feat: add support for JSON-encoded string arrays for tools

- Added normalizeJsonLikeSearchCodebaseInput and normalizeJsonLikeReadFilesInput helpers
- Updated createSearchTool and createReadFilesTool to accept queries/files as JSON-encoded string arrays
- Refactored normalizeJsonLikeRunCommandsInput into a generic normalizeJsonLikeToolInput utility
- Added test coverage for new input format acceptance

.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!"

.cline/skills/publish-ui/SKILL.md

@@ -1,158 +0,0 @@
----
-name: publish-ui
-description: Prepare, validate, and publish standalone @cline/ui npm releases. Use when bumping the UI package version, publishing latest or next through ui-publish.yml, checking UI release readiness, or completing the one-time npm trusted-publishing bootstrap.
----
-
-# Publish UI
-
-Release `@cline/ui` independently from the Cline SDK runtime packages.
-
-## Release contract
-
-- Version source: `sdk/packages/ui/package.json`.
-- Workflow: `.github/workflows/ui-publish.yml`.
-- The package keeps `internal: true` only to stay out of the SDK's shared
-  version/publish scripts. It is still a public npm package because
-  `private: false` and `publishConfig.access: public` control npm publication.
-- `latest` is the production channel. `next` is an opt-in preview channel.
-- Use prerelease versions such as `0.2.0-next.0` for `next`; do not publish a
-  version intended for `latest` under the preview tag because npm versions
-  cannot be republished.
-- There is no UI Git tag, GitHub release, schedule, or Slack announcement.
-- The workflow runs only by manual dispatch. Every release attempt runs the UI
-  quality checks before publishing and requires `confirm_publish=publish` from
-  `main`.
-- The publish job and npm trust relationship use the protected `Publish`
-  environment.
-- Every npm publication needs a new semver version; npm versions are immutable.
-- Always ask before pushing commits, triggering the publish workflow, changing
-  npm trust settings, or running a local publish command.
-
-## Normal release
-
-1. Inspect the branch, current version, npm state, and UI changes.
-
-```sh
-git status --short --branch
-node -p "require('./sdk/packages/ui/package.json').version"
-npm view @cline/ui dist-tags versions --json
-git log --oneline --no-merges -- \
-  sdk/packages/ui apps/examples/desktop-app/webview/components/views/chat \
-  .github/workflows/ui-publish.yml
-```
-
-2. Ask for the npm channel and version together. For `latest`, ask for patch,
-   minor, major, or an explicit version. For `next`, require an explicit
-   prerelease version such as `0.2.0-next.0`. Do not guess. Update only
-   `sdk/packages/ui/package.json` and its workspace version in `bun.lock`. Do
-   not run the SDK version command.
-
-3. Validate the release candidate.
-
-```sh
-bun install --filter @cline/ui --filter @cline/code --frozen-lockfile
-bun -F @cline/ui typecheck
-bun -F @cline/ui test
-bun -F @cline/ui test:package
-bun -F @cline/ui build-storybook
-bun -F @cline/code test:chat-ui
-```
-
-The packed-package test installs the tarball with Bun/React 19 and with
-npm/Node/React 18.
-Inspect `bun pm pack --dry-run` when the exported file set changed.
-
-4. Commit the version bump separately from feature work. Ask before pushing.
-
-```sh
-git add sdk/packages/ui/package.json bun.lock
-git commit -m "chore(ui): release vX.Y.Z"
-git push origin HEAD
-```
-
-5. After the release commit reaches `main`, restate the selected npm tag and ask
-   for explicit publish approval. Then trigger and watch the standalone
-   workflow:
-
-```sh
-run_url=$(gh workflow run ui-publish.yml --ref main \
-  -f npm_tag=latest \
-  -f confirm_publish=publish)
-test -n "$run_url"
-run_id=${run_url##*/}
-gh run watch "$run_id" --exit-status
-```
-
-Use `npm_tag=next` only for a deliberate preview. Do not report success until
-the workflow succeeds and npm shows the exact version under the selected tag.
-
-```sh
-npm view @cline/ui dist-tags versions --json
-```
-
-## One-time npm bootstrap
-
-Use this only while `npm view @cline/ui` returns `E404`. npm requires the
-package to exist before its GitHub trusted publisher can be configured.
-
-1. Merge the package and `ui-publish.yml` to `main`. Start from a clean,
-   reviewed `main` checkout. Verify authentication, account 2FA, and write
-   access to the `@cline` npm organization. The `npm trust` command in step 4
-   requires npm CLI 11.15 or newer; the automated trusted-publishing workflow
-   itself enforces npm 11.5.1 or newer.
-
-```sh
-npm --version
-npm whoami
-npm view @cline/ui version
-```
-
-If npm is older than 11.15, ask before upgrading with
-`npm install -g npm@^11.15.0`.
-
-2. Run the normal release validation in step 3 above. Then build, pack, test,
-   and inspect the exact initial tarball. Record the absolute archive path
-   printed by the final command.
-
-```sh
-bun -F @cline/ui build
-pack_dir=$(mktemp -d)
-(cd sdk/packages/ui && bun pm pack --ignore-scripts --destination "$pack_dir" --quiet)
-tarball=$(find "$pack_dir" -maxdepth 1 -name '*.tgz' -print -quit)
-test -n "$tarball"
-bun sdk/packages/ui/scripts/smoke-package.ts "$tarball"
-tar -tzf "$tarball"
-printf 'Bootstrap archive: %s\n' "$tarball"
-```
-
-3. Ask for explicit approval, then publish the initial version publicly under
-   `latest`:
-
-```sh
-npm publish /absolute/path/from-step-2.tgz --access public --tag latest
-```
-
-4. Ask separately before configuring the standalone workflow as the trusted
-   publisher:
-
-```sh
-npm trust github @cline/ui \
-  --repo cline/cline \
-  --file ui-publish.yml \
-  --env Publish \
-  --allow-publish
-```
-
-5. Verify both package state and trust. Every later release uses the workflow;
-   do not add a long-lived npm token.
-
-```sh
-npm view @cline/ui dist-tags versions --json
-npm trust list @cline/ui
-```
-
-## Final report
-
-Report the version and npm tag, release commit, whether anything was pushed,
-workflow URL or bootstrap result, npm verification, and tests/builds run. If
-the package still returns `E404`, state that bootstrap remains required.

.cline/skills/publish-ui/agents/openai.yaml

@@ -1,4 +0,0 @@
-interface:
-  display_name: "Publish UI"
-  short_description: "Prepare and publish the Cline UI package"
-  default_prompt: "Use $publish-ui to prepare and publish a new @cline/ui npm release."

.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,129 +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). Run with node, NOT bun — Playwright's
-# Electron launch times out under bun:
-node 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,57 +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`).
-- When reading a configuration files that users may edit, use `readFileStrippingUtf8Bom`, `readFileSyncStrippingUtf8Bom`, or `stripUtf8Bom` from `@cline/shared/node`. DON'T strip byte order marks of user files handled by tools/passed to models.
+- 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.
 
@@ -74,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
@@ -94,6 +48,93 @@ 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.
 
@@ -110,7 +151,7 @@ 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.
@@ -158,48 +199,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/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,7 +38,7 @@ 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.

.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/ext-vscode-ab-package.yml

@@ -1,205 +0,0 @@
-name: ext-vscode-ab-package
-
-# Build (and optionally publish) the combined A/B VSIX: a tiny loader plus two
-# complete extension bundles — `next/` from the SDK-based apps/vscode on main,
-# `legacy/` from the legacy-extension branch. Cohort selection happens at
-# runtime via PostHog flags; see apps/vscode-rollout/README.md for the design
-# and the rollout runbook.
-
-on:
-    workflow_dispatch:
-        inputs:
-            version:
-                description: "Combined VSIX version — must exceed every previously published version (e.g. 4.1.0)"
-                required: true
-                type: string
-            next-ref:
-                description: "Ref to build the next (SDK) bundle from"
-                required: true
-                default: "main"
-                type: string
-            legacy-ref:
-                description: "Ref to build the legacy bundle from"
-                required: true
-                default: "legacy-extension"
-                type: string
-            publish:
-                description: "Publish to the VS Code Marketplace (unchecked: just build the .vsix artifact)"
-                required: true
-                default: false
-                type: boolean
-
-permissions:
-    contents: read
-
-concurrency:
-    group: ext-vscode-ab-package-${{ github.event.inputs.version }}
-    cancel-in-progress: false
-
-jobs:
-    package:
-        name: Build combined (legacy + next) VSIX
-        runs-on: ubuntu-latest
-        environment: publish
-        steps:
-            - name: Checkout next (SDK) source
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ github.event.inputs.next-ref }}
-                  path: next-src
-                  lfs: true
-
-            - name: Checkout legacy source
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ github.event.inputs.legacy-ref }}
-                  path: legacy-src
-                  lfs: true
-
-            - uses: oven-sh/setup-bun@v2
-              with:
-                  bun-version: 1.3.14
-
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 22
-
-            - name: Install next workspace dependencies
-              working-directory: next-src
-              run: bun install
-
-            # @cline/* are local workspace symlinks to source packages; apps/vscode's
-            # `package` script does NOT build them, so without this the esbuild step
-            # fails on a fresh checkout. (The nightly workflow already does this.)
-            - name: Build SDK packages
-              working-directory: next-src
-              run: bun run build:sdk
-
-            # Stamp the combined version into each bundle's package.json AFTER
-            # install and BEFORE its build: the About tab and telemetry
-            # extension_version read the bundle's own manifest, so without this
-            # the VSIX reports three different versions depending on where you
-            # look. (The nightly workflow gets the same alignment via nightlify.mjs.)
-            - name: Align next bundle version
-              working-directory: next-src/apps/vscode-rollout
-              run: node scripts/set-version.mjs --dir "$GITHUB_WORKSPACE/next-src/apps/vscode" --version "${{ github.event.inputs.version }}"
-
-            - name: Build next bundle
-              working-directory: next-src/apps/vscode
-              env:
-                  CLINE_ENVIRONMENT: production
-                  TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
-                  ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
-                  # Inlined by esbuild: attributes every telemetry event with
-                  # extension_variant and unlocks the bundle's authoritative
-                  # extension.rollout.bundle_activated capture. Rollout builds only.
-                  CLINE_ROLLOUT_VARIANT: next
-                  # Match the stable publish workflow's OpenTelemetry production defaults.
-                  OTEL_TELEMETRY_ENABLED: ${{ secrets.OTEL_TELEMETRY_ENABLED }}
-                  OTEL_LOGS_EXPORTER: otlp
-                  OTEL_METRICS_EXPORTER: otlp
-                  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 }}
-              run: bun run package
-
-            - name: Install legacy dependencies
-              working-directory: legacy-src
-              run: |
-                  npm --prefix apps/vscode install --include=optional
-                  npm --prefix apps/vscode/webview-ui install --include=optional
-
-            - name: Align legacy bundle version
-              working-directory: next-src/apps/vscode-rollout
-              run: node scripts/set-version.mjs --dir "$GITHUB_WORKSPACE/legacy-src/apps/vscode" --version "${{ github.event.inputs.version }}"
-
-            - name: Build legacy bundle
-              working-directory: legacy-src/apps/vscode
-              env:
-                  CLINE_ENVIRONMENT: production
-                  TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
-                  ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
-                  CLINE_ROLLOUT_VARIANT: legacy
-                  # Match the stable publish workflow's OpenTelemetry production defaults.
-                  OTEL_TELEMETRY_ENABLED: ${{ secrets.OTEL_TELEMETRY_ENABLED }}
-                  OTEL_LOGS_EXPORTER: otlp
-                  OTEL_METRICS_EXPORTER: otlp
-                  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 }}
-              run: npm run package
-
-            - name: Build loader and run rollout tests
-              working-directory: next-src/apps/vscode-rollout
-              env:
-                  TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
-              run: |
-                  bun run typecheck
-                  bun run test
-                  bun run build:production
-
-            - name: Stitch combined VSIX staging
-              working-directory: next-src/apps/vscode-rollout
-              run: |
-                  node scripts/stitch.mjs \
-                    --next "$GITHUB_WORKSPACE/next-src/apps/vscode" \
-                    --legacy "$GITHUB_WORKSPACE/legacy-src/apps/vscode" \
-                    --loader dist/extension.js \
-                    --version "${{ github.event.inputs.version }}" \
-                    --out "$GITHUB_WORKSPACE/staging"
-
-            - name: Smoke-test loader against staging
-              working-directory: next-src/apps/vscode-rollout
-              run: node scripts/smoke-loader.mjs "$GITHUB_WORKSPACE/staging"
-
-            # This workflow publishes the STABLE identity. If nightlify ever leaks
-            # into this path the union manifest would ship under the wrong name.
-            # The bundle sub-manifest checks guard the set-version.mjs stamping:
-            # the About tab and telemetry extension_version read those files.
-            - name: Assert stable manifest identity
-              working-directory: staging
-              env:
-                  EXPECTED_VERSION: ${{ github.event.inputs.version }}
-              run: |
-                  node -e '
-                    const assert = require("node:assert");
-                    const expected = process.env.EXPECTED_VERSION;
-                    const pkg = require("./package.json");
-                    assert.equal(pkg.name, "claude-dev", `unexpected name ${pkg.name}`);
-                    assert.equal(pkg.publisher, "saoudrizwan", `unexpected publisher ${pkg.publisher}`);
-                    assert.equal(pkg.version, expected, `unexpected union version ${pkg.version}`);
-                    for (const bundle of ["next", "legacy"]) {
-                      const sub = require(`./${bundle}/package.json`);
-                      assert.equal(sub.version, expected, `unexpected ${bundle} bundle version ${sub.version}`);
-                    }
-                    console.log(`stable identity ok: ${pkg.publisher}.${pkg.name}@${pkg.version} (bundle versions aligned)`);
-                  '
-
-            - name: Package VSIX
-              working-directory: staging
-              run: |
-                  npm install -g @vscode/vsce
-                  # Preserve the narrowly scoped VSCE `sendgrid` scanner exemption used by
-                  # both standalone bundle workflows. No SendGrid credential is intentionally
-                  # supplied here; inspect the reported artifact before widening the exemption.
-                  vsce package --no-dependencies --allow-package-secrets sendgrid --out "claude-dev-${{ github.event.inputs.version }}.vsix"
-
-            - name: Upload VSIX artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: claude-dev-${{ github.event.inputs.version }}
-                  path: staging/claude-dev-${{ github.event.inputs.version }}.vsix
-                  if-no-files-found: error
-
-            - name: Publish to Marketplace
-              if: ${{ github.event.inputs.publish == 'true' }}
-              working-directory: staging
-              env:
-                  VSCE_PAT: ${{ secrets.VSCE_PAT }}
-              run: |
-                  if [[ -z "$VSCE_PAT" ]]; then
-                    echo "Error: VSCE_PAT is required to publish."
-                    exit 1
-                  fi
-                  vsce publish --no-dependencies --packagePath "claude-dev-${{ github.event.inputs.version }}.vsix"

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

@@ -1,294 +0,0 @@
-name: ext-vscode-publish-legacy
-
-# Publishes the legacy (pre-SDK-migration) VS Code extension from the
-# `legacy-extension` branch. This branch holds the npm-based 3.89.x codebase,
-# rolled forward under a 4.0.x version so existing 4.0.0 users still receive
-# the update. The main `ext-vscode-publish-stable.yml` workflow (bun-based)
-# stays the path for releasing main once the SDK migration is solid.
-#
-# This workflow lives on and is dispatched from `main` (so it satisfies the
-# default-branch dispatch requirement), but it checks out and builds the
-# `legacy-extension` branch.
-
-on:
-    workflow_dispatch:
-        inputs:
-            release-type:
-                description: "Choose release type (release or pre-release)"
-                required: true
-                default: "release"
-                type: choice
-                options:
-                    - pre-release
-                    - release
-            branch:
-                description: "Branch holding the legacy extension code"
-                required: true
-                default: "legacy-extension"
-                type: string
-
-permissions:
-    contents: write
-    packages: write
-    checks: write
-    pull-requests: write
-
-concurrency:
-    group: ext-vscode-publish-legacy-${{ github.event.inputs.branch }}
-    cancel-in-progress: false
-
-jobs:
-    # Gate the publish on the legacy branch's own npm-based test suite. We can't
-    # reuse ./.github/workflows/ext-vscode-test.yml here — on main that's the
-    # bun-based suite and it would test main, not the legacy branch — so the
-    # essential quality + test steps are inlined against the checked-out legacy
-    # branch.
-    test:
-        name: Test Legacy Extension
-        runs-on: ubuntu-latest
-        defaults:
-          run:
-            working-directory: apps/vscode
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                  ref: ${{ github.event.inputs.branch }}
-
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 22
-                  cache: 'npm'
-                  cache-dependency-path: |
-                      apps/vscode/package-lock.json
-                      apps/vscode/webview-ui/package-lock.json
-
-            - name: Install extension dependencies
-              working-directory: ${{ github.workspace }}
-              run: npm --prefix apps/vscode ci
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Install webview-ui dependencies
-              working-directory: ${{ github.workspace }}
-              run: npm --prefix apps/vscode/webview-ui ci
-
-            - name: Run Quality Checks (lint + typecheck)
-              run: npm run ci:check-all
-
-            - name: Build Tests and Extension
-              id: build_step
-              run: npm run ci:build
-
-            - name: Unit Tests
-              if: ${{ !cancelled() && steps.build_step.outcome == 'success' }}
-              run: npm run test:unit
-
-            - name: Extension Integration Tests
-              if: ${{ !cancelled() && steps.build_step.outcome == 'success' }}
-              run: xvfb-run -a npm run test:coverage
-
-            - name: Webview Tests
-              if: ${{ !cancelled() && steps.build_step.outcome == 'success' }}
-              run: |
-                  cd webview-ui
-                  npm run test:coverage
-
-    publish:
-        needs: test
-        name: Publish Legacy Extension
-        runs-on: ubuntu-latest
-        environment: publish
-        defaults:
-          run:
-            working-directory: apps/vscode
-
-        steps:
-            # Check out the legacy branch (NOT main). fetch-depth: 0 + tags so we
-            # can create/push the release tag and compute the previous tag.
-            - uses: actions/checkout@v4
-              with:
-                  ref: ${{ github.event.inputs.branch }}
-                  fetch-depth: 0
-                  fetch-tags: true
-                  lfs: true
-
-            - name: Resolve Release Tag
-              id: resolve_tag
-              working-directory: ${{ github.workspace }}
-              env:
-                  BRANCH: ${{ github.event.inputs.branch }}
-              run: |
-                  # Tag is derived from the package version on the legacy branch.
-                  VERSION=$(node -p "require('./apps/vscode/package.json').version")
-                  TAG="v$VERSION"
-
-                  if [[ ! "$TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+([-.][0-9A-Za-z.]+)?$ ]]; then
-                    echo "Error: derived tag '$TAG' does not match vX.Y.Z"
-                    exit 1
-                  fi
-                  TAG_REF="refs/tags/$TAG"
-                  HEAD_SHA=$(git rev-parse HEAD)
-
-                  if git show-ref --verify --quiet "$TAG_REF"; then
-                    TAG_SHA=$(git rev-list -n 1 "$TAG_REF^{commit}")
-                    if [[ "$TAG_SHA" != "$HEAD_SHA" ]]; then
-                      echo "Error: tag '$TAG' already exists at $TAG_SHA, not at branch head ($HEAD_SHA)"
-                      exit 1
-                    fi
-                    echo "Tag '$TAG' already exists at branch head. Continuing."
-                  else
-                    git config user.name "github-actions[bot]"
-                    git config user.email "github-actions[bot]@users.noreply.github.com"
-                    git tag "$TAG" "$HEAD_SHA"
-                    git push origin "$TAG_REF"
-                    echo "Created and pushed tag '$TAG' from $BRANCH head $HEAD_SHA."
-                  fi
-
-                  echo "tag=$TAG" >> $GITHUB_OUTPUT
-
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 22
-
-            - name: Install extension dependencies
-              working-directory: ${{ github.workspace }}
-              run: npm --prefix apps/vscode install --include=optional
-
-            - name: Install webview-ui dependencies
-              working-directory: ${{ github.workspace }}
-              run: npm --prefix apps/vscode/webview-ui install --include=optional
-
-            - name: Install Publishing Tools
-              run: npm install -g @vscode/vsce ovsx
-
-            - name: Get Version
-              id: get_version
-              run: |
-                  VERSION=$(node -p "require('./package.json').version")
-                  echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-            - name: Verify Tag Matches Package Version
-              run: |
-                  TAG="${{ steps.resolve_tag.outputs.tag }}"
-                  VERSION="v${{ steps.get_version.outputs.version }}"
-                  if [[ "$TAG" != "$VERSION" ]]; then
-                    echo "Error: tag '$TAG' does not match package version '$VERSION'"
-                    exit 1
-                  fi
-                  echo "Tag and package version match: $TAG"
-
-            - name: Verify Changelog Entry
-              working-directory: ${{ github.workspace }}
-              run: |
-                  EXPECTED_HEADING="## [${{ steps.get_version.outputs.version }}]"
-                  FIRST_HEADING=$(grep -m 1 '^## \[' CHANGELOG.md || true)
-                  if [[ "$FIRST_HEADING" != "$EXPECTED_HEADING" ]]; then
-                    echo "Error: CHANGELOG.md must start with '$EXPECTED_HEADING' before publishing."
-                    echo "Current first release heading: ${FIRST_HEADING:-<none>}"
-                    exit 1
-                  fi
-                  echo "Found changelog entry for ${{ steps.get_version.outputs.version }}"
-
-            - name: Verify Marketplace Tokens
-              env:
-                  VSCE_PAT: ${{ secrets.VSCE_PAT }}
-                  OVSX_PAT: ${{ secrets.OVSX_PAT }}
-              run: |
-                  if [[ -z "$VSCE_PAT" ]]; then
-                    echo "Error: VSCE_PAT is required to publish the stable VS Code extension."
-                    exit 1
-                  fi
-                  if [[ -z "$OVSX_PAT" ]]; then
-                    echo "Error: OVSX_PAT is required to publish the stable Open VSX extension."
-                    exit 1
-                  fi
-                  echo "Marketplace publish tokens are configured."
-
-            - name: Package and Publish Extension
-              env:
-                  VSCE_PAT: ${{ secrets.VSCE_PAT }}
-                  OVSX_PAT: ${{ secrets.OVSX_PAT }}
-                  CLINE_ENVIRONMENT: production
-                  TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
-                  ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
-                  # OpenTelemetry production defaults (can be overridden at runtime)
-                  OTEL_TELEMETRY_ENABLED: ${{ secrets.OTEL_TELEMETRY_ENABLED }}
-                  OTEL_LOGS_EXPORTER: otlp
-                  OTEL_METRICS_EXPORTER: otlp
-                  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 }}
-                  RELEASE_TYPE: ${{ github.event.inputs.release-type }}
-              run: |
-                  # Swap README.marketplace.md into README.md so both the GitHub
-                  # release artifact (vsce package below) and the marketplace
-                  # publish (npm run publish:marketplace below, which swaps
-                  # internally as an idempotent no-op) ship the same README.
-                  node scripts/marketplace-readme.mjs swap-in
-                  trap 'node scripts/marketplace-readme.mjs restore' EXIT
-
-                  # Required to generate the .vsix
-                  vsce package --allow-package-secrets sendgrid --out "cline-${{ steps.get_version.outputs.version }}.vsix"
-
-                  if [ "$RELEASE_TYPE" = "pre-release" ]; then
-                    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
-                    npm run publish:marketplace
-                    echo "Successfully published release version ${{ steps.get_version.outputs.version }} to VS Code Marketplace and Open VSX Registry"
-                  fi
-
-            - name: Get Previous Tag
-              id: prev_tag
-              working-directory: ${{ github.workspace }}
-              run: |
-                  CURRENT_TAG="${{ steps.resolve_tag.outputs.tag }}"
-                  PREV_TAG=$(git describe --tags --abbrev=0 "$CURRENT_TAG^" 2>/dev/null || echo "")
-                  echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
-
-            - name: Get Changelog Entry
-              id: changelog
-              working-directory: ${{ github.workspace }}
-              run: |
-                  # Get content between first ## [ and second ## [
-                  CONTENT=$(awk '/^## \[/{if(found) exit; found=1; next} found{print}' CHANGELOG.md)
-                  echo "content<<EOF" >> $GITHUB_OUTPUT
-                  echo "$CONTENT" >> $GITHUB_OUTPUT
-                  echo "EOF" >> $GITHUB_OUTPUT
-
-            - name: Create GitHub Release
-              uses: softprops/action-gh-release@v1
-              with:
-                  tag_name: ${{ steps.resolve_tag.outputs.tag }}
-                  files: "apps/vscode/*.vsix"
-                  body: |
-                      ${{ steps.changelog.outputs.content }}
-
-                      **Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.prev_tag.outputs.prev_tag }}...${{ steps.resolve_tag.outputs.tag }}
-                  prerelease: ${{ github.event.inputs.release-type == 'pre-release' }}
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Post release to Slack
-              uses: slackapi/slack-github-action@v3.0.1
-              with:
-                  method: chat.postMessage
-                  token: ${{ secrets.SLACK_RELEASE_BOT_TOKEN }}
-                  payload: |
-                    channel: "C0APVKGGZFC"
-                    text: "Cline ${{ steps.resolve_tag.outputs.tag }} (legacy)"
-                    blocks:
-                      - type: "section"
-                        text:
-                          type: "mrkdwn"
-                          text: "*Cline ${{ steps.resolve_tag.outputs.tag }} (legacy)*"
-                      - type: "section"
-                        text:
-                          type: "mrkdwn"
-                          text: ${{ toJSON(steps.changelog.outputs.content) }}
-                      - type: "context"
-                        elements:
-                          - type: "mrkdwn"
-                            text: "Full Changelog: https://github.com/${{ github.repository }}/compare/${{ steps.prev_tag.outputs.prev_tag }}...${{ steps.resolve_tag.outputs.tag }}"

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

@@ -1,40 +1,14 @@
 name: ext-vscode-publish-nightly
 
-# Publishes saoudrizwan.cline-nightly as the COMBINED A/B VSIX: the rollout
-# loader plus two complete extension bundles — `next/` from this ref's
-# apps/vscode (SDK-based) and `legacy/` from the legacy-extension branch.
-# Cohort selection happens at runtime via PostHog flags; see
-# apps/vscode-rollout/README.md for the design and rollout runbook.
-#
-# The stable-identity equivalent of this pipeline is ext-vscode-ab-package.yml
-# (manual dispatch, publishes claude-dev). Shared logic lives in
-# apps/vscode-rollout/scripts (nightlify/gen-manifest/stitch/smoke) so both
-# workflows stay thin. The single-bundle nightly path this replaced
-# (apps/vscode/scripts/publish-nightly.mjs) remains for manual feature-branch
-# pre-release publishes.
-
 on:
-  schedule:
-    # Every day at 4:00 AM PST (12:00 UTC)
-    - cron: "0 12 * * *"
   workflow_dispatch:
-    inputs:
-      legacy-ref:
-        description: "Ref to build the legacy bundle from"
-        required: false
-        default: "legacy-extension"
-        type: string
-      dry-run:
-        description: "Build and upload the .vsix artifact without publishing or tagging"
-        required: false
-        default: false
-        type: boolean
 
-run-name: "Publish Combined Nightly from ${{ github.ref_name }} @ ${{ github.sha }}"
+run-name: "Publish Nightly from ${{ github.ref_name }} @ ${{ github.sha }}"
 
-# Prevent concurrent publish runs on the same branch: the version is generated
-# from a seconds-resolution timestamp, so parallel runs on the same ref can
-# collide on the same version and cause publish failures or inconsistent tagging.
+# Prevent concurrent publish runs on the same branch. The nightly publish script
+# generates the extension version from a seconds-resolution timestamp, so parallel
+# runs on the same ref can collide on the same version and cause publish failures
+# or inconsistent tagging. Runs on different branches proceed independently.
 concurrency:
   group: ext-vscode-publish-nightly-${{ github.ref }}
   cancel-in-progress: false
@@ -43,7 +17,7 @@ permissions: {}
 
 jobs:
   test:
-    if: github.repository == 'cline/cline'
+    if: github.repository == 'cline/cline' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dpc/sdk-migration-simpler-login')
     permissions:
       contents: read
       pull-requests: read
@@ -53,106 +27,54 @@ jobs:
     needs: test
     permissions:
       contents: write
-    name: Publish Cline (Nightly) Combined Extension
-    # Defense in depth: only protected main may enter the publishing environment.
-    # This `if` is advisory because a dispatched branch runs its own copy of this
-    # file; the enforced gate is the PublishNightly environment's deployment-branch
-    # policy, which must also allow only main.
-    if: github.repository == 'cline/cline' && github.ref == 'refs/heads/main'
+    name: Publish Cline (Nightly) Extension
+    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
+    defaults:
+      run:
+        working-directory: apps/vscode
 
     steps:
-      - name: Checkout next (SDK) source
+      - name: Checkout selected branch
         uses: actions/checkout@v4
         with:
           ref: ${{ github.sha }}
-          path: next-src
           lfs: true
           persist-credentials: false
 
-      - name: Checkout legacy source
-        uses: actions/checkout@v4
-        with:
-          # NOTE: inputs are empty strings on `schedule` events, so the ||
-          # fallback (not the input's declared default) is what the cron uses.
-          ref: ${{ inputs.legacy-ref || 'legacy-extension' }}
-          path: legacy-src
-          lfs: true
-          persist-credentials: false
-
-      - name: Show build sources
-        env:
-          # Routed through env rather than interpolated into the script body so
-          # a crafted dispatch input can't inject shell (hygiene: dispatchers
-          # need write access anyway, but keep the pattern clean).
-          LEGACY_REF: ${{ inputs.legacy-ref || 'legacy-extension' }}
+      - name: Show build source
+        working-directory: ${{ github.workspace }}
         run: |
-          echo "next:   $(git -C next-src rev-parse HEAD)"
-          echo "legacy: $(git -C legacy-src rev-parse HEAD) ($LEGACY_REF)"
+          echo "Building ref: $GITHUB_REF"
+          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 required beyond install: the rollout scripts run under node and
-      # publishing shells out to vsce/ovsx. Pinned to Node 22 because newer LTS
-      # (Node 24 / npm 11) can make vsce's dependency detection fail.
       - 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
 
-      # ONE version for the next bundle, the legacy bundle, and the union
-      # manifest: gen-manifest hard-fails if the bundle identities diverge.
-      # Same scheme as the standalone nightly: <major>.<minor>.<unix-seconds>
-      # from next's base version, so it keeps outranking earlier nightlies.
-      - name: Compute nightly version
-        id: version
-        run: |
-          BASE=$(node -p "require('./next-src/apps/vscode/package.json').version")
-          VERSION="$(echo "$BASE" | cut -d. -f1,2).$(date +%s)"
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-          echo "Combined nightly version: $VERSION (base $BASE)"
+      - name: Install extension dependencies
+        working-directory: ${{ github.workspace }}
+        run: npm --prefix apps/vscode ci --include=optional
 
-      - name: Install next workspace dependencies
-        working-directory: next-src
-        run: bun install --frozen-lockfile
+      - name: Install webview-ui dependencies
+        working-directory: ${{ github.workspace }}
+        run: npm --prefix apps/vscode/webview-ui ci --include=optional
 
-      - name: Build SDK packages
-        working-directory: next-src
-        run: bun run build:sdk
+      - name: Install Publishing Tools
+        run: npm install -g @vscode/vsce ovsx
 
-      - name: Assert better-sqlite3 native binary present
-        working-directory: next-src/apps/vscode
-        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"
-
-      # Rewrite each bundle's package.json to the cline-nightly identity BEFORE
-      # its build (runtime command/config IDs derive from the manifest) and
-      # AFTER dependency install (workspace self-links key off the original
-      # package name).
-      - name: Nightlify next bundle manifest
-        working-directory: next-src/apps/vscode-rollout
-        run: node scripts/nightlify.mjs --dir "$GITHUB_WORKSPACE/next-src/apps/vscode" --version "${{ steps.version.outputs.version }}"
-
-      - name: Build next bundle
-        working-directory: next-src/apps/vscode
+      - name: Publish Nightly Extension
         env:
-          CLINE_ENVIRONMENT: production
+          VSCE_PAT: ${{ secrets.VSCE_PAT }}
+          OVSX_PAT: ${{ secrets.OVSX_PAT }}
           TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
           ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
-          # Inlined by esbuild: attributes every telemetry event with
-          # extension_variant and unlocks the bundle's authoritative
-          # extension.rollout.bundle_activated capture. Rollout builds only.
-          CLINE_ROLLOUT_VARIANT: next
+          CLINE_ENVIRONMENT: production
           # OpenTelemetry production defaults (can be overridden at runtime)
           OTEL_TELEMETRY_ENABLED: ${{ secrets.OTEL_TELEMETRY_ENABLED }}
           OTEL_LOGS_EXPORTER: otlp
@@ -160,129 +82,10 @@ 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 }}
-        run: bun run package
-
-      - name: Install legacy dependencies
-        working-directory: legacy-src
-        run: |
-          npm --prefix apps/vscode install --include=optional
-          npm --prefix apps/vscode/webview-ui install --include=optional
-
-      - name: Nightlify legacy bundle manifest
-        working-directory: next-src/apps/vscode-rollout
-        run: node scripts/nightlify.mjs --dir "$GITHUB_WORKSPACE/legacy-src/apps/vscode" --version "${{ steps.version.outputs.version }}"
-
-      - name: Build legacy bundle
-        working-directory: legacy-src/apps/vscode
-        env:
-          CLINE_ENVIRONMENT: production
-          TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
-          ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
-          CLINE_ROLLOUT_VARIANT: legacy
-          # Legacy's esbuild inlines these too (its own publish workflow passes
-          # them) — omitting them here would ship the legacy bundle with the
-          # OTel pipeline dead, unlike what legacy users get today.
-          OTEL_TELEMETRY_ENABLED: ${{ secrets.OTEL_TELEMETRY_ENABLED }}
-          OTEL_LOGS_EXPORTER: otlp
-          OTEL_METRICS_EXPORTER: otlp
-          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 }}
-        run: npm run package
-
-      - name: Build loader and run rollout tests
-        working-directory: next-src/apps/vscode-rollout
-        env:
-          TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
-        run: |
-          bun run typecheck
-          bun run test
-          bun run build:production
-
-      - name: Stitch combined VSIX staging
-        working-directory: next-src/apps/vscode-rollout
-        run: |
-          node scripts/stitch.mjs \
-            --next "$GITHUB_WORKSPACE/next-src/apps/vscode" \
-            --legacy "$GITHUB_WORKSPACE/legacy-src/apps/vscode" \
-            --loader dist/extension.js \
-            --version "${{ steps.version.outputs.version }}" \
-            --out "$GITHUB_WORKSPACE/staging"
-
-      - name: Smoke-test loader against staging
-        working-directory: next-src/apps/vscode-rollout
-        run: node scripts/smoke-loader.mjs "$GITHUB_WORKSPACE/staging"
-
-      # The nightly identity must have fully propagated (nightlify -> both
-      # bundle manifests -> union manifest) or we'd publish over the stable
-      # extension ID. The bundle sub-manifest checks guard the version
-      # stamping: the About tab and telemetry extension_version read those.
-      - name: Assert nightly manifest identity
-        working-directory: staging
-        env:
-          EXPECTED_VERSION: ${{ steps.version.outputs.version }}
-        run: |
-          node -e '
-            const assert = require("node:assert");
-            const expected = process.env.EXPECTED_VERSION;
-            const pkg = require("./package.json");
-            assert.equal(pkg.name, "cline-nightly", `unexpected name ${pkg.name}`);
-            assert.equal(pkg.publisher, "saoudrizwan", `unexpected publisher ${pkg.publisher}`);
-            assert.equal(pkg.version, expected, `unexpected union version ${pkg.version}`);
-            for (const bundle of ["next", "legacy"]) {
-              const sub = require(`./${bundle}/package.json`);
-              assert.equal(sub.name, "cline-nightly", `unexpected ${bundle} bundle name ${sub.name}`);
-              assert.equal(sub.version, expected, `unexpected ${bundle} bundle version ${sub.version}`);
-            }
-            console.log(`nightly identity ok: ${pkg.publisher}.${pkg.name}@${pkg.version} (bundle identities aligned)`);
-          '
-
-      - name: Install Publishing Tools
-        run: npm install -g @vscode/vsce ovsx
-
-      - name: Package VSIX
-        working-directory: staging
-        # Preserve the narrowly scoped VSCE `sendgrid` scanner exemption used by
-        # both standalone bundle workflows. No SendGrid credential is intentionally
-        # supplied here; inspect the reported artifact before widening the exemption.
-        run: vsce package --no-dependencies --allow-package-secrets sendgrid --out "cline-nightly-${{ steps.version.outputs.version }}.vsix"
-
-      - name: Upload VSIX artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: cline-nightly-${{ steps.version.outputs.version }}
-          path: staging/cline-nightly-${{ steps.version.outputs.version }}.vsix
-          if-no-files-found: error
-
-      # The job is main-only; step-level dry-run gating still permits a build-only
-      # rehearsal without publishing or tagging.
-      - name: Publish to VS Code Marketplace and Open VSX
-        if: github.ref == 'refs/heads/main' && inputs.dry-run != true
-        working-directory: staging
-        env:
-          VSCE_PAT: ${{ secrets.VSCE_PAT }}
-          OVSX_PAT: ${{ secrets.OVSX_PAT }}
-        run: |
-          if [[ -z "$VSCE_PAT" ]]; then
-            echo "Error: VSCE_PAT is required to publish."
-            exit 1
-          fi
-          vsce publish --no-dependencies --packagePath "cline-nightly-${{ steps.version.outputs.version }}.vsix"
-          if [[ -n "$OVSX_PAT" ]]; then
-            npx ovsx publish --packagePath "cline-nightly-${{ steps.version.outputs.version }}.vsix" --pat "$OVSX_PAT"
-          else
-            echo "WARNING: OVSX_PAT not set; skipping Open VSX publish."
-          fi
+        run: npm run publish:marketplace:nightly
 
       - name: Tag published commit
-        if: github.ref == 'refs/heads/main' && inputs.dry-run != true
-        # Best-effort bookkeeping: the default GITHUB_TOKEN cannot create a ref
-        # whose commit modifies workflow files (no workflows permission exists
-        # for it), so this step fails whenever HEAD touched .github/workflows.
-        # The publish already succeeded by this point — don't mark the run red;
-        # push the tag manually with user credentials when it matters.
-        continue-on-error: true
-        working-directory: next-src
+        working-directory: ${{ github.workspace }}
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
@@ -290,11 +93,10 @@ jobs:
           SHORT_SHA=$(git rev-parse --short=12 HEAD)
           TIMESTAMP=$(date -u +"%Y%m%d%H%M%S")
           TAG="nightly-${SAFE_REF}-${TIMESTAMP}-${SHORT_SHA}"
-          LEGACY_SHA=$(git -C "$GITHUB_WORKSPACE/legacy-src" rev-parse HEAD)
 
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          git tag -a "$TAG" -m "Cline Nightly (combined A/B) published from ${GITHUB_REF_NAME} at ${GITHUB_SHA} (legacy bundle: ${LEGACY_SHA})"
+          git tag -a "$TAG" -m "Cline Nightly published from ${GITHUB_REF_NAME} at ${GITHUB_SHA}"
           # Use an explicit HTTPS remote with GH_TOKEN because checkout was run with
           # persist-credentials: false, so actions/checkout did not persist a git credential helper.
           git push "https://x-access-token:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" "refs/tags/${TAG}"

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

@@ -27,10 +27,6 @@ permissions:
     checks: write
     pull-requests: write
 
-concurrency:
-    group: ext-vscode-publish-stable-${{ github.event.inputs.tag }}
-    cancel-in-progress: false
-
 jobs:
     test:
         uses: ./.github/workflows/ext-vscode-test.yml
@@ -106,61 +102,26 @@ jobs:
                       echo "Error: tag '$TAG' does not exist in the repository"
                       exit 1
                     fi
-                    TAG_SHA=$(git rev-list -n 1 "$TAG_REF^{commit}")
-                    if [[ "$TAG_SHA" != "$TESTED_SHA" ]]; then
-                      echo "Error: existing tag '$TAG' points to $TAG_SHA, but this workflow tested $TESTED_SHA"
-                      echo "Dispatch from the tag ref, or from the exact main commit the tag points to."
-                      exit 1
-                    fi
-                    echo "Using existing tag '$TAG' at tested SHA $TESTED_SHA."
+                    echo "Using existing tag '$TAG'."
                   fi
 
                   git checkout --detach "$TAG_REF^{commit}"
                   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
+            - name: Install extension dependencies
               working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+              run: npm --prefix apps/vscode install --include=optional
 
-            # @cline/* are local workspace symlinks to source packages; build dist/ before
-            # packaging/publishing the extension.
-            - name: Build SDK packages
+            - name: Install webview-ui dependencies
               working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
+              run: npm --prefix apps/vscode/webview-ui 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
 
@@ -180,60 +141,6 @@ jobs:
                   fi
                   echo "Tag and package version match: $TAG"
 
-            - name: Verify Changelog Entry
-              working-directory: ${{ github.workspace }}
-              run: |
-                  EXPECTED_HEADING="## [${{ steps.get_version.outputs.version }}]"
-                  FIRST_HEADING=$(grep -m 1 '^## \[' CHANGELOG.md || true)
-                  if [[ "$FIRST_HEADING" != "$EXPECTED_HEADING" ]]; then
-                    echo "Error: CHANGELOG.md must start with '$EXPECTED_HEADING' before publishing."
-                    echo "Current first release heading: ${FIRST_HEADING:-<none>}"
-                    exit 1
-                  fi
-                  echo "Found changelog entry for ${{ steps.get_version.outputs.version }}"
-
-            - name: Verify Marketplace Tokens
-              env:
-                  VSCE_PAT: ${{ secrets.VSCE_PAT }}
-                  OVSX_PAT: ${{ secrets.OVSX_PAT }}
-              run: |
-                  if [[ -z "$VSCE_PAT" ]]; then
-                    echo "Error: VSCE_PAT is required to publish the stable VS Code extension."
-                    exit 1
-                  fi
-                  if [[ -z "$OVSX_PAT" ]]; then
-                    echo "Error: OVSX_PAT is required to publish the stable Open VSX extension."
-                    exit 1
-                  fi
-                  echo "Marketplace publish tokens are configured."
-
-            - name: Get Previous Tag
-              id: prev_tag
-              working-directory: ${{ github.workspace }}
-              run: |
-                  CURRENT_TAG="${{ steps.resolve_tag.outputs.tag }}"
-                  PREV_TAG=$(
-                    git tag --merged "$CURRENT_TAG^" --list 'v[0-9]*.[0-9]*.[0-9]*' --sort=-v:refname \
-                      | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+([-.][0-9A-Za-z.]+)?$' \
-                      | head -n 1 || true
-                  )
-                  echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
-
-            - name: Get Changelog Entry
-              id: changelog
-              working-directory: ${{ github.workspace }}
-              run: |
-                  # Get content between the matching version heading and the next release heading.
-                  CONTENT=$(awk -v version="${{ steps.get_version.outputs.version }}" '
-                    $0 == "## [" version "]" { found=1; next }
-                    found && /^## \[/ { exit }
-                    found { print }
-                    END { if (!found) exit 1 }
-                  ' CHANGELOG.md)
-                  echo "content<<EOF" >> $GITHUB_OUTPUT
-                  echo "$CONTENT" >> $GITHUB_OUTPUT
-                  echo "EOF" >> $GITHUB_OUTPUT
-
             - name: Package and Publish Extension
               env:
                   VSCE_PAT: ${{ secrets.VSCE_PAT }}
@@ -257,23 +164,35 @@ 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
 
+            - name: Get Previous Tag
+              id: prev_tag
+              working-directory: ${{ github.workspace }}
+              run: |
+                  CURRENT_TAG="${{ steps.resolve_tag.outputs.tag }}"
+                  PREV_TAG=$(git describe --tags --abbrev=0 "$CURRENT_TAG^" 2>/dev/null || echo "")
+                  echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
+
+            - name: Get Changelog Entry
+              id: changelog
+              working-directory: ${{ github.workspace }}
+              run: |
+                  # Get content between first ## [ and second ## [
+                  CONTENT=$(awk '/^## \[/{if(found) exit; found=1; next} found{print}' CHANGELOG.md)
+                  echo "content<<EOF" >> $GITHUB_OUTPUT
+                  echo "$CONTENT" >> $GITHUB_OUTPUT
+                  echo "EOF" >> $GITHUB_OUTPUT
+
             - name: Create GitHub Release
               uses: softprops/action-gh-release@v1
               with:

.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,22 @@ 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
+            - name: Install extension dependencies
               working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+              run: npm --prefix apps/vscode 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
+            - name: Install webview-ui dependencies
               working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
+              run: npm --prefix apps/vscode/webview-ui 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 +148,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,44 +82,33 @@ 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
+            - name: Install extension dependencies
               working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+              run: npm --prefix apps/vscode 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
+            - name: Install webview-ui dependencies
               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"
+              run: npm --prefix apps/vscode/webview-ui 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]
         if: needs.detect-changes.outputs.vscode == 'true'
         env:
-            VSCODE_TEST_VERSION: 1.101.0
+            VSCODE_TEST_VERSION: 1.103.0
         strategy:
             fail-fast: false
             matrix:
@@ -141,43 +123,30 @@ 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
+            - name: Install extension dependencies
               working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+              run: npm --prefix apps/vscode 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
+            - name: Install webview-ui dependencies
               working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
+              run: npm --prefix apps/vscode/webview-ui ci
 
-            - name: Assert better-sqlite3 native binary present
+            - name: Set up NPM on Windows
+              if: runner.os == 'Windows'
+              working-directory: ${{ github.workspace }}
               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 +158,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 +183,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 +201,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 +210,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 +224,39 @@ 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
+            - name: Install extension dependencies
               working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+              run: npm --prefix apps/vscode 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
+            - name: Install webview-ui dependencies
               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"
+              run: npm --prefix apps/vscode/webview-ui 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
+              working-directory: ${{ github.workspace }}
+              run: npm --prefix apps/vscode/testing-platform 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/sdk-publish.yml

@@ -260,41 +260,6 @@ jobs:
             git push origin "refs/tags/${TAG}"
           done
 
-      - name: Get Previous SDK Tag
-        if: steps.check_commits.outputs.skip != 'true' && steps.channel.outputs.channel == 'latest'
-        id: prev_tag
-        env:
-          VERSION: ${{ steps.version.outputs.version }}
-        run: |
-          # The checkout is shallow and tagless, so fetch the release tags explicitly.
-          git fetch origin "+refs/tags/sdk/sdk/v*:refs/tags/sdk/sdk/v*"
-          PREV_TAG=$(git tag -l 'sdk/sdk/v*' | grep -vx "sdk/sdk/v${VERSION}" | sort -V | tail -1 || echo "")
-          echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
-
-      - name: Get Changelog Entry
-        if: steps.check_commits.outputs.skip != 'true' && steps.channel.outputs.channel == 'latest'
-        id: changelog
-        run: |
-          # Grab content between the first "## " header and the next one in sdk/CHANGELOG.md
-          CONTENT=$(awk '/^## [0-9]/{if(found) exit; found=1; next} found{print}' sdk/CHANGELOG.md)
-          DELIMITER=$(openssl rand -hex 8)
-          echo "content<<${DELIMITER}" >> $GITHUB_OUTPUT
-          echo "$CONTENT" >> $GITHUB_OUTPUT
-          echo "${DELIMITER}" >> $GITHUB_OUTPUT
-
-      - name: Create GitHub Release
-        if: steps.check_commits.outputs.skip != 'true' && steps.channel.outputs.channel == 'latest'
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: sdk/sdk/v${{ steps.version.outputs.version }}
-          name: "SDK v${{ steps.version.outputs.version }}"
-          body: |
-            ${{ steps.changelog.outputs.content }}
-
-            ${{ steps.prev_tag.outputs.prev_tag != '' && format('**Full Changelog**: https://github.com/{0}/compare/{1}...sdk/sdk/v{2}', github.repository, steps.prev_tag.outputs.prev_tag, steps.version.outputs.version) || '' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Summary
         if: steps.check_commits.outputs.skip != 'true'
         env:
@@ -315,26 +280,3 @@ jobs:
             echo "  - sdk/core/v${VERSION}"
             echo "  - sdk/sdk/v${VERSION}"
           fi
-
-      - name: Post release to Slack
-        if: steps.check_commits.outputs.skip != 'true' && steps.channel.outputs.channel == 'latest'
-        uses: slackapi/slack-github-action@v3.0.1
-        with:
-          method: chat.postMessage
-          token: ${{ secrets.SLACK_RELEASE_BOT_TOKEN }}
-          payload: |
-            channel: "C0APVKGGZFC"
-            text: "Cline SDK v${{ steps.version.outputs.version }}"
-            blocks:
-              - type: "section"
-                text:
-                  type: "mrkdwn"
-                  text: "Cline SDK v${{ steps.version.outputs.version }}"
-              - type: "section"
-                text:
-                  type: "mrkdwn"
-                  text: ${{ toJSON(steps.changelog.outputs.content) }}
-              - type: "context"
-                elements:
-                  - type: "mrkdwn"
-                    text: "<https://www.npmjs.com/package/@cline/sdk/v/${{ steps.version.outputs.version }}|View on npm>${{ steps.prev_tag.outputs.prev_tag != '' && format(' | Full Changelog: https://github.com/{0}/compare/{1}...sdk/sdk/v{2}', github.repository, steps.prev_tag.outputs.prev_tag, steps.version.outputs.version) || '' }}"

.github/workflows/ui-publish.yml

@@ -1,145 +0,0 @@
-name: ui-publish
-
-on:
-  workflow_dispatch:
-    inputs:
-      npm_tag:
-        description: "npm distribution tag"
-        required: true
-        type: choice
-        options:
-          - next
-          - latest
-        default: next
-      confirm_publish:
-        description: 'Type "publish" to publish @cline/ui to npm'
-        required: true
-        type: string
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: false
-
-jobs:
-  quality:
-    name: UI quality and package checks
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: "1.3.13"
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "24.x"
-
-      - name: Install dependencies
-        run: bun install --filter @cline/ui --filter @cline/code --frozen-lockfile
-
-      - name: Typecheck UI
-        run: bun -F @cline/ui typecheck
-
-      - name: Test UI
-        run: bun -F @cline/ui test
-
-      - name: Build Storybook
-        run: bun -F @cline/ui build-storybook
-
-      - name: Build UI package
-        run: bun -F @cline/ui build
-
-      - name: Test desktop chat integration
-        run: bun -F @cline/code test:chat-ui
-
-      - name: Pack publish artifact
-        id: pack
-        shell: bash
-        run: |
-          set -euo pipefail
-          pack_dir="$RUNNER_TEMP/ui-npm-pack"
-          mkdir -p "$pack_dir"
-          cd sdk/packages/ui
-          bun pm pack --ignore-scripts --destination "$pack_dir" --quiet
-          archive=$(find "$pack_dir" -maxdepth 1 -name '*.tgz' -print -quit)
-          test -n "$archive"
-          echo "archive=$archive" >> "$GITHUB_OUTPUT"
-
-      - name: Test packed package
-        env:
-          UI_PACKAGE_ARCHIVE: ${{ steps.pack.outputs.archive }}
-        run: bun sdk/packages/ui/scripts/smoke-package.ts "$UI_PACKAGE_ARCHIVE"
-
-      - name: Upload publish artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ui-npm-package
-          path: ${{ runner.temp }}/ui-npm-pack/*.tgz
-          if-no-files-found: error
-          retention-days: 7
-
-  publish:
-    name: Publish @cline/ui
-    if: >-
-      github.event_name == 'workflow_dispatch' &&
-      github.repository == 'cline/cline' &&
-      github.ref == 'refs/heads/main' &&
-      inputs.confirm_publish == 'publish' &&
-      !endsWith(github.actor, '[bot]')
-    needs: quality
-    runs-on: ubuntu-latest
-    environment: Publish
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "24.x"
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Download publish artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ui-npm-package
-          path: ${{ runner.temp }}/ui-npm-pack
-
-      - name: Verify publish tooling
-        shell: bash
-        run: |
-          set -euo pipefail
-          npm_version=$(npm --version)
-          echo "npm ${npm_version}"
-          node -e 'const [major, minor, patch] = process.argv[1].split(".").map(Number); if (major < 11 || (major === 11 && (minor < 5 || (minor === 5 && patch < 1)))) { console.error("npm 11.5.1 or newer is required for trusted publishing"); process.exit(1); }' "$npm_version"
-
-      - name: Publish package
-        shell: bash
-        env:
-          NPM_CONFIG_PROVENANCE: "true"
-          NPM_TAG: ${{ inputs.npm_tag }}
-        run: |
-          set -euo pipefail
-          archive=$(find "$RUNNER_TEMP/ui-npm-pack" -maxdepth 1 -name '*.tgz' -print -quit)
-          if [ -z "$archive" ]; then
-            echo "UI package archive was not downloaded"
-            exit 1
-          fi
-
-          version=$(tar -xOf "$archive" package/package.json | node -e 'let input=""; process.stdin.on("data", chunk => input += chunk); process.stdin.on("end", () => process.stdout.write(JSON.parse(input).version))')
-          if npm view "@cline/ui@${version}" version >/dev/null 2>&1; then
-            echo "@cline/ui@${version} already exists; bump sdk/packages/ui/package.json before publishing"
-            exit 1
-          fi
-
-          npm publish "$archive" --tag "$NPM_TAG" --access public
-          echo "Published @cline/ui@${version} with npm tag '${NPM_TAG}'"

.gitignore

@@ -13,9 +13,6 @@ tmp
 pnpm-lock.yaml
 
 .clineignore
-.cline/enterprise
-.cline/remote-config
-**/.cline/remote-config
 .venv
 .actrc
 CLAUDE.local.md
@@ -84,11 +81,3 @@ apps/vscode/webview-ui/src/**/*.js.map
 *.db-wal
 .cline/**/managed.json
 .cline/**/bundle.json
-apps/vscode/tsconfig.test.generated.json
-.next/dev/static
-**/src-tauri/target/debug/.fingerprint
-apps/examples/desktop-app/src-tauri/target
-apps/examples/desktop-app/webview/.next
-
-# Next.js generated type shim (churns between dev and build)
-apps/examples/desktop-app/webview/next-env.d.ts

.greptile/config.json

@@ -39,6 +39,14 @@
 				"sdk/packages/core/src/auth/**"
 			],
 			"severity": "high"
+		},
+		{
+			"id": "sdk-telemetry-doc-update",
+			"rule": "Any PR that adds new event constants to CORE_TELEMETRY_EVENTS in packages/core/src/services/telemetry/core-events.ts, adds new capture* helper functions, or changes the payload shape of an existing event must update the Event Catalog section in DOC.md. Flag PRs that modify core-events.ts without a corresponding change to DOC.md.",
+			"scope": [
+				"sdk/packages/core/src/services/telemetry/core-events.ts"
+			],
+			"severity": "medium"
 		}
 	]
 }

.greptile/files.json

@@ -16,9 +16,13 @@
 			"path": "sdk/packages/core/src/services/telemetry/OpenTelemetryProvider.ts",
 			"description": "OpenTelemetry-backed provider that wires logs/metrics/traces exporters. Contains createConfiguredTelemetryService and createConfiguredTelemetryHandle, the canonical factories every host should use."
 		},
+		{
+			"path": "DOC.md",
+			"description": "Public API and event documentation. The Event Catalog and 'Activation funnel' sections must be kept in sync with core-events.ts. Host integration rules (CLI dir ordering, hub daemon metadata forwarding) are documented here."
+		},
 		{
 			"path": "sdk/ARCHITECTURE.md",
-			"description": "Architecture reference. Telemetry design decisions and completion semantics (submit_and_exit anchoring) are documented here. Use as ground truth for design intent."
+			"description": "Architecture reference. Telemetry design decisions, completion semantics (submit_and_exit anchoring), and hub-daemon telemetry forwarding are documented here. Use as ground truth for design intent."
 		},
 		{
 			"path": "sdk/AGENTS.md",

.greptile/rules.md

@@ -36,13 +36,8 @@ event names. It exports:
 
 1. Add the constant to `CORE_TELEMETRY_EVENTS`
 2. Add a typed `capture*()` helper alongside it (with a typed `properties` parameter)
-3. Add a unit test in `core-events.test.ts` asserting the event flows through the
-   opt-out-respecting `capture` path and never `captureRequired` (opt-out is enforced by
-   `OptedOutTelemetryService`, whose `capture` is a no-op — the test convention is
-   "emits X as a normal opt-out-respecting event"). Events that intentionally bypass
-   opt-out must use `captureRequired` and assert that explicitly.
-
-**All events should be named using snake_case and so should their properties**
+3. Update the Event Catalog section in `DOC.md`
+4. Add a unit test in `core-events.test.ts` asserting the event is dropped when telemetry is opted out
 
 ## The Activation Funnel
 
@@ -87,7 +82,7 @@ The CLI accepts `--config <dir>`. The CLI **must** apply `setClineDir(...)` and
 and any other on-disk telemetry state lands under `~/.cline` instead of the user's chosen
 config dir.
 
-The canonical pattern is in `apps/cli/src/main.ts`:
+The canonical pattern is in `apps/cli/src/main.ts` (PR #357):
 
 ```ts
 if (configDir) setClineDir(configDir);
@@ -95,18 +90,18 @@ setHomeDir(homedir());
 captureCliExtensionActivated();   // <-- after dir overrides
 ```
 
-## Hub Daemon Telemetry
+## Hub Daemon Metadata Forwarding
 
-The detached hub daemon (`sdk/packages/core/src/hub/daemon/entry.ts`) hosts the
-`LocalRuntimeHost` that emits `task.conversation_turn` and `task.tokens` for every
-hub-backed session, so the daemon must own its own `ITelemetryService`. It builds one via
-`createHubDaemonTelemetry()` (`sdk/packages/core/src/hub/daemon/telemetry.ts`), which
-identifies from the cached cline account (re-resolved periodically, since the daemon often
-starts before login) and flushes on every shutdown path, including startup failure.
+Hosts that spawn a detached `@cline/core/hub/daemon-entry` process must forward telemetry
+metadata into the daemon argv so the daemon can reconstruct an equivalent
+`ITelemetryService`. The expected payload is base64-encoded JSON with snake_case keys:
 
-Flag changes that remove this wiring, construct runtime hosts inside the daemon without
-passing its telemetry handle, or add daemon exit paths that skip the flush — hub-backed
-sessions would silently drop their lifecycle telemetry (this exact bug shipped once).
+```
+{ extension_version, cline_type, platform, platform_version, os_type, os_version, is_remote_workspace }
+```
+
+The reference implementation is `apps/vscode/src/hub-daemon.ts` (PR #357). Without this
+forwarding, hub-backed sessions silently drop their lifecycle telemetry.
 
 ## Auth Lifecycle Completeness
 
@@ -125,10 +120,10 @@ canonical examples of all four phases.
 
 ## Single Telemetry Service Per Host
 
-On VS Code, all callers go through the lazy `telemetryService` proxy in
-`apps/vscode/src/services/telemetry/index.ts`, which constructs the service once on first
-use. Do not let individual controllers construct their own `ITelemetryService` — that
-fragments distinct-id state, opt-out tracking, and flush ownership.
+On VS Code, the telemetry handle is built **once** in `activate()`
+(`apps/vscode/src/telemetry.ts`) and the same instance is passed into the sidebar, panel
+command, and daemon spawn payload. Do not let individual controllers construct their own
+`ITelemetryService` — that fragments distinct-id state, opt-out tracking, and flush ownership.
 
 The CLI follows the same pattern via the `getCliTelemetryService()` singleton in
 `apps/cli/src/utils/telemetry.ts`, which is memoized by the activation gate in

.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,10 +65,10 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run build:webview",
+			"command": "npm run build:webview",
 			"group": "build",
 			"problemMatcher": [],
-			"isBackground": false,
+			"isBackground": true,
 			"label": "npm: build:webview",
 			"dependsOn": [
 				"npm: protos"
@@ -86,10 +86,10 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run build:webview:test",
+			"command": "npm run build:webview:test",
 			"group": "build",
 			"problemMatcher": [],
-			"isBackground": false,
+			"isBackground": true,
 			"label": "npm: build:webview:test",
 			"dependsOn": [
 				"npm: protos"
@@ -108,22 +108,22 @@
 		},
 		{
 			"type": "shell",
-			"command": "bun run dev:webview",
+			"command": "npm run dev:webview",
 			"group": "build",
 			"problemMatcher": [
 				{
 					"pattern": [
 						{
-							"regexp": "^(?!)((?:.*))$",
-							"kind": "file",
+							"regexp": ".",
 							"file": 1,
-							"message": 1
+							"location": 2,
+							"message": 3
 						}
 					],
 					"background": {
 						"activeOnStart": true,
-						"beginsPattern": "^Building webview for|^\\s*VITE",
-						"endsPattern": "^.*Local:\\s+http://127\\.0\\.0\\.1:[0-9]+/"
+						"beginsPattern": ".",
+						"endsPattern": "."
 					}
 				}
 			],
@@ -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,44 +1,5 @@
 # Changelog
 
-## [4.0.0]
-
-### Added
-
-- Add the SDK-backed VS Code extension runtime. Cline now runs tasks through the shared Cline SDK session layer for agent turns, tools, Plan/Act mode coordination, MCP, checkpoints, telemetry, provider changes, compaction, mistake limits, and task history.
-- Add ClinePass to the VS Code extension, including onboarding, provider selection, signup and subscription handoff, live model lists, entitlement and organization error states, out-of-credit prompts, and clearer ClinePass auth/error handling.
-- Add the Customize marketplace for discovering and managing Skills, MCP servers, and Plugins from the extension, including installed/marketplace tabs, search and filtering, install/uninstall flows, enable/disable controls, and support for plugin-bundled skills.
-- Cline Plugins: Plugins let you extend Cline with custom tools, workflows, skills, and MCP-powered capabilities tailored to your team or project. Install them from the new Customize marketplace to add specialized behavior, connect external services, and package reusable automations—so Cline can do more than code: it can adapt to the way you work.
-- Add queued prompts in chat. Messages submitted while Cline is already working are now queued, shown while the current turn streams, and can be cancelled before they run.
-- Add edit-and-regenerate support for previous user messages, with clearer Reset Chat and Reset Code actions.
-- Add generic SDK provider settings and model-catalog support so more providers can share the same model picker, reasoning controls, dynamic model IDs, provider config persistence, and custom model handling.
-- Add additional SDK-backed provider exposure and model/provider updates, including ClinePass models, refreshed Cline catalog data, Fireworks GLM 5.2, Kimi K2.6 Fast, Kimi K2.7 Code, Qwen 3.7 Plus, MiniMax M3 updates, SAP AI Core wiring, LiteLLM model fetching, Codex OAuth credentials, and OpenAI-compatible model settings.
-- Add MCP support for plugins and shared marketplace install/uninstall plumbing used by the VS Code extension.
-
-### Changed
-
-- Migrate the VS Code extension from the legacy task implementation to the shared Cline SDK and move the extension build/package workflow to Bun.
-- Rework Plan/Act mode handling through SDK coordinators, including closer CLI parity and automatic continuation when switching from Plan to Act.
-- Rework provider and model configuration around `providers.json`, the model catalog, and SDK session config so settings are preserved consistently across provider switches and active sessions can restart when the selected provider changes.
-- Simplify provider settings UI by replacing many provider-specific views with shared generic settings components and consistent reasoning selectors.
-- Simplify terminal execution through the SDK run-commands path, including clearer non-interactive command guidance and safer structured command formatting.
-- Migrate legacy MCP files and formats into the shared settings file and protect MCP settings writes with safer locking/atomic updates.
-- Refresh the MCP hub automatically after marketplace installs so newly installed servers are available without a manual restart.
-- Reorganize MCP/Skills/Plugins entry points under Customize, hide workflows from the Customize menu, wrap Customize tabs on narrow screens, and allow the MCP Marketplace tab to be disabled remotely while installed MCP servers remain accessible.
-- Simplify auto-approval settings. Command auto-approval is now disabled by default for safer new and reset configurations, and the auto-approval UI has been streamlined.
-- Update task history handling for the SDK migration, including legacy task history visibility, metadata preservation on resume, and corrected deletion behavior.
-- Route compacting and mistake-limit behavior through the SDK so the Compact button and mistake tracking affect the active SDK session.
-- Remove the legacy Explain Changes feature as part of the SDK migration cleanup.
-- Temporarily disable subagents in the VS Code extension while the SDK-backed experience is stabilized.
-
-### Fixed
-
-- Fix marketplace edge cases, including refreshing MCP servers after marketplace installs, disabling the MCP Marketplace tab from remote config, hiding workflows from Customize, surfacing plugin-bundled skills, and uninstalling shared marketplace entries.
-- Fix chat submission during active turns by queuing user messages instead of dropping or racing them, showing pending/queued states promptly, rendering direct user messages immediately, and removing delayed send behavior.
-- Fix editing previous user messages so Escape cancels editing locally and reset action labels are clearer.
-- Fix terminal reliability, including standalone Windows output capture, hardened PowerShell command handling, running-state display for in-progress commands, raw structured command preservation, single-quote handling, cwd setup timeouts, failing-command stdout capture, heredoc coalescing, and removal of duplicated command echoes in tool results.
-- Fix SDK tool-result and provider-message budgeting by truncating large tool outputs by default, capping assistant text, limiting bash/file-read/search output ingestion, bounding media budgets, batching outdated-read rewrites to preserve provider prefix caches, and normalizing JSON-like tool inputs by schema.
-- Fix login and feature-flag resolution by using the correct user/account identity on startup and simplifying the login UX.
-
 ## [3.89.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

@@ -149,7 +149,7 @@ Toggle between Plan mode and Act mode. In Plan mode, Cline explores your codebas
 
 ## Rules and Skills
 
-Define project-specific rules in `.clinerules` files that guide how Cline works in your codebase: coding standards, architecture conventions, deployment procedures, testing requirements. Rules are picked up automatically by the CLI, VS Code extension, and JetBrains plugin. Use skills to let the model load specific rules when needed.
+Define project-specific rules in `.clinerules` files that guide how Cline works in your codebase: coding standards, architecture conventions, deployment procedures, testing requirements. Rules are picked up automatically by the CLI, VS Code extension, and JetBrains plugin. Use skills to let the model load specific rules when needed. 
 
 ## Works With Every Model
 
@@ -158,10 +158,10 @@ Cline is not locked to a single AI provider. Use whichever model fits your workf
 | Provider | Models |
 |----------|--------|
 | Anthropic | Claude Opus, Sonnet, Haiku |
-| OpenAI | GPT series models |
-| Google | Gemini series models |
+| OpenAI | GPT series model |
+| Google | Gemini series model |
 | OpenRouter | 200+ models from any provider |
-| Vercel AI Gateway | Route to many providers through one gateway |
+| Vercel AI Gateway | Models through Vercel AI Gateway |
 | AWS Bedrock | Claude, Llama, and more |
 | Azure / GCP Vertex | All hosted models |
 | Cerebras / Groq | Fast inference models |

apps/cli/CHANGELOG.md

@@ -1,141 +1,5 @@
 # Cline CLI Changelog
 
-## 3.0.46
-
-- Fixed out-of-credits detection so the CLI reliably recognizes the Cline API's real `insufficient_credits` (402) error and shows the "add credits" card instead of a generic error
-
-## 3.0.45
-
-- Smaller install: the Claude Code and Codex providers are now optional and loaded on demand, cutting `npm i -g cline` from ~640MB to ~285MB (from SDK v0.0.65)
-- Kimi K3 is now available as a ClinePass model (from SDK v0.0.65)
-- Runs now retry once after refreshing expired OAuth credentials (from SDK v0.0.65)
-- Team runs: the spawn tool is no longer exposed to teammates, and errored teammate runs now report as failed instead of completed (from SDK v0.0.65)
-- Hub status output now includes version numbers
-- Updated the bundled model catalog (from SDK v0.0.65)
-
-## 3.0.44
-
-- Improved max output token handling across providers (gateway routing, OpenAI vendor, and reasoning models) (from SDK v0.0.64)
-- Frontmatter and configuration files that start with a UTF-8 byte order mark (e.g. saved by Windows editors) now parse correctly (from SDK v0.0.64)
-
-## 3.0.43
-
-- The CLI now automatically trusts your operating system's certificate store, so it works behind corporate proxies and TLS-inspecting firewalls without manually setting `NODE_EXTRA_CA_CERTS` (fixes "unable to get local issuer certificate" errors, including Windows intermediate CA stores)
-
-## 3.0.42
-
-- Fixed Ollama native API routing so context window and timeout settings work again
-
-## 3.0.41
-
-- Compaction now shows progress status in the TUI
-- Model IDs are now suggested from OpenAI-compatible endpoints when configuring a provider
-- Workspace git info (branch/remote) is now persisted and refreshed across sessions
-- Compaction no longer runs during an active turn
-- Fixed a crash when the terminal title was updated during TUI teardown
-- The API key fallback hint is now highlighted for better visibility
-- Benign git states are no longer reported as workspace initialization errors
-
-## 3.0.40
-
-- Added a manual API key escape hatch for Cline OAuth providers, so you can enter a key by hand from settings
-- Fixed provider config not reloading when switching models
-- Fixed auto-update failing to detect Bun global installs after symlink resolution
-- Fixed unexpected logouts caused by transient network or server errors during token refresh
-- The ClinePass usage-limit error is now surfaced clearly when you hit the limit
-- Session id is now preserved when continuing within the same session
-- Hardened context compaction budget handling
-
-## 3.0.39
-
-- You can now select Cline free models on the ClinePass provider in the model picker
-- Removed the retired ClinePass GLM 5.1 model
-- Fixed OpenAI Codex model metadata under the GPT Subscription provider
-- `str_replace` edits now report accurate diffs
-- Fixed context compaction so canonical session history is preserved
-- The detached hub daemon now emits telemetry, and telemetry identity now includes `user_id`
-- Cline provider requests now send versioned client-identity headers
-
-## 3.0.38
-
-- New plan/act accent palette: act mode is now blue (`#79b8ff`) and plan mode amber, replacing the old cyan/yellow — applied across dialogs, the model selector, config, onboarding, markdown, and syntax highlighting, with light-theme variants tuned for contrast
-- Restyled chat input: a minimal frame with full-width horizontal rules and a bold accent prompt glyph instead of the tinted background, plus slimmer user-message bubbles
-- Assistant markdown accents are now tinted by the mode (plan/act) they were produced in
-- Polished the status bar usage display and ClinePass model name
-- Harmonized the success/diff green and dark syntax-highlighting colors with the new brand palette
-- The thinking-level picker now defaults its cursor to Medium instead of Off
-- `read_files` now tolerates malformed input from weaker models: line-range entries (`start_line`/`end_line`) sent as separate array items are coalesced back onto the preceding file path instead of being rejected (from SDK v0.0.58)
-- Models in the live catalog that don't report a context window now default to a 128K input-token limit, so under-specified models get a usable context budget (from SDK v0.0.57)
-
-## 3.0.37
-
-- Weaker models (e.g. DeepSeek) that emit malformed tool calls — wrong argument types or truncated JSON — are now handled gracefully and run instead of erroring out
-- Plan/act mode switches are now visible to the model, so it knows when you change modes mid-session
-- Fixed plan/act mode notices being dropped from prompts sent to the model
-- Fixed a race where switching modes in an empty session could trigger an unexpected restart
-
-## 3.0.36
-
-- Fixed plan mode's `switch_to_act_mode` tool not taking effect until the end of the turn: the model would keep running with plan-mode tools (no file editor) and fall back to editing files through shell commands. Switching to act mode now ends the plan-mode run and automatically continues with the approved plan using the full act-mode toolset. A Tab mode toggle racing a completing turn can no longer auto-start plan execution you didn't approve.
-
-## 3.0.35
-
-- ClinePass is now enabled for all CLI users
-- Recover missing interactive sessions when reading messages
-- Format structured commands in history export
-- Add the subscription promo code when linking to the dashboard subscription page
-- Add Tencent TokenHub as a provider (from SDK v0.0.55)
-- Fix first-prompt truncation on high-output models (e.g. MiniMax M3) that could immediately auto-compact and cut the initial task down to just the input wrapper (from SDK v0.0.55)
-- Use a curated default when migrating legacy provider settings (from SDK v0.0.55)
-- Advertise run commands as shell strings (from SDK v0.0.55)
-- Refresh the bundled model catalog with the latest provider models (from SDK v0.0.55)
-
-## 3.0.34
-
-- Fixed the ClinePass upgrade notice appearing immediately after completing onboarding.
-- Improved the wording of the ClinePass onboarding step.
-- Streamlined the Cline provider picker by merging the subscription and usage/billing options into one and removing the credits link.
-
-## 3.0.33
-
-- Show a ClinePass subscription URL as a fallback during onboarding so you can still subscribe if the subscription screen can't open automatically
-- Hide the ClinePass promo for users who already have a ClinePass subscription
-- Use an adaptive plan accent color for ClinePass prompts so they fit the active theme
-
-## 3.0.32
-
-- Improved the ClinePass onboarding experience
-- Added an intermediate step before going to ClinePass model selection
-- Made the ClinePass subscription screen selectable
-- Promoted ClinePass in the startup notice
-- Used "ClinePass" as one word consistently and refined the provider UI copy
-- More accurate context compaction and clearer error messages (from SDK v0.0.54)
-
-## 3.0.31
-
-- Show when request cost is covered by your Cline subscription
-- Prompt to switch to ClinePass when you run out of credits, and list ClinePass features in the not-subscribed message
-- Added an option to open the subscription page from the ClinePass options
-- Added marketplace uninstall support and surfaced plugin-bundled skills
-- Require quoted prompts for one-shot mode
-- Capped MCP tool names at 64 characters for OpenAI-compatible providers
-- Updated coupon code
-
-## 3.0.30
-
-- Added a token count to the status bar, shown alongside cost
-- Added organization-specific error messages
-- Added SAP AI Core provider support
-- Refreshed the model catalog with the latest provider models
-- Preserved OpenRouter reasoning-disable behavior and improved OpenRouter prompt caching
-- Routed LiteLLM model fetches through the SDK and stopped unrelated models from appearing in the LiteLLM model list
-- Updated ClinePass models live, restored ClinePass models in onboarding, and improved ClinePass error messages
-- Threaded proxy/CA-aware networking into the inference path
-- Persisted Bedrock settings to providers.json
-- Normalized JSON-like tool inputs by schema for more reliable tool calls
-- Fixed an "ERROR: EMPTY CONTENT" message that could appear when an error occurred
-- Fixed a packaging issue (createRequire) that could break the CLI at runtime
-
 ## 3.0.29
 
 - Costs are now hidden for Cline free models

apps/cli/README.md

@@ -346,24 +346,9 @@ Desktop-integrated approval mode is also supported via env wiring (`CLINE_TOOL_A
 - `CLINE_LOG_LEVEL` - Runtime log level (`trace|debug|info|warn|error|fatal|silent`, default `info`)
 - `CLINE_LOG_PATH` - Runtime log file path (default `<CLINE_DATA_DIR>/logs/cline.log`)
 - `CLINE_LOG_NAME` - Logger name embedded in runtime log records
-- `CLINE_DEBUG` - Set to `1`/`true` to print wrapper diagnostics (e.g. the CA bundle summary)
 
 `--key` takes precedence over environment variables.
 
-## Certificate trust
-
-The CLI automatically trusts your operating system's certificate store, so it
-works behind corporate TLS-inspecting proxies and with self-signed/internal
-endpoints without any setup. On launch the `cline` wrapper harvests the OS trust
-anchors and writes them to `~/.cline/cli-node-extra-ca-certs.pem`, then points
-the runtime's `NODE_EXTRA_CA_CERTS` at that bundle. The file is regenerated when
-it changes and is safe to delete (it is rebuilt on the next run).
-
-If you set `NODE_EXTRA_CA_CERTS` yourself, your certificates are **merged** into
-that bundle alongside the system store rather than replacing it. Run with
-`CLINE_DEBUG=1` to see how many OS and user CAs were loaded and where the bundle
-was written.
-
 ## Contributing
 
 See [DEVELOPMENT.md](./DEVELOPMENT.md) for local development setup, monorepo structure, and TUI architecture. See [DISTRIBUTION.md](./DISTRIBUTION.md) for how the CLI is packaged and distributed.

apps/cli/bin/ca-certs.cjs

@@ -1,281 +0,0 @@
-// Auto-discovery of OS trust anchors for the Cline CLI.
-//
-// Bun does not read the OS trust store, so the 3.x CLI cannot see corporate
-// MITM / self-signed CAs out of the box. This runs in the Node `bin/cline`
-// wrapper (not Bun), reads the full OS store via tls.getCACertificates("system")
-// (Node >= 22, no --use-system-ca flag), and hands the certs to the Bun child
-// via NODE_EXTRA_CA_CERTS, which both runtimes honor. Mirrors the JetBrains
-// plugin's configureCertificates(), sourcing from the OS instead of the IDE.
-//
-// Dependency-free CommonJS with injectable modules so it is unit-testable and
-// ships verbatim in the published wrapper package.
-
-const PEM_MARKER = "-----BEGIN CERTIFICATE-----";
-const CERT_BLOCK =
-	/-----BEGIN CERTIFICATE-----[\s\S]*?-----END CERTIFICATE-----/g;
-
-/**
- * Returns only the complete certificate blocks from PEM text, or null when
- * there are none. User files may also hold private keys (combined cert+key
- * PEMs) or other sections, which must never be copied into the managed
- * bundle. Files that contain nothing but certificates pass through verbatim
- * so unchanged bundles keep hash-skipping the rewrite.
- */
-function sanitizePem(text) {
-	const blocks = text.match(CERT_BLOCK) ?? [];
-	if (blocks.length === 0) {
-		return null;
-	}
-	const rest = text.replace(CERT_BLOCK, "");
-	if (/^\s*$/.test(rest)) {
-		return text;
-	}
-	return `${blocks.join("\n")}\n`;
-}
-
-/**
- * Returns OS-trusted certificates as PEM strings, or [] when unavailable.
- * tls.getCACertificates("system") requires Node >= 22.
- */
-function harvestSystemCerts(tlsModule) {
-	try {
-		const tls = tlsModule || require("node:tls");
-		if (typeof tls.getCACertificates !== "function") {
-			return [];
-		}
-		const certs = tls.getCACertificates("system");
-		if (!Array.isArray(certs)) {
-			return [];
-		}
-		return certs.filter(
-			(cert) => typeof cert === "string" && cert.includes(PEM_MARKER),
-		);
-	} catch {
-		return [];
-	}
-}
-
-/**
- * Returns the file's certificate blocks as PEM text, or null when missing,
- * unreadable, or holding no complete certificate block.
- */
-function readUserBundle(fsModule, userPath) {
-	if (!userPath) {
-		return null;
-	}
-	try {
-		const fs = fsModule || require("node:fs");
-		const stat = fs.statSync(userPath, { throwIfNoEntry: false });
-		if (!stat || !stat.isFile()) {
-			return null;
-		}
-		// Binary DER would not have loaded in the runtime either; require PEM.
-		return sanitizePem(fs.readFileSync(userPath, "utf8"));
-	} catch {
-		return null;
-	}
-}
-
-/**
- * Reads the user's NODE_EXTRA_CA_CERTS value into PEM strings. Node treats the
- * value as a single file, but some users set an OS-path-delimited list; the
- * whole value is tried as one file first, then split.
- * The managed bundle is excluded so reading it back never re-appends its certs.
- */
-function readUserCerts(fsModule, pathModule, value, managedPath) {
-	if (!value) {
-		return [];
-	}
-	const fs = fsModule || require("node:fs");
-	const path = pathModule || require("node:path");
-	const candidates = [];
-	const whole = readUserBundle(fs, value);
-	if (whole) {
-		candidates.push({ filePath: value, pem: whole });
-	} else if (value.includes(path.delimiter)) {
-		for (const segment of value.split(path.delimiter)) {
-			const trimmed = segment.trim();
-			if (!trimmed) {
-				continue;
-			}
-			const pem = readUserBundle(fs, trimmed);
-			if (pem) {
-				candidates.push({ filePath: trimmed, pem });
-			}
-		}
-	}
-	const pems = [];
-	for (const candidate of candidates) {
-		const isManaged =
-			managedPath &&
-			path.resolve(candidate.filePath) === path.resolve(managedPath);
-		if (!isManaged) {
-			pems.push(candidate.pem);
-		}
-	}
-	return pems;
-}
-
-/**
- * Concatenates the user PEMs (if any) and the system certificates into one
- * bundle. A separating newline is inserted between parts so adjacent END/BEGIN
- * markers cannot fuse into one invalid line.
- */
-function buildBundle({ systemCerts, userPems }) {
-	const parts = [...(userPems ?? []), ...systemCerts];
-	return parts
-		.map((part) => (part.endsWith("\n") ? part : `${part}\n`))
-		.join("");
-}
-
-/** Counts individual PEM certificates across the given bundle strings. */
-function countCerts(pems) {
-	let count = 0;
-	for (const pem of pems) {
-		count += pem.split(PEM_MARKER).length - 1;
-	}
-	return count;
-}
-
-function readFileIfExists(fs, filePath) {
-	try {
-		return fs.readFileSync(filePath, "utf8");
-	} catch {
-		return null;
-	}
-}
-
-function resolveClineDir(env, os, path) {
-	return env.CLINE_DIR?.trim() || path.join(os.homedir(), ".cline");
-}
-
-/**
- * True when the api-unavailable warning should print. Stamped per Node version
- * in the cline dir so the nudge shows once rather than on every command; a
- * version change (upgrade that still falls short, or downgrade) re-arms it.
- * When the stamp cannot be read or written, warn — bookkeeping failures must
- * never suppress a real diagnostic.
- */
-function shouldWarnApiUnavailable(env, deps = {}) {
-	const fs = deps.fs || require("node:fs");
-	const os = deps.os || require("node:os");
-	const path = deps.path || require("node:path");
-	const version = deps.nodeVersion || process.versions.node;
-	const dir = resolveClineDir(env, os, path);
-	const stamp = path.join(dir, `.ca-api-warned-${version}`);
-	try {
-		if (fs.existsSync(stamp)) {
-			return false;
-		}
-		fs.mkdirSync(dir, { recursive: true });
-		fs.writeFileSync(stamp, "", { mode: 0o600 });
-		return true;
-	} catch {
-		return true;
-	}
-}
-
-/** Atomically writes [content] to [target]; returns true on success. */
-function writeBundle(fs, dir, target, content) {
-	const tmp = `${target}.${process.pid}.${Date.now()}.tmp`;
-	try {
-		fs.mkdirSync(dir, { recursive: true });
-		// Owner read/write: the bundle holds public CA material, not secrets,
-		// but there is no reason to make it world-writable.
-		fs.writeFileSync(tmp, content, { mode: 0o600 });
-		try {
-			fs.renameSync(tmp, target);
-		} catch {
-			// Windows can reject rename over a file a concurrent child holds open.
-			fs.rmSync(target, { force: true });
-			fs.renameSync(tmp, target);
-		}
-		return true;
-	} catch {
-		// Never leave a partial temp file behind (e.g. ENOSPC mid-write).
-		try {
-			fs.rmSync(tmp, { force: true });
-		} catch {
-			// Ignore: best-effort cleanup.
-		}
-		return false;
-	}
-}
-
-/**
- * Harvests OS trust anchors, merges them with any user NODE_EXTRA_CA_CERTS, and
- * points env.NODE_EXTRA_CA_CERTS at a single managed PEM bundle. Mutates `env`
- * in place. Returns an outcome the caller can log; `action` is one of
- * "unchanged" | "written" | "write-failed-reused" | "write-failed" |
- * "no-system-certs" | "api-unavailable".
- */
-function configureNodeExtraCaCerts(env, deps = {}) {
-	const fs = deps.fs || require("node:fs");
-	const os = deps.os || require("node:os");
-	const path = deps.path || require("node:path");
-	const tls = deps.tls || require("node:tls");
-
-	// tls.getCACertificates("system") needs Node >= 22.15; on older Nodes the
-	// harvest cannot run at all, which the caller should surface to the user.
-	if (typeof tls.getCACertificates !== "function") {
-		return {
-			action: "api-unavailable",
-			path: null,
-			systemCertCount: 0,
-			userCertCount: 0,
-		};
-	}
-
-	const systemCerts = harvestSystemCerts(tls);
-	if (systemCerts.length === 0) {
-		// Nothing to add: leave any user-provided NODE_EXTRA_CA_CERTS untouched
-		// and let the runtime fall back to its bundled CAs.
-		return {
-			action: "no-system-certs",
-			path: null,
-			systemCertCount: 0,
-			userCertCount: 0,
-		};
-	}
-
-	const managedDir = resolveClineDir(env, os, path);
-	const managedPath = path.join(managedDir, "cli-node-extra-ca-certs.pem");
-	const userValue = (env.NODE_EXTRA_CA_CERTS || "").trim() || null;
-	const userPems = readUserCerts(fs, path, userValue, managedPath);
-	const bundle = buildBundle({ systemCerts, userPems });
-	const base = {
-		path: managedPath,
-		systemCertCount: systemCerts.length,
-		userCertCount: countCerts(userPems),
-	};
-
-	// Skip the rewrite when the bundle is already current. Avoids per-launch I/O
-	// and the concurrent-rename race in the steady state.
-	if (readFileIfExists(fs, managedPath) === bundle) {
-		env.NODE_EXTRA_CA_CERTS = managedPath;
-		return { ...base, action: "unchanged" };
-	}
-
-	if (writeBundle(fs, managedDir, managedPath, bundle)) {
-		env.NODE_EXTRA_CA_CERTS = managedPath;
-		return { ...base, action: "written" };
-	}
-
-	// Write failed: fall back to a previously-written bundle if one exists.
-	if (readFileIfExists(fs, managedPath)) {
-		env.NODE_EXTRA_CA_CERTS = managedPath;
-		return { ...base, action: "write-failed-reused" };
-	}
-	return { ...base, path: null, action: "write-failed" };
-}
-
-module.exports = {
-	harvestSystemCerts,
-	sanitizePem,
-	readUserBundle,
-	readUserCerts,
-	buildBundle,
-	countCerts,
-	configureNodeExtraCaCerts,
-	shouldWarnApiUnavailable,
-};

apps/cli/bin/cline

@@ -23,48 +23,6 @@ const childEnv = {
 	CLINE_WRAPPER_PATH: scriptPath,
 };
 
-// Auto-discover OS trust anchors and pass them to the Bun child via
-// NODE_EXTRA_CA_CERTS. The Bun runtime does not read the OS store on its own,
-// so corporate/self-signed CAs would otherwise fail. This wrapper runs on
-// Node, which can read the full store here.
-try {
-	const caCerts = require("./ca-certs.cjs");
-	const outcome = caCerts.configureNodeExtraCaCerts(childEnv);
-	const debug =
-		process.env.CLINE_DEBUG === "1" || process.env.CLINE_DEBUG === "true";
-	// Not debug-gated: on old Nodes the harvest silently doing nothing is
-	// indistinguishable from a broken corporate proxy. Stamped per Node
-	// version so the nudge shows once, not on every command.
-	if (
-		outcome &&
-		outcome.action === "api-unavailable" &&
-		!childEnv.NODE_EXTRA_CA_CERTS &&
-		caCerts.shouldWarnApiUnavailable(childEnv)
-	) {
-		console.warn(
-			`[cline] Node ${process.versions.node} cannot read the OS trust store (needs >= 22.15); ` +
-				"corporate or self-signed CAs may fail TLS. Upgrade Node or set NODE_EXTRA_CA_CERTS.",
-		);
-	}
-	if (debug && outcome) {
-		if (outcome.action === "no-system-certs") {
-			console.warn(
-				"[cline] No OS trust anchors found; relying on the runtime's bundled CAs.",
-			);
-		} else if (outcome.action === "write-failed") {
-			console.warn(
-				"[cline] Could not write the managed CA bundle; relying on the runtime's bundled CAs.",
-			);
-		} else {
-			console.warn(
-				`[cline] Trust: ${outcome.systemCertCount} OS + ${outcome.userCertCount} user CAs (${outcome.action}) -> ${outcome.path}`,
-			);
-		}
-	}
-} catch {
-	// Best effort: fall back to the runtime's default trust on any failure.
-}
-
 function run(target) {
 	const result = childProcess.spawnSync(target, process.argv.slice(2), {
 		stdio: "inherit",

apps/cli/bun.mts

@@ -121,7 +121,7 @@ const result = await Bun.build({
 	},
 	env: "OTEL_*",
 	banner:
-		'import { createRequire as __clineCreateRequire } from "node:module"; const require = __clineCreateRequire(import.meta.url);',
+		'import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);',
 });
 
 if (result.logs.length > 0) {

apps/cli/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@cline/cli",
 	"displayName": "cline",
-	"version": "3.0.46",
+	"version": "3.0.29",
 	"description": "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
 	"type": "module",
 	"publishConfig": {

apps/cli/src/acp/acpAgent.ts

@@ -511,7 +511,6 @@ export class AcpAgent implements Agent {
 
 	private async buildConfig(session: SessionState): Promise<Config> {
 		const cwd = session.cwd || process.cwd();
-		const workspaceRoot = resolveWorkspaceRoot(cwd);
 		// Resolve credentials: env vars take precedence, then session provider.
 		const providerId = process.env.CLINE_PROVIDER ?? session.currentProviderId;
 		const apiKey = process.env.CLINE_API_KEY ?? this.authResult?.apiKey ?? "";
@@ -520,7 +519,6 @@ export class AcpAgent implements Agent {
 			providerId,
 			mode: session.currentMode,
 		});
-		const cliBuildInfo = getCliBuildInfo();
 
 		return {
 			providerId,
@@ -539,23 +537,7 @@ export class AcpAgent implements Agent {
 			enableAgentTeams: false,
 			enableTools: true,
 			cwd,
-			workspaceRoot,
-			extensionContext: {
-				client: {
-					name: "cline-acp",
-					version: cliBuildInfo.version,
-					platform: "cli",
-					platformVersion: cliBuildInfo.version,
-					isMultiRoot: false,
-				},
-				workspace: {
-					rootPath: workspaceRoot,
-					cwd,
-					workspaceName: cwd,
-					ide: "Terminal Shell",
-					platform: process.platform,
-				},
-			},
+			workspaceRoot: resolveWorkspaceRoot(cwd),
 		};
 	}
 }

apps/cli/src/bin/ca-certs.test.ts

@@ -1,367 +0,0 @@
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { delimiter, join } from "node:path";
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
-
-// The helper ships as CommonJS in the published wrapper package, so it is
-// loaded via require rather than an ESM import.
-const caCerts = require("../../bin/ca-certs.cjs") as {
-	harvestSystemCerts: (tls?: unknown) => string[];
-	readUserBundle: (fs: unknown, p: string | null) => string | null;
-	readUserCerts: (
-		fs: unknown,
-		path: unknown,
-		value: string | null,
-		managedPath: string | null,
-	) => string[];
-	buildBundle: (input: {
-		systemCerts: string[];
-		userPems?: string[];
-	}) => string;
-	countCerts: (pems: string[]) => number;
-	configureNodeExtraCaCerts: (
-		env: Record<string, string>,
-		deps?: { tls?: unknown; fs?: unknown },
-	) => {
-		action: string;
-		path: string | null;
-		systemCertCount: number;
-		userCertCount: number;
-	};
-	shouldWarnApiUnavailable: (
-		env: Record<string, string>,
-		deps?: { fs?: unknown; nodeVersion?: string },
-	) => boolean;
-};
-
-const fs = require("node:fs");
-const path = require("node:path");
-
-const certSystem =
-	"-----BEGIN CERTIFICATE-----\nSYSTEM\n-----END CERTIFICATE-----\n";
-const certUser = "-----BEGIN CERTIFICATE-----\nUSER\n-----END CERTIFICATE-----";
-
-function fakeTls(certs: unknown) {
-	return { getCACertificates: () => certs };
-}
-
-describe("ca-certs", () => {
-	let dir: string;
-
-	beforeEach(() => {
-		dir = mkdtempSync(join(tmpdir(), "cline-ca-"));
-	});
-
-	afterEach(() => {
-		rmSync(dir, { recursive: true, force: true });
-	});
-
-	describe("harvestSystemCerts", () => {
-		it("returns only PEM strings from the system store", () => {
-			expect(
-				caCerts.harvestSystemCerts(fakeTls([certSystem, "not-a-cert", 42])),
-			).toEqual([certSystem]);
-		});
-
-		it("returns [] when getCACertificates is unavailable", () => {
-			expect(caCerts.harvestSystemCerts({})).toEqual([]);
-		});
-
-		it("returns [] when getCACertificates throws", () => {
-			expect(
-				caCerts.harvestSystemCerts({
-					getCACertificates: () => {
-						throw new Error("nope");
-					},
-				}),
-			).toEqual([]);
-		});
-	});
-
-	describe("readUserBundle", () => {
-		it("returns PEM contents for a PEM file", () => {
-			const p = join(dir, "user.pem");
-			writeFileSync(p, certUser);
-			expect(caCerts.readUserBundle(fs, p)).toBe(certUser);
-		});
-
-		it("returns null for a non-PEM (DER) file", () => {
-			const p = join(dir, "user.der");
-			writeFileSync(p, Buffer.from([0x30, 0x82, 0x01, 0x02]));
-			expect(caCerts.readUserBundle(fs, p)).toBeNull();
-		});
-
-		it("returns null for a missing file and for null path", () => {
-			expect(caCerts.readUserBundle(fs, join(dir, "nope.pem"))).toBeNull();
-			expect(caCerts.readUserBundle(fs, null)).toBeNull();
-		});
-
-		it("strips non-certificate sections such as private keys", () => {
-			// Combined cert+key files (nginx/haproxy style) are common; the key
-			// must never reach the managed bundle.
-			const p = join(dir, "combined.pem");
-			writeFileSync(
-				p,
-				`${certUser}\n-----BEGIN PRIVATE KEY-----\nSECRET\n-----END PRIVATE KEY-----\n`,
-			);
-			const out = caCerts.readUserBundle(fs, p);
-			expect(out).toContain("USER");
-			expect(out).not.toContain("PRIVATE KEY");
-			expect(out).not.toContain("SECRET");
-		});
-
-		it("keeps certificates-only files verbatim", () => {
-			// Byte-identical passthrough keeps the unchanged-skip hash stable.
-			const p = join(dir, "clean.pem");
-			writeFileSync(p, `${certUser}\n${certSystem}`);
-			expect(caCerts.readUserBundle(fs, p)).toBe(`${certUser}\n${certSystem}`);
-		});
-
-		it("returns null for a BEGIN marker without a complete block", () => {
-			const p = join(dir, "truncated.pem");
-			writeFileSync(p, "-----BEGIN CERTIFICATE-----\ntruncated");
-			expect(caCerts.readUserBundle(fs, p)).toBeNull();
-		});
-	});
-
-	describe("readUserCerts", () => {
-		it("reads a single PEM file path", () => {
-			const p = join(dir, "corp.pem");
-			writeFileSync(p, certUser);
-			expect(caCerts.readUserCerts(fs, path, p, null)).toEqual([certUser]);
-		});
-
-		it("splits a legacy OS-path-delimited value and reads each PEM", () => {
-			// Legacy footgun: NODE_EXTRA_CA_CERTS="a.pem;b.pem".
-			const a = join(dir, "a.pem");
-			const b = join(dir, "b.pem");
-			writeFileSync(a, certUser);
-			writeFileSync(b, certSystem);
-			expect(
-				caCerts.readUserCerts(fs, path, [a, b].join(delimiter), null),
-			).toEqual([certUser, certSystem]);
-		});
-
-		it("skips missing segments in a delimited value", () => {
-			const a = join(dir, "a.pem");
-			writeFileSync(a, certUser);
-			const value = [a, join(dir, "missing.pem")].join(delimiter);
-			expect(caCerts.readUserCerts(fs, path, value, null)).toEqual([certUser]);
-		});
-
-		it("excludes the managed bundle from user certs", () => {
-			const managed = join(dir, "cli-node-extra-ca-certs.pem");
-			writeFileSync(managed, certUser);
-			expect(caCerts.readUserCerts(fs, path, managed, managed)).toEqual([]);
-		});
-
-		it("returns [] for empty value", () => {
-			expect(caCerts.readUserCerts(fs, path, null, null)).toEqual([]);
-		});
-	});
-
-	describe("buildBundle", () => {
-		it("merges user PEMs before system certs", () => {
-			expect(
-				caCerts.buildBundle({
-					systemCerts: [certSystem],
-					userPems: [certUser],
-				}),
-			).toBe(`${certUser}\n${certSystem}`);
-		});
-
-		it("inserts a separating newline so END/BEGIN markers do not fuse", () => {
-			// certUser has no trailing newline, so this proves the boundary fix.
-			const merged = caCerts.buildBundle({
-				systemCerts: [certSystem],
-				userPems: [certUser],
-			});
-			expect(merged).not.toContain(
-				"-----END CERTIFICATE----------BEGIN CERTIFICATE-----",
-			);
-		});
-
-		it("handles no user PEMs", () => {
-			expect(caCerts.buildBundle({ systemCerts: [certSystem] })).toBe(
-				certSystem,
-			);
-		});
-	});
-
-	describe("configureNodeExtraCaCerts", () => {
-		it("writes a managed bundle and points the env var at it", () => {
-			const env: Record<string, string> = { CLINE_DIR: dir };
-			const out = caCerts.configureNodeExtraCaCerts(env, {
-				tls: fakeTls([certSystem]),
-			});
-			expect(out.action).toBe("written");
-			expect(out.path).toBe(join(dir, "cli-node-extra-ca-certs.pem"));
-			expect(env.NODE_EXTRA_CA_CERTS).toBe(out.path);
-			expect(readFileSync(out.path as string, "utf8")).toContain("SYSTEM");
-		});
-
-		it("merges a user-supplied NODE_EXTRA_CA_CERTS with system certs", () => {
-			const userPath = join(dir, "corp.pem");
-			writeFileSync(userPath, certUser);
-			const env: Record<string, string> = {
-				CLINE_DIR: dir,
-				NODE_EXTRA_CA_CERTS: userPath,
-			};
-			const out = caCerts.configureNodeExtraCaCerts(env, {
-				tls: fakeTls([certSystem]),
-			});
-			expect(out.userCertCount).toBe(1);
-			const written = readFileSync(env.NODE_EXTRA_CA_CERTS, "utf8");
-			expect(written).toContain("USER");
-			expect(written).toContain("SYSTEM");
-		});
-
-		it("reports unchanged and skips rewrite on the second run", () => {
-			const env: Record<string, string> = { CLINE_DIR: dir };
-			expect(
-				caCerts.configureNodeExtraCaCerts(env, { tls: fakeTls([certSystem]) })
-					.action,
-			).toBe("written");
-			expect(
-				caCerts.configureNodeExtraCaCerts(env, { tls: fakeTls([certSystem]) })
-					.action,
-			).toBe("unchanged");
-		});
-
-		it("does not re-append when the user already points at the managed bundle", () => {
-			const env: Record<string, string> = { CLINE_DIR: dir };
-			const first = caCerts.configureNodeExtraCaCerts(env, {
-				tls: fakeTls([certSystem]),
-			}).path as string;
-			const env2: Record<string, string> = {
-				CLINE_DIR: dir,
-				NODE_EXTRA_CA_CERTS: first,
-			};
-			caCerts.configureNodeExtraCaCerts(env2, { tls: fakeTls([certSystem]) });
-			const written = readFileSync(env2.NODE_EXTRA_CA_CERTS, "utf8");
-			expect(written.match(/SYSTEM/g)?.length).toBe(1);
-		});
-
-		it("no-ops when no system certs are available", () => {
-			const env: Record<string, string> = {
-				CLINE_DIR: dir,
-				NODE_EXTRA_CA_CERTS: "/user/corp.pem",
-			};
-			const out = caCerts.configureNodeExtraCaCerts(env, { tls: fakeTls([]) });
-			expect(out.action).toBe("no-system-certs");
-			expect(out.path).toBeNull();
-			expect(env.NODE_EXTRA_CA_CERTS).toBe("/user/corp.pem");
-		});
-
-		it("reports api-unavailable on Nodes without getCACertificates", () => {
-			const env: Record<string, string> = {
-				CLINE_DIR: dir,
-				NODE_EXTRA_CA_CERTS: "/user/corp.pem",
-			};
-			const out = caCerts.configureNodeExtraCaCerts(env, { tls: {} });
-			expect(out.action).toBe("api-unavailable");
-			expect(out.path).toBeNull();
-			expect(env.NODE_EXTRA_CA_CERTS).toBe("/user/corp.pem");
-		});
-
-		it("reports write-failed when the bundle cannot be written", () => {
-			const realFs = require("node:fs");
-			const failingFs = {
-				...realFs,
-				mkdirSync: () => {
-					throw new Error("EACCES");
-				},
-				writeFileSync: () => {
-					throw new Error("EACCES");
-				},
-			};
-			const env: Record<string, string> = { CLINE_DIR: dir };
-			const out = caCerts.configureNodeExtraCaCerts(env, {
-				tls: fakeTls([certSystem]),
-				fs: failingFs,
-			});
-			expect(out.action).toBe("write-failed");
-			expect(out.path).toBeNull();
-			expect(env.NODE_EXTRA_CA_CERTS).toBeUndefined();
-		});
-
-		it("reuses a stale bundle when the rewrite fails", () => {
-			// First run writes the bundle normally.
-			const env: Record<string, string> = { CLINE_DIR: dir };
-			const managedPath = caCerts.configureNodeExtraCaCerts(env, {
-				tls: fakeTls([certSystem]),
-			}).path as string;
-
-			// Second run: writes fail, but the stale bundle is still readable.
-			const realFs = require("node:fs");
-			const failingFs = {
-				...realFs,
-				mkdirSync: () => {
-					throw new Error("EACCES");
-				},
-				writeFileSync: () => {
-					throw new Error("EACCES");
-				},
-			};
-			const env2: Record<string, string> = { CLINE_DIR: dir };
-			const out = caCerts.configureNodeExtraCaCerts(env2, {
-				// A different system cert forces a rewrite attempt (not "unchanged").
-				tls: fakeTls([certUser]),
-				fs: failingFs,
-			});
-
-			expect(out.action).toBe("write-failed-reused");
-			expect(env2.NODE_EXTRA_CA_CERTS).toBe(managedPath);
-		});
-	});
-
-	describe("countCerts", () => {
-		it("counts individual certificates, not files", () => {
-			// One file holding two certs must report 2, not 1.
-			const twoInOne = `${certUser}\n${certSystem}`;
-			expect(caCerts.countCerts([twoInOne])).toBe(2);
-			expect(caCerts.countCerts([certUser, certSystem])).toBe(2);
-			expect(caCerts.countCerts([])).toBe(0);
-		});
-	});
-
-	describe("shouldWarnApiUnavailable", () => {
-		it("warns once per Node version, then stays quiet", () => {
-			const env = { CLINE_DIR: dir };
-			const deps = { nodeVersion: "22.1.0" };
-			expect(caCerts.shouldWarnApiUnavailable(env, deps)).toBe(true);
-			expect(caCerts.shouldWarnApiUnavailable(env, deps)).toBe(false);
-		});
-
-		it("re-arms when the Node version changes", () => {
-			const env = { CLINE_DIR: dir };
-			expect(
-				caCerts.shouldWarnApiUnavailable(env, { nodeVersion: "22.1.0" }),
-			).toBe(true);
-			expect(
-				caCerts.shouldWarnApiUnavailable(env, { nodeVersion: "22.14.0" }),
-			).toBe(true);
-			expect(
-				caCerts.shouldWarnApiUnavailable(env, { nodeVersion: "22.1.0" }),
-			).toBe(false);
-		});
-
-		it("still warns when the stamp cannot be written", () => {
-			const realFs = require("node:fs");
-			const failingFs = {
-				...realFs,
-				mkdirSync: () => {
-					throw new Error("EACCES");
-				},
-				writeFileSync: () => {
-					throw new Error("EACCES");
-				},
-			};
-			const env = { CLINE_DIR: dir };
-			const deps = { fs: failingFs, nodeVersion: "22.1.0" };
-			// Bookkeeping failure must never suppress the diagnostic.
-			expect(caCerts.shouldWarnApiUnavailable(env, deps)).toBe(true);
-			expect(caCerts.shouldWarnApiUnavailable(env, deps)).toBe(true);
-		});
-	});
-});

apps/cli/src/commands/config.ts

@@ -1,4 +1,4 @@
-import { existsSync, readdirSync } from "node:fs";
+import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, extname, join } from "node:path";
 import {
@@ -15,7 +15,6 @@ import {
 	type SkillConfig,
 	type WorkflowConfig,
 } from "@cline/core";
-import { readFileSyncStrippingUtf8Bom } from "@cline/shared/node";
 import { Command } from "commander";
 import { getToolCatalog } from "../runtime/tools";
 import { loadInteractiveConfigData } from "../tui/interactive-config";
@@ -210,7 +209,7 @@ async function runAgentsConfigCommand(
 					continue;
 				}
 				const filePath = join(directory, entry.name);
-				const raw = readFileSyncStrippingUtf8Bom(filePath);
+				const raw = readFileSync(filePath, "utf8");
 				const frontmatterMatch = raw.match(/^---\r?\n([\s\S]*?)\r?\n---/);
 				const frontmatter = frontmatterMatch?.[1] ?? "";
 				const nameMatch = frontmatter.match(/^\s*name:\s*(.+?)\s*$/m);

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

@@ -9,7 +9,6 @@ import {
 import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { version as cliVersion } from "../../package.json";
 import { getCliBuildInfo } from "../utils/common";
 
 const {
@@ -175,40 +174,6 @@ describe("runDoctorCommand", () => {
 		);
 	});
 
-	it("reports CLI and running hub Core versions", async () => {
-		const cwd = "/workspace";
-		mockReadHubDiscovery.mockResolvedValue({
-			url: "ws://127.0.0.1:25463/hub",
-			port: 25463,
-			pid: 50174,
-			coreVersion: "0.0.63",
-		});
-		mockProbeHubServer.mockResolvedValue({
-			url: "ws://127.0.0.1:25463/hub",
-			port: 25463,
-			pid: 50174,
-			coreVersion: "0.0.64",
-		});
-		mockSpawnSync.mockReturnValue({ status: 1, stdout: "" });
-
-		const output: string[] = [];
-		const code = await runDoctorCommand(
-			{ cwd, json: true },
-			{
-				writeln: (text) => {
-					output.push(text ?? "");
-				},
-				writeErr: () => {},
-			},
-		);
-
-		expect(code).toBe(0);
-		expect(JSON.parse(output[0] || "")).toMatchObject({
-			cliVersion,
-			coreVersion: "0.0.64",
-		});
-	});
-
 	it("doctor --fix clears wedged hub startup artifacts when no server is actually running", async () => {
 		const cwd = mkdtempSync(path.join(os.tmpdir(), "doctor-hub-fix-"));
 		tempDirs.push(cwd);

apps/cli/src/commands/doctor.ts

@@ -14,7 +14,6 @@ import {
 import { formatUptime, resolveClineBuildEnv } from "@cline/shared";
 import { Command } from "commander";
 import open from "open";
-import { version as cliVersion } from "../../package.json";
 import { isProcessRunning } from "../connectors/common";
 import {
 	type ActiveConnectorRecord,
@@ -50,8 +49,6 @@ type SpawnedProcessRecord = {
 
 type DoctorStatus = {
 	cwd: string;
-	cliVersion: string;
-	coreVersion?: string;
 	hubUrl?: string;
 	hubHealthy: boolean;
 	hubPid?: number;
@@ -340,8 +337,6 @@ async function collectDoctorStatus(cwd: string): Promise<DoctorStatus> {
 	];
 	return {
 		cwd,
-		cliVersion,
-		coreVersion: health?.coreVersion ?? discovery?.coreVersion,
 		hubUrl: current?.url,
 		hubHealthy: !!health?.url,
 		hubPid: current?.pid,
@@ -424,8 +419,6 @@ export async function runDoctorCommand(
 			io.writeln(JSON.stringify(before));
 			return 0;
 		}
-		writeln(`cli version ${c.dim}${before.cliVersion}${c.reset}`);
-		writeln(`core version ${c.dim}${before.coreVersion ?? "n/a"}${c.reset}`);
 		writeln(`hub url ${c.dim}${before.hubUrl ?? "none"}${c.reset}`);
 		writeln(
 			`hub healthy ${c.dim}${before.hubHealthy ? "yes" : "no"}${before.hubPid ? ` (pid=${before.hubPid})` : ""}${c.reset}`,

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

@@ -313,45 +313,6 @@ describe("runHistoryExport", () => {
 		await expect(readFile(outputPath, "utf8")).resolves.toContain("world");
 	});
 
-	it("exports run_commands history with structured command objects", async () => {
-		tempDir = await mkdtemp(join(tmpdir(), "cline-history-export-"));
-		const outputPath = join(tempDir, "export.html");
-		const artifact = {
-			version: 1,
-			updated_at: "2026-04-22T17:42:10.123Z",
-			sessionId: "sess_1",
-			messages: [
-				{
-					id: "m1",
-					role: "assistant",
-					content: [
-						{
-							type: "tool_use",
-							id: "tool_1",
-							name: "run_commands",
-							input: {
-								commands: [{ command: "cmd", args: ["/c", "dir"] }],
-							},
-						},
-					],
-				},
-			],
-		} satisfies NonNullable<
-			Awaited<ReturnType<typeof readSessionMessagesArtifact>>
-		>;
-		mockedReadSessionMessagesArtifact.mockResolvedValue(artifact);
-		const io = {
-			writeln: vi.fn(),
-			writeErr: vi.fn(),
-		};
-
-		const code = await runHistoryExport("sess_1", outputPath, "text", io);
-
-		expect(code).toBe(0);
-		expect(io.writeErr).not.toHaveBeenCalled();
-		await expect(readFile(outputPath, "utf8")).resolves.toContain("cmd /c dir");
-	});
-
 	it("fails when the session artifact is missing", async () => {
 		mockedReadSessionMessagesArtifact.mockResolvedValue(undefined);
 		const io = {

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

@@ -34,7 +34,6 @@ vi.mock("@cline/core", () => ({
 	stopLocalHubServerGracefully: mockStopLocalHubServerGracefully,
 }));
 
-import { version as cliVersion } from "../../package.json";
 import { createHubCommand } from "./hub";
 
 const originalBuildEnv = process.env.CLINE_BUILD_ENV;
@@ -64,7 +63,6 @@ describe("createHubCommand", () => {
 			port: 25463,
 			pid: 50174,
 			startedAt: "2026-01-01T00:00:00.000Z",
-			coreVersion: "0.0.62",
 		});
 
 		const output: string[] = [];
@@ -90,8 +88,6 @@ describe("createHubCommand", () => {
 			pid: 50174,
 			startedAt: "2026-01-01T00:00:00.000Z",
 			uptime: "1m 5s",
-			cliVersion,
-			coreVersion: "0.0.62",
 		});
 	});
 

apps/cli/src/commands/hub.ts

@@ -9,7 +9,6 @@ import {
 } from "@cline/core";
 import { formatUptime, resolveClineBuildEnv } from "@cline/shared";
 import { Command } from "commander";
-import { version as cliVersion } from "../../package.json";
 
 interface HubCommandIo {
 	writeln: (text?: string) => void;
@@ -135,8 +134,6 @@ export function createHubCommand(
 					pid: health?.pid,
 					startedAt: health?.startedAt,
 					uptime,
-					cliVersion,
-					coreVersion: health?.coreVersion ?? discovery?.coreVersion,
 				}),
 			);
 		}),

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

@@ -1,27 +1,5 @@
-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,
-			};
-		}),
-	};
-});
+import { buildMcpInstallDefaults, runMcpInstallCommand } from "./mcp";
 
 describe("mcp install command", () => {
 	it("builds stdio wizard defaults from command args", () => {
@@ -110,52 +88,6 @@ describe("mcp install command", () => {
 		).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);
 
@@ -192,11 +124,11 @@ describe("mcp install command", () => {
 		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.",
+			"cline mcp install opens the MCP wizard and requires a TTY.",
 		);
 	});
 
-	it("checks for TTY before validating wizard install arguments", async () => {
+	it("checks for TTY before validating install arguments", async () => {
 		const writeErr = vi.fn();
 
 		const code = await runMcpInstallCommand({
@@ -207,65 +139,7 @@ describe("mcp install command", () => {
 
 		expect(code).toBe(1);
 		expect(writeErr).toHaveBeenCalledWith(
-			"cline mcp install opens the MCP wizard and requires a TTY. Pass --yes to install noninteractively.",
+			"cline mcp install opens the MCP wizard and requires a TTY.",
 		);
 	});
-
-	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,36 +1,21 @@
-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 {
+export interface McpInstallOptions {
+	name: string;
+	targetArgs?: string[];
+	transport?: string;
 	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"] {
+): McpAddDefaults["type"] {
 	const normalized = (value ?? "stdio").trim();
 	if (normalized === "http" || normalized === "streamable-http") {
 		return "streamableHttp";
@@ -106,18 +91,6 @@ export function buildMcpInstallDefaults(options: {
 	};
 }
 
-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({
@@ -131,23 +104,11 @@ 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.",
+				"cline mcp install opens the MCP wizard and requires a TTY.",
 			);
 		}
 		const defaults = buildMcpInstallDefaults(options);

apps/cli/src/commands/program.ts

@@ -33,7 +33,7 @@ export function addRootOptions(cmd: Command): Command {
 			.option("-c, --cwd <path>", "Working directory")
 			.option(
 				"--thinking <level>",
-				"Set reasoning effort: none|low|medium|high|xhigh. Bare --thinking uses medium; omitted leaves provider default.",
+				"Set reasoning effort level between none|low|medium|high|xhigh (default: medium)",
 			)
 			.option("--compaction <mode>", CLI_COMPACTION_MODE_OPTION_DESCRIPTION)
 			.option(

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

@@ -101,22 +101,6 @@ describe("getInstallationInfo", () => {
 		});
 	});
 
-	it("detects bun global installs from the resolved install path", () => {
-		// bun symlinks ~/.bun/bin/cline -> ~/.bun/install/global/node_modules/...,
-		// and realpathSync resolves through the symlink before detection runs.
-		const wrapperPath = createTempFile(
-			".bun/install/global/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.BUN,
-			packageName: "cline",
-			updateCommand: "bun add -g cline@latest",
-		});
-	});
-
 	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"];

apps/cli/src/commands/update.ts

@@ -118,12 +118,7 @@ export function getInstallationInfo(currentVersion: string): InstallationInfo {
 				updateCommand: `yarn global add ${DEFAULT_PACKAGE_NAME}@${tag}`,
 			};
 		}
-		// `bun add -g` symlinks bins into ~/.bun/bin, but realpathSync resolves
-		// them to ~/.bun/install/global/node_modules/..., so match both.
-		if (
-			scriptPath.includes("/.bun/bin") ||
-			scriptPath.includes("/.bun/install/global/")
-		) {
+		if (scriptPath.includes("/.bun/bin")) {
 			return {
 				packageManager: PackageManager.BUN,
 				packageName: DEFAULT_PACKAGE_NAME,

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

@@ -101,7 +101,7 @@ describe("buildConnectorStartRequest", () => {
 		expect(request.apiKey).toBe("env-openrouter-key");
 		expect(request.model).toBe("anthropic/claude-sonnet-4.6");
 		expect(mockGetLastUsedProviderSettings).toHaveBeenCalledWith({
-			isClinePassEnabled: true,
+			isClinePassEnabled: false,
 		});
 	});
 
@@ -125,12 +125,12 @@ describe("buildConnectorStartRequest", () => {
 			io: { writeln: vi.fn(), writeErr: vi.fn() },
 			loggerConfig: { enabled: false, level: "info", destination: "stdout" },
 			systemRules: "Rules",
-			defaultModel: "cline-pass/glm-5.2",
+			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.2");
+		expect(request.model).toBe("cline-pass/glm-5.1");
 	});
 
 	it("uses auth material resolved by provider settings manager", async () => {
@@ -153,11 +153,11 @@ describe("buildConnectorStartRequest", () => {
 			io: { writeln: vi.fn(), writeErr: vi.fn() },
 			loggerConfig: { enabled: false, level: "info", destination: "stdout" },
 			systemRules: "Rules",
-			defaultModel: "cline-pass/glm-5.2",
+			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.2");
+		expect(request.model).toBe("cline-pass/glm-5.1");
 	});
 });

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

@@ -16,6 +16,7 @@ import {
 import type { CliLoggerAdapter } from "../logging/adapter";
 import { resolveSystemPrompt } from "../runtime/prompt";
 import { resolveCliSessionMetadata } from "../utils/enterprise";
+import { getCliFeatureFlagsService } from "../utils/feature-flags";
 import { resolveWorkspaceRoot } from "../utils/helpers";
 import {
 	parseLocalRowMetadata,
@@ -63,7 +64,8 @@ export async function buildConnectorStartRequest(input: {
 	const providerSettingsManager = new ProviderSettingsManager();
 	const lastUsedProviderSettings =
 		providerSettingsManager.getLastUsedProviderSettings({
-			isClinePassEnabled: true,
+			isClinePassEnabled:
+				getCliFeatureFlagsService().getBooleanFlagEnabled("ext-cline-pass"),
 		});
 	const provider = normalizeProviderId(
 		input.options.provider?.trim() ||

apps/cli/src/kanban-migration/notice-dialog.tsx

@@ -1,10 +1,7 @@
 // @jsxImportSource @opentui/react
 import type { ChoiceContext } from "@opentui-ui/dialog";
 import { useDialogKeyboard } from "@opentui-ui/dialog/react";
-import open from "open";
-import { useCallback, useMemo, useState } from "react";
 import { palette } from "../tui/palette";
-import { getCliSubscriptionUrl } from "../utils/cline-pass-errors";
 import type { CliMigrationNotice } from "./notice";
 
 export function MigrationNoticeContent(
@@ -13,29 +10,10 @@ export function MigrationNoticeContent(
 	},
 ) {
 	const { dialogId, notice, resolve } = props;
-	const subscriptionUrl = useMemo(() => getCliSubscriptionUrl(), []);
-	const [status, setStatus] = useState<string | undefined>();
-
-	const openSubscriptionPage = useCallback(() => {
-		setStatus("Opening ClinePass in your browser...");
-		void open(subscriptionUrl, { wait: false })
-			.then(() => {
-				setStatus("Opened ClinePass in your browser.");
-			})
-			.catch(() => {
-				setStatus(
-					"Could not open the browser automatically. Use the URL below.",
-				);
-			});
-	}, [subscriptionUrl]);
 
 	useDialogKeyboard((key) => {
 		if (key.name === "escape") {
 			resolve(true);
-			return;
-		}
-		if (key.name === "return" || key.name === "enter") {
-			openSubscriptionPage();
 		}
 	}, dialogId);
 
@@ -44,24 +22,25 @@ export function MigrationNoticeContent(
 			<text fg={palette.act}>{notice.title}</text>
 			<box flexDirection="column">
 				<text selectable>
-					ClinePass is a $9.99/month subscription plan to get access to the
-					latest open-weight coding models with enough quota for day-to-day
-					work, at a much lower cost than paying API costs directly.
+					We rebuilt the CLI from the ground up using the new Cline SDK. Learn
+					more:{" "}
+					<a href="https://github.com/cline/cline">
+						<span fg={palette.act}>https://github.com/cline/cline</span>
+					</a>
 				</text>
-				<text selectable>Try it now with a limited-time promo for $1.99.</text>
-			</box>
-			<box flexDirection="row">
-				<text fg={palette.act} selectable>
-					<a href={subscriptionUrl}>{subscriptionUrl}</a>
+				<text selectable>
+					Running{" "}
+					<span fg="#98c379" bg="#1f2937">
+						{" cline "}
+					</span>{" "}
+					now opens the terminal UI. To open Kanban, use /quit and run{" "}
+					<span fg="#98c379" bg="#1f2937">
+						{" cline kanban "}
+					</span>{" "}
+					in your terminal
 				</text>
 			</box>
-			<box flexDirection="row">
-				<box paddingX={1} backgroundColor={palette.act}>
-					<text fg={palette.textOnSelection}>Open ClinePass</text>
-				</box>
-			</box>
-			{status && <text fg={palette.muted}>{status}</text>}
-			<text fg={palette.muted}>Press Enter to open, Esc to close</text>
+			<text fg={palette.muted}>Press Esc to close</text>
 		</box>
 	);
 }

apps/cli/src/kanban-migration/notice.test.ts

@@ -1,18 +1,11 @@
-import {
-	mkdirSync,
-	mkdtempSync,
-	readFileSync,
-	rmSync,
-	writeFileSync,
-} from "node:fs";
+import { mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
 import {
 	getClineCliMigrationNotice,
 	markClineCliMigrationNoticeShown,
 	resolveCliNoticeStatePath,
-	shouldSuppressClineCliMigrationNoticeForActiveProvider,
 } from "./notice";
 
 const tempDirs: string[] = [];
@@ -33,25 +26,8 @@ describe("migration notice", () => {
 	it("returns the notice for a fresh data dir", () => {
 		const dataDir = createTempDataDir();
 
-		expect(getClineCliMigrationNotice(dataDir)?.title).toBe("Try ClinePass");
-	});
-
-	it("shows when only the old Kanban notice was marked as shown", () => {
-		const dataDir = createTempDataDir();
-		const noticePath = resolveCliNoticeStatePath(dataDir);
-		mkdirSync(dirname(noticePath), { recursive: true, mode: 0o700 });
-		writeFileSync(
-			noticePath,
-			`${JSON.stringify(
-				{ shown: { "cline-cli-tui-default": true } },
-				null,
-				2,
-			)}\n`,
-			"utf8",
-		);
-
-		expect(getClineCliMigrationNotice(dataDir)?.id).toBe(
-			"cline-cli-cline-pass-intro",
+		expect(getClineCliMigrationNotice(dataDir)?.title).toBe(
+			"Welcome to the new Cline CLI",
 		);
 	});
 
@@ -70,7 +46,7 @@ describe("migration notice", () => {
 
 		expect(
 			getClineCliMigrationNotice(dataDir, {
-				CLINE_FORCE_CLINE_PASS_NOTICE: "1",
+				CLINE_FORCE_MIGRATION_NOTICE: "1",
 			}),
 		).toBeDefined();
 	});
@@ -80,56 +56,18 @@ describe("migration notice", () => {
 
 		expect(
 			getClineCliMigrationNotice(dataDir, {
-				CLINE_DISABLE_CLINE_PASS_NOTICE: "1",
+				CLINE_DISABLE_MIGRATION_NOTICE: "1",
 			}),
 		).toBeUndefined();
 	});
 
-	it("does not show when ClinePass is already the active provider", () => {
-		const dataDir = createTempDataDir();
-
-		expect(
-			getClineCliMigrationNotice(
-				dataDir,
-				{},
-				{ activeProviderId: "cline-pass" },
-			),
-		).toBeUndefined();
-	});
-
-	it("suppresses the active ClinePass provider even when the provider id has surrounding whitespace", () => {
-		expect(
-			shouldSuppressClineCliMigrationNoticeForActiveProvider(" cline-pass "),
-		).toBe(true);
-	});
-
-	it("does not suppress the active ClinePass provider when forced", () => {
-		expect(
-			shouldSuppressClineCliMigrationNoticeForActiveProvider("cline-pass", {
-				CLINE_FORCE_CLINE_PASS_NOTICE: "1",
-			}),
-		).toBe(false);
-	});
-
-	it("shows for the active ClinePass provider when forced", () => {
-		const dataDir = createTempDataDir();
-
-		expect(
-			getClineCliMigrationNotice(
-				dataDir,
-				{ CLINE_FORCE_CLINE_PASS_NOTICE: "1" },
-				{ activeProviderId: "cline-pass" },
-			),
-		).toBeDefined();
-	});
-
 	it("shows when forced even if disabled through the environment", () => {
 		const dataDir = createTempDataDir();
 
 		expect(
 			getClineCliMigrationNotice(dataDir, {
-				CLINE_DISABLE_CLINE_PASS_NOTICE: "1",
-				CLINE_FORCE_CLINE_PASS_NOTICE: "1",
+				CLINE_DISABLE_MIGRATION_NOTICE: "1",
+				CLINE_FORCE_MIGRATION_NOTICE: "1",
 			}),
 		).toBeDefined();
 	});
@@ -140,7 +78,7 @@ describe("migration notice", () => {
 		markClineCliMigrationNoticeShown(dataDir);
 
 		const rawState = readFileSync(resolveCliNoticeStatePath(dataDir), "utf8");
-		expect(rawState).toContain("cline-cli-cline-pass-intro");
+		expect(rawState).toContain("cline-cli-tui-default");
 		expect(getClineCliMigrationNotice(dataDir)).toBeUndefined();
 	});
 });

apps/cli/src/kanban-migration/notice.ts

@@ -2,19 +2,15 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { resolveClineDataDir } from "@cline/shared/storage";
 
-const NOTICE_ID = "cline-cli-cline-pass-intro";
-const FORCE_NOTICE_ENV = "CLINE_FORCE_CLINE_PASS_NOTICE";
-const DISABLE_NOTICE_ENV = "CLINE_DISABLE_CLINE_PASS_NOTICE";
+const NOTICE_ID = "cline-cli-tui-default";
+const FORCE_NOTICE_ENV = "CLINE_FORCE_MIGRATION_NOTICE";
+const DISABLE_NOTICE_ENV = "CLINE_DISABLE_MIGRATION_NOTICE";
 
 export interface CliMigrationNotice {
 	id: string;
 	title: string;
 }
 
-export interface CliMigrationNoticeOptions {
-	activeProviderId?: string;
-}
-
 interface CliNoticeState {
 	shown: Record<string, boolean>;
 }
@@ -53,19 +49,6 @@ function readNoticeState(filePath: string): CliNoticeState {
 	return { shown };
 }
 
-function isForceNoticeEnabled(env: NodeJS.ProcessEnv): boolean {
-	return env[FORCE_NOTICE_ENV]?.trim() === "1";
-}
-
-export function shouldSuppressClineCliMigrationNoticeForActiveProvider(
-	activeProviderId: string | undefined,
-	env: NodeJS.ProcessEnv = process.env,
-): boolean {
-	return (
-		activeProviderId?.trim() === "cline-pass" && !isForceNoticeEnabled(env)
-	);
-}
-
 export function resolveCliNoticeStatePath(
 	dataDir = resolveClineDataDir(),
 ): string {
@@ -75,29 +58,20 @@ export function resolveCliNoticeStatePath(
 export function getClineCliMigrationNotice(
 	dataDir = resolveClineDataDir(),
 	env: NodeJS.ProcessEnv = process.env,
-	options: CliMigrationNoticeOptions = {},
 ): CliMigrationNotice | undefined {
 	const noticePath = resolveCliNoticeStatePath(dataDir);
 	const noticeState = readNoticeState(noticePath);
-	const forceNotice = isForceNoticeEnabled(env);
+	const forceNotice = env[FORCE_NOTICE_ENV]?.trim() === "1";
 	const disableNotice = env[DISABLE_NOTICE_ENV]?.trim() === "1";
 	if (disableNotice && !forceNotice) {
 		return undefined;
 	}
-	if (
-		shouldSuppressClineCliMigrationNoticeForActiveProvider(
-			options.activeProviderId,
-			env,
-		)
-	) {
-		return undefined;
-	}
 	if (noticeState.shown[NOTICE_ID] && !forceNotice) {
 		return undefined;
 	}
 	return {
 		id: NOTICE_ID,
-		title: "Try ClinePass",
+		title: "Welcome to the new Cline CLI",
 	};
 }
 

apps/cli/src/main.test.ts

@@ -1,9 +1,6 @@
 import { fstatSync } from "node:fs";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type {
-	CliMigrationNotice,
-	CliMigrationNoticeOptions,
-} from "./kanban-migration/notice";
+import type { CliMigrationNotice } from "./kanban-migration/notice";
 
 /** Real `fstatSync`: used when tests stub only stdin (fd 0); throwing for every fd breaks imports and session I/O. */
 const fsActual = vi.hoisted(() => ({
@@ -62,13 +59,9 @@ const dashboardMocks = vi.hoisted(() => ({
 	runDashboardCommand: vi.fn(),
 }));
 const migrationNoticeMocks = vi.hoisted(() => ({
-	getClineCliMigrationNotice: vi.fn<
-		(
-			dataDir?: string,
-			env?: NodeJS.ProcessEnv,
-			options?: CliMigrationNoticeOptions,
-		) => CliMigrationNotice | undefined
-	>(() => undefined),
+	getClineCliMigrationNotice: vi.fn<() => CliMigrationNotice | undefined>(
+		() => undefined,
+	),
 	markClineCliMigrationNoticeShown: vi.fn(),
 }));
 const updateMocks = vi.hoisted(() => ({
@@ -122,7 +115,6 @@ const telemetryMocks = vi.hoisted(() => ({
 const featureFlagMocks = vi.hoisted(() => ({
 	getBooleanFlagEnabled: vi.fn(() => false),
 	setCliFeatureFlagsAccountContext: vi.fn(),
-	refreshCliFeatureFlagsInBackground: vi.fn(),
 }));
 
 function forcePromptModeInput() {
@@ -158,9 +150,8 @@ vi.mock("./runtime/run-interactive", () => {
 });
 vi.mock("./utils/session", () => sessionMocks);
 vi.mock("./session/session", () => sessionMocks);
-vi.mock("@cline/core", async () => {
+vi.mock("@cline/core", () => {
 	return {
-		...(await vi.importActual("@cline/core")),
 		resolveProviderConfig: llmMocks.resolveProviderConfig,
 		createTeamName: vi.fn(() => "team-test"),
 		createUserInstructionConfigService: vi.fn(() => ({
@@ -188,8 +179,7 @@ vi.mock("./utils/feature-flags", () => ({
 	getCliFeatureFlagsService: () => ({
 		getBooleanFlagEnabled: featureFlagMocks.getBooleanFlagEnabled,
 	}),
-	refreshCliFeatureFlagsInBackground:
-		featureFlagMocks.refreshCliFeatureFlagsInBackground,
+	refreshCliFeatureFlagsInBackground: vi.fn(),
 	setCliFeatureFlagsAccountContext:
 		featureFlagMocks.setCliFeatureFlagsAccountContext,
 }));
@@ -268,7 +258,6 @@ describe("runCli lightweight command dispatch", () => {
 		featureFlagMocks.getBooleanFlagEnabled.mockReset();
 		featureFlagMocks.getBooleanFlagEnabled.mockReturnValue(false);
 		featureFlagMocks.setCliFeatureFlagsAccountContext.mockReset();
-		featureFlagMocks.refreshCliFeatureFlagsInBackground.mockReset();
 		kanbanMocks.launchKanban.mockReset();
 		kanbanMocks.launchKanban.mockResolvedValue(0);
 		dashboardMocks.runDashboardCommand.mockReset();
@@ -418,7 +407,7 @@ describe("runCli lightweight command dispatch", () => {
 
 	it("does not load interactive runtime for single-prompt mode", async () => {
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "say hello"];
+		process.argv = ["bun", "src/index.ts", "hello"];
 
 		const { runCli } = await import("./main");
 
@@ -428,30 +417,6 @@ describe("runCli lightweight command dispatch", () => {
 		expect(mockState.runInteractiveImports).toBe(0);
 	});
 
-	it("rejects a single bare positional prompt token", async () => {
-		const consoleError = vi
-			.spyOn(console, "error")
-			.mockImplementation(() => undefined);
-		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "nonexistent-command"];
-
-		const { runCli } = await import("./main");
-
-		await expect(runCli()).resolves.toBeUndefined();
-		expect(process.exitCode).toBe(1);
-		expect(consoleError).toHaveBeenCalledWith(
-			expect.stringContaining(
-				"Unknown command or unquoted prompt: nonexistent-command",
-			),
-		);
-		expect(consoleError).toHaveBeenCalledWith(
-			expect.stringContaining('Use "cline --help"'),
-		);
-		expect(runtimeMocks.runAgent).not.toHaveBeenCalled();
-		expect(mockState.runAgentImports).toBe(0);
-		expect(mockState.runInteractiveImports).toBe(0);
-	});
-
 	it("rejects multiple bare positional prompt tokens", async () => {
 		const consoleError = vi
 			.spyOn(console, "error")
@@ -465,7 +430,7 @@ describe("runCli lightweight command dispatch", () => {
 		expect(process.exitCode).toBe(1);
 		expect(consoleError).toHaveBeenCalledWith(
 			expect.stringContaining(
-				"Unknown command or unquoted prompt: hello world",
+				"Unknown command or extra arguments: hello world",
 			),
 		);
 		expect(runtimeMocks.runAgent).not.toHaveBeenCalled();
@@ -509,7 +474,7 @@ describe("runCli lightweight command dispatch", () => {
 
 	it("creates a worktree and runs prompt sessions from it", async () => {
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "--worktree", "say hello"];
+		process.argv = ["bun", "src/index.ts", "--worktree", "hello"];
 
 		const { runCli } = await import("./main");
 
@@ -518,7 +483,7 @@ describe("runCli lightweight command dispatch", () => {
 			cwd: process.cwd(),
 		});
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				cwd: "/tmp/cline-worktree",
 				workspaceRoot: "/tmp/cline-worktree",
@@ -641,8 +606,8 @@ describe("runCli lightweight command dispatch", () => {
 
 	it("passes the migration notice marker into interactive mode", async () => {
 		const notice = {
-			id: "cline-cli-cline-pass-intro",
-			title: "Try ClinePass",
+			id: "cline-cli-tui-default",
+			title: "Welcome to the new Cline CLI",
 		};
 		migrationNoticeMocks.getClineCliMigrationNotice.mockReturnValue(notice);
 		Object.defineProperty(process.stdout, "isTTY", {
@@ -673,37 +638,6 @@ describe("runCli lightweight command dispatch", () => {
 		).toHaveBeenCalledTimes(1);
 	});
 
-	it("passes the active ClinePass provider into the migration notice gate", async () => {
-		providerSettingsMocks.getLastUsedProviderSettings.mockReturnValue({
-			provider: "cline-pass",
-			model: "cline-pass/test-model",
-		});
-		Object.defineProperty(process.stdout, "isTTY", {
-			value: true,
-			configurable: true,
-		});
-		process.argv = ["bun", "src/index.ts"];
-
-		const { runCli } = await import("./main");
-
-		await expect(runCli()).resolves.toBeUndefined();
-		expect(
-			migrationNoticeMocks.getClineCliMigrationNotice,
-		).toHaveBeenCalledWith(undefined, process.env, {
-			activeProviderId: "cline-pass",
-		});
-		expect(runtimeMocks.runInteractive).toHaveBeenCalledWith(
-			expect.objectContaining({
-				providerId: "cline-pass",
-			}),
-			expect.anything(),
-			undefined,
-			expect.objectContaining({
-				initialNotice: undefined,
-			}),
-		);
-	});
-
 	it("does not start OAuth before onboarding in interactive mode", async () => {
 		authMocks.isOAuthProvider.mockReturnValue(true);
 		authMocks.normalizeProviderId.mockReturnValue("cline");
@@ -793,7 +727,7 @@ describe("runCli lightweight command dispatch", () => {
 
 	it("uses the bundled catalog path for single-prompt runs", async () => {
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "say hello"];
+		process.argv = ["bun", "src/index.ts", "hello"];
 
 		const { runCli } = await import("./main");
 
@@ -984,7 +918,7 @@ describe("runCli lightweight command dispatch", () => {
 		);
 	});
 
-	it("seeds feature flag identity from persisted Cline account id before refreshing flags", async () => {
+	it("seeds feature flag identity from persisted Cline account id before checking flags", async () => {
 		const clineSettings = {
 			provider: "cline",
 			model: "anthropic/claude-sonnet-4.6",
@@ -1003,91 +937,14 @@ describe("runCli lightweight command dispatch", () => {
 		expect(
 			featureFlagMocks.setCliFeatureFlagsAccountContext,
 		).toHaveBeenCalledWith({ id: "acct-startup" });
-		// The account identity must be seeded before flags are refreshed/used so
-		// the background refresh resolves flags for the correct account.
 		expect(
 			featureFlagMocks.setCliFeatureFlagsAccountContext.mock
 				.invocationCallOrder[0],
 		).toBeLessThan(
-			featureFlagMocks.refreshCliFeatureFlagsInBackground.mock
-				.invocationCallOrder[0],
+			featureFlagMocks.getBooleanFlagEnabled.mock.invocationCallOrder[0],
 		);
 	});
 
-	it("identifies saved Cline accountId for telemetry before runtime events", async () => {
-		// CLINE-2406: when persisted Cline auth includes an accountId, the
-		// runtime path must call identifyTelemetryAccount(accountContext) so
-		// subsequent task.* and workspace.* events carry user_id.
-		const clineSettings = {
-			provider: "cline",
-			model: "anthropic/claude-sonnet-4.6",
-			auth: { accountId: "usr-abc-123", refreshToken: "rt-token" },
-		};
-		providerSettingsMocks.getLastUsedProviderSettings.mockReturnValue(
-			clineSettings,
-		);
-		providerSettingsMocks.getProviderSettings.mockReturnValue(clineSettings);
-		authMocks.normalizeProviderId.mockImplementation(
-			(providerId?: string) => providerId ?? "cline",
-		);
-		process.argv = ["bun", "src/index.ts"];
-
-		const { runCli } = await import("./main");
-
-		await expect(runCli()).resolves.toBeUndefined();
-		expect(telemetryMocks.identifyTelemetryAccount).toHaveBeenCalledWith(
-			expect.objectContaining({
-				id: "usr-abc-123",
-				provider: "cline",
-			}),
-		);
-	});
-
-	it("does not call identifyTelemetryAccount in runtime path when no saved Cline accountId", async () => {
-		// CLINE-2406: when no persisted accountId is found (anonymous/unauthenticated),
-		// identifyTelemetryAccount should not be called from the runtime path.
-		const clineSettings = {
-			provider: "cline",
-			model: "anthropic/claude-sonnet-4.6",
-			// no auth / no accountId
-		};
-		providerSettingsMocks.getLastUsedProviderSettings.mockReturnValue(
-			clineSettings,
-		);
-		providerSettingsMocks.getProviderSettings.mockReturnValue(clineSettings);
-		authMocks.normalizeProviderId.mockImplementation(
-			(providerId?: string) => providerId ?? "cline",
-		);
-		process.argv = ["bun", "src/index.ts"];
-
-		const { runCli } = await import("./main");
-
-		await expect(runCli()).resolves.toBeUndefined();
-		expect(telemetryMocks.identifyTelemetryAccount).not.toHaveBeenCalled();
-	});
-
-	it("does not call identifyTelemetryAccount from runtime path when provider is not cline", async () => {
-		// CLINE-2406: identity identification from saved settings only applies
-		// to Cline-provider sessions; other providers use different auth flows.
-		providerSettingsMocks.getLastUsedProviderSettings.mockReturnValue({
-			provider: "openrouter",
-			model: "openai/gpt-5",
-		});
-		providerSettingsMocks.getProviderSettings.mockReturnValue({
-			provider: "openrouter",
-			model: "openai/gpt-5",
-		});
-		authMocks.normalizeProviderId.mockImplementation(
-			(providerId?: string) => providerId ?? "openrouter",
-		);
-		process.argv = ["bun", "src/index.ts"];
-
-		const { runCli } = await import("./main");
-
-		await expect(runCli()).resolves.toBeUndefined();
-		expect(telemetryMocks.identifyTelemetryAccount).not.toHaveBeenCalled();
-	});
-
 	it("runs kanban before loading runtime modules", async () => {
 		process.argv = ["bun", "src/index.ts", "kanban"];
 
@@ -1156,30 +1013,12 @@ describe("runCli lightweight command dispatch", () => {
 
 	it("skips hub prewarm for yolo runs", async () => {
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "--yolo", "say hello"];
-
-		const { runCli } = await import("./main");
-
-		await expect(runCli()).resolves.toBeUndefined();
-		expect(runtimeMocks.runAgent).toHaveBeenCalledTimes(1);
-		expect(hubRuntimeMocks.ensureCliHubServer).not.toHaveBeenCalled();
-	});
-
-	it("rejects yolo runs with a single bare prompt token", async () => {
-		const consoleError = vi
-			.spyOn(console, "error")
-			.mockImplementation(() => undefined);
-		forcePromptModeInput();
 		process.argv = ["bun", "src/index.ts", "--yolo", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
-		expect(process.exitCode).toBe(1);
-		expect(consoleError).toHaveBeenCalledWith(
-			expect.stringContaining("Unknown command or unquoted prompt: hello"),
-		);
-		expect(runtimeMocks.runAgent).not.toHaveBeenCalled();
+		expect(runtimeMocks.runAgent).toHaveBeenCalledTimes(1);
 		expect(hubRuntimeMocks.ensureCliHubServer).not.toHaveBeenCalled();
 	});
 
@@ -1203,12 +1042,12 @@ describe("runCli lightweight command dispatch", () => {
 		);
 	});
 
-	it("rejects /team without quoted task text", async () => {
+	it("shows /team usage in single-prompt mode when no task is provided", async () => {
 		mockState.runAgentCalls = 0;
 		runtimeMocks.runAgent.mockClear();
-		const consoleError = vi
-			.spyOn(console, "error")
-			.mockImplementation(() => undefined);
+		const stdoutWrite = vi
+			.spyOn(process.stdout, "write")
+			.mockImplementation(() => true);
 
 		forcePromptModeInput();
 		process.argv = ["bun", "src/index.ts", "/team"];
@@ -1216,10 +1055,9 @@ describe("runCli lightweight command dispatch", () => {
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
-		expect(process.exitCode).toBe(1);
 		expect(mockState.runAgentCalls).toBe(0);
-		expect(consoleError).toHaveBeenCalledWith(
-			expect.stringContaining("Unknown command or unquoted prompt: /team"),
+		expect(stdoutWrite).toHaveBeenCalledWith(
+			expect.stringContaining("Usage: /team <task description>"),
 		);
 	});
 
@@ -1228,14 +1066,14 @@ describe("runCli lightweight command dispatch", () => {
 		runtimeMocks.runAgent.mockClear();
 
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "--thinking", "high", "say hello"];
+		process.argv = ["bun", "src/index.ts", "--thinking", "high", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
 		expect(mockState.runAgentCalls).toBe(1);
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				thinking: true,
 				reasoningEffort: "high",
@@ -1244,40 +1082,19 @@ describe("runCli lightweight command dispatch", () => {
 		);
 	});
 
-	it("leaves thinking unset when --thinking is not provided", async () => {
+	it("leaves thinking disabled when --thinking is not provided", async () => {
 		mockState.runAgentCalls = 0;
 		runtimeMocks.runAgent.mockClear();
 
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "say hello"];
+		process.argv = ["bun", "src/index.ts", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
 		expect(mockState.runAgentCalls).toBe(1);
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
-			expect.objectContaining({
-				thinking: undefined,
-				reasoningEffort: undefined,
-			}),
-			expect.anything(),
-		);
-	});
-
-	it("disables thinking when --thinking none is explicitly provided", async () => {
-		mockState.runAgentCalls = 0;
-		runtimeMocks.runAgent.mockClear();
-
-		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "--thinking", "none", "say hello"];
-
-		const { runCli } = await import("./main");
-
-		await expect(runCli()).resolves.toBeUndefined();
-		expect(mockState.runAgentCalls).toBe(1);
-		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				thinking: false,
 				reasoningEffort: undefined,
@@ -1291,14 +1108,14 @@ describe("runCli lightweight command dispatch", () => {
 		runtimeMocks.runAgent.mockClear();
 
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "--thinking", "--", "say hello"];
+		process.argv = ["bun", "src/index.ts", "--thinking", "--", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
 		expect(mockState.runAgentCalls).toBe(1);
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				compaction: {
 					enabled: true,
@@ -1321,14 +1138,14 @@ describe("runCli lightweight command dispatch", () => {
 		});
 
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "say hello"];
+		process.argv = ["bun", "src/index.ts", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
 		expect(mockState.runAgentCalls).toBe(1);
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				thinking: true,
 				reasoningEffort: "high",
@@ -1337,32 +1154,6 @@ describe("runCli lightweight command dispatch", () => {
 		);
 	});
 
-	it("uses persisted disabled reasoning when --thinking is not provided", async () => {
-		mockState.runAgentCalls = 0;
-		runtimeMocks.runAgent.mockClear();
-		providerSettingsMocks.getProviderSettings.mockReturnValue({
-			provider: "cline",
-			model: "openai/gpt-5",
-			reasoning: { enabled: false },
-		});
-
-		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "say hello"];
-
-		const { runCli } = await import("./main");
-
-		await expect(runCli()).resolves.toBeUndefined();
-		expect(mockState.runAgentCalls).toBe(1);
-		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
-			expect.objectContaining({
-				thinking: false,
-				reasoningEffort: undefined,
-			}),
-			expect.anything(),
-		);
-	});
-
 	it("prefers explicit --thinking over persisted reasoning effort", async () => {
 		mockState.runAgentCalls = 0;
 		runtimeMocks.runAgent.mockClear();
@@ -1373,14 +1164,14 @@ describe("runCli lightweight command dispatch", () => {
 		});
 
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "--thinking", "low", "say hello"];
+		process.argv = ["bun", "src/index.ts", "--thinking", "low", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
 		expect(mockState.runAgentCalls).toBe(1);
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				thinking: true,
 				reasoningEffort: "low",
@@ -1394,13 +1185,13 @@ describe("runCli lightweight command dispatch", () => {
 		runtimeMocks.runAgent.mockClear();
 
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "say hello"];
+		process.argv = ["bun", "src/index.ts", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				compaction: {
 					enabled: true,
@@ -1416,19 +1207,13 @@ describe("runCli lightweight command dispatch", () => {
 		runtimeMocks.runAgent.mockClear();
 
 		forcePromptModeInput();
-		process.argv = [
-			"bun",
-			"src/index.ts",
-			"--compaction",
-			"basic",
-			"say hello",
-		];
+		process.argv = ["bun", "src/index.ts", "--compaction", "basic", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				compaction: {
 					enabled: true,
@@ -1444,19 +1229,13 @@ describe("runCli lightweight command dispatch", () => {
 		runtimeMocks.runAgent.mockClear();
 
 		forcePromptModeInput();
-		process.argv = [
-			"bun",
-			"src/index.ts",
-			"--compaction",
-			"agentic",
-			"say hello",
-		];
+		process.argv = ["bun", "src/index.ts", "--compaction", "agentic", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				compaction: {
 					enabled: true,
@@ -1506,13 +1285,13 @@ describe("runCli lightweight command dispatch", () => {
 		runtimeMocks.runAgent.mockClear();
 
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "--compaction", "off", "say hello"];
+		process.argv = ["bun", "src/index.ts", "--compaction", "off", "hello"];
 
 		const { runCli } = await import("./main");
 
 		await expect(runCli()).resolves.toBeUndefined();
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				compaction: {
 					enabled: false,
@@ -1551,7 +1330,7 @@ describe("runCli lightweight command dispatch", () => {
 		authMocks.ensureOAuthProviderApiKey.mockClear();
 
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "--json", "say hello"];
+		process.argv = ["bun", "src/index.ts", "--json", "hello"];
 
 		const { runCli } = await import("./main");
 
@@ -1559,7 +1338,7 @@ describe("runCli lightweight command dispatch", () => {
 		expect(mockState.runAgentCalls).toBe(1);
 		expect(authMocks.ensureOAuthProviderApiKey).not.toHaveBeenCalled();
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				outputMode: "json",
 				apiKey: "",
@@ -1578,7 +1357,7 @@ describe("runCli lightweight command dispatch", () => {
 		authMocks.ensureOAuthProviderApiKey.mockClear();
 
 		forcePromptModeInput();
-		process.argv = ["bun", "src/index.ts", "--json", "say hello"];
+		process.argv = ["bun", "src/index.ts", "--json", "hello"];
 
 		const { runCli } = await import("./main");
 
@@ -1586,7 +1365,7 @@ describe("runCli lightweight command dispatch", () => {
 		expect(mockState.runAgentCalls).toBe(1);
 		expect(authMocks.ensureOAuthProviderApiKey).not.toHaveBeenCalled();
 		expect(runtimeMocks.runAgent).toHaveBeenCalledWith(
-			"say hello",
+			"hello",
 			expect.objectContaining({
 				outputMode: "json",
 				apiKey: "",

apps/cli/src/main.ts

@@ -15,12 +15,12 @@ import {
 	getPreferredKanbanInstaller,
 } from "./commands/update";
 import { CLI_DEFAULT_CHECKPOINT_CONFIG } from "./runtime/defaults";
-import { getCliBuildInfo } from "./utils/common";
 import {
 	buildCliCompactionConfig,
 	CLI_COMPACTION_MODE_EXPECTED_TEXT,
 } from "./utils/compaction-mode";
 import {
+	getCliFeatureFlagsService,
 	refreshCliFeatureFlagsInBackground,
 	setCliFeatureFlagsAccountContext,
 } from "./utils/feature-flags";
@@ -42,12 +42,10 @@ import {
 	isOAuthProvider,
 	normalizeProviderId,
 } from "./utils/provider-auth";
-import { resolveCliReasoning } from "./utils/reasoning";
 import { rewriteTeamPrompt, TEAM_COMMAND_USAGE } from "./utils/team-command";
 import {
 	captureCliExtensionActivated,
 	getCliTelemetryService,
-	identifyTelemetryAccount,
 } from "./utils/telemetry";
 import type { Config } from "./utils/types";
 import { runConnectWizard } from "./wizards/connect";
@@ -114,23 +112,6 @@ export function resolveConfigDirArg(argv: string[]): string | undefined {
 	return undefined;
 }
 
-function collectOption(value: string, previous: string[] = []): string[] {
-	return [...previous, value];
-}
-
-// Shells strip quote characters before argv reaches us, so a prompt that was
-// typed in quotes is only observable when it remains one argv token with spaces.
-function promptArgLooksQuoted(arg: string | undefined): boolean {
-	return !!arg && /\s/.test(arg);
-}
-
-function writePromptArgError(args: string[]): void {
-	const renderedArgs = args.join(" ");
-	writeErr(
-		`Unknown command or unquoted prompt: ${renderedArgs}\nPrompt text must be passed as a single quoted argument, for example: cline "fix the tests". Use "cline --help" to see available commands and flags.`,
-	);
-}
-
 export async function runCli(): Promise<void> {
 	installStreamErrorGuards();
 	autoUpdateOnStartup();
@@ -423,24 +404,15 @@ export async function runCli(): Promise<void> {
 			"--transport <transport>",
 			"stdio, sse, http, streamable-http, or streamableHttp (default: stdio)",
 		)
-		.option("--header <header>", "Remote MCP request header", collectOption, [])
-		.option("--yes", "Install noninteractively without opening the wizard")
-		.option("--json", "Output as JSON")
 		.action(async (name: string, targetArgs: string[]) => {
 			const opts = mcpInstallCmd.opts<{
-				header?: string[];
-				json?: boolean;
 				transport?: string;
-				yes?: boolean;
 			}>();
 			const { runMcpInstallCommand } = await import("./commands/mcp");
 			ctx.exitCode = await runMcpInstallCommand({
 				name,
-				headers: opts.header,
 				targetArgs,
 				transport: opts.transport,
-				json: opts.json === true || program.opts().json === true,
-				yes: opts.yes === true,
 				io,
 			});
 		});
@@ -750,6 +722,13 @@ export async function runCli(): Promise<void> {
 
 	// Default flow: no subcommand matched, or fall-through from config/history.
 	let args = commanderToParsedArgs(program);
+	if (program.args.length > 1) {
+		writeErr(
+			`Unknown command or extra arguments: ${program.args.join(" ")}\nPrompt text with spaces must be quoted as a single argument, for example: cline "fix the tests". Use "cline --help" to see available commands and flags.`,
+		);
+		process.exitCode = 1;
+		return;
+	}
 
 	let resumeSessionId: string | undefined = ctx.resumeSessionId;
 	if (resumeSessionId) {
@@ -836,13 +815,6 @@ export async function runCli(): Promise<void> {
 	if (args.hooksDir?.trim()) {
 		process.env.CLINE_HOOKS_DIR = args.hooksDir.trim();
 	}
-	if (args.prompt && !args.interactive) {
-		if (program.args.length > 1 || !promptArgLooksQuoted(program.args[0])) {
-			writePromptArgError(program.args);
-			process.exitCode = 1;
-			return;
-		}
-	}
 	setCurrentOutputMode(args.outputMode);
 	const defaultToolAutoApprove = true;
 	const effectiveToolAutoApprove =
@@ -928,17 +900,6 @@ export async function runCli(): Promise<void> {
 		runAgent,
 	} = await loadCliRuntimeModules();
 
-	// Register the SDK early logger as early as possible — before any
-	// provider settings reads — so the full startup sequence is captured.
-	// These components operate before/outside ClineCore sessions, so the
-	// session-scoped logger can't reach them.
-	const { createCliLoggerAdapter } = await import("./logging/adapter");
-	const loggerAdapter = createCliLoggerAdapter({
-		runtime: "cli",
-		component: "main",
-	});
-	coreServer.setSdkLogger(loggerAdapter.core);
-
 	const userInstructionService = createUserInstructionConfigService({
 		skills: {
 			workspacePath: workspaceRoot,
@@ -968,32 +929,14 @@ export async function runCli(): Promise<void> {
 		refreshCliFeatureFlagsInBackground();
 		const lastUsedProviderSettings =
 			providerSettingsManager.getLastUsedProviderSettings({
-				isClinePassEnabled: true,
+				isClinePassEnabled:
+					getCliFeatureFlagsService().getBooleanFlagEnabled("ext-cline-pass"),
 			});
 		const provider = normalizeProviderId(
 			args.provider?.trim() || lastUsedProviderSettings?.provider || "cline",
 		);
 		let selectedProviderSettings =
 			providerSettingsManager.getProviderSettings(provider);
-
-		// Apply locally persisted Cline account identity so subsequent events
-		// (task.*, workspace.initialized) carry user_id when available.
-		// Note: user.extension_activated fires anonymously earlier in startup
-		// and cannot be retroactively updated; this is by design for
-		// lightweight subcommand and pre-auth CLI flows. See CLINE-2406.
-		if (provider === "cline") {
-			const savedAuth = selectedProviderSettings?.auth;
-			if (savedAuth?.accountId) {
-				identifyTelemetryAccount({
-					id: savedAuth.accountId,
-					provider: "cline",
-					organizationId: savedAuth.organizationId,
-					organizationName: savedAuth.organizationName,
-					memberId: savedAuth.memberId,
-				});
-			}
-		}
-
 		const persistedApiKey = getPersistedProviderApiKey(
 			provider,
 			selectedProviderSettings,
@@ -1055,13 +998,19 @@ export async function runCli(): Promise<void> {
 			);
 		}
 		const knownModelIds = knownModels ? Object.keys(knownModels) : [];
-		const resolvedReasoning = resolveCliReasoning({
-			thinking: args.thinking,
-			thinkingExplicitlySet: args.thinkingExplicitlySet,
-			reasoningEffort: args.reasoningEffort,
-			persistedReasoning: selectedProviderSettings?.reasoning,
-		});
-		const cliBuildInfo = getCliBuildInfo();
+		const persistedReasoning = selectedProviderSettings?.reasoning;
+		const persistedReasoningEffort = persistedReasoning?.effort;
+		const reasoningEffortFromSettings =
+			persistedReasoning?.enabled === false
+				? "none"
+				: persistedReasoningEffort && persistedReasoningEffort !== "none"
+					? persistedReasoningEffort
+					: persistedReasoning?.enabled === true
+						? "medium"
+						: "none";
+		const effectiveReasoningEffort = args.thinkingExplicitlySet
+			? (args.reasoningEffort ?? "none")
+			: (args.reasoningEffort ?? reasoningEffortFromSettings);
 		const { createCliLoggerAdapter } = await import("./logging/adapter");
 		const loggerAdapter = createCliLoggerAdapter({
 			runtime: "cli",
@@ -1097,8 +1046,11 @@ export async function runCli(): Promise<void> {
 			sandbox: sandboxEnabled,
 			sandboxDataDir,
 			verbose: args.verbose,
-			thinking: resolvedReasoning.thinking,
-			reasoningEffort: resolvedReasoning.reasoningEffort,
+			thinking: effectiveReasoningEffort !== "none",
+			reasoningEffort:
+				effectiveReasoningEffort === "none"
+					? undefined
+					: effectiveReasoningEffort,
 			outputMode: args.outputMode,
 			mode: args.mode,
 			logger: loggerAdapter.core,
@@ -1112,13 +1064,7 @@ export async function runCli(): Promise<void> {
 			cwd,
 			workspaceRoot,
 			extensionContext: {
-				client: {
-					name: "cline-cli",
-					version: cliBuildInfo.version,
-					platform: "cli",
-					platformVersion: cliBuildInfo.version,
-					isMultiRoot: false,
-				},
+				client: { name: "cline-cli" },
 				workspace: {
 					rootPath: workspaceRoot,
 					cwd,
@@ -1219,9 +1165,7 @@ export async function runCli(): Promise<void> {
 			if (!launchConfigView && process.stdin.isTTY && process.stdout.isTTY) {
 				const { getClineCliMigrationNotice, markClineCliMigrationNoticeShown } =
 					await import("./kanban-migration/notice");
-				initialNotice = getClineCliMigrationNotice(undefined, process.env, {
-					activeProviderId: provider,
-				});
+				initialNotice = getClineCliMigrationNotice();
 				if (initialNotice) {
 					markInitialNoticeShown = () => {
 						markClineCliMigrationNoticeShown();

apps/cli/src/runtime/interactive/compaction.test.ts

@@ -106,7 +106,7 @@ describe("compactInteractiveMessages", () => {
 		}));
 		const config = createConfig();
 		const compact = vi.fn((context: CoreCompactionContext) => {
-			expect(context.budget.request.maxInputTokens).toBe(400_000);
+			expect(context.maxInputTokens).toBe(400_000);
 			return { messages: [messages[0]] };
 		});
 		config.knownModels = {
@@ -126,11 +126,10 @@ describe("compactInteractiveMessages", () => {
 
 		expect(compact).toHaveBeenCalledTimes(1);
 		expect(result.compacted).toBe(true);
-		expect(result.canonicalMessages).toEqual(messages);
-		expect(result.compactionState?.messages).toEqual([messages[0]]);
+		expect(result.messages).toEqual([messages[0]]);
 	});
 
-	it("uses 90 percent of legacy contextWindow for manual compaction", async () => {
+	it("falls back to legacy contextWindow for manual compaction", async () => {
 		const longText = "x".repeat(16_000);
 		const messages = Array.from({ length: 10 }, (_, index) => ({
 			role: index % 2 === 0 ? ("user" as const) : ("assistant" as const),
@@ -138,7 +137,7 @@ describe("compactInteractiveMessages", () => {
 		}));
 		const config = createConfig();
 		const compact = vi.fn((context: CoreCompactionContext) => {
-			expect(context.budget.request.maxInputTokens).toBe(360_000);
+			expect(context.maxInputTokens).toBe(400_000);
 			return { messages: [messages[0]] };
 		});
 		config.knownModels = {
@@ -158,8 +157,7 @@ describe("compactInteractiveMessages", () => {
 
 		expect(compact).toHaveBeenCalledTimes(1);
 		expect(result.compacted).toBe(true);
-		expect(result.canonicalMessages).toEqual(messages);
-		expect(result.compactionState?.messages).toEqual([messages[0]]);
+		expect(result.messages).toEqual([messages[0]]);
 	});
 
 	it("uses a useful target budget for manual compaction", async () => {
@@ -176,8 +174,7 @@ describe("compactInteractiveMessages", () => {
 			messages,
 		});
 
-		const compactedMessages = result.compactionState?.messages ?? [];
-		const compactedTextLength = compactedMessages.reduce(
+		const compactedTextLength = result.messages.reduce(
 			(total, message) =>
 				total +
 				(typeof message.content === "string" ? message.content.length : 0),
@@ -185,9 +182,8 @@ describe("compactInteractiveMessages", () => {
 		);
 
 		expect(result.compacted).toBe(true);
-		expect(result.canonicalMessages).toEqual(messages);
-		expect(compactedMessages.length).toBeGreaterThan(1);
-		expect(compactedMessages.length).toBeLessThan(messages.length);
+		expect(result.messages.length).toBeGreaterThan(1);
+		expect(result.messages.length).toBeLessThan(messages.length);
 		expect(compactedTextLength).toBeGreaterThan(1_000);
 	});
 
@@ -218,9 +214,8 @@ describe("compactInteractiveMessages", () => {
 		});
 
 		expect(result.compacted).toBe(true);
-		expect(result.canonicalMessages).toEqual(messages);
-		expect(result.compactionState?.messages).toHaveLength(messages.length);
-		expect(result.compactionState?.messages[0]?.content).toBe(
+		expect(result.messages).toHaveLength(messages.length);
+		expect(result.messages[0]?.content).toBe(
 			"same count but content should be trimmed",
 		);
 	});

apps/cli/src/runtime/interactive/compaction.ts

@@ -1,11 +1,9 @@
 import {
 	createContextCompactionPrepareTurn,
-	createSessionCompactionState,
 	type ProviderConfig,
 	type ProviderSettings,
 	type ProviderSettingsManager,
 	type ReasoningSettings,
-	type SessionCompactionState,
 	toProviderConfig,
 } from "@cline/core";
 import type { Message } from "@cline/shared";
@@ -54,22 +52,13 @@ export async function compactInteractiveMessages(input: {
 	providerSettingsManager: ProviderSettingsManager;
 	sessionId: string;
 	messages: Message[];
-	abortSignal?: AbortSignal;
-}): Promise<{
-	compacted: boolean;
-	canonicalMessages: Message[];
-	compactionState?: SessionCompactionState;
-}> {
+}): Promise<{ compacted: boolean; messages: Message[] }> {
 	const modelInfo = input.config.knownModels?.[input.config.modelId];
-	const compactionModelInfo = modelInfo
-		? {
-				...modelInfo,
-				id: modelInfo.id ?? input.config.modelId,
-			}
-		: {
-				id: input.config.modelId,
-				maxInputTokens: FALLBACK_MANUAL_COMPACTION_MAX_INPUT_TOKENS,
-			};
+	const maxInputTokens =
+		input.config.compaction?.maxInputTokens ??
+		modelInfo?.maxInputTokens ??
+		modelInfo?.contextWindow ??
+		FALLBACK_MANUAL_COMPACTION_MAX_INPUT_TOKENS;
 	const compact = createContextCompactionPrepareTurn(
 		{
 			providerConfig: resolveCompactionProviderConfig(
@@ -92,11 +81,8 @@ export async function compactInteractiveMessages(input: {
 		{ mode: "manual" },
 	);
 	if (!compact) {
-		return { compacted: false, canonicalMessages: input.messages };
+		return { compacted: false, messages: input.messages };
 	}
-	// Manual compaction intentionally summarizes the full canonical transcript
-	// instead of reusing a prior sidecar summary, which avoids summary-of-summary
-	// drift across repeated `/compact` calls.
 	const result = await compact({
 		agentId: "cli",
 		conversationId: input.sessionId,
@@ -104,26 +90,21 @@ export async function compactInteractiveMessages(input: {
 		iteration: 0,
 		messages: input.messages,
 		apiMessages: input.messages,
-		abortSignal: input.abortSignal ?? new AbortController().signal,
+		abortSignal: new AbortController().signal,
 		systemPrompt: "",
 		tools: [],
 		model: {
 			id: input.config.modelId,
 			provider: input.config.providerId,
-			info: compactionModelInfo,
+			info: {
+				...(modelInfo ?? {}),
+				id: modelInfo?.id ?? input.config.modelId,
+				maxInputTokens: maxInputTokens,
+			},
 		},
 	});
-	if (!result?.messages) {
-		return { compacted: false, canonicalMessages: input.messages };
+	if (!result) {
+		return { compacted: false, messages: input.messages };
 	}
-	return {
-		compacted: true,
-		canonicalMessages: input.messages,
-		compactionState: createSessionCompactionState({
-			sourceMessages: input.messages,
-			compactedMessages: result.messages,
-			conversationId: input.sessionId,
-			systemPrompt: result.systemPrompt,
-		}),
-	};
+	return { compacted: true, messages: result.messages };
 }

apps/cli/src/runtime/interactive/mode.test.ts

@@ -2,15 +2,7 @@ import { createTool } from "@cline/shared";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { Config } from "../../utils/types";
 import { resolveSystemPrompt } from "../prompt";
-import {
-	ACT_MODE_CONTINUATION_PROMPT,
-	type AppliedModeChange,
-	applyInteractiveModeConfig,
-	createInteractiveModeSwitchTool,
-	createModeSwitchNoticeTracker,
-	type PendingModeChange,
-	sendTurnWithActModeContinuation,
-} from "./mode";
+import { applyInteractiveModeConfig } from "./mode";
 
 vi.mock("../prompt", () => ({
 	resolveSystemPrompt: vi.fn(async (input: { mode?: string }) => {
@@ -48,190 +40,6 @@ const switchToActModeTool = createTool({
 	execute: async () => "ok",
 });
 
-describe("createInteractiveModeSwitchTool", () => {
-	function makeSwitchTool(config: Config) {
-		const pendingModeChange: PendingModeChange = {
-			current: null,
-			source: null,
-		};
-		const tuiModeChanged: {
-			current: ((mode: "plan" | "act") => void) | null;
-		} = { current: vi.fn() };
-		const tool = createInteractiveModeSwitchTool({
-			config,
-			pendingModeChange,
-			tuiModeChanged,
-		});
-		return { tool, pendingModeChange, tuiModeChanged };
-	}
-
-	const toolContext = {
-		agentId: "agent-1",
-		iteration: 0,
-	} as const;
-
-	it("completes the run so the model never continues with plan-mode tools", () => {
-		const config = makeConfig();
-		config.mode = "plan";
-		const { tool } = makeSwitchTool(config);
-
-		// The act-mode tool set only exists after the session rebuild, which
-		// happens between runs; without completesRun the model keeps working
-		// with stale plan-mode tools after being told the switch succeeded.
-		expect(tool.lifecycle?.completesRun).toBe(true);
-	});
-
-	it("queues a tool-sourced mode change and notifies the TUI", async () => {
-		const config = makeConfig();
-		config.mode = "plan";
-		const { tool, pendingModeChange, tuiModeChanged } = makeSwitchTool(config);
-
-		const result = await tool.execute({}, toolContext);
-
-		expect(pendingModeChange).toEqual({ current: "act", source: "tool" });
-		expect(tuiModeChanged.current).toHaveBeenCalledWith("act");
-		expect(result).toContain("successfully switched to act mode");
-	});
-
-	it("errors instead of completing the run when already in act mode", async () => {
-		const config = makeConfig();
-		config.mode = "act";
-		const { tool, pendingModeChange } = makeSwitchTool(config);
-
-		// A successful result would end the run via completesRun even though
-		// nothing changed, so the no-op case must surface as a tool error.
-		await expect(tool.execute({}, toolContext)).rejects.toThrow(
-			"Already in act mode.",
-		);
-		expect(pendingModeChange.current).toBeNull();
-	});
-});
-
-describe("sendTurnWithActModeContinuation", () => {
-	type TurnResult = { finishReason: string; iterations: number };
-
-	function makeHarness(input: {
-		initial: TurnResult | undefined;
-		continuation?: TurnResult | undefined;
-		modeChanges: Array<AppliedModeChange | undefined>;
-	}) {
-		const applied = [...input.modeChanges];
-		const sendContinuationTurn = vi.fn(async () => input.continuation);
-		return {
-			sendContinuationTurn,
-			run: () =>
-				sendTurnWithActModeContinuation<TurnResult>({
-					sendInitialTurn: async () => input.initial,
-					sendContinuationTurn,
-					applyPendingModeChange: async () => applied.shift(),
-				}),
-		};
-	}
-
-	it("continues the plan after a tool-initiated switch completes the run", async () => {
-		const { run, sendContinuationTurn } = makeHarness({
-			initial: { finishReason: "completed", iterations: 2 },
-			continuation: { finishReason: "completed", iterations: 3 },
-			modeChanges: [{ mode: "act", source: "tool" }, undefined],
-		});
-
-		const result = await run();
-
-		expect(sendContinuationTurn).toHaveBeenCalledWith(
-			ACT_MODE_CONTINUATION_PROMPT,
-		);
-		expect(result).toEqual({ finishReason: "completed", iterations: 5 });
-	});
-
-	it("does not continue after a UI-initiated mode change", async () => {
-		// A Tab toggle can race a natural turn completion; a "ui" source must
-		// never start executing a plan the user did not approve.
-		const { run, sendContinuationTurn } = makeHarness({
-			initial: { finishReason: "completed", iterations: 2 },
-			modeChanges: [{ mode: "act", source: "ui" }],
-		});
-
-		const result = await run();
-
-		expect(sendContinuationTurn).not.toHaveBeenCalled();
-		expect(result).toEqual({ finishReason: "completed", iterations: 2 });
-	});
-
-	it("does not continue when the switch turn was aborted", async () => {
-		const { run, sendContinuationTurn } = makeHarness({
-			initial: { finishReason: "aborted", iterations: 1 },
-			modeChanges: [{ mode: "act", source: "tool" }],
-		});
-
-		const result = await run();
-
-		expect(sendContinuationTurn).not.toHaveBeenCalled();
-		expect(result).toEqual({ finishReason: "aborted", iterations: 1 });
-	});
-
-	it("does not continue when no mode change was pending", async () => {
-		const { run, sendContinuationTurn } = makeHarness({
-			initial: { finishReason: "completed", iterations: 2 },
-			modeChanges: [undefined],
-		});
-
-		const result = await run();
-
-		expect(sendContinuationTurn).not.toHaveBeenCalled();
-		expect(result).toEqual({ finishReason: "completed", iterations: 2 });
-	});
-
-	it("returns the switch turn result when the continuation yields nothing", async () => {
-		const { run } = makeHarness({
-			initial: { finishReason: "completed", iterations: 2 },
-			continuation: undefined,
-			modeChanges: [{ mode: "act", source: "tool" }, undefined],
-		});
-
-		const result = await run();
-
-		expect(result).toEqual({ finishReason: "completed", iterations: 2 });
-	});
-});
-
-describe("createModeSwitchNoticeTracker", () => {
-	it("records a switch and clears it on consume", () => {
-		const tracker = createModeSwitchNoticeTracker();
-
-		tracker.record("act", "plan");
-
-		expect(tracker.consume()).toEqual({ from: "act", to: "plan" });
-		expect(tracker.consume()).toBeNull();
-	});
-
-	it("cancels a round trip that returns to the mode the model last saw", () => {
-		const tracker = createModeSwitchNoticeTracker();
-
-		tracker.record("act", "plan");
-		tracker.record("plan", "act");
-
-		expect(tracker.consume()).toBeNull();
-	});
-
-	it("keeps the original starting mode across chained switches", () => {
-		const tracker = createModeSwitchNoticeTracker();
-
-		tracker.record("act", "plan");
-		tracker.record("plan", "act");
-		tracker.record("act", "plan");
-
-		expect(tracker.consume()).toEqual({ from: "act", to: "plan" });
-	});
-
-	it("ignores a no-op switch", () => {
-		const tracker = createModeSwitchNoticeTracker();
-
-		tracker.record("plan", "plan");
-
-		expect(tracker.consume()).toBeNull();
-	});
-});
-
 describe("applyInteractiveModeConfig", () => {
 	beforeEach(() => {
 		vi.mocked(resolveSystemPrompt).mockClear();

apps/cli/src/runtime/interactive/mode.ts

@@ -2,42 +2,17 @@ import { createTool } from "@cline/shared";
 import type { Config } from "../../utils/types";
 import { resolveSystemPrompt } from "../prompt";
 
-export type InteractiveUiMode = "plan" | "act";
-
-/**
- * Pending mode change plus who requested it. The switch_to_act_mode tool and
- * the TUI mode toggle share this slot, but only a tool-initiated switch means
- * "the user approved the plan" -- a UI toggle that lands as a turn finishes
- * must not trigger plan execution.
- */
-export type PendingModeChange = {
-	current: InteractiveUiMode | null;
-	source: "tool" | "ui" | null;
-};
-
-export type AppliedModeChange = {
-	mode: InteractiveUiMode;
-	source: "tool" | "ui";
-};
-
-/**
- * Canned prompt that drives the auto-continue turn after the model calls
- * switch_to_act_mode. It is a synthetic user message, so transcript hydration
- * filters it out of the chat display.
- */
-export const ACT_MODE_CONTINUATION_PROMPT =
-	"The user approved switching to act mode. Continue with the approved plan now.";
+type InteractiveUiMode = "plan" | "act";
 
 export function createInteractiveModeSwitchTool(input: {
 	config: Config;
-	pendingModeChange: PendingModeChange;
+	pendingModeChange: { current: InteractiveUiMode | null };
 	tuiModeChanged: { current: ((mode: InteractiveUiMode) => void) | null };
 }) {
 	return createTool({
 		name: "switch_to_act_mode",
 		description:
-			"Switch from plan mode to act mode. Switching to act mode immediately starts executing the plan, so only call this after the user has explicitly approved the plan in a message sent AFTER you presented it (e.g. 'looks good', 'go ahead', 'switch to act mode'). " +
-			"Never call this in the same turn you present a plan, never call it proactively, and never treat the original task request as approval.",
+			"Switch from plan mode to act mode. Call this after the user has confirmed they want to proceed with the plan. Do not call this proactively or before the user has agreed.",
 		inputSchema: {
 			type: "object",
 			properties: {},
@@ -45,76 +20,17 @@ export function createInteractiveModeSwitchTool(input: {
 		timeoutMs: 5000,
 		retryable: false,
 		maxRetries: 0,
-		// The act-mode tools only exist after the session is rebuilt with the
-		// new mode config, which can't happen mid-run. End the run right after
-		// the tool result so the model never keeps working with plan-mode tools
-		// it was just told it no longer has; run-interactive applies the pending
-		// change and auto-continues on the rebuilt session.
-		lifecycle: {
-			completesRun: true,
-		},
 		execute: async () => {
 			if (input.config.mode === "act") {
-				// Throw instead of returning: a successful result would end the
-				// run via completesRun even though nothing changed.
-				throw new Error("Already in act mode.");
+				return "Already in act mode.";
 			}
 			input.pendingModeChange.current = "act";
-			input.pendingModeChange.source = "tool";
 			input.tuiModeChanged.current?.("act");
 			return "You successfully switched to act mode, proceed with the plan. You now have access to editing files and running commands. (The switch_to_act_mode tool is only available in plan mode.)";
 		},
 	});
 }
 
-/**
- * Runs one interactive turn, and when the model ended it by calling
- * switch_to_act_mode, continues the approved plan on the rebuilt act-mode
- * session instead of waiting for the user to prompt again.
- *
- * The continuation only fires for a tool-initiated switch on a turn that
- * finished "completed": a UI toggle mid-run aborts the turn, and even if the
- * toggle races a natural completion its source is "ui", so the user's Tab
- * press can never start executing a plan they did not approve.
- */
-export async function sendTurnWithActModeContinuation<
-	T extends { finishReason: string; iterations: number },
->(input: {
-	sendInitialTurn: () => Promise<T | undefined>;
-	sendContinuationTurn: (prompt: string) => Promise<T | undefined>;
-	applyPendingModeChange: () => Promise<AppliedModeChange | undefined>;
-}): Promise<T | undefined> {
-	const result = await input.sendInitialTurn();
-	const switched = await input.applyPendingModeChange();
-	if (
-		switched?.mode !== "act" ||
-		switched.source !== "tool" ||
-		result?.finishReason !== "completed"
-	) {
-		return result;
-	}
-	const continuation = await input.sendContinuationTurn(
-		ACT_MODE_CONTINUATION_PROMPT,
-	);
-	// Honor a mode toggle made while the continuation was running.
-	await input.applyPendingModeChange();
-	if (!continuation) {
-		return result;
-	}
-	return {
-		...continuation,
-		iterations: result.iterations + continuation.iterations,
-	};
-}
-
-// The tracker moved to @cline/shared so the VSCode extension can share the
-// exact round-trip-cancelling semantics; re-exported here to keep the CLI's
-// import surface stable.
-export {
-	createModeSwitchNoticeTracker,
-	type ModeSwitchNotice,
-} from "@cline/shared";
-
 export async function applyInteractiveModeConfig(input: {
 	config: Config;
 	mode: InteractiveUiMode;

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

@@ -1,89 +1,81 @@
-import {
-	createSessionCompactionState,
-	type ProviderSettingsManager,
-	type SessionManifest,
-	SessionNotFoundError,
-	SessionSource,
-	type ToolApprovalRequest,
-	type ToolApprovalResult,
+import type {
+	AgentEvent,
+	ProviderSettingsManager,
+	TeamEvent,
+	ToolApprovalRequest,
+	ToolApprovalResult,
 } from "@cline/core";
+import { SessionNotFoundError } from "@cline/core";
 import type { AgentTool, Message } from "@cline/shared";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { ChatCommandState } from "../../utils/chat-commands";
 import type { Config } from "../../utils/types";
 
-const createCliCoreMock = vi.hoisted(() => vi.fn());
-const compactInteractiveMessagesMock = vi.hoisted(() => vi.fn());
-const createRuntimeHooksMock = vi.hoisted(() => vi.fn());
-const setActiveCliSessionMock = vi.hoisted(() => vi.fn());
-const loadInteractiveResumeMessagesMock = vi.hoisted(() => vi.fn());
-const subscribeToAgentEventsMock = vi.hoisted(() => vi.fn());
-const subscribeToPendingPromptEventsMock = vi.hoisted(() => vi.fn());
-const markAbortInProgressMock = vi.hoisted(() => vi.fn());
-const submitAndExitInTerminalMock = vi.hoisted(() => vi.fn());
-const createInteractiveExitSummaryMock = vi.hoisted(() => vi.fn());
-
-vi.mock("../../session/session", () => ({
-	createCliCore: createCliCoreMock,
+const {
+	mockCreateCliCore,
+	mockCreateRuntimeHooks,
+	mockLoadInteractiveResumeMessages,
+	mockSetActiveCliSession,
+} = vi.hoisted(() => ({
+	mockCreateCliCore: vi.fn(),
+	mockCreateRuntimeHooks: vi.fn(),
+	mockLoadInteractiveResumeMessages: vi.fn(),
+	mockSetActiveCliSession: vi.fn(),
 }));
 
-vi.mock("../../utils/approval", () => ({
-	submitAndExitInTerminal: submitAndExitInTerminalMock,
+vi.mock("../../session/session", () => ({
+	createCliCore: mockCreateCliCore,
 }));
 
 vi.mock("../../utils/hooks", () => ({
-	createRuntimeHooks: createRuntimeHooksMock,
+	createRuntimeHooks: mockCreateRuntimeHooks,
 }));
 
 vi.mock("../../utils/output", () => ({
-	setActiveCliSession: setActiveCliSessionMock,
+	setActiveCliSession: mockSetActiveCliSession,
 }));
 
 vi.mock("../../utils/resume", () => ({
-	loadInteractiveResumeMessages: loadInteractiveResumeMessagesMock,
+	loadInteractiveResumeMessages: mockLoadInteractiveResumeMessages,
+}));
+
+vi.mock("../../utils/approval", () => ({
+	submitAndExitInTerminal: vi.fn(),
 }));
 
 vi.mock("../active-runtime", () => ({
-	markAbortInProgress: markAbortInProgressMock,
+	markAbortInProgress: vi.fn(),
 }));
 
 vi.mock("../session-events", () => ({
-	subscribeToAgentEvents: subscribeToAgentEventsMock,
-	subscribeToPendingPromptEvents: subscribeToPendingPromptEventsMock,
+	subscribeToAgentEvents: vi.fn(() => vi.fn()),
+	subscribeToPendingPromptEvents: vi.fn(() => vi.fn()),
 }));
 
-vi.mock("./compaction", () => ({
-	compactInteractiveMessages: compactInteractiveMessagesMock,
-}));
+import { createInteractiveSessionRuntime } from "./session-runtime";
 
-vi.mock("./exit-summary", () => ({
-	createInteractiveExitSummary: createInteractiveExitSummaryMock,
-}));
-
-function createConfig(): Config {
+function makeConfig(): Config {
 	return {
-		providerId: "anthropic",
-		modelId: "claude-test",
 		apiKey: "",
-		cwd: "/tmp/project",
-		workspaceRoot: "/tmp/project",
-		systemPrompt: "system",
-		mode: "act",
-		enableTools: true,
-		enableSpawnAgent: true,
-		enableAgentTeams: true,
+		providerId: "cline",
+		modelId: "openai/gpt-5.3-codex",
 		verbose: false,
+		sandbox: false,
 		thinking: false,
 		outputMode: "text",
-		sandbox: false,
-		defaultToolAutoApprove: true,
-		toolPolicies: {
-			"*": { autoApprove: true },
-		},
+		mode: "act",
+		systemPrompt: "",
+		enableTools: true,
+		enableSpawnAgent: true,
+		enableAgentTeams: false,
+		defaultToolAutoApprove: false,
+		toolPolicies: {},
+		cwd: "/tmp/work",
+		workspaceRoot: "/tmp/work",
 	};
 }
 
-function createChatCommandState(config = createConfig()): ChatCommandState {
+function makeChatCommandState(config: Config): ChatCommandState {
 	return {
 		enableTools: config.enableTools,
 		autoApproveTools: config.defaultToolAutoApprove,
@@ -92,35 +84,6 @@ function createChatCommandState(config = createConfig()): ChatCommandState {
 	};
 }
 
-function createProviderSettingsManager(): ProviderSettingsManager {
-	return {
-		getProviderSettings: vi.fn().mockReturnValue(undefined),
-	} as unknown as ProviderSettingsManager;
-}
-
-function createManifest(sessionId: string): SessionManifest {
-	return {
-		version: 1,
-		session_id: sessionId,
-		source: SessionSource.CLI,
-		pid: 1,
-		started_at: "2026-01-01T00:00:00.000Z",
-		status: "running",
-		interactive: true,
-		provider: "anthropic",
-		model: "claude-test",
-		cwd: "/tmp/project",
-		workspace_root: "/tmp/project",
-		enable_tools: true,
-		enable_spawn: true,
-		enable_teams: true,
-	};
-}
-
-async function importRuntime() {
-	return await import("./session-runtime");
-}
-
 function makeSwitchToActModeTool(): AgentTool {
 	return {
 		name: "switch_to_act_mode",
@@ -137,9 +100,9 @@ function makeManager() {
 		const sessionId = `session-${startCount}`;
 		return {
 			sessionId,
-			manifest: createManifest(sessionId),
-			manifestPath: `/tmp/${sessionId}.json`,
-			messagesPath: `/tmp/${sessionId}.messages.json`,
+			manifest: {
+				session_id: sessionId,
+			},
 		};
 	});
 	return {
@@ -151,13 +114,10 @@ function makeManager() {
 		dispose: vi.fn(),
 		get: vi.fn(),
 		readMessages: vi.fn(async (): Promise<Message[]> => []),
-		readSessionCompactionState: vi.fn().mockResolvedValue(undefined),
-		updateSessionCompactionState: vi.fn(),
 		readTranscript: vi.fn(),
 		ingestHookEvent: vi.fn(),
 		subscribe: vi.fn(),
 		updateSessionModel: vi.fn(),
-		updateSessionConnection: vi.fn(async () => {}),
 		pendingPrompts: {
 			update: vi.fn(),
 		},
@@ -173,7 +133,7 @@ function makeTurnResult() {
 		toolCalls: [],
 		iterations: 1,
 		finishReason: "completed" as const,
-		model: { id: "claude-test", provider: "anthropic" },
+		model: { id: "openai/gpt-5.3-codex", provider: "cline" },
 		startedAt: new Date("2026-01-01T00:00:00.000Z"),
 		endedAt: new Date("2026-01-01T00:00:00.100Z"),
 		durationMs: 100,
@@ -190,22 +150,20 @@ function deferred<T>() {
 	return { promise, resolve, reject };
 }
 
-async function makeRuntime(
+function makeRuntime(
 	manager: ReturnType<typeof makeManager>,
 	options: {
-		config?: Config;
 		resumeSessionId?: string;
 		resolveToolPolicy?: (toolName: string) => Config["toolPolicies"][string];
 	} = {},
 ) {
-	createCliCoreMock.mockResolvedValue(manager);
-	const config = options.config ?? createConfig();
-	const { createInteractiveSessionRuntime } = await importRuntime();
+	mockCreateCliCore.mockResolvedValue(manager);
+	const config = makeConfig();
 	return createInteractiveSessionRuntime({
 		config,
-		providerSettingsManager: createProviderSettingsManager(),
+		providerSettingsManager: {} as ProviderSettingsManager,
 		resumeSessionId: options.resumeSessionId,
-		chatCommandState: createChatCommandState(config),
+		chatCommandState: makeChatCommandState(config),
 		requestToolApproval: async (
 			_request: ToolApprovalRequest,
 		): Promise<ToolApprovalResult> => ({ approved: true }),
@@ -214,325 +172,26 @@ async function makeRuntime(
 		askQuestionRef: { current: null },
 		resolveMistakeLimitDecision: undefined,
 		switchToActModeTool: makeSwitchToActModeTool(),
-		onAgentEvent: vi.fn(),
-		onTeamEvent: vi.fn(),
-		onPendingPrompts: vi.fn(),
-		onPendingPromptSubmitted: vi.fn(),
+		onAgentEvent: (_event: AgentEvent) => {},
+		onTeamEvent: (_event: TeamEvent) => {},
+		onPendingPrompts: () => {},
+		onPendingPromptSubmitted: () => {},
 	});
 }
 
 describe("createInteractiveSessionRuntime", () => {
 	beforeEach(() => {
-		createCliCoreMock.mockReset();
-		compactInteractiveMessagesMock.mockReset();
-		createRuntimeHooksMock.mockReset();
-		setActiveCliSessionMock.mockReset();
-		loadInteractiveResumeMessagesMock.mockReset();
-		subscribeToAgentEventsMock.mockReset();
-		subscribeToPendingPromptEventsMock.mockReset();
-		markAbortInProgressMock.mockReset();
-		submitAndExitInTerminalMock.mockReset();
-		createInteractiveExitSummaryMock.mockReset();
-		createRuntimeHooksMock.mockReturnValue({
+		vi.clearAllMocks();
+		mockCreateRuntimeHooks.mockReturnValue({
 			hooks: undefined,
-			shutdown: vi.fn().mockResolvedValue(undefined),
+			shutdown: vi.fn(async () => {}),
 		});
-		loadInteractiveResumeMessagesMock.mockResolvedValue([]);
-		subscribeToAgentEventsMock.mockReturnValue(() => {});
-		subscribeToPendingPromptEventsMock.mockReturnValue(() => {});
-	});
-
-	it("manual compact updates the active session sidecar without restarting", async () => {
-		const sessionId = "sess-active";
-		const messages = [
-			{ id: "u1", role: "user" as const, content: "hello" },
-			{ id: "a1", role: "assistant" as const, content: "world" },
-		];
-		const compactionState = createSessionCompactionState({
-			sourceMessages: messages,
-			compactedMessages: [
-				{ id: "summary", role: "user" as const, content: "summary" },
-			],
-			updatedAt: "2026-01-01T00:00:00.000Z",
-		});
-		const manager = {
-			start: vi.fn().mockResolvedValue({
-				sessionId,
-				manifest: createManifest(sessionId),
-				manifestPath: "/tmp/session.json",
-				messagesPath: "/tmp/session.messages.json",
-			}),
-			readMessages: vi.fn().mockResolvedValue(messages),
-			updateSessionCompactionState: vi
-				.fn()
-				.mockResolvedValue({ updated: true }),
-			stop: vi.fn().mockResolvedValue(undefined),
-			dispose: vi.fn().mockResolvedValue(undefined),
-			ingestHookEvent: vi.fn().mockResolvedValue(undefined),
-			get: vi.fn(),
-			list: vi.fn(),
-			delete: vi.fn(),
-			send: vi.fn(),
-			getAccumulatedUsage: vi.fn(),
-		};
-		createCliCoreMock.mockResolvedValue(manager);
-		compactInteractiveMessagesMock.mockResolvedValue({
-			compacted: true,
-			canonicalMessages: messages,
-			compactionState,
-		});
-		const { createInteractiveSessionRuntime } = await importRuntime();
-		const runtime = createInteractiveSessionRuntime({
-			config: createConfig(),
-			providerSettingsManager: createProviderSettingsManager(),
-			chatCommandState: createChatCommandState(),
-			requestToolApproval: vi.fn(),
-			resolveToolPolicy: () => ({ autoApprove: true }),
-			askQuestionRef: { current: null },
-			resolveMistakeLimitDecision: undefined,
-			switchToActModeTool: {} as never,
-			onAgentEvent: vi.fn(),
-			onTeamEvent: vi.fn(),
-			onPendingPrompts: vi.fn(),
-			onPendingPromptSubmitted: vi.fn(),
-		});
-
-		await runtime.ensureReady();
-		const result = await runtime.compactCurrentSession();
-
-		expect(result).toEqual({
-			messagesBefore: messages.length,
-			messagesAfter: messages.length,
-			workingContextMessagesAfter: compactionState.messages.length,
-			compacted: true,
-		});
-		expect(manager.start).toHaveBeenCalledTimes(1);
-		expect(manager.stop).not.toHaveBeenCalled();
-		expect(manager.readMessages).toHaveBeenCalledWith(sessionId);
-		expect(compactInteractiveMessagesMock).toHaveBeenCalledWith({
-			config: expect.objectContaining({
-				providerId: "anthropic",
-				modelId: "claude-test",
-			}),
-			providerSettingsManager: expect.objectContaining({
-				getProviderSettings: expect.any(Function),
-			}),
-			sessionId,
-			messages,
-			abortSignal: expect.any(AbortSignal),
-		});
-		expect(manager.updateSessionCompactionState).toHaveBeenCalledWith(
-			sessionId,
-			compactionState,
-		);
-		expect(runtime.getActiveSessionId()).toBe(sessionId);
-	});
-
-	it("rejects manual compact while the active session is running", async () => {
-		const sessionId = "sess-running";
-		const messages = [{ role: "user" as const, content: "hello" }];
-		const manager = {
-			start: vi.fn().mockResolvedValue({
-				sessionId,
-				manifest: createManifest(sessionId),
-				manifestPath: "/tmp/session.json",
-				messagesPath: "/tmp/session.messages.json",
-			}),
-			readMessages: vi.fn().mockResolvedValue(messages),
-			updateSessionCompactionState: vi
-				.fn()
-				.mockResolvedValue({ updated: true }),
-			stop: vi.fn().mockResolvedValue(undefined),
-			dispose: vi.fn().mockResolvedValue(undefined),
-			ingestHookEvent: vi.fn().mockResolvedValue(undefined),
-			get: vi.fn().mockResolvedValue({
-				sessionId,
-				status: "running",
-			}),
-			list: vi.fn(),
-			delete: vi.fn(),
-			send: vi.fn(),
-			getAccumulatedUsage: vi.fn(),
-		};
-		createCliCoreMock.mockResolvedValue(manager);
-		const { createInteractiveSessionRuntime } = await importRuntime();
-		const runtime = createInteractiveSessionRuntime({
-			config: createConfig(),
-			providerSettingsManager: createProviderSettingsManager(),
-			chatCommandState: createChatCommandState(),
-			requestToolApproval: vi.fn(),
-			resolveToolPolicy: () => ({ autoApprove: true }),
-			askQuestionRef: { current: null },
-			resolveMistakeLimitDecision: undefined,
-			switchToActModeTool: {} as never,
-			onAgentEvent: vi.fn(),
-			onTeamEvent: vi.fn(),
-			onPendingPrompts: vi.fn(),
-			onPendingPromptSubmitted: vi.fn(),
-		});
-
-		await runtime.ensureReady();
-
-		await expect(runtime.compactCurrentSession()).rejects.toThrow(
-			"Cannot compact while the current turn is running",
-		);
-		expect(manager.readMessages).toHaveBeenCalledWith(sessionId);
-		expect(compactInteractiveMessagesMock).not.toHaveBeenCalled();
-		expect(manager.updateSessionCompactionState).not.toHaveBeenCalled();
-	});
-
-	it("rejects manual compact when compaction is disabled", async () => {
-		const manager = makeManager();
-		const config = createConfig();
-		config.compaction = { enabled: false };
-		const runtime = await makeRuntime(manager, { config });
-
-		await runtime.ensureReady();
-
-		await expect(runtime.compactCurrentSession()).rejects.toThrow(
-			"compaction is off",
-		);
-		expect(compactInteractiveMessagesMock).not.toHaveBeenCalled();
-		expect(manager.updateSessionCompactionState).not.toHaveBeenCalled();
-	});
-
-	it("carries compacted working context across mode-switch restarts", async () => {
-		const firstSessionId = "sess-mode-before";
-		const secondSessionId = "sess-mode-after";
-		const prefixMessage = {
-			id: "u1",
-			role: "user" as const,
-			content: "large original",
-		};
-		const tailMessage = {
-			id: "u2",
-			role: "user" as const,
-			content: "new canonical tail",
-		};
-		const messages = [prefixMessage, tailMessage];
-		const summaryMessage = {
-			id: "summary",
-			role: "user" as const,
-			content: "summary",
-		};
-		const compactionState = createSessionCompactionState({
-			sourceMessages: [prefixMessage],
-			compactedMessages: [summaryMessage],
-			conversationId: firstSessionId,
-			systemPrompt: "compacted system",
-			updatedAt: "2026-01-01T00:00:00.000Z",
-		});
-		const manager = {
-			start: vi
-				.fn()
-				.mockResolvedValueOnce({
-					sessionId: firstSessionId,
-					manifest: createManifest(firstSessionId),
-					manifestPath: "/tmp/session-before.json",
-					messagesPath: "/tmp/session-before.messages.json",
-				})
-				.mockResolvedValueOnce({
-					sessionId: secondSessionId,
-					manifest: createManifest(secondSessionId),
-					manifestPath: "/tmp/session-after.json",
-					messagesPath: "/tmp/session-after.messages.json",
-				}),
-			readMessages: vi.fn().mockResolvedValue(messages),
-			readSessionCompactionState: vi.fn().mockResolvedValue(compactionState),
-			updateSessionCompactionState: vi
-				.fn()
-				.mockResolvedValue({ updated: true }),
-			stop: vi.fn().mockResolvedValue(undefined),
-			dispose: vi.fn().mockResolvedValue(undefined),
-			ingestHookEvent: vi.fn().mockResolvedValue(undefined),
-			get: vi.fn(),
-			list: vi.fn(),
-			delete: vi.fn(),
-			send: vi.fn(),
-			getAccumulatedUsage: vi.fn(),
-		};
-		createCliCoreMock.mockResolvedValue(manager);
-		const { createInteractiveSessionRuntime } = await importRuntime();
-		const runtime = createInteractiveSessionRuntime({
-			config: createConfig(),
-			providerSettingsManager: createProviderSettingsManager(),
-			chatCommandState: createChatCommandState(),
-			requestToolApproval: vi.fn(),
-			resolveToolPolicy: () => ({ autoApprove: true }),
-			askQuestionRef: { current: null },
-			resolveMistakeLimitDecision: undefined,
-			switchToActModeTool: {} as never,
-			onAgentEvent: vi.fn(),
-			onTeamEvent: vi.fn(),
-			onPendingPrompts: vi.fn(),
-			onPendingPromptSubmitted: vi.fn(),
-		});
-
-		await runtime.ensureReady();
-		await runtime.applyMode("plan");
-
-		expect(manager.readMessages).toHaveBeenCalledWith(firstSessionId);
-		expect(manager.readSessionCompactionState).toHaveBeenCalledWith(
-			firstSessionId,
-		);
-		expect(manager.stop).toHaveBeenCalledWith(firstSessionId);
-		const restartInput = manager.start.mock.calls[1]?.[0];
-		expect(restartInput).toMatchObject({
-			initialMessages: messages,
-			initialCompactionState: expect.objectContaining({
-				source_message_count: messages.length,
-				messages: [summaryMessage, tailMessage],
-				system_prompt: "compacted system",
-			}),
-		});
-		expect(restartInput.initialCompactionState).not.toHaveProperty(
-			"conversation_id",
-		);
-		expect(manager.updateSessionCompactionState).not.toHaveBeenCalled();
-		expect(runtime.getActiveSessionId()).toBe(secondSessionId);
+		mockLoadInteractiveResumeMessages.mockResolvedValue([]);
 	});
 
 	it("defers creating the replacement session after a new-session reset", async () => {
-		let startCount = 0;
-		const manager = {
-			start: vi.fn().mockImplementation(async () => {
-				startCount += 1;
-				const sessionId = `session-${startCount}`;
-				return {
-					sessionId,
-					manifest: createManifest(sessionId),
-					manifestPath: `/tmp/${sessionId}.json`,
-					messagesPath: `/tmp/${sessionId}.messages.json`,
-				};
-			}),
-			readMessages: vi.fn().mockResolvedValue([]),
-			readSessionCompactionState: vi.fn().mockResolvedValue(undefined),
-			updateSessionCompactionState: vi.fn(),
-			stop: vi.fn().mockResolvedValue(undefined),
-			dispose: vi.fn().mockResolvedValue(undefined),
-			ingestHookEvent: vi.fn().mockResolvedValue(undefined),
-			get: vi.fn(),
-			list: vi.fn(),
-			delete: vi.fn(),
-			send: vi.fn(),
-			getAccumulatedUsage: vi.fn(),
-		};
-		createCliCoreMock.mockResolvedValue(manager);
-		const { createInteractiveSessionRuntime } = await importRuntime();
-		const runtime = createInteractiveSessionRuntime({
-			config: createConfig(),
-			providerSettingsManager: createProviderSettingsManager(),
-			chatCommandState: createChatCommandState(),
-			requestToolApproval: vi.fn(),
-			resolveToolPolicy: () => ({ autoApprove: true }),
-			askQuestionRef: { current: null },
-			resolveMistakeLimitDecision: undefined,
-			switchToActModeTool: {} as never,
-			onAgentEvent: vi.fn(),
-			onTeamEvent: vi.fn(),
-			onPendingPrompts: vi.fn(),
-			onPendingPromptSubmitted: vi.fn(),
-		});
+		const manager = makeManager();
+		const runtime = makeRuntime(manager);
 
 		await runtime.ensureReady();
 		expect(manager.start).toHaveBeenCalledOnce();
@@ -543,7 +202,7 @@ describe("createInteractiveSessionRuntime", () => {
 		expect(manager.stop).toHaveBeenCalledWith("session-1");
 		expect(manager.start).toHaveBeenCalledOnce();
 		expect(runtime.getActiveSessionId()).toBe("");
-		expect(setActiveCliSessionMock).toHaveBeenLastCalledWith(undefined);
+		expect(mockSetActiveCliSession).toHaveBeenLastCalledWith(undefined);
 
 		await runtime.ensureReady();
 
@@ -551,54 +210,18 @@ describe("createInteractiveSessionRuntime", () => {
 		expect(runtime.getActiveSessionId()).toBe("session-2");
 	});
 
-	it("holds concurrent ensureReady during a restart instead of booting an empty session", async () => {
-		const manager = makeManager();
-		const runtime = await makeRuntime(manager);
-
-		await runtime.ensureReady();
-		expect(runtime.getActiveSessionId()).toBe("session-1");
-
-		// Keep the replacement session's start in flight so the restart window
-		// (old session stopped, no active session yet) stays open.
-		const gate = deferred<void>();
-		manager.start.mockImplementationOnce(async () => {
-			await gate.promise;
-			return {
-				sessionId: "session-restarted",
-				manifest: createManifest("session-restarted"),
-				manifestPath: "/tmp/session-restarted.json",
-				messagesPath: "/tmp/session-restarted.messages.json",
-			};
-		});
-
-		const restart = runtime.restartWithCurrentMessages();
-		await vi.waitFor(() => {
-			expect(manager.start).toHaveBeenCalledTimes(2);
-		});
-
-		// A message submitted mid-restart (e.g. right after a plan/act toggle)
-		// calls ensureReady; it must wait for the restart instead of booting a
-		// blank session that races the replacement for the active slot.
-		const ready = runtime.ensureReady();
-		gate.resolve();
-		await Promise.all([restart, ready]);
-
-		expect(manager.start).toHaveBeenCalledTimes(2);
-		expect(runtime.getActiveSessionId()).toBe("session-restarted");
-	});
-
 	it("adds a live interactive approval policy hook to started sessions", async () => {
 		const manager = makeManager();
 		const upstreamBeforeTool = vi.fn(async () => ({
 			input: { text: "updated" },
 		}));
-		createRuntimeHooksMock.mockReturnValueOnce({
+		mockCreateRuntimeHooks.mockReturnValueOnce({
 			hooks: {
 				beforeTool: upstreamBeforeTool,
 			},
 			shutdown: vi.fn(async () => {}),
 		});
-		const runtime = await makeRuntime(manager, {
+		const runtime = makeRuntime(manager, {
 			resolveToolPolicy: (toolName) => ({
 				autoApprove: toolName === "echo",
 			}),
@@ -650,51 +273,14 @@ describe("createInteractiveSessionRuntime", () => {
 	});
 
 	it("starts fresh after resetting an initially resumed session", async () => {
-		let startCount = 0;
-		const manager = {
-			start: vi.fn().mockImplementation(async () => {
-				startCount += 1;
-				const sessionId = `session-${startCount}`;
-				return {
-					sessionId,
-					manifest: createManifest(sessionId),
-					manifestPath: `/tmp/${sessionId}.json`,
-					messagesPath: `/tmp/${sessionId}.messages.json`,
-				};
-			}),
-			readMessages: vi.fn().mockResolvedValue([]),
-			readSessionCompactionState: vi.fn().mockResolvedValue(undefined),
-			updateSessionCompactionState: vi.fn(),
-			stop: vi.fn().mockResolvedValue(undefined),
-			dispose: vi.fn().mockResolvedValue(undefined),
-			ingestHookEvent: vi.fn().mockResolvedValue(undefined),
-			get: vi.fn(),
-			list: vi.fn(),
-			delete: vi.fn(),
-			send: vi.fn(),
-			getAccumulatedUsage: vi.fn(),
-		};
-		createCliCoreMock.mockResolvedValue(manager);
-		const { createInteractiveSessionRuntime } = await importRuntime();
-		const runtime = createInteractiveSessionRuntime({
-			config: createConfig(),
-			providerSettingsManager: createProviderSettingsManager(),
+		const manager = makeManager();
+		const runtime = makeRuntime(manager, {
 			resumeSessionId: "resumed-session",
-			chatCommandState: createChatCommandState(),
-			requestToolApproval: vi.fn(),
-			resolveToolPolicy: () => ({ autoApprove: true }),
-			askQuestionRef: { current: null },
-			resolveMistakeLimitDecision: undefined,
-			switchToActModeTool: {} as never,
-			onAgentEvent: vi.fn(),
-			onTeamEvent: vi.fn(),
-			onPendingPrompts: vi.fn(),
-			onPendingPromptSubmitted: vi.fn(),
 		});
 
 		await runtime.ensureReady();
 
-		expect(loadInteractiveResumeMessagesMock).toHaveBeenNthCalledWith(
+		expect(mockLoadInteractiveResumeMessages).toHaveBeenNthCalledWith(
 			1,
 			manager,
 			"resumed-session",
@@ -702,14 +288,16 @@ describe("createInteractiveSessionRuntime", () => {
 		expect(manager.start).toHaveBeenNthCalledWith(
 			1,
 			expect.objectContaining({
-				config: expect.objectContaining({ sessionId: "resumed-session" }),
+				config: expect.objectContaining({
+					sessionId: "resumed-session",
+				}),
 			}),
 		);
 
 		await runtime.resetForNewSession();
 		await runtime.ensureReady();
 
-		expect(loadInteractiveResumeMessagesMock).toHaveBeenNthCalledWith(
+		expect(mockLoadInteractiveResumeMessages).toHaveBeenNthCalledWith(
 			2,
 			manager,
 			undefined,
@@ -726,46 +314,8 @@ describe("createInteractiveSessionRuntime", () => {
 	});
 
 	it("keeps explicit empty restarts eager for config-driven restarts", async () => {
-		let startCount = 0;
-		const manager = {
-			start: vi.fn().mockImplementation(async () => {
-				startCount += 1;
-				const sessionId = `session-${startCount}`;
-				return {
-					sessionId,
-					manifest: createManifest(sessionId),
-					manifestPath: `/tmp/${sessionId}.json`,
-					messagesPath: `/tmp/${sessionId}.messages.json`,
-				};
-			}),
-			readMessages: vi.fn().mockResolvedValue([]),
-			readSessionCompactionState: vi.fn().mockResolvedValue(undefined),
-			updateSessionCompactionState: vi.fn(),
-			stop: vi.fn().mockResolvedValue(undefined),
-			dispose: vi.fn().mockResolvedValue(undefined),
-			ingestHookEvent: vi.fn().mockResolvedValue(undefined),
-			get: vi.fn(),
-			list: vi.fn(),
-			delete: vi.fn(),
-			send: vi.fn(),
-			getAccumulatedUsage: vi.fn(),
-		};
-		createCliCoreMock.mockResolvedValue(manager);
-		const { createInteractiveSessionRuntime } = await importRuntime();
-		const runtime = createInteractiveSessionRuntime({
-			config: createConfig(),
-			providerSettingsManager: createProviderSettingsManager(),
-			chatCommandState: createChatCommandState(),
-			requestToolApproval: vi.fn(),
-			resolveToolPolicy: () => ({ autoApprove: true }),
-			askQuestionRef: { current: null },
-			resolveMistakeLimitDecision: undefined,
-			switchToActModeTool: {} as never,
-			onAgentEvent: vi.fn(),
-			onTeamEvent: vi.fn(),
-			onPendingPrompts: vi.fn(),
-			onPendingPromptSubmitted: vi.fn(),
-		});
+		const manager = makeManager();
+		const runtime = makeRuntime(manager);
 
 		await runtime.ensureReady();
 		await runtime.restartEmpty();
@@ -787,7 +337,7 @@ describe("createInteractiveSessionRuntime", () => {
 		manager.send
 			.mockRejectedValueOnce(new SessionNotFoundError("session-1"))
 			.mockResolvedValueOnce(makeTurnResult());
-		const runtime = await makeRuntime(manager);
+		const runtime = makeRuntime(manager);
 
 		await runtime.ensureReady();
 		const result = await runtime.sendCurrentTurn({
@@ -815,125 +365,6 @@ describe("createInteractiveSessionRuntime", () => {
 		expect(runtime.getActiveSessionId()).toBe("session-2");
 	});
 
-	it("preserves the session id and applies changed provider config when restarting with the current messages", async () => {
-		const manager = makeManager();
-		const config = {
-			...createConfig(),
-			providerId: "cline",
-			modelId: "anthropic/claude-sonnet-4.6",
-			apiKey: "cline-key",
-		};
-		const messages: Message[] = [
-			{ role: "user", content: [{ type: "text", text: "hello" }] },
-		];
-		manager.readMessages.mockResolvedValue(messages);
-		const runtime = await makeRuntime(manager, { config });
-
-		await runtime.ensureReady();
-		expect(manager.start).toHaveBeenNthCalledWith(
-			1,
-			expect.objectContaining({
-				config: expect.objectContaining({
-					providerId: "cline",
-					modelId: "anthropic/claude-sonnet-4.6",
-					apiKey: "cline-key",
-				}),
-			}),
-		);
-		config.providerId = "openai-compatible";
-		config.modelId = "custom-model";
-		config.apiKey = "new-key";
-		await runtime.restartWithCurrentMessages();
-
-		expect(manager.start).toHaveBeenCalledTimes(2);
-		expect(manager.start).toHaveBeenNthCalledWith(
-			2,
-			expect.objectContaining({
-				config: expect.objectContaining({
-					sessionId: "session-1",
-					providerId: "openai-compatible",
-					modelId: "custom-model",
-					apiKey: "new-key",
-				}),
-				initialMessages: messages,
-			}),
-		);
-	});
-
-	it("updates the active session connection in place without restarting", async () => {
-		const manager = makeManager();
-		const runtime = await makeRuntime(manager);
-
-		await runtime.ensureReady();
-		await runtime.updateCurrentSessionConnection({
-			providerId: "openai",
-			modelId: "codex-test",
-		});
-
-		expect(manager.updateSessionConnection).toHaveBeenCalledWith("session-1", {
-			providerId: "openai",
-			modelId: "codex-test",
-		});
-		expect(manager.start).toHaveBeenCalledTimes(1);
-		expect(runtime.getActiveSessionId()).toBe("session-1");
-	});
-
-	it("does not reuse the session id when restarting empty", async () => {
-		const manager = makeManager();
-		const runtime = await makeRuntime(manager);
-
-		await runtime.ensureReady();
-		await runtime.restartEmpty();
-
-		expect(manager.start).toHaveBeenCalledTimes(2);
-		const secondStart = manager.start.mock.calls[1]?.[0] as {
-			config?: { sessionId?: string };
-		};
-		expect(secondStart?.config?.sessionId).toBeUndefined();
-	});
-
-	it("recovers empty read-driven restarts when the active interactive session disappeared", async () => {
-		const manager = makeManager();
-		manager.readMessages.mockRejectedValueOnce(
-			new SessionNotFoundError("session-1"),
-		);
-		const runtime = await makeRuntime(manager);
-
-		await runtime.ensureReady();
-		await runtime.restartWithCurrentMessages();
-
-		expect(manager.readMessages).toHaveBeenCalledWith("session-1");
-		expect(manager.start).toHaveBeenCalledTimes(2);
-		expect(manager.start).toHaveBeenNthCalledWith(
-			2,
-			expect.objectContaining({
-				initialMessages: [],
-			}),
-		);
-		expect(runtime.getActiveSessionId()).toBe("session-2");
-	});
-
-	it("does not restart with stale messages when another operation changes the active session during a read", async () => {
-		const manager = makeManager();
-		let runtime!: Awaited<ReturnType<typeof makeRuntime>>;
-		manager.readMessages.mockImplementationOnce(async () => {
-			await runtime.restartEmpty();
-			return [
-				{
-					role: "user" as const,
-					content: [{ type: "text" as const, text: "stale" }],
-				},
-			];
-		});
-		runtime = await makeRuntime(manager);
-
-		await runtime.ensureReady();
-		await runtime.restartWithCurrentMessages();
-
-		expect(manager.start).toHaveBeenCalledTimes(2);
-		expect(runtime.getActiveSessionId()).toBe("session-2");
-	});
-
 	it("waits for missing-session recovery before cleanup disposes the manager", async () => {
 		const manager = makeManager();
 		const recoveryRead = deferred<Message[]>();
@@ -943,7 +374,7 @@ describe("createInteractiveSessionRuntime", () => {
 		manager.get.mockResolvedValue(undefined);
 		manager.getAccumulatedUsage.mockResolvedValue(undefined);
 		manager.send.mockRejectedValueOnce(new SessionNotFoundError("session-1"));
-		const runtime = await makeRuntime(manager);
+		const runtime = makeRuntime(manager);
 
 		await runtime.ensureReady();
 		const sendPromise = runtime

apps/cli/src/runtime/interactive/session-runtime.ts

@@ -2,13 +2,10 @@ import {
 	type AgentEvent,
 	type AgentHooks,
 	type CheckpointEntry,
-	createSessionCompactionState,
 	isSessionNotFoundError,
 	type PendingPromptMutationResult,
 	type ProviderSettingsManager,
-	projectSessionCompactionState,
 	readSessionCheckpointHistory,
-	type SessionCompactionState,
 	SessionSource,
 	type TeamEvent,
 	type ToolApprovalRequest,
@@ -49,19 +46,9 @@ type RuntimeHooks = ReturnType<typeof createRuntimeHooks>;
 type StartedSession = Awaited<ReturnType<CliCore["start"]>>;
 type CurrentTurnInput = Omit<Parameters<CliCore["send"]>[0], "sessionId">;
 type CurrentTurnResult = Awaited<ReturnType<CliCore["send"]>>;
-export type SessionConnectionUpdate = Parameters<
-	CliCore["updateSessionConnection"]
->[1];
 type AskQuestionRef = {
 	current: ((question: string, options: string[]) => Promise<string>) | null;
 };
-type CurrentMessagesRead =
-	| { messages: Message[]; status: "read" }
-	| { messages: Message[]; status: "recovered" }
-	| { messages: Message[]; status: "stale" };
-type MissingSessionRecovery = {
-	messages: Message[];
-};
 type ToolPolicyResolver = (
 	toolName: string,
 ) => NonNullable<Config["toolPolicies"]>[string];
@@ -116,13 +103,10 @@ export function createInteractiveSessionRuntime(input: {
 	let shutdownRequested = false;
 	let activeSessionId = "";
 	let abortRequested = false;
-	let missingSessionRecoveryPromise:
-		| Promise<MissingSessionRecovery>
-		| undefined;
+	let missingSessionRecoveryPromise: Promise<void> | undefined;
 	// A reset can happen while an earlier manager.start() is still in flight.
 	// Bump this before resets and restarts so stale starts cannot become active.
 	let sessionStartGeneration = 0;
-	let manualCompactionAbortController: AbortController | undefined;
 
 	let pendingResumeSessionId = input.resumeSessionId?.trim() || undefined;
 
@@ -212,23 +196,15 @@ export function createInteractiveSessionRuntime(input: {
 	const startFreshSession = async (
 		initial: Message[] = [],
 		sessionMetadata?: Record<string, unknown>,
-		initialCompactionState?: SessionCompactionState,
-		// Restarting an old session associate with this ID,
-		// For continuing the same conversation, e.g. after a config change.
-		sessionId?: string,
 	): Promise<void> => {
 		const generation = sessionStartGeneration;
 		const manager = await ensureSessionManager();
 		const started = await manager.start({
 			source: SessionSource.CLI,
-			config: {
-				...buildSessionConfig(),
-				...(sessionId ? { sessionId } : {}),
-			},
+			config: buildSessionConfig(),
 			toolPolicies: input.config.toolPolicies,
 			interactive: true,
 			initialMessages: initial,
-			...(initialCompactionState ? { initialCompactionState } : {}),
 			...(sessionMetadata ? { sessionMetadata } : {}),
 			localRuntime: {
 				onTeamRestored: () => {},
@@ -299,53 +275,14 @@ export function createInteractiveSessionRuntime(input: {
 		return await startupPromise;
 	};
 
-	const readCurrentMessages = async (): Promise<CurrentMessagesRead> => {
-		const manager = sessionManager;
-		const sessionId = activeSessionId;
-		if (!manager || !sessionId) {
-			return { messages: [], status: "read" };
-		}
-		try {
-			const messages = (await manager.readMessages(sessionId)) ?? [];
-			return {
-				messages,
-				status: activeSessionId === sessionId ? "read" : "stale",
-			};
-		} catch (error) {
-			if (
-				abortRequested ||
-				shutdownRequested ||
-				!isSessionNotFoundError(error)
-			) {
-				throw error;
-			}
-			const recovery = await recoverMissingActiveSession(error);
-			return { messages: recovery.messages, status: "recovered" };
+	const readCurrentMessages = async (): Promise<Message[]> => {
+		if (!sessionManager || !activeSessionId) {
+			return [];
 		}
+		return (await sessionManager.readMessages(activeSessionId)) ?? [];
 	};
 
-	const readCompactionState = async (
-		sessionId: string,
-	): Promise<SessionCompactionState | undefined> => {
-		const manager = sessionManager;
-		if (!manager) {
-			return undefined;
-		}
-		try {
-			return await manager.readSessionCompactionState(sessionId);
-		} catch (error) {
-			input.config.logger?.log?.("Failed to read session compaction state", {
-				sessionId,
-				error,
-				severity: "warn",
-			});
-			return undefined;
-		}
-	};
-
-	const recoverMissingActiveSession = async (
-		error: unknown,
-	): Promise<MissingSessionRecovery> => {
+	const recoverMissingActiveSession = async (error: unknown): Promise<void> => {
 		if (missingSessionRecoveryPromise) {
 			return await missingSessionRecoveryPromise;
 		}
@@ -353,7 +290,7 @@ export function createInteractiveSessionRuntime(input: {
 			const manager = sessionManager;
 			const missingSessionId = activeSessionId;
 			if (!manager || !missingSessionId || shutdownRequested) {
-				return { messages: [] };
+				return;
 			}
 			const messages = await manager
 				.readMessages(missingSessionId)
@@ -370,22 +307,12 @@ export function createInteractiveSessionRuntime(input: {
 			startupError = undefined;
 			clearActiveSession();
 			await startFreshSession(messages);
-			return { messages };
 		})().finally(() => {
 			missingSessionRecoveryPromise = undefined;
 		});
 		return await missingSessionRecoveryPromise;
 	};
 
-	const readCurrentCompactionState = async (): Promise<
-		SessionCompactionState | undefined
-	> => {
-		if (!activeSessionId) {
-			return undefined;
-		}
-		return await readCompactionState(activeSessionId);
-	};
-
 	const stopCurrentSession = async (): Promise<void> => {
 		const sessionId = activeSessionId;
 		if (sessionManager && sessionId) {
@@ -423,89 +350,19 @@ export function createInteractiveSessionRuntime(input: {
 	const restartWithMessages = async (
 		messages: Message[],
 		sessionMetadata?: Record<string, unknown>,
-		initialCompactionState?: SessionCompactionState,
-		options?: { preserveSessionId?: boolean },
 	): Promise<void> => {
-		// Config-only restarts (model/mode/account changes) continue the same
-		// conversation, so they must keep the session id — otherwise each
-		// restart mints a new session history entry for the same conversation.
-		const reuseSessionId = options?.preserveSessionId
-			? activeSessionId || undefined
-			: undefined;
 		sessionStartGeneration += 1;
 		pendingResumeSessionId = undefined;
+		startupPromise = undefined;
 		startupError = undefined;
-		// Publish the restart as the in-flight startup. Teardown leaves a window
-		// with no active session, and without this barrier a concurrent
-		// ensureReady() (e.g. a message submitted right after a plan/act toggle)
-		// reads that window as "no session" and boots an empty session that then
-		// races the restarted one for the active slot.
-		const restart = (async () => {
-			await stopCurrentSession();
-			clearActiveSession();
-			await startFreshSession(
-				messages,
-				sessionMetadata,
-				initialCompactionState,
-				reuseSessionId,
-			);
-		})().catch((error) => {
-			startupError = error;
-			throw error;
-		});
-		startupPromise = restart;
-		try {
-			await restart;
-		} finally {
-			// Restore the pre-restart steady state (startupPromise unset) so a
-			// failed restart stays retryable by the next ensureReady(). A newer
-			// startup that already replaced the barrier is left alone.
-			if (startupPromise === restart) {
-				startupPromise = undefined;
-			}
-		}
+		await stopCurrentSession();
+		clearActiveSession();
+		await startFreshSession(messages, sessionMetadata);
 	};
 
 	const restartWithCurrentMessages = async (): Promise<void> => {
-		const [{ messages, status }, compactionState] = await Promise.all([
-			readCurrentMessages(),
-			readCurrentCompactionState(),
-		]);
-		if (status !== "read") {
-			// If reading recovered a missing hub session, the current messages are
-			// already in the replacement session. If the read is stale, another async
-			// operation changed the active session while this read was in flight.
-			return;
-		}
-		const projectedMessages = compactionState
-			? projectSessionCompactionState(compactionState, messages)
-			: undefined;
-		await restartWithMessages(
-			messages,
-			undefined,
-			projectedMessages
-				? createSessionCompactionState({
-						sourceMessages: messages,
-						compactedMessages: projectedMessages,
-						systemPrompt: compactionState?.system_prompt,
-					})
-				: undefined,
-			{ preserveSessionId: true },
-		);
-	};
-
-	const updateCurrentSessionConnection = async (
-		update: SessionConnectionUpdate,
-	): Promise<void> => {
-		await ensureReady();
-		const manager = sessionManager;
-		const sessionId = activeSessionId;
-		if (!manager || !sessionId) {
-			// No live session to update; the next startup builds its config from
-			// the already-mutated CLI config, so nothing else is needed.
-			return;
-		}
-		await manager.updateSessionConnection(sessionId, update);
+		const messages = await readCurrentMessages();
+		await restartWithMessages(messages);
 	};
 
 	const restartEmpty = async (): Promise<void> => {
@@ -619,10 +476,6 @@ export function createInteractiveSessionRuntime(input: {
 		if (messages.length === 0) {
 			throw new Error("Cannot fork an empty session.");
 		}
-		const compactionState = await readCompactionState(forkedFromSessionId);
-		const projectedMessages = compactionState
-			? projectSessionCompactionState(compactionState, messages)
-			: undefined;
 		await manager.stop(forkedFromSessionId);
 		const forkMetadata = buildForkSessionMetadata({
 			forkedFromSessionId,
@@ -630,33 +483,8 @@ export function createInteractiveSessionRuntime(input: {
 			sourceSession: sessionRecord,
 			messages,
 		});
-		await startFreshSession(
-			messages,
-			forkMetadata,
-			projectedMessages
-				? createSessionCompactionState({
-						sourceMessages: messages,
-						compactedMessages: projectedMessages,
-						systemPrompt: compactionState?.system_prompt,
-					})
-				: undefined,
-		);
-		// Report carried context from what the new session actually accepted:
-		// the host can reject the inherited state (e.g. stale anchor), and the
-		// UI must not claim a carry-over that did not happen.
-		const acceptedState = projectedMessages
-			? await readCompactionState(activeSessionId)
-			: undefined;
-		return {
-			forkedFromSessionId,
-			newSessionId: activeSessionId,
-			carriedWorkingContext: acceptedState
-				? {
-						workingContextMessages: acceptedState.messages.length,
-						canonicalMessages: messages.length,
-					}
-				: undefined,
-		};
+		await startFreshSession(messages, forkMetadata);
+		return { forkedFromSessionId, newSessionId: activeSessionId };
 	};
 
 	const resumeSession = async (sessionId: string): Promise<Message[]> => {
@@ -677,52 +505,22 @@ export function createInteractiveSessionRuntime(input: {
 	const compactCurrentSession = async (): Promise<{
 		messagesBefore: number;
 		messagesAfter: number;
-		workingContextMessagesAfter?: number;
 		compacted: boolean;
 	}> => {
-		if (input.config.compaction?.enabled === false) {
-			throw new Error(
-				"Cannot compact because compaction is off for this session.",
-			);
-		}
-		const manager = sessionManager;
-		const sourceSessionId = activeSessionId;
-		if (!manager || !sourceSessionId) {
+		if (!sessionManager) {
 			return { messagesBefore: 0, messagesAfter: 0, compacted: false };
 		}
-		const { messages, status } = await readCurrentMessages();
-		if (status === "stale" || (status === "recovered" && !activeSessionId)) {
-			return { messagesBefore: 0, messagesAfter: 0, compacted: false };
-		}
-		// If reading messages recovered the session, `messages` are the same messages
-		// used to seed the replacement session, so it is safe to compact the current
-		// active session with them.
+		const messages = await readCurrentMessages();
 		const messagesBefore = messages.length;
 		if (messagesBefore === 0) {
 			return { messagesBefore: 0, messagesAfter: 0, compacted: false };
 		}
-		const sessionRecord = await manager.get(sourceSessionId);
-		if (sessionRecord?.status === "running") {
-			throw new Error(
-				"Cannot compact while the current turn is running. Wait for it to finish or abort it first.",
-			);
-		}
-		let result: Awaited<ReturnType<typeof compactInteractiveMessages>>;
-		const abortController = new AbortController();
-		manualCompactionAbortController = abortController;
-		try {
-			result = await compactInteractiveMessages({
-				config: input.config,
-				providerSettingsManager: input.providerSettingsManager,
-				sessionId: sourceSessionId,
-				messages,
-				abortSignal: abortController.signal,
-			});
-		} finally {
-			if (manualCompactionAbortController === abortController) {
-				manualCompactionAbortController = undefined;
-			}
-		}
+		const result = await compactInteractiveMessages({
+			config: input.config,
+			providerSettingsManager: input.providerSettingsManager,
+			sessionId: activeSessionId,
+			messages,
+		});
 		if (!result.compacted) {
 			return {
 				messagesBefore,
@@ -730,24 +528,10 @@ export function createInteractiveSessionRuntime(input: {
 				compacted: false,
 			};
 		}
-		if (!result.compactionState) {
-			return {
-				messagesBefore,
-				messagesAfter: messagesBefore,
-				compacted: false,
-			};
-		}
-		const updated = await manager.updateSessionCompactionState(
-			sourceSessionId,
-			result.compactionState,
-		);
-		if (!updated.updated) {
-			throw new Error("Compaction could not be saved. Try again.");
-		}
+		await restartWithMessages(result.messages);
 		return {
 			messagesBefore,
-			messagesAfter: result.canonicalMessages.length,
-			workingContextMessagesAfter: result.compactionState?.messages.length,
+			messagesAfter: result.messages.length,
 			compacted: true,
 		};
 	};
@@ -767,10 +551,7 @@ export function createInteractiveSessionRuntime(input: {
 			return undefined;
 		}
 		const checkpointHistory = readSessionCheckpointHistory(sessionRecord);
-		const { messages, status } = await readCurrentMessages();
-		if (status !== "read") {
-			return undefined;
-		}
+		const messages = await readCurrentMessages();
 		return { messages, checkpointHistory };
 	};
 
@@ -837,9 +618,6 @@ export function createInteractiveSessionRuntime(input: {
 		}
 		abortRequested = true;
 		markAbortInProgress();
-		manualCompactionAbortController?.abort(
-			new Error("Interactive runtime abort requested"),
-		);
 		sessionManager
 			.abort(activeSessionId, new Error("Interactive runtime abort requested"))
 			.catch(() => {});
@@ -887,7 +665,6 @@ export function createInteractiveSessionRuntime(input: {
 		resetForNewSession,
 		restartWithMessages,
 		restartWithCurrentMessages,
-		updateCurrentSessionConnection,
 		resumeSession,
 		forkCurrentSession,
 		compactCurrentSession,

apps/cli/src/runtime/prompt.ts

@@ -9,6 +9,19 @@ import {
 import { type AgentMode, buildClineSystemPrompt } from "@cline/shared";
 import { isImagePath, loadImageAsDataUrl } from "../utils/image-attachments";
 
+const PLAN_MODE_INSTRUCTIONS = `# Plan Mode
+
+You are in Plan mode. Your role is to explore, analyze, and plan -- not to execute.
+
+- Read files, search the codebase, and gather context to understand the problem
+- Ask clarifying questions when requirements are ambiguous
+- Present your plan as a structured outline with clear steps
+- Explain tradeoffs between different approaches when they exist
+- Do NOT edit files, write code, run destructive commands, or make any changes
+- Do NOT implement anything -- focus on understanding and alignment first
+
+When the user aligns on a plan and is ready to proceed, use the switch_to_act_mode tool to switch to act mode and begin implementation.`;
+
 export async function resolveSystemPrompt(input: {
 	cwd: string;
 	explicitSystemPrompt?: string;
@@ -17,10 +30,12 @@ export async function resolveSystemPrompt(input: {
 	mode?: AgentMode;
 }): Promise<string> {
 	const metadata = await buildWorkspaceMetadata(input.cwd);
-	// Mode-tag and plan-mode instructions are appended by the shared prompt
-	// builder itself (see MODE_TAG_INSTRUCTIONS / PLAN_MODE_INSTRUCTIONS in
-	// @cline/shared), so only the caller-specific rules are merged here.
-	const rules = mergeRulesForSystemPrompt(undefined, input.rules);
+	let rules = mergeRulesForSystemPrompt(undefined, input.rules);
+	if (input.mode === "plan") {
+		rules = rules
+			? `${rules}\n\n${PLAN_MODE_INSTRUCTIONS}`
+			: PLAN_MODE_INSTRUCTIONS;
+	}
 	return buildClineSystemPrompt({
 		ide: "Terminal Shell",
 		workspaceRoot: input.cwd,

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

@@ -39,19 +39,7 @@ const sessionEventsMocks = vi.hoisted(() => ({
 
 const CLINE_PASS_SUBSCRIPTION_URL =
 	"https://app.cline.bot/dashboard/subscription?personal=true";
-const CLI_SUBSCRIPTION_URL =
-	"https://app.cline.bot/promo?code=CLI-8OFF&personal=true";
-const SDK_CLINE_PASS_SUBSCRIPTION_MESSAGE = `No access to ClinePass subscription models yet. Subscribe to ClinePass, the low cost open weights model coding plan: ${CLINE_PASS_SUBSCRIPTION_URL}`;
-const CLI_CLINE_PASS_SUBSCRIPTION_MESSAGE = `No access to ClinePass subscription models yet. Subscribe to ClinePass, the low cost open weights model coding plan: ${CLI_SUBSCRIPTION_URL}`;
-const CLINE_PASS_LIMIT_DETAIL_MESSAGE =
-	"You have reached your 5-hour Clinepass limit. The limit resets in 5h, please try again later.";
-const CLI_CLINE_PASS_LIMIT_MESSAGE = [
-	"ClinePass limit reached",
-	CLINE_PASS_LIMIT_DETAIL_MESSAGE,
-	"Switch to Cline usage-based billing and retry with the Cline provider.",
-	"Interactive CLI: open the model selector with /model, choose Cline, then retry.",
-	"Headless CLI: rerun with --provider cline.",
-].join("\n");
+const CLINE_PASS_SUBSCRIPTION_MESSAGE = `No access to ClinePass subscription models yet. Subscribe to ClinePass, the low cost open weights model coding plan: ${CLINE_PASS_SUBSCRIPTION_URL}`;
 const CLINE_ORG_INDIVIDUAL_INFERENCE_SUBSCRIPTION_MESSAGE =
 	"Organization accounts cannot use ClinePass subscriptions. Go to /account -> change account to switch to your personal account for ClinePass";
 
@@ -74,30 +62,6 @@ vi.mock("@cline/core", () => ({
 			.includes(
 				"organization accounts cannot use individual model inference subscriptions",
 			),
-	isClinePassLimitError: (error: unknown) =>
-		error instanceof Error && error.name === "ClinePassLimitError",
-	extractClinePassLimitMessage: (text: string) => {
-		const normalized = text.toLowerCase();
-		const prefix = "you have reached your";
-		const suffix = "please try again later.";
-		const start = normalized.indexOf(prefix);
-		if (start === -1) return undefined;
-		const suffixStart = normalized.indexOf(suffix, start);
-		if (suffixStart === -1) return undefined;
-		const end = suffixStart + suffix.length;
-		if (!normalized.slice(start, end).includes("clinepass limit")) {
-			return undefined;
-		}
-		return text.slice(start, end);
-	},
-	isClinePassLimitMessage: (text: string) => {
-		const normalized = text.toLowerCase();
-		return (
-			normalized.includes("you have reached your") &&
-			normalized.includes("clinepass limit") &&
-			normalized.includes("please try again later.")
-		);
-	},
 	prewarmFileIndex: vi.fn(async () => undefined),
 	SessionSource: {
 		CLI: "cli",
@@ -585,7 +549,7 @@ describe("runAgent", () => {
 	});
 
 	it("renders ClinePass subscription errors with friendly copy when startup throws", async () => {
-		const error = new Error(SDK_CLINE_PASS_SUBSCRIPTION_MESSAGE);
+		const error = new Error(CLINE_PASS_SUBSCRIPTION_MESSAGE);
 		error.name = "ClineNotSubscribedError";
 		sessionManagerMocks.start.mockRejectedValue(error);
 
@@ -613,7 +577,7 @@ describe("runAgent", () => {
 
 		expect(process.exitCode).toBe(1);
 		expect(outputMocks.writeErr).toHaveBeenCalledWith(
-			CLI_CLINE_PASS_SUBSCRIPTION_MESSAGE,
+			CLINE_PASS_SUBSCRIPTION_MESSAGE,
 		);
 	});
 
@@ -691,7 +655,7 @@ describe("runAgent", () => {
 			messagesPath: "/tmp/messages.json",
 			manifest: { session_id: "session-1" },
 			result: {
-				text: SDK_CLINE_PASS_SUBSCRIPTION_MESSAGE,
+				text: CLINE_PASS_SUBSCRIPTION_MESSAGE,
 				usage: {
 					inputTokens: 0,
 					outputTokens: 0,
@@ -735,193 +699,10 @@ describe("runAgent", () => {
 
 		expect(process.exitCode).toBe(1);
 		expect(outputMocks.writeErr).toHaveBeenCalledWith(
-			CLI_CLINE_PASS_SUBSCRIPTION_MESSAGE,
+			CLINE_PASS_SUBSCRIPTION_MESSAGE,
 		);
 	});
 
-	it("does not duplicate ClinePass subscription errors already displayed by agent events", async () => {
-		const startedAt = new Date("2026-03-22T00:00:00.000Z");
-		const endedAt = new Date("2026-03-22T00:00:01.000Z");
-		sessionManagerMocks.start.mockImplementation(async () => {
-			sessionEventsMocks.listener?.({
-				type: "error",
-				error: new Error(SDK_CLINE_PASS_SUBSCRIPTION_MESSAGE),
-				recoverable: false,
-			});
-
-			return {
-				sessionId: "session-1",
-				manifestPath: "/tmp/manifest.json",
-				messagesPath: "/tmp/messages.json",
-				manifest: { session_id: "session-1" },
-				result: {
-					text: SDK_CLINE_PASS_SUBSCRIPTION_MESSAGE,
-					usage: {
-						inputTokens: 0,
-						outputTokens: 0,
-						cacheReadTokens: 0,
-						cacheWriteTokens: 0,
-						totalCost: 0,
-					},
-					messages: [],
-					toolCalls: [],
-					iterations: 1,
-					finishReason: "error",
-					model: { id: "premium-model", provider: "cline-pass", info: {} },
-					startedAt,
-					endedAt,
-					durationMs: 1000,
-				},
-			};
-		});
-		sessionManagerMocks.getAccumulatedUsage.mockResolvedValue(undefined);
-
-		const { runAgent } = await import("./run-agent");
-
-		await expect(
-			runAgent("test prompt", {
-				cwd: process.cwd(),
-				enableAgentTeams: false,
-				enableSpawnAgent: false,
-				enableTools: [],
-				execution: { maxConsecutiveMistakes: 3 },
-				logger: undefined,
-				mode: "yolo",
-				modelId: "premium-model",
-				outputMode: "text",
-				providerId: "cline-pass",
-				systemPrompt: "system",
-				thinking: false,
-				toolPolicies: { "*": { autoApprove: true } },
-				verbose: false,
-				workspaceRoot: process.cwd(),
-			} as never),
-		).resolves.toBeUndefined();
-
-		expect(process.exitCode).toBe(1);
-		expect(outputMocks.writeErr).not.toHaveBeenCalled();
-	});
-
-	it("formats ClinePass limit errors with usage-based billing guidance", async () => {
-		const startedAt = new Date("2026-03-22T00:00:00.000Z");
-		const endedAt = new Date("2026-03-22T00:00:01.000Z");
-		sessionManagerMocks.start.mockResolvedValue({
-			sessionId: "session-1",
-			manifestPath: "/tmp/manifest.json",
-			messagesPath: "/tmp/messages.json",
-			manifest: { session_id: "session-1" },
-			result: {
-				text: `Error: ${CLINE_PASS_LIMIT_DETAIL_MESSAGE}`,
-				usage: {
-					inputTokens: 0,
-					outputTokens: 0,
-					cacheReadTokens: 0,
-					cacheWriteTokens: 0,
-					totalCost: 0,
-				},
-				messages: [],
-				toolCalls: [],
-				iterations: 1,
-				finishReason: "error",
-				model: { id: "premium-model", provider: "cline-pass", info: {} },
-				startedAt,
-				endedAt,
-				durationMs: 1000,
-			},
-		});
-		sessionManagerMocks.getAccumulatedUsage.mockResolvedValue(undefined);
-
-		const { runAgent } = await import("./run-agent");
-
-		await expect(
-			runAgent("test prompt", {
-				cwd: process.cwd(),
-				enableAgentTeams: false,
-				enableSpawnAgent: false,
-				enableTools: [],
-				execution: { maxConsecutiveMistakes: 3 },
-				logger: undefined,
-				mode: "yolo",
-				modelId: "premium-model",
-				outputMode: "text",
-				providerId: "cline-pass",
-				systemPrompt: "system",
-				thinking: false,
-				toolPolicies: { "*": { autoApprove: true } },
-				verbose: false,
-				workspaceRoot: process.cwd(),
-			} as never),
-		).resolves.toBeUndefined();
-
-		expect(process.exitCode).toBe(1);
-		expect(outputMocks.writeErr).toHaveBeenCalledWith(
-			CLI_CLINE_PASS_LIMIT_MESSAGE,
-		);
-	});
-
-	it("does not duplicate ClinePass limit errors already displayed by agent events", async () => {
-		const startedAt = new Date("2026-03-22T00:00:00.000Z");
-		const endedAt = new Date("2026-03-22T00:00:01.000Z");
-		sessionManagerMocks.start.mockImplementation(async () => {
-			sessionEventsMocks.listener?.({
-				type: "error",
-				error: new Error(`Error: ${CLINE_PASS_LIMIT_DETAIL_MESSAGE}`),
-				recoverable: false,
-			});
-
-			return {
-				sessionId: "session-1",
-				manifestPath: "/tmp/manifest.json",
-				messagesPath: "/tmp/messages.json",
-				manifest: { session_id: "session-1" },
-				result: {
-					text: `Error: ${CLINE_PASS_LIMIT_DETAIL_MESSAGE}`,
-					usage: {
-						inputTokens: 0,
-						outputTokens: 0,
-						cacheReadTokens: 0,
-						cacheWriteTokens: 0,
-						totalCost: 0,
-					},
-					messages: [],
-					toolCalls: [],
-					iterations: 1,
-					finishReason: "error",
-					model: { id: "premium-model", provider: "cline-pass", info: {} },
-					startedAt,
-					endedAt,
-					durationMs: 1000,
-				},
-			};
-		});
-		sessionManagerMocks.getAccumulatedUsage.mockResolvedValue(undefined);
-
-		const { runAgent } = await import("./run-agent");
-
-		await expect(
-			runAgent("test prompt", {
-				cwd: process.cwd(),
-				enableAgentTeams: false,
-				enableSpawnAgent: false,
-				enableTools: [],
-				execution: { maxConsecutiveMistakes: 3 },
-				logger: undefined,
-				mode: "yolo",
-				modelId: "premium-model",
-				outputMode: "text",
-				providerId: "cline-pass",
-				systemPrompt: "system",
-				thinking: false,
-				toolPolicies: { "*": { autoApprove: true } },
-				verbose: false,
-				workspaceRoot: process.cwd(),
-			} as never),
-		).resolves.toBeUndefined();
-
-		expect(process.exitCode).toBe(1);
-		expect(outputMocks.writeErr).not.toHaveBeenCalled();
-	});
-
 	it("surfaces post-run bookkeeping failures after a completed result", async () => {
 		const startedAt = new Date("2026-03-22T00:00:00.000Z");
 		const endedAt = new Date("2026-03-22T00:00:01.000Z");

apps/cli/src/runtime/run-agent.ts

@@ -204,9 +204,7 @@ export async function runAgent(
 			(!event.recoverable || config.verbose) &&
 			event.error.message.trim()
 		) {
-			displayedErrorMessages.add(
-				formatCliErrorMessage(event.error.message).trim(),
-			);
+			displayedErrorMessages.add(event.error.message.trim());
 		}
 		handleEvent(event, config);
 	};

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

@@ -1,110 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import type { Config } from "../utils/types";
-import {
-	applyInteractiveModelChange,
-	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" });
-	});
-});
-
-describe("applyInteractiveModelChange", () => {
-	it("restarts with the current transcript so a provider switch reloads its complete configuration", async () => {
-		const config = {
-			providerId: "openai-compatible",
-			modelId: "custom-model",
-			apiKey: "new-key",
-			thinking: undefined,
-			reasoningEffort: undefined,
-		} as Config;
-		const getProviderSettings = vi.fn(() => ({
-			provider: "openai-compatible",
-			apiKey: "new-key",
-			baseUrl: "https://example.com/v1",
-			headers: { "X-Custom-Header": "custom-value" },
-			client: "openai-compatible" as const,
-			protocol: "openai-chat" as const,
-			model: "old-model",
-		}));
-		const saveProviderSettings = vi.fn(() => ({
-			version: 1 as const,
-			providers: {},
-		}));
-		const ensureReady = vi.fn(async () => {});
-		const restartWithCurrentMessages = vi.fn(async () => {});
-		const updateCurrentSessionConnection = vi.fn(async () => {});
-
-		await applyInteractiveModelChange({
-			config,
-			providerSettingsManager: {
-				getProviderSettings,
-				saveProviderSettings,
-			},
-			sessionRuntime: {
-				ensureReady,
-				restartWithCurrentMessages,
-				updateCurrentSessionConnection,
-			},
-		});
-
-		expect(saveProviderSettings).toHaveBeenCalledWith({
-			provider: "openai-compatible",
-			apiKey: "new-key",
-			baseUrl: "https://example.com/v1",
-			headers: { "X-Custom-Header": "custom-value" },
-			client: "openai-compatible",
-			protocol: "openai-chat",
-			model: "custom-model",
-		});
-		expect(ensureReady).toHaveBeenCalledOnce();
-		expect(restartWithCurrentMessages).toHaveBeenCalledOnce();
-		expect(updateCurrentSessionConnection).toHaveBeenCalledWith({
-			providerId: "openai-compatible",
-			modelId: "custom-model",
-		});
-		expect(ensureReady.mock.invocationCallOrder[0]).toBeLessThan(
-			restartWithCurrentMessages.mock.invocationCallOrder[0] ?? 0,
-		);
-		expect(saveProviderSettings.mock.invocationCallOrder[0]).toBeLessThan(
-			restartWithCurrentMessages.mock.invocationCallOrder[0] ?? 0,
-		);
-		expect(restartWithCurrentMessages.mock.invocationCallOrder[0]).toBeLessThan(
-			updateCurrentSessionConnection.mock.invocationCallOrder[0] ?? 0,
-		);
-	});
-});

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

@@ -4,12 +4,10 @@ import {
 	ProviderSettingsManager,
 	type UserInstructionConfigService,
 } from "@cline/core";
-import { formatModeSwitchNotice } from "@cline/shared";
 import type { CliMigrationNotice } from "../kanban-migration/notice";
 import { logCliError } from "../logging/errors";
 import {
 	loadClineAccountSnapshot,
-	loadIndividualSubscriptionPlans,
 	onProviderChange,
 	switchClineAccount,
 } from "../tui/cline-account";
@@ -53,80 +51,12 @@ import {
 	type InteractiveExitSummary,
 } from "./interactive/exit-summary";
 import { createMistakeLimitDecisionResolver } from "./interactive/mistakes";
-import {
-	type AppliedModeChange,
-	createInteractiveModeSwitchTool,
-	createModeSwitchNoticeTracker,
-	type PendingModeChange,
-	sendTurnWithActModeContinuation,
-} from "./interactive/mode";
+import { createInteractiveModeSwitchTool } from "./interactive/mode";
 import { assertInteractivePreflight } from "./interactive/preflight";
 import { createInteractiveSessionRuntime } from "./interactive/session-runtime";
 import { buildUserInputMessage } from "./prompt";
 import { getUIEventEmitter } from "./session-events";
 
-type ModelChangeReasoningConfig = {
-	thinking?: boolean;
-	reasoningEffort?: Config["reasoningEffort"];
-};
-
-export function resolveReasoningForModelChange(
-	config: ModelChangeReasoningConfig,
-	existing: Pick<ProviderSettings, "reasoning">,
-): ProviderSettings["reasoning"] {
-	if (config.thinking === false) return { enabled: false };
-	if (config.reasoningEffort) {
-		return { enabled: true, effort: config.reasoningEffort };
-	}
-	if (config.thinking === true) return { enabled: true };
-	return existing.reasoning;
-}
-
-export async function applyInteractiveModelChange(input: {
-	config: Config;
-	providerSettingsManager: Pick<
-		ProviderSettingsManager,
-		"getProviderSettings" | "saveProviderSettings"
-	>;
-	sessionRuntime: Pick<
-		ReturnType<typeof createInteractiveSessionRuntime>,
-		| "ensureReady"
-		| "restartWithCurrentMessages"
-		| "updateCurrentSessionConnection"
-	>;
-}): Promise<void> {
-	const { config, providerSettingsManager, sessionRuntime } = input;
-	await sessionRuntime.ensureReady();
-	await onProviderChange({
-		config,
-		providerId: config.providerId,
-	});
-	const existing = providerSettingsManager.getProviderSettings(
-		config.providerId,
-	) ?? {
-		provider: config.providerId,
-	};
-	const reasoning = resolveReasoningForModelChange(config, existing);
-	providerSettingsManager.saveProviderSettings({
-		...existing,
-		model: config.modelId,
-		...(reasoning === undefined ? {} : { reasoning }),
-	});
-
-	// Provider changes affect more than the model connection: startup resolves
-	// the endpoint, headers, provider-specific options, tools, and plugins. Rebuild
-	// the runtime with the existing transcript so all of that state changes
-	// together. restartWithCurrentMessages preserves the session ID.
-	await sessionRuntime.restartWithCurrentMessages();
-	// A same-ID restart reuses the existing manifest. Sync its connection label
-	// after the fully configured runtime is live so session history reflects the
-	// provider/model that will handle subsequent turns.
-	await sessionRuntime.updateCurrentSessionConnection({
-		providerId: config.providerId,
-		modelId: config.modelId,
-	});
-}
-
 export async function runInteractive(
 	config: Config,
 	userInstructionService?: UserInstructionConfigService,
@@ -201,9 +131,8 @@ export async function runInteractive(
 		tuiAskQuestion,
 	} = createInteractiveApprovalController(config);
 
-	const pendingModeChange: PendingModeChange = {
+	const pendingModeChange: { current: "plan" | "act" | null } = {
 		current: null,
-		source: null,
 	};
 	const tuiModeChanged: {
 		current: ((mode: "plan" | "act") => void) | null;
@@ -257,7 +186,6 @@ export async function runInteractive(
 	});
 	let modeChangePromise: Promise<void> | undefined;
 	let modeChangeTarget: "plan" | "act" | undefined;
-	const modeSwitchNotice = createModeSwitchNoticeTracker();
 
 	const isInteractiveMode = (mode: unknown): mode is "plan" | "act" =>
 		mode === "plan" || mode === "act";
@@ -272,11 +200,7 @@ export async function runInteractive(
 				await modeChangePromise;
 			}
 			await sessionRuntime.ensureReady();
-			const from = config.mode;
 			await sessionRuntime.applyMode(mode);
-			if (isInteractiveMode(from)) {
-				modeSwitchNotice.record(from, mode);
-			}
 		})().finally(() => {
 			if (modeChangePromise === next) {
 				modeChangePromise = undefined;
@@ -447,7 +371,7 @@ export async function runInteractive(
 		? async () => {
 				try {
 					await sessionRuntime.ensureReady();
-					const { messages } = await sessionRuntime.readCurrentMessages();
+					const messages = await sessionRuntime.readCurrentMessages();
 					const usage = await sessionRuntime.getAccumulatedUsage({
 						inputTokens: 0,
 						outputTokens: 0,
@@ -486,12 +410,6 @@ export async function runInteractive(
 				config,
 				clineApiBaseUrl: options?.clineApiBaseUrl,
 			}),
-		loadIndividualSubscriptionPlans: async () =>
-			await loadIndividualSubscriptionPlans({
-				config,
-				clineApiBaseUrl: options?.clineApiBaseUrl,
-				clineProviderSettings: options?.clineProviderSettings,
-			}),
 		switchClineAccount: async (organizationId) =>
 			await switchClineAccount({
 				config,
@@ -578,50 +496,27 @@ export async function runInteractive(
 					...(attachments?.userImages ?? []),
 					...userImages,
 				];
-				// Mark a preceding user-initiated mode switch on this message so
-				// the model sees exactly when the rules changed, instead of only
-				// inferring it from the user_input mode attribute flipping.
-				const switchNotice = modeSwitchNotice.consume();
-				const noticedUserInput = switchNotice
-					? `${formatModeSwitchNotice(switchNotice.from, switchNotice.to)}\n${userInput}`
-					: userInput;
 
-				const applyPendingModeChange = async (): Promise<
-					AppliedModeChange | undefined
-				> => {
+				const applyPendingModeChange = async () => {
 					if (!pendingModeChange.current) return undefined;
-					const applied: AppliedModeChange = {
-						mode: pendingModeChange.current,
-						source: pendingModeChange.source ?? "ui",
-					};
+					const newMode = pendingModeChange.current;
 					pendingModeChange.current = null;
-					pendingModeChange.source = null;
-					const from = config.mode;
-					await sessionRuntime.applyMode(applied.mode);
-					tuiModeChanged.current?.(applied.mode);
-					// The switch_to_act_mode path announces itself through the
-					// continuation prompt; only UI toggles need a notice.
-					if (applied.source === "ui" && isInteractiveMode(from)) {
-						modeSwitchNotice.record(from, applied.mode);
-					}
-					return applied;
+					await sessionRuntime.applyMode(newMode);
+					tuiModeChanged.current?.(newMode);
+					return newMode;
 				};
 
-				const result = await sendTurnWithActModeContinuation({
-					sendInitialTurn: () =>
-						sessionRuntime.sendCurrentTurn({
-							prompt: noticedUserInput,
-							mode,
-							userImages:
-								mergedUserImages.length > 0 ? mergedUserImages : undefined,
-							userFiles: userFiles.length > 0 ? userFiles : undefined,
-							delivery,
-						}),
-					sendContinuationTurn: (prompt) =>
-						sessionRuntime.sendCurrentTurn({ prompt, mode: "act" }),
-					applyPendingModeChange,
+				const result = await sessionRuntime.sendCurrentTurn({
+					prompt: userInput,
+					mode,
+					userImages:
+						mergedUserImages.length > 0 ? mergedUserImages : undefined,
+					userFiles: userFiles.length > 0 ? userFiles : undefined,
+					delivery,
 				});
 
+				await applyPendingModeChange();
+
 				if (!result) {
 					return {
 						usage: { inputTokens: 0, outputTokens: 0 },
@@ -723,7 +618,6 @@ export async function runInteractive(
 			if (!isInteractiveMode(mode)) return;
 			if (isRunning) {
 				pendingModeChange.current = mode;
-				pendingModeChange.source = "ui";
 				sessionRuntime.abortAll();
 				return;
 			}
@@ -732,12 +626,26 @@ export async function runInteractive(
 		onNewSession: async () => {
 			await sessionRuntime.resetForNewSession();
 		},
-		onModelChange: () =>
-			applyInteractiveModelChange({
+		onModelChange: async () => {
+			await sessionRuntime.ensureReady();
+			await onProviderChange({
 				config,
-				providerSettingsManager,
-				sessionRuntime,
-			}),
+				providerId: config.providerId,
+			});
+			const existing = providerSettingsManager.getProviderSettings(
+				config.providerId,
+			) ?? {
+				provider: config.providerId,
+			};
+			providerSettingsManager.saveProviderSettings({
+				...existing,
+				model: config.modelId,
+				reasoning: config.reasoningEffort
+					? { enabled: true, effort: config.reasoningEffort }
+					: { enabled: false },
+			});
+			await sessionRuntime.restartWithCurrentMessages();
+		},
 		onSessionRestart: async () => {
 			await sessionRuntime.ensureReady();
 			await sessionRuntime.restartEmpty();

apps/cli/src/session/export.ts

@@ -1,11 +1,10 @@
 import {
 	type ContentBlock,
-	formatDisplayUserInput,
 	type MessageWithMetadata,
+	normalizeUserInput,
 	type ToolResultContent,
 	type ToolUseContent,
 } from "@cline/shared";
-import { formatStructuredCommand } from "../utils/helpers";
 
 export interface ConversationHistory {
 	version: number;
@@ -681,7 +680,7 @@ function renderContentHTML(
 	toolResultsMap: Map<string, ToolResultContent>,
 ): string {
 	if (typeof content === "string") {
-		const text = isUser ? formatDisplayUserInput(content) : content;
+		const text = isUser ? normalizeUserInput(content) : content;
 		return renderTextHTML(text);
 	}
 
@@ -689,7 +688,7 @@ function renderContentHTML(
 		.map((block) => {
 			switch (block.type) {
 				case "text": {
-					const text = isUser ? formatDisplayUserInput(block.text) : block.text;
+					const text = isUser ? normalizeUserInput(block.text) : block.text;
 					return renderTextHTML(text);
 				}
 				case "tool_use":
@@ -846,15 +845,15 @@ function renderDiffHTML(
 }
 
 function renderCommandsHTML(
-	commands: unknown[],
+	commands: string[],
 	_result?: ToolResultContent,
 ): string {
 	return commands
 		.map(
-			(command, i) => `
+			(cmd, i) => `
     <div class="command-block">
       <div class="command-label">Command ${i + 1}</div>
-      <code>${escapeHtml(formatStructuredCommand(command))}</code>
+      <code>${escapeHtml(cmd)}</code>
     </div>
   `,
 		)

apps/cli/src/tests/flags.test.ts

@@ -3,11 +3,7 @@ import { CLINE_BIN } from "./helpers/constants.js";
 import { clineEnv } from "./helpers/env.js";
 import { expectVisible } from "./helpers/terminal.js";
 
-// Wide enough that long option descriptions (e.g. --thinking) render on a
-// single line. At narrower widths commander wraps them, splitting phrases
-// like "omitted leaves provider default" across lines so the contiguous
-// getByText assertions below fail.
-const HELP_TERMINAL = { columns: 200, rows: 50 };
+const HELP_TERMINAL = { columns: 120, rows: 50 };
 
 // ===========================================================================
 // Root-level flag descriptions
@@ -27,11 +23,10 @@ test.describe("root flag descriptions", () => {
 			"verbose output",
 			"Working directory",
 			"Configuration directory",
-			"Set reasoning effort:",
-			"Bare --thinking uses medium",
-			"omitted leaves provider default",
+			"Set reasoning effort level",
 			"consecutive mistakes",
 			"Output messages as JSON",
+			"ACP",
 			"Check for updates and install if available",
 			"Run the kanban app",
 		]);

apps/cli/src/tests/helpers/env.ts

@@ -124,7 +124,7 @@ export function clineEnv(
 				}),
 		CLINE_SESSION_DATA_DIR: path.join(dataDir, "sessions"),
 		CLINE_TEAM_DATA_DIR: path.join(dataDir, "teams"),
-		CLINE_DISABLE_CLINE_PASS_NOTICE: "1",
+		CLINE_DISABLE_MIGRATION_NOTICE: "1",
 		NO_UPDATE_NOTIFIER: "1",
 		CLINE_NO_AUTO_UPDATE: "1",
 		...extra,

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

@@ -12,8 +12,6 @@ const coreMocks = vi.hoisted(() => {
 		fetchMe: vi.fn(),
 		fetchBalance: vi.fn(),
 		fetchOrganizationBalance: vi.fn(),
-		fetchAvailableSubscriptionPlans: vi.fn(),
-		fetchCurrentUserPlan: vi.fn(),
 		serviceOptions,
 	};
 });
@@ -41,14 +39,6 @@ vi.mock("@cline/core", async (importOriginal) => {
 			fetchOrganizationBalance(organizationId: string) {
 				return coreMocks.fetchOrganizationBalance(organizationId);
 			}
-			fetchAvailableSubscriptionPlans(input?: {
-				type?: "individual" | "teams";
-			}) {
-				return coreMocks.fetchAvailableSubscriptionPlans(input);
-			}
-			fetchCurrentUserPlan() {
-				return coreMocks.fetchCurrentUserPlan();
-			}
 		},
 		ProviderSettingsManager: class {
 			getProviderSettings(providerId: string) {
@@ -110,8 +100,6 @@ describe("createClineAccountService", () => {
 		coreMocks.fetchMe.mockReset();
 		coreMocks.fetchBalance.mockReset();
 		coreMocks.fetchOrganizationBalance.mockReset();
-		coreMocks.fetchAvailableSubscriptionPlans.mockReset();
-		coreMocks.fetchCurrentUserPlan.mockReset();
 		coreMocks.serviceOptions.length = 0;
 		telemetryMocks.identifyTelemetryAccount.mockReset();
 	});
@@ -208,8 +196,6 @@ describe("loadClineAccountSnapshot", () => {
 		coreMocks.fetchMe.mockReset();
 		coreMocks.fetchBalance.mockReset();
 		coreMocks.fetchOrganizationBalance.mockReset();
-		coreMocks.fetchAvailableSubscriptionPlans.mockReset();
-		coreMocks.fetchCurrentUserPlan.mockReset();
 		coreMocks.serviceOptions.length = 0;
 		telemetryMocks.identifyTelemetryAccount.mockReset();
 	});
@@ -263,108 +249,3 @@ describe("loadClineAccountSnapshot", () => {
 		);
 	});
 });
-
-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.fetchCurrentUserPlan.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);
-	});
-});
-
-describe("isClineAccountCreditsErrorMessage", () => {
-	it("matches the raw insufficient_credits JSON payload from the Cline API 402", async () => {
-		const { isClineAccountCreditsErrorMessage } = await import(
-			"./cline-account"
-		);
-		expect(
-			isClineAccountCreditsErrorMessage(
-				'{"code":"insufficient_credits","current_balance":-0.14,"message":"Not enough credits available"}',
-			),
-		).toBe(true);
-	});
-
-	it("matches the insufficient_credits payload wrapped in an error prefix", async () => {
-		const { isClineAccountCreditsErrorMessage } = await import(
-			"./cline-account"
-		);
-		expect(
-			isClineAccountCreditsErrorMessage(
-				'Error: {"code":"insufficient_credits","current_balance":0,"message":"Not enough credits available"}',
-			),
-		).toBe(true);
-	});
-
-	it("matches the plain human-readable Cline API message", async () => {
-		const { isClineAccountCreditsErrorMessage } = await import(
-			"./cline-account"
-		);
-		expect(
-			isClineAccountCreditsErrorMessage("Not enough credits available"),
-		).toBe(true);
-	});
-
-	it("matches the legacy insufficient balance phrasing", async () => {
-		const { isClineAccountCreditsErrorMessage } = await import(
-			"./cline-account"
-		);
-		expect(
-			isClineAccountCreditsErrorMessage(
-				"Insufficient balance. Your Cline credits balance is $0.00.",
-			),
-		).toBe(true);
-	});
-
-	it("does not match unrelated errors", async () => {
-		const { isClineAccountCreditsErrorMessage } = await import(
-			"./cline-account"
-		);
-		expect(isClineAccountCreditsErrorMessage("Payment Required")).toBe(false);
-		expect(
-			isClineAccountCreditsErrorMessage(
-				"Your credit balance is too low to access the Anthropic API.",
-			),
-		).toBe(false);
-		expect(
-			isClineAccountCreditsErrorMessage("insufficient balance on gateway"),
-		).toBe(false);
-	});
-});

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

@@ -2,8 +2,6 @@ import {
 	type ClineAccountBalance,
 	type ClineAccountOrganization,
 	type ClineAccountOrganizationBalance,
-	type ClineSubscriptionPlan,
-	type UserCurrentPlan,
 	ClineAccountService,
 	type ClineAccountUser,
 	formatProviderOAuthApiKey,
@@ -51,16 +49,9 @@ export function isClineAccountAuthErrorMessage(message: string): boolean {
 
 export function isClineAccountCreditsErrorMessage(message: string): boolean {
 	const normalized = message.trim().toLowerCase();
-	// The Cline API's 402 response carries `code: "insufficient_credits"` and
-	// the message "Not enough credits available". Depending on how much of the
-	// payload survives error extraction, the CLI may see the raw JSON blob or
-	// just the human-readable message, so match both. The
-	// "insufficient balance" pair is an older backend phrasing kept for safety.
 	return (
-		normalized.includes("insufficient_credits") ||
-		normalized.includes("not enough credits") ||
-		(normalized.includes("insufficient balance") &&
-			normalized.includes("cline credits balance"))
+		normalized.includes("insufficient balance") &&
+		normalized.includes("cline credits balance")
 	);
 }
 
@@ -133,10 +124,8 @@ export async function createClineAccountService(input: {
 	config: ClineAccountConfig;
 	clineApiBaseUrl?: string;
 	clineProviderSettings?: ProviderSettings;
-	providerSettingsManager?: ProviderSettingsManager;
 }): Promise<ClineAccountService | undefined> {
-	const manager =
-		input.providerSettingsManager ?? new ProviderSettingsManager();
+	const manager = new ProviderSettingsManager();
 	const settings =
 		manager.getProviderSettings("cline") ?? input.clineProviderSettings;
 	const apiBaseUrl = resolveAccountApiBaseUrl({
@@ -158,38 +147,6 @@ export async function createClineAccountService(input: {
 	});
 }
 
-/**
- * Persist the active organization so headless runs and the hub daemon can
- * attach it to telemetry identity. Personal account clears stale org fields.
- */
-function persistClineOrganizationContext(
-	activeOrganization: ClineAccountOrganization | null,
-	userId: string,
-): void {
-	try {
-		const manager = new ProviderSettingsManager();
-		const persisted = manager.getProviderSettings("cline");
-		if (!persisted) {
-			return;
-		}
-		manager.saveProviderSettings(
-			{
-				...persisted,
-				auth: {
-					...persisted.auth,
-					accountId: persisted.auth?.accountId ?? userId,
-					organizationId: activeOrganization?.organizationId,
-					organizationName: activeOrganization?.name,
-					memberId: activeOrganization?.memberId,
-				},
-			},
-			{ setLastUsed: false },
-		);
-	} catch {
-		// Best-effort only.
-	}
-}
-
 export async function loadClineAccountSnapshot(input: {
 	config: ClineAccountConfig;
 	clineApiBaseUrl?: string;
@@ -222,7 +179,6 @@ export async function loadClineAccountSnapshot(input: {
 		memberId: activeOrganization?.memberId,
 	};
 	identifyTelemetryAccount(accountContext, input.config.logger);
-	persistClineOrganizationContext(activeOrganization, user.id);
 
 	return {
 		user,
@@ -247,60 +203,6 @@ export async function switchClineAccount(input: {
 	await service.switchAccount(input.organizationId);
 }
 
-export async function loadIndividualSubscriptionPlans(input: {
-	config: ClineAccountConfig;
-	clineApiBaseUrl?: string;
-	clineProviderSettings?: ProviderSettings;
-}): Promise<ClineSubscriptionPlan[]> {
-	const service = await createClineAccountService(input);
-	if (!service) {
-		throw new Error("No Cline account auth token found");
-	}
-	return service.fetchAvailableSubscriptionPlans({ type: "individual" });
-}
-
-export async function loadCurrentUserPlan(input: {
-	config: ClineAccountConfig;
-	clineApiBaseUrl?: string;
-	clineProviderSettings?: ProviderSettings;
-}): Promise<UserCurrentPlan | undefined> {
-	const service = await createClineAccountService(input);
-	if (!service) {
-		throw new Error("No Cline account auth token found");
-	}
-	return service.fetchCurrentUserPlan();
-}
-
-export async function loadCurrentUserPlanFromProviderSettings(input: {
-	providerSettingsManager: ProviderSettingsManager;
-	clineApiBaseUrl?: string;
-}): Promise<UserCurrentPlan | undefined> {
-	const service = await createClineAccountService({
-		config: { apiKey: "", logger: undefined, providerId: "cline" },
-		clineApiBaseUrl: input.clineApiBaseUrl,
-		providerSettingsManager: input.providerSettingsManager,
-	});
-	if (!service) {
-		throw new Error("No Cline account auth token found");
-	}
-	return service.fetchCurrentUserPlan();
-}
-
-export async function loadIndividualSubscriptionPlansFromProviderSettings(input: {
-	providerSettingsManager: ProviderSettingsManager;
-	clineApiBaseUrl?: string;
-}): Promise<ClineSubscriptionPlan[]> {
-	const service = await createClineAccountService({
-		config: { apiKey: "", logger: undefined, providerId: "cline" },
-		clineApiBaseUrl: input.clineApiBaseUrl,
-		providerSettingsManager: input.providerSettingsManager,
-	});
-	if (!service) {
-		throw new Error("No Cline account auth token found");
-	}
-	return service.fetchAvailableSubscriptionPlans({ type: "individual" });
-}
-
 async function onChangeToClinePass(config: ClineAccountConfig) {
 	try {
 		await switchClineAccount({

apps/cli/src/tui/components/chat-entry.tsx

@@ -1,15 +1,11 @@
-import type { ClineSubscriptionPlan } from "@cline/core";
 import { useTerminalDimensions } from "@opentui/react";
 import type React from "react";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import "opentui-spinner/react";
 import {
 	getClineOrgIndividualInferenceSubscriptionMessage,
-	getClinePassLimitDetailMessage,
-	getCliSubscriptionUrl,
-	getIndividualPlanFeatures,
+	getClinePassSubscriptionUrl,
 	isClineOrgIndividualInferenceSubscriptionErrorMessage,
-	isClinePassLimitErrorMessage,
 	isClinePassSubscriptionError,
 } from "../../utils/cline-pass-errors";
 import {
@@ -19,14 +15,12 @@ import {
 import { useTerminalBackground } from "../hooks/use-terminal-background";
 import {
 	getDefaultForeground,
-	getModeAccent,
-	getUserMessageBackground,
+	getModeInputBackground,
 	palette,
 	type TerminalTheme,
 } from "../palette";
 import type { ChatEntry } from "../types";
-import { formatCompactionDividerLabel } from "../utils/compaction-status";
-import { getSyntaxStyle, type SyntaxAccentMode } from "../utils/syntax-style";
+import { getSyntaxStyle } from "../utils/syntax-style";
 import { isWarningToolError } from "../utils/tool-errors";
 import {
 	parseApplyPatchInput,
@@ -134,7 +128,7 @@ function formatToolParams(
 				const el = f.endLine != null ? String(f.endLine) : "undefined";
 				const sep = i > 0 ? "; " : "";
 				return (
-					<span key={`${i}:${f.path}`}>
+					<span key={f.path}>
 						{sep}
 						{shortenPath(f.path)}
 						<span fg="gray">
@@ -272,8 +266,7 @@ function ToolCallView(props: {
 	);
 }
 
-function ClineCreditsClinePassErrorView(props: { defaultFg?: string }) {
-	const subscriptionUrl = getCliSubscriptionUrl();
+function ClineCreditsErrorView(props: { defaultFg?: string }) {
 	return (
 		<box flexDirection="row">
 			<text fg="red" content="* " />
@@ -288,105 +281,48 @@ function ClineCreditsClinePassErrorView(props: { defaultFg?: string }) {
 				<text
 					fg={props.defaultFg}
 					selectable
-					content={
-						"You have run out of Cline credits. Add credits in the dashboard or purchase and switch to ClinePass to continue."
-					}
+					content="You have run out of Cline credits. Add credits in the dashboard to continue."
 				/>
 				<box flexDirection="row">
-					<text fg="gray">Purchase Credits: </text>
-					<text fg={palette.act} selectable>
+					<text fg="gray">Dashboard: </text>
+					<text fg="cyan" selectable>
 						<a href={CLINE_CREDITS_DASHBOARD_URL}>
 							{CLINE_CREDITS_DASHBOARD_URL}
 						</a>
 					</text>
 				</box>
-				<box flexDirection="row">
-					<text fg="gray">Purchase ClinePass: </text>
-					<text fg={palette.act} selectable>
-						<a href={subscriptionUrl}>{subscriptionUrl}</a>
-					</text>
-				</box>
-				<box flexDirection="row">
-					<text fg="gray">Switch to ClinePass: </text>
-					<text fg="gray">
-						type /settings in CLI and switch provider to ClinePass
-					</text>
-				</box>
 			</box>
 		</box>
 	);
 }
 
-function ClineCreditsErrorView(props: { defaultFg?: string }) {
-	return <ClineCreditsClinePassErrorView defaultFg={props.defaultFg} />;
-}
-
-function ClinePassSubscriptionErrorView(props: {
-	defaultFg?: string;
-	loadIndividualSubscriptionPlans?: () => Promise<ClineSubscriptionPlan[]>;
-	terminalTheme: TerminalTheme;
-}) {
-	const subscriptionUrl = getCliSubscriptionUrl();
-	const [planFeatures, setPlanFeatures] = useState<string[]>([]);
-	const planAccent = getModeAccent("plan", props.terminalTheme);
-
-	useEffect(() => {
-		if (!props.loadIndividualSubscriptionPlans) {
-			return;
-		}
-		let isMounted = true;
-		void props
-			.loadIndividualSubscriptionPlans()
-			.then((plans) => {
-				if (isMounted) {
-					setPlanFeatures(getIndividualPlanFeatures(plans));
-				}
-			})
-			.catch(() => {
-				// Keep the subscription error view usable if plan metadata is unavailable.
-			});
-
-		return () => {
-			isMounted = false;
-		};
-	}, [props.loadIndividualSubscriptionPlans]);
-
+function ClinePassSubscriptionErrorView(props: { defaultFg?: string }) {
+	const subscriptionUrl = getClinePassSubscriptionUrl();
 	return (
 		<box flexDirection="row">
-			<text fg={planAccent} content="* " />
+			<text fg="yellow" content="* " />
 			<box
 				flexDirection="column"
 				border
 				borderStyle="rounded"
-				borderColor={planAccent}
+				borderColor="yellow"
 				paddingX={1}
 			>
-				<text fg={planAccent}>ClinePass subscription required</text>
+				<text fg="yellow">ClinePass subscription required</text>
 				<text
 					fg={props.defaultFg}
 					selectable
 					content="No access to ClinePass subscription models yet. Subscribe to ClinePass, the low cost open weights model coding plan."
 				/>
-				{planFeatures.length > 0 && (
-					<box flexDirection="column" marginTop={1}>
-						<text fg={props.defaultFg}>ClinePass includes:</text>
-						{planFeatures.map((feature) => (
-							<text key={feature} fg={props.defaultFg} selectable>
-								<span fg="green">✓ </span>
-								<span>{feature}</span>
-							</text>
-						))}
-					</box>
-				)}
 				<box flexDirection="row">
 					<text fg="gray">Subscribe: </text>
-					<text fg={palette.act} selectable>
+					<text fg="cyan" selectable>
 						<a href={subscriptionUrl}>Open subscription page</a>
 					</text>
 				</box>
 				<box flexDirection="row">
 					<text fg="gray">URL: </text>
-					<text fg={palette.act} selectable>
+					<text fg="cyan" selectable>
 						<a href={subscriptionUrl}>{subscriptionUrl}</a>
 					</text>
 				</box>
@@ -397,21 +333,18 @@ function ClinePassSubscriptionErrorView(props: {
 
 function ClineOrgIndividualInferenceSubscriptionErrorView(props: {
 	defaultFg?: string;
-	terminalTheme: TerminalTheme;
 }) {
-	const planAccent = getModeAccent("plan", props.terminalTheme);
-
 	return (
 		<box flexDirection="row">
-			<text fg={planAccent} content="* " />
+			<text fg="yellow" content="* " />
 			<box
 				flexDirection="column"
 				border
 				borderStyle="rounded"
-				borderColor={planAccent}
+				borderColor="yellow"
 				paddingX={1}
 			>
-				<text fg={planAccent}>Personal ClinePass required</text>
+				<text fg="yellow">Personal ClinePass required</text>
 				<text
 					fg={props.defaultFg}
 					selectable
@@ -422,98 +355,18 @@ function ClineOrgIndividualInferenceSubscriptionErrorView(props: {
 	);
 }
 
-function CompactionDividerRow(props: {
-	entry: Extract<ChatEntry, { kind: "compaction" }>;
-}) {
-	const { entry } = props;
-	const { width: terminalWidth } = useTerminalDimensions();
-	const inProgress = entry.status === "started";
-	const labelColor = inProgress
-		? "cyan"
-		: entry.status === "failed"
-			? "red"
-			: entry.status === "cancelled" || entry.status === "skipped"
-				? "gray"
-				: "cyan";
-	const label = `✻ ${formatCompactionDividerLabel(entry)} ✻`;
-	// Fill the remaining line with a plain rule instead of a flexGrow bordered
-	// box: a single fixed-content text row keeps the renderer's diffing stable.
-	const ruleWidth = Math.max(2, Math.min(40, terminalWidth - label.length - 8));
-	return (
-		<box flexDirection="row">
-			{inProgress ? (
-				<box width={2}>
-					<spinner name="dots" color={labelColor} />
-				</box>
-			) : (
-				<text fg="gray" content="── " />
-			)}
-			<text fg={labelColor} selectable content={label} />
-			<text fg="gray" content={` ${"─".repeat(ruleWidth)}`} />
-		</box>
-	);
-}
-
-function ClinePassLimitErrorView(props: {
-	message: string;
-	defaultFg?: string;
-	terminalTheme: TerminalTheme;
-}) {
-	const detail = getClinePassLimitDetailMessage(props.message) ?? props.message;
-
-	return (
-		<box flexDirection="row">
-			<text fg={palette.act} content="* " />
-			<box
-				flexDirection="column"
-				border
-				borderStyle="rounded"
-				borderColor={palette.act}
-				paddingX={1}
-			>
-				<text fg="red">ClinePass limit reached</text>
-				<text fg={props.defaultFg} selectable content={detail} />
-				<text
-					fg={props.defaultFg}
-					selectable
-					content="Switch to Cline usage-based billing and retry with the Cline provider."
-				/>
-				<box flexDirection="row">
-					<text fg="gray">Interactive CLI: </text>
-					<text
-						fg={props.defaultFg}
-						selectable
-						content="type /model, press tab to change provider, choose Cline, then retry."
-					/>
-				</box>
-				<box flexDirection="row">
-					<text fg="gray">Headless CLI: </text>
-					<text fg={props.defaultFg} selectable content="rerun with " />
-					<code
-						content="--provider cline"
-						filetype="bash"
-						syntaxStyle={getSyntaxStyle(props.terminalTheme)}
-						selectable
-					/>
-					<text fg={props.defaultFg} selectable content="." />
-				</box>
-			</box>
-		</box>
-	);
-}
-
 export function ChatEntryView(props: {
 	entry: ChatEntry;
 	accent?: string;
-	/** Mode the entry was produced in (resolved with the current-mode fallback). */
-	mode?: SyntaxAccentMode;
-	loadIndividualSubscriptionPlans?: () => Promise<ClineSubscriptionPlan[]>;
 	terminalTheme: TerminalTheme;
 }) {
-	const { entry, accent = palette.act, mode = "act", terminalTheme } = props;
+	const { entry, accent = palette.act, terminalTheme } = props;
 	const terminalBg = useTerminalBackground();
 	const defaultFg = getDefaultForeground(terminalBg);
-	const userMsgBg = getUserMessageBackground(terminalBg);
+	const userMsgBg = getModeInputBackground(
+		accent === palette.plan ? "plan" : "act",
+		terminalBg,
+	);
 
 	switch (entry.kind) {
 		case "user":
@@ -524,9 +377,10 @@ export function ChatEntryView(props: {
 					marginX={-1}
 					paddingLeft={1}
 					paddingRight={2}
+					paddingY={1}
 				>
 					<box width={2}>
-						<text fg={accent}>{"❯"}</text>
+						<text fg={accent}>{">"}</text>
 					</box>
 					<text fg={defaultFg} selectable>
 						{entry.text}
@@ -542,9 +396,10 @@ export function ChatEntryView(props: {
 					marginX={-1}
 					paddingLeft={1}
 					paddingRight={2}
+					paddingY={1}
 				>
 					<box width={2}>
-						<text fg={accent}>{"❯"}</text>
+						<text fg={accent}>{">"}</text>
 					</box>
 					{entry.delivery === "steer" && <text fg="yellow">[steer] </text>}
 					{entry.delivery === "queue" && <text fg="gray">[queued] </text>}
@@ -569,7 +424,7 @@ export function ChatEntryView(props: {
 					<box flexGrow={1}>
 						<markdown
 							content={content}
-							syntaxStyle={getSyntaxStyle(terminalTheme, mode)}
+							syntaxStyle={getSyntaxStyle(terminalTheme)}
 							streaming={entry.streaming}
 							fg={defaultFg}
 						/>
@@ -600,31 +455,11 @@ export function ChatEntryView(props: {
 			}
 			if (isClineOrgIndividualInferenceSubscriptionErrorMessage(entry.text)) {
 				return (
-					<ClineOrgIndividualInferenceSubscriptionErrorView
-						defaultFg={defaultFg}
-						terminalTheme={terminalTheme}
-					/>
+					<ClineOrgIndividualInferenceSubscriptionErrorView defaultFg={defaultFg} />
 				);
 			}
 			if (isClinePassSubscriptionError(entry.text)) {
-				return (
-					<ClinePassSubscriptionErrorView
-						defaultFg={defaultFg}
-						loadIndividualSubscriptionPlans={
-							props.loadIndividualSubscriptionPlans
-						}
-						terminalTheme={terminalTheme}
-					/>
-				);
-			}
-			if (isClinePassLimitErrorMessage(entry.text)) {
-				return (
-					<ClinePassLimitErrorView
-						message={entry.text}
-						defaultFg={defaultFg}
-						terminalTheme={terminalTheme}
-					/>
-				);
+				return <ClinePassSubscriptionErrorView defaultFg={defaultFg} />;
 			}
 			return (
 				<box flexDirection="row">
@@ -649,15 +484,12 @@ export function ChatEntryView(props: {
 				</box>
 			);
 
-		case "compaction":
-			return <CompactionDividerRow entry={entry} />;
-
 		case "done": {
 			const parts: string[] = [];
 			if (entry.elapsed) parts.push(`${entry.elapsed}s`);
 			if (entry.tokens > 0)
 				parts.push(`${entry.tokens.toLocaleString()} tokens`);
-			if (entry.cost > 0) parts.push(`$${entry.cost.toFixed(2)}`);
+			if (entry.cost > 0) parts.push(`$${entry.cost.toFixed(3)}`);
 			if (entry.iterations > 0)
 				parts.push(
 					`${entry.iterations} iteration${entry.iterations !== 1 ? "s" : ""}`,

apps/cli/src/tui/components/chat-message-list.tsx

@@ -1,5 +1,5 @@
 import "opentui-spinner/react";
-import type { AgentMode, ClineSubscriptionPlan } from "@cline/core";
+import type { AgentMode } from "@cline/core";
 import type { ScrollBoxRenderable } from "@opentui/core";
 import {
 	forwardRef,
@@ -21,7 +21,6 @@ export interface TranscriptScrollHandle {
 interface ChatMessageListProps {
 	entries: ChatEntry[];
 	isStreaming?: boolean;
-	loadIndividualSubscriptionPlans?: () => Promise<ClineSubscriptionPlan[]>;
 	uiMode?: AgentMode;
 }
 
@@ -96,18 +95,11 @@ export const ChatMessageList = forwardRef<
 			<box flexDirection="column" paddingX={1} paddingY={1} gap={1}>
 				{props.entries.map((entry, i) => {
 					const key = `${i}:${entry.kind}`;
-					// Single source of truth for the entry's mode: the glyph accent
-					// and the markdown accent must never diverge.
-					const entryMode = entry.mode ?? props.uiMode ?? "act";
 					return (
 						<ChatEntryView
 							key={key}
 							entry={entry}
-							accent={getModeAccent(entryMode, terminalTheme)}
-							mode={entryMode === "plan" ? "plan" : "act"}
-							loadIndividualSubscriptionPlans={
-								props.loadIndividualSubscriptionPlans
-							}
+							accent={accent}
 							terminalTheme={terminalTheme}
 						/>
 					);

apps/cli/src/tui/components/dialogs/account-dialog.tsx

@@ -424,7 +424,7 @@ export function AccountDialogContent(
 	if (state.status === "loading") {
 		return (
 			<box flexDirection="column" paddingX={1} gap={1}>
-				<text fg={palette.act}>Cline Account</text>
+				<text fg="cyan">Cline Account</text>
 				<text fg="gray">{state.message}</text>
 				<text fg="gray">Esc to close</text>
 			</box>
@@ -434,7 +434,7 @@ export function AccountDialogContent(
 	if (state.status === "error") {
 		return (
 			<box flexDirection="column" paddingX={1} gap={1}>
-				<text fg={palette.act}>Cline Account</text>
+				<text fg="cyan">Cline Account</text>
 				<text fg="red">{state.message}</text>
 				<text fg="gray">Esc to close</text>
 			</box>
@@ -444,7 +444,7 @@ export function AccountDialogContent(
 	if (state.status === "unauthenticated") {
 		return (
 			<box flexDirection="column" paddingX={1} gap={1}>
-				<text fg={palette.act}>Cline Account</text>
+				<text fg="cyan">Cline Account</text>
 				<text>Sign in or create a Cline account.</text>
 				<text fg="gray">
 					Get access to the latest models with regular free promos and
@@ -473,7 +473,7 @@ export function AccountDialogContent(
 	if (view === "organizations") {
 		return (
 			<box flexDirection="column" paddingX={1}>
-				<text fg={palette.act}>Change Account</text>
+				<text fg="cyan">Change Account</text>
 				<box flexDirection="column" gap={0}>
 					{orgRows.map((row, index) => (
 						<OrganizationRow
@@ -503,7 +503,7 @@ export function AccountDialogContent(
 
 	return (
 		<box flexDirection="column" paddingX={1} gap={1}>
-			<text fg={palette.act}>Cline Account</text>
+			<text fg="cyan">Cline Account</text>
 
 			<box flexDirection="row" gap={2}>
 				<box
@@ -514,7 +514,7 @@ export function AccountDialogContent(
 					border
 					borderColor="gray"
 				>
-					<text fg={palette.act}>{userInitial(loaded)}</text>
+					<text fg="cyan">{userInitial(loaded)}</text>
 				</box>
 				<box flexDirection="column" flexGrow={1}>
 					<text selectable>{displayName}</text>

apps/cli/src/tui/components/dialogs/command-palette.tsx

@@ -191,7 +191,7 @@ export function CommandPaletteContent(
 											{" "}
 										</text>
 										<text
-											fg={isSelected ? palette.textOnSelection : palette.act}
+											fg={isSelected ? palette.textOnSelection : "cyan"}
 											width={shortcutWidth}
 											flexShrink={0}
 										>

apps/cli/src/tui/components/dialogs/config-dialogs.tsx

@@ -90,7 +90,7 @@ export function ExtDetailContent(
 								flexDirection="row"
 								justifyContent="space-between"
 							>
-								<text fg={palette.act}>
+								<text fg="cyan">
 									<strong>{row.name}</strong>
 								</text>
 								<text

apps/cli/src/tui/components/dialogs/help-dialog.tsx

@@ -1,7 +1,6 @@
 // @jsxImportSource @opentui/react
 import type { ChoiceContext } from "@opentui-ui/dialog";
 import { useDialogKeyboard } from "@opentui-ui/dialog/react";
-import { palette } from "../../palette";
 
 type HelpRow =
 	| { kind: "heading"; id: string; text: string }
@@ -278,7 +277,7 @@ export function HelpDialogContent(props: ChoiceContext<void>) {
 						}
 						return (
 							<box key={row.id} flexDirection="row" paddingX={1}>
-								<text fg={palette.act} width={KEY_WIDTH} flexShrink={0}>
+								<text fg="cyan" width={KEY_WIDTH} flexShrink={0}>
 									{row.key}
 								</text>
 								<text fg="gray">{row.desc}</text>

apps/cli/src/tui/components/dialogs/mcp-manager-dialog.tsx

@@ -121,7 +121,7 @@ export function McpManagerContent(
 
 	return (
 		<box flexDirection="column" paddingX={1}>
-			<text fg={palette.act}>MCP Servers</text>
+			<text fg="cyan">MCP Servers</text>
 
 			<text fg="gray" marginTop={1}>
 				Settings file:
@@ -141,7 +141,7 @@ export function McpManagerContent(
 						const enabledIcon =
 							typeof srv.enabled === "boolean" ? (enabled ? "● " : "○ ") : "";
 						const status = getMcpManagerEntryStatus(srv);
-						let rowColor = isSel ? palette.act : "gray";
+						let rowColor = isSel ? "cyan" : "gray";
 						if (enabled && typeof srv.enabled === "boolean") {
 							rowColor = palette.success;
 						}

apps/cli/src/tui/components/dialogs/provider-picker-helpers.ts

@@ -1,58 +0,0 @@
-import {
-	getProviderAuthStorageId,
-	type ProviderSettingsManager,
-	saveLocalProviderSettings,
-} from "@cline/core";
-import { CLI_PROMO_CODE } from "../../../utils/cline-pass-errors";
-
-const CLINE_PASS_SUBSCRIPTION_PATH = "/dashboard/subscription";
-const DEFAULT_APP_BASE_URL = "https://app.cline.bot";
-
-/**
- * Persist a manually entered API key for an OAuth-capable provider — the
- * escape hatch for when OAuth login isn't working. Any stored OAuth tokens
- * are cleared: the auth handler prefers auth.accessToken over apiKey, so a
- * stale token would otherwise keep winning over the manual key.
- *
- * The key is written both to the provider's auth storage entry (cline-pass
- * stores credentials under "cline") and to the provider's own entry: settings
- * resolution lets a direct entry shadow the storage entry, and provider
- * switching copies merged settings (including auth) into direct entries, so
- * both must be updated for the manual key to reliably take effect.
- */
-export function saveManualProviderApiKey(
-	manager: ProviderSettingsManager,
-	providerId: string,
-	apiKey: string,
-): void {
-	// Empty strings delete these keys from the stored auth object.
-	const clearedAuth = { accessToken: "", refreshToken: "", apiKey: "" };
-	const storageProviderId = getProviderAuthStorageId(providerId) ?? providerId;
-	saveLocalProviderSettings(manager, {
-		providerId: storageProviderId,
-		apiKey,
-		auth: clearedAuth,
-	});
-	if (
-		providerId !== storageProviderId &&
-		manager.read().providers[providerId]
-	) {
-		saveLocalProviderSettings(manager, {
-			providerId,
-			apiKey,
-			auth: clearedAuth,
-		});
-	}
-}
-
-export function buildClinePassSubscriptionPageUrl(
-	appBaseUrl: string | undefined,
-): string {
-	const url = new URL(
-		CLINE_PASS_SUBSCRIPTION_PATH,
-		appBaseUrl || DEFAULT_APP_BASE_URL,
-	);
-	url.searchParams.set("personal", "true");
-	url.searchParams.set("code", CLI_PROMO_CODE);
-	return url.toString();
-}

apps/cli/src/tui/components/dialogs/provider-picker.test.ts

@@ -1,125 +0,0 @@
-import { mkdtempSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { ProviderSettingsManager } from "@cline/core";
-import { afterEach, describe, expect, it } from "vitest";
-import {
-	getPersistedProviderApiKey,
-	isProviderConfigured,
-} from "../../../utils/provider-auth";
-import {
-	buildClinePassSubscriptionPageUrl,
-	saveManualProviderApiKey,
-} from "./provider-picker-helpers";
-
-describe("buildClinePassSubscriptionPageUrl", () => {
-	it("opens the personal subscription page on production by default", () => {
-		expect(buildClinePassSubscriptionPageUrl(undefined)).toBe(
-			"https://app.cline.bot/dashboard/subscription?personal=true&code=CLI-8OFF",
-		);
-	});
-
-	it("keeps the configured app base URL", () => {
-		expect(
-			buildClinePassSubscriptionPageUrl("https://staging-app.cline.bot"),
-		).toBe(
-			"https://staging-app.cline.bot/dashboard/subscription?personal=true&code=CLI-8OFF",
-		);
-	});
-});
-
-describe("saveManualProviderApiKey", () => {
-	const tempDirs: string[] = [];
-
-	afterEach(() => {
-		for (const dir of tempDirs.splice(0)) {
-			rmSync(dir, { force: true, recursive: true });
-		}
-	});
-
-	function createManager(): ProviderSettingsManager {
-		const dir = mkdtempSync(join(tmpdir(), "cline-cli-provider-picker-"));
-		tempDirs.push(dir);
-		return new ProviderSettingsManager({
-			filePath: join(dir, "providers.json"),
-		});
-	}
-
-	it("clears stored OAuth tokens so the manual key takes effect", () => {
-		const manager = createManager();
-		manager.saveProviderSettings({
-			provider: "cline",
-			auth: {
-				accessToken: "stale-access-token",
-				refreshToken: "stale-refresh-token",
-				accountId: "acct_123",
-			},
-		});
-
-		saveManualProviderApiKey(manager, "cline", "manual-api-key");
-
-		const settings = manager.getProviderSettings("cline");
-		expect(settings?.apiKey).toBe("manual-api-key");
-		expect(settings?.auth?.accessToken).toBeUndefined();
-		expect(settings?.auth?.refreshToken).toBeUndefined();
-		expect(settings?.auth?.accountId).toBe("acct_123");
-		expect(getPersistedProviderApiKey("cline", settings)).toBe(
-			"manual-api-key",
-		);
-		expect(isProviderConfigured("cline", settings)).toBe(true);
-	});
-
-	it("saves cline-pass keys to the shared cline auth storage entry", () => {
-		const manager = createManager();
-		manager.saveProviderSettings({
-			provider: "cline",
-			auth: {
-				accessToken: "stale-access-token",
-				refreshToken: "stale-refresh-token",
-			},
-		});
-
-		saveManualProviderApiKey(manager, "cline-pass", "manual-api-key");
-
-		// cline-pass inherits auth storage from the "cline" entry, so the key
-		// must land there and the stale tokens must be gone for both providers.
-		const clineSettings = manager.getProviderSettings("cline");
-		expect(clineSettings?.apiKey).toBe("manual-api-key");
-		expect(clineSettings?.auth?.accessToken).toBeUndefined();
-
-		const clinePassSettings = manager.getProviderSettings("cline-pass");
-		expect(getPersistedProviderApiKey("cline-pass", clinePassSettings)).toBe(
-			"manual-api-key",
-		);
-		expect(isProviderConfigured("cline-pass", clinePassSettings)).toBe(true);
-	});
-
-	it("clears stale credentials copied into a direct cline-pass entry", () => {
-		const manager = createManager();
-		manager.saveProviderSettings({
-			provider: "cline",
-			auth: {
-				accessToken: "stale-access-token",
-				refreshToken: "stale-refresh-token",
-			},
-		});
-		// Provider switching copies the merged settings (including auth) into
-		// a direct cline-pass entry, which shadows the shared "cline" entry.
-		manager.saveProviderSettings({
-			provider: "cline-pass",
-			apiKey: "stale-copied-key",
-			auth: {
-				accessToken: "stale-access-token",
-				refreshToken: "stale-refresh-token",
-			},
-		});
-
-		saveManualProviderApiKey(manager, "cline-pass", "manual-api-key");
-
-		const clinePassSettings = manager.getProviderSettings("cline-pass");
-		expect(clinePassSettings?.auth?.accessToken).toBeUndefined();
-		expect(getPersistedProviderApiKey("cline-pass", clinePassSettings)).toBe(
-			"manual-api-key",
-		);
-	});
-});

apps/cli/src/tui/components/dialogs/provider-picker.tsx

@@ -37,10 +37,6 @@ import {
 	getSearchableListRowsWindow,
 	type SearchableItem,
 } from "../searchable-list";
-import {
-	buildClinePassSubscriptionPageUrl,
-	saveManualProviderApiKey,
-} from "./provider-picker-helpers";
 
 interface ProviderItem {
 	id: string;
@@ -252,33 +248,18 @@ export function ProviderPickerContent(
 	);
 }
 
-export type ExistingProviderAction =
-	| "use_existing"
-	| "reconfigure"
-	| "open_subscription_page"
-	| "open_usage_billing";
-
-export interface ExistingProviderOption {
-	value: ExistingProviderAction;
-	label: string;
-	onSelect?: () => Promise<void> | void;
-}
+export type ExistingProviderAction = "use_existing" | "reconfigure";
 
 export function UseExistingOrReconfigureContent(
-	props: ChoiceContext<ExistingProviderOption> & {
+	props: ChoiceContext<ExistingProviderAction> & {
 		providerName: string;
-		extraOptions?: ExistingProviderOption[];
 	},
 ) {
-	const { resolve, dismiss, dialogId, providerName, extraOptions } = props;
-	const options: ExistingProviderOption[] = useMemo(
-		() => [
-			{ value: "use_existing", label: "Use existing configuration" },
-			{ value: "reconfigure", label: "Configure again" },
-			...(extraOptions ?? []),
-		],
-		[extraOptions],
-	);
+	const { resolve, dismiss, dialogId, providerName } = props;
+	const options: { value: ExistingProviderAction; label: string }[] = [
+		{ value: "use_existing", label: "Use existing configuration" },
+		{ value: "reconfigure", label: "Configure again" },
+	];
 	const [selected, setSelected] = useState(0);
 
 	useDialogKeyboard((key) => {
@@ -288,7 +269,7 @@ export function UseExistingOrReconfigureContent(
 		}
 		if (key.name === "return" || key.name === "enter") {
 			const opt = options[selected];
-			if (opt) resolve(opt);
+			if (opt) resolve(opt.value);
 			return;
 		}
 		if (key.name === "up" || (key.ctrl && key.name === "p")) {
@@ -333,86 +314,6 @@ export function UseExistingOrReconfigureContent(
 	);
 }
 
-function ClinePassBrowserPageContent(
-	props: ChoiceContext<boolean> & {
-		providerName: string;
-		pageLabel: string;
-		url: string;
-		openedStatus: string;
-	},
-) {
-	const {
-		resolve,
-		dismiss,
-		dialogId,
-		providerName,
-		pageLabel,
-		url,
-		openedStatus,
-	} = props;
-	const [status, setStatus] = useState("Opening browser...");
-
-	useEffect(() => {
-		void open(url, { wait: false })
-			.then(() => {
-				setStatus(openedStatus);
-			})
-			.catch(() => {
-				setStatus("Could not open browser automatically. Open the URL below.");
-			});
-	}, [url, openedStatus]);
-
-	useDialogKeyboard((key) => {
-		if (key.name === "escape") {
-			dismiss();
-			return;
-		}
-		if (key.name === "return" || key.name === "enter") {
-			resolve(true);
-		}
-	}, dialogId);
-
-	return (
-		<box flexDirection="column" paddingX={1} gap={1}>
-			<text fg={palette.act}>
-				<strong>{providerName}</strong>
-			</text>
-
-			<text>{status}</text>
-
-			<text fg="gray">{pageLabel}:</text>
-			<text fg={palette.act} selectable>
-				<a href={url}>{url}</a>
-			</text>
-
-			<text fg="gray">
-				<em>Enter or Esc to go back</em>
-			</text>
-		</box>
-	);
-}
-
-export function ClinePassSubscriptionContent(
-	props: ChoiceContext<boolean> & {
-		providerName: string;
-	},
-) {
-	const subscriptionUrl = useMemo(
-		() =>
-			buildClinePassSubscriptionPageUrl(getClineEnvironmentConfig().appBaseUrl),
-		[],
-	);
-
-	return (
-		<ClinePassBrowserPageContent
-			{...props}
-			pageLabel="Subscription page"
-			url={subscriptionUrl}
-			openedStatus="Opened subscription page in your browser."
-		/>
-	);
-}
-
 const DEFAULT_FIELD_LABELS: Partial<Record<ProviderConfigFieldKey, string>> = {
 	apiKey: "API key",
 	baseUrl: "Base URL",
@@ -599,7 +500,7 @@ export function ProviderConfigInputContent(
 
 	return (
 		<box flexDirection="column" paddingX={1} gap={1}>
-			<text fg={palette.act}>
+			<text fg="cyan">
 				<strong>{providerName}</strong>
 			</text>
 
@@ -692,7 +593,7 @@ export function CodexCliStatusContent(
 
 	return (
 		<box flexDirection="column" paddingX={1} gap={1}>
-			<text fg={palette.act}>
+			<text fg="cyan">
 				<strong>{providerName}</strong>
 			</text>
 
@@ -710,7 +611,7 @@ export function CodexCliStatusContent(
 					<text fg="yellow">Codex CLI was not found</text>
 					<text fg="gray">{status.reason}</text>
 					<text fg="gray">Install Codex CLI from:</text>
-					<text fg={palette.act} selectable>
+					<text fg="cyan" selectable>
 						{CODEX_CLI_INSTALL_URL}
 					</text>
 				</box>
@@ -727,27 +628,13 @@ export function CodexCliStatusContent(
 	);
 }
 
-/**
- * Resolves `true` on successful login, `"use_api_key"` when the user opts
- * into manual API key entry (only offered with `allowApiKeyFallback`).
- */
-export type OAuthLoginResult = boolean | "use_api_key";
-
 export function OAuthLoginContent(
-	props: ChoiceContext<OAuthLoginResult> & {
+	props: ChoiceContext<boolean> & {
 		providerId: string;
 		providerName: string;
-		allowApiKeyFallback?: boolean;
 	},
 ) {
-	const {
-		resolve,
-		dismiss,
-		dialogId,
-		providerId,
-		providerName,
-		allowApiKeyFallback,
-	} = props;
+	const { resolve, dismiss, dialogId, providerId, providerName } = props;
 	const [mode, setMode] = useState<"browser" | "device">(
 		providerId === "cline" ? "device" : "browser",
 	);
@@ -880,23 +767,13 @@ export function OAuthLoginContent(
 		if (key.name === "escape") {
 			cancelAuthAttempt();
 			dismiss();
-			return;
-		}
-		if (key.name === "k" && allowApiKeyFallback) {
-			cancelAuthAttempt();
-			resolve("use_api_key");
 		}
 	}, dialogId);
 
-	const escapeHint = allowApiKeyFallback
-		? "K to enter an API key instead, Esc to cancel"
-		: "Esc to cancel";
-	const escapeHintColor = allowApiKeyFallback ? "white" : "gray";
-
 	if (mode === "device") {
 		return (
 			<box flexDirection="column" paddingX={1} gap={1}>
-				<text fg={palette.act}>
+				<text fg="cyan">
 					<strong>{providerName}</strong>
 				</text>
 
@@ -911,7 +788,7 @@ export function OAuthLoginContent(
 							<strong>{deviceUserCode}</strong>
 						</text>
 						<text fg="gray">Visit this URL and enter the code above:</text>
-						<text fg={palette.act} selectable>
+						<text fg="cyan" selectable>
 							<a href={deviceVerifyUrl}>{deviceVerifyUrl}</a>
 						</text>
 					</box>
@@ -919,8 +796,8 @@ export function OAuthLoginContent(
 
 				{deviceError && <text fg="red">{deviceError}</text>}
 
-				<text fg={escapeHintColor}>
-					<em>{escapeHint}</em>
+				<text fg="gray">
+					<em>Esc to cancel</em>
 				</text>
 			</box>
 		);
@@ -928,7 +805,7 @@ export function OAuthLoginContent(
 
 	return (
 		<box flexDirection="column" paddingX={1} gap={1}>
-			<text fg={palette.act}>
+			<text fg="cyan">
 				<strong>{providerName}</strong>
 			</text>
 
@@ -942,83 +819,8 @@ export function OAuthLoginContent(
 
 			{error && <text fg="red">{error}</text>}
 
-			<text fg={escapeHintColor}>
-				<em>{escapeHint}</em>
-			</text>
-		</box>
-	);
-}
-
-/**
- * Manual API key entry for OAuth-capable providers — the escape hatch for
- * when OAuth login isn't working. Saving clears any stored OAuth tokens so
- * the manual key takes effect (see saveManualProviderApiKey).
- */
-export function OAuthApiKeyInputContent(
-	props: ChoiceContext<boolean> & {
-		providerId: string;
-		providerName: string;
-		providerSettingsManager: ProviderSettingsManager;
-	},
-) {
-	const {
-		resolve,
-		dismiss,
-		dialogId,
-		providerId,
-		providerName,
-		providerSettingsManager,
-	} = props;
-	const [value, setValue] = useState("");
-
-	const submit = () => {
-		const apiKey = value.trim();
-		if (!apiKey) return;
-		saveManualProviderApiKey(providerSettingsManager, providerId, apiKey);
-		resolve(true);
-	};
-
-	useDialogKeyboard((key) => {
-		if (key.name === "escape") {
-			dismiss();
-			return;
-		}
-		if (key.name === "return") {
-			submit();
-		}
-	}, dialogId);
-
-	return (
-		<box flexDirection="column" paddingX={1} gap={1}>
-			<text fg={palette.act}>
-				<strong>{providerName}</strong>
-			</text>
-
-			<text fg="gray">
-				Use an API key from your Cline dashboard instead of OAuth login. This
-				replaces any saved login tokens.
-			</text>
-
-			<box flexDirection="column">
-				<text fg="gray">API key</text>
-				<box
-					border
-					borderStyle="rounded"
-					borderColor={palette.act}
-					paddingX={1}
-				>
-					<input
-						value={value}
-						onInput={setValue}
-						placeholder="Paste your API key"
-						flexGrow={1}
-						focused
-					/>
-				</box>
-			</box>
-
-			<text fg="gray">
-				<em>Enter to save, Esc to go back</em>
+			<text fg="gray">
+				<em>Esc to cancel</em>
 			</text>
 		</box>
 	);

apps/cli/src/tui/components/dialogs/skills-picker.tsx

@@ -142,7 +142,7 @@ export function SkillsPickerContent(props: SkillsPickerContentProps) {
 									onMouseDown={() => resolve(SKILLS_MARKETPLACE_ACTION)}
 									height={1}
 								>
-									<text fg={isSelected ? palette.textOnSelection : palette.act}>
+									<text fg={isSelected ? palette.textOnSelection : "cyan"}>
 										{isSelected ? "❯ " : "  "}
 										Browse more skills at {SKILLS_MARKETPLACE_URL}
 									</text>

apps/cli/src/tui/components/dialogs/tool-approval.tsx

@@ -155,7 +155,7 @@ export function ToolApprovalContent(
 		<box flexDirection="column" paddingX={1}>
 			<text fg="yellow">Approve tool call?</text>
 
-			<text fg={palette.act} marginTop={1}>
+			<text fg="cyan" marginTop={1}>
 				<strong>{props.request.toolName}</strong>
 			</text>
 

apps/cli/src/tui/components/input-bar.tsx

@@ -30,7 +30,7 @@ export type TextareaHandle = Pick<
 
 export interface InputBarProps {
 	accent: string;
-	ruleColor: string;
+	inputBackground: string;
 	inputForeground: string;
 	inputPlaceholder: string;
 	placeholder: string;
@@ -62,7 +62,7 @@ function readTextPaste(event: PasteEvent): string | null {
 export function InputBar(props: InputBarProps) {
 	const {
 		accent,
-		ruleColor,
+		inputBackground,
 		inputForeground,
 		inputPlaceholder,
 		placeholder,
@@ -197,13 +197,13 @@ export function InputBar(props: InputBarProps) {
 		<box
 			flexDirection="row"
 			alignItems="flex-start"
-			border={["top", "bottom"]}
-			borderStyle="single"
-			borderColor={ruleColor}
+			backgroundColor={inputBackground}
+			paddingX={2}
+			paddingY={1}
 			onMouseDown={props.onFocusRequest}
 		>
 			<text fg={accent}>
-				<strong>{"❯"}</strong>
+				<strong>{">"}</strong>
 			</text>
 			<box flexGrow={1} paddingLeft={1}>
 				<textarea

apps/cli/src/tui/components/model-selector/cline-model-entries.ts

@@ -1,106 +0,0 @@
-import type {
-	ClineRecommendedModel,
-	ClineRecommendedModelsData,
-} from "@cline/core";
-
-export type ClineModelPickerTier = "recommended" | "subscribed" | "free";
-
-export interface ClineModelPickerItem {
-	kind: "model";
-	model: ClineRecommendedModel;
-	tier: ClineModelPickerTier;
-}
-
-export interface ClineModelPickerBrowse {
-	kind: "browse";
-}
-
-export type ClineModelPickerEntry =
-	| ClineModelPickerItem
-	| ClineModelPickerBrowse;
-
-export const CLINE_MODEL_PICKER_TIER_LABELS: Record<
-	ClineModelPickerTier,
-	string
-> = {
-	recommended: "Recommended",
-	subscribed: "Subscribed",
-	free: "Free",
-};
-
-// Featured entries for the sectioned picker, keyed by provider: cline gets
-// Recommended/Free with a browse-all escape into the full catalog; cline-pass
-// gets Subscribed/Free (see buildClinePassModelEntries for why no browse-all).
-export function buildFeaturedModelEntries(
-	providerId: string,
-	data: ClineRecommendedModelsData,
-): ClineModelPickerEntry[] {
-	return providerId === "cline-pass"
-		? buildClinePassModelEntries(data)
-		: buildClineModelEntries(data);
-}
-
-function buildClineModelEntries(
-	data: ClineRecommendedModelsData,
-): ClineModelPickerEntry[] {
-	const entries: ClineModelPickerEntry[] = [];
-	for (const m of data.recommended) {
-		entries.push({ kind: "model", model: m, tier: "recommended" });
-	}
-	for (const m of data.free) {
-		entries.push({ kind: "model", model: m, tier: "free" });
-	}
-	entries.push({ kind: "browse" });
-	return entries;
-}
-
-// Shown under the Free section header when picking a model for ClinePass
-export const CLINE_PASS_FREE_SECTION_DESCRIPTION =
-	"Try with limited usage, separate from ClinePass quota.";
-
-// ClinePass shows the subscription's models plus the Cline free models — both
-// providers hit the same Cline API, so free models are selectable in place
-// (they ride usage billing at $0 instead of the subscription quota).
-// No "browse all" entry when the clinePass bucket is populated: unlike cline,
-// the ClinePass catalog contains exactly these two buckets, so the sections
-// already list every selectable model. An empty clinePass bucket means the
-// fetch fell back to the bundled list (which has no pass models) — without an
-// escape into the full catalog a subscriber could only pick free models, so
-// browse-all comes back in that degraded mode.
-function buildClinePassModelEntries(
-	data: ClineRecommendedModelsData,
-): ClineModelPickerEntry[] {
-	const entries: ClineModelPickerEntry[] = [];
-	for (const m of data.clinePass) {
-		entries.push({ kind: "model", model: m, tier: "subscribed" });
-	}
-	for (const m of data.free) {
-		entries.push({ kind: "model", model: m, tier: "free" });
-	}
-	if (data.clinePass.length === 0) {
-		entries.push({ kind: "browse" });
-	}
-	return entries;
-}
-
-// The quota explainer only makes sense in the ClinePass picker, which is the
-// only picker that has a "subscribed" section
-export function freeTierDescriptionFor(
-	entries: ClineModelPickerEntry[],
-): string | undefined {
-	const isClinePassPicker = entries.some(
-		(entry) => entry.kind === "model" && entry.tier === "subscribed",
-	);
-	return isClinePassPicker ? CLINE_PASS_FREE_SECTION_DESCRIPTION : undefined;
-}
-
-// OpenRouter marks free variants with "(free)" in names and ":free" in ids to
-// disambiguate them from their paid twins. Inside the sectioned pickers the
-// Free header already says it, so the markers are redundant — but keep them in
-// flat lists (e.g. browse-all), where both variants appear side by side.
-export function stripFreeMarker(displayName: string): string {
-	return displayName
-		.replace(/\s*\(free\)\s*$/i, "")
-		.replace(/:free$/i, "")
-		.trim();
-}

apps/cli/src/tui/components/model-selector/cline-model-picker.test.ts

@@ -1,98 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-	buildFeaturedModelEntries,
-	CLINE_PASS_FREE_SECTION_DESCRIPTION,
-	freeTierDescriptionFor,
-	stripFreeMarker,
-} from "./cline-model-entries";
-
-const model = (id: string) => ({ id, name: id, description: "", tags: [] });
-
-describe("cline model picker entries", () => {
-	it("builds Recommended/Free sections for the cline provider", () => {
-		const entries = buildFeaturedModelEntries("cline", {
-			recommended: [model("anthropic/claude-sonnet-5")],
-			free: [model("deepseek/deepseek-v4-flash")],
-			clinePass: [model("cline-pass/glm-5.1")],
-		});
-
-		expect(entries).toEqual([
-			{
-				kind: "model",
-				model: model("anthropic/claude-sonnet-5"),
-				tier: "recommended",
-			},
-			{
-				kind: "model",
-				model: model("deepseek/deepseek-v4-flash"),
-				tier: "free",
-			},
-			{ kind: "browse" },
-		]);
-	});
-
-	it("builds Subscribed/Free sections for the cline-pass provider", () => {
-		const entries = buildFeaturedModelEntries("cline-pass", {
-			recommended: [model("anthropic/claude-sonnet-5")],
-			free: [model("deepseek/deepseek-v4-flash")],
-			clinePass: [model("cline-pass/glm-5.1"), model("cline-pass/kimi-k2.6")],
-		});
-
-		expect(entries).toEqual([
-			{ kind: "model", model: model("cline-pass/glm-5.1"), tier: "subscribed" },
-			{
-				kind: "model",
-				model: model("cline-pass/kimi-k2.6"),
-				tier: "subscribed",
-			},
-			{
-				kind: "model",
-				model: model("deepseek/deepseek-v4-flash"),
-				tier: "free",
-			},
-		]);
-	});
-
-	it("adds the browse-all escape when the clinePass bucket is empty", () => {
-		// The fetch fell back to the bundled list (no pass models); the sections
-		// alone would leave a subscriber able to pick only free models.
-		const entries = buildFeaturedModelEntries("cline-pass", {
-			recommended: [],
-			free: [model("deepseek/deepseek-v4-flash")],
-			clinePass: [],
-		});
-
-		expect(entries).toEqual([
-			{
-				kind: "model",
-				model: model("deepseek/deepseek-v4-flash"),
-				tier: "free",
-			},
-			{ kind: "browse" },
-		]);
-	});
-
-	it("attaches the quota explainer only to the ClinePass picker's free section", () => {
-		const data = {
-			recommended: [model("anthropic/claude-sonnet-5")],
-			free: [model("deepseek/deepseek-v4-flash")],
-			clinePass: [model("cline-pass/glm-5.1")],
-		};
-
-		expect(
-			freeTierDescriptionFor(buildFeaturedModelEntries("cline-pass", data)),
-		).toBe(CLINE_PASS_FREE_SECTION_DESCRIPTION);
-		expect(
-			freeTierDescriptionFor(buildFeaturedModelEntries("cline", data)),
-		).toBe(undefined);
-	});
-
-	it("strips redundant free markers from display names", () => {
-		expect(stripFreeMarker("Laguna M.1 (free)")).toBe("Laguna M.1");
-		expect(stripFreeMarker("Trinity Large Preview (FREE)")).toBe(
-			"Trinity Large Preview",
-		);
-		expect(stripFreeMarker("laguna-m.1:free")).toBe("laguna-m.1");
-		expect(stripFreeMarker("DeepSeek V4 Flash")).toBe("DeepSeek V4 Flash");
-	});
-});

apps/cli/src/tui/components/model-selector/cline-model-picker.tsx

@@ -1,6 +1,7 @@
 // @jsxImportSource @opentui/react
 
 import {
+	type ClineRecommendedModel,
 	type ClineRecommendedModelsData,
 	fetchClineRecommendedModels,
 } from "@cline/core";
@@ -8,28 +9,25 @@ import type { ReactNode } from "react";
 import { useEffect, useState } from "react";
 import "opentui-spinner/react";
 import { palette } from "../../palette";
-import {
-	CLINE_MODEL_PICKER_TIER_LABELS,
-	type ClineModelPickerEntry,
-	freeTierDescriptionFor,
-	stripFreeMarker,
-} from "./cline-model-entries";
 
-export {
-	buildFeaturedModelEntries,
-	CLINE_MODEL_PICKER_TIER_LABELS,
-	type ClineModelPickerBrowse,
-	type ClineModelPickerEntry,
-	type ClineModelPickerItem,
-	type ClineModelPickerTier,
-	freeTierDescriptionFor,
-	stripFreeMarker,
-} from "./cline-model-entries";
+export interface ClineModelPickerItem {
+	kind: "model";
+	model: ClineRecommendedModel;
+	tier: "recommended" | "free";
+}
+
+export interface ClineModelPickerBrowse {
+	kind: "browse";
+}
+
+export type ClineModelPickerEntry =
+	| ClineModelPickerItem
+	| ClineModelPickerBrowse;
 
 function tagColor(tag: string): string {
 	if (tag === "FREE") return palette.success;
 	if (tag === "BEST") return "magenta";
-	return palette.act;
+	return "cyan";
 }
 
 function resolveDisplayName(
@@ -41,13 +39,12 @@ function resolveDisplayName(
 		for (const key of candidates) {
 			if (!key) continue;
 			const hit = knownModels[key] as { name?: string } | undefined;
-			if (hit?.name) return stripFreeMarker(hit.name);
+			if (hit?.name) return hit.name;
 		}
 	}
-	const fallback = modelId.includes("/")
+	return modelId.includes("/")
 		? (modelId.split("/").pop() ?? modelId)
 		: modelId;
-	return stripFreeMarker(fallback);
 }
 
 export function useClineRecommendedModels() {
@@ -71,6 +68,20 @@ export function useClineRecommendedModels() {
 	return { data, loading };
 }
 
+export function buildClineModelEntries(
+	data: ClineRecommendedModelsData,
+): ClineModelPickerEntry[] {
+	const entries: ClineModelPickerEntry[] = [];
+	for (const m of data.recommended) {
+		entries.push({ kind: "model", model: m, tier: "recommended" });
+	}
+	for (const m of data.free) {
+		entries.push({ kind: "model", model: m, tier: "free" });
+	}
+	entries.push({ kind: "browse" });
+	return entries;
+}
+
 export function ClineModelPicker(props: {
 	entries: ClineModelPickerEntry[];
 	selected: number;
@@ -92,7 +103,6 @@ export function ClineModelPicker(props: {
 	let lastTier: string | null = null;
 	let isFirstHeader = true;
 	const rows: ReactNode[] = [];
-	const freeTierDescription = freeTierDescriptionFor(entries);
 
 	for (let i = 0; i < entries.length; i++) {
 		const entry = entries[i];
@@ -102,20 +112,14 @@ export function ClineModelPicker(props: {
 		if (entry.kind === "model") {
 			if (entry.tier !== lastTier) {
 				lastTier = entry.tier;
-				const label = CLINE_MODEL_PICKER_TIER_LABELS[entry.tier];
+				const label = entry.tier === "recommended" ? "Recommended" : "Free";
 				rows.push(
 					<box
 						key={`tier-${entry.tier}`}
 						paddingX={1}
 						marginTop={isFirstHeader ? 0 : 1}
-						flexDirection="column"
 					>
 						<text fg="gray">{label}</text>
-						{entry.tier === "free" && freeTierDescription && (
-							<text fg="gray">
-								<em>{freeTierDescription}</em>
-							</text>
-						)}
 					</box>,
 				);
 				isFirstHeader = false;

apps/cli/src/tui/components/model-selector/cline-model-selector.tsx

@@ -3,12 +3,7 @@ import type { ChoiceContext } from "@opentui-ui/dialog";
 import { useDialogKeyboard } from "@opentui-ui/dialog/react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { palette } from "../../palette";
-import {
-	CLINE_MODEL_PICKER_TIER_LABELS,
-	type ClineModelPickerEntry,
-	freeTierDescriptionFor,
-	stripFreeMarker,
-} from "./cline-model-picker";
+import type { ClineModelPickerEntry } from "./cline-model-picker";
 import { CHANGE_PROVIDER_ACTION } from "./model-selector";
 import { ProviderRow } from "./provider-row";
 
@@ -22,7 +17,7 @@ type ClineModelEntriesState =
 function tagColor(tag: string): string {
 	if (tag === "FREE") return palette.success;
 	if (tag === "BEST") return "magenta";
-	return palette.act;
+	return "cyan";
 }
 
 function resolveDisplayName(
@@ -34,13 +29,12 @@ function resolveDisplayName(
 		for (const key of candidates) {
 			if (!key) continue;
 			const hit = knownModels[key] as { name?: string } | undefined;
-			if (hit?.name) return stripFreeMarker(hit.name);
+			if (hit?.name) return hit.name;
 		}
 	}
-	const fallback = modelId.includes("/")
+	return modelId.includes("/")
 		? (modelId.split("/").pop() ?? modelId)
 		: modelId;
-	return stripFreeMarker(fallback);
 }
 
 export function ClineModelSelectorContent(
@@ -68,13 +62,11 @@ export function ClineModelSelectorContent(
 			key: string;
 			kind: "header" | "model" | "browse";
 			label: string;
-			description?: string;
 			tags: string[];
 			isCurrent: boolean;
 			entryIndex: number;
 		}[] = [];
 		let lastTier: string | null = null;
-		const freeTierDescription = freeTierDescriptionFor(entries);
 		for (let i = 0; i < entries.length; i++) {
 			const entry = entries[i];
 			if (!entry) continue;
@@ -84,9 +76,7 @@ export function ClineModelSelectorContent(
 					rows.push({
 						key: `tier-${entry.tier}`,
 						kind: "header",
-						label: CLINE_MODEL_PICKER_TIER_LABELS[entry.tier],
-						description:
-							entry.tier === "free" ? freeTierDescription : undefined,
+						label: entry.tier === "recommended" ? "Recommended" : "Free",
 						tags: [],
 						isCurrent: false,
 						entryIndex: -1,
@@ -166,18 +156,8 @@ export function ClineModelSelectorContent(
 					if (row.kind === "header") {
 						const isFirst = idx === 0;
 						return (
-							<box
-								key={row.key}
-								paddingX={1}
-								marginTop={isFirst ? 0 : 1}
-								flexDirection="column"
-							>
+							<box key={row.key} paddingX={1} marginTop={isFirst ? 0 : 1}>
 								<text fg="gray">{row.label}</text>
-								{row.description && (
-									<text fg="gray">
-										<em>{row.description}</em>
-									</text>
-								)}
 							</box>
 						);
 					}
@@ -292,7 +272,7 @@ export function ClineModelSelectorDialogContent(
 	if (state.status === "error") {
 		return (
 			<box flexDirection="column" gap={1}>
-				<text fg={palette.act}>Choose a model</text>
+				<text fg="cyan">Choose a model</text>
 				<ProviderRow providerName={props.currentProviderName} focused={false} />
 				<text fg="red">{state.message}</text>
 				<text fg="gray">R to retry, Esc to go back</text>
@@ -302,7 +282,7 @@ export function ClineModelSelectorDialogContent(
 
 	return (
 		<box flexDirection="column" gap={1}>
-			<text fg={palette.act}>Choose a model</text>
+			<text fg="cyan">Choose a model</text>
 			<ProviderRow providerName={props.currentProviderName} focused={false} />
 			<text fg="gray">{state.message}</text>
 			<text fg="gray">Esc to go back</text>

apps/cli/src/tui/components/model-selector/model-selector.tsx

@@ -329,8 +329,7 @@ export function ThinkingLevelContent(
 ) {
 	const { resolve, dismiss, dialogId, modelName, currentLevel } = props;
 	const [selected, setSelected] = useState(() => {
-		const initialLevel = currentLevel === "none" ? "medium" : currentLevel;
-		const idx = THINKING_LEVELS.findIndex((l) => l.value === initialLevel);
+		const idx = THINKING_LEVELS.findIndex((l) => l.value === currentLevel);
 		return idx >= 0 ? idx : 0;
 	});
 

apps/cli/src/tui/components/model-selector/provider-row.tsx

@@ -13,7 +13,7 @@ export function ProviderRow({
 			<text fg={focused ? palette.selection : "gray"} flexShrink={0}>
 				{focused ? "❯" : " "}
 			</text>
-			<text fg={focused ? palette.selection : palette.act} flexShrink={0}>
+			<text fg={focused ? palette.selection : "cyan"} flexShrink={0}>
 				Provider:
 			</text>
 			<text fg="white">{providerName}</text>

apps/cli/src/tui/components/status-bar.test.ts

@@ -3,7 +3,6 @@ import {
 	createContextBar,
 	formatStatusBarUsageText,
 	resolveContextBarFilledForeground,
-	resolveModelDisplayName,
 } from "./status-bar";
 
 vi.mock("@opentui/react", () => ({
@@ -14,14 +13,14 @@ describe("createContextBar", () => {
 	it("keeps a stable width while changing segment lengths", () => {
 		expect(createContextBar(0, 100)).toEqual({
 			filled: "",
-			empty: "\u2588\u2588\u2588\u2588\u2588\u2588",
+			empty: "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588",
 		});
 		expect(createContextBar(50, 100)).toEqual({
-			filled: "\u2588\u2588\u2588",
-			empty: "\u2588\u2588\u2588",
+			filled: "\u2588\u2588\u2588\u2588",
+			empty: "\u2588\u2588\u2588\u2588",
 		});
 		expect(createContextBar(100, 100)).toEqual({
-			filled: "\u2588\u2588\u2588\u2588\u2588\u2588",
+			filled: "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588",
 			empty: "",
 		});
 	});
@@ -29,17 +28,17 @@ describe("createContextBar", () => {
 	it("shows a non-empty fill when usage is above zero", () => {
 		expect(createContextBar(7_000, 1_000_000)).toEqual({
 			filled: "\u2588",
-			empty: "\u2588\u2588\u2588\u2588\u2588",
+			empty: "\u2588\u2588\u2588\u2588\u2588\u2588\u2588",
 		});
 	});
 
 	it("reserves the final segment for usage at or above the limit", () => {
 		expect(createContextBar(999_999, 1_000_000)).toEqual({
-			filled: "\u2588\u2588\u2588\u2588\u2588",
+			filled: "\u2588\u2588\u2588\u2588\u2588\u2588\u2588",
 			empty: "\u2588",
 		});
 		expect(createContextBar(1_000_000, 1_000_000)).toEqual({
-			filled: "\u2588\u2588\u2588\u2588\u2588\u2588",
+			filled: "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588",
 			empty: "",
 		});
 	});
@@ -56,77 +55,18 @@ describe("formatStatusBarUsageText", () => {
 			formatStatusBarUsageText({
 				totalTokens: 12_345,
 				totalCost: 0.123,
-				providerId: "cline",
+				showCost: true,
 			}),
-		).toBe("(12,345) $0.12");
+		).toBe("(12,345 tokens) $0.12");
 	});
 
-	it("rounds cost to two decimals even when tiny", () => {
-		expect(
-			formatStatusBarUsageText({
-				totalTokens: 12_345,
-				totalCost: 0.0004,
-				providerId: "cline",
-			}),
-		).toBe("(12,345) $0.00");
-	});
-
-	it("hides cost entirely for subscription providers", () => {
+	it("omits cost when usage cost is hidden", () => {
 		expect(
 			formatStatusBarUsageText({
 				totalTokens: 12_345,
 				totalCost: 0.123,
-				providerId: "cline-pass",
+				showCost: false,
 			}),
-		).toBe("(12,345)");
-	});
-});
-
-describe("resolveModelDisplayName", () => {
-	it("uses the friendly model name with a ClinePass prefix", () => {
-		expect(
-			resolveModelDisplayName({
-				providerId: "cline-pass",
-				modelId: "zai/glm-5.2",
-				knownModels: {
-					"zai/glm-5.2": { name: "GLM 5.2" },
-				},
-			}),
-		).toBe("ClinePass: GLM 5.2");
-	});
-
-	it("falls back to the bare model id with a ClinePass prefix when unknown", () => {
-		expect(
-			resolveModelDisplayName({
-				providerId: "cline-pass",
-				modelId: "zai/glm-5.2",
-			}),
-		).toBe("ClinePass: glm-5.2");
-	});
-
-	it("keeps the reasoning effort next to the model name", () => {
-		expect(
-			resolveModelDisplayName({
-				providerId: "cline-pass",
-				modelId: "zai/glm-5.2",
-				knownModels: {
-					"zai/glm-5.2": { name: "GLM 5.2" },
-				},
-				thinking: true,
-				reasoningEffort: "high",
-			}),
-		).toBe("ClinePass: GLM 5.2 (high)");
-	});
-
-	it("uses the friendly model name for non-ClinePass providers", () => {
-		expect(
-			resolveModelDisplayName({
-				providerId: "cline",
-				modelId: "zai/glm-5.2",
-				knownModels: {
-					"zai/glm-5.2": { name: "GLM 5.2" },
-				},
-			}),
-		).toBe("GLM 5.2");
+		).toBe("(12,345 tokens)");
 	});
 });

apps/cli/src/tui/components/status-bar.tsx

@@ -1,9 +1,6 @@
 import type { AgentMode } from "@cline/core";
 import { useTerminalDimensions } from "@opentui/react";
-import {
-	shouldShowCliUsageCost,
-	shouldShowCliUsageCoveredBySubscription,
-} from "../../utils/usage-cost-display";
+import { shouldShowCliUsageCost } from "../../utils/usage-cost-display";
 import {
 	useTerminalBackground,
 	useTerminalTheme,
@@ -18,7 +15,7 @@ import { HOME_VIEW_MAX_WIDTH } from "../types";
 export function createContextBar(
 	used: number,
 	total?: number,
-	width = 6,
+	width = 8,
 ): { filled: string; empty: string } {
 	const normalizedWidth = Math.max(0, Math.floor(width));
 	const ratio = total && total > 0 ? Math.min(used / total, 1) : 0;
@@ -45,35 +42,18 @@ export function resolveContextBarFilledForeground(
 }
 
 function formatCost(cost: number): string {
+	if (cost < 0.01) return `$${cost.toFixed(4)}`;
 	return `$${cost.toFixed(2)}`;
 }
 
-function formatCostText(providerId: string, totalCost: number): string {
-	// Subscription providers (ClinePass) have no per-use cost worth surfacing.
-	if (shouldShowCliUsageCoveredBySubscription(providerId)) {
-		return "";
-	}
-
-	if (!shouldShowCliUsageCost(providerId)) {
-		return "";
-	}
-
-	return formatCost(totalCost);
-}
-
 export function formatStatusBarUsageText(input: {
 	totalTokens: number;
 	totalCost: number;
-	providerId: string;
+	showCost: boolean;
 }): string {
-	const tokens = `(${input.totalTokens.toLocaleString()})`;
-	const costText = formatCostText(input.providerId, input.totalCost);
-
-	if (!costText) {
-		return tokens;
-	}
-
-	return `${tokens} ${costText}`;
+	const tokens = `(${input.totalTokens.toLocaleString()} tokens)`;
+	if (!input.showCost) return tokens;
+	return `${tokens} ${formatCost(input.totalCost)}`;
 }
 
 // knownModels keys are bare IDs ("claude-sonnet-4-6") but config.modelId
@@ -94,22 +74,17 @@ function lookupModelInfo(
 }
 
 export function resolveModelDisplayName(config: {
-	providerId?: string;
 	modelId: string;
 	knownModels?: Record<string, unknown>;
 	thinking?: boolean;
 	reasoningEffort?: string;
 }): string {
 	const info = lookupModelInfo(config.modelId, config.knownModels);
-	const modelIdTail = config.modelId.split("/").pop() ?? config.modelId;
-	let displayName = info?.name ?? modelIdTail;
+	const name = info?.name ?? config.modelId.split("/").pop() ?? config.modelId;
 	if (config.thinking && config.reasoningEffort) {
-		displayName = `${displayName} (${config.reasoningEffort})`;
+		return `${name} (${config.reasoningEffort})`;
 	}
-	if (config.providerId === "cline-pass") {
-		displayName = `ClinePass: ${displayName}`;
-	}
-	return displayName;
+	return name;
 }
 
 export function resolveModelMaxInputTokens(config: {
@@ -177,6 +152,7 @@ export function StatusBar(props: StatusBarProps) {
 	const bar = hasMaxInputTokens
 		? createContextBar(totalTokens, maxInputTokens)
 		: undefined;
+	const showUsageCost = shouldShowCliUsageCost(props.providerId);
 
 	// Available content width after accounting for padding.
 	// Home view: parent box is capped at 60 wide, status bar adds paddingX=1 (-2).
@@ -193,7 +169,7 @@ export function StatusBar(props: StatusBarProps) {
 	const usageText = formatStatusBarUsageText({
 		totalTokens,
 		totalCost,
-		providerId: props.providerId,
+		showCost: showUsageCost,
 	});
 	const contextText = bar
 		? ` ${bar.filled}${bar.empty} ${usageText}`

apps/cli/src/tui/contexts/session-context.tsx

@@ -103,16 +103,9 @@ export function SessionProvider(props: {
 	const [hasSubmitted, setHasSubmitted] = useState(
 		(initialEntries?.length ?? 0) > 0,
 	);
-	const [uiMode, _setUiMode] = useState<AgentMode>(
+	const [uiMode, setUiMode] = useState<AgentMode>(
 		config.mode === "plan" ? "plan" : "act",
 	);
-	// Mirror for appendEntry: entries are appended from event-handler
-	// callbacks that must see the mode at append time, not at closure time.
-	const uiModeRef = useRef<AgentMode>(config.mode === "plan" ? "plan" : "act");
-	const setUiMode = useCallback((mode: AgentMode) => {
-		uiModeRef.current = mode;
-		_setUiMode(mode);
-	}, []);
 	const initialAutoApproveAll = config.toolPolicies["*"]?.autoApprove !== false;
 	const autoApproveAllRef = useRef(initialAutoApproveAll);
 	const [autoApproveAll, _setAutoApproveAll] = useState(initialAutoApproveAll);
@@ -139,9 +132,8 @@ export function SessionProvider(props: {
 	);
 
 	const appendEntry = useCallback((entry: ChatEntry) => {
-		const stamped = entry.mode ? entry : { ...entry, mode: uiModeRef.current };
 		setEntries((prev) => {
-			const next = [...prev, stamped];
+			const next = [...prev, entry];
 			return next.length <= MAX_BUFFERED_LINES
 				? next
 				: next.slice(next.length - MAX_BUFFERED_LINES);
@@ -196,8 +188,8 @@ export function SessionProvider(props: {
 	}, []);
 
 	const toggleMode = useCallback(() => {
-		setUiMode(uiModeRef.current === "act" ? "plan" : "act");
-	}, [setUiMode]);
+		setUiMode((m) => (m === "act" ? "plan" : "act"));
+	}, []);
 
 	const toggleAutoApprove = useCallback(() => {
 		const next = !autoApproveAllRef.current;

apps/cli/src/tui/hooks/local-command-actions.ts

@@ -3,7 +3,6 @@ import type { OpenConfigOptions } from "./use-config-panel";
 
 export interface LocalSlashCommandActionInput {
 	name: string;
-	isRunning: boolean;
 	openAccount: () => void;
 	openConfig: (options?: OpenConfigOptions) => void;
 	openMcpManager: () => Promise<boolean>;
@@ -47,12 +46,7 @@ export function runLocalSlashCommandAction(
 		return true;
 	}
 	if (normalized === "compact") {
-		// Autocomplete can invoke local commands while a turn is running. Keep
-		// /compact handled, but do not let it take ownership of the active turn's
-		// shared running state.
-		if (!input.isRunning) {
-			input.runCompact();
-		}
+		input.runCompact();
 		return true;
 	}
 	if (normalized === "fork") {

apps/cli/src/tui/hooks/use-account-dialog.tsx

@@ -7,10 +7,7 @@ import {
 	type AccountDialogAction,
 	AccountDialogContent,
 } from "../components/dialogs/account-dialog";
-import {
-	OAuthLoginContent,
-	type OAuthLoginResult,
-} from "../components/dialogs/provider-picker";
+import { OAuthLoginContent } from "../components/dialogs/provider-picker";
 import type { OpenModelSelectorOptions } from "./use-model-selector";
 
 export function useAccountDialog(opts: {
@@ -63,14 +60,14 @@ export function useAccountDialog(opts: {
 			return;
 		}
 		if (action === "login") {
-			const saved = await dialog.choice<OAuthLoginResult>({
+			const saved = await dialog.choice<boolean>({
 				style: { maxHeight: termHeight - 2 },
 				closeOnEscape: false,
-				content: (ctx: ChoiceContext<OAuthLoginResult>) => (
+				content: (ctx: ChoiceContext<boolean>) => (
 					<OAuthLoginContent {...ctx} providerId="cline" providerName="Cline" />
 				),
 			});
-			if (saved === true) {
+			if (saved) {
 				await onAccountChange?.();
 				await openAccountDialog();
 				return;

apps/cli/src/tui/hooks/use-agent-events.ts

@@ -1,19 +1,17 @@
 import type { AgentEvent, TeamEvent } from "@cline/core";
-import { formatDisplayUserInput } from "@cline/shared";
 import { useCallback, useRef } from "react";
 import type {
 	PendingPromptSnapshot,
 	PendingPromptSubmittedEvent,
 } from "../../runtime/session-events";
 import { formatCliErrorMessage } from "../../utils/cline-pass-errors";
-import { resolveNonCompactionStatusLabel } from "../../utils/events";
+import { resolveStatusNoticeLabel } from "../../utils/events";
 import {
 	formatToolInput,
 	formatToolOutput,
 	truncate,
 } from "../../utils/helpers";
 import type { ChatEntry, InlineStream, TuiProps } from "../types";
-import { parseCompactionNoticeMetadata } from "../utils/compaction-status";
 
 interface AgentEventDeps {
 	appendEntry: (entry: ChatEntry) => void;
@@ -33,7 +31,6 @@ interface AgentEventDeps {
 }
 
 export function useAgentEventHandlers(deps: AgentEventDeps) {
-	const openCompactionEntryRef = useRef(false);
 	const {
 		appendEntry,
 		updateLastEntry,
@@ -47,47 +44,6 @@ export function useAgentEventHandlers(deps: AgentEventDeps) {
 		verbose,
 	} = deps;
 
-	// Compaction dividers that arrived while an assistant message was still
-	// streaming. Appending them immediately would split the message in two, so
-	// they are held until the active content block closes (or the turn ends).
-	const pendingCompactionEntriesRef = useRef<
-		Extract<ChatEntry, { kind: "compaction" }>[]
-	>([]);
-
-	const flushPendingCompactionEntries = useCallback(() => {
-		const pending = pendingCompactionEntriesRef.current;
-		if (pending.length === 0) return;
-		pendingCompactionEntriesRef.current = [];
-		for (const entry of pending) {
-			if (entry.status !== "started" && openCompactionEntryRef.current) {
-				updateEntry((current) =>
-					current.kind === "compaction" && current.status === "started"
-						? { ...current, ...entry }
-						: current,
-				);
-				openCompactionEntryRef.current = false;
-			} else {
-				appendEntry(entry);
-				if (entry.status === "started") {
-					openCompactionEntryRef.current = true;
-				}
-			}
-		}
-	}, [appendEntry, updateEntry]);
-
-	const finalizeDanglingCompactionEntry = useCallback(
-		(status: "failed" | "cancelled") => {
-			if (!openCompactionEntryRef.current) return;
-			openCompactionEntryRef.current = false;
-			updateEntry((entry) =>
-				entry.kind === "compaction" && entry.status === "started"
-					? { ...entry, status }
-					: entry,
-			);
-		},
-		[updateEntry],
-	);
-
 	const closeToolEntry = useCallback(
 		(event: AgentEvent & { type: "content_end" }) => {
 			const error = event.error ?? undefined;
@@ -127,11 +83,9 @@ export function useAgentEventHandlers(deps: AgentEventDeps) {
 					setIsRunning(true);
 					setIsStreaming(true);
 					closeInlineStream();
-					flushPendingCompactionEntries();
 					break;
 				case "iteration_end":
 					closeInlineStream();
-					flushPendingCompactionEntries();
 					break;
 				case "content_start": {
 					setIsStreaming(false);
@@ -210,15 +164,11 @@ export function useAgentEventHandlers(deps: AgentEventDeps) {
 					setIsRunning(false);
 					setIsStreaming(false);
 					closeInlineStream();
-					flushPendingCompactionEntries();
-					finalizeDanglingCompactionEntry("cancelled");
 					break;
 				case "error":
 					setIsRunning(false);
 					setIsStreaming(false);
 					closeInlineStream();
-					flushPendingCompactionEntries();
-					finalizeDanglingCompactionEntry("failed");
 					turnErrorReportedRef.current = true;
 					onTurnErrorReported(true);
 					if (!event.recoverable || verbose) {
@@ -230,40 +180,8 @@ export function useAgentEventHandlers(deps: AgentEventDeps) {
 					break;
 				case "notice":
 					if (event.displayRole === "status") {
-						const compaction = parseCompactionNoticeMetadata(event.metadata);
-						if (!compaction) {
-							closeInlineStream();
-						}
-						if (compaction) {
-							if (activeInlineStreamRef.current) {
-								// An assistant message is still streaming; appending now
-								// would split it around the divider. Hold the divider (final
-								// state until the content block closes, then reconcile it
-								// with the same open divider atomically.
-								pendingCompactionEntriesRef.current.push({
-									kind: "compaction",
-									...compaction,
-								});
-								break;
-							}
-							if (compaction.status === "started") {
-								appendEntry({ kind: "compaction", ...compaction });
-								openCompactionEntryRef.current = true;
-							} else if (openCompactionEntryRef.current) {
-								// Finalize the in-progress divider in place, wherever it
-								// sits in the transcript.
-								updateEntry((entry) =>
-									entry.kind === "compaction" && entry.status === "started"
-										? { ...entry, ...compaction }
-										: entry,
-								);
-								openCompactionEntryRef.current = false;
-							} else {
-								appendEntry({ kind: "compaction", ...compaction });
-							}
-							break;
-						}
-						const label = resolveNonCompactionStatusLabel(event);
+						closeInlineStream();
+						const label = resolveStatusNoticeLabel(event);
 						if (label) {
 							appendEntry({ kind: "status", text: label });
 						}
@@ -281,7 +199,6 @@ export function useAgentEventHandlers(deps: AgentEventDeps) {
 		[
 			appendEntry,
 			updateLastEntry,
-			updateEntry,
 			closeInlineStream,
 			activeInlineStreamRef,
 			setIsRunning,
@@ -290,8 +207,6 @@ export function useAgentEventHandlers(deps: AgentEventDeps) {
 			onTurnErrorReported,
 			verbose,
 			closeToolEntry,
-			finalizeDanglingCompactionEntry,
-			flushPendingCompactionEntries,
 		],
 	);
 
@@ -381,13 +296,7 @@ export function useAgentEventHandlers(deps: AgentEventDeps) {
 	const handlePendingPromptSubmitted = useCallback(
 		(event: PendingPromptSubmittedEvent) => {
 			knownPendingPromptIdsRef.current.delete(event.id);
-			// Display boundary: formatDisplayUserInput strips runtime-generated
-			// notice elements (e.g. mode_notice) that normalizeUserInput must
-			// preserve, since the latter also sanitizes model-bound prompts.
-			appendEntry({
-				kind: "user_submitted",
-				text: formatDisplayUserInput(event.prompt),
-			});
+			appendEntry({ kind: "user_submitted", text: event.prompt });
 		},
 		[appendEntry],
 	);

apps/cli/src/tui/hooks/use-local-command-actions.test.ts

@@ -9,7 +9,6 @@ function makeActions(
 	overrides: Partial<Omit<LocalSlashCommandActionInput, "name">> = {},
 ): Omit<LocalSlashCommandActionInput, "name"> {
 	return {
-		isRunning: false,
 		openAccount: vi.fn(),
 		openConfig: vi.fn(),
 		openMcpManager: vi.fn(async () => false),
@@ -59,32 +58,6 @@ describe("runLocalSlashCommandAction", () => {
 		expect(openConfig).toHaveBeenCalledWith({ initialTab: "plugins" });
 	});
 
-	it("does not start compaction while a turn is running", () => {
-		const runCompact = vi.fn();
-		const actions = makeActions({ isRunning: true, runCompact });
-
-		const handled = runLocalSlashCommandAction({
-			name: "compact",
-			...actions,
-		});
-
-		expect(handled).toBe(true);
-		expect(runCompact).not.toHaveBeenCalled();
-	});
-
-	it("starts compaction while the session is idle", () => {
-		const runCompact = vi.fn();
-		const actions = makeActions({ runCompact });
-
-		const handled = runLocalSlashCommandAction({
-			name: "compact",
-			...actions,
-		});
-
-		expect(handled).toBe(true);
-		expect(runCompact).toHaveBeenCalledOnce();
-	});
-
 	it("waits for clear to reset the runtime session", async () => {
 		let resolveClear: (() => void) | undefined;
 		const clearConversation = vi.fn(
@@ -188,7 +161,7 @@ describe("formatCompactionStatus", () => {
 				messagesAfter: 300,
 				compacted: true,
 			}),
-		).toBe("Compacted context; message count stayed at 300 messages.");
+		).toBe("Compacted context; message count stayed at 300.");
 	});
 
 	it("reports empty sessions separately", () => {