Add a GitHub Action that tells how to manually test a PR

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/big-turkeys-shake.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Add support for bundled endpoints.json in enterprise distributions. Extensions can now include a pre-configured endpoints.json file that automatically switches Cline to self-hosted mode. Includes packaging scripts for VSIX, NPM, and JetBrains plugins.

.changeset/bright-rooms-wonder.md

@@ -0,0 +1,5 @@
+---
+"cline": patch
+---
+
+Replace the LiteLLM model list with a selector

.changeset/clear-rockets-happen.md

@@ -1,5 +0,0 @@
----
-"cline": minor
----
-
-Adds Messages API support to Oracle Code Assist, adding functionality for Claude models

.changeset/cli-build-workflow.md

@@ -0,0 +1,5 @@
+---
+"cline": patch
+---
+
+Add GitHub Actions workflow to build CLI from any commit for testing

.changeset/cli-stdin-hang.md

@@ -0,0 +1,5 @@
+---
+"cline": patch
+---
+
+fix(cli): prevent hang when spawned without TTY

.changeset/cold-opus-launch.md

@@ -0,0 +1,5 @@
+---
+"cline": patch
+---
+
+Add Claude Opus 4.6 model support

.changeset/config.json

@@ -0,0 +1,11 @@
+{
+	"$schema": "https://unpkg.com/@changesets/config@3.0.5/schema.json",
+	"changelog": "@changesets/cli/changelog",
+	"commit": false,
+	"fixed": [],
+	"linked": [],
+	"access": "restricted",
+	"baseBranch": "main",
+	"updateInternalDependencies": "patch",
+	"ignore": []
+}

.changeset/cuddly-phones-count.md

@@ -1,5 +0,0 @@
----
-"cline": patch
----
-
-Add /q command to quit CLI

.changeset/early-beers-glow.md

@@ -1,5 +0,0 @@
----
-"cline": patch
----
-
-Add Additional Markdown Formatting in CLI

.changeset/famous-poems-smell.md

@@ -0,0 +1,5 @@
+---
+"cline": patch
+---
+
+Supports rendering markdown table in chat view.

.changeset/fix-cli-stdin-ci.md

@@ -0,0 +1,5 @@
+---
+"cline": patch
+---
+
+Fix CLI crashing in CI environments and with stdin redirection (e.g., `cline "prompt" < /dev/null`). Now checks both stdin and stdout TTY status before using Ink, and only errors on empty stdin when no prompt is provided.

.changeset/fix-explain-changes-file-context-path.md

@@ -1,16 +0,0 @@
----
-"cline": patch
----
-
-fix: resolve "Could not find the file context" error in Explain Changes comment replies
-
-When clicking a line to start a discussion in the Explain Changes diff view, replies would
-intermittently fail with "Error: Could not find the file context". This happened because
-the reply handler and the `onCommentStart` callback were using a strict `absolutePath`-only
-match to look up files in `changedFiles`, while the VS Code comment controller may return
-paths in different formats (relative vs. absolute, different separators on Windows, etc.).
-
-Fixed by adding a `relativePath` fallback in both lookup sites, making them consistent with
-the already-correct logic in `streamAIExplanationComments`.
-
-Fixes #9382

.changeset/fix-jetbrains-open-external-fallback.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix JetBrains sign-in regression by adding fallback for openExternal RPC

.changeset/fix-oca-clear-stale-tokens.md

@@ -1,18 +0,0 @@
----
-"cline": patch
----
-
-fix: clear all OCA secrets on auth refresh failure to prevent re-auth loop
-
-When OCA (Oracle Code Assist) token refresh fails with 400 invalid_grant or 401,
-the stale secrets were not fully cleared from storage. The `clearAuth()` method
-only cleared `ocaApiKey` and `ocaRefreshToken`, leaving legacy secrets
-`ocaAccessToken` and `ocaTokenSet` (set by older Cline versions) in VS Code's
-secret storage. These stale secrets caused every subsequent re-auth attempt to
-fail in a loop, requiring manual SQLite deletion to recover.
-
-Fix:
-- Added `ocaAccessToken` and `ocaTokenSet` to `SecretKeys` in `state-keys.ts`
-- Updated `OcaAuthProvider.clearAuth()` to clear all 4 OCA secrets
-
-Fixes #9567

.changeset/fix-vscode-server-auth.md

@@ -0,0 +1,7 @@
+---
+"cline": patch
+---
+
+fix: use vscode.env.openExternal for auth in remote environments
+
+Fixes OAuth authentication in VS Code Server and remote environments by routing browser URL opening through VS Code's native openExternal API instead of the npm 'open' package.

.changeset/fix-vscode-web-auth-callback.md

@@ -0,0 +1,7 @@
+---
+"cline": patch
+---
+
+fix: use vscode.env.asExternalUri for auth callback URLs only in VS Code Web
+
+Fixes OAuth callback redirect in VS Code Web (`code serve-web`) environments by using `vscode.env.asExternalUri()` to resolve the callback URI. This is gated behind a `vscode.env.uiKind === UIKind.Web` check so regular desktop VS Code continues to use the `vscode://` URI directly, avoiding unintended transformations from `asExternalUri`.

.changeset/gpt-oss-openai-compat-apply-patch.md

@@ -1,9 +0,0 @@
----
-"claude-dev": patch
----
-
-Fix OpenAI-compatible `gpt-oss` native tool mode so file editing works reliably:
-
-- Enable `apply_patch` for `gpt-oss` models when using native GPT-5 prompt variants.
-- Add regression tests covering model family selection and tool availability.
-- Add a smoke-test scenario for OpenAI-compatible `gpt-oss` file editing and improve the smoke runner for per-scenario auth/env requirements.

.changeset/hungry-ants-pump.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Updating script documentation and removing unnecessary continue on error

.changeset/neat-seals-guess.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Fix a streaming crash when a chunk has usage data but no `delta` by guarding reasoning field checks in provider handlers. Add regression tests for OpenRouter, Cline, Vercel AI Gateway, and Fireworks handlers to cover usage-only chunks.

.changeset/plain-lies-repair.md

@@ -0,0 +1,5 @@
+---
+"cline": patch
+---
+
+Fix Bedrock model id

.changeset/safe-yaml-schema.md

@@ -1,5 +0,0 @@
----
-"cline": patch
----
-
-Use JSON_SCHEMA for yaml.load to prevent unsafe deserialization from untrusted sources

.changeset/six-clubs-double.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Unify ViewHeader Styles Across All Views

.changeset/small-bugs-complain.md

@@ -1,4 +0,0 @@
-"claude-dev": patch
----
-
-Add missing smoke evaluation npm scripts so documented commands like `npm run eval:smoke:run` work from the repository root.

.changeset/smoke-test-retries.md

@@ -1,5 +0,0 @@
----
-"cline": patch
----
-
-Add automatic retries (up to 3 attempts) for smoke test CI jobs to reduce flaky failures

.changeset/strong-dolls-beam.md

@@ -1,5 +0,0 @@
----
-"cline": patch
----
-
-add focus ring on action buttons

.changeset/tender-berries-search.md

@@ -1,5 +0,0 @@
----
-"cline": patch
----
-
-fix acp auth check so acp mode can be used with more providers

.changeset/two-keys-create.md

@@ -0,0 +1,5 @@
+---
+"cline": minor
+---
+
+Add Generate API Key on Hicap Provider selection

.changeset/wacky-ends-relax.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Update SambaNova Provider models list and add temperature for models

.changie.yaml

@@ -0,0 +1,26 @@
+changesDir: .changes
+unreleasedDir: unreleased
+headerPath: header.tpl.md
+changelogPath: CHANGELOG.md
+versionExt: md
+versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
+kindFormat: "### {{.Kind}}"
+changeFormat: "* {{.Body}}"
+kinds:
+    - label: Added
+      auto: minor
+    - label: Changed
+      auto: major
+    - label: Deprecated
+      auto: minor
+    - label: Removed
+      auto: major
+    - label: Fixed
+      auto: patch
+    - label: Security
+      auto: patch
+newlines:
+    afterChangelogHeader: 1
+    beforeChangelogVersion: 1
+    endOfVersion: 1
+envPrefix: CHANGIE_

.cline/skills/create-pull-request/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: create-pull-request
-description: Create a GitHub pull request following project conventions. Use when the user asks to create a PR, submit changes for review, or open a pull request. Handles commit analysis, branch management, PR template usage, and PR creation using the gh CLI tool.
+description: Create a GitHub pull request following project conventions. Use when the user asks to create a PR, submit changes for review, or open a pull request. Handles commit analysis, branch management, and PR creation using the gh CLI tool.
 ---
 
 # Create Pull Request
@@ -147,29 +147,14 @@ When filling out the template:
 
 ### Create PR with gh CLI
 
-**Use a temporary file for the PR body** to avoid shell escaping issues, newline problems, and other command-line flakiness:
-
-1. Write the PR body to a temporary file:
-   ```
-   /tmp/pr-body.md
-   ```
-
-2. Create the PR using the file:
-   ```bash
-   gh pr create --title "PR_TITLE" --body-file /tmp/pr-body.md --base main
-   ```
-
-3. Clean up the temporary file:
-   ```bash
-   rm /tmp/pr-body.md
-   ```
-
-For draft PRs:
 ```bash
-gh pr create --title "PR_TITLE" --body-file /tmp/pr-body.md --base main --draft
+gh pr create --title "PR_TITLE" --body "PR_BODY" --base main
 ```
 
-**Why use a file?** Passing complex markdown with newlines, special characters, and checkboxes directly via `--body` is error-prone. The `--body-file` flag handles all content reliably.
+Alternatively, create as draft if the user wants review before marking ready:
+```bash
+gh pr create --title "PR_TITLE" --body "PR_BODY" --base main --draft
+```
 
 ## Post-Creation
 

.clinerules/general.md

@@ -14,7 +14,7 @@ This file is the secret sauce for working effectively in this codebase. It captu
 
 ## Miscellaneous
 - 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 creating PRs, if the change is user-facing and significant enough to warrant a changelog entry, run `npm run changeset` and create a patch changeset. Never create minor or major version bumps. Skip changesets for trivial fixes, internal refactors, or minor UI tweaks that users wouldn't notice.
 - 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
 
@@ -147,17 +147,6 @@ Required steps:
 
 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(...)`
-- `src/core/controller/state/updateSettingsCli.ts` for CLI/ACP settings updates
-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 `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(context)` in `common.ts`. For most state, use `controller.stateManager.setGlobalState()`/`getGlobalStateKey()`.
 

.clinerules/storage.md

@@ -1,64 +0,0 @@
-# Storage Architecture
-
-Global settings, secrets and workspace state are stored in **file-backed JSON stores** under `~/.cline/data/`. This is the shared storage layer used by VSCode, CLI, and JetBrains.
-
-## Key Abstractions
-
-### `StorageContext` (src/shared/storage/storage-context.ts)
-The entry point. Created via `createStorageContext()` and passed to `StateManager.initialize()`. Contains three `ClineFileStorage` instances:
-- `globalState` → `~/.cline/data/globalState.json`
-- `secrets` → `~/.cline/data/secrets.json` (mode 0o600)
-- `workspaceState` → `~/.cline/data/workspaces/<hash>/workspaceState.json`
-
-### `ClineFileStorage` (src/shared/storage/ClineFileStorage.ts)
-Synchronous JSON key-value store backed by a single file. Supports `get()`, `set()`, `setBatch()`, `delete()`. Writes are atomic (write-then-rename).
-
-### `StateManager` (src/core/storage/StateManager.ts)
-In-memory cache on top of `StorageContext`. All runtime reads hit the cache; writes update cache immediately and debounce-flush to disk.
-
-## ⚠️ Do NOT Use VSCode's ExtensionContext for Storage
-
-**Do not** read from or write to `context.globalState`, `context.workspaceState`, or `context.secrets` for persistent data. These are VSCode-specific and not available on CLI or JetBrains.
-
-Instead, use:
-```typescript
-// Reading state
-StateManager.get().getGlobalStateKey("myKey")
-StateManager.get().getSecretKey("mySecretKey")
-StateManager.get().getWorkspaceStateKey("myWsKey")
-
-// Writing state
-StateManager.get().setGlobalState("myKey", value)
-StateManager.get().setSecret("mySecretKey", value)
-StateManager.get().setWorkspaceState("myWsKey", value)
-```
-
-Remember that your data may be read by a different client than the one that wrote it. For example, a value written by Cline in JetBrains may be read by Cline CLI.
-
-## VSCode Migration (src/hosts/vscode/vscode-to-file-migration.ts)
-
-On VSCode startup, a migration copies data from VSCode's `ExtensionContext` storage into the file-backed stores. This runs in `src/common.ts` before `StateManager.initialize()`.
-
-- **Sentinel**: `__vscodeMigrationVersion` key in global state and workspace state — prevents re-migration.
-- **Merge strategy**: File store wins. Existing values are never overwritten.
-- **Safe downgrade**: VSCode storage is NOT cleared, so older extension versions still work.
-
-## Adding New Storage Keys
-
-1. Add to `src/shared/storage/state-keys.ts` (see existing patterns)
-2. Read/write via `StateManager` (NOT via `context.globalState`)
-3. If adding a secret, add to `SecretKeys` array in `state-keys.ts`
-
-## File Layout
-
-```
-~/.cline/
-  data/
-    globalState.json          # Global settings & state
-    secrets.json              # API keys (mode 0o600)
-    tasks/
-      taskHistory.json        # Task history (separate file)
-    workspaces/
-      <hash>/
-        workspaceState.json   # Per-workspace toggles
-```

.clinerules/workflows/address-pr-comments.md

@@ -19,7 +19,7 @@ Review and address all comments on the current branch's PR.
    - Inline comments: `gh api repos/{owner}/{repo}/pulls/{pr_number}/comments`
    - General comments: `gh pr view {pr_number} --json comments,reviews`
 
-4. Present a summary of all comments with your recommendation for each (apply, skip, or respond). Ignore bot noise (release automation, CI status, etc.).
+4. Present a summary of all comments with your recommendation for each (apply, skip, or respond). Ignore bot noise (changeset-bot, CI status, etc.).
 
 5. **Wait for my approval** before proceeding.
 

.clinerules/workflows/extension-release.md

@@ -0,0 +1,549 @@
+The goal of this workflow is to take a changeset for a release of Cline, an autonomous coding agent extension that plugs right into your IDE, and write the updated announcement component, and the updated changelog. 
+
+
+For reference, here are some examples of how we converted previous changesets to announcement components / changelogs. 
+
+
+- 3.14
+<changeset>
+This PR was opened by the Changesets release GitHub action. When you're ready to do a release, you can merge this and publish to npm yourself or setup this action to publish automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated.
+
+Releases
+claude-dev@3.14.0
+Minor Changes
+77c9863: create clinerules folder if its currently a file and creating new rule
+0ffb7dd: disabling shift hint for now & improving tooltip behavior
+79b76fd: Add support for custom model ID in AWS Bedrock provider, enabling use of Application Inference Profile.
+eb6e481: Full support for LaTeX rendering
+df37f29: Add support for custom API request timeout. Previously, timeouts were hardcoded to 30 seconds for providers like Ollama or 15 seconds for OpenRouter and Cline. Now users can set a custom timeout value in milliseconds through the settings interface.
+e4d26be: allow cursorrules and windsurfrules
+c5de50f: Fix Handle @withRetry() SyntaxError when running extension locally issue
+61d2f42: enabled pricing calculation for gemini and vertex + more robust caching & cache tracking for gemini & vertex
+aed152b: add truncation notice when truncating manually
+2fe2405: Migrate Cline Tools Section to new docs
+19cc8bc: Add a timeout setting for the terminal connection, allowing users to adjust this if they are having timeout issues
+03d4410: Added copy button to code blocks.
+c78fe23: addressed race condition in terminal command usage
+91e222f: add checkpoints after more messages
+14230e7: add newrule slash command
+1c7d33a: Add remote config with posthog allowing for disabling new features until they're reading, making for a better developer experience.
+4196c14: add cache ui for open router and cline provider
+d97424f: showing expanded task by default
+5294e78: Refactor to not pass a message for showing the MCP View from the servers modal
+70cc437: Fix Windows path issue: Correct handling of import.meta.url to avoid leading slash in pathname
+4b697d8: Migrate the addRemoteServer to protobus
+Patch Changes
+c63d9a1: updated drag and drop text to say "drop" instead of "drag"
+459adf0: Add markdown copy to chat
+74ec823: Minor UX improvement to drag and drop ux
+b0961f4: Remove linear pull request action
+e9ce384: searchCommits protobus migration
+5802b68: createRuleFile protobus migration
+df7f9fc: Add dependsOn to more blocks in the tasks.json
+41ae732: Fix for git commit mentions in repos with no git commits
+7e78445: Adding args to allow Cursor to open workspaces (for checkpoint testing/development)
+bdfda6f: feat(bedrock): Introduce Amazon Nova Premier
+65243ad: Introduce UI library for future UI development
+4565e06: checkIsImageURL migrated to protobus
+5a8e9d8: protobus migration for openImage
+deeda6e: Lowering Gemini cache TTL time
+db0b022: Adding UI to show openrouter balance next to provider
+4650ffa: deleteRuleFile protobus migration
+d4bd755: fix cost calculation
+</changeset>
+
+<changelog>
+## [3.14.0]
+
+-   Add UI to show openrouter balance next to provider
+-   Add support for custom model ID in AWS Bedrock provider, enabling use of Application Inference Profile (Thanks @clicube!)
+-   Add more robust caching & cache tracking for gemini & vertex providers
+-   Add support for LaTeX rendering
+-   Add support for custom API request timeout. Timeouts were 15-30s, but can now be configured via settings for OpenRouter/Cline & Ollama (Thanks @WingsDrafterwork!)
+-   Add truncation notice when truncating manually
+-   Add a timeout setting for the terminal connection, allowing users to set a time to wait for terminal startup
+-   Add copy button to code blocks
+-   Add copy button to markdown blocks (Thanks @weshoke!)
+-   Add checkpoints to more messages
+-   Add slash command to create a new rules file (/newrule)
+-   Add cache ui for open router and cline provider
+-   Add Amazon Nova Premier model to Bedrock (Thanks @watany!)
+-   Add support for cursorrules and windsurfrules
+-   Add support for batch history deletion (Thanks @danix800!)
+-   Improve Drag & Drop experience
+-   Create clinerules folder creating new rule if it's needed
+-   Enable pricing calculation for gemini and vertex providers
+-   Refactor message handling to not show the MCP View of the server modal
+-   Migrate the addRemoteServer to protobus (Thanks @DaveFres!)
+-   Update task header to be expanded by default
+-   Update Gemini cache TTL time to 15 minutes
+-   Fix race condition in terminal command usage
+-   Fix to correctly handle `import.meta.url`, avoiding leading slash in pathname for Windows (Thanks @DaveFres!)
+-   Fix @withRetry() decoration syntax error when running extension locally (Thanks @DaveFres!)
+-   Fix for git commit mentions in repos with no git commits
+-   Fix cost calculation (Thanks @BarreiroT!)
+</changelog>
+
+
+<announcement-component>
+const Announcement = ({ version, hideAnnouncement }: AnnouncementProps) => {
+	const minorVersion = version.split(".").slice(0, 2).join(".") // 2.0.0 -> 2.0
+	return (
+		<div style={containerStyle}>
+			<VSCodeButton appearance="icon" onClick={hideAnnouncement} style={closeIconStyle}>
+				<span className="codicon codicon-close"></span>
+			</VSCodeButton>
+			<h3 style={h3TitleStyle}>
+				🎉{"  "}New in v{minorVersion}
+			</h3>
+			<ul style={ulStyle}>
+				<li>
+					<b>Gemini prompt caching:</b> Gemini and Vertex providers now support prompt caching and price tracking for
+					Gemini models.
+				</li>
+				<li>
+					<b>Copy Buttons:</b> Buttons were added to Markdown and Code blocks that allow you to copy their contents
+					easily.
+				</li>
+				<li>
+					<b>/newrule command:</b> New slash command to have cline write your .clinerules for you based on your
+					workflow.
+				</li>
+				<li>
+					<b>Drag and drop improvements:</b> Don't forget to hold shift while dragging files!
+				</li>
+				<li>Added more checkpoints across the task, allowing you to restore from more than just file changes.</li>
+				<li>Added support for rendering LaTeX in message responses. (Try asking Cline to show the quadratic formula)</li>
+			</ul>
+			<Accordion isCompact className="pl-0">
+				<AccordionItem
+					key="1"
+					aria-label="Previous Updates"
+					title="Previous Updates:"
+					classNames={{
+						trigger: "bg-transparent border-0 pl-0 pb-0 w-fit",
+						title: "font-bold text-(--vscode-foreground)",
+						indicator:
+							"text-(--vscode-foreground) mb-0.5 -rotate-180 data-[open=true]:-rotate-90 rtl:rotate-0 rtl:data-[open=true]:-rotate-90",
+					}}>
+					<ul style={ulStyle}>
+						<li>
+							<b>Global Cline Rules:</b> store multiple rules files in Documents/Cline/Rules to share between
+							projects.
+						</li>
+						<li>
+							<b>Cline Rules Popup:</b> New button in the chat area to view workspace and global cline rules files
+							to plug and play specific rules for the task
+						</li>
+						<li>
+							<b>Slash Commands:</b> Type <code>/</code> in chat to see the list of quick actions, like starting a
+							new task (more coming soon!)
+						</li>
+						<li>
+							<b>Edit Messages:</b> You can now edit a message you sent previously by clicking on it. Optionally
+							restore your project when the message was sent!
+						</li>
+					</ul>
+				</AccordionItem>
+			</Accordion>
+
+			{/*
+			// Leave this here for an example of how to structure the announcement
+			<ul style={{ margin: "0 0 8px", paddingLeft: "12px" }}>
+				 <li>
+					OpenRouter now supports prompt caching! They also have much higher rate limits than other providers,
+					so I recommend trying them out.
+					<br />
+					{!apiConfiguration?.openRouterApiKey && (
+						<VSCodeButtonLink
+							href={getOpenRouterAuthUrl(vscodeUriScheme)}
+							style={{
+								transform: "scale(0.85)",
+								transformOrigin: "left center",
+								margin: "4px -30px 2px 0",
+							}}>
+							Get OpenRouter API Key
+						</VSCodeButtonLink>
+					)}
+					{apiConfiguration?.openRouterApiKey && apiConfiguration?.apiProvider !== "openrouter" && (
+						<VSCodeButton
+							onClick={() => {
+								vscode.postMessage({
+									type: "apiConfiguration",
+									apiConfiguration: { ...apiConfiguration, apiProvider: "openrouter" },
+								})
+							}}
+							style={{
+								transform: "scale(0.85)",
+								transformOrigin: "left center",
+								margin: "4px -30px 2px 0",
+							}}>
+							Switch to OpenRouter
+						</VSCodeButton>
+					)}
+				</li>
+				<li>
+					<b>Edit Cline's changes before accepting!</b> When he creates or edits a file, you can modify his
+					changes directly in the right side of the diff view (+ hover over the 'Revert Block' arrow button in
+					the center to undo "<code>{"// rest of code here"}</code>" shenanigans)
+				</li>
+				<li>
+					New <code>search_files</code> tool that lets Cline perform regex searches in your project, letting
+					him refactor code, address TODOs and FIXMEs, remove dead code, and more!
+				</li>
+				<li>
+					When Cline runs commands, you can now type directly in the terminal (+ support for Python
+					environments)
+				</li>
+			</ul>*/}
+			<div style={hrStyle} />
+			<p style={linkContainerStyle}>
+				Join us on{" "}
+				<VSCodeLink style={linkStyle} href="https://x.com/cline">
+					X,
+				</VSCodeLink>{" "}
+				<VSCodeLink style={linkStyle} href="https://discord.gg/cline">
+					discord,
+				</VSCodeLink>{" "}
+				or{" "}
+				<VSCodeLink style={linkStyle} href="https://www.reddit.com/r/cline/">
+					r/cline
+				</VSCodeLink>
+				for more updates!
+			</p>
+		</div>
+	)
+}
+</announcement-component>
+
+- 3.13
+
+<changeset>
+Minor Changes
+2964388: Added copy button to MermaidBlock component
+75143a7: Add the ability to fetch from global cline rules files
+Patch Changes
+a0252e7: convert inline style to tailwind css of file SettingsView.tsx
+ab59bd9: Add stream options back to xai provider
+7276f50: Icons to indicate an action is occuring outside of the users workspace
+0b19ba6: update to NEW model
+</changeset>
+
+<changelog>
+## [3.13.0]
+
+-   Add Cline rules popover under the chat field, allowing you to easily add, enable & disable workspace level or global rule files
+-   Add new slash command menu letting you type “/“ to do quick actions like creating new tasks
+-   Add ability to edit past messages, with options to restore your workspace back to that point
+-   Allow sending a message when selecting an option provided by the question or plan tool
+-   Add command to jump to Cline's chat input
+-   Add support for OpenAI o3 & 4o-mini (Thanks @PeterDaveHello and @arafatkatze!)
+-   Add baseURL option for Google Gemini provider (Thanks @owengo and @olivierhub!)
+-   Add support for Azure's DeepSeek model. (Thanks @yt3trees!)
+-   Add ability for models that support it to receive image responses from MCP servers (Thanks @rikaaa0928!)
+-   Improve search and replace diff editing by making it more flexible with models that fail to follow structured output instructions. (Thanks @chi-cat!)
+-   Add detection of Ctrl+C termination in terminal, improving output reading issues
+-   Fix issue where some commands with large output would cause UI to freeze
+-   Fix token usage tracking issues with vertex provider (Thanks @mzsima!)
+-   Fix issue with xAI reasoning content not being parsed (Thanks @mrubens!)
+</changelog>
+
+<announcement-component>
+const Announcement = ({ version, hideAnnouncement }: AnnouncementProps) => {
+	const minorVersion = version.split(".").slice(0, 2).join(".") // 2.0.0 -> 2.0
+	return (
+		<div style={containerStyle}>
+			<VSCodeButton appearance="icon" onClick={hideAnnouncement} style={closeIconStyle}>
+				<span className="codicon codicon-close"></span>
+			</VSCodeButton>
+			<h3 style={h3TitleStyle}>
+				🎉{"  "}New in v{minorVersion}
+			</h3>
+			<ul style={ulStyle}>
+				<li>
+					<b>Global Cline Rules:</b> store multiple rules files in Documents/Cline/Rules to share between projects.
+				</li>
+				<li>
+					<b>Cline Rules Popup:</b> New button in the chat area to view workspace and global cline rules files to plug
+					and play specific rules for the task
+				</li>
+				<li>
+					<b>Slash Commands:</b> Type <code>/</code> in chat to see the list of quick actions, like starting a new task
+					(more coming soon!)
+				</li>
+				<li>
+					<b>Edit Messages:</b> You can now edit a message you sent previously by clicking on it. Optionally restore
+					your project when the message was sent!
+				</li>
+			</ul>
+			<h4 style={{ margin: "5px 0 5px" }}>Previous Updates:</h4>
+			<ul style={ulStyle}>
+				<li>
+					<b>Model Favorites:</b> You can now mark your favorite models when using Cline & OpenRouter providers for
+					quick access!
+				</li>
+				<li>
+					<b>Faster Diff Editing:</b> Improved animation performance for large files, plus a new indicator in chat
+					showing the number of edits Cline makes.
+				</li>
+				<li>
+					<b>New Auto-Approve Options:</b> Turn off Cline's ability to read and edit files outside your workspace.
+				</li>
+			</ul>
+			{/*
+			// Leave this here for an example of how to structure the announcement
+			<ul style={{ margin: "0 0 8px", paddingLeft: "12px" }}>
+				 <li>
+					OpenRouter now supports prompt caching! They also have much higher rate limits than other providers,
+					so I recommend trying them out.
+					<br />
+					{!apiConfiguration?.openRouterApiKey && (
+						<VSCodeButtonLink
+							href={getOpenRouterAuthUrl(vscodeUriScheme)}
+							style={{
+								transform: "scale(0.85)",
+								transformOrigin: "left center",
+								margin: "4px -30px 2px 0",
+							}}>
+							Get OpenRouter API Key
+						</VSCodeButtonLink>
+					)}
+					{apiConfiguration?.openRouterApiKey && apiConfiguration?.apiProvider !== "openrouter" && (
+						<VSCodeButton
+							onClick={() => {
+								vscode.postMessage({
+									type: "apiConfiguration",
+									apiConfiguration: { ...apiConfiguration, apiProvider: "openrouter" },
+								})
+							}}
+							style={{
+								transform: "scale(0.85)",
+								transformOrigin: "left center",
+								margin: "4px -30px 2px 0",
+							}}>
+							Switch to OpenRouter
+						</VSCodeButton>
+					)}
+				</li>
+				<li>
+					<b>Edit Cline's changes before accepting!</b> When he creates or edits a file, you can modify his
+					changes directly in the right side of the diff view (+ hover over the 'Revert Block' arrow button in
+					the center to undo "<code>{"// rest of code here"}</code>" shenanigans)
+				</li>
+				<li>
+					New <code>search_files</code> tool that lets Cline perform regex searches in your project, letting
+					him refactor code, address TODOs and FIXMEs, remove dead code, and more!
+				</li>
+				<li>
+					When Cline runs commands, you can now type directly in the terminal (+ support for Python
+					environments)
+				</li>
+			</ul>*/}
+			<div style={hrStyle} />
+			<p style={linkContainerStyle}>
+				Join us on{" "}
+				<VSCodeLink style={linkStyle} href="https://x.com/cline">
+					X,
+				</VSCodeLink>{" "}
+				<VSCodeLink style={linkStyle} href="https://discord.gg/cline">
+					discord,
+				</VSCodeLink>{" "}
+				or{" "}
+				<VSCodeLink style={linkStyle} href="https://www.reddit.com/r/cline/">
+					r/cline
+				</VSCodeLink>
+				for more updates!
+			</p>
+		</div>
+	)
+}
+</announcement-component>
+
+
+We have a changeset PR that automatically generated as new unreleased PRs are merged into main, the PR is always called "Changeset version bump" and the author is github-actions. 
+
+The Changeset PR description looks something like this:
+
+<changeset-pr-description>
+This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and publish to npm yourself or [setup this action to publish automatically](https://github.com/changesets/action#with-publishing). If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated.
+
+
+# Releases
+## claude-dev@3.16.0
+
+### Minor Changes
+
+-   c6e8b04: Recent task list is now collapsible, allowing users to hide their recent tasks (e.g. when sharing their screen).
+-   aabe4ae: Add detection for new users to display special components
+-   6c18d51: adds global endpoint for vertex ai users
+-   080ed7c: Add Tailwind CSS IntelliSense to the the recommended extensions list
+-   5147e28: new workflow feature
+
+### Patch Changes
+
+-   c0b3c69: fix eternal loading states when the last message is a checkpoint
+-   570ece3: selectImages protos migration
+-   8d8452e: askResponse protobus migration
+-   cd1ff2a: Finishing the migration of Vscode Advanced settings to Settings Webview
+</changeset-pr-description>
+
+The changeset pr is ALWAYS on the following branch: `changeset-release/main`.
+
+I have the `gh` command line tool set up and authenticated, so you have everything you need.
+
+The first step is to get the full diff from the changeset PR to look at the changes that were automatically made to the `CHANGELOG.md` file. By default it will automatically add a new section to the changelog.md file with the new version. The problem with the automatically generated section is that it just takes the text that the developers threw into their changeset files for each corresponding PR, and they can be pretty vague and bad. Additionally there's some stuff that is totally irrelevant for the end user, like minor refactoring changes. So I manually typically go in and update this section to be a proper changelog that will show up in our patchnotes. You can look at how the rest of the file is done because those are all good examples of us updating this to use good language for the end user. We usually put new features up top (and the most exciting flagship features at the very top), and then bug fixes/improvements at the bottom. Having some basic organization to the ordering of the bullet points by content is nice. But use common sense. 
+
+To handle this process effectively, do the following:
+
+For each of the automatically generated bullet points in the Changelog.md, you should
+1. Take the commit hash at the start of the bullet point, and use the `gh` command line tool find the PR that it was associated with. 
+2. Use the `gh` command to get the PR title/description/discussion to understand the context surrounding the PR.
+3. Use the `gh` command line tool to get the full PR diff to fully understand the changes made in the code.
+4. Synthesize that knowledge to determine (a) whether or not this change is relevant to end users and (b) what the text & ordering of the line should be.  
+5. Update the `CHANGELOG.md` accordingly 
+
+Do this for every single item in the list from the autogenerated bullet points. We want to be diligent and have a full understanding of every feature so we can make the best changelog ever!
+
+Here are some principles for good changelogs from keepchangelog.com, a handy guide:
+
+<keepachangelog-pinciples-for-good-changelogs>
+### Guiding Principles
+- Changelogs are for humans, not machines.
+- There should be an entry for every single version.
+- The same types of changes should be grouped.
+- The latest version comes first.
+
+### Bullet points in the changelog should follow these principles:
+- Types of changes
+- Added for new features.
+- Changed for changes in existing functionality.
+- Deprecated for soon-to-be removed features.
+- Removed for now removed features.
+- Fixed for any bug fixes.
+- Security in case of vulnerabilities.
+</keepachangelog-pinciples-for-good-changelogs>
+
+Lastly, when developers make a PR, they typically make a changeset. And they have 3 options when making the changeset:
+
+1. Patch
+2. Minor
+3. Major
+
+Sometimes they label something as minor when really it should just be a patch. Or vice versa. Because of this, the automatic version bump may be incorrect. So when starting out this workflow, you should use the <ask_followup_question> tool to confirm with me whether or not this should be a patch bump (show the old version number and what the proposed new version number would be) or a minor bump. Part of the release process is making sure the version in package.json that is automatically changed actually corresponds with what we decided the bump should actually be based on the features. ALL these modifications happen in the `changeset-release/main` branch btw. 
+
+<important_note>
+Before doing any of this, make sure you check out the `changeset-release/main` and pull the most recent up to date changes. Then perform all this work in that branch. 
+
+New announcement banners should ONLY be made for minor version bumps or higher. That's another reason why double checking if the changelog warrants the bump is important.
+
+Also, SUPER important: For any external contributors that aren't part of the cline github organization, we always want to add a (Thanks @username!) at the end of the changelog to attribute them properly. We're an open source project and it's ethical to do this.
+</important_note>
+
+Once the changelog looks good, and the version number looks good, we gotta double check that the version number in the changelog has the brackets around it. And as a final step, double check the package.json version number matches the latest number in the changelog. And as the ultimate final step we run `npm run install:all` to make sure the package version number permiates through the lock file. 
+
+
+<detailed_sequence_of_steps>
+# Cline Release Process - Detailed Sequence of Steps
+
+## Before Starting
+1. First, examine the changeset PR without checking it out:
+   ```bash
+   gh pr view changeset-release/main
+   ```
+
+2. View the PR diff to see the auto-generated CHANGELOG.md changes:
+   ```bash
+   gh pr diff changeset-release/main > changeset-diff.txt
+   cat changeset-diff.txt | grep -A 50 "CHANGELOG.md"
+   ```
+
+## Initial Setup
+3. Once you're ready to start, checkout and update the changeset release branch:
+   ```bash
+   git checkout changeset-release/main
+   git pull origin changeset-release/main
+   ```
+
+## Analyzing Each Change
+4. For each commit hash in the auto-generated changelog entries:
+
+   a. Find the PR number associated with a commit hash:
+      ```bash
+      gh pr list --search "<commit-hash>" --state merged
+      ```
+   
+   b. Get PR details for better context:
+      ```bash
+      gh pr view <PR-number>
+      ```
+   
+   c. Check if the contributor is external to determine if attribution is needed:
+      ```bash
+      # Extract username from PR
+      USERNAME=$(gh pr view <PR-number> --json author --jq .author.login)
+      
+      # Check if user is a member of the Cline organization
+	  # this command is a bit finnicky, but it 100% works. 
+	  # if you see a `Error executing command: The command ran successfully, but we couldn't capture its output. Please proceed accordingly.` error, just retry it until you actually get the output
+	  # don't make any assumptions, just retry the command to actually get the output and determine if they're external or not.
+	  # no output means they are an external contributor, otherwise if there is output they are an internal contributor (part of our github org)
+      gh api "orgs/cline/members" --jq "map(.login)" | grep -i "pashpashpash"
+      ```
+   
+   d. View the full PR diff to understand code changes:
+      ```bash
+      gh pr diff <PR-number> > pr-diff-<PR-number>.txt
+      cat pr-diff-<PR-number>.txt
+      ```
+
+## Updating the Changelog
+5. Based on PR analysis, update the CHANGELOG.md with user-friendly descriptions:
+   - Use the `<replace_in_file>` tool to edit the CHANGELOG.md file
+   - Group by feature type (Added, Changed, Fixed)
+   - Put most exciting features at the top
+   - Move bug fixes and small improvements to the bottom
+   - Use clear, end-user focused language
+   - For external contributors, add attribution at the end of the relevant entry: `(Thanks @username!)`
+
+## Version Number Verification
+6. Confirm the version bump is appropriate:
+   - Check package.json to verify the auto-generated version number:
+     ```bash
+     cat package.json | grep "\"version\""
+     ```
+   - If the feature set doesn't warrant a minor bump, use the `<replace_in_file>` tool to modify package.json
+
+7. Ensure the version in CHANGELOG.md has brackets around it:
+   ```
+   ## [3.16.0]
+   ```
+
+## Creating the Announcement (for minor/major versions only)
+8. If this is a minor version bump, create/update the announcement component:
+   - Use the `<replace_in_file>` tool to edit the src/views/components/announcement.tsx file
+   - Update the highlights based on key features
+   - Move previous version highlights to the "Previous Updates" section
+   - Use the previous announcement components as reference for structure
+
+## Finalizing the Release
+9. Update dependencies with the new version number:
+   ```bash
+   npm run install:all
+   ```
+
+10. Commit your changes:
+    ```bash
+    git add CHANGELOG.md package.json package-lock.json src/views/components/announcement.tsx
+    git commit -m "Update CHANGELOG.md and announcement for version 3.16.0"
+    ```
+
+11. Push your changes to the changeset branch:
+    ```bash
+    git push origin changeset-release/main
+    ```
+
+12. Check that your changes pushed successfully:
+    ```bash
+    git status
+    ```
+</detailed_sequence_of_steps>

.clinerules/workflows/hotfix-release.md

@@ -89,9 +89,16 @@ On the main branch, create a commit that updates:
 
 2. **package.json** - Update the version field to the new version
 
-3. No changelog-entry file cleanup is needed. Contributors do not create changelog-entry files in this repo.
+3. **Delete changesets** for the commits being included in the hotfix. This prevents the changeset bot from including duplicate entries in the next regular release.
 
-**Skip running `npm run install:all`** - release automation handles lockfile consistency as needed.
+   Find and delete the changeset files associated with the selected commits:
+   ```bash
+   ls .changeset/
+   ```
+
+   Each changeset file in `.changeset/` corresponds to a PR. Read them to identify which ones belong to the commits you're hotfixing, then delete those files.
+
+**Skip running `npm run install:all`** - the automation handles outdated lockfiles.
 
 Commit with message format: `v{VERSION} Release Notes (hotfix)`
 
@@ -100,7 +107,7 @@ In the commit body, mention:
 - List the cherry-picked commits that will be included
 
 ```bash
-git add CHANGELOG.md package.json
+git add CHANGELOG.md package.json .changeset/
 git commit -m "v3.40.1 Release Notes (hotfix)
 
 Hotfix release including:

.clinerules/workflows/pr-review.md

@@ -347,6 +347,8 @@ A few notes:
 So until the settings page is update, and this is added to settings in a way that's clean and doesn't confuse new users, I don't think we can merge this. Please bear with us.
 </request_changes_comment>
 <request_changes_comment>
+Also, don't forget to add a changeset since this fixes a user-facing bug.
+
 The architectural change is solid - moving the focus logic to the command handlers makes sense. Just don't want to introduce subtle timing issues by removing those timeouts.
 </request_changes_comment>
 </example_comments_that_i_have_written_before>

.clinerules/workflows/release.md

@@ -1,64 +1,232 @@
 # Release
 
-Prepare and publish a release directly from `main`.
+Prepare and publish a release from the open changeset PR.
 
 ## Overview
 
 This workflow helps you:
-1. Select/confirm the target version
-2. Curate `CHANGELOG.md` entries manually for end users
-3. Ensure `package.json` version matches the changelog
-4. Create and push a release commit + tag
-5. Trigger publish workflow
-6. Update GitHub release notes and share a summary
+1. Find and checkout the open changeset PR
+2. Clean up the changelog (fix version format, wordsmith entries)
+3. Push changes back to the PR branch
+4. Merge with proper commit message format
+5. Tag and push the release (after verifying the commit)
+6. Trigger the publish workflow
+7. Update GitHub release notes
+8. Provide final summary with Slack announcement
 
-## Process
+## Step 1: Find the Changeset PR
 
-### 1) Sync and determine version
+Look for the open changeset PR:
+
+```bash
+gh pr list --search "Changeset version bump" --state open --json number,title,headRefName,url
+```
+
+If no PR is found, inform the user there's no changeset PR ready. They may need to:
+- Merge PRs with changesets to main first
+- Manually trigger the Changeset Converter workflow at: https://github.com/cline/cline/actions/workflows/changeset-converter.yml
+
+## Step 2: Gather PR Information
+
+Get the PR details:
+
+```bash
+PR_NUMBER=<number from step 1>
+gh pr view $PR_NUMBER --json body,files,headRefName
+```
+
+Checkout the PR branch:
+
+```bash
+git fetch origin changeset-release/main
+git checkout changeset-release/main
+```
+
+If the branch has diverged from remote, reset to the remote version:
+
+```bash
+git reset --hard origin/changeset-release/main
+```
+
+## Step 3: Analyze the Changes
+
+Read the current CHANGELOG.md to see what the automation generated:
+
+```bash
+head -50 CHANGELOG.md
+```
+
+Get the version from package.json:
+
+```bash
+cat package.json | grep '"version"'
+```
+
+**Present to the user:**
+- The version number that will be released
+- The raw changelog entries from the changeset PR
+- Whether this is a patch, minor, or major release
+
+## Step 4: Clean Up the Changelog
+
+The changelog needs these fixes:
+
+1. **Add brackets to version number**: Change `## 3.44.1` to `## [3.44.1]`
+
+2. **No category headers**: Don't use `### Added`, `### Fixed`, etc. Just a flat list of bullet points.
+
+3. **Order entries from most important to least important**:
+   - Lead with major new features or significant fixes users care about
+   - End with minor fixes or internal changes
+
+4. **Write user-friendly descriptions**:
+   - This is for end users, not developers—explain what changed in plain language
+   - Remove commit hashes from the beginning of lines (the automation adds these)
+   - Look at the actual commit diffs (`git show <hash>`) and PRs to understand what changed
+   - Write colorful descriptions that explain the value and impact, not just technical details
+   - Consolidate related changes into single entries when appropriate
+
+**Ask the user** to review the proposed changelog changes before applying them. Show them:
+- Current (raw) changelog section
+- Proposed (cleaned) changelog section
+
+Once approved, apply the changes to CHANGELOG.md.
+
+## Step 5: Commit and Push Changes
+
+After making changelog edits:
+
+```bash
+git add CHANGELOG.md
+git commit -m "Clean up changelog formatting"
+git push origin changeset-release/main
+```
+
+## Step 6: Merge the PR
+
+**Ask the user to confirm** they're ready to merge.
+
+Merge the PR with the proper commit message format:
+
+```bash
+VERSION=<version from package.json>
+gh pr merge $PR_NUMBER --squash --subject "v${VERSION} Release Notes" --body ""
+```
+
+**If merge is blocked by branch protection:**
+- Users with admin privileges can add the `--admin` flag to bypass
+- Users without admin privileges need to get the PR approved through normal review first before merging
+
+## Step 7: Tag the Release
+
+After the merge completes, checkout main and pull:
 
 ```bash
 git checkout main
 git pull origin main
-cat package.json | grep '"version"'
 ```
 
-Confirm the release version with the maintainer (patch/minor/major).
-
-### 2) Curate changelog and version
-
-- Edit `CHANGELOG.md` for the target version using human-friendly release notes.
-- Ensure version headers use bracket format, e.g. `## [3.66.1]`.
-- Update `package.json` version to the same value.
-
-### 3) Commit and tag
+**IMPORTANT: Verify the latest commit is the release commit before tagging:**
 
 ```bash
-git add CHANGELOG.md package.json package-lock.json
-git commit -m "v<version> Release Notes"
-git push origin main
-git tag v<version>
-git push origin v<version>
+git log -1 --oneline
 ```
 
-### 4) Trigger publish workflow
+Confirm the commit message matches `v{VERSION} Release Notes` (e.g., `v3.44.1 Release Notes`). Do NOT blindly tag HEAD without verification.
 
-Tell the maintainer to run:
-https://github.com/cline/cline/actions/workflows/publish.yml
-
-Use `v<version>` as the release tag.
-
-### 5) Update GitHub release notes
-
-After publish completes:
+Once verified, tag and push:
 
 ```bash
-gh release view v<version> --json body --jq '.body'
-gh release edit v<version> --notes "<final curated release notes>"
+VERSION=<version>
+git tag v${VERSION}
+git push origin v${VERSION}
 ```
 
-### 6) Final summary
+## Step 8: Trigger Publish Workflow
 
-Provide:
-- Released version/tag
-- Link to release page
-- Summary of top end-user changes
+**Copy the tag to clipboard** so the user can easily paste it into the GitHub Actions workflow:
+
+```bash
+echo -n "v{VERSION}" | pbcopy
+```
+
+**Tell the user to trigger the publish workflow:**
+1. Go to: https://github.com/cline/cline/actions/workflows/publish.yml
+2. Select **"release"** for release-type
+3. Paste **`v{VERSION}`** as the tag (already in clipboard)
+
+**Wait for the user** to confirm the publish workflow has completed before proceeding.
+
+## Step 9: Update GitHub Release Notes
+
+Once the user confirms the publish workflow is done, fetch the auto-generated release content:
+
+```bash
+VERSION=<version>
+gh release view v${VERSION} --json body --jq '.body'
+```
+
+The auto-generated release has:
+- `## What's Changed` - PR list (we'll replace this with our changelog)
+- `## New Contributors` - First-time contributors (keep this if present)
+- `**Full Changelog**` - Comparison link (keep this)
+
+Build the new release body:
+1. Start with `## What's Changed` header
+2. Add our changelog content (from CHANGELOG.md for this version)
+3. Keep the `## New Contributors` section if it exists
+4. Keep the `**Full Changelog**` link
+
+Update the release:
+
+```bash
+gh release edit v${VERSION} --notes "<new body content>"
+```
+
+Verify the release was updated:
+
+```bash
+gh release view v${VERSION}
+```
+
+## Step 10: Final Summary
+
+**Copy a Slack announcement message to clipboard** (include the full changelog, not just highlights):
+
+```bash
+echo "VS Code v{VERSION} Released
+
+- Changelog entry 1
+- Changelog entry 2
+- Changelog entry 3" | pbcopy
+```
+
+**Present a final summary:**
+- Version released: v{VERSION}
+- PR merged: #{PR_NUMBER}
+- Tag pushed: v{VERSION}
+- Release: https://github.com/cline/cline/releases/tag/v{VERSION}
+- Slack message copied to clipboard
+
+**Final reminder:**
+Post the Slack message to announce the release
+
+## Handling Edge Cases
+
+### No changesets found
+If the changeset PR body shows no changes, inform the user they need to merge PRs with changesets first.
+
+### Merge conflicts
+If there are conflicts on the changeset branch, help the user resolve them:
+```bash
+git fetch origin main
+git rebase origin/main
+# resolve conflicts
+git push origin changeset-release/main --force-with-lease
+```
+
+### User wants to add more changes
+If the user wants to include additional PRs before releasing:
+1. Ask them to merge those PRs to main first
+2. The changeset automation will update the PR automatically
+3. Re-run this workflow after the PR is updated

.codex/environments/environment.toml

@@ -1,49 +0,0 @@
-# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY
-version = 1
-name = "cline"
-
-[setup]
-script = '''
-if [ ! -d "node_modules" ]; then
-  MAIN_WORKTREE="$(git worktree list | head -n1 | awk '{print $1}')"
-  ln -s "$MAIN_WORKTREE/node_modules" node_modules
-  ln -s "$MAIN_WORKTREE/webview-ui/node_modules" webview-ui/node_modules
-fi
-'''
-
-[[actions]]
-name = "VS Code"
-icon = "run"
-command = "chmod +x ./scripts/run-extension-host.sh && ./scripts/run-extension-host.sh production"
-
-[[actions]]
-name = "CLI"
-icon = "run"
-command = '''
-npm run cli:build
-npm run cli:run
-'''
-
-[[actions]]
-name = "npm install"
-icon = "tool"
-command = '''
-rm node_modules
-rm webview-ui/node_modules
-npm run install:all
-'''
-
-[[actions]]
-name = "pull main"
-icon = "tool"
-command = '''
-git fetch origin main                                                                                                                                                             
-                                                                                                                                                                                
-if ! git merge-base --is-ancestor main origin/main; then                                                                                                                          
-  echo "Local main has commits not on origin/main. Aborting..."                                                                                                                     
-  exit 1                                                                                                                                                                          
-fi
-
-git update-ref refs/heads/main refs/remotes/origin/main
-echo "main updated to $(git rev-parse --short main)"
-'''

.github/pull_request_template.md

@@ -60,6 +60,7 @@ We're not looking for exhaustive documentation - just evidence that you've thoug
 
 -   [ ] Changes are limited to a single feature, bugfix or chore (split larger changes into separate PRs)
 -   [ ] Tests are passing (`npm test`) and code is formatted and linted (`npm run format && npm run lint`)
+-   [ ] I have created a changeset using `npm run changeset` (required for user-facing changes)
 -   [ ] I have reviewed [contributor guidelines](https://github.com/cline/cline/blob/main/CONTRIBUTING.md)
 
 ### Screenshots

.github/scripts/overwrite_changeset_changelog.py

@@ -0,0 +1,79 @@
+"""
+This script updates a specific version's release notes section in CHANGELOG.md with new content
+or reformats existing content.
+
+The script:
+1. Takes a version number, changelog path, and optionally new content as input from environment variables
+2. Finds the section in the changelog for the specified version
+3. Either:
+   a) Replaces the content with new content if provided, or
+   b) Reformats existing content by:
+      - Removing the first two lines of the changeset format
+      - Ensuring version numbers are wrapped in square brackets
+4. Writes the updated changelog back to the file
+
+Environment Variables:
+    CHANGELOG_PATH: Path to the changelog file (defaults to 'CHANGELOG.md')
+    VERSION: The version number to update/format
+    PREV_VERSION: The previous version number (used to locate section boundaries)
+    NEW_CONTENT: Optional new content to insert for this version
+"""
+
+#!/usr/bin/env python3
+
+import os
+
+CHANGELOG_PATH = os.environ.get("CHANGELOG_PATH", "CHANGELOG.md")
+VERSION = os.environ['VERSION']
+PREV_VERSION = os.environ.get("PREV_VERSION", "")
+NEW_CONTENT = os.environ.get("NEW_CONTENT", "")
+
+def overwrite_changelog_section(changelog_text: str, new_content: str):
+    # Find the section for the specified version
+    version_pattern = f"## {VERSION}\n"
+    unformmatted_prev_version_pattern = f"## {PREV_VERSION}\n"
+    prev_version_pattern = f"## [{PREV_VERSION}]\n"
+    print(f"latest version: {VERSION}")
+    print(f"prev_version: {PREV_VERSION}")
+
+    notes_start_index = changelog_text.find(version_pattern) + len(version_pattern)
+    notes_end_index = changelog_text.find(prev_version_pattern, notes_start_index) if PREV_VERSION and (prev_version_pattern in changelog_text or unformmatted_prev_version_pattern in changelog_text) else len(changelog_text)
+
+    if new_content:
+        return changelog_text[:notes_start_index] + f"{new_content}\n" + changelog_text[notes_end_index:]
+    else:
+        changeset_lines = changelog_text[notes_start_index:notes_end_index].split("\n")
+        filtered_lines = []
+        for line in changeset_lines:
+            # If the previous line is a changeset format
+            if len(filtered_lines) > 1 and filtered_lines[-1].startswith("### "):
+                # Remove the last two lines from the filted_lines
+                filtered_lines.pop()
+                filtered_lines.pop()
+            else:
+                filtered_lines.append(line.strip())
+
+        # Prepend a new line to the first line of filtered_lines
+        if filtered_lines:
+            filtered_lines[0] = "\n" + filtered_lines[0]
+
+        # Print filted_lines wiht a "\n" at the end of each line
+        for line in filtered_lines:
+            print(line.strip())
+
+        parsed_lines = "\n".join(line for line in filtered_lines)
+        updated_changelog = changelog_text[:notes_start_index] + parsed_lines + changelog_text[notes_end_index:]
+        return updated_changelog
+
+with open(CHANGELOG_PATH, 'r') as f:
+    changelog_content = f.read()
+
+new_changelog = overwrite_changelog_section(changelog_content, NEW_CONTENT)
+# print("----------------------------------------------------------------------------------")
+# print(new_changelog)
+# print("----------------------------------------------------------------------------------")
+# Write back to CHANGELOG.md
+with open(CHANGELOG_PATH, 'w') as f:
+    f.write(new_changelog)
+
+print(f"{CHANGELOG_PATH} updated successfully!")

.github/workflows/changeset-converter.yml

@@ -0,0 +1,113 @@
+name: Changeset Converter
+run-name: Changeset Conversion
+
+on:
+    workflow_dispatch:
+    pull_request:
+        types: [closed]
+
+env:
+    REPO_PATH: ${{ github.repository }}
+    GIT_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'main' }}
+    NODE_VERSION: 20.18.1
+
+jobs:
+    # Job 1: Create version bump PR when changesets are merged to main
+    changeset-pr-version-bump:
+        if: |
+            github.event_name == 'workflow_dispatch' ||
+            (
+                github.event_name == 'pull_request' &&
+                github.event.pull_request.merged == true &&
+                github.event.pull_request.base.ref == 'main' &&
+                github.actor != 'github-actions'
+            )
+        runs-on: ubuntu-latest
+        permissions:
+            contents: write
+            pull-requests: write
+        steps:
+            - name: Check user for team affiliation
+              id: team_check
+              if: github.event_name == 'workflow_dispatch'
+              uses: morfien101/actions-authorized-user@4a3cfbf0bcb3cafe4a71710a278920c5d94bb38b
+              with:
+                  username: ${{ github.actor }}
+                  org: ${{ github.repository_owner }}
+                  team: "deployer"
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Check if user is authorized
+              if: github.event_name == 'workflow_dispatch'
+              run: |
+                  if [ "${{ steps.team_check.outputs.authorized }}" != "true" ]; then
+                      echo "User is not authorized to run this workflow."
+                      exit 1
+                  fi
+
+            - name: Git Checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+                  ref: ${{ env.GIT_REF }}
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ env.NODE_VERSION }}
+                  cache: "npm"
+
+            - name: Install Dependencies
+              run: npm ci
+
+            # Check if there are any new changesets to process
+            - name: Check for changesets
+              id: check-changesets
+              run: |
+                  NEW_CHANGESETS=$(find .changeset -name "*.md" ! -name "README.md" | wc -l | tr -d ' ')
+                  echo "Changesets diff with previous version: $NEW_CHANGESETS"
+                  echo "new_changesets=$NEW_CHANGESETS" >> $GITHUB_OUTPUT
+
+            # Create version bump PR using changesets/action if there are new changesets
+            - name: Create Changeset Pull Request
+              if: steps.check-changesets.outputs.new_changesets != '0'
+              uses: changesets/action@v1
+              with:
+                  commit: "changeset version bump"
+                  title: "Changeset version bump"
+                  version: npm run version-packages # This performs the changeset version bump
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+            # Get current and previous versions to edit changelog entry
+            - name: Get version
+              id: get_version
+              run: |
+                  VERSION=$(git show HEAD:package.json | jq -r '.version')
+                  echo "version=$VERSION" >> $GITHUB_OUTPUT
+                  PREV_VERSION=$(git show origin/main:package.json | jq -r '.version')
+                  echo "prev_version=$PREV_VERSION" >> $GITHUB_OUTPUT
+                  echo "version=$VERSION"
+                  echo "prev_version=$PREV_VERSION"
+
+            # Update CHANGELOG.md with proper format
+            - name: Update Changelog Format
+              env:
+                  VERSION: ${{ steps.get_version.outputs.version }}
+                  PREV_VERSION: ${{ steps.get_version.outputs.prev_version }}
+              run: python .github/scripts/overwrite_changeset_changelog.py
+
+            # Commit and push changelog updates
+            - name: Push Changelog updates to Pull Request
+              run: |
+                  git config user.name "github-actions"
+                  git config user.email github-actions@github.com
+                  echo "Running git add and commit..."
+                  git add CHANGELOG.md
+                  git commit -m "Updating CHANGELOG.md format"
+                  git status
+                  echo "--------------------------------------------------------------------------------"
+                  echo "Pushing to remote..."
+                  echo "--------------------------------------------------------------------------------"
+                  CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+                  git push origin $CURRENT_BRANCH

.github/workflows/claude-issue-triage.yml

@@ -0,0 +1,173 @@
+name: Claude Issue Triage
+
+on:
+  issues:
+    types: [opened]
+  # Manual trigger for backfilling existing issues. Run from terminal:
+  #   gh workflow run claude-issue-triage.yml -f issue_number=1234
+  # Or batch process:
+  #   gh issue list --state open --limit 10 --json number --jq '.[].number' | while read num; do
+  #     gh workflow run claude-issue-triage.yml -f issue_number=$num
+  #     sleep 60
+  #   done
+  workflow_dispatch:
+    inputs:
+      issue_number:
+        description: 'Issue number to triage'
+        required: true
+        type: string
+
+jobs:
+  claude-issue-triage:
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+    # SECURITY: These permissions are intentionally restrictive.
+    # - contents: read  -> Claude can read the codebase but CANNOT write/push any code
+    # - issues: write   -> Claude can comment and add labels (the only write access needed)
+    # - pull-requests: read -> Claude can view PR context but CANNOT create PRs
+    # This ensures that even if a malicious user attempts prompt injection via issue content,
+    # Claude cannot modify repository code, create branches, or open PRs.
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Run Issue Response & Triage
+        id: triage
+        uses: anthropics/claude-code-action@v1
+        with:
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          allowed_non_write_users: "*"
+          # Allow all tools - security is enforced by GitHub permissions above (contents: read, issues: write)
+          claude_args: --model claude-opus-4-5-20251101 --allowedTools "Bash,Read,Write,Edit,Glob,Grep,WebFetch,WebSearch"
+          prompt: |
+            You're a GitHub issue first responder for the open source Cline repository.
+
+            **Issue:** #${{ github.event.issue.number || inputs.issue_number }}
+            **Title:** ${{ github.event.issue.title || 'See issue details below' }}
+            **Author:** @${{ github.event.issue.user.login || 'See issue details below' }}
+
+            ## Your job
+
+            Investigate this issue thoroughly, then post a single helpful comment that helps the user and gives maintainers the context they need.
+
+            ## Investigation
+
+            Start by reading the full issue:
+            gh issue view ${{ github.event.issue.number || inputs.issue_number }}
+
+            ### Search for duplicates and related issues
+
+            Search thoroughly for existing issues that match this one:
+            gh issue list --search "<keywords from the issue>" --state all --limit 30
+            gh issue list --search "<error messages>" --state all --limit 20
+            gh issue list --search "<affected feature/component>" --state all --limit 20
+
+            For each relevant issue you find, read it including its comments:
+            gh issue view <number> --comments
+
+            You're looking for:
+            - **Duplicates**: Issues describing the same problem. Link to them and explain why you think they're duplicates. If closed, check how they were resolved - the solution might apply here.
+            - **Related issues**: Similar problems or context that could help. Pull useful information from their comments (workarounds others found, debugging steps that helped, maintainer explanations). Link to them and explain the connection.
+
+            If there are closed issues with solutions, surface those solutions prominently - this might immediately solve the user's problem.
+
+            ### Analyze recent changes (ALWAYS DO THIS)
+
+            Many issues are regressions from recent releases. **Always** check what changed recently:
+            gh release list --limit 10
+            gh pr list --state merged --limit 50 --json number,title,mergedAt,author,body
+
+            Look for PRs merged in the last few weeks that might correlate with the issue. If you find a likely connection:
+            gh pr view <number>
+            gh pr diff <number>
+            git log --since="1 month ago" --oneline -- <relevant paths>
+            git show <commit>
+
+            **Always include your findings in your comment:**
+            - If you find a regression, call it out explicitly: which PR/commit likely caused it, who authored it, what changed, and suggest a fix direction if you can see one.
+            - If you don't find anything related, still mention it: "I analyzed recent PRs and releases but didn't find any changes that seem related to this issue."
+
+            ### Search the codebase
+
+            Find the relevant code:
+            - Use grep/find to locate code related to the issue
+            - Key areas: `src/api/` (providers/models), `src/core/prompts/` (tools/prompts), platform-specific code for VS Code vs JetBrains
+
+            ### Find documentation
+
+            Cline docs are at **https://docs.cline.bot/** and built with Mintlify from the `docs/` directory.
+
+            The URL structure maps directly to the file structure:
+            - `docs/getting-started/selecting-your-model.mdx` → https://docs.cline.bot/getting-started/selecting-your-model
+            - `docs/troubleshooting.mdx` → https://docs.cline.bot/troubleshooting
+            - Headings become anchors: `## Which Model` → `#which-model`
+
+            Search the `docs/` directory to find relevant documentation, then construct URLs to link users to:
+            ```bash
+            ls docs/
+            grep -r "keyword" docs/ --include="*.mdx" -l
+            ```
+
+            ### Identify subject matter experts
+
+            For issues that clearly need engineering attention:
+            git log --since="6 months ago" --format="%an" -- <relevant paths> | sort | uniq -c | sort -rn | head -5
+
+            Cross-reference with GitHub usernames. Include in your response (@mention, do NOT assign):
+
+            | SME | Reason |
+            |-----|--------|
+            | @username1 | Authored PR #X which modified this area |
+            | @username2 | Primary contributor to affected file |
+
+            ## Weak model detection
+
+            Many issues are caused by users running small or non-frontier models that don't tool-call reliably. Signs include:
+            - Model failing to use tools correctly
+            - Nonsensical or malformed responses
+            - User is running a small/local model or older model version
+
+            If this looks like a weak model issue, kindly suggest they try reproducing with Claude Sonnet and report back if it persists. Link to https://docs.cline.bot/getting-started/selecting-your-model if helpful. Still label and triage normally.
+
+            ## Your comment
+
+            Write a single comment as a helpful community member. Be conversational, not robotic. Include what's relevant:
+
+            - **Helpful response** - Answer their question, suggest a fix, provide a workaround. If you found solutions in related closed issues, surface those prominently.
+            - **Duplicates and related issues** - Link to any you found and explain why they're duplicates/related. Summarize useful context from their comments.
+            - **Regression analysis** - If this looks like a regression, explain what change likely caused it, link to the PR/commit, and tag the author.
+            - **Clarifying questions** - If you need more info, ask specific questions. Don't ask for things already provided.
+            - **SME table** - Include the table above if this needs engineering attention. Don't tag people for questions with obvious answers or weak-model issues.
+            - **Context for maintainers** - Relevant code paths, what you found. Keep it concise.
+            - **Docs links** - If there's relevant documentation, link to it naturally in your response as a recommendation (e.g., "For more details, check out [the Ollama setup guide](url)"). Do NOT add a "Sources" section at the end - integrate doc links into your response where they're helpful.
+            - **Possible Duplicates section** - ALWAYS include a "Possible Duplicates" section at the end of your comment listing issues that might be duplicates so maintainers can quickly close if appropriate. If none found, say "No obvious duplicates found."
+
+            ## Labels
+            First, retrieve all available labels and read their descriptions to understand what each is for:
+            gh label list --json name,description --limit 100
+
+            Then apply the appropriate labels based on your analysis. Only use labels from the list above—do not create new labels.
+            gh issue edit ${{ github.event.issue.number || inputs.issue_number }} --add-label "label1,label2"
+
+            If your regression analysis found a likely culprit (a recent PR/commit that probably caused this issue), add the "Regression" label:
+            gh issue edit ${{ github.event.issue.number || inputs.issue_number }} --add-label "Regression"
+
+            IMPORTANT: After posting your comment, add the "Bot Responded" label to indicate this issue has received an automated response:
+            gh issue edit ${{ github.event.issue.number || inputs.issue_number }} --add-label "Bot Responded"
+
+            ## Remember
+
+            - **This is a one-time automated response** - you will NOT see their reply or respond again. Never say things like "I can help you", "let me know", "once I have that info", or "I can give you more targeted help" - you won't be there to follow up. If you ask clarifying questions, frame them for the maintainers who will follow up, e.g., "If you can share X, that would help the maintainers diagnose this."
+            - Don't be formulaic. Respond to what the issue actually needs.
+            - Surface solutions from past issues - often the fastest path to helping.
+            - Connecting regressions to specific changes is extremely valuable.
+            - Link issues with #number so they're clickable.

.github/workflows/claude-pr-review.yml

@@ -0,0 +1,290 @@
+name: Claude PR Review
+
+on:
+  pull_request:
+    types: [opened, ready_for_review]
+  # Manual trigger for backfilling existing PRs. Run from terminal:
+  #   gh workflow run claude-pr-review.yml -f pr_number=1234
+  # Or batch process open PRs:
+  #   gh pr list --state open --limit 10 --json number --jq '.[].number' | while read num; do
+  #     gh workflow run claude-pr-review.yml -f pr_number=$num
+  #     sleep 60
+  #   done
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'PR number to review'
+        required: true
+        type: string
+
+jobs:
+  claude-pr-review:
+    # Runs on PR opened/ready_for_review (skips drafts) or manual trigger for backfilling
+    if: |
+      (github.event_name == 'pull_request' && github.event.pull_request.draft == false) ||
+      github.event_name == 'workflow_dispatch'
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+
+    # SECURITY: These permissions are intentionally restrictive.
+    # - contents: read  -> Claude can read the codebase but CANNOT write/push any code
+    # - pull-requests: write -> Claude can post reviews and inline suggestions
+    # - issues: read -> Claude can search for related issues
+    # NOTE: Even with pull-requests: write, Claude CANNOT merge PRs because branch protection
+    # requires 1 approval from a Code Owner. The GITHUB_TOKEN cannot bypass this.
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Print HEAD commit
+        run: |
+          echo "HEAD is at: $(git rev-parse HEAD)"
+          echo "Short: $(git rev-parse --short HEAD)"
+          git log -1 --format="Commit: %H%nAuthor: %an <%ae>%nDate: %ad%nMessage: %s"
+
+      - name: Get PR number
+        id: pr
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            echo "number=${{ inputs.pr_number }}" >> $GITHUB_OUTPUT
+          else
+            echo "number=${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Run PR Review
+        id: review
+        uses: anthropics/claude-code-action@v1
+        with:
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          allowed_non_write_users: "*"
+          claude_args: --model claude-opus-4-5-20251101 --allowedTools "Bash,Read,Write,Edit,Glob,Grep,WebFetch,WebSearch"
+          prompt: |
+            You're a GitHub PR reviewer for the open source Cline repository. Your goal is to give the PR author helpful feedback and give maintainers the context they need to review efficiently.
+
+            PR: #${{ steps.pr.outputs.number }}
+
+            ## Gather context
+
+            ```bash
+            # Get full PR details
+            gh pr view ${{ steps.pr.outputs.number }} --json number,title,body,author,createdAt,updatedAt,isDraft,labels,commits,files,additions,deletions,changedFiles,baseRefName,headRefName,mergeable,reviewDecision
+
+            # Get the diff
+            gh pr diff ${{ steps.pr.outputs.number }}
+
+            # Check CI status
+            gh pr checks ${{ steps.pr.outputs.number }}
+
+            # Get existing review comments (to understand context and your previous feedback)
+            gh api repos/${{ github.repository }}/pulls/${{ steps.pr.outputs.number }}/comments --jq '.[] | {user: .user.login, body: .body, path: .path, created_at: .created_at}'
+
+            # Get conversation comments
+            gh pr view ${{ steps.pr.outputs.number }} --comments
+            ```
+
+            If this is a re-review (workflow_dispatch event):
+            Read your previous comments carefully. Understand what you asked for before.
+            Check if new commits or comments address your previous feedback.
+
+            ## Check contributing guidelines
+
+            Flag (but don't block) if:
+            - Missing changeset - For user-facing changes, check if there's a `.changeset/` file:
+              ```bash
+              gh pr diff ${{ steps.pr.outputs.number }} --name-only | grep '.changeset/' || echo "No changeset found"
+              ```
+              If missing, ask them to run `npm run changeset`
+            - Missing tests - New features should have tests
+
+            ## Find related issues and PRs
+
+            Search thoroughly for context that might help with the review:
+
+            ```bash
+            # Find related issues for context
+            gh issue list --search "<keywords from the PR>" --state all --limit 30
+            gh issue list --search "<error messages or feature names>" --state all --limit 20
+
+            # Find similar PRs for reference
+            gh pr list --search "<keywords>" --state all --limit 30
+            ```
+
+            For each relevant issue or PR you find, read it including comments:
+            ```bash
+            gh issue view <number> --comments
+            gh pr view <number> --comments
+            ```
+
+            Look for:
+            - Open issues this PR might fix that weren't linked in the description
+            - Similar PRs that went through review - what feedback did they get? What patterns did they follow?
+            - Context from maintainer discussions that could inform your review
+
+            ## Find subject matter experts
+
+            For files changed in this PR, find who knows the code best:
+            ```bash
+            # Get files changed
+            gh pr diff ${{ steps.pr.outputs.number }} --name-only
+
+            # For each relevant path, find contributors
+            git log --since="6 months ago" --format="%an" -- <path> | sort | uniq -c | sort -rn | head -5
+            ```
+
+            Cross-reference git authors with GitHub usernames. Include an SME table in your response:
+
+            | SME | Reason |
+            |-----|--------|
+            | @username1 | Authored PR #X which modified this area |
+            | @username2 | Primary contributor to affected file (15 commits in 6 months) |
+            | @username3 | Reviewed similar PR #Y with extensive feedback |
+
+            ## Deep code review
+
+            This is the most important part. Don't just look for syntax issues - understand what the PR is trying to achieve and whether the implementation is the right approach.
+
+            Step 1: Understand the intent
+            Read the PR description and understand what the author is trying to accomplish. What problem are they solving? What feature are they adding?
+
+            Step 2: Form your own opinion first
+            Before analyzing their code, think about how YOU would implement this feature or fix. What files would you touch? What patterns would you follow? What edge cases would you handle?
+
+            Step 3: Compare approaches
+            Now look at their implementation. How does it compare to what you would have done?
+            - Is their approach better in some ways? Note what they did well.
+            - Is their approach missing something? Be specific about what and why.
+            - Are there edge cases they haven't considered?
+            - Does it follow the patterns established in similar parts of the codebase?
+
+            Step 4: Look at the bigger picture
+            - What other files or systems does this change interact with?
+            - Could this break anything else?
+            - Is there additional work needed beyond this PR to complete the feature?
+            - Does this fit well with the overall architecture?
+
+            Step 5: Find reference implementations
+            Look for similar changes in the codebase:
+            ```bash
+            git log --oneline --all --grep="<relevant keywords>" | head -20
+            git log --oneline -- <similar files> | head -20
+            ```
+
+            If this is adding a new API provider, look at how other providers are implemented.
+            If this is adding a new feature, look at how similar features were added.
+            Note where their implementation aligns with or diverges from established patterns.
+
+            Step 6: Standard code review checks
+            - DRY: Is there duplicated code that could be extracted?
+            - Error handling: Are errors handled appropriately?
+            - Security: Any injection risks, credential exposure, unsafe dependencies?
+            - Performance: Any obvious inefficiencies, memory leaks, N+1 patterns?
+            - Types: Is TypeScript used correctly? Any unsafe type assertions?
+            - Naming: Are variables and functions named clearly?
+            - Comments: Is complex logic explained? Are there outdated comments?
+
+            ## Inline code suggestions
+
+            For specific code improvements, use GitHub's suggestion syntax via `gh api`.
+            This creates suggestions the author can commit with one click.
+
+            Single-line suggestion:
+            ```bash
+            gh api repos/${{ github.repository }}/pulls/${{ steps.pr.outputs.number }}/reviews \
+              -X POST \
+              -f commit_id="$(gh pr view ${{ steps.pr.outputs.number }} --json headRefOid -q .headRefOid)" \
+              -f event="COMMENT" \
+              -f body="" \
+              -F comments='[
+                {
+                  "path": "src/example.ts",
+                  "line": 42,
+                  "body": "Consider simplifying:\n\n```suggestion\nconst result = items.filter(Boolean);\n```"
+                }
+              ]'
+            ```
+
+            Multi-line suggestion (replacing lines 40-45):
+            ```bash
+            gh api repos/${{ github.repository }}/pulls/${{ steps.pr.outputs.number }}/reviews \
+              -X POST \
+              -f commit_id="$(gh pr view ${{ steps.pr.outputs.number }} --json headRefOid -q .headRefOid)" \
+              -f event="COMMENT" \
+              -f body="" \
+              -F comments='[
+                {
+                  "path": "src/example.ts",
+                  "start_line": 40,
+                  "line": 45,
+                  "body": "This can be simplified:\n\n```suggestion\nconst simplified = doThing();\n```"
+                }
+              ]'
+            ```
+
+            Use inline suggestions for concrete improvements. Use regular comments for questions or broader feedback.
+
+            ## Post your review
+
+            After your investigation, post a single helpful comment that helps the author and gives maintainers context.
+
+            Start by noting the commit hash you reviewed:
+            ```bash
+            git rev-parse --short HEAD
+            ```
+            Include this at the top of your comment: "Reviewed at commit: <short hash>"
+
+            Then thank them for their contribution. Be conversational, not robotic.
+
+            Include what's relevant:
+            - In-depth explanation of what the PR does - Be comprehensive. A maintainer should be able to read this section and fully understand the author's intent, why they made the changes, how they implemented it, and what files/systems are affected. Don't just summarize - explain.
+            - Related issues/PRs you found that provide useful context (link to them)
+            - Your review findings (issues to address, suggestions, etc.)
+            - Clear next steps for the author
+
+            At the very bottom of your comment, append this exact footer:
+            ```text
+            ---
+            Generated by Claude PR Review
+            ```
+
+            Include a "For Maintainers" section with:
+            - Anything else useful to help the maintainer resolve this PR
+            - Related issues/PRs with context on why they're relevant
+            - Open issues this PR might fix that weren't linked in the description
+            - Your recommendation: merge as-is, needs changes, needs discussion, close, etc.
+            - SME table - who should review this and why
+
+            For the SME table:
+            | SME | Reason |
+            |-----|--------|
+            | @username | Primary contributor to affected files |
+
+            ## Update labels
+
+            Add appropriate labels based on your analysis:
+            ```bash
+            gh label list --json name,description --limit 100
+            gh pr edit ${{ steps.pr.outputs.number }} --add-label "label1,label2"
+            ```
+
+            When done, add the reviewed label:
+            ```bash
+            gh pr edit ${{ steps.pr.outputs.number }} --add-label "Bot Reviewed"
+            ```
+
+            ## Remember
+
+            - This is a one-time automated response - you will NOT see their reply or respond again. Never say things like "let me know if you have questions", "I can help you with", or "feel free to ask" - you won't be there to follow up. Frame any questions for the maintainers who will follow up.
+            - Be helpful and welcoming - Many contributors are new to the project
+            - Be specific - Point to exact lines and suggest fixes, don't give vague feedback
+            - Think deeply - Don't just surface-level review, understand the intent and evaluate the approach
+            - Use inline suggestions - Make it easy for authors to accept changes
+            - You're a first-pass reviewer - A human maintainer will do final approval

.github/workflows/cline-evals-regression.yml

@@ -1,85 +0,0 @@
-name: Smoke Tests
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'src/core/**'
-      - 'src/shared/**'
-      - 'proto/**'
-      - 'evals/**'
-      - '.github/workflows/cline-evals-regression.yml'
-  pull_request:
-    paths:
-      - 'src/core/**'
-      - 'src/shared/**'
-      - 'proto/**'
-      - 'evals/**'
-      - '.github/workflows/cline-evals-regression.yml'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: smoke-tests-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  smoke-tests:
-    name: Smoke Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build and install CLI
-        run: |
-          npm run protos
-          cd cli && npm install && npm run build && npm link
-          echo "$(npm config get prefix)/bin" >> $GITHUB_PATH
-
-      - name: Verify CLI
-        run: cline --version
-
-      - name: Run smoke tests
-        env:
-          CLINE_API_KEY: ${{ secrets.CLINE_API_KEY }}
-        run: |
-          cline auth -p cline -k "$CLINE_API_KEY" -m "anthropic/claude-sonnet-4.5"
-          max_attempts=3
-          for attempt in $(seq 1 $max_attempts); do
-            echo "::group::Attempt $attempt of $max_attempts"
-            if npx tsx evals/smoke-tests/run-smoke-tests.ts --trials 1 --parallel; then
-              echo "::endgroup::"
-              echo "Smoke tests passed on attempt $attempt"
-              exit 0
-            fi
-            echo "::endgroup::"
-            if [ $attempt -lt $max_attempts ]; then
-              echo "::warning::Smoke tests failed on attempt $attempt, retrying..."
-              sleep 10
-            fi
-          done
-          echo "::error::Smoke tests failed after $max_attempts attempts"
-          exit 1
-
-      - name: Generate summary
-        if: always()
-        run: cat evals/smoke-tests/results/latest/summary.md >> $GITHUB_STEP_SUMMARY
-
-      - name: Upload results
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: smoke-test-results-${{ github.run_id }}
-          path: evals/smoke-tests/results/latest/
-          retention-days: 30

.github/workflows/cline-pr-manual-verification-plan.yml

@@ -0,0 +1,101 @@
+name: Cline PR Manual Verification Plan
+
+on:
+  # Manual trigger only. Run from terminal:
+  #   gh workflow run cline-pr-manual-verification-plan.yml -f pr_number=1234
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: "PR number to generate a verification plan for"
+        required: true
+        type: string
+
+concurrency:
+  group: pr-verification-plan-${{ inputs.pr_number }}
+  cancel-in-progress: true
+
+jobs:
+  cline-pr-manual-verification-plan:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    # SECURITY: These permissions are intentionally restrictive.
+    # - contents: read  -> cline can read the codebase but CANNOT write/push any code
+    # - pull-requests: write -> cline can post reviews and inline suggestions
+    # - issues: read -> cline can search for related issues
+    # NOTE: Even with pull-requests: write, cline CANNOT merge PRs because branch protection
+    # requires 1 approval from a Code Owner. The GITHUB_TOKEN cannot bypass this.
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Print HEAD commit
+        run: |
+          echo "HEAD is at: $(git rev-parse HEAD)"
+          echo "Short: $(git rev-parse --short HEAD)"
+          git log -1 --format="Commit: %H%nAuthor: %an <%ae>%nDate: %ad%nMessage: %s"
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: "npm"
+
+      - name: Configure Cline with Cline Provider
+        run: |
+          npx cline@nightly auth --provider cline \
+            --apikey "${{ secrets.CLINE_API_KEY }}" \
+            --modelid anthropic/claude-opus-4.6
+
+      - name: Get PR number
+        id: pr
+        run: echo "number=${{ inputs.pr_number }}" >> $GITHUB_OUTPUT
+
+      - name: Get PR branch info
+        id: branches
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          PR_NUM="${{ steps.pr.outputs.number }}"
+          BASE_REF=$(gh pr view "$PR_NUM" --json baseRefName -q '.baseRefName')
+          HEAD_REF=$(gh pr view "$PR_NUM" --json headRefName -q '.headRefName')
+          MERGE_BASE=$(git merge-base "origin/${BASE_REF}" HEAD)
+          echo "base_ref=${BASE_REF}" >> $GITHUB_OUTPUT
+          echo "head_ref=${HEAD_REF}" >> $GITHUB_OUTPUT
+          echo "merge_base=${MERGE_BASE}" >> $GITHUB_OUTPUT
+          echo "merge_base_short=$(git rev-parse --short ${MERGE_BASE})" >> $GITHUB_OUTPUT
+
+      - name: Generate manual verification plan with Cline
+        env:
+          PR_NUMBER: ${{ steps.pr.outputs.number }}
+          GITHUB_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+          BASE_REF: ${{ steps.branches.outputs.base_ref }}
+          HEAD_REF: ${{ steps.branches.outputs.head_ref }}
+          MERGE_BASE: ${{ steps.branches.outputs.merge_base }}
+          CLINE_COMMAND_PERMISSIONS: |
+            {
+              "allow": [
+                "gh pr diff *",
+                "gh pr view *",
+                "gh pr checks *",
+                "gh pr list *",
+                "gh label list *",
+                "gh issue list *",
+                "gh issue view *",
+                "git log *",
+                "gh pr comment ${{ steps.pr.outputs.number }} *",
+                "gh pr edit ${{ steps.pr.outputs.number }} *",
+                "gh api repos/${{ github.repository }}/pulls/${{ steps.pr.outputs.number }}/comments *",
+                "gh api repos/${{ github.repository }}/pulls/${{ steps.pr.outputs.number }}/reviews *"
+              ]
+            }
+        run: |
+          npx cline@nightly --yolo --verbose 'Please come up to speed on the changes in the diff between `git --no-pager diff '"${MERGE_BASE}"'..HEAD` (PR #'"${PR_NUMBER}"': '"${HEAD_REF}"' → '"${BASE_REF}"') and assess the architecture decisions made in this change set.  We are interested also in coming up with an effective set of steps for manual verification of the changes to show that the change set is fully working as intended.'

.github/workflows/cline-pr-review.yml

@@ -0,0 +1,326 @@
+name: Cline PR Code Review
+
+on:
+  pull_request:
+    types:
+      [opened, ready_for_review]
+      # Manual trigger for backfilling existing PRs. Run from terminal:
+      #   gh workflow run cline-pr-review.yml -f pr_number=1234
+      # Or batch process open PRs:
+      #   gh pr list --state open --limit 10 --json number --jq '.[].number' | while read num; do
+      #     gh workflow run cline-pr-review.yml -f pr_number=$num
+      #     sleep 60
+      #   done
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: "PR number to review"
+        required: true
+        type: string
+
+concurrency:
+  group: pr-review-${{ github.event.pull_request.number || inputs.pr_number }}
+  cancel-in-progress: true
+
+jobs:
+  cline-pr-review:
+    # Runs on PR opened/ready_for_review (skips drafts) or manual trigger for backfilling
+    if: |
+      (github.event_name == 'pull_request' && github.event.pull_request.draft == false) ||
+      github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+
+    # SECURITY: These permissions are intentionally restrictive.
+    # - contents: read  -> cline can read the codebase but CANNOT write/push any code
+    # - pull-requests: write -> cline can post reviews and inline suggestions
+    # - issues: read -> cline can search for related issues
+    # NOTE: Even with pull-requests: write, cline CANNOT merge PRs because branch protection
+    # requires 1 approval from a Code Owner. The GITHUB_TOKEN cannot bypass this.
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Print HEAD commit
+        run: |
+          echo "HEAD is at: $(git rev-parse HEAD)"
+          echo "Short: $(git rev-parse --short HEAD)"
+          git log -1 --format="Commit: %H%nAuthor: %an <%ae>%nDate: %ad%nMessage: %s"
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: "npm"
+
+      - name: Configure Cline with Cline Provider
+        run: |
+          npx cline@nightly auth --provider cline \
+            --apikey "${{ secrets.CLINE_API_KEY }}" \
+            --modelid anthropic/claude-opus-4.6
+
+      - name: Get PR number
+        id: pr
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            echo "number=${{ inputs.pr_number }}" >> $GITHUB_OUTPUT
+          else
+            echo "number=${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Review PR with Cline
+        env:
+          PR_NUMBER: ${{ steps.pr.outputs.number }}
+          GITHUB_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+          CLINE_COMMAND_PERMISSIONS: |
+            {
+              "allow": [
+                "gh pr diff *",
+                "gh pr view *",
+                "gh pr checks *",
+                "gh pr list *",
+                "gh label list *",
+                "gh issue list *",
+                "gh issue view *",
+                "git log *",
+                "gh pr comment ${{ steps.pr.outputs.number }} *",
+                "gh pr edit ${{ steps.pr.outputs.number }} *",
+                "gh api repos/${{ github.repository }}/pulls/${{ steps.pr.outputs.number }}/comments *",
+                "gh api repos/${{ github.repository }}/pulls/${{ steps.pr.outputs.number }}/reviews *"
+              ]
+            }
+        run: |
+          npx cline@nightly --yolo --verbose 'You'\''re a GitHub PR reviewer for the open source Cline repository. Your goal is to give the PR author helpful feedback and give maintainers the context they need to review efficiently.
+
+          PR: #'"${PR_NUMBER}"'
+
+          ## Gather context
+
+          ```bash
+          # Get full PR details
+          gh pr view '"${PR_NUMBER}"' --json number,title,body,author,createdAt,updatedAt,isDraft,labels,commits,files,additions,deletions,changedFiles,baseRefName,headRefName,mergeable,reviewDecision
+
+          # Get the diff
+          gh pr diff '"${PR_NUMBER}"'
+
+          # Check CI status
+          gh pr checks '"${PR_NUMBER}"'
+
+          # Get existing review comments (to understand context and your previous feedback)
+          gh api repos/'"${GITHUB_REPO}"'/pulls/'"${PR_NUMBER}"'/comments --jq '\''.[] | {user: .user.login, body: .body, path: .path, created_at: .created_at}'\''
+
+          # Get conversation comments
+          gh pr view '"${PR_NUMBER}"' --comments
+          ```
+
+          If this is a re-review (workflow_dispatch event):
+          Read your previous comments carefully. Understand what you asked for before.
+          Check if new commits or comments address your previous feedback.
+
+          ## Check contributing guidelines
+
+          Flag (but don'\''t block) if:
+          - Missing changeset - For user-facing changes, check if there'\''s a `.changeset/` file:
+            ```bash
+            gh pr diff '"${PR_NUMBER}"' --name-only | grep '\''.changeset/'\'' || echo '\''No changeset found'\''
+            ```
+            If missing, ask them to run `npm run changeset`
+          - Missing tests - New features should have tests
+
+          ## Find related issues and PRs
+
+          Search thoroughly for context that might help with the review:
+
+          ```bash
+          # Find related issues for context
+          gh issue list --search '\''<keywords from the PR>'\'' --state all --limit 30
+          gh issue list --search '\''<error messages or feature names>'\'' --state all --limit 20
+
+          # Find similar PRs for reference
+          gh pr list --search '\''<keywords>'\'' --state all --limit 30
+          ```
+
+          For each relevant issue or PR you find, read it including comments:
+          ```bash
+          gh issue view <number> --comments
+          gh pr view <number> --comments
+          ```
+
+          Look for:
+          - Open issues this PR might fix that weren'\''t linked in the description
+          - Similar PRs that went through review - what feedback did they get? What patterns did they follow?
+          - Context from maintainer discussions that could inform your review
+
+          ## Find subject matter experts
+
+          For files changed in this PR, find who knows the code best:
+          ```bash
+          # Get files changed
+          gh pr diff '"${PR_NUMBER}"' --name-only
+
+          # For each relevant path, find contributors
+          git log --since='\''6 months ago'\'' --format='\''%an'\'' -- <path> | sort | uniq -c | sort -rn | head -5
+          ```
+
+          Cross-reference git authors with GitHub usernames. Include an SME table in your response:
+
+          | SME | Reason |
+          |-----|--------|
+          | @username1 | Authored PR #X which modified this area |
+          | @username2 | Primary contributor to affected file (15 commits in 6 months) |
+          | @username3 | Reviewed similar PR #Y with extensive feedback |
+
+          ## Bash command usage
+
+          Don'\''t use operators like `|`, `&&`, or `;` - run each command separately and analyze the output.
+
+          When referencing command outputs, quote them properly to avoid formatting issues.
+
+          ## Deep code review
+
+          This is the most important part. Don'\''t just look for syntax issues - understand what the PR is trying to achieve and whether the implementation is the right approach.
+
+          Step 1: Understand the intent
+          Read the PR description and understand what the author is trying to accomplish. What problem are they solving? What feature are they adding?
+
+          Step 2: Form your own opinion first
+          Before analyzing their code, think about how YOU would implement this feature or fix. What files would you touch? What patterns would you follow? What edge cases would you handle?
+
+          Step 3: Compare approaches
+          Now look at their implementation. How does it compare to what you would have done?
+          - Is their approach better in some ways? Note what they did well.
+          - Is their approach missing something? Be specific about what and why.
+          - Are there edge cases they haven'\''t considered?
+          - Does it follow the patterns established in similar parts of the codebase?
+
+          Step 4: Look at the bigger picture
+          - What other files or systems does this change interact with?
+          - Could this break anything else?
+          - Is there additional work needed beyond this PR to complete the feature?
+          - Does this fit well with the overall architecture?
+
+          Step 5: Find reference implementations
+          Look for similar changes in the codebase:
+          ```bash
+          git log --oneline --all --grep='\''<relevant keywords>'\'' | head -20
+          git log --oneline -- <similar files> | head -20
+          ```
+
+          If this is adding a new API provider, look at how other providers are implemented.
+          If this is adding a new feature, look at how similar features were added.
+          Note where their implementation aligns with or diverges from established patterns.
+
+          Step 6: Standard code review checks
+          - DRY: Is there duplicated code that could be extracted?
+          - Error handling: Are errors handled appropriately?
+          - Security: Any injection risks, credential exposure, unsafe dependencies?
+          - Performance: Any obvious inefficiencies, memory leaks, N+1 patterns?
+          - Types: Is TypeScript used correctly? Any unsafe type assertions?
+          - Naming: Are variables and functions named clearly?
+          - Comments: Is complex logic explained? Are there outdated comments?
+
+          ## Inline code suggestions
+
+          For specific code improvements, use GitHub'\''s suggestion syntax via `gh api`.
+          This creates suggestions the author can commit with one click.
+
+          Single-line suggestion:
+          ```bash
+          gh api repos/'"${GITHUB_REPO}"'/pulls/'"${PR_NUMBER}"'/reviews \
+            -X POST \
+            -f commit_id="$(gh pr view '"${PR_NUMBER}"' --json headRefOid -q .headRefOid)" \
+            -f event='\''COMMENT'\'' \
+            -f body='\'''\'' \
+            -F comments='\''[
+              {
+                "path": "src/example.ts",
+                "line": 42,
+                "body": "Consider simplifying:\n\n```suggestion\nconst result = items.filter(Boolean);\n```"
+              }
+            ]'\''
+          ```
+
+          Multi-line suggestion (replacing lines 40-45):
+          ```bash
+          gh api repos/'"${GITHUB_REPO}"'/pulls/'"${PR_NUMBER}"'/reviews \
+            -X POST \
+            -f commit_id="$(gh pr view '"${PR_NUMBER}"' --json headRefOid -q .headRefOid)" \
+            -f event='\''COMMENT'\'' \
+            -f body='\'''\'' \
+            -F comments='\''[
+              {
+                "path": "src/example.ts",
+                "start_line": 40,
+                "line": 45,
+                "body": "This can be simplified:\n\n```suggestion\nconst simplified = doThing();\n```"
+              }
+            ]'\''
+          ```
+
+          Use inline suggestions for concrete improvements. Use regular comments for questions or broader feedback.
+
+          ## Post your review
+
+          After your investigation, post a single helpful comment that helps the author and gives maintainers context.
+
+          Start by noting the commit hash you reviewed:
+          ```bash
+          git rev-parse --short HEAD
+          ```
+          Include this at the top of your comment: "Reviewed at commit: <short hash>"
+
+          Then thank them for their contribution. Be conversational, not robotic.
+
+          Include what'\''s relevant:
+          - In-depth explanation of what the PR does - Be comprehensive. A maintainer should be able to read this section and fully understand the author'\''s intent, why they made the changes, how they implemented it, and what files/systems are affected. Don'\''t just summarize - explain.
+          - Related issues/PRs you found that provide useful context (link to them)
+          - Your review findings (issues to address, suggestions, etc.)
+          - Clear next steps for the author
+
+          At the very bottom of your comment, append this exact footer:
+          ```text
+          ---
+          Generated by Cline PR Code Review
+          ```
+
+          Include a '\''For Maintainers'\'' section with:
+          - Anything else useful to help the maintainer resolve this PR
+          - Related issues/PRs with context on why they'\''re relevant
+          - Open issues this PR might fix that weren'\''t linked in the description
+          - Your recommendation: merge as-is, needs changes, needs discussion, close, etc.
+          - SME table - who should review this and why
+
+          For the SME table:
+          | SME | Reason |
+          |-----|--------|
+          | @username | Primary contributor to affected files |
+
+          ## Update labels
+
+          Add appropriate labels based on your analysis:
+          ```bash
+          gh label list --json name,description --limit 100
+          gh pr edit '"${PR_NUMBER}"' --add-label '\''label1,label2'\''
+          ```
+
+          When done, add the reviewed label:
+          ```bash
+          gh pr edit '"${PR_NUMBER}"' --add-label '\''Bot Reviewed'\''
+          ```
+
+          ## Remember
+
+          - This is a one-time automated response - you will NOT see their reply or respond again. Never say things like '\''let me know if you have questions'\'', '\''I can help you with'\'', or '\''feel free to ask'\'' - you won'\''t be there to follow up. Frame any questions for the maintainers who will follow up.
+          - Be helpful and welcoming - Many contributors are new to the project
+          - Be specific - Point to exact lines and suggest fixes, don'\''t give vague feedback
+          - Think deeply - Don'\''t just surface-level review, understand the intent and evaluate the approach
+          - Use inline suggestions - Make it easy for authors to accept changes
+          - You'\''re a first-pass reviewer - A human maintainer will do final approval'

.github/workflows/npm-main.yaml

@@ -1,7 +1,7 @@
 name: Publish NPM Release
 
 on:
-  workflow_call:
+  workflow_dispatch:
     inputs:
       confirm_publish:
         description: 'Type "publish" to confirm you want to publish to NPM'
@@ -10,7 +10,6 @@ on:
 
 permissions:
   contents: write # Required for pushing tags
-  id-token: write # Required for npm trusted publishing (OIDC)
   checks: write # Required by test workflow
   pull-requests: write # Required by test workflow
 
@@ -21,7 +20,7 @@ jobs:
   publish-npm-release:
     needs: test
     name: Publish Cline CLI to NPM
-    if: github.repository == 'cline/cline' && github.ref == 'refs/heads/main' && inputs.confirm_publish == 'publish'
+    if: github.repository == 'cline/cline' && github.ref == 'refs/heads/main' && github.event.inputs.confirm_publish == 'publish'
     runs-on: ubuntu-latest
 
     steps:
@@ -31,10 +30,19 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "24.x"
+          node-version: "20.x"
           registry-url: "https://registry.npmjs.org"
 
+      # Cache root dependencies - only reuse if package-lock.json exactly matches
+      - name: Cache root dependencies
+        uses: actions/cache@v4
+        id: root-cache
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
+
       - name: Install root dependencies and CLI dependencies
+        if: steps.check_commits.outputs.skip != 'true'
         run: npm ci --include=optional # this will also install cli deps because "cli" in included in root package.json workspaces field
 
       - name: Generate Protos
@@ -73,6 +81,8 @@ jobs:
           cat dist-standalone/package.json | grep version
 
       - name: Publish to NPM with latest tag
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
         run: |
           echo "Publishing version ${{ steps.version.outputs.version }} to NPM with tag 'latest'..."
           cd dist-standalone

.github/workflows/npm-nightly.yaml

@@ -1,17 +1,12 @@
 name: Publish NPM Nightly
 
 on:
-  workflow_call:
-    inputs:
-      force_publish:
-        description: "Force publish even if there are no commits in the last 24 hours"
-        required: false
-        type: boolean
-        default: false
+  schedule:
+    - cron: "0 12 * * *" # 4 AM PST (UTC-8) = 12 UTC
+  workflow_dispatch:
 
 permissions:
   contents: read
-  id-token: write # Required for npm trusted publishing (OIDC)
   checks: write # Required by test workflow
   pull-requests: write # Required by test workflow
 
@@ -32,12 +27,6 @@ jobs:
       - name: Check for recent commits
         id: check_commits
         run: |
-          if [ "${{ inputs.force_publish }}" = "true" ]; then
-            echo "force_publish enabled, proceeding with publish"
-            echo "skip=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
           if [ $(git rev-list --count HEAD --since="24 hours ago") -eq 0 ]; then
             echo "No commits in last 24 hours, skipping publish"
             echo "skip=true" >> $GITHUB_OUTPUT
@@ -50,9 +39,18 @@ jobs:
         if: steps.check_commits.outputs.skip != 'true'
         uses: actions/setup-node@v4
         with:
-          node-version: "24.x"
+          node-version: "20.x"
           registry-url: "https://registry.npmjs.org"
 
+      # Cache root dependencies - only reuse if package-lock.json exactly matches
+      - name: Cache root dependencies
+        if: steps.check_commits.outputs.skip != 'true'
+        uses: actions/cache@v4
+        id: root-cache
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
+
       - name: Install root dependencies and CLI dependencies
         if: steps.check_commits.outputs.skip != 'true'
         run: npm ci --include=optional # this will also install cli deps because "cli" in included in root package.json workspaces field
@@ -120,6 +118,8 @@ jobs:
 
       - name: Publish to NPM with nightly tag
         if: steps.check_commits.outputs.skip != 'true'
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
         run: |
           echo "Publishing version ${{ steps.version.outputs.version }} to NPM with tag 'nightly'..."
           cd dist-standalone

.github/workflows/publish-cli-trusted.yaml

@@ -1,55 +0,0 @@
-name: Publish CLI (Trusted)
-
-on:
-  schedule:
-    - cron: "0 12 * * *" # 4 AM PST (UTC-8) = 12 UTC
-  workflow_dispatch:
-    inputs:
-      publish_target:
-        description: "Which publish flow to run"
-        required: true
-        default: "main"
-        type: choice
-        options:
-          - main
-          - nightly
-      confirm_publish:
-        description: 'Required when publish_target=main. Type "publish" to confirm release publish.'
-        required: false
-        type: string
-      force_nightly_publish:
-        description: "Force nightly publish even with no commits in last 24h"
-        required: false
-        type: boolean
-        default: false
-
-permissions:
-  id-token: write # Required for npm trusted publishing (OIDC)
-  contents: write # Required because npm-main creates/pushes git tags
-  checks: write # Required by nested reusable test workflow
-  pull-requests: write # Required by nested reusable test workflow
-
-jobs:
-  publish-main:
-    if: |
-      github.repository == 'cline/cline' && (
-        github.event_name == 'workflow_dispatch' &&
-        github.event.inputs.publish_target == 'main' &&
-        github.event.inputs.confirm_publish == 'publish' &&
-        !endsWith(github.actor, '[bot]')
-      )
-    uses: ./.github/workflows/npm-main.yaml
-    secrets: inherit
-    with:
-      confirm_publish: ${{ github.event.inputs.confirm_publish }}
-
-  publish-nightly:
-    if: |
-      github.repository == 'cline/cline' && (
-        github.event_name == 'schedule' ||
-        (github.event_name == 'workflow_dispatch' && github.event.inputs.publish_target == 'nightly')
-      )
-    uses: ./.github/workflows/npm-nightly.yaml
-    secrets: inherit
-    with:
-      force_publish: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.force_nightly_publish == 'true' }}

.github/workflows/publish-nightly.yml

@@ -36,9 +36,23 @@ jobs:
             - 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
+                  node-version: "lts/*"
+
+            # Cache root dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache root dependencies
+              uses: actions/cache@v4
+              id: root-cache
+              with:
+                  path: node_modules
+                  key: ${{ runner.os }}-npm-${{ hashFiles('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: webview-ui/node_modules
+                  key: ${{ runner.os }}-npm-webview-${{ hashFiles('webview-ui/package-lock.json') }}
 
             - name: Install root dependencies
               run: npm ci --include=optional

.github/workflows/publish.yml

@@ -11,13 +11,8 @@ on:
                 options:
                     - pre-release
                     - release
-            auto_create_tag_from_main:
-                description: "Auto-create and push the provided tag from the tested main commit (recommended)"
-                required: true
-                default: true
-                type: boolean
             tag:
-                description: "Tag to publish (required in both modes, e.g., v3.1.2)"
+                description: "Enter existing tag to publish (e.g., v3.1.2)"
                 required: true
                 type: string
 
@@ -40,78 +35,37 @@ jobs:
         steps:
             - uses: actions/checkout@v4
               with:
-                  ref: main
+                  ref: ${{ github.event.inputs.tag }}
                   fetch-depth: 0
                   fetch-tags: true
 
-            - name: Resolve Release Tag
-              id: resolve_tag
-              run: |
-                  TAG="${{ github.event.inputs.tag }}"
-                  AUTO_CREATE="${{ github.event.inputs.auto_create_tag_from_main }}"
-                  TESTED_SHA="${{ github.sha }}"
-                  WORKFLOW_REF="${{ github.ref }}"
-
-                  if [[ -z "$TAG" ]]; then
-                    echo "Error: tag input is required"
-                    exit 1
-                  fi
-
-                  if [[ ! "$TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+([-.][0-9A-Za-z.]+)?$ ]]; then
-                    echo "Error: tag must match vX.Y.Z (optionally with -suffix or .suffix)"
-                    exit 1
-                  fi
-                  TAG_REF="refs/tags/$TAG"
-
-                  git fetch origin main --tags
-
-                  if [[ "$AUTO_CREATE" == "true" ]]; then
-                    if [[ "$WORKFLOW_REF" != "refs/heads/main" ]]; then
-                      echo "Error: auto-create mode requires dispatching from main (current ref: $WORKFLOW_REF)"
-                      exit 1
-                    fi
-                    echo "Auto-create enabled. Using tested workflow SHA: $TESTED_SHA"
-
-                    if ! git merge-base --is-ancestor "$TESTED_SHA" origin/main; then
-                      echo "Error: tested SHA $TESTED_SHA is not on origin/main"
-                      exit 1
-                    fi
-
-                    if git show-ref --verify --quiet "$TAG_REF"; then
-                      TAG_SHA=$(git rev-list -n 1 "$TAG_REF^{commit}")
-                      if [[ "$TAG_SHA" != "$TESTED_SHA" ]]; then
-                        echo "Error: tag '$TAG' already exists at $TAG_SHA, not at tested SHA ($TESTED_SHA)"
-                        exit 1
-                      fi
-                      echo "Tag '$TAG' already exists at tested SHA. Continuing."
-                    else
-                      git config user.name "github-actions[bot]"
-                      git config user.email "github-actions[bot]@users.noreply.github.com"
-                      git tag "$TAG" "$TESTED_SHA"
-                      git push origin "$TAG_REF"
-                      echo "Created and pushed tag '$TAG' from tested SHA $TESTED_SHA."
-                    fi
-                  else
-                    if ! git show-ref --verify --quiet "$TAG_REF"; then
-                      echo "Error: tag '$TAG' does not exist in the repository"
-                      exit 1
-                    fi
-                    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 Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: 22
+                  node-version: "lts/*"
+
+            # Cache root dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache root dependencies
+              uses: actions/cache@v4
+              id: root-cache
+              with:
+                  path: node_modules
+                  key: ${{ runner.os }}-npm-${{ hashFiles('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: webview-ui/node_modules
+                  key: ${{ runner.os }}-npm-webview-${{ hashFiles('webview-ui/package-lock.json') }}
 
             - name: Install root dependencies
+              if: steps.root-cache.outputs.cache-hit != 'true'
               run: npm install --include=optional
 
             - name: Install webview-ui dependencies
+              if: steps.webview-cache.outputs.cache-hit != 'true'
               run: cd webview-ui && npm install --include=optional
 
             - name: Install Publishing Tools
@@ -123,15 +77,20 @@ jobs:
                   VERSION=$(node -p "require('./package.json').version")
                   echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-            - name: Verify Tag Matches Package Version
+            - name: Validate Tag
+              id: validate_tag
               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'"
+                  TAG="${{ github.event.inputs.tag }}"
+                  echo "tag=$TAG" >> $GITHUB_OUTPUT
+                  echo "Using existing tag: $TAG"
+
+                  # Verify the tag exists
+                  if ! git rev-parse "$TAG" >/dev/null 2>&1; then
+                    echo "Error: Tag '$TAG' does not exist in the repository"
                     exit 1
                   fi
-                  echo "Tag and package version match: $TAG"
+
+                  echo "Tag '$TAG' validated successfully"
 
             - name: Package and Publish Extension
               env:
@@ -162,7 +121,7 @@ jobs:
             - name: Get Previous Tag
               id: prev_tag
               run: |
-                  CURRENT_TAG="${{ steps.resolve_tag.outputs.tag }}"
+                  CURRENT_TAG="${{ steps.validate_tag.outputs.tag }}"
                   PREV_TAG=$(git describe --tags --abbrev=0 "$CURRENT_TAG^" 2>/dev/null || echo "")
                   echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
 
@@ -178,12 +137,12 @@ jobs:
             - name: Create GitHub Release
               uses: softprops/action-gh-release@v1
               with:
-                  tag_name: ${{ steps.resolve_tag.outputs.tag }}
+                  tag_name: ${{ steps.validate_tag.outputs.tag }}
                   files: "*.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 }}
+                      **Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.prev_tag.outputs.prev_tag }}...${{ steps.validate_tag.outputs.tag }}
                   prerelease: ${{ github.event.inputs.release-type == 'pre-release' }}
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/trigger-jetbrains-tests.yml

@@ -20,8 +20,7 @@ jobs:
       github.event_name == 'pull_request_target' ||
       (github.event_name == 'issue_comment' &&
        github.event.issue.pull_request &&
-       contains(github.event.comment.body, '/test-jetbrains') &&
-       contains(fromJSON('["MEMBER","OWNER","COLLABORATOR"]'), github.event.comment.author_association))
+       contains(github.event.comment.body, '/test-jetbrains'))
     steps:
       - name: Generate GitHub App Token
         id: app-token

.gitignore

@@ -48,6 +48,3 @@ test-results
 .secrets
 
 *.tsbuildinfo
-
-# Smoke test results (generated)
-evals/smoke-tests/results/

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "evals/cline-bench"]
-	path = evals/cline-bench
-	url = https://github.com/cline/cline-bench.git

.vscode/launch.json

@@ -16,8 +16,7 @@
 				"saoudrizwan.claude-dev", // Avoid conflicts with installed Cline
 				"--disable-extension",
 				"saoudrizwan.cline-nightly", // Avoid conflicts with installed Cline Nightly
-				"${workspaceFolder}",
-				"--disable-extensions"
+				"${workspaceFolder}"
 			],
 			"outFiles": [
 				"${workspaceFolder}/dist/**/*.js"

.vscodeignore

@@ -35,9 +35,11 @@ cli/**
 eslint-rules/
 old_docs/
 evals/
+.changie.yaml
 .codespellrc
 .mocharc.json
 buf.yaml
+.changeset/
 .clinerules/
 
 # Ignore all webview-ui files except the build directory (https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/frameworks/hello-world-react-cra/.vscodeignore)

CHANGELOG.md

@@ -1,198 +1,5 @@
 # Changelog
 
-## [3.70.0]
-
-### Added
-
-- New Cline API docs: Getting Started, Auth, Chat Completions, Models, Errors, and SDK Examples
-- Hook payloads now include `model.provider` and `model.slug` 
-- Token/cost updates now happen immediately as usage chunks arrive, not after tool execution
-
-### Fixed
-
-- Improve subagent context compaction logic
-- Subagent stream retry delay increased to reduce noise from transient failures
-- State serialization errors are now caught and logged instead of crashing
-- Removed incorrect `max_tokens` from OpenRouter requests
-
-### Changed
-
-- Windows test cleanup now retries on locked files and applies per-test timeouts
-- Updated hooks docs 
-
-
-## [3.69.0]
-
-### Added
-
-- Add `User-Agent` header to requests sent to the Cline backend
-- Add default auto-tag workflow for publish release flow
-- Show Cline SDK docs on the Cline page
-
-### Fixed
-
-- Retry nested git restore and prevent silent `.git_disabled` leftovers in checkpoints
-- Prevent Chinese filename escaping in diff view
-- Trigger auto-compaction on OpenRouter context overflow errors
-- Restore GPT-OSS native file editing on OpenAI-compatible models
-
-### Changed
-
-- Update Cline SDK docs
-- Improve hooks support for Windows PowerShell
-
-## [3.68.0]
-
-### Added
-
-- Add dynamic Cline provider model fetching from Cline endpoint
-- Add additional Markdown formatting in CLI
-- Add focus indicator on action buttons in extension
-
-### Fixed
-
-- Clear all OCA secrets on auth refresh failure to prevent re-auth loops
-- Resolve "Could not find the file context" error in Explain Changes
-- Use `JSON_SCHEMA` for `yaml.load` to prevent unsafe deserialization
-- Fetch model info from API in CLI headless auth for Cline and Vercel providers
-- Generate commit message from staged changes only when staging exists
-- Update stale `maxTokens` values for Claude 3.7+ models across Anthropic, Bedrock, Vertex, and SAP AI Core
-- Use `model.info.maxTokens` for OpenRouter instead of hardcoded `8192`
-
-### Changed
-
-- Increase timeout for a flaky test to reduce short-term test instability
-
-## [3.67.1]
-
-### Added
-
-- Added Cline SDK API interface for programmatic access to Cline features and tools, enabling integration into custom applications.
-- Added Codex 5.3 model support
-
-### Fixed
-
-- Fix OpenAI Codex by setting `store` to `false`
-- Use `isLocatedInPath()` instead of string matching for path containment checks
-
-## [3.67.0]
-
-### Added
-
-- Add support for skills and optional modelId in subagent configuration
-- Add AgentConfigLoader for file-based agent configs
-- Add Responses API support for OpenAI native provider
-- Preconnect websocket to reduce response latency
-- Fetch featured models from backend with local fallback
-- Add /q command to quit CLI
-- Add MCP enterprise configuration details
-- Pull Cline's recommended models from internal endpoint
-- Add dynamic flag to adjust banner cache duration
-
-### Fixed
-
-- Fix reasoning delta crash on usage-only stream chunks
-- Fix OpenAI tool ID transformation restricted to native provider only
-- Fix auth check for ACP mode
-- Fix CLI yolo mode to not persist yolo setting to disk
-- Fix inline focus-chain slider within its feature row
-- Fix Gemini 3.1 Pro compatibility
-- Fix Cline auth with ACP flag
-
-### Changed
-
-- Move PR skill to .agents/skills
-- SambaNova provider: update models list
-- Remove changeset-converter GitHub Action and npm run changeset
-
-## [3.66.0]
-
-### Added
-
-- Gemini-3.1 Pro Preview
-
-
-## [3.65.0]
-
-### Added
-
-- Add /skills slash command to CLI for viewing and managing installed skills
-
-### Fixed
-
-- Fix aggressive context compaction caused by accidental clicks on the context window progress bar silently setting a very low auto-condense threshold
-- Fix infinite retry loop when write_to_file fails with missing content parameter.
-- Fixed default claude model
-
-## [3.64.0]
-
-### Added
-- Added sonnet 4.6
-
-
-## [3.63.0]
-
-### Added
-
-- added zai GLM 5 Free promo
-
-### Fixed
-
-- Restore reasoning trace visibility in chat and improve the thinking row UX so reasoning is visible, then collapsible after completion.
-
-## [3.62.0]
-
-### Fixed
-
-- Banners now display immediately when opening the extension instead of requiring user interaction first
-- Resolved 17 security vulnerabilities including high-severity DoS issues in dependencies (body-parser, axios, qs, tar, and others)
-
-## [3.61.0]
-
-- UI/UX fixes with minimax model family
-
-## [3.60.0]
-
-- Fixes for Minimax model family
-
-## [3.59.0]
-
-- Added Minimax 2.5 Free Promo
-- Fixed Response chaining for OpenAI's Responses API
-
-## [3.58.0]
-
-### Added
-
-- Subagent: replace legacy subagents with the native `use_subagents` tool
-- Bundle `endpoints.json` support so packaged distributions can ship required endpoints out-of-the-box
-- Amazon Bedrock: support parallel tool calling
-- New "double-check completion" experimental feature to verify work before marking tasks complete
-- CLI: new task controls/flags including custom `--thinking` token budget and `--max-consecutive-mistakes` for yolo runs
-- Remote config: new UI/options (including connection/test buttons) and support for syncing deletion of remotely configured MCP servers
-- Vertex / Claude Code: add 1M context model options for Claude Opus 4.6
-- ZAI/GLM: add GLM-5
-
-### Fixed
-
-- CLI: handle stdin redirection correctly in CI/headless environments
-- CLI: preserve OAuth callback paths during auth redirects
-- VS Code Web: generate auth callback URLs via `vscode.env.asExternalUri` (OAuth callback reliability)
-- Terminal: surface command exit codes in results and improve long-running `execute_command` timeout behavior
-- UI: add loading indicator and fix `api_req_started` rendering
-- Task streaming: prevent duplicate streamed text rows after completion
-- API: preserve selected Vercel model when model metadata is missing
-- Telemetry: route PostHog networking through proxy-aware shared fetch and ensure telemetry flushes on shutdown
-- CI: increase Windows E2E test timeout to reduce flakiness
-
-### Changed
-
-- Settings/model UX: move "reasoning effort" into model configuration and expose it in settings
-- CLI provider selection: limit provider list to those remotely configured
-- UI: consolidate ViewHeader component/styling across views
-- Tools: add auto-approval support for `attempt_completion` commands
-- Remotely configured MCP server schema now supports custom headers
-
 ## [3.57.1]
 
 ### Fixed
@@ -204,7 +11,7 @@
 ### Added
 
 - Cline CLI 2.0 now available. Install with `npm install -g cline`
-- Anthopic Opus 4.6
+- Anthopic Opus 4.6 
 - Minimax-2.1 and Kimi-k2.5 now available for free for a limited time promo
 - Codex-5.3 through ChatGPT subscription
 
@@ -224,23 +31,23 @@
 
 ### Added
 
-- **CLI authentication:** Added Vercel AI Gateway and Cline API key provider support for headless CI/automation workflows
-- **New model:** Added Kimi-K2.5 model to Moonshot provider (262K context, image support, prompt caching)
-- **Prompt variant:** Added Trinity Large prompt variant for improved tool-calling support
-- **OpenTelemetry:** Added support for custom headers on metrics and logs endpoints
-- **Social links:** Added community icons (X, Discord, GitHub, Reddit, LinkedIn) to the What's New modal
+- __CLI authentication:__ Added Vercel AI Gateway and Cline API key provider support for headless CI/automation workflows
+- __New model:__ Added Kimi-K2.5 model to Moonshot provider (262K context, image support, prompt caching)
+- __Prompt variant:__ Added Trinity Large prompt variant for improved tool-calling support
+- __OpenTelemetry:__ Added support for custom headers on metrics and logs endpoints
+- __Social links:__ Added community icons (X, Discord, GitHub, Reddit, LinkedIn) to the What's New modal
 
 ### Fixed
 
-- **LiteLLM:** Fixed thinking configuration not appearing for reasoning-capable models
-- **OpenTelemetry:** Fixed endpoint path handling (no longer incorrectly appends `/v1/logs` or `/v1/metrics`) and ensured logs are sent regardless of VSCode telemetry settings
-- **CLI auth:** Fixed `cline auth` displaying incorrect provider information after configuration
+- __LiteLLM:__ Fixed thinking configuration not appearing for reasoning-capable models
+- __OpenTelemetry:__ Fixed endpoint path handling (no longer incorrectly appends `/v1/logs` or `/v1/metrics`) and ensured logs are sent regardless of VSCode telemetry settings
+- __CLI auth:__ Fixed `cline auth` displaying incorrect provider information after configuration
 
 ### Changed
 
-- **Hooks:** Hook scripts now run from the workspace repository root instead of filesystem root
-- **Default settings:** Enabled multi-root workspaces, parallel tool calling, and skills by default; disabled strict plan mode by default
-- **Settings UI:** Refreshed feature settings section with collapsible design
+- __Hooks:__ Hook scripts now run from the workspace repository root instead of filesystem root
+- __Default settings:__ Enabled multi-root workspaces, parallel tool calling, and skills by default; disabled strict plan mode by default
+- __Settings UI:__ Refreshed feature settings section with collapsible design
 
 ## [3.55.0]
 

CONTRIBUTING.md

@@ -57,11 +57,25 @@ We also welcome contributions to our [documentation](https://github.com/cline/cl
 
 ### Creating a Pull Request
 
-1. Commit your changes.
+1. Before creating a PR, generate a changeset entry:
+    ```bash
+    npm run changeset
+    ```
+   This will prompt you for:
+   - Type of change (major, minor, patch)
+     - `major` → breaking changes (1.0.0 → 2.0.0)
+     - `minor` → new features (1.0.0 → 1.1.0)
+     - `patch` → bug fixes (1.0.0 → 1.0.1)
+   - Description of your changes
 
-2. Push your branch and create a PR on GitHub. Our CI will:
+2. Commit your changes and the generated `.changeset` file
+
+3. Push your branch and create a PR on GitHub. Our CI will:
    - Run tests and checks
-3. Testing
+   - Changesetbot will create a comment showing the version impact
+   - When merged to main, changesetbot will create a Version Packages PR
+   - When the Version Packages PR is merged, a new release will be published
+4. Testing
     - Run `npm run test` to run tests locally. 
     - Before submitting PR, run `npm run format:fix` to format your code
 
@@ -178,10 +192,15 @@ Anyone can contribute code to Cline, but we ask that you follow these guidelines
       - Temporary workspaces with test fixtures
       - Video recording for failed tests
 
-4. **Versioning & Changelog Notes**
+4. **Version Management with Changesets**
 
-    - Contributors do not need to create changelog-entry files as part of PRs.
-    - Maintainers handle release versioning and changelog curation during the release process.
+    - Create a changeset for any user-facing changes using `npm run changeset`
+    - Choose the appropriate version bump:
+        - `major` for breaking changes (1.0.0 → 2.0.0)
+        - `minor` for new features (1.0.0 → 1.1.0)
+        - `patch` for bug fixes (1.0.0 → 1.0.1)
+    - Write clear, descriptive changeset messages that explain the impact
+    - Documentation-only changes don't require changesets
 
 5. **Commit Guidelines**
 

SECURITY.md

@@ -1,27 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-We actively patch only the most recent minor release of Cline. Older versions receive fixes at our discretion.
-
-## Reporting a Vulnerability
-
-We appreciate your efforts to responsibly disclose your findings and will make every effort to acknowledge your contributions.
-
-To report a security issue, please use the GitHub Security Advisory ["Report a Vulnerability"](https://github.com/cline/cline/security/advisories/new) tab.
-
-The team will send a response indicating the next steps in handling your report. After the initial reply, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
-
-When reporting, please include:
-
-- A short summary of the issue
-- Steps to reproduce or a proof of concept
-- Any logs, stack traces, or screenshots that might help us understand the problem
-
-We acknowledge reports within 48 hours and aim to release a fix or mitigation within 30 days. While we work on a resolution, please keep the details private.
-
-## Escalation
-
-If you do not receive an acknowledgement of your report within 5 business days, you may send an email to security@cline.bot.
-
-Thank you for helping us keep Cline users safe.

cli/CHANGELOG.md

@@ -1,168 +0,0 @@
-# cline
-
-## [2.6.0]
-
-### Added
-
-- Hook payloads now include `model.provider` and `model.slug` 
-- Token/cost updates now happen immediately as usage chunks arrive, not after tool execution
-
-### Fixed
-
-- Improve subagent context compaction logic
-- Subagent stream retry delay increased to reduce noise from transient failures
-- State serialization errors are now caught and logged instead of crashing
-- Removed incorrect `max_tokens` from OpenRouter requests
-
-## [2.5.2]
-
-### Added
-
-- Added Windows PowerShell support for hooks (execution, resolution, and management), improving hook behavior on Windows for CLI and shared core workflows.
-
-### Fixed
-
-- Restored GPT-OSS native file editing for OpenAI-compatible models used through shared core tooling.
-- Improved OpenRouter context overflow error handling so auto-compaction triggers correctly for wrapped 400 errors.
-- Hardened checkpoint recovery by retrying nested git restore and preventing silent `.git_disabled` leftovers.
-- Added a User-Agent header for requests to the Cline back-end to improve request handling consistency.
-
-## [2.5.1]
-
-### Added
-
-- Expanded CLI markdown rendering support (headings, lists, blockquotes, fenced code blocks, links, and nested lists).
-
-### Fixed
-
-- Fixed CLI headless auth provider model metadata loading for Cline and Vercel AI Gateway by fetching model info from API with cache fallback.
-- Increased flaky CLI import test timeout on Windows CI to reduce intermittent test failures.
-
-## [2.5.0]
-
-### Added
-
-- Added Cline SDK API interface for programmatic access to Cline features and tools, enabling integration into custom applications.
-- Added Codex 5.3 model support
-
-### Fixed
-
-- Fix OpenAI Codex by setting `store` to `false`
-- Use `isLocatedInPath()` instead of string matching for path containment checks
-
-## [2.4.3]
-
-### Added
-
-- Add /q command to quit CLI
-- Fetch featured models from backend with local fallback
-
-### Fixed
-
-- Fix auth check for ACP mode
-- Fix Cline auth with ACP flag
-- Fix yolo mode to not persist yolo setting to disk
-
-## [2.4.2]
-
-### Added
-
-- Gemini-3.1 Pro Preview
-
-### Patch Changes
-
-- VSCode uses shared files for global, workspace and secret state.
-
-## [2.4.1]
-
-### Fixed
-
-- Fix infinite retry loop when write_to_file fails with missing content parameter. Provides progressive guidance to the model, escalating from suggestions to hard stops, with context window awareness to break the loop.
-
-## [2.4.0]
-
-### Added
-
-- Adding Anthropic Sonnet 4.6
-- Allows users to enter custom aws region when selecting bedrock as a provider in CLI
-- Keep reasoning rows visible when low-stakes tool groups start immediately after reasoning.
-- Restore reasoning trace visibility in chat and improve the thinking row UX so streamed reasoning is visible, then collapsible after completion.
-
-### Fixed
-
-- Banners now display immediately when opening the extension instead of requiring user interaction first
-- Resolved 17 security vulnerabilities including high-severity DoS issues in dependencies (body-parser, axios, qs, tar, and others)
-
-## [2.2.2]
-
-- Allows users to enter custom aws region when selecting bedrock as a provider
-- Prevent Parent Container Scrolling In Dropdowns
-
-## [2.2.1]
-
-- Added Minimax 2.5 Free Promo
-- Fixed Response chaining for OpenAI's Responses API
-
-## [2.2.0]
-
-### Added
-
-- Subagent: replace legacy subagents with the native `use_subagents` tool
-- Bundle `endpoints.json` support so packaged distributions can ship required endpoints out-of-the-box
-- Amazon Bedrock: support parallel tool calling
-- New "double-check completion" experimental feature to verify work before marking tasks complete
-- CLI: new task controls/flags including custom `--thinking` token budget and `--max-consecutive-mistakes` for yolo runs
-- Remote config: new UI/options (including connection/test buttons) and support for syncing deletion of remotely configured MCP servers
-- Vertex / Claude Code: add 1M context model options for Claude Opus 4.6
-- ZAI/GLM: add GLM-5
-
-### Fixed
-
-- CLI: handle stdin redirection correctly in CI/headless environments
-- CLI: preserve OAuth callback paths during auth redirects
-- VS Code Web: generate auth callback URLs via `vscode.env.asExternalUri` (OAuth callback reliability)
-- Terminal: surface command exit codes in results and improve long-running `execute_command` timeout behavior
-- UI: add loading indicator and fix `api_req_started` rendering
-- Task streaming: prevent duplicate streamed text rows after completion
-- API: preserve selected Vercel model when model metadata is missing
-- Telemetry: route PostHog networking through proxy-aware shared fetch and ensure telemetry flushes on shutdown
-- CI: increase Windows E2E test timeout to reduce flakiness
-
-### Changed
-
-- Settings/model UX: move "reasoning effort" into model configuration and expose it in settings
-- CLI provider selection: limit provider list to those remotely configured
-- UI: consolidate ViewHeader component/styling across views
-- Tools: add auto-approval support for `attempt_completion` commands
-- Remotely configured MCP server schema now supports custom headers
-
-## [2.1.0]
-
-### Minor Changes
-
-- 42ce100: Add Generate API Key on Hicap Provider selection
-
-### Patch Changes
-
-- 195294f: Add support for bundled endpoints.json in enterprise distributions. Extensions can now include a pre-configured endpoints.json file that automatically switches Cline to self-hosted mode. Includes packaging scripts for VSIX, NPM, and JetBrains plugins.
-- a1f2601: Replace the LiteLLM model list with a selector
-- 739d75a: Add Claude Code provider support for Claude Opus 4.6 and Sonnet 4.5 1M variants via both full model names and aliases (`opus[1m]`, `sonnet[1m]`), and align the `opus` alias with Opus 4.6.
-- 8440380: Add GitHub Actions workflow to build CLI from any commit for testing
-- b1a8db2: fix(cli): prevent hang when spawned without TTY
-- 7c87017: Add Claude Opus 4.6 model support
-- d116ac5: Supports rendering markdown table in chat view.
-- 6d8fb85: Fix CLI crashing in CI environments and with stdin redirection (e.g., `cline "prompt" < /dev/null`). Now checks both stdin and stdout TTY status before using Ink, and only errors on empty stdin when no prompt is provided.
-- 70a9904: Fix JetBrains sign-in regression by adding fallback for openExternal RPC
-- f440f3a: fix: use vscode.env.openExternal for auth in remote environments
-
-  Fixes OAuth authentication in VS Code Server and remote environments by routing browser URL opening through VS Code's native openExternal API instead of the npm 'open' package.
-
-- 70a9904: fix: use vscode.env.asExternalUri for auth callback URLs only in VS Code Web
-
-  Fixes OAuth callback redirect in VS Code Web (`code serve-web`, Codespaces) by using `vscode.env.asExternalUri()` to resolve the callback URI. This is gated behind a `vscode.env.uiKind === UIKind.Web` check so regular desktop VS Code continues to use the `vscode://` URI directly. The `getCallbackUrl` API now accepts a `path` parameter so the full callback URI (including route) is resolved correctly, and callers pass their path directly instead of appending after.
-
-- 5308ded: Updating script documentation and removing unnecessary continue on error
-- b514f18: Prevent duplicate streamed text rows when a partial text update arrives after the same text was already finalized.
-- 26391c9: Fix Bedrock model id
-- d19a877: Unify ViewHeader Styles Across All Views
-- 5dcaa8c: Add Vertex Claude Opus 4.6 1M model option and global endpoint support, and pass the 1M beta header for Vertex Claude requests.

cli/README.md

@@ -45,7 +45,7 @@ cline
 
 ### Use any API and Model
 
-Cline supports API providers like ChatGPT, Anthropic, OpenAI, Google Gemini, AWS Bedrock, Azure, GCP Vertex, Cerebras, Groq, and Moonshot. You can also configure any OpenAI compatible API, or use a local model through LM Studio/Ollama. If you're using a Cline Account, you'll always have access to the newest models as soon as they're available.
+Cline supports API providers like ChatGPT, Anthropic, OpenAI, Google Gemini, AWS Bedrock, Azure, GCP Vertex, Cerebras and Groq. You can also configure any OpenAI compatible API, or use a local model through LM Studio/Ollama. If you're using a Cline Account, you'll always have access to the newest models as soon as they're available.
 
 <!-- Transparent pixel to create line break after floating image -->
 
@@ -79,3 +79,4 @@ Get the same Cline experience with enterprise-grade controls: SSO (SAML/OIDC), g
 ## License
 
 [Apache 2.0 © 2026 Cline Bot Inc.](./LICENSE)
+

cli/esbuild.mts

@@ -208,8 +208,8 @@ if (production) {
 	buildEnvVars["process.env.IS_DEV"] = "false"
 }
 
-// Shared build options
-const sharedOptions: Partial<esbuild.BuildOptions> = {
+const config: esbuild.BuildOptions = {
+	entryPoints: [path.join(__dirname, "src", "index.ts")],
 	bundle: true,
 	minify: production,
 	sourcemap: !production,
@@ -221,6 +221,7 @@ const sharedOptions: Partial<esbuild.BuildOptions> = {
 	sourcesContent: false,
 	platform: "node",
 	target: "node20",
+	outfile: path.join(__dirname, "dist", "cli.mjs"),
 	// These modules need to load files from the module directory at runtime
 	external: [
 		"@grpc/reflection",
@@ -236,13 +237,6 @@ const sharedOptions: Partial<esbuild.BuildOptions> = {
 		"@vscode/ripgrep", // Uses __dirname to locate the binary
 	],
 	supported: { "top-level-await": true },
-}
-
-// CLI executable configuration
-const cliConfig: esbuild.BuildOptions = {
-	...sharedOptions,
-	entryPoints: [path.join(__dirname, "src", "index.ts")],
-	outfile: path.join(__dirname, "dist", "cli.mjs"),
 	banner: {
 		js: `#!/usr/bin/env node
 // Suppress all Node.js warnings (deprecation, experimental, etc.)
@@ -256,44 +250,19 @@ const __dirname = _dirname(__filename);`,
 	},
 }
 
-// Library configuration for programmatic use
-const libConfig: esbuild.BuildOptions = {
-	...sharedOptions,
-	entryPoints: [path.join(__dirname, "src", "exports.ts")],
-	outfile: path.join(__dirname, "dist", "lib.mjs"),
-	banner: {
-		js: `// Cline Library - Programmatic API
-import { createRequire as _createRequire } from 'module';
-import { fileURLToPath as _fileURLToPath } from 'url';
-import { dirname as _dirname } from 'path';
-const require = _createRequire(import.meta.url);
-const __filename = _fileURLToPath(import.meta.url);
-const __dirname = _dirname(__filename);`,
-	},
-}
-
 async function main() {
+	const ctx = await esbuild.context(config)
 	if (watch) {
-		// In watch mode, only watch the CLI (primary use case for development)
-		const ctx = await esbuild.context(cliConfig)
 		await ctx.watch()
 		console.log("[cli] Watching for changes...")
 	} else {
-		// Build both CLI and library
-		console.log("[cli esbuild] Building CLI executable...")
-		const cliCtx = await esbuild.context(cliConfig)
-		await cliCtx.rebuild()
-		await cliCtx.dispose()
+		await ctx.rebuild()
+		await ctx.dispose()
 
-		console.log("[cli esbuild] Building library bundle...")
-		const libCtx = await esbuild.context(libConfig)
-		await libCtx.rebuild()
-		await libCtx.dispose()
-
-		// Make the CLI output executable
-		const cliOutfile = path.join(__dirname, "dist", "cli.mjs")
-		if (fs.existsSync(cliOutfile)) {
-			fs.chmodSync(cliOutfile, "755")
+		// Make the output executable
+		const outfile = path.join(__dirname, "dist", "cli.mjs")
+		if (fs.existsSync(outfile)) {
+			fs.chmodSync(outfile, "755")
 		}
 	}
 }

cli/man/cline.1

@@ -125,13 +125,13 @@ authentication wizard, or use quick setup flags.
 Options:
 .PP
 \f[B]\-p\f[R], \f[B]\-\-provider\f[R] \f[I]id\f[R] : Provider ID for
-quick setup (e.g., openai\-native, anthropic, openrouter, moonshot)
+quick setup (e.g., openai\-native, anthropic, openrouter)
 .PP
 \f[B]\-k\f[R], \f[B]\-\-apikey\f[R] \f[I]key\f[R] : API key for the
 provider
 .PP
 \f[B]\-m\f[R], \f[B]\-\-modelid\f[R] \f[I]id\f[R] : Model ID to
-configure (e.g., gpt\-4o, claude\-sonnet\-4\-5\-20250929, kimi\-k2.5)
+configure (e.g., gpt\-4o, claude\-sonnet\-4\-5\-20250929)
 .PP
 \f[B]\-b\f[R], \f[B]\-\-baseurl\f[R] \f[I]url\f[R] : Base URL (optional,
 for OpenAI\-compatible providers)
@@ -242,9 +242,6 @@ cline \-m claude\-sonnet\-4\-5\-20250929 \(dqRefactor this function\(dq
 
 \f[I]# Quick auth setup with model\f[R]
 cline auth \-p anthropic \-k sk\-ant\-xxxxx \-m claude\-sonnet\-4\-5\-20250929
-
-\f[I]# Quick auth setup for Moonshot\f[R]
-cline auth \-p moonshot \-k sk\-xxxxx \-m kimi\-k2.5
 .EE
 .SS Including Images
 .IP
@@ -312,9 +309,6 @@ cline auth \-p anthropic \-k sk\-ant\-api\-xxxxx
 \f[I]# Quick setup for OpenAI\f[R]
 cline auth \-p openai\-native \-k sk\-xxxxx \-m gpt\-4o
 
-\f[I]# Quick setup for Moonshot\f[R]
-cline auth \-p moonshot \-k sk\-xxxxx \-m kimi\-k2.5
-
 \f[I]# OpenAI\-compatible provider with custom base URL\f[R]
 cline auth \-p openai \-k your\-api\-key \-b https://api.example.com/v1
 .EE

cli/man/cline.1.md

@@ -56,8 +56,6 @@ Run a new task with a prompt.
 
 **-y**, **\--yolo** :   Enable yolo/yes mode (auto-approve all actions, output in plain mode, exit process automatically when task complete)
 
-**-t**, **\--timeout** *seconds* :   Optional timeout in seconds. Only applied when explicitly provided.
-
 **-m**, **\--model** *model* :   Model to use for the task
 
 **-i**, **\--images** *paths...* :   Image file paths to include with the task
@@ -146,8 +144,6 @@ When running **cline** with just a prompt (no subcommand), these options are ava
 
 **-y**, **\--yolo** :   Enable yolo mode (auto-approve all actions). Also forces plain text output mode.
 
-**-t**, **\--timeout** *seconds* :   Optional timeout in seconds. Only applied when explicitly provided.
-
 **-m**, **\--model** *model* :   Model to use for the task
 
 **-v**, **\--verbose** :   Show verbose output

cli/package.json

@@ -1,18 +1,11 @@
 {
 	"name": "cline",
-	"version": "2.6.0",
+	"version": "2.0.5",
 	"description": "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
-	"main": "dist/lib.mjs",
-	"types": "dist/lib.d.ts",
+	"main": "dist/cli.mjs",
 	"bin": {
 		"cline": "./dist/cli.mjs"
 	},
-	"exports": {
-		".": {
-			"import": "./dist/lib.mjs",
-			"types": "./dist/lib.d.ts"
-		}
-	},
 	"os": [
 		"darwin",
 		"linux",
@@ -30,9 +23,8 @@
 	"scripts": {
 		"package:brew": "npx tsx ./scripts/update-brew-formula.mts",
 		"package": "npm pack --pack-destination ./dist",
-		"build": "npm run typecheck && npx tsx esbuild.mts && npm run build:types",
-		"build:production": "npm run typecheck && npx tsx esbuild.mts --production && npm run build:types",
-		"build:types": "(npx tsc -p tsconfig.lib.json || true) && cp dist/types/cli/src/exports.d.ts dist/lib.d.ts && mkdir -p dist/agent && cp dist/types/cli/src/agent/ClineAgent.d.ts dist/types/cli/src/agent/ClineSessionEmitter.d.ts dist/types/cli/src/agent/public-types.d.ts dist/agent/ && rm -rf dist/types",
+		"build": "npm run typecheck && npx tsx esbuild.mts",
+		"build:production": "npm run typecheck && npx tsx esbuild.mts --production",
 		"watch": "npx tsx esbuild.mts --watch",
 		"dev": "IS_DEV=true && npm run link && npm run watch ; npm run unlink",
 		"clean": "rimraf dist",
@@ -70,7 +62,6 @@
 		"url": "https://github.com/cline/cline/issues"
 	},
 	"devDependencies": {
-		"@types/marked": "^5.0.2",
 		"@types/node": "20.x",
 		"@types/prompts": "^2.4.9",
 		"@types/react": "^19.2.9",
@@ -90,9 +81,8 @@
 		"ink": "npm:@jrichman/ink@6.4.7",
 		"ink-picture": "^1.3.3",
 		"ink-spinner": "^5.0.0",
-		"marked": "^17.0.3",
-		"nanoid": "^5.1.6",
 		"ora": "^8.0.1",
+		"nanoid": "^5.1.6",
 		"pino": "^10.0.0",
 		"pino-roll": "^4.0.0",
 		"prompts": "^2.4.2",

cli/src/acp/ACPHostBridgeClientProvider.ts

@@ -108,7 +108,11 @@ class ACPDiffServiceClient implements DiffServiceClientInterface {
 class ACPEnvServiceClient implements EnvServiceClientInterface {
 	private readonly version: string
 
-	constructor(_clientCapabilities: acp.ClientCapabilities | undefined, _sessionIdResolver: SessionIdResolver, version: string) {
+	constructor(
+		_clientCapabilities: acp.ClientCapabilities | undefined,
+		_sessionIdResolver: SessionIdResolver,
+		version: string = "1.0.0",
+	) {
 		this.version = version
 	}
 
@@ -398,7 +402,7 @@ export class ACPHostBridgeClientProvider implements HostBridgeClientProvider {
 		clientCapabilities: acp.ClientCapabilities | undefined,
 		sessionIdResolver: SessionIdResolver,
 		cwdResolver: CwdResolver,
-		version: string,
+		version: string = "1.0.0",
 	) {
 		this.workspaceClient = new ACPWorkspaceServiceClient(clientCapabilities, sessionIdResolver, cwdResolver)
 		this.envClient = new ACPEnvServiceClient(clientCapabilities, sessionIdResolver, version)

cli/src/acp/AcpAgent.ts

@@ -15,7 +15,7 @@
 import type * as acp from "@agentclientprotocol/sdk"
 import { Logger } from "@/shared/services/Logger.js"
 import { ClineAgent } from "../agent/ClineAgent.js"
-import { type AcpAgentOptions, type SessionUpdateType } from "../agent/types.js"
+import type { AcpAgentOptions, SessionUpdateType } from "../agent/types.js"
 
 /**
  * ACP Agent wrapper that bridges stdio connection to ClineAgent.
@@ -39,21 +39,37 @@ export class AcpAgent implements acp.Agent {
 		this.clineAgent = new ClineAgent(options)
 
 		// Wire up the permission handler to use the connection
-		this.clineAgent.setPermissionHandler(async (request) => {
+		this.clineAgent.setPermissionHandler(async (request, resolve) => {
 			try {
 				Logger.debug("[AcpAgent] Forwarding permission request to connection")
-				return await this.connection.requestPermission({
-					sessionId: request.sessionId,
+				const response = await this.connection.requestPermission({
+					sessionId: this.getCurrentSessionId() ?? "",
 					toolCall: request.toolCall,
 					options: request.options,
 				})
+				resolve(response)
 			} catch (error) {
 				Logger.debug("[AcpAgent] Error requesting permission:", error)
-				return { outcome: { outcome: "cancelled" } }
+				resolve({ outcome: "rejected" as unknown as acp.RequestPermissionOutcome })
 			}
 		})
 	}
 
+	/**
+	 * Get the current active session ID from the ClineAgent.
+	 */
+	private getCurrentSessionId(): string | undefined {
+		// Find the session that's currently processing
+		for (const [sessionId, session] of this.clineAgent.sessions) {
+			if (session.controller?.task) {
+				return sessionId
+			}
+		}
+		// Fall back to the first session if none is actively processing
+		const firstSession = this.clineAgent.sessions.keys().next()
+		return firstSession.done ? undefined : firstSession.value
+	}
+
 	/**
 	 * Subscribe to session events and forward them to the connection.
 	 */

cli/src/acp/AcpTerminalManager.ts

@@ -12,7 +12,11 @@
 
 import type * as acp from "@agentclientprotocol/sdk"
 import type { TerminalHandle } from "@agentclientprotocol/sdk"
-import { DEFAULT_TERMINAL_OUTPUT_LINE_LIMIT, PROCESS_HOT_TIMEOUT_NORMAL } from "@integrations/terminal/constants"
+import {
+	DEFAULT_SUBAGENT_TERMINAL_OUTPUT_LINE_LIMIT,
+	DEFAULT_TERMINAL_OUTPUT_LINE_LIMIT,
+	PROCESS_HOT_TIMEOUT_NORMAL,
+} from "@integrations/terminal/constants"
 import type {
 	ITerminal,
 	ITerminalManager,
@@ -138,12 +142,12 @@ export interface ManagedTerminal {
  * Wraps ACP terminal operations and emits events compatible with ITerminalProcess.
  */
 class AcpTerminalProcess extends EventEmitter<TerminalProcessEvents> implements ITerminalProcess {
-	isHot = false
-	waitForShellIntegration = false
+	isHot: boolean = false
+	waitForShellIntegration: boolean = false
 
-	private _unretrievedOutput = ""
-	private _continued = false
-	private _completed = false
+	private _unretrievedOutput: string = ""
+	private _continued: boolean = false
+	private _completed: boolean = false
 	private _hotTimeout: NodeJS.Timeout | null = null
 	private _exitWaitTimeout: NodeJS.Timeout | null = null
 	private readonly manager: AcpTerminalManager
@@ -393,7 +397,7 @@ export class AcpTerminalManager implements ITerminalManager {
 	private readonly numericIdToStringId: Map<number, string> = new Map()
 
 	/** Next numeric ID to assign */
-	private nextNumericId = 1
+	private nextNumericId: number = 1
 
 	/** Active processes indexed by numeric terminal ID */
 	private readonly processes: Map<number, AcpTerminalProcess> = new Map()
@@ -402,8 +406,9 @@ export class AcpTerminalManager implements ITerminalManager {
 	private readonly terminalInfos: Map<number, TerminalInfo> = new Map()
 
 	// Configuration options for ITerminalManager
-	private terminalReuseEnabled = true
+	private terminalReuseEnabled: boolean = true
 	private terminalOutputLineLimit: number = DEFAULT_TERMINAL_OUTPUT_LINE_LIMIT
+	private subagentTerminalOutputLineLimit: number = DEFAULT_SUBAGENT_TERMINAL_OUTPUT_LINE_LIMIT
 
 	/**
 	 * Creates a new AcpTerminalManager.
@@ -662,6 +667,14 @@ export class AcpTerminalManager implements ITerminalManager {
 		this.terminalOutputLineLimit = limit
 	}
 
+	/**
+	 * Set the maximum number of output lines for subagent commands.
+	 * @param limit Maximum number of lines
+	 */
+	setSubagentTerminalOutputLineLimit(limit: number): void {
+		this.subagentTerminalOutputLineLimit = limit
+	}
+
 	/**
 	 * Set the default terminal profile.
 	 * @param profile The profile identifier
@@ -674,10 +687,15 @@ export class AcpTerminalManager implements ITerminalManager {
 	 * Process output lines, potentially truncating if over limit.
 	 * @param outputLines Array of output lines
 	 * @param overrideLimit Optional limit override
+	 * @param isSubagentCommand Whether this is a subagent command
 	 * @returns Processed output string
 	 */
-	processOutput(outputLines: string[], overrideLimit?: number): string {
-		const limit = overrideLimit !== undefined ? overrideLimit : this.terminalOutputLineLimit
+	processOutput(outputLines: string[], overrideLimit?: number, isSubagentCommand?: boolean): string {
+		const limit = isSubagentCommand
+			? overrideLimit !== undefined
+				? overrideLimit
+				: this.subagentTerminalOutputLineLimit
+			: this.terminalOutputLineLimit
 
 		if (outputLines.length > limit) {
 			const halfLimit = Math.floor(limit / 2)

cli/src/acp/index.ts

@@ -15,18 +15,22 @@
 
 import { AgentSideConnection, ndJsonStream } from "@agentclientprotocol/sdk"
 import { Logger } from "@/shared/services/Logger"
+import { version as CLI_VERSION } from "../../../package.json"
 import { AcpAgent } from "./AcpAgent.js"
 import { nodeToWebReadable, nodeToWebWritable } from "./streamUtils.js"
 
 // Re-export classes for programmatic use
 export { ClineAgent } from "../agent/ClineAgent.js"
 export { ClineSessionEmitter } from "../agent/ClineSessionEmitter.js"
+// Re-export types
 export type {
 	AcpAgentOptions,
 	AcpSessionState,
+	ClineAcpSession,
 	ClineAgentOptions,
 	ClineSessionEvents,
 	PermissionHandler,
+	PermissionResolver,
 } from "../agent/types.js"
 export { AcpAgent } from "./AcpAgent.js"
 
@@ -95,6 +99,7 @@ export async function runAcpMode(options: AcpModeOptions = {}): Promise<void> {
 
 	new AgentSideConnection((conn) => {
 		agent = new AcpAgent(conn, {
+			version: CLI_VERSION,
 			debug: Boolean(options.verbose),
 		})
 		return agent

cli/src/agent/ClineAgent.ts

@@ -28,8 +28,6 @@ import {
 	groqModels,
 	mistralDefaultModelId,
 	mistralModels,
-	moonshotDefaultModelId,
-	moonshotModels,
 	openAiCodexDefaultModelId,
 	openAiNativeDefaultModelId,
 	openAiNativeModels,
@@ -38,6 +36,7 @@ import {
 } from "@shared/api"
 import type { ClineAsk, ClineMessage as ClineMessageType } from "@shared/ExtensionMessage"
 import { CLI_ONLY_COMMANDS, VSCODE_ONLY_COMMANDS } from "@shared/slashCommands"
+import { ProviderToApiKeyMap } from "@shared/storage"
 import { getProviderModelIdKey } from "@shared/storage/provider-keys"
 import { ClineEndpoint } from "@/config.js"
 import { Controller } from "@/core/controller"
@@ -52,21 +51,18 @@ import { openAiCodexOAuthManager } from "@/integrations/openai-codex/oauth"
 import { StandaloneTerminalManager } from "@/integrations/terminal/index.js"
 import { AuthService } from "@/services/auth/AuthService.js"
 import { Logger } from "@/shared/services/Logger.js"
+import { secretStorage } from "@/shared/storage/ClineSecretStorage"
 import type { Mode } from "@/shared/storage/types"
 import { openExternal } from "@/utils/env"
-import { version as AGENT_VERSION } from "../../package.json"
 import { ACPDiffViewProvider } from "../acp/ACPDiffViewProvider.js"
 import { ACPHostBridgeClientProvider } from "../acp/ACPHostBridgeClientProvider.js"
 import { AcpTerminalManager } from "../acp/AcpTerminalManager.js"
-import { isAuthConfigured } from "../utils/auth"
 import { fetchOpenRouterModels, usesOpenRouterModels } from "../utils/openrouter-models"
 import { CliContextResult, initializeCliContext } from "../vscode-context.js"
 import { ClineSessionEmitter } from "./ClineSessionEmitter.js"
 import { translateMessage } from "./messageTranslator.js"
 import { handlePermissionResponse } from "./permissionHandler.js"
-import type { ClineAcpSession, ClineAgentOptions, PermissionHandler } from "./public-types.js"
-import { AcpSessionStatus } from "./public-types.js"
-import { type AcpSessionState } from "./types.js"
+import type { AcpSessionState, ClineAcpSession, ClineAgentOptions, PermissionHandler } from "./types.js"
 
 // Map providers to their static model lists and defaults (copied from ModelPicker.tsx)
 const providerModels: Record<string, { models: Record<string, unknown>; defaultId: string }> = {
@@ -76,7 +72,6 @@ const providerModels: Record<string, { models: Record<string, unknown>; defaultI
 	bedrock: { models: bedrockModels, defaultId: bedrockDefaultModelId },
 	deepseek: { models: deepSeekModels, defaultId: deepSeekDefaultModelId },
 	mistral: { models: mistralModels, defaultId: mistralDefaultModelId },
-	moonshot: { models: moonshotModels, defaultId: moonshotDefaultModelId },
 	groq: { models: groqModels, defaultId: groqDefaultModelId },
 	xai: { models: xaiModels, defaultId: xaiDefaultModelId },
 }
@@ -107,12 +102,7 @@ function getModelList(provider: string): string[] {
 export class ClineAgent implements acp.Agent {
 	private readonly options: ClineAgentOptions
 	private readonly ctx: CliContextResult
-
-	/** Map of active sessions by session ID */
-	public readonly sessions: Map<string, ClineAcpSession> = new Map()
-
-	/** WeakMap to associate ClineAcpSession with its Controller without exposing it to consumers */
-	readonly #sessionControllers = new WeakMap<ClineAcpSession, Controller>()
+	readonly sessions: Map<string, ClineAcpSession> = new Map()
 
 	/** Runtime state for active sessions */
 	private readonly sessionStates: Map<string, AcpSessionState> = new Map()
@@ -140,7 +130,7 @@ export class ClineAgent implements acp.Agent {
 
 	constructor(options: ClineAgentOptions) {
 		this.options = options
-		this.ctx = initializeCliContext({ clineDir: options.clineDir })
+		this.ctx = initializeCliContext()
 	}
 
 	/**
@@ -184,7 +174,7 @@ export class ClineAgent implements acp.Agent {
 		this.clientCapabilities = params.clientCapabilities
 		this.initializeHostProvider(this.clientCapabilities, connection)
 		await ClineEndpoint.initialize(this.ctx.EXTENSION_DIR)
-		await StateManager.initialize(this.ctx.storageContext)
+		await StateManager.initialize(this.ctx.extensionContext)
 
 		return {
 			protocolVersion: PROTOCOL_VERSION,
@@ -202,7 +192,7 @@ export class ClineAgent implements acp.Agent {
 			},
 			agentInfo: {
 				name: "cline",
-				version: AGENT_VERSION,
+				version: this.options.version,
 			},
 			authMethods: [
 				{
@@ -234,7 +224,7 @@ export class ClineAgent implements acp.Agent {
 			clientCapabilities,
 			() => this.currentActiveSessionId,
 			() => this.sessions.get(this.currentActiveSessionId ?? "")?.cwd ?? process.cwd(),
-			AGENT_VERSION,
+			this.options.version,
 		)
 
 		HostProvider.initialize(
@@ -256,8 +246,8 @@ export class ClineAgent implements acp.Agent {
 			},
 			hostBridgeClientProvider,
 			(message: string) => Logger.info(message),
-			async (path: string) => {
-				return AuthHandler.getInstance().getCallbackUrl(path)
+			async () => {
+				return AuthHandler.getInstance().getCallbackUrl()
 			},
 			async () => "", // get binary location not needed in ACP mode
 			this.ctx.EXTENSION_DIR,
@@ -273,7 +263,7 @@ export class ClineAgent implements acp.Agent {
 	 */
 	async newSession(params: acp.NewSessionRequest): Promise<acp.NewSessionResponse> {
 		// Check if authentication is required
-		const isAuthenticated = await isAuthConfigured()
+		const isAuthenticated = await this.isAuthConfigured()
 		if (!isAuthenticated) {
 			throw RequestError.authRequired()
 		}
@@ -297,16 +287,16 @@ export class ClineAgent implements acp.Agent {
 			mcpServers: params.mcpServers ?? [],
 			createdAt: Date.now(),
 			lastActivityAt: Date.now(),
+			controller,
 		}
 
-		this.#sessionControllers.set(session, controller)
-
 		this.sessions.set(sessionId, session)
 
 		// Initialize session state
 		const sessionState: AcpSessionState = {
 			sessionId,
-			status: AcpSessionStatus.Idle,
+			isProcessing: false,
+			cancelled: false,
 			pendingToolCalls: new Map(),
 		}
 
@@ -443,11 +433,11 @@ export class ClineAgent implements acp.Agent {
 	 *
 	 * The prompt flow:
 	 * 1. Extract content from the ACP prompt (text, images, files)
-	 * 2. Set up internal cline state subsription
-	 * 3. Initialize or continue cline task
+	 * 2. Set up state broadcasting (subscribe to controller updates)
+	 * 3. Initialize or continue task with Controller
 	 * 4. Translate ClineMessages to ACP SessionUpdates
 	 * 5. Handle permission requests for tools/commands
-	 * 6. Return when cline task completes, is cancelled, or needs user input
+	 * 6. Return when task completes, is cancelled, or needs user input
 	 */
 	async prompt(params: acp.PromptRequest): Promise<acp.PromptResponse> {
 		const session = this.sessions.get(params.sessionId)
@@ -457,11 +447,11 @@ export class ClineAgent implements acp.Agent {
 			throw new Error(`Session not found: ${params.sessionId}`)
 		}
 
-		if (sessionState.status === AcpSessionStatus.Processing) {
+		if (sessionState.isProcessing) {
 			throw new Error(`Session ${params.sessionId} is already processing a prompt`)
 		}
 
-		const controller = this.#sessionControllers.get(session)
+		const controller = session.controller
 		if (!controller) {
 			throw new Error("Controller not initialized for session. This is a bug in the ACP agent setup.")
 		}
@@ -472,7 +462,8 @@ export class ClineAgent implements acp.Agent {
 		})
 
 		// Mark session as processing and set as current active session
-		sessionState.status = AcpSessionStatus.Processing
+		sessionState.isProcessing = true
+		sessionState.cancelled = false
 		session.lastActivityAt = Date.now()
 		this.currentActiveSessionId = params.sessionId
 
@@ -593,7 +584,7 @@ export class ClineAgent implements acp.Agent {
 					Logger.debug("[ClineAgent] Error during cleanup:", error)
 				}
 			}
-			sessionState.status = AcpSessionStatus.Idle
+			sessionState.isProcessing = false
 		}
 	}
 
@@ -655,13 +646,7 @@ export class ClineAgent implements acp.Agent {
 		permissionRequest: Omit<acp.RequestPermissionRequest, "sessionId">,
 	): Promise<void> {
 		const session = this.sessions.get(sessionId)
-
-		if (!session) {
-			Logger.debug("[ClineAgent] No session found for permission request")
-			return
-		}
-
-		const controller = this.#sessionControllers.get(session)
+		const controller = session?.controller
 
 		if (!controller?.task) {
 			Logger.debug("[ClineAgent] No active task for permission request")
@@ -842,7 +827,7 @@ export class ClineAgent implements acp.Agent {
 
 				await this.emitSessionUpdate(sessionId, {
 					sessionUpdate,
-					content: { type: "text", text: needsNewline ? `\n${textDelta}` : textDelta },
+					content: { type: "text", text: needsNewline ? "\n" + textDelta : textDelta },
 				})
 			}
 
@@ -895,22 +880,18 @@ export class ClineAgent implements acp.Agent {
 	 */
 	async cancel(params: acp.CancelNotification): Promise<void> {
 		const session = this.sessions.get(params.sessionId)
-		if (!session) {
-			Logger.debug("[ClineAgent] cancel called for non-existent session:", params.sessionId)
-			return
-		}
 		const sessionState = this.sessionStates.get(params.sessionId)
 
 		Logger.debug("[ClineAgent] cancel called:", {
 			sessionId: params.sessionId,
-			status: sessionState?.status,
+			isProcessing: sessionState?.isProcessing,
 		})
 
 		if (sessionState) {
-			sessionState.status = AcpSessionStatus.Cancelled
+			sessionState.cancelled = true
 
 			// If we have an active controller task, cancel it
-			const controller = this.#sessionControllers.get(session)
+			const controller = session?.controller
 			if (controller?.task) {
 				try {
 					await controller.cancelTask()
@@ -951,7 +932,7 @@ export class ClineAgent implements acp.Agent {
 		session.lastActivityAt = Date.now()
 
 		// Update Controller mode if active
-		const controller = this.#sessionControllers.get(session)
+		const controller = session.controller
 		if (controller) {
 			controller.stateManager.setGlobalState("mode", session.mode)
 
@@ -992,7 +973,7 @@ export class ClineAgent implements acp.Agent {
 		// Get the callback URL first to ensure the server is ready
 		let callbackUrl: string
 		try {
-			callbackUrl = await authHandler.getCallbackUrl("/auth")
+			callbackUrl = await authHandler.getCallbackUrl()
 			Logger.debug("[ClineAgent] Callback URL ready:", callbackUrl)
 		} catch (error) {
 			Logger.error("[ClineAgent] Failed to get callback URL:", error)
@@ -1023,14 +1004,13 @@ export class ClineAgent implements acp.Agent {
 			const startTime = Date.now()
 
 			while (Date.now() - startTime < AUTH_TIMEOUT_MS) {
-				const stateManager = StateManager.get()
-
 				// Check if auth data has been stored
-				const authData = stateManager.getSecretKey("cline:clineAccountId")
+				const authData = await secretStorage.get("cline:clineAccountId")
 				if (authData) {
 					Logger.debug("[ClineAgent] Authentication successful")
 
 					// Set up the provider configuration for cline
+					const stateManager = StateManager.get()
 					stateManager.setGlobalState("actModeApiProvider", "cline")
 					stateManager.setGlobalState("planModeApiProvider", "cline")
 					await stateManager.flushPendingState()
@@ -1082,7 +1062,7 @@ export class ClineAgent implements acp.Agent {
 	 * @returns The permission response from the client
 	 */
 	protected async requestPermission(
-		sessionId: string,
+		_sessionId: string,
 		toolCall: acp.ToolCallUpdate,
 		options: acp.PermissionOption[],
 	): Promise<acp.RequestPermissionResponse> {
@@ -1097,15 +1077,17 @@ export class ClineAgent implements acp.Agent {
 			return { outcome: "rejected" as unknown as acp.RequestPermissionOutcome }
 		}
 
-		return await this.permissionHandler({ sessionId, toolCall, options })
+		// Use the permission handler callback pattern
+		return new Promise<acp.RequestPermissionResponse>((resolve) => {
+			this.permissionHandler!({ toolCall, options }, resolve)
+		})
 	}
 
 	async shutdown(): Promise<void> {
 		for (const [sessionId, session] of this.sessions) {
-			const controller = this.#sessionControllers.get(session)
-			await controller?.task?.abortTask()
-			await controller?.stateManager.flushPendingState()
-			await controller?.dispose()
+			await session.controller?.task?.abortTask()
+			await session.controller?.stateManager.flushPendingState()
+			await session.controller?.dispose()
 			this.sessions.delete(sessionId)
 			this.sessionStates.delete(sessionId)
 		}
@@ -1161,6 +1143,48 @@ export class ClineAgent implements acp.Agent {
 		}
 	}
 
+	/**
+	 * Check if the user has authentication configured.
+	 * Returns true if they have either:
+	 * - Cline provider with stored auth data
+	 * - OpenAI Codex provider with OAuth credentials
+	 * - BYO provider with an API key configured
+	 */
+	private async isAuthConfigured(): Promise<boolean> {
+		const stateManager = StateManager.get()
+		const mode = stateManager.getGlobalSettingsKey("mode") as string
+		const providerKey = mode === "act" ? "actModeApiProvider" : "planModeApiProvider"
+		const currentProvider = (stateManager.getGlobalSettingsKey(providerKey) as string) || "cline"
+
+		if (currentProvider === "cline") {
+			// For Cline provider, check if we have stored auth data
+			const values = await Promise.all(["clineApiKey", "clineAccountId"].map((key) => secretStorage.get(key)))
+			return values.some(Boolean)
+		}
+
+		// For OpenAI Codex provider, check OAuth credentials
+		if (currentProvider === "openai-codex") {
+			openAiCodexOAuthManager.initialize(this.ctx.extensionContext)
+			return await openAiCodexOAuthManager.isAuthenticated()
+		}
+
+		// For BYO providers, check if the API key is configured
+		const keyField = ProviderToApiKeyMap[currentProvider as keyof typeof ProviderToApiKeyMap]
+		if (!keyField) {
+			return false
+		}
+
+		const fields = Array.isArray(keyField) ? keyField : [keyField]
+		for (const field of fields) {
+			const value = await secretStorage.get(field)
+			if (value) {
+				return true
+			}
+		}
+
+		return false
+	}
+
 	/**
 	 * Handle OpenAI Codex OAuth authentication flow.
 	 *
@@ -1174,6 +1198,9 @@ export class ClineAgent implements acp.Agent {
 		Logger.debug("[ClineAgent] Starting OpenAI Codex OAuth flow...")
 
 		try {
+			// Initialize the OAuth manager with extension context
+			openAiCodexOAuthManager.initialize(this.ctx.extensionContext)
+
 			// Get the authorization URL and start the callback server
 			const authUrl = openAiCodexOAuthManager.startAuthorizationFlow()
 

cli/src/agent/ClineSessionEmitter.ts

@@ -8,7 +8,7 @@
  */
 
 import { EventEmitter } from "events"
-import type { ClineSessionEvents } from "./public-types.js"
+import type { ClineSessionEvents } from "./types.js"
 
 /**
  * Type-safe EventEmitter for ClineAgent session events.

cli/src/agent/messageTranslator.test.ts

@@ -12,7 +12,6 @@ import type { ClineMessage } from "@shared/ExtensionMessage"
 import { beforeEach, describe, expect, it } from "vitest"
 import { createSessionState, translateMessage, translateMessages } from "./messageTranslator"
 import type { AcpSessionState } from "./types"
-import { AcpSessionStatus } from "./types"
 
 // =============================================================================
 // Test Helpers
@@ -176,7 +175,8 @@ describe("createSessionState", () => {
 		const state = createSessionState("my-session-123")
 
 		expect(state.sessionId).toBe("my-session-123")
-		expect(state.status).toBe(AcpSessionStatus.Idle)
+		expect(state.isProcessing).toBe(false)
+		expect(state.cancelled).toBe(false)
 		expect(state.pendingToolCalls).toBeInstanceOf(Map)
 		expect(state.pendingToolCalls.size).toBe(0)
 		expect(state.currentToolCallId).toBeUndefined()
@@ -187,11 +187,11 @@ describe("createSessionState", () => {
 		const state2 = createSessionState("session-2")
 
 		// Modify state1
-		state1.status = AcpSessionStatus.Processing
+		state1.isProcessing = true
 		state1.pendingToolCalls.set("tool-1", {} as acp.ToolCall)
 
 		// state2 should be unaffected
-		expect(state2.status).toBe(AcpSessionStatus.Idle)
+		expect(state2.isProcessing).toBe(false)
 		expect(state2.pendingToolCalls.size).toBe(0)
 	})
 })

cli/src/agent/messageTranslator.ts

@@ -11,7 +11,6 @@
 import type * as acp from "@agentclientprotocol/sdk"
 import type { ClineMessage, ClineSayBrowserAction, ClineSayTool } from "@shared/ExtensionMessage"
 import type { AcpSessionState, TranslatedMessage } from "./types.js"
-import { AcpSessionStatus } from "./types.js"
 
 /**
  * Maps Cline tool types to ACP ToolKind values.
@@ -313,10 +312,6 @@ function translateSayMessage(
 			// API request finished - no specific update needed
 			break
 
-		case "subagent_usage":
-			// Hidden aggregate metrics event used for task-level accounting.
-			break
-
 		case "task":
 			// Task started - don't echo the user's prompt back to them
 			// The ACP client already knows what they typed
@@ -1020,7 +1015,8 @@ export function translateMessages(messages: ClineMessage[], sessionState: AcpSes
 export function createSessionState(sessionId: string): AcpSessionState {
 	return {
 		sessionId,
-		status: AcpSessionStatus.Idle,
+		isProcessing: false,
+		cancelled: false,
 		pendingToolCalls: new Map(),
 	}
 }

cli/src/agent/public-types.ts

@@ -1,254 +0,0 @@
-/**
- * Public types for the Cline library API.
- *
- * This file contains types that are safe to export to library consumers.
- * It must NOT import any internal types (Controller, StateManager, etc.)
- * to keep the generated declaration files clean.
- *
- * Internal-only extensions of these types live in ./types.ts.
- */
-
-import type * as acp from "@agentclientprotocol/sdk"
-
-// ============================================================
-// Session Update Type Utilities
-// ============================================================
-
-/**
- * Different types of updates that can be sent during session processing.
- *
- * These updates provide real-time feedback about the agent's progress.
- *
- * See protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/prompt-turn#3-agent-reports-output)
- */
-export type SessionUpdateType = acp.SessionUpdate["sessionUpdate"]
-
-/**
- * Different types of update payloads that can be sent during session processing.
- *
- * Each update type has a corresponding payload structure defined in the ACP SessionUpdate union.
- */
-export type SessionUpdatePayload<T extends SessionUpdateType> = Omit<
-	Extract<acp.SessionUpdate, { sessionUpdate: T }>,
-	"sessionUpdate"
->
-
-// ============================================================
-// Permission Handler Callback Types
-// ============================================================
-
-/**
- * Handler function for permission requests.
- * Called when the agent needs permission for a tool call.
- * The handler should present the request to the user and call resolve() with their response.
- */
-export type PermissionHandler = (request: acp.RequestPermissionRequest) => Promise<acp.RequestPermissionResponse>
-
-// ============================================================
-// Session Event Emitter Types
-// ============================================================
-
-/**
- * Maps ACP SessionUpdate types to their event listener signatures.
- * Uses the sessionUpdate discriminator to derive event names and payload types.
- */
-export type ClineSessionEvents = {
-	[K in SessionUpdateType]: (payload: SessionUpdatePayload<K>) => void
-} & {
-	/** Error event for session-level errors (not part of ACP SessionUpdate) */
-	error: (error: Error) => void
-}
-
-// ============================================================
-// ClineAgent Options
-// ============================================================
-
-/**
- * Options for creating a ClineAgent instance.
- */
-export interface ClineAgentOptions {
-	/** Whether debug logging is enabled */
-	debug?: boolean
-	/** Cline Config Directory (defaults to ~/.cline) */
-	clineDir?: string
-}
-
-/**
- * Options for creating an ACP agent instance.
- */
-export interface AcpAgentOptions {
-	/** Whether debug logging is enabled */
-	debug?: boolean
-}
-
-// ============================================================
-// Session Types
-// ============================================================
-export type SessionID = string
-
-/**
- * Extended session data stored by Cline for ACP sessions.
- */
-export interface ClineAcpSession {
-	/** Unique session ID */
-	sessionId: SessionID
-	/** Working directory for the session */
-	cwd: string
-	/** Current mode (plan/act) */
-	mode: "plan" | "act"
-	/** MCP servers passed from the client */
-	mcpServers: acp.McpServer[]
-	/** Timestamp when session was created */
-	createdAt: number
-	/** Timestamp of last activity */
-	lastActivityAt: number
-	/** Whether this session was loaded from history (needs resume on first prompt) */
-	isLoadedFromHistory?: boolean
-	/** Model ID override for plan mode (format: "provider/modelId") */
-	planModeModelId?: string
-	/** Model ID override for act mode (format: "provider/modelId") */
-	actModeModelId?: string
-}
-
-/**
- * Lifecycle status of an ACP session.
- *
- * Represents the state machine:
- *   Idle → Processing → Idle       (normal completion)
- *   Idle → Processing → Cancelled  (cancellation, then back to Idle on next prompt)
- */
-export enum AcpSessionStatus {
-	/** Session is idle, waiting for a prompt */
-	Idle = "idle",
-	/** Session is actively processing a prompt */
-	Processing = "processing",
-	/** Session processing was cancelled */
-	Cancelled = "cancelled",
-}
-
-/**
- * State tracking for an active ACP session within Cline.
- */
-export interface AcpSessionState {
-	/** Session ID */
-	sessionId: SessionID
-	/** Current lifecycle status of the session */
-	status: AcpSessionStatus
-	/** Current tool call ID being executed (if any) */
-	currentToolCallId?: string
-	/** Accumulated tool calls for permission batching */
-	pendingToolCalls: Map<string, acp.ToolCall>
-}
-
-// ============================================================
-// Agent Capabilities
-// ============================================================
-
-/**
- * Cline-specific agent capabilities extending the ACP base capabilities.
- */
-export interface ClineAgentCapabilities {
-	/** Support for loading sessions from disk */
-	loadSession: boolean
-	/** Prompt capabilities for the agent */
-	promptCapabilities: {
-		/** Support for image inputs */
-		image: boolean
-		/** Support for audio inputs */
-		audio: boolean
-		/** Support for embedded context (file resources) */
-		embeddedContext: boolean
-	}
-	/** MCP server passthrough capabilities */
-	mcpCapabilities: {
-		/** Support for HTTP MCP servers */
-		http: boolean
-		/** Support for SSE MCP servers */
-		sse: boolean
-	}
-}
-
-/**
- * Cline agent info for ACP initialization response.
- */
-export interface ClineAgentInfo {
-	name: "cline"
-	title: "Cline"
-	version: string
-}
-
-// ============================================================
-// Permission Options
-// ============================================================
-
-/**
- * Permission option as presented to the ACP client.
- */
-export interface ClinePermissionOption {
-	kind: acp.PermissionOptionKind
-	name: string
-	optionId: string
-}
-
-// ============================================================
-// Message Translation
-// ============================================================
-
-/**
- * Result of translating a Cline message to ACP session update(s).
- * A single Cline message may produce multiple ACP updates.
- */
-export interface TranslatedMessage {
-	/** The session updates to send */
-	updates: acp.SessionUpdate[]
-	/** Whether this message requires a permission request */
-	requiresPermission?: boolean
-	/** Permission request details if required */
-	permissionRequest?: Omit<acp.RequestPermissionRequest, "sessionId">
-	/** The toolCallId that was created/used (for tracking across streaming updates) */
-	toolCallId?: string
-}
-
-// ============================================================
-// Re-exported ACP Types
-// ============================================================
-
-export type {
-	Agent,
-	AgentSideConnection,
-	AudioContent,
-	CancelNotification,
-	ClientCapabilities,
-	ContentBlock,
-	ImageContent,
-	InitializeRequest,
-	InitializeResponse,
-	LoadSessionRequest,
-	LoadSessionResponse,
-	McpServer,
-	ModelInfo,
-	NewSessionRequest,
-	NewSessionResponse,
-	PermissionOption,
-	PermissionOptionKind,
-	PromptRequest,
-	PromptResponse,
-	RequestPermissionRequest,
-	RequestPermissionResponse,
-	SessionConfigOption,
-	SessionModelState,
-	SessionNotification,
-	SessionUpdate,
-	SetSessionConfigOptionRequest,
-	SetSessionConfigOptionResponse,
-	SetSessionModelRequest,
-	SetSessionModelResponse,
-	SetSessionModeRequest,
-	SetSessionModeResponse,
-	StopReason,
-	TextContent,
-	ToolCall,
-	ToolCallStatus,
-	ToolCallUpdate,
-	ToolKind,
-} from "@agentclientprotocol/sdk"

cli/src/agent/types.ts

@@ -1,13 +1,76 @@
 /**
- * Internal types for ACP integration with Cline CLI.
+ * Custom types and extensions for ACP integration with Cline CLI.
  *
- * This file re-exports all public types from ./public-types.ts and adds
- * internal-only Types that reference core modules (Controller, etc.).
- *
- * Library consumers should never import from this file directly — they
- * get the public types via the library entrypoint (exports.ts).
+ * This file extends the base ACP types with Cline-specific functionality.
  */
 
+import type * as acp from "@agentclientprotocol/sdk"
+import type { Controller } from "@/core/controller"
+
+// ============================================================
+// Session Update Type Utilities
+// ============================================================
+
+/**
+ * Extract the sessionUpdate discriminator value from a SessionUpdate variant.
+ */
+export type SessionUpdateType = acp.SessionUpdate["sessionUpdate"]
+
+/**
+ * Extract the payload type for a given sessionUpdate discriminator value.
+ * This removes the `sessionUpdate` discriminator field from the type.
+ */
+export type SessionUpdatePayload<T extends SessionUpdateType> = Omit<
+	Extract<acp.SessionUpdate, { sessionUpdate: T }>,
+	"sessionUpdate"
+>
+
+// ============================================================
+// Permission Handler Callback Types
+// ============================================================
+
+/**
+ * Callback to resolve a permission request with the user's response.
+ */
+export type PermissionResolver = (response: acp.RequestPermissionResponse) => void
+
+/**
+ * Handler function for permission requests.
+ * Called when the agent needs permission for a tool call.
+ * The handler should present the request to the user and call resolve() with their response.
+ */
+export type PermissionHandler = (request: Omit<acp.RequestPermissionRequest, "sessionId">, resolve: PermissionResolver) => void
+
+// ============================================================
+// Session Event Emitter Types
+// ============================================================
+
+/**
+ * Maps ACP SessionUpdate types to their event listener signatures.
+ * Uses the sessionUpdate discriminator to derive event names and payload types.
+ */
+export type ClineSessionEvents = {
+	[K in SessionUpdateType]: (payload: SessionUpdatePayload<K>) => void
+} & {
+	/** Error event for session-level errors (not part of ACP SessionUpdate) */
+	error: (error: Error) => void
+}
+
+// ============================================================
+// ClineAgent Options (decoupled from connection)
+// ============================================================
+
+/**
+ * Options for creating a ClineAgent instance (decoupled from connection).
+ */
+export interface ClineAgentOptions {
+	/** CLI version string */
+	version: string
+	/** Whether debug logging is enabled */
+	debug?: boolean
+}
+
+// Re-export common ACP types for convenience
 export type {
 	Agent,
 	AgentSideConnection,
@@ -51,18 +114,134 @@ export type {
 	WriteTextFileResponse,
 } from "@agentclientprotocol/sdk"
 
-export type {
-	AcpAgentOptions,
-	AcpSessionState,
-	ClineAgentCapabilities,
-	ClineAgentInfo,
-	ClineAgentOptions,
-	ClinePermissionOption,
-	ClineSessionEvents,
-	PermissionHandler,
-	SessionUpdatePayload,
-	SessionUpdateType,
-	TranslatedMessage,
-} from "./public-types.js"
+/**
+ * Cline-specific agent capabilities extending the ACP base capabilities.
+ */
+export interface ClineAgentCapabilities {
+	/** Support for loading sessions from disk */
+	loadSession: boolean
+	/** Prompt capabilities for the agent */
+	promptCapabilities: {
+		/** Support for image inputs */
+		image: boolean
+		/** Support for audio inputs */
+		audio: boolean
+		/** Support for embedded context (file resources) */
+		embeddedContext: boolean
+	}
+	/** MCP server passthrough capabilities */
+	mcpCapabilities: {
+		/** Support for HTTP MCP servers */
+		http: boolean
+		/** Support for SSE MCP servers */
+		sse: boolean
+	}
+}
 
-export { AcpSessionStatus } from "./public-types.js"
+/**
+ * Cline agent info for ACP initialization response.
+ */
+export interface ClineAgentInfo {
+	name: "cline"
+	title: "Cline"
+	version: string
+}
+
+/**
+ * Extended session data stored by Cline for ACP sessions.
+ * Maps to Cline's task history structure.
+ */
+export interface ClineAcpSession {
+	/** Unique session/task ID */
+	sessionId: string
+	/** Working directory for the session */
+	cwd: string
+	/** Current mode (plan/act) */
+	mode: "plan" | "act"
+	/** MCP servers passed from the client */
+	mcpServers: acp.McpServer[]
+	/** Timestamp when session was created */
+	createdAt: number
+	/** Timestamp of last activity */
+	lastActivityAt: number
+	/** Whether this session was loaded from history (needs resume on first prompt) */
+	isLoadedFromHistory?: boolean
+	/** Controller instance for this session (manages task execution) */
+	controller?: Controller
+	/** Model ID override for plan mode (format: "provider/modelId") */
+	planModeModelId?: string
+	/** Model ID override for act mode (format: "provider/modelId") */
+	actModeModelId?: string
+}
+
+/**
+ * Permission option as presented to the ACP client.
+ */
+export interface ClinePermissionOption {
+	kind: acp.PermissionOptionKind
+	name: string
+	optionId: string
+}
+
+/**
+ * Mapping of Cline message types to their ACP session update equivalents.
+ */
+export type ClineToAcpUpdateMapping = {
+	/** Text messages from the agent */
+	text: "agent_message_chunk"
+	/** Reasoning/thinking from the agent */
+	reasoning: "agent_thought_chunk"
+	/** Markdown content from the agent */
+	markdown: "agent_message_chunk"
+	/** Tool execution */
+	tool: "tool_call"
+	/** Command execution */
+	command: "tool_call"
+	/** Command output */
+	command_output: "tool_call_update"
+	/** Task completion */
+	completion_result: "end_turn"
+	/** Error messages */
+	error: "tool_call_update" | "error"
+}
+
+/**
+ * Options for creating an ACP agent instance.
+ */
+export interface AcpAgentOptions {
+	/** CLI version string */
+	version: string
+	/** Whether debug logging is enabled */
+	debug?: boolean
+}
+
+/**
+ * Result of translating a Cline message to ACP session update(s).
+ * A single Cline message may produce multiple ACP updates.
+ */
+export interface TranslatedMessage {
+	/** The session updates to send */
+	updates: acp.SessionUpdate[]
+	/** Whether this message requires a permission request */
+	requiresPermission?: boolean
+	/** Permission request details if required */
+	permissionRequest?: Omit<acp.RequestPermissionRequest, "sessionId">
+	/** The toolCallId that was created/used (for tracking across streaming updates) */
+	toolCallId?: string
+}
+
+/**
+ * State tracking for an active ACP session within Cline.
+ */
+export interface AcpSessionState {
+	/** Session ID */
+	sessionId: string
+	/** Whether the session is currently processing a prompt */
+	isProcessing: boolean
+	/** Current tool call ID being executed (if any) */
+	currentToolCallId?: string
+	/** Whether the session has been cancelled */
+	cancelled: boolean
+	/** Accumulated tool calls for permission batching */
+	pendingToolCalls: Map<string, acp.ToolCall>
+}

cli/src/components/AuthView.tsx

@@ -5,17 +5,15 @@
 
 import { Box, Text, useApp, useInput } from "ink"
 import Spinner from "ink-spinner"
+// biome-ignore lint/style/useImportType: React is used as a value by JSX (jsx: "react" in tsconfig)
 import React, { useCallback, useEffect, useMemo, useState } from "react"
-import { refreshOcaModels } from "@/core/controller/models/refreshOcaModels"
 import { StateManager } from "@/core/storage/StateManager"
 import { openAiCodexOAuthManager } from "@/integrations/openai-codex/oauth"
 import { AuthService } from "@/services/auth/AuthService"
-import { openAiCodexDefaultModelId, openRouterDefaultModelId } from "@/shared/api"
-import { StringRequest } from "@/shared/proto/cline/common"
+import { liteLlmDefaultModelId, openAiCodexDefaultModelId, openRouterDefaultModelId } from "@/shared/api"
 import { openExternal } from "@/utils/env"
 import { COLORS } from "../constants/colors"
 import { useStdinContext } from "../context/StdinContext"
-import { useClineFeaturedModels } from "../hooks/useClineFeaturedModels"
 import { useOcaAuth } from "../hooks/useOcaAuth"
 import { useScrollableList } from "../hooks/useScrollableList"
 import { type DetectedSources, detectImportSources, type ImportSource } from "../utils/import-configs"
@@ -24,7 +22,6 @@ import { applyBedrockConfig, applyProviderConfig } from "../utils/provider-confi
 import { useValidProviders } from "../utils/providers"
 import { ApiKeyInput } from "./ApiKeyInput"
 import { StaticRobotFrame } from "./AsciiMotionCli"
-import { BedrockCustomModelFlow } from "./BedrockCustomModelFlow"
 import { type BedrockConfig, BedrockSetup } from "./BedrockSetup"
 import {
 	FeaturedModelPicker,
@@ -33,8 +30,7 @@ import {
 	isBrowseAllSelected,
 } from "./FeaturedModelPicker"
 import { ImportView } from "./ImportView"
-import { CUSTOM_MODEL_ID, getDefaultModelId, hasModelPicker, ModelPicker } from "./ModelPicker"
-import { OcaEmployeeCheck } from "./OcaEmployeeCheck"
+import { getDefaultModelId, hasModelPicker, ModelPicker } from "./ModelPicker"
 import { getProviderLabel } from "./ProviderPicker"
 
 type AuthStep =
@@ -47,13 +43,11 @@ type AuthStep =
 	| "success"
 	| "error"
 	| "cline_auth"
-	| "oca_employee_check"
 	| "oca_auth"
 	| "cline_model"
 	| "openai_codex_auth"
 	| "bedrock"
 	| "import"
-	| "bedrock_custom"
 
 interface AuthViewProps {
 	controller: any
@@ -79,7 +73,7 @@ const Select: React.FC<{
 	const [selectedIndex, setSelectedIndex] = useState(0)
 
 	useInput(
-		(_, key) => {
+		(input, key) => {
 			if (key.upArrow) {
 				setSelectedIndex((prev) => (prev > 0 ? prev - 1 : items.length - 1))
 			} else if (key.downArrow) {
@@ -145,11 +139,7 @@ const TextInput: React.FC<{
 
 	return (
 		<Box>
-			{!displayValue && placeholder ? (
-				<Text color="gray">e.g. {placeholder}</Text>
-			) : (
-				<Text color="white">{displayValue || ""}</Text>
-			)}
+			<Text color="white">{displayValue || placeholder || ""}</Text>
 			<Text inverse> </Text>
 		</Box>
 	)
@@ -170,10 +160,10 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 	const [modelId, setModelId] = useState("")
 	const [baseUrl, setBaseUrl] = useState("")
 	const [errorMessage, setErrorMessage] = useState("")
+	const [authStatus, setAuthStatus] = useState<string>("")
 	const [providerSearch, setProviderSearch] = useState("")
 	const [providerIndex, setProviderIndex] = useState(0)
 	const [clineModelIndex, setClineModelIndex] = useState(0)
-	const featuredModels = useClineFeaturedModels()
 	const [importSources, setImportSources] = useState<DetectedSources>({ codex: false, opencode: false })
 	const [importSource, setImportSource] = useState<ImportSource | null>(null)
 	const [bedrockConfig, setBedrockConfig] = useState<BedrockConfig | null>(null)
@@ -181,14 +171,11 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 	// OCA auth hook - enabled when step is oca_auth
 	const handleOcaAuthSuccess = useCallback(async () => {
 		await applyProviderConfig({ providerId: "oca", controller })
-		// Fetch OCA models from the API - this sets actModeOcaModelId/planModeOcaModelId in state
-		await refreshOcaModels(controller, StringRequest.create({ value: "" }))
 		const stateManager = StateManager.get()
 		stateManager.setGlobalState("welcomeViewCompleted", true)
 		await stateManager.flushPendingState()
 		setSelectedProvider("oca")
-		const actModelId = stateManager.getGlobalSettingsKey("actModeOcaModelId") || ""
-		setModelId(actModelId)
+		setModelId(liteLlmDefaultModelId)
 		setStep("success")
 	}, [controller])
 
@@ -256,7 +243,6 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 	}, [])
 
 	// Reset provider index when search changes
-	// biome-ignore lint/correctness/useExhaustiveDependencies: we want to reset here
 	useEffect(() => {
 		setProviderIndex(0)
 	}, [providerSearch])
@@ -282,7 +268,7 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 				return
 			}
 
-			if (authState.user?.email) {
+			if (authState.user && authState.user.email) {
 				// Auth succeeded - save configuration and transition to model selection
 				await applyProviderConfig({ providerId: "cline", controller })
 				setSelectedProvider("cline")
@@ -331,6 +317,7 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 	const startClineAuth = useCallback(async () => {
 		try {
 			setStep("cline_auth")
+			setAuthStatus("Starting authentication...")
 			await AuthService.getInstance(controller).createAuthRequest()
 		} catch (error) {
 			setErrorMessage(error instanceof Error ? error.message : String(error))
@@ -340,6 +327,7 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 
 	const startOcaAuth = useCallback(() => {
 		setStep("oca_auth")
+		setAuthStatus("Starting authentication...")
 		initiateOcaAuth()
 	}, [initiateOcaAuth])
 
@@ -370,8 +358,7 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 		(value: string) => {
 			setSelectedProvider(value)
 			if (value === "oca") {
-				// Show employee check screen before starting auth
-				setStep("oca_employee_check")
+				startOcaAuth()
 			} else if (value === "openai-codex") {
 				setStep("openai_codex_auth")
 				startOpenAiCodexAuth()
@@ -398,33 +385,6 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 		[selectedProvider],
 	)
 
-	// Save custom Bedrock ARN configuration with base model for capability detection
-	const saveCustomBedrockConfiguration = useCallback(
-		async (arn: string, baseModelId: string) => {
-			try {
-				if (!bedrockConfig) {
-					throw new Error("Bedrock configuration is missing")
-				}
-				await applyBedrockConfig({
-					bedrockConfig,
-					modelId: arn,
-					customModelBaseId: baseModelId,
-					controller,
-				})
-
-				const stateManager = StateManager.get()
-				stateManager.setGlobalState("welcomeViewCompleted", true)
-				await stateManager.flushPendingState()
-
-				setStep("success")
-			} catch (error) {
-				setErrorMessage(error instanceof Error ? error.message : String(error))
-				setStep("error")
-			}
-		},
-		[bedrockConfig, controller],
-	)
-
 	const saveConfiguration = useCallback(
 		async (model: string, base: string) => {
 			try {
@@ -459,12 +419,6 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 
 	const handleModelIdSubmit = useCallback(
 		(value: string) => {
-			// Intercept "Custom" selection for Bedrock — redirect to custom ARN input flow
-			if (value === CUSTOM_MODEL_ID && selectedProvider === "bedrock") {
-				setStep("bedrock_custom")
-				return
-			}
-
 			if (value.trim()) {
 				setModelId(value)
 			}
@@ -572,9 +526,6 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 				// Go back to cline_model if we came from there (Cline provider)
 				if (selectedProvider === "cline") {
 					setStep("cline_model")
-				} else if (selectedProvider === "bedrock") {
-					// Bedrock skips the API key step — go back to Bedrock setup
-					setStep("bedrock")
 				} else {
 					setStep("apikey")
 				}
@@ -583,11 +534,8 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 				setBaseUrl("")
 				setStep("modelid")
 				break
-			case "oca_employee_check":
-				setStep("provider")
-				break
 			case "oca_auth":
-				setStep("oca_employee_check")
+				setStep("provider")
 				break
 			case "cline_auth":
 				setStep("menu")
@@ -691,7 +639,7 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 					<Box flexDirection="column">
 						<Text color="white">Model ID</Text>
 						<Text> </Text>
-						<Text color="gray">e.g., claude-sonnet-4-6, gpt-4o</Text>
+						<Text color="gray">e.g., claude-sonnet-4-20250514, gpt-4o</Text>
 						<Text> </Text>
 						<TextInput onChange={setModelId} onSubmit={handleModelIdSubmit} placeholder="model-id" value={modelId} />
 						<Text> </Text>
@@ -727,9 +675,6 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 					</Box>
 				)
 
-			case "oca_employee_check":
-				return <OcaEmployeeCheck isActive={step === "oca_employee_check"} onCancel={goBack} onSignIn={startOcaAuth} />
-
 			case "oca_auth":
 			case "cline_auth":
 				return (
@@ -769,7 +714,7 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 					<Box flexDirection="column">
 						<Text color="white">Choose a model</Text>
 						<Text> </Text>
-						<FeaturedModelPicker featuredModels={featuredModels} selectedIndex={clineModelIndex} />
+						<FeaturedModelPicker selectedIndex={clineModelIndex} />
 					</Box>
 				)
 			}
@@ -786,18 +731,6 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 					/>
 				)
 
-			case "bedrock_custom":
-				return (
-					<BedrockCustomModelFlow
-						isActive={step === "bedrock_custom"}
-						onCancel={() => setStep("modelid")}
-						onComplete={(arn, baseModelId) => {
-							setStep("saving")
-							saveCustomBedrockConfiguration(arn, baseModelId)
-						}}
-					/>
-				)
-
 			case "import":
 				if (!importSource) {
 					return null
@@ -827,7 +760,6 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 	const [menuIndex, setMenuIndex] = useState(0)
 
 	// Steps that allow going back with escape (apikey handled by ApiKeyInput component)
-	// OcaEmployeeCheck handles its own escape key, so oca_employee_check is not in this list
 	const canGoBack = [
 		"provider",
 		"modelid",
@@ -871,17 +803,17 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 					setProviderSearch((prev) => prev + input)
 				}
 			} else if (step === "cline_model") {
-				const maxIndex = getFeaturedModelMaxIndex(featuredModels)
+				const maxIndex = getFeaturedModelMaxIndex()
 
 				if (key.upArrow) {
 					setClineModelIndex((prev) => (prev > 0 ? prev - 1 : maxIndex))
 				} else if (key.downArrow) {
 					setClineModelIndex((prev) => (prev < maxIndex ? prev + 1 : 0))
 				} else if (key.return) {
-					if (isBrowseAllSelected(clineModelIndex, featuredModels)) {
+					if (isBrowseAllSelected(clineModelIndex)) {
 						setStep("modelid")
 					} else {
-						const selectedModel = getFeaturedModelAtIndex(clineModelIndex, featuredModels)
+						const selectedModel = getFeaturedModelAtIndex(clineModelIndex)
 						if (selectedModel) {
 							handleClineModelSelect(selectedModel.id)
 						}

cli/src/components/BedrockCustomModelFlow.tsx

@@ -1,111 +0,0 @@
-/**
- * Bedrock Custom Model Flow component
- * Two-step flow: ARN/custom model ID input → base model selection for capability detection.
- * Used by both AuthView (onboarding) and SettingsPanelContent (/settings).
- */
-
-import { Box, Text, useInput } from "ink"
-// biome-ignore lint/correctness/noUnusedImports: React is needed for JSX at runtime
-import React, { useCallback, useState } from "react"
-import { COLORS } from "../constants/colors"
-import { useStdinContext } from "../context/StdinContext"
-import { getModelList } from "./ModelPicker"
-import { SearchableList } from "./SearchableList"
-
-type FlowStep = "arn_input" | "base_model"
-
-interface BedrockCustomModelFlowProps {
-	/** Whether this component should capture keyboard input */
-	isActive: boolean
-	/** Called when the user completes both steps (ARN + base model selection) */
-	onComplete: (arn: string, baseModelId: string) => void
-	/** Called when the user presses Escape on the first step (ARN input) */
-	onCancel: () => void
-}
-
-export const BedrockCustomModelFlow: React.FC<BedrockCustomModelFlowProps> = ({ isActive, onComplete, onCancel }) => {
-	const { isRawModeSupported } = useStdinContext()
-	const [step, setStep] = useState<FlowStep>("arn_input")
-	const [customArn, setCustomArn] = useState("")
-
-	const handleArnSubmit = useCallback(() => {
-		if (customArn.trim()) {
-			setStep("base_model")
-		}
-	}, [customArn])
-
-	const handleBaseModelCancel = useCallback(() => {
-		setStep("arn_input")
-	}, [])
-
-	useInput(
-		(input, key) => {
-			if (step === "arn_input") {
-				if (key.escape) {
-					onCancel()
-				} else if (key.return) {
-					handleArnSubmit()
-				} else if (key.backspace || key.delete) {
-					setCustomArn((prev) => prev.slice(0, -1))
-				} else if (input && !key.ctrl && !key.meta) {
-					setCustomArn((prev) => prev + input)
-				}
-				return
-			}
-
-			if (step === "base_model") {
-				if (key.escape) {
-					handleBaseModelCancel()
-				}
-				// Other input is handled by SearchableList
-			}
-		},
-		{ isActive: isActive && isRawModeSupported },
-	)
-
-	if (step === "arn_input") {
-		return (
-			<Box flexDirection="column">
-				<Text bold color={COLORS.primaryBlue}>
-					Custom Model ID
-				</Text>
-				<Box marginTop={1}>
-					<Text color="gray">Enter your Application Inference Profile ARN or custom model ID</Text>
-				</Box>
-				<Box marginTop={1}>
-					{customArn ? (
-						<Text color="white">{customArn}</Text>
-					) : (
-						<Text color="gray">e.g. arn:aws:bedrock:region:account:application-inference-profile/...</Text>
-					)}
-					<Text inverse> </Text>
-				</Box>
-				<Box marginTop={1}>
-					<Text color="gray">Enter to continue, Esc to go back</Text>
-				</Box>
-			</Box>
-		)
-	}
-
-	// step === "base_model"
-	return (
-		<Box flexDirection="column">
-			<Text bold color={COLORS.primaryBlue}>
-				Base Inference Model
-			</Text>
-			<Text color="gray">Select the base model your inference profile uses (for capability detection)</Text>
-			<Box marginTop={1}>
-				<SearchableList
-					isActive={isActive && step === "base_model"}
-					items={getModelList("bedrock").map((id) => ({ id, label: id }))}
-					onSelect={(item) => {
-						onComplete(customArn, item.id)
-					}}
-				/>
-			</Box>
-			<Box marginTop={1}>
-				<Text color="gray">Type to search, arrows to navigate, Enter to select, Esc to go back</Text>
-			</Box>
-		</Box>
-	)
-}

cli/src/components/BedrockSetup.tsx

@@ -114,11 +114,8 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 
 	// Filtered regions
 	const filteredRegions = useMemo(() => {
-		const search = regionSearch.toLowerCase().trim()
-		if (!search) {
-			return AWS_REGIONS
-		}
-		return AWS_REGIONS.filter((r) => r.toLowerCase().includes(search))
+		const search = regionSearch.toLowerCase()
+		return search ? AWS_REGIONS.filter((r) => r.includes(search)) : AWS_REGIONS
 	}, [regionSearch])
 
 	const {
@@ -173,18 +170,10 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 		}
 	}, [step, authMethod, onCancel])
 
-	const getSelectedRegion = useCallback(() => {
-		if (filteredRegions.length > 0 && regionIndex >= 0 && regionIndex < filteredRegions.length) {
-			return filteredRegions[regionIndex]
-		}
-		// If no matches, use the search term as custom region
-		return regionSearch.trim() || "us-east-1"
-	}, [filteredRegions, regionIndex, regionSearch])
-
 	const finish = useCallback(() => {
 		const config: BedrockConfig = {
 			awsAuthentication: authMethod === "default" ? "credentials" : authMethod,
-			awsRegion: getSelectedRegion(),
+			awsRegion: filteredRegions[regionIndex] || "us-east-1",
 			awsUseCrossRegionInference: crossRegion,
 		}
 		if (authMethod === "profile") {
@@ -195,7 +184,7 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 			if (sessionToken) config.awsSessionToken = sessionToken
 		}
 		onComplete(config)
-	}, [authMethod, profileName, accessKey, secretKey, sessionToken, getSelectedRegion, crossRegion, onComplete])
+	}, [authMethod, profileName, accessKey, secretKey, sessionToken, filteredRegions, regionIndex, crossRegion, onComplete])
 
 	// Handle input for auth_method, region, and options steps
 	useInput(
@@ -215,11 +204,11 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 			} else if (step === "region") {
 				if (key.escape) {
 					goBack()
-				} else if (key.upArrow && filteredRegions.length > 0) {
+				} else if (key.upArrow) {
 					setRegionIndex((prev) => (prev > 0 ? prev - 1 : filteredRegions.length - 1))
-				} else if (key.downArrow && filteredRegions.length > 0) {
+				} else if (key.downArrow) {
 					setRegionIndex((prev) => (prev < filteredRegions.length - 1 ? prev + 1 : 0))
-				} else if (key.return && (filteredRegions.length > 0 || regionSearch.trim())) {
+				} else if (key.return && filteredRegions.length > 0) {
 					setStep("options")
 				} else if (key.backspace || key.delete) {
 					setRegionSearch((prev) => prev.slice(0, -1))
@@ -341,7 +330,7 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 				<Text color="white">AWS Region</Text>
 				<Text> </Text>
 				<Box>
-					<Text color="gray">Search or enter custom region: </Text>
+					<Text color="gray">Search: </Text>
 					<Text color="white">{regionSearch}</Text>
 					<Text inverse> </Text>
 				</Box>
@@ -361,6 +350,7 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 				{showRegionBottom && (
 					<Text color="gray">... {filteredRegions.length - regionVisibleStart - regionVisibleCount} more below</Text>
 				)}
+				{filteredRegions.length === 0 && <Text color="gray">No regions match "{regionSearch}"</Text>}
 				<Text> </Text>
 				<Text color="gray">Type to search, arrows to navigate, Enter to select, Esc to go back</Text>
 			</Box>

cli/src/components/ChatMessage.markdown.test.tsx

@@ -1,53 +0,0 @@
-import type { ClineMessage } from "@shared/ExtensionMessage"
-import { render } from "ink-testing-library"
-import React from "react"
-import { describe, expect, it, vi } from "vitest"
-import { ChatMessage } from "./ChatMessage"
-
-vi.mock("../hooks/useTerminalSize", () => ({
-	useTerminalSize: () => ({
-		columns: 120,
-		rows: 40,
-		resizeKey: 0,
-	}),
-}))
-
-describe("ChatMessage markdown rendering", () => {
-	it("renders basic markdown elements correctly with appropriate styling", () => {
-		const message: ClineMessage = {
-			ts: Date.now(),
-			type: "say",
-			say: "text",
-			text: "# Heading 1\n\nThis is a **bold** and *italic* text with `inline code`.\n\n- List item 1\n- List item 2\n\n> Blockquote\n\n```javascript\nconst x = 1;\n```",
-		}
-
-		const { lastFrame } = render(React.createElement(ChatMessage, { message, mode: "act" }))
-		const frame = lastFrame() || ""
-
-		// Check for heading (bold)
-		// \x1B[1m is the ANSI escape code for bold
-		expect(frame).toMatch(/\x1B\[1mHeading 1\x1B\[22m/)
-
-		// Check for bold text
-		expect(frame).toMatch(/\x1B\[1mbold\x1B\[22m/)
-
-		// Check for italic text
-		// \x1B[3m is the ANSI escape code for italic
-		expect(frame).toMatch(/\x1B\[3mitalic\x1B\[23m/)
-
-		// Check for inline code (no special styling in the current implementation, just text)
-		expect(frame).toContain("inline code")
-
-		// Check for list items (gray bullet)
-		// \x1B[90m is the ANSI escape code for gray
-		expect(frame).toMatch(/\x1B\[90m• \x1B\[39mList item 1/)
-		expect(frame).toMatch(/\x1B\[90m• \x1B\[39mList item 2/)
-
-		// Check for blockquote (gray pipe)
-		expect(frame).toMatch(/\x1B\[90m│ \x1B\[39mBlockquote/)
-
-		// Check for code block (cyan text)
-		// \x1B[36m is the ANSI escape code for cyan
-		expect(frame).toMatch(/\x1B\[36mconst x = 1;\x1B\[39m/)
-	})
-})

cli/src/components/ChatMessage.test.tsx

@@ -1,106 +0,0 @@
-import type { ClineMessage } from "@shared/ExtensionMessage"
-import { render } from "ink-testing-library"
-import React from "react"
-import { describe, expect, it, vi } from "vitest"
-import { ChatMessage } from "./ChatMessage"
-
-vi.mock("../hooks/useTerminalSize", () => ({
-	useTerminalSize: () => ({
-		columns: 120,
-		rows: 40,
-		resizeKey: 0,
-	}),
-}))
-
-describe("ChatMessage subagent rendering", () => {
-	it("renders subagent approval prompts as a tree", () => {
-		const message: ClineMessage = {
-			ts: Date.now(),
-			type: "ask",
-			ask: "use_subagents",
-			text: JSON.stringify({
-				prompts: [
-					"Find codebase stats and size",
-					"Find funny comments and easter eggs",
-					"Find unusual patterns and history",
-				],
-			}),
-		}
-
-		const { lastFrame } = render(React.createElement(ChatMessage, { message, mode: "act" }))
-		const frame = lastFrame() || ""
-
-		expect(frame).toContain("Cline wants to run subagents")
-		expect(frame).toContain("├─   Find codebase stats and size")
-		expect(frame).toContain("├─   Find funny comments and easter eggs")
-		expect(frame).toContain("└─   Find unusual patterns and history")
-	})
-
-	it("renders subagent progress rows with compact token stats and completion checks", () => {
-		const message: ClineMessage = {
-			ts: Date.now(),
-			type: "say",
-			say: "subagent",
-			text: JSON.stringify({
-				status: "running",
-				total: 3,
-				completed: 1,
-				successes: 1,
-				failures: 0,
-				toolCalls: 21,
-				inputTokens: 0,
-				outputTokens: 0,
-				contextWindow: 0,
-				maxContextTokens: 0,
-				maxContextUsagePercentage: 0,
-				items: [
-					{
-						index: 1,
-						prompt: "Find codebase stats and size",
-						status: "completed",
-						toolCalls: 5,
-						inputTokens: 0,
-						outputTokens: 0,
-						totalCost: 0.034,
-						contextTokens: 24400,
-						contextWindow: 200000,
-						contextUsagePercentage: 12.2,
-					},
-					{
-						index: 2,
-						prompt: "Find funny comments and easter eggs",
-						status: "running",
-						toolCalls: 11,
-						inputTokens: 0,
-						outputTokens: 0,
-						totalCost: 0.056,
-						contextTokens: 31600,
-						contextWindow: 200000,
-						contextUsagePercentage: 15.8,
-					},
-					{
-						index: 3,
-						prompt: "Find unusual patterns and history",
-						status: "pending",
-						toolCalls: 5,
-						inputTokens: 0,
-						outputTokens: 0,
-						totalCost: 0,
-						contextTokens: 28900,
-						contextWindow: 200000,
-						contextUsagePercentage: 14.4,
-					},
-				],
-			}),
-		}
-
-		const { lastFrame } = render(React.createElement(ChatMessage, { isStreaming: true, message, mode: "act" }))
-		const frame = lastFrame() || ""
-
-		expect(frame).toContain("Cline is running subagents")
-		expect(frame).toContain("✓ Find codebase stats and size")
-		expect(frame).toContain("5 tool uses · 24.4k tokens · $0.03")
-		expect(frame).toContain("11 tool uses · 31.6k tokens · $0.06")
-		expect(frame).toContain("5 tool uses · 28.9k tokens · $0.00")
-	})
-})

cli/src/components/ChatMessage.tsx

@@ -11,20 +11,21 @@ import { COMMAND_OUTPUT_STRING } from "@shared/combineCommandSequences"
 import type { ClineAskUseMcpServer, ClineMessage } from "@shared/ExtensionMessage"
 import { Box, Text } from "ink"
 import Spinner from "ink-spinner"
-import { lexer, type Token, type Tokens } from "marked"
 import React from "react"
 import { COLORS } from "../constants/colors"
 import { useTerminalSize } from "../hooks/useTerminalSize"
 import { jsonParseSafe } from "../utils/parser"
 import { getToolDescription, isFileEditTool, parseToolFromMessage } from "../utils/tools"
 import { DiffView } from "./DiffView"
-import { SubagentMessage } from "./SubagentMessage"
 
 /**
- * Add "(Tab)" hint after "Act mode" mentions in plain text.
+ * Add "(Tab)" hint after "Act mode" mentions.
  * Case-insensitive, avoids double-adding if already present.
+ * Matches just "Act mode" without requiring "to " prefix because markdown
+ * processing may split "toggle to **Act mode**" into separate text chunks.
  */
-function addActModeHint(text: string, keyPrefix: string): React.ReactNode[] {
+function addActModeHint(text: string): React.ReactNode[] {
+	// Match "Act mode" in various capitalizations, but not if already followed by (Tab)
 	const actModeRegex = /\bact\s+mode\b(?!\s*\(tab\))/gi
 	const parts = text.split(actModeRegex)
 	const matches = text.match(actModeRegex)
@@ -35,156 +36,82 @@ function addActModeHint(text: string, keyPrefix: string): React.ReactNode[] {
 
 	const nodes: React.ReactNode[] = []
 	parts.forEach((part, i) => {
-		if (part) nodes.push(part)
+		if (part) {
+			nodes.push(part)
+		}
 		if (matches[i]) {
 			nodes.push(
-				<React.Fragment key={`${keyPrefix}-act-mode-${i}`}>
+				<React.Fragment key={`act-mode-${i}`}>
 					{matches[i]}
 					<Text color="gray"> (Tab)</Text>
 				</React.Fragment>,
 			)
 		}
 	})
+
 	return nodes
 }
 
 /**
- * Render an array of marked tokens as Ink React nodes.
- * This is the entry point for recursive rendering — each token may
- * contain child tokens (e.g. a paragraph contains inline tokens,
- * a list contains items, etc.).
+ * Render inline markdown: **bold**, *italic*, `code`
+ * Also adds "(Tab)" hints after "Act mode" mentions.
+ * Returns array of React nodes with appropriate styling
  */
-function renderTokens(tokens: Token[], color?: string): React.ReactNode[] {
-	return tokens.map((token, i) => renderToken(token, i, color))
-}
+function renderInlineMarkdown(text: string): React.ReactNode[] {
+	const nodes: React.ReactNode[] = []
+	// Match **bold**, *italic*, or `code` - order matters (** before *)
+	const regex = /(\*\*[^*]+\*\*|\*[^*]+\*|`[^`]+`)/g
+	let lastIndex = 0
+	let match
 
-/**
- * Render a single marked token (block or inline) as an Ink React node.
- * Handles both block-level tokens (heading, paragraph, list, code, etc.)
- * and inline tokens (strong, em, codespan, link, text).
- */
-function renderToken(token: Token, key: number, color?: string): React.ReactNode {
-	switch (token.type) {
-		// --- Block tokens ---
-
-		case "heading": {
-			const { depth, tokens } = token as Tokens.Heading
-			return (
-				<Box key={key} marginY={depth === 1 ? 1 : 0}>
-					<Text bold color={color}>
-						{renderTokens(tokens, color)}
-					</Text>
-				</Box>
-			)
+	while ((match = regex.exec(text)) !== null) {
+		// Add text before match (with Act Mode hint processing)
+		if (match.index > lastIndex) {
+			const beforeText = text.slice(lastIndex, match.index)
+			nodes.push(...addActModeHint(beforeText))
 		}
 
-		case "paragraph":
-			return (
-				<Text color={color} key={key}>
-					{renderTokens((token as Tokens.Paragraph).tokens, color)}
-				</Text>
-			)
+		const fullMatch = match[0]
+		const key = `md-${match.index}`
 
-		case "code":
-			return (
-				<Box flexDirection="column" key={key} marginY={1}>
-					{(token as Tokens.Code).text.split("\n").map((line, i) => (
-						<Text color="cyan" key={i}>
-							{line || " "}
-						</Text>
-					))}
-				</Box>
+		if (fullMatch.startsWith("**") && fullMatch.endsWith("**")) {
+			// Bold - also process for Act Mode hints inside bold text
+			const boldContent = fullMatch.slice(2, -2)
+			const hintedContent = addActModeHint(boldContent)
+			nodes.push(
+				<Text bold key={key}>
+					{hintedContent}
+				</Text>,
 			)
-
-		case "list": {
-			const { ordered, start, items } = token as Tokens.List
-			return (
-				<Box flexDirection="column" key={key}>
-					{items.map((item, i) => (
-						<Box flexDirection="row" key={i}>
-							<Text color="gray">{ordered ? `${Number(start ?? 1) + i}. ` : "• "}</Text>
-							<Box flexDirection="column" flexGrow={1}>
-								{renderTokens(item.tokens, color)}
-							</Box>
-						</Box>
-					))}
-				</Box>
+		} else if (fullMatch.startsWith("*") && fullMatch.endsWith("*")) {
+			// Italic
+			nodes.push(
+				<Text italic key={key}>
+					{fullMatch.slice(1, -1)}
+				</Text>,
 			)
+		} else if (fullMatch.startsWith("`") && fullMatch.endsWith("`")) {
+			// Inline code
+			nodes.push(<Text key={key}>{fullMatch.slice(1, -1)}</Text>)
 		}
 
-		case "blockquote":
-			return (
-				<Box flexDirection="row" key={key}>
-					<Text color="gray">│ </Text>
-					<Box flexDirection="column">{renderTokens((token as Tokens.Blockquote).tokens, color)}</Box>
-				</Box>
-			)
-
-		case "space":
-			return <Text key={key}> </Text>
-
-		// --- Inline tokens ---
-
-		case "strong":
-			return (
-				<Text bold color={color} key={key}>
-					{renderTokens((token as Tokens.Strong).tokens, color)}
-				</Text>
-			)
-
-		case "em":
-			return (
-				<Text color={color} italic key={key}>
-					{renderTokens((token as Tokens.Em).tokens, color)}
-				</Text>
-			)
-
-		case "codespan":
-			return <Text key={key}>{(token as Tokens.Codespan).text}</Text>
-
-		case "link": {
-			const { text, href } = token as Tokens.Link
-			return (
-				<Text color={color} key={key}>
-					{text && text !== href ? `${text} (${href})` : href}
-				</Text>
-			)
-		}
-
-		case "text": {
-			const { text, tokens } = token as Tokens.Text
-			if (tokens?.length) {
-				return (
-					<Text color={color} key={key}>
-						{renderTokens(tokens, color)}
-					</Text>
-				)
-			}
-			return (
-				<Text color={color} key={key}>
-					{addActModeHint(text, `${key}`)}
-				</Text>
-			)
-		}
-
-		// Fallback for any unhandled token type
-		default:
-			return "raw" in token ? (
-				<Text color={color} key={key}>
-					{(token as { raw: string }).raw}
-				</Text>
-			) : null
+		lastIndex = regex.lastIndex
 	}
+
+	// Add remaining text (with Act Mode hint processing)
+	if (lastIndex < text.length) {
+		nodes.push(...addActModeHint(text.slice(lastIndex)))
+	}
+
+	return nodes.length > 0 ? nodes : addActModeHint(text)
 }
 
 /**
- * Render a markdown string as Ink components.
- * Uses marked's lexer to parse markdown into tokens, then renders
- * each token to the appropriate Ink component.
+ * Render text with inline markdown support
  */
 const MarkdownText: React.FC<{ children: string; color?: string }> = ({ children, color }) => {
-	const tokens = lexer(children)
-	return <Box flexDirection="column">{renderTokens(tokens, color)}</Box>
+	const nodes = renderInlineMarkdown(children)
+	return <Text color={color}>{nodes}</Text>
 }
 
 interface ChatMessageProps {
@@ -297,7 +224,7 @@ function truncate(text: string, maxLength: number): string {
 /**
  * Format tool result for display
  */
-function formatToolResult(result: string, maxLines = 5): string[] {
+function formatToolResult(result: string, maxLines: number = 5): string[] {
 	const lines = result.split("\n")
 	if (lines.length <= maxLines) {
 		return lines
@@ -519,10 +446,6 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode, isStrea
 		)
 	}
 
-	if ((type === "ask" && ask === "use_subagents") || say === "use_subagents" || say === "subagent") {
-		return <SubagentMessage isStreaming={isStreaming} message={message} mode={mode} />
-	}
-
 	// MCP response
 	if (say === "mcp_server_response" && text) {
 		const lines = formatToolResult(text, 8)
@@ -877,8 +800,6 @@ export const ChatMessageList: React.FC<ChatMessageListProps> = ({ messages, maxM
 	const displayMessages = messages.filter((m) => {
 		// Skip api_req_finished, they're just markers
 		if (m.say === "api_req_finished") return false
-		// Skip hidden aggregated usage messages
-		if (m.say === "subagent_usage") return false
 		// Skip empty text messages
 		if (m.say === "text" && !m.text?.trim()) return false
 		// Skip checkpoint messages

cli/src/components/ChatView.tsx

@@ -150,28 +150,9 @@ import { HighlightedInput } from "./HighlightedInput"
 import { HistoryPanelContent } from "./HistoryPanelContent"
 import { providerModels } from "./ModelPicker"
 import { SettingsPanelContent } from "./SettingsPanelContent"
-import { SkillsPanelContent } from "./SkillsPanelContent"
 import { SlashCommandMenu } from "./SlashCommandMenu"
 import { ThinkingIndicator } from "./ThinkingIndicator"
 
-/**
- * Persistent input storage that survives React remounts (e.g., during terminal resize).
- * Keyed by a stable identifier so each task/session maintains its own input state.
- */
-interface PersistedInputState {
-	text: string
-	cursorPos: number
-	pastedTexts: Map<number, string>
-	pasteCounter: number
-}
-
-const inputStateStorage = new Map<string, PersistedInputState>()
-
-function getInputStorageKey(controller: any, taskId?: string): string {
-	// Use taskId if available, otherwise fall back to controller instance
-	return taskId || (controller?.task?.taskId ?? "default")
-}
-
 interface ChatViewProps {
 	controller?: any
 	onExit?: () => void
@@ -370,9 +351,6 @@ export const ChatView: React.FC<ChatViewProps> = ({
 		insertText: insertTextAtCursor,
 	} = useTextInput()
 
-	// Get storage key for persisting input across remounts
-	const storageKey = useMemo(() => getInputStorageKey(ctrl, taskId), [ctrl, taskId])
-
 	// Refs for text input and cursor position (used by useHomeEndKeys and to avoid stale closures in useInput)
 	const textInputRef = useRef(textInput)
 	textInputRef.current = textInput
@@ -389,10 +367,8 @@ export const ChatView: React.FC<ChatViewProps> = ({
 	const [userScrolled, setUserScrolled] = useState(false)
 
 	// Pasted text storage - maps placeholder number to full pasted content
-	const [pastedTexts, setPastedTexts] = useState<Map<number, string>>(() => {
-		return inputStateStorage.get(storageKey)?.pastedTexts ?? new Map()
-	})
-	const pasteCounterRef = useRef<number>(inputStateStorage.get(storageKey)?.pasteCounter ?? 0)
+	const [pastedTexts, setPastedTexts] = useState<Map<number, string>>(new Map())
+	const pasteCounterRef = useRef(0)
 	// Track paste timing to combine chunks that arrive in rapid succession
 	const lastPasteTimeRef = useRef<number>(0)
 	const activePasteNumRef = useRef<number>(0)
@@ -413,7 +389,6 @@ export const ChatView: React.FC<ChatViewProps> = ({
 		| { type: "settings"; initialMode?: "model-picker" | "featured-models"; initialModelKey?: "actModelId" | "planModelId" }
 		| { type: "history" }
 		| { type: "help" }
-		| { type: "skills" }
 		| null
 	>(null)
 
@@ -427,29 +402,6 @@ export const ChatView: React.FC<ChatViewProps> = ({
 	// Track when we're exiting to hide UI elements before exit
 	const [isExiting, setIsExiting] = useState(false)
 
-	// Restore input state from storage on mount (after resize remount)
-	useEffect(() => {
-		const stored = inputStateStorage.get(storageKey)
-		if (stored) {
-			setTextInput(stored.text)
-			setCursorPos(stored.cursorPos)
-			setPastedTexts(stored.pastedTexts)
-			pasteCounterRef.current = stored.pasteCounter
-		}
-	}, [storageKey, setTextInput, setCursorPos])
-
-	// Persist input state to storage whenever it changes (survives remount)
-	useEffect(() => {
-		if (textInput || pastedTexts.size > 0) {
-			inputStateStorage.set(storageKey, {
-				text: textInput,
-				cursorPos,
-				pastedTexts: new Map(pastedTexts),
-				pasteCounter: pasteCounterRef.current,
-			})
-		}
-	}, [storageKey, textInput, cursorPos, pastedTexts])
-
 	// Task switch handling: when switching tasks via /history, we clear the terminal and
 	// increment a counter used as the root Box's key. This forces React to remount the tree,
 	// giving us a fresh Static instance. Mirrors how App.tsx handles resize with resizeKey.
@@ -542,14 +494,12 @@ export const ChatView: React.FC<ChatViewProps> = ({
 		clearState() // Force clear React state (bypasses empty messages check)
 		setTextInput("")
 		setCursorPos(0)
-		// Clear persisted state
-		inputStateStorage.delete(storageKey)
 
 		// Post the now-empty state
 		if (ctrl) {
 			ctrl.postStateToWebview()
 		}
-	}, [ctrl, clearState, storageKey])
+	}, [ctrl, clearState])
 
 	const refs = useRef({
 		searchTimeout: null as NodeJS.Timeout | null,
@@ -810,8 +760,6 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			setCursorPos(0)
 			setPastedTexts(new Map()) // Clear stored pastes
 			pasteCounterRef.current = 0
-			// Clear persisted state
-			inputStateStorage.delete(storageKey)
 
 			try {
 				await ctrl.task.handleWebviewAskResponse(responseType, expandedText)
@@ -819,7 +767,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 				// Controller may be disposed
 			}
 		},
-		[ctrl, pendingAsk, pastedTexts, storageKey],
+		[ctrl, pendingAsk, pastedTexts],
 	)
 
 	// Handle cancel/interrupt
@@ -910,8 +858,6 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			setCursorPos(0)
 			setPastedTexts(new Map()) // Clear stored pastes
 			pasteCounterRef.current = 0
-			// Clear persisted state
-			inputStateStorage.delete(storageKey)
 
 			try {
 				// Convert image paths to data URLs if needed
@@ -939,7 +885,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 				onError?.()
 			}
 		},
-		[ctrl, onError, pastedTexts, storageKey],
+		[ctrl, onError, pastedTexts],
 	)
 
 	// Auto-submit initial prompt if provided
@@ -1158,21 +1104,13 @@ export const ChatView: React.FC<ChatViewProps> = ({
 						setSlashMenuDismissed(true)
 						return
 					}
-					if (cmd.name === "skills") {
-						setActivePanel({ type: "skills" })
-						setTextInput("")
-						setCursorPos(0)
-						setSelectedSlashIndex(0)
-						setSlashMenuDismissed(true)
-						return
-					}
 					if (cmd.name === "clear") {
 						clearViewAndResetTask()
 						setSelectedSlashIndex(0)
 						setSlashMenuDismissed(true)
 						return
 					}
-					if (cmd.name === "exit" || cmd.name === "q") {
+					if (cmd.name === "exit") {
 						handleExit()
 						return
 					}
@@ -1555,19 +1493,6 @@ export const ChatView: React.FC<ChatViewProps> = ({
 				{/* Help panel */}
 				{activePanel?.type === "help" && <HelpPanelContent onClose={() => setActivePanel(null)} />}
 
-				{/* Skills panel */}
-				{activePanel?.type === "skills" && ctrl && (
-					<SkillsPanelContent
-						controller={ctrl}
-						onClose={() => setActivePanel(null)}
-						onUseSkill={(skillPath) => {
-							setActivePanel(null)
-							setTextInput(`@${skillPath} `)
-							setCursorPos(skillPath.length + 2)
-						}}
-					/>
-				)}
-
 				{/* Slash command menu - below input (takes priority over file menu) */}
 				{showSlashMenu && !activePanel && (
 					<Box paddingLeft={1} paddingRight={1}>

cli/src/components/ConfigView.tsx

@@ -13,7 +13,6 @@ import {
 import { Box, Text, useApp, useInput } from "ink"
 import React, { useMemo, useState } from "react"
 import { useStdinContext } from "../context/StdinContext"
-import { fuzzyFilter } from "../utils/fuzzy-search"
 import {
 	BooleanSelect,
 	buildConfigEntries,
@@ -22,8 +21,6 @@ import {
 	HookInfo,
 	HookRow,
 	MAX_VISIBLE,
-	ObjectEditorPanel,
-	ObjectEditorState,
 	parseValue,
 	SEPARATOR,
 	SectionHeader,
@@ -108,8 +105,6 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 	const [isEditing, setIsEditing] = useState(false)
 	const [selectedIndex, setSelectedIndex] = useState(0)
 	const [editValue, setEditValue] = useState("")
-	const [searchQuery, setSearchQuery] = useState("")
-	const [objectEditor, setObjectEditor] = useState<ObjectEditorState | null>(null)
 
 	// Build entries for settings tab
 	const configEntries = useMemo(
@@ -117,13 +112,6 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 		[globalState, workspaceState],
 	)
 
-	const filteredConfigEntries = useMemo(() => {
-		if (!searchQuery.trim()) {
-			return configEntries
-		}
-		return fuzzyFilter(configEntries, searchQuery, (entry) => `${entry.key} ${String(entry.value ?? "")}`)
-	}, [configEntries, searchQuery])
-
 	// Build entries for rules tab
 	const ruleEntries = useMemo(() => {
 		const entries: ToggleEntry[] = []
@@ -171,7 +159,7 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 	const currentListLength = useMemo(() => {
 		switch (currentTab) {
 			case "settings":
-				return filteredConfigEntries.length
+				return configEntries.length
 			case "rules":
 				return ruleEntries.length
 			case "workflows":
@@ -183,14 +171,7 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 			default:
 				return 0
 		}
-	}, [
-		currentTab,
-		filteredConfigEntries.length,
-		ruleEntries.length,
-		workflowEntries.length,
-		hookEntries.length,
-		skillEntries.length,
-	])
+	}, [currentTab, configEntries.length, ruleEntries.length, workflowEntries.length, hookEntries.length, skillEntries.length])
 
 	// Get available tabs
 	const availableTabs = useMemo(() => {
@@ -210,11 +191,10 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 		setCurrentTab(newTab)
 		setSelectedIndex(0)
 		setIsEditing(false)
-		setObjectEditor(null)
 	}
 
 	// Settings tab handlers
-	const selectedConfigEntry = filteredConfigEntries[selectedIndex]
+	const selectedConfigEntry = configEntries[selectedIndex]
 
 	const handleSettingsSave = (value: string | boolean) => {
 		if (!selectedConfigEntry) {
@@ -230,43 +210,6 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 		setIsEditing(false)
 	}
 
-	const getObjectAtPath = (root: Record<string, unknown>, path: string[]): Record<string, unknown> => {
-		let current: unknown = root
-		for (const segment of path) {
-			if (!current || typeof current !== "object") {
-				return {}
-			}
-			current = (current as Record<string, unknown>)[segment]
-		}
-		return current && typeof current === "object" ? (current as Record<string, unknown>) : {}
-	}
-
-	const setObjectValueAtPath = (
-		root: Record<string, unknown>,
-		path: string[],
-		key: string,
-		value: unknown,
-	): Record<string, unknown> => {
-		if (path.length === 0) {
-			return { ...root, [key]: value }
-		}
-		const [head, ...rest] = path
-		const child = root[head]
-		const childObj = child && typeof child === "object" ? (child as Record<string, unknown>) : {}
-		return {
-			...root,
-			[head]: setObjectValueAtPath(childObj, rest, key, value),
-		}
-	}
-
-	const persistObjectEditor = (nextObject: Record<string, unknown>, source: "global" | "workspace", key: string) => {
-		if (source === "global" && onUpdateGlobal) {
-			onUpdateGlobal(key as GlobalStateAndSettingsKey, nextObject as never)
-		} else if (source === "workspace" && onUpdateWorkspace) {
-			onUpdateWorkspace(key as LocalStateKey, nextObject as never)
-		}
-	}
-
 	const handleSettingsReset = () => {
 		if (!selectedConfigEntry?.isEditable || selectedConfigEntry.source !== "global") {
 			return
@@ -297,22 +240,15 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 	// Input handling
 	useInput(
 		(input, key) => {
-			if (objectEditor) {
-				return
-			}
-
-			if (key.escape) {
+			if (input.toLowerCase() === "q" || key.escape) {
 				exit()
 			}
 
-			if (key.leftArrow || key.rightArrow || (input >= "1" && input <= "5")) {
-				const currentTabIndex = availableTabs.findIndex((t) => t.key === currentTab)
-				const targetIdx =
-					input >= "1" && input <= "5"
-						? Number.parseInt(input) - 1
-						: key.leftArrow
-							? (currentTabIndex - 1 + availableTabs.length) % availableTabs.length
-							: (currentTabIndex + 1) % availableTabs.length
+			// Tab navigation with Tab key or number keys
+			if (key.tab || (input >= "1" && input <= "5")) {
+				const targetIdx = key.tab
+					? (availableTabs.findIndex((t) => t.key === currentTab) + 1) % availableTabs.length
+					: parseInt(input) - 1
 				if (targetIdx >= 0 && targetIdx < availableTabs.length) {
 					handleTabChange(availableTabs[targetIdx].key)
 				}
@@ -320,45 +256,21 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 			}
 
 			// List navigation (arrow keys and vim-style j/k)
-			if (key.upArrow) {
+			if (key.upArrow || input === "k") {
 				setSelectedIndex((i) => (i > 0 ? i - 1 : currentListLength - 1))
-			} else if (key.downArrow) {
+			} else if (key.downArrow || input === "j") {
 				setSelectedIndex((i) => (i < currentListLength - 1 ? i + 1 : 0))
 			}
 
 			// Tab-specific actions
 			if (currentTab === "settings") {
-				if ((key.return || key.tab) && selectedConfigEntry?.isEditable) {
-					if (selectedConfigEntry.type === "boolean") {
-						handleSettingsSave(!selectedConfigEntry.value)
-						return
-					}
-					if (selectedConfigEntry.type === "object") {
-						const value =
-							selectedConfigEntry.value && typeof selectedConfigEntry.value === "object"
-								? (selectedConfigEntry.value as Record<string, unknown>)
-								: {}
-						setObjectEditor({
-							source: selectedConfigEntry.source,
-							key: selectedConfigEntry.key,
-							path: [],
-							value,
-							selectedIndex: 0,
-							isEditingValue: false,
-							editValue: "",
-						})
-						return
-					}
+				if ((key.return || input === "e") && selectedConfigEntry?.isEditable) {
 					setEditValue(selectedConfigEntry.value !== undefined ? String(selectedConfigEntry.value) : "")
 					setIsEditing(true)
-				} else if (key.ctrl && input.toLowerCase() === "r") {
+				} else if (input === "r") {
 					handleSettingsReset()
-				} else if (key.backspace || key.delete) {
-					setSearchQuery((prev) => prev.slice(0, -1))
-				} else if (input && !key.ctrl && !key.meta && !key.escape && !key.upArrow && !key.downArrow) {
-					setSearchQuery((prev) => prev + input)
 				}
-			} else if (key.return || key.tab || input === " ") {
+			} else if (key.return || input === " ") {
 				// Toggle for rules/workflows/hooks/skills
 				handleToggle()
 			}
@@ -426,31 +338,13 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 		)
 	}
 
-	if (objectEditor && currentTab === "settings") {
-		return (
-			<ObjectEditorPanel
-				getObjectAtPath={getObjectAtPath}
-				onClose={() => setObjectEditor(null)}
-				onPersist={(nextObject) => persistObjectEditor(nextObject, objectEditor.source, objectEditor.key)}
-				setObjectValueAtPath={setObjectValueAtPath}
-				setState={setObjectEditor}
-				state={objectEditor}
-			/>
-		)
-	}
-
 	// Render tab content
 	const renderTabContent = () => {
 		switch (currentTab) {
 			case "settings": {
-				const visibleEntries = filteredConfigEntries.slice(startIndex, startIndex + MAX_VISIBLE)
+				const visibleEntries = configEntries.slice(startIndex, startIndex + MAX_VISIBLE)
 				return (
 					<React.Fragment>
-						<Box>
-							<Text>Search: </Text>
-							<Text color="white">{searchQuery}</Text>
-							<Text inverse> </Text>
-						</Box>
 						<Box>
 							<Text>Data directory: </Text>
 							<Text color="blue" underline>
@@ -613,12 +507,12 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 
 	// Help text based on current tab
 	const getHelpText = () => {
-		const base = "↑/↓ Navigate • ←/→ tabs • 1-5 tabs • Esc Exit"
+		const base = "↑/↓/j/k Navigate • Tab/1-5 Switch tabs • q/Esc Exit"
 		if (currentTab === "settings") {
-			return `${base} • Type to search • Enter/Tab Edit (booleans toggle) • Backspace clear search • Ctrl+R Reset`
+			return `${base} • Enter/e Edit • r Reset`
 		}
 		const openFolder = onOpenFolder ? " • o Open folder" : ""
-		return `${base} • Enter/Tab/Space Toggle${openFolder}`
+		return `${base} • Enter/Space Toggle${openFolder}`
 	}
 
 	return (

cli/src/components/ConfigViewComponents.tsx

@@ -46,19 +46,16 @@ export interface SkillInfo {
 	enabled: boolean
 }
 
-export interface ObjectEditorState {
-	source: "global" | "workspace"
-	key: string
-	path: string[]
-	value: Record<string, unknown>
-	selectedIndex: number
-	isEditingValue: boolean
-	editValue: string
-}
+export const EXCLUDED_KEYS = new Set([
+	"taskHistory",
+	"primaryRootIndex",
+	"subagentsEnabled",
+	"subagentTerminalOutputLineLimit",
+	"welcomeViewCompleted",
+	"isNewUser",
+])
 
-export const EXCLUDED_KEYS = new Set(["taskHistory", "primaryRootIndex", "welcomeViewCompleted", "isNewUser"])
-
-export const EDITABLE_TYPES: Set<ValueType> = new Set(["string", "number", "boolean", "object"])
+export const EDITABLE_TYPES: Set<ValueType> = new Set(["string", "number", "boolean"])
 export const MAX_VISIBLE = 12
 export const SEPARATOR = "─".repeat(80)
 
@@ -138,7 +135,7 @@ export function parseValue(input: string, type: ValueType): unknown {
 		return input.toLowerCase() === "true" || input === "1"
 	}
 	if (type === "number") {
-		const num = Number.parseFloat(input)
+		const num = parseFloat(input)
 		return Number.isNaN(num) ? 0 : num
 	}
 	if (type === "object") {
@@ -220,7 +217,7 @@ export const TextInput: React.FC<TextInputProps> = ({ label, onChange, onCancel,
 			</Text>
 			<Box>
 				<Text color="white">{value}</Text>
-				<Text color="cyan">|</Text>
+				<Text inverse> </Text>
 			</Box>
 			<Text color="gray">Type: {type} • Enter to save • Esc to cancel</Text>
 		</Box>
@@ -382,169 +379,3 @@ export const SectionHeader: React.FC<{ title: string }> = ({ title }) => (
 		</Text>
 	</Box>
 )
-
-interface ObjectEditorPanelProps {
-	state: ObjectEditorState
-	setState: React.Dispatch<React.SetStateAction<ObjectEditorState | null>>
-	onClose: () => void
-	onPersist: (nextObject: Record<string, unknown>) => void
-	getObjectAtPath: (root: Record<string, unknown>, path: string[]) => Record<string, unknown>
-	setObjectValueAtPath: (root: Record<string, unknown>, path: string[], key: string, value: unknown) => Record<string, unknown>
-}
-
-export const ObjectEditorPanel: React.FC<ObjectEditorPanelProps> = ({
-	state,
-	setState,
-	onClose,
-	onPersist,
-	getObjectAtPath,
-	setObjectValueAtPath,
-}) => {
-	const { isRawModeSupported } = useStdinContext()
-	const currentNode = getObjectAtPath(state.value, state.path)
-	const objectEntries = Object.entries(currentNode).sort(([a], [b]) => a.localeCompare(b))
-	const selectedEntry = objectEntries[state.selectedIndex]
-	const breadcrumb = [state.key, ...state.path].join(" › ")
-
-	useInput(
-		(input, key) => {
-			if (state.isEditingValue) {
-				if (key.escape) {
-					setState((prev) => (prev ? { ...prev, isEditingValue: false, editValue: "" } : prev))
-					return
-				}
-				if (key.return) {
-					if (!selectedEntry) {
-						setState((prev) => (prev ? { ...prev, isEditingValue: false, editValue: "" } : prev))
-						return
-					}
-					const [entryKey, entryValue] = selectedEntry
-					let parsed: unknown = state.editValue
-					if (typeof entryValue === "boolean") {
-						parsed = state.editValue.toLowerCase() === "true" || state.editValue === "1"
-					} else if (typeof entryValue === "number") {
-						const maybeNum = Number(state.editValue)
-						parsed = Number.isNaN(maybeNum) ? 0 : maybeNum
-					}
-					const nextObject = setObjectValueAtPath(state.value, state.path, entryKey, parsed)
-					onPersist(nextObject)
-					setState((prev) => (prev ? { ...prev, value: nextObject, isEditingValue: false, editValue: "" } : prev))
-					return
-				}
-				if (key.backspace || key.delete) {
-					setState((prev) => (prev ? { ...prev, editValue: prev.editValue.slice(0, -1) } : prev))
-					return
-				}
-				if (input && !key.ctrl && !key.meta) {
-					setState((prev) => (prev ? { ...prev, editValue: prev.editValue + input } : prev))
-				}
-				return
-			}
-
-			if (key.escape) {
-				if (state.path.length > 0) {
-					setState((prev) => (prev ? { ...prev, path: prev.path.slice(0, -1), selectedIndex: 0 } : prev))
-				} else {
-					onClose()
-				}
-				return
-			}
-
-			if (key.upArrow || input === "k") {
-				setState((prev) =>
-					prev
-						? {
-								...prev,
-								selectedIndex:
-									objectEntries.length > 0
-										? prev.selectedIndex > 0
-											? prev.selectedIndex - 1
-											: objectEntries.length - 1
-										: 0,
-							}
-						: prev,
-				)
-				return
-			}
-			if (key.downArrow || input === "j") {
-				setState((prev) =>
-					prev
-						? {
-								...prev,
-								selectedIndex:
-									objectEntries.length > 0
-										? prev.selectedIndex < objectEntries.length - 1
-											? prev.selectedIndex + 1
-											: 0
-										: 0,
-							}
-						: prev,
-				)
-				return
-			}
-
-			if (key.return || key.tab) {
-				if (!selectedEntry) {
-					return
-				}
-				const [entryKey, entryValue] = selectedEntry
-				if (typeof entryValue === "boolean") {
-					const nextObject = setObjectValueAtPath(state.value, state.path, entryKey, !entryValue)
-					onPersist(nextObject)
-					setState((prev) => (prev ? { ...prev, value: nextObject } : prev))
-					return
-				}
-				if (entryValue && typeof entryValue === "object" && !Array.isArray(entryValue)) {
-					setState((prev) => (prev ? { ...prev, path: [...prev.path, entryKey], selectedIndex: 0 } : prev))
-					return
-				}
-				setState((prev) =>
-					prev
-						? { ...prev, isEditingValue: true, editValue: entryValue !== undefined ? String(entryValue) : "" }
-						: prev,
-				)
-			}
-		},
-		{ isActive: isRawModeSupported },
-	)
-
-	return (
-		<Box flexDirection="column">
-			<Text bold color="white">
-				⚙️ Edit Nested Object
-			</Text>
-			<Text color="gray">{SEPARATOR}</Text>
-			<Text color="cyan">{breadcrumb}</Text>
-			{state.isEditingValue ? (
-				<Box flexDirection="column" marginTop={1}>
-					<Box>
-						<Text color="white">{state.editValue}</Text>
-						<Text color="cyan">|</Text>
-					</Box>
-					<Text color="gray">Enter to save • Esc to cancel</Text>
-				</Box>
-			) : (
-				<Box flexDirection="column" marginTop={1}>
-					{objectEntries.length === 0 ? (
-						<Text color="gray">No nested keys at this level.</Text>
-					) : (
-						objectEntries.map(([key, value], idx) => {
-							const isSelected = idx === state.selectedIndex
-							const valueText =
-								value && typeof value === "object" && !Array.isArray(value) ? "{...}" : String(value)
-							return (
-								<Text color={isSelected ? "cyan" : undefined} key={key}>
-									{isSelected ? "❯ " : "  "}
-									<Text color="cyan">{key}</Text>
-									<Text color="gray">: </Text>
-									<Text color="white">{valueText}</Text>
-								</Text>
-							)
-						})
-					)}
-					<Text color="gray">↑/↓ Navigate • Enter/Tab Edit or drill in • Esc Back/Close</Text>
-				</Box>
-			)}
-		</Box>
-	)
-}

cli/src/components/FeaturedModelPicker.tsx

@@ -7,14 +7,13 @@
 import { Box, Text } from "ink"
 import React from "react"
 import { COLORS } from "../constants/colors"
-import type { FeaturedModel } from "../constants/featured-models"
+import { type FeaturedModel, getAllFeaturedModels } from "../constants/featured-models"
 
 interface FeaturedModelPickerProps {
 	selectedIndex: number
 	title?: string
 	showBrowseAll?: boolean
 	helpText?: string
-	featuredModels: FeaturedModel[]
 }
 
 export const FeaturedModelPicker: React.FC<FeaturedModelPickerProps> = ({
@@ -22,9 +21,8 @@ export const FeaturedModelPicker: React.FC<FeaturedModelPickerProps> = ({
 	title,
 	showBrowseAll = true,
 	helpText = "Arrows to navigate, Enter to select",
-	featuredModels,
 }) => {
-	const models = featuredModels
+	const featuredModels = getAllFeaturedModels()
 
 	return (
 		<Box flexDirection="column">
@@ -37,11 +35,11 @@ export const FeaturedModelPicker: React.FC<FeaturedModelPickerProps> = ({
 				</Text>
 			)}
 
-			{models.map((model, i) => {
+			{featuredModels.map((model, i) => {
 				const isSelected = i === selectedIndex
 
 				return (
-					<Box flexDirection="column" key={`${model.id}-${model.labels[0] || "default"}`} marginBottom={1}>
+					<Box flexDirection="column" key={model.id} marginBottom={1}>
 						<Box>
 							<Text color={isSelected ? COLORS.primaryBlue : undefined}>{isSelected ? "❯ " : "  "}</Text>
 							<Text bold color={isSelected ? COLORS.primaryBlue : "white"}>
@@ -66,8 +64,8 @@ export const FeaturedModelPicker: React.FC<FeaturedModelPickerProps> = ({
 
 			{showBrowseAll && (
 				<Box>
-					<Text color={selectedIndex === models.length ? COLORS.primaryBlue : "white"}>
-						{selectedIndex === models.length ? "❯ " : "  "}
+					<Text color={selectedIndex === featuredModels.length ? COLORS.primaryBlue : "white"}>
+						{selectedIndex === featuredModels.length ? "❯ " : "  "}
 						Browse all models...
 					</Text>
 				</Box>
@@ -83,21 +81,24 @@ export const FeaturedModelPicker: React.FC<FeaturedModelPickerProps> = ({
  * Get the maximum valid index for the featured model picker
  * (includes "Browse all" option if showBrowseAll is true)
  */
-export function getFeaturedModelMaxIndex(featuredModels: FeaturedModel[], showBrowseAll = true): number {
+export function getFeaturedModelMaxIndex(showBrowseAll: boolean = true): number {
+	const featuredModels = getAllFeaturedModels()
 	return showBrowseAll ? featuredModels.length : featuredModels.length - 1
 }
 
 /**
  * Check if the selected index is the "Browse all" option
  */
-export function isBrowseAllSelected(selectedIndex: number, featuredModels: FeaturedModel[]): boolean {
+export function isBrowseAllSelected(selectedIndex: number): boolean {
+	const featuredModels = getAllFeaturedModels()
 	return selectedIndex === featuredModels.length
 }
 
 /**
  * Get the featured model at the given index, or null if "Browse all" is selected
  */
-export function getFeaturedModelAtIndex(index: number, featuredModels: FeaturedModel[]): FeaturedModel | null {
+export function getFeaturedModelAtIndex(index: number): FeaturedModel | null {
+	const featuredModels = getAllFeaturedModels()
 	if (index >= 0 && index < featuredModels.length) {
 		return featuredModels[index]
 	}

cli/src/components/HelpPanelContent.tsx

@@ -43,30 +43,6 @@ export const HelpPanelContent: React.FC<HelpPanelContentProps> = ({ onClose }) =
 					</Text>
 				</Box>
 
-				<Box flexDirection="column">
-					<Text bold>Keyboard Shortcuts</Text>
-					<Text>
-						{"  "}
-						<Text color="white">Ctrl+U</Text> - Clear entire input (delete to start)
-					</Text>
-					<Text>
-						{"  "}
-						<Text color="white">Ctrl+K</Text> - Delete from cursor to end
-					</Text>
-					<Text>
-						{"  "}
-						<Text color="white">Ctrl+W</Text> - Delete word backwards
-					</Text>
-					<Text>
-						{"  "}
-						<Text color="white">Ctrl+A / Ctrl+E</Text> - Jump to start / end of input
-					</Text>
-					<Text>
-						{"  "}
-						<Text color="white">Alt/Option+←/→</Text> - Move by word
-					</Text>
-				</Box>
-
 				<Box flexDirection="column">
 					<Text bold>Slash Commands</Text>
 					<Text>
@@ -88,10 +64,6 @@ export const HelpPanelContent: React.FC<HelpPanelContentProps> = ({ onClose }) =
 						{"  "}
 						<Text color="white">/clear</Text> - Start a fresh task
 					</Text>
-					<Text>
-						{"  "}
-						<Text color="white">/q</Text> - Quit Cline
-					</Text>
 				</Box>
 
 				<Text>

cli/src/components/ModelPicker.tsx

@@ -6,7 +6,6 @@
 import { Box, Text } from "ink"
 import Spinner from "ink-spinner"
 import React, { useEffect, useMemo, useState } from "react"
-import { refreshOcaModels } from "@/core/controller/models/refreshOcaModels"
 import { refreshOpenRouterModels } from "@/core/controller/models/refreshOpenRouterModels"
 import {
 	type ApiProvider,
@@ -65,15 +64,11 @@ import {
 	xaiDefaultModelId,
 	xaiModels,
 } from "@/shared/api"
-import { StringRequest } from "@/shared/proto/cline/common"
 import { filterOpenRouterModelIds } from "@/shared/utils/model-filters"
 import { COLORS } from "../constants/colors"
 import { getOpenRouterDefaultModelId, usesOpenRouterModels } from "../utils/openrouter-models"
 import { SearchableList, SearchableListItem } from "./SearchableList"
 
-// Special ID used to indicate the user wants to enter a custom model ID / ARN
-export const CUSTOM_MODEL_ID = "__custom__"
-
 // Map providers to their static model lists and defaults
 export const providerModels: Record<string, { models: Record<string, unknown>; defaultId: string }> = {
 	anthropic: { models: anthropicModels, defaultId: anthropicDefaultModelId },
@@ -110,7 +105,7 @@ export function hasStaticModels(provider: string): boolean {
 }
 
 export function hasModelPicker(provider: string): boolean {
-	return hasStaticModels(provider) || usesOpenRouterModels(provider) || provider === "oca"
+	return hasStaticModels(provider) || usesOpenRouterModels(provider)
 }
 
 export function getDefaultModelId(provider: string): string {
@@ -137,7 +132,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({ provider, controller,
 	const [isLoading, setIsLoading] = useState(false)
 	const [asyncModels, setAsyncModels] = useState<string[]>([])
 
-	// Fetch async models (OpenRouter or OCA) when needed
+	// Fetch OpenRouter models when needed using shared core function
 	useEffect(() => {
 		if (usesOpenRouterModels(provider)) {
 			setIsLoading(true)
@@ -150,45 +145,22 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({ provider, controller,
 				.finally(() => {
 					setIsLoading(false)
 				})
-		} else if (provider === "oca") {
-			setIsLoading(true)
-			refreshOcaModels(controller, StringRequest.create({ value: "" }))
-				.then((result) => {
-					if (result.models) {
-						const modelIds = Object.keys(result.models).sort((a, b) => a.localeCompare(b))
-						setAsyncModels(modelIds)
-					}
-				})
-				.finally(() => {
-					setIsLoading(false)
-				})
 		}
 	}, [provider, controller])
 
 	const modelList = useMemo(() => {
-		if (usesOpenRouterModels(provider) || provider === "oca") {
+		if (usesOpenRouterModels(provider)) {
 			return asyncModels
 		}
 		return getModelList(provider)
 	}, [provider, asyncModels])
 
-	// Providers that support custom model IDs (e.g., Bedrock Application Inference Profiles)
-	const supportsCustomModel = provider === "bedrock"
-
 	const items: SearchableListItem[] = useMemo(() => {
-		const list = modelList.map((modelId) => ({
+		return modelList.map((modelId) => ({
 			id: modelId,
 			label: modelId,
 		}))
-		// Add "Custom" option at the end for providers that support it
-		if (supportsCustomModel) {
-			list.push({
-				id: CUSTOM_MODEL_ID,
-				label: "Custom (ARN / Inference Profile)",
-			})
-		}
-		return list
-	}, [modelList, supportsCustomModel])
+	}, [modelList])
 
 	// For providers without a model picker, render nothing
 	if (!hasModelPicker(provider)) {
@@ -208,7 +180,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({ provider, controller,
 	}
 
 	// If async fetch returned no models, render nothing
-	if ((usesOpenRouterModels(provider) || provider === "oca") && modelList.length === 0) {
+	if (usesOpenRouterModels(provider) && modelList.length === 0) {
 		return null
 	}
 

cli/src/components/OcaEmployeeCheck.tsx

@@ -1,88 +0,0 @@
-/**
- * OCA (Oracle Cloud Assist) employee check component.
- * Shows a checkbox for "I'm an Oracle Employee" and a sign-in button.
- * Sets ocaMode in state before triggering the OAuth flow.
- */
-
-import { Box, Text, useInput } from "ink"
-// biome-ignore lint/style/useImportType: React is used as a value by JSX (jsx: "react" in tsconfig)
-import React, { useCallback, useState } from "react"
-import { StateManager } from "@/core/storage/StateManager"
-import { COLORS } from "../constants/colors"
-import { useStdinContext } from "../context/StdinContext"
-
-interface OcaEmployeeCheckProps {
-	/** Whether this component is active and should handle input */
-	isActive: boolean
-	/** Called when user confirms and wants to proceed with sign-in */
-	onSignIn: () => void
-	/** Called when user presses Escape to go back */
-	onCancel: () => void
-}
-
-export const OcaEmployeeCheck: React.FC<OcaEmployeeCheckProps> = ({ isActive, onSignIn, onCancel }) => {
-	const { isRawModeSupported } = useStdinContext()
-	const [isEmployee, setIsEmployee] = useState(true) // Default to checked (internal), matching extension behavior
-	const [selectedIndex, setSelectedIndex] = useState(0) // 0 = checkbox, 1 = sign in button
-
-	const ITEM_COUNT = 2
-
-	const handleSignIn = useCallback(async () => {
-		// Persist ocaMode to state before starting auth
-		const stateManager = StateManager.get()
-		stateManager.setGlobalState("ocaMode", isEmployee ? "internal" : "external")
-		await stateManager.flushPendingState()
-		onSignIn()
-	}, [isEmployee, onSignIn])
-
-	useInput(
-		(_input, key) => {
-			if (key.escape) {
-				onCancel()
-				return
-			}
-			if (key.upArrow) {
-				setSelectedIndex((prev) => (prev > 0 ? prev - 1 : ITEM_COUNT - 1))
-			} else if (key.downArrow) {
-				setSelectedIndex((prev) => (prev < ITEM_COUNT - 1 ? prev + 1 : 0))
-			} else if (key.tab || (key.return && selectedIndex === 0)) {
-				// Toggle checkbox when Tab is pressed or Enter on checkbox item
-				if (selectedIndex === 0) {
-					setIsEmployee((prev) => !prev)
-				}
-			} else if (key.return && selectedIndex === 1) {
-				// Sign in button
-				handleSignIn()
-			}
-		},
-		{ isActive: isRawModeSupported && isActive },
-	)
-
-	return (
-		<Box flexDirection="column">
-			<Text color="white">Oracle Code Assist</Text>
-			<Text> </Text>
-			{/* Checkbox: I'm an Oracle Employee */}
-			<Text>
-				<Text bold color={selectedIndex === 0 ? COLORS.primaryBlue : undefined}>
-					{selectedIndex === 0 ? "❯" : " "}{" "}
-				</Text>
-				<Text color={selectedIndex === 0 || isEmployee ? COLORS.primaryBlue : "gray"}>{isEmployee ? "[✓]" : "[ ]"}</Text>
-				<Text color={selectedIndex === 0 ? COLORS.primaryBlue : "white"}> I'm an Oracle Employee</Text>
-				{selectedIndex === 0 && <Text color="gray"> (Tab to toggle)</Text>}
-			</Text>
-			{/* Sign in button */}
-			<Text>
-				<Text bold color={selectedIndex === 1 ? COLORS.primaryBlue : undefined}>
-					{selectedIndex === 1 ? "❯" : " "}{" "}
-				</Text>
-				<Text color={selectedIndex === 1 ? COLORS.primaryBlue : "white"}>Sign in with Oracle Code Assist</Text>
-				{selectedIndex === 1 && <Text color="gray"> (Enter)</Text>}
-			</Text>
-			<Text> </Text>
-			<Text color="gray">Please ask your IT administrator to set up Oracle Code Assist as a model provider.</Text>
-			<Text> </Text>
-			<Text color="gray">Arrows to navigate, Tab to toggle, Enter to continue, Esc to go back</Text>
-		</Box>
-	)
-}

cli/src/components/QuitCommand.test.tsx

@@ -1,112 +0,0 @@
-import { render } from "ink-testing-library"
-// biome-ignore lint/correctness/noUnusedImports: React must be in scope for JSX in this test file.
-import React from "react"
-import { beforeEach, describe, expect, it, vi } from "vitest"
-
-// Mock ink's useApp
-const mockExit = vi.fn()
-vi.mock("ink", async (importOriginal) => {
-	const actual = await importOriginal<typeof import("ink")>()
-	return {
-		...actual,
-		useApp: () => ({ exit: mockExit }),
-	}
-})
-
-// Mock child_process
-vi.mock("child_process", () => ({
-	execSync: vi.fn().mockReturnValue(""),
-	exec: vi.fn(),
-}))
-
-// Mock dependencies
-vi.mock("@/core/controller/slash/getAvailableSlashCommands", () => ({
-	getAvailableSlashCommands: vi.fn().mockResolvedValue({ commands: [] }),
-}))
-
-vi.mock("@/core/storage/StateManager", () => ({
-	StateManager: {
-		get: () => ({
-			getGlobalSettingsKey: vi.fn().mockReturnValue("act"),
-			getGlobalStateKey: vi.fn().mockReturnValue([]),
-			getApiConfiguration: vi.fn().mockReturnValue({}),
-		}),
-	},
-}))
-
-vi.mock("@/services/telemetry", () => ({
-	telemetryService: {
-		captureHostEvent: vi.fn(),
-	},
-}))
-
-vi.mock("@shared/services/Session", () => ({
-	Session: {
-		get: () => ({
-			getStats: vi.fn().mockReturnValue({}),
-		}),
-	},
-}))
-
-vi.mock("../context/TaskContext", () => ({
-	useTaskContext: () => ({
-		controller: {},
-		clearState: vi.fn(),
-	}),
-	useTaskState: () => ({
-		clineMessages: [],
-	}),
-}))
-
-vi.mock("../hooks/useStateSubscriber", () => ({
-	useIsSpinnerActive: () => ({ isActive: false, startTime: 0 }),
-}))
-
-import { ChatView } from "./ChatView"
-
-// Helper to wait for async state updates
-const delay = (ms = 60) => new Promise((resolve) => setTimeout(resolve, ms))
-
-describe("Quit Command (/q and /exit)", () => {
-	const mockOnExit = vi.fn()
-
-	beforeEach(() => {
-		vi.clearAllMocks()
-	})
-
-	it("should exit the application when /q is selected from slash menu", async () => {
-		const { stdin } = render(<ChatView onExit={mockOnExit} />)
-		await delay()
-
-		// Type /q
-		stdin.write("/q")
-		await delay()
-
-		// Press Enter
-		stdin.write("\r")
-
-		// handleExit has a 150ms timeout
-		await delay(200)
-
-		expect(mockExit).toHaveBeenCalled()
-		expect(mockOnExit).toHaveBeenCalled()
-	})
-
-	it("should exit the application when /exit is selected from slash menu", async () => {
-		const { stdin } = render(<ChatView onExit={mockOnExit} />)
-		await delay()
-
-		// Type /exit
-		stdin.write("/exit")
-		await delay()
-
-		// Press Enter
-		stdin.write("\r")
-
-		// handleExit has a 150ms timeout
-		await delay(200)
-
-		expect(mockExit).toHaveBeenCalled()
-		expect(mockOnExit).toHaveBeenCalled()
-	})
-})

cli/src/components/SettingsPanelContent.tsx

@@ -14,23 +14,19 @@ import Spinner from "ink-spinner"
 import React, { useCallback, useEffect, useMemo, useState } from "react"
 import { buildApiHandler } from "@/core/api"
 import type { Controller } from "@/core/controller"
-import { refreshOcaModels } from "@/core/controller/models/refreshOcaModels"
 import { StateManager } from "@/core/storage/StateManager"
 import { openAiCodexOAuthManager } from "@/integrations/openai-codex/oauth"
 import { ClineAccountService } from "@/services/account/ClineAccountService"
 import { AuthService, ClineAccountOrganization } from "@/services/auth/AuthService"
-import { StringRequest } from "@/shared/proto/cline/common"
 import { openExternal } from "@/utils/env"
 import { supportsReasoningEffortForModel } from "@/utils/model-utils"
 import { version as CLI_VERSION } from "../../package.json"
 import { COLORS } from "../constants/colors"
 import { useStdinContext } from "../context/StdinContext"
-import { useClineFeaturedModels } from "../hooks/useClineFeaturedModels"
 import { useOcaAuth } from "../hooks/useOcaAuth"
 import { isMouseEscapeSequence } from "../utils/input"
 import { applyBedrockConfig, applyProviderConfig } from "../utils/provider-config"
 import { ApiKeyInput } from "./ApiKeyInput"
-import { BedrockCustomModelFlow } from "./BedrockCustomModelFlow"
 import { type BedrockConfig, BedrockSetup } from "./BedrockSetup"
 import { Checkbox } from "./Checkbox"
 import {
@@ -40,8 +36,7 @@ import {
 	isBrowseAllSelected,
 } from "./FeaturedModelPicker"
 import { LanguagePicker } from "./LanguagePicker"
-import { CUSTOM_MODEL_ID, hasModelPicker, ModelPicker } from "./ModelPicker"
-import { OcaEmployeeCheck } from "./OcaEmployeeCheck"
+import { hasModelPicker, ModelPicker } from "./ModelPicker"
 import { OrganizationPicker } from "./OrganizationPicker"
 import { Panel, PanelTab } from "./Panel"
 import { getProviderLabel, ProviderPicker } from "./ProviderPicker"
@@ -87,12 +82,6 @@ const TABS: PanelTab[] = [
 
 // Settings configuration for simple boolean toggles
 const FEATURE_SETTINGS = {
-	subagents: {
-		stateKey: "subagentsEnabled",
-		default: false,
-		label: "Subagents",
-		description: "Let Cline run focused subagents in parallel to explore the codebase for you",
-	},
 	autoCondense: {
 		stateKey: "useAutoCondense",
 		default: false,
@@ -162,21 +151,16 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 	)
 	const [isPickingFeaturedModel, setIsPickingFeaturedModel] = useState(initialMode === "featured-models")
 	const [featuredModelIndex, setFeaturedModelIndex] = useState(0)
-	const featuredModels = useClineFeaturedModels()
 	const [isPickingProvider, setIsPickingProvider] = useState(false)
 	const [isPickingLanguage, setIsPickingLanguage] = useState(false)
 	const [isEnteringApiKey, setIsEnteringApiKey] = useState(false)
 	const [isConfiguringBedrock, setIsConfiguringBedrock] = useState(false)
 	const [isWaitingForCodexAuth, setIsWaitingForCodexAuth] = useState(false)
-	const [isShowingOcaEmployeeCheck, setIsShowingOcaEmployeeCheck] = useState(false)
 	const [codexAuthError, setCodexAuthError] = useState<string | null>(null)
 	const [pendingProvider, setPendingProvider] = useState<string | null>(null)
 	const [apiKeyValue, setApiKeyValue] = useState("")
 	const [editValue, setEditValue] = useState("")
 
-	// Bedrock custom ARN flow state
-	const [isBedrockCustomFlow, setIsBedrockCustomFlow] = useState(false)
-
 	// Settings state - single object for feature toggles
 	const [features, setFeatures] = useState<Record<FeatureKey, boolean>>(() => {
 		const initial: Record<string, boolean> = {}
@@ -245,8 +229,6 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 	// OCA auth hook
 	const handleOcaAuthSuccess = useCallback(async () => {
 		await applyProviderConfig({ providerId: "oca", controller })
-		// Fetch OCA models from the API - this sets actModeOcaModelId/planModeOcaModelId in state
-		await refreshOcaModels(controller!, StringRequest.create({ value: "" }))
 		setProvider("oca")
 		refreshModelIds()
 	}, [controller, refreshModelIds])
@@ -950,56 +932,10 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 		setReasoningEffortForMode,
 	])
 
-	// Handle completion of the Bedrock custom ARN flow (ARN + base model selected)
-	const handleBedrockCustomFlowComplete = useCallback(
-		async (arn: string, baseModelId: string) => {
-			if (!pickingModelKey) return
-			const apiConfig = stateManager.getApiConfiguration()
-
-			// Build a minimal BedrockConfig from current state for applyBedrockConfig
-			const bedrockConfig: BedrockConfig = {
-				awsRegion: apiConfig.awsRegion ?? "us-east-1",
-				awsAuthentication: apiConfig.awsUseProfile ? "profile" : "credentials",
-				awsUseCrossRegionInference: Boolean(apiConfig.awsUseCrossRegionInference),
-			}
-
-			await applyBedrockConfig({
-				bedrockConfig,
-				modelId: arn,
-				customModelBaseId: baseModelId,
-				controller,
-			})
-
-			// Flush pending state to ensure everything is persisted
-			await stateManager.flushPendingState()
-
-			// Rebuild API handler if there's an active task
-			rebuildTaskApi()
-
-			refreshModelIds()
-			setIsBedrockCustomFlow(false)
-			setPickingModelKey(null)
-
-			// If opened from /models command, close the entire settings panel
-			if (initialMode) {
-				onClose()
-			}
-		},
-		[pickingModelKey, stateManager, controller, rebuildTaskApi, refreshModelIds, initialMode, onClose],
-	)
-
 	// Handle model selection from picker
 	const handleModelSelect = useCallback(
 		async (modelId: string) => {
 			if (!pickingModelKey) return
-
-			// Intercept "Custom" selection for Bedrock — redirect to custom ARN input flow
-			if (modelId === CUSTOM_MODEL_ID && provider === "bedrock") {
-				setIsPickingModel(false)
-				setIsBedrockCustomFlow(true)
-				return
-			}
-
 			const apiConfig = stateManager.getApiConfiguration()
 			const actProvider = apiConfig.actModeApiProvider
 			const planProvider = apiConfig.planModeApiProvider || actProvider
@@ -1060,7 +996,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 				onClose()
 			}
 		},
-		[pickingModelKey, separateModels, stateManager, controller, provider, refreshModelIds, initialMode, onClose],
+		[pickingModelKey, separateModels, stateManager, controller, refreshModelIds, initialMode, onClose],
 	)
 
 	// Handle language selection from picker
@@ -1136,8 +1072,8 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 					setProvider("oca")
 					refreshModelIds()
 				} else {
-					// Not logged in - show employee check before auth
-					setIsShowingOcaEmployeeCheck(true)
+					// Not logged in - trigger OAuth
+					startOcaAuth()
 				}
 				return
 			}
@@ -1294,7 +1230,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 
 			// Featured model picker mode (Cline provider)
 			if (isPickingFeaturedModel) {
-				const maxIndex = getFeaturedModelMaxIndex(featuredModels)
+				const maxIndex = getFeaturedModelMaxIndex()
 
 				if (key.escape) {
 					setIsPickingFeaturedModel(false)
@@ -1308,12 +1244,12 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 				} else if (key.downArrow) {
 					setFeaturedModelIndex((prev) => (prev < maxIndex ? prev + 1 : 0))
 				} else if (key.return) {
-					if (isBrowseAllSelected(featuredModelIndex, featuredModels)) {
+					if (isBrowseAllSelected(featuredModelIndex)) {
 						// Switch to full ModelPicker
 						setIsPickingFeaturedModel(false)
 						setIsPickingModel(true)
 					} else {
-						const selectedModel = getFeaturedModelAtIndex(featuredModelIndex, featuredModels)
+						const selectedModel = getFeaturedModelAtIndex(featuredModelIndex)
 						if (selectedModel && pickingModelKey) {
 							handleModelSelect(selectedModel.id)
 							setIsPickingFeaturedModel(false)
@@ -1384,11 +1320,6 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 				return
 			}
 
-			// Bedrock custom flow - input handled by BedrockCustomModelFlow component
-			if (isBedrockCustomFlow) {
-				return
-			}
-
 			if (isEditing) {
 				if (key.escape) {
 					setIsEditing(false)
@@ -1433,7 +1364,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 				return
 			}
 		},
-		{ isActive: isRawModeSupported && !isEnteringApiKey && !isConfiguringBedrock && !isShowingOcaEmployeeCheck },
+		{ isActive: isRawModeSupported && !isEnteringApiKey && !isConfiguringBedrock },
 	)
 
 	// Render content
@@ -1524,7 +1455,6 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 			const label = pickingModelKey === "actModelId" ? "Model ID (Act)" : "Model ID (Plan)"
 			return (
 				<FeaturedModelPicker
-					featuredModels={featuredModels}
 					helpText="Arrows to navigate, Enter to select, Esc to cancel"
 					selectedIndex={featuredModelIndex}
 					title={`Select: ${label}`}
@@ -1610,19 +1540,6 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 			)
 		}
 
-		if (isShowingOcaEmployeeCheck) {
-			return (
-				<OcaEmployeeCheck
-					isActive={isShowingOcaEmployeeCheck}
-					onCancel={() => setIsShowingOcaEmployeeCheck(false)}
-					onSignIn={() => {
-						setIsShowingOcaEmployeeCheck(false)
-						startOcaAuth()
-					}}
-				/>
-			)
-		}
-
 		if (isWaitingForOcaAuth) {
 			return (
 				<Box flexDirection="column">
@@ -1642,20 +1559,6 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 			)
 		}
 
-		// Bedrock custom model flow (ARN input + base model selection)
-		if (isBedrockCustomFlow) {
-			return (
-				<BedrockCustomModelFlow
-					isActive={isBedrockCustomFlow}
-					onCancel={() => {
-						setIsBedrockCustomFlow(false)
-						setIsPickingModel(true)
-					}}
-					onComplete={handleBedrockCustomFlowComplete}
-				/>
-			)
-		}
-
 		// Account tab - loading state
 		if (currentTab === "account" && isAccountLoading) {
 			return (
@@ -1818,9 +1721,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
 		!!codexAuthError ||
 		isPickingOrganization ||
 		isWaitingForClineAuth ||
-		isShowingOcaEmployeeCheck ||
 		isWaitingForOcaAuth ||
-		isBedrockCustomFlow ||
 		isEditing
 
 	return (

cli/src/components/SkillsPanelContent.test.tsx

@@ -1,230 +0,0 @@
-/**
- * Tests for SkillsPanelContent component
- *
- * Tests keyboard interactions and callbacks.
- * Rendering tests are limited due to ink-testing-library constraints with nested components.
- */
-
-import { render } from "ink-testing-library"
-// biome-ignore lint/correctness/noUnusedImports: React must be in scope for JSX in this test file.
-import React from "react"
-import { beforeEach, describe, expect, it, vi } from "vitest"
-
-// Mock refreshSkills
-const mockRefreshSkills = vi.fn()
-vi.mock("@/core/controller/file/refreshSkills", () => ({
-	refreshSkills: () => mockRefreshSkills(),
-}))
-
-// Mock toggleSkill
-const mockToggleSkill = vi.fn()
-vi.mock("@/core/controller/file/toggleSkill", () => ({
-	toggleSkill: (...args: unknown[]) => mockToggleSkill(...args),
-}))
-
-// Mock child_process exec
-const mockExec = vi.fn()
-vi.mock("node:child_process", () => ({
-	exec: (...args: unknown[]) => mockExec(...args),
-}))
-
-// Mock StdinContext
-vi.mock("../context/StdinContext", () => ({
-	useStdinContext: () => ({ isRawModeSupported: true }),
-}))
-
-import { SkillsPanelContent } from "./SkillsPanelContent"
-
-// Helper to wait for async state updates
-const delay = (ms = 60) => new Promise((resolve) => setTimeout(resolve, ms))
-
-describe("SkillsPanelContent", () => {
-	const mockController = {} as any
-	const mockOnClose = vi.fn()
-	const mockOnUseSkill = vi.fn()
-
-	const defaultProps = {
-		controller: mockController,
-		onClose: mockOnClose,
-		onUseSkill: mockOnUseSkill,
-	}
-
-	beforeEach(() => {
-		vi.clearAllMocks()
-		mockRefreshSkills.mockResolvedValue({
-			globalSkills: [],
-			localSkills: [],
-		})
-	})
-
-	describe("keyboard interactions", () => {
-		it("should call onClose when Escape is pressed", async () => {
-			mockRefreshSkills.mockResolvedValue({
-				globalSkills: [],
-				localSkills: [],
-			})
-
-			const { stdin } = render(<SkillsPanelContent {...defaultProps} />)
-			await delay()
-
-			stdin.write("\x1B") // Escape
-			await delay()
-
-			expect(mockOnClose).toHaveBeenCalled()
-		})
-
-		it("should call onUseSkill with skill path when Enter is pressed on a skill", async () => {
-			mockRefreshSkills.mockResolvedValue({
-				globalSkills: [{ name: "test-skill", description: "Test", path: "/test/path/SKILL.md", enabled: true }],
-				localSkills: [],
-			})
-
-			const { stdin } = render(<SkillsPanelContent {...defaultProps} />)
-			await delay()
-
-			stdin.write("\r") // Enter
-			await delay()
-
-			expect(mockOnUseSkill).toHaveBeenCalledWith("/test/path/SKILL.md")
-		})
-
-		it("should call toggleSkill when Space is pressed on a skill", async () => {
-			mockRefreshSkills.mockResolvedValue({
-				globalSkills: [{ name: "test-skill", description: "Test", path: "/test/path/SKILL.md", enabled: true }],
-				localSkills: [],
-			})
-
-			const { stdin } = render(<SkillsPanelContent {...defaultProps} />)
-			await delay()
-
-			stdin.write(" ") // Space
-			await delay()
-
-			expect(mockToggleSkill).toHaveBeenCalledWith(
-				mockController,
-				expect.objectContaining({
-					skillPath: "/test/path/SKILL.md",
-					isGlobal: true,
-					enabled: false, // toggled from true to false
-				}),
-			)
-		})
-
-		it("should open marketplace URL when Enter is pressed on marketplace item", async () => {
-			mockRefreshSkills.mockResolvedValue({
-				globalSkills: [{ name: "skill", description: "desc", path: "/path", enabled: true }],
-				localSkills: [],
-			})
-
-			const { stdin } = render(<SkillsPanelContent {...defaultProps} />)
-			await delay()
-
-			// Navigate down to marketplace (past the one skill)
-			stdin.write("\x1B[B") // Down arrow
-			await delay()
-
-			stdin.write("\r") // Enter
-			await delay()
-
-			// Should have called exec with open command
-			expect(mockExec).toHaveBeenCalled()
-			const execCall = mockExec.mock.calls[0][0]
-			expect(execCall).toContain("https://skills.sh/")
-		})
-
-		it("should navigate through skills with arrow keys", async () => {
-			mockRefreshSkills.mockResolvedValue({
-				globalSkills: [
-					{ name: "skill-1", description: "First", path: "/path1", enabled: true },
-					{ name: "skill-2", description: "Second", path: "/path2", enabled: true },
-				],
-				localSkills: [],
-			})
-
-			const { stdin } = render(<SkillsPanelContent {...defaultProps} />)
-			await delay()
-
-			// Navigate down
-			stdin.write("\x1B[B") // Down arrow
-			await delay()
-
-			// Press Enter - should use second skill
-			stdin.write("\r")
-			await delay()
-
-			expect(mockOnUseSkill).toHaveBeenCalledWith("/path2")
-		})
-
-		it("should navigate with vim keys (j/k)", async () => {
-			mockRefreshSkills.mockResolvedValue({
-				globalSkills: [
-					{ name: "skill-1", description: "First", path: "/path1", enabled: true },
-					{ name: "skill-2", description: "Second", path: "/path2", enabled: true },
-				],
-				localSkills: [],
-			})
-
-			const { stdin } = render(<SkillsPanelContent {...defaultProps} />)
-			await delay()
-
-			// Navigate down with j
-			stdin.write("j")
-			await delay()
-
-			// Press Enter - should use second skill
-			stdin.write("\r")
-			await delay()
-
-			expect(mockOnUseSkill).toHaveBeenCalledWith("/path2")
-		})
-
-		it("should revert optimistic toggle on failure", async () => {
-			mockRefreshSkills.mockResolvedValue({
-				globalSkills: [{ name: "test-skill", description: "Test", path: "/test/path/SKILL.md", enabled: true }],
-				localSkills: [],
-			})
-			mockToggleSkill.mockRejectedValueOnce(new Error("toggle failed"))
-
-			const { stdin, lastFrame } = render(<SkillsPanelContent {...defaultProps} />)
-			await delay()
-
-			stdin.write(" ") // Space to toggle
-			await delay(100)
-
-			// toggleSkill was called with enabled: false (toggled from true)
-			expect(mockToggleSkill).toHaveBeenCalledWith(mockController, expect.objectContaining({ enabled: false }))
-			const frame = lastFrame() || ""
-			expect(frame).toContain("● test-skill")
-			expect(frame).not.toContain("○ test-skill")
-		})
-
-		it("should wrap navigation at list boundaries", async () => {
-			mockRefreshSkills.mockResolvedValue({
-				globalSkills: [{ name: "only-skill", description: "Only", path: "/only", enabled: true }],
-				localSkills: [],
-			})
-
-			const { stdin } = render(<SkillsPanelContent {...defaultProps} />)
-			await delay()
-
-			// Navigate up from first item (should wrap to last - marketplace)
-			stdin.write("\x1B[A") // Up arrow
-			await delay()
-
-			stdin.write("\r") // Enter
-			await delay()
-
-			// Should have opened marketplace (wrapped to last item)
-			expect(mockExec).toHaveBeenCalled()
-		})
-	})
-
-	describe("skill loading", () => {
-		it("should call refreshSkills on mount", async () => {
-			render(<SkillsPanelContent {...defaultProps} />)
-			await delay()
-
-			expect(mockRefreshSkills).toHaveBeenCalled()
-		})
-	})
-})

cli/src/components/SkillsPanelContent.tsx

@@ -1,257 +0,0 @@
-/**
- * Skills panel content for inline display in ChatView
- * Shows installed skills with toggle and use functionality
- */
-
-import { exec } from "node:child_process"
-import os from "node:os"
-import { Box, Text, useInput } from "ink"
-import React, { useCallback, useEffect, useMemo, useState } from "react"
-import type { Controller } from "@/core/controller"
-import { refreshSkills } from "@/core/controller/file/refreshSkills"
-import { toggleSkill } from "@/core/controller/file/toggleSkill"
-import { COLORS } from "../constants/colors"
-import { useStdinContext } from "../context/StdinContext"
-import { isMouseEscapeSequence } from "../utils/input"
-import { Panel } from "./Panel"
-
-const SKILLS_MARKETPLACE_URL = "https://skills.sh/"
-
-interface SkillInfo {
-	name: string
-	description: string
-	path: string
-	enabled: boolean
-}
-
-interface SkillsPanelContentProps {
-	controller: Controller
-	onClose: () => void
-	onUseSkill: (skillPath: string) => void
-}
-
-const MAX_VISIBLE = 8
-
-export const SkillsPanelContent: React.FC<SkillsPanelContentProps> = ({ controller, onClose, onUseSkill }) => {
-	const { isRawModeSupported } = useStdinContext()
-	const [globalSkills, setGlobalSkills] = useState<SkillInfo[]>([])
-	const [localSkills, setLocalSkills] = useState<SkillInfo[]>([])
-	const [selectedIndex, setSelectedIndex] = useState(0)
-	const [isLoading, setIsLoading] = useState(true)
-
-	// Load skills on mount
-	useEffect(() => {
-		const loadSkills = async () => {
-			try {
-				const skillsData = await refreshSkills(controller)
-				setGlobalSkills(skillsData.globalSkills || [])
-				setLocalSkills(skillsData.localSkills || [])
-			} catch (_error) {
-				// Skills loading failed, show empty state
-			} finally {
-				setIsLoading(false)
-			}
-		}
-		loadSkills()
-	}, [controller])
-
-	// Build flat list of skills with source info (global first, then local, alphabetical within each)
-	const skillEntries = useMemo(() => {
-		const entries: { skill: SkillInfo; isGlobal: boolean }[] = []
-		globalSkills.forEach((skill) => entries.push({ skill, isGlobal: true }))
-		localSkills.forEach((skill) => entries.push({ skill, isGlobal: false }))
-		return entries.sort((a, b) => {
-			if (a.isGlobal !== b.isGlobal) return a.isGlobal ? -1 : 1
-			return a.skill.name.localeCompare(b.skill.name)
-		})
-	}, [globalSkills, localSkills])
-
-	// Handle toggle
-	const handleToggle = useCallback(async () => {
-		const entry = skillEntries[selectedIndex]
-		if (!entry) return
-
-		const newEnabled = !entry.skill.enabled
-		const setter = entry.isGlobal ? setGlobalSkills : setLocalSkills
-		const update = (enabled: boolean) =>
-			setter((prev) => prev.map((s) => (s.path === entry.skill.path ? { ...s, enabled } : s)))
-
-		// Optimistic update
-		update(newEnabled)
-
-		try {
-			await toggleSkill(controller, {
-				metadata: undefined,
-				skillPath: entry.skill.path,
-				isGlobal: entry.isGlobal,
-				enabled: newEnabled,
-			})
-		} catch {
-			// Revert on failure
-			update(!newEnabled)
-		}
-	}, [controller, skillEntries, selectedIndex])
-
-	// Handle use skill (insert @ mention)
-	const handleUse = useCallback(() => {
-		const entry = skillEntries[selectedIndex]
-		if (!entry) return
-		onUseSkill(entry.skill.path)
-	}, [skillEntries, selectedIndex, onUseSkill])
-
-	// Handle opening the marketplace URL
-	const openMarketplace = useCallback(() => {
-		const platform = os.platform()
-		let command: string
-		if (platform === "darwin") {
-			command = `open "${SKILLS_MARKETPLACE_URL}"`
-		} else if (platform === "win32") {
-			command = `start "${SKILLS_MARKETPLACE_URL}"`
-		} else {
-			command = `xdg-open "${SKILLS_MARKETPLACE_URL}"`
-		}
-		exec(command, (err) => {
-			if (err) {
-				// Fallback: show URL in terminal if browser open fails
-				console.error(`Visit: ${SKILLS_MARKETPLACE_URL}`)
-			}
-		})
-	}, [])
-
-	// Total items = skills + 1 for marketplace link
-	const totalItems = skillEntries.length + 1
-	const isMarketplaceSelected = selectedIndex === skillEntries.length
-
-	useInput(
-		(input, key) => {
-			if (isMouseEscapeSequence(input)) {
-				return
-			}
-			if (key.escape) {
-				onClose()
-				return
-			}
-
-			// Navigation
-			if (key.upArrow || input === "k") {
-				setSelectedIndex((i) => (i > 0 ? i - 1 : totalItems - 1))
-				return
-			}
-			if (key.downArrow || input === "j") {
-				setSelectedIndex((i) => (i < totalItems - 1 ? i + 1 : 0))
-				return
-			}
-
-			// Actions
-			if (key.return) {
-				if (isMarketplaceSelected) {
-					openMarketplace()
-				} else {
-					handleUse()
-				}
-				return
-			}
-			if (input === " " && !isMarketplaceSelected) {
-				handleToggle()
-				return
-			}
-		},
-		{ isActive: isRawModeSupported },
-	)
-
-	// Scrolling window (includes marketplace row)
-	const halfVisible = Math.floor(MAX_VISIBLE / 2)
-	const startIndex = Math.max(0, Math.min(selectedIndex - halfVisible, totalItems - MAX_VISIBLE))
-
-	if (isLoading) {
-		return (
-			<Panel label="Skills">
-				<Text color="gray">Loading skills...</Text>
-			</Panel>
-		)
-	}
-
-	// Check if marketplace row is in visible window
-	const marketplaceIndex = skillEntries.length
-	const showMarketplace = marketplaceIndex >= startIndex && marketplaceIndex < startIndex + MAX_VISIBLE
-
-	return (
-		<Panel label="Skills">
-			<Box flexDirection="column" gap={1}>
-				{skillEntries.length === 0 ? (
-					<Box flexDirection="column" gap={1}>
-						<Text color="gray">No skills installed.</Text>
-						<Text>
-							Install skills with: <Text color="white">npx skills add owner/repo</Text>
-						</Text>
-					</Box>
-				) : (
-					<Box flexDirection="column">
-						{skillEntries
-							.slice(startIndex, Math.min(startIndex + MAX_VISIBLE, skillEntries.length))
-							.map((entry, idx) => {
-								const actualIndex = startIndex + idx
-								const prevEntry = skillEntries[actualIndex - 1]
-								const showHeader = actualIndex === 0 || (prevEntry && prevEntry.isGlobal !== entry.isGlobal)
-
-								return (
-									<React.Fragment key={entry.skill.path}>
-										{showHeader && (
-											<Box marginTop={actualIndex > 0 ? 1 : 0}>
-												<Text bold color="gray">
-													{entry.isGlobal ? "Global Skills:" : "Workspace Skills:"}
-												</Text>
-											</Box>
-										)}
-										<SkillRow isSelected={actualIndex === selectedIndex} skill={entry.skill} />
-									</React.Fragment>
-								)
-							})}
-					</Box>
-				)}
-
-				{/* Marketplace link - selectable */}
-				{showMarketplace && (
-					<Box marginTop={1}>
-						<Text color={isMarketplaceSelected ? "cyan" : undefined}>
-							{isMarketplaceSelected ? "❯ " : "  "}
-							<Text color={COLORS.primaryBlue}>Browse more skills at https://skills.sh/</Text>
-						</Text>
-					</Box>
-				)}
-
-				{/* Help text */}
-				<Box marginTop={1}>
-					<Text color="gray">
-						↑/↓ Navigate • Enter {isMarketplaceSelected ? "Open" : "Use"}
-						{!isMarketplaceSelected && " • Space Toggle"}
-					</Text>
-				</Box>
-			</Box>
-		</Panel>
-	)
-}
-
-const SkillRow: React.FC<{ skill: SkillInfo; isSelected: boolean }> = ({ skill, isSelected }) => {
-	return (
-		<Box flexDirection="column">
-			<Box>
-				<Text color={isSelected ? "cyan" : undefined}>
-					{isSelected ? "❯ " : "  "}
-					<Text color={skill.enabled ? "green" : "red"}>{skill.enabled ? "●" : "○"}</Text>
-					<Text> </Text>
-					<Text bold color="white">
-						{skill.name}
-					</Text>
-				</Text>
-			</Box>
-			{skill.description && (
-				<Box marginLeft={4}>
-					<Text color="gray">
-						{skill.description.length > 60 ? skill.description.slice(0, 57) + "..." : skill.description}
-					</Text>
-				</Box>
-			)}
-		</Box>
-	)
-}

cli/src/components/SubagentMessage.tsx

@@ -1,361 +0,0 @@
-import type { ClineAskUseSubagents, ClineMessage, ClineSaySubagentStatus } from "@shared/ExtensionMessage"
-import { Box, Text } from "ink"
-import Spinner from "ink-spinner"
-import React from "react"
-import { COLORS } from "../constants/colors"
-import { useTerminalSize } from "../hooks/useTerminalSize"
-import { jsonParseSafe } from "../utils/parser"
-
-interface SubagentMessageProps {
-	message: ClineMessage
-	isStreaming?: boolean
-	mode?: "act" | "plan"
-}
-
-const TREE_PREFIX_WIDTH = 5
-const MIN_PROMPT_WIDTH = 20
-
-const DotRow: React.FC<{ children: React.ReactNode; color?: string; flashing?: boolean }> = ({
-	children,
-	color,
-	flashing = false,
-}) => (
-	<Box flexDirection="row">
-		<Box width={2}>
-			{flashing ? (
-				<Text color={color}>
-					<Spinner type="toggle8" />
-				</Text>
-			) : (
-				<Text color={color}>⏺</Text>
-			)}
-		</Box>
-		<Box flexGrow={1}>{children}</Box>
-	</Box>
-)
-
-function formatCompactTokens(tokens: number | undefined): string {
-	const value = Number.isFinite(tokens) ? Math.max(0, tokens || 0) : 0
-	return new Intl.NumberFormat("en-US", {
-		notation: "compact",
-		maximumFractionDigits: 1,
-	})
-		.format(value)
-		.toLowerCase()
-}
-
-function formatCompactCost(cost: number | undefined): string {
-	const value = Number.isFinite(cost) ? Math.max(0, cost || 0) : 0
-	const maximumFractionDigits = value >= 0.01 ? 2 : 4
-	return new Intl.NumberFormat("en-US", {
-		style: "currency",
-		currency: "USD",
-		minimumFractionDigits: 2,
-		maximumFractionDigits,
-	}).format(value)
-}
-
-function formatSubagentStatsValues(
-	toolCalls: number | undefined,
-	contextTokens: number | undefined,
-	totalCost: number | undefined,
-	latestToolCall?: string,
-) {
-	const safeToolCalls = Number.isFinite(toolCalls) ? Math.max(0, toolCalls || 0) : 0
-	const toolUses = safeToolCalls === 1 ? "tool use" : "tool uses"
-	const tokensUsed = formatCompactTokens(contextTokens || 0)
-	const formattedCost = formatCompactCost(totalCost || 0)
-	const stats = `${safeToolCalls} ${toolUses} · ${tokensUsed} tokens · ${formattedCost}`
-	const latestTool = latestToolCall?.trim()
-	return latestTool ? `${latestTool} · ${stats}` : stats
-}
-
-function wrapPrompt(text: string, width: number): string[] {
-	if (!text) {
-		return [""]
-	}
-
-	const normalizedWidth = Math.max(1, width)
-	const wrappedLines: string[] = []
-	const paragraphs = text.split("\n")
-
-	for (const paragraph of paragraphs) {
-		const words = paragraph.trim().split(/\s+/).filter(Boolean)
-		if (words.length === 0) {
-			wrappedLines.push("")
-			continue
-		}
-
-		let line = ""
-		for (const word of words) {
-			if (!line) {
-				if (word.length <= normalizedWidth) {
-					line = word
-					continue
-				}
-
-				let remaining = word
-				while (remaining.length > normalizedWidth) {
-					wrappedLines.push(remaining.slice(0, normalizedWidth))
-					remaining = remaining.slice(normalizedWidth)
-				}
-				line = remaining
-				continue
-			}
-
-			if (line.length + 1 + word.length <= normalizedWidth) {
-				line = `${line} ${word}`
-				continue
-			}
-
-			wrappedLines.push(line)
-
-			if (word.length <= normalizedWidth) {
-				line = word
-				continue
-			}
-
-			let remaining = word
-			while (remaining.length > normalizedWidth) {
-				wrappedLines.push(remaining.slice(0, normalizedWidth))
-				remaining = remaining.slice(normalizedWidth)
-			}
-			line = remaining
-		}
-
-		if (line) {
-			wrappedLines.push(line)
-		}
-	}
-
-	return wrappedLines.length > 0 ? wrappedLines : [text]
-}
-
-const TreePromptRow: React.FC<{
-	prefix: React.ReactNode
-	continuationPrefix: string
-	prompt: string
-	promptWidth: number
-	color?: string
-}> = ({ prefix, continuationPrefix, prompt, promptWidth, color }) => {
-	const lines = wrapPrompt(prompt, promptWidth)
-
-	return (
-		<Box flexDirection="column" width="100%">
-			{lines.map((line, index) => (
-				<Box flexDirection="row" key={`${line}-${index}`} width="100%">
-					<Box flexShrink={0} width={TREE_PREFIX_WIDTH}>
-						{index === 0 ? prefix : <Text color="gray">{continuationPrefix}</Text>}
-					</Box>
-					<Box flexGrow={1}>
-						<Text color={color}>{line}</Text>
-					</Box>
-				</Box>
-			))}
-		</Box>
-	)
-}
-
-const TreeStatsRow: React.FC<{ prefix: string; stats: string }> = ({ prefix, stats }) => (
-	<Box flexDirection="row" width="100%">
-		<Box flexShrink={0} width={TREE_PREFIX_WIDTH}>
-			<Text color="gray">{prefix}</Text>
-		</Box>
-		<Box flexGrow={1}>
-			<Text color="gray">⎿ {stats}</Text>
-		</Box>
-	</Box>
-)
-
-export const SubagentMessage: React.FC<SubagentMessageProps> = ({ message, mode, isStreaming }) => {
-	const { type, ask, say, text, partial } = message
-	const toolColor = mode === "plan" ? "yellow" : COLORS.primaryBlue
-	const { columns } = useTerminalSize()
-	const promptWidth = Math.max(MIN_PROMPT_WIDTH, columns - 2 - TREE_PREFIX_WIDTH)
-
-	if ((type === "ask" && ask === "use_subagents") || say === "use_subagents") {
-		const parsed = text
-			? jsonParseSafe<ClineAskUseSubagents>(text, {
-					prompts: [],
-				})
-			: { prompts: [] }
-
-		const prompts = (parsed.prompts || []).map((prompt) => prompt?.trim()).filter(Boolean)
-		if (prompts.length === 0) {
-			return (
-				<Box flexDirection="column" marginBottom={1} width="100%">
-					<DotRow color={toolColor}>
-						<Text color={toolColor}>Cline wants to run subagents:</Text>
-					</DotRow>
-				</Box>
-			)
-		}
-
-		const singular = prompts.length === 1
-		return (
-			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={toolColor} flashing={partial === true && isStreaming}>
-					<Text color={toolColor}>{singular ? "Cline wants to run a subagent:" : "Cline wants to run subagents:"}</Text>
-				</DotRow>
-				<Box flexDirection="column" marginLeft={2} width="100%">
-					{prompts.map((prompt, index) => {
-						const isLastPrompt = index === prompts.length - 1
-						const branch = isLastPrompt ? "└─" : "├─"
-						const continuationPrefix = isLastPrompt ? "     " : "│    "
-						const shouldShowPromptStats = partial !== true || !isLastPrompt
-						return (
-							<Box flexDirection="column" key={`${prompt}-${index}`}>
-								<TreePromptRow
-									color={toolColor}
-									continuationPrefix={continuationPrefix}
-									prefix={<Text color={toolColor}>{`${branch} `}</Text>}
-									prompt={prompt}
-									promptWidth={promptWidth}
-								/>
-								{shouldShowPromptStats && (
-									<TreeStatsRow
-										prefix={continuationPrefix}
-										stats={formatSubagentStatsValues(undefined, undefined, undefined)}
-									/>
-								)}
-							</Box>
-						)
-					})}
-				</Box>
-			</Box>
-		)
-	}
-
-	if (say === "subagent" && text) {
-		const parsed = jsonParseSafe<ClineSaySubagentStatus>(text, {
-			status: "running",
-			total: 0,
-			completed: 0,
-			successes: 0,
-			failures: 0,
-			toolCalls: 0,
-			inputTokens: 0,
-			outputTokens: 0,
-			contextWindow: 0,
-			maxContextTokens: 0,
-			maxContextUsagePercentage: 0,
-			items: [],
-		})
-
-		const items = parsed.items || []
-		if (items.length === 0) {
-			return null
-		}
-
-		return (
-			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={toolColor} flashing={partial === true && isStreaming}>
-					<Text color={toolColor}>
-						{items.length === 1 ? "Cline is running a subagent:" : "Cline is running subagents:"}
-					</Text>
-				</DotRow>
-				<Box flexDirection="column" marginLeft={2} width="100%">
-					{items.map((entry, index) => {
-						const isLastEntry = index === items.length - 1
-						const branch = isLastEntry ? "└─" : "├─"
-						const continuationPrefix = isLastEntry ? "     " : "│    "
-						const key = `${entry.index}-${index}`
-						const shouldShowStats = true
-
-						if (entry.status === "completed") {
-							return (
-								<Box flexDirection="column" key={key}>
-									<TreePromptRow
-										color="green"
-										continuationPrefix={continuationPrefix}
-										prefix={
-											<Box flexDirection="row">
-												<Text color="gray">{`${branch} `}</Text>
-												<Text color="green">✓</Text>
-											</Box>
-										}
-										prompt={entry.prompt}
-										promptWidth={promptWidth}
-									/>
-									<TreeStatsRow
-										prefix={continuationPrefix}
-										stats={formatSubagentStatsValues(
-											entry.toolCalls,
-											entry.contextTokens,
-											entry.totalCost,
-											entry.latestToolCall,
-										)}
-									/>
-								</Box>
-							)
-						}
-
-						if (entry.status === "failed") {
-							return (
-								<Box flexDirection="column" key={key}>
-									<TreePromptRow
-										color="red"
-										continuationPrefix={continuationPrefix}
-										prefix={
-											<Box flexDirection="row">
-												<Text color="gray">{`${branch} `}</Text>
-												<Text color="red">✗</Text>
-											</Box>
-										}
-										prompt={entry.prompt}
-										promptWidth={promptWidth}
-									/>
-									<TreeStatsRow
-										prefix={continuationPrefix}
-										stats={formatSubagentStatsValues(
-											entry.toolCalls,
-											entry.contextTokens,
-											entry.totalCost,
-											entry.latestToolCall,
-										)}
-									/>
-								</Box>
-							)
-						}
-
-						return (
-							<Box flexDirection="column" key={key}>
-								<TreePromptRow
-									color={toolColor}
-									continuationPrefix={continuationPrefix}
-									prefix={
-										<Box flexDirection="row">
-											<Text color="gray">{branch} </Text>
-											{entry.status === "running" ? (
-												<Text color={toolColor}>
-													<Spinner type="dots" />
-												</Text>
-											) : (
-												<Text color={toolColor}>•</Text>
-											)}
-										</Box>
-									}
-									prompt={entry.prompt}
-									promptWidth={promptWidth}
-								/>
-								{shouldShowStats && (
-									<TreeStatsRow
-										prefix={continuationPrefix}
-										stats={formatSubagentStatsValues(
-											entry.toolCalls,
-											entry.contextTokens,
-											entry.totalCost,
-											entry.latestToolCall,
-										)}
-									/>
-								)}
-							</Box>
-						)
-					})}
-				</Box>
-			</Box>
-		)
-	}
-
-	return null
-}

cli/src/constants/featured-models.test.ts

@@ -1,23 +0,0 @@
-import { describe, expect, it } from "vitest"
-import { getAllFeaturedModels, mapRecommendedModelsToFeaturedModels } from "./featured-models"
-
-describe("featured models", () => {
-	it("includes display names for all featured models", () => {
-		const models = getAllFeaturedModels()
-
-		for (const model of models) {
-			expect(model.name).toBeTruthy()
-		}
-	})
-
-	it("fills free model metadata from fallback when upstream payload is sparse", () => {
-		const models = mapRecommendedModelsToFeaturedModels({
-			recommended: [],
-			free: [{ id: "trinity-large-preview:free", name: "trinity-large-preview:free", description: "", tags: [] }],
-		})
-
-		expect(models.free[0]?.name).toBe("Arcee AI Trinity Large Preview")
-		expect(models.free[0]?.description).toBe("Arcee AI's advanced large preview model in the Trinity series")
-		expect(models.free[0]?.labels).toContain("FREE")
-	})
-})

cli/src/constants/featured-models.ts

@@ -2,7 +2,6 @@
  * Featured models shown in the Cline model picker during onboarding
  * These are curated models that work well with Cline
  */
-import { CLINE_RECOMMENDED_MODELS_FALLBACK } from "@shared/cline/recommended-models"
 
 export interface FeaturedModel {
 	id: string
@@ -11,81 +10,55 @@ export interface FeaturedModel {
 	labels: string[]
 }
 
-type RecommendedModelLike = {
-	id: string
-	name: string
-	description: string
-	tags: string[]
+export const FEATURED_MODELS = {
+	recommended: [
+		{
+			id: "anthropic/claude-opus-4.6",
+			name: "Claude Opus 4.6",
+			description: "State-of-the-art for complex coding",
+			labels: ["BEST"],
+		},
+		{
+			id: "openai/gpt-5.2-codex",
+			name: "GPT 5.2 Codex",
+			description: "OpenAI's latest with strong coding abilities",
+			labels: ["NEW"],
+		},
+		{
+			id: "google/gemini-3-pro-preview",
+			name: "Gemini 3 Pro",
+			description: "1M context window for large codebases",
+			labels: ["TRENDING"],
+		},
+	] as FeaturedModel[],
+	free: [
+		{
+			id: "minimax/minimax-m2.1",
+			name: "MiniMax M2.1",
+			description: "Exceptional Multi-Programming Language Capabilities",
+			labels: ["FREE"],
+		},
+		{
+			id: "moonshotai/kimi-k2.5",
+			name: "Kimi K2.5",
+			description: "State-of-the-art model topping benchmarks",
+			labels: ["FREE"],
+		},
+		{
+			id: "kwaipilot/kat-coder-pro",
+			name: "KAT Coder Pro",
+			description: "Advanced agentic coding model",
+			labels: ["FREE"],
+		},
+		{
+			id: "arcee-ai/trinity-large-preview:free",
+			name: "Trinity Large Preview",
+			description: "US built open source coding model",
+			labels: ["FREE"],
+		},
+	] as FeaturedModel[],
 }
 
-export interface FeaturedModelsByTier {
-	recommended: FeaturedModel[]
-	free: FeaturedModel[]
-}
-
-interface RecommendedModelsByTier {
-	recommended: RecommendedModelLike[]
-	free: RecommendedModelLike[]
-}
-
-function toFeaturedModel(model: RecommendedModelLike): FeaturedModel {
-	return {
-		id: model.id,
-		name: model.name,
-		description: model.description,
-		labels: model.tags,
-	}
-}
-
-function getModelIdSuffix(id: string): string {
-	const lastSlashIndex = id.lastIndexOf("/")
-	return lastSlashIndex >= 0 ? id.slice(lastSlashIndex + 1) : id
-}
-
-function findFallbackFeaturedModelById(models: FeaturedModel[], id: string): FeaturedModel | undefined {
-	const idSuffix = getModelIdSuffix(id)
-	return models.find((model) => model.id === id || getModelIdSuffix(model.id) === idSuffix)
-}
-
-function mapRecommendedModelToFeaturedModelWithFallback(
-	model: RecommendedModelLike,
-	fallbackModels: FeaturedModel[],
-	defaultLabels: string[] = [],
-): FeaturedModel {
-	const fallbackModel = findFallbackFeaturedModelById(fallbackModels, model.id)
-	const upstreamNameLooksLikeFallback = model.name === model.id || model.name.trim().length === 0
-	const name = upstreamNameLooksLikeFallback ? (fallbackModel?.name ?? model.name) : model.name
-	const description = model.description.trim().length > 0 ? model.description : (fallbackModel?.description ?? "")
-	const labels = model.tags.length > 0 ? model.tags : (fallbackModel?.labels ?? defaultLabels)
-
-	return {
-		id: model.id,
-		name,
-		description,
-		labels,
-	}
-}
-
-export const FEATURED_MODELS: FeaturedModelsByTier = {
-	recommended: CLINE_RECOMMENDED_MODELS_FALLBACK.recommended.map(toFeaturedModel),
-	free: CLINE_RECOMMENDED_MODELS_FALLBACK.free.map(toFeaturedModel),
-}
-
-export function getAllFeaturedModels(modelsByTier: FeaturedModelsByTier = FEATURED_MODELS): FeaturedModel[] {
-	return [...modelsByTier.recommended, ...modelsByTier.free]
-}
-
-export function mapRecommendedModelsToFeaturedModels(data: RecommendedModelsByTier): FeaturedModelsByTier {
-	return {
-		recommended: data.recommended.map((model) =>
-			mapRecommendedModelToFeaturedModelWithFallback(model, FEATURED_MODELS.recommended),
-		),
-		free: data.free.map((model) => mapRecommendedModelToFeaturedModelWithFallback(model, FEATURED_MODELS.free, ["FREE"])),
-	}
-}
-
-export function withFeaturedModelFallback(modelsByTier: FeaturedModelsByTier): FeaturedModelsByTier {
-	const recommended = modelsByTier.recommended.length > 0 ? modelsByTier.recommended : FEATURED_MODELS.recommended
-	const free = modelsByTier.free.length > 0 ? modelsByTier.free : FEATURED_MODELS.free
-	return { recommended, free }
+export function getAllFeaturedModels(): FeaturedModel[] {
+	return [...FEATURED_MODELS.recommended, ...FEATURED_MODELS.free]
 }

cli/src/exports.ts

@@ -1,71 +0,0 @@
-/**
- * Cline Library Exports
- *
- * This file exports the public API for programmatic use of Cline.
- * Use these classes and types to embed Cline into your applications.
- *
- * @example
- * ```typescript
- * import { ClineAgent } from "cline"
- *
- * const agent = new ClineAgent()
- * await agent.initialize({ clientCapabilities: {} })
- * const session = await agent.newSession({ cwd: process.cwd() })
- * ```
- * @module cline
- */
-
-export { ClineAgent } from "./agent/ClineAgent.js"
-export { ClineSessionEmitter } from "./agent/ClineSessionEmitter.js"
-export type {
-	AcpAgentOptions,
-	AcpSessionState,
-	AcpSessionStatus,
-	Agent,
-	AgentSideConnection,
-	AudioContent,
-	CancelNotification,
-	ClientCapabilities,
-	ClineAcpSession,
-	ClineAgentCapabilities,
-	ClineAgentInfo,
-	ClineAgentOptions,
-	ClinePermissionOption,
-	ClineSessionEvents,
-	ContentBlock,
-	ImageContent,
-	InitializeRequest,
-	InitializeResponse,
-	LoadSessionRequest,
-	LoadSessionResponse,
-	McpServer,
-	ModelInfo,
-	NewSessionRequest,
-	NewSessionResponse,
-	PermissionHandler,
-	PermissionOption,
-	PermissionOptionKind,
-	PromptRequest,
-	PromptResponse,
-	RequestPermissionRequest,
-	RequestPermissionResponse,
-	SessionConfigOption,
-	SessionModelState,
-	SessionNotification,
-	SessionUpdate,
-	SessionUpdatePayload,
-	SessionUpdateType,
-	SetSessionConfigOptionRequest,
-	SetSessionConfigOptionResponse,
-	SetSessionModelRequest,
-	SetSessionModelResponse,
-	SetSessionModeRequest,
-	SetSessionModeResponse,
-	StopReason,
-	TextContent,
-	ToolCall,
-	ToolCallStatus,
-	ToolCallUpdate,
-	ToolKind,
-	TranslatedMessage,
-} from "./agent/public-types.js"

cli/src/hooks/useClineFeaturedModels.ts

@@ -1,34 +0,0 @@
-import { useEffect, useState } from "react"
-import { refreshClineRecommendedModels } from "@/core/controller/models/refreshClineRecommendedModels"
-import {
-	type FeaturedModel,
-	getAllFeaturedModels,
-	mapRecommendedModelsToFeaturedModels,
-	withFeaturedModelFallback,
-} from "../constants/featured-models"
-
-export function useClineFeaturedModels(): FeaturedModel[] {
-	const [featuredModels, setFeaturedModels] = useState<FeaturedModel[]>(() => getAllFeaturedModels())
-
-	useEffect(() => {
-		let cancelled = false
-		void (async () => {
-			try {
-				const recommendedModels = await refreshClineRecommendedModels()
-				const mappedModels = mapRecommendedModelsToFeaturedModels(recommendedModels)
-				const modelsWithFallback = withFeaturedModelFallback(mappedModels)
-				if (!cancelled) {
-					setFeaturedModels(getAllFeaturedModels(modelsWithFallback))
-				}
-			} catch {
-				// Keep local fallback models on error.
-			}
-		})()
-
-		return () => {
-			cancelled = true
-		}
-	}, [])
-
-	return featuredModels
-}

cli/src/hooks/useTextInput.ts

@@ -6,7 +6,6 @@
  * - Ctrl+A/E: start/end of line
  * - Ctrl+W: delete word backwards
  * - Ctrl+U: delete to start of line
- * - Ctrl+K: delete to end of line
  *
  * Note: Home/End keys are handled by useHomeEndKeys hook because Ink doesn't
  * expose them in useInput (it sets input='' for these keys).
@@ -153,14 +152,6 @@ export function useTextInput(): UseTextInputReturn {
 		}
 	}, [])
 
-	const deleteToEnd = useCallback(() => {
-		const pos = cursorRef.current
-		if (pos < textRef.current.length) {
-			setTextState((prev) => prev.slice(0, pos))
-			// Cursor stays at same position (now at end of text)
-		}
-	}, [])
-
 	// Cursor movement (internal, used by handlers)
 	const moveToStart = useCallback(() => setCursorPosState(0), [])
 	const moveToEnd = useCallback(() => setCursorPosState(textRef.current.length), [])
@@ -199,9 +190,6 @@ export function useTextInput(): UseTextInputReturn {
 				case "u": // Ctrl+U - delete to start
 					deleteToStart()
 					return true
-				case "k": // Ctrl+K - delete to end
-					deleteToEnd()
-					return true
 				case "w": // Ctrl+W - delete word backwards
 					deleteWordBefore()
 					return true
@@ -209,7 +197,7 @@ export function useTextInput(): UseTextInputReturn {
 					return false
 			}
 		},
-		[moveToStart, moveToEnd, deleteToStart, deleteToEnd, deleteWordBefore],
+		[moveToStart, moveToEnd, deleteToStart, deleteWordBefore],
 	)
 
 	return {

cli/src/index.ts

@@ -8,19 +8,22 @@ import { Command } from "commander"
 import { render } from "ink"
 import React from "react"
 import { ClineEndpoint } from "@/config"
-import type { Controller } from "@/core/controller"
+import { Controller } from "@/core/controller"
 import { StateManager } from "@/core/storage/StateManager"
 import { AuthHandler } from "@/hosts/external/AuthHandler"
 import { HostProvider } from "@/hosts/host-provider"
 import { FileEditProvider } from "@/integrations/editor/FileEditProvider"
+import { openAiCodexOAuthManager } from "@/integrations/openai-codex/oauth"
 import { StandaloneTerminalManager } from "@/integrations/terminal/standalone/StandaloneTerminalManager"
+import { BannerService } from "@/services/banner/BannerService"
 import { ErrorService } from "@/services/error/ErrorService"
+import { initializeDistinctId } from "@/services/logging/distinctId"
 import { telemetryService } from "@/services/telemetry"
 import { PostHogClientProvider } from "@/services/telemetry/providers/posthog/PostHogClientProvider"
 import { HistoryItem } from "@/shared/HistoryItem"
 import { Logger } from "@/shared/services/Logger"
 import { Session } from "@/shared/services/Session"
-import { getProviderModelIdKey } from "@/shared/storage"
+import { getProviderModelIdKey, ProviderToApiKeyMap } from "@/shared/storage"
 import { isOpenaiReasoningEffort, OPENAI_REASONING_EFFORT_OPTIONS, type OpenaiReasoningEffort } from "@/shared/storage/types"
 import { version as CLI_VERSION } from "../package.json"
 import { runAcpMode } from "./acp/index.js"
@@ -29,8 +32,7 @@ import { checkRawModeSupport } from "./context/StdinContext"
 import { createCliHostBridgeProvider } from "./controllers"
 import { CliCommentReviewController } from "./controllers/CliCommentReviewController"
 import { CliWebviewProvider } from "./controllers/CliWebviewProvider"
-import { isAuthConfigured } from "./utils/auth"
-import { restoreConsole, suppressConsoleUnlessVerbose } from "./utils/console"
+import { restoreConsole } from "./utils/console"
 import { printInfo, printWarning } from "./utils/display"
 import { selectOutputMode } from "./utils/mode-selection"
 import { parseImagesFromInput, processImagePaths } from "./utils/parser"
@@ -43,10 +45,6 @@ import { autoUpdateOnStartup, checkForUpdates } from "./utils/update"
 import { initializeCliContext } from "./vscode-context"
 import { CLI_LOG_FILE, shutdownEvent, window } from "./vscode-shim"
 
-// CLI-only behavior: suppress console output unless verbose mode is enabled.
-// Kept explicit here so importing the library bundle does not mutate global console methods.
-suppressConsoleUnlessVerbose()
-
 /**
  * Common options shared between runTask and resumeTask
  */
@@ -75,7 +73,10 @@ async function disposeTelemetryServices(): Promise<void> {
 	}
 
 	telemetryDisposed = true
-	await Promise.allSettled([telemetryService.dispose(), PostHogClientProvider.getInstance().dispose()])
+	await Promise.allSettled([
+		telemetryService.dispose(),
+		PostHogClientProvider.getInstance().dispose(),
+	])
 }
 
 async function disposeCliContext(ctx: CliContext): Promise<void> {
@@ -191,10 +192,9 @@ function applyTaskOptions(options: TaskOptions): void {
 		telemetryService.captureHostEvent("max_consecutive_mistakes_flag", String(maxConsecutiveMistakes))
 	}
 
-	// Set yolo mode as a session-scoped override so AutoApprove picks it up,
-	// but it is never persisted to disk (setSessionOverride never touches pendingGlobalState).
+	// Set yolo mode based on --yolo flag
 	if (options.yolo) {
-		StateManager.get().setSessionOverride("yoloModeToggled", true)
+		StateManager.get().setGlobalState("yoloModeToggled", true)
 		telemetryService.captureHostEvent("yolo_flag", "true")
 	}
 
@@ -347,12 +347,6 @@ function setupSignalHandlers() {
 				}
 				await disposeCliContext(activeContext)
 			} else {
-				// Best-effort flush of restored yolo state when no active context
-				try {
-					await StateManager.get().flushPendingState()
-				} catch {
-					// StateManager may not be initialized yet
-				}
 				await ErrorService.get().dispose()
 				await disposeTelemetryServices()
 			}
@@ -403,7 +397,7 @@ interface InitOptions {
  */
 async function initializeCli(options: InitOptions): Promise<CliContext> {
 	const workspacePath = options.cwd || process.cwd()
-	const { extensionContext, storageContext, DATA_DIR, EXTENSION_DIR } = initializeCliContext({
+	const { extensionContext, DATA_DIR, EXTENSION_DIR } = initializeCliContext({
 		clineDir: options.config,
 		workspaceDir: workspacePath,
 	})
@@ -416,6 +410,7 @@ async function initializeCli(options: InitOptions): Promise<CliContext> {
 	Logger.subscribe(logToChannel)
 
 	await ClineEndpoint.initialize(EXTENSION_DIR)
+	await initializeDistinctId(extensionContext)
 
 	// Auto-update check (after endpoints initialized, so we can detect bundled configs)
 	autoUpdateOnStartup(CLI_VERSION)
@@ -438,18 +433,23 @@ async function initializeCli(options: InitOptions): Promise<CliContext> {
 		() => new StandaloneTerminalManager(),
 		createCliHostBridgeProvider(workspacePath),
 		logToChannel,
-		async (path: string) => (options.enableAuth ? AuthHandler.getInstance().getCallbackUrl(path) : ""),
+		async () => (options.enableAuth ? AuthHandler.getInstance().getCallbackUrl() : ""),
 		getCliBinaryPath,
 		EXTENSION_DIR,
 		DATA_DIR,
 	)
 
-	await StateManager.initialize(storageContext)
+	await StateManager.initialize(extensionContext as any)
 	await ErrorService.initialize()
 
+	// Initialize OpenAI Codex OAuth manager with extension context for secrets storage
+	openAiCodexOAuthManager.initialize(extensionContext)
+
 	const webview = HostProvider.get().createWebviewProvider() as CliWebviewProvider
 	const controller = webview.controller
 
+	BannerService.initialize(webview.controller)
+
 	await telemetryService.captureExtensionActivated()
 	await telemetryService.captureHostEvent("cline_cli", "initialized")
 
@@ -728,7 +728,7 @@ program
 	.option("-a, --act", "Run in act mode")
 	.option("-p, --plan", "Run in plan mode")
 	.option("-y, --yolo", "Enable yes/yolo mode (auto-approve actions)")
-	.option("-t, --timeout <seconds>", "Optional timeout in seconds (applies only when provided)")
+	.option("-t, --timeout <seconds>", "Timeout in seconds for yes/yolo mode (default: 600)")
 	.option("-m, --model <model>", "Model to use for the task")
 	.option("-v, --verbose", "Show verbose output")
 	.option("-c, --cwd <path>", "Working directory for the task")
@@ -764,9 +764,9 @@ program
 program
 	.command("auth")
 	.description("Authenticate a provider and configure what model is used")
-	.option("-p, --provider <id>", "Provider ID for quick setup (e.g., openai-native, anthropic, moonshot)")
+	.option("-p, --provider <id>", "Provider ID for quick setup (e.g., openai-native, anthropic)")
 	.option("-k, --apikey <key>", "API key for the provider")
-	.option("-m, --modelid <id>", "Model ID to configure (e.g., gpt-4o, claude-sonnet-4-6, kimi-k2.5)")
+	.option("-m, --modelid <id>", "Model ID to configure (e.g., gpt-4o, claude-sonnet-4-5-20250929)")
 	.option("-b, --baseurl <url>", "Base URL (optional, only for openai provider)")
 	.option("-v, --verbose", "Show verbose output")
 	.option("-c, --cwd <path>", "Working directory for the task")
@@ -795,6 +795,68 @@ devCommand
 		await openExternal(CLI_LOG_FILE)
 	})
 
+/**
+ * Check if the user has completed onboarding (has any provider configured).
+ *
+ * Uses `welcomeViewCompleted` as the single source of truth, matching the VS Code extension's approach.
+ * If `welcomeViewCompleted` is undefined (first run), checks if ANY provider has credentials
+ * and sets the flag accordingly.
+ */
+async function isAuthConfigured(): Promise<boolean> {
+	const stateManager = StateManager.get()
+
+	// Check welcomeViewCompleted first - this is the single source of truth
+	const welcomeViewCompleted = stateManager.getGlobalStateKey("welcomeViewCompleted")
+	if (welcomeViewCompleted !== undefined) {
+		return welcomeViewCompleted
+	}
+
+	// welcomeViewCompleted is undefined - run migration logic to check if ANY provider has credentials
+	// This mirrors the extension's migrateWelcomeViewCompleted behavior
+	const hasAnyAuth = await checkAnyProviderConfigured()
+
+	// Set welcomeViewCompleted based on what we found
+	stateManager.setGlobalState("welcomeViewCompleted", hasAnyAuth)
+	await stateManager.flushPendingState()
+
+	return hasAnyAuth
+}
+
+/**
+ * Check if ANY provider has valid credentials configured.
+ * Used for migration when welcomeViewCompleted is undefined.
+ */
+async function checkAnyProviderConfigured(): Promise<boolean> {
+	const stateManager = StateManager.get()
+	const config = stateManager.getApiConfiguration() as Record<string, unknown>
+
+	// Check Cline account (stored as "cline:clineAccountId" in secrets, loaded into config)
+	if (config["clineApiKey"] || config["cline:clineAccountId"]) return true
+
+	// Check OpenAI Codex OAuth (stored in SECRETS_KEYS, loaded into config)
+	if (config["openai-codex-oauth-credentials"]) return true
+
+	// Check all BYO provider API keys (loaded into config from secrets)
+	for (const [provider, keyField] of Object.entries(ProviderToApiKeyMap)) {
+		// Skip cline - already checked above with the correct key
+		if (provider === "cline") continue
+
+		const fields = Array.isArray(keyField) ? keyField : [keyField]
+		for (const field of fields) {
+			if (config[field]) return true
+		}
+	}
+
+	// Check provider-specific settings that indicate configuration
+	// (for providers that don't require API keys like Bedrock with IAM, Ollama, LM Studio)
+	if (config.awsRegion) return true
+	if (config.vertexProjectId) return true
+	if (config.ollamaBaseUrl) return true
+	if (config.lmStudioBaseUrl) return true
+
+	return false
+}
+
 /**
  * Validate that a task exists in history
  * @returns The task history item if found, null otherwise
@@ -895,7 +957,7 @@ program
 	.option("-a, --act", "Run in act mode")
 	.option("-p, --plan", "Run in plan mode")
 	.option("-y, --yolo", "Enable yolo mode (auto-approve actions)")
-	.option("-t, --timeout <seconds>", "Optional timeout in seconds (applies only when provided)")
+	.option("-t, --timeout <seconds>", "Timeout in seconds for yolo mode (default: 600)")
 	.option("-m, --model <model>", "Model to use for the task")
 	.option("-v, --verbose", "Show verbose output")
 	.option("-c, --cwd <path>", "Working directory")