diff --git a/.changeset/scheduled-wakeup-status.md b/.changeset/scheduled-wakeup-status.md new file mode 100644 index 000000000000..aa1cf18b76b2 --- /dev/null +++ b/.changeset/scheduled-wakeup-status.md @@ -0,0 +1,5 @@ +--- +"kilo-code": minor +--- + +Show a clock status on Agent Manager tabs and worktrees when a session is waiting for a scheduled wakeup. diff --git a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-changes-chromium-linux.png b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-changes-chromium-linux.png index af3bd72e5748..ce2efcbd870c 100644 --- a/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-changes-chromium-linux.png +++ b/packages/kilo-docs/public/img/screenshot-tests/kilo-vscode/visual-regression/agentmanager/full-screen-diff-with-changes-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:003ea4d8d6412bbda7ad30c2658baf6d69f75232a0494e3d07f28793e4602f5e -size 53514 +oid sha256:ffcf0db51ace530056ba92e57295670ce51f311a8428586cfec51520691a002c +size 53216 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 index 1596eedfdde6..5b3d4745577a 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c071338a92316478623abbe23cdb262c366917266511a599f405ccdd7e399225 -size 5710 +oid sha256:29ccfd40f43631c34e22aae6bf397ca6a15a7329bef1077e6f7a82a264a0064b +size 6279 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 index cf734a5f6643..72d91851ce52 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e275e0ec4ce304fc29c71eaac017872a6828d52fa73a504acce4b779fa389228 -size 7407 +oid sha256:ec9887733798a1d45532aa89eae21533bd7aaccfe68825ae88388fc65c6b32b3 +size 8472 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 index 937d23edecb3..53435d430561 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f924b317c2eafaf5112229cc31404591d7526a7e0fba8c1d46cd97597c3a4392 -size 1778 +oid sha256:72c3e0596c1e8fdc349bd9d4b3af5732e1cc18af36c7f488b73faa61e8775585 +size 1569 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 index 484a1eb1d78e..c6e1ee2a3133 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:268efbc7a6121b9fa3c2c843308b70f41a2235d2b9447e61ef6ac5c38b23c5b5 -size 3729 +oid sha256:3a618cbbe306c3f7c6379d8c91b4b58f4a72ed3d5df78203284b219ad9067314 +size 3405 diff --git a/packages/kilo-ui/src/components/icon.tsx b/packages/kilo-ui/src/components/icon.tsx index 67806b85a051..d55da54b51e3 100644 --- a/packages/kilo-ui/src/components/icon.tsx +++ b/packages/kilo-ui/src/components/icon.tsx @@ -99,6 +99,10 @@ const icons: Record = { viewBox: "0 0 20 20", path: ``, }, + clock: { + viewBox: "0 0 20 20", + path: ``, + }, local: { viewBox: "0 0 20 20", path: ``, diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts index a380b6f79353..0cded1332f4c 100644 --- a/packages/kilo-vscode/src/KiloProvider.ts +++ b/packages/kilo-vscode/src/KiloProvider.ts @@ -55,7 +55,7 @@ import { removeMcp } from "./kilo-provider/remove-config-item" import { MarketplaceService } from "./services/marketplace" import type { RemoteStatusService } from "./services/RemoteStatusService" import { resolveProjectDirectory } from "./project-directory" -import { seedSessionStatuses } from "./session-status" +import { seedSessionStatuses, seedSessionWakeups } from "./session-status" import { normalizeEnhancePromptErrorMessage } from "./enhance-prompt-error" import { retry } from "./services/cli-backend/retry" import { integratedBrowserUseSystemChrome } from "./services/browser-automation/chrome-setting" @@ -442,6 +442,9 @@ 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 wakeupSessions = new Set() // Sessions with a pending wakeup at the last seed. + private wakeupSeeding = false // In-flight guard so concurrent transitions share one seed. + private wakeupLive = new Map() // Live pending counts seen during an in-flight seed. private activity: Activity = "idle" private active = false private caption: string | undefined @@ -803,6 +806,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.postMessage({ type: "gitStatus", repo: this.cachedGitRepo }) void this.seedSessionStatusMap() + void this.seedSessionWakeups() this.sendRemoteStatus() } @@ -1952,6 +1956,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper // for the busy-session warning on Save. if (event.type === "session.status") return true + // session.wakeup must also always pass through. Wakeups are cheap and + // worktree sessions without an open tab still need their scheduled + // indicator kept current. + if (event.type === "session.wakeup") return true + // session.deleted must always pass through so the webview can run its cleanup // (messages, parts, stash, todos, permissions, drafts, etc.) — including for // sessions that were never explicitly tracked here (e.g. child sessions @@ -3285,6 +3294,53 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper ) } + private async seedSessionWakeups(): Promise { + if (!this.client || this.connectionState !== "connected") return + if (this.wakeupSeeding) return + this.wakeupSeeding = true + // Snapshot before the awaits and record live events that arrive while the + // seed requests are in flight: they are newer than the responses, so they + // override both the snapshot and `seen` below. + const before = new Set(this.wakeupSessions) + this.wakeupLive = new Map() + try { + const { seen, complete } = await seedSessionWakeups( + this.client, + this.connectionService.getKnownDirectories(), + (message) => this.postMessage(message), + (sessionID) => !this.removedSessionIds.has(sessionID), + ) + // Only reconcile when every directory answered. A failed directory is + // absent from `seen`, so clearing on a partial result would drop valid + // wakeups for that directory's sessions. + if (complete) { + const live = this.wakeupLive + const next = new Set(seen) + for (const [sessionID, pending] of live) { + if (pending > 0) next.add(sessionID) + else next.delete(sessionID) + } + // A wakeup that fired or was cancelled while disconnected is absent + // from the seed response, so clear any session the previous seed saw + // that no live event has since updated. A session scheduled during the + // seed is absent from `seen` but present in `live`, so it survives. + for (const sessionID of before) { + if (!seen.has(sessionID) && !live.has(sessionID)) + this.postMessage({ type: "sessionWakeup", sessionID, pending: 0 }) + } + this.wakeupSessions = next + } else { + // Keep tracking sessions from failed directories so a later complete + // seed can still reconcile them. + this.wakeupSessions = new Set([...this.wakeupSessions, ...seen]) + } + } catch (error) { + console.error("[Kilo New] KiloProvider: Failed to seed session wakeups:", error) + } finally { + this.wakeupSeeding = false + } + } + /** * Fetch the latest merged config and push it as configUpdated. * Called when global.config.updated SSE fires (config changed without a full dispose). @@ -5131,6 +5187,23 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper return } + // session.wakeup also passes the pre-filter for all providers. Forward it + // before the trackedSessionIds guard so worktree sessions without an open + // tab keep their scheduled indicator current. + if (event.type === "session.wakeup") { + const sid = event.properties.sessionID + if (this.removedSessionIds.has(sid)) return + // Track live sessions too, so a wakeup cancelled while disconnected is + // still reconciled to zero by the next complete seed. + if (event.properties.pending > 0) this.wakeupSessions.add(sid) + else this.wakeupSessions.delete(sid) + // While a seed is in flight, remember the live pending count. It is newer + // than the seed response and must win over the seed's reconcile step. + if (this.wakeupSeeding) this.wakeupLive.set(sid, event.properties.pending) + this.postMessage({ type: "sessionWakeup", sessionID: sid, pending: event.properties.pending }) + return + } + // Extract sessionID from the event if (event.type === "session.created" && this.adoptPendingFollowup(event.properties.info)) { return @@ -5854,6 +5927,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.requests.clear() this.epochs.clear() this.sessionStatusMap.clear() + this.wakeupSessions.clear() this.ignoreController?.dispose() this.chatAutocomplete?.dispose() disposeGitChangesTarget() diff --git a/packages/kilo-vscode/src/kilo-provider-utils.ts b/packages/kilo-vscode/src/kilo-provider-utils.ts index 0c31cdd74c5b..aa31013ae3d9 100644 --- a/packages/kilo-vscode/src/kilo-provider-utils.ts +++ b/packages/kilo-vscode/src/kilo-provider-utils.ts @@ -434,6 +434,7 @@ export type WebviewMessage = message: Record } | { type: "sessionStatus"; sessionID: string; status: string; attempt?: number; message?: string; next?: number } + | { type: "sessionWakeup"; sessionID: string; pending: number } | { type: "sessionTurnClosed" sessionID: string @@ -531,42 +532,46 @@ function statusExtra(info: Extract["propertie return {} } -export function mapSSEEventToWebviewMessage(event: StreamEvent, sessionID: string | undefined): WebviewMessage { - if (event.type === "sync") { - switch (event.name) { - case "message.updated.1": { - const info = event.data.info - return { - type: "messageCreated", - message: { - ...info, - createdAt: new Date(info.time.created).toISOString(), - }, - } +function mapSyncEvent(event: SyncEvent, sessionID: string | undefined): WebviewMessage { + switch (event.name) { + case "message.updated.1": { + const info = event.data.info + return { + type: "messageCreated", + message: { + ...info, + createdAt: new Date(info.time.created).toISOString(), + }, } - case "message.removed.1": - return { - type: "messageRemoved", - sessionID: event.data.sessionID, - messageID: event.data.messageID, - } - case "message.part.updated.1": - case "message.part.removed.1": - return mapPartEvent(event, sessionID) - case "session.created.1": - return { - type: "sessionCreated", - session: sessionToWebview(event.data.info), - } - case "session.updated.1": - return null - case "session.deleted.1": - return { - type: "sessionDeleted", - sessionID: event.data.sessionID, - } } + case "message.removed.1": + return { + type: "messageRemoved", + sessionID: event.data.sessionID, + messageID: event.data.messageID, + } + case "message.part.updated.1": + case "message.part.removed.1": + return mapPartEvent(event, sessionID) + case "session.created.1": + return { + type: "sessionCreated", + session: sessionToWebview(event.data.info), + } + case "session.updated.1": + return null + case "session.deleted.1": + return { + type: "sessionDeleted", + sessionID: event.data.sessionID, + } + default: + return null } +} + +export function mapSSEEventToWebviewMessage(event: StreamEvent, sessionID: string | undefined): WebviewMessage { + if (event.type === "sync") return mapSyncEvent(event, sessionID) if (event.type === "message.part.delta") return mapPartEvent(event, sessionID) switch (event.type) { case "session.status": { @@ -580,6 +585,12 @@ export function mapSSEEventToWebviewMessage(event: StreamEvent, sessionID: strin ...extra, } } + case "session.wakeup": + return { + type: "sessionWakeup" as const, + sessionID: event.properties.sessionID, + pending: event.properties.pending, + } case "session.turn.close": return { type: "sessionTurnClosed", 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 c4b7a7571644..f05cdc8ca0ab 100644 --- a/packages/kilo-vscode/src/kilo-provider/native-tab-title.ts +++ b/packages/kilo-vscode/src/kilo-provider/native-tab-title.ts @@ -11,6 +11,7 @@ const icons: Record = { waiting: "⚠", error: "⚠", done: "✓", + scheduled: "◷", } export const nativeTitle = (session: Session | null, state: Activity = "idle", label?: string) => { diff --git a/packages/kilo-vscode/src/services/cli-backend/connection-utils.ts b/packages/kilo-vscode/src/services/cli-backend/connection-utils.ts index 8a25d8527444..67757493922c 100644 --- a/packages/kilo-vscode/src/services/cli-backend/connection-utils.ts +++ b/packages/kilo-vscode/src/services/cli-backend/connection-utils.ts @@ -61,29 +61,31 @@ function resolveSyncSessionId( return event.data.sessionID } +const sessionScopedTransientEvents = new Set([ + "session.status", + "session.turn.open", + "session.turn.close", + "session.idle", + "session.error", + "session.wakeup", + "todo.updated", + "message.part.delta", + "permission.asked", + "permission.replied", + "question.asked", + "question.replied", + "question.rejected", + "suggestion.shown", + "suggestion.accepted", + "suggestion.dismissed", + "session.network.asked", + "session.network.replied", + "session.network.rejected", + "session.network.restored", +]) + function resolveTransientSessionId(event: TransientPayload): string | undefined { - switch (event.type) { - case "session.status": - case "session.turn.open": - case "session.turn.close": - case "session.idle": - case "session.error": - case "todo.updated": - case "message.part.delta": - case "permission.asked": - case "permission.replied": - case "question.asked": - case "question.replied": - case "question.rejected": - case "suggestion.shown": - case "suggestion.accepted": - case "suggestion.dismissed": - case "session.network.asked": - case "session.network.replied": - case "session.network.rejected": - case "session.network.restored": - return event.properties.sessionID - default: - return undefined - } + if (!sessionScopedTransientEvents.has(event.type)) return undefined + const properties = (event as { properties?: { sessionID?: string } }).properties + return properties?.sessionID } diff --git a/packages/kilo-vscode/src/session-status.ts b/packages/kilo-vscode/src/session-status.ts index 0f83d93ad2d4..d89e137fe855 100644 --- a/packages/kilo-vscode/src/session-status.ts +++ b/packages/kilo-vscode/src/session-status.ts @@ -45,3 +45,37 @@ export async function seedSessionStatuses( console.error("[Kilo New] KiloProvider: Failed to seed session statuses:", error) } } + +/** + * Fetch pending wakeup counts for every known directory and seed the webview. + * Wakeups are directory scoped, unlike session status, so each directory needs + * its own request. A failed directory is logged and skipped: one missing + * directory must not blank the others. Returns the session IDs that still hold + * a wakeup and whether every directory answered, so the caller can reconcile a + * previous seed to zero only when the result is complete. + */ +export async function seedSessionWakeups( + client: KiloClient, + dirs: string[], + post: (msg: unknown) => void, + accept?: (sessionID: string) => boolean, +): Promise<{ seen: Set; complete: boolean }> { + const seen = new Set() + let complete = true + await Promise.all( + dirs.map(async (dir) => { + try { + const result = await client.kilocode.wakeups({ directory: dir }, { throwOnError: true }) + for (const item of result.data ?? []) { + if (accept && !accept(item.sessionID)) continue + seen.add(item.sessionID) + post({ type: "sessionWakeup", sessionID: item.sessionID, pending: item.pending }) + } + } catch (error) { + complete = false + console.error(`[Kilo New] KiloProvider: Failed to seed session wakeups for ${dir}:`, error) + } + }), + ) + return { seen, complete } +} diff --git a/packages/kilo-vscode/tests/unit/connection-utils.test.ts b/packages/kilo-vscode/tests/unit/connection-utils.test.ts index 3a31216509d4..c56874276c19 100644 --- a/packages/kilo-vscode/tests/unit/connection-utils.test.ts +++ b/packages/kilo-vscode/tests/unit/connection-utils.test.ts @@ -114,6 +114,16 @@ describe("resolveEventSessionId", () => { expect(resolveEventSessionId(event, noLookup)).toBe("s3") }) + it("routes session.wakeup events", () => { + const event = { + id: "e6-wakeup", + type: "session.wakeup", + properties: { sessionID: "s12", pending: 2 }, + } satisfies Payload + + expect(resolveEventSessionId(event, noLookup)).toBe("s12") + }) + it("routes transient message deltas", () => { const event = { id: "e7", diff --git a/packages/kilo-vscode/tests/unit/early-message.test.ts b/packages/kilo-vscode/tests/unit/early-message.test.ts index 35fb17c2edb9..3436b2b1c55b 100644 --- a/packages/kilo-vscode/tests/unit/early-message.test.ts +++ b/packages/kilo-vscode/tests/unit/early-message.test.ts @@ -63,10 +63,10 @@ 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"]) { + for (const state of ["busy", "waiting", "done", "scheduled", "error", "idle"]) { expect(await routeEarlyMessage({ type: "sessionActivity", state }, ctx)).toBe(true) } - expect(calls).toEqual(["busy", "waiting", "done", "error", "idle"]) + expect(calls).toEqual(["busy", "waiting", "done", "scheduled", "error", "idle"]) }) }) diff --git a/packages/kilo-vscode/tests/unit/kilo-provider-session-refresh.test.ts b/packages/kilo-vscode/tests/unit/kilo-provider-session-refresh.test.ts index 03a010a3b656..c17633fec952 100644 --- a/packages/kilo-vscode/tests/unit/kilo-provider-session-refresh.test.ts +++ b/packages/kilo-vscode/tests/unit/kilo-provider-session-refresh.test.ts @@ -16,6 +16,9 @@ type ProviderInternals = { isWebviewReady: boolean syncWebviewState: (reason: string) => Promise handleMigrationMessage: (message: { type: string }) => boolean + seedSessionWakeups: () => Promise + handleEvent: (event: unknown, directory?: string) => void + wakeupSessions: Set } function deferred() { @@ -77,6 +80,13 @@ function createClient() { notifications: async () => ({ data: [] }), profile: async () => ({ data: {} }), }, + kilocode: { + wakeups: async (_params: { + directory: string + }): Promise<{ data: Array<{ sessionID: string; pending: number }> }> => ({ + data: [], + }), + }, } } @@ -101,6 +111,7 @@ function createConnection(client: ReturnType) { onModelSelectorExpandedChanged: () => () => undefined, onClearPendingPrompts: () => () => undefined, registerDirectoryProvider: () => () => undefined, + getKnownDirectories: () => ["/repo"], getServerInfo: () => ({ port: 12345 }), getServerConfig: () => ({ baseUrl: "http://127.0.0.1:12345", password: "test" }), getConnectionState: () => "connected" as const, @@ -384,4 +395,73 @@ describe("KiloProvider pending session refresh", () => { expect(errors).toEqual([]) }) + + it("reconciles a cancelled wakeup to zero after a complete seed", async () => { + const client = createClient() + client.kilocode.wakeups = async () => ({ data: [{ sessionID: "s1", pending: 2 }] }) + const connection = createConnection(client) + await connection.connect() + const provider = new KiloProvider({} as never, connection as never) + const internal = provider as unknown as ProviderInternals + const sent: unknown[] = [] + internal.connectionState = "connected" + internal.webview = { postMessage: async (message: unknown) => void sent.push(message) } + + await internal.seedSessionWakeups() + expect(sent).toContainEqual({ type: "sessionWakeup", sessionID: "s1", pending: 2 }) + + client.kilocode.wakeups = async () => ({ data: [] }) + await internal.seedSessionWakeups() + + expect(sent).toContainEqual({ type: "sessionWakeup", sessionID: "s1", pending: 0 }) + expect(internal.wakeupSessions.has("s1")).toBe(false) + }) + + it("keeps tracked wakeups when one directory fails", async () => { + const client = createClient() + client.kilocode.wakeups = async () => ({ data: [{ sessionID: "s1", pending: 2 }] }) + const connection = createConnection(client) + connection.getKnownDirectories = () => ["/repo", "/good"] + await connection.connect() + const provider = new KiloProvider({} as never, connection as never) + const internal = provider as unknown as ProviderInternals + const sent: unknown[] = [] + internal.connectionState = "connected" + internal.webview = { postMessage: async (message: unknown) => void sent.push(message) } + + await internal.seedSessionWakeups() + expect(internal.wakeupSessions.has("s1")).toBe(true) + + sent.length = 0 + client.kilocode.wakeups = async (params: { directory: string }) => { + if (params.directory === "/good") throw new Error("offline") + return { data: [] } + } + await internal.seedSessionWakeups() + + expect(sent).not.toContainEqual(expect.objectContaining({ type: "sessionWakeup", sessionID: "s1", pending: 0 })) + expect(internal.wakeupSessions.has("s1")).toBe(true) + }) + + it("keeps a wakeup scheduled while a complete seed is in flight", async () => { + const client = createClient() + const pending = deferred<{ data: Array<{ sessionID: string; pending: number }> }>() + client.kilocode.wakeups = () => pending.promise + const connection = createConnection(client) + await connection.connect() + const provider = new KiloProvider({} as never, connection as never) + const internal = provider as unknown as ProviderInternals + const sent: unknown[] = [] + internal.connectionState = "connected" + internal.webview = { postMessage: async (message: unknown) => void sent.push(message) } + + const seeding = internal.seedSessionWakeups() + internal.handleEvent({ type: "session.wakeup", properties: { sessionID: "live", pending: 1 } }) + pending.resolve({ data: [] }) + await seeding + + expect(sent).not.toContainEqual({ type: "sessionWakeup", sessionID: "live", pending: 0 }) + expect(sent).toContainEqual({ type: "sessionWakeup", sessionID: "live", pending: 1 }) + expect(internal.wakeupSessions.has("live")).toBe(true) + }) }) 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 af16b37863b9..61d89d74b455 100644 --- a/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts +++ b/packages/kilo-vscode/tests/unit/kilo-provider-utils.test.ts @@ -20,6 +20,7 @@ import type { Provider, Event, EventSessionStatus, + EventSessionWakeup, EventSessionTurnClose, EventSessionError, EventSandboxStatusChanged, @@ -384,6 +385,19 @@ describe("mapSSEEventToWebviewMessage", () => { } }) + it("maps session.wakeup to sessionWakeup", () => { + const event: EventSessionWakeup = { + type: "session.wakeup", + properties: { sessionID: "sess-1", pending: 2 }, + } + + expect(mapSSEEventToWebviewMessage(event, "sess-1")).toEqual({ + type: "sessionWakeup", + sessionID: "sess-1", + pending: 2, + }) + }) + it("maps sandbox status changes to effective button state", () => { const event: EventSandboxStatusChanged = { type: "sandbox.status.changed", 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 28bb19cab28d..803bd5962a46 100644 --- a/packages/kilo-vscode/tests/unit/native-tab-title.test.ts +++ b/packages/kilo-vscode/tests/unit/native-tab-title.test.ts @@ -40,10 +40,10 @@ describe("nativeTitle", () => { return { dispose: () => {} } }, }) - for (const state of ["busy", "waiting", "done", "error", "idle", "idle", "invalid", null]) { + for (const state of ["busy", "waiting", "done", "scheduled", "error", "idle", "idle", "invalid", null]) { await listener.current?.({ type: "sessionActivity", state }) } - expect(titles).toEqual(["◔ Kilo Code", "⚠ Kilo Code", "✓ Kilo Code", "⚠ Kilo Code", "Kilo Code"]) + expect(titles).toEqual(["◔ Kilo Code", "⚠ Kilo Code", "✓ Kilo Code", "◷ Kilo Code", "⚠ Kilo Code", "Kilo Code"]) provider.dispose() }) @@ -53,6 +53,7 @@ describe("nativeTitle", () => { 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"), "scheduled")).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/session-activity.test.ts b/packages/kilo-vscode/tests/unit/session-activity.test.ts index 50ffb29ac992..d7996bf1ed5f 100644 --- a/packages/kilo-vscode/tests/unit/session-activity.test.ts +++ b/packages/kilo-vscode/tests/unit/session-activity.test.ts @@ -31,6 +31,15 @@ describe("activity", () => { expect(activity({ status: "busy", finished: true })).toBe("busy") expect(activity({ finished: true })).toBe("done") }) + + it("reports scheduled only while idle and weaker than done", () => { + expect(activity({ scheduled: true })).toBe("scheduled") + expect(activity({ scheduled: true, finished: true })).toBe("done") + expect(activity({ scheduled: true, status: "busy" })).toBe("busy") + expect(activity({ scheduled: true, status: "retry" })).toBe("retry") + expect(activity({ scheduled: true, blocked: true })).toBe("waiting") + expect(activity({ scheduled: true, status: "offline" })).toBe("error") + }) }) describe("activities", () => { @@ -50,6 +59,40 @@ describe("activities", () => { expect(result).toEqual({ root: "waiting", child: "waiting", nested: "waiting", other: "busy" }) }) + it("shows a scheduled wakeup only for the owning idle session", () => { + const input = { + parents, + statuses: {}, + outcomes: {}, + blocked: [], + disconnected: false, + } + expect(activities({ ...input, scheduled: ["nested"] })).toEqual({ nested: "scheduled" }) + expect( + activities({ ...input, scheduled: ["nested"], statuses: { nested: { type: "busy" as const } } }).nested, + ).toBe("busy") + expect(activities({ ...input, scheduled: ["nested"], outcomes: { nested: { reason: "completed" } } }).nested).toBe( + "done", + ) + expect( + activities({ ...input, scheduled: ["nested"], outcomes: { nested: { reason: "completed", seen: true } } }).nested, + ).toBe("scheduled") + expect(activities({ ...input, scheduled: ["nested"], blocked: ["nested"] }).nested).toBe("waiting") + }) + + it("does not roll a child scheduled wakeup up to its parent", () => { + expect( + activities({ + parents, + statuses: {}, + outcomes: {}, + blocked: [], + scheduled: ["nested"], + disconnected: false, + }), + ).toEqual({ nested: "scheduled" }) + }) + it("rolls up child work but leaves terminal outcomes with their owning sessions", () => { const input = { parents, @@ -165,6 +208,7 @@ describe("isActivity", () => { it("accepts only known presentation states", () => { expect(isActivity("waiting")).toBe(true) expect(isActivity("done")).toBe(true) + expect(isActivity("scheduled")).toBe(true) expect(isActivity("idle")).toBe(true) expect(isActivity("unknown")).toBe(false) expect(isActivity({ state: "waiting" })).toBe(false) @@ -183,8 +227,8 @@ describe("running", () => { 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]) + const states: Activity[] = ["idle", "scheduled", "done", "busy", "retry", "error", "waiting"] + expect(states.map(score)).toEqual([0, 1, 2, 3, 4, 5, 6]) for (const [index, state] of states.entries()) { for (const lower of states.slice(0, index + 1)) { expect(strongest([state, lower])).toBe(state) @@ -199,19 +243,22 @@ describe("strongest", () => { expect(strongest(["busy", "waiting", "idle"])).toBe("waiting") expect(strongest(["done", "error", "retry"])).toBe("error") expect(strongest(["done", "busy"])).toBe("busy") + expect(strongest(["scheduled", "idle"])).toBe("scheduled") + expect(strongest(["scheduled", "done"])).toBe("done") expect(strongest([])).toBe("idle") }) }) describe("label", () => { it("returns existing translation keys", () => { - const states: Activity[] = ["waiting", "error", "retry", "busy", "done", "idle"] + const states: Activity[] = ["waiting", "error", "retry", "busy", "done", "scheduled", "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.tabs.switcher.scheduled", "session.current", ]) }) diff --git a/packages/kilo-vscode/tests/unit/session-status.test.ts b/packages/kilo-vscode/tests/unit/session-status.test.ts index f0b3af60baa9..e16e71aeea27 100644 --- a/packages/kilo-vscode/tests/unit/session-status.test.ts +++ b/packages/kilo-vscode/tests/unit/session-status.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect } from "bun:test" -import { seedSessionStatuses } from "../../src/session-status" +import { seedSessionStatuses, seedSessionWakeups } from "../../src/session-status" import type { SessionStatus } from "@kilocode/sdk/v2/client" /** @@ -196,3 +196,88 @@ describe("seedSessionStatuses", () => { expect(msgs).toEqual([{ type: "sessionStatus", sessionID: "confirmed", status: "busy" }]) }) }) + +// --------------------------------------------------------------------------- +// seedSessionWakeups +// --------------------------------------------------------------------------- + +type WakeupResult = { data: Array<{ sessionID: string; pending: number }> | null } | Error + +function createWakeupClient(byDirectory: Record) { + return { + kilocode: { + wakeups: async (params: { directory: string }) => { + const result = byDirectory[params.directory] + if (result === undefined) return { data: [] } + if (result instanceof Error) throw result + return result + }, + }, + } as unknown as Parameters[0] +} + +describe("seedSessionWakeups", () => { + it("posts a wakeup per session and returns the seen sessions", async () => { + const client = createWakeupClient({ + "/repo": { + data: [ + { sessionID: "s1", pending: 1 }, + { sessionID: "s2", pending: 3 }, + ], + }, + }) + const { msgs, post } = collect() + + const { seen, complete } = await seedSessionWakeups(client, ["/repo"], post) + + expect(msgs).toEqual([ + { type: "sessionWakeup", sessionID: "s1", pending: 1 }, + { type: "sessionWakeup", sessionID: "s2", pending: 3 }, + ]) + expect([...seen]).toEqual(["s1", "s2"]) + expect(complete).toBe(true) + }) + + it("reports an incomplete result when one directory fails", async () => { + const client = createWakeupClient({ + "/bad": new Error("connection refused"), + "/good": { data: [{ sessionID: "s3", pending: 2 }] }, + }) + const { msgs, post } = collect() + + const { seen, complete } = await seedSessionWakeups(client, ["/bad", "/good"], post) + + expect(msgs).toEqual([{ type: "sessionWakeup", sessionID: "s3", pending: 2 }]) + expect([...seen]).toEqual(["s3"]) + expect(complete).toBe(false) + }) + + it("skips sessions rejected by the accept filter", async () => { + const client = createWakeupClient({ + "/repo": { + data: [ + { sessionID: "keep", pending: 1 }, + { sessionID: "drop", pending: 1 }, + ], + }, + }) + const { msgs, post } = collect() + + const { seen, complete } = await seedSessionWakeups(client, ["/repo"], post, (sessionID) => sessionID === "keep") + + expect(msgs).toEqual([{ type: "sessionWakeup", sessionID: "keep", pending: 1 }]) + expect([...seen]).toEqual(["keep"]) + expect(complete).toBe(true) + }) + + it("handles null data as no wakeups", async () => { + const client = createWakeupClient({ "/repo": { data: null } }) + const { msgs, post } = collect() + + const { seen, complete } = await seedSessionWakeups(client, ["/repo"], post) + + expect(msgs).toEqual([]) + expect([...seen]).toEqual([]) + expect(complete).toBe(true) + }) +}) diff --git a/packages/kilo-vscode/tests/unit/session-wakeup.test.ts b/packages/kilo-vscode/tests/unit/session-wakeup.test.ts new file mode 100644 index 000000000000..6f418e0400df --- /dev/null +++ b/packages/kilo-vscode/tests/unit/session-wakeup.test.ts @@ -0,0 +1,37 @@ +import { describe, expect, it } from "bun:test" +import { handleWakeupMessage, wakeups } from "../../webview-ui/src/context/session-wakeup" +import type { ExtensionMessage } from "../../webview-ui/src/types/messages" + +function send(message: Record): boolean { + return handleWakeupMessage(message as unknown as ExtensionMessage) +} + +describe("wakeup store", () => { + it("tracks a pending count per session", () => { + send({ type: "sessionWakeup", sessionID: "track-1", pending: 2 }) + send({ type: "sessionWakeup", sessionID: "track-2", pending: 1 }) + + expect(wakeups()["track-1"]).toBe(2) + expect(wakeups()["track-2"]).toBe(1) + }) + + it("clears the state when a wakeup is unscheduled", () => { + send({ type: "sessionWakeup", sessionID: "clear-1", pending: 3 }) + expect(wakeups()["clear-1"]).toBe(3) + + expect(send({ type: "sessionWakeup", sessionID: "clear-1", pending: 0 })).toBe(true) + + expect(wakeups()["clear-1"]).toBeUndefined() + }) + + it("clears the state when the session is deleted", () => { + send({ type: "sessionWakeup", sessionID: "deleted-1", pending: 2 }) + + expect(send({ type: "sessionDeleted", sessionID: "deleted-1" })).toBe(false) + expect(wakeups()["deleted-1"]).toBeUndefined() + }) + + it("leaves unrelated messages alone", () => { + expect(send({ type: "sessionStatus", sessionID: "other-1", status: "busy" })).toBe(false) + }) +}) diff --git a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css index 6efeb1da0e67..d3d6377109cd 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css +++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css @@ -181,6 +181,17 @@ html[data-theme="kilo-vscode"] color: var(--am-activity-color); } +:is( + .am-tab-icon, + .am-wt-icon, + .am-local-status, + .am-sidebar-search-icon, + .am-sidebar-search-status +)[data-activity="scheduled"] { + --am-activity-color: currentColor; + color: var(--am-activity-color); +} + :is(.am-tab-icon, .am-wt-icon, .am-local-status, .am-sidebar-search-icon)[data-activity]:not([data-activity="idle"]) [data-component="icon"] { color: var(--am-activity-color); diff --git a/packages/kilo-vscode/webview-ui/src/components/shared/ActivityIcon.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/ActivityIcon.tsx index 36276f0c3c51..375d442b57c2 100644 --- a/packages/kilo-vscode/webview-ui/src/components/shared/ActivityIcon.tsx +++ b/packages/kilo-vscode/webview-ui/src/components/shared/ActivityIcon.tsx @@ -15,6 +15,9 @@ export const ActivityIcon: Component<{ + + + diff --git a/packages/kilo-vscode/webview-ui/src/context/session-wakeup.ts b/packages/kilo-vscode/webview-ui/src/context/session-wakeup.ts new file mode 100644 index 000000000000..2e4d6d3867ca --- /dev/null +++ b/packages/kilo-vscode/webview-ui/src/context/session-wakeup.ts @@ -0,0 +1,27 @@ +import { createSignal } from "solid-js" +import type { ExtensionMessage } from "../types/messages" + +const [wakeups, setWakeups] = createSignal>({}) + +export { wakeups } + +function remove(map: Record, sessionID: string) { + if (map[sessionID] === undefined) return map + const next = { ...map } + delete next[sessionID] + return next +} + +export function handleWakeupMessage(message: ExtensionMessage): boolean { + if (message.type === "sessionDeleted") { + setWakeups((prev) => remove(prev, message.sessionID)) + return false + } + if (message.type !== "sessionWakeup") return false + setWakeups((prev) => { + if (message.pending <= 0) return remove(prev, message.sessionID) + if (prev[message.sessionID] === message.pending) return prev + return { ...prev, [message.sessionID]: message.pending } + }) + return true +} diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx index 0565345ef510..d3d6efb8b440 100644 --- a/packages/kilo-vscode/webview-ui/src/context/session.tsx +++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx @@ -86,6 +86,7 @@ import { PartStash } from "./part-stash" import { isolate, mergeOptimisticPart, mergeOptimisticParts, mergeParts } from "./session-parts" import { mergeMessages, sameReconcileShape } from "./session-merge" import { createFrameQueue, streamMessage } from "./frame-queue" +import { handleWakeupMessage, wakeups } from "./session-wakeup" import { state as todoState } from "./todo-revert" import { preserveVariant, sessionVariantKeys, transferVariants, variantKey } from "./session-variant-store" import { createSessionVariants } from "./session-variants" @@ -103,13 +104,12 @@ import { createDraftAgentSeed, resolvePromptAgent } from "./session-agent" import { createModelSelector } from "./session-model-selector" import { createModelPreferences } from "./session-model-preferences" import { createPreferenceLoader } from "./session-preference-loader" -import { activities, type Activity } from "../utils/session-activity" +import { activities, blockedSessionIds, type Activity } from "../utils/session-activity" import { hold, type Timing } from "./session-timing" import type { SessionContextValue } from "./session-types" const RECENT_LIMIT = 5 const MESSAGE_PAGE_LIMIT = 80 - // Store structure for messages and parts interface SessionStore { sessions: Record @@ -855,6 +855,7 @@ export const SessionProvider: ParentComponent = (props) => { } function handleStreamMessage(message: ExtensionMessage): boolean { + if (handleWakeupMessage(message)) return true if (!streamMessage(message)) return false if (message.type === "partUpdated") { handlePartUpdated(message.sessionID, message.messageID, message.part, message.delta) @@ -1856,11 +1857,10 @@ export const SessionProvider: ParentComponent = (props) => { parents: lineage().parents, statuses: statusMap, outcomes: closeMap, - blocked: [...permissions(), ...questions().filter((item) => item.blocking !== false)].map( - (item) => item.sessionID, - ), + blocked: blockedSessionIds(permissions(), questions()), submitting: Object.keys(submissionMap), suggested: suggestions().map((item) => item.sessionID), + scheduled: Object.keys(wakeups()), disconnected: disconnected(), }), ), diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts index 4dfbf70fe6d0..09ff26eb6443 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts @@ -73,6 +73,7 @@ export const dict = { "session.activity.error": "حدث خطأ أو فُقد الاتصال.", "session.activity.retry": "إعادة المحاولة تلقائيًا.", "session.activity.busy": "قيد التنفيذ.", + "session.activity.scheduled": "في انتظار استيقاظ مجدول.", "session.activity.done": "اكتمل الدور.", "session.activity.idle": "غير قيد التشغيل.", @@ -543,6 +544,7 @@ export const dict = { "session.tabs.switcher.current": "الحالي", "session.tabs.switcher.pending": "جديد", "session.tabs.switcher.busy": "جارٍ العمل", + "session.tabs.switcher.scheduled": "مجدولة", "session.tab.local": "محلي", "session.tab.cloud": "السحابة", "session.tab.worktree": "شجرة العمل", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts index 517c63ced4d1..1aa80be955c5 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Erro ou conexão perdida.", "session.activity.retry": "Tentando novamente automaticamente.", "session.activity.busy": "Em andamento.", + "session.activity.scheduled": "Aguardando um despertar agendado.", "session.activity.done": "Turno concluído.", "session.activity.idle": "Não está em execução.", @@ -556,6 +557,7 @@ export const dict = { "session.tabs.switcher.current": "Atual", "session.tabs.switcher.pending": "Nova", "session.tabs.switcher.busy": "Trabalhando", + "session.tabs.switcher.scheduled": "Agendado", "session.tab.local": "Local", "session.tab.cloud": "Nuvem", "session.tab.worktree": "Árvore de trabalho", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts index 032ede1c6f07..321122ada1e4 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Greška ili prekinuta veza.", "session.activity.retry": "Automatski novi pokušaj.", "session.activity.busy": "U toku.", + "session.activity.scheduled": "Čeka se zakazano buđenje.", "session.activity.done": "Potez završen.", "session.activity.idle": "Ne radi.", @@ -598,6 +599,7 @@ export const dict = { "session.tabs.switcher.current": "Trenutno", "session.tabs.switcher.pending": "Novo", "session.tabs.switcher.busy": "Radi", + "session.tabs.switcher.scheduled": "Zakazano", "session.tab.local": "Lokalno", "session.tab.cloud": "Oblak", "session.tab.worktree": "Radno stablo", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts index 46804c0434f3..e25845e6bdbe 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Fejl eller mistet forbindelse.", "session.activity.retry": "Prøver automatisk igen.", "session.activity.busy": "I gang.", + "session.activity.scheduled": "Venter på en planlagt vækning.", "session.activity.done": "Tur afsluttet.", "session.activity.idle": "Kører ikke.", @@ -595,6 +596,7 @@ export const dict = { "session.tabs.switcher.current": "Aktuel", "session.tabs.switcher.pending": "Ny", "session.tabs.switcher.busy": "Arbejder", + "session.tabs.switcher.scheduled": "Planlagt", "session.tab.local": "Lokal", "session.tab.cloud": "Sky", "session.tab.worktree": "Arbejdstræ", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts index 340d2aeb278e..190e1461bb55 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts @@ -80,6 +80,7 @@ export const dict = { "session.activity.error": "Fehler oder Verbindung verloren.", "session.activity.retry": "Automatischer erneuter Versuch.", "session.activity.busy": "In Bearbeitung.", + "session.activity.scheduled": "Wartet auf ein geplantes Aufwachen.", "session.activity.done": "Turn abgeschlossen.", "session.activity.idle": "Nicht aktiv.", @@ -606,6 +607,7 @@ export const dict = { "session.tabs.switcher.current": "Aktuell", "session.tabs.switcher.pending": "Neu", "session.tabs.switcher.busy": "In Arbeit", + "session.tabs.switcher.scheduled": "Geplant", "session.tab.local": "Lokal", "session.tab.cloud": "Cloud", "session.tab.worktree": "Arbeitsbaum", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts index c3d256516709..6d93c44e8701 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts @@ -70,6 +70,7 @@ export const dict = { "session.activity.error": "Error or connection lost.", "session.activity.retry": "Retrying automatically.", "session.activity.busy": "In progress.", + "session.activity.scheduled": "Waiting for a scheduled wakeup.", "session.activity.done": "Turn completed.", "session.activity.idle": "Not running.", @@ -505,6 +506,7 @@ export const dict = { "session.tabs.switcher.current": "Current", "session.tabs.switcher.pending": "New", "session.tabs.switcher.busy": "Working", + "session.tabs.switcher.scheduled": "Scheduled", "session.tab.local": "Local", "session.tab.cloud": "Cloud", "session.tab.worktree": "Worktree", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts index 6e9e5c2a7633..05f197ce08af 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Error o conexión perdida.", "session.activity.retry": "Reintentando automáticamente.", "session.activity.busy": "En curso.", + "session.activity.scheduled": "Esperando un despertar programado.", "session.activity.done": "Turno completado.", "session.activity.idle": "No está en ejecución.", @@ -599,6 +600,7 @@ export const dict = { "session.tabs.switcher.current": "Actual", "session.tabs.switcher.pending": "Nueva", "session.tabs.switcher.busy": "Trabajando", + "session.tabs.switcher.scheduled": "Programado", "session.tab.local": "Local", "session.tab.cloud": "Nube", "session.tab.worktree": "Árbol de trabajo", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fa.ts b/packages/kilo-vscode/webview-ui/src/i18n/fa.ts index c3ac8b5e7894..00572bc98ebb 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/fa.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/fa.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "خطا یا قطع اتصال.", "session.activity.retry": "تلاش مجدد خودکار.", "session.activity.busy": "در حال انجام.", + "session.activity.scheduled": "در انتظار بیدارشدن زمان‌بندی‌شده.", "session.activity.done": "نوبت به پایان رسید.", "session.activity.idle": "در حال اجرا نیست.", @@ -510,6 +511,7 @@ export const dict = { "session.tabs.switcher.current": "فعلی", "session.tabs.switcher.pending": "جدید", "session.tabs.switcher.busy": "در حال کار", + "session.tabs.switcher.scheduled": "زمان‌بندی‌شده", "session.tab.local": "محلی", "session.tab.cloud": "Cloud", "session.tab.worktree": "Worktree", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts index 41a3b9dbe14b..6c41a5a32ed6 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Erreur ou connexion perdue.", "session.activity.retry": "Nouvelle tentative automatique.", "session.activity.busy": "En cours.", + "session.activity.scheduled": "En attente d'un réveil programmé.", "session.activity.done": "Tour terminé.", "session.activity.idle": "Inactif.", @@ -602,6 +603,7 @@ export const dict = { "session.tabs.switcher.current": "Actuel", "session.tabs.switcher.pending": "Nouveau", "session.tabs.switcher.busy": "En cours", + "session.tabs.switcher.scheduled": "Programmé", "session.tab.local": "Local", "session.tab.cloud": "Cloud", "session.tab.worktree": "Arbre de travail", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/it.ts b/packages/kilo-vscode/webview-ui/src/i18n/it.ts index ad88392ea6c8..4e1422ff0079 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/it.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/it.ts @@ -72,6 +72,7 @@ export const dict = { "session.activity.error": "Errore o connessione persa.", "session.activity.retry": "Nuovo tentativo automatico.", "session.activity.busy": "In corso.", + "session.activity.scheduled": "In attesa di una riattivazione programmata.", "session.activity.done": "Turno completato.", "session.activity.idle": "Non in esecuzione.", "command.session.new": "Nuova sessione", @@ -437,6 +438,7 @@ export const dict = { "session.tabs.switcher.current": "Corrente", "session.tabs.switcher.pending": "Nuova", "session.tabs.switcher.busy": "In corso", + "session.tabs.switcher.scheduled": "Programmato", "session.tab.local": "Locale", "session.tab.cloud": "Cloud", "session.tab.worktree": "Albero di lavoro", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts index 06496a2b88b0..a5655d00da15 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "エラーまたは接続切断。", "session.activity.retry": "自動的に再試行中。", "session.activity.busy": "進行中。", + "session.activity.scheduled": "予約されたウェイクアップを待機しています。", "session.activity.done": "ターン完了。", "session.activity.idle": "実行されていません。", @@ -590,6 +591,7 @@ export const dict = { "session.tabs.switcher.current": "現在", "session.tabs.switcher.pending": "新規", "session.tabs.switcher.busy": "作業中", + "session.tabs.switcher.scheduled": "予約済み", "session.tab.local": "ローカル", "session.tab.cloud": "クラウド", "session.tab.worktree": "ワークツリー", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts index 77e86dd3e5bc..698a0cf1f7cb 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts @@ -78,6 +78,7 @@ export const dict = { "session.activity.error": "오류 또는 연결 끊김.", "session.activity.retry": "자동으로 재시도하는 중입니다.", "session.activity.busy": "진행 중입니다.", + "session.activity.scheduled": "예약된 웨이크업을 기다리는 중입니다.", "session.activity.done": "턴이 완료되었습니다.", "session.activity.idle": "실행 중이 아닙니다.", @@ -551,6 +552,7 @@ export const dict = { "session.tabs.switcher.current": "현재", "session.tabs.switcher.pending": "새 항목", "session.tabs.switcher.busy": "작업 중", + "session.tabs.switcher.scheduled": "예약됨", "session.tab.local": "로컬", "session.tab.cloud": "클라우드", "session.tab.worktree": "작업 트리", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts index 940e9caedc0a..714f5280e63b 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Fout of verbinding verbroken.", "session.activity.retry": "Automatisch opnieuw proberen.", "session.activity.busy": "In uitvoering.", + "session.activity.scheduled": "Wacht op een geplande wekactie.", "session.activity.done": "Beurt voltooid.", "session.activity.idle": "Niet actief.", @@ -548,6 +549,7 @@ export const dict = { "session.tabs.switcher.current": "Huidig", "session.tabs.switcher.pending": "Nieuw", "session.tabs.switcher.busy": "Bezig", + "session.tabs.switcher.scheduled": "Gepland", "session.tab.local": "Lokaal", "session.tab.cloud": "Cloud", "session.tab.worktree": "Werkboom", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts index 798d69535225..9b5ffd751d20 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts @@ -77,6 +77,7 @@ export const dict = { "session.activity.error": "Feil eller tilkobling brutt.", "session.activity.retry": "Prøver automatisk på nytt.", "session.activity.busy": "Pågår.", + "session.activity.scheduled": "Venter på en planlagt vekking.", "session.activity.done": "Runde fullført.", "session.activity.idle": "Kjører ikke.", @@ -558,6 +559,7 @@ export const dict = { "session.tabs.switcher.current": "Gjeldende", "session.tabs.switcher.pending": "Ny", "session.tabs.switcher.busy": "Jobber", + "session.tabs.switcher.scheduled": "Planlagt", "session.tab.local": "Lokal", "session.tab.cloud": "Sky", "session.tab.worktree": "Arbeidstre", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts index 3f485c311cc0..3fc1095455ac 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Błąd lub utrata połączenia.", "session.activity.retry": "Automatyczne ponawianie próby.", "session.activity.busy": "W toku.", + "session.activity.scheduled": "Oczekiwanie na zaplanowane przebudzenie.", "session.activity.done": "Tura zakończona.", "session.activity.idle": "Nie działa.", @@ -553,6 +554,7 @@ export const dict = { "session.tabs.switcher.current": "Bieżąca", "session.tabs.switcher.pending": "Nowa", "session.tabs.switcher.busy": "Pracuje", + "session.tabs.switcher.scheduled": "Zaplanowano", "session.tab.local": "Lokalny", "session.tab.cloud": "Chmura", "session.tab.worktree": "Drzewo robocze", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts index 98747f358916..c8b21324b7a7 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Ошибка или потеря соединения.", "session.activity.retry": "Автоматический повтор.", "session.activity.busy": "Выполняется.", + "session.activity.scheduled": "Ожидание запланированного пробуждения.", "session.activity.done": "Ход завершён.", "session.activity.idle": "Агент не запущен.", @@ -593,6 +594,7 @@ export const dict = { "session.tabs.switcher.current": "Текущая", "session.tabs.switcher.pending": "Новая", "session.tabs.switcher.busy": "В работе", + "session.tabs.switcher.scheduled": "Запланировано", "session.tab.local": "Локальный", "session.tab.cloud": "Облако", "session.tab.worktree": "Рабочее дерево", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts index f972295a5e2b..d2fd0eaf91aa 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts @@ -73,6 +73,7 @@ export const dict = { "session.activity.error": "เกิดข้อผิดพลาดหรือการเชื่อมต่อขาดหาย", "session.activity.retry": "กำลังลองใหม่โดยอัตโนมัติ", "session.activity.busy": "กำลังดำเนินการ", + "session.activity.scheduled": "กำลังรอการปลุกตามกำหนดเวลา", "session.activity.done": "จบรอบการทำงานแล้ว", "session.activity.idle": "ไม่ได้ทำงานอยู่", @@ -588,6 +589,7 @@ export const dict = { "session.tabs.switcher.current": "ปัจจุบัน", "session.tabs.switcher.pending": "ใหม่", "session.tabs.switcher.busy": "กำลังทำงาน", + "session.tabs.switcher.scheduled": "ตั้งเวลาไว้", "session.tab.local": "ในเครื่อง", "session.tab.cloud": "คลาวด์", "session.tab.worktree": "เวิร์กทรี Git", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts index b6db7d271bd0..c4b713b924a3 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Hata veya bağlantı kaybı.", "session.activity.retry": "Otomatik olarak yeniden deneniyor.", "session.activity.busy": "Devam ediyor.", + "session.activity.scheduled": "Zamanlanmış bir uyandırmayı bekliyor.", "session.activity.done": "Tur tamamlandı.", "session.activity.idle": "Çalışmıyor.", @@ -543,6 +544,7 @@ export const dict = { "session.tabs.switcher.current": "Geçerli", "session.tabs.switcher.pending": "Yeni", "session.tabs.switcher.busy": "Çalışıyor", + "session.tabs.switcher.scheduled": "Zamanlandı", "session.tab.local": "Local", "session.tab.cloud": "Cloud", "session.tab.worktree": "Çalışma ağacı", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts index c2cc69ae8a15..879456d4b277 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "Помилка або втрата з'єднання.", "session.activity.retry": "Автоматична повторна спроба.", "session.activity.busy": "Виконується.", + "session.activity.scheduled": "Очікування запланованого пробудження.", "session.activity.done": "Хід завершено.", "session.activity.idle": "Не запущено.", @@ -548,6 +549,7 @@ export const dict = { "session.tabs.switcher.current": "Поточна", "session.tabs.switcher.pending": "Нова", "session.tabs.switcher.busy": "Працює", + "session.tabs.switcher.scheduled": "Заплановано", "session.tab.local": "Локальний", "session.tab.cloud": "Хмарний", "session.tab.worktree": "Робоче дерево", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts index 3c6503fa3357..224a2dccd7ad 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "错误或连接已断开。", "session.activity.retry": "正在自动重试。", "session.activity.busy": "进行中。", + "session.activity.scheduled": "正在等待计划好的唤醒。", "session.activity.done": "回合已完成。", "session.activity.idle": "未运行。", @@ -570,6 +571,7 @@ export const dict = { "session.tabs.switcher.current": "当前", "session.tabs.switcher.pending": "新建", "session.tabs.switcher.busy": "工作中", + "session.tabs.switcher.scheduled": "已计划", "session.tab.local": "本地", "session.tab.cloud": "云端", "session.tab.worktree": "工作树", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts index f8cd59c38745..436e73e9bc8c 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts @@ -74,6 +74,7 @@ export const dict = { "session.activity.error": "錯誤或連線已中斷。", "session.activity.retry": "正在自動重試。", "session.activity.busy": "進行中。", + "session.activity.scheduled": "正在等待已排程的喚醒。", "session.activity.done": "回合已完成。", "session.activity.idle": "未執行。", @@ -530,6 +531,7 @@ export const dict = { "session.tabs.switcher.current": "目前", "session.tabs.switcher.pending": "新增", "session.tabs.switcher.busy": "工作中", + "session.tabs.switcher.scheduled": "已排程", "session.tab.local": "本機", "session.tab.cloud": "雲端", "session.tab.worktree": "工作樹", diff --git a/packages/kilo-vscode/webview-ui/src/stories/session-tabs.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/session-tabs.stories.tsx index 9ab684734275..ee7afb55295c 100644 --- a/packages/kilo-vscode/webview-ui/src/stories/session-tabs.stories.tsx +++ b/packages/kilo-vscode/webview-ui/src/stories/session-tabs.stories.tsx @@ -70,6 +70,7 @@ type Story = StoryObj const states: { state: Activity; title: string }[] = [ { state: "busy", title: "Running" }, + { state: "scheduled", title: "Scheduled" }, { state: "waiting", title: "Needs input" }, { state: "done", title: "Completed" }, { state: "retry", title: "Retrying" }, diff --git a/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts index 876dceeb9bda..20f64f7330a0 100644 --- a/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts +++ b/packages/kilo-vscode/webview-ui/src/types/messages/extension-messages.ts @@ -181,6 +181,12 @@ export interface SessionStatusMessage { next?: number } +export interface SessionWakeupMessage { + type: "sessionWakeup" + sessionID: string + pending: number +} + export interface SessionTurnClosedMessage { type: "sessionTurnClosed" sessionID: string @@ -1617,6 +1623,7 @@ export type ExtensionMessage = | PartsUpdatedMessage | PartRemovedMessage | SessionStatusMessage + | SessionWakeupMessage | SessionTurnClosedMessage | SessionErrorMessage | PermissionRequestMessage diff --git a/packages/kilo-vscode/webview-ui/src/utils/session-activity.ts b/packages/kilo-vscode/webview-ui/src/utils/session-activity.ts index 02963808551b..a9bcf304d64c 100644 --- a/packages/kilo-vscode/webview-ui/src/utils/session-activity.ts +++ b/packages/kilo-vscode/webview-ui/src/utils/session-activity.ts @@ -1,4 +1,4 @@ -export type Activity = "waiting" | "error" | "retry" | "busy" | "done" | "idle" +export type Activity = "waiting" | "error" | "retry" | "busy" | "done" | "scheduled" | "idle" export type Status = "idle" | "busy" | "retry" | "offline" @@ -7,6 +7,7 @@ export interface ActivityInput { blocked?: boolean errored?: boolean finished?: boolean + scheduled?: boolean disconnected?: boolean } @@ -17,6 +18,7 @@ export function activity(input: ActivityInput): Activity { if (input.status === "retry") return "retry" if (input.status === "busy") return "busy" if (input.finished) return "done" + if (input.scheduled) return "scheduled" return "idle" } @@ -27,17 +29,20 @@ export function activities(input: { blocked: Iterable submitting?: Iterable suggested?: Iterable + scheduled?: Iterable disconnected: boolean }): Record { const blocked = new Set(input.blocked) const submitting = new Set(input.submitting) const suggested = new Set(input.suggested) + const scheduled = new Set(input.scheduled) const ids = new Set([ ...Object.keys(input.statuses), ...Object.keys(input.outcomes), ...blocked, ...submitting, ...suggested, + ...scheduled, ]) const result: Record = {} for (const id of ids) { @@ -50,6 +55,7 @@ export function activities(input: { disconnected: input.disconnected, errored: close === "error", finished: close ? close === "completed" && !input.outcomes[id]?.seen : suggested.has(id), + scheduled: scheduled.has(id), }) result[id] = strongest([result[id] ?? "idle", own]) if (active === "idle") continue @@ -62,11 +68,18 @@ export function activities(input: { return result } +export function blockedSessionIds( + permissions: ReadonlyArray<{ sessionID: string }>, + questions: ReadonlyArray<{ sessionID: string; blocking?: boolean }>, +): string[] { + return [...permissions, ...questions.filter((item) => item.blocking !== false)].map((item) => item.sessionID) +} + export function running(state: Activity): boolean { return state === "busy" || state === "retry" } -const STATES: Activity[] = ["done", "busy", "retry", "error", "waiting"] +const STATES: Activity[] = ["scheduled", "done", "busy", "retry", "error", "waiting"] export function score(state: Activity): number { return STATES.indexOf(state) + 1 @@ -86,6 +99,7 @@ const LABELS: Record = { retry: "session.status.retry", busy: "session.tabs.switcher.busy", done: "task.backgroundAgents.status.completed", + scheduled: "session.tabs.switcher.scheduled", idle: "session.current", }