fix(vscode): preserve slashy VS Code LM selectors

build(vscode): depend on the @cline/* nightly with the registered-handler change
Point @cline/{shared,llms,agents,core} at 0.0.42-nightly.1780514867, the first published SDK build that includes the custom-registered-handler routing the vscode-lm provider needs. Replaces the temporary local-workspace vendoring.
2026-09-12 00:50:27 +08:00 · 2026-06-03 12:52:06 -07:00 · 2026-06-03 12:46:44 -07:00 · 2026-06-03 12:46:44 -07:00 · 2026-06-03 11:20:00 -07:00 · 2026-06-03 10:52:05 -07:00
1926 changed files with 121307 additions and 274496 deletions
@@ -1 +0,0 @@
-../../.cline/skills/publish-desktop
@@ -1 +0,0 @@
-../../.cline/skills/publish-extension
@@ -1 +0,0 @@
-../../.cline/skills/tuistory
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-Remove the non-functional "Use compact prompt" toggle from LM Studio provider settings
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-fix: restore workflow support regressions — expand `/workflow.md` slash commands (the legacy filename spelling the autocomplete inserts) and mid-message commands, honor workflow enable/disable toggles during expansion, refresh the slash menu's workflow list on webview launch, and bring back the Workflows management tab in the rules modal (now last in the tab list, with a deprecation notice pointing to Skills)
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-Fix hidden plan/act mode-switch and task-resumption prompts reappearing as user messages when a task is reopened from history
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-fix: strip trailing slashes from the OpenAI Compatible base URL when fetching the model list, so `/models` is queried correctly and the model dropdown populates
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-fix: center-align the sign-in verification code box shown after clicking "Sign in to Cline"
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-Enable Auto Compact by default so long chats automatically compress conversation history instead of failing at the model context limit. It can be disabled in Settings → Features → "Auto Compact".
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-Fix /compact UX: clear the chat input as soon as the command is submitted, wrap the compaction divider row at narrow sidebar widths, and update the context-window header even when compacting a small conversation grows the estimated context
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-Disable feature tips by default; they can be enabled in Settings → Features → "Feature Tips"
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-Show the edited file in a regular editor tab after the diff preview closes, restoring the legacy post-edit behavior
@@ -1,5 +0,0 @@
---
-"claude-dev": patch
---
-
-Show the user's message in chat immediately when sending to a task opened from history, instead of only a thinking indicator until the session resume finishes
@@ -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!"
@@ -1 +0,0 @@
-../../.cline/skills/publish-desktop
@@ -1 +0,0 @@
-../../.cline/skills/publish-extension
@@ -1 +0,0 @@
-../../.cline/skills/tuistory
@@ -1,127 +0,0 @@
---
-name: publish-desktop
-description: Use when preparing, tagging, and publishing a Cline Code desktop app (apps/examples/desktop-app) release. Guides changelog drafting, version bumps in package.json + tauri.conf.json, desktop-vX.Y.Z tags, and the desktop-publish GitHub workflow that builds, signs, notarizes, and updates the auto-update feed.
---
-
-# Desktop App Release
-
-Use this skill when the user asks to release the desktop app, publish Cline Code, bump the desktop version, create a `desktop-vX.Y.Z` tag, or trigger the desktop publish workflow.
-
-> Working directory: run every command below from the repository root.
-
-Desktop releases are macOS-only today (signed + notarized DMG for Apple Silicon and Intel) and are built entirely in GitHub Actions — there is no local publish path. Installed apps discover new releases automatically through the Tauri updater, so publishing a release is what ships the update to every existing user.
-
-## Release contract
-
- Version sources (must match each other and the tag): `apps/examples/desktop-app/package.json` and `apps/examples/desktop-app/src-tauri/tauri.conf.json`. (`src-tauri/Cargo.toml` has its own version but `tauri.conf.json` overrides it; no need to touch it.)
- Release tag: `desktop-vX.Y.Z`, where `X.Y.Z` matches both version files.
- Release prep includes approved release notes, the version bumps, and an `apps/examples/desktop-app/CHANGELOG.md` update.
- Publish path: `.github/workflows/desktop-publish.yml` (workflow_dispatch, requires the tag to exist, point at the checked-out commit, and be reachable from `origin/main`).
- The workflow creates the `desktop-vX.Y.Z` GitHub release (DMGs + updater artifacts + `latest.json`) and refreshes the rolling `desktop-latest` release, which is the static auto-update feed every installed app polls. Never delete the `desktop-latest` release or tag.
- The changelog's top `## X.Y.Z` section is extracted verbatim into the GitHub release body, the Slack announcement, and the updater manifest notes.
- Always ask before pushing commits or tags.
-
-## Workflow
-
-1. Gather context.
-
-```sh
-git status --short --branch
-git fetch origin --tags
-git tag --list 'desktop-v*' --sort=-v:refname | head -10
-node -p "require('./apps/examples/desktop-app/package.json').version"
-node -p "require('./apps/examples/desktop-app/src-tauri/tauri.conf.json').version"
-```
-
-If there is no `desktop-v*` tag yet, this is the first release; use the desktop app's first commit as the baseline and say the baseline is inferred.
-
-2. Collect release commits.
-
-```sh
-git log <last-desktop-tag>..HEAD --oneline --no-merges -- apps/examples/desktop-app sdk/packages .github/workflows/desktop-publish.yml
-```
-
-The sidecar bundles `@cline/core` and friends from the monorepo, so SDK changes ship inside the desktop app too. Fold user-visible SDK changes (providers, models, behavior fixes) into the notes; skip purely internal ones.
-
-3. Draft user-facing release notes.
-
-Flat bullet list, user-facing language. Present the draft and wait for approval before editing files.
-
-4. Decide the version bump.
-
-Ask whether this is patch, minor, major, or an explicit version. Do not guess if the user has not made it clear.
-
-5. Update release files.
-
- `apps/examples/desktop-app/package.json` → new version
- `apps/examples/desktop-app/src-tauri/tauri.conf.json` → same version
- Prepend `## X.Y.Z` (no date) to `apps/examples/desktop-app/CHANGELOG.md` with the approved notes.
-
-6. Verify before committing.
-
-```sh
-bun -F @cline/code typecheck
-bun test apps/examples/desktop-app/scripts/generate-update-manifest.test.ts
-```
-
-The full desktop bundle can only be built on macOS; the workflow's build job is the real verification. For extra local confidence on a Mac checkout, `bun run package:desktop:mac --allow-unsigned-mac` from the app directory.
-
-7. Commit release changes.
-
-```sh
-git add apps/examples/desktop-app/package.json apps/examples/desktop-app/src-tauri/tauri.conf.json apps/examples/desktop-app/CHANGELOG.md
-git commit -m "chore(desktop): release vX.Y.Z"
-```
-
-Ask before pushing the release commit, then before creating and pushing the tag:
-
-```sh
-git push origin HEAD
-git tag -a desktop-vX.Y.Z -m "Desktop vX.Y.Z"
-git push origin refs/tags/desktop-vX.Y.Z
-```
-
-8. Publish.
-
-The release commit must be on `main` and the tag pushed first.
-
-```sh
-gh workflow run desktop-publish.yml -f git_tag=desktop-vX.Y.Z -f confirm_publish=publish
-gh run list --workflow=desktop-publish.yml --limit=1 --json url,status,conclusion,createdAt --jq '.[0]'
-```
-
-The workflow builds both architectures in parallel (aarch64 native, x86_64 cross-compiled), signs with the Developer ID certificate, notarizes with the App Store Connect API key, signs updater artifacts with the Tauri updater key, creates the GitHub release, refreshes `desktop-latest/latest.json`, and posts to Slack. Notarization typically adds 2–10 minutes.
-
-If the workflow fails on missing credentials, see "Repo secrets (one-time setup)" below.
-
-9. Verify the update feed after the run succeeds.
-
-```sh
-curl -sL https://github.com/cline/cline/releases/download/desktop-latest/latest.json | head -30
-```
-
-The `version` field must be the new release and both `darwin-aarch64` and `darwin-x86_64` URLs must point at the new `desktop-vX.Y.Z` assets. Installed apps pick the update up on next launch or within 2 hours.
-
-10. Final response.
-
-Report: version, tag, changelog updated, commit hash, what was pushed, workflow URL, and the feed verification result.
-
-## Repo secrets (one-time setup)
-
-The workflow needs these repository secrets. The Apple ones come from the same
-Apple Developer account used for manual signing (see the app README's "macOS
-signing & notarization" section for how to obtain them):
-
-| Secret | Value |
-| --- | --- |
-| `APPLE_CERTIFICATE` | Base64 of the **Developer ID Application** identity exported from Keychain Access as `.p12` (must include the private key): `base64 -i certificate.p12 \| pbcopy` |
-| `APPLE_CERTIFICATE_PASSWORD` | The password chosen when exporting the `.p12` |
-| `APPLE_SIGNING_IDENTITY` | `Developer ID Application: <Team Name> (<TEAMID>)` — from `security find-identity -v -p codesigning` |
-| `APPLE_API_KEY` | App Store Connect API **Key ID** (notarization) |
-| `APPLE_API_KEY_CONTENT` | Contents of the `AuthKey_<KEYID>.p8` file |
-| `APPLE_API_ISSUER` | App Store Connect **Issuer ID** (UUID from Users and Access → Integrations) |
-| `TAURI_SIGNING_PRIVATE_KEY` | Contents of the Tauri updater private key (`tauri signer generate`). If this key is ever lost, shipped apps can no longer verify updates — guard it. |
-| `TAURI_SIGNING_PRIVATE_KEY_PASSWORD` | Password for that key |
-
-The Slack + telemetry secrets (`SLACK_RELEASE_BOT_TOKEN`, `TELEMETRY_SERVICE_API_KEY`,
-OTEL settings) are shared with the CLI publish workflow and already configured.
@@ -1,182 +0,0 @@
---
-name: publish-extension
-description: Use when releasing the Cline VS Code extension — stable (currently the combined legacy+next A/B VSIX via ext-vscode-ab-package), nightly (ext-vscode-publish-nightly), or a legacy-branch hotfix (ext-vscode-publish-legacy). Guides version selection, changelog, PostHog rollout-flag coordination, workflow dispatch, environment approvals, tagging, and post-publish verification, plus the eventual cutover to publishing the SDK extension standalone.
---
-
-# VS Code Extension Release
-
-Use this skill when the user asks to release, publish, or ship the VS Code extension — stable, nightly, or a legacy hotfix — or to dial the rollout, or to cut over to the SDK extension permanently.
-
-> Working directory: repo root. All workflows are dispatched from `main` (GitHub requires the workflow file on the default branch; each workflow checks out the refs it actually builds).
-
-## The current era: combined A/B rollout
-
-We are mid-migration from the legacy (npm, pre-SDK) extension to the next (SDK-based, bun) extension. Until the cutover is complete, **the stable and nightly listings ship a combined VSIX**: a small loader + two complete extensions (`next/` built from `main`, `legacy/` built from the `legacy-extension` branch). The loader picks one per window based on the PostHog flag `ext-sdk-bundle-rollout`. Deep-dive docs: `apps/vscode-rollout/README.md` (authoritative) and PR #12253 (design + runbook comments).
-
-Endgame (see "Cutover" at the bottom): once the next bundle is trusted at 100%, stable goes back to a plain build of `main` via `ext-vscode-publish-stable.yml` and all the legacy/rollout machinery is retired.
-
-### The listings and the workflows
-
-| Channel | Marketplace ID | Workflow | Trigger | Version |
-|---|---|---|---|---|
-| Stable (combined) | `saoudrizwan.claude-dev` | `ext-vscode-ab-package.yml` | dispatch only; `publish` input defaults false | manual input (semver, e.g. `4.1.0`) |
-| Nightly (combined) | `saoudrizwan.cline-nightly` | `ext-vscode-publish-nightly.yml` | cron 12:00 UTC + dispatch | auto `<major>.<minor>.<unix-ts>` from main's `apps/vscode/package.json` |
-| Legacy hotfix (standalone) | `saoudrizwan.claude-dev` | `ext-vscode-publish-legacy.yml` | dispatch | from `apps/vscode/package.json` on `legacy-extension` |
-| Stable standalone (post-cutover) | `saoudrizwan.claude-dev` | `ext-vscode-publish-stable.yml` | dispatch | from `apps/vscode/package.json` on `main` |
-
-All three publish paths gate on tests before publishing: nightly and ab-package run the reusable bun suite (`ext-vscode-test.yml`, tests `main`) — ab-package additionally runs the legacy branch's npm suite — and the legacy workflow inlines the npm suite. Environment gates: stable paths use `publish` → `Publish` environment (required reviewers approve in the Actions UI); nightly uses `PublishNightly` (branch policy only, no reviewers — a reviewer requirement would block the cron).
-
-## Golden rules (read before any release)
-
-1. **One listing, one version line.** `claude-dev` is published from multiple workflows/branches. Every stable publish must use a version **strictly above the highest version ever published to the listing from any branch** — marketplace versions are monotonic and cannot be unpublished (supersede, never delete). Check what's live first:
-
-   ```bash
-   curl -s -X POST "https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery" \
-     -H "Content-Type: application/json" -H "Accept: application/json;api-version=3.0-preview.1" \
-     -d '{"filters":[{"criteria":[{"filterType":7,"value":"saoudrizwan.claude-dev"}]}],"flags":16}' \
-     | python3 -c "import json,sys; v=json.load(sys.stdin)['results'][0]['extensions'][0]['versions'][0]; print(v['version'], v['lastUpdated'])"
-   ```
-
-   `ext-vscode-ab-package` also enforces this automatically for `publish=true` runs: a preflight job validates the version format (plain `X.Y.Z`) and hard-fails unless it exceeds the live Marketplace version, and the publish job re-checks right before publishing (the approval wait can last days — a legacy hotfix landing in between is caught). Still run the query yourself when *choosing* the version.
-
-2. **Check the flag BEFORE any stable combined publish.** `ext-sdk-bundle-rollout` is **shared between nightly and stable** — the loader sends only a machine id to `/decide`, no channel property, so there is no per-channel targeting. If the flag is high (nightly dogfooding) and you publish stable, stable users get the next bundle at that same percentage. Verify the effective percentage empirically (no PostHog admin needed — sample `/decide` with random ids using the key inlined in any shipped loader):
-
-   ```bash
-   node -e '
-   const KEY = process.argv[1]; // phc_... extracted from a shipped VSIX loader
-   (async () => {
-     let t = 0, n = 200;
-     for (let i = 0; i < n; i += 20) {
-       const rs = await Promise.all(Array.from({length: 20}, (_, j) =>
-         fetch("https://data.cline.bot/decide?v=3", { method: "POST",
-           headers: {"Content-Type": "application/json"},
-           body: JSON.stringify({api_key: KEY, distinct_id: `probe-${i+j}-${Math.random()}`})
-         }).then(r => r.json())));
-       for (const r of rs) if ((r.featureFlags||{})["ext-sdk-bundle-rollout"] === true) t++;
-     }
-     console.log(`~${(100*t/n).toFixed(1)}% (${t}/${n})`);
-   })()' "$KEY"
-   ```
-
-   Flag changes are made in the PostHog UI (Cline project). **0% is the kill switch** — the flag is two-way; there is no separate killswitch flag. Dialing down demotes machines back to legacy on their next window reload.
-
-3. **Ask before pushing** commits or tags. Environment approvals are the maintainer's to give.
-
-4. **Changelog lives at the repo ROOT** (`CHANGELOG.md`), on the branch being released — not `apps/vscode/CHANGELOG.md` (doesn't exist). The legacy and stable workflows hard-fail unless the first heading is exactly `## [<version>]`.
-
-5. **Stuck concurrency groups**: `ext-vscode-ab-package` groups on the version with `cancel-in-progress: false`. Only `publish=true` runs wait on environment approval (build-only rehearsals run ungated to completion), but a publish run left `waiting` still blocks every later dispatch of the same version — cancel it (`gh run cancel <id>`) before re-dispatching.
-
-## Stable release (combined A/B VSIX) — the current stable path
-
-### Pre-flight
-
-```bash
-# 1. What's live, and what version comes next (must exceed it — rule 1)
-# 2. Flag percentage (rule 2) — decide where it should be for this release
-# 3. Legacy tip = what the non-promoted cohort will run; confirm it's the shipped hotfix line
-git fetch origin main legacy-extension
-git log --oneline -3 origin/legacy-extension
-
-# 4. Cheap local rehearsal of the most likely build failure: the union manifest
-#    hard-fails if views/viewsContainers/configuration diverged between branches.
-git show origin/main:apps/vscode/package.json > /tmp/next.json
-git show origin/legacy-extension:apps/vscode/package.json > /tmp/legacy.json
-node apps/vscode-rollout/scripts/gen-manifest.mjs --next /tmp/next.json --legacy /tmp/legacy.json --version <VERSION>
-# Expected warnings only: engines union (takes newer) + walkthrough copy drift.
-```
-
-Release prep on `main` (PR, not direct push):
- Add `## [<VERSION>]` entry at the top of root `CHANGELOG.md`.
- Bump `apps/vscode/package.json` to `<VERSION>` so the repo reflects the published line. Side effect: nightly versions become `<major>.<minor>.<unix-ts>` of the new base — harmless (separate listing, still monotonic).
-
-### Dispatch
-
-```bash
-gh workflow run ext-vscode-ab-package.yml --ref main \
-  -f version=<VERSION> -f next-ref=main -f legacy-ref=legacy-extension -f publish=true
-# publish=false builds an installable .vsix artifact without publishing and
-# needs NO environment approval — the ungated build job uploads the artifact
-# and the run completes.
-gh run list --workflow=ext-vscode-ab-package.yml --limit 1
-```
-
-Preflight (version format + monotonicity) and both test suites run first, then the ungated `build` job packages and uploads the VSIX; for `publish=true` the `publish` job then **waits for `Publish` environment approval** (Actions → run → "Review deployments"). Both bundles build the exact revisions their test gates ran against (branch names are resolved once — commits landing on either branch mid-run or during the approval wait are not picked up); `publish=true` is additionally refused for any `next-ref` other than `main` (the bun gate only tests main — non-main next-refs are for build-only artifact rehearsals). Check what a run is waiting on:
-
-```bash
-gh api repos/cline/cline/actions/runs/<run-id>/pending_deployments
-```
-
-### Post-publish
-
-1. Verify the marketplace serves the new version (query from rule 1) — expect minutes-to-an-hour of validation lag after "Published" appears in the logs. Also verify Open VSX:
-
-   ```bash
-   curl -s "https://open-vsx.org/api/saoudrizwan/claude-dev" | python3 -c "import json,sys; d=json.load(sys.stdin); print(d['version'], d['timestamp'])"
-   ```
-2. Tag, GitHub Release (with the .vsix attached), and the Slack release-bot post happen **automatically** after a real publish (all `continue-on-error` — the publish itself already succeeded, so bookkeeping failures leave the run green). Verify they landed; the known failure is the tag push when the built commit touches `.github/workflows/**` (default token cannot create such refs — no grantable permission fixes it). Manual fallback:
-
-   ```bash
-   git tag v<VERSION> <main-sha-built>   # ask before pushing
-   git push origin v<VERSION>
-   gh release create v<VERSION> --title "v<VERSION>" --notes "<changelog section>" <path-to.vsix>
-   ```
-
-   A real publish also **hard-fails early** if root `CHANGELOG.md` on the built main revision doesn't start with `## [<VERSION>]` — the release prep PR must be merged before dispatching.
-
-3. Thorough artifact check (`gh run download <run-id>`): union `package.json` is `saoudrizwan.claude-dev@<VERSION>`, `next/package.json` and `legacy/package.json` carry the SAME version, `grep -c 'phc_' extension/extension.js` ≥ 1 (loader key inlined), no leftover `process.env.TELEMETRY_SERVICE_API_KEY` / `process.env.CLINE_ROLLOUT_VARIANT` literals in either bundle's dist (leftovers = a build ran without its env and telemetry is silently dead).
-4. Monitor: `extension.rollout.bundle_activated` in `otel.otel_logs` filtered to `extension_version = '<VERSION>'` (stable cohort is cleanly separable — nightly versions are timestamps). Watch the next/legacy ratio and the crash-fallback rate; Metabase dashboards 17 (rollout + task error rate) and 19 (error deep dive). `extension.rollout.loader_decision` (incl. `double_failure`) is PostHog-only, not in ClickHouse.
-5. Dial the flag per the rollout plan (e.g. 0% at publish → 1% → up), verifying each change with the probe from rule 2. Announce demotions ahead of time — dialing down also demotes nightly dogfooders unless they set `"cline-nightly.rollout.bundleOverride": "next"`.
-
-### Known caveats of this path
-
- **`engines.vscode` unions upward** (main's floor wins, e.g. `^1.101.0` vs legacy's `^1.84.0`): users on older VS Code are never offered the combined VSIX. Fail-safe during rollout; must be resolved before 100%.
- A red run can still mean a successful publish on paths that tag (see Gotchas).
-
-## Nightly release
-
-Happens automatically (cron 12:00 UTC). Manual cut:
-
-```bash
-gh workflow run ext-vscode-publish-nightly.yml --ref main                 # real publish
-gh workflow run ext-vscode-publish-nightly.yml --ref main -f dry-run=true # artifact only
-gh run watch <run-id> --exit-status --interval 60
-```
-
-No changelog/version prep — the version is computed. Verify with the marketplace query against `saoudrizwan.cline-nightly`.
-
-**Red run ≠ failed publish**: the final tag-push step fails whenever main's HEAD touches `.github/workflows/**` (default token cannot create such refs). If "Published" appears in the logs, the release went out; push the `nightly-main-<UTC ts>-<sha12>` tag manually with user credentials.
-
-## Legacy hotfix release (and emergency full rollback)
-
-For shipping a fix on the `legacy-extension` branch — or as the **structural rollback** from a bad combined stable VSIX: a standalone legacy publish at a higher version supersedes the combined VSIX entirely (loader and all) for every user. (For "next bundle misbehaving" you don't need this — dial the flag to 0% instead.)
-
-```bash
-# On legacy-extension: commit the fix, bump apps/vscode/package.json ABOVE the
-# highest version ever published to the listing (rule 1 — including combined
-# versions, e.g. combined 4.1.0 live -> hotfix is 4.1.1, not 4.0.13),
-# add the matching `## [x.y.z]` entry to root CHANGELOG.md, push.
-gh workflow run ext-vscode-publish-legacy.yml --ref main \
-  -f release-type=release -f branch=legacy-extension
-```
-
-npm test suite runs ungated; the publish job waits on the `Publish` environment. This workflow derives + pushes the `v<version>` tag itself and creates the GitHub release — no manual tagging. Publishes to Marketplace **and** Open VSX. The branch is the npm codebase: use `npm`, never `bun`, and expect the old monolith layout (`apps/vscode/src/core/...`).
-
-## Cutover: retiring the A/B machinery (the endgame)
-
-When the next bundle has held at 100% long enough to trust:
-
-1. **Resolve the engines floor**: decide whether stranding VS Code < main's `engines.vscode` on the last combined version is acceptable, or lower main's floor first.
-2. Bump `apps/vscode/package.json` on `main` above everything ever published; root `CHANGELOG.md` entry to match (both are enforced by the workflow).
-3. Ship standalone from main: `gh workflow run ext-vscode-publish-stable.yml --ref main` — tests main, tags `v<version>` itself, creates the GitHub release, publishes Marketplace + Open VSX.
-4. Watch the same rollout telemetry through the transition — `extension_variant` disappears from events as users leave combined builds, which is itself the adoption signal.
-5. Only after the standalone version dominates: retire `legacy-extension` (keep for history), delete `ext-vscode-publish-legacy.yml` and `ext-vscode-ab-package.yml`, convert the nightly workflow back to a plain build of main, remove `apps/vscode-rollout/`, and archive the `ext-sdk-bundle-rollout` flag in PostHog (harmless to machines still on a combined VSIX: absent flag fails safe to... nothing changing until they update, but their loader treats a deleted flag as legacy — leave the flag at 100% until combined-VSIX activations flatline, then archive).
-6. Update this skill: delete the combined-era sections and keep the standalone flow.
-
-## Gotchas index
-
- `inputs.*` are empty strings on `schedule` events — preserve `|| 'default'` fallbacks when editing the nightly workflow.
- `bun run package` in `apps/vscode` does not build `@cline/*` workspace deps — fresh checkouts need `bun run build:sdk` first (workflows handle this).
- Job-level `if:` ref checks in workflow YAML are advisory (a dispatched branch runs its own copy of the file); the enforced boundary is each environment's deployment-branch policy in repo settings.
- Marketplace PATs (`VSCE_PAT`/`OVSX_PAT`) are only mounted into publish steps; neither publish workflow has an untrusted trigger surface.
- Environment-approval runs left waiting don't time out quickly — they sit for days and (for ab-package publish runs) block their version's concurrency group.
- Local forcing for manual testing: `CLINE_BUNDLE_OVERRIDE=next|legacy` env (launch VS Code fresh from a terminal) or the `<prefix>.rollout.bundleOverride` setting + reload; both report as `override` in telemetry so they don't pollute cohort data.
@@ -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.
@@ -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."
@@ -1,107 +0,0 @@
---
-name: tuistory
-description: |
-  Drive and test terminal apps (especially the Cline CLI TUI in apps/cli) through tuistory — named background PTY sessions that agents can read, wait on, snapshot, screenshot, and type into. Like Playwright/tmux for terminals, with reactive waiting instead of blind `sleep`.
-
-  Use this skill when you need to:
-  - Manually test or reproduce bugs in the interactive Cline TUI (`bun run cli -i`) from a headless environment
-  - Run a dev server or any long-lived/interactive process in the background without hanging your tool call
-  - Write or extend Playwright-style e2e tests for the TUI (`bun run test:e2e:tuistory` in apps/cli)
-  - Capture text snapshots or styled PNG screenshots of a TUI screen as evidence
---
-
-# tuistory
-
-[tuistory](https://github.com/remorses/tuistory) wraps any terminal command in a named background PTY session backed by a Ghostty terminal emulator. Agents interact with the session via short CLI calls that return instantly; humans can `tuistory attach` to the same session to watch or intervene. No real terminal or display (`DISPLAY`) is needed — it works fully headless, which makes it the preferred way for cloud agents to exercise the Cline TUI.
-
-It is installed as a devDependency of `@cline/cli`, so the pinned binary resolves when you run from `apps/cli`:
-
-```bash
-cd apps/cli
-bunx tuistory --help   # source of truth for commands, options, and syntax
-```
-
-For full upstream docs: `curl -s https://raw.githubusercontent.com/remorses/tuistory/refs/heads/main/README.md`
-
-## Driving the Cline TUI headlessly
-
-Launch the TUI in an isolated environment so you don't touch real user config (`~/.cline`):
-
-```bash
-cd apps/cli
-DATA_DIR=$(mktemp -d) && HOME_DIR=$(mktemp -d)
-bunx tuistory -s cline --cols 120 --rows 36 \
-  --env HOME=$HOME_DIR --env CLINE_DATA_DIR=$DATA_DIR \
-  --env CLINE_DISABLE_CLINE_PASS_NOTICE=1 --env CLINE_TELEMETRY_DISABLED=1 \
-  -- bun src/index.ts --provider anthropic -m claude-sonnet-4-6 -k test-key
-```
-
-The dummy `-k test-key` renders the full chat UI; only an actual agent turn would fail. For recorded LLM turns, use the VCR cassettes described in `apps/cli/src/tests/helpers/env.ts` (`CLINE_VCR=playback` + `CLINE_VCR_CASSETTE`). Real turns need a provider credential (e.g. `ANTHROPIC_API_KEY`, `CLINE_API_KEY`).
-
-Then use an **observe → act → observe** loop:
-
-```bash
-# Wait reactively for the chat view — never use sleep
-bunx tuistory -s cline wait "What can I do for you?" --timeout 30000
-
-# Act, then always observe the resulting screen state
-bunx tuistory -s cline type "/settings"
-bunx tuistory -s cline snapshot --trim
-bunx tuistory -s cline press enter
-bunx tuistory -s cline snapshot --trim
-
-# Styled PNG of the current screen (prints the file path) — good for artifacts
-bunx tuistory -s cline screenshot
-
-# Full raw output stream (snapshot shows only the visible screen)
-bunx tuistory read -s cline --all
-
-# Tear down a session YOU started (double Ctrl+C exits the TUI cleanly)
-bunx tuistory -s cline press ctrl c
-bunx tuistory -s cline press ctrl c
-bunx tuistory -s cline close
-```
-
-## Background processes (instead of tmux)
-
-```bash
-bunx tuistory -s my-server -- bun run dev:sidecar   # returns immediately
-bunx tuistory -s my-server wait "/listening|ready/i" --timeout 30000
-bunx tuistory read -s my-server                     # new output since last read
-bunx tuistory -s my-server restart                  # after code changes
-```
-
-## Key rules
-
- **Options before `--`, command after.** Everything after the first `--` is passed verbatim to the child: `tuistory -s name --cols 150 -- bun src/index.ts` is correct.
- **Snapshot after every action.** TUIs are stateful; dialogs and errors can render over the view you expect. `snapshot` reflects what the user actually sees (occluded text does not count), unlike grepping the raw stream.
- **Wait, never sleep.** `wait "text"` / `wait "/regex/i"` (case-sensitive by default) reacts as fast as the terminal updates; `wait-idle` when you don't know what to expect. Always pass `--timeout`.
- **Keys land instantly.** Unlike sleep-based scripts, a queued second keypress can leak into the next view (e.g. one Enter both accepts a slash completion and submits it).
- **Never close a session you didn't start.** Sessions are shared with humans (`tuistory attach -s name`) and other agents. Default to leaving sessions running; use `read`/`wait`/`snapshot` to inspect without disrupting.
- `--cols`/`--rows` affect TUI layout (assertions are width-sensitive); `--pixel-ratio 2` gives sharper screenshots.
-
-## Writing e2e tests with the library API
-
-`apps/cli/src/cli.tuistory.e2e.test.ts` (run: `bun run test:e2e:tuistory`) is the reference. The programmatic API runs in-process — no daemon:
-
-```ts
-import { launchTerminal } from "tuistory";
-
-const session = await launchTerminal({
-	command: "bun",
-	args: ["src/index.ts", "--provider", "anthropic", "-k", "test-key"],
-	cwd: cliRoot,
-	env: isolatedEnv, // see createCliEnv() in the reference test
-	cols: 120,
-	rows: 36,
-	waitForDataTimeout: 30_000, // CLI cold start compiles a large TS graph
-});
-
-await session.waitForText("What can I do for you?", { timeout: 30_000 });
-const screen = await session.text({ trimEnd: true }); // emulated screen state
-await session.type("/settings");
-await session.press("enter");
-session.close(); // always close in test teardown
-```
-
-Screen-state assertions can check that stale UI is *gone* (`expect(screen).not.toContain(...)`), which stream-grepping harnesses cannot. `session.text({ only: { bold: true } })` filters by style; `session.read()` returns the raw stream since the last read.
@@ -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.
@@ -6,11 +6,10 @@ HTTP-controlled debugger for the VSCode extension at `src/dev/debug-harness/serv

 ```bash
 # Build extension first if needed (protos + esbuild):
-bun run protos && IS_DEV=true bun esbuild.mjs
+npm run protos && IS_DEV=true node 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
+# Launch (skip-build if already built):
+npx tsx src/dev/debug-harness/server.ts --skip-build --auto-launch

 # In another terminal:
 curl localhost:19229/api -d '{"method":"status"}'
@@ -52,7 +51,7 @@ debug-only hook via `ext.evaluate` (with `awaitPromise: true`):
 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`).
+(`npm run dev:mcp-oauth-test-server`).

 ## Navigating Views — Use Commands, Not Clicks

@@ -13,10 +13,8 @@ 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
@@ -74,7 +72,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
@@ -99,10 +97,12 @@ Adding a new key to global state requires updates in multiple places. Missing an

 Required steps:
 1. Type definition in `src/shared/storage/state-keys.ts` - Add to `GlobalState` or `Settings` interface
-2. Add any default value or transform in `src/shared/storage/state-keys.ts` if the key needs one
-3. Read and write the value through `StateManager` (`setGlobalState()` / `getGlobalStateKey()`) after initialization
+2. Read from globalState in `src/core/storage/utils/state-helpers.ts`:
+   - Add `const myKey = context.globalState.get<GlobalStateAndSettings["myKey"]>("myKey")` in `readGlobalStateFromDisk()`
+   - Add to the return object: `myKey: myKey ?? defaultValue,`
+3. StateManager handles read/write via `setGlobalState()`/`getGlobalStateKey()` after initialization

-Persistent state is file-backed through `StateManager`; do not add new runtime reads or writes against VS Code `ExtensionContext` storage. That storage is only a legacy migration source.
+Common mistake: Adding only the return value without the `context.globalState.get()` call. This compiles but the value is always `undefined` on load.

 Settings plumbing gotcha: if a key is user-toggleable from settings, wire both controller update paths:
 - `src/core/controller/state/updateSettings.ts` for webview `updateSetting(...)`
@@ -110,26 +110,28 @@ Settings plumbing gotcha: if a key is user-toggleable from settings, wire both c
 Missing one path causes a toggle to appear to change in one surface while the backend state stays unchanged.

 Webview toggle gotcha: settings changes must also round-trip back in state payloads.
- Add the field to `UpdateSettingsRequest` in `proto/cline/state.proto` (for webview update requests), then run `bun run protos`
+- Add the field to `UpdateSettingsRequest` in `proto/cline/state.proto` (for webview update requests), then run `npm run protos`
 - Include the key in `Controller.getStateToPostToWebview()` (`src/core/controller/index.ts`)
 - Ensure `ExtensionState` and webview defaults include the key (`src/shared/ExtensionMessage.ts`, `webview-ui/src/context/ExtensionStateContext.tsx`)
 If this round-trip wiring is missing, the backend value can update but the toggle in webview appears stuck or reverts.

 ## StateManager Cache vs Direct globalState Access
-StateManager uses an in-memory cache populated during `StateManager.initialize()` from file-backed storage. For most state, use `controller.stateManager.setGlobalState()`/`getGlobalStateKey()`.
+StateManager uses an in-memory cache populated during `StateManager.initialize(context)` in `common.ts`. For most state, use `controller.stateManager.setGlobalState()`/`getGlobalStateKey()`.

-Exception: host migration code may read legacy VS Code storage before file-backed storage is initialized.
+Exception: State needed immediately at extension startup (before cache is ready)

-Example pattern:
+When Window A sets state and immediately opens Window B, the new window's StateManager cache is populated from `context.globalState` during initialization. If you need to read state in Window B right at startup (e.g., in `common.ts` during `initialize()`), read directly from `context.globalState.get()` instead of StateManager's cache.
+
+Example pattern (see `lastShownAnnouncementId` and `worktreeAutoOpenPath`):
 ```typescript
 // Writing (normal pattern)
 controller.stateManager.setGlobalState("myKey", value)

-// Reading after initialization
-const value = controller.stateManager.getGlobalStateKey("myKey")
+// Reading at startup in common.ts (bypass cache)
+const value = context.globalState.get<string>("myKey")
 ```

-Use `context.globalState` only in VS Code migration code that copies legacy ExtensionContext values into the shared file-backed stores.
+This is only needed for cross-window state read during the brief startup window before StateManager cache is fully usable. Normal state access after initialization should use StateManager.

 ## ChatRow Cancelled/Interrupted States
 When a ChatRow displays a loading/in-progress state (spinner), you must handle what happens when the task is cancelled. This is non-obvious because cancellation doesn't update the message content—you have to infer it from context.
@@ -183,7 +185,7 @@ 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
+    npx tsx 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`
@@ -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.

@@ -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)`

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

 ## Build & Test (Critical — non-obvious commands)
- **Build**: `bun run compile` — NOT `bun run build`.
- **Watch**: `bun run watch` (extension + webview).
- **Protos**: `bun run protos` — run **immediately** after any `.proto` change. Generates into `src/shared/proto/`, `src/generated/`.
- **Tests**: `bun run test:unit`. After prompt/tool changes: `UPDATE_SNAPSHOTS=true bun run test:unit`.
+- **Build**: `npm run compile` — NOT `npm run build`.
+- **Watch**: `npm run watch` (extension + webview).
+- **Protos**: `npm run protos` — run **immediately** after any `.proto` change. Generates into `src/shared/proto/`, `src/generated/`.
+- **Tests**: `npm run test:unit`. After prompt/tool changes: `UPDATE_SNAPSHOTS=true npm run test:unit`.

 ## Protobuf RPC Workflow (4 steps)
 1. **Define** in `proto/cline/*.proto`. Naming: `PascalCaseService`, `camelCase` RPCs, `PascalCase` Messages. Use `common.proto` shared types for simple data.
-2. **Generate**: `bun run protos`.
+2. **Generate**: `npm run protos`.
 3. **Backend handler**: `src/core/controller/<domain>/`. 
 4. **Frontend call**: `UiServiceClient.myMethod(Request.create({...}))`.
 - Adding enums (e.g. `ClineSay`) → also update `src/shared/proto-conversions/cline-message.ts`.
@@ -38,13 +38,13 @@ For Responses API providers: add to `isNextGenModelProvider()` in `src/utils/mod
 4. Whitelist in `src/core/prompts/system-prompt/variants/*/config.ts` for each model family.
 5. Handler in `src/core/task/tools/handlers/`, wire in `ToolExecutor.ts`.
 6. If tool has UI: add `ClineSay` enum in proto → `ExtensionMessage.ts` → `cline-message.ts` → `ChatRow.tsx`.
-7. Regenerate snapshots: `UPDATE_SNAPSHOTS=true bun run test:unit`.
+7. Regenerate snapshots: `UPDATE_SNAPSHOTS=true npm run test:unit`.

 ## Modifying System Prompt
 Modular: `components/` (shared) + `variants/` (model-specific) + `templates/` (`{{PLACEHOLDER}}`). Variants override components via `componentOverrides` in `config.ts` or custom `template.ts`. XS variant is heavily condensed inline. Always regenerate snapshots after changes.

 ## Global State Keys (silent failure risk)
-Adding a key requires updating the typed storage definitions in `src/shared/storage/state-keys.ts`; runtime reads and writes should go through `StateManager`, not VS Code `ExtensionContext` storage. Persistent state is file-backed so it works across VS Code, CLI, and JetBrains hosts.
+Adding a key requires: type in `src/shared/storage/state-keys.ts`, read via `context.globalState.get()` in `src/core/storage/utils/state-helpers.ts` `readGlobalStateFromDisk()`, and add to return object. Missing the `.get()` call compiles fine but value is always `undefined`.

 ## Slash Commands (3 places)
 - `src/core/slash-commands/index.ts` — definitions.
@@ -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
@@ -1,310 +0,0 @@
-name: desktop-publish
-
-on:
-  workflow_dispatch:
-    inputs:
-      git_tag:
-        description: "Existing release tag to publish, for example desktop-v0.1.0"
-        required: true
-        type: string
-      confirm_publish:
-        description: 'Type "publish" to confirm the desktop release.'
-        required: true
-        type: string
-
-permissions:
-  contents: read
-
-defaults:
-  run:
-    working-directory: .
-
-jobs:
-  validate:
-    name: Validate release tag
-    if: |
-      github.repository == 'cline/cline' &&
-      github.event.inputs.confirm_publish == 'publish' &&
-      !endsWith(github.actor, '[bot]')
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.version.outputs.version }}
-      tag: ${{ steps.version.outputs.tag }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.git_tag }}
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Validate release tag
-        id: version
-        env:
-          TAG: ${{ github.event.inputs.git_tag }}
-        run: |
-          if ! printf "%s\n" "$TAG" | grep -Eq '^desktop-v[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.-]+)?$'; then
-            echo "git_tag must look like desktop-vX.Y.Z, got: ${TAG}"
-            exit 1
-          fi
-
-          VERSION="${TAG#desktop-v}"
-          PACKAGE_VERSION=$(node -p "require('./apps/examples/desktop-app/package.json').version")
-          TAURI_VERSION=$(node -p "require('./apps/examples/desktop-app/src-tauri/tauri.conf.json').version")
-
-          if [ "$PACKAGE_VERSION" != "$VERSION" ]; then
-            echo "apps/examples/desktop-app/package.json version ${PACKAGE_VERSION} does not match ${TAG}"
-            exit 1
-          fi
-
-          if [ "$TAURI_VERSION" != "$VERSION" ]; then
-            echo "apps/examples/desktop-app/src-tauri/tauri.conf.json version ${TAURI_VERSION} does not match ${TAG}"
-            exit 1
-          fi
-
-          TAG_COMMIT=$(git rev-parse "${TAG}^{commit}")
-          HEAD_COMMIT=$(git rev-parse HEAD)
-          if [ "$TAG_COMMIT" != "$HEAD_COMMIT" ]; then
-            echo "${TAG} does not point at the checked out commit"
-            exit 1
-          fi
-
-          git fetch origin +main:refs/remotes/origin/main
-          if ! git merge-base --is-ancestor "$HEAD_COMMIT" origin/main; then
-            echo "${TAG} is not reachable from origin/main"
-            exit 1
-          fi
-
-          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
-          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-
-  build:
-    name: Build macOS (${{ matrix.arch }})
-    needs: validate
-    runs-on: macos-latest
-    timeout-minutes: 90
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - target: aarch64-apple-darwin
-            arch: aarch64
-          - target: x86_64-apple-darwin
-            arch: x86_64
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ needs.validate.outputs.tag }}
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: "1.3.13"
-
-      - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
-
-      - name: Cache Rust build
-        uses: swatinem/rust-cache@v2
-        with:
-          workspaces: apps/examples/desktop-app/src-tauri
-          key: ${{ matrix.target }}
-
-      - name: Install dependencies
-        run: bun install
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build SDK packages
-        run: bun run build:sdk
-        env:
-          TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
-          ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
-          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 }}
-
-      - name: Write App Store Connect API key
-        env:
-          APPLE_API_KEY_CONTENT: ${{ secrets.APPLE_API_KEY_CONTENT }}
-        run: |
-          if [ -z "$APPLE_API_KEY_CONTENT" ]; then
-            echo "APPLE_API_KEY_CONTENT secret is not configured"
-            exit 1
-          fi
-          printf "%s" "$APPLE_API_KEY_CONTENT" > "$RUNNER_TEMP/AuthKey.p8"
-
-      - name: Build, sign, and notarize desktop bundle
-        working-directory: apps/examples/desktop-app
-        run: bunx tauri build --target ${{ matrix.target }} --config src-tauri/tauri.release.conf.json
-        env:
-          # Developer ID signing (Tauri imports the cert into a temp keychain)
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          # Notarization via App Store Connect API key. Tauri reads the Key ID
-          # from APPLE_API_KEY; APPLE_API_KEY_ID alone silently skips notarization.
-          APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
-          APPLE_API_KEY_PATH: ${{ runner.temp }}/AuthKey.p8
-          APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
-          # Updater artifact signing (minisign keypair, independent of Apple)
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
-
-      - name: Collect artifacts
-        working-directory: apps/examples/desktop-app
-        env:
-          VERSION: ${{ needs.validate.outputs.version }}
-          ARCH: ${{ matrix.arch }}
-          TARGET: ${{ matrix.target }}
-        run: |
-          BUNDLE_DIR="src-tauri/target/${TARGET}/release/bundle"
-          OUT="dist/publish"
-          mkdir -p "$OUT"
-
-          DMG=$(find "$BUNDLE_DIR/dmg" -name '*.dmg' -print -quit)
-          if [ -z "$DMG" ]; then
-            echo "no DMG produced under $BUNDLE_DIR/dmg"
-            exit 1
-          fi
-          cp "$DMG" "$OUT/Cline-Code_${VERSION}_${ARCH}.dmg"
-
-          TARBALL=$(find "$BUNDLE_DIR/macos" -name '*.app.tar.gz' -print -quit)
-          if [ -z "$TARBALL" ] || [ ! -f "${TARBALL}.sig" ]; then
-            echo "updater artifact or signature missing under $BUNDLE_DIR/macos"
-            exit 1
-          fi
-          cp "$TARBALL" "$OUT/Cline-Code_${VERSION}_${ARCH}.app.tar.gz"
-          cp "${TARBALL}.sig" "$OUT/Cline-Code_${VERSION}_${ARCH}.app.tar.gz.sig"
-
-          ls -lh "$OUT"
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: desktop-${{ matrix.arch }}
-          path: apps/examples/desktop-app/dist/publish/*
-          if-no-files-found: error
-
-  release:
-    name: Create GitHub release
-    needs: [validate, build]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ needs.validate.outputs.tag }}
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: "1.3.13"
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: dist/desktop
-          merge-multiple: true
-
-      - name: Get Changelog Entry
-        id: changelog
-        run: |
-          # Grab content between the first "## " header and the next one
-          CONTENT=$(awk '/^## [0-9]/{if(found) exit; found=1; next} found{print}' apps/examples/desktop-app/CHANGELOG.md)
-          echo "content<<EOF" >> $GITHUB_OUTPUT
-          echo "$CONTENT" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-          printf "%s\n" "$CONTENT" > "$RUNNER_TEMP/release-notes.md"
-
-      - name: Generate updater manifest
-        env:
-          VERSION: ${{ needs.validate.outputs.version }}
-          TAG: ${{ needs.validate.outputs.tag }}
-        run: |
-          bun apps/examples/desktop-app/scripts/generate-update-manifest.ts \
-            --version "$VERSION" \
-            --tag "$TAG" \
-            --dir dist/desktop \
-            --out dist/desktop/latest.json \
-            --repo "$GITHUB_REPOSITORY" \
-            --notes-file "$RUNNER_TEMP/release-notes.md"
-          cat dist/desktop/latest.json
-
-      - name: Get Previous Desktop Tag
-        id: prev_tag
-        env:
-          CURRENT_TAG: ${{ needs.validate.outputs.tag }}
-        run: |
-          PREV_TAG=$(git describe --tags --abbrev=0 --match 'desktop-v*' "$CURRENT_TAG^" 2>/dev/null || echo "")
-          echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: ${{ needs.validate.outputs.tag }}
-          name: "Desktop v${{ needs.validate.outputs.version }}"
-          # The repo-wide "latest" release stays owned by CLI releases; the
-          # desktop auto-update feed is the rolling desktop-latest release.
-          make_latest: "false"
-          files: dist/desktop/*
-          body: |
-            ${{ steps.changelog.outputs.content }}
-
-            ${{ steps.prev_tag.outputs.prev_tag != '' && format('**Full Changelog**: https://github.com/{0}/compare/{1}...{2}', github.repository, steps.prev_tag.outputs.prev_tag, needs.validate.outputs.tag) || '' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Update auto-update feed (desktop-latest)
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          if ! gh release view desktop-latest >/dev/null 2>&1; then
-            gh release create desktop-latest \
-              --title "Cline Code desktop (auto-update feed)" \
-              --notes "Rolling release backing the desktop app auto-updater. The latest.json asset points at the newest desktop-vX.Y.Z release. Do not delete." \
-              --latest=false \
-              --target "$(git rev-parse HEAD)"
-          fi
-          gh release upload desktop-latest dist/desktop/latest.json --clobber
-
-      - name: Summary
-        env:
-          VERSION: ${{ needs.validate.outputs.version }}
-          TAG: ${{ needs.validate.outputs.tag }}
-        run: |
-          echo "Published Cline Code desktop v${VERSION}"
-          echo "Release: https://github.com/${GITHUB_REPOSITORY}/releases/tag/${TAG}"
-          echo "Auto-update feed refreshed: https://github.com/${GITHUB_REPOSITORY}/releases/download/desktop-latest/latest.json"
-
-      - 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 Code desktop v${{ needs.validate.outputs.version }}"
-            blocks:
-              - type: "section"
-                text:
-                  type: "mrkdwn"
-                  text: "Cline Code desktop v${{ needs.validate.outputs.version }}"
-              - type: "section"
-                text:
-                  type: "mrkdwn"
-                  text: ${{ toJSON(steps.changelog.outputs.content) }}
-              - type: "context"
-                elements:
-                  - type: "mrkdwn"
-                    text: "<https://github.com/${{ github.repository }}/releases/tag/${{ needs.validate.outputs.tag }}|Download DMG> — installed apps auto-update on next launch${{ steps.prev_tag.outputs.prev_tag != '' && format(' | Full Changelog: https://github.com/{0}/compare/{1}...{2}', github.repository, steps.prev_tag.outputs.prev_tag, needs.validate.outputs.tag) || '' }}"
@@ -1,551 +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.
-#
-# Job layout: cheap input gates (preflight) and the two bundle test suites run
-# ungated; the build job packages the VSIX with no environment attached, so
-# publish=false rehearsals complete without any approval; only the publish job
-# — Marketplace + Open VSX + bookkeeping — waits on the `publish` environment.
-
-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 and Open VSX (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:
-    # Input gates that need no checkout: fail in seconds — before the test
-    # suites, the ~20-minute build, and the environment approval — instead of
-    # at publish time.
-    preflight:
-        name: Validate inputs
-        runs-on: ubuntu-latest
-        steps:
-            # The input reaches the shell ONLY via env here (never inline
-            # expression interpolation, which is evaluated before bash runs and
-            # would allow script injection from the dispatch form). Because
-            # every later job `needs` preflight, passing this regex is what
-            # makes the plain-string `${{ inputs.version }}` interpolations
-            # downstream safe.
-            - name: Validate version format
-              env:
-                  VERSION: ${{ github.event.inputs.version }}
-              run: |
-                  if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-                    echo "Error: version must be plain X.Y.Z with no leading 'v' and no suffix (got '$VERSION')."
-                    echo "It is stamped verbatim into the union manifest and both bundle manifests."
-                    exit 1
-                  fi
-                  echo "Version format ok: $VERSION"
-
-            # The reusable bun suite tests the dispatch revision (main), so
-            # publishing any other next-ref would ship an untested bundle.
-            # Build-only runs (publish=false) may still use arbitrary next-refs
-            # for artifact rehearsals.
-            - name: Refuse to publish an untested next-ref
-              if: ${{ github.event.inputs.publish == 'true' && github.event.inputs.next-ref != 'main' }}
-              run: |
-                  echo "Error: publish=true requires next-ref=main — the test gate only covers main."
-                  exit 1
-
-            # Marketplace versions are monotonic and cannot be unpublished:
-            # every publish must exceed the highest version ever published to
-            # the claude-dev listing FROM ANY BRANCH (combined stable or legacy
-            # hotfix). The publish job re-checks right before publishing — the
-            # environment-approval wait can last days and a legacy hotfix can
-            # land in between. Keep both copies of this check in sync.
-            - name: Verify version exceeds the live Marketplace version
-              if: ${{ github.event.inputs.publish == 'true' }}
-              env:
-                  VERSION: ${{ github.event.inputs.version }}
-              run: |
-                  LIVE=$(curl -sf --retry 3 -X POST "https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery" \
-                    -H "Content-Type: application/json" -H "Accept: application/json;api-version=3.0-preview.1" \
-                    --data '{"filters":[{"criteria":[{"filterType":7,"value":"saoudrizwan.claude-dev"}]}],"flags":16}' \
-                    | node -e 'let d="";process.stdin.on("data",c=>d+=c);process.stdin.on("end",()=>{process.stdout.write(JSON.parse(d).results[0].extensions[0].versions[0].version)})')
-                  if [[ -z "$LIVE" ]]; then
-                    echo "Error: could not resolve the live Marketplace version for saoudrizwan.claude-dev."
-                    exit 1
-                  fi
-                  node -e '
-                    const [next, live] = process.argv.slice(1).map((v) => v.split(".").map(Number));
-                    for (let i = 0; i < 3; i++) {
-                      if (next[i] > live[i]) process.exit(0);
-                      if (next[i] < live[i]) break;
-                    }
-                    console.error(`Error: version ${process.argv[1]} does not exceed the live Marketplace version ${process.argv[2]}.`);
-                    process.exit(1);
-                  ' "$VERSION" "$LIVE"
-                  echo "Version ok: $VERSION exceeds live Marketplace version $LIVE"
-
-    # Gate the build/publish on BOTH bundles' own test suites, mirroring the two
-    # standalone publish paths (nightly gates on the bun suite via the same
-    # reusable workflow; the legacy publish inlines the npm suite).
-    #
-    # Caveat (shared with the nightly workflow): the reusable bun suite tests the
-    # DISPATCH revision — main's tip at dispatch, since this workflow is only
-    # dispatched from main — not `next-ref`. The build job therefore pins the
-    # default next-ref checkout to that same revision (tested == built) and
-    # preflight refuses publish=true for any other next-ref; build-only artifact
-    # runs may still build untested refs.
-    test-next:
-        name: Test next (SDK) bundle
-        permissions:
-            contents: read
-            pull-requests: read
-        uses: ./.github/workflows/ext-vscode-test.yml
-
-    # The legacy branch is the npm codebase, so the bun-based reusable workflow
-    # cannot test it. Inlined npm steps, kept in sync with the `test` job in
-    # ext-vscode-publish-legacy.yml (same suite, different ref input name).
-    test-legacy:
-        name: Test legacy bundle
-        runs-on: ubuntu-latest
-        # The tested revision, exported so the build job builds EXACTLY what
-        # this suite ran against. legacy-ref is a mutable branch name and the
-        # build job starts later — re-resolving the name there could pick up
-        # commits this gate never saw.
-        outputs:
-            tested-sha: ${{ steps.rev.outputs.sha }}
-        defaults:
-            run:
-                working-directory: apps/vscode
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                  ref: ${{ github.event.inputs.legacy-ref }}
-
-            - name: Record tested revision
-              id: rev
-              run: echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-
-            - 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
-
-    build:
-        name: Build combined (legacy + next) VSIX
-        needs: [preflight, test-next, test-legacy]
-        runs-on: ubuntu-latest
-        steps:
-            # For the default next-ref (main), pin the checkout to the exact
-            # revision the test-next gate ran against: a moving branch name could
-            # otherwise drift past the tested commit during the test phase.
-            - name: Checkout next (SDK) source
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ github.event.inputs.next-ref == 'main' && github.sha || github.event.inputs.next-ref }}
-                  path: next-src
-                  lfs: true
-
-            # Fail fast (before the ~20-min build) if a real publish is missing
-            # its changelog entry — same contract the standalone publish
-            # workflows enforce. Build-only rehearsals are exempt.
-            - name: Verify changelog entry
-              if: ${{ github.event.inputs.publish == 'true' }}
-              working-directory: next-src
-              run: |
-                  EXPECTED_HEADING="## [${{ github.event.inputs.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 (found '$FIRST_HEADING')."
-                    exit 1
-                  fi
-                  echo "Found changelog entry for ${{ github.event.inputs.version }}"
-
-            # Pin to the revision test-legacy actually tested (see that job's
-            # outputs comment) — never re-resolve the mutable branch name here.
-            - name: Checkout legacy source
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ needs.test-legacy.outputs.tested-sha }}
-                  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
-
-            # --frozen-lockfile so the built bundle resolves the exact
-            # dependency set the test-next gate ran against (the reusable suite
-            # installs frozen too) — a bare install could silently re-resolve.
-            - name: Install next workspace dependencies
-              working-directory: next-src
-              run: bun install --frozen-lockfile
-
-            # @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
-
-            - 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"
-
-            # 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
-
-    publish:
-        name: Publish to Marketplace and Open VSX
-        needs: build
-        if: ${{ github.event.inputs.publish == 'true' }}
-        runs-on: ubuntu-latest
-        environment: publish
-        # contents: write is required by the post-publish bookkeeping (tag +
-        # GitHub Release), mirroring the standalone publish workflows.
-        permissions:
-            contents: write
-        steps:
-            # The built next revision: preflight refused publish=true for any
-            # next-ref other than main, and the build job pinned main to the
-            # dispatch SHA — so github.sha IS the published commit. Used for the
-            # changelog, the release tag, and the previous-tag lookup.
-            - uses: actions/checkout@v4
-              with:
-                  ref: ${{ github.sha }}
-
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 22
-
-            - name: Download VSIX artifact
-              uses: actions/download-artifact@v4
-              with:
-                  name: claude-dev-${{ github.event.inputs.version }}
-                  path: staging
-
-            - name: Install Publishing Tools
-              run: npm install -g @vscode/vsce ovsx
-
-            # Re-check monotonicity at the last moment: the environment-approval
-            # wait can last days, and a legacy hotfix published in the meantime
-            # would otherwise be silently superseded by this older code line.
-            # Keep in sync with the preflight copy of this check.
-            - name: Re-verify version exceeds the live Marketplace version
-              env:
-                  VERSION: ${{ github.event.inputs.version }}
-              run: |
-                  LIVE=$(curl -sf --retry 3 -X POST "https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery" \
-                    -H "Content-Type: application/json" -H "Accept: application/json;api-version=3.0-preview.1" \
-                    --data '{"filters":[{"criteria":[{"filterType":7,"value":"saoudrizwan.claude-dev"}]}],"flags":16}' \
-                    | node -e 'let d="";process.stdin.on("data",c=>d+=c);process.stdin.on("end",()=>{process.stdout.write(JSON.parse(d).results[0].extensions[0].versions[0].version)})')
-                  if [[ -z "$LIVE" ]]; then
-                    echo "Error: could not resolve the live Marketplace version for saoudrizwan.claude-dev."
-                    exit 1
-                  fi
-                  node -e '
-                    const [next, live] = process.argv.slice(1).map((v) => v.split(".").map(Number));
-                    for (let i = 0; i < 3; i++) {
-                      if (next[i] > live[i]) process.exit(0);
-                      if (next[i] < live[i]) break;
-                    }
-                    console.error(`Error: version ${process.argv[1]} does not exceed the live Marketplace version ${process.argv[2]}.`);
-                    process.exit(1);
-                  ' "$VERSION" "$LIVE"
-                  echo "Version ok: $VERSION exceeds live Marketplace version $LIVE"
-
-            # Both PATs are verified BEFORE the first irreversible publish so a
-            # missing Open VSX token can't strand us half-published. The two
-            # registries are separate steps: if Open VSX fails after the
-            # Marketplace accepted the VSIX, the run goes red (so the operator
-            # notices Open VSX lagged) but the bookkeeping below still runs —
-            # it is keyed off the Marketplace outcome, which is what "shipped"
-            # means for this listing.
-            - name: Publish to Marketplace
-              id: publish_marketplace
-              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
-                  if [[ -z "$OVSX_PAT" ]]; then
-                    echo "Error: OVSX_PAT is required to publish to Open VSX."
-                    exit 1
-                  fi
-                  vsce publish --no-dependencies --packagePath "claude-dev-${{ github.event.inputs.version }}.vsix"
-
-            - name: Publish to Open VSX
-              working-directory: staging
-              env:
-                  OVSX_PAT: ${{ secrets.OVSX_PAT }}
-              run: npx ovsx publish --packagePath "claude-dev-${{ github.event.inputs.version }}.vsix" --pat "$OVSX_PAT"
-
-            # ---- Post-publish bookkeeping (tag / GitHub Release / Slack) ----
-            # Mirrors the standalone publish workflows. Every step here is
-            # continue-on-error, and gated on the MARKETPLACE outcome rather
-            # than plain step ordering: the Marketplace publish already
-            # happened, so bookkeeping must still run when only the Open VSX
-            # step failed, and a red run after a successful publish is exactly
-            # the confusion the nightly workflow taught us to avoid (tag pushes
-            # fail whenever the built commit touches .github/workflows/** — no
-            # grantable permission fixes that; push the tag manually in that
-            # case, see the publish-extension skill).
-
-            - name: Extract changelog entry
-              id: changelog
-              if: ${{ !cancelled() && steps.publish_marketplace.outcome == 'success' }}
-              continue-on-error: true
-              run: |
-                  CONTENT=$(awk '/^## \[/{if(found) exit; found=1; next} found{print}' CHANGELOG.md)
-                  {
-                    echo "content<<CHANGELOG_EOF"
-                    echo "$CONTENT"
-                    echo "CHANGELOG_EOF"
-                  } >> "$GITHUB_OUTPUT"
-
-            - name: Resolve previous release tag
-              id: prev_tag
-              if: ${{ !cancelled() && steps.publish_marketplace.outcome == 'success' }}
-              continue-on-error: true
-              run: |
-                  # ls-remote needs no local tag objects; take the highest v* tag
-                  # below the one being released.
-                  PREV=$(git ls-remote --tags origin 'v*' \
-                    | awk -F/ '{print $NF}' | grep -v '\^{}' \
-                    | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' \
-                    | grep -vx "v${{ github.event.inputs.version }}" \
-                    | sort -V | tail -1)
-                  echo "prev_tag=$PREV" >> "$GITHUB_OUTPUT"
-
-            - name: Create and push release tag
-              if: ${{ !cancelled() && steps.publish_marketplace.outcome == 'success' }}
-              continue-on-error: true
-              run: |
-                  TAG="v${{ github.event.inputs.version }}"
-                  git tag "$TAG" HEAD
-                  git push origin "refs/tags/$TAG"
-                  echo "Pushed $TAG at $(git rev-parse HEAD)"
-
-            - name: Create GitHub Release
-              if: ${{ !cancelled() && steps.publish_marketplace.outcome == 'success' }}
-              continue-on-error: true
-              uses: softprops/action-gh-release@v1
-              with:
-                  tag_name: v${{ github.event.inputs.version }}
-                  files: staging/claude-dev-${{ github.event.inputs.version }}.vsix
-                  body: |
-                      ${{ steps.changelog.outputs.content }}
-
-                      **Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.prev_tag.outputs.prev_tag }}...v${{ github.event.inputs.version }}
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Post release to Slack
-              if: ${{ !cancelled() && steps.publish_marketplace.outcome == 'success' }}
-              continue-on-error: true
-              uses: slackapi/slack-github-action@v3.0.1
-              with:
-                  method: chat.postMessage
-                  token: ${{ secrets.SLACK_RELEASE_BOT_TOKEN }}
-                  payload: |
-                    channel: "C0APVKGGZFC"
-                    text: "Cline v${{ github.event.inputs.version }}"
-                    blocks:
-                      - type: "section"
-                        text:
-                          type: "mrkdwn"
-                          text: "*Cline v${{ github.event.inputs.version }}*"
-                      - 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 }}...v${{ github.event.inputs.version }}"
@@ -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 }}"
@@ -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,59 @@ 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
+    # The VS Code extension's package.json and lockfiles live under apps/vscode/
+    # (the repo root has no package.json). Mirror ext-vscode-test.yml so install
+    # and publish steps run in the correct workspace.
+    defaults:
+      run:
+        working-directory: apps/vscode

    steps:
-      - name: Checkout 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
+          cache: 'npm'
+          cache-dependency-path: |
+            apps/vscode/package-lock.json
+            apps/vscode/webview-ui/package-lock.json

-      # 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 root dependencies
+        run: npm ci --include=optional

-      - name: Install next workspace dependencies
-        working-directory: next-src
-        run: bun install --frozen-lockfile
+      - name: Install webview-ui dependencies
+        run: cd webview-ui && npm 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 +87,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 +98,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}"
@@ -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,24 @@ 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
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm install --include=optional

-            # @cline/* are local workspace symlinks to source packages; build dist/ before
-            # packaging/publishing the extension.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm install --include=optional

-            - name: Assert better-sqlite3 native binary present
-              run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
-
-            # vsce is a workspace devDependency (on node_modules/.bin), but ovsx is not
-            # vendored and the publish script invokes it via `npx ovsx`, so install ovsx
-            # globally (npm is available via setup-node). vsce is installed globally too
-            # to preserve the script's existing PATH expectations.
            - name: Install Publishing Tools
              run: npm install -g @vscode/vsce ovsx

@@ -180,60 +139,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 +162,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:
@@ -45,16 +45,12 @@ jobs:
                          - 'apps/vscode/assets/**'
                          - 'apps/vscode/walkthrough/**'
                          - 'apps/vscode/package.json'
-                          - 'apps/vscode/webview-ui/package.json'
-                          # Root bun lockfile is authoritative for the whole workspace (incl. apps/vscode).
-                          - 'bun.lock'
-                          # SDK source packages are local workspace symlinks (@cline/*), so SDK changes affect the build.
-                          - 'sdk/packages/**'
+                          - 'apps/vscode/package-lock.json'
                          - 'apps/vscode/buf.yaml'
                          - 'apps/vscode/tsconfig*.json'
                          - 'apps/vscode/biome.jsonc'
                          - 'apps/vscode/esbuild.mjs'
-                          - 'apps/vscode/bunfig.toml'
+                          - 'apps/vscode/.mocharc.json'
                          - 'apps/vscode/.vscode-test.mjs'
                          - 'apps/vscode/.vscodeignore'
                          - 'apps/vscode/playwright*.ts'
@@ -88,20 +84,26 @@ jobs:
                working-directory: apps/vscode
        steps:
            - uses: actions/checkout@v4
-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
+            - name: Setup Node.js environment
+              uses: actions/setup-node@v4
              with:
-                  bun-version: 1.3.14
+                  node-version: 22

-            # Cache Bun's global install cache - keyed on the authoritative root bun.lock.
-            - name: Cache Bun install cache
+            # Cache root dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache root dependencies
              uses: actions/cache@v4
-              id: bun-cache
+              id: root-cache
              with:
-                  path: ~/.bun/install/cache
-                  key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}
-                  restore-keys: |
-                      ${{ runner.os }}-bun-
+                  path: apps/vscode/node_modules
+                  key: ${{ runner.os }}-npm-${{ hashFiles('apps/vscode/package-lock.json') }}
+
+            # Cache webview-ui dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache webview-ui dependencies
+              uses: actions/cache@v4
+              id: webview-cache
+              with:
+                  path: apps/vscode/webview-ui/node_modules
+                  key: ${{ runner.os }}-npm-webview-${{ hashFiles('apps/vscode/webview-ui/package-lock.json') }}

            # Cache VS Code installation
            - name: Cache VS Code
@@ -122,41 +124,20 @@ jobs:
                      ~/.cache/ms-playwright
                      ~/Library/Caches/ms-playwright
                      ~/AppData/Local/ms-playwright
-                  key: playwright-browsers-${{ runner.os }}-${{ hashFiles('bun.lock') }}
+                  key: playwright-browsers-${{ runner.os }}-${{ hashFiles('apps/vscode/package-lock.json') }}
                  restore-keys: |
                      playwright-browsers-${{ runner.os }}-

-            # Single root install resolves the entire bun workspace at once (replaces
-            # the per-package `npm ci` steps for apps/vscode + webview-ui).
-            - name: Install workspace dependencies
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm ci
              env:
                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-            # @cline/* are local workspace symlinks to source packages; build dist/
-            # before building/packaging the extension for E2E.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm ci

-            - name: Assert better-sqlite3 native binary present
-              # Force bash: the Windows runner defaults to pwsh, which can't parse this
-              # POSIX test. Git Bash ships on GitHub's windows-latest images.
-              shell: bash
-              run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
-
-            # NOTE: vsce is no longer installed globally. @vscode/vsce is a workspace
-            # devDependency of apps/vscode (resolved into node_modules/.bin), and the
-            # `test:e2e:build` script invokes `vsce` via `bun run`, which puts the local
-            # .bin on PATH. No global install needed.
+            - name: Install vsce
+              run: npm install -g @vscode/vsce

            - name: Install xvfb on Linux
              if: matrix.runner == 'ubuntu'
@@ -165,11 +146,11 @@ jobs:
            # Run optimized E2E tests (eliminates redundant builds)
            - name: Run E2E tests - Linux
              if: matrix.runner == 'ubuntu'
-              run: xvfb-run -a bun run test:e2e:optimal
+              run: xvfb-run -a npm run test:e2e:optimal

            - name: Run E2E tests - Non-Linux
              if: matrix.runner != 'ubuntu'
-              run: bun run test:e2e:optimal
+              run: npm run test:e2e:optimal

            - uses: actions/upload-artifact@v4
              if: ${{ failure() }}
@@ -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,31 @@ jobs:
            - name: Checkout code
              uses: actions/checkout@v4

-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
+            - name: Setup Node.js environment
+              uses: actions/setup-node@v4
              with:
-                  bun-version: 1.3.14
+                  node-version: 22
+                  cache: 'npm'
+                  cache-dependency-path: |
+                      apps/vscode/package-lock.json
+                      apps/vscode/webview-ui/package-lock.json

-            # Single root install resolves the entire bun workspace (apps/vscode,
-            # webview-ui, testing-platform and the @cline/* SDK symlinks) at once,
-            # so the previous per-package `npm ci` steps collapse into one.
-            - name: Install workspace dependencies
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm ci --include=optional
              env:
                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-            # @cline/* are local workspace symlinks to source packages; their dist/
-            # output must be built before the extension can type-check/compile.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
-
-            - name: Assert better-sqlite3 native binary present
-              run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm ci --include=optional

            - 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 +121,27 @@ jobs:
            - name: Checkout code
              uses: actions/checkout@v4

-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
+            - name: Setup Node.js environment
+              uses: actions/setup-node@v4
              with:
-                  bun-version: 1.3.14
+                  node-version: 22
+                  cache: 'npm'
+                  cache-dependency-path: |
+                      apps/vscode/package-lock.json
+                      apps/vscode/webview-ui/package-lock.json

-            # Single root install resolves the entire bun workspace at once (replaces
-            # the per-package `npm ci` steps for apps/vscode + webview-ui).
-            - name: Install workspace dependencies
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm ci --include=optional
              env:
                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-            # @cline/* are local workspace symlinks to source packages; build dist/
-            # before compiling/testing the extension.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm ci --include=optional

-            - name: Assert better-sqlite3 native binary present
+            - name: Set up NPM on Windows
+              if: runner.os == 'Windows'
              run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
-
-            # NOTE: The old `npm config set script-shell bash` step is intentionally
-            # removed. Scripts are now launched with `bun run`, which uses Bun's own
-            # built-in cross-platform shell rather than npm's configured script-shell,
-            # so that npm-specific Windows workaround no longer applies. Bash-dependent
-            # scripts (e.g. scripts/proto-lint.sh, standalone/runclinecore.sh) are
-            # invoked explicitly via `bash ...` from within the package scripts, and
-            # this job's `defaults.run.shell: bash` (Git Bash on Windows) still covers
-            # the workflow `run:` blocks below.
+                  npm config set script-shell "C:\\Program Files\\Git\\bin\\bash.exe"

            - name: Cache VS Code test runtime
              if: runner.os == 'Windows'
@@ -189,51 +153,29 @@ 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
+              run: npm run test:vitest

-            - 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,36 @@ jobs:
            - name: Checkout code
              uses: actions/checkout@v4

-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
+            - name: Setup Node.js environment
+              uses: actions/setup-node@v4
              with:
-                  bun-version: 1.3.14
+                  node-version: 22
+                  cache: 'npm'
+                  cache-dependency-path: |
+                      apps/vscode/package-lock.json
+                      apps/vscode/webview-ui/package-lock.json
+                      apps/vscode/testing-platform/package-lock.json

-            # Single root install resolves the whole bun workspace, including the
-            # testing-platform package, so the separate per-package `npm ci` steps
-            # (extension + webview-ui + testing-platform) collapse into one.
-            - name: Install workspace dependencies
-              working-directory: ${{ github.workspace }}
-              run: bun install --frozen-lockfile
+            - name: Install root dependencies
+              run: npm ci --include=optional
              env:
                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-            # @cline/* are local workspace symlinks to source packages; build dist/
-            # before compiling the standalone core.
-            - name: Build SDK packages
-              working-directory: ${{ github.workspace }}
-              run: bun run build:sdk
-
-            - name: Assert better-sqlite3 native binary present
-              run: |
-                  NODE_FILE="node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-                  if [ ! -f "$NODE_FILE" ]; then
-                    echo "ERROR: better-sqlite3 native binary missing at apps/vscode/$NODE_FILE"
-                    echo "(bun trustedDependencies postinstall likely did not run)"
-                    exit 1
-                  fi
-                  echo "Found better-sqlite3 native binary: $NODE_FILE"
+            - name: Install webview-ui dependencies
+              run: cd webview-ui && npm ci --include=optional

            - name: Download ripgrep binaries
-              run: bun run download-ripgrep
+              run: npm run download-ripgrep

            - name: Compile Standalone
-              run: bun run compile-standalone
+              run: npm run compile-standalone
+
+            - name: Install testing platform dependencies
+              run: cd testing-platform && npm ci --include=optional

            - 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
@@ -1,60 +0,0 @@
-# Some coding-agent GitHub Apps advertise themselves by auto-commenting on every
-# new PR ("<Tool> Agent can help with this pull request. Just @<tool> ..."). The
-# app needs pull_requests:write for its real job (pushing branches, opening PRs),
-# and GitHub offers no per-behavior control over an installed App, so the ad
-# cannot be disabled at the source. This deletes those promo comments as they
-# appear. Genuine agent output comments (work results, reviews) don't match the
-# promo pattern and are left alone.
-#
-# No checkout, API-calls-only — comment text is only ever handled as data inside
-# the script, never interpolated into the workflow definition.
-name: repo-delete-agent-promo-comments
-on:
-    issue_comment:
-        types: [created]
-
-jobs:
-    delete:
-        runs-on: ubuntu-latest
-        timeout-minutes: 2
-        # Prefilter so a runner only spins up for bot comments that look like the
-        # ad; the script re-verifies before deleting.
-        if: >-
-            github.event.issue.pull_request &&
-            endsWith(github.event.comment.user.login, '[bot]') &&
-            contains(github.event.comment.body, 'can help with this pull request')
-        # Comment deletion goes through the issues API, but GitHub gates the
-        # endpoint by where the comment lives: issue comments need `issues`,
-        # PR-conversation comments need `pull-requests`. The prefilter restricts
-        # this job to PR comments, so pull-requests is the one that matters;
-        # issues is kept in case the prefilter is ever widened.
-        permissions:
-            issues: write
-            pull-requests: write
-        steps:
-            # Pinned to a commit SHA (not the mutable v7 tag) because this job holds
-            # write permissions and fires on attacker-postable events.
-            - uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
-              with:
-                  script: |
-                      const comment = context.payload.comment
-
-                      // Belt and suspenders on top of the job-level prefilter: only
-                      // delete when the author is a real GitHub App bot AND the body
-                      // matches the self-promotion shape ("... can help with this
-                      // pull request. Just @<handle> ..."). A human quoting the ad
-                      // text is not a Bot; a bot posting real work output doesn't
-                      // match the promo shape.
-                      const isBot = comment.user.type === "Bot"
-                      const isPromo = /\bcan help with this pull request\b[\s\S]*@\w/i.test(comment.body || "")
-
-                      if (!isBot || !isPromo) {
-                          core.info("not an agent promo comment, leaving it alone")
-                          return
-                      }
-
-                      await github.rest.issues.deleteComment({
-                          ...context.repo,
-                          comment_id: comment.id,
-                      })
-                      core.info(`deleted promo comment ${comment.id} by ${comment.user.login} on #${context.payload.issue.number}`)
@@ -17,7 +17,7 @@ jobs:
            const labels = context.payload.issue.labels.map(l => l.name);

            // Check if JetBrains Plugin is selected
-            if (body.match(/###\s*Cline Surface\s*\n+JetBrains Plugin/i)) {
+            if (body.match(/###\s*Plugin Type\s*\n+JetBrains Plugin/i)) {
              if (!labels.includes('JetBrains')) {
                await github.rest.issues.addLabels({
                  owner: context.repo.owner,
@@ -29,7 +29,7 @@ jobs:
            }

            // Check if VSCode Extension is selected
-            if (body.match(/###\s*Cline Surface\s*\n+VSCode Extension/i)) {
+            if (body.match(/###\s*Plugin Type\s*\n+VSCode Extension/i)) {
              if (!labels.includes('VS Code')) {
                await github.rest.issues.addLabels({
                  owner: context.repo.owner,
@@ -41,7 +41,7 @@ jobs:
            }

            // Check if CLI is selected
-            if (body.match(/###\s*Cline Surface\s*\n+CLI/i)) {
+            if (body.match(/###\s*Plugin Type\s*\n+CLI/i)) {
              if (!labels.includes('CLI')) {
                await github.rest.issues.addLabels({
                  owner: context.repo.owner,
@@ -1,65 +0,0 @@
-# Cloud coding agents append promotional badge blocks to PR bodies after the
-# agent's final turn, wrapped around <!-- <VENDOR>_AGENT_PR_BODY_BEGIN/END -->
-# marker comments. The agent itself never sees that content, so no repo rule or
-# agent instruction can prevent it. This strips it from the PR description on
-# open/edit, keeping only the agent-authored content between the markers.
-#
-# Uses pull_request_target so the token has write access on PRs from forks. That
-# trigger is only unsafe when a job checks out and executes PR code — this one
-# never checks out the repository, it only calls the REST API.
-name: repo-strip-agent-badges
-on:
-    pull_request_target:
-        types: [opened, edited]
-
-concurrency:
-    group: strip-agent-badges-${{ github.event.pull_request.number }}
-    cancel-in-progress: true
-
-jobs:
-    strip:
-        runs-on: ubuntu-latest
-        if: contains(github.event.pull_request.body, '_AGENT_PR_BODY')
-        permissions:
-            pull-requests: write
-        steps:
-            # Pinned to a commit SHA (not the mutable v7 tag) because this job holds
-            # write permissions under pull_request_target.
-            - uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
-              with:
-                  script: |
-                      // Re-fetch instead of trusting the event payload: the body may have
-                      // been edited again between the event firing and this run (agent
-                      // harnesses edit PR bodies post-open), and updating from the stale
-                      // snapshot would clobber the newer content.
-                      const { data: pr } = await github.rest.pulls.get({
-                          ...context.repo,
-                          pull_number: context.payload.pull_request.number,
-                      })
-                      const body = pr.body || ""
-
-                      // The BEGIN/END comments wrap the agent-authored content; everything
-                      // outside them (vendor promo badges, "open in <tool>" links) is
-                      // appended by the harness. Keep only what's between the markers.
-                      // The backreference requires BEGIN and END to name the same vendor.
-                      // No markers -> no match -> body passes through unchanged.
-                      const cleaned = body
-                          .replace(
-                              /^[\s\S]*?<!--\s*([A-Z][A-Z0-9_]*?)_AGENT_PR_BODY_BEGIN\s*-->\r?\n?([\s\S]*?)<!--\s*\1_AGENT_PR_BODY_END\s*-->[\s\S]*$/,
-                              "$2",
-                          )
-                          .trimEnd()
-
-                      // No change means a previous run already cleaned this body. Returning
-                      // without an update is what stops `edited` from retriggering forever.
-                      if (cleaned === body) {
-                          core.info("nothing to strip")
-                          return
-                      }
-
-                      await github.rest.pulls.update({
-                          ...context.repo,
-                          pull_number: pr.number,
-                          body: cleaned,
-                      })
-                      core.info(`stripped ${body.length - cleaned.length} chars from PR #${pr.number}`)
@@ -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) || '' }}"
@@ -1,150 +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 --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
-
-      # The desktop chat test imports @cline/shared/browser, which resolves to
-      # dist output that nothing else in this job builds.
-      - name: Build shared package
-        run: bun -F @cline/shared 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}'"
@@ -84,11 +84,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
@@ -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"
 		}
 	]
 }
@@ -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",
@@ -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
@@ -7,5 +7,5 @@ fi

 gitleaks git --pre-commit --redact --staged --verbose || exit 1

-cd apps/vscode && bunx lint-staged
+cd apps/vscode && lint-staged

@@ -51,8 +51,7 @@
 			"env": {
 				"IS_DEV": "true",
 				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}/apps/vscode",
-				"CLINE_ENVIRONMENT": "staging",
-				"CLINE_DIR": "${userHome}/.cline_staging"
+				"CLINE_ENVIRONMENT": "staging"
 			}
 		},
 		{
@@ -76,8 +75,7 @@
 			"env": {
 				"IS_DEV": "true",
 				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}/apps/vscode",
-				"CLINE_ENVIRONMENT": "local",
-				"CLINE_DIR": "${userHome}/.cline_local"
+				"CLINE_ENVIRONMENT": "local"
 			}
 		},
 		{
@@ -128,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": {
@@ -182,7 +183,7 @@
 			"name": "Open Storybook",
 			"type": "node",
 			"request": "launch",
-			"runtimeExecutable": "bun",
+			"runtimeExecutable": "npm",
 			"runtimeArgs": [
 				"run",
 				"storybook"
@@ -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
@@ -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": [
@@ -1,32 +0,0 @@
-This is the **Cline** monorepo. Toolchain is **Bun 1.3.13** (package manager + task runner) with **Node >=22** as the runtime. Do not use npm/yarn/pnpm.
-
-## Cloud Agent Instructions
-
-### Cline CLI
- Run from source: `bun run cli` (interactive: `bun run cli -i`; one-shot: append a prompt). This resolves to `apps/cli` and **auto-spawns the `@cline/cline-hub` daemon** — you do not start the hub separately.
- Inspect local health with `bun run cli doctor`; `bun run cli version` prints the version.
- An actual agent turn requires an **LLM provider credential**. With no credentials the default `cline` provider fails fast with an `Unauthorized` error and the interactive TUI shows a provider sign-in screen. Configure via `cline auth` or provider env vars (e.g. `ANTHROPIC_API_KEY`, `CLINE_API_KEY`, `OPENROUTER_API_KEY`); see `apps/cli/README.md`.
-
-### Build / Lint / test
- SDK packages (`@cline/shared|llms|agents|core|sdk`) resolve each other through compiled `dist/` (their `exports` point only at `dist/`, with no `development` source condition). You **must** run `bun run build:sdk` after changing SDK dependencies/source before running the CLI or SDK tests, otherwise imports fail with missing `@cline/*` / missing `dist/` errors. Running processes do **not** hot-reload SDK source changes — rebuild and restart.\
- Known cloud-env test artifact: `@cline/core` test `src/services/workspace/workspace-manifest.test.ts > readGitWorkspaceState > prefers origin and returns the current branch` fails because cloud VMs configure git `insteadOf` rules that rewrite GitHub remotes to `https://x-access-token:...@github.com/...`. This is an environment artifact, not a code bug.
- Some `@cline/cli` e2e assertions (`bun -F @cline/cli test:e2e`) may fail on exact tool-listing string formats; treat as pre-existing test drift, not an environment problem.
-
-### GUI display
- A virtual X display is live at **`DISPLAY=:1`** (the same desktop used for screenshots). GUI apps (VS Code, the Tauri desktop window) launched with `DISPLAY=:1` render there and can be screenshotted — no need to start your own `xvfb`. Prefer starting long-running GUI/dev processes in a `tmux` session (see the tmux guidance) so they survive.
-
-### VS Code extension (`apps/vscode`, package `claude-dev`)
-Toolchain is pre-installed and persisted in the VM: generated gRPC/proto code, the bundled `ripgrep` binaries (`apps/vscode/bin/`), the built webview (`webview-ui/build`), the esbuild bundle (`dist/extension.js`), VS Code itself (`/usr/bin/code`), and the GUI system libraries its tests need.
- **Codegen prerequisite:** `bun run protos` (from `apps/vscode`) regenerates `src/generated/*` and the webview grpc client. The `dev`, `build:webview`, and `check-types` scripts already run it, so proto changes are picked up by those commands; run it manually only if you edit `.proto` files without a full build.
- **Build:** `bun run build:webview` (webview UI, ~15s) then `bun esbuild.mjs` (extension bundle). `bun run package` does the full production build.
- **Run it (dev host):** `DISPLAY=:1 code --no-sandbox --user-data-dir=/tmp/vscode-userdata --extensionDevelopmentPath=/workspace/apps/vscode <some-folder>`, then click the Cline icon in the Activity Bar to open the webview. (`--no-sandbox` is required in this container.)
- **Test:** `bun run test:unit` (bun-based, ~984 tests, no VS Code host needed). `bun run test:integration` (`@vscode/test-electron`, downloads a VS Code build, runs under the GUI libs) and `bun run test:e2e` (Playwright) exercise a real extension host — heavier, and the GUI libs for them are already installed.
- One-time deps (already installed, listed here in case they must be recreated): ripgrep via `bun run download-ripgrep`; VS Code test GUI libs per `CONTRIBUTING.md` (`libnss3`, `libatk*`, `libgbm1`, `xvfb`, etc.).
-
-### Desktop app (`apps/examples/desktop-app`, package `@cline/code`)
-A Tauri v2 (Rust) shell + Next.js webview + a Bun "sidecar" backend. Rust and the Tauri Linux system libs are pre-installed and persisted.
- **Headless (no Rust/window):** run the backend and UI separately — `bun run dev:sidecar` (Bun backend on `127.0.0.1:3126`, serves `ws://.../transport`) and `bun run dev:web` (Next.js UI on `http://localhost:3125`).
- **Native window:** `bun run dev` (`tauri dev`) — its `beforeDevCommand` builds the sidecar binary and starts `dev:web` (`:3125`), then Rust `main.rs` spawns the sidecar; so free ports `3125`/`3126` first. Launch with `DISPLAY=:1` to see the window. A `libEGL: DRI3 error` warning is benign (software rendering) — the WebKitGTK window still renders.
- **Rust version caveat:** the crate graph needs Cargo's `edition2024` feature, so **Rust ≥1.85** is required (the VM's base 1.83 fails with "feature `edition2024` is required"). The toolchain here was updated via `rustup default stable` (currently 1.97). First `cargo` build downloads/compiles the full Tauri crate graph (a few minutes); subsequent builds are cached.
- **System libs (already installed):** `libwebkit2gtk-4.1-dev`, `libgtk-3-dev`, `libayatana-appindicator3-dev`, `librsvg2-dev`, `libxdo-dev`, `libssl-dev`, `build-essential`.
- **Test/typecheck:** `bun run typecheck`, `bun run test:chat-ui` (Vitest). Both trigger `build:ui` first.
@@ -1,225 +1,5 @@
 # Changelog

-## [4.1.2]
-
-### Added
-
- Show which extension variant is active — "Legacy" or "Next" — next to the version in the settings About page, in both bundles of the combined rollout package.
-
-## [4.1.1]
-
-### Changed
-
- Remove vestigial MCP server-key machinery from McpHub — native MCP tool calls now route by server name instead of a random in-memory uid, so routing survives restarts and server list changes.
-
-## [4.1.0]
-
-### Changed
-
- Convert the stable extension to a combined A/B package: one VSIX containing both the current (legacy) extension and the new SDK-based extension, plus a loader that activates exactly one per window via a staged remote rollout. For nearly all users nothing changes — the loader activates the same extension as 4.0.12; a small percentage (starting at 1%) is gradually opted into the SDK-based extension. If the new extension fails to activate, the loader falls back to the current one in the same window. Settings and credentials are shared between the two.
-
-## [4.0.12]
-
-### Added
-
- Add support for free Cline models, shown as "(free)" in the model picker, with a dedicated error card that includes the reset time when the free limit is reached.
-
-### Fixed
-
- Keep Claude Code responses that were already streamed when the CLI exits with a max-turns error, instead of discarding a valid response.
-
-## [4.0.11]
-
-### Added
-
- Add Claude Opus 5 across the Anthropic, Claude Code, Bedrock, Vertex, Cline, and OpenRouter providers, including 1M context window variants.
- Add Moonshot Kimi K3 support.
- Include the host plugin version in telemetry events.
-
-### Fixed
-
- Correct pricing for the Claude Opus 1M context variants, which overstated costs for requests above 200k tokens.
- Enable native tool calling for Kimi K3 models, fixing empty responses.
-
-## [4.0.10]
-
-### Added
-
- Add telemetry to track when Cline reaches the consecutive mistake limit.
-
-## [4.0.9]
-
-### Added
-
- Add GPT-5.6 ChatGPT subscription models.
-
-### Changed
-
- Soften and shorten the message shown when Cline hits the consecutive mistake limit.
-
-### Fixed
-
- Handle cumulative usage snapshots from OpenAI-compatible providers so token counts are no longer over-reported.
- Load skills from files saved as UTF-8 with a byte-order mark (BOM).
-
-## [4.0.8]
-
-### Added
-
- Add more models to the GCP Vertex provider, plus a free-form entry option in the model dropdown for specifying custom Vertex models.
-
-## [4.0.7]
-
-### Added
-
- Add a ClinePass limit-reached error with a one-click option to switch to Cline usage-based billing.
- Allow selecting Cline free models on the ClinePass provider, organized into Subscribed and Free tabs with model descriptions.
-
-### Changed
-
- Refine ClinePass onboarding and provider settings copy, and open the "learn more" link via the in-app URL handler.
- Remove the Cline model picker recommendation copy.
-
-### Removed
-
- Remove all references to GLM 5.1.
-
-## [4.0.6]
-
-### Fixed
-
- Generalize the model capability warning so it applies more broadly.
-
-## [4.0.5]
-
-### Added
-
- Add support for Claude Sonnet 5 across the Anthropic, Bedrock, Vertex, Claude Code, SAP AI Core, OpenRouter, and Vercel AI Gateway providers, including model picker and recommended-model updates.
-
-## [4.0.4]
-
-### Changed
-
- Fully remove the ClinePass feature flag so ClinePass is available everywhere in the UI — onboarding, settings, the welcome promo banner, and the credit-limit "Switch to ClinePass" action.
-
-## [4.0.3]
-
-### Changed
-
- Enable the ClinePass provider for all users by removing the feature-flag gate that previously fell back to the standard Cline provider.
-
-## [4.0.2]
-
-### Added
-
- Add reasoning effort support (including `xhigh`) for DeepSeek thinking models.
- Improve the ClinePass provider experience with clearer reasoning controls and model selection.
-
-### Fixed
-
- Show reasoning effort controls for ClinePass models and align ClinePass model resolution with the rest of the provider.
- Prefer canonical Cline Z.ai model ids and polish ClinePass and Z.ai model metadata.
- Fix environment variable replacement in the webview.
- Default focus chain settings in webview state so the toggle reflects the correct value on load.
-
-## [4.0.1]
-
-### Changed
-
- Roll the stable VS Code extension back to the pre-SDK-migration codebase to resolve regressions reported in 4.0.0. This release ships the 3.89.2 extension code under a higher version number so existing 4.0.0 users receive the update. SDK-migration work continues separately on `main`.
-
-## [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
-
- Complete the fix for the Anthropic provider on VS Code 1.123 and later by upgrading the bundled Anthropic SDK to a release compatible with the Node 24 runtime.
- Update the Vertex AI provider to a compatible Anthropic Vertex SDK release so it works with the upgraded Anthropic SDK.
-
-## [3.89.1]
-
-### Fixed
-
- Restore the Anthropic provider on VS Code 1.123 and later, where the updated Node 24 runtime broke the bundled Anthropic SDK.
- Handle the DeepSeek V4 reasoning format.
-
-## [3.89.0]
-
-### Added
-
- Add Claude Fable 5 model support.
-
-### Fixed
-
- Fix MiniMax M3 thinking controls across gateways.
-
-### Changed
-
- Clean up the Codex model list.
-
-## [3.88.1]
-
-### Added
-
- Add a debug section in settings for Cline testers.
-
-### Fixed
-
- Include the walkthrough markdown files in the VS Code extension package so the first-run walkthrough steps load correctly.
-
-## [3.88.0]
-
-### Added
-
- Add the latest Fireworks AI serverless models and update the default Fireworks model to Kimi K2.6.
-
-### Fixed
-
- Fix MCP server delete/add flows so settings writes do not cause the MCP server list to be emptied by the file watcher.
- Remove stale Fireworks AI models and correct Fireworks model metadata and cache pricing.
-
-### Changed
-
- Always use the upstream Cline recommended models endpoint instead of gating it behind a feature flag.
-
 ## [3.87.0]

 ### Added
@@ -0,0 +1 @@
+@.clinerules/general.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:**
@@ -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 |
@@ -212,12 +212,8 @@ cline schedule create "PR summary" \
 Chat with your agent from any messaging platform: Telegram, Slack, Discord, Google Chat, WhatsApp, and Linear. Each conversation thread maps to an agent session with full context. Set up access control to restrict who can interact with your agent.

 ```bash
-# Connect to Telegram
 cline connect telegram -k $BOT_TOKEN
-# Connect to Slack through webhook
-cline connect slack --bot-token $SLACK_TOKEN --signing-secret $SECRET --base-url $URL
-# Connect to Slack using socket mode
-cline connect slack --bot-token $SLACK_TOKEN --app-token $SLACK_APP_TOKEN
+cline connect slack --token $SLACK_TOKEN --signing-secret $SECRET --base-url $URL
 ```

 ## Headless CLI for CI/CD
@@ -226,7 +222,7 @@ Run Cline with zero interaction for scripting and automation. Pipe input, get JS

 ```bash
 cline "Run tests and fix any failures"
-git diff origin/main | cline "Review these changes for issues"
+git diff origin/main | cline  "Review these changes for issues"
 cline --json "List all TODO comments" | jq -r 'select(.type == "agent_event" and .event.text) | .event.text'
 ```

@@ -1,9 +1,7 @@
 {
 	"$schema": "https://biomejs.dev/schemas/2.4.5/schema.json",
 	"root": false,
-	"extends": [
-		"../sdk/biome.json"
-	],
+	"extends": ["../sdk/biome.json"],
 	"linter": {
 		"rules": {
 			"a11y": {
@@ -9,13 +9,12 @@ Use this skill when the user asks to release the CLI, publish `cline`, bump the

 The CLI is npm-only. Do not add alternate distribution or signing steps.

-> Working directory: run every command below from the repository root. Paths and scripts (e.g. `apps/cli/package.json`, `sdk/packages/`, `bun release cli`, `bun run version`) are written relative to the repo root.
+> Working directory: this skill lives in the SDK sub-monorepo. Run `cd sdk` (from the repo root) before any of the shell commands below. Paths in commands and instructions (e.g. `apps/cli/package.json`, `bun release cli`) are written relative to `sdk/`.

 The skill should guide the user through one release preparation flow, then offer the publish path options. The two normal publish paths are GitHub Actions and local publishing from an authenticated machine.

 ## Release contract

- SDK prerequisite: the CLI depends on the SDK via `workspace:*` (`@cline/core`, `@cline/shared`, and friends). If the SDK changed since its last release, release the SDK first and wait for it to finish publishing before releasing the CLI. See "Step 0: Release the SDK first if it changed" below.
 - Version source: `apps/cli/package.json`.
 - Main release tag: `cli-vX.Y.Z`, where `X.Y.Z` matches `apps/cli/package.json`.
 - Nightly release version: `X.Y.Z-nightly.TIMESTAMP`.
@@ -31,93 +30,8 @@ The skill should guide the user through one release preparation flow, then offer
 - Always ask before pushing commits or tags.
 - Do not amend commits unless explicitly requested.

-## Step 0: Release the SDK first if it changed
-
-Do this before anything else in the Workflow below.
-
-The CLI builds and ships against the SDK source in the monorepo (`workspace:*` for `@cline/core`, `@cline/shared`, and the rest), so a CLI release always contains the latest SDK code whether or not the SDK was released. The build and tests use that source too, not anything from npm. Releasing the SDK alongside the CLI is still worth doing for two reasons:
-
- Hub freshness. The hub daemon lives in `@cline/core` and stamps a `buildId` that defaults to the `@cline/core` package version (`resolveHubBuildId` in `sdk/packages/core/src/hub/discovery/index.ts`). A running hub is only retired and respawned when that `buildId` changes (`isCompatibleHubRecord` / `retireIncompatibleHub` in `sdk/packages/core/src/hub/daemon/index.ts`). So if the SDK code changed but the version did not, a user who upgrades the CLI keeps talking to their already-running hub, which is still executing the old SDK code. Bumping the SDK version makes the new CLI's `buildId` differ, so the stale hub is detected as incompatible and respawned with the fresh code.
- Release hygiene. We want regular SDK releases; cutting one whenever we cut a CLI release keeps the published SDK in step with what the CLI ships.
-
-So when the SDK has changed, release it first (which bumps the `@cline/core` version), then cut the CLI release on top of that bump. Leave the CLI's SDK dependency as `workspace:*` — the fix is to release the SDK, not to pin the CLI.
-
-1. Check for unreleased SDK changes.
-
-```sh
-git fetch origin --tags
-git tag --list 'sdk/sdk/v*' 'sdk-v*' --sort=-v:refname | head -1
-git log <last-sdk-tag>..origin/main --oneline --no-merges -- sdk/packages
-```
-
-`sdk/<pkg>/v*` tags are created by the `sdk-publish.yml` workflow; `sdk-v*` tags are created by the local `bun release sdk` helper. Use whichever is newest as the baseline.
-
-If `git log` prints no commits, the SDK is already up to date. Skip the rest of Step 0 and continue with the Workflow below.
-
-If it prints commits, sanity-check the diff (ignore entries that are only the previous version-bump commit's lockfile or generated files), then release the SDK.
-
-2. Decide the SDK version bump.
-
-All SDK packages share one version, read from `sdk/packages/llms/package.json`. Ask whether this is patch, minor, major, or an explicit version. Patch is the default. Do not guess if the user has not made it clear.
-
-3. Draft the SDK release notes and update the changelog.
-
-Draft user-facing notes from the SDK commits found in step 1, translating commit messages into user-facing language (same approach as the CLI release notes below). Prepend a new `## <version>` section with those notes to the top of `sdk/CHANGELOG.md`, using the header format `## <version>` with no date — the same flat, newest-on-top format as `apps/cli/CHANGELOG.md`. This is the SDK changelog (all SDK packages share one version) and it is maintained by hand; the `sdk-publish.yml` workflow does not read it.
-
-4. Bump versions and regenerate.
-
-```sh
-bun run version <version>
-```
-
-This bumps every SDK `package.json` to the new version, regenerates the lockfile and the generated model catalog, formats, and builds. Review the result.
-
-5. Commit and push the bump to `main`.
-
-The `sdk-publish.yml` workflow publishes the version that is committed on `main` and tags that commit, so the bump must land on `main` before the workflow runs.
-
-```sh
-git add -A
-git commit -m "chore(sdk): release v<version>"
-```
-
-Ask before pushing:
-
-```sh
-git push origin HEAD
-```
-
-6. Trigger the SDK publish workflow on the `latest` channel.
-
-```sh
-gh workflow run sdk-publish.yml -f channel=latest -f confirm_publish=publish
-gh run list --workflow=sdk-publish.yml --limit=1 --json databaseId,url,status,createdAt --jq '.[0]'
-```
-
-The workflow runs the SDK tests, publishes `@cline/shared`, `@cline/llms`, `@cline/agents`, `@cline/core`, and `@cline/sdk` to npm with the `latest` dist-tag in dependency order, and pushes `sdk/<pkg>/v<version>` git tags.
-
-7. Wait for the SDK workflow to succeed before starting the CLI release.
-
-```sh
-gh run watch <run-id> --exit-status
-```
-
-Do not start the CLI release until this run has finished successfully. The CLI does not install the SDK from npm, but cutting the CLI release on top of a clean, completed SDK release keeps the two in step: the CLI release commit then sits on top of the `@cline/core` version bump, so the shipped CLI carries the new version that forces a running hub to respawn with the new code, and you are not building a CLI release on top of an SDK release that failed midway.
-
-After the SDK release succeeds, pull `main` so the CLI release is prepared on top of the SDK version bump:
-
-```sh
-git checkout main && git pull --ff-only
-```
-
-Then continue with the Workflow below.
-
-For a local SDK publish from an authenticated machine instead of the workflow, `bun release sdk <version>` exists, but prefer the `sdk-publish.yml` workflow for normal releases so the CLI release can gate on a single GitHub Actions run.
-
 ## Workflow

-Complete Step 0 first. Only proceed once the SDK is released (or you confirmed no SDK release was needed).
-
 1. Gather context.

 ```sh
@@ -132,10 +46,10 @@ Find the latest CLI tag. If there is no `cli-v*` tag, use the first relevant CLI
 2. Collect release commits.

 ```sh
-git log <last-cli-tag>..HEAD --oneline --no-merges -- apps/cli sdk/packages sdk/scripts .github/workflows/cli-publish.yml
+git log <last-cli-tag>..HEAD --oneline --no-merges -- apps/cli packages scripts .github/workflows/cli-publish.yml
 ```

-The `sdk/packages` commits matter here even though the SDK was released separately in Step 0: the CLI bundles the SDK, so SDK changes ship in this CLI release too. Read those commits and fold anything user-relevant to the CLI into the release notes (provider/model updates, behavior changes, fixes the CLI inherits). Skip SDK changes that are purely internal or have no CLI-visible effect.
+If the release includes broader SDK changes that affect the CLI, also inspect commits outside `apps/cli`.

 3. Draft user-facing release notes.

@@ -1,281 +1,5 @@
 # Cline CLI Changelog

-## 3.0.48
-
- `cline history` now opens inside the existing TUI, with resume and delete actions, instead of rendering a second view in the same process
- Connector threads (Slack, Discord, Telegram, Linear, Google Chat, WhatsApp) now recover when the session they were bound to is gone — the stale binding is dropped and the turn replays against a new session, instead of failing with "session not found" until `threads.json` is edited by hand
- `cline --help` now reports the real default `--config` and `--data-dir` paths
- The per-server `timeout` in `cline_mcp_settings.json` is now honored for `initialize`, `tools/list`, and `tools/call`, so slow MCP servers no longer fail against a hardcoded 5s limit (from SDK v0.0.67)
- Reasoning controls are now routed from the models.dev catalog across providers, with clamped budgets and correct per-provider encoding (from SDK v0.0.67)
- OpenRouter now defaults to `anthropic/claude-sonnet-5` (from SDK v0.0.67)
- Fixed the China and international endpoint toggles being ignored for Qwen, Moonshot, and Z AI (from SDK v0.0.67)
- Legacy API keys are now migrated for every secret-backed provider (from SDK v0.0.67)
- Legacy OpenAI Compatible model-info overrides now survive into the seeded `models.json` (from SDK v0.0.67)
- Fixed auto-compaction state being rejected as stale, which added a redundant summarizer call on every turn past the compaction trigger (from SDK v0.0.67)
- Fixed checkpoint restores across session resumes (from SDK v0.0.67)
- Tool calls that pass line numbers as strings (`insert_line`, `read_files` bounds) are now accepted instead of erroring (from SDK v0.0.67)
- A legacy single-file `.clinerules` no longer aborts the config scan (from SDK v0.0.67)
- Plugins can now emit telemetry through `ctx.telemetry` (from SDK v0.0.67)
-
-## 3.0.47
-
- Free Cline models are now supported end to end: free models show as "(free)", and hitting the free limit renders a dedicated card with the reset time (from SDK v0.0.66)
- `/settings` general toggles (plan/act mode, tool auto-approve, compaction mode) now persist across restarts
- Upgraded the TUI stack from opentui 0.1.102 to 0.4.3
- Fixed a grey panel left behind on screen after closing a dialog (model picker, help, command palette) — a leftover from the opentui upgrade
- Fixed a React duplicate-key warning when `read_files` listed the same path more than once
- Aborting a task no longer risks killing the shared hub daemon
- Connector status delivery failures are no longer fatal to the turn
- Agentic compaction is now the default context-compaction strategy, with fixes for it silently falling back to basic compaction and for tool-heavy transcripts that could never find a cut point (from SDK v0.0.66)
- Editor edits preserve a file's existing line endings, fixing failed exact-match edits on CRLF files (from SDK v0.0.66)
- Broader built-in provider coverage, now generated from models.dev (from SDK v0.0.66)
- Updated the bundled model catalog (from SDK v0.0.66)
-
-## 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
- Fixed Z.ai model metadata resolution for Z.ai models accessed through the Cline provider
- Reverted the model-name-only display change from v3.0.28; the model picker, selector, and status bar return to their previous display behavior
-
-## 3.0.28
-
- Added a ClinePass onboarding flow with selectable ClinePass models, plus improved ClinePass error handling
- Added hub primitive catalogs and refreshed the hub dashboard design with a dedicated customizations breakout
- Auto-approve toggles now apply immediately when changed
- Feature flags now resolve using your user ID on startup
- Fixed Cline model display names so they resolve by model name
- Truncate large tool results by default (including MCP and custom tool output) to keep requests within context budget
- Hardened parallel tool-call guidance for faster, more reliable multi-tool execution
-
-## 3.0.27
-
- Added a `cline skill` command to install and manage skills, matching `cline plugin install` and `cline mcp` (installs default to the Cline agent directory)
- Added a prefilled MCP install wizard command for quicker MCP server setup
- Improved error handling and messaging when plugin MCP OAuth authorization fails
- The CLI now rejects unknown commands and unquoted multi-word input with a clear error instead of silently treating bad arguments as a prompt
-
-## 3.0.26
-
- Reverted the expandable model picker sections and ClinePass models, restoring the previous model-selection UI
-
-## 3.0.25
-
- Added ClinePass support, with selectable ClinePass models in the model picker
- Made model picker sections expandable
- Added MCP server support to plugins, including authorizing plugin MCP OAuth during install
- Encouraged parallel tool calls for faster task execution
- Capped tool output for bash commands and file reads to keep large output within context limits
- Allowed ranged reads on large files
- Fixed apply_patch to fail when a hunk is skipped
- Fixed run_commands to return captured stdout on failure and handle split heredocs
- Fixed search tools to treat zero results as success
- Fixed disabled-reasoning handling for StepFun flash
- Fixed history resume rendering isolation
- Fixed the Hugging Face URL
- Fixed Cline OAuth token formatting in provider config
-
-## 3.0.24
-
- Plugin commands can now submit prompts to the agent
- Added support for overriding the API base URL
- Open the verification URL automatically when starting device authentication
- Enforced a single shared Cline Hub, so a stale hub is respawned after an upgrade
- Suppressed flickering console windows on Windows
- Fixed truncation of structured tool operation result strings so oversized tool output stays within limits
- Stopped echoing the full command text in run_commands tool results
-
-## 3.0.23
-
- Fixed Vertex AI GCP settings configuration
- Fixed the Azure Foundry API version
- Added support for configured agents as subagent tools
- Centralized OAuth management into the SDK
- Fixed an error caused by disabled reasoning on Fable 5
-
-## 3.0.22
-
- Added support for the Claude Fable 5 model
- Fixed MiniMax M3 thinking controls so they route correctly across gateways
-
-## 3.0.21
-
- Added a global auto-update setting that controls automatic updates on CLI startup
- Added a Cline credits refill link
- Fixed scrolling for inline ask-question responses
- Fixed connector thread session routing and stale hub session handling
- Added support for Vertex AI Application Default Credentials (ADC) with tool use
- Fixed empty message content replay for Bedrock
- Cleaned up the OpenAI Codex model list
-
-## 3.0.20
-
- Installed plugin wrappers are now named from their source (npm package name, git repo, remote filename, official slug, or local directory) instead of an opaque hash, making installed plugins easier to identify.
-
-## 3.0.19
-
- Fixed CLI auto-update to use `npm update` so updates apply reliably, while preserving the installed release channel (e.g. nightly).
-
-## 3.0.18
-
- Fix Slack channel mentions so replies post in the original message's thread.
- Fix the abort indicator to clear immediately when a task is cancelled.
- Sync the Fireworks AI model registry and refresh the bundled model catalog with current platform offerings.
- Bump the bundled SDK to v0.0.43, which forces a running Cline Hub to restart so it picks up the latest SDK code.
-
-## 3.0.17
-
- Fix a regression introduced in 3.0.15 where the interactive CLI could get stuck after stopping and restarting Cline Hub and then pressing Escape to cancel a request. The CLI now detects stale or missing sessions, recovers any pending messages, and starts a fresh session instead of failing with "session not found".
- Fix Ctrl+C and Hub shutdown races that surfaced as "hook dispatch failed" and WebSocket connection errors from late hook events racing against Hub shutdown.
- Fix the Hub daemon being shut down prematurely when a runtime request was aborted, so the daemon now stays alive.
- Improve the Telegram connector with a new `--allowed-user-id` flag to restrict which Telegram users are authorized to interact with the agent.
-
-## 3.0.16
-
- Install official Cline plugins by slug off the new github.com/cline/plugins collection.
- Uninstall plugins using `cline plugin uninstall <plugin>` or in the TUI.
- Plugins can now bundle skills, and plugin skills are grouped together in settings.
- Add Slack socket mode support.
- Allow a custom base URL for Anthropic vendor-type providers.
- Fix OAuth token migration for users signed in through the old extension.
- Use a union schema for read-files tool input validation.
- Add a `CLINE_PLUGIN_IMPORT_TIMEOUT_MS` env override to control the plugin import timeout.
-
 ## 3.0.15

 - Add Cline Hub, a web app for monitoring connected clients, viewing and driving sessions, streaming assistant output, and restarting the local hub, with local, LAN, and tunnel usage gated by a room secret.
@@ -339,9 +339,6 @@ bun run test:e2e:interactive
 # TUI-specific E2E tests (uses @microsoft/tui-test)
 bun run test:e2e:cli:tui

-# TUI E2E tests driven through tuistory (PTY + Ghostty terminal emulator)
-bun run test:e2e:tuistory
-
 # Type checking
 bun run typecheck

@@ -367,34 +364,6 @@ bun run dev -- --interactive --config /tmp/cline-test

 Or set `CLINE_FORCE_ONBOARDING=1` to force the onboarding view regardless of existing config.

-### Manually testing the TUI (agents / headless environments)
-
-[tuistory](https://github.com/remorses/tuistory) is installed as a devDependency. It wraps the TUI in a named background PTY session that can be scripted from a plain shell — no real terminal or display needed. This is the preferred way for AI agents (or anyone in a headless environment) to poke at the interactive TUI:
-
-```bash
-cd apps/cli
-
-# Launch the TUI in a background session
-bunx tuistory -s cline --cols 120 --rows 36 -- bun src/index.ts --provider anthropic -m claude-sonnet-4-6 -k test-key
-
-# Wait reactively for the chat view (no sleep guessing)
-bunx tuistory -s cline wait "What can I do for you?" --timeout 30000
-
-# Interact and inspect
-bunx tuistory -s cline type "/settings"
-bunx tuistory -s cline press enter
-bunx tuistory -s cline snapshot --trim     # current screen as text
-bunx tuistory -s cline screenshot          # current screen as a styled PNG
-
-# A human can watch/drive the same session from another terminal
-tuistory attach -s cline
-
-# Tear down
-bunx tuistory -s cline close
-```
-
-The same engine powers the `test:e2e:tuistory` vitest suite (`src/cli.tuistory.e2e.test.ts`), which uses the programmatic `launchTerminal()` API for assertions against the emulated screen.
-
 ### Adding a new TUI component

 1. Create a `.tsx` file in `src/tui/components/`
@@ -447,7 +416,7 @@ Then attach VS Code or Chrome DevTools to `ws://127.0.0.1:6499`.

 ## Publishing

-The CLI is published as the `cline` wrapper package on npm with platform-specific binaries under `@cline/cli-*`. The release flow lives in the `publish-cli` skill (`.cline/skills/publish-cli/SKILL.md` at the repo root).
+The CLI is published as the `cline` wrapper package on npm with platform-specific binaries under `@cline/cli-*`. The release flow lives in the `publish-cli` skill (`apps/cli/.cline/skills/publish-cli/SKILL.md`).

 From the `apps/cli` workspace:

@@ -163,30 +163,6 @@ cline auth --provider anthropic --apikey sk-... --modelid claude-sonnet-4-6
 cline auth --provider openai-native --apikey sk-... --modelid gpt-5 --baseurl https://api.example.com/v1
 ```

-### MCP servers
-
-Manage MCP servers with the interactive wizard:
-
-```sh
-cline mcp
-cline config mcp
-```
-
-Open the add-server wizard with the name, transport, and command or URL already filled in with `cline mcp install` (`cline mcp add` also works). Stdio servers use everything after `--` as the command and arguments:
-
-```sh
-cline mcp install fs -- npx -y @modelcontextprotocol/server-filesystem /tmp
-```
-
-Remote HTTP and SSE servers take a name, transport, and URL. The wizard still asks for auth details before saving:
-
-```sh
-cline mcp install ctx7 --transport http https://mcp.context7.com/mcp
-cline mcp install events --transport sse https://example.com/sse
-```
-
-Because this command opens the wizard, it requires a TTY.
-
 ### Connectors

 Bridge a chat surface into RPC-backed Cline sessions. Each conversation thread maps to a session with full context. Supported platforms: Telegram, Slack, Google Chat, WhatsApp, and Linear.
@@ -198,9 +174,6 @@ cline connect telegram -k 123456:ABCDEF...
 # Slack (webhook mode)
 cline connect slack --bot-token $SLACK_BOT_TOKEN --signing-secret $SLACK_SIGNING_SECRET --base-url https://your-domain.com

-# Slack (socket mode)
-cline connect slack --bot-token $SLACK_BOT_TOKEN --app-token $SLACK_APP_TOKEN
-
 # Google Chat (webhook mode)
 cline connect gchat --base-url https://your-domain.com

@@ -257,10 +230,10 @@ Schedules can route results back to chat surfaces with `--delivery-adapter`, `--
 | `--hooks-dir <path>` | Additional hooks directory hint for runtime hook injection |
 | `--acp` | ACP (Agent Client Protocol) mode |
 | `--thinking [none\|low\|medium\|high\|xhigh]` | Model thinking level when supported. Defaults to `medium` when the flag is provided without a level; thinking is off when the flag is omitted. |
-| `--compaction <agentic\|basic\|off>` | Context compaction mode. Defaults to `agentic`; use `basic` for local truncation or `off` to disable. |
+| `--compaction <agentic\|basic\|off>` | Context compaction mode. Defaults to `basic`; use `agentic` for LLM compaction or `off` to disable. |
 | `--retries <count>` | Maximum consecutive mistakes (retries) before halting (default: `3`) |
 | `--json` | Output NDJSON instead of styled text |
-| `--data-dir <path>` | Use isolated local state at `<path>` instead of `~/.cline/data` (enables sandbox mode automatically) |
+| `--data-dir <path>` | Use isolated local state at `<path>` instead of `~/.cline` (enables sandbox mode automatically) |
 | `--auto-approve [true\|false]` | Set tool auto-approval for all tools |
 | `--kanban` | Run the external `kanban` app |
 | `-y, --yolo` | Skip tool approval prompts, enable `submit_and_exit`, and disable spawn/team tools by default |
@@ -346,24 +319,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.
@@ -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,
-};
@@ -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",
@@ -85,20 +85,6 @@ const result = await Bun.build({
 	],
 	define: {
 		"process.env.NODE_ENV": '"production"',
-		...(process.env.TELEMETRY_SERVICE_API_KEY
-			? {
-					"process.env.TELEMETRY_SERVICE_API_KEY": defineProcessEnv(
-						"TELEMETRY_SERVICE_API_KEY",
-					),
-				}
-			: {}),
-		...(process.env.ERROR_SERVICE_API_KEY
-			? {
-					"process.env.ERROR_SERVICE_API_KEY": defineProcessEnv(
-						"ERROR_SERVICE_API_KEY",
-					),
-				}
-			: {}),
 		"process.env.OTEL_TELEMETRY_ENABLED": defineProcessEnv(
 			"OTEL_TELEMETRY_ENABLED",
 		),
@@ -121,7 +107,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) {
@@ -1,7 +1,7 @@
 {
 	"name": "@cline/cli",
 	"displayName": "cline",
-	"version": "3.0.48",
+	"version": "3.0.15",
 	"description": "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
 	"type": "module",
 	"publishConfig": {
@@ -62,7 +62,6 @@
 		"test:unit": "vitest run --config vitest.config.ts",
 		"test:e2e": "vitest run --config vitest.e2e.config.ts",
 		"test:e2e:interactive": "vitest run --config vitest.interactive.e2e.config.ts",
-		"test:e2e:tuistory": "vitest run --config vitest.tuistory.e2e.config.ts",
 		"test:watch": "vitest --config vitest.config.ts",
 		"test:e2e:cli:tui": "cd src/tests && tui-test",
 		"link": "bun unlink && bun link"
@@ -79,19 +78,18 @@
 		"@cline/cline-hub": "workspace:*",
 		"@gramio/format": "^0.7.0",
 		"@opentui-ui/dialog": "^0.1.2",
-		"@opentui/core": "0.4.3",
-		"@opentui/react": "0.4.3",
+		"@opentui/core": "0.1.102",
+		"@opentui/react": "0.1.102",
 		"chat": "^4.23.0",
 		"commander": "^14.0.3",
 		"fzf": "^0.5.2",
 		"marked": "^15.0.12",
 		"open": "^10.2.0",
-		"opentui-spinner": "^0.0.7",
+		"opentui-spinner": "^0.0.6",
 		"pino": "^10.3.1",
-		"posthog-node": "^5.8.0",
 		"react": "19.2.4",
 		"react-devtools-core": "^7.0.1",
-		"react-reconciler": "0.33.0",
+		"react-reconciler": "0.32.0",
 		"yaml": "^2.8.2",
 		"nanoid": "^5.1.7",
 		"zod": "^4.1.11"
@@ -100,9 +98,8 @@
 		"@cline/core": "workspace:*",
 		"@cline/shared": "workspace:*",
 		"@microsoft/tui-test": "^0.0.2",
-		"@types/bun": "^1.3.10",
 		"@types/react": "19.2.14",
-		"tuistory": "^0.10.1",
-		"vitest": "^4.0.18"
+		"vitest": "^4.0.18",
+		"@types/bun": "^1.3.10"
 	}
 }
@@ -7,8 +7,6 @@ import type {
 	ContentBlock,
 	InitializeRequest,
 	InitializeResponse,
-	LoadSessionRequest,
-	LoadSessionResponse,
 	NewSessionRequest,
 	NewSessionResponse,
 	PromptRequest,
@@ -30,12 +28,11 @@ import {
 	ProviderSettingsManager,
 	SessionSource,
 } from "@cline/core";
-import { isLikelyAuthError, type Message } from "@cline/shared";
+import type { Message } from "@cline/shared";
 import { getPersistedProviderApiKey } from "../commands/auth";
 import { resolveSystemPrompt } from "../runtime/prompt";
 import { subscribeToAgentEvents } from "../runtime/session-events";
 import { createCliCore } from "../session/session";
-import { isClineOrgIndividualInferenceSubscriptionErrorMessage } from "../utils/cline-pass-errors";
 import { getCliBuildInfo } from "../utils/common";
 import { randomSessionId, resolveWorkspaceRoot } from "../utils/helpers";
 import type { Config } from "../utils/types";
@@ -46,19 +43,8 @@ import {
 	authenticateAcpProvider,
 	isAcpAuthMethodId,
 } from "./auth";
-import {
-	buildOrganizationConfigOption,
-	fetchClineOrganizations,
-	getAcpOrgSubscriptionMessage,
-	ORGANIZATION_CONFIG_ID,
-	PERSONAL_ACCOUNT_VALUE,
-	switchClineOrganization,
-	usesClineAccount,
-} from "./organizations";
 import { requestAcpToolApproval } from "./permissions";
-import { replaySessionHistory } from "./session-load";
 import {
-	describeAgentError,
 	forwardAgentEvent,
 	sendConfigOptionUpdate,
 	sendCurrentModeUpdate,
@@ -83,15 +69,6 @@ interface SessionState {
 	abortController?: AbortController;
 	/** Unsubscribe function for the agent event listener. */
 	unsubscribe?: () => void;
-	/**
-	 * Most recent unrecoverable agent error for the in-flight turn.
-	 *
-	 * The runtime reports fatal failures (bad credentials, subscription
-	 * restrictions, provider outages) as an `error` event and still resolves
-	 * `send()` normally, so the message has to be stashed here for `prompt()` to
-	 * turn into an error response.
-	 */
-	fatalError?: Error;
 	/** Messages to inject into the next session manager for conversation continuity. */
 	pendingInitialMessages?: Message[];
 }
@@ -132,7 +109,7 @@ export class AcpAgent implements Agent {
 		};
 	}

-	isSessionReady() {
+	async newSession(params: NewSessionRequest): Promise<NewSessionResponse> {
 		// Require authentication unless an API key is provided via env var.
 		if (!this.authResult && !process.env.CLINE_API_KEY) {
 			// Check for valid persisted credentials from a previous session
@@ -142,46 +119,18 @@ export class AcpAgent implements Agent {
 			if (!this.authResult) {
 				throw RequestError.authRequired(
 					undefined,
-					"Call authenticate before starting a session",
+					"Call authenticate before creating a session",
 				);
 			}
 		}
-	}
-
-	availableModes() {
-		return [
-			{
-				id: "plan",
-				name: "Plan",
-				description:
-					"Explore the codebase and plan changes without modifying files",
-			},
-			{
-				id: "act",
-				name: "Act",
-				description: "Make changes to the codebase",
-			},
-		];
-	}
-
-	async newSession(params: NewSessionRequest): Promise<NewSessionResponse> {
-		this.isSessionReady();

 		const sessionId = randomSessionId();

 		const defaultMode = "act";
 		const providerId =
 			process.env.CLINE_PROVIDER ?? this.authResult?.providerId ?? "cline";
-
-		const providerModels = await Llms.getModelsForProvider(providerId);
-		// Model ids are provider-scoped, so the default must come from the
-		// provider's own catalog: `cline-pass` uses `cline-pass/…` ids that mean
-		// nothing to `cline`, and vice versa.
-		const defaultModelId = await resolveDefaultModelId(
-			providerId,
-			process.env.CLINE_MODEL,
-			providerModels,
-		);
+		const defaultModelId =
+			process.env.CLINE_MODEL ?? "anthropic/claude-sonnet-4.6";

 		this.sessions.set(sessionId, {
 			id: sessionId,
@@ -192,6 +141,7 @@ export class AcpAgent implements Agent {
 			currentModelId: defaultModelId,
 		});

+		const providerModels = await Llms.getModelsForProvider(providerId);
 		const availableModels = Object.entries(providerModels).map(
 			([modelId, info]) => ({
 				modelId,
@@ -200,13 +150,22 @@ export class AcpAgent implements Agent {
 			}),
 		);

-		const organizationOption =
-			await this.getOrganizationConfigOption(providerId);
-
 		return {
 			sessionId,
 			modes: {
-				availableModes: this.availableModes(),
+				availableModes: [
+					{
+						id: "plan",
+						name: "Plan",
+						description:
+							"Explore the codebase and plan changes without modifying files",
+					},
+					{
+						id: "act",
+						name: "Act",
+						description: "Make changes to the codebase",
+					},
+				],
 				currentModeId: defaultMode,
 			},
 			models: {
@@ -217,85 +176,10 @@ export class AcpAgent implements Agent {
 				await buildProviderConfigOption(providerId),
 				buildModelConfigOption(defaultModelId, providerModels),
 				buildModeConfigOption(defaultMode),
-				...(organizationOption ? [organizationOption] : []),
 			],
 		};
 	}

-	async loadSession(params: LoadSessionRequest): Promise<LoadSessionResponse> {
-		this.isSessionReady();
-
-		let session = this.sessions.get(params.sessionId);
-		let messages: Message[];
-
-		if (session?.sessionManager && session.activeSessionId) {
-			// The session is still live in this connection — replay its current
-			// conversation without restarting anything.
-			messages =
-				(await session.sessionManager.readMessages(session.activeSessionId)) ??
-				[];
-		} else {
-			if (!session) {
-				// Provider/model are not persisted per session — a session
-				// loaded on a fresh connection starts from the same defaults
-				// as a new session, with the model resolved against the
-				// provider's own catalog just like newSession.
-				const providerId =
-					process.env.CLINE_PROVIDER ?? this.authResult?.providerId ?? "cline";
-				const providerModels = await Llms.getModelsForProvider(providerId);
-				session = {
-					id: params.sessionId,
-					cwd: params.cwd,
-					mcpServers: params.mcpServers,
-					currentMode: "act",
-					currentProviderId: providerId,
-					currentModelId: await resolveDefaultModelId(
-						providerId,
-						process.env.CLINE_MODEL,
-						providerModels,
-					),
-				};
-				this.sessions.set(params.sessionId, session);
-			}
-			try {
-				messages =
-					(await this.ensureSessionManager(session, params.sessionId, {
-						resume: true,
-					})) ?? [];
-			} catch (error) {
-				this.sessions.delete(params.sessionId);
-				throw error;
-			}
-		}
-
-		// The ACP spec requires the full conversation to be replayed via
-		// session/update notifications before this request resolves.
-		await replaySessionHistory(this.conn, params.sessionId, messages);
-
-		const providerModels = await Llms.getModelsForProvider(
-			session.currentProviderId,
-		);
-		const availableModels = Object.entries(providerModels).map(
-			([availableModelId, info]) => ({
-				modelId: availableModelId,
-				name: info.name ?? availableModelId,
-				description: info.description,
-			}),
-		);
-
-		return {
-			modes: {
-				availableModes: this.availableModes(),
-				currentModeId: session.currentMode,
-			},
-			models: {
-				availableModels,
-				currentModelId: session.currentModelId,
-			},
-			configOptions: await buildAllConfigOptions(session),
-		};
-	}
-
 	async prompt(params: PromptRequest): Promise<PromptResponse> {
 		const session = this.sessions.get(params.sessionId);
 		if (!session) {
@@ -309,7 +193,6 @@ export class AcpAgent implements Agent {

 		const abortController = new AbortController();
 		session.abortController = abortController;
-		session.fatalError = undefined;

 		// If cancel() was already called before prompt() started, bail early.
 		if (abortController.signal.aborted) {
@@ -359,17 +242,6 @@ export class AcpAgent implements Agent {
 			updatedAt: new Date().toISOString(),
 		});

-		// A cancelled turn always reports `cancelled`: the ACP spec
-		// requires agents to convert abort failures into the cancelled stop reason
-		// so clients don't show cancellations as errors.
-		if (stopReason !== "cancelled") {
-			const fatalError = session.fatalError;
-			session.fatalError = undefined;
-			if (fatalError) {
-				throw toAcpPromptError(fatalError);
-			}
-		}
-
 		return { stopReason };
 	}

@@ -454,37 +326,16 @@ export class AcpAgent implements Agent {
 				// creates a fresh one with the new provider on the next prompt().
 				await this.teardownSessionManager(session);

-				// Re-resolve the model against the new provider's catalog: keep the
-				// current one when it's offered there too, otherwise fall back to the
-				// provider's declared default rather than whichever model happens to
-				// be listed first (for cline-pass that is an unrelated free model).
+				// If current model doesn't exist in new provider, reset to first available
 				const providerModels = await Llms.getModelsForProvider(value);
-				session.currentModelId = await resolveDefaultModelId(
-					value,
-					session.currentModelId,
-					providerModels,
-				);
-				break;
-			}
-
-			case ORGANIZATION_CONFIG_ID: {
-				try {
-					await switchClineOrganization({
-						apiKey: this.accountApiKey,
-						providerSettingsManager: this.providerSettingsManager,
-						organizationId: value === PERSONAL_ACCOUNT_VALUE ? null : value,
-					});
-				} catch (error) {
-					const message = describeAgentError(error);
-					throw RequestError.internalError(
-						{ message },
-						`Failed to switch account: ${message}`,
-					);
+				const modelIds = Object.keys(providerModels);
+				const fallbackModelId = modelIds[0];
+				if (
+					!modelIds.includes(session.currentModelId) &&
+					fallbackModelId !== undefined
+				) {
+					session.currentModelId = fallbackModelId;
 				}
-
-				// Restart the backend session so subsequent turns run under the
-				// newly selected account.
-				await this.teardownSessionManager(session);
 				break;
 			}

@@ -519,12 +370,6 @@ export class AcpAgent implements Agent {
 		}

 		const configOptions = await buildAllConfigOptions(session);
-		const organizationOption = await this.getOrganizationConfigOption(
-			session.currentProviderId,
-		);
-		if (organizationOption) {
-			configOptions.push(organizationOption);
-		}
 		sendConfigOptionUpdate(this.conn, params.sessionId, configOptions);
 		return { configOptions };
 	}
@@ -565,25 +410,6 @@ export class AcpAgent implements Agent {
 		this.sessions.clear();
 	}

-	private get accountApiKey(): string {
-		return process.env.CLINE_API_KEY ?? this.authResult?.apiKey ?? "";
-	}
-
-	private async getOrganizationConfigOption(
-		providerId: string,
-	): Promise<SessionConfigOption | undefined> {
-		if (!usesClineAccount(providerId)) {
-			return undefined;
-		}
-		const organizations = await fetchClineOrganizations({
-			apiKey: this.accountApiKey,
-			providerSettingsManager: this.providerSettingsManager,
-		});
-		return organizations
-			? buildOrganizationConfigOption(organizations)
-			: undefined;
-	}
-
 	/**
 	 * Attempt to restore authentication from persisted provider settings.
 	 *
@@ -641,17 +467,13 @@ export class AcpAgent implements Agent {
 	 * Lazily create and start the session manager for this ACP session.
 	 * After the first call the manager persists across prompt() calls so that
 	 * conversation history is maintained.
-	 *
-	 * With `resume: true` the persisted conversation for `acpSessionId` is read
-	 * back through the session manager.
 	 */
 	private async ensureSessionManager(
 		session: SessionState,
 		acpSessionId: string,
-		options?: { resume?: boolean },
-	): Promise<Message[] | undefined> {
+	): Promise<void> {
 		if (session.sessionManager) {
-			return undefined;
+			return;
 		}

 		const config = await this.buildConfig(session);
@@ -666,58 +488,29 @@ export class AcpAgent implements Agent {
 			workspaceRoot: config.workspaceRoot,
 		});

-		let initialMessages: Message[] | undefined;
-		if (options?.resume) {
-			initialMessages = await sessionManager
-				.readMessages(acpSessionId)
-				.catch(() => undefined);
-
-			if (!initialMessages || initialMessages.length === 0) {
-				await sessionManager
-					.dispose("acp_load_session_not_found")
-					.catch(() => {});
-				throw RequestError.resourceNotFound(acpSessionId);
-			}
-		} else {
-			initialMessages = session.pendingInitialMessages;
-			session.pendingInitialMessages = undefined;
-		}
-
 		session.unsubscribe = subscribeToAgentEvents(
 			sessionManager,
 			(event: AgentEvent) => {
-				// Remember unrecoverable failures so prompt() can fail the turn.
-				if (event.type === "error" && !event.recoverable) {
-					session.fatalError =
-						event.error instanceof Error
-							? event.error
-							: new Error(describeAgentError(event.error));
-				}
 				forwardAgentEvent(this.conn, acpSessionId, event);
 			},
 		);

+		const initialMessages = session.pendingInitialMessages;
+		session.pendingInitialMessages = undefined;
+
 		const started = await sessionManager.start({
 			source: SessionSource.CLI,
-			// Persist the core session under the ACP session id so that
-			// session/load can find the conversation by the id the client holds.
-			config: {
-				...config,
-				modelId: session.currentModelId,
-				sessionId: acpSessionId,
-			},
+			config,
 			interactive: true,
 			initialMessages,
 		});

 		session.sessionManager = sessionManager;
 		session.activeSessionId = started.sessionId;
-		return initialMessages;
 	}

 	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 ?? "";
@@ -726,7 +519,6 @@ export class AcpAgent implements Agent {
 			providerId,
 			mode: session.currentMode,
 		});
-		const cliBuildInfo = getCliBuildInfo();

 		return {
 			providerId,
@@ -745,69 +537,11 @@ 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),
 		};
 	}
 }

-async function resolveDefaultModelId(
-	providerId: string,
-	preferredModelId: string | undefined,
-	providerModels: Record<string, unknown>,
-): Promise<string> {
-	const modelIds = Object.keys(providerModels);
-	const preferred = preferredModelId?.trim();
-	if (preferred && modelIds.includes(preferred)) {
-		return preferred;
-	}
-	const providerDefault = (await Llms.getProvider(providerId))?.defaultModelId;
-	if (providerDefault && modelIds.includes(providerDefault)) {
-		return providerDefault;
-	}
-	return modelIds[0] ?? "";
-}
-
-/**
- * Convert a fatal agent error into a JSON-RPC error for the prompt response.
- *
- * Credential/subscription problems map to `auth_required` (-32000) so clients
- * can offer a re-auth affordance rather than just printing text; everything
- * else is an internal error.
- *
- * Classification goes through the shared CLI helpers, which check the error's
- * type *and* its name/message. That matters because the runtime re-wraps errors
- * as it forwards them across the event boundary, so `instanceof` alone fails on
- * the object ACP actually receives.
- */
-function toAcpPromptError(error: Error): RequestError {
-	if (isClineOrgIndividualInferenceSubscriptionErrorMessage(error)) {
-		const message = getAcpOrgSubscriptionMessage();
-		return RequestError.internalError({ message }, message);
-	}
-
-	const message = describeAgentError(error);
-	const isAuthProblem = isLikelyAuthError(error);
-	return isAuthProblem
-		? RequestError.authRequired({ message }, message)
-		: RequestError.internalError({ message }, message);
-}
-
 async function buildProviderConfigOption(
 	currentProviderId: string,
 ): Promise<SessionConfigOption> {
@@ -1,17 +1,18 @@
-import type { ProviderSettingsManager } from "@cline/core";
-import { loginAndSaveProviderOAuthCredentials } from "@cline/core";
-import { getPersistedProviderApiKey } from "../commands/auth";
+import type { ProviderSettings, ProviderSettingsManager } from "@cline/core";
+import { getClineEnvironmentConfig } from "@cline/shared";
+import type { OAuthCredentials } from "../commands/auth";
+import {
+	getPersistedProviderApiKey,
+	saveOAuthProviderSettings,
+	toProviderApiKey,
+} from "../commands/auth";
 import { writeDiagnostic } from "../utils/output";

 /**
 * Supported ACP OAuth provider IDs.
- *
- * This list doubles as the set of selectable providers (see
- * `setSessionConfigOption`)
 */
 export const ACP_AUTH_METHODS = [
 	{ id: "cline", name: "Sign in with Cline" },
-	{ id: "cline-pass", name: "Sign in with ClinePass" },
 	{ id: "openai-codex", name: "Sign in with ChatGPT Subscription" },
 ] as const;

@@ -29,13 +30,37 @@ export function isAcpAuthMethodId(id: string): id is AcpAuthMethodId {
 * If the OAuth flow requires interactive prompts (rare), defaults are used
 * when available; otherwise an error is thrown.
 */
-async function performOAuthLogin(input: {
-	providerId: AcpAuthMethodId;
-	providerSettingsManager: ProviderSettingsManager;
-}): Promise<string> {
-	const [{ createOAuthClientCallbacks }, { default: open }] = await Promise.all(
-		[import("@cline/core"), import("../utils/open")],
-	);
+async function performOAuthLogin(
+	providerId: AcpAuthMethodId,
+	existingSettings: ProviderSettings | undefined,
+): Promise<OAuthCredentials> {
+	const [{ createOAuthClientCallbacks }, { default: open }, coreOAuth] =
+		await Promise.all([
+			import("@cline/core"),
+			import("open"),
+			import("@cline/core").then((m) => ({
+				loginClineOAuth: m.loginClineOAuth as (input: {
+					useWorkOSDeviceAuth?: boolean;
+					apiBaseUrl: string;
+					callbacks: {
+						onAuth: (info: { url: string; instructions?: string }) => void;
+						onPrompt: (prompt: {
+							message: string;
+							defaultValue?: string;
+						}) => Promise<string>;
+						onManualCodeInput?: () => Promise<string>;
+					};
+				}) => Promise<OAuthCredentials>,
+				loginOpenAICodex: m.loginOpenAICodex as (input: {
+					onAuth: (info: { url: string; instructions?: string }) => void;
+					onPrompt: (prompt: {
+						message: string;
+						defaultValue?: string;
+					}) => Promise<string>;
+					onManualCodeInput?: () => Promise<string>;
+				}) => Promise<OAuthCredentials>,
+			})),
+		]);

 	const callbacks = createOAuthClientCallbacks({
 		onPrompt: ({ defaultValue }) => {
@@ -57,18 +82,18 @@ async function performOAuthLogin(input: {
 		},
 	});

-	const settings = await loginAndSaveProviderOAuthCredentials(
-		input.providerSettingsManager,
-		input.providerId,
-		{ callbacks },
-	);
-	const apiKey = getPersistedProviderApiKey(input.providerId, settings);
-	if (!apiKey) {
-		throw new Error(
-			`OAuth login did not persist credentials for ${input.providerId}`,
-		);
+	if (providerId === "cline") {
+		return coreOAuth.loginClineOAuth({
+			apiBaseUrl:
+				existingSettings?.baseUrl?.trim() ||
+				getClineEnvironmentConfig().apiBaseUrl,
+			callbacks,
+			useWorkOSDeviceAuth: true,
+		});
 	}
-	return apiKey;
+
+	// openai-codex
+	return coreOAuth.loginOpenAICodex(callbacks);
 }

 export interface AcpAuthResult {
@@ -97,10 +122,16 @@ export async function authenticateAcpProvider(

 	// Perform a fresh OAuth login.
 	writeDiagnostic(`[acp/auth] Starting OAuth login for ${methodId}…`);
-	const apiKey = await performOAuthLogin({
-		providerId: methodId,
+	const credentials = await performOAuthLogin(methodId, existing);
+
+	saveOAuthProviderSettings(
 		providerSettingsManager,
-	});
+		methodId,
+		existing,
+		credentials,
+	);
+
+	const apiKey = toProviderApiKey(methodId, credentials);
 	writeDiagnostic(`[acp/auth] Successfully authenticated with ${methodId}`);
 	return { providerId: methodId, apiKey };
 }
@@ -1,49 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-	buildOrganizationConfigOption,
-	PERSONAL_ACCOUNT_VALUE,
-} from "./organizations";
-
-describe("buildOrganizationConfigOption", () => {
-	const organizations = [
-		{
-			active: false,
-			memberId: "m-1",
-			name: "Acme Corp",
-			organizationId: "org-1",
-			roles: ["member" as const],
-		},
-		{
-			active: true,
-			memberId: "m-2",
-			name: "Cline Bot Inc",
-			organizationId: "org-2",
-			roles: ["admin" as const],
-		},
-	];
-
-	it("lists Personal first plus every organization", () => {
-		const option = buildOrganizationConfigOption({
-			organizations,
-			activeOrganizationId: "org-2",
-		});
-		expect(option.id).toBe("organization");
-		if (option.type !== "select") {
-			throw new Error(`expected a select option, got ${option.type}`);
-		}
-		expect(option.currentValue).toBe("org-2");
-		expect(option.options).toEqual([
-			{ value: PERSONAL_ACCOUNT_VALUE, name: "Personal" },
-			{ value: "org-1", name: "Acme Corp" },
-			{ value: "org-2", name: "Cline Bot Inc" },
-		]);
-	});
-
-	it("selects Personal when no organization is active", () => {
-		const option = buildOrganizationConfigOption({
-			organizations,
-			activeOrganizationId: null,
-		});
-		expect(option.currentValue).toBe(PERSONAL_ACCOUNT_VALUE);
-	});
-});
@@ -1,154 +0,0 @@
-import type { SessionConfigOption } from "@agentclientprotocol/sdk";
-import {
-	type ClineAccountOrganization,
-	ClineAccountService,
-	getPersistedProviderApiKey,
-	type ProviderSettingsManager,
-	RuntimeOAuthTokenManager,
-} from "@cline/core";
-import { getClineEnvironmentConfig } from "@cline/shared";
-
-export const PERSONAL_ACCOUNT_VALUE = "personal";
-
-export const ORGANIZATION_CONFIG_ID = "organization";
-
-export function usesClineAccount(providerId: string): boolean {
-	return providerId === "cline" || providerId === "cline-pass";
-}
-
-export interface AcpOrganizationState {
-	organizations: ClineAccountOrganization[];
-	/** Active organization id, or null when the personal account is active. */
-	activeOrganizationId: string | null;
-}
-
-interface ClineAccountInput {
-	apiKey: string;
-	providerSettingsManager: ProviderSettingsManager;
-}
-
-// Cline access tokens expire between runs, so account requests resolve
-// through the refresh-aware OAuth manager. A single shared instance keeps
-// refreshes single-flight; the refresh token is single-use, so parallel
-// refreshes would invalidate each other.
-let oauthTokenManager: RuntimeOAuthTokenManager | undefined;
-
-function createAccountService(input: ClineAccountInput): ClineAccountService {
-	const { providerSettingsManager } = input;
-	const settings = providerSettingsManager.getProviderSettings("cline");
-	return new ClineAccountService({
-		apiBaseUrl:
-			settings?.baseUrl?.trim() || getClineEnvironmentConfig().apiBaseUrl,
-		getAuthToken: async () => {
-			try {
-				oauthTokenManager ??= new RuntimeOAuthTokenManager({
-					providerSettingsManager,
-				});
-				const resolution = await oauthTokenManager.resolveProviderApiKey({
-					providerId: "cline",
-				});
-				if (resolution?.apiKey) {
-					return resolution.apiKey;
-				}
-			} catch {
-				// Fall back to the persisted token; the account request surfaces
-				// the auth failure to the caller.
-			}
-			return (
-				getPersistedProviderApiKey(
-					"cline",
-					providerSettingsManager.getProviderSettings("cline"),
-				) ||
-				input.apiKey ||
-				undefined
-			);
-		},
-	});
-}
-
-export async function fetchClineOrganizations(
-	input: ClineAccountInput,
-): Promise<AcpOrganizationState | undefined> {
-	try {
-		const service = createAccountService(input);
-		const organizations = await service.fetchUserOrganizations();
-		if (organizations.length === 0) {
-			return undefined;
-		}
-		return {
-			organizations,
-			activeOrganizationId:
-				organizations.find((org) => org.active)?.organizationId ?? null,
-		};
-	} catch {
-		return undefined;
-	}
-}
-
-export function buildOrganizationConfigOption(
-	state: AcpOrganizationState,
-): SessionConfigOption {
-	return {
-		type: "select",
-		id: ORGANIZATION_CONFIG_ID,
-		name: "Account",
-		description:
-			"The Cline account usage is billed to — your personal account or an organization",
-		category: "account",
-		currentValue: state.activeOrganizationId ?? PERSONAL_ACCOUNT_VALUE,
-		options: [
-			{ value: PERSONAL_ACCOUNT_VALUE, name: "Personal" },
-			...state.organizations.map((org) => ({
-				value: org.organizationId,
-				name: org.name,
-			})),
-		],
-	};
-}
-
-export async function switchClineOrganization(
-	input: ClineAccountInput & { organizationId: string | null },
-): Promise<void> {
-	const service = createAccountService(input);
-	await service.switchAccount(input.organizationId);
-	await persistActiveOrganization(input.providerSettingsManager, service);
-}
-
-// Re-persist the active organization so headless runs and the hub daemon
-// attribute telemetry to the right account. Best-effort: the switch itself
-// already succeeded server-side.
-async function persistActiveOrganization(
-	manager: ProviderSettingsManager,
-	service: ClineAccountService,
-): Promise<void> {
-	try {
-		const organizations = await service.fetchUserOrganizations();
-		const active = organizations.find((org) => org.active) ?? null;
-		const persisted = manager.getProviderSettings("cline");
-		if (!persisted) {
-			return;
-		}
-		manager.saveProviderSettings(
-			{
-				...persisted,
-				auth: {
-					...persisted.auth,
-					organizationId: active?.organizationId,
-					organizationName: active?.name,
-					memberId: active?.memberId,
-				},
-			},
-			{ setLastUsed: false },
-		);
-	} catch {
-		// Ignore; see above.
-	}
-}
-
-export function getAcpOrgSubscriptionMessage(): string {
-	return [
-		"Organization accounts cannot use ClinePass subscriptions.",
-		'Switch the "Account" session option to Personal to keep using ClinePass,',
-		'or switch the "Provider" option to Cline to bill your organization.',
-	].join(" ");
-}
@@ -1,170 +0,0 @@
-import type { AgentSideConnection } from "@agentclientprotocol/sdk";
-import { describe, expect, it, vi } from "vitest";
-import {
-	replaySessionHistory,
-	translateHistoricalMessage,
-} from "./session-load";
-
-describe("translateHistoricalMessage", () => {
-	it("maps string content to a message chunk for the right role", () => {
-		expect(translateHistoricalMessage({ role: "user", content: "hi" })).toEqual(
-			[
-				{
-					sessionUpdate: "user_message_chunk",
-					content: { type: "text", text: "hi" },
-				},
-			],
-		);
-
-		expect(
-			translateHistoricalMessage({ role: "assistant", content: "hello" }),
-		).toEqual([
-			{
-				sessionUpdate: "agent_message_chunk",
-				content: { type: "text", text: "hello" },
-			},
-		]);
-	});
-
-	it("skips empty text and unknown blocks", () => {
-		expect(
-			translateHistoricalMessage({
-				role: "assistant",
-				content: [
-					{ type: "text", text: "" },
-					{ type: "redacted_thinking", data: "xxx" },
-				],
-			}),
-		).toEqual([]);
-	});
-
-	it("maps thinking blocks to agent_thought_chunk", () => {
-		expect(
-			translateHistoricalMessage({
-				role: "assistant",
-				content: [{ type: "thinking", thinking: "pondering" }],
-			}),
-		).toEqual([
-			{
-				sessionUpdate: "agent_thought_chunk",
-				content: { type: "text", text: "pondering" },
-			},
-		]);
-	});
-
-	it("maps tool_use to a pending tool_call", () => {
-		const updates = translateHistoricalMessage({
-			role: "assistant",
-			content: [
-				{
-					type: "tool_use",
-					id: "call-1",
-					name: "read_files",
-					input: { file_paths: ["a.ts"] },
-				},
-			],
-		});
-		expect(updates).toHaveLength(1);
-		expect(updates[0]).toMatchObject({
-			sessionUpdate: "tool_call",
-			toolCallId: "call-1",
-			kind: "read",
-			status: "pending",
-			rawInput: { file_paths: ["a.ts"] },
-		});
-	});
-
-	it("maps tool_result to a tool_call_update with flattened output", () => {
-		expect(
-			translateHistoricalMessage({
-				role: "user",
-				content: [
-					{
-						type: "tool_result",
-						tool_use_id: "call-1",
-						name: "read_files",
-						content: [
-							{ type: "text", text: "line one" },
-							{ type: "image", data: "abc", mediaType: "image/png" },
-						],
-					},
-				],
-			}),
-		).toEqual([
-			{
-				sessionUpdate: "tool_call_update",
-				toolCallId: "call-1",
-				status: "completed",
-				rawOutput: "line one\n[image]",
-			},
-		]);
-	});
-
-	it("marks errored tool results as failed", () => {
-		const [update] = translateHistoricalMessage({
-			role: "user",
-			content: [
-				{
-					type: "tool_result",
-					tool_use_id: "call-2",
-					name: "run_commands",
-					content: "boom",
-					is_error: true,
-				},
-			],
-		});
-		expect(update).toMatchObject({
-			sessionUpdate: "tool_call_update",
-			toolCallId: "call-2",
-			status: "failed",
-			rawOutput: "boom",
-		});
-	});
-
-	it("maps image blocks to image content chunks", () => {
-		expect(
-			translateHistoricalMessage({
-				role: "user",
-				content: [{ type: "image", data: "abc", mediaType: "image/png" }],
-			}),
-		).toEqual([
-			{
-				sessionUpdate: "user_message_chunk",
-				content: { type: "image", data: "abc", mimeType: "image/png" },
-			},
-		]);
-	});
-});
-
-describe("replaySessionHistory", () => {
-	it("sends one awaited notification per update, in order", async () => {
-		const sent: unknown[] = [];
-		const conn = {
-			sessionUpdate: vi.fn(async (notification: unknown) => {
-				sent.push(notification);
-			}),
-		} as unknown as AgentSideConnection;
-
-		await replaySessionHistory(conn, "sess-1", [
-			{ role: "user", content: "question" },
-			{ role: "assistant", content: "answer" },
-		]);
-
-		expect(sent).toEqual([
-			{
-				sessionId: "sess-1",
-				update: {
-					sessionUpdate: "user_message_chunk",
-					content: { type: "text", text: "question" },
-				},
-			},
-			{
-				sessionId: "sess-1",
-				update: {
-					sessionUpdate: "agent_message_chunk",
-					content: { type: "text", text: "answer" },
-				},
-			},
-		]);
-	});
-});
@@ -1,113 +0,0 @@
-import type {
-	AgentSideConnection,
-	SessionUpdate,
-} from "@agentclientprotocol/sdk";
-import type { ContentBlock, Message, ToolResultContent } from "@cline/shared";
-import { buildToolTitle, mapToolKind } from "./tool-utils";
-
-/**
- * Replay a persisted conversation to the client as session/update
- * notifications. Used by `session/load` — the ACP spec requires the entire
- * conversation to be replayed before the load request resolves, so each
- * notification is awaited.
- */
-export async function replaySessionHistory(
-	conn: AgentSideConnection,
-	sessionId: string,
-	messages: Message[],
-): Promise<void> {
-	for (const message of messages) {
-		for (const update of translateHistoricalMessage(message)) {
-			await conn.sessionUpdate({ sessionId, update });
-		}
-	}
-}
-
-export function translateHistoricalMessage(message: Message): SessionUpdate[] {
-	const blocks: ContentBlock[] =
-		typeof message.content === "string"
-			? [{ type: "text", text: message.content }]
-			: message.content;
-
-	const updates: SessionUpdate[] = [];
-
-	for (const block of blocks) {
-		switch (block.type) {
-			case "text": {
-				if (!block.text) break;
-				const content = { type: "text" as const, text: block.text };
-				updates.push(
-					message.role === "user"
-						? { sessionUpdate: "user_message_chunk", content }
-						: { sessionUpdate: "agent_message_chunk", content },
-				);
-				break;
-			}
-			case "thinking": {
-				if (!block.thinking) break;
-				updates.push({
-					sessionUpdate: "agent_thought_chunk",
-					content: { type: "text", text: block.thinking },
-				});
-				break;
-			}
-			case "image": {
-				const content = {
-					type: "image" as const,
-					data: block.data,
-					mimeType: block.mediaType,
-				};
-				updates.push(
-					message.role === "user"
-						? { sessionUpdate: "user_message_chunk", content }
-						: { sessionUpdate: "agent_message_chunk", content },
-				);
-				break;
-			}
-			case "tool_use": {
-				updates.push({
-					sessionUpdate: "tool_call",
-					toolCallId: block.id,
-					title: buildToolTitle(block.name, block.input),
-					kind: mapToolKind(block.name),
-					status: "pending",
-					rawInput: block.input,
-				});
-				break;
-			}
-			case "tool_result": {
-				updates.push({
-					sessionUpdate: "tool_call_update",
-					toolCallId: block.tool_use_id,
-					status: block.is_error ? "failed" : "completed",
-					rawOutput: flattenToolResultContent(block.content),
-				});
-				break;
-			}
-			default:
-				break;
-		}
-	}
-
-	return updates;
-}
-
-function flattenToolResultContent(
-	content: ToolResultContent["content"],
-): string {
-	if (typeof content === "string") {
-		return content;
-	}
-	return content
-		.map((part) => {
-			switch (part.type) {
-				case "text":
-					return part.text;
-				case "file":
-					return part.content;
-				default:
-					return "[image]";
-			}
-		})
-		.join("\n");
-}
@@ -4,7 +4,6 @@ import type {
 	SessionUpdate,
 } from "@agentclientprotocol/sdk";
 import type { AgentEvent } from "@cline/core";
-import { getErrorMessage } from "@cline/shared";
 import { buildToolTitle, mapToolKind } from "./tool-utils";

 /**
@@ -82,11 +81,6 @@ function translateContentStart(
 	}
 }

-export function describeAgentError(error: unknown): string {
-	const message = getErrorMessage(error).trim();
-	return message || "The agent reported an unknown error.";
-}
-
 function translateContentEnd(
 	event: AgentEvent & { type: "content_end" },
 ): SessionUpdate[] {
--- a/Show More
+++ b/Show More