patch

## Summary

- Filter sessions whose artifact files were manually removed from `~/.cline/data/sessions` so `listSessions` no longer returns deleted sessions
- Add background cleanup for stale persisted session rows and wire it into hub daemon-owned session services
- Cascade cleanup to child/subagent rows and align file-backed delete behavior with SQLite-backed behavior

## Validation

- `bunx vitest run sdk/packages/core/src/session/services/persistence-service.test.ts`
- `bun biome check --diagnostic-level=error ...`
- `bun -F @cline/core typecheck`

## Notes

- Missing-artifact cleanup is scheduled in the background and errors are caught/logged.
- `listSessions` filters stale rows immediately without waiting for persisted row cleanup.

.claude/hooks/claude-code-for-web-setup.sh

@@ -41,11 +41,11 @@ fi
 
 # Install project dependencies
 echo "Installing dependencies..."
-bun run install:all
+npm run install:all
 
 # Generate gRPC/protobuf types (required for TypeScript)
 echo "Generating proto types..."
-bun run protos
+npm run protos
 
 echo ""
 echo "Session setup complete!"

.clinerules/bun-and-node.md

@@ -1,55 +0,0 @@
-# Bun (tooling) and Node (runtime)
-
-This repo uses **bun** for package management and task running, and **Node** as
-the execution runtime. Both are correct at the same time; the distinction is the
-source of most confusion, so keep it straight before editing scripts, configs,
-docs, or comments.
-
-## Use bun for tooling
-
-- `bun install` (never `npm install` / `npm ci`)
-- `bun run <script>` (never `npm run <script>`)
-- `bunx <bin>` (never `npx <bin>`)
-- `bun <file>.ts` to run a TS entrypoint directly (no `ts-node` / `tsx`)
-- `bun esbuild.mjs` to drive the build (esbuild/vite are still the bundlers)
-- `bun run --parallel ...` for parallel tasks
-
-The root `bun.lock` is the single lockfile for the whole workspace, including
-`apps/vscode`, `webview-ui`, and `testing-platform`. There are no per-package npm
-lockfiles.
-
-## Node is the runtime — do NOT rewrite these to bun
-
-The build product runs on Node: the VS Code extension host loads
-`dist/extension.js` as CommonJS under Node, and the standalone `cline-core` is a
-Node process. The following are Node runtime/ABI references and are correct as-is:
-
-| Reference | Why it is Node |
-|-----------|----------------|
-| esbuild `platform: "node"` / `target: "node..."` | The bundle targets the Node runtime (extension host, standalone core). |
-| `TARGET_NODE_VERSION` (`scripts/package-standalone.mjs`) | Pins the Node ABI of the bundled standalone runtime (matches the JetBrains-packaged Node). |
-| `prebuild-install --target=<node version>` | Downloads native `.node` binaries for that Node ABI. |
-| `NODE_PATH=... node cline-core.js` | The standalone core is launched by Node, not bun. |
-| `node:` import specifiers (e.g. `node:fs`) | Node builtin module scheme; unrelated to tooling. |
-| `process.versions.node`, `engines.node`, `@types/node` | Runtime version probe / declared runtime / its types. |
-| `ELECTRON_RUN_AS_NODE` | VS Code/Electron runs the extension host as Node. |
-
-When a file legitimately uses both bun and node (e.g. `package-standalone.mjs`
-does `bun install` but `prebuild-install --target=<node>`), the `node` token is
-the runtime/ABI target, not tooling. If unsure, leave it.
-
-## Tests: bun vs the VS Code host
-
-A test file's runner is decided by its import:
-
-- **`import ... from "bun:test"`** → runs under `bun test` (the node-side unit
-  suites + the SDK/model-catalog suites). `scripts/run-bun-unit-tests.ts`
-  discovers these by the `bun:test` import and runs one isolated bun process per
-  file. `build-tests.js` excludes them from the integration compile so the
-  `bun:test` builtin never reaches Node.
-- **`import ... from "mocha"`** → runs under `@vscode/test-cli` in a real VS Code
-  extension host (Node). These exercise the live `vscode` API and cannot run
-  under bun.
-
-So a file imports `bun:test` XOR `mocha`. Don't add `bun:test` to a test that
-needs the real extension host.

.clinerules/debug-harness.md

@@ -1,128 +0,0 @@
-# Debug Harness
-
-HTTP-controlled debugger for the VSCode extension at `src/dev/debug-harness/server.ts`.
-
-## Quick start
-
-```bash
-# Build extension first if needed (protos + esbuild):
-bun run protos && IS_DEV=true bun esbuild.mjs
-
-# Launch (skip-build if already built):
-bun src/dev/debug-harness/server.ts --skip-build --auto-launch
-
-# In another terminal:
-curl localhost:19229/api -d '{"method":"status"}'
-```
-
-## Data Isolation
-
-The debugee runs with `CLINE_DIR=~/.cline2` by default, separate from your real `~/.cline`.
-This prevents the debugee's logout from logging out the debugger, and vice versa.
-Override with `--cline-dir /tmp/test-dir`. Check with `status()` → `clineDir`.
-
-## Browser Capture & OAuth
-
-The debugee runs with `CLINE_CAPTURE_BROWSER=1`, which intercepts `openExternal()` in
-`src/utils/env.ts`. URLs are captured instead of opening a real browser:
-
-- Logged to `$CLINE_DIR/data/debug-captured-urls.jsonl`
-- POSTed in real-time to `/captured-url` on the harness server
-- Queryable via `oauth.captured_urls`
-
-### OAuth API
-
-- **`oauth.captured_urls`** `{clear?}` — URLs the debugee tried to open
-- **`oauth.read_stored_token`** — Check auth token presence in secrets.json
-- **`oauth.simulate_callback`** `{path, code?, state?, provider?, token?}` — Build vscode:// callback URI
-- **`oauth.read_captured_urls_file`** — Read on-disk JSONL of captured URLs
-
-### OAuth testing flow
-
-For **Cline OAuth** (SDK local callback): The SDK starts a local HTTP server, the auth URL
-is captured. To complete: open the captured URL in a real browser (it redirects back to the
-SDK's callback server), OR extract the callback port and `curl http://127.0.0.1:PORT/callback?code=...`.
-
-For **MCP/Provider OAuth** (vscode:// URI): The redirect goes to a vscode:// URI.
-`oauth.simulate_callback` only *builds* the URI — it does not deliver it, and the ESM
-extension host can't `require()` the handler. To actually deliver the callback, call the
-debug-only hook via `ext.evaluate` (with `awaitPromise: true`):
-`globalThis.__clineHandleUri("vscode://saoudrizwan.claude-dev/...?code=...&state=...")`.
-It runs the same `SharedUriHandler.handleUri` as VSCode's real URI handler and exists only
-when `CLINE_CAPTURE_BROWSER` is set (the harness always sets it; never ships in prod).
-For end-to-end MCP OAuth, get a real `code` from the local MCP OAuth test server
-(`bun run dev:mcp-oauth-test-server`).
-
-## Navigating Views — Use Commands, Not Clicks
-
-Don't try to find/click small sidebar icons. Use VSCode commands via command palette.
-Registered in `src/registry.ts`:
-
-| Command | View |
-|---------|------|
-| `cline.accountButtonClicked` | Account / sign-in |
-| `cline.historyButtonClicked` | Task history |
-| `cline.settingsButtonClicked` | Settings |
-| `cline.mcpButtonClicked` | MCP servers |
-| `cline.plusButtonClicked` | New task (chat) |
-| `cline.worktreesButtonClicked` | Worktrees |
-
-```bash
-curl localhost:19229/api -d '{"method":"ui.command_palette","params":{"command":"cline.accountButtonClicked"}}'
-```
-
-## Key commands
-
-All via `POST localhost:19229/api` with `{"method":"...", "params":{...}}`:
-
-- **`launch`** / **`shutdown`** — lifecycle
-- **`ui.screenshot`** — screenshot to `/tmp/cline-debug/`; returns `{path}` — **use `read_file` on the path to examine, do NOT `open` the file** (Preview.app covers the VSCode window)
-- **`ui.open_sidebar`** — open the Cline sidebar
-- **`ext.set_breakpoint`** `{file, line, condition?}` — breakpoint by source file (sourcemap-resolved)
-- **`ext.evaluate`** `{expression, callFrameId?}` — eval in extension host
-- **`ext.resume`** / **`ext.step_over`** / **`ext.step_into`** — stepping
-- **`ext.call_stack`** — inspect when paused
-- **`web.evaluate`** `{expression}` — eval in webview
-- **`web.post_message`** `{message}` — send postMessage to extension host via exposed vsCodeApi
-- **`wait_for_pause`** `{timeout?}` — block until breakpoint hit
-- **`ui.locator`** `{role?, testId?, text?, frame?}` — Playwright locator (auto-retries on stale sidebar frame)
-- **`ui.react_input`** `{text, selector?, clear?, submit?}` — set React textarea value via `execCommand('insertText')`; works reliably across multiple tasks
-- **`ui.send_message`** `{text, images?, files?, responseType?}` — send chat message bypassing the textarea entirely (via gRPC postMessage)
-- **`ui.command_palette`** `{command}` — run VSCode command
-
-## Typical Session
-
-```bash
-# 1. Launch
-curl localhost:19229/api -d '{"method":"launch","params":{"skipBuild":true}}'
-
-# 2. Open sidebar + dismiss overlays (ALWAYS do this first)
-curl localhost:19229/api -d '{"method":"ui.open_sidebar"}'
-curl localhost:19229/api -d '{"method":"web.evaluate","params":{"expression":"document.querySelectorAll(\".sr-only\").forEach(el => el.parentElement?.click())"}}'
-
-# 3. Navigate to view
-curl localhost:19229/api -d '{"method":"ui.command_palette","params":{"command":"cline.accountButtonClicked"}}'
-
-# 4. Check captured OAuth URLs if testing auth
-curl localhost:19229/api -d '{"method":"oauth.captured_urls"}'
-
-# 5. Verify
-curl localhost:19229/api -d '{"method":"ui.screenshot"}'
-```
-
-## Caveats
-
-- **⚠️ Dismiss promotional overlays FIRST**: On fresh launches, full-screen promo overlays block the sidebar. **Dismiss immediately after `ui.open_sidebar`**, before any other interaction or screenshot. May need to run twice:
-  ```bash
-  curl localhost:19229/api -d '{"method": "ui.open_sidebar"}'
-  curl localhost:19229/api -d '{"method": "web.evaluate", "params": {"expression": "document.querySelectorAll(\".sr-only\").forEach(el => el.parentElement?.click())"}}'
-  ```
-- **Screenshots — don't open the file**: `ui.screenshot` and `ui.sidebar_screenshot` save PNGs to `/tmp/cline-debug/` and return the `{path}`. Use `read_file` on that path to examine screenshots. Running `open <path>` launches Preview.app on macOS which covers the VSCode window.
-- **Scripts count = 0 after launch**: CDP connects after extension host starts, so scripts parsed during startup aren't tracked. Breakpoints still work via sourcemap resolution.
-- **Port 9230**: Extension host inspector. If another VSCode instance uses this port, the harness will fail to connect. Kill other debug instances first.
-- **macOS only** for now (Playwright Electron launch behavior).
-- **Webview CDP**: `connect_webview` may fail depending on Electron version. `web.evaluate` still works via Playwright's `frame.evaluate()` fallback.
-- **Sourcemap paths**: esbuild outputs relative paths like `../src/extension.ts` in the sourcemap. The resolver handles this, but if a file isn't found, use `ext.source_files` to see exact paths.
-- **OAuth with fake codes**: Browser capture intercepts the URL but doesn't provide a valid auth code. For real OAuth testing, open the captured URL in a browser. For unit testing, mock the token exchange.
-
-See `src/dev/debug-harness/README.md` for full API reference.

.clinerules/general.md

@@ -13,56 +13,11 @@ This file is the secret sauce for working effectively in this codebase. It captu
 **What NOT to add:** Stuff you can figure out from reading a few files, obvious patterns, or standard practices. This file should be high-signal, not comprehensive.
 
 ## Miscellaneous
-- The whole repo (including `apps/vscode`) uses **bun** for package management and task running. Emit `bun run X` / `bun install` / `bunx <bin>` / `bun file.ts`, never npm/npx. Node remains the *runtime* (VS Code's extension host and the standalone cline-core are Node), so Node-runtime tokens are legitimate and must not be "fixed" to bun — see @.clinerules/bun-and-node.md for the keep-list vs rewrite-list.
-- Avoid provider-specific string matching / hardcoded provider branches when fixing provider/config plumbing. Prefer provider metadata, shared catalog/defaults, explicit protocol/client capabilities, or centralized normalization utilities that apply by data shape rather than `providerId === "..."`. If a provider exception seems necessary, stop and explain why instead of adding ad-hoc string matching.
-- This is a VS Code extension—check `package.json` for available scripts before trying to verify builds (e.g., `bun run compile`, not `bun run build`).
+- This is a VS Code extension—check `package.json` for available scripts before trying to verify builds (e.g., `npm run compile`, not `npm run build`).
 - When creating PRs, contributors should not create changelog-entry files. Maintainers handle release versioning and changelog curation during the release process.
 - When adding new feature flags, see this PR as a reference https://github.com/cline/cline/pull/7566
 - Additional instructions about making requests: @.clinerules/network.md
 
-## Searching the Codebase — Avoiding Build Output
-
-Several directories contain build output or generated code that produces
-noisy or unusable results with `search_files` / `grep`:
-
-| Directory | What it is | Why it's a problem |
-|-----------|-----------|-------------------|
-| `out/` | esbuild bundle output | Mirrors `src/` structure as minified JS — every search gets duplicate hits on single-line files |
-| `dist/` | Packaged extension | Entire extension bundled into one minified `extension.js` (~1 long line) |
-| `dist-standalone/` | Standalone build output | Same minification issue |
-| `src/generated/` | Generated protobuf code | Auto-generated from `proto/`; not the source of truth |
-| `src/shared/proto/` | Generated proto type defs | Auto-generated from `proto/`; not the source of truth |
-| `node_modules/` | Dependencies | Huge, not project source |
-
-### How to skip build output
-
-**`search_files`** — Point at `src/` (not the project root) and use `file_pattern`:
-```
-search_files(path="src/core", regex="myFunction", file_pattern="*.ts")
-```
-The `file_pattern` parameter is the most effective filter — e.g. `"*.ts"`,
-`"*.tsx"`, `"*.proto"`.
-
-**`grep` directly** — Exclude build dirs and restrict to source extensions:
-```bash
-grep -rn "myFunction" src/ --include="*.ts" --exclude-dir={out,dist,node_modules,generated}
-```
-
-### When you must search minified files
-
-Sometimes you need to verify what got bundled (e.g., checking if a change
-made it into the build). Minified files are typically one long line, so
-normal `grep` shows the entire file as context. Use these approaches:
-
-- **`grep -oP`** to extract just the match with limited surrounding context:
-  ```bash
-  grep -oP '.{0,40}myFunction.{0,40}' dist/extension.js
-  ```
-- **`read_file`** on files in `out/src/` — these have source maps and are
-  more readable than `dist/extension.js` (which is the fully bundled output).
-- **Source maps** — `out/src/*.js.map` and `dist/extension.js.map` can be
-  used to trace minified output back to original source locations.
-
 ## gRPC/Protobuf Communication
 The extension and webview communicate via gRPC-like protocol over VS Code message passing.
 
@@ -73,7 +28,7 @@ The extension and webview communicate via gRPC-like protocol over VS Code messag
 - Naming: Services `PascalCaseService`, RPCs `camelCase`, Messages `PascalCase`
 - For streaming responses, use `stream` keyword (see `subscribeToAuthCallback` in `account.proto`)
 
-**Run `bun run protos`** after any proto changes—generates types in:
+**Run `npm run protos`** after any proto changes—generates types in:
 - `src/shared/proto/` - Shared type definitions
 - `src/generated/grpc-js/` - Service implementations
 - `src/generated/nice-grpc/` - Promise-based clients
@@ -93,15 +48,104 @@ The extension and webview communicate via gRPC-like protocol over VS Code messag
 - `src/core/controller/task/explainChanges.ts` - Handler implementation
 - `webview-ui/src/components/chat/ChatRow.tsx` - UI rendering
 
+## Adding a New API Provider
+When adding a new provider (e.g., "openai-codex"), you must update the proto conversion layer in THREE places or the provider will silently reset to Anthropic:
+
+1. `proto/cline/models.proto` - Add to the `ApiProvider` enum (e.g., `OPENAI_CODEX = 40;`)
+2. `convertApiProviderToProto()` in `src/shared/proto-conversions/models/api-configuration-conversion.ts` - Add case mapping string to proto enum
+3. `convertProtoToApiProvider()` in the same file - Add case mapping proto enum back to string
+
+**Why this matters:** Without these, the provider string hits the `default` case and returns `ANTHROPIC`. The webview, provider list, and handler all work fine, but the state silently resets when it round-trips through proto serialization. No error is thrown.
+
+**Other files to update when adding a provider:**
+- `src/shared/api.ts` - Add to `ApiProvider` union type, define models
+- `src/shared/providers/providers.json` - Add to provider list for dropdown
+- `src/core/api/index.ts` - Register handler in `createHandlerForProvider()`
+- `webview-ui/src/components/settings/utils/providerUtils.ts` - Add cases in `getModelsForProvider()` and `normalizeApiConfiguration()`
+- `webview-ui/src/utils/validate.ts` - Add validation case
+- `webview-ui/src/components/settings/ApiOptions.tsx` - Render provider component
+
+## Responses API Providers (OpenAI Codex, OpenAI Native)
+Providers using OpenAI's Responses API require native tool calling. XML tools don't work with the Responses API.
+
+**Symptoms of broken native tool calling:**
+- Tools get called multiple times (e.g., `ask_followup_question` asks the same question twice)
+- Tool arguments get duplicated or malformed
+- The model responds but tools aren't recognized
+
+**Root causes to check:**
+1. **Provider missing from `isNextGenModelProvider()`** in `src/utils/model-utils.ts`. The native variant matchers (e.g., `native-gpt-5/config.ts`) call this function. If your provider isn't in the list, the matcher returns false and falls back to XML tools.
+
+2. **Model missing `apiFormat: ApiFormat.OPENAI_RESPONSES`** in its model info (`src/shared/api.ts`). This property signals that the model requires native tool calling. The task runner in `src/core/task/index.ts` checks this and forces `enableNativeToolCalls: true` regardless of user settings.
+
+**When adding a new Responses API provider:**
+1. Add provider to `isNextGenModelProvider()` list in `src/utils/model-utils.ts`
+2. Set `apiFormat: ApiFormat.OPENAI_RESPONSES` on all models that use the Responses API
+3. The variant matcher and task runner will handle the rest automatically
+
+## Adding Tools to System Prompt
+This is tricky—multiple prompt variants and configs. **Always search for existing similar tools first and follow their pattern.** Look at the full chain from prompt definition → variant configs → handler → UI before implementing.
+
+1. **Add to `ClineDefaultTool` enum** in `src/shared/tools.ts`
+2. **Tool definition** in `src/core/prompts/system-prompt/tools/` (create file like `generate_explanation.ts`)
+   - Define variants for each `ModelFamily` (generic, next-gen, xs, etc.)
+   - Export variants array (e.g., `export const my_tool_variants = [GENERIC, NATIVE_NEXT_GEN, XS]`)
+   - **Fallback behavior**: If a variant isn't defined for a model family, `ClineToolSet.getToolByNameWithFallback()` automatically falls back to GENERIC. So you only need to export `[GENERIC]` unless the tool needs model-specific behavior.
+3. **Register in `src/core/prompts/system-prompt/tools/init.ts`** - Import and spread into `allToolVariants`
+4. **Add to variant configs** - Each model family has its own config in `src/core/prompts/system-prompt/variants/*/config.ts`. Add your tool's enum to the `.tools()` list:
+   - `generic/config.ts`, `next-gen/config.ts`, `gpt-5/config.ts`, `native-gpt-5/config.ts`, `native-gpt-5-1/config.ts`, `native-next-gen/config.ts`, `gemini-3/config.ts`, `glm/config.ts`, `hermes/config.ts`, `xs/config.ts`
+   - **Important**: If you add to a variant's config, make sure the tool spec exports a variant for that ModelFamily (or relies on GENERIC fallback)
+5. **Create handler** in `src/core/task/tools/handlers/`
+6. **Wire up in `ToolExecutor.ts`** if needed for execution flow
+7. **Add to tool parsing** in `src/core/assistant-message/index.ts` if needed
+8. **If tool has UI feedback**: add `ClineSay` enum in proto, update `src/shared/ExtensionMessage.ts`, update `src/shared/proto-conversions/cline-message.ts`, update `webview-ui/src/components/chat/ChatRow.tsx`
+
+## Modifying System Prompt
+**Read these first:** `src/core/prompts/system-prompt/README.md`, `tools/README.md`, `__tests__/README.md`
+
+System prompt is modular: **components** (reusable sections) + **variants** (model-specific configs) + **templates** (with `{{PLACEHOLDER}}` resolution).
+
+**Key directories:**
+- `components/` - Shared sections: `rules.ts`, `capabilities.ts`, `editing_files.ts`, etc.
+- `variants/` - Model-specific: `generic/`, `next-gen/`, `xs/`, `gpt-5/`, `gemini-3/`, `hermes/`, `glm/`, etc.
+- `templates/` - Template engine and placeholder definitions
+
+**Variant tiers (ask user which to modify):**
+- **Next-gen** (Claude 4, GPT-5, Gemini 2.5): `next-gen/`, `native-next-gen/`, `native-gpt-5/`, `native-gpt-5-1/`, `gemini-3/`, `gpt-5/`
+- **Standard** (default fallback): `generic/`
+- **Local/small models**: `xs/`, `hermes/`, `glm/`
+
+**How overrides work:** Variants can override components via `componentOverrides` in their `config.ts`, or provide a custom template in `template.ts` (e.g., `next-gen/template.ts` exports `rules_template`). If no override, the shared component from `components/` is used.
+
+**Example: Adding a rule to RULES section**
+1. Check if variant overrides rules: look for `rules_template` in `variants/*/template.ts` or `componentOverrides.RULES` in `config.ts`
+2. If shared: modify `components/rules.ts`
+3. If overridden: modify that variant's template
+4. XS variant is special—has heavily condensed inline content in `template.ts`
+
+**After any changes, regenerate snapshots:**
+```bash
+UPDATE_SNAPSHOTS=true npm run test:unit
+```
+Snapshots live in `__tests__/__snapshots__/`. Tests validate across model families and context variations (browser, MCP, focus chain).
+
+## Modifying Default Slash Commands
+Three places need updates:
+- `src/core/slash-commands/index.ts` - Command definitions
+- `src/core/prompts/commands.ts` - System prompt integration
+- `webview-ui/src/utils/slash-commands.ts` - Webview autocomplete
+
 ## Adding New Global State Keys
 Adding a new key to global state requires updates in multiple places. Missing any step causes silent failures.
 
 Required steps:
 1. Type definition in `src/shared/storage/state-keys.ts` - Add to `GlobalState` or `Settings` interface
-2. Add any default value or transform in `src/shared/storage/state-keys.ts` if the key needs one
-3. Read and write the value through `StateManager` (`setGlobalState()` / `getGlobalStateKey()`) after initialization
+2. Read from globalState in `src/core/storage/utils/state-helpers.ts`:
+   - Add `const myKey = context.globalState.get<GlobalStateAndSettings["myKey"]>("myKey")` in `readGlobalStateFromDisk()`
+   - Add to the return object: `myKey: myKey ?? defaultValue,`
+3. StateManager handles read/write via `setGlobalState()`/`getGlobalStateKey()` after initialization
 
-Persistent state is file-backed through `StateManager`; do not add new runtime reads or writes against VS Code `ExtensionContext` storage. That storage is only a legacy migration source.
+Common mistake: Adding only the return value without the `context.globalState.get()` call. This compiles but the value is always `undefined` on load.
 
 Settings plumbing gotcha: if a key is user-toggleable from settings, wire both controller update paths:
 - `src/core/controller/state/updateSettings.ts` for webview `updateSetting(...)`
@@ -109,26 +153,28 @@ Settings plumbing gotcha: if a key is user-toggleable from settings, wire both c
 Missing one path causes a toggle to appear to change in one surface while the backend state stays unchanged.
 
 Webview toggle gotcha: settings changes must also round-trip back in state payloads.
-- Add the field to `UpdateSettingsRequest` in `proto/cline/state.proto` (for webview update requests), then run `bun run protos`
+- Add the field to `UpdateSettingsRequest` in `proto/cline/state.proto` (for webview update requests), then run `npm run protos`
 - Include the key in `Controller.getStateToPostToWebview()` (`src/core/controller/index.ts`)
 - Ensure `ExtensionState` and webview defaults include the key (`src/shared/ExtensionMessage.ts`, `webview-ui/src/context/ExtensionStateContext.tsx`)
 If this round-trip wiring is missing, the backend value can update but the toggle in webview appears stuck or reverts.
 
 ## StateManager Cache vs Direct globalState Access
-StateManager uses an in-memory cache populated during `StateManager.initialize()` from file-backed storage. For most state, use `controller.stateManager.setGlobalState()`/`getGlobalStateKey()`.
+StateManager uses an in-memory cache populated during `StateManager.initialize(context)` in `common.ts`. For most state, use `controller.stateManager.setGlobalState()`/`getGlobalStateKey()`.
 
-Exception: host migration code may read legacy VS Code storage before file-backed storage is initialized.
+Exception: State needed immediately at extension startup (before cache is ready)
 
-Example pattern:
+When Window A sets state and immediately opens Window B, the new window's StateManager cache is populated from `context.globalState` during initialization. If you need to read state in Window B right at startup (e.g., in `common.ts` during `initialize()`), read directly from `context.globalState.get()` instead of StateManager's cache.
+
+Example pattern (see `lastShownAnnouncementId` and `worktreeAutoOpenPath`):
 ```typescript
 // Writing (normal pattern)
 controller.stateManager.setGlobalState("myKey", value)
 
-// Reading after initialization
-const value = controller.stateManager.getGlobalStateKey("myKey")
+// Reading at startup in common.ts (bypass cache)
+const value = context.globalState.get<string>("myKey")
 ```
 
-Use `context.globalState` only in VS Code migration code that copies legacy ExtensionContext values into the shared file-backed stores.
+This is only needed for cross-window state read during the brief startup window before StateManager cache is fully usable. Normal state access after initialization should use StateManager.
 
 ## ChatRow Cancelled/Interrupted States
 When a ChatRow displays a loading/in-progress state (spinner), you must handle what happens when the task is cancelled. This is non-obvious because cancellation doesn't update the message content—you have to infer it from context.
@@ -157,48 +203,3 @@ const isGenerating = explanationInfo.status === "generating" && !wasCancelled
 **See also:** `BrowserSessionRow.tsx` uses similar pattern with `isLastApiReqInterrupted` and `isLastMessageResume`.
 
 **Backend side:** When streaming is cancelled, clean up properly (close tabs, clear comments, etc.) by checking `taskState.abort` after the streaming function returns.
-
-## Debug Harness: clear inherited VSCode/Electron env vars before launching
-
-The debug harness (`apps/vscode/src/dev/debug-harness/server.ts`) launches a child
-VSCode via Playwright's `_electron.launch({ env: { ...process.env, ... } })`. If you
-run the harness from a process that was itself spawned by VSCode (e.g. the Cline
-extension host, an integrated terminal, or an agent running inside VSCode), the
-parent's VSCode/Electron env vars leak into the child and break the launch.
-
-The fatal one is **`ELECTRON_RUN_AS_NODE=1`**: it makes the child VSCode binary run
-as plain Node, so it rejects every VSCode CLI flag. Symptom:
-
-```
-.../Visual Studio Code.app/Contents/MacOS/Code: bad option: --extensionDevelopmentPath=...
-Error: Process failed to launch!   (Playwright _electron.launch)
-```
-
-This is NOT the macOS Playwright flakiness mentioned in the harness README — it's
-env inheritance. Fix: strip the inherited vars before starting the harness:
-
-```bash
-env -u ELECTRON_RUN_AS_NODE -u ELECTRON_NO_ATTACH_CONSOLE \
-    -u VSCODE_CLI -u VSCODE_CODE_CACHE_PATH -u VSCODE_CRASH_REPORTER_PROCESS_TYPE \
-    -u VSCODE_CWD -u VSCODE_ESM_ENTRYPOINT -u VSCODE_HANDLES_UNCAUGHT_ERRORS \
-    -u VSCODE_IPC_HOOK -u VSCODE_NLS_CONFIG -u VSCODE_PID -u VSCODE_L10N_BUNDLE_LOCATION \
-    bun src/dev/debug-harness/server.ts --auto-launch --skip-build
-```
-
-Check your own env with `env | grep -iE 'electron|vscode_'` first; `ELECTRON_RUN_AS_NODE=1`
-present means you must scrub before launching.
-
-Other harness notes confirmed in practice:
-- The extension host is **ESM** (`VSCODE_ESM_ENTRYPOINT`), so `ext.evaluate` has no
-  `require` and module-internal functions aren't reachable as globals. To inspect
-  internal builders (e.g. `buildBedrockProviderConfig`), set a breakpoint with
-  `ext.set_breakpoint` and read locals via `ext.evaluate` with the paused `callFrameId`
-  — don't try to `require()` the bundle.
-- `web.evaluate` wraps the expression as a single returned expression; multi-statement
-  snippets must be an IIFE `(() => { ...; return x; })()`, otherwise you get
-  `SyntaxError: Unexpected token ';'`.
-- Webview settings inputs are `vscode-text-field` web components with debounced React
-  onChange. Setting `.value` + dispatching events via `web.evaluate` is unreliable for
-  some fields; focus the inner shadow `input` then use real keystrokes (`ui.type` +
-  `ui.press Tab`, or click the dropdown option) to make the value persist.
-

.clinerules/protobuf-development.md

@@ -42,7 +42,7 @@ Here, we use the common `StringRequest` and `KeyValuePair` types.
 
 After editing a `.proto` file, regenerate the TypeScript code. From the project root, run:
 ```bash
-bun run protos
+npm run protos
 ```
 This command compiles all `.proto` files and outputs the generated code to `src/generated/` and `src/shared/`. Do not edit these generated files manually.
 

.clinerules/sdk-migration.md

@@ -1,26 +0,0 @@
-# SDK Adapter
-
-The VSCode extension runs on the Cline SDK (`@cline/core`, `@cline/llms`,
-`@cline/shared`) through an adapter layer in `apps/vscode/src/sdk/`. The
-webview still talks gRPC; the adapter translates between gRPC handlers and SDK
-calls. See `apps/vscode/src/dev/debug-harness/README.md` for the debug harness.
-
-## Conventions
-
-1. **Look up SDK APIs, don't guess.** Use `kb_search(name="sdk", query="...")`
-   before implementing against an SDK surface.
-2. **Reference the pre-SDK implementation when replacing a module.** Add a
-   `// Replaces classic src/core/... (see origin/main)` header and use
-   `kb_search(name="cline", commit="origin/main")` or
-   `git show origin/main:path` to consult the prior implementation.
-3. **Single entry point.** There is one codepath — the SDK adapter. No
-   `CLINE_SDK` env flag.
-4. **Use `{appBaseUrl}`**, never hardcode `app.cline.bot`.
-5. **Avoid `as` casts.** Use explicit conversion functions with tests. The
-   branded types in `apps/vscode/src/sdk/model-catalog/contracts.ts` exist so
-   casts are unnecessary outside parse/compute boundaries.
-
-## Debug harness
-
-- **Dismiss the Kanban/promo overlay** before any debug harness interaction.
-- **Use the command palette** to navigate tabs in the debug harness.

.clinerules/workflows/hotfix-release.md

@@ -91,7 +91,7 @@ On the main branch, create a commit that updates:
 
 3. No changelog-entry file cleanup is needed. Contributors do not create changelog-entry files in this repo.
 
-**No dependency install is needed.** A CHANGELOG + `version` bump does not change any dependency, and `bun.lock` does not pin workspace-package versions, so the lockfile stays consistent. The publish workflow runs `bun install --frozen-lockfile`, which would *fail* on an out-of-sync lock — so only run `bun install` here if you actually change dependencies (then commit the updated `bun.lock`).
+**Skip running `npm run install:all`** - release automation handles lockfile consistency as needed.
 
 Commit with message format: `v{VERSION} Release Notes (hotfix)`
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,10 +7,10 @@ body:
       value: |
         **Important:** All bug reports must be reproducible using Claude Sonnet 4.5. Cline uses complex prompts so less capable models may not work as expected.
   - type: dropdown
-    id: cline-surface
+    id: plugin-type
     attributes:
-      label: Cline Surface
-      description: Which Cline surface are you reporting a bug for?
+      label: Plugin Type
+      description: Which plugin are you reporting a bug for?
       options:
         - VSCode Extension
         - JetBrains Plugin
@@ -59,18 +59,6 @@ body:
       placeholder: 'e.g., cline:anthropic/claude-sonnet-4.5, gemini:gemini-2.5-pro-exp-03-25'
     validations:
       required: false
-  - type: textarea
-    id: ide-diagnostics
-    attributes:
-      label: IDE / CLI Diagnostics
-      description: |
-        Paste the "About" diagnostics for your Cline surface. This captures the IDE build, runtime, and host details we need.
-        - VSCode Extension: open `Help → About` (Windows/Linux) or `Code → About Visual Studio Code` (macOS), then copy the info.
-        - JetBrains Plugin: open `Help → About` (Windows/Linux) or `<IDE name> → About` (macOS), then click `Copy` to grab build, runtime, OS, memory, and cores.
-        - CLI: there is no About dialog. Run `cline --version` and paste the output.
-      placeholder: Paste the copied About info or `cline --version` output here.
-    validations:
-      required: false
   - type: textarea
     id: system-info
     attributes:

.github/copilot-instructions.md

@@ -9,14 +9,14 @@ This is a VS Code extension. Read `.clinerules/general.md` for tribal knowledge
 - **MCP**: `src/services/mcp/McpHub.ts`.
 
 ## Build & Test (Critical — non-obvious commands)
-- **Build**: `bun run compile` — NOT `bun run build`.
-- **Watch**: `bun run watch` (extension + webview).
-- **Protos**: `bun run protos` — run **immediately** after any `.proto` change. Generates into `src/shared/proto/`, `src/generated/`.
-- **Tests**: `bun run test:unit`. After prompt/tool changes: `UPDATE_SNAPSHOTS=true bun run test:unit`.
+- **Build**: `npm run compile` — NOT `npm run build`.
+- **Watch**: `npm run watch` (extension + webview).
+- **Protos**: `npm run protos` — run **immediately** after any `.proto` change. Generates into `src/shared/proto/`, `src/generated/`.
+- **Tests**: `npm run test:unit`. After prompt/tool changes: `UPDATE_SNAPSHOTS=true npm run test:unit`.
 
 ## Protobuf RPC Workflow (4 steps)
 1. **Define** in `proto/cline/*.proto`. Naming: `PascalCaseService`, `camelCase` RPCs, `PascalCase` Messages. Use `common.proto` shared types for simple data.
-2. **Generate**: `bun run protos`.
+2. **Generate**: `npm run protos`.
 3. **Backend handler**: `src/core/controller/<domain>/`. 
 4. **Frontend call**: `UiServiceClient.myMethod(Request.create({...}))`.
 - Adding enums (e.g. `ClineSay`) → also update `src/shared/proto-conversions/cline-message.ts`.
@@ -38,13 +38,13 @@ For Responses API providers: add to `isNextGenModelProvider()` in `src/utils/mod
 4. Whitelist in `src/core/prompts/system-prompt/variants/*/config.ts` for each model family.
 5. Handler in `src/core/task/tools/handlers/`, wire in `ToolExecutor.ts`.
 6. If tool has UI: add `ClineSay` enum in proto → `ExtensionMessage.ts` → `cline-message.ts` → `ChatRow.tsx`.
-7. Regenerate snapshots: `UPDATE_SNAPSHOTS=true bun run test:unit`.
+7. Regenerate snapshots: `UPDATE_SNAPSHOTS=true npm run test:unit`.
 
 ## Modifying System Prompt
 Modular: `components/` (shared) + `variants/` (model-specific) + `templates/` (`{{PLACEHOLDER}}`). Variants override components via `componentOverrides` in `config.ts` or custom `template.ts`. XS variant is heavily condensed inline. Always regenerate snapshots after changes.
 
 ## Global State Keys (silent failure risk)
-Adding a key requires updating the typed storage definitions in `src/shared/storage/state-keys.ts`; runtime reads and writes should go through `StateManager`, not VS Code `ExtensionContext` storage. Persistent state is file-backed so it works across VS Code, CLI, and JetBrains hosts.
+Adding a key requires: type in `src/shared/storage/state-keys.ts`, read via `context.globalState.get()` in `src/core/storage/utils/state-helpers.ts` `readGlobalStateFromDisk()`, and add to return object. Missing the `.get()` call compiles fine but value is always `undefined`.
 
 ## Slash Commands (3 places)
 - `src/core/slash-commands/index.ts` — definitions.

.github/pull_request_template.md

@@ -59,7 +59,7 @@ We're not looking for exhaustive documentation - just evidence that you've thoug
 <!-- Put an 'x' in all boxes that apply -->
 
 -   [ ] Changes are limited to a single feature, bugfix or chore (split larger changes into separate PRs)
--   [ ] Tests are passing (`bun test`) and code is formatted and linted (`bun run format && bun run lint`)
+-   [ ] Tests are passing (`npm test`) and code is formatted and linted (`npm run format && npm run lint`)
 -   [ ] I have reviewed [contributor guidelines](https://github.com/cline/cline/blob/main/CONTRIBUTING.md)
 
 ### Screenshots

.github/workflows/cli-publish.yml

@@ -102,15 +102,15 @@ jobs:
           fi
 
           VERSION="${TAG#cli-v}"
-          PACKAGE_VERSION=$(node -p "require('./apps/cli/package.json').version")
+          PACKAGE_VERSION=$(node -p "require('./sdk/apps/cli/package.json').version")
 
           if [ "$PACKAGE_VERSION" != "$VERSION" ]; then
-            echo "apps/cli/package.json version ${PACKAGE_VERSION} does not match ${TAG}"
+            echo "sdk/apps/cli/package.json version ${PACKAGE_VERSION} does not match ${TAG}"
             exit 1
           fi
 
           if ! printf "%s\n" "$VERSION" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.-]+)?$'; then
-            echo "apps/cli/package.json has invalid version: ${VERSION}"
+            echo "sdk/apps/cli/package.json has invalid version: ${VERSION}"
             exit 1
           fi
 
@@ -147,7 +147,7 @@ jobs:
 
       - name: Build platform binaries
         run: bun script/build.ts --install-native-variants --skip-sdk-build
-        working-directory: apps/cli
+        working-directory: sdk/apps/cli
         env:
           TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
           ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
@@ -172,7 +172,7 @@ jobs:
           )
 
           for package_name in "${EXPECTED[@]}"; do
-            dir="apps/cli/dist/${package_name#@cline/}"
+            dir="sdk/apps/cli/dist/${package_name#@cline/}"
             if [ ! -f "$dir/package.json" ]; then
               echo "Missing package manifest: $dir/package.json"
               exit 1
@@ -194,7 +194,7 @@ jobs:
         env:
           NPM_CONFIG_PROVENANCE: "true"
         run: bun script/publish-npm.ts --tag latest
-        working-directory: apps/cli
+        working-directory: sdk/apps/cli
 
       - name: Get Previous CLI Tag
         id: prev_tag
@@ -207,8 +207,8 @@ jobs:
       - name: Get Changelog Entry
         id: changelog
         run: |
-          # Grab content between the first "## " header and the next one in apps/cli/CHANGELOG.md
-          CONTENT=$(awk '/^## [0-9]/{if(found) exit; found=1; next} found{print}' apps/cli/CHANGELOG.md)
+          # Grab content between the first "## " header and the next one in sdk/apps/cli/CHANGELOG.md
+          CONTENT=$(awk '/^## [0-9]/{if(found) exit; found=1; next} found{print}' sdk/apps/cli/CHANGELOG.md)
           echo "content<<EOF" >> $GITHUB_OUTPUT
           echo "$CONTENT" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
@@ -349,7 +349,7 @@ jobs:
         if: steps.check_commits.outputs.skip != 'true'
         id: version
         run: |
-          BASE_VERSION=$(node -p "require('./apps/cli/package.json').version")
+          BASE_VERSION=$(node -p "require('./sdk/apps/cli/package.json').version")
           TIMESTAMP=$(date +%s)
           VERSION="${BASE_VERSION}-nightly.${TIMESTAMP}"
 
@@ -365,17 +365,17 @@ jobs:
         run: |
           node -e '
             const fs = require("node:fs");
-            const path = "apps/cli/package.json";
+            const path = "sdk/apps/cli/package.json";
             const pkg = JSON.parse(fs.readFileSync(path, "utf8"));
             pkg.version = process.env.VERSION;
             fs.writeFileSync(path, `${JSON.stringify(pkg, null, "\t")}\n`);
           '
-          cat apps/cli/package.json | grep '"version"'
+          cat sdk/apps/cli/package.json | grep '"version"'
 
       - name: Build platform binaries
         if: steps.check_commits.outputs.skip != 'true'
         run: bun script/build.ts --install-native-variants --skip-sdk-build
-        working-directory: apps/cli
+        working-directory: sdk/apps/cli
         env:
           TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
           ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
@@ -401,7 +401,7 @@ jobs:
           )
 
           for package_name in "${EXPECTED[@]}"; do
-            dir="apps/cli/dist/${package_name#@cline/}"
+            dir="sdk/apps/cli/dist/${package_name#@cline/}"
             if [ ! -f "$dir/package.json" ]; then
               echo "Missing package manifest: $dir/package.json"
               exit 1
@@ -424,7 +424,7 @@ jobs:
         env:
           NPM_CONFIG_PROVENANCE: "true"
         run: bun script/publish-npm.ts --tag nightly
-        working-directory: apps/cli
+        working-directory: sdk/apps/cli
 
       - name: Summary
         if: steps.check_commits.outputs.skip != 'true'

.github/workflows/ext-vscode-publish-nightly.yml

@@ -31,12 +31,6 @@ jobs:
     if: github.repository == 'cline/cline' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dpc/sdk-migration-simpler-login')
     runs-on: ubuntu-latest
     environment: PublishNightly
-    # The VS Code extension's package.json and lockfiles live under apps/vscode/
-    # (the repo root has no package.json). Mirror ext-vscode-test.yml so install
-    # and publish steps run in the correct workspace.
-    defaults:
-      run:
-        working-directory: apps/vscode
 
     steps:
       - name: Checkout selected branch
@@ -53,47 +47,19 @@ jobs:
           echo "Building sha: $GITHUB_SHA"
           git --no-pager log -1 --oneline
 
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: 1.3.14
-
-      # Node is still REQUIRED in the publish job (not just for install): the publish
-      # scripts run as `node ./scripts/publish-*.mjs` and shell out to `npx ovsx`.
-      # setup-bun does not provide a Node runtime, so keep setup-node here.
-      # Pinned to Node 22 because newer LTS (Node 24 / npm 11) can make vsce's
-      # `npm list` dependency detection fail with ELSPROBLEMS during packaging.
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
+          # Keep publish environment aligned with test workflow/tooling lockfile expectations.
+          # Newer LTS (Node 24 / npm 11) can make `npm list` fail with ELSPROBLEMS during vsce packaging.
           node-version: 22
 
-      # Single root install resolves the whole bun workspace at once (replaces the
-      # per-package `npm ci` steps for apps/vscode + webview-ui).
-      - name: Install workspace dependencies
-        working-directory: ${{ github.workspace }}
-        run: bun install --frozen-lockfile
+      - name: Install root dependencies
+        run: npm ci --include=optional
 
-      # @cline/* are local workspace symlinks to source packages; build dist/ before
-      # packaging/publishing the extension.
-      - name: Build SDK packages
-        working-directory: ${{ github.workspace }}
-        run: bun run build:sdk
+      - name: Install webview-ui dependencies
+        run: cd webview-ui && npm ci --include=optional
 
-      - name: Assert better-sqlite3 native binary present
-        run: |
-          NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-          if [ ! -f "$NODE_FILE" ]; then
-            echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-            echo "(bun trustedDependencies postinstall likely did not run)"
-            exit 1
-          fi
-          echo "Found better-sqlite3 native binary: $NODE_FILE"
-
-      # vsce is now a workspace devDependency (on node_modules/.bin), but ovsx is not
-      # vendored and the publish script invokes it via `npx ovsx`, so install ovsx
-      # globally here (npm is available via setup-node). vsce is installed globally
-      # too to preserve the script's existing PATH expectations.
       - name: Install Publishing Tools
         run: npm install -g @vscode/vsce ovsx
 
@@ -111,9 +77,7 @@ jobs:
           OTEL_EXPORTER_OTLP_PROTOCOL: ${{ secrets.OTEL_EXPORTER_OTLP_PROTOCOL }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.OTEL_EXPORTER_OTLP_HEADERS }}
-        # The script itself runs under `node ./scripts/publish-nightly.mjs`; bun run
-        # just launches it. Node + npm (for `npx ovsx`) are provided by setup-node above.
-        run: bun run publish:marketplace:nightly
+        run: npm run publish:marketplace:nightly
 
       - name: Tag published commit
         working-directory: ${{ github.workspace }}

.github/workflows/ext-vscode-publish-stable.yml

@@ -109,48 +109,17 @@ jobs:
                   echo "tag=$TAG" >> $GITHUB_OUTPUT
                   echo "resolved_sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
-              with:
-                  bun-version: 1.3.14
-
-            # Node is still REQUIRED in the publish job (not just for install): the
-            # publish scripts run as `node scripts/publish-*.mjs`, the version step uses
-            # `node -p`, and `npx ovsx` needs npm. setup-bun does not provide a Node
-            # runtime, so keep setup-node. Pinned to Node 22 because newer LTS
-            # (Node 24 / npm 11) can make vsce's `npm list` detection fail with
-            # ELSPROBLEMS during packaging.
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
                   node-version: 22
 
-            # Single root install resolves the whole bun workspace at once (replaces the
-            # per-package `npm install` steps for apps/vscode + webview-ui).
-            - name: Install workspace dependencies
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm install --include=optional
 
-            # @cline/* are local workspace symlinks to source packages; build dist/ before
-            # packaging/publishing the extension.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm install --include=optional
 
-            - name: Assert better-sqlite3 native binary present
-              run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
-
-            # vsce is a workspace devDependency (on node_modules/.bin), but ovsx is not
-            # vendored and the publish script invokes it via `npx ovsx`, so install ovsx
-            # globally (npm is available via setup-node). vsce is installed globally too
-            # to preserve the script's existing PATH expectations.
             - name: Install Publishing Tools
               run: npm install -g @vscode/vsce ovsx
 
@@ -193,20 +162,14 @@ jobs:
                   node scripts/marketplace-readme.mjs swap-in
                   trap 'node scripts/marketplace-readme.mjs restore' EXIT
 
-                  # Required to generate the .vsix. --no-dependencies: the extension
-                  # is fully esbuild-bundled, and under the bun workspace the @cline/*
-                  # deps are symlinks pointing outside the package, so without this vsce
-                  # would walk them and pull the whole monorepo into the .vsix.
-                  vsce package --no-dependencies --allow-package-secrets sendgrid --out "cline-${{ steps.get_version.outputs.version }}.vsix"
+                  # Required to generate the .vsix
+                  vsce package  --allow-package-secrets sendgrid --out "cline-${{ steps.get_version.outputs.version }}.vsix"
 
-                  # These scripts run under `node scripts/publish-marketplace.mjs`;
-                  # bun run just launches them. Node + npm (for `npx ovsx`) come from
-                  # setup-node above.
                   if [ "$RELEASE_TYPE" = "pre-release" ]; then
-                    bun run publish:marketplace:prerelease
+                    npm run publish:marketplace:prerelease
                     echo "Successfully published pre-release version ${{ steps.get_version.outputs.version }} to VS Code Marketplace and Open VSX Registry"
                   else
-                    bun run publish:marketplace
+                    npm run publish:marketplace
                     echo "Successfully published release version ${{ steps.get_version.outputs.version }} to VS Code Marketplace and Open VSX Registry"
                   fi
 

.github/workflows/ext-vscode-test-e2e.yml

@@ -45,16 +45,12 @@ jobs:
                           - 'apps/vscode/assets/**'
                           - 'apps/vscode/walkthrough/**'
                           - 'apps/vscode/package.json'
-                          - 'apps/vscode/webview-ui/package.json'
-                          # Root bun lockfile is authoritative for the whole workspace (incl. apps/vscode).
-                          - 'bun.lock'
-                          # SDK source packages are local workspace symlinks (@cline/*), so SDK changes affect the build.
-                          - 'sdk/packages/**'
+                          - 'apps/vscode/package-lock.json'
                           - 'apps/vscode/buf.yaml'
                           - 'apps/vscode/tsconfig*.json'
                           - 'apps/vscode/biome.jsonc'
                           - 'apps/vscode/esbuild.mjs'
-                          - 'apps/vscode/bunfig.toml'
+                          - 'apps/vscode/.mocharc.json'
                           - 'apps/vscode/.vscode-test.mjs'
                           - 'apps/vscode/.vscodeignore'
                           - 'apps/vscode/playwright*.ts'
@@ -88,20 +84,26 @@ jobs:
                 working-directory: apps/vscode
         steps:
             - uses: actions/checkout@v4
-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
+            - name: Setup Node.js environment
+              uses: actions/setup-node@v4
               with:
-                  bun-version: 1.3.14
+                  node-version: 22
 
-            # Cache Bun's global install cache - keyed on the authoritative root bun.lock.
-            - name: Cache Bun install cache
+            # Cache root dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache root dependencies
               uses: actions/cache@v4
-              id: bun-cache
+              id: root-cache
               with:
-                  path: ~/.bun/install/cache
-                  key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}
-                  restore-keys: |
-                      ${{ runner.os }}-bun-
+                  path: apps/vscode/node_modules
+                  key: ${{ runner.os }}-npm-${{ hashFiles('apps/vscode/package-lock.json') }}
+
+            # Cache webview-ui dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache webview-ui dependencies
+              uses: actions/cache@v4
+              id: webview-cache
+              with:
+                  path: apps/vscode/webview-ui/node_modules
+                  key: ${{ runner.os }}-npm-webview-${{ hashFiles('apps/vscode/webview-ui/package-lock.json') }}
 
             # Cache VS Code installation
             - name: Cache VS Code
@@ -122,41 +124,20 @@ jobs:
                       ~/.cache/ms-playwright
                       ~/Library/Caches/ms-playwright
                       ~/AppData/Local/ms-playwright
-                  key: playwright-browsers-${{ runner.os }}-${{ hashFiles('bun.lock') }}
+                  key: playwright-browsers-${{ runner.os }}-${{ hashFiles('apps/vscode/package-lock.json') }}
                   restore-keys: |
                       playwright-browsers-${{ runner.os }}-
 
-            # Single root install resolves the entire bun workspace at once (replaces
-            # the per-package `npm ci` steps for apps/vscode + webview-ui).
-            - name: Install workspace dependencies
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm ci
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-            # @cline/* are local workspace symlinks to source packages; build dist/
-            # before building/packaging the extension for E2E.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm ci
 
-            - name: Assert better-sqlite3 native binary present
-              # Force bash: the Windows runner defaults to pwsh, which can't parse this
-              # POSIX test. Git Bash ships on GitHub's windows-latest images.
-              shell: bash
-              run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
-
-            # NOTE: vsce is no longer installed globally. @vscode/vsce is a workspace
-            # devDependency of apps/vscode (resolved into node_modules/.bin), and the
-            # `test:e2e:build` script invokes `vsce` via `bun run`, which puts the local
-            # .bin on PATH. No global install needed.
+            - name: Install vsce
+              run: npm install -g @vscode/vsce
 
             - name: Install xvfb on Linux
               if: matrix.runner == 'ubuntu'
@@ -165,11 +146,11 @@ jobs:
             # Run optimized E2E tests (eliminates redundant builds)
             - name: Run E2E tests - Linux
               if: matrix.runner == 'ubuntu'
-              run: xvfb-run -a bun run test:e2e:optimal
+              run: xvfb-run -a npm run test:e2e:optimal
 
             - name: Run E2E tests - Non-Linux
               if: matrix.runner != 'ubuntu'
-              run: bun run test:e2e:optimal
+              run: npm run test:e2e:optimal
 
             - uses: actions/upload-artifact@v4
               if: ${{ failure() }}

.github/workflows/ext-vscode-test.yml

@@ -45,16 +45,13 @@ jobs:
                           - 'apps/vscode/assets/**'
                           - 'apps/vscode/walkthrough/**'
                           - 'apps/vscode/package.json'
-                          - 'apps/vscode/webview-ui/package.json'
-                          # Root bun lockfile is authoritative for the whole workspace (incl. apps/vscode).
-                          - 'bun.lock'
-                          # SDK source packages are local workspace symlinks (@cline/*), so SDK changes affect the build.
-                          - 'sdk/packages/**'
+                          - 'apps/vscode/package-lock.json'
                           - 'apps/vscode/buf.yaml'
                           - 'apps/vscode/tsconfig*.json'
                           - 'apps/vscode/biome.jsonc'
                           - 'apps/vscode/esbuild.mjs'
-                          - 'apps/vscode/bunfig.toml'
+                          - 'apps/vscode/.mocharc.json'
+                          - 'apps/vscode/.nycrc*.json'
                           - 'apps/vscode/.vscode-test.mjs'
                           - 'apps/vscode/test-setup.js'
                           - '.github/workflows/ext-vscode-test.yml'
@@ -63,13 +60,9 @@ jobs:
                           - 'apps/vscode/proto/**'
                           - 'apps/vscode/standalone/**'
                           - 'apps/vscode/testing-platform/**'
-                          - 'apps/vscode/testing-platform/package.json'
                           - 'apps/vscode/tests/specs/**'
                           - 'apps/vscode/package.json'
-                          # Root bun lockfile is authoritative for the whole workspace (incl. apps/vscode).
-                          - 'bun.lock'
-                          # SDK source packages are local workspace symlinks (@cline/*), so SDK changes affect the build.
-                          - 'sdk/packages/**'
+                          - 'apps/vscode/package-lock.json'
                           - 'apps/vscode/buf.yaml'
                           - 'apps/vscode/tsconfig*.json'
                           - 'apps/vscode/esbuild.mjs'
@@ -89,38 +82,25 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@v4
 
-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
+            - name: Setup Node.js environment
+              uses: actions/setup-node@v4
               with:
-                  bun-version: 1.3.14
+                  node-version: 22
+                  cache: 'npm'
+                  cache-dependency-path: |
+                      apps/vscode/package-lock.json
+                      apps/vscode/webview-ui/package-lock.json
 
-            # Single root install resolves the entire bun workspace (apps/vscode,
-            # webview-ui, testing-platform and the @cline/* SDK symlinks) at once,
-            # so the previous per-package `npm ci` steps collapse into one.
-            - name: Install workspace dependencies
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm ci
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-            # @cline/* are local workspace symlinks to source packages; their dist/
-            # output must be built before the extension can type-check/compile.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
-
-            - name: Assert better-sqlite3 native binary present
-              run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm ci
 
             - name: Run Quality Checks (Parallel)
-              run: bun run ci:check-all
+              run: npm run ci:check-all
 
     vscode-test:
         needs: [detect-changes, quality-checks]
@@ -141,43 +121,27 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@v4
 
-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
+            - name: Setup Node.js environment
+              uses: actions/setup-node@v4
               with:
-                  bun-version: 1.3.14
+                  node-version: 22
+                  cache: 'npm'
+                  cache-dependency-path: |
+                      apps/vscode/package-lock.json
+                      apps/vscode/webview-ui/package-lock.json
 
-            # Single root install resolves the entire bun workspace at once (replaces
-            # the per-package `npm ci` steps for apps/vscode + webview-ui).
-            - name: Install workspace dependencies
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm ci
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-            # @cline/* are local workspace symlinks to source packages; build dist/
-            # before compiling/testing the extension.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm ci
 
-            - name: Assert better-sqlite3 native binary present
+            - name: Set up NPM on Windows
+              if: runner.os == 'Windows'
               run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
-
-            # NOTE: The old `npm config set script-shell bash` step is intentionally
-            # removed. Scripts are now launched with `bun run`, which uses Bun's own
-            # built-in cross-platform shell rather than npm's configured script-shell,
-            # so that npm-specific Windows workaround no longer applies. Bash-dependent
-            # scripts (e.g. scripts/proto-lint.sh, standalone/runclinecore.sh) are
-            # invoked explicitly via `bash ...` from within the package scripts, and
-            # this job's `defaults.run.shell: bash` (Git Bash on Windows) still covers
-            # the workflow `run:` blocks below.
+                  npm config set script-shell "C:\\Program Files\\Git\\bin\\bash.exe"
 
             - name: Cache VS Code test runtime
               if: runner.os == 'Windows'
@@ -189,51 +153,24 @@ jobs:
             # Build the extension and tests (without redundant checks)
             - name: Build Tests and Extension
               id: build_step
-              run: bun run ci:build
+              run: npm run ci:build
 
-            - name: Vitest Suites (SDK adapter + model catalog)
-              id: vitest_tests
-              if: ${{ !cancelled() && steps.build_step.outcome == 'success' }}
-              # The vitest config sets passWithNoTests: true, so a broken glob/alias
-              # would "pass" with zero tests. Capture output and assert a non-zero
-              # test count to guard against silent skips.
-              run: |
-                  set -o pipefail
-                  bun run test:vitest 2>&1 | tee vitest-output.log
-                  # Strip ANSI color codes before matching — vitest colorizes the
-                  # "Tests  N passed" summary, so the count is not adjacent to the
-                  # "Tests" label in the raw bytes.
-                  if ! sed -r 's/\x1b\[[0-9;]*m//g' vitest-output.log | grep -Eq 'Tests[[:space:]]+[0-9]*[1-9][0-9]* (passed|failed)'; then
-                    echo "ERROR: vitest reported zero tests (possible silent skip)."
-                    exit 1
-                  fi
-
-            - name: Unit Tests (bun) - Linux
+            - name: Unit Tests with coverage - Linux
               id: unit_tests_linux
               if: ${{ !cancelled() && steps.build_step.outcome == 'success' && runner.os == 'Linux' }}
-              # The node-side unit suite (.mocharc spec set) now runs under `bun test`
-              # via scripts/run-bun-unit-tests.ts (one isolated bun process per file).
-              # The runner exits non-zero on any failure and prints a final
-              # "Files: N  Pass: P  Fail: F" summary; assert a non-zero pass count to
-              # guard against an empty glob silently "passing".
               run: |
-                  set -o pipefail
-                  bun run test:unit 2>&1 | tee unit-output.log
-                  if ! grep -Eq 'Pass:[[:space:]]+[0-9]*[1-9][0-9]*' unit-output.log; then
-                    echo "ERROR: bun unit runner reported zero passing tests (possible silent skip)."
-                    exit 1
-                  fi
+                  npx nyc --nycrc-path .nycrc.unit.json --reporter=lcov npm run test:unit
 
-            - name: Unit Tests (bun) - Non-Linux
+            - name: Unit Tests - Non-Linux
               id: unit_tests_non_linux
               if: ${{ !cancelled() && steps.build_step.outcome == 'success' && runner.os != 'Linux' }}
               run: |
-                  bun run test:unit
+                  npm run test:unit
 
             - name: Extension Integration Tests - Linux
               id: integration_tests_linux
               if: ${{ !cancelled() && steps.build_step.outcome == 'success' && runner.os == 'Linux' }}
-              run: xvfb-run -a bun run test:coverage
+              run: xvfb-run -a npm run test:coverage
 
             - name: Extension Integration Tests - Non-Linux
               id: integration_tests_non_linux
@@ -241,7 +178,7 @@ jobs:
               run: |
                   for attempt in 1 2 3; do
                     echo "Running extension integration tests (attempt ${attempt}/3)"
-                    if bun run test:integration; then
+                    if npm run test:integration; then
                       exit 0
                     fi
 
@@ -259,7 +196,7 @@ jobs:
               if: ${{ !cancelled() && steps.build_step.outcome == 'success' }}
               run: |
                   cd webview-ui
-                  bun run test:coverage
+                  npm run test:coverage
 
             - name: Save Coverage Reports
               uses: actions/upload-artifact@v4
@@ -268,6 +205,7 @@ jobs:
               with:
                   name: pr-coverage-reports
                   path: |
+                      apps/vscode/coverage-unit/lcov.info
                       apps/vscode/webview-ui/coverage/lcov.info
 
     test-platform-integration:
@@ -281,45 +219,36 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@v4
 
-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
+            - name: Setup Node.js environment
+              uses: actions/setup-node@v4
               with:
-                  bun-version: 1.3.14
+                  node-version: 22
+                  cache: 'npm'
+                  cache-dependency-path: |
+                      apps/vscode/package-lock.json
+                      apps/vscode/webview-ui/package-lock.json
+                      apps/vscode/testing-platform/package-lock.json
 
-            # Single root install resolves the whole bun workspace, including the
-            # testing-platform package, so the separate per-package `npm ci` steps
-            # (extension + webview-ui + testing-platform) collapse into one.
-            - name: Install workspace dependencies
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm ci
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-            # @cline/* are local workspace symlinks to source packages; build dist/
-            # before compiling the standalone core.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
-
-            - name: Assert better-sqlite3 native binary present
-              run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm ci
 
             - name: Download ripgrep binaries
-              run: bun run download-ripgrep
+              run: npm run download-ripgrep
 
             - name: Compile Standalone
-              run: bun run compile-standalone
+              run: npm run compile-standalone
+
+            - name: Install testing platform dependencies
+              run: cd testing-platform && npm ci
 
             - name: Running testing platform integration spec tests
               timeout-minutes: 7
-              run: bun run test:tp-orchestrator -- tests/specs/ --count=1 --coverage
+              run: npm run test:tp-orchestrator -- tests/specs/ --count=1 --coverage
 
             - name: Save Coverage Reports
               uses: actions/upload-artifact@v4

.github/workflows/repo-label-issues.yml

@@ -17,7 +17,7 @@ jobs:
             const labels = context.payload.issue.labels.map(l => l.name);
 
             // Check if JetBrains Plugin is selected
-            if (body.match(/###\s*Cline Surface\s*\n+JetBrains Plugin/i)) {
+            if (body.match(/###\s*Plugin Type\s*\n+JetBrains Plugin/i)) {
               if (!labels.includes('JetBrains')) {
                 await github.rest.issues.addLabels({
                   owner: context.repo.owner,
@@ -29,7 +29,7 @@ jobs:
             }
 
             // Check if VSCode Extension is selected
-            if (body.match(/###\s*Cline Surface\s*\n+VSCode Extension/i)) {
+            if (body.match(/###\s*Plugin Type\s*\n+VSCode Extension/i)) {
               if (!labels.includes('VS Code')) {
                 await github.rest.issues.addLabels({
                   owner: context.repo.owner,
@@ -41,7 +41,7 @@ jobs:
             }
 
             // Check if CLI is selected
-            if (body.match(/###\s*Cline Surface\s*\n+CLI/i)) {
+            if (body.match(/###\s*Plugin Type\s*\n+CLI/i)) {
               if (!labels.includes('CLI')) {
                 await github.rest.issues.addLabels({
                   owner: context.repo.owner,

.gitignore

@@ -13,9 +13,6 @@ tmp
 pnpm-lock.yaml
 
 .clineignore
-.cline/enterprise
-.cline/remote-config
-**/.cline/remote-config
 .venv
 .actrc
 CLAUDE.local.md
@@ -64,17 +61,6 @@ tests/**/cache
 # Should never be committed: only exists if a publish aborts mid-swap.
 .README.github.bak
 
-# Tauri generated code
-apps/*/src-tauri/gen
-apps/*/src-tauri/bin
-apps/examples/*/src-tauri/gen
-apps/examples/*/src-tauri/bin
-# Tauri UI test snapshots
-apps/*/src/tests/.tui-test
-apps/*/src/tests/tui-traces
-apps/vscode/webview-ui/src/**/*.js
-apps/vscode/webview-ui/src/**/*.js.map
-
 
 # SDK Session files / User data
 .cline/data
@@ -84,4 +70,3 @@ apps/vscode/webview-ui/src/**/*.js.map
 *.db-wal
 .cline/**/managed.json
 .cline/**/bundle.json
-apps/vscode/tsconfig.test.generated.json

.husky/pre-commit

@@ -7,5 +7,4 @@ fi
 
 gitleaks git --pre-commit --redact --staged --verbose || exit 1
 
-cd apps/vscode && bunx lint-staged
-
+lint-staged

.vscode/launch.json

@@ -126,7 +126,10 @@
 				"${workspaceFolder}/apps/vscode/dist-standalone/**/*.js"
 			],
 			"preLaunchTask": "compile-standalone",
-			"runtimeExecutable": "bun",
+			"runtimeExecutable": "npx",
+			"runtimeArgs": [
+				"tsx"
+			],
 			"program": "scripts/test-standalone-core-api-server.ts",
 			"envFile": "${workspaceFolder}/apps/vscode/.env",
 			"env": {
@@ -180,7 +183,7 @@
 			"name": "Open Storybook",
 			"type": "node",
 			"request": "launch",
-			"runtimeExecutable": "bun",
+			"runtimeExecutable": "npm",
 			"runtimeArgs": [
 				"run",
 				"storybook"

.vscode/settings.json

@@ -22,24 +22,11 @@
 	},
 	// Enable Lint and format using Biome
 	"biome.enabled": true,
-	"biome.requireConfiguration": true,
-	"prettier.enable": false,
 	"editor.defaultFormatter": "biomejs.biome",
-	"[javascript]": {
-		"editor.defaultFormatter": "biomejs.biome"
-	},
-	"[javascriptreact]": {
-		"editor.defaultFormatter": "biomejs.biome"
-	},
-	"[typescript]": {
-		"editor.defaultFormatter": "biomejs.biome"
-	},
-	"[typescriptreact]": {
-		"editor.defaultFormatter": "biomejs.biome"
-	},
 	"editor.codeActionsOnSave": {
 		"source.fixAll.biome": "explicit",
 		"source.removeUnused.biome": "always",
+		"source.removeUnusedImports": "always",
 		"source.organizeImports.biome": "always"
 	},
 	// Disable auto-forwarding ports to prevent Simple Browser from opening the Vite dev server

.vscode/tasks.json

@@ -6,7 +6,7 @@
 		{
 			"label": "compile-standalone",
 			"type": "shell",
-			"command": "bun run compile-standalone",
+			"command": "npm run compile-standalone",
 			"group": "build",
 			"problemMatcher": [],
 			"presentation": {
@@ -19,7 +19,7 @@
 		{
 			"label": "npm: protos",
 			"type": "shell",
-			"command": "bun run protos",
+			"command": "npm run protos",
 			"problemMatcher": [],
 			"isBackground": false,
 			"presentation": {
@@ -65,7 +65,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run build:webview",
+			"command": "npm run build:webview",
 			"group": "build",
 			"problemMatcher": [],
 			"isBackground": true,
@@ -86,7 +86,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run build:webview:test",
+			"command": "npm run build:webview:test",
 			"group": "build",
 			"problemMatcher": [],
 			"isBackground": true,
@@ -108,7 +108,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run dev:webview",
+			"command": "npm run dev:webview",
 			"group": "build",
 			"problemMatcher": [
 				{
@@ -145,7 +145,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run watch:esbuild",
+			"command": "npm run watch:esbuild",
 			"group": "build",
 			"problemMatcher": {
 				"pattern": [
@@ -169,8 +169,7 @@
 			"isBackground": true,
 			"label": "npm: watch:esbuild",
 			"dependsOn": [
-				"npm: protos",
-				"build-sdk:debug"
+				"npm: protos"
 			],
 			"presentation": {
 				"group": "watch",
@@ -185,7 +184,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run watch:esbuild:test",
+			"command": "npm run watch:esbuild:test",
 			"group": "build",
 			"problemMatcher": {
 				"pattern": [
@@ -209,8 +208,7 @@
 			"isBackground": true,
 			"label": "npm: watch:esbuild:test",
 			"dependsOn": [
-				"npm: protos",
-				"build-sdk:debug"
+				"npm: protos"
 			],
 			"presentation": {
 				"group": "watch",
@@ -226,7 +224,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run watch:tsc",
+			"command": "npm run watch:tsc",
 			"group": "build",
 			"problemMatcher": "$tsc-watch",
 			"isBackground": true,
@@ -244,7 +242,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run watch-tests",
+			"command": "npm run watch-tests",
 			"label": "npm: watch-tests",
 			"problemMatcher": "$tsc-watch",
 			"isBackground": true,
@@ -284,7 +282,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run storybook",
+			"command": "npm run storybook",
 			"group": "build",
 			"problemMatcher": [],
 			"isBackground": false,
@@ -313,24 +311,6 @@
 			"options": {
 				"cwd": "${workspaceFolder}"
 			}
-		},
-		{
-			"label": "build-sdk:debug",
-			"type": "shell",
-			"command": "bun run build:sdk",
-			"problemMatcher": [
-				"$tsc"
-			],
-			"presentation": {
-				"group": "watch",
-				"reveal": "always"
-			},
-			"options": {
-				"cwd": "${workspaceFolder}",
-				"env": {
-					"CLINE_SOURCEMAPS": "1"
-				}
-			}
 		}
 	],
 	"inputs": [

CHANGELOG.md

@@ -1,68 +1,5 @@
 # Changelog
 
-## [3.89.2]
-
-### Fixed
-
-- Complete the fix for the Anthropic provider on VS Code 1.123 and later by upgrading the bundled Anthropic SDK to a release compatible with the Node 24 runtime.
-- Update the Vertex AI provider to a compatible Anthropic Vertex SDK release so it works with the upgraded Anthropic SDK.
-
-## [3.89.1]
-
-### Fixed
-
-- Restore the Anthropic provider on VS Code 1.123 and later, where the updated Node 24 runtime broke the bundled Anthropic SDK.
-- Handle the DeepSeek V4 reasoning format.
-
-## [3.89.0]
-
-### Added
-
-- Add Claude Fable 5 model support.
-
-### Fixed
-
-- Fix MiniMax M3 thinking controls across gateways.
-
-### Changed
-
-- Clean up the Codex model list.
-
-## [3.88.1]
-
-### Added
-
-- Add a debug section in settings for Cline testers.
-
-### Fixed
-
-- Include the walkthrough markdown files in the VS Code extension package so the first-run walkthrough steps load correctly.
-
-## [3.88.0]
-
-### Added
-
-- Add the latest Fireworks AI serverless models and update the default Fireworks model to Kimi K2.6.
-
-### Fixed
-
-- Fix MCP server delete/add flows so settings writes do not cause the MCP server list to be emptied by the file watcher.
-- Remove stale Fireworks AI models and correct Fireworks model metadata and cache pricing.
-
-### Changed
-
-- Always use the upstream Cline recommended models endpoint instead of gating it behind a feature flag.
-
-## [3.87.0]
-
-### Added
-
-- Add MiniMax M3 model support.
-
-### Fixed
-
-- Update VS Code extension dependencies to resolve security issues in `@xmldom/xmldom`, `basic-ftp`, `axios`, `undici`, and other direct/transitive packages.
-
 ## [3.86.2]
 
 ### Fixed

CLAUDE.md

@@ -0,0 +1,2 @@
+@.clinerules/general.md
+@.clinerules/network.md

CONTRIBUTING.md

@@ -45,7 +45,7 @@ We also welcome contributions to our [documentation](https://github.com/cline/cl
 3. Install [bun](https://bun.com)
 4. Install the necessary dependencies for the extension and webview-gui:
     ```bash
-    cd apps/vscode && bun run install:all && cd ../..
+    cd apps/vscode && npm run install:all && cd ../..
     cd sdk && bun run build && cd ..
     ```
 5. Generate Protocol Buffer files (required before first build):
@@ -61,8 +61,8 @@ We also welcome contributions to our [documentation](https://github.com/cline/cl
 2. Push your branch and create a PR on GitHub. Our CI will:
    - Run tests and checks
 3. Testing
-    - Run `cd apps/vscode && bun run test` to run tests locally. 
-    - Before submitting PR, run `bun run format:fix` to format your code
+    - Run `cd apps/vscode && npm run test` to run tests locally. 
+    - Before submitting PR, run `npm run format:fix` to format your code
 
 ### Extension
 
@@ -74,12 +74,12 @@ We also welcome contributions to our [documentation](https://github.com/cline/cl
 
 2. **Local Development**
     - cd into the vscode extension, `cd apps/vscode`
-    - Run `bun run install:all` to install dependencies
-    - Run `bun run protos` to generate Protocol Buffer files (required before first build)
-    - Run `bun run test` to run tests locally
+    - Run `npm run install:all` to install dependencies
+    - Run `npm run protos` to generate Protocol Buffer files (required before first build)
+    - Run `npm run test` to run tests locally
     - Run → Start Debugging or `>Debug: Select and Start Debugging` and wait for a new VS Code instance to open
-    - **Terminal Workflow**: Use `bun run dev` (generates protos + runs watch mode) or `bun run watch` (if protos already generated)
-    - Before submitting PR, run `bun run format:fix` to format your code
+    - **Terminal Workflow**: Use `npm run dev` (generates protos + runs watch mode) or `npm run watch` (if protos already generated)
+    - Before submitting PR, run `npm run format:fix` to format your code
 
 3. **Linux-specific Setup**
     VS Code extension tests on Linux require the following system libraries:
@@ -135,8 +135,8 @@ Anyone can contribute code to Cline, but we ask that you follow these guidelines
 
 2. **Code Quality**
 
-    - Run `bun run lint` to check code style
-    - Run `bun run format` to automatically format code
+    - Run `npm run lint` to check code style
+    - Run `npm run format` to automatically format code
     - All PRs must pass CI checks which include both linting and formatting
     - Address any warnings or errors from linter before submitting
     - Follow TypeScript best practices and maintain type safety
@@ -144,7 +144,7 @@ Anyone can contribute code to Cline, but we ask that you follow these guidelines
 3. **Testing**
 
     - Add tests for new features
-    - Run `bun test` to ensure all tests pass
+    - Run `npm test` to ensure all tests pass
     - Update existing tests if your changes affect them
     - Include both unit tests and integration tests where appropriate
 
@@ -154,9 +154,9 @@ Anyone can contribute code to Cline, but we ask that you follow these guidelines
     
     - **Running E2E tests:**
       ```bash
-      bun run test:e2e        # Build and run all E2E tests
-      bun run e2e             # Run tests without rebuilding
-      bun run test:e2e -- --debug  # Run with interactive debugger
+      npm run test:e2e        # Build and run all E2E tests
+      npm run e2e             # Run tests without rebuilding
+      npm run test:e2e -- --debug  # Run with interactive debugger
       ```
     
     - **Writing E2E tests:**

README.md

@@ -51,7 +51,7 @@ for CI/CD and scripting.
 npm i -g cline
 ```
 
-<a href="./apps/cli/README.md">Learn more</a>
+<a href="./sdk/apps/cli/README.md">Learn more</a>
 <br><br>
 
 </td>
@@ -129,7 +129,7 @@ npm install @cline/sdk
 | Product | Description | Location | CHANGELOG |
 |---------|------------|--------------|--------------|
 | **SDK** | Node.js programmatic agent API and extension exports. | [`sdk/`](https://github.com/cline/cline/tree/main/sdk) | [CHANGELOG.md](https://github.com/cline/cline/blob/main/sdk/CHANGELOG.md) |
-| **CLI** | Terminal UI, headless mode, shell commands, and CLI-specific flows. | [`apps/cli/`](https://github.com/cline/cline/tree/main/apps/cli) | [CHANGELOG.md](https://github.com/cline/cline/blob/main/apps/cli/CHANGELOG.md) |
+| **CLI** | Terminal UI, headless mode, shell commands, and CLI-specific flows. | [`sdk/apps/cli/`](https://github.com/cline/cline/tree/main/sdk/apps/cli) | [CHANGELOG.md](https://github.com/cline/cline/blob/main/sdk/apps/cli/CHANGELOG.md) |
 | **VS Code Extension** | The Marketplace extension and extension host integration. | [`/`](https://github.com/cline/cline/tree/main) (WIP migrating) | [CHANGELOG.md](https://github.com/cline/cline/blob/main/CHANGELOG.md) |
 | **JetBrains Plugin** | JetBrains-hosted client that talks to the shared agent core. | Currently we are not open-sourcing JetBrains plugins | - |
 | **Kanban** | Web-based multi-agent task board. | [`cline/kanban`](https://github.com/cline/kanban) | [CHANGELOG.md](https://github.com/cline/kanban/blob/main/CHANGELOG.md) |
@@ -212,12 +212,8 @@ cline schedule create "PR summary" \
 Chat with your agent from any messaging platform: Telegram, Slack, Discord, Google Chat, WhatsApp, and Linear. Each conversation thread maps to an agent session with full context. Set up access control to restrict who can interact with your agent.
 
 ```bash
-# Connect to Telegram
 cline connect telegram -k $BOT_TOKEN
-# Connect to Slack through webhook
-cline connect slack --bot-token $SLACK_TOKEN --signing-secret $SECRET --base-url $URL
-# Connect to Slack using socket mode
-cline connect slack --bot-token $SLACK_TOKEN --app-token $SLACK_APP_TOKEN
+cline connect slack --token $SLACK_TOKEN --signing-secret $SECRET --base-url $URL
 ```
 
 ## Headless CLI for CI/CD

apps/biome.json

@@ -1,14 +0,0 @@
-{
-	"$schema": "https://biomejs.dev/schemas/2.4.5/schema.json",
-	"root": false,
-	"extends": [
-		"../sdk/biome.json"
-	],
-	"linter": {
-		"rules": {
-			"a11y": {
-				"noStaticElementInteractions": "warn"
-			}
-		}
-	}
-}

apps/cli/src/commands/mcp.test.ts

@@ -1,271 +0,0 @@
-import { installMcpServer } from "@cline/core";
-import { describe, expect, it, vi } from "vitest";
-import {
-	buildMcpInstallDefaults,
-	buildMcpInstallTransport,
-	runMcpInstallCommand,
-} from "./mcp";
-
-vi.mock("@cline/core", async (importOriginal) => {
-	const actual = await importOriginal<typeof import("@cline/core")>();
-	return {
-		...actual,
-		installMcpServer: vi.fn((options) => {
-			const { name, transport, warnings } =
-				actual.buildMcpInstallTransport(options);
-			return {
-				name,
-				status: "installed",
-				transport,
-				warnings,
-			};
-		}),
-	};
-});
-
-describe("mcp install command", () => {
-	it("builds stdio wizard defaults from command args", () => {
-		expect(
-			buildMcpInstallDefaults({
-				name: "fs",
-				targetArgs: [
-					"npx",
-					"-y",
-					"@modelcontextprotocol/server-filesystem",
-					"/tmp/my dir",
-				],
-			}),
-		).toEqual({
-			name: "fs",
-			type: "stdio",
-			command: 'npx -y @modelcontextprotocol/server-filesystem "/tmp/my dir"',
-		});
-	});
-
-	it("builds remote wizard defaults and normalizes http transport", () => {
-		expect(
-			buildMcpInstallDefaults({
-				name: "ctx7",
-				transport: "http",
-				targetArgs: ["https://mcp.context7.com/mcp"],
-			}),
-		).toEqual({
-			name: "ctx7",
-			type: "streamableHttp",
-			url: "https://mcp.context7.com/mcp",
-		});
-	});
-
-	it("normalizes streamable-http transport", () => {
-		expect(
-			buildMcpInstallDefaults({
-				name: "docs",
-				transport: "streamable-http",
-				targetArgs: ["https://example.com/mcp"],
-			}),
-		).toEqual({
-			name: "docs",
-			type: "streamableHttp",
-			url: "https://example.com/mcp",
-		});
-	});
-
-	it("builds SSE wizard defaults", () => {
-		expect(
-			buildMcpInstallDefaults({
-				name: "events",
-				transport: "sse",
-				targetArgs: ["https://example.com/sse"],
-			}),
-		).toEqual({
-			name: "events",
-			type: "sse",
-			url: "https://example.com/sse",
-		});
-	});
-
-	it("rejects missing stdio command and invalid remote URL", () => {
-		expect(() =>
-			buildMcpInstallDefaults({
-				name: "fs",
-			}),
-		).toThrow(/requires a command/);
-
-		expect(() =>
-			buildMcpInstallDefaults({
-				name: "bad",
-				transport: "http",
-				targetArgs: ["not-a-url"],
-			}),
-		).toThrow(/Invalid MCP server URL/);
-	});
-
-	it("rejects remote URL schemes other than http and https", () => {
-		expect(() =>
-			buildMcpInstallDefaults({
-				name: "bad",
-				transport: "http",
-				targetArgs: ["file:///etc/passwd"],
-			}),
-		).toThrow(/only http and https are supported/);
-	});
-
-	it("builds direct stdio installs without shell-joining args", () => {
-		expect(
-			buildMcpInstallTransport({
-				name: "fs",
-				targetArgs: [
-					"npx",
-					"-y",
-					"@modelcontextprotocol/server-filesystem",
-					"/tmp/my dir",
-				],
-			}),
-		).toEqual({
-			name: "fs",
-			transport: {
-				type: "stdio",
-				command: "npx",
-				args: ["-y", "@modelcontextprotocol/server-filesystem", "/tmp/my dir"],
-			},
-			warnings: [],
-		});
-	});
-
-	it("builds direct remote installs with headers and placeholder warnings", () => {
-		expect(
-			buildMcpInstallTransport({
-				name: "docs",
-				transport: "http",
-				headers: ["Authorization: Bearer <token>"],
-				targetArgs: ["https://example.com/mcp", "--header=X-Extra: yes"],
-			}),
-		).toEqual({
-			name: "docs",
-			transport: {
-				type: "streamableHttp",
-				url: "https://example.com/mcp",
-				headers: {
-					Authorization: "Bearer <token>",
-					"X-Extra": "yes",
-				},
-			},
-			warnings: [
-				'Header "Authorization" looks like it contains a placeholder. Update it in MCP settings before using this server.',
-			],
-		});
-	});
-
-	it("opens the add wizard with prefilled defaults", async () => {
-		const runWizard = vi.fn(async () => 0);
-
-		const code = await runMcpInstallCommand({
-			name: "ctx7",
-			transport: "http",
-			targetArgs: ["https://mcp.context7.com/mcp"],
-			isTty: true,
-			runWizard,
-			io: { writeErr: vi.fn() },
-		});
-
-		expect(code).toBe(0);
-		expect(runWizard).toHaveBeenCalledWith({
-			name: "ctx7",
-			type: "streamableHttp",
-			url: "https://mcp.context7.com/mcp",
-		});
-	});
-
-	it("requires a TTY because it opens the wizard", async () => {
-		const writeErr = vi.fn();
-		const runWizard = vi.fn(async () => 0);
-
-		const code = await runMcpInstallCommand({
-			name: "ctx7",
-			transport: "http",
-			targetArgs: ["https://mcp.context7.com/mcp"],
-			isTty: false,
-			runWizard,
-			io: { writeErr },
-		});
-
-		expect(code).toBe(1);
-		expect(runWizard).not.toHaveBeenCalled();
-		expect(writeErr).toHaveBeenCalledWith(
-			"cline mcp install opens the MCP wizard and requires a TTY. Pass --yes to install noninteractively.",
-		);
-	});
-
-	it("checks for TTY before validating wizard install arguments", async () => {
-		const writeErr = vi.fn();
-
-		const code = await runMcpInstallCommand({
-			name: "fs",
-			isTty: false,
-			io: { writeErr },
-		});
-
-		expect(code).toBe(1);
-		expect(writeErr).toHaveBeenCalledWith(
-			"cline mcp install opens the MCP wizard and requires a TTY. Pass --yes to install noninteractively.",
-		);
-	});
-
-	it("installs directly with --yes without requiring a TTY", async () => {
-		const writeln = vi.fn();
-		const writeErr = vi.fn();
-
-		const code = await runMcpInstallCommand({
-			name: "docs",
-			transport: "http",
-			targetArgs: [
-				"https://example.com/mcp",
-				"--header",
-				"Authorization: Bearer token",
-			],
-			isTty: false,
-			yes: true,
-			io: { writeln, writeErr },
-		});
-
-		expect(code).toBe(0);
-		expect(installMcpServer).toHaveBeenCalledWith({
-			name: "docs",
-			transport: "http",
-			targetArgs: [
-				"https://example.com/mcp",
-				"--header",
-				"Authorization: Bearer token",
-			],
-			isTty: false,
-			yes: true,
-			io: { writeln, writeErr },
-		});
-		expect(writeln).toHaveBeenCalledWith("Installed MCP server docs.");
-		expect(writeErr).not.toHaveBeenCalled();
-	});
-
-	it("prints direct install JSON with --yes --json", async () => {
-		const writeln = vi.fn();
-
-		const code = await runMcpInstallCommand({
-			name: "fs",
-			targetArgs: ["node", "server.js"],
-			isTty: false,
-			yes: true,
-			json: true,
-			io: { writeln, writeErr: vi.fn() },
-		});
-
-		expect(code).toBe(0);
-		expect(JSON.parse(writeln.mock.calls[0]?.[0])).toMatchObject({
-			name: "fs",
-			status: "installed",
-			transport: {
-				type: "stdio",
-				command: "node",
-				args: ["server.js"],
-			},
-		});
-	});
-});

apps/cli/src/commands/mcp.ts

@@ -1,160 +0,0 @@
-import {
-	type McpInstallOptions as CoreMcpInstallOptions,
-	installMcpServer,
-	type McpInstallResult,
-	type McpServerTransportConfig,
-} from "@cline/core";
-import type { McpAddDefaults } from "../wizards/mcp";
-
-export { buildMcpInstallTransport } from "@cline/core";
-
-export interface McpCommandIo {
-	writeln?: (text: string) => void;
-	writeErr: (text: string) => void;
-}
-
-export interface McpInstallOptions extends CoreMcpInstallOptions {
-	io?: McpCommandIo;
-	isTty?: boolean;
-	json?: boolean;
-	runWizard?: (defaults: McpAddDefaults) => Promise<number>;
-	yes?: boolean;
-}
-
-export interface McpInstallDirectResult {
-	name: string;
-	status: "installed";
-	transport: McpServerTransportConfig;
-	warnings: string[];
-}
-
-function normalizeTransportType(
-	value: string | undefined,
-): McpServerTransportConfig["type"] {
-	const normalized = (value ?? "stdio").trim();
-	if (normalized === "http" || normalized === "streamable-http") {
-		return "streamableHttp";
-	}
-	if (
-		normalized === "stdio" ||
-		normalized === "sse" ||
-		normalized === "streamableHttp"
-	) {
-		return normalized;
-	}
-	throw new Error(
-		`Unsupported MCP transport "${normalized}". Expected stdio, sse, http, streamable-http, or streamableHttp.`,
-	);
-}
-
-function assertValidUrl(url: string): void {
-	let parsed: URL;
-	try {
-		parsed = new URL(url);
-	} catch {
-		throw new Error(`Invalid MCP server URL: ${url}`);
-	}
-	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-		throw new Error(
-			`Invalid MCP server URL: ${url} (only http and https are supported)`,
-		);
-	}
-}
-
-function quoteCommandArg(arg: string): string {
-	if (/^[^\s"'\\]+$/.test(arg)) {
-		return arg;
-	}
-	return `"${arg.replace(/(["\\])/g, "\\$1")}"`;
-}
-
-export function buildMcpInstallDefaults(options: {
-	name: string;
-	targetArgs?: string[];
-	transport?: string;
-}): McpAddDefaults {
-	const name = options.name.trim();
-	if (!name) {
-		throw new Error("MCP server name is required");
-	}
-	const type = normalizeTransportType(options.transport);
-	const targetArgs = options.targetArgs ?? [];
-	if (type === "stdio") {
-		if (targetArgs.length === 0) {
-			throw new Error(
-				"Stdio MCP install requires a command after the server name, for example: cline mcp install fs -- npx -y @modelcontextprotocol/server-filesystem /tmp",
-			);
-		}
-		return {
-			name,
-			type,
-			command: targetArgs.map(quoteCommandArg).join(" "),
-		};
-	}
-
-	if (targetArgs.length !== 1) {
-		throw new Error(
-			"Remote MCP install requires exactly one URL argument after the server name.",
-		);
-	}
-	const url = targetArgs[0]?.trim() ?? "";
-	assertValidUrl(url);
-	return {
-		name,
-		type,
-		url,
-	};
-}
-
-export function installMcpServerDirect(
-	options: McpInstallOptions,
-): McpInstallDirectResult {
-	const result: McpInstallResult = installMcpServer(options);
-	return {
-		name: result.name,
-		status: result.status,
-		transport: result.transport,
-		warnings: result.warnings,
-	};
-}
-
-async function runPrefilledWizard(defaults: McpAddDefaults): Promise<number> {
-	const { runMcpWizard } = await import("../wizards/mcp");
-	return runMcpWizard({
-		initialAction: "add",
-		addDefaults: defaults,
-		exitAfterInitialAction: true,
-	});
-}
-
-export async function runMcpInstallCommand(
-	options: McpInstallOptions,
-): Promise<number> {
-	try {
-		if (options.yes) {
-			const result = installMcpServerDirect(options);
-			if (options.json) {
-				options.io?.writeln?.(JSON.stringify(result));
-			} else {
-				options.io?.writeln?.(`Installed MCP server ${result.name}.`);
-				for (const warning of result.warnings) {
-					options.io?.writeErr(warning);
-				}
-			}
-			return 0;
-		}
-		const isTty =
-			options.isTty ?? (process.stdin.isTTY && process.stdout.isTTY);
-		if (!isTty) {
-			throw new Error(
-				"cline mcp install opens the MCP wizard and requires a TTY. Pass --yes to install noninteractively.",
-			);
-		}
-		const defaults = buildMcpInstallDefaults(options);
-		return await (options.runWizard ?? runPrefilledWizard)(defaults);
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		options.io?.writeErr(message);
-		return 1;
-	}
-}

apps/cli/src/commands/plugin.ts

@@ -1,200 +0,0 @@
-import {
-	installPlugin,
-	type PluginInstallOptions,
-	type PluginInstallResult,
-	type PluginMcpOAuthCandidate,
-	type PluginUninstallOptions,
-	uninstallPlugin,
-} from "@cline/core";
-
-export type {
-	PluginInstallOptions,
-	PluginInstallResult,
-	PluginMcpOAuthCandidate,
-} from "@cline/core";
-export {
-	collectPluginMcpOAuthCandidates,
-	installPlugin,
-	isOfficialPluginSlug,
-	parsePluginSource,
-} from "@cline/core";
-
-export interface PluginInstallMcpOAuthOptions {
-	interactive?: boolean;
-	selectCandidates?: (
-		candidates: PluginMcpOAuthCandidate[],
-	) => Promise<PluginMcpOAuthCandidate[]>;
-	authorize?: (candidate: PluginMcpOAuthCandidate) => Promise<void>;
-}
-
-export interface PluginInstallIo {
-	writeln: (text?: string) => void;
-	writeErr: (text: string) => void;
-}
-
-type PluginInstallCommandOptions = PluginInstallOptions & {
-	json?: boolean;
-	io?: PluginInstallIo;
-	mcpOAuth?: PluginInstallMcpOAuthOptions;
-};
-
-function serializePluginInstallResult(
-	result: PluginInstallResult,
-): Omit<PluginInstallResult, "mcpOAuthCandidates"> {
-	return {
-		source: result.source,
-		installPath: result.installPath,
-		entryPaths: result.entryPaths,
-		mcpSyncFailures: result.mcpSyncFailures,
-	};
-}
-
-function isInteractivePluginInstall(
-	options: PluginInstallCommandOptions,
-): boolean {
-	return (
-		options.mcpOAuth?.interactive ??
-		(process.stdin.isTTY && process.stdout.isTTY)
-	);
-}
-
-async function selectMcpOAuthCandidatesWithClack(
-	candidates: PluginMcpOAuthCandidate[],
-): Promise<PluginMcpOAuthCandidate[]> {
-	const p = await import("@clack/prompts");
-	const action = await p.select({
-		message: "Authorize plugin MCP servers now?",
-		options: [
-			{
-				value: "all",
-				label: "Authorize all",
-				hint: "open browser authorization for each server",
-			},
-			{
-				value: "choose",
-				label: "Choose servers",
-				hint: "select which servers to authorize",
-			},
-			{
-				value: "skip",
-				label: "Skip",
-			},
-		],
-	});
-	if (p.isCancel(action) || action === "skip") {
-		return [];
-	}
-	if (action === "all") {
-		return candidates;
-	}
-
-	const selectedNames = await p.multiselect({
-		message: "Select MCP servers to authorize",
-		options: candidates.map((candidate) => ({
-			value: candidate.name,
-			label: candidate.name,
-			hint: `${candidate.transportType} [${candidate.pluginName}]`,
-		})),
-		required: false,
-	});
-	if (p.isCancel(selectedNames) || !Array.isArray(selectedNames)) {
-		return [];
-	}
-	const selected = new Set(selectedNames);
-	return candidates.filter((candidate) => selected.has(candidate.name));
-}
-
-async function authorizeMcpOAuthCandidate(
-	candidate: PluginMcpOAuthCandidate,
-): Promise<void> {
-	const { authorizeMcpServerOAuthWithBrowser } = await import(
-		"../wizards/mcp/oauth"
-	);
-	await authorizeMcpServerOAuthWithBrowser(candidate.name, {
-		throwOnError: true,
-	});
-}
-
-async function runPluginMcpOAuthFollowup(
-	candidates: PluginMcpOAuthCandidate[],
-	options: PluginInstallCommandOptions,
-): Promise<void> {
-	if (candidates.length === 0) {
-		return;
-	}
-
-	if (!isInteractivePluginInstall(options)) {
-		options.io?.writeln("Plugin MCP servers may require OAuth authorization:");
-		for (const candidate of candidates) {
-			options.io?.writeln(
-				`  ${candidate.name} (${candidate.transportType}, plugin: ${candidate.pluginName})`,
-			);
-		}
-		options.io?.writeln(
-			'Run "cline mcp" and choose "Authorize OAuth" to authorize them.',
-		);
-		return;
-	}
-
-	const selected =
-		options.mcpOAuth?.selectCandidates !== undefined
-			? await options.mcpOAuth.selectCandidates(candidates)
-			: await selectMcpOAuthCandidatesWithClack(candidates);
-	const authorize = options.mcpOAuth?.authorize ?? authorizeMcpOAuthCandidate;
-	for (const candidate of selected) {
-		try {
-			await authorize(candidate);
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			options.io?.writeErr(
-				`Warning: failed to authorize MCP server ${candidate.name}: ${message}. Run "cline mcp" and choose "Authorize OAuth" to retry.`,
-			);
-		}
-	}
-}
-
-export async function runPluginInstallCommand(
-	options: PluginInstallCommandOptions,
-): Promise<number> {
-	try {
-		const result = await installPlugin(options);
-		if (options.json) {
-			process.stdout.write(
-				JSON.stringify(serializePluginInstallResult(result)),
-			);
-			return 0;
-		}
-		options.io?.writeln(`Installed plugin from ${result.source}`);
-		options.io?.writeln(`  Path: ${result.installPath}`);
-		for (const failure of result.mcpSyncFailures) {
-			options.io?.writeErr(
-				`Warning: failed to sync plugin MCP servers for ${failure.pluginName ?? failure.pluginPath}: ${failure.message}`,
-			);
-		}
-		await runPluginMcpOAuthFollowup(result.mcpOAuthCandidates, options);
-		return 0;
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		options.io?.writeErr(message);
-		return 1;
-	}
-}
-
-export async function runPluginUninstallCommand(
-	options: PluginUninstallOptions & { json?: boolean; io?: PluginInstallIo },
-): Promise<number> {
-	try {
-		const result = await uninstallPlugin(options);
-		if (options.json) {
-			process.stdout.write(JSON.stringify(result));
-			return 0;
-		}
-		options.io?.writeln(`Uninstalled plugin ${result.name}`);
-		options.io?.writeln(`  Removed: ${result.installPath}`);
-		return 0;
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		options.io?.writeErr(message);
-		return 1;
-	}
-}

apps/cli/src/commands/skill.test.ts

@@ -1,88 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { buildSkillsArgs } from "./skill";
-
-describe("buildSkillsArgs", () => {
-	it("runs the skills package through npx with -y", () => {
-		expect(buildSkillsArgs(["list"])).toEqual(["-y", "skills@latest", "list"]);
-	});
-
-	it("injects --agent cline for install-style subcommands", () => {
-		expect(buildSkillsArgs(["install", "owner/repo"])).toEqual([
-			"-y",
-			"skills@latest",
-			"add",
-			"owner/repo",
-			"--agent",
-			"cline",
-		]);
-		expect(buildSkillsArgs(["add", "owner/repo"])).toContain("cline");
-		expect(buildSkillsArgs(["i", "owner/repo"])).toContain("cline");
-		expect(buildSkillsArgs(["update", "owner/repo"])).toContain("cline");
-	});
-
-	it("aliases uninstall to the skills remove subcommand", () => {
-		expect(buildSkillsArgs(["uninstall", "my-skill"])).toEqual([
-			"-y",
-			"skills@latest",
-			"remove",
-			"my-skill",
-			"--agent",
-			"cline",
-		]);
-	});
-
-	it("does not inject when the user already targeted an agent", () => {
-		expect(
-			buildSkillsArgs(["install", "owner/repo", "--agent", "cursor"]),
-		).not.toContain("cline");
-		expect(
-			buildSkillsArgs(["install", "owner/repo", "-a", "cursor"]),
-		).not.toContain("cline");
-		expect(
-			buildSkillsArgs(["install", "owner/repo", "--agent=cursor"]),
-		).not.toContain("cline");
-	});
-
-	it("aliases install and uninstall when agent options come before the subcommand", () => {
-		expect(
-			buildSkillsArgs(["--agent", "cursor", "install", "owner/repo"]),
-		).toEqual([
-			"-y",
-			"skills@latest",
-			"--agent",
-			"cursor",
-			"add",
-			"owner/repo",
-		]);
-		expect(
-			buildSkillsArgs(["--agent=cursor", "uninstall", "my-skill"]),
-		).toEqual(["-y", "skills@latest", "--agent=cursor", "remove", "my-skill"]);
-	});
-
-	it("does not scope non-install subcommands to cline", () => {
-		expect(buildSkillsArgs(["use", "owner/repo"])).not.toContain("--agent");
-		expect(buildSkillsArgs(["list"])).not.toContain("--agent");
-	});
-
-	it("scopes remove-style subcommands to cline", () => {
-		expect(buildSkillsArgs(["remove"])).toEqual([
-			"-y",
-			"skills@latest",
-			"remove",
-			"--agent",
-			"cline",
-		]);
-		expect(buildSkillsArgs(["rm", "my-skill"])).toContain("cline");
-		expect(buildSkillsArgs(["r", "my-skill"])).toContain("cline");
-	});
-
-	it("ignores leading flags when detecting the subcommand", () => {
-		expect(buildSkillsArgs(["--global", "install", "owner/repo"])).toContain(
-			"cline",
-		);
-	});
-
-	it("forwards an empty arg list unchanged", () => {
-		expect(buildSkillsArgs([])).toEqual(["-y", "skills@latest"]);
-	});
-});

apps/cli/src/commands/skill.ts

@@ -1,160 +0,0 @@
-import { type SpawnOptions, spawn } from "node:child_process";
-
-export interface SkillCommandIo {
-	writeln: (text?: string) => void;
-	writeErr: (text: string) => void;
-}
-
-// `cline skill` is a thin wrapper around the open skills CLI
-// (https://www.npmjs.com/package/skills). We run it through `npx` so users
-// don't need a separate global install. Pin the version here if we ever need to
-// lock behavior to a known-good release.
-const SKILLS_PACKAGE = "skills@latest";
-
-// Subcommands that write skill files into an agent's skills directory. For a
-// `cline skill` command we default these to Cline unless the user picked their
-// own agent. `use` is intentionally excluded: without --agent it prints the
-// generated prompt to stdout, whereas adding --agent would launch that agent
-// interactively instead — not what someone scoping to Cline would expect.
-const CLINE_SCOPED_SUBCOMMANDS = new Set([
-	"add",
-	"install",
-	"i",
-	"update",
-	"remove",
-	"rm",
-	"r",
-	"uninstall",
-]);
-
-const SKILLS_SUBCOMMAND_ALIASES = new Map([
-	["install", "add"],
-	["uninstall", "remove"],
-]);
-
-function hasAgentFlag(args: readonly string[]): boolean {
-	return args.some(
-		(arg) => arg === "-a" || arg === "--agent" || arg.startsWith("--agent="),
-	);
-}
-
-function optionConsumesNextValue(arg: string): boolean {
-	return arg === "-a" || arg === "--agent";
-}
-
-function findSubcommandIndex(args: readonly string[]): number {
-	for (let index = 0; index < args.length; index++) {
-		const arg = args[index];
-		if (arg.startsWith("-")) {
-			if (optionConsumesNextValue(arg)) {
-				index++;
-			}
-			continue;
-		}
-		return index;
-	}
-	return -1;
-}
-
-function findSubcommand(args: readonly string[]): string | undefined {
-	const index = findSubcommandIndex(args);
-	return index >= 0 ? args[index] : undefined;
-}
-
-function normalizeSkillsSubcommandAliases(args: string[]): void {
-	const index = findSubcommandIndex(args);
-	if (index < 0) return;
-	const alias = SKILLS_SUBCOMMAND_ALIASES.get(args[index]);
-	if (alias) {
-		args[index] = alias;
-	}
-}
-
-/**
- * Build the argument list passed to `npx`, injecting `--agent cline` for
- * install-style subcommands unless the user already targeted an agent.
- */
-export function buildSkillsArgs(userArgs: readonly string[]): string[] {
-	const args = [...userArgs];
-	const subcommand = findSubcommand(args);
-	normalizeSkillsSubcommandAliases(args);
-	if (
-		subcommand &&
-		CLINE_SCOPED_SUBCOMMANDS.has(subcommand) &&
-		!hasAgentFlag(args)
-	) {
-		args.push("--agent", "cline");
-	}
-	return ["-y", SKILLS_PACKAGE, ...args];
-}
-
-function resolveExitCode(
-	code: number | null,
-	signal: NodeJS.Signals | null,
-): number {
-	if (code !== null) {
-		return code;
-	}
-	switch (signal) {
-		case "SIGINT":
-			return 130;
-		case "SIGTERM":
-			return 143;
-		default:
-			return 1;
-	}
-}
-
-/**
- * Forward all arguments to the open skills CLI via `npx skills`.
- *
- * Returns the child process exit code, or 1 if npx is unavailable or fails to
- * spawn. stdio is inherited so the skills CLI's interactive prompts and output
- * pass straight through to the user's terminal.
- */
-export async function runSkillCommand(
-	userArgs: readonly string[],
-	io: SkillCommandIo,
-): Promise<number> {
-	const args = buildSkillsArgs(userArgs);
-	const isWindows = process.platform === "win32";
-	const options: SpawnOptions = {
-		stdio: "inherit",
-		env: process.env,
-		// Prevent a console window from flashing on Windows.
-		windowsHide: true,
-		...(isWindows ? { shell: true } : {}),
-	};
-
-	return new Promise<number>((resolve) => {
-		const child = spawn("npx", args, options);
-
-		const forward = (signal: NodeJS.Signals) => {
-			child.kill(signal);
-		};
-		const handleSigint = () => forward("SIGINT");
-		const handleSigterm = () => forward("SIGTERM");
-		process.on("SIGINT", handleSigint);
-		process.on("SIGTERM", handleSigterm);
-		const cleanup = () => {
-			process.off("SIGINT", handleSigint);
-			process.off("SIGTERM", handleSigterm);
-		};
-
-		child.once("error", (error: NodeJS.ErrnoException) => {
-			cleanup();
-			if (error.code === "ENOENT") {
-				io.writeErr(
-					'npx was not found. Install Node.js (which includes npx) to use "cline skill".',
-				);
-			} else {
-				io.writeErr(`Failed to run npx ${SKILLS_PACKAGE}: ${error.message}`);
-			}
-			resolve(1);
-		});
-		child.once("close", (code, signal) => {
-			cleanup();
-			resolve(resolveExitCode(code, signal));
-		});
-	});
-}

apps/cli/src/commands/update.test.ts

@@ -1,255 +0,0 @@
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { dirname, join } from "node:path";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import {
-	autoUpdateOnStartup,
-	checkForUpdates,
-	getInstallationInfo,
-	PackageManager,
-	resolveCliHubOwnerContext,
-	withMinimumReleaseAgeBypass,
-} from "./update";
-
-const originalArgv = [...process.argv];
-const originalBuildEnv = process.env.CLINE_BUILD_ENV;
-const originalDataDir = process.env.CLINE_DATA_DIR;
-const originalHubDiscoveryPath = process.env.CLINE_HUB_DISCOVERY_PATH;
-const originalWrapperPath = process.env.CLINE_WRAPPER_PATH;
-const originalGlobalSettingsPath = process.env.CLINE_GLOBAL_SETTINGS_PATH;
-const originalIsDev = process.env.IS_DEV;
-const originalNoAutoUpdate = process.env.CLINE_NO_AUTO_UPDATE;
-const tempDirs: string[] = [];
-
-function createFile(path: string): string {
-	mkdirSync(dirname(path), { recursive: true });
-	writeFileSync(path, "");
-	return path;
-}
-
-function createTempFile(pathSuffix: string): string {
-	const root = mkdtempSync(join(tmpdir(), "cline-update-test-"));
-	tempDirs.push(root);
-	return createFile(join(root, pathSuffix));
-}
-
-describe("getInstallationInfo", () => {
-	afterEach(() => {
-		process.argv = [...originalArgv];
-		if (originalBuildEnv === undefined) {
-			delete process.env.CLINE_BUILD_ENV;
-		} else {
-			process.env.CLINE_BUILD_ENV = originalBuildEnv;
-		}
-		if (originalDataDir === undefined) {
-			delete process.env.CLINE_DATA_DIR;
-		} else {
-			process.env.CLINE_DATA_DIR = originalDataDir;
-		}
-		if (originalHubDiscoveryPath === undefined) {
-			delete process.env.CLINE_HUB_DISCOVERY_PATH;
-		} else {
-			process.env.CLINE_HUB_DISCOVERY_PATH = originalHubDiscoveryPath;
-		}
-		if (originalWrapperPath === undefined) {
-			delete process.env.CLINE_WRAPPER_PATH;
-		} else {
-			process.env.CLINE_WRAPPER_PATH = originalWrapperPath;
-		}
-		if (originalGlobalSettingsPath === undefined) {
-			delete process.env.CLINE_GLOBAL_SETTINGS_PATH;
-		} else {
-			process.env.CLINE_GLOBAL_SETTINGS_PATH = originalGlobalSettingsPath;
-		}
-		if (originalIsDev === undefined) {
-			delete process.env.IS_DEV;
-		} else {
-			process.env.IS_DEV = originalIsDev;
-		}
-		if (originalNoAutoUpdate === undefined) {
-			delete process.env.CLINE_NO_AUTO_UPDATE;
-		} else {
-			process.env.CLINE_NO_AUTO_UPDATE = originalNoAutoUpdate;
-		}
-		vi.restoreAllMocks();
-		for (const dir of tempDirs.splice(0)) {
-			rmSync(dir, { recursive: true, force: true });
-		}
-	});
-
-	it("detects npm installs from the wrapper path passed to the compiled binary", () => {
-		const wrapperPath = createTempFile("lib/node_modules/cline/bin/cline");
-		process.env.CLINE_WRAPPER_PATH = wrapperPath;
-		process.argv = ["bun", "/$bunfs/root/cline", "update", "--verbose"];
-
-		expect(getInstallationInfo("1.2.3")).toEqual({
-			packageManager: PackageManager.NPM,
-			packageName: "cline",
-			updateCommand: "npm update -g cline --tag latest",
-		});
-	});
-
-	it("uses the nightly tag when the current CLI version is nightly", () => {
-		const wrapperPath = createTempFile("lib/node_modules/cline/bin/cline");
-		process.env.CLINE_WRAPPER_PATH = wrapperPath;
-		process.argv = ["bun", "/$bunfs/root/cline", "update", "--verbose"];
-
-		expect(getInstallationInfo("1.2.3-nightly.456")).toEqual({
-			packageManager: PackageManager.NPM,
-			packageName: "cline",
-			updateCommand: "npm update -g cline --tag nightly",
-		});
-	});
-
-	it("falls back to unknown when only Bun's virtual compiled path is available", () => {
-		delete process.env.CLINE_WRAPPER_PATH;
-		process.argv = ["bun", "/$bunfs/root/cline", "update", "--verbose"];
-
-		expect(getInstallationInfo("1.2.3")).toEqual({
-			packageManager: PackageManager.UNKNOWN,
-			packageName: "cline",
-		});
-	});
-});
-
-describe("auto update settings", () => {
-	afterEach(() => {
-		process.argv = [...originalArgv];
-		if (originalBuildEnv === undefined) {
-			delete process.env.CLINE_BUILD_ENV;
-		} else {
-			process.env.CLINE_BUILD_ENV = originalBuildEnv;
-		}
-		if (originalDataDir === undefined) {
-			delete process.env.CLINE_DATA_DIR;
-		} else {
-			process.env.CLINE_DATA_DIR = originalDataDir;
-		}
-		if (originalHubDiscoveryPath === undefined) {
-			delete process.env.CLINE_HUB_DISCOVERY_PATH;
-		} else {
-			process.env.CLINE_HUB_DISCOVERY_PATH = originalHubDiscoveryPath;
-		}
-		if (originalWrapperPath === undefined) {
-			delete process.env.CLINE_WRAPPER_PATH;
-		} else {
-			process.env.CLINE_WRAPPER_PATH = originalWrapperPath;
-		}
-		if (originalGlobalSettingsPath === undefined) {
-			delete process.env.CLINE_GLOBAL_SETTINGS_PATH;
-		} else {
-			process.env.CLINE_GLOBAL_SETTINGS_PATH = originalGlobalSettingsPath;
-		}
-		if (originalIsDev === undefined) {
-			delete process.env.IS_DEV;
-		} else {
-			process.env.IS_DEV = originalIsDev;
-		}
-		if (originalNoAutoUpdate === undefined) {
-			delete process.env.CLINE_NO_AUTO_UPDATE;
-		} else {
-			process.env.CLINE_NO_AUTO_UPDATE = originalNoAutoUpdate;
-		}
-		vi.restoreAllMocks();
-		for (const dir of tempDirs.splice(0)) {
-			rmSync(dir, { recursive: true, force: true });
-		}
-	});
-
-	it("skips startup auto update when disabled globally", () => {
-		const settingsPath = createTempFile("data/global-settings.json");
-		writeFileSync(settingsPath, JSON.stringify({ autoUpdateEnabled: false }));
-		process.env.CLINE_GLOBAL_SETTINGS_PATH = settingsPath;
-		delete process.env.IS_DEV;
-		delete process.env.CLINE_NO_AUTO_UPDATE;
-		const fetchSpy = vi
-			.spyOn(globalThis, "fetch")
-			.mockRejectedValue(new Error("should not fetch"));
-
-		autoUpdateOnStartup();
-
-		expect(fetchSpy).not.toHaveBeenCalled();
-	});
-
-	it("still lets manual update checks run when startup auto update is disabled", async () => {
-		const settingsPath = createTempFile("data/global-settings.json");
-		writeFileSync(settingsPath, JSON.stringify({ autoUpdateEnabled: false }));
-		process.env.CLINE_GLOBAL_SETTINGS_PATH = settingsPath;
-		delete process.env.CLINE_NO_AUTO_UPDATE;
-		const fetchSpy = vi.spyOn(globalThis, "fetch").mockResolvedValue({
-			ok: true,
-			json: async () => ({ version: "0.0.0" }),
-		} as Response);
-
-		await checkForUpdates({ includeKanban: false });
-
-		expect(fetchSpy).toHaveBeenCalled();
-	});
-});
-
-describe("hub restart owner selection", () => {
-	afterEach(() => {
-		if (originalBuildEnv === undefined) {
-			delete process.env.CLINE_BUILD_ENV;
-		} else {
-			process.env.CLINE_BUILD_ENV = originalBuildEnv;
-		}
-		if (originalDataDir === undefined) {
-			delete process.env.CLINE_DATA_DIR;
-		} else {
-			process.env.CLINE_DATA_DIR = originalDataDir;
-		}
-		if (originalHubDiscoveryPath === undefined) {
-			delete process.env.CLINE_HUB_DISCOVERY_PATH;
-		} else {
-			process.env.CLINE_HUB_DISCOVERY_PATH = originalHubDiscoveryPath;
-		}
-	});
-
-	it("uses the shared hub owner outside production builds", () => {
-		process.env.CLINE_BUILD_ENV = "development";
-		process.env.CLINE_DATA_DIR = "/tmp/cline-update-test-data";
-		delete process.env.CLINE_HUB_DISCOVERY_PATH;
-
-		const owner = resolveCliHubOwnerContext();
-
-		expect(owner.discoveryPath).toContain("/locks/hub/owners/");
-		expect(owner.discoveryPath).not.toBe(
-			"/tmp/cline-update-test-data/locks/hub/production.json",
-		);
-	});
-});
-
-describe("withMinimumReleaseAgeBypass", () => {
-	it("adds the package-manager-specific cooldown bypass", () => {
-		expect(
-			withMinimumReleaseAgeBypass(
-				"npm update -g cline --tag latest",
-				PackageManager.NPM,
-			).command,
-		).toBe("npm update -g cline --tag latest --min-release-age=0");
-		expect(
-			withMinimumReleaseAgeBypass("bun add -g cline@latest", PackageManager.BUN)
-				.command,
-		).toBe("bun add -g cline@latest --minimum-release-age=0");
-		expect(
-			withMinimumReleaseAgeBypass(
-				"yarn global add cline@latest",
-				PackageManager.YARN,
-			).command,
-		).toBe("yarn global add cline@latest");
-		expect(
-			withMinimumReleaseAgeBypass(
-				"yarn global add cline@latest",
-				PackageManager.YARN,
-			).env?.YARN_NPM_MINIMAL_AGE_GATE,
-		).toBe("0");
-
-		expect(
-			withMinimumReleaseAgeBypass(
-				"pnpm add -g cline@latest",
-				PackageManager.PNPM,
-			).env?.pnpm_config_minimum_release_age,
-		).toBe("0");
-	});
-});

apps/cli/src/connectors/catalog.ts

@@ -1,2 +0,0 @@
-export type { ConnectorCatalogEntry } from "@cline/shared";
-export { CONNECTOR_CATALOG, listConnectorCatalog } from "@cline/shared";

apps/cli/src/connectors/session-runtime.test.ts

@@ -1,163 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-const {
-	mockGetLastUsedProviderSettings,
-	mockGetProviderSettings,
-	mockResolveSystemPrompt,
-	mockGetProviderCollection,
-	mockGetBooleanFlagEnabled,
-} = vi.hoisted(() => ({
-	mockGetLastUsedProviderSettings: vi.fn(),
-	mockGetProviderSettings: vi.fn(),
-	mockResolveSystemPrompt: vi.fn(),
-	mockGetProviderCollection: vi.fn(),
-	mockGetBooleanFlagEnabled: vi.fn(),
-}));
-
-vi.mock("@cline/core", async () => {
-	const actual =
-		await vi.importActual<typeof import("@cline/core")>("@cline/core");
-	return {
-		...actual,
-		ProviderSettingsManager: class {
-			getLastUsedProviderSettings(options?: unknown) {
-				return mockGetLastUsedProviderSettings(options);
-			}
-
-			getProviderSettings(providerId: string) {
-				return mockGetProviderSettings(providerId);
-			}
-		},
-		CoreSessionService: class {},
-		SqliteSessionStore: class {},
-		Llms: {
-			...actual.Llms,
-			getProviderCollection: mockGetProviderCollection,
-		},
-	};
-});
-
-vi.mock("../runtime/prompt", () => ({
-	resolveSystemPrompt: mockResolveSystemPrompt,
-}));
-
-vi.mock("../utils/helpers", () => ({
-	resolveWorkspaceRoot: vi.fn((cwd: string) => cwd),
-}));
-
-vi.mock("../utils/feature-flags", () => ({
-	getCliFeatureFlagsService: () => ({
-		getBooleanFlagEnabled: mockGetBooleanFlagEnabled,
-	}),
-}));
-
-vi.mock("../commands/auth", async () => {
-	const actual =
-		await vi.importActual<typeof import("../commands/auth")>(
-			"../commands/auth",
-		);
-	return {
-		...actual,
-		ensureOAuthProviderApiKey: vi.fn(),
-	};
-});
-
-import { buildConnectorStartRequest } from "./session-runtime";
-
-describe("buildConnectorStartRequest", () => {
-	beforeEach(() => {
-		mockGetBooleanFlagEnabled.mockReturnValue(false);
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-		delete process.env.OPENROUTER_API_KEY;
-	});
-
-	it("falls back to provider env vars when persisted settings have no api key", async () => {
-		mockGetLastUsedProviderSettings.mockReturnValue({ provider: "openrouter" });
-		mockGetProviderSettings.mockReturnValue({
-			provider: "openrouter",
-			model: "anthropic/claude-sonnet-4.6",
-		});
-		mockGetProviderCollection.mockReturnValue({
-			provider: { env: ["OPENROUTER_API_KEY"] },
-		});
-		mockResolveSystemPrompt.mockResolvedValue("system");
-		process.env.OPENROUTER_API_KEY = "env-openrouter-key";
-
-		const request = await buildConnectorStartRequest({
-			options: {
-				cwd: "/tmp/work",
-				mode: "act",
-				enableTools: false,
-			},
-			io: { writeln: vi.fn(), writeErr: vi.fn() },
-			loggerConfig: { enabled: false, level: "info", destination: "stdout" },
-			systemRules: "Rules",
-		});
-
-		expect(request.provider).toBe("openrouter");
-		expect(request.apiKey).toBe("env-openrouter-key");
-		expect(request.model).toBe("anthropic/claude-sonnet-4.6");
-		expect(mockGetLastUsedProviderSettings).toHaveBeenCalledWith({
-			isClinePassEnabled: false,
-		});
-	});
-
-	it("uses auth material resolved by provider settings manager", async () => {
-		mockGetLastUsedProviderSettings.mockReturnValue({ provider: "cline-pass" });
-		mockGetProviderSettings.mockReturnValue({
-			provider: "cline-pass",
-			auth: { accessToken: "workos:resolved-token" },
-		});
-		mockGetProviderCollection.mockReturnValue({
-			provider: { env: ["CLINE_API_KEY"] },
-		});
-		mockResolveSystemPrompt.mockResolvedValue("system");
-
-		const request = await buildConnectorStartRequest({
-			options: {
-				cwd: "/tmp/work",
-				mode: "act",
-				enableTools: false,
-			},
-			io: { writeln: vi.fn(), writeErr: vi.fn() },
-			loggerConfig: { enabled: false, level: "info", destination: "stdout" },
-			systemRules: "Rules",
-			defaultModel: "cline-pass/glm-5.1",
-		});
-
-		expect(request.provider).toBe("cline-pass");
-		expect(request.apiKey).toBe("workos:resolved-token");
-		expect(request.model).toBe("cline-pass/glm-5.1");
-	});
-
-	it("uses auth material resolved by provider settings manager", async () => {
-		mockGetLastUsedProviderSettings.mockReturnValue({ provider: "cline-pass" });
-		mockGetProviderSettings.mockReturnValue({
-			provider: "cline-pass",
-			auth: { accessToken: "workos:resolved-token" },
-		});
-		mockGetProviderCollection.mockReturnValue({
-			provider: { env: ["CLINE_API_KEY"] },
-		});
-		mockResolveSystemPrompt.mockResolvedValue("system");
-
-		const request = await buildConnectorStartRequest({
-			options: {
-				cwd: "/tmp/work",
-				mode: "act",
-				enableTools: false,
-			},
-			io: { writeln: vi.fn(), writeErr: vi.fn() },
-			loggerConfig: { enabled: false, level: "info", destination: "stdout" },
-			systemRules: "Rules",
-			defaultModel: "cline-pass/glm-5.1",
-		});
-
-		expect(request.provider).toBe("cline-pass");
-		expect(request.apiKey).toBe("workos:resolved-token");
-		expect(request.model).toBe("cline-pass/glm-5.1");
-	});
-});

apps/cli/src/runtime/run-interactive.test.ts

@@ -1,40 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { resolveReasoningForModelChange } from "./run-interactive";
-
-describe("resolveReasoningForModelChange", () => {
-	it("persists disabled reasoning only when thinking is explicitly false", () => {
-		expect(
-			resolveReasoningForModelChange(
-				{ thinking: false, reasoningEffort: undefined },
-				{ reasoning: { enabled: true, effort: "high" } },
-			),
-		).toEqual({ enabled: false });
-	});
-
-	it("persists enabled reasoning with the selected effort", () => {
-		expect(
-			resolveReasoningForModelChange(
-				{ thinking: true, reasoningEffort: "low" },
-				{ reasoning: { enabled: false } },
-			),
-		).toEqual({ enabled: true, effort: "low" });
-	});
-
-	it("persists enabled reasoning when thinking is explicitly true without effort", () => {
-		expect(
-			resolveReasoningForModelChange(
-				{ thinking: true, reasoningEffort: undefined },
-				{ reasoning: { enabled: false } },
-			),
-		).toEqual({ enabled: true });
-	});
-
-	it("preserves existing reasoning when thinking is unset", () => {
-		expect(
-			resolveReasoningForModelChange(
-				{ thinking: undefined, reasoningEffort: undefined },
-				{ reasoning: { enabled: true, effort: "medium" } },
-			),
-		).toEqual({ enabled: true, effort: "medium" });
-	});
-});

apps/cli/src/tui/cline-account.test.ts

@@ -1,304 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { Config } from "../utils/types";
-
-const coreMocks = vi.hoisted(() => {
-	const serviceOptions: Array<{
-		apiBaseUrl: string;
-		getAuthToken: () => Promise<string | undefined | null>;
-	}> = [];
-	return {
-		getProviderSettings: vi.fn(),
-		saveProviderSettings: vi.fn(),
-		fetchMe: vi.fn(),
-		fetchBalance: vi.fn(),
-		fetchOrganizationBalance: vi.fn(),
-		fetchAvailableSubscriptionPlans: vi.fn(),
-		serviceOptions,
-	};
-});
-const telemetryMocks = vi.hoisted(() => ({
-	identifyTelemetryAccount: vi.fn(),
-}));
-
-vi.mock("@cline/core", async (importOriginal) => {
-	const actual = await importOriginal<typeof import("@cline/core")>();
-	return {
-		...actual,
-		ClineAccountService: class {
-			constructor(options: {
-				apiBaseUrl: string;
-				getAuthToken: () => Promise<string | undefined | null>;
-			}) {
-				coreMocks.serviceOptions.push(options);
-			}
-			fetchMe() {
-				return coreMocks.fetchMe();
-			}
-			fetchBalance(userId?: string) {
-				return coreMocks.fetchBalance(userId);
-			}
-			fetchOrganizationBalance(organizationId: string) {
-				return coreMocks.fetchOrganizationBalance(organizationId);
-			}
-			fetchAvailableSubscriptionPlans(input?: {
-				type?: "individual" | "teams";
-			}) {
-				return coreMocks.fetchAvailableSubscriptionPlans(input);
-			}
-		},
-		ProviderSettingsManager: class {
-			getProviderSettings(providerId: string) {
-				return coreMocks.getProviderSettings(providerId);
-			}
-			saveProviderSettings(settings: unknown, options?: unknown) {
-				coreMocks.saveProviderSettings(settings, options);
-			}
-		},
-	};
-});
-
-vi.mock("../utils/telemetry", () => ({
-	identifyTelemetryAccount: telemetryMocks.identifyTelemetryAccount,
-}));
-
-function makeConfig(overrides: Partial<Config> = {}): Config {
-	return {
-		providerId: "cline",
-		modelId: "anthropic/claude-sonnet-4.6",
-		apiKey: "",
-		verbose: false,
-		sandbox: false,
-		thinking: false,
-		outputMode: "text",
-		mode: "act",
-		defaultToolAutoApprove: false,
-		toolPolicies: {},
-		enableTools: true,
-		cwd: "/tmp/workspace",
-		logger: {
-			debug: vi.fn(),
-			log: vi.fn(),
-			error: vi.fn(),
-		},
-		...overrides,
-	} as unknown as Config;
-}
-
-function mockFetchJson(body: unknown, status = 200): void {
-	vi.stubGlobal(
-		"fetch",
-		vi.fn(
-			async () =>
-				new Response(JSON.stringify(body), {
-					status,
-					headers: { "Content-Type": "application/json" },
-				}),
-		) as unknown as typeof fetch,
-	);
-}
-
-describe("createClineAccountService", () => {
-	beforeEach(() => {
-		vi.restoreAllMocks();
-		vi.unstubAllGlobals();
-		coreMocks.getProviderSettings.mockReset();
-		coreMocks.saveProviderSettings.mockReset();
-		coreMocks.fetchMe.mockReset();
-		coreMocks.fetchBalance.mockReset();
-		coreMocks.fetchOrganizationBalance.mockReset();
-		coreMocks.fetchAvailableSubscriptionPlans.mockReset();
-		coreMocks.serviceOptions.length = 0;
-		telemetryMocks.identifyTelemetryAccount.mockReset();
-	});
-
-	afterEach(() => {
-		vi.restoreAllMocks();
-		vi.unstubAllGlobals();
-	});
-
-	it("refreshes persisted Cline OAuth credentials before creating the account service", async () => {
-		vi.spyOn(Date, "now").mockReturnValue(100_000);
-		mockFetchJson({
-			success: true,
-			data: {
-				accessToken: "new-access",
-				refreshToken: "new-refresh",
-				tokenType: "Bearer",
-				expiresAt: "2096-10-02T07:06:40.000Z",
-				userInfo: {
-					subject: "sub-new",
-					email: "new@example.com",
-					name: "New User",
-					clineUserId: "acct-new",
-					accounts: [],
-				},
-			},
-		});
-		coreMocks.getProviderSettings.mockReturnValue({
-			provider: "cline",
-			auth: {
-				accessToken: "workos:old-access",
-				refreshToken: "refresh-token",
-				accountId: "acct-old",
-				expiresAt: 1,
-			},
-		});
-
-		const { createClineAccountService } = await import("./cline-account");
-		const service = await createClineAccountService({ config: makeConfig() });
-
-		expect(service).toBeDefined();
-		expect(globalThis.fetch).toHaveBeenCalled();
-		expect(coreMocks.saveProviderSettings).toHaveBeenCalledWith(
-			expect.objectContaining({
-				provider: "cline",
-				auth: expect.objectContaining({
-					accessToken: "workos:new-access",
-					refreshToken: "new-refresh",
-					accountId: "acct-new",
-					expiresAt: 4_000_000_000_000,
-				}),
-			}),
-			{ setLastUsed: false, tokenSource: "oauth" },
-		);
-		expect(await coreMocks.serviceOptions[0]?.getAuthToken()).toBe(
-			"workos:new-access",
-		);
-	});
-
-	it("asks the user to re-authenticate when Cline OAuth credentials cannot refresh", async () => {
-		vi.spyOn(Date, "now").mockReturnValue(100_000);
-		mockFetchJson(
-			{
-				error: "invalid_grant",
-				error_description: "refresh expired",
-			},
-			401,
-		);
-		coreMocks.getProviderSettings.mockReturnValue({
-			provider: "cline",
-			auth: {
-				accessToken: "workos:old-access",
-				refreshToken: "refresh-token",
-				expiresAt: 1,
-			},
-		});
-
-		const { createClineAccountService } = await import("./cline-account");
-
-		await expect(
-			createClineAccountService({ config: makeConfig() }),
-		).rejects.toThrow(
-			"Cline account requires re-authentication. Run cline auth cline.",
-		);
-	});
-});
-
-describe("loadClineAccountSnapshot", () => {
-	beforeEach(() => {
-		vi.restoreAllMocks();
-		vi.unstubAllGlobals();
-		coreMocks.getProviderSettings.mockReset();
-		coreMocks.saveProviderSettings.mockReset();
-		coreMocks.fetchMe.mockReset();
-		coreMocks.fetchBalance.mockReset();
-		coreMocks.fetchOrganizationBalance.mockReset();
-		coreMocks.fetchAvailableSubscriptionPlans.mockReset();
-		coreMocks.serviceOptions.length = 0;
-		telemetryMocks.identifyTelemetryAccount.mockReset();
-	});
-
-	afterEach(() => {
-		vi.restoreAllMocks();
-		vi.unstubAllGlobals();
-	});
-
-	it("identifies the loaded Cline account for telemetry and feature flags", async () => {
-		coreMocks.getProviderSettings.mockReturnValue({
-			provider: "cline",
-			apiKey: "account-token",
-		});
-		const { loadClineAccountSnapshot } = await import("./cline-account");
-		coreMocks.fetchMe.mockResolvedValue({
-			id: "user-1",
-			email: "user@example.com",
-			displayName: "User One",
-			photoUrl: "",
-			createdAt: "",
-			updatedAt: "",
-			organizations: [
-				{
-					active: true,
-					memberId: "member-1",
-					name: "Acme",
-					organizationId: "org-1",
-					roles: ["member"],
-				},
-			],
-		});
-		coreMocks.fetchBalance.mockResolvedValue({ balance: 10, userId: "user-1" });
-		coreMocks.fetchOrganizationBalance.mockResolvedValue({
-			balance: 20,
-			organizationId: "org-1",
-		});
-
-		await loadClineAccountSnapshot({ config: makeConfig() });
-
-		expect(telemetryMocks.identifyTelemetryAccount).toHaveBeenCalledWith(
-			{
-				id: "user-1",
-				email: "user@example.com",
-				provider: "cline",
-				organizationId: "org-1",
-				organizationName: "Acme",
-				memberId: "member-1",
-			},
-			expect.any(Object),
-		);
-	});
-});
-
-describe("loadIndividualSubscriptionPlans", () => {
-	beforeEach(() => {
-		vi.restoreAllMocks();
-		vi.unstubAllGlobals();
-		coreMocks.getProviderSettings.mockReset();
-		coreMocks.saveProviderSettings.mockReset();
-		coreMocks.fetchMe.mockReset();
-		coreMocks.fetchBalance.mockReset();
-		coreMocks.fetchOrganizationBalance.mockReset();
-		coreMocks.fetchAvailableSubscriptionPlans.mockReset();
-		coreMocks.serviceOptions.length = 0;
-		telemetryMocks.identifyTelemetryAccount.mockReset();
-	});
-
-	afterEach(() => {
-		vi.restoreAllMocks();
-		vi.unstubAllGlobals();
-	});
-
-	it("loads individual subscription plans through the authorized account service", async () => {
-		const plans = [
-			{
-				id: "plan-1",
-				interval: "Monthly",
-				features: { included: ["Major open-weights models"] },
-			},
-		];
-		coreMocks.getProviderSettings.mockReturnValue({
-			provider: "cline",
-			apiKey: "account-token",
-		});
-		coreMocks.fetchAvailableSubscriptionPlans.mockResolvedValue(plans);
-
-		const { loadIndividualSubscriptionPlans } = await import("./cline-account");
-		const result = await loadIndividualSubscriptionPlans({
-			config: makeConfig(),
-		});
-
-		expect(coreMocks.fetchAvailableSubscriptionPlans).toHaveBeenCalledWith({
-			type: "individual",
-		});
-		expect(result).toEqual(plans);
-	});
-});

apps/cli/src/utils/cline-pass-errors.test.ts

@@ -1,49 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-	formatCliErrorMessage,
-	getCliNotSubscribedMessage,
-	getCliSubscriptionUrl,
-	getClineOrgIndividualInferenceSubscriptionMessage,
-	isClineOrgIndividualInferenceSubscriptionErrorMessage,
-	isClinePassSubscriptionError,
-} from "./cline-pass-errors";
-
-describe("cline-pass-errors", () => {
-	it("recognizes both raw and formatted ClinePass subscription messages", () => {
-		expect(
-			isClinePassSubscriptionError(
-				"the user is not subscribed to required model plan",
-			),
-		).toBe(true);
-
-		const sdkFormatted =
-			"No access to ClinePass subscription models yet. Subscribe to ClinePass, the low cost open weights model coding plan: https://app.cline.bot/dashboard/subscription?personal=true";
-		const formatted = getCliNotSubscribedMessage();
-		expect(isClinePassSubscriptionError(sdkFormatted)).toBe(true);
-		expect(isClinePassSubscriptionError(formatted)).toBe(true);
-		expect(formatCliErrorMessage(new Error(sdkFormatted))).toBe(formatted);
-		expect(formatCliErrorMessage(new Error(formatted))).toBe(formatted);
-	});
-
-	it("formats the ClinePass subscription URL", () => {
-		expect(getCliSubscriptionUrl()).toBe(
-			"https://app.cline.bot/promo?code=CLI-100&personal=true",
-		);
-	});
-
-	it("recognizes and formats organization account individual subscription errors", () => {
-		const raw =
-			"403 Error 403: organization accounts cannot use individual model inference subscriptions";
-		const formatted = getClineOrgIndividualInferenceSubscriptionMessage();
-
-		expect(isClineOrgIndividualInferenceSubscriptionErrorMessage(raw)).toBe(
-			true,
-		);
-		expect(
-			isClineOrgIndividualInferenceSubscriptionErrorMessage(
-				new Error(formatted),
-			),
-		).toBe(true);
-		expect(formatCliErrorMessage(new Error(raw))).toBe(formatted);
-	});
-});

apps/cli/src/utils/cline-pass-errors.ts

@@ -1,83 +0,0 @@
-import {
-	getClineOrgIndividualInferenceSubscriptionMessage,
-	isClineNotSubscribedError,
-	isClineNotSubscribedMessage,
-	isClineOrgIndividualInferenceSubscriptionError,
-	isClineOrgIndividualInferenceSubscriptionMessage,
-} from "@cline/core";
-
-import { getClineEnvironmentConfig } from "@cline/shared";
-
-export {
-	getClineOrgIndividualInferenceSubscriptionMessage,
-};
-
-export function getCliSubscriptionUrl(): string {
-	return `${new URL(
-		"/promo?code=CLI-100&personal=true",
-		getClineEnvironmentConfig().appBaseUrl,
-	).toString()}`;
-}
-
-export function getCliNotSubscribedMessage(): string {
-	return `No access to ClinePass subscription models yet. Subscribe to ClinePass, the low cost open weights model coding plan: ${getCliSubscriptionUrl()}`;
-}
-
-function isFormattedClinePassSubscriptionMessage(message: string): boolean {
-	const normalized = message.trim().toLowerCase();
-	return (
-		normalized.includes("no access to clinepass subscription models yet") &&
-		normalized.includes("subscribe to clinepass")
-	);
-}
-
-export function isClinePassSubscriptionError(error: unknown): boolean {
-	if (isClineNotSubscribedError(error)) {
-		return true;
-	}
-	if (error instanceof Error) {
-		return (
-			error.name === "ClineNotSubscribedError" ||
-			isClineNotSubscribedMessage(error.message) ||
-			isFormattedClinePassSubscriptionMessage(error.message)
-		);
-	}
-	return (
-		typeof error === "string" &&
-		(isClineNotSubscribedMessage(error) ||
-			isFormattedClinePassSubscriptionMessage(error))
-	);
-}
-
-export function isClineOrgIndividualInferenceSubscriptionErrorMessage(
-	error: unknown,
-): boolean {
-	if (isClineOrgIndividualInferenceSubscriptionError(error)) {
-		return true;
-	}
-	if (error instanceof Error) {
-		return (
-			error.name === "ClineOrgIndividualInferenceSubscriptionError" ||
-			isClineOrgIndividualInferenceSubscriptionMessage(error.message) ||
-			error.message === getClineOrgIndividualInferenceSubscriptionMessage()
-		);
-	}
-	return (
-		typeof error === "string" &&
-		(isClineOrgIndividualInferenceSubscriptionMessage(error) ||
-			error === getClineOrgIndividualInferenceSubscriptionMessage())
-	);
-}
-
-export function formatCliErrorMessage(error: unknown): string {
-	if (isClinePassSubscriptionError(error)) {
-		return getCliNotSubscribedMessage();
-	}
-	if (isClineOrgIndividualInferenceSubscriptionErrorMessage(error)) {
-		return getClineOrgIndividualInferenceSubscriptionMessage();
-	}
-	if (error instanceof Error) {
-		return error.message;
-	}
-	return String(error);
-}

apps/cli/src/utils/feature-flags.test.ts

@@ -1,19 +0,0 @@
-import { afterEach, describe, expect, it } from "vitest";
-import {
-	disposeCliFeatureFlagsService,
-	getCliFeatureFlagsService,
-} from "./feature-flags";
-
-describe("CLI feature flags singleton", () => {
-	afterEach(async () => {
-		await disposeCliFeatureFlagsService();
-	});
-
-	it("recreates the singleton after disposal", async () => {
-		const service = getCliFeatureFlagsService();
-
-		await disposeCliFeatureFlagsService();
-
-		expect(getCliFeatureFlagsService()).not.toBe(service);
-	});
-});

apps/cli/src/utils/feature-flags.ts

@@ -1,118 +0,0 @@
-import { join } from "node:path";
-import {
-	type BasicLogger,
-	type FeatureFlagsContext,
-	FeatureFlagsService,
-	type ITelemetryService,
-	NoOpFeatureFlagsProvider,
-	registerDisposable,
-	resolveCoreDistinctId,
-} from "@cline/core";
-import {
-	buildClinePostHogClient,
-	PostHogFeatureFlagsProvider,
-} from "@cline/core/services/feature-flags/posthog";
-import { resolveClineDataDir } from "@cline/shared/storage";
-
-let cliFeatureFlagsContext: FeatureFlagsContext = { clientName: "cline-cli" };
-let cliFeatureFlagsService: FeatureFlagsService | undefined;
-
-const CLI_FEATURE_FLAGS_CACHE_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000;
-
-function resolveCliFeatureFlagsCachePath(): string {
-	return join(resolveClineDataDir(), "cache", "feature-flags.json");
-}
-
-function ensureCliDistinctId(): string {
-	const distinctId = cliFeatureFlagsContext.distinctId?.trim();
-	if (distinctId) {
-		return distinctId;
-	}
-	const resolved = resolveCoreDistinctId();
-	cliFeatureFlagsContext.distinctId = resolved;
-	return resolved;
-}
-
-export function getCliFeatureFlagsContext(): FeatureFlagsContext {
-	ensureCliDistinctId();
-	return { ...cliFeatureFlagsContext };
-}
-
-export function getCliFeatureFlagsService(options?: {
-	logger?: BasicLogger;
-	telemetry?: ITelemetryService;
-}): FeatureFlagsService {
-	if (!cliFeatureFlagsService) {
-		const apiKey = process.env.TELEMETRY_SERVICE_API_KEY;
-		const provider =
-			apiKey &&
-			process.env.IS_TEST !== "true" &&
-			process.env.E2E_TEST !== "true"
-				? new PostHogFeatureFlagsProvider({
-						client: buildClinePostHogClient(apiKey),
-						config: {
-							logger: options?.logger,
-						},
-					})
-				: new NoOpFeatureFlagsProvider();
-
-		cliFeatureFlagsService = new FeatureFlagsService({
-			provider,
-			telemetry: options?.telemetry,
-			logger: options?.logger,
-			context: getCliFeatureFlagsContext(),
-			cacheFilePath: resolveCliFeatureFlagsCachePath(),
-			persistentCacheMaxAgeMs: CLI_FEATURE_FLAGS_CACHE_MAX_AGE_MS,
-		});
-		registerDisposable(disposeCliFeatureFlagsService);
-	}
-
-	return cliFeatureFlagsService;
-}
-
-export function refreshCliFeatureFlagsInBackground(logger?: BasicLogger): void {
-	const service = getCliFeatureFlagsService({ logger });
-	void service.poll().catch((error) => {
-		logger?.error?.("Error refreshing CLI feature flags", { error });
-	});
-}
-
-export async function disposeCliFeatureFlagsService(): Promise<void> {
-	if (!cliFeatureFlagsService) {
-		return;
-	}
-
-	const current = cliFeatureFlagsService;
-	cliFeatureFlagsService = undefined;
-	await current.dispose();
-}
-
-export function setCliFeatureFlagsAccountContext(account: {
-	id?: string;
-	email?: string;
-}): void {
-	const accountId = account.id?.trim();
-	cliFeatureFlagsContext = {
-		...cliFeatureFlagsContext,
-		...(accountId ? { distinctId: accountId, userId: accountId } : {}),
-		...(account.email?.trim() ? { email: account.email.trim() } : {}),
-	};
-	cliFeatureFlagsService?.setContext(getCliFeatureFlagsContext());
-}
-
-export async function identifyFeatureFlagsAccount(
-	account: { id?: string; email?: string },
-	logger?: BasicLogger,
-): Promise<void> {
-	setCliFeatureFlagsAccountContext(account);
-
-	if (!cliFeatureFlagsService) {
-		return;
-	}
-
-	try {
-		await cliFeatureFlagsService.poll();
-	} catch (error) {
-		logger?.error?.("Error polling CLI feature flags", { error });
-	}
-}

apps/cli/src/utils/free-model-cost.test.ts

@@ -1,162 +0,0 @@
-import type { AgentEvent } from "@cline/core";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import {
-	clearClineFreeModelCostCache,
-	shouldZeroClineFreeModelCost,
-	zeroCliAgentEventCost,
-	zeroCliUsageCost,
-} from "./free-model-cost";
-
-afterEach(() => {
-	clearClineFreeModelCostCache();
-	vi.unstubAllGlobals();
-});
-
-describe("shouldZeroClineFreeModelCost", () => {
-	it("uses the Cline free model list", async () => {
-		const fetchMock = vi.fn(
-			async (_input: Parameters<typeof fetch>[0], _init?: RequestInit) => {
-				return new Response(
-					JSON.stringify({
-						free: [{ id: "deepseek/deepseek-v4-flash" }],
-					}),
-					{ status: 200, headers: { "content-type": "application/json" } },
-				);
-			},
-		);
-		vi.stubGlobal("fetch", fetchMock);
-
-		await expect(
-			shouldZeroClineFreeModelCost({
-				providerId: "cline",
-				modelId: "deepseek/deepseek-v4-flash",
-				baseUrl: "https://cline.test/api/v1",
-			}),
-		).resolves.toBe(true);
-
-		expect(fetchMock.mock.calls[0]?.[0]).toBe(
-			"https://cline.test/api/v1/ai/cline/recommended-models",
-		);
-	});
-
-	it("does not zero non-Cline providers", async () => {
-		const fetchMock = vi.fn();
-		vi.stubGlobal("fetch", fetchMock);
-
-		await expect(
-			shouldZeroClineFreeModelCost({
-				providerId: "openrouter",
-				modelId: "deepseek/deepseek-v4-flash",
-				baseUrl: "https://cline.test/api/v1",
-			}),
-		).resolves.toBe(false);
-		expect(fetchMock).not.toHaveBeenCalled();
-	});
-
-	it("does not match a paid model by only the final path segment", async () => {
-		vi.stubGlobal(
-			"fetch",
-			vi.fn(async () => {
-				return new Response(
-					JSON.stringify({
-						free: [{ id: "deepseek/deepseek-v4-flash" }],
-					}),
-					{ status: 200, headers: { "content-type": "application/json" } },
-				);
-			}),
-		);
-
-		await expect(
-			shouldZeroClineFreeModelCost({
-				providerId: "cline",
-				modelId: "acme/deepseek-v4-flash",
-				baseUrl: "https://cline.test/api/v1",
-			}),
-		).resolves.toBe(false);
-	});
-
-	it("retries after a failed free model list fetch", async () => {
-		const fetchMock = vi
-			.fn()
-			.mockResolvedValueOnce(new Response("unavailable", { status: 503 }))
-			.mockResolvedValueOnce(
-				new Response(
-					JSON.stringify({
-						free: [{ id: "deepseek/deepseek-v4-flash" }],
-					}),
-					{ status: 200, headers: { "content-type": "application/json" } },
-				),
-			);
-		vi.stubGlobal("fetch", fetchMock);
-
-		await expect(
-			shouldZeroClineFreeModelCost({
-				providerId: "cline",
-				modelId: "deepseek/deepseek-v4-flash",
-				baseUrl: "https://cline.test/api/v1",
-			}),
-		).resolves.toBe(false);
-		await expect(
-			shouldZeroClineFreeModelCost({
-				providerId: "cline",
-				modelId: "deepseek/deepseek-v4-flash",
-				baseUrl: "https://cline.test/api/v1",
-			}),
-		).resolves.toBe(true);
-		expect(fetchMock).toHaveBeenCalledTimes(2);
-	});
-});
-
-describe("zeroCliUsageCost", () => {
-	it("zeros total cost while preserving token usage", () => {
-		expect(
-			zeroCliUsageCost(
-				{
-					inputTokens: 10,
-					outputTokens: 5,
-					totalCost: 0.001,
-				},
-				true,
-			),
-		).toEqual({
-			inputTokens: 10,
-			outputTokens: 5,
-			totalCost: 0,
-		});
-	});
-});
-
-describe("zeroCliAgentEventCost", () => {
-	it("zeros usage event cost fields", () => {
-		const event = {
-			type: "usage",
-			inputTokens: 10,
-			outputTokens: 5,
-			cost: 0.001,
-			totalCost: 0.001,
-		} as AgentEvent;
-
-		expect(zeroCliAgentEventCost(event, true)).toMatchObject({
-			cost: 0,
-			totalCost: 0,
-		});
-	});
-
-	it("zeros done event usage cost", () => {
-		const event = {
-			type: "done",
-			reason: "completed",
-			text: "ok",
-			iterations: 1,
-			usage: {
-				inputTokens: 10,
-				outputTokens: 5,
-				totalCost: 0.001,
-			},
-		} as AgentEvent;
-
-		expect(zeroCliAgentEventCost(event, true)).toMatchObject({
-			usage: { totalCost: 0 },
-		});
-	});
-});

apps/cli/src/utils/free-model-cost.ts

@@ -1,123 +0,0 @@
-import type { AgentEvent } from "@cline/core";
-import { getClineEnvironmentConfig } from "@cline/shared";
-import type { Config } from "./types";
-
-const CLINE_RECOMMENDED_MODELS_TIMEOUT_MS = 5_000;
-const freeModelIdsByBaseUrl = new Map<
-	string,
-	Promise<readonly string[] | undefined>
->();
-
-function normalizeModelId(modelId: string | undefined): string {
-	return modelId?.trim().toLowerCase() ?? "";
-}
-
-function modelIdsMatch(selectedModelId: string, freeModelId: string): boolean {
-	const selected = normalizeModelId(selectedModelId);
-	const free = normalizeModelId(freeModelId);
-	if (!selected || !free) return false;
-	return selected === free;
-}
-
-function resolveClineRecommendedModelsUrl(baseUrl: string): string {
-	const normalizedBaseUrl = baseUrl.trim().replace(/\/+$/, "");
-	const apiBaseUrl = normalizedBaseUrl.endsWith("/api/v1")
-		? normalizedBaseUrl.slice(0, -"/api/v1".length)
-		: normalizedBaseUrl;
-	return `${apiBaseUrl}/api/v1/ai/cline/recommended-models`;
-}
-
-async function fetchClineFreeModelIds(
-	baseUrl: string,
-): Promise<readonly string[] | undefined> {
-	const controller = new AbortController();
-	const timeout = setTimeout(
-		() => controller.abort(),
-		CLINE_RECOMMENDED_MODELS_TIMEOUT_MS,
-	);
-	try {
-		const response = await fetch(resolveClineRecommendedModelsUrl(baseUrl), {
-			signal: controller.signal,
-		});
-		if (!response.ok) return undefined;
-		const json = (await response.json()) as { free?: unknown };
-		return Array.isArray(json.free)
-			? json.free
-					.map((model) =>
-						model && typeof model === "object"
-							? (model as Record<string, unknown>).id
-							: undefined,
-					)
-					.filter((id): id is string => typeof id === "string" && id.length > 0)
-			: [];
-	} catch {
-		return undefined;
-	} finally {
-		clearTimeout(timeout);
-	}
-}
-
-function getClineFreeModelIds(baseUrl: string): Promise<readonly string[]> {
-	const cacheKey = baseUrl.trim();
-	let cached = freeModelIdsByBaseUrl.get(cacheKey);
-	if (!cached) {
-		cached = fetchClineFreeModelIds(cacheKey).then((ids) => {
-			if (!ids) freeModelIdsByBaseUrl.delete(cacheKey);
-			return ids;
-		});
-		freeModelIdsByBaseUrl.set(cacheKey, cached);
-	}
-	return cached.then((ids) => ids ?? []);
-}
-
-export async function shouldZeroClineFreeModelCost(
-	config: Pick<Config, "providerId" | "modelId" | "baseUrl">,
-): Promise<boolean> {
-	if (config.providerId !== "cline") return false;
-	const modelId = normalizeModelId(config.modelId);
-	if (!modelId) return false;
-
-	const baseUrl =
-		config.baseUrl?.trim() || getClineEnvironmentConfig().apiBaseUrl;
-	const freeModelIds = await getClineFreeModelIds(baseUrl);
-	return freeModelIds.some((freeModelId) =>
-		modelIdsMatch(modelId, freeModelId),
-	);
-}
-
-export function zeroCliUsageCost<T extends { totalCost?: number } | undefined>(
-	usage: T,
-	shouldZeroCost: boolean,
-): T {
-	if (
-		!shouldZeroCost ||
-		!usage ||
-		typeof usage.totalCost !== "number" ||
-		usage.totalCost === 0
-	) {
-		return usage;
-	}
-	return { ...usage, totalCost: 0 } as T;
-}
-
-export function zeroCliAgentEventCost(
-	event: AgentEvent,
-	shouldZeroCost: boolean,
-): AgentEvent {
-	if (!shouldZeroCost) return event;
-	if (event.type === "done" && event.usage) {
-		return {
-			...event,
-			usage: zeroCliUsageCost(event.usage, true),
-		};
-	}
-	if (event.type !== "usage") return event;
-	const next = { ...event } as Record<string, unknown>;
-	if (typeof next.cost === "number") next.cost = 0;
-	if (typeof next.totalCost === "number") next.totalCost = 0;
-	return next as unknown as AgentEvent;
-}
-
-export function clearClineFreeModelCostCache(): void {
-	freeModelIdsByBaseUrl.clear();
-}

apps/cli/src/utils/history-resume.test.ts

@@ -1,99 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { buildHistoryResumeArgs } from "./history-resume";
-
-describe("buildHistoryResumeArgs", () => {
-	it("replaces the history subcommand with --id", () => {
-		expect(
-			buildHistoryResumeArgs({
-				sessionId: "sess_1",
-				normalizedArgs: ["history"],
-				remainingArgs: ["history"],
-			}),
-		).toEqual(["--id", "sess_1"]);
-	});
-
-	it("preserves global flags that precede the subcommand", () => {
-		expect(
-			buildHistoryResumeArgs({
-				sessionId: "sess_1",
-				normalizedArgs: [
-					"--data-dir",
-					"/tmp/data",
-					"-m",
-					"claude-sonnet-4-6",
-					"history",
-					"--limit",
-					"5",
-				],
-				remainingArgs: ["history", "--limit", "5"],
-			}),
-		).toEqual([
-			"--data-dir",
-			"/tmp/data",
-			"-m",
-			"claude-sonnet-4-6",
-			"--id",
-			"sess_1",
-		]);
-	});
-
-	it("keeps a global flag value that matches the subcommand alias", () => {
-		expect(
-			buildHistoryResumeArgs({
-				sessionId: "sess_1",
-				normalizedArgs: ["-m", "h", "h"],
-				remainingArgs: ["h"],
-			}),
-		).toEqual(["-m", "h", "--id", "sess_1"]);
-	});
-
-	it("forwards a config dir passed as a subcommand option", () => {
-		expect(
-			buildHistoryResumeArgs({
-				sessionId: "sess_1",
-				normalizedArgs: ["history", "--config", "/tmp/conf"],
-				remainingArgs: ["history", "--config", "/tmp/conf"],
-				configDir: "/tmp/conf",
-			}),
-		).toEqual(["--config", "/tmp/conf", "--id", "sess_1"]);
-	});
-
-	it("does not duplicate a config dir already in the global flags", () => {
-		expect(
-			buildHistoryResumeArgs({
-				sessionId: "sess_1",
-				normalizedArgs: ["--config", "/tmp/conf", "history"],
-				remainingArgs: ["history"],
-				configDir: "/tmp/conf",
-			}),
-		).toEqual(["--config", "/tmp/conf", "--id", "sess_1"]);
-	});
-
-	it("recognizes the --config=<dir> spelling in global flags", () => {
-		expect(
-			buildHistoryResumeArgs({
-				sessionId: "sess_1",
-				normalizedArgs: ["--config=/tmp/conf", "history"],
-				remainingArgs: ["history"],
-				configDir: "/tmp/conf",
-			}),
-		).toEqual(["--config=/tmp/conf", "--id", "sess_1"]);
-	});
-
-	it("returns undefined when remaining args are not a suffix of argv", () => {
-		expect(
-			buildHistoryResumeArgs({
-				sessionId: "sess_1",
-				normalizedArgs: ["history", "--limit", "5"],
-				remainingArgs: ["history", "--limit", "9"],
-			}),
-		).toBeUndefined();
-		expect(
-			buildHistoryResumeArgs({
-				sessionId: "sess_1",
-				normalizedArgs: ["history"],
-				remainingArgs: ["extra", "history"],
-			}),
-		).toBeUndefined();
-	});
-});

apps/cli/src/utils/history-resume.ts

@@ -1,115 +0,0 @@
-import { resolveCliLaunchSpec } from "./internal-launch";
-
-export interface HistoryResumeCommand {
-	launcher: string;
-	childArgs: string[];
-}
-
-export interface BuildHistoryResumeArgsInput {
-	sessionId: string;
-	/** Full normalized CLI args (process.argv.slice(2) after normalization). */
-	normalizedArgs: string[];
-	/**
-	 * Commander's `program.args` after parsing: the `history` subcommand token
-	 * and everything following it. Must be a suffix of `normalizedArgs`.
-	 */
-	remainingArgs: string[];
-	/**
-	 * Config dir resolved from the full argv. Forwarded explicitly because
-	 * `--config` may have been passed as a `history` subcommand option, which
-	 * would otherwise be dropped with the rest of the subcommand args.
-	 */
-	configDir?: string;
-}
-
-/**
- * Builds argv for relaunching the CLI as `cline <globalFlags> --id <sessionId>`
- * after a session is picked in `cline history`. Returns undefined when the
- * global-flag prefix cannot be derived safely (caller falls back to resuming
- * in-process).
- */
-export function buildHistoryResumeArgs(
-	input: BuildHistoryResumeArgsInput,
-): string[] | undefined {
-	const { sessionId, normalizedArgs, remainingArgs, configDir } = input;
-	const splitIndex = normalizedArgs.length - remainingArgs.length;
-	if (splitIndex < 0) {
-		return undefined;
-	}
-	for (let i = 0; i < remainingArgs.length; i++) {
-		if (normalizedArgs[splitIndex + i] !== remainingArgs[i]) {
-			return undefined;
-		}
-	}
-	const globalArgs = normalizedArgs.slice(0, splitIndex);
-	const args = [...globalArgs];
-	const hasConfigFlag = globalArgs.some(
-		(arg) => arg === "--config" || arg.startsWith("--config="),
-	);
-	if (configDir && !hasConfigFlag) {
-		args.push("--config", configDir);
-	}
-	args.push("--id", sessionId);
-	return args;
-}
-
-export function buildHistoryResumeCommand(
-	input: BuildHistoryResumeArgsInput,
-): HistoryResumeCommand | undefined {
-	const childArgs = buildHistoryResumeArgs(input);
-	if (!childArgs) {
-		return undefined;
-	}
-	const spec = resolveCliLaunchSpec();
-	if (!spec) {
-		return undefined;
-	}
-	return {
-		launcher: spec.launcher,
-		childArgs: [...spec.childArgsPrefix, ...childArgs],
-	};
-}
-
-/**
- * Resumes a history-picked session in a fresh `cline --id <sessionId>` child
- * process with inherited stdio, and returns its exit code. Creating a second
- * OpenTUI renderer in the picker's process can crash natively during teardown
- * (Bun "panic(main thread): Segmentation fault" on Ctrl+C), so the resumed
- * interactive TUI must get a process of its own.
- *
- * Returns undefined when the child cannot be launched; the caller should fall
- * back to resuming in-process.
- */
-export async function spawnHistoryResume(
-	input: BuildHistoryResumeArgsInput,
-): Promise<number | undefined> {
-	const command = buildHistoryResumeCommand(input);
-	if (!command) {
-		return undefined;
-	}
-	const { spawn } = await import("node:child_process");
-	return await new Promise<number | undefined>((resolve) => {
-		let child: ReturnType<typeof spawn>;
-		try {
-			child = spawn(command.launcher, command.childArgs, {
-				stdio: "inherit",
-			});
-		} catch {
-			resolve(undefined);
-			return;
-		}
-		// The child shares this foreground process group, so terminal-generated
-		// Ctrl+C already reaches it. Keep the parent alive to reap the child
-		// without re-forwarding a second signal into the TUI teardown path.
-		const suppressParentSignal = () => {};
-		process.on("SIGINT", suppressParentSignal);
-		process.on("SIGTERM", suppressParentSignal);
-		const finish = (value: number | undefined) => {
-			process.off("SIGINT", suppressParentSignal);
-			process.off("SIGTERM", suppressParentSignal);
-			resolve(value);
-		};
-		child.once("error", () => finish(undefined));
-		child.once("exit", (code, signal) => finish(signal ? 1 : (code ?? 0)));
-	});
-}

apps/cli/src/utils/provider-catalog.test.ts

@@ -1,34 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-
-const mocks = vi.hoisted(() => ({
-	listLocalProviders: vi.fn(async () => ({ providers: [], settingsPath: "" })),
-	getBooleanFlagEnabled: vi.fn(() => true),
-}));
-
-vi.mock("@cline/core", async (importOriginal) => {
-	const actual = await importOriginal<typeof import("@cline/core")>();
-	return {
-		...actual,
-		listLocalProviders: mocks.listLocalProviders,
-	};
-});
-
-vi.mock("./feature-flags", () => ({
-	getCliFeatureFlagsService: () => ({
-		getBooleanFlagEnabled: mocks.getBooleanFlagEnabled,
-	}),
-}));
-
-describe("listLocalProviders", () => {
-	it("passes the ClinePass feature flag into the SDK provider list", async () => {
-		const { listLocalProviders } = await import("./provider-catalog");
-		const manager = {} as never;
-
-		await listLocalProviders(manager);
-
-		expect(mocks.getBooleanFlagEnabled).toHaveBeenCalledWith("ext-cline-pass");
-		expect(mocks.listLocalProviders).toHaveBeenCalledWith(manager, {
-			isClinePassEnabled: true,
-		});
-	});
-});

apps/cli/src/utils/provider-catalog.ts

@@ -1,14 +0,0 @@
-import {
-	listLocalProviders as internalListLocalProviders,
-	type ProviderSettingsManager,
-} from "@cline/core";
-import { getCliFeatureFlagsService } from "./feature-flags";
-
-export async function listLocalProviders(
-	manager: ProviderSettingsManager,
-): ReturnType<typeof internalListLocalProviders> {
-	return await internalListLocalProviders(manager, {
-		isClinePassEnabled:
-			getCliFeatureFlagsService().getBooleanFlagEnabled("ext-cline-pass"),
-	});
-}

apps/cli/src/utils/reasoning.test.ts

@@ -1,89 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { resolveCliReasoning } from "./reasoning";
-
-describe("resolveCliReasoning", () => {
-	it("leaves reasoning unset when neither CLI nor persisted settings specify it", () => {
-		expect(
-			resolveCliReasoning({
-				thinking: false,
-			}),
-		).toEqual({
-			thinking: undefined,
-			reasoningEffort: undefined,
-		});
-	});
-
-	it("preserves explicit --thinking none as disabled reasoning", () => {
-		expect(
-			resolveCliReasoning({
-				thinking: false,
-				thinkingExplicitlySet: true,
-			}),
-		).toEqual({
-			thinking: false,
-			reasoningEffort: undefined,
-		});
-	});
-
-	it("prefers explicit --thinking over persisted reasoning settings", () => {
-		expect(
-			resolveCliReasoning({
-				thinking: true,
-				thinkingExplicitlySet: true,
-				reasoningEffort: "low",
-				persistedReasoning: { enabled: false },
-			}),
-		).toEqual({
-			thinking: true,
-			reasoningEffort: "low",
-		});
-	});
-
-	it("uses persisted disabled reasoning when --thinking is unset", () => {
-		expect(
-			resolveCliReasoning({
-				thinking: false,
-				persistedReasoning: { enabled: false },
-			}),
-		).toEqual({
-			thinking: false,
-			reasoningEffort: undefined,
-		});
-	});
-
-	it("uses persisted effort none as disabled reasoning when --thinking is unset", () => {
-		expect(
-			resolveCliReasoning({
-				thinking: false,
-				persistedReasoning: { effort: "none" },
-			}),
-		).toEqual({
-			thinking: false,
-			reasoningEffort: undefined,
-		});
-	});
-
-	it("uses persisted active effort when --thinking is unset", () => {
-		expect(
-			resolveCliReasoning({
-				thinking: false,
-				persistedReasoning: { enabled: true, effort: "high" },
-			}),
-		).toEqual({
-			thinking: true,
-			reasoningEffort: "high",
-		});
-	});
-
-	it("uses medium effort when persisted reasoning is enabled without an effort", () => {
-		expect(
-			resolveCliReasoning({
-				thinking: false,
-				persistedReasoning: { enabled: true },
-			}),
-		).toEqual({
-			thinking: true,
-			reasoningEffort: "medium",
-		});
-	});
-});

apps/cli/src/utils/reasoning.ts

@@ -1,65 +0,0 @@
-import type { ProviderSettings } from "@cline/core";
-import type { CliReasoningEffort } from "./types";
-
-type ActiveCliReasoningEffort = Exclude<CliReasoningEffort, "none">;
-
-const ACTIVE_REASONING_EFFORTS = new Set<ActiveCliReasoningEffort>([
-	"low",
-	"medium",
-	"high",
-	"xhigh",
-]);
-
-export interface ResolveCliReasoningInput {
-	thinking: boolean;
-	thinkingExplicitlySet?: boolean;
-	reasoningEffort?: CliReasoningEffort;
-	persistedReasoning?: ProviderSettings["reasoning"];
-}
-
-export interface ResolvedCliReasoning {
-	thinking?: boolean;
-	reasoningEffort?: ActiveCliReasoningEffort;
-}
-
-function isActiveReasoningEffort(
-	effort: unknown,
-): effort is ActiveCliReasoningEffort {
-	return (
-		typeof effort === "string" &&
-		ACTIVE_REASONING_EFFORTS.has(effort as ActiveCliReasoningEffort)
-	);
-}
-
-export function resolveCliReasoning({
-	thinking,
-	thinkingExplicitlySet,
-	reasoningEffort,
-	persistedReasoning,
-}: ResolveCliReasoningInput): ResolvedCliReasoning {
-	if (thinkingExplicitlySet) {
-		return {
-			thinking,
-			reasoningEffort: isActiveReasoningEffort(reasoningEffort)
-				? reasoningEffort
-				: undefined,
-		};
-	}
-
-	if (
-		persistedReasoning?.enabled === false ||
-		persistedReasoning?.effort === "none"
-	) {
-		return { thinking: false, reasoningEffort: undefined };
-	}
-
-	if (isActiveReasoningEffort(persistedReasoning?.effort)) {
-		return { thinking: true, reasoningEffort: persistedReasoning.effort };
-	}
-
-	if (persistedReasoning?.enabled === true) {
-		return { thinking: true, reasoningEffort: "medium" };
-	}
-
-	return { thinking: undefined, reasoningEffort: undefined };
-}

apps/cli/src/wizards/connect/platforms.test.ts

@@ -1,81 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { PLATFORMS, shouldIncludeField } from "./platforms";
-
-describe("connect wizard platform security fields", () => {
-	it("does not ask Telegram users to re-enter the bot username", () => {
-		const telegram = PLATFORMS.find((platform) => platform.id === "telegram");
-
-		expect(telegram?.fields.map((field) => field.label)).toEqual(["Bot token"]);
-		expect(telegram?.fields.map((field) => field.flag)).toEqual(["-k"]);
-	});
-
-	it("rejects unsafe Telegram and Slack access restriction identifiers", () => {
-		const telegram = PLATFORMS.find((platform) => platform.id === "telegram");
-		const slack = PLATFORMS.find((platform) => platform.id === "slack");
-
-		const telegramUser = telegram?.security?.fields.find(
-			(field) => field.key === "userId",
-		);
-		const slackTeam = slack?.security?.fields.find(
-			(field) => field.key === "teamId",
-		);
-		const slackUser = slack?.security?.fields.find(
-			(field) => field.key === "userId",
-		);
-
-		expect(telegramUser?.validate?.("123456")).toBeUndefined();
-		expect(telegramUser?.validate?.("123; rm -rf /")).toContain("digits");
-		expect(slackTeam?.validate?.("T01ABC123")).toBeUndefined();
-		expect(slackTeam?.validate?.("T01;bad")).toContain("Slack workspace");
-		expect(slackUser?.validate?.("U01ABC123")).toBeUndefined();
-		expect(slackUser?.validate?.("U01$(bad)")).toContain("Slack member");
-	});
-
-	it("uses the Telegram allowed user ID flag for wizard security", () => {
-		const telegram = PLATFORMS.find((platform) => platform.id === "telegram");
-
-		const args = telegram?.security?.buildArgs({
-			userId: "123456",
-		});
-
-		expect(args).toEqual(["--allowed-user-id", "123456"]);
-	});
-
-	it("builds an exact-match Slack authorization hook", () => {
-		const slack = PLATFORMS.find((platform) => platform.id === "slack");
-
-		const args = slack?.security?.buildArgs({
-			teamId: "T01ABC123",
-			userId: "U01ABC123",
-		});
-
-		expect(args).toEqual([
-			"--hook-command",
-			`jq -r ".payload.actor.participantKey" | grep -qx "slack:team:T01ABC123:user:U01ABC123" && echo '{"action":"allow"}' || echo '{"action":"deny"}'`,
-		]);
-	});
-
-	it("asks Slack users for mode-specific setup fields", () => {
-		const slack = PLATFORMS.find((platform) => platform.id === "slack");
-		const fields = slack?.fields ?? [];
-		const webhookValues = { "--base-url": "https://example.test" };
-		const socketValues = { "--base-url": "" };
-
-		expect(fields.map((field) => field.flag)).toEqual([
-			"--bot-token",
-			"--base-url",
-			"--signing-secret",
-			"--app-token",
-		]);
-		expect(
-			fields
-				.filter((field) => shouldIncludeField(field, webhookValues))
-				.map((field) => field.flag),
-		).toEqual(["--bot-token", "--base-url", "--signing-secret"]);
-		expect(
-			fields
-				.filter((field) => shouldIncludeField(field, socketValues))
-				.map((field) => field.flag),
-		).toEqual(["--bot-token", "--base-url", "--app-token"]);
-	});
-});

apps/cli/src/wizards/connect/platforms.ts

@@ -1,16 +0,0 @@
-import {
-	CONNECTOR_PLATFORMS,
-	shouldIncludeConnectorField,
-} from "@cline/shared";
-
-export type {
-	ConnectorFieldCondition as FieldCondition,
-	ConnectorFieldDef as FieldDef,
-	ConnectorPlatformDef as PlatformDef,
-	ConnectorSecurityDef as SecurityDef,
-	ConnectorSecurityFieldDef as SecurityFieldDef,
-} from "@cline/shared";
-export { CONNECTOR_PLATFORMS, shouldIncludeConnectorField };
-
-export const PLATFORMS = CONNECTOR_PLATFORMS;
-export const shouldIncludeField = shouldIncludeConnectorField;

apps/cli/src/wizards/mcp/oauth.ts

@@ -1,45 +0,0 @@
-import * as p from "@clack/prompts";
-import {
-	authorizeMcpServerOAuth,
-	resolveDefaultMcpSettingsPath,
-} from "@cline/core";
-import open from "open";
-
-function toErrorMessage(error: unknown): string {
-	if (error instanceof Error) {
-		const message = error.message.trim();
-		if (message.length > 0) {
-			return message;
-		}
-	}
-	return String(error);
-}
-
-export async function authorizeMcpServerOAuthWithBrowser(
-	name: string,
-	options: { throwOnError?: boolean } = {},
-): Promise<void> {
-	p.log.info("Opening browser for MCP OAuth authorization");
-	try {
-		const result = await authorizeMcpServerOAuth({
-			serverName: name,
-			filePath: resolveDefaultMcpSettingsPath(),
-			openUrl: async (url) => {
-				p.log.message(`Authorization URL: ${url}`);
-				await open(url, { wait: false });
-			},
-			onServerListening: (info) => {
-				p.log.message(`Waiting for OAuth callback at ${info.callbackUrl}`);
-			},
-		});
-		p.log.success(result.message);
-	} catch (error) {
-		if (options.throwOnError === true) {
-			throw error instanceof Error ? error : new Error(toErrorMessage(error));
-		}
-		p.log.error(`OAuth authorization failed: ${toErrorMessage(error)}`);
-		p.log.warn(
-			`Server "${name}" is still saved. Choose "Authorize OAuth" to retry.`,
-		);
-	}
-}

apps/cli/src/wizards/mcp/settings.ts

@@ -1,155 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import {
-	type McpServerOAuthState,
-	McpSettingsUpdateSkippedError,
-	resolveDefaultMcpSettingsPath,
-	updateMcpSettingsFileSync,
-} from "@cline/core";
-
-export interface McpServerEntry {
-	name: string;
-	transport: McpTransport;
-	disabled?: boolean;
-	oauth?: McpServerOAuthState;
-}
-
-export type McpTransport =
-	| {
-			type: "stdio";
-			command: string;
-			args?: string[];
-			env?: Record<string, string>;
-	  }
-	| { type: "sse"; url: string; headers?: Record<string, string> }
-	| { type: "streamableHttp"; url: string; headers?: Record<string, string> };
-
-export function getSettingsPath(): string {
-	return resolveDefaultMcpSettingsPath();
-}
-
-export function loadServers(): McpServerEntry[] {
-	const path = getSettingsPath();
-	if (!existsSync(path)) return [];
-	try {
-		const raw = readFileSync(path, "utf-8");
-		const parsed = JSON.parse(raw) as {
-			mcpServers?: Record<string, unknown>;
-		};
-		const servers = parsed.mcpServers ?? {};
-		return Object.entries(servers).map(([name, value]) => {
-			const entry = value as Record<string, unknown>;
-			const transport = (entry.transport ?? entry) as McpTransport;
-			const oauth =
-				entry.oauth &&
-				typeof entry.oauth === "object" &&
-				!Array.isArray(entry.oauth)
-					? (entry.oauth as McpServerOAuthState)
-					: undefined;
-			return {
-				name,
-				transport,
-				disabled: entry.disabled === true,
-				oauth,
-			};
-		});
-	} catch {
-		return [];
-	}
-}
-
-function getOwnServerRecord(
-	servers: Record<string, unknown>,
-	name: string,
-): Record<string, unknown> | undefined {
-	if (!Object.hasOwn(servers, name)) {
-		return undefined;
-	}
-	const value = servers[name];
-	if (!value || typeof value !== "object" || Array.isArray(value)) {
-		return undefined;
-	}
-	return value as Record<string, unknown>;
-}
-
-/**
- * Mutate the MCP settings file through @cline/core's locked read-update-write
- * helper. The mutator must be synchronous and pure; the helper may call it more
- * than once to verify deterministic output. Throw McpSettingsUpdateSkippedError
- * for normal no-op cases instead of returning a boolean that callers can ignore.
- */
-function mutateServers(mutate: (servers: Record<string, unknown>) => void): void {
-	updateMcpSettingsFileSync(getSettingsPath(), (settings) => {
-		const serversValue = settings.mcpServers;
-		const servers = serversValue && typeof serversValue === "object" && !Array.isArray(serversValue)
-			? { ...(serversValue as Record<string, unknown>) }
-			: {};
-		mutate(servers);
-		settings.mcpServers = servers;
-	});
-}
-
-export function addServer(name: string, transport: McpTransport): void {
-	mutateServers((servers) => {
-		servers[name] = { transport };
-	});
-}
-
-export function removeServer(name: string): boolean {
-	try {
-		mutateServers((servers) => {
-			if (!(name in servers)) {
-				throw new McpSettingsUpdateSkippedError(`MCP server not found: ${name}`);
-			}
-			delete servers[name];
-		});
-		return true;
-	} catch (error) {
-		if (error instanceof McpSettingsUpdateSkippedError) {
-			return false;
-		}
-		throw error;
-	}
-}
-
-export function updateServer(name: string, transport: McpTransport): void {
-	mutateServers((servers) => {
-		const existing =
-			servers[name] && typeof servers[name] === "object"
-				? (servers[name] as Record<string, unknown>)
-				: {};
-		servers[name] = { ...existing, transport };
-	});
-}
-
-export function clearServerOAuth(name: string): void {
-	try {
-		mutateServers((servers) => {
-			const existing = getOwnServerRecord(servers, name);
-			if (!existing) {
-				throw new McpSettingsUpdateSkippedError(`MCP server not found: ${name}`);
-			}
-			delete existing.oauth;
-			servers[name] = existing;
-		});
-	} catch (error) {
-		if (error instanceof McpSettingsUpdateSkippedError) {
-			return;
-		}
-		throw error;
-	}
-}
-
-export function toggleServer(name: string, disabled: boolean): void {
-	mutateServers((servers) => {
-		const existing =
-			servers[name] && typeof servers[name] === "object"
-				? (servers[name] as Record<string, unknown>)
-				: {};
-		if (disabled) {
-			existing.disabled = true;
-		} else {
-			delete existing.disabled;
-		}
-		servers[name] = existing;
-	});
-}

apps/cline-hub/src/server/browser-auth.test.ts

@@ -1,359 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-	allowedBrowserHosts,
-	allowedBrowserOrigins,
-	isAuthorizedBrowserRequest,
-	isAuthorizedBrowserToDesktopRequest,
-	requiresBrowserRequestAuth,
-} from "./browser-auth";
-
-const defaultOptions = {
-	bindHost: "127.0.0.1",
-	port: 8787,
-	publicUrl: "http://127.0.0.1:8787",
-};
-
-const publicRoute = (_req: Request, url: URL) => url.pathname === "/public";
-
-function browserRequest(
-	origin?: string,
-	init?: Omit<RequestInit, "headers"> & {
-		headers?: Record<string, string>;
-	},
-): Request {
-	return new Request("http://127.0.0.1:8787/browser", {
-		...init,
-		headers: {
-			host: "127.0.0.1:8787",
-			...(origin === undefined ? {} : { origin }),
-			...(init?.headers ?? {}),
-		},
-	});
-}
-
-describe("allowedBrowserOrigins", () => {
-	it("allows the configured public URL origin and local aliases for local binds", () => {
-		expect([...allowedBrowserOrigins(defaultOptions)].sort()).toEqual([
-			"http://127.0.0.1:8787",
-			"http://[::1]:8787",
-			"http://localhost:8787",
-		]);
-	});
-
-	it("uses the configured public URL scheme for local aliases", () => {
-		expect(
-			[
-				...allowedBrowserOrigins({
-					...defaultOptions,
-					publicUrl: "https://127.0.0.1:8787",
-				}),
-			].sort(),
-		).toEqual([
-			"https://127.0.0.1:8787",
-			"https://[::1]:8787",
-			"https://localhost:8787",
-		]);
-	});
-
-	it("omits default protocol ports for local alias origins", () => {
-		expect(
-			[
-				...allowedBrowserOrigins({
-					bindHost: "127.0.0.1",
-					port: 80,
-					publicUrl: "http://localhost",
-				}),
-			].sort(),
-		).toEqual(["http://127.0.0.1", "http://[::1]", "http://localhost"]);
-
-		expect(
-			[
-				...allowedBrowserOrigins({
-					bindHost: "127.0.0.1",
-					port: 443,
-					publicUrl: "https://localhost",
-				}),
-			].sort(),
-		).toEqual(["https://127.0.0.1", "https://[::1]", "https://localhost"]);
-	});
-
-	it("allows the configured public URL origin and explicit bind origin for non-local binds", () => {
-		expect(
-			[
-				...allowedBrowserOrigins({
-					bindHost: "0.0.0.0",
-					port: 8787,
-					publicUrl: "https://example.ngrok-free.app",
-					roomSecret: "secret",
-				}),
-			].sort(),
-		).toEqual(["https://0.0.0.0:8787", "https://example.ngrok-free.app"]);
-	});
-});
-
-describe("allowedBrowserHosts", () => {
-	it("allows the configured public URL host and local aliases for local binds", () => {
-		expect([...allowedBrowserHosts(defaultOptions)].sort()).toEqual([
-			"127.0.0.1:8787",
-			"[::1]:8787",
-			"localhost:8787",
-		]);
-	});
-
-	it("omits default protocol ports for local alias hosts", () => {
-		expect(
-			[
-				...allowedBrowserHosts({
-					bindHost: "127.0.0.1",
-					port: 80,
-					publicUrl: "http://localhost",
-				}),
-			].sort(),
-		).toEqual(["127.0.0.1", "[::1]", "localhost"]);
-
-		expect(
-			[
-				...allowedBrowserHosts({
-					bindHost: "127.0.0.1",
-					port: 443,
-					publicUrl: "https://localhost",
-				}),
-			].sort(),
-		).toEqual(["127.0.0.1", "[::1]", "localhost"]);
-	});
-
-	it("allows the configured public URL host and explicit bind host for non-local binds", () => {
-		expect(
-			[
-				...allowedBrowserHosts({
-					bindHost: "0.0.0.0",
-					port: 8787,
-					publicUrl: "https://example.ngrok-free.app",
-					roomSecret: "secret",
-				}),
-			].sort(),
-		).toEqual(["0.0.0.0:8787", "example.ngrok-free.app"]);
-	});
-});
-
-describe("requiresBrowserRequestAuth", () => {
-	it("does not require browser auth for public GET routes", () => {
-		expect(
-			requiresBrowserRequestAuth(
-				new Request("http://127.0.0.1:8787/public"),
-				new URL("http://127.0.0.1:8787/public"),
-				publicRoute,
-			),
-		).toBe(false);
-	});
-
-	it("requires browser auth for unknown paths even when they use GET", () => {
-		expect(
-			requiresBrowserRequestAuth(
-				new Request("http://127.0.0.1:8787/future-api"),
-				new URL("http://127.0.0.1:8787/future-api"),
-				publicRoute,
-			),
-		).toBe(true);
-	});
-
-	it("requires browser auth for privileged paths even when they use GET", () => {
-		expect(
-			requiresBrowserRequestAuth(
-				new Request("http://127.0.0.1:8787/browser"),
-				new URL("http://127.0.0.1:8787/browser"),
-				publicRoute,
-			),
-		).toBe(true);
-	});
-
-	it("requires browser auth for every WebSocket upgrade path", () => {
-		expect(
-			requiresBrowserRequestAuth(
-				new Request("http://127.0.0.1:8787/future-socket", {
-					headers: { upgrade: "websocket" },
-				}),
-				new URL("http://127.0.0.1:8787/future-socket"),
-				publicRoute,
-			),
-		).toBe(true);
-	});
-
-	it("requires browser auth for every unsafe HTTP method", () => {
-		expect(
-			requiresBrowserRequestAuth(
-				new Request("http://127.0.0.1:8787/future-api", { method: "POST" }),
-				new URL("http://127.0.0.1:8787/future-api"),
-				publicRoute,
-			),
-		).toBe(true);
-	});
-});
-
-describe("isAuthorizedBrowserRequest", () => {
-	it.each([
-		"http://127.0.0.1:8787",
-		"http://localhost:8787",
-		"http://[::1]:8787",
-	])("accepts local dashboard origin %s without a room secret", (origin) => {
-		expect(
-			isAuthorizedBrowserRequest(
-				browserRequest(origin),
-				new URL("http://127.0.0.1:8787/browser"),
-				defaultOptions,
-			),
-		).toBe(true);
-	});
-
-	it.each([
-		undefined,
-		"",
-		"null",
-		"not a url",
-		"http://evil.attacker.example.com",
-		"http://127.0.0.1:9999",
-		"https://127.0.0.1:8787",
-	])("rejects untrusted origin %s", (origin) => {
-		expect(
-			isAuthorizedBrowserRequest(
-				browserRequest(origin),
-				new URL("http://127.0.0.1:8787/browser"),
-				defaultOptions,
-			),
-		).toBe(false);
-	});
-
-	it.each([
-		undefined,
-		"",
-		"evil.attacker.example.com",
-		"127.0.0.1:9999",
-		"localhost:9999",
-	])("rejects untrusted host %s", (host) => {
-		expect(
-			isAuthorizedBrowserRequest(
-				browserRequest("http://127.0.0.1:8787", {
-					headers: host === undefined ? { host: "" } : { host },
-				}),
-				new URL("http://127.0.0.1:8787/browser"),
-				defaultOptions,
-			),
-		).toBe(false);
-	});
-
-	it("allows explicit wildcard bind host and origin when a room secret is configured", () => {
-		expect(
-			isAuthorizedBrowserRequest(
-				browserRequest("http://0.0.0.0:8787", {
-					headers: { host: "0.0.0.0:8787" },
-				}),
-				new URL("http://0.0.0.0:8787/browser?roomSecret=invite-123"),
-				{
-					bindHost: "0.0.0.0",
-					port: 8787,
-					publicUrl: "http://127.0.0.1:8787",
-					roomSecret: "invite-123",
-				},
-			),
-		).toBe(true);
-	});
-
-	it("requires trusted origin, trusted host, and room secret when a room secret is configured", () => {
-		const options = { ...defaultOptions, roomSecret: "invite-123" };
-
-		expect(
-			isAuthorizedBrowserRequest(
-				browserRequest("http://127.0.0.1:8787"),
-				new URL("http://127.0.0.1:8787/browser?roomSecret=invite-123"),
-				options,
-			),
-		).toBe(true);
-		expect(
-			isAuthorizedBrowserRequest(
-				browserRequest("http://127.0.0.1:8787"),
-				new URL("http://127.0.0.1:8787/browser"),
-				options,
-			),
-		).toBe(false);
-		expect(
-			isAuthorizedBrowserRequest(
-				browserRequest("http://evil.attacker.example.com"),
-				new URL("http://127.0.0.1:8787/browser?roomSecret=invite-123"),
-				options,
-			),
-		).toBe(false);
-		expect(
-			isAuthorizedBrowserRequest(
-				browserRequest("http://127.0.0.1:8787", {
-					headers: { host: "evil.attacker.example.com" },
-				}),
-				new URL("http://127.0.0.1:8787/browser?roomSecret=invite-123"),
-				options,
-			),
-		).toBe(false);
-	});
-});
-
-describe("isAuthorizedBrowserToDesktopRequest", () => {
-	it("allows safe public GET routes without an origin", () => {
-		expect(
-			isAuthorizedBrowserToDesktopRequest(
-				new Request("http://127.0.0.1:8787/public"),
-				new URL("http://127.0.0.1:8787/public"),
-				defaultOptions,
-				publicRoute,
-			),
-		).toBe(true);
-	});
-
-	it("rejects future WebSocket paths from untrusted origins by default", () => {
-		expect(
-			isAuthorizedBrowserToDesktopRequest(
-				new Request("http://127.0.0.1:8787/future-socket", {
-					headers: {
-						host: "127.0.0.1:8787",
-						origin: "http://evil.attacker.example.com",
-						upgrade: "websocket",
-					},
-				}),
-				new URL("http://127.0.0.1:8787/future-socket"),
-				defaultOptions,
-				publicRoute,
-			),
-		).toBe(false);
-	});
-
-	it("rejects future unsafe HTTP routes from untrusted origins by default", () => {
-		expect(
-			isAuthorizedBrowserToDesktopRequest(
-				new Request("http://127.0.0.1:8787/future-api", {
-					method: "POST",
-					headers: {
-						host: "127.0.0.1:8787",
-						origin: "http://evil.attacker.example.com",
-					},
-				}),
-				new URL("http://127.0.0.1:8787/future-api"),
-				defaultOptions,
-				publicRoute,
-			),
-		).toBe(false);
-	});
-
-	it("allows future unsafe HTTP routes from trusted origins", () => {
-		expect(
-			isAuthorizedBrowserToDesktopRequest(
-				new Request("http://127.0.0.1:8787/future-api", {
-					method: "POST",
-					headers: {
-						host: "127.0.0.1:8787",
-						origin: "http://127.0.0.1:8787",
-					},
-				}),
-				new URL("http://127.0.0.1:8787/future-api"),
-				defaultOptions,
-				publicRoute,
-			),
-		).toBe(true);
-	});
-});

apps/cline-hub/src/server/browser-auth.ts

@@ -1,134 +0,0 @@
-import { isNonLocalBindHost } from "../options";
-
-export interface BrowserRequestAuthOptions {
-	bindHost: string;
-	port: number;
-	publicUrl: string;
-	roomSecret?: string;
-}
-
-const SAFE_HTTP_METHODS = new Set(["GET", "HEAD", "OPTIONS"]);
-
-export type PublicBrowserRoutePredicate = (req: Request, url: URL) => boolean;
-
-function isWebSocketUpgrade(req: Request): boolean {
-	return req.headers.get("upgrade")?.toLowerCase() === "websocket";
-}
-
-function parseOrigin(value: string | null): string | undefined {
-	const origin = parseHeader(value);
-	try {
-		return new URL(origin ?? "").origin;
-	} catch {
-		return undefined;
-	}
-}
-
-function parseHeader(value: string | null): string | undefined {
-	const host = value?.trim().toLowerCase();
-	return host || undefined;
-}
-
-function formatHostForOrigin(host: string): string {
-	return host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
-}
-
-function isDefaultProtocolPort(protocol: string, port: number): boolean {
-	return (
-		(protocol === "http:" && port === 80) ||
-		(protocol === "https:" && port === 443)
-	);
-}
-
-function originForHost(protocol: string, host: string, port: number): string {
-	return new URL(`${protocol}//${formatHostForOrigin(host)}:${port}`).origin;
-}
-
-function hostHeaderForHost(
-	protocol: string,
-	host: string,
-	port: number,
-): string {
-	const formattedHost = formatHostForOrigin(host).toLowerCase();
-	return isDefaultProtocolPort(protocol, port)
-		? formattedHost
-		: `${formattedHost}:${port}`;
-}
-
-export function allowedBrowserOrigins({
-	bindHost,
-	port,
-	publicUrl,
-}: BrowserRequestAuthOptions): Set<string> {
-	const publicUrlParts = new URL(publicUrl);
-	const origins = new Set<string>();
-	origins.add(publicUrlParts.origin);
-
-	origins.add(originForHost(publicUrlParts.protocol, bindHost, port));
-
-	if (!isNonLocalBindHost(bindHost)) {
-		for (const hostname of ["127.0.0.1", "localhost", "[::1]"]) {
-			origins.add(originForHost(publicUrlParts.protocol, hostname, port));
-		}
-	}
-
-	return origins;
-}
-
-export function allowedBrowserHosts({
-	bindHost,
-	port,
-	publicUrl,
-}: BrowserRequestAuthOptions): Set<string> {
-	const publicUrlParts = new URL(publicUrl);
-	const hosts = new Set<string>();
-	const publicHost = publicUrlParts.host.toLowerCase();
-	hosts.add(publicHost);
-
-	hosts.add(hostHeaderForHost(publicUrlParts.protocol, bindHost, port));
-
-	if (!isNonLocalBindHost(bindHost)) {
-		for (const hostname of ["127.0.0.1", "localhost", "[::1]"]) {
-			hosts.add(hostHeaderForHost(publicUrlParts.protocol, hostname, port));
-		}
-	}
-
-	return hosts;
-}
-
-export function requiresBrowserRequestAuth(
-	req: Request,
-	url: URL,
-	isPublicBrowserRoute: PublicBrowserRoutePredicate,
-): boolean {
-	if (isWebSocketUpgrade(req)) return true;
-	if (!SAFE_HTTP_METHODS.has(req.method.toUpperCase())) return true;
-	return !isPublicBrowserRoute(req, url);
-}
-
-export function isAuthorizedBrowserRequest(
-	req: Request,
-	url: URL,
-	options: BrowserRequestAuthOptions,
-): boolean {
-	const host = parseHeader(req.headers.get("host"));
-	if (!host || !allowedBrowserHosts(options).has(host)) return false;
-
-	const origin = parseOrigin(req.headers.get("origin"));
-	if (!origin || !allowedBrowserOrigins(options).has(origin)) return false;
-
-	if (!options.roomSecret) return true;
-	return url.searchParams.get("roomSecret") === options.roomSecret;
-}
-
-export function isAuthorizedBrowserToDesktopRequest(
-	req: Request,
-	url: URL,
-	options: BrowserRequestAuthOptions,
-	isPublicBrowserRoute: PublicBrowserRoutePredicate,
-): boolean {
-	return (
-		!requiresBrowserRequestAuth(req, url, isPublicBrowserRoute) ||
-		isAuthorizedBrowserRequest(req, url, options)
-	);
-}

apps/cline-hub/src/server/connectors.test.ts

@@ -1,97 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { __test__ } from "./connectors";
-
-describe("connector launch command", () => {
-	it("uses Bun conditions when launching the source CLI from Bun", () => {
-		expect(
-			__test__.buildCliConnectCommand(["telegram", "--bot-token", "token"], {
-				execPath: "/Users/test/.bun/bin/bun",
-				cliPath: "/repo/apps/cli/src/index.ts",
-				exists: () => true,
-			}),
-		).toEqual({
-			launcher: "/Users/test/.bun/bin/bun",
-			childArgs: [
-				"--conditions=development",
-				"/repo/apps/cli/src/index.ts",
-				"connect",
-				"telegram",
-				"--bot-token",
-				"token",
-			],
-		});
-	});
-
-	it("uses compiled CLI subcommands without Bun flags", () => {
-		expect(
-			__test__.buildCliConnectCommand(["telegram", "--bot-token", "token"], {
-				execPath: "/Applications/Cline/bin/cline",
-				cliPath: "/repo/apps/cli/src/index.ts",
-				exists: () => true,
-			}),
-		).toEqual({
-			launcher: "/Applications/Cline/bin/cline",
-			childArgs: ["connect", "telegram", "--bot-token", "token"],
-		});
-	});
-
-	it("uses Bun conditions when launching the source CLI from Node", () => {
-		expect(
-			__test__.buildCliConnectCommand(["telegram", "--bot-token", "token"], {
-				execPath: "/usr/local/bin/node",
-				cliPath: "/repo/apps/cli/src/index.ts",
-				exists: () => true,
-			}),
-		).toEqual({
-			launcher: "bun",
-			childArgs: [
-				"--conditions=development",
-				"/repo/apps/cli/src/index.ts",
-				"connect",
-				"telegram",
-				"--bot-token",
-				"token",
-			],
-		});
-	});
-
-	it("detects Windows Node when launching the source CLI", () => {
-		expect(
-			__test__.buildCliConnectCommand(["telegram", "--bot-token", "token"], {
-				execPath: "node.exe",
-				cliPath: "C:\\repo\\apps\\cli\\src\\index.ts",
-				exists: () => true,
-			}),
-		).toEqual({
-			launcher: "bun",
-			childArgs: [
-				"--conditions=development",
-				"C:\\repo\\apps\\cli\\src\\index.ts",
-				"connect",
-				"telegram",
-				"--bot-token",
-				"token",
-			],
-		});
-	});
-
-	it("strips terminal color codes from connector command failures", () => {
-		expect(
-			__test__.normalizeConnectorError(
-				"\u001B[31merror:\u001B[0m error: unknown option '--conditions=development'",
-				"connector start failed",
-			),
-		).toBe("unknown option '--conditions=development'");
-	});
-
-	it("turns Telegram unauthorized responses into a token validation message", () => {
-		expect(
-			__test__.normalizeConnectorError(
-				"\u001B[31merror:\u001B[0m Telegram getMe failed (401 Unauthorized): Unauthorized",
-				"connector start failed",
-			),
-		).toBe(
-			"Telegram rejected this bot token. Copy the token from @BotFather and try again.",
-		);
-	});
-});

apps/cline-hub/src/server/http.test.ts

@@ -1,54 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { isWebviewRoute, normalizeWebviewIndexHtml } from "./http";
-
-describe("isWebviewRoute", () => {
-	it.each([
-		"/",
-		"/chat",
-		"/sessions",
-		"/models",
-		"/customizations",
-		"/rules",
-		"/hooks",
-		"/mcp",
-		"/plugins",
-		"/skills",
-		"/agents",
-		"/tools",
-		"/marketplace",
-		"/marketplace/mcp",
-		"/marketplace/skills",
-		"/marketplace/plugins",
-		"/channels",
-		"/schedules",
-		"/settings",
-		"/settings/providers",
-	])("matches dashboard SPA route %s", (pathname) => {
-		expect(isWebviewRoute(pathname)).toBe(true);
-	});
-
-	it("does not treat nested marketplace asset requests as SPA routes", () => {
-		expect(isWebviewRoute("/marketplace/assets/index.js")).toBe(false);
-	});
-});
-
-describe("normalizeWebviewIndexHtml", () => {
-	it("rewrites relative built asset URLs so deep links can refresh", () => {
-		expect(
-			normalizeWebviewIndexHtml(
-				'<script type="module" src="./assets/index.js"></script><link href="./assets/index.css">',
-			),
-		).toBe(
-			'<script type="module" src="/assets/index.js"></script><link href="/assets/index.css">',
-		);
-	});
-
-	it("injects the persisted theme bootstrap once", () => {
-		const normalized = normalizeWebviewIndexHtml(
-			"<html><head></head><body></body></html>",
-		);
-
-		expect(normalized).toContain('id="cline-hub-theme-bootstrap"');
-		expect(normalizeWebviewIndexHtml(normalized)).toBe(normalized);
-	});
-});

apps/cline-hub/src/server/marketplace.test.ts

@@ -1,940 +0,0 @@
-import { createHash } from "node:crypto";
-import {
-	existsSync,
-	mkdirSync,
-	mkdtempSync,
-	readFileSync,
-	rmSync,
-	writeFileSync,
-} from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import {
-	buildMarketplaceMcpInput,
-	fetchMarketplaceCatalog,
-	installMarketplaceEntry,
-	installMarketplaceEntryForDesktopCommand,
-	listMarketplaceInstalledEntries,
-	uninstallLocalPrimitive,
-	uninstallMarketplaceEntry,
-	uninstallMarketplaceEntryForDesktopCommand,
-} from "./marketplace";
-
-describe("marketplace installer", () => {
-	const originalWrapperPath = process.env.CLINE_WRAPPER_PATH;
-	const originalClineDir = process.env.CLINE_DIR;
-	const originalHome = process.env.HOME;
-	const originalMcpSettingsPath = process.env.CLINE_MCP_SETTINGS_PATH;
-
-	afterEach(() => {
-		if (originalWrapperPath === undefined) {
-			delete process.env.CLINE_WRAPPER_PATH;
-		} else {
-			process.env.CLINE_WRAPPER_PATH = originalWrapperPath;
-		}
-		if (originalClineDir === undefined) {
-			delete process.env.CLINE_DIR;
-		} else {
-			process.env.CLINE_DIR = originalClineDir;
-		}
-		if (originalHome === undefined) {
-			delete process.env.HOME;
-		} else {
-			process.env.HOME = originalHome;
-		}
-		if (originalMcpSettingsPath === undefined) {
-			delete process.env.CLINE_MCP_SETTINGS_PATH;
-		} else {
-			process.env.CLINE_MCP_SETTINGS_PATH = originalMcpSettingsPath;
-		}
-		vi.restoreAllMocks();
-	});
-
-	it("maps remote MCP catalog args to MCP settings shape", () => {
-		expect(
-			buildMarketplaceMcpInput([
-				"context7",
-				"--transport",
-				"http",
-				"https://mcp.context7.com/mcp",
-				"--header",
-				"Authorization: Bearer <token>",
-			]),
-		).toEqual({
-			name: "context7",
-			transportType: "streamableHttp",
-			url: "https://mcp.context7.com/mcp",
-			headers: {
-				Authorization: "Bearer <token>",
-			},
-			disabled: false,
-		});
-	});
-
-	it("maps stdio MCP catalog args to command and args", () => {
-		expect(
-			buildMarketplaceMcpInput(["filesystem", "npx", "-y", "server", "/tmp"]),
-		).toEqual({
-			name: "filesystem",
-			transportType: "stdio",
-			command: "npx",
-			args: ["-y", "server", "/tmp"],
-			disabled: false,
-		});
-	});
-
-	it("preserves server flags after stdio MCP command args begin", () => {
-		expect(
-			buildMarketplaceMcpInput([
-				"search",
-				"npx",
-				"-y",
-				"server",
-				"--transport",
-				"stdio",
-			]),
-		).toEqual({
-			name: "search",
-			transportType: "stdio",
-			command: "npx",
-			args: ["-y", "server", "--transport", "stdio"],
-			disabled: false,
-		});
-	});
-
-	it("runs skills globally for Cline without prompts", async () => {
-		const homeDir = mkdtempSync(join(tmpdir(), "cline-marketplace-home-"));
-		process.env.HOME = homeDir;
-		const spawnCommand = vi.fn(async () => {
-			mkdirSync(join(homeDir, ".agents", "skills", "web-design-guidelines"), {
-				recursive: true,
-			});
-			writeFileSync(
-				join(homeDir, ".agents", "skills", "web-design-guidelines", "SKILL.md"),
-				"---\nname: web-design-guidelines\n---\n",
-			);
-			return {
-				exitCode: 0,
-				stdout: "installed",
-				stderr: "",
-			};
-		});
-
-		await installMarketplaceEntry(
-			{
-				entry: {
-					id: "web-design-guidelines",
-					type: "skill",
-					name: "Web Design Guidelines",
-					install: {
-						args: [
-							"vercel-labs/agent-skills",
-							"--skill",
-							"web-design-guidelines",
-						],
-					},
-				},
-			},
-			{ spawnCommand },
-		);
-
-		expect(spawnCommand).toHaveBeenCalledWith("npx", [
-			"-y",
-			"skills@latest",
-			"add",
-			"vercel-labs/agent-skills",
-			"--skill",
-			"web-design-guidelines",
-			"-g",
-			"-a",
-			"cline",
-			"-y",
-		]);
-	});
-
-	it("skips skill install commands when the global skill already exists", async () => {
-		const homeDir = mkdtempSync(join(tmpdir(), "cline-marketplace-home-"));
-		process.env.HOME = homeDir;
-		mkdirSync(join(homeDir, ".agents", "skills", "cline-sdk"), {
-			recursive: true,
-		});
-		writeFileSync(
-			join(homeDir, ".agents", "skills", "cline-sdk", "SKILL.md"),
-			"---\nname: cline-sdk\n---\n",
-		);
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: "",
-			stderr: "",
-		}));
-
-		await expect(
-			installMarketplaceEntry(
-				{
-					entry: {
-						id: "cline-sdk",
-						type: "skill",
-						name: "Cline SDK",
-						install: { args: ["cline/sdk-skill"] },
-					},
-				},
-				{ spawnCommand },
-			),
-		).resolves.toMatchObject({
-			status: "installed",
-			message: "Cline SDK is already installed.",
-		});
-		expect(spawnCommand).not.toHaveBeenCalled();
-	});
-
-	it("reports Cline global skills as marketplace-installed", () => {
-		const clineDir = mkdtempSync(join(tmpdir(), "cline-marketplace-cline-"));
-		process.env.CLINE_DIR = clineDir;
-		mkdirSync(join(clineDir, "skills", "cline-sdk"), {
-			recursive: true,
-		});
-		writeFileSync(
-			join(clineDir, "skills", "cline-sdk", "SKILL.md"),
-			"---\nname: cline-sdk\n---\n",
-		);
-
-		expect(
-			listMarketplaceInstalledEntries({
-				entries: [
-					{
-						id: "cline-sdk",
-						type: "skill",
-						name: "Cline SDK",
-						install: { args: ["cline/sdk-skill"] },
-					},
-				],
-			}),
-		).toEqual({ installedKeys: ["skill:cline-sdk"] });
-	});
-
-	it("accepts skill installs that create Cline global skills", async () => {
-		const homeDir = mkdtempSync(join(tmpdir(), "cline-marketplace-home-"));
-		const clineDir = join(homeDir, ".cline");
-		process.env.HOME = homeDir;
-		process.env.CLINE_DIR = clineDir;
-		const spawnCommand = vi.fn(async () => {
-			mkdirSync(join(clineDir, "skills", "cline-sdk"), {
-				recursive: true,
-			});
-			writeFileSync(
-				join(clineDir, "skills", "cline-sdk", "SKILL.md"),
-				"---\nname: cline-sdk\n---\n",
-			);
-			return {
-				exitCode: 0,
-				stdout: "installed",
-				stderr: "",
-			};
-		});
-
-		await expect(
-			installMarketplaceEntry(
-				{
-					entry: {
-						id: "cline-sdk",
-						type: "skill",
-						name: "Cline SDK",
-						install: { args: ["cline/sdk-skill"] },
-					},
-				},
-				{ spawnCommand },
-			),
-		).resolves.toMatchObject({
-			status: "installed",
-			message: "Installed Cline SDK globally for Cline.",
-		});
-	});
-
-	it("removes Cline global marketplace skills without prompts", async () => {
-		const homeDir = mkdtempSync(join(tmpdir(), "cline-marketplace-home-"));
-		process.env.HOME = homeDir;
-		const skillDir = join(homeDir, ".agents", "skills", "cline-sdk");
-		mkdirSync(skillDir, { recursive: true });
-		writeFileSync(join(skillDir, "SKILL.md"), "---\nname: cline-sdk\n---\n");
-		const spawnCommand = vi.fn(async () => {
-			rmSync(skillDir, { recursive: true, force: true });
-			return {
-				exitCode: 0,
-				stdout: "removed",
-				stderr: "",
-			};
-		});
-
-		await expect(
-			uninstallMarketplaceEntry(
-				{
-					entry: {
-						id: "cline-sdk",
-						type: "skill",
-						name: "Cline SDK",
-						install: { args: ["cline/sdk-skill"] },
-					},
-				},
-				{ spawnCommand },
-			),
-		).resolves.toMatchObject({
-			status: "uninstalled",
-			message: "Uninstalled Cline SDK.",
-		});
-		expect(spawnCommand).toHaveBeenCalledWith("npx", [
-			"-y",
-			"skills@latest",
-			"remove",
-			"cline-sdk",
-			"-g",
-			"-a",
-			"cline",
-			"-y",
-		]);
-	});
-
-	it("does not report project-local skills as marketplace-installed globals", () => {
-		const homeDir = mkdtempSync(join(tmpdir(), "cline-marketplace-home-"));
-		process.env.HOME = homeDir;
-
-		expect(
-			listMarketplaceInstalledEntries(
-				{
-					entries: [
-						{
-							id: "cline-sdk",
-							type: "skill",
-							name: "Cline SDK",
-							install: { args: ["cline/sdk-skill"] },
-						},
-					],
-				},
-				{
-					skills: [
-						{
-							id: "cline-sdk",
-							name: "cline-sdk",
-							path: "/workspace/project/.agents/skills/cline-sdk/SKILL.md",
-						},
-					],
-				},
-			),
-		).toEqual({ installedKeys: [] });
-	});
-
-	it("rejects skill installs that exit zero but report failure", async () => {
-		const homeDir = mkdtempSync(join(tmpdir(), "cline-marketplace-home-"));
-		process.env.HOME = homeDir;
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: "Failed to install 1",
-			stderr: "",
-		}));
-
-		await expect(
-			installMarketplaceEntry(
-				{
-					entry: {
-						id: "cline-sdk",
-						type: "skill",
-						name: "Cline SDK",
-						install: { args: ["cline/sdk-skill"] },
-					},
-				},
-				{ spawnCommand },
-			),
-		).rejects.toThrow("Skill install failed");
-	});
-
-	it("redacts common secret formats from failed install output", async () => {
-		const homeDir = mkdtempSync(join(tmpdir(), "cline-marketplace-home-"));
-		process.env.HOME = homeDir;
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 1,
-			stdout:
-				"Authorization: Bearer stdout-token\nAuthorization: Basic basic-token\napi key stdout-key\nOPENAI_API_KEY=compound-key",
-			stderr:
-				"TOKEN=stderr-token\npassword is stderr-password\nANTHROPIC_SECRET_KEY=anthropic-secret",
-		}));
-
-		let message = "";
-		try {
-			await installMarketplaceEntry(
-				{
-					entry: {
-						id: "cline-sdk",
-						type: "skill",
-						name: "Cline SDK",
-						install: { args: ["cline/sdk-skill"] },
-					},
-				},
-				{ spawnCommand },
-			);
-		} catch (error) {
-			message = error instanceof Error ? error.message : String(error);
-		}
-
-		expect(message).toContain("Authorization: Bearer [redacted]");
-		expect(message).toContain("Authorization: [redacted]");
-		expect(message).not.toContain("Authorization: Bearer [redacted]]");
-		expect(message).toContain("api key [redacted]");
-		expect(message).toContain("OPENAI_API_KEY=[redacted]");
-		expect(message).toContain("TOKEN=[redacted]");
-		expect(message).toContain("password is [redacted]");
-		expect(message).toContain("ANTHROPIC_SECRET_KEY=[redacted]");
-		expect(message).not.toContain("stdout-token");
-		expect(message).not.toContain("basic-token");
-		expect(message).not.toContain("stdout-key");
-		expect(message).not.toContain("compound-key");
-		expect(message).not.toContain("stderr-token");
-		expect(message).not.toContain("stderr-password");
-		expect(message).not.toContain("anthropic-secret");
-	});
-
-	it("rejects skill installs before spawning when the global skill directory is not writable", async () => {
-		const homeDir = mkdtempSync(join(tmpdir(), "cline-marketplace-home-"));
-		process.env.HOME = homeDir;
-		mkdirSync(join(homeDir, ".agents"), { recursive: true });
-		writeFileSync(join(homeDir, ".agents", "skills"), "");
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: "",
-			stderr: "",
-		}));
-
-		await expect(
-			installMarketplaceEntry(
-				{
-					entry: {
-						id: "cline-sdk",
-						type: "skill",
-						name: "Cline SDK",
-						install: { args: ["cline/sdk-skill"] },
-					},
-				},
-				{ spawnCommand },
-			),
-		).rejects.toThrow(
-			"Cannot install skill globally because ~/.agents/skills is not writable",
-		);
-		expect(spawnCommand).not.toHaveBeenCalled();
-	});
-
-	it("rejects skill installs that do not create a global skill", async () => {
-		const homeDir = mkdtempSync(join(tmpdir(), "cline-marketplace-home-"));
-		process.env.HOME = homeDir;
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: "Installation complete",
-			stderr: "",
-		}));
-
-		await expect(
-			installMarketplaceEntry(
-				{
-					entry: {
-						id: "cline-sdk",
-						type: "skill",
-						name: "Cline SDK",
-						install: { args: ["cline/sdk-skill"] },
-					},
-				},
-				{ spawnCommand },
-			),
-		).rejects.toThrow("was not found in Cline's global skills directories");
-	});
-
-	it("runs official plugin installs through the current Cline CLI", async () => {
-		process.env.CLINE_WRAPPER_PATH = "/usr/local/bin/cline";
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: JSON.stringify({ installPath: "/tmp/plugin" }),
-			stderr: "",
-		}));
-
-		await installMarketplaceEntry(
-			{
-				entry: {
-					id: "marketplace-test-plugin",
-					type: "plugin",
-					name: "Marketplace Test Plugin",
-					install: { args: ["marketplace-test-plugin"] },
-				},
-			},
-			{ spawnCommand },
-		);
-
-		expect(spawnCommand).toHaveBeenCalledWith("/usr/local/bin/cline", [
-			"plugin",
-			"install",
-			"marketplace-test-plugin",
-			"--json",
-		]);
-	});
-
-	it("runs MCP installs through the current Cline CLI without prompts", async () => {
-		process.env.CLINE_WRAPPER_PATH = "/usr/local/bin/cline";
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: JSON.stringify({
-				name: "context7",
-				status: "installed",
-				transport: {
-					type: "streamableHttp",
-					url: "https://mcp.context7.com/mcp",
-					headers: {
-						Authorization: "Bearer token",
-					},
-				},
-			}),
-			stderr: "",
-		}));
-
-		await expect(
-			installMarketplaceEntry(
-				{
-					entry: {
-						id: "context7",
-						type: "mcp",
-						name: "Context7",
-						install: {
-							args: [
-								"context7",
-								"--transport",
-								"http",
-								"https://mcp.context7.com/mcp",
-								"--header",
-								"Authorization: Bearer token",
-							],
-						},
-					},
-				},
-				{ spawnCommand },
-			),
-		).resolves.toMatchObject({
-			status: "installed",
-			message: "Installed Context7.",
-			details: {
-				name: "context7",
-				status: "installed",
-			},
-		});
-
-		expect(spawnCommand).toHaveBeenCalledWith("/usr/local/bin/cline", [
-			"mcp",
-			"install",
-			"--yes",
-			"--json",
-			"context7",
-			"--transport",
-			"http",
-			"https://mcp.context7.com/mcp",
-			"--header",
-			"Authorization: Bearer token",
-		]);
-	});
-
-	it("runs official plugin uninstalls through the current Cline CLI", async () => {
-		process.env.CLINE_WRAPPER_PATH = "/usr/local/bin/cline";
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: JSON.stringify({
-				name: "goal",
-				installPath: "/tmp/plugin",
-				removedPaths: ["/tmp/plugin"],
-				entryPaths: [],
-			}),
-			stderr: "",
-		}));
-
-		await expect(
-			uninstallMarketplaceEntry(
-				{
-					entry: {
-						id: "goal",
-						type: "plugin",
-						name: "Goal",
-						install: { args: ["goal"] },
-					},
-				},
-				{ spawnCommand },
-			),
-		).resolves.toMatchObject({
-			status: "uninstalled",
-			message: "Uninstalled Goal.",
-		});
-
-		expect(spawnCommand).toHaveBeenCalledWith("/usr/local/bin/cline", [
-			"plugin",
-			"uninstall",
-			"goal",
-			"--json",
-		]);
-	});
-
-	it("resolves desktop installs from the server catalog instead of browser-sent args", async () => {
-		process.env.CLINE_WRAPPER_PATH = "/usr/local/bin/cline";
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: JSON.stringify({ installPath: "/tmp/plugin" }),
-			stderr: "",
-		}));
-
-		await installMarketplaceEntryForDesktopCommand(
-			{
-				entry: {
-					id: "marketplace-test-plugin",
-					type: "plugin",
-					name: "Tampered",
-					install: { args: ["malicious-source"] },
-				},
-			},
-			{
-				spawnCommand,
-				loadCatalog: async () => ({
-					entries: [
-						{
-							id: "marketplace-test-plugin",
-							type: "plugin",
-							name: "Marketplace Test Plugin",
-							install: { args: ["marketplace-test-plugin"] },
-						},
-					],
-				}),
-			},
-		);
-
-		expect(spawnCommand).toHaveBeenCalledWith("/usr/local/bin/cline", [
-			"plugin",
-			"install",
-			"marketplace-test-plugin",
-			"--json",
-		]);
-	});
-
-	it("resolves desktop uninstalls from the server catalog instead of browser-sent args", async () => {
-		process.env.CLINE_WRAPPER_PATH = "/usr/local/bin/cline";
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: JSON.stringify({
-				name: "goal",
-				installPath: "/tmp/plugin",
-				removedPaths: ["/tmp/plugin"],
-				entryPaths: [],
-			}),
-			stderr: "",
-		}));
-
-		await uninstallMarketplaceEntryForDesktopCommand(
-			{
-				entry: {
-					id: "goal",
-					type: "plugin",
-					name: "Tampered",
-					install: { args: ["malicious-source"] },
-				},
-			},
-			{
-				spawnCommand,
-				loadCatalog: async () => ({
-					entries: [
-						{
-							id: "goal",
-							type: "plugin",
-							name: "Goal",
-							install: { args: ["goal"] },
-						},
-					],
-				}),
-			},
-		);
-
-		expect(spawnCommand).toHaveBeenCalledWith("/usr/local/bin/cline", [
-			"plugin",
-			"uninstall",
-			"goal",
-			"--json",
-		]);
-	});
-
-	it("uninstalls MCP marketplace entries from Cline MCP settings", async () => {
-		const settingsPath = join(
-			mkdtempSync(join(tmpdir(), "cline-marketplace-mcp-")),
-			"cline_mcp_settings.json",
-		);
-		process.env.CLINE_MCP_SETTINGS_PATH = settingsPath;
-		writeFileSync(
-			settingsPath,
-			JSON.stringify(
-				{
-					mcpServers: {
-						context7: {
-							transport: {
-								type: "streamableHttp",
-								url: "https://mcp.context7.com/mcp",
-							},
-						},
-					},
-				},
-				null,
-				2,
-			),
-		);
-
-		await expect(
-			uninstallMarketplaceEntry({
-				entry: {
-					id: "context7",
-					type: "mcp",
-					name: "Context7",
-					install: {
-						args: [
-							"context7",
-							"--transport",
-							"http",
-							"https://mcp.context7.com/mcp",
-						],
-					},
-				},
-			}),
-		).resolves.toMatchObject({
-			status: "uninstalled",
-			message: "Uninstalled Context7.",
-		});
-		expect(
-			listMarketplaceInstalledEntries({
-				entries: [
-					{
-						id: "context7",
-						type: "mcp",
-						name: "Context7",
-						install: {
-							args: [
-								"context7",
-								"--transport",
-								"http",
-								"https://mcp.context7.com/mcp",
-							],
-						},
-					},
-				],
-			}),
-		).toEqual({ installedKeys: [] });
-	});
-
-	it("uninstalls local MCP servers by name", async () => {
-		const settingsPath = join(
-			mkdtempSync(join(tmpdir(), "cline-local-mcp-")),
-			"cline_mcp_settings.json",
-		);
-		process.env.CLINE_MCP_SETTINGS_PATH = settingsPath;
-		writeFileSync(
-			settingsPath,
-			JSON.stringify(
-				{
-					mcpServers: {
-						context7: {
-							transport: {
-								type: "streamableHttp",
-								url: "https://mcp.context7.com/mcp",
-							},
-						},
-					},
-				},
-				null,
-				2,
-			),
-		);
-
-		await expect(
-			uninstallLocalPrimitive({
-				type: "mcp",
-				id: "context7",
-				name: "context7",
-			}),
-		).resolves.toMatchObject({
-			status: "uninstalled",
-			message: "Uninstalled context7.",
-		});
-		expect(readFileSync(settingsPath, "utf8")).not.toContain("context7");
-	});
-
-	it("uninstalls local skills by removing their configured skill directory", async () => {
-		const workspaceRoot = mkdtempSync(join(tmpdir(), "cline-local-skill-"));
-		const skillDir = join(workspaceRoot, ".cline", "skills", "review");
-		mkdirSync(skillDir, { recursive: true });
-		const skillPath = join(skillDir, "SKILL.md");
-		writeFileSync(skillPath, "---\nname: review\n---\nReview changes.");
-
-		await expect(
-			uninstallLocalPrimitive(
-				{
-					type: "skill",
-					id: "review",
-					name: "Review",
-					path: skillPath,
-				},
-				{ workspaceRoot },
-			),
-		).resolves.toMatchObject({
-			status: "uninstalled",
-			message: "Uninstalled Review.",
-		});
-		expect(existsSync(skillDir)).toBe(false);
-	});
-
-	it("reports official plugin marketplace entries installed from Cline home", () => {
-		const clineDir = mkdtempSync(join(tmpdir(), "cline-marketplace-test-"));
-		process.env.CLINE_DIR = clineDir;
-		const sourceKey =
-			"official:https://github.com/cline/plugins.git#plugins/goal";
-		const hash = createHash("sha256")
-			.update(sourceKey)
-			.digest("hex")
-			.slice(0, 12);
-		mkdirSync(
-			join(clineDir, "plugins", "_installed", "official", `goal-${hash}`),
-			{
-				recursive: true,
-			},
-		);
-
-		expect(
-			listMarketplaceInstalledEntries({
-				entries: [
-					{
-						id: "goal",
-						type: "plugin",
-						name: "Goal",
-						install: { args: ["goal"] },
-					},
-				],
-			}),
-		).toEqual({ installedKeys: ["plugin:goal"] });
-	});
-
-	it("does not report plugin inventory substring matches as installed", () => {
-		process.env.CLINE_DIR = mkdtempSync(
-			join(tmpdir(), "cline-marketplace-test-"),
-		);
-
-		expect(
-			listMarketplaceInstalledEntries(
-				{
-					entries: [
-						{
-							id: "goal",
-							type: "plugin",
-							name: "Goal",
-							install: { args: ["goal"] },
-						},
-					],
-				},
-				{
-					plugins: [
-						{
-							name: "goal-helper",
-							path: "/workspace/.cline/plugins/goal-helper/index.ts",
-						},
-					],
-				},
-			),
-		).toEqual({ installedKeys: [] });
-	});
-
-	it("skips invalid marketplace entries during installed-status checks", () => {
-		const clineDir = mkdtempSync(join(tmpdir(), "cline-marketplace-test-"));
-		process.env.CLINE_DIR = clineDir;
-		const sourceKey =
-			"official:https://github.com/cline/plugins.git#plugins/goal";
-		const hash = createHash("sha256")
-			.update(sourceKey)
-			.digest("hex")
-			.slice(0, 12);
-		mkdirSync(
-			join(clineDir, "plugins", "_installed", "official", `goal-${hash}`),
-			{
-				recursive: true,
-			},
-		);
-
-		expect(
-			listMarketplaceInstalledEntries({
-				entries: [
-					{
-						id: "broken-mcp",
-						type: "mcp",
-						name: "Broken MCP",
-						install: {
-							args: [
-								"broken-mcp",
-								"--transport",
-								"ws",
-								"https://example.com/mcp",
-							],
-						},
-					},
-					{
-						id: "goal",
-						type: "plugin",
-						name: "Goal",
-						install: { args: ["goal"] },
-					},
-				],
-			}),
-		).toEqual({ installedKeys: ["plugin:goal"] });
-	});
-
-	it("rejects invalid marketplace entries before spawning commands", async () => {
-		const spawnCommand = vi.fn(async () => ({
-			exitCode: 0,
-			stdout: "",
-			stderr: "",
-		}));
-
-		await expect(
-			installMarketplaceEntry(
-				{
-					entry: {
-						id: "bad",
-						type: "skill",
-						install: { args: [] },
-					},
-				},
-				{ spawnCommand },
-			),
-		).rejects.toThrow("marketplace install args are required");
-		expect(spawnCommand).not.toHaveBeenCalled();
-	});
-
-	it("fetches the marketplace catalog through the server helper", async () => {
-		const fetchImpl = vi.fn(async () => {
-			return new Response(JSON.stringify({ version: 1, entries: [] }), {
-				headers: { "content-type": "application/json" },
-			});
-		});
-
-		await expect(fetchMarketplaceCatalog(fetchImpl)).resolves.toEqual({
-			version: 1,
-			entries: [],
-		});
-		expect(fetchImpl).toHaveBeenCalledWith(
-			"https://cline.github.io/marketplace/catalog.json",
-			{ headers: { Accept: "application/json" } },
-		);
-	});
-
-	it("surfaces marketplace catalog upstream failures", async () => {
-		const fetchImpl = vi.fn(async () => {
-			return new Response("nope", {
-				status: 503,
-				statusText: "Service Unavailable",
-			});
-		});
-
-		await expect(fetchMarketplaceCatalog(fetchImpl)).rejects.toThrow(
-			"Failed to fetch marketplace catalog: 503 Service Unavailable",
-		);
-	});
-});

apps/cline-hub/src/server/user-instructions.test.ts

@@ -1,70 +0,0 @@
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { afterEach, describe, expect, it } from "vitest";
-import { listUserInstructionConfigs } from "./user-instructions";
-
-describe("listUserInstructionConfigs", () => {
-	const tempRoots: string[] = [];
-	const envSnapshot = {
-		CLINE_GLOBAL_SETTINGS_PATH: process.env.CLINE_GLOBAL_SETTINGS_PATH,
-		CLINE_MCP_SETTINGS_PATH: process.env.CLINE_MCP_SETTINGS_PATH,
-	};
-
-	afterEach(async () => {
-		if (envSnapshot.CLINE_GLOBAL_SETTINGS_PATH === undefined) {
-			delete process.env.CLINE_GLOBAL_SETTINGS_PATH;
-		} else {
-			process.env.CLINE_GLOBAL_SETTINGS_PATH =
-				envSnapshot.CLINE_GLOBAL_SETTINGS_PATH;
-		}
-		if (envSnapshot.CLINE_MCP_SETTINGS_PATH === undefined) {
-			delete process.env.CLINE_MCP_SETTINGS_PATH;
-		} else {
-			process.env.CLINE_MCP_SETTINGS_PATH = envSnapshot.CLINE_MCP_SETTINGS_PATH;
-		}
-		await Promise.all(
-			tempRoots.map((dir) => rm(dir, { recursive: true, force: true })),
-		);
-		tempRoots.length = 0;
-	});
-
-	it("uses the package name for package-backed plugin entries", async () => {
-		const tempRoot = await mkdtemp(join(tmpdir(), "cline-hub-config-"));
-		tempRoots.push(tempRoot);
-		process.env.CLINE_GLOBAL_SETTINGS_PATH = join(tempRoot, "settings.json");
-		process.env.CLINE_MCP_SETTINGS_PATH = join(tempRoot, "mcp.json");
-		const packageDir = join(
-			tempRoot,
-			".cline",
-			"plugins",
-			"_installed",
-			"git",
-			"github.com",
-			"demo",
-			"package",
-		);
-		await mkdir(packageDir, { recursive: true });
-		const pluginPath = join(packageDir, "index.ts");
-		await writeFile(
-			join(packageDir, "package.json"),
-			JSON.stringify(
-				{
-					name: "cline-sdk-portable-agents",
-					cline: {
-						plugins: [{ paths: ["./index.ts"] }],
-					},
-				},
-				null,
-				2,
-			),
-		);
-		await writeFile(pluginPath, "export default {};\n");
-
-		const data = await listUserInstructionConfigs(tempRoot);
-		const plugins = data.plugins as Array<{ name: string; path: string }>;
-		const plugin = plugins.find((item) => item.path === pluginPath);
-
-		expect(plugin?.name).toBe("cline-sdk-portable-agents");
-	});
-});

apps/cline-hub/src/webview/public/cline-logo-filled.svg

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Ebene_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 466.73 487.04">
-  <!-- Generator: Adobe Illustrator 29.8.1, SVG Export Plug-In . SVG Version: 2.1.1 Build 2)  -->
-  <path d="M463.6,275.08l-29.26-58.75v-33.83c0-56.08-45.01-101.5-100.53-101.5h-50.01c3.62-7.43,5.61-15.79,5.61-24.61,0-31.17-25.08-56.39-56.07-56.39s-56.07,25.22-56.07,56.39c0,8.82,1.99,17.17,5.61,24.61h-50.01c-55.51,0-100.52,45.42-100.52,101.5v33.83l-29.87,58.59c-3.01,5.9-3.01,12.92,0,18.81l29.87,57.93v33.83c0,56.08,45.01,101.5,100.52,101.5h200.95c55.51,0,100.53-45.42,100.53-101.5v-33.83l29.21-58.13c2.9-5.79,2.9-12.61.05-18.46ZM202.75,322.96c0,25.48-20.54,46.14-45.88,46.14s-45.88-20.66-45.88-46.14v-82.02c0-25.48,20.54-46.14,45.88-46.14s45.88,20.66,45.88,46.14v82.02ZM350.58,322.96c0,25.48-20.54,46.14-45.88,46.14s-45.88-20.66-45.88-46.14v-82.02c0-25.48,20.54-46.14,45.88-46.14s45.88,20.66,45.88,46.14v82.02Z"/>
-</svg>

apps/cline-hub/src/webview/src/components/ai-elements/streamdown.tsx

@@ -1,170 +0,0 @@
-import { cjk } from "@streamdown/cjk";
-import type { MermaidConfig } from "mermaid";
-import type { ComponentProps, ReactNode } from "react";
-import { isValidElement, memo } from "react";
-import {
-	type Components,
-	type DiagramPlugin,
-	Streamdown,
-	type StreamdownProps,
-} from "streamdown";
-import {
-	CodeBlock,
-	CodeBlockActions,
-	CodeBlockCopyButton,
-	CodeBlockFilename,
-	CodeBlockHeader,
-	CodeBlockTitle,
-} from "@/components/ai-elements/code-block";
-import { cn } from "@/lib/utils";
-
-type MarkdownCodeProps = ComponentProps<"code"> & {
-	"data-block"?: boolean | string;
-	node?: {
-		properties?: {
-			metastring?: string;
-		};
-	};
-};
-
-const LANGUAGE_CLASS_PATTERN = /(?:^|\s)language-([^\s]+)/;
-const START_LINE_PATTERN = /startLine=(\d+)/;
-const NO_LINE_NUMBERS_PATTERN = /\bnoLineNumbers\b/;
-
-function codeText(children: ReactNode): string {
-	if (typeof children === "string" || typeof children === "number") {
-		return String(children);
-	}
-	if (Array.isArray(children)) {
-		return children.map(codeText).join("");
-	}
-	if (isValidElement<{ children?: ReactNode }>(children)) {
-		return codeText(children.props.children);
-	}
-	return "";
-}
-
-const MarkdownCode = ({
-	children,
-	className,
-	node,
-	"data-block": dataBlock,
-	...props
-}: MarkdownCodeProps) => {
-	const language = className?.match(LANGUAGE_CLASS_PATTERN)?.[1] ?? "text";
-
-	if (!dataBlock) {
-		return (
-			<code
-				className={cn(
-					"rounded bg-muted px-1.5 py-0.5 font-mono text-sm",
-					className,
-				)}
-				{...props}
-			>
-				{children}
-			</code>
-		);
-	}
-
-	const meta = node?.properties?.metastring;
-	const startLineMatch = meta?.match(START_LINE_PATTERN);
-	const startLine = startLineMatch ? Number.parseInt(startLineMatch[1], 10) : 1;
-	const showLineNumbers = meta ? !NO_LINE_NUMBERS_PATTERN.test(meta) : true;
-
-	return (
-		<CodeBlock
-			code={codeText(children)}
-			data-start-line={startLine > 1 ? startLine : undefined}
-			language={language}
-			showLineNumbers={showLineNumbers}
-		>
-			<CodeBlockHeader>
-				<CodeBlockTitle>
-					<CodeBlockFilename>{language}</CodeBlockFilename>
-				</CodeBlockTitle>
-				<CodeBlockActions>
-					<CodeBlockCopyButton />
-				</CodeBlockActions>
-			</CodeBlockHeader>
-		</CodeBlock>
-	);
-};
-
-const markdownComponents = {
-	code: MarkdownCode,
-} satisfies Components;
-
-const DEFAULT_MERMAID_CONFIG = {
-	fontFamily: "monospace",
-	securityLevel: "strict",
-	startOnLoad: false,
-	suppressErrorRendering: true,
-	theme: "default",
-} satisfies MermaidConfig;
-
-interface LazyMermaidInstance {
-	initialize: (config: MermaidConfig) => void;
-	render: (
-		id: string,
-		source: string,
-	) => Promise<{
-		svg: string;
-	}>;
-}
-
-function createLazyMermaidPlugin(): DiagramPlugin {
-	let config: MermaidConfig = DEFAULT_MERMAID_CONFIG;
-	let initialized = false;
-
-	const instance: LazyMermaidInstance = {
-		initialize(nextConfig: MermaidConfig) {
-			config = { ...DEFAULT_MERMAID_CONFIG, ...config, ...nextConfig };
-			initialized = false;
-		},
-		async render(id: string, source: string) {
-			const mermaidModule = await import("mermaid");
-			const mermaid = mermaidModule.default;
-			if (!initialized) {
-				mermaid.initialize(config);
-				initialized = true;
-			}
-			return mermaid.render(id, source);
-		},
-	};
-
-	return {
-		getMermaid(nextConfig?: MermaidConfig) {
-			if (nextConfig) {
-				instance.initialize(nextConfig);
-			}
-			return instance;
-		},
-		language: "mermaid",
-		name: "mermaid",
-		type: "diagram",
-	};
-}
-
-const streamdownPlugins = { cjk, mermaid: createLazyMermaidPlugin() };
-
-export type HubStreamdownProps = StreamdownProps;
-
-export const HubStreamdown = memo(
-	({ className, components, ...props }: HubStreamdownProps) => {
-		const mergedComponents = components
-			? { ...markdownComponents, ...components }
-			: markdownComponents;
-
-		return (
-			<Streamdown
-				className={className}
-				components={mergedComponents}
-				plugins={streamdownPlugins}
-				{...props}
-			/>
-		);
-	},
-);
-
-HubStreamdown.displayName = "HubStreamdown";

apps/cline-hub/src/webview/src/components/ui/checkbox.tsx

@@ -1,27 +0,0 @@
-"use client";
-
-import { Checkbox as CheckboxPrimitive } from "@base-ui/react/checkbox";
-import { CheckIcon } from "lucide-react";
-import { cn } from "@/lib/utils";
-
-function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
-	return (
-		<CheckboxPrimitive.Root
-			data-slot="checkbox"
-			className={cn(
-				"peer relative flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-lg border border-input transition-colors outline-none group-has-disabled/field:opacity-50 after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 data-disabled:cursor-not-allowed aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 aria-invalid:aria-checked:border-primary dark:bg-input/30 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-checked:border-primary data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary",
-				className,
-			)}
-			{...props}
-		>
-			<CheckboxPrimitive.Indicator
-				data-slot="checkbox-indicator"
-				className="grid place-content-center text-current transition-none [&>svg]:size-3.5"
-			>
-				<CheckIcon />
-			</CheckboxPrimitive.Indicator>
-		</CheckboxPrimitive.Root>
-	);
-}
-
-export { Checkbox };

apps/cline-hub/src/webview/src/components/views/page-layout.tsx

@@ -1,111 +0,0 @@
-import type { ComponentType, ReactNode } from "react";
-import { ScrollArea } from "@/components/ui/scroll-area";
-import { cn } from "@/lib/utils";
-
-type PageFrameProps = {
-	children: ReactNode;
-	className?: string;
-	contentClassName?: string;
-};
-
-export function PageFrame({
-	children,
-	className,
-	contentClassName,
-}: PageFrameProps) {
-	return (
-		<ScrollArea className="h-full">
-			<div
-				className={cn(
-					"px-18 py-10 max-[1200px]:px-8 max-[720px]:px-4 max-[720px]:py-5",
-					className,
-				)}
-			>
-				<div className={cn("max-w-[86rem]", contentClassName)}>{children}</div>
-			</div>
-		</ScrollArea>
-	);
-}
-
-type PageHeaderProps = {
-	actions?: ReactNode;
-	className?: string;
-	description?: ReactNode;
-	icon?: ComponentType<{ className?: string }>;
-	meta?: ReactNode;
-	title: ReactNode;
-};
-
-export function PageHeader({
-	actions,
-	className,
-	description,
-	icon: Icon,
-	meta,
-	title,
-}: PageHeaderProps) {
-	return (
-		<section
-			className={cn(
-				"mb-8 flex items-start justify-between gap-6 max-[860px]:flex-col max-[860px]:items-stretch",
-				className,
-			)}
-		>
-			<div className="min-w-0">
-				<div className="flex min-w-0 items-center gap-3">
-					{Icon ? <Icon className="size-8 shrink-0 text-primary" /> : null}
-					<h1 className="truncate text-[32px] font-semibold leading-[1.15] tracking-normal text-foreground">
-						{title}
-					</h1>
-					{meta}
-				</div>
-				{description ? (
-					<p className="mt-3 max-w-2xl text-[15px] leading-6 text-muted-foreground">
-						{description}
-					</p>
-				) : null}
-			</div>
-			{actions ? (
-				<div className="flex shrink-0 flex-wrap items-center justify-end gap-2 max-[860px]:justify-start">
-					{actions}
-				</div>
-			) : null}
-		</section>
-	);
-}
-
-type PageEmptyStateProps = {
-	children: ReactNode;
-	className?: string;
-};
-
-export function PageEmptyState({ children, className }: PageEmptyStateProps) {
-	return (
-		<div
-			className={cn(
-				"rounded-lg border border-dashed border-border bg-card px-5 py-4 text-sm leading-6 text-muted-foreground",
-				className,
-			)}
-		>
-			{children}
-		</div>
-	);
-}
-
-type CommandBadgeProps = {
-	children: ReactNode;
-	className?: string;
-};
-
-export function CommandBadge({ children, className }: CommandBadgeProps) {
-	return (
-		<span
-			className={cn(
-				"rounded-md border border-border bg-background px-2 py-0.5 font-mono text-xs text-muted-foreground",
-				className,
-			)}
-		>
-			{children}
-		</span>
-	);
-}

apps/cline-hub/src/webview/src/components/views/settings/account-view.tsx

@@ -1,711 +0,0 @@
-"use client";
-
-import type {
-	ClineAccountBalance,
-	ClineAccountOrganization,
-	ClineAccountOrganizationBalance,
-	ClineAccountOrganizationUsageTransaction,
-	ClineAccountPaymentTransaction,
-	ClineAccountUsageTransaction,
-	ClineAccountUser,
-} from "@cline/core";
-import {
-	AlertCircle,
-	Building,
-	CreditCard,
-	ExternalLink,
-	Loader2,
-	LogIn,
-	LogOut,
-	Plus,
-	Receipt,
-	RefreshCw,
-	UserCircleIcon,
-} from "lucide-react";
-import { useCallback, useEffect, useRef, useState } from "react";
-import { Button } from "@/components/ui/button";
-import { desktopClient } from "@/lib/desktop-client";
-import { cn } from "@/lib/utils";
-import { PageFrame, PageHeader } from "../page-layout";
-
-function normalizeAccountViewError(error: unknown): Error {
-	const message = error instanceof Error ? error.message : String(error);
-	if (message.includes("unsupported desktop command: cline_account")) {
-		return new Error(
-			"The desktop sidecar is running an older build that does not support account commands. Restart the sidecar or reload the app, then try again.",
-		);
-	}
-	return error instanceof Error ? error : new Error(message);
-}
-
-function isAccountAuthError(message: string): boolean {
-	const normalized = message.toLowerCase();
-	return (
-		normalized.includes("no cline account auth token found") ||
-		normalized.includes("requires re-authentication") ||
-		normalized.includes("auth token") ||
-		normalized.includes("unauthorized")
-	);
-}
-
-// ---------------------------------------------------------------------------
-// Data fetching helpers via sidecar command
-// ---------------------------------------------------------------------------
-
-async function fetchAccountUser(): Promise<ClineAccountUser> {
-	return await desktopClient.invoke<ClineAccountUser>("cline_account", {
-		action: "clineAccount",
-		operation: "fetchMe",
-	});
-}
-
-async function fetchAccountBalance(): Promise<ClineAccountBalance> {
-	return await desktopClient.invoke<ClineAccountBalance>("cline_account", {
-		action: "clineAccount",
-		operation: "fetchBalance",
-	});
-}
-
-async function fetchAccountOrganizations(): Promise<
-	ClineAccountOrganization[]
-> {
-	return await desktopClient.invoke<ClineAccountOrganization[]>(
-		"cline_account",
-		{
-			action: "clineAccount",
-			operation: "fetchUserOrganizations",
-		},
-	);
-}
-
-async function fetchOrganizationBalance(
-	organizationId: string,
-): Promise<ClineAccountOrganizationBalance> {
-	return await desktopClient.invoke<ClineAccountOrganizationBalance>(
-		"cline_account",
-		{
-			action: "clineAccount",
-			operation: "fetchOrganizationBalance",
-			organizationId,
-		},
-	);
-}
-
-async function fetchUsageTransactions(): Promise<
-	ClineAccountUsageTransaction[]
-> {
-	return await desktopClient.invoke<ClineAccountUsageTransaction[]>(
-		"cline_account",
-		{
-			action: "clineAccount",
-			operation: "fetchUsageTransactions",
-		},
-	);
-}
-
-async function fetchOrganizationUsageTransactions(
-	organizationId: string,
-	memberId?: string,
-): Promise<ClineAccountOrganizationUsageTransaction[]> {
-	return await desktopClient.invoke<ClineAccountOrganizationUsageTransaction[]>(
-		"cline_account",
-		{
-			action: "clineAccount",
-			operation: "fetchOrganizationUsageTransactions",
-			organizationId,
-			...(memberId?.trim() ? { memberId: memberId.trim() } : {}),
-		},
-	);
-}
-
-async function fetchPaymentTransactions(): Promise<
-	ClineAccountPaymentTransaction[]
-> {
-	return await desktopClient.invoke<ClineAccountPaymentTransaction[]>(
-		"cline_account",
-		{
-			action: "clineAccount",
-			operation: "fetchPaymentTransactions",
-		},
-	);
-}
-
-// ---------------------------------------------------------------------------
-// Component
-// ---------------------------------------------------------------------------
-
-export function AccountView() {
-	const [activeTab, setActiveTab] = useState<"overview" | "usage" | "billing">(
-		"overview",
-	);
-	const [accountActionPending, setAccountActionPending] = useState<
-		"sign-in" | "sign-out" | null
-	>(null);
-
-	// Overview data
-	const [user, setUser] = useState<ClineAccountUser | null>(null);
-	const [balance, setBalance] = useState<ClineAccountBalance | null>(null);
-	const [organizationBalance, setOrganizationBalance] =
-		useState<ClineAccountOrganizationBalance | null>(null);
-	const [organizations, setOrganizations] = useState<
-		ClineAccountOrganization[]
-	>([]);
-	const [overviewLoading, setOverviewLoading] = useState(true);
-	const [overviewError, setOverviewError] = useState<string | null>(null);
-
-	// Usage data
-	const [usageTransactions, setUsageTransactions] = useState<
-		ClineAccountUsageTransaction[]
-	>([]);
-	const [usageLoading, setUsageLoading] = useState(false);
-	const [usageError, setUsageError] = useState<string | null>(null);
-	const [usageLoaded, setUsageLoaded] = useState(false);
-	const usageGenerationRef = useRef(0);
-
-	// Billing data
-	const [paymentTransactions, setPaymentTransactions] = useState<
-		ClineAccountPaymentTransaction[]
-	>([]);
-	const [billingLoading, setBillingLoading] = useState(false);
-	const [billingError, setBillingError] = useState<string | null>(null);
-	const [billingLoaded, setBillingLoaded] = useState(false);
-	const activeOrganization = organizations.find((org) => org.active) ?? null;
-
-	const resetAccountData = useCallback(() => {
-		setUser(null);
-		setBalance(null);
-		setOrganizationBalance(null);
-		setOrganizations([]);
-		setUsageTransactions([]);
-		setUsageLoaded(false);
-		setUsageError(null);
-		setPaymentTransactions([]);
-		setBillingLoaded(false);
-		setBillingError(null);
-	}, []);
-
-	// -- Overview fetch --
-	const loadOverview = useCallback(async () => {
-		setOverviewLoading(true);
-		setOverviewError(null);
-		try {
-			const [userData, balanceData, orgsData] = await Promise.all([
-				fetchAccountUser(),
-				fetchAccountBalance(),
-				fetchAccountOrganizations(),
-			]);
-			const nextActiveOrganization =
-				orgsData.find((organization) => organization.active) ?? null;
-			const organizationBalanceData = nextActiveOrganization
-				? await fetchOrganizationBalance(nextActiveOrganization.organizationId)
-				: null;
-			setUser(userData);
-			setBalance(balanceData);
-			setOrganizationBalance(organizationBalanceData);
-			setOrganizations(orgsData);
-		} catch (err) {
-			resetAccountData();
-			const message = normalizeAccountViewError(err).message;
-			setOverviewError(message);
-		} finally {
-			setOverviewLoading(false);
-		}
-	}, [resetAccountData]);
-
-	useEffect(() => {
-		void loadOverview();
-	}, [loadOverview]);
-
-	const signIn = async () => {
-		setAccountActionPending("sign-in");
-		setOverviewError(null);
-		try {
-			await desktopClient.invoke("run_provider_oauth_login", {
-				provider: "cline",
-			});
-			await loadOverview();
-			setActiveTab("overview");
-		} catch (err) {
-			const message = normalizeAccountViewError(err).message;
-			setOverviewError(message);
-			resetAccountData();
-		} finally {
-			setAccountActionPending(null);
-		}
-	};
-
-	const signOut = async () => {
-		setAccountActionPending("sign-out");
-		try {
-			await desktopClient.invoke("save_provider_settings", {
-				provider: "cline",
-				api_key: "",
-				settings: {
-					auth: {
-						accessToken: "",
-						refreshToken: "",
-						accountId: "",
-					},
-				},
-			});
-			resetAccountData();
-			setActiveTab("overview");
-			setOverviewError("No Cline account auth token found");
-		} catch (err) {
-			const message = normalizeAccountViewError(err).message;
-			setOverviewError(message);
-		} finally {
-			setAccountActionPending(null);
-		}
-	};
-
-	// -- Usage fetch (lazy on tab switch) --
-	const loadUsage = useCallback(async () => {
-		const generation = usageGenerationRef.current;
-		setUsageLoading(true);
-		setUsageError(null);
-		try {
-			const data = activeOrganization
-				? await fetchOrganizationUsageTransactions(
-						activeOrganization.organizationId,
-						activeOrganization.memberId,
-					)
-				: await fetchUsageTransactions();
-			if (usageGenerationRef.current !== generation) return;
-			setUsageTransactions(data);
-			setUsageLoaded(true);
-		} catch (err) {
-			if (usageGenerationRef.current !== generation) return;
-			const message = normalizeAccountViewError(err).message;
-			setUsageError(message);
-		} finally {
-			if (usageGenerationRef.current === generation) {
-				setUsageLoading(false);
-			}
-		}
-	}, [activeOrganization]);
-
-	// biome-ignore lint/correctness/useExhaustiveDependencies: we need to reset usage state when the organization changes
-	useEffect(() => {
-		usageGenerationRef.current += 1;
-		setUsageTransactions([]);
-		setUsageLoaded(false);
-		setUsageError(null);
-	}, [activeOrganization?.organizationId]);
-
-	useEffect(() => {
-		if (activeTab === "usage" && !usageLoaded) {
-			void loadUsage();
-		}
-	}, [activeTab, usageLoaded, loadUsage]);
-
-	// -- Billing fetch (lazy on tab switch) --
-	const loadBilling = useCallback(async () => {
-		setBillingLoading(true);
-		setBillingError(null);
-		try {
-			const data = await fetchPaymentTransactions();
-			setPaymentTransactions(data);
-			setBillingLoaded(true);
-		} catch (err) {
-			const message = normalizeAccountViewError(err).message;
-			setBillingError(message);
-		} finally {
-			setBillingLoading(false);
-		}
-	}, []);
-
-	useEffect(() => {
-		if (activeTab === "billing" && !billingLoaded) {
-			void loadBilling();
-		}
-	}, [activeTab, billingLoaded, loadBilling]);
-
-	// -- Formatters --
-
-	const formatDate = (dateStr: string) => {
-		return new Date(dateStr).toLocaleDateString("en-US", {
-			month: "short",
-			day: "numeric",
-			year: "numeric",
-		});
-	};
-
-	const formatTime = (dateStr: string) => {
-		return new Date(dateStr).toLocaleTimeString("en-US", {
-			hour: "numeric",
-			minute: "2-digit",
-		});
-	};
-
-	const formatCreditBalance = (value: number, decimalPlaces = 2) => {
-		return new Intl.NumberFormat("en-US", {
-			minimumFractionDigits: decimalPlaces,
-			maximumFractionDigits: decimalPlaces,
-		}).format(value / 1_000_000);
-	};
-
-	const displayedBalance = activeOrganization
-		? (organizationBalance?.balance ?? balance?.balance ?? null)
-		: (balance?.balance ?? null);
-
-	const tabs = ["overview", "usage", "billing"] as const;
-
-	// -- Shared error / loading UI --
-
-	const renderError = (message: string, onRetry: () => void) => (
-		<div className="flex flex-col items-center justify-center gap-3 py-12 text-center">
-			<AlertCircle className="h-8 w-8 text-destructive" />
-			<p className="text-sm text-muted-foreground max-w-md">{message}</p>
-			<button
-				type="button"
-				onClick={onRetry}
-				className="flex items-center gap-2 rounded-lg border border-border px-3.5 py-2 text-sm font-medium text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
-			>
-				<RefreshCw className="h-4 w-4" />
-				Retry
-			</button>
-		</div>
-	);
-
-	const renderSignedOut = () => (
-		<div className="rounded-lg border border-border bg-card p-6">
-			<div className="mx-auto flex max-w-xl flex-col items-center gap-4 py-8 text-center">
-				<div className="flex size-12 items-center justify-center rounded-lg bg-primary/10 text-primary">
-					<UserCircleIcon className="h-6 w-6" />
-				</div>
-				<div>
-					<h3 className="text-lg font-semibold text-foreground">
-						Sign in to Cline
-					</h3>
-					<p className="mt-2 text-sm text-muted-foreground">
-						Connect your Cline account to review credits, usage, billing, and
-						organization details from Cline Hub.
-					</p>
-				</div>
-				<div className="flex flex-wrap items-center justify-center gap-2">
-					<Button
-						disabled={accountActionPending !== null}
-						onClick={() => void signIn()}
-						type="button"
-					>
-						{accountActionPending === "sign-in" ? (
-							<Loader2 className="h-4 w-4 animate-spin" />
-						) : (
-							<LogIn className="h-4 w-4" />
-						)}
-						{accountActionPending === "sign-in" ? "Signing in" : "Sign in"}
-					</Button>
-					<a
-						className="inline-flex h-9 items-center gap-2 rounded-lg border border-border px-3.5 text-sm font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
-						href="https://app.cline.bot"
-						rel="noopener noreferrer"
-						target="_blank"
-					>
-						Create account
-						<ExternalLink className="h-4 w-4" />
-					</a>
-				</div>
-			</div>
-		</div>
-	);
-
-	const renderLoading = () => (
-		<div className="flex items-center justify-center py-12">
-			<Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
-		</div>
-	);
-
-	return (
-		<PageFrame>
-			<PageHeader
-				description="Review account, usage, billing, and organization details."
-				title="Account"
-			/>
-
-			{/* Tabs */}
-			<div className="mb-6 flex items-center gap-0 border-b border-border">
-				{tabs.map((tab) => {
-					const disabled = !user && tab !== "overview";
-					return (
-						<button
-							disabled={disabled}
-							key={tab}
-							type="button"
-							onClick={() => setActiveTab(tab)}
-							className={cn(
-								"relative px-4 py-2.5 text-sm font-medium capitalize transition-colors",
-								activeTab === tab
-									? "text-foreground"
-									: "text-muted-foreground hover:text-foreground",
-								disabled &&
-									"cursor-not-allowed opacity-45 hover:text-muted-foreground",
-							)}
-						>
-							{tab}
-							{activeTab === tab && (
-								<span className="absolute inset-x-0 -bottom-px h-0.5 bg-foreground" />
-							)}
-						</button>
-					);
-				})}
-			</div>
-
-			{/* Overview Tab */}
-			{activeTab === "overview" && (
-				<div className="flex flex-col gap-6">
-					{overviewLoading && renderLoading()}
-					{overviewError &&
-						(isAccountAuthError(overviewError)
-							? renderSignedOut()
-							: renderError(overviewError, loadOverview))}
-					{!overviewLoading && !overviewError && user && (
-						<>
-							{/* User Profile Card */}
-							<div className="rounded-lg border border-border p-5">
-								<div className="flex items-start gap-4">
-									<div className="flex h-16 w-16 shrink-0 items-center justify-center rounded-full bg-primary/20 text-2xl font-bold text-primary">
-										{user.displayName?.charAt(0) ??
-											user.email?.charAt(0) ??
-											"?"}
-									</div>
-									<div className="min-w-0 flex-1">
-										<h3 className="text-base font-semibold text-foreground">
-											{user.displayName || user.email}
-										</h3>
-										<p className="mt-0.5 text-sm text-muted-foreground">
-											{user.email}
-										</p>
-										<p className="mt-2 text-xs text-muted-foreground">
-											Member since {formatDate(user.createdAt)}
-										</p>
-									</div>
-									<div className="flex shrink-0 items-center gap-2">
-										<a
-											href="https://app.cline.bot/dashboard"
-											target="_blank"
-											rel="noopener noreferrer"
-											className="inline-flex h-8 items-center gap-1.5 rounded-md border border-border px-2.5 text-xs font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
-										>
-											Open dashboard
-											<ExternalLink className="h-3.5 w-3.5" />
-										</a>
-										<Button
-											className="h-8 rounded-md px-2.5 text-xs"
-											disabled={accountActionPending !== null}
-											onClick={() => void signOut()}
-											type="button"
-											variant="outline"
-										>
-											{accountActionPending === "sign-out" ? (
-												<Loader2 className="h-3.5 w-3.5 animate-spin" />
-											) : (
-												<LogOut className="h-3.5 w-3.5" />
-											)}
-											{accountActionPending === "sign-out"
-												? "Signing out"
-												: "Sign out"}
-										</Button>
-									</div>
-								</div>
-							</div>
-
-							{/* Balance Card */}
-							{displayedBalance !== null && (
-								<div className="rounded-lg border border-border p-5">
-									<div className="flex items-center justify-between mb-4">
-										<div className="flex items-center gap-3">
-											<CreditCard className="h-5 w-5 text-primary" />
-											<h3 className="text-sm font-semibold text-foreground">
-												{activeOrganization
-													? `${activeOrganization.name} Balance`
-													: "Credits Balance"}
-											</h3>
-										</div>
-										<a
-											href="https://app.cline.bot/dashboard/organization?tab=credits&redirect=true"
-											target="_blank"
-											rel="noopener noreferrer"
-											className="flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
-										>
-											<Plus className="h-3.5 w-3.5" />
-											Credit
-										</a>
-									</div>
-									<div className="flex items-baseline gap-2">
-										<span className="text-3xl font-bold text-foreground">
-											${formatCreditBalance(displayedBalance)}
-										</span>
-									</div>
-									{activeOrganization && balance && (
-										<p className="mt-2 text-xs text-muted-foreground">
-											Personal account: {formatCreditBalance(balance.balance)}{" "}
-											credits
-										</p>
-									)}
-								</div>
-							)}
-
-							{/* Organizations */}
-							<div className="rounded-lg border border-border p-5">
-								<div className="flex items-center justify-between mb-4">
-									<div className="flex items-center gap-3">
-										<Building className="h-5 w-5 text-muted-foreground" />
-										<h3 className="text-sm font-semibold text-foreground">
-											Organizations
-										</h3>
-									</div>
-									<a
-										href="https://app.cline.bot/onboarding?step=1"
-										target="_blank"
-										rel="noopener noreferrer"
-										className="flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
-									>
-										<Plus className="h-3.5 w-3.5" />
-										Create
-									</a>
-								</div>
-								{organizations.length === 0 ? (
-									<p className="text-sm text-muted-foreground">
-										No organizations yet.
-									</p>
-								) : (
-									<div className="flex flex-col gap-2">
-										{organizations.map((org) => (
-											<div
-												key={org.organizationId}
-												className="flex items-center gap-3 rounded-lg border border-border px-4 py-3 transition-colors hover:bg-accent/20"
-											>
-												<div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-secondary text-sm font-bold text-foreground">
-													{org.name.charAt(0)}
-												</div>
-												<div className="min-w-0 flex-1">
-													<p className="text-sm font-medium text-foreground">
-														{org.name}
-													</p>
-													<p className="text-xs text-muted-foreground capitalize">
-														{org.roles.join(", ")}
-													</p>
-												</div>
-												{org.active && (
-													<span className="rounded-full bg-primary/20 px-2 py-0.5 text-xs font-medium text-primary">
-														Active
-													</span>
-												)}
-											</div>
-										))}
-									</div>
-								)}
-							</div>
-						</>
-					)}
-				</div>
-			)}
-
-			{/* Usage Tab */}
-			{activeTab === "usage" && (
-				<div>
-					<p className="mb-6 text-sm text-muted-foreground">
-						{activeOrganization
-							? `Recent API usage and token consumption for ${activeOrganization.name}.`
-							: "Recent API usage and token consumption across all providers."}
-					</p>
-					{usageLoading && renderLoading()}
-					{usageError && renderError(usageError, loadUsage)}
-					{!usageLoading &&
-						!usageError &&
-						usageLoaded &&
-						(usageTransactions.length === 0 ? (
-							<p className="py-8 text-center text-sm text-muted-foreground">
-								No usage transactions yet.
-							</p>
-						) : (
-							<div className="rounded-lg border border-border overflow-hidden">
-								<div className="grid grid-cols-[1fr_auto_auto_auto] gap-4 border-b border-border bg-secondary/50 px-4 py-2.5 text-xs font-medium text-muted-foreground">
-									<span>Model</span>
-									<span className="text-right">Tokens</span>
-									<span className="text-right">Credits</span>
-									<span className="text-right">Time</span>
-								</div>
-								<div className="divide-y divide-border">
-									{usageTransactions.map((tx) => (
-										<div
-											key={tx.id}
-											className="grid grid-cols-[1fr_auto_auto_auto] gap-4 px-4 py-3 text-sm transition-colors hover:bg-accent/20"
-										>
-											<div className="min-w-0">
-												<p className="font-medium text-foreground truncate">
-													{tx.aiModelName}
-												</p>
-												<p className="text-xs text-muted-foreground">
-													{tx.aiInferenceProviderName}
-												</p>
-											</div>
-											<div className="text-right text-muted-foreground">
-												{tx.totalTokens.toLocaleString()}
-											</div>
-											<div className="text-right text-foreground font-medium">
-												{formatCreditBalance(tx.creditsUsed)}
-											</div>
-											<div className="text-right text-xs text-muted-foreground">
-												<p>{formatDate(tx.createdAt)}</p>
-												<p>{formatTime(tx.createdAt)}</p>
-											</div>
-										</div>
-									))}
-								</div>
-							</div>
-						))}
-				</div>
-			)}
-
-			{/* Billing Tab */}
-			{activeTab === "billing" && (
-				<div>
-					<p className="mb-6 text-sm text-muted-foreground">
-						Payment history and credit purchases.
-					</p>
-					{billingLoading && renderLoading()}
-					{billingError && renderError(billingError, loadBilling)}
-					{!billingLoading &&
-						!billingError &&
-						billingLoaded &&
-						(paymentTransactions.length === 0 ? (
-							<p className="py-8 text-center text-sm text-muted-foreground">
-								No payment transactions yet.
-							</p>
-						) : (
-							<div className="rounded-lg border border-border overflow-hidden">
-								<div className="grid grid-cols-[1fr_auto_auto] gap-4 border-b border-border bg-secondary/50 px-4 py-2.5 text-xs font-medium text-muted-foreground">
-									<span>Date</span>
-									<span className="text-right">Amount</span>
-									<span className="text-right">Credits</span>
-								</div>
-								<div className="divide-y divide-border">
-									{paymentTransactions.map((tx) => (
-										<div
-											key={`${tx.paidAt}-${tx.amountCents}-${tx.credits}`}
-											className="grid grid-cols-[1fr_auto_auto] gap-4 px-4 py-3 text-sm transition-colors hover:bg-accent/20"
-										>
-											<div className="flex items-center gap-3">
-												<Receipt className="h-4 w-4 text-muted-foreground" />
-												<span className="text-foreground">
-													{formatDate(tx.paidAt)}
-												</span>
-											</div>
-											<div className="text-right text-foreground font-medium">
-												${(tx.amountCents / 100).toFixed(2)}
-											</div>
-											<div className="text-right text-primary font-medium">
-												+{formatCreditBalance(tx.credits)}
-											</div>
-										</div>
-									))}
-								</div>
-							</div>
-						))}
-				</div>
-			)}
-		</PageFrame>
-	);
-}

apps/cline-hub/src/webview/src/components/views/settings/add-provider.tsx

@@ -1,529 +0,0 @@
-"use client";
-
-import {
-	ArrowLeft,
-	ChevronDown,
-	Copy,
-	Eye,
-	EyeOff,
-	Plus,
-	Trash2,
-	X,
-} from "lucide-react";
-import { useMemo, useState } from "react";
-import { Button } from "@/components/ui/button";
-import { Label } from "@/components/ui/label";
-import { cn } from "@/lib/utils";
-import { PageFrame, PageHeader } from "../page-layout";
-
-const CAPABILITY_OPTIONS = [
-	"streaming",
-	"tools",
-	"reasoning",
-	"vision",
-	"prompt-cache",
-] as const;
-
-type Capability = (typeof CAPABILITY_OPTIONS)[number];
-
-export interface AddProviderPayload {
-	providerId: string;
-	name: string;
-	baseUrl: string;
-	apiKey?: string;
-	headers?: Record<string, string>;
-	timeoutMs?: number;
-	models: string[];
-	defaultModelId?: string;
-	modelsSourceUrl?: string;
-	capabilities?: Capability[];
-}
-
-interface NewProviderForm {
-	providerId: string;
-	name: string;
-	models: string[];
-	defaultModel: string;
-	apiKey: string;
-	baseUrl: string;
-	modelsSourceUrl: string;
-	headers: Record<string, string>;
-	timeoutMs: string;
-	capabilities: Capability[];
-}
-
-export function AddProviderContent({
-	onBack,
-	onSave,
-	existingProviderIds,
-}: {
-	onBack: () => void;
-	onSave: (payload: AddProviderPayload) => Promise<void>;
-	existingProviderIds: string[];
-}) {
-	const [form, setForm] = useState<NewProviderForm>({
-		providerId: "",
-		name: "",
-		models: [],
-		defaultModel: "",
-		apiKey: "",
-		baseUrl: "",
-		modelsSourceUrl: "",
-		headers: {},
-		timeoutMs: "",
-		capabilities: ["streaming", "tools"],
-	});
-	const [modelInput, setModelInput] = useState("");
-	const [showApiKey, setShowApiKey] = useState(false);
-	const [showAdvanced, setShowAdvanced] = useState(false);
-	const [saving, setSaving] = useState(false);
-	const [error, setError] = useState<string | null>(null);
-
-	const normalizedProviderId = useMemo(
-		() => form.providerId.trim().toLowerCase().replace(/\s+/g, "-"),
-		[form.providerId],
-	);
-
-	const duplicateProviderId =
-		existingProviderIds.includes(normalizedProviderId);
-	const hasManualModels = form.models.length > 0;
-	const hasModelsSource = form.modelsSourceUrl.trim().length > 0;
-	const canSave =
-		normalizedProviderId.length > 0 &&
-		form.name.trim().length > 0 &&
-		form.baseUrl.trim().length > 0 &&
-		(hasManualModels || hasModelsSource) &&
-		!duplicateProviderId;
-
-	const handleAddModel = (e: React.KeyboardEvent<HTMLInputElement>) => {
-		if ((e.key === "Enter" || e.key === ",") && modelInput.trim()) {
-			e.preventDefault();
-			const value = modelInput.trim().replace(/,/g, "");
-			if (value && !form.models.includes(value)) {
-				setForm((prev) => ({
-					...prev,
-					models: [...prev.models, value],
-					defaultModel: prev.defaultModel || value,
-				}));
-			}
-			setModelInput("");
-		} else if (e.key === "Backspace" && !modelInput && form.models.length > 0) {
-			setForm((prev) => ({
-				...prev,
-				models: prev.models.slice(0, -1),
-			}));
-		}
-	};
-
-	const removeModel = (model: string) => {
-		setForm((prev) => {
-			const nextModels = prev.models.filter((m) => m !== model);
-			return {
-				...prev,
-				models: nextModels,
-				defaultModel:
-					prev.defaultModel === model
-						? (nextModels[0] ?? "")
-						: prev.defaultModel,
-			};
-		});
-	};
-
-	const toggleCapability = (cap: Capability) => {
-		setForm((prev) => ({
-			...prev,
-			capabilities: prev.capabilities.includes(cap)
-				? prev.capabilities.filter((c) => c !== cap)
-				: [...prev.capabilities, cap],
-		}));
-	};
-
-	const addHeader = () => {
-		setForm((prev) => ({ ...prev, headers: { ...prev.headers, "": "" } }));
-	};
-
-	const updateHeaderKey = (oldKey: string, newKey: string, idx: number) => {
-		const entries = Object.entries(form.headers);
-		const next: Record<string, string> = {};
-		entries.forEach(([key, value], index) => {
-			next[index === idx ? newKey : key] = value;
-		});
-		if (oldKey !== newKey) {
-			delete next[oldKey];
-		}
-		setForm((prev) => ({ ...prev, headers: next }));
-	};
-
-	const updateHeaderValue = (key: string, value: string) => {
-		setForm((prev) => ({
-			...prev,
-			headers: { ...prev.headers, [key]: value },
-		}));
-	};
-
-	const removeHeader = (key: string) => {
-		const next = { ...form.headers };
-		delete next[key];
-		setForm((prev) => ({ ...prev, headers: next }));
-	};
-
-	const handleSave = async () => {
-		if (!canSave || saving) {
-			return;
-		}
-		setSaving(true);
-		setError(null);
-		try {
-			await onSave({
-				providerId: normalizedProviderId,
-				name: form.name.trim(),
-				baseUrl: form.baseUrl.trim(),
-				apiKey: form.apiKey.trim() || undefined,
-				headers: Object.fromEntries(
-					Object.entries(form.headers)
-						.map(([key, value]) => [key.trim(), value])
-						.filter(([key]) => key.length > 0),
-				),
-				timeoutMs:
-					form.timeoutMs.trim().length > 0
-						? Number.parseInt(form.timeoutMs.trim(), 10)
-						: undefined,
-				models: form.models,
-				defaultModelId: form.defaultModel || form.models[0],
-				modelsSourceUrl: form.modelsSourceUrl.trim() || undefined,
-				capabilities:
-					form.capabilities.length > 0 ? form.capabilities : undefined,
-			});
-		} catch (saveError) {
-			setError(
-				saveError instanceof Error ? saveError.message : String(saveError),
-			);
-		} finally {
-			setSaving(false);
-		}
-	};
-
-	return (
-		<PageFrame contentClassName="max-w-4xl">
-			<PageHeader
-				description="Add an OpenAI-compatible provider and choose its available models."
-				title="Add Provider"
-				actions={
-					<Button
-						onClick={onBack}
-						variant="secondary"
-						className="rounded-md p-1.5 transition-colors"
-						aria-label="Back to providers"
-					>
-						<ArrowLeft className="h-4 w-4" />
-						Providers
-					</Button>
-				}
-			/>
-
-			<div className="flex flex-col gap-6">
-				<div className="rounded-lg border border-border p-5">
-					<h3 className="mb-4 text-sm font-semibold text-foreground">
-						OpenAI-Compatible Provider
-					</h3>
-					<div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-						<div>
-							<Label className="mb-2 block text-xs font-medium text-muted-foreground">
-								Provider ID
-							</Label>
-							<input
-								type="text"
-								value={form.providerId}
-								onChange={(e) =>
-									setForm((prev) => ({ ...prev, providerId: e.target.value }))
-								}
-								placeholder="my-provider"
-								className="w-full rounded-lg border border-border bg-input px-3 py-2 text-sm text-foreground placeholder:text-muted-foreground/50 outline-none focus:ring-1 focus:ring-ring"
-							/>
-							<p className="mt-1.5 text-xs text-muted-foreground">
-								Lowercase ID used in provider registry.
-							</p>
-							{duplicateProviderId ? (
-								<p className="mt-1 text-xs text-destructive">
-									This provider ID already exists.
-								</p>
-							) : null}
-						</div>
-						<div>
-							<Label className="mb-2 block text-xs font-medium text-muted-foreground">
-								Provider Name
-							</Label>
-							<input
-								type="text"
-								value={form.name}
-								onChange={(e) =>
-									setForm((prev) => ({ ...prev, name: e.target.value }))
-								}
-								placeholder="My Provider"
-								className="w-full rounded-lg border border-border bg-input px-3 py-2 text-sm text-foreground placeholder:text-muted-foreground/50 outline-none focus:ring-1 focus:ring-ring"
-							/>
-						</div>
-					</div>
-				</div>
-
-				<div className="rounded-lg border border-border p-5">
-					<Label className="mb-2 block text-xs font-medium text-muted-foreground">
-						Base URL
-					</Label>
-					<input
-						type="url"
-						value={form.baseUrl}
-						onChange={(e) =>
-							setForm((prev) => ({ ...prev, baseUrl: e.target.value }))
-						}
-						placeholder="https://api.example.com/v1"
-						className="w-full rounded-lg border border-border bg-input px-3 py-2 text-sm text-foreground placeholder:text-muted-foreground/50 outline-none focus:ring-1 focus:ring-ring"
-					/>
-				</div>
-
-				<div className="rounded-lg border border-border p-5">
-					<Label className="mb-2 block text-xs font-medium text-muted-foreground">
-						Model Source URL (Optional)
-					</Label>
-					<input
-						type="url"
-						value={form.modelsSourceUrl}
-						onChange={(e) =>
-							setForm((prev) => ({
-								...prev,
-								modelsSourceUrl: e.target.value,
-							}))
-						}
-						placeholder="https://api.example.com/v1/models"
-						className="w-full rounded-lg border border-border bg-input px-3 py-2 text-sm text-foreground placeholder:text-muted-foreground/50 outline-none focus:ring-1 focus:ring-ring"
-					/>
-					<p className="mt-1.5 text-xs text-muted-foreground">
-						Supported JSON: OpenAI `/models` shape with a `data` array, or a
-						direct model array.
-					</p>
-				</div>
-
-				<div className="rounded-lg border border-border p-5">
-					<Label className="mb-2 block text-xs font-medium text-muted-foreground">
-						Models
-					</Label>
-					<div className="flex min-h-11 flex-wrap content-start gap-1.5 rounded-lg border border-border bg-input px-3 py-2 focus-within:ring-1 focus-within:ring-ring">
-						{form.models.map((model) => (
-							<span
-								key={model}
-								className="inline-flex items-center gap-1 rounded-md bg-primary/10 px-2 py-1 text-xs font-medium text-primary"
-							>
-								<span className="font-mono">{model}</span>
-								<Button
-									onClick={() => removeModel(model)}
-									className="text-primary/60 hover:text-primary transition-colors"
-									aria-label={`Remove ${model}`}
-								>
-									<X className="h-3 w-3" />
-								</Button>
-							</span>
-						))}
-						<input
-							type="text"
-							value={modelInput}
-							onChange={(e) => setModelInput(e.target.value)}
-							onKeyDown={handleAddModel}
-							placeholder={
-								form.models.length === 0 ? "Type model ID and press Enter" : ""
-							}
-							className="min-w-35 flex-1 bg-transparent text-sm text-foreground placeholder:text-muted-foreground/50 outline-none"
-						/>
-					</div>
-					<p className="mt-1.5 text-xs text-muted-foreground">
-						Add at least one model or set a Model Source URL.
-					</p>
-				</div>
-
-				{form.models.length > 1 ? (
-					<div className="rounded-lg border border-border p-5">
-						<Label className="mb-2 block text-xs font-medium text-muted-foreground">
-							Default Model
-						</Label>
-						<select
-							value={form.defaultModel}
-							onChange={(e) =>
-								setForm((prev) => ({ ...prev, defaultModel: e.target.value }))
-							}
-							className="w-full rounded-lg border border-border bg-input px-3 py-2 text-sm text-foreground outline-none focus:ring-1 focus:ring-ring"
-						>
-							{form.models.map((model) => (
-								<option key={model} value={model}>
-									{model}
-								</option>
-							))}
-						</select>
-					</div>
-				) : null}
-
-				<div className="rounded-lg border border-border p-5">
-					<Label className="mb-2 block text-xs font-medium text-muted-foreground">
-						API Key (Optional)
-					</Label>
-					<div className="relative">
-						<input
-							type={showApiKey ? "text" : "password"}
-							value={form.apiKey}
-							onChange={(e) =>
-								setForm((prev) => ({ ...prev, apiKey: e.target.value }))
-							}
-							placeholder="sk-..."
-							className="w-full rounded-lg border border-border bg-input px-3 py-2 pr-20 font-mono text-sm text-foreground placeholder:text-muted-foreground/50 outline-none focus:ring-1 focus:ring-ring"
-						/>
-						<div className="absolute right-2 top-1/2 flex -translate-y-1/2 items-center gap-1">
-							<Button
-								onClick={() => setShowApiKey(!showApiKey)}
-								variant="ghost"
-								className="rounded-md p-1 transition-colors"
-								aria-label={showApiKey ? "Hide API key" : "Show API key"}
-							>
-								{showApiKey ? (
-									<EyeOff className="h-4 w-4" />
-								) : (
-									<Eye className="h-4 w-4" />
-								)}
-							</Button>
-							<Button
-								onClick={() => navigator.clipboard.writeText(form.apiKey)}
-								variant="ghost"
-								className="rounded-md p-1 transition-colors"
-								aria-label="Copy API key"
-							>
-								<Copy className="h-4 w-4" />
-							</Button>
-						</div>
-					</div>
-				</div>
-
-				<div className="rounded-lg border border-border p-5">
-					<Label className="mb-3 block text-xs font-medium text-muted-foreground">
-						Capabilities
-					</Label>
-					<div className="flex flex-wrap gap-2">
-						{CAPABILITY_OPTIONS.map((cap) => (
-							<Button
-								key={cap}
-								onClick={() => toggleCapability(cap)}
-								className={cn(
-									"rounded-lg border px-3 py-1.5 text-xs font-medium transition-all",
-									form.capabilities.includes(cap)
-										? "border-primary/40 bg-primary/10 text-primary"
-										: "border-border bg-card text-muted-foreground hover:border-muted-foreground/50 hover:text-foreground",
-								)}
-							>
-								{cap.replace(/-/g, " ")}
-							</Button>
-						))}
-					</div>
-				</div>
-
-				<div className="rounded-lg border border-border overflow-hidden">
-					<Button
-						onClick={() => setShowAdvanced(!showAdvanced)}
-						className="flex w-full items-center justify-between px-5 py-4 text-sm font-medium transition-colors text-foreground/40"
-						variant="ghost"
-					>
-						Advanced Settings
-						<ChevronDown
-							className={cn(
-								"h-4 w-4 text-muted-foreground transition-transform",
-								showAdvanced && "rotate-180",
-							)}
-						/>
-					</Button>
-
-					{showAdvanced ? (
-						<div className="border-t border-border px-5 py-5 flex flex-col gap-5">
-							<div>
-								<Label className="mb-2 block text-xs font-medium text-muted-foreground">
-									Timeout (ms)
-								</Label>
-								<input
-									type="number"
-									value={form.timeoutMs}
-									onChange={(e) =>
-										setForm((prev) => ({
-											...prev,
-											timeoutMs: e.target.value,
-										}))
-									}
-									placeholder="30000"
-									className="w-full rounded-lg border border-border bg-input px-3 py-2 text-sm text-foreground placeholder:text-muted-foreground/50 outline-none focus:ring-1 focus:ring-ring"
-								/>
-							</div>
-
-							<div>
-								<Label className="mb-2 block text-xs font-medium text-muted-foreground">
-									Custom Headers
-								</Label>
-								<div className="flex flex-col gap-2">
-									{Object.entries(form.headers).map(([key, value], idx) => (
-										<div key={key} className="flex items-center gap-2">
-											<input
-												type="text"
-												value={key}
-												onChange={(e) =>
-													updateHeaderKey(key, e.target.value, idx)
-												}
-												placeholder="Header name"
-												className="flex-1 rounded-lg border border-border bg-input px-3 py-2 font-mono text-xs text-foreground placeholder:text-muted-foreground/50 outline-none focus:ring-1 focus:ring-ring"
-											/>
-											<input
-												type="text"
-												value={value}
-												onChange={(e) => updateHeaderValue(key, e.target.value)}
-												placeholder="Value"
-												className="flex-1 rounded-lg border border-border bg-input px-3 py-2 font-mono text-xs text-foreground placeholder:text-muted-foreground/50 outline-none focus:ring-1 focus:ring-ring"
-											/>
-											<Button
-												onClick={() => removeHeader(key)}
-												className="rounded-md p-2 text-muted-foreground hover:text-destructive transition-colors"
-												aria-label="Remove header"
-											>
-												<Trash2 className="h-4 w-4" />
-											</Button>
-										</div>
-									))}
-									<Button
-										onClick={addHeader}
-										className="flex items-center gap-1.5 rounded-md px-2 py-1.5 text-xs font-medium text-muted-foreground hover:text-foreground transition-colors w-fit"
-									>
-										<Plus className="h-3 w-3" />
-										Add Header
-									</Button>
-								</div>
-							</div>
-						</div>
-					) : null}
-				</div>
-
-				{error ? <p className="text-sm text-destructive">{error}</p> : null}
-
-				<div className="flex items-center justify-end gap-3 pt-2">
-					<Button
-						onClick={onBack}
-						className="rounded-lg border border-border px-4 py-2 text-sm font-medium text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
-					>
-						Cancel
-					</Button>
-					<Button
-						onClick={() => void handleSave()}
-						disabled={!canSave || saving}
-						className={cn(
-							"rounded-lg px-4 py-2 text-sm font-medium transition-colors",
-							canSave && !saving
-								? "bg-primary text-primary-foreground hover:bg-primary/90"
-								: "bg-muted text-muted-foreground cursor-not-allowed",
-						)}
-					>
-						{saving ? "Saving..." : "Add Provider"}
-					</Button>
-				</div>
-			</div>
-		</PageFrame>
-	);
-}

apps/cline-hub/src/webview/src/lib/desktop-client.test.ts

@@ -1,71 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import type { WebviewInboundMessage } from "../../../webview-protocol";
-import { HubDesktopClient, isBrowserTransportFailure } from "./desktop-client";
-
-function createClient() {
-	const postToHost = vi.fn<(message: WebviewInboundMessage) => void>();
-	const client = new HubDesktopClient({ postToHost, listen: false });
-	return { client, postToHost };
-}
-
-function lastDesktopCommand(postToHost: ReturnType<typeof vi.fn>) {
-	const message = postToHost.mock.lastCall?.[0] as
-		| Extract<WebviewInboundMessage, { type: "desktopCommand" }>
-		| undefined;
-	if (message?.type !== "desktopCommand") {
-		throw new Error("Expected a desktop command to be posted");
-	}
-	return message;
-}
-
-describe("HubDesktopClient", () => {
-	it("does not reject pending desktop commands for unrelated hub errors", async () => {
-		const { client, postToHost } = createClient();
-		const pending = client.invoke<{ installedKeys: string[] }>(
-			"list_marketplace_installed_entries",
-		);
-		const command = lastDesktopCommand(postToHost);
-
-		client.handleMessage({
-			data: { type: "error", text: "Failed to restore previous session." },
-		});
-		client.handleMessage({
-			data: {
-				type: "desktopCommandResult",
-				id: command.id,
-				ok: true,
-				result: { installedKeys: ["plugin:goal"] },
-			},
-		});
-
-		await expect(pending).resolves.toEqual({ installedKeys: ["plugin:goal"] });
-	});
-
-	it("rejects pending desktop commands for browser transport failures", async () => {
-		const { client } = createClient();
-		const pending = client.invoke("list_marketplace_installed_entries");
-
-		client.handleMessage({
-			data: { type: "status", text: "Disconnected from the Cline Hub server." },
-		});
-
-		await expect(pending).rejects.toThrow(
-			"Disconnected from the Cline Hub server.",
-		);
-	});
-
-	it("only treats exact browser lifecycle messages as transport failures", () => {
-		expect(
-			isBrowserTransportFailure({
-				type: "error",
-				text: "Failed to connect to the Cline Hub server.",
-			}),
-		).toBe(true);
-		expect(
-			isBrowserTransportFailure({
-				type: "error",
-				text: "Failed to restore previous session.",
-			}),
-		).toBe(false);
-	});
-});

apps/cline-hub/src/webview/src/lib/desktop-client.ts

@@ -1,105 +0,0 @@
-"use client";
-
-import type { WebviewOutboundMessage } from "../../../webview-protocol";
-import { postToHost } from "../vscode";
-
-type PostToHost = typeof postToHost;
-
-type PendingRequest = {
-	command: string;
-	resolve: (value: unknown) => void;
-	reject: (error: Error) => void;
-	timeoutId: ReturnType<typeof setTimeout>;
-};
-
-const REQUEST_TIMEOUT_MS = 120_000;
-const BROWSER_TRANSPORT_FAILURE_MESSAGES = new Set([
-	"Disconnected from the Cline Hub server.",
-	"Failed to connect to the Cline Hub server.",
-	"Received an invalid message from the Cline Hub server.",
-]);
-
-export function isBrowserTransportFailure(
-	message: WebviewOutboundMessage,
-): boolean {
-	if (message.type !== "status" && message.type !== "error") {
-		return false;
-	}
-	return BROWSER_TRANSPORT_FAILURE_MESSAGES.has(message.text);
-}
-
-export class HubDesktopClient {
-	private requestCounter = 0;
-	private readonly pending = new Map<string, PendingRequest>();
-	private readonly postToHost: PostToHost;
-
-	constructor(options: { postToHost?: PostToHost; listen?: boolean } = {}) {
-		this.postToHost = options.postToHost ?? postToHost;
-		if ((options.listen ?? true) && typeof window !== "undefined") {
-			window.addEventListener("message", (event) => {
-				this.handleMessage(event as MessageEvent<WebviewOutboundMessage>);
-			});
-		}
-	}
-
-	handleMessage(event: Pick<MessageEvent<WebviewOutboundMessage>, "data">) {
-		const message = event.data;
-		if (
-			message &&
-			typeof message === "object" &&
-			(message.type === "status" || message.type === "error")
-		) {
-			if (isBrowserTransportFailure(message) && this.pending.size > 0) {
-				const error = new Error(message.text);
-				for (const pending of this.pending.values()) {
-					clearTimeout(pending.timeoutId);
-					pending.reject(error);
-				}
-				this.pending.clear();
-			}
-			return;
-		}
-		if (
-			!message ||
-			typeof message !== "object" ||
-			message.type !== "desktopCommandResult"
-		) {
-			return;
-		}
-
-		const pending = this.pending.get(message.id);
-		if (!pending) {
-			return;
-		}
-		clearTimeout(pending.timeoutId);
-		this.pending.delete(message.id);
-		if (message.ok) {
-			pending.resolve(message.result);
-			return;
-		}
-		pending.reject(new Error(message.error));
-	}
-
-	async invoke<T>(
-		command: string,
-		args?: Record<string, unknown>,
-		options?: { timeoutMs?: number },
-	): Promise<T> {
-		const id = `desktop_${Date.now()}_${this.requestCounter++}`;
-		return await new Promise<T>((resolve, reject) => {
-			const timeoutId = setTimeout(() => {
-				this.pending.delete(id);
-				reject(new Error(`Timed out waiting for desktop command: ${command}`));
-			}, options?.timeoutMs ?? REQUEST_TIMEOUT_MS);
-			this.pending.set(id, {
-				command,
-				resolve: (value) => resolve(value as T),
-				reject,
-				timeoutId,
-			});
-			this.postToHost({ type: "desktopCommand", id, command, args });
-		});
-	}
-}
-
-export const desktopClient = new HubDesktopClient();

apps/cline-hub/src/webview/src/lib/marketplace.ts

@@ -1,194 +0,0 @@
-export type MarketplacePrimitiveType = "mcp" | "skill" | "plugin";
-
-export type MarketplaceTag = {
-	id: string;
-	label: string;
-	count: number;
-};
-
-export type MarketplaceEnvVar = {
-	name: string;
-	required?: boolean;
-	description?: string;
-	url?: string;
-};
-
-export type MarketplaceEntry = {
-	id: string;
-	type: MarketplacePrimitiveType;
-	name: string;
-	featured?: boolean;
-	tagline: string;
-	description: string;
-	tags: string[];
-	install: {
-		args: string[];
-		env?: MarketplaceEnvVar[];
-		notes?: string;
-		command: string;
-	};
-};
-
-export type MarketplaceCatalog = {
-	version: number;
-	generatedAt?: string;
-	baseUrl?: string;
-	counts: {
-		total: number;
-		plugins: number;
-		skills: number;
-		mcps: number;
-	};
-	tags: MarketplaceTag[];
-	entries: MarketplaceEntry[];
-};
-
-const MARKETPLACE_CATALOG_URL = "/api/marketplace/catalog";
-
-const EMPTY_CATALOG: MarketplaceCatalog = {
-	version: 1,
-	counts: {
-		total: 0,
-		plugins: 0,
-		skills: 0,
-		mcps: 0,
-	},
-	tags: [],
-	entries: [],
-};
-
-function isPrimitiveType(value: unknown): value is MarketplacePrimitiveType {
-	return value === "mcp" || value === "skill" || value === "plugin";
-}
-
-function toStringArray(value: unknown): string[] {
-	return Array.isArray(value)
-		? value.filter((item): item is string => typeof item === "string")
-		: [];
-}
-
-function parseCount(value: unknown): number {
-	return typeof value === "number" && Number.isFinite(value) ? value : 0;
-}
-
-function parseEnv(value: unknown): MarketplaceEnvVar[] | undefined {
-	if (!Array.isArray(value)) return undefined;
-	const env = value
-		.map((item): MarketplaceEnvVar | null => {
-			if (!item || typeof item !== "object") return null;
-			const candidate = item as Record<string, unknown>;
-			if (typeof candidate.name !== "string") return null;
-			const parsed: MarketplaceEnvVar = {
-				name: candidate.name,
-			};
-			if (typeof candidate.required === "boolean") {
-				parsed.required = candidate.required;
-			}
-			if (typeof candidate.description === "string") {
-				parsed.description = candidate.description;
-			}
-			if (typeof candidate.url === "string") {
-				parsed.url = candidate.url;
-			}
-			return parsed;
-		})
-		.filter((item): item is MarketplaceEnvVar => item !== null);
-	return env.length > 0 ? env : undefined;
-}
-
-export async function fetchMarketplaceCatalog(): Promise<MarketplaceCatalog> {
-	const response = await fetch(MARKETPLACE_CATALOG_URL, {
-		headers: { Accept: "application/json" },
-	});
-	if (!response.ok) {
-		throw new Error(`Failed to fetch marketplace: ${response.status}`);
-	}
-	const data = await response.json();
-	const baseUrl = typeof data?.baseUrl === "string" ? data.baseUrl : undefined;
-	const rawCounts =
-		typeof data?.counts === "object" && data.counts !== null ? data.counts : {};
-
-	const tags: MarketplaceTag[] = Array.isArray(data?.tags)
-		? data.tags
-				.map((tag: unknown) => {
-					if (!tag || typeof tag !== "object") return null;
-					const candidate = tag as Record<string, unknown>;
-					if (
-						typeof candidate.id !== "string" ||
-						typeof candidate.label !== "string"
-					) {
-						return null;
-					}
-					return {
-						id: candidate.id,
-						label: candidate.label,
-						count: parseCount(candidate.count),
-					};
-				})
-				.filter(
-					(tag: MarketplaceTag | null): tag is MarketplaceTag => tag !== null,
-				)
-		: [];
-
-	const entries: MarketplaceEntry[] = Array.isArray(data?.entries)
-		? data.entries
-				.map((entry: unknown) => {
-					if (!entry || typeof entry !== "object") return null;
-					const candidate = entry as Record<string, unknown>;
-					const install =
-						typeof candidate.install === "object" && candidate.install !== null
-							? (candidate.install as Record<string, unknown>)
-							: {};
-					if (
-						typeof candidate.id !== "string" ||
-						!isPrimitiveType(candidate.type) ||
-						typeof candidate.name !== "string" ||
-						typeof candidate.tagline !== "string" ||
-						typeof candidate.description !== "string" ||
-						typeof install.command !== "string"
-					) {
-						return null;
-					}
-					return {
-						id: candidate.id,
-						type: candidate.type,
-						name: candidate.name,
-						featured:
-							typeof candidate.featured === "boolean"
-								? candidate.featured
-								: undefined,
-						tagline: candidate.tagline,
-						description: candidate.description,
-						tags: toStringArray(candidate.tags),
-						install: {
-							args: toStringArray(install.args),
-							command: install.command,
-							env: parseEnv(install.env),
-							notes:
-								typeof install.notes === "string" ? install.notes : undefined,
-						},
-					};
-				})
-				.filter(
-					(entry: MarketplaceEntry | null): entry is MarketplaceEntry =>
-						entry !== null && entry.install.args.length > 0,
-				)
-		: [];
-
-	return {
-		version: parseCount(data?.version) || EMPTY_CATALOG.version,
-		generatedAt:
-			typeof data?.generatedAt === "string" ? data.generatedAt : undefined,
-		baseUrl,
-		counts: {
-			total: parseCount(rawCounts.total) || entries.length,
-			plugins: parseCount(rawCounts.plugins),
-			skills: parseCount(rawCounts.skills),
-			mcps: parseCount(rawCounts.mcps),
-		},
-		tags,
-		entries,
-	};
-}
-
-export { EMPTY_CATALOG, MARKETPLACE_CATALOG_URL };

apps/cline-hub/src/webview/src/lib/theme.ts

@@ -1,30 +0,0 @@
-export const HUB_THEME_STORAGE_KEY = "cline-hub-theme";
-
-export type HubTheme = "light" | "dark";
-
-export function readStoredHubTheme(): HubTheme | null {
-	const stored = window.localStorage.getItem(HUB_THEME_STORAGE_KEY);
-	return stored === "light" || stored === "dark" ? stored : null;
-}
-
-export function readSystemHubTheme(): HubTheme {
-	const kind = document.body.dataset.vscodeThemeKind;
-	return kind === "vscode-dark" || kind === "vscode-high-contrast"
-		? "dark"
-		: "light";
-}
-
-export function applyHubTheme(theme: HubTheme): HubTheme {
-	document.documentElement.classList.toggle("dark", theme === "dark");
-	document.documentElement.dataset.clineHubTheme = theme;
-	return theme;
-}
-
-export function syncHubTheme(): HubTheme {
-	return applyHubTheme(readStoredHubTheme() ?? readSystemHubTheme());
-}
-
-export function setStoredHubTheme(theme: HubTheme): HubTheme {
-	window.localStorage.setItem(HUB_THEME_STORAGE_KEY, theme);
-	return applyHubTheme(theme);
-}

apps/cline-hub/src/webview/vite.config.ts

@@ -1,58 +0,0 @@
-import path from "node:path";
-import tailwindcss from "@tailwindcss/vite";
-import react from "@vitejs/plugin-react-swc";
-import { defineConfig } from "vite";
-
-const mermaidChunkGroups = [
-	{
-		name: "mermaid-parser",
-		maxSize: 450_000,
-		test: /node_modules[\\/](?:\.bun[\\/])?@mermaid-js[+]parser/,
-	},
-	{
-		name: "mermaid-langium",
-		test: /node_modules[\\/](?:\.bun[\\/])?langium/,
-	},
-	{
-		name: "mermaid-layout",
-		maxSize: 450_000,
-		test: /node_modules[\\/](?:\.bun[\\/])?(?:cytoscape|cytoscape-cose-bilkent|dagre|elkjs)/,
-	},
-	{
-		name: "mermaid-markup",
-		test: /node_modules[\\/](?:\.bun[\\/])?(?:katex|dompurify)/,
-	},
-];
-
-export default defineConfig({
-	plugins: [react(), tailwindcss()],
-	resolve: {
-		alias: {
-			"@": path.resolve(__dirname, "./src"),
-		},
-		dedupe: ["react", "react-dom"],
-	},
-	base: "./",
-	server: {
-		cors: true,
-		headers: {
-			"Access-Control-Allow-Origin": "*",
-		},
-		hmr: {
-			host: "localhost",
-		},
-	},
-	build: {
-		outDir: "../../dist/webview",
-		emptyOutDir: true,
-		cssMinify: "esbuild",
-		chunkSizeWarningLimit: 600,
-		rolldownOptions: {
-			output: {
-				codeSplitting: {
-					groups: mermaidChunkGroups,
-				},
-			},
-		},
-	},
-});

apps/cline-hub/tsconfig.json

@@ -1,21 +0,0 @@
-{
-	"extends": "../../sdk/packages/tsconfig.base.json",
-	"compilerOptions": {
-		"noEmit": true,
-		"types": ["bun", "node"],
-		"paths": {
-			"@cline/core": ["../../sdk/packages/core/src/index.ts"],
-			"@cline/core/*": [
-				"../../sdk/packages/core/src/*",
-				"../../sdk/packages/core/src/*/index.ts"
-			],
-			"@cline/shared": ["../../sdk/packages/shared/src/index.ts"],
-			"@cline/shared/*": [
-				"../../sdk/packages/shared/src/*",
-				"../../sdk/packages/shared/src/*/index.ts"
-			]
-		}
-	},
-	"include": ["src/**/*.ts"],
-	"exclude": ["src/webview/**"]
-}

apps/cline-hub/vitest.config.ts

@@ -1,33 +0,0 @@
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { defineConfig } from "vitest/config";
-
-const rootDir = dirname(fileURLToPath(import.meta.url));
-
-export default defineConfig({
-	root: rootDir,
-	resolve: {
-		alias: [
-			{
-				find: /^@cline\/core$/,
-				replacement: resolve(rootDir, "../../sdk/packages/core/src/index.ts"),
-			},
-			{
-				find: /^@cline\/core\/(.+)$/,
-				replacement: resolve(rootDir, "../../sdk/packages/core/src/$1"),
-			},
-			{
-				find: /^@cline\/shared$/,
-				replacement: resolve(rootDir, "../../sdk/packages/shared/src/index.ts"),
-			},
-			{
-				find: /^@cline\/shared\/(.+)$/,
-				replacement: resolve(rootDir, "../../sdk/packages/shared/src/$1"),
-			},
-		],
-	},
-	test: {
-		environment: "node",
-		include: ["src/**/*.test.ts"],
-	},
-});

apps/examples/desktop-app/tsconfig.dev.json

@@ -1,23 +0,0 @@
-{
-	"extends": "./tsconfig.json",
-	"compilerOptions": {
-		"paths": {
-			"@/*": ["./*"],
-			"@cline/agents": ["../../../sdk/packages/agents/src/index.ts"],
-			"@cline/core": ["../../../sdk/packages/core/src/index.ts"],
-			"@cline/core/hub": ["../../../sdk/packages/core/src/hub/index.ts"],
-			"@cline/llms": ["../../../sdk/packages/llms/src/index.ts"],
-			"@cline/shared": ["../../../sdk/packages/shared/src/index.ts"],
-			"@cline/shared/storage": [
-				"../../../sdk/packages/shared/src/storage/index.ts"
-			],
-			"@cline/shared/db": ["../../../sdk/packages/shared/src/db/index.ts"],
-			"@cline/shared/*": [
-				"../../../sdk/packages/shared/src/*",
-				"../../../sdk/packages/shared/src/*/index.ts"
-			]
-		}
-	},
-	"include": ["sidecar/**/*.ts", "scripts/**/*.ts", "global.d.ts", "bun.mts"],
-	"exclude": ["node_modules", "webview"]
-}

apps/examples/desktop-app/webview/tsconfig.json

@@ -1,28 +0,0 @@
-{
-	"extends": "../tsconfig.json",
-	"compilerOptions": {
-		"paths": {
-			"@/*": ["./*"],
-			"@cline/agents": ["../../../../sdk/packages/agents/src/index.ts"],
-			"@cline/core": ["../../../../sdk/packages/core/src/index.ts"],
-			"@cline/llms": ["../../../../sdk/packages/llms/src/index.ts"],
-			"@cline/shared": ["../../../../sdk/packages/shared/src/index.ts"],
-			"@cline/shared/storage": [
-				"../../../../sdk/packages/shared/src/storage/index.ts"
-			],
-			"@cline/shared/db": ["../../../../sdk/packages/shared/src/db/index.ts"],
-			"@cline/shared/*": [
-				"../../../../sdk/packages/shared/src/*",
-				"../../../../sdk/packages/shared/src/*/index.ts"
-			]
-		}
-	},
-	"include": [
-		"next-env.d.ts",
-		"**/*.ts",
-		"**/*.tsx",
-		".next/types/**/*.ts",
-		".next/dev/types/**/*.ts"
-	],
-	"exclude": ["node_modules"]
-}

apps/examples/menubar/tsconfig.json

@@ -1,35 +0,0 @@
-{
-	"extends": "../../../sdk/packages/tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "dist",
-		"module": "ESNext",
-		"moduleResolution": "Bundler",
-		"target": "ESNext",
-		"paths": {
-			"@cline/agents": ["../../../sdk/packages/agents/src/index.ts"],
-			"@cline/agents/*": [
-				"../../../sdk/packages/agents/src/*",
-				"../../../sdk/packages/agents/src/*/index.ts"
-			],
-			"@cline/core": ["../../../sdk/packages/core/src/index.ts"],
-			"@cline/core/hub/daemon-entry": [
-				"../../../sdk/packages/core/src/hub/daemon/entry.ts"
-			],
-			"@cline/core/*": [
-				"../../../sdk/packages/core/src/*",
-				"../../../sdk/packages/core/src/*/index.ts"
-			],
-			"@cline/llms": ["../../../sdk/packages/llms/src/index.ts"],
-			"@cline/shared": ["../../../sdk/packages/shared/src/index.ts"],
-			"@cline/shared/storage": [
-				"../../../sdk/packages/shared/src/storage/index.ts"
-			],
-			"@cline/shared/db": ["../../../sdk/packages/shared/src/db/index.ts"],
-			"@cline/shared/*": [
-				"../../../sdk/packages/shared/src/*",
-				"../../../sdk/packages/shared/src/*/index.ts"
-			]
-		}
-	},
-	"include": ["sidecar/**/*.ts"]
-}

apps/tsconfig.apps.json

@@ -1,31 +0,0 @@
-{
-	"compilerOptions": {
-		"paths": {
-			"@cline/agents": ["../sdk/packages/agents/src/index.ts"],
-			"@cline/agents/*": [
-				"../sdk/packages/agents/src/*",
-				"../sdk/packages/agents/src/*/index.ts"
-			],
-			"@cline/cline-hub": ["./cline-hub/src/server.ts"],
-			"@cline/core": ["../sdk/packages/core/src/index.ts"],
-			"@cline/core/hub/daemon-entry": [
-				"../sdk/packages/core/src/hub/daemon/entry.ts"
-			],
-			"@cline/core/*": [
-				"../sdk/packages/core/src/*",
-				"../sdk/packages/core/src/*/index.ts"
-			],
-			"@cline/core/telemetry": [
-				"../sdk/packages/core/src/services/telemetry/index.ts"
-			],
-			"@cline/llms": ["../sdk/packages/llms/src/index.ts"],
-			"@cline/shared": ["../sdk/packages/shared/src/index.ts"],
-			"@cline/shared/storage": ["../sdk/packages/shared/src/storage/index.ts"],
-			"@cline/shared/db": ["../sdk/packages/shared/src/db/index.ts"],
-			"@cline/shared/*": [
-				"../sdk/packages/shared/src/*",
-				"../sdk/packages/shared/src/*/index.ts"
-			]
-		}
-	}
-}

apps/vscode/.mocharc.json

@@ -0,0 +1,16 @@
+{
+	"extension": [
+		"ts"
+	],
+	"spec": [
+		"src/**/__tests__/*.ts",
+		"src/test/services/**/*.test.ts"
+	],
+	"require": [
+		"ts-node/register",
+		"source-map-support/register",
+		"./src/test/requires.ts"
+	],
+	"recursive": true,
+	"exit": true
+}

apps/vscode/.nycrc.unit.json

@@ -0,0 +1,48 @@
+{
+	"all": true,
+	"check-coverage": false,
+	"reporter": [
+		"text",
+		"lcov"
+	],
+	"include": [
+		"src/**/*.ts"
+	],
+	"exclude": [
+		"**/*.d.ts",
+
+		"**/*.{test,spec}.{js,jsx,ts,tsx,mjs,cjs}",
+		"**/__tests__/**",
+		"**/test/**",
+		"**/tests/**",
+		"**/.nyc_output/**",
+		"**/.vscode-test/**",
+		"**/tests-results/**",
+		"src/test/**",
+
+		"src/generated/**",
+
+		"**/node_modules/**",
+		"**/dist/**",
+		"**/out/**",
+		"**/build/**",
+		"**/coverage/**",
+		"**/coverage-unit/**",
+		"**/proto/**",
+
+		"**/*.{config,setup}.{js,ts,mjs,cjs}",
+		"**/vite-env.d.ts",
+
+		"**/*.{css,scss,sass,less,styl}",
+		"**/*.{svg,png,jpg,jpeg,gif,ico}",
+		"**/*.{json,yaml,yml}"
+	],
+	"extension": [
+		".ts",
+		".js"
+	],
+	"cache": true,
+	"sourceMap": true,
+	"instrument": true,
+	"report-dir": "./coverage-unit"
+}

apps/vscode/.vscode-test.mjs

@@ -1,20 +1,9 @@
 import { defineConfig } from "@vscode/test-cli"
 import path from "path"
-
 const vscodeTestVersion = process.env.VSCODE_TEST_VERSION ?? "stable"
 
 export default defineConfig({
-	files: [
-		"out/src/{core,test,utils,shared,integrations,hosts,services}/**/*.test.js",
-		"src/{core,test,utils,shared,integrations,hosts,services}/**/*.test.js",
-		// The bun unit suite (src/**/__tests__/* and src/test/services/**) runs under
-		// `bun test` (run-bun-unit-tests.ts) and imports `bun:test`, which this
-		// Node-based runner cannot load. Exclude it here.
-		"!out/src/**/__tests__/**/*.test.js",
-		"!out/src/test/services/**/*.test.js",
-		"!src/**/__tests__/**/*.test.js",
-		"!src/test/services/**/*.test.js",
-	],
+	files: "{out/**/*.test.js,src/**/*.test.js,!src/test/e2e/**/*.test.js,!out/src/test/e2e/**/*.test.js}",
 	mocha: {
 		ui: "bdd",
 		timeout: 20000, // Maximum time (in ms) that a test can run before failing

apps/vscode/.vscodeignore

@@ -5,31 +5,13 @@
 # Agent tooling, never shipped in the VSIX
 .agents/**
 .claude/**
-.cline/**
 .codex/**
 CLAUDE.local.md
 out/
 dist-standalone/
 node_modules/
-# Nested workspace-member node_modules (bun links these under each package).
-# Scoped to the sub-package dirs so it doesn't shadow the top-level
-# node_modules/@vscode/codicons re-include below.
-webview-ui/node_modules/**
-testing-platform/node_modules/**
-standalone/**/node_modules/**
 src/**
 standalone/**
-# Build/dev tooling and inputs — bundled into dist/extension.js, not needed in the VSIX.
-bunfig.toml
-esbuild.mjs
-knip.json
-biome.jsonc
-test-setup.js
-.env.example
-scripts/**
-proto/**
-testing-platform/**
-tests/**
 .gitignore
 .yarnrc
 esbuild.js
@@ -52,7 +34,6 @@ sdk/**
 # only exists if a publish aborts mid-swap; neither should ship in the .vsix.
 README.marketplace.md
 .README.github.bak
-package.json.backup
 
 # Custom
 **/demo.gif
@@ -65,6 +46,7 @@ eslint-rules/
 old_docs/
 evals/
 .codespellrc
+.mocharc.json
 buf.yaml
 .clinerules/
 
@@ -96,9 +78,6 @@ old_docs/**
 e2e-build.mjs
 e2e.vsix
 test-results/
-coverage/**
-webview-ui/coverage/**
-webview-ui/.vite-port
 
 # Ignore Storybook files
 **/*.stories.tsx

apps/vscode/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2026 Cline Bot Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

apps/vscode/README.marketplace.md

@@ -1,3 +1,7 @@
+<div align="center"><sub>
+English | <a href="https://github.com/cline/cline/blob/main/locales/es/README.md" target="_blank">Español</a> | <a href="https://github.com/cline/cline/blob/main/locales/de/README.md" target="_blank">Deutsch</a> | <a href="https://github.com/cline/cline/blob/main/locales/ja/README.md" target="_blank">日本語</a> | <a href="https://github.com/cline/cline/blob/main/locales/zh-cn/README.md" target="_blank">简体中文</a> | <a href="https://github.com/cline/cline/blob/main/locales/zh-tw/README.md" target="_blank">繁體中文</a> | <a href="https://github.com/cline/cline/blob/main/locales/ko/README.md" target="_blank">한국어</a>
+</sub></div>
+
 # Cline
 <div align="center">
 <table>

apps/vscode/biome.jsonc

@@ -1,11 +1,6 @@
 {
-	"root": true,
+	"root": false,
 	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
-	"vcs": {
-		"enabled": true,
-		"clientKind": "git",
-		"defaultBranch": "main"
-	},
 	"assist": {
 		"enabled": true,
 		"actions": {
@@ -55,8 +50,8 @@
 				"useEnumInitializers": "off",
 				"useSelfClosingElements": "info",
 				"useSingleVarDeclarator": "off",
-				"useNumberNamespace": "off",
-				"noInferrableTypes": "off",
+				"useNumberNamespace": "info",
+				"noInferrableTypes": "info",
 				"useTemplate": "info",
 				"noUselessElse": "info"
 			},
@@ -127,15 +122,12 @@
 			"!!**/out",
 			"!!**/evals",
 			"!!**/playwright",
-			"!!**/.vscode-test",
 			"!!**/test-results",
-			"!!**/coverage",
 			"!!**/node_modules",
 			"!!**/webview-ui/build",
 			"!!**/generated",
 			"!!**/proto",
-			"!!**/tests/specs",
-			"!!assets/icons/*.svg"
+			"!!**/tests/specs"
 		]
 	},
 	"plugins": [

apps/vscode/bunfig.toml

@@ -1,7 +0,0 @@
-[test]
-# Module-substitution aliases for `bun test`. bun resolves tsconfig `paths`
-# (@/*, @core/*, @shared/*, …) and the real @cline/llms + @cline/shared dist
-# builds on its own; the preload only shadows `vscode` and `@cline/core` with
-# their unit-test stubs (mirrors vitest.config.ts resolve.alias). See
-# src/test/bun-test-preload.ts for details.
-preload = ["./src/test/bun-test-preload.ts"]

apps/vscode/esbuild.mjs

@@ -85,6 +85,44 @@ const esbuildProblemMatcherPlugin = {
 	},
 }
 
+const copyWasmFiles = {
+	name: "copy-wasm-files",
+	setup(build) {
+		build.onEnd(() => {
+			// tree sitter
+			const sourceDir = path.join(__dirname, "node_modules", "web-tree-sitter")
+			const targetDir = path.join(__dirname, destDir)
+
+			// Copy tree-sitter.wasm
+			fs.copyFileSync(path.join(sourceDir, "tree-sitter.wasm"), path.join(targetDir, "tree-sitter.wasm"))
+
+			// Copy language-specific WASM files
+			const languageWasmDir = path.join(__dirname, "node_modules", "tree-sitter-wasms", "out")
+			const languages = [
+				"typescript",
+				"tsx",
+				"python",
+				"rust",
+				"javascript",
+				"go",
+				"cpp",
+				"c",
+				"c_sharp",
+				"ruby",
+				"java",
+				"php",
+				"swift",
+				"kotlin",
+			]
+
+			languages.forEach((lang) => {
+				const filename = `tree-sitter-${lang}.wasm`
+				fs.copyFileSync(path.join(languageWasmDir, filename), path.join(targetDir, filename))
+			})
+		})
+	},
+}
+
 const buildEnvVars = {
 	"import.meta.url": "_importMetaUrl",
 	"process.env.IS_STANDALONE": JSON.stringify(standalone ? "true" : "false"),
@@ -138,6 +176,7 @@ const baseConfig = {
 	define: buildEnvVars,
 	tsconfig: path.resolve(__dirname, "tsconfig.json"),
 	plugins: [
+		copyWasmFiles,
 		aliasResolverPlugin,
 		/* add to the end of plugins array */
 		esbuildProblemMatcherPlugin,

apps/vscode/knip.json

@@ -1,34 +1,23 @@
 {
-	"$schema": "https://unpkg.com/knip@5/schema.json",
-	"workspaces": {
-		".": {
-			"entry": [
-				"src/extension.ts",
-				"src/standalone/cline-core.ts",
-				"src/generated/hosts/standalone/protobus-server-setup.ts",
-				"src/generated/hosts/standalone/host-bridge-clients.ts",
-				"src/generated/hosts/vscode/protobus-services.ts",
-				"src/generated/hosts/vscode/hostbridge-grpc-service-config.ts",
-				"src/**/*.test.ts",
-				"src/**/__tests__/**/*.ts",
-				"src/test/**/*.ts"
-			],
-			"project": [
-				"src/**/*.ts"
-			]
-		},
-		"webview-ui": {
-			"entry": [
-				"src/services/grpc-client.ts",
-				"src/**/*.test.{ts,tsx}",
-				"src/**/*.spec.{ts,tsx}",
-				"src/**/__tests__/**/*.{ts,tsx}"
-			],
-			"project": [
-				"src/**/*.{ts,tsx}",
-				"*.ts"
-			],
-			"vite": true
-		}
-	}
+	"entry": [
+		"src/extension.ts",
+		"src/standalone/cline-core.ts",
+		"src/generated/hosts/standalone/protobus-server-setup.ts",
+		"src/generated/hosts/standalone/host-bridge-clients.ts",
+		"src/generated/hosts/vscode/protobus-services.ts",
+		"src/generated/hosts/vscode/hostbridge-grpc-service-config.ts"
+	],
+	"project": [
+		"src/**/*.ts"
+	],
+	"ignore": [
+		"out/**",
+		"node_modules/**",
+		"*.d.ts",
+		"**/*.test.ts",
+		"**/__tests__",
+		"src/test/**",
+		"src/shared/**"
+	],
+	"vite": true
 }

apps/vscode/package.json

@@ -2,8 +2,11 @@
 	"name": "claude-dev",
 	"displayName": "Cline",
 	"description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.",
-	"version": "4.0.0",
+	"version": "3.86.2",
 	"icon": "assets/icons/icon.png",
+	"workspaces": [
+		"."
+	],
 	"engines": {
 		"vscode": "^1.84.0"
 	},
@@ -42,7 +45,8 @@
 	"activationEvents": [
 		"onLanguage",
 		"onUri",
-		"onStartupFinished"
+		"onStartupFinished",
+		"workspaceContains:evals.env"
 	],
 	"main": "./dist/extension.js",
 	"contributes": {
@@ -88,7 +92,7 @@
 					{
 						"id": "mcp",
 						"title": "Extend with Powerful Tools (MCP)",
-						"description": "Connect to databases, APIs, and other external tools through MCP.",
+						"description": "Connect to databases, APIs, or discover new capabilities in the MCP Marketplace.",
 						"media": {
 							"markdown": "walkthrough/step4.md"
 						}
@@ -137,11 +141,6 @@
 				"title": "MCP Servers",
 				"icon": "$(server)"
 			},
-			{
-				"command": "cline.marketplaceButtonClicked",
-				"title": "Customize",
-				"icon": "$(wrench)"
-			},
 			{
 				"command": "cline.historyButtonClicked",
 				"title": "History",
@@ -233,9 +232,26 @@
 				"command": "cline.reconstructTaskHistory",
 				"title": "Reconstruct Task History",
 				"category": "Cline"
+			},
+			{
+				"command": "cline.reviewComment.reply",
+				"title": "Reply",
+				"category": "Cline",
+				"enablement": "!commentIsEmpty"
+			},
+			{
+				"command": "cline.reviewComment.addToChat",
+				"title": "Add to Cline Chat",
+				"category": "Cline",
+				"icon": "$(link-external)"
 			}
 		],
 		"keybindings": [
+			{
+				"command": "editor.action.submitComment",
+				"key": "enter",
+				"when": "commentEditorFocused && commentController == cline-ai-review && !commentIsEmpty"
+			},
 			{
 				"command": "cline.addToChat",
 				"key": "cmd+'",
@@ -265,7 +281,7 @@
 					"when": "view == claude-dev.SidebarProvider"
 				},
 				{
-					"command": "cline.marketplaceButtonClicked",
+					"command": "cline.mcpButtonClicked",
 					"group": "navigation@2",
 					"when": "view == claude-dev.SidebarProvider"
 				},
@@ -337,6 +353,24 @@
 				{
 					"command": "cline.abortGitCommitMessage",
 					"when": "config.git.enabled && cline.isGeneratingCommit"
+				},
+				{
+					"command": "cline.reviewComment.reply",
+					"when": "false"
+				}
+			],
+			"comments/commentThread/context": [
+				{
+					"command": "cline.reviewComment.reply",
+					"group": "inline",
+					"when": "commentController == cline-ai-review"
+				}
+			],
+			"comments/commentThread/title": [
+				{
+					"command": "cline.reviewComment.addToChat",
+					"group": "inline",
+					"when": "commentController == cline-ai-review"
 				}
 			]
 		},
@@ -346,74 +380,66 @@
 		}
 	},
 	"scripts": {
-		"vscode:prepublish": "bun run package",
-		"compile": "bun run check-types && bun run lint && bun esbuild.mjs",
-		"compile-standalone": "bun run check-types && bun run lint && bun esbuild.mjs --standalone",
+		"vscode:prepublish": "npm run package",
+		"compile": "npm run check-types && npm run lint && node esbuild.mjs",
+		"compile-standalone": "npm run check-types && npm run lint && node esbuild.mjs --standalone",
 		"postcompile-standalone": "node scripts/package-standalone.mjs",
-		"dev": "bun run protos && bun run watch",
-		"watch": "bun run --parallel watch:esbuild watch:tsc",
-		"watch:esbuild": "bun esbuild.mjs --watch",
+		"dev": "npm run protos && npm run watch",
+		"watch": "npx npm-run-all -p watch:*",
+		"watch:esbuild": "node esbuild.mjs --watch",
 		"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
-		"package": "bun run check-types && bun run build:webview && bun run lint && bun esbuild.mjs --production",
+		"package": "npm run check-types && npm run build:webview && npm run lint && node esbuild.mjs --production",
 		"protos": "node scripts/build-proto.mjs",
 		"protos-python": "node scripts/build-python-proto.mjs",
 		"download-ripgrep": "node scripts/download-ripgrep.mjs",
-		"postprotos": "biome format --config-path ./biome.jsonc src/shared/proto src/core/controller src/hosts/ webview-ui/src/services src/generated --write --no-errors-on-unmatched",
+		"postprotos": "biome format src/shared/proto src/core/controller src/hosts/ webview-ui/src/services src/generated --write --no-errors-on-unmatched",
 		"clean:build": "rimraf dist dist-standalone webview-ui/build src/generated out/",
 		"clean:deps": "rimraf node_modules webview-ui/node_modules",
-		"clean:all": "bun run clean:build && bun run clean:deps",
+		"clean:all": "npm run clean:build && npm run clean:deps",
 		"compile-tests": "node ./scripts/build-tests.js",
 		"watch-tests": "tsc -p . -w --outDir out",
-		"check-types": "bun run protos && bunx tsc --noEmit && cd webview-ui && bunx tsc --noEmit",
-		"lint": "biome lint --config-path ./biome.jsonc --no-errors-on-unmatched --files-ignore-unknown=true --diagnostic-level=error && bun run lint:proto",
+		"check-types": "npm run protos && npx tsc --noEmit && cd webview-ui && npx tsc --noEmit",
+		"lint": "biome lint --no-errors-on-unmatched --files-ignore-unknown=true --diagnostic-level=error && npm run lint:proto",
 		"lint:proto": "bash ./scripts/proto-lint.sh",
-		"analyze:unused": "bunx --yes knip --config knip.json --include files,exports,types,enumMembers,duplicates",
-		"analyze:unused:prod": "bunx --yes knip --config knip.json --production --include files,exports,types,enumMembers,dependencies",
-		"analyze:unused:fix-exports": "node scripts/remove-unused-exports.mjs --apply",
-		"analyze:unused:fix-exports:dry": "node scripts/remove-unused-exports.mjs",
-		"format": "biome format --config-path ./biome.jsonc --changed --since main --no-errors-on-unmatched --files-ignore-unknown=true --diagnostic-level=error --semicolons=as-needed",
-		"format:fix": "biome check --config-path ./biome.jsonc --changed --since main --no-errors-on-unmatched --files-ignore-unknown=true --write --semicolons=as-needed",
-		"fix:all": "biome check --config-path ./biome.jsonc --no-errors-on-unmatched --files-ignore-unknown=true --write --diagnostic-level=error --unsafe --semicolons=as-needed",
-		"ci:check-all": "bun run --parallel check-types lint format",
-		"ci:build": "bun run protos && bun run build:webview && bun esbuild.mjs && bun run compile-tests",
-		"pretest": "bun run compile && bun run compile-tests && bun run compile-standalone && bun run lint",
-		"test": "bun run test:unit && bun run test:integration",
-		"test:integration": "bun run compile-tests && vscode-test",
-		"test:unit": "bun scripts/run-bun-unit-tests.ts",
-		"test:vitest": "vitest run --config vitest.config.ts",
-		"test:vitest:watch": "vitest --config vitest.config.ts",
-		"test:bun": "bun scripts/run-bun-tests.ts",
-		"test:bun:unit": "bun scripts/run-bun-unit-tests.ts",
-		"test:coverage": "bun run compile-tests && vscode-test --coverage",
-		"test:sca-server": "bun --watch scripts/test-standalone-core-api-server.ts",
-		"test:tp-orchestrator": "bun scripts/testing-platform-orchestrator.ts",
-		"dev:mcp-oauth-test-server": "bun src/dev/mcp-oauth-test-server/server.ts",
+		"format": "biome format --changed --no-errors-on-unmatched --files-ignore-unknown=true --diagnostic-level=error",
+		"format:fix": "biome check --changed --no-errors-on-unmatched --files-ignore-unknown=true --write",
+		"fix:all": "biome check --no-errors-on-unmatched --files-ignore-unknown=true --write --diagnostic-level=error --unsafe",
+		"ci:check-all": "npx npm-run-all -p check-types lint format",
+		"ci:build": "npm run protos && npm run build:webview && node esbuild.mjs && npm run compile-tests",
+		"pretest": "npm run compile && npm run compile-tests && npm run compile-standalone && npm run lint",
+		"test": "npx npm-run-all test:unit test:integration",
+		"test:integration": "vscode-test",
+		"test:unit": "cross-env TS_NODE_PROJECT=./tsconfig.unit-test.json mocha",
+		"test:coverage": "vscode-test --coverage",
+		"test:sca-server": "npx tsx watch scripts/test-standalone-core-api-server.ts",
+		"test:tp-orchestrator": "npx tsx scripts/testing-platform-orchestrator.ts",
 		"e2e": "playwright test -c playwright.config.ts",
-		"test:e2e:build": "vsce package --no-dependencies --allow-package-secrets sendgrid --out dist/e2e.vsix",
-		"test:e2e": "playwright install && bun run test:e2e:build && node src/test/e2e/utils/build.mjs && playwright test",
-		"test:e2e:optimal": "bun run test:e2e:build && node src/test/e2e/utils/build.mjs && playwright test",
-		"test:e2e:ui": "bun scripts/interactive-playwright.ts",
-		"install:all": "bun install",
-		"dev:webview": "cd webview-ui && bun run dev",
-		"build:webview": "bun run protos && cd webview-ui && bun run build",
-		"test:webview": "cd webview-ui && bun run test",
+		"test:e2e:build": "vsce package --allow-package-secrets sendgrid --out dist/e2e.vsix",
+		"test:e2e": "playwright install && npm run test:e2e:build && node src/test/e2e/utils/build.mjs && playwright test",
+		"test:e2e:optimal": "npm run test:e2e:build && node src/test/e2e/utils/build.mjs && playwright test",
+		"test:e2e:ui": "npx tsx scripts/interactive-playwright.ts",
+		"install:all": "npm install && cd webview-ui && npm install",
+		"dev:webview": "cd webview-ui && npm run dev",
+		"build:webview": "cd webview-ui && npm run build",
+		"test:webview": "cd webview-ui && npm run test",
 		"publish:marketplace": "node scripts/publish-marketplace.mjs",
 		"publish:marketplace:prerelease": "node scripts/publish-marketplace.mjs --pre-release",
 		"publish:marketplace:nightly": "node ./scripts/publish-nightly.mjs",
-		"docs": "cd docs && bun run dev",
-		"docs:check-links": "cd docs && bun run check",
-		"docs:rename-file": "cd docs && bun run rename",
+		"prepare": "npx husky",
+		"docs": "cd docs && npm run dev",
+		"docs:check-links": "cd docs && npm run check",
+		"docs:rename-file": "cd docs && npm run rename",
 		"report-issue": "node scripts/report-issue.js",
-		"storybook": "cd webview-ui && bun run storybook",
-		"eval:smoke:run": "bun evals/smoke-tests/run-smoke-tests.ts"
+		"storybook": "cd webview-ui && npm run storybook",
+		"eval:smoke:run": "npx tsx evals/smoke-tests/run-smoke-tests.ts"
 	},
 	"lint-staged": {
 		"src/shared/storage/state-keys.ts": [
 			"node scripts/generate-state-proto.mjs",
-			"git add apps/vscode/proto/cline/state.proto"
+			"git add proto/cline/state.proto"
 		],
 		"*": [
-			"biome check --write --staged --no-errors-on-unmatched --files-ignore-unknown=true --semicolons=as-needed"
+			"biome check --write --staged --no-errors-on-unmatched --files-ignore-unknown=true"
 		]
 	},
 	"devDependencies": {
@@ -429,6 +455,7 @@
 		"@types/node": "20.x",
 		"@types/pdf-parse": "^1.1.4",
 		"@types/picomatch": "^4.0.2",
+		"@types/proxyquire": "^1.3.31",
 		"@types/shell-quote": "^1.7.5",
 		"@types/should": "^11.2.0",
 		"@types/sinon": "^21.0.0",
@@ -440,41 +467,42 @@
 		"c8": "^10.1.3",
 		"chai": "^4.3.10",
 		"chalk": "5.6.2",
+		"cross-env": "^10.1.0",
 		"dotenv": "^17.2.3",
 		"esbuild": "^0.25.0",
-		"glob": "^11.0.0",
 		"grpc-tools": "^1.13.0",
+		"husky": "^9.1.7",
 		"lint-staged": "^16.1.0",
 		"minimatch": "^3.0.3",
-		"minimist": "^1.2.8",
-		"mocha": "^11.7.4",
-		"playwright": "^1.55.1",
+		"npm-run-all": "^4.1.5",
+		"nyc": "^17.1.0",
 		"prebuild-install": "^7.1.3",
 		"protoc-gen-ts": "^0.8.7",
+		"proxyquire": "^2.1.3",
 		"rimraf": "^6.0.1",
 		"should": "^13.2.3",
 		"sinon": "^21.0.3",
-		"tar": "^7.5.2",
 		"tree-kill": "^1.2.2",
+		"ts-node": "^10.9.2",
 		"ts-proto": "^2.6.1",
 		"tsconfig-paths": "^4.2.0",
-		"typescript": "^5.4.5",
-		"vitest": "^4.0.17"
+		"typescript": "^5.4.5"
 	},
 	"dependencies": {
 		"@anthropic-ai/sdk": "^0.37.0",
+		"@anthropic-ai/vertex-sdk": "^0.6.4",
+		"@aws-sdk/client-bedrock-runtime": "^3.922.0",
+		"@aws-sdk/credential-providers": "^3.922.0",
+		"@azure/identity": "^4.13.0",
 		"@bufbuild/protobuf": "^2.2.5",
-		"@cline/agents": "workspace:*",
-		"@cline/core": "workspace:*",
-		"@cline/llms": "workspace:*",
-		"@cline/shared": "workspace:*",
+		"@cerebras/cerebras_cloud_sdk": "^1.35.0",
+		"@google-cloud/vertexai": "^1.9.3",
 		"@google/genai": "^1.30.0",
 		"@grpc/grpc-js": "^1.9.15",
-		"@grpc/proto-loader": "^0.7.13",
 		"@grpc/reflection": "^1.0.4",
+		"@mistralai/mistralai": "^1.5.0",
 		"@modelcontextprotocol/sdk": "^1.25.1",
 		"@opentelemetry/api": "^1.9.0",
-		"@opentelemetry/api-logs": "^0.56.0",
 		"@opentelemetry/core": "^2.1.0",
 		"@opentelemetry/exporter-logs-otlp-grpc": "^0.56.0",
 		"@opentelemetry/exporter-logs-otlp-http": "^0.56.0",
@@ -494,6 +522,9 @@
 		"@opentelemetry/sdk-trace-node": "^1.30.1",
 		"@opentelemetry/semantic-conventions": "^1.37.0",
 		"@playwright/test": "^1.55.1",
+		"@sap-ai-sdk/ai-api": "^2.7.0",
+		"@sap-ai-sdk/orchestration": "^2.7.0",
+		"@sap-cloud-sdk/connectivity": "^4.6.0",
 		"@streamparser/json": "^0.0.22",
 		"@tailwindcss/vite": "^4.1.14",
 		"@types/uuid": "^10.0.0",
@@ -519,15 +550,13 @@
 		"ignore": "^7.0.3",
 		"image-size": "^2.0.2",
 		"isbinaryfile": "^5.0.2",
-		"js-yaml": "^4.1.1",
 		"jschardet": "^3.1.4",
 		"json5": "^2.2.3",
-		"jwt-decode": "^4.0.0",
 		"mammoth": "^1.11.0",
 		"nanoid": "^5.1.6",
 		"nice-grpc": "^2.1.12",
-		"nice-grpc-common": "^2.0.3",
 		"node-machine-id": "^1.1.12",
+		"ollama": "^0.5.13",
 		"open": "^10.1.2",
 		"open-graph-scraper": "^6.9.0",
 		"openai": "^6.21.0",
@@ -546,13 +575,24 @@
 		"simple-git": "3.36.0",
 		"strip-ansi": "^7.1.2",
 		"tailwindcss": "^4.1.14",
+		"tree-sitter-wasms": "^0.1.11",
 		"ts-morph": "^25.0.1",
 		"turndown": "^7.2.0",
 		"ulid": "^2.4.0",
 		"undici": "^7.26.0",
 		"uuid": "^11.1.0",
 		"vscode-uri": "^3.1.0",
-		"zod": "^4.3.6"
+		"web-tree-sitter": "^0.22.6",
+		"zod": "^3.24.2"
+	},
+	"overrides": {
+		"tar-fs": ">=3.1.1",
+		"tar": "^7.5.2",
+		"vite": "^7.1.11",
+		"js-yaml": "^4.1.1",
+		"serialize-javascript": ">=7.0.3",
+		"protobufjs": "7.5.8",
+		"diff": "8.0.4"
 	},
 	"c8": {
 		"reporter": [

apps/vscode/proto/cline/checkpoints.proto

@@ -3,13 +3,17 @@ syntax = "proto3";
 package cline;
 
 import "cline/common.proto";
+import "google/protobuf/timestamp.proto";
 
 option go_package = "github.com/cline/grpc-go/cline";
 option java_multiple_files = true;
 option java_package = "bot.cline.proto";
 
 service CheckpointsService {
+  rpc checkpointDiff(Int64Request) returns (Empty);
   rpc checkpointRestore(CheckpointRestoreRequest) returns (Empty);
+  rpc subscribeToCheckpoints(CheckpointSubscriptionRequest) returns (stream CheckpointEvent);
+  rpc getCwdHash(StringArrayRequest) returns (PathHashMap);
 }
 
 message CheckpointRestoreRequest {
@@ -18,3 +22,26 @@ message CheckpointRestoreRequest {
   string restore_type = 3;
   optional int64 offset = 4;
 }
+
+message CheckpointSubscriptionRequest {
+  string cwd_hash = 1;
+}
+
+message CheckpointEvent {
+  enum OperationType {
+    CHECKPOINT_INIT = 0;
+    CHECKPOINT_COMMIT = 1;
+    CHECKPOINT_RESTORE = 2;
+  }
+
+  OperationType operation = 1;
+  string cwd_hash = 2;
+  bool is_active = 3;
+  google.protobuf.Timestamp timestamp = 4;
+  optional string task_id = 5;
+  optional string commit_hash = 6;
+}
+
+message PathHashMap {
+  map<string, string> path_hash = 1;
+}

apps/vscode/proto/cline/marketplace.proto

@@ -1,100 +0,0 @@
-syntax = "proto3";
-
-package cline;
-
-import "cline/common.proto";
-
-option go_package = "github.com/cline/grpc-go/cline";
-option java_multiple_files = true;
-option java_package = "bot.cline.proto";
-
-service MarketplaceService {
-  rpc getMarketplaceCatalog(EmptyRequest) returns (MarketplaceCatalog);
-  rpc listMarketplaceLocalInstalledEntries(EmptyRequest) returns (MarketplaceLocalInstalledEntries);
-  rpc listMarketplaceInstalledEntries(MarketplaceEntriesRequest) returns (MarketplaceInstalledEntries);
-  rpc installMarketplaceEntry(MarketplaceEntryRequest) returns (MarketplaceInstallResult);
-  rpc toggleMarketplaceLocalInstalledEntry(ToggleMarketplaceLocalInstalledEntryRequest) returns (MarketplaceLocalInstalledEntries);
-}
-
-message MarketplaceTag {
-  string label = 1;
-  optional string color = 2;
-}
-
-message MarketplaceCounts {
-  optional int32 tools = 1;
-  optional int32 prompts = 2;
-  optional int32 resources = 3;
-}
-
-message MarketplaceEnvVar {
-  string name = 1;
-  bool required = 2;
-  optional string description = 3;
-  optional string url = 4;
-}
-
-message MarketplaceInstall {
-  repeated string args = 1;
-  repeated MarketplaceEnvVar env = 2;
-  optional string command = 3;
-  optional string notes = 4;
-}
-
-message MarketplaceEntry {
-  string id = 1;
-  string type = 2;
-  string name = 3;
-  optional string tagline = 4;
-  optional string description = 5;
-  repeated string tags = 6;
-  repeated MarketplaceTag tag_objects = 7;
-  optional string author = 8;
-  optional string source_url = 9;
-  optional string homepage_url = 10;
-  optional MarketplaceCounts counts = 11;
-  optional MarketplaceInstall install = 12;
-}
-
-message MarketplaceCatalog {
-  repeated MarketplaceEntry entries = 1;
-}
-
-message MarketplaceEntriesRequest {
-  repeated MarketplaceEntry entries = 1;
-}
-
-message MarketplaceInstalledEntries {
-  repeated string installed_keys = 1;
-}
-
-message MarketplaceLocalInstalledEntry {
-  string id = 1;
-  string type = 2;
-  string name = 3;
-  optional string description = 4;
-  optional string path = 5;
-  optional string source = 6;
-  bool enabled = 7;
-}
-
-message MarketplaceLocalInstalledEntries {
-  repeated MarketplaceLocalInstalledEntry entries = 1;
-}
-
-message ToggleMarketplaceLocalInstalledEntryRequest {
-  MarketplaceLocalInstalledEntry entry = 1;
-  bool enabled = 2;
-}
-
-message MarketplaceEntryRequest {
-  MarketplaceEntry entry = 1;
-}
-
-message MarketplaceInstallResult {
-  string id = 1;
-  string type = 2;
-  string status = 3;
-  string message = 4;
-  optional string output = 5;
-}

apps/vscode/proto/cline/mcp.proto

@@ -12,11 +12,16 @@ service McpService {
   rpc toggleMcpServer(ToggleMcpServerRequest) returns (McpServers);
   rpc updateMcpTimeout(UpdateMcpTimeoutRequest) returns (McpServers);
   rpc addRemoteMcpServer(AddRemoteMcpServerRequest) returns (McpServers);
+  rpc downloadMcp(StringRequest) returns (McpDownloadResponse);
   rpc restartMcpServer(StringRequest) returns (McpServers);
   rpc deleteMcpServer(StringRequest) returns (McpServers);
   rpc toggleToolAutoApprove(ToggleToolAutoApproveRequest) returns (McpServers);
+  rpc refreshMcpMarketplace(EmptyRequest) returns (McpMarketplaceCatalog);
   rpc openMcpSettings(EmptyRequest) returns (Empty);
   rpc authenticateMcpServer(StringRequest) returns (Empty);
+
+  // Subscribe to MCP marketplace catalog updates
+  rpc subscribeToMcpMarketplaceCatalog(EmptyRequest) returns (stream McpMarketplaceCatalog);
   rpc getLatestMcpServers(Empty) returns (McpServers);
 
   // Subscribe to MCP server updates
@@ -109,3 +114,40 @@ message McpServer {
 message McpServers {
   repeated McpServer mcp_servers = 1;
 }
+
+message McpMarketplaceItem {
+  string mcp_id = 1;
+  string github_url = 2;
+  string name = 3;
+  string author = 4;
+  string description = 5;
+  string codicon_icon = 6;
+  string logo_url = 7;
+  string category = 8;
+  repeated string tags = 9;
+  bool requires_api_key = 10;
+  optional string readme_content = 11;
+  optional string llms_installation_content = 12;
+  bool is_recommended = 13;
+  int32 github_stars = 14;
+  int32 download_count = 15;
+  string created_at = 16;
+  string updated_at = 17;
+  string last_github_sync = 18;
+}
+
+message McpMarketplaceCatalog {
+  repeated McpMarketplaceItem items = 1;
+}
+
+message McpDownloadResponse {
+  string mcp_id = 1;
+  string github_url = 2;
+  string name = 3;
+  string author = 4;
+  string description = 5;
+  string readme_content = 6;
+  string llms_installation_content = 7;
+  bool requires_api_key = 8;
+  optional string error = 9;
+}

apps/vscode/proto/cline/models.proto

@@ -21,6 +21,8 @@ service ModelsService {
   rpc refreshOpenRouterModelsRpc(EmptyRequest) returns (OpenRouterCompatibleModelInfo);
   // Refreshes and returns recommended and free Cline models
   rpc refreshClineRecommendedModelsRpc(EmptyRequest) returns (ClineRecommendedModelsResponse);
+  // Refreshes and returns Cline provider models
+  rpc refreshClineModelsRpc(EmptyRequest) returns (OpenRouterCompatibleModelInfo);
   // Refreshes and returns Hugging Face models
   rpc refreshHuggingFaceModels(EmptyRequest) returns (OpenRouterCompatibleModelInfo);
   // Refreshes and returns OpenAI models
@@ -53,18 +55,6 @@ service ModelsService {
   rpc getAihubmixModels(EmptyRequest) returns (OpenRouterCompatibleModelInfo);
   // Refreshes and returns Vercel AI Gateway models
   rpc refreshVercelAiGatewayModelsRpc(EmptyRequest) returns (OpenRouterCompatibleModelInfo);
-  // Lists providers available from the unified SDK-backed catalog
-  rpc listProviders(Empty) returns (ProviderListingsResponse);
-  // Resolves model metadata for a provider through the unified SDK-backed catalog
-  rpc resolveProviderModels(ResolveProviderModelsRequest) returns (ProviderModelsResponse);
-  // Resolves model metadata for a provider/model without refreshing model lists
-  rpc resolveModelInfo(ResolveModelInfoRequest) returns (ResolveModelInfoResponse);
-  // Reads redacted effective provider configuration
-  rpc readProviderConfig(StringRequest) returns (ProviderConfigResponse);
-  // Writes provider configuration fields and returns redacted effective configuration
-  rpc writeProviderConfig(WriteProviderConfigRequest) returns (ProviderConfigResponse);
-  // Commits a mode-specific model selection atomically with its model metadata
-  rpc commitModelSelection(CommitModelSelectionRequest) returns (Empty);
 }
 
 // List of VS Code LM models
@@ -127,142 +117,6 @@ message OpenRouterCompatibleModelInfo {
   map<string, OpenRouterModelInfo> models = 1;
 }
 
-// Lightweight provider entry for the top-level model/provider picker.
-// Does not include the full model list; use resolveProviderModels for models.
-message ProviderListing {
-  string id = 1;
-  string name = 2;
-  optional string default_model_id = 3;
-  optional string family = 4;
-  optional string protocol = 5;
-  optional string auth_description = 6;
-  optional string base_url_description = 7;
-  bool allows_custom_model_ids = 8;
-
-  // SDK-driven hint for cost display. Values: "show" (default) or "hide".
-  // Sourced from `resolveProviderUsageCostDisplay(provider.metadata)` in
-  // `@cline/llms`. When "hide", consumers must suppress per-token pricing
-  // and total cost displays (matches the CLI's `shouldShowCliUsageCost`).
-  string usage_cost_display = 11;
-}
-
-message ProviderListingsResponse {
-  repeated ProviderListing providers = 1;
-}
-
-message ResolveProviderModelsRequest {
-  string provider_id = 1;
-  bool force_refresh = 2;
-  optional string request_id = 3;
-}
-
-message CatalogErrorInfo {
-  string kind = 1;
-  string message = 2;
-  optional string code = 3;
-  optional bool retryable = 4;
-}
-
-message ProviderModelsResponse {
-  string provider_id = 1;
-  string request_id = 2;
-  string config_fingerprint = 3;
-  int64 fetched_at = 4;
-  bool ok = 5;
-  map<string, OpenRouterModelInfo> models = 6;
-  optional string default_model_id = 7;
-  optional string source = 8;
-  optional CatalogErrorInfo error = 9;
-}
-
-message ResolveModelInfoRequest {
-  string provider_id = 1;
-  optional string model_id = 2;
-}
-
-message ResolveModelInfoResponse {
-  string provider_id = 1;
-  string model_id = 2;
-  optional OpenRouterModelInfo model_info = 3;
-  string source = 4;
-}
-
-message AwsProviderConfig {
-  optional string authentication = 1;
-  optional string profile = 2;
-  optional string access_key = 3;
-  int64 access_key_length = 4;
-  optional string secret_key = 5;
-  int64 secret_key_length = 6;
-  optional string session_token = 7;
-  int64 session_token_length = 8;
-  optional string endpoint = 9;
-  optional bool use_prompt_cache = 10;
-  optional string custom_model_base_id = 11;
-  optional bool use_cross_region_inference = 12;
-  optional bool use_global_inference = 13;
-}
-
-message GcpProviderConfig {
-  optional string project_id = 1;
-  optional string region = 2;
-}
-
-message ProviderConfigResponse {
-  string provider_id = 1;
-  optional string base_url = 2;
-  optional string api_line = 3;
-  map<string, string> headers = 4;
-  optional string region = 5;
-  int64 api_key_length = 6;
-  bool has_access_token = 7;
-  bool has_refresh_token = 8;
-  optional string account_id = 9;
-  optional CommittedModelSelection plan_selection = 10;
-  optional CommittedModelSelection act_selection = 11;
-  optional AwsProviderConfig aws = 12;
-  optional GcpProviderConfig gcp = 13;
-}
-
-message CommittedModelSelection {
-  string provider_id = 1;
-  string model_id = 2;
-  OpenRouterModelInfo model_info = 3;
-}
-
-message ProviderReasoningPatch {
-  optional bool enabled = 1;
-  optional string effort = 2; // "none" | "low" | "medium" | "high" | "xhigh"
-  optional int32 budget_tokens = 3;
-}
-
-message WriteProviderConfigPatch {
-  optional string api_key = 1;
-  optional string base_url = 2;
-  map<string, string> headers = 3;
-  optional string region = 4;
-  optional string api_line = 5;
-  optional string access_token = 6;
-  optional string refresh_token = 7;
-  optional string account_id = 8;
-  optional ProviderReasoningPatch reasoning = 9;
-  optional bool clear_headers = 10;
-  optional AwsProviderConfig aws = 11;
-  optional GcpProviderConfig gcp = 12;
-}
-
-message WriteProviderConfigRequest {
-  string provider_id = 1;
-  WriteProviderConfigPatch patch = 2;
-}
-
-message CommitModelSelectionRequest {
-  string provider_id = 1;
-  string mode = 2;
-  string model_id = 3;
-  OpenRouterModelInfo model_info = 4;
-}
-
 message ClineRecommendedModel {
   string id = 1;
   string name = 2;
@@ -273,7 +127,6 @@ message ClineRecommendedModel {
 message ClineRecommendedModelsResponse {
   repeated ClineRecommendedModel recommended = 1;
   repeated ClineRecommendedModel free = 2;
-  repeated ClineRecommendedModel cline_pass = 3;
 }
 
 // Request for fetching OpenAI models
@@ -434,8 +287,6 @@ message ModelsApiOptions {
   optional OpenAiCompatibleModelInfo plan_mode_aihubmix_model_info = 134;
   optional string plan_mode_cline_model_id = 135;
   optional OpenRouterModelInfo plan_mode_cline_model_info = 136;
-  optional string plan_mode_cline_pass_model_id = 137;
-  optional OpenRouterModelInfo plan_mode_cline_pass_model_info = 138;
 
   // Act mode configurations
   optional ApiProvider act_mode_api_provider = 200;
@@ -475,8 +326,6 @@ message ModelsApiOptions {
   optional OpenAiCompatibleModelInfo act_mode_aihubmix_model_info = 234;
   optional string act_mode_cline_model_id = 235;
   optional OpenRouterModelInfo act_mode_cline_model_info = 236;
-  optional string act_mode_cline_pass_model_id = 237;
-  optional OpenRouterModelInfo act_mode_cline_pass_model_info = 238;
 }
 
 // Request for updating API configuration (legacy - uses combined configuration)
@@ -612,13 +461,6 @@ enum ApiProvider {
   NOUSRESEARCH = 39;
   OPENAI_CODEX = 40;
   WANDB = 41;
-  CLINE_PASS = 42;
-  POOLSIDE = 45;
-  V0 = 46;
-  XIAOMI = 47;
-  ZAI_CODING_PLAN = 49;
-  reserved 43, 44, 48;
-  reserved "OPENAI_CODEX_CLI", "OPENCODE", "KILO";
 }
 
 enum ApiFormat {
@@ -802,8 +644,6 @@ message ModelsApiConfiguration {
   optional string gemini_plan_mode_thinking_level = 139;
   optional string plan_mode_cline_model_id = 140;
   optional OpenRouterModelInfo plan_mode_cline_model_info = 141;
-  optional string plan_mode_cline_pass_model_id = 142;
-  optional OpenRouterModelInfo plan_mode_cline_pass_model_info = 143;
 
   // Act mode configurations
   optional ApiProvider act_mode_api_provider = 200;
@@ -848,6 +688,4 @@ message ModelsApiConfiguration {
   optional string gemini_act_mode_thinking_level = 239;
   optional string act_mode_cline_model_id = 240;
   optional OpenRouterModelInfo act_mode_cline_model_info = 241;
-  optional string act_mode_cline_pass_model_id = 242;
-  optional OpenRouterModelInfo act_mode_cline_pass_model_info = 243;
 }

apps/vscode/proto/cline/remote_config.proto

@@ -1,32 +0,0 @@
-syntax = "proto3";
-
-package cline;
-
-import "cline/common.proto";
-
-option go_package = "github.com/cline/grpc-go/cline";
-option java_multiple_files = true;
-option java_package = "bot.cline.proto";
-
-enum RemoteConfigType {
-  RULE = 0;
-  WORKFLOW = 1;
-  SKILL = 2;
-}
-
-message RemoteConfigSetting {
-  RemoteConfigType type = 1;
-  string name = 2;
-  string content = 3;
-  bool enabled = 4;
-  bool locked = 5;
-}
-
-message RemoteConfigSettingsResponse {
-  repeated RemoteConfigSetting settings = 1;
-}
-
-service RemoteConfigService {
-  rpc getRemoteConfigSettings(Empty) returns (RemoteConfigSettingsResponse);
-  rpc toggleRemoteConfigSetting(StringRequest) returns (RemoteConfigSetting);
-}

apps/vscode/proto/cline/slash.proto

@@ -23,7 +23,7 @@ message SlashCommandInfo {
   string name = 1; // Command name without slash, e.g., "newtask", "smol"
   string description = 2; // Human-readable description
   string section = 3; // "default", "custom", or "cli"
-  bool cli_compatible = 4; // false for VS Code-only commands
+  bool cli_compatible = 4; // false for VS Code-only commands like explain-changes
 }
 
 // Response containing all available slash commands

apps/vscode/proto/cline/state.proto

@@ -112,9 +112,6 @@ message Secrets {
 // in src/shared/storage/state-keys.ts and use the scripts/generate-state-proto.mjs
 // script to regenerate this list.
 message Settings {
-  reserved 144, 154, 176;
-  reserved "cline_web_tools_enabled", "enable_parallel_tool_calling", "double_check_completion_enabled";
-
   optional string lite_llm_base_url = 1;
   optional bool lite_llm_use_prompt_cache = 2;
   optional string anthropic_base_url = 4;
@@ -251,15 +248,19 @@ message Settings {
   optional bool enable_checkpoints_setting = 135;
   optional int32 shell_integration_timeout = 136;
   optional string default_terminal_profile = 137;
+  optional int32 terminal_output_line_limit = 138;
   optional int32 max_consecutive_mistakes = 139;
+  optional bool strict_plan_mode_enabled = 141;
   optional bool yolo_mode_toggled = 142;
   optional bool use_auto_condense = 143;
+  optional bool cline_web_tools_enabled = 144;
   optional string preferred_language = 145;
   optional PlanActMode mode = 147;
   optional FocusChainSettings focus_chain_settings = 149;
   optional string custom_prompt = 150;
   optional bool hooks_enabled = 152;
   optional bool subagents_enabled = 153;
+  optional bool enable_parallel_tool_calling = 154;
   optional bool background_edit_enabled = 155;
   optional bool opt_out_of_remote_config = 157;
   optional bool open_telemetry_enabled = 158;
@@ -278,12 +279,14 @@ message Settings {
   optional int32 open_telemetry_log_max_queue_size = 171;
   optional bool worktrees_enabled = 172;
   optional bool auto_approve_all_toggled = 174;
+  optional bool double_check_completion_enabled = 176;
   map<string, string> open_ai_headers = 177;
   optional string plan_mode_cline_model_id = 178;
   optional OpenRouterModelInfo plan_mode_cline_model_info = 179;
   optional string act_mode_cline_model_id = 180;
   optional OpenRouterModelInfo act_mode_cline_model_info = 181;
   optional bool show_feature_tips = 182;
+  optional bool lazy_teammate_mode_enabled = 183;
 }
 
 message State {
@@ -387,11 +390,7 @@ message UpdateTaskSettingsRequest {
 message UpdateSettingsRequest {
   reserved 15; // was openai_reasoning_effort (moved to mode-scoped reasoning effort)
   reserved 23; // was dictation_settings (dictation removed)
-  reserved 32, 34, 35, 41;
   reserved 38; // was skills_enabled (removed - now always enabled)
-  reserved 43; // was lazy_teammate_mode_enabled (removed)
-  reserved 12; // was terminal_output_line_limit (removed; SDK command output limits are character-based)
-  reserved "native_tool_call_enabled", "cline_web_tools_enabled", "enable_parallel_tool_calling", "double_check_completion_enabled";
 
   Metadata metadata = 1;
   optional ModelsApiConfiguration api_configuration = 2;
@@ -403,9 +402,10 @@ message UpdateSettingsRequest {
   optional bool terminal_reuse_enabled = 9;
   optional bool mcp_responses_collapsed = 10;
   optional McpDisplayMode mcp_display_mode = 11;
+  optional int32 terminal_output_line_limit = 12;
   optional PlanActMode mode = 13;
   optional string preferred_language = 14;
-  reserved 16; // was strict_plan_mode_enabled (removed)
+  optional bool strict_plan_mode_enabled = 16;
   optional FocusChainSettings focus_chain_settings = 17;
   optional bool use_auto_condense = 18;
   optional string custom_prompt = 19;
@@ -419,12 +419,17 @@ message UpdateSettingsRequest {
   optional bool subagents_enabled = 29;
   optional int32 subagent_terminal_output_line_limit = 30;
   optional string cline_env = 31;
+  optional bool native_tool_call_enabled = 32;
   optional OnboardingModelGroup onboarding_models = 33;
+  optional bool cline_web_tools_enabled = 34;
+  optional bool enable_parallel_tool_calling = 35;
   optional bool background_edit_enabled = 36;
   optional string oca_reasoning_effort = 37;
   optional bool opt_out_of_remote_config = 39;
   optional bool worktrees_enabled = 40;
+  optional bool double_check_completion_enabled = 41;
   optional bool show_feature_tips = 42;
+  optional bool lazy_teammate_mode_enabled = 43;
 }
 
 message UpdateTerminalConnectionTimeoutRequest {
@@ -451,11 +456,6 @@ message OnboardingProgressRequest {
   optional string action = 2;
   optional bool completed = 3;
   optional string model_selected = 4;
-  optional string page = 5;
-  optional string page_variant = 6;
-  optional string user_type = 7;
-  optional int32 destination_step = 8;
-  optional string destination_page = 9;
 }
 
 message OnboardingModelGroup {

apps/vscode/proto/cline/task.proto

@@ -32,14 +32,16 @@ service TaskService {
   rpc getTaskHistory(GetTaskHistoryRequest) returns (TaskHistoryArray);
   // Sends a response to a previous ask operation
   rpc askResponse(AskResponseRequest) returns (Empty);
-  // Edits a previous user message, truncates following conversation, and regenerates
-  rpc editMessageAndRegenerate(EditMessageAndRegenerateRequest) returns (Empty);
   // Records task feedback (thumbs up/down)
   rpc taskFeedback(StringRequest) returns (Empty);
+  // Shows task completion changes diff in a view
+  rpc taskCompletionViewChanges(Int64Request) returns (Empty);
   // Executes a quick win task with command and title
   rpc executeQuickWin(ExecuteQuickWinRequest) returns (Empty);
   // Deletes all task history
   rpc deleteAllTaskHistory(EmptyRequest) returns (DeleteAllTaskHistoryCount);
+  // Explains changes with AI and adds inline comments to the diff view
+  rpc explainChanges(ExplainChangesRequest) returns (Empty);
 }
 
 // Request message for creating a new task
@@ -80,14 +82,12 @@ message GetTaskHistoryRequest {
   string search_query = 3;
   string sort_by = 4;
   bool current_workspace_only = 5;
-  int32 limit = 6;
-  int32 offset = 7;
 }
 
 // Response for task history
 message TaskHistoryArray {
   repeated TaskItem tasks = 1;
-  bool has_more = 2;
+  int32 total_count = 2;
 }
 
 // Task item details for history list
@@ -114,16 +114,6 @@ message AskResponseRequest {
   repeated string files = 5;
 }
 
-// Request for editing a past user message and regenerating the conversation after it
-message EditMessageAndRegenerateRequest {
-  Metadata metadata = 1;
-  int64 message_ts = 2;
-  string text = 3;
-  repeated string images = 4;
-  repeated string files = 5;
-  bool restore_workspace = 6;
-}
-
 // Request for executing a quick win task
 message ExecuteQuickWinRequest {
   Metadata metadata = 1;
@@ -135,3 +125,10 @@ message ExecuteQuickWinRequest {
 message DeleteAllTaskHistoryCount {
   int32 tasks_deleted = 1;
 }
+
+// Request for explaining changes with AI
+message ExplainChangesRequest {
+  Metadata metadata = 1;
+  // Timestamp of the completion message to explain changes for
+  int64 message_ts = 2;
+}