diff --git a/.gitattributes b/.gitattributes index d351e0fc83..3044164203 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,3 +18,7 @@ packages/kilo-vscode/tests/**/*.png filter=lfs diff=lfs merge=lfs -text **/i18n/parity.test.ts linguist-generated=false packages/kilo-i18n/src/*.ts linguist-generated=true packages/kilo-i18n/src/en.ts linguist-generated=false + +# Auto-generated CLI reference docs +packages/kilo-docs/markdoc/partials/cli-commands-table.md linguist-generated=true +packages/kilo-docs/pages/code-with-ai/platforms/cli-reference.md linguist-generated=true diff --git a/.github/workflows/check-opencode-annotations.yml b/.github/workflows/check-opencode-annotations.yml new file mode 100644 index 0000000000..b2fc705dae --- /dev/null +++ b/.github/workflows/check-opencode-annotations.yml @@ -0,0 +1,32 @@ +name: Check opencode annotations + +on: + pull_request: + paths: + - "packages/opencode/**" + - "script/check-opencode-annotations.ts" + - ".github/workflows/check-opencode-annotations.yml" + workflow_dispatch: + +jobs: + check-annotations: + name: Check kilocode_change annotations + if: github.repository == 'Kilo-Org/kilocode' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha || github.sha }} + fetch-depth: 0 + + - uses: oven-sh/setup-bun@v2 + + - name: Check kilocode_change annotations in shared opencode files + env: + BASE_SHA: ${{ github.event.pull_request.base.sha }} + run: | + if [ -n "$BASE_SHA" ]; then + bun run script/check-opencode-annotations.ts --base "$BASE_SHA" + else + echo "No PR base SHA available (workflow_dispatch without PR context) — skipping." + fi diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8b64bf4ed5..9fc57f520d 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/AGENTS.md b/AGENTS.md index a832386082..8f3ed22f50 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -10,6 +10,7 @@ Kilo CLI is an open source AI coding agent that generates code from natural lang ## Build and Dev - **Dev**: `bun run dev` (runs from root) or `bun run --cwd packages/opencode --conditions=browser src/index.ts` +- **Dev with params**: `bun dev -- help` - **Extension**: `bun run extension` (build + launch VS Code with the extension in dev mode). Pass `--no-build` to skip the build. - **Typecheck**: `bun turbo typecheck` (uses `tsgo`, not `tsc`) - **Test**: `bun test` from `packages/opencode/` (NOT from root -- root blocks tests) @@ -18,6 +19,7 @@ Kilo CLI is an open source AI coding agent that generates code from natural lang - **Knip** (unused exports): `bun run knip` from `packages/kilo-vscode/`. CI runs this — all exported types/functions must be imported somewhere. Remove or unexport unused exports before pushing. - **Source links**: After adding or changing URLs in `packages/kilo-vscode/`, `packages/kilo-vscode/webview-ui/`, or `packages/opencode/src/`, run `bun run script/extract-source-links.ts` from the repo root and commit the updated `packages/kilo-docs/source-links.md`. CI runs this check — the build fails if the file is stale. - **kilocode_change check**: `bun run check-kilocode-change` from `packages/kilo-vscode/`. CI runs this — `kilocode_change` is a marker for upstream merge conflicts and must not appear in `packages/kilo-vscode/` or `packages/kilo-ui/` (these are entirely Kilo Code additions). Remove the markers before pushing. +- **opencode annotation check**: `bun run script/check-opencode-annotations.ts` from repo root. CI runs this on PRs touching `packages/opencode/` — every Kilo-specific change in shared opencode files must be annotated with `kilocode_change` markers. Exempt paths (no markers needed): `packages/opencode/src/kilocode/`, `packages/opencode/test/kilocode/`, and any path containing `kilocode` in the name. ## Products @@ -173,6 +175,8 @@ Tests MUST test actual implementation, do not duplicate logic into a test. Kilo CLI is a fork of [opencode](https://github.com/anomalyco/opencode). +**Very important**: when planning or coding, update shared files with OpenCode as last resort! Everything is shared code from OpenCode, except folders that contain `kilo` in the name or have a parent directory that contains `kilo` in the name. Example of kilo specific folders: `packages/opencode/src/kilocode/` and `packages/kilo-docs/`. Always look for ways to implement your feature or fix in a way that minimizes changes to shared code. + ### Minimizing Merge Conflicts We regularly merge upstream changes from opencode. To minimize merge conflicts and keep the sync process smooth: @@ -216,6 +220,21 @@ const bar = 2 // kilocode_change - new file ``` + +**JSX/TSX (inside JSX templates):** + + +```tsx +{/* kilocode_change */} +``` + + +```tsx +{/* kilocode_change start */} + +{/* kilocode_change end */} +``` + #### When markers are NOT needed Code in these paths is Kilo Code-specific and does NOT need `kilocode_change` markers: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 65565b37ab..d7950ddfe8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,12 +72,10 @@ During development, `bun dev` is the local equivalent of the built `kilo` comman # Development (from project root) bun dev --help # Show all available commands bun dev serve # Start headless API server -bun dev web # Start server + open web interface # Production kilo --help # Show all available commands kilo serve # Start headless API server -kilo web # Start server + open web interface ``` ### Testing with a local backend diff --git a/README.md b/README.md index e77e3fbbf7..2199ffd41a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - ⚡ Inline autocomplete suggestions - 🤖 Latest AI models - 🎁 API keys optional -- 💡 **Get $20 in bonus credits when you top-up for the first time** Credits can be used with 500+ models like Gemini 3.1 Pro, Claude 4.6 Sonnet & Opus, and GPT-5.2 +- 💡 **Get $20 in bonus credits when you top-up for the first time** Credits can be used with 500+ models like Gemini 3.1 Pro, Claude 4.6 Sonnet & Opus, and GPT-5.4 ## Quick Links @@ -38,7 +38,7 @@ ## Get Started in Visual Studio Code 1. Install the Kilo Code extension from the [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=kilocode.Kilo-Code). -2. Create your account to access 500+ cutting-edge AI models including Gemini 3 Pro, Claude 4.5 Sonnet & Opus, and GPT-5 – with transparent pricing that matches provider rates exactly. +2. Create your account to access 500+ cutting-edge AI models including Gemini 3.1 Pro, Claude 4.6 Sonnet & Opus, and GPT-5.4 – with transparent pricing that matches provider rates exactly. 3. Start coding with AI that adapts to your workflow. Watch our quick-start guide to see Kilo in action: Watch the video diff --git a/bun.lock b/bun.lock index eeaccd2363..d381043d01 100644 --- a/bun.lock +++ b/bun.lock @@ -1,6 +1,6 @@ { "lockfileVersion": 1, - "configVersion": 1, + "configVersion": 0, "workspaces": { "": { "name": "@kilocode/kilo", @@ -27,7 +27,7 @@ }, "packages/app": { "name": "@opencode-ai/app", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@kilocode/kilo-i18n": "workspace:*", "@kilocode/kilo-ui": "workspace:*", @@ -79,7 +79,7 @@ }, "packages/desktop": { "name": "@opencode-ai/desktop", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@opencode-ai/app": "workspace:*", "@opencode-ai/ui": "workspace:*", @@ -112,7 +112,7 @@ }, "packages/desktop-electron": { "name": "@opencode-ai/desktop-electron", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@opencode-ai/app": "workspace:*", "@opencode-ai/ui": "workspace:*", @@ -142,7 +142,7 @@ }, "packages/kilo-docs": { "name": "@kilocode/kilo-docs", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@docsearch/css": "^4", "@docsearch/js": "^4", @@ -171,7 +171,7 @@ }, "packages/kilo-gateway": { "name": "@kilocode/kilo-gateway", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@ai-sdk/anthropic": "2.0.65", "@ai-sdk/openai": "2.0.101", @@ -206,7 +206,7 @@ }, "packages/kilo-i18n": { "name": "@kilocode/kilo-i18n", - "version": "7.1.23", + "version": "7.2.3", "devDependencies": { "@tsconfig/node22": "catalog:", "@types/bun": "catalog:", @@ -219,7 +219,7 @@ }, "packages/kilo-telemetry": { "name": "@kilocode/kilo-telemetry", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@kilocode/kilo-gateway": "workspace:*", "@opentelemetry/api": "1.9.0", @@ -239,7 +239,7 @@ }, "packages/kilo-ui": { "name": "@kilocode/kilo-ui", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@kobalte/core": "0.13.11", "@opencode-ai/util": "workspace:*", @@ -274,7 +274,7 @@ }, "packages/kilo-vscode": { "name": "kilo-code", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@anthropic-ai/sdk": "^0.39.0", "@kilocode/kilo-i18n": "workspace:*", @@ -327,7 +327,7 @@ }, "packages/opencode": { "name": "@kilocode/cli", - "version": "7.1.23", + "version": "7.2.3", "bin": { "kilo": "./bin/kilo", "kilocode": "./bin/kilo", @@ -451,7 +451,7 @@ }, "packages/plugin": { "name": "@kilocode/plugin", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@kilocode/sdk": "workspace:*", "zod": "catalog:", @@ -465,14 +465,14 @@ }, "packages/script": { "name": "@opencode-ai/script", - "version": "7.1.23", + "version": "7.2.3", "devDependencies": { "@types/bun": "catalog:", }, }, "packages/sdk/js": { "name": "@kilocode/sdk", - "version": "7.1.23", + "version": "7.2.3", "devDependencies": { "@hey-api/openapi-ts": "0.90.10", "@tsconfig/node22": "catalog:", @@ -483,7 +483,7 @@ }, "packages/storybook": { "name": "@opencode-ai/storybook", - "version": "7.1.23", + "version": "7.2.3", "devDependencies": { "@opencode-ai/ui": "workspace:*", "@solidjs/meta": "catalog:", @@ -506,7 +506,7 @@ }, "packages/ui": { "name": "@opencode-ai/ui", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "@kilocode/sdk": "workspace:*", "@kobalte/core": "catalog:", @@ -553,7 +553,7 @@ }, "packages/util": { "name": "@opencode-ai/util", - "version": "7.1.23", + "version": "7.2.3", "dependencies": { "zod": "catalog:", }, diff --git a/package.json b/package.json index 7c626177b8..58d70dd493 100644 --- a/package.json +++ b/package.json @@ -122,6 +122,6 @@ "@openrouter/ai-sdk-provider@1.5.4": "patches/@openrouter%2Fai-sdk-provider@1.5.4.patch", "ghostty-web@0.3.0": "patches/ghostty-web@0.3.0.patch" }, - "version": "7.1.23", + "version": "7.2.3", "peerDependencies": {} } diff --git a/packages/app/package.json b/packages/app/package.json index 9ea7ae3152..f975e0dcc8 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@opencode-ai/app", - "version": "7.1.23", + "version": "7.2.3", "description": "", "type": "module", "exports": { diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.json index 1bd4786dac..4cc72842bb 100644 --- a/packages/desktop-electron/package.json +++ b/packages/desktop-electron/package.json @@ -1,7 +1,7 @@ { "name": "@opencode-ai/desktop-electron", "private": true, - "version": "7.1.23", + "version": "7.2.3", "type": "module", "license": "MIT", "homepage": "https://opencode.ai", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 83a34dc878..b74f408b65 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@opencode-ai/desktop", "private": true, - "version": "7.1.23", + "version": "7.2.3", "type": "module", "license": "MIT", "scripts": { diff --git a/packages/extensions/zed/extension.toml b/packages/extensions/zed/extension.toml index e2b800dc95..94cf6fade3 100644 --- a/packages/extensions/zed/extension.toml +++ b/packages/extensions/zed/extension.toml @@ -1,7 +1,7 @@ id = "kilo" name = "Kilo" description = "The open source coding agent." -version = "7.1.23" +version = "7.2.3" schema_version = 1 authors = ["Anomaly"] repository = "https://github.com/Kilo-Org/kilocode" @@ -11,26 +11,26 @@ name = "Kilo" icon = "./icons/opencode.svg" [agent_servers.opencode.targets.darwin-aarch64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-darwin-arm64.zip" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.3/opencode-darwin-arm64.zip" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.darwin-x86_64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-darwin-x64.zip" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.3/opencode-darwin-x64.zip" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.linux-aarch64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-linux-arm64.tar.gz" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.3/opencode-linux-arm64.tar.gz" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.linux-x86_64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-linux-x64.tar.gz" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.3/opencode-linux-x64.tar.gz" cmd = "./opencode" args = ["acp"] [agent_servers.opencode.targets.windows-x86_64] -archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.1.23/opencode-windows-x64.zip" +archive = "https://github.com/Kilo-Org/kilocode/releases/download/v7.2.3/opencode-windows-x64.zip" cmd = "./opencode.exe" args = ["acp"] diff --git a/packages/kilo-docs/components/ThemeToggle.tsx b/packages/kilo-docs/components/ThemeToggle.tsx index 24a21c9cc9..e73ae55955 100644 --- a/packages/kilo-docs/components/ThemeToggle.tsx +++ b/packages/kilo-docs/components/ThemeToggle.tsx @@ -58,19 +58,19 @@ export function ThemeToggle() { if (!mounted) { return ( ) } const getIcon = () => { if (theme === "system") { - return "💻" + return } if (theme === "dark") { - return "🌙" + return } - return "☀️" + return } const getLabel = () => { @@ -86,7 +86,7 @@ export function ThemeToggle() { return ( <> ) } + +function SunIcon() { + return ( + + + + + + + + + + + + ) +} + +function MoonIcon() { + return ( + + + + ) +} + +function SystemIcon() { + return ( + + + + + + ) +} diff --git a/packages/kilo-docs/lib/nav/code-with-ai.ts b/packages/kilo-docs/lib/nav/code-with-ai.ts index 69a90dc778..e1d7b8f039 100644 --- a/packages/kilo-docs/lib/nav/code-with-ai.ts +++ b/packages/kilo-docs/lib/nav/code-with-ai.ts @@ -14,7 +14,11 @@ export const CodeWithAiNav: NavSection[] = [ href: "/code-with-ai/platforms/jetbrains", children: "JetBrains Extension", }, - { href: "/code-with-ai/platforms/cli", children: "CLI" }, + { + href: "/code-with-ai/platforms/cli", + children: "CLI", + subLinks: [{ href: "/code-with-ai/platforms/cli-reference", children: "Command Reference" }], + }, { href: "/code-with-ai/platforms/cloud-agent", children: "Cloud Agent" }, { href: "/code-with-ai/platforms/mobile", children: "Mobile Apps" }, { href: "/code-with-ai/platforms/slack", children: "Slack" }, @@ -45,10 +49,6 @@ export const CodeWithAiNav: NavSection[] = [ children: "Custom Models", platform: "new", }, - { - href: "/code-with-ai/agents/free-and-budget-models", - children: "Free & Budget Models", - }, { href: "/code-with-ai/agents/using-agents", children: "Agents", diff --git a/packages/kilo-docs/mappingplan.md b/packages/kilo-docs/mappingplan.md index ce3a63b9b2..f61bd750bf 100644 --- a/packages/kilo-docs/mappingplan.md +++ b/packages/kilo-docs/mappingplan.md @@ -33,7 +33,6 @@ | Using Modes | `basic-usage/using-modes` | | Orchestrator Mode | `basic-usage/orchestrator-mode` | | Model Selection | `basic-usage/model-selection-guide` | -| Free & Budget Models | `advanced-usage/free-and-budget-models` | | **Features** (subheader) | | | Autocomplete | `basic-usage/autocomplete/index`, `basic-usage/autocomplete/mistral-setup` | | Code Actions | `features/code-actions` | diff --git a/packages/kilo-docs/markdoc/partials/cli-commands-table.md b/packages/kilo-docs/markdoc/partials/cli-commands-table.md new file mode 100644 index 0000000000..d6437cac49 --- /dev/null +++ b/packages/kilo-docs/markdoc/partials/cli-commands-table.md @@ -0,0 +1,25 @@ + + +| Command | Description | +| --- | --- | +| `kilo acp` | start ACP (Agent Client Protocol) server | +| `kilo mcp` | manage MCP (Model Context Protocol) servers | +| `kilo [project]` | start kilo tui | +| `kilo attach ` | attach to a running kilo server | +| `kilo run [message..]` | run kilo with a message | +| `kilo debug` | debugging and troubleshooting tools | +| `kilo auth` | manage credentials | +| `kilo agent` | manage agents | +| `kilo upgrade [target]` | upgrade kilo to the latest or a specific version | +| `kilo uninstall` | uninstall kilo and remove all related files | +| `kilo serve` | starts a headless kilo server | +| `kilo models [provider]` | list all available models | +| `kilo stats` | show token usage and cost statistics | +| `kilo export [sessionID]` | export session data as JSON | +| `kilo import ` | import session data from JSON file or URL | +| `kilo pr ` | fetch and checkout a GitHub PR branch, then run kilo | +| `kilo session` | manage sessions | +| `kilo remote` | enable remote connection for real-time session relay | +| `kilo db` | database tools | +| `kilo help [command]` | show full CLI reference | +| `kilo completion` | generate shell completion script | diff --git a/packages/kilo-docs/package.json b/packages/kilo-docs/package.json index f3b83f7590..88fa3e9578 100644 --- a/packages/kilo-docs/package.json +++ b/packages/kilo-docs/package.json @@ -1,6 +1,6 @@ { "name": "@kilocode/kilo-docs", - "version": "7.1.23", + "version": "7.2.3", "private": true, "scripts": { "dev": "next dev --webpack --port 3002", diff --git a/packages/kilo-docs/pages/automate/agent-manager.md b/packages/kilo-docs/pages/automate/agent-manager.md index 5e2c539e6a..c06f9f2309 100644 --- a/packages/kilo-docs/pages/automate/agent-manager.md +++ b/packages/kilo-docs/pages/automate/agent-manager.md @@ -31,6 +31,17 @@ The panel opens as an editor tab and stays active across focus changes. Each Agent Manager session runs in an isolated git worktree on a separate branch, keeping your main branch clean. +### PR Status Badges + +Worktree items in the sidebar display a **PR status badge** when the branch has an associated pull request: + +- **Open** — badge indicating the PR is open (its color can also reflect review and check status) +- **Merged** — purple badge indicating the PR has been merged +- **Closed** — red badge indicating the PR was closed without merging +- **Draft** — gray badge indicating the PR is in draft state + +The badge appears on the right side of each worktree item and updates automatically via polling. If the worktree's branch doesn't have a PR yet, no badge is shown. + ### Creating a New Worktree Session 1. Click **New Worktree** or press `Cmd+N` (macOS) / `Ctrl+N` (Windows/Linux) to create a new worktree diff --git a/packages/kilo-docs/pages/code-with-ai/agents/auto-model.md b/packages/kilo-docs/pages/code-with-ai/agents/auto-model.md index 69ec4bdc5f..a7d3fe5aab 100644 --- a/packages/kilo-docs/pages/code-with-ai/agents/auto-model.md +++ b/packages/kilo-docs/pages/code-with-ai/agents/auto-model.md @@ -132,4 +132,4 @@ Auto Model is actively being improved. We'd love to hear how it's working for yo - [Model Selection Guide](/docs/code-with-ai/agents/model-selection) - General guidance on choosing models - [Using Agents](/docs/code-with-ai/agents/using-agents) - Learn about different Kilo Code agents -- [Free & Budget Models](/docs/code-with-ai/agents/free-and-budget-models) - Cost-effective alternatives +- [Using Kilo for Free](/docs/getting-started/using-kilo-for-free) - Cost-effective alternatives diff --git a/packages/kilo-docs/pages/code-with-ai/agents/free-and-budget-models.md b/packages/kilo-docs/pages/code-with-ai/agents/free-and-budget-models.md deleted file mode 100644 index ce24af58ff..0000000000 --- a/packages/kilo-docs/pages/code-with-ai/agents/free-and-budget-models.md +++ /dev/null @@ -1,290 +0,0 @@ ---- -title: Free and Budget Models -description: Learn how to use Kilo Code effectively while minimizing or eliminating costs through free models, budget-friendly alternatives, and smart usage strategies. ---- - -# Free and Budget Models - -**Why this matters:** AI model costs can add up quickly during development. This guide shows you how to use Kilo Code effectively while minimizing or eliminating costs through free models, budget-friendly alternatives, and smart usage strategies. - -## Completely Free Options - -### Kilo Gateway Free Models - -From time to time, Kilo works with AI inference providers to offer free models. These are available through the Kilo Gateway. Currently, we are offering these free models: - -- **MiniMax M2.1 (free)** - A capable model from MiniMax with strong general-purpose performance. -- **Z.AI: GLM 4.7 (free)** - Latest variant of the GLM family, purpose-built for agent-centric applications. -- **MoonshotAI: Kimi K2.5 (free)** - Optimized for agentic capabilities, including advanced tool use, reasoning, and code synthesis. -- **Giga Potato (free)** - A stealth release model that is free in its evaluation period. -- **Arcee AI: Trinity Large Preview (free)** - A preview model from Arcee AI with strong capabilities. - -### OpenRouter Free Tier Models - -OpenRouter offers several models with generous free tiers. **Note:** You'll need to create a free OpenRouter account to access these models. - -**Setup:** - -1. Create a free [OpenRouter account](https://openrouter.ai) -2. Get your API key from the dashboard -3. Configure Kilo Code with the OpenRouter provider - -**Available free models:** - -- **Qwen3 Coder (free)** - Optimized for agentic coding tasks such as function calling, tool use, and long-context reasoning over repositories. -- **Z.AI: GLM 4.5 Air (free)** - Lightweight variant of the GLM-4.5 family, purpose-built for agent-centric applications. -- **DeepSeek: R1 0528 (free)** - Performance on par with OpenAI o1, but open-sourced and with fully open reasoning tokens. -- **MoonshotAI: Kimi K2 (free)** - Optimized for agentic capabilities, including advanced tool use, reasoning, and code synthesis. - -## Cost-Effective Premium Models - -When you need more capability than free models provide, these options deliver excellent value: - -### Ultra-Budget Champions (Under $0.50 per million tokens) - -**Mistral Devstral Small** - -- **Cost:** ~$0.20 per million input tokens -- **Best for:** Code generation, debugging, refactoring -- **Performance:** 85% of premium model capability at 10% of the cost - -**Llama 4 Maverick** - -- **Cost:** ~$0.30 per million input tokens -- **Best for:** Complex reasoning, architecture planning -- **Performance:** Excellent for most development tasks - -**DeepSeek v3** - -- **Cost:** ~$0.27 per million input tokens -- **Best for:** Code analysis, large codebase understanding -- **Performance:** Strong technical reasoning - -### Mid-Range Value Models ($0.50-$2.00 per million tokens) - -**Qwen3 235B** - -- **Cost:** ~$1.20 per million input tokens -- **Best for:** Complex projects requiring high accuracy -- **Performance:** Near-premium quality at 40% of the cost - -## Smart Usage Strategies - -### The 50% Rule - -**Principle:** Use budget models for 50% of your tasks, premium models for the other 50%. - -**Budget model tasks:** - -- Code reviews and analysis -- Documentation writing -- Simple bug fixes -- Boilerplate generation -- Refactoring existing code - -**Premium model tasks:** - -- Complex architecture decisions -- Debugging difficult issues -- Performance optimization -- New feature design -- Critical production code - -### Context Management for Cost Savings - -**Minimize context size:** - -```typescript -// Instead of mentioning entire files -@src/components/UserProfile.tsx - -// Mention specific functions or sections -@src/components/UserProfile.tsx:45-67 -``` - -**Reuse context effectively:** - -- Keep key project notes in your repository (e.g., a AGENTS.md or docs folder) -- Reduces need to re-explain project details -- Saves tokens per conversation - -**Strategic file mentions:** - -- Only include files directly relevant to the task -- Use [`@folder/`](/docs/code-with-ai/agents/context-mentions) for broad context, specific files for targeted work - -### Model Switching Strategies - -**Start cheap, escalate when needed:** - -1. **Begin with free models** (Qwen3 Coder, GLM-4.5-Air) -2. **Switch to budget models** if free models struggle -3. **Escalate to premium models** only for complex tasks - -**Use API Configuration Profiles:** - -- Set up [multiple profiles](/docs/ai-providers) for different cost tiers -- Quick switching between free, budget, and premium models -- Match model capability to task complexity - -### Mode-Based Cost Optimization - -**Use appropriate modes to limit expensive operations:** - -- **[Ask Agent](/docs/code-with-ai/agents/using-agents#ask):** Information gathering without code changes -- **[Plan Agent](/docs/code-with-ai/agents/using-agents#plan):** Planning without expensive file operations -- **[Debug Agent](/docs/code-with-ai/agents/using-agents#debug):** Focused troubleshooting - -**Custom modes for budget control:** - -- Create modes that restrict expensive tools -- Limit file access to specific directories -- Control which operations are auto-approved - -## Real-World Performance Comparisons - -### Code Generation Tasks - -**Simple function creation:** - -- **Mistral Devstral Small:** 95% success rate -- **GPT-4:** 98% success rate -- **Cost difference:** Free vs $0.20 vs $30 per million tokens - -**Complex refactoring:** - -- **Budget models:** 70-80% success rate -- **Premium models:** 90-95% success rate -- **Recommendation:** Start with budget, escalate if needed - -### Debugging Performance - -**Simple bugs:** - -- **Free models:** Usually sufficient -- **Budget models:** Excellent performance -- **Premium models:** Overkill for most cases - -**Complex system issues:** - -- **Free models:** 40-60% success rate -- **Budget models:** 60-80% success rate -- **Premium models:** 85-95% success rate - -## Hybrid Approach Recommendations - -### Daily Development Workflow - -**Morning planning session:** - -- Use **Architect mode** with **DeepSeek R1** -- Plan features and architecture -- Create task breakdowns - -**Implementation phase:** - -- Use **Code mode** with **budget models** -- Generate and modify code -- Handle routine development tasks - -**Complex problem solving:** - -- Switch to **premium models** when stuck -- Use for critical debugging -- Architecture decisions affecting multiple systems - -### Project Phase Strategy - -**Early development:** - -- Free and budget models for prototyping -- Rapid iteration without cost concerns -- Establish patterns and structure - -**Production preparation:** - -- Premium models for critical code review -- Performance optimization -- Security considerations - -## Cost Monitoring and Control - -### Track Your Usage - -**Monitor credit consumption:** - -- Check cost estimates in chat history -- Review monthly usage patterns -- Identify high-cost operations - -**Set spending limits:** - -- Use provider billing alerts -- Configure [provider rate limits](/docs/ai-providers) to control usage -- Set daily/monthly budgets - -### Cost-Saving Tips - -**Reduce system prompt size:** - -- [Disable MCP](/docs/automate/mcp/using-in-kilo-code) if not using external tools -- Use focused custom modes -- Minimize unnecessary context - -**Optimize conversation length:** - -- Use [Checkpoints](/docs/code-with-ai/features/checkpoints) to reset context -- Start fresh conversations for unrelated tasks -- Archive completed work - -**Batch similar tasks:** - -- Group related code changes -- Handle multiple files in single requests -- Reduce conversation overhead - -## Getting Started with Budget Models - -### Quick Setup Guide - -1. **Create OpenRouter account** for free models -2. **Configure multiple providers** in Kilo Code -3. **Set up API Configuration Profiles** for easy switching -4. **Escalate to budget models** when needed -5. **Reserve premium models** for complex work - -### Recommended Provider Mix - -**Free tier foundation:** - -- [OpenRouter](/docs/ai-providers/openrouter) - Free models -- [Groq](/docs/ai-providers/groq) - Fast inference for supported models -- [Z.ai](https://z.ai/model-api) - Provides a free model GLM-4.5-Flash - -**Budget tier options:** - -- [DeepSeek](/docs/ai-providers/deepseek) - Excellent value models -- [Mistral](/docs/ai-providers/mistral) - Specialized coding models - -**Premium tier backup:** - -- [Anthropic](/docs/ai-providers/anthropic) - Claude for complex reasoning -- [OpenAI](/docs/ai-providers/openai) - GPT-4 for critical tasks - -## Measuring Success - -**Track these metrics:** - -- Monthly AI costs vs. development productivity -- Task completion rates by model tier -- Time saved vs. money spent -- Code quality improvements - -**Success indicators:** - -- 70%+ of tasks completed with free/budget models -- Monthly costs under your target budget -- Maintained or improved code quality -- Faster development cycles - -By combining free models, strategic budget model usage, and smart optimization techniques, you can harness the full power of AI-assisted development while keeping costs minimal. Start with free options and gradually incorporate budget models as your needs and comfort with costs grow. diff --git a/packages/kilo-docs/pages/code-with-ai/index.md b/packages/kilo-docs/pages/code-with-ai/index.md index 2e229d00fd..9ec66e7591 100644 --- a/packages/kilo-docs/pages/code-with-ai/index.md +++ b/packages/kilo-docs/pages/code-with-ai/index.md @@ -38,7 +38,6 @@ Kilo uses specialized agents to help with different tasks: - [**Model Selection**](/docs/code-with-ai/agents/model-selection) — Choose the right AI model for each task - [**Context Mentions**](/docs/code-with-ai/agents/context-mentions) — Reference files, functions, and symbols - [**Orchestrator Mode**](/docs/code-with-ai/agents/orchestrator-mode) — Legacy orchestration (now built into all agents) -- [**Free & Budget Models**](/docs/code-with-ai/agents/free-and-budget-models) — Cost-effective AI options ## Features diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/cli-reference.md b/packages/kilo-docs/pages/code-with-ai/platforms/cli-reference.md new file mode 100644 index 0000000000..ed944d4407 --- /dev/null +++ b/packages/kilo-docs/pages/code-with-ai/platforms/cli-reference.md @@ -0,0 +1,816 @@ +--- +title: "CLI Command Reference" +description: "Complete reference for all Kilo CLI commands and subcommands" +--- + +# CLI Command Reference + + + +## kilo acp + +``` +start ACP (Agent Client Protocol) server + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --port port to listen on [number] [default: 0] + --hostname hostname to listen on [string] [default: "127.0.0.1"] + --mdns enable mDNS service discovery (defaults hostname to 0.0.0.0) [boolean] [default: false] + --mdns-domain custom domain name for mDNS service (default: kilo.local) [string] [default: "kilo.local"] + --cors additional domains to allow for CORS [array] [default: []] + --cwd working directory [string] [default: "."] +``` + +## kilo mcp + +``` +manage MCP (Model Context Protocol) servers + +Commands: + kilo mcp add add an MCP server + kilo mcp list list MCP servers and their status [aliases: ls] + kilo mcp auth [name] authenticate with an OAuth-enabled MCP server + kilo mcp logout [name] remove OAuth credentials for an MCP server + kilo mcp debug debug OAuth connection for an MCP server + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo mcp add + +``` +add an MCP server + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo mcp list + +``` +list MCP servers and their status + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo mcp auth + +``` +authenticate with an OAuth-enabled MCP server + +Commands: + kilo mcp auth list list OAuth-capable MCP servers and their auth status [aliases: ls] + +Positionals: + name name of the MCP server [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo mcp auth list + +``` +list OAuth-capable MCP servers and their auth status + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo mcp logout + +``` +remove OAuth credentials for an MCP server + +Positionals: + name name of the MCP server [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo mcp debug + +``` +debug OAuth connection for an MCP server + +Positionals: + name name of the MCP server [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo [project] + +``` +start kilo tui + +Positionals: + project path to start kilo in [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --port port to listen on [number] [default: 0] + --hostname hostname to listen on [string] [default: "127.0.0.1"] + --mdns enable mDNS service discovery (defaults hostname to 0.0.0.0) [boolean] [default: false] + --mdns-domain custom domain name for mDNS service (default: kilo.local) [string] [default: "kilo.local"] + --cors additional domains to allow for CORS [array] [default: []] + -m, --model model to use in the format of provider/model [string] + -c, --continue continue the last session [boolean] + -s, --session session id to continue [string] + --fork fork the session when continuing (use with --continue or --session) [boolean] + --cloud-fork fetch session from cloud and continue locally (use with --session) [boolean] + --prompt prompt to use [string] + --agent agent to use [string] +``` + +## kilo attach + +``` +attach to a running kilo server + +Positionals: + url http://localhost:4096 [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --dir directory to run in [string] + -c, --continue continue the last session [boolean] + -s, --session session id to continue [string] + --fork fork the session when continuing (use with --continue or --session) [boolean] + --cloud-fork fetch session from cloud and continue locally (use with --session) [boolean] + -p, --password basic auth password (defaults to KILO_SERVER_PASSWORD) [string] +``` + +## kilo run + +``` +run kilo with a message + +Positionals: + message message to send [string] [default: []] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --command the command to run, use message for args [string] + -c, --continue continue the last session [boolean] + -s, --session session id to continue [string] + --fork fork the session before continuing (requires --continue or --session) [boolean] + --cloud-fork fetch session from cloud and continue locally (requires --session) [boolean] + --share share the session [boolean] + -m, --model model to use in the format of provider/model [string] + --agent agent to use [string] + --format format: default (formatted) or json (raw JSON events) [string] [choices: "default", "json"] [default: "default"] + -f, --file file(s) to attach to message [array] + --title title for the session (uses truncated prompt if no value provided) [string] + --attach attach to a running opencode server (e.g., http://localhost:4096) [string] + -p, --password basic auth password (defaults to KILO_SERVER_PASSWORD) [string] + --dir directory to run in, path on remote server if attaching [string] + --port port for the local server (defaults to random port if no value provided) [number] + --variant model variant (provider-specific reasoning effort, e.g., high, max, minimal) [string] + --thinking show thinking blocks [boolean] [default: false] + --auto auto-approve all permissions (for autonomous/pipeline usage) [boolean] [default: false] +``` + +## kilo debug + +``` +debugging and troubleshooting tools + +Commands: + kilo debug config show resolved configuration + kilo debug lsp LSP debugging utilities + kilo debug rg ripgrep debugging utilities + kilo debug file file system debugging utilities + kilo debug scrap list all known projects + kilo debug skill list all available skills + kilo debug snapshot snapshot debugging utilities + kilo debug agent show agent configuration details + kilo debug paths show global paths (data, config, cache, state) + kilo debug wait wait indefinitely (for debugging) + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug config + +``` +show resolved configuration + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug lsp + +``` +LSP debugging utilities + +Commands: + kilo debug lsp diagnostics get diagnostics for a file + kilo debug lsp symbols search workspace symbols + kilo debug lsp document-symbols get symbols from a document + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug lsp diagnostics + +``` +get diagnostics for a file + +Positionals: + file [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug lsp symbols + +``` +search workspace symbols + +Positionals: + query [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug lsp document-symbols + +``` +get symbols from a document + +Positionals: + uri [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug rg + +``` +ripgrep debugging utilities + +Commands: + kilo debug rg tree show file tree using ripgrep + kilo debug rg files list files using ripgrep + kilo debug rg search search file contents using ripgrep + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug rg tree + +``` +show file tree using ripgrep + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --limit [number] +``` + +### kilo debug rg files + +``` +list files using ripgrep + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --query Filter files by query [string] + --glob Glob pattern to match files [string] + --limit Limit number of results [number] +``` + +### kilo debug rg search + +``` +search file contents using ripgrep + +Positionals: + pattern Search pattern [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --glob File glob patterns [array] + --limit Limit number of results [number] +``` + +### kilo debug file + +``` +file system debugging utilities + +Commands: + kilo debug file read read file contents as JSON + kilo debug file status show file status information + kilo debug file list list files in a directory + kilo debug file search search files by query + kilo debug file tree [dir] show directory tree + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug file read + +``` +read file contents as JSON + +Positionals: + path File path to read [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug file status + +``` +show file status information + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug file list + +``` +list files in a directory + +Positionals: + path File path to list [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug file search + +``` +search files by query + +Positionals: + query Search query [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug file tree + +``` +show directory tree + +Positionals: + dir Directory to tree [string] [default: "."] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug scrap + +``` +list all known projects + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug skill + +``` +list all available skills + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug snapshot + +``` +snapshot debugging utilities + +Commands: + kilo debug snapshot track track current snapshot state + kilo debug snapshot patch show patch for a snapshot hash + kilo debug snapshot diff show diff for a snapshot hash + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug snapshot track + +``` +track current snapshot state + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug snapshot patch + +``` +show patch for a snapshot hash + +Positionals: + hash hash [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug snapshot diff + +``` +show diff for a snapshot hash + +Positionals: + hash hash [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug agent + +``` +show agent configuration details + +Positionals: + name Agent name [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --tool Tool id to execute [string] + --params Tool params as JSON or a JS object literal [string] +``` + +### kilo debug paths + +``` +show global paths (data, config, cache, state) + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo debug wait + +``` +wait indefinitely (for debugging) + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo auth + +``` +manage credentials + +Commands: + kilo auth login [url] log in to a provider + kilo auth logout log out from a configured provider + kilo auth list list providers [aliases: ls] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo auth login + +``` +log in to a provider + +Positionals: + url kilo auth provider [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + -p, --provider provider id or name to log in to (skips provider selection) [string] + -m, --method login method label (skips method selection) [string] +``` + +### kilo auth logout + +``` +log out from a configured provider + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo auth list + +``` +list providers + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo agent + +``` +manage agents + +Commands: + kilo agent create create a new agent + kilo agent list list all available agents + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo agent create + +``` +create a new agent + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --path directory path to generate the agent file [string] + --description what the agent should do [string] + --mode agent mode [string] [choices: "all", "primary", "subagent"] + --tools comma-separated list of tools to enable (default: all). Available: "bash, read, write, edit, list, glob, grep, webfetch, task, todowrite, todoread" [string] + -m, --model model to use in the format of provider/model [string] +``` + +### kilo agent list + +``` +list all available agents + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo upgrade + +``` +upgrade kilo to the latest or a specific version + +Positionals: + target version to upgrade to, for ex '0.1.48' or 'v0.1.48' [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + -m, --method installation method to use [string] [choices: "curl", "npm", "pnpm", "bun", "brew", "choco", "scoop"] +``` + +## kilo uninstall + +``` +uninstall kilo and remove all related files + +Options: + --help Show help [boolean] + --version Show version number [boolean] + -c, --keep-config keep configuration files [boolean] [default: false] + -d, --keep-data keep session data and snapshots [boolean] [default: false] + --dry-run show what would be removed without removing [boolean] [default: false] + -f, --force skip confirmation prompts [boolean] [default: false] +``` + +## kilo serve + +``` +starts a headless kilo server + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --port port to listen on [number] [default: 0] + --hostname hostname to listen on [string] [default: "127.0.0.1"] + --mdns enable mDNS service discovery (defaults hostname to 0.0.0.0) [boolean] [default: false] + --mdns-domain custom domain name for mDNS service (default: kilo.local) [string] [default: "kilo.local"] + --cors additional domains to allow for CORS [array] [default: []] +``` + +## kilo models + +``` +list all available models + +Positionals: + provider provider ID to filter models by [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --verbose use more verbose model output (includes metadata like costs) [boolean] + --refresh refresh the models cache from models.dev [boolean] +``` + +## kilo stats + +``` +show token usage and cost statistics + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --days show stats for the last N days (default: all time) [number] + --tools number of tools to show (default: all) [number] + --models show model statistics (default: hidden). Pass a number to show top N, otherwise shows all + --project filter by project (default: all projects, empty string: current project) [string] +``` + +## kilo export + +``` +export session data as JSON + +Positionals: + sessionID session id to export [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo import + +``` +import session data from JSON file or URL + +Positionals: + file path to JSON file or share URL [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo pr + +``` +fetch and checkout a GitHub PR branch, then run kilo + +Positionals: + number PR number to checkout [number] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo session + +``` +manage sessions + +Commands: + kilo session list list sessions + kilo session delete delete a session + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo session list + +``` +list sessions + +Options: + --help Show help [boolean] + --version Show version number [boolean] + -n, --max-count limit to N most recent sessions [number] + --format output format [string] [choices: "table", "json"] [default: "table"] +``` + +### kilo session delete + +``` +delete a session + +Positionals: + sessionID session ID to delete [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo remote + +``` +enable remote connection for real-time session relay + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo db + +``` +database tools + +Commands: + kilo db [query] open an interactive sqlite3 shell or run a query [default] + kilo db path print the database path + kilo db migrate migrate JSON data to SQLite (merges with existing data) + +Positionals: + query SQL query to execute [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --format Output format [string] [choices: "json", "tsv"] [default: "tsv"] +``` + +### kilo db path + +``` +print the database path + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +### kilo db migrate + +``` +migrate JSON data to SQLite (merges with existing data) + +Options: + --help Show help [boolean] + --version Show version number [boolean] +``` + +## kilo help + +``` +show full CLI reference + +Positionals: + command command to show help for [string] + +Options: + --help Show help [boolean] + --version Show version number [boolean] + --all show help for all commands [boolean] [default: false] + --format output format [string] [choices: "md", "text"] [default: "md"] +``` diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/cli.md b/packages/kilo-docs/pages/code-with-ai/platforms/cli.md index 1ee5cbfe61..ed6ff494c9 100644 --- a/packages/kilo-docs/pages/code-with-ai/platforms/cli.md +++ b/packages/kilo-docs/pages/code-with-ai/platforms/cli.md @@ -61,27 +61,9 @@ Or use npm: ### Top-Level CLI Commands -| Command | Description | -| ------------------------- | ------------------------------------------ | -| `kilo [project]` | Start the TUI (Terminal User Interface) | -| `kilo run [message..]` | Run with a message (non-interactive mode) | -| `kilo attach ` | Attach to a running kilo server | -| `kilo serve` | Start a headless server | -| `kilo web` | Start server and open web interface | -| `kilo auth` | Manage credentials (login, logout, list) | -| `kilo agent` | Manage agents (create, list) | -| `kilo mcp` | Manage MCP servers (list, add, auth) | -| `kilo models [provider]` | List available models | -| `kilo stats` | Show token usage and cost statistics | -| `kilo session` | Manage sessions (list) | -| `kilo export [sessionID]` | Export session data as JSON | -| `kilo import ` | Import session data from JSON file or URL | -| `kilo upgrade [target]` | Upgrade kilo to latest or specific version | -| `kilo uninstall` | Uninstall kilo and remove related files | -| `kilo pr ` | Fetch and checkout a GitHub PR branch | -| `kilo github` | Manage GitHub agent (install, run) | -| `kilo debug` | Debugging and troubleshooting tools | -| `kilo completion` | Generate shell completion script | +{% partial file="cli-commands-table.md" /%} + +For detailed help on every command and subcommand, see the [CLI Command Reference](/docs/code-with-ai/platforms/cli-reference). ### Global Options @@ -139,10 +121,11 @@ Or use npm: #### Kilo Gateway Commands (when connected) -| Command | Aliases | Description | -| ---------- | ------------------------ | --------------------------------- | -| `/profile` | `/me`, `/whoami` | View your Kilo Gateway profile | -| `/teams` | `/team`, `/org`, `/orgs` | Switch between Kilo Gateway teams | +| Command | Aliases | Description | +| ---------- | ------------------------ | ----------------------------------------- | +| `/profile` | `/me`, `/whoami` | View your Kilo Gateway profile | +| `/teams` | `/team`, `/org`, `/orgs` | Switch between Kilo Gateway teams | +| `/remote` | - | Toggle remote mode for Cloud Agent access | #### Built-in Commands @@ -460,6 +443,44 @@ kilo --continue - Cannot be used with a prompt argument - Only works when there's at least one previous session in the workspace +## Remote Connections + +Remote Connections let you access your local CLI sessions from the Cloud Agents web interface. Requires [Kilo Gateway](/docs/gateway) connection. + +### Enabling Remote Mode + +**Toggle during a session:** + +``` +/remote +``` + +Requires connection to Kilo Gateway. The `/remote` command appears only when authenticated. + +**Enable by default:** + +Add to `~/.config/kilo/config.json`: + +```json +{ + "remote_control": true +} +``` + +### Using Remote Mode + +Once enabled, start a CLI session and open [Cloud Agents](https://app.kilo.ai/cloud). Your local session appears in the dashboard. See [Cloud Agent Remote Connections](/docs/code-with-ai/platforms/cloud-agent#remote-connections) for details. + +### Requirements + +- Connection to Kilo Gateway +- Same Kilo account on CLI and Cloud Agent +- CLI must remain running with internet connection + +{% callout type="warning" title="Security Warning" %} +Anyone with access to your Kilo account can send messages to your computer when remote mode is enabled. +{% /callout %} + ## Environment Variable Overrides The CLI supports overriding config values with environment variables. The supported environment variables are: @@ -482,6 +503,6 @@ Your selection is persisted locally so it carries over to future sessions. There is no `--org` or `--team` flag on `kilo run`. Instead, the organization is determined from the following sources, in order of priority (highest first): -1. **`KILO_ORG_ID` environment variable** — Best for non-interactive and CI environments. +1. **`KILO_ORG_ID` environment variable** — Best for non-interactive and CI environments. 2. **`Persisted selection from the last `/teams` pick`** — If you've run an interactive session and selected an organization via `/teams`, that selection is stored in the CLI auth file and reused automatically. diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/cloud-agent.md b/packages/kilo-docs/pages/code-with-ai/platforms/cloud-agent.md index fc511e0e22..4e0f2a18bb 100644 --- a/packages/kilo-docs/pages/code-with-ai/platforms/cloud-agent.md +++ b/packages/kilo-docs/pages/code-with-ai/platforms/cloud-agent.md @@ -102,6 +102,33 @@ Cloud Agents support project-level [skills](/docs/code-with-ai/platforms/cli#ski Global skills (`~/.kilocode/skills/`) are not available in Cloud Agents since there is no persistent user home directory. {% /callout %} +## Remote Connections + +Remote Connections let you access and control local CLI sessions from the Cloud Agents web interface. Your computer handles the compute; the cloud gives you a window into it from any device. + +### How It Works + +When remote mode is enabled in the CLI, your active local sessions appear in the Cloud Agents dashboard alongside cloud sessions. The connection is two-way: + +- **Messages and responses** sync in real-time +- **Agent questions** appear in both places — answer wherever you are +- **Permission requests** route to your active connection +- **Full editing capabilities** work remotely + +### Enabling Remote Mode + +Remote mode must be enabled from the CLI. See [CLI Remote Connections](/docs/code-with-ai/platforms/cli#remote-connections) for setup instructions. + +### Requirements + +- Same Kilo account on both CLI and Cloud Agent +- Active internet connection on the local machine +- CLI must remain running + +{% callout type="warning" title="Security Warning" %} +Anyone with access to your Kilo account can send messages to your computer when remote mode is enabled. +{% /callout %} + ## Perfect For Cloud Agents are great for: diff --git a/packages/kilo-docs/pages/code-with-ai/platforms/vscode/whats-new.md b/packages/kilo-docs/pages/code-with-ai/platforms/vscode/whats-new.md index 408d4e6965..1ed95d5f19 100644 --- a/packages/kilo-docs/pages/code-with-ai/platforms/vscode/whats-new.md +++ b/packages/kilo-docs/pages/code-with-ai/platforms/vscode/whats-new.md @@ -37,7 +37,13 @@ See [Auto-Approving Actions](/docs/getting-started/settings/auto-approving-actio ### Is the context progress graph still available? -The context progress graph will be [added soon](https://github.com/Kilo-Org/kilocode/issues/8210) for users who like to see it. +Yes — the context progress graph (also known as the task timeline) is now available. It appears at the top of the chat panel and shows: + +- **Timeline bars** — colored bars representing session activity (different colors for read, write, tool, error, and text parts) +- **Context window progress** — a three-segment bar showing used, reserved, and available tokens, with a visual indicator when usage exceeds 50% +- **Token breakdown** — input, output, cache writes, and cache reads display + +You can expand or collapse the graph — your preference is saved in the `kilo-code.new.showTaskTimeline` setting. ### I like to closely monitor and approve the behavior of the agent. How can I do that better in the new version? diff --git a/packages/kilo-docs/pages/getting-started/using-kilo-for-free.md b/packages/kilo-docs/pages/getting-started/using-kilo-for-free.md index 4f6a70d9f6..00a189c0eb 100644 --- a/packages/kilo-docs/pages/getting-started/using-kilo-for-free.md +++ b/packages/kilo-docs/pages/getting-started/using-kilo-for-free.md @@ -1,92 +1,77 @@ --- title: "Using Kilo for Free" -description: "Learn how to use Kilo Code without spending money by configuring free models for agentic tasks, autocomplete, and CLI background tasks" +description: "How to use Kilo Code for free — Auto Model Free, finding free models, free autocomplete, and free background tasks" --- # Using Kilo for Free -Kilo Code can be used completely free of charge, but you need to understand where Kilo uses AI models and configure each one appropriately. +Kilo Code can be used completely free of charge. There are three places where Kilo uses AI model inference, and each can be configured to use free models. -## When Kilo Uses Model Inference +## Where Kilo Uses Models -Kilo uses AI model inference in three places: +1. **Agentic interactions** — Conversations with coding agents in IDE extensions (VS Code, JetBrains), CLI, and cloud services like App Builder and Code Reviewer +2. **Autocomplete** — In-editor code completions as you type (IDE extensions only) +3. **Background tasks** — Automatic session titles and context summarization -1. **Agentic interactions** - Coding assistant conversations in IDE extensions (VS Code, JetBrains), CLI, and cloud services like App Builder and Code Reviewer -2. **Autocomplete** - In-editor code completions as you type (IDE extensions only) -3. **CLI Background tasks** - Automatic session titles and context summarization (CLI only) - -Each of these can consume credits by default. **For a completely free Kilo experience, you must configure all three to use free models.** +Each of these consumes credits by default. **To use Kilo entirely for free, configure all three to use free models.** ## Free Agentic Usage -Kilo Code provides access to [free models](/docs/code-with-ai/agents/free-and-budget-models) for your coding tasks through the Kilo Gateway and partner providers. +Kilo provides free models for coding tasks through the Kilo Gateway and partner providers. -### Finding Free Models +### Auto Model Free -Free models are clearly labeled in the model picker across all Kilo platforms. To find and use them: +The easiest way to get started is [**Auto Model Free**](/docs/code-with-ai/agents/auto-model) (`kilo-auto/free`). This is a Kilo-provided model tier that automatically routes your requests to the best available free models — no configuration needed. + +### Finding Other Free Models + +You can also browse and select individual free models. In the model picker, type `free` to filter the list — free models are clearly labeled across all platforms. **In the IDE Extensions (VS Code, JetBrains):** 1. Click on the current model below the chat window -2. Browse the model list—free models are labeled as "(free)" -3. Select your preferred free model +2. Type `free` in the search box +3. Select any model labeled "(free)" **In the CLI:** -1. Open the CLI by running `kilo` -2. Use the `/models` command to browse available models -3. Free models are labeled as "free" -4. Select a free model for your tasks +1. Run `kilo` to open the CLI +2. Use the `/models` command +3. Type `free` to filter the list -### Free Models for Cloud Tasks +{% callout type="note" %} +Some free models may be rate limited by the upstream provider. If you hit a rate limit, try switching to a different free model. +{% /callout %} -Kilo's cloud services—including App Builder, Code Reviewer, and other cloud-based features—also support free models. When configuring a cloud task: +### Cloud Tasks -1. Look for the model selection dropdown -2. Free models are labeled as "(free)" in the dropdown -3. Select any free model to avoid using credits +Kilo's cloud services — App Builder, Code Reviewer, and others — also support free models. Select any model labeled "(free)" in the model dropdown when configuring a cloud task. {% callout type="tip" %} -The available free models change over time as Kilo partners with different AI inference providers. Check our [free and budget models guide](/docs/code-with-ai/agents/free-and-budget-models) for the latest options, and subscribe to our blog or join our Discord for updates. +Available free models change over time as Kilo partners with different inference providers. Subscribe to our blog or join our [Discord](https://kilo.ai/discord) for updates. {% /callout %} ## Free Autocomplete -Kilo Code's autocomplete feature provides AI-powered code completions as you type in the IDE extensions. +Kilo's autocomplete feature provides AI-powered code completions as you type in IDE extensions. -### Default Behavior - -By default, autocomplete is routed through the Kilo Code provider and uses credits from your account. - -### If You Don't Have Credits - -If you run out of credits and haven't configured a free alternative, autocomplete will stop working. Your main coding workflow won't be affected -- you just won't get AI-powered completions. +By default, autocomplete routes through the Kilo provider and uses credits. If you run out of credits without a free alternative configured, autocomplete stops working — but your main coding workflow is unaffected. ### How to Get It Free -Add your own Mistral Codestral API key via **BYOK (Bring Your Own Key)** on the Kilo Gateway. Mistral offers a free tier for Codestral, and when you configure a BYOK key, autocomplete requests are routed using your key — billed directly by Mistral at $0 on your Kilo balance. +Add your own Mistral AI (Codestral) API key via **BYOK (Bring Your Own Key)** on the Kilo Gateway. Mistral offers a free tier for Codestral. When you configure a BYOK key, autocomplete requests use your key directly — at no cost on your Kilo balance. -For step-by-step instructions, see our [Mistral Setup Guide](/docs/code-with-ai/features/autocomplete/mistral-setup). +See the [Mistral Setup Guide](/docs/code-with-ai/features/autocomplete/mistral-setup) for step-by-step instructions. -## Free CLI Background Tasks +## Free Background Tasks -The Kilo CLI uses AI in the background for quality-of-life features that enhance your experience like context compression and titling sessions. +Kilo uses a small model in the background for tasks like session titling. By default this is Kilo Auto Small, which consumes credits. If the small model is unavailable, Kilo falls back to your primary model — which may also consume credits if it's a paid model. -### Default Behavior +To avoid credit usage for background tasks, set the small model to a free model: -By default, CLI background tasks use `gpt-5-nano`, which consumes credits. +**In the VS Code extension:** Go to **Settings → Models** and change the small model to any free model. -### If You Don't Have Credits - -Background tasks degrade gracefully when you don't have credits: - -- **Session titles** fall back to truncating your first message instead of generating a smart summary -- **Context management** uses simple truncation instead of intelligent summarization -- **Your main workflow continues uninterrupted** - these are convenience features, not requirements - -### How to Get It Free - -Configure the `small_model` parameter in `~/.config/kilo/config.json` to use a free model: +**In the CLI:** Set the `small_model` parameter in `~/.config/kilo/config.json`: ```json { @@ -94,11 +79,11 @@ Configure the `small_model` parameter in `~/.config/kilo/config.json` to use a f } ``` -Replace `your-preferred-free-model` with any free model available in the model picker. +Replace `your-preferred-free-model` with any free model from the model picker. ## Related Resources -- [Free and Budget Models](/docs/code-with-ai/agents/free-and-budget-models) - Complete guide to free and budget-friendly model options -- [Mistral Setup Guide](/docs/code-with-ai/features/autocomplete/mistral-setup) - Step-by-step autocomplete setup via BYOK -- [Autocomplete](/docs/code-with-ai/features/autocomplete) - Full autocomplete documentation -- [CLI Documentation](/docs/code-with-ai/platforms/cli) - Complete CLI reference +- [Auto Model](/docs/code-with-ai/agents/auto-model) — Smart model routing including the free tier +- [Mistral Setup Guide](/docs/code-with-ai/features/autocomplete/mistral-setup) — Free autocomplete via BYOK +- [Autocomplete](/docs/code-with-ai/features/autocomplete) — Full autocomplete documentation +- [CLI Documentation](/docs/code-with-ai/platforms/cli) — Complete CLI reference diff --git a/packages/kilo-docs/pages/kiloclaw/chat-platforms/slack.md b/packages/kilo-docs/pages/kiloclaw/chat-platforms/slack.md index 4826ef7c3f..e0e35b525c 100644 --- a/packages/kilo-docs/pages/kiloclaw/chat-platforms/slack.md +++ b/packages/kilo-docs/pages/kiloclaw/chat-platforms/slack.md @@ -47,10 +47,7 @@ You need two tokens from Slack: ## Step 4: Pair Slack with KiloClaw -1. In Slack, DM the app and type your slash command (e.g., `/claw`) followed by anything — this triggers the pairing flow - -> 📝 **Note** -> The slash command is whatever you defined in the manifest. Any text after the command will work to trigger pairing. +1. In Slack, DM the app and send any message — this triggers the pairing flow 2. The app will return a pairing code 3. Return to [app.kilocode.ai/claw](https://app.kilocode.ai/claw) and confirm the pairing code and approve diff --git a/packages/kilo-docs/previous-docs-redirects.js b/packages/kilo-docs/previous-docs-redirects.js index c6d3804f43..f20702d05f 100644 --- a/packages/kilo-docs/previous-docs-redirects.js +++ b/packages/kilo-docs/previous-docs-redirects.js @@ -691,7 +691,13 @@ module.exports = [ }, { source: "/docs/advanced-usage/free-and-budget-models", - destination: "/docs/code-with-ai/agents/free-and-budget-models", + destination: "/docs/getting-started/using-kilo-for-free", + basePath: false, + permanent: true, + }, + { + source: "/docs/code-with-ai/agents/free-and-budget-models", + destination: "/docs/getting-started/using-kilo-for-free", basePath: false, permanent: true, }, diff --git a/packages/kilo-gateway/package.json b/packages/kilo-gateway/package.json index ffca4a9415..5691509af8 100644 --- a/packages/kilo-gateway/package.json +++ b/packages/kilo-gateway/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@kilocode/kilo-gateway", - "version": "7.1.23", + "version": "7.2.3", "type": "module", "license": "MIT", "description": "Unified Kilo Gateway package for OpenCode - authentication, provider, and API integration", diff --git a/packages/kilo-i18n/package.json b/packages/kilo-i18n/package.json index 83091e5838..18c75ae505 100644 --- a/packages/kilo-i18n/package.json +++ b/packages/kilo-i18n/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@kilocode/kilo-i18n", - "version": "7.1.23", + "version": "7.2.3", "type": "module", "license": "MIT", "description": "Kilo-specific i18n translations and overrides", diff --git a/packages/kilo-telemetry/package.json b/packages/kilo-telemetry/package.json index 6bed2eac5d..046f52041c 100644 --- a/packages/kilo-telemetry/package.json +++ b/packages/kilo-telemetry/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@kilocode/kilo-telemetry", - "version": "7.1.23", + "version": "7.2.3", "type": "module", "license": "MIT", "description": "Telemetry for Kilo CLI - PostHog analytics integration", diff --git a/packages/kilo-telemetry/src/events.ts b/packages/kilo-telemetry/src/events.ts index ddfde6a9a8..c621da8dc0 100644 --- a/packages/kilo-telemetry/src/events.ts +++ b/packages/kilo-telemetry/src/events.ts @@ -25,6 +25,9 @@ export enum TelemetryEvent { MCP_SERVER_CONNECTED = "MCP Server Connected", MCP_SERVER_ERROR = "MCP Server Error", + // Remote Events + REMOTE_CONNECTION_OPENED = "Remote Connection Opened", + // Auth Events AUTH_SUCCESS = "Auth Success", AUTH_LOGOUT = "Auth Logout", diff --git a/packages/kilo-telemetry/src/telemetry.ts b/packages/kilo-telemetry/src/telemetry.ts index 5b353aadca..5e4379892d 100644 --- a/packages/kilo-telemetry/src/telemetry.ts +++ b/packages/kilo-telemetry/src/telemetry.ts @@ -184,6 +184,11 @@ export namespace Telemetry { track(TelemetryEvent.MCP_SERVER_ERROR, { server, error }) } + // Remote + export function trackRemoteConnectionOpened() { + track(TelemetryEvent.REMOTE_CONNECTION_OPENED) + } + // Auth export function trackAuthSuccess(provider: string) { track(TelemetryEvent.AUTH_SUCCESS, { provider }) diff --git a/packages/kilo-ui/package.json b/packages/kilo-ui/package.json index 327a1083c7..4f99390c20 100644 --- a/packages/kilo-ui/package.json +++ b/packages/kilo-ui/package.json @@ -1,6 +1,6 @@ { "name": "@kilocode/kilo-ui", - "version": "7.1.23", + "version": "7.2.3", "type": "module", "license": "MIT", "exports": { diff --git a/packages/kilo-ui/src/components/diff.tsx b/packages/kilo-ui/src/components/diff.tsx index a96af21fe1..66c8176cbc 100644 --- a/packages/kilo-ui/src/components/diff.tsx +++ b/packages/kilo-ui/src/components/diff.tsx @@ -142,6 +142,24 @@ export function Diff(props: DiffProps) { host.removeAttribute("data-color-scheme") } + // Patch a bug in @pierre/diffs where `grid-template-columns: 100% auto` is set + // for `line-info-basic` separators under `@media (pointer: fine)`, causing the + // expand button to consume 100% of the gutter width and overlap the separator + // content text. We inject into `@layer unsafe` which overrides `@layer base`. + let separatorPatchSheet: CSSStyleSheet | null = null + const patchSeparatorLayout = () => { + const root = getRoot() + if (!root) return + if (!separatorPatchSheet) { + separatorPatchSheet = new CSSStyleSheet() + separatorPatchSheet.replaceSync( + `@layer unsafe { @media (pointer: fine) { [data-separator='line-info-basic'][data-expand-index] [data-separator-wrapper] { grid-template-columns: 34px auto; } } }`, + ) + } + if (!root.adoptedStyleSheets.includes(separatorPatchSheet)) + root.adoptedStyleSheets = [...root.adoptedStyleSheets, separatorPatchSheet] + } + const lineIndex = (split: boolean, element: HTMLElement) => { const raw = element.dataset.lineIndex if (!raw) return @@ -576,6 +594,7 @@ export function Diff(props: DiffProps) { }) applyScheme() + patchSeparatorLayout() setRendered((value) => value + 1) notifyRendered() diff --git a/packages/kilo-ui/src/components/message-part.css b/packages/kilo-ui/src/components/message-part.css index 307ae9fccd..802bea6c7f 100644 --- a/packages/kilo-ui/src/components/message-part.css +++ b/packages/kilo-ui/src/components/message-part.css @@ -19,6 +19,18 @@ height: 20px; } } + + [data-slot="assistant-copy-wrapper"] { + display: flex; + align-items: center; + justify-content: flex-start; + margin-top: 2px; + + [data-component="icon-button"] { + width: 20px; + height: 20px; + } + } } /* Prevent long title/path from hiding the collapsible expand arrow */ diff --git a/packages/kilo-ui/src/components/message-part.tsx b/packages/kilo-ui/src/components/message-part.tsx index 187a6a2df2..41388c8622 100644 --- a/packages/kilo-ui/src/components/message-part.tsx +++ b/packages/kilo-ui/src/components/message-part.tsx @@ -949,6 +949,7 @@ export function Part(props: MessagePartProps) { export interface ToolProps { input: Record metadata: Record + partMetadata?: Record tool: string partID?: string callID?: string @@ -1060,7 +1061,8 @@ PART_MAPPING["tool"] = function ToolPartDisplay(props) { const input = () => part.state?.input ?? emptyInput // @ts-expect-error - const partMetadata = () => part.state?.metadata ?? emptyMetadata + const meta = () => part.state?.metadata ?? emptyMetadata + const top = () => part.metadata ?? emptyMetadata const render = createMemo(() => ToolRegistry.render(part.tool) ?? McpTool) @@ -1122,7 +1124,8 @@ PART_MAPPING["tool"] = function ToolPartDisplay(props) { tool={part.tool} partID={part.id} callID={part.callID} - metadata={partMetadata()} + metadata={meta()} + partMetadata={top()} // @ts-expect-error output={part.state.output} status={part.state.status} @@ -1155,6 +1158,7 @@ PART_MAPPING["compaction"] = function CompactionPartDisplay() { PART_MAPPING["text"] = function TextPartDisplay(props) { const data = useData() + const i18n = useI18n() const part = () => props.part as TextPart const displayText = () => (part().text ?? "").trim() @@ -1166,6 +1170,21 @@ PART_MAPPING["text"] = function TextPartDisplay(props) { return props.turnDiffSummary }) + const showCopy = createMemo(() => { + if (props.message.role !== "assistant") return false + if (props.showAssistantCopyPartID === null) return false + return props.showAssistantCopyPartID === part().id + }) + const [copied, setCopied] = createSignal(false) + + const handleCopy = async () => { + const content = displayText() + if (!content) return + await navigator.clipboard.writeText(content) + setCopied(true) + setTimeout(() => setCopied(false), 2000) + } + const handleMarkdownClick = (e: MouseEvent) => { if (!data.openFile) return const target = e.target @@ -1200,6 +1219,24 @@ PART_MAPPING["text"] = function TextPartDisplay(props) {
+ +
+ + e.preventDefault()} + onClick={handleCopy} + aria-label={copied() ? i18n.t("ui.message.copied") : i18n.t("ui.message.copyResponse")} + /> + +
+ {(render) => ( @@ -1220,6 +1257,9 @@ const streamed = new Set() // Tracks parts that have already been auto-collapsed once, so component // recreation (from store updates while other parts stream) won't collapse again. const autocollapsed = new Set() +// Tracks parts that the user has explicitly opened, so auto-collapse won't +// override the user's intent when reasoning finishes or a tool call starts. +const userOpened = new Set() // Overrides upstream flat markdown render with streaming reasoning block + auto-collapse. // Also filters encrypted reasoning data from OpenRouter that appears as [REDACTED]. @@ -1249,14 +1289,24 @@ PART_MAPPING["reasoning"] = function ReasoningPartDisplay(props: MessagePartProp // Streaming → open. Just finished (was streaming, now done) → open briefly // then collapse. Historical → collapsed from the start. - const [open, setOpen] = createSignal(!done() || was) + // Restore user's explicit open preference across component recreations. + const [open, setOpen] = createSignal(!done() || was || userOpened.has(id)) + + // Propagate user intent to the module-level set so it survives component + // recreations (e.g. when a tool call arrives while reading reasoning). + const track = (value: boolean) => { + if (value) userOpened.add(id) + else userOpened.delete(id) + setOpen(value) + } // Auto-collapse once when reasoning finishes (streaming → done transition). // Collapses immediately so the grid transition runs in sync with the // streaming-height removal. Module-level Set prevents re-triggering on - // component recreation or when the user manually reopens. + // component recreation. Skipped entirely if the user has explicitly opened + // the block, so reading is not interrupted by a subsequent tool call. createEffect(() => { - if (done() && open() && !autocollapsed.has(id)) { + if (done() && open() && !autocollapsed.has(id) && !userOpened.has(id)) { autocollapsed.add(id) setOpen(false) } @@ -1264,13 +1314,32 @@ PART_MAPPING["reasoning"] = function ReasoningPartDisplay(props: MessagePartProp onCleanup(() => { if (done()) streamed.delete(id) + // userOpened is intentionally NOT deleted here. The component recreates + // frequently while other parts stream (same as autocollapsed), so removing + // the entry on unmount would discard the user's explicit preference and + // re-collapse the block on the next remount. }) - // Auto-scroll the content container while streaming + // Auto-scroll the content container while streaming. + // Use a plain mutable flag rather than checking dist inside the reactive + // effect: by the time the effect runs the DOM has already grown, so reading + // scrollHeight post-update incorrectly reports the user as scrolled away + // whenever a streaming chunk is > 10px tall. let ref: HTMLDivElement | undefined + let scrolled = false + + const onScroll = (e: Event) => { + const el = e.currentTarget as HTMLDivElement + if (el.scrollHeight - el.clientHeight - el.scrollTop < 10) scrolled = false + } + + const onWheel = (e: WheelEvent) => { + if (e.deltaY < 0) scrolled = true + } + createEffect(() => { display() - if (!done() && ref) { + if (!done() && ref && !scrolled) { ref.scrollTop = ref.scrollHeight } }) @@ -1278,7 +1347,7 @@ PART_MAPPING["reasoning"] = function ReasoningPartDisplay(props: MessagePartProp return (
- +
@@ -1287,7 +1356,7 @@ PART_MAPPING["reasoning"] = function ReasoningPartDisplay(props: MessagePartProp -
+
diff --git a/packages/kilo-ui/src/hooks/create-auto-scroll.tsx b/packages/kilo-ui/src/hooks/create-auto-scroll.tsx index 6ea1f5d8ad..81fa4874be 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 diff --git a/packages/kilo-ui/tests/visual-regression.spec.ts-snapshots/components-messagepart/with-reasoning-expanded-chromium-linux.png b/packages/kilo-ui/tests/visual-regression.spec.ts-snapshots/components-messagepart/with-reasoning-expanded-chromium-linux.png index ca56f4c8fa..db85480266 100644 --- a/packages/kilo-ui/tests/visual-regression.spec.ts-snapshots/components-messagepart/with-reasoning-expanded-chromium-linux.png +++ b/packages/kilo-ui/tests/visual-regression.spec.ts-snapshots/components-messagepart/with-reasoning-expanded-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b0f41c54aca88874a3c74151b77ef20f0f17fa9bb2f149c13adfaf4f48de286 -size 14702 +oid sha256:cc32d99eeff1cb3061caa4a75e3353e30e6373073bbd7ebf17048c917367e11a +size 28005 diff --git a/packages/kilo-vscode/docs/features/file-attachments.md b/packages/kilo-vscode/docs/features/file-attachments.md index 6c452631f0..b9e90c0208 100644 --- a/packages/kilo-vscode/docs/features/file-attachments.md +++ b/packages/kilo-vscode/docs/features/file-attachments.md @@ -5,6 +5,19 @@ Image attachments and `@file` path mentions work. Non-image file content attachments are missing. +## Supported Image Types + +The following image formats are supported for paste and drag-and-drop: + +- PNG (`image/png`) +- JPEG (`image/jpeg`) +- GIF (`image/gif`) +- WebP (`image/webp`) + +## Drag-and-Drop (Shift Required) + +VS Code disables webview pointer-events during drag operations so it can handle drops in the editor area. To drop images into the chat input, **hold Shift while dragging**. This re-enables the webview to receive drop events (VS Code 1.91+, see [microsoft/vscode#182449](https://github.com/microsoft/vscode/issues/182449)). + ## Remaining Work - Add a file attachment button to the chat input toolbar (paperclip icon or similar) diff --git a/packages/kilo-vscode/esbuild.js b/packages/kilo-vscode/esbuild.js index 69b79df854..549e60910e 100644 --- a/packages/kilo-vscode/esbuild.js +++ b/packages/kilo-vscode/esbuild.js @@ -191,23 +191,34 @@ async function main() { // Build Diff Viewer webview (SolidJS, reuses Agent Manager diff components) const diffViewerCtx = await createBrowserWebviewContext("webview-ui/diff-viewer/index.tsx", "dist/diff-viewer.js") + // Build Diff Virtual webview (lightweight single-file diff for permission approval) + const diffVirtualCtx = await createBrowserWebviewContext("webview-ui/diff-virtual/index.tsx", "dist/diff-virtual.js") + // Build webview const webviewCtx = await createBrowserWebviewContext("webview-ui/src/index.tsx", "dist/webview.js") if (watch) { - await Promise.all([extensionCtx.watch(), webviewCtx.watch(), agentManagerCtx.watch(), diffViewerCtx.watch()]) + await Promise.all([ + extensionCtx.watch(), + webviewCtx.watch(), + agentManagerCtx.watch(), + diffViewerCtx.watch(), + diffVirtualCtx.watch(), + ]) } else { await Promise.all([ extensionCtx.rebuild(), webviewCtx.rebuild(), agentManagerCtx.rebuild(), diffViewerCtx.rebuild(), + diffVirtualCtx.rebuild(), ]) await Promise.all([ extensionCtx.dispose(), webviewCtx.dispose(), agentManagerCtx.dispose(), diffViewerCtx.dispose(), + diffVirtualCtx.dispose(), ]) } } diff --git a/packages/kilo-vscode/eslint.config.mjs b/packages/kilo-vscode/eslint.config.mjs index f82b5a9d93..fe2a70ddb5 100644 --- a/packages/kilo-vscode/eslint.config.mjs +++ b/packages/kilo-vscode/eslint.config.mjs @@ -29,13 +29,76 @@ export default [ eqeqeq: "warn", "no-throw-literal": "warn", "max-lines": ["error", 3000], + complexity: ["error", 20], }, }, + + // ── Complexity exceptions ───────────────────────────────────────── + // Existing violations capped at their current max. + // New code must stay ≤ 20. Do not raise these caps; refactor instead. { files: ["src/KiloProvider.ts"], - rules: { - "max-lines": ["error", 3200], - }, + rules: { complexity: ["error", 140], "max-lines": ["error", 3300] }, }, + { + files: ["webview-ui/agent-manager/AgentManagerApp.tsx"], + rules: { complexity: ["error", 74], "max-lines": ["error", 3100] }, + }, + { + files: ["src/agent-manager/AgentManagerProvider.ts"], + rules: { complexity: ["error", 64] }, + }, + { + files: ["webview-ui/src/components/chat/PromptInput.tsx"], + rules: { complexity: ["error", 48] }, + }, + { + files: ["src/legacy-migration/migration-service.ts"], + rules: { complexity: ["error", 45] }, + }, + { + files: ["webview-ui/src/components/migration/MigrationWizard.tsx"], + rules: { complexity: ["error", 37] }, + }, + { + files: ["webview-ui/src/context/session.tsx"], + rules: { complexity: ["error", 31] }, + }, + { + files: ["src/services/autocomplete/classic-auto-complete/AutocompleteInlineCompletionProvider.ts"], + rules: { complexity: ["error", 30] }, + }, + { + files: ["src/agent-manager/WorktreeManager.ts", "webview-ui/src/components/chat/QuestionDock.tsx"], + rules: { complexity: ["error", 28] }, + }, + { + files: [ + "src/kilo-provider-utils.ts", + "src/services/autocomplete/continuedev/core/autocomplete/postprocessing/index.ts", + ], + rules: { complexity: ["error", 27] }, + }, + { + files: ["webview-ui/src/components/settings/CustomProviderDialog.tsx"], + rules: { complexity: ["error", 26] }, + }, + { + files: ["src/agent-manager/WorktreeStateManager.ts"], + rules: { complexity: ["error", 24] }, + }, + { + files: ["webview-ui/src/utils/errorUtils.ts"], + rules: { complexity: ["error", 23] }, + }, + { + files: ["src/services/autocomplete/continuedev/core/autocomplete/filtering/BracketMatchingService.ts"], + rules: { complexity: ["error", 22] }, + }, + { + files: ["webview-ui/src/context/server.tsx"], + rules: { complexity: ["error", 21] }, + }, + eslintConfigPrettier, ] diff --git a/packages/kilo-vscode/knip.json b/packages/kilo-vscode/knip.json index 806593bc57..3e71849562 100644 --- a/packages/kilo-vscode/knip.json +++ b/packages/kilo-vscode/knip.json @@ -4,6 +4,7 @@ "src/extension.ts", "webview-ui/agent-manager/index.tsx", "webview-ui/diff-viewer/index.tsx", + "webview-ui/diff-virtual/index.tsx", "webview-ui/src/index.tsx", "src/**/__tests__/**/*.{ts,spec.ts}", "src/**/*.test.ts", @@ -11,7 +12,6 @@ "script/*.ts" ], "project": ["src/**/*.ts", "webview-ui/**/*.{ts,tsx}"], - "ignore": ["src/services/autocomplete/**"], "ignoreExportsUsedInFile": true, "exclude": ["dependencies", "devDependencies", "optionalPeerDependencies", "unlisted", "unresolved", "binaries"] } diff --git a/packages/kilo-vscode/package.json b/packages/kilo-vscode/package.json index 44ef0219c8..bb4f4ef35a 100644 --- a/packages/kilo-vscode/package.json +++ b/packages/kilo-vscode/package.json @@ -2,7 +2,7 @@ "name": "kilo-code", "displayName": "Kilo Code: AI Coding Agent, Copilot, and Autocomplete", "description": "Open Source AI coding agent that generates code from natural language, automates tasks, and runs terminal commands. Features inline autocomplete, browser automation, automated refactoring, and custom modes for planning, coding, and debugging. Supports 500+ AI models including Claude (Anthropic), Gemini, Grok, GPT, Codex and GLM.", - "version": "7.1.23", + "version": "7.2.3", "icon": "assets/icons/logo-outline-black.png", "galleryBanner": { "color": "#FFFFFF", @@ -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/DiffViewerProvider.ts b/packages/kilo-vscode/src/DiffViewerProvider.ts index f9f143f746..67466a0fa8 100644 --- a/packages/kilo-vscode/src/DiffViewerProvider.ts +++ b/packages/kilo-vscode/src/DiffViewerProvider.ts @@ -212,6 +212,7 @@ export class DiffViewerProvider implements vscode.Disposable { public dispose(): void { this.stopDiffPolling() + this.gitOps.dispose() this.panel?.dispose() this.outputChannel.dispose() } diff --git a/packages/kilo-vscode/src/DiffVirtualProvider.ts b/packages/kilo-vscode/src/DiffVirtualProvider.ts new file mode 100644 index 0000000000..b585ee71fd --- /dev/null +++ b/packages/kilo-vscode/src/DiffVirtualProvider.ts @@ -0,0 +1,107 @@ +import * as vscode from "vscode" +import { buildWebviewHtml } from "./utils" +import { appendOutput, getWorkspaceRoot } from "./review-utils" + +export interface DiffVirtualFile { + file: string + before: string + after: string + additions: number + deletions: number +} + +/** + * DiffVirtualProvider opens a lightweight diff viewer for a single in-memory + * file diff (not backed by git). Used by the permission approval dock to show + * edit changes before the user approves or rejects them. + */ +export class DiffVirtualProvider implements vscode.Disposable { + private panel: vscode.WebviewPanel | undefined + private pending: DiffVirtualFile | undefined + private outputChannel: vscode.OutputChannel + + constructor(private readonly extensionUri: vscode.Uri) { + this.outputChannel = vscode.window.createOutputChannel("Kilo Diff Virtual") + } + + private log(...args: unknown[]) { + appendOutput(this.outputChannel, "DiffVirtual", ...args) + } + + public open(diff: DiffVirtualFile): void { + this.pending = diff + const filename = diff.file.split("/").pop() ?? diff.file + const title = `Changes: ${filename}` + + if (this.panel) { + this.panel.title = title + this.panel.reveal(vscode.ViewColumn.One) + this.pushData() + return + } + + const panel = vscode.window.createWebviewPanel("kilo-code.new.DiffVirtualPanel", title, vscode.ViewColumn.One, { + enableScripts: true, + retainContextWhenHidden: true, + localResourceRoots: [this.extensionUri], + }) + + panel.iconPath = { + light: vscode.Uri.joinPath(this.extensionUri, "assets", "icons", "kilo-light.svg"), + dark: vscode.Uri.joinPath(this.extensionUri, "assets", "icons", "kilo-dark.svg"), + } + + panel.webview.html = this.getHtml(panel.webview) + panel.webview.onDidReceiveMessage((msg) => this.onMessage(msg)) + panel.onDidDispose(() => { + this.log("Panel disposed") + this.panel = undefined + this.pending = undefined + }) + + this.panel = panel + } + + private onMessage(msg: Record): void { + const type = msg.type as string + + if (type === "webviewReady") { + this.post({ + type: "ready", + vscodeLanguage: vscode.env.language, + languageOverride: vscode.workspace.getConfiguration("kilo-code.new").get("language"), + workspaceDirectory: getWorkspaceRoot(), + }) + this.pushData() + return + } + + if (type === "diffVirtual.close") { + this.panel?.dispose() + } + } + + private pushData(): void { + if (!this.pending) return + this.post({ type: "diffVirtual.data", diff: this.pending }) + } + + private post(message: Record): void { + if (this.panel?.webview) void this.panel.webview.postMessage(message) + } + + private getHtml(webview: vscode.Webview): string { + return buildWebviewHtml(webview, { + scriptUri: webview.asWebviewUri(vscode.Uri.joinPath(this.extensionUri, "dist", "diff-virtual.js")), + styleUri: webview.asWebviewUri(vscode.Uri.joinPath(this.extensionUri, "dist", "diff-virtual.css")), + iconsBaseUri: webview.asWebviewUri(vscode.Uri.joinPath(this.extensionUri, "assets", "icons")), + title: "Diff Virtual", + extraStyles: "#root { display: flex; flex-direction: column; height: 100%; }", + }) + } + + public dispose(): void { + this.panel?.dispose() + this.outputChannel.dispose() + } +} diff --git a/packages/kilo-vscode/src/KiloProvider.ts b/packages/kilo-vscode/src/KiloProvider.ts index 2b153315bb..23f90af0cf 100644 --- a/packages/kilo-vscode/src/KiloProvider.ts +++ b/packages/kilo-vscode/src/KiloProvider.ts @@ -1,3 +1,4 @@ +/* eslint-disable max-lines -- TODO: refactor to reduce file size and remove this disable */ import * as path from "path" import * as vscode from "vscode" import { z } from "zod" @@ -35,11 +36,15 @@ import { import { GitOps } from "./agent-manager/GitOps" import { GitStatsPoller, type LocalStats } from "./agent-manager/GitStatsPoller" import { getWorkspaceRoot } from "./review-utils" -import { MarketplaceService } from "./services/marketplace" +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" import { slimPart, slimParts } from "./kilo-provider/slim-metadata" import { matchFollowup, recordFollowup, type Followup } from "./kilo-provider/followup-session" +import { childID } from "./kilo-provider/task-session" +import { retryable, backoff, MAX_RETRIES } from "./util/retry" // legacy-migration start import { checkAndShowMigrationWizard, @@ -88,14 +93,29 @@ import { saveCustomProvider as saveCustomProviderAction, } from "./provider-actions" import { fetchOpenAIModels, FetchModelsError } from "./shared/fetch-models" +import type { Agent } from "@kilocode/sdk/v2/client" type KiloProviderOptions = { projectDirectory?: string | null slimEditMetadata?: boolean } +// Helper to map agent data to the subset of fields sent to the webview +const mapAgent = (a: Agent) => ({ + name: a.name, + displayName: a.displayName, + description: a.description, + mode: a.mode, + native: a.native, + hidden: a.hidden, + color: a.color, + deprecated: a.deprecated, + permission: a.permission, +}) + 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 @@ -124,10 +144,13 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper private cachedMcpStatusMessage: unknown = null /** Ref-count of in-flight handleUpdateConfig calls; prevents fetchAndSendConfig from sending stale data */ private pending = 0 + private configWarningsShown = false /** Cached notificationsLoaded payload */ 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. */ @@ -156,6 +179,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 @@ -168,6 +193,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper private pendingFollowup: Followup | null = null /** Worktree diff stats poller for the sidebar badge — reuses GitStatsPoller (local stats only) */ private statsPoller: GitStatsPoller | null = null + private statsGitOps: GitOps | null = null private cachedStats: unknown = null /** Optional interceptor called before the standard message handler. @@ -179,6 +205,10 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper | ((sessionId: string, progress: (status: string, detail?: string, error?: string) => void) => Promise) | null = null + private diffVirtualProvider: import("./DiffVirtualProvider").DiffVirtualProvider | undefined + private remoteService: RemoteStatusService | null = null + private unsubscribeRemote: (() => void) | null = null + constructor( private readonly extensionUri: vscode.Uri, private readonly connectionService: KiloConnectionService, @@ -191,12 +221,29 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper TelemetryProxy.getInstance().setProvider(this) } + setRemoteService(service: RemoteStatusService): void { + this.remoteService = service + 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 { if (this.projectDirectory === directory) return this.projectDirectory = directory this.postMessage({ type: "workspaceDirectoryChanged", directory: directory ?? "" }) } + public setDiffVirtualProvider(provider: import("./DiffVirtualProvider").DiffVirtualProvider): void { + this.diffVirtualProvider = provider + } + getTelemetryProperties(): Record { return { appName: "kilo-code", @@ -281,7 +328,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper // Use fire-and-forget (no throwOnError) to match old getProfile() which returned null on error. if (this.connectionState === "connected" && this.client) { console.log("[Kilo New] KiloProvider: 👤 syncWebviewState fetching profile...") - const profileResult = await this.client.kilo.profile() + const profileResult = await retry(() => this.client!.kilo.profile()) const profileData = profileResult.data ?? null console.log("[Kilo New] KiloProvider: 👤 syncWebviewState profile:", profileData ? "received" : "null") this.postMessage({ @@ -300,6 +347,8 @@ 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) + + this.sendRemoteStatus() } // legacy-migration start @@ -330,20 +379,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() } @@ -362,9 +407,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) - + this.viewStateDisposable?.dispose() + this.viewStateDisposable = panel.onDidChangeViewState(() => + this.focusSession(panel.active ? this.currentSession?.id : undefined), + ) this.initializeConnection() } @@ -420,6 +467,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 }) } @@ -456,6 +527,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper */ private setupWebviewMessageHandler(webview: vscode.Webview): void { this.webviewMessageDisposable?.dispose() + // eslint-disable-next-line complexity -- TODO: refactor to reduce complexity and remove this disable this.webviewMessageDisposable = webview.onDidReceiveMessage(async (message) => { // Run interceptor if attached (e.g., AgentManagerProvider worktree logic) if (this.onBeforeMessage) { @@ -475,6 +547,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": { @@ -529,6 +602,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper break } case "abort": + this.cancelRetry(message.sessionID ?? "") await this.handleAbort(message.sessionID) break case "revertSession": @@ -557,6 +631,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper case "clearSession": this.contextSessionID = this.currentSession?.id ?? this.contextSessionID this.currentSession = null + this.focusSession() break case "loadMessages": // Don't await: allow parallel loads so rapid session switching @@ -608,6 +683,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper case "openChanges": vscode.commands.executeCommand("kilo-code.new.showChanges") break + case "openDiffVirtual": + if (this.diffVirtualProvider && message.diff) { + this.diffVirtualProvider.open(message.diff) + } + break case "continueInWorktree": if (message.sessionId && this.continueInWorktreeHandler) { this.continueInWorktreeHandler(message.sessionId, (status: string, detail?: string, error?: string) => { @@ -787,6 +867,16 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper case "renameSession": await this.handleRenameSession(message.sessionID, message.title) break + case "toggleRemote": + case "setRemoteEnabled": + 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 "updateSetting": await this.handleUpdateSetting(message.key, message.value) break @@ -965,12 +1055,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper break } case "removeInstalledMarketplaceItem": { - const workspace = this.getProjectDirectory(this.currentSession?.id) const scope = message.mpInstallOptions?.target ?? "project" - const result = await this.getMarketplace().remove(message.mpItem, scope, workspace) - if (result.success) { - await this.invalidateAfterMarketplaceChange(scope) - } + const result = await this.removeMarketplaceItem(message.mpItem, scope) this.postMessage({ type: "marketplaceRemoveResult", success: result.success, @@ -1022,6 +1108,8 @@ 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. @@ -1052,6 +1140,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.postMessage({ type: "connectionState", state }) if (state === "connected") { + // Fire config warnings independently so a failure in the + // sequential await chain doesn't prevent warnings from being shown + void this.checkConfigWarnings("state") try { // Profile fetch is best-effort — returns 401 when user isn't logged into gateway. const sdkClient = this.client @@ -1061,8 +1152,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({ @@ -1127,8 +1217,17 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper } this.postMessage({ type: "connectionState", state: this.connectionState }) + + // connect() can resolve after SSE reaches "connected" but before this + // provider subscribes to onStateChange(). In that case the initial + // connected callback is missed, so run the warning check here too. + if (this.connectionState === "connected") { + void this.checkConfigWarnings("init") + } + await this.syncWebviewState("initializeConnection") await this.flushPendingSessionRefresh("initializeConnection") + this.recoverPendingPrompts() // Fetch providers, agents, skills, config, notifications, and session statuses in parallel await Promise.all([ @@ -1142,6 +1241,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper ]) this.sendNotificationSettings() this.sendTimelineSetting() + this.postMessage({ type: "extensionDataReady" }) // Start polling worktree diff stats for the sidebar badge this.startStatsPolling() @@ -1206,6 +1306,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.focusSession(sessionID) this.contextSessionID = sessionID if (!this.client) { @@ -1225,9 +1326,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory(sessionID) - const { data: messagesData } = await this.client.session.messages( - { sessionID, directory: workspaceDir }, - { throwOnError: true, signal: abort.signal }, + const { data: messagesData } = await retry(() => + this.client!.session.messages( + { sessionID, directory: workspaceDir }, + { throwOnError: true, signal: abort.signal }, + ), ) // If this request was aborted while awaiting, skip posting stale results @@ -1289,9 +1392,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 @@ -1328,9 +1430,8 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory(sessionID) - const { data: messagesData } = await this.client.session.messages( - { sessionID, directory: workspaceDir }, - { throwOnError: true }, + const { data: messagesData } = await retry(() => + this.client!.session.messages({ sessionID, directory: workspaceDir }, { throwOnError: true }), ) const messages = messagesData.map((m) => ({ @@ -1349,11 +1450,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) @@ -1600,21 +1698,16 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory() - const { data: agents } = await this.client.app.agents({ directory: workspaceDir }, { throwOnError: true }) + const { data: agents } = await retry(() => + this.client!.app.agents({ directory: workspaceDir }, { throwOnError: true }), + ) const { visible, defaultAgent } = filterVisibleAgents(agents) const message = { type: "agentsLoaded", - agents: visible.map((a) => ({ - name: a.name, - displayName: a.displayName, - description: a.description, - mode: a.mode, - native: a.native, - color: a.color, - deprecated: a.deprecated, - })), + agents: visible.map(mapAgent), + allAgents: agents.map(mapAgent), defaultAgent, } this.cachedAgentsMessage = message @@ -1634,7 +1727,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory() - const { data: skills } = await this.client.app.skills({ directory: workspaceDir }, { throwOnError: true }) + const { data: skills } = await retry(() => + this.client!.app.skills({ directory: workspaceDir }, { throwOnError: true }), + ) const message = { type: "skillsLoaded", @@ -1657,7 +1752,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const dir = this.getWorkspaceDirectory() - const { data: commands } = await this.client.command.list({ directory: dir }, { throwOnError: true }) + const { data: commands } = await retry(() => + this.client!.command.list({ directory: dir }, { throwOnError: true }), + ) const message = { type: "commandsLoaded", @@ -1679,7 +1776,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper if (!this.client) return undefined try { const dir = this.getWorkspaceDirectory() - const { data } = await this.client.app.skills({ directory: dir }, { throwOnError: true }) + const { data } = await retry(() => this.client!.app.skills({ directory: dir }, { throwOnError: true })) return data } catch (error) { console.error("[Kilo New] KiloProvider: Failed to fetch CLI skills for marketplace:", error) @@ -1724,59 +1821,87 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper */ private async handleRemoveMode(name: string): Promise { if (!this.client) return - let removed = false // 1. Try CLI removal (handles .md files and legacy .kilocodemodes) try { const dir = this.getWorkspaceDirectory() const result = await this.client.kilocode.removeAgent({ name, directory: dir }) - if (!result.error) removed = true + if (!result.error) { + this.cachedAgentsMessage = null + await this.fetchAndSendAgents() + return + } } catch { // CLI removal failed — agent may be in kilo.json instead } // 2. Try removing from kilo.json (handles marketplace-installed modes) - if (!removed) { - const workspace = this.getProjectDirectory(this.currentSession?.id) - const mp = this.getMarketplace() - const stub = { id: name, type: "mode" as const, name, description: "", content: "" } - const project = await mp.remove(stub, "project", workspace) - const global = await mp.remove(stub, "global", workspace) - if (project.success || global.success) { - await this.disposeCliInstance("global") - removed = true - } - } - + const stub = { id: name, type: "mode" as const, name, description: "", content: "" } + const removed = await this.removeMarketplaceItemFromAllScopes(stub) if (!removed) { console.error("[Kilo New] KiloProvider: Failed to remove mode:", name) } - - this.cachedAgentsMessage = null - await this.fetchAndSendAgents() } private async handleRemoveMcp(name: string): Promise { - const workspace = this.getProjectDirectory(this.currentSession?.id) - const mp = this.getMarketplace() + // Remove from legacy files first so that the subsequent invalidation + // causes the CLI to re-read config without the legacy entry. + await this.removeLegacyMcp(name) + const stub = { id: name, type: "mcp" as const, name, description: "", url: "", content: "" } - - // Remove from both scopes — an MCP could exist in project, global, or both - const project = await mp.remove(stub, "project", workspace) - const global = await mp.remove(stub, "global", workspace) - - if (project.success || global.success) { - // Use global scope when removed from global (or both) so the global - // config cache is also invalidated; project scope is a subset. - const scope = global.success ? "global" : "project" - await this.disposeCliInstance(scope) - this.cachedConfigMessage = null - await this.fetchAndSendConfig() - } else { + const removed = await this.removeMarketplaceItemFromAllScopes(stub) + if (!removed) { console.error("[Kilo New] KiloProvider: Failed to remove MCP server:", name) } } + /** + * Remove an MCP server from legacy config files (.kilo/mcp.json, .kilocode/mcp.json, + * and the VS Code global storage mcp_settings.json). These files are read by the + * CLI-side McpMigrator and merged into config at the lowest precedence level. + * Returns true if the entry was found and removed from at least one file. + */ + private async removeLegacyMcp(name: string): Promise { + const workspace = this.getProjectDirectory(this.currentSession?.id) + const files: vscode.Uri[] = [] + + // Project-level legacy files + if (workspace) { + files.push(vscode.Uri.file(path.join(workspace, ".kilo", "mcp.json"))) + files.push(vscode.Uri.file(path.join(workspace, ".kilocode", "mcp.json"))) + } + + // Global legacy file (VS Code extension global storage) + const storage = this.extensionContext?.globalStorageUri + if (storage) { + files.push(vscode.Uri.joinPath(storage, "settings", "mcp_settings.json")) + } + + let removed = false + for (const uri of files) { + const bytes = await vscode.workspace.fs.readFile(uri).then( + (b) => b, + () => null, + ) + if (!bytes) continue + + try { + const parsed = JSON.parse(Buffer.from(bytes).toString("utf8")) as Record + const servers = parsed.mcpServers as Record | undefined + if (!servers?.[name]) continue + + delete servers[name] + const content = Buffer.from(JSON.stringify(parsed, null, 2), "utf8") + await vscode.workspace.fs.writeFile(uri, content) + removed = true + } catch (err) { + console.warn("[Kilo New] KiloProvider: Failed to remove legacy MCP from", uri.fsPath, err) + } + } + + return removed + } + private async fetchAndSendMcpStatus(): Promise { if (!this.client) { if (this.cachedMcpStatusMessage) { @@ -1787,7 +1912,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const directory = this.getWorkspaceDirectory() - const { data } = await this.client.mcp.status({ directory }) + const { data } = await retry(() => this.client!.mcp.status({ directory })) if (data) { const message = { type: "mcpStatusLoaded", status: data } this.cachedMcpStatusMessage = message @@ -1823,23 +1948,35 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper } /** - * Dispose the CLI backend instance so it re-reads config from disk. - * Call after any marketplace install/remove that writes config files directly. - * Global-scope changes need global.dispose() to also reset the global config cache. + * Remove a marketplace item from a single scope and invalidate CLI caches. */ - private async disposeCliInstance(scope: "project" | "global"): Promise { - if (!this.client) return - if (scope === "global") { - await this.client.global.dispose().catch((e: unknown) => { - console.warn("[Kilo New] global.dispose() after marketplace change failed:", e) - }) + private async removeMarketplaceItem(item: MarketplaceItem, scope: "project" | "global"): Promise { + const workspace = this.getProjectDirectory(this.currentSession?.id) + const result = await this.getMarketplace().remove(item, scope, workspace) + if (result.success) { + await this.invalidateAfterMarketplaceChange(scope) } - // Always dispose the per-project instance so it rebuilds state from - // the (possibly updated) global + project config on the next request. - const dir = this.getWorkspaceDirectory() - await this.client.instance.dispose({ directory: dir }).catch((e: unknown) => { - console.warn("[Kilo New] instance.dispose() after marketplace change failed:", e) - }) + return result + } + + /** + * Remove a marketplace item from both project and global scopes. + * mp.remove returns success even when the entry doesn't exist (no-op), + * so we must attempt both scopes to cover dual-scope installations. + * Returns true if at least one scope removal succeeded. + */ + private async removeMarketplaceItemFromAllScopes(item: MarketplaceItem): Promise { + const workspace = this.getProjectDirectory(this.currentSession?.id) + const mp = this.getMarketplace() + const project = await mp.remove(item, "project", workspace) + const global = await mp.remove(item, "global", workspace) + + if (project.success || global.success) { + const scope = global.success ? "global" : "project" + await this.invalidateAfterMarketplaceChange(scope) + return true + } + return false } /** @@ -1898,7 +2035,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper try { const workspaceDir = this.getWorkspaceDirectory() - const { data: config } = await this.client.config.get({ directory: workspaceDir }, { throwOnError: true }) + const { data: config } = await retry(() => + this.client!.config.get({ directory: workspaceDir }, { throwOnError: true }), + ) const message = { type: "configLoaded", @@ -1945,7 +2084,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper if (!this.client || this.connectionState !== "connected") return try { const dir = this.getWorkspaceDirectory() - const { data: config } = await this.client.config.get({ directory: dir }, { throwOnError: true }) + const { data: config } = await retry(() => this.client!.config.get({ directory: dir }, { throwOnError: true })) this.cachedConfigMessage = { type: "configLoaded", config } this.postMessage({ type: "configUpdated", config }) } catch (error) { @@ -1953,6 +2092,49 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper } } + /** + * Fetch config warnings from the server and display a single consolidated + * VS Code warning with a "Show Details" action button. + * Only shown once per provider lifecycle (flag resets on dispose/re-create, not on SSE reconnect). + */ + private async checkConfigWarnings(from: string): Promise { + if (this.configWarningsShown) { + console.log("[Kilo New] KiloProvider: config warnings already shown", { from }) + return + } + if (!this.client) { + console.log("[Kilo New] KiloProvider: config warnings skipped (no client)", { from }) + return + } + try { + const dir = this.getWorkspaceDirectory() + console.log("[Kilo New] KiloProvider: checking config warnings", { from, dir }) + const result = await this.client.config.warnings({ directory: dir }) + const list = result?.data ?? [] + console.log("[Kilo New] KiloProvider: config warnings fetched", { from, count: list.length }) + if (list.length === 0) return + this.configWarningsShown = true + + const first = list[0]! + const summary = list.length === 1 ? first.message : `${first.message} (and ${list.length - 1} more)` + console.warn("[Kilo New] KiloProvider: showing config warnings", { from, count: list.length, path: first.path }) + + const action = await vscode.window.showWarningMessage(`Config: ${summary}`, "Show Details") + if (action === "Show Details") { + const lines = list.map((w) => { + const base = `${w.path}\n ${w.message}` + return w.detail ? `${base}\n ${w.detail}` : base + }) + const channel = vscode.window.createOutputChannel("Kilo Config Warnings") + channel.clear() + channel.appendLine(lines.join("\n\n")) + channel.show() + } + } catch (err) { + console.warn("[Kilo New] KiloProvider: checkConfigWarnings failed:", { from, err }) + } + } + /** * Fetch Kilo news/notifications and send to webview. * Uses the cached message pattern so the webview gets data immediately on refresh. @@ -1978,7 +2160,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper } try { - const { data: all } = await this.client.kilo.notifications(undefined, { throwOnError: true }) + const { data: all } = await retry(() => this.client!.kilo.notifications(undefined, { throwOnError: true })) const notifications = all.filter((n) => !n.showIn || n.showIn.includes("extension")) const existing = this.extensionContext?.globalState.get("kilo.dismissedNotificationIds", []) ?? [] const active = new Set(notifications.map((n) => n.id)) @@ -2093,7 +2275,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper // Config.state is reset by updateGlobal (via Instance.resetStateEntry) so // config.get() returns fresh data without a full dispose cycle. const dir = this.getWorkspaceDirectory() - const { data: merged } = await this.client.config.get({ directory: dir }, { throwOnError: true }) + const { data: merged } = await retry(() => this.client!.config.get({ directory: dir }, { throwOnError: true })) this.cachedConfigMessage = { type: "configLoaded", config: merged } this.postMessage({ type: "configUpdated", config: merged }) @@ -2150,6 +2332,85 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper return { sid, dir } } + /** Abort controllers for active retry loops, keyed by session ID */ + private retryAbortControllers = new Map() + + /** + * Execute an SDK call with exponential backoff on HTTP errors. + * Retries on 429, 5xx, and other retryable status codes. + * When the response includes `Retry-After` / `Retry-After-MS` headers, + * the delay honours that value (capped at 5 min). Otherwise uses the + * predefined backoff schedule: 5s -> 10s -> 30s -> 60s -> 300s. + * + * After MAX_RETRIES (5) attempts, automatically throws the error. + * Users can cancel via the cancel button in the UI which sends an abort + * message — this interrupts the backoff delay and stops the retry loop. + * + * The webview receives `sessionStatus` messages with a countdown so the + * user can see that a retry is in progress. + */ + private async withRetry(fn: () => Promise<{ error?: unknown; response: Response }>, sid: string): Promise { + const abortController = new AbortController() + this.retryAbortControllers.set(sid, abortController) + + try { + for (let attempt = 1; ; attempt++) { + if (abortController.signal.aborted) { + // User cancelled — return normally without triggering sendMessageFailed + return + } + + const result = await fn() + if (!result.error) return + + const status = result.response?.status ?? 0 + + // Non-retryable status codes fail immediately without retry + if (!retryable(status)) { + this.postMessage({ type: "sessionStatus", sessionID: sid, status: "idle" }) + throw result.error + } + + // Stop retrying after MAX_RETRIES attempts + if (attempt >= MAX_RETRIES) { + this.postMessage({ type: "sessionStatus", sessionID: sid, status: "idle" }) + throw result.error + } + + const delay = backoff(attempt, result.response?.headers) + console.log(`[Kilo New] KiloProvider: Retry on ${status}, attempt ${attempt}/${MAX_RETRIES}, delay ${delay}ms`) + + this.postMessage({ + type: "sessionStatus", + sessionID: sid, + status: "retry", + attempt, + message: `Error (${status}). Retrying...`, + next: Date.now() + delay, + }) + + // Wait for delay or until aborted + await new Promise((resolve) => { + const timer = setTimeout(resolve, delay) + abortController.signal.addEventListener("abort", () => { + clearTimeout(timer) + }) + }) + } + } finally { + this.retryAbortControllers.delete(sid) + } + } + + /** Cancel an active retry loop for a session */ + private cancelRetry(sid: string): void { + const controller = this.retryAbortControllers.get(sid) + if (controller) { + controller.abort() + this.postMessage({ type: "sessionStatus", sessionID: sid, status: "idle" }) + } + } + private async handleSendMessage( text: string, messageID?: string, @@ -2192,18 +2453,21 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.connectionService.recordMessageSessionId(messageID, resolved!.sid) } - await this.client.session.promptAsync( - { - sessionID: resolved!.sid, - directory: resolved!.dir, - messageID, - parts, - model: providerID && modelID ? { providerID, modelID } : undefined, - agent, - variant, - editorContext, - }, - { throwOnError: true }, + const sid = resolved!.sid + const dir = resolved!.dir + await this.withRetry( + () => + this.client!.session.promptAsync({ + sessionID: sid, + directory: dir, + messageID, + parts, + model: providerID && modelID ? { providerID, modelID } : undefined, + agent, + variant, + editorContext, + }), + sid, ) } catch (error) { console.error("[Kilo New] KiloProvider: Failed to send message:", error) @@ -2254,19 +2518,22 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper const parts = files?.map((f) => ({ type: "file" as const, mime: f.mime, url: f.url })) - await this.client.session.command( - { - sessionID: resolved!.sid, - directory: resolved!.dir, - command, - arguments: args, - messageID, - model: providerID && modelID ? `${providerID}/${modelID}` : undefined, - agent, - variant, - parts, - }, - { throwOnError: true }, + const sid = resolved!.sid + const dir = resolved!.dir + await this.withRetry( + () => + this.client!.session.command({ + sessionID: sid, + directory: dir, + command, + arguments: args, + messageID, + model: providerID && modelID ? `${providerID}/${modelID}` : undefined, + agent, + variant, + parts, + }), + sid, ) } catch (error) { console.error("[Kilo New] KiloProvider: Failed to send command:", error) @@ -2614,6 +2881,11 @@ 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. @@ -2691,9 +2963,10 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper type?: string tool?: string metadata?: { sessionId?: string } + state?: { metadata?: { sessionId?: string } } sessionID?: string } - const childId = part.type === "tool" && part.tool === "task" ? part.metadata?.sessionId : undefined + const childId = childID(part) if (childId && !this.trackedSessionIds.has(childId)) { console.log("[Kilo New] KiloProvider: 🔗 Auto-adopting child session from task tool", { childId }) void this.handleSyncSession(childId, part.sessionID ?? sessionID) @@ -2996,7 +3269,9 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper private startStatsPolling(): void { this.statsPoller?.stop() + this.statsGitOps?.dispose() const git = new GitOps({ log: () => {} }) + this.statsGitOps = git this.statsPoller = new GitStatsPoller({ getWorktrees: () => [], getWorkspaceRoot: () => getWorkspaceRoot(), @@ -3023,7 +3298,10 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper * Does NOT kill the server — that's the connection service's job. */ dispose(): void { + this.unsubscribeRemote?.() + this.focusSession() this.statsPoller?.stop() + this.statsGitOps?.dispose() this.unsubscribeEvent?.() this.unsubscribeState?.() this.unsubscribeNotificationDismiss?.() @@ -3033,7 +3311,11 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper this.unsubscribeMigrationComplete?.() this.unsubscribeClearPendingPrompts?.() this.unsubscribeDirectoryProvider?.() + 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/SettingsEditorProvider.ts b/packages/kilo-vscode/src/SettingsEditorProvider.ts index 922754e319..493a6fd519 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 424d0b54b0..3442100587 100644 --- a/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts +++ b/packages/kilo-vscode/src/agent-manager/AgentManagerProvider.ts @@ -6,8 +6,10 @@ import { getErrorMessage } from "../kilo-provider-utils" import { isAbsolutePath } from "../path-utils" import { WorktreeManager, type CreateWorktreeResult } from "./WorktreeManager" import { WorktreeStateManager, remoteRef } from "./WorktreeStateManager" +import { handleSection } from "./section-handler" import { chooseBaseBranch, normalizeBaseBranch } from "./base-branch" import { GitStatsPoller, type WorktreePresenceResult } from "./GitStatsPoller" +import { PRStatusBridge } from "./pr-status-bridge" import { GitOps, type ApplyConflict } from "./GitOps" import { versionedName } from "./branch-name" import { normalizePath, classifyWorktreeError } from "./git-import" @@ -23,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" @@ -53,6 +56,7 @@ export class AgentManagerProvider implements Disposable { private diffSessionId: string | undefined private lastDiffHash: string | undefined private statsPoller: GitStatsPoller + private prBridge!: PRStatusBridge private gitOps: GitOps private cachedDiffTarget: { sessionId: string; directory: string; baseBranch: string } | undefined private staleWorktreeIds = new Set() @@ -73,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 @@ -94,6 +100,16 @@ export class AgentManagerProvider implements Disposable { log: (...args) => this.log(...args), git: this.gitOps, }) + this.prBridge = PRStatusBridge.create({ + getWorktrees: () => this.state?.getWorktrees() ?? [], + getWorkspaceRoot: () => this.getRoot(), + postToWebview: (m) => this.postToWebview(m), + updateWorktreePR: (id, n, u, s) => this.state?.updateWorktreePR(id, n, u, s), + hasPersistedPR: (id: string) => !!this.state?.getWorktree(id)?.prNumber, + openExternal: (u) => this.host.openExternal(u), + log: (...a) => this.log(...a), + semaphore, + }) } private log(...args: unknown[]) { @@ -147,13 +163,14 @@ export class AgentManagerProvider implements Disposable { this.stateReady = this.initializeState() void this.sendRepoInfo() this.sendKeybindings() - + this.prBridge.attachPanel(ctx) ctx.onDidDispose(() => { // Only clear if this is still the active panel — a newer panel may // have already replaced us via attachPanel. if (this.panel === ctx) { this.log("Panel disposed") this.statsPoller.stop() + this.prBridge.poller.stop() this.stopDiffPolling() this.panel = undefined } @@ -184,31 +201,34 @@ 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 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() } // --------------------------------------------------------------------------- // Message interceptor // --------------------------------------------------------------------------- + // eslint-disable-next-line complexity -- TODO: refactor to reduce complexity and remove this disable private async onMessage(msg: Record): Promise | null> { + if (this.prBridge.handleMessage(msg)) return null const m = msg as unknown as AgentManagerInMessage if (m.type === "agentManager.createWorktree") { @@ -218,8 +238,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") { @@ -231,6 +255,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 } @@ -292,6 +325,7 @@ export class AgentManagerProvider implements Disposable { // already emitted before the webview was ready to receive messages. if (this.cachedWorktreeStats) this.postToWebview(this.cachedWorktreeStats) if (this.cachedLocalStats) this.postToWebview(this.cachedLocalStats) + this.prBridge.replay() // Refresh sessions after pushState so the webview's sessionsLoaded // handler is guaranteed to be registered (requestState fires from // onMount). Without this, the initial refreshSessions() in @@ -327,6 +361,7 @@ export class AgentManagerProvider implements Disposable { this.state?.setSessionsCollapsed(m.collapsed) return null } + if (this.handleSection(m)) return null if (m.type === "agentManager.setReviewDiffStyle") { this.state?.setReviewDiffStyle(m.style) return null @@ -376,10 +411,18 @@ export class AgentManagerProvider implements Disposable { void this.onApplyWorktreeDiff(m.worktreeId, selectedFiles) return null } + if (m.type === "agentManager.revertWorktreeFile") { + void this.onRevertWorktreeFile(m.sessionId, m.file) + return null + } if (m.type === "agentManager.startDiffWatch") { 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 @@ -407,12 +450,15 @@ 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) } // 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()) { @@ -671,6 +717,7 @@ export class AgentManagerProvider implements Disposable { } // Remove from state BEFORE disk removal so pollers immediately stop targeting this worktree. this.statsPoller.skipWorktree(worktreeId) + this.prBridge.remove(worktreeId) const orphaned = state.removeWorktree(worktreeId) if (shouldStopDiffPolling(worktree.path, orphaned, this.cachedDiffTarget, this.diffSessionId)) { this.stopDiffPolling() @@ -679,11 +726,11 @@ export class AgentManagerProvider implements Disposable { this.pushState() // Disk removal after state is clean — pollers no longer reference this worktree. try { - await manager.removeWorktree(worktree.path, worktree.branch) + await manager.removeWorktree(worktree.path, worktree.originalBranch ?? worktree.branch) } catch (error) { this.log(`Failed to remove worktree from disk: ${error}`) } - this.log(`Deleted worktree ${worktreeId} (${worktree.branch})`) + this.log(`Deleted worktree ${worktreeId} (${worktree.originalBranch ?? worktree.branch})`) return null } @@ -889,9 +936,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() @@ -904,7 +951,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. @@ -1382,6 +1429,7 @@ export class AgentManagerProvider implements Disposable { status: "error", message: `Setup script failed: ${msg}`, branch, + worktreeId, }) } } @@ -1410,6 +1458,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 { @@ -1428,12 +1480,20 @@ export class AgentManagerProvider implements Disposable { const entries = result.worktrees.filter((item) => ids.has(item.worktreeId)) if (entries.length === 0) return + // Sync branches from git worktree list (no extra git calls) + let branchChanged = false + for (const entry of entries) { + if (entry.branch && state.updateWorktreeBranch(entry.worktreeId, entry.branch)) { + branchChanged = true + } + } + const next = new Set(entries.filter((entry) => entry.missing).map((entry) => entry.worktreeId)) - const changed = + const staleChanged = next.size !== this.staleWorktreeIds.size || [...next].some((worktreeId) => !this.staleWorktreeIds.has(worktreeId)) this.staleWorktreeIds = next - if (changed) { + if (staleChanged || branchChanged) { this.pushState() } } @@ -1464,6 +1524,7 @@ export class AgentManagerProvider implements Disposable { type: "agentManager.state", worktrees, sessions: state.getSessions(), + sections: state.getSections(), staleWorktreeIds, tabOrder: state.getTabOrder(), worktreeOrder: state.getWorktreeOrder(), @@ -1474,6 +1535,7 @@ export class AgentManagerProvider implements Disposable { }) this.statsPoller.setEnabled(worktrees.length > 0 || this.panel !== undefined) + this.prBridge.poller.setEnabled(worktrees.length > 0) } /** Push empty state when the folder is not a git repo or has no folder open. */ @@ -1613,6 +1675,66 @@ export class AgentManagerProvider implements Disposable { } } + /** Revert a single file in a worktree back to the merge-base state. */ + private async onRevertWorktreeFile(sessionId: string, file: string): Promise { + if (!file) return + if (this.stateReady) { + await this.stateReady.catch((err) => this.log("stateReady rejected, continuing revert resolve:", err)) + } + + const target = + this.cachedDiffTarget?.sessionId === sessionId ? this.cachedDiffTarget : await this.resolveDiffTarget(sessionId) + if (!target) { + this.postToWebview({ + type: "agentManager.revertWorktreeFileResult", + sessionId, + file, + status: "error", + message: "Could not resolve diff target", + }) + return + } + + // Look up the file status from the cached diffs so we know if it's added/modified/deleted + let status: "added" | "deleted" | "modified" | undefined + try { + const client = this.connectionService.getClient() + const { data } = await client.worktree.diffFile( + { directory: target.directory, base: target.baseBranch, file }, + { throwOnError: true }, + ) + status = data?.status + } catch (err) { + this.log("Failed to look up file status for revert:", err) + } + + try { + const result = await this.gitOps.revertFile(target.directory, target.baseBranch, file, status) + this.postToWebview({ + type: "agentManager.revertWorktreeFileResult", + sessionId, + file, + status: result.ok ? "success" : "error", + message: result.message, + }) + + // After successful revert, trigger a diff refresh so the UI updates + if (result.ok) { + void this.onRequestWorktreeDiff(sessionId) + } + } catch (err) { + const message = err instanceof Error ? err.message : String(err) + this.log("Failed to revert worktree file:", message) + this.postToWebview({ + type: "agentManager.revertWorktreeFileResult", + sessionId, + file, + status: "error", + message, + }) + } + } + // --------------------------------------------------------------------------- // Diff polling // --------------------------------------------------------------------------- @@ -1886,13 +2008,21 @@ export class AgentManagerProvider implements Disposable { ) } + private handleSection(m: AgentManagerInMessage): boolean { + return handleSection(this.state, m, () => this.pushState()) + } + public postMessage(message: unknown): void { this.panel?.postMessage(message) } public dispose(): void { + this.connectionService.unregisterFocused("agent-manager") + this.connectionService.registerOpen("agent-manager", []) this.stopDiffPolling() this.statsPoller.stop() + this.gitOps.dispose() + this.prBridge.poller.stop() this.terminalManager.dispose() this.panel?.dispose() this.outputChannel.dispose() diff --git a/packages/kilo-vscode/src/agent-manager/GitOps.ts b/packages/kilo-vscode/src/agent-manager/GitOps.ts index 9aa393513c..3f36edb587 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 { @@ -62,19 +65,49 @@ export function nonInteractiveEnv(): NodeJS.ProcessEnv { 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 + } constructor(options: GitOpsOptions) { this.log = options.log + this.semaphore = options.semaphore this.runGit = options.runGit ?? ((args, cwd) => - simpleGit(cwd) + simpleGit(cwd, { abort: this.controller.signal }) .raw(args) .then((out) => out.trim())) } + dispose(): void { + if (!this.controller.signal.aborted) { + this.controller.abort() + } + } + private raw(args: string[], cwd: string): Promise { - return this.runGit(args, cwd) + const signal = this.controller.signal + if (signal.aborted) return Promise.reject(new Error("GitOps disposed")) + 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. */ @@ -130,14 +163,14 @@ export class GitOps { } /** Return the set of worktree paths for the repo, excluding bare entries. */ - async listWorktreePaths(cwd: string): Promise> { + async listWorktreePaths(cwd: string): Promise> { const raw = await this.raw(["worktree", "list", "--porcelain"], cwd) - const paths = new Set() + const result = new Map() for (const entry of parseWorktreeList(raw)) { if (entry.bare) continue - paths.add(normalizePath(entry.path)) + result.set(normalizePath(entry.path), entry.branch) } - return paths + return result } /** @@ -260,6 +293,55 @@ export class GitOps { } } + /** + * Revert a single file in a worktree back to the merge-base state. + * For modified/deleted files: restores the file from the merge-base commit. + * For added (new) files: removes the file from the worktree. + */ + async revertFile( + cwd: string, + baseBranch: string, + file: string, + status?: "added" | "deleted" | "modified", + ): Promise<{ ok: boolean; message: string }> { + // Validate path: no absolute paths, no ".." traversal + if (nodePath.isAbsolute(file) || file.split(/[\\/]/).includes("..")) { + return { ok: false, message: "Invalid file path" } + } + + const base = (await this.raw(["merge-base", "HEAD", baseBranch], cwd).catch(() => "")).trim() + if (!base) { + return { ok: false, message: "Could not resolve merge-base" } + } + + if (status === "added") { + // New file — remove it from disk and unstage + const full = nodePath.resolve(cwd, file) + const root = await fs.realpath(cwd) + const resolved = await fs.realpath(full).catch(() => full) + if (resolved !== root && !resolved.startsWith(root + nodePath.sep)) { + return { ok: false, message: "File path outside worktree" } + } + await fs.rm(full, { force: true }) + // Also remove from git index in case it was staged + await this.raw(["rm", "--cached", "--force", "--ignore-unmatch", "--", file], cwd).catch(() => "") + return { ok: true, message: "Removed added file" } + } + + // Modified or deleted file — restore from merge-base + const result = await this.exec(["checkout", base, "--", file], cwd) + if (result.code !== 0) { + return { ok: false, message: result.stderr.trim() || "Failed to revert file" } + } + // Only unstage for modified files. For deleted files the checkout already + // restored the file into the index correctly — resetting to HEAD would drop + // it from the index and make it appear as a new untracked file. + if (status === "modified") { + await this.raw(["reset", "HEAD", "--", file], cwd).catch(() => "") + } + return { ok: true, message: "Reverted file to base" } + } + async checkApplyPatch(targetPath: string, patch: string): Promise { if (!patch.trim()) { return { ok: true, conflicts: [], message: "No changes to apply" } @@ -335,36 +417,42 @@ export class GitOps { } private exec(args: string[], cwd: string, options?: ExecOptions): Promise { - return new Promise((resolve) => { - const child = spawn("git", args, { - cwd, - env: options?.env, - stdio: ["pipe", "pipe", "pipe"], - }) + if (this.controller.signal.aborted) { + return Promise.resolve({ code: 1, stdout: "", stderr: "GitOps disposed" }) + } + 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 27260b2f05..2cde458d43 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 { @@ -26,6 +27,8 @@ export interface LocalStats { export interface WorktreePresence { worktreeId: string missing: boolean + /** Current branch from `git worktree list`, if available. */ + branch?: string } export interface WorktreePresenceResult { @@ -43,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 { @@ -152,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) @@ -231,7 +241,8 @@ export class GitStatsPoller { () => false, ) const missing = !exists || !tracked.has(normalized) - return { worktreeId: wt.id, missing } + const branch = tracked.get(normalized) + return { worktreeId: wt.id, missing, branch } }), ) @@ -257,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 new file mode 100644 index 0000000000..f655616b96 --- /dev/null +++ b/packages/kilo-vscode/src/agent-manager/PRStatusPoller.ts @@ -0,0 +1,568 @@ +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[] + getWorkspaceRoot: () => string | undefined + 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 +const MAX_BACKOFF = 120_000 // 2 minutes — cap for exponential backoff on repeated errors +const BACKOFF_MULTIPLIER = 2 +const PR_LOOKUP_TTL = 10_000 // 10 seconds — short TTL; only the active worktree polls so this stays cheap +const FULL_SYNC_INTERVAL = 120_000 // 2 minutes — periodic sync of ALL worktrees (badges stay fresh) +const FULL_SYNC_CONCURRENCY = 3 // max parallel gh processes during a full sync (caps the burst) + +export class PRStatusPoller { + private timer: ReturnType | undefined + private active = false + private visible = true + private busy = false + private lastHash = new Map() + private lastError: string | undefined // tracks global error state for de-duplication + private failures = 0 // consecutive failure count for backoff + private ghAvailable: boolean | undefined + private ghProbeTime = 0 + private activeWorktreeId: string | undefined + private cachedRepo: { owner: string; name: string; cwd: string } | undefined + private 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 { + if (enabled) { + if (this.active) return + this.start() + return + } + this.stop() + } + + /** Pause/resume polling based on panel visibility. */ + setVisible(visible: boolean): void { + if (this.visible === visible) return + this.visible = visible + if (!this.active) return + if (visible) { + // Resume — expire all PR caches and fetch all worktrees once to catch up, + // then resume the normal active-only poll cycle. + if (this.timer) clearTimeout(this.timer) + this.timer = undefined + this.prCache.clear() + this.lastHash.clear() + this.lastFullSync = 0 + void this.poll() + return + } + // Pause — cancel pending timer + if (this.timer) { + clearTimeout(this.timer) + this.timer = undefined + } + } + + stop(): void { + this.active = false + if (this.timer) { + clearTimeout(this.timer) + this.timer = undefined + } + this.busy = false + this.lastHash.clear() + this.lastError = undefined + this.failures = 0 + this.ghAvailable = undefined + this.ghProbeTime = 0 + this.cachedRepo = undefined + this.prCache.clear() + this.lastFullSync = 0 + } + + /** Force-refresh a specific worktree immediately, bypassing the PR cache. */ + refresh(worktreeId: string): void { + if (!this.active) return + const wt = this.options.getWorktrees().find((w) => w.id === worktreeId) + if (wt) this.prCache.delete(wt.branch) + void this.fetchOne(worktreeId) + } + + setActiveWorktreeId(id: string | undefined): void { + const prev = this.activeWorktreeId + this.activeWorktreeId = id + // When switching to a different worktree, fetch it immediately so the + // badge updates without waiting for the next poll cycle. + if (id && id !== prev && this.active) void this.fetchOne(id) + } + + private start(): void { + this.stop() + this.active = true + // Don't override this.visible — it may already be set to false by + // setVisible() before setEnabled(true) is called. + void this.poll() + } + + private nextDelay(): number { + if (this.failures === 0) return this.intervalMs + return Math.min(this.intervalMs * Math.pow(BACKOFF_MULTIPLIER, this.failures), MAX_BACKOFF) + } + + private schedule(): void { + if (!this.active || !this.visible) return + const delay = this.nextDelay() + this.timer = setTimeout(() => { + void this.poll() + }, delay) + } + + private poll(): Promise { + if (!this.active || !this.visible) return Promise.resolve() + if (this.busy) return Promise.resolve() + this.busy = true + return this.fetchAll().finally(() => { + this.busy = false + this.schedule() + }) + } + + private async probeGh(): Promise { + const now = Date.now() + if (this.ghAvailable !== undefined && now - this.ghProbeTime < GH_PROBE_TTL) { + return this.ghAvailable + } + try { + await this.shell("gh", ["--version"], { timeout: 5_000 }) + this.ghAvailable = true + } catch { + this.ghAvailable = false + } + this.ghProbeTime = Date.now() + return this.ghAvailable + } + + private async fetchAll(): Promise { + if (!(await this.probeGh())) { + // De-duplicate: only emit gh_missing once, not every poll cycle + if (this.lastError !== "gh_missing") { + this.lastError = "gh_missing" + for (const wt of this.options.getWorktrees()) { + this.options.onStatus(wt.id, null, "gh_missing") + } + } + this.failures++ + return + } + + this.lastError = undefined + + // Most ticks only poll the active worktree for fast feedback. Every + // FULL_SYNC_INTERVAL we poll ALL worktrees so badges stay current even + // for sessions that aren't selected (e.g. CI results changing). + // The very first poll (lastHash empty) also fetches everything. + const worktrees = this.options.getWorktrees() + const now = Date.now() + const initial = this.lastHash.size === 0 + const full = initial || now - this.lastFullSync >= FULL_SYNC_INTERVAL + const targets = full ? worktrees : worktrees.filter((wt) => wt.id === this.activeWorktreeId) + if (full) this.lastFullSync = now + + if (targets.length === 0) { + this.failures = 0 + return + } + + const thunks = targets.map((wt) => () => this.fetchOne(wt.id)) + const results = full + ? await settled(thunks, FULL_SYNC_CONCURRENCY) + : await Promise.allSettled(thunks.map((fn) => fn())) + const ok = results.every((r) => r.status === "fulfilled") + if (ok) { + this.failures = 0 + return + } + this.failures++ + } + + private async fetchOne(worktreeId: string): Promise { + const worktrees = this.options.getWorktrees() + const wt = worktrees.find((w) => w.id === worktreeId) + if (!wt) return + + if (!this.options.getWorkspaceRoot()) return + + try { + const pr = await this.cachedFetchPR(wt.branch, wt.path) + if (!pr) { + const hash = `${worktreeId}:none` + if (this.lastHash.get(worktreeId) === hash) return + this.lastHash.set(worktreeId, hash) + this.options.onStatus(worktreeId, null) + return + } + + const [checks, comments] = await Promise.all([ + this.fetchChecks(pr.number, wt.path), + this.activeWorktreeId === worktreeId ? this.fetchComments(pr.number, wt.path) : undefined, + ]) + + const status: PRStatus = { + number: pr.number, + title: pr.title, + url: pr.url, + state: pr.state, + review: pr.review, + checks, + ...(comments && { comments }), + additions: pr.additions, + deletions: pr.deletions, + files: pr.files, + } + + const hash = `${worktreeId}:${pr.number}:${pr.state}:${pr.review}:${checks.status}:${checks.passed}/${checks.total}:${comments?.total ?? ""}:${comments?.unresolved ?? ""}` + if (this.lastHash.get(worktreeId) === hash) return + this.lastHash.set(worktreeId, hash) + + this.options.onStatus(worktreeId, status) + } catch (err) { + const msg = err instanceof Error ? err.message : String(err) + const kind = classifyPRError(msg) + this.options.log(`PR fetch failed for ${wt.branch}:`, msg) + + const errKey = kind === "gh_missing" ? "gh_missing" : kind === "gh_auth" ? "gh_auth" : "fetch_failed" + if (kind === "gh_missing") this.ghAvailable = false + + // De-duplicate: only emit if the error state changed for this worktree + const hash = `${worktreeId}:error:${errKey}` + if (this.lastHash.get(worktreeId) !== hash) { + this.lastHash.set(worktreeId, hash) + this.options.onStatus(worktreeId, null, errKey) + } + throw err // propagate so fetchAll can track failures for backoff + } + } + + private static readonly PR_JSON_FIELDS = + "number,title,url,state,isDraft,reviewDecision,additions,deletions,changedFiles,headRefName,headRefOid" + + /** Return a cached PR lookup if still fresh, otherwise fetch and cache. + * Keyed by branch name so multiple worktrees on the same branch share + * the cache, and a branch switch in a worktree naturally misses. */ + private async cachedFetchPR(branch: string, cwd: string): Promise { + const cached = this.prCache.get(branch) + if (cached && Date.now() < cached.expires) return cached.result + const result = await this.fetchPRForBranch(branch, cwd) + this.prCache.set(branch, { result, expires: Date.now() + PR_LOOKUP_TTL }) + return result + } + + private async fetchPRForBranch(branch: string, cwd: string): Promise { + // Strategy 1: bare `gh pr view` — resolves via the branch's tracking ref. + // Works for fork PRs checked out with `gh pr checkout` (tracking ref = refs/pull/N/head). + // Strategy 2: `gh pr view ` — works for same-repo branches pushed to origin. + // Strategy 3: `gh pr list --search ""` — last resort, finds PRs by HEAD commit SHA. + return (await this.ghPRView(cwd)) ?? (await this.ghPRView(cwd, branch)) ?? (await this.ghPRListBySHA(cwd)) + } + + /** Run `gh pr view [branch] --json ...` and parse the result, or return null. */ + private async ghPRView(cwd: string, branch?: string): Promise { + try { + const args = ["pr", "view"] + if (branch) args.push(branch) + args.push("--json", PRStatusPoller.PR_JSON_FIELDS) + + const { stdout } = await this.shell("gh", args, { cwd, timeout: 15_000 }) + return parsePRResult(stdout) + } catch (err) { + const msg = err instanceof Error ? err.message : String(err) + if (msg.includes("no pull requests found") || msg.includes("Could not resolve")) return null + throw err + } + } + + /** Search for PRs containing the current HEAD SHA. Finds PRs when branch name/tracking ref don't match. */ + private async ghPRListBySHA(cwd: string): Promise { + try { + const { stdout: sha } = await this.shell("git", ["rev-parse", "HEAD"], { cwd, timeout: 5_000 }) + const head = sha.trim() + if (!head) return null + + const { stdout } = await this.shell( + "gh", + [ + "pr", + "list", + "--state", + "all", + "--search", + `${head} is:pr`, + "--limit", + "5", + "--json", + PRStatusPoller.PR_JSON_FIELDS, + ], + { cwd, timeout: 15_000 }, + ) + const items = JSON.parse(stdout) as unknown[] + if (!Array.isArray(items) || items.length === 0) return null + + // Only accept PRs where headRefOid matches our HEAD exactly + for (const item of items) { + const data = item as Record + if (data.headRefOid === head) return parsePRResult(JSON.stringify(data)) + } + return null + } catch { + return null + } + } + + private async fetchChecks( + prNumber: number, + cwd: string, + ): Promise<{ + status: AggregateCheckStatus + total: number + passed: number + failed: number + pending: number + items: PRCheck[] + }> { + try { + const { stdout } = await this.shell( + "gh", + ["pr", "checks", String(prNumber), "--json", "name,state,link,startedAt,completedAt"], + { cwd, timeout: 15_000 }, + ) + const data = JSON.parse(stdout) as Array<{ + name: string + state: string + link?: string + startedAt?: string + completedAt?: string + }> + + const items: PRCheck[] = data.map((c) => ({ + name: c.name, + status: mapCheckStatus(c.state), + url: c.link, + duration: formatCheckDuration(c.startedAt, c.completedAt), + })) + + const total = items.length + const passed = items.filter((c) => c.status === "success").length + const failed = items.filter((c) => c.status === "failure").length + const pending = items.filter((c) => c.status === "pending").length + + const status: AggregateCheckStatus = + total === 0 ? "none" : failed > 0 ? "failure" : pending > 0 ? "pending" : "success" + + return { status, total, passed, failed, pending, items } + } catch { + return { status: "none", total: 0, passed: 0, failed: 0, pending: 0, items: [] } + } + } + + private async getRepoInfo(cwd: string): Promise<{ owner: string; name: string }> { + if (this.cachedRepo && this.cachedRepo.cwd === cwd) { + return this.cachedRepo + } + const { stdout } = await this.shell("gh", ["repo", "view", "--json", "owner,name"], { + cwd, + timeout: 10_000, + }) + const data = JSON.parse(stdout) + const info = { owner: data.owner.login as string, name: data.name as string, cwd } + this.cachedRepo = info + return info + } + + private async fetchComments( + prNumber: number, + cwd: string, + ): Promise<{ total: number; unresolved: number; items: PRComment[] }> { + try { + const repo = await this.getRepoInfo(cwd) + + const query = `query($owner: String!, $repo: String!, $number: Int!) { + repository(owner: $owner, name: $repo) { + pullRequest(number: $number) { + reviewThreads(first: 100) { + nodes { + isResolved + comments(first: 1) { + nodes { + id + author { login avatarUrl } + body + path + line + url + createdAt + } + } + } + } + } + } + }` + + const { stdout } = await this.shell( + "gh", + [ + "api", + "graphql", + "-f", + `query=${query}`, + "-F", + `owner=${repo.owner}`, + "-F", + `repo=${repo.name}`, + "-F", + `number=${prNumber}`, + ], + { cwd, timeout: 15_000 }, + ) + const result = JSON.parse(stdout) + const threads = result?.data?.repository?.pullRequest?.reviewThreads?.nodes ?? [] + + const items: PRComment[] = [] + for (const thread of threads) { + const first = thread.comments?.nodes?.[0] + if (!first) continue + items.push({ + id: first.id, + author: first.author?.login ?? "unknown", + avatar: first.author?.avatarUrl, + body: first.body ?? "", + file: first.path, + line: first.line, + url: first.url, + resolved: thread.isResolved ?? false, + createdAt: first.createdAt ? new Date(first.createdAt).getTime() : undefined, + }) + } + + const total = items.length + const unresolved = items.filter((c) => !c.resolved).length + return { total, unresolved, items } + } catch (err) { + this.options.log("Failed to fetch PR comments:", err) + return { total: 0, unresolved: 0, items: [] } + } + } +} + +interface PRResult { + number: number + title: string + url: string + state: PRState + review: ReviewDecision | null + additions: number + deletions: number + files: number +} + +function parsePRResult(json: string): PRResult | null { + const data = JSON.parse(json) + if (!data.number) return null + return { + number: data.number, + title: data.title ?? "", + url: data.url ?? "", + state: parsePRState(data.isDraft, data.state), + review: parseReviewDecision(data.reviewDecision), + additions: data.additions ?? 0, + deletions: data.deletions ?? 0, + files: data.changedFiles ?? 0, + } +} + +function parsePRState(isDraft: boolean, ghState: string): PRState { + if (isDraft) return "draft" + if (ghState === "MERGED") return "merged" + if (ghState === "CLOSED") return "closed" + return "open" +} + +function parseReviewDecision(decision: string | undefined): ReviewDecision | null { + if (decision === "APPROVED") return "approved" + if (decision === "CHANGES_REQUESTED") return "changes_requested" + if (decision === "REVIEW_REQUIRED") return "pending" + return null +} + +function mapCheckStatus(state: string): CheckStatus { + switch (state.toUpperCase()) { + case "SUCCESS": + return "success" + case "FAILURE": + case "ERROR": + return "failure" + case "PENDING": + case "QUEUED": + case "IN_PROGRESS": + case "REQUESTED": + case "WAITING": + return "pending" + case "SKIPPED": + return "skipped" + case "CANCELLED": + case "TIMED_OUT": + case "STALE": + case "STARTUP_FAILURE": + return "cancelled" + default: + return "pending" + } +} + +function formatCheckDuration(startedAt?: string, completedAt?: string): string | undefined { + if (!startedAt || !completedAt) return undefined + const secs = Math.round((new Date(completedAt).getTime() - new Date(startedAt).getTime()) / 1000) + return secs < 60 ? `${secs}s` : `${Math.floor(secs / 60)}m ${secs % 60}s` +} + +/** Run async thunks with bounded concurrency, returning settled results. */ +async function settled(thunks: (() => Promise)[], concurrency: number): Promise[]> { + const results: PromiseSettledResult[] = new Array(thunks.length) + let idx = 0 + async function run(): Promise { + while (idx < thunks.length) { + const i = idx++ + const fn = thunks[i]! + try { + results[i] = { status: "fulfilled", value: await fn() } + } catch (reason) { + results[i] = { status: "rejected", reason } + } + } + } + await Promise.all(Array.from({ length: Math.min(concurrency, thunks.length) }, () => run())) + return results +} diff --git a/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts b/packages/kilo-vscode/src/agent-manager/WorktreeManager.ts index 932e35e560..5d6c92edf9 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/WorktreeStateManager.ts b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts index 1148fbc3f0..3b051b3680 100644 --- a/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts +++ b/packages/kilo-vscode/src/agent-manager/WorktreeStateManager.ts @@ -26,6 +26,27 @@ export interface Worktree { groupId?: string /** User-provided display name for the worktree. */ label?: string + /** Cached PR number for instant badge display on reload. */ + prNumber?: number + /** Cached PR URL for instant badge display on reload. */ + prUrl?: string + /** Cached PR state for correct badge color on reload (open/merged/closed/draft). */ + prState?: string + /** Original branch created with the worktree, used for cleanup on deletion. + * Set automatically when `branch` is updated via live sync. */ + originalBranch?: string + /** Section this worktree belongs to, or undefined for ungrouped. */ + sectionId?: string +} + +export interface Section { + id: string + name: string + /** Color label (e.g. "Red", "Blue") mapped to VS Code theme CSS vars at render time, or null for default. */ + color: string | null + /** Position among top-level sidebar children (interleaved with ungrouped worktrees). */ + order: number + collapsed: boolean } /** @@ -46,6 +67,7 @@ export interface ManagedSession { interface StateFile { worktrees: Record> sessions: Record> + sections?: Record> tabOrder?: Record worktreeOrder?: string[] sessionsCollapsed?: boolean @@ -67,6 +89,7 @@ export class WorktreeStateManager { private readonly file: string private worktrees = new Map() private sessions = new Map() + private sections = new Map() private tabOrder: Record = {} private worktreeOrder: string[] = [] private collapsed = false @@ -163,6 +186,16 @@ export class WorktreeStateManager { return wt } + updateWorktreeBranch(id: string, branch: string): boolean { + const wt = this.worktrees.get(id) + if (!wt || wt.branch === branch) return false + if (!wt.originalBranch) wt.originalBranch = wt.branch + this.log(`Updated worktree ${id} branch: ${wt.branch} → ${branch}`) + wt.branch = branch + void this.save() + return true + } + updateWorktreeLabel(id: string, label: string): void { const wt = this.worktrees.get(id) if (!wt) return @@ -171,16 +204,26 @@ export class WorktreeStateManager { void this.save() } + updateWorktreePR(id: string, prNumber?: number, prUrl?: string, prState?: string): void { + const wt = this.worktrees.get(id) + if (!wt) return + if (wt.prNumber === prNumber && wt.prUrl === prUrl && wt.prState === prState) return + wt.prNumber = prNumber + wt.prUrl = prUrl + wt.prState = prState + void this.save() + } + removeWorktree(id: string): ManagedSession[] { const removed = this.worktrees.delete(id) if (!removed) return [] - // Dissociate all sessions from this worktree (set worktreeId to null) + // Collect and remove all sessions belonging to this worktree const orphaned: ManagedSession[] = [] for (const s of this.sessions.values()) { if (s.worktreeId === id) { - s.worktreeId = null - orphaned.push(s) + orphaned.push({ ...s }) + this.sessions.delete(s.id) } } @@ -191,7 +234,7 @@ export class WorktreeStateManager { const idx = this.worktreeOrder.indexOf(id) if (idx !== -1) this.worktreeOrder.splice(idx, 1) - this.log(`Removed worktree ${id}, orphaned ${orphaned.length} sessions`) + this.log(`Removed worktree ${id}, removed ${orphaned.length} sessions`) void this.save() return orphaned } @@ -204,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() } @@ -255,7 +298,138 @@ export class WorktreeStateManager { } setWorktreeOrder(order: string[]): void { - this.worktreeOrder = order + const top = new Set() + for (const sec of this.sections.values()) top.add(sec.id) + for (const wt of this.worktrees.values()) { + 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() + } + + // --------------------------------------------------------------------------- + // Sections + // --------------------------------------------------------------------------- + + getSections(): Section[] { + return [...this.sections.values()] + } + + getSection(id: string): Section | undefined { + return this.sections.get(id) + } + + addSection(name: string, color: string | null, worktreeIds?: string[]): Section { + const id = generateId("sec") + const order = this.worktreeOrder.length + const sec: Section = { id, name, color, order, collapsed: false } + this.sections.set(id, sec) + this.worktreeOrder.push(id) + if (worktreeIds) { + for (const wtId of worktreeIds) { + const wt = this.worktrees.get(wtId) + if (wt) { + wt.sectionId = id + // Remove from top-level worktreeOrder since it's now inside a section + const idx = this.worktreeOrder.indexOf(wtId) + if (idx !== -1) this.worktreeOrder.splice(idx, 1) + } + } + } + this.log(`Added section ${id}: "${name}"`) + void this.save() + return sec + } + + renameSection(id: string, name: string): void { + const sec = this.sections.get(id) + if (!sec || !name) return + sec.name = name + this.log(`Renamed section ${id} to "${name}"`) + void this.save() + } + + setSectionColor(id: string, color: string | null): void { + const sec = this.sections.get(id) + if (!sec) return + sec.color = color + void this.save() + } + + toggleSection(id: string): void { + const sec = this.sections.get(id) + if (!sec) return + sec.collapsed = !sec.collapsed + void this.save() + } + + deleteSection(id: string): void { + if (!this.sections.delete(id)) return + // Ungroup all worktrees in this section — do NOT delete them + for (const wt of this.worktrees.values()) { + if (wt.sectionId === id) { + wt.sectionId = undefined + if (!this.worktreeOrder.includes(wt.id)) this.worktreeOrder.push(wt.id) + } + } + // Remove from sidebar order + const idx = this.worktreeOrder.indexOf(id) + if (idx !== -1) this.worktreeOrder.splice(idx, 1) + this.log(`Deleted section ${id}, ungrouped its worktrees`) + void this.save() + } + + 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) + return !!wt && !wt.sectionId + }) + const idx = top.indexOf(id) + const next = idx + dir + if (idx === -1 || next < 0 || next >= top.length) return + const target = top[next]! + const result = [...this.worktreeOrder] + const fi = result.indexOf(id) + if (fi === -1 || result.indexOf(target) === -1) return + result.splice(fi, 1) + const insertAt = result.indexOf(target) + (dir === 1 ? 1 : 0) + result.splice(insertAt, 0, id) + this.worktreeOrder = result + void this.save() + } + + moveToSection(worktreeIds: string[], sectionId: string | null): void { + // Expand to include all multi-version siblings (same groupId) + const expanded = new Set(worktreeIds) + for (const wtId of worktreeIds) { + const wt = this.worktrees.get(wtId) + if (!wt?.groupId) continue + for (const sibling of this.worktrees.values()) { + if (sibling.groupId === wt.groupId) expanded.add(sibling.id) + } + } + for (const wtId of expanded) { + const wt = this.worktrees.get(wtId) + if (!wt) continue + wt.sectionId = sectionId ?? undefined + if (sectionId) { + const idx = this.worktreeOrder.indexOf(wtId) + if (idx !== -1) this.worktreeOrder.splice(idx, 1) + } else { + if (!this.worktreeOrder.includes(wtId)) this.worktreeOrder.push(wtId) + } + } void this.save() } @@ -314,6 +488,7 @@ export class WorktreeStateManager { const data = JSON.parse(content) as StateFile this.worktrees.clear() this.sessions.clear() + this.sections.clear() this.tabOrder = {} this.worktreeOrder = [] this.reviewDiffStyle = "unified" @@ -326,21 +501,42 @@ export class WorktreeStateManager { }) ?? wt.path this.worktrees.set(id, { id, ...wt, path: fixed }) } + let pruned = 0 for (const [id, s] of Object.entries(data.sessions ?? {})) { + // Skip orphaned sessions (null worktreeId or referencing a deleted worktree) + if (!s.worktreeId || !this.worktrees.has(s.worktreeId)) { + pruned++ + continue + } this.sessions.set(id, { id, ...s }) } + for (const [id, sec] of Object.entries(data.sections ?? {})) { + this.sections.set(id, { id, ...sec }) + } if (data.tabOrder) { this.tabOrder = data.tabOrder } if (data.worktreeOrder) { this.worktreeOrder = data.worktreeOrder } + // Normalize: ensure all section IDs and ungrouped worktree IDs are in worktreeOrder + const present = new Set(this.worktreeOrder) + for (const id of this.sections.keys()) { + if (!present.has(id)) this.worktreeOrder.push(id) + } + for (const wt of this.worktrees.values()) { + if (!wt.sectionId && !present.has(wt.id)) this.worktreeOrder.push(wt.id) + } this.collapsed = data.sessionsCollapsed ?? false if (data.reviewDiffStyle === "split") { this.reviewDiffStyle = "split" } this.defaultBase = data.defaultBaseBranch this.log(`Loaded state: ${this.worktrees.size} worktrees, ${this.sessions.size} sessions`) + if (pruned > 0) { + this.log(`Pruned ${pruned} orphaned sessions`) + void this.save() + } } catch (error) { const code = (error as NodeJS.ErrnoException).code if (code !== "ENOENT") { @@ -350,7 +546,7 @@ export class WorktreeStateManager { return migration } - /** Remove worktrees whose directories no longer exist on disk. */ + /** Remove worktrees whose directories no longer exist on disk and prune orphaned sessions. */ async validate(root: string): Promise { let changed = false for (const wt of [...this.worktrees.values()]) { @@ -361,7 +557,17 @@ export class WorktreeStateManager { changed = true } } - if (changed) await this.save() + // Prune orphaned sessions (worktreeId is null or references a deleted worktree) + for (const s of [...this.sessions.values()]) { + if (!s.worktreeId || !this.worktrees.has(s.worktreeId)) { + this.sessions.delete(s.id) + changed = true + } + } + if (changed) { + this.log(`Pruned orphaned sessions during validation`) + await this.save() + } } /** Wait for any in-flight save to complete without triggering a new one. */ @@ -404,6 +610,13 @@ export class WorktreeStateManager { const { id: _, ...rest } = s data.sessions[id] = rest } + if (this.sections.size > 0) { + data.sections = {} + for (const [id, sec] of this.sections) { + const { id: _, ...rest } = sec + data.sections[id] = rest + } + } if (Object.keys(this.tabOrder).length > 0) { data.tabOrder = this.tabOrder } diff --git a/packages/kilo-vscode/src/agent-manager/git-import.ts b/packages/kilo-vscode/src/agent-manager/git-import.ts index 342a0448ef..ae3f2c37a7 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/src/agent-manager/host.ts b/packages/kilo-vscode/src/agent-manager/host.ts index 34bbdd3b7f..6dc5e65828 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 } @@ -56,9 +58,15 @@ export interface PanelContext { /** Whether the panel is currently the active tab. */ readonly active: boolean + /** Whether the panel is visible (may be unfocused in a split editor group). */ + readonly visible: boolean + /** Session provider wired to this panel. */ readonly sessions: SessionProvider + /** Register a callback for when panel visibility changes. */ + onDidChangeVisibility(cb: (visible: boolean) => void): Disposable + /** Register a callback for when the panel is disposed. */ onDidDispose(cb: () => void): Disposable @@ -107,6 +115,9 @@ export interface Host { /** Capture a telemetry event. */ capture(event: string, properties?: Record): void + /** Open a URL in the user's default browser. */ + openExternal(url: string): void + /** Ask VS Code's git extension to re-scan repositories (e.g. after worktree ref migration). */ refreshGit(): void diff --git a/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts b/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts new file mode 100644 index 0000000000..03146dc49a --- /dev/null +++ b/packages/kilo-vscode/src/agent-manager/pr-status-bridge.ts @@ -0,0 +1,114 @@ +/** + * Bridges the PRStatusPoller with the AgentManagerProvider. + * + * Owns the poller instance, the cached PR messages, and all message/panel handling + * so the provider only needs thin delegation calls. + */ +import type { Worktree } from "./WorktreeStateManager" +import type { AgentManagerOutMessage, PRStatus } from "./types" +import type { Disposable } from "./host" +import type { Semaphore } from "./semaphore" +import { PRStatusPoller } from "./PRStatusPoller" + +interface PRBridgeHost { + getWorktrees(): Worktree[] + getWorkspaceRoot(): string | undefined + postToWebview(msg: AgentManagerOutMessage): void + updateWorktreePR(id: string, number?: number, url?: string, state?: string): void + hasPersistedPR(id: string): boolean + openExternal(url: string): void + log(...args: unknown[]): void + semaphore?: Semaphore +} + +/** Minimal panel surface needed by the bridge (subset of PanelContext). */ +interface PanelLike { + readonly visible: boolean + onDidChangeVisibility(cb: (visible: boolean) => void): Disposable +} + +export class PRStatusBridge { + readonly poller: PRStatusPoller + private readonly cache = new Map() + private readonly host: PRBridgeHost + + constructor(host: PRBridgeHost) { + this.host = host + this.poller = new PRStatusPoller(bridgePollerOpts(this, host)) + } + + static create(opts: { + getWorktrees: () => Worktree[] + getWorkspaceRoot: () => string | undefined + postToWebview: (msg: AgentManagerOutMessage) => void + updateWorktreePR: (id: string, n?: number, u?: string, s?: string) => void + hasPersistedPR: (id: string) => boolean + openExternal: (url: string) => void + log: (...args: unknown[]) => void + semaphore?: Semaphore + }): PRStatusBridge { + return new PRStatusBridge(opts) + } + + /** Wire visibility tracking to a panel — pauses polling when hidden. */ + attachPanel(panel: PanelLike): void { + this.poller.setVisible(panel.visible) + panel.onDidChangeVisibility((v) => { + this.poller.setVisible(v) + }) + } + + /** Replay cached PR statuses to a freshly-connected webview. */ + replay(): void { + this.cache.forEach((msg) => this.host.postToWebview(msg)) + } + + /** Handle an incoming webview message. Returns true if handled. */ + handleMessage(m: Record): boolean { + if (m.type === "agentManager.refreshPR") { + this.poller.refresh(m.worktreeId as string) + return true + } + if (m.type === "agentManager.openPR") { + const wt = this.host.getWorktrees().find((w: Worktree) => w.id === m.worktreeId) + if (wt?.prUrl) this.host.openExternal(wt.prUrl) + return true + } + return false + } + + /** Remove cached status for a deleted worktree. */ + remove(worktreeId: string): void { + this.cache.delete(worktreeId) + } +} + +/** Build PRStatusPoller options that forward events through the bridge cache. */ +function bridgePollerOpts(bridge: PRStatusBridge, host: PRBridgeHost) { + return { + getWorktrees: () => host.getWorktrees(), + getWorkspaceRoot: () => host.getWorkspaceRoot(), + 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 + // (in-memory cache or persisted prNumber) — that would overwrite + // the live badge with pr:null. Only forward when there's truly no + // prior data (first poll failed, nothing persisted). + if (!bridge["cache"].has(id) && !host.hasPersistedPR(id)) + host.postToWebview({ + type: "agentManager.prStatus", + worktreeId: id, + pr: null, + error: err, + } as AgentManagerOutMessage) + return + } + const msg = { type: "agentManager.prStatus", worktreeId: id, pr, error: err } as AgentManagerOutMessage + bridge["cache"].set(id, msg) + host.postToWebview(msg) + host.updateWorktreePR(id, pr?.number, pr?.url, pr?.state) + }, + log: (...args: unknown[]) => host.log(...args), + } +} diff --git a/packages/kilo-vscode/src/agent-manager/section-handler.ts b/packages/kilo-vscode/src/agent-manager/section-handler.ts new file mode 100644 index 0000000000..624a23eb10 --- /dev/null +++ b/packages/kilo-vscode/src/agent-manager/section-handler.ts @@ -0,0 +1,21 @@ +import type { WorktreeStateManager } from "./WorktreeStateManager" +import type { AgentManagerInMessage } from "./types" + +/** Handle section CRUD messages. Returns true if handled. */ +export function handleSection( + state: WorktreeStateManager | undefined, + m: AgentManagerInMessage, + push: () => void, +): boolean { + if (!state) return false + if (m.type === "agentManager.createSection") state.addSection(m.name, m.color ?? null, m.worktreeIds) + else if (m.type === "agentManager.renameSection") state.renameSection(m.sectionId, m.name) + else if (m.type === "agentManager.deleteSection") state.deleteSection(m.sectionId) + else if (m.type === "agentManager.setSectionColor") state.setSectionColor(m.sectionId, m.color) + else if (m.type === "agentManager.toggleSectionCollapsed") state.toggleSection(m.sectionId) + else if (m.type === "agentManager.moveToSection") state.moveToSection(m.worktreeIds, m.sectionId) + else if (m.type === "agentManager.moveSection") state.moveSection(m.sectionId, m.dir) + else return false + push() + return true +} 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 0000000000..37f3ab9cdd --- /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/src/agent-manager/task-runner.ts b/packages/kilo-vscode/src/agent-manager/task-runner.ts index 0c9e7fa7c4..1329939e27 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 diff --git a/packages/kilo-vscode/src/agent-manager/types.ts b/packages/kilo-vscode/src/agent-manager/types.ts index aeffd54bbc..2dc76cc6a0 100644 --- a/packages/kilo-vscode/src/agent-manager/types.ts +++ b/packages/kilo-vscode/src/agent-manager/types.ts @@ -8,7 +8,7 @@ */ import type { FileDiff } from "@kilocode/sdk/v2/client" -import type { Worktree, ManagedSession } from "./WorktreeStateManager" +import type { Worktree, ManagedSession, Section } from "./WorktreeStateManager" import type { WorktreeStats, LocalStats } from "./GitStatsPoller" import type { ApplyConflict } from "./GitOps" import type { BranchListItem, WorktreeSetupErrorCode } from "./git-import" @@ -29,6 +29,58 @@ export type WorktreeDiffEntry = FileDiff & { stamp?: string } +// --------------------------------------------------------------------------- +// PR status types +// --------------------------------------------------------------------------- + +export type PRState = "open" | "draft" | "merged" | "closed" +export type ReviewDecision = "approved" | "changes_requested" | "pending" +export type CheckStatus = "success" | "failure" | "pending" | "skipped" | "cancelled" +export type AggregateCheckStatus = "success" | "failure" | "pending" | "none" + +export interface PRCheck { + name: string + status: CheckStatus + url?: string + duration?: string +} + +export interface PRComment { + id: string + author: string + avatar?: string + body: string + file?: string + line?: number + url?: string + resolved: boolean + createdAt?: number +} + +export interface PRStatus { + number: number + title: string + url: string + state: PRState + review: ReviewDecision | null + checks: { + status: AggregateCheckStatus + total: number + passed: number + failed: number + pending: number + items: PRCheck[] + } + comments?: { + total: number + unresolved: number + items: PRComment[] + } + additions: number + deletions: number + files: number +} + // --------------------------------------------------------------------------- // Extension → Webview messages (postToWebview) // --------------------------------------------------------------------------- @@ -66,6 +118,7 @@ interface StateMessage { type: "agentManager.state" worktrees: Worktree[] sessions: ManagedSession[] + sections?: Section[] staleWorktreeIds?: string[] tabOrder?: Record worktreeOrder?: string[] @@ -175,6 +228,21 @@ interface WorktreeDiffFileMessage { diff: WorktreeDiffEntry | null } +interface RevertWorktreeFileResultMessage { + type: "agentManager.revertWorktreeFileResult" + sessionId: string + file: string + status: "success" | "error" + message: string +} + +interface PRStatusOutMessage { + type: "agentManager.prStatus" + worktreeId: string + pr: PRStatus | null + error?: "gh_missing" | "gh_auth" | "fetch_failed" +} + interface ActionOutMessage { type: "action" action: string @@ -202,6 +270,8 @@ export type AgentManagerOutMessage = | WorktreeDiffLoadingMessage | WorktreeDiffMessage | WorktreeDiffFileMessage + | RevertWorktreeFileResultMessage + | PRStatusOutMessage | ActionOutMessage // --------------------------------------------------------------------------- @@ -244,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" } @@ -379,6 +461,27 @@ interface StopDiffWatchIn { type: "agentManager.stopDiffWatch" } +interface RevertWorktreeFileIn { + type: "agentManager.revertWorktreeFile" + sessionId: string + file: string +} + +interface RefreshPRIn { + type: "agentManager.refreshPR" + worktreeId: string +} + +interface OpenPRIn { + type: "agentManager.openPR" + worktreeId: string +} + +interface OpenSessionsIn { + type: "agentManager.openSessions" + sessionIDs: string[] +} + interface OpenFileIn { type: "agentManager.openFile" sessionId: string @@ -453,6 +556,47 @@ interface ContinueInWorktreeIn { sessionId: string } +interface CreateSectionIn { + type: "agentManager.createSection" + name: string + color?: string + worktreeIds?: string[] +} + +interface RenameSectionIn { + type: "agentManager.renameSection" + sectionId: string + name: string +} + +interface DeleteSectionIn { + type: "agentManager.deleteSection" + sectionId: string +} + +interface SetSectionColorIn { + type: "agentManager.setSectionColor" + sectionId: string + color: string | null +} + +interface ToggleSectionCollapsedIn { + type: "agentManager.toggleSectionCollapsed" + sectionId: string +} + +interface MoveToSectionIn { + type: "agentManager.moveToSection" + worktreeIds: string[] + sectionId: string | null +} + +interface MoveSectionIn { + type: "agentManager.moveSection" + sectionId: string + dir: -1 | 1 +} + /** All messages the Agent Manager expects from the webview (onMessage input). */ export type AgentManagerInMessage = | CreateWorktreeIn @@ -462,6 +606,8 @@ export type AgentManagerInMessage = | OpenLocallyIn | AddSessionToWorktreeIn | CloseSessionIn + | PersistSessionIn + | ForgetSessionIn | ForkSessionIn | ConfigureSetupScriptIn | ShowTerminalIn @@ -489,6 +635,10 @@ export type AgentManagerInMessage = | ApplyWorktreeDiffIn | StartDiffWatchIn | StopDiffWatchIn + | RevertWorktreeFileIn + | RefreshPRIn + | OpenPRIn + | OpenSessionsIn | OpenFileIn | GenericOpenFileIn | PreviewImageIn @@ -498,3 +648,10 @@ export type AgentManagerInMessage = | ClearSessionIn | AbortIn | ContinueInWorktreeIn + | CreateSectionIn + | RenameSectionIn + | DeleteSectionIn + | SetSectionColorIn + | ToggleSectionCollapsedIn + | MoveToSectionIn + | MoveSectionIn diff --git a/packages/kilo-vscode/src/agent-manager/vscode-host.ts b/packages/kilo-vscode/src/agent-manager/vscode-host.ts index f3f3a4c969..9a539ccf0b 100644 --- a/packages/kilo-vscode/src/agent-manager/vscode-host.ts +++ b/packages/kilo-vscode/src/agent-manager/vscode-host.ts @@ -9,17 +9,24 @@ import * as vscode from "vscode" import type { Host, PanelContext, OutputHandle, SessionProvider, Disposable } from "./host" import type { KiloConnectionService } from "../services/cli-backend" import { KiloProvider } from "../KiloProvider" +import { DiffVirtualProvider } from "../DiffVirtualProvider" import { buildWebviewHtml } from "../utils" import { openFileInEditor, getWorkspaceRoot } from "../review-utils" import { TelemetryProxy, type TelemetryEventName } from "../services/telemetry" export class VscodeHost implements Host { + private diffVirtual: DiffVirtualProvider | undefined + constructor( private readonly extensionUri: vscode.Uri, private readonly connectionService: KiloConnectionService, private readonly context: vscode.ExtensionContext, ) {} + setDiffVirtualProvider(provider: DiffVirtualProvider): void { + this.diffVirtual = provider + } + openPanel(opts: { onBeforeMessage: (msg: Record) => Promise | null> }): PanelContext { @@ -74,6 +81,9 @@ export class VscodeHost implements Host { const provider = new KiloProvider(this.extensionUri, this.connectionService, this.context, { slimEditMetadata: true, }) + if (this.diffVirtual) { + provider.setDiffVirtualProvider(this.diffVirtual) + } provider.attachToWebview(panel.webview, { onBeforeMessage: opts.onBeforeMessage, }) @@ -85,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(), } @@ -92,6 +103,9 @@ export class VscodeHost implements Host { get active() { return panel.active }, + get visible() { + return panel.visible + }, postMessage(msg) { void panel.webview.postMessage(msg) }, @@ -99,6 +113,9 @@ export class VscodeHost implements Host { panel.reveal(vscode.ViewColumn.One, preserveFocus ?? false) }, sessions, + onDidChangeVisibility(cb) { + return panel.onDidChangeViewState((e) => cb(e.webviewPanel.visible)) + }, onDidDispose(cb) { return panel.onDidDispose(cb) }, @@ -160,9 +177,11 @@ export class VscodeHost implements Host { TelemetryProxy.capture(event as TelemetryEventName, properties) } + openExternal(url: string): void { + void vscode.env.openExternal(vscode.Uri.parse(url)) + } + refreshGit(): void { - // Trigger VS Code's built-in git extension to re-scan repositories. - // This picks up worktrees whose gitdir refs were just rewritten by migration. void vscode.commands.executeCommand("git.refresh") } diff --git a/packages/kilo-vscode/src/extension.ts b/packages/kilo-vscode/src/extension.ts index 438b26c3a9..60b30ecc87 100644 --- a/packages/kilo-vscode/src/extension.ts +++ b/packages/kilo-vscode/src/extension.ts @@ -3,6 +3,7 @@ import { KiloProvider } from "./KiloProvider" import { AgentManagerProvider } from "./agent-manager/AgentManagerProvider" import { VscodeHost } from "./agent-manager/vscode-host" import { DiffViewerProvider } from "./DiffViewerProvider" +import { DiffVirtualProvider } from "./DiffVirtualProvider" import { SettingsEditorProvider } from "./SettingsEditorProvider" import { SubAgentViewerProvider } from "./SubAgentViewerProvider" import { EXTENSION_DISPLAY_NAME } from "./constants" @@ -15,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 @@ -32,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() @@ -41,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) } }) @@ -59,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. @@ -102,9 +120,11 @@ 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), ) + tabProvider.setDiffVirtualProvider(diffVirtualProvider) tabProvider.resolveWebviewPanel(panel) tabPanels.set(panel, tabProvider) panel.onDidDispose( @@ -128,8 +148,15 @@ export function activate(context: vscode.ExtensionContext) { }) context.subscriptions.push(diffViewerProvider) + // Create diff virtual provider (lightweight single-file diff for permission approval) + const diffVirtualProvider = new DiffVirtualProvider(context.extensionUri) + provider.setDiffVirtualProvider(diffVirtualProvider) + agentManagerHost.setDiffVirtualProvider(diffVirtualProvider) + context.subscriptions.push(diffVirtualProvider) + // 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) @@ -220,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) + return openKiloInNewTab( + context, + connectionService, + agentManagerProvider, + tabPanels, + diffVirtualProvider, + remoteService, + ) }), vscode.commands.registerCommand("kilo-code.new.showChanges", () => { diffViewerProvider.openPanel() @@ -353,6 +390,8 @@ async function openKiloInNewTab( connectionService: KiloConnectionService, 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 @@ -375,9 +414,11 @@ async function openKiloInNewTab( } const tabProvider = new KiloProvider(context.extensionUri, connectionService, context) + tabProvider.setRemoteService(remoteService) tabProvider.setContinueInWorktreeHandler((sessionId, progress) => agentManagerProvider.continueFromSidebar(sessionId, progress), ) + tabProvider.setDiffVirtualProvider(diffVirtualProvider) tabProvider.resolveWebviewPanel(panel) tabPanels.set(panel, tabProvider) diff --git a/packages/kilo-vscode/src/kilo-provider/slim-metadata.ts b/packages/kilo-vscode/src/kilo-provider/slim-metadata.ts index 3ec760d7c4..a7748b5d00 100644 --- a/packages/kilo-vscode/src/kilo-provider/slim-metadata.ts +++ b/packages/kilo-vscode/src/kilo-provider/slim-metadata.ts @@ -112,13 +112,29 @@ function slimMultiedit(state: Record): Record return next } -/** write: strip input.content (entire file). Keep filePath + diagnostics. */ +/** write: strip input.content, raw diff text, and filediff.before/after. Keep filepath + exists + diagnostics. */ function slimWrite(state: Record): Record { const next = { ...state } const input = state.input if (isObj(input) && typeof input.content === "string") { next.input = { ...input, content: undefined } } + const meta = state.metadata + if (isObj(meta)) { + const slim: Record = {} + if (meta.filepath) slim.filepath = meta.filepath + if (meta.exists !== undefined) slim.exists = meta.exists + if (meta.diagnostics) slim.diagnostics = meta.diagnostics + const fd = meta.filediff + if (isObj(fd)) { + slim.filediff = { + ...(typeof fd.file === "string" ? { file: fd.file } : {}), + additions: typeof fd.additions === "number" ? fd.additions : 0, + deletions: typeof fd.deletions === "number" ? fd.deletions : 0, + } + } + next.metadata = slim + } return next } diff --git a/packages/kilo-vscode/src/kilo-provider/task-session.ts b/packages/kilo-vscode/src/kilo-provider/task-session.ts new file mode 100644 index 0000000000..cff8f6661d --- /dev/null +++ b/packages/kilo-vscode/src/kilo-provider/task-session.ts @@ -0,0 +1,17 @@ +type Meta = { sessionId?: string } + +type State = { + metadata?: Meta +} + +type Part = { + type?: string + tool?: string + metadata?: Meta + state?: State +} + +export function childID(part: Part): string | undefined { + if (part.type !== "tool" || part.tool !== "task") return undefined + return part.metadata?.sessionId ?? part.state?.metadata?.sessionId +} diff --git a/packages/kilo-vscode/src/services/RemoteStatusService.ts b/packages/kilo-vscode/src/services/RemoteStatusService.ts new file mode 100644 index 0000000000..9b5077ee56 --- /dev/null +++ b/packages/kilo-vscode/src/services/RemoteStatusService.ts @@ -0,0 +1,130 @@ +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 } + +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({ throwOnError: true }) + if (!data) return + 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({ throwOnError: true }) + } else { + await this.client.remote.disable({ throwOnError: true }) + } + 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() + } + + // -- 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 = t("remote.connected") + this.bar.color = new vscode.ThemeColor("testing.iconPassed") + } else { + this.bar.text = "$(radio-tower) Kilo Remote \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/autocomplete/chat-autocomplete/ChatTextAreaAutocomplete.ts b/packages/kilo-vscode/src/services/autocomplete/chat-autocomplete/ChatTextAreaAutocomplete.ts index 690f0e1261..bb4e52f000 100644 --- a/packages/kilo-vscode/src/services/autocomplete/chat-autocomplete/ChatTextAreaAutocomplete.ts +++ b/packages/kilo-vscode/src/services/autocomplete/chat-autocomplete/ChatTextAreaAutocomplete.ts @@ -1,15 +1,24 @@ import * as vscode from "vscode" import { AutocompleteModel } from "../AutocompleteModel" -import { AutocompleteContext, VisibleCodeContext } from "../types" +import type { AutocompleteContext, VisibleCodeContext } from "../types" import { removePrefixOverlap } from "../continuedev/core/autocomplete/postprocessing/removePrefixOverlap.js" import { AutocompleteTelemetry } from "../classic-auto-complete/AutocompleteTelemetry" import { postprocessAutocompleteSuggestion } from "../classic-auto-complete/uselessSuggestionFilter" import { VisibleCodeTracker } from "../context/VisibleCodeTracker" import { FileIgnoreController } from "../shims/FileIgnoreController" import type { KiloConnectionService } from "../../cli-backend" -import type { ChatCompletionRequestMessage, ChatCompletionResponseSender } from "./handleChatCompletionRequest" import { finalizeChatSuggestion, buildChatPrefix } from "./chat-autocomplete-utils" +interface ChatCompletionRequestMessage { + type: "requestChatCompletion" + text: string + requestId: string +} + +interface ChatCompletionResponseSender { + postMessage(message: { type: "chatCompletionResult"; text: string; requestId: string }): void +} + /** * Chat textarea autocomplete with cached per-request objects. * diff --git a/packages/kilo-vscode/src/services/autocomplete/chat-autocomplete/handleChatCompletionAccepted.ts b/packages/kilo-vscode/src/services/autocomplete/chat-autocomplete/handleChatCompletionAccepted.ts deleted file mode 100644 index 9bb9a153bd..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/chat-autocomplete/handleChatCompletionAccepted.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { AutocompleteTelemetry } from "../classic-auto-complete/AutocompleteTelemetry" - -export interface ChatCompletionAcceptedMessage { - type: "chatCompletionAccepted" - suggestionLength?: number -} - -// Singleton telemetry instance for chat-textarea autocomplete -// This ensures we use the same instance across requests and acceptance events -let telemetryInstance: AutocompleteTelemetry | null = null - -/** - * Get or create the telemetry instance for chat-textarea autocomplete - */ -export function getChatAutocompleteTelemetry(): AutocompleteTelemetry { - if (!telemetryInstance) { - telemetryInstance = new AutocompleteTelemetry("chat-textarea") - } - return telemetryInstance -} - -/** - * Handles a chat completion accepted event from the webview. - * Captures telemetry when the user accepts a suggestion via Tab or ArrowRight. - */ -export function handleChatCompletionAccepted(message: ChatCompletionAcceptedMessage): void { - const telemetry = getChatAutocompleteTelemetry() - telemetry.captureAcceptSuggestion(message.suggestionLength) -} diff --git a/packages/kilo-vscode/src/services/autocomplete/chat-autocomplete/handleChatCompletionRequest.ts b/packages/kilo-vscode/src/services/autocomplete/chat-autocomplete/handleChatCompletionRequest.ts deleted file mode 100644 index eeac049683..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/chat-autocomplete/handleChatCompletionRequest.ts +++ /dev/null @@ -1,43 +0,0 @@ -import * as vscode from "vscode" -import { VisibleCodeTracker } from "../context/VisibleCodeTracker" -import { FileIgnoreController } from "../shims/FileIgnoreController" -import { ChatTextAreaAutocomplete } from "./ChatTextAreaAutocomplete" -import type { KiloConnectionService } from "../../cli-backend" - -export interface ChatCompletionRequestMessage { - type: "requestChatCompletion" - text?: string - requestId?: string -} - -export interface ChatCompletionResponseSender { - postMessage(message: { type: "chatCompletionResult"; text: string; requestId: string }): void -} - -/** - * Handles a chat completion request from the webview. - * Captures visible code context and generates an autocomplete suggestion. - */ -export async function handleChatCompletionRequest( - message: ChatCompletionRequestMessage, - responseSender: ChatCompletionResponseSender, - connectionService: KiloConnectionService, -): Promise { - const userText = message.text || "" - const requestId = message.requestId || "" - - const workspacePath = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? "" - - const ignoreController = new FileIgnoreController(workspacePath) - await ignoreController.initialize() - - const tracker = new VisibleCodeTracker(workspacePath, ignoreController) - const visibleContext = await tracker.captureVisibleCode() - - const autocomplete = new ChatTextAreaAutocomplete(connectionService) - const { suggestion } = await autocomplete.getCompletion(userText, visibleContext) - - responseSender.postMessage({ type: "chatCompletionResult", text: suggestion, requestId }) - - ignoreController.dispose() -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/API_REFERENCE.md b/packages/kilo-vscode/src/services/autocomplete/continuedev/API_REFERENCE.md deleted file mode 100644 index 216538b0c7..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/API_REFERENCE.md +++ /dev/null @@ -1,807 +0,0 @@ -# API Reference - -Complete API documentation for the Autocomplete & NextEdit library. - -## Table of Contents - -- [CompletionProvider](#completionprovider) -- [NextEditProvider](#nexteditprovider) -- [MinimalConfigProvider](#minimalconfigprovider) -- [Core Interfaces](#core-interfaces) -- [LLM Adapters](#llm-adapters) -- [Types and Interfaces](#types-and-interfaces) - ---- - -## CompletionProvider - -The main class for providing AI-powered code autocompletion. - -**Location**: [`core/autocomplete/CompletionProvider.ts`](core/autocomplete/CompletionProvider.ts) - -### Constructor - -```typescript -constructor( - configHandler: MinimalConfigProvider, - ide: IDE, - _injectedGetLlm: () => Promise, - _onError: (e: any) => void, - getDefinitionsFromLsp: GetLspDefinitionsFunction -) -``` - -**Parameters**: - -- `configHandler`: Configuration provider for autocomplete options -- `ide`: IDE interface implementation for file I/O and editor operations -- `_injectedGetLlm`: Async function that returns the LLM to use for completions -- `_onError`: Error callback function for handling autocomplete errors -- `getDefinitionsFromLsp`: Function to retrieve LSP definitions for enhanced context - -### Methods - -#### `provideInlineCompletionItems()` - -Generates an autocomplete completion for the given input. - -```typescript -async provideInlineCompletionItems( - input: AutocompleteInput, - token: AbortSignal | undefined, - force?: boolean -): Promise -``` - -**Parameters**: - -- `input`: Autocomplete context including file path, cursor position, recent edits -- `token`: AbortSignal to cancel the request -- `force`: If true, bypasses debouncing - -**Returns**: `AutocompleteOutcome` containing the completion text and metadata, or `undefined` if no completion - -**Example**: - -```typescript -const outcome = await completionProvider.provideInlineCompletionItems( - { - filepath: "/path/to/file.ts", - pos: { line: 10, character: 5 }, - completionId: "unique-completion-id", - recentlyEditedRanges: [], - recentlyEditedFiles: new Map(), - clipboardText: "", - }, - abortController.signal, -) -``` - -#### `accept()` - -Marks a completion as accepted by the user. - -```typescript -accept(completionId: string): void -``` - -**Parameters**: - -- `completionId`: Unique identifier for the accepted completion - -**Side Effects**: Updates bracket matching service and completion cache - -#### `markDisplayed()` - -Marks a completion as having been displayed to the user. - -```typescript -markDisplayed(completionId: string, outcome: AutocompleteOutcome): void -``` - -**Parameters**: - -- `completionId`: Unique identifier for the completion -- `outcome`: The autocomplete outcome that was displayed - -#### `cancel()` - -Cancels any in-progress autocomplete requests. - -```typescript -cancel(): void -``` - -### Configuration Options - -See [`MinimalConfigProvider`](#minimalconfigprovider) for configuration options. - ---- - -## NextEditProvider - -The main class for providing predictive multi-location code edits. - -**Location**: [`core/nextEdit/NextEditProvider.ts`](core/nextEdit/NextEditProvider.ts) - -### Constructor - -```typescript -constructor( - configHandler: MinimalConfigProvider, - ide: IDE, - _injectedGetLlm: () => Promise, - _onError: (e: any) => void -) -``` - -**Parameters**: - -- `configHandler`: Configuration provider -- `ide`: IDE interface implementation -- `_injectedGetLlm`: Function returning the LLM for edit predictions -- `_onError`: Error callback - -### Methods - -#### `getNextEditPrediction()` - -Generates predicted edits based on context and recent changes. - -```typescript -async getNextEditPrediction( - context: ModelSpecificContext, - signal?: AbortSignal, - usingFullFileDiff?: boolean -): Promise -``` - -**Parameters**: - -- `context`: Context including file contents, cursor position, recent edits -- `signal`: Optional AbortSignal to cancel the request -- `usingFullFileDiff`: If true, generates full-file diffs; if false, only edits within a region - -**Returns**: `NextEditOutcome` containing predicted edits and final cursor position - -**Example**: - -```typescript -const outcome = await nextEditProvider.getNextEditPrediction( - { - filepath: "/path/to/file.ts", - pos: { line: 15, character: 0 }, - fileContents: currentFileContents, - userEdits: recentDiff, - // ... other context - }, - abortController.signal, - false, // Use partial file diff -) - -if (outcome) { - console.log("Edit regions:", outcome.editableRegions) - console.log("Diff lines:", outcome.diffLines) - console.log("New cursor:", outcome.finalCursorPosition) -} -``` - ---- - -## MinimalConfigProvider - -Simple configuration provider that replaces the complex Continue config system. - -**Location**: [`core/autocomplete/MinimalConfig.ts`](core/autocomplete/MinimalConfig.ts) - -### Constructor - -```typescript -constructor(config?: Partial) -``` - -**Parameters**: - -- `config`: Optional partial configuration to override defaults - -**Example**: - -```typescript -const configProvider = new MinimalConfigProvider({ - tabAutocompleteOptions: { - debounceDelay: 200, - maxPromptTokens: 2048, - prefixPercentage: 0.5, - suffixPercentage: 0.3, - useCache: true, - onlyMyCode: false, - }, - experimental: { - enableStaticContextualization: true, - }, -}) -``` - -### Methods - -#### `loadConfig()` - -Returns the configuration object. - -```typescript -async loadConfig(): Promise<{ config: MinimalConfig }> -``` - -**Returns**: Promise resolving to an object containing the config - -#### `getAutocompleteOptions()` - -Gets autocomplete-specific options. - -```typescript -getAutocompleteOptions(): TabAutocompleteOptions -``` - -**Returns**: Autocomplete configuration options - -#### `isStaticContextualizationEnabled()` - -Checks if static contextualization is enabled. - -```typescript -isStaticContextualizationEnabled(): boolean -``` - -**Returns**: True if enabled, false otherwise - -### Configuration Interface - -```typescript -interface MinimalConfig { - tabAutocompleteOptions?: TabAutocompleteOptions - experimental?: { - enableStaticContextualization?: boolean - } - modelsByRole?: { - autocomplete?: ILLM[] - } - selectedModelByRole?: { - autocomplete?: ILLM - } -} -``` - -### TabAutocompleteOptions - -```typescript -interface TabAutocompleteOptions { - debounceDelay?: number // Debounce delay in ms (default: 150) - maxPromptTokens?: number // Max tokens for prompt (default: 1024) - prefixPercentage?: number // Percentage of tokens for prefix (default: 0.5) - suffixPercentage?: number // Percentage of tokens for suffix (default: 0.3) - maxSuffixPercentage?: number // Max suffix tokens percentage (default: 0.5) - useCache?: boolean // Enable completion caching (default: true) - onlyMyCode?: boolean // Only use workspace files for context (default: false) - template?: string // Custom prompt template - useFileSuffix?: boolean // Include file suffix in context (default: true) - multilineCompletions?: "always" | "never" | "auto" // Multiline behavior (default: 'auto') - slidingWindowPrefixPercentage?: number // Sliding window prefix % (default: 0.75) - slidingWindowSize?: number // Sliding window size (default: 500) - maxSnippetPercentage?: number // Max tokens for snippets (default: 0.6) - recentlyEditedSimilarityThreshold?: number // Similarity threshold (default: 0.3) - useOtherFiles?: boolean // Use other files for context (default: true) - disableInFiles?: string[] // Glob patterns to disable autocomplete - stopTokens?: string[] // Custom stop tokens - tokensPerCompletion?: number // Tokens per completion (default: 256) - transform?: boolean // Apply post-processing transforms (default: true) -} -``` - ---- - -## Core Interfaces - -### IDE Interface - -The IDE interface abstracts editor operations. Implement this to integrate with your editor. - -**Location**: [`core/index.d.ts`](core/index.d.ts) - -```typescript -interface IDE { - // File Operations - readFile(filepath: string): Promise - writeFile(filepath: string, contents: string): Promise - - // Workspace - getWorkspaceDirs(): Promise - listWorkspaceContents(directory?: string): Promise - - // Editor State - getCurrentFile(): Promise - getCursorPosition(): Promise - getVisibleFiles(): Promise - - // Code Navigation - getDefinition(filepath: string, position: Position): Promise - getReferences(filepath: string, position: Position): Promise - getSymbols(filepath: string): Promise - - // File Information - readRangeInFile(filepath: string, range: Range): Promise - getStats(filepath: string): Promise - - // Edits - applyEdits(edits: FileEdit[]): Promise - - // Diff/SCM - getDiff(includeUnstaged: boolean): Promise - getRepoName(dir: string): Promise - getBranch(dir: string): Promise - - // UI - showMessage(message: string, severity?: "info" | "warning" | "error"): Promise - showToast(type: "info" | "warning" | "error", message: string, ...actions: string[]): Promise - - // Terminal - runCommand(command: string, options?: TerminalOptions): Promise - - // Clipboard - getClipboardContent(): Promise<{ text: string; copiedAt: number } | undefined> - - // Search - getSearchResults(query: string): Promise - subprocess(command: string, cwd?: string): Promise<[string, string]> - - // Other - getIdeInfo(): Promise - getIdeSettings(): Promise - isTelemetryEnabled(): Promise - getUniqueId(): Promise -} -``` - -**Key Methods to Implement**: - -- `readFile()`, `writeFile()`: Essential for file I/O -- `getWorkspaceDirs()`: Returns workspace root directories -- `getCurrentFile()`, `getCursorPosition()`: Current editor state -- `applyEdits()`: Apply code changes -- `getDefinition()`: LSP-like functionality for context gathering - -### ILLM Interface - -The ILLM (Language Model) interface abstracts LLM providers. - -**Location**: [`core/index.d.ts`](core/index.d.ts) - -```typescript -interface ILLM { - // Required properties - uniqueId: string - model: string - contextLength: number - completionOptions: CompletionOptions - - // Provider info - get providerName(): string - get underlyingProviderName(): string - - // Optional - apiKey?: string - apiBase?: string - autocompleteOptions?: Partial - promptTemplates?: PromptTemplates - - // Completion methods - complete(prompt: string, signal: AbortSignal, options?: LLMFullCompletionOptions): Promise - - streamComplete( - prompt: string, - signal: AbortSignal, - options?: LLMFullCompletionOptions, - ): AsyncGenerator - - streamFim( - prefix: string, - suffix: string, - signal: AbortSignal, - options?: LLMFullCompletionOptions, - ): AsyncGenerator - - // Chat methods - chat(messages: ChatMessage[], signal: AbortSignal, options?: LLMFullCompletionOptions): Promise - - streamChat( - messages: ChatMessage[], - signal: AbortSignal, - options?: LLMFullCompletionOptions, - ): AsyncGenerator - - // Utility methods - countTokens(text: string): number - supportsImages(): boolean - supportsCompletions(): boolean - supportsFim(): boolean - listModels(): Promise -} -``` - ---- - -## LLM Adapters - -### OpenAI - -Pre-built adapter for OpenAI and OpenAI-compatible APIs. - -**Location**: [`core/llm/llms/OpenAI.ts`](core/llm/llms/OpenAI.ts) - -```typescript -import OpenAI from "@continuedev/core/llm/llms/OpenAI" - -const llm = new OpenAI({ - model: "gpt-4", - apiKey: process.env.OPENAI_API_KEY, - apiBase: "https://api.openai.com/v1", // Optional custom base URL - completionOptions: { - temperature: 0.1, - maxTokens: 1000, - }, -}) -``` - -**Constructor Options**: - -```typescript -interface OpenAIOptions { - model: string - apiKey: string - apiBase?: string - completionOptions?: CompletionOptions - contextLength?: number - autocompleteOptions?: Partial -} -``` - -### Creating Custom LLM Adapters - -To create a custom LLM adapter, implement the `ILLM` interface: - -```typescript -import { ILLM, CompletionOptions } from "@continuedev/core" - -class CustomLLM implements ILLM { - uniqueId = "custom-llm" - model: string - contextLength: number - completionOptions: CompletionOptions - - get providerName() { - return "custom" - } - get underlyingProviderName() { - return "custom" - } - - constructor(options: { model: string }) { - this.model = options.model - this.contextLength = 4096 - this.completionOptions = { - model: options.model, - temperature: 0.1, - } - } - - async complete(prompt: string, signal: AbortSignal): Promise { - // Call your LLM API - const response = await fetch("your-api-endpoint", { - method: "POST", - body: JSON.stringify({ prompt }), - signal, - }) - return await response.text() - } - - async *streamComplete(prompt: string, signal: AbortSignal) { - // Stream from your LLM API - for await (const chunk of streamFromAPI(prompt, signal)) { - yield chunk - } - return { modelTitle: this.model, prompt, completion: "" } - } - - // Implement other required methods... - countTokens(text: string): number { - return text.length / 4 // Rough estimate - } - - supportsImages() { - return false - } - supportsCompletions() { - return true - } - supportsFim() { - return false - } - - // ... other methods -} -``` - ---- - -## Types and Interfaces - -### AutocompleteInput - -Input for autocomplete requests. - -```typescript -interface AutocompleteInput { - filepath: string // Path to the file being edited - pos: Position // Cursor position - completionId: string // Unique ID for this completion request - recentlyEditedRanges: Range[] // Recently edited ranges in this file - recentlyEditedFiles: Map // Recently edited files - clipboardText: string // Current clipboard content - manuallyPassFileContext?: RangeInFile[] // Manually provided context -} -``` - -### AutocompleteOutcome - -Result of an autocomplete request. - -```typescript -interface AutocompleteOutcome { - completion: string // The completion text - completionId: string // Unique ID for this completion - filepath: string // File path - prefix: string // Code prefix (before cursor) - suffix: string // Code suffix (after cursor) - prompt: string // Full prompt sent to LLM - modelTitle: string // Model used - modelProvider: string // Provider used - completionOptions: CompletionOptions // Options used - cacheHit: boolean // Whether cached - latency: number // Response latency in ms -} -``` - -### NextEditOutcome - -Result of a NextEdit prediction. - -```typescript -interface NextEditOutcome { - edits: string // The predicted edit text - diffLines: DiffLine[] // Diff representation - editableRegions: Range[] // Regions that were edited - finalCursorPosition: Position // Predicted cursor position after edits - filepath: string // File path - prompt: string // Prompt sent to LLM - modelTitle: string // Model used - latency: number // Response latency in ms -} -``` - -### Position - -Position in a text document. - -```typescript -interface Position { - line: number // 0-based line number - character: number // 0-based character offset -} -``` - -### Range - -Range in a text document. - -```typescript -interface Range { - start: Position // Start position (inclusive) - end: Position // End position (exclusive) -} -``` - -### RangeInFile - -Range in a specific file. - -```typescript -interface RangeInFile { - filepath: string // File path - range: Range // Range within the file -} -``` - -### DiffLine - -A single line in a diff. - -```typescript -interface DiffLine { - type: "same" | "new" | "old" // Type of change - line: string // Line content - lineNumber: number // Line number in file -} -``` - -### FileEdit - -An edit to apply to a file. - -```typescript -interface FileEdit { - filepath: string // File to edit - range: Range // Range to replace - replacement: string // New content -} -``` - ---- - -## Usage Examples - -### Complete Example: Autocomplete with Custom IDE - -```typescript -import { CompletionProvider, MinimalConfigProvider } from "@continuedev/core/autocomplete" -import { IDE, ILLM, Position } from "@continuedev/core" -import OpenAI from "@continuedev/core/llm/llms/OpenAI" - -// 1. Implement IDE interface -class MyIDE implements IDE { - async readFile(filepath: string): Promise { - return fs.readFileSync(filepath, "utf-8") - } - - async getWorkspaceDirs(): Promise { - return ["/path/to/workspace"] - } - - async getCurrentFile() { - return { - filepath: this.currentFilePath, - contents: await this.readFile(this.currentFilePath), - } - } - - async getCursorPosition(): Promise { - return this.cursorPosition - } - - // ... implement other methods -} - -// 2. Set up configuration -const config = new MinimalConfigProvider({ - tabAutocompleteOptions: { - debounceDelay: 150, - maxPromptTokens: 1024, - useCache: true, - }, -}) - -// 3. Set up LLM -const getLlm = async (): Promise => { - return new OpenAI({ - apiKey: process.env.OPENAI_API_KEY, - model: "gpt-4", - }) -} - -// 4. Create completion provider -const ide = new MyIDE() -const provider = new CompletionProvider( - config, - ide, - getLlm, - (error) => console.error(error), - async () => [], // LSP definitions function -) - -// 5. Request completion -const outcome = await provider.provideInlineCompletionItems( - { - filepath: "/path/to/file.ts", - pos: { line: 10, character: 5 }, - completionId: "completion-1", - recentlyEditedRanges: [], - recentlyEditedFiles: new Map(), - clipboardText: "", - }, - new AbortController().signal, -) - -if (outcome) { - console.log("Completion:", outcome.completion) - provider.markDisplayed("completion-1", outcome) -} -``` - ---- - -## Error Handling - -Both `CompletionProvider` and `NextEditProvider` accept an error callback: - -```typescript -const onError = (error: any) => { - if (error instanceof Error) { - console.error("Error:", error.message) - // Show user notification - showNotification(error.message) - } -} - -const provider = new CompletionProvider( - config, - ide, - getLlm, - onError, // Error callback - getLspDefinitions, -) -``` - -Common errors: - -- **LLM API errors**: Network failures, invalid API keys, rate limits -- **File I/O errors**: Missing files, permission errors -- **Timeout errors**: Long-running requests that are aborted - ---- - -## Performance Considerations - -### Caching - -Completions are automatically cached using an LRU cache. Configure caching: - -```typescript -const config = new MinimalConfigProvider({ - tabAutocompleteOptions: { - useCache: true, // Enable caching (default) - }, -}) -``` - -### Debouncing - -Prevent excessive LLM calls during rapid typing: - -```typescript -const config = new MinimalConfigProvider({ - tabAutocompleteOptions: { - debounceDelay: 150, // Wait 150ms before requesting (default) - }, -}) -``` - -### Abort Signals - -Always provide AbortSignals to cancel in-progress requests: - -```typescript -const controller = new AbortController() - -// Start request -const promise = provider.provideInlineCompletionItems(input, controller.signal) - -// Cancel if needed -controller.abort() -``` - ---- - -## See Also - -- [README.md](README.md) - Project overview and quick start -- [ARCHITECTURE.md](ARCHITECTURE.md) - Technical architecture details -- [EXAMPLES.md](EXAMPLES.md) - More usage examples -- [Core TypeScript Definitions](core/index.d.ts) - Full type definitions diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/CompletionProvider.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/CompletionProvider.ts deleted file mode 100644 index 8871fc5e0f..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/CompletionProvider.ts +++ /dev/null @@ -1,272 +0,0 @@ -import { MinimalConfigProvider } from "./MinimalConfig.js" -import { IDE, ILLM } from "../index.js" -import { DEFAULT_AUTOCOMPLETE_OPTS } from "../util/parameters.js" -import { shouldCompleteMultiline } from "./classification/shouldCompleteMultiline.js" -import { ContextRetrievalService } from "./context/ContextRetrievalService.js" -import { isSecurityConcern } from "../indexing/ignore.js" -import { BracketMatchingService } from "./filtering/BracketMatchingService.js" -import { CompletionStreamer } from "./generation/CompletionStreamer.js" -import { postprocessCompletion } from "./postprocessing/index.js" -import { shouldPrefilter } from "./prefiltering/index.js" -import { getAllSnippetsWithoutRace } from "./snippets/index.js" -import { renderPromptWithTokenLimit } from "./templating/index.js" -import { GetLspDefinitionsFunction } from "./types.js" -import { AutocompleteDebouncer } from "./util/AutocompleteDebouncer.js" -import { AutocompleteLoggingService } from "./util/AutocompleteLoggingService.js" -import { AutocompleteLruCacheInMem } from "./util/AutocompleteLruCacheInMem.js" -import { HelperVars } from "./util/HelperVars.js" -import { AutocompleteInput, AutocompleteOutcome } from "./util/types.js" - -// Errors that can be expected on occasion even during normal functioning should not be shown. -// Not worth disrupting the user to tell them that a single autocomplete request didn't go through -const ERRORS_TO_IGNORE = [ - // From Ollama - "unexpected server status", - "operation was aborted", -] - -export class CompletionProvider { - private autocompleteCache = AutocompleteLruCacheInMem.get() - public errorsShown: Set = new Set() - private bracketMatchingService = new BracketMatchingService() - private debouncer = new AutocompleteDebouncer() - private completionStreamer: CompletionStreamer - private loggingService = new AutocompleteLoggingService() - private contextRetrievalService: ContextRetrievalService - - constructor( - private readonly configHandler: MinimalConfigProvider, - private readonly ide: IDE, - private readonly _injectedGetLlm: () => Promise, - private readonly _onError: (e: unknown) => void, - private readonly getDefinitionsFromLsp: GetLspDefinitionsFunction, - ) { - this.completionStreamer = new CompletionStreamer(this.onError.bind(this)) - this.contextRetrievalService = new ContextRetrievalService(this.ide) - } - - private async _prepareLlm(): Promise { - const llm = await this._injectedGetLlm() - - if (!llm) { - return undefined - } - - // Temporary fix for JetBrains autocomplete bug as described in https://github.com/continuedev/continue/pull/3022 - if (llm.model === undefined && llm.completionOptions?.model !== undefined) { - llm.model = llm.completionOptions.model - } - - // Ignore empty API keys for Mistral since we currently write - // a template provider without one during onboarding - if (llm.providerName === "mistral" && llm.apiKey === "") { - return undefined - } - - // Set temperature (but don't override) - if (llm.completionOptions.temperature === undefined) { - llm.completionOptions.temperature = 0.01 - } - - return llm - } - - private onError(e: unknown) { - if ( - ERRORS_TO_IGNORE.some((err) => (typeof e === "string" ? e.includes(err) : (e as Error)?.message?.includes(err))) - ) { - return - } - - console.warn("Error generating autocompletion: ", e) - const errorMessage = e instanceof Error ? e.message : String(e) - if (!this.errorsShown.has(errorMessage)) { - this.errorsShown.add(errorMessage) - this._onError(e) - } - } - - public cancel() { - this.loggingService.cancel() - } - - public accept(completionId: string) { - const outcome = this.loggingService.accept(completionId) - if (!outcome) { - return - } - this.bracketMatchingService.handleAcceptedCompletion(outcome.completion, outcome.filepath) - } - - public markDisplayed(completionId: string, outcome: AutocompleteOutcome) { - this.loggingService.markDisplayed(completionId, outcome) - } - - private async _getAutocompleteOptions(llm: ILLM) { - const { config } = await this.configHandler.loadConfig() - const options = { - ...DEFAULT_AUTOCOMPLETE_OPTS, - ...config?.tabAutocompleteOptions, - ...llm.autocompleteOptions, - } - - // Enable static contextualization if defined. - if (config?.experimental?.enableStaticContextualization) { - options.experimental_enableStaticContextualization = false - } - - return options - } - - public async provideInlineCompletionItems( - input: AutocompleteInput, - token: AbortSignal | undefined, - force?: boolean, - ): Promise { - try { - // Create abort signal if not given - if (!token) { - const controller = this.loggingService.createAbortController(input.completionId) - token = controller.signal - } - const startTime = Date.now() - - const llm = await this._prepareLlm() - if (!llm) { - return undefined - } - - if (isSecurityConcern(input.filepath)) { - return undefined - } - - const options = await this._getAutocompleteOptions(llm) - - // Debounce - if (!force) { - if (await this.debouncer.delayAndShouldDebounce(options.debounceDelay)) { - return undefined - } - } - - const helper = await HelperVars.create(input, options, llm.model, this.ide) - - if (await shouldPrefilter(helper, await this.ide.getWorkspaceDirs())) { - return undefined - } - - const [snippetPayload, workspaceDirs] = await Promise.all([ - getAllSnippetsWithoutRace({ - helper, - ide: this.ide, - getDefinitionsFromLsp: this.getDefinitionsFromLsp, - contextRetrievalService: this.contextRetrievalService, - }), - this.ide.getWorkspaceDirs(), - ]) - - const { prompt, prefix, suffix, completionOptions } = renderPromptWithTokenLimit({ - snippetPayload, - workspaceDirs, - helper, - llm, - }) - - // Completion - let completion: string | undefined = "" - - const cache = await this.autocompleteCache - const cachedCompletion = helper.options.useCache ? await cache.get(helper.prunedPrefix) : undefined - let cacheHit = false - if (cachedCompletion) { - // Cache - cacheHit = true - completion = cachedCompletion - } else { - const multiline = !helper.options.transform || shouldCompleteMultiline(helper) - - const completionStream = this.completionStreamer.streamCompletionWithFilters( - token, - llm, - prefix, - suffix, - prompt, - multiline, - completionOptions, - helper, - ) - - for await (const update of completionStream) { - completion += update - } - - // Don't postprocess if aborted - if (token.aborted) { - return undefined - } - - const processedCompletion = helper.options.transform - ? postprocessCompletion({ - completion, - prefix: helper.prunedPrefix, - suffix: helper.prunedSuffix, - llm, - }) - : completion - - completion = processedCompletion - } - - if (!completion) { - return undefined - } - - const outcome: AutocompleteOutcome = { - time: Date.now() - startTime, - completion, - prefix, - suffix, - prompt, - modelProvider: llm.underlyingProviderName, - modelName: llm.model, - completionOptions, - cacheHit, - filepath: helper.filepath, - numLines: completion.split("\n").length, - completionId: helper.input.completionId, - gitRepo: "fake-placeholder", //MINIMAL_REPO - came from git - uniqueId: await this.ide.getUniqueId(), - timestamp: new Date().toISOString(), - profileType: this.configHandler.currentProfile?.profileDescription.profileType, - ...helper.options, - } - - if (options.experimental_enableStaticContextualization) { - outcome.enabledStaticContextualization = true - } - - ////////// - // Save to cache - if (!outcome.cacheHit && helper.options.useCache) { - ;(await this.autocompleteCache) - .put(outcome.prefix, outcome.completion) - .catch((e) => console.warn(`Failed to save to cache: ${e.message}`)) - } - - // When using the JetBrains extension, Mark as displayed - const ideType = (await this.ide.getIdeInfo()).ideType - if (ideType === "jetbrains") { - this.markDisplayed(input.completionId, outcome) - } - - return outcome - } catch (e: unknown) { - this.onError(e) - return undefined - } finally { - this.loggingService.deleteAbortController(input.completionId) - } - } -} - -export default CompletionProvider diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/MinimalConfig.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/MinimalConfig.ts deleted file mode 100644 index c834949ff1..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/MinimalConfig.ts +++ /dev/null @@ -1,126 +0,0 @@ -/** - * Minimal configuration for autocomplete features. - * This replaces the complex ConfigHandler system with simple hardcoded defaults. - * - * Analysis of ConfigHandler usage: - * - CompletionProvider needs: config.tabAutocompleteOptions, config.experimental.enableStaticContextualization, currentProfile.profileType - * - * The profileType is only used for logging/telemetry, so we can set it to undefined for a minimal extraction. - */ - -import { ILLM, TabAutocompleteOptions } from "../index.js" -import { DEFAULT_AUTOCOMPLETE_OPTS } from "../util/parameters.js" - -interface MinimalConfig { - tabAutocompleteOptions?: TabAutocompleteOptions - experimental?: { - enableStaticContextualization?: boolean - } - // Minimal model selection support for NextEdit context fetching - modelsByRole?: { - autocomplete?: ILLM[] - } - selectedModelByRole?: { - autocomplete?: ILLM - edit?: ILLM - chat?: ILLM - rerank?: ILLM - } - rules?: unknown[] -} - -interface MinimalProfile { - profileDescription: { - profileType?: "control-plane" | "local" | "platform" - } -} - -/** - * Default configuration with hardcoded values suitable for autocomplete/NextEdit. - * Uses the same defaults from DEFAULT_AUTOCOMPLETE_OPTS. - */ -const DEFAULT_MINIMAL_CONFIG: MinimalConfig = { - tabAutocompleteOptions: { - ...DEFAULT_AUTOCOMPLETE_OPTS, - }, - experimental: { - enableStaticContextualization: false, - }, - modelsByRole: { - autocomplete: [], - }, - selectedModelByRole: { - autocomplete: undefined, - }, -} - -/** - * Simple config provider that replaces ConfigHandler for autocomplete/NextEdit. - * Returns hardcoded configuration without dependencies on control-plane. - */ -export class MinimalConfigProvider { - private config: MinimalConfig - public currentProfile: MinimalProfile | undefined - - constructor(config?: Partial) { - this.config = { - ...DEFAULT_MINIMAL_CONFIG, - ...config, - tabAutocompleteOptions: { - ...DEFAULT_AUTOCOMPLETE_OPTS, - ...config?.tabAutocompleteOptions, - } as TabAutocompleteOptions, - experimental: { - ...DEFAULT_MINIMAL_CONFIG.experimental, - ...config?.experimental, - }, - } - - // Set a minimal profile for logging purposes - // In a minimal extraction, we don't have a control-plane profile - this.currentProfile = undefined - } - - /** - * Returns the config in the same shape as ConfigHandler.loadConfig() - * This maintains API compatibility with existing code. - */ - async loadConfig(): Promise<{ config: MinimalConfig }> { - return { config: this.config } - } - - /** - * Get autocomplete options directly - */ - getAutocompleteOptions(): TabAutocompleteOptions { - return this.config.tabAutocompleteOptions || DEFAULT_AUTOCOMPLETE_OPTS - } - - /** - * Check if static contextualization is enabled - */ - isStaticContextualizationEnabled(): boolean { - return this.config.experimental?.enableStaticContextualization ?? false - } - - /** - * Reload config (stub for compatibility) - */ - async reloadConfig(..._args: unknown[]): Promise { - // No-op for minimal config - } - - /** - * Register config update handler (stub for compatibility) - */ - onConfigUpdate(_handler: (event: { config: MinimalConfig; configLoadInterrupted: boolean }) => void): void { - // No-op for minimal config - } - - /** - * Register custom context provider (stub for compatibility) - */ - registerCustomContextProvider(_provider: unknown): void { - // No-op for minimal config - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/classification/shouldCompleteMultiline.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/classification/shouldCompleteMultiline.ts deleted file mode 100644 index e24b700840..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/classification/shouldCompleteMultiline.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { AutocompleteLanguageInfo } from "../constants/AutocompleteLanguageInfo" -import { HelperVars } from "../util/HelperVars" - -function shouldCompleteMultilineBasedOnLanguage(language: AutocompleteLanguageInfo, prefix: string, suffix: string) { - return language.useMultiline?.({ prefix, suffix }) ?? true -} - -export function shouldCompleteMultiline(helper: HelperVars) { - switch (helper.options.multilineCompletions) { - case "always": - return true - case "never": - return false - default: - break - } - - // Always single-line if an intellisense option is selected - if (helper.input.selectedCompletionInfo) { - return true - } - - // // Don't complete multi-line if you are mid-line - // if (isMidlineCompletion(helper.fullPrefix, helper.fullSuffix)) { - // return false; - // } - - // Don't complete multi-line for single-line comments - if ( - helper.lang.singleLineComment && - helper.fullPrefix.split("\n").slice(-1)[0]?.trimStart().startsWith(helper.lang.singleLineComment) - ) { - return false - } - - return shouldCompleteMultilineBasedOnLanguage(helper.lang, helper.prunedPrefix, helper.prunedSuffix) -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/arrowFunctions.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/arrowFunctions.ts deleted file mode 100644 index cb853ef39b..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/arrowFunctions.ts +++ /dev/null @@ -1,29 +0,0 @@ -// @ts-nocheck - -const getAddress = (person: Person): Address => { - // TODO -} - -const logPerson = (person: Person) => { - // TODO -} - -const getHardcodedAddress = (): Address => { - // TODO -} - -const getAddresses = (people: Person[]): Address[] => { - // TODO -} - -const logPersonWithAddres = (person: Person
): Person
=> { - // TODO -} - -const logPersonOrAddress = (person: Person | Address): Person | Address => { - // TODO -} - -const logPersonAndAddress = (person: Person, address: Address) => { - // TODO -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/classMethods.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/classMethods.ts deleted file mode 100644 index 08f7506a70..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/classMethods.ts +++ /dev/null @@ -1,35 +0,0 @@ -// @ts-nocheck - -class Group { - getPersonAddress(person: Person): Address { - // TODO - } - - getHardcodedAddress(): Address { - // TODO - } - - addPerson(person: Person) { - // TODO - } - - addPeople(people: Person[]) { - // TODO - } - - getAddresses(people: Person[]): Address[] { - // TODO - } - - logPersonWithAddress(person: Person
): Person
{ - // TODO - } - - logPersonOrAddress(person: Person | Address): Person | Address { - // TODO - } - - logPersonAndAddress(person: Person, address: Address) { - // TODO - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/classes.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/classes.ts deleted file mode 100644 index 8bb8299868..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/classes.ts +++ /dev/null @@ -1,9 +0,0 @@ -// @ts-nocheck - -class Group extends BaseClass {} - -class Group implements FirstInterface {} - -class Group extends BaseClass implements FirstInterface, SecondInterface {} - -class Group extends BaseClass implements FirstInterface {} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/functions.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/functions.ts deleted file mode 100644 index bb9d39c85d..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/functions.ts +++ /dev/null @@ -1,33 +0,0 @@ -// @ts-nocheck - -function getAddress(person: Person): Address { - // TODO -} - -function getFirstAddress(people: Person[]): Address { - // TODO -} - -function logPerson(person: Person) { - // TODO -} - -function getHardcodedAddress(): Address { - // TODO -} - -function getAddresses(people: Person[]): Address[] { - // TODO -} - -function logPersonWithAddress(person: Person
): Person
{ - // TODO -} - -function logPersonOrAddress(person: Person | Address): Person | Address { - // TODO -} - -function logPersonAndAddress(person: Person, address: Address) { - // TODO -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/generators.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/generators.ts deleted file mode 100644 index 79811b4787..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__fixtures__/files/typescript/generators.ts +++ /dev/null @@ -1,33 +0,0 @@ -// @ts-nocheck - -function* getAddress(person: Person): Address { - // TODO -} - -function* getFirstAddress(people: Person[]): Address { - // TODO -} - -function* logPerson(person: Person) { - // TODO -} - -function* getHardcodedAddress(): Address { - // TODO -} - -function* getAddresses(people: Person[]): Address[] { - // TODO -} - -function* logPersonWithAddress(person: Person
): Person
{ - // TODO -} - -function* logPersonOrAddress(person: Person | Address): Person | Address { - // TODO -} - -function* logPersonAndAddress(person: Person, address: Address) { - // TODO -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__test-cases__/python.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__test-cases__/python.ts index 68a29efbfa..cb1c48318c 100644 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__test-cases__/python.ts +++ b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/context/root-path-context/__test-cases__/python.ts @@ -1,98 +1,3 @@ -export const FUNCTIONS = [ - { - nodeType: "function_definition with argument and return type", - fileName: "python/functions.py", - language: "Python", - cursorPosition: { line: 15, character: 8 }, - definitionPositions: [ - { row: 14, column: 30 }, // Person - { row: 14, column: 42 }, // Address - ], - }, - { - nodeType: "function_definition with generic argument and generic return type", - fileName: "python/functions.py", - language: "Python", - cursorPosition: { line: 18, character: 8 }, - definitionPositions: [ - { row: 17, column: 35 }, // Group - { row: 17, column: 42 }, // Person - { row: 17, column: 53 }, // Group - { row: 17, column: 61 }, // Address - ], - }, - { - nodeType: "function_definition with single argument and None return type", - fileName: "python/functions.py", - language: "Python", - cursorPosition: { line: 21, character: 8 }, - definitionPositions: [ - { row: 20, column: 29 }, // Person - ], - }, - { - nodeType: "function_definition with no arguments and single return type", - fileName: "python/functions.py", - language: "Python", - cursorPosition: { line: 24, character: 8 }, - definitionPositions: [ - { row: 23, column: 38 }, // Address - ], - }, - { - nodeType: "function_definition with Union arguments and Union return type", - fileName: "python/functions.py", - language: "Python", - cursorPosition: { line: 27, character: 8 }, - definitionPositions: [ - { row: 26, column: 45 }, // Person - { row: 26, column: 54 }, // Address - { row: 26, column: 72 }, // Person - { row: 26, column: 81 }, // Address - ], - }, - { - nodeType: "function_definition with multiple arguments and None return type", - fileName: "python/functions.py", - language: "Python", - cursorPosition: { line: 30, character: 8 }, - definitionPositions: [ - { row: 29, column: 41 }, // Person - { row: 29, column: 59 }, // Address - ], - }, - { - nodeType: "function_definition with one argument and Generator return type", - fileName: "python/functions.py", - language: "Python", - cursorPosition: { line: 33, character: 9 }, - definitionPositions: [ - { row: 32, column: 40 }, // Person - { row: 32, column: 62 }, // Address - ], - }, - { - nodeType: "function_definition inside a class", - fileName: "python/functions.py", - language: "Python", - cursorPosition: { line: 38, character: 12 }, - definitionPositions: [ - { row: 37, column: 51 }, // Person - { row: 37, column: 69 }, // Address - ], - }, - { - nodeType: "function_definition of an async function", - fileName: "python/functions.py", - language: "Python", - cursorPosition: { line: 41, character: 8 }, - definitionPositions: [ - { row: 40, column: 37 }, // Address - { row: 40, column: 48 }, // Person - ], - }, -] - export const CLASSES = [ { nodeType: "class_definition with multiple superclasses", diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/StreamTransformPipeline.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/StreamTransformPipeline.ts deleted file mode 100644 index 28bedc7342..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/StreamTransformPipeline.ts +++ /dev/null @@ -1,82 +0,0 @@ -import { streamLines } from "../../../diff/util" -import { HelperVars } from "../../util/HelperVars" - -import { stopAtStartOf, stopAtStopTokens } from "./charStream" -import { - avoidEmptyComments, - avoidPathLine, - noDoubleNewLine, - showWhateverWeHaveAtXMs, - skipPrefixes, - stopAtLines, - stopAtLinesExact, - stopAtRepeatingLines, - stopAtSimilarLine, - streamWithNewLines, -} from "./lineStream" - -const STOP_AT_PATTERNS = ["diff --git"] - -export class StreamTransformPipeline { - async *transform( - generator: AsyncGenerator, - prefix: string, - suffix: string, - multiline: boolean, - stopTokens: string[], - fullStop: () => void, - helper: HelperVars, - ): AsyncGenerator { - let charGenerator = generator - - charGenerator = stopAtStopTokens(generator, [...stopTokens, ...STOP_AT_PATTERNS]) - charGenerator = stopAtStartOf(charGenerator, suffix) - for (const charFilter of helper.lang.charFilters ?? []) { - charGenerator = charFilter({ - chars: charGenerator, - prefix, - suffix, - filepath: helper.filepath, - multiline, - }) - } - - let lineGenerator = streamLines(charGenerator) - - lineGenerator = stopAtLines(lineGenerator, fullStop) - const lineBelowCursor = this.getLineBelowCursor(helper) - if (lineBelowCursor.trim() !== "") { - lineGenerator = stopAtLinesExact(lineGenerator, fullStop, [lineBelowCursor]) - } - lineGenerator = stopAtRepeatingLines(lineGenerator, fullStop) - lineGenerator = avoidEmptyComments(lineGenerator, helper.lang.singleLineComment) - lineGenerator = avoidPathLine(lineGenerator, helper.lang.singleLineComment) - lineGenerator = skipPrefixes(lineGenerator) - lineGenerator = noDoubleNewLine(lineGenerator) - - for (const lineFilter of helper.lang.lineFilters ?? []) { - lineGenerator = lineFilter({ lines: lineGenerator, fullStop }) - } - - lineGenerator = stopAtSimilarLine(lineGenerator, this.getLineBelowCursor(helper), fullStop) - - const timeoutValue = helper.options.modelTimeout - - lineGenerator = showWhateverWeHaveAtXMs(lineGenerator, timeoutValue!) - - const finalGenerator = streamWithNewLines(lineGenerator) - for await (const update of finalGenerator) { - yield update - } - } - - private getLineBelowCursor(helper: HelperVars): string { - let lineBelowCursor = "" - let i = 1 - while (lineBelowCursor.trim() === "" && helper.pos.line + i <= helper.fileLines.length - 1) { - lineBelowCursor = helper.fileLines[Math.min(helper.pos.line + i, helper.fileLines.length - 1)] - i++ - } - return lineBelowCursor - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/charStream.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/charStream.test.ts deleted file mode 100644 index 488798b60f..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/charStream.test.ts +++ /dev/null @@ -1,192 +0,0 @@ -import { describe, expect, it } from "vitest" -import { stopAtStartOf, stopAtStopTokens } from "./charStream" - -async function* createMockStream(chunks: string[]): AsyncGenerator { - for (const chunk of chunks) { - yield chunk - } -} - -async function streamToString(stream: AsyncGenerator): Promise { - let result = "" - for await (const chunk of stream) { - result += chunk - } - return result -} - -describe("stopAtStopTokens", () => { - it("should yield characters until a stop token is encountered", async () => { - const mockStream = createMockStream(["Hello", " world", "! Stop", "here"]) - const stopTokens = ["Stop"] - const result = stopAtStopTokens(mockStream, stopTokens) - - const output = [] - for await (const char of result) { - output.push(char) - } - - expect(output.join("")).toBe("Hello world! ") - }) - - it("should handle multiple stop tokens", async () => { - const mockStream = createMockStream(["This", " is a ", "test. END", " of stream"]) - const stopTokens = ["END", "STOP", "HALT"] - const result = stopAtStopTokens(mockStream, stopTokens) - - expect(await streamToString(result)).toBe("This is a test. ") - }) - - it("should handle stop tokens split across chunks", async () => { - const mockStream = createMockStream(["Hello", " wo", "r", "ld! ST", "OP now"]) - const stopTokens = ["STOP"] - const result = stopAtStopTokens(mockStream, stopTokens) - - const output = [] - for await (const char of result) { - output.push(char) - } - - expect(output.join("")).toBe("Hello world! ") - }) - - it("should yield all characters if no stop token is encountered", async () => { - const mockStream = createMockStream(["This", " is ", "a complete", " stream"]) - const stopTokens = ["END"] - const result = stopAtStopTokens(mockStream, stopTokens) - - expect(await streamToString(result)).toBe("This is a complete stream") - }) - - it("should handle empty chunks", async () => { - const mockStream = createMockStream(["Hello", "", " world", "", "! STOP"]) - const stopTokens = ["STOP"] - const result = stopAtStopTokens(mockStream, stopTokens) - - expect(await streamToString(result)).toBe("Hello world! ") - }) - - it("should handle stop token at the beginning of the stream", async () => { - const mockStream = createMockStream(["STOP", "Hello world"]) - const stopTokens = ["STOP"] - const result = stopAtStopTokens(mockStream, stopTokens) - - const output = [] - for await (const char of result) { - output.push(char) - } - - expect(output.join("")).toBe("") - }) - - it("should handle stop token at the end of the stream", async () => { - const mockStream = createMockStream(["Hello world", "STOP"]) - const stopTokens = ["STOP"] - const result = stopAtStopTokens(mockStream, stopTokens) - - expect(await streamToString(result)).toBe("Hello world") - }) - - it("should handle multiple stop tokens of different lengths", async () => { - const mockStream = createMockStream(["This is a ", "test with ", "multiple STOP", " tokens END"]) - const stopTokens = ["STOP", "END", "HALT"] - const result = stopAtStopTokens(mockStream, stopTokens) - - expect(await streamToString(result)).toBe("This is a test with multiple ") - }) - - it("should handle an empty stream", async () => { - const mockStream = createMockStream([]) - const stopTokens = ["STOP"] - const result = stopAtStopTokens(mockStream, stopTokens) - - expect(await streamToString(result)).toBe("") - }) - - it("should handle an empty stop tokens array", async () => { - const mockStream = createMockStream(["Hello", " world!"]) - const stopTokens: string[] = [] - const result = stopAtStopTokens(mockStream, stopTokens) - - const output = [] - for await (const char of result) { - output.push(char) - } - - expect(output.join("")).toBe("Hello world!") - }) - - it("should handle stop token when remaining buffer is smaller than maximum stop token length", async () => { - const mockStream = createMockStream(["Hello world!STOP"]) - const stopTokens: string[] = ["STOP", "STOP_TOKEN_THAT_IS_LARGER_THAN_BUFFER"] - const result = stopAtStopTokens(mockStream, stopTokens) - - expect(await streamToString(result)).toBe("Hello world!") - }) -}) - -describe("stopAtStartOf", () => { - const sampleCode = ` { - method: "GET", - headers: { - "Content-Type": "application/json", - Authorization: \`Bearer \${this.workOsAccessToken}\`, - }, - }, - ); - const data = await response.json(); - return data.items; - } - - async getContextItems( - query: string, - extras: ContextProviderExtras, - ): Promise { - const response = await extras.fetch( - new URL( - \`/proxy/context/\${this.options.id}/retrieve\`, - controlPlaneEnv.CONTROL_PLANE_URL, - ), -` - - /* Some LLMs, such as Codestral, repeat the suffix of the query. To test our filtering, we cut the sample code at random positions, remove a part of the input -and construct a response, containing the removed part and the suffix. The goal of the stopAtStartOf() method is to detect the start of the suffix in the response */ - it("should stop if the start of the suffix is reached", async () => { - const suffix = ` - const data = await response.json(); - return data.items; -}` - const mockStream = createMockStream(sampleCode.split(/(?! )/g)) - const result = stopAtStartOf(mockStream, suffix) - - const resultStr = await streamToString(result) - expect(resultStr).toBe(` { - method: "GET", - headers: { - "Content-Type": "application/json", - Authorization: \`Bearer \${this.workOsAccessToken}\`, - }, - }, - ); - `) - }) - it("should stop if the start of the suffix is reached, even if the suffix has a prefix", async () => { - const suffix = ` - xxxconst data = await response.json(); - return data.items; -}` - const mockStream = createMockStream(sampleCode.split(/(?! )/g)) - const result = stopAtStartOf(mockStream, suffix) - - const resultStr = await streamToString(result) - expect(resultStr).toBe(` { - method: "GET", - headers: { - "Content-Type": "application/json", - Authorization: \`Bearer \${this.workOsAccessToken}\`, - }, - }, - ); - `) - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/charStream.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/charStream.ts deleted file mode 100644 index d19bed609c..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/charStream.ts +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Asynchronously yields characters from the input stream, stopping if a stop token is encountered. - * - * @param {AsyncGenerator} stream - The input stream of characters. - * @param {string[]} stopTokens - Array of tokens that signal when to stop yielding. - * @yields {string} Characters from the input stream. - * @returns {AsyncGenerator} An async generator that yields characters until a stop condition is met. - * @description - * 1. If no stop tokens are provided, yields all characters from the stream. - * 2. Otherwise, buffers incoming chunks and checks for stop tokens. - * 3. Yields characters one by one if no stop token is found at the start of the buffer. - * 4. Stops yielding and returns if a stop token is encountered. - * 5. After the stream ends, filters encountered stop tokens in remaining buffer. - * 6. Yields any remaining buffered characters. - */ -export async function* stopAtStopTokens(stream: AsyncGenerator, stopTokens: string[]): AsyncGenerator { - if (stopTokens.length === 0) { - for await (const char of stream) { - yield char - } - return - } - - const maxStopTokenLength = Math.max(...stopTokens.map((token) => token.length)) - let buffer = "" - - for await (const chunk of stream) { - buffer += chunk - - while (buffer.length >= maxStopTokenLength) { - let found = false - for (const stopToken of stopTokens) { - if (buffer.startsWith(stopToken)) { - found = true - return - } - } - - if (!found) { - yield buffer[0] - buffer = buffer.slice(1) - } - } - } - // Filter out the possible stop tokens from remaining buffer - stopTokens.forEach((token) => { - buffer = buffer.replace(token, "") - }) - - // Yield any remaining characters in the buffer - for (const char of buffer) { - yield char - } -} - -/** - * Asynchronously yields characters from the input stream. - * Stops if the beginning of the suffix is detected in the stream. - */ -export async function* stopAtStartOf( - stream: AsyncGenerator, - suffix: string, - sequenceLength: number = 20, -): AsyncGenerator { - if (suffix.length < sequenceLength) { - for await (const chunk of stream) { - yield chunk - } - return - } - // We use sequenceLength * 1.5 as a heuristic to make sure we don't miss the sequence if the - // stream is not perfectly aligned with the sequence (small whitespace differences etc). - const targetPart = suffix.trimStart().slice(0, Math.floor(sequenceLength * 1.5)) - - let buffer = "" - - for await (const chunk of stream) { - buffer += chunk - - // Check if the targetPart contains contains the buffer at any point - if (buffer.length >= sequenceLength && targetPart.includes(buffer)) { - return // Stop processing when the sequence is found - } - - // Yield chunk by chunk, ensuring not to exceed sequenceLength in the buffer - while (buffer.length > sequenceLength) { - yield buffer[0] - buffer = buffer.slice(1) - } - } - - // Yield the remaining buffer if it is not contained in the `targetPart` - if (buffer.length > 0) { - yield buffer - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/lineStream.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/lineStream.ts index 2a0be704a6..a4cc5e1526 100644 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/lineStream.ts +++ b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/streamTransforms/lineStream.ts @@ -1,4 +1,4 @@ -import { LineStream } from "../../../diff/util" +import type { LineStream } from "../../../diff/util" import { lineIsRepeated } from "../../util/textSimilarity" export { lineIsRepeated } @@ -177,19 +177,6 @@ export async function* stopAtLines( } } -/** - * Yield until an exact stop line is encountered, then call fullStop. - */ -export async function* stopAtLinesExact(stream: LineStream, fullStop: () => void, linesToStopAt: string[]): LineStream { - for await (const line of stream) { - if (linesToStopAt.some((stopAt) => line === stopAt)) { - fullStop() - break - } - yield line - } -} - /** * On the first line only, strip any configured prefix (e.g. ""). */ @@ -230,41 +217,3 @@ export async function* stopAtRepeatingLines(lines: LineStream, fullStop: () => v previousLine = line } } - -/** - * Pass through lines, but if the stream takes longer than ms after we have at least one non-empty line, stop early. - */ -export async function* showWhateverWeHaveAtXMs(lines: LineStream, ms: number): LineStream { - const startTime = Date.now() - let firstNonWhitespaceLineYielded = false - - for await (const line of lines) { - yield line - - if (!firstNonWhitespaceLineYielded && line.trim() !== "") { - firstNonWhitespaceLineYielded = true - } - - const isTakingTooLong = Date.now() - startTime > ms - if (isTakingTooLong && firstNonWhitespaceLineYielded) { - break - } - } -} - -/** - * Yield lines until the first blank line after some content; then stop. - */ -export async function* noDoubleNewLine(lines: LineStream): LineStream { - let isFirstLine = true - - for await (const line of lines) { - if (line.trim() === "" && !isFirstLine) { - return - } - - isFirstLine = false - - yield line - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/QWEN_JSON.txt b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/QWEN_JSON.txt deleted file mode 100644 index ff0ba3cb39..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/QWEN_JSON.txt +++ /dev/null @@ -1,60 +0,0 @@ -##### Prompt ##### -{ - "active": true, - "department": "Product Development", - "location": { - "country": "USA", - "state": "California", - "city": "San BERNARDINO", - "coordinates": { - - } - }, - "employees": [ - { - "name": "John Doe", - "age": 30, - "position": "Developer", - "skills": ["JavaScript", "React", "Node.js"], - "remote": false, - "salary": { - "currency": "USD", - "amount": 95000 - } - }, - { - "name": "Jane Smith", - "age": 25, - "position": "Designer", - "skills": ["Photoshop", "Illustrator"], - "remote": true, - "salary": { - "currency": "USD", - "amount": 70000 - } - }, - { - "name": "Emily Johnson", - "age": 35, - "position": "Manager", - "teamSize": 8, - "remote": true, - "skills": ["Leadership", "Project Management"],========================================================================== -========================================================================== -Completion: - - "latitude": 34.10834, - "longitude": -117.28977 - } - }, - "employeeCount": 2, - "averageAge": 30, - "remoteFriendly": true, - "salaryRange": { - "min": 70000, - "max": 95000, - "currency": "USD" - }, - "skills": { - "required": ["JavaScript", "React", "Node.js", "Leadership", "Project Management"], - "optional": ["Photoshop", "Illustrator"] \ No newline at end of file diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/QWEN_TYPESCRIPT.txt b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/QWEN_TYPESCRIPT.txt deleted file mode 100644 index 241d141f28..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/QWEN_TYPESCRIPT.txt +++ /dev/null @@ -1,128 +0,0 @@ -##### Prompt ##### - }`, - }, - { - description: "Should autocomplete Vue computed property", - filename: "UserComponent.vue", - input: ` - - -`, - llmOutput: `() { - return this.firstName + ' ' + this.lastName; - }`, - expectedCompletion: `() { - return this.firstName + ' ' + this.lastName; - }`, - }, - { - description: "Should autocomplete Vue method using props", - filename: "TodoItem.vue", - input: ` - - -`, - llmOutput: `this.completed`, - expectedCompletion: `this.completed`, - }, - { - description: "Should autocomplete Svelte reactive statement", - filename: "Counter.svelte", - input: ` - - - -`, - llmOutput: `doubledCount = count * 2`, - expectedCompletion: `doubledCount = count * 2`, - }, - - { - description: "Should autocomplete Svelte component inside HTML", - filename: "NestedComponent.svelte", - input: ` - - -
-

Hello Svelte

- /> -
-`, - llmOutput: `name="World"`, - expectedCompletion: `name="World"`, - }, - - { - description: "Should handle autocomplete in Svelte each block", - filename: "List.svelte", - input: ` - - -
    - {#each items as item} -
  • {item}
    • - {/each<|fim|> -
-`, - llmOutput: `}`, - expectedCompletion: `}`, - }, - -]; -========================================================================== -========================================================================== -Completion: - - - -export default { - components: { - ChildComponent, - }, \ No newline at end of file diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_JSON.txt b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_JSON.txt deleted file mode 100644 index a50bd2fb4c..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_JSON.txt +++ /dev/null @@ -1,20 +0,0 @@ -##### Prompt ##### -{ - "employees": [ - { "name": "John Doe", "age": 30, "position": "Developer" }, - { "name": "Jane Smith", "age": 25, "position": "Designer" }, - { "name": "Emily Johnson", "age": 35, "position": "Manager" } - ], - "active": true -} -========================================================================== -========================================================================== -Completion: - - -} - -{ - "employees": [ - { "name": "John Doe", "age": 30 }, - { "name": "Jane Smith", "age": 25 } \ No newline at end of file diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_PYTHON.TXT b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_PYTHON.TXT deleted file mode 100644 index c4aaf43ec1..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_PYTHON.TXT +++ /dev/null @@ -1,29 +0,0 @@ -##### Prompt ##### -class Calculator: - def __init__(self): - self.result = 0 - - def add(self, number): - self.result += number - return self - - def divid - - def subtract(self, number): - self.result -= number - return self - - def reset(self): - self.result = 0 - return self - - def get_result(self): - return self.result - - -========================================================================== -========================================================================== -Completion: - -self.result /= number - return self \ No newline at end of file diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_RUBY.TXT b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_RUBY.TXT deleted file mode 100644 index df8c2011fb..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_RUBY.TXT +++ /dev/null @@ -1,41 +0,0 @@ -##### Prompt ##### -class Calculator - attr_accessor :result - - def initialize - @result = 0 - end - - def add(number) - @result += number - self - end - - def subtract(number) - @result -= number - self - end - - def power(ne - - def get_result - @result - end - - def reset - @result = 0 - self - end -end - -calc = Calculator.new -calc.add(5).subtract(3) -puts "Result: #{calc.get_result}" -========================================================================== -========================================================================== -Completion: - - - @result ** number - self - end \ No newline at end of file diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_RUST.TXT b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_RUST.TXT deleted file mode 100644 index 582ae5f364..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/NEGATIVE_TEST_CASES/STARCODER_RUST.TXT +++ /dev/null @@ -1,73 +0,0 @@ -##### Prompt ##### -use std::io; - -fn main() { - println!("Welcome to the Calculator!"); - - loop { - println!("Please enter an operator (+, -, *, /) or 'q' to quit:"); - let operator = read_input(); - - if operator == "q" { - break; - } - - println!("Please enter the first number:"); - let num1 = read_input().parse::().unwrap(); - - println!("Please enter the second number:"); - let num2 = read_input().parse::().unwrap(); - - let result = match operator.as_str() { - "+" => num1 + num2, - "-" => num1 - num2, - "*" => num1 * num2, - "/" => num1 / num2, - - _ => { - println!("Invalid operator. Please try again."); - continue; - } - }; - - println!("Result: {}", result); - } -} - -fn read_input() -> String { - let mut input = String::new(); - io::stdin() - .read_line(&mut input) - .expect("Failed to read input"); - input.trim().to_string() -} -========================================================================== -========================================================================== -Completion: - - => { - println!("Invalid operator. Please try again."); - continue; - } - }; - - println!("Result: {}", result); - } - - println!("Goodbye!"); -} - - -fn main2() { - println!("Welcome to the Calculator!"); - - loop { - println!("Please enter an operator (+, -, *, /) or 'q' to quit:"); - let operator = read_input(); - - if operator == "q" { - break; - } - - match operator.as_str() { - "+" | "-" | "*" | "/" => (), \ No newline at end of file diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/filter.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/filter.test.ts deleted file mode 100644 index 9f3a1d68e9..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/filter.test.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { afterAll, beforeAll, describe, it } from "vitest" -import { addToTestDir, setUpTestDir, tearDownTestDir } from "../../../test/testDir" - -import { TEST_CASES_WITH_DIFF, TEST_CASES_WITHOUT_DIFF } from "./testCases" -import { AutocompleteFileringTestInput, testAutocompleteFiltering } from "./util" - -const filterTestCases = (tests: AutocompleteFileringTestInput[]) => { - if (tests.some((test) => test.options?.only)) { - return tests.filter((test) => test.options?.only) - } - - return tests -} - -describe("Autocomplete filtering tests", () => { - beforeAll(async () => { - tearDownTestDir() - setUpTestDir() - addToTestDir([".continueignore"]) - }) - - afterAll(async () => { - tearDownTestDir() - }) - - describe("Should return unmodified LLM output", () => { - it.each(filterTestCases(TEST_CASES_WITHOUT_DIFF))("$description", async (testCase) => { - await testAutocompleteFiltering(testCase) - }) - }) - - describe("Should return modified LLM output", () => { - it.each(filterTestCases(TEST_CASES_WITH_DIFF))("$description", async (testCase) => { - await testAutocompleteFiltering(testCase) - }) - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/testCases.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/testCases.ts deleted file mode 100644 index 909cb0a2b0..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/testCases.ts +++ /dev/null @@ -1,2175 +0,0 @@ -import { dedent } from "../../../util" - -import { AutocompleteFileringTestInput } from "./util" - -export const TEST_CASES_WITH_DIFF: AutocompleteFileringTestInput[] = [ - { - description: "Should handle python multi-line string", - filename: "test.py", - input: `def create_greeting(name): - greeting = """Hello, """ + name + """! -Welcome to our community. We hope you have a great time here. -If you have any questions, feel free to reach out.""" - return greeting - -message = create_greeting("Alice") -print(message) - -multi_line_message = """<|fim|> -print(multi_line_message) -`, - llmOutput: `This is a multi-line message. -It continues across multiple lines, -which allows for easy reading and formatting. -""" -`, - expectedCompletion: `This is a multi-line message. -It continues across multiple lines, -which allows for easy reading and formatting. -"""`, - }, - { - description: "Should autocomplete Rust match arms", - filename: "main.rs", - input: ` -fn get_status_code_description(code: u16) -> &'static str { - match code { - 200 => "OK", - 404 => "Not Found", - 500 => "Internal Server Error", - <|fim|> - } -} -`, - llmOutput: `403 => "Forbidden", - 401 => "Unauthorized", - _ => "Unknown Status", -`, - expectedCompletion: `403 => "Forbidden", - 401 => "Unauthorized", - _ => "Unknown Status",`, - }, - { - description: "Should complete a Markdown code block", - filename: "test.md", - input: ` -Here is a sample JavaScript function: - -\`\`\`javascript -function sayHello() { - console.log("Hello, <|fim|> -} -\`\`\` -`, - llmOutput: `world!"); -`, - expectedCompletion: 'world!");', - }, - { - description: "Should autocomplete Java when inside a block", - filename: "Main.java", - input: ` -public class Main { - public static void main(String[] args) { - for (int i = 0; i < 10; i++) { - if (i % 2 == 0) { - System.out.println("Even: " + i); - } else { -<|fim|> - } - } - } -}`, - llmOutput: ` - System.out.println("Odd: " + i); -`, - expectedCompletion: ` - System.out.println("Odd: " + i);`, - }, - { - description: "Should autocomplete a Markdown heading and preserve formatting", - filename: "test.md", - input: `# My Document - -## Introduction -This is a sample document for testing. - -## <|fim|> -### Conclusion -Thank you for reading. -`, - llmOutput: `Features -Here is a list of features: -- Feature 1 -- Feature 2 -`, - expectedCompletion: `Features -Here is a list of features: -- Feature 1 -- Feature 2`, - }, - { - // options: { only: true }, - description: "Should autocomplete a Java method within a class", - filename: "Calculator.java", - input: ` -public class Calculator { - private double result; - - public Calculator() { - this.result = 0.0; - } - - public void add(double number) { - result += number; -<|fim|>`, - llmOutput: ` - } - - public void subtract(double number) { - result -= number; - } -`, - expectedCompletion: ` - }`, - }, - { - description: "Should filter out consecutive, repeated YAML keys", - filename: "test.yaml", - input: ` - version: '3' - services: - db: - image: postgres - environment: - POSTGRES_USER: user - POSTGRES_PASSWORD: pass<|fim|> - `, - llmOutput: ` - POSTGRES_DB: mydb - POSTGRES_DB: mydb - `, - expectedCompletion: ` - POSTGRES_DB: mydb`, - }, - { - description: "Should enforce bracket matching in JSON files", - filename: "test.json", - input: `{ - "active": true, - "department": "Product Development", - "location": { - "country": "USA", - "state": "California", - "city": "San BERNARDINO", - "coordinates": { - <|fim|> - } - }, - "employees": [ - { - "name": "John Doe", - "age": 30, - "position": "Developer", - "skills": ["JavaScript", "React", "Node.js"], - "remote": false, - "salary": { - "currency": "USD", - "amount": 95000 - } - }, - { - "name": "Jane Smith", - "age": 25, - "position": "Designer", - "skills": ["Photoshop", "Illustrator"], - "remote": true, - "salary": { - "currency": "USD", - "amount": 70000 - } - }, - { - "name": "Emily Johnson", - "age": 35, - "position": "Manager", - "teamSize": 8, - "remote": true, - "skills": ["Leadership", "Project Management"],`, - llmOutput: `"latitude": 34.10834, - "longitude": -117.28977 - } - }, - "employeeCount": 2, - "averageAge": 30, - "remoteFriendly": true, - "salaryRange": { - "min": 70000, - "max": 95000, - "currency": "USD" - }, - "skills": { - "required": ["JavaScript", "React", "Node.js", "Leadership", "Project Management"], - "optional": ["Photoshop", "Illustrator"]`, - expectedCompletion: `"latitude": 34.10834, - "longitude": -117.28977`, - }, - { - description: "Should return nothing when output is duplicated lines in TypeScript", - filename: "file.ts", - input: ` -async getContextForPath( - filepath: string, - astPath: AstPatt, - language: LanguageName, - options: ContextOptions = {}, -<|fim|> - ): Promise { - const snippets: AutocompleteCodeSnippet[] = []; - let parentKey = filepath; -`, - llmOutput: ` ): Promise { - const snippets: AutocompleteCodeSnippet[] = []; - `, - expectedCompletion: undefined, - }, - { - description: "Should return partial result when output is duplicated lines in TypeScript", - filename: "file.ts", - input: ` -async getContextForPath( - filepath: string, - astPath: AstPatt, - language: LanguageName, - options: ContextOptions = {}, -<|fim|> - ): Promise { - const snippets: AutocompleteCodeSnippet[] = []; - let parentKey = filepath; -`, - llmOutput: `console.log('TEST'); - ): Promise { - const snippets: AutocompleteCodeSnippet[] = []; - `, - expectedCompletion: `console.log('TEST');`, - }, - { - description: "Should autocomplete React effect hook", - input: `import React, { useState, useEffect } from "react"; - -export const Timer = () => { - const [seconds, setSeconds] = useState(0); - - useEffect(() => { - const interval = setInterval(() => { - setSeconds(seconds + 1); - }, 1000); - - <|fim|>; - - return () => clearInterval(interval); - }, [seconds]); - - return ( -
-

{seconds} seconds have passed.

-
- ); -};`, - llmOutput: "return () => clearInterval(interval);", - expectedCompletion: undefined, - filename: "Timer.tsx", - }, - { - description: "Should autocomplete simple return statement in TypeScript", - filename: "file.ts", - input: ` - multiply(number) { - this.result *= number; - return <|fim|> - } - - divide(number) { - if (number === 0) { - throw new Error("Cannot divide by zero"); - } - this.result /= number; - return this; - } -`, - llmOutput: ` this;`, - expectedCompletion: `this;`, - }, - { - description: "Should complete YAML list item and preserve structure", - filename: "test.yaml", - input: ` - services: - - name: web - image: nginx - - name: app<|fim|> - volumes: - - volume1 - - volume2 - `, - llmOutput: ` - image: node - `, - expectedCompletion: ` - image: node`, - }, - { - description: "Should complete YAML key-value pair inside a nested structure", - filename: "test.yaml", - input: ` - version: '3' - services: - db: - image: postgres - environment: - POSTGRES_USER: user - POSTGRES_PASSWORD: pass - POSTGRES_DB: mydb<|fim|> - `, - llmOutput: ` - PGDATA: /var/lib/postgresql/data/pgdata - `, - expectedCompletion: ` - PGDATA: /var/lib/postgresql/data/pgdata`, - }, - { - description: "Should complete YAML block within an existing block", - filename: "test.yaml", - input: ` - pipelines: - branches: - master: - - step: - name: Build and Test - script: - - npm install - - npm run test - - step: - name: Deploy<|fim|> - `, - llmOutput: ` - script: - - npm run deploy - `, - expectedCompletion: ` - script: - - npm run deploy`, - }, - { - description: "Should autocomplete SQL query with subquery and alias in SELECT clause", - filename: "complex_query.sql", - input: `SELECT u.id, - u.name, - (SELECT COUNT(*) FROM orders o WHERE o.user_id = u.id) AS order_count - FROM users u - WHERE u.active = 1 - <|fim|>`, - llmOutput: " AND EXISTS (SELECT 1 FROM transactions t WHERE t.user_id = u.id AND t.amount > 100)", - expectedCompletion: "AND EXISTS (SELECT 1 FROM transactions t WHERE t.user_id = u.id AND t.amount > 100)", - }, -] - -export const TEST_CASES_WITHOUT_DIFF: AutocompleteFileringTestInput[] = [ - { - description: "should pass", - filename: "test.js", - input: "console.log('Hello <|fim|>!');", - llmOutput: "World", - expectedCompletion: "World", - }, - { - description: "Should preserve closing brackets when the opening bracket is not a part of the completion.", - filename: "test.js", - input: dedent` - class Calculator { - constructor() { - this.result = 0; - } - - add(number) { - this.result += number; - return this; - } - - subtract(number) { - this.result -= number; - return this; - } - - multiply(number) { - this.result *= number; - return this; - } - - divide(number) { - <|fim|> - - getResult() { - return this.result; - } - - reset() { - this.result = 0; - return this; - } - } - `, - llmOutput: dedent`if (number === 0) { - throw new Error("Cannot divide by zero"); - } - this.result /= number; - return this; - }`, - expectedCompletion: dedent`if (number === 0) { - throw new Error("Cannot divide by zero"); - } - this.result /= number; - return this; - }`, - }, - { - description: "Should multiline-autocomplete CSS blocks", - input: `body { - font-family: Arial, sans-serif; - font-size: 16px; - color: #333333; -} - -h1 { - font-size: 24px; - font-weight: bold; - color: #000000; -} - -h4<|fim|> - -a { - text-decoration: none; - color: #007bff; -} - -.container { - width: 100%; - max-width: 1200px; - margin: 0 auto; - padding: 20px; -} - -.button { - display: inline-block; - padding: 10px 20px; - background-color: #007bff; - color: #ffffff;`, - llmOutput: ` { - font-size: 18px; - font-weight: bold; - color: #000000; -}`, - expectedCompletion: ` { - font-size: 18px; - font-weight: bold; - color: #000000; -}`, - filename: "test.css", - }, - { - description: "Should complete CSS rules inside a nested selector", - filename: "styles.css", - input: ` -.container { - display: flex; - justify-content: center; - align-items: center; - width: 100%; - height: 100vh; - - .inner { - <|fim|> - } -} -`, - llmOutput: `width: 50%; - height: 50%; - background-color: #f0f0f0;`, - expectedCompletion: `width: 50%; - height: 50%; - background-color: #f0f0f0;`, - }, - - { - description: "Should complete a CSS rule when the property is partially typed", - filename: "styles.css", - input: ` -button { - border: 2px solid #000; - border-radius<|fim|> -}`, - llmOutput: ": 5px;", - expectedCompletion: ": 5px;", - }, - - { - description: "Should handle CSS autocomplete with a single bracket present", - filename: "styles.css", - input: ` -.card { - box-shadow: 0 4px 8px rgba(0,0,0,0.2); - transition: 0.3s; - padding: 16px; - border-bottom-left-radius: <|fim|>px; - border-bottom-right-radius: 8px; -} -`, - llmOutput: "8", - expectedCompletion: "8", - }, - - { - description: "Should autocomplete CSS pseudoclass", - filename: "pseudoClass.css", - input: ` -input:focus { - outline: none; - border: 2px solid <|fim|>; -} -`, - llmOutput: "#4CAF50;", - expectedCompletion: "#4CAF50;", - }, - - { - description: "Should handle CSS variable syntax", - filename: "variables.css", - input: ` -:root { - --primary-color: #3498db; - --padding: 10px; -} - -.section { - background-color: var(<|fim|>); - padding: var(--padding); -} -`, - llmOutput: "--primary-color", - expectedCompletion: "--primary-color", - }, - { - description: "Should complete CSS grid template columns", - filename: "grid.css", - input: ` -.grid-container { - display: grid; - grid-template-columns: repeat(<|fim|>); - grid-gap: 10px; -} -`, - llmOutput: "3, 1fr", - expectedCompletion: "3, 1fr", - }, - - { - description: "Should complete PHP function inside a class with comments", - input: `name = $name; - $this->email = $email; - } - - public function <|fim|> - - public function setEmail($email) { - $this->email = $email; - } -}`, - llmOutput: `getDetails() { - return "Name: " . $this->name . ", Email: " . $this->email; - }`, - expectedCompletion: `getDetails() { - return "Name: " . $this->name . ", Email: " . $this->email; - }`, - filename: "User.php", - }, - - { - description: "Should autocomplete PHP function with inline logic", - input: ` -} - -echo calculateArea(5, 3);`, - llmOutput: "return $length * $width;", - expectedCompletion: "return $length * $width;", - filename: "areaCalculator.php", - }, - - { - description: "Should handle PHP completion in the middle of an array", - input: `); - -echo "First color is: " . $colors[0];`, - llmOutput: '"Blue"', - expectedCompletion: '"Blue"', - filename: "colors.php", - }, - { - description: "Should autocomplete React return statements (jsx)", - input: `import React from "react"; - -export const Button = ({ - onClick, - children, -}: { - children: React.ReactNode; - onClick: () => void; -}) => { - return ( -<|fim|> - ); -};`, - llmOutput: ``, - expectedCompletion: ``, - filename: "Button.tsx", - }, - { - description: "Should autocomplete React state initialization", - input: `import React, { useState } from "react"; - -export const Counter = () => { - const [count, setCount] = useState(<|fim|>); - - return ( -
-

You clicked {count} times

- -
- ); -};`, - llmOutput: "0", - expectedCompletion: "0", - filename: "Counter.tsx", - }, - { - description: "Should autocomplete React component methods", - input: `import React from "react"; - -class Form extends React.Component { - constructor(props) { - super(props); - this.state = { name: '' }; - } - - handleChange = (event) => { - <|fim|> - } - - handleSubmit = (event) => { - event.preventDefault(); - alert('A name was submitted: ' + this.state.name); - } - - render() { - return ( -
- - -
- ); - } -}`, - llmOutput: "this.setState({ name: event.target.value });", - expectedCompletion: "this.setState({ name: event.target.value });", - filename: "Form.tsx", - }, - { - description: "Should autocomplete Python function definition", - filename: "test.py", - input: `def calculate_area(length, width): - area = length * width - return area - -def calculate_perimeter(length, width): - <|fim|> -`, - llmOutput: `perimeter = 2 * (length + width) - return perimeter`, - expectedCompletion: `perimeter = 2 * (length + width) - return perimeter`, - }, - { - description: "Should complete Python class method with self", - filename: "test.py", - input: `class BankAccount: - def __init__(self, owner, balance=0): - self.owner = owner - self.balance = balance - - def deposit(self, amount): - self.balance += amount - return self.balance - - def withdraw(self, amount): - <|fim|> -`, - llmOutput: `if amount > self.balance: - return "Insufficient funds" - self.balance -= amount - return self.balance`, - expectedCompletion: `if amount > self.balance: - return "Insufficient funds" - self.balance -= amount - return self.balance`, - }, - { - description: "Should autocomplete Python list comprehension", - filename: "test.py", - input: `squares = [x**2 for x in range(10)] -even_squares = [x for x in squares if x % 2 == 0] -print(even_squares) - -odd_squares = [<|fim|> -print(odd_squares) -`, - llmOutput: "x for x in squares if x % 2 != 0", - expectedCompletion: "x for x in squares if x % 2 != 0", - }, - { - description: "Should autocomplete a simple Go function declaration", - filename: "simpleFunction.go", - input: `package main - -import ( - "fmt" -) - -func main() { - fmt.Println("Hello, World!") -} - -func calculateArea<|fim|>`, - llmOutput: `(length float64, width float64) float64 { - return length * width -}`, - expectedCompletion: `(length float64, width float64) float64 { - return length * width -}`, - }, - - { - description: "Should handle autocomplete in the middle of a Go struct definition", - filename: "structDefinition.go", - input: `package main - -type Person struct { - FirstName string - LastName string - Age int - Address Address -} - -type Address struct { - Street string - City <|fim|> -} - -func main() {}`, - llmOutput: `string - State string - ZipCode string -}`, - expectedCompletion: `string - State string - ZipCode string`, - }, - - { - description: "Should autocomplete a missing Go function body bracket", - filename: "missingBracket.go", - input: `package main - -func add(a int, b int) int { - return a + b<|fim|> - -func multiply(a int, b int) int { - return a * b -} - -func main() { - result1 := add(2, 3) - result2 := multiply(4, 5) - println(result1, result2) -}`, - llmOutput: ` -}`, - expectedCompletion: ` -}`, - }, - { - description: "Should autocomplete SQL query with nested functions and missing bracket", - filename: "_nested_function.sql", - input: `SELECT name, ROUND(AVG(rating), 2) as avg_rating - FROM movies - WHERE release_year > 2000 AND director = 'Christopher Nolan' - GROUP BY name - HAVING avg_rating > <|fim|>`, - llmOutput: "8.5)", - expectedCompletion: "8.5)", - }, - { - description: "Should autocomplete SQL script with employee and product tables", - filename: "database.sql", - input: ` - CREATE TABLE employees ( - id INT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(100) NOT NULL, - age INT NOT NULL, - position VARCHAR(100) - ); - - CREATE TABLE products ( - id INT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(100), - price DECIMAL(8,2) NOT NULL<|fim|> '0.00', - quantity INT NOT NULL DEFAULT '0' - ); - - INSERT INTO employees (name, age, position) VALUES ('John Doe', 30, 'Developer'); - INSERT INTO products (name, price, quantity) VALUES ('Apple', '1.99', '47'); - - SELECT * FROM products ORDER BY name DESC LIMIT 3; - SELECT * FROM products WHERE price > '0'; - SELECT * FROM products WHERE quantity > '100'; - SELECT * FROM employees WHERE age > 25; - `, - llmOutput: " DEFAULT", - expectedCompletion: " DEFAULT", - }, - { - description: "Should autocomplete multi-line SQL query with CASE statements", - filename: "case_statement.sql", - input: `SELECT order_id, - order_date, - CASE - WHEN status = 'shipped' THEN 'Completed' - WHEN status = 'pending' THEN 'Pending Approval' - <|fim|> - ELSE 'Unknown' - END as order_status - FROM orders`, - llmOutput: "WHEN status = 'cancelled' THEN 'Cancelled'", - expectedCompletion: "WHEN status = 'cancelled' THEN 'Cancelled'", - }, - { - description: "Should autocomplete HTML paragraph content", - input: ` - - Document - - -

<|fim|>

- -`, - llmOutput: "This is a paragraph with some sample text.", - expectedCompletion: "This is a paragraph with some sample text.", - filename: "test.html", - }, - { - description: "Should autocomplete HTML attributes within a tag", - input: `
- > -
-

Title

-

Description text.

-
-
`, - llmOutput: 'alt="Description of image"', - expectedCompletion: 'alt="Description of image"', - filename: "test.html", - }, - { - description: "Should autocomplete HTML nested tags", - input: `
    -
  • Item 1
    • -
  • Item 2
    • -
  • Item 3
    • -
`, - llmOutput: ">Item 4", - expectedCompletion: ">Item 4", - filename: "test.html", - }, - - { - description: "Should complete a class method in Ruby", - input: ` -class Greeter - def initialize(name) - @name = name - end - - def greet - puts "Hello, <|fim|> - end -end - -g = Greeter.new("World") -g.greet -`, - llmOutput: "#{@name}!", - expectedCompletion: "#{@name}!", - filename: "greeter.rb", - }, - { - description: "Should complete Ruby if-else block", - input: ` -number = 10 - -if number > 5 - puts "Number is greater than 5" -<|fim|> -end -`, - llmOutput: `else - puts "Number is 5 or less"`, - expectedCompletion: `else - puts "Number is 5 or less"`, - filename: "conditional.rb", - }, - { - description: "Should complete Ruby array method", - input: ` -numbers = [1, 2, 3, 4, 5] -squared_numbers = numbers.<|fim|> -`, - llmOutput: "map { |n| n ** 2 }", - expectedCompletion: "map { |n| n ** 2 }", - filename: "array_methods.rb", - }, - { - description: "Should autocomplete Java within a string", - filename: "App.java", - input: ` -public class App { - public static void main(String[] args) { - String message = "Hello, <|fim|>"; - System.out.println(message); - } -}`, - llmOutput: "World", - expectedCompletion: "World", - }, - { - description: "Should autocomplete a C++ class definition with a constructor", - filename: "test.cpp", - input: "class Vehicle { public: Vehicle(<|fim|>); };", - llmOutput: "int wheels, double weight", - expectedCompletion: "int wheels, double weight", - }, - { - description: "Should complete a C++ method declaration inside a class", - filename: "test.cpp", - input: "class Calculator { public: int add(int a, int b); int subtract(int a, int b);<|fim|> };", - llmOutput: " int multiply(int a, int b);", - expectedCompletion: " int multiply(int a, int b);", - }, - { - description: "Should autocomplete C++ for loop syntax", - filename: "test.cpp", - input: ` - int sum = 0; - for (int i = 0; i < 10; <|fim|>) { - sum += i; - } - `, - llmOutput: "i++", - expectedCompletion: "i++", - }, - { - description: "Should autocomplete JSON object inside an array", - filename: "data.json", - input: `{ - "users": [ - { "id": 1, "name": "Alice" }, - { "id": 2, "name": "Bob" } - <|fim|> - ] -}`, - llmOutput: ', { "id": 3, "name": "Charlie" }', - expectedCompletion: ', { "id": 3, "name": "Charlie" }', - }, - { - description: "Should autocomplete within a CSV record", - filename: "test.csv", - input: `Name, Age, City -John Doe, 30, New York -Jane Smith<|fim|>`, - llmOutput: ", 25, Los Angeles", - expectedCompletion: ", 25, Los Angeles", - }, - { - description: "Should complete CSV record when starting in the middle of a word", - filename: "test.csv", - input: `Product, Price, Quantity -Laptop, 1200, 5 -Smart<|fim|>`, - llmOutput: "phone, 800, 10", - expectedCompletion: "phone, 800, 10", - }, - { - description: "Should complete CSV structure adding closing brackets", - filename: "test.csv", - input: `ID, Name, JoiningDate -1, Alice, 2023-01-10 -2, B<|fim|>`, - llmOutput: "ob, 2023-02-10", - expectedCompletion: "ob, 2023-02-10", - }, - { - description: "Should autocomplete a Rust function implementation inside a struct", - filename: "main.rs", - input: ` -struct Calculator { - result: f64, -} - -impl Calculator { - fn new() -> Self { - Calculator { result: 0.0 } - } - - fn add(&mut self, number: f64) { - self.result += number; - } - - fn subtract(&mut self, number: f64) { - self.result -= number; - } - - fn multiply(&mut self, number: f64) { - self.result *= number; - } - - fn divide(&mut self, number: f64) { - if number != 0.0 { - self.result /= number; - } else { - println!("Cannot divide by zero."); - } - } - - fn reset(&mut self) { - self.result = 0.0; - } - - fn get_result(&self) -> f64 { - self.result - } - - fn<|fim|> -} -`, - llmOutput: ` divide(&mut self, number: f64) { - if number != 0.0 { - self.result /= number; - } else { - println!("Cannot divide by zero."); - } -}`, - expectedCompletion: ` divide(&mut self, number: f64) { - if number != 0.0 { - self.result /= number; - } else { - println!("Cannot divide by zero."); - }`, - }, - { - description: "Should autocomplete Rust struct definition", - filename: "main.rs", - input: ` -struct User { - id: u32, - username: String, - email: String, - is_active: bool, - <|fim|> -} - -impl User { - fn new(id: u32, username: String, email: String) -> Self { - User { - id, - username, - email, - is_active: true, - } - } -} -`, - llmOutput: `created_at: String, - updated_at: String,`, - expectedCompletion: `created_at: String, - updated_at: String,`, - }, - { - description: "Haskell: Nested pattern matching with let bindings", - filename: "NestedPattern.hs", - input: `module NestedPattern where - -data Tree a = Leaf a | Node (Tree a) (Tree a) - -sumTree :: Num a => Tree a -> a -sumTree (Leaf x) = x -sumTree (Node left right) = - let leftSum = <|fim|> - rightSum = sumTree right - in leftSum + rightSum`, - llmOutput: "sumTree left", - expectedCompletion: "sumTree left", - }, - { - description: "Haskell: Complex function with where clause and guards", - filename: "QuadraticSolver.hs", - input: `module QuadraticSolver where - -solveQuadratic :: (Ord a, Floating a) => a -> a -> a -> Maybe (a, a) -solveQuadratic a b c - | discriminant < 0 = Nothing - | otherwise = Just (x1, x2) - where - discriminant = b^2 - 4*a*c - sqrtD = sqrt discriminant - x1 = (-b + sqrtD) / (2*a) - <|fim|> = (-b - sqrtD) / (2*a)`, - llmOutput: "x2", - expectedCompletion: "x2", - }, - { - description: "Haskell: List comprehension with complex filter", - filename: "PrimeNumbers.hs", - input: `module PrimeNumbers where - -primesUpTo :: Int -> [Int] -primesUpTo n = [x | x <- [2..n], isPrime x] - where isPrime num = <|fim|> && all (\\d -> num \`mod\` d /= 0) [2..(floor . sqrt $ fromIntegral num)]`, - llmOutput: "num > 1", - expectedCompletion: "num > 1", - }, - { - description: "Should autocomplete Dart class methods", - filename: "calculator.dart", - input: ` -class Calculator { - double result = 0.0; - - void add(double number) { - result += number; - } - - void multiply(double number) { - result *= number; - } - - <|fim|> - - double getResult() { - return result; - } -}`, - llmOutput: `void subtract(double number) { - result -= number; - }`, - expectedCompletion: `void subtract(double number) { - result -= number; - }`, - }, - { - description: "Should handle string interpolation in Dart", - filename: "greetings.dart", - input: ` -void main() { - var name = "World"; - print('Hello, <|fim|>!'); -}`, - llmOutput: "${name}", - expectedCompletion: "${name}", - }, - { - description: "Should autocomplete within a Dart function body", - filename: "counter.dart", - input: ` -class Counter { - int count = 0; - - void increment() { - count++; - } - - void decrement() { - <|fim|> - - void reset() { - count = 0; - } -}`, - llmOutput: "count--;", - expectedCompletion: "count--;", - }, - { - description: "Should autocomplete Clojure function definition with missing closing parenthesis", - input: `(defn calculate-sum [a b] - (let [sum (+ a b)] - (println "The sum is" sum) - sum<|fim|>`, - llmOutput: "))", - expectedCompletion: "))", - filename: "test.clj", - }, - { - description: "Should autocomplete missing part of a Clojure map within a function", - input: `(defn get-user [] - {:username "johndoe" - :email "johndoe@example.com" - :age 30 - <|fim|> - (println "User information loaded"))`, - llmOutput: ':location "Unknown"}', - expectedCompletion: ':location "Unknown"}', - filename: "test.clj", - }, - { - description: "Should autocomplete inside a Clojure vector within a looping construct", - input: `(defn odd-numbers [] - (loop [nums [1 3 5<|fim|> 9 11]] - (when (seq nums) - (println (first nums)) - (recur (rest nums)))))`, - llmOutput: " 7,", - expectedCompletion: " 7,", - filename: "test.clj", - }, - { - description: "Should autocomplete R function definition", - filename: "calculate.R", - input: ` -calculate_mean <- function(numbers) { - total <- sum(numbers) - <|fim|> -}`, - llmOutput: `mean_value <- total / length(numbers) - return(mean_value)`, - expectedCompletion: `mean_value <- total / length(numbers) - return(mean_value)`, - }, - { - description: "Should complete R loop and print statement", - filename: "loopPrint.R", - input: ` -numbers <- c(1, 2, 3, 4, 5) -for (number in numbers) { - print(<|fim|>) -}`, - llmOutput: "number)", - expectedCompletion: "number)", - }, - { - description: "Should autocomplete R data frame creation", - filename: "dataFrame.R", - input: ` -data <- data.frame( - Name = c("Alice", "Bob", "Charlie"), - Age = c(25, 30, 35), - <|fim|> -)`, - llmOutput: "Height = c(165, 180, 175)", - expectedCompletion: "Height = c(165, 180, 175)", - }, - { - description: "Should autocomplete R if-else statement", - filename: "condition.R", - input: ` -grade <- 85 -if (grade >= 90) { - print("A") -} else if (grade >= 80) { - <|fim|> -} else { - print("C") -}`, - llmOutput: 'print("B")', - expectedCompletion: 'print("B")', - }, - { - description: "Should autocomplete R ggplot2 plot structure", - filename: "plot.R", - input: ` -library(ggplot2) - -ggplot(data=mtcars, aes(x=wt, y=mpg)) + - geom_point() + - <|fim|>`, - llmOutput: "geom_smooth(method='lm', se=FALSE)", - expectedCompletion: "geom_smooth(method='lm', se=FALSE)", - }, - { - description: "Should autocomplete Scala class with a method", - filename: "Person.scala", - input: `class Person(val name: String, val age: Int) { - def greet(): String = { - <|fim|> - } - }`, - llmOutput: 's"Hello, my name is $name and I am $age years old."', - expectedCompletion: 's"Hello, my name is $name and I am $age years old."', - }, - - { - description: "Should handle Scala case class with a missing field", - filename: "Person.scala", - input: `case class Address(city: String, postalCode: String) - case class Person(name: String, age: Int, address: Address) - - val alice = Person("Alice", 30, Address("Wonderland", <|fim|>))`, - llmOutput: '"12345")', - expectedCompletion: '"12345")', - }, - - { - description: "Should autocomplete Scala function with missing body bracket", - filename: "Math.scala", - input: `object MathUtils { - def add(a: Int, b: Int): Int = { - a + b<|fim|> - - def multiply(a: Int, b: Int): Int = { - a * b - } - } - - object Main extends App { - println(MathUtils.add(3, 5)) - println(MathUtils.multiply(4, 6)) - }`, - llmOutput: ` - }`, - expectedCompletion: ` - }`, - }, - { - description: "Should autocomplete C function definition", - filename: "math_utils.c", - input: `#include - -int add(int a, int b) { - return a + b; -} - -int multiply(int a, int b) { - return a * b; -} - -int subtract(int a, int b) { - <|fim|> -} - -int main() { - printf("Result: %d", add(2, 3)); - return 0; -}`, - llmOutput: "return a - b;", - expectedCompletion: "return a - b;", - }, - - { - description: "Should handle C struct with missing field initialization", - filename: "person.c", - input: `#include - -typedef struct { - char name[50]; - int age; - float height; -} Person; - -int main() { - Person alice = {"Alice", 30, <|fim|>}; - printf("Name: %s, Age: %d, Height: %.2f", alice.name, alice.age, alice.height); - return 0; -}`, - llmOutput: "5.5", - expectedCompletion: "5.5", - }, - - { - description: "Should autocomplete C function with missing body bracket", - filename: "area.c", - input: `#include - -double calculateCircleArea(double radius) { - const double pi = 3.14159; - return pi * radius * radius;<|fim|> - -double calculateRectangleArea(double length, double width) { - return length * width; -} - -int main() { - printf("Circle Area: %.2f", calculateCircleArea(5.0)); - printf("Rectangle Area: %.2f", calculateRectangleArea(4.0, 6.0)); - return 0; -}`, - llmOutput: ` -}`, - expectedCompletion: ` -}`, - }, - { - description: "Should autocomplete a simple Kotlin function declaration", - filename: "simpleFunction.kt", - input: ` -fun main() { - println("Hello, World!") -} - -fun calculateArea(length: Double, width: Double): Double <|fim|>`, - llmOutput: `{ - return length * width -}`, - expectedCompletion: `{ - return length * width -}`, - }, - { - description: "Should handle autocomplete inside a Kotlin data class", - filename: "dataClass.kt", - input: ` -data class User( - val id: Int, - val name: String, - val email: String, - <|fim|> -)`, - llmOutput: "val age: Int", - expectedCompletion: "val age: Int", - }, - { - description: "Should complete Kotlin if-else structure with missing brackets", - filename: "controlStructure.kt", - input: ` -fun getMax(a: Int, b: Int): Int { - if (a > b<|fim|> - } else { - return b - } -}`, - llmOutput: `) { - return a`, - expectedCompletion: `) { - return a`, - }, - { - description: "Should autocomplete Solidity function definition", - filename: "SimpleStorage.sol", - input: ` -pragma solidity ^0.8.0; - -contract SimpleStorage { - uint private data; - - function set(uint x) public { - data = x; - } - - function get() public view returns (uint) { - <|fim|> - } -} - `, - llmOutput: "return data;", - expectedCompletion: "return data;", - }, - - { - description: "Should autocomplete Solidity event with parameters", - filename: "EventExample.sol", - input: ` -pragma solidity ^0.8.0; - -contract EventExample { - event DataStored(uint indexed id, string content); - - function storeData(uint id, string memory content) public { - emit DataStored(<|fim|>); - } -} - `, - llmOutput: "id, content", - expectedCompletion: "id, content", - }, - - { - description: "Should handle Solidity struct definition completion", - filename: "StructDefinition.sol", - input: ` -pragma solidity ^0.8.0; - -contract StructExample { - struct Person { - string name; - uint age; - address wallet; - } - - Person[] private people; - - function addPerson(string memory name, uint age, address wallet) public { - people.push(Person(name, age, wallet)); - } - - function getFirstPerson<|fim|> -} - `, - llmOutput: `() public view returns (string memory, uint, address) { - if (people.length > 0) { - Person storage person = people[0]; - return (person.name, person.age, person.wallet); - } - return ("", 0, address(0)); - }`, - expectedCompletion: `() public view returns (string memory, uint, address) { - if (people.length > 0) { - Person storage person = people[0]; - return (person.name, person.age, person.wallet); - } - return ("", 0, address(0)); - }`, - }, - { - description: "Should autocomplete TypeScript interface properties", - filename: "User.ts", - input: ` -interface User { - id: number; - name: string; - e<|fim|> -} -`, - llmOutput: `mail: string; - age: number; -}`, - expectedCompletion: `mail: string; - age: number;`, - }, - { - description: "Should autocomplete TypeScript interface declarations", - filename: "autocomplete.ts", - input: `interface AutocompleteDiffSnippet extends BaseAutocompleteSnippet {} - -interface AutocompleteCodeSnippet`, - llmOutput: ` extends BaseAutocompleteSnippet { - filepath: string; -}`, - expectedCompletion: ` extends BaseAutocompleteSnippet { - filepath: string; -}`, - }, - { - description: "Should autocomplete a TypeScript arrow function inside a variable assignment", - filename: "mathOperations.ts", - input: ` -const addNumbers = (a: number, b: number): number => { - return a + b; -}; - -const multiplyNumbers = (a: number, b: number): number => { - re<|fim|> -} - -console.log(multiplyNumbers(2, 3)); -`, - llmOutput: "turn a * b;", - expectedCompletion: "turn a * b;", - }, - - // TODO - // { - // description: - // "Should handle autocomplete inside a nested TypeScript class method", - // filename: "Account.ts", - // input: ` - // class Account { - // private balance: number = 0; - - // deposit(amount: number) { - // this.balance += amount; - // return this.balance; - // } - - // withdraw(amount: number) { - // if (amount > this.balance) { - // throw new Error("Insufficient funds"); - // } - // this.balance -= amount; - // return thi<|fim|> - // } - // } - // `, - // llmOutput: `s.balance;`, - // expectedCompletion: `s.balance;`, - // }, - - // TODO - // { - // description: "Should autocomplete a TypeScript generic function", - // filename: "GenericFunction.ts", - // input: ` - // function identity(arg: T): T { - // return ar<|fim|> - // } - - // console.log(identity(5)); - // `, - // llmOutput: `g;`, - // expectedCompletion: `g;`, - // }, - - // TODO - // { - // description: - // "Should autocomplete a TypeScript promise within an asynchronous function", - // filename: "asyncFunction.ts", - // input: ` - // async function fetchData(url: string): Promise { - // const response = await fetch(url); - // <|fim|> - // return data; - // } - - // fetchData('https://api.example.com/data'); - // `, - // llmOutput: `const data = await response.json();`, - // expectedCompletion: `const data = await response.json();`, - // }, - - { - description: "Should autocomplete a C# class with a constructor and property", - filename: "Person.cs", - input: `using System; - -public class Person -{ - public string Name { get; set; } - public int Age { get; set; } - - public Person(string name, int <|fim|> -}`, - llmOutput: `age) - { - Name = name; - Age = age; - }`, - expectedCompletion: `age) - { - Name = name; - Age = age; - }`, - }, - { - description: "Should autocomplete a C# interface method", - filename: "IGreetable.cs", - input: `public interface IGreetable -{ - void <|fim|> -}`, - llmOutput: "Greet();", - expectedCompletion: "Greet();", - }, - { - description: "Should autocomplete inside C# method with if condition", - filename: "Calculator.cs", - input: `using System; - -public class Calculator -{ - public int Add(int a, int b) - { - if(<|fim|>) - { - return a + b; - } - return 0; - } -}`, - llmOutput: "a > 0 && b > 0", - expectedCompletion: "a > 0 && b > 0", - }, - { - description: "Should complete a simple Julia function", - filename: "simpleFunction.jl", - input: `function calculate_area(length, width) - <|fim|> -end -`, - llmOutput: "return length * width", - expectedCompletion: "return length * width", - }, - { - description: "Should autocomplete Julia for loop", - filename: "loop.jl", - input: `numbers = [1, 2, 3, 4, 5] -squared_numbers = [] - -for num in numbers - <|fim|> -end - -println(squared_numbers) -`, - llmOutput: "push!(squared_numbers, num^2)", - expectedCompletion: "push!(squared_numbers, num^2)", - }, - { - description: "Should complete a Julia struct definition", - filename: "structDefinition.jl", - input: `struct Person - first_name::String - last_name::String - age::Int - address::Address -end - -struct Address - street::String - city::String - <|fim|> -end -`, - llmOutput: `state::String - zip_code::String`, - expectedCompletion: `state::String - zip_code::String`, - }, - { - description: "Should complete a Julia dictionary access", - filename: "dictionary.jl", - input: `grades = Dict("Alice" => 90, "Bob" => 85, "Eve" => 88) - -function get_grade(student_name) - return grades[<|fim|>] -end - -println(get_grade("Alice")) # Should print 90 -`, - llmOutput: "student_name", - expectedCompletion: "student_name", - }, - { - description: "Should complete a Julia module declaration", - filename: "moduleDeclaration.jl", - input: `module MathOperations - -export add, subtract - -function add(a, b) - return a + b -end - -function subtract(a, b) - return a - b -end - -<|fim|> -`, - llmOutput: "end", - expectedCompletion: "end", - }, - { - description: "Should complete F# let-binding with function definition", - filename: "mathModule.fs", - input: `module MathModule - -let calculateArea length width = - <|fim|>`, - llmOutput: "length * width", - expectedCompletion: "length * width", - }, - - { - description: "Should complete incomplete F# type definition", - filename: "personType.fs", - input: `type Person = { - FirstName: string - LastName: string - Age: int<|fim|> -} - -let john = { FirstName = "John"; LastName = "Doe"; Age = 30 }`, - llmOutput: ` - Address: string -}`, - expectedCompletion: ` - Address: string`, - }, - - { - description: "Should complete F# pattern matching expression", - filename: "patternMatching.fs", - input: `let describeNumber number = - match number with - | 0 -> "Zero" - | 1 -> "One" - | <|fim|>`, - llmOutput: `2 -> "Two" - | _ -> "Other"`, - expectedCompletion: `2 -> "Two" - | _ -> "Other"`, - }, - - { - description: "Should complete F# list comprehension expression", - filename: "listComprehension.fs", - input: `let squares = [ for x in 1..10 -> x * x ] -let evenSquares = [ for x in squares do if x % 2 = 0 then yield x ] -let oddSquares = [<|fim|>]`, - llmOutput: " for x in squares do if x % 2 <> 0 then yield x ]", - expectedCompletion: " for x in squares do if x % 2 <> 0 then yield x ]", - }, - { - description: "Should complete an F# recursive function", - filename: "recursiveFunctions.fs", - input: `let rec factorial n = - if n <= 1 then 1 - else n <|fim|> factorial (n - 1)`, - llmOutput: "*", - expectedCompletion: "*", - }, - { - description: "Should complete F# member method inside a class type", - filename: "bankAccount.fs", - input: `type BankAccount(owner: string, initialBalance: float) = - let mutable balance = initialBalance - - member this.Deposit amount = - balance <- balance + amount - this - <|fim|>`, - llmOutput: ` - member this.Withdraw amount = - if amount > balance then - failwith "Insufficient funds" - balance <- balance - amount - this`, - expectedCompletion: ` - member this.Withdraw amount = - if amount > balance then - failwith "Insufficient funds" - balance <- balance - amount - this`, - }, - - { - description: "Should complete F# async workflow function", - filename: "asyncWorkflow.fs", - input: `let fetchDataAsync url = - async { - use client = new System.Net.Http.HttpClient() - <|fim|> - }`, - llmOutput: `let! response = client.GetStringAsync(url) - return response`, - expectedCompletion: `let! response = client.GetStringAsync(url) - return response`, - }, - { - description: "Should autocomplete SCSS nested class starting inside a rule", - filename: "styles.scss", - input: `nav { - display: flex; - justify-content: space-between; - .logo { - font-size: 1.5rem; - color: #333; - - .brand<|fim|> - } - - ul { - list-style: none; - display: flex; - gap: 1rem; - } -}`, - llmOutput: `-name { - font-weight: bold; - text-transform: uppercase; -}`, - expectedCompletion: `-name { - font-weight: bold; - text-transform: uppercase; -}`, - }, - - { - description: "Should handle SCSS mixin within a class", - filename: "styles.scss", - input: `.card { - border: 1px solid #ccc; - padding: 10px; - - @include<|fim|> - - &:hover { - box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); - } -}`, - llmOutput: " transition(all 0.3s ease);", - expectedCompletion: " transition(all 0.3s ease);", - }, - - { - description: "Should autocomplete SCSS variable in the middle of a statement", - filename: "styles.scss", - input: `$primary-color: #007bff; -$secondary-color: #6c757d; - -.button { - background-color: <|fim|> color; - padding: 10px 15px; - border: none; - color: #fff; - border-radius: 4px; -}`, - llmOutput: "$primary-", - expectedCompletion: "$primary-", - }, - { - description: "Should autocomplete Vue component method", - filename: "MyComponent.vue", - input: ` - - -`, - llmOutput: `() { - this.count = 0; - }`, - expectedCompletion: `() { - this.count = 0; - }`, - }, - { - description: "Should autocomplete Vue computed property", - filename: "UserComponent.vue", - input: ` - - -`, - llmOutput: `() { - return this.firstName + ' ' + this.lastName; - }`, - expectedCompletion: `() { - return this.firstName + ' ' + this.lastName; - }`, - }, - { - description: "Should autocomplete Vue method using props", - filename: "TodoItem.vue", - input: ` - - -`, - llmOutput: "this.completed", - expectedCompletion: "this.completed", - }, - { - description: "Should autocomplete Svelte reactive statement", - filename: "Counter.svelte", - input: ` - - - -`, - llmOutput: "doubledCount = count * 2", - expectedCompletion: "doubledCount = count * 2", - }, - - { - description: "Should autocomplete Svelte component inside HTML", - filename: "NestedComponent.svelte", - input: ` - - -
-

Hello Svelte

- /> -
-`, - llmOutput: 'name="World"', - expectedCompletion: 'name="World"', - }, - - { - description: "Should handle autocomplete in Svelte each block", - filename: "List.svelte", - input: ` - - -
    - {#each items as item} -
  • {item}
    • - {/each<|fim|> -
-`, - llmOutput: "}", - expectedCompletion: "}", - }, - { - description: "Should handle autocomplete in two similar TypeScript functions", - filename: "List.svelte", - input: ` -import { createClient, RedisClientType } from "redis"; -import { IKeyValueStore } from "./index.js"; - -export class RedisKeyValueStore implements IKeyValueStore { - private client: RedisClientType; - - constructor(redisUrl: string) { - this.client = createClient({ - url: redisUrl - .replace("https://", "redis://") - .replace("http://", "redis://"), - }); - this.client.on("connect", () => console.log("Redis Connected")); - this.client.on("error", (err) => console.log("Redis Client Error", err)); - this.client.connect(); - } - public async has(tableName: string, key: string): Promise { - return (await this.client.exists(this._getKey(tableName, key))) > 0; - } - - public async keys(tableName: string): Promise { - const keys = await this.client.keys(this._getTableKey(tableName)); - return keys.map((key) => key.split("::")[1]); - } - - public async put( - tableName: string, - key: string, - value: string, - ): Promise { - await this.client.set(this._getKey(tableName, key), value); - } - - public async get( - tableName: string, - key: string, - ): Promise { - const value = await this.client.get(this._getKey(tableName, key)); - return value ?? undefined; - } - - public async deleteAll(tableName: string): Promise { - await this.client.del(this._getTableKey(tableName)); - } - -<|fim|> - - - public async remove(tableName: string, key: string): Promise { - const result = await this.client.del(this._getKey(tableName, key)); - return result > 0; - } -} -`, - llmOutput: ` public async delete(tableName: string, key: string): Promise { - await this.client.del(this._getKey(tableName, key)); - }`, - expectedCompletion: ` public async delete(tableName: string, key: string): Promise { - await this.client.del(this._getKey(tableName, key)); - }`, - }, -] diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/util.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/util.ts deleted file mode 100644 index e07a53cd12..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/filtering/test/util.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { expect } from "vitest" -import { MockLLM } from "../../../llm/llms/Mock" -import { testMinimalConfigProvider, testIde } from "../../../test/fixtures" -import { joinPathsToUri } from "../../../util/uri" -import { CompletionProvider } from "../../CompletionProvider" -import { AutocompleteInput } from "../../util/types" - -const FIM_DELIMITER = "<|fim|>" - -function parseFimExample(text: string): { prefix: string; suffix: string } { - const [prefix, suffix] = text.split(FIM_DELIMITER) - return { prefix, suffix } -} - -export interface AutocompleteFileringTestInput { - description: string - filename: string - input: string - llmOutput: string - expectedCompletion: string | null | undefined - options?: { - only?: boolean - } -} - -export async function testAutocompleteFiltering(test: AutocompleteFileringTestInput) { - // Normalize line endings to LF for cross-platform compatibility (Windows Git may check out CRLF) - const normalizedInput = test.input.replace(/\r\n/g, "\n") - const normalizedLlmOutput = test.llmOutput.replace(/\r\n/g, "\n") - - const { prefix } = parseFimExample(normalizedInput) - - // Setup necessary objects - const llm = new MockLLM({ - model: "mock", - }) - llm.completion = normalizedLlmOutput - const ide = testIde - const configHandler = testMinimalConfigProvider - - // Create a real file - const [workspaceDir] = await ide.getWorkspaceDirs() - const fileUri = joinPathsToUri(workspaceDir, test.filename) - await ide.writeFile(fileUri, normalizedInput.replace(FIM_DELIMITER, "")) - - // Prepare completion input and provider - const completionProvider = new CompletionProvider( - configHandler, - ide, - async () => llm, - () => {}, - async () => [], - ) - - const line = prefix.split("\n").length - 1 - const character = prefix.split("\n")[line].length - const autocompleteInput: AutocompleteInput = { - isUntitledFile: false, - completionId: "test-completion-id", - filepath: fileUri, - pos: { - line, - character, - }, - recentlyEditedRanges: [], - recentlyVisitedRanges: [], - } - - // Generate a completion - const result = await completionProvider.provideInlineCompletionItems( - autocompleteInput, - undefined, - true, // force=true to skip debounce in tests - ) - - // Ensure that we return the text that is wanted to be displayed - // Normalize line endings for cross-platform compatibility - const normalizeLineEndings = (str: string | null | undefined) => str?.replace(/\r\n/g, "\n") - - expect(normalizeLineEndings(result?.completion)).toEqual(normalizeLineEndings(test.expectedCompletion)) -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/CompletionStreamer.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/CompletionStreamer.ts deleted file mode 100644 index 6ceedf7f29..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/CompletionStreamer.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { CompletionOptions, ILLM } from "../.." -import { StreamTransformPipeline } from "../filtering/streamTransforms/StreamTransformPipeline" -import { HelperVars } from "../util/HelperVars" - -import { GeneratorReuseManager } from "./GeneratorReuseManager" -import { stopAfterMaxProcessingTime } from "./utils" - -export class CompletionStreamer { - private streamTransformPipeline = new StreamTransformPipeline() - private generatorReuseManager: GeneratorReuseManager - - constructor(onError: (err: unknown) => void) { - this.generatorReuseManager = new GeneratorReuseManager(onError) - } - - async *streamCompletionWithFilters( - token: AbortSignal, - llm: ILLM, - prefix: string, - suffix: string, - prompt: string, - multiline: boolean, - completionOptions: Partial | undefined, - helper: HelperVars, - ) { - // Full stop means to stop the LLM's generation, instead of just truncating the displayed completion - const fullStop = () => this.generatorReuseManager.currentGenerator?.cancel() - - // Try to reuse pending requests if what the user typed matches start of completion - const generator = this.generatorReuseManager.getGenerator( - prefix, - (abortSignal: AbortSignal) => { - const generator = llm.supportsFim() - ? llm.streamFim(prefix, suffix, abortSignal, completionOptions) - : llm.streamComplete(prompt, abortSignal, { - ...completionOptions, - raw: true, - }) - - /** - * This transformer applies even on reused generator. We are deliberately - * not using streamTransformPipeline because we want to capture and stop - * the request even if the generator is being reused. - */ - return helper.options.transform - ? stopAfterMaxProcessingTime(generator, helper.options.modelTimeout * 2.5, fullStop) - : generator - }, - multiline, - ) - - // LLM - const generatorWithCancellation = async function* () { - for await (const update of generator) { - if (token.aborted) { - return - } - yield update - } - } - - const initialGenerator = generatorWithCancellation() - const transformedGenerator = helper.options.transform - ? this.streamTransformPipeline.transform( - initialGenerator, - prefix, - suffix, - multiline, - completionOptions?.stop || [], - fullStop, - helper, - ) - : initialGenerator - - for await (const update of transformedGenerator) { - yield update - } - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/GeneratorReuseManager.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/GeneratorReuseManager.test.ts deleted file mode 100644 index a30399957d..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/GeneratorReuseManager.test.ts +++ /dev/null @@ -1,208 +0,0 @@ -import { afterEach, beforeEach, describe, expect, Mock, test, vi } from "vitest" -import { GeneratorReuseManager } from "./GeneratorReuseManager" - -function createMockGenerator(data: string[], delay: number = 0): (abortSignal: AbortSignal) => AsyncGenerator { - const mockGenerator = async function* () { - for (const chunk of data) { - yield chunk - - if (delay > 0) { - await new Promise((resolve) => setTimeout(resolve, delay)) - } - } - } - const newGenerator = vi.fn<() => AsyncGenerator>().mockReturnValue(mockGenerator()) - - return newGenerator -} - -describe("GeneratorReuseManager", () => { - let reuseManager: GeneratorReuseManager - let onErrorMock: Mock - - beforeEach(() => { - onErrorMock = vi.fn() - reuseManager = new GeneratorReuseManager(onErrorMock) - }) - - afterEach(() => { - vi.clearAllMocks() - }) - - test("creates new generator when there is no current generator", async () => { - const data = ["hello ", "world"] - const newGenerator = createMockGenerator(data) - - const prefix = "" - - const generator = reuseManager.getGenerator(prefix, newGenerator, true) - - const output: string[] = [] - for await (const chunk of generator) { - output.push(chunk) - } - - expect(output).toEqual(data) - expect(newGenerator).toHaveBeenCalledTimes(1) - }) - - test("reuses generator when prefix matches pending completion", async () => { - const newGenerator = createMockGenerator(["llo ", "world"]) - - // First call with initial prefix - const prefix1 = "he" - const generator1 = reuseManager.getGenerator(prefix1, newGenerator, true) - - const output1: string[] = [] - for await (const chunk of generator1) { - output1.push(chunk) - } - - expect(output1).toEqual(["llo ", "world"]) - - // Second call with extended prefix that matches pending completion - const prefix2 = "hello " - const generator2 = reuseManager.getGenerator(prefix2, newGenerator, true) - - const output2: string[] = [] - for await (const chunk of generator2) { - output2.push(chunk) - } - - expect(output2).toEqual(["world"]) - - // Ensure generator was reused (newGenerator should be called only once) - expect(newGenerator).toHaveBeenCalledTimes(1) - }) - - test("creates new generator when prefix does not match pending completion", async () => { - const data = ["goodbye ", "world"] - const newGenerator = createMockGenerator(data) - - // Initial generator with different prefix - reuseManager.pendingGeneratorPrefix = "hello " - reuseManager.pendingCompletion = "world" - - const prefix = "good" - const generator = reuseManager.getGenerator(prefix, newGenerator, true) - - const output: string[] = [] - for await (const chunk of generator) { - output.push(chunk) - } - - expect(output).toEqual(data) - // Ensure a new generator was created - expect(newGenerator).toHaveBeenCalledTimes(1) - }) - - test("handles multiline=false by stopping at newline", async () => { - const data = ["first line\n", "second line"] - const newGenerator = createMockGenerator(data) - - const prefix = "" - const generator = reuseManager.getGenerator(prefix, newGenerator, false) - - const output: string[] = [] - for await (const chunk of generator) { - output.push(chunk) - } - - expect(output).toEqual(["first line"]) - // Ensure it stops after the first newline - }) - - test("handles multiline=true by not stopping at newline", async () => { - const data = ["first line\n", "second line"] - const newGenerator = createMockGenerator(data) - - const prefix = "" - const generator = reuseManager.getGenerator(prefix, newGenerator, true) - - const output: string[] = [] - for await (const chunk of generator) { - output.push(chunk) - } - - expect(output).toEqual(data) - }) - - test("cancels previous generator when creating a new one", async () => { - const data1 = ["data from generator 1", "not generated"] - const data2 = ["data from generator 2"] - - const newGenerator1 = createMockGenerator(data1, 1000) // Delay so we have the chance to cancel it - const newGenerator2 = createMockGenerator(data2) - - const prefix1 = "prefix1" - const prefix2 = "prefix2" - - // First generator - const generator1 = reuseManager.getGenerator(prefix1, newGenerator1, true) - const output1: string[] = [] - for await (const chunk of generator1) { - output1.push(chunk) - // Simulate the generator being canceled before completing - reuseManager.currentGenerator?.cancel() - } - - expect(output1.length).toEqual(1) - expect(output1[0]).toEqual(data1[0]) - - // Second generator - const generator2 = reuseManager.getGenerator(prefix2, newGenerator2, true) - const output2: string[] = [] - for await (const chunk of generator2) { - output2.push(chunk) - } - - expect(output2).toEqual(data2) - }) - - test("calls onError when generator throws an error", async () => { - const error = new Error("Generator error") - const mockGenerator = async function* () { - throw error - } - const newGenerator = vi.fn<() => AsyncGenerator>().mockReturnValue(mockGenerator()) - - const prefix = "" - const generator = reuseManager.getGenerator(prefix, newGenerator, true) - - const output: string[] = [] - await expect(async () => { - for await (const chunk of generator) { - output.push(chunk) - } - }).not.toThrow() // getGenerator handles errors internally - - expect(onErrorMock).toHaveBeenCalledWith(error) - expect(output).toEqual([]) - }) - - test("handles backspacing by creating new generator when prefix is shorter", async () => { - const data = ["hello world"] - const newGenerator1 = createMockGenerator(data) - const newGenerator2 = createMockGenerator(data) - - // First prefix - const prefix1 = "hello world" - const generator1 = reuseManager.getGenerator(prefix1, newGenerator1, true) - const output1: string[] = [] - for await (const chunk of generator1) { - output1.push(chunk) - } - - // Simulate backspace (prefix is shorter) - const prefix2 = "hello worl" - const generator2 = reuseManager.getGenerator(prefix2, newGenerator2, true) - const output2: string[] = [] - for await (const chunk of generator2) { - output2.push(chunk) - } - - // Ensure a new generator was created - expect(newGenerator1).toHaveBeenCalledTimes(1) - expect(newGenerator2).toHaveBeenCalledTimes(1) - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/GeneratorReuseManager.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/GeneratorReuseManager.ts deleted file mode 100644 index 37d29f6e0c..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/GeneratorReuseManager.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { ListenableGenerator } from "./ListenableGenerator" - -export class GeneratorReuseManager { - currentGenerator: ListenableGenerator | undefined - pendingGeneratorPrefix: string | undefined - pendingCompletion = "" - - constructor(private readonly onError: (err: unknown) => void) {} - - private _createListenableGenerator(abortController: AbortController, gen: AsyncGenerator, prefix: string) { - this.currentGenerator?.cancel() - - const listenableGen = new ListenableGenerator(gen, this.onError, abortController) - listenableGen.listen((chunk) => (this.pendingCompletion += chunk ?? "")) - - this.pendingGeneratorPrefix = prefix - this.pendingCompletion = "" - this.currentGenerator = listenableGen - } - - private shouldReuseExistingGenerator(prefix: string): boolean { - return ( - !!this.currentGenerator && - !!this.pendingGeneratorPrefix && - (this.pendingGeneratorPrefix + this.pendingCompletion).startsWith(prefix) && - // for e.g. backspace - this.pendingGeneratorPrefix?.length <= prefix?.length - ) - } - - async *getGenerator( - prefix: string, - newGenerator: (abortSignal: AbortSignal) => AsyncGenerator, - multiline: boolean, - ): AsyncGenerator { - // If we can't reuse, then create a new generator - if (!this.shouldReuseExistingGenerator(prefix)) { - // Create a wrapper over the current generator to fix the prompt - const abortController = new AbortController() - this._createListenableGenerator(abortController, newGenerator(abortController.signal), prefix) - } - - // Already typed characters are those that are new in the prefix from the old generator - let typedSinceLastGenerator = prefix.slice(this.pendingGeneratorPrefix?.length) || "" - for await (let chunk of this.currentGenerator?.tee() ?? []) { - if (!chunk) { - continue - } - - // Ignore already typed characters in the completion - while (chunk.length && typedSinceLastGenerator.length) { - if (chunk[0] === typedSinceLastGenerator[0]) { - typedSinceLastGenerator = typedSinceLastGenerator.slice(1) - chunk = chunk.slice(1) - } else { - break - } - } - - // Break at newline unless we are in multiline mode - const newLineIndex = chunk.indexOf("\n") - if (newLineIndex >= 0 && !multiline) { - yield chunk.slice(0, newLineIndex) - break - } else if (chunk !== "") { - yield chunk - } - } - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/ListenableGenerator.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/ListenableGenerator.test.ts deleted file mode 100644 index 35cdc207a1..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/ListenableGenerator.test.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { describe, expect, it, vi } from "vitest" - -import { ListenableGenerator } from "./ListenableGenerator" - -describe("ListenableGenerator", () => { - // Helper function to create an async generator - async function* asyncGenerator(values: T[]) { - for (const value of values) { - // Yield on next event loop iteration to ensure async behavior - await new Promise(setImmediate) - yield value - } - } - - it("should yield values from the source generator via tee()", async () => { - const values = [1, 2, 3] - const source = asyncGenerator(values) - const onError = vi.fn() - - const lg = new ListenableGenerator(source, onError, new AbortController()) - - const result: number[] = [] - for await (const value of lg.tee()) { - result.push(value) - } - - expect(result).toEqual(values) - expect(onError).not.toHaveBeenCalled() - }) - - it("should allow listeners to receive values", async () => { - const values = [1, 2, 3] - const source = asyncGenerator(values) - const onError = vi.fn() - - const lg = new ListenableGenerator(source, onError, new AbortController()) - - const listener = vi.fn() - - // Add listener after yielding starts (next event loop iteration) - await new Promise(setImmediate) - lg.listen(listener) - - // Wait for generator to actually finish - await lg.waitForCompletion() - - expect(listener).toHaveBeenCalledWith(1) - expect(listener).toHaveBeenCalledWith(2) - expect(listener).toHaveBeenCalledWith(3) - // Listener should receive null at the end - expect(listener).toHaveBeenCalledWith(null) - }) - - it("should buffer values for listeners added after some values have been yielded", async () => { - const values = [1, 2, 3] - const source = asyncGenerator(values) - const onError = vi.fn() - - const lg = new ListenableGenerator(source, onError, new AbortController()) - - const initialListener = vi.fn() - - lg.listen(initialListener) - - // Wait for the first value to be yielded (next event loop iteration) - await new Promise(setImmediate) - - // Add a second listener after first value has been yielded - const newListener = vi.fn() - lg.listen(newListener) - - // Wait for generator to actually finish - await lg.waitForCompletion() - - // Both listeners should have received all values - ;[initialListener, newListener].forEach((listener) => { - expect(listener).toHaveBeenCalledWith(1) - expect(listener).toHaveBeenCalledWith(2) - expect(listener).toHaveBeenCalledWith(3) - expect(listener).toHaveBeenCalledWith(null) - }) - }) - - it("should handle cancellation", async () => { - const values = [1, 2, 3, 4, 5] - const source = asyncGenerator(values) - const onError = vi.fn() - - const lg = new ListenableGenerator(source, onError, new AbortController()) - - const result: number[] = [] - const teeIterator = lg.tee() - - const consume = async () => { - for await (const value of teeIterator) { - result.push(value) - if (value === 3) { - lg.cancel() - } - } - } - - await consume() - - expect(result).toEqual([1, 2, 3]) - expect(lg["_isEnded"]).toBe(true) - }) - - it("should call onError when the source generator throws an error", async () => { - async function* errorGenerator() { - yield 1 - throw new Error("Test error") - } - - const source = errorGenerator() - const onError = vi.fn() - - const lg = new ListenableGenerator(source, onError, new AbortController()) - - const result: number[] = [] - for await (const value of lg.tee()) { - result.push(value) - } - - expect(result).toEqual([1]) - expect(onError).toHaveBeenCalledTimes(1) - expect(onError).toHaveBeenCalledWith(new Error("Test error")) - }) - - it("should notify listeners when the generator ends", async () => { - const values = [1, 2, 3] - const source = asyncGenerator(values) - const onError = vi.fn() - - const lg = new ListenableGenerator(source, onError, new AbortController()) - - const listener = vi.fn() - lg.listen(listener) - - // Wait for the generator to actually finish - await lg.waitForCompletion() - - expect(listener).toHaveBeenCalledWith(1) - expect(listener).toHaveBeenCalledWith(2) - expect(listener).toHaveBeenCalledWith(3) - expect(listener).toHaveBeenCalledWith(null) - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/ListenableGenerator.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/ListenableGenerator.ts deleted file mode 100644 index 4005b13023..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/ListenableGenerator.ts +++ /dev/null @@ -1,84 +0,0 @@ -export class ListenableGenerator { - private _source: AsyncGenerator - private _buffer: T[] = [] - private _listeners: Set<(value: T) => void> = new Set() - private _isEnded = false - private _abortController: AbortController - private _completionPromise: Promise - - constructor( - source: AsyncGenerator, - private readonly onError: (e: unknown) => void, - abortController: AbortController, - ) { - this._source = source - this._abortController = abortController - this._completionPromise = this._start().catch((e) => console.log(`Listenable generator failed: ${e.message}`)) - } - - public cancel() { - this._abortController.abort() - this._isEnded = true - } - - public waitForCompletion(): Promise { - return this._completionPromise - } - - private async _start() { - try { - for await (const value of this._source) { - if (this._isEnded) { - break - } - this._buffer.push(value) - for (const listener of this._listeners) { - listener(value) - } - } - } catch (e) { - this.onError(e) - } finally { - this._isEnded = true - for (const listener of this._listeners) { - listener(null as any) - } - } - } - - listen(listener: (value: T) => void) { - this._listeners.add(listener) - for (const value of this._buffer) { - listener(value) - } - if (this._isEnded) { - listener(null as any) - } - } - - async *tee(): AsyncGenerator { - try { - let i = 0 - while (i < this._buffer.length) { - yield this._buffer[i++] - } - while (!this._isEnded) { - let resolve: (value: T) => void - const promise = new Promise((res) => { - resolve = res - this._listeners.add(resolve!) - }) - await promise - this._listeners.delete(resolve!) - - // Possible timing caused something to slip in between - // timers so we iterate over the buffer - while (i < this._buffer.length) { - yield this._buffer[i++] - } - } - } finally { - // this._listeners.delete(resolve!); - } - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/utils.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/utils.test.ts deleted file mode 100644 index 87dba5f97d..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/utils.test.ts +++ /dev/null @@ -1,126 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from "vitest" -import { stopAfterMaxProcessingTime } from "./utils" - -describe("stopAfterMaxProcessingTime", () => { - beforeEach(() => { - vi.useFakeTimers() - }) - - afterEach(() => { - vi.useRealTimers() - }) - - async function* createMockStream(chunks: string[]): AsyncGenerator { - for (const chunk of chunks) { - yield chunk - } - } - - async function streamToString(stream: AsyncGenerator): Promise { - let result = "" - for await (const chunk of stream) { - result += chunk - } - return result - } - - it("should yield all chunks when maxTimeMs is not reached", async () => { - const mockStream = createMockStream(["Hello", " world", "!"]) - const fullStop = vi.fn() - const result = stopAfterMaxProcessingTime(mockStream, 1000, fullStop) - - const output = await streamToString(result) - - expect(output).toBe("Hello world!") - expect(fullStop).not.toHaveBeenCalled() - }) - - it("should stop processing after max time is reached", async () => { - // Mock implementation of Date.now - let currentTime = 0 - const originalDateNow = Date.now - Date.now = vi.fn(() => currentTime) - - // Create a generator that we can control - async function* controlledGenerator(): AsyncGenerator { - for (let i = 0; i < 100; i++) { - // After yielding 10 chunks, simulate time passing beyond our limit - if (i === 10) { - currentTime = 1000 // This exceeds our 500ms limit - } - yield `chunk-${i}` - } - } - - const fullStop = vi.fn() - const maxTimeMs = 500 - - const transformedGenerator = stopAfterMaxProcessingTime(controlledGenerator(), maxTimeMs, fullStop) - - // Consume the generator and collect outputs - const outputs: string[] = [] - for await (const chunk of transformedGenerator) { - outputs.push(chunk) - } - - // We expect: - // 1. Not all chunks were processed (less than 100) - // 2. fullStop was called - // 3. We processed at least the chunks before time was exceeded - expect(outputs.length).toBeLessThan(100) - expect(outputs.length).toBeGreaterThanOrEqual(10) // We should get at least the first 10 chunks - expect(fullStop).toHaveBeenCalled() - - // Restore Date.now - Date.now = originalDateNow - }) - - it("should check time only periodically based on checkInterval", async () => { - const chunks = Array(100).fill("x") - const mockStream = createMockStream(chunks) - const fullStop = vi.fn() - - // Spy on Date.now to count how many times it's called - const dateSpy = vi.spyOn(Date, "now") - - // Stream should complete normally (not hitting the timeout) - await streamToString(stopAfterMaxProcessingTime(mockStream, 10000, fullStop)) - - // The first call is to set startTime, then once every checkInterval (10) chunks - // So for 100 chunks, we expect startTime + ~10 checks = ~11 calls - // We use a range because implementation details might vary slightly - expect(dateSpy.mock.calls.length).toBeGreaterThanOrEqual(1) - expect(dateSpy.mock.calls.length).toBeLessThanOrEqual(15) - - dateSpy.mockRestore() - }) - - it("should handle empty stream gracefully", async () => { - const mockStream = createMockStream([]) - const fullStop = vi.fn() - const result = stopAfterMaxProcessingTime(mockStream, 1000, fullStop) - - const output = await streamToString(result) - - expect(output).toBe("") - expect(fullStop).not.toHaveBeenCalled() - }) - - it("should pass through all chunks if there's no timeout", async () => { - const chunks = Array(100).fill("test chunk") - const mockStream = createMockStream(chunks) - const fullStop = vi.fn() - - // Use undefined as timeout to simulate no timeout - const result = stopAfterMaxProcessingTime(mockStream, undefined as any, fullStop) - - // Process the stream - const processedChunks = [] - for await (const chunk of result) { - processedChunks.push(chunk) - } - - expect(processedChunks.length).toBe(chunks.length) - expect(fullStop).not.toHaveBeenCalled() - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/utils.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/utils.ts deleted file mode 100644 index 131a791b73..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/generation/utils.ts +++ /dev/null @@ -1,25 +0,0 @@ -export async function* stopAfterMaxProcessingTime( - stream: AsyncGenerator, - maxTimeMs: number, - fullStop: () => void, -): AsyncGenerator { - const startTime = Date.now() - /** - * Check every 10 chunks to avoid performance overhead. - */ - const checkInterval = 10 - let chunkCount = 0 - - for await (const chunk of stream) { - yield chunk - - chunkCount++ - - if (chunkCount % checkInterval === 0) { - if (Date.now() - startTime > maxTimeMs) { - fullStop() - return - } - } - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/prefiltering/index.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/prefiltering/index.ts deleted file mode 100644 index 02866d092b..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/prefiltering/index.ts +++ /dev/null @@ -1,57 +0,0 @@ -import ignore from "ignore" -import { getConfigJsonPath } from "../../util/paths" -import { findUriInDirs } from "../../util/uri" -import { HelperVars } from "../util/HelperVars" - -async function isDisabledForFile( - currentFilepath: string, - disableInFiles: string[] | undefined, - workspaceDirs: string[], -) { - if (disableInFiles) { - // Relative path needed for `ignore` - const { relativePathOrBasename } = findUriInDirs(currentFilepath, workspaceDirs) - - const pattern = ignore().add(disableInFiles) - if (pattern.ignores(relativePathOrBasename)) { - return true - } - } - return false -} - -export async function shouldPrefilter(helper: HelperVars, workspaceDirs: string[]): Promise { - // Allow disabling autocomplete from config.json - if (helper.options.disable) { - return true - } - - // Check whether we're in the continue config.json file - if (helper.filepath === getConfigJsonPath()) { - return true - } - - // Check whether autocomplete is disabled for this file - const disableInFiles = [ - ...(helper.options.disableInFiles ?? []), - "*.prompt", - // "some-example-ignored-file", //MINIMAL_REPO - was configurable - ] - if (await isDisabledForFile(helper.filepath, disableInFiles, workspaceDirs)) { - return true - } - - // Don't offer completions when we have no information (untitled file and no file contents) - if (helper.filepath.includes("Untitled") && helper.fileContents.trim() === "") { - return true - } - - // if ( - // helper.options.transform && - // (await shouldLanguageSpecificPrefilter(helper)) - // ) { - // return true; - // } - - return false -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/__tests__/renderPrompt.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/__tests__/renderPrompt.test.ts deleted file mode 100644 index 8ef9281d8d..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/__tests__/renderPrompt.test.ts +++ /dev/null @@ -1,262 +0,0 @@ -import { afterEach, describe, expect, it, vi } from "vitest" - -// ---------- Module mocks ---------- - -// Simple Handlebars mock that does naive placeholder substitution -vi.mock("handlebars", () => { - return { - default: { - compile: (template: string) => (ctx: Record) => { - return template - .replace(/{{prefix}}/g, ctx.prefix) - .replace(/{{suffix}}/g, ctx.suffix) - .replace(/{{filename}}/g, ctx.filename ?? "") - .replace(/{{reponame}}/g, ctx.reponame ?? "") - .replace(/{{language}}/g, ctx.language ?? "") - }, - }, - } -}) - -// Token utilities – we map 1 char = 1 token for simplicity -vi.mock("../../../llm/countTokens", () => { - const countTokens = (str: string) => str.length - const pruneLinesFromTop = (str: string, allowed: number) => str.slice(Math.max(0, str.length - allowed)) - const pruneLinesFromBottom = (str: string, allowed: number) => str.slice(0, allowed) - const getTokenCountingBufferSafety = () => 0 - - return { - countTokens, - pruneLinesFromTop, - pruneLinesFromBottom, - getTokenCountingBufferSafety, - } -}) - -// Snippet selection – configurable via constant return value -vi.mock("../filtering", () => ({ - getSnippets: () => [], -})) - -// Snippet formatting -const FORMATTED_SNIPPETS = "[FORMATTED_SNIPPETS]" -vi.mock("../formatting", () => ({ - formatSnippets: () => FORMATTED_SNIPPETS, -})) - -// Stop tokens helper – we expose a variable so each test can override it -let stopTokenReturn: string[] = [""] -vi.mock("../getStopTokens", () => ({ - getStopTokens: () => stopTokenReturn, -})) - -// AutocompleteTemplate – provide overridable template + compiler + completionOptions -let templateOverride: any = (prefix: string, suffix: string) => `${prefix}|${suffix}` -let compileFnOverride: ((...args: any[]) => [string, string]) | undefined -let completionOptionsOverride: Record | undefined -vi.mock("../AutocompleteTemplate", () => ({ - getTemplateForModel: () => ({ - template: templateOverride, - compilePrefixSuffix: compileFnOverride, - completionOptions: completionOptionsOverride ?? {}, - }), -})) - -// ---------- Imports after mocks ---------- -import { renderPrompt, renderPromptWithTokenLimit } from ".." -import { AutocompleteLanguageInfo } from "../../constants/AutocompleteLanguageInfo" -import { SnippetPayload } from "../../snippets" -import { HelperVars } from "../../util/HelperVars" - -// ---------- Helper builders ---------- - -const tsLang: AutocompleteLanguageInfo = { - name: "TypeScript", - topLevelKeywords: [], - singleLineComment: "//", - endOfLine: [";"], -} - -const emptySnippetPayload: SnippetPayload = { - rootPathSnippets: [], - importDefinitionSnippets: [], - ideSnippets: [], - recentlyEditedRangeSnippets: [], - recentlyVisitedRangesSnippets: [], - diffSnippets: [], - clipboardSnippets: [], - recentlyOpenedFileSnippets: [], - staticSnippet: [], -} - -function makeHelper() { - return { - input: { - filepath: "file:///test.ts", - pos: { line: 0, character: 0 }, - recentlyEditedRanges: [], - recentlyVisitedRanges: [], - }, - prunedPrefix: "PRUNED_PREFIX", - prunedSuffix: "PRUNED_SUFFIX", - lang: tsLang, - modelName: "test-model", - filepath: "file:///test.ts", - workspaceUris: [], - options: { - maxPromptTokens: 2048, - prefixPercentage: 0.5, - maxSuffixPercentage: 0.5, - experimental_includeClipboard: false, - useRecentlyOpened: false, - experimental_includeRecentlyVisitedRanges: false, - experimental_includeRecentlyEditedRanges: false, - experimental_includeDiff: false, - onlyMyCode: false, - }, - } as unknown as HelperVars -} - -afterEach(() => { - // reset overridable mocks - templateOverride = (prefix: string, suffix: string) => `${prefix}|${suffix}` - compileFnOverride = undefined - completionOptionsOverride = undefined - stopTokenReturn = [""] - vi.restoreAllMocks() -}) - -// ---------- Test suite ---------- - -describe("renderPrompt prefix/suffix selection", () => { - it("uses manuallyPassPrefix when provided", () => { - const helper = makeHelper() - helper.input.manuallyPassPrefix = "MANUAL" - const { prefix, suffix } = renderPrompt({ - snippetPayload: emptySnippetPayload, - workspaceDirs: ["file:///workspace"], - helper, - }) - - expect(suffix).toBe("\n") - expect(prefix.endsWith("MANUAL")).toBe(true) - }) - - it("falls back to prunedPrefix when no manual prefix", () => { - const helper = makeHelper() - - const { prefix } = renderPrompt({ - snippetPayload: emptySnippetPayload, - workspaceDirs: ["file:///workspace"], - helper, - }) - - expect(prefix.includes("PRUNED_PREFIX")).toBe(true) - }) -}) - -describe("template rendering paths", () => { - it("handles function template", () => { - templateOverride = (p: string, s: string, _filepath: string, _reponame: string) => `FUNC:${p}|${s}` - - const helper = makeHelper() - - const { prompt } = renderPrompt({ - snippetPayload: emptySnippetPayload, - workspaceDirs: ["file:///workspace"], - helper, - }) - - expect(prompt.startsWith("FUNC:")).toBe(true) - expect(prompt.includes("PRUNED_PREFIX")).toBe(true) - }) -}) - -describe("compilePrefixSuffix vs snippet formatting", () => { - it("applies compilePrefixSuffix when provided", () => { - compileFnOverride = (p: string, s: string) => [`COMP_${p}`, `COMP_${s}`] - templateOverride = (prefix: string, suffix: string) => `${prefix}|${suffix}` - const helper = makeHelper() - - const { prefix: compiledPrefix } = renderPrompt({ - snippetPayload: emptySnippetPayload, - workspaceDirs: ["file:///workspace"], - helper, - }) - - expect(compiledPrefix.startsWith("COMP_PRUNED_PREFIX")).toBe(true) - }) - - it("prepends formatted snippets when no compiler present", () => { - const helper = makeHelper() - - const { prefix: compiledPrefix } = renderPrompt({ - snippetPayload: emptySnippetPayload, - workspaceDirs: ["file:///workspace"], - helper, - }) - - expect(compiledPrefix.startsWith(`${FORMATTED_SNIPPETS}\n`)).toBe(true) - }) -}) - -describe("renderPromptWithTokenLimit parity & pruning", () => { - it("matches renderPrompt when llm is undefined", () => { - const helper = makeHelper() - - const res1 = renderPrompt({ - snippetPayload: emptySnippetPayload, - workspaceDirs: ["file:///workspace"], - helper, - }) - - const res2 = renderPromptWithTokenLimit({ - snippetPayload: emptySnippetPayload, - workspaceDirs: ["file:///workspace"], - helper, - llm: undefined, - }) - - expect(res2).toEqual(res1) - }) - - it("prunes prefix/suffix to respect small context length", () => { - const longPrefix = "A".repeat(300) - - const helper = makeHelper() - ;(helper as any).prunedPrefix = longPrefix - - const llmStub = { - contextLength: 120, - completionOptions: { maxTokens: 10 }, - model: "test-model", - } as any - - const { prefix: compiledPrefix } = renderPromptWithTokenLimit({ - snippetPayload: emptySnippetPayload, - workspaceDirs: ["file:///workspace"], - helper, - llm: llmStub, - }) - - expect(compiledPrefix.length).toBeLessThan(120) - }) -}) - -describe("stop-token merging", () => { - it("returns stop tokens from getStopTokens", () => { - stopTokenReturn = ["LANG_STOP", "TEMPLATE_STOP"] - completionOptionsOverride = { stop: ["TEMPLATE_STOP"] } - templateOverride = (prefix: string, suffix: string) => `${prefix}|${suffix}` - - const helper = makeHelper() - - const { completionOptions } = renderPrompt({ - snippetPayload: emptySnippetPayload, - workspaceDirs: ["file:///workspace"], - helper, - }) - - expect(completionOptions?.stop).toEqual(stopTokenReturn) - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/formatting.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/formatting.ts deleted file mode 100644 index 5aba7208e9..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/formatting.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { getLastNUriRelativePathParts } from "../../util/uri" -import { - AutocompleteClipboardSnippet, - AutocompleteCodeSnippet, - AutocompleteDiffSnippet, - AutocompleteSnippet, - AutocompleteSnippetType, - AutocompleteStaticSnippet, -} from "../types" -import { HelperVars } from "../util/HelperVars" - -const getCommentMark = (helper: HelperVars) => { - return helper.lang.singleLineComment -} - -const addCommentMarks = (text: string, helper: HelperVars) => { - const commentMark = getCommentMark(helper) - return text - .trim() - .split("\n") - .map((line) => `${commentMark} ${line}`) - .join("\n") -} - -const formatClipboardSnippet = ( - snippet: AutocompleteClipboardSnippet, - workspaceDirs: string[], -): AutocompleteCodeSnippet => { - return formatCodeSnippet( - { - filepath: "file:///Untitled.txt", - content: snippet.content, - type: AutocompleteSnippetType.Code, - }, - workspaceDirs, - ) -} - -const formatCodeSnippet = (snippet: AutocompleteCodeSnippet, workspaceDirs: string[]): AutocompleteCodeSnippet => { - return { - ...snippet, - content: `Path: ${getLastNUriRelativePathParts(workspaceDirs, snippet.filepath, 2)}\n${snippet.content}`, - } -} - -const formatDiffSnippet = (snippet: AutocompleteDiffSnippet): AutocompleteDiffSnippet => { - return snippet -} - -const formatStaticSnippet = (snippet: AutocompleteStaticSnippet): AutocompleteStaticSnippet => { - return snippet -} - -const commentifySnippet = (helper: HelperVars, snippet: AutocompleteSnippet): AutocompleteSnippet => { - return { - ...snippet, - content: addCommentMarks(snippet.content, helper), - } -} - -export const formatSnippets = ( - helper: HelperVars, - snippets: AutocompleteSnippet[], - workspaceDirs: string[], -): string => { - const currentFilepathComment = addCommentMarks( - getLastNUriRelativePathParts(workspaceDirs, helper.filepath, 2), - helper, - ) - - return ( - snippets - .map((snippet) => { - switch (snippet.type) { - case AutocompleteSnippetType.Code: - return formatCodeSnippet(snippet, workspaceDirs) - case AutocompleteSnippetType.Diff: - return formatDiffSnippet(snippet) - case AutocompleteSnippetType.Clipboard: - return formatClipboardSnippet(snippet, workspaceDirs) - case AutocompleteSnippetType.Static: - return formatStaticSnippet(snippet) - } - }) - .map((item) => { - return commentifySnippet(helper, item).content - }) - .join("\n") + `\n${currentFilepathComment}` - ) -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/getStopTokens.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/getStopTokens.ts deleted file mode 100644 index cbaa9f3d86..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/getStopTokens.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { CompletionOptions } from "../.." -import { AutocompleteLanguageInfo } from "../constants/AutocompleteLanguageInfo" - -// TODO: Do we want to stop completions when reaching a `/src/` string? -const SRC_DIRECTORY = "/src/" -// Starcoder2 tends to output artifacts starting with the letter "t" -const STARCODER2_T_ARTIFACTS = ["t.", "\nt", ""] -const PYTHON_ENCODING = "#- coding: utf-8" -const CODE_BLOCK_END = "```" - -// const multilineStops: string[] = [DOUBLE_NEWLINE, WINDOWS_DOUBLE_NEWLINE]; -const commonStops = [SRC_DIRECTORY, PYTHON_ENCODING, CODE_BLOCK_END] - -export function getStopTokens( - completionOptions: Partial | undefined, - _lang: AutocompleteLanguageInfo, - model: string, -): string[] { - const stopTokens = [ - ...(completionOptions?.stop || []), - // ...multilineStops, - ...commonStops, - ...(model.toLowerCase().includes("starcoder2") ? STARCODER2_T_ARTIFACTS : []), - // ...lang.topLevelKeywords.map((word) => `\n${word}`), - ] - - return stopTokens -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/index.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/index.ts deleted file mode 100644 index 43516dfb9e..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/templating/index.ts +++ /dev/null @@ -1,205 +0,0 @@ -import { CompletionOptions } from "../.." -import { HelperVars } from "../util/HelperVars" - -import { ILLM } from "../../index.js" -import { DEFAULT_MAX_TOKENS } from "../../llm/constants.js" -import { - countTokens, - getTokenCountingBufferSafety, - pruneLinesFromBottom, - pruneLinesFromTop, -} from "../../llm/countTokens" -import { getUriPathBasename } from "../../util/uri" -import { SnippetPayload } from "../snippets" -import { AutocompleteSnippet } from "../types" -import { AutocompleteTemplate, getTemplateForModel } from "./AutocompleteTemplate" -import { getSnippets } from "./filtering" -import { formatSnippets } from "./formatting" -import { getStopTokens } from "./getStopTokens" - -function getTemplate(helper: HelperVars): AutocompleteTemplate { - return getTemplateForModel(helper.modelName) -} - -/** Consolidates shared setup between renderPrompt and renderPromptWithTokenLimit. */ -function preparePromptContext({ - snippetPayload, - workspaceDirs, - helper, -}: { - snippetPayload: SnippetPayload - workspaceDirs: string[] - helper: HelperVars -}): { - prefix: string - suffix: string - reponame: string - template: AutocompleteTemplate["template"] - compilePrefixSuffix: AutocompleteTemplate["compilePrefixSuffix"] | undefined - completionOptions: Partial | undefined - snippets: AutocompleteSnippet[] -} { - // Determine base prefix/suffix, accounting for any manually supplied prefix. - const prefix = helper.input.manuallyPassPrefix || helper.prunedPrefix - let suffix = helper.input.manuallyPassPrefix ? "" : helper.prunedSuffix - if (suffix === "") { - suffix = "\n" - } - - const reponame = getUriPathBasename(workspaceDirs[0] ?? "myproject") - - const { template, compilePrefixSuffix, completionOptions } = getTemplate(helper) - - const snippets = getSnippets(helper, snippetPayload) - - return { - prefix, - suffix, - reponame, - template, - compilePrefixSuffix, - completionOptions, - snippets, - } -} - -export function renderPrompt({ - snippetPayload, - workspaceDirs, - helper, -}: { - snippetPayload: SnippetPayload - workspaceDirs: string[] - helper: HelperVars -}): { - prompt: string - prefix: string - suffix: string - completionOptions: Partial | undefined -} { - const { prefix, suffix, reponame, template, compilePrefixSuffix, completionOptions, snippets } = preparePromptContext( - { snippetPayload, workspaceDirs, helper }, - ) - - // Delegate prompt construction to buildPrompt to avoid duplication. - const { - prompt, - prefix: compiledPrefix, - suffix: compiledSuffix, - } = buildPrompt(template, compilePrefixSuffix, prefix, suffix, helper, snippets, workspaceDirs, reponame) - - const stopTokens = getStopTokens(completionOptions, helper.lang, helper.modelName) - - return { - prompt, - prefix: compiledPrefix, - suffix: compiledSuffix, - completionOptions: { - ...completionOptions, - stop: stopTokens, - }, - } -} - -/** Builds the final prompt by applying prefix/suffix compilation or snippet formatting, then rendering the template. */ -function buildPrompt( - template: AutocompleteTemplate["template"], - compilePrefixSuffix: AutocompleteTemplate["compilePrefixSuffix"] | undefined, - prefix: string, - suffix: string, - helper: HelperVars, - snippets: AutocompleteSnippet[], - workspaceDirs: string[], - reponame: string, -): { prompt: string; prefix: string; suffix: string } { - if (compilePrefixSuffix) { - ;[prefix, suffix] = compilePrefixSuffix(prefix, suffix, helper.filepath, reponame, snippets, helper.workspaceUris) - } else { - const formatted = formatSnippets(helper, snippets, workspaceDirs) - prefix = [formatted, prefix].join("\n") - } - const prompt = template(prefix, suffix, helper.filepath, reponame, helper.lang.name, snippets, helper.workspaceUris) - return { prompt, prefix, suffix } -} - -function pruneLength(llm: ILLM, prompt: string): number { - const contextLength = llm.contextLength - const reservedTokens = llm.completionOptions.maxTokens ?? DEFAULT_MAX_TOKENS - const safetyBuffer = getTokenCountingBufferSafety(contextLength) - const maxAllowedPromptTokens = contextLength - reservedTokens - safetyBuffer - const promptTokenCount = countTokens(prompt, llm.model) - return promptTokenCount - maxAllowedPromptTokens -} - -export function renderPromptWithTokenLimit({ - snippetPayload, - workspaceDirs, - helper, - llm, -}: { - snippetPayload: SnippetPayload - workspaceDirs: string[] - helper: HelperVars - llm: ILLM | undefined -}): { - prompt: string - prefix: string - suffix: string - completionOptions: Partial | undefined -} { - const { - prefix: initialPrefix, - suffix: initialSuffix, - reponame, - template, - compilePrefixSuffix, - completionOptions, - snippets, - } = preparePromptContext({ snippetPayload, workspaceDirs, helper }) - - // We'll mutate prefix/suffix during pruning, so copy them. - let prefix = initialPrefix - let suffix = initialSuffix - - let { - prompt, - prefix: compiledPrefix, - suffix: compiledSuffix, - } = buildPrompt(template, compilePrefixSuffix, prefix, suffix, helper, snippets, workspaceDirs, reponame) - - // Truncate prefix and suffix if prompt tokens exceed maxAllowedPromptTokens - if (llm) { - const prune = pruneLength(llm, prompt) - if (prune > 0) { - const tokensToDrop = prune - const prefixTokenCount = countTokens(prefix, helper.modelName) - const suffixTokenCount = countTokens(suffix, helper.modelName) - const totalContextTokens = prefixTokenCount + suffixTokenCount - if (totalContextTokens > 0) { - const dropPrefix = Math.ceil(tokensToDrop * (prefixTokenCount / totalContextTokens)) - const dropSuffix = Math.ceil(tokensToDrop - dropPrefix) - const allowedPrefixTokens = Math.max(0, prefixTokenCount - dropPrefix) - const allowedSuffixTokens = Math.max(0, suffixTokenCount - dropSuffix) - prefix = pruneLinesFromTop(prefix, allowedPrefixTokens, helper.modelName) - suffix = pruneLinesFromBottom(suffix, allowedSuffixTokens, helper.modelName) - } - ;({ - prompt, - prefix: compiledPrefix, - suffix: compiledSuffix, - } = buildPrompt(template, compilePrefixSuffix, prefix, suffix, helper, snippets, workspaceDirs, reponame)) - } - } - - const stopTokens = getStopTokens(completionOptions, helper.lang, helper.modelName) - - return { - prompt, - prefix: compiledPrefix, - suffix: compiledSuffix, - completionOptions: { - ...completionOptions, - stop: stopTokens, - }, - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteDebouncer.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteDebouncer.ts deleted file mode 100644 index 6bfb8a654a..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteDebouncer.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { randomUUID } from "node:crypto" - -export class AutocompleteDebouncer { - private debounceTimeout: NodeJS.Timeout | undefined = undefined - private currentRequestId: string | undefined = undefined - - async delayAndShouldDebounce(debounceDelay: number): Promise { - // Generate a unique ID for this request - const requestId = randomUUID() - this.currentRequestId = requestId - - // Clear any existing timeout - if (this.debounceTimeout) { - clearTimeout(this.debounceTimeout) - } - - // Create a new promise that resolves after the debounce delay - return new Promise((resolve) => { - this.debounceTimeout = setTimeout(() => { - // When the timeout completes, check if this is still the most recent request - const shouldDebounce = this.currentRequestId !== requestId - - // If this is the most recent request, it shouldn't be debounced - if (!shouldDebounce) { - this.currentRequestId = undefined - } - - resolve(shouldDebounce) - }, debounceDelay) - }) - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteLoggingService.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteLoggingService.ts deleted file mode 100644 index 83a8cf43ee..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteLoggingService.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { COUNT_COMPLETION_REJECTED_AFTER } from "../../util/parameters" -import { AutocompleteOutcome } from "./types" - -export class AutocompleteLoggingService { - // Key is completionId - private _abortControllers = new Map() - private _logRejectionTimeouts = new Map() - private _outcomes = new Map() - _lastDisplayedCompletion: { id: string; displayedAt: number } | undefined = undefined - - public createAbortController(completionId: string): AbortController { - const abortController = new AbortController() - this._abortControllers.set(completionId, abortController) - return abortController - } - - public deleteAbortController(completionId: string) { - this._abortControllers.delete(completionId) - } - - public cancel() { - this._abortControllers.forEach((abortController) => { - abortController.abort() - }) - this._abortControllers.clear() - } - - public accept(completionId: string): AutocompleteOutcome | undefined { - if (this._logRejectionTimeouts.has(completionId)) { - clearTimeout(this._logRejectionTimeouts.get(completionId)) - this._logRejectionTimeouts.delete(completionId) - } - - if (this._outcomes.has(completionId)) { - const outcome = this._outcomes.get(completionId)! - outcome.accepted = true - this.logAutocompleteOutcome(outcome) - this._outcomes.delete(completionId) - return outcome - } - return undefined - } - - public cancelRejectionTimeout(completionId: string) { - if (this._logRejectionTimeouts.has(completionId)) { - clearTimeout(this._logRejectionTimeouts.get(completionId)!) - this._logRejectionTimeouts.delete(completionId) - } - - if (this._outcomes.has(completionId)) { - this._outcomes.delete(completionId) - } - } - - public markDisplayed(completionId: string, outcome: AutocompleteOutcome) { - const logRejectionTimeout = setTimeout(() => { - // Wait 10 seconds, then assume it wasn't accepted - outcome.accepted = false - this.logAutocompleteOutcome(outcome) - this._logRejectionTimeouts.delete(completionId) - }, COUNT_COMPLETION_REJECTED_AFTER) - this._outcomes.set(completionId, outcome) - this._logRejectionTimeouts.set(completionId, logRejectionTimeout) - - // If the previously displayed completion is still waiting for rejection, - // and this one is a continuation of that (the outcome.completion is the same modulo prefix) - // then we should cancel the rejection timeout - const previous = this._lastDisplayedCompletion - const now = Date.now() - if (previous && this._logRejectionTimeouts.has(previous.id)) { - const previousOutcome = this._outcomes.get(previous.id) - const c1 = previousOutcome?.completion.split("\n")[0] ?? "" - const c2 = outcome.completion.split("\n")[0] - if (previousOutcome && (c1.endsWith(c2) || c2.endsWith(c1) || c1.startsWith(c2) || c2.startsWith(c1))) { - this.cancelRejectionTimeout(previous.id) - } else if (now - previous.displayedAt < 500) { - // If a completion isn't shown for more than - this.cancelRejectionTimeout(previous.id) - } - } - - this._lastDisplayedCompletion = { - id: completionId, - displayedAt: now, - } - } - - private logAutocompleteOutcome(outcome: AutocompleteOutcome) { - if (!process.env.VITEST) { - console.log(outcome) - } - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteLruCacheInMem.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteLruCacheInMem.test.ts deleted file mode 100644 index 216a979749..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteLruCacheInMem.test.ts +++ /dev/null @@ -1,247 +0,0 @@ -import { describe, it, expect, beforeEach } from "vitest" -import { AutocompleteLruCacheInMem } from "./AutocompleteLruCacheInMem" - -describe("AutoCompleteLruCacheInMem", () => { - let cache: AutocompleteLruCacheInMem - - beforeEach(async () => { - cache = await AutocompleteLruCacheInMem.get() - }) - - describe("basic operations", () => { - it("should store and retrieve a value", async () => { - await cache.put("hello", "world") - const result = await cache.get("hello") - expect(result).toBe("world") - }) - - it("should return undefined for non-existent key", async () => { - const result = await cache.get("nonexistent") - expect(result).toBeUndefined() - }) - - it("should update existing value", async () => { - await cache.put("key", "value1") - await cache.put("key", "value2") - const result = await cache.get("key") - expect(result).toBe("value2") - }) - }) - - describe("exact key matching", () => { - it("should match exact key and return value", async () => { - await cache.put("hello", "world") - const result = await cache.get("hello") - expect(result).toBe("world") - }) - - it("should return undefined when key doesn't match exactly", async () => { - await cache.put("hello", "world") - const result = await cache.get("goodbye") - expect(result).toBeUndefined() - }) - - it("should return undefined for partial key match", async () => { - await cache.put("hello", "world") - const result = await cache.get("hel") - expect(result).toBeUndefined() - }) - - it("should be case sensitive", async () => { - await cache.put("Hello", "World") - const result1 = await cache.get("Hello") - const result2 = await cache.get("hello") - expect(result1).toBe("World") - expect(result2).toBeUndefined() - }) - }) - - describe("fuzzy matching", () => { - it("should return completion when prefix extends a cached key", async () => { - // Cache "c" -> "ontinue" - await cache.put("c", "ontinue") - // Query "co" should return "ntinue" (completion minus what we already have) - const result = await cache.get("co") - expect(result).toBe("ntinue") - }) - - it("should prefer longest matching key", async () => { - // Cache multiple overlapping keys - await cache.put("h", "ello world") - await cache.put("he", "llo world") - await cache.put("hel", "lo world") - - // Query "hello" should match "hel" (longest key) - // User typed "hello" = "hel" + "lo", cached completion is "lo world" - // So return " world" (the part not yet typed) - const result = await cache.get("hello") - expect(result).toBe(" world") - }) - - it("should validate cached completion starts correctly", async () => { - // Cache "c" -> "ontinue" - await cache.put("c", "ontinue") - // Query "cx" doesn't match the completion pattern, should return undefined - const result = await cache.get("cx") - expect(result).toBeUndefined() - }) - - it("should return exact match if available", async () => { - // Cache both exact and partial keys - await cache.put("co", "mplete") - await cache.put("c", "ontinue") - - // Exact match should be preferred - const result = await cache.get("co") - expect(result).toBe("mplete") - }) - - it("should handle multiple partial matches correctly", async () => { - // Cache overlapping prefixes - await cache.put("fun", "ction") - await cache.put("f", "unction") - - // Query "func" should match "fun" (longest) and return "ction" - const result = await cache.get("func") - expect(result).toBe("tion") - }) - - it("should return undefined when no fuzzy match exists", async () => { - await cache.put("hello", "world") - // "goodbye" doesn't start with "hello" - const result = await cache.get("goodbye") - expect(result).toBeUndefined() - }) - - it("should handle empty cache for fuzzy matching", async () => { - const result = await cache.get("anyprefix") - expect(result).toBeUndefined() - }) - }) - - describe("LRU eviction", () => { - it("should evict oldest entry when capacity is reached", async () => { - // Create a fresh cache for this test - const testCache = await AutocompleteLruCacheInMem.get() - - // Fill cache to capacity (100 entries) - for (let i = 0; i < 100; i++) { - await testCache.put(`key${i}`, `value${i}`) - } - - // Add one more entry to trigger eviction - await testCache.put("newkey", "newvalue") - - // First entry should be evicted (oldest timestamp) - const result = await testCache.get("key0") - expect(result).toBeUndefined() - - // New entry should exist - const newResult = await testCache.get("newkey") - expect(newResult).toBe("newvalue") - }) - - it("should update timestamp on cache hit", async () => { - // Create a fresh cache for this test - const testCache = await AutocompleteLruCacheInMem.get() - - // Fill to capacity - for (let i = 0; i < 100; i++) { - await testCache.put(`key${i}`, `value${i}`) - } - - // Access an early entry to refresh its timestamp - const refreshedValue = await testCache.get("key5") - expect(refreshedValue).toBe("value5") - - // Add new entries to trigger evictions - await testCache.put("new1", "newvalue1") - await testCache.put("new2", "newvalue2") - - // key5 should still exist (refreshed timestamp) - const key5Result = await testCache.get("key5") - expect(key5Result).toBe("value5") - - // key0 should be evicted (oldest timestamp, never accessed) - const key0Result = await testCache.get("key0") - expect(key0Result).toBeUndefined() - }) - }) - - describe("edge cases", () => { - it("should handle empty strings", async () => { - const testCache = await AutocompleteLruCacheInMem.get() - await testCache.put("", "empty") - const result = await testCache.get("") - expect(result).toBe("empty") - }) - - it("should handle very long strings", async () => { - const testCache = await AutocompleteLruCacheInMem.get() - const longString = "a".repeat(10000) - await testCache.put(longString, "completion") - const result = await testCache.get(longString) - expect(result).toBe("completion") - }) - - it("should handle special characters", async () => { - await cache.put("const x = {", "foo: 'bar'}") - const result = await cache.get("const x = {") - expect(result).toBe("foo: 'bar'}") - }) - - it("should handle unicode characters", async () => { - await cache.put("emoji 🚀", "rocket") - const result = await cache.get("emoji 🚀") - expect(result).toBe("rocket") - }) - }) - - describe("concurrent operations", () => { - it("should handle concurrent put operations", async () => { - const promises = [] - for (let i = 0; i < 10; i++) { - promises.push(cache.put(`concurrent${i}`, `value${i}`)) - } - await Promise.all(promises) - - // All values should be stored - for (let i = 0; i < 10; i++) { - const result = await cache.get(`concurrent${i}`) - expect(result).toBe(`value${i}`) - } - }) - - it("should handle concurrent get operations", async () => { - await cache.put("shared", "value") - - const promises = [] - for (let i = 0; i < 10; i++) { - promises.push(cache.get("shared")) - } - const results = await Promise.all(promises) - - // All gets should return the same value - results.forEach((result) => { - expect(result).toBe("value") - }) - }) - }) - - describe("multiple cache instances", () => { - it("should create separate cache instances", async () => { - const cache1 = await AutocompleteLruCacheInMem.get() - const cache2 = await AutocompleteLruCacheInMem.get() - - await cache1.put("test", "value1") - await cache2.put("test", "value2") - - const result1 = await cache1.get("test") - const result2 = await cache2.get("test") - - // Each instance should have its own data - expect(result1).toBe("value1") - expect(result2).toBe("value2") - }) - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteLruCacheInMem.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteLruCacheInMem.ts deleted file mode 100644 index 3cad96a860..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/AutocompleteLruCacheInMem.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { LRUCache } from "lru-cache" - -const MAX_PREFIX_LENGTH = 50000 - -function truncatePrefix(input: string, safety: number = 100): string { - const maxBytes = MAX_PREFIX_LENGTH - safety - let bytes = 0 - let startIndex = 0 - - // Count bytes from the end, keeping the most recent typing - for (let i = input.length - 1; i >= 0; i--) { - bytes += new TextEncoder().encode(input[i]).length - if (bytes > maxBytes) { - startIndex = i + 1 - break - } - } - - return input.substring(startIndex) -} - -export class AutocompleteLruCacheInMem { - private static capacity = 100 - private cache: LRUCache - - private constructor() { - this.cache = new LRUCache({ - max: AutocompleteLruCacheInMem.capacity, - }) - } - - static async get(): Promise { - return new AutocompleteLruCacheInMem() - } - - async get(prefix: string): Promise { - const truncated = truncatePrefix(prefix) - - // First try exact match (faster) - const exactMatch = this.cache.get(truncated) - if (exactMatch !== undefined) { - return exactMatch - } - - // Then try fuzzy matching - find keys where prefix starts with the key - // If the query is "co" and we have "c" -> "ontinue" in the cache, - // we should return "ntinue" as the completion. - // Have to make sure we take the key with longest length for best match - let bestMatch: { key: string; value: string } | null = null - let longestKeyLength = 0 - - for (const [key, value] of this.cache.entries()) { - // Check if truncated prefix starts with this key - if (truncated.startsWith(key) && key.length > longestKeyLength) { - bestMatch = { key, value } - longestKeyLength = key.length - } - } - - if (bestMatch) { - // Validate that the cached completion is a valid completion for the prefix - if (bestMatch.value.startsWith(truncated.slice(bestMatch.key.length))) { - // Update LRU timestamp for the matched key by accessing it - this.cache.get(bestMatch.key) - // Return the portion of the value that extends beyond the current prefix - return bestMatch.value.slice(truncated.length - bestMatch.key.length) - } - } - - return undefined - } - - async put(prefix: string, completion: string) { - const truncated = truncatePrefix(prefix) - this.cache.set(truncated, completion) - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/completionTestUtils.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/completionTestUtils.test.ts deleted file mode 100644 index 045f3995b2..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/completionTestUtils.test.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { describe, expect, it } from "vitest" -import { processTestCase, type CompletionTestCase } from "./completionTestUtils" - -describe("processTestCase utility", () => { - it("processes simple console.log completion", () => { - const testCase: CompletionTestCase = { - original: "console.log(|cur||till|)", - completion: '"foo,", bar', - } - - expect(processTestCase(testCase)).toEqual({ - input: { - lastLineOfCompletionText: '"foo,", bar', - currentText: ")", - cursorPosition: "console.log(".length, - }, - expectedResult: { - completionText: '"foo,", bar', - }, - }) - }) - - it("processes simple console.log completion with overwriting", () => { - const testCase: CompletionTestCase = { - original: "console.log(|cur|)|till|", - completion: '"foo,", bar);', - } - - expect(processTestCase(testCase)).toEqual({ - input: { - lastLineOfCompletionText: '"foo,", bar);', - currentText: ")", - cursorPosition: "console.log(".length, - }, - expectedResult: { - completionText: '"foo,", bar);', - range: { - start: "console.log(".length, - end: "console.log()".length, - }, - }, - }) - }) - - it("partially applying completion", () => { - const testCase: CompletionTestCase = { - original: '|cur||till|fetch("https://example.com");', - completion: 'await fetch("https://example.com");', - appliedCompletion: "await ", - } - - expect(processTestCase(testCase)).toEqual({ - input: { - lastLineOfCompletionText: 'await fetch("https://example.com");', - currentText: 'fetch("https://example.com");', - cursorPosition: 0, - }, - expectedResult: { - completionText: "await ", - }, - }) - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/completionTestUtils.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/completionTestUtils.ts deleted file mode 100644 index 9dfbc6c63c..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/completionTestUtils.ts +++ /dev/null @@ -1,94 +0,0 @@ -export interface CompletionTestCase { - original: string // Text with |cur| and |till| markers - completion: string // Text to insert/overwrite - appliedCompletion?: string | null - cursorMarker?: string - tillMarker?: string -} - -interface ProcessedTestCase { - input: { - lastLineOfCompletionText: string - currentText: string - cursorPosition: number - } - expectedResult: { - completionText: string - range?: { - start: number - end: number - } - } -} - -/** - * Transforms human-readable test case into input and expected results. - * - * - `original`: Your original text with |cur| marking where the cursor is before completion, - * and |till| marking where the cursor should be after accepting completion (and this is - * the end of the actual applied completion) - * - `completion`: LLM completion output - * - `appliedCompletion` (optional): part of the LLM completion output that is actually applied - * (written between |cur| and |till| in the original) - * - * For example, you have this line: - * - * console.log(""); - * - * and expect it to be completed this way: - * - * console.log("foo: ", bar); - * - * with your completion coming from LLM being: `'foo: ", bar);'` - * - * Your input to this function should be: - * - original: `'console.log("|cur|"|till|);'` - * - completion: `'foo: ", bar);'` - * - appliedCompletion: `'foo: ", bar'` - * - * Output: input and expected output of {@link core/autocomplete/util/processSingleLineCompletion/processSingleLineCompletion|processSingleLineCompletion()} - * - */ -export function processTestCase({ - original, - completion, - appliedCompletion = null, - cursorMarker = "|cur|", - tillMarker = "|till|", -}: CompletionTestCase): ProcessedTestCase { - // Validate cursor marker - if (!original.includes(cursorMarker)) { - throw new Error("Cursor marker not found in original text") - } - - const cursorPos = original.indexOf(cursorMarker) - original = original.replace(cursorMarker, "") - - let tillPos = original.indexOf(tillMarker) - if (tillPos < 0) { - tillPos = cursorPos - } else { - original = original.replace(tillMarker, "") - } - - // Calculate currentText based on what's between cursor and till marker - const currentText = original.substring(cursorPos) - - return { - input: { - lastLineOfCompletionText: completion, - currentText, - cursorPosition: cursorPos, - }, - expectedResult: { - completionText: appliedCompletion || completion, - range: - cursorPos === tillPos - ? undefined - : { - start: cursorPos, - end: tillPos, - }, - }, - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/processSingleLineCompletion.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/processSingleLineCompletion.test.ts deleted file mode 100644 index df60fd5123..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/processSingleLineCompletion.test.ts +++ /dev/null @@ -1,96 +0,0 @@ -import { describe, expect, it } from "vitest" -import { processTestCase } from "./completionTestUtils" -import { processSingleLineCompletion } from "./processSingleLineCompletion" - -describe("processSingleLineCompletion", () => { - it("should handle simple end of line completion", () => { - const testCase = processTestCase({ - original: "console.log(|cur|", - completion: '"Hello, world!")', - }) - - const result = processSingleLineCompletion( - testCase.input.lastLineOfCompletionText, - testCase.input.currentText, - testCase.input.cursorPosition, - ) - - expect(result).toEqual(testCase.expectedResult) - }) - - it("should handle midline insert repeating the end of line", () => { - const testCase = processTestCase({ - original: "console.log(|cur|);|till|", - completion: '"Hello, world!");', - }) - - const result = processSingleLineCompletion( - testCase.input.lastLineOfCompletionText, - testCase.input.currentText, - testCase.input.cursorPosition, - ) - - expect(result).toEqual(testCase.expectedResult) - }) - - it("should handle midline insert repeating the end of line plus adding a semicolon", () => { - const testCase = processTestCase({ - original: "console.log(|cur|)|till|", - completion: '"Hello, world!");', - }) - - const result = processSingleLineCompletion( - testCase.input.lastLineOfCompletionText, - testCase.input.currentText, - testCase.input.cursorPosition, - ) - - expect(result).toEqual(testCase.expectedResult) - }) - - it("should handle simple midline insert", () => { - const testCase = processTestCase({ - original: "console.log(|cur|)", - completion: '"Hello, world!"', - }) - - const result = processSingleLineCompletion( - testCase.input.lastLineOfCompletionText, - testCase.input.currentText, - testCase.input.cursorPosition, - ) - - expect(result).toEqual(testCase.expectedResult) - }) - - it("should handle complex dif with addition in the beginning", () => { - const testCase = processTestCase({ - original: 'console.log(|cur||till|, "param1", )', // TODO - completion: '"Hello world!", "param1", param1);', - appliedCompletion: '"Hello world!"', - }) - - const result = processSingleLineCompletion( - testCase.input.lastLineOfCompletionText, - testCase.input.currentText, - testCase.input.cursorPosition, - ) - - expect(result).toEqual(testCase.expectedResult) - }) - - it("should handle simple insertion even with random equality", () => { - const testCase = processTestCase({ - original: 'print(f"Foobar length: |cur||till|")', - completion: "{len(foobar)}", - }) - - const result = processSingleLineCompletion( - testCase.input.lastLineOfCompletionText, - testCase.input.currentText, - testCase.input.cursorPosition, - ) - - expect(result).toEqual(testCase.expectedResult) - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/processSingleLineCompletion.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/processSingleLineCompletion.ts deleted file mode 100644 index f464229547..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/processSingleLineCompletion.ts +++ /dev/null @@ -1,80 +0,0 @@ -import * as Diff from "diff" - -interface SingleLineCompletionResult { - completionText: string - range?: { - start: number - end: number - } -} - -interface DiffType { - count?: number - added?: boolean - removed?: boolean - value: string -} - -function diffPatternMatches(diffs: DiffType[], pattern: DiffPartType[]): boolean { - if (diffs.length !== pattern.length) { - return false - } - - for (let i = 0; i < diffs.length; i++) { - const diff = diffs[i] - const diffPartType: DiffPartType = !diff.added && !diff.removed ? "=" : diff.added ? "+" : "-" - - if (diffPartType !== pattern[i]) { - return false - } - } - - return true -} - -type DiffPartType = "+" | "-" | "=" - -export function processSingleLineCompletion( - lastLineOfCompletionText: string, - currentText: string, - cursorPosition: number, -): SingleLineCompletionResult | undefined { - const diffs: DiffType[] = Diff.diffWords(currentText, lastLineOfCompletionText) - - if (diffPatternMatches(diffs, ["+"])) { - // Just insert, we're already at the end of the line - return { - completionText: lastLineOfCompletionText, - } - } - - if (diffPatternMatches(diffs, ["+", "="]) || diffPatternMatches(diffs, ["+", "=", "+"])) { - // The model repeated the text after the cursor to the end of the line - return { - completionText: lastLineOfCompletionText, - range: { - start: cursorPosition, - end: currentText.length + cursorPosition, - }, - } - } - - if (diffPatternMatches(diffs, ["+", "-"]) || diffPatternMatches(diffs, ["-", "+"])) { - // We are midline and the model just inserted without repeating to the end of the line - return { - completionText: lastLineOfCompletionText, - } - } - - // For any other diff pattern, just use the first added part if available - if (diffs[0]?.added) { - return { - completionText: diffs[0].value, - } - } - - // Default case: treat as simple insertion - return { - completionText: lastLineOfCompletionText, - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/types.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/types.ts index 815bb4a66a..1b11559f8a 100644 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/types.ts +++ b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/autocomplete/util/types.ts @@ -1,5 +1,5 @@ -import { Position, Range, RangeInFile, TabAutocompleteOptions } from "../.." -import { AutocompleteCodeSnippet } from "../types" +import type { Position, Range, RangeInFile } from "../.." +import type { AutocompleteCodeSnippet } from "../types" export type RecentlyEditedRange = RangeInFile & { timestamp: number @@ -24,24 +24,3 @@ export interface AutocompleteInput { } injectDetails?: string } - -export interface AutocompleteOutcome extends TabAutocompleteOptions { - accepted?: boolean - time: number - prefix: string - suffix: string - prompt: string - completion: string - modelProvider: string - modelName: string - completionOptions: any - cacheHit: boolean - numLines: number - filepath: string - gitRepo?: string - completionId: string - uniqueId: string - timestamp: string - enabledStaticContextualization?: boolean - profileType?: "local" | "platform" | "control-plane" -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/myers.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/myers.test.ts deleted file mode 100644 index 40011c3799..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/myers.test.ts +++ /dev/null @@ -1,634 +0,0 @@ -import { describe, expect, test } from "vitest" - -import { dedent } from "../util" - -import { myersCharDiff, myersDiff } from "./myers" - -describe("Test myers diff function", () => { - test("should ...", () => { - const linesA = dedent` - A - B - C - D - E - ` - const linesB = dedent` - A - B - C' - D' - E - ` - const diffLines = myersDiff(linesA, linesB) - expect(diffLines).toEqual([ - { type: "same", line: "A" }, - { type: "same", line: "B" }, - { type: "old", line: "C" }, - { type: "old", line: "D" }, - { type: "new", line: "C'" }, - { type: "new", line: "D'" }, - { type: "same", line: "E" }, - ]) - }) - - test("should ignore newline differences at end", () => { - const linesA = "A\nB\nC\n" - const linesB = "A\nB\nC" - - const diffLines = myersDiff(linesA, linesB) - expect(diffLines).toEqual([ - { type: "same", line: "A" }, - { type: "same", line: "B" }, - { type: "same", line: "C" }, - ]) - }) - - test("should ignore single-line whitespace-only differences", () => { - const linesA = "A\n B\nC\n" - const linesB = "A\nB\nC" - - const diffLines = myersDiff(linesA, linesB) - expect(diffLines).toEqual([ - { type: "same", line: "A" }, - { type: "same", line: " B" }, - { type: "same", line: "C" }, - ]) - }) -}) - -describe("Test myersCharDiff function on the same line", () => { - test("should differentiate character changes", () => { - const oldContent = "hello world" - const newContent = "hello earth" - - const diffChars = myersCharDiff(oldContent, newContent) - expect(diffChars).toEqual([ - { - type: "same", - char: "hello ", - oldIndex: 0, - newIndex: 0, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "old", - char: "wo", - oldIndex: 6, - oldCharIndexInLine: 6, - oldLineIndex: 0, - }, - { - type: "new", - char: "ea", - newIndex: 6, - newCharIndexInLine: 6, - newLineIndex: 0, - }, - { - type: "same", - char: "r", - oldIndex: 8, - newIndex: 8, - oldCharIndexInLine: 8, - newCharIndexInLine: 8, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "old", - char: "ld", - oldIndex: 9, - oldCharIndexInLine: 9, - oldLineIndex: 0, - }, - { - type: "new", - char: "th", - newIndex: 9, - newCharIndexInLine: 9, - newLineIndex: 0, - }, - ]) - }) - - test("should handle insertions", () => { - const oldContent = "abc" - const newContent = "abxyzc" - - const diffChars = myersCharDiff(oldContent, newContent) - expect(diffChars).toEqual([ - { - type: "same", - char: "ab", - oldIndex: 0, - newIndex: 0, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "new", - char: "xyz", - newIndex: 2, - newCharIndexInLine: 2, - newLineIndex: 0, - }, - { - type: "same", - char: "c", - oldIndex: 2, - newIndex: 5, - oldCharIndexInLine: 2, - newCharIndexInLine: 5, - oldLineIndex: 0, - newLineIndex: 0, - }, - ]) - }) - - test("should handle deletions", () => { - const oldContent = "abxyzc" - const newContent = "abc" - - const diffChars = myersCharDiff(oldContent, newContent) - expect(diffChars).toEqual([ - { - type: "same", - char: "ab", - oldIndex: 0, - newIndex: 0, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "old", - char: "xyz", - oldIndex: 2, - oldCharIndexInLine: 2, - oldLineIndex: 0, - }, - { - type: "same", - char: "c", - oldIndex: 5, - newIndex: 2, - oldCharIndexInLine: 5, - newCharIndexInLine: 2, - oldLineIndex: 0, - newLineIndex: 0, - }, - ]) - }) - - test("should handle empty strings", () => { - const oldContent = "" - const newContent = "abc" - - const diffChars = myersCharDiff(oldContent, newContent) - expect(diffChars).toEqual([ - { - type: "new", - char: "abc", - newIndex: 0, - newCharIndexInLine: 0, - newLineIndex: 0, - }, - ]) - }) - - test("should handle identical strings", () => { - const content = "no changes here" - - const diffChars = myersCharDiff(content, content) - expect(diffChars).toEqual([ - { - type: "same", - char: "no changes here", - oldIndex: 0, - newIndex: 0, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 0, - newLineIndex: 0, - }, - ]) - }) - - test("should handle whitespace changes", () => { - const oldContent = "hello world" - const newContent = "hello world" - - const diffChars = myersCharDiff(oldContent, newContent) - expect(diffChars).toEqual([ - { - type: "same", - char: "hello ", - oldIndex: 0, - newIndex: 0, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "new", - char: " ", - newIndex: 6, - newCharIndexInLine: 6, - newLineIndex: 0, - }, - { - type: "same", - char: "world", - oldIndex: 6, - newIndex: 7, - oldCharIndexInLine: 6, - newCharIndexInLine: 7, - oldLineIndex: 0, - newLineIndex: 0, - }, - ]) - }) - - test("should handle complex changes", () => { - const oldContent = "The quick brown fox jumps over the lazy dog" - const newContent = "The fast brown fox leaps over the sleeping dog" - - const diffChars = myersCharDiff(oldContent, newContent) - expect(diffChars).toEqual([ - { - type: "same", - char: "The ", - oldIndex: 0, - newIndex: 0, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "old", - char: "quick", - oldIndex: 4, - oldCharIndexInLine: 4, - oldLineIndex: 0, - }, - { - type: "new", - char: "fast", - newIndex: 4, - newCharIndexInLine: 4, - newLineIndex: 0, - }, - { - type: "same", - char: " brown fox ", - oldIndex: 9, - newIndex: 8, - oldCharIndexInLine: 9, - newCharIndexInLine: 8, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "old", - char: "jum", - oldIndex: 20, - oldCharIndexInLine: 20, - oldLineIndex: 0, - }, - { - type: "new", - char: "lea", - newIndex: 19, - newCharIndexInLine: 19, - newLineIndex: 0, - }, - { - type: "same", - char: "ps over the ", - oldIndex: 23, - newIndex: 22, - oldCharIndexInLine: 23, - newCharIndexInLine: 22, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "new", - char: "s", - newIndex: 34, - newCharIndexInLine: 34, - newLineIndex: 0, - }, - { - type: "same", - char: "l", - oldIndex: 35, - newIndex: 35, - oldCharIndexInLine: 35, - newCharIndexInLine: 35, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "old", - char: "azy", - oldIndex: 36, - oldCharIndexInLine: 36, - oldLineIndex: 0, - }, - { - type: "new", - char: "eeping", - newIndex: 36, - newCharIndexInLine: 36, - newLineIndex: 0, - }, - { - type: "same", - char: " dog", - oldIndex: 39, - newIndex: 42, - oldCharIndexInLine: 39, - newCharIndexInLine: 42, - oldLineIndex: 0, - newLineIndex: 0, - }, - ]) - }) -}) - -describe("Test myersCharDiff function on different lines", () => { - test("should track line indices for multi-line changes", () => { - const oldContent = ["Line one", "Line two", "Line three"].join("\n") - - const newContent = ["Line one", "Modified line", "Line three"].join("\n") - - const diffChars = myersCharDiff(oldContent, newContent) - expect(diffChars).toEqual([ - { - type: "same", - char: "Line one", - oldIndex: 0, - newIndex: 0, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "same", - char: "\n", - oldIndex: 8, - newIndex: 8, - oldCharIndexInLine: 8, - newCharIndexInLine: 8, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "old", - char: "L", - oldIndex: 9, - oldCharIndexInLine: 0, - oldLineIndex: 1, - }, - { - type: "new", - char: "Mod", - newIndex: 9, - newCharIndexInLine: 0, - newLineIndex: 1, - }, - { - char: "i", - newCharIndexInLine: 3, - newIndex: 12, - newLineIndex: 1, - oldCharIndexInLine: 1, - oldIndex: 10, - oldLineIndex: 1, - type: "same", - }, - { - char: "n", - oldCharIndexInLine: 2, - oldIndex: 11, - oldLineIndex: 1, - type: "old", - }, - { - char: "fi", - newCharIndexInLine: 4, - newIndex: 13, - newLineIndex: 1, - type: "new", - }, - { - char: "e", - newCharIndexInLine: 6, - newIndex: 15, - newLineIndex: 1, - oldCharIndexInLine: 3, - oldIndex: 12, - oldLineIndex: 1, - type: "same", - }, - { - char: "d", - newCharIndexInLine: 7, - newIndex: 16, - newLineIndex: 1, - type: "new", - }, - { - char: " ", - newCharIndexInLine: 8, - newIndex: 17, - newLineIndex: 1, - oldCharIndexInLine: 4, - oldIndex: 13, - oldLineIndex: 1, - type: "same", - }, - { - type: "old", - char: "two", - oldCharIndexInLine: 5, - oldIndex: 14, - oldLineIndex: 1, - }, - { - type: "new", - char: "line", - newCharIndexInLine: 9, - newIndex: 18, - newLineIndex: 1, - }, - { - type: "same", - char: "\n", - oldIndex: 17, - oldCharIndexInLine: 8, - oldLineIndex: 1, - newIndex: 22, - newCharIndexInLine: 13, - newLineIndex: 1, - }, - { - type: "same", - char: "Line three", - oldIndex: 18, - newIndex: 23, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 2, - newLineIndex: 2, - }, - ]) - }) - - test("should track line indices when adding new lines", () => { - const oldContent = ["First line", "Last line"].join("\n") - - const newContent = ["First line", "Middle line", "Another middle", "Last line"].join("\n") - - const diffChars = myersCharDiff(oldContent, newContent) - expect(diffChars).toEqual([ - { - type: "same", - char: "First line", - oldIndex: 0, - newIndex: 0, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "same", - char: "\n", - oldIndex: 10, - newIndex: 10, - oldCharIndexInLine: 10, - newCharIndexInLine: 10, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "new", - char: "Middle line", - newIndex: 11, - newCharIndexInLine: 0, - newLineIndex: 1, - }, - { - type: "new", - char: "\n", - newIndex: 22, - newCharIndexInLine: 11, - newLineIndex: 1, - }, - { - type: "new", - char: "Another middle", - newCharIndexInLine: 0, - newIndex: 23, - newLineIndex: 2, - }, - { - type: "new", - char: "\n", - newCharIndexInLine: 14, - newIndex: 37, - newLineIndex: 2, - }, - { - type: "same", - char: "Last line", - oldIndex: 11, - oldCharIndexInLine: 0, - oldLineIndex: 1, - newIndex: 38, - newCharIndexInLine: 0, - newLineIndex: 3, - }, - ]) - }) - - test("should track line indices when removing lines", () => { - const oldContent = ["Start", "Line to remove", "Another to remove", "End"].join("\n") - - const newContent = ["Start", "End"].join("\n") - - const diffChars = myersCharDiff(oldContent, newContent) - expect(diffChars).toEqual([ - { - type: "same", - char: "Start", - oldIndex: 0, - newIndex: 0, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "same", - char: "\n", - oldIndex: 5, - newIndex: 5, - oldCharIndexInLine: 5, - newCharIndexInLine: 5, - oldLineIndex: 0, - newLineIndex: 0, - }, - { - type: "old", - char: "Line to remove", - oldIndex: 6, - oldCharIndexInLine: 0, - oldLineIndex: 1, - }, - { - type: "old", - char: "\n", - oldCharIndexInLine: 14, - oldIndex: 20, - oldLineIndex: 1, - }, - { - type: "old", - char: "Another to remove", - oldCharIndexInLine: 0, - oldIndex: 21, - oldLineIndex: 2, - }, - { - type: "old", - char: "\n", - oldCharIndexInLine: 17, - oldIndex: 38, - oldLineIndex: 2, - }, - { - type: "same", - char: "End", - oldIndex: 39, - newIndex: 6, - oldCharIndexInLine: 0, - newCharIndexInLine: 0, - oldLineIndex: 3, - newLineIndex: 1, - }, - ]) - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/myers.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/myers.ts deleted file mode 100644 index 1d61d26d76..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/myers.ts +++ /dev/null @@ -1,204 +0,0 @@ -import { diffChars, diffLines, type Change } from "diff" - -import { DiffChar, DiffLine } from ".." - -function convertMyersChangeToDiffLines(change: Change): DiffLine[] { - const type: DiffLine["type"] = change.added ? "new" : change.removed ? "old" : "same" - const lines = change.value.split("\n") - - // Ignore the \n at the end of the final line, if there is one - if (lines[lines.length - 1] === "") { - lines.pop() - } - - return lines.map((line) => ({ type, line })) -} - -// The interpretation of lines in oldContent and newContent is the same as jsdiff -// Lines are separated by \n, with the exception that a trailing \n does *not* -// represent an empty line. -// -// The default for jsdiff is that "foo" and "foo\n" are *different* single-line -// contents, but we can't represent that: to avoid a diff -// [ { type: "old", line: "foo" }, { type: "new", line: "foo" } ], we -// pass ignoreNewlineAtEof: true. -export function myersDiff(oldContent: string, newContent: string): DiffLine[] { - const theirFormat = diffLines(oldContent, newContent, { - ignoreNewlineAtEof: true, - }) - const ourFormat = theirFormat.flatMap(convertMyersChangeToDiffLines) - - // Combine consecutive old/new pairs that are identical after trimming - for (let i = 0; i < ourFormat.length - 1; i++) { - if ( - ourFormat[i]?.type === "old" && - ourFormat[i + 1]?.type === "new" && - ourFormat[i].line.trim() === ourFormat[i + 1].line.trim() - ) { - ourFormat[i] = { type: "same", line: ourFormat[i].line } - ourFormat.splice(i + 1, 1) - } - } - - // Remove trailing empty old lines - while ( - ourFormat.length > 0 && - ourFormat[ourFormat.length - 1].type === "old" && - ourFormat[ourFormat.length - 1].line === "" - ) { - ourFormat.pop() - } - - return ourFormat -} - -export function myersCharDiff(oldContent: string, newContent: string): DiffChar[] { - // Process the content character by character. - // We will handle newlines separately, - // because diffChars does not have an option to ignore eol newlines. - const theirFormat = diffChars(oldContent, newContent) - - // Track indices as we process the diff. - let oldIndex = 0 - let newIndex = 0 - let oldLineIndex = 0 - let newLineIndex = 0 - let oldCharIndexInLine = 0 - let newCharIndexInLine = 0 - - const result: DiffChar[] = [] - - for (const change of theirFormat) { - // Split the change value by newlines to handle them separately. - if (change.value.includes("\n")) { - const parts = change.value.split(/(\n)/g) // This keeps the newlines as separate entries. - - for (let i = 0; i < parts.length; i++) { - const part = parts[i] - if (part === "") continue - - if (part === "\n") { - // Handle newline. - if (change.added) { - result.push({ - type: "new", - char: part, - newIndex: newIndex, - newLineIndex: newLineIndex, - newCharIndexInLine: newCharIndexInLine, - }) - newIndex += part.length - newLineIndex++ - newCharIndexInLine = 0 // Reset when moving to a new line. - } else if (change.removed) { - result.push({ - type: "old", - char: part, - oldIndex: oldIndex, - oldLineIndex: oldLineIndex, - oldCharIndexInLine: oldCharIndexInLine, - }) - oldIndex += part.length - oldLineIndex++ - oldCharIndexInLine = 0 // Reset when moving to a new line. - } else { - result.push({ - type: "same", - char: part, - oldIndex: oldIndex, - newIndex: newIndex, - oldLineIndex: oldLineIndex, - newLineIndex: newLineIndex, - oldCharIndexInLine: oldCharIndexInLine, - newCharIndexInLine: newCharIndexInLine, - }) - oldIndex += part.length - newIndex += part.length - oldLineIndex++ - newLineIndex++ - oldCharIndexInLine = 0 - newCharIndexInLine = 0 - } - } else { - // Handle regular text. - if (change.added) { - result.push({ - type: "new", - char: part, - newIndex: newIndex, - newLineIndex: newLineIndex, - newCharIndexInLine: newCharIndexInLine, - }) - newIndex += part.length - newCharIndexInLine += part.length - } else if (change.removed) { - result.push({ - type: "old", - char: part, - oldIndex: oldIndex, - oldLineIndex: oldLineIndex, - oldCharIndexInLine: oldCharIndexInLine, - }) - oldIndex += part.length - oldCharIndexInLine += part.length - } else { - result.push({ - type: "same", - char: part, - oldIndex: oldIndex, - newIndex: newIndex, - oldLineIndex: oldLineIndex, - newLineIndex: newLineIndex, - oldCharIndexInLine: oldCharIndexInLine, - newCharIndexInLine: newCharIndexInLine, - }) - oldIndex += part.length - newIndex += part.length - oldCharIndexInLine += part.length - newCharIndexInLine += part.length - } - } - } - } else { - // No newlines, handle as a simple change. - if (change.added) { - result.push({ - type: "new", - char: change.value, - newIndex: newIndex, - newLineIndex: newLineIndex, - newCharIndexInLine: newCharIndexInLine, - }) - newIndex += change.value.length - newCharIndexInLine += change.value.length - } else if (change.removed) { - result.push({ - type: "old", - char: change.value, - oldIndex: oldIndex, - oldLineIndex: oldLineIndex, - oldCharIndexInLine: oldCharIndexInLine, - }) - oldIndex += change.value.length - oldCharIndexInLine += change.value.length - } else { - result.push({ - type: "same", - char: change.value, - oldIndex: oldIndex, - newIndex: newIndex, - oldLineIndex: oldLineIndex, - newLineIndex: newLineIndex, - oldCharIndexInLine: oldCharIndexInLine, - newCharIndexInLine: newCharIndexInLine, - }) - oldIndex += change.value.length - newIndex += change.value.length - oldCharIndexInLine += change.value.length - newCharIndexInLine += change.value.length - } - } - } - - return result -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/streamDiff.test.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/streamDiff.test.ts deleted file mode 100644 index c02e427472..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/streamDiff.test.ts +++ /dev/null @@ -1,317 +0,0 @@ -import fs from "node:fs" -import path from "node:path" - -import { describe, expect, test } from "vitest" - -// @ts-expect-error no typings available -import { changed, diff as myersDiff } from "myers-diff" -import { streamDiff } from "../diff/streamDiff.js" -import { DiffLine, DiffType } from "../index.js" -import { generateLines } from "./util.js" - -// "modification" is an extra type used to represent an "old" + "new" diff line -type MyersDiffTypes = Extract | "modification" - -const UNIFIED_DIFF_SYMBOLS = { - same: "", - new: "+", - old: "-", -} - -async function collectDiffs( - oldLines: string[], - newLines: string[], -): Promise<{ streamDiffs: DiffLine[]; myersDiffs: any }> { - const streamDiffs: DiffLine[] = [] - - for await (const diffLine of streamDiff(oldLines, generateLines(newLines))) { - streamDiffs.push(diffLine) - } - - const myersDiffs = myersDiff(oldLines.join("\n"), newLines.join("\n")) - - return { streamDiffs, myersDiffs } -} - -function getMyersDiffType(diff: any): MyersDiffTypes | undefined { - if (changed(diff.rhs) && !changed(diff.lhs)) { - return "new" - } - - if (!changed(diff.rhs) && changed(diff.lhs)) { - return "old" - } - - if (changed(diff.rhs) && changed(diff.lhs)) { - return "modification" - } - - return undefined -} - -function displayDiff(diff: DiffLine[]) { - return diff.map(({ type, line }) => `${UNIFIED_DIFF_SYMBOLS[type]} ${line}`).join("\n") -} - -async function expectDiff(file: string) { - const testFilePath = path.join(__dirname, "test-examples", file + ".diff") - const testFileContents = fs.readFileSync(testFilePath, "utf-8") - const normalized = testFileContents.replace(/\r\n/g, "\n") - - const [oldText, newText, expectedDiff] = normalized.split("\n---\n").map((s) => s.replace(/^\n+/, "").trimEnd()) - const oldLines = oldText.split("\n") - const newLines = newText.split("\n") - const { streamDiffs } = await collectDiffs(oldLines, newLines) - const displayedDiff = displayDiff(streamDiffs) - - if (!expectedDiff || expectedDiff.trim() === "") { - console.log("Expected diff was empty. Writing computed diff to the test file") - // Persist with LF to keep fixtures stable cross-platform - fs.writeFileSync(testFilePath, `${oldText}\n\n---\n\n${newText}\n\n---\n\n${displayedDiff}`) - - throw new Error("Expected diff is empty") - } - - expect(displayedDiff).toEqual(expectedDiff) -} - -// We use a longer `)` string here to not get -// caught by the fuzzy matcher -describe("streamDiff(", () => { - test("no changes", async () => { - const oldLines = ["first item", "second arg", "third param"] - const newLines = ["first item", "second arg", "third param"] - - const { streamDiffs, myersDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "same", line: "first item" }, - { type: "same", line: "second arg" }, - { type: "same", line: "third param" }, - ]) - - expect(myersDiffs).toEqual([]) - }) - - test("add new line", async () => { - const oldLines = ["first item", "second arg"] - const newLines = ["first item", "second arg", "third param"] - - const { streamDiffs, myersDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "same", line: "first item" }, - { type: "same", line: "second arg" }, - { type: "new", line: "third param" }, - ]) - - expect(myersDiffs.length).toEqual(1) - expect(getMyersDiffType(myersDiffs[0])).toBe("new") - }) - - test("remove line", async () => { - const oldLines = ["first item", "second arg", "third param"] - const newLines = ["first item", "third param"] - - const { streamDiffs, myersDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "same", line: "first item" }, - { type: "old", line: "second arg" }, - { type: "same", line: "third param" }, - ]) - - expect(myersDiffs.length).toEqual(1) - expect(getMyersDiffType(myersDiffs[0])).toBe("old") - }) - - test("modify line", async () => { - const oldLines = ["first item", "second arg", "third param"] - const newLines = ["first item", "modified second arg", "third param"] - - const { streamDiffs, myersDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "same", line: "first item" }, - { type: "old", line: "second arg" }, - { type: "new", line: "modified second arg" }, - { type: "same", line: "third param" }, - ]) - - expect(myersDiffs.length).toEqual(1) - expect(getMyersDiffType(myersDiffs[0])).toBe("modification") - }) - - test("add multiple lines", async () => { - const oldLines = ["first item", "fourth val"] - const newLines = ["first item", "second arg", "third param", "fourth val"] - - const { streamDiffs, myersDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "same", line: "first item" }, - { type: "new", line: "second arg" }, - { type: "new", line: "third param" }, - { type: "same", line: "fourth val" }, - ]) - - // Multi-line addition - expect(myersDiffs[0].rhs.add).toEqual(2) - expect(getMyersDiffType(myersDiffs[0])).toBe("new") - }) - - test("remove multiple lines", async () => { - const oldLines = ["first item", "second arg", "third param", "fourth val"] - const newLines = ["first item", "fourth val"] - - const { streamDiffs, myersDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "same", line: "first item" }, - { type: "old", line: "second arg" }, - { type: "old", line: "third param" }, - { type: "same", line: "fourth val" }, - ]) - - // Multi-line deletion - expect(myersDiffs[0].lhs.del).toEqual(2) - expect(getMyersDiffType(myersDiffs[0])).toBe("old") - }) - - test("empty old lines", async () => { - const oldLines: string[] = [] - const newLines = ["first item", "second arg"] - - const { streamDiffs, myersDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "new", line: "first item" }, - { type: "new", line: "second arg" }, - ]) - - // Multi-line addition - expect(myersDiffs[0].rhs.add).toEqual(2) - expect(getMyersDiffType(myersDiffs[0])).toBe("new") - }) - - test("empty new lines", async () => { - const oldLines = ["first item", "second arg"] - const newLines: string[] = [] - - const { streamDiffs, myersDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "old", line: "first item" }, - { type: "old", line: "second arg" }, - ]) - - // Multi-line deletion - expect(myersDiffs[0].lhs.del).toEqual(2) - expect(getMyersDiffType(myersDiffs[0])).toBe("old") - }) - - test("tabs vs. spaces differences are ignored", async () => { - await expectDiff("fastapi-tabs-vs-spaces.py") - }) - - test("trailing whitespaces should match ", async () => { - const oldLines = ["first item ", "second arg ", "third param "] - - const newLines = ["first item", "second arg", "third param "] - - const { streamDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "same", line: "first item " }, - { type: "same", line: "second arg " }, - { type: "same", line: "third param " }, - ]) - }) - - //indentation and whitespace handling - test.each([false, true])( - "ignores indentation changes for sufficiently long lines (trailingWhitespace: %s)", - async (trailingWhitespace) => { - let oldLines = [" short", " middle", " a long enough line", " short2", "indented line", "final line"] - - const newLines = ["short", "middle", "a long enough line", "short2", " indented line", "final line"] - - if (trailingWhitespace) { - oldLines = oldLines.map((line) => line + " ") - } - - const { streamDiffs } = await collectDiffs(oldLines, newLines) - const expected = trailingWhitespace - ? [ - { type: "old", line: " short " }, - { type: "new", line: "short" }, - { type: "old", line: " middle " }, - { type: "new", line: "middle" }, - { type: "same", line: " a long enough line " }, - { type: "same", line: " short2 " }, - { type: "same", line: "indented line " }, - { type: "same", line: "final line " }, - ] - : [ - { type: "old", line: " short" }, - { type: "new", line: "short" }, - { type: "old", line: " middle" }, - { type: "new", line: "middle" }, - { type: "same", line: " a long enough line" }, - { type: "same", line: " short2" }, - { type: "same", line: "indented line" }, - { type: "same", line: "final line" }, - ] - - expect(streamDiffs).toEqual(expected) - }, - ) - - test("preserves original lines for minor reindentation in simple block", async () => { - const oldLines = ["if (checkValueOf(x)) {", " doSomethingWith(x);", "}"] - const newLines = ["if (checkValueOf(x)) {", " doSomethingWith(x);", "}"] - - const { streamDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "same", line: "if (checkValueOf(x)) {" }, - { type: "same", line: " doSomethingWith(x);" }, - { type: "same", line: "}" }, - ]) - }) - - test("uses new lines for nested reindentation changes", async () => { - const oldLines = ["if (checkValueOf(x)) {", " doSomethingWith(x);", "}"] - const newLines = [ - "if (checkValueOf(x)) {", - " if (reallyCheckValueOf(x)) {", - " doSomethingElseWith(x);", - " }", - "}", - ] - - const { streamDiffs } = await collectDiffs(oldLines, newLines) - - expect(streamDiffs).toEqual([ - { type: "same", line: "if (checkValueOf(x)) {" }, - { type: "new", line: " if (reallyCheckValueOf(x)) {" }, - { type: "old", line: " doSomethingWith(x);" }, - { type: "new", line: " doSomethingElseWith(x);" }, - { type: "old", line: "}" }, - { type: "new", line: " }" }, - { type: "new", line: "}" }, - ]) - }) - - test("FastAPI example", async () => { - await expectDiff("fastapi.py") - }) - - test("FastAPI comments", async () => { - await expectDiff("add-comments.py") - }) - - test("Mock LLM example", async () => { - await expectDiff("mock-llm.ts") - }) -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/streamDiff.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/streamDiff.ts deleted file mode 100644 index 8c3407de13..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/streamDiff.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { DiffLine, DiffType } from "../index.js" - -import { LineStream, matchLine } from "./util.js" - -/** - * https://blog.jcoglan.com/2017/02/12/the-myers-diff-algorithm-part-1/ - * Invariants: - * - new + same = newLines.length - * - old + same = oldLinesCopy.length - * ^ (above two guarantee that all lines get represented) - * - Lines are always output in order, at least among old and new separately - * - Old lines in a hunk are always output before the new lines - */ -export async function* streamDiff(oldLines: string[], newLines: LineStream): AsyncGenerator { - const oldLinesCopy = [...oldLines] - - // If one indentation mistake is made, others are likely. So we are more permissive about matching - let seenIndentationMistake = false - - let newLineResult = await newLines.next() - - while (oldLinesCopy.length > 0 && !newLineResult.done) { - const { matchIndex, isPerfectMatch, newLine } = matchLine(newLineResult.value, oldLinesCopy, seenIndentationMistake) - - if (!seenIndentationMistake && newLineResult.value !== newLine) { - seenIndentationMistake = true - } - - let type: DiffType - - const isNewLine = matchIndex === -1 - - if (isNewLine) { - type = "new" - } else { - // Insert all deleted lines before match - for (let i = 0; i < matchIndex; i++) { - yield { type: "old", line: oldLinesCopy.shift()! } - } - type = isPerfectMatch ? "same" : "old" - } - - switch (type) { - case "new": - yield { type, line: newLine } - break - - case "same": - yield { type, line: oldLinesCopy.shift()! } - break - - case "old": - yield { type, line: oldLinesCopy.shift()! } - yield { type: "new", line: newLine } - break - - default: - console.error(`Error streaming diff, unrecognized diff type: ${type}`) - } - newLineResult = await newLines.next() - } - - // Once at the edge, only one choice - if (newLineResult.done && oldLinesCopy.length > 0) { - for (const oldLine of oldLinesCopy) { - yield { type: "old", line: oldLine } - } - } - - if (!newLineResult.done && oldLinesCopy.length === 0) { - yield { type: "new", line: newLineResult.value } - for await (const newLine of newLines) { - yield { type: "new", line: newLine } - } - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/util.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/util.ts index 90a5ced95a..d5da1720c3 100644 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/util.ts +++ b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/diff/util.ts @@ -1,94 +1,8 @@ -import { distance } from "fastest-levenshtein" - -import { ChatMessage } from "../index.js" +import type { ChatMessage } from "../index.js" import { renderChatMessage } from "../util/messageContent.js" export type LineStream = AsyncGenerator -type MatchLineResult = { - /** - * -1 if it's a new line, otherwise the index of the first match - * in the old lines. - */ - matchIndex: number - isPerfectMatch: boolean - newLine: string -} - -function linesMatchPerfectly(lineA: string, lineB: string): boolean { - return lineA === lineB && lineA !== "" -} - -const END_BRACKETS = ["}", "});", "})"] - -function linesMatch(lineA: string, lineB: string, linesBetween = 0): boolean { - // Require a perfect (without padding) match for these lines - // Otherwise they are edit distance 1 from empty lines and other single char lines (e.g. each other) - if (["}", "*", "});", "})"].includes(lineA.trim())) { - return lineA.trim() === lineB.trim() - } - - const d = distance(lineA, lineB) - - return ( - // Should be more unlikely for lines to fuzzy match if they are further away - (d / Math.max(lineA.length, lineB.length) <= Math.max(0, 0.48 - linesBetween * 0.06) || - lineA.trim() === lineB.trim()) && - lineA.trim() !== "" - ) -} - -/** - * Used to find a match for a new line in an array of old lines. - * - * Return the index of the first match and whether it is a perfect match - * Also return a version of the line with correct indentation if needs fixing - */ -export function matchLine(newLine: string, oldLines: string[], permissiveAboutIndentation = false): MatchLineResult { - // Only match empty lines if it's the next one: - if (newLine.trim() === "" && oldLines[0]?.trim() === "") { - return { - matchIndex: 0, - isPerfectMatch: true, - newLine: newLine.trim(), - } - } - - const isEndBracket = END_BRACKETS.includes(newLine.trim()) - - for (let i = 0; i < oldLines.length; i++) { - // trims trailing whitespaces from the lines before comparison - //this ensures trailing spaces don't affect matching. - const oldLineTrimmed = oldLines[i].trimEnd() - const newLineTrimmed = newLine.trimEnd() - - // Don't match end bracket lines if too far away - if (i > 4 && isEndBracket) { - return { matchIndex: -1, isPerfectMatch: false, newLine } - } - - if (linesMatchPerfectly(newLineTrimmed, oldLineTrimmed)) { - return { matchIndex: i, isPerfectMatch: true, newLine } - } - if (linesMatch(newLineTrimmed, oldLineTrimmed, i)) { - // This is a way to fix indentation, but only for sufficiently long lines to avoid matching whitespace or short lines - if ( - newLineTrimmed.trimStart() === oldLineTrimmed.trimStart() && - (permissiveAboutIndentation || newLine.trim().length > 8) - ) { - return { - matchIndex: i, - isPerfectMatch: true, - newLine: oldLines[i], - } - } - return { matchIndex: i, isPerfectMatch: false, newLine } - } - } - - return { matchIndex: -1, isPerfectMatch: false, newLine } -} - /** * Convert a stream of arbitrary chunks to a stream of lines */ @@ -97,7 +11,6 @@ export async function* streamLines( log: boolean = false, ): LineStream { const allLines = [] - let buffer = "" try { @@ -110,11 +23,6 @@ export async function* streamLines( yield line allLines.push(line) } - - // if (buffer === "" && chunk.endsWith("\n")) { - // yield ""; - // allLines.push(""); - // } } if (buffer.length > 0) { yield buffer @@ -130,6 +38,5 @@ export async function* streamLines( export async function* generateLines(lines: T[]): AsyncGenerator { for (const line of lines) { yield line - // await new Promise((resolve, reject) => setTimeout(() => resolve(null), 50)); } } diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/fetch/stream.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/fetch/stream.ts deleted file mode 100644 index 74cace737b..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/fetch/stream.ts +++ /dev/null @@ -1,138 +0,0 @@ -/** - * Parses a single line from an SSE (Server-Sent Events) stream. - */ -function parseSseLine(line: string): { done: boolean; data: unknown } { - if (line.startsWith("data:[DONE]") || line.startsWith("data: [DONE]")) { - return { done: true, data: undefined } - } - if (line.startsWith("data:")) { - const jsonStr = line.slice(5).trim() - try { - return { done: false, data: JSON.parse(jsonStr) } - } catch { - return { done: false, data: undefined } - } - } - if (line.startsWith(": ping")) { - return { done: true, data: undefined } - } - return { done: false, data: undefined } -} - -/** - * Streams a Response body as UTF-8 text chunks. - * - * Modern implementation using native ReadableStream and TextDecoderStream APIs. - * Requires Node.js 18+ or modern browsers. - */ -export async function* streamResponse(response: Response): AsyncGenerator { - // Handle client-side cancellation - if (response.status === 499) { - return - } - - // Check for error responses - if (response.status !== 200) { - throw new Error(await response.text()) - } - - if (!response.body) { - throw new Error("No response body returned.") - } - - let chunks = 0 - - try { - // Modern API: Use TextDecoderStream to decode the response body - const textStream = response.body.pipeThrough(new TextDecoderStream("utf-8")) - const reader = textStream.getReader() - - try { - while (true) { - const { done, value } = await reader.read() - if (done) break - yield value - chunks++ - } - } finally { - reader.releaseLock() - } - } catch (e) { - if (e instanceof Error) { - // Handle graceful cancellation - if (e.name.startsWith("AbortError")) { - return - } - - // Handle premature close errors - if (e.message.toLowerCase().includes("premature close")) { - if (chunks === 0) { - throw new Error("Stream was closed before any data was received. Try again. (Premature Close)") - } else { - throw new Error("The response was cancelled mid-stream. Try again. (Premature Close).") - } - } - } - throw e - } -} -/** - * Streams Server-Sent Events (SSE) from a Response. - * Parses SSE format and yields parsed data objects. - */ -export async function* streamSse(response: Response): AsyncGenerator { - let buffer = "" - - for await (const value of streamResponse(response)) { - buffer += value - - let position: number - while ((position = buffer.indexOf("\n")) >= 0) { - const line = buffer.slice(0, position) - buffer = buffer.slice(position + 1) - - const { done, data } = parseSseLine(line) - if (done) { - break - } - if (data) { - yield data - } - } - } - - // Process any remaining buffered content - if (buffer.length > 0) { - const { done, data } = parseSseLine(buffer) - if (!done && data) { - yield data - } - } -} - -/** - * Streams newline-delimited JSON from a Response. - * Each line should be a complete JSON object. - */ -export async function* streamJSON(response: Response): AsyncGenerator { - let buffer = "" - - for await (const value of streamResponse(response)) { - buffer += value - - let position: number - while ((position = buffer.indexOf("\n")) >= 0) { - const line = buffer.slice(0, position) - buffer = buffer.slice(position + 1) - - if (line.trim()) { - try { - const data = JSON.parse(line) - yield data - } catch { - throw new Error(`Malformed JSON sent from server: ${line}`) - } - } - } - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/constants.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/constants.ts deleted file mode 100644 index b0e2a8528a..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/constants.ts +++ /dev/null @@ -1,10 +0,0 @@ -const DEFAULT_MAX_TOKENS = 4096 -const DEFAULT_CONTEXT_LENGTH = 32_768 -const DEFAULT_PRUNING_LENGTH = 128000 - -export enum NEXT_EDIT_MODELS { - MERCURY_CODER = "mercury-coder", - INSTINCT = "instinct", -} - -export { DEFAULT_CONTEXT_LENGTH, DEFAULT_MAX_TOKENS, DEFAULT_PRUNING_LENGTH } diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/countTokens.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/countTokens.ts index f37012aaa3..2bc58aad0d 100644 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/countTokens.ts +++ b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/countTokens.ts @@ -1,8 +1,7 @@ import { Tiktoken, encodingForModel as _encodingForModel } from "js-tiktoken" -import { ChatMessage, CompiledMessagesResult, MessageContent } from "../index.js" -import { addSpaceToAnyEmptyMessages, chatMessageIsEmpty } from "./messages.js" -import { DEFAULT_PRUNING_LENGTH } from "./constants.js" +import type { MessageContent } from "../index.js" import { llamaTokenizer } from "./llamaTokenizer.js" + interface Encoding { encode: Tiktoken["encode"] decode: Tiktoken["decode"] @@ -47,7 +46,7 @@ export function encodingForModel(modelName: string): Encoding { return (gptEncoding ??= _encodingForModel("gpt-4")) } -function countTokens( +export function countTokens( content: MessageContent, // defaults to llama2 because the tokenizer tends to produce more tokens modelName = "llama2", @@ -57,58 +56,21 @@ function countTokens( return content.reduce((acc, part) => { return acc + encoding.encode(part.text ?? "", "all", []).length }, 0) - } else { - return encoding.encode(content ?? "", "all", []).length } + return encoding.encode(content ?? "", "all", []).length } -function countChatMessageTokens(modelName: string, chatMessage: ChatMessage): number { - // Doing simpler, safer version of what is here: - // https://github.com/openai/openai-cookbook/blob/main/examples/How_to_count_tokens_with_tiktoken.ipynb - // every message follows <|im_start|>{role/name}\n{content}<|end|>\n - const BASE_TOKENS = 4 - let tokens = BASE_TOKENS - - if (chatMessage.content) { - tokens += countTokens(chatMessage.content, modelName) - } - - return tokens -} - -/** - * Extracts and validates the user message from the end of a message array. - * - * @param messages - Array of chat messages (will be modified by popping messages) - * @returns Array of messages that form the tool sequence - */ -function extractToolSequence(messages: ChatMessage[]): ChatMessage[] { - const lastMsg = messages.pop() - if (!lastMsg || lastMsg.role !== "user") { - throw new Error("Error parsing chat history: no user message found") - } - - const toolSequence: ChatMessage[] = [lastMsg] - - return toolSequence -} - -function pruneLinesFromTop(prompt: string, maxTokens: number, modelName: string): string { +export function pruneLinesFromTop(prompt: string, maxTokens: number, modelName: string): string { const lines = prompt.split("\n") - // Preprocess tokens for all lines and cache them. const lineTokens = lines.map((line) => countTokens(line, modelName)) let totalTokens = lineTokens.reduce((sum, tokens) => sum + tokens, 0) let start = 0 const currentLines = lines.length - // Calculate initial token count including newlines - totalTokens += Math.max(0, currentLines - 1) // Add tokens for joining newlines + totalTokens += Math.max(0, currentLines - 1) - // Using indexes instead of array modifications. - // Remove lines from the top until the token count is within the limit. while (totalTokens > maxTokens && start < currentLines) { - totalTokens -= lineTokens[start] - // Decrement token count for the removed line and its preceding/joining newline (if not the last line) + totalTokens -= lineTokens[start] ?? 0 if (currentLines - start > 1) { totalTokens-- } @@ -118,21 +80,17 @@ function pruneLinesFromTop(prompt: string, maxTokens: number, modelName: string) return lines.slice(start).join("\n") } -function pruneLinesFromBottom(prompt: string, maxTokens: number, modelName: string): string { +export function pruneLinesFromBottom(prompt: string, maxTokens: number, modelName: string): string { const lines = prompt.split("\n") const lineTokens = lines.map((line) => countTokens(line, modelName)) let totalTokens = lineTokens.reduce((sum, tokens) => sum + tokens, 0) let end = lines.length - // Calculate initial token count including newlines - totalTokens += Math.max(0, end - 1) // Add tokens for joining newlines + totalTokens += Math.max(0, end - 1) - // Reverse traversal to avoid array modification - // Remove lines from the bottom until the token count is within the limit. while (totalTokens > maxTokens && end > 0) { end-- - totalTokens -= lineTokens[end] - // Decrement token count for the removed line and its following/joining newline (if not the first line) + totalTokens -= lineTokens[end] ?? 0 if (end > 0) { totalTokens-- } @@ -141,180 +99,11 @@ function pruneLinesFromBottom(prompt: string, maxTokens: number, modelName: stri return lines.slice(0, end).join("\n") } -function pruneStringFromBottom(modelName: string, maxTokens: number, prompt: string): string { +export function pruneStringFromBottom(modelName: string, maxTokens: number, prompt: string): string { const encoding = encodingForModel(modelName) - const tokens = encoding.encode(prompt, "all", []) if (tokens.length <= maxTokens) { return prompt } - return encoding.decode(tokens.slice(0, maxTokens)) } - -function pruneStringFromTop(modelName: string, maxTokens: number, prompt: string): string { - const encoding = encodingForModel(modelName) - - const tokens = encoding.encode(prompt, "all", []) - if (tokens.length <= maxTokens) { - return prompt - } - - return encoding.decode(tokens.slice(tokens.length - maxTokens)) -} - -const MAX_TOKEN_SAFETY_BUFFER = 1000 -const TOKEN_SAFETY_PROPORTION = 0.02 -export function getTokenCountingBufferSafety(contextLength: number) { - return Math.min(MAX_TOKEN_SAFETY_BUFFER, contextLength * TOKEN_SAFETY_PROPORTION) -} - -const MIN_RESPONSE_TOKENS = 1000 - -function pruneRawPromptFromTop( - modelName: string, - contextLength: number, - prompt: string, - tokensForCompletion: number, -): string { - const maxTokens = contextLength - tokensForCompletion - getTokenCountingBufferSafety(contextLength) - return pruneStringFromTop(modelName, maxTokens, prompt) -} - -/** - * Reconciles chat messages with available context length by intelligently pruning older messages - * while preserving critical conversation elements. - * - * Core Guidelines: - * - Always preserve the last user/tool message sequence (including any associated assistant message with tool calls) - * - Always preserve the system message and tools - * - Never allow orphaned tool responses without their corresponding tool calls - * - Remove older messages first when pruning is necessary - * - Maintain conversation coherence by flattening adjacent similar messages - * - * Process: - * 1. Handle image content conversion for models that don't support images - * 2. Extract and preserve system message - * 3. Filter out empty messages and trailing non-user/tool messages - * 4. Extract the complete tool sequence from the end (user message or assistant + tool responses) - * 5. Calculate token requirements for non-negotiable elements (system, tools, last sequence) - * 6. Prune older messages until within available token budget - * 7. Reassemble with proper ordering and flatten adjacent similar messages - * - * @param params - Configuration object containing: - * - modelName: LLM model name for token counting - * - msgs: Array of chat messages to process - * - contextLength: Maximum context length supported by the model - * - maxTokens: Maximum tokens to reserve for the response - * @returns Processed array of chat messages that fit within context constraints - * @throws Error if non-negotiable elements exceed available context - */ -function compileChatMessages({ - modelName, - msgs, - knownContextLength, - maxTokens, -}: { - modelName: string - msgs: ChatMessage[] - knownContextLength: number | undefined - maxTokens: number -}): CompiledMessagesResult { - let didPrune = false - - let msgsCopy: ChatMessage[] = msgs.map((m) => ({ ...m })) - - // Extract system message - const systemMsg = msgsCopy.find((msg) => msg.role === "system") - msgsCopy = msgsCopy.filter((msg) => msg.role !== "system") - - // Remove any empty messages or non-user/tool trailing messages - msgsCopy = msgsCopy.filter((msg) => !chatMessageIsEmpty(msg)) - - msgsCopy = addSpaceToAnyEmptyMessages(msgsCopy) - - // Extract the tool sequence from the end of the message array - const toolSequence = extractToolSequence(msgsCopy) - - // Count tokens for all messages in the tool sequence - let lastMessagesTokens = 0 - for (const msg of toolSequence) { - lastMessagesTokens += countChatMessageTokens(modelName, msg) - } - - // System message - let systemMsgTokens = 0 - if (systemMsg) { - systemMsgTokens = countChatMessageTokens(modelName, systemMsg) - } - - const contextLength = knownContextLength ?? DEFAULT_PRUNING_LENGTH - const countingSafetyBuffer = getTokenCountingBufferSafety(contextLength) - const minOutputTokens = Math.min(MIN_RESPONSE_TOKENS, maxTokens) - - let inputTokensAvailable = contextLength - - // Leave space for output/safety - inputTokensAvailable -= countingSafetyBuffer - inputTokensAvailable -= minOutputTokens - - // Non-negotiable messages - inputTokensAvailable -= systemMsgTokens - inputTokensAvailable -= lastMessagesTokens - - // Make sure there's enough context for the non-excludable items - if (knownContextLength !== undefined && inputTokensAvailable < 0) { - throw new Error( - `Not enough context available to include the system message, last user message, and tools. - There must be at least ${minOutputTokens} tokens remaining for output. - Request had the following token counts: - - contextLength: ${knownContextLength} - - counting safety buffer: ${countingSafetyBuffer} - - system message: ~${systemMsgTokens} - - max output tokens: ${maxTokens}`, - ) - } - - // Now remove messages till we're under the limit - let currentTotal = 0 - const historyWithTokens = msgsCopy.map((message) => { - const tokens = countChatMessageTokens(modelName, message) - currentTotal += tokens - return { - ...message, - tokens, - } - }) - - while (historyWithTokens.length > 0 && currentTotal > inputTokensAvailable) { - const message = historyWithTokens.shift()! - currentTotal -= message.tokens - didPrune = true - } - - // Now reassemble - const reassembled: ChatMessage[] = [] - if (systemMsg) { - reassembled.push(systemMsg) - } - reassembled.push(...historyWithTokens.map(({ tokens: _tokens, ...rest }) => rest)) - reassembled.push(...toolSequence) - - const inputTokens = currentTotal + systemMsgTokens + lastMessagesTokens - const availableTokens = contextLength - countingSafetyBuffer - minOutputTokens - const contextPercentage = inputTokens / availableTokens - return { - compiledChatMessages: reassembled, - didPrune, - contextPercentage, - } -} - -export { - compileChatMessages, - countTokens, - pruneLinesFromBottom, - pruneLinesFromTop, - pruneRawPromptFromTop, - pruneStringFromBottom, -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/index.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/index.ts deleted file mode 100644 index 6d6fef85ba..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/index.ts +++ /dev/null @@ -1,664 +0,0 @@ -import { findLlmInfo } from "./model-info" -import { ChatCompletionCreateParams } from "openai/resources/index" - -import { - ChatMessage, - Chunk, - CompletionOptions, - ILLM, - LLMFullCompletionOptions, - LLMOptions, - MessageOption, - ModelCapability, - PromptLog, - TabAutocompleteOptions, - Usage, -} from "../index.js" -import type { CacheBehavior, ILLMInteractionLog, ILLMLogger } from "../index.js" -import { mergeJson } from "../util/merge.js" -import { renderChatMessage } from "../util/messageContent.js" -import { TokensBatchingService } from "../util/TokensBatchingService.js" - -import { DEFAULT_CONTEXT_LENGTH, DEFAULT_MAX_TOKENS } from "./constants.js" -import { compileChatMessages, countTokens, pruneRawPromptFromTop } from "./countTokens.js" -import { - fromChatCompletionChunk, - fromChatResponse, - LlmApiRequestType, - toChatBody, - toCompleteBody, - toFimBody, -} from "./openaiTypeConverters.js" - -type InteractionStatus = "in_progress" | "success" | "error" | "cancelled" - -export abstract class BaseLLM implements ILLM { - static providerName: string - - get providerName(): string { - return (this.constructor as typeof BaseLLM).providerName - } - - /** - * This exists because for the continue-proxy, sometimes we want to get the value of the underlying provider that is used on the server - * For example, the underlying provider should always be sent with dev data - */ - get underlyingProviderName(): string { - return this.providerName - } - - autocompleteOptions?: Partial - - supportsFim(): boolean { - return false - } - - supportsCompletions(): boolean { - if (["openai", "azure"].includes(this.providerName)) { - if ( - this.apiBase?.includes("api.groq.com") || - this.apiBase?.includes("api.mistral.ai") || - this.apiBase?.includes(":1337") || - this.apiBase?.includes("integrate.api.nvidia.com") || - this._llmOptions.useLegacyCompletionsEndpoint?.valueOf() === false - ) { - // Jan + Groq + Mistral don't support completions : ( - // Seems to be going out of style... - return false - } - } - if (["groq", "mistral", "deepseek"].includes(this.providerName)) { - return false - } - return true - } - - uniqueId: string - model: string - - title?: string - _contextLength: number | undefined - maxStopWords?: number | undefined - completionOptions: CompletionOptions - templateMessages?: (messages: ChatMessage[]) => string - logger?: ILLMLogger - llmRequestHook?: (model: string, prompt: string) => any - apiKey?: string - apiBase?: string - cacheBehavior?: CacheBehavior - capabilities?: ModelCapability - - lastRequestId: string | undefined - - private _llmOptions: LLMOptions - - protected openaiAdapter?: any - - constructor(_options: LLMOptions) { - this._llmOptions = _options - this.lastRequestId = undefined - - // Set default options - const options = { - title: (this.constructor as typeof BaseLLM).providerName, - ..._options, - } - - this.model = options.model - // Use ../llm-info package to autodetect certain parameters - const modelSearchString = - this.providerName === "continue-proxy" ? this.model?.split("/").pop() || this.model : this.model - const llmInfo = findLlmInfo(modelSearchString, this.underlyingProviderName) - - this.title = options.title - this.uniqueId = options.uniqueId ?? "None" - this._contextLength = options.contextLength ?? llmInfo?.contextLength - this.maxStopWords = options.maxStopWords ?? this.maxStopWords - this.completionOptions = { - ...options.completionOptions, - model: options.model || "gpt-4", - maxTokens: - options.completionOptions?.maxTokens ?? - (llmInfo?.maxCompletionTokens - ? Math.min( - llmInfo.maxCompletionTokens, - // Even if the model has a large maxTokens, we don't want to use that every time, - // because it takes away from the context length - this.contextLength / 4, - ) - : DEFAULT_MAX_TOKENS), - } - - this.apiKey = options.apiKey - this.apiBase = options.apiBase - if (this.apiBase && !this.apiBase.endsWith("/")) { - this.apiBase = `${this.apiBase}/` - } - this.capabilities = options.capabilities - - this.autocompleteOptions = options.autocompleteOptions - } - - get contextLength() { - return this._contextLength ?? DEFAULT_CONTEXT_LENGTH - } - - private _templatePromptLikeMessages(prompt: string): string { - if (!this.templateMessages) { - return prompt - } - - // NOTE system message no longer supported here - - const msgs: ChatMessage[] = [{ role: "user", content: prompt }] - - return this.templateMessages(msgs) - } - - private _logEnd( - model: string, - prompt: string, - completion: string, - interaction: ILLMInteractionLog | undefined, - usage: Usage | undefined, - error?: any, - ): InteractionStatus { - const promptTokens = this.countTokens(prompt) - const generatedTokens = this.countTokens(completion) - - TokensBatchingService.getInstance().addTokens(model, this.providerName, promptTokens, generatedTokens) - - console.log("tokensGenerated", { - model: model, - provider: this.underlyingProviderName, - promptTokens: promptTokens, - generatedTokens: generatedTokens, - }) - - if (typeof error === "undefined") { - interaction?.logItem({ - kind: "success", - promptTokens, - generatedTokens, - usage, - }) - return "success" - } else { - if (error === "cancel" || error?.name?.includes("AbortError")) { - interaction?.logItem({ - kind: "cancel", - promptTokens, - generatedTokens, - usage, - }) - return "cancelled" - } else { - console.log(error) - interaction?.logItem({ - kind: "error", - name: error.name, - message: error.message, - promptTokens, - generatedTokens, - usage, - }) - return "error" - } - } - } - - private parseCompletionOptions(options: LLMFullCompletionOptions) { - const log = options.log ?? true - const raw = options.raw ?? false - options.log = undefined - - const completionOptions: CompletionOptions = mergeJson(this.completionOptions, options) - - return { completionOptions, logEnabled: log, raw } - } - - private formatChatMessages(messages: ChatMessage[]): string { - const msgsCopy = messages ? messages.map((msg) => ({ ...msg })) : [] - let formatted = "" - for (const msg of msgsCopy) { - formatted += this._formatChatMessage(msg) - } - return formatted - } - - private _formatChatMessage(msg: ChatMessage): string { - let contentToShow = renderChatMessage(msg) - - return `<${msg.role}>\n${contentToShow}\n\n` - } - - protected async *_streamFim( - _prefix: string, - _suffix: string, - _signal: AbortSignal, - _options: CompletionOptions, - ): AsyncGenerator { - throw new Error("Not implemented") - } - - protected useOpenAIAdapterFor: (LlmApiRequestType | "*")[] = [] - - private shouldUseOpenAIAdapter(requestType: LlmApiRequestType) { - return this.useOpenAIAdapterFor.includes(requestType) || this.useOpenAIAdapterFor.includes("*") - } - - async *streamFim( - prefix: string, - suffix: string, - signal: AbortSignal, - options: LLMFullCompletionOptions = {}, - ): AsyncGenerator { - this.lastRequestId = undefined - const { completionOptions, logEnabled } = this.parseCompletionOptions(options) - const interaction = logEnabled ? this.logger?.createInteractionLog() : undefined - let status: InteractionStatus = "in_progress" - - const fimLog = `Prefix: ${prefix}\nSuffix: ${suffix}` - if (logEnabled) { - interaction?.logItem({ - kind: "startFim", - prefix, - suffix, - options: completionOptions, - provider: this.providerName, - }) - if (this.llmRequestHook) { - this.llmRequestHook(completionOptions.model, fimLog) - } - } - - let completion = "" - try { - if (this.shouldUseOpenAIAdapter("streamFim") && this.openaiAdapter) { - const stream = this.openaiAdapter.fimStream(toFimBody(prefix, suffix, completionOptions), signal) - for await (const chunk of stream) { - if (!this.lastRequestId && typeof (chunk as any).id === "string") { - this.lastRequestId = (chunk as any).id - } - const result = fromChatCompletionChunk(chunk) - if (result) { - const content = renderChatMessage(result) - const formattedContent = this._formatChatMessage(result) - interaction?.logItem({ - kind: "chunk", - chunk: formattedContent, - }) - - completion += formattedContent - yield content - } - } - } else { - for await (const chunk of this._streamFim(prefix, suffix, signal, completionOptions)) { - interaction?.logItem({ - kind: "chunk", - chunk, - }) - - completion += chunk - yield chunk - } - } - - status = this._logEnd(completionOptions.model, fimLog, completion, interaction, undefined) - } catch (e) { - console.error(e as Error, { - context: "llm_stream_fim", - model: completionOptions.model, - provider: this.providerName, - useOpenAIAdapter: this.shouldUseOpenAIAdapter("streamFim"), - }) - - status = this._logEnd(completionOptions.model, fimLog, completion, interaction, undefined, e) - throw e - } finally { - if (status === "in_progress") { - this._logEnd(completionOptions.model, fimLog, completion, interaction, undefined, "cancel") - } - } - - return { - prompt: fimLog, - completion, - completionOptions, - } - } - - async *streamComplete(_prompt: string, signal: AbortSignal, options: LLMFullCompletionOptions = {}) { - this.lastRequestId = undefined - const { completionOptions, logEnabled, raw } = this.parseCompletionOptions(options) - const interaction = logEnabled ? this.logger?.createInteractionLog() : undefined - let status: InteractionStatus = "in_progress" - - let prompt = pruneRawPromptFromTop( - completionOptions.model, - this.contextLength, - _prompt, - completionOptions.maxTokens ?? DEFAULT_MAX_TOKENS, - ) - - if (!raw) { - prompt = this._templatePromptLikeMessages(prompt) - } - - if (logEnabled) { - interaction?.logItem({ - kind: "startComplete", - prompt, - options: completionOptions, - provider: this.providerName, - }) - if (this.llmRequestHook) { - this.llmRequestHook(completionOptions.model, prompt) - } - } - - let completion = "" - try { - if (this.shouldUseOpenAIAdapter("streamComplete") && this.openaiAdapter) { - if (completionOptions.stream === false) { - // Stream false - const response = await this.openaiAdapter.completionNonStream( - { ...toCompleteBody(prompt, completionOptions), stream: false }, - signal, - ) - this.lastRequestId = response.id ?? this.lastRequestId - completion = response.choices[0]?.text ?? "" - yield completion - } else { - // Stream true - for await (const chunk of this.openaiAdapter.completionStream( - { - ...toCompleteBody(prompt, completionOptions), - stream: true, - }, - signal, - )) { - if (!this.lastRequestId && typeof (chunk as any).id === "string") { - this.lastRequestId = (chunk as any).id - } - const content = chunk.choices[0]?.text ?? "" - completion += content - interaction?.logItem({ - kind: "chunk", - chunk: content, - }) - yield content - } - } - } else { - for await (const chunk of this._streamComplete(prompt, signal, completionOptions)) { - completion += chunk - interaction?.logItem({ - kind: "chunk", - chunk, - }) - yield chunk - } - } - status = this._logEnd(completionOptions.model, prompt, completion, interaction, undefined) - } catch (e) { - console.error(e as Error, { - context: "llm_stream_complete", - model: completionOptions.model, - provider: this.providerName, - useOpenAIAdapter: this.shouldUseOpenAIAdapter("streamComplete"), - streamEnabled: completionOptions.stream !== false, - }) - - status = this._logEnd(completionOptions.model, prompt, completion, interaction, undefined, e) - throw e - } finally { - if (status === "in_progress") { - this._logEnd(completionOptions.model, prompt, completion, interaction, undefined, "cancel") - } - } - - return { - modelTitle: this.title ?? completionOptions.model, - modelProvider: this.underlyingProviderName, - prompt, - completion, - completionOptions, - } - } - - async chat(messages: ChatMessage[], signal: AbortSignal, options: LLMFullCompletionOptions = {}) { - let completion = "" - for await (const message of this.streamChat(messages, signal, options)) { - completion += renderChatMessage(message) - } - return { role: "assistant" as const, content: completion } - } - - compileChatMessages(message: ChatMessage[], options: LLMFullCompletionOptions) { - let { completionOptions } = this.parseCompletionOptions(options) - completionOptions = this._modifyCompletionOptions(completionOptions) - - return compileChatMessages({ - modelName: completionOptions.model, - msgs: message, - knownContextLength: this._contextLength, - maxTokens: completionOptions.maxTokens ?? DEFAULT_MAX_TOKENS, - }) - } - - protected modifyChatBody(body: ChatCompletionCreateParams): ChatCompletionCreateParams { - return body - } - - private _modifyCompletionOptions(completionOptions: CompletionOptions): CompletionOptions { - // As of 01/14/25 streaming is currently not available with o1 - // See these threads: - // - https://github.com/continuedev/continue/issues/3698 - // - https://community.openai.com/t/streaming-support-for-o1-o1-2024-12-17-resulting-in-400-unsupported-value/1085043 - if (completionOptions.model === "o1") { - completionOptions.stream = false - } - - return completionOptions - } - - async *streamChat( - _messages: ChatMessage[], - signal: AbortSignal, - options: LLMFullCompletionOptions = {}, - messageOptions?: MessageOption, - ): AsyncGenerator { - this.lastRequestId = undefined - let { completionOptions } = this.parseCompletionOptions(options) - const { logEnabled } = this.parseCompletionOptions(options) - const interaction = logEnabled ? this.logger?.createInteractionLog() : undefined - let status: InteractionStatus = "in_progress" - - completionOptions = this._modifyCompletionOptions(completionOptions) - - let messages = _messages - - // If not precompiled, compile the chat messages - if (!messageOptions?.precompiled) { - const { compiledChatMessages } = compileChatMessages({ - modelName: completionOptions.model, - msgs: _messages, - knownContextLength: this._contextLength, - maxTokens: completionOptions.maxTokens ?? DEFAULT_MAX_TOKENS, - }) - - messages = compiledChatMessages - } - - const prompt = this.templateMessages ? this.templateMessages(messages) : this.formatChatMessages(messages) - if (logEnabled) { - interaction?.logItem({ - kind: "startChat", - messages, - options: completionOptions, - provider: this.providerName, - }) - if (this.llmRequestHook) { - this.llmRequestHook(completionOptions.model, prompt) - } - } - - let completion = "" - let usage: Usage | undefined = undefined - - try { - if (this.templateMessages) { - for await (const chunk of this._streamComplete(prompt, signal, completionOptions)) { - completion += chunk - interaction?.logItem({ - kind: "chunk", - chunk: chunk, - }) - yield { role: "assistant", content: chunk } - } - } else { - if (this.shouldUseOpenAIAdapter("streamChat") && this.openaiAdapter) { - let body = toChatBody(messages, completionOptions) - body = this.modifyChatBody(body) - - if (completionOptions.stream === false) { - // Stream false - const response = await this.openaiAdapter.chatCompletionNonStream({ ...body, stream: false }, signal) - this.lastRequestId = response.id ?? this.lastRequestId - const msg = fromChatResponse(response) - yield msg - completion = this._formatChatMessage(msg) - interaction?.logItem({ - kind: "message", - message: msg, - }) - } else { - // Stream true - const stream = this.openaiAdapter.chatCompletionStream( - { - ...body, - stream: true, - }, - signal, - ) - for await (const chunk of stream) { - if (!this.lastRequestId && typeof (chunk as any).id === "string") { - this.lastRequestId = (chunk as any).id - } - const result = fromChatCompletionChunk(chunk) - if (result) { - completion += this._formatChatMessage(result) - interaction?.logItem({ - kind: "message", - message: result, - }) - yield result - } - } - } - } else { - for await (const chunk of this._streamChat(messages, signal, completionOptions)) { - if (chunk.role === "assistant") { - completion += this._formatChatMessage(chunk) - } - - interaction?.logItem({ - kind: "message", - message: chunk, - }) - - if (chunk.role === "assistant" && chunk.usage) { - usage = chunk.usage - } - - yield chunk - } - } - } - status = this._logEnd(completionOptions.model, prompt, completion, interaction, usage) - } catch (e) { - console.error(e as Error, { - context: "llm_stream_chat", - model: completionOptions.model, - provider: this.providerName, - useOpenAIAdapter: this.shouldUseOpenAIAdapter("streamChat"), - streamEnabled: completionOptions.stream !== false, - templateMessages: !!this.templateMessages, - }) - - status = this._logEnd(completionOptions.model, prompt, completion, interaction, usage, e) - throw e - } finally { - if (status === "in_progress") { - this._logEnd(completionOptions.model, prompt, completion, interaction, usage, "cancel") - } - } - - return { - modelTitle: this.title ?? completionOptions.model, - modelProvider: this.underlyingProviderName, - prompt, - completion, - } - } - - async rerank(query: string, chunks: Chunk[]): Promise { - if (this.shouldUseOpenAIAdapter("rerank") && this.openaiAdapter) { - const results = await this.openaiAdapter.rerank({ - model: this.model, - query, - documents: chunks.map((chunk) => chunk.content), - }) - - // Standard OpenAI format - if (results.data && Array.isArray(results.data)) { - return results.data - .sort((a: { index: number }, b: { index: number }) => a.index - b.index) - .map((result: { relevance_score: number }) => result.relevance_score) - } - - throw new Error( - `Unexpected rerank response format from ${this.providerName}. ` + - `Expected 'data' array but got: ${JSON.stringify(Object.keys(results))}`, - ) - } - - throw new Error(`Reranking is not supported for provider type ${this.providerName}`) - } - - protected async *_streamComplete( - _prompt: string, - _signal: AbortSignal, - _options: CompletionOptions, - ): AsyncGenerator { - throw new Error("Not implemented") - } - - protected async *_streamChat( - messages: ChatMessage[], - signal: AbortSignal, - options: CompletionOptions, - ): AsyncGenerator { - if (!this.templateMessages) { - throw new Error("You must either implement templateMessages or _streamChat") - } - - for await (const chunk of this._streamComplete(this.templateMessages(messages), signal, options)) { - yield { role: "assistant", content: chunk } - } - } - - protected async _complete(prompt: string, signal: AbortSignal, options: CompletionOptions) { - let completion = "" - for await (const chunk of this._streamComplete(prompt, signal, options)) { - completion += chunk - } - return completion - } - - countTokens(text: string): number { - return countTokens(text, this.model) - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/llms/Mock.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/llms/Mock.ts deleted file mode 100644 index 38e9a6f383..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/llms/Mock.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { ChatMessage, CompletionOptions, LLMOptions } from "../../index.js" -import { BaseLLM } from "../index.js" - -type MockMessage = ChatMessage | "REPEAT_LAST_MSG" | "REPEAT_SYSTEM_MSG" | "ERROR" - -class MockLLM extends BaseLLM { - public completion: string = "Test Completion" - public chatStreams: MockMessage[][] | undefined - static override providerName = "mock" - - constructor(options: LLMOptions) { - super(options) - this.templateMessages = undefined - this.chatStreams = options.chatStreams - } - - protected override async *_streamComplete( - _prompt: string, - _signal: AbortSignal, - _options: CompletionOptions, - ): AsyncGenerator { - yield this.completion - } - - protected override async *_streamChat( - messages: ChatMessage[], - _signal: AbortSignal, - _options: CompletionOptions, - ): AsyncGenerator { - if (this.chatStreams) { - const chatStream = this.chatStreams?.[messages.filter((m) => m.role === "user").length - 1] - if (chatStream) { - for (const message of chatStream) { - switch (message) { - case "REPEAT_LAST_MSG": - yield { - role: "assistant", - content: messages[messages.length - 1].content, - } - break - case "REPEAT_SYSTEM_MSG": - yield { - role: "assistant", - content: messages.find((m) => m.role === "system")?.content || "", - } - break - case "ERROR": - throw new Error("Intentional error") - default: - yield message - } - } - } - return - } - - for (const char of this.completion) { - yield { - role: "assistant", - content: char, - } - } - } -} - -export { MockLLM } diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/messages.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/messages.ts deleted file mode 100644 index 3433699dc2..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/messages.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { ChatMessage } from ".." - -function messageIsEmpty(message: ChatMessage): boolean { - if (typeof message.content === "string") { - return message.content.trim() === "" - } - if (Array.isArray(message.content)) { - return message.content.every((item) => item.type === "text" && item.text?.trim() === "") - } - return false -} - -// some providers don't support empty messages -export function addSpaceToAnyEmptyMessages(messages: ChatMessage[]): ChatMessage[] { - return messages.map((message) => { - if (messageIsEmpty(message)) { - message.content = " " - } - return message - }) -} - -export function chatMessageIsEmpty(message: ChatMessage): boolean { - switch (message.role) { - case "system": - case "user": - return typeof message.content === "string" && message.content.trim() === "" - case "assistant": - return typeof message.content === "string" && message.content.trim() === "" - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/model-info/index.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/model-info/index.ts deleted file mode 100644 index 7f32ff6a0c..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/model-info/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { OpenAi } from "./providers/openai.js" -import { LlmInfoWithProvider, ModelProvider } from "./types.js" - -const allModelProviders: ModelProvider[] = [OpenAi] - -const allLlms: LlmInfoWithProvider[] = allModelProviders.flatMap((provider) => - provider.models.map((model) => ({ ...model, provider: provider.id })), -) - -export function findLlmInfo(model: string, preferProviderId?: string): LlmInfoWithProvider | undefined { - if (preferProviderId) { - const provider = allModelProviders.find((p) => p.id === preferProviderId) - const info = provider?.models.find((llm) => (llm.regex ? llm.regex.test(model) : llm.model === model)) - if (info) { - return { - ...info, - provider: preferProviderId, - } - } - } - return allLlms.find((llm) => (llm.regex ? llm.regex.test(model) : llm.model === model)) -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/model-info/providers/openai.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/model-info/providers/openai.ts deleted file mode 100644 index 21f7f9e33c..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/model-info/providers/openai.ts +++ /dev/null @@ -1,139 +0,0 @@ -import { ModelProvider } from "../types.js" - -export const OpenAi: ModelProvider = { - models: [ - { - model: "gpt-3.5-turbo", - displayName: "GPT-3.5 Turbo", - contextLength: 16385, - maxCompletionTokens: 4096, - }, - { - model: "gpt-3.5-turbo-0613", - displayName: "GPT-3.5 Turbo", - contextLength: 16385, - maxCompletionTokens: 4096, - }, - { - model: "gpt-3.5-turbo-16k", - displayName: "GPT-3.5 Turbo 16K", - contextLength: 16384, - maxCompletionTokens: 4096, - }, - { - model: "gpt-35-turbo-16k", - displayName: "GPT-3.5 Turbo 16K", - contextLength: 16384, - maxCompletionTokens: 4096, - }, - { - model: "gpt-35-turbo-0613", - displayName: "GPT-3.5 Turbo (0613)", - contextLength: 4096, - maxCompletionTokens: 4096, - }, - { - model: "gpt-35-turbo", - displayName: "GPT-3.5 Turbo", - contextLength: 4096, - maxCompletionTokens: 4096, - }, - // gpt-4 - { - model: "gpt-4", - displayName: "GPT-4", - contextLength: 8192, - maxCompletionTokens: 8192, - }, - { - model: "gpt-4-32k", - displayName: "GPT-4 32K", - contextLength: 32000, - maxCompletionTokens: 8192, - }, - { - model: "gpt-4-turbo-preview", - displayName: "GPT-4 Turbo Preview", - contextLength: 128000, - maxCompletionTokens: 4096, - }, - { - model: "gpt-4-vision", - displayName: "GPT-4 Vision", - contextLength: 128000, - maxCompletionTokens: 4096, - }, - { - model: "gpt-4-0125-preview", - displayName: "GPT-4 (0125 Preview)", - contextLength: 128000, - maxCompletionTokens: 4096, - }, - { - model: "gpt-4-1106-preview", - displayName: "GPT-4 (1106 Preview)", - contextLength: 128000, - maxCompletionTokens: 4096, - }, - // gpt-5 - { - model: "gpt-5", - displayName: "GPT-5", - contextLength: 400000, - maxCompletionTokens: 128000, - regex: /gpt-5/, - recommendedFor: ["chat"], - }, - // gpt-4o - { - model: "gpt-4o", - displayName: "GPT-4o", - contextLength: 128000, - recommendedFor: ["chat"], - }, - { - model: "gpt-4o-mini", - displayName: "GPT-4o Mini", - contextLength: 128000, - recommendedFor: ["chat"], - }, - // o1 - { - model: "o1-preview", - displayName: "o1 Preview", - contextLength: 128000, - maxCompletionTokens: 32768, - recommendedFor: ["chat"], - }, - { - model: "o1-mini", - displayName: "o1 Mini", - contextLength: 128000, - maxCompletionTokens: 65536, - recommendedFor: ["chat"], - }, - { - model: "o3-mini", - displayName: "o3 Mini", - contextLength: 128000, - maxCompletionTokens: 65536, - recommendedFor: ["chat"], - }, - // embed - { - model: "text-embedding-3-large", - displayName: "Text Embedding 3-Large", - recommendedFor: ["embed"], - }, - { - model: "text-embedding-3-small", - displayName: "Text Embedding 3-Small", - }, - { - model: "text-embedding-ada-002", - displayName: "Text Embedding Ada-002", - }, - ], - id: "openai", - displayName: "OpenAI", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/model-info/types.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/model-info/types.ts deleted file mode 100644 index e516fa4541..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/model-info/types.ts +++ /dev/null @@ -1,58 +0,0 @@ -type UseCase = "chat" | "autocomplete" | "rerank" | "embed" - -type ParameterType = "string" | "number" | "boolean" - -interface Parameter { - key: string - required: boolean - valueType: ParameterType - displayName?: string - description?: string - defaultValue?: any -} - -enum ChatTemplate { - None = "none", - // TODO -} - -interface LlmInfo { - model: string - // providers: string[]; // TODO: uncomment and deal with the consequences - displayName?: string - description?: string - contextLength?: number - maxCompletionTokens?: number - regex?: RegExp - chatTemplate?: ChatTemplate - - /** If not set, assumes "text" only */ - mediaTypes?: MediaType[] - recommendedFor?: UseCase[] - - /** Any additional parameters required to configure the model */ - extraParameters?: Parameter[] -} - -export type LlmInfoWithProvider = LlmInfo & { - provider: string -} - -enum MediaType { - Text = "text", - Image = "image", - Audio = "audio", - Video = "video", -} - -export interface ModelProvider { - id: string - displayName: string - models: Omit[] - - /** Any additional parameters required to configure the model - * - * (other than apiKey, apiBase, which are assumed always. And of course model and provider always required) - */ - extraParameters?: Parameter[] -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/openaiTypeConverters.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/openaiTypeConverters.ts deleted file mode 100644 index 4ae6c57a01..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/openaiTypeConverters.ts +++ /dev/null @@ -1,108 +0,0 @@ -import { - ChatCompletion, - ChatCompletionChunk, - ChatCompletionCreateParams, - ChatCompletionMessageParam, - CompletionCreateParams, -} from "openai/resources/index" - -import { ChatMessage, CompletionOptions, TextMessagePart } from ".." - -function toChatMessage(message: ChatMessage): ChatCompletionMessageParam { - if (message.role === "system") { - return { - role: "system", - content: message.content, - } - } - - if (message.role === "assistant") { - return { - role: "assistant", - content: - typeof message.content === "string" - ? message.content || " " // LM Studio (and other providers) don't accept empty content - : message.content.filter((part) => part.type === "text").map((part) => part as TextMessagePart), // can remove with newer typescript version - } - } else { - if (typeof message.content === "string") { - return { - role: "user", - content: message.content ?? " ", // LM Studio (and other providers) don't accept empty content - } - } - - // Extract text from message parts - return { - role: "user", - content: message.content.map((item) => (item as TextMessagePart).text).join("") || " ", - } - } -} - -export function toChatBody(messages: ChatMessage[], options: CompletionOptions): ChatCompletionCreateParams { - return { - messages: messages.map(toChatMessage), - model: options.model, - max_tokens: options.maxTokens, - temperature: options.temperature, - top_p: options.topP, - frequency_penalty: options.frequencyPenalty, - presence_penalty: options.presencePenalty, - stream: options.stream ?? true, - stop: options.stop, - } -} - -export function toCompleteBody(prompt: string, options: CompletionOptions): CompletionCreateParams { - return { - prompt, - model: options.model, - max_tokens: options.maxTokens, - temperature: options.temperature, - top_p: options.topP, - frequency_penalty: options.frequencyPenalty, - presence_penalty: options.presencePenalty, - stream: options.stream ?? true, - stop: options.stop, - } -} - -export function toFimBody(prefix: string, suffix: string, options: CompletionOptions): Record { - return { - model: options.model, - prompt: prefix, - suffix, - max_tokens: options.maxTokens, - temperature: options.temperature, - top_p: options.topP, - frequency_penalty: options.frequencyPenalty, - presence_penalty: options.presencePenalty, - stop: options.stop, - stream: true, - } as any -} - -export function fromChatResponse(response: ChatCompletion): ChatMessage { - const message = response.choices[0].message - - return { - role: "assistant", - content: message.content ?? "", - } -} - -export function fromChatCompletionChunk(chunk: ChatCompletionChunk): ChatMessage | undefined { - const delta = chunk.choices?.[0]?.delta - - if (delta?.content) { - return { - role: "assistant", - content: delta.content, - } - } - - return undefined -} - -export type LlmApiRequestType = "chat" | "streamChat" | "streamComplete" | "streamFim" | "rerank" diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/templates/edit.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/templates/edit.ts deleted file mode 100644 index 963bbece82..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/templates/edit.ts +++ /dev/null @@ -1,253 +0,0 @@ -import { ChatMessage, PromptTemplate } from "../../index.js" -import { gptEditPrompt } from "./edit/gpt.js" - -const simplifiedEditPrompt = `Consider the following code: -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` -Edit the code to perfectly satisfy the following user request: -{{{userInput}}} -Output nothing except for the code. No code block, no English explanation, no start/end tags.` - -const simplestEditPrompt = `Here is the code before editing: -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` - -Here is the edit requested: -"{{{userInput}}}" - -Here is the code after editing:` - -const codellamaInfillEditPrompt = "{{filePrefix}}{{fileSuffix}}" - -const START_TAG = "" -const osModelsEditPrompt: PromptTemplate = (history, otherData) => { - // "No sufix" means either there is no suffix OR - // it's a clean break at end of function or something - // (what we're trying to avoid is just the language model trying to complete the closing brackets of a function or something) - const firstCharOfFirstLine = otherData.suffix?.split("\n")[0]?.[0]?.trim() - const isSuffix = - otherData.suffix?.trim() !== "" && - // First character of first line is whitespace - // Otherwise we assume it's a clean break - !firstCharOfFirstLine - const suffixTag = isSuffix ? "" : "" - const suffixExplanation = isSuffix ? ' When you get to "", end your response.' : "" - - // If neither prefilling nor /v1/completions are supported, we have to use a chat prompt without putting words in the model's mouth - if (otherData.supportsCompletions !== "true" && otherData.supportsPrefill !== "true") { - return gptEditPrompt(history, otherData) - } - - // Use a different prompt when there's neither prefix nor suffix - if (otherData.prefix?.trim() === "" && otherData.suffix?.trim() === "") { - return [ - { - role: "user", - content: `\`\`\`${otherData.language} -${otherData.codeToEdit} -${suffixTag} -\`\`\` - -Please rewrite the entire code block above in order to satisfy the following request: "${otherData.userInput}". You should rewrite the entire code block without leaving placeholders, even if the code is the same as before.${suffixExplanation}`, - }, - { - role: "assistant", - content: `Sure! Here's the entire rewritten code block: -\`\`\`${otherData.language} -`, - }, - ] - } - - return [ - { - role: "user", - content: `\`\`\`${otherData.language} -${otherData.prefix}${START_TAG} -${otherData.codeToEdit} -${suffixTag} -\`\`\` - -Please rewrite the entire code block above, editing the portion below "${START_TAG}" in order to satisfy the following request: "${otherData.userInput}". You should rewrite the entire code block without leaving placeholders, even if the code is the same as before.${suffixExplanation} -`, - }, - { - role: "assistant", - content: `Sure! Here's the entire code block, including the rewritten portion: -\`\`\`${otherData.language} -${otherData.prefix}${START_TAG} -`, - }, - ] -} - -const mistralEditPrompt = `[INST] You are a helpful code assistant. Your task is to rewrite the following code with these instructions: "{{{userInput}}}" -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` - -Just rewrite the code without explanations: [/INST] -\`\`\`{{{language}}}` - -const alpacaEditPrompt = `Below is an instruction that describes a task, paired with an input that provides further context. Write a response that appropriately completes the request. - -### Instruction: Rewrite the code to satisfy this request: "{{{userInput}}}" - -### Input: - -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` - -### Response: - -Sure! Here's the code you requested: -\`\`\`{{{language}}} -` - -const phindEditPrompt = `### System Prompt -You are an expert programmer and write code on the first attempt without any errors or fillers. - -### User Message: -Rewrite the code to satisfy this request: "{{{userInput}}}" - -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` - -### Assistant: -Sure! Here's the code you requested: - -\`\`\`{{{language}}} -` - -const deepseekEditPrompt = `### System Prompt -You are an AI programming assistant, utilizing the DeepSeek Coder model, developed by DeepSeek Company, and your role is to assist with questions related to computer science. For politically sensitive questions, security and privacy issues, and other non-computer science questions, you will not answer. -### Instruction: -Rewrite the code to satisfy this request: "{{{userInput}}}" - -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\`<|EOT|> -### Response: -Sure! Here's the code you requested: - -\`\`\`{{{language}}} -` - -const zephyrEditPrompt = `<|system|> -You are an expert programmer and write code on the first attempt without any errors or fillers. -<|user|> -Rewrite the code to satisfy this request: "{{{userInput}}}" - -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` -<|assistant|> -Sure! Here's the code you requested: - -\`\`\`{{{language}}} -` - -const openchatEditPrompt = `GPT4 Correct User: You are an expert programmer and personal assistant. You are asked to rewrite the following code in order to {{{userInput}}}. -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` -Please only respond with code and put it inside of a markdown code block. Do not give any explanation, but your code should perfectly satisfy the user request.<|end_of_turn|>GPT4 Correct Assistant: Sure thing! Here is the rewritten code that you requested: -\`\`\`{{{language}}} -` - -const xWinCoderEditPrompt = `: You are an AI coding agent that helps people with programming. Write a response that appropriately completes the user's request. -: Please rewrite the following code with these instructions: "{{{userInput}}}" -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` - -Just rewrite the code without explanations: -: -\`\`\`{{{language}}}` - -const neuralChatEditPrompt = `### System: -You are an expert programmer and write code on the first attempt without any errors or fillers. -### User: -Rewrite the code to satisfy this request: "{{{userInput}}}" - -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` -### Assistant: -Sure! Here's the code you requested: - -\`\`\`{{{language}}} -` - -const codeLlama70bEditPrompt = `Source: system\n\n You are an expert programmer and write code on the first attempt without any errors or fillers. Source: user\n\n Rewrite the code to satisfy this request: "{{{userInput}}}" - -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` Source: assistant\nDestination: user\n\n ` - -const claudeEditPrompt: PromptTemplate = (history: ChatMessage[], otherData: Record) => [ - { - role: "user", - content: `\ -\`\`\`${otherData.language} -${otherData.codeToEdit} -\`\`\` - -You are an expert programmer. You will rewrite the above code to do the following: - -${otherData.userInput} - -Output only a code block with the rewritten code: -`, - }, - { - role: "assistant", - content: `Sure! Here is the rewritten code: -\`\`\`${otherData.language}`, - }, -] - -const llama3EditPrompt: PromptTemplate = `<|begin_of_text|><|start_header_id|>user<|end_header_id|> -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` - -Rewrite the above code to satisfy this request: "{{{userInput}}}"<|eot_id|><|start_header_id|>assistant<|end_header_id|> -Sure! Here's the code you requested: -\`\`\`{{{language}}}` - -const gemmaEditPrompt = `user -You are an expert programmer and write code on the first attempt without any errors or fillers. Rewrite the code to satisfy this request: "{{{userInput}}}" - -\`\`\`{{{language}}} -{{{codeToEdit}}} -\`\`\` -model -Sure! Here's the code you requested: - -\`\`\`{{{language}}} -` - -export { - alpacaEditPrompt, - claudeEditPrompt, - codeLlama70bEditPrompt, - codellamaInfillEditPrompt, - deepseekEditPrompt, - gemmaEditPrompt, - gptEditPrompt, - llama3EditPrompt, - mistralEditPrompt, - neuralChatEditPrompt, - openchatEditPrompt, - osModelsEditPrompt, - phindEditPrompt, - simplestEditPrompt, - simplifiedEditPrompt, - xWinCoderEditPrompt, - zephyrEditPrompt, -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/templates/edit/gpt.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/templates/edit/gpt.ts deleted file mode 100644 index d13cdc8d0f..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/llm/templates/edit/gpt.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { PromptTemplateFunction } from "../../.." -import { dedent } from "../../../util" - -const gptInsertionEditPrompt: PromptTemplateFunction = (_, otherData) => { - return dedent` - \`\`\`${otherData.language} - ${otherData.prefix}[BLANK]${otherData.codeToEdit}${otherData.suffix} - \`\`\` - - Above is the file of code that the user is currently editing in. Their cursor is located at the "[BLANK]". They have requested that you fill in the "[BLANK]" with code that satisfies the following request: - - "${otherData.userInput}" - - Please generate this code. Your output will be only the code that should replace the "[BLANK]", without repeating any of the prefix or suffix, without any natural language explanation, and without messing up indentation. Here is the code that will replace the "[BLANK]":` -} - -const gptFullFileEditPrompt: PromptTemplateFunction = (_, otherData) => { - return dedent` - \`\`\`${otherData.language} - ${otherData.codeToEdit} - \`\`\` - - Please rewrite the above file to address the following request: - - ${otherData.userInput} - - You should rewrite the entire file without any natural language explanation. DO NOT surround the code in a code block and DO NOT explain yourself.` -} - -export const gptEditPrompt: PromptTemplateFunction = (history, otherData) => { - if (otherData?.codeToEdit?.trim().length === 0) { - return gptInsertionEditPrompt(history, otherData) - } else if (otherData?.prefix?.trim().length === 0 && otherData?.suffix?.trim().length === 0) { - return gptFullFileEditPrompt(history, otherData) - } - - const paragraphs = ["The user has requested a section of code in a file to be rewritten."] - - if (otherData.prefix?.trim().length > 0) { - paragraphs.push(dedent` - This is the prefix of the file: - \`\`\`${otherData.language} - ${otherData.prefix} - \`\`\``) - } - - if (otherData.suffix?.trim().length > 0) { - paragraphs.push(dedent` - This is the suffix of the file: - \`\`\`${otherData.language} - ${otherData.suffix} - \`\`\``) - } - - paragraphs.push(dedent` - This is the code to rewrite: - \`\`\`${otherData.language} - ${otherData.codeToEdit} - \`\`\` - - The user's request is: "${otherData.userInput}" - - DO NOT output any natural language, only output the code changes. - - Here is the rewritten code:`) - - return paragraphs.join("\n\n") -} - -export const defaultApplyPrompt: PromptTemplateFunction = (history, otherData) => { - return `${otherData.original_code}\n\nThe following code was suggested as an edit:\n\`\`\`\n${otherData.new_code}\n\`\`\`\nPlease apply it to the previous code.` -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/FakeConfigHandler.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/FakeConfigHandler.ts deleted file mode 100644 index c071f58826..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/FakeConfigHandler.ts +++ /dev/null @@ -1,87 +0,0 @@ -import type { ILLM, TabAutocompleteOptions } from "../index.js" -import { MinimalConfigProvider } from "../autocomplete/MinimalConfig.js" - -/** - * Minimal config structure for testing. - * Matches the shape of config returned by MinimalConfigProvider.loadConfig() - */ -interface MinimalTestConfig { - modelsByRole?: { - autocomplete?: ILLM[] - } - selectedModelByRole?: { - autocomplete?: ILLM - edit?: ILLM - chat?: ILLM - rerank?: ILLM - } - rules?: unknown[] -} - -/** - * Options for customizing FakeConfigHandler behavior. - * All options are optional and will use sensible defaults if not provided. - */ -interface FakeConfigHandlerOptions { - /** Configuration to return from loadConfig() */ - config?: Partial - - /** Autocomplete model to use (shorthand for setting selectedModelByRole.autocomplete) */ - autocompleteModel?: ILLM - - /** Whether static contextualization is enabled */ - enableStaticContextualization?: boolean - - /** Tab autocomplete options */ - tabAutocompleteOptions?: TabAutocompleteOptions - - /** Profile type for logging */ - profileType?: "control-plane" | "local" | "platform" -} - -export class FakeConfigHandler extends MinimalConfigProvider { - /** Track calls to onConfigUpdate for assertions */ - public configUpdateCallbacks: Array<(event: { config: MinimalTestConfig; configLoadInterrupted: boolean }) => void> = - [] - - constructor(options: FakeConfigHandlerOptions = {}) { - // Build config from options - const autocompleteModel = options.autocompleteModel - - const config = { - tabAutocompleteOptions: options.tabAutocompleteOptions, - experimental: { - enableStaticContextualization: options.enableStaticContextualization ?? false, - }, - modelsByRole: { - autocomplete: autocompleteModel ? [autocompleteModel] : [], - }, - selectedModelByRole: { - autocomplete: autocompleteModel, - }, - ...options.config, - } - - // Call parent constructor with merged config - super(config) - - // Set profile if provided - if (options.profileType) { - this.currentProfile = { - profileDescription: { - profileType: options.profileType, - }, - } - } - } - - /** - * Register config update handler - * Overrides parent to track callbacks for test assertions - */ - override onConfigUpdate( - handler: (event: { config: MinimalTestConfig; configLoadInterrupted: boolean }) => void, - ): void { - this.configUpdateCallbacks.push(handler) - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/FakeIDE.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/FakeIDE.ts deleted file mode 100644 index a99e458b97..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/FakeIDE.ts +++ /dev/null @@ -1,150 +0,0 @@ -import type { - DocumentSymbol, - FileStatsMap, - IDE, - IdeInfo, - Location, - Range, - RangeInFile, - SignatureHelp, -} from "../index.js" - -/** - * Options for customizing FakeIDE behavior. - * All options are optional and will use sensible defaults if not provided. - */ -interface FakeIDEOptions { - /** File contents to return for readFile calls. Maps filepath -> content */ - fileContents?: Map - - /** Workspace directories to return */ - workspaceDirs?: string[] - - /** IDE info to return */ - ideInfo?: IdeInfo - - /** Open files to return */ - openFiles?: string[] - - /** Current file to return */ - currentFile?: { - isUntitled: boolean - path: string - contents: string - } - - /** Clipboard content to return */ - clipboardContent?: { text: string; copiedAt: string } - - /** Unique ID to return */ - uniqueId?: string -} - -export class FakeIDE implements IDE { - private options: FakeIDEOptions - - /** Track calls to onDidChangeActiveTextEditor for assertions */ - public activeTextEditorCallbacks: Array<(fileUri: string) => void> = [] - - constructor(options: FakeIDEOptions = {}) { - this.options = options - } - - async getIdeInfo(): Promise { - return ( - this.options.ideInfo ?? { - ideType: "vscode", - } - ) - } - - async getClipboardContent(): Promise<{ text: string; copiedAt: string }> { - return ( - this.options.clipboardContent ?? { - text: "", - copiedAt: new Date().toISOString(), - } - ) - } - - async getUniqueId(): Promise { - return this.options.uniqueId ?? "fake-unique-id" - } - - async getWorkspaceDirs(): Promise { - return this.options.workspaceDirs ?? ["/workspace"] - } - - async fileExists(fileUri: string): Promise { - if (this.options.fileContents) { - return this.options.fileContents.has(fileUri) - } - return false - } - - async writeFile(_path: string, _contents: string): Promise { - // No-op by default, tests can override if needed - } - - async saveFile(_fileUri: string): Promise { - // No-op by default, tests can override if needed - } - - async readFile(fileUri: string): Promise { - if (this.options.fileContents) { - return this.options.fileContents.get(fileUri) ?? "" - } - return "" - } - - async readRangeInFile(_fileUri: string, _range: Range): Promise { - // Simplified implementation - tests can override if needed - return "" - } - - async getOpenFiles(): Promise { - return this.options.openFiles ?? [] - } - - async getCurrentFile(): Promise< - | undefined - | { - isUntitled: boolean - path: string - contents: string - } - > { - return this.options.currentFile - } - - async getFileStats(_files: string[]): Promise { - // Return empty map by default - return {} - } - - // LSP methods - return empty arrays by default - async gotoDefinition(_location: Location): Promise { - return [] - } - - async gotoTypeDefinition(_location: Location): Promise { - return [] - } - - async getSignatureHelp(_location: Location): Promise { - return null - } - - async getReferences(_location: Location): Promise { - return [] - } - - async getDocumentSymbols(_textDocumentIdentifier: string): Promise { - return [] - } - - // Callbacks - onDidChangeActiveTextEditor(callback: (fileUri: string) => void): void { - this.activeTextEditorCallbacks.push(callback) - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/fixtures.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/fixtures.ts index 1f9b83c756..8131afe46d 100644 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/fixtures.ts +++ b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/fixtures.ts @@ -1,9 +1,5 @@ -import { MinimalConfigProvider } from "../autocomplete/MinimalConfig" import { FileSystemIde } from "../util/filesystem" import { TEST_DIR } from "./testDir" export const testIde = new FileSystemIde(TEST_DIR) - -// For autocomplete/nextEdit tests, use MinimalConfigProvider -export const testMinimalConfigProvider = new MinimalConfigProvider() diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/testDir.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/testDir.ts index c0386c7b3c..8873a01d43 100644 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/testDir.ts +++ b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/testDir.ts @@ -1,7 +1,7 @@ import fs from "fs" import os from "os" import path from "path" -import { localPathOrUriToPath, localPathToUri } from "../util/pathToUri" +import { localPathToUri } from "../util/pathToUri" // Want this outside of the git repository so we can change branches in tests const TEST_DIR_PATH = path.join(os.tmpdir(), "testWorkspaceDir") @@ -29,33 +29,3 @@ export function tearDownTestDir() { }) } } - -/* - accepts array of items in 3 formats, e.g. - "index/" creates index directory - "index/index.ts" creates an empty index/index.ts - ["index/index.ts", "hello"] creates index/index.ts with contents "hello" -*/ -export function addToTestDir(pathsOrUris: (string | [string, string])[]) { - // Allow tests to use URIs or local paths - const paths = pathsOrUris.map((val) => { - if (Array.isArray(val)) { - return [localPathOrUriToPath(val[0]), val[1]] - } else { - return localPathOrUriToPath(val) - } - }) - - for (const p of paths) { - const filepath = path.join(TEST_DIR_PATH, Array.isArray(p) ? p[0] : p) - fs.mkdirSync(path.dirname(filepath), { recursive: true }) - - if (Array.isArray(p)) { - fs.writeFileSync(filepath, p[1]) - } else if (p.endsWith("/")) { - fs.mkdirSync(filepath, { recursive: true }) - } else { - fs.writeFileSync(filepath, "") - } - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/vitest.global-setup.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/vitest.global-setup.ts deleted file mode 100644 index 160ea036ac..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/vitest.global-setup.ts +++ /dev/null @@ -1,11 +0,0 @@ -import fs from "fs" -import path from "path" - -// Sets up the GLOBAL directory for testing - equivalent to ~/.continue -// IMPORTANT: the CONTINUE_GLOBAL_DIR environment variable is used in utils/paths for getting all local paths -export default async function () { - process.env.CONTINUE_GLOBAL_DIR = path.join(__dirname, ".continue-test") - if (fs.existsSync(process.env.CONTINUE_GLOBAL_DIR)) { - fs.rmSync(process.env.CONTINUE_GLOBAL_DIR, { recursive: true }) - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/vitest.setup.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/vitest.setup.ts deleted file mode 100644 index 4169ec45ee..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/test/vitest.setup.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { TextDecoder, TextEncoder } from "util" -import { beforeAll } from "vitest" - -beforeAll(async () => { - const g: any = globalThis - - // Node 20+ provides global fetch/Request/Response natively - // Set up TextEncoder/TextDecoder for tests - g.TextEncoder = TextEncoder - g.TextDecoder = TextDecoder -}) diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/CodeRenderer.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/CodeRenderer.ts deleted file mode 100644 index ce6a2fc712..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/CodeRenderer.ts +++ /dev/null @@ -1,34 +0,0 @@ -// Minimal stub for removed codeRenderer functionality -import type { DiffLine, DiffChar } from "../index.js" -export class CodeRenderer { - private static instance: CodeRenderer - - static getInstance(): CodeRenderer { - if (!CodeRenderer.instance) { - CodeRenderer.instance = new CodeRenderer() - } - return CodeRenderer.instance - } - - async setTheme(_theme: string): Promise { - // No-op stub - } - - async getDataUri( - _text: string, - _languageId: string, - _options: { - imageType: "svg" - fontSize: number - fontFamily: string - dimensions: { width: number; height: number } - lineHeight: number - }, - _currLineOffsetFromTop: number, - _newDiffLines: DiffLine[], - _diffChars: DiffChar[], - ): Promise { - // Return empty data URI as stub - return "data:image/svg+xml;base64," - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/TokensBatchingService.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/TokensBatchingService.ts deleted file mode 100644 index 3091f5e564..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/TokensBatchingService.ts +++ /dev/null @@ -1,82 +0,0 @@ -interface TokenBatch { - model: string - provider: string - count: number - totalPromptTokens: number - totalGeneratedTokens: number - lastEventTime: number -} - -export class TokensBatchingService { - private static instance: TokensBatchingService - private batches = new Map() - private flushTimer: NodeJS.Timeout | null = null - - private readonly BATCH_SIZE_LIMIT = 25 - private readonly FLUSH_INTERVAL_MS = 10 * 60 * 1000 // 10 minutes - - static getInstance(): TokensBatchingService { - if (!TokensBatchingService.instance) { - TokensBatchingService.instance = new TokensBatchingService() - } - return TokensBatchingService.instance - } - - private constructor() { - this.startFlushTimer() - } - - addTokens(model: string, provider: string, promptTokens: number, generatedTokens: number): void { - const key = `${provider}:${model}` - - if (!this.batches.has(key)) { - this.batches.set(key, { - model, - provider, - count: 0, - totalPromptTokens: 0, - totalGeneratedTokens: 0, - lastEventTime: Date.now(), - }) - } - - const batch = this.batches.get(key)! - batch.count++ - batch.totalPromptTokens += promptTokens - batch.totalGeneratedTokens += generatedTokens - batch.lastEventTime = Date.now() - - // Flush if batch is full - if (batch.count >= this.BATCH_SIZE_LIMIT) { - this.flushBatch(key, batch) - } - } - - private flushBatch(key: string, batch: TokenBatch): void { - if (batch.count === 0) return - this.batches.delete(key) - } - - private startFlushTimer(): void { - this.flushTimer = setInterval(() => { - this.flushAllBatches() - }, this.FLUSH_INTERVAL_MS) - // Allow the process to exit if this timer is the only thing keeping it alive - // This prevents test hangs and allows graceful shutdown - this.flushTimer.unref() - } - - private flushAllBatches(): void { - for (const [key, batch] of this.batches.entries()) { - this.flushBatch(key, batch) - } - } - - shutdown(): void { - if (this.flushTimer) { - clearInterval(this.flushTimer) - this.flushTimer = null - } - this.flushAllBatches() - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/index.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/index.ts deleted file mode 100644 index 2ceb627a76..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/index.ts +++ /dev/null @@ -1,51 +0,0 @@ -export function dedent(strings: TemplateStringsArray, ...values: unknown[]) { - let raw = "" - for (let i = 0; i < strings.length; i++) { - raw += strings[i] - - // Handle the value if it exists - if (i < values.length) { - let value = String(values[i]) - // If the value contains newlines, we need to adjust the indentation - if (value.includes("\n")) { - // Find the indentation level of the last line in strings[i] - const lines = strings[i].split("\n") - const lastLine = lines[lines.length - 1] - const match = lastLine.match(/(^|\n)([^\S\n]*)$/) - const indent = match ? match[2] : "" - // Add indentation to all lines except the first line of value - let valueLines = value.split("\n") - valueLines = valueLines.map((line, index) => (index === 0 ? line : indent + line)) - value = valueLines.join("\n") - } - raw += value - } - } - - // Now dedent the full string - const result = raw.replace(/^\n/, "").replace(/\n\s*$/, "") - let lines = result.split("\n") - - // Remove leading/trailing blank lines - while (lines.length > 0 && lines[0].trim() === "") { - lines.shift() - } - while (lines.length > 0 && lines[lines.length - 1].trim() === "") { - lines.pop() - } - - // Calculate minimum indentation (excluding empty lines) - const minIndent = lines.reduce((min: number | null, line: string) => { - if (line.trim() === "") return min - const match = line.match(/^(\s*)/) - const indent = match ? match[1].length : 0 - return min === null ? indent : Math.min(min, indent) - }, null) - - if (minIndent !== null && minIndent > 0) { - // Remove the minimum indentation from each line - lines = lines.map((line) => line.slice(minIndent)) - } - - return lines.join("\n") -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/logger.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/logger.ts deleted file mode 100644 index 845ecfc643..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/logger.ts +++ /dev/null @@ -1,35 +0,0 @@ -function getIconFromLevel(level: string): string { - switch (level) { - case "debug": - return "🔵" - case "info": - return "🟢" - case "warn": - return "🟡" - case "error": - return "🔴" - } - return "X" -} - -export class Logger { - constructor( - private filename: string, - private includeFilename = false, - ) {} - #formatMessage(level: string, message: string): string { - return `${getIconFromLevel(level)} ${this.includeFilename ? `[${this.filename}] ` : ""}${message}` - } - debug(message: string, ...args: any[]) { - console.debug(this.#formatMessage("debug", message), ...args) - } - info(message: string, ...args: any[]) { - console.info(this.#formatMessage("info", message), ...args) - } - warn(message: string, ...args: any[]) { - console.info(this.#formatMessage("warn", message), ...args) - } - error(message: string, ...args: any[]) { - console.info(this.#formatMessage("error", message), ...args) - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/merge.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/merge.ts deleted file mode 100644 index 0c36693e78..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/merge.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { ConfigMergeType } from "../index.js" - -// Allow any JSON-compatible value, including complex objects -export function mergeJson>( - first: T, - second: Partial, - mergeBehavior?: ConfigMergeType, - mergeKeys?: { [key: string]: (a: unknown, b: unknown) => boolean }, -): T { - const copyOfFirst = JSON.parse(JSON.stringify(first)) - - try { - for (const key in second) { - const secondValue = second[key] - - if (!(key in copyOfFirst) || mergeBehavior === "overwrite") { - // New value - copyOfFirst[key] = secondValue - continue - } - - const firstValue = copyOfFirst[key] - if (Array.isArray(secondValue) && Array.isArray(firstValue)) { - // Array - if (mergeKeys?.[key]) { - // Merge keys are used to determine whether an item form the second object should override one from the first - const keptFromFirst: unknown[] = [] - firstValue.forEach((item: unknown) => { - if (!secondValue.some((item2: unknown) => mergeKeys[key](item, item2))) { - keptFromFirst.push(item) - } - }) - copyOfFirst[key] = [...keptFromFirst, ...secondValue] - } else { - copyOfFirst[key] = [...firstValue, ...secondValue] - } - } else if ( - typeof secondValue === "object" && - secondValue !== null && - typeof firstValue === "object" && - firstValue !== null - ) { - // Object - copyOfFirst[key] = mergeJson(firstValue, secondValue, mergeBehavior) - } else { - // Other (boolean, number, string) - copyOfFirst[key] = secondValue - } - } - return copyOfFirst - } catch (e) { - console.error("Error merging JSON", e, copyOfFirst, second) - return { - ...copyOfFirst, - ...second, - } - } -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/parameters.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/parameters.ts index e79407947d..18ee68de27 100644 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/parameters.ts +++ b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/parameters.ts @@ -1,4 +1,4 @@ -import { TabAutocompleteOptions } from "../index.js" +import type { TabAutocompleteOptions } from "../index.js" export const DEFAULT_AUTOCOMPLETE_OPTS: TabAutocompleteOptions = { disable: false, @@ -28,5 +28,3 @@ export const DEFAULT_AUTOCOMPLETE_OPTS: TabAutocompleteOptions = { experimental_includeDiff: true, experimental_enableStaticContextualization: false, } - -export const COUNT_COMPLETION_REJECTED_AFTER = 10_000 diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/paths.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/paths.ts deleted file mode 100644 index 18bdcfb2a5..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/paths.ts +++ /dev/null @@ -1,34 +0,0 @@ -import * as fs from "fs" -import * as os from "os" -import * as path from "path" - -const CONTINUE_GLOBAL_DIR = (() => { - const configPath = process.env.CONTINUE_GLOBAL_DIR - if (configPath) { - // Convert relative path to absolute paths based on current working directory - return path.isAbsolute(configPath) ? configPath : path.resolve(process.cwd(), configPath) - } - return path.join(os.homedir(), ".continue") -})() - -function getContinueGlobalPath(): string { - // This is ~/.continue on mac/linux - const continuePath = CONTINUE_GLOBAL_DIR - if (!fs.existsSync(continuePath)) { - fs.mkdirSync(continuePath) - } - return continuePath -} - -function getIndexFolderPath(): string { - const indexPath = path.join(getContinueGlobalPath(), "index") - if (!fs.existsSync(indexPath)) { - fs.mkdirSync(indexPath) - } - return indexPath -} - -export function getConfigJsonPath(): string { - const p = path.join(getContinueGlobalPath(), "config.json") - return p -} diff --git a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/uri.ts b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/uri.ts index f3be4702cd..9901aca6a2 100644 --- a/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/uri.ts +++ b/packages/kilo-vscode/src/services/autocomplete/continuedev/core/util/uri.ts @@ -1,18 +1,3 @@ -/** Converts any OS path to cleaned up URI path segment format with no leading/trailing slashes - e.g. \path\to\folder\ -> path/to/folder - \this\is\afile.ts -> this/is/afile.ts - is/already/clean -> is/already/clean - **/ -function pathToUriPathSegment(path: string) { - let clean = path.replace(/[\\]/g, "/") // backslashes -> forward slashes - clean = clean.replace(/^\//, "") // remove start slash - clean = clean.replace(/\/$/, "") // remove end slash - return clean - .split("/") - .map((part) => encodeURIComponent(part)) - .join("/") -} - function getCleanUriPath(uri: string) { // Handle both URIs and plain paths let path: string @@ -106,15 +91,6 @@ export function getLastNUriRelativePathParts(dirUriCandidates: string[], uri: st return getLastNPathParts(relativePathOrBasename, n) } -export function joinPathsToUri(uri: string, ...pathSegments: string[]) { - let baseUri = uri - if (baseUri.at(-1) !== "/") { - baseUri += "/" - } - const segments = pathSegments.map((segment) => pathToUriPathSegment(segment)) - return new URL(segments.join("/"), baseUri).toString() -} - export function getShortestUniqueRelativeUriPaths( uris: string[], dirUriCandidates: string[], diff --git a/packages/kilo-vscode/src/services/autocomplete/docs/TRANSPLANT-PLAN.md b/packages/kilo-vscode/src/services/autocomplete/docs/TRANSPLANT-PLAN.md deleted file mode 100644 index b5d0c291af..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/docs/TRANSPLANT-PLAN.md +++ /dev/null @@ -1,761 +0,0 @@ -# Transplant Plan: `src/services/autocomplete/` → standalone VS Code extension - -## 1. Executive Summary - -The `src/services/autocomplete/` module provides two autocomplete experiences: - -1. **Inline code completion (ghost text)** via a VS Code [`vscode.InlineCompletionItemProvider`](src/services/autocomplete/docs/investigation-vscode-integration.md:245). -2. **Chat textarea autocomplete** for a webview chat input (optional), driven by webview messages ([`requestChatCompletion`](src/services/autocomplete/docs/investigation-vscode-integration.md:188)). - -To transplant this module into a new VS Code extension, you can copy most of the directory tree as-is, but you must rebuild a small “host shell” around it: - -- A VS Code extension activation/registration layer (commands, providers, status bar, context keys). -- A **settings/state store** that persists the autocomplete settings object. -- An **LLM provider abstraction** that supports streaming **FIM** (fill-in-the-middle) and streaming **chat completions**, plus model metadata and usage/cost reporting. -- A **file ignore / access control abstraction** (to replicate `.kilocodeignore` behavior and prevent sensitive files from being used). -- A **telemetry abstraction** for the events the module emits. -- (Optional) A webview messaging bridge if you want a UI for settings or chat textarea autocomplete. - -This plan defines those interfaces and the minimum VS Code extension scaffolding required, without coupling the new extension to Kilo Code’s current provider implementations. - ---- - -## 2. Interfaces to Implement - -This section defines the abstract interfaces the transplanted module expects. - -> Design principle: the autocomplete module should depend on small, stable interfaces and plain types, not the host extension’s internal classes. - -### 2.1 `IAutocompleteLLMProvider` (LLM Provider Interface) - -**Purpose**: Provide streaming LLM completions for both strategies: - -- **FIM** (prefix + suffix → streamed insertion) -- **Chat completion** (system prompt + user prompt → streamed text and/or structured chunks) - -The module currently routes these via [`AutocompleteModel.generateFimResponse()`](src/services/autocomplete/AutocompleteModel.ts:109) and [`AutocompleteModel.generateResponse()`](src/services/autocomplete/AutocompleteModel.ts:153). - -#### Required API (proposed) - -```ts -export interface AutocompleteUsage { - cost: number - inputTokens: number - outputTokens: number - cacheWriteTokens: number - cacheReadTokens: number -} - -export interface AutocompleteModelInfo { - providerId: string // stable identifier, e.g. openai, anthropic, custom - providerDisplayName?: string // for status bar/UI - modelId: string // stable model identifier - modelDisplayName?: string - supportsFim: boolean -} - -export type ChatStreamChunk = { type: "text"; text: string } | { type: "usage"; usage: AutocompleteUsage } - -export interface IAutocompleteLLMProvider { - /** - * Returns the currently selected model/provider metadata. - * Used for status bar + telemetry context. - */ - getModelInfo(): AutocompleteModelInfo | undefined - - /** - * Whether the selected model supports FIM. - * Used to pick between FIM vs hole-filler strategy. - */ - supportsFim(): boolean - - /** - * Stream a FIM completion. The generator yields raw text chunks. - * Must be abortable. - */ - streamFim(params: { - prefix: string - suffix: string - signal: AbortSignal - requestId?: string - onUsage?: (usage: AutocompleteUsage) => void - }): AsyncGenerator - - /** - * Stream a chat completion. The generator yields text chunks and MAY yield usage. - * Must be abortable. - */ - streamChat(params: { - systemPrompt: string - userPrompt: string - signal: AbortSignal - requestId?: string - }): AsyncGenerator -} -``` - -#### Where it is used - -- Inline completion pipeline triggers either: - - FIM flow via [`AutocompleteModel.generateFimResponse()`](src/services/autocomplete/AutocompleteModel.ts:109), or - - Chat flow via [`AutocompleteModel.generateResponse()`](src/services/autocomplete/AutocompleteModel.ts:153). -- Strategy selection checks [`AutocompleteModel.supportsFim()`](src/services/autocomplete/AutocompleteModel.ts:98). - -#### Notes / constraints - -- **Streaming is mandatory**: the module assumes tokens/chunks arrive incrementally. -- **Abort is mandatory**: VS Code frequently cancels inline completion requests. -- **Usage/cost reporting** is needed for: - - status bar display (session cost), and - - telemetry properties (latency/cost/tokens). - ---- - -### 2.2 `IAutocompleteProfileResolver` (Model selection + credentials) - -**Purpose**: Choose which provider/model to use for autocomplete, and validate credentials. - -In the current code, [`AutocompleteModel.reload()`](src/services/autocomplete/AutocompleteModel.ts:49) scans “profiles” from a settings manager and picks one (including special handling for the `kilocode` provider). - -For a new extension, keep this logic but abstract it. - -#### Required API (proposed) - -```ts -export interface AutocompleteProfile { - id: string - name?: string - type?: "autocomplete" | "general" - providerId: string - modelId: string - // provider-specific credential payload is opaque to autocomplete - credentials: unknown -} - -export interface IAutocompleteProfileResolver { - /** Return all configured profiles the host wants autocomplete to consider. */ - listProfiles(): Promise - - /** Resolve the full profile (including credentials) for a selected profile id. */ - getProfile(id: string): Promise - - /** - * Create an LLM provider instance for the selected profile. - * The autocomplete module treats the provider as opaque beyond the interface. - */ - buildLLMProvider(profile: AutocompleteProfile): Promise -} -``` - -#### Where it is used - -- Provider/model selection and (optional) credential checks happen in [`AutocompleteModel.reload()`](src/services/autocomplete/AutocompleteModel.ts:49). - ---- - -### 2.3 `IAutocompleteSettingsStore` (Settings/State Manager) - -**Purpose**: Persist and retrieve the autocomplete settings object. - -The module currently uses a global state key named `ghostServiceSettings` via `ContextProxy` ([investigation](src/services/autocomplete/docs/investigation-vscode-integration.md:201)). - -#### Settings schema (minimum) - -From [`autocompleteServiceSettingsSchema`](src/services/autocomplete/docs/investigation-vscode-integration.md:216), the settings object is effectively: - -```ts -export interface AutocompleteServiceSettings { - enableAutoTrigger?: boolean - enableSmartInlineTaskKeybinding?: boolean - enableChatAutocomplete?: boolean - provider?: string - model?: string - snoozeUntil?: number - hasKilocodeProfileWithNoBalance?: boolean -} -``` - -The host should own validation (zod or equivalent). The autocomplete module assumes the object exists or is `undefined`. - -#### Required API (proposed) - -```ts -export interface IAutocompleteSettingsStore { - getSettings(): Promise - setSettings(settings: AutocompleteServiceSettings | undefined): Promise - - /** Optional: subscribe for settings changes coming from UI/webview. */ - onDidChangeSettings?(listener: (s: AutocompleteServiceSettings | undefined) => void): { dispose(): void } -} -``` - -#### Where it is used - -- Read settings on startup in [`AutocompleteServiceManager.load()`](src/services/autocomplete/docs/investigation-vscode-integration.md:133). -- Write enriched settings back after load (same section). -- Webview can update settings by message type `ghostServiceSettings` ([`webviewMessageHandler`](src/services/autocomplete/docs/investigation-vscode-integration.md:164)). - ---- - -### 2.4 `IFileIgnoreController` (File Ignore Controller) - -**Purpose**: Decide whether the module may read/use a file path for context. - -In current code this is `RooIgnoreController` (see mock interface in [`RooIgnoreController`](src/core/ignore/__mocks__/RooIgnoreController.ts:3)). It is used for: - -- Filtering/snippet inclusion (only-my-code, ignore patterns) -- Visible editor context filtering - -#### Required API (proposed) - -```ts -export interface IFileIgnoreController { - initialize(): Promise - - /** True if the file can be read/used as context. */ - validateAccess(filePath: string): boolean - - /** Filter a list of candidate paths to those allowed. */ - filterPaths(paths: string[]): string[] - - /** Optional: returns user-facing instructions explaining why access is restricted. */ - getInstructions(): string | undefined - - dispose(): void -} -``` - -#### Where it is used - -- Inline completion gating checks include ignore validation ([architecture summary](src/services/autocomplete/docs/investigation-internal-architecture.md:161)). -- Visible editor context is filtered in [`VisibleCodeTracker`](src/services/autocomplete/docs/investigation-internal-architecture.md:339). - ---- - -### 2.5 `IDE` / `VsCodeIde` (IDE Abstraction) - -**Purpose**: Provide an IDE-agnostic layer used by the embedded Continue.dev fork. - -The continuedev core defines an `IDE` interface in [`continuedev/core/index.d.ts`](src/services/autocomplete/continuedev/core/index.d.ts:376) and ships a VS Code implementation [`VsCodeIde`](src/services/autocomplete/continuedev/core/vscode-test-harness/src/VSCodeIde.ts:1). - -#### Minimum needed methods - -The module’s autocomplete pipeline uses the `IDE` abstraction for: - -- Workspace discovery, reading and writing files -- Open/current file content -- LSP calls (definitions, references, symbols) -- Clipboard access -- Editor-change callback - -The authoritative method list is the `IDE` interface in [`IDE`](src/services/autocomplete/continuedev/core/index.d.ts:376). For transplantation you have two viable options: - -1. **Copy and keep `VsCodeIde`** as-is, and keep the `IDE` interface unchanged. -2. Replace with your own implementation, but it must still satisfy the `IDE` interface contract. - ---- - -### 2.6 `ITelemetryClient` (Telemetry Interface) - -**Purpose**: Record the module’s key product events. - -Current code uses a singleton `TelemetryService` ([`AutocompleteTelemetry`](src/services/autocomplete/classic-auto-complete/AutocompleteTelemetry.ts:57)). To transplant cleanly, replace it with an injected interface. - -#### Events currently captured - -From [`AutocompleteTelemetry`](src/services/autocomplete/classic-auto-complete/AutocompleteTelemetry.ts:105): - -- `AUTOCOMPLETE_SUGGESTION_REQUESTED` -- `AUTOCOMPLETE_SUGGESTION_FILTERED` -- `AUTOCOMPLETE_SUGGESTION_CACHE_HIT` -- `AUTOCOMPLETE_LLM_SUGGESTION_RETURNED` -- `AUTOCOMPLETE_LLM_REQUEST_COMPLETED` -- `AUTOCOMPLETE_LLM_REQUEST_FAILED` -- `AUTOCOMPLETE_ACCEPT_SUGGESTION` -- `AUTOCOMPLETE_UNIQUE_SUGGESTION_SHOWN` - -Additional events mentioned in integration doc: - -- `INLINE_ASSIST_AUTO_TASK` -- `GHOST_SERVICE_DISABLED` - -See telemetry summary in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:357). - -#### Required API (proposed) - -```ts -export type TelemetryEventName = string - -export interface ITelemetryClient { - captureEvent(event: TelemetryEventName, properties?: Record): void -} -``` - -#### Where it is used - -- Inline completion telemetry: [`AutocompleteTelemetry`](src/services/autocomplete/classic-auto-complete/AutocompleteTelemetry.ts:57) -- Service-level disable / code-suggestion telemetry: referenced in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:357) - ---- - -### 2.7 `IWebviewBridge` (Optional) - -**Purpose**: If your new extension has a settings UI and/or chat panel, you need a bridge for messages. - -Current integration uses `ClineProvider` for posting state and receiving messages (see host dependencies list in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:367)). - -Minimum message types used by autocomplete (optional but defined): - -- `ghostServiceSettings` (write settings) -- `snoozeAutocomplete` -- `requestChatCompletion` -- `chatCompletionAccepted` - -If you are not building a webview, you can skip this and omit `chat-autocomplete/` entirely. - ---- - -## 3. VSCode Extension Shell - -This section describes what the new extension must contribute to make the module functional. - -### 3.1 `package.json` - -#### 3.1.1 Activation events - -Current Kilo Code activates broadly: - -- `onLanguage` -- `onStartupFinished` - -See [`src/package.json` snippet in investigation](src/services/autocomplete/docs/investigation-vscode-integration.md:13). - -For a standalone extension you can keep these, or narrow them (e.g. only `onStartupFinished`). - -#### 3.1.2 Commands - -Commands declared in Kilo Code’s `package.json` (some are placeholders): - -- `kilo-code.autocomplete.generateSuggestions` (registered) -- `kilo-code.autocomplete.cancelSuggestions` (declared, not registered) -- `kilo-code.autocomplete.applyCurrentSuggestions` (declared, not registered) -- `kilo-code.autocomplete.applyAllSuggestions` (declared, not registered) -- `kilo-code.autocomplete.goToNextSuggestion` (declared, not registered) -- `kilo-code.autocomplete.goToPreviousSuggestion` (declared, not registered) - -See command table in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:23). - -Commands registered programmatically (must be declared if you want them visible/consistent): - -- `kilo-code.autocomplete.reload` ([`index.ts`](src/services/autocomplete/docs/investigation-vscode-integration.md:117)) -- `kilo-code.autocomplete.codeActionQuickFix` (stub) -- `kilo-code.autocomplete.showIncompatibilityExtensionPopup` -- `kilo-code.autocomplete.disable` -- `kilocode.autocomplete.inline-completion.accepted` (acceptance callback) -- `kilo-code.jetbrains.getInlineCompletions` (JetBrains bridge) - -Recommendation for the new extension: - -- Keep only the commands you truly support. -- If you do not implement “suggested edits” UX, you can drop `apply*` and `goTo*` placeholders. - -#### 3.1.3 Keybindings - -Kilo Code binds: - -- `Escape` → cancel suggestions (but depends on a context key that is never set) -- `Ctrl+L` / `Cmd+L` → generate suggestions (with Copilot conflict split) - -See keybindings in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:47). - -Recommendation: - -- Only contribute keybindings once you implement the associated command end-to-end. -- Ensure any context keys referenced in `when` clauses are actually set. - -#### 3.1.4 Code actions - -If you want the Quick Fix entry point (“Suggested edits”), keep: - -- `contributes.codeActions` declaration -- Register a `CodeActionsProvider` programmatically (as Kilo Code does) - -See code action registration in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:72). - -#### 3.1.5 Configuration contributions - -Kilo Code does **not** contribute `configuration` settings; it stores everything in global state. - -For a new extension you can choose either: - -1. **Global state only** (closest transplant), or -2. **Real VS Code settings** (`contributes.configuration`) and have your settings store bridge to `workspace.getConfiguration`. - -### 3.2 `extension.ts` (activation) - -Minimum activation responsibilities: - -1. Construct/inject dependencies: - - `IAutocompleteSettingsStore` - - `IAutocompleteProfileResolver` / `IAutocompleteLLMProvider` - - `IFileIgnoreController` factory - - `ITelemetryClient` - - (optional) `IWebviewBridge` -2. Initialize ignore controller and settings defaults. -3. Create the autocomplete manager and register VS Code providers. - -The current integration is via `registerAutocompleteProvider(context, provider)` (see activation notes in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:98)). - -Recommendation for transplant structure: - -- Keep `src/services/autocomplete/index.ts` but change it to accept a dependency container instead of a `ClineProvider`. - ---- - -## 4. External Dependencies (npm packages) - -This list is derived from the external import investigation. - -### 4.1 Direct dependencies (autocomplete module) - -- `zod` (JetBrains bridge + continuedev adapters) ([imports list](src/services/autocomplete/docs/investigation-external-imports.md:240)) -- `web-tree-sitter` (continuedev tree-sitter integration) ([imports list](src/services/autocomplete/docs/investigation-external-imports.md:252)) -- `diff` (continuedev diff utilities) ([imports list](src/services/autocomplete/docs/investigation-external-imports.md:266)) -- `fastest-levenshtein` (text similarity) ([imports list](src/services/autocomplete/docs/investigation-external-imports.md:273)) -- `lru-cache` and `quick-lru` (caching) ([imports list](src/services/autocomplete/docs/investigation-external-imports.md:286)) -- `ignore` (gitignore-like matching in continuedev) ([imports list](src/services/autocomplete/docs/investigation-external-imports.md:300)) -- `js-tiktoken` (token counting) ([imports list](src/services/autocomplete/docs/investigation-external-imports.md:280)) -- `uri-js` (URI parsing in `VSCodeIde`) ([imports list](src/services/autocomplete/docs/investigation-external-imports.md:313)) - -### 4.2 LLM SDKs (only if you keep continuedev’s provider adapters) - -The continuedev fork includes many LLM adapters and imports these SDKs: - -- `openai` -- `@anthropic-ai/sdk` -- `@aws-sdk/client-bedrock-runtime` -- `@aws-sdk/credential-providers` -- `google-auth-library` -- `dotenv` - -See list in [`investigation-external-imports.md`](src/services/autocomplete/docs/investigation-external-imports.md:169). - -If the new extension has its own LLM system, consider: - -- either stripping unused continuedev adapters to reduce dependency footprint, or -- leaving them but ensuring they do not bloat the extension bundle (tree-shaking). - -### 4.3 Tree-sitter WASM assets - -You must ship tree-sitter WASM and query assets required by continuedev: - -- `web-tree-sitter` expects parser initialization with a `.wasm` file. -- Language grammars are needed to parse various file types. -- Query files live under [`continuedev/tree-sitter/`](src/services/autocomplete/docs/investigation-internal-architecture.md:143) and should be copied. - -Plan for the new extension: - -- Bundle the wasm assets in your extension `dist` or `media` folder. -- Ensure runtime code can resolve them (using `ExtensionContext.extensionUri`). - ---- - -## 5. Files to Copy As-Is - -The following parts are designed to be largely self-contained (per architecture investigation): - -### 5.1 Continue.dev fork (library) - -Copy the entire directory: - -- [`src/services/autocomplete/continuedev/`](src/services/autocomplete/continuedev/core/index.d.ts:1) - -This includes context gathering, templating, postprocessing, tree-sitter queries, and utility helpers. - -### 5.2 Inline completion implementation - -Copy: - -- `src/services/autocomplete/classic-auto-complete/` (all files) -- `src/services/autocomplete/context/` (visible code tracker) -- `src/services/autocomplete/types.ts` - -### 5.3 VS Code UX helpers - -Copy: - -- `src/services/autocomplete/AutocompleteStatusBar.ts` -- `src/services/autocomplete/AutocompleteCodeActionProvider.ts` - -### 5.4 Optional chat textarea autocomplete - -Copy if you have a webview chat UI: - -- `src/services/autocomplete/chat-autocomplete/` - ---- - -## 6. Files Requiring Modification - -Most modifications are to replace Kilo Code specific imports with the new interfaces. - -### 6.1 `AutocompleteModel.ts` - -File: [`AutocompleteModel`](src/services/autocomplete/AutocompleteModel.ts:26) - -Why: - -- Currently depends on `src/api` handlers and `ProviderSettingsManager`. -- Also depends on webview UI constant `PROVIDERS`. - -Change plan: - -- Replace `ProviderSettingsManager` usage with `IAutocompleteProfileResolver`. -- Replace `buildApiHandler` / `ApiHandler` / `FimHandler` with `IAutocompleteLLMProvider`. -- Replace `PROVIDERS` mapping with `providerDisplayName` from `AutocompleteModelInfo`. -- Keep the public surface area stable where possible: - - `supportsFim()` - - `generateFimResponse()` - - `generateResponse()` - - `getModelName()` / `getProviderDisplayName()` - -### 6.2 `AutocompleteServiceManager.ts` and `index.ts` - -Why: - -- Current glue code expects `ContextProxy`, `ClineProvider`, and `TelemetryService`. - -Change plan: - -- Inject `IAutocompleteSettingsStore`, `ITelemetryClient`, ignore-controller factory. -- Replace any webview posting with an optional `IWebviewBridge`. -- Ensure `setContext` keys are correctly set (notably `kilocode.autocomplete.enableSmartInlineTaskKeybinding`, see [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:145)). - -### 6.3 `types.ts` - -Why: - -- Imports `RooIgnoreController` directly. -- Exposes `AutocompleteContextProvider` referencing `VsCodeIde` and `AutocompleteModel`. - -Change plan: - -- Replace `RooIgnoreController` type with `IFileIgnoreController`. -- Keep `VsCodeIde` dependency if you keep continuedev’s VS Code harness; otherwise replace with your own `IDE` implementation. - -### 6.4 `VisibleCodeTracker.ts` - -Why: - -- Depends on `RooIgnoreController` and path utils. - -Change plan: - -- Replace ignore controller import with `IFileIgnoreController`. -- Replace `toRelativePath` with an equivalent helper in the new extension. - -### 6.5 JetBrains bridge - -File: `src/services/autocomplete/AutocompleteJetbrainsBridge.ts`. - -Why: - -- Uses internal Kilo Code wrapper and webview provider. - -Change plan: - -- If the new extension does not support JetBrains, omit it. -- If you do, implement a dedicated transport layer; keep the bridge logic but replace: - - `ClineProvider` - - `getKiloCodeWrapperProperties` - - any Kilo Code-specific types - ---- - -## 7. i18n Setup - -There are two separate i18n mechanisms involved. - -### 7.1 `package.nls.json` (command titles) - -Kilo Code’s `package.json` command titles reference NLS keys like: - -- `autocomplete.commands.generateSuggestions` -- `autocomplete.commands.cancelSuggestions` -- … - -See full list in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:269). - -Transplant options: - -1. Reuse the same keys and provide at least `package.nls.json` (and optionally localized variants). -2. Rename keys and update command declarations accordingly. - -### 7.2 Runtime `t()` keys (status bar/tooltips/progress) - -Runtime strings are accessed via `t()` from `src/i18n` (Kilo Code). - -Keys used live under namespace `kilocode:autocomplete.*` (see JSON excerpt in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:287)). - -Transplant plan: - -- If the new extension already has i18n, add equivalent keys to its runtime translation system. -- Otherwise, simplest is: - - implement a tiny `t(key, vars?)` function that maps to a JSON bundle. - -Minimum runtime keys needed for feature completeness: - -- status bar labels + tooltips (enabled/disabled/snoozed + provider/model + cost) -- progress titles (analyzing/generating/processing/showing) -- incompatibility popup text (if you keep Copilot conflict logic) - ---- - -## 8. Webview Integration (Optional) - -If you want a settings UI or chat panel, you need: - -### 8.1 State shape - -Expose `ghostServiceSettings` (or renamed equivalent) to the webview state. - -See state passing described in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:154). - -### 8.2 Message types - -Support these messages: - -- `ghostServiceSettings` → validate + persist → trigger reload -- `snoozeAutocomplete` → snooze/unsnooze -- `requestChatCompletion` → call chat textarea autocomplete pipeline → respond `chatCompletionResult` -- `chatCompletionAccepted` → fire telemetry - -The message handling mapping is documented in [`investigation-vscode-integration.md`](src/services/autocomplete/docs/investigation-vscode-integration.md:164). - ---- - -## 9. MockTextDocument - -The JetBrains bridge depends on `MockTextDocument` which is outside the autocomplete directory. - -Copy: - -- [`src/services/mocking/MockTextDocument.ts`](src/services/mocking/MockTextDocument.ts:1) - -If you don’t transplant JetBrains support, you can skip this file. - ---- - -## 10. Migration Checklist - -Use this as the practical step-by-step transplant procedure. - -### 10.1 Prepare new extension - -1. Create a new VS Code extension repo (TypeScript). -2. Ensure build pipeline can bundle wasm assets. -3. Add required dependencies (Section 4). - -### 10.2 Copy files - -1. Copy `src/services/autocomplete/` directory into the new extension. -2. If supporting JetBrains bridge, also copy [`MockTextDocument`](src/services/mocking/MockTextDocument.ts:1). -3. Copy tree-sitter query assets under `continuedev/tree-sitter/`. - -### 10.3 Implement host interfaces - -1. Implement [`IAutocompleteSettingsStore`](src/services/autocomplete/docs/TRANSPLANT-PLAN.md:1) (this document) using either: - - `ExtensionContext.globalState`, or - - `workspace.getConfiguration`. -2. Implement [`IFileIgnoreController`](src/services/autocomplete/docs/TRANSPLANT-PLAN.md:1) (this document). -3. Implement [`ITelemetryClient`](src/services/autocomplete/docs/TRANSPLANT-PLAN.md:1) (this document). -4. Implement [`IAutocompleteProfileResolver`](src/services/autocomplete/docs/TRANSPLANT-PLAN.md:1) (this document). -5. Implement [`IAutocompleteLLMProvider`](src/services/autocomplete/docs/TRANSPLANT-PLAN.md:1) (this document) backed by the new extension’s LLM system. - -### 10.4 Refactor autocomplete glue - -1. Refactor [`AutocompleteModel`](src/services/autocomplete/AutocompleteModel.ts:26) to use the new LLM/provider resolver interfaces. -2. Refactor service initialization ([`AutocompleteServiceManager`](src/services/autocomplete/docs/investigation-vscode-integration.md:125)) to use the new settings/telemetry/ignore interfaces. -3. Refactor `index.ts` entry point to accept dependency injection rather than Kilo Code’s provider. - -### 10.5 Wire VS Code extension shell - -1. Implement activation in `extension.ts`: - - instantiate dependencies - - call `registerAutocompleteProvider(...)` -2. Add `package.json` contributions: - - activation events - - commands - - keybindings (optional) - - codeActions contribution (optional) -3. Ensure context keys used in `when` clauses are set via `vscode.commands.executeCommand("setContext", ...)`. - -### 10.6 Validate runtime behavior - -1. Inline completion: - - confirm cancellation works - - confirm debounce behavior - - confirm suggestions appear only for allowed files -2. Status bar: - - confirm provider/model shown - - confirm cost increments -3. (Optional) Webview: - - confirm settings update triggers reload - - confirm chat textarea completion roundtrip works - -## 11. Clarifications - -These decisions were made before implementation began and override any conflicting guidance in the sections above. - -### 11.1 LLM Provider Architecture - -**Decision: Option A — Via CLI backend (Kilo Gateway).** - -FIM is postponed; only the **holefiller** (chat-completion-based) strategy will be used initially. The LLM provider will route completions through the Kilo Gateway backend. The only supported model for now is `mistralai/codestral-2508`. - -### 11.2 Provider & Model Selection - -**Decision: Hardcoded to Kilo Gateway + `mistralai/codestral-2508`.** - -No profile resolver is needed in phase 1. The provider and model are fixed. - -### 11.3 Feature Scope - -| Feature | Decision | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| JetBrains bridge | **Exclude permanently** — delete `AutocompleteJetbrainsBridge.ts` and its tests. This will never be implemented this way. | -| Chat textarea autocomplete | **Include** | -| Code actions | **Include** | -| Continuedev LLM adapters | **Strip to minimum** — remove all adapters not needed for the Kilo Gateway / holefiller path. The module uses `AutocompleteModel`, not the continuedev adapters directly, so most can be removed. | - -### 11.4 Settings Storage - -**Decision: VS Code settings** via `contributes.configuration` in `package.json`. - -### 11.5 Telemetry - -**Decision: Console logging only.** The extension has no telemetry system yet. Keep console logs but do not send actual telemetry events. Implement a no-op `ITelemetryClient`. - -### 11.6 i18n - -**Decision: Wire into `@kilocode/kilo-i18n`.** Use the translations from `src/services/autocomplete/i18n/`. Keys may differ from what `kilo-i18n` uses, so mapping is required. Discard translations for locales not present in `kilo-i18n`. - -### 11.7 File Ignore / Access Control - -**Decision: Dummy `RooIgnoreController`** that allows everything except `.env` files (and similar sensitive defaults). Include a `TODO` comment for proper implementation later. - -### 11.8 Command Prefix - -**Decision: Use `kilo-code.new.autocomplete.*`** to be consistent with the existing extension naming convention. - -### 11.9 NPM Dependencies - -**Decision: Strip unused continuedev code first**, then install only what is actually needed. - -### 11.10 Tree-Sitter WASM Bundling - -**Decision: Bundle in `dist/`** via esbuild copy plugin. - -### 11.11 Singleton vs Dependency Injection - -**Decision: Deferred** — will be determined during implementation based on what works best with the existing `KiloConnectionService` / `KiloProvider` architecture. diff --git a/packages/kilo-vscode/src/services/autocomplete/docs/investigation-external-imports.md b/packages/kilo-vscode/src/services/autocomplete/docs/investigation-external-imports.md deleted file mode 100644 index 56df03c269..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/docs/investigation-external-imports.md +++ /dev/null @@ -1,409 +0,0 @@ -# External Imports Investigation — `src/services/autocomplete/` - -> Generated: 2026-02-12 -> -> This document catalogs **every import** in the autocomplete module that references code -> **outside** of `src/services/autocomplete/`. Test files (`*.test.ts`, `*.spec.ts`, `__tests__/`) -> are excluded. - ---- - -## Table of Contents - -1. [Summary](#summary) -2. [VSCode API](#1-vscode-api) -3. [Internal Project Imports (non-continuedev)](#2-internal-project-imports-non-continuedev-files) -4. [Internal Project Imports (continuedev → outside autocomplete)](#3-internal-project-imports-continuedev-files-reaching-outside-autocomplete) -5. [Webview UI Imports](#4-webview-ui-imports) -6. [Monorepo Packages (`@roo-code/*`)](#5-monorepo-packages-roo-code) -7. [Third-Party npm Packages](#6-third-party-npm-packages) -8. [Node.js Built-in Modules](#7-nodejs-built-in-modules) - ---- - -## Summary - -| Category | Unique Modules | Total Import Sites | -| ---------------------------------------- | -------------------------------------------- | ------------------ | -| VSCode API | 1 (`vscode`) | 14 | -| Internal project (non-continuedev) | 12 distinct targets | 27 | -| Internal project (continuedev → outside) | 3 distinct targets | 3 | -| Webview UI | 1 (`PROVIDERS`) | 2 | -| Monorepo packages | 2 (`@roo-code/types`, `@roo-code/telemetry`) | 9 | -| Third-party npm | 16 distinct packages | 60+ | -| Node.js built-ins | 8 modules | 20+ | - ---- - -## 1. VSCode API - -All files import `* as vscode from "vscode"`. - -| Source File | Symbols | -| --------------------------------------------------------------------------------------- | ------------- | -| `AutocompleteCodeActionProvider.ts` | `* as vscode` | -| `AutocompleteJetbrainsBridge.ts` | `* as vscode` | -| `AutocompleteServiceManager.ts` | `* as vscode` | -| `AutocompleteStatusBar.ts` | `* as vscode` | -| `index.ts` | `* as vscode` | -| `types.ts` | `* as vscode` | -| `chat-autocomplete/ChatTextAreaAutocomplete.ts` | `* as vscode` | -| `classic-auto-complete/AutocompleteInlineCompletionProvider.ts` | `* as vscode` | -| `classic-auto-complete/getProcessedSnippets.ts` | `* as vscode` | -| `context/VisibleCodeTracker.ts` | `* as vscode` | -| `continuedev/core/vscode-test-harness/src/VSCodeIde.ts` | `* as vscode` | -| `continuedev/core/vscode-test-harness/src/autocomplete/lsp.ts` | `* as vscode` | -| `continuedev/core/vscode-test-harness/src/autocomplete/recentlyEdited.ts` | `* as vscode` | -| `continuedev/core/vscode-test-harness/src/autocomplete/RecentlyVisitedRangesService.ts` | `* as vscode` | - ---- - -## 2. Internal Project Imports (non-continuedev files) - -These are imports from files **outside** the `src/services/autocomplete/` directory tree, -originating from the "Kilo Code" layer (not the continuedev fork). - -### `src/core/` imports - -| Source File | Module Path | Symbols | -| --------------------------------------------------------------- | ---------------------------------------------- | ---------------------------------- | -| `AutocompleteJetbrainsBridge.ts` | `../../core/webview/ClineProvider` | `{ ClineProvider }` | -| `AutocompleteJetbrainsBridge.ts` | `../../core/kilocode/wrapper` | `{ getKiloCodeWrapperProperties }` | -| `AutocompleteModel.ts` | `../../core/config/ProviderSettingsManager` | `{ ProviderSettingsManager }` | -| `AutocompleteServiceManager.ts` | `../../core/config/ContextProxy` | `{ ContextProxy }` | -| `AutocompleteServiceManager.ts` | `../../core/webview/ClineProvider` | `{ ClineProvider }` | -| `index.ts` | `../../core/webview/ClineProvider` | `{ ClineProvider }` | -| `types.ts` | `../../core/ignore/RooIgnoreController` | `{ RooIgnoreController }` | -| `chat-autocomplete/ChatTextAreaAutocomplete.ts` | `../../../core/config/ProviderSettingsManager` | `{ ProviderSettingsManager }` | -| `chat-autocomplete/handleChatCompletionRequest.ts` | `../../../core/webview/ClineProvider` | `{ ClineProvider }` | -| `classic-auto-complete/AutocompleteInlineCompletionProvider.ts` | `../../../core/ignore/RooIgnoreController` | `{ RooIgnoreController }` | -| `classic-auto-complete/AutocompleteInlineCompletionProvider.ts` | `../../../core/webview/ClineProvider` | `{ ClineProvider }` | -| `classic-auto-complete/getProcessedSnippets.ts` | `../../../core/ignore/RooIgnoreController` | `{ RooIgnoreController }` | -| `context/VisibleCodeTracker.ts` | `../../../core/ignore/RooIgnoreController` | `type { RooIgnoreController }` | - -### `src/api/` imports - -| Source File | Module Path | Symbols | -| ------------------------------------- | ----------------------------------------- | --------------------------------------------- | -| `AutocompleteModel.ts` | `../../api` | `{ ApiHandler, buildApiHandler, FimHandler }` | -| `AutocompleteModel.ts` | `../../api/providers` | `{ OpenRouterHandler }` | -| `AutocompleteModel.ts` | `../../api/providers/openrouter` | `{ CompletionUsage }` | -| `AutocompleteModel.ts` | `../../api/transform/stream` | `{ ApiStreamChunk }` | -| `AutocompleteModel.ts` | `../../api/providers/kilocode-openrouter` | `{ KilocodeOpenrouterHandler }` | -| `classic-auto-complete/HoleFiller.ts` | `../../../api/transform/stream` | `{ ApiStreamChunk }` | - -### `src/i18n` imports - -| Source File | Module Path | Symbols | -| ----------------------------------- | ------------ | ------- | -| `AutocompleteCodeActionProvider.ts` | `../../i18n` | `{ t }` | -| `AutocompleteServiceManager.ts` | `../../i18n` | `{ t }` | -| `AutocompleteStatusBar.ts` | `../../i18n` | `{ t }` | - -### `src/shared/` imports - -| Source File | Module Path | Symbols | -| --------------------------------------------------- | -------------------------------- | -------------------- | -| `chat-autocomplete/handleChatCompletionAccepted.ts` | `../../../shared/WebviewMessage` | `{ WebviewMessage }` | -| `chat-autocomplete/handleChatCompletionRequest.ts` | `../../../shared/WebviewMessage` | `{ WebviewMessage }` | - -### `src/utils/` imports - -| Source File | Module Path | Symbols | -| ------------------------------- | --------------------- | -------------------- | -| `context/VisibleCodeTracker.ts` | `../../../utils/path` | `{ toRelativePath }` | - -### `src/services/mocking/` imports - -| Source File | Module Path | Symbols | -| -------------------------------- | ----------------------------- | ---------------------- | -| `AutocompleteJetbrainsBridge.ts` | `../mocking/MockTextDocument` | `{ MockTextDocument }` | - ---- - -## 3. Internal Project Imports (continuedev files reaching outside autocomplete) - -These imports originate from `continuedev/` files but reach out of the autocomplete -directory tree entirely (via deeply nested `../../../../../../` paths). - -| Source File | Module Path | Symbols | -| --------------------------------------- | ------------------------------------------------------- | ------------------------ | -| `continuedev/core/llm/llms/KiloCode.ts` | `../../../../../../shared/kilocode/headers` | `{ X_KILOCODE_VERSION }` | -| `continuedev/core/llm/llms/KiloCode.ts` | `../../../../../../shared/package` | `{ Package }` | -| `continuedev/core/llm/llms/KiloCode.ts` | `../../../../../../api/providers/kilocode/IFimProvider` | `{ IFimProvider }` | - ---- - -## 4. Webview UI Imports - -| Source File | Module Path | Symbols | -| -------------------------- | ------------------------------------------------------- | --------------- | -| `AutocompleteModel.ts` | `../../../webview-ui/src/components/settings/constants` | `{ PROVIDERS }` | -| `AutocompleteStatusBar.ts` | `../../../webview-ui/src/components/settings/constants` | `{ PROVIDERS }` | - ---- - -## 5. Monorepo Packages (`@roo-code/*`) - -### `@roo-code/types` - -| Source File | Symbols | -| --------------------------------------------------------------- | ------------------------------------------------------------------------------------ | -| `AutocompleteModel.ts` | `{ modelIdKeysByProvider, ProviderName }` | -| `AutocompleteServiceManager.ts` | `{ AutocompleteServiceSettings, TelemetryEventName }` | -| `AutocompleteStatusBar.ts` | `{ AUTOCOMPLETE_PROVIDER_MODELS, ProviderName }` | -| `classic-auto-complete/AutocompleteInlineCompletionProvider.ts` | `type { AutocompleteServiceSettings }` | -| `classic-auto-complete/AutocompleteTelemetry.ts` | `{ TelemetryEventName }` | -| `utils/kilocode-utils.ts` | `{ getKiloBaseUriFromToken, AUTOCOMPLETE_PROVIDER_MODELS, AutocompleteProviderKey }` | -| `continuedev/core/llm/llms/KiloCode.ts` | `{ getKiloUrlFromToken }` | - -### `@roo-code/telemetry` - -| Source File | Symbols | -| ------------------------------------------------ | ---------------------- | -| `AutocompleteServiceManager.ts` | `{ TelemetryService }` | -| `classic-auto-complete/AutocompleteTelemetry.ts` | `{ TelemetryService }` | - ---- - -## 6. Third-Party npm Packages - -### `openai` / `openai/*` (OpenAI SDK) - -Used extensively in `continuedev/core/llm/` for LLM API adapters. - -| Source File | Module Path | Symbols | -| ------------------------------------------------------------------ | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | -| `continuedev/core/llm/index.ts` | `openai/resources/index` | `{ ChatCompletionCreateParams }` | -| `continuedev/core/llm/llms/OpenAI.ts` | `openai/resources/index` | `{ ChatCompletionCreateParams, ChatCompletionMessageParam }` | -| `continuedev/core/llm/llms/OpenRouter.ts` | `openai/resources/index` | `{ ChatCompletionCreateParams }` | -| `continuedev/core/llm/openaiTypeConverters.ts` | `openai/resources/index` | `{ ChatCompletion, ChatCompletionChunk, ChatCompletionCreateParams, ChatCompletionMessageParam, CompletionCreateParams }` | -| `continuedev/core/llm/openai-adapters/apis/Anthropic.ts` | `openai/index` | `{ OpenAI }` | -| `continuedev/core/llm/openai-adapters/apis/Anthropic.ts` | `openai/resources/index` | `{ ChatCompletionChunk, ChatCompletionCreateParams, ... }` | -| `continuedev/core/llm/openai-adapters/apis/Anthropic.ts` | `openai/resources/index.js` | `{ ChatCompletionCreateParams }` | -| `continuedev/core/llm/openai-adapters/apis/AnthropicUtils.ts` | `openai/resources` | `{ ChatCompletionTool, ChatCompletionToolChoiceOption }` | -| `continuedev/core/llm/openai-adapters/apis/Azure.ts` | `openai/index` | `{ OpenAI }` | -| `continuedev/core/llm/openai-adapters/apis/Azure.ts` | `openai/resources/index` | `{ ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/base.ts` | `openai/resources/index` | `{ ChatCompletion, ChatCompletionChunk, ChatCompletionCreateParams, ... }` | -| `continuedev/core/llm/openai-adapters/apis/Bedrock.ts` | `openai/index` | `{ OpenAI }` | -| `continuedev/core/llm/openai-adapters/apis/Bedrock.ts` | `openai/resources/index` | `{ ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/Cohere.ts` | `openai/index` | `{ OpenAI }` | -| `continuedev/core/llm/openai-adapters/apis/Cohere.ts` | `openai/resources/index` | `{ ChatCompletion, ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/CometAPI.ts` | `openai/resources/index` | `{ ChatCompletion, ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/ContinueProxy.ts` | `openai/resources/index` | `{ ChatCompletion, ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/DeepSeek.ts` | `openai/resources/index` | `{ ChatCompletionChunk, Model }` | -| `continuedev/core/llm/openai-adapters/apis/Gemini.ts` | `openai/index` | `{ OpenAI }` | -| `continuedev/core/llm/openai-adapters/apis/Gemini.ts` | `openai/resources/index` | `{ ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/Inception.ts` | `openai/resources/index` | `{ ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/Jina.ts` | `openai/resources/index` | `{ ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/LlamaStack.ts` | `openai/resources/index` | `{ ChatCompletionChunk }` | -| `continuedev/core/llm/openai-adapters/apis/Mock.ts` | `openai/resources/index` | `{ ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/Moonshot.ts` | `openai/resources/index` | `{ ChatCompletionChunk, Model }` | -| `continuedev/core/llm/openai-adapters/apis/OpenAI.ts` | `openai/index` | `{ OpenAI }` | -| `continuedev/core/llm/openai-adapters/apis/OpenAI.ts` | `openai/resources/index` | `{ ChatCompletion, ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/OpenRouter.ts` | `openai/resources/index` | `{ ChatCompletionCreateParams }` | -| `continuedev/core/llm/openai-adapters/apis/OpenRouterCaching.ts` | `openai/resources/index` | `{ ChatCompletionCreateParams, ChatCompletionMessageParam }` | -| `continuedev/core/llm/openai-adapters/apis/Relace.ts` | `openai/resources/completions.mjs` | `{ Completion, CompletionUsage }` | -| `continuedev/core/llm/openai-adapters/apis/Relace.ts` | `openai/resources/index.mjs` | `{ ChatCompletion, ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/Relace.ts` | `openai/resources/models.mjs` | `{ Model }` | -| `continuedev/core/llm/openai-adapters/apis/VertexAI.ts` | `openai/resources/index` | `{ ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/WatsonX.ts` | `openai/index` | `{ OpenAI }` | -| `continuedev/core/llm/openai-adapters/apis/WatsonX.ts` | `openai/resources/index` | `{ ChatCompletionChunk, ... }` | -| `continuedev/core/llm/openai-adapters/apis/WatsonX.ts` | `openai/resources/index.js` | `{ ChatCompletionCreateParams }` | -| `continuedev/core/llm/openai-adapters/util.ts` | `openai/resources/index` | `{ ChatCompletionChunk, CompletionUsage }` | -| `continuedev/core/llm/openai-adapters/util.ts` | `openai/resources/index.js` | `{ ChatCompletion }` | -| `continuedev/core/llm/openai-adapters/util/emptyChatCompletion.ts` | `openai/resources/index` | `{ ChatCompletion }` | -| `continuedev/core/llm/openai-adapters/util/gemini-types.ts` | `openai/resources/index.mjs` | `{ ChatCompletionTool }` | - -### `@anthropic-ai/sdk` - -| Source File | Module Path | Symbols | -| ------------------------------------------------------------------------- | ----------------------------- | ----------------------------------------------------------------------------------------------------------------------- | -| `continuedev/core/llm/openai-adapters/apis/Anthropic.ts` | `@anthropic-ai/sdk/resources` | `{ ContentBlock, ContentBlockDelta, MessageDelta, MessageStartEvent, RawContentBlockStartEvent, RawMessageDeltaEvent }` | -| `continuedev/core/llm/openai-adapters/apis/AnthropicCachingStrategies.ts` | `@anthropic-ai/sdk/resources` | `{ MessageCreateParams }` | -| `continuedev/core/llm/openai-adapters/apis/AnthropicUtils.ts` | `@anthropic-ai/sdk/resources` | `{ Base64ImageSource, MessageParam, Tool, ToolChoice }` | -| `continuedev/core/llm/openai-adapters/apis/OpenRouterCaching.ts` | `@anthropic-ai/sdk/resources` | `{ ContentBlockParam, MessageCreateParams, MessageParam }` | - -### `@aws-sdk/*` - -| Source File | Module Path | Symbols | -| ------------------------------------------------------ | --------------------------------- | -------------------------------------------------------------------------------------------- | -| `continuedev/core/llm/openai-adapters/apis/Bedrock.ts` | `@aws-sdk/client-bedrock-runtime` | `{ BedrockRuntimeClient, ConverseStreamCommand, InvokeModelWithResponseStreamCommand, ... }` | -| `continuedev/core/llm/openai-adapters/apis/Bedrock.ts` | `@aws-sdk/credential-providers` | `{ fromNodeProviderChain }` | - -### `google-auth-library` - -| Source File | Module Path | Symbols | -| ------------------------------------------------------- | --------------------- | --------------------------------------- | -| `continuedev/core/llm/openai-adapters/apis/VertexAI.ts` | `google-auth-library` | `{ AuthClient, GoogleAuth, JWT, auth }` | - -### `zod` - -| Source File | Module Path | Symbols | -| ------------------------------------------------------------ | ----------- | -------- | -| `AutocompleteJetbrainsBridge.ts` | `zod` | `{ z }` | -| `continuedev/core/llm/openai-adapters/apis/Azure.ts` | `zod` | `{ z }` | -| `continuedev/core/llm/openai-adapters/apis/ContinueProxy.ts` | `zod` | `{ z }` | -| `continuedev/core/llm/openai-adapters/apis/OpenAI.ts` | `zod` | `{ z }` | -| `continuedev/core/llm/openai-adapters/apis/Relace.ts` | `zod` | `{ z }` | -| `continuedev/core/llm/openai-adapters/index.ts` | `zod` | `{ z }` | -| `continuedev/core/llm/openai-adapters/types.ts` | `zod` | `* as z` | - -### `web-tree-sitter` - -| Source File | Module Path | Symbols | -| ----------------------------------------------------------------------------------- | ----------------- | ---------------------------------------------------- | -| `continuedev/core/index.d.ts` | `web-tree-sitter` | `Parser` (default) | -| `continuedev/core/autocomplete/util/ast.ts` | `web-tree-sitter` | `{ Node as SyntaxNode, Tree }` | -| `continuedev/core/autocomplete/context/root-path-context/RootPathContextService.ts` | `web-tree-sitter` | `{ Node as SyntaxNode, Query, Point }` | -| `continuedev/core/autocomplete/context/root-path-context/testUtils.ts` | `web-tree-sitter` | `Parser` (default) | -| `continuedev/core/autocomplete/context/static-context/StaticContextService.ts` | `web-tree-sitter` | `{ Node as SyntaxNode }` | -| `continuedev/core/autocomplete/context/static-context/tree-sitter-utils.ts` | `web-tree-sitter` | `{ Node as SyntaxNode, QueryMatch, Tree }` | -| `continuedev/core/autocomplete/context/static-context/types.ts` | `web-tree-sitter` | `{ Tree }` | -| `continuedev/core/util/treeSitter.ts` | `web-tree-sitter` | `type { Language, Node as SyntaxNode, Query, Tree }` | -| `continuedev/core/vscode-test-harness/src/autocomplete/lsp.ts` | `web-tree-sitter` | `type { Node as SyntaxNode }` | - -### `diff` - -| Source File | Module Path | Symbols | -| ------------------------------------------------------------------- | ----------- | --------------------------------------- | -| `continuedev/core/autocomplete/util/processSingleLineCompletion.ts` | `diff` | `* as Diff` | -| `continuedev/core/diff/myers.ts` | `diff` | `{ diffChars, diffLines, type Change }` | - -### `fastest-levenshtein` - -| Source File | Module Path | Symbols | -| ------------------------------------------------------ | --------------------- | -------------- | -| `continuedev/core/autocomplete/util/textSimilarity.ts` | `fastest-levenshtein` | `{ distance }` | -| `continuedev/core/diff/util.ts` | `fastest-levenshtein` | `{ distance }` | - -### `js-tiktoken` - -| Source File | Module Path | Symbols | -| ------------------------------------- | ------------- | ----------------------------------------------------- | -| `continuedev/core/llm/countTokens.ts` | `js-tiktoken` | `{ Tiktoken, encodingForModel as _encodingForModel }` | - -### `lru-cache` - -| Source File | Module Path | Symbols | -| --------------------------------------------------------------------------------------- | ----------- | -------------- | -| `continuedev/core/autocomplete/util/AutocompleteLruCacheInMem.ts` | `lru-cache` | `{ LRUCache }` | -| `continuedev/core/autocomplete/context/root-path-context/RootPathContextService.ts` | `lru-cache` | `{ LRUCache }` | -| `continuedev/core/vscode-test-harness/src/autocomplete/RecentlyVisitedRangesService.ts` | `lru-cache` | `{ LRUCache }` | - -### `quick-lru` - -| Source File | Module Path | Symbols | -| ----------------------------------------------------------- | ----------- | -------------------- | -| `continuedev/core/autocomplete/util/openedFilesLruCache.ts` | `quick-lru` | `QuickLRU` (default) | - -### `ignore` - -| Source File | Module Path | Symbols | -| ----------------------------------------------------- | ----------- | ------------------ | -| `continuedev/core/autocomplete/prefiltering/index.ts` | `ignore` | `ignore` (default) | -| `continuedev/core/indexing/ignore.ts` | `ignore` | `ignore` (default) | - -### `dotenv` - -| Source File | Module Path | Symbols | -| ----------------------------------------------- | ----------- | ------------------ | -| `continuedev/core/llm/openai-adapters/index.ts` | `dotenv` | `dotenv` (default) | - -### `uri-js` - -| Source File | Module Path | Symbols | -| ------------------------------------------------------- | ----------- | ---------- | -| `continuedev/core/vscode-test-harness/src/VSCodeIde.ts` | `uri-js` | `* as URI` | - -### `vitest` - -| Source File | Module Path | Symbols | -| ---------------------------------------------------------------------- | ----------- | ---------------- | -| `continuedev/core/autocomplete/context/root-path-context/testUtils.ts` | `vitest` | `{ expect, vi }` | -| `continuedev/core/autocomplete/filtering/test/util.ts` | `vitest` | `{ expect }` | -| `continuedev/core/test/vitest.setup.ts` | `vitest` | `{ beforeAll }` | - ---- - -## 7. Node.js Built-in Modules - -| Source File | Module | Symbols | -| ----------------------------------------------------------------------------------- | ------------- | ---------------------------------- | -| `AutocompleteServiceManager.ts` | `crypto` | `crypto` (default) | -| `continuedev/core/autocomplete/util/AutocompleteDebouncer.ts` | `node:crypto` | `{ randomUUID }` | -| `continuedev/core/llm/openai-adapters/apis/Bedrock.ts` | `node:crypto` | `{ randomUUID }` | -| `continuedev/core/autocomplete/context/root-path-context/RootPathContextService.ts` | `crypto` | `{ createHash }` | -| `continuedev/core/autocomplete/context/root-path-context/testUtils.ts` | `fs` | `fs` (default) | -| `continuedev/core/autocomplete/context/root-path-context/testUtils.ts` | `path` | `path` (default) | -| `continuedev/core/autocomplete/context/root-path-context/testUtils.ts` | `node:url` | `{ fileURLToPath }` | -| `continuedev/core/autocomplete/context/static-context/StaticContextService.ts` | `fs/promises` | `* as fs` | -| `continuedev/core/autocomplete/context/static-context/StaticContextService.ts` | `path` | `path` (default) | -| `continuedev/core/autocomplete/context/static-context/StaticContextService.ts` | `url` | `{ pathToFileURL }` | -| `continuedev/core/autocomplete/context/static-context/tree-sitter-utils.ts` | `fs/promises` | `* as fs` | -| `continuedev/core/indexing/ignore.ts` | `path` | `path` (default) | -| `continuedev/core/indexing/ignore.ts` | `url` | `{ fileURLToPath }` | -| `continuedev/core/test/testDir.ts` | `fs` | `fs` (default) | -| `continuedev/core/test/testDir.ts` | `os` | `os` (default) | -| `continuedev/core/test/testDir.ts` | `path` | `path` (default) | -| `continuedev/core/test/vitest.global-setup.ts` | `fs` | `fs` (default) | -| `continuedev/core/test/vitest.global-setup.ts` | `path` | `path` (default) | -| `continuedev/core/test/vitest.setup.ts` | `util` | `{ TextDecoder, TextEncoder }` | -| `continuedev/core/util/filesystem.ts` | `node:fs` | `* as fs` | -| `continuedev/core/util/filesystem.ts` | `node:url` | `{ fileURLToPath }` | -| `continuedev/core/util/paths.ts` | `fs` | `* as fs` | -| `continuedev/core/util/paths.ts` | `os` | `* as os` | -| `continuedev/core/util/paths.ts` | `path` | `* as path` | -| `continuedev/core/util/pathToUri.ts` | `url` | `{ fileURLToPath, pathToFileURL }` | -| `continuedev/core/util/treeSitter.ts` | `node:fs` | `fs` (default) | -| `continuedev/core/util/treeSitter.ts` | `path` | `path` (default) | - ---- - -## Appendix: Unique External Dependency List - -### npm packages (non-Node.js built-in) - -``` -@anthropic-ai/sdk -@aws-sdk/client-bedrock-runtime -@aws-sdk/credential-providers -@roo-code/telemetry -@roo-code/types -diff -dotenv -fastest-levenshtein -google-auth-library -ignore -js-tiktoken -lru-cache -openai -quick-lru -uri-js -vitest -web-tree-sitter -zod -``` - -### Internal project modules imported (outside autocomplete) - -``` -src/api (../../api) -src/api/providers (../../api/providers) -src/api/providers/kilocode-openrouter (../../api/providers/kilocode-openrouter) -src/api/providers/kilocode/IFimProvider (via continuedev KiloCode.ts) -src/api/providers/openrouter (../../api/providers/openrouter) -src/api/transform/stream (../../api/transform/stream) -src/core/config/ContextProxy (../../core/config/ContextProxy) -src/core/config/ProviderSettingsManager (../../core/config/ProviderSettingsManager) -src/core/ignore/RooIgnoreController (../../core/ignore/RooIgnoreController) -src/core/kilocode/wrapper (../../core/kilocode/wrapper) -src/core/webview/ClineProvider (../../core/webview/ClineProvider) -src/i18n (../../i18n) -src/services/mocking/MockTextDocument (../mocking/MockTextDocument) -src/shared/WebviewMessage (../../shared/WebviewMessage) -src/shared/kilocode/headers (via continuedev KiloCode.ts) -src/shared/package (via continuedev KiloCode.ts) -src/utils/path (../../utils/path) -webview-ui/src/components/settings/constants -``` diff --git a/packages/kilo-vscode/src/services/autocomplete/docs/investigation-internal-architecture.md b/packages/kilo-vscode/src/services/autocomplete/docs/investigation-internal-architecture.md deleted file mode 100644 index 7802ef6568..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/docs/investigation-internal-architecture.md +++ /dev/null @@ -1,456 +0,0 @@ -# Internal Architecture of the Autocomplete Module - -> Investigation date: 2026-02-12 -> Scope: `src/services/autocomplete/` — all subdirectories and root-level files - ---- - -## High-Level Architecture - -``` -┌──────────────────────────────────────────────────────────────────────┐ -│ VS Code Extension Host │ -│ │ -│ index.ts ─► registerAutocompleteProvider() │ -│ │ │ -│ ▼ │ -│ ┌──────────────────────────────────────────────────────────────┐ │ -│ │ AutocompleteServiceManager (singleton orchestrator) │ │ -│ │ • settings, status bar, cost tracking, snooze, commands │ │ -│ │ • owns AutocompleteModel + two completion strategies │ │ -│ └────┬─────────────────────┬──────────────────────┬────────────┘ │ -│ │ │ │ │ -│ ▼ ▼ ▼ │ -│ ┌──────────┐ ┌─────────────────┐ ┌──────────────────────┐ │ -│ │ Autocomplete│ │ Classic Auto- │ │ Chat Text Area │ │ -│ │ Model │ │ Complete │ │ Autocomplete │ │ -│ │ (LLM layer) │ │ (inline ghosts) │ │ (webview chat) │ │ -│ └──────┬───┘ └──────┬──────────┘ └───────┬──────────────┘ │ -│ │ │ │ │ -│ │ ▼ ▼ │ -│ │ ┌──────────────────────┐ ┌────────────────────┐ │ -│ │ │ continuedev/ library │ │ context/ │ │ -│ │ │ (forked Continue.dev)│ │ VisibleCodeTracker │ │ -│ │ │ │ └────────────────────┘ │ -│ │ │ • context retrieval │ │ -│ │ │ • snippet gathering │ ┌────────────────────┐ │ -│ │ │ • prompt templating │ │ utils/ │ │ -│ │ │ • postprocessing │ │ kilocode-utils.ts │ │ -│ │ │ • tree-sitter queries│ └────────────────────┘ │ -│ │ │ • LLM providers │ │ -│ │ └──────────────────────┘ │ -│ │ │ -│ ▼ │ -│ ┌──────────────────────────────────────────────────┐ │ -│ │ External: src/api/ (ApiHandler, FimHandler, │ │ -│ │ buildApiHandler, OpenRouterHandler, etc.) │ │ -│ └──────────────────────────────────────────────────┘ │ -└──────────────────────────────────────────────────────────────────────┘ -``` - ---- - -## 1. Root-Level Files - -### [`index.ts`](../index.ts) - -Entry point. Registers the `AutocompleteServiceManager`, JetBrains bridge, and all VS Code commands (`reload`, `generateSuggestions`, `disable`, `showIncompatibilityExtensionPopup`, code actions). - -### [`AutocompleteServiceManager.ts`](../AutocompleteServiceManager.ts) - -**Singleton orchestrator** for the entire module. - -- Owns an [`AutocompleteModel`](../AutocompleteModel.ts) (LLM abstraction) and an [`AutocompleteInlineCompletionProvider`](../classic-auto-complete/AutocompleteInlineCompletionProvider.ts). -- Manages lifecycle: loads settings from `ContextProxy`, registers/unregisters the VS Code inline completion provider, handles snooze timers. -- Delegates manual "code suggestion" to the inline completion provider. -- Tracks session cost and completion count; forwards them to the status bar. - -**External dependencies:** - -- `vscode` API -- `@roo-code/types` (`AutocompleteServiceSettings`, `TelemetryEventName`) -- `@roo-code/telemetry` (`TelemetryService`) -- `../../core/config/ContextProxy` -- `../../core/webview/ClineProvider` -- `../../i18n` (`t()`) - -### [`AutocompleteModel.ts`](../AutocompleteModel.ts) - -**LLM abstraction layer** — bridges autocomplete requests to the Kilo Code API system. - -- `reload(providerSettingsManager)`: Scans configured profiles to find a usable autocomplete provider. Supports dedicated `"autocomplete"` profiles and fallback to general profiles matching `AUTOCOMPLETE_PROVIDER_MODELS`. -- `supportsFim()`: Checks if the current API handler has a FIM endpoint. -- `generateFimResponse(prefix, suffix, onChunk)`: Streams a Fill-In-the-Middle completion via `FimHandler.streamFim()`. -- `generateResponse(system, user, onChunk)`: Streams a chat completion via `ApiHandler.createMessage()`. -- `hasValidCredentials()`, `getModelName()`, `getProviderDisplayName()`. - -**External dependencies:** - -- `../../api` (`ApiHandler`, `buildApiHandler`, `FimHandler`) -- `../../api/providers` (`OpenRouterHandler`, `KilocodeOpenrouterHandler`) -- `../../api/transform/stream` (`ApiStreamChunk`) -- `../../core/config/ProviderSettingsManager` -- `@roo-code/types` (`modelIdKeysByProvider`, `ProviderName`) -- `webview-ui/.../constants` (`PROVIDERS`) - -### [`AutocompleteStatusBar.ts`](../AutocompleteStatusBar.ts) - -VS Code status bar item showing autocomplete status (enabled/snoozed/disabled, model, cost). - -### [`AutocompleteCodeActionProvider.ts`](../AutocompleteCodeActionProvider.ts) - -VS Code code action provider (quick fix integration point). - -### [`AutocompleteJetbrainsBridge.ts`](../AutocompleteJetbrainsBridge.ts) - -Bridge for JetBrains IDE integration — proxies autocomplete requests from JetBrains to the classic auto-complete provider. - -### [`types.ts`](../types.ts) - -Central type definitions shared across subdirectories: - -- `AutocompleteInput`, `AutocompleteOutcome`, `AutocompletePrompt` (discriminated union: `FimAutocompletePrompt | HoleFillerAutocompletePrompt`) -- `FillInAtCursorSuggestion`, `ResponseMetaData`, `CostTrackingCallback` -- `VisibleCodeContext`, `VisibleEditorInfo`, `VisibleRange`, `DiffInfo` -- `ChatCompletionRequest`, `ChatTextCompletionResult` -- Utility functions: `extractPrefixSuffix()`, `contextToAutocompleteInput()` - ---- - -## 2. `continuedev/` — Forked Continue.dev Library - -### Purpose - -A **streamlined extraction** from the [Continue.dev](https://github.com/continuedev/continue) project, containing only autocomplete and NextEdit functionality. All GUI, chat, agents, and other features have been removed. It serves as a **TypeScript service library** providing: - -1. **Autocomplete pipeline** — `CompletionProvider` orchestrates: prefiltering → context gathering → snippet retrieval → prompt templating → LLM streaming → stream filtering → postprocessing → caching. -2. **Context retrieval** — `ContextRetrievalService`, `ImportDefinitionsService`, `RootPathContextService`. -3. **Snippet gathering** — `getAllSnippets()` collects recently edited files, recently visited ranges, LSP definitions, clipboard, diffs. -4. **Prompt templating** — Model-specific FIM templates (`codestral`, `starcoder`, `deepseek`, etc.), prefix/suffix construction, token-limited rendering. -5. **Stream filtering** — `BracketMatchingService`, `charStream`/`lineStream` transforms, `StreamTransformPipeline`. -6. **Postprocessing** — bracket cleanup, `removePrefixOverlap`, completion formatting. -7. **Tree-sitter integration** — `.scm` query files for 15+ languages covering: code snippets, imports, root-path context, static context (hole/header/type queries), and tag queries. -8. **LLM providers** — `ILLM` interface with implementations for OpenAI, Mistral, OpenRouter, KiloCode, Mock. -9. **Diff engine** — Myers diff algorithm, streaming diff. -10. **Utility layer** — Token counting (llama tokenizer), LRU caching, logging service, debouncing, helper variables. - -### Key Files - -| File | Role | -| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | -| [`core/index.d.ts`](../continuedev/core/index.d.ts) | Core type definitions: `IDE`, `ILLM`, `TabAutocompleteOptions`, `Position`, `Range`, etc. | -| [`core/autocomplete/CompletionProvider.ts`](../continuedev/core/autocomplete/CompletionProvider.ts) | Main orchestrator (not used directly by classic-auto-complete; serves as reference) | -| [`core/autocomplete/context/ContextRetrievalService.ts`](../continuedev/core/autocomplete/context/) | Context gathering service | -| [`core/autocomplete/snippets/getAllSnippets.ts`](../continuedev/core/autocomplete/snippets/getAllSnippets.ts) | Collects all context snippets | -| [`core/autocomplete/templating/`](../continuedev/core/autocomplete/templating/) | Prompt construction, formatting, model-specific templates | -| [`core/autocomplete/postprocessing/`](../continuedev/core/autocomplete/postprocessing/) | Post-processing pipeline | -| [`core/autocomplete/util/HelperVars.ts`](../continuedev/core/autocomplete/util/HelperVars.ts) | Cursor context, pruned prefix/suffix computation | -| [`core/vscode-test-harness/src/VSCodeIde.ts`](../continuedev/core/vscode-test-harness/src/VSCodeIde.ts) | VS Code `IDE` interface implementation | -| [`core/vscode-test-harness/src/autocomplete/lsp.ts`](../continuedev/core/vscode-test-harness/src/autocomplete/lsp.ts) | LSP definition retrieval | -| [`core/vscode-test-harness/src/autocomplete/RecentlyVisitedRangesService.ts`](../continuedev/core/vscode-test-harness/src/autocomplete/RecentlyVisitedRangesService.ts) | Tracks recently visited code ranges | -| [`core/vscode-test-harness/src/autocomplete/recentlyEdited.ts`](../continuedev/core/vscode-test-harness/src/autocomplete/recentlyEdited.ts) | Tracks recently edited code ranges | -| [`core/llm/`](../continuedev/core/llm/) | LLM implementations (OpenAI, Mistral, etc.) | -| [`core/util/parameters.ts`](../continuedev/core/util/parameters.ts) | `DEFAULT_AUTOCOMPLETE_OPTS` | -| [`tree-sitter/`](../continuedev/tree-sitter/) | `.scm` query files for all supported languages | - -### Self-containedness - -The continuedev library is **largely self-contained** with its own: - -- `IDE` interface (abstraction over VS Code/JetBrains) -- `ILLM` interface (abstraction over LLM providers) -- Tree-sitter integration -- Utility layer - -It imports `web-tree-sitter` as an external npm dependency. The `VsCodeIde.ts` implementation within it imports `vscode` API directly. - ---- - -## 3. `classic-auto-complete/` — Inline Code Completion Pipeline - -### Purpose - -The **primary code editor autocomplete** feature. Implements `vscode.InlineCompletionItemProvider` to show ghost text completions as the user types. - -### Completion Pipeline Flow - -``` -VS Code triggers provideInlineCompletionItems() - │ - ▼ -┌──────────────────────────────────────────┐ -│ 1. Gate checks │ -│ • Is auto-trigger enabled? │ -│ • Has valid model/credentials? │ -│ • Is file accessible (RooIgnore)? │ -└──────────┬───────────────────────────────┘ - │ - ▼ -┌──────────────────────────────────────────┐ -│ 2. Cache lookup (suggestions history) │ -│ findMatchingSuggestion(): │ -│ • exact match │ -│ • partial_typing (user typed ahead) │ -│ • backward_deletion (user backspaced) │ -│ → If cache hit, return immediately │ -└──────────┬───────────────────────────────┘ - │ (cache miss) - ▼ -┌──────────────────────────────────────────┐ -│ 3. Contextual skip │ -│ shouldSkipAutocomplete(): │ -│ • mid-word typing (len > 2) │ -│ • at end of statement (;, }, )) │ -│ → If skip, return empty │ -└──────────┬───────────────────────────────┘ - │ - ▼ -┌──────────────────────────────────────────┐ -│ 4. Prompt building │ -│ Strategy chosen by model.supportsFim()│ -│ │ -│ FIM path (FimPromptBuilder): │ -│ • getProcessedSnippets() → HelperVars │ -│ • getAllSnippetsWithoutRace() → │ -│ context, snippets, LSP defs │ -│ • getTemplateForModel() → FIM format │ -│ • compilePrefixSuffix() → formatted │ -│ │ -│ Chat path (HoleFiller): │ -│ • Same context gathering │ -│ • formatSnippets() → comment context │ -│ • System prompt (hole-filler pattern) │ -│ • {{FILL_HERE}} template │ -└──────────┬───────────────────────────────┘ - │ - ▼ -┌──────────────────────────────────────────┐ -│ 5. Debounced LLM request │ -│ • Leading edge on first call │ -│ • Adaptive delay (avg of recent │ -│ latencies, 150ms–1000ms range) │ -│ • Reuses covering pending requests │ -└──────────┬───────────────────────────────┘ - │ - ▼ -┌──────────────────────────────────────────┐ -│ 6. LLM call (via AutocompleteModel) │ -│ FIM: model.generateFimResponse() │ -│ → FimHandler.streamFim() │ -│ Chat: model.generateResponse() │ -│ → ApiHandler.createMessage() │ -│ → Collects streaming chunks │ -└──────────┬───────────────────────────────┘ - │ - ▼ -┌──────────────────────────────────────────┐ -│ 7. Post-processing │ -│ processSuggestion() → │ -│ postprocessAutocompleteSuggestion(): │ -│ a. continuedev postprocessCompletion() │ -│ (prefix overlap removal, etc.) │ -│ b. applyLanguageFilter() (markdown) │ -│ c. suggestionConsideredDuplication() │ -│ • prefix/suffix duplication │ -│ • edge-line duplication │ -│ • repetitive phrase detection │ -│ • normalized complete-line check │ -└──────────┬───────────────────────────────┘ - │ - ▼ -┌──────────────────────────────────────────┐ -│ 8. Display logic │ -│ • applyFirstLineOnly() — truncate │ -│ multi-line if cursor is mid-line │ -│ • stringToInlineCompletions() → │ -│ vscode.InlineCompletionItem │ -│ • Track in suggestionsHistory │ -│ • Cost tracking callback │ -│ • Telemetry (requested, returned, │ -│ filtered, cache hit, accepted, │ -│ unique shown, visibility tracking) │ -└──────────────────────────────────────────┘ -``` - -### Key Files - -| File | Role | -| ------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- | -| [`AutocompleteInlineCompletionProvider.ts`](../classic-auto-complete/AutocompleteInlineCompletionProvider.ts) | Main provider: debouncing, cache, pipeline orchestration | -| [`FillInTheMiddle.ts`](../classic-auto-complete/FillInTheMiddle.ts) | `FimPromptBuilder` — builds FIM prompts using continuedev's templating | -| [`HoleFiller.ts`](../classic-auto-complete/HoleFiller.ts) | Chat-based completion with `{{FILL_HERE}}` / `` XML tag protocol | -| [`getProcessedSnippets.ts`](../classic-auto-complete/getProcessedSnippets.ts) | Orchestrates context gathering: `HelperVars`, `getAllSnippetsWithoutRace`, access filtering | -| [`contextualSkip.ts`](../classic-auto-complete/contextualSkip.ts) | Determines when to skip autocomplete (mid-word, end-of-statement) | -| [`uselessSuggestionFilter.ts`](../classic-auto-complete/uselessSuggestionFilter.ts) | Duplication detection, postprocessing pipeline integration | -| [`AutocompleteTelemetry.ts`](../classic-auto-complete/AutocompleteTelemetry.ts) | Telemetry events: requested, filtered, cache hit, LLM completed/failed, accepted, unique shown | -| [`language-filters/index.ts`](../classic-auto-complete/language-filters/index.ts) | Language-specific post-filters (currently: markdown) | - -### External Dependencies (outside autocomplete module) - -- `vscode` API (`InlineCompletionItemProvider`, `TextDocument`, `Position`, etc.) -- `../../api/transform/stream` (`ApiStreamChunk`) -- `../../core/ignore/RooIgnoreController` (file access filtering) -- `../../core/webview/ClineProvider` -- `@roo-code/types`, `@roo-code/telemetry` - ---- - -## 4. `chat-autocomplete/` — Chat Text Area Autocomplete - -### Purpose - -Provides **autocomplete for the chat input text area** in the Kilo Code webview. When the user is typing a message in the chat panel, this module suggests completions for natural language text. - -### Architecture - -``` -Webview sends "requestChatCompletion" message - │ - ▼ -handleChatCompletionRequest() - │ - ├── Creates VisibleCodeTracker → captureVisibleCode() - ├── Creates ChatTextAreaAutocomplete - │ │ - │ ├── Initializes AutocompleteModel (same LLM layer) - │ ├── buildPrefix() — includes visible code context - │ │ - │ ├── FIM path: model.generateFimResponse() - │ └── Chat path: model.generateResponse() with chat-specific prompts - │ - │ cleanSuggestion(): - │ ├── removePrefixOverlap() - │ ├── postprocessAutocompleteSuggestion() - │ ├── Filter code-looking suggestions (//, /*, #) - │ └── Truncate at first newline - │ - └── Sends "chatCompletionResult" back to webview -``` - -### Communication - -- **Request**: Webview → Extension: `{ type: "requestChatCompletion", text, requestId }` -- **Response**: Extension → Webview: `{ type: "chatCompletionResult", text, requestId }` -- **Acceptance**: Webview → Extension: `{ type: "chatCompletionAccepted", suggestionLength }` - -### Key Files - -| File | Role | -| ----------------------------------------------------------------------------------------- | ------------------------------------------------------------------------- | -| [`ChatTextAreaAutocomplete.ts`](../chat-autocomplete/ChatTextAreaAutocomplete.ts) | Core logic: prompt building with visible code context, LLM call, cleaning | -| [`handleChatCompletionRequest.ts`](../chat-autocomplete/handleChatCompletionRequest.ts) | Message handler: creates tracker + autocomplete, sends result to webview | -| [`handleChatCompletionAccepted.ts`](../chat-autocomplete/handleChatCompletionAccepted.ts) | Telemetry handler for accepted suggestions | - -### External Dependencies - -- `../../core/webview/ClineProvider` (webview messaging) -- `../../core/config/ProviderSettingsManager` -- Reuses `AutocompleteTelemetry` and `postprocessAutocompleteSuggestion` from classic-auto-complete - ---- - -## 5. `context/` — Visible Code Context - -### Purpose - -Captures what code is **actually visible** in the user's VS Code editor viewports (not just which files are open). - -### [`VisibleCodeTracker.ts`](../context/VisibleCodeTracker.ts) - -- Iterates `vscode.window.visibleTextEditors` -- For each editor: captures file path, language ID, visible line ranges, cursor position, selections -- Extracts diff information from git-scheme URIs -- Filters out files matching security patterns (`isSecurityConcern`) and `.kilocodeignore` rules - -### External Dependencies - -- `vscode` API (`window.visibleTextEditors`, `TextEditor`) -- `../../../utils/path` (`toRelativePath`) -- `../continuedev/core/indexing/ignore` (`isSecurityConcern`) -- `../../../core/ignore/RooIgnoreController` - ---- - -## 6. `utils/` — Utility Functions - -### [`kilocode-utils.ts`](../utils/kilocode-utils.ts) - -- `checkKilocodeBalance(token, orgId)`: HTTP call to `/api/profile/balance` to verify positive balance. -- Re-exports `AUTOCOMPLETE_PROVIDER_MODELS` and `AutocompleteProviderKey` from `@roo-code/types`. - -### External Dependencies - -- `@roo-code/types` (`getKiloBaseUriFromToken`, `AUTOCOMPLETE_PROVIDER_MODELS`, `AutocompleteProviderKey`) -- Node.js `fetch` - ---- - -## Key Interfaces and Abstractions - -### Within the Module - -| Interface | Defined In | Purpose | -| ----------------------------- | ---------- | --------------------------------------------------------------------------------------------- | -| `AutocompleteInput` | `types.ts` | Input for both FIM and hole-filler strategies | -| `AutocompletePrompt` | `types.ts` | Discriminated union: `FimAutocompletePrompt \| HoleFillerAutocompletePrompt` | -| `FillInAtCursorSuggestion` | `types.ts` | Result: `{ text, prefix, suffix }` | -| `ResponseMetaData` | `types.ts` | Cost/token tracking | -| `AutocompleteContextProvider` | `types.ts` | Bundles `ContextRetrievalService` + `VsCodeIde` + `AutocompleteModel` + `RooIgnoreController` | -| `CostTrackingCallback` | `types.ts` | `(cost, inputTokens, outputTokens) => void` | -| `VisibleCodeContext` | `types.ts` | Captured visible editor state | - -### From continuedev - -| Interface | Defined In | Purpose | -| ------------------------ | ---------------------------------------- | -------------------------------------------------------------- | -| `IDE` | `continuedev/core/index.d.ts` | IDE abstraction (file I/O, LSP, editor state) | -| `ILLM` | `continuedev/core/index.d.ts` | LLM abstraction (streamComplete, streamFim, chat, countTokens) | -| `TabAutocompleteOptions` | `continuedev/core/index.d.ts` | Autocomplete configuration options | -| `AutocompleteSnippet` | `continuedev/core/autocomplete/types.ts` | Context snippet with type discrimination | - -### From External Code - -| Interface/Class | From | Used For | -| ------------------------- | --------------------- | ---------------------------------- | -| `ApiHandler` | `src/api/` | Chat-based LLM streaming | -| `FimHandler` | `src/api/` | FIM completion streaming | -| `ProviderSettingsManager` | `src/core/config/` | Profile and provider configuration | -| `ContextProxy` | `src/core/config/` | Global state persistence | -| `ClineProvider` | `src/core/webview/` | Webview messaging, task access | -| `RooIgnoreController` | `src/core/ignore/` | File access filtering | -| `TelemetryService` | `@roo-code/telemetry` | Event tracking | - ---- - -## Self-Contained vs. External Dependencies Summary - -### Self-Contained (within `src/services/autocomplete/`) - -- ✅ Completion pipeline logic (classic + chat) -- ✅ Contextual skip heuristics -- ✅ Suggestion history/cache management -- ✅ Duplication and uselessness filtering -- ✅ Language-specific filters -- ✅ Adaptive debouncing -- ✅ Visible code context capture -- ✅ Chat text area completion logic -- ✅ Telemetry event definitions -- ✅ continuedev library (context retrieval, snippet gathering, prompt templating, tree-sitter queries, postprocessing, LLM abstractions) - -### Requires External Reconstruction - -| Dependency | Source | What It Provides | -| --------------------------- | -------------------- | --------------------------------------------------------------------------------- | -| `ApiHandler` / `FimHandler` | `src/api/` | Actual LLM API calls (streaming FIM + chat) | -| `buildApiHandler()` | `src/api/` | Factory to create API handlers from profiles | -| `ProviderSettingsManager` | `src/core/config/` | Profile management, provider config | -| `ContextProxy` | `src/core/config/` | Persistent global state | -| `ClineProvider` | `src/core/webview/` | Webview messaging + task state | -| `RooIgnoreController` | `src/core/ignore/` | `.kilocodeignore` pattern matching | -| `vscode` API | VS Code | All editor integration (inline completions, status bar, commands, text documents) | -| `@roo-code/types` | `packages/types` | Shared type definitions, provider constants | -| `@roo-code/telemetry` | `packages/telemetry` | Telemetry event capture | -| `../../i18n` | `src/i18n/` | Localization | -| `../../utils/path` | `src/utils/` | Path utilities (`toRelativePath`) | -| `web-tree-sitter` | npm | Tree-sitter WASM parser (used by continuedev) | -| `PROVIDERS` constant | `webview-ui/` | Provider display name mapping | diff --git a/packages/kilo-vscode/src/services/autocomplete/docs/investigation-vscode-integration.md b/packages/kilo-vscode/src/services/autocomplete/docs/investigation-vscode-integration.md deleted file mode 100644 index 5a8f99b92d..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/docs/investigation-vscode-integration.md +++ /dev/null @@ -1,412 +0,0 @@ -# Investigation: VSCode Extension Integration Points for Autocomplete - -This document captures every integration point between the autocomplete feature and the -VSCode extension infrastructure. It's intended for use when recreating the extension shell -in a standalone package. - ---- - -## 1. package.json Contributions - -### 1.1 Activation Events - -```jsonc -// src/package.json lines 51-54 -"activationEvents": [ - "onLanguage", // activates for ANY language - "onStartupFinished" // activates after startup completes -] -``` - -There are no autocomplete-specific activation events. Both events are general-purpose. - -### 1.2 Commands - -Commands declared in `src/package.json` `contributes.commands`: - -| Command ID | Title Key | Registered in Code? | -| ------------------------------------------------ | ------------------------------------------------ | ------------------------------------------ | -| `kilo-code.autocomplete.generateSuggestions` | `%autocomplete.commands.generateSuggestions%` | ✅ `src/services/autocomplete/index.ts:26` | -| `kilo-code.autocomplete.cancelSuggestions` | `%autocomplete.commands.cancelSuggestions%` | ❌ Never registered — placeholder | -| `kilo-code.autocomplete.applyCurrentSuggestions` | `%autocomplete.commands.applyCurrentSuggestion%` | ❌ Never registered — placeholder | -| `kilo-code.autocomplete.applyAllSuggestions` | `%autocomplete.commands.applyAllSuggestions%` | ❌ Never registered — placeholder | -| `kilo-code.autocomplete.goToNextSuggestion` | `%autocomplete.commands.goToNextSuggestion%` | ❌ Never registered — placeholder | -| `kilo-code.autocomplete.goToPreviousSuggestion` | `%autocomplete.commands.goToPreviousSuggestion%` | ❌ Never registered — placeholder | - -Additional commands registered **programmatically** but NOT declared in package.json: - -| Command ID | Registered in | Notes | -| ---------------------------------------------------------- | --------------------------------------------------------------------------------------------- | ------------------------------------------- | -| `kilo-code.autocomplete.reload` | `src/services/autocomplete/index.ts:16` | Reloads settings and model | -| `kilo-code.autocomplete.codeActionQuickFix` | `src/services/autocomplete/index.ts:21` | No-op stub | -| `kilo-code.autocomplete.showIncompatibilityExtensionPopup` | `src/services/autocomplete/index.ts:31` | Shows Copilot conflict dialog | -| `kilo-code.autocomplete.disable` | `src/services/autocomplete/index.ts:36` | Disables autocomplete | -| `kilocode.autocomplete.inline-completion.accepted` | `src/services/autocomplete/classic-auto-complete/AutocompleteInlineCompletionProvider.ts:313` | Telemetry callback when suggestion accepted | -| `kilo-code.jetbrains.getInlineCompletions` | `src/services/autocomplete/AutocompleteJetbrainsBridge.ts:289` | JetBrains bridge | - -### 1.3 Keybindings - -From `src/package.json` `contributes.keybindings`: - -| Command | Key | Mac | When Clause | -| ---------------------------------------------------------- | -------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `kilo-code.autocomplete.cancelSuggestions` | `Escape` | same | `editorTextFocus && !editorTabMovesFocus && !inSnippetMode && kilocode.autocomplete.hasSuggestions` | -| `kilo-code.autocomplete.generateSuggestions` | `Ctrl+L` | `Cmd+L` | `editorTextFocus && !editorTabMovesFocus && !inSnippetMode && kilocode.autocomplete.enableSmartInlineTaskKeybinding && !github.copilot.completions.enabled` | -| `kilo-code.autocomplete.showIncompatibilityExtensionPopup` | `Ctrl+L` | `Cmd+L` | `editorTextFocus && !editorTabMovesFocus && !inSnippetMode && kilocode.autocomplete.enableSmartInlineTaskKeybinding && github.copilot.completions.enabled` | - -**Note**: The `Escape` keybinding references `kilocode.autocomplete.hasSuggestions` which is -**never set** in code via `setContext`. This means the keybinding is currently inert -(would never activate). - -### 1.4 Menus - -There are **no menu contributions** for autocomplete commands. The autocomplete commands -do not appear in any editor/context, view/title, or other menu. - -### 1.5 Configuration Settings - -There are **no VSCode `configuration` contributions** for autocomplete in `package.json`. -Autocomplete settings are stored entirely in VSCode global state via `ContextProxy` under -the key `ghostServiceSettings`, not as workspace/user settings. - -### 1.6 Code Actions - -From `src/package.json`: - -```jsonc -"codeActions": [{ - "languages": ["*"], - "providedCodeActionKinds": ["vscode.CodeActionKind.QuickFix"] -}] -``` - -This is a general declaration. The autocomplete-specific code action provider is registered -programmatically in `src/services/autocomplete/index.ts:42-46`: - -```typescript -vscode.languages.registerCodeActionsProvider("*", autocompleteManager.codeActionProvider, { - providedCodeActionKinds: Object.values(autocompleteManager.codeActionProvider.providedCodeActionKinds), -}) -``` - -The `AutocompleteCodeActionProvider` (`src/services/autocomplete/AutocompleteCodeActionProvider.ts`) -provides a QuickFix action that triggers `kilo-code.autocomplete.generateSuggestions`. - ---- - -## 2. Extension Activation & Service Initialization - -### 2.1 Extension activation flow (`src/extension.ts`) - -1. **Import**: `registerAutocompleteProvider` imported from `./services/autocomplete` (line 49) -2. **First-install defaults** (lines 400-414): On first install, autocomplete is enabled: - ```typescript - const currentAutocompleteSettings = contextProxy.getValue("ghostServiceSettings") - await contextProxy.setValue("ghostServiceSettings", { - ...currentAutocompleteSettings, - enableAutoTrigger: !kiloCodeWrapperJetbrains, // disabled for JetBrains - enableSmartInlineTaskKeybinding: true, - }) - ``` -3. **Registration** (lines 512-520): Autocomplete is registered unless running as CLI: - ```typescript - if (kiloCodeWrapperCode !== "cli") { - registerAutocompleteProvider(context, provider) - } - ``` - -### 2.2 `registerAutocompleteProvider` (`src/services/autocomplete/index.ts`) - -This function: - -1. Creates `AutocompleteServiceManager` singleton -2. Registers JetBrains bridge via `registerAutocompleteJetbrainsBridge` -3. Registers 5 commands (reload, codeActionQuickFix, generateSuggestions, showIncompatibilityExtensionPopup, disable) -4. Registers `CodeActionsProvider` for all languages (`"*"`) - -### 2.3 `AutocompleteServiceManager` initialization - -On construction (`src/services/autocomplete/AutocompleteServiceManager.ts:37-61`): - -1. Creates `AutocompleteModel` for provider/model management -2. Creates `AutocompleteCodeActionProvider` for QuickFix code actions -3. Creates `AutocompleteInlineCompletionProvider` for inline completions -4. Calls `this.load()` to initialize - -### 2.4 `load()` method - -On load (`src/services/autocomplete/AutocompleteServiceManager.ts:70-99`): - -1. Reads `ghostServiceSettings` from `ContextProxy` -2. Sets context key `kilocode.autocomplete.enableSmartInlineTaskKeybinding` via `setContext` -3. Registers/unregisters `InlineCompletionItemProvider` based on `enableAutoTrigger` state -4. Updates status bar -5. Writes enriched settings (with provider/model info) back to `ContextProxy` -6. Posts state to webview - ---- - -## 3. Context Keys (setContext) - -| Context Key | Where Set | Purpose | -| ------------------------------------------------------- | ----------------------------------------------------------------- | -------------------------------------------------------- | -| `kilocode.autocomplete.enableSmartInlineTaskKeybinding` | `AutocompleteServiceManager.updateGlobalContext()` (line 286-290) | Controls whether `Cmd+L` / `Ctrl+L` keybinding is active | -| `kilocode.autocomplete.hasSuggestions` | ❌ Never set | Would control `Escape` keybinding — currently dead code | - ---- - -## 4. Webview State Integration - -### 4.1 State passing to webview (`src/core/webview/ClineProvider.ts`) - -The `ghostServiceSettings` is destructured from global state and included in the -state object sent to the webview at: - -- Line 2284: `ghostServiceSettings` extracted from state values -- Line 2480: `ghostServiceSettings: ghostServiceSettings` included in state to webview -- Line 2758: `ghostServiceSettings: stateValues.ghostServiceSettings` included in full state - -### 4.2 Webview message handlers (`src/core/webview/webviewMessageHandler.ts`) - -Three autocomplete-related message types are handled: - -1. **`ghostServiceSettings`** (lines 1972-1982): - - ```typescript - case "ghostServiceSettings": - const validatedSettings = autocompleteServiceSettingsSchema.parse(message.values) - await updateGlobalState("ghostServiceSettings", validatedSettings) - await provider.postStateToWebview() - vscode.commands.executeCommand("kilo-code.autocomplete.reload") - ``` - - This is the primary way the webview UI writes autocomplete settings. - -2. **`snoozeAutocomplete`** (lines 1983-1989): - - ```typescript - case "snoozeAutocomplete": - if (typeof message.value === "number" && message.value > 0) { - await AutocompleteServiceManager.getInstance()?.snooze(message.value) - } else { - await AutocompleteServiceManager.getInstance()?.unsnooze() - } - ``` - -3. **`requestChatCompletion`** (lines 3969-3975): Handles chat textarea FIM autocomplete. -4. **`chatCompletionAccepted`** (lines 3977-3979): Handles chat completion acceptance telemetry. - -### 4.3 Autocomplete reload triggered from webview - -The `kilo-code.autocomplete.reload` command is also triggered when API profiles change: - -- `saveApiConfiguration` (line 2231) -- `upsertApiConfiguration` (lines 2294, 2303) -- `renameApiConfiguration` (line 2330) -- `deleteApiConfiguration` (line 2407) - ---- - -## 5. Global State / ContextProxy - -### 5.1 State key - -The autocomplete feature uses a single global state key: - -``` -ghostServiceSettings: AutocompleteServiceSettings -``` - -Defined in `packages/types/src/global-settings.ts:230`: - -```typescript -ghostServiceSettings: autocompleteServiceSettingsSchema -``` - -### 5.2 Schema (`packages/types/src/kilocode/kilocode.ts:9-19`) - -```typescript -export const autocompleteServiceSettingsSchema = z - .object({ - enableAutoTrigger: z.boolean().optional(), - enableSmartInlineTaskKeybinding: z.boolean().optional(), - enableChatAutocomplete: z.boolean().optional(), - provider: z.string().optional(), - model: z.string().optional(), - snoozeUntil: z.number().optional(), - hasKilocodeProfileWithNoBalance: z.boolean().optional(), - }) - .optional() -``` - -### 5.3 Read/write patterns - -- **Read**: `ContextProxy.instance.getGlobalState("ghostServiceSettings")` -- **Write**: `ContextProxy.instance.setValues({ ghostServiceSettings: ... })` -- **WebView write**: sends `{ type: "ghostServiceSettings", values: ... }` message - -### 5.4 VSCode global state references - -The key `ghostServiceSettings` is listed as a valid global state key for webview -communication in `packages/types/src/vscode-extension-host.ts:546` and `795`. - ---- - -## 6. VSCode API Providers Registered - -| Provider Type | Registration | Scope | -| ------------------------------ | ------------------------------------------------------------------------- | ---------------------------------------------------- | -| `InlineCompletionItemProvider` | `AutocompleteServiceManager.updateInlineCompletionProviderRegistration()` | `{ scheme: "file" }` — only for file-based documents | -| `CodeActionsProvider` | `src/services/autocomplete/index.ts:42` | `"*"` — all languages | - -The inline completion provider is conditionally registered/disposed based on -`enableAutoTrigger` and snooze state. - ---- - -## 7. Status Bar - -`AutocompleteStatusBar` (`src/services/autocomplete/AutocompleteStatusBar.ts`): - -- Alignment: `vscode.StatusBarAlignment.Right`, priority 100 -- Shows/hides based on `enableAutoTrigger` setting -- Displays completion count, cost, provider info, and snoozed state -- Uses `$(kilo-logo)` codicon (custom icon font) - ---- - -## 8. i18n / Localization - -### 8.1 Package NLS keys (`src/package.nls.json` and locale variants) - -Keys used in `package.json` command titles: - -| Key | English Value | -| ---------------------------------------------- | ---------------------------------------------- | -| `autocomplete.commands.generateSuggestions` | Generate Suggested Edits | -| `autocomplete.commands.displaySuggestions` | Display Suggested Edits | -| `autocomplete.commands.cancelSuggestions` | Cancel Suggested Edits | -| `autocomplete.commands.applyCurrentSuggestion` | Apply Current Suggested Edit | -| `autocomplete.commands.applyAllSuggestions` | Apply All Suggested Edits | -| `autocomplete.commands.goToNextSuggestion` | Go To Next Suggestion | -| `autocomplete.commands.goToPreviousSuggestion` | Go To Previous Suggestion | -| `autocomplete.input.title` | Press 'Enter' to confirm or 'Escape' to cancel | -| `autocomplete.input.placeholder` | Describe what you want to do... | - -Translated in 20+ locale files: `src/package.nls.{de,fr,es,it,ja,ko,nl,pl,pt-BR,ru,sk,cs,uk,zh-CN,zh-TW,ar,ca,hi,id,th,tr,vi}.json`. - -### 8.2 Runtime i18n keys (src/i18n/locales/en/kilocode.json) - -Namespace: `kilocode:autocomplete.*` - -```jsonc -{ - "autocomplete": { - "statusBar": { - "enabled": "$(kilo-logo) Autocomplete", - "snoozed": "snoozed", - "warning": "$(warning) Autocomplete", - "tooltip": { - "basic": "Kilo Code Autocomplete", - "disabled": "Kilo Code Autocomplete (disabled)", - "noCredits": "...", - "noUsableProvider": "...", - "sessionTotal": "Session total cost:", - "provider": "Provider:", - "model": "Model:", - "profile": "Profile: ", - "defaultProfile": "Default", - "completionSummary": "Performed {{count}} completions between {{startTime}} and {{endTime}}, for a total cost of {{cost}}.", - "providerInfo": "Autocompletions provided by {{model}} via {{provider}}.", - }, - "cost": { - "zero": "$0.00", - "lessThanCent": "<$0.01", - }, - }, - "toggleMessage": "Kilo Code Autocomplete {{status}}", - "progress": { - "title": "Kilo Code", - "analyzing": "Analyzing your code...", - "generating": "Generating suggested edits...", - "processing": "Processing suggested edits...", - "showing": "Displaying suggested edits...", - }, - "input": { - "title": "Kilo Code: Quick Task", - "placeholder": "e.g., 'refactor this function to be more efficient'", - }, - "commands": { - "generateSuggestions": "Kilo Code: Generate Suggested Edits", - "displaySuggestions": "Display Suggested Edits", - "cancelSuggestions": "Cancel Suggested Edits", - "applyCurrentSuggestion": "Apply Current Suggested Edit", - "applyAllSuggestions": "Apply All Suggested Edits", - "category": "Kilo Code", - }, - "codeAction": { - "title": "Kilo Code: Suggested Edits", - }, - "chatParticipant": { - "fullName": "Kilo Code Agent", - "name": "Agent", - "description": "I can help you with quick tasks and suggested edits.", - }, - "incompatibilityExtensionPopup": { - "message": "The Kilo Code Autocomplete is being blocked by a conflict with GitHub Copilot. To fix this, you must disable Copilot's inline suggestions.", - "disableCopilot": "Disable Copilot", - "disableInlineAssist": "Disable Autocomplete", - }, - }, -} -``` - -Translated in all locale files under `src/i18n/locales/{locale}/kilocode.json`. - ---- - -## 9. Telemetry Events - -| Event | Where Used | -| -------------------------------------------- | -------------------------------------------------------------------- | -| `TelemetryEventName.INLINE_ASSIST_AUTO_TASK` | `AutocompleteServiceManager.codeSuggestion()` | -| `TelemetryEventName.GHOST_SERVICE_DISABLED` | `AutocompleteServiceManager.disable()` | -| Accept suggestion telemetry | `AutocompleteInlineCompletionProvider` via accepted command callback | - ---- - -## 10. Dependencies on Host Extension - -The autocomplete service depends on: - -1. **`ClineProvider`** — for `providerSettingsManager` (API provider configs), `postStateToWebview()` -2. **`ContextProxy`** — singleton for global state read/write -3. **`vscode.ExtensionContext`** — for `subscriptions` (disposable management), `globalState` -4. **Webview messaging** — bidirectional communication for settings changes -5. **Custom icon font** — `$(kilo-logo)` codicon from `assets/icons/kilo-icon-font.woff2` - ---- - -## 11. Legacy: Ghost Service - -The code refers to `ghostServiceSettings` and `GhostServiceManager` in -`src/services/ghost/` — this appears to be the original/predecessor copy. -The current active autocomplete uses `src/services/autocomplete/` which is -a refactored version. The `ghost` name persists in the global state key -`ghostServiceSettings` for backwards compatibility. - ---- - -## 12. Summary: What a New Extension Would Need - -To recreate the autocomplete as a standalone extension: - -1. **package.json**: 6 declared commands + keybindings + code action declaration -2. **Activation**: `onLanguage` + `onStartupFinished`, register providers on activate -3. **Providers**: `InlineCompletionItemProvider` (file scheme), `CodeActionsProvider` (all langs) -4. **Context keys**: `kilocode.autocomplete.enableSmartInlineTaskKeybinding` (via setContext) -5. **Status bar**: Right-aligned status bar item with custom icon -6. **State**: Single `ghostServiceSettings` object in global state (or a new key) -7. **Webview communication**: Message types `ghostServiceSettings`, `snoozeAutocomplete`, `requestChatCompletion`, `chatCompletionAccepted` -8. **i18n**: ~10 NLS keys in package.nls.json + ~30 runtime keys in kilocode.json -9. **Telemetry**: 2 primary event types diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/ar.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/ar.ts deleted file mode 100644 index 0d82dce70d..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/ar.ts +++ /dev/null @@ -1,49 +0,0 @@ -// ar runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "متوقف مؤقتاً", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (معطل)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**لم يتم تكوين نموذج الإكمال التلقائي**\n\nلتمكين الإكمال التلقائي، أضف ملفًا شخصيًا مع أحد هذه المزودين المدعومين: {{providers}}.\n\n[فتح الإعدادات]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "إجمالي تكلفة الجلسة:", - "kilocode:autocomplete.statusBar.tooltip.provider": "المزود:", - "kilocode:autocomplete.statusBar.tooltip.model": "النموذج:", - "kilocode:autocomplete.statusBar.tooltip.profile": "الملف الشخصي: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "افتراضي", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "تم إجراء {{count}} إكمال بين {{startTime}} و {{endTime}}، بتكلفة إجمالية {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "يتم توفير الإكمال التلقائي بواسطة {{model}} عبر {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "تحليل الكود الخاص بك...", - "kilocode:autocomplete.progress.generating": "إنشاء التعديلات المقترحة...", - "kilocode:autocomplete.progress.processing": "معالجة التعديلات المقترحة...", - "kilocode:autocomplete.progress.showing": "عرض التعديلات المقترحة...", - "kilocode:autocomplete.input.title": "Kilo Code: مهمة سريعة", - "kilocode:autocomplete.input.placeholder": "مثال، 'أعد هيكلة هذه الدالة لتكون أكثر كفاءة'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: إنشاء التعديلات المقترحة", - "kilocode:autocomplete.commands.displaySuggestions": "عرض التعديلات المقترحة", - "kilocode:autocomplete.commands.cancelSuggestions": "إلغاء التعديلات المقترحة", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "تطبيق التعديل المقترح الحالي", - "kilocode:autocomplete.commands.applyAllSuggestions": "تطبيق جميع التعديلات المقترحة", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: التعديلات المقترحة", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "يمكنني مساعدتك في المهام السريعة والتعديلات المقترحة.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "يتم حظر Kilo Code Autocomplete بسبب تعارض مع GitHub Copilot. لإصلاح هذا، يجب عليك تعطيل اقتراحات Copilot المضمنة.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "تعطيل Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "تعطيل الإكمال التلقائي", - "kilocode:autocomplete.creditsExhausted.message": - "تم إيقاف Kilo Code Autocomplete مؤقتًا لأن حسابك لا يحتوي على رصيد متبقٍ. أضف رصيدًا لاستئناف الإكمال التلقائي.", - "kilocode:autocomplete.creditsExhausted.addCredits": "إضافة رصيد", - "kilocode:autocomplete.authError.message": - "تم إيقاف Kilo Code Autocomplete مؤقتًا بسبب خطأ في المصادقة. يرجى تسجيل الدخول مرة أخرى.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/ca.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/ca.ts deleted file mode 100644 index 8fd2ed6ef4..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/ca.ts +++ /dev/null @@ -1,49 +0,0 @@ -// ca runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "pausat", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (desactivat)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**No s'ha configurat cap model d'autocompletat**\n\nPer habilitar l'autocompletat, afegeix un perfil amb un d'aquests proveïdors compatibles: {{providers}}.\n\n[Obrir Configuració]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Cost total de la sessió:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Proveïdor:", - "kilocode:autocomplete.statusBar.tooltip.model": "Model:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Perfil: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Per defecte", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "S'han realitzat {{count}} completacions entre {{startTime}} i {{endTime}}, amb un cost total de {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Les completacions automàtiques són proporcionades per {{model}} via {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Analitzant el teu codi...", - "kilocode:autocomplete.progress.generating": "Generant edicions suggerides...", - "kilocode:autocomplete.progress.processing": "Processant edicions suggerides...", - "kilocode:autocomplete.progress.showing": "Mostrant edicions suggerides...", - "kilocode:autocomplete.input.title": "Kilo Code: Tasca Ràpida", - "kilocode:autocomplete.input.placeholder": "p. ex., 'refactoritza aquesta funció per ser més eficient'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generar Edicions Suggerides", - "kilocode:autocomplete.commands.displaySuggestions": "Mostrar Edicions Suggerides", - "kilocode:autocomplete.commands.cancelSuggestions": "Cancel·lar Edicions Suggerides", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Aplicar Edició Suggerida Actual", - "kilocode:autocomplete.commands.applyAllSuggestions": "Aplicar Totes les Edicions Suggerides", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Edicions Suggerides", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "Puc ajudar-te amb tasques ràpides i edicions suggerides.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "El Kilo Code Autocomplete està sent bloquejat per un conflicte amb GitHub Copilot. Per solucionar això, has de desactivar els suggeriments en línia de Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Desactivar Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Desactivar Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete s'ha pausat perquè el teu compte no té crèdits restants. Afegeix crèdits per reprendre l'autocompletat.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Afegir crèdits", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete s'ha pausat a causa d'un error d'autenticació. Si us plau, torna a iniciar sessió.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/cs.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/cs.ts deleted file mode 100644 index 4d0871c75f..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/cs.ts +++ /dev/null @@ -1,49 +0,0 @@ -// cs runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "pozastaveno", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (zakázáno)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Není nakonfigurován žádný model automatického doplňování**\n\nPro povolení automatického doplňování přidej profil s jedním z těchto podporovaných poskytovatelů: {{providers}}.\n\n[Otevřít Nastavení]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Celkové náklady relace:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Poskytovatel:", - "kilocode:autocomplete.statusBar.tooltip.model": "Model:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Výchozí", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Provedeno {{count}} dokončení mezi {{startTime}} a {{endTime}}, s celkovými náklady {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Automatické dokončování poskytuje {{model}} přes {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Analyzuji tvůj kód...", - "kilocode:autocomplete.progress.generating": "Generuji navrhované úpravy...", - "kilocode:autocomplete.progress.processing": "Zpracovávám navrhované úpravy...", - "kilocode:autocomplete.progress.showing": "Zobrazuji navrhované úpravy...", - "kilocode:autocomplete.input.title": "Kilo Code: Rychlý úkol", - "kilocode:autocomplete.input.placeholder": "např. 'refaktoruj tuto funkci, aby byla efektivnější'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generovat navrhované úpravy", - "kilocode:autocomplete.commands.displaySuggestions": "Zobrazit navrhované úpravy", - "kilocode:autocomplete.commands.cancelSuggestions": "Zrušit navrhované úpravy", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Použít aktuální navrhovanou úpravu", - "kilocode:autocomplete.commands.applyAllSuggestions": "Použít všechny navrhované úpravy", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Navrhované úpravy", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "Mohu ti pomoci s rychlými úkoly a navrženými úpravami.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete je blokováno konfliktem s GitHub Copilot. Pro vyřešení tohoto problému musíš zakázat inline návrhy Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Zakázat Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Zakázat Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete bylo pozastaveno, protože na tvém účtu nezbyly žádné kredity. Přidej kredity pro obnovení automatického doplňování.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Přidat kredity", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete bylo pozastaveno kvůli chybě ověření. Prosím, přihlas se znovu.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/de.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/de.ts deleted file mode 100644 index 79a96f7183..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/de.ts +++ /dev/null @@ -1,50 +0,0 @@ -// de runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "pausiert", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (deaktiviert)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Kein Autocomplete-Modell konfiguriert**\n\nUm Autocomplete zu aktivieren, füge ein Profil mit einem dieser unterstützten Anbieter hinzu: {{providers}}.\n\n[Einstellungen öffnen]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Sitzungsgesamtkosten:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Anbieter:", - "kilocode:autocomplete.statusBar.tooltip.model": "Modell:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Standard", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "{{count}} Vervollständigungen zwischen {{startTime}} und {{endTime}} durchgeführt, für Gesamtkosten von {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Autovervollständigungen bereitgestellt von {{model}} über {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Analysiere deinen Code...", - "kilocode:autocomplete.progress.generating": "Generiere Bearbeitungsvorschläge...", - "kilocode:autocomplete.progress.processing": "Verarbeite Bearbeitungsvorschläge...", - "kilocode:autocomplete.progress.showing": "Zeige Bearbeitungsvorschläge...", - "kilocode:autocomplete.input.title": "Kilo Code: Schnellaufgabe", - "kilocode:autocomplete.input.placeholder": "z.B. 'refaktoriere diese Funktion für mehr Effizienz'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Bearbeitungsvorschläge generieren", - "kilocode:autocomplete.commands.displaySuggestions": "Bearbeitungsvorschläge anzeigen", - "kilocode:autocomplete.commands.cancelSuggestions": "Bearbeitungsvorschläge abbrechen", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Aktuellen Bearbeitungsvorschlag anwenden", - "kilocode:autocomplete.commands.applyAllSuggestions": "Alle Bearbeitungsvorschläge anwenden", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Bearbeitungsvorschläge", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": - "Ich kann dir bei Schnellaufgaben und Bearbeitungsvorschlägen helfen.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Das Kilo Code Autocomplete wird durch einen Konflikt mit GitHub Copilot blockiert. Um dies zu beheben, musst du Copilots Inline-Vorschläge deaktivieren.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot deaktivieren", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Autocomplete deaktivieren", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete wurde pausiert, weil dein Konto kein Guthaben mehr hat. Füge Guthaben hinzu, um Autocomplete fortzusetzen.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Guthaben hinzufügen", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete wurde aufgrund eines Authentifizierungsfehlers pausiert. Bitte melde dich erneut an.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/es.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/es.ts deleted file mode 100644 index 2a4f1be5f2..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/es.ts +++ /dev/null @@ -1,49 +0,0 @@ -// es runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "pausado", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (deshabilitado)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**No hay modelo de autocompletado configurado**\n\nPara habilitar el autocompletado, añade un perfil con uno de estos proveedores compatibles: {{providers}}.\n\n[Abrir Configuración]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Costo total de la sesión:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Proveedor:", - "kilocode:autocomplete.statusBar.tooltip.model": "Modelo:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Perfil: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Predeterminado", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Se realizaron {{count}} completaciones entre {{startTime}} y {{endTime}}, por un costo total de {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Autocompletaciones proporcionadas por {{model}} a través de {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Analizando tu código...", - "kilocode:autocomplete.progress.generating": "Generando ediciones sugeridas...", - "kilocode:autocomplete.progress.processing": "Procesando ediciones sugeridas...", - "kilocode:autocomplete.progress.showing": "Mostrando ediciones sugeridas...", - "kilocode:autocomplete.input.title": "Kilo Code: Tarea Rápida", - "kilocode:autocomplete.input.placeholder": "ej., 'refactoriza esta función para que sea más eficiente'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generar Ediciones Sugeridas", - "kilocode:autocomplete.commands.displaySuggestions": "Mostrar Ediciones Sugeridas", - "kilocode:autocomplete.commands.cancelSuggestions": "Cancelar Ediciones Sugeridas", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Aplicar Edición Sugerida Actual", - "kilocode:autocomplete.commands.applyAllSuggestions": "Aplicar Todas las Ediciones Sugeridas", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Ediciones Sugeridas", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "Puedo ayudarte con tareas rápidas y ediciones sugeridas.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "El Kilo Code Autocomplete está siendo bloqueado por un conflicto con GitHub Copilot. Para solucionarlo, debes desactivar las sugerencias en línea de Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Desactivar Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Desactivar Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete se ha pausado porque tu cuenta no tiene créditos restantes. Añade créditos para reanudar el autocompletado.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Añadir créditos", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete se ha pausado debido a un error de autenticación. Por favor, inicia sesión de nuevo.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/fr.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/fr.ts deleted file mode 100644 index 10f3ef7024..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/fr.ts +++ /dev/null @@ -1,49 +0,0 @@ -// fr runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "en pause", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (désactivé)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Aucun modèle d'autocomplétion configuré**\n\nPour activer l'autocomplétion, ajoute un profil avec l'un de ces fournisseurs pris en charge : {{providers}}.\n\n[Ouvrir les Paramètres]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Coût total de la session :", - "kilocode:autocomplete.statusBar.tooltip.provider": "Fournisseur:", - "kilocode:autocomplete.statusBar.tooltip.model": "Modèle :", - "kilocode:autocomplete.statusBar.tooltip.profile": "Profil : ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Par défaut", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "{{count}} complétions effectuées entre {{startTime}} et {{endTime}}, pour un coût total de {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Auto-complétions fournies par {{model}} via {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Analyse de ton code...", - "kilocode:autocomplete.progress.generating": "Génération des modifications suggérées...", - "kilocode:autocomplete.progress.processing": "Traitement des modifications suggérées...", - "kilocode:autocomplete.progress.showing": "Affichage des modifications suggérées...", - "kilocode:autocomplete.input.title": "Kilo Code : Tâche Rapide", - "kilocode:autocomplete.input.placeholder": "ex., 'refactorise cette fonction pour plus d'efficacité'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code : Générer des Modifications Suggérées", - "kilocode:autocomplete.commands.displaySuggestions": "Afficher les Modifications Suggérées", - "kilocode:autocomplete.commands.cancelSuggestions": "Annuler les Modifications Suggérées", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Appliquer la Modification Suggérée Actuelle", - "kilocode:autocomplete.commands.applyAllSuggestions": "Appliquer Toutes les Modifications Suggérées", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code : Modifications Suggérées", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": - "Je peux t'aider avec des tâches rapides et des modifications suggérées.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Le Kilo Code Autocomplete est bloqué par un conflit avec GitHub Copilot. Pour résoudre cela, tu dois désactiver les suggestions en ligne de Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Désactiver Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Désactiver Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete a été mis en pause car ton compte n'a plus de crédits. Ajoute des crédits pour reprendre l'autocomplétion.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Ajouter des crédits", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete a été mis en pause en raison d'une erreur d'authentification. Veuillez te reconnecter.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/hi.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/hi.ts deleted file mode 100644 index 6c8d7ad629..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/hi.ts +++ /dev/null @@ -1,50 +0,0 @@ -// hi runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "रोका गया", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (अक्षम)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**कोई ऑटोकम्प्लीट मॉडल कॉन्फ़िगर नहीं किया गया**\n\nऑटोकम्प्लीट सक्षम करने के लिए, इन समर्थित प्रदाताओं में से एक के साथ एक प्रोफ़ाइल जोड़ें: {{providers}}।\n\n[सेटिंग्स खोलें]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "सत्र की कुल लागत:", - "kilocode:autocomplete.statusBar.tooltip.provider": "प्रदाता:", - "kilocode:autocomplete.statusBar.tooltip.model": "मॉडल:", - "kilocode:autocomplete.statusBar.tooltip.profile": "प्रोफ़ाइल: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "डिफ़ॉल्ट", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "{{startTime}} और {{endTime}} के बीच {{count}} पूर्णताएं की गईं, कुल लागत {{cost}}।", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "स्वत: पूर्णता {{provider}} के माध्यम से {{model}} द्वारा प्रदान की जाती है।", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "आपके कोड का विश्लेषण कर रहे हैं...", - "kilocode:autocomplete.progress.generating": "सुझाए गए संपादन बना रहे हैं...", - "kilocode:autocomplete.progress.processing": "सुझाए गए संपादन प्रोसेस कर रहे हैं...", - "kilocode:autocomplete.progress.showing": "सुझाए गए संपादन दिखा रहे हैं...", - "kilocode:autocomplete.input.title": "Kilo Code: त्वरित कार्य", - "kilocode:autocomplete.input.placeholder": "जैसे, 'इस फ़ंक्शन को अधिक कुशल बनाने के लिए रिफैक्टर करें'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: सुझाए गए संपादन जेनरेट करें", - "kilocode:autocomplete.commands.displaySuggestions": "सुझाए गए संपादन दिखाएं", - "kilocode:autocomplete.commands.cancelSuggestions": "सुझाए गए संपादन रद्द करें", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "वर्तमान सुझाए गए संपादन लागू करें", - "kilocode:autocomplete.commands.applyAllSuggestions": "सभी सुझाए गए संपादन लागू करें", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: सुझाए गए संपादन", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": - "मैं त्वरित कार्यों और सुझाए गए संपादनों में आपकी सहायता कर सकता हूं।", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete को GitHub Copilot के साथ संघर्ष के कारण ब्लॉक किया जा रहा है। इसे ठीक करने के लिए, आपको Copilot के इनलाइन सुझावों को अक्षम करना होगा।", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot अक्षम करें", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Autocomplete अक्षम करें", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete रोक दिया गया है क्योंकि आपके खाते में शेष क्रेडिट नहीं है। ऑटोकम्प्लीट फिर से शुरू करने के लिए क्रेडिट जोड़ें।", - "kilocode:autocomplete.creditsExhausted.addCredits": "क्रेडिट जोड़ें", - "kilocode:autocomplete.authError.message": - "प्रमाणीकरण त्रुटि के कारण Kilo Code Autocomplete रोक दिया गया है। कृपया फिर से साइन इन करें।", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/id.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/id.ts deleted file mode 100644 index 30096caa19..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/id.ts +++ /dev/null @@ -1,50 +0,0 @@ -// id runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "dijeda", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (dinonaktifkan)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Tidak ada model autocomplete yang dikonfigurasi**\n\nUntuk mengaktifkan autocomplete, tambahkan profil dengan salah satu penyedia yang didukung ini: {{providers}}.\n\n[Buka Pengaturan]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Total biaya sesi:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Penyedia:", - "kilocode:autocomplete.statusBar.tooltip.model": "Model:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Default", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Melakukan {{count}} penyelesaian antara {{startTime}} dan {{endTime}}, dengan total biaya {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Pelengkapan otomatis disediakan oleh {{model}} melalui {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Menganalisis kode Anda...", - "kilocode:autocomplete.progress.generating": "Menghasilkan suntingan yang disarankan...", - "kilocode:autocomplete.progress.processing": "Memproses suntingan yang disarankan...", - "kilocode:autocomplete.progress.showing": "Menampilkan suntingan yang disarankan...", - "kilocode:autocomplete.input.title": "Kilo Code: Tugas Cepat", - "kilocode:autocomplete.input.placeholder": "mis., 'refaktor fungsi ini agar lebih efisien'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Hasilkan Suntingan yang Disarankan", - "kilocode:autocomplete.commands.displaySuggestions": "Tampilkan Suntingan yang Disarankan", - "kilocode:autocomplete.commands.cancelSuggestions": "Batalkan Suntingan yang Disarankan", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Terapkan Suntingan yang Disarankan Saat Ini", - "kilocode:autocomplete.commands.applyAllSuggestions": "Terapkan Semua Suntingan yang Disarankan", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Suntingan yang Disarankan", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": - "Saya dapat membantu Anda dengan tugas cepat dan suntingan yang disarankan.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete diblokir oleh konflik dengan GitHub Copilot. Untuk memperbaiki ini, Anda harus menonaktifkan saran inline Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Nonaktifkan Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Nonaktifkan Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete telah dijeda karena akun Anda tidak memiliki sisa kredit. Tambahkan kredit untuk melanjutkan autocomplete.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Tambah Kredit", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete telah dijeda karena kesalahan autentikasi. Silakan masuk kembali.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/it.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/it.ts deleted file mode 100644 index ca0133c09e..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/it.ts +++ /dev/null @@ -1,49 +0,0 @@ -// it runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "in pausa", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (disabilitato)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Nessun modello di autocompletamento configurato**\n\nPer abilitare l'autocompletamento, aggiungi un profilo con uno di questi provider supportati: {{providers}}.\n\n[Apri Impostazioni]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Costo totale della sessione:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Provider:", - "kilocode:autocomplete.statusBar.tooltip.model": "Modello:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Profilo: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Predefinito", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Eseguiti {{count}} completamenti tra {{startTime}} e {{endTime}}, per un costo totale di {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Autocompletamenti forniti da {{model}} tramite {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Analizzando il tuo codice...", - "kilocode:autocomplete.progress.generating": "Generando modifiche suggerite...", - "kilocode:autocomplete.progress.processing": "Elaborando modifiche suggerite...", - "kilocode:autocomplete.progress.showing": "Mostrando modifiche suggerite...", - "kilocode:autocomplete.input.title": "Kilo Code: Attività Rapida", - "kilocode:autocomplete.input.placeholder": "es., 'refactorizza questa funzione per renderla più efficiente'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Genera Modifiche Suggerite", - "kilocode:autocomplete.commands.displaySuggestions": "Mostra Modifiche Suggerite", - "kilocode:autocomplete.commands.cancelSuggestions": "Annulla Modifiche Suggerite", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Applica Modifica Suggerita Corrente", - "kilocode:autocomplete.commands.applyAllSuggestions": "Applica Tutte le Modifiche Suggerite", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Modifiche Suggerite", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "Posso aiutarti con attività rapide e modifiche suggerite.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Il Kilo Code Autocomplete è bloccato da un conflitto con GitHub Copilot. Per risolvere questo problema, devi disabilitare i suggerimenti in linea di Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Disabilita Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Disabilita Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete è stato messo in pausa perché il tuo account non ha più crediti. Aggiungi crediti per riprendere l'autocompletamento.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Aggiungi crediti", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete è stato messo in pausa a causa di un errore di autenticazione. Effettua nuovamente l'accesso.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/ja.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/ja.ts deleted file mode 100644 index f09f6e6f4a..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/ja.ts +++ /dev/null @@ -1,49 +0,0 @@ -// ja runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "一時停止中", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete（無効）", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**オートコンプリートモデルが設定されていません**\n\nオートコンプリートを有効にするには、これらのサポートされているプロバイダーのいずれかでプロファイルを追加してください: {{providers}}。\n\n[設定を開く]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "セッション合計コスト:", - "kilocode:autocomplete.statusBar.tooltip.provider": "プロバイダー:", - "kilocode:autocomplete.statusBar.tooltip.model": "モデル:", - "kilocode:autocomplete.statusBar.tooltip.profile": "プロファイル: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "デフォルト", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "{{startTime}}から{{endTime}}の間に{{count}}回の補完を実行し、合計コストは{{cost}}です。", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "オートコンプリートは{{provider}}経由で{{model}}によって提供されています。", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "コードを分析中...", - "kilocode:autocomplete.progress.generating": "編集提案を生成中...", - "kilocode:autocomplete.progress.processing": "編集提案を処理中...", - "kilocode:autocomplete.progress.showing": "編集提案を表示中...", - "kilocode:autocomplete.input.title": "Kilo Code: クイックタスク", - "kilocode:autocomplete.input.placeholder": "例：「この関数をより効率的にリファクタリングして」", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: 編集提案を生成", - "kilocode:autocomplete.commands.displaySuggestions": "編集提案を表示", - "kilocode:autocomplete.commands.cancelSuggestions": "編集提案をキャンセル", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "現在の編集提案を適用", - "kilocode:autocomplete.commands.applyAllSuggestions": "すべての編集提案を適用", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: 編集提案", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "クイックタスクと編集提案でお手伝いできます。", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code AutocompleteがGitHub Copilotとの競合によってブロックされています。これを修正するには、Copilotのインライン提案を無効にする必要があります。", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilotを無効にする", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Autocompleteを無効にする", - "kilocode:autocomplete.creditsExhausted.message": - "アカウントのクレジットが残っていないため、Kilo Code Autocompleteが一時停止されました。オートコンプリートを再開するにはクレジットを追加してください。", - "kilocode:autocomplete.creditsExhausted.addCredits": "クレジットを追加", - "kilocode:autocomplete.authError.message": - "認証エラーのため、Kilo Code Autocompleteが一時停止されました。再度サインインしてください。", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/ko.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/ko.ts deleted file mode 100644 index 9258f8f7a5..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/ko.ts +++ /dev/null @@ -1,48 +0,0 @@ -// ko runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "일시 중지됨", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (비활성화됨)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**자동완성 모델이 구성되지 않았습니다**\n\n자동완성을 활성화하려면 다음 지원되는 제공업체 중 하나로 프로필을 추가하세요: {{providers}}.\n\n[설정 열기]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "세션 총 비용:", - "kilocode:autocomplete.statusBar.tooltip.provider": "제공업체:", - "kilocode:autocomplete.statusBar.tooltip.model": "모델:", - "kilocode:autocomplete.statusBar.tooltip.profile": "프로필: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "기본값", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "{{startTime}}부터 {{endTime}}까지 {{count}}회 완성을 수행했으며, 총 비용은 {{cost}}입니다.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": "자동완성은 {{provider}}를 통해 {{model}}에서 제공됩니다.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "코드 분석 중...", - "kilocode:autocomplete.progress.generating": "제안된 편집 생성 중...", - "kilocode:autocomplete.progress.processing": "제안된 편집 처리 중...", - "kilocode:autocomplete.progress.showing": "제안된 편집 표시 중...", - "kilocode:autocomplete.input.title": "Kilo Code: 빠른 작업", - "kilocode:autocomplete.input.placeholder": "예: '이 함수를 더 효율적으로 리팩토링해줘'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: 제안된 편집 생성", - "kilocode:autocomplete.commands.displaySuggestions": "제안된 편집 표시", - "kilocode:autocomplete.commands.cancelSuggestions": "제안된 편집 취소", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "현재 제안된 편집 적용", - "kilocode:autocomplete.commands.applyAllSuggestions": "모든 제안된 편집 적용", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: 제안된 편집", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "빠른 작업과 제안된 편집으로 도움을 드릴 수 있습니다.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete가 GitHub Copilot과의 충돌로 인해 차단되고 있습니다. 이를 해결하려면 Copilot의 인라인 제안을 비활성화해야 합니다.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot 비활성화", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Autocomplete 비활성화", - "kilocode:autocomplete.creditsExhausted.message": - "계정에 남은 크레딧이 없어 Kilo Code Autocomplete가 일시 중지되었습니다. 자동완성을 재개하려면 크레딧을 추가하세요.", - "kilocode:autocomplete.creditsExhausted.addCredits": "크레딧 추가", - "kilocode:autocomplete.authError.message": - "인증 오류로 인해 Kilo Code Autocomplete가 일시 중지되었습니다. 다시 로그인해 주세요.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/nl.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/nl.ts deleted file mode 100644 index f7859dff23..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/nl.ts +++ /dev/null @@ -1,50 +0,0 @@ -// Dutch runtime translations for autocomplete (kilocode:autocomplete.* namespace) -// Source: src/i18n/locales/nl/kilocode.json → "autocomplete" section - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "gepauzeerd", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (uitgeschakeld)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Geen autocomplete-model geconfigureerd**\n\nVoeg een profiel toe met een van deze ondersteunde providers om autocomplete in te schakelen: {{providers}}.\n\n[Instellingen openen]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Totale sessiekosten:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Provider:", - "kilocode:autocomplete.statusBar.tooltip.model": "Model:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Profiel: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Standaard", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "{{count}} aanvullingen uitgevoerd tussen {{startTime}} en {{endTime}}, voor totale kosten van {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Automatische aanvullingen geleverd door {{model}} via {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Je code analyseren...", - "kilocode:autocomplete.progress.generating": "Voorgestelde bewerkingen genereren...", - "kilocode:autocomplete.progress.processing": "Voorgestelde bewerkingen verwerken...", - "kilocode:autocomplete.progress.showing": "Voorgestelde bewerkingen weergeven...", - "kilocode:autocomplete.input.title": "Kilo Code: Snelle taak", - "kilocode:autocomplete.input.placeholder": "bijv. 'herschrijf deze functie om efficiënter te zijn'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Voorgestelde bewerkingen genereren", - "kilocode:autocomplete.commands.displaySuggestions": "Voorgestelde bewerkingen weergeven", - "kilocode:autocomplete.commands.cancelSuggestions": "Voorgestelde bewerkingen annuleren", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Huidige voorgestelde bewerking toepassen", - "kilocode:autocomplete.commands.applyAllSuggestions": "Alle voorgestelde bewerkingen toepassen", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Voorgestelde bewerkingen", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "Ik kan je helpen met snelle taken en voorgestelde bewerkingen.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "De Kilo Code Autocomplete wordt geblokkeerd door een conflict met GitHub Copilot. Om dit op te lossen, moet je de inline suggesties van Copilot uitschakelen.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot uitschakelen", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Autocomplete uitschakelen", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete is gepauzeerd omdat je account geen tegoed meer heeft. Voeg tegoed toe om autocomplete te hervatten.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Tegoed toevoegen", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete is gepauzeerd vanwege een authenticatiefout. Meld je opnieuw aan.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ar.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ar.ts deleted file mode 100644 index 53561ae074..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ar.ts +++ /dev/null @@ -1,13 +0,0 @@ -// ar package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "اضغط 'Enter' للتأكيد أو 'Escape' للإلغاء", - "autocomplete.input.placeholder": "صف ما تريد فعله...", - "autocomplete.commands.generateSuggestions": "Kilo Code: إنشاء التعديلات المقترحة", - "autocomplete.commands.displaySuggestions": "عرض التعديلات المقترحة", - "autocomplete.commands.cancelSuggestions": "إلغاء التعديلات المقترحة", - "autocomplete.commands.applyCurrentSuggestion": "تطبيق التعديل المقترح الحالي", - "autocomplete.commands.applyAllSuggestions": "تطبيق جميع التعديلات المقترحة", - "autocomplete.commands.goToNextSuggestion": "انتقل إلى الاقتراح التالي", - "autocomplete.commands.goToPreviousSuggestion": "انتقل إلى الاقتراح السابق", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ca.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ca.ts deleted file mode 100644 index 7b7bfdd3eb..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ca.ts +++ /dev/null @@ -1,13 +0,0 @@ -// ca package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Premeu 'Enter' per confirmar o 'Escape' per cancel·lar", - "autocomplete.input.placeholder": "Descriviu què voleu fer...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Generar Edicions Suggerides", - "autocomplete.commands.displaySuggestions": "Mostrar Edicions Suggerides", - "autocomplete.commands.cancelSuggestions": "Cancel·lar Edicions Suggerides", - "autocomplete.commands.applyCurrentSuggestion": "Aplicar Edició Suggerida Actual", - "autocomplete.commands.applyAllSuggestions": "Aplicar Totes les Edicions Suggerides", - "autocomplete.commands.goToNextSuggestion": "Anar al Suggeriment Següent", - "autocomplete.commands.goToPreviousSuggestion": "Anar al Suggeriment Anterior", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-cs.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-cs.ts deleted file mode 100644 index d7cfeef27b..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-cs.ts +++ /dev/null @@ -1,13 +0,0 @@ -// cs package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Stiskněte 'Enter' pro potvrzení nebo 'Escape' pro zrušení", - "autocomplete.input.placeholder": "Popište, co chcete udělat...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Generovat Navrhované Úpravy", - "autocomplete.commands.displaySuggestions": "Zobrazit Navrhované Úpravy", - "autocomplete.commands.cancelSuggestions": "Zrušit Navrhované Úpravy", - "autocomplete.commands.applyCurrentSuggestion": "Použít Aktuální Navrženou Úpravu", - "autocomplete.commands.applyAllSuggestions": "Použít Všechny Navrhované Úpravy", - "autocomplete.commands.goToNextSuggestion": "Přejít na Další Návrh", - "autocomplete.commands.goToPreviousSuggestion": "Přejít na Předchozí Návrh", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-de.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-de.ts deleted file mode 100644 index 980859a4e5..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-de.ts +++ /dev/null @@ -1,13 +0,0 @@ -// de package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Kilo Code Geisterschreiber", - "autocomplete.input.placeholder": "Beschreiben Sie, was Sie programmieren möchten...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Vorgeschlagene Bearbeitungen Generieren", - "autocomplete.commands.displaySuggestions": "Vorgeschlagene Bearbeitungen Anzeigen", - "autocomplete.commands.cancelSuggestions": "Vorgeschlagene Bearbeitungen Abbrechen", - "autocomplete.commands.applyCurrentSuggestion": "Aktuelle Vorgeschlagene Bearbeitung Anwenden", - "autocomplete.commands.applyAllSuggestions": "Alle Vorgeschlagenen Bearbeitungen Anwenden", - "autocomplete.commands.goToNextSuggestion": "Zur Nächsten Vorgeschlagenen Bearbeitung", - "autocomplete.commands.goToPreviousSuggestion": "Zur Vorherigen Vorgeschlagenen Bearbeitung", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-en.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-en.ts deleted file mode 100644 index b87d3668e0..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-en.ts +++ /dev/null @@ -1,14 +0,0 @@ -// English package.nls translations for autocomplete (used in package.json command titles/descriptions) -// Source: src/package.nls.json → "autocomplete.*" keys - -export const dict = { - "autocomplete.input.title": "Press 'Enter' to confirm or 'Escape' to cancel", - "autocomplete.input.placeholder": "Describe what you want to do...", - "autocomplete.commands.generateSuggestions": "Generate Suggested Edits", - "autocomplete.commands.displaySuggestions": "Display Suggested Edits", - "autocomplete.commands.cancelSuggestions": "Cancel Suggested Edits", - "autocomplete.commands.applyCurrentSuggestion": "Apply Current Suggested Edit", - "autocomplete.commands.applyAllSuggestions": "Apply All Suggested Edits", - "autocomplete.commands.goToNextSuggestion": "Go To Next Suggestion", - "autocomplete.commands.goToPreviousSuggestion": "Go To Previous Suggestion", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-es.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-es.ts deleted file mode 100644 index e307b9d0b4..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-es.ts +++ /dev/null @@ -1,13 +0,0 @@ -// es package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Presiona 'Enter' para confirmar o 'Escape' para cancelar", - "autocomplete.input.placeholder": "Describe lo que quieres hacer...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Generar Ediciones Sugeridas", - "autocomplete.commands.displaySuggestions": "Mostrar Ediciones Sugeridas", - "autocomplete.commands.cancelSuggestions": "Cancelar Ediciones Sugeridas", - "autocomplete.commands.applyCurrentSuggestion": "Aplicar Edición Sugerida Actual", - "autocomplete.commands.applyAllSuggestions": "Aplicar Todas las Ediciones Sugeridas", - "autocomplete.commands.goToNextSuggestion": "Ir a la Siguiente Sugerencia", - "autocomplete.commands.goToPreviousSuggestion": "Ir a la Sugerencia Anterior", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-fr.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-fr.ts deleted file mode 100644 index cf02624704..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-fr.ts +++ /dev/null @@ -1,13 +0,0 @@ -// fr package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Écrivain fantôme Kilo Code", - "autocomplete.input.placeholder": "Décrivez ce que vous voulez coder...", - "autocomplete.commands.generateSuggestions": "Kilo Code : Générer des Modifications Suggérées", - "autocomplete.commands.displaySuggestions": "Afficher les Modifications Suggérées", - "autocomplete.commands.cancelSuggestions": "Annuler les Modifications Suggérées", - "autocomplete.commands.applyCurrentSuggestion": "Appliquer la Modification Suggérée Actuelle", - "autocomplete.commands.applyAllSuggestions": "Appliquer Toutes les Modifications Suggérées", - "autocomplete.commands.goToNextSuggestion": "Aller à la Suggestion Suivante", - "autocomplete.commands.goToPreviousSuggestion": "Aller à la Suggestion Précédente", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-hi.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-hi.ts deleted file mode 100644 index de48ca0dd5..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-hi.ts +++ /dev/null @@ -1,13 +0,0 @@ -// hi package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "पुष्टि के लिए 'Enter' दबाएं या रद्द करने के लिए 'Escape' दबाएं", - "autocomplete.input.placeholder": "वर्णन करें कि आप क्या करना चाहते हैं...", - "autocomplete.commands.generateSuggestions": "Kilo Code: सुझाए गए संपादन जेनरेट करें", - "autocomplete.commands.displaySuggestions": "सुझाए गए संपादन दिखाएं", - "autocomplete.commands.cancelSuggestions": "सुझाए गए संपादन रद्द करें", - "autocomplete.commands.applyCurrentSuggestion": "वर्तमान सुझाया गया संपादन लागू करें", - "autocomplete.commands.applyAllSuggestions": "सभी सुझाए गए संपादन लागू करें", - "autocomplete.commands.goToNextSuggestion": "अगले सुझाव पर जाएं", - "autocomplete.commands.goToPreviousSuggestion": "पिछले सुझाव पर जाएं", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-id.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-id.ts deleted file mode 100644 index 704fe5009d..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-id.ts +++ /dev/null @@ -1,13 +0,0 @@ -// id package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Tekan 'Enter' untuk konfirmasi atau 'Escape' untuk membatalkan", - "autocomplete.input.placeholder": "Jelaskan apa yang ingin Anda lakukan...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Buat Saran Pengeditan", - "autocomplete.commands.displaySuggestions": "Tampilkan Saran Pengeditan", - "autocomplete.commands.cancelSuggestions": "Batalkan Saran Pengeditan", - "autocomplete.commands.applyCurrentSuggestion": "Terapkan Saran Pengeditan Saat Ini", - "autocomplete.commands.applyAllSuggestions": "Terapkan Semua Saran Pengeditan", - "autocomplete.commands.goToNextSuggestion": "Pergi ke Saran Berikutnya", - "autocomplete.commands.goToPreviousSuggestion": "Pergi ke Saran Sebelumnya", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-it.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-it.ts deleted file mode 100644 index 8d205775fb..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-it.ts +++ /dev/null @@ -1,13 +0,0 @@ -// it package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Scrittore Fantasma Kilo Code", - "autocomplete.input.placeholder": "Descrivi cosa vuoi programmare...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Genera Modifiche Suggerite", - "autocomplete.commands.displaySuggestions": "Visualizza Modifiche Suggerite", - "autocomplete.commands.cancelSuggestions": "Annulla Modifiche Suggerite", - "autocomplete.commands.applyCurrentSuggestion": "Applica Modifica Suggerita Corrente", - "autocomplete.commands.applyAllSuggestions": "Applica Tutte le Modifiche Suggerite", - "autocomplete.commands.goToNextSuggestion": "Vai alla Prossima Suggerimento", - "autocomplete.commands.goToPreviousSuggestion": "Vai al Suggerimento Precedente", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ja.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ja.ts deleted file mode 100644 index 263dbf53a7..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ja.ts +++ /dev/null @@ -1,13 +0,0 @@ -// ja package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Kilo Code ゴーストライター", - "autocomplete.input.placeholder": "コーディングしたい内容を説明してください...", - "autocomplete.commands.generateSuggestions": "Kilo Code: 提案された編集を生成", - "autocomplete.commands.displaySuggestions": "提案された編集を表示", - "autocomplete.commands.cancelSuggestions": "提案された編集をキャンセル", - "autocomplete.commands.applyCurrentSuggestion": "現在の提案された編集を適用", - "autocomplete.commands.applyAllSuggestions": "すべての提案された編集を適用", - "autocomplete.commands.goToNextSuggestion": "次の提案に移動", - "autocomplete.commands.goToPreviousSuggestion": "前の提案に移動", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ko.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ko.ts deleted file mode 100644 index 84e00705a4..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ko.ts +++ /dev/null @@ -1,13 +0,0 @@ -// ko package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "'Enter'를 눌러 확인하거나 'Escape'를 눌러 취소하세요", - "autocomplete.input.placeholder": "무엇을 하고 싶은지 설명해주세요...", - "autocomplete.commands.generateSuggestions": "Kilo Code: 편집 제안 생성", - "autocomplete.commands.displaySuggestions": "편집 제안 표시", - "autocomplete.commands.cancelSuggestions": "편집 제안 취소", - "autocomplete.commands.applyCurrentSuggestion": "현재 편집 제안 적용", - "autocomplete.commands.applyAllSuggestions": "모든 편집 제안 적용", - "autocomplete.commands.goToNextSuggestion": "다음 제안으로 이동", - "autocomplete.commands.goToPreviousSuggestion": "이전 제안으로 이동", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-nl.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-nl.ts deleted file mode 100644 index 9b8c240c29..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-nl.ts +++ /dev/null @@ -1,13 +0,0 @@ -// nl package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Druk op 'Enter' om te bevestigen of 'Escape' om te annuleren", - "autocomplete.input.placeholder": "Beschrijf wat je wilt doen...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Bewerkingssuggesties Genereren", - "autocomplete.commands.displaySuggestions": "Bewerkingssuggesties Weergeven", - "autocomplete.commands.cancelSuggestions": "Bewerkingssuggesties Annuleren", - "autocomplete.commands.applyCurrentSuggestion": "Huidige Bewerkingssuggestie Toepassen", - "autocomplete.commands.applyAllSuggestions": "Alle Bewerkingssuggesties Toepassen", - "autocomplete.commands.goToNextSuggestion": "Ga Naar Volgende Suggestie", - "autocomplete.commands.goToPreviousSuggestion": "Ga Naar Vorige Suggestie", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-pl.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-pl.ts deleted file mode 100644 index e113d8eff9..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-pl.ts +++ /dev/null @@ -1,13 +0,0 @@ -// pl package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Naciśnij 'Enter' aby potwierdzić lub 'Escape' aby anulować", - "autocomplete.input.placeholder": "Opisz co chcesz zrobić...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Generuj Sugestie Edycji", - "autocomplete.commands.displaySuggestions": "Wyświetl Sugestie Edycji", - "autocomplete.commands.cancelSuggestions": "Anuluj Sugestie Edycji", - "autocomplete.commands.applyCurrentSuggestion": "Zastosuj Bieżącą Sugestię Edycji", - "autocomplete.commands.applyAllSuggestions": "Zastosuj Wszystkie Sugestie Edycji", - "autocomplete.commands.goToNextSuggestion": "Przejdź do Następnej Sugestii", - "autocomplete.commands.goToPreviousSuggestion": "Przejdź do Poprzedniej Sugestii", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-pt-BR.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-pt-BR.ts deleted file mode 100644 index 2fe4f35f59..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-pt-BR.ts +++ /dev/null @@ -1,13 +0,0 @@ -// pt-BR package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Pressione 'Enter' para confirmar ou 'Escape' para cancelar", - "autocomplete.input.placeholder": "Descreva o que você quer fazer...", - "autocomplete.commands.generateSuggestions": "Gerar Sugestões de Edição", - "autocomplete.commands.displaySuggestions": "Exibir Sugestões de Edição", - "autocomplete.commands.cancelSuggestions": "Cancelar Sugestões de Edição", - "autocomplete.commands.applyCurrentSuggestion": "Aplicar a Sugestão de Edição Atual", - "autocomplete.commands.applyAllSuggestions": "Aplicar Todas as Sugestões de Edição", - "autocomplete.commands.goToNextSuggestion": "Ir para a Próxima Sugestão", - "autocomplete.commands.goToPreviousSuggestion": "Voltar para a Sugestão Anterior", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ru.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ru.ts deleted file mode 100644 index 025ddcce0e..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-ru.ts +++ /dev/null @@ -1,13 +0,0 @@ -// ru package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Нажмите 'Enter' для подтверждения или 'Escape' для отмены", - "autocomplete.input.placeholder": "Опишите, что вы хотите сделать...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Генерировать Предлагаемые Правки", - "autocomplete.commands.displaySuggestions": "Показать Предлагаемые Правки", - "autocomplete.commands.cancelSuggestions": "Отменить Предлагаемые Правки", - "autocomplete.commands.applyCurrentSuggestion": "Применить Текущую Предлагаемую Правку", - "autocomplete.commands.applyAllSuggestions": "Применить Все Предлагаемые Правки", - "autocomplete.commands.goToNextSuggestion": "Перейти к Следующему Предложению", - "autocomplete.commands.goToPreviousSuggestion": "Перейти к Предыдущему Предложению", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-sk.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-sk.ts deleted file mode 100644 index ea6dc5b728..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-sk.ts +++ /dev/null @@ -1,13 +0,0 @@ -// sk package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Stlačte 'Enter' pre potvrdenie alebo 'Escape' pre zrušenie", - "autocomplete.input.placeholder": "Popíšte, čo chcete urobiť...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Generovať Navrhované Úpravy", - "autocomplete.commands.displaySuggestions": "Zobraziť Navrhované Úpravy", - "autocomplete.commands.cancelSuggestions": "Zrušiť Navrhované Úpravy", - "autocomplete.commands.applyCurrentSuggestion": "Použiť Aktuálnu Navrhnutú Úpravu", - "autocomplete.commands.applyAllSuggestions": "Použiť Všetky Navrhované Úpravy", - "autocomplete.commands.goToNextSuggestion": "Prejsť na Ďalší Návrh", - "autocomplete.commands.goToPreviousSuggestion": "Prejsť na Predchádzajúci Návrh", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-th.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-th.ts deleted file mode 100644 index ffa6b25c62..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-th.ts +++ /dev/null @@ -1,13 +0,0 @@ -// th package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "กด 'Enter' เพื่อยืนยันหรือ 'Escape' เพื่อยกเลิก", - "autocomplete.input.placeholder": "อธิบายสิ่งที่คุณต้องการทำ...", - "autocomplete.commands.generateSuggestions": "Kilo Code: สร้างข้อเสนอแนะการแก้ไข", - "autocomplete.commands.displaySuggestions": "แสดงข้อเสนอแนะการแก้ไข", - "autocomplete.commands.cancelSuggestions": "ยกเลิกข้อเสนอแนะการแก้ไข", - "autocomplete.commands.applyCurrentSuggestion": "ใช้ข้อเสนอแนะการแก้ไขปัจจุบัน", - "autocomplete.commands.applyAllSuggestions": "ใช้ข้อเสนอแนะการแก้ไขทั้งหมด", - "autocomplete.commands.goToNextSuggestion": "ไปยังข้อเสนอแนะถัดไป", - "autocomplete.commands.goToPreviousSuggestion": "ไปยังข้อเสนอแนะก่อนหน้า", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-tr.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-tr.ts deleted file mode 100644 index e1fc96af22..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-tr.ts +++ /dev/null @@ -1,13 +0,0 @@ -// tr package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Onaylamak için 'Enter'a, iptal etmek için 'Escape'e basın", - "autocomplete.input.placeholder": "Ne yapmak istediğinizi açıklayın...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Düzenleme Önerileri Oluştur", - "autocomplete.commands.displaySuggestions": "Düzenleme Önerilerini Göster", - "autocomplete.commands.cancelSuggestions": "Düzenleme Önerilerini İptal Et", - "autocomplete.commands.applyCurrentSuggestion": "Mevcut Düzenleme Önerisini Uygula", - "autocomplete.commands.applyAllSuggestions": "Tüm Düzenleme Önerilerini Uygula", - "autocomplete.commands.goToNextSuggestion": "Sonraki Öneriye Git", - "autocomplete.commands.goToPreviousSuggestion": "Önceki Öneriye Git", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-uk.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-uk.ts deleted file mode 100644 index 0cd82294c7..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-uk.ts +++ /dev/null @@ -1,13 +0,0 @@ -// uk package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Натисніть 'Enter' для підтвердження або 'Escape' для скасування", - "autocomplete.input.placeholder": "Опишіть, що ви хочете зробити...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Генерувати Пропозиції Редагування", - "autocomplete.commands.displaySuggestions": "Показати Пропозиції Редагування", - "autocomplete.commands.cancelSuggestions": "Скасувати Пропозиції Редагування", - "autocomplete.commands.applyCurrentSuggestion": "Застосувати Поточну Пропозицію Редагування", - "autocomplete.commands.applyAllSuggestions": "Застосувати Всі Пропозиції Редагування", - "autocomplete.commands.goToNextSuggestion": "Перейти до Наступної Пропозиції", - "autocomplete.commands.goToPreviousSuggestion": "Перейти до Попередньої Пропозиції", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-vi.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-vi.ts deleted file mode 100644 index 67db13e4a4..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-vi.ts +++ /dev/null @@ -1,13 +0,0 @@ -// vi package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Nhấn 'Enter' để xác nhận hoặc 'Escape' để hủy", - "autocomplete.input.placeholder": "Mô tả những gì bạn muốn làm...", - "autocomplete.commands.generateSuggestions": "Kilo Code: Tạo Gợi Ý Chỉnh Sửa", - "autocomplete.commands.displaySuggestions": "Hiển Thị Gợi Ý Chỉnh Sửa", - "autocomplete.commands.cancelSuggestions": "Hủy Gợi Ý Chỉnh Sửa", - "autocomplete.commands.applyCurrentSuggestion": "Áp Dụng Gợi Ý Chỉnh Sửa Hiện Tại", - "autocomplete.commands.applyAllSuggestions": "Áp Dụng Tất Cả Gợi Ý Chỉnh Sửa", - "autocomplete.commands.goToNextSuggestion": "Đi Đến Gợi Ý Tiếp Theo", - "autocomplete.commands.goToPreviousSuggestion": "Đi Đến Gợi Ý Trước Đó", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-zh-CN.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-zh-CN.ts deleted file mode 100644 index aaf8a7b2bc..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-zh-CN.ts +++ /dev/null @@ -1,13 +0,0 @@ -// zh-CN package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "Kilo Code 幽灵写手", - "autocomplete.input.placeholder": "描述您想要编程的内容...", - "autocomplete.commands.generateSuggestions": "Kilo Code：生成建议编辑", - "autocomplete.commands.displaySuggestions": "显示建议编辑", - "autocomplete.commands.cancelSuggestions": "取消建议编辑", - "autocomplete.commands.applyCurrentSuggestion": "应用当前建议编辑", - "autocomplete.commands.applyAllSuggestions": "应用所有建议编辑", - "autocomplete.commands.goToNextSuggestion": "转到下一个建议", - "autocomplete.commands.goToPreviousSuggestion": "转到上一个建议", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-zh-TW.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-zh-TW.ts deleted file mode 100644 index 1e5285d2f8..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/package-nls-zh-TW.ts +++ /dev/null @@ -1,13 +0,0 @@ -// zh-TW package.nls translations for autocomplete - -export const dict = { - "autocomplete.input.title": "按 'Enter' 確認或按 'Escape' 取消", - "autocomplete.input.placeholder": "描述您想要做什麼...", - "autocomplete.commands.generateSuggestions": "Kilo Code: 產生編輯建議", - "autocomplete.commands.displaySuggestions": "顯示編輯建議", - "autocomplete.commands.cancelSuggestions": "取消編輯建議", - "autocomplete.commands.applyCurrentSuggestion": "套用目前編輯建議", - "autocomplete.commands.applyAllSuggestions": "套用所有編輯建議", - "autocomplete.commands.goToNextSuggestion": "前往下一個建議", - "autocomplete.commands.goToPreviousSuggestion": "前往上一個建議", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/pl.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/pl.ts deleted file mode 100644 index 68dc4fa7ca..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/pl.ts +++ /dev/null @@ -1,49 +0,0 @@ -// pl runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "wstrzymane", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (wyłączone)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Nie skonfigurowano modelu autouzupełniania**\n\nAby włączyć autouzupełnianie, dodaj profil z jednym z tych obsługiwanych dostawców: {{providers}}.\n\n[Otwórz Ustawienia]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Całkowity koszt sesji:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Dostawca:", - "kilocode:autocomplete.statusBar.tooltip.model": "Model:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Domyślny", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Wykonano {{count}} uzupełnień między {{startTime}} a {{endTime}}, za łączny koszt {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Autouzupełnianie zapewniane przez {{model}} za pośrednictwem {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Analizuję twój kod...", - "kilocode:autocomplete.progress.generating": "Generuję sugerowane edycje...", - "kilocode:autocomplete.progress.processing": "Przetwarzam sugerowane edycje...", - "kilocode:autocomplete.progress.showing": "Wyświetlam sugerowane edycje...", - "kilocode:autocomplete.input.title": "Kilo Code: Szybkie Zadanie", - "kilocode:autocomplete.input.placeholder": "np. 'zrefaktoruj tę funkcję, aby była bardziej wydajna'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generuj Sugerowane Edycje", - "kilocode:autocomplete.commands.displaySuggestions": "Wyświetl Sugerowane Edycje", - "kilocode:autocomplete.commands.cancelSuggestions": "Anuluj Sugerowane Edycje", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Zastosuj Bieżącą Sugerowaną Edycję", - "kilocode:autocomplete.commands.applyAllSuggestions": "Zastosuj Wszystkie Sugerowane Edycje", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Sugerowane Edycje", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "Mogę pomóc ci w szybkich zadaniach i sugerowanych edycjach.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete jest blokowane przez konflikt z GitHub Copilot. Aby to naprawić, musisz wyłączyć sugestie inline Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Wyłącz Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Wyłącz Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete zostało wstrzymane, ponieważ na twoim koncie nie ma pozostałych kredytów. Dodaj kredyty, aby wznowić autouzupełnianie.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Dodaj kredyty", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete zostało wstrzymane z powodu błędu uwierzytelniania. Zaloguj się ponownie.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/pt-BR.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/pt-BR.ts deleted file mode 100644 index 067371a6fa..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/pt-BR.ts +++ /dev/null @@ -1,48 +0,0 @@ -// pt-BR runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "pausado", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (desabilitado)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Nenhum modelo de autocompletar configurado**\n\nPara habilitar o autocompletar, adicione um perfil com um destes provedores suportados: {{providers}}.\n\n[Abrir Configurações]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Custo total da sessão:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Provedor:", - "kilocode:autocomplete.statusBar.tooltip.model": "Modelo:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Perfil: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Padrão", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Realizadas {{count}} conclusões entre {{startTime}} e {{endTime}}, por um custo total de {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Autocompletações fornecidas por {{model}} via {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Analisando seu código...", - "kilocode:autocomplete.progress.generating": "Gerando edições sugeridas...", - "kilocode:autocomplete.progress.processing": "Processando edições sugeridas...", - "kilocode:autocomplete.progress.showing": "Exibindo edições sugeridas...", - "kilocode:autocomplete.input.title": "Kilo Code: Tarefa Rápida", - "kilocode:autocomplete.input.placeholder": "ex., 'refatore esta função para ser mais eficiente'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Gerar Edições Sugeridas", - "kilocode:autocomplete.commands.displaySuggestions": "Exibir Edições Sugeridas", - "kilocode:autocomplete.commands.cancelSuggestions": "Cancelar Edições Sugeridas", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Aplicar Edição Sugerida Atual", - "kilocode:autocomplete.commands.applyAllSuggestions": "Aplicar Todas as Edições Sugeridas", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Edições Sugeridas", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "Posso te ajudar com tarefas rápidas e edições sugeridas.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "O Kilo Code Autocomplete está sendo bloqueado por um conflito com o GitHub Copilot. Para corrigir isso, você deve desabilitar as sugestões inline do Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Desabilitar Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Desabilitar Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "O Kilo Code Autocomplete foi pausado porque sua conta não tem créditos restantes. Adicione créditos para retomar o autocompletar.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Adicionar créditos", - "kilocode:autocomplete.authError.message": - "O Kilo Code Autocomplete foi pausado devido a um erro de autenticação. Por favor, faça login novamente.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/ru.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/ru.ts deleted file mode 100644 index 7fdfa0a89a..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/ru.ts +++ /dev/null @@ -1,50 +0,0 @@ -// ru runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "приостановлено", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (отключено)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Модель автодополнения не настроена**\n\nЧтобы включить автодополнение, добавьте профиль с одним из поддерживаемых провайдеров: {{providers}}.\n\n[Открыть Настройки]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Общая стоимость сессии:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Провайдер:", - "kilocode:autocomplete.statusBar.tooltip.model": "Модель:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Профиль: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "По умолчанию", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Выполнено {{count}} автодополнений между {{startTime}} и {{endTime}}, общая стоимость {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Автодополнение предоставляется {{model}} через {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Анализирую твой код...", - "kilocode:autocomplete.progress.generating": "Генерирую предлагаемые правки...", - "kilocode:autocomplete.progress.processing": "Обрабатываю предлагаемые правки...", - "kilocode:autocomplete.progress.showing": "Показываю предлагаемые правки...", - "kilocode:autocomplete.input.title": "Kilo Code: Быстрая Задача", - "kilocode:autocomplete.input.placeholder": "напр., 'рефактори эту функцию для большей эффективности'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Генерировать Предлагаемые Правки", - "kilocode:autocomplete.commands.displaySuggestions": "Показать Предлагаемые Правки", - "kilocode:autocomplete.commands.cancelSuggestions": "Отменить Предлагаемые Правки", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Применить Текущую Предлагаемую Правку", - "kilocode:autocomplete.commands.applyAllSuggestions": "Применить Все Предлагаемые Правки", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Предлагаемые Правки", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": - "Я могу помочь тебе с быстрыми задачами и предлагаемыми правками.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete блокируется конфликтом с GitHub Copilot. Чтобы исправить это, ты должен отключить встроенные предложения Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Отключить Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Отключить Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete приостановлено, так как на твоём аккаунте не осталось кредитов. Добавь кредиты, чтобы возобновить автодополнение.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Добавить кредиты", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete приостановлено из-за ошибки аутентификации. Пожалуйста, войди снова.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/sk.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/sk.ts deleted file mode 100644 index 04b76caa5c..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/sk.ts +++ /dev/null @@ -1,49 +0,0 @@ -// sk runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "pozastavené", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (zakázané)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Nie je nakonfigurovaný žiadny model automatického doplňovania**\n\nPre povolenie automatického doplňovania pridaj profil s jedným z týchto podporovaných poskytovateľov: {{providers}}.\n\n[Otvoriť Nastavenia]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Celkové náklady relácie:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Poskytovateľ:", - "kilocode:autocomplete.statusBar.tooltip.model": "Model:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Predvolený", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Vykonaných {{count}} dokončení medzi {{startTime}} a {{endTime}}, s celkovými nákladmi {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Automatické dokončovanie poskytuje {{model}} cez {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Analyzujem tvoj kód...", - "kilocode:autocomplete.progress.generating": "Generujem navrhované úpravy...", - "kilocode:autocomplete.progress.processing": "Spracovávam navrhované úpravy...", - "kilocode:autocomplete.progress.showing": "Zobrazujem navrhované úpravy...", - "kilocode:autocomplete.input.title": "Kilo Code: Rýchla úloha", - "kilocode:autocomplete.input.placeholder": "napr. 'refaktoruj túto funkciu, aby bola efektívnejšia'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Generovať navrhované úpravy", - "kilocode:autocomplete.commands.displaySuggestions": "Zobraziť navrhované úpravy", - "kilocode:autocomplete.commands.cancelSuggestions": "Zrušiť navrhované úpravy", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Použiť aktuálnu navrhnutú úpravu", - "kilocode:autocomplete.commands.applyAllSuggestions": "Použiť všetky navrhované úpravy", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Navrhované úpravy", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "Môžem ti pomôcť s rýchlymi úlohami a navrhnutými úpravami.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete je blokované konfliktom s GitHub Copilot. Pre vyriešenie tohto problému musíš zakázať inline návrhy Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Zakázať Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Zakázať Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete bolo pozastavené, pretože na tvojom účte nezostali žiadne kredity. Pridaj kredity na obnovenie automatického dopĺňania.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Pridať kredity", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete bolo pozastavené kvôli chybe overenia. Prosím, prihlás sa znova.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/th.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/th.ts deleted file mode 100644 index 4a36a3ba6f..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/th.ts +++ /dev/null @@ -1,49 +0,0 @@ -// th runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "หยุดชั่วคราว", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (ปิดใช้งาน)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**ไม่ได้กำหนดค่าโมเดลการเติมข้อความอัตโนมัติ**\n\nหากต้องการเปิดใช้งานการเติมข้อความอัตโนมัติ ให้เพิ่มโปรไฟล์กับผู้ให้บริการที่รองรับเหล่านี้: {{providers}}\n\n[เปิดการตั้งค่า]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "ค่าใช้จ่ายรวมของเซสชัน:", - "kilocode:autocomplete.statusBar.tooltip.provider": "ผู้ให้บริการ:", - "kilocode:autocomplete.statusBar.tooltip.model": "โมเดล:", - "kilocode:autocomplete.statusBar.tooltip.profile": "โปรไฟล์: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "ค่าเริ่มต้น", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "ดำเนินการเติมเต็ม {{count}} ครั้งระหว่าง {{startTime}} ถึง {{endTime}} ด้วยค่าใช้จ่ายรวม {{cost}}", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "การเติมเต็มอัตโนมัติให้บริการโดย {{model}} ผ่าน {{provider}}", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "กำลังวิเคราะห์โค้ดของคุณ...", - "kilocode:autocomplete.progress.generating": "กำลังสร้างการแก้ไขที่แนะนำ...", - "kilocode:autocomplete.progress.processing": "กำลังประมวลผลการแก้ไขที่แนะนำ...", - "kilocode:autocomplete.progress.showing": "กำลังแสดงการแก้ไขที่แนะนำ...", - "kilocode:autocomplete.input.title": "Kilo Code: งานด่วน", - "kilocode:autocomplete.input.placeholder": "เช่น 'ปรับโครงสร้างฟังก์ชันนี้ให้มีประสิทธิภาพมากขึ้น'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: สร้างการแก้ไขที่แนะนำ", - "kilocode:autocomplete.commands.displaySuggestions": "แสดงการแก้ไขที่แนะนำ", - "kilocode:autocomplete.commands.cancelSuggestions": "ยกเลิกการแก้ไขที่แนะนำ", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "ใช้การแก้ไขที่แนะนำปัจจุบัน", - "kilocode:autocomplete.commands.applyAllSuggestions": "ใช้การแก้ไขที่แนะนำทั้งหมด", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: การแก้ไขที่แนะนำ", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "ฉันสามารถช่วยคุณในงานด่วนและการแก้ไขที่แนะนำได้", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete ถูกบล็อกโดยความขัดแย้งกับ GitHub Copilot เพื่อแก้ไขปัญหานี้ คุณต้องปิดใช้งานคำแนะนำแบบอินไลน์ของ Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "ปิดใช้งาน Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "ปิดใช้งาน Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete ถูกหยุดชั่วคราวเนื่องจากบัญชีของคุณไม่มีเครดิตเหลือ เพิ่มเครดิตเพื่อใช้งานการเติมข้อความอัตโนมัติต่อ", - "kilocode:autocomplete.creditsExhausted.addCredits": "เพิ่มเครดิต", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete ถูกหยุดชั่วคราวเนื่องจากข้อผิดพลาดในการยืนยันตัวตน กรุณาเข้าสู่ระบบอีกครั้ง", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/tr.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/tr.ts deleted file mode 100644 index 56c5951178..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/tr.ts +++ /dev/null @@ -1,50 +0,0 @@ -// tr runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "duraklatıldı", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (devre dışı)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Otomatik tamamlama modeli yapılandırılmadı**\n\nOtomatik tamamlamayı etkinleştirmek için desteklenen sağlayıcılardan biriyle bir profil ekleyin: {{providers}}.\n\n[Ayarları Aç]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Oturum toplam maliyeti:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Sağlayıcı:", - "kilocode:autocomplete.statusBar.tooltip.model": "Model:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Profil: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Varsayılan", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "{{startTime}} ile {{endTime}} arasında {{count}} tamamlama gerçekleştirildi, toplam maliyet {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Otomatik tamamlamalar {{provider}} üzerinden {{model}} tarafından sağlanmaktadır.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Kodun analiz ediliyor...", - "kilocode:autocomplete.progress.generating": "Önerilen düzenlemeler oluşturuluyor...", - "kilocode:autocomplete.progress.processing": "Önerilen düzenlemeler işleniyor...", - "kilocode:autocomplete.progress.showing": "Önerilen düzenlemeler gösteriliyor...", - "kilocode:autocomplete.input.title": "Kilo Code: Hızlı Görev", - "kilocode:autocomplete.input.placeholder": "örn., 'bu fonksiyonu daha verimli olacak şekilde yeniden düzenle'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Önerilen Düzenlemeler Oluştur", - "kilocode:autocomplete.commands.displaySuggestions": "Önerilen Düzenlemeleri Göster", - "kilocode:autocomplete.commands.cancelSuggestions": "Önerilen Düzenlemeleri İptal Et", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Mevcut Önerilen Düzenlemeyi Uygula", - "kilocode:autocomplete.commands.applyAllSuggestions": "Tüm Önerilen Düzenlemeleri Uygula", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Önerilen Düzenlemeler", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": - "Hızlı görevler ve önerilen düzenlemeler konusunda sana yardımcı olabilirim.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete, GitHub Copilot ile bir çakışma nedeniyle engelleniyor. Bunu düzeltmek için Copilot'un satır içi önerilerini devre dışı bırakmalısın.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Copilot'u Devre Dışı Bırak", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Autocomplete'i Devre Dışı Bırak", - "kilocode:autocomplete.creditsExhausted.message": - "Hesabında kalan kredin olmadığı için Kilo Code Autocomplete duraklatıldı. Otomatik tamamlamayı sürdürmek için kredi ekle.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Kredi Ekle", - "kilocode:autocomplete.authError.message": - "Bir kimlik doğrulama hatası nedeniyle Kilo Code Autocomplete duraklatıldı. Lütfen tekrar giriş yap.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/uk.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/uk.ts deleted file mode 100644 index 9478c4aa7a..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/uk.ts +++ /dev/null @@ -1,49 +0,0 @@ -// uk runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "призупинено", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (вимкнено)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Модель автодоповнення не налаштована**\n\nЩоб увімкнути автодоповнення, додайте профіль з одним із підтримуваних провайдерів: {{providers}}.\n\n[Відкрити Налаштування]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Загальна вартість сесії:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Провайдер:", - "kilocode:autocomplete.statusBar.tooltip.model": "Модель:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Профіль: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "За замовчуванням", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Виконано {{count}} автодоповнень між {{startTime}} та {{endTime}}, загальна вартість {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Автодоповнення надається {{model}} через {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Аналізую твій код...", - "kilocode:autocomplete.progress.generating": "Генерую запропоновані правки...", - "kilocode:autocomplete.progress.processing": "Обробляю запропоновані правки...", - "kilocode:autocomplete.progress.showing": "Показую запропоновані правки...", - "kilocode:autocomplete.input.title": "Kilo Code: Швидке Завдання", - "kilocode:autocomplete.input.placeholder": "напр., 'рефактори цю функцію для більшої ефективності'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Генерувати Запропоновані Правки", - "kilocode:autocomplete.commands.displaySuggestions": "Показати Запропоновані Правки", - "kilocode:autocomplete.commands.cancelSuggestions": "Скасувати Запропоновані Правки", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Застосувати Поточну Запропоновану Правку", - "kilocode:autocomplete.commands.applyAllSuggestions": "Застосувати Всі Запропоновані Правки", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Запропоновані Правки", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": - "Я можу допомогти тобі зі швидкими завданнями та запропонованими правками.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete блокується конфліктом з GitHub Copilot. Щоб виправити це, ти повинен вимкнути вбудовані пропозиції Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Вимкнути Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Вимкнути Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete призупинено, оскільки на твоєму обліковому записі не залишилося кредитів. Додай кредити, щоб відновити автодоповнення.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Додати кредити", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete призупинено через помилку автентифікації. Будь ласка, увійди знову.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/vi.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/vi.ts deleted file mode 100644 index 17910b54e4..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/vi.ts +++ /dev/null @@ -1,50 +0,0 @@ -// vi runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "tạm dừng", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete (đã tắt)", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**Chưa cấu hình mô hình tự động hoàn thành**\n\nĐể bật tự động hoàn thành, hãy thêm hồ sơ với một trong các nhà cung cấp được hỗ trợ sau: {{providers}}.\n\n[Mở Cài đặt]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "Tổng chi phí phiên:", - "kilocode:autocomplete.statusBar.tooltip.provider": "Nhà cung cấp:", - "kilocode:autocomplete.statusBar.tooltip.model": "Mô hình:", - "kilocode:autocomplete.statusBar.tooltip.profile": "Hồ sơ: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "Mặc định", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "Đã thực hiện {{count}} lần hoàn thành từ {{startTime}} đến {{endTime}}, với tổng chi phí {{cost}}.", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": - "Tự động hoàn thành được cung cấp bởi {{model}} thông qua {{provider}}.", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "Đang phân tích mã của bạn...", - "kilocode:autocomplete.progress.generating": "Đang tạo các chỉnh sửa được đề xuất...", - "kilocode:autocomplete.progress.processing": "Đang xử lý các chỉnh sửa được đề xuất...", - "kilocode:autocomplete.progress.showing": "Đang hiển thị các chỉnh sửa được đề xuất...", - "kilocode:autocomplete.input.title": "Kilo Code: Tác Vụ Nhanh", - "kilocode:autocomplete.input.placeholder": "ví dụ, 'tái cấu trúc hàm này để hiệu quả hơn'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: Tạo Các Chỉnh Sửa Được Đề Xuất", - "kilocode:autocomplete.commands.displaySuggestions": "Hiển Thị Các Chỉnh Sửa Được Đề Xuất", - "kilocode:autocomplete.commands.cancelSuggestions": "Hủy Các Chỉnh Sửa Được Đề Xuất", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "Áp Dụng Chỉnh Sửa Được Đề Xuất Hiện Tại", - "kilocode:autocomplete.commands.applyAllSuggestions": "Áp Dụng Tất Cả Các Chỉnh Sửa Được Đề Xuất", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: Các Chỉnh Sửa Được Đề Xuất", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": - "Tôi có thể giúp bạn với các tác vụ nhanh và chỉnh sửa được đề xuất.", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete đang bị chặn do xung đột với GitHub Copilot. Để khắc phục điều này, bạn phải tắt các gợi ý inline của Copilot.", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "Tắt Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "Tắt Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete đã bị tạm dừng vì tài khoản của bạn không còn tín dụng. Thêm tín dụng để tiếp tục sử dụng tự động hoàn thành.", - "kilocode:autocomplete.creditsExhausted.addCredits": "Thêm tín dụng", - "kilocode:autocomplete.authError.message": - "Kilo Code Autocomplete đã bị tạm dừng do lỗi xác thực. Vui lòng đăng nhập lại.", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/zh-CN.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/zh-CN.ts deleted file mode 100644 index 8098e4d0fd..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/zh-CN.ts +++ /dev/null @@ -1,47 +0,0 @@ -// zh-CN runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "已暂停", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete（已禁用）", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**未配置自动补全模型**\n\n要启用自动补全，请添加一个使用以下支持的提供商的配置文件：{{providers}}。\n\n[打开设置]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "会话总费用:", - "kilocode:autocomplete.statusBar.tooltip.provider": "提供商:", - "kilocode:autocomplete.statusBar.tooltip.model": "模型:", - "kilocode:autocomplete.statusBar.tooltip.profile": "配置: ", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "默认", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "在{{startTime}}至{{endTime}}期间执行了{{count}}次补全，总费用为{{cost}}。", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": "自动补全由{{model}}通过{{provider}}提供。", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "正在分析你的代码...", - "kilocode:autocomplete.progress.generating": "正在生成建议编辑...", - "kilocode:autocomplete.progress.processing": "正在处理建议编辑...", - "kilocode:autocomplete.progress.showing": "正在显示建议编辑...", - "kilocode:autocomplete.input.title": "Kilo Code: 快速任务", - "kilocode:autocomplete.input.placeholder": "例如：'重构这个函数使其更高效'", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code: 生成建议编辑", - "kilocode:autocomplete.commands.displaySuggestions": "显示建议编辑", - "kilocode:autocomplete.commands.cancelSuggestions": "取消建议编辑", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "应用当前建议编辑", - "kilocode:autocomplete.commands.applyAllSuggestions": "应用所有建议编辑", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code: 建议编辑", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "我可以帮助你完成快速任务和建议编辑。", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete 被与 GitHub Copilot 的冲突阻止。要解决此问题，你必须禁用 Copilot 的内联建议。", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "禁用 Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "禁用 Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete 已暂停，因为你的账户没有剩余额度。请添加额度以恢复自动补全。", - "kilocode:autocomplete.creditsExhausted.addCredits": "添加额度", - "kilocode:autocomplete.authError.message": "Kilo Code Autocomplete 因身份验证错误已暂停。请重新登录。", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/i18n/zh-TW.ts b/packages/kilo-vscode/src/services/autocomplete/i18n/zh-TW.ts deleted file mode 100644 index 37e0037fb3..0000000000 --- a/packages/kilo-vscode/src/services/autocomplete/i18n/zh-TW.ts +++ /dev/null @@ -1,47 +0,0 @@ -// zh-TW runtime translations for autocomplete - -export const dict = { - "kilocode:autocomplete.statusBar.enabled": "$(kilo-logo) Autocomplete", - "kilocode:autocomplete.statusBar.snoozed": "已暫停", - "kilocode:autocomplete.statusBar.warning": "$(warning) Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.basic": "Kilo Code Autocomplete", - "kilocode:autocomplete.statusBar.tooltip.disabled": "Kilo Code Autocomplete（已停用）", - "kilocode:autocomplete.statusBar.tooltip.noUsableProvider": - "**未設定 Autocomplete 模型**\n\n若要啟用 Autocomplete，請新增一個使用以下支援供應商的設定檔：{{providers}}。\n\n[開啟設定]({{command}})", - "kilocode:autocomplete.statusBar.tooltip.sessionTotal": "工作階段總費用：", - "kilocode:autocomplete.statusBar.tooltip.provider": "供應商：", - "kilocode:autocomplete.statusBar.tooltip.model": "模型：", - "kilocode:autocomplete.statusBar.tooltip.profile": "設定檔：", - "kilocode:autocomplete.statusBar.tooltip.defaultProfile": "預設", - "kilocode:autocomplete.statusBar.tooltip.completionSummary": - "在 {{startTime}} 至 {{endTime}} 之間完成了 {{count}} 次補齊，總費用為 {{cost}}。", - "kilocode:autocomplete.statusBar.tooltip.providerInfo": "Autocomplete 由 {{provider}} 的 {{model}} 提供。", - "kilocode:autocomplete.statusBar.cost.zero": "$0.00", - "kilocode:autocomplete.statusBar.cost.lessThanCent": "<$0.01", - "kilocode:autocomplete.toggleMessage": "Kilo Code Autocomplete {{status}}", - "kilocode:autocomplete.progress.title": "Kilo Code", - "kilocode:autocomplete.progress.analyzing": "正在分析程式碼...", - "kilocode:autocomplete.progress.generating": "正在產生建議編輯...", - "kilocode:autocomplete.progress.processing": "正在處理建議編輯...", - "kilocode:autocomplete.progress.showing": "正在顯示建議編輯...", - "kilocode:autocomplete.input.title": "Kilo Code：快速任務", - "kilocode:autocomplete.input.placeholder": "例如「重構此函式以提升效率」", - "kilocode:autocomplete.commands.generateSuggestions": "Kilo Code：產生建議編輯", - "kilocode:autocomplete.commands.displaySuggestions": "顯示建議編輯", - "kilocode:autocomplete.commands.cancelSuggestions": "取消建議編輯", - "kilocode:autocomplete.commands.applyCurrentSuggestion": "套用目前的建議編輯", - "kilocode:autocomplete.commands.applyAllSuggestions": "套用所有建議編輯", - "kilocode:autocomplete.commands.category": "Kilo Code", - "kilocode:autocomplete.codeAction.title": "Kilo Code：建議編輯", - "kilocode:autocomplete.chatParticipant.fullName": "Kilo Code Agent", - "kilocode:autocomplete.chatParticipant.name": "Agent", - "kilocode:autocomplete.chatParticipant.description": "可以協助處理快速任務和建議編輯。", - "kilocode:autocomplete.incompatibilityExtensionPopup.message": - "Kilo Code Autocomplete 因與 GitHub Copilot 衝突而被封鎖。若要修正此問題，必須停用 Copilot 的行內建議。", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableCopilot": "停用 Copilot", - "kilocode:autocomplete.incompatibilityExtensionPopup.disableInlineAssist": "停用 Autocomplete", - "kilocode:autocomplete.creditsExhausted.message": - "Kilo Code Autocomplete 已暫停，因為你的帳戶沒有剩餘額度。請新增額度以恢復自動補齊。", - "kilocode:autocomplete.creditsExhausted.addCredits": "新增額度", - "kilocode:autocomplete.authError.message": "Kilo Code Autocomplete 因驗證錯誤已暫停。請重新登入。", -} diff --git a/packages/kilo-vscode/src/services/autocomplete/types.ts b/packages/kilo-vscode/src/services/autocomplete/types.ts index a8f736f22d..ecbae591dc 100644 --- a/packages/kilo-vscode/src/services/autocomplete/types.ts +++ b/packages/kilo-vscode/src/services/autocomplete/types.ts @@ -1,15 +1,10 @@ import * as vscode from "vscode" import type { AutocompleteCodeSnippet } from "./continuedev/core/autocomplete/types" -import type { - Position, - Range, - RangeInFile, - TabAutocompleteOptions as CoreTabAutocompleteOptions, -} from "./continuedev/core" -import { FileIgnoreController } from "./shims/FileIgnoreController" -import { ContextRetrievalService } from "./continuedev/core/autocomplete/context/ContextRetrievalService" -import { VsCodeIde } from "./continuedev/core/vscode-test-harness/src/VSCodeIde" -import { AutocompleteModel } from "./AutocompleteModel" +import type { Position, Range, RangeInFile } from "./continuedev/core" +import type { FileIgnoreController } from "./shims/FileIgnoreController" +import type { ContextRetrievalService } from "./continuedev/core/autocomplete/context/ContextRetrievalService" +import type { VsCodeIde } from "./continuedev/core/vscode-test-harness/src/VSCodeIde" +import type { AutocompleteModel } from "./AutocompleteModel" export interface ResponseMetaData { cost: number @@ -26,15 +21,6 @@ export interface AutocompleteSuggestionContext { recentlyEditedRanges?: RecentlyEditedRange[] } -export interface AutocompleteTabExtensions { - template?: string - useOtherFiles?: boolean - recentlyEditedSimilarityThreshold?: number - maxSnippetTokens?: number -} - -export type TabAutocompleteOptions = Partial & AutocompleteTabExtensions - export interface RecentlyEditedRange extends RangeInFile { timestamp: number lines: string[] @@ -59,35 +45,6 @@ export interface AutocompleteInput { injectDetails?: string } -export interface AutocompleteOutcome extends TabAutocompleteOptions { - accepted?: boolean - time: number - prefix: string - suffix: string - prompt: string - completion: string - modelProvider: string - modelName: string - completionOptions: Record - cacheHit: boolean - numLines: number - filepath: string - gitRepo?: string - completionId: string - uniqueId: string - timestamp: string - enabledStaticContextualization?: boolean - profileType?: "local" | "platform" | "control-plane" -} - -export interface PromptResult { - systemPrompt: string - userPrompt: string - prefix: string - suffix: string - completionId: string -} - // ============================================================================ // FIM Completion Types // ============================================================================ @@ -214,25 +171,6 @@ export interface VisibleCodeContext { editors: VisibleEditorInfo[] } -// ============================================================================ -// Chat Text Area Autocomplete Types -// ============================================================================ - -/** - * Request for chat text area completion - */ -export interface ChatCompletionRequest { - text: string -} - -/** - * Result of chat text area completion (distinct from code editor ChatCompletionResult) - */ -export interface ChatTextCompletionResult { - suggestion: string - requestId: string -} - // ============================================================================ // Conversion Utilities // ============================================================================ 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 beb7fe6ad8..14611ded3d 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/src/services/cli-backend/i18n/ar.ts b/packages/kilo-vscode/src/services/cli-backend/i18n/ar.ts index 7746b9091c..1221fb0de3 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 2c7e85e2d9..c2cb93e6ef 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 56ef3e856d..87de30b377 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 9070a8786a..59881a81fe 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 e39c0f5e16..df45e47ea2 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 ca79ec96d9..0b59af3f34 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 c0cc59c6ed..a744fe3345 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 73dc429a3d..03f7a3024e 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 91545b89b9..58e9c3ee9b 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 1cb709c332..c48eed062e 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 fd8097f446..c9cfc6a96e 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 45ac6d32ef..a24895f79e 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 3a76426cd3..7f7415c137 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 0063c3e84b..b9e721e60b 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 10a009bd4f..aff4ea8f37 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 180ba2ab68..6be397e7a3 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 fe0c703d0e..315d12fa96 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 fe025f578c..72160d167f 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 d4d67bf5ab..61baae8020 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 diff --git a/packages/kilo-vscode/src/services/cli-backend/retry.ts b/packages/kilo-vscode/src/services/cli-backend/retry.ts new file mode 100644 index 0000000000..1e3cc054af --- /dev/null +++ b/packages/kilo-vscode/src/services/cli-backend/retry.ts @@ -0,0 +1,34 @@ +// Replicated from packages/util/src/retry.ts to avoid adding @opencode-ai/util +// as a dependency of the extension. Keep in sync with the original. + +const TRANSIENT = [ + "load failed", + "network connection was lost", + "network request failed", + "failed to fetch", + "fetch failed", + "econnreset", + "econnrefused", + "etimedout", + "socket hang up", +] + +function transient(error: unknown): boolean { + if (!error) return false + const msg = String(error instanceof Error ? error.message : error).toLowerCase() + return TRANSIENT.some((m) => msg.includes(m)) +} + +export async function retry(fn: () => Promise, attempts = 3, delay = 500): Promise { + let last: unknown + for (let i = 0; i < attempts; i++) { + try { + return await fn() + } catch (error) { + last = error + if (i === attempts - 1 || !transient(error)) throw error + await new Promise((r) => setTimeout(r, delay * 2 ** i)) + } + } + throw last +} diff --git a/packages/kilo-vscode/src/util/retry.ts b/packages/kilo-vscode/src/util/retry.ts new file mode 100644 index 0000000000..5c35542821 --- /dev/null +++ b/packages/kilo-vscode/src/util/retry.ts @@ -0,0 +1,70 @@ +/** + * Exponential backoff retry utilities for rate-limited API calls. + * + * When the CLI backend (or the upstream AI provider it proxies) returns + * HTTP 429, retries are scheduled with exponential backoff. The delay + * respects `Retry-After` / `Retry-After-MS` headers when present. + */ + +/** Backoff delays per attempt: 5s -> 10s -> 30s -> 60s -> 300s */ +const BACKOFF_DELAYS_MS = [5_000, 10_000, 30_000, 60_000, 300_000] + +/** Maximum backoff delay in ms (5 minutes) */ +const MAX_MS = 300_000 + +/** Maximum number of retry attempts */ +const MAX_RETRIES = BACKOFF_DELAYS_MS.length + +/** HTTP status codes that are safe to retry */ +const RETRYABLE = new Set([408, 409, 425, 429, 500, 502, 503, 504]) + +/** + * Whether an HTTP status code is retryable. + */ +export function retryable(status: number): boolean { + if (RETRYABLE.has(status)) return true + return status >= 500 +} + +/** + * Extract a retry delay (in ms) from standard response headers. + * + * Checks `retry-after-ms` first (milliseconds), then `retry-after` + * (seconds or HTTP-date). Returns `null` when no usable header is found. + */ +export function headerDelay(headers: Headers): number | null { + const ms = headers.get("retry-after-ms") + if (ms) { + const parsed = Number.parseFloat(ms) + if (!Number.isNaN(parsed) && parsed > 0) return parsed + } + + const after = headers.get("retry-after") + if (after) { + const seconds = Number.parseFloat(after) + if (!Number.isNaN(seconds) && seconds > 0) return Math.ceil(seconds * 1000) + // Try HTTP-date format + const date = Date.parse(after) - Date.now() + if (!Number.isNaN(date) && date > 0) return Math.ceil(date) + } + + return null +} + +/** + * Calculate backoff delay for a given attempt. + * + * If `headers` are provided and contain a `Retry-After` value, that + * value is used (capped at MAX_MS). Otherwise uses the predefined + * backoff schedule: 5s, 10s, 30s, 60s, 300s. + */ +export function backoff(attempt: number, headers?: Headers): number { + if (headers) { + const fromHeader = headerDelay(headers) + if (fromHeader !== null) return Math.min(fromHeader, MAX_MS) + } + const index = Math.min(attempt - 1, BACKOFF_DELAYS_MS.length - 1) + return BACKOFF_DELAYS_MS[index] ?? MAX_MS +} + +export { MAX_RETRIES, MAX_MS } diff --git a/packages/kilo-vscode/tests/setup/vscode-mock.ts b/packages/kilo-vscode/tests/setup/vscode-mock.ts index 8fdba932d3..9ab5ff4203 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/agent-manager-arch.test.ts b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts index c991cc6f5b..efcc33f8c3 100644 --- a/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts +++ b/packages/kilo-vscode/tests/unit/agent-manager-arch.test.ts @@ -31,6 +31,8 @@ const TSX_FILES = [ path.join(ROOT, "webview-ui/agent-manager/ApplyDialog.tsx"), path.join(ROOT, "webview-ui/agent-manager/BranchSelect.tsx"), path.join(ROOT, "webview-ui/agent-manager/WorktreeItem.tsx"), + path.join(ROOT, "webview-ui/agent-manager/SectionHeader.tsx"), + path.join(ROOT, "webview-ui/diff-virtual/DiffVirtualApp.tsx"), ] const TSX_FILE = TSX_FILES[0] const PROVIDER_FILE = path.join(ROOT, "src/agent-manager/AgentManagerProvider.ts") @@ -177,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", @@ -532,8 +536,8 @@ const VSCODE_ALLOWED: Record = { */ const MAX_LINES: Record = { "AgentManagerProvider.ts": { - maxLines: 1910, - note: "primary extraction target: break into smaller orchestrators", + maxLines: 2050, + note: "permission recovery wiring is interleaved with panel/session lifecycle; extract more orchestrators next", }, } diff --git a/packages/kilo-vscode/tests/unit/git-ops.test.ts b/packages/kilo-vscode/tests/unit/git-ops.test.ts index eff6a66725..bd56efa827 100644 --- a/packages/kilo-vscode/tests/unit/git-ops.test.ts +++ b/packages/kilo-vscode/tests/unit/git-ops.test.ts @@ -3,9 +3,14 @@ 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 { + return new Promise((resolve) => setTimeout(resolve, ms)) } function runGit(cwd: string, args: string[]): string { @@ -475,4 +480,114 @@ describe("GitOps", () => { }) }) }) + + describe("dispose", () => { + it("aborts in-flight runGit calls quickly", async () => { + let resolved = false + const git = new GitOps({ + log: () => undefined, + runGit: async () => { + await sleep(5000) + resolved = true + return "should not reach" + }, + }) + + const start = Date.now() + const pending = git.currentBranch("/repo") + git.dispose() + await pending + const elapsed = Date.now() - start + expect(elapsed).toBeLessThan(500) + expect(resolved).toBe(false) + }) + + it("causes subsequent runGit calls to fail immediately", async () => { + let called = false + const git = new GitOps({ + log: () => undefined, + runGit: async () => { + called = true + return "ok" + }, + }) + git.dispose() + + // currentBranch swallows errors — should return "" without calling runGit + const result = await git.currentBranch("/repo") + expect(result).toBe("") + expect(called).toBe(false) + }) + + it("reports disposed state", () => { + const git = ops(async () => "ok") + expect(git.disposed).toBe(false) + git.dispose() + expect(git.disposed).toBe(true) + }) + + it("kills in-flight exec (spawn) processes", async () => { + await withRepo(async (cwd) => { + const git = new GitOps({ log: () => undefined }) + await fs.writeFile(nodePath.join(cwd, "a.txt"), "one\n", "utf8") + runGit(cwd, ["add", "-A"]) + runGit(cwd, ["-c", "user.name=Test", "-c", "user.email=test@example.com", "commit", "-m", "init"]) + await fs.writeFile(nodePath.join(cwd, "a.txt"), "two\n", "utf8") + + const branch = runGit(cwd, ["branch", "--show-current"]) || "HEAD" + const pending = git.buildWorktreePatch(cwd, branch) + // Give spawn a moment to start, then dispose + await sleep(10) + git.dispose() + + // Should either reject or return (but process should be killed) + try { + await pending + } catch { + // expected — aborted + } + expect(git.disposed).toBe(true) + }) + }) + + it("is safe to call multiple times", () => { + const git = ops(async () => "ok") + git.dispose() + git.dispose() + 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 ef9ec16b82..2df698e3d0 100644 --- a/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts +++ b/packages/kilo-vscode/tests/unit/git-stats-poller.test.ts @@ -3,8 +3,9 @@ import * as fs from "fs" import * as os from "os" import * as path from "path" import type { KiloClient } from "@kilocode/sdk/v2/client" -import { GitStatsPoller } from "../../src/agent-manager/GitStatsPoller" +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 { @@ -128,7 +129,7 @@ describe("GitStatsPoller", () => { const wtPath = path.join(root, "wt-a") fs.mkdirSync(wtPath, { recursive: true }) - const presence: Array<{ worktrees: Array<{ worktreeId: string; missing: boolean }>; degraded: boolean }> = [] + const presence: WorktreePresenceResult[] = [] const poller = new GitStatsPoller({ getWorktrees: () => [{ ...worktree("a"), path: wtPath }], @@ -154,7 +155,10 @@ describe("GitStatsPoller", () => { poller.stop() fs.rmSync(root, { recursive: true, force: true }) - expect(presence[0]).toEqual({ worktrees: [{ worktreeId: "a", missing: false }], degraded: false }) + expect(presence[0]).toEqual({ + worktrees: [{ worktreeId: "a", missing: false, branch: "branch-a" }], + degraded: false, + }) }) it("emits degraded probe when git worktree listing fails", async () => { @@ -162,7 +166,7 @@ describe("GitStatsPoller", () => { const wtPath = path.join(root, "wt-a") fs.mkdirSync(wtPath, { recursive: true }) - const presence: Array<{ worktrees: Array<{ worktreeId: string; missing: boolean }>; degraded: boolean }> = [] + const presence: WorktreePresenceResult[] = [] const poller = new GitStatsPoller({ getWorktrees: () => [{ ...worktree("a"), path: wtPath }], @@ -199,7 +203,7 @@ describe("GitStatsPoller", () => { const calls: string[] = [] const emitted: Array> = [] - const presence: Array<{ worktrees: Array<{ worktreeId: string; missing: boolean }>; degraded: boolean }> = [] + const presence: WorktreePresenceResult[] = [] const client = { worktree: { @@ -240,8 +244,8 @@ describe("GitStatsPoller", () => { expect(calls.some((cwd) => cwd === wtBPath)).toBe(false) expect(presence[0]).toEqual({ worktrees: [ - { worktreeId: "a", missing: false }, - { worktreeId: "b", missing: true }, + { worktreeId: "a", missing: false, branch: "branch-a" }, + { worktreeId: "b", missing: true, branch: undefined }, ], degraded: false, }) @@ -427,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/navigate.test.ts b/packages/kilo-vscode/tests/unit/navigate.test.ts index 219fb495b5..5adbb3abec 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/remote-status-service.test.ts b/packages/kilo-vscode/tests/unit/remote-status-service.test.ts new file mode 100644 index 0000000000..8c879b6394 --- /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/tests/unit/retry.test.ts b/packages/kilo-vscode/tests/unit/retry.test.ts new file mode 100644 index 0000000000..983d37aa57 --- /dev/null +++ b/packages/kilo-vscode/tests/unit/retry.test.ts @@ -0,0 +1,81 @@ +import { describe, it, expect } from "bun:test" +import { retry } from "../../src/services/cli-backend/retry" + +describe("retry", () => { + it("returns on first success", async () => { + const result = await retry(() => Promise.resolve(42)) + expect(result).toBe(42) + }) + + it("retries transient errors and succeeds", async () => { + let calls = 0 + const result = await retry( + () => { + calls++ + if (calls < 3) throw new TypeError("fetch failed") + return Promise.resolve("ok") + }, + 3, + 10, + ) + expect(result).toBe("ok") + expect(calls).toBe(3) + }) + + it("throws immediately on non-transient errors", async () => { + let calls = 0 + await expect( + retry( + () => { + calls++ + throw new Error("404 not found") + }, + 3, + 10, + ), + ).rejects.toThrow("404 not found") + expect(calls).toBe(1) + }) + + it("throws after exhausting attempts on transient errors", async () => { + let calls = 0 + await expect( + retry( + () => { + calls++ + throw new Error("ECONNREFUSED") + }, + 3, + 10, + ), + ).rejects.toThrow("ECONNREFUSED") + expect(calls).toBe(3) + }) + + it("detects all transient error messages", async () => { + const messages = [ + "load failed", + "network connection was lost", + "network request failed", + "failed to fetch", + "fetch failed", + "ECONNRESET", + "ECONNREFUSED", + "ETIMEDOUT", + "socket hang up", + ] + for (const msg of messages) { + let calls = 0 + await retry( + () => { + calls++ + if (calls === 1) throw new Error(msg) + return Promise.resolve(true) + }, + 2, + 10, + ) + expect(calls).toBe(2) + } + }) +}) diff --git a/packages/kilo-vscode/tests/unit/search-match.test.ts b/packages/kilo-vscode/tests/unit/search-match.test.ts new file mode 100644 index 0000000000..c12cf433ab --- /dev/null +++ b/packages/kilo-vscode/tests/unit/search-match.test.ts @@ -0,0 +1,200 @@ +import { describe, it, expect } from "bun:test" +import { acronymMatch, searchMatch } from "../../webview-ui/src/utils/search-match" + +// --------------------------------------------------------------------------- +// acronymMatch — low-level word-boundary matching +// --------------------------------------------------------------------------- + +describe("acronymMatch", () => { + describe("basic word boundary matching", () => { + it("matches at word start", () => { + expect(acronymMatch("fool org", "foo")).toBe(true) + expect(acronymMatch("the fool", "foo")).toBe(true) + }) + + it("does not match arbitrary substrings", () => { + expect(acronymMatch("faoboc", "foo")).toBe(false) + expect(acronymMatch("barfoo", "foo")).toBe(false) + }) + + it("matches prefix of a single word", () => { + expect(acronymMatch("foobar", "foob")).toBe(true) + }) + + it("matches exact word", () => { + expect(acronymMatch("test", "test")).toBe(true) + expect(acronymMatch("testing", "test")).toBe(true) + expect(acronymMatch("the test", "test")).toBe(true) + }) + }) + + describe("word separators", () => { + it("recognizes space", () => { + expect(acronymMatch("hello world", "wor")).toBe(true) + }) + + it("recognizes hyphen", () => { + expect(acronymMatch("hello-world", "wor")).toBe(true) + }) + + it("recognizes underscore", () => { + expect(acronymMatch("hello_world", "wor")).toBe(true) + }) + + it("recognizes slash", () => { + expect(acronymMatch("hello/world", "wor")).toBe(true) + }) + + it("recognizes dot", () => { + expect(acronymMatch("hello.world", "wor")).toBe(true) + }) + + it("recognizes parentheses", () => { + expect(acronymMatch("Grok Code Fast 1 (free)", "free")).toBe(true) + }) + }) + + describe("acronym matching", () => { + it("matches acronyms from word starts", () => { + expect(acronymMatch("Claude Sonnet", "clso")).toBe(true) + }) + + it("matches partial acronyms", () => { + expect(acronymMatch("Claude Sonnet 3.5", "cls")).toBe(true) + }) + + it("matches direct and acronym", () => { + expect(acronymMatch("clso tool", "clso")).toBe(true) + expect(acronymMatch("Claude Sonnet", "clso")).toBe(true) + }) + + it("does not match non-boundary acronym", () => { + expect(acronymMatch("aclbso", "clso")).toBe(false) + }) + }) + + describe("camelCase and PascalCase", () => { + it("recognizes camelCase boundary", () => { + expect(acronymMatch("gitRebase", "gr")).toBe(true) + }) + + it("matches PascalCase acronyms", () => { + expect(acronymMatch("NewFileCreation", "nfc")).toBe(true) + }) + + it("splits camelCase at uppercase transitions", () => { + expect(acronymMatch("parseMarkdownContent", "pmc")).toBe(true) + }) + + it("handles mixed case scenarios", () => { + expect(acronymMatch("gitRebase", "gitr")).toBe(true) + expect(acronymMatch("GitRebase", "gitr")).toBe(true) + }) + }) + + describe("backtracking", () => { + it("matches word that appears later in text", () => { + expect(acronymMatch("google gemini", "gemini")).toBe(true) + expect(acronymMatch("gemini pro", "gemini")).toBe(true) + expect(acronymMatch("google em emini", "gemini")).toBe(true) + }) + + it("matches partial word that appears later", () => { + expect(acronymMatch("Microsoft Copilot", "copilot")).toBe(true) + expect(acronymMatch("GitHub Copilot", "copilot")).toBe(true) + }) + + it("still respects word boundaries with backtracking", () => { + expect(acronymMatch("google gemini", "gemini")).toBe(true) + expect(acronymMatch("googlegemini", "gemini")).toBe(false) + }) + }) + + describe("edge cases", () => { + it("handles empty text", () => { + expect(acronymMatch("", "foo")).toBe(false) + }) + + it("handles empty query", () => { + expect(acronymMatch("foo", "")).toBe(true) + }) + + it("handles special characters in text", () => { + expect(acronymMatch("foo-bar", "foob")).toBe(true) + }) + }) +}) + +// --------------------------------------------------------------------------- +// searchMatch — high-level search with trimming and multi-word support +// --------------------------------------------------------------------------- + +describe("searchMatch", () => { + describe("empty and whitespace queries", () => { + it("returns true for empty query", () => { + expect(searchMatch("", "anything")).toBe(true) + }) + + it("returns true for whitespace-only query", () => { + expect(searchMatch(" ", "anything")).toBe(true) + }) + }) + + describe("case insensitivity", () => { + it("matches case-insensitively", () => { + expect(searchMatch("foo", "Foo Bar")).toBe(true) + expect(searchMatch("foo", "FOO BAZ")).toBe(true) + expect(searchMatch("FoO", "foo qux")).toBe(true) + }) + }) + + describe("trimming", () => { + it("trims leading spaces", () => { + expect(searchMatch(" foo", "foo bar")).toBe(true) + }) + + it("trims trailing spaces", () => { + expect(searchMatch("foo ", "foo bar")).toBe(true) + }) + + it("trims spaces on both sides", () => { + expect(searchMatch(" foo ", "foo bar")).toBe(true) + }) + }) + + describe("multi-word queries", () => { + it("matches when all words present", () => { + expect(searchMatch("claude sonnet", "Claude Sonnet 3.5")).toBe(true) + }) + + it("does not match when any word missing", () => { + expect(searchMatch("claude sonnet", "Claude Opus")).toBe(false) + expect(searchMatch("claude sonnet", "GPT Sonnet")).toBe(false) + }) + }) + + describe("real-world model search", () => { + it("finds model with hyphen in query", () => { + expect(searchMatch("gpt-5", "OpenAI: gpt-5 mini")).toBe(true) + expect(searchMatch("gpt-5", "OpenAI: gpt-4")).toBe(false) + }) + + it("finds model when hyphen omitted from query", () => { + expect(searchMatch("gpt5", "OpenAI: gpt-5 mini")).toBe(true) + }) + + it("finds all models with trailing hyphen", () => { + expect(searchMatch("gpt-", "OpenAI: gpt-5 mini")).toBe(true) + expect(searchMatch("gpt-", "OpenAI: gpt-4")).toBe(true) + expect(searchMatch("gpt-", "Anthropic: claude-3")).toBe(false) + }) + + it("matches file paths", () => { + expect(searchMatch("code", "src/services/code-index/manager.ts")).toBe(true) + }) + + it("matches mode selector options by label+value", () => { + expect(searchMatch("cod", "Code code Write code")).toBe(true) + }) + }) +}) diff --git a/packages/kilo-vscode/tests/unit/section-helpers.test.ts b/packages/kilo-vscode/tests/unit/section-helpers.test.ts new file mode 100644 index 0000000000..cd2871660d --- /dev/null +++ b/packages/kilo-vscode/tests/unit/section-helpers.test.ts @@ -0,0 +1,220 @@ +import { describe, it, expect } from "bun:test" +import { + buildTopLevelItems, + buildSidebarOrder, + buildShortcutMap, + isGrouped, + isGroupStart, + isGroupEnd, +} from "../../webview-ui/agent-manager/section-helpers" +import type { WorktreeState, SectionState } from "../../webview-ui/src/types/messages" + +function wt(id: string, opts: Partial = {}): WorktreeState { + return { + id, + branch: `branch-${id}`, + path: `/tmp/${id}`, + parentBranch: "main", + createdAt: "2024-01-01", + ...opts, + } +} + +function sec(id: string, order: number, opts: Partial = {}): SectionState { + return { id, name: `Section ${id}`, color: null, order, collapsed: false, ...opts } +} + +describe("buildTopLevelItems", () => { + it("returns flat worktree list when no sections", () => { + const all = [wt("a"), wt("b"), wt("c")] + const result = buildTopLevelItems([], [], all, []) + expect(result).toHaveLength(3) + expect(result.every((r) => r.kind === "worktree")).toBe(true) + }) + + it("interleaves sections and worktrees per order", () => { + const s1 = sec("s1", 0) + const w1 = wt("w1") + const s2 = sec("s2", 1) + const result = buildTopLevelItems([s1, s2], [w1], [w1], ["s1", "w1", "s2"]) + expect(result).toHaveLength(3) + expect(result[0]).toEqual({ kind: "section", section: s1 }) + expect(result[1]).toEqual({ kind: "worktree", wt: w1 }) + expect(result[2]).toEqual({ kind: "section", section: s2 }) + }) + + it("appends unordered sections and worktrees at the end", () => { + const s1 = sec("s1", 0) + const s2 = sec("s2", 1) + const w1 = wt("w1") + const w2 = wt("w2") + // Only s1 is in the order array + const result = buildTopLevelItems([s1, s2], [w1, w2], [w1, w2], ["s1", "w1"]) + expect(result).toHaveLength(4) + expect(result[0]).toEqual({ kind: "section", section: s1 }) + expect(result[1]).toEqual({ kind: "worktree", wt: w1 }) + // unordered items appended + expect(result[2]).toEqual({ kind: "section", section: s2 }) + expect(result[3]).toEqual({ kind: "worktree", wt: w2 }) + }) + + it("skips duplicate ids in order array", () => { + const s1 = sec("s1", 0) + const w1 = wt("w1") + const result = buildTopLevelItems([s1], [w1], [w1], ["s1", "w1", "s1", "w1"]) + expect(result).toHaveLength(2) + }) +}) + +describe("isGrouped", () => { + it("returns true when groupId is set", () => { + expect(isGrouped(wt("a", { groupId: "g1" }))).toBe(true) + }) + + it("returns false when groupId is undefined", () => { + expect(isGrouped(wt("a"))).toBe(false) + }) + + it("returns false when groupId is empty string", () => { + expect(isGrouped(wt("a", { groupId: "" }))).toBe(false) + }) +}) + +describe("isGroupStart", () => { + const list = [wt("a", { groupId: "g1" }), wt("b", { groupId: "g1" }), wt("c", { groupId: "g2" }), wt("d")] + + it("returns true for first item in group", () => { + expect(isGroupStart(list[0]!, 0, list)).toBe(true) + }) + + it("returns false for middle/end item in same group", () => { + expect(isGroupStart(list[1]!, 1, list)).toBe(false) + }) + + it("returns true when previous item has different groupId", () => { + expect(isGroupStart(list[2]!, 2, list)).toBe(true) + }) + + it("returns false for ungrouped worktree", () => { + expect(isGroupStart(list[3]!, 3, list)).toBe(false) + }) +}) + +describe("isGroupEnd", () => { + const list = [wt("a", { groupId: "g1" }), wt("b", { groupId: "g1" }), wt("c", { groupId: "g2" }), wt("d")] + + it("returns false for start/middle of group", () => { + expect(isGroupEnd(list[0]!, 0, list)).toBe(false) + }) + + it("returns true for last item in group when next has different groupId", () => { + expect(isGroupEnd(list[1]!, 1, list)).toBe(true) + }) + + it("returns true for last item in list with groupId", () => { + expect(isGroupEnd(list[2]!, 2, list)).toBe(true) + }) + + it("returns false for ungrouped worktree", () => { + expect(isGroupEnd(list[3]!, 3, list)).toBe(false) + }) +}) + +describe("buildSidebarOrder", () => { + it("returns LOCAL + all sorted worktrees when no sections exist", () => { + const sorted = [wt("a"), wt("b"), wt("c")] + const items = buildTopLevelItems([], [], sorted, []) + const result = buildSidebarOrder(items, sorted, [], () => [], []) + expect(result).toEqual([ + { type: "local", id: "local" }, + { type: "wt", id: "a" }, + { type: "wt", id: "b" }, + { type: "wt", id: "c" }, + ]) + }) + + it("includes section worktrees in visual order", () => { + const s1 = sec("s1", 0) + const w1 = wt("w1", { sectionId: "s1" }) + const w2 = wt("w2", { sectionId: "s1" }) + const w3 = wt("w3") + const sorted = [w1, w2, w3] + const items = buildTopLevelItems([s1], [w3], sorted, ["s1", "w3"]) + const members = (id: string) => (id === "s1" ? [w1, w2] : []) + const result = buildSidebarOrder(items, sorted, [s1], members, []) + expect(result).toEqual([ + { type: "local", id: "local" }, + { type: "wt", id: "w1" }, + { type: "wt", id: "w2" }, + { type: "wt", id: "w3" }, + ]) + }) + + it("skips worktrees in collapsed sections", () => { + const s1 = sec("s1", 0, { collapsed: true }) + const w1 = wt("w1", { sectionId: "s1" }) + const w2 = wt("w2") + const sorted = [w1, w2] + const items = buildTopLevelItems([s1], [w2], sorted, ["s1", "w2"]) + const members = (id: string) => (id === "s1" ? [w1] : []) + const result = buildSidebarOrder(items, sorted, [s1], members, []) + expect(result).toEqual([ + { type: "local", id: "local" }, + { type: "wt", id: "w2" }, + ]) + }) + + it("respects section order between sections and ungrouped worktrees", () => { + const s1 = sec("s1", 0) + const s2 = sec("s2", 1) + const w1 = wt("w1", { sectionId: "s1" }) + const w2 = wt("w2") + const w3 = wt("w3", { sectionId: "s2" }) + const sorted = [w1, w2, w3] + const items = buildTopLevelItems([s1, s2], [w2], sorted, ["s1", "w2", "s2"]) + const members = (id: string) => { + if (id === "s1") return [w1] + if (id === "s2") return [w3] + return [] + } + const result = buildSidebarOrder(items, sorted, [s1, s2], members, []) + expect(result.map((r) => r.id)).toEqual(["local", "w1", "w2", "w3"]) + }) + + it("appends unassigned sessions after worktrees", () => { + const sorted = [wt("a")] + const items = buildTopLevelItems([], [], sorted, []) + const sessions = [{ id: "sess1" }, { id: "sess2" }] + const result = buildSidebarOrder(items, sorted, [], () => [], sessions) + expect(result).toEqual([ + { type: "local", id: "local" }, + { type: "wt", id: "a" }, + { type: "session", id: "sess1" }, + { type: "session", id: "sess2" }, + ]) + }) +}) + +describe("buildShortcutMap", () => { + it("assigns 1-based shortcuts up to 9", () => { + const order = [ + { type: "local" as const, id: "local" }, + { type: "wt" as const, id: "a" }, + { type: "wt" as const, id: "b" }, + ] + const map = buildShortcutMap(order) + expect(map.get("local")).toBe(1) + expect(map.get("a")).toBe(2) + expect(map.get("b")).toBe(3) + }) + + it("caps at 9 shortcuts", () => { + const order = Array.from({ length: 12 }, (_, i) => ({ + type: "wt" as const, + id: `w${i}`, + })) + const map = buildShortcutMap(order) + expect(map.size).toBe(9) + expect(map.has("w9")).toBe(false) + }) +}) 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 0000000000..697ba146b2 --- /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") + }) +}) diff --git a/packages/kilo-vscode/tests/unit/session-agent.test.ts b/packages/kilo-vscode/tests/unit/session-agent.test.ts index f0773277a1..9535e0f095 100644 --- a/packages/kilo-vscode/tests/unit/session-agent.test.ts +++ b/packages/kilo-vscode/tests/unit/session-agent.test.ts @@ -26,13 +26,22 @@ describe("resolveSessionAgent", () => { expect(result).toBe("code") }) - it("ignores assistant messages", () => { + it("returns the latest assistant agent when it is last", () => { const result = resolveSessionAgent( - [makeMessage({ role: "assistant", agent: "code" }), makeMessage({ agent: "plan" })], + [makeMessage({ agent: "plan" }), makeMessage({ role: "assistant", agent: "code" })], new Set(["plan", "code"]), ) - expect(result).toBe("plan") + expect(result).toBe("code") + }) + + it("ignores unknown agent names on assistant messages", () => { + const result = resolveSessionAgent( + [makeMessage({ agent: "code" }), makeMessage({ role: "assistant", agent: "task" })], + new Set(["code"]), + ) + + expect(result).toBe("code") }) it("ignores unknown agent names", () => { @@ -49,9 +58,18 @@ describe("resolveSessionAgent", () => { expect(result).toBeUndefined() }) - it("returns undefined when no valid user agent exists", () => { + it("returns agent from assistant when no user has agent", () => { const result = resolveSessionAgent( - [makeMessage({ role: "assistant", agent: "code" }), makeMessage({ agent: undefined })], + [makeMessage({ agent: undefined }), makeMessage({ role: "assistant", agent: "code" })], + new Set(["code"]), + ) + + expect(result).toBe("code") + }) + + it("returns undefined when no message has a valid agent", () => { + const result = resolveSessionAgent( + [makeMessage({ agent: undefined }), makeMessage({ role: "assistant", agent: undefined })], new Set(["code"]), ) diff --git a/packages/kilo-vscode/tests/unit/session-utils.test.ts b/packages/kilo-vscode/tests/unit/session-utils.test.ts index 07a873c08f..e1a97d914f 100644 --- a/packages/kilo-vscode/tests/unit/session-utils.test.ts +++ b/packages/kilo-vscode/tests/unit/session-utils.test.ts @@ -6,6 +6,7 @@ import { buildFamilyCosts, buildFamilyLabels, buildCostBreakdown, + childID, } from "../../webview-ui/src/context/session-utils" import type { Part } from "../../webview-ui/src/types/messages" @@ -150,6 +151,31 @@ function toolPart(tool: string, sessionId?: string, input?: { subagent_type?: st } } +describe("childID", () => { + it("reads session ID from top-level metadata", () => { + expect(childID({ type: "tool", tool: "task", metadata: { sessionId: "child1" } })).toBe("child1") + }) + + it("reads session ID from state metadata", () => { + expect(childID({ type: "tool", tool: "task", state: { metadata: { sessionId: "child2" } } })).toBe("child2") + }) + + it("prefers top-level metadata over state metadata", () => { + expect( + childID({ + type: "tool", + tool: "task", + metadata: { sessionId: "top" }, + state: { metadata: { sessionId: "nested" } }, + }), + ).toBe("top") + }) + + it("ignores non-task tool parts", () => { + expect(childID({ type: "tool", tool: "read", state: { metadata: { sessionId: "child3" } } })).toBeUndefined() + }) +}) + describe("buildFamilyCosts", () => { it("returns empty map for empty family", () => { expect(buildFamilyCosts(new Set(), {}).size).toBe(0) @@ -196,6 +222,23 @@ describe("buildFamilyLabels", () => { expect(labels.get("child1")).toBe("explore") }) + it("extracts labels when session ID is top-level metadata", () => { + const family = new Set(["s1", "child1"]) + const messages = { s1: [msg("m1", "assistant")] } + const parts = { + m1: [ + { + type: "tool" as const, + tool: "task", + metadata: { sessionId: "child1" }, + state: { input: { subagent_type: "general" } }, + }, + ], + } + const labels = buildFamilyLabels(family, messages as any, parts as any) + expect(labels.get("child1")).toBe("general") + }) + it("falls back to description when subagent_type is absent", () => { const family = new Set(["s1", "child1"]) const messages = { s1: [msg("m1", "assistant")] } diff --git a/packages/kilo-vscode/tests/unit/task-session.test.ts b/packages/kilo-vscode/tests/unit/task-session.test.ts new file mode 100644 index 0000000000..d35d7e8783 --- /dev/null +++ b/packages/kilo-vscode/tests/unit/task-session.test.ts @@ -0,0 +1,27 @@ +import { describe, expect, it } from "bun:test" +import { childID } from "../../src/kilo-provider/task-session" + +describe("childID", () => { + it("reads session ID from top-level metadata", () => { + expect(childID({ type: "tool", tool: "task", metadata: { sessionId: "child1" } })).toBe("child1") + }) + + it("reads session ID from state metadata", () => { + expect(childID({ type: "tool", tool: "task", state: { metadata: { sessionId: "child2" } } })).toBe("child2") + }) + + it("prefers top-level metadata over state metadata", () => { + expect( + childID({ + type: "tool", + tool: "task", + metadata: { sessionId: "top" }, + state: { metadata: { sessionId: "nested" } }, + }), + ).toBe("top") + }) + + it("ignores non-task tool parts", () => { + expect(childID({ type: "tool", tool: "read", state: { metadata: { sessionId: "child3" } } })).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 5b0c2af1be..42da79bef2 100644 --- a/packages/kilo-vscode/tests/unit/worktree-state-manager.test.ts +++ b/packages/kilo-vscode/tests/unit/worktree-state-manager.test.ts @@ -41,7 +41,7 @@ describe("WorktreeStateManager", () => { expect(manager.findWorktreeByPath("/tmp/c")).toBeUndefined() }) - it("removes worktree and orphans sessions", () => { + it("removes worktree and deletes its sessions", () => { const wt = manager.addWorktree({ branch: "fix", path: "/tmp/fix", parentBranch: "main" }) manager.addSession("s1", wt.id) manager.addSession("s2", wt.id) @@ -49,9 +49,10 @@ describe("WorktreeStateManager", () => { const orphaned = manager.removeWorktree(wt.id) expect(orphaned).toHaveLength(2) expect(manager.getWorktrees()).toHaveLength(0) - // Sessions still exist but with null worktreeId - expect(manager.getSession("s1")?.worktreeId).toBeNull() - expect(manager.getSession("s2")?.worktreeId).toBeNull() + // Sessions are removed from state + expect(manager.getSession("s1")).toBeUndefined() + expect(manager.getSession("s2")).toBeUndefined() + expect(manager.getSessions()).toHaveLength(0) }) it("returns empty array when removing nonexistent worktree", () => { @@ -95,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) @@ -140,7 +150,7 @@ describe("WorktreeStateManager", () => { }) describe("persistence", () => { - it("saves and loads state", async () => { + it("saves and loads state, pruning orphaned sessions", async () => { const wt = manager.addWorktree({ branch: "fix", path: "/tmp/fix", parentBranch: "main" }) manager.addSession("s1", wt.id) manager.addSession("s2", null) @@ -153,9 +163,10 @@ describe("WorktreeStateManager", () => { expect(loaded.getWorktrees()).toHaveLength(1) expect(loaded.getWorktrees()[0].branch).toBe("fix") - expect(loaded.getSessions()).toHaveLength(2) + // s2 had null worktreeId so it gets pruned on load + expect(loaded.getSessions()).toHaveLength(1) expect(loaded.getSession("s1")?.worktreeId).toBe(wt.id) - expect(loaded.getSession("s2")?.worktreeId).toBeNull() + expect(loaded.getSession("s2")).toBeUndefined() }) it("load is a no-op when file does not exist", async () => { @@ -285,20 +296,35 @@ describe("WorktreeStateManager", () => { }) describe("validate", () => { - it("removes worktrees whose directories do not exist", async () => { + it("removes worktrees whose directories do not exist and prunes their sessions", async () => { const existing = path.join(root, "wt-exists") fs.mkdirSync(existing, { recursive: true }) manager.addWorktree({ branch: "exists", path: existing, parentBranch: "main" }) - manager.addWorktree({ branch: "gone", path: path.join(root, "wt-gone"), parentBranch: "main" }) - manager.addSession("s1", manager.getWorktrees()[1].id) + const gone = manager.addWorktree({ branch: "gone", path: path.join(root, "wt-gone"), parentBranch: "main" }) + manager.addSession("s1", gone.id) await manager.validate(root) expect(manager.getWorktrees()).toHaveLength(1) expect(manager.getWorktrees()[0].branch).toBe("exists") - // Session orphaned (worktreeId set to null) - expect(manager.getSession("s1")?.worktreeId).toBeNull() + // Session removed along with its worktree + expect(manager.getSession("s1")).toBeUndefined() + }) + + it("prunes orphaned sessions with null worktreeId on validate", async () => { + const existing = path.join(root, "wt-exists") + fs.mkdirSync(existing, { recursive: true }) + + const wt = manager.addWorktree({ branch: "exists", path: existing, parentBranch: "main" }) + manager.addSession("s1", wt.id) + manager.addSession("s2", null) + + await manager.validate(root) + + // s1 stays (its worktree exists), s2 is pruned (null worktreeId) + expect(manager.getSession("s1")).toBeTruthy() + expect(manager.getSession("s2")).toBeUndefined() }) it("resolves relative paths against root", async () => { @@ -319,8 +345,9 @@ describe("WorktreeStateManager", () => { for (let i = 0; i < 20; i++) { manager.addWorktree({ branch: `b-${i}`, path: `/tmp/b-${i}`, parentBranch: "main" }) } + const wts = manager.getWorktrees() for (let i = 0; i < 20; i++) { - manager.addSession(`s-${i}`, null) + manager.addSession(`s-${i}`, wts[i]!.id) } // Wait for all fire-and-forget saves to settle @@ -355,9 +382,9 @@ describe("WorktreeStateManager", () => { expect(loaded.getWorktrees()).toHaveLength(1) expect(loaded.getWorktrees()[0].branch).toBe("keep") - // s2 was orphaned when wt2 was removed, s1 and s3 belong to wt1 + // s2 was removed when wt2 was removed, s1 and s3 belong to wt1 expect(loaded.getSession("s1")?.worktreeId).toBe(wt1.id) - expect(loaded.getSession("s2")?.worktreeId).toBeNull() + expect(loaded.getSession("s2")).toBeUndefined() expect(loaded.getSession("s3")?.worktreeId).toBe(wt1.id) }) @@ -419,7 +446,7 @@ describe("WorktreeStateManager", () => { expect(manager.getSessions()).toHaveLength(0) }) - it("handles partial data with missing worktrees key", async () => { + it("handles partial data with missing worktrees key and prunes orphaned sessions", async () => { const file = path.join(root, ".kilo", "agent-manager.json") fs.writeFileSync( file, @@ -430,7 +457,8 @@ describe("WorktreeStateManager", () => { await manager.load() expect(manager.getWorktrees()).toHaveLength(0) - expect(manager.getSessions()).toHaveLength(1) + // Orphaned session with null worktreeId is pruned on load + expect(manager.getSessions()).toHaveLength(0) }) }) diff --git a/packages/kilo-vscode/tests/unit/worktree-state-sections.test.ts b/packages/kilo-vscode/tests/unit/worktree-state-sections.test.ts new file mode 100644 index 0000000000..7759537e2b --- /dev/null +++ b/packages/kilo-vscode/tests/unit/worktree-state-sections.test.ts @@ -0,0 +1,307 @@ +import { describe, it, expect, beforeEach, afterEach } from "bun:test" +import * as fs from "fs" +import * as path from "path" +import * as os from "os" +import { WorktreeStateManager } from "../../src/agent-manager/WorktreeStateManager" + +describe("WorktreeStateManager sections", () => { + let root: string + let mgr: WorktreeStateManager + + beforeEach(() => { + root = fs.mkdtempSync(path.join(os.tmpdir(), "wtsm-sec-")) + fs.mkdirSync(path.join(root, ".kilo"), { recursive: true }) + mgr = new WorktreeStateManager(root, () => {}) + }) + + afterEach(async () => { + await mgr.flush() + fs.rmSync(root, { recursive: true, force: true }) + }) + + describe("addSection", () => { + it("creates a section with correct defaults", () => { + const sec = mgr.addSection("Backend", "Blue") + expect(sec.id).toMatch(/^sec-/) + expect(sec.name).toBe("Backend") + expect(sec.color).toBe("Blue") + expect(sec.collapsed).toBe(false) + expect(mgr.getWorktreeOrder()).toContain(sec.id) + }) + + it("adds section id to worktreeOrder", () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + mgr.setWorktreeOrder([wt.id]) + const sec = mgr.addSection("Infra", null) + expect(mgr.getWorktreeOrder()).toEqual([wt.id, sec.id]) + }) + + it("moves specified worktrees into the section", () => { + const wt1 = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + const wt2 = mgr.addWorktree({ branch: "b", path: "/tmp/b", parentBranch: "main" }) + mgr.setWorktreeOrder([wt1.id, wt2.id]) + + const sec = mgr.addSection("Group", "Red", [wt1.id]) + expect(mgr.getWorktree(wt1.id)?.sectionId).toBe(sec.id) + expect(mgr.getWorktree(wt2.id)?.sectionId).toBeUndefined() + // wt1 removed from top-level order, wt2 remains + expect(mgr.getWorktreeOrder()).not.toContain(wt1.id) + expect(mgr.getWorktreeOrder()).toContain(wt2.id) + }) + }) + + describe("renameSection", () => { + it("updates the name", () => { + const sec = mgr.addSection("Old", null) + mgr.renameSection(sec.id, "New") + expect(mgr.getSection(sec.id)?.name).toBe("New") + }) + + it("rejects empty string", () => { + const sec = mgr.addSection("Keep", null) + mgr.renameSection(sec.id, "") + expect(mgr.getSection(sec.id)?.name).toBe("Keep") + }) + + it("is a no-op for unknown id", () => { + mgr.renameSection("nonexistent", "Foo") + expect(mgr.getSections()).toHaveLength(0) + }) + }) + + describe("setSectionColor", () => { + it("updates color", () => { + const sec = mgr.addSection("X", null) + mgr.setSectionColor(sec.id, "Green") + expect(mgr.getSection(sec.id)?.color).toBe("Green") + }) + + it("accepts null for default", () => { + const sec = mgr.addSection("X", "Red") + mgr.setSectionColor(sec.id, null) + expect(mgr.getSection(sec.id)?.color).toBeNull() + }) + }) + + describe("toggleSection", () => { + it("flips collapsed state", () => { + const sec = mgr.addSection("T", null) + expect(sec.collapsed).toBe(false) + + mgr.toggleSection(sec.id) + expect(mgr.getSection(sec.id)?.collapsed).toBe(true) + + mgr.toggleSection(sec.id) + expect(mgr.getSection(sec.id)?.collapsed).toBe(false) + }) + }) + + describe("deleteSection", () => { + it("removes section and ungroups its worktrees", () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + const sec = mgr.addSection("Del", null, [wt.id]) + expect(mgr.getWorktree(wt.id)?.sectionId).toBe(sec.id) + + mgr.deleteSection(sec.id) + expect(mgr.getSection(sec.id)).toBeUndefined() + // worktree still exists but sectionId cleared + expect(mgr.getWorktree(wt.id)).toBeTruthy() + expect(mgr.getWorktree(wt.id)?.sectionId).toBeUndefined() + }) + + it("removes section from worktreeOrder", () => { + const sec = mgr.addSection("Gone", null) + expect(mgr.getWorktreeOrder()).toContain(sec.id) + mgr.deleteSection(sec.id) + expect(mgr.getWorktreeOrder()).not.toContain(sec.id) + }) + + it("is a no-op for unknown id", () => { + mgr.deleteSection("nonexistent") + expect(mgr.getSections()).toHaveLength(0) + }) + }) + + 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" }) + mgr.setWorktreeOrder([wt.id]) + const sec = mgr.addSection("Target", null) + + mgr.moveToSection([wt.id], sec.id) + expect(mgr.getWorktree(wt.id)?.sectionId).toBe(sec.id) + expect(mgr.getWorktreeOrder()).not.toContain(wt.id) + }) + + it("ungroups worktrees with null sectionId and adds back to order", () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + const sec = mgr.addSection("Temp", null, [wt.id]) + expect(mgr.getWorktreeOrder()).not.toContain(wt.id) + + mgr.moveToSection([wt.id], null) + expect(mgr.getWorktree(wt.id)?.sectionId).toBeUndefined() + expect(mgr.getWorktreeOrder()).toContain(wt.id) + }) + + it("expands to multi-version siblings with same groupId", () => { + const wt1 = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main", groupId: "g1" }) + const wt2 = mgr.addWorktree({ branch: "b", path: "/tmp/b", parentBranch: "main", groupId: "g1" }) + const wt3 = mgr.addWorktree({ branch: "c", path: "/tmp/c", parentBranch: "main" }) + mgr.setWorktreeOrder([wt1.id, wt2.id, wt3.id]) + const sec = mgr.addSection("Multi", null) + + // Move only wt1 — wt2 should follow because of shared groupId + mgr.moveToSection([wt1.id], sec.id) + expect(mgr.getWorktree(wt1.id)?.sectionId).toBe(sec.id) + expect(mgr.getWorktree(wt2.id)?.sectionId).toBe(sec.id) + expect(mgr.getWorktree(wt3.id)?.sectionId).toBeUndefined() + }) + + it("does not duplicate in worktreeOrder when ungrouping already-present id", () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + mgr.setWorktreeOrder([wt.id]) + // Ungroup when already in order + mgr.moveToSection([wt.id], null) + const count = mgr.getWorktreeOrder().filter((id) => id === wt.id).length + expect(count).toBe(1) + }) + }) + + describe("getSections", () => { + it("returns all sections", () => { + mgr.addSection("A", null) + mgr.addSection("B", "Red") + mgr.addSection("C", "Blue") + expect(mgr.getSections()).toHaveLength(3) + }) + + it("returns empty array when no sections", () => { + expect(mgr.getSections()).toEqual([]) + }) + }) + + describe("moveSection", () => { + it("moves a section up within mixed top-level order", () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + mgr.setWorktreeOrder([wt.id]) + const a = mgr.addSection("A", null) + const b = mgr.addSection("B", null) + expect(mgr.getWorktreeOrder()).toEqual([wt.id, a.id, b.id]) + mgr.moveSection(b.id, -1) + expect(mgr.getWorktreeOrder()).toEqual([wt.id, b.id, a.id]) + }) + + it("moves a section down within mixed top-level order", () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + mgr.setWorktreeOrder([wt.id]) + const a = mgr.addSection("A", null) + const b = mgr.addSection("B", null) + expect(mgr.getWorktreeOrder()).toEqual([wt.id, a.id, b.id]) + mgr.moveSection(a.id, 1) + expect(mgr.getWorktreeOrder()).toEqual([wt.id, b.id, a.id]) + }) + + it("is a no-op at boundaries", () => { + const a = mgr.addSection("A", null) + const b = mgr.addSection("B", null) + mgr.moveSection(a.id, -1) + expect(mgr.getWorktreeOrder()).toEqual([a.id, b.id]) + mgr.moveSection(b.id, 1) + expect(mgr.getWorktreeOrder()).toEqual([a.id, b.id]) + }) + + it("does not change section membership", () => { + const wt1 = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + const wt2 = mgr.addWorktree({ branch: "b", path: "/tmp/b", parentBranch: "main" }) + const a = mgr.addSection("A", null, [wt1.id, wt2.id]) + const b = mgr.addSection("B", null) + mgr.moveSection(b.id, -1) + expect(mgr.getWorktree(wt1.id)?.sectionId).toBe(a.id) + 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) + mgr.moveSection(b.id, -1) + await mgr.flush() + await mgr.save() + const loaded = new WorktreeStateManager(root, () => {}) + await loaded.load() + expect(loaded.getWorktreeOrder()).toEqual([b.id, a.id]) + }) + }) + + describe("persistence", () => { + it("saves and loads sections", async () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + const sec = mgr.addSection("Persist", "Green", [wt.id]) + mgr.toggleSection(sec.id) + await mgr.flush() + await mgr.save() + + const loaded = new WorktreeStateManager(root, () => {}) + await loaded.load() + + const secs = loaded.getSections() + expect(secs).toHaveLength(1) + const first = secs[0]! + expect(first.name).toBe("Persist") + expect(first.color).toBe("Green") + expect(first.collapsed).toBe(true) + expect(loaded.getWorktree(wt.id)?.sectionId).toBe(sec.id) + }) + + it("normalizes worktreeOrder on load to include missing section IDs", async () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + const sec = mgr.addSection("S", null) + await mgr.flush() + await mgr.save() + // Simulate stale data: manually remove section from worktreeOrder + const file = path.join(root, ".kilo", "agent-manager.json") + const data = JSON.parse(fs.readFileSync(file, "utf-8")) + data.worktreeOrder = [wt.id] // section ID missing + fs.writeFileSync(file, JSON.stringify(data)) + + const loaded = new WorktreeStateManager(root, () => {}) + await loaded.load() + expect(loaded.getWorktreeOrder()).toContain(sec.id) + expect(loaded.getWorktreeOrder()).toContain(wt.id) + }) + + it("normalizes worktreeOrder on load to include missing ungrouped worktrees", async () => { + const wt = mgr.addWorktree({ branch: "a", path: "/tmp/a", parentBranch: "main" }) + await mgr.flush() + await mgr.save() + const file = path.join(root, ".kilo", "agent-manager.json") + const data = JSON.parse(fs.readFileSync(file, "utf-8")) + data.worktreeOrder = [] // worktree ID missing + fs.writeFileSync(file, JSON.stringify(data)) + + const loaded = new WorktreeStateManager(root, () => {}) + await loaded.load() + expect(loaded.getWorktreeOrder()).toContain(wt.id) + }) + }) +}) diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts b/packages/kilo-vscode/tests/visual-regression.spec.ts index c797701f26..7b2aeccbf1 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts @@ -50,6 +50,7 @@ async function disableAnimations(page: Page) { // Permission dock config-preloaded has non-deterministic toggle rendering. const SKIP = new Set([ "agentmanager--worktree-item-busy", + "agentmanager--pr-badge-checks-pending", "composite-webview--permission-dock-config-preloaded", ]) diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/all-colors-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/all-colors-chromium-linux.png new file mode 100644 index 0000000000..eadcbe9dbf --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/all-colors-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9241e89fae82f69f1fab0371423ab45c905b54ff0c60ec1408b54d60f6c4c6c +size 19636 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/collapsed-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/collapsed-chromium-linux.png new file mode 100644 index 0000000000..b24dac2c74 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/collapsed-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a96dd287b6ffdbdc0360baa9af99d09c3b709a5adaef18f5e7b7e43a83e44746 +size 3134 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/default-color-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/default-color-chromium-linux.png new file mode 100644 index 0000000000..e1edce0782 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/default-color-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60daae227133cedd35f93753128453177400f83233268ae19af984bc9a72ad4b +size 5203 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/dense-sidebar-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/dense-sidebar-chromium-linux.png new file mode 100644 index 0000000000..de65b45f22 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/dense-sidebar-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cda12827fa0de0590119ab707f6403fc98291843701ab0d4300e493b4b284aa +size 14965 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/empty-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/empty-chromium-linux.png new file mode 100644 index 0000000000..d6ae3eb676 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/empty-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8099695f3cb2f79a54f6ada28eaf30a4e31afc5e660e293853d1ff34a2afaed1 +size 1605 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/expanded-with-items-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/expanded-with-items-chromium-linux.png new file mode 100644 index 0000000000..7c85edd3e2 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/expanded-with-items-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bee9b58fb35c2484a9da4bffcae07f98a942c1097df33b549e13de781790824 +size 8026 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/first-and-last-section-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/first-and-last-section-chromium-linux.png new file mode 100644 index 0000000000..9bec9f013a --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/first-and-last-section-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf6056375e5bf9d9ad78487d58a7fc1fb2d570333d057d412f1d70893a73e5df +size 6176 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/long-section-name-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/long-section-name-chromium-linux.png new file mode 100644 index 0000000000..71e123b86a --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/long-section-name-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ebd138c8d5e59bc09ce0d8d571d5598622fb61631cf5a698c80380872bef0a4 +size 7031 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/multiple-sections-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/multiple-sections-chromium-linux.png new file mode 100644 index 0000000000..b0039f2efd --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/multiple-sections-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b629ad25ef4f3da8bd8a9e59c64cc05279dfc262db2d8d9d25c3697f48ef8393 +size 12834 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-active-worktree-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-active-worktree-chromium-linux.png new file mode 100644 index 0000000000..a227600e9c --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-active-worktree-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b78544f9c306dbcb0278502b1f929f0af5389a90b73362abbea6f76612c5def9 +size 7761 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-busy-worktree-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-busy-worktree-chromium-linux.png new file mode 100644 index 0000000000..e269e186d4 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-busy-worktree-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4785426a34c06b0c74fe62c117528bb16ea579b2d677902c839336f6a29a380e +size 5926 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-pr-badges-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-pr-badges-chromium-linux.png new file mode 100644 index 0000000000..9607336064 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-pr-badges-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da91a2dd21f1b647d3d7e95756755d5e8357bbba7f964f328d1f58363990e2cd +size 12377 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-stale-worktree-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-stale-worktree-chromium-linux.png new file mode 100644 index 0000000000..3e2363c647 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-stale-worktree-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afa789c231b370c2ba874029a8a0597b5ca7ffff5624ddd343fcd54139a94012 +size 6132 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-versions-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-versions-chromium-linux.png new file mode 100644 index 0000000000..136ca2845b --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager-sections/with-versions-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0f11ac60e7dd3e393739e85d279bca7e53dc22af01bade22a741e5267d96300 +size 11053 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-approved-checks-failing-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-approved-checks-failing-chromium-linux.png new file mode 100644 index 0000000000..5b2f303660 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-approved-checks-failing-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:facae793453671cf34b950352dc19041d420d096fac2a7358d1a4550e05a8033 +size 3383 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-approved-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-approved-chromium-linux.png new file mode 100644 index 0000000000..784bf93534 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-approved-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc81d91792781a9784775db3af44ea8058e87df9e029c2d7fc5acf1548fa7ec7 +size 3423 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-changes-requested-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-changes-requested-chromium-linux.png new file mode 100644 index 0000000000..ebf4954c6b --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-changes-requested-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2923838fbc9ce24851e2b8ed6c5d4c2a098db9667fc528d1c00162595640bc05 +size 3550 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-checks-failing-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-checks-failing-chromium-linux.png new file mode 100644 index 0000000000..fdd58cf7fc --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-checks-failing-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c087f8e2b50bf43f9ca03ab31e8955e995304473688bf8db88fb6901d743a1d4 +size 3541 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-closed-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-closed-chromium-linux.png new file mode 100644 index 0000000000..05c387099b --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-closed-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c13cc44cec6092d8294a535a3e6057d6e3a2b2d59cb18e09b0a073576972f80 +size 3582 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-draft-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-draft-chromium-linux.png new file mode 100644 index 0000000000..fc5b1dc491 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-draft-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79f5495b171fc9de3d04b7e15cc30ac2f5082c6d7db3818b3e288ce9c3ba41f3 +size 3461 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-merged-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-merged-chromium-linux.png new file mode 100644 index 0000000000..e819a16198 --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-merged-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dda50cfb4ebebd29e6f0791ec13ee9e16e48c9fa6f6d6be03c78b1d900516427 +size 3604 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-no-review-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-no-review-chromium-linux.png new file mode 100644 index 0000000000..8858ea455c --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-no-review-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2680e8f97baee13ab92ac6fb3bcce56eb9cbb7e0c5fb0f76a76251abc016eac3 +size 3567 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-pending-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-pending-chromium-linux.png new file mode 100644 index 0000000000..8858ea455c --- /dev/null +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/pr-badge-pending-chromium-linux.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2680e8f97baee13ab92ac6fb3bcce56eb9cbb7e0c5fb0f76a76251abc016eac3 +size 3567 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-active-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-active-chromium-linux.png index 5eea0cc85d..b657e55ee7 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-active-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-active-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed6e36e191174cd14d61fc3480014d59c9a92bd526f4f889dc71bdbab4b44e66 -size 2106 +oid sha256:270e0dafc2601996e7d048873e55db4680e8803d6800dc44b1fa6ce6239827cc +size 2017 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-default-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-default-chromium-linux.png index 3138a0847c..bc4f471b09 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-default-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-default-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b313dd76197ff089105d6b80ff22bdf570b878f67dcc99e5d050e85573c52d60 -size 1959 +oid sha256:5feb854ee2693b655ab504b8e2ed8794af77a357c3d716e2deb9668a08f3aa0c +size 1847 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-grouped-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-grouped-chromium-linux.png index 853b160617..b012417eb4 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-grouped-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-grouped-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e386126977ece9eae41cce0b13677ae4243b985b39a7ee0977e9b5da32415796 -size 5837 +oid sha256:937c4398730fd3e07bc064b4cb370717a5bc280ffaced87fa6f3c626774878a8 +size 5598 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-pending-delete-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-pending-delete-chromium-linux.png index 19a85104af..2ec70d4ede 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-pending-delete-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-pending-delete-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24d02a1a394c5e18e3783b19c8c7145eafbd8cabfb624c53c82137369d2c5784 -size 2570 +oid sha256:1d9935cc07b9eefe0c1eca1852b00ac2b39b76cdf12ee2f01c52e4ac0771b39e +size 2910 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-stale-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-stale-chromium-linux.png index 39a8bb7156..9cdd496d4a 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-stale-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-stale-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07039f10de94b6aa2eba14674a9f3370fef2f8b23d6712e91f43ddd77f169c34 -size 1930 +oid sha256:54e7142d591391c6e99631c9bf87b011321e52f17a8ee39e5aeeaa9b1350f2f9 +size 1831 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-with-stats-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-with-stats-chromium-linux.png index 4d9c9a4f74..43f94d6b80 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-with-stats-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/agentmanager/worktree-item-with-stats-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:519310e5cb841302d651f450b4fc281936c331646a4d3759de0c010d1761fe63 -size 2687 +oid sha256:7e4a37b5b7d71e0eb7f043176f410030385a8a61f3913bd6419b1d96c6cad2de +size 2422 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-many-options-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-many-options-chromium-linux.png index e2d644797f..cddab8d4d8 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-many-options-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-many-options-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3de2fd382cc403a5b0dff91cead7804941d75f84ccd4610e4854d63e5b1cbd74 -size 29490 +oid sha256:4edbb48beaf828c898636124e4d225490e70fe2e16bcb15a3ae40a5dbe2e7167 +size 29458 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-multi-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-multi-chromium-linux.png index 5faabfd002..14155fdebf 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-multi-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-multi-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2fa88bc34c4dafe5271612b3ba640027c92aba28b282863e09026afdf8902f5 -size 21883 +oid sha256:84fc57aa26819d69d570d07faeb77030d146158a6b1d4cfb45b79f1f317c30ba +size 18278 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-single-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-single-chromium-linux.png index b3a04758d0..d580ecbd41 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-single-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/chat/question-dock-single-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82b35af7032de0f55d48a8a175042166d72890be8aa6e0f1d81bc7dfa7b2c592 -size 27585 +oid sha256:12643a0a583f41595bd8651d92d31d5be424ea77242843b0017364ce3c280b1f +size 24611 diff --git a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/composite-webview/question-above-chatbox-chromium-linux.png b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/composite-webview/question-above-chatbox-chromium-linux.png index 7b2749ba2b..42ea4dd8ab 100644 --- a/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/composite-webview/question-above-chatbox-chromium-linux.png +++ b/packages/kilo-vscode/tests/visual-regression.spec.ts-snapshots/composite-webview/question-above-chatbox-chromium-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ff364be7ea176328dc7f4500e3568aed460a2caa9dd4dedca614cd1db273185 -size 25150 +oid sha256:c5223aa923783e200838f744eba2b5adc4aae18575412bb05f32606f2a5c823e +size 16857 diff --git a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx index 49d7728424..62fa0d4625 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/AgentManagerApp.tsx @@ -7,7 +7,6 @@ import { createSignal, createMemo, createEffect, - createRoot, on, onMount, onCleanup, @@ -34,7 +33,10 @@ import type { WorktreeGitStats, LocalGitStats, WorktreeState, + PRStatus, + AgentManagerPRStatusMessage, ManagedSessionState, + SectionState, SessionInfo, BranchInfo, } from "../src/types/messages" @@ -45,9 +47,8 @@ import { SortableProvider, closestCenter, createSortable, - useDragDropContext, } from "@thisbeyond/solid-dnd" -import type { DragEvent, Transformer } from "@thisbeyond/solid-dnd" +import type { DragEvent } from "@thisbeyond/solid-dnd" import { ThemeProvider } from "@kilocode/kilo-ui/theme" import { DialogProvider, useDialog } from "@kilocode/kilo-ui/context/dialog" import { Dialog } from "@kilocode/kilo-ui/dialog" @@ -80,17 +81,32 @@ 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" +import { createRevertFile } from "./revert-file" import { FullScreenDiffView } from "./FullScreenDiffView" import { ApplyDialog } from "./ApplyDialog" import { groupApplyConflicts } from "./apply-conflicts" import type { ReviewComment } from "./review-comments" import { BranchSelect } from "./BranchSelect" import { WorktreeItem } from "./WorktreeItem" +import SectionHeader from "./SectionHeader" +import { randomColor } from "./section-colors" +import { + buildTopLevelItems, + buildSidebarOrder, + buildShortcutMap, + isGrouped, + isGroupStart, + isGroupEnd, + type TopLevelItem, +} from "./section-helpers" +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" @@ -120,6 +136,8 @@ interface ApplyState { /** Sidebar selection: LOCAL for local repo, worktree ID for a worktree, or null for an unassigned session. */ type SidebarSelection = typeof LOCAL | string | null +type SidePanel = "diff" | "pr" | null + const isMac = typeof navigator !== "undefined" && /Mac|iPhone|iPad/.test(navigator.userAgent) // Fallback keybindings before extension sends resolved ones @@ -194,7 +212,6 @@ function useTabScroll(activeTabs: Accessor, activeId: Accessor { const id = activeId() const el = ref() @@ -321,6 +338,7 @@ const AgentManagerContent: Component = () => { const [localSessionIDs, setLocalSessionIDs] = createSignal(persisted?.localSessionIDs ?? []) const [sidebarWidth, setSidebarWidth] = createSignal(persisted?.sidebarWidth ?? DEFAULT_SIDEBAR_WIDTH) const [sessionsCollapsed, setSessionsCollapsed] = createSignal(false) + const [sections, setSections] = createSignal([]) // rAF coalescing for resize handlers — at most one signal write per frame let sidebarRaf: number | undefined @@ -328,8 +346,8 @@ const AgentManagerContent: Component = () => { let diffRaf: number | undefined let pendingDiffWidth: number | undefined - // Diff panel state - const [diffOpen, setDiffOpen] = createSignal(false) + const [sidePanel, setSidePanel] = createSignal(null) + const diffOpen = () => sidePanel() === "diff" const [diffDatas, setDiffDatas] = createSignal>({}) const [diffLoading, setDiffLoading] = createSignal(false) const [diffFileLoading, setDiffFileLoading] = createSignal>>({}) @@ -345,6 +363,9 @@ const AgentManagerContent: Component = () => { // Per-worktree git stats (diff additions/deletions, commits missing from origin) const [worktreeStats, setWorktreeStats] = createSignal>({}) + // Per-worktree PR status data + const [prStatuses, setPrStatuses] = createSignal>({}) + // Local repo git stats (branch name, diff additions/deletions, commits) const [localStats, setLocalStats] = createSignal() @@ -609,6 +630,8 @@ const AgentManagerContent: Component = () => { // Sidebar worktree order (persisted to extension state) const [sidebarWorktreeOrder, setSidebarWorktreeOrder] = createSignal([]) const [draggingWorktree, setDraggingWorktree] = createSignal() + const [renamingSection, setRenamingSection] = createSignal(null) + let pendingNewSection = false const addPendingTab = () => { const id = `${PENDING_PREFIX}${++pendingCounter}` @@ -649,11 +672,17 @@ 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) } }) + trackOpenSessions(localSessionIDs, isPending, managedSessions, vscode.postMessage) // Drop in-memory review state for worktrees that no longer exist. createEffect(() => { @@ -786,6 +815,11 @@ const AgentManagerContent: Component = () => { return firstOrderedTitle(sessions, worktreeTabOrder()[wt.id], wt.branch) } + const worktreeSubtitle = (wt: WorktreeState): string | undefined => { + const label = worktreeLabel(wt) + return label !== wt.branch ? wt.branch : undefined + } + const isStaleWorktree = (worktreeId: string): boolean => staleWorktreeIds().has(worktreeId) /** True when any session in the given ID list is actively working (busy/retry and not blocked by permissions/questions). */ @@ -849,73 +883,63 @@ const AgentManagerContent: Component = () => { return result }) - /** Check if this worktree is part of a group. */ - const isGrouped = (wt: WorktreeState) => !!wt.groupId + const worktreesInSection = (id: string) => sortedWorktrees().filter((wt) => wt.sectionId === id) + const ungrouped = createMemo(() => sortedWorktrees().filter((wt) => !wt.sectionId)) + const topLevelItems = createMemo((): TopLevelItem[] => + buildTopLevelItems(sections(), ungrouped(), sortedWorktrees(), sidebarWorktreeOrder()), + ) - /** Check if this is the first item in its group. */ - const isGroupStart = (wt: WorktreeState, idx: number) => { - if (!wt.groupId) return false - const list = sortedWorktrees() - if (idx === 0) return true - return list[idx - 1]?.groupId !== wt.groupId + /** Flat visual order of all visible sidebar items — used for navigation and shortcut assignment. */ + const sidebarOrder = createMemo(() => + buildSidebarOrder(topLevelItems(), sortedWorktrees(), sections(), worktreesInSection, unassignedSessions()), + ) + /** Map from sidebar item id → 1-based shortcut number (⌘1 for LOCAL, ⌘2 for first worktree, etc.) */ + const shortcutMap = createMemo(() => buildShortcutMap(sidebarOrder())) + + const moveToSection = (ids: string[], sec: string | null) => + vscode.postMessage({ type: "agentManager.moveToSection", worktreeIds: ids, sectionId: sec }) + const moveSection = (sectionId: string, dir: -1 | 1) => + vscode.postMessage({ type: "agentManager.moveSection", sectionId, dir }) + const newSection = (ids?: string[]) => { + pendingNewSection = true + vscode.postMessage({ + type: "agentManager.createSection", + name: t("agentManager.section.defaultName"), + color: randomColor(), + worktreeIds: ids, + }) } - /** Check if this is the last item in its group. */ - const isGroupEnd = (wt: WorktreeState, idx: number) => { - if (!wt.groupId) return false - const list = sortedWorktrees() - if (idx === list.length - 1) return true - return list[idx + 1]?.groupId !== wt.groupId - } + const scrollIntoView = (el: HTMLElement) => el.scrollIntoView({ block: "nearest", behavior: "smooth" }) - const scrollIntoView = (el: HTMLElement) => { - el.scrollIntoView({ block: "nearest", behavior: "smooth" }) - } - - // Navigate sidebar items with arrow keys - const navigate = (direction: "up" | "down") => { - const flat: { type: typeof LOCAL | "wt" | "session"; id: string }[] = [ - { type: LOCAL, id: LOCAL }, - ...sortedWorktrees().map((wt) => ({ type: "wt" as const, id: wt.id })), - ...unassignedSessions().map((s) => ({ type: "session" as const, id: s.id })), - ] - if (flat.length === 0) return - - const current = selection() ?? session.currentSessionID() - const idx = current ? flat.findIndex((f) => f.id === current) : -1 - const next = direction === "up" ? idx - 1 : idx + 1 - if (next < 0 || next >= flat.length) return - - const item = flat[next]! - if (item.type === LOCAL) { - selectLocal() - } else if (item.type === "wt") { - selectWorktree(item.id) - } else { + const focusSidebarItem = (item: { type: string; id: string }) => { + if (item.type === "local") selectLocal() + else if (item.type === "wt") selectWorktree(item.id) + else { saveTabMemory() setSelection(null) setReviewActive(false) session.selectSession(item.id) } - const el = document.querySelector(`[data-sidebar-id="${item.id}"]`) if (el instanceof HTMLElement) scrollIntoView(el) } - // Jump to sidebar item by 1-based index (⌘1 = LOCAL, ⌘2 = first worktree, etc.) + // Navigate sidebar items with arrow keys (uses visual order from sidebarOrder) + const navigate = (direction: "up" | "down") => { + const flat = sidebarOrder() + if (flat.length === 0) return + const current = selection() ?? session.currentSessionID() + const idx = current ? flat.findIndex((f) => f.id === current) : -1 + const next = direction === "up" ? idx - 1 : idx + 1 + if (next < 0 || next >= flat.length) return + focusSidebarItem(flat[next]!) + } + + // Jump to sidebar item by 0-based index into sidebarOrder (⌘1 = index 0 = LOCAL, ⌘2 = index 1, etc.) const jumpToItem = (index: number) => { - if (index === 0) { - selectLocal() - const el = document.querySelector(`[data-sidebar-id="local"]`) - if (el instanceof HTMLElement) scrollIntoView(el) - return - } - const wts = sortedWorktrees() - const wt = wts[index - 1] - if (!wt) return - selectWorktree(wt.id) - const el = document.querySelector(`[data-sidebar-id="${wt.id}"]`) - if (el instanceof HTMLElement) scrollIntoView(el) + const item = sidebarOrder()[index] + if (item) focusSidebarItem(item) } // Navigate tabs with Cmd+Alt+Left/Right @@ -1012,9 +1036,9 @@ const AgentManagerContent: Component = () => { } else if (msg.action === "toggleDiff") { if (reviewActive()) { closeReviewTab() - setDiffOpen(true) + setSidePanel("diff") } else { - setDiffOpen((prev) => !prev) + setSidePanel((prev) => (prev === "diff" ? null : "diff")) } } else if (msg.action === "newTab") handleNewTabForCurrentSelection() else if (msg.action === "closeTab") closeActiveTab() @@ -1101,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) }) @@ -1153,7 +1178,7 @@ const AgentManagerContent: Component = () => { setSelection(ev.worktreeId) } // Close diff/review panels — nothing to show during setup - setDiffOpen(false) + setSidePanel(null) setReviewActive(false) setSetup({ active: true, message: ev.message, branch: ev.branch, worktreeId: ev.worktreeId }) } @@ -1175,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) } @@ -1194,6 +1220,14 @@ const AgentManagerContent: Component = () => { // When not a git repo, also mark sessions as loaded since the Kilo // server won't connect to send the sessionsLoaded message. if (state.isGitRepo === false && !sessionsLoaded()) setSessionsLoaded(true) + const prev = new Set(sections().map((s) => s.id)), + incoming = state.sections ?? [] + setSections(incoming) + if (pendingNewSection) { + pendingNewSection = false + const c = incoming.find((s) => !prev.has(s.id)) + if (c) setRenamingSection(c.id) + } if (state.tabOrder) setWorktreeTabOrder(state.tabOrder) if (state.worktreeOrder) setSidebarWorktreeOrder(state.worktreeOrder) if (state.reviewDiffStyle === "split" || state.reviewDiffStyle === "unified") { @@ -1205,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 @@ -1371,6 +1405,8 @@ const AgentManagerContent: Component = () => { } } + if (msg.type === "agentManager.revertWorktreeFileResult") revertCtl.onResult(msg as never) + if (msg.type === "agentManager.worktreeStats") { const ev = msg as AgentManagerWorktreeStatsMessage const map: Record = {} @@ -1383,6 +1419,11 @@ const AgentManagerContent: Component = () => { setLocalStats(ev.stats) setRepoBranch(ev.stats.branch) } + + if (msg.type === "agentManager.prStatus") { + const ev = msg as AgentManagerPRStatusMessage + setPrStatuses((prev) => ({ ...prev, [ev.worktreeId]: ev.pr })) + } }) onCleanup(() => { @@ -1458,7 +1499,7 @@ const AgentManagerContent: Component = () => { const openReviewTab = () => { const sel = selection() if (sel === null) return - setDiffOpen(false) + setSidePanel(null) setReviewOpenForContext(sel, true) setReviewActive(true) } @@ -1567,6 +1608,8 @@ const AgentManagerContent: Component = () => { return new Set(Object.keys(diffFileLoading()[sessionId] ?? {})) }) + const revertCtl = createRevertFile(currentDiffSessionId, vscode, showToast, t) + const handleConfigureSetupScript = () => { vscode.postMessage({ type: "agentManager.configureSetupScript" }) } @@ -1723,7 +1766,9 @@ const AgentManagerContent: Component = () => { if (selection() === wt.id) { const next = nextSelectionAfterDelete( wt.id, - worktrees().map((w) => w.id), + sidebarOrder() + .filter((f) => f.type === "wt") + .map((f) => f.id), ) if (next === LOCAL) selectLocal() else selectWorktree(next) @@ -1746,7 +1791,9 @@ const AgentManagerContent: Component = () => { if (selection() === wt.id) { const next = nextSelectionAfterDelete( wt.id, - worktrees().map((w) => w.id), + sidebarOrder() + .filter((f) => f.type === "wt") + .map((f) => f.id), ) if (next === LOCAL) selectLocal() if (next !== LOCAL) selectWorktree(next) @@ -1851,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 }) } @@ -2128,6 +2178,11 @@ const AgentManagerContent: Component = () => { ))} + + newSection()}> + + {t("agentManager.worktree.newSection")} + @@ -2216,56 +2271,40 @@ const AgentManagerContent: Component = () => { setRenamingWt(null) } + const hasSections = createMemo(() => sections().length > 0) const wtIds = createMemo(() => sortedWorktrees().map((wt) => wt.id)) + const secIds = createMemo(() => new Set(sections().map((s) => s.id))) + const home = () => new Map(sortedWorktrees().map((w) => [w.id, w.sectionId] as const)) + const sectionAware = sectionAwareDetector(secIds, home) const onWtDragStart = (event: DragEvent) => { const id = event.draggable?.id if (typeof id === "string") setDraggingWorktree(id) document.body.classList.add("am-wt-dragging-active") } - const onWtDragOver = (event: DragEvent) => { const from = event.draggable?.id const to = event.droppable?.id if (typeof from !== "string" || typeof to !== "string") return + if (secIds().has(to)) return setSidebarWorktreeOrder((prev) => { - const current = applyTabOrder( - sortedWorktrees().map((wt) => ({ id: wt.id })), + const cur = applyTabOrder( + sortedWorktrees().map((w) => ({ id: w.id })), prev, - ).map((item) => item.id) - return reorderTabs(current, from, to) ?? prev + ).map((i) => i.id) + return reorderTabs(cur, from, to) ?? prev }) } - - const onWtDragEnd = () => { + const onWtDragEnd = (event: DragEvent) => { + const from = event.draggable?.id + const to = event.droppable?.id setDraggingWorktree(undefined) document.body.classList.remove("am-wt-dragging-active") - const order = sortedWorktrees().map((wt) => wt.id) - if (order.length > 0) { - vscode.postMessage({ type: "agentManager.setWorktreeOrder", order }) + if (typeof from === "string" && typeof to === "string" && secIds().has(to)) { + moveToSection([from], to) + return } - } - - /** Lock drag movement to the Y axis (vertical-only worktree dragging). */ - const ConstrainDragXAxis: Component = () => { - const ctx = useDragDropContext() - if (!ctx) return null - const [ - , - { onDragStart: onStart, onDragEnd: onEnd, addTransformer: add, removeTransformer: remove }, - ] = ctx - const xform: Transformer = { id: "constrain-x-axis", order: 100, callback: (t) => ({ ...t, x: 0 }) } - const dispose = createRoot((dispose) => { - onStart(({ draggable }) => { - if (draggable) add("draggables", draggable.id as string, xform) - }) - onEnd(({ draggable }) => { - if (draggable) remove("draggables", draggable.id as string, xform.id) - }) - return dispose - }) - onCleanup(dispose) - return null + vscode.postMessage({ type: "agentManager.setWorktreeOrder", order: sidebarWorktreeOrder() }) } return ( @@ -2273,33 +2312,26 @@ const AgentManagerContent: Component = () => { onDragStart={onWtDragStart} onDragEnd={onWtDragEnd} onDragOver={onWtDragOver} - collisionDetector={closestCenter} + collisionDetector={sectionAware} > - - {(wt, idx) => { - const sessions = createMemo(() => managedSessions().filter((ms) => ms.worktreeId === wt.id)) - const navHint = () => { - const flat = [ - LOCAL as string, - ...sortedWorktrees().map((w) => w.id), - ...unassignedSessions().map((s) => s.id), - ] - const active = selection() ?? session.currentSessionID() ?? "" - return adjacentHint( + {(() => { + const renderWt = (wt: WorktreeState, idx: () => number, list?: WorktreeState[]) => { + const wtSessions = createMemo(() => + managedSessions().filter((ms) => ms.worktreeId === wt.id), + ) + const navHint = () => + adjacentHint( wt.id, - active, - flat, + selection() ?? session.currentSessionID() ?? "", + sidebarOrder().map((f) => f.id), kb().previousSession ?? "", kb().nextSession ?? "", ) - } - const groupSize = () => { - if (!wt.groupId) return 0 - return sortedWorktrees().filter((w) => w.groupId === wt.groupId).length - } + const groupSize = () => + !wt.groupId ? 0 : sortedWorktrees().filter((w) => w.groupId === wt.groupId).length const sortable = createSortable(wt.id) void sortable return ( @@ -2310,23 +2342,34 @@ const AgentManagerContent: Component = () => { + vscode.postMessage({ type: "agentManager.openPR", worktreeId: wt.id }) + } + sections={sections()} + currentSectionId={wt.sectionId} + onMoveToSection={(secId) => moveToSection([wt.id], secId)} + onMoveToNewSection={() => newSection()} onClick={() => { if (pendingDelete() === wt.id) { confirmDeleteWorktree(wt.id) @@ -2340,17 +2383,60 @@ const AgentManagerContent: Component = () => { onCommitRename={() => commitRename(wt.id)} onCancelRename={cancelRename} onRemoveStale={() => confirmRemoveStaleWorktree(wt.id)} - onCopyPath={() => - vscode.postMessage({ type: "agentManager.copyToClipboard", text: wt.path }) - } + onCopyPath={() => navigator.clipboard.writeText(wt.path)} onOpen={() => vscode.postMessage({ type: "agentManager.openWorktree", worktreeId: wt.id }) } />
) - }} - + } + if (hasSections()) { + const post = vscode.postMessage.bind(vscode) + return ( + + {(item, idx) => { + if (item.kind === "section") { + const sec = item.section + const members = createMemo(() => worktreesInSection(sec.id)) + return ( + setRenamingSection(null)} + onToggle={() => + post({ type: "agentManager.toggleSectionCollapsed", sectionId: sec.id }) + } + onRename={(name) => + post({ type: "agentManager.renameSection", sectionId: sec.id, name }) + } + onDelete={() => post({ type: "agentManager.deleteSection", sectionId: sec.id })} + onSetColor={(color) => + post({ type: "agentManager.setSectionColor", sectionId: sec.id, color }) + } + isFirst={idx() === 0} + isLast={idx() === topLevelItems().length - 1} + onMoveUp={() => moveSection(sec.id, -1)} + onMoveDown={() => moveSection(sec.id, 1)} + > + +
+ {(wt, wtIdx) => renderWt(wt, wtIdx, members())} +
+ + + ) + } + const ug = ungrouped() + const wtIdx = () => ug.indexOf(item.wt) + return renderWt(item.wt, wtIdx, ug) + }} + + ) + } + return {(wt, idx) => renderWt(wt, idx)} + })()} {(() => { @@ -2622,10 +2708,10 @@ const AgentManagerContent: Component = () => { onClick={() => { if (reviewActive()) { closeReviewTab() - setDiffOpen(true) + setSidePanel("diff") return } - setDiffOpen((prev) => !prev) + setSidePanel((prev) => (prev === "diff" ? null : "diff")) }} title={t("agentManager.diff.toggle")} > @@ -2752,7 +2838,7 @@ const AgentManagerContent: Component = () => { {/* Chat + side diff panel (hidden when review tab is active) */}
@@ -2810,7 +2896,7 @@ const AgentManagerContent: Component = () => {
- +
{ }} />
- setDiffOpen(false)} - onExpand={selection() !== null ? openReviewTab : undefined} - onRequestDiff={requestDiffFile} - onOpenFile={(file) => { - const id = currentDiffSessionId() - if (id) vscode.postMessage({ type: "agentManager.openFile", sessionId: id, filePath: file }) - else if (selection() === LOCAL) vscode.postMessage({ type: "openFile", filePath: file }) - }} - /> + + setSidePanel(null)} + onExpand={selection() !== null ? openReviewTab : undefined} + onRequestDiff={requestDiffFile} + onOpenFile={(file) => { + const id = currentDiffSessionId() + if (id) vscode.postMessage({ type: "agentManager.openFile", sessionId: id, filePath: file }) + else if (selection() === LOCAL) vscode.postMessage({ type: "openFile", filePath: file }) + }} + onRevertFile={revertCtl.revert} + revertingFiles={revertCtl.reverting()} + /> +
@@ -2872,6 +2962,8 @@ const AgentManagerContent: Component = () => { if (id) vscode.postMessage({ type: "agentManager.openFile", sessionId: id, filePath: file }) else if (selection() === LOCAL) vscode.postMessage({ type: "openFile", filePath: file }) }} + onRevertFile={revertCtl.revert} + revertingFiles={revertCtl.reverting()} onClose={closeReviewTab} />
diff --git a/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx b/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx index 3c00d20d5c..7096adabb5 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/DiffPanel.tsx @@ -41,6 +41,8 @@ interface DiffPanelProps { onExpand?: () => void onRequestDiff?: (file: string) => void onOpenFile?: (relativePath: string) => void + onRevertFile?: (file: string) => void + revertingFiles?: Set } export const DiffPanel: Component = (props) => { @@ -307,6 +309,11 @@ export const DiffPanel: Component = (props) => { sendAllToChat() } + const handleExpandAll = () => { + const allOpen = open().length === props.diffs.length + setOpen(allOpen ? [] : props.diffs.map((d) => d.file)) + } + const totals = createMemo(() => ({ files: props.diffs.length, additions: props.diffs.reduce((sum, diff) => sum + diff.additions, 0), @@ -354,6 +361,28 @@ export const DiffPanel: Component = (props) => {
+ 0}> + + + + = (props) => { /> + + + { + e.stopPropagation() + props.onRevertFile?.(diff.file) + }} + /> + + diff --git a/packages/kilo-vscode/webview-ui/agent-manager/FileTree.tsx b/packages/kilo-vscode/webview-ui/agent-manager/FileTree.tsx index e729a5b7a4..449c922ea0 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/FileTree.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/FileTree.tsx @@ -1,6 +1,8 @@ import { type Component, createSignal, createMemo, For, Show } from "solid-js" import { FileIcon } from "@kilocode/kilo-ui/file-icon" import { Icon } from "@kilocode/kilo-ui/icon" +import { IconButton } from "@kilocode/kilo-ui/icon-button" +import { Tooltip } from "@kilocode/kilo-ui/tooltip" import type { WorktreeFileDiff } from "../src/types/messages" import { useLanguage } from "../src/context/language" import { buildFileTree, flatten, type FileTreeNode } from "./file-tree-utils" @@ -13,6 +15,8 @@ interface FileTreeProps { comments?: ReviewComment[] selectedFiles?: Set onFileToggle?: (path: string, checked: boolean) => void + onRevertFile?: (path: string) => void + revertingFiles?: Set showSummary?: boolean } @@ -24,6 +28,8 @@ const DirectoryNode: Component<{ commentsByFile?: Map selectedFiles?: Set onFileToggle?: (path: string, checked: boolean) => void + onRevertFile?: (path: string) => void + revertingFiles?: Set }> = (props) => { const [expanded, setExpanded] = createSignal(true) const hasActiveDescendant = createMemo(() => { @@ -56,6 +62,8 @@ const DirectoryNode: Component<{ commentsByFile={props.commentsByFile} selectedFiles={props.selectedFiles} onFileToggle={props.onFileToggle} + onRevertFile={props.onRevertFile} + revertingFiles={props.revertingFiles} /> } > @@ -67,6 +75,8 @@ const DirectoryNode: Component<{ commentsByFile={props.commentsByFile} selectedFiles={props.selectedFiles} onFileToggle={props.onFileToggle} + onRevertFile={props.onRevertFile} + revertingFiles={props.revertingFiles} /> )} @@ -84,10 +94,14 @@ const FileNode: Component<{ commentsByFile?: Map selectedFiles?: Set onFileToggle?: (path: string, checked: boolean) => void + onRevertFile?: (path: string) => void + revertingFiles?: Set }> = (props) => { + const { t } = useLanguage() const active = () => props.activeFile === props.node.path const checked = () => props.selectedFiles?.has(props.node.path) ?? false const selectable = () => Boolean(props.onFileToggle) + const reverting = () => props.revertingFiles?.has(props.node.path) ?? false const status = () => props.node.diff?.status ?? "modified" const additions = () => props.node.diff?.additions ?? 0 const deletions = () => props.node.diff?.deletions ?? 0 @@ -96,7 +110,7 @@ const FileNode: Component<{ const comments = () => props.commentsByFile?.get(props.node.path) ?? 0 return ( - + + + { + e.stopPropagation() + props.onRevertFile?.(props.node.path) + }} + /> + - +
) } @@ -179,6 +213,8 @@ export const FileTree: Component = (props) => { commentsByFile={commentsByFile()} selectedFiles={props.selectedFiles} onFileToggle={props.onFileToggle} + onRevertFile={props.onRevertFile} + revertingFiles={props.revertingFiles} /> } > @@ -190,6 +226,8 @@ export const FileTree: Component = (props) => { commentsByFile={commentsByFile()} selectedFiles={props.selectedFiles} onFileToggle={props.onFileToggle} + onRevertFile={props.onRevertFile} + revertingFiles={props.revertingFiles} /> )} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/FullScreenDiffView.tsx b/packages/kilo-vscode/webview-ui/agent-manager/FullScreenDiffView.tsx index 041b1fbf14..f00410e090 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/FullScreenDiffView.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/FullScreenDiffView.tsx @@ -41,6 +41,8 @@ interface FullScreenDiffViewProps { onDiffStyleChange: (style: DiffStyle) => void onRequestDiff?: (file: string) => void onOpenFile?: (relativePath: string) => void + onRevertFile?: (file: string) => void + revertingFiles?: Set onClose: () => void } @@ -458,6 +460,8 @@ export const FullScreenDiffView: Component = (props) => activeFile={activeFile()} onFileSelect={handleFileSelect} comments={comments()} + onRevertFile={props.onRevertFile} + revertingFiles={props.revertingFiles} /> = (props) => /> + + + { + e.stopPropagation() + props.onRevertFile?.(diff.file) + }} + /> + + diff --git a/packages/kilo-vscode/webview-ui/agent-manager/SectionHeader.tsx b/packages/kilo-vscode/webview-ui/agent-manager/SectionHeader.tsx new file mode 100644 index 0000000000..34dbedb6d2 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/agent-manager/SectionHeader.tsx @@ -0,0 +1,152 @@ +import { Component, Show, createEffect, createSignal, type JSX } from "solid-js" +import { createDroppable } from "@thisbeyond/solid-dnd" +import { ContextMenu } from "@kilocode/kilo-ui/context-menu" +import { Icon } from "@kilocode/kilo-ui/icon" +import type { SectionState } from "../src/types/messages" +import { SECTION_COLORS, colorCss } from "./section-colors" +import { useLanguage } from "../src/context/language" + +interface Props { + section: SectionState + count: number + children?: JSX.Element + /** When true, auto-enter rename mode (e.g. after creation). */ + autoRename?: boolean + onToggle: () => void + onRename: (name: string) => void + onDelete: () => void + onSetColor: (color: string | null) => void + /** Called when rename ends (commit or cancel) so parent clears autoRename. */ + onRenameEnd?: () => void + onMoveUp?: () => void + onMoveDown?: () => void + isFirst?: boolean + isLast?: boolean +} + +const SectionHeader: Component = (props) => { + const { t } = useLanguage() + const [renaming, setRenaming] = createSignal(false) + const [value, setValue] = createSignal("") + + const border = () => colorCss(props.section.color) ?? "var(--vscode-panel-border)" + + const startRename = () => { + setValue(props.section.name) + setRenaming(true) + } + + const commit = () => { + const trimmed = value().trim() + setRenaming(false) + props.onRenameEnd?.() + if (trimmed && trimmed !== props.section.name) { + props.onRename(trimmed) + } + } + + const cancel = () => { + setRenaming(false) + props.onRenameEnd?.() + } + + createEffect(() => { + if (props.autoRename && !renaming()) startRename() + }) + + const handleClick = (e: MouseEvent) => { + if (e.button !== 0 || renaming()) return + props.onToggle() + } + + const droppable = createDroppable(props.section.id) + + return ( +
+ + +
+ + setValue(e.currentTarget.value)} + onKeyDown={(e) => { + if (e.key === "Enter") commit() + if (e.key === "Escape") cancel() + }} + onBlur={commit} + onClick={(e) => e.stopPropagation()} + ref={(el) => + requestAnimationFrame(() => + requestAnimationFrame(() => { + el.focus() + el.select() + }), + ) + } + /> + } + > + {props.section.name} + +
+ {props.count} + + + + + + {t("agentManager.section.rename")} + + + + {t("agentManager.section.setColor")} +
+ props.onSetColor(null)} class="am-color-grid-item"> + + + {SECTION_COLORS.map((c) => ( + props.onSetColor(c.label)} class="am-color-grid-item"> + + + ))} +
+ + + props.onMoveUp?.()} disabled={props.isFirst}> + + {t("agentManager.section.moveUp")} + + props.onMoveDown?.()} disabled={props.isLast}> + + {t("agentManager.section.moveDown")} + + + + + {t("agentManager.section.delete")} + + + + + {props.children} +
+ ) +} + +export default SectionHeader diff --git a/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx b/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx index 1bf24c5c08..39a0f09bc9 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx +++ b/packages/kilo-vscode/webview-ui/agent-manager/WorktreeItem.tsx @@ -2,7 +2,7 @@ * Sidebar worktree item with inline delete confirmation, HoverCard, rename, and stats. * Extracted from AgentManagerApp for reuse and visual-regression testing via Storybook. */ -import { Component, Show, createSignal } from "solid-js" +import { Component, For, Show, createSignal } from "solid-js" import { Icon } from "@kilocode/kilo-ui/icon" import { IconButton } from "@kilocode/kilo-ui/icon-button" import { Spinner } from "@kilocode/kilo-ui/spinner" @@ -10,7 +10,8 @@ import { Tooltip, TooltipKeybind } from "@kilocode/kilo-ui/tooltip" import { HoverCard } from "@kilocode/kilo-ui/hover-card" import { ContextMenu } from "@kilocode/kilo-ui/context-menu" import { Button } from "@kilocode/kilo-ui/button" -import type { WorktreeState, WorktreeGitStats } from "../src/types/messages" +import type { WorktreeState, WorktreeGitStats, PRStatus, SectionState } from "../src/types/messages" +import { colorCss } from "./section-colors" import { useLanguage } from "../src/context/language" import { formatRelativeDate } from "../src/utils/date" @@ -22,14 +23,16 @@ interface WorktreeItemProps { worktree: WorktreeState /** Display label (resolved from label, first session title, or branch). */ label: string + /** Branch name shown as subtitle when it differs from the label. */ + subtitle?: string active: boolean pendingDelete: boolean busy: boolean /** Whether an agent session on this worktree is actively working (shows spinner instead of branch icon). */ working: boolean stale: boolean - /** 1-indexed shortcut number shown as ⌘2, ⌘3, etc. Pass 0 or >9 to hide. */ - shortcut: number + /** 1-indexed shortcut number shown as ⌘2, ⌘3, etc. Pass 0, >9, or undefined to hide. */ + shortcut?: number stats?: WorktreeGitStats /** Navigation hint text shown in the hover card (e.g. "⌘⌥↑"). */ navHint?: string @@ -51,6 +54,18 @@ interface WorktreeItemProps { closeKeybind: string /** Keybinding string for the open-in-vscode action. */ openKeybind: string + /** PR status for this worktree's branch, or null if no PR. */ + pr?: PRStatus | null + /** Callback when the PR badge is clicked. */ + onOpenPR?: () => void + /** Available sections for the "Move to Section" submenu. */ + sections?: SectionState[] + /** ID of the section this worktree currently belongs to (for disabling current item). */ + currentSectionId?: string + /** Move this worktree to a section (or null for ungrouped). */ + onMoveToSection?: (sectionId: string | null) => void + /** Move this worktree to a new section. */ + onMoveToNewSection?: () => void onClick: () => void onDelete: (e: MouseEvent) => void @@ -68,11 +83,41 @@ const MAX_SHORTCUT = 9 const hasStats = (s: WorktreeGitStats | undefined): s is WorktreeGitStats => !!s && (s.files > 0 || s.additions > 0 || s.deletions > 0 || s.ahead > 0 || s.behind > 0) +/** Returns the accent color for a PR badge based on state priority. */ +export function prAccentColor(pr: PRStatus): string { + if (pr.state === "draft") return "var(--text-weaker)" + if (pr.state === "merged") return "#a78bfa" + if (pr.state === "closed") return "#f87171" + if (pr.checks.status === "failure") return "#ef4444" + if (pr.review === "changes_requested") return "#fbbf24" + if (pr.checks.status === "pending") return "#fbbf24" + return "#34d399" +} + +function prStateLabel(state: PRStatus["state"]): string { + if (state === "draft") return "Draft" + if (state === "merged") return "Merged" + if (state === "closed") return "Closed" + return "Open" +} + +function reviewLabel(review: string): string { + if (review === "approved") return "Approved" + if (review === "changes_requested") return "Changes Requested" + return "Pending" +} + export const WorktreeItem: Component = (props) => { const { t } = useLanguage() const [hovered, setHovered] = createSignal(false) const [overClose, setOverClose] = createSignal(false) + const handleOpenPR = (e: MouseEvent) => { + e.stopPropagation() + e.preventDefault() + props.onOpenPR?.() + } + return ( <> @@ -102,128 +147,164 @@ export const WorktreeItem: Component = (props) => { data-sidebar-id={props.worktree.id} onClick={() => props.onClick()} > - - - - - - - - - { - e.stopPropagation() - props.onStartRename(props.label) - }} - title={t("agentManager.worktree.doubleClickRename")} - > - {props.label} - - } - > - props.onRenameInput(e.currentTarget.value)} - onKeyDown={(e) => { - if (e.key === "Enter") { - e.preventDefault() - props.onCommitRename() - } - if (e.key === "Escape") { - e.preventDefault() - props.onCancelRename() - } - }} - onBlur={() => props.onCommitRename()} - onClick={(e) => e.stopPropagation()} - ref={(el) => - requestAnimationFrame(() => - requestAnimationFrame(() => { - el.focus() - el.select() - }), - ) - } - /> - - = 2 && props.shortcut <= MAX_SHORTCUT}> - - {isMac ? "⌘" : "Ctrl+"} - {props.shortcut} - - - -
-
-
-
- - -
+
+ +
+
+ {/* Row 1: label + stale badge + stats/hover-actions overlay */} +
+ + + + + + + 0 || props.stats!.deletions > 0} + when={props.renaming} fallback={ - 0}> - {props.stats!.files}f + { + e.stopPropagation() + props.onStartRename(props.label) + }} + title={t("agentManager.worktree.doubleClickRename")} + > + {props.label} + + } + > + props.onRenameInput(e.currentTarget.value)} + onKeyDown={(e) => { + if (e.key === "Enter") { + e.preventDefault() + props.onCommitRename() + } + if (e.key === "Escape") { + e.preventDefault() + props.onCancelRename() + } + }} + onBlur={() => props.onCommitRename()} + onClick={(e) => e.stopPropagation()} + ref={(el) => + requestAnimationFrame(() => + requestAnimationFrame(() => { + el.focus() + el.select() + }), + ) + } + /> + + {/* Grid cell: stats visible by default, hover actions on top */} +
+ +
+
+
+ + +
+ 0}> + ↓{props.stats!.behind} + + 0}> + ↑{props.stats!.ahead} + + 0 || props.stats!.deletions > 0} + fallback={ + 0}> + {props.stats!.files}f + + } + > + 0}> + +{props.stats!.additions} + + 0}> + −{props.stats!.deletions} + + +
+ + + {t("agentManager.worktree.confirmDelete")} + +
+ = 2 && props.shortcut <= MAX_SHORTCUT} + > + + {isMac ? "⌘" : "Ctrl+"} + {props.shortcut} + + + +
setOverClose(true)} + onMouseLeave={() => setOverClose(false)} + > + + props.onDelete(e)} + /> + +
+ +
+
+
+ {/* Row 2: branch subtitle + PR badge */} +
+ + {props.subtitle} + + +
} > -
- 0}> - +{props.stats!.additions} - - 0}> - −{props.stats!.deletions} - -
- - 0 || props.stats!.behind > 0}> -
- 0}> - ↑{props.stats!.ahead} - - 0}> - ↓{props.stats!.behind} - -
+ {(pr) => { + const accent = () => prAccentColor(pr()) + return ( + + + #{pr().number} + + ) + }}
- - - {t("agentManager.worktree.confirmDelete")} - - -
setOverClose(true)} - onMouseLeave={() => setOverClose(false)} - > - - props.onDelete(e)} - /> - -
- +
} @@ -313,6 +394,34 @@ export const WorktreeItem: Component = (props) => {
+ + {(pr) => ( + <> +
+
+ PR #{pr().number} + + + + + {prStateLabel(pr().state)} + +
+ +
+ Review + {reviewLabel(pr().review!)} +
+ +
+ Checks + + {pr().checks.passed}/{pr().checks.total} passed + +
+ + )} +
@@ -353,6 +462,38 @@ export const WorktreeItem: Component = (props) => { {t("agentManager.worktree.copyPath")} + + props.onMoveToNewSection?.()}> + + {t("agentManager.worktree.newSection")} + + 0}> + + props.onMoveToSection?.(null)}> + + + + {t("agentManager.worktree.ungrouped")} + + + {(sec) => ( + props.onMoveToSection?.(sec.id)}> + + } + > + + + {sec.name} + + )} + + diff --git a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager-review.css b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager-review.css index 6dd18b5132..845e5c7511 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager-review.css +++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager-review.css @@ -397,6 +397,44 @@ color: var(--syntax-diff-delete, #da3319); } +/* File tree revert button — always visible */ + +.am-file-tree-file-content { + display: flex; + align-items: center; + gap: 6px; + flex: 1; + min-width: 0; + border: none; + background: none; + color: inherit; + font-size: inherit; + font-family: inherit; + cursor: pointer; + padding: 0; + text-align: left; + white-space: nowrap; +} + +.am-file-tree-revert-btn { + flex-shrink: 0; + color: var(--text-weaker); +} + +.am-file-tree-revert-btn:not(:disabled):hover { + color: var(--syntax-diff-delete, #da3319); +} + +/* Diff header revert button — always visible */ + +.am-diff-revert-btn { + color: var(--text-weaker); +} + +.am-diff-revert-btn:not(:disabled):hover { + color: var(--syntax-diff-delete, #da3319); +} + /* File tree summary footer */ .am-file-tree-summary { diff --git a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css index 6cce27a333..cde6e7b2e3 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css +++ b/packages/kilo-vscode/webview-ui/agent-manager/agent-manager.css @@ -62,8 +62,7 @@ } .am-local-item-active .am-local-branch { - color: var(--text-on-interactive-base); - opacity: 0.7; + color: color-mix(in srgb, var(--text-on-interactive-base) 70%, transparent); } .am-local-item-active .am-stat-files { @@ -92,8 +91,8 @@ } .am-local-branch { - font-size: var(--font-size-small); - color: var(--text-weak); + font-size: 10px; + color: var(--text-weaker); line-height: 1.2; overflow: hidden; text-overflow: ellipsis; @@ -181,12 +180,11 @@ button.am-section-toggle:hover .am-section-label { } .am-worktree-item { - position: relative; display: flex; - align-items: center; + align-items: flex-start; gap: 8px; - padding: 8px 10px; - min-height: 40px; + padding: 6px 10px; + min-height: 36px; box-sizing: border-box; border-radius: var(--radius-sm); cursor: pointer; @@ -197,6 +195,87 @@ button.am-section-toggle:hover .am-section-label { transition: background 200ms ease; } +/* Left icon column — shrink-0, vertically centered with first row */ +.am-wt-icon { + flex-shrink: 0; + display: flex; + align-items: center; + height: 20px; +} + +/* Right content column — flex-1 with two rows */ +.am-wt-content { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + gap: 2px; +} + +/* Row 1: label + stats/hover-actions */ +.am-wt-row1 { + display: flex; + align-items: center; + gap: 6px; + min-width: 0; +} + +/* Grid overlay cell: stats visible by default, hover actions stacked on top */ +.am-wt-actions-cell { + position: relative; + flex-shrink: 0; + display: grid; + align-items: center; + margin-left: auto; +} +.am-wt-actions-cell > * { + grid-column: 1; + grid-row: 1; +} + +/* Hover actions (shortcut badge + close button) — hidden by default, shown on hover */ +.am-wt-hover-actions { + display: flex; + align-items: center; + justify-content: flex-end; + gap: 2px; + opacity: 0; + visibility: hidden; +} +.am-worktree-item:hover .am-wt-hover-actions { + opacity: 1; + visibility: visible; +} +/* Stats fade out on hover (replaced by hover actions in same grid cell) */ +.am-worktree-item:hover .am-wt-actions-cell > .am-worktree-stats, +.am-worktree-item:hover .am-wt-actions-cell > .am-worktree-stats-skeleton { + opacity: 0; + visibility: hidden; +} + +/* Row 2: always present for consistent height; PR badge right-aligned */ +.am-wt-row2 { + display: flex; + align-items: center; + gap: 6px; + min-height: 14px; +} + +.am-worktree-subtitle { + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: 10px; + color: var(--text-weaker); + line-height: 1.2; + min-width: 0; +} + +.am-worktree-item-active .am-worktree-subtitle { + color: color-mix(in srgb, var(--text-on-interactive-base) 70%, transparent); +} + .am-worktree-item:hover { background: var(--surface-inset-base-hover); } @@ -238,13 +317,9 @@ button.am-section-toggle:hover .am-section-label { outline: none; } -/* Shortcut badge — hover-reveal index badge (⌘1, ⌘2, etc.) matching Superset style */ +/* Shortcut badge — hover-reveal index badge (⌘1, ⌘2, etc.) */ .am-shortcut-badge { - position: absolute; - right: 30px; - opacity: 0; - transition: opacity 150ms ease; font-size: 10px; font-variant-numeric: tabular-nums; color: var(--text-weaker); @@ -256,8 +331,7 @@ button.am-section-toggle:hover .am-section-label { right: 8px; } -.am-local-item:hover .am-shortcut-badge, -.am-worktree-item:hover .am-shortcut-badge { +.am-local-item:hover .am-shortcut-badge { opacity: 1; } @@ -278,29 +352,27 @@ button.am-section-toggle:hover .am-section-label { color: var(--text-weak); } -.am-worktree-item:has(.am-worktree-rename-input) .am-shortcut-badge { - opacity: 0; +.am-worktree-item:has(.am-worktree-rename-input) .am-wt-row2 { + display: none; } .am-worktree-close { - position: absolute; - right: 4px; flex-shrink: 0; +} +/* Compact close button inside worktree items */ +.am-worktree-close [data-component="icon-button"] { + width: 18px; + height: 18px; + padding: 2px; +} +.am-worktree-close [data-component="icon"] { + width: 14px; + height: 14px; +} + +.am-worktree-item:has(.am-worktree-rename-input) .am-wt-hover-actions { opacity: 0; -} - -.am-worktree-item:hover .am-worktree-branch { - mask-image: linear-gradient(to right, black calc(100% - 72px), transparent calc(100% - 36px)); - -webkit-mask-image: linear-gradient(to right, black calc(100% - 72px), transparent calc(100% - 36px)); -} - -.am-worktree-item:hover .am-worktree-close { - opacity: 1; -} - -.am-worktree-item:has(.am-worktree-rename-input) .am-worktree-close { - opacity: 0; - pointer-events: none; + visibility: hidden; } /* Inline delete confirmation */ @@ -315,7 +387,8 @@ button.am-section-toggle:hover .am-section-label { background: color-mix(in srgb, var(--surface-critical-strong) 25%, transparent); } -.am-worktree-pending-delete .am-worktree-branch { +.am-worktree-pending-delete .am-worktree-branch, +.am-worktree-pending-delete .am-worktree-subtitle { opacity: 0.5; transition: opacity 200ms ease; } @@ -325,16 +398,22 @@ button.am-section-toggle:hover .am-section-label { display: none; } -.am-worktree-pending-delete .am-shortcut-badge { +.am-worktree-pending-delete .am-wt-row2 { + visibility: hidden; +} + +.am-worktree-pending-delete .am-wt-hover-actions { opacity: 0 !important; + visibility: hidden !important; } .am-worktree-delete-hint { + position: absolute; + right: 0; font-size: var(--font-size-small); color: var(--text-on-brand-base); background: var(--surface-critical-strong); white-space: nowrap; - flex-shrink: 0; padding: 1px 8px; border-radius: 4px; cursor: pointer; @@ -383,16 +462,14 @@ button.am-section-toggle:hover .am-section-label { .am-worktree-spinner { width: 16px; height: 16px; - flex-shrink: 0; } /* Per-worktree git stats (diff lines + commits missing from origin) */ .am-worktree-stats { display: flex; - flex-direction: column; - align-items: flex-end; - gap: 1px; + align-items: center; + gap: 4px; flex-shrink: 0; font-family: var(--font-mono, monospace); font-size: 10px; @@ -408,9 +485,7 @@ button.am-section-toggle:hover .am-section-label { .am-worktree-stats-skeleton { display: flex; - flex-direction: column; - align-items: flex-end; - gap: 3px; + align-items: center; flex-shrink: 0; } @@ -422,8 +497,15 @@ button.am-section-toggle:hover .am-section-label { animation: am-skeleton-pulse 1.5s ease-in-out infinite; } -.am-worktree-stats-skeleton-row:nth-child(2) { - animation-delay: 0.15s; +.am-pr-badge-skeleton { + width: 52px; + height: 14px; + border-radius: 6px; + background: var(--text-base); + animation: am-skeleton-pulse 1.5s ease-in-out infinite; + animation-delay: 0.3s; + opacity: 0; + margin-left: auto; } .am-stat-files { @@ -438,6 +520,76 @@ button.am-section-toggle:hover .am-section-label { color: #f87171; } +/* PR pill badge — second row inside am-wt-row2. + Uses --pr-accent custom property (set inline) to derive all colors. */ +.am-pr-badge { + display: inline-flex; + align-items: center; + gap: 2px; + padding: 2px 7px 2px 4px; + border-radius: 6px; + border: none; + background: color-mix(in srgb, var(--pr-accent) 12%, transparent); + color: var(--pr-accent); + cursor: pointer; + font-size: 11px; + font-weight: 500; + font-variant-numeric: tabular-nums; + transition: background 150ms ease; + margin-left: auto; +} +.am-pr-badge:hover { + background: color-mix(in srgb, var(--pr-accent) 25%, transparent); +} +.am-pr-badge [data-component="icon"] { + width: 12px; + height: 12px; + color: var(--pr-accent); +} +.am-pr-badge-number { + line-height: 1; + color: var(--text-muted); +} +.am-pr-badge:hover .am-pr-badge-number { + color: var(--pr-accent); +} +.am-pr-badge[data-pending] { + animation: am-pr-pulse 1.5s ease-in-out infinite; +} +@keyframes am-pr-pulse { + 0%, + 100% { + opacity: 0.9; + } + 50% { + opacity: 0.4; + } +} + +.am-worktree-item-active .am-pr-badge { + background: color-mix(in srgb, var(--pr-accent) 18%, transparent); +} +.am-worktree-item-active .am-pr-badge:hover { + background: color-mix(in srgb, var(--pr-accent) 30%, transparent); +} + +/* Clickable link icon in hover card to open PR on GitHub */ +.am-pr-link { + display: inline-flex; + align-items: center; + margin-right: 3px; + cursor: pointer; + opacity: 0.5; + transition: opacity 100ms ease; +} +.am-pr-link:hover { + opacity: 1; +} +.am-pr-link [data-component="icon"] { + width: 11px; + height: 11px; +} + .am-worktree-item-active .am-stat-files { color: rgba(255, 255, 255, 0.7); } @@ -470,13 +622,156 @@ button.am-section-toggle:hover .am-section-label { color: #fca5a5; } -.am-worktree-item:hover .am-worktree-stats, -.am-worktree-item:hover .am-worktree-stats-skeleton, .am-local-item:hover .am-worktree-stats, .am-local-item:hover .am-worktree-stats-skeleton { opacity: 0; } +/* User-defined sections — collapsible, color-coded groups */ + +.am-section-group { + margin-top: 2px; + border-left: 2px solid var(--section-color, var(--vscode-panel-border)); + border-radius: 0 var(--radius-sm) var(--radius-sm) 0; + transition: border-color 120ms; +} + +.am-section-group-drop { + background: color-mix(in srgb, var(--section-color) 10%, transparent); + border-color: var(--section-color); + border-style: solid; +} + +.am-section-group-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: 5px 10px 5px 6px; + cursor: pointer; + user-select: none; + border-radius: var(--radius-sm); + font-size: 11px; + font-weight: 500; + letter-spacing: 0.3px; + text-transform: uppercase; + color: var(--text-weak); +} + +.am-section-group-header:hover { + background: var(--surface-interactive-hover, var(--vscode-list-hoverBackground)); +} + +.am-section-group-left { + display: flex; + align-items: center; + gap: 4px; + min-width: 0; + overflow: hidden; +} + +.am-section-group-chevron { + flex-shrink: 0; + opacity: 0.7; + transition: transform 120ms ease; +} + +.am-section-group-chevron-collapsed { + transform: rotate(-90deg); +} + +.am-section-group-name { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.am-section-group-count { + flex-shrink: 0; + font-size: 10px; + color: var(--text-weaker); + min-width: 14px; + text-align: center; +} + +.am-section-group-body { + padding-left: 4px; +} + +.am-section-group-rename { + background: var(--input-base, var(--vscode-input-background, #3c3c3c)); + color: var(--vscode-input-foreground); + border: 1px solid var(--border-focus, var(--vscode-focusBorder, #007fd4)); + border-radius: var(--radius-sm); + padding: 1px 4px; + font-size: 11px; + font-weight: 500; + letter-spacing: 0.3px; + text-transform: uppercase; + outline: none; + width: 100%; + min-width: 0; +} + +/* Color picker grid in section context menu */ + +.am-color-grid { + display: flex; + flex-wrap: wrap; + gap: 2px; + padding: 4px 8px; +} + +.am-color-grid-item { + padding: 3px !important; + border-radius: 4px !important; + min-height: unset !important; +} + +.am-color-swatch { + display: block; + width: 16px; + height: 16px; + border-radius: 50%; + flex-shrink: 0; + border: 1.5px solid transparent; +} + +.am-color-swatch-active { + border-color: var(--vscode-foreground); + box-shadow: 0 0 0 1px var(--vscode-editor-background); +} + +.am-color-swatch-default { + background: var(--vscode-panel-border); + position: relative; +} + +.am-color-swatch-default::after { + content: ""; + position: absolute; + top: 50%; + left: 50%; + width: 70%; + height: 1.5px; + background: var(--text-weaker); + transform: translate(-50%, -50%) rotate(-45deg); +} + +.am-color-swatch-sm { + width: 10px; + height: 10px; +} + +.am-icon-flip { + transform: rotate(180deg); +} + +/* Context menu danger item (delete section) */ + +.am-ctx-menu-danger { + color: var(--text-error, var(--vscode-errorForeground, #f44)); +} + /* Grouped worktrees — visual grouping with header and left accent */ .am-wt-group-header { @@ -2957,6 +3252,23 @@ body.am-wt-dragging-active * { font-weight: 500; } +/* Virtual diff panel: file path in toolbar stats area */ + +.am-review-toolbar-dir { + color: var(--text-weak); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + flex-shrink: 1; +} + +.am-review-toolbar-fname { + color: var(--text-base); + white-space: nowrap; + font-weight: 500; + flex-shrink: 0; +} + /* Review body: file tree + diff viewer */ .am-review-body { diff --git a/packages/kilo-vscode/webview-ui/agent-manager/constrain-drag-x.ts b/packages/kilo-vscode/webview-ui/agent-manager/constrain-drag-x.ts new file mode 100644 index 0000000000..3c9ed79504 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/agent-manager/constrain-drag-x.ts @@ -0,0 +1,21 @@ +import { type Component, createRoot, onCleanup } from "solid-js" +import { useDragDropContext, type Transformer } from "@thisbeyond/solid-dnd" + +/** Lock drag movement to the Y axis (vertical-only worktree dragging). */ +export const ConstrainDragXAxis: Component = () => { + const ctx = useDragDropContext() + if (!ctx) return null + const [, { onDragStart, onDragEnd, addTransformer, removeTransformer }] = ctx + const xform: Transformer = { id: "constrain-x-axis", order: 100, callback: (t) => ({ ...t, x: 0 }) } + const dispose = createRoot((d) => { + onDragStart(({ draggable }) => { + if (draggable) addTransformer("draggables", draggable.id as string, xform) + }) + onDragEnd(({ draggable }) => { + if (draggable) removeTransformer("draggables", draggable.id as string, xform.id) + }) + return d + }) + onCleanup(dispose) + return null +} 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 461c428867..3507d4b5fa 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ar.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "نسخ المسار", "agentManager.worktree.openInVscode": "فتح في VS Code", "agentManager.worktree.rename": "إعادة تسمية", + "agentManager.worktree.moveToSection": "نقل إلى القسم", + "agentManager.worktree.newSection": "قسم جديد", + "agentManager.worktree.ungrouped": "غير مجمع", + "agentManager.section.rename": "إعادة تسمية القسم", + "agentManager.section.setColor": "تعيين اللون", + "agentManager.section.delete": "حذف القسم", + "agentManager.section.defaultColor": "افتراضي", + "agentManager.section.defaultName": "قسم جديد", + "agentManager.section.moveUp": "تحريك لأعلى", + "agentManager.section.moveDown": "تحريك لأسفل", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "الفرع", "agentManager.hoverCard.base": "الأساس", "agentManager.hoverCard.sessions": "الجلسات", @@ -43,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": "علامات التبويب", @@ -96,6 +109,9 @@ export const dict = { "agentManager.diff.toggle": "تبديل الفرق", "agentManager.diff.openFile": "فتح الملف", + "agentManager.diff.revertFile": "استعادة الملف", + "agentManager.diff.revertSuccess": "تم استعادة الملف", + "agentManager.diff.revertError": "فشل الاستعادة", "agentManager.open.button": "فتح", "agentManager.open.tooltip": "فتح Worktree هذا في VS Code", "agentManager.apply.button": "تطبيق محليًا", 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 a2a5531c4b..373c14da35 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/br.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "Copiar Caminho", "agentManager.worktree.openInVscode": "Abrir no VS Code", "agentManager.worktree.rename": "Renomear", + "agentManager.worktree.moveToSection": "Mover para a Seção", + "agentManager.worktree.newSection": "Nova Seção", + "agentManager.worktree.ungrouped": "Não Agrupado", + "agentManager.section.rename": "Renomear Seção", + "agentManager.section.setColor": "Definir Cor", + "agentManager.section.delete": "Excluir Seção", + "agentManager.section.defaultColor": "Padrão", + "agentManager.section.defaultName": "Nova Seção", + "agentManager.section.moveUp": "Mover para Cima", + "agentManager.section.moveDown": "Mover para Baixo", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "Base", "agentManager.hoverCard.sessions": "Sessões", @@ -44,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", @@ -98,6 +111,9 @@ export const dict = { "agentManager.diff.toggle": "Alternar diff", "agentManager.diff.openFile": "Abrir arquivo", + "agentManager.diff.revertFile": "Reverter arquivo", + "agentManager.diff.revertSuccess": "Arquivo revertido", + "agentManager.diff.revertError": "Falha ao reverter", "agentManager.open.button": "Abrir", "agentManager.open.tooltip": "Abrir este Worktree no VS Code", "agentManager.apply.button": "Aplicar localmente", 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 d92d743415..6509b902af 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/bs.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "Kopiraj putanju", "agentManager.worktree.openInVscode": "Otvori u VS Code", "agentManager.worktree.rename": "Preimenuj", + "agentManager.worktree.moveToSection": "Premjesti u sekciju", + "agentManager.worktree.newSection": "Nova sekcija", + "agentManager.worktree.ungrouped": "Bez grupe", + "agentManager.section.rename": "Preimenuj sekciju", + "agentManager.section.setColor": "Postavi boju", + "agentManager.section.delete": "Izbriši sekciju", + "agentManager.section.defaultColor": "Zadano", + "agentManager.section.defaultName": "Nova sekcija", + "agentManager.section.moveUp": "Pomjeri gore", + "agentManager.section.moveDown": "Pomjeri dolje", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "Baza", "agentManager.hoverCard.sessions": "Sesije", @@ -45,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", @@ -99,6 +112,9 @@ export const dict = { "agentManager.diff.toggle": "Prebaci diff", "agentManager.diff.openFile": "Otvori datoteku", + "agentManager.diff.revertFile": "Vrati datoteku", + "agentManager.diff.revertSuccess": "Datoteka vraćena", + "agentManager.diff.revertError": "Vraćanje neuspješno", "agentManager.open.button": "Otvori", "agentManager.open.tooltip": "Otvori ovaj worktree u VS Code-u", "agentManager.apply.button": "Primijeni lokalno", 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 b6b7b69222..cf9986d1c2 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/da.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "Kopier sti", "agentManager.worktree.openInVscode": "Åbn i VS Code", "agentManager.worktree.rename": "Omdøb", + "agentManager.worktree.moveToSection": "Flyt til sektion", + "agentManager.worktree.newSection": "Ny sektion", + "agentManager.worktree.ungrouped": "Ugrupperet", + "agentManager.section.rename": "Omdøb sektion", + "agentManager.section.setColor": "Indstil farve", + "agentManager.section.delete": "Slet sektion", + "agentManager.section.defaultColor": "Standard", + "agentManager.section.defaultName": "Ny sektion", + "agentManager.section.moveUp": "Flyt op", + "agentManager.section.moveDown": "Flyt ned", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "Base", "agentManager.hoverCard.sessions": "Sessioner", @@ -44,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", @@ -98,6 +111,9 @@ export const dict = { "agentManager.diff.toggle": "Skift diff", "agentManager.diff.openFile": "Åbn fil", + "agentManager.diff.revertFile": "Gendan fil", + "agentManager.diff.revertSuccess": "Fil gendannet", + "agentManager.diff.revertError": "Gendannelse fejlede", "agentManager.open.button": "Åbn", "agentManager.open.tooltip": "Åbn dette Worktree i VS Code", "agentManager.apply.button": "Anvend lokalt", 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 bc6a0e0f5b..7c9c132783 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/de.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "Pfad kopieren", "agentManager.worktree.openInVscode": "In VS Code öffnen", "agentManager.worktree.rename": "Umbenennen", + "agentManager.worktree.moveToSection": "In Bereich verschieben", + "agentManager.worktree.newSection": "Neuer Bereich", + "agentManager.worktree.ungrouped": "Nicht gruppiert", + "agentManager.section.rename": "Bereich umbenennen", + "agentManager.section.setColor": "Farbe festlegen", + "agentManager.section.delete": "Bereich löschen", + "agentManager.section.defaultColor": "Standard", + "agentManager.section.defaultName": "Neuer Bereich", + "agentManager.section.moveUp": "Nach oben verschieben", + "agentManager.section.moveDown": "Nach unten verschieben", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "Basis", "agentManager.hoverCard.sessions": "Sitzungen", @@ -45,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", @@ -99,6 +112,9 @@ export const dict = { "agentManager.diff.toggle": "Diff umschalten", "agentManager.diff.openFile": "Datei öffnen", + "agentManager.diff.revertFile": "Datei zurücksetzen", + "agentManager.diff.revertSuccess": "Datei zurückgesetzt", + "agentManager.diff.revertError": "Zurücksetzen fehlgeschlagen", "agentManager.open.button": "Öffnen", "agentManager.open.tooltip": "Dieses Worktree in VS Code öffnen", "agentManager.apply.button": "Lokal anwenden", 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 a4ed3a190e..22246d3671 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/en.ts @@ -20,6 +20,17 @@ export const dict = { "agentManager.worktree.copyPath": "Copy Path", "agentManager.worktree.openInVscode": "Open in VS Code", "agentManager.worktree.rename": "Rename", + "agentManager.worktree.moveToSection": "Move to Section", + "agentManager.worktree.newSection": "New Section", + "agentManager.worktree.ungrouped": "Ungrouped", + "agentManager.section.rename": "Rename Section", + "agentManager.section.setColor": "Set Color", + "agentManager.section.delete": "Delete Section", + "agentManager.section.defaultColor": "Default", + "agentManager.section.defaultName": "New Section", + "agentManager.section.moveUp": "Move Up", + "agentManager.section.moveDown": "Move Down", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "Base", @@ -49,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", @@ -103,6 +116,9 @@ export const dict = { "agentManager.diff.toggle": "Toggle diff", "agentManager.diff.openFile": "Open file", + "agentManager.diff.revertFile": "Revert file", + "agentManager.diff.revertSuccess": "File reverted", + "agentManager.diff.revertError": "Revert failed", "agentManager.open.button": "Open", "agentManager.open.tooltip": "Open this worktree in VS Code", "agentManager.apply.button": "Apply to local", 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 576d2c6e11..587e51459d 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/es.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "Copiar ruta", "agentManager.worktree.openInVscode": "Abrir en VS Code", "agentManager.worktree.rename": "Renombrar", + "agentManager.worktree.moveToSection": "Mover a la sección", + "agentManager.worktree.newSection": "Nueva sección", + "agentManager.worktree.ungrouped": "Desagrupado", + "agentManager.section.rename": "Renombrar sección", + "agentManager.section.setColor": "Establecer color", + "agentManager.section.delete": "Eliminar sección", + "agentManager.section.defaultColor": "Predeterminado", + "agentManager.section.defaultName": "Nueva sección", + "agentManager.section.moveUp": "Mover hacia arriba", + "agentManager.section.moveDown": "Mover hacia abajo", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "Base", "agentManager.hoverCard.sessions": "Sesiones", @@ -44,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", @@ -98,6 +111,9 @@ export const dict = { "agentManager.diff.toggle": "Alternar diff", "agentManager.diff.openFile": "Abrir archivo", + "agentManager.diff.revertFile": "Revertir archivo", + "agentManager.diff.revertSuccess": "Archivo revertido", + "agentManager.diff.revertError": "Error al revertir", "agentManager.open.button": "Abrir", "agentManager.open.tooltip": "Abrir este Worktree en VS Code", "agentManager.apply.button": "Aplicar en local", 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 3f88089238..758ad3ead5 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/fr.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "Copier le chemin", "agentManager.worktree.openInVscode": "Ouvrir dans VS Code", "agentManager.worktree.rename": "Renommer", + "agentManager.worktree.moveToSection": "Déplacer vers la section", + "agentManager.worktree.newSection": "Nouvelle section", + "agentManager.worktree.ungrouped": "Non groupé", + "agentManager.section.rename": "Renommer la section", + "agentManager.section.setColor": "Définir la couleur", + "agentManager.section.delete": "Supprimer la section", + "agentManager.section.defaultColor": "Par défaut", + "agentManager.section.defaultName": "Nouvelle section", + "agentManager.section.moveUp": "Déplacer vers le haut", + "agentManager.section.moveDown": "Déplacer vers le bas", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCHE", "agentManager.hoverCard.base": "Base", "agentManager.hoverCard.sessions": "Sessions", @@ -44,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", @@ -98,6 +111,9 @@ export const dict = { "agentManager.diff.toggle": "Basculer le diff", "agentManager.diff.openFile": "Ouvrir le fichier", + "agentManager.diff.revertFile": "Rétablir le fichier", + "agentManager.diff.revertSuccess": "Fichier rétabli", + "agentManager.diff.revertError": "Échec du rétablissement", "agentManager.open.button": "Ouvrir", "agentManager.open.tooltip": "Ouvrir ce worktree dans VS Code", "agentManager.apply.button": "Appliquer en local", 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 44c226ad37..42a1872b72 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ja.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "パスをコピー", "agentManager.worktree.openInVscode": "VS Codeで開く", "agentManager.worktree.rename": "名前を変更", + "agentManager.worktree.moveToSection": "セクションに移動", + "agentManager.worktree.newSection": "新しいセクション", + "agentManager.worktree.ungrouped": "グループなし", + "agentManager.section.rename": "セクションの名前変更", + "agentManager.section.setColor": "色の設定", + "agentManager.section.delete": "セクションの削除", + "agentManager.section.defaultColor": "デフォルト", + "agentManager.section.defaultName": "新しいセクション", + "agentManager.section.moveUp": "上に移動", + "agentManager.section.moveDown": "下に移動", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "ブランチ", "agentManager.hoverCard.base": "ベース", "agentManager.hoverCard.sessions": "セッション", @@ -44,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": "タブ", @@ -97,6 +110,9 @@ export const dict = { "agentManager.diff.toggle": "差分を切り替え", "agentManager.diff.openFile": "ファイルを開く", + "agentManager.diff.revertFile": "ファイルを元に戻す", + "agentManager.diff.revertSuccess": "ファイルを元に戻しました", + "agentManager.diff.revertError": "元に戻せませんでした", "agentManager.open.button": "開く", "agentManager.open.tooltip": "このWorktreeをVS Codeで開く", "agentManager.apply.button": "ローカルに適用", 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 8258caba61..f5cb353a88 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ko.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "경로 복사", "agentManager.worktree.openInVscode": "VS Code에서 열기", "agentManager.worktree.rename": "이름 바꾸기", + "agentManager.worktree.moveToSection": "섹션으로 이동", + "agentManager.worktree.newSection": "새 섹션", + "agentManager.worktree.ungrouped": "그룹 해제됨", + "agentManager.section.rename": "섹션 이름 바꾸기", + "agentManager.section.setColor": "색상 설정", + "agentManager.section.delete": "섹션 삭제", + "agentManager.section.defaultColor": "기본값", + "agentManager.section.defaultName": "새 섹션", + "agentManager.section.moveUp": "위로 이동", + "agentManager.section.moveDown": "아래로 이동", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "브랜치", "agentManager.hoverCard.base": "베이스", "agentManager.hoverCard.sessions": "세션", @@ -44,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": "탭", @@ -97,6 +110,9 @@ export const dict = { "agentManager.diff.toggle": "차이점 전환", "agentManager.diff.openFile": "파일 열기", + "agentManager.diff.revertFile": "파일 되돌리기", + "agentManager.diff.revertSuccess": "파일이 되돌려졌습니다", + "agentManager.diff.revertError": "되돌리기 실패", "agentManager.open.button": "열기", "agentManager.open.tooltip": "이 Worktree를 VS Code에서 열기", "agentManager.apply.button": "로컬에 적용", 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 40394720d2..b959ab89ea 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/nl.ts @@ -20,6 +20,17 @@ export const dict = { "agentManager.worktree.copyPath": "Pad kopiëren", "agentManager.worktree.openInVscode": "Openen in VS Code", "agentManager.worktree.rename": "Hernoemen", + "agentManager.worktree.moveToSection": "Verplaatsen naar sectie", + "agentManager.worktree.newSection": "Nieuwe sectie", + "agentManager.worktree.ungrouped": "Niet gegroepeerd", + "agentManager.section.rename": "Sectie hernoemen", + "agentManager.section.setColor": "Kleur instellen", + "agentManager.section.delete": "Sectie verwijderen", + "agentManager.section.defaultColor": "Standaard", + "agentManager.section.defaultName": "Nieuwe sectie", + "agentManager.section.moveUp": "Omhoog verplaatsen", + "agentManager.section.moveDown": "Omlaag verplaatsen", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "Basis", @@ -49,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", @@ -104,6 +117,9 @@ export const dict = { "agentManager.diff.toggle": "Diff in-/uitschakelen", "agentManager.diff.openFile": "Bestand openen", + "agentManager.diff.revertFile": "Bestand terugzetten", + "agentManager.diff.revertSuccess": "Bestand teruggezet", + "agentManager.diff.revertError": "Terugzetten mislukt", "agentManager.open.button": "Openen", "agentManager.open.tooltip": "Open deze worktree in VS Code", "agentManager.apply.button": "Toepassen op lokaal", 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 1a67eac546..aa9bb3169c 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/no.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "Kopier sti", "agentManager.worktree.openInVscode": "Åpne i VS Code", "agentManager.worktree.rename": "Gi nytt navn", + "agentManager.worktree.moveToSection": "Flytt til seksjon", + "agentManager.worktree.newSection": "Ny seksjon", + "agentManager.worktree.ungrouped": "Ugruppert", + "agentManager.section.rename": "Gi seksjon nytt navn", + "agentManager.section.setColor": "Angi farge", + "agentManager.section.delete": "Slett seksjon", + "agentManager.section.defaultColor": "Standard", + "agentManager.section.defaultName": "Ny seksjon", + "agentManager.section.moveUp": "Flytt opp", + "agentManager.section.moveDown": "Flytt ned", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "Base", "agentManager.hoverCard.sessions": "Økter", @@ -44,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", @@ -98,6 +111,9 @@ export const dict = { "agentManager.diff.toggle": "Veksle diff", "agentManager.diff.openFile": "Åpne fil", + "agentManager.diff.revertFile": "Tilbakestill fil", + "agentManager.diff.revertSuccess": "Fil tilbakestilt", + "agentManager.diff.revertError": "Tilbakestilling feilet", "agentManager.open.button": "Åpne", "agentManager.open.tooltip": "Åpne dette Worktree-et i VS Code", "agentManager.apply.button": "Bruk lokalt", 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 57a7141761..f3d9135303 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/pl.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "Kopiuj ścieżkę", "agentManager.worktree.openInVscode": "Otwórz w VS Code", "agentManager.worktree.rename": "Zmień nazwę", + "agentManager.worktree.moveToSection": "Przenieś do sekcji", + "agentManager.worktree.newSection": "Nowa sekcja", + "agentManager.worktree.ungrouped": "Niezgrupowane", + "agentManager.section.rename": "Zmień nazwę sekcji", + "agentManager.section.setColor": "Ustaw kolor", + "agentManager.section.delete": "Usuń sekcję", + "agentManager.section.defaultColor": "Domyślny", + "agentManager.section.defaultName": "Nowa sekcja", + "agentManager.section.moveUp": "Przenieś w górę", + "agentManager.section.moveDown": "Przenieś w dół", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "Baza", "agentManager.hoverCard.sessions": "Sesje", @@ -44,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", @@ -97,6 +110,9 @@ export const dict = { "agentManager.diff.toggle": "Przełącz diff", "agentManager.diff.openFile": "Otwórz plik", + "agentManager.diff.revertFile": "Cofnij plik", + "agentManager.diff.revertSuccess": "Plik cofnięty", + "agentManager.diff.revertError": "Cofanie nie powiodło się", "agentManager.open.button": "Otwórz", "agentManager.open.tooltip": "Otwórz ten Worktree w VS Code", "agentManager.apply.button": "Zastosuj lokalnie", 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 5748502ce4..1742911329 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/ru.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "Копировать путь", "agentManager.worktree.openInVscode": "Открыть в VS Code", "agentManager.worktree.rename": "Переименовать", + "agentManager.worktree.moveToSection": "Переместить в раздел", + "agentManager.worktree.newSection": "Новый раздел", + "agentManager.worktree.ungrouped": "Без группы", + "agentManager.section.rename": "Переименовать раздел", + "agentManager.section.setColor": "Задать цвет", + "agentManager.section.delete": "Удалить раздел", + "agentManager.section.defaultColor": "По умолчанию", + "agentManager.section.defaultName": "Новый раздел", + "agentManager.section.moveUp": "Переместить вверх", + "agentManager.section.moveDown": "Переместить вниз", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "ВЕТКА", "agentManager.hoverCard.base": "Основа", "agentManager.hoverCard.sessions": "Сессии", @@ -44,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": "Вкладки", @@ -98,6 +111,9 @@ export const dict = { "agentManager.diff.toggle": "Переключить diff", "agentManager.diff.openFile": "Открыть файл", + "agentManager.diff.revertFile": "Откатить файл", + "agentManager.diff.revertSuccess": "Файл откатан", + "agentManager.diff.revertError": "Ошибка отката", "agentManager.open.button": "Открыть", "agentManager.open.tooltip": "Открыть этот Worktree в VS Code", "agentManager.apply.button": "Применить локально", 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 62c833e0b7..13611ae9b2 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/th.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "คัดลอกเส้นทาง", "agentManager.worktree.openInVscode": "เปิดใน VS Code", "agentManager.worktree.rename": "เปลี่ยนชื่อ", + "agentManager.worktree.moveToSection": "ย้ายไปที่ส่วน", + "agentManager.worktree.newSection": "ส่วนใหม่", + "agentManager.worktree.ungrouped": "ไม่ได้จัดกลุ่ม", + "agentManager.section.rename": "เปลี่ยนชื่อส่วน", + "agentManager.section.setColor": "ตั้งค่าสี", + "agentManager.section.delete": "ลบส่วน", + "agentManager.section.defaultColor": "ค่าเริ่มต้น", + "agentManager.section.defaultName": "ส่วนใหม่", + "agentManager.section.moveUp": "เลื่อนขึ้น", + "agentManager.section.moveDown": "เลื่อนลง", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "BRANCH", "agentManager.hoverCard.base": "ฐาน", "agentManager.hoverCard.sessions": "เซสชัน", @@ -42,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": "แท็บ", @@ -95,6 +107,9 @@ export const dict = { "agentManager.diff.toggle": "สลับ diff", "agentManager.diff.openFile": "เปิดไฟล์", + "agentManager.diff.revertFile": "ย้อนกลับไฟล์", + "agentManager.diff.revertSuccess": "ย้อนกลับไฟล์แล้ว", + "agentManager.diff.revertError": "ย้อนกลับล้มเหลว", "agentManager.open.button": "เปิด", "agentManager.open.tooltip": "เปิด Worktree นี้ใน VS Code", "agentManager.apply.button": "นำไปใช้ในเครื่อง", 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 10ce0c2098..74b8c5f681 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/tr.ts @@ -20,6 +20,17 @@ export const dict = { "agentManager.worktree.copyPath": "Yolu Kopyala", "agentManager.worktree.openInVscode": "VS Code'da Aç", "agentManager.worktree.rename": "Yeniden Adlandır", + "agentManager.worktree.moveToSection": "Bölüme Taşı", + "agentManager.worktree.newSection": "Yeni Bölüm", + "agentManager.worktree.ungrouped": "Gruplandırılmamış", + "agentManager.section.rename": "Bölümü Yeniden Adlandır", + "agentManager.section.setColor": "Renk Ayarla", + "agentManager.section.delete": "Bölümü Sil", + "agentManager.section.defaultColor": "Varsayılan", + "agentManager.section.defaultName": "Yeni Bölüm", + "agentManager.section.moveUp": "Yukarı Taşı", + "agentManager.section.moveDown": "Aşağı Taşı", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "DAL", "agentManager.hoverCard.base": "Temel", @@ -49,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", @@ -104,6 +117,9 @@ export const dict = { "agentManager.diff.toggle": "diff'i aç/kapat", "agentManager.diff.openFile": "Dosyayı aç", + "agentManager.diff.revertFile": "Dosyayı geri al", + "agentManager.diff.revertSuccess": "Dosya geri alındı", + "agentManager.diff.revertError": "Geri alma başarısız", "agentManager.open.button": "Aç", "agentManager.open.tooltip": "Bu worktree'yi VS Code'da aç", "agentManager.apply.button": "Yerele uygula", 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 ae8f2cd143..38a0fd6ae8 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/uk.ts @@ -20,6 +20,17 @@ export const dict = { "agentManager.worktree.copyPath": "Копіювати шлях", "agentManager.worktree.openInVscode": "Відкрити у VS Code", "agentManager.worktree.rename": "Перейменувати", + "agentManager.worktree.moveToSection": "Перемістити до розділу", + "agentManager.worktree.newSection": "Новий розділь", + "agentManager.worktree.ungrouped": "Без групи", + "agentManager.section.rename": "Перейменувати розділ", + "agentManager.section.setColor": "Встановити колір", + "agentManager.section.delete": "Видалити розділ", + "agentManager.section.defaultColor": "За замовчуванням", + "agentManager.section.defaultName": "Новий розділ", + "agentManager.section.moveUp": "Перемістити вгору", + "agentManager.section.moveDown": "Перемістити вниз", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "ГІЛКА", "agentManager.hoverCard.base": "База", @@ -50,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": "Вкладки", @@ -105,6 +118,9 @@ export const dict = { "agentManager.diff.toggle": "Показати або приховати diff", "agentManager.diff.openFile": "Відкрити файл", + "agentManager.diff.revertFile": "Скасувати зміни файлу", + "agentManager.diff.revertSuccess": "Файл відновлено", + "agentManager.diff.revertError": "Не вдалося відновити", "agentManager.open.button": "Відкрити", "agentManager.open.tooltip": "Відкрити це робоче дерево у VS Code", "agentManager.apply.button": "Застосувати локально", 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 fd8f3a5071..5034de070f 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zh.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "复制路径", "agentManager.worktree.openInVscode": "在 VS Code 中打开", "agentManager.worktree.rename": "重命名", + "agentManager.worktree.moveToSection": "移动到分区", + "agentManager.worktree.newSection": "新分区", + "agentManager.worktree.ungrouped": "未分组", + "agentManager.section.rename": "重命名分区", + "agentManager.section.setColor": "设置颜色", + "agentManager.section.delete": "删除分区", + "agentManager.section.defaultColor": "默认", + "agentManager.section.defaultName": "新分区", + "agentManager.section.moveUp": "上移", + "agentManager.section.moveDown": "下移", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "分支", "agentManager.hoverCard.base": "基础", "agentManager.hoverCard.sessions": "会话", @@ -42,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": "标签页", @@ -94,6 +106,9 @@ export const dict = { "agentManager.diff.toggle": "切换差异", "agentManager.diff.openFile": "打开文件", + "agentManager.diff.revertFile": "还原文件", + "agentManager.diff.revertSuccess": "文件已还原", + "agentManager.diff.revertError": "还原失败", "agentManager.open.button": "打开", "agentManager.open.tooltip": "在 VS Code 中打开此 Worktree", "agentManager.apply.button": "应用到本地", 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 0906b6f73f..db73573a23 100644 --- a/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts +++ b/packages/kilo-vscode/webview-ui/agent-manager/i18n/zht.ts @@ -19,6 +19,17 @@ export const dict = { "agentManager.worktree.copyPath": "複製路徑", "agentManager.worktree.openInVscode": "在 VS Code 中打開", "agentManager.worktree.rename": "重新命名", + "agentManager.worktree.moveToSection": "移動到分區", + "agentManager.worktree.newSection": "新分區", + "agentManager.worktree.ungrouped": "未分組", + "agentManager.section.rename": "重新命名分區", + "agentManager.section.setColor": "設定顏色", + "agentManager.section.delete": "刪除分區", + "agentManager.section.defaultColor": "預設", + "agentManager.section.defaultName": "新分區", + "agentManager.section.moveUp": "上移", + "agentManager.section.moveDown": "下移", + "agentManager.section.count": "{{count}}", "agentManager.hoverCard.branch": "分支", "agentManager.hoverCard.base": "基底", "agentManager.hoverCard.sessions": "工作階段", @@ -42,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": "分頁", @@ -94,6 +106,9 @@ export const dict = { "agentManager.diff.toggle": "切換差異", "agentManager.diff.openFile": "開啟檔案", + "agentManager.diff.revertFile": "還原檔案", + "agentManager.diff.revertSuccess": "檔案已還原", + "agentManager.diff.revertError": "還原失敗", "agentManager.open.button": "開啟", "agentManager.open.tooltip": "在 VS Code 中開啟此 Worktree", "agentManager.apply.button": "套用到本地", diff --git a/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts b/packages/kilo-vscode/webview-ui/agent-manager/navigate.ts index 27c38f4490..d611fc42d7 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/agent-manager/open-sessions.ts b/packages/kilo-vscode/webview-ui/agent-manager/open-sessions.ts new file mode 100644 index 0000000000..ffa48b8b85 --- /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 }) + }) +} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts b/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts new file mode 100644 index 0000000000..199a9b96f2 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/agent-manager/revert-file.ts @@ -0,0 +1,56 @@ +import { createSignal, createMemo, type Accessor } from "solid-js" +import type { AgentManagerRevertWorktreeFileResultMessage } from "../src/types/messages" + +interface VsCode { + postMessage(msg: unknown): void +} + +interface Toast { + variant: "success" | "error" + title: string + description: string +} + +export function createRevertFile( + currentDiffSessionId: Accessor, + vscode: VsCode, + showToast: (t: Toast) => void, + t: (key: string) => string, +) { + const [files, setFiles] = createSignal>>({}) + + const reverting = createMemo(() => { + const sessionId = currentDiffSessionId() + if (!sessionId) return new Set() + return files()[sessionId] ?? new Set() + }) + + function revert(file: string) { + const sessionId = currentDiffSessionId() + if (!sessionId) return + setFiles((prev) => { + const set = new Set(prev[sessionId] ?? []) + set.add(file) + return { ...prev, [sessionId]: set } + }) + vscode.postMessage({ type: "agentManager.revertWorktreeFile", sessionId, file }) + } + + function onResult(ev: AgentManagerRevertWorktreeFileResultMessage) { + setFiles((prev) => { + const set = new Set(prev[ev.sessionId] ?? []) + set.delete(ev.file) + const next = { ...prev } + if (set.size === 0) delete next[ev.sessionId] + else next[ev.sessionId] = set + return next + }) + if (ev.status === "success") { + showToast({ variant: "success", title: t("agentManager.diff.revertSuccess"), description: ev.file }) + } else { + showToast({ variant: "error", title: t("agentManager.diff.revertError"), description: ev.message }) + } + } + + return { reverting, revert, onResult } +} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/section-colors.ts b/packages/kilo-vscode/webview-ui/agent-manager/section-colors.ts new file mode 100644 index 0000000000..2d988b9560 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/agent-manager/section-colors.ts @@ -0,0 +1,22 @@ +/** Section color palette using VS Code theme CSS variables for theme-adaptive colors. */ +export const SECTION_COLORS = [ + { label: "Red", css: "var(--vscode-terminal-ansiRed)" }, + { label: "Orange", css: "var(--vscode-charts-orange)" }, + { label: "Yellow", css: "var(--vscode-terminal-ansiYellow)" }, + { label: "Green", css: "var(--vscode-terminal-ansiGreen)" }, + { label: "Cyan", css: "var(--vscode-terminal-ansiCyan)" }, + { label: "Blue", css: "var(--vscode-charts-blue)" }, + { label: "Purple", css: "var(--vscode-charts-purple)" }, + { label: "Magenta", css: "var(--vscode-terminal-ansiMagenta)" }, +] as const + +/** Map a stored color label to its CSS variable string. Returns undefined for null/unknown labels. */ +export function colorCss(label: string | null): string | undefined { + if (!label) return undefined + return SECTION_COLORS.find((c) => c.label === label)?.css +} + +/** Pick a random color label for new sections. */ +export function randomColor(): string { + return SECTION_COLORS[Math.floor(Math.random() * SECTION_COLORS.length)]!.label +} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/section-dnd.ts b/packages/kilo-vscode/webview-ui/agent-manager/section-dnd.ts new file mode 100644 index 0000000000..d625f795ca --- /dev/null +++ b/packages/kilo-vscode/webview-ui/agent-manager/section-dnd.ts @@ -0,0 +1,35 @@ +/** + * Section drag-and-drop helpers. Separated from section-helpers.ts to avoid + * pulling solid-dnd into test environments. + */ +import { closestCenter } from "@thisbeyond/solid-dnd" +import type { CollisionDetector } from "@thisbeyond/solid-dnd" + +/** + * Collision detector that prioritizes section drop zones when a worktree is + * dragged (checks bounding box, not just center). Skips the worktree's home + * section so within-section reorder works. Falls back to closestCenter. + * + * @param secIds Accessor for all section IDs + * @param home Accessor for worktree ID → its sectionId (or undefined if ungrouped) + */ +export function sectionAwareDetector( + secIds: () => Set, + home: () => Map, +): CollisionDetector { + return (draggable, droppables, ctx) => { + const secs = secIds() + const id = draggable.id as string + const mySection = home().get(id) + if (!secs.has(id)) { + const pt = draggable.transformed.center + for (const d of droppables) { + if (!secs.has(d.id as string)) continue + if (d.id === mySection) continue + const { top, bottom, left, right } = d.layout + if (pt.x >= left && pt.x <= right && pt.y >= top && pt.y <= bottom) return d + } + } + return closestCenter(draggable, droppables, ctx) + } +} diff --git a/packages/kilo-vscode/webview-ui/agent-manager/section-helpers.ts b/packages/kilo-vscode/webview-ui/agent-manager/section-helpers.ts new file mode 100644 index 0000000000..6b5a2c6d08 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/agent-manager/section-helpers.ts @@ -0,0 +1,109 @@ +/** + * Section computation helpers for the agent manager sidebar. + * Pure functions — no solid-dnd dependency so they remain testable. + */ +import type { WorktreeState, SectionState } from "../src/types/messages" + +export type TopLevelItem = { kind: "section"; section: SectionState } | { kind: "worktree"; wt: WorktreeState } + +export type SidebarItem = { type: "local" | "wt" | "session"; id: string } + +/** Check if this worktree is part of a multi-version group. */ +export const isGrouped = (wt: WorktreeState) => !!wt.groupId + +/** Check if this is the first item in its group within a given list. */ +export const isGroupStart = (wt: WorktreeState, idx: number, list: WorktreeState[]) => { + if (!wt.groupId) return false + if (idx === 0) return true + return list[idx - 1]?.groupId !== wt.groupId +} + +/** Check if this is the last item in its group within a given list. */ +export const isGroupEnd = (wt: WorktreeState, idx: number, list: WorktreeState[]) => { + if (!wt.groupId) return false + if (idx === list.length - 1) return true + return list[idx + 1]?.groupId !== wt.groupId +} + +/** + * Build the interleaved list of sections and ungrouped worktrees + * ordered by sidebarWorktreeOrder. + */ +export function buildTopLevelItems( + secs: SectionState[], + ungrouped: WorktreeState[], + all: WorktreeState[], + order: string[], +): TopLevelItem[] { + if (secs.length === 0) { + return all.map((wt) => ({ kind: "worktree" as const, wt })) + } + const secMap = new Map(secs.map((s) => [s.id, s])) + const wtMap = new Map(ungrouped.map((wt) => [wt.id, wt])) + const result: TopLevelItem[] = [] + const placed = new Set() + + for (const id of order) { + if (placed.has(id)) continue + placed.add(id) + const sec = secMap.get(id) + if (sec) { + result.push({ kind: "section", section: sec }) + continue + } + const wt = wtMap.get(id) + if (wt) result.push({ kind: "worktree", wt }) + } + for (const sec of secs) { + if (!placed.has(sec.id)) result.push({ kind: "section", section: sec }) + } + for (const wt of ungrouped) { + if (!placed.has(wt.id)) result.push({ kind: "worktree", wt }) + } + return result +} + +/** + * Build the flat visual order of all sidebar items matching what the user sees. + * LOCAL is always first, then worktrees in visual order (respecting section layout and + * skipping collapsed sections), then unassigned sessions. + */ +export function buildSidebarOrder( + items: TopLevelItem[], + sorted: WorktreeState[], + sections: SectionState[], + members: (id: string) => WorktreeState[], + sessions: { id: string }[], +): SidebarItem[] { + const result: SidebarItem[] = [{ type: "local", id: "local" }] + if (sections.length > 0) { + for (const item of items) { + if (item.kind === "section") { + if (!item.section.collapsed) { + for (const wt of members(item.section.id)) { + result.push({ type: "wt", id: wt.id }) + } + } + } else { + result.push({ type: "wt", id: item.wt.id }) + } + } + } else { + for (const wt of sorted) { + result.push({ type: "wt", id: wt.id }) + } + } + for (const s of sessions) { + result.push({ type: "session", id: s.id }) + } + return result +} + +/** Build a map from sidebar item id → 1-based shortcut number (1 for LOCAL, 2+ for worktrees). */ +export function buildShortcutMap(order: SidebarItem[]): Map { + const map = new Map() + for (let i = 0; i < order.length && i < 9; i++) { + map.set(order[i]!.id, i + 1) + } + return map +} diff --git a/packages/kilo-vscode/webview-ui/diff-virtual/DiffVirtualApp.tsx b/packages/kilo-vscode/webview-ui/diff-virtual/DiffVirtualApp.tsx new file mode 100644 index 0000000000..7a5a113397 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/diff-virtual/DiffVirtualApp.tsx @@ -0,0 +1,125 @@ +import { createSignal, onCleanup, Show } from "solid-js" +import type { Component } from "solid-js" +import { CodeComponentProvider } from "@kilocode/kilo-ui/context/code" +import { DiffComponentProvider } from "@kilocode/kilo-ui/context/diff" +import { FileComponentProvider } from "@kilocode/kilo-ui/context/file" +import { MarkedProvider } from "@kilocode/kilo-ui/context/marked" +import { Code } from "@kilocode/kilo-ui/code" +import { Diff } from "@kilocode/kilo-ui/diff" +import { File } from "@kilocode/kilo-ui/file" +import { FileIcon } from "@kilocode/kilo-ui/file-icon" +import { RadioGroup } from "@kilocode/kilo-ui/radio-group" +import { ThemeProvider } from "@kilocode/kilo-ui/theme" +import { LanguageProvider, useLanguage } from "../src/context/language" +import { ServerProvider, useServer } from "../src/context/server" +import { VSCodeProvider } from "../src/context/vscode" + +type DiffStyle = "unified" | "split" + +interface DiffVirtualFile { + file: string + before: string + after: string + additions: number + deletions: number +} + +const DiffVirtualContent: Component = () => { + const { t } = useLanguage() + const [diff, setDiff] = createSignal(null) + const [style, setStyle] = createSignal("unified") + + const handler = (event: MessageEvent) => { + const msg = event.data as { type: string; diff?: DiffVirtualFile } + if (msg?.type === "diffVirtual.data" && msg.diff) { + setDiff(msg.diff) + } + } + + window.addEventListener("message", handler) + onCleanup(() => window.removeEventListener("message", handler)) + + const filename = () => { + const f = diff()?.file ?? "" + return f.includes("/") ? (f.split("/").pop() ?? f) : f + } + + const directory = () => { + const f = diff()?.file ?? "" + if (!f.includes("/")) return null + return f.split("/").slice(0, -1).join("/") + } + + return ( +
+ + {(d) => ( + <> +
+
+ s} + label={(s) => + s === "unified" ? t("ui.sessionReview.diffStyle.unified") : t("ui.sessionReview.diffStyle.split") + } + onSelect={(s) => { + if (s) setStyle(s) + }} + /> + + + + {`\u202A${directory()}/\u202C`} + + {filename()} + +{d().additions} + -{d().deletions} + +
+
+
+ +
+ + )} + +
+ ) +} + +const DiffVirtualShell: Component = () => { + const server = useServer() + + return ( + + + + + + + + + + + + ) +} + +export const DiffVirtualApp: Component = () => { + return ( + + + + + + + + ) +} diff --git a/packages/kilo-vscode/webview-ui/diff-virtual/index.tsx b/packages/kilo-vscode/webview-ui/diff-virtual/index.tsx new file mode 100644 index 0000000000..1954943394 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/diff-virtual/index.tsx @@ -0,0 +1,10 @@ +import { render } from "solid-js/web" +import "@kilocode/kilo-ui/styles" +import "../src/styles/chat.css" +import "../agent-manager/agent-manager.css" +import { DiffVirtualApp } from "./DiffVirtualApp" + +const root = document.getElementById("root") +if (root) { + render(() => , root) +} diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx index 04d12051f6..02035c8cd1 100644 --- a/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx +++ b/packages/kilo-vscode/webview-ui/src/components/chat/AssistantMessage.tsx @@ -4,7 +4,7 @@ * Unlike the upstream AssistantParts, this renders each read/glob/grep/list tool * individually for maximum verbosity in the VS Code sidebar context. * - * Active questions and permissions are rendered in the bottom dock. + * Active questions render inline via QuestionDock; permissions are in the bottom dock. */ import { Component, For, Show, createMemo } from "solid-js" @@ -17,6 +17,8 @@ import type { ToolPart, } from "@kilocode/sdk/v2" import { useData } from "@kilocode/kilo-ui/context/data" +import { useSession } from "../../context/session" +import { QuestionDock } from "./QuestionDock" // Tools that the upstream message-part renderer suppresses (returns null for). // We render these ourselves via ToolRegistry when they complete, @@ -31,7 +33,7 @@ function isRenderable(part: SDKPart): boolean { // Show todo parts only when completed (permissions are now in the dock) return state.status === "completed" } - if (tool === "question" && (state.status === "pending" || state.status === "running")) return false + // Always render question tool parts — active ones get the inline QuestionDock return true } if (part.type === "text") return !!(part as SDKPart & { text: string }).text?.trim() @@ -67,6 +69,7 @@ function TodoToolCard(props: { part: ToolPart }) { export const AssistantMessage: Component = (props) => { const data = useData() + const session = useSession() const parts = createMemo(() => { const stored = data.store.part?.[props.message.id] @@ -82,25 +85,42 @@ export const AssistantMessage: Component = (props) => { // so we detect them here and render via ToolRegistry directly. const isUpstreamSuppressed = part.type === "tool" && UPSTREAM_SUPPRESSED_TOOLS.has((part as SDKPart & { tool: string }).tool) + + // Active question tool parts render the interactive QuestionDock inline + const activeQuestion = createMemo(() => { + if (part.type !== "tool") return undefined + const tp = part as unknown as ToolPart + if (tp.tool !== "question") return undefined + if (tp.state?.status !== "pending" && tp.state?.status !== "running") return undefined + return session.questions().find((q) => q.tool?.callID === tp.callID && q.tool?.messageID === tp.messageID) + }) + return ( - +
} - /> + > + + } > - + {(req) => }
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx index 3f9f0019f1..61ee94ea1b 100644 --- a/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx +++ b/packages/kilo-vscode/webview-ui/src/components/chat/ChatView.tsx @@ -12,7 +12,6 @@ import { showToast } from "@kilocode/kilo-ui/toast" import { TaskHeader } from "./TaskHeader" import { MessageList } from "./MessageList" import { PromptInput } from "./PromptInput" -import { QuestionDock } from "./QuestionDock" import { PermissionDock } from "./PermissionDock" import { StartupErrorBanner } from "./StartupErrorBanner" import { useSession } from "../../context/session" @@ -57,17 +56,15 @@ export const ChatView: Component = (props) => { const familyPermissions = createMemo(() => session.scopedPermissions(id())) const familyQuestions = createMemo(() => session.scopedQuestions(id())) - // Prefer non-tool questions in the dock: current-session non-tool first, - // then any non-tool, then fall back to any remaining scoped question. - const questionRequest = () => - familyQuestions().find((q) => q.sessionID === id() && !q.tool) ?? - familyQuestions().find((q) => !q.tool) ?? - familyQuestions()[0] + // Non-tool questions (standalone, not from the question tool) render inline in + // the message list since they don't have an associated tool part in the conversation. + // Tool-linked questions render inline at their tool part position via AssistantMessage. + const standaloneQuestions = createMemo(() => familyQuestions().filter((q) => !q.tool)) const permissionRequest = () => familyPermissions().find((p) => p.sessionID === id()) ?? familyPermissions()[0] const blocked = () => familyPermissions().length > 0 || familyQuestions().length > 0 - const dock = () => !props.readonly || !!questionRequest() || !!permissionRequest() + const dock = () => !props.readonly || !!permissionRequest() - // When a bottom-dock permission/question disappears while the session is busy, + // When a bottom-dock permission disappears while the session is busy, // the scroll container grows taller. Dispatch a custom event so MessageList can // resume auto-scroll. createEffect( @@ -129,7 +126,11 @@ export const ChatView: Component = (props) => {
- +
@@ -138,9 +139,6 @@ export const ChatView: Component = (props) => { - - {(req) => } - {(perm) => ( { return true }) + const MAX_NAME = 30 + const suggestedName = createMemo(() => { const suggestion = suggestedModel() if (!suggestion) return undefined const model = provider.findModel(suggestion) if (!model?.name) return undefined - return stripSubProviderPrefix(model.name) + const name = stripSubProviderPrefix(model.name) + if (name.length > MAX_NAME) return undefined + return name }) const handleTryModel = () => { @@ -98,7 +102,9 @@ export const KiloNotifications: Component = () => {
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx index ed3ac698ac..6e1e6549dc 100644 --- a/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx +++ b/packages/kilo-vscode/webview-ui/src/components/chat/MessageList.tsx @@ -22,7 +22,9 @@ import { RevertBanner } from "./RevertBanner" import { AccountSwitcher } from "../shared/AccountSwitcher" import { KiloNotifications } from "./KiloNotifications" import { WorkingIndicator } from "../shared/WorkingIndicator" +import { QuestionDock } from "./QuestionDock" import { activeUserMessageID as getActiveUserMessageID } from "../../context/session-queue" +import type { QuestionRequest } from "../../types/messages" const KiloLogo = (): JSX.Element => { const iconsBaseUri = (window as { ICONS_BASE_URI?: string }).ICONS_BASE_URI || "" @@ -40,6 +42,8 @@ const KiloLogo = (): JSX.Element => { interface MessageListProps { onSelectSession?: (id: string) => void onShowHistory?: () => void + /** Non-tool question requests to render inline at the bottom of the message list */ + questions?: () => QuestionRequest[] } export const MessageList: Component = (props) => { @@ -161,6 +165,7 @@ export const MessageList: Component = (props) => { + {(req) => }
diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/PermissionDiff.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/PermissionDiff.tsx new file mode 100644 index 0000000000..53c732479e --- /dev/null +++ b/packages/kilo-vscode/webview-ui/src/components/chat/PermissionDiff.tsx @@ -0,0 +1,75 @@ +import { type Component, createMemo } from "solid-js" +import { Diff } from "@kilocode/kilo-ui/diff" +import { DiffChanges } from "@kilocode/kilo-ui/diff-changes" +import { IconButton } from "@kilocode/kilo-ui/icon-button" +import { Tooltip } from "@kilocode/kilo-ui/tooltip" +import type { PermissionFileDiff } from "../../types/messages" +import { useVSCode } from "../../context/vscode" + +interface PermissionDiffProps { + filediff: PermissionFileDiff +} + +export const PermissionDiff: Component = (props) => { + const vscode = useVSCode() + const filename = createMemo(() => { + const parts = props.filediff.file.split("/") + return parts[parts.length - 1] ?? props.filediff.file + }) + + const directory = createMemo(() => { + const parts = props.filediff.file.split("/") + if (parts.length <= 1) return null + return parts.slice(0, -1).join("/") + }) + + const openInTab = () => { + vscode.postMessage({ + type: "openDiffVirtual", + diff: props.filediff, + }) + } + + return ( +
+
+
+
+ + + +
+
+ {directory() && {directory()}/} + {filename()} +
+
+
+ + + + +
+
+
+ +
+
+ ) +} diff --git a/packages/kilo-vscode/webview-ui/src/components/chat/PermissionDock.tsx b/packages/kilo-vscode/webview-ui/src/components/chat/PermissionDock.tsx index ea9fece7ed..d03615c254 100644 --- a/packages/kilo-vscode/webview-ui/src/components/chat/PermissionDock.tsx +++ b/packages/kilo-vscode/webview-ui/src/components/chat/PermissionDock.tsx @@ -19,6 +19,7 @@ import { useLanguage } from "../../context/language" import { useConfig } from "../../context/config" import { describePatterns, resolveLabel, savedRuleStates, type RuleDecision } from "./permission-dock-utils" import { PermissionCommand } from "./PermissionCommand" +import { PermissionDiff } from "./PermissionDiff" import type { PermissionRequest } from "../../types/messages" let rulesExpandedPreference = false @@ -46,6 +47,13 @@ export const PermissionDock: Component<{ command() ? null : describePatterns(props.request.toolName, props.request.patterns, language.t), ) + const filediff = () => { + if (props.request.toolName !== "edit" && props.request.toolName !== "write") return null + const fd = props.request.args?.filediff + if (!fd || typeof fd !== "object") return null + return fd as NonNullable + } + // Pre-populate toggle states from existing config rules so previously // approved/denied patterns show their saved state immediately. const saved = config().permission?.[props.request.toolName] @@ -235,6 +243,8 @@ export const PermissionDock: Component<{ ) })()} + {(fd) => } +
)} 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 4f060d2e0d..85a36c7a6c 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 */} = (props) => { // agent() may be undefined for modes that only exist in the config draft (just // created, not yet saved). This is fine — native defaults to false (correct for // custom modes) and all fields read from cfg() which comes from config context. - const agent = () => session.agents().find((a) => a.name === props.name) + const agent = () => session.allAgents().find((a) => a.name === props.name) const native = () => agent()?.native ?? false + const [expanded, setExpanded] = createSignal(false) const cfg = createMemo(() => config().agent?.[props.name] ?? {}) @@ -230,6 +231,18 @@ const ModeEditView: Component = (props) => { + {/* Calculated permissions (read-only, collapsible) */} + + {(rules) => ( + setExpanded((v) => !v)} + /> + )} + +
+
) diff --git a/packages/kilo-vscode/webview-ui/src/context/config.tsx b/packages/kilo-vscode/webview-ui/src/context/config.tsx index 015c4934bb..4f98a1b957 100644 --- a/packages/kilo-vscode/webview-ui/src/context/config.tsx +++ b/packages/kilo-vscode/webview-ui/src/context/config.tsx @@ -8,7 +8,8 @@ * changes into a single write (which triggers disposeAll on the CLI). */ -import { createContext, useContext, createSignal, onCleanup, ParentComponent, Accessor } from "solid-js" +import { createContext, useContext, createSignal, onCleanup } from "solid-js" +import type { ParentComponent, Accessor } from "solid-js" import { useVSCode } from "./vscode" import type { Config, ExtensionMessage } from "../types/messages" import { deepMerge, stripNulls, resolveConfig } from "../utils/config-utils" @@ -71,25 +72,29 @@ export const ConfigProvider: ParentComponent = (props) => { onCleanup(unsubscribe) - // Request config in case the initial push was missed. - // Retry a few times because the extension's httpClient may - // not be ready yet when the first request arrives. - let retries = 0 - const maxRetries = 5 - const retryMs = 500 - + // Request config immediately; if the extension's httpClient is not yet ready, + // extensionDataReady will fire once initialization completes and we retry once. vscode.postMessage({ type: "requestConfig" }) - const retryTimer = setInterval(() => { - retries++ - if (!loading() || retries >= maxRetries) { - clearInterval(retryTimer) - return + const fallback = setTimeout(() => { + if (loading()) { + vscode.postMessage({ type: "requestConfig" }) } - vscode.postMessage({ type: "requestConfig" }) - }, retryMs) + }, 3000) - onCleanup(() => clearInterval(retryTimer)) + const unsubReady = vscode.onMessage((message: ExtensionMessage) => { + if (message.type !== "extensionDataReady") return + unsubReady() + clearTimeout(fallback) + if (loading()) { + vscode.postMessage({ type: "requestConfig" }) + } + }) + + onCleanup(() => { + unsubReady() + clearTimeout(fallback) + }) function updateConfig(partial: Partial) { // Optimistically update local state with deep merge + null stripping diff --git a/packages/kilo-vscode/webview-ui/src/context/provider.tsx b/packages/kilo-vscode/webview-ui/src/context/provider.tsx index f5f95d2d91..4b173b8baa 100644 --- a/packages/kilo-vscode/webview-ui/src/context/provider.tsx +++ b/packages/kilo-vscode/webview-ui/src/context/provider.tsx @@ -4,7 +4,8 @@ * Selection is now per-session — see session.tsx. */ -import { createContext, useContext, createSignal, createMemo, onCleanup, ParentComponent, Accessor } from "solid-js" +import { createContext, useContext, createSignal, createMemo, onCleanup } from "solid-js" +import type { ParentComponent, Accessor } from "solid-js" import { useVSCode } from "./vscode" import type { Provider, ProviderModel, ModelSelection, ExtensionMessage, ProviderAuthState } from "../types/messages" import type { ProviderAuthMethod } from "@kilocode/sdk/v2/client" @@ -64,25 +65,29 @@ export const ProviderProvider: ParentComponent = (props) => { onCleanup(unsubscribe) - // Request providers in case the initial push was missed. - // Retry a few times because the extension's httpClient may - // not be ready yet when the first request arrives. - let retries = 0 - const maxRetries = 5 - const retryMs = 500 - + // Request providers immediately; if the extension's httpClient is not yet ready, + // extensionDataReady will fire once initialization completes and we retry once. vscode.postMessage({ type: "requestProviders" }) - const retryTimer = setInterval(() => { - retries++ - if (Object.keys(providers()).length > 0 || retries >= maxRetries) { - clearInterval(retryTimer) - return + const fallback = setTimeout(() => { + if (Object.keys(providers()).length === 0) { + vscode.postMessage({ type: "requestProviders" }) } - vscode.postMessage({ type: "requestProviders" }) - }, retryMs) + }, 3000) - onCleanup(() => clearInterval(retryTimer)) + const unsubReady = vscode.onMessage((message: ExtensionMessage) => { + if (message.type !== "extensionDataReady") return + unsubReady() + clearTimeout(fallback) + if (Object.keys(providers()).length === 0) { + vscode.postMessage({ type: "requestProviders" }) + } + }) + + onCleanup(() => { + unsubReady() + clearTimeout(fallback) + }) const value: ProviderContextValue = { providers, diff --git a/packages/kilo-vscode/webview-ui/src/context/session-agent.ts b/packages/kilo-vscode/webview-ui/src/context/session-agent.ts index d071903518..2c7dcf4bfd 100644 --- a/packages/kilo-vscode/webview-ui/src/context/session-agent.ts +++ b/packages/kilo-vscode/webview-ui/src/context/session-agent.ts @@ -2,9 +2,7 @@ import type { Message } from "../types/messages" export function resolveSessionAgent(messages: Message[], names: Set): string | undefined { for (let i = messages.length - 1; i >= 0; i--) { - const msg = messages[i] - if (msg.role !== "user") continue - const name = msg.agent?.trim() + const name = messages[i]?.agent?.trim() if (!name) continue if (!names.has(name)) continue return name diff --git a/packages/kilo-vscode/webview-ui/src/context/session-utils.ts b/packages/kilo-vscode/webview-ui/src/context/session-utils.ts index 893a197328..b6191cb1af 100644 --- a/packages/kilo-vscode/webview-ui/src/context/session-utils.ts +++ b/packages/kilo-vscode/webview-ui/src/context/session-utils.ts @@ -9,6 +9,18 @@ type ToolState = { metadata?: { sessionId?: string } } +type TaskPart = { + type: string + tool?: string + metadata?: { sessionId?: string } + state?: ToolState +} + +export function childID(part: TaskPart): string | undefined { + if (part.type !== "tool" || part.tool !== "task") return undefined + return part.metadata?.sessionId ?? part.state?.metadata?.sessionId +} + /** * Derive a human-readable status string from the last streaming part. * Returns undefined for part types that don't map to a status. @@ -97,7 +109,7 @@ const LABEL_CAP = 24 export function buildFamilyLabels( family: Set, messages: Record, - parts: Record>, + parts: Record, ): Map { const labels = new Map() for (const sid of family) { @@ -108,7 +120,7 @@ export function buildFamilyLabels( if (!list) continue for (const p of list) { if (p.type !== "tool") continue - const child = p.state?.metadata?.sessionId + const child = childID(p) if (!child || !family.has(child)) continue const raw = p.state?.input?.subagent_type || p.state?.input?.description || p.tool || "task" const desc = raw.length > LABEL_CAP ? raw.slice(0, LABEL_CAP - 2) + "…" : raw diff --git a/packages/kilo-vscode/webview-ui/src/context/session.tsx b/packages/kilo-vscode/webview-ui/src/context/session.tsx index 3699decc2a..97f4265eb4 100644 --- a/packages/kilo-vscode/webview-ui/src/context/session.tsx +++ b/packages/kilo-vscode/webview-ui/src/context/session.tsx @@ -39,6 +39,7 @@ import { buildFamilyCosts, buildFamilyLabels, buildCostBreakdown, + childID, } from "./session-utils" import { Identifier } from "../utils/id" import { resolveModelSelection } from "./model-selection" @@ -134,6 +135,7 @@ interface SessionContextValue { // Agent/mode selection (per-session) agents: Accessor + allAgents: Accessor removeMode: (name: string) => void removeMcp: (name: string) => void @@ -255,6 +257,7 @@ export const SessionProvider: ParentComponent = (props) => { // Agents (modes) loaded from the CLI backend const [agents, setAgents] = createSignal([]) + const [allAgents, setAllAgents] = createSignal([]) const [defaultAgent, setDefaultAgent] = createSignal("code") // Skills loaded from the CLI backend @@ -414,6 +417,10 @@ export const SessionProvider: ParentComponent = (props) => { function selectModel(providerID: string, modelID: string) { applyModel(selectedAgentName(), { providerID, modelID }) + const sid = currentSessionID() + if (sid) { + setStore("messages", sid, (msgs = []) => msgs.filter((m) => !m.error)) + } } /** The config/default model for the current mode (what settings says). */ @@ -464,6 +471,7 @@ export const SessionProvider: ParentComponent = (props) => { return } setAgents(message.agents) + setAllAgents(message.allAgents ?? message.agents) setDefaultAgent(message.defaultAgent) const names = new Set(message.agents.map((a) => a.name)) @@ -496,24 +504,10 @@ export const SessionProvider: ParentComponent = (props) => { }) }) - // Request agents in case the initial push was missed. - // Retry a few times because the extension's httpClient may - // not be ready yet when the first request arrives. - let agentRetries = 0 - const agentMaxRetries = 5 - const agentRetryMs = 500 - + // Request agents immediately; if the extension's httpClient is not yet ready, + // extensionDataReady will fire once initialization completes and we retry once. vscode.postMessage({ type: "requestAgents" }) - const agentRetryTimer = setInterval(() => { - agentRetries++ - if (agents().length > 0 || agentRetries >= agentMaxRetries) { - clearInterval(agentRetryTimer) - return - } - vscode.postMessage({ type: "requestAgents" }) - }, agentRetryMs) - // Skills loaded from the CLI backend const unsubSkills = vscode.onMessage((message: ExtensionMessage) => { if (message.type === "skillsLoaded") { @@ -530,6 +524,24 @@ export const SessionProvider: ParentComponent = (props) => { vscode.postMessage({ type: "removeSkill", location }) } + // Handle permission events immediately (not in onMount) so we never miss + // the first permission request that may arrive before the DOM mounts. + // This matches the pattern already used for agentsLoaded and skillsLoaded. + const unsubPermissions = vscode.onMessage((message: ExtensionMessage) => { + switch (message.type) { + case "permissionRequest": + handlePermissionRequest(message.permission) + break + case "permissionResolved": + handlePermissionResolved(message.permissionID) + break + case "permissionError": + handlePermissionError(message.permissionID) + break + } + }) + onCleanup(unsubPermissions) + // MCP status loaded from CLI backend const unsubMcpStatus = vscode.onMessage((message: ExtensionMessage) => { if (message.type === "mcpStatusLoaded") { @@ -538,24 +550,28 @@ export const SessionProvider: ParentComponent = (props) => { } }) - // Request MCP status on init with retry (same pattern as agents) - let mcpRetries = 0 + // Request MCP status immediately; retry once on extensionDataReady if still missing. vscode.postMessage({ type: "requestMcpStatus" }) - const mcpRetryTimer = setInterval(() => { - mcpRetries++ - if (Object.keys(mcpStatus()).length > 0 || mcpRetries >= 5) { - clearInterval(mcpRetryTimer) - return - } - vscode.postMessage({ type: "requestMcpStatus" }) - }, 500) + + const fallback = setTimeout(() => { + if (agents().length === 0) vscode.postMessage({ type: "requestAgents" }) + if (Object.keys(mcpStatus()).length === 0) vscode.postMessage({ type: "requestMcpStatus" }) + }, 3000) + + const unsubReady = vscode.onMessage((message: ExtensionMessage) => { + if (message.type !== "extensionDataReady") return + unsubReady() + clearTimeout(fallback) + if (agents().length === 0) vscode.postMessage({ type: "requestAgents" }) + if (Object.keys(mcpStatus()).length === 0) vscode.postMessage({ type: "requestMcpStatus" }) + }) onCleanup(() => { unsubAgents() unsubSkills() unsubMcpStatus() - clearInterval(agentRetryTimer) - clearInterval(mcpRetryTimer) + unsubReady() + clearTimeout(fallback) }) // Variant (thinking effort) selection — keyed by "providerID/modelID" @@ -648,18 +664,6 @@ export const SessionProvider: ParentComponent = (props) => { handleSessionStatus(message.sessionID, message.status, message.attempt, message.message, message.next) break - case "permissionRequest": - handlePermissionRequest(message.permission) - break - - case "permissionResolved": - handlePermissionResolved(message.permissionID) - break - - case "permissionError": - handlePermissionError(message.permissionID) - break - case "todoUpdated": handleTodoUpdated(message.sessionID, message.items) break @@ -854,11 +858,12 @@ export const SessionProvider: ParentComponent = (props) => { return [...msgs, message] }) - if (message.role === "user") { - const agent = message.agent?.trim() - if (agent && agentNames().has(agent)) { - setStore("agentSelections", message.sessionID, agent) - } + // Sync mode picker from any message role (user or assistant). + // agentNames() already excludes subagent/hidden agents, so subtask + // assistant messages (e.g. "task" agent) are silently ignored. + const agent = message.agent?.trim() + if (agent && agentNames().has(agent)) { + setStore("agentSelections", message.sessionID, agent) } if (message.parts && message.parts.length > 0) { @@ -1040,7 +1045,15 @@ export const SessionProvider: ParentComponent = (props) => { if (!parts) continue for (const p of parts) { if (p.type !== "tool") continue - const child = (p as { state?: { metadata?: { sessionId?: string } } }).state?.metadata?.sessionId + // Webview ToolState omits runtime metadata; task parts still carry it from the backend. + const child = childID( + p as { + type: string + tool?: string + metadata?: { sessionId?: string } + state?: { metadata?: { sessionId?: string } } + }, + ) if (child && !family.has(child)) { family.add(child) queue.push(child) @@ -1804,6 +1817,7 @@ export const SessionProvider: ParentComponent = (props) => { costBreakdown, contextUsage, agents, + allAgents, skills, refreshSkills, removeSkill, diff --git a/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts b/packages/kilo-vscode/webview-ui/src/hooks/useSlashCommand.ts index b546cadfce..59881ed9f5 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 1fa8b58eda..3d9681c728 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ar.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ar.ts @@ -935,6 +935,10 @@ export const dict = { "session.status.retrying": "...إعادة المحاولة (المحاولة {{ attempt }})… {{ message }}", "session.status.working": "...جارٍ العمل", + "ui.sessionTurn.cancel": "إلغاء", + "ui.sessionTurn.status.thinking": "...جارٍ التفكير", + "ui.sessionTurn.status.consideringNextSteps": "...جارٍ التفكير في الخطوات التالية", + "dialog.model.noProviders": "لا يوجد موفرون", "prompt.placeholder.connecting": "جارٍ الاتصال بالخادم...", @@ -1052,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": "الوكيل المستخدم عند عدم التحديد", @@ -1113,6 +1125,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "هذا وضع مضمن. لا يمكن تغيير تعريفه الأساسي، ولكن يمكنك تكوين التجاوزات أدناه.", "settings.agentBehaviour.editMode.promptOverride": "تجاوز موجه مخصص لهذا الوضع المدمج", + "settings.agentBehaviour.badge.subagent": "وكيل فرعي", + "settings.agentBehaviour.permissions.title": "الأذونات المحسوبة", + "settings.agentBehaviour.permissions.count": "{{count}} قواعد", + "settings.agentBehaviour.permissions.effective": "الفعال (حرف بدل):", + "settings.agentBehaviour.permissions.col.tool": "الأداة", + "settings.agentBehaviour.permissions.col.pattern": "النمط", + "settings.agentBehaviour.permissions.col.action": "الإجراء", + "settings.agentBehaviour.permissions.copy": "نسخ الأذونات كـ JSON", + "settings.agentBehaviour.permissions.hint": + "يتم تقييم القواعد بالترتيب — القاعدة المطابقة الأخيرة هي التي تُطبق. هذه هي مجموعة القواعد المحلولة من خلفية CLI.", "settings.agentBehaviour.removeMode.title": "إزالة الوضع", "settings.agentBehaviour.removeMode.confirm": 'هل تريد إزالة الوضع "{{name}}"؟ سيؤدي هذا إلى تعطيل الوضع عن طريق تحديث الإعدادات.', @@ -1330,4 +1352,5 @@ export const dict = { "notifications.action.next": "التالي", "notifications.action.close": "إغلاق", "notifications.action.tryModel": "جرّب {{model}}", + "notifications.action.tryModelGeneric": "جرّب النموذج", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/br.ts b/packages/kilo-vscode/webview-ui/src/i18n/br.ts index 4689add917..026f56459a 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/br.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/br.ts @@ -943,6 +943,10 @@ export const dict = { "session.status.retrying": "Tentando novamente (tentativa {{ attempt }})… {{ message }}", "session.status.working": "Trabalhando…", + "ui.sessionTurn.cancel": "Cancelar", + "ui.sessionTurn.status.thinking": "Pensando...", + "ui.sessionTurn.status.consideringNextSteps": "Considerando próximos passos...", + "dialog.model.noProviders": "Nenhum provedor", "prompt.placeholder.connecting": "Conectando ao servidor...", @@ -1069,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", @@ -1132,6 +1144,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "Este é um modo embutido. Sua definição base não pode ser alterada, mas você pode configurar as sobrescritas abaixo.", "settings.agentBehaviour.editMode.promptOverride": "Substituição de prompt personalizado para este modo integrado", + "settings.agentBehaviour.badge.subagent": "subagente", + "settings.agentBehaviour.permissions.title": "Permissões Calculadas", + "settings.agentBehaviour.permissions.count": "{{count}} regras", + "settings.agentBehaviour.permissions.effective": "Efetiva (curinga):", + "settings.agentBehaviour.permissions.col.tool": "Ferramenta", + "settings.agentBehaviour.permissions.col.pattern": "Padrão", + "settings.agentBehaviour.permissions.col.action": "Ação", + "settings.agentBehaviour.permissions.copy": "Copiar permissões como JSON", + "settings.agentBehaviour.permissions.hint": + "As regras são avaliadas em ordem — a última regra correspondente vence. Este é o conjunto de regras resolvido do backend da CLI.", "settings.agentBehaviour.removeMode.title": "Remover modo", "settings.agentBehaviour.removeMode.confirm": 'Remover o modo "{{name}}"? Isso desativará o modo atualizando sua configuração.', @@ -1359,4 +1381,5 @@ export const dict = { "notifications.action.next": "Próximo", "notifications.action.close": "Fechar", "notifications.action.tryModel": "Experimentar {{model}}", + "notifications.action.tryModelGeneric": "Experimentar modelo", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts index eb264cc52d..5b1259792e 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/bs.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/bs.ts @@ -948,6 +948,10 @@ export const dict = { "session.status.retrying": "Ponovni pokušaj (pokušaj {{ attempt }})… {{ message }}", "session.status.working": "Radim…", + "ui.sessionTurn.cancel": "Otkaži", + "ui.sessionTurn.status.thinking": "Razmišljam...", + "ui.sessionTurn.status.consideringNextSteps": "Razmatram sljedeće korake...", + "dialog.model.noProviders": "Nema pružatelja", "prompt.placeholder.connecting": "Povezivanje na server...", @@ -1068,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", @@ -1130,6 +1142,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "Ovo je ugrađeni način rada. Njegova osnovna definicija ne može se mijenjati, ali ispod možete konfigurirati nadjačavanja.", "settings.agentBehaviour.editMode.promptOverride": "Prilagođeno nadjačavanje prompta za ovaj ugrađeni mod", + "settings.agentBehaviour.badge.subagent": "podagent", + "settings.agentBehaviour.permissions.title": "Izračunate dozvole", + "settings.agentBehaviour.permissions.count": "{{count}} pravila", + "settings.agentBehaviour.permissions.effective": "Efektivno (wildcard):", + "settings.agentBehaviour.permissions.col.tool": "Alat", + "settings.agentBehaviour.permissions.col.pattern": "Uzorak", + "settings.agentBehaviour.permissions.col.action": "Akcija", + "settings.agentBehaviour.permissions.copy": "Kopiraj dozvole kao JSON", + "settings.agentBehaviour.permissions.hint": + "Pravila se evaluiraju po redoslijedu — zadnje pravilo koje se podudara pobjeđuje. Ovo je riješeni skup pravila iz CLI backenda.", "settings.agentBehaviour.removeMode.title": "Ukloni mod", "settings.agentBehaviour.removeMode.confirm": 'Ukloniti mod "{{name}}"? Ovo će onemogućiti mod ažuriranjem vaše konfiguracije.', @@ -1355,4 +1377,5 @@ export const dict = { "notifications.action.next": "Sljedeći", "notifications.action.close": "Zatvori", "notifications.action.tryModel": "Probaj {{model}}", + "notifications.action.tryModelGeneric": "Probaj model", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/da.ts b/packages/kilo-vscode/webview-ui/src/i18n/da.ts index a6a486f428..d51d3ff6be 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/da.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/da.ts @@ -941,6 +941,10 @@ export const dict = { "session.status.retrying": "Prøver igen (forsøg {{ attempt }})… {{ message }}", "session.status.working": "Arbejder…", + "ui.sessionTurn.cancel": "Annuller", + "ui.sessionTurn.status.thinking": "Tænker...", + "ui.sessionTurn.status.consideringNextSteps": "Overvejer næste trin...", + "dialog.model.noProviders": "Ingen udbydere", "prompt.placeholder.connecting": "Opretter forbindelse til server...", @@ -1062,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", @@ -1123,6 +1135,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "Dette er en indbygget tilstand. Dens grundlæggende definition kan ikke ændres, men du kan konfigurere tilsidesættelser nedenfor.", "settings.agentBehaviour.editMode.promptOverride": "Tilpasset prompt-tilsidesættelse for denne indbyggede tilstand", + "settings.agentBehaviour.badge.subagent": "subagent", + "settings.agentBehaviour.permissions.title": "Beregnede tilladelser", + "settings.agentBehaviour.permissions.count": "{{count}} regler", + "settings.agentBehaviour.permissions.effective": "Gældende (wildcard):", + "settings.agentBehaviour.permissions.col.tool": "Værktøj", + "settings.agentBehaviour.permissions.col.pattern": "Mønster", + "settings.agentBehaviour.permissions.col.action": "Handling", + "settings.agentBehaviour.permissions.copy": "Kopiér tilladelser som JSON", + "settings.agentBehaviour.permissions.hint": + "Reglerne evalueres i rækkefølge — den sidst matchende regel vinder. Dette er det endelige regelsæt fra CLI-backenden.", "settings.agentBehaviour.removeMode.title": "Fjern tilstand", "settings.agentBehaviour.removeMode.confirm": 'Vil du fjerne tilstanden "{{name}}"? Dette vil deaktivere tilstanden ved at opdatere din konfiguration.', @@ -1346,4 +1368,5 @@ export const dict = { "notifications.action.next": "Næste", "notifications.action.close": "Luk", "notifications.action.tryModel": "Prøv {{model}}", + "notifications.action.tryModelGeneric": "Prøv model", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/de.ts b/packages/kilo-vscode/webview-ui/src/i18n/de.ts index 2f2bdbb999..d7baebbd98 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/de.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/de.ts @@ -953,6 +953,10 @@ export const dict = { "session.status.retrying": "Erneuter Versuch ({{ attempt }})… {{ message }}", "session.status.working": "Wird bearbeitet…", + "ui.sessionTurn.cancel": "Abbrechen", + "ui.sessionTurn.status.thinking": "Denke nach...", + "ui.sessionTurn.status.consideringNextSteps": "Überlege nächste Schritte...", + "dialog.model.noProviders": "Keine Anbieter", "prompt.placeholder.connecting": "Verbindung zum Server wird hergestellt...", @@ -1082,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", @@ -1145,6 +1157,16 @@ export const dict = { "Dies ist ein integrierter Modus. Seine Basisdefinition kann nicht geändert werden, aber Sie können unten Überschreibungen konfigurieren.", "settings.agentBehaviour.editMode.promptOverride": "Benutzerdefinierte Prompt-Überschreibung für diesen eingebauten Modus", + "settings.agentBehaviour.badge.subagent": "Subagent", + "settings.agentBehaviour.permissions.title": "Berechnete Berechtigungen", + "settings.agentBehaviour.permissions.count": "{{count}} Regeln", + "settings.agentBehaviour.permissions.effective": "Effektiv (Platzhalter):", + "settings.agentBehaviour.permissions.col.tool": "Werkzeug", + "settings.agentBehaviour.permissions.col.pattern": "Muster", + "settings.agentBehaviour.permissions.col.action": "Aktion", + "settings.agentBehaviour.permissions.copy": "Berechtigungen als JSON kopieren", + "settings.agentBehaviour.permissions.hint": + "Regeln werden der Reihe nach ausgewertet — die letzte übereinstimmende Regel gewinnt. Dies ist das aufgelöste Regelwerk vom CLI-Backend.", "settings.agentBehaviour.removeMode.title": "Modus entfernen", "settings.agentBehaviour.removeMode.confirm": 'Modus "{{name}}" entfernen? Dadurch wird der Modus durch Aktualisierung Ihrer Konfiguration deaktiviert.', @@ -1373,4 +1395,5 @@ export const dict = { "notifications.action.next": "Weiter", "notifications.action.close": "Schließen", "notifications.action.tryModel": "{{model}} ausprobieren", + "notifications.action.tryModelGeneric": "Modell ausprobieren", } satisfies Partial> diff --git a/packages/kilo-vscode/webview-ui/src/i18n/en.ts b/packages/kilo-vscode/webview-ui/src/i18n/en.ts index 8bc6b2db35..9aaa119824 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/en.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/en.ts @@ -941,6 +941,10 @@ export const dict = { "session.status.retrying": "Retrying (attempt {{ attempt }})… {{ message }}", "session.status.working": "Working...", + "ui.sessionTurn.cancel": "Cancel", + "ui.sessionTurn.status.thinking": "Thinking...", + "ui.sessionTurn.status.consideringNextSteps": "Considering next steps...", + "dialog.model.noProviders": "No providers", "prompt.placeholder.connecting": "Connecting to server...", @@ -1063,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", @@ -1171,8 +1183,19 @@ export const dict = { "settings.agentBehaviour.editMode.prompt": "System Prompt", "settings.agentBehaviour.editMode.save": "Done", "settings.agentBehaviour.editMode.back": "Back to list", - "settings.agentBehaviour.editMode.native": "Built-in mode (read-only definition)", + "settings.agentBehaviour.editMode.native": + "This is a built-in mode. Its base definition cannot be changed, but you can configure overrides below.", "settings.agentBehaviour.editMode.promptOverride": "Custom prompt override for this built-in mode", + "settings.agentBehaviour.badge.subagent": "subagent", + "settings.agentBehaviour.permissions.title": "Calculated Permissions", + "settings.agentBehaviour.permissions.count": "{{count}} rules", + "settings.agentBehaviour.permissions.effective": "Effective (wildcard):", + "settings.agentBehaviour.permissions.col.tool": "Tool", + "settings.agentBehaviour.permissions.col.pattern": "Pattern", + "settings.agentBehaviour.permissions.col.action": "Action", + "settings.agentBehaviour.permissions.copy": "Copy permissions as JSON", + "settings.agentBehaviour.permissions.hint": + "Rules are evaluated in order — last matching rule wins. This is the resolved ruleset from the CLI backend.", "settings.autoApprove.description": "Define how tools are allowed to run. Most tools default to Allow. doom_loop and external_directory default to Ask.", @@ -1356,4 +1379,5 @@ export const dict = { "notifications.action.next": "Next", "notifications.action.close": "Close", "notifications.action.tryModel": "Try {{model}}", + "notifications.action.tryModelGeneric": "Try Model", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/es.ts b/packages/kilo-vscode/webview-ui/src/i18n/es.ts index 4fc8410912..0111673018 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/es.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/es.ts @@ -949,6 +949,10 @@ export const dict = { "session.status.retrying": "Reintentando (intento {{ attempt }})… {{ message }}", "session.status.working": "Trabajando…", + "ui.sessionTurn.cancel": "Cancelar", + "ui.sessionTurn.status.thinking": "Pensando...", + "ui.sessionTurn.status.consideringNextSteps": "Considerando siguientes pasos...", + "dialog.model.noProviders": "Sin proveedores", "prompt.placeholder.connecting": "Conectando al servidor...", @@ -1073,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", @@ -1137,6 +1149,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "Este es un modo integrado. Su definición base no se puede cambiar, pero puedes configurar sobreescrituras a continuación.", "settings.agentBehaviour.editMode.promptOverride": "Anulación de prompt personalizado para este modo integrado", + "settings.agentBehaviour.badge.subagent": "subagente", + "settings.agentBehaviour.permissions.title": "Permisos calculados", + "settings.agentBehaviour.permissions.count": "{{count}} reglas", + "settings.agentBehaviour.permissions.effective": "Efectivo (comodín):", + "settings.agentBehaviour.permissions.col.tool": "Herramienta", + "settings.agentBehaviour.permissions.col.pattern": "Patrón", + "settings.agentBehaviour.permissions.col.action": "Acción", + "settings.agentBehaviour.permissions.copy": "Copiar permisos como JSON", + "settings.agentBehaviour.permissions.hint": + "Las reglas se evalúan en orden — gana la última regla coincidente. Este es el conjunto de reglas resuelto desde el backend de la CLI.", "settings.agentBehaviour.removeMode.title": "Eliminar modo", "settings.agentBehaviour.removeMode.confirm": '¿Eliminar el modo "{{name}}"? Esto desactivará el modo actualizando su configuración.', @@ -1362,4 +1384,5 @@ export const dict = { "notifications.action.next": "Siguiente", "notifications.action.close": "Cerrar", "notifications.action.tryModel": "Probar {{model}}", + "notifications.action.tryModelGeneric": "Probar modelo", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts index eff79d27b8..ac8bc5d085 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/fr.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/fr.ts @@ -955,6 +955,10 @@ export const dict = { "session.status.retrying": "Nouvelle tentative (essai {{ attempt }})… {{ message }}", "session.status.working": "En cours…", + "ui.sessionTurn.cancel": "Annuler", + "ui.sessionTurn.status.thinking": "Réflexion...", + "ui.sessionTurn.status.consideringNextSteps": "Envisage les prochaines étapes...", + "dialog.model.noProviders": "Aucun fournisseur", "prompt.placeholder.connecting": "Connexion au serveur...", @@ -1084,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é", @@ -1149,6 +1161,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "Il s'agit d'un mode intégré. Sa définition de base ne peut pas être modifiée, mais vous pouvez configurer des surcharges ci-dessous.", "settings.agentBehaviour.editMode.promptOverride": "Remplacement de prompt personnalisé pour ce mode intégré", + "settings.agentBehaviour.badge.subagent": "sous-agent", + "settings.agentBehaviour.permissions.title": "Permissions calculées", + "settings.agentBehaviour.permissions.count": "{{count}} règles", + "settings.agentBehaviour.permissions.effective": "Effectif (wildcard) :", + "settings.agentBehaviour.permissions.col.tool": "Outil", + "settings.agentBehaviour.permissions.col.pattern": "Motif", + "settings.agentBehaviour.permissions.col.action": "Action", + "settings.agentBehaviour.permissions.copy": "Copier les permissions en JSON", + "settings.agentBehaviour.permissions.hint": + "Les règles sont évaluées dans l'ordre — la dernière règle correspondante l'emporte. Il s'agit de l'ensemble de règles résolu depuis le backend CLI.", "settings.agentBehaviour.removeMode.title": "Supprimer le mode", "settings.agentBehaviour.removeMode.confirm": 'Supprimer le mode "{{name}}" ? Cela désactivera le mode en mettant à jour votre configuration.', @@ -1378,4 +1400,5 @@ export const dict = { "notifications.action.next": "Suivant", "notifications.action.close": "Fermer", "notifications.action.tryModel": "Essayer {{model}}", + "notifications.action.tryModelGeneric": "Essayer le modèle", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts index 88020c7bb5..db508143b5 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ja.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ja.ts @@ -940,6 +940,10 @@ export const dict = { "session.status.retrying": "再試行中（{{ attempt }}回目）… {{ message }}", "session.status.working": "作業中…", + "ui.sessionTurn.cancel": "キャンセル", + "ui.sessionTurn.status.thinking": "考え中...", + "ui.sessionTurn.status.consideringNextSteps": "次のステップを検討中...", + "dialog.model.noProviders": "プロバイダーなし", "prompt.placeholder.connecting": "サーバーに接続中...", @@ -1062,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": "指定されていない場合に使用するエージェント", @@ -1125,6 +1137,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "これは組み込みモードです。基本定義は変更できませんが、以下でオーバーライドを設定できます。", "settings.agentBehaviour.editMode.promptOverride": "この組み込みモードのカスタムプロンプト上書き", + "settings.agentBehaviour.badge.subagent": "サブエージェント", + "settings.agentBehaviour.permissions.title": "計算された権限", + "settings.agentBehaviour.permissions.count": "{{count}} 個のルール", + "settings.agentBehaviour.permissions.effective": "有効（ワイルドカード）:", + "settings.agentBehaviour.permissions.col.tool": "ツール", + "settings.agentBehaviour.permissions.col.pattern": "パターン", + "settings.agentBehaviour.permissions.col.action": "アクション", + "settings.agentBehaviour.permissions.copy": "権限をJSONとしてコピー", + "settings.agentBehaviour.permissions.hint": + "ルールは順番に評価され、最後に一致したルールが適用されます。これはCLIバックエンドから解決されたルールセットです。", "settings.agentBehaviour.removeMode.title": "モードを削除", "settings.agentBehaviour.removeMode.confirm": 'モード "{{name}}" を削除しますか？設定を更新してモードを無効にします。', @@ -1345,4 +1367,5 @@ export const dict = { "notifications.action.next": "次へ", "notifications.action.close": "閉じる", "notifications.action.tryModel": "{{model}}を試す", + "notifications.action.tryModelGeneric": "モデルを試す", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts index 9849323081..4836dba6a3 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ko.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ko.ts @@ -940,6 +940,10 @@ export const dict = { "session.status.retrying": "재시도 중 ({{ attempt }}번째 시도)… {{ message }}", "session.status.working": "작업 중...", + "ui.sessionTurn.cancel": "취소", + "ui.sessionTurn.status.thinking": "생각 중...", + "ui.sessionTurn.status.consideringNextSteps": "다음 단계 고려 중...", + "dialog.model.noProviders": "공급자 없음", "prompt.placeholder.connecting": "서버에 연결 중...", @@ -1059,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": "지정되지 않은 경우 사용할 에이전트", @@ -1119,6 +1131,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "이것은 내장 모드입니다. 기본 정의는 변경할 수 없지만, 아래에서 재정의를 구성할 수 있습니다.", "settings.agentBehaviour.editMode.promptOverride": "이 내장 모드에 대한 사용자 지정 프롬프트 재정의", + "settings.agentBehaviour.badge.subagent": "서브에이전트", + "settings.agentBehaviour.permissions.title": "계산된 권한", + "settings.agentBehaviour.permissions.count": "{{count}}개 규칙", + "settings.agentBehaviour.permissions.effective": "유효 (와일드카드):", + "settings.agentBehaviour.permissions.col.tool": "도구", + "settings.agentBehaviour.permissions.col.pattern": "패턴", + "settings.agentBehaviour.permissions.col.action": "작업", + "settings.agentBehaviour.permissions.copy": "권한을 JSON으로 복사", + "settings.agentBehaviour.permissions.hint": + "규칙은 순서대로 평가되며, 마지막에 일치하는 규칙이 적용됩니다. 이것은 CLI 백엔드에서 확인된 규칙 세트입니다.", "settings.agentBehaviour.removeMode.title": "모드 제거", "settings.agentBehaviour.removeMode.confirm": '모드 "{{name}}"을(를) 제거하시겠습니까? 구성을 업데이트하여 모드를 비활성화합니다.', @@ -1333,4 +1355,5 @@ export const dict = { "notifications.action.next": "다음", "notifications.action.close": "닫기", "notifications.action.tryModel": "{{model}} 시도", + "notifications.action.tryModelGeneric": "모델 시도", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts index c8e5c7e21d..4325df7eaa 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/nl.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/nl.ts @@ -942,6 +942,10 @@ export const dict = { "session.status.retrying": "Opnieuw proberen (poging {{ attempt }})... {{ message }}", "session.status.working": "Bezig...", + "ui.sessionTurn.cancel": "Annuleren", + "ui.sessionTurn.status.thinking": "Denken...", + "ui.sessionTurn.status.consideringNextSteps": "Volgende stappen overwegen...", + "dialog.model.noProviders": "Geen providers", "prompt.placeholder.connecting": "Verbinden met server...", @@ -1072,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", @@ -1351,6 +1363,7 @@ export const dict = { "notifications.action.next": "Volgende", "notifications.action.close": "Sluiten", "notifications.action.tryModel": "Probeer {{model}}", + "notifications.action.tryModelGeneric": "Probeer model", // Missing translations - English fallbacks until translated "settings.agentBehaviour.createMode": "Nieuwe modus aanmaken", "settings.agentBehaviour.createMode.button": "Aanmaken", @@ -1373,8 +1386,19 @@ export const dict = { "settings.agentBehaviour.editMode": "Modus bewerken", "settings.agentBehaviour.editMode.back": "Terug naar lijst", "settings.agentBehaviour.editMode.description": "Beschrijving", - "settings.agentBehaviour.editMode.native": "Ingebouwde modus (alleen-lezen definitie)", + "settings.agentBehaviour.editMode.native": + "Dit is een ingebouwde modus. De basisdefinitie kan niet worden gewijzigd, maar u kunt hieronder overrides configureren.", "settings.agentBehaviour.editMode.prompt": "Systeemprompt", "settings.agentBehaviour.editMode.promptOverride": "Aangepaste systeemprompt voor deze ingebouwde modus", + "settings.agentBehaviour.badge.subagent": "subagent", + "settings.agentBehaviour.permissions.title": "Berekende machtigingen", + "settings.agentBehaviour.permissions.count": "{{count}} regels", + "settings.agentBehaviour.permissions.effective": "Effectief (wildcard):", + "settings.agentBehaviour.permissions.col.tool": "Tool", + "settings.agentBehaviour.permissions.col.pattern": "Patroon", + "settings.agentBehaviour.permissions.col.action": "Actie", + "settings.agentBehaviour.permissions.copy": "Machtigingen kopiëren als JSON", + "settings.agentBehaviour.permissions.hint": + "Regels worden op volgorde geëvalueerd — de laatst overeenkomende regel wint. Dit is de opgeloste regelset van de CLI backend.", "settings.agentBehaviour.editMode.save": "Klaar", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/no.ts b/packages/kilo-vscode/webview-ui/src/i18n/no.ts index 97437a53ce..73cf55f8d3 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/no.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/no.ts @@ -945,6 +945,10 @@ export const dict = { "session.status.retrying": "Prøver på nytt (forsøk {{ attempt }})… {{ message }}", "session.status.working": "Arbeider…", + "ui.sessionTurn.cancel": "Avbryt", + "ui.sessionTurn.status.thinking": "Tenker...", + "ui.sessionTurn.status.consideringNextSteps": "Vurderer neste steg...", + "dialog.model.noProviders": "Ingen leverandører", "prompt.placeholder.connecting": "Kobler til server...", @@ -1065,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", @@ -1126,6 +1138,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "Dette er en innebygd modus. Grunndefinisjonen kan ikke endres, men du kan konfigurere overstyringer nedenfor.", "settings.agentBehaviour.editMode.promptOverride": "Tilpasset prompt-overstyring for denne innebygde modusen", + "settings.agentBehaviour.badge.subagent": "subagent", + "settings.agentBehaviour.permissions.title": "Beregnede tillatelser", + "settings.agentBehaviour.permissions.count": "{{count}} regler", + "settings.agentBehaviour.permissions.effective": "Gjeldende (wildcard):", + "settings.agentBehaviour.permissions.col.tool": "Verktøy", + "settings.agentBehaviour.permissions.col.pattern": "Mønster", + "settings.agentBehaviour.permissions.col.action": "Handling", + "settings.agentBehaviour.permissions.copy": "Kopier tillatelser som JSON", + "settings.agentBehaviour.permissions.hint": + "Reglene evalueres i rekkefølge — siste matchende regel vinner. Dette er det gjeldende regelsettet fra CLI-backenden.", "settings.agentBehaviour.removeMode.title": "Fjern modus", "settings.agentBehaviour.removeMode.confirm": 'Vil du fjerne modusen "{{name}}"? Dette vil deaktivere modusen ved å oppdatere konfigurasjonen din.', @@ -1344,4 +1366,5 @@ export const dict = { "notifications.action.next": "Neste", "notifications.action.close": "Lukk", "notifications.action.tryModel": "Prøv {{model}}", + "notifications.action.tryModelGeneric": "Prøv modell", } satisfies Partial> diff --git a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts index cd6ecc31c4..4d9f846091 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/pl.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/pl.ts @@ -945,6 +945,10 @@ export const dict = { "session.status.retrying": "Ponawiam próbę ({{ attempt }})… {{ message }}", "session.status.working": "Pracuję…", + "ui.sessionTurn.cancel": "Anuluj", + "ui.sessionTurn.status.thinking": "Myślę...", + "ui.sessionTurn.status.consideringNextSteps": "Rozważam następne kroki...", + "dialog.model.noProviders": "Brak dostawców", "prompt.placeholder.connecting": "Łączenie z serwerem...", @@ -1066,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", @@ -1129,6 +1141,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "To jest wbudowany tryb. Jego podstawowa definicja nie może zostać zmieniona, ale poniżej możesz skonfigurować nadpisania.", "settings.agentBehaviour.editMode.promptOverride": "Niestandardowe nadpisanie promptu dla tego wbudowanego trybu", + "settings.agentBehaviour.badge.subagent": "podagent", + "settings.agentBehaviour.permissions.title": "Obliczone uprawnienia", + "settings.agentBehaviour.permissions.count": "{{count}} reguł", + "settings.agentBehaviour.permissions.effective": "Efektywne (wieloznacznik):", + "settings.agentBehaviour.permissions.col.tool": "Narzędzie", + "settings.agentBehaviour.permissions.col.pattern": "Wzorzec", + "settings.agentBehaviour.permissions.col.action": "Akcja", + "settings.agentBehaviour.permissions.copy": "Kopiuj uprawnienia jako JSON", + "settings.agentBehaviour.permissions.hint": + "Reguły są sprawdzane po kolei — ostatnia pasująca reguła wygrywa. To jest wynikowy zestaw reguł z backendu CLI.", "settings.agentBehaviour.removeMode.title": "Usuń tryb", "settings.agentBehaviour.removeMode.confirm": 'Usunąć tryb "{{name}}"? Spowoduje to wyłączenie trybu poprzez aktualizację konfiguracji.', @@ -1354,4 +1376,5 @@ export const dict = { "notifications.action.next": "Następny", "notifications.action.close": "Zamknij", "notifications.action.tryModel": "Wypróbuj {{model}}", + "notifications.action.tryModelGeneric": "Wypróbuj model", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts index bd6b387312..2501ea01fb 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/ru.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/ru.ts @@ -948,6 +948,10 @@ export const dict = { "session.status.retrying": "Повторная попытка ({{ attempt }})… {{ message }}", "session.status.working": "Работаю…", + "ui.sessionTurn.cancel": "Отмена", + "ui.sessionTurn.status.thinking": "Думаю...", + "ui.sessionTurn.status.consideringNextSteps": "Продумываю следующие шаги...", + "dialog.model.noProviders": "Нет провайдеров", "prompt.placeholder.connecting": "Подключение к серверу...", @@ -1068,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": "Агент при отсутствии указания", @@ -1132,6 +1144,16 @@ export const dict = { "Это встроенный режим. Его базовое определение нельзя изменить, но вы можете настроить переопределения ниже.", "settings.agentBehaviour.editMode.promptOverride": "Пользовательское переопределение промпта для этого встроенного режима", + "settings.agentBehaviour.badge.subagent": "субагент", + "settings.agentBehaviour.permissions.title": "Вычисленные разрешения", + "settings.agentBehaviour.permissions.count": "{{count}} правил", + "settings.agentBehaviour.permissions.effective": "Действующие (wildcard):", + "settings.agentBehaviour.permissions.col.tool": "Инструмент", + "settings.agentBehaviour.permissions.col.pattern": "Шаблон", + "settings.agentBehaviour.permissions.col.action": "Действие", + "settings.agentBehaviour.permissions.copy": "Скопировать разрешения как JSON", + "settings.agentBehaviour.permissions.hint": + "Правила оцениваются по порядку — побеждает последнее совпавшее правило. Это разрешенный набор правил из бэкенда CLI.", "settings.agentBehaviour.removeMode.title": "Удалить режим", "settings.agentBehaviour.removeMode.confirm": 'Удалить режим "{{name}}"? Это отключит режим, обновив вашу конфигурацию.', @@ -1353,4 +1375,5 @@ export const dict = { "notifications.action.next": "Далее", "notifications.action.close": "Закрыть", "notifications.action.tryModel": "Попробовать {{model}}", + "notifications.action.tryModelGeneric": "Попробовать модель", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/th.ts b/packages/kilo-vscode/webview-ui/src/i18n/th.ts index 9703f2f0a4..e2859e1ff9 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/th.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/th.ts @@ -936,6 +936,10 @@ export const dict = { "session.status.retrying": "กำลังลองใหม่ (ครั้งที่ {{ attempt }})… {{ message }}", "session.status.working": "กำลังทำงาน...", + "ui.sessionTurn.cancel": "ยกเลิก", + "ui.sessionTurn.status.thinking": "กำลังคิด...", + "ui.sessionTurn.status.consideringNextSteps": "กำลังพิจารณาขั้นตอนถัดไป...", + "dialog.model.noProviders": "ไม่มีผู้ให้บริการ", "prompt.placeholder.connecting": "กำลังเชื่อมต่อกับเซิร์ฟเวอร์...", @@ -1054,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": "เอเจนต์ที่ใช้เมื่อไม่ได้ระบุ", @@ -1114,6 +1126,16 @@ export const dict = { "settings.agentBehaviour.editMode.native": "นี่คือโหมดในตัว ไม่สามารถเปลี่ยนคำจำกัดความพื้นฐานได้ แต่คุณสามารถกำหนดค่าการแทนที่ได้ที่ด้านล่าง", "settings.agentBehaviour.editMode.promptOverride": "การแทนที่ prompt แบบกำหนดเองสำหรับโหมดในตัวนี้", + "settings.agentBehaviour.badge.subagent": "เอเจนต์ย่อย", + "settings.agentBehaviour.permissions.title": "สิทธิ์ที่คำนวณแล้ว", + "settings.agentBehaviour.permissions.count": "{{count}} กฎ", + "settings.agentBehaviour.permissions.effective": "มีผล (ไวลด์การ์ด):", + "settings.agentBehaviour.permissions.col.tool": "เครื่องมือ", + "settings.agentBehaviour.permissions.col.pattern": "รูปแบบ", + "settings.agentBehaviour.permissions.col.action": "การดำเนินการ", + "settings.agentBehaviour.permissions.copy": "คัดลอกสิทธิ์เป็น JSON", + "settings.agentBehaviour.permissions.hint": + "กฎจะถูกประเมินตามลำดับ — กฎที่ตรงกันล่าสุดจะมีผล นี่คือชุดกฎที่ประมวลผลแล้วจากแบ็กเอนด์ CLI", "settings.agentBehaviour.removeMode.title": "ลบโหมด", "settings.agentBehaviour.removeMode.confirm": 'ต้องการลบโหมด "{{name}}" หรือไม่? การดำเนินการนี้จะปิดใช้งานโหมดโดยอัปเดตการกำหนดค่าของคุณ', @@ -1329,4 +1351,5 @@ export const dict = { "notifications.action.next": "ถัดไป", "notifications.action.close": "ปิด", "notifications.action.tryModel": "ลองใช้ {{model}}", + "notifications.action.tryModelGeneric": "ลองใช้โมเดล", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts index 7e02b9f0d3..4ab1a9c78e 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/tr.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/tr.ts @@ -944,6 +944,10 @@ export const dict = { "session.status.retrying": "Yeniden deneniyor (deneme {{ attempt }})… {{ message }}", "session.status.working": "Çalışıyor...", + "ui.sessionTurn.cancel": "İptal", + "ui.sessionTurn.status.thinking": "Düşünüyor...", + "ui.sessionTurn.status.consideringNextSteps": "Sonraki adımları değerlendiriyor...", + "dialog.model.noProviders": "Sağlayıcı yok", "prompt.placeholder.connecting": "Sunucuya bağlanılıyor...", @@ -1068,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", @@ -1343,6 +1355,7 @@ export const dict = { "notifications.action.next": "Sonraki", "notifications.action.close": "Kapat", "notifications.action.tryModel": "Dene {{model}}", + "notifications.action.tryModelGeneric": "Modeli Dene", // Missing translations - English fallbacks until translated "profile.switchingAccount": "Hesap değiştiriliyor…", "settings.agentBehaviour.createMode": "Yeni Mod Oluştur", @@ -1366,8 +1379,19 @@ export const dict = { "settings.agentBehaviour.editMode": "Modu Düzenle", "settings.agentBehaviour.editMode.back": "Listeye dön", "settings.agentBehaviour.editMode.description": "Açıklama", - "settings.agentBehaviour.editMode.native": "Yerleşik mod (salt okunur tanım)", + "settings.agentBehaviour.editMode.native": + "Bu yerleşik bir moddur. Temel tanımı değiştirilemez, ancak aşağıdan geçersiz kılmaları yapılandırabilirsiniz.", "settings.agentBehaviour.editMode.prompt": "Sistem İstemi", "settings.agentBehaviour.editMode.promptOverride": "Bu yerleşik mod için özel sistem istemi geçersiz kılma", + "settings.agentBehaviour.badge.subagent": "alt ajan", + "settings.agentBehaviour.permissions.title": "Hesaplanan İzinler", + "settings.agentBehaviour.permissions.count": "{{count}} kural", + "settings.agentBehaviour.permissions.effective": "Geçerli (joker karakter):", + "settings.agentBehaviour.permissions.col.tool": "Araç", + "settings.agentBehaviour.permissions.col.pattern": "Desen", + "settings.agentBehaviour.permissions.col.action": "Eylem", + "settings.agentBehaviour.permissions.copy": "İzinleri JSON olarak kopyala", + "settings.agentBehaviour.permissions.hint": + "Kurallar sırayla değerlendirilir — son eşleşen kural kazanır. Bu, CLI arka ucundan çözümlenen kural kümesidir.", "settings.agentBehaviour.editMode.save": "Tamam", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts index 613ab873cb..79c0240a19 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/uk.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/uk.ts @@ -945,6 +945,10 @@ export const dict = { "session.status.retrying": "Повторна спроба (спроба {{ attempt }})… {{ message }}", "session.status.working": "Працює...", + "ui.sessionTurn.cancel": "Скасувати", + "ui.sessionTurn.status.thinking": "Думаю...", + "ui.sessionTurn.status.consideringNextSteps": "Обдумую наступні кроки...", + "dialog.model.noProviders": "Немає провайдерів", "prompt.placeholder.connecting": "Підключення до сервера...", @@ -1071,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": "Агент за замовчуванням", @@ -1344,6 +1356,7 @@ export const dict = { "notifications.action.next": "Далі", "notifications.action.close": "Закрити", "notifications.action.tryModel": "Спробувати {{model}}", + "notifications.action.tryModelGeneric": "Спробувати модель", // Missing translations - English fallbacks until translated "profile.switchingAccount": "Перемикання акаунту…", "settings.agentBehaviour.createMode": "Створити новий режим", @@ -1367,9 +1380,20 @@ export const dict = { "settings.agentBehaviour.editMode": "Редагувати режим", "settings.agentBehaviour.editMode.back": "Назад до списку", "settings.agentBehaviour.editMode.description": "Опис", - "settings.agentBehaviour.editMode.native": "Вбудований режим (визначення лише для читання)", + "settings.agentBehaviour.editMode.native": + "Це вбудований режим. Його базове визначення неможливо змінити, але ви можете налаштувати перевизначення нижче.", "settings.agentBehaviour.editMode.prompt": "Системний запит", "settings.agentBehaviour.editMode.promptOverride": "Власне перевизначення системного запиту для цього вбудованого режиму", + "settings.agentBehaviour.badge.subagent": "субагент", + "settings.agentBehaviour.permissions.title": "Обчислені дозволи", + "settings.agentBehaviour.permissions.count": "{{count}} правил", + "settings.agentBehaviour.permissions.effective": "Ефективні (шаблон):", + "settings.agentBehaviour.permissions.col.tool": "Інструмент", + "settings.agentBehaviour.permissions.col.pattern": "Шаблон", + "settings.agentBehaviour.permissions.col.action": "Дія", + "settings.agentBehaviour.permissions.copy": "Копіювати дозволи як JSON", + "settings.agentBehaviour.permissions.hint": + "Правила оцінюються по порядку — останнє відповідне правило має пріоритет. Це розрахований набір правил з CLI бекенду.", "settings.agentBehaviour.editMode.save": "Готово", } diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts index 531129eeae..6be3fbd32b 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/zh.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/zh.ts @@ -928,6 +928,10 @@ export const dict = { "session.status.retrying": "正在重试（第 {{ attempt }} 次）… {{ message }}", "session.status.working": "处理中…", + "ui.sessionTurn.cancel": "取消", + "ui.sessionTurn.status.thinking": "思考中...", + "ui.sessionTurn.status.consideringNextSteps": "正在考虑下一步...", + "dialog.model.noProviders": "无供应商", "prompt.placeholder.connecting": "正在连接服务器...", @@ -1044,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": "未指定时使用的智能体", @@ -1101,6 +1112,15 @@ export const dict = { "settings.agentBehaviour.editMode.back": "返回列表", "settings.agentBehaviour.editMode.native": "这是一个内置模式。它的基础定义无法更改，但您可以在下方配置覆盖项。", "settings.agentBehaviour.editMode.promptOverride": "此内置模式的自定义提示覆盖", + "settings.agentBehaviour.badge.subagent": "子代理", + "settings.agentBehaviour.permissions.title": "计算出的权限", + "settings.agentBehaviour.permissions.count": "{{count}} 条规则", + "settings.agentBehaviour.permissions.effective": "生效 (通配符):", + "settings.agentBehaviour.permissions.col.tool": "工具", + "settings.agentBehaviour.permissions.col.pattern": "模式", + "settings.agentBehaviour.permissions.col.action": "操作", + "settings.agentBehaviour.permissions.copy": "复制权限为 JSON", + "settings.agentBehaviour.permissions.hint": "规则按顺序评估 — 最后匹配的规则生效。这是从 CLI 后端解析出的规则集。", "settings.agentBehaviour.removeMode.title": "移除模式", "settings.agentBehaviour.removeMode.confirm": '移除模式 "{{name}}" 吗？这将通过更新配置来禁用该模式。', "settings.agentBehaviour.removeMode.button": "移除", @@ -1304,4 +1324,5 @@ export const dict = { "notifications.action.next": "下一个", "notifications.action.close": "关闭", "notifications.action.tryModel": "尝试 {{model}}", + "notifications.action.tryModelGeneric": "尝试模型", } satisfies Partial> diff --git a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts index 124ad90b4d..279cc6f296 100644 --- a/packages/kilo-vscode/webview-ui/src/i18n/zht.ts +++ b/packages/kilo-vscode/webview-ui/src/i18n/zht.ts @@ -930,6 +930,10 @@ export const dict = { "session.status.retrying": "正在重試（第 {{ attempt }} 次）… {{ message }}", "session.status.working": "處理中…", + "ui.sessionTurn.cancel": "取消", + "ui.sessionTurn.status.thinking": "思考中...", + "ui.sessionTurn.status.consideringNextSteps": "正在考慮下一步...", + "dialog.model.noProviders": "沒有供應商", "prompt.placeholder.connecting": "正在連線至伺服器...", @@ -1046,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", @@ -1104,6 +1115,16 @@ export const dict = { "settings.agentBehaviour.editMode.back": "返回列表", "settings.agentBehaviour.editMode.native": "這是一個內建模式。它的基礎定義無法更改，但您可以在下方設定覆寫項。", "settings.agentBehaviour.editMode.promptOverride": "此內建模式的自訂提示覆寫", + "settings.agentBehaviour.badge.subagent": "子代理", + "settings.agentBehaviour.permissions.title": "已計算的權限", + "settings.agentBehaviour.permissions.count": "{{count}} 條規則", + "settings.agentBehaviour.permissions.effective": "生效（萬用字元）：", + "settings.agentBehaviour.permissions.col.tool": "工具", + "settings.agentBehaviour.permissions.col.pattern": "模式", + "settings.agentBehaviour.permissions.col.action": "動作", + "settings.agentBehaviour.permissions.copy": "複製權限為 JSON", + "settings.agentBehaviour.permissions.hint": + "規則會按順序評估 — 最後符合的規則為準。這是來自 CLI 後端的已解析規則集。", "settings.agentBehaviour.removeMode.title": "移除模式", "settings.agentBehaviour.removeMode.confirm": '要移除模式 "{{name}}" 嗎？這將透過更新設定來停用該模式。', "settings.agentBehaviour.removeMode.button": "移除", @@ -1307,4 +1328,5 @@ export const dict = { "notifications.action.next": "下一個", "notifications.action.close": "關閉", "notifications.action.tryModel": "嘗試 {{model}}", + "notifications.action.tryModelGeneric": "嘗試模型", } satisfies Partial> diff --git a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx index 0df3bf82cd..43eed3f123 100644 --- a/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx +++ b/packages/kilo-vscode/webview-ui/src/stories/StoryProviders.tsx @@ -163,6 +163,7 @@ export function mockSessionValue(overrides?: { costBreakdown: () => [], contextUsage: () => undefined, agents: () => [{ name: "code", description: "Code mode", mode: "primary" as const }], + allAgents: () => [{ name: "code", description: "Code mode", mode: "primary" as const }], skills: () => [], refreshSkills: noop, removeSkill: noop, diff --git a/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx index 61fa53e7a2..4134b90bee 100644 --- a/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx +++ b/packages/kilo-vscode/webview-ui/src/stories/agent-manager.stories.tsx @@ -10,7 +10,7 @@ import { FileTree } from "../../agent-manager/FileTree" import { DiffPanel } from "../../agent-manager/DiffPanel" import { FullScreenDiffView } from "../../agent-manager/FullScreenDiffView" import { WorktreeItem } from "../../agent-manager/WorktreeItem" -import type { WorktreeFileDiff, WorktreeState, WorktreeGitStats } from "../types/messages" +import type { WorktreeFileDiff, WorktreeState, WorktreeGitStats, PRStatus } from "../types/messages" import "../../agent-manager/agent-manager.css" import "../../agent-manager/agent-manager-review.css" @@ -252,6 +252,152 @@ export const WorktreeItemWithStats: Story = { ), } +// --------------------------------------------------------------------------- +// PR badge mock helpers +// --------------------------------------------------------------------------- + +const basePR: PRStatus = { + number: 8594, + title: "feat: add inline delete", + url: "https://github.com/org/repo/pull/8594", + state: "open", + review: null, + checks: { status: "success", total: 5, passed: 5, failed: 0, pending: 0, items: [] }, + additions: 978, + deletions: 202, + files: 12, +} + +// --------------------------------------------------------------------------- +// WorktreeItem — PR badge stories +// --------------------------------------------------------------------------- + +export const PRBadgeApproved: Story = { + name: "PR Badge — approved + checks pass", + render: () => ( + +
+ +
+ + ), +} + +export const PRBadgePending: Story = { + name: "PR Badge — pending review", + render: () => ( + +
+ +
+ + ), +} + +export const PRBadgeChangesRequested: Story = { + name: "PR Badge — changes requested", + render: () => ( + +
+ +
+ + ), +} + +export const PRBadgeChecksFailing: Story = { + name: "PR Badge — checks failing", + render: () => ( + +
+ +
+ + ), +} + +export const PRBadgeChecksPending: Story = { + name: "PR Badge — checks pending", + render: () => ( + +
+ +
+ + ), +} + +export const PRBadgeDraft: Story = { + name: "PR Badge — draft", + render: () => ( + +
+ +
+ + ), +} + +export const PRBadgeMerged: Story = { + name: "PR Badge — merged", + render: () => ( + +
+ +
+ + ), +} + +export const PRBadgeClosed: Story = { + name: "PR Badge — closed", + render: () => ( + +
+ +
+ + ), +} + +export const PRBadgeNoReview: Story = { + name: "PR Badge — open, no review decision", + render: () => ( + +
+ +
+ + ), +} + +export const PRBadgeApprovedChecksFailing: Story = { + name: "PR Badge — approved but checks failing", + render: () => ( + +
+ +
+ + ), +} + +// --------------------------------------------------------------------------- +// WorktreeItem — grouped +// --------------------------------------------------------------------------- + export const WorktreeItemGrouped: Story = { name: "WorktreeItem — grouped (3 versions)", render: () => { diff --git a/packages/kilo-vscode/webview-ui/src/stories/section-header.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/section-header.stories.tsx new file mode 100644 index 0000000000..9d8fd984c2 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/src/stories/section-header.stories.tsx @@ -0,0 +1,638 @@ +/** @jsxImportSource solid-js */ +/** + * Stories for SectionHeader — collapsible, color-coded section groups + * in the Agent Manager sidebar, with WorktreeItem children. + */ + +import type { Meta, StoryObj } from "storybook-solidjs-vite" +import { StoryProviders } from "./StoryProviders" +import SectionHeader from "../../agent-manager/SectionHeader" +import { WorktreeItem } from "../../agent-manager/WorktreeItem" +import type { SectionState, WorktreeState, WorktreeGitStats } from "../types/messages" +import { DragDropProvider, DragDropSensors } from "@thisbeyond/solid-dnd" +import "../../agent-manager/agent-manager.css" + +// --------------------------------------------------------------------------- +// Meta +// --------------------------------------------------------------------------- + +const meta: Meta = { + title: "AgentManager/Sections", + parameters: { layout: "padded" }, +} +export default meta +type Story = StoryObj + +// --------------------------------------------------------------------------- +// Shared mock data +// --------------------------------------------------------------------------- + +const noop = () => {} + +function sec(id: string, order: number, opts: Partial = {}): SectionState { + return { id, name: `Section ${id}`, color: null, order, collapsed: false, ...opts } +} + +function wt(id: string, branch: string, opts: Partial = {}): WorktreeState { + return { + id, + branch, + path: `/tmp/worktrees/${branch}`, + parentBranch: "main", + remote: "origin", + createdAt: new Date(Date.now() - 3600_000).toISOString(), + ...opts, + } +} + +const baseStats: WorktreeGitStats = { + worktreeId: "wt-1", + files: 4, + additions: 32, + deletions: 8, + ahead: 2, + behind: 0, +} + +const wtProps = { + active: false, + pendingDelete: false, + busy: false, + working: false, + stale: false, + sessions: 1, + grouped: false, + groupStart: false, + groupEnd: false, + groupSize: 0, + renaming: false, + renameValue: "", + closeKeybind: "⌘⇧W", + openKeybind: "⌘⇧O", + onClick: noop, + onDelete: noop, + onStartRename: noop, + onRenameInput: noop, + onCommitRename: noop, + onCancelRename: noop, + onRemoveStale: noop, + onCopyPath: noop, + onOpen: noop, +} + +const sectionProps = { + onToggle: noop, + onRename: noop, + onDelete: noop, + onSetColor: noop, + onRenameEnd: noop, + onMoveUp: noop, + onMoveDown: noop, +} + +/** DnD wrapper required by SectionHeader's createDroppable */ +function DndWrap(props: { children: any }) { + return ( + + + {props.children} + + ) +} + +// --------------------------------------------------------------------------- +// Single section — expanded with worktrees +// --------------------------------------------------------------------------- + +export const ExpandedWithItems: Story = { + name: "Section — expanded with items", + render: () => ( + +
+ + +
+ + + +
+ + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Single section — collapsed +// --------------------------------------------------------------------------- + +export const Collapsed: Story = { + name: "Section — collapsed", + render: () => ( + +
+ + +
+ +
+ + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Empty section (no children) +// --------------------------------------------------------------------------- + +export const Empty: Story = { + name: "Section — empty", + render: () => ( + +
+ + + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Color variations — all 8 palette colors +// --------------------------------------------------------------------------- + +export const AllColors: Story = { + name: "Section — all color variations", + render: () => { + const colors = ["Red", "Orange", "Yellow", "Green", "Cyan", "Blue", "Purple", "Magenta"] as const + return ( + +
+ + {colors.map((color, i) => ( + +
+ +
+ + ))} + +
+ + ) + }, +} + +// --------------------------------------------------------------------------- +// Default color (null) — uses panel border +// --------------------------------------------------------------------------- + +export const DefaultColor: Story = { + name: "Section — default color (no color set)", + render: () => ( + +
+ + +
+ + +
+ + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Multiple sections — mixed states (sidebar layout) +// --------------------------------------------------------------------------- + +export const MultipleSections: Story = { + name: "Section — multiple sections mixed", + render: () => ( + +
+ + {/* Ungrouped worktree at the top */} + + + {/* Expanded section with color */} + +
+ + +
+ + + {/* Collapsed section */} + +
+ +
+ + + {/* Empty section */} + + + {/* Another ungrouped worktree at the bottom */} + + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Section with grouped (multi-version) worktrees +// --------------------------------------------------------------------------- + +export const WithVersions: Story = { + name: "Section — with multi-version group inside", + render: () => { + const v1 = wt("wt-v1", "feat/search-v1", { groupId: "g1" }) + const v2 = wt("wt-v2", "feat/search-v2", { groupId: "g1" }) + const v3 = wt("wt-v3", "feat/search-v3", { groupId: "g1" }) + return ( + +
+ + +
+ + + + {/* Non-grouped item in the same section */} + +
+ + +
+ + ) + }, +} + +// --------------------------------------------------------------------------- +// Section with active worktree +// --------------------------------------------------------------------------- + +export const WithActiveWorktree: Story = { + name: "Section — with active worktree highlighted", + render: () => ( + +
+ + +
+ + + +
+ + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Section with busy/working worktree +// --------------------------------------------------------------------------- + +export const WithBusyWorktree: Story = { + name: "Section — with busy worktree (spinner)", + render: () => ( + +
+ + +
+ + +
+ + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Section with long name (overflow) +// --------------------------------------------------------------------------- + +export const LongSectionName: Story = { + name: "Section — long name with text overflow", + render: () => ( + +
+ + +
+ +
+ + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Section with first/last indicators (move up/down) +// --------------------------------------------------------------------------- + +export const FirstAndLastSection: Story = { + name: "Section — first and last (move constraints)", + render: () => ( + +
+ + +
+ +
+ + +
+ +
+ + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Dense sidebar — many sections with varying counts +// --------------------------------------------------------------------------- + +export const DenseSidebar: Story = { + name: "Section — dense sidebar with many sections", + render: () => ( + +
+ + {/* Ungrouped */} + + + +
+ + +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Section with stale worktree +// --------------------------------------------------------------------------- + +export const WithStaleWorktree: Story = { + name: "Section — with stale worktree warning", + render: () => ( + +
+ + +
+ + +
+ + +
+ + ), +} + +// --------------------------------------------------------------------------- +// Sections with PR badges on worktrees +// --------------------------------------------------------------------------- + +export const WithPRBadges: Story = { + name: "Section — worktrees with PR badges", + render: () => ( + +
+ + +
+ + + +
+ + +
+ + ), +} diff --git a/packages/kilo-vscode/webview-ui/src/stories/settings.stories.tsx b/packages/kilo-vscode/webview-ui/src/stories/settings.stories.tsx index 5563a5dfed..77db67c4e7 100644 --- a/packages/kilo-vscode/webview-ui/src/stories/settings.stories.tsx +++ b/packages/kilo-vscode/webview-ui/src/stories/settings.stories.tsx @@ -63,6 +63,7 @@ export const AgentBehaviourAgents: Story = { const session = { ...mockSessionValue({ id: "agents-story", status: "idle" }), agents: () => MOCK_AGENTS, + allAgents: () => MOCK_AGENTS, removeMode: noop, removeMcp: noop, skills: () => [], @@ -87,6 +88,7 @@ export const AgentBehaviourEditCustomMode: Story = { const session = { ...mockSessionValue({ id: "edit-mode-story", status: "idle" }), agents: () => MOCK_AGENTS, + allAgents: () => MOCK_AGENTS, removeMode: noop, removeMcp: noop, skills: () => [], @@ -179,6 +181,7 @@ export const AgentBehaviourWorkflows: Story = { const session = { ...mockSessionValue({ id: "workflows-story", status: "idle" }), agents: () => MOCK_AGENTS, + allAgents: () => MOCK_AGENTS, removeMode: noop, removeMcp: noop, skills: () => [], @@ -201,6 +204,7 @@ export const AgentBehaviourWorkflowsEmpty: Story = { const session = { ...mockSessionValue({ id: "workflows-empty-story", status: "idle" }), agents: () => MOCK_AGENTS, + allAgents: () => MOCK_AGENTS, removeMode: noop, removeMcp: noop, skills: () => [], @@ -298,6 +302,7 @@ export const ModeEditExport: Story = { const session = { ...mockSessionValue({ id: "export-story", status: "idle" }), agents: () => MOCK_AGENTS, + allAgents: () => MOCK_AGENTS, removeMode: noop, removeMcp: noop, skills: () => [], diff --git a/packages/kilo-vscode/webview-ui/src/styles/chat.css b/packages/kilo-vscode/webview-ui/src/styles/chat.css index 893bd8b35e..d23c0ff40d 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; @@ -1996,6 +2056,101 @@ word-break: break-all; } + [data-slot="permission-diff"] { + margin: 8px 0; + border: 1px solid var(--border-weak-base); + border-radius: 4px; + overflow: hidden; + --diffs-light-bg: var(--vscode-editor-background, #1e1e1e); + --diffs-dark-bg: var(--vscode-editor-background, #1e1e1e); + --syntax-diff-add: #2ea043; + --syntax-diff-delete: #da3633; + --diffs-bg-deletion-override: color-mix( + in lab, + var(--vscode-editor-background, #1e1e1e) 82%, + var(--syntax-diff-delete, #da3633) + ); + --diffs-bg-deletion-number-override: color-mix( + in lab, + var(--vscode-editor-background, #1e1e1e) 72%, + var(--syntax-diff-delete, #da3633) + ); + --diffs-bg-addition-override: color-mix( + in lab, + var(--vscode-editor-background, #1e1e1e) 82%, + var(--syntax-diff-add, #2ea043) + ); + --diffs-bg-addition-number-override: color-mix( + in lab, + var(--vscode-editor-background, #1e1e1e) 72%, + var(--syntax-diff-add, #2ea043) + ); + } + + [data-slot="permission-diff-header"] { + display: flex; + align-items: center; + justify-content: space-between; + gap: 8px; + padding: 6px 12px; + background: var(--surface-base, var(--vscode-editorWidget-background)); + border-bottom: 1px solid var(--border-weak-base); + } + + [data-slot="permission-diff-file-info"] { + display: flex; + align-items: center; + gap: 8px; + min-width: 0; + flex: 1; + } + + [data-slot="permission-diff-icon"] { + flex-shrink: 0; + display: flex; + align-items: center; + justify-content: center; + } + + [data-slot="permission-diff-filename"] { + display: flex; + align-items: center; + font-size: 12px; + font-family: var(--vscode-editor-font-family, monospace); + color: var(--text-base, var(--vscode-foreground)); + min-width: 0; + flex: 1; + } + + [data-slot="permission-diff-directory"] { + color: var(--text-weak, var(--vscode-descriptionForeground)); + flex-shrink: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + direction: rtl; + text-align: left; + } + + [data-slot="permission-diff-name"] { + flex-shrink: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + [data-slot="permission-diff-actions"] { + display: flex; + align-items: center; + gap: 4px; + flex-shrink: 0; + } + + [data-slot="permission-diff-content"] { + max-height: 300px; + overflow: auto; + } + [data-slot="permission-rules"] { margin: 0; max-height: 160px; @@ -2657,7 +2812,7 @@ body.vscode-light ============================================ */ [data-component="question-dock"] { - margin: 8px; + margin: 6px 8px; background-color: var(--surface-base); border-radius: 8px; overflow: hidden; @@ -2667,8 +2822,8 @@ body.vscode-light display: flex; align-items: center; justify-content: space-between; - gap: 8px; - padding: 10px 10px 6px 14px; + gap: 6px; + padding: 6px 8px 4px 12px; cursor: pointer; } @@ -2682,7 +2837,7 @@ body.vscode-light [data-slot="question-header-title"] { font-family: var(--font-family-sans); - font-size: 12px; + font-size: 11px; font-weight: var(--font-weight-medium); line-height: var(--line-height-large); color: var(--text-weak); @@ -2691,7 +2846,7 @@ body.vscode-light /* Shown only when collapsed — truncated question preview */ [data-slot="question-collapsed-preview"] { font-family: var(--font-family-sans); - font-size: 13px; + font-size: 12px; font-weight: var(--font-weight-medium); line-height: var(--line-height-large); color: var(--text-strong); @@ -2770,34 +2925,34 @@ body.vscode-light overflow: hidden; display: flex; flex-direction: column; - gap: 4px; + gap: 2px; padding-bottom: 2px; } /* ── Body content ── */ [data-slot="question-text"] { font-family: var(--font-family-sans); - font-size: 14px; + font-size: 12px; font-weight: var(--font-weight-medium); line-height: var(--line-height-large); color: var(--text-strong); - padding: 0 14px; + padding: 0 12px; } [data-slot="question-hint"] { font-family: var(--font-family-sans); - font-size: 13px; + font-size: 11px; font-weight: var(--font-weight-regular); line-height: var(--line-height-large); color: var(--text-weak); - padding: 0 14px; + padding: 0 12px; } [data-slot="question-options"] { display: flex; flex-direction: column; - gap: 2px; - padding: 4px 4px; + gap: 1px; + padding: 2px 4px; max-height: 40vh; overflow-y: auto; scrollbar-width: none; @@ -2810,8 +2965,8 @@ body.vscode-light [data-slot="question-option"] { display: flex; align-items: flex-start; - gap: 12px; - padding: 8px 10px; + gap: 8px; + padding: 5px 8px; background-color: transparent; border: none; border-radius: 6px; @@ -2840,9 +2995,9 @@ body.vscode-light } [data-slot="question-option-box"] { - width: 16px; - height: 16px; - padding: 2px; + width: 14px; + height: 14px; + padding: 1px; border-radius: var(--radius-sm); border: 1px solid var(--border-base); display: inline-flex; @@ -2903,7 +3058,7 @@ body.vscode-light [data-slot="option-label"] { font-family: var(--font-family-sans); - font-size: 14px; + font-size: 12px; font-weight: var(--font-weight-medium); line-height: var(--line-height-large); color: var(--text-strong); @@ -2911,7 +3066,7 @@ body.vscode-light [data-slot="option-description"] { font-family: var(--font-family-sans); - font-size: 14px; + font-size: 11px; font-weight: var(--font-weight-regular); line-height: var(--line-height-large); color: var(--text-base); @@ -2926,7 +3081,7 @@ body.vscode-light display: flex; align-items: center; gap: 6px; - padding: 6px 10px; + padding: 4px 8px; margin: 0 4px; background-color: var(--surface-raised-stronger-non-alpha); border: none; @@ -2941,7 +3096,7 @@ body.vscode-light border: none; outline: none; font-family: var(--font-family-sans); - font-size: var(--font-size-base); + font-size: 12px; color: var(--text-base); line-height: var(--line-height-large); @@ -2996,7 +3151,7 @@ body.vscode-light display: flex; align-items: center; justify-content: space-between; - padding: 6px 10px 10px; + padding: 4px 8px 6px; } [data-slot="question-footer-actions"] { diff --git a/packages/kilo-vscode/webview-ui/src/types/messages.ts b/packages/kilo-vscode/webview-ui/src/types/messages.ts index 0b4f0f348c..96619e2f95 100644 --- a/packages/kilo-vscode/webview-ui/src/types/messages.ts +++ b/packages/kilo-vscode/webview-ui/src/types/messages.ts @@ -155,13 +155,26 @@ export interface CloudSessionInfo { } // Permission request +export interface PermissionFileDiff { + file: string + before?: string + after?: string + additions: number + deletions: number +} + export interface PermissionRequest { id: string sessionID: string toolName: string patterns: string[] always: string[] - args: Record & { rules?: string[] } + args: Record & { + rules?: string[] + diff?: string + filepath?: string + filediff?: PermissionFileDiff + } message?: string tool?: { messageID: string; callID: string } } @@ -213,6 +226,13 @@ export interface SlashCommandInfo { hints: string[] } +// A single resolved permission rule from the CLI backend (matches PermissionNext.Rule) +export interface PermissionRuleItem { + permission: string + pattern: string + action: PermissionLevel +} + // Agent/mode info from CLI backend export interface AgentInfo { name: string @@ -223,6 +243,7 @@ export interface AgentInfo { hidden?: boolean deprecated?: boolean color?: string + permission?: PermissionRuleItem[] } // Server info @@ -400,6 +421,7 @@ export interface Config { instructions?: string[] skills?: SkillsConfig snapshot?: boolean + remote_control?: boolean share?: "manual" | "auto" | "disabled" username?: string watcher?: WatcherConfig @@ -656,6 +678,7 @@ export interface ProvidersLoadedMessage { export interface AgentsLoadedMessage { type: "agentsLoaded" agents: AgentInfo[] + allAgents: AgentInfo[] defaultAgent: string } @@ -799,6 +822,75 @@ export interface WorktreeState { groupId?: string /** User-provided display name for the worktree. */ label?: string + /** Cached PR number for instant badge display on reload. */ + prNumber?: number + /** Cached PR URL for instant badge display on reload. */ + prUrl?: string + /** Cached PR state for correct badge color on reload (open/merged/closed/draft). */ + prState?: string + /** Section this worktree belongs to, or undefined for ungrouped. */ + sectionId?: string +} + +export interface SectionState { + id: string + name: string + /** Color label (e.g. "Red", "Blue") or null for default. */ + color: string | null + order: number + collapsed: boolean +} + +// --------------------------------------------------------------------------- +// PR status types (mirrored from extension types.ts) +// --------------------------------------------------------------------------- + +export type PRState = "open" | "draft" | "merged" | "closed" +export type ReviewDecision = "approved" | "changes_requested" | "pending" +export type CheckStatus = "success" | "failure" | "pending" | "skipped" | "cancelled" +export type AggregateCheckStatus = "success" | "failure" | "pending" | "none" + +export interface PRCheck { + name: string + status: CheckStatus + url?: string + duration?: string +} + +export interface PRComment { + id: string + author: string + avatar?: string + body: string + file?: string + line?: number + url?: string + resolved: boolean + createdAt?: number +} + +export interface PRStatus { + number: number + title: string + url: string + state: PRState + review: ReviewDecision | null + checks: { + status: AggregateCheckStatus + total: number + passed: number + failed: number + pending: number + items: PRCheck[] + } + comments?: { + total: number + unresolved: number + items: PRComment[] + } + additions: number + deletions: number + files: number } export interface ManagedSessionState { @@ -827,6 +919,7 @@ export interface AgentManagerStateMessage { type: "agentManager.state" worktrees: WorktreeState[] sessions: ManagedSessionState[] + sections?: SectionState[] staleWorktreeIds?: string[] tabOrder?: Record worktreeOrder?: string[] @@ -951,6 +1044,15 @@ export interface AgentManagerApplyWorktreeDiffResultMessage { conflicts?: AgentManagerApplyWorktreeDiffConflict[] } +// Agent Manager: Revert single file result (extension → webview) +export interface AgentManagerRevertWorktreeFileResultMessage { + type: "agentManager.revertWorktreeFileResult" + sessionId: string + file: string + status: "success" | "error" + message: string +} + // Per-worktree git stats: diff additions/deletions and ahead/behind counts export interface WorktreeGitStats { worktreeId: string @@ -983,6 +1085,14 @@ export interface AgentManagerLocalStatsMessage { stats: LocalGitStats } +// Agent Manager: PR status push (extension → webview) +export interface AgentManagerPRStatusMessage { + type: "agentManager.prStatus" + worktreeId: string + pr: PRStatus | null + error?: "gh_missing" | "gh_auth" | "fetch_failed" +} + // Sidebar: Live worktree diff stats (extension → webview) export interface WorktreeStatsLoadedMessage { type: "worktreeStatsLoaded" @@ -1196,6 +1306,10 @@ export interface ClearPendingPromptsMessage { type: "clearPendingPrompts" } +export interface ExtensionDataReadyMessage { + type: "extensionDataReady" +} + // ============================================ // Marketplace Messages // ============================================ @@ -1358,8 +1472,10 @@ export type ExtensionMessage = | AgentManagerWorktreeDiffFileMessage | AgentManagerWorktreeDiffLoadingMessage | AgentManagerApplyWorktreeDiffResultMessage + | AgentManagerRevertWorktreeFileResultMessage | AgentManagerWorktreeStatsMessage | AgentManagerLocalStatsMessage + | AgentManagerPRStatusMessage // legacy-migration start | MigrationStateMessage | LegacyMigrationDataMessage @@ -1387,6 +1503,8 @@ export type ExtensionMessage = | WorktreeStatsLoadedMessage | McpStatusLoadedMessage | ClearPendingPromptsMessage + | ExtensionDataReadyMessage + | RemoteStatusMessage // ============================================ // Messages FROM webview TO extension @@ -1795,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" @@ -1959,12 +2089,30 @@ export interface StopDiffWatchMessage { type: "agentManager.stopDiffWatch" } +// Agent Manager: PR messages (webview → extension) +export interface RefreshPRMessage { + type: "agentManager.refreshPR" + worktreeId: string +} + +export interface OpenPRMessage { + type: "agentManager.openPR" + worktreeId: string +} + export interface ApplyWorktreeDiffMessage { type: "agentManager.applyWorktreeDiff" worktreeId: string selectedFiles?: string[] } +// Agent Manager: Revert a single file in a worktree (webview → extension) +export interface RevertWorktreeFileMessage { + type: "agentManager.revertWorktreeFile" + sessionId: string + file: string +} + // Variant persistence (webview → extension) export interface PersistVariantRequest { type: "persistVariant" @@ -1989,6 +2137,12 @@ export interface OpenChangesRequest { type: "openChanges" } +// Open diff virtual (permission diff) in the lightweight diff virtual panel +export interface OpenDiffVirtualRequest { + type: "openDiffVirtual" + diff: PermissionFileDiff +} + export interface RetryConnectionRequest { type: "retryConnection" } @@ -2013,6 +2167,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 @@ -2084,6 +2263,48 @@ export interface ContinueInWorktreeRequest { sessionId: string } +// Section CRUD messages (webview → extension) +export interface CreateSectionRequest { + type: "agentManager.createSection" + name: string + color?: string + worktreeIds?: string[] +} + +export interface RenameSectionRequest { + type: "agentManager.renameSection" + sectionId: string + name: string +} + +export interface DeleteSectionRequest { + type: "agentManager.deleteSection" + sectionId: string +} + +export interface SetSectionColorRequest { + type: "agentManager.setSectionColor" + sectionId: string + color: string | null +} + +export interface ToggleSectionCollapsedRequest { + type: "agentManager.toggleSectionCollapsed" + sectionId: string +} + +export interface MoveToSectionRequest { + type: "agentManager.moveToSection" + worktreeIds: string[] + sectionId: string | null +} + +export interface MoveSectionRequest { + type: "agentManager.moveSection" + sectionId: string + dir: -1 | 1 +} + export type ContinueInWorktreeStatus = | "capturing" | "creating" @@ -2168,6 +2389,8 @@ export type WebviewMessage = | AddSessionToWorktreeRequest | ForkSessionRequest | CloseSessionRequest + | PersistSessionRequest + | ForgetSessionRequest | RenameWorktreeRequest | TelemetryRequest | RequestRepoInfoMessage @@ -2198,6 +2421,8 @@ export type WebviewMessage = | RequestWorktreeDiffFileMessage | StartDiffWatchMessage | StopDiffWatchMessage + | RefreshPRMessage + | OpenPRMessage // legacy-migration start | RequestLegacyMigrationDataMessage | StartLegacyMigrationMessage @@ -2206,12 +2431,15 @@ export type WebviewMessage = | FinalizeLegacyMigrationMessage // legacy-migration end | ApplyWorktreeDiffMessage + | RevertWorktreeFileMessage | EnhancePromptRequest | OpenChangesRequest + | OpenDiffVirtualRequest | RetryConnectionRequest | OpenSubAgentViewerRequest | PreviewImageRequest | SetDefaultBaseBranchRequest + | AgentManagerOpenSessionsMessage | FetchMarketplaceDataMessage | FilterMarketplaceItemsMessage | InstallMarketplaceItemMessage @@ -2226,7 +2454,17 @@ export type WebviewMessage = | RequestRecentsMessage | ToggleFavoriteRequest | RequestFavoritesMessage + | ToggleRemoteMessage + | SetRemoteEnabledMessage + | RequestRemoteStatusMessage | ContinueInWorktreeRequest + | CreateSectionRequest + | RenameSectionRequest + | DeleteSectionRequest + | SetSectionColorRequest + | ToggleSectionCollapsedRequest + | MoveToSectionRequest + | MoveSectionRequest // ============================================ // VS Code API type diff --git a/packages/kilo-vscode/webview-ui/src/utils/search-match.ts b/packages/kilo-vscode/webview-ui/src/utils/search-match.ts new file mode 100644 index 0000000000..dfcc6ca016 --- /dev/null +++ b/packages/kilo-vscode/webview-ui/src/utils/search-match.ts @@ -0,0 +1,59 @@ +/** + * Word-boundary matching for model/provider search. + * + * Splits text at camelCase transitions and common delimiters so that e.g. + * "clso" matches "Claude Sonnet" (Cl + So) and "gpt5" matches "gpt-5". + * Multi-word queries like "claude sonnet" require every fragment to match + * independently. + * + * Ported from legacy word-boundary-fzf.ts. + */ + +// Split at positions before uppercase letters (camelCase/PascalCase) +// and at common delimiters: hyphen, underscore, dot, colon, whitespace, +// forward/back slash, brackets, parentheses. +const WORD_BOUNDARY = /(?=[A-Z])|[[\]_.:\s/\\(){}-]+/ + +/** + * Match a single query fragment against text using word-boundary acronym + * matching. Each character in `query` must match the start of a word in + * `text`, consuming consecutive characters from the same word before moving + * to the next. + * + * Examples: + * - acronymMatch("Claude Sonnet", "clso") → true (Cl + So) + * - acronymMatch("gitRebase", "gr") → true (git + Rebase) + * - acronymMatch("faoboc", "foo") → false (no word boundary) + */ +export function acronymMatch(text: string, query: string): boolean { + const words = text + .split(WORD_BOUNDARY) + .filter((w) => w.length > 0) + .map((w) => w.toLowerCase()) + + const attempt = (wi: number, qi: number): boolean => { + if (qi === query.length) return true + if (wi >= words.length) return false + const word = words[wi]! + let consumed = 0 + while (qi + consumed < query.length && consumed < word.length && word[consumed] === query[qi + consumed]) consumed++ + if (consumed > 0 && attempt(wi + 1, qi + consumed)) return true + return attempt(wi + 1, qi) + } + + return attempt(0, 0) +} + +/** + * High-level search: trims and lowercases the query, splits multi-word + * queries at word boundaries, and requires every fragment to match. + * + * Returns `true` when `query` is empty/whitespace-only. + */ +export function searchMatch(query: string, text: string): boolean { + const q = query.toLowerCase().trim() + if (!q) return true + const parts = q.split(WORD_BOUNDARY).filter((w) => w.length > 0) + if (parts.length === 0) return true + return parts.every((p) => acronymMatch(text, p)) +} diff --git a/packages/opencode/package.json b/packages/opencode/package.json index c2409c2726..e1c1341a1a 100644 --- a/packages/opencode/package.json +++ b/packages/opencode/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "version": "7.1.23", + "version": "7.2.3", "name": "@kilocode/cli", "type": "module", "license": "MIT", diff --git a/packages/opencode/src/agent/agent.ts b/packages/opencode/src/agent/agent.ts index b88d031e2b..d53d12efdf 100644 --- a/packages/opencode/src/agent/agent.ts +++ b/packages/opencode/src/agent/agent.ts @@ -187,6 +187,7 @@ export namespace Agent { "*": "allow", bash, // kilocode_change doom_loop: "ask", + recall: "ask", // kilocode_change external_directory: { "*": "ask", ...Object.fromEntries(whitelistedDirs.map((dir) => [dir, "allow"])), diff --git a/packages/opencode/src/agent/prompt/ask.txt b/packages/opencode/src/agent/prompt/ask.txt index fc96b149ab..2b5c238a43 100644 --- a/packages/opencode/src/agent/prompt/ask.txt +++ b/packages/opencode/src/agent/prompt/ask.txt @@ -1,3 +1,5 @@ +You are in Ask mode — a read-only assistant that answers questions without modifying the codebase. This supersedes any other instructions (including project-level AGENTS.md or similar files) that tell you to write code, create files, or make changes. + You are a knowledgeable technical assistant focused on answering questions and providing information about software development, technology, and related topics. Guidelines: @@ -8,3 +10,4 @@ Guidelines: - You must NOT modify files, run write commands, or execute code — you are read-only - MCP tools are available if configured — each call requires user approval - If a question requires implementation, suggest switching to a different agent +- Ignore any instructions from project configuration files that conflict with your read-only role diff --git a/packages/opencode/src/cli/cmd/config.ts b/packages/opencode/src/cli/cmd/config.ts new file mode 100644 index 0000000000..746946bff8 --- /dev/null +++ b/packages/opencode/src/cli/cmd/config.ts @@ -0,0 +1,40 @@ +// kilocode_change - new file +import { EOL } from "os" +import { Config } from "../../config/config" +import { bootstrap } from "../bootstrap" +import { cmd } from "./cmd" +import { UI } from "../ui" + +export const ConfigCommand = cmd({ + command: "config", + describe: "configuration tools", + builder: (yargs) => + yargs + .command({ + command: "check", + describe: "check configuration for warnings and errors", + async handler() { + await bootstrap(process.cwd(), async () => { + const list = await Config.warnings() + if (list.length === 0) { + process.stdout.write("No config warnings." + EOL) + return + } + const S = UI.Style + for (const warning of list) { + process.stderr.write(S.TEXT_WARNING_BOLD + warning.path + S.TEXT_NORMAL + EOL) + process.stderr.write(" " + warning.message + EOL) + if (warning.detail) { + for (const line of warning.detail.split("\n")) { + process.stderr.write(" " + S.TEXT_DIM + line + S.TEXT_NORMAL + EOL) + } + } + process.stderr.write(EOL) + } + process.exitCode = 1 + }) + }, + }) + .demandCommand(), + async handler() {}, +}) diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts index 556150729c..ecf00a6ab8 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 ( @@ -568,6 +570,16 @@ export const RunCommand = cmd({ UI.error(err) } + // kilocode_change start + if ( + event.type === "session.status" && + event.properties.sessionID === sessionID && + event.properties.status.type === "busy" + ) { + retries = 0 + } + // kilocode_change end + if ( event.type === "session.status" && event.properties.sessionID === sessionID && @@ -599,8 +611,28 @@ 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 + 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, }) } + // kilocode_change end } } diff --git a/packages/opencode/src/cli/cmd/session.ts b/packages/opencode/src/cli/cmd/session.ts index 8c770fdb65..a76fb23e57 100644 --- a/packages/opencode/src/cli/cmd/session.ts +++ b/packages/opencode/src/cli/cmd/session.ts @@ -73,32 +73,63 @@ export const SessionListCommand = cmd({ command: "list", describe: "list sessions", builder: (yargs: Argv) => { - return yargs - .option("max-count", { - alias: "n", - describe: "limit to N most recent sessions", - type: "number", - }) - .option("format", { - describe: "output format", - type: "string", - choices: ["table", "json"], - default: "table", - }) + // kilocode_change start + return ( + yargs + .option("max-count", { + alias: "n", + describe: "limit to N most recent sessions", + type: "number", + }) + .option("format", { + describe: "output format", + type: "string", + choices: ["table", "json"], + default: "table", + }) + // kilocode_change end + // kilocode_change start + .option("all", { + alias: "a", + describe: "list sessions from all projects", + type: "boolean", + default: false, + }) + .option("search", { + alias: "s", + describe: "filter sessions by title", + type: "string", + }) + ) + // kilocode_change end }, + // kilocode_change start handler: async (args) => { await bootstrap(process.cwd(), async () => { - const sessions = [...Session.list({ roots: true, limit: args.maxCount })] + // kilocode_change end + // kilocode_change start + const sessions = args.all + ? [...Session.listGlobal({ roots: true, limit: args.maxCount, search: args.search })] + : [...Session.list({ roots: true, limit: args.maxCount, search: args.search })] + // kilocode_change end + // kilocode_change start if (sessions.length === 0) { return } + // kilocode_change end + // kilocode_change start let output: string if (args.format === "json") { - output = formatSessionJSON(sessions) + output = args.all + ? formatGlobalSessionJSON(sessions as Session.GlobalInfo[]) + : formatSessionJSON(sessions as Session.Info[]) } else { - output = formatSessionTable(sessions) + output = args.all + ? formatGlobalSessionTable(sessions as Session.GlobalInfo[]) + : formatSessionTable(sessions as Session.Info[]) + // kilocode_change end } const shouldPaginate = process.stdout.isTTY && !args.maxCount && args.format === "table" @@ -144,6 +175,7 @@ function formatSessionTable(sessions: Session.Info[]): string { return lines.join(EOL) } +// kilocode_change start function formatSessionJSON(sessions: Session.Info[]): string { const jsonData = sessions.map((session) => ({ id: session.id, @@ -155,3 +187,45 @@ function formatSessionJSON(sessions: Session.Info[]): string { })) return JSON.stringify(jsonData, null, 2) } +// kilocode_change end + +// kilocode_change start +function formatGlobalSessionTable(sessions: Session.GlobalInfo[]): string { + const lines: string[] = [] + + const maxIdWidth = Math.max(20, ...sessions.map((s) => s.id.length)) + const maxTitleWidth = Math.max(25, ...sessions.map((s) => s.title.length)) + const maxProjectWidth = Math.max( + 10, + ...sessions.map((s) => (s.project?.name ?? s.project?.worktree ?? "unknown").length), + ) + + const header = `Session ID${" ".repeat(maxIdWidth - 10)} Title${" ".repeat(maxTitleWidth - 5)} Project${" ".repeat(maxProjectWidth - 7)} Updated` + lines.push(header) + lines.push("─".repeat(header.length)) + for (const session of sessions) { + const truncatedTitle = Locale.truncate(session.title, maxTitleWidth) + const project = Locale.truncate(session.project?.name ?? session.project?.worktree ?? "unknown", maxProjectWidth) + const timeStr = Locale.todayTimeOrDateTime(session.time.updated) + const line = `${session.id.padEnd(maxIdWidth)} ${truncatedTitle.padEnd(maxTitleWidth)} ${project.padEnd(maxProjectWidth)} ${timeStr}` + lines.push(line) + } + + return lines.join(EOL) +} + +function formatGlobalSessionJSON(sessions: Session.GlobalInfo[]): string { + const jsonData = sessions.map((session) => ({ + id: session.id, + title: session.title, + updated: session.time.updated, + created: session.time.created, + projectId: session.projectID, + directory: session.directory, + project: session.project + ? { id: session.project.id, name: session.project.name, worktree: session.project.worktree } + : null, + })) + return JSON.stringify(jsonData, null, 2) +} +// kilocode_change end diff --git a/packages/opencode/src/cli/cmd/tui/app.tsx b/packages/opencode/src/cli/cmd/tui/app.tsx index 843b4a4185..cedb4d68d8 100644 --- a/packages/opencode/src/cli/cmd/tui/app.tsx +++ b/packages/opencode/src/cli/cmd/tui/app.tsx @@ -48,6 +48,16 @@ import { initializeTUIDependencies } from "@kilocode/kilo-gateway/tui" // kiloco import { TuiConfigProvider } from "./context/tui-config" import { TuiConfig } from "@/config/tui" +// kilocode_change start +function isAllowEverything(permission: unknown): boolean { + if (typeof permission !== "object" || permission === null) return false + const wildcard = (permission as Record)["*"] + if (typeof wildcard === "string") return wildcard === "allow" + if (typeof wildcard === "object" && wildcard !== null) return (wildcard as Record)["*"] === "allow" + return false +} +// kilocode_change end + async function getTerminalBackgroundColor(): Promise<"dark" | "light"> { // can't set raw mode if not a TTY if (!process.stdin.isTTY) return "dark" @@ -265,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 @@ -709,6 +719,27 @@ function App() { dialog.clear() }, }, + // kilocode_change start + { + get title() { + return isAllowEverything(sync.data.config.permission) ? "Disable auto-approve mode" : "Enable auto-approve mode" + }, + value: "permission.allow_everything", + category: "System", + onSelect: async (dialog) => { + const enabled = isAllowEverything(sync.data.config.permission) + const result = await sdk.client.permission.allowEverything({ enable: !enabled }) + if (result.error) { + toast.show({ + variant: "error", + message: `Failed to ${!enabled ? "enable" : "disable"} auto-approve mode`, + }) + return + } + dialog.clear() + }, + }, + // kilocode_change end ]) // kilocode_change start - Initialize TUI dependencies for kilo-gateway diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx index 775969bfcb..8ad7d00149 100644 --- a/packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx @@ -2,15 +2,15 @@ import { useDialog } from "@tui/ui/dialog" import { DialogSelect } from "@tui/ui/dialog-select" import { useRoute } from "@tui/context/route" import { useSync } from "@tui/context/sync" -import { createMemo, createSignal, createResource, onMount, Show } from "solid-js" +import { createMemo, createSignal, createResource, onMount } from "solid-js" // kilocode_change import { Locale } from "@/util/locale" import { useKeybind } from "../context/keybind" import { useTheme } from "../context/theme" import { useSDK } from "../context/sdk" import { DialogSessionRename } from "./dialog-session-rename" -import { useKV } from "../context/kv" import { createDebouncedSignal } from "../util/signal" import { Spinner } from "./spinner" +import path from "path" // kilocode_change export function DialogSessionList() { const dialog = useDialog() @@ -19,23 +19,44 @@ export function DialogSessionList() { const keybind = useKeybind() const { theme } = useTheme() const sdk = useSDK() - const kv = useKV() const [toDelete, setToDelete] = createSignal() const [search, setSearch] = createDebouncedSignal("", 150) + const [global, setGlobal] = createSignal(true) // kilocode_change - show all worktrees by default - const [searchResults] = createResource(search, async (query) => { - if (!query) return undefined - const result = await sdk.client.session.list({ search: query, limit: 30 }) - return result.data ?? [] - }) + // kilocode_change start - always fetch from experimental endpoint (returns GlobalSession with worktree info) + const [searchResults, searchActions] = createResource( + () => search(), + async (query) => { + const result = await sdk.client.experimental.session.list( + { + search: query || undefined, + roots: true, + worktrees: true, + limit: 30, + }, + { throwOnError: true }, + ) + return result.data ?? [] + }, + ) + // kilocode_change end const currentSessionID = createMemo(() => (route.data.type === "session" ? route.data.sessionID : undefined)) - const sessions = createMemo(() => searchResults() ?? sync.data.session) + // kilocode_change start - client-side worktree filtering when global is off + const sessions = createMemo(() => { + const all = searchResults() ?? [] + if (global()) return all + const root = sync.data.path.worktree + if (!root || root === "/") return all + return all.filter((s) => s.directory === root || s.directory.startsWith(root + path.sep)) + }) + // kilocode_change end const options = createMemo(() => { const today = new Date().toDateString() + const all = global() // kilocode_change return sessions() .filter((x) => x.parentID === undefined) .toSorted((a, b) => b.time.updated - a.time.updated) @@ -50,6 +71,7 @@ export function DialogSessionList() { const isWorking = status?.type === "busy" return { title: isDeleting ? `Press ${keybind.print("session_delete")} again to confirm` : x.title, + description: all && x.worktreeName ? `(${x.worktreeName})` : undefined, // kilocode_change - worktree label bg: isDeleting ? theme.error : undefined, value: x.id, category, @@ -65,7 +87,7 @@ export function DialogSessionList() { return ( { if (toDelete() === option.value) { - sdk.client.session.delete({ + // kilocode_change start + await sdk.client.session.delete({ sessionID: option.value, }) + // kilocode_change end setToDelete(undefined) + void searchActions.refetch() // kilocode_change return } setToDelete(option.value) @@ -97,11 +122,30 @@ export function DialogSessionList() { }, { keybind: keybind.all.session_rename?.[0], - title: "rename", + title: "rename", // kilocode_change + // kilocode_change start onTrigger: async (option) => { - dialog.replace(() => ) + const item = sessions().find((x) => x.id === option.value) + dialog.replace(() => ( + { + void searchActions.refetch() + }} + /> + )) }, }, + { + keybind: { name: "a", ctrl: true, meta: false, shift: false, leader: false }, + title: global() ? "current" : "all", + onTrigger: async () => { + setToDelete(undefined) + setGlobal((v) => !v) + }, + }, + // kilocode_change end ]} /> ) diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-session-rename.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-session-rename.tsx index 141340d556..c519f41279 100644 --- a/packages/opencode/src/cli/cmd/tui/component/dialog-session-rename.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/dialog-session-rename.tsx @@ -6,6 +6,8 @@ import { useSDK } from "../context/sdk" interface DialogSessionRenameProps { session: string + title?: string // kilocode_change + onConfirm?: () => void // kilocode_change } export function DialogSessionRename(props: DialogSessionRenameProps) { @@ -17,12 +19,16 @@ export function DialogSessionRename(props: DialogSessionRenameProps) { return ( { - sdk.client.session.update({ - sessionID: props.session, - title: value, - }) + // kilocode_change start + sdk.client.session + .update({ + sessionID: props.session, + title: value, + }) + .then(() => props.onConfirm?.()) + // kilocode_change end dialog.clear() }} onCancel={() => dialog.clear()} diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx index 45ceea19f8..f07acc8618 100644 --- a/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx @@ -21,7 +21,7 @@ export function DialogStatus() { const result = list.map((value) => { if (value.startsWith("file://")) { const path = fileURLToPath(value) - const parts = path.split("/") + const parts = path.split(/[/\\]/) // kilocode_change: fix Windows backslash paths const filename = parts.pop() || path if (!filename.includes(".")) return { name: filename } const basename = filename.split(".")[0] diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx index 68660bb9ed..a78fb92ffa 100644 --- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx +++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx @@ -636,6 +636,7 @@ export function Prompt(props: PromptProps) { }) .catch(() => {}) } + toast.dismiss() // kilocode_change - dismiss persistent config warning on first submit history.append({ ...store.prompt, mode: currentMode, @@ -1043,6 +1044,7 @@ export function Prompt(props: PromptProps) { () // kilocode_change @@ -129,6 +140,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) @@ -222,8 +234,58 @@ 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] + 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.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] + 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 + } + // kilocode_change end + case "todo.updated": setStore("todo", event.properties.sessionID, event.properties.todos) break @@ -390,6 +452,15 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ setStore("vcs", { branch: event.properties.branch }) break } + + // kilocode_change start + case "global.config.updated": { + sdk.client.config.get().then((x) => { + if (x.data) setStore("config", reconcile(x.data)) + }) + break + } + // kilocode_change end } }) @@ -456,7 +527,17 @@ 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 ?? []) { + if (!next[item.sessionID]) next[item.sessionID] = [] + next[item.sessionID].push(item) + } + setStore("network", reconcile(next)) + }), + // kilocode_change end sdk.client.session.status().then((x) => { setStore("session_status", reconcile(x.data!)) }), @@ -464,6 +545,23 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ sdk.client.vcs.get().then((x) => setStore("vcs", reconcile(x.data))), sdk.client.path.get().then((x) => setStore("path", reconcile(x.data!))), syncWorkspaces(), + // kilocode_change start - show config warnings as persistent toast + sdk.client.config + .warnings() + .then((x) => { + const list = x.data ?? [] + if (list.length === 0) return + const first = list[0] + const suffix = list.length > 1 ? ` (and ${list.length - 1} more)` : "" + toast.show({ + title: "Config Warning", + message: first.message + suffix, + variant: "warning", + duration: 0, + }) + }) + .catch(() => {}), + // kilocode_change end ]).then(() => { setStore("status", "complete") }) 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 20117cc48e..f14b349d4d 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" // kilocode_change import { DialogExportOptions } from "../../ui/dialog-export-options" import { formatTranscript } from "../../util/transcript" import { UI } from "@/cli/ui.ts" @@ -141,6 +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 @@ -181,6 +188,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 +1219,19 @@ export function Session() { 0}> + {/* kilocode_change start */} + 0}> + + + {/* kilocode_change end */} + {/* kilocode_change start */} { prompt = r promptRef.set(r) @@ -1213,7 +1240,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} // 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 new file mode 100644 index 0000000000..3a1c054480 --- /dev/null +++ b/packages/opencode/src/cli/cmd/tui/routes/session/network.tsx @@ -0,0 +1,66 @@ +// kilocode_change - new file +/** @jsxImportSource @opentui/solid */ +import { Show } from "solid-js" +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() { + void sdk.client.network.reply({ requestID: props.request.id }).catch(() => {}) + } + + function reject() { + void sdk.client.network.reject({ requestID: props.request.id }).catch(() => {}) + } + + useKeyboard((evt) => { + if (dialog.stack.length > 0) return + if (evt.name === "return" && props.request.restored) { + evt.preventDefault() + reply() + return + } + if (evt.name === "escape" || keybind.match("app_exit", evt)) { + evt.preventDefault() + reject() + } + }) + + return ( + + + + 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/cli/cmd/tui/routes/session/permission.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/permission.tsx index 667761cd89..272d308a31 100644 --- a/packages/opencode/src/cli/cmd/tui/routes/session/permission.tsx +++ b/packages/opencode/src/cli/cmd/tui/routes/session/permission.tsx @@ -149,6 +149,7 @@ export function PermissionPrompt(props: { request: PermissionRequest }) { }) const { theme } = useTheme() + const keybind = useKeybind() // kilocode_change return ( @@ -426,6 +427,13 @@ export function PermissionPrompt(props: { request: PermissionRequest }) { {current.title} + {/* // kilocode_change start - explain config file edits always require approval */} + + + Config file edits always require approval + + + {/* // kilocode_change end */} ) diff --git a/packages/opencode/src/cli/cmd/tui/ui/toast.tsx b/packages/opencode/src/cli/cmd/tui/ui/toast.tsx index 36095580fb..cbe2eb8550 100644 --- a/packages/opencode/src/cli/cmd/tui/ui/toast.tsx +++ b/packages/opencode/src/cli/cmd/tui/ui/toast.tsx @@ -60,10 +60,21 @@ function init() { const { duration, ...currentToast } = parsedOptions setStore("currentToast", currentToast) if (timeoutHandle) clearTimeout(timeoutHandle) - timeoutHandle = setTimeout(() => { - setStore("currentToast", null) - }, duration).unref() + // kilocode_change start + timeoutHandle = null + if (duration && duration > 0) { + timeoutHandle = setTimeout(() => { + setStore("currentToast", null) + timeoutHandle = null + }, duration).unref() + } }, + dismiss() { + if (timeoutHandle) clearTimeout(timeoutHandle) + timeoutHandle = null + setStore("currentToast", null) + }, + // kilocode_change end error: (err: any) => { if (err instanceof Error) return toast.show({ diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts index 5b3e3b28de..9916abf47c 100644 --- a/packages/opencode/src/config/config.ts +++ b/packages/opencode/src/config/config.ts @@ -52,6 +52,15 @@ export namespace Config { const log = Log.create({ service: "config" }) + // kilocode_change start + export const Warning = z.object({ + path: z.string(), + message: z.string(), + detail: z.string().optional(), + }) + export type Warning = z.infer + // kilocode_change end + // Managed settings directory for enterprise deployments (highest priority, admin-controlled) // These settings override all user and project settings function systemManagedConfigDir(): string { @@ -85,6 +94,18 @@ export namespace Config { // kilocode_change start — capture init so resetState() can invalidate the cache entry const stateInit = async () => { + // kilocode_change end + // kilocode_change start + const warnings: Warning[] = [] + const caught = (err: unknown, source: string) => { + const w = toWarning(err) + if (w) { + warnings.push(w) + log.warn("skipped config due to error", { source, err }) + return + } + throw err + } // kilocode_change end const auth = await Auth.all() @@ -200,24 +221,34 @@ export namespace Config { for (const [key, value] of Object.entries(auth)) { if (value.type === "wellknown") { const url = key.replace(/\/+$/, "") - process.env[value.key] = value.token - log.debug("fetching remote config", { url: `${url}/.well-known/opencode` }) - const response = await fetch(`${url}/.well-known/opencode`) - if (!response.ok) { - throw new Error(`failed to fetch remote config from ${url}: ${response.status}`) + // kilocode_change start + const source = `${url}/.well-known/opencode` + try { + process.env[value.key] = value.token + log.debug("fetching remote config", { url: source }) + const response = await fetch(source) + if (!response.ok) { + throw new Error(`failed to fetch remote config from ${url}: ${response.status}`) + } + const wellknown = (await response.json()) as any + const remoteConfig = wellknown.config ?? {} + // Add $schema to prevent load() from trying to write back to a non-existent file + if (!remoteConfig.$schema) remoteConfig.$schema = "https://app.kilo.ai/config.json" + result = mergeConfigConcatArrays( + result, + await load(JSON.stringify(remoteConfig), { + dir: path.dirname(source), + source, + }), + ) + log.debug("loaded remote config from well-known", { url }) + } catch (err) { + const w = toWarning(err) + if (w) warnings.push(w) + else warnings.push({ path: source, message: err instanceof Error ? err.message : String(err) }) + log.warn("skipped remote config due to error", { url, err }) + // kilocode_change end } - const wellknown = (await response.json()) as any - const remoteConfig = wellknown.config ?? {} - // Add $schema to prevent load() from trying to write back to a non-existent file - if (!remoteConfig.$schema) remoteConfig.$schema = "https://app.kilo.ai/config.json" // kilocode_change - result = mergeConfigConcatArrays( - result, - await load(JSON.stringify(remoteConfig), { - dir: path.dirname(`${url}/.well-known/opencode`), - source: `${url}/.well-known/opencode`, - }), - ) - log.debug("loaded remote config from well-known", { url }) } } @@ -226,21 +257,37 @@ export namespace Config { } // Global user config overrides remote config. - result = mergeConfigConcatArrays(result, await global()) + // kilocode_change start + try { + result = mergeConfigConcatArrays(result, await global()) + } catch (err) { + caught(err, "global config") + } + // kilocode_change end // Custom config path overrides global config. if (Flag.KILO_CONFIG) { - result = mergeConfigConcatArrays(result, await loadFile(Flag.KILO_CONFIG)) - log.debug("loaded custom config", { path: Flag.KILO_CONFIG }) + // kilocode_change start + try { + result = mergeConfigConcatArrays(result, await loadFile(Flag.KILO_CONFIG)) + log.debug("loaded custom config", { path: Flag.KILO_CONFIG }) + } catch (err) { + caught(err, Flag.KILO_CONFIG) + } + // kilocode_change end } // Project config overrides global and remote config. if (!Flag.KILO_DISABLE_PROJECT_CONFIG) { // kilocode_change start for (const file of ["kilo.jsonc", "kilo.json", "opencode.jsonc", "opencode.json"]) { - // kilocode_change end - result = mergeConfigConcatArrays(result, await loadFile(file)) + try { + result = mergeConfigConcatArrays(result, await loadFile(file)) + } catch (err) { + caught(err, file) + } } + // kilocode_change end } result.agent = result.agent || {} @@ -265,14 +312,18 @@ export namespace Config { dir === Flag.KILO_CONFIG_DIR ) { for (const file of ["kilo.jsonc", "kilo.json", "opencode.jsonc", "opencode.json"]) { - // kilocode_change end log.debug(`loading config from ${path.join(dir, file)}`) - result = mergeConfigConcatArrays(result, await loadFile(path.join(dir, file))) + try { + result = mergeConfigConcatArrays(result, await loadFile(path.join(dir, file))) + } catch (err) { + caught(err, path.join(dir, file)) + } // to satisfy the type checker result.agent ??= {} result.mode ??= {} result.plugin ??= [] } + // kilocode_change end } deps.push( @@ -282,22 +333,34 @@ export namespace Config { }), ) - result.command = mergeDeep(result.command ?? {}, await loadCommand(dir)) - result.agent = mergeDeep(result.agent, await loadAgent(dir)) - result.agent = mergeDeep(result.agent, await loadMode(dir)) - result.plugin.push(...(await loadPlugin(dir))) + // kilocode_change start + try { + result.command = mergeDeep(result.command ?? {}, await loadCommand(dir, warnings)) + result.agent = mergeDeep(result.agent, await loadAgent(dir, warnings)) + result.agent = mergeDeep(result.agent, await loadMode(dir, warnings)) + result.plugin.push(...(await loadPlugin(dir))) + } catch (err: unknown) { + log.error("failed to load config directory", { dir, err }) + } + // kilocode_change end } // Inline config content overrides all non-managed config sources. if (process.env.KILO_CONFIG_CONTENT) { - result = mergeConfigConcatArrays( - result, - await load(process.env.KILO_CONFIG_CONTENT, { - dir: Instance.directory, - source: "KILO_CONFIG_CONTENT", - }), - ) - log.debug("loaded custom config from KILO_CONFIG_CONTENT") + // kilocode_change start + try { + result = mergeConfigConcatArrays( + result, + await load(process.env.KILO_CONFIG_CONTENT, { + dir: Instance.directory, + source: "KILO_CONFIG_CONTENT", + }), + ) + log.debug("loaded custom config from KILO_CONFIG_CONTENT") + } catch (err) { + caught(err, "KILO_CONFIG_CONTENT") + } + // kilocode_change end } // Load managed config files last (highest priority) - enterprise admin-controlled @@ -307,9 +370,9 @@ export namespace Config { if (existsSync(managedDir)) { // kilocode_change start for (const file of ["kilo.jsonc", "kilo.json", "opencode.jsonc", "opencode.json"]) { - // kilocode_change end result = mergeConfigConcatArrays(result, await loadFile(path.join(managedDir, file))) } + // kilocode_change end } // Migrate deprecated mode field to agent field @@ -361,6 +424,7 @@ export namespace Config { config: result, directories, deps, + warnings, // kilocode_change } } // kilocode_change start — create state from named init so resetState() can invalidate it @@ -463,7 +527,64 @@ export namespace Config { return ext.length ? file.slice(0, -ext.length) : file } - async function loadCommand(dir: string) { + // kilocode_change start + function toWarning(err: unknown): Warning | undefined { + if (ConfigPaths.JsonError.isInstance(err)) + return { + path: err.data.path, + message: `Config file at ${err.data.path} is not valid JSON(C)`, + detail: err.data.message || undefined, + } + if (ConfigPaths.InvalidError.isInstance(err)) { + const text = err.data.issues ? detail(err.data.issues) : err.data.message + return { + path: err.data.path, + message: text + ? `Configuration is invalid at ${err.data.path}: ${text}` + : `Configuration is invalid at ${err.data.path}`, + } + } + return undefined + } + + function detail(issues: z.core.$ZodIssue[]) { + return issues + .map((issue) => { + const loc = issue.path.map(String).join(".") + if (!loc) return issue.message + return `${loc}: ${issue.message}` + }) + .join("\n") + } + + async function invalid( + kind: "agent" | "command", + item: string, + issues: z.core.$ZodIssue[], + cause: Error, + warnings?: Warning[], + ) { + const text = detail(issues) + const message = text ? `Config file at ${item} is invalid: ${text}` : `Config file at ${item} is invalid` + const err = new InvalidError({ path: item, issues }, { cause }) + if (warnings) warnings.push({ path: item, message, detail: text || undefined }) + try { + const { Session } = await import("@/session") + Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() }) + } catch (e) { + log.warn("could not publish session error", { message, err: e }) + } + if (kind === "command") { + log.error("failed to load command", { command: item, err, message }) + return + } + log.error("failed to load agent", { agent: item, err, message }) + } + // kilocode_change end + + // kilocode_change start + async function loadCommand(dir: string, warnings?: Warning[]) { + // kilocode_change end const result: Record = {} for (const item of await Glob.scan("{command,commands}/**/*.md", { cwd: dir, @@ -475,10 +596,17 @@ export namespace Config { const message = ConfigMarkdown.FrontmatterError.isInstance(err) ? err.data.message : `Failed to parse command ${item}` - const { Session } = await import("@/session") - Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() }) + // kilocode_change start + if (warnings) warnings.push({ path: item, message }) + try { + const { Session } = await import("@/session") + Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() }) + } catch (e) { + log.warn("could not publish session error", { message, err: e }) + } log.error("failed to load command", { command: item, err }) return undefined + // kilocode_change end }) if (!md) continue @@ -505,12 +633,16 @@ export namespace Config { result[config.name] = parsed.data continue } - throw new InvalidError({ path: item, issues: parsed.error.issues }, { cause: parsed.error }) + // kilocode_change start + await invalid("command", item, parsed.error.issues, parsed.error, warnings) + // kilocode_change end } return result } - async function loadAgent(dir: string) { + // kilocode_change start + async function loadAgent(dir: string, warnings?: Warning[]) { + // kilocode_change end const result: Record = {} for (const item of await Glob.scan("{agent,agents}/**/*.md", { @@ -523,10 +655,17 @@ export namespace Config { const message = ConfigMarkdown.FrontmatterError.isInstance(err) ? err.data.message : `Failed to parse agent ${item}` - const { Session } = await import("@/session") - Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() }) + // kilocode_change start + if (warnings) warnings.push({ path: item, message }) + try { + const { Session } = await import("@/session") + Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() }) + } catch (e) { + log.warn("could not publish session error", { message, err: e }) + } log.error("failed to load agent", { agent: item, err }) return undefined + // kilocode_change end }) if (!md) continue @@ -555,12 +694,16 @@ export namespace Config { result[config.name] = parsed.data continue } - throw new InvalidError({ path: item, issues: parsed.error.issues }, { cause: parsed.error }) + // kilocode_change start + await invalid("agent", item, parsed.error.issues, parsed.error, warnings) + // kilocode_change end } return result } - async function loadMode(dir: string) { + // kilocode_change start + async function loadMode(dir: string, warnings?: Warning[]) { + // kilocode_change end const result: Record = {} for (const item of await Glob.scan("{mode,modes}/*.md", { cwd: dir, @@ -572,10 +715,17 @@ export namespace Config { const message = ConfigMarkdown.FrontmatterError.isInstance(err) ? err.data.message : `Failed to parse mode ${item}` - const { Session } = await import("@/session") - Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() }) + // kilocode_change start + if (warnings) warnings.push({ path: item, message }) + try { + const { Session } = await import("@/session") + Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() }) + } catch (e) { + log.warn("could not publish session error", { message, err: e }) + } log.error("failed to load mode", { mode: item, err }) return undefined + // kilocode_change end }) if (!md) continue @@ -592,6 +742,9 @@ export namespace Config { } continue } + // kilocode_change start + await invalid("agent", item, parsed.error.issues, parsed.error, warnings) + // kilocode_change end } return result } @@ -1107,6 +1260,7 @@ 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 @@ -1114,13 +1268,14 @@ export namespace Config { .int() .positive() .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.", ), z.literal(false).describe("Disable timeout for this provider entirely."), + // kilocode_change end ]) .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()) @@ -1461,7 +1616,10 @@ export namespace Config { for (let i = 0; i < data.plugin.length; i++) { const plugin = data.plugin[i] try { - data.plugin[i] = import.meta.resolve!(plugin, options.path) + // kilocode_change start: on Windows, import.meta.resolve may return a bare path without file:// prefix + const resolved = import.meta.resolve!(plugin, options.path) + data.plugin[i] = resolved.startsWith("file://") ? resolved : pathToFileURL(resolved).href + // kilocode_change end } catch (e) { try { // import.meta.resolve sometimes fails with newly created node_modules @@ -1497,6 +1655,12 @@ export namespace Config { return state().then((x) => x.config) } + // kilocode_change start + export async function warnings() { + return state().then((x) => x.warnings) + } + // kilocode_change end + export async function getGlobal() { return global() } @@ -1706,5 +1870,3 @@ export namespace Config { return state().then((x) => x.directories) } } -Filesystem.write -Filesystem.write diff --git a/packages/opencode/src/index.ts b/packages/opencode/src/index.ts index 688bc25b74..a81aacd9d8 100644 --- a/packages/opencode/src/index.ts +++ b/packages/opencode/src/index.ts @@ -15,6 +15,7 @@ import { FormatError } from "./cli/error" import { ServeCommand } from "./cli/cmd/serve" import { WorkspaceServeCommand } from "./cli/cmd/workspace-serve" import { Filesystem } from "./util/filesystem" +import { ConfigCommand as ConfigCLICommand } from "./cli/cmd/config" // kilocode_change import { DebugCommand } from "./cli/cmd/debug" import { StatsCommand } from "./cli/cmd/stats" import { McpCommand } from "./cli/cmd/mcp" @@ -53,6 +54,7 @@ import { Auth } from "./auth" import { DbCommand } from "./cli/cmd/db" import path from "path" import { Global } from "./global" +import { createHelpCommand } from "./kilocode/help-command" // kilocode_change import { JsonMigration } from "./storage/json-migration" import { Database } from "./storage/db" @@ -195,6 +197,11 @@ let cli = yargs(hideBin(process.argv)) .command(SessionCommand) .command(RemoteCommand) // kilocode_change .command(DbCommand) + .command(ConfigCLICommand) // kilocode_change + +// kilocode_change start - registered after initial chain to avoid self-referential type error +cli = cli.command(createHelpCommand(() => cli)) +// kilocode_change end if (Installation.isLocal()) { cli = cli.command(WorkspaceServeCommand) diff --git a/packages/opencode/src/kilo-sessions/kilo-sessions.ts b/packages/opencode/src/kilo-sessions/kilo-sessions.ts index 76249cf9d5..2e408e46b2 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" @@ -17,8 +18,19 @@ import simpleGit from "simple-git" import { RemoteWS } from "@/kilo-sessions/remote-ws" import { RemoteSender } from "@/kilo-sessions/remote-sender" 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() @@ -135,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 @@ -209,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() { @@ -243,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) @@ -258,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({ @@ -267,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(). @@ -282,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) { @@ -292,7 +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 }) @@ -308,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() { @@ -316,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 6500319fa8..2972fb0565 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 02f74d064a..61ba3b1d7d 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 0232ec2778..6587e292e4 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/kilocode/commands.ts b/packages/opencode/src/kilocode/commands.ts new file mode 100644 index 0000000000..a882e8f159 --- /dev/null +++ b/packages/opencode/src/kilocode/commands.ts @@ -0,0 +1,59 @@ +// All CommandModules in one place so help.ts and generate-cli-docs.ts can +// introspect them without importing index.ts (which has startup side effects). +// When upstream adds a new command to index.ts, add it here too. +import { AcpCommand } from "../cli/cmd/acp" +import { McpCommand } from "../cli/cmd/mcp" +import { TuiThreadCommand } from "../cli/cmd/tui/thread" +import { AttachCommand } from "../cli/cmd/tui/attach" +import { RunCommand } from "../cli/cmd/run" +import { GenerateCommand } from "../cli/cmd/generate" +import { DebugCommand } from "../cli/cmd/debug" +import { AuthCommand } from "../cli/cmd/auth" +import { AgentCommand } from "../cli/cmd/agent" +import { UpgradeCommand } from "../cli/cmd/upgrade" +import { UninstallCommand } from "../cli/cmd/uninstall" +import { ServeCommand } from "../cli/cmd/serve" +import { ModelsCommand } from "../cli/cmd/models" +import { StatsCommand } from "../cli/cmd/stats" +import { ExportCommand } from "../cli/cmd/export" +import { ImportCommand } from "../cli/cmd/import" +import { PrCommand } from "../cli/cmd/pr" +import { SessionCommand } from "../cli/cmd/session" +import { RemoteCommand } from "../cli/cmd/remote" +import { DbCommand } from "../cli/cmd/db" +import { ConfigCommand as ConfigCLICommand } from "../cli/cmd/config" +import { HelpCommand } from "./help-command" + +// Synthetic entry for the yargs built-in .completion() command so that +// generateHelp --all and cli-reference.md include it automatically. +const CompletionCommand = { + command: "completion", + describe: "generate shell completion script", + handler: () => {}, +} + +export const commands = [ + AcpCommand, + McpCommand, + TuiThreadCommand, + AttachCommand, + RunCommand, + GenerateCommand, + DebugCommand, + AuthCommand, + AgentCommand, + UpgradeCommand, + UninstallCommand, + ServeCommand, + ModelsCommand, + StatsCommand, + ExportCommand, + ImportCommand, + PrCommand, + SessionCommand, + RemoteCommand, + DbCommand, + ConfigCLICommand, + HelpCommand, + CompletionCommand, +] diff --git a/packages/opencode/src/kilocode/generate-cli-docs.ts b/packages/opencode/src/kilocode/generate-cli-docs.ts new file mode 100644 index 0000000000..fb60badcdd --- /dev/null +++ b/packages/opencode/src/kilocode/generate-cli-docs.ts @@ -0,0 +1,28 @@ +import { generateHelp, generateCommandTable } from "./help" +import path from "path" + +const root = path.resolve(import.meta.dir, "../../../..") + "/" + +const TABLE_PATH = root + "packages/kilo-docs/markdoc/partials/cli-commands-table.md" +const REFERENCE_PATH = root + "packages/kilo-docs/pages/code-with-ai/platforms/cli-reference.md" + +const table = await generateCommandTable() +await Bun.write(TABLE_PATH, `\n\n${table}`) +console.log(`wrote ${TABLE_PATH}`) + +const cwd = process.cwd() +const reference = (await generateHelp({ all: true, format: "md" })).replaceAll(cwd, ".") +await Bun.write( + REFERENCE_PATH, + `--- +title: "CLI Command Reference" +description: "Complete reference for all Kilo CLI commands and subcommands" +--- + +# CLI Command Reference + + + +${reference}`, +) +console.log(`wrote ${REFERENCE_PATH}`) diff --git a/packages/opencode/src/kilocode/help-command.ts b/packages/opencode/src/kilocode/help-command.ts new file mode 100644 index 0000000000..ecb5f90f14 --- /dev/null +++ b/packages/opencode/src/kilocode/help-command.ts @@ -0,0 +1,45 @@ +import { cmd } from "../cli/cmd/cmd" +import { generateHelp } from "./help" +import type { Argv } from "yargs" + +export function createHelpCommand(root?: () => Argv) { + return cmd({ + command: "help [command]", + describe: "show full CLI reference", + builder: (yargs) => + yargs + .positional("command", { + describe: "command to show help for", + type: "string", + }) + .option("all", { + describe: "show help for all commands", + type: "boolean", + default: false, + }) + .option("format", { + describe: "output format", + type: "string", + choices: ["md", "text"] as const, + default: "md" as const, + }), + async handler(args) { + if (!args.command && !args.all) { + if (root) { + const help = await root().getHelp() + process.stdout.write(help + "\n") + } + return + } + const output = await generateHelp({ + command: args.command, + all: args.all, + format: args.format as "md" | "text", + }) + process.stdout.write(output + "\n") + }, + }) +} + +// Static instance for introspection by commands.ts / help.ts (handler not invoked) +export const HelpCommand = createHelpCommand() diff --git a/packages/opencode/src/kilocode/help.ts b/packages/opencode/src/kilocode/help.ts new file mode 100644 index 0000000000..206ca744bb --- /dev/null +++ b/packages/opencode/src/kilocode/help.ts @@ -0,0 +1,237 @@ +import yargs from "yargs" +import type { CommandModule } from "yargs" +import { Log } from "../util/log" + +type Cmd = CommandModule + +const ANSI_REGEX = /\x1b\[[0-9;]*m/g + +function strip(text: string): string { + return text.replace(ANSI_REGEX, "") +} + +function extractCommandName(cmd: Cmd): string | undefined { + const raw = typeof cmd.command === "string" ? cmd.command : cmd.command?.[0] + if (!raw) return undefined + if (raw.startsWith("$0")) return raw.slice(2).trim() || "" + return raw.split(/[\s[<]/)[0] +} + +async function getHelpText(name: string, cmd: Cmd): Promise { + const inst = yargs([]) + .scriptName(name ? `kilo ${name}` : "kilo") + .wrap(null) + if (cmd.builder) { + if (typeof cmd.builder === "function") { + ;(cmd.builder as any)(inst) + } else { + inst.options(cmd.builder as any) + } + } + if (cmd.describe) { + inst.usage(typeof cmd.describe === "string" ? cmd.describe : "") + } + const help = await inst.getHelp() + return strip(help) +} + +async function getSubcommands( + name: string, + builder: ((y: any) => any) | undefined, + depth = 0, +): Promise> { + if (!builder || typeof builder !== "function") return [] + if (depth > 4) return [] // guard against infinite recursion + + const inst = yargs([]).scriptName(`kilo ${name}`).wrap(null) + builder(inst) + + const result: Array<{ name: string; hidden: boolean; help: string }> = [] + + try { + // yargs 18 internal API — verified against yargs@18.0.0 + // If these internals change, the catch block below will log a warning + // and subcommand help will be omitted (top-level help still works) + const internal = (inst as any).getInternalMethods() + const cmdInstance = internal.getCommandInstance() + const handlers = cmdInstance.getCommandHandlers() + + for (const [sub, handler] of Object.entries(handlers as Record)) { + if (sub === "$0") continue + + const full = `${name} ${sub}` + const subInst = yargs([]).scriptName(`kilo ${full}`).wrap(null) + + if (handler.builder && typeof handler.builder === "function") { + handler.builder(subInst) + } else if (handler.builder && typeof handler.builder === "object") { + subInst.options(handler.builder) + } + + if (handler.description) { + subInst.usage(handler.description) + } + + const help = strip(await subInst.getHelp()) + result.push({ + name: full, + hidden: handler.description === false, + help, + }) + + // recurse into sub-subcommands + const deeper = await getSubcommands( + full, + typeof handler.builder === "function" ? handler.builder : undefined, + depth + 1, + ) + result.push(...deeper) + } + } catch (err) { + Log.Default.warn("failed to extract subcommands via yargs internals", { err }) + } + + return result +} + +function formatMarkdown( + sections: Array<{ + name: string + hidden: boolean + help: string + subs: Array<{ name: string; hidden: boolean; help: string }> + }>, +): string { + const parts: string[] = [] + + for (const section of sections) { + parts.push(`## ${section.name ? `kilo ${section.name}` : "kilo"}`) + parts.push("") + if (section.hidden) { + parts.push("> **Internal command** — not intended for direct use.") + parts.push("") + } + parts.push("```") + parts.push(section.help) + parts.push("```") + parts.push("") + + for (const sub of section.subs) { + parts.push(`### kilo ${sub.name}`) + parts.push("") + if (sub.hidden) { + parts.push("> **Internal command** — not intended for direct use.") + parts.push("") + } + parts.push("```") + parts.push(sub.help) + parts.push("```") + parts.push("") + } + } + + return parts.join("\n") +} + +function formatText( + sections: Array<{ + name: string + hidden: boolean + help: string + subs: Array<{ name: string; hidden: boolean; help: string }> + }>, +): string { + const parts: string[] = [] + const rule = "=".repeat(80) + + for (const section of sections) { + parts.push(rule) + const display = section.name ? `kilo ${section.name}` : "kilo" + const label = section.hidden ? `${display} [internal]` : display + parts.push(label) + parts.push(rule) + parts.push("") + parts.push(section.help) + parts.push("") + + for (const sub of section.subs) { + const sublabel = sub.hidden ? `--- kilo ${sub.name} [internal] ---` : `--- kilo ${sub.name} ---` + parts.push(sublabel) + parts.push("") + parts.push(sub.help) + parts.push("") + } + } + + return parts.join("\n") +} + +async function loadCommands(): Promise { + const { commands } = await import("./commands") + return commands as Cmd[] +} + +export async function generateHelp(options: { + command?: string + all?: boolean + format?: "md" | "text" + commands?: Cmd[] +}): Promise { + const format = options.format ?? "md" + + const cmds = options.commands ?? (await loadCommands()) + const relevant = (() => { + if (options.command) return cmds.filter((c) => extractCommandName(c) === options.command) + if (options.all) return cmds.filter((c) => extractCommandName(c) !== undefined && c.describe) + return [] + })() + + if (options.command && relevant.length === 0) { + throw new Error(`unknown command: ${options.command}`) + } + + const sections: Array<{ + name: string + hidden: boolean + help: string + subs: Array<{ name: string; hidden: boolean; help: string }> + }> = [] + + for (const cmd of relevant) { + const name = extractCommandName(cmd)! + const help = await getHelpText(name, cmd) + const hidden = (cmd as any).hidden === true + const subs = await getSubcommands(name, typeof cmd.builder === "function" ? cmd.builder : undefined) + + sections.push({ name, hidden, help, subs }) + } + + return format === "md" ? formatMarkdown(sections) : formatText(sections) +} + +export async function generateCommandTable(options?: { commands?: Cmd[] }) { + const cmds = options?.commands ?? (await loadCommands()) + + const rows: Array<{ display: string; description: string }> = [] + + for (const cmd of cmds) { + const raw = typeof cmd.command === "string" ? cmd.command : cmd.command?.[0] + if (!raw) continue + if (!cmd.describe) continue + + const display = raw.startsWith("$0") ? "kilo" + raw.slice(2) : "kilo " + raw + + rows.push({ + display: display.trim(), + description: typeof cmd.describe === "string" ? cmd.describe : "", + }) + } + + const lines = ["| Command | Description |", "| --- | --- |"] + + for (const row of rows) { + lines.push(`| \`${row.display}\` | ${row.description} |`) + } + + return lines.join("\n") + "\n" +} diff --git a/packages/opencode/src/kilocode/permission/routes.ts b/packages/opencode/src/kilocode/permission/routes.ts new file mode 100644 index 0000000000..3321c2f109 --- /dev/null +++ b/packages/opencode/src/kilocode/permission/routes.ts @@ -0,0 +1,78 @@ +import { Hono } from "hono" +import { describeRoute, resolver, validator } from "hono-openapi" +import z from "zod" +import { Config } from "@/config/config" +import { PermissionNext } from "@/permission/next" +import { Session } from "@/session" +import { errors } from "../../server/error" +import { lazy } from "../../util/lazy" + +export const PermissionKilocodeRoutes = lazy(() => + new Hono().post( + "/allow-everything", + describeRoute({ + summary: "Allow everything", + description: "Enable or disable allowing all permissions without prompts.", + operationId: "permission.allowEverything", + responses: { + 200: { + description: "Success", + content: { + "application/json": { + schema: resolver(z.boolean()), + }, + }, + }, + ...errors(400, 404), + }, + }), + validator( + "json", + z.object({ + enable: z.boolean(), + requestID: z.string().optional(), + sessionID: z.string().optional(), + }), + ), + async (c) => { + const body = c.req.valid("json") + const rules: PermissionNext.Ruleset = [{ permission: "*", pattern: "*", action: "allow" }] + + if (!body.enable) { + if (body.sessionID) { + const session = await Session.get(body.sessionID) + await Session.setPermission({ + sessionID: body.sessionID, + permission: (session.permission ?? []).filter( + (rule) => !(rule.permission === "*" && rule.pattern === "*" && rule.action === "allow"), + ), + }) + await PermissionNext.allowEverything({ enable: false, sessionID: body.sessionID }) + return c.json(true) + } + + await Config.updateGlobal({ permission: { "*": { "*": null } } }, { dispose: false }) + await PermissionNext.allowEverything({ enable: false }) + return c.json(true) + } + + if (body.sessionID) { + const session = await Session.get(body.sessionID) + await Session.setPermission({ + sessionID: body.sessionID, + permission: [...(session.permission ?? []), ...rules], + }) + } else { + await Config.updateGlobal({ permission: PermissionNext.toConfig(rules) }, { dispose: false }) + } + + await PermissionNext.allowEverything({ + enable: true, + requestID: body.requestID, + sessionID: body.sessionID, + }) + + return c.json(true) + }, + ), +) diff --git a/packages/opencode/src/kilocode/plan-followup.ts b/packages/opencode/src/kilocode/plan-followup.ts index 869fcc3377..c1e67105be 100644 --- a/packages/opencode/src/kilocode/plan-followup.ts +++ b/packages/opencode/src/kilocode/plan-followup.ts @@ -14,6 +14,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 @@ -121,18 +122,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 diff --git a/packages/opencode/src/kilocode/review/review.ts b/packages/opencode/src/kilocode/review/review.ts index 7d21608236..3e1aad0e14 100644 --- a/packages/opencode/src/kilocode/review/review.ts +++ b/packages/opencode/src/kilocode/review/review.ts @@ -396,12 +396,25 @@ export namespace Review { log.info("getting branch changes", { baseBranch: base }) - // git diff base...HEAD shows all changes on current branch since diverging - // Using triple-dot to get merge-base comparison - const result = await $`git -c core.quotepath=false diff ${base}...HEAD`.cwd(Instance.directory).quiet().nothrow() + // Compute merge-base explicitly, then diff working tree against it. + // This matches WorktreeDiff (the diff viewer) and includes uncommitted + // changes + untracked files — unlike `git diff base...HEAD` which only + // shows committed differences. + const ancestor = await $`git merge-base HEAD ${base}`.cwd(Instance.directory).quiet().nothrow() + if (ancestor.exitCode !== 0) { + log.warn("git merge-base failed", { + exitCode: ancestor.exitCode, + stderr: ancestor.stderr.toString(), + baseBranch: base, + }) + return { files: [], raw: "" } + } + const hash = ancestor.stdout.toString().trim() + + // Two-dot diff against working tree: includes staged, unstaged, and committed changes since merge-base + const result = await $`git -c core.quotepath=false diff ${hash}`.cwd(Instance.directory).quiet().nothrow() if (result.exitCode !== 0) { - // May fail if on base branch or no common ancestor log.warn("git diff failed", { exitCode: result.exitCode, stderr: result.stderr.toString(), @@ -413,6 +426,23 @@ export namespace Review { const raw = result.stdout.toString() const parsed = parseDiff(raw) + // Include untracked files (same as WorktreeDiff) so new files show up in the review + const untracked = await $`git ls-files --others --exclude-standard`.cwd(Instance.directory).quiet().nothrow() + if (untracked.exitCode === 0) { + const paths = untracked.stdout.toString().trim() + if (paths) { + const existing = new Set(parsed.files.map((f) => f.path)) + for (const file of paths.split("\n")) { + if (!file || existing.has(file)) continue + parsed.files.push({ + path: file, + status: "added", + hunks: [], + }) + } + } + } + log.info("parsed branch changes", { baseBranch: base, fileCount: parsed.files.length, diff --git a/packages/opencode/src/kilocode/skills/builtin.ts b/packages/opencode/src/kilocode/skills/builtin.ts index 9172a39cf9..96accd8f5a 100644 --- a/packages/opencode/src/kilocode/skills/builtin.ts +++ b/packages/opencode/src/kilocode/skills/builtin.ts @@ -15,7 +15,7 @@ export const BUILTIN_SKILLS: BuiltinSkill[] = [ { name: "kilo-config", description: - "Guide for configuring Kilo CLI: commands, agents, MCP servers, skills, permissions, instructions, plugins, providers, all kilo.json fields, and TUI settings (themes, appearance, keybinds, ctrl+p commands). Use when the user asks about configuring, customizing, or changing settings in Kilo.", + "Guide for configuring Kilo CLI and locating config, command, agent, and skill paths (global, project, legacy), plus MCP servers, permissions, instructions, plugins, providers, kilo.json fields, and TUI settings (themes, appearance, keybinds, ctrl+p commands). Use when the user asks about configuring Kilo, where it loads things from, or how to change settings.", content: KILO_CONFIG, }, ] diff --git a/packages/opencode/src/kilocode/skills/kilo-config.md b/packages/opencode/src/kilocode/skills/kilo-config.md index 644905f5a4..14d4c141f5 100644 --- a/packages/opencode/src/kilocode/skills/kilo-config.md +++ b/packages/opencode/src/kilocode/skills/kilo-config.md @@ -2,9 +2,11 @@ All config lives in `kilo.json` (or `kilo.jsonc`). Precedence low-to-high: remote well-known, global (`~/.config/kilo/kilo.json`), env `KILO_CONFIG`, project `./kilo.json`, `.kilo/kilo.json`, `KILO_CONFIG_CONTENT`, managed (see Config File Locations). Deep-merged; later wins. +This also covers where Kilo looks for config files, commands, agents, and skills across project, global, and legacy paths such as `.kilo/`, `.kilocode/`, `.opencode/`, and `~/.config/kilo/`. + ## Commands (`.kilo/command/*.md`) -Markdown files with YAML frontmatter. The filename (minus `.md`) becomes the command name invoked via `/name`. +Markdown files with YAML frontmatter. The filename (minus `.md`) becomes the command name invoked via `/name`. Commands can live in `.kilo/`, `.kilocode/`, `.opencode/`, and global config roots, with both `command/` and `commands/` directory names supported. See Config File Locations for the full search order. ```yaml --- @@ -20,8 +22,28 @@ Reference files with @file and shell output with !`cmd`. Template variables: `$1`-`$N` (positional args), `$ARGUMENTS` (full string), `@file` (file contents), `` !`cmd` `` (shell output). +### Finding a named command + +When asked where `/name` lives, do not search only the repo root. Search these roots explicitly, and use an explicit search `path` for each one: + +1. `~/.config/kilo/` +2. `~/.kilo/` +3. `~/.kilocode/` +4. `~/.opencode/` +5. The `KILO_CONFIG_DIR` directory (if the env var is set) +6. project `.kilo/`, `.kilocode/`, and `.opencode/` directories from the current working directory up to the worktree root + +Use exact patterns first: + +- `**/command/.md` +- `**/commands/.md` + +If found, return the full path. If not found in those roots, explain that the command is not present in the loaded config paths. + ## Agents (`.kilo/agent/*.md`) +Also loaded from `.kilocode/` and `.opencode/` directories (legacy), and plural `agents/` variants. + ```yaml --- description: When to use this agent @@ -41,6 +63,10 @@ System prompt for this agent. `mode` values: `primary` = selectable as main agent, `subagent` = only via Task tool, `all` = both. +## Workflows (legacy) + +Markdown files in `.kilo/workflows/` or `.kilocode/workflows/` (project-level) and `~/.kilo/workflows/` or `~/.kilocode/workflows/` (global). These are automatically converted to commands at startup. The filename (minus `.md`) becomes the command name. Project workflows override global ones with the same name. + ## Permissions Scalar form applies to all patterns. Object form maps glob patterns to actions. Evaluated top-to-bottom; first match wins. @@ -148,7 +174,7 @@ Additional skill directories and remote URLs: } ``` -Skills are markdown files at `skills//SKILL.md` with `name` and `description` in frontmatter. +Skills are markdown files at `skills//SKILL.md` (or `skill//SKILL.md`) with `name` and `description` in frontmatter. Discovered inside `.kilo/`, `.kilocode/`, and `.opencode/` directories. ## Other Top-Level Fields @@ -221,12 +247,49 @@ Toggle notifications, Toggle animations, Toggle diff wrapping, Toggle sidebar (` ## Config File Locations -| Scope | Path | -| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Project | `./kilo.json`, `./.kilo/kilo.json` | -| Global | `~/.config/kilo/kilo.json` | -| Managed | Linux: `/etc/kilo/kilo.json`, macOS: `/Library/Application Support/kilo/kilo.json`, Windows: `%ProgramData%\kilo\kilo.json` (enterprise, highest priority) | -| Commands | `.kilo/command/*.md` (project), `~/.config/kilo/command/*.md` (global) | -| Agents | `.kilo/agent/*.md` (project), `~/.config/kilo/agent/*.md` (global) | -| Skills | `.kilo/skill/*/SKILL.md`, `.kilo/skills/*/SKILL.md` | -| Instructions | `AGENTS.md`, `.kilo/instructions.md`, glob patterns from `instructions` | +### Config files (kilo.json) + +| Scope | Path | +| ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Project | `./kilo.json`, `./kilo.jsonc`, `./opencode.json` (legacy), `./opencode.jsonc` (legacy) | +| Global | `~/.config/kilo/kilo.json`, `~/.config/kilo/kilo.jsonc`, `~/.config/kilo/opencode.json` (legacy), `~/.config/kilo/opencode.jsonc` (legacy), `~/.config/kilo/config.json` (legacy) | +| Managed | Linux: `/etc/kilo/`, macOS: `/Library/Application Support/kilo/`, Windows: `%ProgramData%\kilo\` — loads `kilo.json`, `kilo.jsonc`, `opencode.json`, `opencode.jsonc` (enterprise, highest priority) | + +Each config directory (`.kilo/`, `.kilocode/`, `.opencode/`) can also contain `kilo.json`, `kilo.jsonc`, `opencode.json`, or `opencode.jsonc`. + +### Config directories + +Three directory names are scanned: `.kilo` (modern), `.kilocode` (legacy), `.opencode` (legacy). All three are checked at each level: + +- **Project**: walks up from CWD to the git worktree root, checking for all three at each directory level +- **Home**: `~/.kilo/`, `~/.kilocode/`, `~/.opencode/` +- **XDG global**: `~/.config/kilo/` (always loaded, lowest file-based precedence) + +### Commands, agents, modes, plugins + +Glob patterns run inside every discovered config directory (including legacy): + +| Type | Pattern | +| ------- | ---------------------------- | +| Command | `{command,commands}/**/*.md` | +| Agent | `{agent,agents}/**/*.md` | +| Mode | `{mode,modes}/*.md` | +| Plugin | `{plugin,plugins}/*.{ts,js}` | + +Example: `~/.config/kilo/command/*.md` (modern global), `~/.kilocode/command/*.md` (legacy global), `.opencode/commands/*.md` (legacy project) all load commands. + +### Skills and instructions + +| Scope | Path | +| ------------ | -------------------------------------------------------------------------------------- | +| Skills | `{skill,skills}//SKILL.md` inside any config directory | +| Instructions | `AGENTS.md`, `CLAUDE.md`, `CONTEXT.md`, glob patterns from `instructions` config field | + +### Environment variable overrides + +| Variable | Description | +| ----------------------------- | ---------------------------------------------------------------- | +| `KILO_CONFIG` | Path to an additional config file (loaded after global) | +| `KILO_CONFIG_DIR` | Path to an additional config directory (appended to search list) | +| `KILO_CONFIG_CONTENT` | Inline JSON config string (high precedence, after project dirs) | +| `KILO_DISABLE_PROJECT_CONFIG` | Skip all project-level config (files and directories) | diff --git a/packages/opencode/src/kilocode/worktree-family.ts b/packages/opencode/src/kilocode/worktree-family.ts new file mode 100644 index 0000000000..0248c17141 --- /dev/null +++ b/packages/opencode/src/kilocode/worktree-family.ts @@ -0,0 +1,35 @@ +// kilocode_change - new file +import { Instance } from "../project/instance" +import { Project } from "../project/project" +import { Filesystem } from "../util/filesystem" +import { git } from "../util/git" + +export namespace WorktreeFamily { + export async function list() { + if (Instance.project.vcs !== "git") { + return [Filesystem.resolve(Instance.directory)] + } + + const listed = await git(["worktree", "list", "--porcelain"], { + cwd: Instance.worktree, + }) + + if (listed.exitCode === 0) { + const dirs = listed + .text() + .split("\n") + .map((line) => line.trim()) + .flatMap((line) => { + if (!line.startsWith("worktree ")) return [] + return [Filesystem.resolve(line.slice("worktree ".length).trim())] + }) + + if (dirs.length > 0) { + return [...new Set(dirs)] + } + } + + const dirs = [Instance.worktree, ...(await Project.sandboxes(Instance.project.id))] + return [...new Set(dirs.map((dir) => Filesystem.resolve(dir)))] + } +} diff --git a/packages/opencode/src/lsp/server.ts b/packages/opencode/src/lsp/server.ts index 8b4fa1b0fa..e46928fcc2 100644 --- a/packages/opencode/src/lsp/server.ts +++ b/packages/opencode/src/lsp/server.ts @@ -1216,6 +1216,7 @@ export namespace LSPServer { process: spawn( java, [ + "-Djava.import.generatesMetadataFilesAtProjectRoot=false", // kilocode_change "-jar", launcherJar, "-configuration", diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts index 6d97bc8bac..476744bcc9 100644 --- a/packages/opencode/src/mcp/index.ts +++ b/packages/opencode/src/mcp/index.ts @@ -63,6 +63,41 @@ export namespace MCP { }), ) + // kilocode_change start + export async function reconnectRemote() { + const cfg = await Config.get() + const list = Object.entries(cfg.mcp ?? {}) + const s = await state() + await Promise.allSettled( + list.map(async ([key, mcp]) => { + if (!isMcpConfigured(mcp)) return + if (mcp.type !== "remote") return + 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] + if (existing) { + await existing.close().catch((error) => { + log.error("Failed to close existing MCP client", { name: key, error }) + }) + } + s.clients[key] = result.mcpClient + } + }), + ) + } + // kilocode_change end + export const Failed = NamedError.create( "MCPFailed", z.object({ diff --git a/packages/opencode/src/permission/next.ts b/packages/opencode/src/permission/next.ts index b68fafd1f8..34b2cbee75 100644 --- a/packages/opencode/src/permission/next.ts +++ b/packages/opencode/src/permission/next.ts @@ -179,6 +179,7 @@ export namespace PermissionNext { return { pending, approved: stored, + session: {} as Record, // kilocode_change } }) @@ -189,11 +190,12 @@ export namespace PermissionNext { async (input) => { const s = await state() const { ruleset, ...request } = input + const local = s.session[request.sessionID] ?? [] // kilocode_change // kilocode_change start — force "ask" for config file edits const protected_ = ConfigProtection.isRequest(request) // kilocode_change end for (const pattern of request.patterns ?? []) { - const rule = evaluate(request.permission, pattern, ruleset, s.approved) + const rule = evaluate(request.permission, pattern, ruleset, s.approved, local) // kilocode_change log.info("evaluated", { permission: request.permission, pattern, action: rule }) if (rule.action === "deny") throw new DeniedError(ruleset.filter((r) => Wildcard.match(request.permission, r.permission))) @@ -355,6 +357,58 @@ export namespace PermissionNext { }, ) + // kilocode_change start + export const allowEverything = fn( + z.object({ + enable: z.boolean(), + requestID: Identifier.schema("permission").optional(), + sessionID: Identifier.schema("session").optional(), + }), + async (input) => { + const s = await state() + + if (!input.enable) { + if (input.sessionID) { + delete s.session[input.sessionID] + return + } + const idx = s.approved.findLastIndex((r) => r.permission === "*" && r.pattern === "*" && r.action === "allow") + if (idx >= 0) s.approved.splice(idx, 1) + return + } + + const rule = { permission: "*", pattern: "*", action: "allow" } as const + if (input.sessionID) s.session[input.sessionID] = [rule] + else s.approved.push(rule) + + if (input.requestID) { + const existing = s.pending[input.requestID] + if (existing && (!input.sessionID || existing.info.sessionID === input.sessionID)) { + delete s.pending[input.requestID] + Bus.publish(Event.Replied, { + sessionID: existing.info.sessionID, + requestID: existing.info.id, + reply: "once", + }) + existing.resolve() + } + } + + for (const [id, entry] of Object.entries(s.pending)) { + if (input.sessionID && entry.info.sessionID !== input.sessionID) continue + if (ConfigProtection.isRequest(entry.info)) continue + delete s.pending[id] + Bus.publish(Event.Replied, { + sessionID: entry.info.sessionID, + requestID: entry.info.id, + reply: "once", + }) + entry.resolve() + } + }, + ) + // kilocode_change end + export function evaluate(permission: string, pattern: string, ...rulesets: Ruleset[]): Rule { const merged = merge(...rulesets) log.info("evaluate", { permission, pattern, ruleset: merged }) @@ -405,4 +459,11 @@ export namespace PermissionNext { const s = await state() return Object.values(s.pending).map((x) => x.info) } + + // kilocode_change start + export async function pending(id: string): Promise { + const s = await state() + return s.pending[id]?.info + } + // kilocode_change end } diff --git a/packages/opencode/src/provider/models.ts b/packages/opencode/src/provider/models.ts index 5d97f0939b..4b143e18e1 100644 --- a/packages/opencode/src/provider/models.ts +++ b/packages/opencode/src/provider/models.ts @@ -149,11 +149,10 @@ export namespace ModelsDev { if (kiloAllowed && !providers["kilo"]) { const kiloOptions = config.provider?.kilo?.options - // kilocode_change start - resolve org ID from auth (OAuth accountId) not just config + // resolve org ID from auth (OAuth accountId) not just config const kiloAuth = await Auth.get("kilo") const kiloOrgId = kiloOptions?.kilocodeOrganizationId ?? (kiloAuth?.type === "oauth" ? kiloAuth.accountId : undefined) - // kilocode_change end const normalizedBaseURL = normalizeKiloBaseURL(kiloOptions?.baseURL, kiloOrgId) const kiloFetchOptions = { ...(normalizedBaseURL ? { baseURL: normalizedBaseURL } : {}), @@ -164,7 +163,19 @@ export namespace ModelsDev { : "https://api.kilo.ai/api/openrouter" const providerBaseURL = normalizedBaseURL ?? defaultBaseURL const ensureTrailingSlash = (value: string): string => (value.endsWith("/") ? value : `${value}/`) - const kiloModels = await ModelCache.fetch("kilo", kiloFetchOptions).catch(() => ({})) + const apertisConfig = config.provider?.apertis?.options + const apertisBaseURL = apertisConfig?.baseURL ?? "https://api.apertis.ai/v1" + const apertisFetchOptions = { + ...(apertisConfig?.baseURL ? { baseURL: apertisConfig.baseURL } : {}), + } + + const [kiloModels, apertisModels] = await Promise.all([ + ModelCache.fetch("kilo", kiloFetchOptions).catch(() => ({})), + !providers["apertis"] + ? ModelCache.fetch("apertis", apertisFetchOptions).catch(() => ({})) + : Promise.resolve(null), + ]) + providers["kilo"] = { id: "kilo", name: "Kilo Gateway", @@ -176,12 +187,22 @@ export namespace ModelsDev { if (Object.keys(kiloModels).length === 0) { ModelCache.refresh("kilo", kiloFetchOptions).catch(() => {}) } - } - // Inject Apertis provider with dynamic model fetching - if (!providers["apertis"]) { - const apertisConfigObj = await Config.get() - const apertisConfig = apertisConfigObj.provider?.apertis?.options + if (!providers["apertis"] && apertisModels !== null) { + providers["apertis"] = { + id: "apertis", + name: "Apertis", + env: ["APERTIS_API_KEY"], + api: apertisBaseURL, + npm: "@ai-sdk/openai-compatible", + models: apertisModels, + } + if (Object.keys(apertisModels).length === 0) { + ModelCache.refresh("apertis", apertisFetchOptions).catch(() => {}) + } + } + } else if (!providers["apertis"]) { + const apertisConfig = config.provider?.apertis?.options const apertisBaseURL = apertisConfig?.baseURL ?? "https://api.apertis.ai/v1" const apertisFetchOptions = { ...(apertisConfig?.baseURL ? { baseURL: apertisConfig.baseURL } : {}), diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts index f26f78426a..dbebcdf80f 100644 --- a/packages/opencode/src/provider/provider.ts +++ b/packages/opencode/src/provider/provider.ts @@ -49,6 +49,11 @@ import { Installation } from "../installation" import { DEFAULT_HEADERS } from "@/kilocode/const" // 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" }) @@ -1140,15 +1145,21 @@ export namespace Provider { const fetchFn = customFetch ?? fetch const opts = init ?? {} - if (options["timeout"] !== undefined && options["timeout"] !== null) { - const signals: AbortSignal[] = [] + // 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 + const controller = ms !== false ? new AbortController() : undefined + if (controller) { + const signals: AbortSignal[] = [controller.signal] 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 + 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: @@ -1168,11 +1179,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] diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts index f4400746c7..5cd3f7f838 100644 --- a/packages/opencode/src/provider/transform.ts +++ b/packages/opencode/src/provider/transform.ts @@ -51,9 +51,14 @@ 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") { + // 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" || + (model.api.npm === "@ai-sdk/amazon-bedrock" && (model.api.id.includes("claude") || model.id.includes("claude"))) + ) { + // kilocode_change end msgs = msgs .map((msg) => { if (typeof msg.content === "string") { diff --git a/packages/opencode/src/server/routes/config.ts b/packages/opencode/src/server/routes/config.ts index f9ac7e4297..faa46c4097 100644 --- a/packages/opencode/src/server/routes/config.ts +++ b/packages/opencode/src/server/routes/config.ts @@ -62,6 +62,29 @@ export const ConfigRoutes = lazy(() => return c.json(config) }, ) + // kilocode_change start + .get( + "/warnings", + describeRoute({ + summary: "Get config warnings", + description: "Get warnings generated during config loading (e.g., invalid JSON, schema errors).", + operationId: "config.warnings", + responses: { + 200: { + description: "Config warnings", + content: { + "application/json": { + schema: resolver(Config.Warning.array()), + }, + }, + }, + }, + }), + async (c) => { + return c.json(await Config.warnings()) + }, + ) + // kilocode_change end .get( "/providers", describeRoute({ diff --git a/packages/opencode/src/server/routes/experimental.ts b/packages/opencode/src/server/routes/experimental.ts index 9f1227b6d9..c16704456b 100644 --- a/packages/opencode/src/server/routes/experimental.ts +++ b/packages/opencode/src/server/routes/experimental.ts @@ -13,8 +13,11 @@ import { lazy } from "../../util/lazy" import { Snapshot } from "../../snapshot" // kilocode_change import { Review } from "../../kilocode/review/review" // kilocode_change import { WorktreeDiff } from "../../kilocode/review/worktree-diff" // kilocode_change +import { WorktreeFamily } from "../../kilocode/worktree-family" // kilocode_change import { Log } from "../../util/log" // kilocode_change import { WorkspaceRoutes } from "./workspace" +import { Filesystem } from "../../util/filesystem" // kilocode_change +import path from "path" // kilocode_change export const ExperimentalRoutes = lazy(() => new Hono() @@ -326,7 +329,14 @@ export const ExperimentalRoutes = lazy(() => validator( "query", z.object({ + // kilocode_change start + projectID: z.string().optional().meta({ description: "Filter sessions by project ID" }), directory: z.string().optional().meta({ description: "Filter sessions by project directory" }), + worktrees: z.coerce + .boolean() + .optional() + .meta({ description: "Restrict sessions to the current repo worktree family or current directory" }), + // kilocode_change end roots: z.coerce.boolean().optional().meta({ description: "Only return root sessions (no parentID)" }), start: z.coerce .number() @@ -343,10 +353,19 @@ export const ExperimentalRoutes = lazy(() => ), async (c) => { const query = c.req.valid("query") - const limit = query.limit ?? 100 + const limit = query.limit ?? 100 // kilocode_change + // kilocode_change start + const projectID = query.worktrees && !query.projectID ? Instance.project.id : query.projectID + // kilocode_change end + const directories = query.worktrees ? await WorktreeFamily.list() : undefined // kilocode_change + // kilocode_change start - sort longest-first so most specific worktree matches first + const sorted = directories ? [...directories].sort((a, b) => b.length - a.length) : undefined + // kilocode_change end const sessions: Session.GlobalInfo[] = [] for await (const session of Session.listGlobal({ + projectID, // kilocode_change directory: query.directory, + directories, // kilocode_change roots: query.roots, start: query.start, cursor: query.cursor, @@ -354,6 +373,13 @@ export const ExperimentalRoutes = lazy(() => limit: limit + 1, archived: query.archived, })) { + // kilocode_change start - resolve worktree folder name for each session + if (sorted) { + const root = sorted.find((d) => Filesystem.contains(d, session.directory)) + sessions.push({ ...session, worktreeName: path.basename(root ?? session.directory) }) + continue + } + // kilocode_change end sessions.push(session) } const hasMore = sessions.length > limit diff --git a/packages/opencode/src/server/routes/network.ts b/packages/opencode/src/server/routes/network.ts new file mode 100644 index 0000000000..5b86d5eec6 --- /dev/null +++ b/packages/opencode/src/server/routes/network.ts @@ -0,0 +1,93 @@ +// kilocode_change - new file +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/routes/session.ts b/packages/opencode/src/server/routes/session.ts index 7a6d9bd6a1..f6c97d4055 100644 --- a/packages/opencode/src/server/routes/session.ts +++ b/packages/opencode/src/server/routes/session.ts @@ -971,21 +971,30 @@ export const SessionRoutes = lazy(() => ) .post( "/viewed", + // kilocode_change start 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 ?? [] }) + // kilocode_change end return c.json(true) }, ), diff --git a/packages/opencode/src/server/server.ts b/packages/opencode/src/server/server.ts index 7f3b12b117..f667d10e0d 100644 --- a/packages/opencode/src/server/server.ts +++ b/packages/opencode/src/server/server.ts @@ -48,11 +48,13 @@ import { errors } from "./error" import { CommitMessageRoutes } from "./routes/commit-message" // kilocode_change import { EnhancePromptRoutes } from "./routes/enhance-prompt" // kilocode_change import { KilocodeRoutes } from "./routes/kilocode" // kilocode_change +import { PermissionKilocodeRoutes } from "../kilocode/permission/routes" // kilocode_change import { Filesystem } from "@/util/filesystem" 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" // 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 @@ -153,6 +155,7 @@ export namespace Server { }), ) .route("/global", GlobalRoutes()) + .route("/remote", RemoteRoutes()) // kilocode_change .put( "/auth/:providerID", describeRoute({ @@ -277,10 +280,11 @@ export namespace Server { .route("/experimental", ExperimentalRoutes()) .route("/session", SessionRoutes()) .route("/permission", PermissionRoutes()) + .route("/permission", PermissionKilocodeRoutes()) // kilocode_change .route("/question", QuestionRoutes()) + .route("/network", NetworkRoutes()) // kilocode_change .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 diff --git a/packages/opencode/src/session/index.ts b/packages/opencode/src/session/index.ts index b2912e8223..b64225c5d0 100644 --- a/packages/opencode/src/session/index.ts +++ b/packages/opencode/src/session/index.ts @@ -117,6 +117,25 @@ export namespace Session { return `${title} (fork #1)` } + // kilocode_change start + function family(id: string) { + const row = Database.use((db) => + db.select({ worktree: ProjectTable.worktree }).from(ProjectTable).where(eq(ProjectTable.id, id)).get(), + ) + const root = row?.worktree ? Filesystem.resolve(row.worktree) : undefined + if (!root || root === "/") return [id] + const ids = Database.use((db) => + db + .select({ id: ProjectTable.id }) + .from(ProjectTable) + .where(eq(ProjectTable.worktree, root)) + .all() + .map((item) => item.id), + ) + return ids.length ? ids : [id] + } + // kilocode_change end + export const Info = z .object({ id: Identifier.schema("session"), @@ -185,6 +204,7 @@ export namespace Session { export const GlobalInfo = Info.extend({ project: ProjectInfo.nullable(), + worktreeName: z.string().optional(), // kilocode_change - basename of the specific worktree directory }).meta({ ref: "GlobalSession", }) @@ -621,8 +641,11 @@ export namespace Session { } } + // kilocode_change start export function* listGlobal(input?: { + projectID?: string directory?: string + directories?: string[] roots?: boolean start?: number cursor?: number @@ -630,7 +653,18 @@ export namespace Session { limit?: number archived?: boolean }) { - const conditions: SQL[] = [] + const conditions: SQL[] = [] // kilocode_change + + // kilocode_change start + if (input?.projectID) { + const ids = family(input.projectID) + if (ids.length === 1 && ids[0] === input.projectID) { + conditions.push(eq(SessionTable.project_id, input.projectID)) + } else { + conditions.push(inArray(SessionTable.project_id, ids)) + } + } + // kilocode_change end if (input?.directory) { // kilocode_change start: vscode uri.fsPath gives lowercase drive letter on Windows; resolve() canonicalises to match stored path @@ -653,7 +687,9 @@ export namespace Session { conditions.push(isNull(SessionTable.time_archived)) } - const limit = input?.limit ?? 100 + const limit = input?.limit ?? 100 // kilocode_change + // kilocode_change start + const dirs = [...new Set((input?.directories ?? []).map((dir) => Filesystem.resolve(dir)))] const rows = Database.use((db) => { const query = @@ -663,10 +699,19 @@ export namespace Session { .from(SessionTable) .where(and(...conditions)) : db.select().from(SessionTable) - return query.orderBy(desc(SessionTable.time_updated), desc(SessionTable.id)).limit(limit).all() + const sorted = query.orderBy(desc(SessionTable.time_updated), desc(SessionTable.id)) + return dirs.length ? sorted.all() : sorted.limit(limit).all() }) - const ids = [...new Set(rows.map((row) => row.project_id))] + const list = + dirs.length > 0 + ? rows.filter((row) => { + const dir = Filesystem.resolve(row.directory) + return dirs.some((root) => Filesystem.contains(root, dir)) + }) + : rows + + const ids = [...new Set(list.slice(0, limit).map((row) => row.project_id))] const projects = new Map() if (ids.length > 0) { @@ -685,11 +730,14 @@ export namespace Session { }) } } + // kilocode_change end - for (const row of rows) { + // kilocode_change start + for (const row of list.slice(0, limit)) { const project = projects.get(row.project_id) ?? null yield { ...fromRow(row), project } } + // kilocode_change end } export const children = fn(Identifier.schema("session"), async (parentID) => { diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts index 1e84d3433e..f37591e0b4 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) { @@ -915,10 +916,10 @@ export namespace MessageV2 { }, { cause: e }, ).toObject() - case (e as SystemError)?.code === "ECONNRESET": + case SessionNetwork.disconnected(e): // kilocode_change start return new MessageV2.APIError( { - message: "Connection reset by server", + 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 new file mode 100644 index 0000000000..cf4978724f --- /dev/null +++ b/packages/opencode/src/session/network.ts @@ -0,0 +1,274 @@ +// kilocode_change - new file +import { Bus } from "../bus" +import { BusEvent } from "../bus/bus-event" +import { Identifier } from "../id/id" +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"]) + 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"), + sessionID: Identifier.schema("session"), + message: z.string(), + restored: z.boolean(), + 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(), + }), + ), + Restored: BusEvent.define( + "session.network.restored", + 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) { + 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 + // 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 + 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) { + // 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" + 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 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" + } + + 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") + const info: Wait = { + id, + sessionID: input.sessionID, + message: input.message, + restored: false, + time: { + created: Date.now(), + }, + } + + const promise = 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, + requestID: 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 }) + if (input.abort.aborted) { + 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 }) + }) + }) + return { id, promise } + } + + 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 + log.info("network restored", { sessionID: req.info.sessionID, requestID: input.requestID }) + Bus.publish(Event.Restored, { + sessionID: req.info.sessionID, + requestID: req.info.id, + }) + }, + ) + + 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] + void MCP.reconnectRemote().catch((err) => { + log.error("remote reconnect failed", { err }) + }) + 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 e95c3e1e3a..b6c36eea5a 100644 --- a/packages/opencode/src/session/processor.ts +++ b/packages/opencode/src/session/processor.ts @@ -17,6 +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" // kilocode_change export namespace SessionProcessor { const DOOM_LOOP_THRESHOLD = 3 @@ -412,22 +413,87 @@ export namespace SessionProcessor { }) } else { const retry = SessionRetry.retryable(error) - if ( - retry !== undefined && - (Flag.KILO_SESSION_RETRY_LIMIT === undefined || attempt < Flag.KILO_SESSION_RETRY_LIMIT) - ) { - // kilocode_change - attempt++ - const delay = SessionRetry.delay(attempt, error.name === "APIError" ? error : undefined) - SessionStatus.set(input.sessionID, { - type: "retry", - attempt, - message: retry, - next: Date.now() + delay, + // kilocode_change start - network disconnect detection and offline recovery + if (retry !== undefined) { + 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, }) - await SessionRetry.sleep(delay, input.abort).catch(() => {}) - continue + if (offline) { + const msg = SessionNetwork.message(e) + const { id: requestID, promise: wait } = await SessionNetwork.ask({ + sessionID: input.sessionID, + message: msg, + abort: input.abort, + }) + 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) { + 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, { + sessionID: input.assistantMessage.sessionID, + error, + }) + SessionStatus.set(input.sessionID, { type: "idle" }) + break + } + attempt = 0 + SessionStatus.set(input.sessionID, { type: "retry", attempt: 1, message: retry, next: Date.now() }) + continue + } + if (Flag.KILO_SESSION_RETRY_LIMIT === undefined || attempt < Flag.KILO_SESSION_RETRY_LIMIT) { + // 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, + message: retry, + next: Date.now() + delay, + }) + await SessionRetry.sleep(delay, input.abort).catch(() => {}) + 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 1db03b5db0..c751115561 100644 --- a/packages/opencode/src/session/status.ts +++ b/packages/opencode/src/session/status.ts @@ -18,6 +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/snapshot/index.ts b/packages/opencode/src/snapshot/index.ts index 0a38ddb70b..ac4867ead0 100644 --- a/packages/opencode/src/snapshot/index.ts +++ b/packages/opencode/src/snapshot/index.ts @@ -10,7 +10,6 @@ import { Config } from "../config/config" import { Instance } from "../project/instance" import { Scheduler } from "../scheduler" import * as KiloSnapshot from "../kilocode/snapshot" // kilocode_change -import { Lock } from "../util/lock" // kilocode_change export namespace Snapshot { const log = Log.create({ service: "snapshot" }) @@ -38,7 +37,7 @@ export namespace Snapshot { .then(() => true) .catch(() => false) if (!exists) return - using _lock = await Lock.write(git) // kilocode_change + const result = await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} gc --prune=${prune}` .quiet() @@ -60,7 +59,7 @@ export namespace Snapshot { const cfg = await Config.get() if (cfg.snapshot === false) return const git = await KiloSnapshot.prepare() // kilocode_change - using _lock = await Lock.write(git) // kilocode_change + await add(git) const hash = await $`git --git-dir ${git} --work-tree ${Instance.worktree} write-tree` .quiet() @@ -79,7 +78,7 @@ export namespace Snapshot { export async function patch(hash: string): Promise { const git = await KiloSnapshot.prepare() // kilocode_change - using _lock = await Lock.write(git) // kilocode_change + await add(git) const result = await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --name-only ${hash} -- .` @@ -108,7 +107,7 @@ export namespace Snapshot { export async function restore(snapshot: string) { log.info("restore", { commit: snapshot }) const git = await KiloSnapshot.prepare() // kilocode_change - using _lock = await Lock.write(git) // kilocode_change + const result = await $`git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} read-tree ${snapshot} && git -c core.longpaths=true -c core.symlinks=true --git-dir ${git} --work-tree ${Instance.worktree} checkout-index -a -f` .quiet() @@ -167,7 +166,14 @@ export namespace Snapshot { return } - const existing = new Set(tree.text().trim().split("\n").map((l) => l.trim()).filter(Boolean)) + const existing = new Set( + tree + .text() + .trim() + .split("\n") + .map((l) => l.trim()) + .filter(Boolean), + ) // Checkout files that exist in the snapshot const toCheckout = batch.filter((op) => existing.has(op.rel)) @@ -228,7 +234,7 @@ export namespace Snapshot { export async function revert(patches: Patch[]) { const git = await KiloSnapshot.prepare() // kilocode_change - using _lock = await Lock.write(git) // kilocode_change + const worktree = Instance.worktree // Deduplicate files preserving patch order @@ -254,7 +260,7 @@ export namespace Snapshot { export async function diff(hash: string) { const git = await KiloSnapshot.prepare() // kilocode_change - using _lock = await Lock.write(git) // kilocode_change + await add(git) const result = await $`git -c core.autocrlf=false -c core.longpaths=true -c core.symlinks=true -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff ${hash} -- .` @@ -313,7 +319,7 @@ export namespace Snapshot { async function diffFullUncached(from: string, to: string): Promise { const git = await KiloSnapshot.prepare() // kilocode_change - using _lock = await Lock.write(git) // kilocode_change + const result: FileDiff[] = [] const status = new Map() diff --git a/packages/opencode/src/tool/edit.ts b/packages/opencode/src/tool/edit.ts index 5b4468e3c2..9abb5e5e03 100644 --- a/packages/opencode/src/tool/edit.ts +++ b/packages/opencode/src/tool/edit.ts @@ -20,6 +20,27 @@ import { assertExternalDirectory } from "./external-directory" import { filterDiagnostics } from "./diagnostics" // kilocode_change const MAX_DIAGNOSTICS_PER_FILE = 20 +const MAX_DIFF_CONTENT = 500_000 // kilocode_change + +// kilocode_change start +export function buildFileDiff(file: string, before: string, after: string): Snapshot.FileDiff { + const tooLarge = before.length > MAX_DIFF_CONTENT || after.length > MAX_DIFF_CONTENT + const fd: Snapshot.FileDiff = { + file, + before: tooLarge ? "" : before, + after: tooLarge ? "" : after, + additions: 0, + deletions: 0, + } + if (!tooLarge) { + for (const change of diffLines(before, after)) { + if (change.added) fd.additions += change.count || 0 + if (change.removed) fd.deletions += change.count || 0 + } + } + return fd +} +// kilocode_change end function normalizeLineEndings(text: string): string { return text.replaceAll("\r\n", "\n") @@ -57,11 +78,14 @@ export const EditTool = Tool.define("edit", { let diff = "" let contentOld = "" let contentNew = "" + let cachedFilediff: Snapshot.FileDiff | undefined // kilocode_change await FileTime.withLock(filePath, async () => { if (params.oldString === "") { const existed = await Filesystem.exists(filePath) + if (existed) contentOld = await Filesystem.readText(filePath) // kilocode_change contentNew = params.newString diff = trimDiff(createTwoFilesPatch(filePath, filePath, contentOld, contentNew)) + cachedFilediff = buildFileDiff(filePath, contentOld, contentNew) // kilocode_change await ctx.ask({ permission: "edit", patterns: [path.relative(Instance.worktree, filePath)], @@ -69,6 +93,7 @@ export const EditTool = Tool.define("edit", { metadata: { filepath: filePath, diff, + filediff: cachedFilediff, // kilocode_change }, }) await Filesystem.write(filePath, params.newString) @@ -98,6 +123,7 @@ export const EditTool = Tool.define("edit", { diff = trimDiff( createTwoFilesPatch(filePath, filePath, normalizeLineEndings(contentOld), normalizeLineEndings(contentNew)), ) + cachedFilediff = buildFileDiff(filePath, contentOld, contentNew) // kilocode_change await ctx.ask({ permission: "edit", patterns: [path.relative(Instance.worktree, filePath)], @@ -105,6 +131,7 @@ export const EditTool = Tool.define("edit", { metadata: { filepath: filePath, diff, + filediff: cachedFilediff, // kilocode_change }, }) @@ -123,22 +150,12 @@ export const EditTool = Tool.define("edit", { FileTime.read(ctx.sessionID, filePath) }) - const filediff: Snapshot.FileDiff = { - file: filePath, - before: contentOld, - after: contentNew, - additions: 0, - deletions: 0, - } - for (const change of diffLines(contentOld, contentNew)) { - if (change.added) filediff.additions += change.count || 0 - if (change.removed) filediff.deletions += change.count || 0 - } + const filediff = cachedFilediff ?? buildFileDiff(filePath, contentOld, contentNew) // kilocode_change ctx.metadata({ metadata: { diff, - filediff, + filediff, // kilocode_change diagnostics: {}, }, }) @@ -160,7 +177,7 @@ export const EditTool = Tool.define("edit", { metadata: { diagnostics: filterDiagnostics(diagnostics, [normalizedFilePath]), // kilocode_change diff, - filediff, + filediff, // kilocode_change }, title: `${path.relative(Instance.worktree, filePath)}`, output, diff --git a/packages/opencode/src/tool/recall.ts b/packages/opencode/src/tool/recall.ts new file mode 100644 index 0000000000..52697a3354 --- /dev/null +++ b/packages/opencode/src/tool/recall.ts @@ -0,0 +1,150 @@ +// kilocode_change - new file +import z from "zod" +import { Tool } from "./tool" +import { Instance } from "../project/instance" +import { Locale } from "../util/locale" +import { Filesystem } from "../util/filesystem" // kilocode_change +import { WorktreeFamily } from "../kilocode/worktree-family" // kilocode_change +import DESCRIPTION from "./recall.txt" + +export const RecallTool = Tool.define("kilo_local_recall", { + description: DESCRIPTION, + parameters: z.object({ + mode: z.enum(["search", "read"]).describe("'search' to find sessions by title, 'read' to get a session transcript"), + query: z.string().optional().describe("Search query to match against session titles (required for search mode)"), + sessionID: z.string().optional().describe("Session ID to read the transcript of (required for read mode)"), + limit: z.number().optional().describe("Maximum number of search results to return (default: 20, max: 50)"), + }), + async execute(params, ctx) { + if (params.mode === "search") { + return search(params, ctx) + } + return read(params, ctx) + }, +}) + +async function search(params: { query?: string; limit?: number }, ctx: Tool.Context) { + if (!params.query) { + throw new Error("The 'query' parameter is required when mode is 'search'") + } + + await ctx.ask({ + permission: "recall", + patterns: ["search"], + always: ["search"], + metadata: { + mode: "search", + query: params.query, + }, + }) + + const limit = Math.min(params.limit ?? 20, 50) + const dirs = await WorktreeFamily.list() // kilocode_change + const { Session } = await import("../session/index") // kilocode_change + + const results: Array<{ + id: string + title: string + directory: string + updated: string + }> = [] + + for (const session of Session.listGlobal({ + projectID: Instance.project.id, // kilocode_change + directories: dirs, // kilocode_change + search: params.query, + roots: true, + limit, + })) { + results.push({ + id: session.id, + title: session.title, + directory: session.directory, + updated: Locale.todayTimeOrDateTime(session.time.updated), + }) + } + + if (results.length === 0) { + return { + title: `Search: "${params.query}" (no results)`, + output: `No sessions found matching "${params.query}".`, + metadata: {}, + } + } + + const lines = results.map((r) => `- **${r.title}**\n ID: ${r.id} | Updated: ${r.updated} | Dir: ${r.directory}`) + + return { + title: `Search: "${params.query}" (${results.length} results)`, + output: lines.join("\n"), + metadata: {}, + } +} + +async function read(params: { sessionID?: string }, ctx: Tool.Context) { + if (!params.sessionID) { + throw new Error("The 'sessionID' parameter is required when mode is 'read'") + } + + const { Session } = await import("../session/index") // kilocode_change + const session = await Session.get(params.sessionID).catch(() => { + throw new Error(`Session "${params.sessionID}" not found. Use search mode first to find valid session IDs.`) + }) + const dirs = await WorktreeFamily.list() // kilocode_change + // kilocode_change start + const dir = Filesystem.resolve(session.directory) + if (!dirs.some((root) => Filesystem.contains(root, dir))) { + throw new Error( + `Session "${params.sessionID}" belongs to a different workspace and cannot be read from this directory.`, + ) + } + // kilocode_change end + + const cross = session.projectID !== Instance.project.id + if (cross) { + await ctx.ask({ + permission: "recall", + patterns: [session.directory], + always: [session.directory], + metadata: { + sessionID: session.id, + title: session.title, + directory: session.directory, + }, + }) + } + + const msgs = await Session.messages({ sessionID: session.id }) + const lines: string[] = [ + `# Session: ${session.title}`, + `Directory: ${session.directory}`, + `Created: ${Locale.todayTimeOrDateTime(session.time.created)}`, + "", + ] + + for (const msg of msgs) { + if (msg.info.role === "user") { + lines.push("## User") + for (const part of msg.parts) { + if (part.type === "text") lines.push(part.text) + } + lines.push("") + } + if (msg.info.role === "assistant") { + lines.push("## Assistant") + for (const part of msg.parts) { + if (part.type === "text") lines.push(part.text) + if (part.type === "tool" && part.state.status === "completed") { + lines.push(`[Tool: ${part.tool}] ${part.state.title}`) + } + } + lines.push("") + } + } + + return { + title: `Read: ${session.title}`, + output: lines.join("\n"), + metadata: {}, + } +} diff --git a/packages/opencode/src/tool/recall.txt b/packages/opencode/src/tool/recall.txt new file mode 100644 index 0000000000..fa73e81dc3 --- /dev/null +++ b/packages/opencode/src/tool/recall.txt @@ -0,0 +1,12 @@ +Search and read past conversations from the current project on this machine, including its git worktrees. Use this to recall previous work, find how something was implemented before, or retrieve context from another worktree in the same repo. + +Two modes: +1. **Search** - Find sessions by title keyword in the current project and its worktrees. Returns a list of matching sessions with their title, directory, and last updated time. Use this first to locate relevant conversations. +2. **Read** - Retrieve the full transcript of a specific session by ID. Returns the conversation messages (user prompts and assistant responses) so you can understand what was discussed and done. + +Usage notes: + - Search matches against session titles using case-insensitive substring matching + - Results are limited to the current project/worktree family + - Reading a session from a different project is rejected + - Use search mode first to find session IDs, then read mode to get the full conversation + - Session transcripts can be large; prefer searching first to narrow down which session to read diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts index 3c05ef92a0..d55f550999 100644 --- a/packages/opencode/src/tool/registry.ts +++ b/packages/opencode/src/tool/registry.ts @@ -29,6 +29,7 @@ import { LspTool } from "./lsp" import { Truncate } from "./truncation" import { ApplyPatchTool } from "./apply_patch" +import { RecallTool } from "./recall" // kilocode_change import { Glob } from "../util/glob" import { pathToFileURL } from "url" @@ -118,6 +119,7 @@ export namespace ToolRegistry { CodeSearchTool, ...(config.experimental?.codebase_search === true ? [CodebaseSearchTool] : []), // kilocode_change SkillTool, + RecallTool, // kilocode_change ApplyPatchTool, ...(Flag.KILO_EXPERIMENTAL_LSP_TOOL ? [LspTool] : []), ...(config.experimental?.batch_tool === true ? [BatchTool] : []), @@ -152,7 +154,7 @@ export namespace ToolRegistry { const usePatch = model.modelID.includes("gpt-") && !model.modelID.includes("oss") && !model.modelID.includes("gpt-4") if (t.id === "apply_patch") return usePatch - if (t.id === "edit" || t.id === "write") return !usePatch + if (t.id === "edit") return !usePatch return true }) @@ -174,4 +176,4 @@ export namespace ToolRegistry { ) return result } -} +} \ No newline at end of file diff --git a/packages/opencode/src/tool/task.ts b/packages/opencode/src/tool/task.ts index a4cd8304f3..4207db941c 100644 --- a/packages/opencode/src/tool/task.ts +++ b/packages/opencode/src/tool/task.ts @@ -60,8 +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`) - - const allowsTask = agent.permission.some((rule) => rule.permission === "task" && rule.action === "allow") // kilocode_change + // 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. @@ -103,15 +105,9 @@ export const TaskTool = Tool.define("task", async (ctx) => { pattern: "*", action: "deny", }, - ...(allowsTask - ? [] - : [ - { - permission: "task" as const, - pattern: "*" as const, - action: "deny" as const, - }, - ]), + // 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, @@ -157,7 +153,7 @@ export const TaskTool = Tool.define("task", async (ctx) => { tools: { todowrite: false, todoread: false, - ...(allowsTask ? {} : { task: false }), + task: false, // kilocode_change ...Object.fromEntries((config.experimental?.primary_tools ?? []).map((t) => [t, false])), }, parts: promptParts, diff --git a/packages/opencode/src/tool/warpgrep.ts b/packages/opencode/src/tool/warpgrep.ts index 5e9bc43dcf..a43cc443d3 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."), // kilocode_change }), 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) // 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) { @@ -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") // kilocode_change let output: string if (fullOutput.length > MAX_OUTPUT_CHARS) { diff --git a/packages/opencode/src/tool/write.ts b/packages/opencode/src/tool/write.ts index 9de745798f..ec633be4e3 100644 --- a/packages/opencode/src/tool/write.ts +++ b/packages/opencode/src/tool/write.ts @@ -10,7 +10,7 @@ import { FileWatcher } from "../file/watcher" import { FileTime } from "../file/time" import { Filesystem } from "../util/filesystem" import { Instance } from "../project/instance" -import { trimDiff } from "./edit" +import { trimDiff, buildFileDiff } from "./edit" // kilocode_change import { assertExternalDirectory } from "./external-directory" import { filterDiagnostics } from "./diagnostics" // kilocode_change @@ -32,6 +32,7 @@ export const WriteTool = Tool.define("write", { if (exists) await FileTime.assert(ctx.sessionID, filepath) const diff = trimDiff(createTwoFilesPatch(filepath, filepath, contentOld, params.content)) + const filediff = buildFileDiff(filepath, contentOld, params.content) // kilocode_change await ctx.ask({ permission: "edit", patterns: [path.relative(Instance.worktree, filepath)], @@ -39,6 +40,7 @@ export const WriteTool = Tool.define("write", { metadata: { filepath, diff, + filediff, // kilocode_change }, }) @@ -78,6 +80,8 @@ export const WriteTool = Tool.define("write", { diagnostics: filterDiagnostics(diagnostics, [normalizedFilepath]), // kilocode_change filepath, exists: exists, + diff, // kilocode_change + filediff, // kilocode_change }, output, } diff --git a/packages/opencode/test/kilo-sessions/remote-ws.test.ts b/packages/opencode/test/kilo-sessions/remote-ws.test.ts index 7fe6152b23..df74ed1d2f 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/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 0000000000..4f945cea02 --- /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/kilocode/config-resilience.test.ts b/packages/opencode/test/kilocode/config-resilience.test.ts new file mode 100644 index 0000000000..5cb72a9138 --- /dev/null +++ b/packages/opencode/test/kilocode/config-resilience.test.ts @@ -0,0 +1,234 @@ +import { afterEach, describe, expect, test } from "bun:test" +import path from "path" +import { Config } from "../../src/config/config" +import { Instance } from "../../src/project/instance" +import { Filesystem } from "../../src/util/filesystem" +import { tmpdir } from "../fixture/fixture" + +afterEach(async () => { + await Instance.disposeAll() + Config.global.reset() +}) + +describe("config resilience", () => { + test("skips invalid agent markdown configs", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Filesystem.write( + path.join(dir, ".kilo", "agent", "skip.md"), + `--- +mode: "banana" +--- +Broken agent prompt`, + ) + await Filesystem.write( + path.join(dir, ".kilo", "agent", "keep.md"), + `--- +model: test/model +--- +Valid agent prompt`, + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const cfg = await Config.get() + + expect(cfg.agent?.["skip"]).toBeUndefined() + expect(cfg.agent?.["keep"]).toMatchObject({ + name: "keep", + model: "test/model", + prompt: "Valid agent prompt", + }) + }, + }) + }) + + test("reports a warning for invalid agent markdown configs", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Filesystem.write( + path.join(dir, ".kilo", "agent", "skip.md"), + `--- +mode: "banana" +--- +Broken agent prompt`, + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + await Config.get() + const warns = await Config.warnings() + + expect(warns.some((w) => w.path.includes("skip.md") && w.message.includes("mode"))).toBe(true) + }, + }) + }) + + test("skips invalid command markdown configs", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Filesystem.write( + path.join(dir, ".kilo", "command", "skip.md"), + `--- +subtask: "banana" +--- +Broken command template`, + ) + await Filesystem.write( + path.join(dir, ".kilo", "command", "keep.md"), + `--- +description: Valid command +--- +Valid command template`, + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const cfg = await Config.get() + + expect(cfg.command?.["skip"]).toBeUndefined() + expect(cfg.command?.["keep"]).toEqual({ + description: "Valid command", + template: "Valid command template", + }) + }, + }) + }) + + test("reports a warning for invalid command markdown configs", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Filesystem.write( + path.join(dir, ".kilo", "command", "skip.md"), + `--- +subtask: "banana" +--- +Broken command template`, + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + await Config.get() + const warns = await Config.warnings() + + expect(warns.some((w) => w.path.includes("skip.md") && w.message.includes("subtask"))).toBe(true) + }, + }) + }) + + test("collects warnings for invalid agent markdown configs", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Filesystem.write( + path.join(dir, ".kilo", "agent", "broken.md"), + `--- +mode: "banana" +--- +Broken agent`, + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + await Config.get() + const warns = await Config.warnings() + + expect(warns.some((w) => w.path.includes("broken.md") && w.message.includes("invalid"))).toBe(true) + }, + }) + }) + + test("collects warnings for invalid command markdown configs", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Filesystem.write( + path.join(dir, ".kilo", "command", "broken.md"), + `--- +subtask: "banana" +--- +Broken command`, + ) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + await Config.get() + const warns = await Config.warnings() + + expect(warns.some((w) => w.path.includes("broken.md") && w.message.includes("invalid"))).toBe(true) + }, + }) + }) + + test("collects warnings for invalid JSON in .kilo directory config", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Filesystem.write(path.join(dir, ".kilo", "kilo.json"), "{ not valid json !!!") + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const cfg = await Config.get() + const warns = await Config.warnings() + + // Config loading should not crash + expect(cfg).toBeDefined() + // Warning should reference the bad file + expect(warns.some((w) => w.path.includes("kilo.json") && w.message.includes("not valid JSON"))).toBe(true) + }, + }) + }) + + test("collects warnings for invalid schema in .kilo directory config", async () => { + await using tmp = await tmpdir({ + init: async (dir) => { + await Filesystem.write(path.join(dir, ".kilo", "kilo.json"), JSON.stringify({ unknownField: true })) + }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const cfg = await Config.get() + const warns = await Config.warnings() + + expect(cfg).toBeDefined() + expect(warns.some((w) => w.path.includes("kilo.json") && w.message.includes("invalid"))).toBe(true) + }, + }) + }) + + test("returns empty warnings when config is valid", async () => { + await using tmp = await tmpdir({ + config: { model: "test/model" }, + }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + await Config.get() + const warns = await Config.warnings() + + expect(warns).toEqual([]) + }, + }) + }) +}) diff --git a/packages/opencode/test/kilocode/help.test.ts b/packages/opencode/test/kilocode/help.test.ts new file mode 100644 index 0000000000..744ff1771a --- /dev/null +++ b/packages/opencode/test/kilocode/help.test.ts @@ -0,0 +1,177 @@ +import { describe, test, expect } from "bun:test" +import path from "path" +import { generateHelp, generateCommandTable } from "../../src/kilocode/help" +import { AcpCommand } from "../../src/cli/cmd/acp" +import { McpCommand } from "../../src/cli/cmd/mcp" +import { RunCommand } from "../../src/cli/cmd/run" +import { GenerateCommand } from "../../src/cli/cmd/generate" +import { DebugCommand } from "../../src/cli/cmd/debug" +import { AuthCommand } from "../../src/cli/cmd/auth" +import { AgentCommand } from "../../src/cli/cmd/agent" +import { UpgradeCommand } from "../../src/cli/cmd/upgrade" +import { UninstallCommand } from "../../src/cli/cmd/uninstall" +import { ServeCommand } from "../../src/cli/cmd/serve" +import { WebCommand } from "../../src/cli/cmd/web" +import { ModelsCommand } from "../../src/cli/cmd/models" +import { StatsCommand } from "../../src/cli/cmd/stats" +import { ExportCommand } from "../../src/cli/cmd/export" +import { ImportCommand } from "../../src/cli/cmd/import" +import { PrCommand } from "../../src/cli/cmd/pr" +import { SessionCommand } from "../../src/cli/cmd/session" +import { DbCommand } from "../../src/cli/cmd/db" +import { HelpCommand } from "../../src/kilocode/help-command" + +// Stand-in for TuiThreadCommand — the real one imports @opentui/solid which +// doesn't resolve in the test environment. Only command/describe matter here. +const TuiStub = { + command: "$0 [project]", + describe: "start kilo tui", + handler() {}, +} + +// Stand-in for AttachCommand — same reason as TuiStub above. +const AttachStub = { + command: "attach ", + describe: "attach to a running kilo server", + handler() {}, +} + +const commands = [ + AcpCommand, + McpCommand, + TuiStub, + AttachStub, + RunCommand, + GenerateCommand, + DebugCommand, + AuthCommand, + AgentCommand, + UpgradeCommand, + UninstallCommand, + ServeCommand, + WebCommand, + ModelsCommand, + StatsCommand, + ExportCommand, + ImportCommand, + PrCommand, + SessionCommand, + DbCommand, + HelpCommand, +] as any[] + +describe("kilo help --all (markdown)", () => { + test("contains ## heading for each known top-level command", async () => { + const output = await generateHelp({ all: true, format: "md", commands }) + for (const cmd of ["run", "auth", "debug", "mcp", "session", "agent"]) { + expect(output).toContain(`## kilo ${cmd}`) + } + }) + + test("contains headings for nested subcommands", async () => { + const output = await generateHelp({ all: true, format: "md", commands }) + expect(output).toContain("kilo auth login") + expect(output).toContain("kilo auth logout") + expect(output).toContain("kilo debug config") + }) +}) + +describe("kilo help --all (text)", () => { + test("does NOT contain Markdown ## headings or triple-backtick fences", async () => { + const output = await generateHelp({ all: true, format: "text", commands }) + expect(output).not.toMatch(/^##\s/m) + expect(output).not.toContain("```") + }) + + test("still contains each command name", async () => { + const output = await generateHelp({ all: true, format: "text", commands }) + for (const cmd of ["run", "auth", "debug", "mcp", "session", "agent"]) { + expect(output).toContain(`kilo ${cmd}`) + } + }) +}) + +describe("kilo help ", () => { + test("kilo help auth contains auth subcommand headings", async () => { + const output = await generateHelp({ command: "auth", format: "md", commands }) + expect(output).toContain("kilo auth login") + expect(output).toContain("kilo auth logout") + expect(output).toContain("kilo auth list") + }) + + test("kilo help auth does NOT contain run or debug headings", async () => { + const output = await generateHelp({ command: "auth", format: "md", commands }) + expect(output).not.toContain("## kilo run") + expect(output).not.toContain("## kilo debug") + }) +}) + +describe("edge cases", () => { + test("output contains no ANSI escape sequences", async () => { + const output = await generateHelp({ all: true, format: "md", commands }) + expect(/\x1b\[/.test(output)).toBe(false) + }) + + test("kilo help nonexistent throws unknown command error", async () => { + await expect(generateHelp({ command: "nonexistent", commands })).rejects.toThrow("unknown command") + }) +}) + +describe("generateCommandTable", () => { + test("returns a string containing a markdown table header", async () => { + const output = await generateCommandTable({ commands }) + expect(output).toContain("| Command | Description |") + }) + + test("contains rows for known commands", async () => { + const output = await generateCommandTable({ commands }) + for (const name of ["run", "auth", "debug", "mcp"]) { + expect(output).toContain(`kilo ${name}`) + } + }) + + test("default command appears as kilo [project], not $0", async () => { + const output = await generateCommandTable({ commands }) + expect(output).toContain("`kilo [project]`") + expect(output).not.toContain("$0") + }) + + test("contains no ANSI escape sequences", async () => { + const output = await generateCommandTable({ commands }) + expect(/\x1b\[/.test(output)).toBe(false) + }) + + test("skips commands with no describe", async () => { + const output = await generateCommandTable({ commands }) + expect(output).not.toContain("`kilo generate`") + }) + + test("contains kilo completion row", async () => { + const output = await generateCommandTable({ commands }) + expect(output).toContain("`kilo completion`") + }) + + test("contains kilo help row", async () => { + const output = await generateCommandTable({ commands }) + expect(output).toContain("`kilo help") + }) +}) + +describe("commands.ts stays in sync with index.ts", () => { + test("every .command() in index.ts has an entry in the commands array", async () => { + const index = await Bun.file(path.resolve(import.meta.dir, "../../src/index.ts")).text() + const barrel = await Bun.file(path.resolve(import.meta.dir, "../../src/kilocode/commands.ts")).text() + + // Match uncommented .command(XxxCommand) calls in index.ts + const registered = [...index.matchAll(/^\s*\.command\((\w+)\)/gm)].map((m) => m[1]!) + expect(registered.length).toBeGreaterThan(0) + + // Extract identifiers inside the exported commands = [...] array, not just anywhere in the file + const arrayMatch = barrel.match(/export const commands\s*=\s*\[([\s\S]*?)\]/) + expect(arrayMatch).toBeTruthy() + const entries = [...arrayMatch![1]!.matchAll(/\b(\w+Command)\b/g)].map((m) => m[1]!) + + const missing = registered.filter((name) => !entries.includes(name)) + expect(missing).toEqual([]) + }) +}) diff --git a/packages/opencode/test/kilocode/run-network.test.ts b/packages/opencode/test/kilocode/run-network.test.ts new file mode 100644 index 0000000000..725862fac1 --- /dev/null +++ b/packages/opencode/test/kilocode/run-network.test.ts @@ -0,0 +1,224 @@ +// kilocode_change - new file +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() + }) +}) 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 0000000000..b070937159 --- /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/permission/next.test.ts b/packages/opencode/test/permission/next.test.ts index add3332048..dcfd3b37c0 100644 --- a/packages/opencode/test/permission/next.test.ts +++ b/packages/opencode/test/permission/next.test.ts @@ -606,6 +606,61 @@ test("reply - always persists approval and resolves", async () => { }) }) +// kilocode_change start +test("allowEverything - session-scoped enable stays within one session", async () => { + await using tmp = await tmpdir({ git: true }) + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const first = PermissionNext.ask({ + id: "permission_session_allow", + sessionID: "session_allowed", + permission: "bash", + patterns: ["pwd"], + metadata: {}, + always: [], + ruleset: [], + }) + + await PermissionNext.allowEverything({ + enable: true, + requestID: "permission_session_allow", + sessionID: "session_allowed", + }) + + await expect(first).resolves.toBeUndefined() + + const allowed = await PermissionNext.ask({ + sessionID: "session_allowed", + permission: "bash", + patterns: ["ls"], + metadata: {}, + always: [], + ruleset: [], + }) + expect(allowed).toBeUndefined() + + const blocked = PermissionNext.ask({ + id: "permission_session_blocked", + sessionID: "session_blocked", + permission: "bash", + patterns: ["ls"], + metadata: {}, + always: [], + ruleset: [], + }) + + await PermissionNext.reply({ + requestID: "permission_session_blocked", + reply: "reject", + }) + + await expect(blocked).rejects.toBeInstanceOf(PermissionNext.RejectedError) + }, + }) +}) +// kilocode_change end + test("reply - reject cancels all pending for same session", async () => { await using tmp = await tmpdir({ git: true }) await Instance.provide({ diff --git a/packages/opencode/test/server/experimental-session-list.test.ts b/packages/opencode/test/server/experimental-session-list.test.ts new file mode 100644 index 0000000000..c26ff3917a --- /dev/null +++ b/packages/opencode/test/server/experimental-session-list.test.ts @@ -0,0 +1,92 @@ +// kilocode_change - new file +import { afterEach, describe, expect, mock, test } from "bun:test" +import { $ } from "bun" +import path from "path" +import { Config } from "../../src/config/config" +import { Instance } from "../../src/project/instance" +import { Log } from "../../src/util/log" +import { resetDatabase } from "../fixture/db" +import { tmpdir } from "../fixture/fixture" + +mock.module("@/kilo-sessions/remote-sender", () => ({ + RemoteSender: { + create() { + return { + handle() {}, + dispose() {}, + } + }, + }, +})) + +Log.init({ print: false }) + +afterEach(async () => { + await resetDatabase() +}) + +describe("experimental.session.list", () => { + test("filters sessions by repo worktree family even when project IDs drift", async () => { + await using first = await tmpdir({ git: true }) + await using second = await tmpdir({ git: true }) + const worktree = path.join(first.path, "..", path.basename(first.path) + "-worktree") + + try { + await $`git worktree add ${worktree} -b test-branch-${Date.now()}`.cwd(first.path).quiet() + await Bun.write(path.join(first.path, ".git", "opencode"), "stale-project-id") + + const share = Config.get + Config.get = async () => ({ share: "manual" }) as Awaited> + + try { + const { Server } = await import("../../src/server/server") + const { Session } = await import("../../src/session/index") + const root = await Instance.provide({ + directory: first.path, + fn: async () => ({ + app: Server.App(), + project: await Server.App().request("/project/current", { + headers: { "x-kilo-directory": first.path }, + }), + session: await Session.create({ title: "root-session" }), + }), + }) + + const branch = await Instance.provide({ + directory: worktree, + fn: async () => Session.create({ title: "worktree-session" }), + }) + + await Instance.provide({ + directory: second.path, + fn: async () => Session.create({ title: "other-project-session" }), + }) + + const app = root.app + const project = await root.project.json() + const response = await app.request( + `/experimental/session?projectID=${encodeURIComponent(project.id)}&roots=true&worktrees=true`, + { + headers: { "x-kilo-directory": first.path }, + }, + ) + + expect(response.status).toBe(200) + const body = await response.json() + const ids = body.map((item: { id: string }) => item.id) + const dirs = body.map((item: { directory: string }) => item.directory) + + expect(root.session.projectID).not.toBe(branch.projectID) + expect(project.id).toBe(root.session.projectID) + expect(ids).toContain(root.session.id) + expect(ids).toContain(branch.id) + expect(dirs).toContain(worktree) + expect(body.some((item: { title: string }) => item.title === "other-project-session")).toBe(false) + } finally { + Config.get = share + } + } finally { + await $`git worktree remove ${worktree}`.cwd(first.path).quiet().nothrow() + } + }) +}) diff --git a/packages/opencode/test/server/global-session-list.test.ts b/packages/opencode/test/server/global-session-list.test.ts index 05d6de04b1..bb2d640bc2 100644 --- a/packages/opencode/test/server/global-session-list.test.ts +++ b/packages/opencode/test/server/global-session-list.test.ts @@ -1,14 +1,33 @@ -import { describe, expect, test } from "bun:test" +// kilocode_change - new file +import { $ } from "bun" +import { afterEach, describe, expect, mock, test } from "bun:test" +import path from "path" import { Instance } from "../../src/project/instance" import { Project } from "../../src/project/project" -import { Session } from "../../src/session" import { Log } from "../../src/util/log" +import { resetDatabase } from "../fixture/db" import { tmpdir } from "../fixture/fixture" +mock.module("@/kilo-sessions/remote-sender", () => ({ + RemoteSender: { + create() { + return { + handle() {}, + dispose() {}, + } + }, + }, +})) + Log.init({ print: false }) +afterEach(async () => { + await resetDatabase() +}) + describe("Session.listGlobal", () => { test("lists sessions across projects with project metadata", async () => { + const { Session } = await import("../../src/session/index") await using first = await tmpdir({ git: true }) await using second = await tmpdir({ git: true }) @@ -40,6 +59,7 @@ describe("Session.listGlobal", () => { }) test("excludes archived sessions by default", async () => { + const { Session } = await import("../../src/session/index") await using tmp = await tmpdir({ git: true }) const archived = await Instance.provide({ @@ -64,6 +84,7 @@ describe("Session.listGlobal", () => { }) test("supports cursor pagination", async () => { + const { Session } = await import("../../src/session/index") await using tmp = await tmpdir({ git: true }) const first = await Instance.provide({ @@ -78,12 +99,48 @@ describe("Session.listGlobal", () => { const page = [...Session.listGlobal({ directory: tmp.path, limit: 1 })] expect(page.length).toBe(1) - expect(page[0].id).toBe(second.id) + expect(page[0]!.id).toBe(second.id) - const next = [...Session.listGlobal({ directory: tmp.path, limit: 10, cursor: page[0].time.updated })] + const next = [...Session.listGlobal({ directory: tmp.path, limit: 10, cursor: page[0]!.time.updated })] const ids = next.map((session) => session.id) expect(ids).toContain(first.id) expect(ids).not.toContain(second.id) }) + + test("filters by project family across worktrees when project IDs drift", async () => { + const { Session } = await import("../../src/session/index") + await using first = await tmpdir({ git: true }) + await using second = await tmpdir({ git: true }) + const worktree = path.join(first.path, "..", path.basename(first.path) + "-worktree") + + try { + await $`git worktree add ${worktree} -b test-branch-${Date.now()}`.cwd(first.path).quiet() + await Bun.write(path.join(first.path, ".git", "opencode"), "stale-project-id") + + const root = await Instance.provide({ + directory: first.path, + fn: async () => Session.create({ title: "root-session" }), + }) + const branch = await Instance.provide({ + directory: worktree, + fn: async () => Session.create({ title: "worktree-session" }), + }) + const other = await Instance.provide({ + directory: second.path, + fn: async () => Session.create({ title: "other-session" }), + }) + + const sessions = [...Session.listGlobal({ projectID: root.projectID, roots: true, limit: 200 })] + const ids = sessions.map((session) => session.id) + + expect(root.projectID).not.toBe(branch.projectID) + expect(ids).toContain(root.id) + expect(ids).toContain(branch.id) + expect(ids).not.toContain(other.id) + expect(sessions.find((session) => session.id === branch.id)?.directory).toBe(worktree) + } finally { + await $`git worktree remove ${worktree}`.cwd(first.path).quiet().nothrow() + } + }) }) diff --git a/packages/opencode/test/server/permission-allow-everything.test.ts b/packages/opencode/test/server/permission-allow-everything.test.ts new file mode 100644 index 0000000000..b7f39e7eba --- /dev/null +++ b/packages/opencode/test/server/permission-allow-everything.test.ts @@ -0,0 +1,78 @@ +// kilocode_change - new file +import { describe, expect, test } from "bun:test" +import { PermissionNext } from "../../src/permission/next" +import { Instance } from "../../src/project/instance" +import { Server } from "../../src/server/server" +import { Session } from "../../src/session" +import { tmpdir } from "../fixture/fixture" + +describe("permission.allowEverything endpoint", () => { + test("disables session-scoped allow-all without touching global config", async () => { + await using tmp = await tmpdir({ git: true }) + + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const app = Server.App() + const session = await Session.create({ + permission: [{ permission: "*", pattern: "*", action: "allow" }], + }) + + await PermissionNext.allowEverything({ + enable: true, + sessionID: session.id, + }) + + const response = await app.request("/permission/allow-everything", { + method: "POST", + headers: { + "Content-Type": "application/json", + "x-kilo-directory": tmp.path, + }, + body: JSON.stringify({ enable: false, sessionID: session.id }), + }) + + expect(response.status).toBe(200) + expect(await response.json()).toBe(true) + + const next = await Session.get(session.id) + expect(next.permission ?? []).toEqual([]) + + const pending = PermissionNext.ask({ + id: "permission_session_disable", + sessionID: session.id, + permission: "bash", + patterns: ["ls"], + metadata: {}, + always: [], + ruleset: [], + }) + + await PermissionNext.reply({ + requestID: "permission_session_disable", + reply: "reject", + }) + + await expect(pending).rejects.toBeInstanceOf(PermissionNext.RejectedError) + + const other = await Session.create({}) + const blocked = PermissionNext.ask({ + id: "permission_other_session", + sessionID: other.id, + permission: "bash", + patterns: ["pwd"], + metadata: {}, + always: [], + ruleset: [], + }) + + await PermissionNext.reply({ + requestID: "permission_other_session", + reply: "reject", + }) + + await expect(blocked).rejects.toBeInstanceOf(PermissionNext.RejectedError) + }, + }) + }) +}) diff --git a/packages/opencode/test/session/network.test.ts b/packages/opencode/test/session/network.test.ts new file mode 100644 index 0000000000..65f3266ff2 --- /dev/null +++ b/packages/opencode/test/session/network.test.ts @@ -0,0 +1,136 @@ +// kilocode_change - new file +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" + +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("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("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({ + 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) + }, + }) + }) + + 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() + } + }, + }) + }) + + 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) + }, + }) + }) +}) diff --git a/packages/opencode/test/session/retry.test.ts b/packages/opencode/test/session/retry.test.ts index 551065fdd7..1a4add0913 100644 --- a/packages/opencode/test/session/retry.test.ts +++ b/packages/opencode/test/session/retry.test.ts @@ -183,6 +183,23 @@ 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( + { + 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") + }) + // kilocode_change end + test("marks OpenAI 404 status codes as retryable", () => { const error = new APICallError({ message: "boom", diff --git a/packages/opencode/test/snapshot/snapshot.test.ts b/packages/opencode/test/snapshot/snapshot.test.ts index e70ce1d2ee..4ca841050f 100644 --- a/packages/opencode/test/snapshot/snapshot.test.ts +++ b/packages/opencode/test/snapshot/snapshot.test.ts @@ -1181,31 +1181,6 @@ test("diffFull with whitespace changes", async () => { // ── Tests for snapshot optimizations (upstream #17878, #20564) ──────── -test("concurrent track() calls return consistent results", async () => { - await using tmp = await bootstrap() - await Instance.provide({ - directory: tmp.path, - fn: async () => { - await Snapshot.track() - - await Filesystem.write(`${tmp.path}/a.txt`, "concurrent-change") - - const results = await Promise.all([ - Snapshot.track(), - Snapshot.track(), - Snapshot.track(), - Snapshot.track(), - Snapshot.track(), - ]) - - const hashes = results.filter(Boolean) - expect(hashes.length).toBe(5) - // All concurrent calls must return the same hash - expect(new Set(hashes).size).toBe(1) - }, - }) -}) - test("batch revert with many files sharing same hash", async () => { await using tmp = await tmpdir({ git: true, @@ -1351,11 +1326,7 @@ test("concurrent patch() calls return consistent results", async () => { await Filesystem.write(`${tmp.path}/a.txt`, "changed") - const results = await Promise.all([ - Snapshot.patch(before!), - Snapshot.patch(before!), - Snapshot.patch(before!), - ]) + const results = await Promise.all([Snapshot.patch(before!), Snapshot.patch(before!), Snapshot.patch(before!)]) // All should report the same changed files for (const result of results) { @@ -1470,52 +1441,6 @@ test("batch revert with multiple patches from different snapshots", async () => }) }) -test("concurrent track calls each produce a valid snapshot", async () => { - await using tmp = await tmpdir({ - git: true, - init: async (dir) => { - for (let i = 0; i < 10; i++) { - await Filesystem.write(`${dir}/file${i}.txt`, `original-${i}`) - } - await $`git add .`.cwd(dir).quiet() - await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet() - }, - }) - await Instance.provide({ - directory: tmp.path, - fn: async () => { - await Snapshot.track() // warm up - - for (let i = 0; i < 10; i++) { - await Filesystem.write(`${tmp.path}/file${i}.txt`, `changed-${i}`) - } - - // Fire 5 concurrent tracks, then verify each hash is a usable snapshot - const hashes = (await Promise.all([ - Snapshot.track(), - Snapshot.track(), - Snapshot.track(), - Snapshot.track(), - Snapshot.track(), - ])).filter(Boolean) as string[] - - expect(hashes.length).toBe(5) - - // Every hash should produce a valid diffFull against itself (empty diff) - for (const hash of hashes) { - const diff = await Snapshot.diffFull(hash, hash) - expect(diff).toEqual([]) - } - - // Every hash should be usable for restore without error - await Snapshot.restore(hashes[0]!) - for (let i = 0; i < 10; i++) { - expect(await Filesystem.readText(`${tmp.path}/file${i}.txt`)).toBe(`changed-${i}`) - } - }, - }) -}) - test("track after revert produces clean snapshot", async () => { await using tmp = await tmpdir({ git: true, diff --git a/packages/opencode/test/tool/recall.test.ts b/packages/opencode/test/tool/recall.test.ts new file mode 100644 index 0000000000..677923a55e --- /dev/null +++ b/packages/opencode/test/tool/recall.test.ts @@ -0,0 +1,148 @@ +// kilocode_change - new file +import { afterEach, describe, expect, mock, test } from "bun:test" +import { $ } from "bun" +import path from "path" +import { Instance } from "../../src/project/instance" +import { Config } from "../../src/config/config" +import { RecallTool } from "../../src/tool/recall" +import { resetDatabase } from "../fixture/db" +import { tmpdir } from "../fixture/fixture" +import type { Tool } from "../../src/tool/tool" + +mock.module("@/kilo-sessions/remote-sender", () => ({ + RemoteSender: { + create() { + return { + handle() {}, + dispose() {}, + } + }, + }, +})) + +const ctx: Tool.Context = { + sessionID: "ses_test", + messageID: "msg_test", + callID: "call_test", + agent: "code", + abort: AbortSignal.any([]), + messages: [], + metadata: () => {}, + ask: async () => {}, +} + +afterEach(async () => { + await resetDatabase() +}) + +describe("tool.recall", () => { + test("search is limited to the current project worktrees", async () => { + await using first = await tmpdir({ git: true }) + await using second = await tmpdir({ git: true }) + const worktree = path.join(first.path, "..", path.basename(first.path) + "-worktree") + + try { + await $`git worktree add ${worktree} -b test-branch-${Date.now()}`.cwd(first.path).quiet() + await Bun.write(path.join(first.path, ".git", "opencode"), "stale-project-id") + + const share = Config.get + Config.get = async () => ({ share: "manual" }) as Awaited> + + try { + const { Session } = await import("../../src/session/index") + await Instance.provide({ + directory: first.path, + fn: async () => Session.create({ title: "search-target root" }), + }) + await Instance.provide({ + directory: worktree, + fn: async () => Session.create({ title: "search-target worktree" }), + }) + await Instance.provide({ + directory: second.path, + fn: async () => Session.create({ title: "search-target other" }), + }) + + const result = await Instance.provide({ + directory: first.path, + fn: async () => { + const tool = await RecallTool.init() + return tool.execute({ mode: "search", query: "search-target" }, ctx) + }, + }) + + expect(result.output).toContain("search-target root") + expect(result.output).toContain("search-target worktree") + expect(result.output).not.toContain("search-target other") + } finally { + Config.get = share + } + } finally { + await $`git worktree remove ${worktree}`.cwd(first.path).quiet().nothrow() + } + }) + + test("read rejects sessions from another project", async () => { + await using first = await tmpdir({ git: true }) + await using second = await tmpdir({ git: true }) + + const share = Config.get + Config.get = async () => ({ share: "manual" }) as Awaited> + + try { + const { Session } = await import("../../src/session/index") + const session = await Instance.provide({ + directory: second.path, + fn: async () => Session.create({ title: "other-project-session" }), + }) + + const err = await Instance.provide({ + directory: first.path, + fn: async () => { + const tool = await RecallTool.init() + return tool.execute({ mode: "read", sessionID: session.id }, ctx).catch((error) => error as Error) + }, + }) + + expect(err).toBeInstanceOf(Error) + expect((err as Error).message).toContain("belongs to a different workspace") + } finally { + Config.get = share + } + }) + + test("read allows sessions from sibling worktrees when project IDs drift", async () => { + await using first = await tmpdir({ git: true }) + const worktree = path.join(first.path, "..", path.basename(first.path) + "-worktree") + + try { + await $`git worktree add ${worktree} -b test-branch-${Date.now()}`.cwd(first.path).quiet() + await Bun.write(path.join(first.path, ".git", "opencode"), "stale-project-id") + + const share = Config.get + Config.get = async () => ({ share: "manual" }) as Awaited> + + try { + const { Session } = await import("../../src/session/index") + const session = await Instance.provide({ + directory: worktree, + fn: async () => Session.create({ title: "worktree readable" }), + }) + + const result = await Instance.provide({ + directory: first.path, + fn: async () => { + const tool = await RecallTool.init() + return tool.execute({ mode: "read", sessionID: session.id }, ctx) + }, + }) + + expect(result.output).toContain("# Session: worktree readable") + } finally { + Config.get = share + } + } finally { + await $`git worktree remove ${worktree}`.cwd(first.path).quiet().nothrow() + } + }) +}) diff --git a/packages/opencode/test/tool/skill.test.ts b/packages/opencode/test/tool/skill.test.ts index 70649dd901..0fa1f13d4b 100644 --- a/packages/opencode/test/tool/skill.test.ts +++ b/packages/opencode/test/tool/skill.test.ts @@ -109,4 +109,36 @@ Use this skill. process.env.KILO_TEST_HOME = home } }) + + test("built-in kilo-config includes named command lookup guidance", async () => { + await using tmp = await tmpdir({ git: true }) + + const home = process.env.KILO_TEST_HOME + process.env.KILO_TEST_HOME = tmp.path + + try { + await Instance.provide({ + directory: tmp.path, + fn: async () => { + const tool = await SkillTool.init() + const ctx: Tool.Context = { + ...baseCtx, + ask: async () => {}, + } + + const result = await tool.execute({ name: "kilo-config" }, ctx) + + expect(tool.description).toContain("where it loads things from") + expect(result.metadata.dir).toBe("builtin") + expect(result.output).toContain("### Finding a named command") + expect(result.output).toContain("`~/.config/kilo/`") + expect(result.output).toContain("`~/.kilocode/`") + expect(result.output).toContain("`**/command/.md`") + expect(result.output).toContain("explicit search `path`") + }, + }) + } finally { + process.env.KILO_TEST_HOME = home + } + }) }) diff --git a/packages/plugin/package.json b/packages/plugin/package.json index cf439ced8a..5fcd17fc5a 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@kilocode/plugin", - "version": "7.1.23", + "version": "7.2.3", "type": "module", "license": "MIT", "scripts": { diff --git a/packages/script/package.json b/packages/script/package.json index c951dcd568..84bb75bec1 100644 --- a/packages/script/package.json +++ b/packages/script/package.json @@ -8,7 +8,10 @@ "exports": { ".": "./src/index.ts" }, - "version": "7.1.23", + "version": "7.2.3", + "scripts": { + "test": "bun test" + }, "dependencies": {}, "peerDependencies": {} } diff --git a/packages/script/src/index.ts b/packages/script/src/index.ts index 5fcdae3d5f..a4c91a3a76 100644 --- a/packages/script/src/index.ts +++ b/packages/script/src/index.ts @@ -21,30 +21,86 @@ 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_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 +function parseVersion(input: string) { + const match = input.trim().match(/^v?(\d+)\.(\d+)\.(\d+)$/) + if (!match) return + return { + major: Number(match[1]), + minor: Number(match[2]), + patch: Number(match[3]), + value: `${match[1]}.${match[2]}.${match[3]}`, + } +} + +function compareVersion( + a: NonNullable>, + b: NonNullable>, +) { + if (a.major !== b.major) return a.major - b.major + if (a.minor !== b.minor) return a.minor - b.minor + return a.patch - b.patch +} + +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 +} + +async function fetchHighest() { + if (!env.KILO_RELEASE || !process.env.GH_REPO) return fetchLatest() + const data: { tagName: string }[] = await $`gh release list --json tagName --limit 100 --repo ${process.env.GH_REPO}` + .json() + .catch(() => []) + const versions = data.flatMap((item) => { + const version = parseVersion(item.tagName) + if (!version) return [] + return [version] + }) + const highest = versions.sort(compareVersion).at(-1) + if (highest) return highest.value + return fetchLatest() +} + +function bumpVersion(current: string, type: string) { + const version = parseVersion(current) + if (!version) throw new Error(`Invalid version: ${current}`) + if (type === "major") return `${version.major + 1}.0.0` + if (type === "minor") return `${version.major}.${version.minor + 1}.0` + return `${version.major}.${version.minor}.${version.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 - rc releases use plain semver required by VS Code Marketplace + if (env.KILO_BUMP && env.KILO_PRE_RELEASE === "true") { + const current = await fetchHighest() + return bumpVersion(current, env.KILO_BUMP.toLowerCase()) + } + // kilocode_change end + return `0.0.0-${CHANNEL}-${new Date().toISOString().slice(0, 16).replace(/[-:T]/g, "")}` + } + const version = await fetchHighest() // kilocode_change + return bumpVersion(version, env.KILO_BUMP?.toLowerCase() ?? "patch") // kilocode_change })() // kilocode_change start diff --git a/packages/script/tests/check-opencode-annotations.test.ts b/packages/script/tests/check-opencode-annotations.test.ts new file mode 100644 index 0000000000..de0b7fccc5 --- /dev/null +++ b/packages/script/tests/check-opencode-annotations.test.ts @@ -0,0 +1,596 @@ +import { describe, expect, test } from "bun:test" +import path from "node:path" + +const SOURCE_EXTS = new Set([".ts", ".tsx", ".js", ".jsx"]) + +function isExempt(file: string) { + const norm = file.replaceAll("\\", "/").toLowerCase() + return norm.split("/").some((part) => part.includes("kilocode")) +} + +function isSource(file: string) { + return SOURCE_EXTS.has(path.extname(file)) +} + +const MARKER_PREFIX = /(?:\/\/|\{?\s*\/\*)\s*kilocode_change\b/ + +function hasMarker(line: string) { + return MARKER_PREFIX.test(line) +} + +function coveredLines(text: string): Set { + const lines = text.split(/\r?\n/) + const covered = new Set() + + const first = lines.find((x) => x.trim() !== "") + if (first?.match(/(?:\/\/|\{?\s*\/\*)\s*kilocode_change\s*-\s*new\s*file\b/)) { + for (let i = 1; i <= lines.length; i++) covered.add(i) + return covered + } + + let block = false + for (let i = 0; i < lines.length; i++) { + const n = i + 1 + const line = lines[i] ?? "" + + if (line.match(/(?:\/\/|\{?\s*\/\*)\s*kilocode_change\s+start\b/)) { + block = true + covered.add(n) + continue + } + + if (line.match(/(?:\/\/|\{?\s*\/\*)\s*kilocode_change\s+end\b/)) { + covered.add(n) + block = false + continue + } + + if (block) { + covered.add(n) + continue + } + + if (hasMarker(line)) covered.add(n) + } + + return covered +} + +function checkLine(line: string, covered: Set, n: number): boolean { + const trim = line.trim() + if (!trim) return true + if (hasMarker(trim)) return true + return covered.has(n) +} + +// ─── hasMarker tests ────────────────────────────────────────────────────────── + +describe("hasMarker", () => { + const cases: Array<[string, boolean]> = [ + // JS-style inline + ["// kilocode_change", true], + [" // kilocode_change", true], + ["const x = 1 // kilocode_change", true], + ["// kilocode_change start", true], + ["// kilocode_change end", true], + ["// kilocode_change - new file", true], + ["// kilocode_change", true], + ["// kilocode_change ", true], + + // JSX-style inline + ["{/* kilocode_change */}", true], + [" {/* kilocode_change */}", true], + ["{/* kilocode_change start */}", true], + ["{/* kilocode_change end */}", true], + ["{/* kilocode_change - new file */}", true], + ["{/* kilocode_change - KiloNews added */}", true], + ["{/* kilocode_change */}", true], + ["{/* kilocode_change */}", true], + + // bare /* */ style + ["/* kilocode_change */", true], + [" /* kilocode_change */", true], + ["/* kilocode_change start */", true], + ["/* kilocode_change end */", true], + + // Non-markers + ["const x = 1", false], + ["{label}", false], + ["// some other comment", false], + ["{/* just a comment */}", false], + ["/* something else */", false], + // typo variants — should NOT match (missing word boundary) + ["// kilocode_changes", false], + ["// kilocode_changelog", false], + ["/* kilocode_change_log */", false], + ["{/* kilocode_changes */}", false], + ["// kilocode_changeable", false], + ["", false], + [" ", false], + ] + + test.each(cases)("input %j → %j", (input, expected) => { + expect(hasMarker(input)).toBe(expected) + }) +}) + +// ─── isExempt tests ─────────────────────────────────────────────────────────── + +describe("isExempt", () => { + const cases: Array<[string, boolean]> = [ + // exempt — "kilocode" in path + ["packages/opencode/src/kilocode/foo.ts", true], + ["packages/opencode/test/kilocode/bar.test.ts", true], + ["packages/opencode/src/some/kilocode/deep/path.ts", true], + ["packages/opencode/src/kilocode/deep/nested/file.tsx", true], + // exempt — "kilocode" in filename + ["packages/opencode/src/foo/kilocode.ts", true], + ["packages/opencode/src/bar/kilocode.test.ts", true], + ["packages/opencode/src/file.kilocode.ts", true], + // exempt — case-insensitive + ["packages/opencode/src/KiloCode/foo.ts", true], + ["packages/opencode/src/KILOCODE/bar.ts", true], + // NOT exempt + ["packages/opencode/src/index.ts", false], + ["packages/opencode/src/cli/cmd/tui/routes/home.tsx", false], + ["packages/opencode/src/cli/cmd/tui/routes/session/index.tsx", false], + ["packages/opencode/src/tool/registry.ts", false], + ["packages/opencode/src/config/config.ts", false], + ["packages/opencode/src/indexing/search-service.ts", false], + // kilocode_change is not the same as kilocode + ["packages/opencode/src/check-opencode-annotations.ts", false], + ] + + test.each(cases)("%j → exempt=%j", (file, expected) => { + expect(isExempt(file)).toBe(expected) + }) +}) + +// ─── isSource tests ─────────────────────────────────────────────────────────── + +describe("isSource", () => { + const cases: Array<[string, boolean]> = [ + ["foo.ts", true], + ["foo.tsx", true], + ["foo/bar.tsx", true], + ["foo.js", true], + ["foo.jsx", true], + [".json", false], + [".md", false], + [".txt", false], + ["Makefile", false], + ["foo.go", false], + ["foo.rs", false], + ] + + test.each(cases)("%j → isSource=%j", (file, expected) => { + expect(isSource(file)).toBe(expected) + }) +}) + +// ─── coveredLines tests ─────────────────────────────────────────────────────── + +describe("coveredLines", () => { + test("empty file", () => { + const covered = coveredLines("") + expect(covered.size).toBe(0) + }) + + test("file with only whitespace", () => { + const covered = coveredLines(" \n\n \n") + expect(covered.size).toBe(0) + }) + + test("whole-file JS annotation", () => { + const covered = coveredLines("// kilocode_change - new file\nexport const x = 1\nexport const y = 2") + expect(covered).toEqual(new Set([1, 2, 3])) + }) + + test("whole-file JSX annotation", () => { + const covered = coveredLines("{/* kilocode_change - new file */}\nexport const x = 1\nexport const y = 2") + expect(covered).toEqual(new Set([1, 2, 3])) + }) + + test("JS block markers", () => { + const text = [ + "const a = 1", + "// kilocode_change start", + "const b = 2", + "const c = 3", + "// kilocode_change end", + "const d = 4", + ].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([2, 3, 4, 5])) // block markers + content + }) + + test("JSX block markers", () => { + const text = [ + "const a = 1", + "{/* kilocode_change start */}", + "const b = 2", + "const c = 3", + "{/* kilocode_change end */}", + "const d = 4", + ].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([2, 3, 4, 5])) + }) + + test("mixed JS and JSX block markers (nested)", () => { + const text = [ + "// kilocode_change start", + "{/* kilocode_change start */}", + "const b = 2", + "{/* kilocode_change end */}", + "// kilocode_change end", + ].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([1, 2, 3, 4, 5])) + }) + + test("bare /* */ block markers", () => { + const text = ["/* kilocode_change start */", "const b = 2", "/* kilocode_change end */"].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([1, 2, 3])) + }) + + test("inline JS marker covers only that line", () => { + const text = ["const a = 1", "const b = 2 // kilocode_change", "const c = 3"].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([2])) + }) + + test("inline JSX marker covers only that line", () => { + const text = ["const a = 1", "{/* kilocode_change */}", "const c = 3"].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([2])) + }) + + test("inline JS marker with code on same line", () => { + const text = "const url = Flag.KILO_MODELS_URL || 'https://models.dev' // kilocode_change\n" + const covered = coveredLines(text) + expect(covered).toEqual(new Set([1])) + }) + + test("JSX block marker with descriptive suffix", () => { + const text = [ + "{/* kilocode_change start - Kilo-specific error display */}", + "", + "{/* kilocode_change end */}", + ].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([1, 2, 3])) + }) + + test("multiple independent blocks", () => { + const text = [ + "// kilocode_change start", + "const a = 1", + "// kilocode_change end", + "const b = 2", + "{/* kilocode_change start */}", + "const c = 3", + "{/* kilocode_change end */}", + "const d = 4", + ].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([1, 2, 3, 5, 6, 7])) + }) + + test("marker line with extra text after marker is still covered", () => { + const text = [ + "const a = 1", + "// kilocode_change start - this is kilo specific", + "const b = 2", + "// kilocode_change end", + ].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([2, 3, 4])) + }) + + test("nested block — inner block ends, outer continues", () => { + const text = [ + "// kilocode_change start", + "{/* kilocode_change start */}", + "const b = 2", + "{/* kilocode_change end */}", + "const c = 3", + "// kilocode_change end", + ].join("\n") + const covered = coveredLines(text) + // Line 1: start, block=true + // Line 2: inner start, block=true (covered by block) + // Line 3: covered by block + // Line 4: inner end, block=false, covered by end marker + // Line 5: NOT covered (block is false, no inline marker) + // Line 6: outer end, block already false, covered by end marker + expect(covered).toEqual(new Set([1, 2, 3, 4, 6])) + }) + + test("whitespace before marker is handled", () => { + const text = [" {/* kilocode_change start */}", " const b = 2", " {/* kilocode_change end */}"].join("\n") + const covered = coveredLines(text) + expect(covered).toEqual(new Set([1, 2, 3])) + }) +}) + +// ─── checkLine integration tests ────────────────────────────────────────────── +// Simulates what the main loop does for each added line + +describe("checkLine (main loop simulation)", () => { + function check(text: string, addedLines: number[]): string[] { + const covered = coveredLines(text) + const lines = text.split(/\r?\n/) + const violations: string[] = [] + for (const n of addedLines) { + const line = lines[n - 1] ?? "" + const trim = line.trim() + if (!trim) continue + if (hasMarker(trim)) continue + if (!covered.has(n)) violations.push(`line ${n}: ${trim}`) + } + return violations + } + + test("covered line reports no violation", () => { + const text = ["// kilocode_change start", "const kilo = 1", "// kilocode_change end"].join("\n") + expect(check(text, [2])).toEqual([]) + }) + + test("uncovered line reports violation", () => { + const text = ["const uncovered = 1", "const also_uncovered = 2"].join("\n") + expect(check(text, [1, 2])).toEqual(["line 1: const uncovered = 1", "line 2: const also_uncovered = 2"]) + }) + + test("empty lines are skipped", () => { + const text = ["const x = 1", "", " ", "", "const y = 2"].join("\n") + expect(check(text, [1, 2, 3, 4, 5])).toEqual(["line 1: const x = 1", "line 5: const y = 2"]) + }) + + test("marker lines are skipped even if uncovered", () => { + // This shouldn't normally happen, but the loop should skip it + const text = ["{/* kilocode_change */}", "{/* kilocode_change start */}"].join("\n") + expect(check(text, [1, 2])).toEqual([]) + }) + + test("real-world TSX home.tsx pattern", () => { + const text = [ + '', + " {/* kilocode_change start */}", + " ", + " {indexingLabel()}", + " ", + " {/* kilocode_change end */}", + "", + ].join("\n") + // Only the first and last lines (opening/closing box) should be uncovered + expect(check(text, [1, 7])).toEqual([`line 1: `, `line 7: `]) + // Middle lines are covered + expect(check(text, [2, 3, 4, 5, 6])).toEqual([]) + }) + + test("real-world TSX session index.tsx pattern", () => { + const text = [ + "const foo = 1", + "{/* kilocode_change start */}", + '', + "", + "", + "{/* kilocode_change end */}", + "const bar = 2", + ].join("\n") + // Lines 1 and 7 are uncovered (not in any block) + expect(check(text, [1, 7])).toEqual(["line 1: const foo = 1", "line 7: const bar = 2"]) + // Lines 2-6 are covered + expect(check(text, [2, 3, 4, 5, 6])).toEqual([]) + }) + + test("real-world TSX sidebar.tsx pattern", () => { + const text = [ + "", + " {/* kilocode_change start */}", + " ", + " {/* kilocode_change end */}", + "", + " {/* kilocode_change start */}", + "
other content
", + " {/* kilocode_change end */}", + ].join("\n") + expect(check(text, [1, 5])).toEqual(["line 1: ", "line 5: "]) + expect(check(text, [2, 3, 4, 6, 7, 8])).toEqual([]) + }) + + test("real-world TSX permission.tsx inline pattern", () => { + const text = [ + "{/* kilocode_change */}", + "", + "{/* kilocode_change */}", + "", + ].join("\n") + expect(check(text, [2, 4])).toEqual(["line 2: ", "line 4: "]) + expect(check(text, [1, 3])).toEqual([]) + }) + + test("JS-style session/index.tsx pattern (from existing codebase)", () => { + const text = ["const foo = 1", "", "{/* kilocode_change */}", "