diff --git a/.github/workflows/check-opencode-annotations.yml b/.github/workflows/check-opencode-annotations.yml new file mode 100644 index 00000000000..b2fc705daea --- /dev/null +++ b/.github/workflows/check-opencode-annotations.yml @@ -0,0 +1,32 @@ +name: Check opencode annotations + +on: + pull_request: + paths: + - "packages/opencode/**" + - "script/check-opencode-annotations.ts" + - ".github/workflows/check-opencode-annotations.yml" + workflow_dispatch: + +jobs: + check-annotations: + name: Check kilocode_change annotations + if: github.repository == 'Kilo-Org/kilocode' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha || github.sha }} + fetch-depth: 0 + + - uses: oven-sh/setup-bun@v2 + + - name: Check kilocode_change annotations in shared opencode files + env: + BASE_SHA: ${{ github.event.pull_request.base.sha }} + run: | + if [ -n "$BASE_SHA" ]; then + bun run script/check-opencode-annotations.ts --base "$BASE_SHA" + else + echo "No PR base SHA available (workflow_dispatch without PR context) — skipping." + fi diff --git a/AGENTS.md b/AGENTS.md index a8323860822..1d4c3f77eb2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -18,6 +18,7 @@ Kilo CLI is an open source AI coding agent that generates code from natural lang - **Knip** (unused exports): `bun run knip` from `packages/kilo-vscode/`. CI runs this — all exported types/functions must be imported somewhere. Remove or unexport unused exports before pushing. - **Source links**: After adding or changing URLs in `packages/kilo-vscode/`, `packages/kilo-vscode/webview-ui/`, or `packages/opencode/src/`, run `bun run script/extract-source-links.ts` from the repo root and commit the updated `packages/kilo-docs/source-links.md`. CI runs this check — the build fails if the file is stale. - **kilocode_change check**: `bun run check-kilocode-change` from `packages/kilo-vscode/`. CI runs this — `kilocode_change` is a marker for upstream merge conflicts and must not appear in `packages/kilo-vscode/` or `packages/kilo-ui/` (these are entirely Kilo Code additions). Remove the markers before pushing. +- **opencode annotation check**: `bun run script/check-opencode-annotations.ts` from repo root. CI runs this on PRs touching `packages/opencode/` — every Kilo-specific change in shared opencode files must be annotated with `kilocode_change` markers. Exempt paths (no markers needed): `packages/opencode/src/kilocode/`, `packages/opencode/test/kilocode/`, and any path containing `kilocode` in the name. ## Products diff --git a/bun.lock b/bun.lock index eeaccd23638..19f273a6ac1 100644 --- a/bun.lock +++ b/bun.lock @@ -27,7 +27,7 @@ }, "packages/app": { "name": "@opencode-ai/app", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@kilocode/kilo-i18n": "workspace:*", "@kilocode/kilo-ui": "workspace:*", @@ -79,7 +79,7 @@ }, "packages/desktop": { "name": "@opencode-ai/desktop", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@opencode-ai/app": "workspace:*", "@opencode-ai/ui": "workspace:*", @@ -112,7 +112,7 @@ }, "packages/desktop-electron": { "name": "@opencode-ai/desktop-electron", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@opencode-ai/app": "workspace:*", "@opencode-ai/ui": "workspace:*", @@ -142,7 +142,7 @@ }, "packages/kilo-docs": { "name": "@kilocode/kilo-docs", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@docsearch/css": "^4", "@docsearch/js": "^4", @@ -171,7 +171,7 @@ }, "packages/kilo-gateway": { "name": "@kilocode/kilo-gateway", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@ai-sdk/anthropic": "2.0.65", "@ai-sdk/openai": "2.0.101", @@ -206,7 +206,7 @@ }, "packages/kilo-i18n": { "name": "@kilocode/kilo-i18n", - "version": "7.1.23", + "version": "7.2.0", "devDependencies": { "@tsconfig/node22": "catalog:", "@types/bun": "catalog:", @@ -219,7 +219,7 @@ }, "packages/kilo-telemetry": { "name": "@kilocode/kilo-telemetry", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@kilocode/kilo-gateway": "workspace:*", "@opentelemetry/api": "1.9.0", @@ -239,7 +239,7 @@ }, "packages/kilo-ui": { "name": "@kilocode/kilo-ui", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@kobalte/core": "0.13.11", "@opencode-ai/util": "workspace:*", @@ -274,7 +274,7 @@ }, "packages/kilo-vscode": { "name": "kilo-code", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@anthropic-ai/sdk": "^0.39.0", "@kilocode/kilo-i18n": "workspace:*", @@ -327,7 +327,7 @@ }, "packages/opencode": { "name": "@kilocode/cli", - "version": "7.1.23", + "version": "7.2.0", "bin": { "kilo": "./bin/kilo", "kilocode": "./bin/kilo", @@ -451,7 +451,7 @@ }, "packages/plugin": { "name": "@kilocode/plugin", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@kilocode/sdk": "workspace:*", "zod": "catalog:", @@ -465,14 +465,14 @@ }, "packages/script": { "name": "@opencode-ai/script", - "version": "7.1.23", + "version": "7.2.0", "devDependencies": { "@types/bun": "catalog:", }, }, "packages/sdk/js": { "name": "@kilocode/sdk", - "version": "7.1.23", + "version": "7.2.0", "devDependencies": { "@hey-api/openapi-ts": "0.90.10", "@tsconfig/node22": "catalog:", @@ -483,7 +483,7 @@ }, "packages/storybook": { "name": "@opencode-ai/storybook", - "version": "7.1.23", + "version": "7.2.0", "devDependencies": { "@opencode-ai/ui": "workspace:*", "@solidjs/meta": "catalog:", @@ -506,7 +506,7 @@ }, "packages/ui": { "name": "@opencode-ai/ui", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "@kilocode/sdk": "workspace:*", "@kobalte/core": "catalog:", @@ -553,7 +553,7 @@ }, "packages/util": { "name": "@opencode-ai/util", - "version": "7.1.23", + "version": "7.2.0", "dependencies": { "zod": "catalog:", }, diff --git a/package.json b/package.json index 7c626177b8e..654595cb6e9 100644 --- a/package.json +++ b/package.json @@ -122,6 +122,6 @@ "@openrouter/ai-sdk-provider@1.5.4": "patches/@openrouter%2Fai-sdk-provider@1.5.4.patch", "ghostty-web@0.3.0": "patches/ghostty-web@0.3.0.patch" }, - "version": "7.1.23", + "version": "7.2.0", "peerDependencies": {} } diff --git a/packages/app/package.json b/packages/app/package.json index 9ea7ae31522..b13141ca050 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/app", - "version": "7.1.23", + "version": "7.2.0", "description": "", "type": "module", "exports": { diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.json index 1bd4786dac6..37418e6d590 100644 --- a/packages/desktop-electron/package.json +++ b/packages/desktop-electron/package.json @@ -1,7 +1,7 @@ { "name": "@opencode-ai/desktop-electron", "private": true, - "version": "7.1.23", + "version": "7.2.0", "type": "module", "license": "MIT", "homepage": "https://opencode.ai", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 83a34dc8782..5722e09ba89 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@opencode-ai/desktop", "private": true, - "version": "7.1.23", + "version": "7.2.0", "type": "module", "license": "MIT", "scripts": { diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml index e2b800dc95a..95cc4d7dcfb 100644 --- a/packages/extensions/zed/extension.toml +++ b/packages/extensions/zed/extension.toml @@ -1,7 +1,7 @@ id = "kilo" name = "Kilo" description = "The open source coding agent." -version = "7.1.23" +version = "7.2.0" schema_version = 1 authors = ["Anomaly"] repository = "https://github.com/Kilo-Org/kilocode" @@ -11,26 +11,26 @@ name = "Kilo" icon = "./icons/opencode.svg" [agent_servers.opencode.targets.darwin-aarch64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-darwin-arm64.zip" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.0/opencode-darwin-arm64.zip" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.darwin-x86_64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-darwin-x64.zip" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.0/opencode-darwin-x64.zip" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.linux-aarch64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-linux-arm64.tar.gz" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.0/opencode-linux-arm64.tar.gz" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.linux-x86_64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-linux-x64.tar.gz" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.0/opencode-linux-x64.tar.gz" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.windows-x86_64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-windows-x64.zip" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.0/opencode-windows-x64.zip" cmd = "./opencode.exe" args = ["acp"] diff --git a/packages/kilo-docs/package.json b/packages/kilo-docs/package.json index f3b83f7590c..c503bf17710 100644 --- a/packages/kilo-docs/package.json +++ b/packages/kilo-docs/package.json @@ -1,6 +1,6 @@ { "name": "@kilocode/kilo-docs", - "version": "7.1.23", + "version": "7.2.0", "private": true, "scripts": { "dev": "next dev --webpack --port 3002", diff --git a/packages/kilo-gateway/package.json b/packages/kilo-gateway/package.json index ffca4a9415f..34bc04c675e 100644 --- a/packages/kilo-gateway/package.json +++ b/packages/kilo-gateway/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@kilocode/kilo-gateway", - "version": "7.1.23", + "version": "7.2.0", "type": "module", "license": "MIT", "description": "Unified Kilo Gateway package for OpenCode - authentication, provider, and API integration", diff --git a/packages/kilo-i18n/package.json b/packages/kilo-i18n/package.json index 83091e58381..780eb6d7052 100644 --- a/packages/kilo-i18n/package.json +++ b/packages/kilo-i18n/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@kilocode/kilo-i18n", - "version": "7.1.23", + "version": "7.2.0", "type": "module", "license": "MIT", "description": "Kilo-specific i18n translations and overrides", diff --git a/packages/kilo-telemetry/package.json b/packages/kilo-telemetry/package.json index 6bed2eac5d5..121b2d317a7 100644 --- a/packages/kilo-telemetry/package.json +++ b/packages/kilo-telemetry/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@kilocode/kilo-telemetry", - "version": "7.1.23", + "version": "7.2.0", "type": "module", "license": "MIT", "description": "Telemetry for Kilo CLI - PostHog analytics integration", diff --git a/packages/kilo-ui/package.json b/packages/kilo-ui/package.json index 327a1083c71..0450b0335f9 100644 --- a/packages/kilo-ui/package.json +++ b/packages/kilo-ui/package.json @@ -1,6 +1,6 @@ { "name": "@kilocode/kilo-ui", - "version": "7.1.23", + "version": "7.2.0", "type": "module", "license": "MIT", "exports": { diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json index 44ef0219c8e..99082d05f0d 100644 --- a/packages/kilo-vscode/package.json +++ b/packages/kilo-vscode/package.json @@ -2,7 +2,7 @@ "name": "kilo-code", "displayName": "Kilo Code: AI Coding Agent, Copilot, and Autocomplete", "description": "Open Source AI coding agent that generates code from natural language, automates tasks, and runs terminal commands. Features inline autocomplete, browser automation, automated refactoring, and custom modes for planning, coding, and debugging. Supports 500+ AI models including Claude (Anthropic), Gemini, Grok, GPT, Codex and GLM.", - "version": "7.1.23", + "version": "7.2.0", "icon": "assets/icons/logo-outline-black.png", "galleryBanner": { "color": "#FFFFFF", diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts index 2b153315bb4..9596d4a3920 100644 --- a/packages/kilo-vscode/src/KiloProvider.ts +++ b/packages/kilo-vscode/src/KiloProvider.ts @@ -38,8 +38,10 @@ import { getWorkspaceRoot } from "./review-utils" import { MarketplaceService } from "./services/marketplace" import { resolveProjectDirectory } from "./project-directory" import { getBusySessionCount, seedSessionStatuses } from "./session-status" +import { retry } from "./services/cli-backend/retry" import { slimPart, slimParts } from "./kilo-provider/slim-metadata" import { matchFollowup, recordFollowup, type Followup } from "./kilo-provider/followup-session" +import { retryable, backoff, MAX_RETRIES } from "./util/retry" // legacy-migration start import { checkAndShowMigrationWizard, @@ -281,7 +283,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper // Use fire-and-forget (no throwOnError) to match old getProfile() which returned null on error. if (this.connectionState === "connected" && this.client) { console.log("[Kilo New] KiloProvider: 👤 syncWebviewState fetching profile...") - const profileResult = await this.client.kilo.profile() + const profileResult = await retry(() => this.client!.kilo.profile()) const profileData = profileResult.data ?? null console.log("[Kilo New] KiloProvider: 👤 syncWebviewState profile:", profileData ? "received" : "null") this.postMessage({ @@ -529,6 +531,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper break } case "abort": + this.cancelRetry(message.sessionID ?? "") await this.handleAbort(message.sessionID) break case "revertSession": @@ -1225,9 +1228,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory(sessionID) - const { data: messagesData } = await this.client.session.messages( - { sessionID, directory: workspaceDir }, - { throwOnError: true, signal: abort.signal }, + const { data: messagesData } = await retry(() => + this.client!.session.messages( + { sessionID, directory: workspaceDir }, + { throwOnError: true, signal: abort.signal }, + ), ) // If this request was aborted while awaiting, skip posting stale results @@ -1328,9 +1333,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory(sessionID) - const { data: messagesData } = await this.client.session.messages( - { sessionID, directory: workspaceDir }, - { throwOnError: true }, + const { data: messagesData } = await retry(() => + this.client!.session.messages({ sessionID, directory: workspaceDir }, { throwOnError: true }), ) const messages = messagesData.map((m) => ({ @@ -1600,7 +1604,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory() - const { data: agents } = await this.client.app.agents({ directory: workspaceDir }, { throwOnError: true }) + const { data: agents } = await retry(() => + this.client!.app.agents({ directory: workspaceDir }, { throwOnError: true }), + ) const { visible, defaultAgent } = filterVisibleAgents(agents) @@ -1634,7 +1640,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory() - const { data: skills } = await this.client.app.skills({ directory: workspaceDir }, { throwOnError: true }) + const { data: skills } = await retry(() => + this.client!.app.skills({ directory: workspaceDir }, { throwOnError: true }), + ) const message = { type: "skillsLoaded", @@ -1657,7 +1665,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const dir = this.getWorkspaceDirectory() - const { data: commands } = await this.client.command.list({ directory: dir }, { throwOnError: true }) + const { data: commands } = await retry(() => + this.client!.command.list({ directory: dir }, { throwOnError: true }), + ) const message = { type: "commandsLoaded", @@ -1679,7 +1689,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper if (!this.client) return undefined try { const dir = this.getWorkspaceDirectory() - const { data } = await this.client.app.skills({ directory: dir }, { throwOnError: true }) + const { data } = await retry(() => this.client!.app.skills({ directory: dir }, { throwOnError: true })) return data } catch (error) { console.error("[Kilo New] KiloProvider: Failed to fetch CLI skills for marketplace:", error) @@ -1787,7 +1797,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const directory = this.getWorkspaceDirectory() - const { data } = await this.client.mcp.status({ directory }) + const { data } = await retry(() => this.client!.mcp.status({ directory })) if (data) { const message = { type: "mcpStatusLoaded", status: data } this.cachedMcpStatusMessage = message @@ -1898,7 +1908,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory() - const { data: config } = await this.client.config.get({ directory: workspaceDir }, { throwOnError: true }) + const { data: config } = await retry(() => + this.client!.config.get({ directory: workspaceDir }, { throwOnError: true }), + ) const message = { type: "configLoaded", @@ -1945,7 +1957,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper if (!this.client || this.connectionState !== "connected") return try { const dir = this.getWorkspaceDirectory() - const { data: config } = await this.client.config.get({ directory: dir }, { throwOnError: true }) + const { data: config } = await retry(() => this.client!.config.get({ directory: dir }, { throwOnError: true })) this.cachedConfigMessage = { type: "configLoaded", config } this.postMessage({ type: "configUpdated", config }) } catch (error) { @@ -1978,7 +1990,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper } try { - const { data: all } = await this.client.kilo.notifications(undefined, { throwOnError: true }) + const { data: all } = await retry(() => this.client!.kilo.notifications(undefined, { throwOnError: true })) const notifications = all.filter((n) => !n.showIn || n.showIn.includes("extension")) const existing = this.extensionContext?.globalState.get("kilo.dismissedNotificationIds", []) ?? [] const active = new Set(notifications.map((n) => n.id)) @@ -2093,7 +2105,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper // Config.state is reset by updateGlobal (via Instance.resetStateEntry) so // config.get() returns fresh data without a full dispose cycle. const dir = this.getWorkspaceDirectory() - const { data: merged } = await this.client.config.get({ directory: dir }, { throwOnError: true }) + const { data: merged } = await retry(() => this.client!.config.get({ directory: dir }, { throwOnError: true })) this.cachedConfigMessage = { type: "configLoaded", config: merged } this.postMessage({ type: "configUpdated", config: merged }) @@ -2150,6 +2162,85 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper return { sid, dir } } + /** Abort controllers for active retry loops, keyed by session ID */ + private retryAbortControllers = new Map() + + /** + * Execute an SDK call with exponential backoff on HTTP errors. + * Retries on 429, 5xx, and other retryable status codes. + * When the response includes `Retry-After` / `Retry-After-MS` headers, + * the delay honours that value (capped at 5 min). Otherwise uses the + * predefined backoff schedule: 5s -> 10s -> 30s -> 60s -> 300s. + * + * After MAX_RETRIES (5) attempts, automatically throws the error. + * Users can cancel via the cancel button in the UI which sends an abort + * message — this interrupts the backoff delay and stops the retry loop. + * + * The webview receives `sessionStatus` messages with a countdown so the + * user can see that a retry is in progress. + */ + private async withRetry(fn: () => Promise<{ error?: unknown; response: Response }>, sid: string): Promise { + const abortController = new AbortController() + this.retryAbortControllers.set(sid, abortController) + + try { + for (let attempt = 1; ; attempt++) { + if (abortController.signal.aborted) { + // User cancelled — return normally without triggering sendMessageFailed + return + } + + const result = await fn() + if (!result.error) return + + const status = result.response?.status ?? 0 + + // Non-retryable status codes fail immediately without retry + if (!retryable(status)) { + this.postMessage({ type: "sessionStatus", sessionID: sid, status: "idle" }) + throw result.error + } + + // Stop retrying after MAX_RETRIES attempts + if (attempt >= MAX_RETRIES) { + this.postMessage({ type: "sessionStatus", sessionID: sid, status: "idle" }) + throw result.error + } + + const delay = backoff(attempt, result.response?.headers) + console.log(`[Kilo New] KiloProvider: Retry on ${status}, attempt ${attempt}/${MAX_RETRIES}, delay ${delay}ms`) + + this.postMessage({ + type: "sessionStatus", + sessionID: sid, + status: "retry", + attempt, + message: `Error (${status}). Retrying...`, + next: Date.now() + delay, + }) + + // Wait for delay or until aborted + await new Promise((resolve) => { + const timer = setTimeout(resolve, delay) + abortController.signal.addEventListener("abort", () => { + clearTimeout(timer) + }) + }) + } + } finally { + this.retryAbortControllers.delete(sid) + } + } + + /** Cancel an active retry loop for a session */ + private cancelRetry(sid: string): void { + const controller = this.retryAbortControllers.get(sid) + if (controller) { + controller.abort() + this.postMessage({ type: "sessionStatus", sessionID: sid, status: "idle" }) + } + } + private async handleSendMessage( text: string, messageID?: string, @@ -2192,18 +2283,21 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.connectionService.recordMessageSessionId(messageID, resolved!.sid) } - await this.client.session.promptAsync( - { - sessionID: resolved!.sid, - directory: resolved!.dir, - messageID, - parts, - model: providerID && modelID ? { providerID, modelID } : undefined, - agent, - variant, - editorContext, - }, - { throwOnError: true }, + const sid = resolved!.sid + const dir = resolved!.dir + await this.withRetry( + () => + this.client!.session.promptAsync({ + sessionID: sid, + directory: dir, + messageID, + parts, + model: providerID && modelID ? { providerID, modelID } : undefined, + agent, + variant, + editorContext, + }), + sid, ) } catch (error) { console.error("[Kilo New] KiloProvider: Failed to send message:", error) @@ -2254,19 +2348,22 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper const parts = files?.map((f) => ({ type: "file" as const, mime: f.mime, url: f.url })) - await this.client.session.command( - { - sessionID: resolved!.sid, - directory: resolved!.dir, - command, - arguments: args, - messageID, - model: providerID && modelID ? `${providerID}/${modelID}` : undefined, - agent, - variant, - parts, - }, - { throwOnError: true }, + const sid = resolved!.sid + const dir = resolved!.dir + await this.withRetry( + () => + this.client!.session.command({ + sessionID: sid, + directory: dir, + command, + arguments: args, + messageID, + model: providerID && modelID ? `${providerID}/${modelID}` : undefined, + agent, + variant, + parts, + }), + sid, ) } catch (error) { console.error("[Kilo New] KiloProvider: Failed to send command:", error) diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts index 424d0b54b07..d70103ab362 100644 --- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts +++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts @@ -8,6 +8,7 @@ import { WorktreeManager, type CreateWorktreeResult } from "./WorktreeManager" import { WorktreeStateManager, remoteRef } from "./WorktreeStateManager" import { chooseBaseBranch, normalizeBaseBranch } from "./base-branch" import { GitStatsPoller, type WorktreePresenceResult } from "./GitStatsPoller" +import { PRStatusBridge } from "./pr-status-bridge" import { GitOps, type ApplyConflict } from "./GitOps" import { versionedName } from "./branch-name" import { normalizePath, classifyWorktreeError } from "./git-import" @@ -53,6 +54,7 @@ export class AgentManagerProvider implements Disposable { private diffSessionId: string | undefined private lastDiffHash: string | undefined private statsPoller: GitStatsPoller + private prBridge!: PRStatusBridge private gitOps: GitOps private cachedDiffTarget: { sessionId: string; directory: string; baseBranch: string } | undefined private staleWorktreeIds = new Set() @@ -94,6 +96,15 @@ export class AgentManagerProvider implements Disposable { log: (...args) => this.log(...args), git: this.gitOps, }) + this.prBridge = PRStatusBridge.create({ + getWorktrees: () => this.state?.getWorktrees() ?? [], + getWorkspaceRoot: () => this.getRoot(), + postToWebview: (m) => this.postToWebview(m), + updateWorktreePR: (id, n, u, s) => this.state?.updateWorktreePR(id, n, u, s), + hasPersistedPR: (id: string) => !!this.state?.getWorktree(id)?.prNumber, + openExternal: (u) => this.host.openExternal(u), + log: (...a) => this.log(...a), + }) } private log(...args: unknown[]) { @@ -147,13 +158,14 @@ export class AgentManagerProvider implements Disposable { this.stateReady = this.initializeState() void this.sendRepoInfo() this.sendKeybindings() - + this.prBridge.attachPanel(ctx) ctx.onDidDispose(() => { // Only clear if this is still the active panel — a newer panel may // have already replaced us via attachPanel. if (this.panel === ctx) { this.log("Panel disposed") this.statsPoller.stop() + this.prBridge.poller.stop() this.stopDiffPolling() this.panel = undefined } @@ -209,6 +221,7 @@ export class AgentManagerProvider implements Disposable { // --------------------------------------------------------------------------- private async onMessage(msg: Record): Promise | null> { + if (this.prBridge.handleMessage(msg)) return null const m = msg as unknown as AgentManagerInMessage if (m.type === "agentManager.createWorktree") { @@ -292,6 +305,7 @@ export class AgentManagerProvider implements Disposable { // already emitted before the webview was ready to receive messages. if (this.cachedWorktreeStats) this.postToWebview(this.cachedWorktreeStats) if (this.cachedLocalStats) this.postToWebview(this.cachedLocalStats) + this.prBridge.replay() // Refresh sessions after pushState so the webview's sessionsLoaded // handler is guaranteed to be registered (requestState fires from // onMount). Without this, the initial refreshSessions() in @@ -408,6 +422,7 @@ export class AgentManagerProvider implements Disposable { if (m.type === "loadMessages") { this.activeSessionId = m.sessionID this.terminalManager.syncOnSessionSwitch(m.sessionID) + this.prBridge.poller.setActiveWorktreeId(this.state?.getSession(m.sessionID)?.worktreeId ?? undefined) } // After clearSession, clear active tracking and re-register worktree sessions @@ -671,6 +686,7 @@ export class AgentManagerProvider implements Disposable { } // Remove from state BEFORE disk removal so pollers immediately stop targeting this worktree. this.statsPoller.skipWorktree(worktreeId) + this.prBridge.remove(worktreeId) const orphaned = state.removeWorktree(worktreeId) if (shouldStopDiffPolling(worktree.path, orphaned, this.cachedDiffTarget, this.diffSessionId)) { this.stopDiffPolling() @@ -1474,6 +1490,7 @@ export class AgentManagerProvider implements Disposable { }) this.statsPoller.setEnabled(worktrees.length > 0 || this.panel !== undefined) + this.prBridge.poller.setEnabled(worktrees.length > 0) } /** Push empty state when the folder is not a git repo or has no folder open. */ @@ -1893,6 +1910,7 @@ export class AgentManagerProvider implements Disposable { public dispose(): void { this.stopDiffPolling() this.statsPoller.stop() + this.prBridge.poller.stop() this.terminalManager.dispose() this.panel?.dispose() this.outputChannel.dispose() diff --git a/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts b/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts new file mode 100644 index 00000000000..a1d37297c16 --- /dev/null +++ b/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts @@ -0,0 +1,486 @@ +import type { Worktree } from "./WorktreeStateManager" +import type { PRStatus, PRCheck, PRComment, CheckStatus, AggregateCheckStatus, PRState, ReviewDecision } from "./types" +import { execWithShellEnv } from "./shell-env" +import { classifyPRError } from "./git-import" + +interface PRStatusPollerOptions { + getWorktrees: () => Worktree[] + getWorkspaceRoot: () => string | undefined + onStatus: (worktreeId: string, pr: PRStatus | null, error?: "gh_missing" | "gh_auth" | "fetch_failed") => void + log: (...args: unknown[]) => void + intervalMs?: number +} + +const GH_PROBE_TTL = 300_000 // 5 minutes — gh installation state rarely changes at runtime +const MAX_BACKOFF = 120_000 // 2 minutes — cap for exponential backoff on repeated errors +const BACKOFF_MULTIPLIER = 2 + +export class PRStatusPoller { + private timer: ReturnType | undefined + private active = false + private visible = true + private busy = false + private lastHash = new Map() + private lastError: string | undefined // tracks global error state for de-duplication + private failures = 0 // consecutive failure count for backoff + private ghAvailable: boolean | undefined + private ghProbeTime = 0 + private activeWorktreeId: string | undefined + private cachedRepo: { owner: string; name: string; cwd: string } | undefined + private readonly intervalMs: number + + constructor(private readonly options: PRStatusPollerOptions) { + this.intervalMs = options.intervalMs ?? 15_000 + } + + setEnabled(enabled: boolean): void { + if (enabled) { + if (this.active) return + this.start() + return + } + this.stop() + } + + /** Pause/resume polling based on panel visibility. */ + setVisible(visible: boolean): void { + if (this.visible === visible) return + this.visible = visible + if (!this.active) return + if (visible) { + // Resume — poll immediately then schedule normally + if (this.timer) clearTimeout(this.timer) + this.timer = undefined + void this.poll() + return + } + // Pause — cancel pending timer + if (this.timer) { + clearTimeout(this.timer) + this.timer = undefined + } + } + + stop(): void { + this.active = false + if (this.timer) { + clearTimeout(this.timer) + this.timer = undefined + } + this.busy = false + this.lastHash.clear() + this.lastError = undefined + this.failures = 0 + this.ghAvailable = undefined + this.ghProbeTime = 0 + this.cachedRepo = undefined + } + + /** Force-refresh a specific worktree immediately. */ + refresh(worktreeId: string): void { + if (!this.active) return + void this.fetchOne(worktreeId) + } + + setActiveWorktreeId(id: string | undefined): void { + this.activeWorktreeId = id + } + + private start(): void { + this.stop() + this.active = true + // Don't override this.visible — it may already be set to false by + // setVisible() before setEnabled(true) is called. + void this.poll() + } + + private nextDelay(): number { + if (this.failures === 0) return this.intervalMs + return Math.min(this.intervalMs * Math.pow(BACKOFF_MULTIPLIER, this.failures), MAX_BACKOFF) + } + + private schedule(): void { + if (!this.active || !this.visible) return + const delay = this.nextDelay() + this.timer = setTimeout(() => { + void this.poll() + }, delay) + } + + private poll(): Promise { + if (!this.active || !this.visible) return Promise.resolve() + if (this.busy) return Promise.resolve() + this.busy = true + return this.fetchAll().finally(() => { + this.busy = false + this.schedule() + }) + } + + private async probeGh(): Promise { + const now = Date.now() + if (this.ghAvailable !== undefined && now - this.ghProbeTime < GH_PROBE_TTL) { + return this.ghAvailable + } + try { + await execWithShellEnv("gh", ["--version"], { timeout: 5_000 }) + this.ghAvailable = true + } catch { + this.ghAvailable = false + } + this.ghProbeTime = Date.now() + return this.ghAvailable + } + + private async fetchAll(): Promise { + if (!(await this.probeGh())) { + // De-duplicate: only emit gh_missing once, not every poll cycle + if (this.lastError !== "gh_missing") { + this.lastError = "gh_missing" + for (const wt of this.options.getWorktrees()) { + this.options.onStatus(wt.id, null, "gh_missing") + } + } + this.failures++ + return + } + + this.lastError = undefined + const worktrees = this.options.getWorktrees() + const results = await Promise.allSettled(worktrees.map((wt) => this.fetchOne(wt.id))) + const ok = results.every((r) => r.status === "fulfilled") + if (ok) { + this.failures = 0 + return + } + this.failures++ + } + + private async fetchOne(worktreeId: string): Promise { + const worktrees = this.options.getWorktrees() + const wt = worktrees.find((w) => w.id === worktreeId) + if (!wt) return + + if (!this.options.getWorkspaceRoot()) return + + try { + const pr = await this.fetchPRForBranch(wt.branch, wt.path) + if (!pr) { + const hash = `${worktreeId}:none` + if (this.lastHash.get(worktreeId) === hash) return + this.lastHash.set(worktreeId, hash) + this.options.onStatus(worktreeId, null) + return + } + + const [checks, comments] = await Promise.all([ + this.fetchChecks(pr.number, wt.path), + this.activeWorktreeId === worktreeId ? this.fetchComments(pr.number, wt.path) : undefined, + ]) + + const status: PRStatus = { + number: pr.number, + title: pr.title, + url: pr.url, + state: pr.state, + review: pr.review, + checks, + ...(comments && { comments }), + additions: pr.additions, + deletions: pr.deletions, + files: pr.files, + } + + const hash = `${worktreeId}:${pr.number}:${pr.state}:${pr.review}:${checks.status}:${checks.passed}/${checks.total}:${comments?.total ?? ""}:${comments?.unresolved ?? ""}` + if (this.lastHash.get(worktreeId) === hash) return + this.lastHash.set(worktreeId, hash) + + this.options.onStatus(worktreeId, status) + } catch (err) { + const msg = err instanceof Error ? err.message : String(err) + const kind = classifyPRError(msg) + this.options.log(`PR fetch failed for ${wt.branch}:`, msg) + + const errKey = kind === "gh_missing" ? "gh_missing" : kind === "gh_auth" ? "gh_auth" : "fetch_failed" + if (kind === "gh_missing") this.ghAvailable = false + + // De-duplicate: only emit if the error state changed for this worktree + const hash = `${worktreeId}:error:${errKey}` + if (this.lastHash.get(worktreeId) !== hash) { + this.lastHash.set(worktreeId, hash) + this.options.onStatus(worktreeId, null, errKey) + } + throw err // propagate so fetchAll can track failures for backoff + } + } + + private static readonly PR_JSON_FIELDS = + "number,title,url,state,isDraft,reviewDecision,additions,deletions,changedFiles,headRefName,headRefOid" + + private async fetchPRForBranch(branch: string, cwd: string): Promise { + // Strategy 1: bare `gh pr view` — resolves via the branch's tracking ref. + // Works for fork PRs checked out with `gh pr checkout` (tracking ref = refs/pull/N/head). + // Strategy 2: `gh pr view ` — works for same-repo branches pushed to origin. + // Strategy 3: `gh pr list --search ""` — last resort, finds PRs by HEAD commit SHA. + return (await this.ghPRView(cwd)) ?? (await this.ghPRView(cwd, branch)) ?? (await this.ghPRListBySHA(cwd)) + } + + /** Run `gh pr view [branch] --json ...` and parse the result, or return null. */ + private async ghPRView(cwd: string, branch?: string): Promise { + try { + const args = ["pr", "view"] + if (branch) args.push(branch) + args.push("--json", PRStatusPoller.PR_JSON_FIELDS) + + const { stdout } = await execWithShellEnv("gh", args, { cwd, timeout: 15_000 }) + return parsePRResult(stdout) + } catch (err) { + const msg = err instanceof Error ? err.message : String(err) + if (msg.includes("no pull requests found") || msg.includes("Could not resolve")) return null + throw err + } + } + + /** Search for PRs containing the current HEAD SHA. Finds PRs when branch name/tracking ref don't match. */ + private async ghPRListBySHA(cwd: string): Promise { + try { + const { stdout: sha } = await execWithShellEnv("git", ["rev-parse", "HEAD"], { cwd, timeout: 5_000 }) + const head = sha.trim() + if (!head) return null + + const { stdout } = await execWithShellEnv( + "gh", + [ + "pr", + "list", + "--state", + "all", + "--search", + `${head} is:pr`, + "--limit", + "5", + "--json", + PRStatusPoller.PR_JSON_FIELDS, + ], + { cwd, timeout: 15_000 }, + ) + const items = JSON.parse(stdout) as unknown[] + if (!Array.isArray(items) || items.length === 0) return null + + // Only accept PRs where headRefOid matches our HEAD exactly + for (const item of items) { + const data = item as Record + if (data.headRefOid === head) return parsePRResult(JSON.stringify(data)) + } + return null + } catch { + return null + } + } + + private async fetchChecks( + prNumber: number, + cwd: string, + ): Promise<{ + status: AggregateCheckStatus + total: number + passed: number + failed: number + pending: number + items: PRCheck[] + }> { + try { + const { stdout } = await execWithShellEnv( + "gh", + ["pr", "checks", String(prNumber), "--json", "name,state,link,startedAt,completedAt"], + { cwd, timeout: 15_000 }, + ) + const data = JSON.parse(stdout) as Array<{ + name: string + state: string + link?: string + startedAt?: string + completedAt?: string + }> + + const items: PRCheck[] = data.map((c) => ({ + name: c.name, + status: mapCheckStatus(c.state), + url: c.link, + duration: formatCheckDuration(c.startedAt, c.completedAt), + })) + + const total = items.length + const passed = items.filter((c) => c.status === "success").length + const failed = items.filter((c) => c.status === "failure").length + const pending = items.filter((c) => c.status === "pending").length + + const status: AggregateCheckStatus = + total === 0 ? "none" : failed > 0 ? "failure" : pending > 0 ? "pending" : "success" + + return { status, total, passed, failed, pending, items } + } catch { + return { status: "none", total: 0, passed: 0, failed: 0, pending: 0, items: [] } + } + } + + private async getRepoInfo(cwd: string): Promise<{ owner: string; name: string }> { + if (this.cachedRepo && this.cachedRepo.cwd === cwd) { + return this.cachedRepo + } + const { stdout } = await execWithShellEnv("gh", ["repo", "view", "--json", "owner,name"], { + cwd, + timeout: 10_000, + }) + const data = JSON.parse(stdout) + const info = { owner: data.owner.login as string, name: data.name as string, cwd } + this.cachedRepo = info + return info + } + + private async fetchComments( + prNumber: number, + cwd: string, + ): Promise<{ total: number; unresolved: number; items: PRComment[] }> { + try { + const repo = await this.getRepoInfo(cwd) + + const query = `query($owner: String!, $repo: String!, $number: Int!) { + repository(owner: $owner, name: $repo) { + pullRequest(number: $number) { + reviewThreads(first: 100) { + nodes { + isResolved + comments(first: 1) { + nodes { + id + author { login avatarUrl } + body + path + line + url + createdAt + } + } + } + } + } + } + }` + + const { stdout } = await execWithShellEnv( + "gh", + [ + "api", + "graphql", + "-f", + `query=${query}`, + "-F", + `owner=${repo.owner}`, + "-F", + `repo=${repo.name}`, + "-F", + `number=${prNumber}`, + ], + { cwd, timeout: 15_000 }, + ) + const result = JSON.parse(stdout) + const threads = result?.data?.repository?.pullRequest?.reviewThreads?.nodes ?? [] + + const items: PRComment[] = [] + for (const thread of threads) { + const first = thread.comments?.nodes?.[0] + if (!first) continue + items.push({ + id: first.id, + author: first.author?.login ?? "unknown", + avatar: first.author?.avatarUrl, + body: first.body ?? "", + file: first.path, + line: first.line, + url: first.url, + resolved: thread.isResolved ?? false, + createdAt: first.createdAt ? new Date(first.createdAt).getTime() : undefined, + }) + } + + const total = items.length + const unresolved = items.filter((c) => !c.resolved).length + return { total, unresolved, items } + } catch (err) { + this.options.log("Failed to fetch PR comments:", err) + return { total: 0, unresolved: 0, items: [] } + } + } +} + +interface PRResult { + number: number + title: string + url: string + state: PRState + review: ReviewDecision | null + additions: number + deletions: number + files: number +} + +function parsePRResult(json: string): PRResult | null { + const data = JSON.parse(json) + if (!data.number) return null + return { + number: data.number, + title: data.title ?? "", + url: data.url ?? "", + state: parsePRState(data.isDraft, data.state), + review: parseReviewDecision(data.reviewDecision), + additions: data.additions ?? 0, + deletions: data.deletions ?? 0, + files: data.changedFiles ?? 0, + } +} + +function parsePRState(isDraft: boolean, ghState: string): PRState { + if (isDraft) return "draft" + if (ghState === "MERGED") return "merged" + if (ghState === "CLOSED") return "closed" + return "open" +} + +function parseReviewDecision(decision: string | undefined): ReviewDecision | null { + if (decision === "APPROVED") return "approved" + if (decision === "CHANGES_REQUESTED") return "changes_requested" + if (decision === "REVIEW_REQUIRED") return "pending" + return null +} + +function mapCheckStatus(state: string): CheckStatus { + switch (state.toUpperCase()) { + case "SUCCESS": + return "success" + case "FAILURE": + case "ERROR": + return "failure" + case "PENDING": + case "QUEUED": + case "IN_PROGRESS": + case "REQUESTED": + case "WAITING": + return "pending" + case "SKIPPED": + return "skipped" + case "CANCELLED": + case "TIMED_OUT": + case "STALE": + case "STARTUP_FAILURE": + return "cancelled" + default: + return "pending" + } +} + +function formatCheckDuration(startedAt?: string, completedAt?: string): string | undefined { + if (!startedAt || !completedAt) return undefined + const secs = Math.round((new Date(completedAt).getTime() - new Date(startedAt).getTime()) / 1000) + return secs < 60 ? `${secs}s` : `${Math.floor(secs / 60)}m ${secs % 60}s` +} diff --git a/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts index 1148fbc3f02..e7c0ba50214 100644 --- a/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts +++ b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts @@ -26,6 +26,12 @@ export interface Worktree { groupId?: string /** User-provided display name for the worktree. */ label?: string + /** Cached PR number for instant badge display on reload. */ + prNumber?: number + /** Cached PR URL for instant badge display on reload. */ + prUrl?: string + /** Cached PR state for correct badge color on reload (open/merged/closed/draft). */ + prState?: string } /** @@ -171,6 +177,16 @@ export class WorktreeStateManager { void this.save() } + updateWorktreePR(id: string, prNumber?: number, prUrl?: string, prState?: string): void { + const wt = this.worktrees.get(id) + if (!wt) return + if (wt.prNumber === prNumber && wt.prUrl === prUrl && wt.prState === prState) return + wt.prNumber = prNumber + wt.prUrl = prUrl + wt.prState = prState + void this.save() + } + removeWorktree(id: string): ManagedSession[] { const removed = this.worktrees.delete(id) if (!removed) return [] diff --git a/packages/kilo-vscode/src/agent-manager/host.ts b/packages/kilo-vscode/src/agent-manager/host.ts index 34bbdd3b7f3..596e32cf88c 100644 --- a/packages/kilo-vscode/src/agent-manager/host.ts +++ b/packages/kilo-vscode/src/agent-manager/host.ts @@ -56,9 +56,15 @@ export interface PanelContext { /** Whether the panel is currently the active tab. */ readonly active: boolean + /** Whether the panel is visible (may be unfocused in a split editor group). */ + readonly visible: boolean + /** Session provider wired to this panel. */ readonly sessions: SessionProvider + /** Register a callback for when panel visibility changes. */ + onDidChangeVisibility(cb: (visible: boolean) => void): Disposable + /** Register a callback for when the panel is disposed. */ onDidDispose(cb: () => void): Disposable @@ -107,6 +113,9 @@ export interface Host { /** Capture a telemetry event. */ capture(event: string, properties?: Record): void + /** Open a URL in the user's default browser. */ + openExternal(url: string): void + /** Ask VS Code's git extension to re-scan repositories (e.g. after worktree ref migration). */ refreshGit(): void diff --git a/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts b/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts new file mode 100644 index 00000000000..15d5d754d7e --- /dev/null +++ b/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts @@ -0,0 +1,110 @@ +/** + * Bridges the PRStatusPoller with the AgentManagerProvider. + * + * Owns the poller instance, the cached PR messages, and all message/panel handling + * so the provider only needs thin delegation calls. + */ +import type { Worktree } from "./WorktreeStateManager" +import type { AgentManagerOutMessage, PRStatus } from "./types" +import type { Disposable } from "./host" +import { PRStatusPoller } from "./PRStatusPoller" + +interface PRBridgeHost { + getWorktrees(): Worktree[] + getWorkspaceRoot(): string | undefined + postToWebview(msg: AgentManagerOutMessage): void + updateWorktreePR(id: string, number?: number, url?: string, state?: string): void + hasPersistedPR(id: string): boolean + openExternal(url: string): void + log(...args: unknown[]): void +} + +/** Minimal panel surface needed by the bridge (subset of PanelContext). */ +interface PanelLike { + readonly visible: boolean + onDidChangeVisibility(cb: (visible: boolean) => void): Disposable +} + +export class PRStatusBridge { + readonly poller: PRStatusPoller + private readonly cache = new Map() + private readonly host: PRBridgeHost + + constructor(host: PRBridgeHost) { + this.host = host + this.poller = new PRStatusPoller(bridgePollerOpts(this, host)) + } + + static create(opts: { + getWorktrees: () => Worktree[] + getWorkspaceRoot: () => string | undefined + postToWebview: (msg: AgentManagerOutMessage) => void + updateWorktreePR: (id: string, n?: number, u?: string, s?: string) => void + hasPersistedPR: (id: string) => boolean + openExternal: (url: string) => void + log: (...args: unknown[]) => void + }): PRStatusBridge { + return new PRStatusBridge(opts) + } + + /** Wire visibility tracking to a panel — pauses polling when hidden. */ + attachPanel(panel: PanelLike): void { + this.poller.setVisible(panel.visible) + panel.onDidChangeVisibility((v) => { + this.poller.setVisible(v) + }) + } + + /** Replay cached PR statuses to a freshly-connected webview. */ + replay(): void { + this.cache.forEach((msg) => this.host.postToWebview(msg)) + } + + /** Handle an incoming webview message. Returns true if handled. */ + handleMessage(m: Record): boolean { + if (m.type === "agentManager.refreshPR") { + this.poller.refresh(m.worktreeId as string) + return true + } + if (m.type === "agentManager.openPR") { + const wt = this.host.getWorktrees().find((w: Worktree) => w.id === m.worktreeId) + if (wt?.prUrl) this.host.openExternal(wt.prUrl) + return true + } + return false + } + + /** Remove cached status for a deleted worktree. */ + remove(worktreeId: string): void { + this.cache.delete(worktreeId) + } +} + +/** Build PRStatusPoller options that forward events through the bridge cache. */ +function bridgePollerOpts(bridge: PRStatusBridge, host: PRBridgeHost) { + return { + getWorktrees: () => host.getWorktrees(), + getWorkspaceRoot: () => host.getWorkspaceRoot(), + onStatus: (id: string, pr: PRStatus | null, err?: "gh_missing" | "gh_auth" | "fetch_failed") => { + if (err) { + // Don't forward errors to the webview when we have prior PR data + // (in-memory cache or persisted prNumber) — that would overwrite + // the live badge with pr:null. Only forward when there's truly no + // prior data (first poll failed, nothing persisted). + if (!bridge["cache"].has(id) && !host.hasPersistedPR(id)) + host.postToWebview({ + type: "agentManager.prStatus", + worktreeId: id, + pr: null, + error: err, + } as AgentManagerOutMessage) + return + } + const msg = { type: "agentManager.prStatus", worktreeId: id, pr, error: err } as AgentManagerOutMessage + bridge["cache"].set(id, msg) + host.postToWebview(msg) + host.updateWorktreePR(id, pr?.number, pr?.url, pr?.state) + }, + log: (...args: unknown[]) => host.log(...args), + } +} diff --git a/packages/kilo-vscode/src/agent-manager/types.ts b/packages/kilo-vscode/src/agent-manager/types.ts index aeffd54bbce..6c116034638 100644 --- a/packages/kilo-vscode/src/agent-manager/types.ts +++ b/packages/kilo-vscode/src/agent-manager/types.ts @@ -29,6 +29,58 @@ export type WorktreeDiffEntry = FileDiff & { stamp?: string } +// --------------------------------------------------------------------------- +// PR status types +// --------------------------------------------------------------------------- + +export type PRState = "open" | "draft" | "merged" | "closed" +export type ReviewDecision = "approved" | "changes_requested" | "pending" +export type CheckStatus = "success" | "failure" | "pending" | "skipped" | "cancelled" +export type AggregateCheckStatus = "success" | "failure" | "pending" | "none" + +export interface PRCheck { + name: string + status: CheckStatus + url?: string + duration?: string +} + +export interface PRComment { + id: string + author: string + avatar?: string + body: string + file?: string + line?: number + url?: string + resolved: boolean + createdAt?: number +} + +export interface PRStatus { + number: number + title: string + url: string + state: PRState + review: ReviewDecision | null + checks: { + status: AggregateCheckStatus + total: number + passed: number + failed: number + pending: number + items: PRCheck[] + } + comments?: { + total: number + unresolved: number + items: PRComment[] + } + additions: number + deletions: number + files: number +} + // --------------------------------------------------------------------------- // Extension → Webview messages (postToWebview) // --------------------------------------------------------------------------- @@ -175,6 +227,13 @@ interface WorktreeDiffFileMessage { diff: WorktreeDiffEntry | null } +interface PRStatusOutMessage { + type: "agentManager.prStatus" + worktreeId: string + pr: PRStatus | null + error?: "gh_missing" | "gh_auth" | "fetch_failed" +} + interface ActionOutMessage { type: "action" action: string @@ -202,6 +261,7 @@ export type AgentManagerOutMessage = | WorktreeDiffLoadingMessage | WorktreeDiffMessage | WorktreeDiffFileMessage + | PRStatusOutMessage | ActionOutMessage // --------------------------------------------------------------------------- @@ -379,6 +439,16 @@ interface StopDiffWatchIn { type: "agentManager.stopDiffWatch" } +interface RefreshPRIn { + type: "agentManager.refreshPR" + worktreeId: string +} + +interface OpenPRIn { + type: "agentManager.openPR" + worktreeId: string +} + interface OpenFileIn { type: "agentManager.openFile" sessionId: string @@ -489,6 +559,8 @@ export type AgentManagerInMessage = | ApplyWorktreeDiffIn | StartDiffWatchIn | StopDiffWatchIn + | RefreshPRIn + | OpenPRIn | OpenFileIn | GenericOpenFileIn | PreviewImageIn diff --git a/packages/kilo-vscode/src/agent-manager/vscode-host.ts b/packages/kilo-vscode/src/agent-manager/vscode-host.ts index f3f3a4c969f..7ea4403cbc0 100644 --- a/packages/kilo-vscode/src/agent-manager/vscode-host.ts +++ b/packages/kilo-vscode/src/agent-manager/vscode-host.ts @@ -92,6 +92,9 @@ export class VscodeHost implements Host { get active() { return panel.active }, + get visible() { + return panel.visible + }, postMessage(msg) { void panel.webview.postMessage(msg) }, @@ -99,6 +102,9 @@ export class VscodeHost implements Host { panel.reveal(vscode.ViewColumn.One, preserveFocus ?? false) }, sessions, + onDidChangeVisibility(cb) { + return panel.onDidChangeViewState((e) => cb(e.webviewPanel.visible)) + }, onDidDispose(cb) { return panel.onDidDispose(cb) }, @@ -160,9 +166,11 @@ export class VscodeHost implements Host { TelemetryProxy.capture(event as TelemetryEventName, properties) } + openExternal(url: string): void { + void vscode.env.openExternal(vscode.Uri.parse(url)) + } + refreshGit(): void { - // Trigger VS Code's built-in git extension to re-scan repositories. - // This picks up worktrees whose gitdir refs were just rewritten by migration. void vscode.commands.executeCommand("git.refresh") } diff --git a/packages/kilo-vscode/src/services/cli-backend/retry.ts b/packages/kilo-vscode/src/services/cli-backend/retry.ts new file mode 100644 index 00000000000..1e3cc054af4 --- /dev/null +++ b/packages/kilo-vscode/src/services/cli-backend/retry.ts @@ -0,0 +1,34 @@ +// Replicated from packages/util/src/retry.ts to avoid adding @opencode-ai/util +// as a dependency of the extension. Keep in sync with the original. + +const TRANSIENT = [ + "load failed", + "network connection was lost", + "network request failed", + "failed to fetch", + "fetch failed", + "econnreset", + "econnrefused", + "etimedout", + "socket hang up", +] + +function transient(error: unknown): boolean { + if (!error) return false + const msg = String(error instanceof Error ? error.message : error).toLowerCase() + return TRANSIENT.some((m) => msg.includes(m)) +} + +export async function retry(fn: () => Promise, attempts = 3, delay = 500): Promise { + let last: unknown + for (let i = 0; i < attempts; i++) { + try { + return await fn() + } catch (error) { + last = error + if (i === attempts - 1 || !transient(error)) throw error + await new Promise((r) => setTimeout(r, delay * 2 ** i)) + } + } + throw last +} diff --git a/packages/kilo-vscode/src/util/retry.ts b/packages/kilo-vscode/src/util/retry.ts new file mode 100644 index 00000000000..5c35542821c --- /dev/null +++ b/packages/kilo-vscode/src/util/retry.ts @@ -0,0 +1,70 @@ +/** + * Exponential backoff retry utilities for rate-limited API calls. + * + * When the CLI backend (or the upstream AI provider it proxies) returns + * HTTP 429, retries are scheduled with exponential backoff. The delay + * respects `Retry-After` / `Retry-After-MS` headers when present. + */ + +/** Backoff delays per attempt: 5s -> 10s -> 30s -> 60s -> 300s */ +const BACKOFF_DELAYS_MS = [5_000, 10_000, 30_000, 60_000, 300_000] + +/** Maximum backoff delay in ms (5 minutes) */ +const MAX_MS = 300_000 + +/** Maximum number of retry attempts */ +const MAX_RETRIES = BACKOFF_DELAYS_MS.length + +/** HTTP status codes that are safe to retry */ +const RETRYABLE = new Set([408, 409, 425, 429, 500, 502, 503, 504]) + +/** + * Whether an HTTP status code is retryable. + */ +export function retryable(status: number): boolean { + if (RETRYABLE.has(status)) return true + return status >= 500 +} + +/** + * Extract a retry delay (in ms) from standard response headers. + * + * Checks `retry-after-ms` first (milliseconds), then `retry-after` + * (seconds or HTTP-date). Returns `null` when no usable header is found. + */ +export function headerDelay(headers: Headers): number | null { + const ms = headers.get("retry-after-ms") + if (ms) { + const parsed = Number.parseFloat(ms) + if (!Number.isNaN(parsed) && parsed > 0) return parsed + } + + const after = headers.get("retry-after") + if (after) { + const seconds = Number.parseFloat(after) + if (!Number.isNaN(seconds) && seconds > 0) return Math.ceil(seconds * 1000) + // Try HTTP-date format + const date = Date.parse(after) - Date.now() + if (!Number.isNaN(date) && date > 0) return Math.ceil(date) + } + + return null +} + +/** + * Calculate backoff delay for a given attempt. + * + * If `headers` are provided and contain a `Retry-After` value, that + * value is used (capped at MAX_MS). Otherwise uses the predefined + * backoff schedule: 5s, 10s, 30s, 60s, 300s. + */ +export function backoff(attempt: number, headers?: Headers): number { + if (headers) { + const fromHeader = headerDelay(headers) + if (fromHeader !== null) return Math.min(fromHeader, MAX_MS) + } + const index = Math.min(attempt - 1, BACKOFF_DELAYS_MS.length - 1) + return BACKOFF_DELAYS_MS[index] ?? MAX_MS +} + +export { MAX_RETRIES, MAX_MS } diff --git a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts index c991cc6f5b6..65a20a1af4f 100644 --- a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts +++ b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts @@ -532,7 +532,7 @@ const VSCODE_ALLOWED: Record = { */ const MAX_LINES: Record = { "AgentManagerProvider.ts": { - maxLines: 1910, + maxLines: 2000, note: "primary extraction target: break into smaller orchestrators", }, } diff --git a/packages/kilo-vscode/tests/unit/retry.test.ts b/packages/kilo-vscode/tests/unit/retry.test.ts new file mode 100644 index 00000000000..983d37aa57c --- /dev/null +++ b/packages/kilo-vscode/tests/unit/retry.test.ts @@ -0,0 +1,81 @@ +import { describe, it, expect } from "bun:test" +import { retry } from "../../src/services/cli-backend/retry" + +describe("retry", () => { + it("returns on first success", async () => { + const result = await retry(() => Promise.resolve(42)) + expect(result).toBe(42) + }) + + it("retries transient errors and succeeds", async () => { + let calls = 0 + const result = await retry( + () => { + calls++ + if (calls < 3) throw new TypeError("fetch failed") + return Promise.resolve("ok") + }, + 3, + 10, + ) + expect(result).toBe("ok") + expect(calls).toBe(3) + }) + + it("throws immediately on non-transient errors", async () => { + let calls = 0 + await expect( + retry( + () => { + calls++ + throw new Error("404 not found") + }, + 3, + 10, + ), + ).rejects.toThrow("404 not found") + expect(calls).toBe(1) + }) + + it("throws after exhausting attempts on transient errors", async () => { + let calls = 0 + await expect( + retry( + () => { + calls++ + throw new Error("ECONNREFUSED") + }, + 3, + 10, + ), + ).rejects.toThrow("ECONNREFUSED") + expect(calls).toBe(3) + }) + + it("detects all transient error messages", async () => { + const messages = [ + "load failed", + "network connection was lost", + "network request failed", + "failed to fetch", + "fetch failed", + "ECONNRESET", + "ECONNREFUSED", + "ETIMEDOUT", + "socket hang up", + ] + for (const msg of messages) { + let calls = 0 + await retry( + () => { + calls++ + if (calls === 1) throw new Error(msg) + return Promise.resolve(true) + }, + 2, + 10, + ) + expect(calls).toBe(2) + } + }) +}) diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-active-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-active-chromium-linux.png index 5eea0cc85df..b657e55ee74 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-active-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-active-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed6e36e191174cd14d61fc3480014d59c9a92bd526f4f889dc71bdbab4b44e66 -size 2106 +oid sha256:270e0dafc2601996e7d048873e55db4680e8803d6800dc44b1fa6ce6239827cc +size 2017 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-default-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-default-chromium-linux.png index 3138a0847c8..bc4f471b091 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-default-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-default-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b313dd76197ff089105d6b80ff22bdf570b878f67dcc99e5d050e85573c52d60 -size 1959 +oid sha256:5feb854ee2693b655ab504b8e2ed8794af77a357c3d716e2deb9668a08f3aa0c +size 1847 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-grouped-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-grouped-chromium-linux.png index 853b1606174..b012417eb4f 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-grouped-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-grouped-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e386126977ece9eae41cce0b13677ae4243b985b39a7ee0977e9b5da32415796 -size 5837 +oid sha256:937c4398730fd3e07bc064b4cb370717a5bc280ffaced87fa6f3c626774878a8 +size 5598 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-pending-delete-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-pending-delete-chromium-linux.png index 19a85104afe..2ec70d4ede2 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-pending-delete-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-pending-delete-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24d02a1a394c5e18e3783b19c8c7145eafbd8cabfb624c53c82137369d2c5784 -size 2570 +oid sha256:1d9935cc07b9eefe0c1eca1852b00ac2b39b76cdf12ee2f01c52e4ac0771b39e +size 2910 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-stale-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-stale-chromium-linux.png index 39a8bb71569..9cdd496d4a1 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-stale-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-stale-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07039f10de94b6aa2eba14674a9f3370fef2f8b23d6712e91f43ddd77f169c34 -size 1930 +oid sha256:54e7142d591391c6e99631c9bf87b011321e52f17a8ee39e5aeeaa9b1350f2f9 +size 1831 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-with-stats-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-with-stats-chromium-linux.png index 4d9c9a4f74c..43f94d6b804 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-with-stats-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-with-stats-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:519310e5cb841302d651f450b4fc281936c331646a4d3759de0c010d1761fe63 -size 2687 +oid sha256:7e4a37b5b7d71e0eb7f043176f410030385a8a61f3913bd6419b1d96c6cad2de +size 2422 diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx index 49d7728424e..c131f64681d 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx @@ -34,6 +34,8 @@ import type { WorktreeGitStats, LocalGitStats, WorktreeState, + PRStatus, + AgentManagerPRStatusMessage, ManagedSessionState, SessionInfo, BranchInfo, @@ -120,6 +122,8 @@ interface ApplyState { /** Sidebar selection: LOCAL for local repo, worktree ID for a worktree, or null for an unassigned session. */ type SidebarSelection = typeof LOCAL | string | null +type SidePanel = "diff" | "pr" | null + const isMac = typeof navigator !== "undefined" && /Mac|iPhone|iPad/.test(navigator.userAgent) // Fallback keybindings before extension sends resolved ones @@ -328,8 +332,8 @@ const AgentManagerContent: Component = () => { let diffRaf: number | undefined let pendingDiffWidth: number | undefined - // Diff panel state - const [diffOpen, setDiffOpen] = createSignal(false) + const [sidePanel, setSidePanel] = createSignal(null) + const diffOpen = () => sidePanel() === "diff" const [diffDatas, setDiffDatas] = createSignal>({}) const [diffLoading, setDiffLoading] = createSignal(false) const [diffFileLoading, setDiffFileLoading] = createSignal>>({}) @@ -345,6 +349,9 @@ const AgentManagerContent: Component = () => { // Per-worktree git stats (diff additions/deletions, commits missing from origin) const [worktreeStats, setWorktreeStats] = createSignal>({}) + // Per-worktree PR status data + const [prStatuses, setPrStatuses] = createSignal>({}) + // Local repo git stats (branch name, diff additions/deletions, commits) const [localStats, setLocalStats] = createSignal() @@ -786,6 +793,11 @@ const AgentManagerContent: Component = () => { return firstOrderedTitle(sessions, worktreeTabOrder()[wt.id], wt.branch) } + const worktreeSubtitle = (wt: WorktreeState): string | undefined => { + const label = worktreeLabel(wt) + return label !== wt.branch ? wt.branch : undefined + } + const isStaleWorktree = (worktreeId: string): boolean => staleWorktreeIds().has(worktreeId) /** True when any session in the given ID list is actively working (busy/retry and not blocked by permissions/questions). */ @@ -1012,9 +1024,9 @@ const AgentManagerContent: Component = () => { } else if (msg.action === "toggleDiff") { if (reviewActive()) { closeReviewTab() - setDiffOpen(true) + setSidePanel("diff") } else { - setDiffOpen((prev) => !prev) + setSidePanel((prev) => (prev === "diff" ? null : "diff")) } } else if (msg.action === "newTab") handleNewTabForCurrentSelection() else if (msg.action === "closeTab") closeActiveTab() @@ -1153,7 +1165,7 @@ const AgentManagerContent: Component = () => { setSelection(ev.worktreeId) } // Close diff/review panels — nothing to show during setup - setDiffOpen(false) + setSidePanel(null) setReviewActive(false) setSetup({ active: true, message: ev.message, branch: ev.branch, worktreeId: ev.worktreeId }) } @@ -1383,6 +1395,11 @@ const AgentManagerContent: Component = () => { setLocalStats(ev.stats) setRepoBranch(ev.stats.branch) } + + if (msg.type === "agentManager.prStatus") { + const ev = msg as AgentManagerPRStatusMessage + setPrStatuses((prev) => ({ ...prev, [ev.worktreeId]: ev.pr })) + } }) onCleanup(() => { @@ -1458,7 +1475,7 @@ const AgentManagerContent: Component = () => { const openReviewTab = () => { const sel = selection() if (sel === null) return - setDiffOpen(false) + setSidePanel(null) setReviewOpenForContext(sel, true) setReviewActive(true) } @@ -2310,6 +2327,7 @@ const AgentManagerContent: Component = () => { { renameValue={renameValue()} closeKeybind={kb().closeWorktree ?? ""} openKeybind={kb().openWorktree ?? ""} + pr={ + prStatuses()[wt.id] !== undefined + ? prStatuses()[wt.id] + : wt.prNumber + ? { + number: wt.prNumber, + title: "", + url: wt.prUrl ?? "", + state: (wt.prState ?? "open") as PRStatus["state"], + review: null, + checks: { + status: "none" as const, + total: 0, + passed: 0, + failed: 0, + pending: 0, + items: [], + }, + comments: { total: 0, unresolved: 0, items: [] }, + additions: 0, + deletions: 0, + files: 0, + } + : undefined + } + onOpenPR={() => + vscode.postMessage({ type: "agentManager.openPR", worktreeId: wt.id }) + } onClick={() => { if (pendingDelete() === wt.id) { confirmDeleteWorktree(wt.id) @@ -2622,10 +2668,10 @@ const AgentManagerContent: Component = () => { onClick={() => { if (reviewActive()) { closeReviewTab() - setDiffOpen(true) + setSidePanel("diff") return } - setDiffOpen((prev) => !prev) + setSidePanel((prev) => (prev === "diff" ? null : "diff")) }} title={t("agentManager.diff.toggle")} > @@ -2752,7 +2798,7 @@ const AgentManagerContent: Component = () => { {/* Chat + side diff panel (hidden when review tab is active) */}
@@ -2810,7 +2856,7 @@ const AgentManagerContent: Component = () => {
- +
{ }} />
- setDiffOpen(false)} - onExpand={selection() !== null ? openReviewTab : undefined} - onRequestDiff={requestDiffFile} - onOpenFile={(file) => { - const id = currentDiffSessionId() - if (id) vscode.postMessage({ type: "agentManager.openFile", sessionId: id, filePath: file }) - else if (selection() === LOCAL) vscode.postMessage({ type: "openFile", filePath: file }) - }} - /> + + setSidePanel(null)} + onExpand={selection() !== null ? openReviewTab : undefined} + onRequestDiff={requestDiffFile} + onOpenFile={(file) => { + const id = currentDiffSessionId() + if (id) vscode.postMessage({ type: "agentManager.openFile", sessionId: id, filePath: file }) + else if (selection() === LOCAL) vscode.postMessage({ type: "openFile", filePath: file }) + }} + /> +
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx b/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx index 1bf24c5c087..d2fd93465ef 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx @@ -10,7 +10,7 @@ import { Tooltip, TooltipKeybind } from "@kilocode/kilo-ui/tooltip" import { HoverCard } from "@kilocode/kilo-ui/hover-card" import { ContextMenu } from "@kilocode/kilo-ui/context-menu" import { Button } from "@kilocode/kilo-ui/button" -import type { WorktreeState, WorktreeGitStats } from "../src/types/messages" +import type { WorktreeState, WorktreeGitStats, PRStatus } from "../src/types/messages" import { useLanguage } from "../src/context/language" import { formatRelativeDate } from "../src/utils/date" @@ -22,6 +22,8 @@ interface WorktreeItemProps { worktree: WorktreeState /** Display label (resolved from label, first session title, or branch). */ label: string + /** Branch name shown as subtitle when it differs from the label. */ + subtitle?: string active: boolean pendingDelete: boolean busy: boolean @@ -51,6 +53,10 @@ interface WorktreeItemProps { closeKeybind: string /** Keybinding string for the open-in-vscode action. */ openKeybind: string + /** PR status for this worktree's branch, or null if no PR. */ + pr?: PRStatus | null + /** Callback when the PR badge is clicked. */ + onOpenPR?: () => void onClick: () => void onDelete: (e: MouseEvent) => void @@ -68,11 +74,41 @@ const MAX_SHORTCUT = 9 const hasStats = (s: WorktreeGitStats | undefined): s is WorktreeGitStats => !!s && (s.files > 0 || s.additions > 0 || s.deletions > 0 || s.ahead > 0 || s.behind > 0) +/** Returns the accent color for a PR badge based on state priority. */ +export function prAccentColor(pr: PRStatus): string { + if (pr.state === "draft") return "var(--text-weaker)" + if (pr.state === "merged") return "#a78bfa" + if (pr.state === "closed") return "#f87171" + if (pr.checks.status === "failure") return "#ef4444" + if (pr.review === "changes_requested") return "#fbbf24" + if (pr.checks.status === "pending") return "#fbbf24" + return "#34d399" +} + +function prStateLabel(state: PRStatus["state"]): string { + if (state === "draft") return "Draft" + if (state === "merged") return "Merged" + if (state === "closed") return "Closed" + return "Open" +} + +function reviewLabel(review: string): string { + if (review === "approved") return "Approved" + if (review === "changes_requested") return "Changes Requested" + return "Pending" +} + export const WorktreeItem: Component = (props) => { const { t } = useLanguage() const [hovered, setHovered] = createSignal(false) const [overClose, setOverClose] = createSignal(false) + const handleOpenPR = (e: MouseEvent) => { + e.stopPropagation() + e.preventDefault() + props.onOpenPR?.() + } + return ( <> @@ -102,128 +138,162 @@ export const WorktreeItem: Component = (props) => { data-sidebar-id={props.worktree.id} onClick={() => props.onClick()} > - - - - - - - - - { - e.stopPropagation() - props.onStartRename(props.label) - }} - title={t("agentManager.worktree.doubleClickRename")} - > - {props.label} - - } - > - props.onRenameInput(e.currentTarget.value)} - onKeyDown={(e) => { - if (e.key === "Enter") { - e.preventDefault() - props.onCommitRename() - } - if (e.key === "Escape") { - e.preventDefault() - props.onCancelRename() - } - }} - onBlur={() => props.onCommitRename()} - onClick={(e) => e.stopPropagation()} - ref={(el) => - requestAnimationFrame(() => - requestAnimationFrame(() => { - el.focus() - el.select() - }), - ) - } - /> - - = 2 && props.shortcut <= MAX_SHORTCUT}> - - {isMac ? "⌘" : "Ctrl+"} - {props.shortcut} - - - -
-
-
-
- - -
+
+ +
+
+ {/* Row 1: label + stale badge + stats/hover-actions overlay */} +
+ + + + + + + 0 || props.stats!.deletions > 0} + when={props.renaming} fallback={ - 0}> - {props.stats!.files}f + { + e.stopPropagation() + props.onStartRename(props.label) + }} + title={t("agentManager.worktree.doubleClickRename")} + > + {props.label} + + } + > + props.onRenameInput(e.currentTarget.value)} + onKeyDown={(e) => { + if (e.key === "Enter") { + e.preventDefault() + props.onCommitRename() + } + if (e.key === "Escape") { + e.preventDefault() + props.onCancelRename() + } + }} + onBlur={() => props.onCommitRename()} + onClick={(e) => e.stopPropagation()} + ref={(el) => + requestAnimationFrame(() => + requestAnimationFrame(() => { + el.focus() + el.select() + }), + ) + } + /> + + {/* Grid cell: stats visible by default, hover actions on top */} +
+ +
+
+
+ + +
+ 0}> + ↓{props.stats!.behind} + + 0}> + ↑{props.stats!.ahead} + + 0 || props.stats!.deletions > 0} + fallback={ + 0}> + {props.stats!.files}f + + } + > + 0}> + +{props.stats!.additions} + + 0}> + −{props.stats!.deletions} + + +
+ + + {t("agentManager.worktree.confirmDelete")} + +
+ = 2 && props.shortcut <= MAX_SHORTCUT}> + + {isMac ? "⌘" : "Ctrl+"} + {props.shortcut} + + + +
setOverClose(true)} + onMouseLeave={() => setOverClose(false)} + > + + props.onDelete(e)} + /> + +
+ +
+
+
+ {/* Row 2: branch subtitle + PR badge */} +
+ + {props.subtitle} + + +
} > -
- 0}> - +{props.stats!.additions} - - 0}> - −{props.stats!.deletions} - -
- - 0 || props.stats!.behind > 0}> -
- 0}> - ↑{props.stats!.ahead} - - 0}> - ↓{props.stats!.behind} - -
+ {(pr) => { + const accent = () => prAccentColor(pr()) + return ( + + + #{pr().number} + + ) + }}
- - - {t("agentManager.worktree.confirmDelete")} - - -
setOverClose(true)} - onMouseLeave={() => setOverClose(false)} - > - - props.onDelete(e)} - /> - -
- +
} @@ -313,6 +383,34 @@ export const WorktreeItem: Component = (props) => {
+ + {(pr) => ( + <> +
+
+ PR #{pr().number} + + + + + {prStateLabel(pr().state)} + +
+ +
+ Review + {reviewLabel(pr().review!)} +
+ +
+ Checks + + {pr().checks.passed}/{pr().checks.total} passed + +
+ + )} +
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 6cce27a333a..648a3ccbaca 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css +++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css @@ -62,8 +62,7 @@ } .am-local-item-active .am-local-branch { - color: var(--text-on-interactive-base); - opacity: 0.7; + color: color-mix(in srgb, var(--text-on-interactive-base) 70%, transparent); } .am-local-item-active .am-stat-files { @@ -92,8 +91,8 @@ } .am-local-branch { - font-size: var(--font-size-small); - color: var(--text-weak); + font-size: 10px; + color: var(--text-weaker); line-height: 1.2; overflow: hidden; text-overflow: ellipsis; @@ -181,12 +180,11 @@ button.am-section-toggle:hover .am-section-label { } .am-worktree-item { - position: relative; display: flex; - align-items: center; + align-items: flex-start; gap: 8px; - padding: 8px 10px; - min-height: 40px; + padding: 6px 10px; + min-height: 36px; box-sizing: border-box; border-radius: var(--radius-sm); cursor: pointer; @@ -197,6 +195,87 @@ button.am-section-toggle:hover .am-section-label { transition: background 200ms ease; } +/* Left icon column — shrink-0, vertically centered with first row */ +.am-wt-icon { + flex-shrink: 0; + display: flex; + align-items: center; + height: 20px; +} + +/* Right content column — flex-1 with two rows */ +.am-wt-content { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + gap: 2px; +} + +/* Row 1: label + stats/hover-actions */ +.am-wt-row1 { + display: flex; + align-items: center; + gap: 6px; + min-width: 0; +} + +/* Grid overlay cell: stats visible by default, hover actions stacked on top */ +.am-wt-actions-cell { + position: relative; + flex-shrink: 0; + display: grid; + align-items: center; + margin-left: auto; +} +.am-wt-actions-cell > * { + grid-column: 1; + grid-row: 1; +} + +/* Hover actions (shortcut badge + close button) — hidden by default, shown on hover */ +.am-wt-hover-actions { + display: flex; + align-items: center; + justify-content: flex-end; + gap: 2px; + opacity: 0; + visibility: hidden; +} +.am-worktree-item:hover .am-wt-hover-actions { + opacity: 1; + visibility: visible; +} +/* Stats fade out on hover (replaced by hover actions in same grid cell) */ +.am-worktree-item:hover .am-wt-actions-cell > .am-worktree-stats, +.am-worktree-item:hover .am-wt-actions-cell > .am-worktree-stats-skeleton { + opacity: 0; + visibility: hidden; +} + +/* Row 2: always present for consistent height; PR badge right-aligned */ +.am-wt-row2 { + display: flex; + align-items: center; + gap: 6px; + min-height: 14px; +} + +.am-worktree-subtitle { + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: 10px; + color: var(--text-weaker); + line-height: 1.2; + min-width: 0; +} + +.am-worktree-item-active .am-worktree-subtitle { + color: color-mix(in srgb, var(--text-on-interactive-base) 70%, transparent); +} + .am-worktree-item:hover { background: var(--surface-inset-base-hover); } @@ -238,13 +317,9 @@ button.am-section-toggle:hover .am-section-label { outline: none; } -/* Shortcut badge — hover-reveal index badge (⌘1, ⌘2, etc.) matching Superset style */ +/* Shortcut badge — hover-reveal index badge (⌘1, ⌘2, etc.) */ .am-shortcut-badge { - position: absolute; - right: 30px; - opacity: 0; - transition: opacity 150ms ease; font-size: 10px; font-variant-numeric: tabular-nums; color: var(--text-weaker); @@ -256,8 +331,7 @@ button.am-section-toggle:hover .am-section-label { right: 8px; } -.am-local-item:hover .am-shortcut-badge, -.am-worktree-item:hover .am-shortcut-badge { +.am-local-item:hover .am-shortcut-badge { opacity: 1; } @@ -278,29 +352,27 @@ button.am-section-toggle:hover .am-section-label { color: var(--text-weak); } -.am-worktree-item:has(.am-worktree-rename-input) .am-shortcut-badge { - opacity: 0; +.am-worktree-item:has(.am-worktree-rename-input) .am-wt-row2 { + display: none; } .am-worktree-close { - position: absolute; - right: 4px; flex-shrink: 0; +} +/* Compact close button inside worktree items */ +.am-worktree-close [data-component="icon-button"] { + width: 18px; + height: 18px; + padding: 2px; +} +.am-worktree-close [data-component="icon"] { + width: 14px; + height: 14px; +} + +.am-worktree-item:has(.am-worktree-rename-input) .am-wt-hover-actions { opacity: 0; -} - -.am-worktree-item:hover .am-worktree-branch { - mask-image: linear-gradient(to right, black calc(100% - 72px), transparent calc(100% - 36px)); - -webkit-mask-image: linear-gradient(to right, black calc(100% - 72px), transparent calc(100% - 36px)); -} - -.am-worktree-item:hover .am-worktree-close { - opacity: 1; -} - -.am-worktree-item:has(.am-worktree-rename-input) .am-worktree-close { - opacity: 0; - pointer-events: none; + visibility: hidden; } /* Inline delete confirmation */ @@ -315,7 +387,8 @@ button.am-section-toggle:hover .am-section-label { background: color-mix(in srgb, var(--surface-critical-strong) 25%, transparent); } -.am-worktree-pending-delete .am-worktree-branch { +.am-worktree-pending-delete .am-worktree-branch, +.am-worktree-pending-delete .am-worktree-subtitle { opacity: 0.5; transition: opacity 200ms ease; } @@ -325,16 +398,22 @@ button.am-section-toggle:hover .am-section-label { display: none; } -.am-worktree-pending-delete .am-shortcut-badge { +.am-worktree-pending-delete .am-wt-row2 { + visibility: hidden; +} + +.am-worktree-pending-delete .am-wt-hover-actions { opacity: 0 !important; + visibility: hidden !important; } .am-worktree-delete-hint { + position: absolute; + right: 0; font-size: var(--font-size-small); color: var(--text-on-brand-base); background: var(--surface-critical-strong); white-space: nowrap; - flex-shrink: 0; padding: 1px 8px; border-radius: 4px; cursor: pointer; @@ -383,16 +462,14 @@ button.am-section-toggle:hover .am-section-label { .am-worktree-spinner { width: 16px; height: 16px; - flex-shrink: 0; } /* Per-worktree git stats (diff lines + commits missing from origin) */ .am-worktree-stats { display: flex; - flex-direction: column; - align-items: flex-end; - gap: 1px; + align-items: center; + gap: 4px; flex-shrink: 0; font-family: var(--font-mono, monospace); font-size: 10px; @@ -408,9 +485,7 @@ button.am-section-toggle:hover .am-section-label { .am-worktree-stats-skeleton { display: flex; - flex-direction: column; - align-items: flex-end; - gap: 3px; + align-items: center; flex-shrink: 0; } @@ -422,8 +497,15 @@ button.am-section-toggle:hover .am-section-label { animation: am-skeleton-pulse 1.5s ease-in-out infinite; } -.am-worktree-stats-skeleton-row:nth-child(2) { - animation-delay: 0.15s; +.am-pr-badge-skeleton { + width: 52px; + height: 14px; + border-radius: 6px; + background: var(--text-base); + animation: am-skeleton-pulse 1.5s ease-in-out infinite; + animation-delay: 0.3s; + opacity: 0; + margin-left: auto; } .am-stat-files { @@ -438,6 +520,76 @@ button.am-section-toggle:hover .am-section-label { color: #f87171; } +/* PR pill badge — second row inside am-wt-row2. + Uses --pr-accent custom property (set inline) to derive all colors. */ +.am-pr-badge { + display: inline-flex; + align-items: center; + gap: 2px; + padding: 2px 7px 2px 4px; + border-radius: 6px; + border: none; + background: color-mix(in srgb, var(--pr-accent) 12%, transparent); + color: var(--pr-accent); + cursor: pointer; + font-size: 11px; + font-weight: 500; + font-variant-numeric: tabular-nums; + transition: background 150ms ease; + margin-left: auto; +} +.am-pr-badge:hover { + background: color-mix(in srgb, var(--pr-accent) 25%, transparent); +} +.am-pr-badge [data-component="icon"] { + width: 12px; + height: 12px; + color: var(--pr-accent); +} +.am-pr-badge-number { + line-height: 1; + color: var(--text-muted); +} +.am-pr-badge:hover .am-pr-badge-number { + color: var(--pr-accent); +} +.am-pr-badge[data-pending] { + animation: am-pr-pulse 1.5s ease-in-out infinite; +} +@keyframes am-pr-pulse { + 0%, + 100% { + opacity: 0.9; + } + 50% { + opacity: 0.4; + } +} + +.am-worktree-item-active .am-pr-badge { + background: color-mix(in srgb, var(--pr-accent) 18%, transparent); +} +.am-worktree-item-active .am-pr-badge:hover { + background: color-mix(in srgb, var(--pr-accent) 30%, transparent); +} + +/* Clickable link icon in hover card to open PR on GitHub */ +.am-pr-link { + display: inline-flex; + align-items: center; + margin-right: 3px; + cursor: pointer; + opacity: 0.5; + transition: opacity 100ms ease; +} +.am-pr-link:hover { + opacity: 1; +} +.am-pr-link [data-component="icon"] { + width: 11px; + height: 11px; +} + .am-worktree-item-active .am-stat-files { color: rgba(255, 255, 255, 0.7); } @@ -470,8 +622,6 @@ button.am-section-toggle:hover .am-section-label { color: #fca5a5; } -.am-worktree-item:hover .am-worktree-stats, -.am-worktree-item:hover .am-worktree-stats-skeleton, .am-local-item:hover .am-worktree-stats, .am-local-item:hover .am-worktree-stats-skeleton { opacity: 0; diff --git a/packages/kilo-vscode/webview-ui/src/components/shared/WorkingIndicator.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/WorkingIndicator.tsx index 6d35fed0344..9585b87bf86 100644 --- a/packages/kilo-vscode/webview-ui/src/components/shared/WorkingIndicator.tsx +++ b/packages/kilo-vscode/webview-ui/src/components/shared/WorkingIndicator.tsx @@ -4,14 +4,17 @@ * Matches the v1.0.25 working indicator UX. */ -import { Component, Show, createSignal, createEffect, onCleanup } from "solid-js" +import { type Component, Show, createSignal, createEffect, onCleanup } from "solid-js" import { Spinner } from "@kilocode/kilo-ui/spinner" +import { Button } from "@kilocode/kilo-ui/button" import { useSession } from "../../context/session" import { useLanguage } from "../../context/language" +import { useVSCode } from "../../context/vscode" export const WorkingIndicator: Component = () => { const session = useSession() const language = useLanguage() + const vscode = useVSCode() const [elapsed, setElapsed] = createSignal(0) const [retryCountdown, setRetryCountdown] = createSignal(0) @@ -80,6 +83,15 @@ export const WorkingIndicator: Component = () => { return perms.length > 0 || questions.length > 0 } + const isRetrying = () => session.statusInfo().type === "retry" + + const handleCancelRetry = () => { + const sid = session.currentSessionID() + if (sid) { + vscode.postMessage({ type: "abort", sessionID: sid }) + } + } + return (
@@ -88,6 +100,17 @@ export const WorkingIndicator: Component = () => { 0}> {formatElapsed()} + + +
) diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx index 3699decc2a6..3ce48123df2 100644 --- a/packages/kilo-vscode/webview-ui/src/context/session.tsx +++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx @@ -414,6 +414,10 @@ export const SessionProvider: ParentComponent = (props) => { function selectModel(providerID: string, modelID: string) { applyModel(selectedAgentName(), { providerID, modelID }) + const sid = currentSessionID() + if (sid) { + setStore("messages", sid, (msgs = []) => msgs.filter((m) => !m.error)) + } } /** The config/default model for the current mode (what settings says). */ diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts index 1fa8b58eda4..018648fff11 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts @@ -935,6 +935,10 @@ export const dict = { "session.status.retrying": "...إعادة المحاولة (المحاولة {{ attempt }})… {{ message }}", "session.status.working": "...جارٍ العمل", + "ui.sessionTurn.cancel": "إلغاء", + "ui.sessionTurn.status.thinking": "...جارٍ التفكير", + "ui.sessionTurn.status.consideringNextSteps": "...جارٍ التفكير في الخطوات التالية", + "dialog.model.noProviders": "لا يوجد موفرون", "prompt.placeholder.connecting": "جارٍ الاتصال بالخادم...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts index 4689add917c..f53d7ee3106 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts @@ -943,6 +943,10 @@ export const dict = { "session.status.retrying": "Tentando novamente (tentativa {{ attempt }})… {{ message }}", "session.status.working": "Trabalhando…", + "ui.sessionTurn.cancel": "Cancelar", + "ui.sessionTurn.status.thinking": "Pensando...", + "ui.sessionTurn.status.consideringNextSteps": "Considerando próximos passos...", + "dialog.model.noProviders": "Nenhum provedor", "prompt.placeholder.connecting": "Conectando ao servidor...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts index eb264cc52da..804deedc915 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts @@ -948,6 +948,10 @@ export const dict = { "session.status.retrying": "Ponovni pokušaj (pokušaj {{ attempt }})… {{ message }}", "session.status.working": "Radim…", + "ui.sessionTurn.cancel": "Otkaži", + "ui.sessionTurn.status.thinking": "Razmišljam...", + "ui.sessionTurn.status.consideringNextSteps": "Razmatram sljedeće korake...", + "dialog.model.noProviders": "Nema pružatelja", "prompt.placeholder.connecting": "Povezivanje na server...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts index a6a486f428f..0f85dd66ead 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts @@ -941,6 +941,10 @@ export const dict = { "session.status.retrying": "Prøver igen (forsøg {{ attempt }})… {{ message }}", "session.status.working": "Arbejder…", + "ui.sessionTurn.cancel": "Annuller", + "ui.sessionTurn.status.thinking": "Tænker...", + "ui.sessionTurn.status.consideringNextSteps": "Overvejer næste trin...", + "dialog.model.noProviders": "Ingen udbydere", "prompt.placeholder.connecting": "Opretter forbindelse til server...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts index 2f2bdbb999c..c0ce3dcc640 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts @@ -953,6 +953,10 @@ export const dict = { "session.status.retrying": "Erneuter Versuch ({{ attempt }})… {{ message }}", "session.status.working": "Wird bearbeitet…", + "ui.sessionTurn.cancel": "Abbrechen", + "ui.sessionTurn.status.thinking": "Denke nach...", + "ui.sessionTurn.status.consideringNextSteps": "Überlege nächste Schritte...", + "dialog.model.noProviders": "Keine Anbieter", "prompt.placeholder.connecting": "Verbindung zum Server wird hergestellt...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts index 8bc6b2db359..cdc8808c581 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts @@ -941,6 +941,10 @@ export const dict = { "session.status.retrying": "Retrying (attempt {{ attempt }})… {{ message }}", "session.status.working": "Working...", + "ui.sessionTurn.cancel": "Cancel", + "ui.sessionTurn.status.thinking": "Thinking...", + "ui.sessionTurn.status.consideringNextSteps": "Considering next steps...", + "dialog.model.noProviders": "No providers", "prompt.placeholder.connecting": "Connecting to server...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts index 4fc84109126..83ef47af004 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts @@ -949,6 +949,10 @@ export const dict = { "session.status.retrying": "Reintentando (intento {{ attempt }})… {{ message }}", "session.status.working": "Trabajando…", + "ui.sessionTurn.cancel": "Cancelar", + "ui.sessionTurn.status.thinking": "Pensando...", + "ui.sessionTurn.status.consideringNextSteps": "Considerando siguientes pasos...", + "dialog.model.noProviders": "Sin proveedores", "prompt.placeholder.connecting": "Conectando al servidor...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts index eff79d27b83..451e4dc37e5 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts @@ -955,6 +955,10 @@ export const dict = { "session.status.retrying": "Nouvelle tentative (essai {{ attempt }})… {{ message }}", "session.status.working": "En cours…", + "ui.sessionTurn.cancel": "Annuler", + "ui.sessionTurn.status.thinking": "Réflexion...", + "ui.sessionTurn.status.consideringNextSteps": "Envisage les prochaines étapes...", + "dialog.model.noProviders": "Aucun fournisseur", "prompt.placeholder.connecting": "Connexion au serveur...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts index 88020c7bb59..a7457c19d22 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts @@ -940,6 +940,10 @@ export const dict = { "session.status.retrying": "再試行中（{{ attempt }}回目）… {{ message }}", "session.status.working": "作業中…", + "ui.sessionTurn.cancel": "キャンセル", + "ui.sessionTurn.status.thinking": "考え中...", + "ui.sessionTurn.status.consideringNextSteps": "次のステップを検討中...", + "dialog.model.noProviders": "プロバイダーなし", "prompt.placeholder.connecting": "サーバーに接続中...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts index 98493230812..1c0de33a563 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts @@ -940,6 +940,10 @@ export const dict = { "session.status.retrying": "재시도 중 ({{ attempt }}번째 시도)… {{ message }}", "session.status.working": "작업 중...", + "ui.sessionTurn.cancel": "취소", + "ui.sessionTurn.status.thinking": "생각 중...", + "ui.sessionTurn.status.consideringNextSteps": "다음 단계 고려 중...", + "dialog.model.noProviders": "공급자 없음", "prompt.placeholder.connecting": "서버에 연결 중...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts index c8e5c7e21df..b3a648f5ab9 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts @@ -942,6 +942,10 @@ export const dict = { "session.status.retrying": "Opnieuw proberen (poging {{ attempt }})... {{ message }}", "session.status.working": "Bezig...", + "ui.sessionTurn.cancel": "Annuleren", + "ui.sessionTurn.status.thinking": "Denken...", + "ui.sessionTurn.status.consideringNextSteps": "Volgende stappen overwegen...", + "dialog.model.noProviders": "Geen providers", "prompt.placeholder.connecting": "Verbinden met server...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts index 97437a53ce3..d397d75f5a8 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts @@ -945,6 +945,10 @@ export const dict = { "session.status.retrying": "Prøver på nytt (forsøk {{ attempt }})… {{ message }}", "session.status.working": "Arbeider…", + "ui.sessionTurn.cancel": "Avbryt", + "ui.sessionTurn.status.thinking": "Tenker...", + "ui.sessionTurn.status.consideringNextSteps": "Vurderer neste steg...", + "dialog.model.noProviders": "Ingen leverandører", "prompt.placeholder.connecting": "Kobler til server...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts index cd6ecc31c49..c5283783fb5 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts @@ -945,6 +945,10 @@ export const dict = { "session.status.retrying": "Ponawiam próbę ({{ attempt }})… {{ message }}", "session.status.working": "Pracuję…", + "ui.sessionTurn.cancel": "Anuluj", + "ui.sessionTurn.status.thinking": "Myślę...", + "ui.sessionTurn.status.consideringNextSteps": "Rozważam następne kroki...", + "dialog.model.noProviders": "Brak dostawców", "prompt.placeholder.connecting": "Łączenie z serwerem...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts index bd6b3873120..6685607d233 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts @@ -948,6 +948,10 @@ export const dict = { "session.status.retrying": "Повторная попытка ({{ attempt }})… {{ message }}", "session.status.working": "Работаю…", + "ui.sessionTurn.cancel": "Отмена", + "ui.sessionTurn.status.thinking": "Думаю...", + "ui.sessionTurn.status.consideringNextSteps": "Продумываю следующие шаги...", + "dialog.model.noProviders": "Нет провайдеров", "prompt.placeholder.connecting": "Подключение к серверу...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts index 9703f2f0a4c..dbd2efc8fa0 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts @@ -936,6 +936,10 @@ export const dict = { "session.status.retrying": "กำลังลองใหม่ (ครั้งที่ {{ attempt }})… {{ message }}", "session.status.working": "กำลังทำงาน...", + "ui.sessionTurn.cancel": "ยกเลิก", + "ui.sessionTurn.status.thinking": "กำลังคิด...", + "ui.sessionTurn.status.consideringNextSteps": "กำลังพิจารณาขั้นตอนถัดไป...", + "dialog.model.noProviders": "ไม่มีผู้ให้บริการ", "prompt.placeholder.connecting": "กำลังเชื่อมต่อกับเซิร์ฟเวอร์...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts index 7e02b9f0d39..9728ca2defe 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts @@ -944,6 +944,10 @@ export const dict = { "session.status.retrying": "Yeniden deneniyor (deneme {{ attempt }})… {{ message }}", "session.status.working": "Çalışıyor...", + "ui.sessionTurn.cancel": "İptal", + "ui.sessionTurn.status.thinking": "Düşünüyor...", + "ui.sessionTurn.status.consideringNextSteps": "Sonraki adımları değerlendiriyor...", + "dialog.model.noProviders": "Sağlayıcı yok", "prompt.placeholder.connecting": "Sunucuya bağlanılıyor...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts index 613ab873cbc..44d43c7073a 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts @@ -945,6 +945,10 @@ export const dict = { "session.status.retrying": "Повторна спроба (спроба {{ attempt }})… {{ message }}", "session.status.working": "Працює...", + "ui.sessionTurn.cancel": "Скасувати", + "ui.sessionTurn.status.thinking": "Думаю...", + "ui.sessionTurn.status.consideringNextSteps": "Обдумую наступні кроки...", + "dialog.model.noProviders": "Немає провайдерів", "prompt.placeholder.connecting": "Підключення до сервера...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts index 531129eeaea..e2527847aef 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts @@ -928,6 +928,10 @@ export const dict = { "session.status.retrying": "正在重试（第 {{ attempt }} 次）… {{ message }}", "session.status.working": "处理中…", + "ui.sessionTurn.cancel": "取消", + "ui.sessionTurn.status.thinking": "思考中...", + "ui.sessionTurn.status.consideringNextSteps": "正在考虑下一步...", + "dialog.model.noProviders": "无供应商", "prompt.placeholder.connecting": "正在连接服务器...", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts index 124ad90b4d1..016313e9b0b 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts @@ -930,6 +930,10 @@ export const dict = { "session.status.retrying": "正在重試（第 {{ attempt }} 次）… {{ message }}", "session.status.working": "處理中…", + "ui.sessionTurn.cancel": "取消", + "ui.sessionTurn.status.thinking": "思考中...", + "ui.sessionTurn.status.consideringNextSteps": "正在考慮下一步...", + "dialog.model.noProviders": "沒有供應商", "prompt.placeholder.connecting": "正在連線至伺服器...", diff --git a/packages/kilo-vscode/webview-ui/src/types/messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages.ts index 0b4f0f348c8..2f36feec95a 100644 --- a/packages/kilo-vscode/webview-ui/src/types/messages.ts +++ b/packages/kilo-vscode/webview-ui/src/types/messages.ts @@ -799,6 +799,64 @@ export interface WorktreeState { groupId?: string /** User-provided display name for the worktree. */ label?: string + /** Cached PR number for instant badge display on reload. */ + prNumber?: number + /** Cached PR URL for instant badge display on reload. */ + prUrl?: string + /** Cached PR state for correct badge color on reload (open/merged/closed/draft). */ + prState?: string +} + +// --------------------------------------------------------------------------- +// PR status types (mirrored from extension types.ts) +// --------------------------------------------------------------------------- + +export type PRState = "open" | "draft" | "merged" | "closed" +export type ReviewDecision = "approved" | "changes_requested" | "pending" +export type CheckStatus = "success" | "failure" | "pending" | "skipped" | "cancelled" +export type AggregateCheckStatus = "success" | "failure" | "pending" | "none" + +export interface PRCheck { + name: string + status: CheckStatus + url?: string + duration?: string +} + +export interface PRComment { + id: string + author: string + avatar?: string + body: string + file?: string + line?: number + url?: string + resolved: boolean + createdAt?: number +} + +export interface PRStatus { + number: number + title: string + url: string + state: PRState + review: ReviewDecision | null + checks: { + status: AggregateCheckStatus + total: number + passed: number + failed: number + pending: number + items: PRCheck[] + } + comments?: { + total: number + unresolved: number + items: PRComment[] + } + additions: number + deletions: number + files: number } export interface ManagedSessionState { @@ -983,6 +1041,14 @@ export interface AgentManagerLocalStatsMessage { stats: LocalGitStats } +// Agent Manager: PR status push (extension → webview) +export interface AgentManagerPRStatusMessage { + type: "agentManager.prStatus" + worktreeId: string + pr: PRStatus | null + error?: "gh_missing" | "gh_auth" | "fetch_failed" +} + // Sidebar: Live worktree diff stats (extension → webview) export interface WorktreeStatsLoadedMessage { type: "worktreeStatsLoaded" @@ -1360,6 +1426,7 @@ export type ExtensionMessage = | AgentManagerApplyWorktreeDiffResultMessage | AgentManagerWorktreeStatsMessage | AgentManagerLocalStatsMessage + | AgentManagerPRStatusMessage // legacy-migration start | MigrationStateMessage | LegacyMigrationDataMessage @@ -1959,6 +2026,17 @@ export interface StopDiffWatchMessage { type: "agentManager.stopDiffWatch" } +// Agent Manager: PR messages (webview → extension) +export interface RefreshPRMessage { + type: "agentManager.refreshPR" + worktreeId: string +} + +export interface OpenPRMessage { + type: "agentManager.openPR" + worktreeId: string +} + export interface ApplyWorktreeDiffMessage { type: "agentManager.applyWorktreeDiff" worktreeId: string @@ -2198,6 +2276,8 @@ export type WebviewMessage = | RequestWorktreeDiffFileMessage | StartDiffWatchMessage | StopDiffWatchMessage + | RefreshPRMessage + | OpenPRMessage // legacy-migration start | RequestLegacyMigrationDataMessage | StartLegacyMigrationMessage diff --git a/packages/opencode/package.json b/packages/opencode/package.json index c2409c27264..ee31c7c871a 100644 --- a/packages/opencode/package.json +++ b/packages/opencode/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "version": "7.1.23", + "version": "7.2.0", "name": "@kilocode/cli", "type": "module", "license": "MIT", diff --git a/packages/opencode/src/file/ignore.ts b/packages/opencode/src/file/ignore.ts index 225983131c3..b9731040c7d 100644 --- a/packages/opencode/src/file/ignore.ts +++ b/packages/opencode/src/file/ignore.ts @@ -31,8 +31,6 @@ export namespace FileIgnore { "mypy_cache", ".history", ".gradle", - ".kilocode", // kilocode_change — ignore legacy local storage (#8379) - ".opencode", // kilocode_change — ignore legacy local storage (#8379) ]) const FILES = [ diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts index 7764b874a0c..0a38ddb70b9 100644 --- a/packages/opencode/src/snapshot/index.ts +++ b/packages/opencode/src/snapshot/index.ts @@ -10,12 +10,14 @@ import { Config } from "../config/config" import { Instance } from "../project/instance" import { Scheduler } from "../scheduler" import * as KiloSnapshot from "../kilocode/snapshot" // kilocode_change +import { Lock } from "../util/lock" // kilocode_change export namespace Snapshot { const log = Log.create({ service: "snapshot" }) const hour = 60 * 60 * 1000 const prune = "7.days" export const MAX_DIFF_SIZE = 256 * 1024 // kilocode_change + const MAX_SNAPSHOT_FILE_SIZE = 2 * 1024 * 1024 // kilocode_change — skip files >2MB during snapshot add export function init() { Scheduler.register({ @@ -36,6 +38,7 @@ export namespace Snapshot { .then(() => true) .catch(() => false) if (!exists) return + using _lock = await Lock.write(git) // kilocode_change const result = await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} gc --prune=${prune}` .quiet() @@ -57,6 +60,7 @@ export namespace Snapshot { const cfg = await Config.get() if (cfg.snapshot === false) return const git = await KiloSnapshot.prepare() // kilocode_change + using _lock = await Lock.write(git) // kilocode_change await add(git) const hash = await $`git --git-dir ${git} --work-tree ${Instance.worktree} write-tree` .quiet() @@ -75,6 +79,7 @@ export namespace Snapshot { export async function patch(hash: string): Promise { const git = await KiloSnapshot.prepare() // kilocode_change + using _lock = await Lock.write(git) // kilocode_change await add(git) const result = await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --name-only ${hash} -- .` @@ -103,6 +108,7 @@ export namespace Snapshot { export async function restore(snapshot: string) { log.info("restore", { commit: snapshot }) const git = await KiloSnapshot.prepare() // kilocode_change + using _lock = await Lock.write(git) // kilocode_change const result = await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} read-tree ${snapshot} && git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} checkout-index -a -f` .quiet() @@ -119,41 +125,136 @@ export namespace Snapshot { } } - export async function revert(patches: Patch[]) { - const files = new Set() - for (const item of patches) { - const git = await KiloSnapshot.prepare() // kilocode_change - for (const file of item.files) { - if (files.has(file)) continue - log.info("reverting", { file, hash: item.hash }) - const result = - await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} checkout ${item.hash} -- ${file}` - .quiet() - .cwd(Instance.worktree) - .nothrow() - if (result.exitCode !== 0) { - const relativePath = path.relative(Instance.worktree, file) - const checkTree = - await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} ls-tree ${item.hash} -- ${relativePath}` - .quiet() - .cwd(Instance.worktree) - .nothrow() - if (checkTree.exitCode === 0 && checkTree.text().trim()) { - log.info("file existed in snapshot but checkout failed, keeping", { - file, - }) - } else { - log.info("file did not exist in snapshot, deleting", { file }) - await fs.unlink(file).catch(() => {}) - } - } - files.add(file) + // kilocode_change start — batched revert: group up to 100 files per git checkout (port of upstream #20564) + type RevertOp = { hash: string; file: string; rel: string } + + /** Revert a single file: checkout from snapshot or delete if it didn't exist. */ + async function revertSingle(git: string, worktree: string, op: RevertOp) { + log.info("reverting", { file: op.file, hash: op.hash }) + const result = + await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${worktree} checkout ${op.hash} -- ${op.file}` + .quiet() + .cwd(worktree) + .nothrow() + if (result.exitCode === 0) return + const tree = + await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${worktree} ls-tree ${op.hash} -- ${op.rel}` + .quiet() + .cwd(worktree) + .nothrow() + if (tree.exitCode === 0 && tree.text().trim()) { + log.info("file existed in snapshot but checkout failed, keeping", { file: op.file, hash: op.hash }) + return + } + log.info("file did not exist in snapshot, deleting", { file: op.file, hash: op.hash }) + await fs.unlink(op.file).catch(() => {}) + } + + /** Revert a batch of files sharing the same hash. Falls back to single-file on failure. */ + async function revertBatch(git: string, worktree: string, batch: RevertOp[]) { + const hash = batch[0]!.hash + + // Check which files exist in the snapshot + const tree = + await $`git -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${worktree} ls-tree --name-only ${hash} -- ${batch.map((op) => op.rel)}` + .quiet() + .cwd(worktree) + .nothrow() + + if (tree.exitCode !== 0) { + log.info("batched ls-tree failed, falling back to single-file revert", { hash, files: batch.length }) + for (const op of batch) await revertSingle(git, worktree, op) + return + } + + const existing = new Set(tree.text().trim().split("\n").map((l) => l.trim()).filter(Boolean)) + + // Checkout files that exist in the snapshot + const toCheckout = batch.filter((op) => existing.has(op.rel)) + if (toCheckout.length) { + log.info("reverting", { hash, files: toCheckout.length }) + const result = + await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${worktree} checkout ${hash} -- ${toCheckout.map((op) => op.file)}` + .quiet() + .cwd(worktree) + .nothrow() + if (result.exitCode !== 0) { + log.info("batched checkout failed, falling back to single-file revert", { hash, files: toCheckout.length }) + for (const op of batch) await revertSingle(git, worktree, op) + return } } + + // Delete files that didn't exist in the snapshot + for (const op of batch) { + if (existing.has(op.rel)) continue + log.info("file did not exist in snapshot, deleting", { file: op.file, hash: op.hash }) + await fs.unlink(op.file).catch(() => {}) + } } + /** True when one path is a parent of the other (e.g. "a/b" and "a/b/c"). */ + function pathsClash(a: string, b: string) { + return a === b || a.startsWith(`${b}/`) || b.startsWith(`${a}/`) + } + + /** Can this op be added to the current batch? */ + function canBatch(batch: RevertOp[], op: RevertOp): boolean { + if (batch.length >= 100) return false + if (op.hash !== batch[0]!.hash) return false + if (batch.some((existing) => pathsClash(existing.rel, op.rel))) return false + return true + } + + /** + * Group consecutive ops into batches that share the same hash, + * have no path conflicts, and contain at most 100 files each. + */ + function groupIntoBatches(ops: RevertOp[]): RevertOp[][] { + const batches: RevertOp[][] = [] + let batch: RevertOp[] = [] + + for (const op of ops) { + if (batch.length > 0 && !canBatch(batch, op)) { + batches.push(batch) + batch = [] + } + batch.push(op) + } + if (batch.length > 0) batches.push(batch) + + return batches + } + + export async function revert(patches: Patch[]) { + const git = await KiloSnapshot.prepare() // kilocode_change + using _lock = await Lock.write(git) // kilocode_change + const worktree = Instance.worktree + + // Deduplicate files preserving patch order + const ops: RevertOp[] = [] + const seen = new Set() + for (const item of patches) { + for (const file of item.files) { + if (seen.has(file)) continue + seen.add(file) + ops.push({ hash: item.hash, file, rel: path.relative(worktree, file).replaceAll("\\", "/") }) + } + } + + for (const batch of groupIntoBatches(ops)) { + if (batch.length === 1) { + await revertSingle(git, worktree, batch[0]!) + } else { + await revertBatch(git, worktree, batch) + } + } + } + // kilocode_change end + export async function diff(hash: string) { const git = await KiloSnapshot.prepare() // kilocode_change + using _lock = await Lock.write(git) // kilocode_change await add(git) const result = await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff ${hash} -- .` @@ -208,10 +309,11 @@ export namespace Snapshot { diffCache.set(key, pending) return pending } + // kilocode_change end async function diffFullUncached(from: string, to: string): Promise { const git = await KiloSnapshot.prepare() // kilocode_change - // kilocode_change end + using _lock = await Lock.write(git) // kilocode_change const result: FileDiff[] = [] const status = new Map() @@ -277,26 +379,72 @@ export namespace Snapshot { return KiloSnapshot.gitdir() // kilocode_change } + // kilocode_change start — incremental add: diff-files + ls-files + size filter (port of upstream #17878) async function add(git: string) { - await syncExclude(git) - await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} add .` + const cwd = Instance.directory + const worktree = Instance.worktree + + // Run diff-files and ls-files concurrently to find changed + untracked files + const [diffResult, otherResult] = await Promise.all([ + $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${worktree} diff-files --name-only -z -- .` + .quiet() + .cwd(cwd) + .nothrow(), + $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${worktree} ls-files --others --exclude-standard -z -- .` + .quiet() + .cwd(cwd) + .nothrow(), + ]) + + if (diffResult.exitCode !== 0 || otherResult.exitCode !== 0) { + log.warn("failed to list snapshot files", { + diffCode: diffResult.exitCode, + diffStderr: diffResult.stderr.toString(), + otherCode: otherResult.exitCode, + otherStderr: otherResult.stderr.toString(), + }) + return + } + + const tracked = diffResult.text().split("\0").filter(Boolean) + const all = Array.from(new Set([...tracked, ...otherResult.text().split("\0").filter(Boolean)])) + if (!all.length) { + await syncExclude(git) + return + } + + // Filter out oversized files (>2MB) + const large = ( + await Promise.all( + all.map(async (item) => { + const stat = await fs.stat(path.join(cwd, item)).catch(() => null) + return stat?.isFile() && stat.size > MAX_SNAPSHOT_FILE_SIZE ? item : undefined + }), + ) + ).filter(Boolean) as string[] + + await syncExclude(git, large) + await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${worktree} add --sparse .` .quiet() - .cwd(Instance.directory) + .cwd(cwd) .nothrow() } - async function syncExclude(git: string) { + async function syncExclude(git: string, largeFiles: string[] = []) { const file = await excludes() const target = path.join(git, "info", "exclude") await fs.mkdir(path.join(git, "info"), { recursive: true }) - if (!file) { - await Filesystem.write(target, "") - return + const parts: string[] = [] + if (file) { + const text = await Filesystem.readText(file).catch(() => "") + if (text.trim()) parts.push(text.trimEnd()) } - const text = await Filesystem.readText(file).catch(() => "") - - await Filesystem.write(target, text) + for (const item of largeFiles) { + parts.push(`/${item.replaceAll("\\", "/")}`) + } + await Filesystem.write(target, parts.length ? parts.join("\n") + "\n" : "") } + // kilocode_change end async function excludes() { const file = await $`git rev-parse --path-format=absolute --git-path info/exclude` diff --git a/packages/opencode/test/snapshot/snapshot.test.ts b/packages/opencode/test/snapshot/snapshot.test.ts index 1804ab5c2a2..e70ce1d2eed 100644 --- a/packages/opencode/test/snapshot/snapshot.test.ts +++ b/packages/opencode/test/snapshot/snapshot.test.ts @@ -1178,3 +1178,414 @@ test("diffFull with whitespace changes", async () => { }, }) }) + +// ── Tests for snapshot optimizations (upstream #17878, #20564) ──────── + +test("concurrent track() calls return consistent results", async () => { + await using tmp = await bootstrap() + await Instance.provide({ + directory: tmp.path, + fn: async () => { + await Snapshot.track() + + await Filesystem.write(`${tmp.path}/a.txt`, "concurrent-change") + + const results = await Promise.all([ + Snapshot.track(), + Snapshot.track(), + Snapshot.track(), + Snapshot.track(), + Snapshot.track(), + ]) + + const hashes = results.filter(Boolean) + expect(hashes.length).toBe(5) + // All concurrent calls must return the same hash + expect(new Set(hashes).size).toBe(1) + }, + }) +}) + +test("batch revert with many files sharing same hash", async () => { + await using tmp = await tmpdir({ + git: true, + init: async (dir) => { + // Create enough files to trigger batching (>1 per hash) + for (let i = 0; i < 20; i++) { + await Filesystem.write(`${dir}/file${i}.txt`, `original-${i}`) + } + await $`git add .`.cwd(dir).quiet() + await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet() + }, + }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const before = await Snapshot.track() + expect(before).toBeTruthy() + + // Modify all 20 files + for (let i = 0; i < 20; i++) { + await Filesystem.write(`${tmp.path}/file${i}.txt`, `changed-${i}`) + } + // Add 5 new files + for (let i = 0; i < 5; i++) { + await Filesystem.write(`${tmp.path}/new${i}.txt`, `new-${i}`) + } + + const patch = await Snapshot.patch(before!) + expect(patch.files.length).toBe(25) + + await Snapshot.revert([patch]) + + // Modified files should be restored + for (let i = 0; i < 20; i++) { + const content = await Filesystem.readText(`${tmp.path}/file${i}.txt`) + expect(content).toBe(`original-${i}`) + } + // New files should be deleted + for (let i = 0; i < 5; i++) { + expect( + await fs + .access(`${tmp.path}/new${i}.txt`) + .then(() => true) + .catch(() => false), + ).toBe(false) + } + }, + }) +}) + +test("batch revert with files in nested subdirectories", async () => { + await using tmp = await tmpdir({ + git: true, + init: async (dir) => { + await fs.mkdir(`${dir}/a/b/c`, { recursive: true }) + await fs.mkdir(`${dir}/d/e`, { recursive: true }) + for (let i = 0; i < 10; i++) { + await Filesystem.write(`${dir}/a/b/c/file${i}.txt`, `deep-${i}`) + await Filesystem.write(`${dir}/d/e/file${i}.txt`, `other-${i}`) + } + await $`git add .`.cwd(dir).quiet() + await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet() + }, + }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const before = await Snapshot.track() + expect(before).toBeTruthy() + + for (let i = 0; i < 10; i++) { + await Filesystem.write(`${tmp.path}/a/b/c/file${i}.txt`, `modified-${i}`) + await Filesystem.write(`${tmp.path}/d/e/file${i}.txt`, `modified-${i}`) + } + + await Snapshot.revert([await Snapshot.patch(before!)]) + + for (let i = 0; i < 10; i++) { + expect(await Filesystem.readText(`${tmp.path}/a/b/c/file${i}.txt`)).toBe(`deep-${i}`) + expect(await Filesystem.readText(`${tmp.path}/d/e/file${i}.txt`)).toBe(`other-${i}`) + } + }, + }) +}) + +test("incremental add skips new files larger than 2MB", async () => { + await using tmp = await bootstrap() + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const before = await Snapshot.track() + expect(before).toBeTruthy() + + // Create a file larger than 2MB + const largeContent = "x".repeat(3 * 1024 * 1024) + await Filesystem.write(`${tmp.path}/large.bin`, largeContent) + // Also create a small file + await Filesystem.write(`${tmp.path}/small.txt`, "small change") + + const after = await Snapshot.track() + expect(after).toBeTruthy() + + const patch = await Snapshot.patch(before!) + // Small file should be tracked, large file should be excluded + const files = patch.files.map((f) => path.basename(f)) + expect(files).toContain("small.txt") + expect(files).not.toContain("large.bin") + }, + }) +}) + +test("incremental add: tracked files that grow past 2MB are still visible in patch", async () => { + // The 2MB size filter only prevents NEW large files from being added to the + // snapshot index. Already-tracked files that grow past 2MB still appear in + // patch/diff because those compare against the working tree. This matches + // upstream OpenCode behavior. + await using tmp = await bootstrap() + await Instance.provide({ + directory: tmp.path, + fn: async () => { + await Filesystem.write(`${tmp.path}/growing.txt`, "small") + const before = await Snapshot.track() + expect(before).toBeTruthy() + + await Filesystem.write(`${tmp.path}/growing.txt`, "x".repeat(3 * 1024 * 1024)) + await Filesystem.write(`${tmp.path}/a.txt`, "changed") + + const patch = await Snapshot.patch(before!) + const files = patch.files.map((f) => path.basename(f)) + expect(files).toContain("a.txt") + expect(files).toContain("growing.txt") + }, + }) +}) + +test("concurrent patch() calls return consistent results", async () => { + await using tmp = await bootstrap() + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const before = await Snapshot.track() + expect(before).toBeTruthy() + + await Filesystem.write(`${tmp.path}/a.txt`, "changed") + + const results = await Promise.all([ + Snapshot.patch(before!), + Snapshot.patch(before!), + Snapshot.patch(before!), + ]) + + // All should report the same changed files + for (const result of results) { + expect(result.files).toContain(fwd(tmp.path, "a.txt")) + } + }, + }) +}) + +test("batch revert with mix of modified, new, and deleted files", async () => { + await using tmp = await tmpdir({ + git: true, + init: async (dir) => { + for (let i = 0; i < 15; i++) { + await Filesystem.write(`${dir}/file${i}.txt`, `original-${i}`) + } + await $`git add .`.cwd(dir).quiet() + await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet() + }, + }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const before = await Snapshot.track() + expect(before).toBeTruthy() + + // Modify some files + for (let i = 0; i < 5; i++) { + await Filesystem.write(`${tmp.path}/file${i}.txt`, `modified-${i}`) + } + // Delete some files + for (let i = 5; i < 10; i++) { + await fs.unlink(`${tmp.path}/file${i}.txt`) + } + // Add new files + for (let i = 0; i < 5; i++) { + await Filesystem.write(`${tmp.path}/added${i}.txt`, `added-${i}`) + } + + await Snapshot.revert([await Snapshot.patch(before!)]) + + // Modified files restored + for (let i = 0; i < 5; i++) { + expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`original-${i}`) + } + // Deleted files restored + for (let i = 5; i < 10; i++) { + expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`original-${i}`) + } + // Untouched files unchanged + for (let i = 10; i < 15; i++) { + expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`original-${i}`) + } + // New files removed + for (let i = 0; i < 5; i++) { + expect( + await fs + .access(`${tmp.path}/added${i}.txt`) + .then(() => true) + .catch(() => false), + ).toBe(false) + } + }, + }) +}) + +test("batch revert with multiple patches from different snapshots", async () => { + await using tmp = await tmpdir({ + git: true, + init: async (dir) => { + for (let i = 0; i < 10; i++) { + await Filesystem.write(`${dir}/file${i}.txt`, `v0-${i}`) + } + await $`git add .`.cwd(dir).quiet() + await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet() + }, + }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + // Snapshot A + const snapA = await Snapshot.track() + expect(snapA).toBeTruthy() + + // Modify first 5 files + for (let i = 0; i < 5; i++) { + await Filesystem.write(`${tmp.path}/file${i}.txt`, `v1-${i}`) + } + + // Snapshot B (captures v1 state) + const snapB = await Snapshot.track() + expect(snapB).toBeTruthy() + + // Modify last 5 files + for (let i = 5; i < 10; i++) { + await Filesystem.write(`${tmp.path}/file${i}.txt`, `v2-${i}`) + } + + // Revert with patches from two different hashes + const patchA = await Snapshot.patch(snapA!) + const patchB = await Snapshot.patch(snapB!) + // patchA covers files 0-4 (changed in v1) + files 5-9 (changed in v2) + // patchB covers files 5-9 (changed in v2) + // Reverting [patchA, patchB]: patchA's hash wins for all files (first seen) + await Snapshot.revert([patchA, patchB]) + + // All files should be at v0 (snapA's state) + for (let i = 0; i < 10; i++) { + expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`v0-${i}`) + } + }, + }) +}) + +test("concurrent track calls each produce a valid snapshot", async () => { + await using tmp = await tmpdir({ + git: true, + init: async (dir) => { + for (let i = 0; i < 10; i++) { + await Filesystem.write(`${dir}/file${i}.txt`, `original-${i}`) + } + await $`git add .`.cwd(dir).quiet() + await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet() + }, + }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + await Snapshot.track() // warm up + + for (let i = 0; i < 10; i++) { + await Filesystem.write(`${tmp.path}/file${i}.txt`, `changed-${i}`) + } + + // Fire 5 concurrent tracks, then verify each hash is a usable snapshot + const hashes = (await Promise.all([ + Snapshot.track(), + Snapshot.track(), + Snapshot.track(), + Snapshot.track(), + Snapshot.track(), + ])).filter(Boolean) as string[] + + expect(hashes.length).toBe(5) + + // Every hash should produce a valid diffFull against itself (empty diff) + for (const hash of hashes) { + const diff = await Snapshot.diffFull(hash, hash) + expect(diff).toEqual([]) + } + + // Every hash should be usable for restore without error + await Snapshot.restore(hashes[0]!) + for (let i = 0; i < 10; i++) { + expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`changed-${i}`) + } + }, + }) +}) + +test("track after revert produces clean snapshot", async () => { + await using tmp = await tmpdir({ + git: true, + init: async (dir) => { + for (let i = 0; i < 10; i++) { + await Filesystem.write(`${dir}/file${i}.txt`, `original-${i}`) + } + await $`git add .`.cwd(dir).quiet() + await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet() + }, + }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const before = await Snapshot.track() + expect(before).toBeTruthy() + + for (let i = 0; i < 10; i++) { + await Filesystem.write(`${tmp.path}/file${i}.txt`, `changed-${i}`) + } + + await Snapshot.revert([await Snapshot.patch(before!)]) + + // After revert, a new track should match the original snapshot + const after = await Snapshot.track() + expect(after).toBeTruthy() + expect(after).toBe(before) + }, + }) +}) + +test("incremental add tracks newly created files", async () => { + await using tmp = await bootstrap() + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const before = await Snapshot.track() + expect(before).toBeTruthy() + + // Create several new files in subdirectories + await fs.mkdir(`${tmp.path}/newdir/sub`, { recursive: true }) + await Filesystem.write(`${tmp.path}/newdir/one.txt`, "one") + await Filesystem.write(`${tmp.path}/newdir/sub/two.txt`, "two") + await Filesystem.write(`${tmp.path}/three.txt`, "three") + + const patch = await Snapshot.patch(before!) + const files = patch.files.map((f) => path.basename(f)) + expect(files).toContain("one.txt") + expect(files).toContain("two.txt") + expect(files).toContain("three.txt") + }, + }) +}) + +test("incremental add tracks modified and deleted files", async () => { + await using tmp = await bootstrap() + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const before = await Snapshot.track() + expect(before).toBeTruthy() + + // Modify one file, delete the other + await Filesystem.write(`${tmp.path}/a.txt`, "modified-a") + await fs.unlink(`${tmp.path}/b.txt`) + + const patch = await Snapshot.patch(before!) + const files = patch.files.map((f) => path.basename(f)) + expect(files).toContain("a.txt") + expect(files).toContain("b.txt") + }, + }) +}) diff --git a/packages/plugin/package.json b/packages/plugin/package.json index cf439ced8aa..63bcd4a3bd1 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@kilocode/plugin", - "version": "7.1.23", + "version": "7.2.0", "type": "module", "license": "MIT", "scripts": { diff --git a/packages/script/package.json b/packages/script/package.json index c951dcd5687..1a6b1ee9aac 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -8,7 +8,7 @@ "exports": { ".": "./src/index.ts" }, - "version": "7.1.23", + "version": "7.2.0", "dependencies": {}, "peerDependencies": {} } diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json index 969a6d0aa44..1c2f28473c6 100644 --- a/packages/sdk/js/package.json +++ b/packages/sdk/js/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@kilocode/sdk", - "version": "7.1.23", + "version": "7.2.0", "type": "module", "license": "MIT", "scripts": { diff --git a/packages/storybook/package.json b/packages/storybook/package.json index c874f5501d4..181a277cf52 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -26,7 +26,7 @@ "typescript": "catalog:", "vite": "catalog:" }, - "version": "7.1.23", + "version": "7.2.0", "dependencies": {}, "peerDependencies": {} } diff --git a/packages/ui/package.json b/packages/ui/package.json index 6535b8dcf0f..f0a6d88dcef 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/ui", - "version": "7.1.23", + "version": "7.2.0", "type": "module", "license": "MIT", "exports": { diff --git a/packages/util/package.json b/packages/util/package.json index ed93fce66e7..2f92151be1c 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/util", - "version": "7.1.23", + "version": "7.2.0", "private": true, "type": "module", "license": "MIT", diff --git a/script/check-opencode-annotations.ts b/script/check-opencode-annotations.ts new file mode 100644 index 00000000000..314b399d460 --- /dev/null +++ b/script/check-opencode-annotations.ts @@ -0,0 +1,168 @@ +#!/usr/bin/env bun + +/** + * Verifies that every Kilo-specific change in shared packages/opencode/ files + * is annotated with a kilocode_change marker. + * + * Usage: + * bun run script/check-opencode-annotations.ts # diff against origin/main + * bun run script/check-opencode-annotations.ts --base # diff against + * + * A line is "covered" if it: + * - contains // kilocode_change (inline annotation) + * - falls inside a // kilocode_change start/end block (block annotation) + * - is in a file whose first non-empty line is (whole-file annotation) + * // kilocode_change - new file + * - is empty / whitespace-only (skipped) + * - is itself a marker line (auto-covered) + * + * Exempt paths (no markers needed — entirely Kilo-specific): + * - packages/opencode/src/kilocode/** + * - packages/opencode/test/kilocode/** + * - Any path containing "kilocode" in directory or filename + */ + +import { spawnSync } from "node:child_process" +import { readFileSync } from "node:fs" +import path from "node:path" + +const ROOT = path.resolve(import.meta.dir, "..") +const SOURCE_EXTS = new Set([".ts", ".tsx", ".js", ".jsx"]) + +const args = process.argv.slice(2) +const baseIdx = args.indexOf("--base") +const base = baseIdx !== -1 ? args[baseIdx + 1] : "origin/main" + +function run(cmd: string, args: string[]) { + const result = spawnSync(cmd, args, { cwd: ROOT, encoding: "utf8" }) + return result.stdout?.trim() ?? "" +} + +function changedFiles() { + const out = run("git", ["diff", "--name-only", "--diff-filter=AMRT", `${base}...HEAD`, "--", "packages/opencode"]) + return out ? out.split("\n").filter(Boolean) : [] +} + +function isExempt(file: string) { + const norm = file.replaceAll("\\", "/").toLowerCase() + return norm.split("/").some((part) => part.includes("kilocode")) +} + +function isSource(file: string) { + return SOURCE_EXTS.has(path.extname(file)) +} + +function addedLines(file: string): Set { + const diff = run("git", ["diff", "--unified=0", "--diff-filter=AMRT", `${base}...HEAD`, "--", file]) + const out = new Set() + for (const line of diff.split("\n")) { + const m = line.match(/^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/) + if (!m) continue + const start = Number(m[1]) + const count = m[2] !== undefined ? Number(m[2]) : 1 + for (let i = 0; i < count; i++) out.add(start + i) + } + return out +} + +function coveredLines(text: string): { lines: string[]; covered: Set } { + const lines = text.split(/\r?\n/) + const covered = new Set() + + // Whole-file annotation: first non-empty line is "// kilocode_change - new file" + const first = lines.find((x) => x.trim() !== "") + if (first?.match(/\/\/\s*kilocode_change\s*-\s*new\s*file\b/)) { + for (let i = 1; i <= lines.length; i++) covered.add(i) + return { lines, covered } + } + + let block = false + for (let i = 0; i < lines.length; i++) { + const n = i + 1 + const line = lines[i] ?? "" + + if (line.match(/\/\/\s*kilocode_change\s+start\b/)) { + block = true + covered.add(n) + continue + } + + if (line.match(/\/\/\s*kilocode_change\s+end\b/)) { + covered.add(n) + block = false + continue + } + + if (block) { + covered.add(n) + continue + } + + if (line.match(/\/\/\s*kilocode_change\b/)) covered.add(n) + } + + return { lines, covered } +} + +// --- main --- + +const files = changedFiles().filter((f) => !isExempt(f) && isSource(f)) + +if (files.length === 0) { + console.log("No shared opencode source files changed — nothing to check.") + process.exit(0) +} + +const violations: string[] = [] + +for (const file of files) { + const nums = addedLines(file) + if (nums.size === 0) continue + + const abs = path.join(ROOT, file) + const text = readFileSync(abs, "utf8") + const { lines, covered } = coveredLines(text) + + for (const n of nums) { + const line = lines[n - 1] ?? "" + const trim = line.trim() + if (!trim) continue + if (trim.match(/\/\/\s*kilocode_change\b/)) continue + if (!covered.has(n)) violations.push(` ${file}:${n}: ${trim}`) + } +} + +if (violations.length === 0) { + console.log("All shared opencode changes are annotated with kilocode_change markers.") + process.exit(0) +} + +console.error( + [ + "Unannotated Kilo changes found in shared opencode files:", + "", + ...violations, + "", + "Every Kilo-specific change in packages/opencode/ must be annotated.", + "", + "Inline (single line):", + " const url = Flag.KILO_MODELS_URL || 'https://models.dev' // kilocode_change", + "", + "Block (multiple lines):", + " // kilocode_change start", + " ...", + " // kilocode_change end", + "", + "New file:", + " // kilocode_change - new file", + "", + "Exempt paths (no markers needed):", + " - packages/opencode/src/kilocode/**", + " - packages/opencode/test/kilocode/**", + " - Any path containing 'kilocode' in the directory or filename", + "", + "See AGENTS.md for details.", + ].join("\n"), +) + +process.exit(1) diff --git a/script/upstream/package.json b/script/upstream/package.json index 76643aab7bc..d6dab3f44b3 100644 --- a/script/upstream/package.json +++ b/script/upstream/package.json @@ -1,6 +1,6 @@ { "name": "@kilocode/upstream-merge", - "version": "7.1.23", + "version": "7.2.0", "private": true, "type": "module", "description": "Scripts for automating upstream opencode merges into Kilo", diff --git a/sdks/vscode/package.json b/sdks/vscode/package.json index 12b653118d0..d521dcb3c2b 100644 --- a/sdks/vscode/package.json +++ b/sdks/vscode/package.json @@ -2,7 +2,7 @@ "name": "opencode", "displayName": "opencode", "description": "opencode for VS Code", - "version": "7.1.23", + "version": "7.2.0", "publisher": "sst-dev", "repository": { "type": "git",