Files
kilocode/packages/kilo-vscode/webview-ui/agent-manager/ProjectSidebarBody.tsx
T
marius-kilocode ff5aeba07b fix(agent-manager): address drag-to-prompt review feedback
- Track dropped mentions so typing after a drop keeps the dropdown closed
- Detect leaving the side panel via strip bounds so leftward reordering works
- Tear down the drop listener and drag state when the prompt unmounts
- Restore sidebar worktree order on prompt and outside drops
- Derive the disabled flag for drag-dropped worktree references
2026-09-14 09:38:07 +02:00

507 lines
21 KiB
TypeScript
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
import { For, Show, createEffect, createMemo, createSignal, onCleanup, type Component } from "solid-js"
import { Icon } from "@kilocode/kilo-ui/icon"
import {
DragDropProvider,
DragDropSensors,
DragOverlay,
SortableProvider,
createSortable,
type DragEvent,
} from "@thisbeyond/solid-dnd"
import type {
AgentManagerStateMessage,
AgentProjectSnapshot,
LocalGitStats,
PRStatus,
ProjectSessionInfo,
WorktreeState,
WorktreeGitStats,
} from "../src/types/messages"
import type { LanguageContextValue } from "../src/context/language"
import { LocalActivity } from "../src/components/shared/ActivityIcon"
import { label, type Activity } from "../src/utils/session-activity"
import { useVSCode } from "../src/context/vscode"
import SectionHeader from "./SectionHeader"
import { SidebarSectionHeader } from "./SidebarSectionHeader"
import { WorktreeItem } from "./WorktreeItem"
import { useBaseUpdate } from "./update-from-base"
import { ProjectActions } from "./ProjectActions"
import { StatsSkeleton, WorktreeSkeleton } from "./Skeleton"
import { applyTabOrder, firstOrderedTitle, reorderTabs } from "./tab-order"
import {
buildSidebarOrder,
buildTopLevelItems,
sortWorktrees,
isGroupEnd,
isGroupStart,
isGrouped,
} from "./section-helpers"
import { LOCAL, nextSelectionAfterDelete } from "./navigate"
import { outsideSidebar, sectionAwareDetector } from "./section-dnd"
import { ConstrainDragXAxis } from "./constrain-drag-x"
import { createProjectStore, type ProjectStore } from "./project/store"
import { randomColor } from "./section-colors"
import { projectSidebarOrder, projectWorktreeRow } from "./project-local-navigation"
import { rootSessions } from "./project/session-filter"
import { createWorktreeCompletion } from "./worktree-completion"
import { worktreeDropReference } from "./worktree-references"
import { beginPromptMentionDrop, endPromptMentionDrop } from "../src/utils/prompt-mention-drop"
const isMac = typeof navigator !== "undefined" && /Mac|iPhone|iPad/.test(navigator.userAgent)
interface Props {
project: AgentProjectSnapshot
state?: AgentManagerStateMessage
store?: ProjectStore
busy: (id: string) => boolean
blocked: (id: string) => boolean
activityFor: (worktreeId: string | null) => Activity
stats?: Record<string, WorktreeGitStats>
local?: LocalGitStats
prs?: Record<string, PRStatus | null>
sessions?: ProjectSessionInfo[]
selectedProject?: string
selection?: string
currentSessionID?: () => string | undefined
bindings: Record<string, string>
t: LanguageContextValue["t"]
onSelectLocal: (projectId: string) => void
onSelectWorktree: (projectId: string, worktreeId: string) => void
onOpenComments?: (projectId: string, worktreeId: string) => void
onOpenPR?: (projectId: string, worktreeId: string) => void
onNewWorktree: (projectId: string) => void
shortcutMap?: () => Map<string, number>
}
/** Permanent real sidebar body for one expanded project. */
export const ProjectSidebarBody: Component<Props> = (props) => {
const vscode = useVSCode()
const updateBase = useBaseUpdate()
const store = props.store ?? createProjectStore(props.project.id)
if (!props.store) {
createEffect(() => {
const state = props.state
if (state) store.applyState(state)
})
}
const [pending, setPending] = createSignal<string>()
const [renaming, setRenaming] = createSignal<string>()
const [renamingSection, setRenamingSection] = createSignal<string>()
const [pendingSection, setPendingSection] = createSignal<
{ ids: Set<string>; state?: AgentManagerStateMessage } | undefined
>()
const [dragging, setDragging] = createSignal<string>()
const [dragOrigin, setDragOrigin] = createSignal<string[]>()
const [name, setName] = createSignal("")
let pendingTimer: ReturnType<typeof setTimeout> | undefined
onCleanup(() => clearTimeout(pendingTimer))
/** Arm on the first click, execute on the second, matching the legacy sidebar. */
const confirmDelete = (worktreeId: string) => {
if (props.busy(worktreeId) || props.blocked(worktreeId)) return
if (pending() === worktreeId) {
clearTimeout(pendingTimer)
setPending(undefined)
store.setBusy((prev) => new Map([...prev, [worktreeId, { reason: "deleting" as const }]]))
post({ type: "agentManager.deleteWorktree", worktreeId })
selectAfterDelete(worktreeId)
return
}
clearTimeout(pendingTimer)
setPending(worktreeId)
pendingTimer = setTimeout(() => setPending(undefined), 2500)
}
const state = () => props.state
const sessions = (worktreeId: string | null) => rootSessions(props.sessions ?? [], worktreeId)
const active = () => props.selectedProject === props.project.id
const runs = () => store.runStatuses()
const sections = () => store.sections()
const worktrees = () => store.worktrees()
const order = () => store.worktreeOrder()
const completion = createWorktreeCompletion(
() => sortWorktrees(worktrees(), order()),
() => props.project.id,
(wt) => wt.label || firstOrderedTitle(sessions(wt.id), store.tabOrder()[wt.id], wt.branch),
)
const sorted = completion.rows
const members = (sectionId: string) => sorted().filter((wt) => wt.sectionId === sectionId)
const ungrouped = createMemo(() => sorted().filter((wt) => !wt.sectionId))
const top = createMemo(() => buildTopLevelItems(sections(), ungrouped(), sorted(), order()))
const sidebarOrder = createMemo(() => projectSidebarOrder(top(), sorted(), sections(), members))
const post = (message: Record<string, unknown>) =>
vscode.postMessage({ ...message, projectId: props.project.id } as never)
const localState = () => props.activityFor(null)
const selectAfterDelete = (id: string) => {
if (!active() || props.selection !== id) return
const ids = new Set(store.managedSessions().map((item) => item.worktreeId))
const order = buildSidebarOrder(top(), sorted(), sections(), members, id)
.filter((item) => item.type === "wt")
.map((item) => item.id)
const next = nextSelectionAfterDelete(
id,
order,
(id) => ids.has(id) && !props.busy(id) && !store.staleWorktreeIds().has(id),
)
if (next === LOCAL) return props.onSelectLocal(props.project.id)
props.onSelectWorktree(props.project.id, next)
}
const row = (id: string) =>
projectWorktreeRow({
projectId: props.project.id,
activeProjectId: props.selectedProject,
worktreeId: id,
activeId: props.selection ?? props.currentSessionID?.(),
flatIds: sidebarOrder(),
bindings: props.bindings,
shortcuts: props.shortcutMap?.(),
})
const scope = (kind: "section" | "worktree", id: string) => `${props.project.id}:${kind}:${id}`
const parse = (kind: "section" | "worktree", value: unknown) => {
if (typeof value !== "string") return
const prefix = `${props.project.id}:${kind}:`
return value.startsWith(prefix) ? value.slice(prefix.length) : undefined
}
const createSection = (worktreeIds?: string[]) => {
setPendingSection({ ids: new Set(sections().map((section) => section.id)), state: state() })
post({
type: "agentManager.createSection",
name: props.t("agentManager.section.defaultName"),
color: randomColor(),
worktreeIds,
})
}
createEffect(() => {
const previous = pendingSection()
if (!previous) return
const current = state()
if (current === previous.state) return
const created = (current?.sections ?? []).find((section) => !previous.ids.has(section.id))
setPendingSection(undefined)
if (!created) return
setRenamingSection(created.id)
})
const worktreeIds = createMemo(() => new Set(worktrees().map((wt) => wt.id)))
const sectionIds = createMemo(() => new Set(sections().map((section) => scope("section", section.id))))
const home = createMemo(
() =>
new Map(
worktrees().map(
(wt) => [scope("worktree", wt.id), wt.sectionId ? scope("section", wt.sectionId) : undefined] as const,
),
),
)
const detector = sectionAwareDetector(sectionIds, home)
const dragIds = createMemo(() => sorted().map((wt) => scope("worktree", wt.id)))
const onDragStart = (event: DragEvent) => {
const id = parse("worktree", event.draggable?.id)
if (!id || !worktreeIds().has(id)) return
setDragging(id)
setDragOrigin(order())
const wt = worktrees().find((item) => item.id === id)
if (wt) {
beginPromptMentionDrop({
kind: "worktree",
worktree: worktreeDropReference(
wt,
wt.label || firstOrderedTitle(sessions(wt.id), store.tabOrder()[wt.id], wt.branch),
sessions(wt.id).map((session) => ({ id: session.id })),
wt.id === props.selection || store.staleWorktreeIds().has(wt.id) || store.busy().has(wt.id),
),
})
}
document.body.classList.add("am-wt-dragging-active")
}
const onDragOver = (event: DragEvent) => {
// Once the card leaves the sidebar it is on its way to the prompt, so stop
// reordering the list under it.
if (outsideSidebar(event.draggable)) return
const from = parse("worktree", event.draggable?.id)
const to = parse("worktree", event.droppable?.id)
if (!from || !to || !worktreeIds().has(from) || !worktreeIds().has(to)) return
store.setWorktreeOrder((previous) => {
const current = applyTabOrder(
sorted().map((wt) => ({ id: wt.id })),
previous,
).map((item) => item.id)
return reorderTabs(current, from, to) ?? previous
})
}
const onDragEnd = (event: DragEvent) => {
const handled = endPromptMentionDrop()
const from = parse("worktree", event.draggable?.id)
const section = parse("section", event.droppable?.id)
const to = parse("worktree", event.droppable?.id)
setDragging(undefined)
const origin = dragOrigin()
setDragOrigin(undefined)
document.body.classList.remove("am-wt-dragging-active")
// A drop on the prompt inserts a mention. Do not also move the worktree to
// whatever section happens to be under the pointer. Both this path and an
// outside release undo the reorder applied while passing over sibling rows.
if (handled || outsideSidebar(event.draggable)) {
if (origin) store.setWorktreeOrder(origin)
return
}
if (!from || !worktreeIds().has(from)) {
if (origin) store.setWorktreeOrder(origin)
return
}
if (section && sections().some((item) => item.id === section)) {
post({ type: "agentManager.moveToSection", worktreeIds: [from], sectionId: section })
return
}
if (!to || !worktreeIds().has(to)) {
if (origin) store.setWorktreeOrder(origin)
return
}
post({ type: "agentManager.setWorktreeOrder", order: order() })
}
onCleanup(() => document.body.classList.remove("am-wt-dragging-active"))
// Escape unmounts the focused rename input, which fires a synchronous blur
// that would re-commit the cancelled value; this flag swallows that blur.
let cancelled = false
const commitRename = (worktreeId: string) => {
if (cancelled) {
cancelled = false
return
}
const label = name().trim()
setRenaming(undefined)
if (label) post({ type: "agentManager.renameWorktree", worktreeId, label })
}
const cancelRename = () => {
cancelled = true
setRenaming(undefined)
}
const renderWorktree = (worktree: WorktreeState, idx: () => number, list: WorktreeState[]) => {
const label = () => firstOrderedTitle(sessions(worktree.id), store.tabOrder()[worktree.id], worktree.branch)
const subtitle = () => (label() !== worktree.branch ? worktree.branch : undefined)
const values = () => row(worktree.id)
const sortable = createSortable(scope("worktree", worktree.id))
void sortable
return (
<div use:sortable class={`am-wt-sortable ${sortable.isActiveDraggable ? "am-wt-dragging" : ""}`}>
<WorktreeItem
completed={completion.completed(worktree.id)}
onCompletionEnd={() => completion.release(worktree.id)}
worktree={worktree}
sidebarId={`${props.project.id}:${worktree.id}`}
label={worktree.label || label()}
subtitle={worktree.label ? (worktree.label !== worktree.branch ? worktree.branch : undefined) : subtitle()}
active={active() && props.selection === worktree.id}
pendingDelete={pending() === worktree.id}
busy={props.busy(worktree.id)}
activity={props.activityFor(worktree.id)}
blocked={props.blocked(worktree.id)}
stale={state()?.staleWorktreeIds?.includes(worktree.id) === true}
stats={props.stats?.[worktree.id]}
shortcut={values().shortcut}
navHint={values().navHint}
sessions={sessions(worktree.id).length}
grouped={isGrouped(worktree)}
groupStart={isGroupStart(worktree, idx(), list)}
groupEnd={isGroupEnd(worktree, idx(), list)}
groupSize={worktree.groupId ? sorted().filter((item) => item.groupId === worktree.groupId).length : 0}
renaming={renaming() === worktree.id}
renameValue={name()}
closeKeybind={values().closeKeybind}
openKeybind={values().openKeybind}
pr={props.prs?.[worktree.id] ?? undefined}
runStatus={runs()[worktree.id]}
sections={sections()}
currentSectionId={worktree.sectionId}
onMoveToSection={(sectionId) =>
post({ type: "agentManager.moveToSection", worktreeIds: [worktree.id], sectionId })
}
onMoveToNewSection={() => createSection([worktree.id])}
onClick={() => props.onSelectWorktree(props.project.id, worktree.id)}
onCancelDelete={() => setPending(undefined)}
onDelete={(event) => {
event.stopPropagation()
confirmDelete(worktree.id)
}}
onStartRename={(value) => {
setName(value)
setRenaming(worktree.id)
}}
onRenameInput={setName}
onCommitRename={() => commitRename(worktree.id)}
onCancelRename={cancelRename}
onRemoveStale={() => {
post({ type: "agentManager.removeStaleWorktree", worktreeId: worktree.id })
selectAfterDelete(worktree.id)
}}
onUpdateBase={() =>
updateBase(
worktree.id,
props.project.id,
state()?.sessions.find(
(item) => item.worktreeId === worktree.id && item.id === props.currentSessionID?.(),
)?.id,
)
}
onCopyPath={() => navigator.clipboard.writeText(worktree.path)}
onOpen={() => post({ type: "agentManager.openWorktree", worktreeId: worktree.id })}
onOpenComments={() => props.onOpenComments?.(props.project.id, worktree.id)}
onOpenPR={() => props.onOpenPR?.(props.project.id, worktree.id)}
/>
</div>
)
}
return (
<div class="am-project-body" data-project-body={props.project.id}>
<button
class="am-local-item"
classList={{ "am-local-item-active": active() && props.selection === "local" }}
data-sidebar-id={`${props.project.id}:local`}
onClick={() => props.onSelectLocal(props.project.id)}
>
<LocalActivity state={localState()} label={props.t(label(localState()))} />
<div class="am-local-text">
<span class="am-local-label">{props.t("agentManager.local")}</span>
<Show when={props.local === undefined}>
<span class="am-local-branch-skeleton" />
</Show>
<Show when={props.local?.branch}>
<span class="am-local-branch">{props.local!.branch}</span>
</Show>
</div>
<div class="am-wt-actions-cell">
<Show when={props.local === undefined}>
<StatsSkeleton />
</Show>
<Show
when={
props.local && (props.local.additions || props.local.deletions || props.local.ahead || props.local.behind)
}
>
<div class="am-worktree-stats">
<Show when={props.local!.behind}>
<span class="am-worktree-behind">{props.local!.behind}</span>
</Show>
<Show when={props.local!.ahead}>
<span class="am-worktree-commits">{props.local!.ahead}</span>
</Show>
<Show when={props.local!.additions}>
<span class="am-stat-additions">+{props.local!.additions}</span>
</Show>
<Show when={props.local!.deletions}>
<span class="am-stat-deletions">{props.local!.deletions}</span>
</Show>
</div>
</Show>
<div class="am-wt-hover-actions">
<Show when={props.shortcutMap?.().get(`${props.project.id}:local`)}>
{(shortcut) => (
<span class="am-shortcut-badge">
{isMac ? "⌘" : "Ctrl+"}
{shortcut()}
</span>
)}
</Show>
</div>
</div>
</button>
<div class="am-section">
<SidebarSectionHeader
class="am-section-header"
label={<span class="am-section-label">{props.t("agentManager.section.worktrees")}</span>}
actions={
<ProjectActions
branch={state()?.defaultBaseBranch ?? props.local?.branch ?? "main"}
bindings={props.bindings}
loaded={state() !== undefined}
t={props.t}
onCreate={() => post({ type: "agentManager.createWorktree" })}
onNew={() => props.onNewWorktree(props.project.id)}
onSection={() => createSection()}
onSettings={() =>
vscode.postMessage({ type: "openSettingsPanel", tab: "agentManager", projectId: props.project.id })
}
/>
}
/>
<div class="am-worktree-list">
<Show when={state()} fallback={<WorktreeSkeleton />}>
<DragDropProvider
onDragStart={onDragStart}
onDragOver={onDragOver}
onDragEnd={onDragEnd}
collisionDetector={detector}
>
<DragDropSensors />
<ConstrainDragXAxis />
<SortableProvider ids={dragIds()}>
<For each={top()}>
{(item, index) => {
if (item.kind === "worktree") {
const list = ungrouped()
return renderWorktree(item.wt, () => list.indexOf(item.wt), list)
}
const section = item.section
const list = members(section.id)
return (
<SectionHeader
section={section}
dropId={scope("section", section.id)}
count={list.length}
autoRename={renamingSection() === section.id}
onRenameEnd={() => {
if (renamingSection() === section.id) setRenamingSection(undefined)
}}
onToggle={() => post({ type: "agentManager.toggleSectionCollapsed", sectionId: section.id })}
onRename={(value: string) =>
post({ type: "agentManager.renameSection", sectionId: section.id, name: value })
}
onDelete={() => post({ type: "agentManager.deleteSection", sectionId: section.id })}
onSetColor={(color: string | null) =>
post({ type: "agentManager.setSectionColor", sectionId: section.id, color })
}
isFirst={index() === 0}
isLast={index() === top().length - 1}
onMoveUp={() => post({ type: "agentManager.moveSection", sectionId: section.id, dir: -1 })}
onMoveDown={() => post({ type: "agentManager.moveSection", sectionId: section.id, dir: 1 })}
>
<Show when={!section.collapsed}>
<div class="am-section-group-body">
<For each={list}>{(wt, wtIndex) => renderWorktree(wt, wtIndex, list)}</For>
</div>
</Show>
</SectionHeader>
)
}}
</For>
</SortableProvider>
<DragOverlay>
{(() => {
const wt = sorted().find((item) => item.id === dragging())
if (!wt) return null
return (
<div class="am-wt-overlay">
<Icon name="branch" size="small" />
<span>{wt.label || firstOrderedTitle(sessions(wt.id), store.tabOrder()[wt.id], wt.branch)}</span>
</div>
)
})()}
</DragOverlay>
</DragDropProvider>
</Show>
</div>
</div>
</div>
)
}