From f293ecbba849384ae8b10bc7735dc79791c62cdf Mon Sep 17 00:00:00 2001 From: marius-kilocode Date: Thu, 27 Aug 2026 12:03:59 +0200 Subject: [PATCH 1/5] fix(vscode): show consistent session activity indicators --- .changeset/session-tab-attention.md | 5 + packages/kilo-vscode/src/KiloProvider.ts | 18 +- .../kilo-vscode/src/SubAgentViewerProvider.ts | 8 +- .../src/agent-manager/vscode-host.ts | 4 + .../kilo-vscode/src/kilo-provider-utils.ts | 8 +- .../src/kilo-provider/early-message.ts | 7 +- .../src/kilo-provider/native-tab-title.ts | 19 +- .../kilo-vscode/src/kilo-provider/options.ts | 1 + .../fixtures/session-provider-activity.tsx | 393 ++++++++++++++++++ .../kilo-vscode/tests/setup/vscode-mock.ts | 4 + .../tests/unit/early-message.test.ts | 11 + .../tests/unit/kilo-provider-utils.test.ts | 15 + .../tests/unit/native-tab-title.test.ts | 34 ++ .../tests/unit/project-session-busy.test.ts | 70 +++- .../tests/unit/session-activity.test.ts | 169 ++++++++ .../unit/session-provider-activity.test.ts | 48 +++ .../tests/unit/sidebar-search.test.ts | 23 +- .../agent-manager/AgentManagerApp.tsx | 47 ++- .../webview-ui/agent-manager/ProjectList.tsx | 28 +- .../agent-manager/ProjectSidebarBody.tsx | 32 +- .../webview-ui/agent-manager/SidebarBody.tsx | 28 +- .../agent-manager/SidebarSearchMenu.tsx | 60 ++- .../webview-ui/agent-manager/WorktreeItem.tsx | 15 +- .../agent-manager/WorktreeSectionActions.tsx | 4 +- .../agent-manager/agent-manager.css | 27 ++ .../webview-ui/agent-manager/i18n/ar.ts | 2 - .../webview-ui/agent-manager/i18n/br.ts | 2 - .../webview-ui/agent-manager/i18n/bs.ts | 2 - .../webview-ui/agent-manager/i18n/da.ts | 2 - .../webview-ui/agent-manager/i18n/de.ts | 2 - .../webview-ui/agent-manager/i18n/en.ts | 2 - .../webview-ui/agent-manager/i18n/es.ts | 2 - .../webview-ui/agent-manager/i18n/fa.ts | 2 - .../webview-ui/agent-manager/i18n/fr.ts | 2 - .../webview-ui/agent-manager/i18n/it.ts | 2 - .../webview-ui/agent-manager/i18n/ja.ts | 2 - .../webview-ui/agent-manager/i18n/ko.ts | 2 - .../webview-ui/agent-manager/i18n/nl.ts | 2 - .../webview-ui/agent-manager/i18n/no.ts | 2 - .../webview-ui/agent-manager/i18n/pl.ts | 2 - .../webview-ui/agent-manager/i18n/ru.ts | 2 - .../webview-ui/agent-manager/i18n/th.ts | 2 - .../webview-ui/agent-manager/i18n/tr.ts | 2 - .../webview-ui/agent-manager/i18n/uk.ts | 2 - .../webview-ui/agent-manager/i18n/zh.ts | 2 - .../webview-ui/agent-manager/i18n/zht.ts | 2 - .../agent-manager/project/session-busy.ts | 60 ++- .../agent-manager/sidebar-search.ts | 60 ++- .../webview-ui/agent-manager/sortable-tab.tsx | 7 +- .../agent-manager/tab-rendering.tsx | 10 +- packages/kilo-vscode/webview-ui/src/App.tsx | 7 +- .../src/components/chat/SessionTab.tsx | 14 +- .../src/components/chat/SessionTabStrip.tsx | 14 +- .../components/chat/SessionTabSwitcher.tsx | 22 +- .../src/components/shared/ActivityIcon.tsx | 22 + .../webview-ui/src/context/session-utils.ts | 28 ++ .../webview-ui/src/context/session.tsx | 57 ++- .../src/stories/agent-manager.stories.tsx | 50 ++- .../src/stories/section-header.stories.tsx | 6 +- .../src/stories/session-tabs.stories.tsx | 105 ++++- .../webview-ui/src/styles/session-tabs.css | 21 + .../src/types/messages/extension-messages.ts | 1 + .../src/types/messages/webview-messages.ts | 2 + .../webview-ui/src/utils/session-activity.ts | 85 ++++ 64 files changed, 1418 insertions(+), 273 deletions(-) create mode 100644 .changeset/session-tab-attention.md create mode 100644 packages/kilo-vscode/tests/fixtures/session-provider-activity.tsx create mode 100644 packages/kilo-vscode/tests/unit/session-activity.test.ts create mode 100644 packages/kilo-vscode/tests/unit/session-provider-activity.test.ts create mode 100644 packages/kilo-vscode/webview-ui/src/components/shared/ActivityIcon.tsx create mode 100644 packages/kilo-vscode/webview-ui/src/utils/session-activity.ts diff --git a/.changeset/session-tab-attention.md b/.changeset/session-tab-attention.md new file mode 100644 index 00000000000..2a0d3b3225e --- /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/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts index 1c1450bebc9..8bd0bb43379 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" @@ -391,6 +392,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 @@ -508,7 +511,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 { @@ -1035,6 +1046,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 a11a98bf1af..046d19325fe 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/vscode-host.ts b/packages/kilo-vscode/src/agent-manager/vscode-host.ts index 83b307727c3..a015fc45af8 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 c1284b1d481..1aafaacf42f 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 04c5cdb0a50..8b9454e5686 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 7166b9cd9a9..c4b7a757164 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 +const icons: Record = { + idle: "", + busy: "◔", + retry: "◔", + waiting: "⚠", + error: "⚠", + done: "✓", +} -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)}...` +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 b9e9994d891..fa3f56c05ce 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/tests/fixtures/session-provider-activity.tsx b/packages/kilo-vscode/tests/fixtures/session-provider-activity.tsx new file mode 100644 index 00000000000..7de89185d6e --- /dev/null +++ b/packages/kilo-vscode/tests/fixtures/session-provider-activity.tsx @@ -0,0 +1,393 @@ +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, + 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") + await emit({ type: "sessionStatus", sessionID: "task-grand", status: "idle" }) + await check("root", "idle") + + 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: "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") + 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/setup/vscode-mock.ts b/packages/kilo-vscode/tests/setup/vscode-mock.ts index 9d01986cc87..05cfb52e829 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/early-message.test.ts b/packages/kilo-vscode/tests/unit/early-message.test.ts index cad4c42b43b..5329af16d82 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/kilo-provider-utils.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts index 75ed68671e5..2c8ce4fb6e6 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/native-tab-title.test.ts b/packages/kilo-vscode/tests/unit/native-tab-title.test.ts index f949f88e3ec..d1775b1c76a 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 27d480fcf56..4de226f9859 100644 --- a/packages/kilo-vscode/tests/unit/project-session-busy.test.ts +++ b/packages/kilo-vscode/tests/unit/project-session-busy.test.ts @@ -1,31 +1,61 @@ import { describe, expect, it } from "bun:test" -import { createSessionBusy } from "../../webview-ui/agent-manager/project/session-busy" +import { createSessionActivity } from "../../webview-ui/agent-manager/project/session-busy" -const busy = (statuses: Record) => - createSessionBusy({ - statuses: () => statuses, - permissions: () => [], - questions: () => [], +const activity = (values: Record) => + createSessionActivity({ 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) => values[id] ?? "idle", }) -describe("createSessionBusy", () => { - it("does not mark stopped or unknown sessions as busy", () => { - const state = busy({ idle: { type: "idle" } }) +describe("createSessionActivity", () => { + it("returns idle for groups without sessions", () => { + const state = activity({}) - expect(state.agent("wt-unknown")).toBe(false) - expect(state.agent("wt-idle")).toBe(false) - expect(state.project("background", "wt-unknown")).toBe(false) + expect(state.agent("wt-missing")).toBe("idle") + expect(state.project("background", "wt-missing")).toBe("idle") }) - it("marks sessions with an active status as busy", () => { - expect(busy({ working: { type: "busy" } }).agent("wt-working")).toBe(true) + 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.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("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") }) }) 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 00000000000..6d4d282bd42 --- /dev/null +++ b/packages/kilo-vscode/tests/unit/session-activity.test.ts @@ -0,0 +1,169 @@ +import { describe, expect, it } from "bun:test" +import { + activities, + activity, + isActivity, + label, + running, + 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("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("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 00000000000..bcf5fe4d245 --- /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/sidebar-search.test.ts b/packages/kilo-vscode/tests/unit/sidebar-search.test.ts index 3d2f96c6fab..b7f8502cf0a 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 6c1f9494351..7561ad12a5b 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx @@ -91,7 +91,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 { createSessionBusy } from "./project/session-busy" +import { createSessionActivity } from "./project/session-busy" import { switchProject } from "./project/switch" import { createProjectStateHandlers } from "./project/state-handlers" import { ownsParent as ownsParentSession, isCurrent } from "./project/message-ownership" @@ -116,6 +116,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, @@ -123,6 +124,7 @@ import { adjacentHint, focusChatSearch, LOCAL, + remoteSessions, } from "./navigate" import { buildProjectNavEntries, createProjectNav } from "./project-nav" import { @@ -898,22 +900,26 @@ const AgentManagerContent: Component = () => { return label !== wt.branch ? wt.branch : undefined } - const isStaleWorktree = (worktreeId: string): boolean => staleWorktreeIds().has(worktreeId) - - const busy = createSessionBusy({ - statuses: session.allStatusMap, - permissions: session.permissions, - questions: session.questions, + const activity = createSessionActivity({ managed: managedSessions, local: localSessionIDs, projects: projectSessionsLive, active: activeProjectId, + activityFor: session.activityFor, }) - 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)), + ]) + : remoteSessions(localSessionIDs(), managedSessions(), isPending).map(session.activityFor), + ), + ) + 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())) @@ -1050,14 +1056,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) => { @@ -2255,7 +2258,8 @@ const AgentManagerContent: Component = () => { activePendingId, visibleTabId, isPending, - isBusy: isSessionBusy, + activityFor: (id) => session.activityFor(id), + stateLabel: (state) => t(label(state)), tabLookup, adjacentHint, activateTerminal: termHandlers.activate, @@ -2319,8 +2323,6 @@ const AgentManagerContent: Component = () => { states={projectStates()} store={(id) => registry.ensure(id)} busy={(projectId, id) => registry.ensure(projectId).busy().has(id)} - working={(projectId, id) => projectBusy(projectId, id)} - localBusy={(projectId) => projectBusy(projectId, null)} stats={projectLive.stats()} local={projectLive.local()} prs={projectLive.prs()} @@ -2337,6 +2339,8 @@ const AgentManagerContent: Component = () => { onShortcuts={handleShowKeyboardShortcuts} onHistory={openHistory} shortcutMap={projectShortcutMap} + activityFor={activity.project} + sessionActivity={session.activityFor} /> @@ -2346,7 +2350,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 }} @@ -2384,8 +2388,7 @@ const AgentManagerContent: Component = () => { worktreeSubtitle={worktreeSubtitle} pendingDelete={pendingDelete} busy={(id) => busyWorktrees().has(id)} - isAgentBusy={isAgentBusy} - isStaleWorktree={isStaleWorktree} + 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 ee2c86e9be5..eb1aeb922a5 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,9 @@ interface Props { mode: ModeRouter defaultBase?: (projectId: string) => string | undefined onCreate?: (projectId: string) => void - busy?: (projectId: string, id: string) => boolean - working?: (projectId: string, id: string) => boolean - localBusy?: (projectId: string) => boolean + busy: (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 +67,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 +80,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 +95,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 +114,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 +180,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 +223,8 @@ 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) => props.working?.(project.id, id) ?? false} - localBusy={() => props.localBusy?.(project.id) ?? false} + busy={(id) => props.busy(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 52741e14402..c5d2b5bbbd5 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,8 @@ interface Props { project: AgentProjectSnapshot state?: AgentManagerStateMessage store?: ProjectStore - busy?: (id: string) => boolean - working?: (id: string) => boolean - localBusy?: () => boolean + busy: (id: string) => boolean + activityFor: (worktreeId: string | null) => Activity stats?: Record local?: LocalGitStats prs?: Record @@ -105,6 +105,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({ @@ -236,8 +237,8 @@ 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"} + busy={props.busy(worktree.id)} + activity={props.activityFor(worktree.id)} stale={state()?.staleWorktreeIds?.includes(worktree.id) === true} stats={props.stats?.[worktree.id]} shortcut={values().shortcut} @@ -294,13 +295,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 5e5e8ded6de..3d381e6e396 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,6 @@ export interface SidebarBodyProps { worktreeSubtitle: (wt: WorktreeState) => string | undefined pendingDelete: () => string | null busy: (id: string) => boolean - isAgentBusy: (id: string) => boolean isStaleWorktree: (id: string) => boolean shortcutMap: () => Map worktreeStats: () => Record @@ -95,6 +95,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 +105,18 @@ export const SidebarBody: Component = (props) => { data-sidebar-id="local" onClick={() => props.selectLocal()} > - + + + + + + + } + /> +
{props.t("agentManager.local")} @@ -314,7 +320,7 @@ 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)} + activity={props.activityFor(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 e228c0f7d86..7bb9fecdd52 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} - - - {props.labels.retry} + + + {stateLabel()} + - + {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 c44b767cffd..5c36b39f66f 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, 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 stale: boolean /** 1-indexed shortcut number shown as ⌘2, ⌘3, etc. Pass 0, >9, or undefined to hide. */ shortcut?: number @@ -155,6 +156,7 @@ export const WorktreeItem: Component = (props) => { const { t } = useLanguage() const [hovered, setHovered] = createSignal(false) const [overClose, setOverClose] = createSignal(false) + const state = () => props.activity const handleOpenPR = (e: MouseEvent) => { e.stopPropagation() @@ -199,9 +201,12 @@ export const WorktreeItem: Component = (props) => { data-sidebar-id={props.sidebarId ?? props.worktree.id} onClick={() => props.onClick()} > -
-