From 98c2335cf05a21467795c64201d5bcae1f7c08b4 Mon Sep 17 00:00:00 2001 From: 0xCybin <0xcybin@gmail.com> Date: Sat, 7 Mar 2026 22:53:29 -0600 Subject: [PATCH 01/58] fix: apply empty-text content filtering to Bedrock Claude models Bedrock Claude models reject messages with empty text content blocks (ValidationException), but the existing filter only checked for @ai-sdk/anthropic. Extended the condition to also cover @ai-sdk/amazon-bedrock when the model ID contains "claude". Closes #6596 Co-Authored-By: Claude Opus 4.6 --- packages/opencode/src/provider/transform.ts | 9 +- .../opencode/test/provider/transform.test.ts | 104 ++++++++++++++++++ 2 files changed, 110 insertions(+), 3 deletions(-) diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts index 6e35ee35beb..e44090413e8 100644 --- a/packages/opencode/src/provider/transform.ts +++ b/packages/opencode/src/provider/transform.ts @@ -50,9 +50,12 @@ export namespace ProviderTransform { model: Provider.Model, options: Record, ): ModelMessage[] { - // Anthropic rejects messages with empty content - filter out empty string messages - // and remove empty text/reasoning parts from array content - if (model.api.npm === "@ai-sdk/anthropic") { + // Anthropic and Bedrock Claude reject messages with empty content - filter out + // empty string messages and remove empty text/reasoning parts from array content + if ( + model.api.npm === "@ai-sdk/anthropic" || + (model.api.npm === "@ai-sdk/amazon-bedrock" && model.api.id.includes("claude")) + ) { msgs = msgs .map((msg) => { if (typeof msg.content === "string") { diff --git a/packages/opencode/test/provider/transform.test.ts b/packages/opencode/test/provider/transform.test.ts index c18698e5a35..6bcd24daacb 100644 --- a/packages/opencode/test/provider/transform.test.ts +++ b/packages/opencode/test/provider/transform.test.ts @@ -1022,6 +1022,110 @@ describe("ProviderTransform.message - anthropic empty content filtering", () => }) }) +describe("ProviderTransform.message - bedrock claude empty content filtering", () => { + const bedrockClaudeModel = { + id: "amazon-bedrock/anthropic.claude-sonnet-4-5", + providerID: "amazon-bedrock", + api: { + id: "anthropic.claude-sonnet-4-5-20250514-v1:0", + url: "https://bedrock-runtime.us-east-1.amazonaws.com", + npm: "@ai-sdk/amazon-bedrock", + }, + name: "Claude Sonnet 4.5 (Bedrock)", + capabilities: { + temperature: true, + reasoning: false, + attachment: true, + toolcall: true, + input: { text: true, audio: false, image: true, video: false, pdf: true }, + output: { text: true, audio: false, image: false, video: false, pdf: false }, + interleaved: false, + }, + cost: { input: 0.003, output: 0.015 }, + limit: { context: 200000, output: 8192 }, + status: "active", + options: {}, + headers: {}, + } as any + + test("filters out messages with empty string content", () => { + const msgs = [ + { role: "user", content: "Hello" }, + { role: "assistant", content: "" }, + { role: "user", content: "World" }, + ] as any[] + + const result = ProviderTransform.message(msgs, bedrockClaudeModel, {}) + + expect(result).toHaveLength(2) + expect(result[0].content).toBe("Hello") + expect(result[1].content).toBe("World") + }) + + test("filters out empty text parts from array content", () => { + const msgs = [ + { + role: "assistant", + content: [ + { type: "text", text: "" }, + { type: "text", text: "Hello" }, + ], + }, + ] as any[] + + const result = ProviderTransform.message(msgs, bedrockClaudeModel, {}) + + expect(result).toHaveLength(1) + expect(result[0].content).toHaveLength(1) + expect(result[0].content[0]).toEqual({ type: "text", text: "Hello" }) + }) + + test("removes entire message when all parts are empty", () => { + const msgs = [ + { role: "user", content: "Hello" }, + { + role: "assistant", + content: [ + { type: "text", text: "" }, + { type: "reasoning", text: "" }, + ], + }, + { role: "user", content: "World" }, + ] as any[] + + const result = ProviderTransform.message(msgs, bedrockClaudeModel, {}) + + expect(result).toHaveLength(2) + expect(result[0].content).toBe("Hello") + expect(result[1].content).toBe("World") + }) + + test("does not filter for non-claude bedrock models", () => { + const bedrockNonClaudeModel = { + ...bedrockClaudeModel, + api: { + id: "amazon.titan-text-express-v1", + url: "https://bedrock-runtime.us-east-1.amazonaws.com", + npm: "@ai-sdk/amazon-bedrock", + }, + } + + const msgs = [ + { role: "assistant", content: "" }, + { + role: "assistant", + content: [{ type: "text", text: "" }], + }, + ] as any[] + + const result = ProviderTransform.message(msgs, bedrockNonClaudeModel, {}) + + expect(result).toHaveLength(2) + expect(result[0].content).toBe("") + expect(result[1].content).toHaveLength(1) + }) +}) + describe("ProviderTransform.message - strip openai metadata when store=false", () => { const openaiModel = { id: "openai/gpt-5", From d0c1bd2673e5b10b2a2b89a56358418b002f2881 Mon Sep 17 00:00:00 2001 From: 0xCybin <0xcybin@gmail.com> Date: Sat, 7 Mar 2026 23:02:00 -0600 Subject: [PATCH 02/58] fix: handle bedrock claude custom inference profile ARNs Custom inference profiles use ARN-based api.id values that don't contain "claude", so also check model.id for claude detection. Added test coverage for the inference profile edge case and fixed the non-claude test to properly override model.id. Co-Authored-By: Claude Opus 4.6 --- packages/opencode/src/provider/transform.ts | 3 +- .../opencode/test/provider/transform.test.ts | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts index e44090413e8..f736927cc9e 100644 --- a/packages/opencode/src/provider/transform.ts +++ b/packages/opencode/src/provider/transform.ts @@ -54,7 +54,8 @@ export namespace ProviderTransform { // empty string messages and remove empty text/reasoning parts from array content if ( model.api.npm === "@ai-sdk/anthropic" || - (model.api.npm === "@ai-sdk/amazon-bedrock" && model.api.id.includes("claude")) + (model.api.npm === "@ai-sdk/amazon-bedrock" && + (model.api.id.includes("claude") || model.id.includes("claude"))) ) { msgs = msgs .map((msg) => { diff --git a/packages/opencode/test/provider/transform.test.ts b/packages/opencode/test/provider/transform.test.ts index 6bcd24daacb..fab2f49d533 100644 --- a/packages/opencode/test/provider/transform.test.ts +++ b/packages/opencode/test/provider/transform.test.ts @@ -1100,9 +1100,41 @@ describe("ProviderTransform.message - bedrock claude empty content filtering", ( expect(result[1].content).toBe("World") }) + test("filters empty text for bedrock claude custom inference profiles", () => { + const bedrockProfileModel = { + ...bedrockClaudeModel, + id: "amazon-bedrock/custom-claude-sonnet-4.5", + api: { + id: "arn:aws:bedrock:xxx:yyy:application-inference-profile/zzz", + url: "https://bedrock-runtime.us-east-1.amazonaws.com", + npm: "@ai-sdk/amazon-bedrock", + }, + } + + const msgs = [ + { role: "user", content: "Hello" }, + { role: "assistant", content: "" }, + { + role: "assistant", + content: [ + { type: "text", text: "" }, + { type: "text", text: "Answer" }, + ], + }, + ] as any[] + + const result = ProviderTransform.message(msgs, bedrockProfileModel, {}) + + expect(result).toHaveLength(2) + expect(result[0].content).toBe("Hello") + expect(result[1].content).toHaveLength(1) + expect(result[1].content[0]).toEqual({ type: "text", text: "Answer" }) + }) + test("does not filter for non-claude bedrock models", () => { const bedrockNonClaudeModel = { ...bedrockClaudeModel, + id: "amazon-bedrock/amazon.titan-text-express-v1", api: { id: "amazon.titan-text-express-v1", url: "https://bedrock-runtime.us-east-1.amazonaws.com", From 04373d730cf78fbe3fad977addb26681ee63cbc7 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Wed, 25 Mar 2026 11:53:22 +0200 Subject: [PATCH 03/58] feat(cli): pause and resume sessions on network errors Add SessionNetwork module that detects network disconnects (ECONNRESET, ECONNREFUSED, ENOTFOUND, etc.) during LLM calls and pauses the session instead of silently retrying. - Introduce session.network namespace with ask/reply/reject lifecycle - Add 'offline' session status and server routes for network waits - Show NetworkPrompt in TUI; auto-reply in headless 'kilo run' mode - Reconnect remote MCP servers on resume via MCP.reconnectRemote() - Expand fromError to classify additional socket error codes - Regenerate SDK with new network endpoints --- .kilo/plans/network-reconnect.md | 342 +++ .../kilo-docs/pages/customize/agents-md.md | 2 +- .../src/components/shared/PopupSelector.tsx | 6 +- packages/opencode/src/cli/cmd/pr.ts | 3 +- packages/opencode/src/cli/cmd/run.ts | 10 +- .../opencode/src/cli/cmd/tui/context/sync.tsx | 51 + .../src/cli/cmd/tui/routes/session/index.tsx | 26 +- .../cli/cmd/tui/routes/session/network.tsx | 52 + packages/opencode/src/mcp/index.ts | 23 + .../opencode/src/server/routes/network.ts | 92 + packages/opencode/src/server/server.ts | 2 + packages/opencode/src/session/message-v2.ts | 26 + packages/opencode/src/session/network.ts | 182 ++ packages/opencode/src/session/processor.ts | 28 + packages/opencode/src/session/status.ts | 5 + packages/opencode/src/snapshot/index.ts | 9 +- packages/opencode/src/tool/warpgrep.ts | 11 +- .../opencode/test/session/network.test.ts | 51 + packages/opencode/test/session/retry.test.ts | 15 + packages/sdk/js/src/v2/gen/sdk.gen.ts | 106 + packages/sdk/js/src/v2/gen/types.gen.ts | 207 +- packages/sdk/openapi.json | 2375 ++++++----------- 22 files changed, 1953 insertions(+), 1671 deletions(-) create mode 100644 .kilo/plans/network-reconnect.md create mode 100644 packages/opencode/src/cli/cmd/tui/routes/session/network.tsx create mode 100644 packages/opencode/src/server/routes/network.ts create mode 100644 packages/opencode/src/session/network.ts create mode 100644 packages/opencode/test/session/network.test.ts diff --git a/.kilo/plans/network-reconnect.md b/.kilo/plans/network-reconnect.md new file mode 100644 index 00000000000..12c4d514438 --- /dev/null +++ b/.kilo/plans/network-reconnect.md @@ -0,0 +1,342 @@ +# Plan: Graceful Network Disconnect/Reconnect Handling + +## Branch: `feat/network-reconnect` + +## Prior Art + +No existing PRs address this feature. Searched open PRs for "network", "offline", "reconnect", and "connection" — none match. The closest is PR #6802 (SSE reconnect for permission prompts in the VS Code extension), which is a different concern (localhost SSE, not internet connectivity). + +## Current State + +The codebase has **zero network connectivity awareness**: + +- **Only `ECONNRESET` is handled as retryable** (`message-v2.ts:856`). Other network errors (`ETIMEDOUT`, `ENETUNREACH`, `ENOTFOUND`, `ECONNREFUSED`) fall through to `NamedError.Unknown` — **non-retryable** — causing the session loop to stop permanently with an error. +- **No connectivity monitoring** — no probes, no heartbeats, no online/offline state. +- **No "paused" session status** — `SessionStatus` only has `idle`, `busy`, and `retry`. +- **MCP remote servers stay failed** — no automatic reconnection when network returns. +- **The retry loop is blind** — exponential backoff with no awareness of whether the network is actually available. + +## Design + +### Architecture Overview + +``` ++-----------------------------------------------------+ +| Network Monitor | +| (reactive detection + active probing while offline) | +| | +| Bus Events: Network.Event.Online / .Offline | +| API: waitForOnline(abort): Promise | ++---------------+----------------------+---------------+ + | | + +-----------v-----------+ +-------v------------------+ + | Processor (retry) | | MCP Reconnection | + | | | (remote servers) | + | network error -> | | | + | status "network" -> | | online -> reconnect | + | waitForOnline() -> | | failed remote servers | + | NetworkResume.ask() | | | + +-----------+-----------+ +---------------------------+ + | + +-----------v-----------+ + | NetworkResume | + | (confirmation) | + | | + | Backend promise -> | + | Bus event (SSE) -> | + | TUI/client prompt -> | + | API endpoint reply | + +-----------+-----------+ + | + +-----------v-----------+ + | TUI Integration | + | | + | Bell + Toast on | + | reconnect. Inline | + | confirmation prompt | + +------------------------+ +``` + +### Network Detection Strategy + +**Hybrid reactive + active approach:** + +1. **Reactive detection**: When an LLM call fails with a network system error code (`ECONNRESET`, `ETIMEDOUT`, `ENETUNREACH`, `ENOTFOUND`, `ECONNREFUSED`), the network monitor is immediately flagged as offline. +2. **Active probing while offline**: Once flagged offline, periodic DNS lookups (`Bun.dns.resolve("dns.google")`) every 2 seconds detect when connectivity returns. +3. **No proactive polling when online**: Zero overhead when things are working — the monitor is dormant until triggered by an error. + +### User Confirmation Flow + +When the network comes back online while a session was interrupted: + +1. **Backend** (`processor.ts`): Detects network error -> sets session status to `{ type: "network" }` -> calls `Network.waitForOnline(abort)` (blocks until DNS probe succeeds) -> calls `NetworkResume.ask(sessionID, abort)` (blocks until user responds) +2. **Backend** (`NetworkResume`): Publishes `NetworkResume.Event.Asked` bus event -> SSE delivers to all clients +3. **TUI**: Receives event -> rings bell -> shows confirmation prompt "Network back online. Do you want to continue?" with [Continue] / [Cancel] options +4. **User responds**: TUI calls `POST /network-resume/:requestID` with `{ action: "continue" | "cancel" }` +5. **Backend**: Promise resolves -> processor either continues retry or breaks the loop + +### Mode-Specific Behavior + +| Mode | Behavior | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **TUI** (`kilo`) | Full prompt: bell + inline confirmation at bottom of session view | +| **`kilo run`** | Auto-resume (no user to ask; non-interactive mode) | +| **`kilo serve`** (VS Code) | Bus event published over SSE; client handles UI. Initial implementation: auto-resume with toast notification. VS Code extension can add its own confirmation UI later. | + +### Session Status Extension + +Add a new `"network"` status variant to `SessionStatus.Info`: + +```ts +z.object({ + type: z.literal("network"), + message: z.string(), // e.g., "Network disconnected" or "Waiting for confirmation" +}) +``` + +This allows the TUI to show a distinct status indicator (e.g., "Network offline -- waiting for reconnection...") instead of the generic retry countdown. + +--- + +## Commits + +### Commit 1: Add network monitor service + +**New file:** `packages/opencode/src/kilocode/network.ts` + +```ts +export namespace Network { + // Bus events + Event.Online // published when connectivity is restored + Event.Offline // published when connectivity is lost + + // State + isOnline(): boolean + + // Called reactively when a network error is detected + markOffline(): void + + // Blocks until network is back online. Uses periodic DNS probes. + // Respects abort signal for cancellation. + waitForOnline(abort: AbortSignal): Promise +} +``` + +Implementation details: + +- Uses `Instance.state()` for per-project singleton +- DNS probe: `Bun.dns.resolve("dns.google")` -- lightweight, no HTTP overhead +- Probe interval while offline: 2 seconds +- On successful probe: publish `Network.Event.Online`, stop probing +- On `markOffline()`: publish `Network.Event.Offline`, start probing +- Thread-safe: multiple callers to `waitForOnline()` share the same probe loop + +### Commit 2: Handle all network system errors as retryable + +**Modified file:** `packages/opencode/src/session/message-v2.ts` + +Extend the `fromError()` function (currently line 856) to recognize all network system error codes: + +```ts +// Current: only ECONNRESET +case (e as SystemError)?.code === "ECONNRESET": + +// New: all network-related system errors +case isNetworkSystemError(e): + return new MessageV2.APIError({ + message: networkErrorMessage(e), + isRetryable: true, + metadata: { + code: (e as SystemError).code ?? "", + syscall: (e as SystemError).syscall ?? "", + message: (e as SystemError).message ?? "", + isNetwork: true, // flag for the processor to detect + }, + }, { cause: e }).toObject() +``` + +Where `isNetworkSystemError()` checks for: `ECONNRESET`, `ETIMEDOUT`, `ENETUNREACH`, `ENOTFOUND`, `ECONNREFUSED`, `EHOSTUNREACH`, `ENETDOWN`, `EPIPE`, `EAI_AGAIN`. + +The `isNetwork: true` metadata flag allows the processor to distinguish network errors from other retryable API errors (like rate limits). + +### Commit 3: Add "network" session status + network-aware retry + +**Modified files:** + +- `packages/opencode/src/session/status.ts` -- Add `"network"` variant to `SessionStatus.Info` +- `packages/opencode/src/session/processor.ts` -- Network-aware retry logic +- `packages/opencode/src/session/retry.ts` -- Add `isNetworkError()` helper + +In `processor.ts`, the catch block (currently line 376) gains a new branch: + +```ts +} catch (e: any) { + const error = MessageV2.fromError(e, { providerID: input.model.providerID }) + + // ... existing context overflow handling ... + + // NEW: network error handling + if (isNetworkError(error)) { + Network.markOffline() + SessionStatus.set(input.sessionID, { + type: "network", + message: "Network disconnected" + }) + await Network.waitForOnline(input.abort) + const confirmed = await NetworkResume.ask(input.sessionID, input.abort) + if (confirmed) { + attempt = 0 // reset retry counter + continue + } + // User declined -- stop the session + input.assistantMessage.error = error + Bus.publish(Session.Event.Error, { ... }) + SessionStatus.set(input.sessionID, { type: "idle" }) + break + } + + // ... existing retry logic ... +} +``` + +The `isNetworkError()` helper in `retry.ts` checks for `MessageV2.APIError` with `metadata.isNetwork === true`. + +### Commit 4: Network resume confirmation mechanism + +**New file:** `packages/opencode/src/kilocode/network-resume.ts` + +Follows the same pattern as `Question` (`packages/opencode/src/question/index.ts`): + +```ts +export namespace NetworkResume { + // Bus events + Event.Asked // { id, sessionID, message } + Event.Replied // { id, sessionID, action: "continue" | "cancel" } + + // Creates a pending confirmation and returns a promise + // that resolves to true (continue) or false (cancel). + // In non-interactive contexts (kilo run), auto-resolves to true. + ask(sessionID: string, abort: AbortSignal): Promise + + // Called by the server when the user responds + reply(id: string, action: "continue" | "cancel"): void + + // List pending confirmations (for SSE reconnect recovery) + list(): PendingRequest[] +} +``` + +**New route file:** `packages/opencode/src/server/routes/network-resume.ts` + +Add endpoints: + +- `GET /network-resume` -- list pending network resume requests +- `POST /network-resume/:requestID` -- reply to a network resume request + +**Modified file:** `packages/opencode/src/server/server.ts` -- Register the new route + +**Auto-resume for non-interactive modes:** + +- Check if the session was created with `permission` rules that deny `question` (this is how `kilo run` configures sessions -- see `run.ts:381-396`) +- If so, auto-resolve to `true` after a short delay (e.g., 1 second) +- This avoids blocking headless/pipeline usage + +### Commit 5: TUI integration -- notification and confirmation UI + +**Modified files:** + +1. **`packages/opencode/src/cli/cmd/tui/context/sync.tsx`** + - Subscribe to `NetworkResume.Event.Asked` and `NetworkResume.Event.Replied` SSE events + - Store pending network resume requests in the sync store (similar to `store.question`) + - Subscribe to `Network.Event.Online` / `Network.Event.Offline` for toast notifications + +2. **`packages/opencode/src/cli/cmd/tui/routes/session/index.tsx`** + - Add network resume prompt rendering in the prompt area (priority: permission > question > network-resume > chat input) + - Ring bell when `NetworkResume.Event.Asked` fires + - Show toast "Network disconnected" on offline event + - Show toast "Network restored" on online event (in addition to the confirmation prompt) + +3. **New file: `packages/opencode/src/cli/cmd/tui/routes/session/network-resume.tsx`** + - Inline prompt component (similar to `QuestionPrompt`): + - Message: "Network back online. Do you want to continue?" + - Options: [Continue] [Cancel] + - Keyboard: Enter to confirm, Escape to cancel, left/right to toggle + - Calls `sdk.client` on user response + +4. **`packages/opencode/src/cli/cmd/tui/routes/session/index.tsx`** -- Status area + - When session status is `{ type: "network" }`, show "Network offline -- waiting..." in the status area + +### Commit 6: MCP server reconnection on network restore + +**Modified file:** `packages/opencode/src/mcp/index.ts` + +Subscribe to `Network.Event.Online` in the MCP module's `Instance.state()` initialization: + +- When online event fires, iterate all MCP servers +- For servers with `status === "failed"` that use remote transport (StreamableHTTP or SSE): + - Attempt reconnection with the original config + - Log success/failure + - Publish toast notification for each reconnected server + +This is non-blocking and runs in the background after the network comes back. + +### Commit 7: SDK regeneration + kilo run handling + +**Run:** `./script/generate.ts` to regenerate `packages/sdk/js/` + +The SSE endpoint already uses `Bus.subscribeAll()` (wildcard) so new bus events (`Network.Event.*`, `NetworkResume.Event.*`) will automatically be forwarded to SSE clients. However, we need to: + +- Add the new event types to the SDK's event type union so clients get proper typing +- Update `kilo run` in `packages/opencode/src/cli/cmd/run.ts` to handle `NetworkResume.Event.Asked` events (auto-approve when in `--auto` mode or reject the question permission) + +### Commit 8: Tests + +**New files:** + +- `packages/opencode/test/kilocode/network.test.ts` -- Network monitor unit tests + - Test DNS probe success/failure detection + - Test `waitForOnline()` resolves when probe succeeds + - Test abort signal cancels the wait + - Test bus events are published on transitions + +- `packages/opencode/test/kilocode/network-resume.test.ts` -- NetworkResume confirmation tests + - Test `ask()` creates pending request and resolves on `reply()` + - Test auto-resume for non-interactive sessions + - Test abort signal rejects the promise + - Test `list()` returns pending requests + +- Update existing retry tests if the new network error branch affects them + +--- + +## Open Questions / Tradeoffs + +### 1. DNS probe target + +Using `dns.google` (Google's public DNS) as the probe target. Alternatives: `1.1.1.1` (Cloudflare), `one.one.one.one`. Should we make this configurable, or is a hardcoded well-known target sufficient? + +**Recommendation:** Hardcode `dns.google` -- it's the most reliable public DNS. Can make configurable later if needed. + +### 2. Probe interval + +2-second probe interval while offline. Too aggressive? Too slow? + +**Recommendation:** 2 seconds is a good balance. DNS lookup is ~1-2ms when it succeeds. When offline, it fails fast (typically <100ms). Low overhead either way. + +### 3. VS Code extension handling + +The bus events will be available over SSE for the VS Code extension. Should we implement extension-side handling in this PR or leave it for a follow-up? + +**Recommendation:** Leave for follow-up. The extension communicates with a local `kilo serve` process, so the server-side handling (auto-resume or waiting for extension response) is sufficient initially. + +### 4. Tool execution failures + +When a tool like `websearch` or `webfetch` fails due to network issues, the LLM sees the error and decides what to do next. Should we intercept tool-level network failures too? + +**Recommendation:** Not in this PR. Tool failures are already surfaced to the LLM, which can retry or use alternatives. The network monitor's primary job is handling the LLM call -- the most critical network-dependent operation. + +### 5. Session persistence across restarts + +If the CLI is killed while in "network" status, should it remember and prompt on next launch? + +**Recommendation:** No. The session loop state is in-memory. If the process dies, the user restarts and re-sends their message. Consistent with how other interruptions work. diff --git a/packages/kilo-docs/pages/customize/agents-md.md b/packages/kilo-docs/pages/customize/agents-md.md index d451b5e7a7d..cd34077e7a0 100644 --- a/packages/kilo-docs/pages/customize/agents-md.md +++ b/packages/kilo-docs/pages/customize/agents-md.md @@ -18,7 +18,7 @@ If you'd like to migrate your memory bank content to AGENTS.md: 1. Examine the contents in `.kilocode/rules/memory-bank/` 2. Move that content into your project's `AGENTS.md` file (or ask Kilo to do it for you) -{% /callout %} + {% /callout %} ## What is AGENTS.md? diff --git a/packages/kilo-vscode/webview-ui/src/components/shared/PopupSelector.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/PopupSelector.tsx index a195f2fb0f7..863afa2e73b 100644 --- a/packages/kilo-vscode/webview-ui/src/components/shared/PopupSelector.tsx +++ b/packages/kilo-vscode/webview-ui/src/components/shared/PopupSelector.tsx @@ -22,10 +22,8 @@ import { import { Popover } from "@kilocode/kilo-ui/popover" import type { PopoverProps } from "@kilocode/kilo-ui/popover" -export interface PopupSelectorProps extends Omit< - PopoverProps, - "style" | "children" -> { +export interface PopupSelectorProps + extends Omit, "style" | "children"> { /** Whether the selector is in expanded mode (wider + taller). */ expanded: boolean /** Preferred width when collapsed. Default: 250 */ diff --git a/packages/opencode/src/cli/cmd/pr.ts b/packages/opencode/src/cli/cmd/pr.ts index 170c4671b68..6f1168c98c8 100644 --- a/packages/opencode/src/cli/cmd/pr.ts +++ b/packages/opencode/src/cli/cmd/pr.ts @@ -97,7 +97,8 @@ export const PrCommand = cmd({ // Launch opencode TUI with session ID if available const { spawn } = await import("child_process") const opencodeArgs = sessionId ? ["-s", sessionId] : [] - const opencodeProcess = spawn(bin, opencodeArgs, { // kilocode_change + const opencodeProcess = spawn(bin, opencodeArgs, { + // kilocode_change stdio: "inherit", cwd: process.cwd(), windowsHide: true, // kilocode_change - prevent CMD window flash on Windows diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts index 1cdd7a9e58d..52e666ef7da 100644 --- a/packages/opencode/src/cli/cmd/run.ts +++ b/packages/opencode/src/cli/cmd/run.ts @@ -317,7 +317,7 @@ export const RunCommand = cmd({ describe: "auto-approve all permissions (for autonomous/pipeline usage)", default: false, }) - // kilocode_change end + // kilocode_change end ) }, handler: async (args) => { @@ -601,6 +601,14 @@ export const RunCommand = cmd({ reply: "reject", }) } + + if (event.type === "session.network.asked") { + const request = event.properties + if (request.sessionID !== sessionID) continue + await sdk.network.reply({ + requestID: request.id, + }) + } } } diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx index 7d0d8f62ab5..99db682024f 100644 --- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx @@ -9,6 +9,7 @@ import type { Command, PermissionRequest, QuestionRequest, + SessionNetworkWait, LspStatus, McpStatus, McpResource, @@ -47,6 +48,9 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ question: { [sessionID: string]: QuestionRequest[] } + network: { + [sessionID: string]: SessionNetworkWait[] + } config: Config session: Session[] session_status: { @@ -87,6 +91,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ agent: [], permission: {}, question: {}, + network: {}, command: [], provider: [], provider_default: {}, @@ -194,6 +199,44 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ break } + case "session.network.replied": + case "session.network.rejected": { + const requests = store.network[event.properties.sessionID] + if (!requests) break + const match = Binary.search(requests, event.properties.requestID, (r) => r.id) + if (!match.found) break + setStore( + "network", + event.properties.sessionID, + produce((draft) => { + draft.splice(match.index, 1) + }), + ) + break + } + + case "session.network.asked": { + const request = event.properties + const requests = store.network[request.sessionID] + if (!requests) { + setStore("network", request.sessionID, [request]) + break + } + const match = Binary.search(requests, request.id, (r) => r.id) + if (match.found) { + setStore("network", request.sessionID, match.index, reconcile(request)) + break + } + setStore( + "network", + request.sessionID, + produce((draft) => { + draft.splice(match.index, 0, request) + }), + ) + break + } + case "todo.updated": setStore("todo", event.properties.sessionID, event.properties.todos) break @@ -416,6 +459,14 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ sdk.client.mcp.status().then((x) => setStore("mcp", reconcile(x.data!))), sdk.client.experimental.resource.list().then((x) => setStore("mcp_resource", reconcile(x.data ?? {}))), sdk.client.formatter.status().then((x) => setStore("formatter", reconcile(x.data!))), + sdk.client.network.list().then((x) => { + const next: Record = {} + for (const item of x.data ?? []) { + if (!next[item.sessionID]) next[item.sessionID] = [] + next[item.sessionID].push(item) + } + setStore("network", reconcile(next)) + }), sdk.client.session.status().then((x) => { setStore("session_status", reconcile(x.data!)) }), diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx index 289be84da67..6c7f179c02d 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx @@ -78,6 +78,7 @@ import { Filesystem } from "@/util/filesystem" import { Global } from "@/global" import { PermissionPrompt } from "./permission" import { QuestionPrompt } from "./question" +import { NetworkPrompt } from "./network" import { DialogExportOptions } from "../../ui/dialog-export-options" import { formatTranscript } from "../../util/transcript" import { UI } from "@/cli/ui.ts" @@ -141,6 +142,10 @@ export function Session() { if (session()?.parentID) return [] return children().flatMap((x) => sync.data.question[x.id] ?? []) }) + const network = createMemo(() => { + if (session()?.parentID) return [] + return children().flatMap((x) => sync.data.network[x.id] ?? []) + }) const pending = createMemo(() => { return messages().findLast((x) => x.role === "assistant" && !x.time.completed)?.id @@ -181,6 +186,15 @@ export function Session() { }, ), ) + createEffect( + on( + () => [route.sessionID, network().length] as const, + ([id, len], prev) => { + if (!prev || prev[0] !== id) return + if (len > prev[1] && bellEnabled()) bell() + }, + ), + ) // kilocode_change end const dimensions = useTerminalDimensions() @@ -1203,8 +1217,16 @@ export function Session() { 0}> + 0}> + + { prompt = r promptRef.set(r) @@ -1213,7 +1235,7 @@ export function Session() { r.set(route.initialPrompt) } }} - disabled={permissions().length > 0 || questions().length > 0} + disabled={permissions().length > 0 || questions().length > 0 || network().length > 0} onSubmit={() => { toBottom() }} diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx new file mode 100644 index 00000000000..a2f13781822 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx @@ -0,0 +1,52 @@ +/** @jsxImportSource @opentui/solid */ +import { useKeyboard } from "@opentui/solid" +import { useTheme } from "../../context/theme" +import { SplitBorder } from "../../component/border" +import { useSDK } from "../../context/sdk" +import { useDialog } from "../../ui/dialog" +import type { SessionNetworkWait } from "@kilocode/sdk/v2" +import { useKeybind } from "../../context/keybind" + +export function NetworkPrompt(props: { request: SessionNetworkWait }) { + const sdk = useSDK() + const { theme } = useTheme() + const keybind = useKeybind() + const dialog = useDialog() + + function reply() { + sdk.client.network.reply({ requestID: props.request.id }) + } + + function reject() { + sdk.client.network.reject({ requestID: props.request.id }) + } + + useKeyboard((evt) => { + if (dialog.stack.length > 0) return + if (evt.name === "return") { + evt.preventDefault() + reply() + return + } + if (evt.name === "escape" || keybind.match("app_exit", evt)) { + evt.preventDefault() + reject() + } + }) + + return ( + + + Network reconnect required + {props.request.message} + Reconnect the network-dependent service, then press Enter to resume. + Press Esc to stop this turn. + + + ) +} diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts index 9ffbce1a0ba..46cb595ee11 100644 --- a/packages/opencode/src/mcp/index.ts +++ b/packages/opencode/src/mcp/index.ts @@ -63,6 +63,29 @@ export namespace MCP { }), ) + export async function reconnectRemote() { + const cfg = await Config.get() + const list = Object.entries(cfg.mcp ?? {}) + const s = await state() + await Promise.all( + list.map(async ([key, mcp]) => { + if (!isMcpConfigured(mcp)) return + if (mcp.type !== "remote") return + const result = await create(key, mcp) + s.status[key] = result.status + if (result.mcpClient) { + const existing = s.clients[key] + if (existing) { + await existing.close().catch((error) => { + log.error("Failed to close existing MCP client", { name: key, error }) + }) + } + s.clients[key] = result.mcpClient + } + }), + ) + } + export const Failed = NamedError.create( "MCPFailed", z.object({ diff --git a/packages/opencode/src/server/routes/network.ts b/packages/opencode/src/server/routes/network.ts new file mode 100644 index 00000000000..e51b689c82f --- /dev/null +++ b/packages/opencode/src/server/routes/network.ts @@ -0,0 +1,92 @@ +import { Hono } from "hono" +import { describeRoute, resolver, validator } from "hono-openapi" +import z from "zod" +import { lazy } from "../../util/lazy" +import { errors } from "../error" +import { SessionNetwork } from "../../session/network" + +export const NetworkRoutes = lazy(() => + new Hono() + .get( + "/", + describeRoute({ + summary: "List pending network waits", + description: "Get all pending network reconnect requests across all sessions.", + operationId: "network.list", + responses: { + 200: { + description: "List of pending network reconnect requests", + content: { + "application/json": { + schema: resolver(SessionNetwork.Wait.array()), + }, + }, + }, + }, + }), + async (c) => { + const result = await SessionNetwork.list() + return c.json(result) + }, + ) + .post( + "/:requestID/reply", + describeRoute({ + summary: "Resume after network wait", + description: "Resume a pending session after reconnecting network-dependent services.", + operationId: "network.reply", + responses: { + 200: { + description: "Network wait resumed successfully", + content: { + "application/json": { + schema: resolver(z.boolean()), + }, + }, + }, + ...errors(400, 404), + }, + }), + validator( + "param", + z.object({ + requestID: z.string(), + }), + ), + async (c) => { + const params = c.req.valid("param") + await SessionNetwork.reply({ requestID: params.requestID }) + return c.json(true) + }, + ) + .post( + "/:requestID/reject", + describeRoute({ + summary: "Reject network resume request", + description: "Stop a pending session instead of resuming after network reconnect.", + operationId: "network.reject", + responses: { + 200: { + description: "Network wait rejected successfully", + content: { + "application/json": { + schema: resolver(z.boolean()), + }, + }, + }, + ...errors(400, 404), + }, + }), + validator( + "param", + z.object({ + requestID: z.string(), + }), + ), + async (c) => { + const params = c.req.valid("param") + await SessionNetwork.reject({ requestID: params.requestID }) + return c.json(true) + }, + ), +) diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts index b5b224e7400..daf651333a7 100644 --- a/packages/opencode/src/server/server.ts +++ b/packages/opencode/src/server/server.ts @@ -52,6 +52,7 @@ import { Filesystem } from "@/util/filesystem" import { QuestionRoutes } from "./routes/question" import { PermissionRoutes } from "./routes/permission" import { GlobalRoutes } from "./routes/global" +import { NetworkRoutes } from "./routes/network" import { MDNS } from "./mdns" // @ts-ignore This global is needed to prevent ai-sdk from logging warnings to stdout https://github.com/vercel/ai/blob/2dc67e0ef538307f21368db32d5a12345d98831b/packages/ai/src/logger/log-warnings.ts#L85 @@ -268,6 +269,7 @@ export namespace Server { .route("/session", SessionRoutes()) .route("/permission", PermissionRoutes()) .route("/question", QuestionRoutes()) + .route("/network", NetworkRoutes()) .route("/provider", ProviderRoutes()) .route("/telemetry", TelemetryRoutes()) // kilocode_change .route("/commit-message", CommitMessageRoutes()) // kilocode_change diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts index e468d1f2604..b518de036c5 100644 --- a/packages/opencode/src/session/message-v2.ts +++ b/packages/opencode/src/session/message-v2.ts @@ -853,6 +853,32 @@ export namespace MessageV2 { }, { cause: e }, ).toObject() + case ["ECONNRESET", "ECONNREFUSED", "ENOTFOUND", "EAI_AGAIN", "ETIMEDOUT", "ENETUNREACH"].includes( + ((e as SystemError)?.code ?? "") as string, + ): + return new MessageV2.APIError( + { + message: + (e as SystemError).code === "ECONNRESET" + ? "Connection reset by server" + : (e as SystemError).code === "ECONNREFUSED" + ? "Connection refused" + : (e as SystemError).code === "ENOTFOUND" + ? "Host not found" + : (e as SystemError).code === "EAI_AGAIN" + ? "DNS lookup failed" + : (e as SystemError).code === "ETIMEDOUT" + ? "Connection timed out" + : "Network is unreachable", + isRetryable: true, + metadata: { + code: (e as SystemError).code ?? "", + syscall: (e as SystemError).syscall ?? "", + message: (e as SystemError).message ?? "", + }, + }, + { cause: e }, + ).toObject() case (e as SystemError)?.code === "ECONNRESET": return new MessageV2.APIError( { diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts new file mode 100644 index 00000000000..a2c2c7e7e85 --- /dev/null +++ b/packages/opencode/src/session/network.ts @@ -0,0 +1,182 @@ +import { Bus } from "../bus" +import { BusEvent } from "../bus/bus-event" +import { Identifier } from "../id/id" +import { Config } from "../config/config" +import { Instance } from "../project/instance" +import { Log } from "../util/log" +import { fn } from "../util/fn" +import { MCP } from "../mcp" +import z from "zod" + +export namespace SessionNetwork { + const log = Log.create({ service: "session.network" }) + const codes = new Set(["ECONNRESET", "ECONNREFUSED", "ENOTFOUND", "EAI_AGAIN", "ETIMEDOUT", "ENETUNREACH"]) + + export const Wait = z + .object({ + id: Identifier.schema("question"), + sessionID: Identifier.schema("session"), + message: z.string(), + time: z.object({ + created: z.number(), + }), + }) + .meta({ + ref: "SessionNetworkWait", + }) + export type Wait = z.infer + + export const Event = { + Asked: BusEvent.define("session.network.asked", Wait), + Replied: BusEvent.define( + "session.network.replied", + z.object({ + sessionID: z.string(), + requestID: z.string(), + }), + ), + Rejected: BusEvent.define( + "session.network.rejected", + z.object({ + sessionID: z.string(), + requestID: z.string(), + }), + ), + } + + const state = Instance.state(async () => { + const pending: Record< + string, + { + info: Wait + resolve: () => void + reject: (e: unknown) => void + } + > = {} + return { pending } + }) + + export function code(err: unknown) { + const code = (err as { code?: unknown })?.code + return typeof code === "string" ? code : undefined + } + + export function disconnected(err: unknown) { + const match = code(err) + if (match && codes.has(match)) return true + const msg = err instanceof Error ? err.message : String(err) + if (msg.includes("fetch failed")) return true + if (msg.includes("network is unreachable")) return true + if (msg.includes("socket connection")) return true + return false + } + + export function message(err: unknown) { + const match = code(err) + if (match === "ECONNRESET") return "Connection reset by server" + if (match === "ECONNREFUSED") return "Connection refused" + if (match === "ENOTFOUND") return "Host not found" + if (match === "EAI_AGAIN") return "DNS lookup failed" + if (match === "ETIMEDOUT") return "Connection timed out" + if (match === "ENETUNREACH") return "Network is unreachable" + const msg = err instanceof Error ? err.message : String(err) + if (msg.includes("fetch failed")) return "Network request failed" + return "Network connection failed" + } + + export const shouldPrompt = fn( + z.object({ + err: z.unknown(), + }), + async (input) => { + if (!disconnected(input.err)) return false + const cfg = await Config.get() + const list = Object.values(cfg.mcp ?? {}) + return list.some((item) => item && typeof item === "object" && "type" in item && item.type === "remote") + }, + ) + + export async function ask(input: { sessionID: string; message: string; abort: AbortSignal }) { + const s = await state() + const id = Identifier.ascending("question") + const info: Wait = { + id, + sessionID: input.sessionID, + message: input.message, + time: { + created: Date.now(), + }, + } + + return new Promise((resolve, reject) => { + const onAbort = () => { + delete s.pending[id] + reject(new DOMException("Aborted", "AbortError")) + } + s.pending[id] = { + info, + resolve: () => { + input.abort.removeEventListener("abort", onAbort) + resolve() + }, + reject: (err) => { + input.abort.removeEventListener("abort", onAbort) + reject(err) + }, + } + input.abort.addEventListener("abort", onAbort, { once: true }) + Bus.publish(Event.Asked, info) + }) + } + + export const reply = fn( + z.object({ + requestID: z.string(), + }), + async (input) => { + const s = await state() + const req = s.pending[input.requestID] + if (!req) { + log.warn("reply for unknown request", { requestID: input.requestID }) + return + } + delete s.pending[input.requestID] + await MCP.reconnectRemote().catch(() => {}) + Bus.publish(Event.Replied, { + sessionID: req.info.sessionID, + requestID: req.info.id, + }) + req.resolve() + }, + ) + + export const reject = fn( + z.object({ + requestID: z.string(), + }), + async (input) => { + const s = await state() + const req = s.pending[input.requestID] + if (!req) { + log.warn("reject for unknown request", { requestID: input.requestID }) + return + } + delete s.pending[input.requestID] + Bus.publish(Event.Rejected, { + sessionID: req.info.sessionID, + requestID: req.info.id, + }) + req.reject(new RejectedError()) + }, + ) + + export async function list() { + return state().then((s) => Object.values(s.pending).map((item) => item.info)) + } + + export class RejectedError extends Error { + constructor() { + super("Network reconnect was rejected") + } + } +} diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts index 585facce3d4..0d91559e893 100644 --- a/packages/opencode/src/session/processor.ts +++ b/packages/opencode/src/session/processor.ts @@ -16,6 +16,7 @@ import { SessionCompaction } from "./compaction" import { PermissionNext } from "@/permission/next" import { Question } from "@/question" import { Telemetry } from "@kilocode/kilo-telemetry" // kilocode_change +import { SessionNetwork } from "./network" export namespace SessionProcessor { const DOOM_LOOP_THRESHOLD = 3 @@ -388,6 +389,33 @@ export namespace SessionProcessor { } else { const retry = SessionRetry.retryable(error) if (retry !== undefined) { + if (await SessionNetwork.shouldPrompt({ err: e })) { + const msg = SessionNetwork.message(e) + const wait = SessionNetwork.ask({ + sessionID: input.sessionID, + message: msg, + abort: input.abort, + }) + const list = await SessionNetwork.list() + const match = list.findLast((item) => item.sessionID === input.sessionID) + if (match) { + SessionStatus.set(input.sessionID, { + type: "offline", + requestID: match.id, + message: match.message, + }) + } + await wait.catch((err) => { + if (err instanceof SessionNetwork.RejectedError) blocked = true + }) + if (blocked) { + input.assistantMessage.error = error + } else { + attempt = 0 + SessionStatus.set(input.sessionID, { type: "retry", attempt: 1, message: retry, next: Date.now() }) + continue + } + } attempt++ const delay = SessionRetry.delay(attempt, error.name === "APIError" ? error : undefined) SessionStatus.set(input.sessionID, { diff --git a/packages/opencode/src/session/status.ts b/packages/opencode/src/session/status.ts index 1db03b5db0d..205b17086a9 100644 --- a/packages/opencode/src/session/status.ts +++ b/packages/opencode/src/session/status.ts @@ -18,6 +18,11 @@ export namespace SessionStatus { z.object({ type: z.literal("busy"), }), + z.object({ + type: z.literal("offline"), + requestID: z.string(), + message: z.string(), + }), ]) .meta({ ref: "SessionStatus", diff --git a/packages/opencode/src/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts index 9aade734eee..f9fcf338d29 100644 --- a/packages/opencode/src/snapshot/index.ts +++ b/packages/opencode/src/snapshot/index.ts @@ -34,10 +34,11 @@ export namespace Snapshot { .then(() => true) .catch(() => false) if (!exists) return - 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() - .cwd(Instance.directory) - .nothrow() + 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() + .cwd(Instance.directory) + .nothrow() if (result.exitCode !== 0) { log.warn("cleanup failed", { exitCode: result.exitCode, diff --git a/packages/opencode/src/tool/warpgrep.ts b/packages/opencode/src/tool/warpgrep.ts index 5e9bc43dcfb..145fbf77816 100644 --- a/packages/opencode/src/tool/warpgrep.ts +++ b/packages/opencode/src/tool/warpgrep.ts @@ -16,9 +16,7 @@ export const CodebaseSearchTool = Tool.define("codebase_search", { parameters: z.object({ query: z .string() - .describe( - "Search query describing what code you are looking for. Be specific and descriptive for best results.", - ), + .describe("Search query describing what code you are looking for. Be specific and descriptive for best results."), }), async execute(params, ctx) { await ctx.ask({ @@ -47,8 +45,7 @@ export const CodebaseSearchTool = Tool.define("codebase_search", { // FREE_PERIOD_TODO: When the proxy stops serving free requests, errors // from the proxy (401/402/429) will surface here. The message below // tells the user exactly what to do. - const isAuthOrRateLimit = - result.error && /401|402|429|rate.limit|free.period|unauthorized/i.test(result.error) + const isAuthOrRateLimit = result.error && /401|402|429|rate.limit|free.period|unauthorized/i.test(result.error) const apiKeyMsg = "Codebase search unavailable: free period ended. Set MORPH_API_KEY to continue. Get your key at https://www.morphllm.com/" if (isAuthOrRateLimit) { @@ -67,9 +64,7 @@ export const CodebaseSearchTool = Tool.define("codebase_search", { } const MAX_OUTPUT_CHARS = 45_000 - const fullOutput = result.contexts - .map((c) => `### ${c.file}\n\`\`\`\n${c.content}\n\`\`\``) - .join("\n\n") + const fullOutput = result.contexts.map((c) => `### ${c.file}\n\`\`\`\n${c.content}\n\`\`\``).join("\n\n") let output: string if (fullOutput.length > MAX_OUTPUT_CHARS) { diff --git a/packages/opencode/test/session/network.test.ts b/packages/opencode/test/session/network.test.ts new file mode 100644 index 00000000000..e37e77cbebd --- /dev/null +++ b/packages/opencode/test/session/network.test.ts @@ -0,0 +1,51 @@ +import { describe, expect, test } from "bun:test" +import { Instance } from "../../src/project/instance" +import { tmpdir } from "../fixture/fixture" +import { SessionNetwork } from "../../src/session/network" + +describe("session.network", () => { + test("detects common network disconnect codes", () => { + expect(SessionNetwork.disconnected({ code: "ECONNREFUSED" })).toBe(true) + expect(SessionNetwork.disconnected({ code: "ENOTFOUND" })).toBe(true) + expect(SessionNetwork.disconnected({ code: "EAI_AGAIN" })).toBe(true) + expect(SessionNetwork.disconnected({ code: "ENOENT" })).toBe(false) + }) + + test("reply resolves pending request", async () => { + await using tmp = await tmpdir({ git: true }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const ask = SessionNetwork.ask({ + sessionID: "ses_test", + message: "Connection refused", + abort: new AbortController().signal, + }) + const pending = await SessionNetwork.list() + expect(pending).toHaveLength(1) + const req = pending[0]! + await SessionNetwork.reply({ requestID: req.id }) + await expect(ask).resolves.toBeUndefined() + }, + }) + }) + + test("reject rejects pending request", async () => { + await using tmp = await tmpdir({ git: true }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const ask = SessionNetwork.ask({ + sessionID: "ses_test", + message: "Connection timed out", + abort: new AbortController().signal, + }) + const pending = await SessionNetwork.list() + expect(pending).toHaveLength(1) + const req = pending[0]! + await SessionNetwork.reject({ requestID: req.id }) + await expect(ask).rejects.toBeInstanceOf(SessionNetwork.RejectedError) + }, + }) + }) +}) diff --git a/packages/opencode/test/session/retry.test.ts b/packages/opencode/test/session/retry.test.ts index eba4a995053..b67f1fd00ee 100644 --- a/packages/opencode/test/session/retry.test.ts +++ b/packages/opencode/test/session/retry.test.ts @@ -173,6 +173,21 @@ describe("session.message-v2.fromError", () => { expect(retryable).toBe("Connection reset by server") }) + test("ECONNREFUSED socket error is retryable", () => { + const result = MessageV2.fromError( + { + code: "ECONNREFUSED", + syscall: "connect", + message: "connect ECONNREFUSED 127.0.0.1:3000", + }, + { providerID: "test" }, + ) as MessageV2.APIError + + expect(result.data.isRetryable).toBe(true) + expect(result.data.message).toBe("Connection refused") + expect(result.data.metadata?.code).toBe("ECONNREFUSED") + }) + test("marks OpenAI 404 status codes as retryable", () => { const error = new APICallError({ message: "boom", diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts index 513f3c0212e..f1f93d50da3 100644 --- a/packages/sdk/js/src/v2/gen/sdk.gen.ts +++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts @@ -86,6 +86,11 @@ import type { McpLocalConfig, McpRemoteConfig, McpStatusResponses, + NetworkListResponses, + NetworkRejectErrors, + NetworkRejectResponses, + NetworkReplyErrors, + NetworkReplyResponses, OutputFormat, Part as Part2, PartDeleteErrors, @@ -2672,6 +2677,102 @@ export class Question extends HeyApiClient { } } +export class Network extends HeyApiClient { + /** + * List pending network waits + * + * Get all pending network reconnect requests across all sessions. + */ + public list( + parameters?: { + directory?: string + workspace?: string + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + ], + }, + ], + ) + return (options?.client ?? this.client).get({ + url: "/network", + ...options, + ...params, + }) + } + + /** + * Resume after network wait + * + * Resume a pending session after reconnecting network-dependent services. + */ + public reply( + parameters: { + requestID: string + directory?: string + workspace?: string + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "path", key: "requestID" }, + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + ], + }, + ], + ) + return (options?.client ?? this.client).post({ + url: "/network/{requestID}/reply", + ...options, + ...params, + }) + } + + /** + * Reject network resume request + * + * Stop a pending session instead of resuming after network reconnect. + */ + public reject( + parameters: { + requestID: string + directory?: string + workspace?: string + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "path", key: "requestID" }, + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + ], + }, + ], + ) + return (options?.client ?? this.client).post({ + url: "/network/{requestID}/reject", + ...options, + ...params, + }) + } +} + export class Oauth extends HeyApiClient { /** * OAuth authorize @@ -4669,6 +4770,11 @@ export class KiloClient extends HeyApiClient { return (this._question ??= new Question({ client: this.client })) } + private _network?: Network + get network(): Network { + return (this._network ??= new Network({ client: this.client })) + } + private _provider?: Provider get provider(): Provider { return (this._provider ??= new Provider({ client: this.client })) diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index 1663ef784af..2bb54585b8d 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -604,6 +604,11 @@ export type SessionStatus = | { type: "busy" } + | { + type: "offline" + requestID: string + message: string + } export type EventSessionStatus = { type: "session.status" @@ -695,44 +700,6 @@ export type EventQuestionRejected = { } } -export type EventSessionCompacted = { - type: "session.compacted" - properties: { - sessionID: string - } -} - -export type EventFileWatcherUpdated = { - type: "file.watcher.updated" - properties: { - file: string - event: "add" | "change" | "unlink" - } -} - -export type Todo = { - /** - * Brief description of the task - */ - content: string - /** - * Current status of the task: pending, in_progress, completed, cancelled - */ - status: string - /** - * Priority level of the task: high, medium, low - */ - priority: string -} - -export type EventTodoUpdated = { - type: "todo.updated" - properties: { - sessionID: string - todos: Array - } -} - export type EventTuiPromptAppend = { type: "tui.prompt.append" properties: { @@ -802,6 +769,74 @@ export type EventMcpBrowserOpenFailed = { } } +export type SessionNetworkWait = { + id: string + sessionID: string + message: string + time: { + created: number + } +} + +export type EventSessionNetworkAsked = { + type: "session.network.asked" + properties: SessionNetworkWait +} + +export type EventSessionNetworkReplied = { + type: "session.network.replied" + properties: { + sessionID: string + requestID: string + } +} + +export type EventSessionNetworkRejected = { + type: "session.network.rejected" + properties: { + sessionID: string + requestID: string + } +} + +export type EventSessionCompacted = { + type: "session.compacted" + properties: { + sessionID: string + } +} + +export type EventFileWatcherUpdated = { + type: "file.watcher.updated" + properties: { + file: string + event: "add" | "change" | "unlink" + } +} + +export type Todo = { + /** + * Brief description of the task + */ + content: string + /** + * Current status of the task: pending, in_progress, completed, cancelled + */ + status: string + /** + * Priority level of the task: high, medium, low + */ + priority: string +} + +export type EventTodoUpdated = { + type: "todo.updated" + properties: { + sessionID: string + todos: Array + } +} + export type EventCommandExecuted = { type: "command.executed" properties: { @@ -1012,15 +1047,18 @@ export type Event = | EventQuestionAsked | EventQuestionReplied | EventQuestionRejected - | EventSessionCompacted - | EventFileWatcherUpdated - | EventTodoUpdated | EventTuiPromptAppend | EventTuiCommandExecute | EventTuiToastShow | EventTuiSessionSelect | EventMcpToolsChanged | EventMcpBrowserOpenFailed + | EventSessionNetworkAsked + | EventSessionNetworkReplied + | EventSessionNetworkRejected + | EventSessionCompacted + | EventFileWatcherUpdated + | EventTodoUpdated | EventCommandExecuted | EventSessionCreated | EventSessionUpdated @@ -4129,6 +4167,93 @@ export type QuestionRejectResponses = { export type QuestionRejectResponse = QuestionRejectResponses[keyof QuestionRejectResponses] +export type NetworkListData = { + body?: never + path?: never + query?: { + directory?: string + workspace?: string + } + url: "/network" +} + +export type NetworkListResponses = { + /** + * List of pending network reconnect requests + */ + 200: Array +} + +export type NetworkListResponse = NetworkListResponses[keyof NetworkListResponses] + +export type NetworkReplyData = { + body?: never + path: { + requestID: string + } + query?: { + directory?: string + workspace?: string + } + url: "/network/{requestID}/reply" +} + +export type NetworkReplyErrors = { + /** + * Bad request + */ + 400: BadRequestError + /** + * Not found + */ + 404: NotFoundError +} + +export type NetworkReplyError = NetworkReplyErrors[keyof NetworkReplyErrors] + +export type NetworkReplyResponses = { + /** + * Network wait resumed successfully + */ + 200: boolean +} + +export type NetworkReplyResponse = NetworkReplyResponses[keyof NetworkReplyResponses] + +export type NetworkRejectData = { + body?: never + path: { + requestID: string + } + query?: { + directory?: string + workspace?: string + } + url: "/network/{requestID}/reject" +} + +export type NetworkRejectErrors = { + /** + * Bad request + */ + 400: BadRequestError + /** + * Not found + */ + 404: NotFoundError +} + +export type NetworkRejectError = NetworkRejectErrors[keyof NetworkRejectErrors] + +export type NetworkRejectResponses = { + /** + * Network wait rejected successfully + */ + 200: boolean +} + +export type NetworkRejectResponse = NetworkRejectResponses[keyof NetworkRejectResponses] + export type ProviderListData = { body?: never path?: never diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json index 4b8e95c4c5b..559aad3b286 100644 --- a/packages/sdk/openapi.json +++ b/packages/sdk/openapi.json @@ -27,10 +27,7 @@ "type": "string" } }, - "required": [ - "healthy", - "version" - ] + "required": ["healthy", "version"] } } } @@ -745,10 +742,7 @@ "type": "number" } }, - "required": [ - "rows", - "cols" - ] + "required": ["rows", "cols"] } } } @@ -1023,10 +1017,7 @@ } } }, - "required": [ - "providers", - "default" - ] + "required": ["providers", "default"] } } } @@ -1233,11 +1224,7 @@ ] } }, - "required": [ - "type", - "branch", - "extra" - ] + "required": ["type", "branch", "extra"] } } } @@ -2148,9 +2135,7 @@ ], "summary": "Get session", "description": "Retrieve detailed information about a specific Kilo session.", - "tags": [ - "Session" - ], + "tags": ["Session"], "responses": { "200": { "description": "Get session", @@ -2377,9 +2362,7 @@ } ], "summary": "Get session children", - "tags": [ - "Session" - ], + "tags": ["Session"], "description": "Retrieve all child sessions that were forked from the specified parent session.", "responses": { "200": { @@ -2576,11 +2559,7 @@ "pattern": "^msg.*" } }, - "required": [ - "modelID", - "providerID", - "messageID" - ] + "required": ["modelID", "providerID", "messageID"] } } } @@ -3004,10 +2983,7 @@ "type": "boolean" } }, - "required": [ - "providerID", - "modelID" - ] + "required": ["providerID", "modelID"] } } } @@ -3077,10 +3053,7 @@ } } }, - "required": [ - "info", - "parts" - ] + "required": ["info", "parts"] } } } @@ -3161,10 +3134,7 @@ } } }, - "required": [ - "info", - "parts" - ] + "required": ["info", "parts"] } } } @@ -3210,10 +3180,7 @@ "type": "string" } }, - "required": [ - "providerID", - "modelID" - ] + "required": ["providerID", "modelID"] }, "agent": { "type": "string" @@ -3283,9 +3250,7 @@ } } }, - "required": [ - "parts" - ] + "required": ["parts"] } } } @@ -3355,10 +3320,7 @@ } } }, - "required": [ - "info", - "parts" - ] + "required": ["info", "parts"] } } } @@ -3725,10 +3687,7 @@ "type": "string" } }, - "required": [ - "providerID", - "modelID" - ] + "required": ["providerID", "modelID"] }, "agent": { "type": "string" @@ -3798,9 +3757,7 @@ } } }, - "required": [ - "parts" - ] + "required": ["parts"] } } } @@ -3861,10 +3818,7 @@ } } }, - "required": [ - "info", - "parts" - ] + "required": ["info", "parts"] } } } @@ -3942,20 +3896,13 @@ "$ref": "#/components/schemas/FilePartSource" } }, - "required": [ - "type", - "mime", - "url" - ] + "required": ["type", "mime", "url"] } ] } } }, - "required": [ - "arguments", - "command" - ] + "required": ["arguments", "command"] } } } @@ -4049,19 +3996,13 @@ "type": "string" } }, - "required": [ - "providerID", - "modelID" - ] + "required": ["providerID", "modelID"] }, "command": { "type": "string" } }, - "required": [ - "agent", - "command" - ] + "required": ["agent", "command"] } } } @@ -4150,9 +4091,7 @@ "pattern": "^prt.*" } }, - "required": [ - "messageID" - ] + "required": ["messageID"] } } } @@ -4312,16 +4251,10 @@ "properties": { "response": { "type": "string", - "enum": [ - "once", - "always", - "reject" - ] + "enum": ["once", "always", "reject"] } }, - "required": [ - "response" - ] + "required": ["response"] } } } @@ -4403,19 +4336,13 @@ "properties": { "reply": { "type": "string", - "enum": [ - "once", - "always", - "reject" - ] + "enum": ["once", "always", "reject"] }, "message": { "type": "string" } }, - "required": [ - "reply" - ] + "required": ["reply"] } } } @@ -4683,9 +4610,7 @@ } } }, - "required": [ - "answers" - ] + "required": ["answers"] } } } @@ -4767,6 +4692,188 @@ ] } }, + "/network": { + "get": { + "operationId": "network.list", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + } + ], + "summary": "List pending network waits", + "description": "Get all pending network reconnect requests across all sessions.", + "responses": { + "200": { + "description": "List of pending network reconnect requests", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SessionNetworkWait" + } + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.network.list({\n ...\n})" + } + ] + } + }, + "/network/{requestID}/reply": { + "post": { + "operationId": "network.reply", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + }, + { + "in": "path", + "name": "requestID", + "schema": { + "type": "string" + }, + "required": true + } + ], + "summary": "Resume after network wait", + "description": "Resume a pending session after reconnecting network-dependent services.", + "responses": { + "200": { + "description": "Network wait resumed successfully", + "content": { + "application/json": { + "schema": { + "type": "boolean" + } + } + } + }, + "400": { + "description": "Bad request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/BadRequestError" + } + } + } + }, + "404": { + "description": "Not found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundError" + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.network.reply({\n ...\n})" + } + ] + } + }, + "/network/{requestID}/reject": { + "post": { + "operationId": "network.reject", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + }, + { + "in": "path", + "name": "requestID", + "schema": { + "type": "string" + }, + "required": true + } + ], + "summary": "Reject network resume request", + "description": "Stop a pending session instead of resuming after network reconnect.", + "responses": { + "200": { + "description": "Network wait rejected successfully", + "content": { + "application/json": { + "schema": { + "type": "boolean" + } + } + } + }, + "400": { + "description": "Bad request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/BadRequestError" + } + } + } + }, + "404": { + "description": "Not found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundError" + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.network.reject({\n ...\n})" + } + ] + } + }, "/provider": { "get": { "operationId": "provider.list", @@ -4862,15 +4969,10 @@ "properties": { "field": { "type": "string", - "enum": [ - "reasoning_content", - "reasoning_details" - ] + "enum": ["reasoning_content", "reasoning_details"] } }, - "required": [ - "field" - ], + "required": ["field"], "additionalProperties": false } ] @@ -4906,16 +5008,10 @@ "type": "number" } }, - "required": [ - "input", - "output" - ] + "required": ["input", "output"] } }, - "required": [ - "input", - "output" - ] + "required": ["input", "output"] }, "limit": { "type": "object", @@ -4930,10 +5026,7 @@ "type": "number" } }, - "required": [ - "context", - "output" - ] + "required": ["context", "output"] }, "modalities": { "type": "object", @@ -4942,61 +5035,39 @@ "type": "array", "items": { "type": "string", - "enum": [ - "text", - "audio", - "image", - "video", - "pdf" - ] + "enum": ["text", "audio", "image", "video", "pdf"] } }, "output": { "type": "array", "items": { "type": "string", - "enum": [ - "text", - "audio", - "image", - "video", - "pdf" - ] + "enum": ["text", "audio", "image", "video", "pdf"] } } }, - "required": [ - "input", - "output" - ] + "required": ["input", "output"] }, "recommendedIndex": { "type": "number" }, "prompt": { "type": "string", - "enum": [ - "codex", - "gemini", - "beast", - "anthropic", - "trinity", - "anthropic_without_todo" - ] + "enum": ["codex", "gemini", "beast", "anthropic", "trinity", "anthropic_without_todo"] }, "isFree": { "type": "boolean" }, + "ai_sdk_provider": { + "type": "string", + "enum": ["anthropic", "openai", "openai-compatible", "openrouter"] + }, "experimental": { "type": "boolean" }, "status": { "type": "string", - "enum": [ - "alpha", - "beta", - "deprecated" - ] + "enum": ["alpha", "beta", "deprecated"] }, "options": { "type": "object", @@ -5053,12 +5124,7 @@ } } }, - "required": [ - "name", - "env", - "id", - "models" - ] + "required": ["name", "env", "id", "models"] } }, "default": { @@ -5077,11 +5143,7 @@ } } }, - "required": [ - "all", - "default", - "connected" - ] + "required": ["all", "default", "connected"] } } } @@ -5208,9 +5270,7 @@ "type": "number" } }, - "required": [ - "method" - ] + "required": ["method"] } } } @@ -5290,9 +5350,7 @@ "type": "string" } }, - "required": [ - "method" - ] + "required": ["method"] } } } @@ -5367,9 +5425,7 @@ "additionalProperties": {} } }, - "required": [ - "event" - ] + "required": ["event"] } } } @@ -5415,9 +5471,7 @@ "type": "string" } }, - "required": [ - "message" - ] + "required": ["message"] } } } @@ -5455,9 +5509,7 @@ "type": "string" } }, - "required": [ - "path" - ] + "required": ["path"] } } } @@ -5503,9 +5555,7 @@ "type": "string" } }, - "required": [ - "text" - ] + "required": ["text"] } } } @@ -5533,9 +5583,7 @@ "minLength": 1 } }, - "required": [ - "text" - ] + "required": ["text"] } } } @@ -5601,9 +5649,7 @@ "type": "string" } }, - "required": [ - "location" - ] + "required": ["location"] } } } @@ -5669,9 +5715,7 @@ "type": "string" } }, - "required": [ - "name" - ] + "required": ["name"] } } } @@ -5737,17 +5781,11 @@ "type": "string" } }, - "required": [ - "id", - "name", - "role" - ] + "required": ["id", "name", "role"] } } }, - "required": [ - "email" - ] + "required": ["email"] }, "balance": { "anyOf": [ @@ -5758,9 +5796,7 @@ "type": "number" } }, - "required": [ - "balance" - ] + "required": ["balance"] }, { "type": "null" @@ -5778,11 +5814,7 @@ ] } }, - "required": [ - "profile", - "balance", - "currentOrgId" - ] + "required": ["profile", "balance", "currentOrgId"] } } } @@ -5866,9 +5898,7 @@ ] } }, - "required": [ - "organizationId" - ] + "required": ["organizationId"] } } } @@ -5953,7 +5983,32 @@ }, "groups": { "type": "array", - "items": {} + "items": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "array", + "prefixItems": [ + { + "type": "string" + }, + { + "type": "object", + "properties": { + "fileRegex": { + "type": "string" + }, + "description": { + "type": "string" + } + } + } + ] + } + ] + } } } } @@ -5971,9 +6026,7 @@ } } }, - "required": [ - "modes" - ] + "required": ["modes"] } } } @@ -6084,10 +6137,7 @@ "type": "number" } }, - "required": [ - "prefix", - "suffix" - ] + "required": ["prefix", "suffix"] } } } @@ -6150,10 +6200,7 @@ "type": "string" } }, - "required": [ - "actionText", - "actionURL" - ] + "required": ["actionText", "actionURL"] }, "showIn": { "type": "array", @@ -6165,11 +6212,7 @@ "type": "string" } }, - "required": [ - "id", - "title", - "message" - ] + "required": ["id", "title", "message"] } } } @@ -6312,9 +6355,7 @@ "type": "string" } }, - "required": [ - "sessionId" - ] + "required": ["sessionId"] } } } @@ -6405,13 +6446,7 @@ "type": "number" } }, - "required": [ - "session_id", - "title", - "created_at", - "updated_at", - "version" - ] + "required": ["session_id", "title", "created_at", "updated_at", "version"] } }, "nextCursor": { @@ -6425,10 +6460,7 @@ ] } }, - "required": [ - "cliSessions", - "nextCursor" - ] + "required": ["cliSessions", "nextCursor"] } } } @@ -6498,9 +6530,7 @@ "type": "string" } }, - "required": [ - "text" - ] + "required": ["text"] }, "lines": { "type": "object", @@ -6509,9 +6539,7 @@ "type": "string" } }, - "required": [ - "text" - ] + "required": ["text"] }, "line_number": { "type": "number" @@ -6531,9 +6559,7 @@ "type": "string" } }, - "required": [ - "text" - ] + "required": ["text"] }, "start": { "type": "number" @@ -6542,21 +6568,11 @@ "type": "number" } }, - "required": [ - "match", - "start", - "end" - ] + "required": ["match", "start", "end"] } } }, - "required": [ - "path", - "lines", - "line_number", - "absolute_offset", - "submatches" - ] + "required": ["path", "lines", "line_number", "absolute_offset", "submatches"] } } } @@ -6602,10 +6618,7 @@ "name": "dirs", "schema": { "type": "string", - "enum": [ - "true", - "false" - ] + "enum": ["true", "false"] } }, { @@ -6613,10 +6626,7 @@ "name": "type", "schema": { "type": "string", - "enum": [ - "file", - "directory" - ] + "enum": ["file", "directory"] } }, { @@ -6965,10 +6975,7 @@ ] } }, - "required": [ - "name", - "config" - ] + "required": ["name", "config"] } } } @@ -7023,9 +7030,7 @@ "type": "string" } }, - "required": [ - "authorizationUrl" - ] + "required": ["authorizationUrl"] } } } @@ -7099,9 +7104,7 @@ "const": true } }, - "required": [ - "success" - ] + "required": ["success"] } } } @@ -7197,9 +7200,7 @@ "type": "string" } }, - "required": [ - "code" - ] + "required": ["code"] } } } @@ -7430,9 +7431,7 @@ "type": "string" } }, - "required": [ - "text" - ] + "required": ["text"] } } } @@ -7744,9 +7743,7 @@ "type": "string" } }, - "required": [ - "command" - ] + "required": ["command"] } } } @@ -7806,12 +7803,7 @@ }, "variant": { "type": "string", - "enum": [ - "info", - "success", - "warning", - "error" - ] + "enum": ["info", "success", "warning", "error"] }, "duration": { "description": "Duration in milliseconds", @@ -7819,10 +7811,7 @@ "type": "number" } }, - "required": [ - "message", - "variant" - ] + "required": ["message", "variant"] } } } @@ -7973,9 +7962,7 @@ "pattern": "^ses" } }, - "required": [ - "sessionID" - ] + "required": ["sessionID"] } } } @@ -8022,10 +8009,7 @@ }, "body": {} }, - "required": [ - "path", - "body" - ] + "required": ["path", "body"] } } } @@ -8310,12 +8294,7 @@ "level": { "description": "Log level", "type": "string", - "enum": [ - "debug", - "info", - "error", - "warn" - ] + "enum": ["debug", "info", "error", "warn"] }, "message": { "description": "Log message", @@ -8330,11 +8309,7 @@ "additionalProperties": {} } }, - "required": [ - "service", - "level", - "message" - ] + "required": ["service", "level", "message"] } } } @@ -8435,12 +8410,7 @@ "type": "string" } }, - "required": [ - "name", - "description", - "location", - "content" - ] + "required": ["name", "description", "location", "content"] } } } @@ -8601,15 +8571,10 @@ "type": "string" } }, - "required": [ - "version" - ] + "required": ["version"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.installation.update-available": { "type": "object", @@ -8625,15 +8590,10 @@ "type": "string" } }, - "required": [ - "version" - ] + "required": ["version"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Project": { "type": "object", @@ -8687,10 +8647,7 @@ "type": "number" } }, - "required": [ - "created", - "updated" - ] + "required": ["created", "updated"] }, "sandboxes": { "type": "array", @@ -8699,12 +8656,7 @@ } } }, - "required": [ - "id", - "worktree", - "time", - "sandboxes" - ] + "required": ["id", "worktree", "time", "sandboxes"] }, "Event.project.updated": { "type": "object", @@ -8717,10 +8669,7 @@ "$ref": "#/components/schemas/Project" } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.server.instance.disposed": { "type": "object", @@ -8736,15 +8685,10 @@ "type": "string" } }, - "required": [ - "directory" - ] + "required": ["directory"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.server.connected": { "type": "object", @@ -8758,10 +8702,7 @@ "properties": {} } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.global.disposed": { "type": "object", @@ -8775,10 +8716,7 @@ "properties": {} } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.global.config.updated": { "type": "object", @@ -8792,10 +8730,7 @@ "properties": {} } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.lsp.client.diagnostics": { "type": "object", @@ -8814,16 +8749,10 @@ "type": "string" } }, - "required": [ - "serverID", - "path" - ] + "required": ["serverID", "path"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.lsp.updated": { "type": "object", @@ -8837,10 +8766,7 @@ "properties": {} } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.file.edited": { "type": "object", @@ -8856,15 +8782,10 @@ "type": "string" } }, - "required": [ - "file" - ] + "required": ["file"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "OutputFormatText": { "type": "object", @@ -8874,9 +8795,7 @@ "const": "text" } }, - "required": [ - "type" - ] + "required": ["type"] }, "JSONSchema": { "type": "object", @@ -8902,10 +8821,7 @@ "maximum": 9007199254740991 } }, - "required": [ - "type", - "schema" - ] + "required": ["type", "schema"] }, "OutputFormat": { "anyOf": [ @@ -8937,20 +8853,10 @@ }, "status": { "type": "string", - "enum": [ - "added", - "deleted", - "modified" - ] + "enum": ["added", "deleted", "modified"] } }, - "required": [ - "file", - "before", - "after", - "additions", - "deletions" - ] + "required": ["file", "before", "after", "additions", "deletions"] }, "UserMessage": { "type": "object", @@ -8972,9 +8878,7 @@ "type": "number" } }, - "required": [ - "created" - ] + "required": ["created"] }, "format": { "$ref": "#/components/schemas/OutputFormat" @@ -8995,9 +8899,7 @@ } } }, - "required": [ - "diffs" - ] + "required": ["diffs"] }, "agent": { "type": "string" @@ -9012,10 +8914,7 @@ "type": "string" } }, - "required": [ - "providerID", - "modelID" - ] + "required": ["providerID", "modelID"] }, "system": { "type": "string" @@ -9056,14 +8955,7 @@ } } }, - "required": [ - "id", - "sessionID", - "role", - "time", - "agent", - "model" - ] + "required": ["id", "sessionID", "role", "time", "agent", "model"] }, "ProviderAuthError": { "type": "object", @@ -9082,16 +8974,10 @@ "type": "string" } }, - "required": [ - "providerID", - "message" - ] + "required": ["providerID", "message"] } }, - "required": [ - "name", - "data" - ] + "required": ["name", "data"] }, "UnknownError": { "type": "object", @@ -9107,15 +8993,10 @@ "type": "string" } }, - "required": [ - "message" - ] + "required": ["message"] } }, - "required": [ - "name", - "data" - ] + "required": ["name", "data"] }, "MessageOutputLengthError": { "type": "object", @@ -9129,10 +9010,7 @@ "properties": {} } }, - "required": [ - "name", - "data" - ] + "required": ["name", "data"] }, "MessageAbortedError": { "type": "object", @@ -9148,15 +9026,10 @@ "type": "string" } }, - "required": [ - "message" - ] + "required": ["message"] } }, - "required": [ - "name", - "data" - ] + "required": ["name", "data"] }, "StructuredOutputError": { "type": "object", @@ -9175,16 +9048,10 @@ "type": "number" } }, - "required": [ - "message", - "retries" - ] + "required": ["message", "retries"] } }, - "required": [ - "name", - "data" - ] + "required": ["name", "data"] }, "ContextOverflowError": { "type": "object", @@ -9203,15 +9070,10 @@ "type": "string" } }, - "required": [ - "message" - ] + "required": ["message"] } }, - "required": [ - "name", - "data" - ] + "required": ["name", "data"] }, "APIError": { "type": "object", @@ -9254,16 +9116,10 @@ } } }, - "required": [ - "message", - "isRetryable" - ] + "required": ["message", "isRetryable"] } }, - "required": [ - "name", - "data" - ] + "required": ["name", "data"] }, "AssistantMessage": { "type": "object", @@ -9288,9 +9144,7 @@ "type": "number" } }, - "required": [ - "created" - ] + "required": ["created"] }, "error": { "anyOf": [ @@ -9342,10 +9196,7 @@ "type": "string" } }, - "required": [ - "cwd", - "root" - ] + "required": ["cwd", "root"] }, "summary": { "type": "boolean" @@ -9378,18 +9229,10 @@ "type": "number" } }, - "required": [ - "read", - "write" - ] + "required": ["read", "write"] } }, - "required": [ - "input", - "output", - "reasoning", - "cache" - ] + "required": ["input", "output", "reasoning", "cache"] }, "structured": {}, "variant": { @@ -9438,15 +9281,10 @@ "$ref": "#/components/schemas/Message" } }, - "required": [ - "info" - ] + "required": ["info"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.message.removed": { "type": "object", @@ -9465,16 +9303,10 @@ "type": "string" } }, - "required": [ - "sessionID", - "messageID" - ] + "required": ["sessionID", "messageID"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "TextPart": { "type": "object", @@ -9511,9 +9343,7 @@ "type": "number" } }, - "required": [ - "start" - ] + "required": ["start"] }, "metadata": { "type": "object", @@ -9523,13 +9353,7 @@ "additionalProperties": {} } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "text" - ] + "required": ["id", "sessionID", "messageID", "type", "text"] }, "SubtaskPart": { "type": "object", @@ -9566,24 +9390,13 @@ "type": "string" } }, - "required": [ - "providerID", - "modelID" - ] + "required": ["providerID", "modelID"] }, "command": { "type": "string" } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "prompt", - "description", - "agent" - ] + "required": ["id", "sessionID", "messageID", "type", "prompt", "description", "agent"] }, "ReasoningPart": { "type": "object", @@ -9621,19 +9434,10 @@ "type": "number" } }, - "required": [ - "start" - ] + "required": ["start"] } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "text", - "time" - ] + "required": ["id", "sessionID", "messageID", "type", "text", "time"] }, "FilePartSourceText": { "type": "object", @@ -9652,11 +9456,7 @@ "maximum": 9007199254740991 } }, - "required": [ - "value", - "start", - "end" - ] + "required": ["value", "start", "end"] }, "FileSource": { "type": "object", @@ -9672,11 +9472,7 @@ "type": "string" } }, - "required": [ - "text", - "type", - "path" - ] + "required": ["text", "type", "path"] }, "Range": { "type": "object", @@ -9691,10 +9487,7 @@ "type": "number" } }, - "required": [ - "line", - "character" - ] + "required": ["line", "character"] }, "end": { "type": "object", @@ -9706,16 +9499,10 @@ "type": "number" } }, - "required": [ - "line", - "character" - ] + "required": ["line", "character"] } }, - "required": [ - "start", - "end" - ] + "required": ["start", "end"] }, "SymbolSource": { "type": "object", @@ -9742,14 +9529,7 @@ "maximum": 9007199254740991 } }, - "required": [ - "text", - "type", - "path", - "range", - "name", - "kind" - ] + "required": ["text", "type", "path", "range", "name", "kind"] }, "ResourceSource": { "type": "object", @@ -9768,12 +9548,7 @@ "type": "string" } }, - "required": [ - "text", - "type", - "clientName", - "uri" - ] + "required": ["text", "type", "clientName", "uri"] }, "FilePartSource": { "anyOf": [ @@ -9817,14 +9592,7 @@ "$ref": "#/components/schemas/FilePartSource" } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "mime", - "url" - ] + "required": ["id", "sessionID", "messageID", "type", "mime", "url"] }, "ToolStatePending": { "type": "object", @@ -9844,11 +9612,7 @@ "type": "string" } }, - "required": [ - "status", - "input", - "raw" - ] + "required": ["status", "input", "raw"] }, "ToolStateRunning": { "type": "object", @@ -9881,16 +9645,10 @@ "type": "number" } }, - "required": [ - "start" - ] + "required": ["start"] } }, - "required": [ - "status", - "input", - "time" - ] + "required": ["status", "input", "time"] }, "ToolStateCompleted": { "type": "object", @@ -9932,10 +9690,7 @@ "type": "number" } }, - "required": [ - "start", - "end" - ] + "required": ["start", "end"] }, "attachments": { "type": "array", @@ -9944,14 +9699,7 @@ } } }, - "required": [ - "status", - "input", - "output", - "title", - "metadata", - "time" - ] + "required": ["status", "input", "output", "title", "metadata", "time"] }, "ToolStateError": { "type": "object", @@ -9987,18 +9735,10 @@ "type": "number" } }, - "required": [ - "start", - "end" - ] + "required": ["start", "end"] } }, - "required": [ - "status", - "input", - "error", - "time" - ] + "required": ["status", "input", "error", "time"] }, "ToolState": { "anyOf": [ @@ -10049,15 +9789,7 @@ "additionalProperties": {} } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "callID", - "tool", - "state" - ] + "required": ["id", "sessionID", "messageID", "type", "callID", "tool", "state"] }, "StepStartPart": { "type": "object", @@ -10079,12 +9811,7 @@ "type": "string" } }, - "required": [ - "id", - "sessionID", - "messageID", - "type" - ] + "required": ["id", "sessionID", "messageID", "type"] }, "StepFinishPart": { "type": "object", @@ -10136,29 +9863,13 @@ "type": "number" } }, - "required": [ - "read", - "write" - ] + "required": ["read", "write"] } }, - "required": [ - "input", - "output", - "reasoning", - "cache" - ] + "required": ["input", "output", "reasoning", "cache"] } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "reason", - "cost", - "tokens" - ] + "required": ["id", "sessionID", "messageID", "type", "reason", "cost", "tokens"] }, "SnapshotPart": { "type": "object", @@ -10180,13 +9891,7 @@ "type": "string" } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "snapshot" - ] + "required": ["id", "sessionID", "messageID", "type", "snapshot"] }, "PatchPart": { "type": "object", @@ -10214,14 +9919,7 @@ } } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "hash", - "files" - ] + "required": ["id", "sessionID", "messageID", "type", "hash", "files"] }, "AgentPart": { "type": "object", @@ -10259,20 +9957,10 @@ "maximum": 9007199254740991 } }, - "required": [ - "value", - "start", - "end" - ] + "required": ["value", "start", "end"] } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "name" - ] + "required": ["id", "sessionID", "messageID", "type", "name"] }, "RetryPart": { "type": "object", @@ -10303,20 +9991,10 @@ "type": "number" } }, - "required": [ - "created" - ] + "required": ["created"] } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "attempt", - "error", - "time" - ] + "required": ["id", "sessionID", "messageID", "type", "attempt", "error", "time"] }, "CompactionPart": { "type": "object", @@ -10341,13 +10019,7 @@ "type": "boolean" } }, - "required": [ - "id", - "sessionID", - "messageID", - "type", - "auto" - ] + "required": ["id", "sessionID", "messageID", "type", "auto"] }, "Part": { "anyOf": [ @@ -10403,15 +10075,10 @@ "$ref": "#/components/schemas/Part" } }, - "required": [ - "part" - ] + "required": ["part"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.message.part.delta": { "type": "object", @@ -10439,19 +10106,10 @@ "type": "string" } }, - "required": [ - "sessionID", - "messageID", - "partID", - "field", - "delta" - ] + "required": ["sessionID", "messageID", "partID", "field", "delta"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.message.part.removed": { "type": "object", @@ -10473,17 +10131,10 @@ "type": "string" } }, - "required": [ - "sessionID", - "messageID", - "partID" - ] + "required": ["sessionID", "messageID", "partID"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "PermissionRequest": { "type": "object", @@ -10528,20 +10179,10 @@ "type": "string" } }, - "required": [ - "messageID", - "callID" - ] + "required": ["messageID", "callID"] } }, - "required": [ - "id", - "sessionID", - "permission", - "patterns", - "metadata", - "always" - ] + "required": ["id", "sessionID", "permission", "patterns", "metadata", "always"] }, "Event.permission.asked": { "type": "object", @@ -10554,10 +10195,7 @@ "$ref": "#/components/schemas/PermissionRequest" } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.permission.replied": { "type": "object", @@ -10577,24 +10215,13 @@ }, "reply": { "type": "string", - "enum": [ - "once", - "always", - "reject" - ] + "enum": ["once", "always", "reject"] } }, - "required": [ - "sessionID", - "requestID", - "reply" - ] + "required": ["sessionID", "requestID", "reply"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "SessionStatus": { "anyOf": [ @@ -10606,9 +10233,7 @@ "const": "idle" } }, - "required": [ - "type" - ] + "required": ["type"] }, { "type": "object", @@ -10627,12 +10252,7 @@ "type": "number" } }, - "required": [ - "type", - "attempt", - "message", - "next" - ] + "required": ["type", "attempt", "message", "next"] }, { "type": "object", @@ -10642,9 +10262,23 @@ "const": "busy" } }, - "required": [ - "type" - ] + "required": ["type"] + }, + { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "offline" + }, + "requestID": { + "type": "string" + }, + "message": { + "type": "string" + } + }, + "required": ["type", "requestID", "message"] } ] }, @@ -10665,16 +10299,10 @@ "$ref": "#/components/schemas/SessionStatus" } }, - "required": [ - "sessionID", - "status" - ] + "required": ["sessionID", "status"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.session.idle": { "type": "object", @@ -10690,15 +10318,10 @@ "type": "string" } }, - "required": [ - "sessionID" - ] + "required": ["sessionID"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "QuestionOption": { "type": "object", @@ -10716,10 +10339,7 @@ "type": "string" } }, - "required": [ - "label", - "description" - ] + "required": ["label", "description"] }, "QuestionInfo": { "type": "object", @@ -10748,11 +10368,7 @@ "type": "boolean" } }, - "required": [ - "question", - "header", - "options" - ] + "required": ["question", "header", "options"] }, "QuestionRequest": { "type": "object", @@ -10782,17 +10398,10 @@ "type": "string" } }, - "required": [ - "messageID", - "callID" - ] + "required": ["messageID", "callID"] } }, - "required": [ - "id", - "sessionID", - "questions" - ] + "required": ["id", "sessionID", "questions"] }, "Event.question.asked": { "type": "object", @@ -10805,10 +10414,7 @@ "$ref": "#/components/schemas/QuestionRequest" } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "QuestionAnswer": { "type": "array", @@ -10839,17 +10445,10 @@ } } }, - "required": [ - "sessionID", - "requestID", - "answers" - ] + "required": ["sessionID", "requestID", "answers"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.question.rejected": { "type": "object", @@ -10868,134 +10467,10 @@ "type": "string" } }, - "required": [ - "sessionID", - "requestID" - ] + "required": ["sessionID", "requestID"] } }, - "required": [ - "type", - "properties" - ] - }, - "Event.session.compacted": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "session.compacted" - }, - "properties": { - "type": "object", - "properties": { - "sessionID": { - "type": "string" - } - }, - "required": [ - "sessionID" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "Event.file.watcher.updated": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "file.watcher.updated" - }, - "properties": { - "type": "object", - "properties": { - "file": { - "type": "string" - }, - "event": { - "anyOf": [ - { - "type": "string", - "const": "add" - }, - { - "type": "string", - "const": "change" - }, - { - "type": "string", - "const": "unlink" - } - ] - } - }, - "required": [ - "file", - "event" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "Todo": { - "type": "object", - "properties": { - "content": { - "description": "Brief description of the task", - "type": "string" - }, - "status": { - "description": "Current status of the task: pending, in_progress, completed, cancelled", - "type": "string" - }, - "priority": { - "description": "Priority level of the task: high, medium, low", - "type": "string" - } - }, - "required": [ - "content", - "status", - "priority" - ] - }, - "Event.todo.updated": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "todo.updated" - }, - "properties": { - "type": "object", - "properties": { - "sessionID": { - "type": "string" - }, - "todos": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Todo" - } - } - }, - "required": [ - "sessionID", - "todos" - ] - } - }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.tui.prompt.append": { "type": "object", @@ -11011,15 +10486,10 @@ "type": "string" } }, - "required": [ - "text" - ] + "required": ["text"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.tui.command.execute": { "type": "object", @@ -11060,15 +10530,10 @@ ] } }, - "required": [ - "command" - ] + "required": ["command"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.tui.toast.show": { "type": "object", @@ -11088,12 +10553,7 @@ }, "variant": { "type": "string", - "enum": [ - "info", - "success", - "warning", - "error" - ] + "enum": ["info", "success", "warning", "error"] }, "duration": { "description": "Duration in milliseconds", @@ -11101,16 +10561,10 @@ "type": "number" } }, - "required": [ - "message", - "variant" - ] + "required": ["message", "variant"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.tui.session.select": { "type": "object", @@ -11128,15 +10582,10 @@ "pattern": "^ses" } }, - "required": [ - "sessionID" - ] + "required": ["sessionID"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.mcp.tools.changed": { "type": "object", @@ -11152,15 +10601,10 @@ "type": "string" } }, - "required": [ - "server" - ] + "required": ["server"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.mcp.browser.open.failed": { "type": "object", @@ -11179,16 +10623,190 @@ "type": "string" } }, - "required": [ - "mcpName", - "url" - ] + "required": ["mcpName", "url"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] + }, + "SessionNetworkWait": { + "type": "object", + "properties": { + "id": { + "type": "string", + "pattern": "^que.*" + }, + "sessionID": { + "type": "string", + "pattern": "^ses.*" + }, + "message": { + "type": "string" + }, + "time": { + "type": "object", + "properties": { + "created": { + "type": "number" + } + }, + "required": ["created"] + } + }, + "required": ["id", "sessionID", "message", "time"] + }, + "Event.session.network.asked": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.asked" + }, + "properties": { + "$ref": "#/components/schemas/SessionNetworkWait" + } + }, + "required": ["type", "properties"] + }, + "Event.session.network.replied": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.replied" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + }, + "requestID": { + "type": "string" + } + }, + "required": ["sessionID", "requestID"] + } + }, + "required": ["type", "properties"] + }, + "Event.session.network.rejected": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.rejected" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + }, + "requestID": { + "type": "string" + } + }, + "required": ["sessionID", "requestID"] + } + }, + "required": ["type", "properties"] + }, + "Event.session.compacted": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.compacted" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + } + }, + "required": ["sessionID"] + } + }, + "required": ["type", "properties"] + }, + "Event.file.watcher.updated": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "file.watcher.updated" + }, + "properties": { + "type": "object", + "properties": { + "file": { + "type": "string" + }, + "event": { + "anyOf": [ + { + "type": "string", + "const": "add" + }, + { + "type": "string", + "const": "change" + }, + { + "type": "string", + "const": "unlink" + } + ] + } + }, + "required": ["file", "event"] + } + }, + "required": ["type", "properties"] + }, + "Todo": { + "type": "object", + "properties": { + "content": { + "description": "Brief description of the task", + "type": "string" + }, + "status": { + "description": "Current status of the task: pending, in_progress, completed, cancelled", + "type": "string" + }, + "priority": { + "description": "Priority level of the task: high, medium, low", + "type": "string" + } + }, + "required": ["content", "status", "priority"] + }, + "Event.todo.updated": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "todo.updated" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + }, + "todos": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Todo" + } + } + }, + "required": ["sessionID", "todos"] + } + }, + "required": ["type", "properties"] }, "Event.command.executed": { "type": "object", @@ -11215,26 +10833,14 @@ "pattern": "^msg.*" } }, - "required": [ - "name", - "sessionID", - "arguments", - "messageID" - ] + "required": ["name", "sessionID", "arguments", "messageID"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "PermissionAction": { "type": "string", - "enum": [ - "allow", - "deny", - "ask" - ] + "enum": ["allow", "deny", "ask"] }, "PermissionRule": { "type": "object", @@ -11249,11 +10855,7 @@ "$ref": "#/components/schemas/PermissionAction" } }, - "required": [ - "permission", - "pattern", - "action" - ] + "required": ["permission", "pattern", "action"] }, "PermissionRuleset": { "type": "array", @@ -11303,11 +10905,7 @@ } } }, - "required": [ - "additions", - "deletions", - "files" - ] + "required": ["additions", "deletions", "files"] }, "share": { "type": "object", @@ -11316,9 +10914,7 @@ "type": "string" } }, - "required": [ - "url" - ] + "required": ["url"] }, "title": { "type": "string" @@ -11342,10 +10938,7 @@ "type": "number" } }, - "required": [ - "created", - "updated" - ] + "required": ["created", "updated"] }, "permission": { "$ref": "#/components/schemas/PermissionRuleset" @@ -11366,20 +10959,10 @@ "type": "string" } }, - "required": [ - "messageID" - ] + "required": ["messageID"] } }, - "required": [ - "id", - "slug", - "projectID", - "directory", - "title", - "version", - "time" - ] + "required": ["id", "slug", "projectID", "directory", "title", "version", "time"] }, "Event.session.created": { "type": "object", @@ -11395,15 +10978,10 @@ "$ref": "#/components/schemas/Session" } }, - "required": [ - "info" - ] + "required": ["info"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.session.updated": { "type": "object", @@ -11419,15 +10997,10 @@ "$ref": "#/components/schemas/Session" } }, - "required": [ - "info" - ] + "required": ["info"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.session.deleted": { "type": "object", @@ -11443,15 +11016,10 @@ "$ref": "#/components/schemas/Session" } }, - "required": [ - "info" - ] + "required": ["info"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.session.diff": { "type": "object", @@ -11473,16 +11041,10 @@ } } }, - "required": [ - "sessionID", - "diff" - ] + "required": ["sessionID", "diff"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.session.error": { "type": "object", @@ -11525,10 +11087,7 @@ } } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.session.turn.open": { "type": "object", @@ -11544,15 +11103,10 @@ "type": "string" } }, - "required": [ - "sessionID" - ] + "required": ["sessionID"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.session.turn.close": { "type": "object", @@ -11569,23 +11123,13 @@ }, "reason": { "type": "string", - "enum": [ - "completed", - "error", - "interrupted" - ] + "enum": ["completed", "error", "interrupted"] } }, - "required": [ - "sessionID", - "reason" - ] + "required": ["sessionID", "reason"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.vcs.branch.updated": { "type": "object", @@ -11603,10 +11147,7 @@ } } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.workspace.ready": { "type": "object", @@ -11622,15 +11163,10 @@ "type": "string" } }, - "required": [ - "name" - ] + "required": ["name"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.workspace.failed": { "type": "object", @@ -11646,15 +11182,10 @@ "type": "string" } }, - "required": [ - "message" - ] + "required": ["message"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Pty": { "type": "object", @@ -11680,24 +11211,13 @@ }, "status": { "type": "string", - "enum": [ - "running", - "exited" - ] + "enum": ["running", "exited"] }, "pid": { "type": "number" } }, - "required": [ - "id", - "title", - "command", - "args", - "cwd", - "status", - "pid" - ] + "required": ["id", "title", "command", "args", "cwd", "status", "pid"] }, "Event.pty.created": { "type": "object", @@ -11713,15 +11233,10 @@ "$ref": "#/components/schemas/Pty" } }, - "required": [ - "info" - ] + "required": ["info"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.pty.updated": { "type": "object", @@ -11737,15 +11252,10 @@ "$ref": "#/components/schemas/Pty" } }, - "required": [ - "info" - ] + "required": ["info"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.pty.exited": { "type": "object", @@ -11765,16 +11275,10 @@ "type": "number" } }, - "required": [ - "id", - "exitCode" - ] + "required": ["id", "exitCode"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.pty.deleted": { "type": "object", @@ -11791,15 +11295,10 @@ "pattern": "^pty.*" } }, - "required": [ - "id" - ] + "required": ["id"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.worktree.ready": { "type": "object", @@ -11818,16 +11317,10 @@ "type": "string" } }, - "required": [ - "name", - "branch" - ] + "required": ["name", "branch"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event.worktree.failed": { "type": "object", @@ -11843,15 +11336,10 @@ "type": "string" } }, - "required": [ - "message" - ] + "required": ["message"] } }, - "required": [ - "type", - "properties" - ] + "required": ["type", "properties"] }, "Event": { "anyOf": [ @@ -11921,15 +11409,6 @@ { "$ref": "#/components/schemas/Event.question.rejected" }, - { - "$ref": "#/components/schemas/Event.session.compacted" - }, - { - "$ref": "#/components/schemas/Event.file.watcher.updated" - }, - { - "$ref": "#/components/schemas/Event.todo.updated" - }, { "$ref": "#/components/schemas/Event.tui.prompt.append" }, @@ -11948,6 +11427,24 @@ { "$ref": "#/components/schemas/Event.mcp.browser.open.failed" }, + { + "$ref": "#/components/schemas/Event.session.network.asked" + }, + { + "$ref": "#/components/schemas/Event.session.network.replied" + }, + { + "$ref": "#/components/schemas/Event.session.network.rejected" + }, + { + "$ref": "#/components/schemas/Event.session.compacted" + }, + { + "$ref": "#/components/schemas/Event.file.watcher.updated" + }, + { + "$ref": "#/components/schemas/Event.todo.updated" + }, { "$ref": "#/components/schemas/Event.command.executed" }, @@ -12011,20 +11508,12 @@ "$ref": "#/components/schemas/Event" } }, - "required": [ - "directory", - "payload" - ] + "required": ["directory", "payload"] }, "LogLevel": { "description": "Log level", "type": "string", - "enum": [ - "DEBUG", - "INFO", - "WARN", - "ERROR" - ] + "enum": ["DEBUG", "INFO", "WARN", "ERROR"] }, "ServerConfig": { "description": "Server configuration for kilo serve and web commands", @@ -12062,11 +11551,7 @@ "anyOf": [ { "type": "string", - "enum": [ - "ask", - "allow", - "deny" - ] + "enum": ["ask", "allow", "deny"] }, { "type": "null" @@ -12209,11 +11694,7 @@ }, "mode": { "type": "string", - "enum": [ - "subagent", - "primary", - "all" - ] + "enum": ["subagent", "primary", "all"] }, "hidden": { "description": "Hide this subagent from the @ autocomplete menu (default: false, only applies to mode: subagent)", @@ -12235,15 +11716,7 @@ }, { "type": "string", - "enum": [ - "primary", - "secondary", - "accent", - "success", - "warning", - "error", - "info" - ] + "enum": ["primary", "secondary", "accent", "success", "warning", "error", "info"] } ] }, @@ -12329,15 +11802,10 @@ "properties": { "field": { "type": "string", - "enum": [ - "reasoning_content", - "reasoning_details" - ] + "enum": ["reasoning_content", "reasoning_details"] } }, - "required": [ - "field" - ], + "required": ["field"], "additionalProperties": false } ] @@ -12373,16 +11841,10 @@ "type": "number" } }, - "required": [ - "input", - "output" - ] + "required": ["input", "output"] } }, - "required": [ - "input", - "output" - ] + "required": ["input", "output"] }, "limit": { "type": "object", @@ -12397,10 +11859,7 @@ "type": "number" } }, - "required": [ - "context", - "output" - ] + "required": ["context", "output"] }, "modalities": { "type": "object", @@ -12409,61 +11868,39 @@ "type": "array", "items": { "type": "string", - "enum": [ - "text", - "audio", - "image", - "video", - "pdf" - ] + "enum": ["text", "audio", "image", "video", "pdf"] } }, "output": { "type": "array", "items": { "type": "string", - "enum": [ - "text", - "audio", - "image", - "video", - "pdf" - ] + "enum": ["text", "audio", "image", "video", "pdf"] } } }, - "required": [ - "input", - "output" - ] + "required": ["input", "output"] }, "recommendedIndex": { "type": "number" }, "prompt": { "type": "string", - "enum": [ - "codex", - "gemini", - "beast", - "anthropic", - "trinity", - "anthropic_without_todo" - ] + "enum": ["codex", "gemini", "beast", "anthropic", "trinity", "anthropic_without_todo"] }, "isFree": { "type": "boolean" }, + "ai_sdk_provider": { + "type": "string", + "enum": ["anthropic", "openai", "openai-compatible", "openrouter"] + }, "experimental": { "type": "boolean" }, "status": { "type": "string", - "enum": [ - "alpha", - "beta", - "deprecated" - ] + "enum": ["alpha", "beta", "deprecated"] }, "options": { "type": "object", @@ -12599,10 +12036,7 @@ "maximum": 9007199254740991 } }, - "required": [ - "type", - "command" - ], + "required": ["type", "command"], "additionalProperties": false }, "McpOAuthConfig": { @@ -12668,19 +12102,13 @@ "maximum": 9007199254740991 } }, - "required": [ - "type", - "url" - ], + "required": ["type", "url"], "additionalProperties": false }, "LayoutConfig": { "description": "@deprecated Always uses stretch layout.", "type": "string", - "enum": [ - "auto", - "stretch" - ] + "enum": ["auto", "stretch"] }, "Config": { "type": "object", @@ -12720,9 +12148,7 @@ "type": "boolean" } }, - "required": [ - "template" - ] + "required": ["template"] } }, "skills": { @@ -12768,11 +12194,7 @@ "share": { "description": "Control sharing behavior:'manual' allows manual sharing via commands, 'auto' enables automatic sharing, 'disabled' disables all sharing", "type": "string", - "enum": [ - "manual", - "auto", - "disabled" - ] + "enum": ["manual", "auto", "disabled"] }, "autoshare": { "description": "@deprecated Use 'share' field instead. Share newly created sessions automatically", @@ -12923,9 +12345,7 @@ "type": "boolean" } }, - "required": [ - "enabled" - ], + "required": ["enabled"], "additionalProperties": false } ] @@ -12995,9 +12415,7 @@ "const": true } }, - "required": [ - "disabled" - ] + "required": ["disabled"] }, { "type": "object", @@ -13034,9 +12452,7 @@ "additionalProperties": {} } }, - "required": [ - "command" - ] + "required": ["command"] } ] } @@ -13153,11 +12569,7 @@ "const": false } }, - "required": [ - "data", - "errors", - "success" - ] + "required": ["data", "errors", "success"] }, "OAuth": { "type": "object", @@ -13182,12 +12594,7 @@ "type": "string" } }, - "required": [ - "type", - "refresh", - "access", - "expires" - ] + "required": ["type", "refresh", "access", "expires"] }, "ApiAuth": { "type": "object", @@ -13200,10 +12607,7 @@ "type": "string" } }, - "required": [ - "type", - "key" - ] + "required": ["type", "key"] }, "WellKnownAuth": { "type": "object", @@ -13219,11 +12623,7 @@ "type": "string" } }, - "required": [ - "type", - "key", - "token" - ] + "required": ["type", "key", "token"] }, "Auth": { "anyOf": [ @@ -13252,15 +12652,10 @@ "type": "string" } }, - "required": [ - "message" - ] + "required": ["message"] } }, - "required": [ - "name", - "data" - ] + "required": ["name", "data"] }, "Model": { "type": "object", @@ -13284,11 +12679,7 @@ "type": "string" } }, - "required": [ - "id", - "url", - "npm" - ] + "required": ["id", "url", "npm"] }, "name": { "type": "string" @@ -13330,13 +12721,7 @@ "type": "boolean" } }, - "required": [ - "text", - "audio", - "image", - "video", - "pdf" - ] + "required": ["text", "audio", "image", "video", "pdf"] }, "output": { "type": "object", @@ -13357,13 +12742,7 @@ "type": "boolean" } }, - "required": [ - "text", - "audio", - "image", - "video", - "pdf" - ] + "required": ["text", "audio", "image", "video", "pdf"] }, "interleaved": { "anyOf": [ @@ -13375,28 +12754,15 @@ "properties": { "field": { "type": "string", - "enum": [ - "reasoning_content", - "reasoning_details" - ] + "enum": ["reasoning_content", "reasoning_details"] } }, - "required": [ - "field" - ] + "required": ["field"] } ] } }, - "required": [ - "temperature", - "reasoning", - "attachment", - "toolcall", - "input", - "output", - "interleaved" - ] + "required": ["temperature", "reasoning", "attachment", "toolcall", "input", "output", "interleaved"] }, "cost": { "type": "object", @@ -13417,10 +12783,7 @@ "type": "number" } }, - "required": [ - "read", - "write" - ] + "required": ["read", "write"] }, "experimentalOver200K": { "type": "object", @@ -13441,24 +12804,13 @@ "type": "number" } }, - "required": [ - "read", - "write" - ] + "required": ["read", "write"] } }, - "required": [ - "input", - "output", - "cache" - ] + "required": ["input", "output", "cache"] } }, - "required": [ - "input", - "output", - "cache" - ] + "required": ["input", "output", "cache"] }, "limit": { "type": "object", @@ -13473,19 +12825,11 @@ "type": "number" } }, - "required": [ - "context", - "output" - ] + "required": ["context", "output"] }, "status": { "type": "string", - "enum": [ - "alpha", - "beta", - "deprecated", - "active" - ] + "enum": ["alpha", "beta", "deprecated", "active"] }, "options": { "type": "object", @@ -13524,17 +12868,14 @@ }, "prompt": { "type": "string", - "enum": [ - "codex", - "gemini", - "beast", - "anthropic", - "trinity", - "anthropic_without_todo" - ] + "enum": ["codex", "gemini", "beast", "anthropic", "trinity", "anthropic_without_todo"] }, "isFree": { "type": "boolean" + }, + "ai_sdk_provider": { + "type": "string", + "enum": ["anthropic", "openai", "openai-compatible", "openrouter"] } }, "required": [ @@ -13562,12 +12903,7 @@ }, "source": { "type": "string", - "enum": [ - "env", - "config", - "custom", - "api" - ] + "enum": ["env", "config", "custom", "api"] }, "env": { "type": "array", @@ -13595,14 +12931,7 @@ } } }, - "required": [ - "id", - "name", - "source", - "env", - "options", - "models" - ] + "required": ["id", "name", "source", "env", "options", "models"] }, "ToolIDs": { "type": "array", @@ -13621,11 +12950,7 @@ }, "parameters": {} }, - "required": [ - "id", - "description", - "parameters" - ] + "required": ["id", "description", "parameters"] }, "ToolList": { "type": "array", @@ -13685,15 +13010,7 @@ "type": "string" } }, - "required": [ - "id", - "type", - "branch", - "name", - "directory", - "extra", - "projectID" - ] + "required": ["id", "type", "branch", "name", "directory", "extra", "projectID"] }, "Worktree": { "type": "object", @@ -13708,11 +13025,7 @@ "type": "string" } }, - "required": [ - "name", - "branch", - "directory" - ] + "required": ["name", "branch", "directory"] }, "WorktreeCreateInput": { "type": "object", @@ -13733,9 +13046,7 @@ "type": "string" } }, - "required": [ - "directory" - ] + "required": ["directory"] }, "WorktreeResetInput": { "type": "object", @@ -13744,9 +13055,7 @@ "type": "string" } }, - "required": [ - "directory" - ] + "required": ["directory"] }, "WorktreeDiffItem": { "type": "object", @@ -13768,11 +13077,7 @@ }, "status": { "type": "string", - "enum": [ - "added", - "deleted", - "modified" - ] + "enum": ["added", "deleted", "modified"] }, "tracked": { "type": "boolean" @@ -13812,10 +13117,7 @@ "type": "string" } }, - "required": [ - "id", - "worktree" - ] + "required": ["id", "worktree"] }, "GlobalSession": { "type": "object", @@ -13859,11 +13161,7 @@ } } }, - "required": [ - "additions", - "deletions", - "files" - ] + "required": ["additions", "deletions", "files"] }, "share": { "type": "object", @@ -13872,9 +13170,7 @@ "type": "string" } }, - "required": [ - "url" - ] + "required": ["url"] }, "title": { "type": "string" @@ -13898,10 +13194,7 @@ "type": "number" } }, - "required": [ - "created", - "updated" - ] + "required": ["created", "updated"] }, "permission": { "$ref": "#/components/schemas/PermissionRuleset" @@ -13922,9 +13215,7 @@ "type": "string" } }, - "required": [ - "messageID" - ] + "required": ["messageID"] }, "project": { "anyOf": [ @@ -13937,16 +13228,7 @@ ] } }, - "required": [ - "id", - "slug", - "projectID", - "directory", - "title", - "version", - "time", - "project" - ] + "required": ["id", "slug", "projectID", "directory", "title", "version", "time", "project"] }, "McpResource": { "type": "object", @@ -13967,11 +13249,7 @@ "type": "string" } }, - "required": [ - "name", - "uri", - "client" - ] + "required": ["name", "uri", "client"] }, "TextPartInput": { "type": "object", @@ -14002,9 +13280,7 @@ "type": "number" } }, - "required": [ - "start" - ] + "required": ["start"] }, "metadata": { "type": "object", @@ -14014,10 +13290,7 @@ "additionalProperties": {} } }, - "required": [ - "type", - "text" - ] + "required": ["type", "text"] }, "FilePartInput": { "type": "object", @@ -14042,11 +13315,7 @@ "$ref": "#/components/schemas/FilePartSource" } }, - "required": [ - "type", - "mime", - "url" - ] + "required": ["type", "mime", "url"] }, "AgentPartInput": { "type": "object", @@ -14078,17 +13347,10 @@ "maximum": 9007199254740991 } }, - "required": [ - "value", - "start", - "end" - ] + "required": ["value", "start", "end"] } }, - "required": [ - "type", - "name" - ] + "required": ["type", "name"] }, "SubtaskPartInput": { "type": "object", @@ -14119,21 +13381,13 @@ "type": "string" } }, - "required": [ - "providerID", - "modelID" - ] + "required": ["providerID", "modelID"] }, "command": { "type": "string" } }, - "required": [ - "type", - "prompt", - "description", - "agent" - ] + "required": ["type", "prompt", "description", "agent"] }, "ProviderAuthMethod": { "type": "object", @@ -14154,10 +13408,7 @@ "type": "string" } }, - "required": [ - "type", - "label" - ] + "required": ["type", "label"] }, "ProviderAuthAuthorization": { "type": "object", @@ -14181,11 +13432,7 @@ "type": "string" } }, - "required": [ - "url", - "method", - "instructions" - ] + "required": ["url", "method", "instructions"] }, "Symbol": { "type": "object", @@ -14206,17 +13453,10 @@ "$ref": "#/components/schemas/Range" } }, - "required": [ - "uri", - "range" - ] + "required": ["uri", "range"] } }, - "required": [ - "name", - "kind", - "location" - ] + "required": ["name", "kind", "location"] }, "FileNode": { "type": "object", @@ -14232,32 +13472,20 @@ }, "type": { "type": "string", - "enum": [ - "file", - "directory" - ] + "enum": ["file", "directory"] }, "ignored": { "type": "boolean" } }, - "required": [ - "name", - "path", - "absolute", - "type", - "ignored" - ] + "required": ["name", "path", "absolute", "type", "ignored"] }, "FileContent": { "type": "object", "properties": { "type": { "type": "string", - "enum": [ - "text", - "binary" - ] + "enum": ["text", "binary"] }, "content": { "type": "string" @@ -14304,24 +13532,14 @@ } } }, - "required": [ - "oldStart", - "oldLines", - "newStart", - "newLines", - "lines" - ] + "required": ["oldStart", "oldLines", "newStart", "newLines", "lines"] } }, "index": { "type": "string" } }, - "required": [ - "oldFileName", - "newFileName", - "hunks" - ] + "required": ["oldFileName", "newFileName", "hunks"] }, "encoding": { "type": "string", @@ -14331,10 +13549,7 @@ "type": "string" } }, - "required": [ - "type", - "content" - ] + "required": ["type", "content"] }, "File": { "type": "object", @@ -14354,19 +13569,10 @@ }, "status": { "type": "string", - "enum": [ - "added", - "deleted", - "modified" - ] + "enum": ["added", "deleted", "modified"] } }, - "required": [ - "path", - "added", - "removed", - "status" - ] + "required": ["path", "added", "removed", "status"] }, "MCPStatusConnected": { "type": "object", @@ -14376,9 +13582,7 @@ "const": "connected" } }, - "required": [ - "status" - ] + "required": ["status"] }, "MCPStatusDisabled": { "type": "object", @@ -14388,9 +13592,7 @@ "const": "disabled" } }, - "required": [ - "status" - ] + "required": ["status"] }, "MCPStatusFailed": { "type": "object", @@ -14403,10 +13605,7 @@ "type": "string" } }, - "required": [ - "status", - "error" - ] + "required": ["status", "error"] }, "MCPStatusNeedsAuth": { "type": "object", @@ -14416,9 +13615,7 @@ "const": "needs_auth" } }, - "required": [ - "status" - ] + "required": ["status"] }, "MCPStatusNeedsClientRegistration": { "type": "object", @@ -14431,10 +13628,7 @@ "type": "string" } }, - "required": [ - "status", - "error" - ] + "required": ["status", "error"] }, "MCPStatus": { "anyOf": [ @@ -14474,13 +13668,7 @@ "type": "string" } }, - "required": [ - "home", - "state", - "config", - "worktree", - "directory" - ] + "required": ["home", "state", "config", "worktree", "directory"] }, "VcsInfo": { "type": "object", @@ -14489,9 +13677,7 @@ "type": "string" } }, - "required": [ - "branch" - ] + "required": ["branch"] }, "Command": { "type": "object", @@ -14510,11 +13696,7 @@ }, "source": { "type": "string", - "enum": [ - "command", - "mcp", - "skill" - ] + "enum": ["command", "mcp", "skill"] }, "template": { "anyOf": [ @@ -14536,11 +13718,7 @@ } } }, - "required": [ - "name", - "template", - "hints" - ] + "required": ["name", "template", "hints"] }, "Agent": { "type": "object", @@ -14556,11 +13734,7 @@ }, "mode": { "type": "string", - "enum": [ - "subagent", - "primary", - "all" - ] + "enum": ["subagent", "primary", "all"] }, "native": { "type": "boolean" @@ -14590,10 +13764,7 @@ "type": "string" } }, - "required": [ - "modelID", - "providerID" - ] + "required": ["modelID", "providerID"] }, "variant": { "type": "string" @@ -14614,12 +13785,7 @@ "maximum": 9007199254740991 } }, - "required": [ - "name", - "mode", - "permission", - "options" - ] + "required": ["name", "mode", "permission", "options"] }, "LSPStatus": { "type": "object", @@ -14646,12 +13812,7 @@ ] } }, - "required": [ - "id", - "name", - "root", - "status" - ] + "required": ["id", "name", "root", "status"] }, "FormatterStatus": { "type": "object", @@ -14669,12 +13830,8 @@ "type": "boolean" } }, - "required": [ - "name", - "extensions", - "enabled" - ] + "required": ["name", "extensions", "enabled"] } } } -} \ No newline at end of file +} From c80794faab975ecc384517278045023f3392a0a0 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 12:10:19 +0200 Subject: [PATCH 04/58] chore: remove plan file from PR --- .kilo/plans/network-reconnect.md | 342 ------------------------------- 1 file changed, 342 deletions(-) delete mode 100644 .kilo/plans/network-reconnect.md diff --git a/.kilo/plans/network-reconnect.md b/.kilo/plans/network-reconnect.md deleted file mode 100644 index 12c4d514438..00000000000 --- a/.kilo/plans/network-reconnect.md +++ /dev/null @@ -1,342 +0,0 @@ -# Plan: Graceful Network Disconnect/Reconnect Handling - -## Branch: `feat/network-reconnect` - -## Prior Art - -No existing PRs address this feature. Searched open PRs for "network", "offline", "reconnect", and "connection" — none match. The closest is PR #6802 (SSE reconnect for permission prompts in the VS Code extension), which is a different concern (localhost SSE, not internet connectivity). - -## Current State - -The codebase has **zero network connectivity awareness**: - -- **Only `ECONNRESET` is handled as retryable** (`message-v2.ts:856`). Other network errors (`ETIMEDOUT`, `ENETUNREACH`, `ENOTFOUND`, `ECONNREFUSED`) fall through to `NamedError.Unknown` — **non-retryable** — causing the session loop to stop permanently with an error. -- **No connectivity monitoring** — no probes, no heartbeats, no online/offline state. -- **No "paused" session status** — `SessionStatus` only has `idle`, `busy`, and `retry`. -- **MCP remote servers stay failed** — no automatic reconnection when network returns. -- **The retry loop is blind** — exponential backoff with no awareness of whether the network is actually available. - -## Design - -### Architecture Overview - -``` -+-----------------------------------------------------+ -| Network Monitor | -| (reactive detection + active probing while offline) | -| | -| Bus Events: Network.Event.Online / .Offline | -| API: waitForOnline(abort): Promise | -+---------------+----------------------+---------------+ - | | - +-----------v-----------+ +-------v------------------+ - | Processor (retry) | | MCP Reconnection | - | | | (remote servers) | - | network error -> | | | - | status "network" -> | | online -> reconnect | - | waitForOnline() -> | | failed remote servers | - | NetworkResume.ask() | | | - +-----------+-----------+ +---------------------------+ - | - +-----------v-----------+ - | NetworkResume | - | (confirmation) | - | | - | Backend promise -> | - | Bus event (SSE) -> | - | TUI/client prompt -> | - | API endpoint reply | - +-----------+-----------+ - | - +-----------v-----------+ - | TUI Integration | - | | - | Bell + Toast on | - | reconnect. Inline | - | confirmation prompt | - +------------------------+ -``` - -### Network Detection Strategy - -**Hybrid reactive + active approach:** - -1. **Reactive detection**: When an LLM call fails with a network system error code (`ECONNRESET`, `ETIMEDOUT`, `ENETUNREACH`, `ENOTFOUND`, `ECONNREFUSED`), the network monitor is immediately flagged as offline. -2. **Active probing while offline**: Once flagged offline, periodic DNS lookups (`Bun.dns.resolve("dns.google")`) every 2 seconds detect when connectivity returns. -3. **No proactive polling when online**: Zero overhead when things are working — the monitor is dormant until triggered by an error. - -### User Confirmation Flow - -When the network comes back online while a session was interrupted: - -1. **Backend** (`processor.ts`): Detects network error -> sets session status to `{ type: "network" }` -> calls `Network.waitForOnline(abort)` (blocks until DNS probe succeeds) -> calls `NetworkResume.ask(sessionID, abort)` (blocks until user responds) -2. **Backend** (`NetworkResume`): Publishes `NetworkResume.Event.Asked` bus event -> SSE delivers to all clients -3. **TUI**: Receives event -> rings bell -> shows confirmation prompt "Network back online. Do you want to continue?" with [Continue] / [Cancel] options -4. **User responds**: TUI calls `POST /network-resume/:requestID` with `{ action: "continue" | "cancel" }` -5. **Backend**: Promise resolves -> processor either continues retry or breaks the loop - -### Mode-Specific Behavior - -| Mode | Behavior | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| **TUI** (`kilo`) | Full prompt: bell + inline confirmation at bottom of session view | -| **`kilo run`** | Auto-resume (no user to ask; non-interactive mode) | -| **`kilo serve`** (VS Code) | Bus event published over SSE; client handles UI. Initial implementation: auto-resume with toast notification. VS Code extension can add its own confirmation UI later. | - -### Session Status Extension - -Add a new `"network"` status variant to `SessionStatus.Info`: - -```ts -z.object({ - type: z.literal("network"), - message: z.string(), // e.g., "Network disconnected" or "Waiting for confirmation" -}) -``` - -This allows the TUI to show a distinct status indicator (e.g., "Network offline -- waiting for reconnection...") instead of the generic retry countdown. - ---- - -## Commits - -### Commit 1: Add network monitor service - -**New file:** `packages/opencode/src/kilocode/network.ts` - -```ts -export namespace Network { - // Bus events - Event.Online // published when connectivity is restored - Event.Offline // published when connectivity is lost - - // State - isOnline(): boolean - - // Called reactively when a network error is detected - markOffline(): void - - // Blocks until network is back online. Uses periodic DNS probes. - // Respects abort signal for cancellation. - waitForOnline(abort: AbortSignal): Promise -} -``` - -Implementation details: - -- Uses `Instance.state()` for per-project singleton -- DNS probe: `Bun.dns.resolve("dns.google")` -- lightweight, no HTTP overhead -- Probe interval while offline: 2 seconds -- On successful probe: publish `Network.Event.Online`, stop probing -- On `markOffline()`: publish `Network.Event.Offline`, start probing -- Thread-safe: multiple callers to `waitForOnline()` share the same probe loop - -### Commit 2: Handle all network system errors as retryable - -**Modified file:** `packages/opencode/src/session/message-v2.ts` - -Extend the `fromError()` function (currently line 856) to recognize all network system error codes: - -```ts -// Current: only ECONNRESET -case (e as SystemError)?.code === "ECONNRESET": - -// New: all network-related system errors -case isNetworkSystemError(e): - return new MessageV2.APIError({ - message: networkErrorMessage(e), - isRetryable: true, - metadata: { - code: (e as SystemError).code ?? "", - syscall: (e as SystemError).syscall ?? "", - message: (e as SystemError).message ?? "", - isNetwork: true, // flag for the processor to detect - }, - }, { cause: e }).toObject() -``` - -Where `isNetworkSystemError()` checks for: `ECONNRESET`, `ETIMEDOUT`, `ENETUNREACH`, `ENOTFOUND`, `ECONNREFUSED`, `EHOSTUNREACH`, `ENETDOWN`, `EPIPE`, `EAI_AGAIN`. - -The `isNetwork: true` metadata flag allows the processor to distinguish network errors from other retryable API errors (like rate limits). - -### Commit 3: Add "network" session status + network-aware retry - -**Modified files:** - -- `packages/opencode/src/session/status.ts` -- Add `"network"` variant to `SessionStatus.Info` -- `packages/opencode/src/session/processor.ts` -- Network-aware retry logic -- `packages/opencode/src/session/retry.ts` -- Add `isNetworkError()` helper - -In `processor.ts`, the catch block (currently line 376) gains a new branch: - -```ts -} catch (e: any) { - const error = MessageV2.fromError(e, { providerID: input.model.providerID }) - - // ... existing context overflow handling ... - - // NEW: network error handling - if (isNetworkError(error)) { - Network.markOffline() - SessionStatus.set(input.sessionID, { - type: "network", - message: "Network disconnected" - }) - await Network.waitForOnline(input.abort) - const confirmed = await NetworkResume.ask(input.sessionID, input.abort) - if (confirmed) { - attempt = 0 // reset retry counter - continue - } - // User declined -- stop the session - input.assistantMessage.error = error - Bus.publish(Session.Event.Error, { ... }) - SessionStatus.set(input.sessionID, { type: "idle" }) - break - } - - // ... existing retry logic ... -} -``` - -The `isNetworkError()` helper in `retry.ts` checks for `MessageV2.APIError` with `metadata.isNetwork === true`. - -### Commit 4: Network resume confirmation mechanism - -**New file:** `packages/opencode/src/kilocode/network-resume.ts` - -Follows the same pattern as `Question` (`packages/opencode/src/question/index.ts`): - -```ts -export namespace NetworkResume { - // Bus events - Event.Asked // { id, sessionID, message } - Event.Replied // { id, sessionID, action: "continue" | "cancel" } - - // Creates a pending confirmation and returns a promise - // that resolves to true (continue) or false (cancel). - // In non-interactive contexts (kilo run), auto-resolves to true. - ask(sessionID: string, abort: AbortSignal): Promise - - // Called by the server when the user responds - reply(id: string, action: "continue" | "cancel"): void - - // List pending confirmations (for SSE reconnect recovery) - list(): PendingRequest[] -} -``` - -**New route file:** `packages/opencode/src/server/routes/network-resume.ts` - -Add endpoints: - -- `GET /network-resume` -- list pending network resume requests -- `POST /network-resume/:requestID` -- reply to a network resume request - -**Modified file:** `packages/opencode/src/server/server.ts` -- Register the new route - -**Auto-resume for non-interactive modes:** - -- Check if the session was created with `permission` rules that deny `question` (this is how `kilo run` configures sessions -- see `run.ts:381-396`) -- If so, auto-resolve to `true` after a short delay (e.g., 1 second) -- This avoids blocking headless/pipeline usage - -### Commit 5: TUI integration -- notification and confirmation UI - -**Modified files:** - -1. **`packages/opencode/src/cli/cmd/tui/context/sync.tsx`** - - Subscribe to `NetworkResume.Event.Asked` and `NetworkResume.Event.Replied` SSE events - - Store pending network resume requests in the sync store (similar to `store.question`) - - Subscribe to `Network.Event.Online` / `Network.Event.Offline` for toast notifications - -2. **`packages/opencode/src/cli/cmd/tui/routes/session/index.tsx`** - - Add network resume prompt rendering in the prompt area (priority: permission > question > network-resume > chat input) - - Ring bell when `NetworkResume.Event.Asked` fires - - Show toast "Network disconnected" on offline event - - Show toast "Network restored" on online event (in addition to the confirmation prompt) - -3. **New file: `packages/opencode/src/cli/cmd/tui/routes/session/network-resume.tsx`** - - Inline prompt component (similar to `QuestionPrompt`): - - Message: "Network back online. Do you want to continue?" - - Options: [Continue] [Cancel] - - Keyboard: Enter to confirm, Escape to cancel, left/right to toggle - - Calls `sdk.client` on user response - -4. **`packages/opencode/src/cli/cmd/tui/routes/session/index.tsx`** -- Status area - - When session status is `{ type: "network" }`, show "Network offline -- waiting..." in the status area - -### Commit 6: MCP server reconnection on network restore - -**Modified file:** `packages/opencode/src/mcp/index.ts` - -Subscribe to `Network.Event.Online` in the MCP module's `Instance.state()` initialization: - -- When online event fires, iterate all MCP servers -- For servers with `status === "failed"` that use remote transport (StreamableHTTP or SSE): - - Attempt reconnection with the original config - - Log success/failure - - Publish toast notification for each reconnected server - -This is non-blocking and runs in the background after the network comes back. - -### Commit 7: SDK regeneration + kilo run handling - -**Run:** `./script/generate.ts` to regenerate `packages/sdk/js/` - -The SSE endpoint already uses `Bus.subscribeAll()` (wildcard) so new bus events (`Network.Event.*`, `NetworkResume.Event.*`) will automatically be forwarded to SSE clients. However, we need to: - -- Add the new event types to the SDK's event type union so clients get proper typing -- Update `kilo run` in `packages/opencode/src/cli/cmd/run.ts` to handle `NetworkResume.Event.Asked` events (auto-approve when in `--auto` mode or reject the question permission) - -### Commit 8: Tests - -**New files:** - -- `packages/opencode/test/kilocode/network.test.ts` -- Network monitor unit tests - - Test DNS probe success/failure detection - - Test `waitForOnline()` resolves when probe succeeds - - Test abort signal cancels the wait - - Test bus events are published on transitions - -- `packages/opencode/test/kilocode/network-resume.test.ts` -- NetworkResume confirmation tests - - Test `ask()` creates pending request and resolves on `reply()` - - Test auto-resume for non-interactive sessions - - Test abort signal rejects the promise - - Test `list()` returns pending requests - -- Update existing retry tests if the new network error branch affects them - ---- - -## Open Questions / Tradeoffs - -### 1. DNS probe target - -Using `dns.google` (Google's public DNS) as the probe target. Alternatives: `1.1.1.1` (Cloudflare), `one.one.one.one`. Should we make this configurable, or is a hardcoded well-known target sufficient? - -**Recommendation:** Hardcode `dns.google` -- it's the most reliable public DNS. Can make configurable later if needed. - -### 2. Probe interval - -2-second probe interval while offline. Too aggressive? Too slow? - -**Recommendation:** 2 seconds is a good balance. DNS lookup is ~1-2ms when it succeeds. When offline, it fails fast (typically <100ms). Low overhead either way. - -### 3. VS Code extension handling - -The bus events will be available over SSE for the VS Code extension. Should we implement extension-side handling in this PR or leave it for a follow-up? - -**Recommendation:** Leave for follow-up. The extension communicates with a local `kilo serve` process, so the server-side handling (auto-resume or waiting for extension response) is sufficient initially. - -### 4. Tool execution failures - -When a tool like `websearch` or `webfetch` fails due to network issues, the LLM sees the error and decides what to do next. Should we intercept tool-level network failures too? - -**Recommendation:** Not in this PR. Tool failures are already surfaced to the LLM, which can retry or use alternatives. The network monitor's primary job is handling the LLM call -- the most critical network-dependent operation. - -### 5. Session persistence across restarts - -If the CLI is killed while in "network" status, should it remember and prompt on next launch? - -**Recommendation:** No. The session loop state is in-memory. If the process dies, the user restarts and re-sends their message. Consistent with how other interruptions work. From 106095b31dda4b45753d5482d556936e2fed3e91 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 12:10:48 +0200 Subject: [PATCH 05/58] fix(cli): prompt on all network errors --- packages/opencode/src/session/network.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index a2c2c7e7e85..196dd8271be 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -1,7 +1,6 @@ import { Bus } from "../bus" import { BusEvent } from "../bus/bus-event" import { Identifier } from "../id/id" -import { Config } from "../config/config" import { Instance } from "../project/instance" import { Log } from "../util/log" import { fn } from "../util/fn" @@ -89,10 +88,7 @@ export namespace SessionNetwork { err: z.unknown(), }), async (input) => { - if (!disconnected(input.err)) return false - const cfg = await Config.get() - const list = Object.values(cfg.mcp ?? {}) - return list.some((item) => item && typeof item === "object" && "type" in item && item.type === "remote") + return disconnected(input.err) }, ) From afcc3255223fbd5024474c8c3a1b5a921852556a Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 12:11:33 +0200 Subject: [PATCH 06/58] fix(cli): break loop on reject --- packages/opencode/src/session/processor.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts index 0d91559e893..cdd081a298b 100644 --- a/packages/opencode/src/session/processor.ts +++ b/packages/opencode/src/session/processor.ts @@ -410,6 +410,12 @@ export namespace SessionProcessor { }) if (blocked) { input.assistantMessage.error = error + Bus.publish(Session.Event.Error, { + sessionID: input.assistantMessage.sessionID, + error, + }) + SessionStatus.set(input.sessionID, { type: "idle" }) + break } else { attempt = 0 SessionStatus.set(input.sessionID, { type: "retry", attempt: 1, message: retry, next: Date.now() }) From c383133c15edaa25063fea68b3dd133989d05cad Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 12:12:10 +0200 Subject: [PATCH 07/58] fix(cli): add backoff before headless resume --- packages/opencode/src/cli/cmd/run.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts index 52e666ef7da..9a50efc3219 100644 --- a/packages/opencode/src/cli/cmd/run.ts +++ b/packages/opencode/src/cli/cmd/run.ts @@ -605,6 +605,7 @@ export const RunCommand = cmd({ if (event.type === "session.network.asked") { const request = event.properties if (request.sessionID !== sessionID) continue + await new Promise((r) => setTimeout(r, 5000)) await sdk.network.reply({ requestID: request.id, }) From 6be2726816a7ec1e1ab691a0c3f8b0366d5ca51c Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 12:13:10 +0200 Subject: [PATCH 08/58] fix(cli): move /remote before workspace middleware --- packages/opencode/src/server/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts index 5f9f7ff9238..ffb8c27e886 100644 --- a/packages/opencode/src/server/server.ts +++ b/packages/opencode/src/server/server.ts @@ -145,6 +145,7 @@ export namespace Server { }), ) .route("/global", GlobalRoutes()) + .route("/remote", RemoteRoutes()) // kilocode_change .put( "/auth/:providerID", describeRoute({ @@ -273,7 +274,6 @@ export namespace Server { .route("/network", NetworkRoutes()) .route("/provider", ProviderRoutes()) .route("/telemetry", TelemetryRoutes()) // kilocode_change - .route("/remote", RemoteRoutes()) // kilocode_change .route("/commit-message", CommitMessageRoutes()) // kilocode_change .route("/enhance-prompt", EnhancePromptRoutes()) // kilocode_change .route("/kilocode", KilocodeRoutes()) // kilocode_change From d96c3380627bdb2acf377827f257d35af122fb3c Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 14:31:24 +0200 Subject: [PATCH 09/58] style(vscode): fix prettier formatting in PopupSelector --- .../webview-ui/src/components/shared/PopupSelector.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/kilo-vscode/webview-ui/src/components/shared/PopupSelector.tsx b/packages/kilo-vscode/webview-ui/src/components/shared/PopupSelector.tsx index 207e2f7aaff..27426e39242 100644 --- a/packages/kilo-vscode/webview-ui/src/components/shared/PopupSelector.tsx +++ b/packages/kilo-vscode/webview-ui/src/components/shared/PopupSelector.tsx @@ -22,8 +22,10 @@ import { import { Popover } from "@kilocode/kilo-ui/popover" import type { PopoverProps } from "@kilocode/kilo-ui/popover" -export interface PopupSelectorProps - extends Omit, "style" | "children"> { +export interface PopupSelectorProps extends Omit< + PopoverProps, + "style" | "children" +> { /** Whether the selector is in expanded mode (wider + taller). */ expanded: boolean /** Preferred width when collapsed. Default: 250 */ From 4fc67f11e03622979f83e3eae0957a3088d5642b Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 15:26:58 +0200 Subject: [PATCH 10/58] fix(cli): remove dead ECONNRESET case and deduplicate error mapping The new network error case block already handles all 6 error codes including ECONNRESET, making the original ECONNRESET-only case dead code. Replace the inline ternary chain with SessionNetwork.message() and SessionNetwork.disconnected() to establish a single source of truth. --- packages/opencode/src/session/message-v2.ts | 31 ++------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts index b518de036c5..82f14eba5d2 100644 --- a/packages/opencode/src/session/message-v2.ts +++ b/packages/opencode/src/session/message-v2.ts @@ -15,6 +15,7 @@ import { ProviderError } from "@/provider/error" import { iife } from "@/util/iife" import { type SystemError } from "bun" import type { Provider } from "@/provider/provider" +import { SessionNetwork } from "./network" // kilocode_change export namespace MessageV2 { export function isMedia(mime: string) { @@ -853,36 +854,10 @@ export namespace MessageV2 { }, { cause: e }, ).toObject() - case ["ECONNRESET", "ECONNREFUSED", "ENOTFOUND", "EAI_AGAIN", "ETIMEDOUT", "ENETUNREACH"].includes( - ((e as SystemError)?.code ?? "") as string, - ): + case SessionNetwork.disconnected(e): // kilocode_change return new MessageV2.APIError( { - message: - (e as SystemError).code === "ECONNRESET" - ? "Connection reset by server" - : (e as SystemError).code === "ECONNREFUSED" - ? "Connection refused" - : (e as SystemError).code === "ENOTFOUND" - ? "Host not found" - : (e as SystemError).code === "EAI_AGAIN" - ? "DNS lookup failed" - : (e as SystemError).code === "ETIMEDOUT" - ? "Connection timed out" - : "Network is unreachable", - isRetryable: true, - metadata: { - code: (e as SystemError).code ?? "", - syscall: (e as SystemError).syscall ?? "", - message: (e as SystemError).message ?? "", - }, - }, - { cause: e }, - ).toObject() - case (e as SystemError)?.code === "ECONNRESET": - return new MessageV2.APIError( - { - message: "Connection reset by server", + message: SessionNetwork.message(e), isRetryable: true, metadata: { code: (e as SystemError).code ?? "", From 33a63b216698a9640834be95850a7967447d6437 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 15:27:06 +0200 Subject: [PATCH 11/58] fix(cli): re-throw non-RejectedError and remove else block in processor The catch handler on the network wait promise was silently swallowing all non-RejectedError exceptions (e.g. AbortError). Now only RejectedError sets the blocked flag; all other errors propagate. Also removes the unnecessary else block after break per style guide. --- packages/opencode/src/session/processor.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts index cdd081a298b..fea7dd2c37c 100644 --- a/packages/opencode/src/session/processor.ts +++ b/packages/opencode/src/session/processor.ts @@ -389,7 +389,7 @@ export namespace SessionProcessor { } else { const retry = SessionRetry.retryable(error) if (retry !== undefined) { - if (await SessionNetwork.shouldPrompt({ err: e })) { + if (SessionNetwork.disconnected(e)) { const msg = SessionNetwork.message(e) const wait = SessionNetwork.ask({ sessionID: input.sessionID, @@ -406,7 +406,11 @@ export namespace SessionProcessor { }) } await wait.catch((err) => { - if (err instanceof SessionNetwork.RejectedError) blocked = true + if (err instanceof SessionNetwork.RejectedError) { + blocked = true + return + } + throw err }) if (blocked) { input.assistantMessage.error = error @@ -416,11 +420,10 @@ export namespace SessionProcessor { }) SessionStatus.set(input.sessionID, { type: "idle" }) break - } else { - attempt = 0 - SessionStatus.set(input.sessionID, { type: "retry", attempt: 1, message: retry, next: Date.now() }) - continue } + attempt = 0 + SessionStatus.set(input.sessionID, { type: "retry", attempt: 1, message: retry, next: Date.now() }) + continue } attempt++ const delay = SessionRetry.delay(attempt, error.name === "APIError" ? error : undefined) From be8a5c853fe91db491e8e03dce73a5add081db49 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 15:27:12 +0200 Subject: [PATCH 12/58] fix(cli): add retry limit and backoff for network prompts in kilo run The headless kilo run mode auto-replied to network prompts after a fixed 5s delay with no limit, creating an infinite retry loop if the network was actually down. Now limits to 3 retries with exponential backoff and rejects after the limit is reached. --- packages/opencode/src/cli/cmd/run.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts index 9a50efc3219..b95558bc2b0 100644 --- a/packages/opencode/src/cli/cmd/run.ts +++ b/packages/opencode/src/cli/cmd/run.ts @@ -478,6 +478,8 @@ export const RunCommand = cmd({ async function loop() { const toggles = new Map() + const MAX_RETRIES = 3 // kilocode_change + let retries = 0 // kilocode_change for await (const event of events.stream) { if ( @@ -605,7 +607,17 @@ export const RunCommand = cmd({ if (event.type === "session.network.asked") { const request = event.properties if (request.sessionID !== sessionID) continue - await new Promise((r) => setTimeout(r, 5000)) + retries++ + if (retries > MAX_RETRIES) { + UI.println( + UI.Style.TEXT_WARNING_BOLD + "!", + UI.Style.TEXT_NORMAL + `network retry limit reached (${MAX_RETRIES}); rejecting`, + ) + await sdk.network.reject({ requestID: request.id }) + continue + } + const delay = Math.min(5000 * Math.pow(2, retries - 1), 60000) + await new Promise((r) => setTimeout(r, delay)) await sdk.network.reply({ requestID: request.id, }) From 2fcb24d8cebdf402d0709b9a5017cc68e99f027d Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 15:27:20 +0200 Subject: [PATCH 13/58] fix(cli): log MCP reconnect errors and remove shouldPrompt wrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Log reconnect failures instead of silently swallowing them. Also remove the shouldPrompt async wrapper that unnecessarily wrapped the sync disconnected() check — callers now use disconnected() directly. --- packages/opencode/src/session/network.ts | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index 196dd8271be..7d235fa8775 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -83,15 +83,6 @@ export namespace SessionNetwork { return "Network connection failed" } - export const shouldPrompt = fn( - z.object({ - err: z.unknown(), - }), - async (input) => { - return disconnected(input.err) - }, - ) - export async function ask(input: { sessionID: string; message: string; abort: AbortSignal }) { const s = await state() const id = Identifier.ascending("question") @@ -137,7 +128,9 @@ export namespace SessionNetwork { return } delete s.pending[input.requestID] - await MCP.reconnectRemote().catch(() => {}) + await MCP.reconnectRemote().catch((err) => { + log.error("remote reconnect failed", { err }) + }) Bus.publish(Event.Replied, { sessionID: req.info.sessionID, requestID: req.info.id, From 86f19e9cbdd04d448d313de434b0dde861379fb3 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 15:27:27 +0200 Subject: [PATCH 14/58] fix(ui): reset lastScrollTop when scroll element changes When scrollRef receives a new element, the stale lastScrollTop from the previous element could incorrectly trigger the stop() handler. Reset it to undefined so the comparison starts fresh. --- packages/kilo-ui/src/hooks/create-auto-scroll.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/kilo-ui/src/hooks/create-auto-scroll.tsx b/packages/kilo-ui/src/hooks/create-auto-scroll.tsx index 6ea1f5d8ad0..81fa4874be0 100644 --- a/packages/kilo-ui/src/hooks/create-auto-scroll.tsx +++ b/packages/kilo-ui/src/hooks/create-auto-scroll.tsx @@ -201,6 +201,7 @@ export function createAutoScroll(options: AutoScrollOptions) { cleanup = undefined } + lastScrollTop = undefined scroll = el if (!el) return From f5373f398ffc5b03fe36ff689535ec161ba07adc Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 15:27:33 +0200 Subject: [PATCH 15/58] fix(cli): use Promise.allSettled in reconnectRemote Promise.all rejects early if any single MCP reconnect fails, preventing other remote MCPs from being reconnected. Promise.allSettled ensures all MCPs get a reconnect attempt regardless of individual failures. --- packages/opencode/src/mcp/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts index 46cb595ee11..9bfb9e2a68c 100644 --- a/packages/opencode/src/mcp/index.ts +++ b/packages/opencode/src/mcp/index.ts @@ -67,7 +67,7 @@ export namespace MCP { const cfg = await Config.get() const list = Object.entries(cfg.mcp ?? {}) const s = await state() - await Promise.all( + await Promise.allSettled( list.map(async ([key, mcp]) => { if (!isMcpConfigured(mcp)) return if (mcp.type !== "remote") return From a54777be75507e827abda0640adff177af7ec256 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 15:27:39 +0200 Subject: [PATCH 16/58] fix(cli): clean up network store entries when evicting session The evict() function cleaned up message, part, session_diff, session_status, and todo entries but missed network entries. --- packages/opencode/src/cli/cmd/tui/context/sync.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx index 15c0e0efdc3..34e9ad7005b 100644 --- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx @@ -134,6 +134,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ delete draft.session_diff[sessionID] delete draft.session_status[sessionID] delete draft.todo[sessionID] + delete draft.network[sessionID] }), ) fullSyncedSessions.delete(sessionID) From 2c34153799d33cffc30803c8e221e68383d810e9 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 15:27:44 +0200 Subject: [PATCH 17/58] fix(cli): handle promise rejections in TUI network reply/reject The SDK calls returned promises that were neither awaited nor caught, risking unhandled promise rejections. --- packages/opencode/src/cli/cmd/tui/routes/session/network.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx index a2f13781822..04444e6332c 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx @@ -14,11 +14,11 @@ export function NetworkPrompt(props: { request: SessionNetworkWait }) { const dialog = useDialog() function reply() { - sdk.client.network.reply({ requestID: props.request.id }) + void sdk.client.network.reply({ requestID: props.request.id }).catch(() => {}) } function reject() { - sdk.client.network.reject({ requestID: props.request.id }) + void sdk.client.network.reject({ requestID: props.request.id }).catch(() => {}) } useKeyboard((evt) => { From 184ae09b72293a694179613bd31feacb61bf9564 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 15:27:50 +0200 Subject: [PATCH 18/58] fix(cli): validate model.json with Zod schema in plan-followup Replace unsafe JSON.parse() as type assertion with Zod safeParse for the model state file. Parsing now fails gracefully instead of producing runtime errors from invalid data. --- packages/opencode/src/kilocode/plan-followup.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/opencode/src/kilocode/plan-followup.ts b/packages/opencode/src/kilocode/plan-followup.ts index caf2df67db3..962dea1cca2 100644 --- a/packages/opencode/src/kilocode/plan-followup.ts +++ b/packages/opencode/src/kilocode/plan-followup.ts @@ -13,6 +13,7 @@ import { MessageV2 } from "@/session/message-v2" import { Todo } from "@/session/todo" import { Log } from "@/util/log" import path from "path" +import z from "zod" function toText(item: MessageV2.WithParts): string { return item.parts @@ -120,18 +121,20 @@ export namespace PlanFollowup { return value } + const ModelState = z + .object({ + model: z.record(z.string(), z.object({ providerID: z.string(), modelID: z.string() })).optional(), + variant: z.record(z.string(), z.string().optional()).optional(), + }) + .passthrough() + async function resolveCodeModel(input: Pick) { const state = Flag.KILO_CLIENT === "cli" ? await Bun.file(path.join(Global.Path.state, "model.json")) .text() - .then( - (raw) => - JSON.parse(raw) as { - model?: Record - variant?: Record - }, - ) + .then((raw) => ModelState.safeParse(JSON.parse(raw))) + .then((r) => (r.success ? r.data : undefined)) .catch(() => undefined) : undefined const saved = state?.model?.code From 3120a941cbaa6e230272d36a029e80294a282f7d Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 16:00:15 +0200 Subject: [PATCH 19/58] fix(cli): mark failed mcp on reconnect error --- packages/opencode/src/mcp/index.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts index 9bfb9e2a68c..9bcaeccaf3b 100644 --- a/packages/opencode/src/mcp/index.ts +++ b/packages/opencode/src/mcp/index.ts @@ -71,7 +71,17 @@ export namespace MCP { list.map(async ([key, mcp]) => { if (!isMcpConfigured(mcp)) return if (mcp.type !== "remote") return - const result = await create(key, mcp) + const result = await create(key, mcp).catch((err) => { + log.error("remote reconnect failed", { name: key, err }) + s.status[key] = { status: "failed", error: err instanceof Error ? err.message : String(err) } + const stale = s.clients[key] + if (stale) { + stale.close().catch((e) => log.error("failed to close stale client", { name: key, e })) + delete s.clients[key] + } + return undefined + }) + if (!result) return s.status[key] = result.status if (result.mcpClient) { const existing = s.clients[key] From f7be6789ee8f0fb3cff60b186eeb4d82753b55f9 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 16:00:58 +0200 Subject: [PATCH 20/58] fix(cli): reset retry counter on success --- packages/opencode/src/cli/cmd/run.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts index b95558bc2b0..267082d066a 100644 --- a/packages/opencode/src/cli/cmd/run.ts +++ b/packages/opencode/src/cli/cmd/run.ts @@ -621,6 +621,7 @@ export const RunCommand = cmd({ await sdk.network.reply({ requestID: request.id, }) + retries = 0 } } } From ef0a45ce490dc2e8c1b05ea5111425709dc509e3 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 26 Mar 2026 16:01:23 +0200 Subject: [PATCH 21/58] fix(cli): publish rejected event on abort --- packages/opencode/src/session/network.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index 7d235fa8775..2b1898897dc 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -98,6 +98,10 @@ export namespace SessionNetwork { return new Promise((resolve, reject) => { const onAbort = () => { delete s.pending[id] + Bus.publish(Event.Rejected, { + sessionID: input.sessionID, + requestID: id, + }) reject(new DOMException("Aborted", "AbortError")) } s.pending[id] = { From b0ea7da026f9a73b74121c5b3c9aabf4c0351a6b Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Fri, 3 Apr 2026 22:24:53 +0300 Subject: [PATCH 22/58] fix(cli): reset retry on busy --- packages/opencode/src/cli/cmd/run.ts | 9 +- .../opencode/test/cli/run-network.test.ts | 223 ++++++++++++++++++ 2 files changed, 231 insertions(+), 1 deletion(-) create mode 100644 packages/opencode/test/cli/run-network.test.ts diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts index 267082d066a..ad66bb76292 100644 --- a/packages/opencode/src/cli/cmd/run.ts +++ b/packages/opencode/src/cli/cmd/run.ts @@ -570,6 +570,14 @@ export const RunCommand = cmd({ UI.error(err) } + if ( + event.type === "session.status" && + event.properties.sessionID === sessionID && + event.properties.status.type === "busy" + ) { + retries = 0 + } + if ( event.type === "session.status" && event.properties.sessionID === sessionID && @@ -621,7 +629,6 @@ export const RunCommand = cmd({ await sdk.network.reply({ requestID: request.id, }) - retries = 0 } } } diff --git a/packages/opencode/test/cli/run-network.test.ts b/packages/opencode/test/cli/run-network.test.ts new file mode 100644 index 00000000000..288c9ee859f --- /dev/null +++ b/packages/opencode/test/cli/run-network.test.ts @@ -0,0 +1,223 @@ +import { afterEach, describe, expect, mock, test } from "bun:test" + +type Event = { + type: string + properties: Record +} + +function feed() { + const list: T[] = [] + const wait: Array<() => void> = [] + const state = { done: false } + + return { + push(item: T) { + list.push(item) + while (wait.length) wait.shift()?.() + }, + end() { + state.done = true + while (wait.length) wait.shift()?.() + }, + async *stream() { + while (!state.done || list.length) { + if (list.length) { + yield list.shift() as T + continue + } + await new Promise((resolve) => wait.push(resolve)) + } + }, + } +} + +function asked(id: number): Event { + return { + type: "session.network.asked", + properties: { + sessionID: "ses_test", + id: `req_${id}`, + message: "Connection refused", + time: { created: 0 }, + }, + } +} + +function busy(): Event { + return { + type: "session.status", + properties: { + sessionID: "ses_test", + status: { type: "busy" }, + }, + } +} + +function idle(): Event { + return { + type: "session.status", + properties: { + sessionID: "ses_test", + status: { type: "idle" }, + }, + } +} + +function args() { + return { + _: [], + $0: "kilo", + message: ["hi"], + command: undefined, + continue: false, + session: "ses_test", + fork: false, + "cloud-fork": false, + cloudFork: false, + share: false, + model: undefined, + agent: undefined, + format: "default", + file: undefined, + title: undefined, + attach: "http://127.0.0.1:4096", + password: undefined, + dir: undefined, + port: undefined, + variant: undefined, + thinking: false, + auto: false, + "--": [], + } +} + +const timer = globalThis.setTimeout +const tty = Object.getOwnPropertyDescriptor(process.stdin, "isTTY") + +afterEach(() => { + globalThis.setTimeout = timer + if (tty) { + Object.defineProperty(process.stdin, "isTTY", tty) + return + } + delete (process.stdin as { isTTY?: boolean }).isTTY +}) + +function instant() { + globalThis.setTimeout = ((cb: TimerHandler) => { + if (typeof cb === "function") { + queueMicrotask(() => cb()) + } + return 0 as unknown as ReturnType + }) as unknown as typeof setTimeout +} + +async function run(sdk: Record) { + mock.module("@kilocode/sdk/v2", () => ({ + createKiloClient: () => sdk, + })) + + Object.defineProperty(process.stdin, "isTTY", { + configurable: true, + value: true, + }) + + const key = JSON.stringify({ time: Date.now(), rand: Math.random() }) + const { RunCommand } = await import(`../../src/cli/cmd/run?${key}`) + return RunCommand.handler(args() as never) +} + +describe("cli run network retries", () => { + test("rejects after repeated offline resumes without busy", async () => { + instant() + const q = feed() + const calls: string[] = [] + const gate = Promise.withResolvers() + const state = { reject: undefined as string | undefined } + + const sdk = { + config: { + get: async () => ({ data: { share: "manual" } }), + }, + event: { + subscribe: async () => ({ stream: q.stream() }), + }, + network: { + reply: async (input: { requestID: string }) => { + calls.push(input.requestID) + q.push(asked(calls.length + 1)) + }, + reject: async (input: { requestID: string }) => { + state.reject = input.requestID + q.push(idle()) + q.end() + gate.resolve() + }, + }, + session: { + prompt: async () => { + q.push(asked(1)) + await gate.promise + return { data: undefined } + }, + }, + } + + await run(sdk) + + expect(calls).toStrictEqual(["req_1", "req_2", "req_3"]) + expect(state.reject).toBe("req_4") + }) + + test("resets retry budget only after the session is busy again", async () => { + instant() + const q = feed() + const calls: string[] = [] + const gate = Promise.withResolvers() + const state = { reject: undefined as string | undefined } + + const sdk = { + config: { + get: async () => ({ data: { share: "manual" } }), + }, + event: { + subscribe: async () => ({ stream: q.stream() }), + }, + network: { + reply: async (input: { requestID: string }) => { + calls.push(input.requestID) + if (calls.length === 1) { + q.push(busy()) + q.push(asked(2)) + return + } + if (calls.length < 4) { + q.push(asked(calls.length + 1)) + return + } + q.push(idle()) + q.end() + gate.resolve() + }, + reject: async (input: { requestID: string }) => { + state.reject = input.requestID + q.push(idle()) + q.end() + gate.resolve() + }, + }, + session: { + prompt: async () => { + q.push(asked(1)) + await gate.promise + return { data: undefined } + }, + }, + } + + await run(sdk) + + expect(calls).toStrictEqual(["req_1", "req_2", "req_3", "req_4"]) + expect(state.reject).toBeUndefined() + }) +}) From c56532575249ef0e84382698dec85489cb9326be Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Fri, 3 Apr 2026 22:26:30 +0300 Subject: [PATCH 23/58] fix(cli): skip asked after abort --- packages/opencode/src/session/network.ts | 6 ++++ .../opencode/test/session/network.test.ts | 31 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index 2b1898897dc..db51a41520f 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -97,6 +97,8 @@ export namespace SessionNetwork { return new Promise((resolve, reject) => { const onAbort = () => { + if (!s.pending[id]) return + input.abort.removeEventListener("abort", onAbort) delete s.pending[id] Bus.publish(Event.Rejected, { sessionID: input.sessionID, @@ -116,6 +118,10 @@ export namespace SessionNetwork { }, } input.abort.addEventListener("abort", onAbort, { once: true }) + if (input.abort.aborted) { + onAbort() + return + } Bus.publish(Event.Asked, info) }) } diff --git a/packages/opencode/test/session/network.test.ts b/packages/opencode/test/session/network.test.ts index e37e77cbebd..da16868dc49 100644 --- a/packages/opencode/test/session/network.test.ts +++ b/packages/opencode/test/session/network.test.ts @@ -1,4 +1,5 @@ import { describe, expect, test } from "bun:test" +import { Bus } from "../../src/bus" import { Instance } from "../../src/project/instance" import { tmpdir } from "../fixture/fixture" import { SessionNetwork } from "../../src/session/network" @@ -48,4 +49,34 @@ describe("session.network", () => { }, }) }) + + test("aborted signal rejects without publishing asked", async () => { + await using tmp = await tmpdir({ git: true }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const abort = new AbortController() + const seen: string[] = [] + const offAsked = Bus.subscribe(SessionNetwork.Event.Asked, () => seen.push("asked")) + const offRejected = Bus.subscribe(SessionNetwork.Event.Rejected, () => seen.push("rejected")) + abort.abort() + + try { + const err = await SessionNetwork.ask({ + sessionID: "ses_test", + message: "Connection timed out", + abort: abort.signal, + }).catch((err) => err) + + expect(err).toBeInstanceOf(DOMException) + expect(err.name).toBe("AbortError") + expect(await SessionNetwork.list()).toHaveLength(0) + expect(seen).toStrictEqual(["rejected"]) + } finally { + offAsked() + offRejected() + } + }, + }) + }) }) From 8e30cc12a58991405c165fbca0aba3c82f2a1282 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Sat, 4 Apr 2026 00:09:03 +0300 Subject: [PATCH 24/58] fix(cli): catch abort during offline network wait in processor --- packages/opencode/src/session/processor.ts | 12 +++++++++ .../opencode/test/session/network.test.ts | 27 +++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts index 4f30f20643a..fb94c4705cd 100644 --- a/packages/opencode/src/session/processor.ts +++ b/packages/opencode/src/session/processor.ts @@ -430,13 +430,25 @@ export namespace SessionProcessor { message: match.message, }) } + let aborted = false await wait.catch((err) => { if (err instanceof SessionNetwork.RejectedError) { blocked = true return } + if (err instanceof DOMException && err.name === "AbortError") { + aborted = true + return + } throw err }) + if (aborted) { + input.assistantMessage.error = MessageV2.fromError(new DOMException("Aborted", "AbortError"), { + providerID: input.model.providerID, + }) + SessionStatus.set(input.sessionID, { type: "idle" }) + break + } if (blocked) { input.assistantMessage.error = error Bus.publish(Session.Event.Error, { diff --git a/packages/opencode/test/session/network.test.ts b/packages/opencode/test/session/network.test.ts index da16868dc49..37d864dd6d6 100644 --- a/packages/opencode/test/session/network.test.ts +++ b/packages/opencode/test/session/network.test.ts @@ -79,4 +79,31 @@ describe("session.network", () => { }, }) }) + + test("abort during pending ask rejects with AbortError and cleans up", async () => { + await using tmp = await tmpdir({ git: true }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const abort = new AbortController() + const pending = SessionNetwork.ask({ + sessionID: "ses_test", + message: "Connection refused", + abort: abort.signal, + }) + // wait for the ask to register + const list = await SessionNetwork.list() + expect(list).toHaveLength(1) + + // abort while waiting + abort.abort() + const err = await pending.catch((e: unknown) => e) + expect(err).toBeInstanceOf(DOMException) + expect((err as DOMException).name).toBe("AbortError") + + // pending entry should be cleaned up + expect(await SessionNetwork.list()).toHaveLength(0) + }, + }) + }) }) From 0b423a35e6fcc9ef027915872d2a2a9f4c9cd300 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Sat, 4 Apr 2026 00:12:46 +0300 Subject: [PATCH 25/58] feat(cli): detect network restoration and notify user to resume Add background DNS probe that polls every 3s after a network wait is created. When connectivity returns, publish a session.network.restored event and update the TUI prompt from 'waiting' to 'reconnected' state with clear resume/stop instructions. Also regenerate openapi.json from raw server output (without Prettier on JSON) to eliminate ~2000 lines of formatting noise in the SDK diff. --- .../opencode/src/cli/cmd/tui/context/sync.tsx | 10 + .../cli/cmd/tui/routes/session/network.tsx | 21 +- packages/opencode/src/session/network.ts | 48 + packages/sdk/js/src/v2/gen/client.gen.ts | 4 +- .../sdk/js/src/v2/gen/client/client.gen.ts | 10 +- packages/sdk/js/src/v2/gen/client/index.ts | 20 +- .../sdk/js/src/v2/gen/client/types.gen.ts | 8 +- .../sdk/js/src/v2/gen/client/utils.gen.ts | 12 +- .../js/src/v2/gen/core/bodySerializer.gen.ts | 2 +- .../src/v2/gen/core/serverSentEvents.gen.ts | 2 +- packages/sdk/js/src/v2/gen/core/types.gen.ts | 4 +- packages/sdk/js/src/v2/gen/core/utils.gen.ts | 4 +- packages/sdk/js/src/v2/gen/sdk.gen.ts | 146 +- packages/sdk/js/src/v2/gen/types.gen.ts | 349 +- packages/sdk/openapi.json | 2916 ++++++++++++----- 15 files changed, 2460 insertions(+), 1096 deletions(-) diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx index 34e9ad7005b..93e2bc29cc2 100644 --- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx @@ -246,6 +246,16 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ break } + case "session.network.restored": { + const requests = store.network[event.properties.sessionID] + if (!requests) break + const match = Binary.search(requests, event.properties.requestID, (r) => r.id) + if (match.found) { + setStore("network", event.properties.sessionID, match.index, "restored", true) + } + break + } + case "session.network.asked": { const request = event.properties const requests = store.network[request.sessionID] diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx index 04444e6332c..12a203b2049 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx @@ -1,4 +1,5 @@ /** @jsxImportSource @opentui/solid */ +import { Show } from "solid-js" import { useKeyboard } from "@opentui/solid" import { useTheme } from "../../context/theme" import { SplitBorder } from "../../component/border" @@ -42,10 +43,22 @@ export function NetworkPrompt(props: { request: SessionNetworkWait }) { customBorderChars={SplitBorder.customBorderChars} > - Network reconnect required - {props.request.message} - Reconnect the network-dependent service, then press Enter to resume. - Press Esc to stop this turn. + + Network disconnected + {props.request.message} + Waiting for network... + Press Esc to stop this turn. + + } + > + Network reconnected + Connection restored. + Press Enter to resume this turn. + Press Esc to stop. + ) diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index db51a41520f..3f159e985e1 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -10,12 +10,14 @@ import z from "zod" export namespace SessionNetwork { const log = Log.create({ service: "session.network" }) const codes = new Set(["ECONNRESET", "ECONNREFUSED", "ENOTFOUND", "EAI_AGAIN", "ETIMEDOUT", "ENETUNREACH"]) + const POLL_MS = 3_000 export const Wait = z .object({ id: Identifier.schema("question"), sessionID: Identifier.schema("session"), message: z.string(), + restored: z.boolean(), time: z.object({ created: z.number(), }), @@ -41,6 +43,13 @@ export namespace SessionNetwork { requestID: z.string(), }), ), + Restored: BusEvent.define( + "session.network.restored", + z.object({ + sessionID: z.string(), + requestID: z.string(), + }), + ), } const state = Instance.state(async () => { @@ -83,6 +92,25 @@ export namespace SessionNetwork { return "Network connection failed" } + async function probe() { + const info = await Bun.dns.lookup("dns.google") + return info.length > 0 + } + + async function watch(input: { requestID: string; abort: AbortSignal }) { + while (!input.abort.aborted) { + await Bun.sleep(POLL_MS) + if (input.abort.aborted) return + const s = await state() + const req = s.pending[input.requestID] + if (!req || req.info.restored) return + const ok = await probe().catch(() => false) + if (!ok) continue + await restore({ requestID: input.requestID }) + return + } + } + export async function ask(input: { sessionID: string; message: string; abort: AbortSignal }) { const s = await state() const id = Identifier.ascending("question") @@ -90,6 +118,7 @@ export namespace SessionNetwork { id, sessionID: input.sessionID, message: input.message, + restored: false, time: { created: Date.now(), }, @@ -123,9 +152,28 @@ export namespace SessionNetwork { return } Bus.publish(Event.Asked, info) + void watch({ requestID: id, abort: input.abort }).catch((err) => { + log.error("restore watch failed", { err, requestID: id }) + }) }) } + export const restore = fn( + z.object({ + requestID: z.string(), + }), + async (input) => { + const s = await state() + const req = s.pending[input.requestID] + if (!req || req.info.restored) return + req.info.restored = true + Bus.publish(Event.Restored, { + sessionID: req.info.sessionID, + requestID: req.info.id, + }) + }, + ) + export const reply = fn( z.object({ requestID: z.string(), diff --git a/packages/sdk/js/src/v2/gen/client.gen.ts b/packages/sdk/js/src/v2/gen/client.gen.ts index 0c110eca39b..50dd74c8748 100644 --- a/packages/sdk/js/src/v2/gen/client.gen.ts +++ b/packages/sdk/js/src/v2/gen/client.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from "./client/index.js" -import type { ClientOptions as ClientOptions2 } from "./types.gen.js" +import { type ClientOptions, type Config, createClient, createConfig } from "./client" +import type { ClientOptions as ClientOptions2 } from "./types.gen" /** * The `createClientConfig()` function will be called on client initialization diff --git a/packages/sdk/js/src/v2/gen/client/client.gen.ts b/packages/sdk/js/src/v2/gen/client/client.gen.ts index 627e98ec420..30237375a7b 100644 --- a/packages/sdk/js/src/v2/gen/client/client.gen.ts +++ b/packages/sdk/js/src/v2/gen/client/client.gen.ts @@ -1,9 +1,9 @@ // This file is auto-generated by @hey-api/openapi-ts -import { createSseClient } from "../core/serverSentEvents.gen.js" -import type { HttpMethod } from "../core/types.gen.js" -import { getValidRequestBody } from "../core/utils.gen.js" -import type { Client, Config, RequestOptions, ResolvedRequestOptions } from "./types.gen.js" +import { createSseClient } from "../core/serverSentEvents.gen" +import type { HttpMethod } from "../core/types.gen" +import { getValidRequestBody } from "../core/utils.gen" +import type { Client, Config, RequestOptions, ResolvedRequestOptions } from "./types.gen" import { buildUrl, createConfig, @@ -12,7 +12,7 @@ import { mergeConfigs, mergeHeaders, setAuthParams, -} from "./utils.gen.js" +} from "./utils.gen" type ReqInit = Omit & { body?: any diff --git a/packages/sdk/js/src/v2/gen/client/index.ts b/packages/sdk/js/src/v2/gen/client/index.ts index 0af63f3300e..25f42e04def 100644 --- a/packages/sdk/js/src/v2/gen/client/index.ts +++ b/packages/sdk/js/src/v2/gen/client/index.ts @@ -1,15 +1,11 @@ // This file is auto-generated by @hey-api/openapi-ts -export type { Auth } from "../core/auth.gen.js" -export type { QuerySerializerOptions } from "../core/bodySerializer.gen.js" -export { - formDataBodySerializer, - jsonBodySerializer, - urlSearchParamsBodySerializer, -} from "../core/bodySerializer.gen.js" -export { buildClientParams } from "../core/params.gen.js" -export { serializeQueryKeyValue } from "../core/queryKeySerializer.gen.js" -export { createClient } from "./client.gen.js" +export type { Auth } from "../core/auth.gen" +export type { QuerySerializerOptions } from "../core/bodySerializer.gen" +export { formDataBodySerializer, jsonBodySerializer, urlSearchParamsBodySerializer } from "../core/bodySerializer.gen" +export { buildClientParams } from "../core/params.gen" +export { serializeQueryKeyValue } from "../core/queryKeySerializer.gen" +export { createClient } from "./client.gen" export type { Client, ClientOptions, @@ -21,5 +17,5 @@ export type { ResolvedRequestOptions, ResponseStyle, TDataShape, -} from "./types.gen.js" -export { createConfig, mergeHeaders } from "./utils.gen.js" +} from "./types.gen" +export { createConfig, mergeHeaders } from "./utils.gen" diff --git a/packages/sdk/js/src/v2/gen/client/types.gen.ts b/packages/sdk/js/src/v2/gen/client/types.gen.ts index e053aa40662..90a6ad284cc 100644 --- a/packages/sdk/js/src/v2/gen/client/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/client/types.gen.ts @@ -1,9 +1,9 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Auth } from "../core/auth.gen.js" -import type { ServerSentEventsOptions, ServerSentEventsResult } from "../core/serverSentEvents.gen.js" -import type { Client as CoreClient, Config as CoreConfig } from "../core/types.gen.js" -import type { Middleware } from "./utils.gen.js" +import type { Auth } from "../core/auth.gen" +import type { ServerSentEventsOptions, ServerSentEventsResult } from "../core/serverSentEvents.gen" +import type { Client as CoreClient, Config as CoreConfig } from "../core/types.gen" +import type { Middleware } from "./utils.gen" export type ResponseStyle = "data" | "fields" diff --git a/packages/sdk/js/src/v2/gen/client/utils.gen.ts b/packages/sdk/js/src/v2/gen/client/utils.gen.ts index 3b1dfb78718..65007692a5d 100644 --- a/packages/sdk/js/src/v2/gen/client/utils.gen.ts +++ b/packages/sdk/js/src/v2/gen/client/utils.gen.ts @@ -1,11 +1,11 @@ // This file is auto-generated by @hey-api/openapi-ts -import { getAuthToken } from "../core/auth.gen.js" -import type { QuerySerializerOptions } from "../core/bodySerializer.gen.js" -import { jsonBodySerializer } from "../core/bodySerializer.gen.js" -import { serializeArrayParam, serializeObjectParam, serializePrimitiveParam } from "../core/pathSerializer.gen.js" -import { getUrl } from "../core/utils.gen.js" -import type { Client, ClientOptions, Config, RequestOptions } from "./types.gen.js" +import { getAuthToken } from "../core/auth.gen" +import type { QuerySerializerOptions } from "../core/bodySerializer.gen" +import { jsonBodySerializer } from "../core/bodySerializer.gen" +import { serializeArrayParam, serializeObjectParam, serializePrimitiveParam } from "../core/pathSerializer.gen" +import { getUrl } from "../core/utils.gen" +import type { Client, ClientOptions, Config, RequestOptions } from "./types.gen" export const createQuerySerializer = ({ parameters = {}, ...args }: QuerySerializerOptions = {}) => { const querySerializer = (queryParams: T) => { diff --git a/packages/sdk/js/src/v2/gen/core/bodySerializer.gen.ts b/packages/sdk/js/src/v2/gen/core/bodySerializer.gen.ts index 9678fb08ec6..24808ed15c2 100644 --- a/packages/sdk/js/src/v2/gen/core/bodySerializer.gen.ts +++ b/packages/sdk/js/src/v2/gen/core/bodySerializer.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { ArrayStyle, ObjectStyle, SerializerOptions } from "./pathSerializer.gen.js" +import type { ArrayStyle, ObjectStyle, SerializerOptions } from "./pathSerializer.gen" export type QuerySerializer = (query: Record) => string diff --git a/packages/sdk/js/src/v2/gen/core/serverSentEvents.gen.ts b/packages/sdk/js/src/v2/gen/core/serverSentEvents.gen.ts index 056a8125932..6b389c18562 100644 --- a/packages/sdk/js/src/v2/gen/core/serverSentEvents.gen.ts +++ b/packages/sdk/js/src/v2/gen/core/serverSentEvents.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Config } from "./types.gen.js" +import type { Config } from "./types.gen" export type ServerSentEventsOptions = Omit & Pick & { diff --git a/packages/sdk/js/src/v2/gen/core/types.gen.ts b/packages/sdk/js/src/v2/gen/core/types.gen.ts index bfa77b8acd2..624ba56a98b 100644 --- a/packages/sdk/js/src/v2/gen/core/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/core/types.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Auth, AuthToken } from "./auth.gen.js" -import type { BodySerializer, QuerySerializer, QuerySerializerOptions } from "./bodySerializer.gen.js" +import type { Auth, AuthToken } from "./auth.gen" +import type { BodySerializer, QuerySerializer, QuerySerializerOptions } from "./bodySerializer.gen" export type HttpMethod = "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace" diff --git a/packages/sdk/js/src/v2/gen/core/utils.gen.ts b/packages/sdk/js/src/v2/gen/core/utils.gen.ts index 8a45f72698a..2d9ab7b05ee 100644 --- a/packages/sdk/js/src/v2/gen/core/utils.gen.ts +++ b/packages/sdk/js/src/v2/gen/core/utils.gen.ts @@ -1,12 +1,12 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { BodySerializer, QuerySerializer } from "./bodySerializer.gen.js" +import type { BodySerializer, QuerySerializer } from "./bodySerializer.gen" import { type ArraySeparatorStyle, serializeArrayParam, serializeObjectParam, serializePrimitiveParam, -} from "./pathSerializer.gen.js" +} from "./pathSerializer.gen" export interface PathSerializer { path: Record diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts index 8355c127532..d53c8693869 100644 --- a/packages/sdk/js/src/v2/gen/sdk.gen.ts +++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts -import { client } from "./client.gen.js" -import { buildClientParams, type Client, type Options as Options2, type TDataShape } from "./client/index.js" +import { buildClientParams, type Client, type Options as Options2, type TDataShape } from "./client" +import { client } from "./client.gen" import type { AgentPartInput, AppAgentsResponses, @@ -235,7 +235,7 @@ import type { WorktreeResetErrors, WorktreeResetInput, WorktreeResetResponses, -} from "./types.gen.js" +} from "./types.gen" export type Options = Options2< TData, @@ -361,6 +361,44 @@ export class Global extends HeyApiClient { } } +export class Remote extends HeyApiClient { + /** + * Enable remote connection + * + * Enable WebSocket connection to UserConnectionDO for real-time session relay and commands. + */ + public enable(options?: Options) { + return (options?.client ?? this.client).post({ + url: "/remote/enable", + ...options, + }) + } + + /** + * Disable remote connection + * + * Close the remote WebSocket connection to UserConnectionDO. + */ + public disable(options?: Options) { + return (options?.client ?? this.client).post({ + url: "/remote/disable", + ...options, + }) + } + + /** + * Get remote connection status + * + * Get the current state of the remote WebSocket connection. + */ + public status(options?: Options) { + return (options?.client ?? this.client).get({ + url: "/remote/status", + ...options, + }) + } +} + export class Auth extends HeyApiClient { /** * Remove auth credentials @@ -3024,98 +3062,6 @@ export class Telemetry extends HeyApiClient { } } -export class Remote extends HeyApiClient { - /** - * Enable remote connection - * - * Enable WebSocket connection to UserConnectionDO for real-time session relay and commands. - */ - public enable( - parameters?: { - directory?: string - workspace?: string - }, - options?: Options, - ) { - const params = buildClientParams( - [parameters], - [ - { - args: [ - { in: "query", key: "directory" }, - { in: "query", key: "workspace" }, - ], - }, - ], - ) - return (options?.client ?? this.client).post({ - url: "/remote/enable", - ...options, - ...params, - }) - } - - /** - * Disable remote connection - * - * Close the remote WebSocket connection to UserConnectionDO. - */ - public disable( - parameters?: { - directory?: string - workspace?: string - }, - options?: Options, - ) { - const params = buildClientParams( - [parameters], - [ - { - args: [ - { in: "query", key: "directory" }, - { in: "query", key: "workspace" }, - ], - }, - ], - ) - return (options?.client ?? this.client).post({ - url: "/remote/disable", - ...options, - ...params, - }) - } - - /** - * Get remote connection status - * - * Get the current state of the remote WebSocket connection. - */ - public status( - parameters?: { - directory?: string - workspace?: string - }, - options?: Options, - ) { - const params = buildClientParams( - [parameters], - [ - { - args: [ - { in: "query", key: "directory" }, - { in: "query", key: "workspace" }, - ], - }, - ], - ) - return (options?.client ?? this.client).get({ - url: "/remote/status", - ...options, - ...params, - }) - } -} - export class CommitMessage extends HeyApiClient { /** * Generate commit message @@ -5312,6 +5258,11 @@ export class KiloClient extends HeyApiClient { return (this._global ??= new Global({ client: this.client })) } + private _remote?: Remote + get remote(): Remote { + return (this._remote ??= new Remote({ client: this.client })) + } + private _auth?: Auth get auth(): Auth { return (this._auth ??= new Auth({ client: this.client })) @@ -5382,11 +5333,6 @@ export class KiloClient extends HeyApiClient { return (this._telemetry ??= new Telemetry({ client: this.client })) } - private _remote?: Remote - get remote(): Remote { - return (this._remote ??= new Remote({ client: this.client })) - } - private _commitMessage?: CommitMessage get commitMessage(): CommitMessage { return (this._commitMessage ??= new CommitMessage({ client: this.client })) diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index 42319733ede..20e26bd95c5 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -97,6 +97,114 @@ export type EventFileEdited = { } } +export type EventTuiPromptAppend = { + type: "tui.prompt.append" + properties: { + text: string + } +} + +export type EventTuiCommandExecute = { + type: "tui.command.execute" + properties: { + command: + | "session.list" + | "session.new" + | "session.share" + | "session.interrupt" + | "session.compact" + | "session.page.up" + | "session.page.down" + | "session.line.up" + | "session.line.down" + | "session.half.page.up" + | "session.half.page.down" + | "session.first" + | "session.last" + | "prompt.clear" + | "prompt.submit" + | "agent.cycle" + | string + } +} + +export type EventTuiToastShow = { + type: "tui.toast.show" + properties: { + title?: string + message: string + variant: "info" | "success" | "warning" | "error" + /** + * Duration in milliseconds + */ + duration?: number + } +} + +export type EventTuiSessionSelect = { + type: "tui.session.select" + properties: { + /** + * Session ID to navigate to + */ + sessionID: string + } +} + +export type EventMcpToolsChanged = { + type: "mcp.tools.changed" + properties: { + server: string + } +} + +export type EventMcpBrowserOpenFailed = { + type: "mcp.browser.open.failed" + properties: { + mcpName: string + url: string + } +} + +export type SessionNetworkWait = { + id: string + sessionID: string + message: string + restored: boolean + time: { + created: number + } +} + +export type EventSessionNetworkAsked = { + type: "session.network.asked" + properties: SessionNetworkWait +} + +export type EventSessionNetworkReplied = { + type: "session.network.replied" + properties: { + sessionID: string + requestID: string + } +} + +export type EventSessionNetworkRejected = { + type: "session.network.rejected" + properties: { + sessionID: string + requestID: string + } +} + +export type EventSessionNetworkRestored = { + type: "session.network.restored" + properties: { + sessionID: string + requestID: string + } +} + export type OutputFormatText = { type: "text" } @@ -700,105 +808,6 @@ export type EventQuestionRejected = { } } -export type EventTuiPromptAppend = { - type: "tui.prompt.append" - properties: { - text: string - } -} - -export type EventTuiCommandExecute = { - type: "tui.command.execute" - properties: { - command: - | "session.list" - | "session.new" - | "session.share" - | "session.interrupt" - | "session.compact" - | "session.page.up" - | "session.page.down" - | "session.line.up" - | "session.line.down" - | "session.half.page.up" - | "session.half.page.down" - | "session.first" - | "session.last" - | "prompt.clear" - | "prompt.submit" - | "agent.cycle" - | string - } -} - -export type EventTuiToastShow = { - type: "tui.toast.show" - properties: { - title?: string - message: string - variant: "info" | "success" | "warning" | "error" - /** - * Duration in milliseconds - */ - duration?: number - } -} - -export type EventTuiSessionSelect = { - type: "tui.session.select" - properties: { - /** - * Session ID to navigate to - */ - sessionID: string - } -} - -export type EventMcpToolsChanged = { - type: "mcp.tools.changed" - properties: { - server: string - } -} - -export type EventMcpBrowserOpenFailed = { - type: "mcp.browser.open.failed" - properties: { - mcpName: string - url: string - } -} - -export type SessionNetworkWait = { - id: string - sessionID: string - message: string - time: { - created: number - } -} - -export type EventSessionNetworkAsked = { - type: "session.network.asked" - properties: SessionNetworkWait -} - -export type EventSessionNetworkReplied = { - type: "session.network.replied" - properties: { - sessionID: string - requestID: string - } -} - -export type EventSessionNetworkRejected = { - type: "session.network.rejected" - properties: { - sessionID: string - requestID: string - } -} - export type EventSessionCompacted = { type: "session.compacted" properties: { @@ -1040,6 +1049,16 @@ export type Event = | EventLspClientDiagnostics | EventLspUpdated | EventFileEdited + | EventTuiPromptAppend + | EventTuiCommandExecute + | EventTuiToastShow + | EventTuiSessionSelect + | EventMcpToolsChanged + | EventMcpBrowserOpenFailed + | EventSessionNetworkAsked + | EventSessionNetworkReplied + | EventSessionNetworkRejected + | EventSessionNetworkRestored | EventMessageUpdated | EventMessageRemoved | EventMessagePartUpdated @@ -1052,15 +1071,6 @@ export type Event = | EventQuestionAsked | EventQuestionReplied | EventQuestionRejected - | EventTuiPromptAppend - | EventTuiCommandExecute - | EventTuiToastShow - | EventTuiSessionSelect - | EventMcpToolsChanged - | EventMcpBrowserOpenFailed - | EventSessionNetworkAsked - | EventSessionNetworkReplied - | EventSessionNetworkRejected | EventSessionCompacted | EventFileWatcherUpdated | EventTodoUpdated @@ -2114,6 +2124,63 @@ export type GlobalDisposeResponses = { export type GlobalDisposeResponse = GlobalDisposeResponses[keyof GlobalDisposeResponses] +export type RemoteEnableData = { + body?: never + path?: never + query?: never + url: "/remote/enable" +} + +export type RemoteEnableResponses = { + /** + * Remote connection enabled + */ + 200: { + enabled: boolean + connected: boolean + } +} + +export type RemoteEnableResponse = RemoteEnableResponses[keyof RemoteEnableResponses] + +export type RemoteDisableData = { + body?: never + path?: never + query?: never + url: "/remote/disable" +} + +export type RemoteDisableResponses = { + /** + * Remote connection disabled + */ + 200: { + enabled: boolean + connected: boolean + } +} + +export type RemoteDisableResponse = RemoteDisableResponses[keyof RemoteDisableResponses] + +export type RemoteStatusData = { + body?: never + path?: never + query?: never + url: "/remote/status" +} + +export type RemoteStatusResponses = { + /** + * Remote connection status + */ + 200: { + enabled: boolean + connected: boolean + } +} + +export type RemoteStatusResponse = RemoteStatusResponses[keyof RemoteStatusResponses] + export type AuthRemoveData = { body?: never path: { @@ -4520,72 +4587,6 @@ export type TelemetryCaptureResponses = { export type TelemetryCaptureResponse = TelemetryCaptureResponses[keyof TelemetryCaptureResponses] -export type RemoteEnableData = { - body?: never - path?: never - query?: { - directory?: string - workspace?: string - } - url: "/remote/enable" -} - -export type RemoteEnableResponses = { - /** - * Remote connection enabled - */ - 200: { - enabled: boolean - connected: boolean - } -} - -export type RemoteEnableResponse = RemoteEnableResponses[keyof RemoteEnableResponses] - -export type RemoteDisableData = { - body?: never - path?: never - query?: { - directory?: string - workspace?: string - } - url: "/remote/disable" -} - -export type RemoteDisableResponses = { - /** - * Remote connection disabled - */ - 200: { - enabled: boolean - connected: boolean - } -} - -export type RemoteDisableResponse = RemoteDisableResponses[keyof RemoteDisableResponses] - -export type RemoteStatusData = { - body?: never - path?: never - query?: { - directory?: string - workspace?: string - } - url: "/remote/status" -} - -export type RemoteStatusResponses = { - /** - * Remote connection status - */ - 200: { - enabled: boolean - connected: boolean - } -} - -export type RemoteStatusResponse = RemoteStatusResponses[keyof RemoteStatusResponses] - export type CommitMessageGenerateData = { body?: { /** diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json index 3a2cbbe85dc..1225158e9c5 100644 --- a/packages/sdk/openapi.json +++ b/packages/sdk/openapi.json @@ -27,7 +27,10 @@ "type": "string" } }, - "required": ["healthy", "version"] + "required": [ + "healthy", + "version" + ] } } } @@ -158,6 +161,117 @@ ] } }, + "/remote/enable": { + "post": { + "operationId": "remote.enable", + "summary": "Enable remote connection", + "description": "Enable WebSocket connection to UserConnectionDO for real-time session relay and commands.", + "responses": { + "200": { + "description": "Remote connection enabled", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "connected": { + "type": "boolean" + } + }, + "required": [ + "enabled", + "connected" + ] + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.enable({\n ...\n})" + } + ] + } + }, + "/remote/disable": { + "post": { + "operationId": "remote.disable", + "summary": "Disable remote connection", + "description": "Close the remote WebSocket connection to UserConnectionDO.", + "responses": { + "200": { + "description": "Remote connection disabled", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "connected": { + "type": "boolean" + } + }, + "required": [ + "enabled", + "connected" + ] + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.disable({\n ...\n})" + } + ] + } + }, + "/remote/status": { + "get": { + "operationId": "remote.status", + "summary": "Get remote connection status", + "description": "Get the current state of the remote WebSocket connection.", + "responses": { + "200": { + "description": "Remote connection status", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "connected": { + "type": "boolean" + } + }, + "required": [ + "enabled", + "connected" + ] + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.status({\n ...\n})" + } + ] + } + }, "/auth/{providerID}": { "put": { "operationId": "auth.set", @@ -742,7 +856,10 @@ "type": "number" } }, - "required": ["rows", "cols"] + "required": [ + "rows", + "cols" + ] } } } @@ -1017,7 +1134,10 @@ } } }, - "required": ["providers", "default"] + "required": [ + "providers", + "default" + ] } } } @@ -1224,7 +1344,11 @@ ] } }, - "required": ["type", "branch", "extra"] + "required": [ + "type", + "branch", + "extra" + ] } } } @@ -2135,7 +2259,9 @@ ], "summary": "Get session", "description": "Retrieve detailed information about a specific Kilo session.", - "tags": ["Session"], + "tags": [ + "Session" + ], "responses": { "200": { "description": "Get session", @@ -2362,7 +2488,9 @@ } ], "summary": "Get session children", - "tags": ["Session"], + "tags": [ + "Session" + ], "description": "Retrieve all child sessions that were forked from the specified parent session.", "responses": { "200": { @@ -2559,7 +2687,11 @@ "pattern": "^msg.*" } }, - "required": ["modelID", "providerID", "messageID"] + "required": [ + "modelID", + "providerID", + "messageID" + ] } } } @@ -2983,7 +3115,10 @@ "type": "boolean" } }, - "required": ["providerID", "modelID"] + "required": [ + "providerID", + "modelID" + ] } } } @@ -3053,7 +3188,10 @@ } } }, - "required": ["info", "parts"] + "required": [ + "info", + "parts" + ] } } } @@ -3134,7 +3272,10 @@ } } }, - "required": ["info", "parts"] + "required": [ + "info", + "parts" + ] } } } @@ -3180,7 +3321,10 @@ "type": "string" } }, - "required": ["providerID", "modelID"] + "required": [ + "providerID", + "modelID" + ] }, "agent": { "type": "string" @@ -3250,7 +3394,9 @@ } } }, - "required": ["parts"] + "required": [ + "parts" + ] } } } @@ -3320,7 +3466,10 @@ } } }, - "required": ["info", "parts"] + "required": [ + "info", + "parts" + ] } } } @@ -3687,7 +3836,10 @@ "type": "string" } }, - "required": ["providerID", "modelID"] + "required": [ + "providerID", + "modelID" + ] }, "agent": { "type": "string" @@ -3757,7 +3909,9 @@ } } }, - "required": ["parts"] + "required": [ + "parts" + ] } } } @@ -3818,7 +3972,10 @@ } } }, - "required": ["info", "parts"] + "required": [ + "info", + "parts" + ] } } } @@ -3896,13 +4053,20 @@ "$ref": "#/components/schemas/FilePartSource" } }, - "required": ["type", "mime", "url"] + "required": [ + "type", + "mime", + "url" + ] } ] } } }, - "required": ["arguments", "command"] + "required": [ + "arguments", + "command" + ] } } } @@ -3996,13 +4160,19 @@ "type": "string" } }, - "required": ["providerID", "modelID"] + "required": [ + "providerID", + "modelID" + ] }, "command": { "type": "string" } }, - "required": ["agent", "command"] + "required": [ + "agent", + "command" + ] } } } @@ -4091,7 +4261,9 @@ "pattern": "^prt.*" } }, - "required": ["messageID"] + "required": [ + "messageID" + ] } } } @@ -4251,10 +4423,16 @@ "properties": { "response": { "type": "string", - "enum": ["once", "always", "reject"] + "enum": [ + "once", + "always", + "reject" + ] } }, - "required": ["response"] + "required": [ + "response" + ] } } } @@ -4391,13 +4569,19 @@ "properties": { "reply": { "type": "string", - "enum": ["once", "always", "reject"] + "enum": [ + "once", + "always", + "reject" + ] }, "message": { "type": "string" } }, - "required": ["reply"] + "required": [ + "reply" + ] } } } @@ -4665,7 +4849,9 @@ } } }, - "required": ["answers"] + "required": [ + "answers" + ] } } } @@ -5024,10 +5210,15 @@ "properties": { "field": { "type": "string", - "enum": ["reasoning_content", "reasoning_details"] + "enum": [ + "reasoning_content", + "reasoning_details" + ] } }, - "required": ["field"], + "required": [ + "field" + ], "additionalProperties": false } ] @@ -5063,10 +5254,16 @@ "type": "number" } }, - "required": ["input", "output"] + "required": [ + "input", + "output" + ] } }, - "required": ["input", "output"] + "required": [ + "input", + "output" + ] }, "limit": { "type": "object", @@ -5081,7 +5278,10 @@ "type": "number" } }, - "required": ["context", "output"] + "required": [ + "context", + "output" + ] }, "modalities": { "type": "object", @@ -5090,39 +5290,70 @@ "type": "array", "items": { "type": "string", - "enum": ["text", "audio", "image", "video", "pdf"] + "enum": [ + "text", + "audio", + "image", + "video", + "pdf" + ] } }, "output": { "type": "array", "items": { "type": "string", - "enum": ["text", "audio", "image", "video", "pdf"] + "enum": [ + "text", + "audio", + "image", + "video", + "pdf" + ] } } }, - "required": ["input", "output"] + "required": [ + "input", + "output" + ] }, "recommendedIndex": { "type": "number" }, "prompt": { "type": "string", - "enum": ["codex", "gemini", "beast", "anthropic", "trinity", "anthropic_without_todo"] + "enum": [ + "codex", + "gemini", + "beast", + "anthropic", + "trinity", + "anthropic_without_todo" + ] }, "isFree": { "type": "boolean" }, "ai_sdk_provider": { "type": "string", - "enum": ["anthropic", "openai", "openai-compatible", "openrouter"] + "enum": [ + "anthropic", + "openai", + "openai-compatible", + "openrouter" + ] }, "experimental": { "type": "boolean" }, "status": { "type": "string", - "enum": ["alpha", "beta", "deprecated"] + "enum": [ + "alpha", + "beta", + "deprecated" + ] }, "options": { "type": "object", @@ -5179,7 +5410,12 @@ } } }, - "required": ["name", "env", "id", "models"] + "required": [ + "name", + "env", + "id", + "models" + ] } }, "default": { @@ -5198,7 +5434,11 @@ } } }, - "required": ["all", "default", "connected"] + "required": [ + "all", + "default", + "connected" + ] } } } @@ -5325,7 +5565,9 @@ "type": "number" } }, - "required": ["method"] + "required": [ + "method" + ] } } } @@ -5405,7 +5647,9 @@ "type": "string" } }, - "required": ["method"] + "required": [ + "method" + ] } } } @@ -5480,7 +5724,9 @@ "additionalProperties": {} } }, - "required": ["event"] + "required": [ + "event" + ] } } } @@ -5493,156 +5739,6 @@ ] } }, - "/remote/enable": { - "post": { - "operationId": "remote.enable", - "parameters": [ - { - "in": "query", - "name": "directory", - "schema": { - "type": "string" - } - }, - { - "in": "query", - "name": "workspace", - "schema": { - "type": "string" - } - } - ], - "summary": "Enable remote connection", - "description": "Enable WebSocket connection to UserConnectionDO for real-time session relay and commands.", - "responses": { - "200": { - "description": "Remote connection enabled", - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - }, - "connected": { - "type": "boolean" - } - }, - "required": ["enabled", "connected"] - } - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.enable({\n ...\n})" - } - ] - } - }, - "/remote/disable": { - "post": { - "operationId": "remote.disable", - "parameters": [ - { - "in": "query", - "name": "directory", - "schema": { - "type": "string" - } - }, - { - "in": "query", - "name": "workspace", - "schema": { - "type": "string" - } - } - ], - "summary": "Disable remote connection", - "description": "Close the remote WebSocket connection to UserConnectionDO.", - "responses": { - "200": { - "description": "Remote connection disabled", - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - }, - "connected": { - "type": "boolean" - } - }, - "required": ["enabled", "connected"] - } - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.disable({\n ...\n})" - } - ] - } - }, - "/remote/status": { - "get": { - "operationId": "remote.status", - "parameters": [ - { - "in": "query", - "name": "directory", - "schema": { - "type": "string" - } - }, - { - "in": "query", - "name": "workspace", - "schema": { - "type": "string" - } - } - ], - "summary": "Get remote connection status", - "description": "Get the current state of the remote WebSocket connection.", - "responses": { - "200": { - "description": "Remote connection status", - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - }, - "connected": { - "type": "boolean" - } - }, - "required": ["enabled", "connected"] - } - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.status({\n ...\n})" - } - ] - } - }, "/commit-message": { "post": { "operationId": "commitMessage.generate", @@ -5676,7 +5772,9 @@ "type": "string" } }, - "required": ["message"] + "required": [ + "message" + ] } } } @@ -5714,7 +5812,9 @@ "type": "string" } }, - "required": ["path"] + "required": [ + "path" + ] } } } @@ -5760,7 +5860,9 @@ "type": "string" } }, - "required": ["text"] + "required": [ + "text" + ] } } } @@ -5788,7 +5890,9 @@ "minLength": 1 } }, - "required": ["text"] + "required": [ + "text" + ] } } } @@ -5840,7 +5944,10 @@ "type": "boolean" } }, - "required": ["ok", "id"] + "required": [ + "ok", + "id" + ] } } } @@ -5904,7 +6011,13 @@ } } }, - "required": ["id", "worktree", "timeCreated", "timeUpdated", "sandboxes"] + "required": [ + "id", + "worktree", + "timeCreated", + "timeUpdated", + "sandboxes" + ] } } } @@ -5956,7 +6069,10 @@ "type": "boolean" } }, - "required": ["ok", "id"] + "required": [ + "ok", + "id" + ] } } } @@ -6028,7 +6144,11 @@ } } }, - "required": ["additions", "deletions", "files"] + "required": [ + "additions", + "deletions", + "files" + ] }, "revert": { "type": "object", @@ -6046,7 +6166,9 @@ "type": "string" } }, - "required": ["messageID"] + "required": [ + "messageID" + ] }, "permission": { "type": "object", @@ -6068,7 +6190,16 @@ "type": "number" } }, - "required": ["id", "projectID", "slug", "directory", "title", "version", "timeCreated", "timeUpdated"] + "required": [ + "id", + "projectID", + "slug", + "directory", + "title", + "version", + "timeCreated", + "timeUpdated" + ] } } } @@ -6120,7 +6251,10 @@ "type": "boolean" } }, - "required": ["ok", "id"] + "required": [ + "ok", + "id" + ] } } } @@ -6167,7 +6301,9 @@ "type": "number" } }, - "required": ["created"] + "required": [ + "created" + ] }, "agent": { "type": "string" @@ -6182,7 +6318,10 @@ "type": "string" } }, - "required": ["providerID", "modelID"] + "required": [ + "providerID", + "modelID" + ] }, "tools": { "type": "object", @@ -6194,7 +6333,12 @@ } } }, - "required": ["role", "time", "agent", "model"] + "required": [ + "role", + "time", + "agent", + "model" + ] }, { "type": "object", @@ -6213,7 +6357,9 @@ "type": "number" } }, - "required": ["created"] + "required": [ + "created" + ] }, "parentID": { "type": "string" @@ -6240,7 +6386,10 @@ "type": "string" } }, - "required": ["cwd", "root"] + "required": [ + "cwd", + "root" + ] }, "summary": { "type": "boolean" @@ -6273,10 +6422,18 @@ "type": "number" } }, - "required": ["read", "write"] + "required": [ + "read", + "write" + ] } }, - "required": ["input", "output", "reasoning", "cache"] + "required": [ + "input", + "output", + "reasoning", + "cache" + ] }, "structured": {}, "variant": { @@ -6302,7 +6459,12 @@ ] } }, - "required": ["id", "sessionID", "timeCreated", "data"] + "required": [ + "id", + "sessionID", + "timeCreated", + "data" + ] } } } @@ -6354,7 +6516,10 @@ "type": "boolean" } }, - "required": ["ok", "id"] + "required": [ + "ok", + "id" + ] } } } @@ -6416,7 +6581,9 @@ "type": "number" } }, - "required": ["start"] + "required": [ + "start" + ] }, "metadata": { "type": "object", @@ -6426,7 +6593,10 @@ "additionalProperties": {} } }, - "required": ["type", "text"] + "required": [ + "type", + "text" + ] }, { "type": "object", @@ -6455,10 +6625,16 @@ "type": "number" } }, - "required": ["start"] + "required": [ + "start" + ] } }, - "required": ["type", "text", "time"] + "required": [ + "type", + "text", + "time" + ] }, { "type": "object", @@ -6493,7 +6669,11 @@ "type": "string" } }, - "required": ["status", "input", "raw"] + "required": [ + "status", + "input", + "raw" + ] }, { "type": "object", @@ -6526,10 +6706,16 @@ "type": "number" } }, - "required": ["start"] + "required": [ + "start" + ] } }, - "required": ["status", "input", "time"] + "required": [ + "status", + "input", + "time" + ] }, { "type": "object", @@ -6571,10 +6757,20 @@ "type": "number" } }, - "required": ["start", "end"] + "required": [ + "start", + "end" + ] } }, - "required": ["status", "input", "output", "title", "metadata", "time"] + "required": [ + "status", + "input", + "output", + "title", + "metadata", + "time" + ] }, { "type": "object", @@ -6610,10 +6806,18 @@ "type": "number" } }, - "required": ["start", "end"] + "required": [ + "start", + "end" + ] } }, - "required": ["status", "input", "error", "time"] + "required": [ + "status", + "input", + "error", + "time" + ] } ] }, @@ -6625,12 +6829,22 @@ "additionalProperties": {} } }, - "required": ["type", "callID", "tool", "state"] + "required": [ + "type", + "callID", + "tool", + "state" + ] } ] } }, - "required": ["id", "messageID", "sessionID", "data"] + "required": [ + "id", + "messageID", + "sessionID", + "data" + ] } } } @@ -6696,7 +6910,9 @@ "type": "string" } }, - "required": ["location"] + "required": [ + "location" + ] } } } @@ -6762,7 +6978,9 @@ "type": "string" } }, - "required": ["name"] + "required": [ + "name" + ] } } } @@ -6828,11 +7046,17 @@ "type": "string" } }, - "required": ["id", "name", "role"] + "required": [ + "id", + "name", + "role" + ] } } }, - "required": ["email"] + "required": [ + "email" + ] }, "balance": { "anyOf": [ @@ -6843,7 +7067,9 @@ "type": "number" } }, - "required": ["balance"] + "required": [ + "balance" + ] }, { "type": "null" @@ -6861,7 +7087,11 @@ ] } }, - "required": ["profile", "balance", "currentOrgId"] + "required": [ + "profile", + "balance", + "currentOrgId" + ] } } } @@ -6945,7 +7175,9 @@ ] } }, - "required": ["organizationId"] + "required": [ + "organizationId" + ] } } } @@ -7073,7 +7305,9 @@ } } }, - "required": ["modes"] + "required": [ + "modes" + ] } } } @@ -7184,7 +7418,10 @@ "type": "number" } }, - "required": ["prefix", "suffix"] + "required": [ + "prefix", + "suffix" + ] } } } @@ -7247,7 +7484,10 @@ "type": "string" } }, - "required": ["actionText", "actionURL"] + "required": [ + "actionText", + "actionURL" + ] }, "showIn": { "type": "array", @@ -7259,7 +7499,11 @@ "type": "string" } }, - "required": ["id", "title", "message"] + "required": [ + "id", + "title", + "message" + ] } } } @@ -7402,7 +7646,9 @@ "type": "string" } }, - "required": ["sessionId"] + "required": [ + "sessionId" + ] } } } @@ -7448,7 +7694,14 @@ "anyOf": [ { "type": "string", - "enum": ["provisioned", "starting", "restarting", "running", "stopped", "destroying"] + "enum": [ + "provisioned", + "starting", + "restarting", + "running", + "stopped", + "destroying" + ] }, { "type": "null" @@ -7471,7 +7724,10 @@ "type": "number" } }, - "required": ["cpus", "memory_mb"] + "required": [ + "cpus", + "memory_mb" + ] }, "openclawVersion": { "anyOf": [ @@ -7513,7 +7769,9 @@ "type": "string" } }, - "required": ["status"] + "required": [ + "status" + ] } } } @@ -7571,7 +7829,12 @@ "type": "string" } }, - "required": ["apiKey", "userId", "userToken", "channelId"] + "required": [ + "apiKey", + "userId", + "userToken", + "channelId" + ] }, { "type": "null" @@ -7668,7 +7931,13 @@ "type": "number" } }, - "required": ["session_id", "title", "created_at", "updated_at", "version"] + "required": [ + "session_id", + "title", + "created_at", + "updated_at", + "version" + ] } }, "nextCursor": { @@ -7682,7 +7951,10 @@ ] } }, - "required": ["cliSessions", "nextCursor"] + "required": [ + "cliSessions", + "nextCursor" + ] } } } @@ -7752,7 +8024,9 @@ "type": "string" } }, - "required": ["text"] + "required": [ + "text" + ] }, "lines": { "type": "object", @@ -7761,7 +8035,9 @@ "type": "string" } }, - "required": ["text"] + "required": [ + "text" + ] }, "line_number": { "type": "number" @@ -7781,7 +8057,9 @@ "type": "string" } }, - "required": ["text"] + "required": [ + "text" + ] }, "start": { "type": "number" @@ -7790,11 +8068,21 @@ "type": "number" } }, - "required": ["match", "start", "end"] + "required": [ + "match", + "start", + "end" + ] } } }, - "required": ["path", "lines", "line_number", "absolute_offset", "submatches"] + "required": [ + "path", + "lines", + "line_number", + "absolute_offset", + "submatches" + ] } } } @@ -7840,7 +8128,10 @@ "name": "dirs", "schema": { "type": "string", - "enum": ["true", "false"] + "enum": [ + "true", + "false" + ] } }, { @@ -7848,7 +8139,10 @@ "name": "type", "schema": { "type": "string", - "enum": ["file", "directory"] + "enum": [ + "file", + "directory" + ] } }, { @@ -8197,7 +8491,10 @@ ] } }, - "required": ["name", "config"] + "required": [ + "name", + "config" + ] } } } @@ -8252,7 +8549,9 @@ "type": "string" } }, - "required": ["authorizationUrl"] + "required": [ + "authorizationUrl" + ] } } } @@ -8326,7 +8625,9 @@ "const": true } }, - "required": ["success"] + "required": [ + "success" + ] } } } @@ -8422,7 +8723,9 @@ "type": "string" } }, - "required": ["code"] + "required": [ + "code" + ] } } } @@ -8653,7 +8956,9 @@ "type": "string" } }, - "required": ["text"] + "required": [ + "text" + ] } } } @@ -8965,7 +9270,9 @@ "type": "string" } }, - "required": ["command"] + "required": [ + "command" + ] } } } @@ -9025,7 +9332,12 @@ }, "variant": { "type": "string", - "enum": ["info", "success", "warning", "error"] + "enum": [ + "info", + "success", + "warning", + "error" + ] }, "duration": { "description": "Duration in milliseconds", @@ -9033,7 +9345,10 @@ "type": "number" } }, - "required": ["message", "variant"] + "required": [ + "message", + "variant" + ] } } } @@ -9184,7 +9499,9 @@ "pattern": "^ses" } }, - "required": ["sessionID"] + "required": [ + "sessionID" + ] } } } @@ -9231,7 +9548,10 @@ }, "body": {} }, - "required": ["path", "body"] + "required": [ + "path", + "body" + ] } } } @@ -9516,7 +9836,12 @@ "level": { "description": "Log level", "type": "string", - "enum": ["debug", "info", "error", "warn"] + "enum": [ + "debug", + "info", + "error", + "warn" + ] }, "message": { "description": "Log message", @@ -9531,7 +9856,11 @@ "additionalProperties": {} } }, - "required": ["service", "level", "message"] + "required": [ + "service", + "level", + "message" + ] } } } @@ -9632,7 +9961,12 @@ "type": "string" } }, - "required": ["name", "description", "location", "content"] + "required": [ + "name", + "description", + "location", + "content" + ] } } } @@ -9793,10 +10127,15 @@ "type": "string" } }, - "required": ["version"] + "required": [ + "version" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.installation.update-available": { "type": "object", @@ -9812,10 +10151,15 @@ "type": "string" } }, - "required": ["version"] + "required": [ + "version" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Project": { "type": "object", @@ -9869,7 +10213,10 @@ "type": "number" } }, - "required": ["created", "updated"] + "required": [ + "created", + "updated" + ] }, "sandboxes": { "type": "array", @@ -9878,7 +10225,12 @@ } } }, - "required": ["id", "worktree", "time", "sandboxes"] + "required": [ + "id", + "worktree", + "time", + "sandboxes" + ] }, "Event.project.updated": { "type": "object", @@ -9891,7 +10243,10 @@ "$ref": "#/components/schemas/Project" } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.server.instance.disposed": { "type": "object", @@ -9907,10 +10262,15 @@ "type": "string" } }, - "required": ["directory"] + "required": [ + "directory" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.server.connected": { "type": "object", @@ -9924,7 +10284,10 @@ "properties": {} } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.global.disposed": { "type": "object", @@ -9938,7 +10301,10 @@ "properties": {} } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.global.config.updated": { "type": "object", @@ -9952,7 +10318,10 @@ "properties": {} } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.lsp.client.diagnostics": { "type": "object", @@ -9971,10 +10340,16 @@ "type": "string" } }, - "required": ["serverID", "path"] + "required": [ + "serverID", + "path" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.lsp.updated": { "type": "object", @@ -9988,7 +10363,10 @@ "properties": {} } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.file.edited": { "type": "object", @@ -10004,10 +10382,345 @@ "type": "string" } }, - "required": ["file"] + "required": [ + "file" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] + }, + "Event.tui.prompt.append": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "tui.prompt.append" + }, + "properties": { + "type": "object", + "properties": { + "text": { + "type": "string" + } + }, + "required": [ + "text" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.tui.command.execute": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "tui.command.execute" + }, + "properties": { + "type": "object", + "properties": { + "command": { + "anyOf": [ + { + "type": "string", + "enum": [ + "session.list", + "session.new", + "session.share", + "session.interrupt", + "session.compact", + "session.page.up", + "session.page.down", + "session.line.up", + "session.line.down", + "session.half.page.up", + "session.half.page.down", + "session.first", + "session.last", + "prompt.clear", + "prompt.submit", + "agent.cycle" + ] + }, + { + "type": "string" + } + ] + } + }, + "required": [ + "command" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.tui.toast.show": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "tui.toast.show" + }, + "properties": { + "type": "object", + "properties": { + "title": { + "type": "string" + }, + "message": { + "type": "string" + }, + "variant": { + "type": "string", + "enum": [ + "info", + "success", + "warning", + "error" + ] + }, + "duration": { + "description": "Duration in milliseconds", + "default": 5000, + "type": "number" + } + }, + "required": [ + "message", + "variant" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.tui.session.select": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "tui.session.select" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "description": "Session ID to navigate to", + "type": "string", + "pattern": "^ses" + } + }, + "required": [ + "sessionID" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.mcp.tools.changed": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "mcp.tools.changed" + }, + "properties": { + "type": "object", + "properties": { + "server": { + "type": "string" + } + }, + "required": [ + "server" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.mcp.browser.open.failed": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "mcp.browser.open.failed" + }, + "properties": { + "type": "object", + "properties": { + "mcpName": { + "type": "string" + }, + "url": { + "type": "string" + } + }, + "required": [ + "mcpName", + "url" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "SessionNetworkWait": { + "type": "object", + "properties": { + "id": { + "type": "string", + "pattern": "^que.*" + }, + "sessionID": { + "type": "string", + "pattern": "^ses.*" + }, + "message": { + "type": "string" + }, + "restored": { + "type": "boolean" + }, + "time": { + "type": "object", + "properties": { + "created": { + "type": "number" + } + }, + "required": [ + "created" + ] + } + }, + "required": [ + "id", + "sessionID", + "message", + "restored", + "time" + ] + }, + "Event.session.network.asked": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.asked" + }, + "properties": { + "$ref": "#/components/schemas/SessionNetworkWait" + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.session.network.replied": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.replied" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + }, + "requestID": { + "type": "string" + } + }, + "required": [ + "sessionID", + "requestID" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.session.network.rejected": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.rejected" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + }, + "requestID": { + "type": "string" + } + }, + "required": [ + "sessionID", + "requestID" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.session.network.restored": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.restored" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + }, + "requestID": { + "type": "string" + } + }, + "required": [ + "sessionID", + "requestID" + ] + } + }, + "required": [ + "type", + "properties" + ] }, "OutputFormatText": { "type": "object", @@ -10017,7 +10730,9 @@ "const": "text" } }, - "required": ["type"] + "required": [ + "type" + ] }, "JSONSchema": { "type": "object", @@ -10043,7 +10758,10 @@ "maximum": 9007199254740991 } }, - "required": ["type", "schema"] + "required": [ + "type", + "schema" + ] }, "OutputFormat": { "anyOf": [ @@ -10075,10 +10793,20 @@ }, "status": { "type": "string", - "enum": ["added", "deleted", "modified"] + "enum": [ + "added", + "deleted", + "modified" + ] } }, - "required": ["file", "before", "after", "additions", "deletions"] + "required": [ + "file", + "before", + "after", + "additions", + "deletions" + ] }, "UserMessage": { "type": "object", @@ -10100,7 +10828,9 @@ "type": "number" } }, - "required": ["created"] + "required": [ + "created" + ] }, "format": { "$ref": "#/components/schemas/OutputFormat" @@ -10121,7 +10851,9 @@ } } }, - "required": ["diffs"] + "required": [ + "diffs" + ] }, "agent": { "type": "string" @@ -10136,7 +10868,10 @@ "type": "string" } }, - "required": ["providerID", "modelID"] + "required": [ + "providerID", + "modelID" + ] }, "system": { "type": "string" @@ -10177,7 +10912,14 @@ } } }, - "required": ["id", "sessionID", "role", "time", "agent", "model"] + "required": [ + "id", + "sessionID", + "role", + "time", + "agent", + "model" + ] }, "ProviderAuthError": { "type": "object", @@ -10196,10 +10938,16 @@ "type": "string" } }, - "required": ["providerID", "message"] + "required": [ + "providerID", + "message" + ] } }, - "required": ["name", "data"] + "required": [ + "name", + "data" + ] }, "UnknownError": { "type": "object", @@ -10215,10 +10963,15 @@ "type": "string" } }, - "required": ["message"] + "required": [ + "message" + ] } }, - "required": ["name", "data"] + "required": [ + "name", + "data" + ] }, "MessageOutputLengthError": { "type": "object", @@ -10232,7 +10985,10 @@ "properties": {} } }, - "required": ["name", "data"] + "required": [ + "name", + "data" + ] }, "MessageAbortedError": { "type": "object", @@ -10248,10 +11004,15 @@ "type": "string" } }, - "required": ["message"] + "required": [ + "message" + ] } }, - "required": ["name", "data"] + "required": [ + "name", + "data" + ] }, "StructuredOutputError": { "type": "object", @@ -10270,10 +11031,16 @@ "type": "number" } }, - "required": ["message", "retries"] + "required": [ + "message", + "retries" + ] } }, - "required": ["name", "data"] + "required": [ + "name", + "data" + ] }, "ContextOverflowError": { "type": "object", @@ -10292,10 +11059,15 @@ "type": "string" } }, - "required": ["message"] + "required": [ + "message" + ] } }, - "required": ["name", "data"] + "required": [ + "name", + "data" + ] }, "APIError": { "type": "object", @@ -10338,10 +11110,16 @@ } } }, - "required": ["message", "isRetryable"] + "required": [ + "message", + "isRetryable" + ] } }, - "required": ["name", "data"] + "required": [ + "name", + "data" + ] }, "AssistantMessage": { "type": "object", @@ -10366,7 +11144,9 @@ "type": "number" } }, - "required": ["created"] + "required": [ + "created" + ] }, "error": { "anyOf": [ @@ -10418,7 +11198,10 @@ "type": "string" } }, - "required": ["cwd", "root"] + "required": [ + "cwd", + "root" + ] }, "summary": { "type": "boolean" @@ -10451,10 +11234,18 @@ "type": "number" } }, - "required": ["read", "write"] + "required": [ + "read", + "write" + ] } }, - "required": ["input", "output", "reasoning", "cache"] + "required": [ + "input", + "output", + "reasoning", + "cache" + ] }, "structured": {}, "variant": { @@ -10503,10 +11294,15 @@ "$ref": "#/components/schemas/Message" } }, - "required": ["info"] + "required": [ + "info" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.message.removed": { "type": "object", @@ -10525,10 +11321,16 @@ "type": "string" } }, - "required": ["sessionID", "messageID"] + "required": [ + "sessionID", + "messageID" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "TextPart": { "type": "object", @@ -10565,7 +11367,9 @@ "type": "number" } }, - "required": ["start"] + "required": [ + "start" + ] }, "metadata": { "type": "object", @@ -10575,7 +11379,13 @@ "additionalProperties": {} } }, - "required": ["id", "sessionID", "messageID", "type", "text"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "text" + ] }, "SubtaskPart": { "type": "object", @@ -10612,13 +11422,24 @@ "type": "string" } }, - "required": ["providerID", "modelID"] + "required": [ + "providerID", + "modelID" + ] }, "command": { "type": "string" } }, - "required": ["id", "sessionID", "messageID", "type", "prompt", "description", "agent"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "prompt", + "description", + "agent" + ] }, "ReasoningPart": { "type": "object", @@ -10656,10 +11477,19 @@ "type": "number" } }, - "required": ["start"] + "required": [ + "start" + ] } }, - "required": ["id", "sessionID", "messageID", "type", "text", "time"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "text", + "time" + ] }, "FilePartSourceText": { "type": "object", @@ -10678,7 +11508,11 @@ "maximum": 9007199254740991 } }, - "required": ["value", "start", "end"] + "required": [ + "value", + "start", + "end" + ] }, "FileSource": { "type": "object", @@ -10694,7 +11528,11 @@ "type": "string" } }, - "required": ["text", "type", "path"] + "required": [ + "text", + "type", + "path" + ] }, "Range": { "type": "object", @@ -10709,7 +11547,10 @@ "type": "number" } }, - "required": ["line", "character"] + "required": [ + "line", + "character" + ] }, "end": { "type": "object", @@ -10721,10 +11562,16 @@ "type": "number" } }, - "required": ["line", "character"] + "required": [ + "line", + "character" + ] } }, - "required": ["start", "end"] + "required": [ + "start", + "end" + ] }, "SymbolSource": { "type": "object", @@ -10751,7 +11598,14 @@ "maximum": 9007199254740991 } }, - "required": ["text", "type", "path", "range", "name", "kind"] + "required": [ + "text", + "type", + "path", + "range", + "name", + "kind" + ] }, "ResourceSource": { "type": "object", @@ -10770,7 +11624,12 @@ "type": "string" } }, - "required": ["text", "type", "clientName", "uri"] + "required": [ + "text", + "type", + "clientName", + "uri" + ] }, "FilePartSource": { "anyOf": [ @@ -10814,7 +11673,14 @@ "$ref": "#/components/schemas/FilePartSource" } }, - "required": ["id", "sessionID", "messageID", "type", "mime", "url"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "mime", + "url" + ] }, "ToolStatePending": { "type": "object", @@ -10834,7 +11700,11 @@ "type": "string" } }, - "required": ["status", "input", "raw"] + "required": [ + "status", + "input", + "raw" + ] }, "ToolStateRunning": { "type": "object", @@ -10867,10 +11737,16 @@ "type": "number" } }, - "required": ["start"] + "required": [ + "start" + ] } }, - "required": ["status", "input", "time"] + "required": [ + "status", + "input", + "time" + ] }, "ToolStateCompleted": { "type": "object", @@ -10912,7 +11788,10 @@ "type": "number" } }, - "required": ["start", "end"] + "required": [ + "start", + "end" + ] }, "attachments": { "type": "array", @@ -10921,7 +11800,14 @@ } } }, - "required": ["status", "input", "output", "title", "metadata", "time"] + "required": [ + "status", + "input", + "output", + "title", + "metadata", + "time" + ] }, "ToolStateError": { "type": "object", @@ -10957,10 +11843,18 @@ "type": "number" } }, - "required": ["start", "end"] + "required": [ + "start", + "end" + ] } }, - "required": ["status", "input", "error", "time"] + "required": [ + "status", + "input", + "error", + "time" + ] }, "ToolState": { "anyOf": [ @@ -11011,7 +11905,15 @@ "additionalProperties": {} } }, - "required": ["id", "sessionID", "messageID", "type", "callID", "tool", "state"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "callID", + "tool", + "state" + ] }, "StepStartPart": { "type": "object", @@ -11033,7 +11935,12 @@ "type": "string" } }, - "required": ["id", "sessionID", "messageID", "type"] + "required": [ + "id", + "sessionID", + "messageID", + "type" + ] }, "StepFinishPart": { "type": "object", @@ -11085,13 +11992,29 @@ "type": "number" } }, - "required": ["read", "write"] + "required": [ + "read", + "write" + ] } }, - "required": ["input", "output", "reasoning", "cache"] + "required": [ + "input", + "output", + "reasoning", + "cache" + ] } }, - "required": ["id", "sessionID", "messageID", "type", "reason", "cost", "tokens"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "reason", + "cost", + "tokens" + ] }, "SnapshotPart": { "type": "object", @@ -11113,7 +12036,13 @@ "type": "string" } }, - "required": ["id", "sessionID", "messageID", "type", "snapshot"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "snapshot" + ] }, "PatchPart": { "type": "object", @@ -11141,7 +12070,14 @@ } } }, - "required": ["id", "sessionID", "messageID", "type", "hash", "files"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "hash", + "files" + ] }, "AgentPart": { "type": "object", @@ -11179,10 +12115,20 @@ "maximum": 9007199254740991 } }, - "required": ["value", "start", "end"] + "required": [ + "value", + "start", + "end" + ] } }, - "required": ["id", "sessionID", "messageID", "type", "name"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "name" + ] }, "RetryPart": { "type": "object", @@ -11213,10 +12159,20 @@ "type": "number" } }, - "required": ["created"] + "required": [ + "created" + ] } }, - "required": ["id", "sessionID", "messageID", "type", "attempt", "error", "time"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "attempt", + "error", + "time" + ] }, "CompactionPart": { "type": "object", @@ -11241,7 +12197,13 @@ "type": "boolean" } }, - "required": ["id", "sessionID", "messageID", "type", "auto"] + "required": [ + "id", + "sessionID", + "messageID", + "type", + "auto" + ] }, "Part": { "anyOf": [ @@ -11297,10 +12259,15 @@ "$ref": "#/components/schemas/Part" } }, - "required": ["part"] + "required": [ + "part" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.message.part.delta": { "type": "object", @@ -11328,10 +12295,19 @@ "type": "string" } }, - "required": ["sessionID", "messageID", "partID", "field", "delta"] + "required": [ + "sessionID", + "messageID", + "partID", + "field", + "delta" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.message.part.removed": { "type": "object", @@ -11353,10 +12329,17 @@ "type": "string" } }, - "required": ["sessionID", "messageID", "partID"] + "required": [ + "sessionID", + "messageID", + "partID" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "PermissionRequest": { "type": "object", @@ -11401,10 +12384,20 @@ "type": "string" } }, - "required": ["messageID", "callID"] + "required": [ + "messageID", + "callID" + ] } }, - "required": ["id", "sessionID", "permission", "patterns", "metadata", "always"] + "required": [ + "id", + "sessionID", + "permission", + "patterns", + "metadata", + "always" + ] }, "Event.permission.asked": { "type": "object", @@ -11417,7 +12410,10 @@ "$ref": "#/components/schemas/PermissionRequest" } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.permission.replied": { "type": "object", @@ -11437,13 +12433,24 @@ }, "reply": { "type": "string", - "enum": ["once", "always", "reject"] + "enum": [ + "once", + "always", + "reject" + ] } }, - "required": ["sessionID", "requestID", "reply"] + "required": [ + "sessionID", + "requestID", + "reply" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "SessionStatus": { "anyOf": [ @@ -11455,7 +12462,9 @@ "const": "idle" } }, - "required": ["type"] + "required": [ + "type" + ] }, { "type": "object", @@ -11474,7 +12483,12 @@ "type": "number" } }, - "required": ["type", "attempt", "message", "next"] + "required": [ + "type", + "attempt", + "message", + "next" + ] }, { "type": "object", @@ -11484,7 +12498,9 @@ "const": "busy" } }, - "required": ["type"] + "required": [ + "type" + ] }, { "type": "object", @@ -11500,7 +12516,11 @@ "type": "string" } }, - "required": ["type", "requestID", "message"] + "required": [ + "type", + "requestID", + "message" + ] } ] }, @@ -11521,10 +12541,16 @@ "$ref": "#/components/schemas/SessionStatus" } }, - "required": ["sessionID", "status"] + "required": [ + "sessionID", + "status" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.session.idle": { "type": "object", @@ -11540,10 +12566,15 @@ "type": "string" } }, - "required": ["sessionID"] + "required": [ + "sessionID" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "QuestionOption": { "type": "object", @@ -11561,7 +12592,10 @@ "type": "string" } }, - "required": ["label", "description"] + "required": [ + "label", + "description" + ] }, "QuestionInfo": { "type": "object", @@ -11590,7 +12624,11 @@ "type": "boolean" } }, - "required": ["question", "header", "options"] + "required": [ + "question", + "header", + "options" + ] }, "QuestionRequest": { "type": "object", @@ -11620,10 +12658,17 @@ "type": "string" } }, - "required": ["messageID", "callID"] + "required": [ + "messageID", + "callID" + ] } }, - "required": ["id", "sessionID", "questions"] + "required": [ + "id", + "sessionID", + "questions" + ] }, "Event.question.asked": { "type": "object", @@ -11636,7 +12681,10 @@ "$ref": "#/components/schemas/QuestionRequest" } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "QuestionAnswer": { "type": "array", @@ -11667,10 +12715,17 @@ } } }, - "required": ["sessionID", "requestID", "answers"] + "required": [ + "sessionID", + "requestID", + "answers" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.question.rejected": { "type": "object", @@ -11689,249 +12744,16 @@ "type": "string" } }, - "required": ["sessionID", "requestID"] + "required": [ + "sessionID", + "requestID" + ] } }, - "required": ["type", "properties"] - }, - "Event.tui.prompt.append": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "tui.prompt.append" - }, - "properties": { - "type": "object", - "properties": { - "text": { - "type": "string" - } - }, - "required": ["text"] - } - }, - "required": ["type", "properties"] - }, - "Event.tui.command.execute": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "tui.command.execute" - }, - "properties": { - "type": "object", - "properties": { - "command": { - "anyOf": [ - { - "type": "string", - "enum": [ - "session.list", - "session.new", - "session.share", - "session.interrupt", - "session.compact", - "session.page.up", - "session.page.down", - "session.line.up", - "session.line.down", - "session.half.page.up", - "session.half.page.down", - "session.first", - "session.last", - "prompt.clear", - "prompt.submit", - "agent.cycle" - ] - }, - { - "type": "string" - } - ] - } - }, - "required": ["command"] - } - }, - "required": ["type", "properties"] - }, - "Event.tui.toast.show": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "tui.toast.show" - }, - "properties": { - "type": "object", - "properties": { - "title": { - "type": "string" - }, - "message": { - "type": "string" - }, - "variant": { - "type": "string", - "enum": ["info", "success", "warning", "error"] - }, - "duration": { - "description": "Duration in milliseconds", - "default": 5000, - "type": "number" - } - }, - "required": ["message", "variant"] - } - }, - "required": ["type", "properties"] - }, - "Event.tui.session.select": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "tui.session.select" - }, - "properties": { - "type": "object", - "properties": { - "sessionID": { - "description": "Session ID to navigate to", - "type": "string", - "pattern": "^ses" - } - }, - "required": ["sessionID"] - } - }, - "required": ["type", "properties"] - }, - "Event.mcp.tools.changed": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "mcp.tools.changed" - }, - "properties": { - "type": "object", - "properties": { - "server": { - "type": "string" - } - }, - "required": ["server"] - } - }, - "required": ["type", "properties"] - }, - "Event.mcp.browser.open.failed": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "mcp.browser.open.failed" - }, - "properties": { - "type": "object", - "properties": { - "mcpName": { - "type": "string" - }, - "url": { - "type": "string" - } - }, - "required": ["mcpName", "url"] - } - }, - "required": ["type", "properties"] - }, - "SessionNetworkWait": { - "type": "object", - "properties": { - "id": { - "type": "string", - "pattern": "^que.*" - }, - "sessionID": { - "type": "string", - "pattern": "^ses.*" - }, - "message": { - "type": "string" - }, - "time": { - "type": "object", - "properties": { - "created": { - "type": "number" - } - }, - "required": ["created"] - } - }, - "required": ["id", "sessionID", "message", "time"] - }, - "Event.session.network.asked": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "session.network.asked" - }, - "properties": { - "$ref": "#/components/schemas/SessionNetworkWait" - } - }, - "required": ["type", "properties"] - }, - "Event.session.network.replied": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "session.network.replied" - }, - "properties": { - "type": "object", - "properties": { - "sessionID": { - "type": "string" - }, - "requestID": { - "type": "string" - } - }, - "required": ["sessionID", "requestID"] - } - }, - "required": ["type", "properties"] - }, - "Event.session.network.rejected": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "session.network.rejected" - }, - "properties": { - "type": "object", - "properties": { - "sessionID": { - "type": "string" - }, - "requestID": { - "type": "string" - } - }, - "required": ["sessionID", "requestID"] - } - }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.session.compacted": { "type": "object", @@ -11947,10 +12769,15 @@ "type": "string" } }, - "required": ["sessionID"] + "required": [ + "sessionID" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.file.watcher.updated": { "type": "object", @@ -11982,10 +12809,16 @@ ] } }, - "required": ["file", "event"] + "required": [ + "file", + "event" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Todo": { "type": "object", @@ -12003,7 +12836,11 @@ "type": "string" } }, - "required": ["content", "status", "priority"] + "required": [ + "content", + "status", + "priority" + ] }, "Event.todo.updated": { "type": "object", @@ -12025,10 +12862,16 @@ } } }, - "required": ["sessionID", "todos"] + "required": [ + "sessionID", + "todos" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.command.executed": { "type": "object", @@ -12055,14 +12898,26 @@ "pattern": "^msg.*" } }, - "required": ["name", "sessionID", "arguments", "messageID"] + "required": [ + "name", + "sessionID", + "arguments", + "messageID" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "PermissionAction": { "type": "string", - "enum": ["allow", "deny", "ask"] + "enum": [ + "allow", + "deny", + "ask" + ] }, "PermissionRule": { "type": "object", @@ -12077,7 +12932,11 @@ "$ref": "#/components/schemas/PermissionAction" } }, - "required": ["permission", "pattern", "action"] + "required": [ + "permission", + "pattern", + "action" + ] }, "PermissionRuleset": { "type": "array", @@ -12136,14 +12995,26 @@ }, "status": { "type": "string", - "enum": ["added", "deleted", "modified"] + "enum": [ + "added", + "deleted", + "modified" + ] } }, - "required": ["file", "additions", "deletions"] + "required": [ + "file", + "additions", + "deletions" + ] } } }, - "required": ["additions", "deletions", "files"] + "required": [ + "additions", + "deletions", + "files" + ] }, "share": { "type": "object", @@ -12152,7 +13023,9 @@ "type": "string" } }, - "required": ["url"] + "required": [ + "url" + ] }, "title": { "type": "string" @@ -12176,7 +13049,10 @@ "type": "number" } }, - "required": ["created", "updated"] + "required": [ + "created", + "updated" + ] }, "permission": { "$ref": "#/components/schemas/PermissionRuleset" @@ -12197,10 +13073,20 @@ "type": "string" } }, - "required": ["messageID"] + "required": [ + "messageID" + ] } }, - "required": ["id", "slug", "projectID", "directory", "title", "version", "time"] + "required": [ + "id", + "slug", + "projectID", + "directory", + "title", + "version", + "time" + ] }, "Event.session.created": { "type": "object", @@ -12216,10 +13102,15 @@ "$ref": "#/components/schemas/Session" } }, - "required": ["info"] + "required": [ + "info" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.session.updated": { "type": "object", @@ -12235,10 +13126,15 @@ "$ref": "#/components/schemas/Session" } }, - "required": ["info"] + "required": [ + "info" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.session.deleted": { "type": "object", @@ -12254,10 +13150,15 @@ "$ref": "#/components/schemas/Session" } }, - "required": ["info"] + "required": [ + "info" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.session.diff": { "type": "object", @@ -12279,10 +13180,16 @@ } } }, - "required": ["sessionID", "diff"] + "required": [ + "sessionID", + "diff" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.session.error": { "type": "object", @@ -12325,7 +13232,10 @@ } } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.session.turn.open": { "type": "object", @@ -12341,10 +13251,15 @@ "type": "string" } }, - "required": ["sessionID"] + "required": [ + "sessionID" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.session.turn.close": { "type": "object", @@ -12361,13 +13276,23 @@ }, "reason": { "type": "string", - "enum": ["completed", "error", "interrupted"] + "enum": [ + "completed", + "error", + "interrupted" + ] } }, - "required": ["sessionID", "reason"] + "required": [ + "sessionID", + "reason" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.vcs.branch.updated": { "type": "object", @@ -12385,7 +13310,10 @@ } } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.workspace.ready": { "type": "object", @@ -12401,10 +13329,15 @@ "type": "string" } }, - "required": ["name"] + "required": [ + "name" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.workspace.failed": { "type": "object", @@ -12420,10 +13353,15 @@ "type": "string" } }, - "required": ["message"] + "required": [ + "message" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Pty": { "type": "object", @@ -12449,13 +13387,24 @@ }, "status": { "type": "string", - "enum": ["running", "exited"] + "enum": [ + "running", + "exited" + ] }, "pid": { "type": "number" } }, - "required": ["id", "title", "command", "args", "cwd", "status", "pid"] + "required": [ + "id", + "title", + "command", + "args", + "cwd", + "status", + "pid" + ] }, "Event.pty.created": { "type": "object", @@ -12471,10 +13420,15 @@ "$ref": "#/components/schemas/Pty" } }, - "required": ["info"] + "required": [ + "info" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.pty.updated": { "type": "object", @@ -12490,10 +13444,15 @@ "$ref": "#/components/schemas/Pty" } }, - "required": ["info"] + "required": [ + "info" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.pty.exited": { "type": "object", @@ -12513,10 +13472,16 @@ "type": "number" } }, - "required": ["id", "exitCode"] + "required": [ + "id", + "exitCode" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.pty.deleted": { "type": "object", @@ -12533,10 +13498,15 @@ "pattern": "^pty.*" } }, - "required": ["id"] + "required": [ + "id" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.worktree.ready": { "type": "object", @@ -12555,10 +13525,16 @@ "type": "string" } }, - "required": ["name", "branch"] + "required": [ + "name", + "branch" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event.worktree.failed": { "type": "object", @@ -12574,10 +13550,15 @@ "type": "string" } }, - "required": ["message"] + "required": [ + "message" + ] } }, - "required": ["type", "properties"] + "required": [ + "type", + "properties" + ] }, "Event": { "anyOf": [ @@ -12611,6 +13592,36 @@ { "$ref": "#/components/schemas/Event.file.edited" }, + { + "$ref": "#/components/schemas/Event.tui.prompt.append" + }, + { + "$ref": "#/components/schemas/Event.tui.command.execute" + }, + { + "$ref": "#/components/schemas/Event.tui.toast.show" + }, + { + "$ref": "#/components/schemas/Event.tui.session.select" + }, + { + "$ref": "#/components/schemas/Event.mcp.tools.changed" + }, + { + "$ref": "#/components/schemas/Event.mcp.browser.open.failed" + }, + { + "$ref": "#/components/schemas/Event.session.network.asked" + }, + { + "$ref": "#/components/schemas/Event.session.network.replied" + }, + { + "$ref": "#/components/schemas/Event.session.network.rejected" + }, + { + "$ref": "#/components/schemas/Event.session.network.restored" + }, { "$ref": "#/components/schemas/Event.message.updated" }, @@ -12647,33 +13658,6 @@ { "$ref": "#/components/schemas/Event.question.rejected" }, - { - "$ref": "#/components/schemas/Event.tui.prompt.append" - }, - { - "$ref": "#/components/schemas/Event.tui.command.execute" - }, - { - "$ref": "#/components/schemas/Event.tui.toast.show" - }, - { - "$ref": "#/components/schemas/Event.tui.session.select" - }, - { - "$ref": "#/components/schemas/Event.mcp.tools.changed" - }, - { - "$ref": "#/components/schemas/Event.mcp.browser.open.failed" - }, - { - "$ref": "#/components/schemas/Event.session.network.asked" - }, - { - "$ref": "#/components/schemas/Event.session.network.replied" - }, - { - "$ref": "#/components/schemas/Event.session.network.rejected" - }, { "$ref": "#/components/schemas/Event.session.compacted" }, @@ -12746,12 +13730,20 @@ "$ref": "#/components/schemas/Event" } }, - "required": ["directory", "payload"] + "required": [ + "directory", + "payload" + ] }, "LogLevel": { "description": "Log level", "type": "string", - "enum": ["DEBUG", "INFO", "WARN", "ERROR"] + "enum": [ + "DEBUG", + "INFO", + "WARN", + "ERROR" + ] }, "ServerConfig": { "description": "Server configuration for kilo serve and web commands", @@ -12789,7 +13781,11 @@ "anyOf": [ { "type": "string", - "enum": ["ask", "allow", "deny"] + "enum": [ + "ask", + "allow", + "deny" + ] }, { "type": "null" @@ -12932,7 +13928,11 @@ }, "mode": { "type": "string", - "enum": ["subagent", "primary", "all"] + "enum": [ + "subagent", + "primary", + "all" + ] }, "hidden": { "description": "Hide this subagent from the @ autocomplete menu (default: false, only applies to mode: subagent)", @@ -12954,7 +13954,15 @@ }, { "type": "string", - "enum": ["primary", "secondary", "accent", "success", "warning", "error", "info"] + "enum": [ + "primary", + "secondary", + "accent", + "success", + "warning", + "error", + "info" + ] } ] }, @@ -13040,10 +14048,15 @@ "properties": { "field": { "type": "string", - "enum": ["reasoning_content", "reasoning_details"] + "enum": [ + "reasoning_content", + "reasoning_details" + ] } }, - "required": ["field"], + "required": [ + "field" + ], "additionalProperties": false } ] @@ -13079,10 +14092,16 @@ "type": "number" } }, - "required": ["input", "output"] + "required": [ + "input", + "output" + ] } }, - "required": ["input", "output"] + "required": [ + "input", + "output" + ] }, "limit": { "type": "object", @@ -13097,7 +14116,10 @@ "type": "number" } }, - "required": ["context", "output"] + "required": [ + "context", + "output" + ] }, "modalities": { "type": "object", @@ -13106,39 +14128,70 @@ "type": "array", "items": { "type": "string", - "enum": ["text", "audio", "image", "video", "pdf"] + "enum": [ + "text", + "audio", + "image", + "video", + "pdf" + ] } }, "output": { "type": "array", "items": { "type": "string", - "enum": ["text", "audio", "image", "video", "pdf"] + "enum": [ + "text", + "audio", + "image", + "video", + "pdf" + ] } } }, - "required": ["input", "output"] + "required": [ + "input", + "output" + ] }, "recommendedIndex": { "type": "number" }, "prompt": { "type": "string", - "enum": ["codex", "gemini", "beast", "anthropic", "trinity", "anthropic_without_todo"] + "enum": [ + "codex", + "gemini", + "beast", + "anthropic", + "trinity", + "anthropic_without_todo" + ] }, "isFree": { "type": "boolean" }, "ai_sdk_provider": { "type": "string", - "enum": ["anthropic", "openai", "openai-compatible", "openrouter"] + "enum": [ + "anthropic", + "openai", + "openai-compatible", + "openrouter" + ] }, "experimental": { "type": "boolean" }, "status": { "type": "string", - "enum": ["alpha", "beta", "deprecated"] + "enum": [ + "alpha", + "beta", + "deprecated" + ] }, "options": { "type": "object", @@ -13274,7 +14327,10 @@ "maximum": 9007199254740991 } }, - "required": ["type", "command"], + "required": [ + "type", + "command" + ], "additionalProperties": false }, "McpOAuthConfig": { @@ -13340,13 +14396,19 @@ "maximum": 9007199254740991 } }, - "required": ["type", "url"], + "required": [ + "type", + "url" + ], "additionalProperties": false }, "LayoutConfig": { "description": "@deprecated Always uses stretch layout.", "type": "string", - "enum": ["auto", "stretch"] + "enum": [ + "auto", + "stretch" + ] }, "Config": { "type": "object", @@ -13386,7 +14448,9 @@ "type": "boolean" } }, - "required": ["template"] + "required": [ + "template" + ] } }, "skills": { @@ -13432,7 +14496,11 @@ "share": { "description": "Control sharing behavior:'manual' allows manual sharing via commands, 'auto' enables automatic sharing, 'disabled' disables all sharing", "type": "string", - "enum": ["manual", "auto", "disabled"] + "enum": [ + "manual", + "auto", + "disabled" + ] }, "autoshare": { "description": "@deprecated Use 'share' field instead. Share newly created sessions automatically", @@ -13587,7 +14655,9 @@ "type": "boolean" } }, - "required": ["enabled"], + "required": [ + "enabled" + ], "additionalProperties": false } ] @@ -13657,7 +14727,9 @@ "const": true } }, - "required": ["disabled"] + "required": [ + "disabled" + ] }, { "type": "object", @@ -13694,7 +14766,9 @@ "additionalProperties": {} } }, - "required": ["command"] + "required": [ + "command" + ] } ] } @@ -13811,7 +14885,11 @@ "const": false } }, - "required": ["data", "errors", "success"] + "required": [ + "data", + "errors", + "success" + ] }, "OAuth": { "type": "object", @@ -13836,7 +14914,12 @@ "type": "string" } }, - "required": ["type", "refresh", "access", "expires"] + "required": [ + "type", + "refresh", + "access", + "expires" + ] }, "ApiAuth": { "type": "object", @@ -13849,7 +14932,10 @@ "type": "string" } }, - "required": ["type", "key"] + "required": [ + "type", + "key" + ] }, "WellKnownAuth": { "type": "object", @@ -13865,7 +14951,11 @@ "type": "string" } }, - "required": ["type", "key", "token"] + "required": [ + "type", + "key", + "token" + ] }, "Auth": { "anyOf": [ @@ -13894,10 +14984,15 @@ "type": "string" } }, - "required": ["message"] + "required": [ + "message" + ] } }, - "required": ["name", "data"] + "required": [ + "name", + "data" + ] }, "Model": { "type": "object", @@ -13921,7 +15016,11 @@ "type": "string" } }, - "required": ["id", "url", "npm"] + "required": [ + "id", + "url", + "npm" + ] }, "name": { "type": "string" @@ -13963,7 +15062,13 @@ "type": "boolean" } }, - "required": ["text", "audio", "image", "video", "pdf"] + "required": [ + "text", + "audio", + "image", + "video", + "pdf" + ] }, "output": { "type": "object", @@ -13984,7 +15089,13 @@ "type": "boolean" } }, - "required": ["text", "audio", "image", "video", "pdf"] + "required": [ + "text", + "audio", + "image", + "video", + "pdf" + ] }, "interleaved": { "anyOf": [ @@ -13996,15 +15107,28 @@ "properties": { "field": { "type": "string", - "enum": ["reasoning_content", "reasoning_details"] + "enum": [ + "reasoning_content", + "reasoning_details" + ] } }, - "required": ["field"] + "required": [ + "field" + ] } ] } }, - "required": ["temperature", "reasoning", "attachment", "toolcall", "input", "output", "interleaved"] + "required": [ + "temperature", + "reasoning", + "attachment", + "toolcall", + "input", + "output", + "interleaved" + ] }, "cost": { "type": "object", @@ -14025,7 +15149,10 @@ "type": "number" } }, - "required": ["read", "write"] + "required": [ + "read", + "write" + ] }, "experimentalOver200K": { "type": "object", @@ -14046,13 +15173,24 @@ "type": "number" } }, - "required": ["read", "write"] + "required": [ + "read", + "write" + ] } }, - "required": ["input", "output", "cache"] + "required": [ + "input", + "output", + "cache" + ] } }, - "required": ["input", "output", "cache"] + "required": [ + "input", + "output", + "cache" + ] }, "limit": { "type": "object", @@ -14067,11 +15205,19 @@ "type": "number" } }, - "required": ["context", "output"] + "required": [ + "context", + "output" + ] }, "status": { "type": "string", - "enum": ["alpha", "beta", "deprecated", "active"] + "enum": [ + "alpha", + "beta", + "deprecated", + "active" + ] }, "options": { "type": "object", @@ -14110,14 +15256,26 @@ }, "prompt": { "type": "string", - "enum": ["codex", "gemini", "beast", "anthropic", "trinity", "anthropic_without_todo"] + "enum": [ + "codex", + "gemini", + "beast", + "anthropic", + "trinity", + "anthropic_without_todo" + ] }, "isFree": { "type": "boolean" }, "ai_sdk_provider": { "type": "string", - "enum": ["anthropic", "openai", "openai-compatible", "openrouter"] + "enum": [ + "anthropic", + "openai", + "openai-compatible", + "openrouter" + ] } }, "required": [ @@ -14145,7 +15303,12 @@ }, "source": { "type": "string", - "enum": ["env", "config", "custom", "api"] + "enum": [ + "env", + "config", + "custom", + "api" + ] }, "env": { "type": "array", @@ -14173,7 +15336,14 @@ } } }, - "required": ["id", "name", "source", "env", "options", "models"] + "required": [ + "id", + "name", + "source", + "env", + "options", + "models" + ] }, "ToolIDs": { "type": "array", @@ -14192,7 +15362,11 @@ }, "parameters": {} }, - "required": ["id", "description", "parameters"] + "required": [ + "id", + "description", + "parameters" + ] }, "ToolList": { "type": "array", @@ -14252,7 +15426,15 @@ "type": "string" } }, - "required": ["id", "type", "branch", "name", "directory", "extra", "projectID"] + "required": [ + "id", + "type", + "branch", + "name", + "directory", + "extra", + "projectID" + ] }, "Worktree": { "type": "object", @@ -14267,7 +15449,11 @@ "type": "string" } }, - "required": ["name", "branch", "directory"] + "required": [ + "name", + "branch", + "directory" + ] }, "WorktreeCreateInput": { "type": "object", @@ -14288,7 +15474,9 @@ "type": "string" } }, - "required": ["directory"] + "required": [ + "directory" + ] }, "WorktreeResetInput": { "type": "object", @@ -14297,7 +15485,9 @@ "type": "string" } }, - "required": ["directory"] + "required": [ + "directory" + ] }, "WorktreeDiffItem": { "type": "object", @@ -14319,7 +15509,11 @@ }, "status": { "type": "string", - "enum": ["added", "deleted", "modified"] + "enum": [ + "added", + "deleted", + "modified" + ] }, "tracked": { "type": "boolean" @@ -14359,7 +15553,10 @@ "type": "string" } }, - "required": ["id", "worktree"] + "required": [ + "id", + "worktree" + ] }, "GlobalSession": { "type": "object", @@ -14412,14 +15609,26 @@ }, "status": { "type": "string", - "enum": ["added", "deleted", "modified"] + "enum": [ + "added", + "deleted", + "modified" + ] } }, - "required": ["file", "additions", "deletions"] + "required": [ + "file", + "additions", + "deletions" + ] } } }, - "required": ["additions", "deletions", "files"] + "required": [ + "additions", + "deletions", + "files" + ] }, "share": { "type": "object", @@ -14428,7 +15637,9 @@ "type": "string" } }, - "required": ["url"] + "required": [ + "url" + ] }, "title": { "type": "string" @@ -14452,7 +15663,10 @@ "type": "number" } }, - "required": ["created", "updated"] + "required": [ + "created", + "updated" + ] }, "permission": { "$ref": "#/components/schemas/PermissionRuleset" @@ -14473,7 +15687,9 @@ "type": "string" } }, - "required": ["messageID"] + "required": [ + "messageID" + ] }, "project": { "anyOf": [ @@ -14486,7 +15702,16 @@ ] } }, - "required": ["id", "slug", "projectID", "directory", "title", "version", "time", "project"] + "required": [ + "id", + "slug", + "projectID", + "directory", + "title", + "version", + "time", + "project" + ] }, "McpResource": { "type": "object", @@ -14507,7 +15732,11 @@ "type": "string" } }, - "required": ["name", "uri", "client"] + "required": [ + "name", + "uri", + "client" + ] }, "TextPartInput": { "type": "object", @@ -14538,7 +15767,9 @@ "type": "number" } }, - "required": ["start"] + "required": [ + "start" + ] }, "metadata": { "type": "object", @@ -14548,7 +15779,10 @@ "additionalProperties": {} } }, - "required": ["type", "text"] + "required": [ + "type", + "text" + ] }, "FilePartInput": { "type": "object", @@ -14573,7 +15807,11 @@ "$ref": "#/components/schemas/FilePartSource" } }, - "required": ["type", "mime", "url"] + "required": [ + "type", + "mime", + "url" + ] }, "AgentPartInput": { "type": "object", @@ -14605,10 +15843,17 @@ "maximum": 9007199254740991 } }, - "required": ["value", "start", "end"] + "required": [ + "value", + "start", + "end" + ] } }, - "required": ["type", "name"] + "required": [ + "type", + "name" + ] }, "SubtaskPartInput": { "type": "object", @@ -14639,13 +15884,21 @@ "type": "string" } }, - "required": ["providerID", "modelID"] + "required": [ + "providerID", + "modelID" + ] }, "command": { "type": "string" } }, - "required": ["type", "prompt", "description", "agent"] + "required": [ + "type", + "prompt", + "description", + "agent" + ] }, "ProviderAuthMethod": { "type": "object", @@ -14666,7 +15919,10 @@ "type": "string" } }, - "required": ["type", "label"] + "required": [ + "type", + "label" + ] }, "ProviderAuthAuthorization": { "type": "object", @@ -14690,7 +15946,11 @@ "type": "string" } }, - "required": ["url", "method", "instructions"] + "required": [ + "url", + "method", + "instructions" + ] }, "Symbol": { "type": "object", @@ -14711,10 +15971,17 @@ "$ref": "#/components/schemas/Range" } }, - "required": ["uri", "range"] + "required": [ + "uri", + "range" + ] } }, - "required": ["name", "kind", "location"] + "required": [ + "name", + "kind", + "location" + ] }, "FileNode": { "type": "object", @@ -14730,20 +15997,32 @@ }, "type": { "type": "string", - "enum": ["file", "directory"] + "enum": [ + "file", + "directory" + ] }, "ignored": { "type": "boolean" } }, - "required": ["name", "path", "absolute", "type", "ignored"] + "required": [ + "name", + "path", + "absolute", + "type", + "ignored" + ] }, "FileContent": { "type": "object", "properties": { "type": { "type": "string", - "enum": ["text", "binary"] + "enum": [ + "text", + "binary" + ] }, "content": { "type": "string" @@ -14790,14 +16069,24 @@ } } }, - "required": ["oldStart", "oldLines", "newStart", "newLines", "lines"] + "required": [ + "oldStart", + "oldLines", + "newStart", + "newLines", + "lines" + ] } }, "index": { "type": "string" } }, - "required": ["oldFileName", "newFileName", "hunks"] + "required": [ + "oldFileName", + "newFileName", + "hunks" + ] }, "encoding": { "type": "string", @@ -14807,7 +16096,10 @@ "type": "string" } }, - "required": ["type", "content"] + "required": [ + "type", + "content" + ] }, "File": { "type": "object", @@ -14827,10 +16119,19 @@ }, "status": { "type": "string", - "enum": ["added", "deleted", "modified"] + "enum": [ + "added", + "deleted", + "modified" + ] } }, - "required": ["path", "added", "removed", "status"] + "required": [ + "path", + "added", + "removed", + "status" + ] }, "MCPStatusConnected": { "type": "object", @@ -14840,7 +16141,9 @@ "const": "connected" } }, - "required": ["status"] + "required": [ + "status" + ] }, "MCPStatusDisabled": { "type": "object", @@ -14850,7 +16153,9 @@ "const": "disabled" } }, - "required": ["status"] + "required": [ + "status" + ] }, "MCPStatusFailed": { "type": "object", @@ -14863,7 +16168,10 @@ "type": "string" } }, - "required": ["status", "error"] + "required": [ + "status", + "error" + ] }, "MCPStatusNeedsAuth": { "type": "object", @@ -14873,7 +16181,9 @@ "const": "needs_auth" } }, - "required": ["status"] + "required": [ + "status" + ] }, "MCPStatusNeedsClientRegistration": { "type": "object", @@ -14886,7 +16196,10 @@ "type": "string" } }, - "required": ["status", "error"] + "required": [ + "status", + "error" + ] }, "MCPStatus": { "anyOf": [ @@ -14926,7 +16239,13 @@ "type": "string" } }, - "required": ["home", "state", "config", "worktree", "directory"] + "required": [ + "home", + "state", + "config", + "worktree", + "directory" + ] }, "VcsInfo": { "type": "object", @@ -14935,7 +16254,9 @@ "type": "string" } }, - "required": ["branch"] + "required": [ + "branch" + ] }, "Command": { "type": "object", @@ -14954,7 +16275,11 @@ }, "source": { "type": "string", - "enum": ["command", "mcp", "skill"] + "enum": [ + "command", + "mcp", + "skill" + ] }, "template": { "anyOf": [ @@ -14976,7 +16301,11 @@ } } }, - "required": ["name", "template", "hints"] + "required": [ + "name", + "template", + "hints" + ] }, "Agent": { "type": "object", @@ -14992,7 +16321,11 @@ }, "mode": { "type": "string", - "enum": ["subagent", "primary", "all"] + "enum": [ + "subagent", + "primary", + "all" + ] }, "native": { "type": "boolean" @@ -15025,7 +16358,10 @@ "type": "string" } }, - "required": ["modelID", "providerID"] + "required": [ + "modelID", + "providerID" + ] }, "variant": { "type": "string" @@ -15046,7 +16382,12 @@ "maximum": 9007199254740991 } }, - "required": ["name", "mode", "permission", "options"] + "required": [ + "name", + "mode", + "permission", + "options" + ] }, "LSPStatus": { "type": "object", @@ -15073,7 +16414,12 @@ ] } }, - "required": ["id", "name", "root", "status"] + "required": [ + "id", + "name", + "root", + "status" + ] }, "FormatterStatus": { "type": "object", @@ -15091,8 +16437,12 @@ "type": "boolean" } }, - "required": ["name", "extensions", "enabled"] + "required": [ + "name", + "extensions", + "enabled" + ] } } } -} +} \ No newline at end of file From 8fbe4295ac29db22482c3ccfa8e41b630131b500 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Sat, 4 Apr 2026 00:15:09 +0300 Subject: [PATCH 26/58] fix(sdk): minimize openapi.json diff by preserving base formatting Start from main's openapi.json and surgically add only the new network endpoints, schemas, and events instead of regenerating the entire file. Reduces the SDK diff from ~2600 lines to ~350 additions. --- packages/sdk/js/src/v2/gen/sdk.gen.ts | 342 +++--- packages/sdk/js/src/v2/gen/types.gen.ts | 533 ++++----- packages/sdk/openapi.json | 1358 ++++++++++++----------- 3 files changed, 1172 insertions(+), 1061 deletions(-) diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts index d53c8693869..2a01144fdf2 100644 --- a/packages/sdk/js/src/v2/gen/sdk.gen.ts +++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts @@ -361,44 +361,6 @@ export class Global extends HeyApiClient { } } -export class Remote extends HeyApiClient { - /** - * Enable remote connection - * - * Enable WebSocket connection to UserConnectionDO for real-time session relay and commands. - */ - public enable(options?: Options) { - return (options?.client ?? this.client).post({ - url: "/remote/enable", - ...options, - }) - } - - /** - * Disable remote connection - * - * Close the remote WebSocket connection to UserConnectionDO. - */ - public disable(options?: Options) { - return (options?.client ?? this.client).post({ - url: "/remote/disable", - ...options, - }) - } - - /** - * Get remote connection status - * - * Get the current state of the remote WebSocket connection. - */ - public status(options?: Options) { - return (options?.client ?? this.client).get({ - url: "/remote/status", - ...options, - }) - } -} - export class Auth extends HeyApiClient { /** * Remove auth credentials @@ -2766,102 +2728,6 @@ export class Question extends HeyApiClient { } } -export class Network extends HeyApiClient { - /** - * List pending network waits - * - * Get all pending network reconnect requests across all sessions. - */ - public list( - parameters?: { - directory?: string - workspace?: string - }, - options?: Options, - ) { - const params = buildClientParams( - [parameters], - [ - { - args: [ - { in: "query", key: "directory" }, - { in: "query", key: "workspace" }, - ], - }, - ], - ) - return (options?.client ?? this.client).get({ - url: "/network", - ...options, - ...params, - }) - } - - /** - * Resume after network wait - * - * Resume a pending session after reconnecting network-dependent services. - */ - public reply( - parameters: { - requestID: string - directory?: string - workspace?: string - }, - options?: Options, - ) { - const params = buildClientParams( - [parameters], - [ - { - args: [ - { in: "path", key: "requestID" }, - { in: "query", key: "directory" }, - { in: "query", key: "workspace" }, - ], - }, - ], - ) - return (options?.client ?? this.client).post({ - url: "/network/{requestID}/reply", - ...options, - ...params, - }) - } - - /** - * Reject network resume request - * - * Stop a pending session instead of resuming after network reconnect. - */ - public reject( - parameters: { - requestID: string - directory?: string - workspace?: string - }, - options?: Options, - ) { - const params = buildClientParams( - [parameters], - [ - { - args: [ - { in: "path", key: "requestID" }, - { in: "query", key: "directory" }, - { in: "query", key: "workspace" }, - ], - }, - ], - ) - return (options?.client ?? this.client).post({ - url: "/network/{requestID}/reject", - ...options, - ...params, - }) - } -} - export class Oauth extends HeyApiClient { /** * OAuth authorize @@ -3062,6 +2928,98 @@ export class Telemetry extends HeyApiClient { } } +export class Remote extends HeyApiClient { + /** + * Enable remote connection + * + * Enable WebSocket connection to UserConnectionDO for real-time session relay and commands. + */ + public enable( + parameters?: { + directory?: string + workspace?: string + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + ], + }, + ], + ) + return (options?.client ?? this.client).post({ + url: "/remote/enable", + ...options, + ...params, + }) + } + + /** + * Disable remote connection + * + * Close the remote WebSocket connection to UserConnectionDO. + */ + public disable( + parameters?: { + directory?: string + workspace?: string + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + ], + }, + ], + ) + return (options?.client ?? this.client).post({ + url: "/remote/disable", + ...options, + ...params, + }) + } + + /** + * Get remote connection status + * + * Get the current state of the remote WebSocket connection. + */ + public status( + parameters?: { + directory?: string + workspace?: string + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + ], + }, + ], + ) + return (options?.client ?? this.client).get({ + url: "/remote/status", + ...options, + ...params, + }) + } +} + export class CommitMessage extends HeyApiClient { /** * Generate commit message @@ -5245,6 +5203,102 @@ export class Event extends HeyApiClient { } } +export class Network extends HeyApiClient { + /** + * List pending network waits + * + * Get all pending network reconnect requests across all sessions. + */ + public list( + parameters?: { + directory?: string + workspace?: string + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + ], + }, + ], + ) + return (options?.client ?? this.client).get({ + url: "/network", + ...options, + ...params, + }) + } + + /** + * Resume after network wait + * + * Resume a pending session after reconnecting network-dependent services. + */ + public reply( + parameters: { + requestID: string + directory?: string + workspace?: string + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "path", key: "requestID" }, + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + ], + }, + ], + ) + return (options?.client ?? this.client).post({ + url: "/network/{requestID}/reply", + ...options, + ...params, + }) + } + + /** + * Reject network resume request + * + * Stop a pending session instead of resuming after network reconnect. + */ + public reject( + parameters: { + requestID: string + directory?: string + workspace?: string + }, + options?: Options, + ) { + const params = buildClientParams( + [parameters], + [ + { + args: [ + { in: "path", key: "requestID" }, + { in: "query", key: "directory" }, + { in: "query", key: "workspace" }, + ], + }, + ], + ) + return (options?.client ?? this.client).post({ + url: "/network/{requestID}/reject", + ...options, + ...params, + }) + } +} + export class KiloClient extends HeyApiClient { public static readonly __registry = new HeyApiRegistry() @@ -5258,11 +5312,6 @@ export class KiloClient extends HeyApiClient { return (this._global ??= new Global({ client: this.client })) } - private _remote?: Remote - get remote(): Remote { - return (this._remote ??= new Remote({ client: this.client })) - } - private _auth?: Auth get auth(): Auth { return (this._auth ??= new Auth({ client: this.client })) @@ -5318,11 +5367,6 @@ export class KiloClient extends HeyApiClient { return (this._question ??= new Question({ client: this.client })) } - private _network?: Network - get network(): Network { - return (this._network ??= new Network({ client: this.client })) - } - private _provider?: Provider get provider(): Provider { return (this._provider ??= new Provider({ client: this.client })) @@ -5333,6 +5377,11 @@ export class KiloClient extends HeyApiClient { return (this._telemetry ??= new Telemetry({ client: this.client })) } + private _remote?: Remote + get remote(): Remote { + return (this._remote ??= new Remote({ client: this.client })) + } + private _commitMessage?: CommitMessage get commitMessage(): CommitMessage { return (this._commitMessage ??= new CommitMessage({ client: this.client })) @@ -5412,4 +5461,9 @@ export class KiloClient extends HeyApiClient { get event(): Event { return (this._event ??= new Event({ client: this.client })) } + + private _network?: Network + get network(): Network { + return (this._network ??= new Network({ client: this.client })) + } } diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index 20e26bd95c5..e998c1b1748 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -97,114 +97,6 @@ export type EventFileEdited = { } } -export type EventTuiPromptAppend = { - type: "tui.prompt.append" - properties: { - text: string - } -} - -export type EventTuiCommandExecute = { - type: "tui.command.execute" - properties: { - command: - | "session.list" - | "session.new" - | "session.share" - | "session.interrupt" - | "session.compact" - | "session.page.up" - | "session.page.down" - | "session.line.up" - | "session.line.down" - | "session.half.page.up" - | "session.half.page.down" - | "session.first" - | "session.last" - | "prompt.clear" - | "prompt.submit" - | "agent.cycle" - | string - } -} - -export type EventTuiToastShow = { - type: "tui.toast.show" - properties: { - title?: string - message: string - variant: "info" | "success" | "warning" | "error" - /** - * Duration in milliseconds - */ - duration?: number - } -} - -export type EventTuiSessionSelect = { - type: "tui.session.select" - properties: { - /** - * Session ID to navigate to - */ - sessionID: string - } -} - -export type EventMcpToolsChanged = { - type: "mcp.tools.changed" - properties: { - server: string - } -} - -export type EventMcpBrowserOpenFailed = { - type: "mcp.browser.open.failed" - properties: { - mcpName: string - url: string - } -} - -export type SessionNetworkWait = { - id: string - sessionID: string - message: string - restored: boolean - time: { - created: number - } -} - -export type EventSessionNetworkAsked = { - type: "session.network.asked" - properties: SessionNetworkWait -} - -export type EventSessionNetworkReplied = { - type: "session.network.replied" - properties: { - sessionID: string - requestID: string - } -} - -export type EventSessionNetworkRejected = { - type: "session.network.rejected" - properties: { - sessionID: string - requestID: string - } -} - -export type EventSessionNetworkRestored = { - type: "session.network.restored" - properties: { - sessionID: string - requestID: string - } -} - export type OutputFormatText = { type: "text" } @@ -846,6 +738,75 @@ export type EventTodoUpdated = { } } +export type EventTuiPromptAppend = { + type: "tui.prompt.append" + properties: { + text: string + } +} + +export type EventTuiCommandExecute = { + type: "tui.command.execute" + properties: { + command: + | "session.list" + | "session.new" + | "session.share" + | "session.interrupt" + | "session.compact" + | "session.page.up" + | "session.page.down" + | "session.line.up" + | "session.line.down" + | "session.half.page.up" + | "session.half.page.down" + | "session.first" + | "session.last" + | "prompt.clear" + | "prompt.submit" + | "agent.cycle" + | string + } +} + +export type EventTuiToastShow = { + type: "tui.toast.show" + properties: { + title?: string + message: string + variant: "info" | "success" | "warning" | "error" + /** + * Duration in milliseconds + */ + duration?: number + } +} + +export type EventTuiSessionSelect = { + type: "tui.session.select" + properties: { + /** + * Session ID to navigate to + */ + sessionID: string + } +} + +export type EventMcpToolsChanged = { + type: "mcp.tools.changed" + properties: { + server: string + } +} + +export type EventMcpBrowserOpenFailed = { + type: "mcp.browser.open.failed" + properties: { + mcpName: string + url: string + } +} + export type EventCommandExecuted = { type: "command.executed" properties: { @@ -1049,16 +1010,6 @@ export type Event = | EventLspClientDiagnostics | EventLspUpdated | EventFileEdited - | EventTuiPromptAppend - | EventTuiCommandExecute - | EventTuiToastShow - | EventTuiSessionSelect - | EventMcpToolsChanged - | EventMcpBrowserOpenFailed - | EventSessionNetworkAsked - | EventSessionNetworkReplied - | EventSessionNetworkRejected - | EventSessionNetworkRestored | EventMessageUpdated | EventMessageRemoved | EventMessagePartUpdated @@ -1071,9 +1022,19 @@ export type Event = | EventQuestionAsked | EventQuestionReplied | EventQuestionRejected + | EventSessionNetworkAsked + | EventSessionNetworkReplied + | EventSessionNetworkRejected + | EventSessionNetworkRestored | EventSessionCompacted | EventFileWatcherUpdated | EventTodoUpdated + | EventTuiPromptAppend + | EventTuiCommandExecute + | EventTuiToastShow + | EventTuiSessionSelect + | EventMcpToolsChanged + | EventMcpBrowserOpenFailed | EventCommandExecuted | EventSessionCreated | EventSessionUpdated @@ -2032,6 +1993,45 @@ export type FormatterStatus = { enabled: boolean } +export type SessionNetworkWait = { + id: string + sessionID: string + message: string + restored: boolean + time: { + created: number + } +} + +export type EventSessionNetworkAsked = { + type: "session.network.asked" + properties: SessionNetworkWait +} + +export type EventSessionNetworkReplied = { + type: "session.network.replied" + properties: { + sessionID: string + requestID: string + } +} + +export type EventSessionNetworkRejected = { + type: "session.network.rejected" + properties: { + sessionID: string + requestID: string + } +} + +export type EventSessionNetworkRestored = { + type: "session.network.restored" + properties: { + sessionID: string + requestID: string + } +} + export type GlobalHealthData = { body?: never path?: never @@ -2124,63 +2124,6 @@ export type GlobalDisposeResponses = { export type GlobalDisposeResponse = GlobalDisposeResponses[keyof GlobalDisposeResponses] -export type RemoteEnableData = { - body?: never - path?: never - query?: never - url: "/remote/enable" -} - -export type RemoteEnableResponses = { - /** - * Remote connection enabled - */ - 200: { - enabled: boolean - connected: boolean - } -} - -export type RemoteEnableResponse = RemoteEnableResponses[keyof RemoteEnableResponses] - -export type RemoteDisableData = { - body?: never - path?: never - query?: never - url: "/remote/disable" -} - -export type RemoteDisableResponses = { - /** - * Remote connection disabled - */ - 200: { - enabled: boolean - connected: boolean - } -} - -export type RemoteDisableResponse = RemoteDisableResponses[keyof RemoteDisableResponses] - -export type RemoteStatusData = { - body?: never - path?: never - query?: never - url: "/remote/status" -} - -export type RemoteStatusResponses = { - /** - * Remote connection status - */ - 200: { - enabled: boolean - connected: boolean - } -} - -export type RemoteStatusResponse = RemoteStatusResponses[keyof RemoteStatusResponses] - export type AuthRemoveData = { body?: never path: { @@ -4270,93 +4213,6 @@ export type QuestionRejectResponses = { export type QuestionRejectResponse = QuestionRejectResponses[keyof QuestionRejectResponses] -export type NetworkListData = { - body?: never - path?: never - query?: { - directory?: string - workspace?: string - } - url: "/network" -} - -export type NetworkListResponses = { - /** - * List of pending network reconnect requests - */ - 200: Array -} - -export type NetworkListResponse = NetworkListResponses[keyof NetworkListResponses] - -export type NetworkReplyData = { - body?: never - path: { - requestID: string - } - query?: { - directory?: string - workspace?: string - } - url: "/network/{requestID}/reply" -} - -export type NetworkReplyErrors = { - /** - * Bad request - */ - 400: BadRequestError - /** - * Not found - */ - 404: NotFoundError -} - -export type NetworkReplyError = NetworkReplyErrors[keyof NetworkReplyErrors] - -export type NetworkReplyResponses = { - /** - * Network wait resumed successfully - */ - 200: boolean -} - -export type NetworkReplyResponse = NetworkReplyResponses[keyof NetworkReplyResponses] - -export type NetworkRejectData = { - body?: never - path: { - requestID: string - } - query?: { - directory?: string - workspace?: string - } - url: "/network/{requestID}/reject" -} - -export type NetworkRejectErrors = { - /** - * Bad request - */ - 400: BadRequestError - /** - * Not found - */ - 404: NotFoundError -} - -export type NetworkRejectError = NetworkRejectErrors[keyof NetworkRejectErrors] - -export type NetworkRejectResponses = { - /** - * Network wait rejected successfully - */ - 200: boolean -} - -export type NetworkRejectResponse = NetworkRejectResponses[keyof NetworkRejectResponses] - export type ProviderListData = { body?: never path?: never @@ -4587,6 +4443,72 @@ export type TelemetryCaptureResponses = { export type TelemetryCaptureResponse = TelemetryCaptureResponses[keyof TelemetryCaptureResponses] +export type RemoteEnableData = { + body?: never + path?: never + query?: { + directory?: string + workspace?: string + } + url: "/remote/enable" +} + +export type RemoteEnableResponses = { + /** + * Remote connection enabled + */ + 200: { + enabled: boolean + connected: boolean + } +} + +export type RemoteEnableResponse = RemoteEnableResponses[keyof RemoteEnableResponses] + +export type RemoteDisableData = { + body?: never + path?: never + query?: { + directory?: string + workspace?: string + } + url: "/remote/disable" +} + +export type RemoteDisableResponses = { + /** + * Remote connection disabled + */ + 200: { + enabled: boolean + connected: boolean + } +} + +export type RemoteDisableResponse = RemoteDisableResponses[keyof RemoteDisableResponses] + +export type RemoteStatusData = { + body?: never + path?: never + query?: { + directory?: string + workspace?: string + } + url: "/remote/status" +} + +export type RemoteStatusResponses = { + /** + * Remote connection status + */ + 200: { + enabled: boolean + connected: boolean + } +} + +export type RemoteStatusResponse = RemoteStatusResponses[keyof RemoteStatusResponses] + export type CommitMessageGenerateData = { body?: { /** @@ -6308,3 +6230,90 @@ export type EventSubscribeResponses = { } export type EventSubscribeResponse = EventSubscribeResponses[keyof EventSubscribeResponses] + +export type NetworkListData = { + body?: never + path?: never + query?: { + directory?: string + workspace?: string + } + url: "/network" +} + +export type NetworkListResponses = { + /** + * List of pending network reconnect requests + */ + 200: Array +} + +export type NetworkListResponse = NetworkListResponses[keyof NetworkListResponses] + +export type NetworkReplyData = { + body?: never + path: { + requestID: string + } + query?: { + directory?: string + workspace?: string + } + url: "/network/{requestID}/reply" +} + +export type NetworkReplyErrors = { + /** + * Bad request + */ + 400: BadRequestError + /** + * Not found + */ + 404: NotFoundError +} + +export type NetworkReplyError = NetworkReplyErrors[keyof NetworkReplyErrors] + +export type NetworkReplyResponses = { + /** + * Network wait resumed successfully + */ + 200: boolean +} + +export type NetworkReplyResponse = NetworkReplyResponses[keyof NetworkReplyResponses] + +export type NetworkRejectData = { + body?: never + path: { + requestID: string + } + query?: { + directory?: string + workspace?: string + } + url: "/network/{requestID}/reject" +} + +export type NetworkRejectErrors = { + /** + * Bad request + */ + 400: BadRequestError + /** + * Not found + */ + 404: NotFoundError +} + +export type NetworkRejectError = NetworkRejectErrors[keyof NetworkRejectErrors] + +export type NetworkRejectResponses = { + /** + * Network wait rejected successfully + */ + 200: boolean +} + +export type NetworkRejectResponse = NetworkRejectResponses[keyof NetworkRejectResponses] diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json index 1225158e9c5..9bb9b2a0511 100644 --- a/packages/sdk/openapi.json +++ b/packages/sdk/openapi.json @@ -161,117 +161,6 @@ ] } }, - "/remote/enable": { - "post": { - "operationId": "remote.enable", - "summary": "Enable remote connection", - "description": "Enable WebSocket connection to UserConnectionDO for real-time session relay and commands.", - "responses": { - "200": { - "description": "Remote connection enabled", - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - }, - "connected": { - "type": "boolean" - } - }, - "required": [ - "enabled", - "connected" - ] - } - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.enable({\n ...\n})" - } - ] - } - }, - "/remote/disable": { - "post": { - "operationId": "remote.disable", - "summary": "Disable remote connection", - "description": "Close the remote WebSocket connection to UserConnectionDO.", - "responses": { - "200": { - "description": "Remote connection disabled", - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - }, - "connected": { - "type": "boolean" - } - }, - "required": [ - "enabled", - "connected" - ] - } - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.disable({\n ...\n})" - } - ] - } - }, - "/remote/status": { - "get": { - "operationId": "remote.status", - "summary": "Get remote connection status", - "description": "Get the current state of the remote WebSocket connection.", - "responses": { - "200": { - "description": "Remote connection status", - "content": { - "application/json": { - "schema": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - }, - "connected": { - "type": "boolean" - } - }, - "required": [ - "enabled", - "connected" - ] - } - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.status({\n ...\n})" - } - ] - } - }, "/auth/{providerID}": { "put": { "operationId": "auth.set", @@ -4933,188 +4822,6 @@ ] } }, - "/network": { - "get": { - "operationId": "network.list", - "parameters": [ - { - "in": "query", - "name": "directory", - "schema": { - "type": "string" - } - }, - { - "in": "query", - "name": "workspace", - "schema": { - "type": "string" - } - } - ], - "summary": "List pending network waits", - "description": "Get all pending network reconnect requests across all sessions.", - "responses": { - "200": { - "description": "List of pending network reconnect requests", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/SessionNetworkWait" - } - } - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.network.list({\n ...\n})" - } - ] - } - }, - "/network/{requestID}/reply": { - "post": { - "operationId": "network.reply", - "parameters": [ - { - "in": "query", - "name": "directory", - "schema": { - "type": "string" - } - }, - { - "in": "query", - "name": "workspace", - "schema": { - "type": "string" - } - }, - { - "in": "path", - "name": "requestID", - "schema": { - "type": "string" - }, - "required": true - } - ], - "summary": "Resume after network wait", - "description": "Resume a pending session after reconnecting network-dependent services.", - "responses": { - "200": { - "description": "Network wait resumed successfully", - "content": { - "application/json": { - "schema": { - "type": "boolean" - } - } - } - }, - "400": { - "description": "Bad request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/BadRequestError" - } - } - } - }, - "404": { - "description": "Not found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundError" - } - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.network.reply({\n ...\n})" - } - ] - } - }, - "/network/{requestID}/reject": { - "post": { - "operationId": "network.reject", - "parameters": [ - { - "in": "query", - "name": "directory", - "schema": { - "type": "string" - } - }, - { - "in": "query", - "name": "workspace", - "schema": { - "type": "string" - } - }, - { - "in": "path", - "name": "requestID", - "schema": { - "type": "string" - }, - "required": true - } - ], - "summary": "Reject network resume request", - "description": "Stop a pending session instead of resuming after network reconnect.", - "responses": { - "200": { - "description": "Network wait rejected successfully", - "content": { - "application/json": { - "schema": { - "type": "boolean" - } - } - } - }, - "400": { - "description": "Bad request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/BadRequestError" - } - } - } - }, - "404": { - "description": "Not found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundError" - } - } - } - } - }, - "x-codeSamples": [ - { - "lang": "js", - "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.network.reject({\n ...\n})" - } - ] - } - }, "/provider": { "get": { "operationId": "provider.list", @@ -5739,6 +5446,165 @@ ] } }, + "/remote/enable": { + "post": { + "operationId": "remote.enable", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + } + ], + "summary": "Enable remote connection", + "description": "Enable WebSocket connection to UserConnectionDO for real-time session relay and commands.", + "responses": { + "200": { + "description": "Remote connection enabled", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "connected": { + "type": "boolean" + } + }, + "required": [ + "enabled", + "connected" + ] + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.enable({\n ...\n})" + } + ] + } + }, + "/remote/disable": { + "post": { + "operationId": "remote.disable", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + } + ], + "summary": "Disable remote connection", + "description": "Close the remote WebSocket connection to UserConnectionDO.", + "responses": { + "200": { + "description": "Remote connection disabled", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "connected": { + "type": "boolean" + } + }, + "required": [ + "enabled", + "connected" + ] + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.disable({\n ...\n})" + } + ] + } + }, + "/remote/status": { + "get": { + "operationId": "remote.status", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + } + ], + "summary": "Get remote connection status", + "description": "Get the current state of the remote WebSocket connection.", + "responses": { + "200": { + "description": "Remote connection status", + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "connected": { + "type": "boolean" + } + }, + "required": [ + "enabled", + "connected" + ] + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.remote.status({\n ...\n})" + } + ] + } + }, "/commit-message": { "post": { "operationId": "commitMessage.generate", @@ -5808,7 +5674,7 @@ } }, "previousMessage": { - "description": "Previously generated message — triggers regeneration with a different result", + "description": "Previously generated message \u2014 triggers regeneration with a different result", "type": "string" } }, @@ -10109,6 +9975,188 @@ } ] } + }, + "/network": { + "get": { + "operationId": "network.list", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + } + ], + "summary": "List pending network waits", + "description": "Get all pending network reconnect requests across all sessions.", + "responses": { + "200": { + "description": "List of pending network reconnect requests", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SessionNetworkWait" + } + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.network.list({\n ...\n})" + } + ] + } + }, + "/network/{requestID}/reply": { + "post": { + "operationId": "network.reply", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + }, + { + "in": "path", + "name": "requestID", + "schema": { + "type": "string" + }, + "required": true + } + ], + "summary": "Resume after network wait", + "description": "Resume a pending session after reconnecting network-dependent services.", + "responses": { + "200": { + "description": "Network wait resumed successfully", + "content": { + "application/json": { + "schema": { + "type": "boolean" + } + } + } + }, + "400": { + "description": "Bad request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/BadRequestError" + } + } + } + }, + "404": { + "description": "Not found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundError" + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.network.reply({\n ...\n})" + } + ] + } + }, + "/network/{requestID}/reject": { + "post": { + "operationId": "network.reject", + "parameters": [ + { + "in": "query", + "name": "directory", + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "workspace", + "schema": { + "type": "string" + } + }, + { + "in": "path", + "name": "requestID", + "schema": { + "type": "string" + }, + "required": true + } + ], + "summary": "Reject network resume request", + "description": "Stop a pending session instead of resuming after network reconnect.", + "responses": { + "200": { + "description": "Network wait rejected successfully", + "content": { + "application/json": { + "schema": { + "type": "boolean" + } + } + } + }, + "400": { + "description": "Bad request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/BadRequestError" + } + } + } + }, + "404": { + "description": "Not found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundError" + } + } + } + } + }, + "x-codeSamples": [ + { + "lang": "js", + "source": "import { createKiloClient } from \"@kilocode/sdk\n\nconst client = createKiloClient()\nawait client.network.reject({\n ...\n})" + } + ] + } } }, "components": { @@ -10392,336 +10440,6 @@ "properties" ] }, - "Event.tui.prompt.append": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "tui.prompt.append" - }, - "properties": { - "type": "object", - "properties": { - "text": { - "type": "string" - } - }, - "required": [ - "text" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "Event.tui.command.execute": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "tui.command.execute" - }, - "properties": { - "type": "object", - "properties": { - "command": { - "anyOf": [ - { - "type": "string", - "enum": [ - "session.list", - "session.new", - "session.share", - "session.interrupt", - "session.compact", - "session.page.up", - "session.page.down", - "session.line.up", - "session.line.down", - "session.half.page.up", - "session.half.page.down", - "session.first", - "session.last", - "prompt.clear", - "prompt.submit", - "agent.cycle" - ] - }, - { - "type": "string" - } - ] - } - }, - "required": [ - "command" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "Event.tui.toast.show": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "tui.toast.show" - }, - "properties": { - "type": "object", - "properties": { - "title": { - "type": "string" - }, - "message": { - "type": "string" - }, - "variant": { - "type": "string", - "enum": [ - "info", - "success", - "warning", - "error" - ] - }, - "duration": { - "description": "Duration in milliseconds", - "default": 5000, - "type": "number" - } - }, - "required": [ - "message", - "variant" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "Event.tui.session.select": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "tui.session.select" - }, - "properties": { - "type": "object", - "properties": { - "sessionID": { - "description": "Session ID to navigate to", - "type": "string", - "pattern": "^ses" - } - }, - "required": [ - "sessionID" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "Event.mcp.tools.changed": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "mcp.tools.changed" - }, - "properties": { - "type": "object", - "properties": { - "server": { - "type": "string" - } - }, - "required": [ - "server" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "Event.mcp.browser.open.failed": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "mcp.browser.open.failed" - }, - "properties": { - "type": "object", - "properties": { - "mcpName": { - "type": "string" - }, - "url": { - "type": "string" - } - }, - "required": [ - "mcpName", - "url" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "SessionNetworkWait": { - "type": "object", - "properties": { - "id": { - "type": "string", - "pattern": "^que.*" - }, - "sessionID": { - "type": "string", - "pattern": "^ses.*" - }, - "message": { - "type": "string" - }, - "restored": { - "type": "boolean" - }, - "time": { - "type": "object", - "properties": { - "created": { - "type": "number" - } - }, - "required": [ - "created" - ] - } - }, - "required": [ - "id", - "sessionID", - "message", - "restored", - "time" - ] - }, - "Event.session.network.asked": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "session.network.asked" - }, - "properties": { - "$ref": "#/components/schemas/SessionNetworkWait" - } - }, - "required": [ - "type", - "properties" - ] - }, - "Event.session.network.replied": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "session.network.replied" - }, - "properties": { - "type": "object", - "properties": { - "sessionID": { - "type": "string" - }, - "requestID": { - "type": "string" - } - }, - "required": [ - "sessionID", - "requestID" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "Event.session.network.rejected": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "session.network.rejected" - }, - "properties": { - "type": "object", - "properties": { - "sessionID": { - "type": "string" - }, - "requestID": { - "type": "string" - } - }, - "required": [ - "sessionID", - "requestID" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, - "Event.session.network.restored": { - "type": "object", - "properties": { - "type": { - "type": "string", - "const": "session.network.restored" - }, - "properties": { - "type": "object", - "properties": { - "sessionID": { - "type": "string" - }, - "requestID": { - "type": "string" - } - }, - "required": [ - "sessionID", - "requestID" - ] - } - }, - "required": [ - "type", - "properties" - ] - }, "OutputFormatText": { "type": "object", "properties": { @@ -12873,6 +12591,199 @@ "properties" ] }, + "Event.tui.prompt.append": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "tui.prompt.append" + }, + "properties": { + "type": "object", + "properties": { + "text": { + "type": "string" + } + }, + "required": [ + "text" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.tui.command.execute": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "tui.command.execute" + }, + "properties": { + "type": "object", + "properties": { + "command": { + "anyOf": [ + { + "type": "string", + "enum": [ + "session.list", + "session.new", + "session.share", + "session.interrupt", + "session.compact", + "session.page.up", + "session.page.down", + "session.line.up", + "session.line.down", + "session.half.page.up", + "session.half.page.down", + "session.first", + "session.last", + "prompt.clear", + "prompt.submit", + "agent.cycle" + ] + }, + { + "type": "string" + } + ] + } + }, + "required": [ + "command" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.tui.toast.show": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "tui.toast.show" + }, + "properties": { + "type": "object", + "properties": { + "title": { + "type": "string" + }, + "message": { + "type": "string" + }, + "variant": { + "type": "string", + "enum": [ + "info", + "success", + "warning", + "error" + ] + }, + "duration": { + "description": "Duration in milliseconds", + "default": 5000, + "type": "number" + } + }, + "required": [ + "message", + "variant" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.tui.session.select": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "tui.session.select" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "description": "Session ID to navigate to", + "type": "string", + "pattern": "^ses" + } + }, + "required": [ + "sessionID" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.mcp.tools.changed": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "mcp.tools.changed" + }, + "properties": { + "type": "object", + "properties": { + "server": { + "type": "string" + } + }, + "required": [ + "server" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.mcp.browser.open.failed": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "mcp.browser.open.failed" + }, + "properties": { + "type": "object", + "properties": { + "mcpName": { + "type": "string" + }, + "url": { + "type": "string" + } + }, + "required": [ + "mcpName", + "url" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, "Event.command.executed": { "type": "object", "properties": { @@ -13592,36 +13503,6 @@ { "$ref": "#/components/schemas/Event.file.edited" }, - { - "$ref": "#/components/schemas/Event.tui.prompt.append" - }, - { - "$ref": "#/components/schemas/Event.tui.command.execute" - }, - { - "$ref": "#/components/schemas/Event.tui.toast.show" - }, - { - "$ref": "#/components/schemas/Event.tui.session.select" - }, - { - "$ref": "#/components/schemas/Event.mcp.tools.changed" - }, - { - "$ref": "#/components/schemas/Event.mcp.browser.open.failed" - }, - { - "$ref": "#/components/schemas/Event.session.network.asked" - }, - { - "$ref": "#/components/schemas/Event.session.network.replied" - }, - { - "$ref": "#/components/schemas/Event.session.network.rejected" - }, - { - "$ref": "#/components/schemas/Event.session.network.restored" - }, { "$ref": "#/components/schemas/Event.message.updated" }, @@ -13658,6 +13539,18 @@ { "$ref": "#/components/schemas/Event.question.rejected" }, + { + "$ref": "#/components/schemas/Event.session.network.asked" + }, + { + "$ref": "#/components/schemas/Event.session.network.replied" + }, + { + "$ref": "#/components/schemas/Event.session.network.rejected" + }, + { + "$ref": "#/components/schemas/Event.session.network.restored" + }, { "$ref": "#/components/schemas/Event.session.compacted" }, @@ -13667,6 +13560,24 @@ { "$ref": "#/components/schemas/Event.todo.updated" }, + { + "$ref": "#/components/schemas/Event.tui.prompt.append" + }, + { + "$ref": "#/components/schemas/Event.tui.command.execute" + }, + { + "$ref": "#/components/schemas/Event.tui.toast.show" + }, + { + "$ref": "#/components/schemas/Event.tui.session.select" + }, + { + "$ref": "#/components/schemas/Event.mcp.tools.changed" + }, + { + "$ref": "#/components/schemas/Event.mcp.browser.open.failed" + }, { "$ref": "#/components/schemas/Event.command.executed" }, @@ -16442,7 +16353,144 @@ "extensions", "enabled" ] + }, + "SessionNetworkWait": { + "type": "object", + "properties": { + "id": { + "type": "string", + "pattern": "^que.*" + }, + "sessionID": { + "type": "string", + "pattern": "^ses.*" + }, + "message": { + "type": "string" + }, + "restored": { + "type": "boolean" + }, + "time": { + "type": "object", + "properties": { + "created": { + "type": "number" + } + }, + "required": [ + "created" + ] + } + }, + "required": [ + "id", + "sessionID", + "message", + "restored", + "time" + ] + }, + "Event.session.network.asked": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.asked" + }, + "properties": { + "$ref": "#/components/schemas/SessionNetworkWait" + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.session.network.replied": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.replied" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + }, + "requestID": { + "type": "string" + } + }, + "required": [ + "sessionID", + "requestID" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.session.network.rejected": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.rejected" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + }, + "requestID": { + "type": "string" + } + }, + "required": [ + "sessionID", + "requestID" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.session.network.restored": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.network.restored" + }, + "properties": { + "type": "object", + "properties": { + "sessionID": { + "type": "string" + }, + "requestID": { + "type": "string" + } + }, + "required": [ + "sessionID", + "requestID" + ] + } + }, + "required": [ + "type", + "properties" + ] } } } -} \ No newline at end of file +} From 2b900fe1a79605e9d0c9511b8a37c5b4421d6f05 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Sat, 4 Apr 2026 00:20:14 +0300 Subject: [PATCH 27/58] fix(sdk): restore gen/client and gen/core from main, hand-edit types and sdk The hey-api codegen produces import paths without .js extensions which break nodenext module resolution. Restore client/, core/, and client.gen.ts from main and surgically add only the new Network types and class to types.gen.ts and sdk.gen.ts. --- packages/sdk/js/src/v2/gen/client.gen.ts | 4 ++-- .../sdk/js/src/v2/gen/client/client.gen.ts | 10 +++++----- packages/sdk/js/src/v2/gen/client/index.ts | 20 +++++++++++-------- .../sdk/js/src/v2/gen/client/types.gen.ts | 8 ++++---- .../sdk/js/src/v2/gen/client/utils.gen.ts | 12 +++++------ .../js/src/v2/gen/core/bodySerializer.gen.ts | 2 +- .../src/v2/gen/core/serverSentEvents.gen.ts | 2 +- packages/sdk/js/src/v2/gen/core/types.gen.ts | 4 ++-- packages/sdk/js/src/v2/gen/core/utils.gen.ts | 4 ++-- packages/sdk/js/src/v2/gen/sdk.gen.ts | 6 +++--- 10 files changed, 38 insertions(+), 34 deletions(-) diff --git a/packages/sdk/js/src/v2/gen/client.gen.ts b/packages/sdk/js/src/v2/gen/client.gen.ts index 50dd74c8748..0c110eca39b 100644 --- a/packages/sdk/js/src/v2/gen/client.gen.ts +++ b/packages/sdk/js/src/v2/gen/client.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts -import { type ClientOptions, type Config, createClient, createConfig } from "./client" -import type { ClientOptions as ClientOptions2 } from "./types.gen" +import { type ClientOptions, type Config, createClient, createConfig } from "./client/index.js" +import type { ClientOptions as ClientOptions2 } from "./types.gen.js" /** * The `createClientConfig()` function will be called on client initialization diff --git a/packages/sdk/js/src/v2/gen/client/client.gen.ts b/packages/sdk/js/src/v2/gen/client/client.gen.ts index 30237375a7b..627e98ec420 100644 --- a/packages/sdk/js/src/v2/gen/client/client.gen.ts +++ b/packages/sdk/js/src/v2/gen/client/client.gen.ts @@ -1,9 +1,9 @@ // This file is auto-generated by @hey-api/openapi-ts -import { createSseClient } from "../core/serverSentEvents.gen" -import type { HttpMethod } from "../core/types.gen" -import { getValidRequestBody } from "../core/utils.gen" -import type { Client, Config, RequestOptions, ResolvedRequestOptions } from "./types.gen" +import { createSseClient } from "../core/serverSentEvents.gen.js" +import type { HttpMethod } from "../core/types.gen.js" +import { getValidRequestBody } from "../core/utils.gen.js" +import type { Client, Config, RequestOptions, ResolvedRequestOptions } from "./types.gen.js" import { buildUrl, createConfig, @@ -12,7 +12,7 @@ import { mergeConfigs, mergeHeaders, setAuthParams, -} from "./utils.gen" +} from "./utils.gen.js" type ReqInit = Omit & { body?: any diff --git a/packages/sdk/js/src/v2/gen/client/index.ts b/packages/sdk/js/src/v2/gen/client/index.ts index 25f42e04def..0af63f3300e 100644 --- a/packages/sdk/js/src/v2/gen/client/index.ts +++ b/packages/sdk/js/src/v2/gen/client/index.ts @@ -1,11 +1,15 @@ // This file is auto-generated by @hey-api/openapi-ts -export type { Auth } from "../core/auth.gen" -export type { QuerySerializerOptions } from "../core/bodySerializer.gen" -export { formDataBodySerializer, jsonBodySerializer, urlSearchParamsBodySerializer } from "../core/bodySerializer.gen" -export { buildClientParams } from "../core/params.gen" -export { serializeQueryKeyValue } from "../core/queryKeySerializer.gen" -export { createClient } from "./client.gen" +export type { Auth } from "../core/auth.gen.js" +export type { QuerySerializerOptions } from "../core/bodySerializer.gen.js" +export { + formDataBodySerializer, + jsonBodySerializer, + urlSearchParamsBodySerializer, +} from "../core/bodySerializer.gen.js" +export { buildClientParams } from "../core/params.gen.js" +export { serializeQueryKeyValue } from "../core/queryKeySerializer.gen.js" +export { createClient } from "./client.gen.js" export type { Client, ClientOptions, @@ -17,5 +21,5 @@ export type { ResolvedRequestOptions, ResponseStyle, TDataShape, -} from "./types.gen" -export { createConfig, mergeHeaders } from "./utils.gen" +} from "./types.gen.js" +export { createConfig, mergeHeaders } from "./utils.gen.js" diff --git a/packages/sdk/js/src/v2/gen/client/types.gen.ts b/packages/sdk/js/src/v2/gen/client/types.gen.ts index 90a6ad284cc..e053aa40662 100644 --- a/packages/sdk/js/src/v2/gen/client/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/client/types.gen.ts @@ -1,9 +1,9 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Auth } from "../core/auth.gen" -import type { ServerSentEventsOptions, ServerSentEventsResult } from "../core/serverSentEvents.gen" -import type { Client as CoreClient, Config as CoreConfig } from "../core/types.gen" -import type { Middleware } from "./utils.gen" +import type { Auth } from "../core/auth.gen.js" +import type { ServerSentEventsOptions, ServerSentEventsResult } from "../core/serverSentEvents.gen.js" +import type { Client as CoreClient, Config as CoreConfig } from "../core/types.gen.js" +import type { Middleware } from "./utils.gen.js" export type ResponseStyle = "data" | "fields" diff --git a/packages/sdk/js/src/v2/gen/client/utils.gen.ts b/packages/sdk/js/src/v2/gen/client/utils.gen.ts index 65007692a5d..3b1dfb78718 100644 --- a/packages/sdk/js/src/v2/gen/client/utils.gen.ts +++ b/packages/sdk/js/src/v2/gen/client/utils.gen.ts @@ -1,11 +1,11 @@ // This file is auto-generated by @hey-api/openapi-ts -import { getAuthToken } from "../core/auth.gen" -import type { QuerySerializerOptions } from "../core/bodySerializer.gen" -import { jsonBodySerializer } from "../core/bodySerializer.gen" -import { serializeArrayParam, serializeObjectParam, serializePrimitiveParam } from "../core/pathSerializer.gen" -import { getUrl } from "../core/utils.gen" -import type { Client, ClientOptions, Config, RequestOptions } from "./types.gen" +import { getAuthToken } from "../core/auth.gen.js" +import type { QuerySerializerOptions } from "../core/bodySerializer.gen.js" +import { jsonBodySerializer } from "../core/bodySerializer.gen.js" +import { serializeArrayParam, serializeObjectParam, serializePrimitiveParam } from "../core/pathSerializer.gen.js" +import { getUrl } from "../core/utils.gen.js" +import type { Client, ClientOptions, Config, RequestOptions } from "./types.gen.js" export const createQuerySerializer = ({ parameters = {}, ...args }: QuerySerializerOptions = {}) => { const querySerializer = (queryParams: T) => { diff --git a/packages/sdk/js/src/v2/gen/core/bodySerializer.gen.ts b/packages/sdk/js/src/v2/gen/core/bodySerializer.gen.ts index 24808ed15c2..9678fb08ec6 100644 --- a/packages/sdk/js/src/v2/gen/core/bodySerializer.gen.ts +++ b/packages/sdk/js/src/v2/gen/core/bodySerializer.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { ArrayStyle, ObjectStyle, SerializerOptions } from "./pathSerializer.gen" +import type { ArrayStyle, ObjectStyle, SerializerOptions } from "./pathSerializer.gen.js" export type QuerySerializer = (query: Record) => string diff --git a/packages/sdk/js/src/v2/gen/core/serverSentEvents.gen.ts b/packages/sdk/js/src/v2/gen/core/serverSentEvents.gen.ts index 6b389c18562..056a8125932 100644 --- a/packages/sdk/js/src/v2/gen/core/serverSentEvents.gen.ts +++ b/packages/sdk/js/src/v2/gen/core/serverSentEvents.gen.ts @@ -1,6 +1,6 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Config } from "./types.gen" +import type { Config } from "./types.gen.js" export type ServerSentEventsOptions = Omit & Pick & { diff --git a/packages/sdk/js/src/v2/gen/core/types.gen.ts b/packages/sdk/js/src/v2/gen/core/types.gen.ts index 624ba56a98b..bfa77b8acd2 100644 --- a/packages/sdk/js/src/v2/gen/core/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/core/types.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { Auth, AuthToken } from "./auth.gen" -import type { BodySerializer, QuerySerializer, QuerySerializerOptions } from "./bodySerializer.gen" +import type { Auth, AuthToken } from "./auth.gen.js" +import type { BodySerializer, QuerySerializer, QuerySerializerOptions } from "./bodySerializer.gen.js" export type HttpMethod = "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace" diff --git a/packages/sdk/js/src/v2/gen/core/utils.gen.ts b/packages/sdk/js/src/v2/gen/core/utils.gen.ts index 2d9ab7b05ee..8a45f72698a 100644 --- a/packages/sdk/js/src/v2/gen/core/utils.gen.ts +++ b/packages/sdk/js/src/v2/gen/core/utils.gen.ts @@ -1,12 +1,12 @@ // This file is auto-generated by @hey-api/openapi-ts -import type { BodySerializer, QuerySerializer } from "./bodySerializer.gen" +import type { BodySerializer, QuerySerializer } from "./bodySerializer.gen.js" import { type ArraySeparatorStyle, serializeArrayParam, serializeObjectParam, serializePrimitiveParam, -} from "./pathSerializer.gen" +} from "./pathSerializer.gen.js" export interface PathSerializer { path: Record diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts index 2a01144fdf2..c65111e940a 100644 --- a/packages/sdk/js/src/v2/gen/sdk.gen.ts +++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts -import { buildClientParams, type Client, type Options as Options2, type TDataShape } from "./client" -import { client } from "./client.gen" +import { client } from "./client.gen.js" +import { buildClientParams, type Client, type Options as Options2, type TDataShape } from "./client/index.js" import type { AgentPartInput, AppAgentsResponses, @@ -235,7 +235,7 @@ import type { WorktreeResetErrors, WorktreeResetInput, WorktreeResetResponses, -} from "./types.gen" +} from "./types.gen.js" export type Options = Options2< TData, From 125ca4b132156c9993e9bba20fd1b22926586dac Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Mon, 6 Apr 2026 06:45:34 +0300 Subject: [PATCH 28/58] fix(cli): show offline prompt for provider connection failures Treat wrapped provider connection errors as offline waits so sleep and network-loss sessions prompt to resume instead of falling through generic retries. --- packages/opencode/src/session/network.ts | 53 ++++-- packages/opencode/src/session/processor.ts | 22 ++- .../session-processor-network-offline.test.ts | 152 ++++++++++++++++++ .../opencode/test/session/network.test.ts | 13 ++ 4 files changed, 230 insertions(+), 10 deletions(-) create mode 100644 packages/opencode/test/kilocode/session-processor-network-offline.test.ts diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index 3f159e985e1..8ff14469313 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -12,6 +12,30 @@ export namespace SessionNetwork { const codes = new Set(["ECONNRESET", "ECONNREFUSED", "ENOTFOUND", "EAI_AGAIN", "ETIMEDOUT", "ENETUNREACH"]) const POLL_MS = 3_000 + function chain(err: unknown, seen = new Set()): unknown[] { + if (err === undefined) return [] + if (typeof err === "object" && err !== null) { + if (seen.has(err)) return [] + seen.add(err) + } + const cause = typeof err === "object" && err !== null ? (err as { cause?: unknown }).cause : undefined + return [err, ...chain(cause, seen)] + } + + function msgs(err: unknown) { + return chain(err).flatMap((item) => { + const msg = + item instanceof Error + ? item.message + : typeof item === "string" + ? item + : typeof item === "object" && item !== null && typeof (item as { message?: unknown }).message === "string" + ? (item as { message: string }).message + : undefined + return msg ? [msg] : [] + }) + } + export const Wait = z .object({ id: Identifier.schema("question"), @@ -65,18 +89,23 @@ export namespace SessionNetwork { }) export function code(err: unknown) { - const code = (err as { code?: unknown })?.code - return typeof code === "string" ? code : undefined + for (const item of chain(err)) { + const code = (item as { code?: unknown })?.code + if (typeof code === "string") return code + } } export function disconnected(err: unknown) { const match = code(err) if (match && codes.has(match)) return true - const msg = err instanceof Error ? err.message : String(err) - if (msg.includes("fetch failed")) return true - if (msg.includes("network is unreachable")) return true - if (msg.includes("socket connection")) return true - return false + return msgs(err).some((item) => { + const msg = item.toLowerCase() + if (msg.includes("fetch failed")) return true + if (msg.includes("network is unreachable")) return true + if (msg.includes("socket connection")) return true + if (msg.includes("unable to connect") && msg.includes("access the url")) return true + return false + }) } export function message(err: unknown) { @@ -87,8 +116,12 @@ export namespace SessionNetwork { if (match === "EAI_AGAIN") return "DNS lookup failed" if (match === "ETIMEDOUT") return "Connection timed out" if (match === "ENETUNREACH") return "Network is unreachable" - const msg = err instanceof Error ? err.message : String(err) - if (msg.includes("fetch failed")) return "Network request failed" + const matchMsg = msgs(err).find((item) => { + const msg = item.toLowerCase() + return msg.includes("unable to connect") && msg.includes("access the url") + }) + if (matchMsg) return matchMsg + if (msgs(err).some((item) => item.toLowerCase().includes("fetch failed"))) return "Network request failed" return "Network connection failed" } @@ -151,6 +184,7 @@ export namespace SessionNetwork { onAbort() return } + log.warn("waiting for network", { sessionID: input.sessionID, requestID: id, message: input.message }) Bus.publish(Event.Asked, info) void watch({ requestID: id, abort: input.abort }).catch((err) => { log.error("restore watch failed", { err, requestID: id }) @@ -167,6 +201,7 @@ export namespace SessionNetwork { const req = s.pending[input.requestID] if (!req || req.info.restored) return req.info.restored = true + log.info("network restored", { sessionID: req.info.sessionID, requestID: input.requestID }) Bus.publish(Event.Restored, { sessionID: req.info.sessionID, requestID: req.info.id, diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts index fb94c4705cd..b5b3e57dc10 100644 --- a/packages/opencode/src/session/processor.ts +++ b/packages/opencode/src/session/processor.ts @@ -414,7 +414,16 @@ export namespace SessionProcessor { } else { const retry = SessionRetry.retryable(error) if (retry !== undefined) { - if (SessionNetwork.disconnected(e)) { + const offline = SessionNetwork.disconnected(e) + log.warn("retryable error", { + sessionID: input.sessionID, + name: e instanceof Error ? e.name : undefined, + message: e instanceof Error ? e.message : String(e), + code: SessionNetwork.code(e), + offline, + retry, + }) + if (offline) { const msg = SessionNetwork.message(e) const wait = SessionNetwork.ask({ sessionID: input.sessionID, @@ -424,6 +433,11 @@ export namespace SessionProcessor { const list = await SessionNetwork.list() const match = list.findLast((item) => item.sessionID === input.sessionID) if (match) { + log.warn("session offline", { + sessionID: input.sessionID, + requestID: match.id, + message: match.message, + }) SessionStatus.set(input.sessionID, { type: "offline", requestID: match.id, @@ -466,6 +480,12 @@ export namespace SessionProcessor { // kilocode_change attempt++ const delay = SessionRetry.delay(attempt, error.name === "APIError" ? error : undefined) + log.warn("retry scheduled", { + sessionID: input.sessionID, + attempt, + delay, + message: retry, + }) SessionStatus.set(input.sessionID, { type: "retry", attempt, diff --git a/packages/opencode/test/kilocode/session-processor-network-offline.test.ts b/packages/opencode/test/kilocode/session-processor-network-offline.test.ts new file mode 100644 index 00000000000..b070937159f --- /dev/null +++ b/packages/opencode/test/kilocode/session-processor-network-offline.test.ts @@ -0,0 +1,152 @@ +import { describe, expect, mock, spyOn, test } from "bun:test" + +mock.module("@/kilo-sessions/remote-sender", () => ({ + RemoteSender: { + create() { + return { + queue() {}, + flush: async () => undefined, + } + }, + }, +})) + +import type { Provider } from "../../src/provider/provider" +import type { LLM as LLMType } from "../../src/session/llm" +import type { MessageV2 } from "../../src/session/message-v2" +import { Log } from "../../src/util/log" +import { tmpdir } from "../fixture/fixture" + +Log.init({ print: false }) + +function model(): Provider.Model { + return { + id: "gpt-4", + providerID: "openai", + name: "GPT-4", + limit: { + context: 128000, + input: 0, + output: 4096, + }, + cost: { input: 0, output: 0, cache: { read: 0, write: 0 } }, + capabilities: { + toolcall: true, + attachment: false, + reasoning: false, + temperature: true, + input: { text: true, image: false, audio: false, video: false }, + output: { text: true, image: false, audio: false, video: false }, + }, + api: { id: "openai", url: "https://api.openai.com/v1", npm: "@ai-sdk/openai" }, + options: {}, + headers: {}, + } as Provider.Model +} + +describe("session processor network offline", () => { + test("enters offline state for provider connection message", async () => { + const { Bus } = await import("../../src/bus") + const { Instance } = await import("../../src/project/instance") + const { LLM } = await import("../../src/session/llm") + const { Identifier } = await import("../../src/id/id") + const { SessionNetwork } = await import("../../src/session/network") + const { SessionStatus } = await import("../../src/session/status") + const { MessageV2 } = await import("../../src/session/message-v2") + + await using tmp = await tmpdir({ git: true }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const { Session } = await import("../../src/session") + const { SessionProcessor } = await import("../../src/session/processor") + const m = model() + const session = await Session.create({}) + const user = (await Session.updateMessage({ + id: Identifier.ascending("message"), + role: "user", + sessionID: session.id, + time: { created: Date.now() }, + agent: "code", + model: { providerID: m.providerID, modelID: m.id }, + tools: {}, + })) as MessageV2.User + const assistant = (await Session.updateMessage({ + id: Identifier.ascending("message"), + parentID: user.id, + role: "assistant", + mode: "code", + agent: "code", + path: { cwd: Instance.directory, root: Instance.worktree }, + cost: 0, + tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } }, + modelID: m.id, + providerID: m.providerID, + time: { created: Date.now() }, + sessionID: session.id, + })) as MessageV2.Assistant + + const err = new Error("Unable to connect. Is the computer able to access the url?") + const status: Array = [] + const off = Bus.subscribe(SessionStatus.Event.Status, (event) => { + if (event.properties.sessionID !== session.id) return + status.push(event.properties.status) + }) + const offAsk = Bus.subscribe(SessionNetwork.Event.Asked, (event) => { + if (event.properties.sessionID !== session.id) return + void SessionNetwork.reply({ requestID: event.properties.id }) + }) + const ask = spyOn(SessionNetwork, "ask") + const llm = spyOn(LLM, "stream") + .mockRejectedValueOnce(err) + .mockResolvedValueOnce({ + fullStream: (async function* () { + yield { type: "start" } + yield { type: "start-step" } + yield { + type: "finish-step", + finishReason: "stop", + usage: { inputTokens: 10, completionTokens: 5, totalTokens: 15 }, + providerMetadata: undefined, + } + yield { type: "finish" } + })(), + } as unknown as Awaited>) + + const processor = SessionProcessor.create({ + assistantMessage: assistant, + sessionID: session.id, + model: m, + abort: AbortSignal.any([]), + }) + const inp: LLMType.StreamInput = { + user, + sessionID: session.id, + model: m, + agent: { name: "code", mode: "primary", permission: [], options: {} } as any, + system: [], + abort: AbortSignal.any([]), + messages: [], + tools: {}, + } + + try { + const result = await processor.process(inp) + expect(result).toBe("continue") + expect(ask).toHaveBeenCalledTimes(1) + expect(status).toContainEqual({ + type: "offline", + requestID: expect.any(String), + message: err.message, + }) + } finally { + off() + offAsk() + llm.mockRestore() + ask.mockRestore() + } + }, + }) + }) +}) diff --git a/packages/opencode/test/session/network.test.ts b/packages/opencode/test/session/network.test.ts index 37d864dd6d6..5432b2d8963 100644 --- a/packages/opencode/test/session/network.test.ts +++ b/packages/opencode/test/session/network.test.ts @@ -12,6 +12,19 @@ describe("session.network", () => { expect(SessionNetwork.disconnected({ code: "ENOENT" })).toBe(false) }) + test("detects provider unable to connect message", () => { + const err = new Error("Unable to connect. Is the computer able to access the url?") + expect(SessionNetwork.disconnected(err)).toBe(true) + expect(SessionNetwork.message(err)).toBe("Unable to connect. Is the computer able to access the url?") + }) + + test("detects wrapped network cause", () => { + const err = new Error("top") as Error & { cause?: unknown } + err.cause = { code: "ETIMEDOUT" } + expect(SessionNetwork.disconnected(err)).toBe(true) + expect(SessionNetwork.message(err)).toBe("Connection timed out") + }) + test("reply resolves pending request", async () => { await using tmp = await tmpdir({ git: true }) await Instance.provide({ From 6ad2e7a3931b08b90c9561f3b1622ee6540c5aa9 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Mon, 6 Apr 2026 09:19:06 +0300 Subject: [PATCH 29/58] fix(cli): add 2-minute default request timeout for provider requests Previously, provider HTTP requests had no application-level timeout unless explicitly configured. Combined with Bun's fetch timeout being disabled, requests could hang indefinitely when the network was down, waiting for the OS TCP stack to give up. Add REQUEST_TIMEOUT_MS (120s) as the default timeout applied via AbortSignal.timeout() in the provider fetch wrapper. Recognize TimeoutError as a network disconnection so it enters the offline prompt flow. --- packages/opencode/src/config/config.ts | 12 ++++-------- packages/opencode/src/provider/provider.ts | 14 ++++++++------ packages/opencode/src/session/network.ts | 8 ++++++++ packages/opencode/test/session/network.test.ts | 13 +++++++++++++ 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts index 5b3e3b28de4..e33c9fa7703 100644 --- a/packages/opencode/src/config/config.ts +++ b/packages/opencode/src/config/config.ts @@ -1109,18 +1109,14 @@ export namespace Config { setCacheKey: z.boolean().optional().describe("Enable promptCacheKey for this provider (default false)"), timeout: z .union([ - z - .number() - .int() - .positive() - .describe( - "Timeout in milliseconds for requests to this provider. Default is 300000 (5 minutes). Set to false to disable timeout.", - ), + z.number().int().positive().describe( + "Timeout in milliseconds for requests to this provider. Default is 120000 (2 minutes). Set to false to disable timeout.", // kilocode_change + ), z.literal(false).describe("Disable timeout for this provider entirely."), ]) .optional() .describe( - "Timeout in milliseconds for requests to this provider. Default is 300000 (5 minutes). Set to false to disable timeout.", + "Timeout in milliseconds for requests to this provider. Default is 120000 (2 minutes). Set to false to disable timeout.", // kilocode_change ), }) .catchall(z.any()) diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts index f26f78426a3..87fa07ec60f 100644 --- a/packages/opencode/src/provider/provider.ts +++ b/packages/opencode/src/provider/provider.ts @@ -49,6 +49,9 @@ import { Installation } from "../installation" import { DEFAULT_HEADERS } from "@/kilocode/const" // kilocode_change +/** Default timeout (ms) for provider HTTP requests. kilocode_change */ +export const REQUEST_TIMEOUT_MS = 120_000 // 2 minutes + export namespace Provider { const log = Log.create({ service: "provider" }) @@ -1140,14 +1143,13 @@ export namespace Provider { const fetchFn = customFetch ?? fetch const opts = init ?? {} - if (options["timeout"] !== undefined && options["timeout"] !== null) { + // kilocode_change - apply default timeout when not explicitly configured + const ms = options["timeout"] ?? REQUEST_TIMEOUT_MS + if (ms !== false) { const signals: AbortSignal[] = [] if (opts.signal) signals.push(opts.signal) - if (options["timeout"] !== false) signals.push(AbortSignal.timeout(options["timeout"])) - - const combined = signals.length > 1 ? AbortSignal.any(signals) : signals[0] - - opts.signal = combined + signals.push(AbortSignal.timeout(ms)) + opts.signal = signals.length > 1 ? AbortSignal.any(signals) : signals[0] } // Strip openai itemId metadata following what codex does diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index 8ff14469313..545939cf515 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -98,6 +98,10 @@ export namespace SessionNetwork { export function disconnected(err: unknown) { const match = code(err) if (match && codes.has(match)) return true + // kilocode_change - recognize AbortSignal.timeout() errors + for (const item of chain(err)) { + if (item instanceof DOMException && item.name === "TimeoutError") return true + } return msgs(err).some((item) => { const msg = item.toLowerCase() if (msg.includes("fetch failed")) return true @@ -109,6 +113,10 @@ export namespace SessionNetwork { } export function message(err: unknown) { + // kilocode_change - check for timeout first + for (const item of chain(err)) { + if (item instanceof DOMException && item.name === "TimeoutError") return "Request timed out" + } const match = code(err) if (match === "ECONNRESET") return "Connection reset by server" if (match === "ECONNREFUSED") return "Connection refused" diff --git a/packages/opencode/test/session/network.test.ts b/packages/opencode/test/session/network.test.ts index 5432b2d8963..dba8ba81090 100644 --- a/packages/opencode/test/session/network.test.ts +++ b/packages/opencode/test/session/network.test.ts @@ -25,6 +25,19 @@ describe("session.network", () => { expect(SessionNetwork.message(err)).toBe("Connection timed out") }) + test("detects TimeoutError as disconnected", () => { + const err = new DOMException("The operation was aborted due to timeout", "TimeoutError") + expect(SessionNetwork.disconnected(err)).toBe(true) + expect(SessionNetwork.message(err)).toBe("Request timed out") + }) + + test("detects wrapped TimeoutError in cause chain", () => { + const timeout = new DOMException("signal timed out", "TimeoutError") + const err = new Error("request failed", { cause: timeout }) + expect(SessionNetwork.disconnected(err)).toBe(true) + expect(SessionNetwork.message(err)).toBe("Request timed out") + }) + test("reply resolves pending request", async () => { await using tmp = await tmpdir({ git: true }) await Instance.provide({ From 3ea1e8f400a621c6f881e2b8fb26088ebf5c0fc6 Mon Sep 17 00:00:00 2001 From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 14:27:42 +0000 Subject: [PATCH 30/58] feat(cli): publish CLI as npm prerelease when pre_release flag is set When the publish workflow is dispatched with pre_release=true, the CLI and SDK packages are now published to npm under the "rc" dist-tag with a semver prerelease version (e.g. 7.1.24-rc.202604081425) instead of going to the "latest" tag as a stable release. This ensures that pre-release VS Code extension builds ship with a matching pre-release CLI on npm, so users on the stable channel are never affected by pre-release publishes. --- .github/workflows/publish.yml | 4 ++- packages/script/src/index.ts | 46 ++++++++++++++++++++++++++--------- script/publish.ts | 5 +++- script/version.ts | 6 +++-- 4 files changed, 45 insertions(+), 16 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8b64bf4ed5d..9fc57f520d9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,7 +23,7 @@ on: required: false type: string pre_release: - description: "Publish as pre-release (VS Code marketplace)" + description: "Publish as pre-release (VS Code marketplace + npm rc channel)" required: false type: boolean default: false @@ -58,6 +58,7 @@ jobs: GH_REPO: ${{ github.repository }} KILO_BUMP: ${{ inputs.bump }} KILO_VERSION: ${{ inputs.version }} + KILO_PRE_RELEASE: ${{ inputs.pre_release }} KILO_API_KEY: ${{ secrets.KILO_API_KEY }} KILO_ORG_ID: ${{ secrets.KILO_ORG_ID }} outputs: @@ -83,6 +84,7 @@ jobs: env: KILO_VERSION: ${{ needs.version.outputs.version }} KILO_RELEASE: ${{ needs.version.outputs.release }} + KILO_PRE_RELEASE: ${{ inputs.pre_release }} GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} diff --git a/packages/script/src/index.ts b/packages/script/src/index.ts index 5fcdae3d5f9..699260d2974 100644 --- a/packages/script/src/index.ts +++ b/packages/script/src/index.ts @@ -21,30 +21,52 @@ const env = { KILO_BUMP: process.env["KILO_BUMP"], KILO_VERSION: process.env["KILO_VERSION"], KILO_RELEASE: process.env["KILO_RELEASE"], + KILO_PRE_RELEASE: process.env["KILO_PRE_RELEASE"], } // kilocode_change end const CHANNEL = await (async () => { if (env.KILO_CHANNEL) return env.KILO_CHANNEL // kilocode_change + // kilocode_change start - publish to "rc" channel for pre-releases + if (env.KILO_BUMP && env.KILO_PRE_RELEASE === "true") return "rc" + // kilocode_change end if (env.KILO_BUMP) return "latest" // kilocode_change if (env.KILO_VERSION && !env.KILO_VERSION.startsWith("0.0.0-")) return "latest" // kilocode_change return await $`git branch --show-current`.text().then((x) => x.trim()) })() const IS_PREVIEW = CHANNEL !== "latest" +// kilocode_change start - shared helpers for version computation +async function fetchLatest() { + const data: any = await fetch("https://registry.npmjs.org/@kilocode/cli/latest").then((res) => { + if (!res.ok) throw new Error(res.statusText) + return res.json() + }) + return data.version as string +} + +function bumpVersion(current: string, type: string) { + const [major, minor, patch] = current.split(".").map((x: string) => Number(x) || 0) + if (type === "major") return `${major + 1}.0.0` + if (type === "minor") return `${major}.${minor + 1}.0` + return `${major}.${minor}.${patch + 1}` +} +// kilocode_change end + const VERSION = await (async () => { if (env.KILO_VERSION) return env.KILO_VERSION // kilocode_change - if (IS_PREVIEW) return `0.0.0-${CHANNEL}-${new Date().toISOString().slice(0, 16).replace(/[-:T]/g, "")}` - const version = await fetch("https://registry.npmjs.org/@kilocode/cli/latest") // kilocode_change - .then((res) => { - if (!res.ok) throw new Error(res.statusText) - return res.json() - }) - .then((data: any) => data.version) - const [major, minor, patch] = version.split(".").map((x: string) => Number(x) || 0) - const t = env.KILO_BUMP?.toLowerCase() // kilocode_change - if (t === "major") return `${major + 1}.0.0` - if (t === "minor") return `${major}.${minor + 1}.0` - return `${major}.${minor}.${patch + 1}` + if (IS_PREVIEW) { + // kilocode_change start - compute semver prerelease for rc channel + if (env.KILO_BUMP && env.KILO_PRE_RELEASE === "true") { + const current = await fetchLatest() + const base = bumpVersion(current, env.KILO_BUMP.toLowerCase()) + const stamp = new Date().toISOString().slice(0, 16).replace(/[-:T]/g, "") + return `${base}-rc.${stamp}` + } + // kilocode_change end + return `0.0.0-${CHANNEL}-${new Date().toISOString().slice(0, 16).replace(/[-:T]/g, "")}` + } + const version = await fetchLatest() // kilocode_change + return bumpVersion(version, env.KILO_BUMP?.toLowerCase() ?? "patch") // kilocode_change })() // kilocode_change start diff --git a/script/publish.ts b/script/publish.ts index 8b99c918412..14b75965ecf 100755 --- a/script/publish.ts +++ b/script/publish.ts @@ -72,7 +72,10 @@ if (Script.release) { // await import(`../packages/desktop-electron/scripts/finalize-latest-yml.ts`) // kilocode_change end - await $`gh release edit v${Script.version} --draft=false --repo ${process.env.GH_REPO}` + // kilocode_change start - mark prerelease GitHub releases accordingly + const flags = Script.preview ? ["--draft=false", "--prerelease"] : ["--draft=false"] + await $`gh release edit v${Script.version} ${flags} --repo ${process.env.GH_REPO}` + // kilocode_change end } console.log("\n=== cli ===\n") diff --git a/script/version.ts b/script/version.ts index 71619f46185..40a2e617773 100755 --- a/script/version.ts +++ b/script/version.ts @@ -17,12 +17,14 @@ if (!Script.preview) { const release = await $`gh release view v${Script.version} --json tagName,databaseId`.json() output.push(`release=${release.databaseId}`) output.push(`tag=${release.tagName}`) -} else if (Script.channel === "beta") { - await $`gh release create v${Script.version} -d --title "v${Script.version}" --repo ${process.env.GH_REPO}` + // kilocode_change start - handle both beta and rc preview channels +} else if (Script.channel === "beta" || Script.channel === "rc") { + await $`gh release create v${Script.version} -d --prerelease --title "v${Script.version}" --repo ${process.env.GH_REPO}` const release = await $`gh release view v${Script.version} --json tagName,databaseId --repo ${process.env.GH_REPO}`.json() output.push(`release=${release.databaseId}`) output.push(`tag=${release.tagName}`) + // kilocode_change end } output.push(`repo=${process.env.GH_REPO}`) From 501fb340f16486398251069eaeff74905b0119f4 Mon Sep 17 00:00:00 2001 From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 14:42:31 +0000 Subject: [PATCH 31/58] chore: trigger CI re-run From 5ea872e4a89394d0814d231ce36f029d24d23c7f Mon Sep 17 00:00:00 2001 From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 14:49:44 +0000 Subject: [PATCH 32/58] fix: handle pre_release flag with explicit version override When KILO_PRE_RELEASE is true, always use the rc channel regardless of whether KILO_VERSION or KILO_BUMP is set. This prevents manual version-override pre-releases from being published to the latest npm dist-tag. --- packages/script/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/script/src/index.ts b/packages/script/src/index.ts index 699260d2974..5ea9d757a69 100644 --- a/packages/script/src/index.ts +++ b/packages/script/src/index.ts @@ -27,7 +27,7 @@ const env = { const CHANNEL = await (async () => { if (env.KILO_CHANNEL) return env.KILO_CHANNEL // kilocode_change // kilocode_change start - publish to "rc" channel for pre-releases - if (env.KILO_BUMP && env.KILO_PRE_RELEASE === "true") return "rc" + if (env.KILO_PRE_RELEASE === "true") return "rc" // kilocode_change end if (env.KILO_BUMP) return "latest" // kilocode_change if (env.KILO_VERSION && !env.KILO_VERSION.startsWith("0.0.0-")) return "latest" // kilocode_change From 25143d8637f74188af0d829c2461814dff0342a0 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Wed, 8 Apr 2026 19:24:46 +0300 Subject: [PATCH 33/58] fix(cli): gate resume on restored state --- packages/opencode/src/cli/cmd/tui/routes/session/network.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx index 12a203b2049..4bbae3464ab 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx @@ -24,7 +24,7 @@ export function NetworkPrompt(props: { request: SessionNetworkWait }) { useKeyboard((evt) => { if (dialog.stack.length > 0) return - if (evt.name === "return") { + if (evt.name === "return" && props.request.restored) { evt.preventDefault() reply() return From dc94dc39f567a4fd5adced9e0dbd45deaca0ebb4 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Wed, 8 Apr 2026 19:25:33 +0300 Subject: [PATCH 34/58] fix(cli): scope timeout to connection phase --- packages/opencode/src/provider/provider.ts | 34 ++++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts index 87fa07ec60f..38b3eb5ac69 100644 --- a/packages/opencode/src/provider/provider.ts +++ b/packages/opencode/src/provider/provider.ts @@ -1143,14 +1143,21 @@ export namespace Provider { const fetchFn = customFetch ?? fetch const opts = init ?? {} - // kilocode_change - apply default timeout when not explicitly configured + // kilocode_change start - apply connection-phase timeout only + // Use an AbortController so we can cancel the timer once headers arrive, + // preventing healthy streaming responses from being aborted mid-stream. const ms = options["timeout"] ?? REQUEST_TIMEOUT_MS - if (ms !== false) { - const signals: AbortSignal[] = [] + const controller = ms !== false ? new AbortController() : undefined + if (controller) { + const signals: AbortSignal[] = [controller.signal] if (opts.signal) signals.push(opts.signal) - signals.push(AbortSignal.timeout(ms)) opts.signal = signals.length > 1 ? AbortSignal.any(signals) : signals[0] } + const timer = + controller && typeof ms === "number" + ? setTimeout(() => controller.abort(new DOMException("The operation timed out.", "TimeoutError")), ms) + : undefined + // kilocode_change end // Strip openai itemId metadata following what codex does // Codex uses #[serde(skip_serializing)] on id fields for all item types: @@ -1170,11 +1177,20 @@ export namespace Provider { } } - return fetchFn(input, { - ...opts, - // @ts-ignore see here: https://github.com/oven-sh/bun/issues/16682 - timeout: false, - }) + // kilocode_change start - clear timeout once headers arrive + try { + const response = await fetchFn(input, { + ...opts, + // @ts-ignore see here: https://github.com/oven-sh/bun/issues/16682 + timeout: false, + }) + if (timer !== undefined) clearTimeout(timer) + return response + } catch (err) { + if (timer !== undefined) clearTimeout(timer) + throw err + } + // kilocode_change end } const bundledFn = BUNDLED_PROVIDERS[model.api.npm] From da3ce5623cd7d6e7f2e58e42a3e1bce2c159f1a8 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 9 Apr 2026 09:20:30 +0300 Subject: [PATCH 35/58] chore(cli): add kilocode_change annotations --- .kilo/plans/1775246628649-lucky-planet.md | 369 ++++++++++++++++++ packages/opencode/src/cli/cmd/run.ts | 9 +- .../opencode/src/cli/cmd/tui/context/sync.tsx | 14 +- .../src/cli/cmd/tui/routes/session/index.tsx | 12 +- .../cli/cmd/tui/routes/session/network.tsx | 1 + packages/opencode/src/config/config.ts | 12 +- packages/opencode/src/mcp/index.ts | 2 + packages/opencode/src/provider/provider.ts | 4 +- .../opencode/src/server/routes/network.ts | 1 + packages/opencode/src/server/server.ts | 4 +- packages/opencode/src/session/message-v2.ts | 4 +- packages/opencode/src/session/network.ts | 1 + packages/opencode/src/session/processor.ts | 4 +- packages/opencode/src/session/status.ts | 2 + packages/opencode/src/tool/warpgrep.ts | 6 +- .../opencode/test/cli/run-network.test.ts | 1 + .../opencode/test/session/network.test.ts | 1 + packages/opencode/test/session/retry.test.ts | 2 + 18 files changed, 428 insertions(+), 21 deletions(-) create mode 100644 .kilo/plans/1775246628649-lucky-planet.md diff --git a/.kilo/plans/1775246628649-lucky-planet.md b/.kilo/plans/1775246628649-lucky-planet.md new file mode 100644 index 00000000000..2584af7d05a --- /dev/null +++ b/.kilo/plans/1775246628649-lucky-planet.md @@ -0,0 +1,369 @@ +# Plan: Minimize SDK diff + Network Reconnection Notification + +## Context + +Branch: `kilocode-cli-resume-after-sleep` +PR: https://github.com/Kilo-Org/kilocode/pull/7578 + +## Part 1: Minimize `packages/sdk/openapi.json` diff + +### Problem + +The `openapi.json` diff is ~5000 lines but **zero schemas were removed**. The diff is large because: + +1. **Formatting changes**: All `"required"` / `"enum"` / `"tags"` multi-line arrays were collapsed to single-line (likely Prettier behavior changed — possibly a dependency that generates the base JSON before Prettier runs) +2. **Schema reordering**: Route order changed in `server.ts` (`/remote` moved earlier, `/network` added), causing schemas to appear in different positions +3. **`FileDiff` → inline**: The `Session.diffs` and `GlobalSession.diffs` fields changed from `$ref: FileDiff` to an inline object definition + +The actual new content is small: + +- 4 new schemas: `SessionNetworkWait`, 3 network event types +- 5 new API paths: 3 network endpoints, 2 KiloClaw endpoints +- 5 modified schemas: `Config` (+`remote_control`), `Event` (+ network refs), `GlobalSession`/`Session` (`diffs` inlined), `SessionStatus` (+`offline` variant) +- 4 modified paths: session-import endpoints (+`skipped` field) + +Similarly, `types.gen.ts` shows types "removed" then "added" at a different position — they were just reordered. + +### Approach: Regenerate with minimal route reordering + +The openapi.json is auto-generated by `./script/generate.ts`. The formatting difference comes from running `prettier` on the generated output. To minimize the diff: + +1. **Keep the `/remote` route in its original position in `server.ts`** — it was moved from after `/telemetry` to after `/global`, which reordered schemas in the generated output. Move it back to its original position. + +2. **Regenerate `openapi.json`** via `./script/generate.ts`. The new endpoints/schemas will be added, but existing schemas will stay in the same order. + +3. **If formatting diffs persist after regeneration** (due to Prettier), take the main branch's `openapi.json` and manually merge in only the new content: + - New paths: `/network`, `/network/{requestID}/reply`, `/network/{requestID}/reject`, `/kilo/claw/status`, `/kilo/claw/chat-credentials` + - New schemas: `SessionNetworkWait`, `Event.session.network.asked`, `Event.session.network.replied`, `Event.session.network.rejected` + - Modified schemas: `SessionStatus` (+offline variant), `Config` (+remote_control), `Event` (+network refs), `Session`/`GlobalSession` (diffs field) + - Modified paths: session-import endpoints (+skipped) + +4. **Regenerate SDK types** from the (now minimal-diff) openapi.json. The types will preserve original ordering, so `types.gen.ts` and `sdk.gen.ts` diffs will be clean additions only. + +### Files to change + +- `packages/opencode/src/server/server.ts` — possibly revert `/remote` route position +- `packages/sdk/openapi.json` — regenerate or manually merge +- `packages/sdk/js/src/v2/gen/types.gen.ts` — regenerated +- `packages/sdk/js/src/v2/gen/sdk.gen.ts` — regenerated + +--- + +## Part 2: Network Reconnection Notification + +### Current flow + +1. Network error detected in `session/processor.ts` → calls `SessionNetwork.ask()` +2. Session status set to `{ type: "offline", requestID, message }` +3. TUI shows `NetworkPrompt` with static text: + - **"Network reconnect required"** (title) + - `{error message}` (e.g., "Connection refused") + - "Reconnect the network-dependent service, then press Enter to resume." + - "Press Esc to stop this turn." +4. User manually presses Enter → session retries | Esc → session stops + +### Problem + +The user must manually detect when the network is back and press Enter. There's no automatic detection of network restoration, and no notification when connectivity returns. + +### Desired flow + +1. Network error detected → session pauses, TUI shows "waiting" state +2. System polls for connectivity restoration in the background +3. When network comes back → bell rings + prompt updates to ask: "Network resumed. Continue this turn?" +4. User presses Enter (resume) or Esc (stop) + +### Implementation + +#### 2a. Add network connectivity monitor (`session/network.ts`) + +Add a `monitor()` function that polls for connectivity after a network wait is created: + +```ts +async function monitor(info: Wait, abort: AbortSignal) { + const interval = 3000 // poll every 3 seconds + while (!abort.aborted) { + await new Promise((r) => setTimeout(r, interval)) + if (abort.aborted) return + const online = await probe().catch(() => false) + if (online) { + Bus.publish(Event.Restored, { sessionID: info.sessionID, requestID: info.id }) + return + } + } +} +``` + +The `probe()` function should make a lightweight connectivity check. Options: + +- **DNS resolution** of a known host (e.g., `dns.google`) +- **HTTP HEAD** to a well-known endpoint +- **TCP connect** to a known port + +Simplest and most reliable: DNS resolution via `Bun.dns.resolve("dns.google")` or similar. + +#### 2b. New event: `SessionNetwork.Event.Restored` + +Add a new bus event so the TUI can react when connectivity returns: + +```ts +Restored: BusEvent.define( + "session.network.restored", + z.object({ + sessionID: z.string(), + requestID: z.string(), + }), +) +``` + +This needs to be: + +- Published from the monitor when probe succeeds +- Included in the SSE event stream so the SDK receives it +- Added to the openapi.json schema +- Handled in `sync.tsx` → update the wait item to indicate restoration + +#### 2c. Update `SessionNetworkWait` schema + +Add a `restored` boolean field (default `false`) to track whether connectivity has returned: + +```ts +export const Wait = z.object({ + id: Identifier.schema("question"), + sessionID: Identifier.schema("session"), + message: z.string(), + restored: z.boolean().default(false), + time: z.object({ + created: z.number(), + }), +}) +``` + +When the `Restored` event fires, update the pending wait's `restored` flag. + +#### 2d. Update TUI `NetworkPrompt` (`routes/session/network.tsx`) + +Update the prompt to have two visual states based on `request.restored`: + +**Disconnected state** (`restored === false`): + +``` +⚠ Network disconnected +Connection refused +Waiting for network... + +Press Esc to stop this turn. +``` + +**Reconnected state** (`restored === true`): + +``` +Network reconnected +{original error message} — connection restored + +1. Resume Continue this turn +2. Stop Cancel and return to prompt + +↑↓ select enter confirm +``` + +The reconnected state uses the numbered-option pattern from `QuestionPrompt` for consistency. Keep Enter/Esc keyboard handling (Enter = resume, Esc = stop). Ring the bell when transitioning to reconnected state (already wired - the `createEffect` in `session/index.tsx` handles this). + +**Alternative simpler wording** (matching the existing prompt style): + +``` +Network reconnected +Connection restored. + +Press Enter to resume this turn. +Press Esc to stop. +``` + +This is more consistent with the existing `NetworkPrompt` style (text instructions rather than numbered options). + +#### 2e. Update `sync.tsx` to handle restored event + +Add a handler for `session.network.restored`: + +```ts +case "session.network.restored": { + const requests = store.network[event.properties.sessionID] + if (!requests) break + const match = Binary.search(requests, event.properties.requestID, (r) => r.id) + if (match.found) { + setStore("network", event.properties.sessionID, match.index, "restored", true) + } + break +} +``` + +#### 2f. Server route for restored event + +Already included in the SSE event stream since all bus events are forwarded. Just need to add the event to the `Event` union in the server's OpenAPI spec (which happens automatically via the schema definition). + +#### 2g. `run.ts` non-TUI handling + +The `run.ts` (headless/pipeline mode) already auto-replies to network waits with exponential backoff. No changes needed there — the monitor is primarily for the TUI interactive experience. + +### Files to change + +- `packages/opencode/src/session/network.ts` — add `monitor()`, `probe()`, `Event.Restored`, update `Wait` schema with `restored` +- `packages/opencode/src/cli/cmd/tui/routes/session/network.tsx` — two-state UI (disconnected vs reconnected) +- `packages/opencode/src/cli/cmd/tui/context/sync.tsx` — handle `session.network.restored` event +- `packages/opencode/src/session/processor.ts` — call `monitor()` after creating the wait (with abort signal) +- `packages/sdk/openapi.json` — add restored event schema (via regeneration) +- `packages/sdk/js/src/v2/gen/types.gen.ts` — regenerated +- `packages/sdk/js/src/v2/gen/sdk.gen.ts` — regenerated + +--- + +## Execution Order + +1. Fix `/remote` route position in `server.ts` (if needed for minimal diff) +2. Add `probe()`, `monitor()`, `Event.Restored`, update `Wait` schema in `session/network.ts` +3. Wire `monitor()` call in `processor.ts` +4. Add SSE event forwarding for `session.network.restored` (verify it's automatic) +5. Update `sync.tsx` to handle the restored event +6. Update `NetworkPrompt` with two-state UI +7. Regenerate SDK: `./script/generate.ts` +8. Verify openapi.json diff is minimal (only actual semantic additions) +9. Run typecheck: `bun turbo typecheck` +10. Run tests: `bun test` from `packages/opencode/` + +--- + +## Part 3: Default Request Timeout (2 minutes) + +### Problem + +When the network is unavailable (e.g. laptop sleep/wake, Wi-Fi disconnect), it takes far too long for requests to fail. The fetch hangs until the OS TCP stack gives up (60-120+ seconds depending on OS), with no application-level timeout enforcing a bound. Three factors compound: + +1. **No default fetch timeout applied**: `provider.ts` line 1143 checks `options["timeout"] !== undefined && !== null`, but when the user hasn't configured a timeout in their config, `options["timeout"]` is `undefined` and the entire timeout block is skipped. The config schema documents "Default is 300000 (5 minutes)" but **no code applies this default**. + +2. **Bun's built-in timeout disabled**: Line 1174 passes `timeout: false` to Bun's fetch, explicitly disabling the runtime's own timeout. + +3. **Unlimited retries by default**: `KILO_SESSION_RETRY_LIMIT` is `undefined` by default. The processor check at line 479 (`Flag.KILO_SESSION_RETRY_LIMIT === undefined || attempt < limit`) means retries are infinite. Each retry waits for another OS-level TCP timeout before failing. + +Combined: each request can hang for minutes, then retries infinitely with backoff. + +### Approach + +Add a single constant `REQUEST_TIMEOUT_MS = 120_000` (2 minutes) and apply it as the default timeout in the provider's custom fetch wrapper. Also ensure timeout errors (`DOMException` with `name === "TimeoutError"`) are recognized as network disconnection, so they trigger the existing offline prompt flow. + +### Changes + +#### 3a. Add default timeout constant and apply it (`provider/provider.ts`) + +Add a prominently placed, exported constant near the top of the file: + +```ts +/** Default timeout (ms) for provider HTTP requests. */ +export const REQUEST_TIMEOUT_MS = 120_000 // 2 minutes +``` + +Modify the custom fetch wrapper (lines 1143-1151) to apply the default when no explicit timeout is configured: + +```ts +// Before: +if (options["timeout"] !== undefined && options["timeout"] !== null) { + const signals: AbortSignal[] = [] + if (opts.signal) signals.push(opts.signal) + if (options["timeout"] !== false) signals.push(AbortSignal.timeout(options["timeout"])) + const combined = signals.length > 1 ? AbortSignal.any(signals) : signals[0] + opts.signal = combined +} + +// After: +const ms = options["timeout"] ?? REQUEST_TIMEOUT_MS +if (ms !== false) { + const signals: AbortSignal[] = [] + if (opts.signal) signals.push(opts.signal) + signals.push(AbortSignal.timeout(ms)) + opts.signal = signals.length > 1 ? AbortSignal.any(signals) : signals[0] +} +``` + +The key change: `options["timeout"] ?? REQUEST_TIMEOUT_MS` means: + +- If user configured `timeout: 300000` → uses 300000 +- If user configured `timeout: false` → disables timeout +- If not configured (`undefined`) → uses `REQUEST_TIMEOUT_MS` (120000) + +#### 3b. Recognize timeout errors as network disconnection (`session/network.ts`) + +`AbortSignal.timeout()` fires a `DOMException` with `name === "TimeoutError"`. The Vercel AI SDK may wrap this in its own error types, so we need to check the cause chain. + +Update `disconnected()` to also match `TimeoutError` DOMExceptions: + +```ts +export function disconnected(err: unknown) { + const match = code(err) + if (match && codes.has(match)) return true + // Recognize AbortSignal.timeout() errors (DOMException name "TimeoutError") + for (const item of chain(err)) { + if (item instanceof DOMException && item.name === "TimeoutError") return true + } + return msgs(err).some((item) => { + // ... existing message checks unchanged ... + }) +} +``` + +Update `message()` to return a friendly message for timeout errors: + +```ts +export function message(err: unknown) { + // Check for timeout first (before code-based checks) + for (const item of chain(err)) { + if (item instanceof DOMException && item.name === "TimeoutError") return "Request timed out" + } + const match = code(err) + // ... rest unchanged ... +} +``` + +This ensures timeout errors enter the offline prompt flow where DNS polling will confirm whether the network is actually down. If the network IS up (provider was just slow), the DNS probe immediately succeeds and the user sees the restore prompt. + +#### 3c. Update config schema documentation (`config/config.ts`) + +The timeout default documentation says "Default is 300000 (5 minutes)" but the actual default is now 120000 (2 minutes). Update the schema description to match: + +```ts +// Line 1116-1117: +"Timeout in milliseconds for requests to this provider. Default is 120000 (2 minutes). Set to false to disable timeout." +``` + +#### 3d. Tests + +Add tests in `packages/opencode/test/session/network.test.ts`: + +- `TimeoutError` DOMException is classified as disconnected +- Wrapped `TimeoutError` (in cause chain) is classified as disconnected +- `message()` returns "Request timed out" for timeout errors + +### Files to change + +| File | Change | +| ------------------------------------------------ | -------------------------------------------------------------------- | +| `packages/opencode/src/provider/provider.ts` | Add `REQUEST_TIMEOUT_MS` constant, apply as default in fetch wrapper | +| `packages/opencode/src/session/network.ts` | Recognize `TimeoutError` in `disconnected()` and `message()` | +| `packages/opencode/src/config/config.ts` | Update timeout default documentation | +| `packages/opencode/test/session/network.test.ts` | Add timeout error tests | + +### Execution order + +1. Add `REQUEST_TIMEOUT_MS` constant and modify fetch wrapper in `provider/provider.ts` +2. Update `disconnected()` and `message()` in `session/network.ts` +3. Update config schema description in `config/config.ts` +4. Add tests in `test/session/network.test.ts` +5. Run tests: `bun test test/session/network.test.ts` +6. Run typecheck: `bun run typecheck` + +--- + +## Decisions (all parts) + +- **Connectivity probe**: `Bun.dns.lookup("dns.google")` — fast, lightweight DNS check. Sufficient for sleep/wake scenarios. +- **Request timeout default**: 120,000ms (2 minutes) — generous enough for slow providers, short enough to detect offline quickly. +- **Timeout error classification**: Treat `TimeoutError` as network disconnection → enters offline prompt flow → DNS probe confirms actual network state. Worst case (provider is just slow): DNS probe immediately succeeds, user sees restore prompt, presses Enter. +- **Single constant**: `REQUEST_TIMEOUT_MS` in `provider/provider.ts` — one place to update for all providers. User can still override per-provider via config `timeout` field. diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts index ad66bb76292..ecf00a6ab83 100644 --- a/packages/opencode/src/cli/cmd/run.ts +++ b/packages/opencode/src/cli/cmd/run.ts @@ -570,6 +570,7 @@ export const RunCommand = cmd({ UI.error(err) } + // kilocode_change start if ( event.type === "session.status" && event.properties.sessionID === sessionID && @@ -577,6 +578,7 @@ export const RunCommand = cmd({ ) { retries = 0 } + // kilocode_change end if ( event.type === "session.status" && @@ -609,9 +611,9 @@ export const RunCommand = cmd({ await sdk.permission.reply({ requestID: permission.id, reply: "reject", - }) - } - + }) // kilocode_change + } // kilocode_change + // kilocode_change start - network retry handling if (event.type === "session.network.asked") { const request = event.properties if (request.sessionID !== sessionID) continue @@ -630,6 +632,7 @@ export const RunCommand = cmd({ requestID: request.id, }) } + // kilocode_change end } } diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx index 0fddd94ed2c..b5657ebbadd 100644 --- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx @@ -9,7 +9,7 @@ import type { Command, PermissionRequest, QuestionRequest, - SessionNetworkWait, + SessionNetworkWait, // kilocode_change LspStatus, McpStatus, McpResource, @@ -49,9 +49,11 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ question: { [sessionID: string]: QuestionRequest[] } + // kilocode_change start network: { [sessionID: string]: SessionNetworkWait[] } + // kilocode_change end config: Config session: Session[] session_status: { @@ -92,7 +94,9 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ agent: [], permission: {}, question: {}, + // kilocode_change start network: {}, + // kilocode_change end command: [], provider: [], provider_default: {}, @@ -230,8 +234,9 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ }), ) break - } + } // kilocode_change + // kilocode_change start case "session.network.replied": case "session.network.rejected": { const requests = store.network[event.properties.sessionID] @@ -279,6 +284,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ ) break } + // kilocode_change end case "todo.updated": setStore("todo", event.properties.sessionID, event.properties.todos) @@ -512,7 +518,8 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ sdk.client.lsp.status().then((x) => setStore("lsp", reconcile(x.data!))), sdk.client.mcp.status().then((x) => setStore("mcp", reconcile(x.data!))), sdk.client.experimental.resource.list().then((x) => setStore("mcp_resource", reconcile(x.data ?? {}))), - sdk.client.formatter.status().then((x) => setStore("formatter", reconcile(x.data!))), + sdk.client.formatter.status().then((x) => setStore("formatter", reconcile(x.data!))), // kilocode_change + // kilocode_change start sdk.client.network.list().then((x) => { const next: Record = {} for (const item of x.data ?? []) { @@ -521,6 +528,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ } setStore("network", reconcile(next)) }), + // kilocode_change end sdk.client.session.status().then((x) => { setStore("session_status", reconcile(x.data!)) }), diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx index 9e05f501403..a6e7d5e3d82 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx @@ -78,7 +78,7 @@ import { Filesystem } from "@/util/filesystem" import { Global } from "@/global" import { PermissionPrompt } from "./permission" import { QuestionPrompt } from "./question" -import { NetworkPrompt } from "./network" +import { NetworkPrompt } from "./network" // kilocode_change import { DialogExportOptions } from "../../ui/dialog-export-options" import { formatTranscript } from "../../util/transcript" import { UI } from "@/cli/ui.ts" @@ -142,10 +142,12 @@ export function Session() { if (session()?.parentID) return [] return children().flatMap((x) => sync.data.question[x.id] ?? []) }) + // kilocode_change start const network = createMemo(() => { if (session()?.parentID) return [] return children().flatMap((x) => sync.data.network[x.id] ?? []) }) + // kilocode_change end const pending = createMemo(() => { return messages().findLast((x) => x.role === "assistant" && !x.time.completed)?.id @@ -1217,16 +1219,20 @@ export function Session() { 0}> + {/* kilocode_change */} + {/* kilocode_change start */} 0}> + {/* kilocode_change end */} + {/* kilocode_change start */} { prompt = r promptRef.set(r) @@ -1235,7 +1241,7 @@ export function Session() { r.set(route.initialPrompt) } }} - disabled={permissions().length > 0 || questions().length > 0 || network().length > 0} + disabled={permissions().length > 0 || questions().length > 0 || network().length > 0} // kilocode_change onSubmit={() => { toBottom() }} diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx index 4bbae3464ab..3a1c0544804 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx @@ -1,3 +1,4 @@ +// kilocode_change - new file /** @jsxImportSource @opentui/solid */ import { Show } from "solid-js" import { useKeyboard } from "@opentui/solid" diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts index 50824974112..1e25f16fccf 100644 --- a/packages/opencode/src/config/config.ts +++ b/packages/opencode/src/config/config.ts @@ -1260,12 +1260,18 @@ export namespace Config { baseURL: z.string().optional(), enterpriseUrl: z.string().optional().describe("GitHub Enterprise URL for copilot authentication"), setCacheKey: z.boolean().optional().describe("Enable promptCacheKey for this provider (default false)"), + // kilocode_change start timeout: z .union([ - z.number().int().positive().describe( - "Timeout in milliseconds for requests to this provider. Default is 120000 (2 minutes). Set to false to disable timeout.", // kilocode_change - ), + z + .number() + .int() + .positive() + .describe( + "Timeout in milliseconds for requests to this provider. Default is 120000 (2 minutes). Set to false to disable timeout.", + ), z.literal(false).describe("Disable timeout for this provider entirely."), + // kilocode_change end ]) .optional() .describe( diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts index 1d4cfdfdd30..476744bcc98 100644 --- a/packages/opencode/src/mcp/index.ts +++ b/packages/opencode/src/mcp/index.ts @@ -63,6 +63,7 @@ export namespace MCP { }), ) + // kilocode_change start export async function reconnectRemote() { const cfg = await Config.get() const list = Object.entries(cfg.mcp ?? {}) @@ -95,6 +96,7 @@ export namespace MCP { }), ) } + // kilocode_change end export const Failed = NamedError.create( "MCPFailed", diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts index 38b3eb5ac69..dbebcdf80f9 100644 --- a/packages/opencode/src/provider/provider.ts +++ b/packages/opencode/src/provider/provider.ts @@ -49,8 +49,10 @@ import { Installation } from "../installation" import { DEFAULT_HEADERS } from "@/kilocode/const" // kilocode_change -/** Default timeout (ms) for provider HTTP requests. kilocode_change */ +// kilocode_change start +/** Default timeout (ms) for provider HTTP requests. */ export const REQUEST_TIMEOUT_MS = 120_000 // 2 minutes +// kilocode_change end export namespace Provider { const log = Log.create({ service: "provider" }) diff --git a/packages/opencode/src/server/routes/network.ts b/packages/opencode/src/server/routes/network.ts index e51b689c82f..5b86d5eec66 100644 --- a/packages/opencode/src/server/routes/network.ts +++ b/packages/opencode/src/server/routes/network.ts @@ -1,3 +1,4 @@ +// kilocode_change - new file import { Hono } from "hono" import { describeRoute, resolver, validator } from "hono-openapi" import z from "zod" diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts index ba40490b117..1c1a8380eb6 100644 --- a/packages/opencode/src/server/server.ts +++ b/packages/opencode/src/server/server.ts @@ -53,7 +53,7 @@ import { QuestionRoutes } from "./routes/question" import { PermissionRoutes } from "./routes/permission" import { RemoteRoutes } from "./routes/remote" // kilocode_change import { GlobalRoutes } from "./routes/global" -import { NetworkRoutes } from "./routes/network" +import { NetworkRoutes } from "./routes/network" // kilocode_change import { MDNS } from "./mdns" // @ts-ignore This global is needed to prevent ai-sdk from logging warnings to stdout https://github.com/vercel/ai/blob/2dc67e0ef538307f21368db32d5a12345d98831b/packages/ai/src/logger/log-warnings.ts#L85 @@ -280,7 +280,7 @@ export namespace Server { .route("/session", SessionRoutes()) .route("/permission", PermissionRoutes()) .route("/question", QuestionRoutes()) - .route("/network", NetworkRoutes()) + .route("/network", NetworkRoutes()) // kilocode_change .route("/provider", ProviderRoutes()) .route("/telemetry", TelemetryRoutes()) // kilocode_change .route("/commit-message", CommitMessageRoutes()) // kilocode_change diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts index ad995836250..f37591e0b48 100644 --- a/packages/opencode/src/session/message-v2.ts +++ b/packages/opencode/src/session/message-v2.ts @@ -916,10 +916,10 @@ export namespace MessageV2 { }, { cause: e }, ).toObject() - case SessionNetwork.disconnected(e): // kilocode_change + case SessionNetwork.disconnected(e): // kilocode_change start return new MessageV2.APIError( { - message: SessionNetwork.message(e), + message: SessionNetwork.message(e), // kilocode_change end isRetryable: true, metadata: { code: (e as SystemError).code ?? "", diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index 545939cf515..bc82e0caafd 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -1,3 +1,4 @@ +// kilocode_change - new file import { Bus } from "../bus" import { BusEvent } from "../bus/bus-event" import { Identifier } from "../id/id" diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts index b5b3e57dc10..5b035ba8b6f 100644 --- a/packages/opencode/src/session/processor.ts +++ b/packages/opencode/src/session/processor.ts @@ -17,7 +17,7 @@ import { PermissionNext } from "@/permission/next" import { Question } from "@/question" import { Telemetry } from "@kilocode/kilo-telemetry" // kilocode_change import { Flag } from "@/flag/flag" // kilocode_change -import { SessionNetwork } from "./network" +import { SessionNetwork } from "./network" // kilocode_change export namespace SessionProcessor { const DOOM_LOOP_THRESHOLD = 3 @@ -413,6 +413,7 @@ export namespace SessionProcessor { }) } else { const retry = SessionRetry.retryable(error) + // kilocode_change start - network disconnect detection and offline recovery if (retry !== undefined) { const offline = SessionNetwork.disconnected(e) log.warn("retryable error", { @@ -496,6 +497,7 @@ export namespace SessionProcessor { continue } } + // kilocode_change end input.assistantMessage.error = error Bus.publish(Session.Event.Error, { sessionID: input.assistantMessage.sessionID, diff --git a/packages/opencode/src/session/status.ts b/packages/opencode/src/session/status.ts index 205b17086a9..c7511155617 100644 --- a/packages/opencode/src/session/status.ts +++ b/packages/opencode/src/session/status.ts @@ -18,11 +18,13 @@ export namespace SessionStatus { z.object({ type: z.literal("busy"), }), + // kilocode_change start z.object({ type: z.literal("offline"), requestID: z.string(), message: z.string(), }), + // kilocode_change end ]) .meta({ ref: "SessionStatus", diff --git a/packages/opencode/src/tool/warpgrep.ts b/packages/opencode/src/tool/warpgrep.ts index 145fbf77816..a43cc443d35 100644 --- a/packages/opencode/src/tool/warpgrep.ts +++ b/packages/opencode/src/tool/warpgrep.ts @@ -16,7 +16,7 @@ export const CodebaseSearchTool = Tool.define("codebase_search", { parameters: z.object({ query: z .string() - .describe("Search query describing what code you are looking for. Be specific and descriptive for best results."), + .describe("Search query describing what code you are looking for. Be specific and descriptive for best results."), // kilocode_change }), async execute(params, ctx) { await ctx.ask({ @@ -45,7 +45,7 @@ export const CodebaseSearchTool = Tool.define("codebase_search", { // FREE_PERIOD_TODO: When the proxy stops serving free requests, errors // from the proxy (401/402/429) will surface here. The message below // tells the user exactly what to do. - const isAuthOrRateLimit = result.error && /401|402|429|rate.limit|free.period|unauthorized/i.test(result.error) + const isAuthOrRateLimit = result.error && /401|402|429|rate.limit|free.period|unauthorized/i.test(result.error) // kilocode_change const apiKeyMsg = "Codebase search unavailable: free period ended. Set MORPH_API_KEY to continue. Get your key at https://www.morphllm.com/" if (isAuthOrRateLimit) { @@ -64,7 +64,7 @@ export const CodebaseSearchTool = Tool.define("codebase_search", { } const MAX_OUTPUT_CHARS = 45_000 - const fullOutput = result.contexts.map((c) => `### ${c.file}\n\`\`\`\n${c.content}\n\`\`\``).join("\n\n") + const fullOutput = result.contexts.map((c) => `### ${c.file}\n\`\`\`\n${c.content}\n\`\`\``).join("\n\n") // kilocode_change let output: string if (fullOutput.length > MAX_OUTPUT_CHARS) { diff --git a/packages/opencode/test/cli/run-network.test.ts b/packages/opencode/test/cli/run-network.test.ts index 288c9ee859f..725862fac19 100644 --- a/packages/opencode/test/cli/run-network.test.ts +++ b/packages/opencode/test/cli/run-network.test.ts @@ -1,3 +1,4 @@ +// kilocode_change - new file import { afterEach, describe, expect, mock, test } from "bun:test" type Event = { diff --git a/packages/opencode/test/session/network.test.ts b/packages/opencode/test/session/network.test.ts index dba8ba81090..65f3266ff2d 100644 --- a/packages/opencode/test/session/network.test.ts +++ b/packages/opencode/test/session/network.test.ts @@ -1,3 +1,4 @@ +// kilocode_change - new file import { describe, expect, test } from "bun:test" import { Bus } from "../../src/bus" import { Instance } from "../../src/project/instance" diff --git a/packages/opencode/test/session/retry.test.ts b/packages/opencode/test/session/retry.test.ts index 7b102f58974..1a4add0913d 100644 --- a/packages/opencode/test/session/retry.test.ts +++ b/packages/opencode/test/session/retry.test.ts @@ -183,6 +183,7 @@ describe("session.message-v2.fromError", () => { expect(retryable).toBe("Connection reset by server") }) + // kilocode_change start test("ECONNREFUSED socket error is retryable", () => { const result = MessageV2.fromError( { @@ -197,6 +198,7 @@ describe("session.message-v2.fromError", () => { expect(result.data.message).toBe("Connection refused") expect(result.data.metadata?.code).toBe("ECONNREFUSED") }) + // kilocode_change end test("marks OpenAI 404 status codes as retryable", () => { const error = new APICallError({ From 7ddc269cf1654c6e03d0d8d3fe85b99e2c89c351 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 9 Apr 2026 11:42:15 +0300 Subject: [PATCH 36/58] chore(cli): remove plan file --- .kilo/plans/1775246628649-lucky-planet.md | 369 ---------------------- 1 file changed, 369 deletions(-) delete mode 100644 .kilo/plans/1775246628649-lucky-planet.md diff --git a/.kilo/plans/1775246628649-lucky-planet.md b/.kilo/plans/1775246628649-lucky-planet.md deleted file mode 100644 index 2584af7d05a..00000000000 --- a/.kilo/plans/1775246628649-lucky-planet.md +++ /dev/null @@ -1,369 +0,0 @@ -# Plan: Minimize SDK diff + Network Reconnection Notification - -## Context - -Branch: `kilocode-cli-resume-after-sleep` -PR: https://github.com/Kilo-Org/kilocode/pull/7578 - -## Part 1: Minimize `packages/sdk/openapi.json` diff - -### Problem - -The `openapi.json` diff is ~5000 lines but **zero schemas were removed**. The diff is large because: - -1. **Formatting changes**: All `"required"` / `"enum"` / `"tags"` multi-line arrays were collapsed to single-line (likely Prettier behavior changed — possibly a dependency that generates the base JSON before Prettier runs) -2. **Schema reordering**: Route order changed in `server.ts` (`/remote` moved earlier, `/network` added), causing schemas to appear in different positions -3. **`FileDiff` → inline**: The `Session.diffs` and `GlobalSession.diffs` fields changed from `$ref: FileDiff` to an inline object definition - -The actual new content is small: - -- 4 new schemas: `SessionNetworkWait`, 3 network event types -- 5 new API paths: 3 network endpoints, 2 KiloClaw endpoints -- 5 modified schemas: `Config` (+`remote_control`), `Event` (+ network refs), `GlobalSession`/`Session` (`diffs` inlined), `SessionStatus` (+`offline` variant) -- 4 modified paths: session-import endpoints (+`skipped` field) - -Similarly, `types.gen.ts` shows types "removed" then "added" at a different position — they were just reordered. - -### Approach: Regenerate with minimal route reordering - -The openapi.json is auto-generated by `./script/generate.ts`. The formatting difference comes from running `prettier` on the generated output. To minimize the diff: - -1. **Keep the `/remote` route in its original position in `server.ts`** — it was moved from after `/telemetry` to after `/global`, which reordered schemas in the generated output. Move it back to its original position. - -2. **Regenerate `openapi.json`** via `./script/generate.ts`. The new endpoints/schemas will be added, but existing schemas will stay in the same order. - -3. **If formatting diffs persist after regeneration** (due to Prettier), take the main branch's `openapi.json` and manually merge in only the new content: - - New paths: `/network`, `/network/{requestID}/reply`, `/network/{requestID}/reject`, `/kilo/claw/status`, `/kilo/claw/chat-credentials` - - New schemas: `SessionNetworkWait`, `Event.session.network.asked`, `Event.session.network.replied`, `Event.session.network.rejected` - - Modified schemas: `SessionStatus` (+offline variant), `Config` (+remote_control), `Event` (+network refs), `Session`/`GlobalSession` (diffs field) - - Modified paths: session-import endpoints (+skipped) - -4. **Regenerate SDK types** from the (now minimal-diff) openapi.json. The types will preserve original ordering, so `types.gen.ts` and `sdk.gen.ts` diffs will be clean additions only. - -### Files to change - -- `packages/opencode/src/server/server.ts` — possibly revert `/remote` route position -- `packages/sdk/openapi.json` — regenerate or manually merge -- `packages/sdk/js/src/v2/gen/types.gen.ts` — regenerated -- `packages/sdk/js/src/v2/gen/sdk.gen.ts` — regenerated - ---- - -## Part 2: Network Reconnection Notification - -### Current flow - -1. Network error detected in `session/processor.ts` → calls `SessionNetwork.ask()` -2. Session status set to `{ type: "offline", requestID, message }` -3. TUI shows `NetworkPrompt` with static text: - - **"Network reconnect required"** (title) - - `{error message}` (e.g., "Connection refused") - - "Reconnect the network-dependent service, then press Enter to resume." - - "Press Esc to stop this turn." -4. User manually presses Enter → session retries | Esc → session stops - -### Problem - -The user must manually detect when the network is back and press Enter. There's no automatic detection of network restoration, and no notification when connectivity returns. - -### Desired flow - -1. Network error detected → session pauses, TUI shows "waiting" state -2. System polls for connectivity restoration in the background -3. When network comes back → bell rings + prompt updates to ask: "Network resumed. Continue this turn?" -4. User presses Enter (resume) or Esc (stop) - -### Implementation - -#### 2a. Add network connectivity monitor (`session/network.ts`) - -Add a `monitor()` function that polls for connectivity after a network wait is created: - -```ts -async function monitor(info: Wait, abort: AbortSignal) { - const interval = 3000 // poll every 3 seconds - while (!abort.aborted) { - await new Promise((r) => setTimeout(r, interval)) - if (abort.aborted) return - const online = await probe().catch(() => false) - if (online) { - Bus.publish(Event.Restored, { sessionID: info.sessionID, requestID: info.id }) - return - } - } -} -``` - -The `probe()` function should make a lightweight connectivity check. Options: - -- **DNS resolution** of a known host (e.g., `dns.google`) -- **HTTP HEAD** to a well-known endpoint -- **TCP connect** to a known port - -Simplest and most reliable: DNS resolution via `Bun.dns.resolve("dns.google")` or similar. - -#### 2b. New event: `SessionNetwork.Event.Restored` - -Add a new bus event so the TUI can react when connectivity returns: - -```ts -Restored: BusEvent.define( - "session.network.restored", - z.object({ - sessionID: z.string(), - requestID: z.string(), - }), -) -``` - -This needs to be: - -- Published from the monitor when probe succeeds -- Included in the SSE event stream so the SDK receives it -- Added to the openapi.json schema -- Handled in `sync.tsx` → update the wait item to indicate restoration - -#### 2c. Update `SessionNetworkWait` schema - -Add a `restored` boolean field (default `false`) to track whether connectivity has returned: - -```ts -export const Wait = z.object({ - id: Identifier.schema("question"), - sessionID: Identifier.schema("session"), - message: z.string(), - restored: z.boolean().default(false), - time: z.object({ - created: z.number(), - }), -}) -``` - -When the `Restored` event fires, update the pending wait's `restored` flag. - -#### 2d. Update TUI `NetworkPrompt` (`routes/session/network.tsx`) - -Update the prompt to have two visual states based on `request.restored`: - -**Disconnected state** (`restored === false`): - -``` -⚠ Network disconnected -Connection refused -Waiting for network... - -Press Esc to stop this turn. -``` - -**Reconnected state** (`restored === true`): - -``` -Network reconnected -{original error message} — connection restored - -1. Resume Continue this turn -2. Stop Cancel and return to prompt - -↑↓ select enter confirm -``` - -The reconnected state uses the numbered-option pattern from `QuestionPrompt` for consistency. Keep Enter/Esc keyboard handling (Enter = resume, Esc = stop). Ring the bell when transitioning to reconnected state (already wired - the `createEffect` in `session/index.tsx` handles this). - -**Alternative simpler wording** (matching the existing prompt style): - -``` -Network reconnected -Connection restored. - -Press Enter to resume this turn. -Press Esc to stop. -``` - -This is more consistent with the existing `NetworkPrompt` style (text instructions rather than numbered options). - -#### 2e. Update `sync.tsx` to handle restored event - -Add a handler for `session.network.restored`: - -```ts -case "session.network.restored": { - const requests = store.network[event.properties.sessionID] - if (!requests) break - const match = Binary.search(requests, event.properties.requestID, (r) => r.id) - if (match.found) { - setStore("network", event.properties.sessionID, match.index, "restored", true) - } - break -} -``` - -#### 2f. Server route for restored event - -Already included in the SSE event stream since all bus events are forwarded. Just need to add the event to the `Event` union in the server's OpenAPI spec (which happens automatically via the schema definition). - -#### 2g. `run.ts` non-TUI handling - -The `run.ts` (headless/pipeline mode) already auto-replies to network waits with exponential backoff. No changes needed there — the monitor is primarily for the TUI interactive experience. - -### Files to change - -- `packages/opencode/src/session/network.ts` — add `monitor()`, `probe()`, `Event.Restored`, update `Wait` schema with `restored` -- `packages/opencode/src/cli/cmd/tui/routes/session/network.tsx` — two-state UI (disconnected vs reconnected) -- `packages/opencode/src/cli/cmd/tui/context/sync.tsx` — handle `session.network.restored` event -- `packages/opencode/src/session/processor.ts` — call `monitor()` after creating the wait (with abort signal) -- `packages/sdk/openapi.json` — add restored event schema (via regeneration) -- `packages/sdk/js/src/v2/gen/types.gen.ts` — regenerated -- `packages/sdk/js/src/v2/gen/sdk.gen.ts` — regenerated - ---- - -## Execution Order - -1. Fix `/remote` route position in `server.ts` (if needed for minimal diff) -2. Add `probe()`, `monitor()`, `Event.Restored`, update `Wait` schema in `session/network.ts` -3. Wire `monitor()` call in `processor.ts` -4. Add SSE event forwarding for `session.network.restored` (verify it's automatic) -5. Update `sync.tsx` to handle the restored event -6. Update `NetworkPrompt` with two-state UI -7. Regenerate SDK: `./script/generate.ts` -8. Verify openapi.json diff is minimal (only actual semantic additions) -9. Run typecheck: `bun turbo typecheck` -10. Run tests: `bun test` from `packages/opencode/` - ---- - -## Part 3: Default Request Timeout (2 minutes) - -### Problem - -When the network is unavailable (e.g. laptop sleep/wake, Wi-Fi disconnect), it takes far too long for requests to fail. The fetch hangs until the OS TCP stack gives up (60-120+ seconds depending on OS), with no application-level timeout enforcing a bound. Three factors compound: - -1. **No default fetch timeout applied**: `provider.ts` line 1143 checks `options["timeout"] !== undefined && !== null`, but when the user hasn't configured a timeout in their config, `options["timeout"]` is `undefined` and the entire timeout block is skipped. The config schema documents "Default is 300000 (5 minutes)" but **no code applies this default**. - -2. **Bun's built-in timeout disabled**: Line 1174 passes `timeout: false` to Bun's fetch, explicitly disabling the runtime's own timeout. - -3. **Unlimited retries by default**: `KILO_SESSION_RETRY_LIMIT` is `undefined` by default. The processor check at line 479 (`Flag.KILO_SESSION_RETRY_LIMIT === undefined || attempt < limit`) means retries are infinite. Each retry waits for another OS-level TCP timeout before failing. - -Combined: each request can hang for minutes, then retries infinitely with backoff. - -### Approach - -Add a single constant `REQUEST_TIMEOUT_MS = 120_000` (2 minutes) and apply it as the default timeout in the provider's custom fetch wrapper. Also ensure timeout errors (`DOMException` with `name === "TimeoutError"`) are recognized as network disconnection, so they trigger the existing offline prompt flow. - -### Changes - -#### 3a. Add default timeout constant and apply it (`provider/provider.ts`) - -Add a prominently placed, exported constant near the top of the file: - -```ts -/** Default timeout (ms) for provider HTTP requests. */ -export const REQUEST_TIMEOUT_MS = 120_000 // 2 minutes -``` - -Modify the custom fetch wrapper (lines 1143-1151) to apply the default when no explicit timeout is configured: - -```ts -// Before: -if (options["timeout"] !== undefined && options["timeout"] !== null) { - const signals: AbortSignal[] = [] - if (opts.signal) signals.push(opts.signal) - if (options["timeout"] !== false) signals.push(AbortSignal.timeout(options["timeout"])) - const combined = signals.length > 1 ? AbortSignal.any(signals) : signals[0] - opts.signal = combined -} - -// After: -const ms = options["timeout"] ?? REQUEST_TIMEOUT_MS -if (ms !== false) { - const signals: AbortSignal[] = [] - if (opts.signal) signals.push(opts.signal) - signals.push(AbortSignal.timeout(ms)) - opts.signal = signals.length > 1 ? AbortSignal.any(signals) : signals[0] -} -``` - -The key change: `options["timeout"] ?? REQUEST_TIMEOUT_MS` means: - -- If user configured `timeout: 300000` → uses 300000 -- If user configured `timeout: false` → disables timeout -- If not configured (`undefined`) → uses `REQUEST_TIMEOUT_MS` (120000) - -#### 3b. Recognize timeout errors as network disconnection (`session/network.ts`) - -`AbortSignal.timeout()` fires a `DOMException` with `name === "TimeoutError"`. The Vercel AI SDK may wrap this in its own error types, so we need to check the cause chain. - -Update `disconnected()` to also match `TimeoutError` DOMExceptions: - -```ts -export function disconnected(err: unknown) { - const match = code(err) - if (match && codes.has(match)) return true - // Recognize AbortSignal.timeout() errors (DOMException name "TimeoutError") - for (const item of chain(err)) { - if (item instanceof DOMException && item.name === "TimeoutError") return true - } - return msgs(err).some((item) => { - // ... existing message checks unchanged ... - }) -} -``` - -Update `message()` to return a friendly message for timeout errors: - -```ts -export function message(err: unknown) { - // Check for timeout first (before code-based checks) - for (const item of chain(err)) { - if (item instanceof DOMException && item.name === "TimeoutError") return "Request timed out" - } - const match = code(err) - // ... rest unchanged ... -} -``` - -This ensures timeout errors enter the offline prompt flow where DNS polling will confirm whether the network is actually down. If the network IS up (provider was just slow), the DNS probe immediately succeeds and the user sees the restore prompt. - -#### 3c. Update config schema documentation (`config/config.ts`) - -The timeout default documentation says "Default is 300000 (5 minutes)" but the actual default is now 120000 (2 minutes). Update the schema description to match: - -```ts -// Line 1116-1117: -"Timeout in milliseconds for requests to this provider. Default is 120000 (2 minutes). Set to false to disable timeout." -``` - -#### 3d. Tests - -Add tests in `packages/opencode/test/session/network.test.ts`: - -- `TimeoutError` DOMException is classified as disconnected -- Wrapped `TimeoutError` (in cause chain) is classified as disconnected -- `message()` returns "Request timed out" for timeout errors - -### Files to change - -| File | Change | -| ------------------------------------------------ | -------------------------------------------------------------------- | -| `packages/opencode/src/provider/provider.ts` | Add `REQUEST_TIMEOUT_MS` constant, apply as default in fetch wrapper | -| `packages/opencode/src/session/network.ts` | Recognize `TimeoutError` in `disconnected()` and `message()` | -| `packages/opencode/src/config/config.ts` | Update timeout default documentation | -| `packages/opencode/test/session/network.test.ts` | Add timeout error tests | - -### Execution order - -1. Add `REQUEST_TIMEOUT_MS` constant and modify fetch wrapper in `provider/provider.ts` -2. Update `disconnected()` and `message()` in `session/network.ts` -3. Update config schema description in `config/config.ts` -4. Add tests in `test/session/network.test.ts` -5. Run tests: `bun test test/session/network.test.ts` -6. Run typecheck: `bun run typecheck` - ---- - -## Decisions (all parts) - -- **Connectivity probe**: `Bun.dns.lookup("dns.google")` — fast, lightweight DNS check. Sufficient for sleep/wake scenarios. -- **Request timeout default**: 120,000ms (2 minutes) — generous enough for slow providers, short enough to detect offline quickly. -- **Timeout error classification**: Treat `TimeoutError` as network disconnection → enters offline prompt flow → DNS probe confirms actual network state. Worst case (provider is just slow): DNS probe immediately succeeds, user sees restore prompt, presses Enter. -- **Single constant**: `REQUEST_TIMEOUT_MS` in `provider/provider.ts` — one place to update for all providers. User can still override per-provider via config `timeout` field. From 128c6e9e2889b483b7d1d8e383d7cdbd0690cfd7 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 9 Apr 2026 11:42:53 +0300 Subject: [PATCH 37/58] style(cli): remove duplicate marker --- packages/opencode/src/cli/cmd/tui/routes/session/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx index a6e7d5e3d82..f14b349d4da 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx @@ -1219,7 +1219,6 @@ export function Session() { 0}> - {/* kilocode_change */} {/* kilocode_change start */} 0}> From 2c4c214b3e5865e6038539b697a771fa94959a7e Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 9 Apr 2026 11:43:15 +0300 Subject: [PATCH 38/58] fix(cli): background mcp reconnect --- packages/opencode/src/session/network.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index bc82e0caafd..81445244a4c 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -230,7 +230,7 @@ export namespace SessionNetwork { return } delete s.pending[input.requestID] - await MCP.reconnectRemote().catch((err) => { + void MCP.reconnectRemote().catch((err) => { log.error("remote reconnect failed", { err }) }) Bus.publish(Event.Replied, { From e1ca9e9214b4082ff692a421c27ae1f463e9ddd5 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 9 Apr 2026 11:44:22 +0300 Subject: [PATCH 39/58] refactor(cli): return id from ask() --- packages/opencode/src/session/network.ts | 3 ++- packages/opencode/src/session/processor.ts | 26 +++++++++------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/packages/opencode/src/session/network.ts b/packages/opencode/src/session/network.ts index 81445244a4c..cf4978724f3 100644 --- a/packages/opencode/src/session/network.ts +++ b/packages/opencode/src/session/network.ts @@ -166,7 +166,7 @@ export namespace SessionNetwork { }, } - return new Promise((resolve, reject) => { + const promise = new Promise((resolve, reject) => { const onAbort = () => { if (!s.pending[id]) return input.abort.removeEventListener("abort", onAbort) @@ -199,6 +199,7 @@ export namespace SessionNetwork { log.error("restore watch failed", { err, requestID: id }) }) }) + return { id, promise } } export const restore = fn( diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts index 5b035ba8b6f..b6c36eea5af 100644 --- a/packages/opencode/src/session/processor.ts +++ b/packages/opencode/src/session/processor.ts @@ -426,25 +426,21 @@ export namespace SessionProcessor { }) if (offline) { const msg = SessionNetwork.message(e) - const wait = SessionNetwork.ask({ + const { id: requestID, promise: wait } = await SessionNetwork.ask({ sessionID: input.sessionID, message: msg, abort: input.abort, }) - const list = await SessionNetwork.list() - const match = list.findLast((item) => item.sessionID === input.sessionID) - if (match) { - log.warn("session offline", { - sessionID: input.sessionID, - requestID: match.id, - message: match.message, - }) - SessionStatus.set(input.sessionID, { - type: "offline", - requestID: match.id, - message: match.message, - }) - } + log.warn("session offline", { + sessionID: input.sessionID, + requestID, + message: msg, + }) + SessionStatus.set(input.sessionID, { + type: "offline", + requestID, + message: msg, + }) let aborted = false await wait.catch((err) => { if (err instanceof SessionNetwork.RejectedError) { From 9c27d7a01baa5701e6e48226ae7cfec290085048 Mon Sep 17 00:00:00 2001 From: Alex Alecu Date: Thu, 9 Apr 2026 11:44:46 +0300 Subject: [PATCH 40/58] test(cli): move to kilocode test dir --- packages/opencode/test/{cli => kilocode}/run-network.test.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/opencode/test/{cli => kilocode}/run-network.test.ts (100%) diff --git a/packages/opencode/test/cli/run-network.test.ts b/packages/opencode/test/kilocode/run-network.test.ts similarity index 100% rename from packages/opencode/test/cli/run-network.test.ts rename to packages/opencode/test/kilocode/run-network.test.ts From 56a062011863f2acaec3f7332d83edb4130bd57f Mon Sep 17 00:00:00 2001 From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 08:56:44 +0000 Subject: [PATCH 41/58] fix(cli): unconditionally deny task tool for all subagent sessions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the allowsTask conditional that let subagents spawn further subagents when their merged permissions contained task: allow. This closes the infinite recursion hole where agents could create unbounded chains of child sessions (e.g. via user config or cross-agent loops). The task tool is now always denied in subagent sessions and always removed from the LLM tool list, regardless of agent permissions. Primary agents are unaffected — they retain full task tool access. Fixes #8637 --- packages/opencode/src/tool/task.ts | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/opencode/src/tool/task.ts b/packages/opencode/src/tool/task.ts index a4cd8304f35..e554418c4e1 100644 --- a/packages/opencode/src/tool/task.ts +++ b/packages/opencode/src/tool/task.ts @@ -61,8 +61,6 @@ export const TaskTool = Tool.define("task", async (ctx) => { const agent = await Agent.get(params.subagent_type) if (!agent) throw new Error(`Unknown agent type: ${params.subagent_type} is not a valid agent type`) - const allowsTask = agent.permission.some((rule) => rule.permission === "task" && rule.action === "allow") // kilocode_change - // kilocode_change start — inherit edit and bash restrictions from the calling agent so // sub-agents cannot perform actions the parent agent is not allowed to perform. // We merge the static agent definition with the current session's accumulated permissions @@ -103,15 +101,11 @@ export const TaskTool = Tool.define("task", async (ctx) => { pattern: "*", action: "deny", }, - ...(allowsTask - ? [] - : [ - { - permission: "task" as const, - pattern: "*" as const, - action: "deny" as const, - }, - ]), + { + permission: "task", + pattern: "*", + action: "deny", + }, ...(config.experimental?.primary_tools?.map((t) => ({ pattern: "*", action: "allow" as const, @@ -157,7 +151,7 @@ export const TaskTool = Tool.define("task", async (ctx) => { tools: { todowrite: false, todoread: false, - ...(allowsTask ? {} : { task: false }), + task: false, ...Object.fromEntries((config.experimental?.primary_tools ?? []).map((t) => [t, false])), }, parts: promptParts, From 424244c668dadd36ec6bda999d308e300349769a Mon Sep 17 00:00:00 2001 From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 10:51:31 +0000 Subject: [PATCH 42/58] fix(cli): add kilocode_change markers and reject primary agents in task tool - Add runtime check to reject mode=primary agents from being used as subagents - Add kilocode_change markers to the unconditional task deny block and task:false tool override - Add kilocode_change markers around the primary agent mode check --- packages/opencode/src/tool/task.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/opencode/src/tool/task.ts b/packages/opencode/src/tool/task.ts index e554418c4e1..4207db941c2 100644 --- a/packages/opencode/src/tool/task.ts +++ b/packages/opencode/src/tool/task.ts @@ -60,6 +60,10 @@ export const TaskTool = Tool.define("task", async (ctx) => { const agent = await Agent.get(params.subagent_type) if (!agent) throw new Error(`Unknown agent type: ${params.subagent_type} is not a valid agent type`) + // kilocode_change start — reject primary agents; only subagent/all modes allowed + if (agent.mode === "primary") + throw new Error(`Agent "${params.subagent_type}" is a primary agent and cannot be used as a subagent`) + // kilocode_change end // kilocode_change start — inherit edit and bash restrictions from the calling agent so // sub-agents cannot perform actions the parent agent is not allowed to perform. @@ -101,11 +105,9 @@ export const TaskTool = Tool.define("task", async (ctx) => { pattern: "*", action: "deny", }, - { - permission: "task", - pattern: "*", - action: "deny", - }, + // kilocode_change start — unconditionally deny task for all subagent sessions + { permission: "task", pattern: "*", action: "deny" }, + // kilocode_change end ...(config.experimental?.primary_tools?.map((t) => ({ pattern: "*", action: "allow" as const, @@ -151,7 +153,7 @@ export const TaskTool = Tool.define("task", async (ctx) => { tools: { todowrite: false, todoread: false, - task: false, + task: false, // kilocode_change ...Object.fromEntries((config.experimental?.primary_tools ?? []).map((t) => [t, false])), }, parts: promptParts, From 684319891e78e7d3c05202598abbf8f2726496ad Mon Sep 17 00:00:00 2001 From: Evgeny Shurakov Date: Thu, 9 Apr 2026 12:46:55 +0200 Subject: [PATCH 43/58] feat(vscode): remote session tracking with focused/open distinction Implement end-to-end remote session tracking so the Kilo server knows which sessions are opened and focused in the VS Code extension. - Add RemoteStatusService that tracks open/focused sessions and pushes state to kilo serve via the connection service - Extend connection-service with viewed-sessions endpoint and auto-flush on remote enable/disable and CLI reconnect - Redesign remote settings UI in ExperimentalTab with status indicator and descriptive copy - Add SDK schema for kilo-sessions.remote-status-changed event - Gate session reporting on remote-enabled setting; reset state on CLI disconnect - Remove vestigial remoteToggled message type - Add comprehensive unit tests for RemoteStatusService - Add i18n keys for new remote settings UI across all locales --- packages/kilo-vscode/src/KiloProvider.ts | 72 +++++ .../kilo-vscode/src/SettingsEditorProvider.ts | 13 + .../src/agent-manager/AgentManagerProvider.ts | 8 + .../kilo-vscode/src/agent-manager/types.ts | 6 + packages/kilo-vscode/src/extension.ts | 35 +- .../src/services/RemoteStatusService.ts | 108 +++++++ .../cli-backend/connection-service.ts | 86 +++++ .../kilo-vscode/tests/setup/vscode-mock.ts | 13 + .../tests/unit/remote-status-service.test.ts | 301 ++++++++++++++++++ .../agent-manager/AgentManagerApp.tsx | 8 + .../components/settings/ExperimentalTab.tsx | 49 ++- .../src/components/settings/settings-io.ts | 1 + .../webview-ui/src/hooks/useSlashCommand.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/ar.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/br.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/bs.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/da.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/de.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/en.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/es.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/fr.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/ja.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/ko.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/nl.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/no.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/pl.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/ru.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/th.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/tr.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/uk.ts | 8 + .../kilo-vscode/webview-ui/src/i18n/zh.ts | 7 + .../kilo-vscode/webview-ui/src/i18n/zht.ts | 7 + .../webview-ui/src/styles/chat.css | 60 ++++ .../webview-ui/src/types/messages.ts | 31 ++ packages/opencode/src/cli/cmd/tui/app.tsx | 2 +- .../src/kilo-sessions/kilo-sessions.ts | 53 ++- .../src/kilo-sessions/remote-protocol.ts | 2 + .../src/kilo-sessions/remote-sender.ts | 44 ++- .../opencode/src/kilo-sessions/remote-ws.ts | 11 +- .../opencode/src/server/routes/session.ts | 17 +- .../test/kilo-sessions/remote-ws.test.ts | 20 +- packages/sdk/js/src/v2/gen/sdk.gen.ts | 10 +- packages/sdk/js/src/v2/gen/types.gen.ts | 14 +- packages/sdk/openapi.json | 50 ++- 44 files changed, 1118 insertions(+), 54 deletions(-) create mode 100644 packages/kilo-vscode/src/services/RemoteStatusService.ts create mode 100644 packages/kilo-vscode/tests/unit/remote-status-service.test.ts diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts index 1e18055c837..cbf83893c0b 100644 --- a/packages/kilo-vscode/src/KiloProvider.ts +++ b/packages/kilo-vscode/src/KiloProvider.ts @@ -36,6 +36,7 @@ import { GitOps } from "./agent-manager/GitOps" import { GitStatsPoller, type LocalStats } from "./agent-manager/GitStatsPoller" import { getWorkspaceRoot } from "./review-utils" import { MarketplaceService, type MarketplaceItem, type RemoveResult } from "./services/marketplace" +import type { RemoteStatusService } from "./services/RemoteStatusService" import { resolveProjectDirectory } from "./project-directory" import { getBusySessionCount, seedSessionStatuses } from "./session-status" import { retry } from "./services/cli-backend/retry" @@ -112,6 +113,7 @@ const mapAgent = (a: Agent) => ({ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryPropertiesProvider { public static readonly viewType = "kilo-code.SidebarProvider" + private readonly instanceId = crypto.randomUUID() private webview: vscode.Webview | null = null private currentSession: Session | null = null @@ -198,6 +200,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper | null = null private diffVirtualProvider: import("./DiffVirtualProvider").DiffVirtualProvider | undefined + private remoteService: RemoteStatusService | null = null + private unsubscribeRemote: (() => void) | null = null constructor( private readonly extensionUri: vscode.Uri, @@ -211,6 +215,13 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper TelemetryProxy.getInstance().setProvider(this) } + setRemoteService(service: RemoteStatusService): void { + this.remoteService = service + this.unsubscribeRemote = service.onChange((state) => { + this.postMessage({ type: "remoteStatus", enabled: state.enabled, connected: state.connected }) + }) + } + public setProjectDirectory(directory: string | null): void { if (this.projectDirectory === directory) return this.projectDirectory = directory @@ -324,6 +335,12 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper // authoritative and reconciliation risks race-resetting busy sessions. const reconcile = this.sessionStatusMap.size === 0 void this.seedSessionStatusMap(reconcile) + + // Send current remote status so settings panel shows correct state + if (this.remoteService) { + const state = this.remoteService.getState() + this.postMessage({ type: "remoteStatus", enabled: state.enabled, connected: state.connected }) + } } // legacy-migration start @@ -365,6 +382,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper webviewView.onDidChangeVisibility(() => { vscode.commands.executeCommand("setContext", "kilo-code.new.sidebarVisible", webviewView.visible) this.statsPoller?.setEnabled(webviewView.visible) + if (webviewView.visible) { + if (this.currentSession) this.connectionService.registerFocused(this.instanceId, this.currentSession.id) + } else { + this.connectionService.unregisterFocused(this.instanceId) + } }) // Initialize connection to CLI backend @@ -389,6 +411,15 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper // Handle messages from webview (shared handler) this.setupWebviewMessageHandler(panel.webview) + // Unregister focus when the editor tab becomes inactive, re-register when active + panel.onDidChangeViewState(() => { + if (panel.active) { + if (this.currentSession) this.connectionService.registerFocused(this.instanceId, this.currentSession.id) + } else { + this.connectionService.unregisterFocused(this.instanceId) + } + }) + this.initializeConnection() } @@ -582,6 +613,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper case "clearSession": this.contextSessionID = this.currentSession?.id ?? this.contextSessionID this.currentSession = null + this.connectionService.unregisterFocused(this.instanceId) break case "loadMessages": // Don't await: allow parallel loads so rapid session switching @@ -817,6 +849,30 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper case "renameSession": await this.handleRenameSession(message.sessionID, message.title) break + case "toggleRemote": + this.remoteService?.toggle().catch((err) => { + console.error("[Kilo New] toggleRemote failed:", err) + this.postMessage({ type: "error", message: "Failed to toggle remote control" }) + }) + break + case "setRemoteEnabled": + this.remoteService?.setEnabled(message.enabled).catch((err) => { + console.error("[Kilo New] setRemoteEnabled failed:", err) + this.postMessage({ + type: "error", + message: `Failed to ${message.enabled ? "enable" : "disable"} remote control`, + }) + }) + break + case "requestRemoteStatus": { + // Send cached state immediately, then refresh + if (this.remoteService) { + const state = this.remoteService.getState() + this.postMessage({ type: "remoteStatus", enabled: state.enabled, connected: state.connected }) + } + this.remoteService?.refresh().catch((err) => console.error("[Kilo New] remoteStatus refresh failed:", err)) + break + } case "updateSetting": await this.handleUpdateSetting(message.key, message.value) break @@ -1048,6 +1104,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper // Subscribe to SSE events for this webview (filtered by tracked sessions) this.unsubscribeEvent = this.connectionService.onEventFiltered( (event) => { + // Remote status events are global and should always pass through + if (event.type === "kilo-sessions.remote-status-changed") { + return true + } + const sessionId = this.connectionService.resolveEventSessionId(event) // message.part.updated and message.part.delta are always session-scoped; drop if session unknown. @@ -1244,6 +1305,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper private async handleLoadMessages(sessionID: string): Promise { // Track the session so we receive its SSE events this.trackedSessionIds.add(sessionID) + this.connectionService.registerFocused(this.instanceId, sessionID) this.contextSessionID = sessionID if (!this.client) { @@ -2822,6 +2884,14 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper * Filters events by project ID and tracked session IDs so each webview only sees its own sessions. */ private handleEvent(event: Event): void { + if (event.type === "kilo-sessions.remote-status-changed") { + this.remoteService?.updateFromEvent({ + enabled: event.properties.enabled, + connected: event.properties.connected, + }) + return + } + // Drop session events from other projects before any tracking logic. // This must come first: the trackedSessionIds guard below would otherwise // let a foreign session through if it was accidentally tracked. @@ -3233,6 +3303,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper * Does NOT kill the server — that's the connection service's job. */ dispose(): void { + this.unsubscribeRemote?.() + this.connectionService.unregisterFocused(this.instanceId) this.statsPoller?.stop() this.statsGitOps?.dispose() this.unsubscribeEvent?.() diff --git a/packages/kilo-vscode/src/SettingsEditorProvider.ts b/packages/kilo-vscode/src/SettingsEditorProvider.ts index 922754e319f..493a6fd519b 100644 --- a/packages/kilo-vscode/src/SettingsEditorProvider.ts +++ b/packages/kilo-vscode/src/SettingsEditorProvider.ts @@ -2,6 +2,7 @@ import * as vscode from "vscode" import { KiloProvider } from "./KiloProvider" import { resolvePanelProjectDirectory } from "./project-directory" import type { KiloConnectionService } from "./services/cli-backend" +import type { RemoteStatusService } from "./services/RemoteStatusService" type PanelView = "settings" | "profile" | "marketplace" @@ -26,6 +27,7 @@ export class SettingsEditorProvider implements vscode.Disposable { private panels = new Map() private providers = new Map() private tabs = new Map() + private remoteService: RemoteStatusService | null = null constructor( private readonly extensionUri: vscode.Uri, @@ -101,6 +103,9 @@ export class SettingsEditorProvider implements vscode.Disposable { const provider = new KiloProvider(this.extensionUri, this.connectionService, this.context, { projectDirectory, }) + if (this.remoteService) { + provider.setRemoteService(this.remoteService) + } provider.resolveWebviewPanel(panel) // Listen for closePanel from the webview (back button in panel mode) @@ -144,6 +149,14 @@ export class SettingsEditorProvider implements vscode.Disposable { }) } + setRemoteService(service: RemoteStatusService): void { + this.remoteService = service + // Apply to any existing providers + for (const [, provider] of this.providers) { + provider.setRemoteService(service) + } + } + dispose(): void { for (const [, panel] of this.panels) { panel.dispose() diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts index bebd61406a2..5cf668d3bc3 100644 --- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts +++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts @@ -396,6 +396,10 @@ export class AgentManagerProvider implements Disposable { this.startDiffPolling(m.sessionId) return null } + if (m.type === "agentManager.openSessions") { + this.connectionService.registerOpen("agent-manager", m.sessionIDs) + return null + } if (m.type === "agentManager.stopDiffWatch") { this.stopDiffPolling() return null @@ -423,6 +427,7 @@ export class AgentManagerProvider implements Disposable { // uses the correct session even before the session provider's async session.get completes. if (m.type === "loadMessages") { this.activeSessionId = m.sessionID + this.connectionService.registerFocused("agent-manager", m.sessionID) this.terminalManager.syncOnSessionSwitch(m.sessionID) this.prBridge.poller.setActiveWorktreeId(this.state?.getSession(m.sessionID)?.worktreeId ?? undefined) } @@ -430,6 +435,7 @@ export class AgentManagerProvider implements Disposable { // After clearSession, clear active tracking and re-register worktree sessions if (m.type === "clearSession") { this.activeSessionId = undefined + this.connectionService.unregisterFocused("agent-manager") void Promise.resolve().then(() => { if (!this.panel || !this.state) return for (const id of this.state.worktreeSessionIds()) { @@ -1923,6 +1929,8 @@ export class AgentManagerProvider implements Disposable { } public dispose(): void { + this.connectionService.unregisterFocused("agent-manager") + this.connectionService.registerOpen("agent-manager", []) this.stopDiffPolling() this.statsPoller.stop() this.gitOps.dispose() diff --git a/packages/kilo-vscode/src/agent-manager/types.ts b/packages/kilo-vscode/src/agent-manager/types.ts index 264f1f46107..81090aadaa5 100644 --- a/packages/kilo-vscode/src/agent-manager/types.ts +++ b/packages/kilo-vscode/src/agent-manager/types.ts @@ -450,6 +450,11 @@ interface OpenPRIn { worktreeId: string } +interface OpenSessionsIn { + type: "agentManager.openSessions" + sessionIDs: string[] +} + interface OpenFileIn { type: "agentManager.openFile" sessionId: string @@ -603,6 +608,7 @@ export type AgentManagerInMessage = | StopDiffWatchIn | RefreshPRIn | OpenPRIn + | OpenSessionsIn | OpenFileIn | GenericOpenFileIn | PreviewImageIn diff --git a/packages/kilo-vscode/src/extension.ts b/packages/kilo-vscode/src/extension.ts index df9681c0fc1..60b30ecc877 100644 --- a/packages/kilo-vscode/src/extension.ts +++ b/packages/kilo-vscode/src/extension.ts @@ -16,6 +16,7 @@ import { TelemetryProxy } from "./services/telemetry" import { registerCommitMessageService } from "./services/commit-message" import { registerCodeActions, registerTerminalActions, KiloCodeActionProvider } from "./services/code-actions" import { registerToggleAutoApprove } from "./commands/toggle-auto-approve" +import { RemoteStatusService } from "./services/RemoteStatusService" // Activated via "onStartupFinished" (package.json) so that commands, code actions, keybindings, // autocomplete, commit-message generation, and URI deep links all work immediately — without @@ -33,8 +34,13 @@ export function activate(context: vscode.ExtensionContext) { const browserAutomationService = new BrowserAutomationService(connectionService) browserAutomationService.syncWithSettings() + // Create remote status service (one status bar item for all webviews) + const remoteService = new RemoteStatusService() + context.subscriptions.push(remoteService) + connectionService.setRemoteService(remoteService) + // Re-register browser automation MCP server on CLI backend reconnect, configure telemetry, - // and reload autocomplete so it picks up the now-available backend connection. + // set remote service client, and reload autocomplete so it picks up the now-available backend connection. const unsubscribeStateChange = connectionService.onStateChange((state) => { if (state === "connected") { browserAutomationService.reregisterIfEnabled() @@ -42,7 +48,17 @@ export function activate(context: vscode.ExtensionContext) { if (config) { telemetry.configure(config.baseUrl, config.password) } + try { + remoteService.setClient(connectionService.getClient()) + console.log("[Kilo New] CLI connected, calling remoteService.refresh()") + remoteService.refresh().catch((err) => console.warn("[Kilo New] initial remote refresh failed:", err)) + } catch { + remoteService.setClient(null) + } AutocompleteServiceManager.getInstance()?.load() + } else { + remoteService.clearState() + remoteService.setClient(null) } }) @@ -60,6 +76,7 @@ export function activate(context: vscode.ExtensionContext) { // Create the provider with shared service const provider = new KiloProvider(context.extensionUri, connectionService, context) + provider.setRemoteService(remoteService) // Register the webview view provider for the sidebar. // retainContextWhenHidden keeps the webview alive when switching to other sidebar panels. @@ -103,6 +120,7 @@ export function activate(context: vscode.ExtensionContext) { vscode.window.registerWebviewPanelSerializer("kilo-code.new.TabPanel", { deserializeWebviewPanel(panel: vscode.WebviewPanel) { const tabProvider = new KiloProvider(context.extensionUri, connectionService, context) + tabProvider.setRemoteService(remoteService) tabProvider.setContinueInWorktreeHandler((sessionId, progress) => agentManagerProvider.continueFromSidebar(sessionId, progress), ) @@ -138,6 +156,7 @@ export function activate(context: vscode.ExtensionContext) { // Create settings/profile editor provider (opens in editor area, not sidebar) const settingsEditorProvider = new SettingsEditorProvider(context.extensionUri, connectionService, context) + settingsEditorProvider.setRemoteService(remoteService) context.subscriptions.push(settingsEditorProvider) // Create sub-agent viewer provider (read-only editor panel for sub-agent sessions) @@ -228,8 +247,18 @@ export function activate(context: vscode.ExtensionContext) { await provider.waitForReady() provider.postMessage({ type: "triggerTask", text: `Generate a terminal command: ${input}` }) }), + vscode.commands.registerCommand("kilo-code.new.toggleRemote", () => { + remoteService.toggle().catch((err) => console.error("[Kilo New] toggleRemote command failed:", err)) + }), vscode.commands.registerCommand("kilo-code.new.openInTab", () => { - return openKiloInNewTab(context, connectionService, agentManagerProvider, tabPanels, diffVirtualProvider) + return openKiloInNewTab( + context, + connectionService, + agentManagerProvider, + tabPanels, + diffVirtualProvider, + remoteService, + ) }), vscode.commands.registerCommand("kilo-code.new.showChanges", () => { diffViewerProvider.openPanel() @@ -362,6 +391,7 @@ async function openKiloInNewTab( agentManagerProvider: AgentManagerProvider, tabPanels: Map, diffVirtualProvider: DiffVirtualProvider, + remoteService: RemoteStatusService, ) { const lastCol = Math.max(...vscode.window.visibleTextEditors.map((e) => e.viewColumn || 0), 0) const hasVisibleEditors = vscode.window.visibleTextEditors.length > 0 @@ -384,6 +414,7 @@ async function openKiloInNewTab( } const tabProvider = new KiloProvider(context.extensionUri, connectionService, context) + tabProvider.setRemoteService(remoteService) tabProvider.setContinueInWorktreeHandler((sessionId, progress) => agentManagerProvider.continueFromSidebar(sessionId, progress), ) diff --git a/packages/kilo-vscode/src/services/RemoteStatusService.ts b/packages/kilo-vscode/src/services/RemoteStatusService.ts new file mode 100644 index 00000000000..8644fdad2d2 --- /dev/null +++ b/packages/kilo-vscode/src/services/RemoteStatusService.ts @@ -0,0 +1,108 @@ +import * as vscode from "vscode" +import type { KiloClient } from "@kilocode/sdk/v2/client" + +export type RemoteState = { enabled: boolean; connected: boolean } + +type Listener = (state: RemoteState) => void + +/** + * Singleton service that owns all remote-control state and the VS Code status bar item. + * Replaces the per-webview polling in RemoteIndicator.tsx and ExperimentalTab.tsx + * with a push-based model: one status bar item, zero recurring cost for non-remote users. + */ +export class RemoteStatusService implements vscode.Disposable { + private state: RemoteState = { enabled: false, connected: false } + private bar: vscode.StatusBarItem + private listeners = new Set() + private client: KiloClient | null = null + + constructor() { + this.bar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 99) + this.bar.command = "kilo-code.new.toggleRemote" + this.sync() + } + + setClient(c: KiloClient | null): void { + this.client = c + } + + /** Get current state synchronously. */ + getState(): RemoteState { + return this.state + } + + updateFromEvent(state: RemoteState): void { + this.update(state) + } + + /** Subscribe to state changes. Returns an unsubscribe function. */ + onChange(cb: Listener): () => void { + this.listeners.add(cb) + return () => this.listeners.delete(cb) + } + + clearState(): void { + this.update({ enabled: false, connected: false }) + } + + /** One-shot status fetch — broadcasts via onChange if state changed. */ + async refresh(): Promise { + if (!this.client) return + const res = await this.client.remote.status().catch((err: unknown) => { + console.warn("[Kilo] remote status refresh failed:", err) + return undefined + }) + if (!res?.data) return + this.update({ enabled: res.data.enabled, connected: res.data.connected }) + } + + /** Toggle remote on/off based on current state. */ + async toggle(): Promise { + if (!this.client) return + const { data } = await this.client.remote.status(undefined, { throwOnError: true }) + await this.setEnabled(!data.enabled) + } + + /** Enable or disable remote. State updates are pushed via events. */ + async setEnabled(enabled: boolean): Promise { + if (!this.client) return + if (enabled) { + await this.client.remote.enable(undefined, { throwOnError: true }) + } else { + await this.client.remote.disable(undefined, { throwOnError: true }) + } + this.update({ enabled, connected: false }) + } + + dispose(): void { + this.listeners.clear() + this.bar.dispose() + } + + // -- internal --------------------------------------------------------------- + + private update(next: RemoteState): void { + if (this.state.enabled === next.enabled && this.state.connected === next.connected) return + this.state = next + this.sync() + for (const cb of this.listeners) cb(next) + } + + /** Sync status bar appearance to current state. */ + private sync(): void { + if (!this.state.enabled) { + this.bar.hide() + return + } + if (this.state.connected) { + this.bar.text = "$(radio-tower) Kilo Remote" + this.bar.tooltip = "Kilo Remote: Connected" + this.bar.color = new vscode.ThemeColor("testing.iconPassed") + } else { + this.bar.text = "$(radio-tower) Kilo Remote \u2026" + this.bar.tooltip = "Kilo Remote: Connecting\u2026" + this.bar.color = new vscode.ThemeColor("editorWarning.foreground") + } + this.bar.show() + } +} diff --git a/packages/kilo-vscode/src/services/cli-backend/connection-service.ts b/packages/kilo-vscode/src/services/cli-backend/connection-service.ts index beb7fe6ad82..14611ded3d5 100644 --- a/packages/kilo-vscode/src/services/cli-backend/connection-service.ts +++ b/packages/kilo-vscode/src/services/cli-backend/connection-service.ts @@ -34,6 +34,7 @@ export class KiloConnectionService { private state: ConnectionState = "disconnected" private connectPromise: Promise | null = null private healthPollTimer: ReturnType | null = null + private remoteService: import("../RemoteStatusService").RemoteStatusService | null = null private readonly eventListeners: Set = new Set() private readonly stateListeners: Set = new Set() @@ -51,6 +52,13 @@ export class KiloConnectionService { */ private readonly messageSessionIdsByMessageId: Map = new Map() + /** Provider key → single focused session ID. */ + private readonly focused: Map = new Map() + /** Provider key → all open (background) session IDs. */ + private readonly opened: Map = new Map() + private debounceTimer: ReturnType | null = null + private unsubRemote: (() => void) | null = null + constructor(context: vscode.ExtensionContext) { this.serverManager = new ServerManager(context) } @@ -106,6 +114,27 @@ export class KiloConnectionService { return this.config } + /** + * Set the remote status service. When remote is disabled, flushViewed() + * is a no-op. When remote becomes enabled (startup refresh, user toggle, + * or SSE event), the accumulated focused/opened state is automatically + * flushed so the server is never left unaware of already-open sessions. + */ + setRemoteService(service: import("../RemoteStatusService").RemoteStatusService | null): void { + this.unsubRemote?.() + this.unsubRemote = null + this.remoteService = service + if (service) { + this.unsubRemote = service.onChange((state) => { + if (state.enabled) this.flushViewed() + }) + } + } + + private isRemoteEnabled(): boolean { + return this.remoteService?.getState().enabled ?? false + } + /** * Current connection state. */ @@ -345,6 +374,55 @@ export class KiloConnectionService { } } + /** + * Register the session a provider is actively viewing (focused). + * After any change the aggregated set is sent to the server (debounced). + */ + registerFocused(key: string, sessionID: string): void { + if (this.focused.get(key) === sessionID) return + this.focused.set(key, sessionID) + this.flushViewed() + } + + /** + * Unregister a provider's focused session (e.g. on dispose, hidden, or clearSession). + */ + unregisterFocused(key: string): void { + if (!this.focused.has(key)) return + this.focused.delete(key) + this.flushViewed() + } + + /** + * Register the open (background tab) session IDs for a provider. + * Sessions that appear in both focused and open are reported as focused only. + */ + registerOpen(key: string, ids: string[]): void { + const prev = this.opened.get(key) + if (prev && prev.length === ids.length && prev.every((v, i) => v === ids[i])) return + this.opened.set(key, ids) + this.flushViewed() + } + + /** Debounced: send the aggregated focused + open session IDs to the server. */ + flushViewed(): void { + if (!this.isRemoteEnabled()) return + if (this.debounceTimer) clearTimeout(this.debounceTimer) + this.debounceTimer = setTimeout(() => { + this.debounceTimer = null + const focus = new Set(this.focused.values()) + const open = new Set() + for (const ids of this.opened.values()) { + for (const id of ids) { + if (!focus.has(id)) open.add(id) + } + } + this.client?.session + .viewed({ focused: [...focus], open: [...open] }) + .catch((err) => console.warn("[Kilo New] ConnectionService: viewed flush failed:", err)) + }, 150) + } + /** * Clean up everything: kill server, close SSE, clear listeners. */ @@ -361,6 +439,14 @@ export class KiloConnectionService { this.clearPendingPromptsListeners.clear() this.directoryProviders.clear() this.messageSessionIdsByMessageId.clear() + this.focused.clear() + this.opened.clear() + if (this.debounceTimer) { + clearTimeout(this.debounceTimer) + this.debounceTimer = null + } + this.unsubRemote?.() + this.unsubRemote = null this.client = null this.sseClient = null this.config = null diff --git a/packages/kilo-vscode/tests/setup/vscode-mock.ts b/packages/kilo-vscode/tests/setup/vscode-mock.ts index 8fdba932d30..9ab5ff42032 100644 --- a/packages/kilo-vscode/tests/setup/vscode-mock.ts +++ b/packages/kilo-vscode/tests/setup/vscode-mock.ts @@ -60,6 +60,10 @@ const mockVscode = { stat: async () => ({ type: 1, ctime: 0, mtime: 0, size: 0 }), }, }, + StatusBarAlignment: { Left: 1, Right: 2 }, + ThemeColor: class { + constructor(public id: string) {} + }, window: { activeTextEditor: undefined, visibleTextEditors: [], @@ -67,6 +71,15 @@ const mockVscode = { showTextDocument: async () => {}, showWarningMessage: async () => undefined, createTerminal: () => ({ show: noop, sendText: noop, dispose: noop }), + createStatusBarItem: () => ({ + text: "", + tooltip: "", + color: undefined as unknown, + command: undefined as string | undefined, + show: noop, + hide: noop, + dispose: noop, + }), }, commands: { registerCommand: () => ({ dispose: noop }), diff --git a/packages/kilo-vscode/tests/unit/remote-status-service.test.ts b/packages/kilo-vscode/tests/unit/remote-status-service.test.ts new file mode 100644 index 00000000000..8c879b6394e --- /dev/null +++ b/packages/kilo-vscode/tests/unit/remote-status-service.test.ts @@ -0,0 +1,301 @@ +import { describe, it, expect, spyOn } from "bun:test" +import { RemoteStatusService, type RemoteState } from "../../src/services/RemoteStatusService" + +type StatusResponse = { enabled: boolean; connected: boolean } + +function client(opts: { status?: StatusResponse | (() => StatusResponse); fail?: boolean }) { + return { + remote: { + status: async (_body?: unknown, _opts?: unknown) => { + if (opts.fail) throw new Error("connection refused") + const data = + typeof opts.status === "function" ? opts.status() : (opts.status ?? { enabled: false, connected: false }) + return { data } + }, + enable: async (_body?: unknown, _opts?: unknown) => { + if (opts.fail) throw new Error("enable failed") + return { data: true } + }, + disable: async (_body?: unknown, _opts?: unknown) => { + if (opts.fail) throw new Error("disable failed") + return { data: true } + }, + }, + } +} + +function service() { + return new RemoteStatusService() +} + +// --------------------------------------------------------------------------- +// Listener management +// --------------------------------------------------------------------------- + +describe("RemoteStatusService", () => { + describe("onChange", () => { + it("listener called on state change", async () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + svc.setClient(client({ status: { enabled: true, connected: true } }) as never) + await svc.refresh() + expect(states).toEqual([{ enabled: true, connected: true }]) + svc.dispose() + }) + + it("listener not called after unsubscribe", async () => { + const svc = service() + const states: RemoteState[] = [] + const unsub = svc.onChange((s) => states.push(s)) + unsub() + svc.setClient(client({ status: { enabled: true, connected: true } }) as never) + await svc.refresh() + expect(states).toEqual([]) + svc.dispose() + }) + + it("multiple listeners all notified", async () => { + const svc = service() + const a: RemoteState[] = [] + const b: RemoteState[] = [] + svc.onChange((s) => a.push(s)) + svc.onChange((s) => b.push(s)) + svc.setClient(client({ status: { enabled: true, connected: false } }) as never) + await svc.refresh() + expect(a).toEqual([{ enabled: true, connected: false }]) + expect(b).toEqual([{ enabled: true, connected: false }]) + svc.dispose() + }) + }) + + // --------------------------------------------------------------------------- + // refresh() + // --------------------------------------------------------------------------- + + describe("refresh", () => { + it("fetches status and notifies listeners", async () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + svc.setClient(client({ status: { enabled: true, connected: false } }) as never) + await svc.refresh() + expect(states).toEqual([{ enabled: true, connected: false }]) + svc.dispose() + }) + + it("without client is a no-op", async () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + await svc.refresh() // no client set + expect(states).toEqual([]) + svc.dispose() + }) + + it("does not notify if state unchanged", async () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + // initial state is { enabled: false, connected: false }, same as client returns + svc.setClient(client({ status: { enabled: false, connected: false } }) as never) + await svc.refresh() + expect(states).toEqual([]) // no change from initial + svc.dispose() + }) + }) + + // --------------------------------------------------------------------------- + // setEnabled() + // --------------------------------------------------------------------------- + + describe("setEnabled", () => { + it("setEnabled(true) calls enable and broadcasts enabled state", async () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + svc.setClient(client({ status: { enabled: true, connected: false } }) as never) + await svc.setEnabled(true) + expect(states).toEqual([{ enabled: true, connected: false }]) + svc.dispose() + }) + + it("setEnabled(false) calls disable and broadcasts disabled", async () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + svc.setClient(client({ status: { enabled: true, connected: true } }) as never) + // First get to enabled state + await svc.refresh() + states.length = 0 // reset + await svc.setEnabled(false) + expect(states).toEqual([{ enabled: false, connected: false }]) + svc.dispose() + }) + + it("setEnabled(false) after enable broadcasts disabled", async () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + svc.setClient(client({ status: { enabled: true, connected: false } }) as never) + await svc.setEnabled(true) + states.length = 0 + await svc.setEnabled(false) + expect(states).toEqual([{ enabled: false, connected: false }]) + svc.dispose() + }) + + it("setEnabled(true) error is surfaced", async () => { + const svc = service() + svc.setClient(client({ fail: true }) as never) + await expect(svc.setEnabled(true)).rejects.toThrow("enable failed") + svc.dispose() + }) + }) + + // --------------------------------------------------------------------------- + // toggle() + // --------------------------------------------------------------------------- + + describe("toggle", () => { + it("toggle when disabled calls enable", async () => { + const svc = service() + let enabled = false + const c = { + remote: { + status: async (_b?: unknown, _o?: unknown) => ({ data: { enabled: false, connected: false } }), + enable: async (_b?: unknown, _o?: unknown) => { + enabled = true + return { data: true } + }, + disable: async (_b?: unknown, _o?: unknown) => ({ data: true }), + }, + } + svc.setClient(c as never) + await svc.toggle() + expect(enabled).toBe(true) + svc.dispose() + }) + + it("toggle when enabled calls disable", async () => { + const svc = service() + let disabled = false + const c = { + remote: { + status: async (_b?: unknown, _o?: unknown) => ({ data: { enabled: true, connected: true } }), + enable: async (_b?: unknown, _o?: unknown) => ({ data: true }), + disable: async (_b?: unknown, _o?: unknown) => { + disabled = true + return { data: true } + }, + }, + } + svc.setClient(c as never) + await svc.toggle() + expect(disabled).toBe(true) + svc.dispose() + }) + }) + + // --------------------------------------------------------------------------- + // Push-based updates via updateFromEvent + // --------------------------------------------------------------------------- + + describe("updateFromEvent", () => { + it("broadcasts state when pushed via event", () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + svc.updateFromEvent({ enabled: true, connected: true }) + expect(states).toEqual([{ enabled: true, connected: true }]) + svc.dispose() + }) + + it("does not notify if event state matches current", () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + // initial state is { enabled: false, connected: false } + svc.updateFromEvent({ enabled: false, connected: false }) + expect(states).toEqual([]) + svc.dispose() + }) + + it("tracks successive event-driven transitions", () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + svc.updateFromEvent({ enabled: true, connected: false }) + svc.updateFromEvent({ enabled: true, connected: true }) + expect(states).toEqual([ + { enabled: true, connected: false }, + { enabled: true, connected: true }, + ]) + svc.dispose() + }) + }) + + // --------------------------------------------------------------------------- + // clearState + // --------------------------------------------------------------------------- + + describe("clearState", () => { + it("resets to disabled state", () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + svc.updateFromEvent({ enabled: true, connected: true }) + states.length = 0 + svc.clearState() + expect(states).toEqual([{ enabled: false, connected: false }]) + expect(svc.getState()).toEqual({ enabled: false, connected: false }) + svc.dispose() + }) + }) + + // --------------------------------------------------------------------------- + // Status bar + // --------------------------------------------------------------------------- + + describe("status bar", () => { + it("status bar hidden when remote disabled", async () => { + const svc = service() + svc.setClient(client({ status: { enabled: false, connected: false } }) as never) + await svc.refresh() // no state change from initial, bar should stay hidden + // Dispose checks bar was never shown — no direct assertion on mock, just no crash + svc.dispose() + }) + + it("status bar shown with correct text when connected", async () => { + const svc = service() + svc.setClient(client({ status: { enabled: true, connected: true } }) as never) + await svc.refresh() + // Service is functional — status bar is managed internally. We verify no errors. + svc.dispose() + }) + + it("status bar shown with connecting text when enabled but not connected", async () => { + const svc = service() + svc.setClient(client({ status: { enabled: true, connected: false } }) as never) + await svc.refresh() + svc.dispose() + }) + }) + + // --------------------------------------------------------------------------- + // dispose() + // --------------------------------------------------------------------------- + + describe("dispose", () => { + it("dispose clears listeners", () => { + const svc = service() + const states: RemoteState[] = [] + svc.onChange((s) => states.push(s)) + svc.updateFromEvent({ enabled: true, connected: false }) + svc.dispose() + // No further notifications after dispose + svc.updateFromEvent({ enabled: true, connected: true }) + expect(states).toEqual([{ enabled: true, connected: false }]) + }) + }) +}) diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx index 5583b4425d6..dd7f184044c 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx @@ -668,6 +668,14 @@ const AgentManagerContent: Component = () => { } }) + // Report all open (non-pending) session IDs to extension for heartbeat + createEffect(() => { + const local = localSessionIDs().filter((id) => !isPending(id)) + const managed = managedSessions().map((ms) => ms.id) + const all = [...new Set([...local, ...managed])] + vscode.postMessage({ type: "agentManager.openSessions", sessionIDs: all }) + }) + // Drop in-memory review state for worktrees that no longer exist. createEffect(() => { const ids = new Set(worktrees().map((wt) => wt.id)) diff --git a/packages/kilo-vscode/webview-ui/src/components/settings/ExperimentalTab.tsx b/packages/kilo-vscode/webview-ui/src/components/settings/ExperimentalTab.tsx index 4f060d2e0df..85a36c7a6c8 100644 --- a/packages/kilo-vscode/webview-ui/src/components/settings/ExperimentalTab.tsx +++ b/packages/kilo-vscode/webview-ui/src/components/settings/ExperimentalTab.tsx @@ -1,10 +1,12 @@ -import { Component, For, Show, createMemo } from "solid-js" +import { Component, For, Show, createMemo, createSignal, onCleanup, onMount } from "solid-js" import { Switch } from "@kilocode/kilo-ui/switch" import { Select } from "@kilocode/kilo-ui/select" import { TextField } from "@kilocode/kilo-ui/text-field" import { Card } from "@kilocode/kilo-ui/card" import { useConfig } from "../../context/config" import { useLanguage } from "../../context/language" +import { useVSCode } from "../../context/vscode" +import type { ExtensionMessage } from "../../types/messages" import SettingsRow from "./SettingsRow" interface ShareOption { @@ -21,6 +23,20 @@ const SHARE_OPTIONS: ShareOption[] = [ const ExperimentalTab: Component = () => { const { config, updateConfig } = useConfig() const language = useLanguage() + const vscode = useVSCode() + const [active, setActive] = createSignal(false) + + const handler = (msg: ExtensionMessage) => { + if (msg.type === "remoteStatus") { + setActive(msg.enabled) + } + } + + onMount(() => { + const unsub = vscode.onMessage(handler) + vscode.postMessage({ type: "requestRemoteStatus" }) + onCleanup(unsub) + }) const experimental = createMemo(() => config().experimental ?? {}) @@ -33,6 +49,37 @@ const ExperimentalTab: Component = () => { return (
+ {/* Remote control */} +
+
+
{language.t("settings.experimental.remote.title")}
+
{language.t("settings.experimental.remote.description")}
+
+
+
+ {language.t("settings.experimental.remote.current")} + + {active() + ? language.t("settings.experimental.remote.active") + : language.t("settings.experimental.remote.inactive")} + +
+
{language.t("settings.experimental.remote.hint")}
+
+
+ {language.t("settings.experimental.remote.startup")} + { + updateConfig({ remote_control: checked }) + }} + hideLabel + > + {language.t("settings.experimental.remote.startup")} + +
+
+ {/* Share mode */} = [ "instructions", "skills", "snapshot", + "remote_control", "share", "username", "watcher", diff --git a/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts b/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts index b546cadfce2..59881ed9f58 100644 --- a/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts +++ b/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts @@ -98,6 +98,14 @@ export function useSlashCommand(vscode: VSCodeContext, exclude?: Set): S vscode.postMessage({ type: "openSettingsPanel" }) }, }, + { + name: "remote", + description: "Toggle remote control", + hints: [], + action: () => { + vscode.postMessage({ type: "toggleRemote" }) + }, + }, ] const client = exclude ? all.filter((c) => !exclude.has(c.name)) : all diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts index 4aaca97a6c0..3d9681c7282 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts @@ -1056,6 +1056,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "متابعة حلقة الوكيل عند رفض الإذن", "settings.experimental.mcpTimeout.title": "مهلة MCP (مللي ثانية)", "settings.experimental.mcpTimeout.description": "مهلة طلبات خادم MCP بالمللي ثانية", + "settings.experimental.remote.title": "التحكم Remote", + "settings.experimental.remote.description": + "قم بتمكين التحكم Remote في الجلسات عبر Kilo Cloud. سيؤثر هذا أيضًا على واجهات سطر الأوامر (CLIs) على هذا الجهاز.", + "settings.experimental.remote.current": "الحالة الحالية:", + "settings.experimental.remote.startup": "التفعيل التلقائي عند بدء التشغيل:", + "settings.experimental.remote.active": "نشط", + "settings.experimental.remote.inactive": "غير نشط", + "settings.experimental.remote.hint": "استخدم /remote في الدردشة للتبديل", "settings.experimental.toolToggles": "مفاتيح الأدوات", "settings.agentBehaviour.defaultAgent.title": "الوكيل الافتراضي", "settings.agentBehaviour.defaultAgent.description": "الوكيل المستخدم عند عدم التحديد", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts index 399efbf5530..026f56459af 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts @@ -1073,6 +1073,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Continuar o loop do agente quando uma permissão é negada", "settings.experimental.mcpTimeout.title": "Tempo limite MCP (ms)", "settings.experimental.mcpTimeout.description": "Tempo limite para solicitações do servidor MCP em milissegundos", + "settings.experimental.remote.title": "Controle Remote", + "settings.experimental.remote.description": + "Habilite o controle Remote de sessões via Kilo Cloud. Isso também afetará as CLIs nesta máquina.", + "settings.experimental.remote.current": "Estado atual:", + "settings.experimental.remote.startup": "Ativar automaticamente na inicialização:", + "settings.experimental.remote.active": "Ativo", + "settings.experimental.remote.inactive": "Inativo", + "settings.experimental.remote.hint": "Use /remote no chat para alternar", "settings.experimental.toolToggles": "Alternadores de ferramentas", "settings.agentBehaviour.defaultAgent.title": "Agente padrão", "settings.agentBehaviour.defaultAgent.description": "Agente a usar quando nenhum é especificado", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts index be7bfbaa460..5b1259792e7 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts @@ -1072,6 +1072,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Nastavi petlju agenta kada je dozvola odbijena", "settings.experimental.mcpTimeout.title": "MCP istek vremena (ms)", "settings.experimental.mcpTimeout.description": "Istek vremena za MCP server zahtjeve u milisekundama", + "settings.experimental.remote.title": "Remote kontrola", + "settings.experimental.remote.description": + "Omogućite Remote kontrolu sesija putem Kilo Cloud. Ovo će također utjecati na CLI-jeve na ovoj mašini.", + "settings.experimental.remote.current": "Trenutno stanje:", + "settings.experimental.remote.startup": "Automatsko uključivanje pri pokretanju:", + "settings.experimental.remote.active": "Aktivno", + "settings.experimental.remote.inactive": "Neaktivno", + "settings.experimental.remote.hint": "Koristite /remote u chatu za prebacivanje", "settings.experimental.toolToggles": "Prekidači alata", "settings.agentBehaviour.defaultAgent.title": "Zadani agent", "settings.agentBehaviour.defaultAgent.description": "Agent koji se koristi kada nijedan nije naveden", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts index 625836b01f8..d51d3ff6be4 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts @@ -1066,6 +1066,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Fortsæt agentløkken, når en tilladelse afvises", "settings.experimental.mcpTimeout.title": "MCP-timeout (ms)", "settings.experimental.mcpTimeout.description": "Timeout for MCP-serveranmodninger i millisekunder", + "settings.experimental.remote.title": "Remote-styring", + "settings.experimental.remote.description": + "Aktivér Remote-styring af sessioner via Kilo Cloud. Dette vil også påvirke CLI'er på denne maskine.", + "settings.experimental.remote.current": "Nuværende status:", + "settings.experimental.remote.startup": "Aktivér automatisk ved opstart:", + "settings.experimental.remote.active": "Aktiv", + "settings.experimental.remote.inactive": "Inaktiv", + "settings.experimental.remote.hint": "Brug /remote i chatten for at skifte", "settings.experimental.toolToggles": "Værktøjsskift", "settings.agentBehaviour.defaultAgent.title": "Standardagent", "settings.agentBehaviour.defaultAgent.description": "Agent til brug, når ingen er angivet", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts index 3e9b7e263c0..d7baebbd986 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts @@ -1086,6 +1086,14 @@ export const dict = { "Agent-Schleife fortsetzen, wenn eine Berechtigung abgelehnt wird", "settings.experimental.mcpTimeout.title": "MCP-Zeitlimit (ms)", "settings.experimental.mcpTimeout.description": "Zeitlimit für MCP-Server-Anfragen in Millisekunden", + "settings.experimental.remote.title": "Remote-Steuerung", + "settings.experimental.remote.description": + "Aktivieren Sie die Remote-Steuerung von Sitzungen über Kilo Cloud. Dies betrifft auch CLIs auf diesem Computer.", + "settings.experimental.remote.current": "Aktueller Status:", + "settings.experimental.remote.startup": "Automatisch beim Start aktivieren:", + "settings.experimental.remote.active": "Aktiv", + "settings.experimental.remote.inactive": "Inaktiv", + "settings.experimental.remote.hint": "Verwende /remote im Chat zum Umschalten", "settings.experimental.toolToggles": "Werkzeug-Schalter", "settings.agentBehaviour.defaultAgent.title": "Standard-Agent", "settings.agentBehaviour.defaultAgent.description": "Agent, der verwendet wird, wenn keiner angegeben ist", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts index d25ab051951..9aaa1198244 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts @@ -1067,6 +1067,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Continue the agent loop when a permission is denied", "settings.experimental.mcpTimeout.title": "MCP Timeout (ms)", "settings.experimental.mcpTimeout.description": "Timeout for MCP server requests in milliseconds", + "settings.experimental.remote.title": "Remote Control", + "settings.experimental.remote.description": + "Enable remote control of sessions via Kilo Cloud. This will also affect CLIs on this machine.", + "settings.experimental.remote.current": "Current state:", + "settings.experimental.remote.startup": "Auto-enable on startup:", + "settings.experimental.remote.active": "Active", + "settings.experimental.remote.inactive": "Inactive", + "settings.experimental.remote.hint": "Use /remote in chat to toggle", "settings.experimental.toolToggles": "Tool Toggles", "settings.agentBehaviour.defaultAgent.title": "Default Agent", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts index 5b15425315c..01116730185 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts @@ -1077,6 +1077,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Continuar el bucle del agente cuando se deniega un permiso", "settings.experimental.mcpTimeout.title": "Tiempo de espera MCP (ms)", "settings.experimental.mcpTimeout.description": "Tiempo de espera para solicitudes del servidor MCP en milisegundos", + "settings.experimental.remote.title": "Control Remote", + "settings.experimental.remote.description": + "Habilite el control Remote de las sesiones a través de Kilo Cloud. Esto también afectará a las CLI de este equipo.", + "settings.experimental.remote.current": "Estado actual:", + "settings.experimental.remote.startup": "Activar automáticamente al inicio:", + "settings.experimental.remote.active": "Activo", + "settings.experimental.remote.inactive": "Inactivo", + "settings.experimental.remote.hint": "Usa /remote en el chat para alternar", "settings.experimental.toolToggles": "Interruptores de herramientas", "settings.agentBehaviour.defaultAgent.title": "Agente predeterminado", "settings.agentBehaviour.defaultAgent.description": "Agente a usar cuando no se especifica ninguno", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts index ffcb99b0b91..ac8bc5d085d 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts @@ -1088,6 +1088,14 @@ export const dict = { "Continuer la boucle de l'agent lorsqu'une autorisation est refusée", "settings.experimental.mcpTimeout.title": "Délai MCP (ms)", "settings.experimental.mcpTimeout.description": "Délai des requêtes du serveur MCP en millisecondes", + "settings.experimental.remote.title": "Contrôle Remote", + "settings.experimental.remote.description": + "Activez le contrôle Remote des sessions via Kilo Cloud. Cela affectera également les CLI sur cette machine.", + "settings.experimental.remote.current": "État actuel :", + "settings.experimental.remote.startup": "Activation automatique au démarrage :", + "settings.experimental.remote.active": "Actif", + "settings.experimental.remote.inactive": "Inactif", + "settings.experimental.remote.hint": "Utilisez /remote dans le chat pour basculer", "settings.experimental.toolToggles": "Commutateurs d'outils", "settings.agentBehaviour.defaultAgent.title": "Agent par défaut", "settings.agentBehaviour.defaultAgent.description": "Agent à utiliser lorsqu'aucun n'est spécifié", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts index 89c95a7eaa7..db508143b59 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts @@ -1066,6 +1066,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "権限が拒否された場合にエージェントループを続行", "settings.experimental.mcpTimeout.title": "MCPタイムアウト（ミリ秒）", "settings.experimental.mcpTimeout.description": "MCPサーバーリクエストのタイムアウト（ミリ秒）", + "settings.experimental.remote.title": "Remote コントロール", + "settings.experimental.remote.description": + "Kilo Cloud 経由でのセッションの Remote コントロールを有効にします。これはこのマシンの CLI にも影響します。", + "settings.experimental.remote.current": "現在の状態:", + "settings.experimental.remote.startup": "起動時の自動有効化:", + "settings.experimental.remote.active": "アクティブ", + "settings.experimental.remote.inactive": "非アクティブ", + "settings.experimental.remote.hint": "チャットで /remote を使用して切り替えます", "settings.experimental.toolToggles": "ツールトグル", "settings.agentBehaviour.defaultAgent.title": "デフォルトエージェント", "settings.agentBehaviour.defaultAgent.description": "指定されていない場合に使用するエージェント", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts index a6c1afd36dd..4836dba6a34 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts @@ -1063,6 +1063,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "권한이 거부되면 에이전트 루프 계속", "settings.experimental.mcpTimeout.title": "MCP 타임아웃 (ms)", "settings.experimental.mcpTimeout.description": "MCP 서버 요청의 타임아웃 시간 (밀리초)", + "settings.experimental.remote.title": "Remote 제어", + "settings.experimental.remote.description": + "Kilo Cloud를 통한 세션의 Remote 제어를 활성화합니다. 이는 이 컴퓨터의 CLI에도 영향을 미칩니다.", + "settings.experimental.remote.current": "현재 상태:", + "settings.experimental.remote.startup": "시작 시 자동 활성화:", + "settings.experimental.remote.active": "활성", + "settings.experimental.remote.inactive": "비활성", + "settings.experimental.remote.hint": "채팅에서 /remote를 사용하여 전환하세요", "settings.experimental.toolToggles": "도구 토글", "settings.agentBehaviour.defaultAgent.title": "기본 에이전트", "settings.agentBehaviour.defaultAgent.description": "지정되지 않은 경우 사용할 에이전트", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts index 77e2aab3b7a..4325df7eaab 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts @@ -1076,6 +1076,14 @@ export const dict = { "Ga door met de agent loop wanneer een toestemming wordt geweigerd", "settings.experimental.mcpTimeout.title": "MCP Timeout (ms)", "settings.experimental.mcpTimeout.description": "Timeout voor MCP-serververzoeken in milliseconden", + "settings.experimental.remote.title": "Remote-bediening", + "settings.experimental.remote.description": + "Schakel Remote-bediening van sessies in via Kilo Cloud. Dit heeft ook invloed op CLI's op deze machine.", + "settings.experimental.remote.current": "Huidige status:", + "settings.experimental.remote.startup": "Automatisch inschakelen bij opstarten:", + "settings.experimental.remote.active": "Actief", + "settings.experimental.remote.inactive": "Inactief", + "settings.experimental.remote.hint": "Gebruik /remote in de chat om te schakelen", "settings.experimental.toolToggles": "Tool Schakelaars", "settings.agentBehaviour.defaultAgent.title": "Standaard Agent", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts index b06456e47b5..73cf55f8d34 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts @@ -1069,6 +1069,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Fortsett agentløkken når en tillatelse avvises", "settings.experimental.mcpTimeout.title": "MCP-tidsavbrudd (ms)", "settings.experimental.mcpTimeout.description": "Tidsavbrudd for MCP-serverforespørsler i millisekunder", + "settings.experimental.remote.title": "Remote-kontroll", + "settings.experimental.remote.description": + "Aktiver Remote-kontroll av økter via Kilo Cloud. Dette vil også påvirke CLI-er på denne maskinen.", + "settings.experimental.remote.current": "Nåværende status:", + "settings.experimental.remote.startup": "Aktiver automatisk ved oppstart:", + "settings.experimental.remote.active": "Aktiv", + "settings.experimental.remote.inactive": "Inaktiv", + "settings.experimental.remote.hint": "Bruk /remote i chatten for å veksle", "settings.experimental.toolToggles": "Verktøybrytere", "settings.agentBehaviour.defaultAgent.title": "Standardagent", "settings.agentBehaviour.defaultAgent.description": "Agent å bruke når ingen er angitt", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts index 856ea582178..4d9f8460914 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts @@ -1070,6 +1070,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Kontynuuj pętlę agenta po odmowie uprawnienia", "settings.experimental.mcpTimeout.title": "Limit czasu MCP (ms)", "settings.experimental.mcpTimeout.description": "Limit czasu żądań serwera MCP w milisekundach", + "settings.experimental.remote.title": "Sterowanie Remote", + "settings.experimental.remote.description": + "Włącz sterowanie Remote sesjami za pośrednictwem Kilo Cloud. Wpłynie to również na CLI na tej maszynie.", + "settings.experimental.remote.current": "Aktualny stan:", + "settings.experimental.remote.startup": "Automatyczne włączanie przy starcie:", + "settings.experimental.remote.active": "Aktywny", + "settings.experimental.remote.inactive": "Nieaktywny", + "settings.experimental.remote.hint": "Użyj /remote na czacie, aby przełączyć", "settings.experimental.toolToggles": "Przełączniki narzędzi", "settings.agentBehaviour.defaultAgent.title": "Domyślny agent", "settings.agentBehaviour.defaultAgent.description": "Agent używany, gdy żaden nie jest określony", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts index 1eff6b800d1..2501ea01fbe 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts @@ -1072,6 +1072,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Продолжить цикл агента при отказе в разрешении", "settings.experimental.mcpTimeout.title": "Таймаут MCP (мс)", "settings.experimental.mcpTimeout.description": "Таймаут запросов MCP-сервера в миллисекундах", + "settings.experimental.remote.title": "Управление Remote", + "settings.experimental.remote.description": + "Включите управление Remote сеансами через Kilo Cloud. Это также повлияет на CLI на этом компьютере.", + "settings.experimental.remote.current": "Текущее состояние:", + "settings.experimental.remote.startup": "Автоматически включать при запуске:", + "settings.experimental.remote.active": "Активно", + "settings.experimental.remote.inactive": "Неактивно", + "settings.experimental.remote.hint": "Используйте /remote в чате для переключения", "settings.experimental.toolToggles": "Переключатели инструментов", "settings.agentBehaviour.defaultAgent.title": "Агент по умолчанию", "settings.agentBehaviour.defaultAgent.description": "Агент при отсутствии указания", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts index cf6f01dde73..e2859e1ff94 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts @@ -1058,6 +1058,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "ดำเนินลูปเอเจนต์ต่อเมื่อสิทธิ์ถูกปฏิเสธ", "settings.experimental.mcpTimeout.title": "หมดเวลา MCP (มิลลิวินาที)", "settings.experimental.mcpTimeout.description": "หมดเวลาสำหรับคำขอเซิร์ฟเวอร์ MCP เป็นมิลลิวินาที", + "settings.experimental.remote.title": "การควบคุม Remote", + "settings.experimental.remote.description": + "เปิดใช้งานการควบคุม Remote ของเซสชันผ่าน Kilo Cloud ซึ่งจะส่งผลต่อ CLI บนเครื่องนี้ด้วย", + "settings.experimental.remote.current": "สถานะปัจจุบัน:", + "settings.experimental.remote.startup": "เปิดใช้งานอัตโนมัติเมื่อเริ่มต้น:", + "settings.experimental.remote.active": "เปิดใช้งาน", + "settings.experimental.remote.inactive": "ปิดใช้งาน", + "settings.experimental.remote.hint": "ใช้ /remote ในแชทเพื่อสลับสถานะ", "settings.experimental.toolToggles": "สวิตช์เครื่องมือ", "settings.agentBehaviour.defaultAgent.title": "เอเจนต์เริ่มต้น", "settings.agentBehaviour.defaultAgent.description": "เอเจนต์ที่ใช้เมื่อไม่ได้ระบุ", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts index 9f472eb53b0..4ab1a9c78ef 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts @@ -1072,6 +1072,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Bir izin reddedildiğinde ajan döngüsüne devam et", "settings.experimental.mcpTimeout.title": "MCP Zaman Aşımı (ms)", "settings.experimental.mcpTimeout.description": "MCP sunucu istekleri için milisaniye cinsinden zaman aşımı", + "settings.experimental.remote.title": "Remote Kontrolü", + "settings.experimental.remote.description": + "Kilo Cloud üzerinden oturumların Remote kontrolünü etkinleştirin. Bu, bu makinedeki CLI'leri de etkileyecektir.", + "settings.experimental.remote.current": "Mevcut durum:", + "settings.experimental.remote.startup": "Başlangıçta otomatik etkinleştir:", + "settings.experimental.remote.active": "Aktif", + "settings.experimental.remote.inactive": "Pasif", + "settings.experimental.remote.hint": "Geçiş yapmak için sohbette /remote kullanın", "settings.experimental.toolToggles": "Araç Açma/Kapatma", "settings.agentBehaviour.defaultAgent.title": "Varsayılan Ajan", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts index c922d79a42b..79c0240a193 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts @@ -1075,6 +1075,14 @@ export const dict = { "settings.experimental.continueOnDeny.description": "Продовжувати цикл агента, коли дозвіл відхилено", "settings.experimental.mcpTimeout.title": "Тайм-аут MCP (мс)", "settings.experimental.mcpTimeout.description": "Тайм-аут у мілісекундах для запитів до MCP-сервера", + "settings.experimental.remote.title": "Керування Remote", + "settings.experimental.remote.description": + "Увімкніть керування Remote сеансами через Kilo Cloud. Це також вплине на CLI на цьому комп'ютері.", + "settings.experimental.remote.current": "Поточний стан:", + "settings.experimental.remote.startup": "Автоматичне ввімкнення під час запуску:", + "settings.experimental.remote.active": "Активний", + "settings.experimental.remote.inactive": "Неактивний", + "settings.experimental.remote.hint": "Використовуйте /remote у чаті для перемикання", "settings.experimental.toolToggles": "Перемикачі інструментів", "settings.agentBehaviour.defaultAgent.title": "Агент за замовчуванням", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts index a8ec3a8960d..6be3fbd32b7 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts @@ -1048,6 +1048,13 @@ export const dict = { "settings.experimental.continueOnDeny.description": "权限被拒绝时继续智能体循环", "settings.experimental.mcpTimeout.title": "MCP 超时（毫秒）", "settings.experimental.mcpTimeout.description": "MCP 服务器请求的超时时间（毫秒）", + "settings.experimental.remote.title": "Remote 控制", + "settings.experimental.remote.description": "通过 Kilo Cloud 启用会话的 Remote 控制。这也会影响此计算机上的 CLI。", + "settings.experimental.remote.current": "当前状态：", + "settings.experimental.remote.startup": "启动时自动启用：", + "settings.experimental.remote.active": "已启用", + "settings.experimental.remote.inactive": "未启用", + "settings.experimental.remote.hint": "在聊天中使用 /remote 进行切换", "settings.experimental.toolToggles": "工具开关", "settings.agentBehaviour.defaultAgent.title": "默认智能体", "settings.agentBehaviour.defaultAgent.description": "未指定时使用的智能体", diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts index a9cefcac819..279cc6f2964 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts @@ -1050,6 +1050,13 @@ export const dict = { "settings.experimental.continueOnDeny.description": "權限被拒絕時繼續 Agent 迴圈", "settings.experimental.mcpTimeout.title": "MCP 逾時（毫秒）", "settings.experimental.mcpTimeout.description": "MCP 伺服器請求的逾時時間（毫秒）", + "settings.experimental.remote.title": "Remote 控制", + "settings.experimental.remote.description": "透過 Kilo Cloud 啟用工作階段的 Remote 控制。這也會影響此電腦上的 CLI。", + "settings.experimental.remote.current": "目前狀態：", + "settings.experimental.remote.startup": "啟動時自動啟用：", + "settings.experimental.remote.active": "已啟用", + "settings.experimental.remote.inactive": "已停用", + "settings.experimental.remote.hint": "在聊天中使用 /remote 來切換", "settings.experimental.toolToggles": "工具開關", "settings.agentBehaviour.defaultAgent.title": "預設 Agent", "settings.agentBehaviour.defaultAgent.description": "未指定時使用的 Agent", diff --git a/packages/kilo-vscode/webview-ui/src/styles/chat.css b/packages/kilo-vscode/webview-ui/src/styles/chat.css index 7784e08a943..d23c0ff40dd 100644 --- a/packages/kilo-vscode/webview-ui/src/styles/chat.css +++ b/packages/kilo-vscode/webview-ui/src/styles/chat.css @@ -1072,6 +1072,66 @@ } } +/* Remote Settings */ +[data-component="remote-settings"] { + display: flex; + flex-direction: column; + gap: 8px; + margin-bottom: 8px; + padding-bottom: 8px; + border-bottom: 1px solid var(--border-weak-base); +} + +[data-slot="remote-settings-header"] { + margin-bottom: 4px; + + [data-slot="settings-row-label-title"] { + font-weight: 500; + margin-bottom: 4px; + } + + [data-slot="settings-row-label-subtitle"] { + font-size: 12px; + color: var(--text-weak-base, var(--vscode-descriptionForeground)); + } +} + +[data-slot="remote-settings-row"] { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; +} + +[data-slot="remote-settings-label"] { + font-size: 12px; + color: var(--text-weak); + white-space: nowrap; +} + +[data-slot="remote-settings-block"] { + display: flex; + flex-direction: column; + gap: 2px; +} + +[data-slot="remote-settings-status"] { + font-size: 12px; + font-weight: 500; + color: var(--text-weak); +} + +[data-slot="remote-settings-status"][data-active="true"] { + color: var(--vscode-testing-iconPassed, #5cb85c); +} + +[data-slot="remote-settings-hint"] { + font-size: 11px; + color: var(--text-weak); + opacity: 0.7; + font-style: italic; +} + .prompt-input-hint-actions { display: flex; gap: 4px; diff --git a/packages/kilo-vscode/webview-ui/src/types/messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages.ts index 2f401cb91d0..15edc6ca620 100644 --- a/packages/kilo-vscode/webview-ui/src/types/messages.ts +++ b/packages/kilo-vscode/webview-ui/src/types/messages.ts @@ -421,6 +421,7 @@ export interface Config { instructions?: string[] skills?: SkillsConfig snapshot?: boolean + remote_control?: boolean share?: "manual" | "auto" | "disabled" username?: string watcher?: WatcherConfig @@ -1493,6 +1494,7 @@ export type ExtensionMessage = | McpStatusLoadedMessage | ClearPendingPromptsMessage | ExtensionDataReadyMessage + | RemoteStatusMessage // ============================================ // Messages FROM webview TO extension @@ -2136,6 +2138,31 @@ export interface SetDefaultBaseBranchRequest { branch?: string } +// Report all open session IDs to extension for heartbeat (webview → extension) +export interface AgentManagerOpenSessionsMessage { + type: "agentManager.openSessions" + sessionIDs: string[] +} + +export interface RemoteStatusMessage { + type: "remoteStatus" + enabled: boolean + connected: boolean +} + +export interface ToggleRemoteMessage { + type: "toggleRemote" +} + +export interface SetRemoteEnabledMessage { + type: "setRemoteEnabled" + enabled: boolean +} + +export interface RequestRemoteStatusMessage { + type: "requestRemoteStatus" +} + export interface ConnectProviderMessage { type: "connectProvider" requestId: string @@ -2380,6 +2407,7 @@ export type WebviewMessage = | OpenSubAgentViewerRequest | PreviewImageRequest | SetDefaultBaseBranchRequest + | AgentManagerOpenSessionsMessage | FetchMarketplaceDataMessage | FilterMarketplaceItemsMessage | InstallMarketplaceItemMessage @@ -2394,6 +2422,9 @@ export type WebviewMessage = | RequestRecentsMessage | ToggleFavoriteRequest | RequestFavoritesMessage + | ToggleRemoteMessage + | SetRemoteEnabledMessage + | RequestRemoteStatusMessage | ContinueInWorktreeRequest | CreateSectionRequest | RenameSectionRequest diff --git a/packages/opencode/src/cli/cmd/tui/app.tsx b/packages/opencode/src/cli/cmd/tui/app.tsx index 61b64d1a789..cedb4d68d8d 100644 --- a/packages/opencode/src/cli/cmd/tui/app.tsx +++ b/packages/opencode/src/cli/cmd/tui/app.tsx @@ -275,7 +275,7 @@ function App() { // kilocode_change start — notify server which session the user is viewing (for live session indicators) createEffect(() => { const sessionID = route.data.type === "session" ? route.data.sessionID : undefined - sdk.client.session.viewed({ sessionID }).catch(() => {}) + sdk.client.session.viewed({ focused: sessionID ? [sessionID] : [] }).catch(() => {}) }) // kilocode_change end diff --git a/packages/opencode/src/kilo-sessions/kilo-sessions.ts b/packages/opencode/src/kilo-sessions/kilo-sessions.ts index d45abad6926..2e408e46b21 100644 --- a/packages/opencode/src/kilo-sessions/kilo-sessions.ts +++ b/packages/opencode/src/kilo-sessions/kilo-sessions.ts @@ -1,4 +1,5 @@ import { Bus } from "@/bus" +import { BusEvent } from "@/bus/bus-event" import { Provider } from "@/provider/provider" import { Session } from "@/session" import { MessageV2 } from "@/session/message-v2" @@ -20,6 +21,16 @@ import { SessionStatus } from "@/session/status" import { Telemetry } from "@kilocode/kilo-telemetry" export namespace KiloSessions { + export const Event = { + RemoteStatusChanged: BusEvent.define( + "kilo-sessions.remote-status-changed", + z.object({ + enabled: z.boolean(), + connected: z.boolean(), + }), + ), + } + const log = Log.create({ service: "kilo-sessions" }) const Uuid = z.uuid() @@ -136,7 +147,8 @@ export namespace KiloSessions { let remote: { conn: RemoteWS.Connection; sender: RemoteSender.Sender; heartbeat: () => Promise } | undefined let enabling: Promise | undefined let remoteSeq = 0 - let viewedSessionId: string | undefined + const focused = new Set() + const opened = new Set() export async function init() { if (ingestDisabled) return @@ -210,7 +222,11 @@ export namespace KiloSessions { const cfg = await Config.getGlobal() if (remoteEnabled || cfg.remote_control) enableRemote().catch((err) => log.warn("remote not enabled", { error: String(err) })) - Bus.subscribe(Bus.InstanceDisposed, () => disableRemote()) + // Use wildcard subscription so the dispose handler actually fires — + // Bus.state dispose only notifies "*" subscribers, not event-type ones. + Bus.subscribeAll((evt) => { + if (evt.type === Bus.InstanceDisposed.type) disableRemote() + }) } export async function enableRemote() { @@ -244,7 +260,8 @@ export namespace KiloSessions { ]) const statuses = SessionStatus.list() const ids = new Set(Object.keys(statuses)) - if (viewedSessionId) ids.add(viewedSessionId) + for (const id of focused) ids.add(id) + for (const id of opened) ids.add(id) const results = await Promise.all( [...ids].map(async (id) => { const session = await Session.get(id).catch(() => undefined) @@ -259,7 +276,12 @@ export namespace KiloSessions { } }), ) - return results.filter((r): r is NonNullable => !!r) + const sessions = results.filter((r): r is NonNullable => !!r) + return { + sessions, + focused: focused.size > 0 ? [...focused] : undefined, + open: opened.size > 0 ? [...opened] : undefined, + } } const conn = RemoteWS.connect({ @@ -268,6 +290,12 @@ export namespace KiloSessions { withContext: (fn) => Instance.provide({ directory, fn }), getSessions, log, + onOpen: () => { + void Bus.publish(Event.RemoteStatusChanged, { enabled: true, connected: true }) + }, + onDisconnect: () => { + void Bus.publish(Event.RemoteStatusChanged, { enabled: !!remote, connected: false }) + }, onMessage: (msg) => { // Must run inside Instance.provide so Bus.subscribeAll can access // the instance-scoped subscription map via Instance.state(). @@ -283,7 +311,7 @@ export namespace KiloSessions { }) const heartbeat = async () => { - conn.send({ type: "heartbeat", sessions: await getSessions() }) + conn.send({ type: "heartbeat", ...(await getSessions()) }) } if (seq !== remoteSeq) { @@ -293,8 +321,9 @@ export namespace KiloSessions { } remote = { conn, sender, heartbeat } - log.info("remote connection enabled") + log.info("remote connection enabled", { connected: conn.connected }) Telemetry.trackRemoteConnectionOpened() + void Bus.publish(Event.RemoteStatusChanged, { enabled: true, connected: conn.connected }) })().finally(() => { if (remoteSeq === seq) enabling = undefined }) @@ -310,6 +339,7 @@ export namespace KiloSessions { remote.conn.close() remote = undefined log.info("remote connection disabled") + void Bus.publish(Event.RemoteStatusChanged, { enabled: false, connected: false }) } export function remoteStatus() { @@ -318,8 +348,15 @@ export namespace KiloSessions { connected: remote?.conn.connected ?? false, } } - export function setViewedSession(sessionID: string | undefined) { - viewedSessionId = sessionID + export function setViewedSessions(input: { focused: string[]; open?: string[] }) { + focused.clear() + opened.clear() + for (const id of input.focused) { + focused.add(id) + } + for (const id of input.open ?? []) { + opened.add(id) + } if (remote) void remote.heartbeat().catch((err) => log.warn("heartbeat failed", { error: String(err) })) } diff --git a/packages/opencode/src/kilo-sessions/remote-protocol.ts b/packages/opencode/src/kilo-sessions/remote-protocol.ts index 6500319fa81..2972fb0565e 100644 --- a/packages/opencode/src/kilo-sessions/remote-protocol.ts +++ b/packages/opencode/src/kilo-sessions/remote-protocol.ts @@ -18,6 +18,8 @@ export namespace RemoteProtocol { export const Heartbeat = z.object({ type: z.literal("heartbeat"), sessions: z.array(SessionInfo), + focused: z.array(z.string()).optional(), + open: z.array(z.string()).optional(), }) export type Heartbeat = z.infer diff --git a/packages/opencode/src/kilo-sessions/remote-sender.ts b/packages/opencode/src/kilo-sessions/remote-sender.ts index 02f74d064a0..61ba3b1d7da 100644 --- a/packages/opencode/src/kilo-sessions/remote-sender.ts +++ b/packages/opencode/src/kilo-sessions/remote-sender.ts @@ -1,6 +1,6 @@ import { RemoteProtocol } from "@/kilo-sessions/remote-protocol" import type { RemoteWS } from "@/kilo-sessions/remote-ws" -import { Bus } from "@/bus" +import { GlobalBus } from "@/bus/global" import { Instance } from "@/project/instance" import { Session } from "@/session" import { SessionPrompt } from "@/session/prompt" @@ -48,7 +48,7 @@ export namespace RemoteSender { error: (...args: any[]) => void warn: (...args: any[]) => void } - subscribe?: typeof Bus.subscribeAll + subscribe?: (callback: (event: any) => void) => () => void provide?: typeof Instance.provide } @@ -62,7 +62,20 @@ export namespace RemoteSender { const children = new Map() // childId → parentId let unsub: (() => void) | undefined - const sub = options.subscribe ?? Bus.subscribeAll + const sub = + options.subscribe ?? + ((callback: (event: any) => void) => { + const handler = (event: { directory?: string; payload: any }) => callback(event.payload) + GlobalBus.on("event", handler) + return () => { + GlobalBus.off("event", handler) + } + }) + + async function directoryFor(sid: string): Promise { + const info = await Session.get(sid).catch(() => undefined) + return info?.directory ?? options.directory + } function subscribed(sid: string) { if (sessions.has(sid)) return true @@ -79,8 +92,9 @@ export namespace RemoteSender { async function backfillChildren(parentId: string) { const provide = options.provide ?? Instance.provide try { + const dir = await directoryFor(parentId) await provide({ - directory: options.directory, + directory: dir, fn: async () => { await discoverChildren(parentId) }, @@ -118,8 +132,9 @@ export namespace RemoteSender { async function backfillPendingState(sessionId: string) { const provide = options.provide ?? Instance.provide try { + const dir = await directoryFor(sessionId) await provide({ - directory: options.directory, + directory: dir, fn: () => replay(sessionId), }) } catch (e) { @@ -179,12 +194,12 @@ export namespace RemoteSender { }) } - function dispatchLongRunning(msg: RemoteProtocol.Command, work: () => Promise) { + function dispatchLongRunning(msg: RemoteProtocol.Command, dir: Promise, work: () => Promise) { const provide = options.provide ?? Instance.provide options.conn.send({ type: "response", id: msg.id, result: {} }) void (async () => { try { - await provide({ directory: options.directory, fn: work }) + await provide({ directory: await dir, fn: work }) } catch (e) { options.log.error("long-running command failed after ACK", { id: msg.id, @@ -195,11 +210,11 @@ export namespace RemoteSender { })() } - function dispatchQuick(msg: RemoteProtocol.Command, work: () => Promise) { + function dispatchQuick(msg: RemoteProtocol.Command, dir: Promise, work: () => Promise) { const provide = options.provide ?? Instance.provide void (async () => { try { - await provide({ directory: options.directory, fn: work }) + await provide({ directory: await dir, fn: work }) options.conn.send({ type: "response", id: msg.id, result: {} }) } catch (e) { options.conn.send({ type: "response", id: msg.id, error: String(e) }) @@ -227,7 +242,7 @@ export namespace RemoteSender { }) return } - dispatchLongRunning(msg, async () => { + dispatchLongRunning(msg, directoryFor(input.data.sessionID), async () => { await SessionPrompt.prompt(input.data) }) return @@ -242,7 +257,8 @@ export namespace RemoteSender { }) return } - dispatchQuick(msg, () => Question.reply(parsed.data)) + const dir = msg.sessionId ? directoryFor(msg.sessionId) : Promise.resolve(options.directory) + dispatchQuick(msg, dir, () => Question.reply(parsed.data)) return } if (msg.command === "question_reject") { @@ -255,7 +271,8 @@ export namespace RemoteSender { }) return } - dispatchQuick(msg, () => Question.reject(parsed.data.requestID)) + const dir = msg.sessionId ? directoryFor(msg.sessionId) : Promise.resolve(options.directory) + dispatchQuick(msg, dir, () => Question.reject(parsed.data.requestID)) return } if (msg.command === "permission_respond") { @@ -268,7 +285,8 @@ export namespace RemoteSender { }) return } - dispatchQuick(msg, () => PermissionNext.reply(parsed.data)) + const dir = msg.sessionId ? directoryFor(msg.sessionId) : Promise.resolve(options.directory) + dispatchQuick(msg, dir, () => PermissionNext.reply(parsed.data)) return } options.conn.send({ diff --git a/packages/opencode/src/kilo-sessions/remote-ws.ts b/packages/opencode/src/kilo-sessions/remote-ws.ts index 0232ec27785..6587e292e46 100644 --- a/packages/opencode/src/kilo-sessions/remote-ws.ts +++ b/packages/opencode/src/kilo-sessions/remote-ws.ts @@ -6,13 +6,15 @@ export namespace RemoteWS { export type Options = { url: string getToken: () => Promise - getSessions: () => SessionInfo[] | Promise + getSessions: () => Promise<{ sessions: SessionInfo[]; focused?: string[]; open?: string[] }> log: { info: (...args: any[]) => void error: (...args: any[]) => void warn: (...args: any[]) => void } onMessage?: (msg: RemoteProtocol.Inbound) => void + onOpen?: () => void + onDisconnect?: () => void heartbeat?: number /** Wraps callbacks that need to run in a specific async context (e.g. Instance.provide) */ withContext?: (fn: () => R) => Promise | R @@ -46,7 +48,7 @@ export namespace RemoteWS { stopHeartbeat() beat = setInterval(() => { void withContext(async () => { - send({ type: "heartbeat", sessions: await options.getSessions() }) + send({ type: "heartbeat", ...(await options.getSessions()) }) }).catch((err) => { options.log.error("remote-ws heartbeat failed", { error: String(err) }) }) @@ -95,6 +97,7 @@ export namespace RemoteWS { ws.onopen = () => { options.log.info("remote-ws connected", { buffered: buffer.length }) + void withContext(() => options.onOpen?.()) backoff = 1000 for (const msg of buffer) ws!.send(msg) buffer.length = 0 @@ -128,14 +131,16 @@ export namespace RemoteWS { ws = undefined stopHeartbeat() stopWatchdog() + if (closed) return if (event.code === 4401 || event.code === 4403 || event.code === 4409) { options.log.warn("remote-ws closed permanently", { code: event.code, reason: event.reason, }) - options.onClose?.(event.code, event.reason) + void withContext(() => options.onClose?.(event.code, event.reason)) return } + void withContext(() => options.onDisconnect?.()) schedule() } diff --git a/packages/opencode/src/server/routes/session.ts b/packages/opencode/src/server/routes/session.ts index 7a6d9bd6a1f..f7d3b32bc42 100644 --- a/packages/opencode/src/server/routes/session.ts +++ b/packages/opencode/src/server/routes/session.ts @@ -972,20 +972,27 @@ export const SessionRoutes = lazy(() => .post( "/viewed", describeRoute({ - summary: "Set viewed session", - description: "Notify the server which session the user is currently viewing, or clear it.", + summary: "Set viewed sessions", + description: "Notify the server which sessions the user is currently viewing, or clear all.", operationId: "session.viewed", responses: { 200: { - description: "Viewed session updated", + description: "Viewed sessions updated", content: { "application/json": { schema: resolver(z.boolean()) } }, }, }, }), - validator("json", z.object({ sessionID: z.string().optional() })), + validator( + "json", + z.object({ + focused: z.array(z.string()).optional(), + open: z.array(z.string()).optional(), + }), + ), async (c) => { const { KiloSessions } = await import("../../kilo-sessions/kilo-sessions") - await KiloSessions.setViewedSession(c.req.valid("json").sessionID) + const body = c.req.valid("json") + KiloSessions.setViewedSessions({ focused: body.focused ?? [], open: body.open ?? [] }) return c.json(true) }, ), diff --git a/packages/opencode/test/kilo-sessions/remote-ws.test.ts b/packages/opencode/test/kilo-sessions/remote-ws.test.ts index 7fe6152b23a..df74ed1d2f4 100644 --- a/packages/opencode/test/kilo-sessions/remote-ws.test.ts +++ b/packages/opencode/test/kilo-sessions/remote-ws.test.ts @@ -94,7 +94,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [{ id: "s1", status: "active", title: "Test" }], + getSessions: async () => ({ sessions: [{ id: "s1", status: "active", title: "Test" }] }), log: nolog(), heartbeat: 100, }) @@ -116,7 +116,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [], + getSessions: async () => ({ sessions: [] }), log: nolog(), heartbeat: 60_000, }) @@ -149,7 +149,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [], + getSessions: async () => ({ sessions: [] }), log: nolog(), heartbeat: 60_000, }) @@ -175,7 +175,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [], + getSessions: async () => ({ sessions: [] }), log: nolog(), heartbeat: 60_000, }) @@ -198,7 +198,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [], + getSessions: async () => ({ sessions: [] }), log: nolog(), heartbeat: 60_000, onClose: (code) => codes.push(code), @@ -223,7 +223,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [], + getSessions: async () => ({ sessions: [] }), log: cap.log, heartbeat: 60_000, onMessage: (msg) => received.push(msg), @@ -263,7 +263,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [{ id: "s1", status: "active", title: "Test" }], + getSessions: async () => ({ sessions: [{ id: "s1", status: "active", title: "Test" }] }), log: nolog(), heartbeat: 100, }) @@ -292,7 +292,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [], + getSessions: async () => ({ sessions: [] }), log: nolog(), heartbeat: 60_000, timeout: 200, @@ -319,7 +319,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [], + getSessions: async () => ({ sessions: [] }), log: nolog(), heartbeat: 60_000, timeout: 300, @@ -347,7 +347,7 @@ describe("RemoteWS", () => { conn = RemoteWS.connect({ url: server.url, getToken: async () => "tok", - getSessions: () => [], + getSessions: async () => ({ sessions: [] }), log: nolog(), heartbeat: 60_000, timeout: 100, diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts index 10656347925..04dd5ff148e 100644 --- a/packages/sdk/js/src/v2/gen/sdk.gen.ts +++ b/packages/sdk/js/src/v2/gen/sdk.gen.ts @@ -2382,15 +2382,16 @@ export class Session2 extends HeyApiClient { } /** - * Set viewed session + * Set viewed sessions * - * Notify the server which session the user is currently viewing, or clear it. + * Notify the server which sessions the user is currently viewing, or clear all. */ public viewed( parameters?: { directory?: string workspace?: string - sessionID?: string + focused?: Array + open?: Array }, options?: Options, ) { @@ -2401,7 +2402,8 @@ export class Session2 extends HeyApiClient { args: [ { in: "query", key: "directory" }, { in: "query", key: "workspace" }, - { in: "body", key: "sessionID" }, + { in: "body", key: "focused" }, + { in: "body", key: "open" }, ], }, ], diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts index e6cd4e256bc..0e09b84a086 100644 --- a/packages/sdk/js/src/v2/gen/types.gen.ts +++ b/packages/sdk/js/src/v2/gen/types.gen.ts @@ -994,6 +994,14 @@ export type EventWorktreeFailed = { } } +export type EventKiloSessionsRemoteStatusChanged = { + type: "kilo-sessions.remote-status-changed" + properties: { + enabled: boolean + connected: boolean + } +} + export type Event = | EventInstallationUpdated | EventInstallationUpdateAvailable @@ -1043,6 +1051,7 @@ export type Event = | EventPtyDeleted | EventWorktreeReady | EventWorktreeFailed + | EventKiloSessionsRemoteStatusChanged export type GlobalEvent = { directory: string @@ -3992,7 +4001,8 @@ export type PermissionRespondResponse = PermissionRespondResponses[keyof Permiss export type SessionViewedData = { body?: { - sessionID?: string + focused?: Array + open?: Array } path?: never query?: { @@ -4004,7 +4014,7 @@ export type SessionViewedData = { export type SessionViewedResponses = { /** - * Viewed session updated + * Viewed sessions updated */ 200: boolean } diff --git a/packages/sdk/openapi.json b/packages/sdk/openapi.json index dd5a9164a34..b2d6c8679eb 100644 --- a/packages/sdk/openapi.json +++ b/packages/sdk/openapi.json @@ -4358,11 +4358,11 @@ } } ], - "summary": "Set viewed session", - "description": "Notify the server which session the user is currently viewing, or clear it.", + "summary": "Set viewed sessions", + "description": "Notify the server which sessions the user is currently viewing, or clear all.", "responses": { "200": { - "description": "Viewed session updated", + "description": "Viewed sessions updated", "content": { "application/json": { "schema": { @@ -4378,8 +4378,17 @@ "schema": { "type": "object", "properties": { - "sessionID": { - "type": "string" + "focused": { + "type": "array", + "items": { + "type": "string" + } + }, + "open": { + "type": "array", + "items": { + "type": "string" + } } } } @@ -12373,6 +12382,34 @@ }, "required": ["type", "properties"] }, + "Event.kilo-sessions.remote-status-changed": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "kilo-sessions.remote-status-changed" + }, + "properties": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "connected": { + "type": "boolean" + } + }, + "required": [ + "enabled", + "connected" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, "Event": { "anyOf": [ { @@ -12518,6 +12555,9 @@ }, { "$ref": "#/components/schemas/Event.worktree.failed" + }, + { + "$ref": "#/components/schemas/Event.kilo-sessions.remote-status-changed" } ] }, From 403bcc0ec46b851d38645f22335ad0ea584a9ae2 Mon Sep 17 00:00:00 2001 From: Evgeny Shurakov Date: Thu, 9 Apr 2026 14:08:16 +0200 Subject: [PATCH 44/58] refactor(vscode): extract remote status and focus helpers in KiloProvider Consolidate remote message handling into RemoteStatusService.handleMessage(), extract sendRemoteStatus/focusSession helpers to reduce duplication, and move trackOpenSessions effect into its own module. Add runtime guard for undefined enabled parameter in setRemoteEnabled handler. --- packages/kilo-vscode/src/KiloProvider.ts | 74 ++++++------------- .../src/services/RemoteStatusService.ts | 20 +++++ .../agent-manager/AgentManagerApp.tsx | 10 +-- .../webview-ui/agent-manager/open-sessions.ts | 15 ++++ 4 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 packages/kilo-vscode/webview-ui/agent-manager/open-sessions.ts diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts index cbf83893c0b..96495461260 100644 --- a/packages/kilo-vscode/src/KiloProvider.ts +++ b/packages/kilo-vscode/src/KiloProvider.ts @@ -217,9 +217,15 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper setRemoteService(service: RemoteStatusService): void { this.remoteService = service - this.unsubscribeRemote = service.onChange((state) => { - this.postMessage({ type: "remoteStatus", enabled: state.enabled, connected: state.connected }) - }) + this.unsubscribeRemote = service.onChange(() => this.sendRemoteStatus()) + } + private sendRemoteStatus(): void { + const s = this.remoteService?.getState() + if (s) this.postMessage({ type: "remoteStatus", enabled: s.enabled, connected: s.connected }) + } + private focusSession(id?: string): void { + if (id) this.connectionService.registerFocused(this.instanceId, id) + else this.connectionService.unregisterFocused(this.instanceId) } public setProjectDirectory(directory: string | null): void { @@ -336,11 +342,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper const reconcile = this.sessionStatusMap.size === 0 void this.seedSessionStatusMap(reconcile) - // Send current remote status so settings panel shows correct state - if (this.remoteService) { - const state = this.remoteService.getState() - this.postMessage({ type: "remoteStatus", enabled: state.enabled, connected: state.connected }) - } + this.sendRemoteStatus() } // legacy-migration start @@ -382,11 +384,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper webviewView.onDidChangeVisibility(() => { vscode.commands.executeCommand("setContext", "kilo-code.new.sidebarVisible", webviewView.visible) this.statsPoller?.setEnabled(webviewView.visible) - if (webviewView.visible) { - if (this.currentSession) this.connectionService.registerFocused(this.instanceId, this.currentSession.id) - } else { - this.connectionService.unregisterFocused(this.instanceId) - } + this.focusSession(webviewView.visible ? this.currentSession?.id : undefined) }) // Initialize connection to CLI backend @@ -412,13 +410,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.setupWebviewMessageHandler(panel.webview) // Unregister focus when the editor tab becomes inactive, re-register when active - panel.onDidChangeViewState(() => { - if (panel.active) { - if (this.currentSession) this.connectionService.registerFocused(this.instanceId, this.currentSession.id) - } else { - this.connectionService.unregisterFocused(this.instanceId) - } - }) + panel.onDidChangeViewState(() => this.focusSession(panel.active ? this.currentSession?.id : undefined)) this.initializeConnection() } @@ -613,7 +605,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper case "clearSession": this.contextSessionID = this.currentSession?.id ?? this.contextSessionID this.currentSession = null - this.connectionService.unregisterFocused(this.instanceId) + this.focusSession() break case "loadMessages": // Don't await: allow parallel loads so rapid session switching @@ -850,29 +842,15 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper await this.handleRenameSession(message.sessionID, message.title) break case "toggleRemote": - this.remoteService?.toggle().catch((err) => { - console.error("[Kilo New] toggleRemote failed:", err) - this.postMessage({ type: "error", message: "Failed to toggle remote control" }) - }) - break case "setRemoteEnabled": - this.remoteService?.setEnabled(message.enabled).catch((err) => { - console.error("[Kilo New] setRemoteEnabled failed:", err) - this.postMessage({ - type: "error", - message: `Failed to ${message.enabled ? "enable" : "disable"} remote control`, + case "requestRemoteStatus": + this.remoteService + ?.handleMessage(message.type, message.enabled) + .then((s) => { + if (s) this.sendRemoteStatus() }) - }) + .catch((err) => console.error("[Kilo New] remote message failed:", err)) break - case "requestRemoteStatus": { - // Send cached state immediately, then refresh - if (this.remoteService) { - const state = this.remoteService.getState() - this.postMessage({ type: "remoteStatus", enabled: state.enabled, connected: state.connected }) - } - this.remoteService?.refresh().catch((err) => console.error("[Kilo New] remoteStatus refresh failed:", err)) - break - } case "updateSetting": await this.handleUpdateSetting(message.key, message.value) break @@ -1105,10 +1083,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.unsubscribeEvent = this.connectionService.onEventFiltered( (event) => { // Remote status events are global and should always pass through - if (event.type === "kilo-sessions.remote-status-changed") { - return true - } - + if (event.type === "kilo-sessions.remote-status-changed") return true const sessionId = this.connectionService.resolveEventSessionId(event) // message.part.updated and message.part.delta are always session-scoped; drop if session unknown. @@ -1305,7 +1280,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper private async handleLoadMessages(sessionID: string): Promise { // Track the session so we receive its SSE events this.trackedSessionIds.add(sessionID) - this.connectionService.registerFocused(this.instanceId, sessionID) + this.focusSession(sessionID) this.contextSessionID = sessionID if (!this.client) { @@ -2885,10 +2860,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper */ private handleEvent(event: Event): void { if (event.type === "kilo-sessions.remote-status-changed") { - this.remoteService?.updateFromEvent({ - enabled: event.properties.enabled, - connected: event.properties.connected, - }) + this.remoteService?.updateFromEvent({ enabled: event.properties.enabled, connected: event.properties.connected }) return } @@ -3304,7 +3276,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper */ dispose(): void { this.unsubscribeRemote?.() - this.connectionService.unregisterFocused(this.instanceId) + this.focusSession() this.statsPoller?.stop() this.statsGitOps?.dispose() this.unsubscribeEvent?.() diff --git a/packages/kilo-vscode/src/services/RemoteStatusService.ts b/packages/kilo-vscode/src/services/RemoteStatusService.ts index 8644fdad2d2..5acaaf799c3 100644 --- a/packages/kilo-vscode/src/services/RemoteStatusService.ts +++ b/packages/kilo-vscode/src/services/RemoteStatusService.ts @@ -74,6 +74,26 @@ export class RemoteStatusService implements vscode.Disposable { this.update({ enabled, connected: false }) } + /** + * Handle a remote-related webview message. + * Returns a response message to post back to the webview, or null. + */ + async handleMessage(type: string, enabled?: boolean): Promise { + switch (type) { + case "toggleRemote": + await this.toggle() + return null + case "setRemoteEnabled": + if (enabled === undefined) return null + await this.setEnabled(enabled) + return null + case "requestRemoteStatus": + void this.refresh() + return this.state + } + return null + } + dispose(): void { this.listeners.clear() this.bar.dispose() diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx index dd7f184044c..8ad912b83f8 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx @@ -97,6 +97,7 @@ import { buildTopLevelItems, isGrouped, isGroupStart, isGroupEnd, type TopLevelI import { sectionAwareDetector } from "./section-dnd" import { ConstrainDragXAxis } from "./constrain-drag-x" import { mergeWorktreeDiffs } from "./diff-state" +import { trackOpenSessions } from "./open-sessions" import "./agent-manager.css" import "./agent-manager-review.css" @@ -667,14 +668,7 @@ const AgentManagerContent: Component = () => { setLocalSessionIDs(valid) } }) - - // Report all open (non-pending) session IDs to extension for heartbeat - createEffect(() => { - const local = localSessionIDs().filter((id) => !isPending(id)) - const managed = managedSessions().map((ms) => ms.id) - const all = [...new Set([...local, ...managed])] - vscode.postMessage({ type: "agentManager.openSessions", sessionIDs: all }) - }) + trackOpenSessions(localSessionIDs, isPending, managedSessions, vscode.postMessage) // Drop in-memory review state for worktrees that no longer exist. createEffect(() => { diff --git a/packages/kilo-vscode/webview-ui/agent-manager/open-sessions.ts b/packages/kilo-vscode/webview-ui/agent-manager/open-sessions.ts new file mode 100644 index 00000000000..ffa48b8b853 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/agent-manager/open-sessions.ts @@ -0,0 +1,15 @@ +import { createEffect } from "solid-js" +import type { Accessor } from "solid-js" + +/** Reactive effect: reports open (non-pending) session IDs to the extension for heartbeat. */ +export function trackOpenSessions( + local: Accessor, + pending: (id: string) => boolean, + managed: Accessor>, + post: (msg: { type: "agentManager.openSessions"; sessionIDs: string[] }) => void, +): void { + createEffect(() => { + const ids = [...new Set([...local().filter((id) => !pending(id)), ...managed().map((s) => s.id)])] + post({ type: "agentManager.openSessions", sessionIDs: ids }) + }) +} From 537db084473bd009e590ac986794e0ecb4ce62dd Mon Sep 17 00:00:00 2001 From: Evgeny Shurakov Date: Thu, 9 Apr 2026 14:17:13 +0200 Subject: [PATCH 45/58] fix: exempt kilo-* dirs from annotation check, add markers to session route The kilo-sessions/ directory is entirely Kilo-specific and should not require kilocode_change markers. Update isExempt() to also match directories starting with 'kilo-'. Add block markers to the /viewed route changes in session.ts. --- packages/opencode/src/server/routes/session.ts | 2 ++ script/check-opencode-annotations.ts | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/opencode/src/server/routes/session.ts b/packages/opencode/src/server/routes/session.ts index f7d3b32bc42..f6c97d40556 100644 --- a/packages/opencode/src/server/routes/session.ts +++ b/packages/opencode/src/server/routes/session.ts @@ -971,6 +971,7 @@ export const SessionRoutes = lazy(() => ) .post( "/viewed", + // kilocode_change start describeRoute({ summary: "Set viewed sessions", description: "Notify the server which sessions the user is currently viewing, or clear all.", @@ -993,6 +994,7 @@ export const SessionRoutes = lazy(() => const { KiloSessions } = await import("../../kilo-sessions/kilo-sessions") const body = c.req.valid("json") KiloSessions.setViewedSessions({ focused: body.focused ?? [], open: body.open ?? [] }) + // kilocode_change end return c.json(true) }, ), diff --git a/script/check-opencode-annotations.ts b/script/check-opencode-annotations.ts index b953fd44d8b..2b122e67d03 100644 --- a/script/check-opencode-annotations.ts +++ b/script/check-opencode-annotations.ts @@ -22,6 +22,7 @@ * - packages/opencode/src/kilocode/** * - packages/opencode/test/kilocode/** * - Any path containing "kilocode" in directory or filename + * - Any path with a directory starting with "kilo-" (e.g. kilo-sessions/) */ import { spawnSync } from "node:child_process" @@ -52,7 +53,7 @@ function changedFiles() { function isExempt(file: string) { const norm = file.replaceAll("\\", "/").toLowerCase() - return norm.split("/").some((part) => part.includes("kilocode")) + return norm.split("/").some((part) => part.includes("kilocode") || part.startsWith("kilo-")) } function isSource(file: string) { @@ -180,6 +181,7 @@ console.error( " - packages/opencode/src/kilocode/**", " - packages/opencode/test/kilocode/**", " - Any path containing 'kilocode' in the directory or filename", + " - Any directory starting with 'kilo-' (e.g. kilo-sessions/)", "", "See AGENTS.md for details.", ].join("\n"), From f1948fb3d74613eae70bd7750c5bfcdac268e167 Mon Sep 17 00:00:00 2001 From: Evgeny Shurakov Date: Thu, 9 Apr 2026 15:13:08 +0200 Subject: [PATCH 46/58] fix(vscode): dispose visibility and view state listeners in KiloProvider Store onDidChangeVisibility and onDidChangeViewState disposables as instance fields so they are properly cleaned up in dispose(), preventing event listener leaks. Add defensive dispose-before-reassign to match the existing webviewMessageDisposable pattern. --- packages/kilo-vscode/src/KiloProvider.ts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts index 96495461260..d4c066ead0d 100644 --- a/packages/kilo-vscode/src/KiloProvider.ts +++ b/packages/kilo-vscode/src/KiloProvider.ts @@ -175,6 +175,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper private unsubscribeDirectoryProvider: (() => void) | null = null private initConnectionPromise: Promise | null = null private webviewMessageDisposable: vscode.Disposable | null = null + private viewStateDisposable: vscode.Disposable | null = null + private visibilityDisposable: vscode.Disposable | null = null /** Lazily initialized ignore controller for .kilocodeignore filtering */ private ignoreController: FileIgnoreController | null = null @@ -373,21 +375,16 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper localResourceRoots: [this.extensionUri], } - // Set HTML content webviewView.webview.html = this._getHtmlForWebview(webviewView.webview) - - // Handle messages from webview (shared handler) this.setupWebviewMessageHandler(webviewView.webview) - // Track sidebar visibility for keybinding when-clauses and stats polling vscode.commands.executeCommand("setContext", "kilo-code.new.sidebarVisible", webviewView.visible) - webviewView.onDidChangeVisibility(() => { + this.visibilityDisposable?.dispose() + this.visibilityDisposable = webviewView.onDidChangeVisibility(() => { vscode.commands.executeCommand("setContext", "kilo-code.new.sidebarVisible", webviewView.visible) this.statsPoller?.setEnabled(webviewView.visible) this.focusSession(webviewView.visible ? this.currentSession?.id : undefined) }) - - // Initialize connection to CLI backend this.initializeConnection() } @@ -406,12 +403,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper panel.webview.html = this._getHtmlForWebview(panel.webview) - // Handle messages from webview (shared handler) this.setupWebviewMessageHandler(panel.webview) - - // Unregister focus when the editor tab becomes inactive, re-register when active - panel.onDidChangeViewState(() => this.focusSession(panel.active ? this.currentSession?.id : undefined)) - + this.viewStateDisposable?.dispose() + this.viewStateDisposable = panel.onDidChangeViewState(() => + this.focusSession(panel.active ? this.currentSession?.id : undefined), + ) this.initializeConnection() } @@ -3288,6 +3284,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.unsubscribeMigrationComplete?.() this.unsubscribeClearPendingPrompts?.() this.unsubscribeDirectoryProvider?.() + this.viewStateDisposable?.dispose() + this.visibilityDisposable?.dispose() this.webviewMessageDisposable?.dispose() this.trackedSessionIds.clear() this.syncedChildSessions.clear() From 5ef8a7029eafaf07d06a86acc81addb389e08838 Mon Sep 17 00:00:00 2001 From: Evgeny Shurakov Date: Thu, 9 Apr 2026 15:20:09 +0200 Subject: [PATCH 47/58] fix(vscode): translate remote status bar tooltips MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use i18n keys for 'Connected' and 'Connecting…' tooltips in RemoteStatusService, with translations for all 19 locales. --- packages/kilo-vscode/src/services/RemoteStatusService.ts | 5 +++-- packages/kilo-vscode/src/services/cli-backend/i18n/ar.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/br.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/bs.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/da.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/de.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/en.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/es.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/fr.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/ja.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/ko.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/nl.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/no.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/pl.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/ru.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/th.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/tr.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/uk.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/zh.ts | 2 ++ packages/kilo-vscode/src/services/cli-backend/i18n/zht.ts | 2 ++ 20 files changed, 41 insertions(+), 2 deletions(-) diff --git a/packages/kilo-vscode/src/services/RemoteStatusService.ts b/packages/kilo-vscode/src/services/RemoteStatusService.ts index 5acaaf799c3..14181005063 100644 --- a/packages/kilo-vscode/src/services/RemoteStatusService.ts +++ b/packages/kilo-vscode/src/services/RemoteStatusService.ts @@ -1,5 +1,6 @@ import * as vscode from "vscode" import type { KiloClient } from "@kilocode/sdk/v2/client" +import { t } from "./cli-backend/i18n" export type RemoteState = { enabled: boolean; connected: boolean } @@ -116,11 +117,11 @@ export class RemoteStatusService implements vscode.Disposable { } if (this.state.connected) { this.bar.text = "$(radio-tower) Kilo Remote" - this.bar.tooltip = "Kilo Remote: Connected" + this.bar.tooltip = t("remote.connected") this.bar.color = new vscode.ThemeColor("testing.iconPassed") } else { this.bar.text = "$(radio-tower) Kilo Remote \u2026" - this.bar.tooltip = "Kilo Remote: Connecting\u2026" + this.bar.tooltip = t("remote.connecting") this.bar.color = new vscode.ThemeColor("editorWarning.foreground") } this.bar.show() diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/ar.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/ar.ts index 7746b9091c0..1221fb0de36 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/ar.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/ar.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "انتهت عملية CLI بالرمز {{code}} قبل بدء الخادم", "server.startupTimeout": "انتهت مهلة بدء تشغيل الخادم بعد {{seconds}} ثانية", + "remote.connected": "Kilo Remote: متصل", + "remote.connecting": "Kilo Remote: جارٍ الاتصال\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/br.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/br.ts index 2c7e85e2d94..c2cb93e6ef1 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/br.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/br.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "O processo da CLI foi encerrado com o código {{code}} antes que o servidor fosse iniciado", "server.startupTimeout": "Tempo limite de inicialização do servidor esgotado após {{seconds}} segundos", + "remote.connected": "Kilo Remote: Conectado", + "remote.connecting": "Kilo Remote: Conectando\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/bs.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/bs.ts index 56ef3e856dc..87de30b377c 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/bs.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/bs.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "CLI proces je izašao sa kodom {{code}} prije nego što se server pokrenuo", "server.startupTimeout": "Vrijeme pokretanja servera je isteklo nakon {{seconds}} sekundi", + "remote.connected": "Kilo Remote: Povezano", + "remote.connecting": "Kilo Remote: Povezivanje\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/da.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/da.ts index 9070a8786aa..59881a81fec 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/da.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/da.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "CLI-processen afsluttede med kode {{code}} før serveren startede", "server.startupTimeout": "Serverens opstartstid udløb efter {{seconds}} sekunder", + "remote.connected": "Kilo Remote: Forbundet", + "remote.connecting": "Kilo Remote: Forbinder\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/de.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/de.ts index e39c0f5e160..df45e47ea27 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/de.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/de.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "Der CLI-Prozess wurde mit dem Code {{code}} beendet, bevor der Server gestartet wurde", "server.startupTimeout": "Zeitüberschreitung beim Serverstart nach {{seconds}} Sekunden", + "remote.connected": "Kilo Remote: Verbunden", + "remote.connecting": "Kilo Remote: Verbindung wird hergestellt\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/en.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/en.ts index ca79ec96d93..0b59af3f34f 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/en.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/en.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "CLI process exited with code {{code}} before server started", "server.startupTimeout": "Server startup timeout after {{seconds}} seconds", + "remote.connected": "Kilo Remote: Connected", + "remote.connecting": "Kilo Remote: Connecting\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/es.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/es.ts index c0cc59c6edb..a744fe33455 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/es.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/es.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "El proceso de la CLI finalizó con el código {{code}} antes de que se iniciara el servidor", "server.startupTimeout": "Tiempo de espera de inicio del servidor agotado después de {{seconds}} segundos", + "remote.connected": "Kilo Remote: Conectado", + "remote.connecting": "Kilo Remote: Conectando\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/fr.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/fr.ts index 73dc429a3db..03f7a3024e9 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/fr.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/fr.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "Le processus CLI s'est terminé avec le code {{code}} avant le démarrage du serveur", "server.startupTimeout": "Délai de démarrage du serveur dépassé après {{seconds}} secondes", + "remote.connected": "Kilo Remote\u00a0: Connecté", + "remote.connecting": "Kilo Remote\u00a0: Connexion\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/ja.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/ja.ts index 91545b89b94..58e9c3ee9bd 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/ja.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/ja.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "サーバーが起動する前に、CLI プロセスがコード {{code}} で終了しました", "server.startupTimeout": "サーバーの起動が {{seconds}} 秒後にタイムアウトしました", + "remote.connected": "Kilo Remote: 接続済み", + "remote.connecting": "Kilo Remote: 接続中\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/ko.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/ko.ts index 1cb709c332f..c48eed062e9 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/ko.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/ko.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "서버가 시작되기 전에 CLI 프로세스가 코드 {{code}}로 종료되었습니다", "server.startupTimeout": "{{seconds}}초 후 서버 시작 시간이 초과되었습니다", + "remote.connected": "Kilo Remote: 연결됨", + "remote.connecting": "Kilo Remote: 연결 중\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/nl.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/nl.ts index fd8097f446f..c9cfc6a96e2 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/nl.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/nl.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "CLI-proces is afgesloten met code {{code}} voordat de server is gestart", "server.startupTimeout": "Time-out bij opstarten van server na {{seconds}} seconden", + "remote.connected": "Kilo Remote: Verbonden", + "remote.connecting": "Kilo Remote: Verbinden\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/no.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/no.ts index 45ac6d32efe..a24895f79e4 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/no.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/no.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "CLI-prosessen avsluttet med kode {{code}} før serveren startet", "server.startupTimeout": "Tidsavbrudd for serveroppstart etter {{seconds}} sekunder", + "remote.connected": "Kilo Remote: Tilkoblet", + "remote.connecting": "Kilo Remote: Kobler til\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/pl.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/pl.ts index 3a76426cd34..7f7415c1378 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/pl.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/pl.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "Proces CLI zakończył się z kodem {{code}} przed uruchomieniem serwera", "server.startupTimeout": "Przekroczono limit czasu uruchamiania serwera po {{seconds}} sekundach", + "remote.connected": "Kilo Remote: Połączono", + "remote.connecting": "Kilo Remote: Łączenie\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/ru.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/ru.ts index 0063c3e84b0..b9e721e60bf 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/ru.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/ru.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "Процесс CLI завершился с кодом {{code}} до запуска сервера", "server.startupTimeout": "Время ожидания запуска сервера истекло через {{seconds}} секунд", + "remote.connected": "Kilo Remote: Подключено", + "remote.connecting": "Kilo Remote: Подключение\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/th.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/th.ts index 10a009bd4f4..aff4ea8f378 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/th.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/th.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "กระบวนการ CLI ออกด้วยรหัส {{code}} ก่อนที่เซิร์ฟเวอร์จะเริ่มทำงาน", "server.startupTimeout": "หมดเวลาการเริ่มต้นเซิร์ฟเวอร์หลังจาก {{seconds}} วินาที", + "remote.connected": "Kilo Remote: เชื่อมต่อแล้ว", + "remote.connecting": "Kilo Remote: กำลังเชื่อมต่อ\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/tr.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/tr.ts index 180ba2ab68d..6be397e7a36 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/tr.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/tr.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "CLI işlemi sunucu başlamadan önce {{code}} koduyla çıktı", "server.startupTimeout": "{{seconds}} saniye sonra sunucu başlatma zaman aşımı", + "remote.connected": "Kilo Remote: Bağlandı", + "remote.connecting": "Kilo Remote: Bağlanıyor\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/uk.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/uk.ts index fe0c703d0e7..315d12fa96d 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/uk.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/uk.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "Процес CLI завершився з кодом {{code}} до запуску сервера", "server.startupTimeout": "Час очікування запуску сервера вичерпано після {{seconds}} секунд", + "remote.connected": "Kilo Remote: Підключено", + "remote.connecting": "Kilo Remote: Підключення\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/zh.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/zh.ts index fe025f578c0..72160d167fe 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/zh.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/zh.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "在服务器启动之前，CLI 进程已退出，代码为 {{code}}", "server.startupTimeout": "服务器启动在 {{seconds}} 秒后超时", + "remote.connected": "Kilo Remote: 已连接", + "remote.connecting": "Kilo Remote: 正在连接\u2026", } as const diff --git a/packages/kilo-vscode/src/services/cli-backend/i18n/zht.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/zht.ts index d4d67bf5abb..61baae8020f 100644 --- a/packages/kilo-vscode/src/services/cli-backend/i18n/zht.ts +++ b/packages/kilo-vscode/src/services/cli-backend/i18n/zht.ts @@ -1,4 +1,6 @@ export const dict = { "server.processExited": "在伺服器啟動之前，CLI 處理程序已退出，代碼為 {{code}}", "server.startupTimeout": "伺服器啟動在 {{seconds}} 秒後逾時", + "remote.connected": "Kilo Remote: 已連線", + "remote.connecting": "Kilo Remote: 正在連線\u2026", } as const From 060822724eb1c3bc839cd4233315bbaf6d699a0d Mon Sep 17 00:00:00 2001 From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 13:32:11 +0000 Subject: [PATCH 48/58] refactor(cli): add kilocode_change markers and extract bedrock tests Add kilocode_change markers to the Bedrock Claude condition in transform.ts to ease upstream merges. Move the bedrock-specific tests to test/kilocode/ so the shared transform.test.ts stays closer to upstream and reduces merge conflicts. --- packages/opencode/src/provider/transform.ts | 5 +- .../bedrock-claude-empty-content.test.ts | 138 ++++++++++++++++++ .../opencode/test/provider/transform.test.ts | 136 ----------------- 3 files changed, 141 insertions(+), 138 deletions(-) create mode 100644 packages/opencode/test/kilocode/bedrock-claude-empty-content.test.ts diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts index 9c80dcd91e7..81e20b51a21 100644 --- a/packages/opencode/src/provider/transform.ts +++ b/packages/opencode/src/provider/transform.ts @@ -55,8 +55,9 @@ export namespace ProviderTransform { // empty string messages and remove empty text/reasoning parts from array content if ( model.api.npm === "@ai-sdk/anthropic" || - (model.api.npm === "@ai-sdk/amazon-bedrock" && - (model.api.id.includes("claude") || model.id.includes("claude"))) + // kilocode_change start - also filter for Bedrock Claude models + (model.api.npm === "@ai-sdk/amazon-bedrock" && (model.api.id.includes("claude") || model.id.includes("claude"))) + // kilocode_change end ) { msgs = msgs .map((msg) => { diff --git a/packages/opencode/test/kilocode/bedrock-claude-empty-content.test.ts b/packages/opencode/test/kilocode/bedrock-claude-empty-content.test.ts new file mode 100644 index 00000000000..4f945cea02f --- /dev/null +++ b/packages/opencode/test/kilocode/bedrock-claude-empty-content.test.ts @@ -0,0 +1,138 @@ +import { describe, expect, test } from "bun:test" +import { ProviderTransform } from "../../src/provider/transform" + +describe("ProviderTransform.message - bedrock claude empty content filtering", () => { + const model = { + id: "amazon-bedrock/anthropic.claude-sonnet-4-5", + providerID: "amazon-bedrock", + api: { + id: "anthropic.claude-sonnet-4-5-20250514-v1:0", + url: "https://bedrock-runtime.us-east-1.amazonaws.com", + npm: "@ai-sdk/amazon-bedrock", + }, + name: "Claude Sonnet 4.5 (Bedrock)", + capabilities: { + temperature: true, + reasoning: false, + attachment: true, + toolcall: true, + input: { text: true, audio: false, image: true, video: false, pdf: true }, + output: { text: true, audio: false, image: false, video: false, pdf: false }, + interleaved: false, + }, + cost: { input: 0.003, output: 0.015 }, + limit: { context: 200000, output: 8192 }, + status: "active", + options: {}, + headers: {}, + } as any + + test("filters out messages with empty string content", () => { + const msgs = [ + { role: "user", content: "Hello" }, + { role: "assistant", content: "" }, + { role: "user", content: "World" }, + ] as any[] + + const result = ProviderTransform.message(msgs, model, {}) + + expect(result).toHaveLength(2) + expect(result[0].content).toBe("Hello") + expect(result[1].content).toBe("World") + }) + + test("filters out empty text parts from array content", () => { + const msgs = [ + { + role: "assistant", + content: [ + { type: "text", text: "" }, + { type: "text", text: "Hello" }, + ], + }, + ] as any[] + + const result = ProviderTransform.message(msgs, model, {}) + + expect(result).toHaveLength(1) + expect(result[0].content).toHaveLength(1) + expect(result[0].content[0]).toEqual({ type: "text", text: "Hello" }) + }) + + test("removes entire message when all parts are empty", () => { + const msgs = [ + { role: "user", content: "Hello" }, + { + role: "assistant", + content: [ + { type: "text", text: "" }, + { type: "reasoning", text: "" }, + ], + }, + { role: "user", content: "World" }, + ] as any[] + + const result = ProviderTransform.message(msgs, model, {}) + + expect(result).toHaveLength(2) + expect(result[0].content).toBe("Hello") + expect(result[1].content).toBe("World") + }) + + test("filters empty text for bedrock claude custom inference profiles", () => { + const profile = { + ...model, + id: "amazon-bedrock/custom-claude-sonnet-4.5", + api: { + id: "arn:aws:bedrock:xxx:yyy:application-inference-profile/zzz", + url: "https://bedrock-runtime.us-east-1.amazonaws.com", + npm: "@ai-sdk/amazon-bedrock", + }, + } + + const msgs = [ + { role: "user", content: "Hello" }, + { role: "assistant", content: "" }, + { + role: "assistant", + content: [ + { type: "text", text: "" }, + { type: "text", text: "Answer" }, + ], + }, + ] as any[] + + const result = ProviderTransform.message(msgs, profile, {}) + + expect(result).toHaveLength(2) + expect(result[0].content).toBe("Hello") + expect(result[1].content).toHaveLength(1) + expect(result[1].content[0]).toEqual({ type: "text", text: "Answer" }) + }) + + test("does not filter for non-claude bedrock models", () => { + const titan = { + ...model, + id: "amazon-bedrock/amazon.titan-text-express-v1", + api: { + id: "amazon.titan-text-express-v1", + url: "https://bedrock-runtime.us-east-1.amazonaws.com", + npm: "@ai-sdk/amazon-bedrock", + }, + } + + const msgs = [ + { role: "assistant", content: "" }, + { + role: "assistant", + content: [{ type: "text", text: "" }], + }, + ] as any[] + + const result = ProviderTransform.message(msgs, titan, {}) + + expect(result).toHaveLength(2) + expect(result[0].content).toBe("") + expect(result[1].content).toHaveLength(1) + }) +}) diff --git a/packages/opencode/test/provider/transform.test.ts b/packages/opencode/test/provider/transform.test.ts index 1e704b2a884..c70acf260c8 100644 --- a/packages/opencode/test/provider/transform.test.ts +++ b/packages/opencode/test/provider/transform.test.ts @@ -1122,142 +1122,6 @@ describe("ProviderTransform.message - anthropic empty content filtering", () => }) }) -describe("ProviderTransform.message - bedrock claude empty content filtering", () => { - const bedrockClaudeModel = { - id: "amazon-bedrock/anthropic.claude-sonnet-4-5", - providerID: "amazon-bedrock", - api: { - id: "anthropic.claude-sonnet-4-5-20250514-v1:0", - url: "https://bedrock-runtime.us-east-1.amazonaws.com", - npm: "@ai-sdk/amazon-bedrock", - }, - name: "Claude Sonnet 4.5 (Bedrock)", - capabilities: { - temperature: true, - reasoning: false, - attachment: true, - toolcall: true, - input: { text: true, audio: false, image: true, video: false, pdf: true }, - output: { text: true, audio: false, image: false, video: false, pdf: false }, - interleaved: false, - }, - cost: { input: 0.003, output: 0.015 }, - limit: { context: 200000, output: 8192 }, - status: "active", - options: {}, - headers: {}, - } as any - - test("filters out messages with empty string content", () => { - const msgs = [ - { role: "user", content: "Hello" }, - { role: "assistant", content: "" }, - { role: "user", content: "World" }, - ] as any[] - - const result = ProviderTransform.message(msgs, bedrockClaudeModel, {}) - - expect(result).toHaveLength(2) - expect(result[0].content).toBe("Hello") - expect(result[1].content).toBe("World") - }) - - test("filters out empty text parts from array content", () => { - const msgs = [ - { - role: "assistant", - content: [ - { type: "text", text: "" }, - { type: "text", text: "Hello" }, - ], - }, - ] as any[] - - const result = ProviderTransform.message(msgs, bedrockClaudeModel, {}) - - expect(result).toHaveLength(1) - expect(result[0].content).toHaveLength(1) - expect(result[0].content[0]).toEqual({ type: "text", text: "Hello" }) - }) - - test("removes entire message when all parts are empty", () => { - const msgs = [ - { role: "user", content: "Hello" }, - { - role: "assistant", - content: [ - { type: "text", text: "" }, - { type: "reasoning", text: "" }, - ], - }, - { role: "user", content: "World" }, - ] as any[] - - const result = ProviderTransform.message(msgs, bedrockClaudeModel, {}) - - expect(result).toHaveLength(2) - expect(result[0].content).toBe("Hello") - expect(result[1].content).toBe("World") - }) - - test("filters empty text for bedrock claude custom inference profiles", () => { - const bedrockProfileModel = { - ...bedrockClaudeModel, - id: "amazon-bedrock/custom-claude-sonnet-4.5", - api: { - id: "arn:aws:bedrock:xxx:yyy:application-inference-profile/zzz", - url: "https://bedrock-runtime.us-east-1.amazonaws.com", - npm: "@ai-sdk/amazon-bedrock", - }, - } - - const msgs = [ - { role: "user", content: "Hello" }, - { role: "assistant", content: "" }, - { - role: "assistant", - content: [ - { type: "text", text: "" }, - { type: "text", text: "Answer" }, - ], - }, - ] as any[] - - const result = ProviderTransform.message(msgs, bedrockProfileModel, {}) - - expect(result).toHaveLength(2) - expect(result[0].content).toBe("Hello") - expect(result[1].content).toHaveLength(1) - expect(result[1].content[0]).toEqual({ type: "text", text: "Answer" }) - }) - - test("does not filter for non-claude bedrock models", () => { - const bedrockNonClaudeModel = { - ...bedrockClaudeModel, - id: "amazon-bedrock/amazon.titan-text-express-v1", - api: { - id: "amazon.titan-text-express-v1", - url: "https://bedrock-runtime.us-east-1.amazonaws.com", - npm: "@ai-sdk/amazon-bedrock", - }, - } - - const msgs = [ - { role: "assistant", content: "" }, - { - role: "assistant", - content: [{ type: "text", text: "" }], - }, - ] as any[] - - const result = ProviderTransform.message(msgs, bedrockNonClaudeModel, {}) - - expect(result).toHaveLength(2) - expect(result[0].content).toBe("") - expect(result[1].content).toHaveLength(1) - }) -}) - describe("ProviderTransform.message - strip openai metadata when store=false", () => { const openaiModel = { id: "openai/gpt-5", From 1f2046c596915725e0598faa48bc0875fdb92e20 Mon Sep 17 00:00:00 2001 From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 13:34:27 +0000 Subject: [PATCH 49/58] wip --- bun.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/bun.lock b/bun.lock index 297c0b0bd9c..1a295a2759e 100644 --- a/bun.lock +++ b/bun.lock @@ -1,5 +1,6 @@ { "lockfileVersion": 1, + "configVersion": 0, "workspaces": { "": { "name": "@kilocode/kilo", From 46f450a84f43b9a7cb23aececbe2bc667477e5dd Mon Sep 17 00:00:00 2001 From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 13:47:22 +0000 Subject: [PATCH 50/58] fix(cli): expand kilocode_change markers to cover all changed lines The annotation CI check requires all diff lines in shared opencode files to be inside kilocode_change marker blocks. Move the start marker above the modified comment so every changed line is covered. --- packages/opencode/src/provider/transform.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts index 81e20b51a21..5cd3f7f8389 100644 --- a/packages/opencode/src/provider/transform.ts +++ b/packages/opencode/src/provider/transform.ts @@ -51,14 +51,14 @@ export namespace ProviderTransform { model: Provider.Model, options: Record, ): ModelMessage[] { + // kilocode_change start - also filter for Bedrock Claude models // Anthropic and Bedrock Claude reject messages with empty content - filter out // empty string messages and remove empty text/reasoning parts from array content if ( model.api.npm === "@ai-sdk/anthropic" || - // kilocode_change start - also filter for Bedrock Claude models (model.api.npm === "@ai-sdk/amazon-bedrock" && (model.api.id.includes("claude") || model.id.includes("claude"))) - // kilocode_change end ) { + // kilocode_change end msgs = msgs .map((msg) => { if (typeof msg.content === "string") { From ebcda1b50b6bf859e1fdbdfe2f06d82bbdfe1d45 Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 9 Apr 2026 15:54:11 +0200 Subject: [PATCH 51/58] fix(agent-manager): fix version group splitting when sections exist (#8667) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Top-level worktrees were passing the mixed topLevelItems index to isGroupStart/isGroupEnd which compared against sortedWorktrees — a different array. This caused grouped worktrees sharing the same groupId to render as separate version groups. Pass ungrouped() list and the correct index within it instead. --- .../kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx index e8147a0abdd..863eec63763 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx @@ -2416,7 +2416,9 @@ const AgentManagerContent: Component = () => { ) } - return renderWt(item.wt, idx) + const ug = ungrouped() + const wtIdx = () => ug.indexOf(item.wt) + return renderWt(item.wt, wtIdx, false, ug) }} ) From a2436ce1e8de0c90c8364237665dcec414f44427 Mon Sep 17 00:00:00 2001 From: "kiloconnect[bot]" <240665456+kiloconnect[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 14:10:20 +0000 Subject: [PATCH 52/58] fix(agent-manager): fix renderWt call with stale 4-arg signature Commit ebcda1b50 changed the ungrouped worktree call site to pass (wt, wtIdx, false, ug) using the old 4-parameter signature that had an inSection boolean. Meanwhile 7b3756f27 removed the inSection parameter, leaving a 3-parameter signature (wt, idx, list?). The two merged without textual conflict but the call site was left with a stale false argument, causing a typecheck failure. Drop the false arg to match the current signature. --- .../kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx index 863eec63763..98e24b8c49b 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx @@ -2418,7 +2418,7 @@ const AgentManagerContent: Component = () => { } const ug = ungrouped() const wtIdx = () => ug.indexOf(item.wt) - return renderWt(item.wt, wtIdx, false, ug) + return renderWt(item.wt, wtIdx, ug) }} ) From 6642e8c6de881030f60222e1d52a8c3cfc2b7065 Mon Sep 17 00:00:00 2001 From: "kilo-code-bot[bot]" <240665456+kilo-code-bot[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 14:39:17 +0000 Subject: [PATCH 53/58] fix(agent-manager): recover pending permissions after worktree session registration (#8659) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(agent-manager): recover pending permissions after worktree session registration When the Agent Manager panel is disposed and recreated (e.g. window reload, panel close/reopen), or when a new worktree session is created, permission prompts emitted by the CLI backend could be silently dropped. This happened because: 1. Panel recreation clears trackedSessionIds and sessionDirectories in the KiloProvider, so fetchAndSendPendingPermissions() during SSE reconnection only queries the workspace root Instance — missing worktree permissions. 2. The CLI backend may emit permission.asked between session.create() returning and registerWorktreeSession() completing, and the SSE filter drops the event because the session is not yet tracked. Fix: Add recoverPendingPrompts() to the SessionProvider interface and call it both after initializeState() re-registers all worktree sessions and after each registerWorktreeSession() call. This ensures pending permissions and questions are recovered regardless of timing. Closes #8658 * fix(agent-manager): recover prompts after webview readiness * test(agent-manager): raise provider line cap --------- Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com> Co-authored-by: marius-kilocode --- packages/kilo-vscode/src/KiloProvider.ts | 45 ++++++++++++++----- .../src/agent-manager/AgentManagerProvider.ts | 10 +++++ .../kilo-vscode/src/agent-manager/host.ts | 2 + .../src/agent-manager/vscode-host.ts | 1 + .../tests/unit/agent-manager-arch.test.ts | 4 +- 5 files changed, 50 insertions(+), 12 deletions(-) diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts index d4c066ead0d..5989c170065 100644 --- a/packages/kilo-vscode/src/KiloProvider.ts +++ b/packages/kilo-vscode/src/KiloProvider.ts @@ -147,6 +147,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper private cachedNotificationsMessage: unknown = null private pendingReviewComments: { comments: unknown[]; autoSend: boolean }[] = [] private readyResolvers: (() => void)[] = [] + private promptRecoveryQueued = false + private promptRecovery: Promise | null = null private trackedSessionIds: Set = new Set() private syncedChildSessions: Set = new Set() /** Tracks the latest status for each session, used to warn before destructive config operations. */ @@ -463,6 +465,30 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper void this.handleLoadSessions() } + /** Recover permission/question prompts after sessions and directories are tracked. */ + public recoverPendingPrompts(): void { + this.promptRecoveryQueued = true + if (!this.isWebviewReady) return + if (!this.client) return + if (this.promptRecovery) return + + this.promptRecovery = this.flushPendingPrompts().finally(() => { + this.promptRecovery = null + if (this.promptRecoveryQueued && this.isWebviewReady && this.client) this.recoverPendingPrompts() + }) + } + + private async flushPendingPrompts(): Promise { + while (this.promptRecoveryQueued && this.isWebviewReady) { + if (!this.client) return + this.promptRecoveryQueued = false + await Promise.all([ + fetchAndSendPendingPermissions(this.permissionCtx), + fetchAndSendPendingQuestions(this.questionCtx), + ]) + } + } + public openCloudSession(sessionId: string): void { this.postMessage({ type: "openCloudSession", sessionId }) } @@ -518,6 +544,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.isWebviewReady = true await this.syncWebviewState("webviewReady") this.flushPendingReviewComments() + this.recoverPendingPrompts() this.readyResolvers.splice(0).forEach((r) => r()) break case "sendMessage": { @@ -1122,8 +1149,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper } await this.syncWebviewState("sse-connected") await this.flushPendingSessionRefresh("sse-connected") - await fetchAndSendPendingPermissions(this.permissionCtx) - await fetchAndSendPendingQuestions(this.questionCtx) + this.recoverPendingPrompts() } catch (error) { console.error("[Kilo New] KiloProvider: ❌ Failed during connected state handling:", error) this.postMessage({ @@ -1198,6 +1224,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper await this.syncWebviewState("initializeConnection") await this.flushPendingSessionRefresh("initializeConnection") + this.recoverPendingPrompts() // Fetch providers, agents, skills, config, notifications, and session statuses in parallel await Promise.all([ @@ -1362,9 +1389,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper messages, }) - // Recover any permission.asked events that were missed while the webview - // was loading or during an SSE reconnection (fire-and-forget). - void fetchAndSendPendingPermissions(this.permissionCtx) + // Recover any prompts missed while the webview was loading or during an SSE reconnection. + this.recoverPendingPrompts() } catch (error) { // Silently ignore aborted requests — the user switched to a different session if (abort.signal.aborted) return @@ -1421,11 +1447,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper messages, }) - // Recover any missed permission/question prompts emitted by the child before - // we started tracking it. Both run fire-and-forget after messagesLoaded so - // the webview isn't blocked. - void fetchAndSendPendingPermissions(this.permissionCtx) - void fetchAndSendPendingQuestions(this.questionCtx) + // Recover any prompts emitted by the child before we started tracking it. + this.recoverPendingPrompts() } catch (err) { this.syncedChildSessions.delete(sessionID) console.error("[Kilo New] KiloProvider: Failed to sync child session:", err) @@ -3287,6 +3310,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.viewStateDisposable?.dispose() this.visibilityDisposable?.dispose() this.webviewMessageDisposable?.dispose() + this.isWebviewReady = false + this.promptRecoveryQueued = false this.trackedSessionIds.clear() this.syncedChildSessions.clear() this.sessionDirectories.clear() diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts index 67ba770cf4f..30892052326 100644 --- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts +++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts @@ -215,6 +215,12 @@ export class AgentManagerProvider implements Disposable { if (state.getSessions().length > 0) { this.panel?.sessions.refreshSessions() } + + // Recover any pending permission/question prompts that were missed during + // panel recreation or SSE reconnection. Must run after all worktree sessions + // are registered with their directory overrides so the recovery queries the + // correct CLI backend Instances. + this.panel?.sessions.recoverPendingPrompts() } // --------------------------------------------------------------------------- @@ -1438,6 +1444,10 @@ export class AgentManagerProvider implements Disposable { if (!this.panel) return this.panel.sessions.setSessionDirectory(sessionId, directory) this.panel.sessions.trackSession(sessionId) + // Recover any permission/question prompts that arrived before the session + // was tracked. The CLI backend may have emitted permission.asked between + // session.create() returning and this registration completing. + this.panel.sessions.recoverPendingPrompts() } private onWorktreePresence(result: WorktreePresenceResult): void { diff --git a/packages/kilo-vscode/src/agent-manager/host.ts b/packages/kilo-vscode/src/agent-manager/host.ts index 596e32cf88c..6dc5e658280 100644 --- a/packages/kilo-vscode/src/agent-manager/host.ts +++ b/packages/kilo-vscode/src/agent-manager/host.ts @@ -38,6 +38,8 @@ export interface SessionProvider { trackSession(id: string): void refreshSessions(): void registerSession(session: Session): void + /** Recover any pending permission/question prompts for tracked sessions. */ + recoverPendingPrompts(): void dispose(): void } diff --git a/packages/kilo-vscode/src/agent-manager/vscode-host.ts b/packages/kilo-vscode/src/agent-manager/vscode-host.ts index d0eadb6e381..9a539ccf0ba 100644 --- a/packages/kilo-vscode/src/agent-manager/vscode-host.ts +++ b/packages/kilo-vscode/src/agent-manager/vscode-host.ts @@ -95,6 +95,7 @@ export class VscodeHost implements Host { trackSession: (id) => provider.trackSession(id), refreshSessions: () => provider.refreshSessions(), registerSession: (s) => provider.registerSession(s), + recoverPendingPrompts: () => provider.recoverPendingPrompts(), dispose: () => provider.dispose(), } 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 8cd63e4f9b2..39cae416ec4 100644 --- a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts +++ b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts @@ -534,8 +534,8 @@ const VSCODE_ALLOWED: Record = { */ const MAX_LINES: Record = { "AgentManagerProvider.ts": { - maxLines: 2000, - note: "primary extraction target: break into smaller orchestrators", + maxLines: 2050, + note: "permission recovery wiring is interleaved with panel/session lifecycle; extract more orchestrators next", }, } From 86513816a06fbdf87dcec750ae4fccf0977af911 Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 9 Apr 2026 17:33:47 +0200 Subject: [PATCH 54/58] feat(agent-manager): add shared semaphore to cap concurrent git/gh processes (#8660) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(agent-manager): add shared semaphore to cap concurrent git/gh processes The agent manager's polling loops (GitStatsPoller, PRStatusPoller, diff watcher) could spawn unbounded concurrent git/gh child processes — one per worktree per tick. With many worktrees on Windows this causes process storms. Introduce a Semaphore(3) shared across GitOps, PRStatusPoller, and GitStatsPoller so at most 3 git/gh child processes run at any time. HTTP diffSummary calls are also gated since they trigger server-side git spawning. * fix(agent-manager): avoid nested semaphore acquisition in GitStatsPoller Gate only the HTTP diffSummary call through the semaphore, not the entire per-worktree lambda. The aheadBehind call goes through GitOps.raw() which already acquires the same semaphore — wrapping both would deadlock when all slots are held. --- .../src/agent-manager/AgentManagerProvider.ts | 6 +- .../kilo-vscode/src/agent-manager/GitOps.ts | 89 ++++++++------- .../src/agent-manager/GitStatsPoller.ts | 20 +++- .../src/agent-manager/PRStatusPoller.ts | 30 ++++-- .../src/agent-manager/pr-status-bridge.ts | 4 + .../src/agent-manager/semaphore.ts | 41 +++++++ .../kilo-vscode/tests/unit/git-ops.test.ts | 38 ++++++- .../tests/unit/git-stats-poller.test.ts | 52 +++++++++ .../kilo-vscode/tests/unit/semaphore.test.ts | 102 ++++++++++++++++++ 9 files changed, 327 insertions(+), 55 deletions(-) create mode 100644 packages/kilo-vscode/src/agent-manager/semaphore.ts create mode 100644 packages/kilo-vscode/tests/unit/semaphore.test.ts diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts index 30892052326..1c6f285a539 100644 --- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts +++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts @@ -25,6 +25,7 @@ import { continueInWorktree } from "./continue-in-worktree" import { shouldStopDiffPolling } from "./delete-worktree" import { buildKeybindingMap } from "./format-keybinding" import { resolveVersionModels, buildInitialMessages, type CreatedVersion } from "./multi-version" +import { Semaphore } from "./semaphore" import { PLATFORM } from "./constants" import type { AgentManagerOutMessage, AgentManagerInMessage } from "./types" import { hashFileDiffs, resolveLocalDiffTarget } from "../review-utils" @@ -76,11 +77,13 @@ export class AgentManagerProvider implements Disposable { (msg) => this.outputChannel.appendLine(`[SessionTerminal] ${msg}`), createTerminalHost(), ) - this.gitOps = new GitOps({ log: (...args) => this.log(...args) }) + const semaphore = new Semaphore(3) + this.gitOps = new GitOps({ log: (...args) => this.log(...args), semaphore }) this.statsPoller = new GitStatsPoller({ getWorktrees: () => this.state?.getWorktrees() ?? [], getWorkspaceRoot: () => this.getRoot(), getClient: () => this.connectionService.getClient(), + semaphore, onStats: (stats) => { const msg = { type: "agentManager.worktreeStats" as const, stats } this.cachedWorktreeStats = msg @@ -105,6 +108,7 @@ export class AgentManagerProvider implements Disposable { hasPersistedPR: (id: string) => !!this.state?.getWorktree(id)?.prNumber, openExternal: (u) => this.host.openExternal(u), log: (...a) => this.log(...a), + semaphore, }) } diff --git a/packages/kilo-vscode/src/agent-manager/GitOps.ts b/packages/kilo-vscode/src/agent-manager/GitOps.ts index 7f47ae46e56..3f36edb587e 100644 --- a/packages/kilo-vscode/src/agent-manager/GitOps.ts +++ b/packages/kilo-vscode/src/agent-manager/GitOps.ts @@ -4,11 +4,14 @@ import * as fs from "fs/promises" import { spawn } from "../util/process" import simpleGit from "simple-git" import { parseWorktreeList, normalizePath } from "./git-import" +import type { Semaphore } from "./semaphore" interface GitOpsOptions { log: (...args: unknown[]) => void /** Override git command execution for testing. */ runGit?: (args: string[], cwd: string) => Promise + /** Shared concurrency gate for child process spawning. */ + semaphore?: Semaphore } export interface ApplyConflict { @@ -63,6 +66,7 @@ export class GitOps { private readonly log: (...args: unknown[]) => void private readonly runGit: (args: string[], cwd: string) => Promise private readonly controller = new AbortController() + private readonly semaphore: Semaphore | undefined get disposed(): boolean { return this.controller.signal.aborted @@ -70,6 +74,7 @@ export class GitOps { constructor(options: GitOpsOptions) { this.log = options.log + this.semaphore = options.semaphore this.runGit = options.runGit ?? ((args, cwd) => @@ -87,20 +92,22 @@ export class GitOps { private raw(args: string[], cwd: string): Promise { const signal = this.controller.signal if (signal.aborted) return Promise.reject(new Error("GitOps disposed")) - return new Promise((resolve, reject) => { - const onAbort = () => reject(new Error("GitOps disposed")) - signal.addEventListener("abort", onAbort, { once: true }) - this.runGit(args, cwd).then( - (value) => { - signal.removeEventListener("abort", onAbort) - resolve(value) - }, - (err) => { - signal.removeEventListener("abort", onAbort) - reject(err) - }, - ) - }) + const invoke = () => + new Promise((resolve, reject) => { + const onAbort = () => reject(new Error("GitOps disposed")) + signal.addEventListener("abort", onAbort, { once: true }) + this.runGit(args, cwd).then( + (value) => { + signal.removeEventListener("abort", onAbort) + resolve(value) + }, + (err) => { + signal.removeEventListener("abort", onAbort) + reject(err) + }, + ) + }) + return this.semaphore ? this.semaphore.run(invoke) : invoke() } /** Return the name of the currently checked-out branch, or `"HEAD"` if detached. */ @@ -413,37 +420,39 @@ export class GitOps { if (this.controller.signal.aborted) { return Promise.resolve({ code: 1, stdout: "", stderr: "GitOps disposed" }) } - return new Promise((resolve) => { - const child = spawn("git", args, { - cwd, - env: options?.env, - signal: this.controller.signal, - stdio: ["pipe", "pipe", "pipe"], - }) + const invoke = () => + new Promise((resolve) => { + const child = spawn("git", args, { + cwd, + env: options?.env, + signal: this.controller.signal, + stdio: ["pipe", "pipe", "pipe"], + }) - if (options?.stdin !== undefined) { - if (!child.stdin) { - resolve({ code: 1, stdout: "", stderr: "stdin not available for git process" }) - return + if (options?.stdin !== undefined) { + if (!child.stdin) { + resolve({ code: 1, stdout: "", stderr: "stdin not available for git process" }) + return + } + child.stdin.end(options.stdin) } - child.stdin.end(options.stdin) - } - const out: Buffer[] = [] - const err: Buffer[] = [] - child.stdout?.on("data", (chunk: Buffer) => out.push(chunk)) - child.stderr?.on("data", (chunk: Buffer) => err.push(chunk)) + const out: Buffer[] = [] + const err: Buffer[] = [] + child.stdout?.on("data", (chunk: Buffer) => out.push(chunk)) + child.stderr?.on("data", (chunk: Buffer) => err.push(chunk)) - child.on("error", (error) => { - resolve({ code: 1, stdout: "", stderr: error.message }) - }) - child.on("close", (code) => { - resolve({ - code: code ?? 1, - stdout: Buffer.concat(out).toString("utf8"), - stderr: Buffer.concat(err).toString("utf8"), + child.on("error", (error) => { + resolve({ code: 1, stdout: "", stderr: error.message }) + }) + child.on("close", (code) => { + resolve({ + code: code ?? 1, + stdout: Buffer.concat(out).toString("utf8"), + stderr: Buffer.concat(err).toString("utf8"), + }) }) }) - }) + return this.semaphore ? this.semaphore.run(invoke) : invoke() } } diff --git a/packages/kilo-vscode/src/agent-manager/GitStatsPoller.ts b/packages/kilo-vscode/src/agent-manager/GitStatsPoller.ts index 301261d137e..2cde458d432 100644 --- a/packages/kilo-vscode/src/agent-manager/GitStatsPoller.ts +++ b/packages/kilo-vscode/src/agent-manager/GitStatsPoller.ts @@ -3,6 +3,7 @@ import * as path from "path" import type { KiloClient, FileDiff } from "@kilocode/sdk/v2/client" import { remoteRef, type Worktree } from "./WorktreeStateManager" import type { GitOps } from "./GitOps" +import type { Semaphore } from "./semaphore" import { normalizePath } from "./git-import" export interface WorktreeStats { @@ -45,6 +46,8 @@ interface GitStatsPollerOptions { onWorktreePresence?: (result: WorktreePresenceResult) => void log: (...args: unknown[]) => void intervalMs?: number + /** Shared concurrency gate for child process spawning. */ + semaphore?: Semaphore } export class GitStatsPoller { @@ -154,15 +157,20 @@ export class GitStatsPoller { return } + // Gate the HTTP diffSummary call through the semaphore but NOT the + // aheadBehind call — that goes through GitOps.raw() which already + // acquires the same semaphore. Wrapping both would deadlock. + const gate = this.options.semaphore + const diff = (dir: string, base: string) => { + const invoke = () => client.worktree.diffSummary({ directory: dir, base }, { throwOnError: true }) + return gate ? gate.run(invoke) : invoke() + } const stats = ( await Promise.all( active.map(async (wt) => { try { const base = remoteRef(wt) - const [{ data: diffs }, ab] = await Promise.all([ - client.worktree.diffSummary({ directory: wt.path, base }, { throwOnError: true }), - this.git.aheadBehind(wt.path, base), - ]) + const [{ data: diffs }, ab] = await Promise.all([diff(wt.path, base), this.git.aheadBehind(wt.path, base)]) const files = diffs.length const additions = diffs.reduce((sum: number, diff: FileDiff) => sum + diff.additions, 0) const deletions = diffs.reduce((sum: number, diff: FileDiff) => sum + diff.deletions, 0) @@ -260,8 +268,10 @@ export class GitStatsPoller { try { if (base && client) { this.options.log(`Local stats: using HTTP client with base=${base}`) + const gate = this.options.semaphore + const invoke = () => client.worktree.diffSummary({ directory: root, base }, { throwOnError: true }) const [{ data: diffs }, ab] = await Promise.all([ - client.worktree.diffSummary({ directory: root, base }, { throwOnError: true }), + gate ? gate.run(invoke) : invoke(), this.git.aheadBehind(root, base), ]) files = diffs.length diff --git a/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts b/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts index 6ec85c11ea1..f655616b96e 100644 --- a/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts +++ b/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts @@ -1,7 +1,9 @@ +import type { ExecFileOptionsWithStringEncoding } from "child_process" 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" +import type { Semaphore } from "./semaphore" interface PRStatusPollerOptions { getWorktrees: () => Worktree[] @@ -9,6 +11,8 @@ interface PRStatusPollerOptions { onStatus: (worktreeId: string, pr: PRStatus | null, error?: "gh_missing" | "gh_auth" | "fetch_failed") => void log: (...args: unknown[]) => void intervalMs?: number + /** Shared concurrency gate for child process spawning. */ + semaphore?: Semaphore } const GH_PROBE_TTL = 300_000 // 5 minutes — gh installation state rarely changes at runtime @@ -33,9 +37,21 @@ export class PRStatusPoller { private prCache = new Map() private lastFullSync = 0 // timestamp of last full (all-worktree) sync private readonly intervalMs: number + private readonly semaphore: Semaphore | undefined constructor(private readonly options: PRStatusPollerOptions) { this.intervalMs = options.intervalMs ?? 15_000 + this.semaphore = options.semaphore + } + + /** Run a command through the shared concurrency gate (when configured). */ + private shell( + cmd: string, + args: string[], + options?: Omit, + ): Promise<{ stdout: string; stderr: string }> { + const invoke = () => execWithShellEnv(cmd, args, options) + return this.semaphore ? this.semaphore.run(invoke) : invoke() } setEnabled(enabled: boolean): void { @@ -140,7 +156,7 @@ export class PRStatusPoller { return this.ghAvailable } try { - await execWithShellEnv("gh", ["--version"], { timeout: 5_000 }) + await this.shell("gh", ["--version"], { timeout: 5_000 }) this.ghAvailable = true } catch { this.ghAvailable = false @@ -279,7 +295,7 @@ export class PRStatusPoller { if (branch) args.push(branch) args.push("--json", PRStatusPoller.PR_JSON_FIELDS) - const { stdout } = await execWithShellEnv("gh", args, { cwd, timeout: 15_000 }) + const { stdout } = await this.shell("gh", args, { cwd, timeout: 15_000 }) return parsePRResult(stdout) } catch (err) { const msg = err instanceof Error ? err.message : String(err) @@ -291,11 +307,11 @@ export class PRStatusPoller { /** 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 { stdout: sha } = await this.shell("git", ["rev-parse", "HEAD"], { cwd, timeout: 5_000 }) const head = sha.trim() if (!head) return null - const { stdout } = await execWithShellEnv( + const { stdout } = await this.shell( "gh", [ "pr", @@ -337,7 +353,7 @@ export class PRStatusPoller { items: PRCheck[] }> { try { - const { stdout } = await execWithShellEnv( + const { stdout } = await this.shell( "gh", ["pr", "checks", String(prNumber), "--json", "name,state,link,startedAt,completedAt"], { cwd, timeout: 15_000 }, @@ -375,7 +391,7 @@ export class PRStatusPoller { if (this.cachedRepo && this.cachedRepo.cwd === cwd) { return this.cachedRepo } - const { stdout } = await execWithShellEnv("gh", ["repo", "view", "--json", "owner,name"], { + const { stdout } = await this.shell("gh", ["repo", "view", "--json", "owner,name"], { cwd, timeout: 10_000, }) @@ -415,7 +431,7 @@ export class PRStatusPoller { } }` - const { stdout } = await execWithShellEnv( + const { stdout } = await this.shell( "gh", [ "api", diff --git a/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts b/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts index 15d5d754d7e..03146dc49a6 100644 --- a/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts +++ b/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts @@ -7,6 +7,7 @@ import type { Worktree } from "./WorktreeStateManager" import type { AgentManagerOutMessage, PRStatus } from "./types" import type { Disposable } from "./host" +import type { Semaphore } from "./semaphore" import { PRStatusPoller } from "./PRStatusPoller" interface PRBridgeHost { @@ -17,6 +18,7 @@ interface PRBridgeHost { hasPersistedPR(id: string): boolean openExternal(url: string): void log(...args: unknown[]): void + semaphore?: Semaphore } /** Minimal panel surface needed by the bridge (subset of PanelContext). */ @@ -43,6 +45,7 @@ export class PRStatusBridge { hasPersistedPR: (id: string) => boolean openExternal: (url: string) => void log: (...args: unknown[]) => void + semaphore?: Semaphore }): PRStatusBridge { return new PRStatusBridge(opts) } @@ -85,6 +88,7 @@ function bridgePollerOpts(bridge: PRStatusBridge, host: PRBridgeHost) { return { getWorktrees: () => host.getWorktrees(), getWorkspaceRoot: () => host.getWorkspaceRoot(), + semaphore: host.semaphore, 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 diff --git a/packages/kilo-vscode/src/agent-manager/semaphore.ts b/packages/kilo-vscode/src/agent-manager/semaphore.ts new file mode 100644 index 00000000000..37f3ab9cdd2 --- /dev/null +++ b/packages/kilo-vscode/src/agent-manager/semaphore.ts @@ -0,0 +1,41 @@ +/** + * Bounded-concurrency gate for git/gh child processes. + * + * Shared across GitOps and PRStatusPoller so that all polling loops + * (GitStatsPoller, PRStatusPoller, diff watcher) compete for the same + * slots. Prevents process storms when many worktrees are active. + */ +export class Semaphore { + private running = 0 + private readonly pending: (() => void)[] = [] + + constructor(private readonly limit: number) {} + + async run(fn: () => Promise): Promise { + await this.acquire() + try { + return await fn() + } finally { + this.release() + } + } + + private acquire(): Promise { + if (this.running < this.limit) { + this.running++ + return Promise.resolve() + } + return new Promise((resolve) => { + this.pending.push(() => { + this.running++ + resolve() + }) + }) + } + + private release(): void { + this.running-- + const next = this.pending.shift() + if (next) next() + } +} diff --git a/packages/kilo-vscode/tests/unit/git-ops.test.ts b/packages/kilo-vscode/tests/unit/git-ops.test.ts index 64f0b78c85a..bd56efa8274 100644 --- a/packages/kilo-vscode/tests/unit/git-ops.test.ts +++ b/packages/kilo-vscode/tests/unit/git-ops.test.ts @@ -3,9 +3,10 @@ import * as fs from "fs/promises" import * as os from "os" import * as nodePath from "path" import { GitOps } from "../../src/agent-manager/GitOps" +import { Semaphore } from "../../src/agent-manager/semaphore" -function ops(handler: (args: string[], cwd: string) => Promise): GitOps { - return new GitOps({ log: () => undefined, runGit: handler }) +function ops(handler: (args: string[], cwd: string) => Promise, semaphore?: Semaphore): GitOps { + return new GitOps({ log: () => undefined, runGit: handler, semaphore }) } function sleep(ms: number): Promise { @@ -556,4 +557,37 @@ describe("GitOps", () => { expect(git.disposed).toBe(true) }) }) + + describe("semaphore integration", () => { + it("limits concurrent raw() calls", async () => { + let running = 0 + let peak = 0 + const sem = new Semaphore(2) + const git = ops(async () => { + running++ + peak = Math.max(peak, running) + await sleep(10) + running-- + return "ok" + }, sem) + + await Promise.all(Array.from({ length: 6 }, () => git.currentBranch("/repo"))) + expect(peak).toBe(2) + }) + + it("works without a semaphore (no gating)", async () => { + let running = 0 + let peak = 0 + const git = ops(async () => { + running++ + peak = Math.max(peak, running) + await sleep(10) + running-- + return "ok" + }) + + await Promise.all(Array.from({ length: 4 }, () => git.currentBranch("/repo"))) + expect(peak).toBe(4) + }) + }) }) diff --git a/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts b/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts index 53176ffccb9..2df698e3d0e 100644 --- a/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts +++ b/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts @@ -5,6 +5,7 @@ import * as path from "path" import type { KiloClient } from "@kilocode/sdk/v2/client" import { GitStatsPoller, type WorktreePresenceResult } from "../../src/agent-manager/GitStatsPoller" import { GitOps } from "../../src/agent-manager/GitOps" +import { Semaphore } from "../../src/agent-manager/semaphore" import type { Worktree } from "../../src/agent-manager/WorktreeStateManager" function sleep(ms: number): Promise { @@ -430,4 +431,55 @@ describe("GitStatsPoller", () => { const fetches = commands.filter((cmd) => cmd[0] === "fetch") expect(fetches.length).toBe(0) }) + + it("limits concurrent diffSummary calls when semaphore is provided", async () => { + let running = 0 + let peak = 0 + let ticks = 0 + const sem = new Semaphore(2) + + const client = { + worktree: { + diffSummary: async () => { + running++ + peak = Math.max(peak, running) + await sleep(20) + running-- + return { data: diff(1, 0) } + }, + }, + } as unknown as KiloClient + + // Wire the SAME semaphore into GitOps to prove there's no deadlock — + // aheadBehind acquires the semaphore independently, not nested inside + // the diffSummary gate. + const wts = Array.from({ length: 5 }, (_, i) => worktree(String(i))) + const poller = new GitStatsPoller({ + getWorktrees: () => wts, + getWorkspaceRoot: () => undefined, + getClient: () => client, + onStats: () => { + ticks++ + }, + onLocalStats: () => undefined, + log: () => undefined, + intervalMs: 5, + semaphore: sem, + git: new GitOps({ + log: () => undefined, + semaphore: sem, + runGit: async (args) => { + if (args[0] === "rev-list" && args[1] === "--left-right") return "0\t0" + return "" + }, + }), + }) + + poller.setEnabled(true) + await waitFor(() => ticks >= 1) + poller.stop() + + // Only diffSummary calls are tracked — they should be bounded. + expect(peak).toBeLessThanOrEqual(2) + }) }) diff --git a/packages/kilo-vscode/tests/unit/semaphore.test.ts b/packages/kilo-vscode/tests/unit/semaphore.test.ts new file mode 100644 index 00000000000..697ba146b21 --- /dev/null +++ b/packages/kilo-vscode/tests/unit/semaphore.test.ts @@ -0,0 +1,102 @@ +import { describe, it, expect } from "bun:test" +import { Semaphore } from "../../src/agent-manager/semaphore" + +function delay(ms: number): Promise { + return new Promise((resolve) => setTimeout(resolve, ms)) +} + +describe("Semaphore", () => { + it("runs tasks up to the concurrency limit", async () => { + const sem = new Semaphore(2) + let running = 0 + let peak = 0 + + const task = () => + sem.run(async () => { + running++ + peak = Math.max(peak, running) + await delay(50) + running-- + }) + + await Promise.all([task(), task(), task(), task(), task()]) + expect(peak).toBe(2) + expect(running).toBe(0) + }) + + it("returns the value produced by the function", async () => { + const sem = new Semaphore(1) + const result = await sem.run(async () => 42) + expect(result).toBe(42) + }) + + it("propagates rejections without blocking the queue", async () => { + const sem = new Semaphore(1) + const order: string[] = [] + + const failing = sem.run(async () => { + order.push("fail-start") + throw new Error("boom") + }) + + const passing = sem.run(async () => { + order.push("pass-start") + return "ok" + }) + + await expect(failing).rejects.toThrow("boom") + expect(await passing).toBe("ok") + expect(order).toEqual(["fail-start", "pass-start"]) + }) + + it("processes queued tasks in FIFO order", async () => { + const sem = new Semaphore(1) + const order: number[] = [] + + // First task holds the slot while 2 and 3 queue + const t1 = sem.run(async () => { + order.push(1) + await delay(50) + }) + const t2 = sem.run(async () => { + order.push(2) + }) + const t3 = sem.run(async () => { + order.push(3) + }) + + await Promise.all([t1, t2, t3]) + expect(order).toEqual([1, 2, 3]) + }) + + it("allows full concurrency when limit exceeds task count", async () => { + const sem = new Semaphore(10) + let running = 0 + let peak = 0 + + const task = () => + sem.run(async () => { + running++ + peak = Math.max(peak, running) + await delay(30) + running-- + }) + + await Promise.all([task(), task(), task()]) + expect(peak).toBe(3) + }) + + it("releases the slot on synchronous throw", async () => { + const sem = new Semaphore(1) + + await expect( + sem.run(() => { + throw new Error("sync") + }), + ).rejects.toThrow("sync") + + // Slot is free — next task should run immediately + const result = await sem.run(async () => "recovered") + expect(result).toBe("recovered") + }) +}) From da6dcfbf59b2b2f249c8157721cb50a45ad9143e Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 9 Apr 2026 18:39:16 +0200 Subject: [PATCH 55/58] fix(agent-manager): worktree setup overlay stuck when using custom base branch (#7542) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit onCreateMultiVersion was missing worktreeId in calls to runSetupScriptForWorktree, createSessionInWorktree, and notifyWorktreeReady. The webview tracks setup state by worktreeId, so without it the busy overlay could never be cleared — blocking all interaction with the worktree permanently. Also declares the kilo-worktree-setup task type in package.json and catches executeTask failures gracefully to prevent VS Code from surfacing its own error notification for the undeclared task type. --- packages/kilo-vscode/package.json | 11 +++++++++++ .../src/agent-manager/AgentManagerProvider.ts | 7 ++++--- packages/kilo-vscode/src/agent-manager/task-runner.ts | 11 ++++++++++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json index d8c72aec7c8..8fcd0ce742a 100644 --- a/packages/kilo-vscode/package.json +++ b/packages/kilo-vscode/package.json @@ -50,6 +50,17 @@ ], "main": "./dist/extension.js", "contributes": { + "taskDefinitions": [ + { + "type": "kilo-worktree-setup", + "properties": { + "script": { + "type": "string", + "description": "The setup script command to execute" + } + } + } + ], "viewsContainers": { "activitybar": [ { diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts index 1c6f285a539..db6f79add15 100644 --- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts +++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts @@ -927,9 +927,9 @@ export class AgentManagerProvider implements Disposable { continue } - await this.runSetupScriptForWorktree(wt.result.path, wt.result.branch) + await this.runSetupScriptForWorktree(wt.result.path, wt.result.branch, wt.worktree.id) - const session = await this.createSessionInWorktree(wt.result.path, wt.result.branch) + const session = await this.createSessionInWorktree(wt.result.path, wt.result.branch, wt.worktree.id) if (!session) { const state = this.getStateManager() const manager = this.getWorktreeManager() @@ -942,7 +942,7 @@ export class AgentManagerProvider implements Disposable { const state = this.getStateManager()! state.addSession(session.id, wt.worktree.id) this.registerWorktreeSession(session.id, wt.result.path) - this.notifyWorktreeReady(session.id, wt.result) + this.notifyWorktreeReady(session.id, wt.result, wt.worktree.id) // Set the per-version model immediately so the UI selector reflects // the correct model as soon as the worktree appears, before Phase 2. @@ -1420,6 +1420,7 @@ export class AgentManagerProvider implements Disposable { status: "error", message: `Setup script failed: ${msg}`, branch, + worktreeId, }) } } diff --git a/packages/kilo-vscode/src/agent-manager/task-runner.ts b/packages/kilo-vscode/src/agent-manager/task-runner.ts index 0c9e7fa7c46..1329939e274 100644 --- a/packages/kilo-vscode/src/agent-manager/task-runner.ts +++ b/packages/kilo-vscode/src/agent-manager/task-runner.ts @@ -28,7 +28,16 @@ export async function executeVscodeTask(config: SetupTaskConfig): Promise { let done = false From 4d6ae2454959fdb3a914ca86242ad578d4110921 Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 9 Apr 2026 19:00:35 +0200 Subject: [PATCH 56/58] fix(agent-manager): persist non-worktree sessions to agent-manager.json (#7928) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Non-worktree sessions (opened in the Local tab) were only stored in vscode.setState() and lost when the Agent Manager panel was closed. Now they are written to agent-manager.json as ManagedSession entries with worktreeId=null. On startup, initializeState reads them back and the webview restores them as local tabs. - Add persistSession/forgetSession messages (webview → extension) - Update openLocally handler to set worktreeId=null via moveSession - Extract restoreLocalSessions() helper with unit tests - Allow moveSession() to accept null worktreeId Closes #7801 --- .../src/agent-manager/AgentManagerProvider.ts | 32 ++++-- .../src/agent-manager/WorktreeStateManager.ts | 6 +- .../kilo-vscode/src/agent-manager/types.ts | 14 +++ .../tests/unit/agent-manager-arch.test.ts | 2 + .../kilo-vscode/tests/unit/navigate.test.ts | 104 +++++++++++++++++- .../tests/unit/worktree-state-manager.test.ts | 9 ++ .../agent-manager/AgentManagerApp.tsx | 34 ++++-- .../webview-ui/agent-manager/navigate.ts | 48 ++++++++ .../webview-ui/src/types/messages.ts | 14 +++ 9 files changed, 235 insertions(+), 28 deletions(-) diff --git a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts index db6f79add15..60c2383dbab 100644 --- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts +++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts @@ -201,18 +201,13 @@ export class AgentManagerProvider implements Disposable { this.host.refreshGit() } - // Do not auto-remove stale worktrees on load. - // Presence checks run in the shared poller and require explicit user cleanup. - - // Register all worktree sessions with the session provider - for (const worktree of state.getWorktrees()) { - for (const session of state.getSessions(worktree.id)) { - this.panel?.sessions.setSessionDirectory(session.id, worktree.path) - this.panel?.sessions.trackSession(session.id) + for (const wt of state.getWorktrees()) { + for (const s of state.getSessions(wt.id)) { + this.panel?.sessions.setSessionDirectory(s.id, wt.path) + this.panel?.sessions.trackSession(s.id) } } - - // Push full state to webview + for (const s of state.getSessions()) if (!s.worktreeId) this.panel?.sessions.trackSession(s.id) this.pushState() // Refresh sessions so worktree sessions appear in the list @@ -242,8 +237,12 @@ export class AgentManagerProvider implements Disposable { if (m.type === "agentManager.removeStaleWorktree") return this.onRemoveStaleWorktree(m.worktreeId) if (m.type === "agentManager.promoteSession") return this.onPromoteSession(m.sessionId) if (m.type === "agentManager.openLocally") { - if (!this.panel) return null - this.panel.sessions.clearSessionDirectory(m.sessionId) + this.panel?.sessions.clearSessionDirectory(m.sessionId) + const st = this.getStateManager() + if (st?.getSession(m.sessionId)) { + st.moveSession(m.sessionId, null) + this.pushState() + } return null } if (m.type === "continueInWorktree") { @@ -255,6 +254,15 @@ export class AgentManagerProvider implements Disposable { if (m.type === "agentManager.addSessionToWorktree") return this.onAddSessionToWorktree(m.worktreeId) if (m.type === "agentManager.forkSession") return this.onForkSession(m.sessionId, m.worktreeId) if (m.type === "agentManager.closeSession") return this.onCloseSession(m.sessionId) + if (m.type === "agentManager.persistSession" || m.type === "agentManager.forgetSession") { + const persist = m.type === "agentManager.persistSession" + void this.stateReady?.then(() => { + const st = this.getStateManager() + if (st) + persist ? !st.getSession(m.sessionId) && st.addSession(m.sessionId, null) : st.removeSession(m.sessionId) + }) + return null + } if ((m.type === "sendMessage" || m.type === "sendCommand") && m.draftID && !m.sessionID) { this.activeSessionId = m.draftID } diff --git a/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts index 3765785d96f..9846596766e 100644 --- a/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts +++ b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts @@ -247,12 +247,12 @@ export class WorktreeStateManager { return session } - /** Move an existing session to a worktree (promotion). */ - moveSession(sessionId: string, worktreeId: string): void { + /** Move an existing session to a worktree (or back to local when null). */ + moveSession(sessionId: string, worktreeId: string | null): void { const session = this.sessions.get(sessionId) if (!session) return session.worktreeId = worktreeId - this.log(`Moved session ${sessionId} to worktree ${worktreeId}`) + this.log(`Moved session ${sessionId} to ${worktreeId ?? "local"}`) void this.save() } diff --git a/packages/kilo-vscode/src/agent-manager/types.ts b/packages/kilo-vscode/src/agent-manager/types.ts index d9d5d22c128..2dc76cc6a01 100644 --- a/packages/kilo-vscode/src/agent-manager/types.ts +++ b/packages/kilo-vscode/src/agent-manager/types.ts @@ -314,6 +314,18 @@ interface CloseSessionIn { sessionId: string } +/** Persist a non-worktree session to agent-manager.json (worktreeId = null). */ +interface PersistSessionIn { + type: "agentManager.persistSession" + sessionId: string +} + +/** Remove a non-worktree session from agent-manager.json. */ +interface ForgetSessionIn { + type: "agentManager.forgetSession" + sessionId: string +} + interface ConfigureSetupScriptIn { type: "agentManager.configureSetupScript" } @@ -594,6 +606,8 @@ export type AgentManagerInMessage = | OpenLocallyIn | AddSessionToWorktreeIn | CloseSessionIn + | PersistSessionIn + | ForgetSessionIn | ForkSessionIn | ConfigureSetupScriptIn | ShowTerminalIn 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 39cae416ec4..efcc33f8c3f 100644 --- a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts +++ b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts @@ -179,6 +179,8 @@ describe("Agent Manager Provider — onMessage routing", () => { "agentManager.addSessionToWorktree", "agentManager.forkSession", "agentManager.closeSession", + "agentManager.persistSession", + "agentManager.forgetSession", "agentManager.configureSetupScript", "agentManager.showTerminal", "agentManager.showLocalTerminal", diff --git a/packages/kilo-vscode/tests/unit/navigate.test.ts b/packages/kilo-vscode/tests/unit/navigate.test.ts index 219fb495b59..5adbb3abece 100644 --- a/packages/kilo-vscode/tests/unit/navigate.test.ts +++ b/packages/kilo-vscode/tests/unit/navigate.test.ts @@ -1,5 +1,11 @@ import { describe, it, expect } from "bun:test" -import { resolveNavigation, validateLocalSession, adjacentHint, LOCAL } from "../../webview-ui/agent-manager/navigate" +import { + resolveNavigation, + validateLocalSession, + adjacentHint, + restoreLocalSessions, + LOCAL, +} from "../../webview-ui/agent-manager/navigate" const ids = ["a", "b", "c", "d"] @@ -180,3 +186,99 @@ describe("adjacentHint", () => { expect(adjacentHint("b", "a", ["a", "b"], "prev", "next")).toBe("next") }) }) + +describe("restoreLocalSessions", () => { + const identity = (items: { id: string }[], _order: string[]) => items + const isPending = (id: string) => id.startsWith("pending-") + + // Simulates applyTabOrder: reorders items to match the order array + const reorder = (items: { id: string }[], order: string[]) => { + const lookup = new Map(items.map((item) => [item.id, item])) + const result: { id: string }[] = [] + for (const id of order) { + const item = lookup.get(id) + if (item) { + result.push(item) + lookup.delete(id) + } + } + for (const item of lookup.values()) result.push(item) + return result + } + + it("restores local sessions when current list is empty", () => { + const sessions = [ + { id: "s1", worktreeId: null }, + { id: "s2", worktreeId: null }, + ] + const result = restoreLocalSessions(sessions, [], undefined, isPending, identity) + expect(result).toEqual(["s1", "s2"]) + }) + + it("skips worktree-bound sessions", () => { + const sessions = [ + { id: "s1", worktreeId: "wt-1" }, + { id: "s2", worktreeId: null }, + { id: "s3", worktreeId: "wt-2" }, + ] + const result = restoreLocalSessions(sessions, [], undefined, isPending, identity) + expect(result).toEqual(["s2"]) + }) + + it("applies tab order on restore", () => { + const sessions = [ + { id: "s1", worktreeId: null }, + { id: "s2", worktreeId: null }, + { id: "s3", worktreeId: null }, + ] + const result = restoreLocalSessions(sessions, [], ["s3", "s1", "s2"], isPending, reorder) + expect(result).toEqual(["s3", "s1", "s2"]) + }) + + it("does not overwrite existing real sessions", () => { + const sessions = [ + { id: "s1", worktreeId: null }, + { id: "s2", worktreeId: null }, + ] + // Current already has real sessions — don't replace + const result = restoreLocalSessions(sessions, ["s1", "s2"], undefined, isPending, identity) + expect(result).toBeUndefined() + }) + + it("does restore when current only has pending tabs", () => { + const sessions = [ + { id: "s1", worktreeId: null }, + { id: "s2", worktreeId: null }, + ] + const result = restoreLocalSessions(sessions, ["pending-1"], undefined, isPending, identity) + expect(result).toEqual(["s1", "s2"]) + }) + + it("returns undefined when no local sessions and no tab order", () => { + const sessions = [{ id: "s1", worktreeId: "wt-1" }] + const result = restoreLocalSessions(sessions, [], undefined, isPending, identity) + expect(result).toBeUndefined() + }) + + it("applies tab order to existing sessions", () => { + const sessions = [{ id: "s1", worktreeId: null }] + const result = restoreLocalSessions(sessions, ["s2", "s1"], ["s1", "s2"], isPending, reorder) + expect(result).toEqual(["s1", "s2"]) + }) + + it("merges disk session missing from stale webview state", () => { + const sessions = [ + { id: "s1", worktreeId: null }, + { id: "s2", worktreeId: null }, + { id: "s3", worktreeId: null }, + ] + // webview state is stale: has s1, s2 but not s3 (debounce didn't fire) + const result = restoreLocalSessions(sessions, ["s1", "s2"], undefined, isPending, identity) + expect(result).toEqual(["s1", "s2", "s3"]) + }) + + it("returns undefined when no disk sessions and no tab order", () => { + const result = restoreLocalSessions([], [], undefined, isPending, identity) + expect(result).toBeUndefined() + }) +}) diff --git a/packages/kilo-vscode/tests/unit/worktree-state-manager.test.ts b/packages/kilo-vscode/tests/unit/worktree-state-manager.test.ts index 714cf01522d..42da79bef26 100644 --- a/packages/kilo-vscode/tests/unit/worktree-state-manager.test.ts +++ b/packages/kilo-vscode/tests/unit/worktree-state-manager.test.ts @@ -96,6 +96,15 @@ describe("WorktreeStateManager", () => { expect(manager.getSession("s1")?.worktreeId).toBe(wt2.id) }) + it("moves session back to local (null worktreeId)", () => { + const wt = manager.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + manager.addSession("s1", wt.id) + expect(manager.getSession("s1")?.worktreeId).toBe(wt.id) + + manager.moveSession("s1", null) + expect(manager.getSession("s1")?.worktreeId).toBeNull() + }) + it("moveSession is a no-op for nonexistent session", () => { manager.moveSession("nonexistent", "wt-1") expect(manager.getSessions()).toHaveLength(0) diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx index d7336d3a299..62fa0d4625b 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx @@ -81,7 +81,7 @@ import { NewWorktreeDialog } from "./NewWorktreeDialog" import { LanguageBridge, DataBridge } from "../src/App" import { useLanguage } from "../src/context/language" import { formatRelativeDate } from "../src/utils/date" -import { validateLocalSession, nextSelectionAfterDelete, adjacentHint, LOCAL } from "./navigate" +import { validateLocalSession, nextSelectionAfterDelete, adjacentHint, restoreLocalSessions, LOCAL } from "./navigate" import { reorderTabs, applyTabOrder, firstOrderedTitle } from "./tab-order" import { ConstrainDragYAxis, SortableReviewTab, SortableTab } from "./sortable-tab" import { DiffPanel } from "./DiffPanel" @@ -672,8 +672,13 @@ const AgentManagerContent: Component = () => { const all = session.sessions() if (all.length === 0) return // sessions not loaded yet const ids = all.map((s) => s.id) - const valid = localSessionIDs().filter((lid) => isPending(lid) || validateLocalSession(lid, ids)) - if (valid.length !== localSessionIDs().length) { + const prev = localSessionIDs() + const valid = prev.filter((lid) => isPending(lid) || validateLocalSession(lid, ids)) + if (valid.length !== prev.length) { + const removed = prev.filter((lid) => !isPending(lid) && !valid.includes(lid)) + for (const id of removed) { + vscode.postMessage({ type: "agentManager.forgetSession", sessionId: id }) + } setLocalSessionIDs(valid) } }) @@ -1120,6 +1125,7 @@ const AgentManagerContent: Component = () => { setLocalSessionIDs((prev) => [...prev, created.session.id]) setSelection(LOCAL) } + vscode.postMessage({ type: "agentManager.persistSession", sessionId: created.session.id }) session.selectSession(created.session.id) }) @@ -1194,6 +1200,7 @@ const AgentManagerContent: Component = () => { if (idx >= 0) return [...prev.slice(0, idx + 1), ev.sessionId, ...prev.slice(idx + 1)] return [...prev, ev.sessionId] }) + vscode.postMessage({ type: "agentManager.persistSession", sessionId: ev.sessionId }) } session.selectSession(ev.sessionId) } @@ -1232,15 +1239,15 @@ const AgentManagerContent: Component = () => { const ms = state.sessions.find((s) => s.id === current) if (ms?.worktreeId) setSelection(ms.worktreeId) } - // Recover local tab order from persisted state - const localOrder = state.tabOrder?.[LOCAL] - if (localOrder && localSessionIDs().length > 0) { - const reordered = applyTabOrder( - localSessionIDs().map((id) => ({ id })), - localOrder, - ).map((item) => item.id) - setLocalSessionIDs(reordered) - } + // Restore local session IDs from persisted state (sessions with no worktreeId) + const restored = restoreLocalSessions( + state.sessions, + localSessionIDs(), + state.tabOrder?.[LOCAL], + isPending, + applyTabOrder, + ) + if (restored) setLocalSessionIDs(restored) // Recover sessions collapsed state from extension-persisted state if (state.sessionsCollapsed !== undefined) setSessionsCollapsed(state.sessionsCollapsed) // Clear busy state for worktrees that have been removed @@ -1891,6 +1898,9 @@ const AgentManagerContent: Component = () => { } if (pending || localSet().has(sessionId)) { setLocalSessionIDs((prev) => prev.filter((id) => id !== sessionId)) + if (!pending) { + vscode.postMessage({ type: "agentManager.forgetSession", sessionId }) + } } else { vscode.postMessage({ type: "agentManager.closeSession", sessionId }) } diff --git a/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts b/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts index 27c38f44900..d611fc42d7e 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts @@ -74,6 +74,54 @@ export function adjacentHint( return "" } +/** + * Compute which session IDs should populate the "local" tab on state restore. + * + * Managed sessions with `worktreeId === null` are non-worktree sessions that + * were persisted to agent-manager.json. On restore we use them as the local + * tab list, optionally applying a persisted tab order. + * + * @param sessions - All managed sessions from agent-manager.json + * @param current - The webview's current localSessionIDs (may contain pending tabs) + * @param tabOrder - Persisted tab order for the "local" key, if any + * @param isPending - Predicate to identify pending (not-yet-created) tab IDs + * @param applyOrder - Reorder helper: (items, order) → ordered items + */ +export function restoreLocalSessions( + sessions: { id: string; worktreeId: string | null }[], + current: string[], + tabOrder: string[] | undefined, + isPending: (id: string) => boolean, + applyOrder: (items: { id: string }[], order: string[]) => { id: string }[], +): string[] | undefined { + const locals = sessions.filter((s) => !s.worktreeId).map((s) => s.id) + const real = current.filter((id) => !isPending(id)) + + // First restore: current has no real sessions but disk has some + if (locals.length > 0 && real.length === 0) { + if (!tabOrder) return locals + return applyOrder( + locals.map((id) => ({ id })), + tabOrder, + ).map((item) => item.id) + } + + // Merge any disk-persisted sessions missing from current (e.g. vscode.setState + // debounce didn't fire before close, but persistSession already wrote to disk) + const missing = locals.filter((id) => !current.includes(id)) + const merged = missing.length > 0 ? [...current, ...missing] : current + + // Apply tab order if present + if (tabOrder && merged.length > 0) { + return applyOrder( + merged.map((id) => ({ id })), + tabOrder, + ).map((item) => item.id) + } + + return missing.length > 0 ? merged : undefined +} + /** * After removing a worktree, pick the nearest remaining sidebar neighbor. * Order: the worktree just below → the one above → LOCAL. diff --git a/packages/kilo-vscode/webview-ui/src/types/messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages.ts index 4f5b214caba..96619e2f956 100644 --- a/packages/kilo-vscode/webview-ui/src/types/messages.ts +++ b/packages/kilo-vscode/webview-ui/src/types/messages.ts @@ -1913,6 +1913,18 @@ export interface CloseSessionRequest { sessionId: string } +/** Persist a non-worktree session to agent-manager.json (worktreeId = null). */ +export interface PersistSessionRequest { + type: "agentManager.persistSession" + sessionId: string +} + +/** Remove a non-worktree session from agent-manager.json. */ +export interface ForgetSessionRequest { + type: "agentManager.forgetSession" + sessionId: string +} + // Rename a worktree's display label export interface RenameWorktreeRequest { type: "agentManager.renameWorktree" @@ -2377,6 +2389,8 @@ export type WebviewMessage = | AddSessionToWorktreeRequest | ForkSessionRequest | CloseSessionRequest + | PersistSessionRequest + | ForgetSessionRequest | RenameWorktreeRequest | TelemetryRequest | RequestRepoInfoMessage From def14eb2e66df80ce693d9ebcbf4443e1871f758 Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 9 Apr 2026 19:00:58 +0200 Subject: [PATCH 57/58] fix(agent-manager): preserve sections missing from worktreeOrder during move and reorder (#8595) Sections could silently disappear from worktreeOrder when drag-and-drop sent a setWorktreeOrder call that omitted them. This made moveSection a no-op for the affected section since it relies on worktreeOrder position. Fix both paths: setWorktreeOrder now appends any missing sections/ungrouped worktrees, and moveSection self-heals by adding the section before swapping. --- .../src/agent-manager/WorktreeStateManager.ts | 10 +++++++++ .../unit/worktree-state-sections.test.ts | 21 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts index 9846596766e..3b051b3680d 100644 --- a/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts +++ b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts @@ -304,6 +304,11 @@ export class WorktreeStateManager { if (!wt.sectionId) top.add(wt.id) } this.worktreeOrder = order.filter((id) => top.has(id)) + // Append any sections/ungrouped worktrees missing from the incoming order + const present = new Set(this.worktreeOrder) + for (const id of top) { + if (!present.has(id)) this.worktreeOrder.push(id) + } void this.save() } @@ -380,6 +385,11 @@ export class WorktreeStateManager { } moveSection(id: string, dir: -1 | 1): void { + // Ensure the section is in worktreeOrder (it may be missing if drag-and-drop + // overwrote the order before this section was tracked) + if (this.sections.has(id) && !this.worktreeOrder.includes(id)) { + this.worktreeOrder.push(id) + } const top = this.worktreeOrder.filter((item) => { if (this.sections.has(item)) return true const wt = this.worktrees.get(item) diff --git a/packages/kilo-vscode/tests/unit/worktree-state-sections.test.ts b/packages/kilo-vscode/tests/unit/worktree-state-sections.test.ts index e83ea943dc4..7759537e2b7 100644 --- a/packages/kilo-vscode/tests/unit/worktree-state-sections.test.ts +++ b/packages/kilo-vscode/tests/unit/worktree-state-sections.test.ts @@ -122,6 +122,17 @@ describe("WorktreeStateManager sections", () => { }) }) + describe("setWorktreeOrder", () => { + it("preserves sections missing from incoming order", () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + const a = mgr.addSection("A", null) + const b = mgr.addSection("B", null) + // Simulate webview sending an order that omits section B + mgr.setWorktreeOrder([wt.id, a.id]) + expect(mgr.getWorktreeOrder()).toContain(b.id) + }) + }) + describe("moveToSection", () => { it("sets sectionId and removes from worktreeOrder", () => { const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) @@ -220,6 +231,16 @@ describe("WorktreeStateManager sections", () => { expect(mgr.getWorktree(wt2.id)?.sectionId).toBe(a.id) }) + it("moves a section that is missing from worktreeOrder", () => { + const a = mgr.addSection("A", null) + const b = mgr.addSection("B", null) + // Simulate a drag-and-drop that lost section B from the order + mgr.setWorktreeOrder([a.id]) + expect(mgr.getWorktreeOrder()).toEqual([a.id, b.id]) + mgr.moveSection(b.id, -1) + expect(mgr.getWorktreeOrder()).toEqual([b.id, a.id]) + }) + it("persists reordered sections across save/load", async () => { const a = mgr.addSection("A", null) const b = mgr.addSection("B", null) From 014f15cc0168a025f281954e82a3ea9f1a9e9025 Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 9 Apr 2026 19:01:27 +0200 Subject: [PATCH 58/58] fix(agent-manager): show helpful error when repo has no commits (#8648) Detect unborn branch state in defaultBranch() using git status and surface a user-friendly localized error instead of the raw 'Could not determine default branch' message. Adds no_commits error code and i18n strings for all 19 locales. --- .../kilo-vscode/src/agent-manager/WorktreeManager.ts | 9 +++++++++ packages/kilo-vscode/src/agent-manager/git-import.ts | 3 ++- packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts | 1 + packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts | 2 ++ packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts | 1 + .../kilo-vscode/webview-ui/agent-manager/i18n/zht.ts | 1 + 21 files changed, 46 insertions(+), 1 deletion(-) diff --git a/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts b/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts index 932e35e5604..5d6c92edf9a 100644 --- a/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts +++ b/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts @@ -858,6 +858,15 @@ export class WorktreeManager { this.log(`defaultBranch: branchLocal failed: ${e}`) } + // Check if this is an empty repo with no commits (unborn branch). + // rev-parse --verify HEAD exits non-zero only when HEAD has no target + // commit, which is the definitive test for an unborn branch. + try { + await this.git.raw(["rev-parse", "--verify", "HEAD"]) + } catch { + throw new Error("This repository has no commits yet. Create an initial commit before using worktrees.") + } + throw new Error("Could not determine default branch") } diff --git a/packages/kilo-vscode/src/agent-manager/git-import.ts b/packages/kilo-vscode/src/agent-manager/git-import.ts index 342a0448efd..ae3f2c37a73 100644 --- a/packages/kilo-vscode/src/agent-manager/git-import.ts +++ b/packages/kilo-vscode/src/agent-manager/git-import.ts @@ -29,7 +29,7 @@ interface WorktreeEntry { type PRErrorKind = "not_found" | "gh_missing" | "gh_auth" | "unknown" -export type WorktreeSetupErrorCode = "git_not_found" | "not_git_repo" | "lfs_missing" +export type WorktreeSetupErrorCode = "git_not_found" | "not_git_repo" | "lfs_missing" | "no_commits" export function parsePRUrl(url: string): PRUrlParts | null { let normalized = url.trim() @@ -158,5 +158,6 @@ export function classifyWorktreeError(msg: string): WorktreeSetupErrorCode | und if (msg.includes("ENOENT") || msg.includes("not found in PATH")) return "git_not_found" if (msg.includes("not a git repository")) return "not_git_repo" if (msg.includes("Git LFS") && msg.includes("not found")) return "lfs_missing" + if (msg.includes("no commits yet")) return "no_commits" return undefined } diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts index 87c01528170..3507d4b5fae 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts @@ -54,6 +54,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "افتح مجلدًا يحتوي على مستودع git لاستخدام مساحات العمل (worktrees).", "agentManager.setup.error.lfs_missing": "يستخدم هذا المستودع Git LFS، ولكن لم يتم العثور على git-lfs. يرجى تثبيت Git LFS.", + "agentManager.setup.error.no_commits": + "هذا المستودع لا يحتوي على أي التزامات (commits) بعد. قم بإنشاء التزام أولي قبل استخدام مساحات العمل (worktrees).", "agentManager.shortcuts.title": "اختصارات لوحة المفاتيح", "agentManager.shortcuts.category.sidebar": "الشريط الجانبي", "agentManager.shortcuts.category.tabs": "علامات التبويب", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts index 03e90cb135d..373c14da355 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts @@ -55,6 +55,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Abra uma pasta que contém um repositório git para usar worktrees.", "agentManager.setup.error.lfs_missing": "Este repositório usa Git LFS, mas o git-lfs não foi encontrado. Instale o Git LFS.", + "agentManager.setup.error.no_commits": + "Este repositório ainda não possui commits. Crie um commit inicial antes de usar worktrees.", "agentManager.shortcuts.title": "Atalhos de Teclado", "agentManager.shortcuts.category.sidebar": "Barra lateral", "agentManager.shortcuts.category.tabs": "Abas", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts index 2f3753a9483..6509b902aff 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts @@ -56,6 +56,8 @@ export const dict = { "Otvorite fasciklu koja sadrži git repozitorijum da biste koristili worktrees.", "agentManager.setup.error.lfs_missing": "Ovaj repozitorijum koristi Git LFS, ali git-lfs nije pronađen. Molimo instalirajte Git LFS.", + "agentManager.setup.error.no_commits": + "Ovaj repozitorijum još uvek nema commit-ova. Napravite početni commit pre korišćenja worktrees.", "agentManager.shortcuts.title": "Prečice na tastaturi", "agentManager.shortcuts.category.sidebar": "Bočna traka", "agentManager.shortcuts.category.tabs": "Kartice", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts index 5174719d101..cf9986d1c2c 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts @@ -55,6 +55,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Åbn en mappe, der indeholder et git-repository for at bruge worktrees.", "agentManager.setup.error.lfs_missing": "Dette repository bruger Git LFS, men git-lfs blev ikke fundet. Installer venligst Git LFS.", + "agentManager.setup.error.no_commits": + "Dette repository har ingen commits endnu. Opret et indledende commit før du bruger worktrees.", "agentManager.shortcuts.title": "Tastaturgenveje", "agentManager.shortcuts.category.sidebar": "Sidebjælke", "agentManager.shortcuts.category.tabs": "Faner", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts index ac293d54bf0..7c9c132783d 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts @@ -56,6 +56,8 @@ export const dict = { "Öffnen Sie einen Ordner, der ein Git-Repository enthält, um Worktrees zu verwenden.", "agentManager.setup.error.lfs_missing": "Dieses Repository verwendet Git LFS, aber git-lfs wurde nicht gefunden. Bitte installieren Sie Git LFS.", + "agentManager.setup.error.no_commits": + "Dieses Repository hat noch keine Commits. Erstellen Sie einen initialen Commit, bevor Sie Worktrees verwenden.", "agentManager.shortcuts.title": "Tastenkombinationen", "agentManager.shortcuts.category.sidebar": "Seitenleiste", "agentManager.shortcuts.category.tabs": "Tabs", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts index c2c4abe641f..22246d3671d 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts @@ -60,6 +60,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Open a folder that contains a git repository to use worktrees.", "agentManager.setup.error.lfs_missing": "This repository uses Git LFS, but git-lfs was not found. Please install Git LFS.", + "agentManager.setup.error.no_commits": + "This repository has no commits yet. Create an initial commit before using worktrees.", "agentManager.shortcuts.title": "Keyboard Shortcuts", "agentManager.shortcuts.category.sidebar": "Sidebar", "agentManager.shortcuts.category.tabs": "Tabs", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts index c601a14846c..587e51459db 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts @@ -55,6 +55,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Abra una carpeta que contenga un repositorio git para usar worktrees.", "agentManager.setup.error.lfs_missing": "Este repositorio usa Git LFS, pero no se encontró git-lfs. Por favor instale Git LFS.", + "agentManager.setup.error.no_commits": + "Este repositorio aún no tiene commits. Cree un commit inicial antes de usar worktrees.", "agentManager.shortcuts.title": "Atajos de teclado", "agentManager.shortcuts.category.sidebar": "Barra lateral", "agentManager.shortcuts.category.tabs": "Pestañas", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts index 015fe19aa82..758ad3ead5b 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts @@ -55,6 +55,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Ouvrez un dossier contenant un dépôt git pour utiliser les worktrees.", "agentManager.setup.error.lfs_missing": "Ce dépôt utilise Git LFS, mais git-lfs n'a pas été trouvé. Veuillez installer Git LFS.", + "agentManager.setup.error.no_commits": + "Ce dépôt n'a pas encore de commits. Créez un commit initial avant d'utiliser les worktrees.", "agentManager.shortcuts.title": "Raccourcis clavier", "agentManager.shortcuts.category.sidebar": "Barre latérale", "agentManager.shortcuts.category.tabs": "Onglets", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts index 942d4cb72ed..42a1872b725 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts @@ -55,6 +55,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "worktreesを使用するには、gitリポジトリを含むフォルダーを開いてください。", "agentManager.setup.error.lfs_missing": "このリポジトリはGit LFSを使用していますが、git-lfsが見つかりませんでした。Git LFSをインストールしてください。", + "agentManager.setup.error.no_commits": + "このリポジトリにはまだコミットがありません。worktreesを使用する前に最初のコミットを作成してください。", "agentManager.shortcuts.title": "キーボードショートカット", "agentManager.shortcuts.category.sidebar": "サイドバー", "agentManager.shortcuts.category.tabs": "タブ", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts index 4db3e4c0c26..f5cb353a880 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts @@ -55,6 +55,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "worktrees를 사용하려면 git 리포지토리가 포함된 폴더를 여세요.", "agentManager.setup.error.lfs_missing": "이 리포지토리는 Git LFS를 사용하지만 git-lfs를 찾을 수 없습니다. Git LFS를 설치하세요.", + "agentManager.setup.error.no_commits": + "이 리포지토리에는 아직 커밋이 없습니다. worktrees를 사용하기 전에 초기 커밋을 생성하세요.", "agentManager.shortcuts.title": "키보드 단축키", "agentManager.shortcuts.category.sidebar": "사이드바", "agentManager.shortcuts.category.tabs": "탭", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts index 61930b5fc93..b959ab89eab 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts @@ -60,6 +60,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Open een map die een git repository bevat om worktrees te gebruiken.", "agentManager.setup.error.lfs_missing": "Deze repository gebruikt Git LFS, maar git-lfs is niet gevonden. Installeer Git LFS.", + "agentManager.setup.error.no_commits": + "Deze repository heeft nog geen commits. Maak een initiële commit voordat je worktrees gebruikt.", "agentManager.shortcuts.title": "Sneltoetsen", "agentManager.shortcuts.category.sidebar": "Zijbalk", "agentManager.shortcuts.category.tabs": "Tabbladen", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts index 4a6afa5b85d..aa9bb3169cc 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts @@ -55,6 +55,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Åpne en mappe som inneholder et git-repositorium for å bruke worktrees.", "agentManager.setup.error.lfs_missing": "Dette repositoriet bruker Git LFS, men git-lfs ble ikke funnet. Vennligst installer Git LFS.", + "agentManager.setup.error.no_commits": + "Dette repositoriet har ingen commits ennå. Opprett en første commit før du bruker worktrees.", "agentManager.shortcuts.title": "Tastatursnarveier", "agentManager.shortcuts.category.sidebar": "Sidepanel", "agentManager.shortcuts.category.tabs": "Faner", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts index 3e5b8fcb485..f3d91353032 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts @@ -55,6 +55,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Otwórz folder zawierający repozytorium git, aby używać worktrees.", "agentManager.setup.error.lfs_missing": "To repozytorium używa Git LFS, ale nie znaleziono git-lfs. Zainstaluj Git LFS.", + "agentManager.setup.error.no_commits": + "To repozytorium nie ma jeszcze commitów. Utwórz początkowy commit przed użyciem worktrees.", "agentManager.shortcuts.title": "Skróty klawiszowe", "agentManager.shortcuts.category.sidebar": "Pasek boczny", "agentManager.shortcuts.category.tabs": "Karty", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts index 77280bb04da..17429113296 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts @@ -55,6 +55,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Откройте папку, содержащую репозиторий git, чтобы использовать worktrees.", "agentManager.setup.error.lfs_missing": "Этот репозиторий использует Git LFS, но git-lfs не найден. Пожалуйста, установите Git LFS.", + "agentManager.setup.error.no_commits": + "В этом репозитории еще нет коммитов. Создайте начальный коммит перед использованием worktrees.", "agentManager.shortcuts.title": "Сочетания клавиш", "agentManager.shortcuts.category.sidebar": "Боковая панель", "agentManager.shortcuts.category.tabs": "Вкладки", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts index 8db1a4f90f2..13611ae9b2f 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts @@ -53,6 +53,7 @@ export const dict = { "agentManager.setup.error.git_not_found": "ไม่ได้ติดตั้ง Git หรือไม่พบใน PATH โปรดติดตั้ง Git และรีสตาร์ท VS Code", "agentManager.setup.error.not_git_repo": "เปิดโฟลเดอร์ที่มีที่เก็บ git เพื่อใช้ worktrees", "agentManager.setup.error.lfs_missing": "ที่เก็บนี้ใช้ Git LFS แต่ไม่พบ git-lfs โปรดติดตั้ง Git LFS", + "agentManager.setup.error.no_commits": "ที่เก็บนี้ยังไม่มีการคอมมิต สร้างการคอมมิตเริ่มต้นก่อนใช้ worktrees", "agentManager.shortcuts.title": "ปุ่มลัดแป้นพิมพ์", "agentManager.shortcuts.category.sidebar": "แถบด้านข้าง", "agentManager.shortcuts.category.tabs": "แท็บ", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts index 3e4d0f27d50..74b8c5f681d 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts @@ -60,6 +60,8 @@ export const dict = { "agentManager.setup.error.not_git_repo": "Worktree'leri kullanmak için bir git deposu içeren bir klasör açın.", "agentManager.setup.error.lfs_missing": "Bu depo Git LFS kullanıyor, ancak git-lfs bulunamadı. Lütfen Git LFS'yi yükleyin.", + "agentManager.setup.error.no_commits": + "Bu depoda henüz commit bulunmuyor. Worktree'leri kullanmadan önce bir başlangıç commit'i oluşturun.", "agentManager.shortcuts.title": "Klavye Kısayolları", "agentManager.shortcuts.category.sidebar": "Kenar Çubuğu", "agentManager.shortcuts.category.tabs": "Sekmeler", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts index 3d22119285e..38a0fd6ae85 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts @@ -61,6 +61,8 @@ export const dict = { "Відкрийте папку, що містить git-репозиторій, щоб використовувати робочі дерева.", "agentManager.setup.error.lfs_missing": "Цей репозиторій використовує Git LFS, але git-lfs не знайдено. Будь ласка, встановіть Git LFS.", + "agentManager.setup.error.no_commits": + "У цьому репозиторії ще немає коммітів. Створіть початковий комміт перед використанням worktrees.", "agentManager.shortcuts.title": "Клавіатурні скорочення", "agentManager.shortcuts.category.sidebar": "Бічна панель", "agentManager.shortcuts.category.tabs": "Вкладки", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts index b444fa746c8..5034de070f7 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts @@ -53,6 +53,7 @@ export const dict = { "agentManager.setup.error.git_not_found": "未安装 Git 或在 PATH 中找不到 Git。请安装 Git 并重新启动 VS Code。", "agentManager.setup.error.not_git_repo": "打开一个包含 git 存储库的文件夹以使用 worktrees。", "agentManager.setup.error.lfs_missing": "此存储库使用 Git LFS，但找不到 git-lfs。请安装 Git LFS。", + "agentManager.setup.error.no_commits": "此存储库尚无提交。在使用 worktrees 之前，请创建一个初始提交。", "agentManager.shortcuts.title": "键盘快捷键", "agentManager.shortcuts.category.sidebar": "侧边栏", "agentManager.shortcuts.category.tabs": "标签页", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts index 2ec24fe2791..db73573a23b 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts @@ -53,6 +53,7 @@ export const dict = { "agentManager.setup.error.git_not_found": "未安裝 Git 或在 PATH 中找不到 Git。請安裝 Git 並重新啟動 VS Code。", "agentManager.setup.error.not_git_repo": "開啟一個包含 git 儲存庫的資料夾以使用 worktrees。", "agentManager.setup.error.lfs_missing": "此儲存庫使用 Git LFS，但找不到 git-lfs。請安裝 Git LFS。", + "agentManager.setup.error.no_commits": "此儲存庫尚無提交。在使用 worktrees 之前，請建立一個初始提交。", "agentManager.shortcuts.title": "鍵盤快捷鍵", "agentManager.shortcuts.category.sidebar": "側邊欄", "agentManager.shortcuts.category.tabs": "分頁",