diff --git a/.changeset/preserve-question-typing-focus.md b/.changeset/preserve-question-typing-focus.md new file mode 100644 index 0000000000..656023986d --- /dev/null +++ b/.changeset/preserve-question-typing-focus.md @@ -0,0 +1,5 @@ +--- +"kilo-code": patch +--- + +Keep focus in active text fields when questions appear or refresh. diff --git a/.changeset/quiet-compaction-model.md b/.changeset/quiet-compaction-model.md new file mode 100644 index 0000000000..56efcb1eab --- /dev/null +++ b/.changeset/quiet-compaction-model.md @@ -0,0 +1,5 @@ +--- +"kilo-code": minor +--- + +Choose a separate model for conversation compaction in Context settings. diff --git a/.changeset/quiet-parallel-agents.md b/.changeset/quiet-parallel-agents.md new file mode 100644 index 0000000000..09665a265c --- /dev/null +++ b/.changeset/quiet-parallel-agents.md @@ -0,0 +1,7 @@ +--- +"kilo-code": patch +"@kilocode/kilo-ui": patch +"@opencode-ai/ui": patch +--- + +Stop offscreen loading animations while preserving their original appearance, and release obsolete transcript pages from memory. diff --git a/.changeset/restore-past-session-mentions.md b/.changeset/restore-past-session-mentions.md new file mode 100644 index 0000000000..7b86c50132 --- /dev/null +++ b/.changeset/restore-past-session-mentions.md @@ -0,0 +1,6 @@ +--- +"kilo-code": patch +"@kilocode/cli": patch +--- + +Search the latest 5,000 chats across the worktree family and display the best 50 matches in the sidebar and Agent Manager. Skip inaccessible folders from unrelated projects when finding past chats. diff --git a/.changeset/session-tab-attention.md b/.changeset/session-tab-attention.md new file mode 100644 index 0000000000..2a0d3b3225 --- /dev/null +++ b/.changeset/session-tab-attention.md @@ -0,0 +1,5 @@ +--- +"kilo-code": patch +--- + +Show consistent running, completion, and input-required indicators across session tabs and Agent Manager worktrees. diff --git a/.changeset/steady-compaction-turns.md b/.changeset/steady-compaction-turns.md new file mode 100644 index 0000000000..ecf12b246e --- /dev/null +++ b/.changeset/steady-compaction-turns.md @@ -0,0 +1,5 @@ +--- +"@kilocode/cli": patch +--- + +Resume pending requests after automatic compaction without replaying requests that already completed. diff --git a/AGENTS.md b/AGENTS.md index 45963d7b0a..3e2954cb77 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -93,6 +93,7 @@ Examples: `fix(tui): simplify thinking toggle styling`, `docs: update contributi - Prefer single word variable names where possible - Use Bun APIs when possible, like `Bun.file()` - Rely on type inference when possible; avoid explicit type annotations or interfaces unless necessary for exports or clarity +- Prefer `Promise.withResolvers()` for deferreds when runtime/types support it; allow callback/event executors, not async executors or redundant Promise wrapping. ### Avoid let statements diff --git a/packages/core/src/kilocode/zero-id.ts b/packages/core/src/kilocode/zero-id.ts new file mode 100644 index 0000000000..b182d40724 --- /dev/null +++ b/packages/core/src/kilocode/zero-id.ts @@ -0,0 +1,5 @@ +export function zeroID(...parts: (string | number | boolean)[]) { + if (parts.length === 2) return `${parts[0]}\0${parts[1]}` + if (parts.length === 3) return `${parts[0]}\0${parts[1]}\0${parts[2]}` + return parts.join("\0") +} diff --git a/packages/core/test/kilocode/zero-id.test.ts b/packages/core/test/kilocode/zero-id.test.ts new file mode 100644 index 0000000000..9790f1e66e --- /dev/null +++ b/packages/core/test/kilocode/zero-id.test.ts @@ -0,0 +1,58 @@ +import { describe, expect, expectTypeOf, test } from "bun:test" +import { zeroID } from "@opencode-ai/core/kilocode/zero-id" + +describe("zeroID", () => { + test("accepts only string, number, and boolean parts", () => { + expectTypeOf>().toEqualTypeOf<(string | number | boolean)[]>() + expectTypeOf>().toEqualTypeOf() + }) + + test("matches template literals for short composite keys", () => { + const values = ["", "a", "a\0b", "路径", "null", "undefined", 0, -0, -1, 0.5, NaN, Infinity, -Infinity, true, false] + for (const first of values) { + for (const second of values) { + expect(zeroID(first, second)).toBe(`${first}\0${second}`) + for (const third of values) { + expect(zeroID(first, second, third)).toBe(`${first}\0${second}\0${third}`) + } + } + } + }) + + test("matches array joins across arities and preserves empty parts", () => { + const cases: Parameters[] = [ + [], + [""], + [false], + [0], + ["", ""], + ["", "", ""], + ["", "", "", ""], + ["prefix", "", 0, false, "suffix"], + ["/repo", "", "ancestor", "file.ts", true, "modified", 3, 0, false, ""], + ["\0", "a\0b", "", "路径", NaN, -0, -Infinity, true, false], + ] + for (const parts of cases) { + const expected = parts.join("\0") + expect(zeroID(...parts)).toBe(expected) + expect(Buffer.from(zeroID(...parts))).toEqual(Buffer.from(expected)) + } + }) + + test("preserves namespace prefixes, suffixes, and nested keys", () => { + expect(zeroID("project", "")).toBe("project\0") + expect(zeroID("", "file.ts")).toBe("\0file.ts") + expect(zeroID("error", "message")).toBe("error\0message") + expect(zeroID(zeroID("project", "session"), "file.ts")).toBe("project\0session\0file.ts") + expect(zeroID("ab", "c")).not.toBe(zeroID("a", "bc")) + expect(zeroID("project", "session").startsWith(zeroID("project", ""))).toBe(true) + expect(zeroID("project-other", "session").startsWith(zeroID("project", ""))).toBe(false) + }) + + test("supports explicit caller-specific nullish coercion", () => { + for (const value of [null, undefined]) { + expect(zeroID("scope", String(value))).toBe(`scope\0${value}`) + expect(zeroID("scope", value ?? "")).toBe(["scope", value].join("\0")) + } + }) +}) diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/session-tab-activity-states-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/session-tab-activity-states-chromium-linux.png new file mode 100644 index 0000000000..501f015c53 --- /dev/null +++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/session-tab-activity-states-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d55567442d6b3d627e64b583e7d4f49a522685efd8455013b17c4c4f0a84d84 +size 8753 diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/worktree-activity-states-active-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/worktree-activity-states-active-chromium-linux.png new file mode 100644 index 0000000000..fcee3b4a0b --- /dev/null +++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/worktree-activity-states-active-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d4601147436962bb2fb3db3eede146e2f83a6d88d50f5d7dce016c34817062d +size 18551 diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/worktree-activity-states-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/worktree-activity-states-chromium-linux.png new file mode 100644 index 0000000000..60a76c6029 --- /dev/null +++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/worktree-activity-states-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f86a360b9c84e63f8614898edf4fd64e0ce41a570e306326f80868ce99483720 +size 18265 diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/activity-states-1280-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/activity-states-1280-chromium-linux.png new file mode 100644 index 0000000000..1596eedfdd --- /dev/null +++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/activity-states-1280-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c071338a92316478623abbe23cdb262c366917266511a599f405ccdd7e399225 +size 5710 diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/activity-states-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/activity-states-chromium-linux.png new file mode 100644 index 0000000000..cf734a5f66 --- /dev/null +++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/activity-states-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e275e0ec4ce304fc29c71eaac017872a6828d52fa73a504acce4b779fa389228 +size 7407 diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/multiple-sessions-200-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/multiple-sessions-200-chromium-linux.png new file mode 100644 index 0000000000..937d23edec --- /dev/null +++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/multiple-sessions-200-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f924b317c2eafaf5112229cc31404591d7526a7e0fba8c1d46cd97597c3a4392 +size 1778 diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/multiple-sessions-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/multiple-sessions-chromium-linux.png new file mode 100644 index 0000000000..484a1eb1d7 --- /dev/null +++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/multiple-sessions-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:268efbc7a6121b9fa3c2c843308b70f41a2235d2b9447e61ef6ac5c38b23c5b5 +size 3729 diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/switcher-open-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/switcher-open-chromium-linux.png index 4bb775859c..c41e9aa40d 100644 --- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/switcher-open-chromium-linux.png +++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/session-tabs/switcher-open-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:273c76976df0e83fa404ae2af2d561f8c38458e3ef1b32f4f5b1990a5906a195 -size 14239 +oid sha256:f62edc4cf5786ca40fececbec0ae08e20096f0bc2bc08258de42c8a524a2366e +size 20730 diff --git a/packages/kilo-ui/src/components/spinner.css b/packages/kilo-ui/src/components/spinner.css new file mode 100644 index 0000000000..d1bd402f55 --- /dev/null +++ b/packages/kilo-ui/src/components/spinner.css @@ -0,0 +1,5 @@ +@media (prefers-reduced-motion: reduce) { + [data-component="spinner"] > rect { + animation: none !important; + } +} diff --git a/packages/kilo-ui/src/stories/spinner.stories.tsx b/packages/kilo-ui/src/stories/spinner.stories.tsx index 11b8ba7f2b..edec1d094c 100644 --- a/packages/kilo-ui/src/stories/spinner.stories.tsx +++ b/packages/kilo-ui/src/stories/spinner.stories.tsx @@ -1,6 +1,6 @@ /** @jsxImportSource solid-js */ import type { Meta, StoryObj } from "storybook-solidjs-vite" -import { Spinner } from "@opencode-ai/ui/spinner" +import { Spinner } from "@kilocode/kilo-ui/spinner" const meta: Meta = { title: "Components/Spinner", @@ -20,6 +20,16 @@ export const Large: Story = { render: () => , } +export const Parallel: Story = { + render: () => ( +
+ {Array.from({ length: 24 }, () => ( + + ))} +
+ ), +} + export const Colored: Story = { render: () => , } diff --git a/packages/kilo-ui/src/styles/index.css b/packages/kilo-ui/src/styles/index.css index adc0af0f53..37b1f47029 100644 --- a/packages/kilo-ui/src/styles/index.css +++ b/packages/kilo-ui/src/styles/index.css @@ -35,6 +35,7 @@ @import "../components/select.css"; @import "../components/session.css"; @import "../components/settings-sidebar.css"; +@import "../components/spinner.css"; @import "../components/status-indicator.css"; @import "../components/switch.css"; @import "../components/tabs.css"; diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts index 520c484b70..18a1572753 100644 --- a/packages/kilo-vscode/src/KiloProvider.ts +++ b/packages/kilo-vscode/src/KiloProvider.ts @@ -142,6 +142,7 @@ import { } from "./kilo-provider/handlers/question" import { fetchAndSendPendingSuggestions } from "./kilo-provider/handlers/suggestion" import { nativeTitle } from "./kilo-provider/native-tab-title" +import { isActivity, type Activity } from "../webview-ui/src/utils/session-activity" import { parseReview, reviewMetadata, type ReviewMessageData } from "./shared/review-comments" import { completesWithoutStatus } from "./kilo-provider/command-completion" import { KiloProviderMemory } from "./kilo-provider/memory" @@ -392,6 +393,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper private readonly refreshes = new Map() private readonly anacondaDesktop = new AnacondaDesktopBridge() private sessionStatusMap = new Map() // Latest status used for destructive config warnings. + private activity: Activity = "idle" + private caption: string | undefined private readonly epochs = new Map>() private readonly requests = new Map() private epoch = 0 @@ -509,7 +512,15 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper if (id) this.refreshes.set(id, (this.refreshes.get(id) ?? 0) + 1) } this.currentSession = session - this.opts.tabTitle?.(nativeTitle(session)) + this.updateTitle() + } + + private updateTitle(): void { + if (!this.opts.tabTitle) return + const title = nativeTitle(this.currentSession, this.activity, this.opts.tabLabel) + if (this.caption === title) return + this.caption = title + this.opts.tabTitle(title) } private checkpoint(sid: string, run: () => Promise): void { @@ -1037,6 +1048,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper exportTranscript: (sessionID) => this.handleExportSessionTranscript(sessionID), copy: (text) => vscode.env.clipboard.writeText(text), openSessions: (ids) => this.trackOpenSessions(ids), + activity: (state) => { + if (!isActivity(state)) return + this.activity = state + this.updateTitle() + }, speechToTextModels: () => this.fetchAndSendSpeechToTextModels(), modelUsage: (msg) => handleModelUsageMessage(msg, this.extensionContext, (value) => this.postMessage(value)), backgroundJobs: (sessionID, requestID) => this.fetchAndSendBackgroundJobs(sessionID, requestID), diff --git a/packages/kilo-vscode/src/SubAgentViewerProvider.ts b/packages/kilo-vscode/src/SubAgentViewerProvider.ts index a11a98bf1a..046d19325f 100644 --- a/packages/kilo-vscode/src/SubAgentViewerProvider.ts +++ b/packages/kilo-vscode/src/SubAgentViewerProvider.ts @@ -42,7 +42,13 @@ export class SubAgentViewerProvider implements vscode.Disposable { dark: vscode.Uri.joinPath(this.extensionUri, "assets", "icons", "kilo-dark.svg"), } - const provider = new KiloProvider(this.extensionUri, this.connectionService, this.context, { hideTopBar: true }) + const provider = new KiloProvider(this.extensionUri, this.connectionService, this.context, { + hideTopBar: true, + tabTitle: (title) => { + panel.title = title + }, + tabLabel: label, + }) if (directory) provider.setSessionDirectory(sessionID, directory) // Start accepting this session's SSE events as soon as the panel subscribes. // Reasoning deltas are not persisted until the reasoning part finishes. diff --git a/packages/kilo-vscode/src/agent-manager/local-diff-cache.ts b/packages/kilo-vscode/src/agent-manager/local-diff-cache.ts index 04f7235252..601c119c86 100644 --- a/packages/kilo-vscode/src/agent-manager/local-diff-cache.ts +++ b/packages/kilo-vscode/src/agent-manager/local-diff-cache.ts @@ -1,3 +1,4 @@ +import { zeroID } from "@opencode-ai/core/kilocode/zero-id" import { imageMime } from "../diff/shared/image" import type { Batch, Meta } from "./local-diff-batch" import type { WorktreeDiffEntry } from "./types" @@ -58,7 +59,7 @@ export function createDiffCache(load: Loader) { } const identity = (dir: string, base: string, anc: string, meta: Meta) => - [ + zeroID( dir, base, anc, @@ -69,7 +70,7 @@ export function createDiffCache(load: Loader) { meta.deletions, meta.binary, meta.stamp, - ].join("\0") + ) const cached = (id: string) => { const value = details.get(id) @@ -236,8 +237,8 @@ export function createDiffCache(load: Loader) { } const queued = (id: string, dir: string, base: string, anc: string, meta: Meta, signal?: AbortSignal) => { - const scope = `${dir}\0${base}` - const key = `${scope}\0${anc}` + const scope = zeroID(dir, base) + const key = zeroID(scope, anc) let queue = queues.get(key) if (!queue) { queue = new Map() @@ -270,7 +271,7 @@ export function createDiffCache(load: Loader) { const file = (dir: string, base: string, path: string, signal?: AbortSignal): Promise => { if (signal?.aborted) return Promise.reject(new Error("Diff detail aborted")) - const state = states.get(`${dir}\0${base}`) + const state = states.get(zeroID(dir, base)) if (!state) return load.file(dir, base, path, signal) const meta = state.metas.get(path) if (!meta) return Promise.resolve(null) @@ -292,7 +293,7 @@ export function createDiffCache(load: Loader) { return { summary: async (dir: string, base: string): Promise => { - const id = `${dir}\0${base}` + const id = zeroID(dir, base) const generation = (generations.get(id) ?? 0) + 1 generations.set(id, generation) const result = await load.summary(dir, base) diff --git a/packages/kilo-vscode/src/agent-manager/project/route.ts b/packages/kilo-vscode/src/agent-manager/project/route.ts index 8504e65227..90c93079fe 100644 --- a/packages/kilo-vscode/src/agent-manager/project/route.ts +++ b/packages/kilo-vscode/src/agent-manager/project/route.ts @@ -1,5 +1,7 @@ /** Strict project/resource ownership for Agent Manager multi-project routing. */ +import { zeroID as key } from "@opencode-ai/core/kilocode/zero-id" + export interface ProjectRef { projectId: string } @@ -45,8 +47,6 @@ interface SessionRoute { generation: number } -const key = (projectId: string, id: string) => `${projectId}\0${id}` - export class ProjectRouteService { private readonly projects = new Map() private readonly sessions = new Map() diff --git a/packages/kilo-vscode/src/agent-manager/vscode-host.ts b/packages/kilo-vscode/src/agent-manager/vscode-host.ts index 83b307727c..a015fc45af 100644 --- a/packages/kilo-vscode/src/agent-manager/vscode-host.ts +++ b/packages/kilo-vscode/src/agent-manager/vscode-host.ts @@ -104,6 +104,10 @@ export class VscodeHost implements Host { }) const provider = new KiloProvider(this.extensionUri, this.connectionService, this.context, { + tabTitle: (title) => { + panel.title = title + }, + tabLabel: "Agent Manager", platform: PLATFORM, snapshotInitialization: SNAPSHOT_INITIALIZATION, slimEditMetadata: true, diff --git a/packages/kilo-vscode/src/kilo-provider-utils.ts b/packages/kilo-vscode/src/kilo-provider-utils.ts index c1284b1d48..1aafaacf42 100644 --- a/packages/kilo-vscode/src/kilo-provider-utils.ts +++ b/packages/kilo-vscode/src/kilo-provider-utils.ts @@ -411,7 +411,12 @@ export type WebviewMessage = message: Record } | { type: "sessionStatus"; sessionID: string; status: string; attempt?: number; message?: string; next?: number } - | { type: "sessionTurnClosed"; sessionID: string; reason: "completed" | "error" | "interrupted" | "superseded" } + | { + type: "sessionTurnClosed" + sessionID: string + reason: "completed" | "error" | "interrupted" | "superseded" + parentID?: string + } | { type: "permissionRequest" permission: { @@ -556,6 +561,7 @@ export function mapSSEEventToWebviewMessage(event: StreamEvent, sessionID: strin type: "sessionTurnClosed", sessionID: event.properties.sessionID, reason: event.properties.reason, + ...(event.properties.parentID ? { parentID: event.properties.parentID } : {}), } case "permission.asked": return { diff --git a/packages/kilo-vscode/src/kilo-provider/early-message.ts b/packages/kilo-vscode/src/kilo-provider/early-message.ts index 04c5cdb0a5..8b9454e568 100644 --- a/packages/kilo-vscode/src/kilo-provider/early-message.ts +++ b/packages/kilo-vscode/src/kilo-provider/early-message.ts @@ -19,6 +19,7 @@ type Ctx = { exportTranscript: (sessionID: string) => Promise copy: (text: string) => PromiseLike openSessions: (ids: string[]) => void + activity: (state: unknown) => void speechToTextModels: () => Promise modelUsage: (message: ModelUsageMessage) => Promise backgroundJobs: (sessionID: string, requestID: string) => Promise @@ -56,7 +57,7 @@ async function routeBackgroundMessage( } export async function routeEarlyMessage( - message: { type: string; id?: unknown; text?: unknown }, + message: { type: string; id?: unknown; text?: unknown; state?: unknown }, ctx: Ctx, ): Promise { if (message.type === "copyToClipboard") { @@ -88,6 +89,10 @@ export async function routeEarlyMessage( if (typeof input.sessionID === "string") await ctx.exportTranscript(input.sessionID) return true } + if (message.type === "sessionActivity") { + ctx.activity(message.state) + return true + } if (message.type === "sidebar.openSessions") { const input = message as { sessionIDs?: unknown } const ids = Array.isArray(input.sessionIDs) diff --git a/packages/kilo-vscode/src/kilo-provider/native-tab-title.ts b/packages/kilo-vscode/src/kilo-provider/native-tab-title.ts index 7166b9cd9a..c4b7a75716 100644 --- a/packages/kilo-vscode/src/kilo-provider/native-tab-title.ts +++ b/packages/kilo-vscode/src/kilo-provider/native-tab-title.ts @@ -1,12 +1,21 @@ import type { Session } from "@kilocode/sdk/v2/client" +import type { Activity } from "../../webview-ui/src/utils/session-activity" import { EXTENSION_DISPLAY_NAME } from "../constants" const DEFAULT_SESSION_TITLE = /^(New session|Child session) - \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/ const TITLE_LIMIT = 19 - -export const nativeTitle = (session: Session | null) => { - const title = session?.title?.trim() - if (!title || DEFAULT_SESSION_TITLE.test(title)) return EXTENSION_DISPLAY_NAME - if (title.length <= TITLE_LIMIT) return title - return `${title.slice(0, TITLE_LIMIT)}...` +const icons: Record = { + idle: "", + busy: "◔", + retry: "◔", + waiting: "⚠", + error: "⚠", + done: "✓", +} + +export const nativeTitle = (session: Session | null, state: Activity = "idle", label?: string) => { + const value = session?.title?.trim() + const title = label ?? (!value || DEFAULT_SESSION_TITLE.test(value) ? EXTENSION_DISPLAY_NAME : value) + const text = label || title.length <= TITLE_LIMIT ? title : `${title.slice(0, TITLE_LIMIT)}...` + return icons[state] ? `${icons[state]} ${text}` : text } diff --git a/packages/kilo-vscode/src/kilo-provider/options.ts b/packages/kilo-vscode/src/kilo-provider/options.ts index b9e9994d89..fa3f56c05c 100644 --- a/packages/kilo-vscode/src/kilo-provider/options.ts +++ b/packages/kilo-vscode/src/kilo-provider/options.ts @@ -17,6 +17,7 @@ export type KiloProviderOptions = { snapshotInitialization?: "wait" slimEditMetadata?: boolean tabTitle?: (title: string) => void + tabLabel?: string worktreeDirectories?: () => string[] /** * Dynamic root directory override. When present, it replaces the diff --git a/packages/kilo-vscode/src/kilo-provider/session-search.ts b/packages/kilo-vscode/src/kilo-provider/session-search.ts index e525b5a854..0d0e3d33b2 100644 --- a/packages/kilo-vscode/src/kilo-provider/session-search.ts +++ b/packages/kilo-vscode/src/kilo-provider/session-search.ts @@ -44,7 +44,7 @@ export async function handleSessionSearch(input: Input): Promise { try { const res = await client.experimental.session.list( - { worktrees: true, roots: true, directory: dir, limit: 50 }, + { worktrees: true, roots: true, directory: dir, limit: 5_000 }, { throwOnError: true }, ) const sessions: Item[] = res.data diff --git a/packages/kilo-vscode/src/services/cli-backend/explicit-abort.ts b/packages/kilo-vscode/src/services/cli-backend/explicit-abort.ts index 93987b0db3..23ae7e86a6 100644 --- a/packages/kilo-vscode/src/services/cli-backend/explicit-abort.ts +++ b/packages/kilo-vscode/src/services/cli-backend/explicit-abort.ts @@ -1,4 +1,5 @@ import path from "node:path" +import { zeroID } from "@opencode-ai/core/kilocode/zero-id" import type { SSEPayload } from "./sdk-sse-adapter" type Buffered = { event: SSEPayload; directory?: string } @@ -75,12 +76,12 @@ export class ExplicitAbortState { const key = scope(sessionID, directory) return this.states.has(key) ? [key] : [] } - const prefix = `${sessionID}\0` + const prefix = zeroID(sessionID, "") return [...this.states.keys()].filter((key) => key.startsWith(prefix)) } } function scope(sessionID: string, directory: string) { const dir = path.resolve(directory) - return `${sessionID}\0${process.platform === "win32" ? dir.toLowerCase() : dir}` + return zeroID(sessionID, process.platform === "win32" ? dir.toLowerCase() : dir) } diff --git a/packages/kilo-vscode/tests/fixtures/question-dock-disposal.tsx b/packages/kilo-vscode/tests/fixtures/question-dock-disposal.tsx index b530ab148b..641d44d59d 100644 --- a/packages/kilo-vscode/tests/fixtures/question-dock-disposal.tsx +++ b/packages/kilo-vscode/tests/fixtures/question-dock-disposal.tsx @@ -2,6 +2,8 @@ import { Window } from "happy-dom" import type { QuestionRequest } from "../../webview-ui/src/types/messages" const window = new Window() +const frames: FrameRequestCallback[] = [] +window.document.hasFocus = () => true Object.assign(globalThis, { window, document: window.document, @@ -9,7 +11,7 @@ Object.assign(globalThis, { Element: window.Element, HTMLElement: window.HTMLElement, SVGElement: window.SVGElement, - requestAnimationFrame: () => 0, + requestAnimationFrame: (callback: FrameRequestCallback) => frames.push(callback), }) const { Show, createSignal } = await import("solid-js") @@ -49,7 +51,10 @@ const language = { t: (key: string) => key, } const root = document.createElement("div") -document.body.append(root) +const prompt = document.createElement("textarea") +prompt.className = "prompt-input" +document.body.append(prompt, root) +prompt.focus() const dispose = render( () => ( @@ -61,9 +66,34 @@ const dispose = render( root, ) +const flush = () => { + while (frames.length) frames.shift()?.(0) +} +flush() +if (document.activeElement !== prompt) throw new Error("New question stole composer focus") +setActive(structuredClone(request)) +flush() +if (document.activeElement !== prompt) throw new Error("Repeated question stole composer focus") + +setActive(undefined) +prompt.blur() +setActive(structuredClone(request)) +prompt.focus() +flush() +if (document.activeElement !== prompt) throw new Error("Scheduled question focus interrupted typing") + +setActive(undefined) +prompt.blur() +setActive(structuredClone(request)) +flush() const option = root.querySelector('[data-slot="question-option"]') const submit = root.querySelector('[data-slot="question-footer-actions"] button') if (!option || !submit) throw new Error("Question controls did not render") +if (document.activeElement !== option) throw new Error("Question did not focus when no text field was active") +option.dispatchEvent(new window.KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true })) +if (document.activeElement !== root.querySelector('[data-custom="true"]')) { + throw new Error("Question keyboard navigation did not move to the next option") +} option.click() if (submit.disabled) throw new Error("Submit did not enable after selecting an answer") submit.click() diff --git a/packages/kilo-vscode/tests/fixtures/session-provider-activity.tsx b/packages/kilo-vscode/tests/fixtures/session-provider-activity.tsx new file mode 100644 index 0000000000..dafc7c6b47 --- /dev/null +++ b/packages/kilo-vscode/tests/fixtures/session-provider-activity.tsx @@ -0,0 +1,418 @@ +import assert from "node:assert/strict" +import { Window } from "happy-dom" + +const window = new Window({ url: "http://localhost" }) +const sent: unknown[] = [] +const api = { + postMessage: (message: unknown) => sent.push(message), + getState: () => undefined, + setState: () => {}, +} + +Object.assign(globalThis, { + window, + document: window.document, + navigator: window.navigator, + Node: window.Node, + Element: window.Element, + HTMLElement: window.HTMLElement, + HTMLInputElement: window.HTMLInputElement, + HTMLTextAreaElement: window.HTMLTextAreaElement, + SVGElement: window.SVGElement, + MutationObserver: window.MutationObserver, + IntersectionObserver: window.IntersectionObserver, + ResizeObserver: window.ResizeObserver, + CustomEvent: window.CustomEvent, + Event: window.Event, + MessageEvent: window.MessageEvent, + requestAnimationFrame: window.requestAnimationFrame.bind(window), + cancelAnimationFrame: window.cancelAnimationFrame.bind(window), + getComputedStyle: window.getComputedStyle.bind(window), + acquireVsCodeApi: () => api, +}) + +const { render } = await import("solid-js/web") +const { For } = await import("solid-js") +const { DragDropProvider, SortableProvider } = await import("@thisbeyond/solid-dnd") +const { renderTab } = await import("../../webview-ui/agent-manager/tab-rendering") +const { VSCodeProvider } = await import("../../webview-ui/src/context/vscode") +const { ServerProvider } = await import("../../webview-ui/src/context/server") +const { ConfigContext } = await import("../../webview-ui/src/context/config") +const { LanguageContext } = await import("../../webview-ui/src/context/language") +const { ProviderContext } = await import("../../webview-ui/src/context/provider") +const { SessionProvider, useSession } = await import("../../webview-ui/src/context/session") + +const provider = { + providers: () => ({}), + connected: () => [], + defaults: () => ({}), + defaultSelection: () => ({ providerID: "kilocode", modelID: "auto" }), + models: () => [], + findModel: () => undefined, + authMethods: () => ({}), + authStates: () => ({}), + isModelValid: () => true, +} +const config = { + config: () => ({}), + globalConfig: () => ({}), + globalDraft: () => ({}), + projectConfig: () => ({}), + collections: () => ({}), + settings: () => ({}), + features: () => ({ indexing: false, sandboxControls: false, backgroundSubagents: false }), + loading: () => false, + isDirty: () => false, + saving: () => false, + saveError: () => null, + updateConfig: () => {}, + updateGlobalConfig: () => {}, + updateProjectConfig: () => {}, + updateSetting: () => {}, + applySetting: () => {}, + saveConfig: () => {}, + discardConfig: () => {}, +} +const language = { + locale: () => "en", + setLocale: () => {}, + userOverride: () => "", + t: (key: string) => key, +} + +const ref = { value: undefined as ReturnType | undefined } +const Probe = () => { + const session = useSession() + ref.value = session + const ids = ["root", "background"] + const deps = { + terms: { activeId: () => undefined }, + REVIEW_TAB_ID: "review", + tabIds: () => ids, + kb: () => ({}), + reviewActive: () => false, + currentSessionID: session.currentSessionID, + visibleTabId: session.currentSessionID, + activePendingId: () => undefined, + isPending: () => false, + activityFor: session.activityFor, + stateLabel: (state: string) => state, + tabLookup: () => new Map(ids.map((id) => [id, { id, title: id }])), + adjacentHint: () => "", + } as Parameters[1] + return ( + + + {(id) => renderTab(id, deps)} + + + ) +} +const host = document.createElement("div") +document.body.append(host) +const step = { value: 0 } +const failures: string[] = [] + +const dispose = render( + () => ( + + + + + + + + + + + + + + ), + host, +) + +const settle = async () => { + await Promise.resolve() + await window.happyDOM.waitUntilComplete() +} +const emit = async (data: unknown) => { + window.dispatchEvent(new MessageEvent("message", { data })) + await settle() +} +const state = (id: string) => { + const value = ref.value + assert(value) + return value.activityFor(id) +} +const check = async (id: string, expected: string) => { + await settle() + step.value += 1 + const value = ref.value + assert(value) + const actual = state(id) + const tab = host.querySelector(`[data-tab-id="${id}"] [data-activity]`) + if (id === "root" || id === "background") assert(tab, `Missing rendered tab for ${id}`) + if (tab && tab.getAttribute("data-activity") !== expected) { + failures.push( + `step ${step.value} ${id}: rendered tab expected ${expected}, got ${tab.getAttribute("data-activity")}`, + ) + } + if (actual !== expected) { + failures.push( + `step ${step.value} ${id}: expected ${expected}, got ${actual}, status=${value.status()}, close=${value.closeReason() ?? "none"}`, + ) + } +} +const info = (id: string, parentID?: string) => ({ + id, + ...(parentID ? { parentID } : {}), + title: id, + createdAt: "2026-01-01T00:00:00.000Z", + updatedAt: "2026-01-01T00:00:00.000Z", +}) +const task = (id: string, parentID: string, childID: string, nested: boolean) => ({ + type: "partUpdated", + sessionID: parentID, + messageID: `${parentID}-part-message`, + part: { + type: "tool", + id, + sessionID: parentID, + messageID: `${parentID}-part-message`, + tool: "task", + state: { status: "running", input: {}, ...(nested ? { metadata: { sessionId: childID } } : {}) }, + ...(!nested ? { metadata: { sessionId: childID } } : {}), + }, +}) + +try { + await settle() + await emit({ type: "ready", serverInfo: { port: 1 } }) + await emit({ + type: "sessionsLoaded", + sessions: [info("root"), info("background"), info("durable-child", "root"), info("durable-grand", "durable-child")], + }) + + const value = ref.value + assert(value) + value.setCurrentSessionID("root") + await check("root", "idle") + await check("background", "idle") + + await emit({ type: "sessionStatus", sessionID: "background", status: "busy" }) + await check("background", "busy") + await check("root", "idle") + await emit({ type: "sessionStatus", sessionID: "background", status: "idle" }) + + await emit(task("root-task", "root", "task-child", false)) + await emit(task("child-task", "task-child", "task-grand", true)) + await emit({ type: "sessionStatus", sessionID: "durable-grand", status: "busy" }) + await check("root", "busy") + await check("durable-child", "busy") + await check("durable-grand", "busy") + await emit({ type: "sessionStatus", sessionID: "durable-grand", status: "idle" }) + + await emit({ type: "sessionStatus", sessionID: "task-child", status: "busy" }) + await check("root", "busy") + await check("task-child", "busy") + await emit({ type: "sessionStatus", sessionID: "task-child", status: "retry", attempt: 1, message: "retry", next: 1 }) + await check("root", "retry") + await check("task-child", "retry") + await emit({ type: "sessionStatus", sessionID: "task-child", status: "idle" }) + await emit({ type: "sessionStatus", sessionID: "task-grand", status: "busy" }) + await check("root", "busy") + await check("task-child", "busy") + await check("task-grand", "busy") + await emit({ type: "sessionStatus", sessionID: "task-grand", status: "offline" }) + await check("root", "error") + await check("task-child", "error") + await check("task-grand", "error") + assert.equal(value.inUseFor("root"), true) + await emit({ type: "sessionStatus", sessionID: "task-grand", status: "idle" }) + await check("root", "idle") + assert.equal(value.inUseFor("root"), false) + + await emit({ + type: "permissionRequest", + permission: { id: "permission", sessionID: "task-grand", toolName: "bash", patterns: [], always: [], args: {} }, + }) + await check("root", "waiting") + await check("task-child", "waiting") + await check("task-grand", "waiting") + await emit({ type: "permissionError", permissionID: "permission", stale: true }) + await check("root", "idle") + assert.equal(value.permissions().length, 0) + await emit({ + type: "permissionRequest", + permission: { id: "permission", sessionID: "durable-grand", toolName: "bash", patterns: [], always: [], args: {} }, + }) + await check("root", "waiting") + await emit({ type: "permissionResolved", permissionID: "permission", sessionID: "durable-grand", response: "once" }) + await check("root", "idle") + assert.equal(value.permissions().length, 0) + + await emit({ type: "sessionStatus", sessionID: "task-child", status: "busy" }) + await emit({ + type: "questionRequest", + question: { id: "notice", sessionID: "task-child", blocking: false, questions: [] }, + }) + await check("root", "busy") + await check("task-child", "busy") + await emit({ type: "sessionStatus", sessionID: "task-child", status: "idle" }) + await check("root", "idle") + assert.equal(value.inUseFor("root"), true) + assert.equal(value.inUseFor("background"), false) + await emit({ type: "sessionStatus", sessionID: "task-child", status: "busy" }) + await emit({ + type: "questionRequest", + question: { id: "notice", sessionID: "task-child", blocking: true, questions: [] }, + }) + await check("root", "waiting") + await emit({ type: "questionResolved", requestID: "notice" }) + await check("root", "busy") + await emit({ type: "sessionStatus", sessionID: "task-child", status: "idle" }) + + await emit({ + type: "questionRequest", + question: { + id: "question", + sessionID: "task-child", + questions: [{ question: "Continue?", header: "Confirm", options: [] }], + }, + }) + await check("root", "waiting") + await emit({ type: "questionResolved", requestID: "question" }) + await check("root", "idle") + assert.equal(value.questions().length, 0) + + await emit({ + type: "suggestionRequest", + suggestion: { id: "suggestion", sessionID: "task-grand", text: "Try this", actions: [] }, + }) + await check("root", "waiting") + await emit({ type: "suggestionResolved", requestID: "suggestion" }) + await check("root", "idle") + assert.equal(value.suggestions().length, 0) + + await emit({ type: "sessionTurnClosed", sessionID: "task-child", reason: "completed", parentID: "root" }) + await check("task-child", "done") + await check("root", "idle") + await emit({ type: "sessionTurnClosed", sessionID: "task-child", reason: "error", parentID: "root" }) + await check("task-child", "error") + await check("root", "idle") + await emit({ type: "sessionStatus", sessionID: "root", status: "busy" }) + await check("root", "busy") + await emit({ type: "sessionStatus", sessionID: "root", status: "idle" }) + await check("root", "idle") + + await emit({ type: "sessionTurnClosed", sessionID: "root", reason: "completed" }) + await check("root", "done") + await emit({ type: "sessionStatus", sessionID: "root", status: "busy" }) + await check("root", "busy") + await emit({ type: "sessionStatus", sessionID: "root", status: "idle" }) + await check("root", "idle") + + await emit({ type: "sessionTurnClosed", sessionID: "root", reason: "completed" }) + await check("root", "done") + await emit({ + type: "sessionUpdated", + session: { ...info("root"), revert: { messageID: "root-message" } }, + }) + await check("root", "idle") + await emit({ type: "sessionUpdated", session: { ...info("root"), revert: null } }) + await check("root", "idle") + + await emit({ type: "sessionTurnClosed", sessionID: "root", reason: "completed" }) + await check("root", "done") + value.sendMessage("next turn") + await settle() + await check("root", "busy") + await emit({ type: "sessionStatus", sessionID: "root", status: "busy" }) + await check("root", "busy") + await emit({ type: "sessionStatus", sessionID: "root", status: "idle" }) + await check("root", "idle") + + value.setCurrentSessionID("background") + await emit({ type: "sessionStatus", sessionID: "background", status: "busy" }) + await check("background", "busy") + await emit({ type: "sessionError", eventID: "background-aborted", error: { name: "MessageAbortedError" } }) + await check("background", "busy") + await emit({ type: "connectionState", state: "disconnected", error: "offline" }) + await check("background", "error") + await emit({ type: "connectionState", state: "connecting" }) + await check("background", "error") + await emit({ type: "connectionState", state: "connected" }) + await check("background", "busy") + + await emit({ + type: "questionRequest", + question: { + id: "connection-question", + sessionID: "background", + questions: [{ question: "Reconnect?", header: "Confirm", options: [] }], + }, + }) + await check("background", "waiting") + await emit({ type: "connectionState", state: "error", error: "failed" }) + await check("background", "error") + await emit({ type: "connectionState", state: "connecting" }) + await check("background", "error") + await emit({ type: "connectionState", state: "connected" }) + await check("background", "waiting") + await emit({ type: "questionResolved", requestID: "connection-question" }) + await check("background", "busy") + await emit({ type: "sessionStatus", sessionID: "background", status: "idle" }) + await check("background", "idle") + + value.setCurrentSessionID("root") + await emit({ type: "sessionError", eventID: "aborted", error: { name: "MessageAbortedError" } }) + await check("root", "idle") + await emit({ type: "sessionError", eventID: "root-error", error: { name: "ProviderError" } }) + await check("root", "error") + assert.equal(value.inUseFor("root"), false) + await emit({ type: "sessionTurnClosed", sessionID: "root", reason: "completed" }) + await check("root", "error") + + await emit({ type: "sessionStatus", sessionID: "root", status: "busy" }) + await check("root", "busy") + await emit({ type: "sessionStatus", sessionID: "root", status: "idle" }) + await check("root", "idle") + + await emit({ + type: "questionRequest", + question: { + id: "deleted-question", + sessionID: "root", + questions: [{ question: "Delete?", header: "Confirm", options: [] }], + }, + }) + await check("root", "waiting") + await emit({ type: "sessionDeleted", sessionID: "root" }) + await check("root", "idle") + assert.equal(value.currentSessionID(), undefined) + assert.equal( + value.sessions().some((item) => item.id === "root"), + false, + ) + assert.equal( + value.questions().some((item) => item.sessionID === "root"), + false, + ) + assert.equal( + sent.some((item) => (item as { type?: string }).type === "sendMessage"), + true, + ) + assert.deepEqual(failures, []) +} finally { + const before = state("background") + dispose() + window.dispatchEvent( + new MessageEvent("message", { data: { type: "sessionStatus", sessionID: "background", status: "retry" } }), + ) + assert.equal(state("background"), before) + await window.happyDOM.cancelAsync() + await window.happyDOM.close() +} + +process.exit(0) diff --git a/packages/kilo-vscode/tests/fixtures/session-tab-switcher.tsx b/packages/kilo-vscode/tests/fixtures/session-tab-switcher.tsx index 0817ffc545..4230b002a0 100644 --- a/packages/kilo-vscode/tests/fixtures/session-tab-switcher.tsx +++ b/packages/kilo-vscode/tests/fixtures/session-tab-switcher.tsx @@ -14,6 +14,7 @@ Object.assign(globalThis, { HTMLTextAreaElement: window.HTMLTextAreaElement, SVGElement: window.SVGElement, MutationObserver: window.MutationObserver, + IntersectionObserver: window.IntersectionObserver, ResizeObserver: window.ResizeObserver, CustomEvent: window.CustomEvent, Event: window.Event, diff --git a/packages/kilo-vscode/tests/setup/vscode-mock.ts b/packages/kilo-vscode/tests/setup/vscode-mock.ts index 9d01986cc8..05cfb52e82 100644 --- a/packages/kilo-vscode/tests/setup/vscode-mock.ts +++ b/packages/kilo-vscode/tests/setup/vscode-mock.ts @@ -40,6 +40,7 @@ const mockVscode = { language: "en", machineId: "test-machine", isTelemetryEnabled: false, + onDidChangeTelemetryEnabled: () => ({ dispose: noop }), shell: "/bin/bash", openExternal: noop, }, @@ -171,6 +172,9 @@ const mockVscode = { }, Disposable: class { constructor(private callback: () => void = noop) {} + static from(...items: { dispose: () => void }[]) { + return { dispose: () => items.forEach((item) => item.dispose()) } + } dispose() { this.callback() } diff --git a/packages/kilo-vscode/tests/unit/agent-manager-focus.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-focus.test.ts index 4488414e83..5ebac14cda 100644 --- a/packages/kilo-vscode/tests/unit/agent-manager-focus.test.ts +++ b/packages/kilo-vscode/tests/unit/agent-manager-focus.test.ts @@ -2,6 +2,7 @@ import { describe, expect, it } from "bun:test" import { Window } from "happy-dom" import { agentManagerFocusTarget, + createChatFocus, focusQuestionOption, hasQuestionOption, preservesTextFocus, @@ -9,6 +10,61 @@ import { import { isTextControl } from "../../webview-ui/src/utils/focus" describe("Agent Manager focus", () => { + it("preserves composer focus through retries unless focus is explicitly requested", async () => { + const window = new Window() + const document = window.document + const frames: FrameRequestCallback[] = [] + const original = { + document: Object.getOwnPropertyDescriptor(globalThis, "document"), + requestAnimationFrame: Object.getOwnPropertyDescriptor(globalThis, "requestAnimationFrame"), + } + document.hasFocus = () => true + Object.assign(globalThis, { + document, + requestAnimationFrame: (callback: FrameRequestCallback) => frames.push(callback), + }) + const prompt = document.createElement("textarea") + prompt.className = "prompt-input" + const dock = document.createElement("div") + dock.setAttribute("data-component", "question-dock") + const option = document.createElement("button") + option.setAttribute("data-slot", "question-option") + dock.append(option) + document.body.append(prompt, dock) + const focus = createChatFocus({ term: () => undefined, history: () => false, review: () => false }) + const flush = () => { + while (frames.length) frames.shift()?.(0) + } + + try { + prompt.focus() + focus() + await Promise.resolve() + expect(document.activeElement).toBe(prompt) + flush() + expect(document.activeElement).toBe(prompt) + + prompt.blur() + focus() + await Promise.resolve() + expect(document.activeElement).toBe(option) + prompt.focus() + flush() + expect(document.activeElement).toBe(prompt) + + focus(true) + await Promise.resolve() + flush() + expect(document.activeElement).toBe(option) + } finally { + for (const [key, descriptor] of Object.entries(original)) { + if (descriptor) Object.defineProperty(globalThis, key, descriptor) + else Reflect.deleteProperty(globalThis, key) + } + await window.happyDOM.close() + } + }) + it("focuses the first enabled question option", () => { const window = new Window() const root = window.document.createElement("div") diff --git a/packages/kilo-vscode/tests/unit/agent-manager-worktree-diffs.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-worktree-diffs.test.ts index c647fbcbda..d9b2e2dd19 100644 --- a/packages/kilo-vscode/tests/unit/agent-manager-worktree-diffs.test.ts +++ b/packages/kilo-vscode/tests/unit/agent-manager-worktree-diffs.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "bun:test" import { createRoot } from "solid-js" -import { createWorktreeDiffs } from "../../webview-ui/agent-manager/worktree-diffs" +import { createWorktreeDiffs, diffDataKey } from "../../webview-ui/agent-manager/worktree-diffs" import type { WorktreeFileDiff } from "../../webview-ui/src/types/messages" const diff = (file: string, additions = 1): WorktreeFileDiff => ({ @@ -30,7 +30,37 @@ const withDiffs = (fn: (diffs: ReturnType, sent: Sen }) } +describe("diffDataKey", () => { + it("preserves the nullish fallback without replacing an empty project", () => { + expect(diffDataKey(undefined, "s1")).toBe("single\0s1") + expect(diffDataKey("single", "s1")).toBe("single\0s1") + expect(diffDataKey("", "s1")).toBe("\0s1") + expect(diffDataKey("project", "")).toBe("project\0") + expect(diffDataKey("project", "s1\0file.ts")).toBe("project\0s1\0file.ts") + }) +}) + describe("createWorktreeDiffs", () => { + it.each([undefined, "", "project"])("prunes only the complete project namespace %j", (project) => { + createRoot((dispose) => { + const store = createWorktreeDiffs(vscode([]), () => project) + const sibling = `${project ?? "single"}-other` + for (const owner of [project, sibling]) { + store.onWorktreeDiff({ + type: "agentManager.worktreeDiff", + projectId: owner, + sessionId: "gone#branch", + diffs: [diff("a.ts")], + }) + } + + store.prune(new Set()) + expect(store.diffDatas()[`${project ?? "single"}\0gone#branch`]).toBeUndefined() + expect(store.diffDatas()[`${sibling}\0gone#branch`]).toHaveLength(1) + dispose() + }) + }) + it("stores full diffs per session", () => { withDiffs((diffs) => { diffs.onWorktreeDiff({ type: "agentManager.worktreeDiff", sessionId: "s1", diffs: [diff("a.ts")] }) diff --git a/packages/kilo-vscode/tests/unit/agent-project-route.test.ts b/packages/kilo-vscode/tests/unit/agent-project-route.test.ts index 9ee54dc8fc..e1487d094f 100644 --- a/packages/kilo-vscode/tests/unit/agent-project-route.test.ts +++ b/packages/kilo-vscode/tests/unit/agent-project-route.test.ts @@ -50,6 +50,13 @@ describe("ProjectRouteService", () => { ) }) + it("preserves fallback, precedence, and empty fields in composite UI keys", () => { + expect(ProjectRouteService.key({ projectId: "a" })).toBe("a\0local") + expect(ProjectRouteService.key({ projectId: "a", sessionId: "s", worktreeId: "wt" })).toBe("a\0s") + expect(ProjectRouteService.key({ projectId: "a", sessionId: "", worktreeId: "wt" })).toBe("a\0") + expect(ProjectRouteService.key({ projectId: "", worktreeId: "" })).toBe("\0") + }) + describe("safe resolution (non-throwing)", () => { it("trySessionDirectory returns the exact dir for an unambiguous raw id", () => { const routes = new ProjectRouteService() diff --git a/packages/kilo-vscode/tests/unit/config-utils.test.ts b/packages/kilo-vscode/tests/unit/config-utils.test.ts index 5ca90cb714..3bbb320979 100644 --- a/packages/kilo-vscode/tests/unit/config-utils.test.ts +++ b/packages/kilo-vscode/tests/unit/config-utils.test.ts @@ -392,6 +392,27 @@ describe("ConfigState", () => { }) }) + it("sets and clears the compaction model without changing other settings", () => { + const s = new ConfigState() + const cfg: Config = { + model: "kilo/openai/gpt-4.1", + agent: { compaction: { prompt: "Keep task details" }, code: { model: "kilo/openai/gpt-4.1" } }, + } + const model = "kilo/anthropic/claude-haiku-4-5" + s.handleConfigLoaded(cfg) + s.updateConfig({ agent: { compaction: { model } } }) + + expect(s.config).toEqual({ + ...cfg, + agent: { ...cfg.agent, compaction: { prompt: "Keep task details", model } }, + }) + s.updateConfig({ agent: { compaction: { model: null } } }) + + expect(s.config).toEqual(cfg) + expect(s.draft.agent?.compaction?.model).toBeNull() + expect(configUnsetPaths(s.draft)).toEqual([["agent", "compaction", "model"]]) + }) + describe("agent permission patches", () => { it("merges nested per-agent permission patches into existing rules", () => { const s = new ConfigState() diff --git a/packages/kilo-vscode/tests/unit/early-message.test.ts b/packages/kilo-vscode/tests/unit/early-message.test.ts index cad4c42b43..5329af16d8 100644 --- a/packages/kilo-vscode/tests/unit/early-message.test.ts +++ b/packages/kilo-vscode/tests/unit/early-message.test.ts @@ -43,6 +43,17 @@ describe("routeEarlyMessage clipboard handling", () => { }) }) +describe("routeEarlyMessage activity", () => { + it("forwards authoritative webview presentation state without interpreting session events", async () => { + const calls: unknown[] = [] + const ctx = { activity: (state: unknown) => calls.push(state) } as Ctx + for (const state of ["busy", "waiting", "done", "error", "idle"]) { + expect(await routeEarlyMessage({ type: "sessionActivity", state }, ctx)).toBe(true) + } + expect(calls).toEqual(["busy", "waiting", "done", "error", "idle"]) + }) +}) + describe("routeEarlyMessage background jobs", () => { it("forwards list request correlation", async () => { const calls: unknown[] = [] diff --git a/packages/kilo-vscode/tests/unit/explicit-abort.test.ts b/packages/kilo-vscode/tests/unit/explicit-abort.test.ts index 1d2f8d06f9..dd3c93fbe5 100644 --- a/packages/kilo-vscode/tests/unit/explicit-abort.test.ts +++ b/packages/kilo-vscode/tests/unit/explicit-abort.test.ts @@ -78,6 +78,30 @@ describe("explicit abort state", () => { expect(state.event(close("interrupted"), "/repo/a")).toBe(false) }) + it.each(["", "session"])("removes only the exact session prefix %j across directories", (session) => { + const state = new ExplicitAbortState() + for (const directory of ["/repo/a", "/repo/b"]) { + const id = state.begin(session, directory) + state.finish(session, directory, id, true) + } + const sibling = `${session}-other` + const id = state.begin(sibling, "/repo/a") + state.finish(sibling, "/repo/a", id, true) + + state.remove(session) + expect(state.event(close("interrupted", session), "/repo/a")).toBe(true) + expect(state.event(close("interrupted", session), "/repo/b")).toBe(true) + expect(state.event(close("interrupted", sibling))).toBe(false) + }) + + it("normalizes directories before building scope keys", () => { + const state = new ExplicitAbortState() + const id = state.begin("session", "/repo/nested/..") + state.finish("session", "/repo", id, true) + + expect(state.event(close("interrupted"), "/repo/.")).toBe(false) + }) + it("clears suppression when an idle session becomes busy again", () => { const state = new ExplicitAbortState() const id = state.begin("session", "/repo") diff --git a/packages/kilo-vscode/tests/unit/file-mention-utils.test.ts b/packages/kilo-vscode/tests/unit/file-mention-utils.test.ts index 30df1c1210..add791708e 100644 --- a/packages/kilo-vscode/tests/unit/file-mention-utils.test.ts +++ b/packages/kilo-vscode/tests/unit/file-mention-utils.test.ts @@ -7,6 +7,7 @@ import { buildMentionResults, buildSessionAttachments, filterMentionResults, + filterSessions, getMentionRemovalRange, getPastChatsMentionResult, isCursorAtMentionEnd, @@ -119,6 +120,39 @@ describe("filterMentionResults", () => { }) }) +describe("filterSessions", () => { + const sessions = Array.from({ length: 60 }, (_, index) => ({ + id: `ses_${index}`, + title: `Recent session ${index}`, + updated: 60 - index, + worktreeName: "branch", + })) + + it("shows the first 50 sessions in their existing order without a query", () => { + expect(filterSessions(sessions, "")).toEqual(sessions.slice(0, 50)) + }) + + it("limits broad search results to 50 matches", () => { + expect(filterSessions(sessions, "recent")).toHaveLength(50) + }) + + it.each(["ORCHID", "old-branch"])("finds older sessions beyond the display limit by %s", (query) => { + const source = { id: "ses_old", title: "Orchid reference source", updated: 0, worktreeName: "old-branch" } + expect(filterSessions([...sessions, source], query)).toEqual([source]) + }) + + it("ranks an older exact match before newer partial matches", () => { + const source = { id: "ses_old", title: "Recent", updated: 0 } + const matches = filterSessions([...sessions, source], "recent") + expect(matches).toHaveLength(50) + expect(matches[0]).toBe(source) + }) + + it("returns no results when nothing matches", () => { + expect(filterSessions(sessions, "zzzz")).toEqual([]) + }) +}) + describe("syncMentionedPaths", () => { it("keeps paths still referenced in text", () => { const paths = new Set(["foo.ts", "bar.ts"]) diff --git a/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts index 75ed68671e..2c8ce4fb6e 100644 --- a/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts +++ b/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts @@ -376,6 +376,21 @@ describe("mapSSEEventToWebviewMessage", () => { expect(msg).toEqual({ type: "sessionTurnClosed", sessionID: "sess-1", reason: "interrupted" }) }) + it("forwards the parent session ID when a child turn closes", () => { + const event: EventSessionTurnClose = { + id: "evt-child-turn", + type: "session.turn.close", + properties: { sessionID: "child", parentID: "parent", reason: "completed" }, + } + + expect(mapSSEEventToWebviewMessage(event, "child")).toEqual({ + type: "sessionTurnClosed", + sessionID: "child", + reason: "completed", + parentID: "parent", + }) + }) + it("maps session errors with their event identity and message", () => { const event: EventSessionError = { id: "evt-error", diff --git a/packages/kilo-vscode/tests/unit/local-diff.test.ts b/packages/kilo-vscode/tests/unit/local-diff.test.ts index dfaf6679d3..352f2679d3 100644 --- a/packages/kilo-vscode/tests/unit/local-diff.test.ts +++ b/packages/kilo-vscode/tests/unit/local-diff.test.ts @@ -467,6 +467,26 @@ describe("diffFile", () => { }) }) + it("keeps empty and named base cache identities separate", async () => { + await withRepo(async (dir, base) => { + await fs.writeFile(path.join(dir, "seed.txt"), "seed\ncommitted\n") + runSync(dir, ["commit", "-am", "change seed"]) + await fs.writeFile(path.join(dir, "seed.txt"), "seed\ncommitted\nworking\n") + const local = createLocalDiff(git()) + await local.summary(dir, "") + await local.summary(dir, base) + + const current = await local.file(dir, "", "seed.txt") + const ancestor = await local.file(dir, base, "seed.txt") + expect(current?.before).toBe("seed\ncommitted\n") + expect(ancestor?.before).toBe("seed\n") + expect(current?.after).toBe("seed\ncommitted\nworking\n") + expect(ancestor?.after).toBe(current?.after) + expect(await local.file(dir, "", "seed.txt")).toBe(current) + expect(await local.file(dir, base, "seed.txt")).toBe(ancestor) + }) + }) + it("does not cache detail that is aborted before Git completes", async () => { await withRepo(async (dir, base) => { await fs.writeFile(path.join(dir, "seed.txt"), "seed\ncached\n") diff --git a/packages/kilo-vscode/tests/unit/native-tab-title.test.ts b/packages/kilo-vscode/tests/unit/native-tab-title.test.ts index f949f88e3e..d1775b1c76 100644 --- a/packages/kilo-vscode/tests/unit/native-tab-title.test.ts +++ b/packages/kilo-vscode/tests/unit/native-tab-title.test.ts @@ -18,4 +18,38 @@ describe("nativeTitle", () => { it("truncates long session titles", () => { expect(nativeTitle(session("Dynamic VS Code tab titles for Kilo sessions"))).toBe("Dynamic VS Code tab...") }) + + it("updates the native panel only from valid webview activity reports", async () => { + const { KiloProvider } = await import("../../src/KiloProvider") + const titles: string[] = [] + const listener: { current?: (message: { type: string; state: unknown }) => Promise } = {} + const provider = new KiloProvider( + { fsPath: "/extension" } as never, + { unregisterVisible: () => {}, unregisterAttached: () => {} } as never, + undefined, + { tabTitle: (title) => titles.push(title) }, + ) + const internal = provider as unknown as { setupWebviewMessageHandler: (webview: unknown) => void } + internal.setupWebviewMessageHandler({ + onDidReceiveMessage: (handler: NonNullable) => { + listener.current = handler + return { dispose: () => {} } + }, + }) + for (const state of ["busy", "waiting", "done", "error", "idle", "idle", "invalid", null]) { + await listener.current?.({ type: "sessionActivity", state }) + } + expect(titles).toEqual(["◔ Kilo Code", "⚠ Kilo Code", "✓ Kilo Code", "⚠ Kilo Code", "Kilo Code"]) + provider.dispose() + }) + + it("renders the same activity values used by webview tabs and worktrees", () => { + expect(nativeTitle(session("Greeting"), "busy")).toBe("◔ Greeting") + expect(nativeTitle(session("Greeting"), "retry")).toBe("◔ Greeting") + expect(nativeTitle(session("Greeting"), "waiting")).toBe("⚠ Greeting") + expect(nativeTitle(session("Greeting"), "error")).toBe("⚠ Greeting") + expect(nativeTitle(session("Greeting"), "done")).toBe("✓ Greeting") + expect(nativeTitle(session("Greeting"), "idle")).toBe("Greeting") + expect(nativeTitle(session("Greeting"), "waiting", "Agent Manager")).toBe("⚠ Agent Manager") + }) }) diff --git a/packages/kilo-vscode/tests/unit/project-session-busy.test.ts b/packages/kilo-vscode/tests/unit/project-session-busy.test.ts index 53515eb2dd..54388802f9 100644 --- a/packages/kilo-vscode/tests/unit/project-session-busy.test.ts +++ b/packages/kilo-vscode/tests/unit/project-session-busy.test.ts @@ -1,66 +1,72 @@ import { describe, expect, it } from "bun:test" -import { createSessionBusy, createWorktreeBusy } from "../../webview-ui/agent-manager/project/session-busy" +import { createSessionActivity, createWorktreeActivity } from "../../webview-ui/agent-manager/project/session-busy" import type { ExtensionMessage } from "../../webview-ui/src/types/messages" +import type { Activity } from "../../webview-ui/src/utils/session-activity" -const options = (statuses: Record) => ({ - statuses: () => statuses, - permissions: () => [], - questions: () => [], +const options = (values: Record) => ({ managed: () => [ - { id: "unknown", worktreeId: "wt-unknown" }, - { id: "idle", worktreeId: "wt-idle" }, - { id: "working", worktreeId: "wt-working" }, + { id: "current-wt", worktreeId: "wt-current" }, + { id: "current-other", worktreeId: "wt-other" }, + { id: "priority-busy", worktreeId: "wt-priority" }, + { id: "priority-waiting", worktreeId: "wt-priority" }, ], - local: () => [], - projects: () => ({ background: [{ id: "unknown", worktreeId: "wt-unknown" }] }), - active: () => "project-a", + local: () => ["current-local"], + projects: () => ({ + background: [ + { id: "background-local", worktreeId: null }, + { id: "background-wt", worktreeId: "wt-background" }, + ], + }), + active: () => "current", + activityFor: (id: string) => values[id] ?? "idle", + inUseFor: (id: string) => ["busy", "retry", "waiting"].includes(values[id] ?? "idle"), }) -const busy = (statuses: Record) => createSessionBusy(options(statuses)) +const activity = (values: Record) => createSessionActivity(options(values)) -describe("createSessionBusy", () => { - it("does not mark stopped or unknown sessions as busy", () => { - const state = busy({ idle: { type: "idle" } }) - - expect(state.agent("wt-unknown")).toBe(false) - expect(state.agent("wt-idle")).toBe(false) - expect(state.project("background", "wt-unknown")).toBe(false) +describe("createSessionActivity", () => { + it("returns idle for groups without sessions", () => { + const state = activity({}) + expect(state.agent("wt-missing")).toBe("idle") + expect(state.project("background", "wt-missing")).toBe("idle") }) - it.each(["busy", "retry"])("marks sessions with an active %s status as busy", (type) => { - expect(busy({ working: { type } }).agent("wt-working")).toBe(true) - }) - - it("keeps running for non-blocking questions", () => { - const questions: { sessionID: string; blocking?: boolean }[] = [{ sessionID: "working", blocking: false }] - const state = createSessionBusy({ - ...options({ working: { type: "busy" } }), - questions: () => questions, + it("scopes local, current, and background project activity", () => { + const state = activity({ + "current-local": "done", + "current-wt": "busy", + "current-other": "error", + "background-local": "retry", + "background-wt": "error", }) - expect(state.agent("wt-working")).toBe(true) - questions[0].blocking = true - expect(state.agent("wt-working")).toBe(false) - delete questions[0].blocking - expect(state.agent("wt-working")).toBe(false) + expect(state.local()).toBe("done") + expect(state.project("current", null)).toBe("done") + expect(state.project("current", "wt-current")).toBe("busy") + expect(state.project("background", null)).toBe("retry") + expect(state.project("background", "wt-background")).toBe("error") }) - it("does not keep a spinner for an offline session", () => { - const state = busy({ working: { type: "offline" }, unknown: { type: "offline" } }) - - expect(state.agent("wt-working")).toBe(false) - expect(state.session("working")).toBe(false) - expect(state.project("background", "wt-unknown")).toBe(false) - expect(state.agent("wt-working", true)).toBe(true) - expect(state.project("background", "wt-unknown", true)).toBe(true) + it("prioritizes attention over errors and work in a group", () => { + const state = activity({ + "current-wt": "busy", + "current-other": "waiting", + "priority-busy": "busy", + "priority-waiting": "waiting", + "background-local": "error", + "background-wt": "waiting", + }) + expect(state.agent("wt-priority")).toBe("waiting") + expect(state.project("current", "wt-other")).toBe("waiting") + expect(state.project("background", "wt-background")).toBe("waiting") }) }) -describe("createWorktreeBusy", () => { +describe("createWorktreeActivity", () => { it("keeps directory activity separate from parent status and other projects", () => { const listeners = new Set<(message: ExtensionMessage) => void>() - const state = createWorktreeBusy({ - ...options({ idle: { type: "idle" }, working: { type: "busy" } }), + const state = createWorktreeActivity({ + ...options({ "current-wt": "done", "current-other": "busy", "current-local": "done" }), worktrees: (project) => [ - { id: "wt-idle", path: project === "background" ? "/other/worktree" : "/repo/worktree" }, + { id: "wt-current", path: project === "background" ? "/other/worktree" : "/repo/worktree" }, ], subscribe: (callback) => { listeners.add(callback) @@ -70,46 +76,60 @@ describe("createWorktreeBusy", () => { const send = (active: string[]) => { for (const callback of listeners) callback({ type: "agentManager.worktreeActivity", active }) } - - expect(state.agent("wt-idle")).toBe(false) - expect(state.agent("wt-working")).toBe(true) + expect(state.agent("wt-current")).toBe("done") + expect(state.blocked("wt-current")).toBe(false) + expect(state.agent("wt-other")).toBe("busy") send(["/repo/worktree"]) - expect(state.agent("wt-idle")).toBe(true) - expect(state.project("project-a", "wt-idle")).toBe(true) - expect(state.project("background", "wt-idle")).toBe(false) - expect(state.project("background", null)).toBe(false) - expect(state.agent("missing")).toBe(false) - expect(state.session("idle")).toBe(false) - expect(state.local()).toBe(false) - + expect(state.agent("wt-current")).toBe("busy") + expect(state.blocked("wt-current")).toBe(true) + expect(state.project("current", "wt-current")).toBe("busy") + expect(state.project("background", "wt-current")).toBe("idle") + expect(state.blocked("wt-current", "background")).toBe(false) + expect(state.project("background", null)).toBe("idle") + expect(state.agent("missing")).toBe("idle") + expect(state.local()).toBe("done") send(["/other/worktree"]) - expect(state.agent("wt-idle")).toBe(false) - expect(state.project("background", "wt-idle")).toBe(true) + expect(state.agent("wt-current")).toBe("done") + expect(state.blocked("wt-current")).toBe(false) + expect(state.project("background", "wt-current")).toBe("busy") + expect(state.blocked("wt-current", "background")).toBe(true) send([]) - expect(state.project("background", "wt-idle")).toBe(false) - expect(state.agent("wt-working")).toBe(true) + expect(state.project("background", "wt-current")).toBe("idle") + expect(state.blocked("wt-current", "background")).toBe(false) + expect(state.agent("wt-other")).toBe("busy") }) - it.each(["permission", "question", "non-blocking question"] as const)( - "blocks deletion for a pending %s without showing a running spinner", - (kind) => { - const state = createWorktreeBusy({ - statuses: () => ({ session: { type: "idle" } }), - permissions: () => (kind === "permission" ? [{ sessionID: "session" }] : []), - questions: () => (kind !== "permission" ? [{ sessionID: "session", blocking: kind === "question" }] : []), - worktrees: () => [], - subscribe: () => () => undefined, - managed: () => [{ id: "session", worktreeId: "worktree" }], - local: () => [], - projects: () => ({ other: [{ id: "session", worktreeId: "worktree" }] }), - active: () => "active", - }) + it.each(["waiting", "error", "retry"] as const)("does not hide %s behind directory activity", (value) => { + const listeners = new Set<(message: ExtensionMessage) => void>() + const state = createWorktreeActivity({ + ...options({ "current-wt": value }), + worktrees: () => [{ id: "wt-current", path: "/repo/worktree" }], + subscribe: (callback) => { + listeners.add(callback) + return () => listeners.delete(callback) + }, + }) + for (const callback of listeners) callback({ type: "agentManager.worktreeActivity", active: ["/repo/worktree"] }) + expect(state.agent("wt-current")).toBe(value) + expect(state.project("current", "wt-current")).toBe(value) + }) - expect(state.agent("worktree")).toBe(false) - expect(state.agent("worktree", true)).toBe(true) - expect(state.project("active", "worktree", true)).toBe(true) - expect(state.project("other", "worktree")).toBe(false) - expect(state.project("other", "worktree", true)).toBe(true) - }, - ) + it.each(["idle", "waiting", "error"] as const)("keeps deletion guards independent of the %s icon", (value) => { + let pending = true + const state = createWorktreeActivity({ + ...options({ "current-wt": value }), + inUseFor: (id) => id === "current-wt" && pending, + projects: () => ({ other: [{ id: "current-wt", worktreeId: "wt-current" }] }), + worktrees: () => [], + subscribe: () => () => undefined, + }) + expect(state.agent("wt-current")).toBe(value) + expect(state.blocked("wt-current")).toBe(true) + expect(state.blocked("wt-current", "current")).toBe(true) + expect(state.blocked("wt-current", "other")).toBe(true) + expect(state.blocked("missing")).toBe(false) + pending = false + expect(state.blocked("wt-current")).toBe(false) + expect(state.blocked("wt-current", "other")).toBe(false) + }) }) diff --git a/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts b/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts index 17a9093f48..c0f6e5e2da 100644 --- a/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts +++ b/packages/kilo-vscode/tests/unit/prompt-send-contract.test.ts @@ -1,8 +1,8 @@ /** * Source contract tests for prompt send paths. * - * Static analysis — reads session.tsx source and verifies that sendMessage and - * sendCommand still dismiss suggestions and reject questions before dispatching. + * Static analysis — reads the session context source and verifies that sendMessage + * and sendCommand still dismiss suggestions and reject questions before dispatching. * Also reads ChatView.tsx and asserts the prompt-block predicate is fed only * permission counts, never question counts — guarantees that a pending question * cannot re-block the prompt input. @@ -17,6 +17,7 @@ import { clearIfOn } from "../../webview-ui/src/context/session-cloud-prune" const ROOT = path.resolve(import.meta.dir, "../..") const SESSION_FILE = path.join(ROOT, "webview-ui/src/context/session.tsx") +const SESSION_TYPES_FILE = path.join(ROOT, "webview-ui/src/context/session-types.ts") const CHATVIEW_FILE = path.join(ROOT, "webview-ui/src/components/chat/ChatView.tsx") const AGENT_MANAGER_FILE = path.join(ROOT, "webview-ui/agent-manager/AgentManagerApp.tsx") const PROMPT_UTILS_FILE = path.join(ROOT, "webview-ui/src/components/chat/prompt-input-utils.ts") @@ -427,7 +428,7 @@ describe("SessionContext userClearedSession contract", () => { // restoreFailed uses session.userClearedSession() to decide whether :new // is a legitimate restore target after the user clicks New Task or // deletes their current/draft session. The accessor must be exposed. - expect(source).toMatch(/userClearedSession:\s*Accessor/) + expect(readFile(SESSION_TYPES_FILE)).toMatch(/userClearedSession:\s*Accessor/) }) it("clearCurrentSession sets the flag", () => { diff --git a/packages/kilo-vscode/tests/unit/question-dock-disposal.test.ts b/packages/kilo-vscode/tests/unit/question-dock-disposal.test.ts index cd9c5da3dd..ea589a42c8 100644 --- a/packages/kilo-vscode/tests/unit/question-dock-disposal.test.ts +++ b/packages/kilo-vscode/tests/unit/question-dock-disposal.test.ts @@ -8,8 +8,8 @@ const ROOT = path.resolve(import.meta.dir, "../..") const WEBVIEW = path.join(ROOT, "webview-ui") const FIXTURE = path.join(ROOT, "tests/fixtures/question-dock-disposal.tsx") -describe("QuestionDock disposal", () => { - it("does not read a stale callback-form Show accessor", async () => { +describe("QuestionDock lifecycle", () => { + it("preserves text focus and disposes without reading a stale Show accessor", async () => { const solid = path.dirname(Bun.resolveSync("solid-js/package.json", WEBVIEW)) const aliases: Record = { "solid-js": path.join(solid, "dist/solid.js"), diff --git a/packages/kilo-vscode/tests/unit/session-activity.test.ts b/packages/kilo-vscode/tests/unit/session-activity.test.ts new file mode 100644 index 0000000000..182036dda9 --- /dev/null +++ b/packages/kilo-vscode/tests/unit/session-activity.test.ts @@ -0,0 +1,184 @@ +import { describe, expect, it } from "bun:test" +import { + activities, + activity, + isActivity, + label, + running, + score, + strongest, + type Activity, +} from "../../webview-ui/src/utils/session-activity" +import { ancestry } from "../../webview-ui/src/context/session-utils" + +describe("activity", () => { + it("maps backend states", () => { + expect(activity({})).toBe("idle") + expect(activity({ status: "busy" })).toBe("busy") + expect(activity({ status: "retry" })).toBe("retry") + expect(activity({ status: "offline" })).toBe("error") + }) + + it("prioritizes waiting over terminal and running states", () => { + expect(activity({ status: "busy", blocked: true, errored: true, finished: true })).toBe("waiting") + }) + + it("prioritizes errors over running and completed states", () => { + expect(activity({ status: "retry", errored: true, finished: true })).toBe("error") + }) + + it("only reports done while idle", () => { + expect(activity({ status: "busy", finished: true })).toBe("busy") + expect(activity({ finished: true })).toBe("done") + }) +}) + +describe("activities", () => { + const parents = new Map([ + ["child", "root"], + ["nested", "child"], + ]) + + it("derives nested requests and active work without reading transcript pages", () => { + const result = activities({ + parents, + statuses: { root: { type: "idle" }, child: { type: "retry" }, other: { type: "busy" } }, + outcomes: {}, + blocked: ["nested"], + disconnected: false, + }) + expect(result).toEqual({ root: "waiting", child: "waiting", nested: "waiting", other: "busy" }) + }) + + it("rolls up child work but leaves terminal outcomes with their owning sessions", () => { + const input = { + parents, + statuses: {}, + outcomes: { child: { reason: "error" }, nested: { reason: "completed" } }, + blocked: [], + disconnected: false, + } + expect(activities(input)).toEqual({ child: "error", nested: "done" }) + expect(activities({ ...input, submitting: ["nested"] })).toEqual({ + root: "busy", + child: "error", + nested: "busy", + }) + expect(activities({ ...input, outcomes: { ...input.outcomes, root: { reason: "completed" } } }).root).toBe("done") + }) + + it("shows disconnected active sessions as errors without changing idle or completed sessions", () => { + const input = { + parents, + statuses: { root: { type: "busy" as const }, other: { type: "idle" as const } }, + outcomes: { complete: { reason: "completed" } }, + blocked: ["nested"], + disconnected: true, + } + expect(activities(input)).toEqual({ + root: "error", + child: "error", + nested: "error", + other: "idle", + complete: "done", + }) + expect(activities({ ...input, disconnected: false }).root).toBe("waiting") + }) + + it("does not leak a parent request into child or sibling session indicators", () => { + expect( + activities({ + parents, + statuses: { child: { type: "busy" }, nested: { type: "idle" } }, + outcomes: {}, + blocked: ["root"], + disconnected: false, + }), + ).toEqual({ root: "waiting", child: "busy", nested: "idle" }) + }) + + it("guards cycles and does not mutate its source state", () => { + const parents = new Map([ + ["first", "second"], + ["second", "first"], + ]) + const statuses = { first: { type: "busy" as const } } + const input = { parents, statuses, outcomes: {}, blocked: [], disconnected: false } + expect(activities(input)).toEqual({ first: "busy", second: "busy" }) + expect(activities({ ...input, statuses: {} })).toEqual({}) + expect(statuses).toEqual({ first: { type: "busy" } }) + }) +}) + +describe("ancestry", () => { + it("prefers durable session metadata over task and close-event fallbacks", () => { + const result = ancestry( + { child: { parentID: "root" }, root: { parentID: null } }, + { + other: [ + { type: "tool", tool: "task", metadata: { sessionId: "child" } }, + { type: "tool", tool: "task", state: { metadata: { sessionId: "fallback" } } }, + ], + }, + { child: { parentID: "stale" }, missing: { parentID: "root" } }, + ) + expect(Object.fromEntries(result.parents)).toEqual({ child: "root", fallback: "other", missing: "root" }) + expect(result.children.get("root")).toEqual(["child", "missing"]) + }) +}) + +describe("isActivity", () => { + it("accepts only known presentation states", () => { + expect(isActivity("waiting")).toBe(true) + expect(isActivity("done")).toBe(true) + expect(isActivity("idle")).toBe(true) + expect(isActivity("unknown")).toBe(false) + expect(isActivity({ state: "waiting" })).toBe(false) + expect(isActivity(undefined)).toBe(false) + }) +}) + +describe("running", () => { + it("matches spinner states", () => { + expect(running("busy")).toBe(true) + expect(running("retry")).toBe(true) + expect(running("waiting")).toBe(false) + expect(running("done")).toBe(false) + }) +}) + +describe("score", () => { + it("preserves every activity priority with idle scoring zero", () => { + const states: Activity[] = ["idle", "done", "busy", "retry", "error", "waiting"] + expect(states.map(score)).toEqual([0, 1, 2, 3, 4, 5]) + for (const [index, state] of states.entries()) { + for (const lower of states.slice(0, index + 1)) { + expect(strongest([state, lower])).toBe(state) + expect(strongest([lower, state])).toBe(state) + } + } + }) +}) + +describe("strongest", () => { + it("returns the highest priority state", () => { + expect(strongest(["busy", "waiting", "idle"])).toBe("waiting") + expect(strongest(["done", "error", "retry"])).toBe("error") + expect(strongest(["done", "busy"])).toBe("busy") + expect(strongest([])).toBe("idle") + }) +}) + +describe("label", () => { + it("returns existing translation keys", () => { + const states: Activity[] = ["waiting", "error", "retry", "busy", "done", "idle"] + expect(states.map(label)).toEqual([ + "task.backgroundAgents.needsInput", + "task.backgroundAgents.status.error", + "session.status.retry", + "session.tabs.switcher.busy", + "task.backgroundAgents.status.completed", + "session.current", + ]) + }) +}) diff --git a/packages/kilo-vscode/tests/unit/session-provider-activity.test.ts b/packages/kilo-vscode/tests/unit/session-provider-activity.test.ts new file mode 100644 index 0000000000..bcf5fe4d24 --- /dev/null +++ b/packages/kilo-vscode/tests/unit/session-provider-activity.test.ts @@ -0,0 +1,48 @@ +import { describe, expect, it } from "bun:test" +import { unlinkSync } from "node:fs" +import path from "node:path" +import { build } from "esbuild" +import { solidPlugin } from "esbuild-plugin-solid" + +const root = path.resolve(import.meta.dir, "../..") +const webview = path.join(root, "webview-ui") +const fixture = path.join(root, "tests/fixtures/session-provider-activity.tsx") + +describe("SessionProvider activity", () => { + it("covers real session activity lifecycle messages", async () => { + const solid = path.dirname(Bun.resolveSync("solid-js/package.json", webview)) + const aliases: Record = { + "solid-js": path.join(solid, "dist/solid.js"), + "solid-js/web": path.join(solid, "web/dist/web.js"), + "solid-js/store": path.join(solid, "store/dist/store.js"), + } + const dedupe = { + name: "solid-dedupe", + setup(ctx: Parameters[0]["plugins"]>[number]["setup"]>[0]) { + ctx.onResolve({ filter: /^solid-js(\/web|\/store)?$/ }, (args) => ({ path: aliases[args.path] })) + }, + } + const result = await build({ + entryPoints: [fixture], + bundle: true, + conditions: ["browser"], + external: ["happy-dom"], + format: "esm", + logLevel: "silent", + loader: { ".css": "empty" }, + platform: "node", + plugins: [dedupe, solidPlugin()], + target: "es2022", + write: false, + }) + const file = path.join(root, `.session-provider-activity-${crypto.randomUUID()}.mjs`) + await Bun.write(file, result.outputFiles[0]!.contents) + try { + const child = Bun.spawnSync(["bun", file], { cwd: webview, stdout: "pipe", stderr: "pipe" }) + const output = child.stdout.toString() + child.stderr.toString() + expect(child.exitCode, output).toBe(0) + } finally { + unlinkSync(file) + } + }) +}) diff --git a/packages/kilo-vscode/tests/unit/session-search.test.ts b/packages/kilo-vscode/tests/unit/session-search.test.ts index 0bae8bb682..fc14275fbb 100644 --- a/packages/kilo-vscode/tests/unit/session-search.test.ts +++ b/packages/kilo-vscode/tests/unit/session-search.test.ts @@ -35,7 +35,7 @@ describe("handleSessionSearch", () => { post: (msg) => posted.push(msg), }) - expect(calls).toEqual([{ worktrees: true, roots: true, directory: "/repo/.kilo/worktrees/wt-1", limit: 50 }]) + expect(calls).toEqual([{ worktrees: true, roots: true, directory: "/repo/.kilo/worktrees/wt-1", limit: 5_000 }]) expect(posted).toEqual([ { type: "sessionSearchResult", @@ -89,6 +89,24 @@ describe("handleSessionSearch", () => { expect(posted[0]?.sessions.map((s) => s.id)).toEqual(["ses_keep"]) }) + it.each(["/repo", "/repo/.kilo/worktrees/branch"])("loads older chats in one request from %s", async (dir) => { + const recent = Array.from({ length: 60 }, (_, index) => session(`ses_${index}`, `Recent ${index}`, 2, "branch")) + const source = session("ses_old", "Older chat", 1, "main") + const api = stub([...recent, source]) + const posted: Array<{ sessions: Array<{ id: string }> }> = [] + + await handleSessionSearch({ + client: api.client as never, + message: { requestId: "all", sessionID: "ses_current" }, + dir: (id) => (id === "ses_current" ? dir : "/wrong-project"), + post: (msg) => posted.push(msg as never), + }) + + expect(api.calls).toEqual([{ worktrees: true, roots: true, directory: dir, limit: 5_000 }]) + expect(posted).toHaveLength(1) + expect(posted[0]?.sessions.map((item) => item.id)).toEqual([...recent.map((item) => item.id), source.id]) + }) + it("posts an empty result when the client is missing or the list fails", async () => { const posted: unknown[] = [] diff --git a/packages/kilo-vscode/tests/unit/sidebar-search.test.ts b/packages/kilo-vscode/tests/unit/sidebar-search.test.ts index 3d2f96c6fa..b7f8502cf0 100644 --- a/packages/kilo-vscode/tests/unit/sidebar-search.test.ts +++ b/packages/kilo-vscode/tests/unit/sidebar-search.test.ts @@ -51,9 +51,8 @@ const build = (overrides?: Partial[0]>) => localBranch: "main", untitled: "Untitled", pending: (id) => id.startsWith("pending:"), - status: (id) => (id === "busy-session" ? "busy" : "idle"), + activityFor: (id) => (id === "busy-session" ? "busy" : "idle"), busy: () => false, - localBusy: false, ...overrides, }) @@ -104,6 +103,24 @@ describe("buildSidebarSearch", () => { expect(items[4]).toMatchObject({ state: "busy", updatedAt: "2026-06-03T00:00:00.000Z" }) }) + it("uses the strongest session activity for context rows", () => { + const items = build({ + activityFor: (id) => (id === "busy-session" ? "busy" : id === "recent-session" ? "waiting" : "idle"), + }) + + expect(items.find((item) => item.key === "session:recent-session")).toMatchObject({ state: "waiting" }) + expect(items.find((item) => item.key === "worktree:wt-search")).toMatchObject({ state: "waiting" }) + }) + + it("keeps operation busy separate from session activity", () => { + const items = build({ + activityFor: () => "idle", + busy: () => true, + }) + + expect(items.find((item) => item.key === "worktree:wt-search")).toMatchObject({ state: "idle", busy: true }) + }) + it("uses expanded sidebar visibility before recency as a tie-breaker", () => { const items = build({ worktrees: [ @@ -119,7 +136,7 @@ describe("buildSidebarSearch", () => { }, ], local: [], - status: () => "idle", + activityFor: () => "idle", }) expect(items.filter((item) => item.kind === "session").map((item) => item.sessionId)).toEqual(["visible", "hidden"]) diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx index 334f25166a..c0ca26b35e 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx @@ -93,7 +93,7 @@ import { createProjectRegistry, type PersistedProjectTabs } from "./project/regi import type { WorktreeBusyState } from "./project/store" import { rememberTarget, restoreProjectTarget } from "./project/restore" import { createProjectStateRouter } from "./project/state" -import { createWorktreeBusy } from "./project/session-busy" +import { createWorktreeActivity } from "./project/session-busy" import { switchProject } from "./project/switch" import { createProjectStateHandlers } from "./project/state-handlers" import { ownsParent as ownsParentSession, isCurrent } from "./project/message-ownership" @@ -118,6 +118,7 @@ import { DataBridge } from "../src/App" import { LanguageBridge } from "../src/context/language-bridge" import { useLanguage } from "../src/context/language" import { createTabFocus } from "../src/utils/tab-navigation" +import { label, strongest } from "../src/utils/session-activity" import { canOpenRootSession, isKnownRootSession, @@ -877,37 +878,37 @@ const AgentManagerContent: Component = () => { ), ) reportVisibleSession(vscode, visibleSession) - const worktreeLabel = (wt: WorktreeState): string => { - if (wt.label) return wt.label - return firstOrderedTitle(sessionsForWorktree(wt.id), worktreeTabOrder()[wt.id], wt.branch) - } - + const worktreeLabel = (wt: WorktreeState): string => + wt.label || firstOrderedTitle(sessionsForWorktree(wt.id), worktreeTabOrder()[wt.id], wt.branch) const worktreeSubtitle = (wt: WorktreeState): string | undefined => { const label = worktreeLabel(wt) return label !== wt.branch ? wt.branch : undefined } - - const isStaleWorktree = (worktreeId: string): boolean => staleWorktreeIds().has(worktreeId) - - const busy = createWorktreeBusy({ - statuses: session.allStatusMap, - permissions: session.permissions, - questions: session.questions, + const activity = createWorktreeActivity({ managed: managedSessions, local: localSessionIDs, projects: projectSessionsLive, active: activeProjectId, + activityFor: session.activityFor, + inUseFor: session.inUseFor, worktrees: (id) => (id ? registry.ensure(id) : registry.active()).worktrees(), subscribe: vscode.onMessage, }) - const isAgentBusy = busy.agent - const isLocalBusy = busy.local - const projectBusy = busy.project - const isSessionBusy = busy.session - + const sessionActivity = createMemo(() => + strongest( + multiProject() + ? projectList() + .filter((project) => projectStates()[project.id]) + .flatMap((project) => [ + activity.project(project.id, null), + ...projectStates()[project.id]!.worktrees.map((worktree) => activity.project(project.id, worktree.id)), + ]) + : [activity.local(), ...worktrees().map((worktree) => activity.agent(worktree.id))], + ), + ) + createEffect(() => vscode.postMessage({ type: "sessionActivity", state: sessionActivity() })) /** Worktrees sorted so that grouped items are always adjacent, respecting custom order if set. */ const sortedWorktrees = createMemo(() => sortWorktrees(worktrees(), sidebarWorktreeOrder())) - const worktreesInSection = (id: string) => sortedWorktrees().filter((wt) => wt.sectionId === id) const ungrouped = createMemo(() => sortedWorktrees().filter((wt) => !wt.sectionId)) const topLevelItems = createMemo((): TopLevelItem[] => @@ -1041,14 +1042,11 @@ const AgentManagerContent: Component = () => { localBranch: repoBranch, selection, sessionId: session.currentSessionID, - statuses: session.allStatusMap, - permissions: session.permissions, - questions: session.questions, + activityFor: session.activityFor, label: worktreeLabel, sessions: sessionsForWorktree, pending: isPending, busy: (id) => busyWorktrees().has(id) || (runStatuses()[id]?.state ?? "idle") !== "idle", - localBusy: isLocalBusy, t, }) const focusSidebarSearchItem = (item: SidebarSearchItem) => { @@ -1814,7 +1812,7 @@ const AgentManagerContent: Component = () => { const confirmDeleteWorktree = (worktreeId: string) => { const wt = worktrees().find((w) => w.id === worktreeId) const run = runStatuses()[worktreeId]?.state - if (!wt || busyWorktrees().has(worktreeId) || isAgentBusy(worktreeId, true) || (run && run !== "idle")) return + if (!wt || busyWorktrees().has(worktreeId) || activity.blocked(worktreeId) || (run && run !== "idle")) return // Second press/click: execute the delete if (pendingDelete() === worktreeId) { cancelPendingDelete() @@ -2248,7 +2246,8 @@ const AgentManagerContent: Component = () => { activePendingId, visibleTabId, isPending, - isBusy: isSessionBusy, + activityFor: (id) => session.activityFor(id), + stateLabel: (state) => t(label(state)), tabLookup, adjacentHint, activateTerminal: termHandlers.activate, @@ -2312,8 +2311,7 @@ const AgentManagerContent: Component = () => { states={projectStates()} store={(id) => registry.ensure(id)} busy={(projectId, id) => registry.ensure(projectId).busy().has(id)} - working={(projectId, id, waiting) => projectBusy(projectId, id, waiting)} - localBusy={(projectId) => projectBusy(projectId, null)} + blocked={(projectId, id) => activity.blocked(id, projectId)} stats={projectLive.stats()} local={projectLive.local()} prs={projectLive.prs()} @@ -2330,6 +2328,8 @@ const AgentManagerContent: Component = () => { onShortcuts={handleShowKeyboardShortcuts} onHistory={openHistory} shortcutMap={projectShortcutMap} + activityFor={activity.project} + sessionActivity={session.activityFor} /> @@ -2339,7 +2339,7 @@ const AgentManagerContent: Component = () => { currentSessionID={session.currentSessionID} selectLocal={selectLocal} selectWorktree={selectWorktree} - isLocalBusy={isLocalBusy} + activityFor={(id) => (id === null ? activity.local() : activity.agent(id))} repoBranch={repoBranch} localStats={localStats} search={{ items: sidebarSearch.items, current: sidebarSearch.current }} @@ -2377,8 +2377,8 @@ const AgentManagerContent: Component = () => { worktreeSubtitle={worktreeSubtitle} pendingDelete={pendingDelete} busy={(id) => busyWorktrees().has(id)} - isAgentBusy={isAgentBusy} - isStaleWorktree={isStaleWorktree} + blocked={activity.blocked} + isStaleWorktree={(id) => staleWorktreeIds().has(id)} shortcutMap={shortcutMap} worktreeStats={worktreeStats} prStatuses={prStatuses} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx b/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx index 2de694b5ed..9fe1c49cfb 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/ProjectList.tsx @@ -7,6 +7,7 @@ import type { LocalGitStats, PRStatus, ProjectSessionInfo, + RunStatus, WorktreeGitStats, } from "../src/types/messages" import type { LanguageContextValue } from "../src/context/language" @@ -16,6 +17,7 @@ import { ProjectsSection } from "./ProjectsSection" import { ProjectSidebarBody } from "./ProjectSidebarBody" import { SidebarSearchMenu, type SidebarSearchMenuRef } from "./SidebarSearchMenu" import type { SidebarSearchItem } from "./sidebar-search" +import { label, type Activity } from "../src/utils/session-activity" import { LOCAL } from "./navigate" import { NewWorktreeDialog } from "./NewWorktreeDialog" import type { ProjectStore } from "./project/store" @@ -26,6 +28,10 @@ const place = (state: AgentManagerStateMessage, session: ProjectSessionInfo, loc return wt?.label || wt?.branch || local } +const activeRun = (status: RunStatus | undefined) => status?.state === "running" || status?.state === "stopping" +const operationBusy = (store: ProjectStore | undefined, id: string) => + store?.busy().has(id) || activeRun(store?.runStatuses()[id]) + interface Props { projects: AgentProjectSnapshot[] states: Record @@ -40,9 +46,10 @@ interface Props { mode: ModeRouter defaultBase?: (projectId: string) => string | undefined onCreate?: (projectId: string) => void - busy?: (projectId: string, id: string) => boolean - working?: (projectId: string, id: string, waiting?: boolean) => boolean - localBusy?: (projectId: string) => boolean + busy: (projectId: string, id: string) => boolean + blocked: (projectId: string, id: string) => boolean + activityFor: (projectId: string, worktreeId: string | null) => Activity + sessionActivity: (id: string) => Activity bindings: Record t: LanguageContextValue["t"] onSearchRef: (ref: SidebarSearchMenuRef) => void @@ -61,6 +68,7 @@ export const ProjectList: Component = (props) => { for (const project of props.projects) { const state = props.states[project.id] if (!state) continue + const store = props.store?.(project.id) const local = props.sessions[project.id]?.filter((session) => session.worktreeId === null) ?? [] items.push({ key: `${project.id}:local`, @@ -73,7 +81,7 @@ export const ProjectList: Component = (props) => { .filter(Boolean) .join(" "), updatedAt: local.reduce((latest, session) => (session.updatedAt > latest ? session.updatedAt : latest), ""), - state: "idle", + state: props.activityFor(project.id, null), visible: project.expanded, count: local.length, }) @@ -88,10 +96,11 @@ export const ProjectList: Component = (props) => { meta: [project.label, worktree.branch], search: [project.label, worktree.label, worktree.branch, worktree.id].filter(Boolean).join(" "), updatedAt: worktree.createdAt, - state: "idle", + state: props.activityFor(project.id, worktree.id), visible: project.expanded, worktreeId: worktree.id, count: sessions.length, + busy: props.busy(project.id, worktree.id) || operationBusy(store, worktree.id), }) } for (const session of props.sessions[project.id] ?? []) { @@ -106,7 +115,7 @@ export const ProjectList: Component = (props) => { meta: [project.label, where], search: [project.label, where, wt?.branch, session.title, session.id].filter(Boolean).join(" "), updatedAt: session.updatedAt, - state: "idle", + state: props.sessionActivity(session.id), visible: project.expanded, sessionId: session.id, location: session.worktreeId ? "worktree" : "local", @@ -172,8 +181,7 @@ export const ProjectList: Component = (props) => { scope: props.t("agentManager.sidebarSearch.scope"), sessions: props.t("agentManager.section.sessions"), contexts: props.t("agentManager.sidebarSearch.contexts"), - waiting: props.t("agentManager.tabsMenu.status.waiting"), - retry: props.t("agentManager.tabsMenu.status.retry"), + state: (value) => props.t(label(value)), }} onSelect={selectSearch} /> @@ -216,9 +224,9 @@ export const ProjectList: Component = (props) => { project={project} state={props.states[project.id]} store={props.store?.(project.id)} - busy={(id) => props.busy?.(project.id, id) ?? false} - working={(id, waiting) => props.working?.(project.id, id, waiting) ?? false} - localBusy={() => props.localBusy?.(project.id) ?? false} + busy={(id) => props.busy(project.id, id)} + blocked={(id) => props.blocked(project.id, id)} + activityFor={(id) => props.activityFor(project.id, id)} stats={props.stats[project.id]} local={props.local[project.id]} prs={props.prs[project.id]} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/ProjectSidebarBody.tsx b/packages/kilo-vscode/webview-ui/agent-manager/ProjectSidebarBody.tsx index 1c7ad15ac8..36eec50b98 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/ProjectSidebarBody.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/ProjectSidebarBody.tsx @@ -1,6 +1,5 @@ import { For, Show, createEffect, createMemo, createSignal, onCleanup, type Component } from "solid-js" import { Icon } from "@kilocode/kilo-ui/icon" -import { Spinner } from "@kilocode/kilo-ui/spinner" import { DragDropProvider, DragDropSensors, @@ -19,6 +18,8 @@ import type { WorktreeGitStats, } from "../src/types/messages" import type { LanguageContextValue } from "../src/context/language" +import { ActivityIcon } 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" @@ -40,9 +41,9 @@ interface Props { project: AgentProjectSnapshot state?: AgentManagerStateMessage store?: ProjectStore - busy?: (id: string) => boolean - working?: (id: string, waiting?: boolean) => boolean - localBusy?: () => boolean + busy: (id: string) => boolean + blocked: (id: string) => boolean + activityFor: (worktreeId: string | null) => Activity stats?: Record local?: LocalGitStats prs?: Record @@ -81,7 +82,7 @@ export const ProjectSidebarBody: Component = (props) => { 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.working?.(worktreeId, true)) return + if (props.busy(worktreeId) || props.blocked(worktreeId)) return if (pending() === worktreeId) { clearTimeout(pendingTimer) setPending(undefined) @@ -106,6 +107,7 @@ export const ProjectSidebarBody: Component = (props) => { const sidebarOrder = createMemo(() => projectSidebarOrder(top(), sorted(), sections(), members)) const post = (message: Record) => vscode.postMessage({ ...message, projectId: props.project.id } as never) + const localState = () => props.activityFor(null) const row = (id: string) => projectWorktreeRow({ @@ -237,9 +239,9 @@ export const ProjectSidebarBody: Component = (props) => { 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) ?? false} - working={props.working?.(worktree.id) || runs()[worktree.id]?.state === "running"} - blocked={props.working?.(worktree.id, true)} + 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} @@ -296,13 +298,18 @@ export const ProjectSidebarBody: Component = (props) => { data-sidebar-id={`${props.project.id}:local`} onClick={() => props.onSelectLocal(props.project.id)} > - + + + + + + + } + /> +
{props.t("agentManager.local")} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/SidebarBody.tsx b/packages/kilo-vscode/webview-ui/agent-manager/SidebarBody.tsx index bc3a3bcd04..07fb71325e 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/SidebarBody.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/SidebarBody.tsx @@ -1,6 +1,5 @@ import { For, Show, createMemo, createSignal, type Component } from "solid-js" import { Icon } from "@kilocode/kilo-ui/icon" -import { Spinner } from "@kilocode/kilo-ui/spinner" import { DragDropProvider, DragDropSensors, @@ -32,6 +31,8 @@ import { WorktreeItem } from "./WorktreeItem" import { WorktreeSectionActions } from "./WorktreeSectionActions" import { StatsSkeleton, WorktreeSkeleton } from "./Skeleton" import type { SidebarSearchMenuRef } from "./SidebarSearchMenu" +import { ActivityIcon } from "../src/components/shared/ActivityIcon" +import { label, type Activity } from "../src/utils/session-activity" const isMac = typeof navigator !== "undefined" && /Mac|iPhone|iPad/.test(navigator.userAgent) @@ -43,7 +44,7 @@ export interface SidebarBodyProps { currentSessionID: () => string | undefined selectLocal: () => void selectWorktree: (id: string) => void - isLocalBusy: () => boolean + activityFor: (id: string | null) => Activity repoBranch: () => string | undefined localStats: () => LocalGitStats | undefined search: { items: () => SidebarSearchItem[]; current: () => SidebarSearchItem | undefined } @@ -80,7 +81,7 @@ export interface SidebarBodyProps { worktreeSubtitle: (wt: WorktreeState) => string | undefined pendingDelete: () => string | null busy: (id: string) => boolean - isAgentBusy: (id: string, waiting?: boolean) => boolean + blocked: (id: string) => boolean isStaleWorktree: (id: string) => boolean shortcutMap: () => Map worktreeStats: () => Record @@ -95,6 +96,7 @@ export interface SidebarBodyProps { /** Legacy single-project sidebar body: local repo, worktrees, unassigned sessions. */ export const SidebarBody: Component = (props) => { const vscode = useVSCode() + const localState = () => props.activityFor(null) return ( <> @@ -104,13 +106,18 @@ export const SidebarBody: Component = (props) => { data-sidebar-id="local" onClick={() => props.selectLocal()} > - + + + + + + + } + /> +
{props.t("agentManager.local")} @@ -314,8 +321,8 @@ export const SidebarBody: Component = (props) => { active={props.selection() === wt.id} pendingDelete={props.pendingDelete() === wt.id} busy={props.busy(wt.id)} - working={props.isAgentBusy(wt.id)} - blocked={props.isAgentBusy(wt.id, true)} + activity={props.activityFor(wt.id)} + blocked={props.blocked(wt.id)} stale={props.isStaleWorktree(wt.id)} shortcut={props.shortcutMap().get(wt.id)} stats={props.worktreeStats()[wt.id]} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/SidebarSearchMenu.tsx b/packages/kilo-vscode/webview-ui/agent-manager/SidebarSearchMenu.tsx index e228c0f7d8..d9661ed7b7 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/SidebarSearchMenu.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/SidebarSearchMenu.tsx @@ -9,6 +9,8 @@ import type { ListRef } from "@kilocode/kilo-ui/list" import { Popover } from "@kilocode/kilo-ui/popover" import { Spinner } from "@kilocode/kilo-ui/spinner" import { TooltipKeybind } from "@kilocode/kilo-ui/tooltip" +import { ActivityIcon } from "../src/components/shared/ActivityIcon" +import type { Activity } from "../src/utils/session-activity" import { formatRelativeDate } from "../src/utils/date" import { colorCss } from "./section-colors" import type { SidebarSearchItem } from "./sidebar-search" @@ -20,7 +22,13 @@ export interface SidebarSearchMenuRef { interface SidebarSearchMenuProps { items: Accessor current: Accessor - labels: { search: string; scope: string; contexts: string; sessions: string; waiting: string; retry: string } + labels: { + search: string + scope: string + contexts: string + sessions: string + state: (value: Activity) => string + } keybind: string ref?: (value: SidebarSearchMenuRef) => void onSelect: (item: SidebarSearchItem) => void @@ -104,7 +112,7 @@ export const SidebarSearchMenu: Component = (props) => { }} > {(item) => { - const working = item.state === "busy" || item.state === "retry" + const stateLabel = () => props.labels.state(item.state) return ( = (props) => { data-session-id={item.kind === "session" ? item.sessionId : undefined} data-worktree-id={item.kind === "worktree" ? item.worktreeId : undefined} > - - @@ -143,13 +162,12 @@ export const SidebarSearchMenu: Component = (props) => { {item.meta.join(" · ")} - - {props.labels.waiting} + + + {stateLabel()} + - - {props.labels.retry} - - + {item.kind !== "session" ? item.count : ""} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx b/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx index e48404ffca..dcd77dfd8c 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx @@ -12,6 +12,8 @@ import { ContextMenu } from "@kilocode/kilo-ui/context-menu" import { Button } from "@kilocode/kilo-ui/button" import type { WorktreeState, WorktreeGitStats, SectionState, RunStatus } from "../src/types/messages" import type { PRStatus } from "../src/types/messages" +import { ActivityIcon } from "../src/components/shared/ActivityIcon" +import { label, running, type Activity } from "../src/utils/session-activity" import { colorCss } from "./section-colors" import { useLanguage } from "../src/context/language" import { formatRelativeDate } from "../src/utils/date" @@ -31,8 +33,7 @@ interface WorktreeItemProps { active: boolean pendingDelete: boolean busy: boolean - /** Whether an agent session on this worktree is actively working (shows spinner instead of branch icon). */ - working: boolean + activity: Activity blocked?: boolean stale: boolean /** 1-indexed shortcut number shown as ⌘2, ⌘3, etc. Pass 0, >9, or undefined to hide. */ @@ -156,6 +157,13 @@ export const WorktreeItem: Component = (props) => { const { t } = useLanguage() const [hovered, setHovered] = createSignal(false) const [overClose, setOverClose] = createSignal(false) + const state = () => props.activity + const blocked = () => + props.busy || + props.blocked || + running(state()) || + props.runStatus?.state === "running" || + props.runStatus?.state === "stopping" const handleOpenPR = (e: MouseEvent) => { e.stopPropagation() @@ -200,9 +208,12 @@ export const WorktreeItem: Component = (props) => { data-sidebar-id={props.sidebarId ?? props.worktree.id} onClick={() => props.onClick()} > -
-