- {/* Chat/terminal + side diff panel. Keep it mounted under the
- review tab so live xterm canvases never leave the paint tree. */}
- {/* Keep terminal tabs mounted so output streams across worktree switches. */}
{renderTerminalLayer({
state: terms,
onFocusPrompt: focusCtl.focus,
onFocusChange: focusCtl.report,
})}
- {/* Session-less context (e.g. a worktree mid-provisioning): the
- empty state lives in the main pane so the side terminal
- panel can render next to it. */}
{
- {/* One inspector host for all right-side modes. It stays
- mounted while a side terminal is alive — hidden via
- .am-side-host-hidden (absolute + opacity), never
- unmounted, so xterm render loops keep streaming. */}
-
0 || subagents.tabs().length > 0}>
+ 0 || subagents.tabs().length > 0}
+ >
{
/>
-
- metrics.track("send_review_comments", "side_review")}
- onClose={metrics.click("side_review_close", "side_review", () => setSidePanel(null))}
- onExpand={
- selection() !== null
- ? metrics.click("fullscreen_review", "side_review", openReviewTab, { action: "open" })
- : undefined
- }
- onRequestDiff={requestDiffFile}
- onOpenFile={(file, line) => {
- const id = diffCtx()
- if (id)
- vscode.postMessage({ type: "agentManager.openFile", sessionId: id, filePath: file, line })
- }}
- onOpenDocument={documentInspector.open}
- onRevertFile={metrics.use("revert_file", "side_review", revertCtl.revert)}
- revertingFiles={revertCtl.reverting()}
- activeTerminalId={terms.activeId()}
- />
-
+
diffOpen() && !history() && !reviewActive()}
+ data={diffDatas}
+ loading={(key) => diffs.diffLoadingFor(() => key)}
+ loadingFiles={(key) => diffs.diffFileLoadingFor(() => key)}
+ notice={(key) => diffNotices()[diffDataKey(activeProjectId(), key)]}
+ comments={(key) =>
+ readReviewComments(reviewCommentsByContext(), currentProjectId() ?? "single", key)
+ }
+ setComments={(key, comments) =>
+ setReviewCommentsByContext((prev) =>
+ setReviewComments(prev, currentProjectId() ?? "single", key, comments),
+ )
+ }
+ composer={composers.get}
+ lead={() => diffScopeControls(true)}
+ canRevert={scopeCapabilities(review.scope()).revert}
+ diffStyle={diffStyle.style()}
+ onDiffStyleChange={setSharedDiffStyle}
+ markdownRender={markdown.render()}
+ onMarkdownRenderChange={markdown.update}
+ onSendClick={() => metrics.track("send_review_comments", "side_review")}
+ onClose={metrics.click("side_review_close", "side_review", () => setSidePanel(null))}
+ onExpand={
+ selection() !== null
+ ? metrics.click("fullscreen_review", "side_review", openReviewTab, { action: "open" })
+ : undefined
+ }
+ onRequestDiff={diffs.requestDiffFile}
+ onOpenFile={(ctx, file, line) =>
+ vscode.postMessage({ type: "agentManager.openFile", sessionId: ctx, filePath: file, line })
+ }
+ onOpenDocument={documentInspector.open}
+ onRevertFile={(key, ctx, file) => {
+ metrics.track("revert_file", "side_review")
+ revertCtl.revertFor(key, ctx, review.scope(), file)
+ }}
+ revertingFiles={revertCtl.revertingFor}
+ activeTerminalId={terms.activeId()}
+ contexts={() => new Set(worktrees().map((wt) => wt.id))}
+ onEvict={(key) => {
+ composers.drop(key)
+ diffs.drop(key)
+ }}
+ />
{
{
canComment={scopeCapabilities(review.scope()).comments}
comments={reviewComments()}
onCommentsChange={setReviewCommentsForSelection}
- composer={reviewComposer}
+ composer={composers.get(`${activeProjectId() ?? "single"}\0${diffScopeId() ?? ""}`)}
onSendAll={closeReviewTab}
onSendClick={() => metrics.track("send_review_comments", "fullscreen_review")}
diffStyle={diffStyle.style()}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx b/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx
index 9513aacae6a..4dbb6611ac9 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx
@@ -1,4 +1,13 @@
-import { type Component, createSignal, createMemo, Show, createEffect, on, type JSXElement } from "solid-js"
+import {
+ type Component,
+ createSignal,
+ createMemo,
+ Show,
+ createEffect,
+ createRenderEffect,
+ on,
+ type JSXElement,
+} from "solid-js"
import type { VirtualizerHandle } from "virtua/solid"
import { Diff } from "@kilocode/kilo-ui/diff"
import { Accordion } from "@kilocode/kilo-ui/accordion"
@@ -8,7 +17,6 @@ import { DiffChanges } from "@kilocode/kilo-ui/diff-changes"
import { Icon } from "@kilocode/kilo-ui/icon"
import { Button } from "@kilocode/kilo-ui/button"
import { IconButton } from "@kilocode/kilo-ui/icon-button"
-import { Spinner } from "@kilocode/kilo-ui/spinner"
import { Tooltip, TooltipKeybind } from "@kilocode/kilo-ui/tooltip"
import type { DiffLineAnnotation, AnnotationSide, SelectedLineRange } from "@pierre/diffs"
import type { WorktreeFileDiff } from "../src/types/messages"
@@ -74,6 +82,7 @@ const DIFF_NOTICE_KEYS: Record = {
interface DiffPanelProps {
diffs: WorktreeFileDiff[]
loading: boolean
+ active?: boolean
loadingFiles?: Set
sessionId?: string
sessionKey?: string
@@ -159,6 +168,7 @@ export const DiffPanel: Component = (props) => {
},
),
)
+
const setOpen = (files: string[] | ((prev: string[]) => string[])) => {
const key = props.sessionKey ?? ""
const current = open()
@@ -197,6 +207,20 @@ export const DiffPanel: Component = (props) => {
// so pierre's annotation cache doesn't invalidate and destroy the textarea.
let draftMeta: AnnotationMeta | null = composer().draft
let editMeta: AnnotationMeta | null = composer().edit
+ createRenderEffect(
+ on(
+ () => props.active,
+ (active) => {
+ if (!active) return
+ const value = reviewComposerDraft(composer())
+ const edit = reviewComposerEdit(composer())
+ setDraft(value)
+ setEditing(edit)
+ draftMeta = composer().draft
+ editMeta = composer().edit
+ },
+ ),
+ )
// Ref to the scrollable container — used to preserve scroll position when
// annotation changes cause pierre to fully re-render diffs
@@ -249,6 +273,7 @@ export const DiffPanel: Component = (props) => {
on(
() => props.sessionKey,
() => {
+ if (props.active === false) return
setDraft(null)
draftMeta = null
setEditing(null)
@@ -264,7 +289,7 @@ export const DiffPanel: Component = (props) => {
diffs: () => props.diffs,
open,
loading: () => props.loadingFiles,
- send: () => props.onRequestDiff,
+ send: () => (props.active === false ? undefined : props.onRequestDiff),
})
// --- CRUD ---
@@ -327,6 +352,7 @@ export const DiffPanel: Component = (props) => {
on(
() => [props.diffs, comments()] as const,
([diffs, current]) => {
+ if (props.active === false) return
const valid = sanitizeReviewComments(current, diffs)
if (valid.length !== current.length) {
setComments(valid)
@@ -392,8 +418,10 @@ export const DiffPanel: Component = (props) => {
const result = buildFileAnnotations(file, commentsByFile().get(file) ?? [], editing(), draft(), draftMeta, editMeta)
draftMeta = result.draftMeta
editMeta = result.editMeta
- composer().draft = draft() ? draftMeta : null
- composer().edit = editing() ? editMeta : null
+ if (props.active !== false) {
+ composer().draft = draft() ? draftMeta : null
+ composer().edit = editing() ? editMeta : null
+ }
return result.annotations
}
@@ -553,7 +581,6 @@ export const DiffPanel: Component = (props) => {
-
{t("session.review.loadingChanges")}
@@ -714,10 +741,7 @@ export const DiffPanel: Component = (props) => {
fallback={
Diff preview loads on demand.}>
- <>
-
- Loading diff...
-
+ Loading diff...
}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/DiffPanelCache.tsx b/packages/kilo-vscode/webview-ui/agent-manager/DiffPanelCache.tsx
new file mode 100644
index 00000000000..0bf696f83c9
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/DiffPanelCache.tsx
@@ -0,0 +1,129 @@
+import { For, createEffect, createMemo, createSignal, type Accessor, type Component, type JSX } from "solid-js"
+import type { WorktreeFileDiff } from "../src/types/messages"
+import type { ReviewComment } from "../diff-viewer/review-comments"
+import type { ReviewComposer } from "../diff-viewer/review-annotations"
+import { DiffPanel } from "./DiffPanel"
+import { diffDataKey } from "./worktree-diffs"
+
+const CACHE_SIZE = 4
+
+interface Entry {
+ key: string
+ cacheKey: string
+ ctx: string
+ used: number
+}
+
+interface Props {
+ current: Accessor
+ context: Accessor
+ project: Accessor
+ active: Accessor
+ onEvict?: (key: string) => void
+ contexts: Accessor>
+ data: Accessor>
+ loading: (key: string) => boolean
+ loadingFiles: (key: string) => Set
+ notice: (key: string) => string | undefined
+ comments: (ctx: string) => ReviewComment[]
+ setComments: (ctx: string, comments: ReviewComment[]) => void
+ composer: (key: string) => ReviewComposer
+ lead: () => JSX.Element
+ canRevert: boolean
+ diffStyle: "unified" | "split"
+ onDiffStyleChange: (style: "unified" | "split") => void
+ markdownRender: boolean
+ onMarkdownRenderChange: (render: boolean) => void
+ onSendClick: () => void
+ onClose: () => void
+ onExpand?: () => void
+ onRequestDiff: (key: string, file: string) => void
+ onOpenFile: (ctx: string, file: string, line?: number) => void
+ onOpenDocument: (file: string) => void
+ onRevertFile: (key: string, ctx: string, file: string) => void
+ revertingFiles: (key: string) => Set
+ activeTerminalId?: string
+}
+
+export const DiffPanelCache: Component = (props) => {
+ const [entries, setEntries] = createSignal([])
+ let used = 0
+
+ createEffect(() => {
+ const contexts = props.contexts()
+ setEntries((prev) => {
+ const next = prev.filter((entry) => entry.ctx === "local" || contexts.has(entry.ctx))
+ for (const item of prev) if (!next.includes(item)) props.onEvict?.(item.cacheKey)
+ return next
+ })
+ })
+
+ createEffect(() => {
+ if (!props.active()) return
+ const key = props.current()
+ const ctx = props.context()
+ const project = props.project() ?? "single"
+ if (!key || !ctx) return
+ const cacheKey = `${project}\0${key}`
+ setEntries((prev) => {
+ const prefix = `${project}\0`
+ const scoped = prev.filter((item) => item.cacheKey.startsWith(prefix))
+ const current = scoped.find((item) => item.cacheKey === cacheKey)
+ if (current) {
+ current.used = ++used
+ for (const item of prev) if (!scoped.includes(item)) props.onEvict?.(item.cacheKey)
+ return scoped
+ }
+ const next = [...scoped, { key, cacheKey, ctx, used: ++used }]
+ if (next.length <= CACHE_SIZE) {
+ for (const item of prev) if (!next.includes(item)) props.onEvict?.(item.cacheKey)
+ return next
+ }
+ const oldest = next.reduce((entry, item) => (item.used < entry.used ? item : entry))
+ const result = next.filter((item) => item !== oldest)
+ props.onEvict?.(oldest.cacheKey)
+ for (const item of prev) if (!result.includes(item)) props.onEvict?.(item.cacheKey)
+ return result
+ })
+ })
+
+ return (
+
+ {(entry) => {
+ const active = createMemo(
+ () => props.active() && `${props.project() ?? "single"}\0${props.current()}` === entry.cacheKey,
+ )
+ return (
+
+ props.setComments(entry.key, comments)}
+ composer={props.composer(entry.cacheKey)}
+ onSendClick={props.onSendClick}
+ onClose={props.onClose}
+ onExpand={props.onExpand}
+ onRequestDiff={(file) => props.onRequestDiff(entry.key, file)}
+ onOpenFile={(file, line) => props.onOpenFile(entry.ctx, file, line)}
+ onOpenDocument={props.onOpenDocument}
+ onRevertFile={(file) => props.onRevertFile(entry.key, entry.ctx, file)}
+ revertingFiles={props.revertingFiles(entry.key)}
+ activeTerminalId={props.activeTerminalId}
+ />
+
+ )
+ }}
+
+ )
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
index 34ea4b246f4..d3c8961a14d 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
+++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css
@@ -1851,6 +1851,24 @@ body.am-wt-dragging-active * {
overflow: hidden;
}
+.am-diff-panel-cache {
+ position: absolute;
+ inset: 0;
+ display: flex;
+ min-width: 0;
+ min-height: 0;
+ opacity: 0;
+ pointer-events: none;
+ z-index: 0;
+ background: var(--surface-base);
+}
+
+.am-diff-panel-cache-active {
+ opacity: 1;
+ pointer-events: auto;
+ z-index: 2;
+}
+
.am-diff-panel-wrapper > [data-component="resize-handle"]::after {
background: var(--surface-interactive-base);
}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/apply-to-local.tsx b/packages/kilo-vscode/webview-ui/agent-manager/apply-to-local.tsx
index d57c3a39c50..5fee2b5b3fc 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/apply-to-local.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/apply-to-local.tsx
@@ -15,6 +15,7 @@ import { showToast } from "@kilocode/kilo-ui/toast"
import { groupApplyConflicts } from "./apply-conflicts"
import { ApplyDialog } from "./ApplyDialog"
import { composeDiffId } from "./diff-scope-state"
+import { diffDataKey } from "./worktree-diffs"
import type { tracker } from "./telemetry"
import type { useDialog } from "@kilocode/kilo-ui/context/dialog"
import type { useLanguage } from "../src/context/language"
@@ -74,7 +75,7 @@ export function createApplyToLocal(opts: ApplyToLocalOptions) {
const applyDiffs = createMemo(() => {
const key = applyDiffKey()
if (!key) return [] as WorktreeFileDiff[]
- return diffDatas()[key] ?? ([] as WorktreeFileDiff[])
+ return diffDatas()[diffDataKey(opts.projectId?.(), key)] ?? ([] as WorktreeFileDiff[])
})
const applyStateForTarget = createMemo(() => {
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/project/review-state.ts b/packages/kilo-vscode/webview-ui/agent-manager/project/review-state.ts
index ce0aa9e51c6..158b91cb54e 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/project/review-state.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/project/review-state.ts
@@ -50,8 +50,9 @@ export function pruneReviewState(
): Record {
return Object.fromEntries(
Object.entries(values).filter(([key]) => {
- const [owner, context] = key.split(":")
- return owner !== project || context === "local" || contexts.has(context)
+ const [owner, value] = key.split(":")
+ const context = value?.split("#", 1)[0]
+ return owner !== project || context === "local" || (context !== undefined && contexts.has(context))
}),
)
}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts b/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts
index 3f2a5285180..1b3605fae42 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts
@@ -21,38 +21,45 @@ export function createRevertFile(
projectId?: Accessor,
) {
const [files, setFiles] = createSignal>>({})
+ const key = (project: string | undefined, scope: string) => `${project ?? "single"}\0${scope}`
const reverting = createMemo(() => {
const id = diffScopeId()
if (!id) return new Set()
- return files()[id] ?? new Set()
+ return files()[key(projectId?.(), id)] ?? new Set()
})
- function revert(file: string) {
- const id = diffScopeId()
- const context = ctx()
+ const revertingFor = (id: string) => files()[key(projectId?.(), id)] ?? new Set()
+
+ function revertFor(id: string | undefined, context: string | undefined, source: string, file: string) {
if (!id || !context) return
+ const data = key(projectId?.(), id)
setFiles((prev) => {
- const set = new Set(prev[id] ?? [])
+ const set = new Set(prev[data] ?? [])
set.add(file)
- return { ...prev, [id]: set }
+ return { ...prev, [data]: set }
})
vscode.postMessage({
type: "agentManager.revertWorktreeFile",
projectId: projectId?.(),
sessionId: context,
file,
- scope: scope(),
+ scope: source,
})
}
+ function revert(file: string) {
+ revertFor(diffScopeId(), ctx(), scope(), file)
+ }
+
function onResult(ev: AgentManagerRevertWorktreeFileResultMessage) {
+ const data = key(ev.projectId, ev.sessionId)
setFiles((prev) => {
- const set = new Set(prev[ev.sessionId] ?? [])
+ const set = new Set(prev[data] ?? [])
set.delete(ev.file)
const next = { ...prev }
- if (set.size === 0) delete next[ev.sessionId]
- else next[ev.sessionId] = set
+ if (set.size === 0) delete next[data]
+ else next[data] = set
return next
})
if (ev.status === "success") {
@@ -62,5 +69,5 @@ export function createRevertFile(
}
}
- return { reverting, revert, onResult }
+ return { reverting, revertingFor, revert, revertFor, onResult }
}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/review-composers.ts b/packages/kilo-vscode/webview-ui/agent-manager/review-composers.ts
new file mode 100644
index 00000000000..a82f0781be0
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/review-composers.ts
@@ -0,0 +1,42 @@
+import type { Accessor } from "solid-js"
+import { createReviewComposer, type ReviewComposer } from "../diff-viewer/review-annotations"
+
+export function createReviewComposers(project: Accessor) {
+ const values = new Map()
+
+ const get = (key: string) => {
+ const current = values.get(key)
+ if (current) return current
+ const next = createReviewComposer()
+ values.set(key, next)
+ return next
+ }
+
+ const clear = (ctx: string | null) => {
+ if (!ctx) return
+ const prefix = `${project() ?? "single"}\0${ctx}`
+ for (const key of values.keys()) {
+ if (key === prefix || key.startsWith(`${prefix}#`)) values.delete(key)
+ }
+ }
+
+ const drop = (key: string) => values.delete(key)
+
+ const clearProject = (id: string) => {
+ const prefix = `${id}\0`
+ for (const key of values.keys()) {
+ if (key.startsWith(prefix)) values.delete(key)
+ }
+ }
+
+ const prune = (contexts: Set) => {
+ const prefix = `${project() ?? "single"}\0`
+ for (const key of values.keys()) {
+ if (!key.startsWith(prefix)) continue
+ const ctx = key.slice(prefix.length).split("#", 1)[0]
+ if (ctx !== "local" && !contexts.has(ctx)) values.delete(key)
+ }
+ }
+
+ return { get, clear, drop, clearProject, prune }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/sidebar-scroll.ts b/packages/kilo-vscode/webview-ui/agent-manager/sidebar-scroll.ts
new file mode 100644
index 00000000000..7c81604c294
--- /dev/null
+++ b/packages/kilo-vscode/webview-ui/agent-manager/sidebar-scroll.ts
@@ -0,0 +1,38 @@
+type Entry = {
+ el: HTMLElement
+ top: number
+}
+
+export function createSidebarScrollPreserver(
+ active: () => string | null | undefined = () => undefined,
+ root: ParentNode = document,
+ schedule: typeof requestAnimationFrame = requestAnimationFrame,
+ cancel: typeof cancelAnimationFrame = cancelAnimationFrame,
+) {
+ let frame: number | undefined
+ let inner: number | undefined
+
+ return (fn: () => void): void => {
+ if (frame !== undefined) cancel(frame)
+ if (inner !== undefined) cancel(inner)
+
+ const prior = active()
+ const scrolls: Entry[] = [...root.querySelectorAll(".am-worktree-list, .am-projects-list")].map(
+ (el) => ({
+ el,
+ top: el.scrollTop,
+ }),
+ )
+ fn()
+ frame = schedule(() => {
+ frame = undefined
+ inner = schedule(() => {
+ inner = undefined
+ if (active() !== prior) return
+ for (const item of scrolls) {
+ if (item.el.isConnected && item.top > 0 && item.el.scrollTop === 0) item.el.scrollTop = item.top
+ }
+ })
+ })
+ }
+}
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx b/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx
index 54ef6689981..a58e421de62 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx
+++ b/packages/kilo-vscode/webview-ui/agent-manager/terminal/TerminalTab.tsx
@@ -334,7 +334,7 @@ export const TerminalTab: Component = (props) => {
if (typeof event.data === "string") {
if (!replay.output(event.data)) {
input.clear()
- next.close(1009, "terminal replay exceeded limit")
+ next.close(4009, "terminal replay exceeded limit")
return
}
scheduleFlush()
@@ -345,7 +345,7 @@ export const TerminalTab: Component = (props) => {
if (replay.frame(bytes)) return
if (!replay.output(bytes)) {
input.clear()
- next.close(1009, "terminal replay exceeded limit")
+ next.close(4009, "terminal replay exceeded limit")
return
}
scheduleFlush()
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/worktree-diffs.ts b/packages/kilo-vscode/webview-ui/agent-manager/worktree-diffs.ts
index 60ba7cb5991..350ba0ea5cd 100644
--- a/packages/kilo-vscode/webview-ui/agent-manager/worktree-diffs.ts
+++ b/packages/kilo-vscode/webview-ui/agent-manager/worktree-diffs.ts
@@ -29,15 +29,43 @@ export function wireDiffId(id: string) {
return { sessionId: ctx, scope, diffSessionId: sessionId }
}
+export function diffDataKey(project: string | undefined, id: string): string {
+ return `${project ?? "single"}\0${id}`
+}
+
export function createWorktreeDiffs(
vscode: ReturnType,
project: () => string | undefined = () => undefined,
) {
const [diffDatas, setDiffDatas] = createSignal>({})
- const [diffLoading, setDiffLoading] = createSignal(false)
+ const [diffLoadings, setDiffLoadings] = createSignal>({})
+ const diffLoading = () => Object.keys(diffLoadings()).length > 0
const [diffNotices, setDiffNotices] = createSignal>({})
const [diffFileLoading, setDiffFileLoading] = createSignal>>({})
+ const key = (id: string) => diffDataKey(project(), id)
+
+ const reset = () => {
+ setDiffDatas({})
+ setDiffLoadings({})
+ setDiffNotices({})
+ setDiffFileLoading({})
+ }
+
+ const drop = (id: string) => {
+ const data = id.includes("\0") ? id : key(id)
+ const remove = >(prev: T): T => {
+ if (!(data in prev)) return prev
+ const next = { ...prev }
+ delete next[data]
+ return next
+ }
+ setDiffDatas(remove)
+ setDiffLoadings(remove)
+ setDiffNotices(remove)
+ setDiffFileLoading(remove)
+ }
+
const setDiffFilePending = (sessionId: string, file: string, value: boolean) => {
setDiffFileLoading((prev) => {
const session = prev[sessionId] ?? {}
@@ -66,20 +94,21 @@ export function createWorktreeDiffs(
/** Lazily load a single file's full diff for the given composite diff id. */
const requestDiffFile = (id: string, file: string) => {
- if (diffFileLoading()[id]?.[file]) return
- setDiffFilePending(id, file, true)
+ const data = key(id)
+ if (diffFileLoading()[data]?.[file]) return
+ setDiffFilePending(data, file, true)
vscode.postMessage({ type: "agentManager.requestWorktreeDiffFile", projectId: project(), file, ...wireDiffId(id) })
}
/** Files the backend flagged as stale in a merged update need a fresh fetch. */
- const refreshStaleDiffs = (id: string, files: Set) => {
- const loading = diffFileLoading()[id] ?? {}
+ const refreshStaleDiffs = (id: string, files: Set, data = key(id), owner = project()) => {
+ const loading = diffFileLoading()[data] ?? {}
for (const file of files) {
if (loading[file]) continue
- setDiffFilePending(id, file, true)
+ setDiffFilePending(data, file, true)
vscode.postMessage({
type: "agentManager.requestWorktreeDiffFile",
- projectId: project(),
+ projectId: owner,
file,
...wireDiffId(id),
})
@@ -90,53 +119,79 @@ export function createWorktreeDiffs(
const diffFileLoadingFor = (sessionId: Accessor) => {
const id = sessionId()
if (!id) return new Set()
- return new Set(Object.keys(diffFileLoading()[id] ?? {}))
+ return new Set(Object.keys(diffFileLoading()[key(id)] ?? {}))
+ }
+
+ /** Initial summary loading for one composite diff id. Cached results stay visible while refreshing. */
+ const diffLoadingFor = (sessionId: Accessor) => {
+ const id = sessionId()
+ if (!id) return false
+ const data = key(id)
+ return diffLoadings()[data] === true && !(data in diffDatas())
}
// Backend messages.
const onWorktreeDiff = (ev: AgentManagerWorktreeDiffMessage) => {
+ const data = diffDataKey(ev.projectId, ev.sessionId)
let staleFiles: Set | undefined
setDiffDatas((prev) => {
- const existing = prev[ev.sessionId]
+ const existing = prev[data]
const merged = existing ? mergeWorktreeDiffs(existing, ev.diffs) : { diffs: ev.diffs, stale: new Set() }
staleFiles = merged.stale
const next = merged.diffs
if (existing && existing.length === next.length && existing.every((old, i) => old === next[i])) return prev
- return { ...prev, [ev.sessionId]: next }
+ return { ...prev, [data]: next }
})
- if (staleFiles) refreshStaleDiffs(ev.sessionId, staleFiles)
+ if (staleFiles) refreshStaleDiffs(ev.sessionId, staleFiles, data, ev.projectId)
}
const onWorktreeDiffFile = (ev: AgentManagerWorktreeDiffFileMessage) => {
+ const data = diffDataKey(ev.projectId, ev.sessionId)
if (ev.diff) {
setDiffDatas((prev) => {
- const existing = prev[ev.sessionId] ?? []
+ const existing = prev[data] ?? []
const next = existing.map((item) => (item.file === ev.diff!.file ? ev.diff! : item))
- return { ...prev, [ev.sessionId]: next }
+ return { ...prev, [data]: next }
})
- setDiffFilePending(ev.sessionId, ev.diff.file, false)
+ setDiffFilePending(data, ev.diff.file, false)
return
}
- setDiffFilePending(ev.sessionId, ev.file, false)
+ setDiffFilePending(data, ev.file, false)
}
const onWorktreeDiffLoading = (ev: AgentManagerWorktreeDiffLoadingMessage) => {
- setDiffLoading(ev.loading)
+ const data = diffDataKey(ev.projectId, ev.sessionId)
+ // One source is active per project. Replacing the map on start also clears
+ // an interrupted source whose stale completion is intentionally discarded.
+ if (ev.loading) {
+ setDiffLoadings({ [data]: true })
+ return
+ }
+ setDiffLoadings((prev) => {
+ if (!prev[data]) return prev
+ const next = { ...prev }
+ delete next[data]
+ return next
+ })
}
const onWorktreeDiffNotice = (ev: AgentManagerWorktreeDiffNoticeMessage) => {
- setDiffNotices((prev) => ({ ...prev, [ev.sessionId]: ev.notice }))
+ setDiffNotices((prev) => ({ ...prev, [diffDataKey(ev.projectId, ev.sessionId)]: ev.notice }))
}
return {
diffDatas,
diffLoading,
- setDiffLoading,
+ setDiffLoading: (loading: boolean) => setDiffLoadings(loading ? diffLoadings() : {}),
diffNotices,
requestDiffFile,
refreshStaleDiffs,
diffFileLoadingFor,
+ diffLoadingFor,
+ diffDataKey,
+ drop,
+ reset,
onWorktreeDiff,
onWorktreeDiffFile,
onWorktreeDiffLoading,
diff --git a/packages/kilo-vscode/webview-ui/diff-viewer/diff-requests.ts b/packages/kilo-vscode/webview-ui/diff-viewer/diff-requests.ts
index 904ceca13fc..8d517795668 100644
--- a/packages/kilo-vscode/webview-ui/diff-viewer/diff-requests.ts
+++ b/packages/kilo-vscode/webview-ui/diff-viewer/diff-requests.ts
@@ -13,6 +13,7 @@ interface DiffRequestOptions {
export function createDiffRequests(opts: DiffRequestOptions) {
const requested = new Map()
+ let active = false
createEffect(
on(
@@ -36,8 +37,17 @@ export function createDiffRequests(opts: DiffRequestOptions) {
createEffect(
on(
- () => [opts.open(), opts.diffs(), opts.loading()] as const,
+ () => [opts.open(), opts.diffs(), opts.loading(), opts.send()] as const,
([open, diffs]) => {
+ if (!opts.send()) {
+ requested.clear()
+ active = false
+ return
+ }
+ if (!active) {
+ requested.clear()
+ active = true
+ }
const files = new Set(open)
for (const file of requested.keys()) {
if (!files.has(file)) requested.delete(file)
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/TaskToolExpanded.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/TaskToolExpanded.tsx
index 3a8d4f72daf..568245bcc6c 100644
--- a/packages/kilo-vscode/webview-ui/src/components/chat/TaskToolExpanded.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/chat/TaskToolExpanded.tsx
@@ -20,7 +20,8 @@ import { createAutoScroll } from "@kilocode/kilo-ui/hooks"
import { useSession } from "../../context/session"
import { useVSCode } from "../../context/vscode"
import { useWorktreeMode } from "../../context/worktree-mode"
-import { childID } from "../../context/session-utils"
+import { childID, latestTaskPart } from "../../context/session-utils"
+import { useConfig } from "../../context/config"
import { openSubagent } from "./open-subagent"
import { showChildPromotion, taskResult, taskRunning, taskVisible } from "./task-tool-state"
@@ -28,6 +29,7 @@ const TaskToolRenderer: Component = (props) => {
const i18n = useI18n()
const language = useLanguage()
const session = useSession()
+ const { features } = useConfig()
const vscode = useVSCode()
const worktree = useWorktreeMode()
@@ -45,7 +47,13 @@ const TaskToolRenderer: Component = (props) => {
props.partMetadata as Record | undefined,
props.metadata as Record | undefined,
session.allStatusMap(),
+ features().backgroundSubagents,
props.readonly,
+ latestTaskPart(
+ props.partID,
+ childSessionId(),
+ session.currentSessionID() ? session.getSessionToolParts(session.currentSessionID()!) : [],
+ ),
),
)
@@ -168,7 +176,7 @@ const TaskToolRenderer: Component = (props) => {
-
+
| undefined,
state: Record | undefined,
status: Record,
+ latest: boolean,
) {
- if (!id) return false
+ if (!id || !latest) return false
if (part?.background === true || state?.background === true) return false
return status[id]?.type === "busy" || status[id]?.type === "retry"
}
@@ -20,9 +21,11 @@ export function showChildPromotion(
part: Record | undefined,
state: Record | undefined,
status: Record,
+ enabled: boolean | undefined,
readonly: boolean | undefined,
+ latest: boolean,
) {
- return !readonly && childForeground(id, part, state, status)
+ return enabled === true && !readonly && childForeground(id, part, state, status, latest)
}
export function taskVisible(open: boolean | undefined, id: string | undefined) {
diff --git a/packages/kilo-vscode/webview-ui/src/context/config.tsx b/packages/kilo-vscode/webview-ui/src/context/config.tsx
index 53b3bfafc3e..4fc09d1e8da 100644
--- a/packages/kilo-vscode/webview-ui/src/context/config.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/config.tsx
@@ -88,7 +88,11 @@ export const ConfigProvider: ParentComponent = (props) => {
const [projectConfig, setProjectConfig] = createSignal({})
const [collections, setCollections] = createSignal({})
const [settings, setSettings] = createSignal>({})
- const [features, setFeatures] = createSignal({ indexing: false, sandboxControls: false })
+ const [features, setFeatures] = createSignal({
+ indexing: false,
+ sandboxControls: false,
+ backgroundSubagents: false,
+ })
const [loading, setLoading] = createSignal(true)
const [draft, setDraft] = createSignal>({})
const [globalDraft, setGlobalDraft] = createSignal>({})
diff --git a/packages/kilo-vscode/webview-ui/src/context/session-parts.ts b/packages/kilo-vscode/webview-ui/src/context/session-parts.ts
index 883a2b71483..b025feabd7d 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session-parts.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/session-parts.ts
@@ -1,5 +1,9 @@
import type { Part } from "../types/messages"
+export function isolate(part: Part): Part {
+ return { ...part }
+}
+
function stream(part: Part): part is Extract {
return part.type === "text" || part.type === "reasoning"
}
@@ -27,10 +31,11 @@ export function sameParts(local: Part[] = [], snapshot: Part[] = []): boolean {
export function mergeOptimisticPart(current: Part[], ids: ReadonlySet, part: Part) {
const index = current.findIndex((item) => ids.has(item.id) && item.type === part.type)
- if (index < 0) return { parts: [...current, part] }
+ const copy = isolate(part)
+ if (index < 0) return { parts: [...current, copy] }
const old = current[index]!
const next = current.slice()
- next[index] = part
+ next[index] = copy
return { parts: next, replaced: old.id }
}
diff --git a/packages/kilo-vscode/webview-ui/src/context/session-utils.ts b/packages/kilo-vscode/webview-ui/src/context/session-utils.ts
index b783496f7a7..84212c2c4b6 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session-utils.ts
+++ b/packages/kilo-vscode/webview-ui/src/context/session-utils.ts
@@ -105,6 +105,7 @@ type ToolState = {
}
type TaskPart = {
+ id?: string
type: string
tool?: string
metadata?: { sessionId?: string }
@@ -116,6 +117,11 @@ export function childID(part: TaskPart): string | undefined {
return part.metadata?.sessionId ?? part.state?.metadata?.sessionId
}
+export function latestTaskPart(partID: string | undefined, child: string | undefined, parts: readonly TaskPart[]) {
+ if (!partID || !child) return false
+ return parts.findLast((part) => childID(part) === child)?.id === partID
+}
+
function stringField(value: unknown): string | undefined {
return typeof value === "string" ? value : undefined
}
diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx
index 64c1753c5f7..54841acdae6 100644
--- a/packages/kilo-vscode/webview-ui/src/context/session.tsx
+++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx
@@ -79,7 +79,7 @@ import { getAgentModel } from "./session-model-store"
import { resolveMessagePrefs } from "./session-preferences"
import { errorIDs, preserveSessionErrors, withoutResolvedSessionErrors } from "./session-errors"
import { PartStash } from "./part-stash"
-import { mergeOptimisticPart, mergeParts } from "./session-parts"
+import { isolate, mergeOptimisticPart, mergeParts } from "./session-parts"
import { mergeMessages, sameReconcileShape } from "./session-merge"
import { state as todoState } from "./todo-revert"
import { sessionVariantKeys, transferVariants, variantKey } from "./session-variant-store"
@@ -1457,7 +1457,7 @@ export const SessionProvider: ParentComponent = (props) => {
const cutoff = Math.max(0, messages.length - 15)
for (let i = 0; i < messages.length; i++) {
const msg = messages[i]!
- const parts = msg.parts ?? []
+ const parts = msg.parts?.map(isolate) ?? []
if (mode === "reconcile" && store.parts[msg.id] && !optimisticParts.has(msg.id)) {
const merged = mergeParts(store.parts[msg.id], parts, input.since ?? Number.POSITIVE_INFINITY)
setStore("parts", msg.id, reconcile(merged, { key: "id" }))
@@ -1546,7 +1546,7 @@ export const SessionProvider: ParentComponent = (props) => {
if (message.parts && message.parts.length > 0) {
optimisticParts.delete(message.id)
stash.remove(message.id)
- setStore("parts", message.id, message.parts)
+ setStore("parts", message.id, message.parts.map(isolate))
}
rebuildToolParts(message.sessionID, store.messages[message.sessionID] ?? [])
}
@@ -1624,7 +1624,7 @@ export const SessionProvider: ParentComponent = (props) => {
}
} else {
// Add new part
- list.push(part)
+ list.push(isolate(part))
}
}),
)
@@ -2067,7 +2067,7 @@ export const SessionProvider: ParentComponent = (props) => {
setStore("messages", key, messages)
for (const msg of messages) {
if (msg.parts && msg.parts.length > 0) {
- setStore("parts", msg.id, msg.parts)
+ setStore("parts", msg.id, msg.parts.map(isolate))
}
}
rebuildToolParts(key, messages)
diff --git a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
index 00cf1e48759..d682b3ab6bb 100644
--- a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
+++ b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx
@@ -337,6 +337,7 @@ const ConfigWrapper: ParentComponent<{
return {
indexing: props.features?.indexing ?? hasIndexingPlugin(config.plugin ?? []),
sandboxControls: props.features?.sandboxControls ?? false,
+ backgroundSubagents: props.features?.backgroundSubagents ?? false,
}
})
diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/config.ts b/packages/kilo-vscode/webview-ui/src/types/messages/config.ts
index ccca1426483..de4014161a1 100644
--- a/packages/kilo-vscode/webview-ui/src/types/messages/config.ts
+++ b/packages/kilo-vscode/webview-ui/src/types/messages/config.ts
@@ -173,4 +173,5 @@ export interface Config {
export interface FeatureFlags {
indexing: boolean
sandboxControls: boolean
+ backgroundSubagents: boolean
}
diff --git a/packages/opencode/src/kilocode/cli/lazy-commands.ts b/packages/opencode/src/kilocode/cli/lazy-commands.ts
index ee49d9d5b6a..b917fab6d1a 100644
--- a/packages/opencode/src/kilocode/cli/lazy-commands.ts
+++ b/packages/opencode/src/kilocode/cli/lazy-commands.ts
@@ -19,6 +19,14 @@ export function hasLazyCommandSelection() {
return selected
}
+export function resetLazyCommandSelection() {
+ selected = false
+}
+
+export function markLazyCommandSelection() {
+ selected = true
+}
+
export function lazy(input: {
command: string | readonly string[]
aliases?: string | readonly string[]
@@ -29,9 +37,11 @@ export function lazy(input: {
const load = () => (state.task ??= input.load())
if (completion) {
tasks.push(
- load().then((command) => {
- state.command = command
- }),
+ load()
+ .then((command) => {
+ state.command = command
+ })
+ .catch(() => undefined),
)
}
return {
@@ -39,7 +49,7 @@ export function lazy(input: {
aliases: input.aliases,
describe: input.describe,
builder: ((args: Argv) => {
- selected = true
+ markLazyCommandSelection()
if (state.command) return build(state.command, args)
return load().then((command) => build(command, args))
}) as never,
diff --git a/packages/opencode/src/kilocode/help-command.ts b/packages/opencode/src/kilocode/help-command.ts
index ecb5f90f14d..fa92607751a 100644
--- a/packages/opencode/src/kilocode/help-command.ts
+++ b/packages/opencode/src/kilocode/help-command.ts
@@ -1,13 +1,15 @@
import { cmd } from "../cli/cmd/cmd"
import { generateHelp } from "./help"
import type { Argv } from "yargs"
+import { markLazyCommandSelection } from "@/kilocode/cli/lazy-commands"
export function createHelpCommand(root?: () => Argv) {
return cmd({
command: "help [command]",
describe: "show full CLI reference",
- builder: (yargs) =>
- yargs
+ builder: (yargs) => {
+ markLazyCommandSelection()
+ return yargs
.positional("command", {
describe: "command to show help for",
type: "string",
@@ -22,7 +24,8 @@ export function createHelpCommand(root?: () => Argv) {
type: "string",
choices: ["md", "text"] as const,
default: "md" as const,
- }),
+ })
+ },
async handler(args) {
if (!args.command && !args.all) {
if (root) {
diff --git a/packages/opencode/src/kilocode/server/httpapi/handlers/kilocode.ts b/packages/opencode/src/kilocode/server/httpapi/handlers/kilocode.ts
index 10fa39f21d6..19633573202 100644
--- a/packages/opencode/src/kilocode/server/httpapi/handlers/kilocode.ts
+++ b/packages/opencode/src/kilocode/server/httpapi/handlers/kilocode.ts
@@ -25,6 +25,7 @@ import { Skill } from "@/skill"
import { BackgroundJob } from "@/background/job"
import { SessionRunState } from "@/session/run-state"
import { SessionID } from "@/session/schema"
+import { RuntimeFlags } from "@/effect/runtime-flags"
import {
AgentManagerRejectPayload,
AgentManagerReplyPayload,
@@ -48,6 +49,7 @@ export const kilocodeHandlers = HttpApiBuilder.group(InstanceHttpApi, "kilocode"
const notebook = yield* Notebook.Service
const background = yield* BackgroundJob.Service
const runState = yield* SessionRunState.Service
+ const flags = yield* RuntimeFlags.Service
const locations = yield* LocationServiceMap.Service
// Location-scoped services, keyed by the request's directory and workspace.
@@ -237,6 +239,7 @@ export const kilocodeHandlers = HttpApiBuilder.group(InstanceHttpApi, "kilocode"
const backgroundJobPromote = Effect.fn("KilocodeHttpApi.backgroundJobPromote")(function* (ctx: {
params: { jobID: string }
}) {
+ if (!flags.experimentalBackgroundSubagents) return false
const job = yield* background.get(ctx.params.jobID)
if (!job) return yield* new HttpApiError.NotFound({})
const promoted = yield* background.promote(ctx.params.jobID)
diff --git a/packages/opencode/src/kilocode/tool/agent-manager-models.ts b/packages/opencode/src/kilocode/tool/agent-manager-models.ts
index 613489a1c89..d70d697db16 100644
--- a/packages/opencode/src/kilocode/tool/agent-manager-models.ts
+++ b/packages/opencode/src/kilocode/tool/agent-manager-models.ts
@@ -89,7 +89,7 @@ export const AgentManagerModelsTool = Tool.define<
offset,
total: matches.length,
nextOffset,
- hint: "Pass a model name (or one of its providers/IDs) as the agent_manager task `model`. Agent Manager picks the provider, preferring the one used by the current turn.",
+ hint: "Pass a model name (or one of its providers/IDs) as the agent_manager task `model`. Add the task `provider` to force one of the listed providers; otherwise Agent Manager prefers the provider used by the current turn.",
}),
metadata: { count: models.length, total: matches.length },
}
diff --git a/packages/opencode/src/kilocode/tool/agent-manager-models.txt b/packages/opencode/src/kilocode/tool/agent-manager-models.txt
index 8c73797bde6..8571d6045d9 100644
--- a/packages/opencode/src/kilocode/tool/agent-manager-models.txt
+++ b/packages/opencode/src/kilocode/tool/agent-manager-models.txt
@@ -1,5 +1,5 @@
Search the models available to Agent Manager sessions and inspect their reasoning variants.
-Use this tool before `agent_manager` when you need to pick a model or reasoning effort. Results are grouped by model, not by provider, because you select a model and Agent Manager chooses the provider for you. With no arguments it returns the top available models (capped at 20); pass `query` to search by model name or ID, and `offset` to page further. The query is matched leniently: it is case-insensitive, ignores spacing and punctuation, and is order-independent, so `opus claude`, `glm5.2`, and `gpt5` all work. You do not need the exact model name.
+Use this tool before `agent_manager` when you need to pick a model or reasoning effort. Results are grouped by model, not by provider, and list every provider that offers each model so you can constrain the provider when needed. With no arguments it returns the top available models (capped at 20); pass `query` to search by model name or ID, and `offset` to page further. The query is matched leniently: it is case-insensitive, ignores spacing and punctuation, and is order-independent, so `opus claude`, `glm5.2`, and `gpt5` all work. You do not need the exact model name.
-Each result includes the model name, its reasoning variant names, and the providers that offer it (informational only). Pass the model name back as the `agent_manager` task `model`. Agent Manager resolves the provider automatically, preferring the provider used by the current turn and falling back to the Kilo Gateway, so you do not need to choose a provider yourself.
+Each result includes the model name, its reasoning variant names, and the providers that offer it. Pass the model name back as the `agent_manager` task `model`; pass one of the listed provider IDs as the task `provider` when the provider must be explicit. When `provider` is omitted, Agent Manager resolves it automatically, preferring the one used by the current turn and falling back to the Kilo Gateway.
diff --git a/packages/opencode/src/kilocode/tool/agent-manager.ts b/packages/opencode/src/kilocode/tool/agent-manager.ts
index 8166f8302ee..630f08200f8 100644
--- a/packages/opencode/src/kilocode/tool/agent-manager.ts
+++ b/packages/opencode/src/kilocode/tool/agent-manager.ts
@@ -28,6 +28,10 @@ const Task = Schema.Struct({
description:
"Optional model override from agent_manager_models (e.g. 'Claude Opus 4.1'). Omit unless the user requests a different model. Agent Manager otherwise inherits the current turn's model. A qualified provider/model ID is also accepted to force a specific provider.",
}),
+ provider: Schema.optional(Schema.NullOr(Schema.String)).annotate({
+ description:
+ "Optional provider ID to constrain model resolution (e.g. 'anthropic'). Use with model to select a model from a specific provider; omit to use the current-turn provider preference.",
+ }),
variant: Schema.optional(Schema.NullOr(Schema.String)).annotate({
description:
"Optional reasoning variant override from agent_manager_models. Specify it without model to override the inherited model's variant. Omit both to inherit the current turn's selection.",
@@ -41,6 +45,9 @@ const Task = Schema.Struct({
Schema.makeFilter((task) =>
task.model?.trim() && !task.prompt?.trim() ? "A task model requires an initial prompt" : undefined,
),
+ Schema.makeFilter((task) =>
+ task.provider?.trim() && !task.model?.trim() ? "A task provider requires a model" : undefined,
+ ),
Schema.makeFilter((task) =>
task.variant?.trim() && !task.prompt?.trim() ? "A task variant requires an initial prompt" : undefined,
),
@@ -245,6 +252,7 @@ function select(
...(task.branchName != null ? { branchName: task.branchName } : {}),
}
const value = task.model?.trim()
+ const provider = task.provider?.trim()
const variant = task.variant?.trim()
if (!value) {
if (!variant) {
@@ -271,12 +279,21 @@ function select(
return { task: { ...base, model: source.model, variant } }
}
- const { pool, names } = lookup(all, value)
+ const scope = provider ? all.filter((item) => item.providerID === provider) : all
+ if (provider && scope.length === 0) {
+ return {
+ error: `Task ${index + 1} provider is not available for model selection: ${provider}. Requested model: ${value}.`,
+ }
+ }
+
+ const { pool, names } = lookup(scope, value)
if (pool.length === 0) {
- const close = suggest(all, value)
+ const close = suggest(scope, value)
const hint = close.length ? ` Closest matches: ${close.join(", ")}.` : ""
return {
- error: `Task ${index + 1} model is not available: ${value}.${hint} Use agent_manager_models to search models.`,
+ error: provider
+ ? `Task ${index + 1} model is not available from provider "${provider}": ${value}.${hint} Use agent_manager_models to search models.`
+ : `Task ${index + 1} model is not available: ${value}.${hint} Use agent_manager_models to search models.`,
}
}
if (names.length > 1) {
@@ -479,8 +496,9 @@ export const AgentManagerTool = Tool.define<
...(msg.model.variant ? { variant: msg.model.variant } : {}),
}
: undefined
- const need = params.tasks.some((task) => task.model?.trim() || task.variant?.trim())
- const all = need ? candidates(yield* provider.list()) : []
+ const need = params.tasks.some((task) => task.model?.trim() || task.provider?.trim() || task.variant?.trim())
+ const providers = need ? yield* provider.list() : undefined
+ const all = providers ? candidates(providers) : []
const preferred = need
? (source?.model.providerID ??
(yield* provider.defaultModel().pipe(
diff --git a/packages/opencode/src/kilocode/tool/agent-manager.txt b/packages/opencode/src/kilocode/tool/agent-manager.txt
index 1d081b91dfb..4dbb410b840 100644
--- a/packages/opencode/src/kilocode/tool/agent-manager.txt
+++ b/packages/opencode/src/kilocode/tool/agent-manager.txt
@@ -14,7 +14,7 @@ Modes:
- `worktree`: creates a new Agent Manager git worktree for each task, like the New Worktree dialog.
- `local`: creates Agent Manager sessions in the current workspace directory without git worktree isolation.
-Each task may provide a prompt, a short display name, a branch name, a `model`, and a model-specific reasoning `variant`. By default, omit `model` and `variant`: prompted tasks inherit the exact model and reasoning variant used by the current turn. Only specify `model` when the user explicitly asks to use or compare a different model, and only specify `variant` when the user explicitly asks for a different reasoning variant. A variant can be specified without a model to override the inherited model's variant. Never choose a different model merely because work is being fanned out. Specify an override `model` by name (e.g. "Claude Opus 4.1"); the name is matched leniently (case-insensitive, punctuation/spacing-insensitive, order-independent), so an approximate name like "opus 4.1" works and you do not need the exact name. Agent Manager picks the provider for you, preferring the provider used by the current turn and falling back to the Kilo Gateway. A qualified `provider/model` ID is also accepted to force a specific provider. If the name is ambiguous and matches several different models, the tool returns the candidates so you can choose. A model or variant selection requires an initial prompt so the session can persist that selection. Keep display names short because Agent Manager cards are narrow. Branch names are sanitized before worktree creation. Use `agent_manager_models` to search available models and variants on demand instead of guessing or loading the full model catalog. Prepared sessions without an initial prompt use the normal defaults. The agent and base branch settings always use the normal defaults.
+Each task may provide a prompt, a short display name, a branch name, a `model`, an optional `provider`, and a model-specific reasoning `variant`. By default, omit `model`, `provider`, and `variant`: prompted tasks inherit the exact model and reasoning variant used by the current turn. Only specify `model` when the user explicitly asks to use or compare a different model, and only specify `variant` when the user explicitly asks for a different reasoning variant. A variant can be specified without a model to override the inherited model's variant. Specify `provider` with `model` to force a model-name match to one provider ID. Never choose a different model merely because work is being fanned out. Specify an override `model` by name (e.g. "Claude Opus 4.1"); the name is matched leniently (case-insensitive, punctuation/spacing-insensitive, order-independent), so an approximate name like "opus 4.1" works and you do not need the exact name. Agent Manager picks the provider for you, preferring the provider used by the current turn and falling back to the Kilo Gateway. A qualified `provider/model` ID is also accepted to force a specific provider. If the name is ambiguous and matches several different models, the tool returns the candidates so you can choose. A model or variant selection requires an initial prompt so the session can persist that selection. Keep display names short because Agent Manager cards are narrow. Branch names are sanitized before worktree creation. Use `agent_manager_models` to search available models and variants on demand instead of guessing or loading the full model catalog. Prepared sessions without an initial prompt use the normal defaults. The agent and base branch settings always use the normal defaults.
By default, multiple tasks are started as independent Agent Manager sessions. Set `versions` to true only when all tasks are alternate versions of the same work that should be compared together. Versioned worktrees are grouped in Agent Manager and branch names may receive version suffixes.
diff --git a/packages/opencode/src/server/routes/instance/httpapi/handlers/file.ts b/packages/opencode/src/server/routes/instance/httpapi/handlers/file.ts
index 259a1fedc93..28b545944b4 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/handlers/file.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/handlers/file.ts
@@ -1,4 +1,5 @@
import * as InstanceState from "@/effect/instance-state"
+import { WorkspaceRef } from "@/effect/instance-ref" // kilocode_change - preserve the shared location key shape
import { FileSystem } from "@opencode-ai/core/filesystem"
import { LocationServiceMap } from "@opencode-ai/core/location-services" // kilocode_change - reuse the server location map
import { Ripgrep } from "@opencode-ai/core/ripgrep"
@@ -17,11 +18,19 @@ export const fileHandlers = HttpApiBuilder.group(InstanceHttpApi, "file", (handl
const locations = yield* LocationServiceMap.Service
const filesystem = Effect.fnUntraced(function* (effect: Effect.Effect) {
+ // kilocode_change start - preserve the shared location key shape
+ const workspaceID = yield* WorkspaceRef
return yield* effect.pipe(
Effect.provide(
- locations.get(Location.Ref.make({ directory: AbsolutePath.make((yield* InstanceState.context).directory) })),
+ locations.get(
+ Location.Ref.make({
+ directory: AbsolutePath.make((yield* InstanceState.context).directory),
+ workspaceID,
+ }),
+ ),
),
)
+ // kilocode_change end
})
const findText = Effect.fn("FileHttpApi.findText")(function* (ctx: { query: { pattern: string } }) {
diff --git a/packages/opencode/test/kilocode/agent-manager-tool.test.ts b/packages/opencode/test/kilocode/agent-manager-tool.test.ts
index 69b33d42384..411d2d173f3 100644
--- a/packages/opencode/test/kilocode/agent-manager-tool.test.ts
+++ b/packages/opencode/test/kilocode/agent-manager-tool.test.ts
@@ -229,6 +229,14 @@ describe("agent_manager tool", () => {
expect(Schema.is(Params)({ action: "stop", sessionID: "invalid" })).toBe(false)
})
+ test("validates provider selectors at the task level", () => {
+ expect(Schema.is(Params)({ mode: "local", tasks: [{ prompt: "Fix", model: "Shared", provider: "kilo" }] })).toBe(
+ true,
+ )
+ expect(Schema.is(Params)({ mode: "local", tasks: [{ prompt: "Fix", provider: "kilo" }] })).toBe(false)
+ expect(Schema.is(Params)({ mode: "local", tasks: [{ prompt: "Fix", model: "Shared", provider: 42 }] })).toBe(false)
+ })
+
// Regression for #13029: the OpenAI Responses API forces a value for every
// advertised property. With action nullable the model can decline it and the
// start request survives; with a populated action the action wins instead.
@@ -673,6 +681,12 @@ describe("agent_manager tool", () => {
expect(task?.variant).toBe("low")
})
+ test("uses an explicitly selected provider for a shared model name", async () => {
+ const task = await publish(runtime, { prompt: "Fix", model: " Shared ", provider: " kilo " })
+ expect(String(task?.model?.providerID)).toBe("kilo")
+ expect(String(task?.model?.modelID)).toBe("kilo/shared")
+ })
+
test("uses the provider of a different default model when that is the user's choice", async () => {
const rt = makeRuntime("kilo")
const task = await publish(rt, { prompt: "Fix", model: "Shared", variant: "low" })
@@ -717,6 +731,43 @@ describe("agent_manager tool", () => {
expect(result.metadata.count).toBe(0)
})
+ test("reports a model unavailable from an explicit provider", async () => {
+ const tool = await init()
+ const calls: unknown[] = []
+
+ const result = await runtime.runPromise(
+ provideTmpdirInstance(() =>
+ tool.execute(
+ { mode: "local", tasks: [{ prompt: "Fix", model: "Reasoning Model", provider: "kilo" }] },
+ { ...ctx, ask: (input: unknown) => Effect.sync(() => calls.push(input)) },
+ ),
+ ).pipe(Effect.scoped),
+ )
+
+ expect(calls).toEqual([])
+ expect(result.output).toContain('model is not available from provider "kilo": Reasoning Model')
+ expect(result.metadata.count).toBe(0)
+ })
+
+ test("rejects an unknown provider without touching inherited object properties", async () => {
+ const tool = await init()
+ const calls: unknown[] = []
+
+ const result = await runtime.runPromise(
+ provideTmpdirInstance(() =>
+ tool.execute(
+ { mode: "local", tasks: [{ prompt: "Fix", model: "Shared", provider: "__proto__" }] },
+ { ...ctx, ask: (input: unknown) => Effect.sync(() => calls.push(input)) },
+ ),
+ ).pipe(Effect.scoped),
+ )
+
+ expect(calls).toEqual([])
+ expect(result.output).toContain("provider is not available for model selection: __proto__")
+ expect(result.output).toContain("Requested model: Shared")
+ expect(result.metadata.count).toBe(0)
+ })
+
test("echoes how each named model resolved", async () => {
const tool = await init()
const result = await runtime.runPromise(
diff --git a/packages/opencode/test/kilocode/cli/bootstrap-runtime.test.ts b/packages/opencode/test/kilocode/cli/bootstrap-runtime.test.ts
index 4ac32559b59..7f580e3b6fe 100644
--- a/packages/opencode/test/kilocode/cli/bootstrap-runtime.test.ts
+++ b/packages/opencode/test/kilocode/cli/bootstrap-runtime.test.ts
@@ -1,7 +1,13 @@
-import { describe, expect, test } from "bun:test"
+import { afterEach, beforeEach, describe, expect, test } from "bun:test"
import { KiloCli } from "../../../src/kilocode/cli/setup"
+import { createHelpCommand } from "../../../src/kilocode/help-command"
+import { resetLazyCommandSelection } from "../../../src/kilocode/cli/lazy-commands"
+import yargs from "yargs"
describe("CLI bootstrap runtime selection", () => {
+ beforeEach(resetLazyCommandSelection)
+ afterEach(resetLazyCommandSelection)
+
test("uses the narrow runtime for worker-backed TUI launches", () => {
expect(KiloCli.workerTui({ _: [] })).toBe(true)
expect(KiloCli.workerTui({ _: ["./project"] })).toBe(true)
@@ -11,4 +17,11 @@ describe("CLI bootstrap runtime selection", () => {
expect(KiloCli.workerTui({ _: [], mini: true })).toBe(false)
expect(KiloCli.workerTui({ _: [], worktree: "feature" })).toBe(false)
})
+
+ test("keeps full bootstrap when the eager help command is selected", () => {
+ const command = createHelpCommand()
+ if (typeof command.builder !== "function") throw new Error("help builder is not a function")
+ command.builder(yargs([]))
+ expect(KiloCli.workerTui({ _: [] })).toBe(false)
+ })
})
diff --git a/packages/opencode/test/kilocode/shared-location-map-key.test.ts b/packages/opencode/test/kilocode/shared-location-map-key.test.ts
new file mode 100644
index 00000000000..3fa931e7798
--- /dev/null
+++ b/packages/opencode/test/kilocode/shared-location-map-key.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, test } from "bun:test"
+import { Equal, Hash } from "effect"
+import { readFileSync } from "node:fs"
+import { Location } from "@opencode-ai/core/location"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+
+const opencode = new URL("../../src/", import.meta.url)
+const server = new URL("../../../server/src/", import.meta.url)
+
+function source(root: URL, path: string) {
+ return readFileSync(new URL(path, root), "utf8")
+}
+
+describe("shared location service map keys", () => {
+ test("all location route consumers include workspaceID in their cache key", () => {
+ const consumers = [
+ [opencode, "server/routes/instance/httpapi/handlers/file.ts"],
+ [opencode, "server/routes/instance/httpapi/handlers/pty.ts"],
+ [server, "middleware/session-location.ts"],
+ ] as const
+
+ for (const [root, path] of consumers) {
+ expect(source(root, path), path).toMatch(/Location\.Ref\.make\(\{[^}]*workspaceID/)
+ }
+ })
+
+ test("omitted and explicit undefined workspace IDs are distinct keys", () => {
+ const directory = AbsolutePath.make("/workspace")
+ const omitted = Location.Ref.make({ directory })
+ const explicit = Location.Ref.make({ directory, workspaceID: undefined })
+
+ expect(Object.hasOwn(omitted, "workspaceID")).toBe(false)
+ expect(Object.hasOwn(explicit, "workspaceID")).toBe(true)
+ expect(Equal.equals(omitted, explicit)).toBe(false)
+ expect(Hash.hash(omitted)).not.toBe(Hash.hash(explicit))
+ })
+})
diff --git a/packages/opencode/test/server/session-actions.test.ts b/packages/opencode/test/server/session-actions.test.ts
index ee318274b3d..306c3cf5c3b 100644
--- a/packages/opencode/test/server/session-actions.test.ts
+++ b/packages/opencode/test/server/session-actions.test.ts
@@ -1,6 +1,6 @@
import { afterEach, describe, expect, mock } from "bun:test"
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
-import { Effect, Fiber, Layer } from "effect" // kilocode_change
+import { ConfigProvider, Effect, Fiber, Layer } from "effect" // kilocode_change
import { BackgroundJob } from "@/background/job" // kilocode_change
import { Session as SessionNs } from "@/session/session"
import { disposeAllInstances, TestInstance } from "../fixture/fixture"
@@ -9,7 +9,23 @@ import { httpApiLayer, requestInDirectory } from "./httpapi-layer"
// kilocode_change start - provide the background-job service for promotion coverage
const it = testEffect(
- Layer.mergeAll(LayerNode.compile(SessionNs.node), LayerNode.compile(BackgroundJob.node), httpApiLayer), // kilocode_change
+ Layer.mergeAll(
+ LayerNode.compile(SessionNs.node),
+ LayerNode.compile(BackgroundJob.node),
+ httpApiLayer,
+ ), // kilocode_change
+)
+const disabled = testEffect(
+ Layer.mergeAll(LayerNode.compile(SessionNs.node), LayerNode.compile(BackgroundJob.node), httpApiLayer).pipe(
+ Layer.provide(
+ ConfigProvider.layer(
+ ConfigProvider.fromUnknown({
+ KILO_EXPERIMENTAL_BACKGROUND_SUBAGENTS: "false",
+ KILO_EXPERIMENTAL_DISABLE_FILEWATCHER: "true",
+ }),
+ ),
+ ),
+ ),
)
// kilocode_change end
@@ -127,6 +143,26 @@ describe("session action routes", () => {
{ git: true },
)
+ disabled.instance(
+ "background job promotion is disabled when the flag is off",
+ () =>
+ Effect.gen(function* () {
+ const test = yield* TestInstance
+ const jobs = yield* BackgroundJob.Service
+ const job = yield* jobs.start({ type: "task", metadata: { parentSessionId: "ses_parent" }, run: Effect.never })
+
+ const res = yield* requestInDirectory(`/kilocode/background-jobs/${job.id}/promote`, test.directory, {
+ method: "POST",
+ })
+
+ expect(res.status).toBe(200)
+ expect(yield* res.json).toBe(false)
+ expect((yield* jobs.get(job.id))?.metadata?.background).toBeUndefined()
+ yield* jobs.cancel(job.id)
+ }),
+ { git: true },
+ )
+
// kilocode_change start - verify HTTP promotion of a running task
it.instance(
"experimental background route backgrounds a synchronous subagent",