Merge branch 'main' into cve-example

* refactor: centralize tool handler registration and filter by allowed tools

- Create centralized toolHandlersMap for all tool handler instantiation
- Add registerToolHandlers method to register only allowed tools from config
- Filter subagent tools to only include allowed tools from allowedTools config
- Remove scattered tool handler registration logic in favor of single source of truth
- Improve maintainability by consolidating tool handler creation in one place

This refactoring ensures subagents only have access to explicitly allowed tools
and makes the tool registration process more maintainable and consistent.

It also improves separation of concerns by having the coordinator manage all tool handler registration, while the executor focuses on orchestration. The allowedTools parameter enables runtime filtering of available tools for different contexts.

Also update PromptRegistry to load synchronous and simplify variant lookup

- Convert async load() to synchronous, called in constructor as both loadVariants and loadComponents are not async functions
- Remove health check logic and loaded state tracking
- Extract getVariant() method with proper generic fallback
- Add getComponents() accessor and simplify component loading
- Convert variant/component loaders from async to synchronous
- Remove unnecessary await calls throughout the codebase
- Add PromptRegistry tests for variant resolution and components

* fix test

* feat: add AgentConfigLoader for file-based agent configs

Add AgentConfigLoader singleton to manage agent configurations loaded from
YAML files in the agents directory. Supports hot-reloading via file watcher,
validates config schema with Zod, and integrates with extension lifecycle
(StateManager initialization and tearDown disposal).

* add tests

* add missing export

* update tests

* feat(tools): implement dynamic tool registration for subagents

Updates the tool system to support dynamically registered subagents as individual tools.

- Modifies `ClineToolSet` to generate specific tool definitions for configured subagents via `AgentConfigLoader`.
- Updates `parseAssistantMessageV2` to use `getToolUseNames()` instead of a static list, enabling the parser to recognize dynamic tool tags.
- Replaces the generic `USE_SUBAGENTS` tool with specific subagent instances when available in the system prompt context.

* update config path and refine tool descriptions

- Relocate the subagent configuration directory from `~/.cline/data/agents` to `~/Documents/Cline/Agents` to improve user accessibility.
- Update subagent tool descriptions and parameter instructions in the system prompt to be more descriptive and helpful for the model.

* revert unrelated changes

* revert unrelated changes

* update unit test

* fix: await AgentConfigLoader initialization before StateManager completes

Ensure agent configs are fully loaded during StateManager initialization
by awaiting the `ready()` promise. Previously, `AgentConfigLoader` was
instantiated without waiting for the initial load to complete, causing
potential race conditions where configs might not be available when
needed.

- Add `initialLoadPromise` field to track the async initial load
- Expose a `ready()` method to allow callers to await initialization
- Await `AgentConfigLoader.getInstance().ready()` in StateManager

* set previousRequestTotalTokens

.changeset/clear-rockets-happen.md

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

.changeset/cuddly-phones-count.md

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

.changeset/endpoint-config-file.md

@@ -1,7 +0,0 @@
----
-"claude-dev": patch
----
-
-Add endpoint configuration file support for on-premise deployments
-
-Enterprise customers can now configure custom API endpoints by creating a `~/.cline/endpoints.json` file with custom URLs for `appBaseUrl`, `apiBaseUrl`, and `mcpBaseUrl`. When this file is present, Cline runs in on-premise mode with the custom endpoints.

.changeset/fix-prevent-infinite-retry-loops.md

@@ -1,7 +0,0 @@
----
-"claude-dev": patch
----
-
-fix: prevent infinite retry loops when replace_in_file fails repeatedly
-
-Add safeguards to prevent the LLM from getting stuck in infinite retry loops when `replace_in_file` operations fail repeatedly. The system now detects repeated failures and provides better guidance to break out of retry cycles.

.changeset/fix-skip-diff-error-during-streaming.md

@@ -1,7 +0,0 @@
----
-"claude-dev": patch
----
-
-fix: skip diff error UI handling during streaming to prevent flickering
-
-Suppress diff view error notifications while content is actively streaming to prevent visual flickering and improve user experience. Error handling is deferred until streaming completes.

.changeset/fix-strip-notebook-outputs.md

@@ -1,7 +0,0 @@
----
-"claude-dev": patch
----
-
-fix(extract-text): strip notebook outputs to reduce context size
-
-Strip notebook cell outputs when extracting text content from Jupyter notebooks, significantly reducing the amount of context sent to the LLM while preserving the essential code and markdown content.

.changeset/fix-throttle-diff-updates.md

@@ -1,7 +0,0 @@
----
-"claude-dev": patch
----
-
-fix: throttle diff view updates during streaming
-
-Add throttling to diff view updates during content streaming to reduce UI flickering and improve performance. Updates are now batched at reasonable intervals instead of firing on every token received.

.changeset/flat-owls-sit.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Disable PostHog telemetry, error tracking, and feature flags in self-hosted mode

.changeset/neat-seals-guess.md

@@ -0,0 +1,5 @@
+---
+"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/remove-zai-glm-4-6.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Remove deprecated zai-glm-4.6 model from Cerebras provider

.changeset/silent-hounds-read.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Make Sonnet 4.5 the default Amazon Bedrock model id

.changeset/small-bugs-complain.md

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

.changeset/tender-berries-search.md

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

.changeset/violet-parrots-tell.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Disable PostHog and build-time OpenTelemetry telemetry in self-hosted/on-premise mode. Enterprise customers running self-hosted deployments will no longer send any telemetry to Cline's collectors. Runtime environment OTEL and remote config OTEL remain available for enterprises to configure their own telemetry collection.

.changeset/wacky-ends-relax.md

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

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

@@ -147,14 +147,29 @@ 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 "PR_BODY" --base main
+gh pr create --title "PR_TITLE" --body-file /tmp/pr-body.md --base main --draft
 ```
 
-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
-```
+**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.
 
 ## Post-Creation
 

.clinerules/general.md

@@ -147,6 +147,17 @@ 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

@@ -0,0 +1,64 @@
+# 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
+```

.codex/environments/environment.toml

@@ -0,0 +1,49 @@
+# 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)"
+'''

.env.example

@@ -16,13 +16,6 @@
 TELEMETRY_SERVICE_API_KEY=your-posthog-telemetry-api-key
 ERROR_SERVICE_API_KEY=your-posthog-error-tracking-api-key
 
-# ============================================================================
-# TELEMETRY PROVIDER CONTROL
-# ============================================================================
-# Control which telemetry providers are active
-POSTHOG_TELEMETRY_ENABLED=true          # Enable PostHog telemetry (default: true)
-                                        # Set to false to disable Telemetry completely
-
 # ============================================================================
 # OPENTELEMETRY (Optional - for advanced telemetry)
 # ============================================================================

.github/CODEOWNERS

@@ -1,3 +1,2 @@
-/docs/
-/.github/   @saoudrizwan @garoth @sjf
-/README.md  @saoudrizwan @nickbaumann98
+/.github/   @saoudrizwan @arafatkatze @maxpaulus43 @candieduniverse
+/README.md  @saoudrizwan @juanpflores

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

@@ -1,173 +0,0 @@
-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

@@ -1,272 +0,0 @@
-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: 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 with a warm thank you 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
-
-            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

@@ -0,0 +1,70 @@
+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"
+          npx tsx evals/smoke-tests/run-smoke-tests.ts --trials 1 --parallel
+
+      - 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-review.yml

@@ -1,312 +0,0 @@
-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: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: "npm"
-
-      - name: Install and Verify Cline CLI
-        run: |
-          npx cline version # verify installation
-
-      - name: Configure Cline with Anthropic
-        run: |
-          npx cline auth --provider anthropic \
-            --apikey "${{ secrets.ANTHROPIC_API_KEY }}" \
-            --modelid claude-opus-4-5-20251101
-
-      - 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 --yolo '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 with a warm thank you 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
-
-          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/e2e.yml

@@ -80,13 +80,16 @@ jobs:
                       playwright-browsers-${{ runner.os }}-
 
             - name: Install root dependencies
-              if: steps.root-cache.outputs.cache-hit != 'true'
               run: npm ci
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Install webview-ui dependencies
-              if: steps.webview-cache.outputs.cache-hit != 'true'
               run: cd webview-ui && npm ci
 
+            - name: Install vsce
+              run: npm install -g @vscode/vsce
+
             - name: Install xvfb on Linux
               if: matrix.runner == 'ubuntu'
               run: sudo apt-get update && sudo apt-get install -y xvfb

.github/workflows/npm-main.yaml

@@ -1,7 +1,7 @@
 name: Publish NPM Release
 
 on:
-  workflow_dispatch:
+  workflow_call:
     inputs:
       confirm_publish:
         description: 'Type "publish" to confirm you want to publish to NPM'
@@ -9,9 +9,10 @@ on:
         type: string
 
 permissions:
-  contents: read
-  checks: write  # Required by test workflow
-  pull-requests: write  # Required by test workflow
+  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
 
 jobs:
   test:
@@ -20,7 +21,7 @@ jobs:
   publish-npm-release:
     needs: test
     name: Publish Cline CLI to NPM
-    if: github.repository == 'cline/cline' && github.ref == 'refs/heads/main' && github.event.inputs.confirm_publish == 'publish'
+    if: github.repository == 'cline/cline' && github.ref == 'refs/heads/main' && inputs.confirm_publish == 'publish'
     runs-on: ubuntu-latest
 
     steps:
@@ -30,32 +31,11 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "24.x"
+          registry-url: "https://registry.npmjs.org"
 
-      # Cache root dependencies
-      - name: Cache root dependencies
-        uses: actions/cache@v4
-        id: root-cache
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
-
-      # Cache cli dependencies
-      - name: Cache cli dependencies
-        uses: actions/cache@v4
-        id: cli-cache
-        with:
-          path: cli/node_modules
-          key: ${{ runner.os }}-npm-cli-${{ hashFiles('cli/package-lock.json') }}
-
-      - name: Install root dependencies
-        if: steps.root-cache.outputs.cache-hit != 'true'
-        run: npm ci --include=optional
-
-      - name: Install cli dependencies
-        if: steps.cli-cache.outputs.cache-hit != 'true'
-        run: cd cli && npm ci
+      - name: Install root dependencies and CLI dependencies
+        run: npm ci --include=optional # this will also install cli deps because "cli" in included in root package.json workspaces field
 
       - name: Generate Protos
         run: npm run protos
@@ -68,10 +48,7 @@ jobs:
           echo "Release version: $VERSION"
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-      - name: Clean previous builds
-        run: rm -rf dist-standalone
-
-      - name: Build and package CLI
+      - name: Build standalone NPM package
         env:
           TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
           ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
@@ -82,7 +59,6 @@ jobs:
           OTEL_EXPORTER_OTLP_PROTOCOL: ${{ secrets.OTEL_EXPORTER_OTLP_PROTOCOL }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.OTEL_EXPORTER_OTLP_HEADERS }}
-          POSTHOG_TELEMETRY_ENABLED: "true"
         run: node scripts/package-npm.mjs
 
       - name: Verify build output
@@ -90,20 +66,25 @@ jobs:
           echo "Checking dist-standalone directory..."
           ls -la dist-standalone/
 
-          echo "Checking dist-standalone/dist..."
-          ls -la dist-standalone/dist/
+          echo "Verifying CLI binaries..."
+          ls -lh cli/bin/cline-* || echo "Warning: CLI binaries not found"
 
           echo "Checking package.json in dist-standalone..."
-          cat dist-standalone/package.json
+          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
           npm publish --tag latest --access public
 
+      - name: Tag release
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git tag "v${{ steps.version.outputs.version }}-cli"
+          git push origin "v${{ steps.version.outputs.version }}-cli"
+
       - name: Summary
         run: |
           echo "✅ Successfully published cline@${{ steps.version.outputs.version }} to NPM with tag 'latest'"

.github/workflows/npm-nightly.yaml

@@ -1,14 +1,19 @@
 name: Publish NPM Nightly
 
 on:
-  schedule:
-    - cron: '0 12 * * *'  # 4 AM PST (UTC-8) = 12 UTC
-  workflow_dispatch:
+  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
 
 permissions:
   contents: read
-  checks: write  # Required by test workflow
-  pull-requests: write  # Required by test workflow
+  id-token: write # Required for npm trusted publishing (OIDC)
+  checks: write # Required by test workflow
+  pull-requests: write # Required by test workflow
 
 jobs:
   test:
@@ -27,6 +32,12 @@ 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
@@ -39,34 +50,12 @@ jobs:
         if: steps.check_commits.outputs.skip != 'true'
         uses: actions/setup-node@v4
         with:
-          node-version: '20.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "24.x"
+          registry-url: "https://registry.npmjs.org"
 
-      # Cache root dependencies
-      - name: Cache root dependencies
+      - name: Install root dependencies and CLI 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') }}
-
-      # Cache cli dependencies
-      - name: Cache cli dependencies
-        if: steps.check_commits.outputs.skip != 'true'
-        uses: actions/cache@v4
-        id: cli-cache
-        with:
-          path: cli/node_modules
-          key: ${{ runner.os }}-npm-cli-${{ hashFiles('cli/package-lock.json') }}
-
-      - name: Install root dependencies
-        if: steps.check_commits.outputs.skip != 'true' && steps.root-cache.outputs.cache-hit != 'true'
-        run: npm ci --include=optional
-
-      - name: Install cli dependencies
-        if: steps.check_commits.outputs.skip != 'true' && steps.cli-cache.outputs.cache-hit != 'true'
-        run: cd cli && npm ci
+        run: npm ci --include=optional # this will also install cli deps because "cli" in included in root package.json workspaces field
 
       - name: Generate Protos
         if: steps.check_commits.outputs.skip != 'true'
@@ -82,7 +71,7 @@ jobs:
           # Generate timestamp (Unix epoch seconds)
           TIMESTAMP=$(date +%s)
 
-          # Create unique nightly version: 2.0.0-nightly.1736365200
+          # Create unique nightly version: 1.0.9-nightly.1736365200
           VERSION="${BASE_VERSION}-nightly.${TIMESTAMP}"
 
           echo "Base version: $BASE_VERSION"
@@ -103,10 +92,6 @@ jobs:
           echo "Using version ${{ steps.version.outputs.version }} for build"
           cat cli/package.json | grep '"version"'
 
-      - name: Clean previous builds
-        if: steps.check_commits.outputs.skip != 'true'
-        run: rm -rf dist-standalone
-
       - name: Build and package CLI
         if: steps.check_commits.outputs.skip != 'true'
         env:
@@ -119,7 +104,6 @@ jobs:
           OTEL_EXPORTER_OTLP_PROTOCOL: ${{ secrets.OTEL_EXPORTER_OTLP_PROTOCOL }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.OTEL_EXPORTER_OTLP_HEADERS }}
-          POSTHOG_TELEMETRY_ENABLED: "true"
         run: node scripts/package-npm.mjs
 
       - name: Verify build output
@@ -128,16 +112,14 @@ jobs:
           echo "Checking dist-standalone directory..."
           ls -la dist-standalone/
 
-          echo "Checking dist-standalone/dist..."
-          ls -la dist-standalone/dist/
+          echo "Verifying CLI binaries..."
+          ls -lh cli/bin/cline-* || echo "Warning: CLI binaries not found"
 
           echo "Checking package.json in dist-standalone..."
-          cat dist-standalone/package.json
+          cat dist-standalone/package.json | grep version
 
       - 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/pack-cli.yml

@@ -0,0 +1,215 @@
+# Build and Pack CLI
+#
+# Builds a CLI tarball from any branch/commit and publishes it as a GitHub Release.
+# Requires write access to the repository (maintainers/collaborators only).
+#
+# Security: Split into two jobs to isolate untrusted build code from write tokens.
+# The build job runs arbitrary ref code with zero permissions. The release job
+# only runs trusted GitHub Actions with write scope.
+#
+# Usage (helper script, auto-detects current branch):
+#   ./scripts/build-cli-artifact.sh
+#   ./scripts/build-cli-artifact.sh feature/my-changes
+#   ./scripts/build-cli-artifact.sh feature/my-changes 1234  # comments on PR
+#
+# Usage (gh CLI directly):
+#   gh workflow run pack-cli.yml -f ref=main
+#   gh workflow run pack-cli.yml -f ref=abc123 -f pr_number=1234
+#
+# Install the built CLI (no auth required):
+#   npm install -g https://github.com/cline/cline/releases/download/cli-build-<sha>/cline-<ver>.tgz
+#
+# Find releases:
+#   gh release list --limit 10
+
+name: Build and Pack CLI
+
+permissions:
+  contents: read
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'Branch, tag, or commit SHA to build (leave empty for default branch)'
+        required: false
+        type: string
+      pr_number:
+        description: 'PR number to comment on with install instructions (optional)'
+        required: false
+        type: number
+
+jobs:
+  # ── Build job: runs untrusted ref code with ZERO permissions ──
+  build:
+    name: Build CLI
+    runs-on: ubuntu-latest
+    permissions: {}
+    outputs:
+      commit_sha: ${{ steps.commit.outputs.sha }}
+      tarball: ${{ steps.pack.outputs.tarball }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}
+          persist-credentials: false
+
+      - name: Get commit SHA
+        id: commit
+        run: |
+          COMMIT_SHA=$(git rev-parse --short HEAD)
+          echo "sha=$COMMIT_SHA" >> $GITHUB_OUTPUT
+          echo "Building from commit: $COMMIT_SHA"
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20.x"
+
+      - name: Install dependencies
+        run: npm ci --include=optional
+
+      - name: Generate Protos
+        run: npm run protos
+
+      - name: Build standalone package
+        run: node scripts/package-npm.mjs
+
+      - name: Create Tarball
+        id: pack
+        run: |
+          cd dist-standalone
+          TARBALL=$(npm pack)
+          echo "tarball=$TARBALL" >> $GITHUB_OUTPUT
+          echo "Created tarball: $TARBALL"
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cli-tarball
+          path: dist-standalone/*.tgz
+
+  # ── Release job: only trusted Actions code, with write permissions ──
+  release:
+    name: Release CLI
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      issues: write
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: cli-tarball
+          path: dist-standalone
+
+      - name: Create GitHub Release
+        id: create_release
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+            const commit = '${{ needs.build.outputs.commit_sha }}';
+            const tarball = '${{ needs.build.outputs.tarball }}';
+
+            // Delete existing release/tag if re-running for the same commit
+            const tagName = `cli-build-${commit}`;
+            try {
+              const existing = await github.rest.repos.getReleaseByTag({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                tag: tagName
+              });
+              await github.rest.repos.deleteRelease({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                release_id: existing.data.id
+              });
+              await github.rest.git.deleteRef({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                ref: `tags/${tagName}`
+              });
+              core.info(`Deleted existing release for ${tagName}`);
+            } catch (e) {
+              // Release doesn't exist yet, that's fine
+            }
+
+            // Create a release
+            const release = await github.rest.repos.createRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              tag_name: tagName,
+              name: `CLI Build (${commit})`,
+              body: `Automated CLI build from commit ${commit}\n\nInstall with:\n\`\`\`bash\nnpm install -g https://github.com/${context.repo.owner}/${context.repo.repo}/releases/download/${tagName}/${tarball}\n\`\`\``,
+              draft: false,
+              prerelease: true
+            });
+
+            // Upload the tarball as a release asset
+            const tarballPath = path.join('dist-standalone', tarball);
+            const tarballData = fs.readFileSync(tarballPath);
+
+            await github.rest.repos.uploadReleaseAsset({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: release.data.id,
+              name: tarball,
+              data: tarballData
+            });
+
+            const downloadUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/releases/download/${tagName}/${tarball}`;
+            core.setOutput('release_url', release.data.html_url);
+            core.setOutput('download_url', downloadUrl);
+
+      - name: Comment on PR with download instructions
+        if: inputs.pr_number != ''
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const commit = '${{ needs.build.outputs.commit_sha }}';
+            const releaseUrl = '${{ steps.create_release.outputs.release_url }}';
+            const downloadUrl = '${{ steps.create_release.outputs.download_url }}';
+            const prNumber = ${{ inputs.pr_number || 0 }};
+            if (!prNumber) return;
+
+            const comment = `## 📦 CLI Build Ready
+
+            A CLI build has been created for commit \`${commit}\`.
+
+            ### Install Directly from URL (No Authentication Required!)
+
+            \`\`\`bash
+            npm install -g ${downloadUrl}
+            \`\`\`
+
+            ### Alternative: Download and Install
+
+            \`\`\`bash
+            curl -L ${downloadUrl} -o cline.tgz
+            npm install -g ./cline.tgz
+            \`\`\`
+
+            📦 [View Release](${releaseUrl})
+            `;
+
+            await github.rest.issues.createComment({
+              issue_number: prNumber,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: comment
+            });
+
+      - name: Summary
+        run: |
+          echo "✅ CLI build complete!"
+          echo ""
+          echo "📦 Release: ${{ steps.create_release.outputs.release_url }}"
+          echo "🔗 Download URL: ${{ steps.create_release.outputs.download_url }}"
+          echo ""
+          echo "Install from anywhere (no authentication required):"
+          echo "  npm install -g ${{ steps.create_release.outputs.download_url }}"

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

@@ -0,0 +1,55 @@
+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,30 +36,14 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  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') }}
+                  # 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
 
             - name: Install root dependencies
-              if: steps.root-cache.outputs.cache-hit != 'true'
               run: npm ci --include=optional
 
             - name: Install webview-ui dependencies
-              if: steps.webview-cache.outputs.cache-hit != 'true'
               run: cd webview-ui && npm ci --include=optional
 
             - name: Install Publishing Tools

.github/workflows/publish.yml

@@ -42,30 +42,12 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  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') }}
+                  node-version: 22
 
             - 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

.github/workflows/test.yml

@@ -28,27 +28,17 @@ jobs:
               uses: actions/setup-node@v4
               with:
                   node-version: 22
-
-            - name: Cache root dependencies
-              uses: actions/cache@v4
-              id: root-cache
-              with:
-                  path: node_modules
-                  key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
-
-            - 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') }}
+                  cache: 'npm'
+                  cache-dependency-path: |
+                      package-lock.json
+                      webview-ui/package-lock.json
 
             - name: Install root dependencies
-              if: steps.root-cache.outputs.cache-hit != 'true'
               run: npm ci
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Install webview-ui dependencies
-              if: steps.webview-cache.outputs.cache-hit != 'true'
               run: cd webview-ui && npm ci
 
             - name: Run Quality Checks (Parallel)
@@ -73,27 +63,17 @@ jobs:
               uses: actions/setup-node@v4
               with:
                   node-version: 22
-
-            - name: Cache root dependencies
-              uses: actions/cache@v4
-              id: root-cache
-              with:
-                  path: node_modules
-                  key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
-
-            - 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') }}
+                  cache: 'npm'
+                  cache-dependency-path: |
+                      package-lock.json
+                      webview-ui/package-lock.json
 
             - name: Install root dependencies
-              if: steps.root-cache.outputs.cache-hit != 'true'
               run: npm ci
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Install webview-ui dependencies
-              if: steps.webview-cache.outputs.cache-hit != 'true'
               run: cd webview-ui && npm ci
 
             - name: Set up NPM on Windows
@@ -135,6 +115,11 @@ jobs:
                   cd webview-ui
                   npm run test:coverage
 
+            - name: CLI Tests
+              id: cli_tests
+              if: ${{ !cancelled() && steps.build_step.outcome == 'success' }}
+              run: cd cli && npm run test:run
+
             - name: Save Coverage Reports
               uses: actions/upload-artifact@v4
               # Only upload artifacts on Linux - We only need coverage from one OS
@@ -156,35 +141,18 @@ jobs:
               uses: actions/setup-node@v4
               with:
                   node-version: 22
-                  
-            - name: Cache root dependencies
-              uses: actions/cache@v4
-              id: root-cache
-              with:
-                  path: node_modules
-                  key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
-
-            - 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') }}
-
-            # Cache testing-platform dependencies
-            - name: Cache testing-platform dependencies
-              uses: actions/cache@v4
-              id: testing-platform-cache
-              with:
-                path: testing-platform/node_modules
-                key: ${{ runner.os }}-npm-testing-platform-${{ hashFiles('testing-platform/package-lock.json') }}
+                  cache: 'npm'
+                  cache-dependency-path: |
+                      package-lock.json
+                      webview-ui/package-lock.json
+                      testing-platform/package-lock.json
 
             - name: Install root dependencies
-              if: steps.root-cache.outputs.cache-hit != 'true'
               run: npm ci
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Install webview-ui dependencies
-              if: steps.webview-cache.outputs.cache-hit != 'true'
               run: cd webview-ui && npm ci
 
             - name: Download ripgrep binaries
@@ -194,17 +162,11 @@ jobs:
               run: npm run compile-standalone
 
             - name: Install testing platform dependencies
-              if: steps.testing-platform-cache.outputs.cache-hit != 'true'
               run: cd testing-platform && npm ci
 
             - name: Running testing platform integration spec tests
-              continue-on-error: true
               timeout-minutes: 7
-              # Temporarily wrapping the test command to always return a neutral exit code.
-              # This prevents the job from showing as failed and avoids distracting developers
-              # until the integration tests are ready to be enforced.
-              run: |
-                npm run test:tp-orchestrator -- tests/specs/ --count=1 --coverage
+              run: npm run test:tp-orchestrator -- tests/specs/ --count=1 --coverage
 
             - name: Save Coverage Reports
               uses: actions/upload-artifact@v4

.gitignore

@@ -38,6 +38,7 @@ coverage-unit
 src/generated/
 src/shared/proto/
 webview-ui/src/services/grpc-client.ts
+*.tsbuildinfo
 
 # E2E Tests
 test-results
@@ -47,3 +48,6 @@ test-results
 .secrets
 
 *.tsbuildinfo
+
+# Smoke test results (generated)
+evals/smoke-tests/results/

.gitmodules

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

.vscode/launch.json

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

CHANGELOG.md

@@ -1,14 +1,178 @@
 # Changelog
 
+## [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
+
+- Fixed Opus 4.6 for bedrock provider
+
+## [3.57.0]
+
+### Added
+
+- Cline CLI 2.0 now available. Install with `npm install -g cline`
+- 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
+
+### Fixed
+
+- Fix read file tool to support reading large files
+- Fix decimal input crash in OpenAI Compatible price fields (#8129)
+- Fix build complete handlers when updating the api config
+- Fixed missing provider from list
+- Fixed Favorite Icon / Star from getting clipped in the task history view
+
+### Changed
+
+- Make skills always enabled and remove feature toggle setting
+
+## [3.56.0]
+
+### 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
+
+### 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
+
+### 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
+
+## [3.55.0]
+
+- Add new model: Arcee Trinity Large Preview
+- Add new model: Moonshot Kimi K2.5
+- Add MCP prompts support - prompts from connected MCP servers now appear in slash command autocomplete as `/mcp:<server>:<prompt>`
+
+## [3.54.0]
+
+### Added
+
+- Native tool calls support for Ollama provider
+- Sonnet 4.5 is now the default Amazon Bedrock model id
+
+### Fixed
+
+- Prevent infinite retry loops when replace_in_file fails repeatedly. The system now detects repeated failures and provides better guidance to break out of retry cycles.
+- Skip diff error UI handling during streaming to prevent flickering. Error handling is deferred until streaming completes.
+- Strip notebook cell outputs when extracting text content from Jupyter notebooks, significantly reducing context size sent to the LLM.
+- Throttle diff view updates during streaming to reduce UI flickering and improve performance.
+
+### Changed
+
+- Removed Mistral's Devstral-2512 free from the free models list
+- Removed deprecated zai-glm-4.6 model from Cerebras provider
+
 ## [3.53.1]
 
 ### Fixed
- - Bug in responses API
+
+- Bug in responses API
 
 ## [3.53.0]
 
 ### Fixed
- - Removed grok model from free tier
+
+- Removed grok model from free tier
 
 ## [3.52.0]
 

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2025 Cline Bot Inc.
+   Copyright 2026 Cline Bot Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -148,4 +148,4 @@ Get the same Cline experience with enterprise-grade controls: SSO (SAML/OIDC), g
 
 ## License
 
-[Apache 2.0 © 2025 Cline Bot Inc.](./LICENSE)
+[Apache 2.0 © 2026 Cline Bot Inc.](./LICENSE)

SECURITY.md

@@ -0,0 +1,27 @@
+# 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.

assets/icons/social/discord.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.317 4.15557C18.7873 3.45369 17.147 2.93658 15.4319 2.6404C15.4007 2.63469 15.3695 2.64897 15.3534 2.67754C15.1424 3.05276 14.9087 3.54225 14.7451 3.927C12.9004 3.65083 11.0652 3.65083 9.25832 3.927C9.09465 3.5337 8.85248 3.05276 8.64057 2.67754C8.62449 2.64992 8.59328 2.63564 8.56205 2.6404C6.84791 2.93563 5.20756 3.45275 3.67693 4.15557C3.66368 4.16129 3.65233 4.17082 3.64479 4.18319C0.533392 8.83155 -0.31895 13.3657 0.0991801 17.8436C0.101072 17.8655 0.11337 17.8864 0.130398 17.8997C2.18321 19.4073 4.17171 20.3225 6.12328 20.9291C6.15451 20.9386 6.18761 20.9272 6.20748 20.9015C6.66913 20.2711 7.08064 19.6063 7.43348 18.9073C7.4543 18.8664 7.43442 18.8178 7.39186 18.8016C6.73913 18.554 6.1176 18.2521 5.51973 17.9093C5.47244 17.8816 5.46865 17.814 5.51216 17.7816C5.63797 17.6873 5.76382 17.5893 5.88396 17.4902C5.90569 17.4721 5.93598 17.4683 5.96153 17.4797C9.88928 19.273 14.1415 19.273 18.023 17.4797C18.0485 17.4674 18.0788 17.4712 18.1015 17.4893C18.2216 17.5883 18.3475 17.6873 18.4742 17.7816C18.5177 17.814 18.5149 17.8816 18.4676 17.9093C17.8697 18.2588 17.2482 18.554 16.5945 18.8006C16.552 18.8168 16.533 18.8664 16.5538 18.9073C16.9143 19.6054 17.3258 20.2701 17.7789 20.9005C17.7978 20.9272 17.8319 20.9386 17.8631 20.9291C19.8241 20.3225 21.8126 19.4073 23.8654 17.8997C23.8834 17.8864 23.8948 17.8664 23.8967 17.8445C24.3971 12.6676 23.0585 8.17064 20.3482 4.18414C20.3416 4.17082 20.3303 4.16129 20.317 4.15557ZM8.02002 15.117C6.8375 15.117 5.86313 14.0313 5.86313 12.6981C5.86313 11.3648 6.8186 10.2791 8.02002 10.2791C9.23087 10.2791 10.1958 11.3743 10.1769 12.6981C10.1769 14.0313 9.22141 15.117 8.02002 15.117ZM15.9947 15.117C14.8123 15.117 13.8379 14.0313 13.8379 12.6981C13.8379 11.3648 14.7933 10.2791 15.9947 10.2791C17.2056 10.2791 18.1705 11.3743 18.1516 12.6981C18.1516 14.0313 17.2056 15.117 15.9947 15.117Z" fill="#FAFAFA"/>
+</svg>

assets/icons/social/github.svg

@@ -0,0 +1,3 @@
+        <svg viewBox="0 0 24 24" fill="black" xmlns="http://www.w3.org/2000/svg">
+          <path d="M12 2C6.477 2 2 6.477 2 12C2 16.418 4.865 20.166 8.84 21.49C9.34 21.58 9.52 21.27 9.52 21C9.52 20.77 9.51 20.14 9.51 19.31C6.73 19.91 6.14 17.97 6.14 17.97C5.68 16.81 5.03 16.5 5.03 16.5C4.12 15.88 5.1 15.9 5.1 15.9C6.1 15.97 6.63 16.93 6.63 16.93C7.5 18.45 8.97 18 9.54 17.76C9.63 17.11 9.89 16.67 10.17 16.42C7.95 16.17 5.62 15.31 5.62 11.5C5.62 10.39 6 9.5 6.65 8.79C6.55 8.54 6.2 7.5 6.75 6.15C6.75 6.15 7.59 5.88 9.5 7.17C10.29 6.95 11.15 6.84 12 6.84C12.85 6.84 13.71 6.95 14.5 7.17C16.41 5.88 17.25 6.15 17.25 6.15C17.8 7.5 17.45 8.54 17.35 8.79C18 9.5 18.38 10.39 18.38 11.5C18.38 15.32 16.04 16.16 13.81 16.41C14.17 16.72 14.5 17.33 14.5 18.26C14.5 19.6 14.49 20.68 14.49 21C14.49 21.27 14.67 21.59 15.17 21.49C19.14 20.16 22 16.42 22 12C22 6.477 17.523 2 12 2Z" fill="white"/>
+        </svg>

assets/icons/social/linkedin.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2001_1428)">
+<path d="M22.2234 0H1.77187C0.792187 0 0 0.773438 0 1.72969V22.2656C0 23.2219 0.792187 24 1.77187 24H22.2234C23.2031 24 24 23.2219 24 22.2703V1.72969C24 0.773438 23.2031 0 22.2234 0ZM7.12031 20.4516H3.55781V8.99531H7.12031V20.4516ZM5.33906 7.43438C4.19531 7.43438 3.27188 6.51094 3.27188 5.37187C3.27188 4.23281 4.19531 3.30937 5.33906 3.30937C6.47813 3.30937 7.40156 4.23281 7.40156 5.37187C7.40156 6.50625 6.47813 7.43438 5.33906 7.43438ZM20.4516 20.4516H16.8937V14.8828C16.8937 13.5562 16.8703 11.8453 15.0422 11.8453C13.1906 11.8453 12.9094 13.2937 12.9094 14.7891V20.4516H9.35625V8.99531H12.7687V10.5609H12.8156C13.2891 9.66094 14.4516 8.70938 16.1813 8.70938C19.7859 8.70938 20.4516 11.0813 20.4516 14.1656V20.4516Z" fill="#FAFAFA"/>
+</g>
+<defs>
+<clipPath id="clip0_2001_1428">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

assets/icons/social/reddit.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.0512 4.07466C15.3113 5.17727 16.301 5.99866 17.4829 5.99866C18.8627 5.99866 19.9813 4.87965 19.9813 3.49933C19.9813 2.11902 18.8627 1 17.4829 1C16.2764 1 15.2703 1.85537 15.036 2.99314C13.0155 3.20991 11.4378 4.92417 11.4378 7.00167C11.4378 7.00636 11.4378 7.00988 11.4378 7.01456C9.24041 7.10713 7.23397 7.73284 5.641 8.72062C5.04949 8.26247 4.30688 7.98945 3.50102 7.98945C1.5672 7.98945 0 9.55725 0 11.4918C0 12.8955 0.824597 14.1048 2.01581 14.6637C2.13177 18.7297 6.56047 22 12.0082 22C17.4559 22 21.8905 18.7261 22.0006 14.6567C23.1824 14.0942 24 12.8885 24 11.493C24 9.55842 22.4328 7.99063 20.499 7.99063C19.6966 7.99063 18.9575 8.2613 18.3672 8.71594C16.7602 7.72113 14.7315 7.09541 12.5119 7.01222C12.5119 7.0087 12.5119 7.00636 12.5119 7.00285C12.5119 5.51473 13.6176 4.27971 15.0512 4.077V4.07466ZM5.50044 13.7146C5.559 12.4444 6.40234 11.4695 7.38272 11.4695C8.3631 11.4695 9.11274 12.4995 9.05417 13.7697C8.99561 15.0398 8.26354 15.5015 7.28199 15.5015C6.30044 15.5015 5.44187 14.9848 5.50044 13.7146ZM16.6348 11.4695C17.6164 11.4695 18.4597 12.4444 18.5171 13.7146C18.5757 14.9848 17.716 15.5015 16.7356 15.5015C15.7552 15.5015 15.022 15.041 14.9634 13.7697C14.9048 12.4995 15.6533 11.4695 16.6348 11.4695ZM15.4682 16.6533C15.6521 16.6721 15.7693 16.8631 15.6978 17.0341C15.0946 18.4766 13.6703 19.4901 12.0082 19.4901C10.3461 19.4901 8.92299 18.4766 8.31859 17.0341C8.24714 16.8631 8.36427 16.6721 8.54817 16.6533C9.62577 16.5444 10.7912 16.4846 12.0082 16.4846C13.2252 16.4846 14.3895 16.5444 15.4682 16.6533Z" fill="#FAFAFA"/>
+</svg>

assets/icons/social/x.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.3263 1.90393H21.6998L14.3297 10.3274L23 21.7899H16.2112L10.894 14.838L4.80995 21.7899H1.43443L9.31743 12.78L1 1.90393H7.96111L12.7674 8.25826L18.3263 1.90393ZM17.1423 19.7707H19.0116L6.94539 3.81706H4.93946L17.1423 19.7707Z" fill="#FAFAFA"/>
+</svg>

biome.jsonc

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://biomejs.dev/schemas/2.1.4/schema.json",
+	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
 	"vcs": {
 		"enabled": true,
 		"clientKind": "git",
@@ -28,19 +28,19 @@
 		"rules": {
 			"recommended": true,
 			"correctness": {
-				"useExhaustiveDependencies": "off",
+				"useExhaustiveDependencies": "info",
 				"noUndeclaredVariables": "off",
-				"noEmptyPattern": "off",
+				"noEmptyPattern": "info",
 				"useJsxKeyInIterable": "off",
 				"noInnerDeclarations": "off",
-				"useHookAtTopLevel": "off",
-				"useYield": "off",
+				"useHookAtTopLevel": "info",
+				"useYield": "info",
 				"noConstructorReturn": "off",
 				"noInvalidPositionAtImportRule": "off",
 				"noSwitchDeclarations": "off",
 				"noUnusedImports": "error"
 			},
-			"a11y": "off",
+			"a11y": "info",
 			"style": {
 				"useNodejsImportProtocol": "off",
 				"useImportType": "off",
@@ -51,35 +51,36 @@
 				"noParameterAssign": "off",
 				"useAsConstAssertion": "off",
 				"useDefaultParameterLast": "off",
-				"noNonNullAssertion": "off",
+				"noNonNullAssertion": "info",
 				"useEnumInitializers": "off",
-				"useSelfClosingElements": "off",
+				"useSelfClosingElements": "info",
 				"useSingleVarDeclarator": "off",
-				"useNumberNamespace": "off",
-				"noInferrableTypes": "off",
-				"useTemplate": "off",
-				"noUselessElse": "off"
+				"useNumberNamespace": "info",
+				"noInferrableTypes": "info",
+				"useTemplate": "info",
+				"noUselessElse": "info"
 			},
 			"suspicious": {
 				"noDoubleEquals": "warn",
 				"noImplicitAnyLet": "info",
 				"noThenProperty": "off",
-				"noAsyncPromiseExecutor": "off",
+				"noAsyncPromiseExecutor": "info",
 				"noImportAssign": "off",
-				"noExplicitAny": "off",
-				"noControlCharactersInRegex": "off",
+				"noExplicitAny": "info",
+				"noControlCharactersInRegex": "warn",
 				"noShadowRestrictedNames": "off",
 				"noArrayIndexKey": "info",
-				"noAssignInExpressions": "info"
+				"noAssignInExpressions": "info",
+				"useIterableCallbackReturn": "info"
 			},
 			"complexity": {
-				"noUselessConstructor": "off",
-				"useOptionalChain": "off",
-				"noBannedTypes": "off",
-				"useLiteralKeys": "off",
-				"noUselessCatch": "off",
-				"noUselessSwitchCase": "off",
-				"noStaticOnlyClass": "off"
+				"noUselessConstructor": "info",
+				"useOptionalChain": "info",
+				"noBannedTypes": "warn",
+				"useLiteralKeys": "info",
+				"noUselessCatch": "info",
+				"noUselessSwitchCase": "info",
+				"noStaticOnlyClass": "info"
 			},
 			"security": {
 				"noDangerouslySetInnerHtml": "info"
@@ -94,6 +95,11 @@
 		"lineEnding": "lf",
 		"formatWithErrors": true
 	},
+	"css": {
+		"parser": {
+			"tailwindDirectives": true
+		}
+	},
 	"javascript": {
 		"formatter": {
 			"semicolons": "asNeeded",
@@ -112,19 +118,21 @@
 		}
 	},
 	"files": {
+		"ignoreUnknown": true,
 		"includes": [
 			"**",
-			"!**/dist",
-			"!**/dist-*",
-			"!**/out",
-			"!**/evals",
-			"!**/playwright",
-			"!**/test-results",
-			"!**/node_modules",
-			"!**/webview-ui/build",
-			"!**/generated",
-			"!**/proto",
-			"!**/tests/specs"
+			// explicitly force files to be ignored by the scanner with !!
+			"!!**/dist",
+			"!!**/dist-*",
+			"!!**/out",
+			"!!**/evals",
+			"!!**/playwright",
+			"!!**/test-results",
+			"!!**/node_modules",
+			"!!**/webview-ui/build",
+			"!!**/generated",
+			"!!**/proto",
+			"!!**/tests/specs"
 		]
 	},
 	"plugins": [
@@ -134,14 +142,15 @@
 		{
 			"includes": [
 				"**",
-				"!**/hosts/vscode/**",
-				"!**/test/**",
-				"!**/*.test.ts",
-				"!src/dev/**",
-				"!src/extension.ts",
-				"!src/integrations/git/commit-message-generator.ts",
-				"!src/integrations/terminal/**",
-				"!src/core/controller/ui/openWalkthrough.ts"
+				"!!**/dist",
+				"!!**/hosts/vscode/**",
+				"!!**/test/**",
+				"!!**/*.test.ts",
+				"!!src/dev/**",
+				"!!src/extension.ts",
+				"!!src/integrations/git/commit-message-generator.ts",
+				"!!src/integrations/terminal/**",
+				"!!src/core/controller/ui/openWalkthrough.ts"
 			],
 			"plugins": [
 				"src/dev/grit/vscode-api.grit"
@@ -154,36 +163,37 @@
 			],
 			"includes": [
 				"**",
-				"!**/esbuild.*",
-				"!**/*.mts",
-				"!**/webview-ui/**",
-				"!**/evals/**",
-				"!**/standalone/**",
-				"!**/e2e/**",
-				"!**/test/**",
-				"!**/__tests__/**",
-				"!**/*.test.ts",
-				"!**/*.stories.ts",
-				"!src/dev/**",
-				"!**/*.mjs",
-				"!**/*.js",
-				"!**/scripts/**",
-				"!**/*.tsx",
-				"!**/testing-platform/**",
+				"!!**/esbuild.*",
+				"!!**/*.mts",
+				"!!**/webview-ui/**",
+				"!!**/evals/**",
+				"!!**/standalone/**",
+				"!!**/cli/**",
+				"!!**/e2e/**",
+				"!!**/test/**",
+				"!!**/__tests__/**",
+				"!!**/*.test.ts",
+				"!!**/*.stories.ts",
+				"!!src/dev/**",
+				"!!**/*.mjs",
+				"!!**/*.js",
+				"!!**/scripts/**",
+				"!!**/*.tsx",
+				"!!**/testing-platform/**",
 				// ACP mode must redirect console to stderr - this is intentional
-				"!cli/src/acp/index.ts"
+				"!!cli/src/acp/index.ts"
 			]
 		},
 		{
 			"includes": [
 				"**",
-				"!src/core/storage/state-migrations.ts",
-				"!src/core/storage/FileContextTracker.ts",
-				"!src/core/context/context-tracking/FileContextTracker.ts",
-				"!src/common.ts",
-				"!src/services/logging/distinctId.ts",
-				"!src/core/storage/utils/state-helpers.ts",
-				"!src/extension.ts"
+				"!!src/core/storage/state-migrations.ts",
+				"!!src/core/storage/FileContextTracker.ts",
+				"!!src/core/context/context-tracking/FileContextTracker.ts",
+				"!!src/common.ts",
+				"!!src/services/logging/distinctId.ts",
+				"!!src/core/storage/utils/state-helpers.ts",
+				"!!src/extension.ts"
 			],
 			"plugins": [
 				"src/dev/grit/use-cache-service.grit"

cli/CHANGELOG.md

@@ -0,0 +1,105 @@
+# cline
+
+## 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/DEVELOPMENT.md

@@ -0,0 +1,365 @@
+# Cline CLI
+
+The official CLI for Cline. Run Cline tasks directly from the terminal with the same underlying functionality as the VS Code extension.
+
+## Features
+
+- **Reuses Core Codebase**: Shares the same Controller, Task, and API handling as the VS Code extension
+- **Terminal Output**: Displays Cline messages directly in your terminal with colored output
+- **Task History**: Access your task history from the command line
+- **Configurable**: Use custom configuration directories and working directories
+- **Image Support**: Attach images to your prompts using file paths or inline references
+
+## Prerequisites
+
+- Node.js 20.x or later
+- npm or yarn
+- The parent Cline project dependencies installed
+
+## Installation
+
+From the repository root:
+
+```bash
+# Install all dependencies first
+npm run install:all
+
+# Ensure protos are generated
+npm run protos
+
+# Build and link the CLI globally
+npm run cli:link
+```
+
+## Usage
+
+### Interactive Mode (Default)
+
+When you run `cline` without any command, it launches an interactive welcome prompt:
+
+```bash
+# Launch interactive mode
+cline
+
+# Or run a task directly
+cline "Create a hello world function in Python"
+
+# With options
+cline -v --thinking "Analyze this codebase"
+```
+
+### Commands
+
+#### `task` (alias: `t`)
+
+Run a new task with a prompt.
+
+```bash
+cline task "Create a hello world function in Python"
+cline t "Create a hello world function"
+```
+
+**Options:**
+
+| Option | Description |
+|--------|-------------|
+| `-a, --act` | Run in act mode |
+| `-p, --plan` | Run in plan mode |
+| `-y, --yolo` | Enable yolo mode (auto-approve actions) |
+| `-m, --model <model>` | Model to use for the task |
+| `-i, --images <paths...>` | Image file paths to include with the task |
+| `-v, --verbose` | Show verbose output including reasoning |
+| `-c, --cwd <path>` | Working directory for the task |
+| `--config <path>` | Path to Cline configuration directory |
+| `-t, --thinking` | Enable extended thinking (1024 token budget) |
+
+**Examples:**
+
+```bash
+# Run in plan mode with verbose output
+cline task -p -v "Design a REST API"
+
+# Use a specific model with yolo mode
+cline task -m claude-sonnet-4-5-20250929 -y "Refactor this function"
+
+# Include images with your prompt
+cline task -i screenshot.png diagram.jpg "Fix the UI based on these images"
+
+# Or use inline image references in the prompt
+cline task "Fix the layout shown in @./screenshot.png"
+
+# Enable extended thinking for complex tasks
+cline task -t "Architect a microservices system"
+
+# Specify working directory
+cline task -c /path/to/project "Add unit tests"
+```
+
+#### `history` (alias: `h`)
+
+List task history with pagination support.
+
+```bash
+cline history
+cline h
+```
+
+**Options:**
+
+| Option | Description |
+|--------|-------------|
+| `-n, --limit <number>` | Number of tasks to show (default: 10) |
+| `-p, --page <number>` | Page number, 1-based (default: 1) |
+| `--config <path>` | Path to Cline configuration directory |
+
+**Examples:**
+
+```bash
+# Show last 10 tasks (default)
+cline history
+
+# Show 20 tasks
+cline history -n 20
+
+# Show page 2 with 5 tasks per page
+cline history -n 5 -p 2
+```
+
+#### `config`
+
+Show current configuration including global and workspace state.
+
+```bash
+cline config
+```
+
+**Options:**
+
+| Option | Description |
+|--------|-------------|
+| `--config <path>` | Path to Cline configuration directory |
+
+#### `auth`
+
+Authenticate a provider and configure what model is used.
+
+```bash
+cline auth
+```
+
+**Options:**
+
+| Option | Description |
+|--------|-------------|
+| `-p, --provider <id>` | Provider ID for quick setup (e.g., openai-native, anthropic) |
+| `-k, --apikey <key>` | API key for the provider |
+| `-m, --modelid <id>` | Model ID to configure (e.g., gpt-4o, claude-sonnet-4-5-20250929) |
+| `-b, --baseurl <url>` | Base URL (optional, only for openai provider) |
+| `-v, --verbose` | Show verbose output |
+| `-c, --cwd <path>` | Working directory for the task |
+| `--config <path>` | Path to Cline configuration directory |
+
+**Examples:**
+
+```bash
+# Interactive authentication
+cline auth
+
+# Quick setup with provider and API key
+cline auth -p anthropic -k sk-ant-xxxxx
+
+# Full quick setup with model
+cline auth -p openai-native -k sk-xxxxx -m gpt-4o
+
+# OpenAI-compatible provider with custom base URL
+cline auth -p openai -k your-api-key -b https://api.example.com/v1
+```
+
+### Global Options
+
+These options are available for the default command (running a task directly):
+
+| Option | Description |
+|--------|-------------|
+| `-v, --verbose` | Show verbose output |
+| `-c, --cwd <path>` | Working directory |
+| `--config <path>` | Configuration directory |
+| `--thinking` | Enable extended thinking (1024 token budget) |
+
+## Development
+
+### Quick Start
+
+```bash
+# 1. Install all dependencies (root, webview-ui, cli)
+npm run install:all
+
+# 2. Build and link globally so you can run `cline` from anywhere
+npm run cli:link
+
+# 3. Test it
+cline --help
+```
+
+### Scripts
+
+Run these from the repository root:
+
+| Script | Description |
+|--------|-------------|
+| `npm run install:all` | Install deps for root, webview-ui, and cli |
+| `npm run cli:build` | Generate protos and build CLI |
+| `npm run cli:build:production` | Production build (minified) |
+| `npm run cli:link` | Build and `npm link` so you can run `cline` from anywhere |
+| `npm run cli:unlink` | Remove the global `cline` symlink |
+| `npm run cli:dev` | Link + watch mode for development |
+| `npm run cli:watch` | Watch mode only (no initial build) |
+| `npm run cli:test` | Run CLI tests |
+
+### Development Workflow
+
+1. Run `npm run cli:dev` - this links the CLI globally and starts watch mode
+2. Make changes to files in `cli/src/`
+3. The build automatically rebuilds on save
+4. Test your changes by running `cline` in another terminal
+5. When done, run `npm run cli:unlink` to clean up
+
+### Proto Generation
+
+The CLI uses proto-generated types for message passing (same as the VS Code extension). If you modify any `.proto` files, run:
+
+```bash
+npm run protos
+```
+
+This generates TypeScript types in `src/generated/` that both the CLI and extension use.
+
+## Publish
+
+#### 1. Publish to npm
+```bash
+npm publish
+```
+
+#### 2. Update the Homebrew formula
+```bash
+npm run update-brew-formula
+```
+
+#### 3. Test the formula locally
+```bash
+# Create a local tap
+brew tap-new cline/local
+cp ./cli/cline.rb "$(brew --repository)/Library/Taps/cline/homebrew-local/Formula/cline.rb"
+
+# Build from Source
+brew install --build-from-source cline/local/cline
+
+# Install from your local tap
+brew install cline/local/cline
+
+# Clean up when done
+brew untap cline/local
+```
+
+#### 4. If using a tap, commit and push
+```bash
+git add cline.rb
+git commit -m "Update cline to v2.0.0"
+git push
+```
+
+## Architecture
+
+### How It Works
+
+The CLI directly imports and reuses the core Cline TypeScript codebase (the same code that powers the VS Code extension). This means feature parity is easy to maintain - when core gets updated, the CLI automatically benefits.
+
+```
+┌─────────────────────────────────────────────────────────┐
+│                     CLI (cli/)                          │
+│  - React Ink terminal UI                                │
+│  - Command parsing (commander)                          │
+│  - Terminal-specific adapters                           │
+└─────────────────────────────────────────────────────────┘
+                          │
+                          │ direct imports
+                          ▼
+┌─────────────────────────────────────────────────────────┐
+│                  Core (src/core/)                       │
+│  - Controller: task lifecycle, state management         │
+│  - Task: AI API calls, tool execution                   │
+│  - StateManager: persistent storage                     │
+│  - Proto types: message definitions                     │
+└─────────────────────────────────────────────────────────┘
+```
+
+Unlike a client-server architecture, the CLI runs everything in a single Node.js process. The "host bridge" pattern provides terminal-appropriate implementations for things the VS Code extension would handle differently (clipboard, file dialogs, etc.).
+
+### Key Files
+
+| File | Purpose |
+|------|---------|
+| `src/index.ts` | Entry point, command definitions |
+| `src/components/App.tsx` | Main React Ink app |
+| `src/components/ChatView.tsx` | Task conversation UI |
+| `src/controllers/CliWebviewProvider.ts` | Bridges core messages to terminal output |
+| `src/vscode-context.ts` | Mock VS Code extension context for core compatibility |
+| `src/vscode-shim.ts` | Shims for VS Code APIs that core depends on |
+| `src/constants/colors.ts` | Terminal color definitions |
+
+### React Ink
+
+The CLI uses [React Ink](https://github.com/vadimdemedes/ink) for its terminal UI. This lets us build the interface with React components that render to the terminal. Key patterns:
+
+- Components in `src/components/` render terminal UI
+- Hooks in `src/hooks/` manage terminal-specific state (size, scrolling)
+- The `useStateSubscriber` hook subscribes to core state changes
+
+## Configuration
+
+The CLI stores its data in `~/.cline/data/` by default:
+
+- `globalState.json`: Global settings and state
+- `secrets.json`: API keys and secrets
+- `workspace/`: Workspace-specific state
+- `tasks/`: Task history and conversation data
+
+Override with the `--config` option or `CLINE_DIR` environment variable.
+
+## Troubleshooting
+
+### Build Errors
+
+If you encounter build errors:
+
+```bash
+# Make sure all deps are installed
+npm run install:all
+
+# Regenerate proto types
+npm run protos
+
+# Then rebuild
+npm run cli:build
+```
+
+### "command not found: cline"
+
+The CLI isn't linked globally. Run:
+
+```bash
+npm run cli:link
+```
+
+### Changes Not Reflected
+
+If your code changes aren't showing up:
+
+1. Make sure watch mode is running (`npm run cli:dev`)
+2. Check for TypeScript errors in the watch output
+3. Try unlinking and relinking: `npm run cli:unlink && npm run cli:link`
+
+### Import Errors from Core
+
+The CLI imports from `@core/`, `@shared/`, etc. These paths are defined in the root `tsconfig.json`. If you see import errors, make sure you're building from the repo root, not from inside `cli/`.

cli/README.md

@@ -1,365 +1,81 @@
-# Cline CLI
+# Cline
 
-The official CLI for Cline. Run Cline tasks directly from the terminal with the same underlying functionality as the VS Code extension.
+<p align="center">
+  <img src="https://github.com/user-attachments/assets/7123f9d1-afeb-48d5-93fa-e750dec0ebba" width="70%" />
+</p>
 
-## Features
+<div align="center">
+<table>
+<tbody>
+<td align="center">
+<a href="https://www.npmjs.com/package/cline" target="_blank"><strong>NPM</strong></a>
+</td>
+<td align="center">
+<a href="https://discord.gg/cline" target="_blank"><strong>Discord</strong></a>
+</td>
+<td align="center">
+<a href="https://www.reddit.com/r/cline/" target="_blank"><strong>r/cline</strong></a>
+</td>
+<td align="center">
+<a href="https://github.com/cline/cline/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+Requests%22+sort%3Atop" target="_blank"><strong>Feature Requests</strong></a>
+</td>
+<td align="center">
+<a href="https://docs.cline.bot/getting-started/for-new-coders" target="_blank"><strong>Getting Started</strong></a>
+</td>
+</tbody>
+</table>
+</div>
 
-- **Reuses Core Codebase**: Shares the same Controller, Task, and API handling as the VS Code extension
-- **Terminal Output**: Displays Cline messages directly in your terminal with colored output
-- **Task History**: Access your task history from the command line
-- **Configurable**: Use custom configuration directories and working directories
-- **Image Support**: Attach images to your prompts using file paths or inline references
+Meet Cline, an AI assistant that lives in your terminal.
 
-## Prerequisites
-
-- Node.js 20.x or later
-- npm or yarn
-- The parent Cline project dependencies installed
-
-## Installation
-
-From the repository root:
+Cline can handle complex software development tasks step-by-step. With tools that let him create & edit files, explore large projects, use the browser, and execute terminal commands (after you grant permission), he can assist you in ways that go beyond code completion or tech support.
 
 ```bash
-# Install all dependencies first
-npm run install:all
+npm i -g cline
 
-# Ensure protos are generated
-npm run protos
-
-# Build and link the CLI globally
-npm run cli:link
-```
-
-## Usage
-
-### Interactive Mode (Default)
-
-When you run `cline` without any command, it launches an interactive welcome prompt:
-
-```bash
-# Launch interactive mode
+# cd into your project and run:
 cline
-
-# Or run a task directly
-cline "Create a hello world function in Python"
-
-# With options
-cline -v --thinking "Analyze this codebase"
 ```
 
-### Commands
+> Move your mouse around under the Cline icon for a surprise!
 
-#### `task` (alias: `t`)
+---
 
-Run a new task with a prompt.
+<img align="right" width="340" src="https://github.com/user-attachments/assets/ceb74224-08aa-4b8b-a3e7-b438ac3d160a">
 
-```bash
-cline task "Create a hello world function in Python"
-cline t "Create a hello world function"
-```
+### Use any API and Model
 
-**Options:**
+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.
 
-| Option | Description |
-|--------|-------------|
-| `-a, --act` | Run in act mode |
-| `-p, --plan` | Run in plan mode |
-| `-y, --yolo` | Enable yolo mode (auto-approve actions) |
-| `-m, --model <model>` | Model to use for the task |
-| `-i, --images <paths...>` | Image file paths to include with the task |
-| `-v, --verbose` | Show verbose output including reasoning |
-| `-c, --cwd <path>` | Working directory for the task |
-| `--config <path>` | Path to Cline configuration directory |
-| `-t, --thinking` | Enable extended thinking (1024 token budget) |
+<!-- Transparent pixel to create line break after floating image -->
 
-**Examples:**
+<img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
 
-```bash
-# Run in plan mode with verbose output
-cline task -p -v "Design a REST API"
+<img align="left" width="370" src="https://github.com/user-attachments/assets/cad091f6-6c0f-4e4b-97ea-a1ff67e39b9b">
 
-# Use a specific model with yolo mode
-cline task -m claude-sonnet-4-5-20250929 -y "Refactor this function"
+### Stay in Control with Human-in-the-Loop
 
-# Include images with your prompt
-cline task -i screenshot.png diagram.jpg "Fix the UI based on these images"
+Cline asks for your approval before running commands, editing files, or taking any action. Review each step and approve or reject as you go—or enable auto-approve to let Cline work autonomously to completion.
 
-# Or use inline image references in the prompt
-cline task "Fix the layout shown in @./screenshot.png"
+<!-- Transparent pixel to create line break after floating image -->
 
-# Enable extended thinking for complex tasks
-cline task -t "Architect a microservices system"
+<img width="2000" height="0" src="https://github.com/user-attachments/assets/cad091f6-6c0f-4e4b-97ea-a1ff67e39b9b"><br>
 
-# Specify working directory
-cline task -c /path/to/project "Add unit tests"
-```
+<img align="right" width="400" src="https://github.com/user-attachments/assets/4f264a0c-3802-49a7-8e5e-13d97beb659e">
 
-#### `history` (alias: `h`)
+### Plan & Act Modes
 
-List task history with pagination support.
+Toggle to Plan Mode to discuss implementation and architecture with Cline. He'll ask clarifying questions, explore your codebase, and present a plan for you to align on. Once you're satisfied, switch to Act Mode and let Cline execute the plan.
 
-```bash
-cline history
-cline h
-```
+<!-- Transparent pixel to create line break after floating image -->
 
-**Options:**
+<img width="2000" height="0" src="https://github.com/user-attachments/assets/4f264a0c-3802-49a7-8e5e-13d97beb659e"><br>
 
-| Option | Description |
-|--------|-------------|
-| `-n, --limit <number>` | Number of tasks to show (default: 10) |
-| `-p, --page <number>` | Page number, 1-based (default: 1) |
-| `--config <path>` | Path to Cline configuration directory |
 
-**Examples:**
+## Enterprise
 
-```bash
-# Show last 10 tasks (default)
-cline history
+Get the same Cline experience with enterprise-grade controls: SSO (SAML/OIDC), global policies and configuration, observability with audit trails, private networking (VPC/private link), and self-hosted or on-prem deployments, and enterprise support. Learn more at our [enterprise page](https://cline.bot/enterprise) or [talk to us](https://cline.bot/contact-sales).
 
-# Show 20 tasks
-cline history -n 20
+## License
 
-# Show page 2 with 5 tasks per page
-cline history -n 5 -p 2
-```
-
-#### `config`
-
-Show current configuration including global and workspace state.
-
-```bash
-cline config
-```
-
-**Options:**
-
-| Option | Description |
-|--------|-------------|
-| `--config <path>` | Path to Cline configuration directory |
-
-#### `auth`
-
-Authenticate a provider and configure what model is used.
-
-```bash
-cline auth
-```
-
-**Options:**
-
-| Option | Description |
-|--------|-------------|
-| `-p, --provider <id>` | Provider ID for quick setup (e.g., openai-native, anthropic) |
-| `-k, --apikey <key>` | API key for the provider |
-| `-m, --modelid <id>` | Model ID to configure (e.g., gpt-4o, claude-sonnet-4-5-20250929) |
-| `-b, --baseurl <url>` | Base URL (optional, only for openai provider) |
-| `-v, --verbose` | Show verbose output |
-| `-c, --cwd <path>` | Working directory for the task |
-| `--config <path>` | Path to Cline configuration directory |
-
-**Examples:**
-
-```bash
-# Interactive authentication
-cline auth
-
-# Quick setup with provider and API key
-cline auth -p anthropic -k sk-ant-xxxxx
-
-# Full quick setup with model
-cline auth -p openai-native -k sk-xxxxx -m gpt-4o
-
-# OpenAI-compatible provider with custom base URL
-cline auth -p openai -k your-api-key -b https://api.example.com/v1
-```
-
-### Global Options
-
-These options are available for the default command (running a task directly):
-
-| Option | Description |
-|--------|-------------|
-| `-v, --verbose` | Show verbose output |
-| `-c, --cwd <path>` | Working directory |
-| `--config <path>` | Configuration directory |
-| `--thinking` | Enable extended thinking (1024 token budget) |
-
-## Development
-
-### Quick Start
-
-```bash
-# 1. Install all dependencies (root, webview-ui, cli)
-npm run install:all
-
-# 2. Build and link globally so you can run `cline` from anywhere
-npm run cli:link
-
-# 3. Test it
-cline --help
-```
-
-### Scripts
-
-Run these from the repository root:
-
-| Script | Description |
-|--------|-------------|
-| `npm run install:all` | Install deps for root, webview-ui, and cli |
-| `npm run cli:build` | Generate protos and build CLI |
-| `npm run cli:build:production` | Production build (minified) |
-| `npm run cli:link` | Build and `npm link` so you can run `cline` from anywhere |
-| `npm run cli:unlink` | Remove the global `cline` symlink |
-| `npm run cli:dev` | Link + watch mode for development |
-| `npm run cli:watch` | Watch mode only (no initial build) |
-| `npm run cli:test` | Run CLI tests |
-
-### Development Workflow
-
-1. Run `npm run cli:dev` - this links the CLI globally and starts watch mode
-2. Make changes to files in `cli/src/`
-3. The build automatically rebuilds on save
-4. Test your changes by running `cline` in another terminal
-5. When done, run `npm run cli:unlink` to clean up
-
-### Proto Generation
-
-The CLI uses proto-generated types for message passing (same as the VS Code extension). If you modify any `.proto` files, run:
-
-```bash
-npm run protos
-```
-
-This generates TypeScript types in `src/generated/` that both the CLI and extension use.
-
-## Publish
-
-#### 1. Publish to npm
-```bash
-npm publish
-```
-
-#### 2. Update the Homebrew formula
-```bash
-npm run update-brew-formula
-```
-
-#### 3. Test the formula locally
-```bash
-# Create a local tap
-brew tap-new cline/local
-cp ./cli/cline.rb "$(brew --repository)/Library/Taps/cline/homebrew-local/Formula/cline.rb"
-
-# Build from Source
-brew install --build-from-source cline/local/cline
-
-# Install from your local tap
-brew install cline/local/cline
-
-# Clean up when done
-brew untap cline/local
-```
-
-#### 4. If using a tap, commit and push
-```bash
-git add cline.rb
-git commit -m "Update cline to v2.0.0"
-git push
-```
-
-## Architecture
-
-### How It Works
-
-The CLI directly imports and reuses the core Cline TypeScript codebase (the same code that powers the VS Code extension). This means feature parity is easy to maintain - when core gets updated, the CLI automatically benefits.
-
-```
-┌─────────────────────────────────────────────────────────┐
-│                     CLI (cli/)                          │
-│  - React Ink terminal UI                                │
-│  - Command parsing (commander)                          │
-│  - Terminal-specific adapters                           │
-└─────────────────────────────────────────────────────────┘
-                          │
-                          │ direct imports
-                          ▼
-┌─────────────────────────────────────────────────────────┐
-│                  Core (src/core/)                       │
-│  - Controller: task lifecycle, state management         │
-│  - Task: AI API calls, tool execution                   │
-│  - StateManager: persistent storage                     │
-│  - Proto types: message definitions                     │
-└─────────────────────────────────────────────────────────┘
-```
-
-Unlike a client-server architecture, the CLI runs everything in a single Node.js process. The "host bridge" pattern provides terminal-appropriate implementations for things the VS Code extension would handle differently (clipboard, file dialogs, etc.).
-
-### Key Files
-
-| File | Purpose |
-|------|---------|
-| `src/index.ts` | Entry point, command definitions |
-| `src/components/App.tsx` | Main React Ink app |
-| `src/components/ChatView.tsx` | Task conversation UI |
-| `src/controllers/CliWebviewProvider.ts` | Bridges core messages to terminal output |
-| `src/vscode-context.ts` | Mock VS Code extension context for core compatibility |
-| `src/vscode-shim.ts` | Shims for VS Code APIs that core depends on |
-| `src/constants/colors.ts` | Terminal color definitions |
-
-### React Ink
-
-The CLI uses [React Ink](https://github.com/vadimdemedes/ink) for its terminal UI. This lets us build the interface with React components that render to the terminal. Key patterns:
-
-- Components in `src/components/` render terminal UI
-- Hooks in `src/hooks/` manage terminal-specific state (size, scrolling)
-- The `useStateSubscriber` hook subscribes to core state changes
-
-## Configuration
-
-The CLI stores its data in `~/.cline/data/` by default:
-
-- `globalState.json`: Global settings and state
-- `secrets.json`: API keys and secrets
-- `workspace/`: Workspace-specific state
-- `tasks/`: Task history and conversation data
-
-Override with the `--config` option or `CLINE_DIR` environment variable.
-
-## Troubleshooting
-
-### Build Errors
-
-If you encounter build errors:
-
-```bash
-# Make sure all deps are installed
-npm run install:all
-
-# Regenerate proto types
-npm run protos
-
-# Then rebuild
-npm run cli:build
-```
-
-### "command not found: cline"
-
-The CLI isn't linked globally. Run:
-
-```bash
-npm run cli:link
-```
-
-### Changes Not Reflected
-
-If your code changes aren't showing up:
-
-1. Make sure watch mode is running (`npm run cli:dev`)
-2. Check for TypeScript errors in the watch output
-3. Try unlinking and relinking: `npm run cli:unlink && npm run cli:link`
-
-### Import Errors from Core
-
-The CLI imports from `@core/`, `@shared/`, etc. These paths are defined in the root `tsconfig.json`. If you see import errors, make sure you're building from the repo root, not from inside `cli/`.
+[Apache 2.0 © 2026 Cline Bot Inc.](./LICENSE)

cli/man/cline.1

@@ -88,6 +88,10 @@ directory
 \f[B]\-\-thinking\f[R] : Enable extended thinking (1024 token budget)
 .PP
 \f[B]\-\-json\f[R] : Output messages as JSON instead of styled text
+.PP
+\f[B]\-T\f[R], \f[B]\-\-taskId\f[R] \f[I]id\f[R] : Resume an existing
+task by ID.
+The prompt argument becomes an optional follow\-up message.
 .SS history (alias: h)
 List task history with pagination.
 .PP
@@ -121,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)
+quick setup (e.g., openai\-native, anthropic, openrouter, moonshot)
 .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)
+configure (e.g., gpt\-4o, claude\-sonnet\-4\-5\-20250929, kimi\-k2.5)
 .PP
 \f[B]\-b\f[R], \f[B]\-\-baseurl\f[R] \f[I]url\f[R] : Base URL (optional,
 for OpenAI\-compatible providers)
@@ -179,6 +183,10 @@ the task
 .PP
 \f[B]\-\-json\f[R] : Output messages as JSON instead of styled text.
 Forces plain text mode.
+.PP
+\f[B]\-T\f[R], \f[B]\-\-taskId\f[R] \f[I]id\f[R] : Resume an existing
+task by ID instead of starting a new one.
+The prompt becomes an optional follow\-up message.
 .SH JSON OUTPUT FORMAT
 When using \f[B]\-\-json\f[R], each message is output as a JSON object
 with these fields:
@@ -234,6 +242,9 @@ 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
@@ -274,6 +285,21 @@ cline history
 \f[I]# Show more tasks with pagination\f[R]
 cline history \-n 20 \-p 2
 .EE
+.SS Resuming Tasks
+.IP
+.EX
+\f[I]# Resume a task by ID (get IDs from cline history)\f[R]
+cline \-T abc123def
+
+\f[I]# Resume a task with a follow\-up message\f[R]
+cline \-T abc123def \(dqNow add unit tests for the changes\(dq
+
+\f[I]# Resume in plan mode to review before continuing\f[R]
+cline \-T abc123def \-p \(dqWhat\(aqs left to do?\(dq
+
+\f[I]# Resume with yolo mode for automated continuation\f[R]
+cline \-T abc123def \-y \(dqContinue with the implementation\(dq
+.EE
 .SS Authentication
 .IP
 .EX
@@ -286,6 +312,9 @@ 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
@@ -348,20 +377,19 @@ export CLINE_COMMAND_PERMISSIONS=\(aq{\(dqallow\(dq: [\(dqnpm *\(dq, \(dqgit *\(
 \f[I]# Allow file operations with redirects\f[R]
 export CLINE_COMMAND_PERMISSIONS=\(aq{\(dqallow\(dq: [\(dqcat *\(dq, \(dqecho *\(dq], \(dqallowRedirects\(dq: true}\(aq
 .EE
-.SH FILES
-\f[B]\(ti/.cline/data/\f[R] : Default configuration directory
-containing:
+.SH CONFIGURATION FILES
+.IP
+.EX
+\(ti/.cline/
+├── data/                    # Default configuration directory
+│   ├── globalState.json     # Global settings and state
+│   ├── secrets.json         # API keys and secrets (stored securely)
+│   ├── workspace/           # Workspace\-specific state
+│   └── tasks/               # Task history and conversation data
+└── log/                     # Log files for debugging
+.EE
 .PP
-\f[B]globalState.json\f[R] : Global settings and state
-.PP
-\f[B]secrets.json\f[R] : API keys and secrets (stored securely)
-.PP
-\f[B]workspace/\f[R] : Workspace\-specific state
-.PP
-\f[B]tasks/\f[R] : Task history and conversation data
-.PP
-\f[B]\(ti/.cline/log/\f[R] : Log files for debugging.
-View with \f[CR]cline dev log\f[R].
+View logs with \f[CR]cline dev log\f[R].
 .SH BUGS
 Report bugs at: \c
 .UR https://github.com/cline/cline/issues

cli/man/cline.1.md

@@ -56,6 +56,8 @@ 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
@@ -70,6 +72,8 @@ Run a new task with a prompt.
 
 **\--json** :   Output messages as JSON instead of styled text
 
+**-T**, **\--taskId** *id* :   Resume an existing task by ID. The prompt argument becomes an optional follow-up message.
+
 ## history (alias: h)
 
 List task history with pagination.
@@ -142,6 +146,8 @@ 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
@@ -154,6 +160,8 @@ When running **cline** with just a prompt (no subcommand), these options are ava
 
 **\--json** :   Output messages as JSON instead of styled text. Forces plain text mode.
 
+**-T**, **\--taskId** *id* :   Resume an existing task by ID instead of starting a new one. The prompt becomes an optional follow-up message.
+
 # JSON OUTPUT FORMAT
 
 When using **\--json**, each message is output as a JSON object with these fields:
@@ -251,6 +259,22 @@ cline history
 cline history -n 20 -p 2
 ```
 
+## Resuming Tasks
+
+```bash
+# Resume a task by ID (get IDs from cline history)
+cline -T abc123def
+
+# Resume a task with a follow-up message
+cline -T abc123def "Now add unit tests for the changes"
+
+# Resume in plan mode to review before continuing
+cline -T abc123def -p "What's left to do?"
+
+# Resume with yolo mode for automated continuation
+cline -T abc123def -y "Continue with the implementation"
+```
+
 ## Authentication
 
 ```bash

cli/package.json

@@ -1,25 +1,34 @@
 {
 	"name": "cline",
-	"version": "2.0.0",
+	"version": "2.4.2",
 	"description": "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
 	"main": "dist/cli.mjs",
 	"bin": {
 		"cline": "./dist/cli.mjs"
 	},
+	"os": [
+		"darwin",
+		"linux",
+		"win32"
+	],
+	"cpu": [
+		"x64",
+		"arm64"
+	],
+	"man": "./man/cline.1",
 	"type": "module",
 	"engines": {
 		"node": ">=20.0.0"
 	},
 	"scripts": {
-		"prepublishOnly": "npm run build:production",
-		"package:brew": "node ./scripts/update-brew-formula.mts",
+		"package:brew": "npx tsx ./scripts/update-brew-formula.mts",
 		"package": "npm pack --pack-destination ./dist",
-		"build": "node esbuild.mts",
-		"build:production": "node esbuild.mts --production",
-		"watch": "node esbuild.mts --watch",
+		"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",
-		"typecheck": "tsc --noEmit",
+		"typecheck": "npx tsc --noEmit",
 		"link": "npm run build && npm link",
 		"unlink": "npm unlink -g cline",
 		"test": "vitest",

cli/src/acp/ACPHostBridgeClientProvider.ts

@@ -172,6 +172,16 @@ class ACPEnvServiceClient implements EnvServiceClientInterface {
 		Logger.debug("[ACPEnvServiceClient] shutdown called (stub)")
 		return proto.cline.Empty.create()
 	}
+
+	async openExternal(request: proto.cline.StringRequest): Promise<proto.cline.Empty> {
+		const url = request.value || ""
+		if (url) {
+			Logger.debug(`[ACPEnvServiceClient] openExternal: ${url}`)
+			const { openUrlInBrowser } = await import("../utils/browser")
+			await openUrlInBrowser(url)
+		}
+		return proto.cline.Empty.create()
+	}
 }
 
 /**

cli/src/acp/AcpTerminalManager.ts

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

cli/src/agent/ClineAgent.ts

@@ -28,6 +28,8 @@ import {
 	groqModels,
 	mistralDefaultModelId,
 	mistralModels,
+	moonshotDefaultModelId,
+	moonshotModels,
 	openAiCodexDefaultModelId,
 	openAiNativeDefaultModelId,
 	openAiNativeModels,
@@ -36,7 +38,6 @@ 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"
@@ -51,12 +52,12 @@ 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 { ACPDiffViewProvider } from "../acp/ACPDiffViewProvider.js"
 import { ACPHostBridgeClientProvider } from "../acp/ACPHostBridgeClientProvider.js"
 import { AcpTerminalManager } from "../acp/AcpTerminalManager.js"
+import { isAuthConfigured } from "../index.js"
 import { fetchOpenRouterModels, usesOpenRouterModels } from "../utils/openrouter-models"
 import { CliContextResult, initializeCliContext } from "../vscode-context.js"
 import { ClineSessionEmitter } from "./ClineSessionEmitter.js"
@@ -72,6 +73,7 @@ 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 },
 }
@@ -173,8 +175,8 @@ export class ClineAgent implements acp.Agent {
 	async initialize(params: acp.InitializeRequest, connection?: acp.AgentSideConnection): Promise<acp.InitializeResponse> {
 		this.clientCapabilities = params.clientCapabilities
 		this.initializeHostProvider(this.clientCapabilities, connection)
-		await ClineEndpoint.initialize()
-		await StateManager.initialize(this.ctx.extensionContext)
+		await ClineEndpoint.initialize(this.ctx.EXTENSION_DIR)
+		await StateManager.initialize(this.ctx.storageContext)
 
 		return {
 			protocolVersion: PROTOCOL_VERSION,
@@ -246,8 +248,8 @@ export class ClineAgent implements acp.Agent {
 			},
 			hostBridgeClientProvider,
 			(message: string) => Logger.info(message),
-			async () => {
-				return AuthHandler.getInstance().getCallbackUrl()
+			async (path: string) => {
+				return AuthHandler.getInstance().getCallbackUrl(path)
 			},
 			async () => "", // get binary location not needed in ACP mode
 			this.ctx.EXTENSION_DIR,
@@ -263,7 +265,7 @@ export class ClineAgent implements acp.Agent {
 	 */
 	async newSession(params: acp.NewSessionRequest): Promise<acp.NewSessionResponse> {
 		// Check if authentication is required
-		const isAuthenticated = await this.isAuthConfigured()
+		const isAuthenticated = await isAuthConfigured()
 		if (!isAuthenticated) {
 			throw RequestError.authRequired()
 		}
@@ -333,14 +335,15 @@ export class ClineAgent implements acp.Agent {
 
 		// Get current provider and model for the mode
 		const providerKey = mode === "act" ? "actModeApiProvider" : "planModeApiProvider"
-		const modelKey = mode === "act" ? "actModeApiModelId" : "planModeApiModelId"
-
 		const currentProvider = stateManager.getGlobalSettingsKey(providerKey) as ApiProvider | undefined
-		const currentModelId = stateManager.getGlobalSettingsKey(modelKey) as string | undefined
+
+		// Use provider-specific model ID key (e.g., cline uses actModeOpenRouterModelId)
+		const modelKey = currentProvider ? getProviderModelIdKey(currentProvider, mode) : null
+		const currentModelId = modelKey ? stateManager.getGlobalSettingsKey(modelKey) : undefined
 
 		// Build the current model ID in provider/model format
 		const currentFullModelId =
-			currentProvider && currentModelId ? `${currentProvider}/${currentModelId}` : currentProvider || "anthropic"
+			currentProvider && currentModelId ? `${currentProvider}/${currentModelId}` : currentProvider || ""
 
 		// Get available models based on provider
 		let modelIds: string[] = []
@@ -398,13 +401,11 @@ export class ClineAgent implements acp.Agent {
 
 		const stateManager = StateManager.get()
 
-		// Update model for both plan and act modes (use the same model for both)
+		// Update provider for both modes
 		stateManager.setGlobalState("actModeApiProvider", provider)
-		stateManager.setGlobalState("actModeApiModelId", modelId)
 		stateManager.setGlobalState("planModeApiProvider", provider)
-		stateManager.setGlobalState("planModeApiModelId", modelId)
 
-		// Also update the provider-specific model ID keys for both modes
+		// Update model ID using provider-specific keys (e.g., cline uses actModeOpenRouterModelId)
 		const actProviderModelKey = getProviderModelIdKey(provider, "act")
 		if (actProviderModelKey) {
 			stateManager.setGlobalState(actProviderModelKey, modelId)
@@ -974,7 +975,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()
+			callbackUrl = await authHandler.getCallbackUrl("/auth")
 			Logger.debug("[ClineAgent] Callback URL ready:", callbackUrl)
 		} catch (error) {
 			Logger.error("[ClineAgent] Failed to get callback URL:", error)
@@ -1005,13 +1006,14 @@ 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 = await secretStorage.get("cline:clineAccountId")
+				const authData = stateManager.getSecretKey("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()
@@ -1144,48 +1146,6 @@ 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 authData = await secretStorage.get("cline:clineAccountId")
-			return !!authData
-		}
-
-		// 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.
 	 *
@@ -1199,9 +1159,6 @@ 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()
 
@@ -1219,8 +1176,11 @@ export class ClineAgent implements acp.Agent {
 			const stateManager = StateManager.get()
 			stateManager.setGlobalState("actModeApiProvider", "openai-codex")
 			stateManager.setGlobalState("planModeApiProvider", "openai-codex")
-			stateManager.setGlobalState("actModeApiModelId", openAiCodexDefaultModelId)
-			stateManager.setGlobalState("planModeApiModelId", openAiCodexDefaultModelId)
+			// Use provider-specific model ID keys for consistency
+			const actModelKey = getProviderModelIdKey("openai-codex", "act")
+			const planModelKey = getProviderModelIdKey("openai-codex", "plan")
+			if (actModelKey) stateManager.setGlobalState(actModelKey, openAiCodexDefaultModelId)
+			if (planModelKey) stateManager.setGlobalState(planModelKey, openAiCodexDefaultModelId)
 			await stateManager.flushPendingState()
 
 			return {}

cli/src/agent/messageTranslator.ts

@@ -312,6 +312,10 @@ 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

cli/src/components/App.test.tsx

@@ -82,9 +82,8 @@ describe("App", () => {
 		})
 
 		it("should render AuthView when view is auth", () => {
-			const { lastFrame } = render(<App authQuickSetup={{ provider: "openai" }} controller={mockController} view="auth" />)
+			const { lastFrame } = render(<App controller={mockController} view="auth" />)
 			expect(lastFrame()).toContain("AuthView")
-			expect(lastFrame()).toContain("openai")
 		})
 
 		it("should render ChatView when view is welcome", () => {

cli/src/components/App.tsx

@@ -81,13 +81,6 @@ interface AppProps {
 	globalSkills?: SkillInfo[]
 	localSkills?: SkillInfo[]
 	onToggleSkill?: (isGlobal: boolean, skillPath: string, enabled: boolean) => void
-	// For auth view
-	authQuickSetup?: {
-		provider?: string
-		apikey?: string
-		modelid?: string
-		baseurl?: string
-	}
 	// For welcome view
 	onWelcomeSubmit?: (prompt: string, imagePaths: string[]) => void
 	onWelcomeExit?: () => void
@@ -95,8 +88,6 @@ interface AppProps {
 	initialImages?: string[]
 	// Stdin support
 	isRawModeSupported?: boolean
-	// Robot position (calculated before Ink mounts)
-	robotTopRow?: number
 }
 
 export const App: React.FC<AppProps> = ({
@@ -135,13 +126,11 @@ export const App: React.FC<AppProps> = ({
 	globalSkills,
 	localSkills,
 	onToggleSkill,
-	authQuickSetup,
 	onWelcomeSubmit,
 	onWelcomeExit,
 	initialPrompt,
 	initialImages,
 	isRawModeSupported = true,
-	robotTopRow,
 }) => {
 	const { resizeKey } = useTerminalSize()
 	const [currentView, setCurrentView] = useState<ViewType>(initialView)
@@ -240,7 +229,6 @@ export const App: React.FC<AppProps> = ({
 					onComplete={onComplete}
 					onError={onError}
 					onNavigateToWelcome={handleNavigateToWelcome}
-					quickSetup={authQuickSetup}
 				/>
 			)
 			break
@@ -259,7 +247,6 @@ export const App: React.FC<AppProps> = ({
 							onComplete={onComplete}
 							onError={onError}
 							onExit={onWelcomeExit}
-							robotTopRow={robotTopRow}
 							taskId={selectedTaskId}
 						/>
 					)}

cli/src/components/AsciiMotionCli.tsx

@@ -34,8 +34,7 @@ type AsciiMotionCliProps = {
   autoPlay?: boolean;
   loop?: boolean;
   onReady?: (api: PlaybackAPI) => void;
-  robotTopRow?: number; // Screen row where robot is rendered (calculated before Ink mounts)
-  onScroll?: () => void; // Called when user scrolls (scroll wheel)
+  onInteraction?: () => void; // Called when user scrolls, clicks, or drags
 };
 
 const FRAMES: FrameData[] = [
@@ -333365,12 +333364,12 @@ const FRAME_BOTTOM_RIGHT = 128;
 
 export const AsciiMotionCli: React.FC<AsciiMotionCliProps> = ({
   hasDarkBackground = true,
-  robotTopRow,
-  onScroll,
+  onInteraction,
 }) => {
   const [frameIndex, setFrameIndex] = useState(0);
   const [targetFrame, setTargetFrame] = useState(0);
   const [cursor, setCursor] = useState({ x: 0, y: 0 });
+  const lastCursorUpdateRef = useRef(0);
   const { stdout } = useStdout();
   const { stdin, setRawMode } = useStdin();
 
@@ -333379,8 +333378,9 @@ export const AsciiMotionCli: React.FC<AsciiMotionCliProps> = ({
   const faceX = Math.floor(terminalWidth / 2);
   // Robot height after cropping is ~12 rows, eyes are roughly halfway down
   const robotHeight = 12;
-  // faceY is the robot's eye level - calculated from robotTopRow prop (set before Ink mounts)
-  const faceY = robotTopRow !== undefined ? robotTopRow + Math.floor(robotHeight / 2) : null;
+  // Robot is always rendered at the top of the terminal in welcome state.
+  // faceY is the robot's eye level (row 2 + half robot height)
+  const faceY = 2 + Math.floor(robotHeight / 2);
 
   // Select color theme based on background
   const theme = useMemo(() => hasDarkBackground ? THEME_DARK : THEME_LIGHT, [hasDarkBackground]);
@@ -333390,13 +333390,13 @@ export const AsciiMotionCli: React.FC<AsciiMotionCliProps> = ({
   // Stop animation on terminal resize to prevent visual glitches
   useEffect(() => {
     const handleResize = () => {
-      onScroll?.();
+      onInteraction?.();
     };
     process.stdout.on("resize", handleResize);
     return () => {
       process.stdout.off("resize", handleResize);
     };
-  }, [onScroll]);
+  }, [onInteraction]);
 
   // Mouse tracking - gracefully handle environments without tty support
   useEffect(() => {
@@ -333417,15 +333417,26 @@ export const AsciiMotionCli: React.FC<AsciiMotionCliProps> = ({
     const handleData = (data: Buffer) => {
       const str = data.toString();
 
-      // Parse mouse events: \x1b[<button;x;yM
+      // Parse mouse events: \x1b[<button;x;yM (M=press, m=release)
       const mouseMatch = str.match(/\x1b\[<(\d+);(\d+);(\d+)([Mm])/);
       if (mouseMatch) {
         const button = parseInt(mouseMatch[1], 10);
-        // Button 64 = scroll up, 65 = scroll down
-        if (button === 64 || button === 65) {
-          onScroll?.();
+        const isPress = mouseMatch[4] === "M";
+        // Button 64/65 = scroll up/down
+        // Button 0-2 = left/middle/right click (on press)
+        // Button 32-34 = drag with left/middle/right button held
+        const isScroll = button === 64 || button === 65;
+        const isClick = isPress && button >= 0 && button <= 2;
+        const isDrag = button >= 32 && button <= 34;
+        if (isScroll || isClick || isDrag) {
+          onInteraction?.();
+        }
+        // Throttle cursor updates to ~20fps to reduce re-renders
+        const now = Date.now();
+        if (now - lastCursorUpdateRef.current >= 50) {
+          lastCursorUpdateRef.current = now;
+          setCursor({ x: parseInt(mouseMatch[2], 10), y: parseInt(mouseMatch[3], 10) });
         }
-        setCursor({ x: parseInt(mouseMatch[2], 10), y: parseInt(mouseMatch[3], 10) });
       }
     };
 
@@ -333444,9 +333455,6 @@ export const AsciiMotionCli: React.FC<AsciiMotionCliProps> = ({
 
   // Map cursor position to target frame (continuous interpolation)
   useEffect(() => {
-    // Wait until we know where the robot is on screen
-    if (faceY === null) return;
-
     const dx = cursor.x - faceX;
     const dy = cursor.y - faceY;
 

cli/src/components/AskPrompt.tsx

@@ -3,7 +3,7 @@
  * Handles different types of user interactions (text input, confirmations, choices)
  */
 
-import type { ClineAsk } from "@shared/ExtensionMessage"
+import type { ClineAsk, ClineMessage } from "@shared/ExtensionMessage"
 import { Box, Text, useApp, useInput } from "ink"
 import React, { useCallback, useEffect, useRef, useState } from "react"
 import { useStdinContext } from "../context/StdinContext"
@@ -11,7 +11,6 @@ import { useTaskController } from "../context/TaskContext"
 import { useLastCompletedAskMessage } from "../hooks/useStateSubscriber"
 import { isMouseEscapeSequence } from "../utils/input"
 import { jsonParseSafe } from "../utils/parser"
-import { getCliMessagePrefixIcon } from "./MessageRow"
 
 interface AskPromptProps {
 	onRespond?: (response: string) => void
@@ -372,3 +371,73 @@ export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 			return null
 	}
 }
+
+/**
+ * Get emoji icon for message type
+ */
+function getCliMessagePrefixIcon(message: ClineMessage): string {
+	if (message.type === "ask") {
+		switch (message.ask) {
+			case "followup":
+				return "❓"
+			case "command":
+			case "command_output":
+				return "⚙️"
+			case "tool":
+				return "🔧"
+			case "completion_result":
+				return "✅"
+			case "api_req_failed":
+				return "❌"
+			case "resume_task":
+			case "resume_completed_task":
+				return "▶️"
+			case "browser_action_launch":
+				return "🌐"
+			case "use_mcp_server":
+				return "🔌"
+			case "plan_mode_respond":
+				return "📋"
+			default:
+				return "❔"
+		}
+	} else {
+		switch (message.say) {
+			case "task":
+				return "📋"
+			case "error":
+				return "❌"
+			case "text":
+				return "💬"
+			case "reasoning":
+				return "🧠"
+			case "completion_result":
+				return "✅"
+			case "user_feedback":
+				return "👤"
+			case "command":
+			case "command_output":
+				return "⚙️"
+			case "tool":
+				return "🔧"
+			case "browser_action":
+			case "browser_action_launch":
+			case "browser_action_result":
+				return "🌐"
+			case "mcp_server_request_started":
+			case "mcp_server_response":
+				return "🔌"
+			case "api_req_started":
+			case "api_req_finished":
+				return "🔄"
+			case "checkpoint_created":
+				return "💾"
+			case "info":
+				return "ℹ️"
+			case "generate_explanation":
+				return "📝"
+			default:
+				return "  "
+		}
+	}
+}

cli/src/components/AuthView.tsx

@@ -6,20 +6,24 @@
 import { Box, Text, useApp, useInput } from "ink"
 import Spinner from "ink-spinner"
 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 { API_PROVIDERS_LIST, openAiCodexDefaultModelId, openRouterDefaultModelId } from "@/shared/api"
-import { ProviderToApiKeyMap } from "@/shared/storage"
+import { openAiCodexDefaultModelId, openRouterDefaultModelId } from "@/shared/api"
+import { StringRequest } from "@/shared/proto/cline/common"
 import { openExternal } from "@/utils/env"
 import { COLORS } from "../constants/colors"
-import { getAllFeaturedModels } from "../constants/featured-models"
 import { useStdinContext } from "../context/StdinContext"
+import { useOcaAuth } from "../hooks/useOcaAuth"
 import { useScrollableList } from "../hooks/useScrollableList"
 import { type DetectedSources, detectImportSources, type ImportSource } from "../utils/import-configs"
 import { isMouseEscapeSequence } from "../utils/input"
+import { applyBedrockConfig, applyProviderConfig } from "../utils/provider-config"
+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,
@@ -28,8 +32,9 @@ import {
 	isBrowseAllSelected,
 } from "./FeaturedModelPicker"
 import { ImportView } from "./ImportView"
-import { getDefaultModelId, hasModelPicker, ModelPicker } from "./ModelPicker"
-import { getProviderLabel, getProviderOrder } from "./ProviderPicker"
+import { CUSTOM_MODEL_ID, getDefaultModelId, hasModelPicker, ModelPicker } from "./ModelPicker"
+import { OcaEmployeeCheck } from "./OcaEmployeeCheck"
+import { getProviderLabel } from "./ProviderPicker"
 
 type AuthStep =
 	| "menu"
@@ -41,26 +46,19 @@ type AuthStep =
 	| "success"
 	| "error"
 	| "cline_auth"
+	| "oca_employee_check"
+	| "oca_auth"
 	| "cline_model"
 	| "openai_codex_auth"
 	| "bedrock"
 	| "import"
-
-// Featured models loaded from shared constants
-const featuredModels = getAllFeaturedModels()
+	| "bedrock_custom"
 
 interface AuthViewProps {
 	controller: any
 	onComplete?: () => void
 	onError?: () => void
 	onNavigateToWelcome?: () => void
-	// Quick setup options
-	quickSetup?: {
-		provider?: string
-		apikey?: string
-		modelid?: string
-		baseurl?: string
-	}
 }
 
 interface SelectItem {
@@ -80,7 +78,7 @@ const Select: React.FC<{
 	const [selectedIndex, setSelectedIndex] = useState(0)
 
 	useInput(
-		(input, key) => {
+		(_, key) => {
 			if (key.upArrow) {
 				setSelectedIndex((prev) => (prev > 0 ? prev - 1 : items.length - 1))
 			} else if (key.downArrow) {
@@ -146,15 +144,22 @@ const TextInput: React.FC<{
 
 	return (
 		<Box>
-			<Text color="white">{displayValue || placeholder || ""}</Text>
+			{!displayValue && placeholder ? (
+				<Text color="gray">e.g. {placeholder}</Text>
+			) : (
+				<Text color="white">{displayValue || ""}</Text>
+			)}
 			<Text inverse> </Text>
 		</Box>
 	)
 }
 
-export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onError, onNavigateToWelcome, quickSetup }) => {
+export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onError, onNavigateToWelcome }) => {
 	const { exit } = useApp()
-	const [step, setStep] = useState<AuthStep>(quickSetup ? "saving" : "menu")
+
+	const providers = useValidProviders()
+
+	const [step, setStep] = useState<AuthStep>("menu")
 	const [selectedProvider, setSelectedProvider] = useState<string>(
 		StateManager.get().getApiConfiguration().actModeApiProvider ||
 			StateManager.get().getApiConfiguration().planModeApiProvider ||
@@ -164,7 +169,6 @@ 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)
@@ -172,15 +176,35 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 	const [importSource, setImportSource] = useState<ImportSource | null>(null)
 	const [bedrockConfig, setBedrockConfig] = useState<BedrockConfig | null>(null)
 
-	// Use providers.json order, filtered to only available providers
-	const sortedProviders = useMemo(() => {
-		const availableProviders = new Set(API_PROVIDERS_LIST)
-		return getProviderOrder().filter((p) => availableProviders.has(p))
+	// 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)
+		setStep("success")
+	}, [controller])
+
+	const handleOcaAuthError = useCallback((error: Error) => {
+		setErrorMessage(error.message)
+		setStep("error")
 	}, [])
 
+	const { startAuth: initiateOcaAuth } = useOcaAuth({
+		controller,
+		enabled: step === "oca_auth",
+		onSuccess: handleOcaAuthSuccess,
+		onError: handleOcaAuthError,
+	})
+
 	// Main menu items - conditionally include import options
 	const mainMenuItems: SelectItem[] = useMemo(() => {
-		const items: SelectItem[] = [{ label: "Sign in with Cline account", value: "cline_auth" }]
+		const items: SelectItem[] = [{ label: "Sign in with Cline", value: "cline_auth" }]
 
 		// Add OpenAI Codex option for ChatGPT subscribers
 		items.push({ label: "Sign in with ChatGPT Subscription", value: "openai_codex_auth" })
@@ -203,15 +227,13 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 	const providerItems: SelectItem[] = useMemo(() => {
 		const search = providerSearch.toLowerCase()
 		const filtered = providerSearch
-			? sortedProviders.filter(
-					(p) => p.toLowerCase().includes(search) || getProviderLabel(p).toLowerCase().includes(search),
-				)
-			: sortedProviders
+			? providers.filter((p) => p.toLowerCase().includes(search) || getProviderLabel(p).toLowerCase().includes(search))
+			: providers
 		return filtered.map((p: string) => ({
 			label: getProviderLabel(p),
 			value: p,
 		}))
-	}, [sortedProviders, providerSearch])
+	}, [providers, providerSearch])
 
 	// Use shared scrollable list hook for provider windowing
 	const TOTAL_PROVIDER_ROWS = 8
@@ -232,6 +254,7 @@ 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])
@@ -243,13 +266,6 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 		}
 	}, [step, selectedProvider])
 
-	// Handle quick setup
-	useEffect(() => {
-		if (quickSetup && step === "saving") {
-			handleQuickSetup()
-		}
-	}, [quickSetup, step])
-
 	// Subscribe to auth status updates when in cline_auth step
 	useEffect(() => {
 		if (step !== "cline_auth") {
@@ -264,22 +280,11 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 				return
 			}
 
-			if (authState.user && authState.user.email) {
-				// Auth succeeded - save configuration and transition to success
-				const stateManager = StateManager.get()
-				const mode = stateManager.getGlobalSettingsKey("mode") || "act"
-				const providerKey = mode === "act" ? "actModeApiProvider" : "planModeApiProvider"
-				const modelIdKey = mode === "act" ? "actModeApiModelId" : "planModeApiModelId"
-				const config: Record<string, string> = {
-					actModeApiProvider: "cline",
-					[providerKey]: "cline",
-					[modelIdKey]: openRouterDefaultModelId,
-				}
-				stateManager.setApiConfiguration(config)
-				stateManager.flushPendingState()
-
+			if (authState.user?.email) {
+				// Auth succeeded - save configuration and transition to model selection
+				await applyProviderConfig({ providerId: "cline", controller })
 				setSelectedProvider("cline")
-				setModelId(config[modelIdKey])
+				setModelId(openRouterDefaultModelId)
 				setStep("cline_model")
 			}
 		}
@@ -293,80 +298,6 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 		}
 	}, [step, controller])
 
-	const handleQuickSetup = async () => {
-		if (!quickSetup) {
-			return
-		}
-
-		try {
-			const { provider, apikey, modelid, baseurl } = quickSetup
-
-			// Validate required parameters
-			if (!provider || !apikey || !modelid) {
-				setErrorMessage("Quick setup requires --provider, --apikey, and --modelid flags")
-				setStep("error")
-				return
-			}
-
-			const normalizedProvider = provider.toLowerCase().trim()
-
-			if (!sortedProviders.includes(normalizedProvider)) {
-				setErrorMessage(`Invalid provider '${provider}'. Supported providers: ${sortedProviders.join(", ")}`)
-				setStep("error")
-				return
-			}
-
-			if (normalizedProvider === "bedrock") {
-				setErrorMessage(
-					"Bedrock provider is not supported for quick setup due to complex authentication requirements. Please use interactive setup.",
-				)
-				setStep("error")
-				return
-			}
-
-			if (baseurl && !["openai", "openai-native"].includes(normalizedProvider)) {
-				setErrorMessage("Base URL is only supported for OpenAI and OpenAI-compatible providers")
-				setStep("error")
-				return
-			}
-
-			// Save configuration
-			const stateManager = StateManager.get()
-			const config: Record<string, string> = {
-				actModeApiProvider: normalizedProvider,
-				planModeApiProvider: normalizedProvider,
-				actModeApiModelId: modelid,
-				planModeApiModelId: modelid,
-			}
-
-			// Use provider-specific API key field
-			const keyField = ProviderToApiKeyMap[normalizedProvider]
-			if (keyField) {
-				const fields = Array.isArray(keyField) ? keyField : [keyField]
-				// Set the first key field for the provider
-				config[fields[0]] = apikey
-			} else {
-				// Fallback to generic apiKey
-				config.apiKey = apikey
-			}
-
-			if (baseurl) {
-				config.openAiBaseUrl = baseurl
-			}
-
-			stateManager.setApiConfiguration(config)
-
-			await stateManager.flushPendingState()
-			setSelectedProvider(normalizedProvider)
-			setModelId(modelid)
-			setBaseUrl(baseurl || "")
-			setStep("success")
-		} catch (error) {
-			setErrorMessage(error instanceof Error ? error.message : String(error))
-			setStep("error")
-		}
-	}
-
 	// Start OpenAI Codex OAuth flow
 	const startOpenAiCodexAuth = useCallback(async () => {
 		try {
@@ -380,19 +311,10 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 			await openAiCodexOAuthManager.waitForCallback()
 
 			// Success - save configuration
+			await applyProviderConfig({ providerId: "openai-codex", controller })
 			const stateManager = StateManager.get()
-			const mode = stateManager.getGlobalSettingsKey("mode") || "act"
-			const providerKey = mode === "act" ? "actModeApiProvider" : "planModeApiProvider"
-			const modelIdKey = mode === "act" ? "actModeApiModelId" : "planModeApiModelId"
-			const config: Record<string, string> = {
-				actModeApiProvider: "openai-codex",
-				planModeApiProvider: "openai-codex",
-				[providerKey]: "openai-codex",
-				[modelIdKey]: openAiCodexDefaultModelId,
-			}
-			stateManager.setApiConfiguration(config)
+			stateManager.setGlobalState("welcomeViewCompleted", true)
 			await stateManager.flushPendingState()
-
 			setSelectedProvider("openai-codex")
 			setModelId(openAiCodexDefaultModelId)
 			setStep("success")
@@ -407,7 +329,6 @@ 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))
@@ -415,6 +336,11 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 		}
 	}, [controller])
 
+	const startOcaAuth = useCallback(() => {
+		setStep("oca_auth")
+		initiateOcaAuth()
+	}, [initiateOcaAuth])
+
 	const handleMainMenuSelect = useCallback(
 		(value: string) => {
 			if (value === "exit") {
@@ -441,8 +367,9 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 	const handleProviderSelect = useCallback(
 		(value: string) => {
 			setSelectedProvider(value)
-			if (value === "cline") {
-				startClineAuth()
+			if (value === "oca") {
+				// Show employee check screen before starting auth
+				setStep("oca_employee_check")
 			} else if (value === "openai-codex") {
 				setStep("openai_codex_auth")
 				startOpenAiCodexAuth()
@@ -452,7 +379,7 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 				setStep("apikey")
 			}
 		},
-		[startClineAuth, startOpenAiCodexAuth],
+		[startOcaAuth, startOpenAiCodexAuth],
 	)
 
 	const handleApiKeySubmit = useCallback(
@@ -469,42 +396,22 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 		[selectedProvider],
 	)
 
-	const saveConfiguration = useCallback(
-		async (model: string, base: string) => {
+	// 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()
-				const config: Record<string, string> = {
-					actModeApiProvider: selectedProvider,
-					planModeApiProvider: selectedProvider,
-					actModeApiModelId: model,
-					planModeApiModelId: model,
-					apiProvider: selectedProvider,
-				}
-
-				// Add API key or Bedrock-specific config
-				if (selectedProvider === "bedrock" && bedrockConfig) {
-					const bedrockFields: Record<string, unknown> = {
-						awsAuthentication: bedrockConfig.awsAuthentication,
-						awsRegion: bedrockConfig.awsRegion,
-						awsUseCrossRegionInference: bedrockConfig.awsUseCrossRegionInference,
-					}
-					if (bedrockConfig.awsProfile !== undefined) bedrockFields.awsProfile = bedrockConfig.awsProfile
-					if (bedrockConfig.awsAccessKey) bedrockFields.awsAccessKey = bedrockConfig.awsAccessKey
-					if (bedrockConfig.awsSecretKey) bedrockFields.awsSecretKey = bedrockConfig.awsSecretKey
-					if (bedrockConfig.awsSessionToken) bedrockFields.awsSessionToken = bedrockConfig.awsSessionToken
-					Object.assign(config, bedrockFields)
-				} else if (apiKey) {
-					const keyField = ProviderToApiKeyMap[selectedProvider as keyof typeof ProviderToApiKeyMap]
-					if (keyField) {
-						const fields = Array.isArray(keyField) ? keyField : [keyField]
-						config[fields[0]] = apiKey
-					}
-				}
-
-				if (base) {
-					config.openAiBaseUrl = base
-				}
-				stateManager.setApiConfiguration(config)
+				stateManager.setGlobalState("welcomeViewCompleted", true)
 				await stateManager.flushPendingState()
 
 				setStep("success")
@@ -513,11 +420,49 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 				setStep("error")
 			}
 		},
-		[selectedProvider, apiKey, bedrockConfig],
+		[bedrockConfig, controller],
+	)
+
+	const saveConfiguration = useCallback(
+		async (model: string, base: string) => {
+			try {
+				if (selectedProvider === "bedrock" && bedrockConfig) {
+					await applyBedrockConfig({
+						bedrockConfig,
+						modelId: model,
+						controller,
+					})
+				} else {
+					await applyProviderConfig({
+						providerId: selectedProvider,
+						apiKey,
+						modelId: model,
+						baseUrl: base,
+						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")
+			}
+		},
+		[selectedProvider, apiKey, bedrockConfig, controller],
 	)
 
 	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)
 			}
@@ -565,11 +510,18 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 	}, [])
 
 	// Auto-navigate to welcome after success (immediate)
+	// For quick setup mode (no onNavigateToWelcome), exit the Ink app
 	useEffect(() => {
-		if (step === "success" && onNavigateToWelcome) {
-			onNavigateToWelcome()
+		if (step === "success") {
+			if (onNavigateToWelcome) {
+				onNavigateToWelcome()
+			} else {
+				// Quick setup mode - exit Ink app after successful configuration
+				// The cleanup handler in runInkApp will handle process exit
+				exit()
+			}
 		}
-	}, [step, onNavigateToWelcome])
+	}, [step, onNavigateToWelcome, exit])
 
 	// Error screen menu items
 	const errorMenuItems: SelectItem[] = useMemo(() => {
@@ -618,6 +570,9 @@ 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")
 				}
@@ -626,6 +581,12 @@ 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")
+				break
 			case "cline_auth":
 				setStep("menu")
 				break
@@ -728,7 +689,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-20250514, gpt-4o</Text>
+						<Text color="gray">e.g., claude-sonnet-4-6, gpt-4o</Text>
 						<Text> </Text>
 						<TextInput onChange={setModelId} onSubmit={handleModelIdSubmit} placeholder="model-id" value={modelId} />
 						<Text> </Text>
@@ -764,6 +725,10 @@ 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 (
 					<Box flexDirection="column">
@@ -819,6 +784,18 @@ 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
@@ -848,11 +825,13 @@ 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",
 		"baseurl",
 		"cline_auth",
+		"oca_auth",
 		"cline_model",
 		"openai_codex_auth",
 		"bedrock",
@@ -940,9 +919,12 @@ export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onEr
 						<Text> </Text>
 						{mainMenuItems.map((item, index) => (
 							<Box key={item.value}>
-								<Text color={index === menuIndex ? COLORS.primaryBlue : undefined}>
-									{index === menuIndex ? "❯ " : "  "}
-									{item.label}
+								<Text>
+									<Text color={index === menuIndex ? COLORS.primaryBlue : undefined}>
+										{index === menuIndex ? "❯ " : "  "}
+										{item.label}
+									</Text>
+									{item.value === "cline_auth" && <Text color="yellow"> (try Opus 4.6!)</Text>}
 								</Text>
 							</Box>
 						))}

cli/src/components/BedrockCustomModelFlow.tsx

@@ -0,0 +1,111 @@
+/**
+ * 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,8 +114,11 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 
 	// Filtered regions
 	const filteredRegions = useMemo(() => {
-		const search = regionSearch.toLowerCase()
-		return search ? AWS_REGIONS.filter((r) => r.includes(search)) : AWS_REGIONS
+		const search = regionSearch.toLowerCase().trim()
+		if (!search) {
+			return AWS_REGIONS
+		}
+		return AWS_REGIONS.filter((r) => r.toLowerCase().includes(search))
 	}, [regionSearch])
 
 	const {
@@ -170,10 +173,18 @@ 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: filteredRegions[regionIndex] || "us-east-1",
+			awsRegion: getSelectedRegion(),
 			awsUseCrossRegionInference: crossRegion,
 		}
 		if (authMethod === "profile") {
@@ -184,7 +195,7 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 			if (sessionToken) config.awsSessionToken = sessionToken
 		}
 		onComplete(config)
-	}, [authMethod, profileName, accessKey, secretKey, sessionToken, filteredRegions, regionIndex, crossRegion, onComplete])
+	}, [authMethod, profileName, accessKey, secretKey, sessionToken, getSelectedRegion, crossRegion, onComplete])
 
 	// Handle input for auth_method, region, and options steps
 	useInput(
@@ -204,11 +215,11 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 			} else if (step === "region") {
 				if (key.escape) {
 					goBack()
-				} else if (key.upArrow) {
+				} else if (key.upArrow && filteredRegions.length > 0) {
 					setRegionIndex((prev) => (prev > 0 ? prev - 1 : filteredRegions.length - 1))
-				} else if (key.downArrow) {
+				} else if (key.downArrow && filteredRegions.length > 0) {
 					setRegionIndex((prev) => (prev < filteredRegions.length - 1 ? prev + 1 : 0))
-				} else if (key.return && filteredRegions.length > 0) {
+				} else if (key.return && (filteredRegions.length > 0 || regionSearch.trim())) {
 					setStep("options")
 				} else if (key.backspace || key.delete) {
 					setRegionSearch((prev) => prev.slice(0, -1))
@@ -330,7 +341,7 @@ export const BedrockSetup: React.FC<BedrockSetupProps> = ({ isActive, onComplete
 				<Text color="white">AWS Region</Text>
 				<Text> </Text>
 				<Box>
-					<Text color="gray">Search: </Text>
+					<Text color="gray">Search or enter custom region: </Text>
 					<Text color="white">{regionSearch}</Text>
 					<Text inverse> </Text>
 				</Box>
@@ -350,7 +361,6 @@ 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.test.tsx

@@ -0,0 +1,106 @@
+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

@@ -10,38 +10,80 @@ import { CLINE_ACCOUNT_AUTH_ERROR_MESSAGE } from "@shared/ClineAccount"
 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 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.
+ * 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[] {
+	// 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)
+
+	if (!matches || parts.length <= 1) {
+		return [text]
+	}
+
+	const nodes: React.ReactNode[] = []
+	parts.forEach((part, i) => {
+		if (part) {
+			nodes.push(part)
+		}
+		if (matches[i]) {
+			nodes.push(
+				<React.Fragment key={`${keyPrefix}-act-mode-${i}`}>
+					{matches[i]}
+					<Text color="gray"> (Tab)</Text>
+				</React.Fragment>,
+			)
+		}
+	})
+
+	return nodes
+}
 
 /**
  * Render inline markdown: **bold**, *italic*, `code`
+ * Also adds "(Tab)" hints after "Act mode" mentions.
  * Returns array of React nodes with appropriate styling
  */
 function renderInlineMarkdown(text: string): React.ReactNode[] {
 	const nodes: React.ReactNode[] = []
+	let hintCallIndex = 0
+	const addHintedText = (value: string) => addActModeHint(value, `hint-${hintCallIndex++}`)
 	// Match **bold**, *italic*, or `code` - order matters (** before *)
 	const regex = /(\*\*[^*]+\*\*|\*[^*]+\*|`[^`]+`)/g
 	let lastIndex = 0
 	let match
 
 	while ((match = regex.exec(text)) !== null) {
-		// Add text before match
+		// Add text before match (with Act Mode hint processing)
 		if (match.index > lastIndex) {
-			nodes.push(text.slice(lastIndex, match.index))
+			const beforeText = text.slice(lastIndex, match.index)
+			nodes.push(...addHintedText(beforeText))
 		}
 
 		const fullMatch = match[0]
 		const key = `md-${match.index}`
 
 		if (fullMatch.startsWith("**") && fullMatch.endsWith("**")) {
-			// Bold
+			// Bold - also process for Act Mode hints inside bold text
+			const boldContent = fullMatch.slice(2, -2)
+			const hintedContent = addHintedText(boldContent)
 			nodes.push(
 				<Text bold key={key}>
-					{fullMatch.slice(2, -2)}
+					{hintedContent}
 				</Text>,
 			)
 		} else if (fullMatch.startsWith("*") && fullMatch.endsWith("*")) {
@@ -59,12 +101,12 @@ function renderInlineMarkdown(text: string): React.ReactNode[] {
 		lastIndex = regex.lastIndex
 	}
 
-	// Add remaining text
+	// Add remaining text (with Act Mode hint processing)
 	if (lastIndex < text.length) {
-		nodes.push(text.slice(lastIndex))
+		nodes.push(...addHintedText(text.slice(lastIndex)))
 	}
 
-	return nodes.length > 0 ? nodes : [text]
+	return nodes.length > 0 ? nodes : addHintedText(text)
 }
 
 /**
@@ -88,10 +130,20 @@ interface ChatMessageProps {
  * For this to work properly, parent containers must have width="100%"
  * so flexGrow={1} on the content box has a reference width to fill.
  */
-const DotRow: React.FC<{ children: React.ReactNode; color?: string }> = ({ children, color }) => (
+const DotRow: React.FC<{ children: React.ReactNode; color?: string; flashing?: boolean }> = ({
+	children,
+	color,
+	flashing = false,
+}) => (
 	<Box flexDirection="row">
 		<Box width={2}>
-			<Text color={color}>⏺</Text>
+			{flashing ? (
+				<Text color={color}>
+					<Spinner type="toggle8" />
+				</Text>
+			) : (
+				<Text color={color}>⏺</Text>
+			)}
 		</Box>
 		<Box flexGrow={1}>{children}</Box>
 	</Box>
@@ -175,7 +227,7 @@ function truncate(text: string, maxLength: number): string {
 /**
  * Format tool result for display
  */
-function formatToolResult(result: string, maxLines: number = 5): string[] {
+function formatToolResult(result: string, maxLines = 5): string[] {
 	const lines = result.split("\n")
 	if (lines.length <= maxLines) {
 		return lines
@@ -185,8 +237,8 @@ function formatToolResult(result: string, maxLines: number = 5): string[] {
 	return displayLines
 }
 
-export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
-	const { type, ask, say, text } = message
+export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode, isStreaming }) => {
+	const { type, ask, say, text, partial } = message
 	const toolColor = mode === "plan" ? "yellow" : COLORS.primaryBlue
 	const { columns: terminalWidth } = useTerminalSize()
 
@@ -224,7 +276,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 		return (
 			<Box flexDirection="column" marginBottom={1} width="100%">
 				<DotRow>
-					<Text>{text}</Text>
+					<MarkdownText>{text}</MarkdownText>
 				</DotRow>
 			</Box>
 		)
@@ -242,11 +294,11 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 			if (isFileEditTool(toolInfo.toolName) && filePath && toolInfo.args.content) {
 				return (
 					<Box flexDirection="column" marginBottom={1} width="100%">
-						<DotRow color={toolColor}>
+						<DotRow color={toolColor} flashing={partial === true && isStreaming}>
 							<ToolCallText args={toolInfo.args} isAsk={isToolAsk} mode={mode} toolName={toolInfo.toolName} />
 						</DotRow>
 						<Box marginLeft={2}>
-							<DiffView content={toolInfo.args.content} filePath={filePath as string | undefined} />
+							<DiffView content={toolInfo.args.content as string} filePath={filePath as string | undefined} />
 						</Box>
 					</Box>
 				)
@@ -261,7 +313,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 
 			return (
 				<Box flexDirection="column" marginBottom={1} width="100%">
-					<DotRow color={toolColor}>
+					<DotRow color={toolColor} flashing={partial === true && isStreaming}>
 						<ToolCallText args={toolInfo.args} isAsk={isToolAsk} mode={mode} toolName={toolInfo.toolName} />
 					</DotRow>
 					{contentLines.length > 0 && (
@@ -280,7 +332,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 		if (isToolSay) {
 			return (
 				<Box flexDirection="column" marginBottom={1} width="100%">
-					<DotRow color={toolColor}>
+					<DotRow color={toolColor} flashing={partial === true && isStreaming}>
 						<Text color={toolColor}>{truncate(text, 100)}</Text>
 					</DotRow>
 				</Box>
@@ -302,7 +354,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 
 		return (
 			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={toolColor}>
+				<DotRow color={toolColor} flashing={partial === true && isStreaming}>
 					<Text>
 						<Text color={toolColor}>{label}</Text>
 						<Text>{truncate(command, 120)}</Text>
@@ -341,12 +393,12 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 	if ((type === "ask" && ask === "use_mcp_server") || say === "use_mcp_server") {
 		const isAsk = type === "ask"
 		const parsed = text
-			? jsonParseSafe<ClineAskUseMcpServer>(text, {
-					type: undefined as ClineAskUseMcpServer["type"] | undefined,
+			? jsonParseSafe<Partial<ClineAskUseMcpServer> & { serverName: string }>(text, {
+					type: undefined,
 					serverName: "unknown server",
-					toolName: undefined as string | undefined,
-					arguments: undefined as string | undefined,
-					uri: undefined as string | undefined,
+					toolName: undefined,
+					arguments: undefined,
+					uri: undefined,
 				})
 			: undefined
 
@@ -372,7 +424,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 
 		return (
 			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={toolColor}>
+				<DotRow color={toolColor} flashing={partial === true && isStreaming}>
 					<Text>
 						<Text color={toolColor}>{actionLabel}</Text>
 						<Text>{`: ${serverName}`}</Text>
@@ -397,12 +449,16 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 		)
 	}
 
+	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)
 		return (
 			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={toolColor}>
+				<DotRow color={toolColor} flashing={partial === true && isStreaming}>
 					<Text color={toolColor}>MCP response</Text>
 				</DotRow>
 				<Box flexDirection="column" marginLeft={2} width="100%">
@@ -543,7 +599,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 	if (say === "browser_action" || say === "browser_action_launch") {
 		return (
 			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={toolColor}>
+				<DotRow color={toolColor} flashing={partial === true && isStreaming}>
 					<Text>
 						<Text color={toolColor}>Cline used the browser</Text>
 						{text && (
@@ -562,7 +618,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 	if (say === "mcp_server_request_started") {
 		return (
 			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={toolColor}>
+				<DotRow color={toolColor} flashing={partial === true && isStreaming}>
 					<Text>
 						<Text color={toolColor}>Cline is using an MCP tool</Text>
 						{text && (
@@ -690,7 +746,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 	if (type === "ask" && ask === "condense" && text) {
 		return (
 			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={COLORS.primaryBlue}>
+				<DotRow color={COLORS.primaryBlue} flashing={partial === true && isStreaming}>
 					<Text bold color={COLORS.primaryBlue}>
 						Cline wants to condense your conversation:
 					</Text>
@@ -706,7 +762,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 	if (type === "ask" && ask === "summarize_task" && text) {
 		return (
 			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={COLORS.primaryBlue}>
+				<DotRow color={COLORS.primaryBlue} flashing={partial === true && isStreaming}>
 					<Text bold color={COLORS.primaryBlue}>
 						Cline wants to summarize the task:
 					</Text>
@@ -722,7 +778,7 @@ export const ChatMessage: React.FC<ChatMessageProps> = ({ message, mode }) => {
 	if (type === "ask" && ask === "report_bug" && text) {
 		return (
 			<Box flexDirection="column" marginBottom={1} width="100%">
-				<DotRow color={COLORS.primaryBlue}>
+				<DotRow color={COLORS.primaryBlue} flashing={partial === true && isStreaming}>
 					<Text bold color={COLORS.primaryBlue}>
 						Cline wants to create a Github issue:
 					</Text>
@@ -751,6 +807,8 @@ 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.test.tsx

@@ -1,7 +1,7 @@
 /**
  * Tests for ChatView component exit and cleanup behavior
  *
- * These tests verify that when the user exits (via Ctrl+C or other means),
+ * These tests verify that when the user exits (via shutdown event or other means),
  * the input field is properly hidden before the app terminates.
  */
 
@@ -12,7 +12,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
 import { ChatView } from "./ChatView"
 
 // Helper to wait for async state updates
-// Using 60ms since handleExit has a 50ms setTimeout
 const delay = (ms: number = 60) => new Promise((resolve) => setTimeout(resolve, ms))
 
 // Type for our exit mock function
@@ -175,12 +174,21 @@ vi.mock("@shared/getApiMetrics", () => ({
 		totalTokensOut: 0,
 		totalCost: 0,
 	})),
+	getLastApiReqTotalTokens: vi.fn(() => 0),
 }))
 
 vi.mock("child_process", () => ({
+	exec: vi.fn(),
 	execSync: vi.fn(() => "main"),
 }))
 
+// Mock telemetry service to prevent HostProvider errors in shutdown handler
+vi.mock("@/services/telemetry", () => ({
+	telemetryService: {
+		captureHostEvent: vi.fn(),
+	},
+}))
+
 // Helper to create a typed mock for onExit
 const createExitMock = (): ExitMockFn => vi.fn() as ExitMockFn
 
@@ -213,33 +221,6 @@ describe("ChatView Exit and Cleanup", () => {
 		})
 	})
 
-	describe("Ctrl+C exit handling", () => {
-		it("should hide input but keep footer, then call onExit", async () => {
-			const { lastFrame, stdin } = render(<ChatView onExit={mockOnExit} />)
-
-			// Verify UI visible before Ctrl+C
-			expect(lastFrame()).toContain("Input:")
-			expect(lastFrame()).toContain("@ for files")
-
-			// Simulate Ctrl+C
-			stdin.write("\x03")
-
-			// onExit should not be called immediately
-			expect(mockOnExit).not.toHaveBeenCalled()
-
-			// Wait for state update and callback
-			await delay()
-
-			// Input should be hidden, but footer should remain
-			const frameAfter = lastFrame()
-			expect(frameAfter).not.toContain("Input:")
-			expect(frameAfter).toContain("@ for files")
-
-			// onExit should have been called
-			expect(mockOnExit).toHaveBeenCalledTimes(1)
-		})
-	})
-
 	describe("Shutdown event handling", () => {
 		it("should subscribe on mount and unsubscribe on unmount", () => {
 			const { unmount } = render(<ChatView onExit={mockOnExit} />)
@@ -249,39 +230,59 @@ describe("ChatView Exit and Cleanup", () => {
 			expect(shutdownMockState.listeners.length).toBe(0)
 		})
 
-		it("should hide UI when shutdown event fires", async () => {
+		it("should hide input when shutdown event fires", async () => {
 			const { lastFrame } = render(<ChatView onExit={mockOnExit} />)
 
+			// Input should be visible initially
 			expect(lastFrame()).toContain("Input:")
 
+			// Fire shutdown event (simulates Ctrl+C)
 			shutdownMockState.fire()
 			await delay()
 
+			// Input should be hidden after shutdown
 			expect(lastFrame()).not.toContain("Input:")
 		})
+
+		it("should preserve footer when shutdown event fires", async () => {
+			const { lastFrame } = render(<ChatView onExit={mockOnExit} />)
+
+			// Footer should be visible initially
+			expect(lastFrame()).toContain("@ for files")
+
+			// Fire shutdown event
+			shutdownMockState.fire()
+			await delay()
+
+			// Footer should still be present (only input is hidden)
+			expect(lastFrame()).toContain("@ for files")
+		})
 	})
 
 	describe("Edge cases", () => {
-		it("should handle exit when onExit prop is undefined", async () => {
-			const { lastFrame, stdin } = render(<ChatView />)
+		it("should handle shutdown event when onExit prop is undefined", async () => {
+			const { lastFrame } = render(<ChatView />)
 
-			stdin.write("\x03")
+			// Fire shutdown event
+			shutdownMockState.fire()
 			await delay()
 
 			// Should not throw, UI should still hide
 			expect(lastFrame()).not.toContain("Input:")
 		})
 
-		it("should handle multiple Ctrl+C presses gracefully", async () => {
-			const { stdin } = render(<ChatView onExit={mockOnExit} />)
+		it("should handle multiple shutdown events gracefully", async () => {
+			const { lastFrame } = render(<ChatView onExit={mockOnExit} />)
 
-			stdin.write("\x03")
-			stdin.write("\x03")
-			stdin.write("\x03")
+			// Fire multiple shutdown events
+			shutdownMockState.fire()
+			shutdownMockState.fire()
+			shutdownMockState.fire()
 
 			await delay()
 
-			expect(mockOnExit).toHaveBeenCalled()
+			// UI should still hide properly
+			expect(lastFrame()).not.toContain("Input:")
 		})
 	})
 })
@@ -294,14 +295,15 @@ describe("ChatView UI State During Exit", () => {
 
 	it("should preserve static content and footer, only hide input during exit", async () => {
 		const onExit = createExitMock()
-		const { lastFrame, stdin } = render(<ChatView onExit={onExit} />)
+		const { lastFrame } = render(<ChatView onExit={onExit} />)
 
 		// Footer contains auto-approve toggle
 		expect(lastFrame()).toContain("Auto-approve")
 		expect(lastFrame()).toContain("What can I do for you?")
 		expect(lastFrame()).toContain("Input:")
 
-		stdin.write("\x03")
+		// Fire shutdown event
+		shutdownMockState.fire()
 		await delay()
 
 		const frameAfter = lastFrame()

cli/src/components/ChatView.tsx

@@ -101,16 +101,19 @@
  * - log-update: node_modules/ink/build/log-update.js (eraseLines logic)
  */
 
-import type { ModelInfo } from "@shared/api"
+import type { ApiProvider, ModelInfo } from "@shared/api"
 import { combineCommandSequences } from "@shared/combineCommandSequences"
+import { combineHookSequences } from "@shared/combineHookSequences"
 import type { ClineAsk, ClineMessage } from "@shared/ExtensionMessage"
 import { getApiMetrics, getLastApiReqTotalTokens } from "@shared/getApiMetrics"
 import { EmptyRequest, StringRequest } from "@shared/proto/cline/common"
 import type { SlashCommandInfo } from "@shared/proto/cline/slash"
 import { CLI_ONLY_COMMANDS } from "@shared/slashCommands"
+import { getProviderDefaultModelId, getProviderModelIdKey } from "@shared/storage"
 import type { Mode } from "@shared/storage/types"
 import { execSync } from "child_process"
 import { Box, Static, Text, useApp, useInput } from "ink"
+// biome-ignore lint/style/useImportType: JSX requires React as a value (jsx: "react" in tsconfig)
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { getAvailableSlashCommands } from "@/core/controller/slash/getAvailableSlashCommands"
 import { showTaskWithId } from "@/core/controller/task/showTaskWithId"
@@ -120,7 +123,9 @@ import { Logger } from "@/shared/services/Logger"
 import { Session } from "@/shared/services/Session"
 import { COLORS } from "../constants/colors"
 import { useTaskContext, useTaskState } from "../context/TaskContext"
+import { useHomeEndKeys } from "../hooks/useHomeEndKeys"
 import { useIsSpinnerActive } from "../hooks/useStateSubscriber"
+import { findWordEnd, findWordStart, useTextInput } from "../hooks/useTextInput"
 import { moveCursorDown, moveCursorUp } from "../utils/cursor"
 import { setTerminalTitle } from "../utils/display"
 import {
@@ -133,6 +138,7 @@ import {
 import { isMouseEscapeSequence } from "../utils/input"
 import { jsonParseSafe, parseImagesFromInput } from "../utils/parser"
 import { extractSlashQuery, filterCommands, insertSlashCommand, sortCommandsWorkflowsFirst } from "../utils/slash-commands"
+import { waitFor } from "../utils/timeout"
 import { isFileEditTool, parseToolFromMessage } from "../utils/tools"
 import { shutdownEvent } from "../vscode-shim"
 import { ActionButtons, type ButtonActionType, getButtonConfig, getVisibleButtons } from "./ActionButtons"
@@ -144,15 +150,33 @@ 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
 	onComplete?: () => void
 	onError?: () => void
-	robotTopRow?: number
 	initialPrompt?: string
 	initialImages?: string[]
 	taskId?: string
@@ -206,9 +230,9 @@ function getGitDiffStats(cwd?: string): GitDiffStats | null {
 		const delMatch = output.match(/(\d+) deletion/)
 
 		return {
-			files: filesMatch ? parseInt(filesMatch[1], 10) : 0,
-			additions: addMatch ? parseInt(addMatch[1], 10) : 0,
-			deletions: delMatch ? parseInt(delMatch[1], 10) : 0,
+			files: filesMatch ? Number.parseInt(filesMatch[1], 10) : 0,
+			additions: addMatch ? Number.parseInt(addMatch[1], 10) : 0,
+			deletions: delMatch ? Number.parseInt(delMatch[1], 10) : 0,
 		}
 	} catch {
 		return null
@@ -219,7 +243,7 @@ function getGitDiffStats(cwd?: string): GitDiffStats | null {
  * Create a progress bar for context window usage
  * Returns { filled, empty } strings to allow different coloring
  */
-function createContextBar(used: number, total: number, width: number = 8): { filled: string; empty: string } {
+function createContextBar(used: number, total: number, width = 8): { filled: string; empty: string } {
 	const ratio = Math.min(used / total, 1)
 	// Use ceil so any usage > 0 shows at least one bar
 	const filledCount = used > 0 ? Math.max(1, Math.ceil(ratio * width)) : 0
@@ -309,7 +333,7 @@ function parseAskOptions(text: string): string[] {
  */
 function expandPastedTexts(text: string, pastedTexts: Map<number, string>): string {
 	return text.replace(/\[Pasted text #(\d+) \+\d+ lines\]/g, (match, num) => {
-		const content = pastedTexts.get(parseInt(num, 10))
+		const content = pastedTexts.get(Number.parseInt(num, 10))
 		return content ?? match
 	})
 }
@@ -319,7 +343,6 @@ export const ChatView: React.FC<ChatViewProps> = ({
 	onExit,
 	onComplete: _onComplete,
 	onError,
-	robotTopRow,
 	initialPrompt,
 	initialImages,
 	taskId,
@@ -335,9 +358,27 @@ export const ChatView: React.FC<ChatViewProps> = ({
 	// Prefer prop controller over context controller (memoized for stable reference in callbacks)
 	const ctrl = useMemo(() => controller || taskController, [controller, taskController])
 
-	// Input state
-	const [textInput, setTextInput] = useState("")
-	const [cursorPos, setCursorPos] = useState(0)
+	// Input state - using hook for text editing with keyboard shortcuts
+	const {
+		text: textInput,
+		cursorPos,
+		setText: setTextInput,
+		setCursorPos,
+		handleKeyboardSequence,
+		handleCtrlShortcut,
+		deleteCharBefore,
+		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
+	const cursorPosRef = useRef(cursorPos)
+	cursorPosRef.current = cursorPos
+
 	const [fileResults, setFileResults] = useState<FileSearchResult[]>([])
 	const [selectedIndex, setSelectedIndex] = useState(0) // For file menu
 	const [historyIndex, setHistoryIndex] = useState(-1) // -1 = not browsing history, 0+ = history item index
@@ -348,8 +389,10 @@ 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>>(new Map())
-	const pasteCounterRef = useRef(0)
+	const [pastedTexts, setPastedTexts] = useState<Map<number, string>>(() => {
+		return inputStateStorage.get(storageKey)?.pastedTexts ?? new Map()
+	})
+	const pasteCounterRef = useRef<number>(inputStateStorage.get(storageKey)?.pasteCounter ?? 0)
 	// Track paste timing to combine chunks that arrive in rapid succession
 	const lastPasteTimeRef = useRef<number>(0)
 	const activePasteNumRef = useRef<number>(0)
@@ -367,12 +410,46 @@ export const ChatView: React.FC<ChatViewProps> = ({
 
 	// Panel state
 	const [activePanel, setActivePanel] = useState<
-		{ type: "settings"; initialMode?: "model-picker" | "featured-models" } | { type: "history" } | { type: "help" } | null
+		| { type: "settings"; initialMode?: "model-picker" | "featured-models"; initialModelKey?: "actModelId" | "planModelId" }
+		| { type: "history" }
+		| { type: "help" }
+		| { type: "skills" }
+		| null
 	>(null)
 
+	// Handle Home/End keys from raw stdin (Ink doesn't expose these in useInput)
+	useHomeEndKeys({
+		onHome: useCallback(() => setCursorPos(0), [setCursorPos]),
+		onEnd: useCallback(() => setCursorPos(textInputRef.current.length), [setCursorPos]),
+		isActive: !activePanel, // Only active when no panel is open
+	})
+
 	// 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.
@@ -399,7 +476,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 		return stateManager.getGlobalSettingsKey("mode") || "act"
 	})
 
-	const [yolo, setYolo] = useState<boolean>(() => StateManager.get().getGlobalSettingsKey("yoloModeToggled") ?? false)
+	const [yolo, _setYolo] = useState<boolean>(() => StateManager.get().getGlobalSettingsKey("yoloModeToggled") ?? false)
 	const [autoApproveAll, setAutoApproveAll] = useState<boolean>(
 		() => StateManager.get().getGlobalSettingsKey("autoApproveAllToggled") ?? false,
 	)
@@ -417,21 +494,24 @@ export const ChatView: React.FC<ChatViewProps> = ({
 		StateManager.get().setGlobalState("autoApproveAllToggled", newValue)
 	}, [autoApproveAll])
 
-	// Get model ID based on current mode
-	// Re-read when activePanel changes (settings panel closes) to pick up changes
-	const modelId = useMemo(() => {
-		const stateManager = StateManager.get()
-		const modelKey = mode === "act" ? "actModeApiModelId" : "planModeApiModelId"
-		return (stateManager.getGlobalSettingsKey(modelKey) as string) || "claude-sonnet-4-20250514"
-	}, [mode, activePanel])
-
-	// Get provider based on current mode
+	// Get provider based on current mode (computed first since modelId depends on it)
 	const provider = useMemo(() => {
 		const stateManager = StateManager.get()
 		const providerKey = mode === "act" ? "actModeApiProvider" : "planModeApiProvider"
-		return (stateManager.getGlobalSettingsKey(providerKey) as string) || "anthropic"
+		return (stateManager.getGlobalSettingsKey(providerKey) as string) || ""
 	}, [mode, activePanel])
 
+	// Get model ID based on current mode and provider
+	// Different providers use different state keys (e.g., cline uses actModeOpenRouterModelId)
+	// Re-read when activePanel changes (settings panel closes) to pick up changes
+	// Falls back to provider's default model if no model has been explicitly set
+	const modelId = useMemo(() => {
+		if (!provider) return ""
+		const stateManager = StateManager.get()
+		const modelKey = getProviderModelIdKey(provider as ApiProvider, mode)
+		return (stateManager.getGlobalSettingsKey(modelKey) as string) || getProviderDefaultModelId(provider as ApiProvider) || ""
+	}, [mode, provider, activePanel])
+
 	const toggleMode = useCallback(async () => {
 		const newMode: Mode = mode === "act" ? "plan" : "act"
 		setMode(newMode)
@@ -462,12 +542,14 @@ 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])
+	}, [ctrl, clearState, storageKey])
 
 	const refs = useRef({
 		searchTimeout: null as NodeJS.Timeout | null,
@@ -574,11 +656,14 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			if (m.say === "checkpoint_created") return false
 			if (m.say === "api_req_started") return false
 			if (m.say === "api_req_retried") return false // Redundant with error_retry messages
+			if (m.say === "reasoning") return false // Hide thinking traces - they clutter the UI
 			return true
 		})
 
-		// Combine command messages with their output (like webview does)
-		return combineCommandSequences(filtered)
+		// Combine hook messages with their output, then command messages (like webview does)
+		// CLI always has hooks enabled, so we always apply combineHookSequences
+		const withHooks = combineHookSequences(filtered)
+		return combineCommandSequences(withHooks)
 	}, [messages])
 
 	// Detect task switches by watching first message timestamp change.
@@ -725,6 +810,8 @@ 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)
@@ -732,7 +819,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 				// Controller may be disposed
 			}
 		},
-		[ctrl, pendingAsk, pastedTexts],
+		[ctrl, pendingAsk, pastedTexts, storageKey],
 	)
 
 	// Handle cancel/interrupt
@@ -823,6 +910,8 @@ 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
@@ -850,10 +939,12 @@ export const ChatView: React.FC<ChatViewProps> = ({
 				onError?.()
 			}
 		},
-		[ctrl, onError, pastedTexts],
+		[ctrl, onError, pastedTexts, storageKey],
 	)
 
 	// Auto-submit initial prompt if provided
+	// When taskId is also provided, this sends the prompt to resume the existing task
+	// When no taskId, this creates a new task with the prompt
 	useEffect(() => {
 		const autoSubmit = async () => {
 			if (!initialPrompt && (!initialImages || initialImages.length === 0)) {
@@ -874,8 +965,32 @@ export const ChatView: React.FC<ChatViewProps> = ({
 				if (initialPrompt) {
 					setTerminalTitle(initialPrompt)
 				}
-				// initialImages are already data URLs from index.ts processing
-				await ctrl.initTask(initialPrompt || "", initialImages && initialImages.length > 0 ? initialImages : undefined)
+
+				if (taskId) {
+					// Resuming an existing task with a prompt - wait for task to load first
+					// The task loading happens in the other useEffect via showTaskWithId
+					// We need to wait for it to complete before sending the resume message
+					const task = await waitFor(() => ctrl.task, 5000)
+
+					if (task) {
+						// Send the prompt as a message to resume the task
+						await task.handleWebviewAskResponse("messageResponse", initialPrompt || "")
+					} else {
+						// Task failed to load, fall back to creating new task
+						Logger.error(`Failed to load task ${taskId} for resume, creating new task instead`)
+						await ctrl.initTask(
+							initialPrompt || "",
+							initialImages && initialImages.length > 0 ? initialImages : undefined,
+						)
+					}
+				} else {
+					// New task - use initTask
+					// initialImages are already data URLs from index.ts processing
+					await ctrl.initTask(
+						initialPrompt || "",
+						initialImages && initialImages.length > 0 ? initialImages : undefined,
+					)
+				}
 			} catch (_error) {
 				onError?.()
 			}
@@ -939,13 +1054,48 @@ export const ChatView: React.FC<ChatViewProps> = ({
 	}, [mentionInfo.inMentionMode, mentionInfo.query, workspacePath])
 
 	// Handle keyboard input
+	//
+	// KEYBOARD PRIORITY ORDER (first match wins):
+	// 1. Mouse escape sequences -> filtered out (from AsciiMotionCli tracking)
+	// 2. Option+arrow escape sequences -> word navigation (handleKeyboardSequence)
+	// 3. Option+arrow via key.meta -> word navigation (backup for when Ink parses it)
+	// 4. Panel open -> bail (let panel handle its own input)
+	// 5. Slash menu open -> menu navigation (up/down/tab/return/escape)
+	// 6. File menu open -> menu navigation (up/down/tab/return/escape)
+	// 7. History navigation -> up/down when input empty or matches history item
+	// 8. Button actions -> "1"/"2" keys when buttons shown and no text typed
+	// 9. Ask responses -> return to send, numbers for option selection
+	// 10. Ctrl shortcuts -> Ctrl+A/E/W/U (handleCtrlShortcut)
+	// 11. Large paste detection -> collapse into placeholder
+	// 12. Normal input -> tab (mode toggle), return (submit), backspace, arrows, text
+	//
+	// Note: Home/End keys are handled separately by useHomeEndKeys hook because
+	// Ink doesn't expose them in useInput (it sets input='' for these keys).
+	//
 	useInput((input, key) => {
-		// Filter out mouse escape sequences from AsciiMotionCli's mouse tracking
+		// 1. Filter out mouse escape sequences from AsciiMotionCli's mouse tracking
 		if (isMouseEscapeSequence(input)) {
 			return
 		}
 
-		// When a panel is open, let the panel handle its own input
+		// 2. Handle Option+arrow escape sequences for word navigation
+		if (handleKeyboardSequence(input)) {
+			return
+		}
+
+		// 3. Handle Option+arrow via key.meta (backup - Ink sometimes parses these instead of passing raw sequence)
+		if (key.meta) {
+			if (key.leftArrow) {
+				setCursorPos(findWordStart(textInputRef.current, cursorPosRef.current))
+				return
+			}
+			if (key.rightArrow) {
+				setCursorPos(findWordEnd(textInputRef.current, cursorPosRef.current))
+				return
+			}
+		}
+
+		// 4. When a panel is open, let the panel handle its own input
 		if (activePanel) {
 			return
 		}
@@ -953,7 +1103,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 		const inSlashMenu = slashInfo.inSlashMode && filteredCommands.length > 0 && !slashMenuDismissed
 		const inFileMenu = mentionInfo.inMentionMode && fileResults.length > 0 && !inSlashMenu
 
-		// Slash command menu navigation (takes priority over file menu)
+		// 5. Slash command menu navigation (takes priority over file menu)
 		if (inSlashMenu) {
 			if (key.upArrow) {
 				setSelectedSlashIndex((i) => Math.max(0, i - 1))
@@ -984,13 +1134,16 @@ export const ChatView: React.FC<ChatViewProps> = ({
 						return
 					}
 					if (cmd.name === "models") {
-						// If separate models for plan/act is enabled, just open settings (user picks which mode)
-						const hasSeparateModels = StateManager.get().getGlobalSettingsKey("planActSeparateModelsSetting")
 						const apiConfig = StateManager.get().getApiConfiguration()
-						const provider = apiConfig.actModeApiProvider || apiConfig.planModeApiProvider
-						const initialMode =
-							hasSeparateModels || !provider ? undefined : provider === "cline" ? "featured-models" : "model-picker"
-						setActivePanel({ type: "settings", initialMode })
+						// Use current mode's provider to determine picker type
+						const provider =
+							mode === "act"
+								? apiConfig.actModeApiProvider || apiConfig.planModeApiProvider
+								: apiConfig.planModeApiProvider || apiConfig.actModeApiProvider
+						const initialMode = !provider ? undefined : provider === "cline" ? "featured-models" : "model-picker"
+						// Set model for current mode (plan or act)
+						const initialModelKey = mode === "act" ? "actModelId" : "planModelId"
+						setActivePanel({ type: "settings", initialMode, initialModelKey })
 						setTextInput("")
 						setCursorPos(0)
 						setSelectedSlashIndex(0)
@@ -1005,13 +1158,21 @@ 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") {
+					if (cmd.name === "exit" || cmd.name === "q") {
 						handleExit()
 						return
 					}
@@ -1030,7 +1191,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			}
 		}
 
-		// File mention menu navigation
+		// 6. File mention menu navigation
 		if (inFileMenu) {
 			if (key.upArrow) {
 				setSelectedIndex((i) => Math.max(0, i - 1))
@@ -1058,7 +1219,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			}
 		}
 
-		// History navigation with up/down arrows
+		// 7. History navigation with up/down arrows
 		// Only works when: input is empty, or input matches the currently selected history item
 		if (key.upArrow && !inSlashMenu && !inFileMenu) {
 			const historyItems = getHistoryItems()
@@ -1108,7 +1269,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			}
 		}
 
-		// Handle button actions (1 for primary, 2 for secondary)
+		// 8. Handle button actions (1 for primary, 2 for secondary)
 		// Only when buttons are enabled, not streaming, and no text has been typed
 		if (
 			buttonConfig.enableButtons &&
@@ -1123,7 +1284,8 @@ export const ChatView: React.FC<ChatViewProps> = ({
 				if (hasPrimary && buttonConfig.primaryAction) {
 					handleButtonAction(buttonConfig.primaryAction, true)
 					return
-				} else if (hasSecondary && !hasPrimary && buttonConfig.secondaryAction) {
+				}
+				if (hasSecondary && !hasPrimary && buttonConfig.secondaryAction) {
 					handleButtonAction(buttonConfig.secondaryAction, false)
 					return
 				}
@@ -1135,7 +1297,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			}
 		}
 
-		// Handle ask responses for options and text input
+		// 9. Handle ask responses for options and text input
 		if (pendingAsk && !isYoloSuppressed(yolo, pendingAsk.ask as ClineAsk | undefined)) {
 			// Allow sending text message for any ask type where sending is enabled
 			if (key.return && textInput.trim() && !buttonConfig.sendingDisabled) {
@@ -1144,7 +1306,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			}
 			// Number selection for options (only when no text typed yet)
 			if (askType === "options") {
-				const num = parseInt(input, 10)
+				const num = Number.parseInt(input, 10)
 				if (textInput === "" && !Number.isNaN(num) && num >= 1 && num <= askOptions.length) {
 					const selectedOption = askOptions[num - 1]
 					sendAskResponse("messageResponse", selectedOption)
@@ -1153,40 +1315,12 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			}
 		}
 
-		// Handle Ctrl+ shortcuts
-		const keydown = input?.toLowerCase()
-		if (key.ctrl && cursorPos && keydown) {
-			switch (keydown) {
-				case "u": // Ctrl+U, clear line before cursor
-					if (cursorPos > 0) {
-						setTextInput((prev) => prev.slice(cursorPos))
-						setCursorPos(0)
-					}
-					return
-				case "e": // Ctrl+E, move cursor to end
-					setCursorPos(textInput.length)
-					return
-				case "b": // Ctrl+B, move cursor left
-					setCursorPos((pos) => Math.max(0, pos - 1))
-					return
-				case "f": // Ctrl+F, move cursor right
-					setCursorPos((pos) => Math.min(textInput.length, pos + 1))
-					return
-				case "d": // Ctrl+D, delete character after cursor
-					if (cursorPos < textInput.length) {
-						setTextInput((prev) => prev.slice(0, cursorPos) + prev.slice(cursorPos + 1))
-					}
-					return
-				case "h": // Ctrl+H, delete character before cursor (like backspace)
-					if (cursorPos > 0) {
-						setTextInput((prev) => prev.slice(0, cursorPos - 1) + prev.slice(cursorPos))
-						setCursorPos((pos) => pos - 1)
-					}
-					return
-			}
+		// 10. Handle Ctrl+ shortcuts (Ctrl+A, Ctrl+E, Ctrl+W, etc.)
+		if (key.ctrl && input && handleCtrlShortcut(input)) {
+			return
 		}
 
-		// Detect paste by checking if input length exceeds threshold
+		// 11. Detect paste by checking if input length exceeds threshold
 		// Large pastes mess up the terminal UI, so we collapse them into a placeholder
 		// Terminal sends large pastes in multiple chunks, so we combine chunks that arrive rapidly
 		if (input && input.length > PASTE_COLLAPSE_THRESHOLD) {
@@ -1214,10 +1348,10 @@ export const ChatView: React.FC<ChatViewProps> = ({
 				}
 				pasteUpdateTimeoutRef.current = setTimeout(() => {
 					const newPlaceholder = `[Pasted text #${pasteNum} +${activePasteLinesRef.current} lines]`
-					setTextInput((prev) => {
-						const pattern = new RegExp(`\\[Pasted text #${pasteNum} \\+\\d+ lines\\]`)
-						return prev.replace(pattern, newPlaceholder)
-					})
+					const pattern = new RegExp(`\\[Pasted text #${pasteNum} \\+\\d+ lines\\]`)
+					const newText = textInputRef.current.replace(pattern, newPlaceholder)
+					textInputRef.current = newText // Update ref immediately so setCursorPos bounds check works
+					setTextInput(newText)
 					// Update cursor to be right after the placeholder
 					setCursorPos(activePasteStartPosRef.current + newPlaceholder.length)
 					Logger.info(`Paste #${pasteNum} complete: ${activePasteLinesRef.current} lines`)
@@ -1230,7 +1364,8 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			pasteCounterRef.current += 1
 			const pasteNum = pasteCounterRef.current
 			activePasteNumRef.current = pasteNum
-			activePasteStartPosRef.current = cursorPos // Track where placeholder starts
+			const currentCursorPos = cursorPosRef.current // Use ref to avoid stale closure
+			activePasteStartPosRef.current = currentCursorPos // Track where placeholder starts
 			// Count line breaks in the pasted content (handle both \n and \r)
 			const extraLines = input.match(/[\r\n]/g)?.length || 0
 			activePasteLinesRef.current = extraLines // Track total lines
@@ -1242,12 +1377,15 @@ export const ChatView: React.FC<ChatViewProps> = ({
 				return next
 			})
 
-			setTextInput((prev) => prev.slice(0, cursorPos) + placeholder + prev.slice(cursorPos))
-			setCursorPos(cursorPos + placeholder.length)
+			const newText =
+				textInputRef.current.slice(0, currentCursorPos) + placeholder + textInputRef.current.slice(currentCursorPos)
+			textInputRef.current = newText // Update ref immediately so setCursorPos bounds check works
+			setTextInput(newText)
+			setCursorPos(currentCursorPos + placeholder.length)
 			return // Exit early - don't also add the raw input via normal handling below
 		}
 
-		// Normal input handling
+		// 12. Normal input handling
 		if (key.shift && key.tab) {
 			toggleAutoApproveAll()
 			return
@@ -1263,10 +1401,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			return
 		}
 		if (key.backspace || key.delete) {
-			if (cursorPos > 0) {
-				setTextInput((prev) => prev.slice(0, cursorPos - 1) + prev.slice(cursorPos))
-				setCursorPos((pos) => pos - 1)
-			}
+			deleteCharBefore()
 			return
 		}
 		// Cursor movement (when not in a menu)
@@ -1275,21 +1410,20 @@ export const ChatView: React.FC<ChatViewProps> = ({
 			return
 		}
 		if (key.rightArrow && !inSlashMenu && !inFileMenu) {
-			setCursorPos((pos) => Math.min(textInput.length, pos + 1))
+			setCursorPos((pos) => Math.min(textInputRef.current.length, pos + 1))
 			return
 		}
 		if (key.upArrow && !inSlashMenu && !inFileMenu) {
-			setCursorPos(moveCursorUp(textInput, cursorPos))
+			setCursorPos(moveCursorUp(textInputRef.current, cursorPosRef.current))
 			return
 		}
 		if (key.downArrow && !inSlashMenu && !inFileMenu) {
-			setCursorPos(moveCursorDown(textInput, cursorPos))
+			setCursorPos(moveCursorDown(textInputRef.current, cursorPosRef.current))
 			return
 		}
 		// Normal input (single char or short paste)
 		if (input && !key.ctrl && !key.meta && !key.upArrow && !key.downArrow && !key.tab) {
-			setTextInput((prev) => prev.slice(0, cursorPos) + input + prev.slice(cursorPos))
-			setCursorPos((pos) => pos + input.length)
+			insertTextAtCursor(input)
 		}
 	})
 
@@ -1350,10 +1484,10 @@ export const ChatView: React.FC<ChatViewProps> = ({
 
 			{/* Dynamic region - only current streaming message + input */}
 			<Box flexDirection="column" width="100%">
-				{/* Animated robot and welcome text - only shown before messages start and user hasn't scrolled */}
+				{/* Animated robot and welcome text - only shown before messages start and user hasn't interacted */}
 				{isWelcomeState && (
 					<Box flexDirection="column" marginBottom={1}>
-						<AsciiMotionCli onScroll={() => setUserScrolled(true)} robotTopRow={robotTopRow} />
+						<AsciiMotionCli onInteraction={() => setUserScrolled(true)} />
 						<Text> </Text>
 						<Text bold color="white">
 							{centerText("What can I do for you?")}
@@ -1404,6 +1538,7 @@ export const ChatView: React.FC<ChatViewProps> = ({
 					<SettingsPanelContent
 						controller={ctrl}
 						initialMode={activePanel.initialMode}
+						initialModelKey={activePanel.initialModelKey}
 						onClose={() => setActivePanel(null)}
 					/>
 				)}
@@ -1420,6 +1555,19 @@ 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,6 +13,7 @@ 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,
@@ -21,6 +22,8 @@ import {
 	HookInfo,
 	HookRow,
 	MAX_VISIBLE,
+	ObjectEditorPanel,
+	ObjectEditorState,
 	parseValue,
 	SEPARATOR,
 	SectionHeader,
@@ -105,6 +108,8 @@ 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(
@@ -112,6 +117,13 @@ 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[] = []
@@ -159,7 +171,7 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 	const currentListLength = useMemo(() => {
 		switch (currentTab) {
 			case "settings":
-				return configEntries.length
+				return filteredConfigEntries.length
 			case "rules":
 				return ruleEntries.length
 			case "workflows":
@@ -171,7 +183,14 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 			default:
 				return 0
 		}
-	}, [currentTab, configEntries.length, ruleEntries.length, workflowEntries.length, hookEntries.length, skillEntries.length])
+	}, [
+		currentTab,
+		filteredConfigEntries.length,
+		ruleEntries.length,
+		workflowEntries.length,
+		hookEntries.length,
+		skillEntries.length,
+	])
 
 	// Get available tabs
 	const availableTabs = useMemo(() => {
@@ -191,10 +210,11 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 		setCurrentTab(newTab)
 		setSelectedIndex(0)
 		setIsEditing(false)
+		setObjectEditor(null)
 	}
 
 	// Settings tab handlers
-	const selectedConfigEntry = configEntries[selectedIndex]
+	const selectedConfigEntry = filteredConfigEntries[selectedIndex]
 
 	const handleSettingsSave = (value: string | boolean) => {
 		if (!selectedConfigEntry) {
@@ -210,6 +230,43 @@ 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
@@ -240,15 +297,22 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 	// Input handling
 	useInput(
 		(input, key) => {
-			if (input.toLowerCase() === "q" || key.escape) {
+			if (objectEditor) {
+				return
+			}
+
+			if (key.escape) {
 				exit()
 			}
 
-			// 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 (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
 				if (targetIdx >= 0 && targetIdx < availableTabs.length) {
 					handleTabChange(availableTabs[targetIdx].key)
 				}
@@ -256,21 +320,45 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 			}
 
 			// List navigation (arrow keys and vim-style j/k)
-			if (key.upArrow || input === "k") {
+			if (key.upArrow) {
 				setSelectedIndex((i) => (i > 0 ? i - 1 : currentListLength - 1))
-			} else if (key.downArrow || input === "j") {
+			} else if (key.downArrow) {
 				setSelectedIndex((i) => (i < currentListLength - 1 ? i + 1 : 0))
 			}
 
 			// Tab-specific actions
 			if (currentTab === "settings") {
-				if ((key.return || input === "e") && selectedConfigEntry?.isEditable) {
+				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
+					}
 					setEditValue(selectedConfigEntry.value !== undefined ? String(selectedConfigEntry.value) : "")
 					setIsEditing(true)
-				} else if (input === "r") {
+				} else if (key.ctrl && input.toLowerCase() === "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 || input === " ") {
+			} else if (key.return || key.tab || input === " ") {
 				// Toggle for rules/workflows/hooks/skills
 				handleToggle()
 			}
@@ -338,13 +426,31 @@ 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 = configEntries.slice(startIndex, startIndex + MAX_VISIBLE)
+				const visibleEntries = filteredConfigEntries.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>
@@ -507,12 +613,12 @@ export const ConfigView: React.FC<ConfigViewProps> = ({
 
 	// Help text based on current tab
 	const getHelpText = () => {
-		const base = "↑/↓/j/k Navigate • Tab/1-5 Switch tabs • q/Esc Exit"
+		const base = "↑/↓ Navigate • ←/→ tabs • 1-5 tabs • Esc Exit"
 		if (currentTab === "settings") {
-			return `${base} • Enter/e Edit • r Reset`
+			return `${base} • Type to search • Enter/Tab Edit (booleans toggle) • Backspace clear search • Ctrl+R Reset`
 		}
 		const openFolder = onOpenFolder ? " • o Open folder" : ""
-		return `${base} • Enter/Space Toggle${openFolder}`
+		return `${base} • Enter/Tab/Space Toggle${openFolder}`
 	}
 
 	return (

cli/src/components/ConfigViewComponents.tsx

@@ -46,16 +46,19 @@ export interface SkillInfo {
 	enabled: boolean
 }
 
-export const EXCLUDED_KEYS = new Set([
-	"taskHistory",
-	"primaryRootIndex",
-	"subagentsEnabled",
-	"subagentTerminalOutputLineLimit",
-	"welcomeViewCompleted",
-	"isNewUser",
-])
+export interface ObjectEditorState {
+	source: "global" | "workspace"
+	key: string
+	path: string[]
+	value: Record<string, unknown>
+	selectedIndex: number
+	isEditingValue: boolean
+	editValue: string
+}
 
-export const EDITABLE_TYPES: Set<ValueType> = new Set(["string", "number", "boolean"])
+export const EXCLUDED_KEYS = new Set(["taskHistory", "primaryRootIndex", "welcomeViewCompleted", "isNewUser"])
+
+export const EDITABLE_TYPES: Set<ValueType> = new Set(["string", "number", "boolean", "object"])
 export const MAX_VISIBLE = 12
 export const SEPARATOR = "─".repeat(80)
 
@@ -135,7 +138,7 @@ export function parseValue(input: string, type: ValueType): unknown {
 		return input.toLowerCase() === "true" || input === "1"
 	}
 	if (type === "number") {
-		const num = parseFloat(input)
+		const num = Number.parseFloat(input)
 		return Number.isNaN(num) ? 0 : num
 	}
 	if (type === "object") {
@@ -217,7 +220,7 @@ export const TextInput: React.FC<TextInputProps> = ({ label, onChange, onCancel,
 			</Text>
 			<Box>
 				<Text color="white">{value}</Text>
-				<Text inverse> </Text>
+				<Text color="cyan">|</Text>
 			</Box>
 			<Text color="gray">Type: {type} • Enter to save • Esc to cancel</Text>
 		</Box>
@@ -379,3 +382,169 @@ 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

@@ -27,38 +27,40 @@ export const FeaturedModelPicker: React.FC<FeaturedModelPickerProps> = ({
 	return (
 		<Box flexDirection="column">
 			{title && (
-				<>
+				<Text>
 					<Text bold color={COLORS.primaryBlue}>
 						{title}
 					</Text>
 					<Text> </Text>
-				</>
+				</Text>
 			)}
 
-			{featuredModels.map((model, i) => (
-				<Box flexDirection="column" key={model.id} marginBottom={1}>
-					<Box>
-						<Text color={i === selectedIndex ? COLORS.primaryBlue : undefined}>
-							{i === selectedIndex ? "❯ " : "  "}
-						</Text>
-						<Text bold color={i === selectedIndex ? COLORS.primaryBlue : "white"}>
-							{model.name}
-						</Text>
-						{model.label && (
-							<>
-								<Text> </Text>
-								<Text backgroundColor={model.label === "FREE" ? "gray" : COLORS.primaryBlue} color="black">
-									{" "}
-									{model.label}{" "}
+			{featuredModels.map((model, i) => {
+				const isSelected = i === selectedIndex
+
+				return (
+					<Box flexDirection="column" key={`${model.id}-${model.labels[0] || "default"}`} marginBottom={1}>
+						<Box>
+							<Text color={isSelected ? COLORS.primaryBlue : undefined}>{isSelected ? "❯ " : "  "}</Text>
+							<Text bold color={isSelected ? COLORS.primaryBlue : "white"}>
+								{model.name}
+							</Text>
+							{model.labels.map((label) => (
+								<Text key={label}>
+									<Text> </Text>
+									<Text backgroundColor={label === "FREE" ? "gray" : COLORS.primaryBlue} color="black">
+										{" "}
+										{label}{" "}
+									</Text>
 								</Text>
-							</>
-						)}
+							))}
+						</Box>
+						<Box paddingLeft={2}>
+							<Text color="gray">{model.description}</Text>
+						</Box>
 					</Box>
-					<Box paddingLeft={2}>
-						<Text color="gray">{model.description}</Text>
-					</Box>
-				</Box>
-			))}
+				)
+			})}
 
 			{showBrowseAll && (
 				<Box>
@@ -79,7 +81,7 @@ 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(showBrowseAll: boolean = true): number {
+export function getFeaturedModelMaxIndex(showBrowseAll = true): number {
 	const featuredModels = getAllFeaturedModels()
 	return showBrowseAll ? featuredModels.length : featuredModels.length - 1
 }

cli/src/components/HelpPanelContent.tsx

@@ -43,6 +43,30 @@ 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>
@@ -64,6 +88,10 @@ 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/ImportView.tsx

@@ -16,6 +16,7 @@ import {
 	importFromCodex,
 	importFromOpenCode,
 } from "../utils/import-configs"
+import { applyProviderConfig } from "../utils/provider-config"
 
 type ImportStep = "select" | "confirm" | "saving" | "error"
 
@@ -59,23 +60,13 @@ export const ImportView: React.FC<ImportViewProps> = ({ source, onComplete, onCa
 				return
 			}
 
+			await applyProviderConfig({
+				providerId: selectedKey.provider,
+				apiKey: selectedKey.key,
+				modelId: selectedKey.modelId,
+			})
 			const stateManager = StateManager.get()
-			const config: Record<string, string> = {
-				actModeApiProvider: selectedKey.provider,
-				planModeApiProvider: selectedKey.provider,
-				apiProvider: selectedKey.provider,
-			}
-
-			// Set API key
-			config[selectedKey.keyField] = selectedKey.key
-
-			// Set model ID if available
-			if (selectedKey.modelId) {
-				config.actModeApiModelId = selectedKey.modelId
-				config.planModeApiModelId = selectedKey.modelId
-			}
-
-			stateManager.setApiConfiguration(config)
+			stateManager.setGlobalState("welcomeViewCompleted", true)
 			await stateManager.flushPendingState()
 
 			onComplete()

cli/src/components/ModelPicker.tsx

@@ -6,6 +6,7 @@
 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,
@@ -64,11 +65,15 @@ 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 },
@@ -105,7 +110,7 @@ export function hasStaticModels(provider: string): boolean {
 }
 
 export function hasModelPicker(provider: string): boolean {
-	return hasStaticModels(provider) || usesOpenRouterModels(provider)
+	return hasStaticModels(provider) || usesOpenRouterModels(provider) || provider === "oca"
 }
 
 export function getDefaultModelId(provider: string): string {
@@ -132,7 +137,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({ provider, controller,
 	const [isLoading, setIsLoading] = useState(false)
 	const [asyncModels, setAsyncModels] = useState<string[]>([])
 
-	// Fetch OpenRouter models when needed using shared core function
+	// Fetch async models (OpenRouter or OCA) when needed
 	useEffect(() => {
 		if (usesOpenRouterModels(provider)) {
 			setIsLoading(true)
@@ -145,22 +150,45 @@ 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)) {
+		if (usesOpenRouterModels(provider) || provider === "oca") {
 			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(() => {
-		return modelList.map((modelId) => ({
+		const list = modelList.map((modelId) => ({
 			id: modelId,
 			label: modelId,
 		}))
-	}, [modelList])
+		// 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])
 
 	// For providers without a model picker, render nothing
 	if (!hasModelPicker(provider)) {
@@ -180,7 +208,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({ provider, controller,
 	}
 
 	// If async fetch returned no models, render nothing
-	if (usesOpenRouterModels(provider) && modelList.length === 0) {
+	if ((usesOpenRouterModels(provider) || provider === "oca") && modelList.length === 0) {
 		return null
 	}
 

cli/src/components/OcaEmployeeCheck.tsx

@@ -0,0 +1,88 @@
+/**
+ * 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/Panel.tsx

@@ -20,11 +20,13 @@ interface PanelProps {
 	tabs?: PanelTab[]
 	/** Current tab key - required when tabs are provided */
 	currentTab?: string
+	/** Whether currently in a subpage (shows "Esc to go back" and hides arrow key hint) */
+	isSubpage?: boolean
 	/** Panel content */
 	children: ReactNode
 }
 
-export const Panel: React.FC<PanelProps> = ({ label, tabs, currentTab, children }) => {
+export const Panel: React.FC<PanelProps> = ({ label, tabs, currentTab, isSubpage, children }) => {
 	const { columns } = useTerminalSize()
 	const currentTabIndex = currentTab && tabs ? tabs.findIndex((t) => t.key === currentTab) : 0
 
@@ -35,7 +37,7 @@ export const Panel: React.FC<PanelProps> = ({ label, tabs, currentTab, children
 				<Text bold color={COLORS.primaryBlue}>
 					{label}
 				</Text>
-				<Text color="gray"> (Esc to close)</Text>
+				<Text color="gray"> (Esc to {isSubpage ? "go back" : "close"})</Text>
 			</Box>
 
 			{/* Tab bar if tabs are provided */}
@@ -53,7 +55,7 @@ export const Panel: React.FC<PanelProps> = ({ label, tabs, currentTab, children
 							</Text>
 						)
 					})}
-					<Text color="gray"> (←/→)</Text>
+					{!isSubpage && <Text color="gray"> (←/→)</Text>}
 				</Box>
 			)}
 

cli/src/components/ProviderPicker.tsx

@@ -4,31 +4,12 @@
 
 import React, { useMemo } from "react"
 import { StateManager } from "@/core/storage/StateManager"
-import { API_PROVIDERS_LIST, ApiConfiguration } from "@/shared/api"
-import providersData from "@/shared/providers/providers.json"
-import { SearchableList, SearchableListItem } from "./SearchableList"
+import type { ApiConfiguration } from "@/shared/api"
+import { getProviderLabel, useValidProviders } from "../utils/providers"
+import { SearchableList, type SearchableListItem } from "./SearchableList"
 
-// Create a lookup map from provider value to display label
-const providerLabels: Record<string, string> = Object.fromEntries(
-	providersData.list.map((p: { value: string; label: string }) => [p.value, p.label]),
-)
-
-// Get provider order from providers.json (same order as webview)
-const providerOrder: string[] = providersData.list.map((p: { value: string }) => p.value)
-
-/**
- * Providers that are not supported in CLI.
- * - vscode-lm: Requires VS Code's Language Model API (see ENG-1490 for OAuth-based support)
- */
-const CLI_EXCLUDED_PROVIDERS = new Set<string>(["vscode-lm"])
-
-export function getProviderLabel(providerId: string): string {
-	return providerLabels[providerId] || providerId
-}
-
-export function getProviderOrder(): string[] {
-	return providerOrder
-}
+// Re-export for backwards compatibility
+export { getProviderLabel }
 
 /**
  * Check if a provider is configured (has required credentials/settings)
@@ -37,7 +18,8 @@ export function getProviderOrder(): string[] {
 function isProviderConfigured(providerId: string, config: ApiConfiguration): boolean {
 	switch (providerId) {
 		case "cline":
-			return true // Always available
+			// Check if user has Cline API key or Cline account auth data stored
+			return !!(config.clineApiKey ?? config["cline:clineAccountId"])
 		case "anthropic":
 			return !!config.apiKey
 		case "openrouter":
@@ -51,7 +33,8 @@ function isProviderConfigured(providerId: string, config: ApiConfiguration): boo
 		case "openai-native":
 			return !!config.openAiNativeApiKey
 		case "openai-codex":
-			return !!config.openAiCodexRefreshToken
+			// OpenAI Codex uses OAuth with credentials stored as JSON blob
+			return !!(config as Record<string, unknown>)["openai-codex-oauth-credentials"]
 		case "deepseek":
 			return !!config.deepSeekApiKey
 		case "xai":
@@ -142,18 +125,16 @@ interface ProviderPickerProps {
 export const ProviderPicker: React.FC<ProviderPickerProps> = ({ onSelect, isActive = true }) => {
 	// Get API configuration to check which providers are configured
 	const apiConfig = StateManager.get().getApiConfiguration()
+	const sorted = useValidProviders()
 
-	// Use providers.json order, filtered to available providers (excluding CLI-incompatible ones)
+	// Use providers.json order, filtered to exclude CLI-incompatible providers
 	const items: SearchableListItem[] = useMemo(() => {
-		const availableProviders = new Set(API_PROVIDERS_LIST)
-		const sorted = providerOrder.filter((p) => availableProviders.has(p) && !CLI_EXCLUDED_PROVIDERS.has(p))
-
-		return sorted.map((providerId) => ({
+		return sorted.map((providerId: string) => ({
 			id: providerId,
 			label: getProviderLabel(providerId),
 			suffix: isProviderConfigured(providerId, apiConfig) ? "(Configured)" : undefined,
 		}))
-	}, [apiConfig])
+	}, [apiConfig, sorted])
 
 	return <SearchableList isActive={isActive} items={items} onSelect={(item) => onSelect(item.id)} />
 }

cli/src/components/QuitCommand.test.tsx

@@ -0,0 +1,112 @@
+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

@@ -5,22 +5,31 @@
 
 import type { AutoApprovalSettings } from "@shared/AutoApprovalSettings"
 import { DEFAULT_AUTO_APPROVAL_SETTINGS } from "@shared/AutoApprovalSettings"
-import { ProviderToApiKeyMap } from "@shared/storage"
+import type { ApiProvider, ModelInfo } from "@shared/api"
+import { getProviderModelIdKey, isSettingsKey, ProviderToApiKeyMap } from "@shared/storage"
+import { isOpenaiReasoningEffort, OPENAI_REASONING_EFFORT_OPTIONS, type OpenaiReasoningEffort } from "@shared/storage/types"
 import type { TelemetrySetting } from "@shared/TelemetrySetting"
 import { Box, Text, useInput } from "ink"
 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 { useOcaAuth } from "../hooks/useOcaAuth"
 import { isMouseEscapeSequence } from "../utils/input"
-import { applyProviderConfig } from "../utils/provider-config"
+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 {
@@ -30,7 +39,8 @@ import {
 	isBrowseAllSelected,
 } from "./FeaturedModelPicker"
 import { LanguagePicker } from "./LanguagePicker"
-import { getDefaultModelId, hasModelPicker, ModelPicker } from "./ModelPicker"
+import { CUSTOM_MODEL_ID, hasModelPicker, ModelPicker } from "./ModelPicker"
+import { OcaEmployeeCheck } from "./OcaEmployeeCheck"
 import { OrganizationPicker } from "./OrganizationPicker"
 import { Panel, PanelTab } from "./Panel"
 import { getProviderLabel, ProviderPicker } from "./ProviderPicker"
@@ -39,6 +49,7 @@ interface SettingsPanelContentProps {
 	onClose: () => void
 	controller?: Controller
 	initialMode?: "model-picker" | "featured-models"
+	initialModelKey?: "actModelId" | "planModelId"
 }
 
 type SettingsTab = "api" | "auto-approve" | "features" | "other" | "account"
@@ -46,13 +57,25 @@ type SettingsTab = "api" | "auto-approve" | "features" | "other" | "account"
 interface ListItem {
 	key: string
 	label: string
-	type: "checkbox" | "readonly" | "editable" | "separator" | "header" | "spacer" | "action"
+	type: "checkbox" | "readonly" | "editable" | "separator" | "header" | "spacer" | "action" | "cycle"
 	value: string | boolean
 	description?: string
 	isSubItem?: boolean
 	parentKey?: string
 }
 
+function normalizeReasoningEffort(value: unknown): OpenaiReasoningEffort {
+	if (isOpenaiReasoningEffort(value)) {
+		return value
+	}
+	return "low"
+}
+
+function nextReasoningEffort(current: OpenaiReasoningEffort): OpenaiReasoningEffort {
+	const idx = OPENAI_REASONING_EFFORT_OPTIONS.indexOf(current)
+	return OPENAI_REASONING_EFFORT_OPTIONS[(idx + 1) % OPENAI_REASONING_EFFORT_OPTIONS.length]
+}
+
 const TABS: PanelTab[] = [
 	{ key: "api", label: "API" },
 	{ key: "auto-approve", label: "Auto-approve" },
@@ -63,41 +86,47 @@ 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" as const,
+		stateKey: "useAutoCondense",
 		default: false,
 		label: "Auto-condense",
 		description: "Automatically summarize long conversations",
 	},
 	webTools: {
-		stateKey: "clineWebToolsEnabled" as const,
+		stateKey: "clineWebToolsEnabled",
 		default: true,
 		label: "Web tools",
 		description: "Enable web search and fetch tools",
 	},
 	strictPlanMode: {
-		stateKey: "strictPlanModeEnabled" as const,
+		stateKey: "strictPlanModeEnabled",
 		default: true,
 		label: "Strict plan mode",
 		description: "Require explicit mode switching",
 	},
 	nativeToolCall: {
-		stateKey: "nativeToolCallEnabled" as const,
+		stateKey: "nativeToolCallEnabled",
 		default: true,
 		label: "Native tool call",
 		description: "Use model's native tool calling API",
 	},
 	parallelToolCalling: {
-		stateKey: "enableParallelToolCalling" as const,
+		stateKey: "enableParallelToolCalling",
 		default: false,
 		label: "Parallel tool calling",
 		description: "Allow multiple tools in a single response",
 	},
-	skillsEnabled: {
-		stateKey: "skillsEnabled" as const,
+	doubleCheckCompletion: {
+		stateKey: "doubleCheckCompletionEnabled",
 		default: false,
-		label: "Skills",
-		description: "Enable reusable agent instructions",
+		label: "Double-check completion",
+		description: "Reject first completion attempt and require re-verification",
 	},
 } as const
 
@@ -113,7 +142,12 @@ function formatBalance(balance: number | null): string {
 	return `$${(balance / 1000000).toFixed(2)}`
 }
 
-export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onClose, controller, initialMode }) => {
+export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({
+	onClose,
+	controller,
+	initialMode,
+	initialModelKey,
+}) => {
 	const { isRawModeSupported } = useStdinContext()
 	const stateManager = StateManager.get()
 
@@ -122,7 +156,9 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 	const [selectedIndex, setSelectedIndex] = useState(0)
 	const [isEditing, setIsEditing] = useState(false)
 	const [isPickingModel, setIsPickingModel] = useState(initialMode === "model-picker")
-	const [pickingModelKey, setPickingModelKey] = useState<"actModelId" | "planModelId" | null>(initialMode ? "actModelId" : null)
+	const [pickingModelKey, setPickingModelKey] = useState<"actModelId" | "planModelId" | null>(
+		initialMode ? (initialModelKey ?? "actModelId") : null,
+	)
 	const [isPickingFeaturedModel, setIsPickingFeaturedModel] = useState(initialMode === "featured-models")
 	const [featuredModelIndex, setFeaturedModelIndex] = useState(0)
 	const [isPickingProvider, setIsPickingProvider] = useState(false)
@@ -130,16 +166,24 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 	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> = {}
 		for (const [key, config] of Object.entries(FEATURE_SETTINGS)) {
-			initial[key] = stateManager.getGlobalSettingsKey(config.stateKey) ?? config.default
+			if (isSettingsKey(config.stateKey)) {
+				initial[key] = stateManager.getGlobalSettingsKey(config.stateKey)
+			} else {
+				initial[key] = stateManager.getGlobalStateKey(config.stateKey)
+			}
 		}
 		return initial as Record<FeatureKey, boolean>
 	})
@@ -155,6 +199,12 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 	const [planThinkingEnabled, setPlanThinkingEnabled] = useState<boolean>(
 		() => (stateManager.getGlobalSettingsKey("planModeThinkingBudgetTokens") ?? 0) > 0,
 	)
+	const [actReasoningEffort, setActReasoningEffort] = useState<OpenaiReasoningEffort>(() =>
+		normalizeReasoningEffort(stateManager.getGlobalSettingsKey("actModeReasoningEffort")),
+	)
+	const [planReasoningEffort, setPlanReasoningEffort] = useState<OpenaiReasoningEffort>(() =>
+		normalizeReasoningEffort(stateManager.getGlobalSettingsKey("planModeReasoningEffort")),
+	)
 
 	// Auto-approve settings (complex nested object)
 	const [autoApproveSettings, setAutoApproveSettings] = useState<AutoApprovalSettings>(() => {
@@ -180,12 +230,50 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 	const [accountChecked, setAccountChecked] = useState(false) // Tracks if we've already checked auth
 
 	// Get current provider and model info
-	const apiConfig = stateManager.getApiConfiguration()
 	const [provider, setProvider] = useState<string>(
-		() => apiConfig.actModeApiProvider || apiConfig.planModeApiProvider || "not configured",
+		() =>
+			stateManager.getApiConfiguration().actModeApiProvider ||
+			stateManager.getApiConfiguration().planModeApiProvider ||
+			"not configured",
 	)
-	const actModelId = (stateManager.getGlobalSettingsKey("actModeApiModelId") as string) || ""
-	const planModelId = (stateManager.getGlobalSettingsKey("planModeApiModelId") as string) || ""
+	// Refresh trigger to force re-reading model IDs from state
+	const [modelRefreshKey, setModelRefreshKey] = useState(0)
+	const refreshModelIds = useCallback(() => setModelRefreshKey((k) => k + 1), [])
+
+	// 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])
+
+	const {
+		isWaiting: isWaitingForOcaAuth,
+		startAuth: startOcaAuth,
+		cancelAuth: cancelOcaAuth,
+		isAuthenticated: isOcaAuthenticated,
+	} = useOcaAuth({
+		controller,
+		onSuccess: handleOcaAuthSuccess,
+	})
+
+	// Read model IDs from state (re-reads when refreshKey changes)
+	const { actModelId, planModelId } = useMemo(() => {
+		const apiConfig = stateManager.getApiConfiguration()
+		const actProvider = apiConfig.actModeApiProvider
+		const planProvider = apiConfig.planModeApiProvider || actProvider
+		if (!actProvider && !planProvider) {
+			return { actModelId: "", planModelId: "" }
+		}
+		const actKey = actProvider ? getProviderModelIdKey(actProvider, "act") : null
+		const planKey = planProvider ? getProviderModelIdKey(planProvider, "plan") : null
+		return {
+			actModelId: actKey ? (stateManager.getGlobalSettingsKey(actKey) as string) || "" : "",
+			planModelId: planKey ? (stateManager.getGlobalSettingsKey(planKey) as string) || "" : "",
+		}
+	}, [modelRefreshKey, stateManager])
 
 	// Toggle a feature setting
 	const toggleFeature = useCallback(
@@ -227,19 +315,21 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 				return
 			}
 
-			// Get organization info
-			const organizations = authService.getUserOrganizations()
+			const accountService = ClineAccountService.getInstance()
+
+			// Fetch fresh organization info from server (like webview's getUserOrganizations RPC)
+			// Don't use authService.getUserOrganizations() as it returns cached data
+			const organizations = await accountService.fetchUserOrganizationsRPC()
+			let activeOrgId: string | undefined
 			if (organizations) {
 				setAccountOrganizations(organizations)
 				const activeOrg = organizations.find((org) => org.active)
 				setAccountOrganization(activeOrg || null)
+				activeOrgId = activeOrg?.organizationId
 			}
 
 			// Fetch credit balance
 			try {
-				const accountService = ClineAccountService.getInstance()
-				const activeOrgId = authService.getActiveOrganizationId()
-
 				if (activeOrgId) {
 					const orgBalance = await accountService.fetchOrganizationCreditsRPC(activeOrgId)
 					if (orgBalance?.balance !== undefined) {
@@ -299,9 +389,8 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 			setIsPickingOrganization(false)
 			try {
 				await ClineAccountService.getInstance().switchAccount(orgId || undefined)
-				// Refetch to get updated auth info with new active org
-				await AuthService.getInstance(controller).restoreRefreshTokenAndRetrieveAuthInfo()
-				fetchAccountInfo()
+				// Refetch fresh org data from server
+				await fetchAccountInfo()
 			} catch {
 				// Error switching organization
 			}
@@ -334,6 +423,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 				setAccountChecked(false) // Reset so fetchAccountInfo can run
 				await applyProviderConfig({ providerId: "cline", controller })
 				setProvider("cline")
+				refreshModelIds()
 				fetchAccountInfo()
 			}
 		}
@@ -347,9 +437,12 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 
 	// Build items list based on current tab
 	const items: ListItem[] = useMemo(() => {
-		// OpenAI Native, Codex, and GPT models don't support thinking budget (they use reasoning effort)
-		const isGptModel = actModelId?.toLowerCase().includes("gpt") || planModelId?.toLowerCase().includes("gpt")
-		const showThinkingOption = provider !== "openai-native" && provider !== "openai-codex" && !isGptModel
+		// Some providers/models expose reasoning effort instead of thinking budget controls.
+		const providerUsesReasoningEffort = provider === "openai-native" || provider === "openai-codex"
+		const showActReasoningEffort = supportsReasoningEffortForModel(actModelId || "")
+		const showPlanReasoningEffort = supportsReasoningEffortForModel(planModelId || "")
+		const showActThinkingOption = !providerUsesReasoningEffort && !showActReasoningEffort
+		const showPlanThinkingOption = !providerUsesReasoningEffort && !showPlanReasoningEffort
 
 		switch (currentTab) {
 			case "api":
@@ -373,7 +466,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 									type: "editable" as const,
 									value: actModelId || "not set",
 								},
-								...(showThinkingOption
+								...(showActThinkingOption
 									? [
 											{
 												key: "actThinkingEnabled",
@@ -383,6 +476,16 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 											},
 										]
 									: []),
+								...(showActReasoningEffort
+									? [
+											{
+												key: "actReasoningEffort",
+												label: "Reasoning effort",
+												type: "cycle" as const,
+												value: actReasoningEffort,
+											},
+										]
+									: []),
 								{ key: "planHeader", label: "Plan Mode", type: "header" as const, value: "" },
 								{
 									key: "planModelId",
@@ -390,7 +493,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 									type: "editable" as const,
 									value: planModelId || "not set",
 								},
-								...(showThinkingOption
+								...(showPlanThinkingOption
 									? [
 											{
 												key: "planThinkingEnabled",
@@ -400,6 +503,16 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 											},
 										]
 									: []),
+								...(showPlanReasoningEffort
+									? [
+											{
+												key: "planReasoningEffort",
+												label: "Reasoning effort",
+												type: "cycle" as const,
+												value: planReasoningEffort,
+											},
+										]
+									: []),
 								{ key: "spacer1", label: "", type: "spacer" as const, value: "" },
 							]
 						: [
@@ -409,7 +522,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 									type: "editable" as const,
 									value: actModelId || "not set",
 								},
-								...(showThinkingOption
+								...(showActThinkingOption
 									? [
 											{
 												key: "actThinkingEnabled",
@@ -419,6 +532,16 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 											},
 										]
 									: []),
+								...(showActReasoningEffort
+									? [
+											{
+												key: "actReasoningEffort",
+												label: "Reasoning effort",
+												type: "cycle" as const,
+												value: actReasoningEffort,
+											},
+										]
+									: []),
 							]),
 					{
 						key: "separateModels",
@@ -445,7 +568,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 						key: parentKey,
 						label: parentLabel,
 						type: "checkbox",
-						value: actions[parentKey as keyof typeof actions],
+						value: actions[parentKey as keyof typeof actions] ?? false,
 						description: parentDesc,
 					})
 					if (actions[parentKey as keyof typeof actions]) {
@@ -529,9 +652,11 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 						key: "telemetry",
 						label: "Error/usage reporting",
 						type: "checkbox",
-						value: telemetry === "enabled",
+						value: telemetry !== "disabled",
 						description: "Help improve Cline by sending anonymous usage data",
 					},
+					{ key: "separator", label: "", type: "separator", value: "" },
+					{ key: "version", label: "", type: "readonly", value: `Cline v${CLI_VERSION}` },
 				]
 
 			case "account":
@@ -579,6 +704,8 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 		separateModels,
 		actThinkingEnabled,
 		planThinkingEnabled,
+		actReasoningEffort,
+		planReasoningEffort,
 		autoApproveSettings,
 		features,
 		preferredLanguage,
@@ -612,6 +739,33 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 		}
 	}, [items.length, selectedIndex])
 
+	const rebuildTaskApi = useCallback(() => {
+		if (!controller?.task) {
+			return
+		}
+		const currentMode = stateManager.getGlobalSettingsKey("mode")
+		const apiConfig = stateManager.getApiConfiguration()
+		controller.task.api = buildApiHandler({ ...apiConfig, ulid: controller.task.ulid }, currentMode)
+	}, [controller, stateManager])
+
+	const setReasoningEffortForMode = useCallback(
+		(mode: "act" | "plan", effort: OpenaiReasoningEffort) => {
+			if (mode === "act") {
+				setActReasoningEffort(effort)
+				stateManager.setGlobalState("actModeReasoningEffort", effort)
+				if (!separateModels) {
+					setPlanReasoningEffort(effort)
+					stateManager.setGlobalState("planModeReasoningEffort", effort)
+				}
+			} else {
+				setPlanReasoningEffort(effort)
+				stateManager.setGlobalState("planModeReasoningEffort", effort)
+			}
+			rebuildTaskApi()
+		},
+		[separateModels, rebuildTaskApi, stateManager],
+	)
+
 	// Handle toggle/edit for selected item
 	const handleAction = useCallback(() => {
 		const item = items[selectedIndex]
@@ -635,6 +789,15 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 			return
 		}
 
+		if (item.type === "cycle") {
+			const targetMode = item.key === "actReasoningEffort" ? "act" : item.key === "planReasoningEffort" ? "plan" : undefined
+			if (targetMode) {
+				const currentEffort = targetMode === "act" ? actReasoningEffort : planReasoningEffort
+				setReasoningEffortForMode(targetMode, nextReasoningEffort(currentEffort))
+			}
+			return
+		}
+
 		if (item.type === "editable") {
 			// For provider field, use the provider picker
 			if (item.key === "provider") {
@@ -683,9 +846,25 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 			stateManager.setGlobalState("planActSeparateModelsSetting", newValue)
 			// When disabling separate models, sync plan model to act model
 			if (!newValue) {
-				const actModel = stateManager.getGlobalSettingsKey("actModeApiModelId")
-				stateManager.setGlobalState("planModeApiModelId", actModel)
+				const apiConfig = stateManager.getApiConfiguration()
+				const actProvider = apiConfig.actModeApiProvider
+				const planProvider = apiConfig.planModeApiProvider || actProvider
+				if (actProvider) {
+					const actKey = getProviderModelIdKey(actProvider, "act")
+					const planKey = planProvider ? getProviderModelIdKey(planProvider, "plan") : null
+					const actModel = stateManager.getGlobalSettingsKey(actKey)
+					if (planKey) stateManager.setGlobalState(planKey, actModel)
+				}
+				const actThinkingBudget = stateManager.getGlobalSettingsKey("actModeThinkingBudgetTokens") ?? 0
+				stateManager.setGlobalState("planModeThinkingBudgetTokens", actThinkingBudget)
+				setPlanThinkingEnabled(actThinkingBudget > 0)
+
+				const actEffort = normalizeReasoningEffort(stateManager.getGlobalSettingsKey("actModeReasoningEffort"))
+				stateManager.setGlobalState("planModeReasoningEffort", actEffort)
+				setPlanReasoningEffort(actEffort)
 			}
+
+			rebuildTaskApi()
 			return
 		}
 
@@ -693,23 +872,19 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 		if (item.key === "actThinkingEnabled") {
 			setActThinkingEnabled(newValue)
 			stateManager.setGlobalState("actModeThinkingBudgetTokens", newValue ? 1024 : 0)
-			// Rebuild API handler to apply thinking budget change
-			if (controller?.task) {
-				const currentMode = stateManager.getGlobalSettingsKey("mode")
-				const apiConfig = stateManager.getApiConfiguration()
-				controller.task.api = buildApiHandler({ ...apiConfig, ulid: controller.task.ulid }, currentMode)
+			if (!separateModels) {
+				setPlanThinkingEnabled(newValue)
+				stateManager.setGlobalState("planModeThinkingBudgetTokens", newValue ? 1024 : 0)
 			}
+			// Rebuild API handler to apply thinking budget change
+			rebuildTaskApi()
 			return
 		}
 		if (item.key === "planThinkingEnabled") {
 			setPlanThinkingEnabled(newValue)
 			stateManager.setGlobalState("planModeThinkingBudgetTokens", newValue ? 1024 : 0)
 			// Rebuild API handler to apply thinking budget change
-			if (controller?.task) {
-				const currentMode = stateManager.getGlobalSettingsKey("mode")
-				const apiConfig = stateManager.getApiConfiguration()
-				controller.task.api = buildApiHandler({ ...apiConfig, ulid: controller.task.ulid }, currentMode)
-			}
+			rebuildTaskApi()
 			return
 		}
 
@@ -718,8 +893,11 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 			const newTelemetry: TelemetrySetting = newValue ? "enabled" : "disabled"
 			setTelemetry(newTelemetry)
 			stateManager.setGlobalState("telemetrySetting", newTelemetry)
-			// Update telemetry providers to respect the new setting
-			controller?.updateTelemetrySetting(newTelemetry)
+			// Flush synchronously before continuing - must complete before app can exit
+			void stateManager.flushPendingState().then(() => {
+				// Update telemetry providers to respect the new setting
+				controller?.updateTelemetrySetting(newTelemetry)
+			})
 			return
 		}
 
@@ -763,25 +941,124 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 		handleClineLogin,
 		handleClineLogout,
 		accountOrganizations,
+		separateModels,
+		actReasoningEffort,
+		planReasoningEffort,
+		rebuildTaskApi,
+		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(
-		(modelId: string) => {
+		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
+			const providerForSelection = separateModels
+				? pickingModelKey === "actModelId"
+					? actProvider
+					: planProvider
+				: actProvider || planProvider
+			if (!providerForSelection) return
+			// Use provider-specific model ID keys (e.g., cline uses actModeOpenRouterModelId)
+			const actKey = actProvider ? getProviderModelIdKey(actProvider, "act") : null
+			const planKey = planProvider ? getProviderModelIdKey(planProvider, "plan") : null
+
+			// For cline/openrouter providers, also set model info (like webview does)
+			let modelInfo: ModelInfo | undefined
+			if (providerForSelection === "cline" || providerForSelection === "openrouter") {
+				const openRouterModels = await controller?.readOpenRouterModels()
+				modelInfo = openRouterModels?.[modelId]
+			}
+
 			if (separateModels) {
 				// Only update the selected mode's model
-				const stateKey = pickingModelKey === "actModelId" ? "actModeApiModelId" : "planModeApiModelId"
-				stateManager.setGlobalState(stateKey, modelId)
+				const stateKey = pickingModelKey === "actModelId" ? actKey : planKey
+				if (stateKey) stateManager.setGlobalState(stateKey, modelId)
+				// Set model info for the selected mode
+				if (modelInfo) {
+					const infoKey =
+						pickingModelKey === "actModelId" ? "actModeOpenRouterModelInfo" : "planModeOpenRouterModelInfo"
+					stateManager.setGlobalState(infoKey, modelInfo)
+				}
 			} else {
 				// Update both modes to keep them in sync
-				stateManager.setGlobalState("actModeApiModelId", modelId)
-				stateManager.setGlobalState("planModeApiModelId", modelId)
+				if (actKey) stateManager.setGlobalState(actKey, modelId)
+				if (planKey) stateManager.setGlobalState(planKey, modelId)
+				// Set model info for both modes
+				if (modelInfo) {
+					stateManager.setGlobalState("actModeOpenRouterModelInfo", modelInfo)
+					stateManager.setGlobalState("planModeOpenRouterModelInfo", modelInfo)
+				}
 			}
+
+			// Flush pending state to ensure model ID is persisted
+			await stateManager.flushPendingState()
+
+			// Rebuild API handler if there's an active task
+			if (controller?.task) {
+				const currentMode = stateManager.getGlobalSettingsKey("mode")
+				const freshApiConfig = stateManager.getApiConfiguration()
+				controller.task.api = buildApiHandler({ ...freshApiConfig, ulid: controller.task.ulid }, currentMode)
+			}
+
+			refreshModelIds()
 			setIsPickingModel(false)
 			setPickingModelKey(null)
+
+			// If opened from /models command, close the entire settings panel
+			if (initialMode) {
+				onClose()
+			}
 		},
-		[pickingModelKey, separateModels, stateManager],
+		[pickingModelKey, separateModels, stateManager, controller, provider, refreshModelIds, initialMode, onClose],
 	)
 
 	// Handle language selection from picker
@@ -812,6 +1089,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 			// Success - apply provider config
 			await applyProviderConfig({ providerId: "openai-codex", controller })
 			setProvider("openai-codex")
+			refreshModelIds()
 			setIsWaitingForCodexAuth(false)
 		} catch (error) {
 			openAiCodexOAuthManager.cancelAuthorizationFlow()
@@ -820,9 +1098,8 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 		}
 	}, [controller])
 
-	// Handle provider selection from picker
 	const handleProviderSelect = useCallback(
-		(providerId: string) => {
+		async (providerId: string) => {
 			// Special handling for Cline - uses OAuth (but skip if already logged in)
 			if (providerId === "cline") {
 				setIsPickingProvider(false)
@@ -830,8 +1107,9 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 				const authInfo = AuthService.getInstance(controller).getInfo()
 				if (authInfo?.user?.email) {
 					// Already logged in - just set the provider
-					applyProviderConfig({ providerId: "cline", controller })
+					await applyProviderConfig({ providerId: "cline", controller })
 					setProvider("cline")
+					refreshModelIds()
 				} else {
 					// Not logged in - trigger OAuth
 					handleClineLogin()
@@ -846,6 +1124,22 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 				return
 			}
 
+			// Special handling for OCA - uses OAuth (but skip if already logged in)
+			if (providerId === "oca") {
+				setIsPickingProvider(false)
+				// Check if already logged in
+				if (isOcaAuthenticated) {
+					// Already logged in - just set the provider
+					await applyProviderConfig({ providerId: "oca", controller })
+					setProvider("oca")
+					refreshModelIds()
+				} else {
+					// Not logged in - show employee check before auth
+					setIsShowingOcaEmployeeCheck(true)
+				}
+				return
+			}
+
 			// Special handling for Bedrock - needs multi-field configuration
 			if (providerId === "bedrock") {
 				setPendingProvider(providerId)
@@ -855,7 +1149,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 			}
 
 			// Check if this provider needs an API key
-			const keyField = ProviderToApiKeyMap[providerId as keyof typeof ProviderToApiKeyMap]
+			const keyField = ProviderToApiKeyMap[providerId as ApiProvider]
 			if (keyField) {
 				// Provider needs an API key - go to API key entry mode
 				// Pre-fill with existing key if configured
@@ -868,12 +1162,13 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 				setIsEnteringApiKey(true)
 			} else {
 				// Provider doesn't need an API key (rare) - just set it
-				applyProviderConfig({ providerId, controller })
+				await applyProviderConfig({ providerId, controller })
 				setProvider(providerId)
+				refreshModelIds()
 				setIsPickingProvider(false)
 			}
 		},
-		[stateManager, startCodexAuth, handleClineLogin, controller],
+		[stateManager, startCodexAuth, handleClineLogin, startOcaAuth, isOcaAuthenticated, controller, refreshModelIds],
 	)
 
 	// Handle API key submission after provider selection
@@ -885,53 +1180,27 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 
 			await applyProviderConfig({ providerId: pendingProvider, apiKey: submittedValue.trim(), controller })
 			setProvider(pendingProvider)
+			refreshModelIds()
 			setIsEnteringApiKey(false)
 			setPendingProvider(null)
 			setApiKeyValue("")
 		},
-		[pendingProvider, controller],
+		[pendingProvider, controller, refreshModelIds],
 	)
 
 	// Handle Bedrock configuration complete
 	const handleBedrockComplete = useCallback(
 		(bedrockConfig: BedrockConfig) => {
-			const config: Record<string, unknown> = {
-				actModeApiProvider: "bedrock",
-				planModeApiProvider: "bedrock",
-				apiProvider: "bedrock",
-				awsAuthentication: bedrockConfig.awsAuthentication,
-				awsRegion: bedrockConfig.awsRegion,
-				awsUseCrossRegionInference: bedrockConfig.awsUseCrossRegionInference,
-			}
-
-			const defaultModelId = getDefaultModelId("bedrock")
-			if (defaultModelId) {
-				config.actModeApiModelId = defaultModelId
-				config.planModeApiModelId = defaultModelId
-			}
-
-			if (bedrockConfig.awsProfile !== undefined) config.awsProfile = bedrockConfig.awsProfile
-			if (bedrockConfig.awsAccessKey) config.awsAccessKey = bedrockConfig.awsAccessKey
-			if (bedrockConfig.awsSecretKey) config.awsSecretKey = bedrockConfig.awsSecretKey
-			if (bedrockConfig.awsSessionToken) config.awsSessionToken = bedrockConfig.awsSessionToken
-
-			stateManager.setApiConfiguration(config as Record<string, string>)
-
-			// Close Bedrock config first, then flush state async
+			// Update UI state first for responsiveness
 			setProvider("bedrock")
+			refreshModelIds()
 			setIsConfiguringBedrock(false)
 			setPendingProvider(null)
 
-			// Flush state and rebuild API handler in background
-			stateManager.flushPendingState().then(() => {
-				if (controller?.task) {
-					const currentMode = stateManager.getGlobalSettingsKey("mode")
-					const apiConfig = stateManager.getApiConfiguration()
-					controller.task.api = buildApiHandler({ ...apiConfig, ulid: controller.task.ulid }, currentMode)
-				}
-			})
+			// Apply config and rebuild API handler in background
+			applyBedrockConfig({ bedrockConfig, controller })
 		},
-		[stateManager, controller],
+		[controller, refreshModelIds],
 	)
 
 	// Handle saving edited value
@@ -941,17 +1210,26 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 
 		switch (item.key) {
 			case "actModelId":
-			case "planModelId":
+			case "planModelId": {
+				// Use provider-specific model ID keys (e.g., cline uses actModeOpenRouterModelId)
+				const apiConfig = stateManager.getApiConfiguration()
+				const actProvider = apiConfig.actModeApiProvider
+				const planProvider = apiConfig.planModeApiProvider || actProvider
+				if (!actProvider && !planProvider) break
+				const actKey = actProvider ? getProviderModelIdKey(actProvider, "act") : null
+				const planKey = planProvider ? getProviderModelIdKey(planProvider, "plan") : null
+
 				if (separateModels) {
 					// Only update the selected mode's model
-					const stateKey = item.key === "actModelId" ? "actModeApiModelId" : "planModeApiModelId"
-					stateManager.setGlobalState(stateKey, editValue || undefined)
+					const stateKey = item.key === "actModelId" ? actKey : planKey
+					if (stateKey) stateManager.setGlobalState(stateKey, editValue || undefined)
 				} else {
 					// Update both modes to keep them in sync
-					stateManager.setGlobalState("actModeApiModelId", editValue || undefined)
-					stateManager.setGlobalState("planModeApiModelId", editValue || undefined)
+					if (actKey) stateManager.setGlobalState(actKey, editValue || undefined)
+					if (planKey) stateManager.setGlobalState(planKey, editValue || undefined)
 				}
 				break
+			}
 			case "language":
 				setPreferredLanguage(editValue)
 				stateManager.setGlobalState("preferredLanguage", editValue)
@@ -1019,6 +1297,10 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 				if (key.escape) {
 					setIsPickingFeaturedModel(false)
 					setPickingModelKey(null)
+					// If opened from /models command, close the entire settings panel
+					if (initialMode) {
+						onClose()
+					}
 				} else if (key.upArrow) {
 					setFeaturedModelIndex((prev) => (prev > 0 ? prev - 1 : maxIndex))
 				} else if (key.downArrow) {
@@ -1045,6 +1327,10 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 				if (key.escape) {
 					setIsPickingModel(false)
 					setPickingModelKey(null)
+					// If opened from /models command, close the entire settings panel
+					if (initialMode) {
+						onClose()
+					}
 				}
 				return
 			}
@@ -1088,6 +1374,19 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 				return
 			}
 
+			// OCA OAuth waiting mode - escape to cancel
+			if (isWaitingForOcaAuth) {
+				if (key.escape) {
+					cancelOcaAuth()
+				}
+				return
+			}
+
+			// Bedrock custom flow - input handled by BedrockCustomModelFlow component
+			if (isBedrockCustomFlow) {
+				return
+			}
+
 			if (isEditing) {
 				if (key.escape) {
 					setIsEditing(false)
@@ -1132,7 +1431,7 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 				return
 			}
 		},
-		{ isActive: isRawModeSupported && !isEnteringApiKey && !isConfiguringBedrock },
+		{ isActive: isRawModeSupported && !isEnteringApiKey && !isConfiguringBedrock && !isShowingOcaEmployeeCheck },
 	)
 
 	// Render content
@@ -1308,6 +1607,52 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 			)
 		}
 
+		if (isShowingOcaEmployeeCheck) {
+			return (
+				<OcaEmployeeCheck
+					isActive={isShowingOcaEmployeeCheck}
+					onCancel={() => setIsShowingOcaEmployeeCheck(false)}
+					onSignIn={() => {
+						setIsShowingOcaEmployeeCheck(false)
+						startOcaAuth()
+					}}
+				/>
+			)
+		}
+
+		if (isWaitingForOcaAuth) {
+			return (
+				<Box flexDirection="column">
+					<Box>
+						<Text color={COLORS.primaryBlue}>
+							<Spinner type="dots" />
+						</Text>
+						<Text color="white"> Waiting for OCA sign-in...</Text>
+					</Box>
+					<Box marginTop={1}>
+						<Text color="gray">Complete sign-in in your browser.</Text>
+					</Box>
+					<Box marginTop={1}>
+						<Text color="gray">Esc to cancel</Text>
+					</Box>
+				</Box>
+			)
+		}
+
+		// 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 (
@@ -1425,13 +1770,28 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 						)
 					}
 
+					if (item.type === "cycle") {
+						return (
+							<Text key={item.key}>
+								<Text bold color={isSelected ? COLORS.primaryBlue : undefined}>
+									{isSelected ? "❯" : " "}{" "}
+								</Text>
+								<Text color={isSelected ? COLORS.primaryBlue : "white"}>{item.label}: </Text>
+								<Text color={COLORS.primaryBlue}>
+									{typeof item.value === "string" ? item.value : String(item.value)}
+								</Text>
+								{isSelected && <Text color="gray"> (Tab to cycle)</Text>}
+							</Text>
+						)
+					}
+
 					// Readonly or editable field
 					return (
 						<Text key={item.key}>
 							<Text bold color={isSelected ? COLORS.primaryBlue : undefined}>
 								{isSelected ? "❯" : " "}{" "}
 							</Text>
-							<Text color={isSelected ? COLORS.primaryBlue : "white"}>{item.label}: </Text>
+							{item.label && <Text color={isSelected ? COLORS.primaryBlue : "white"}>{item.label}: </Text>}
 							<Text color={item.type === "readonly" ? "gray" : COLORS.primaryBlue}>
 								{typeof item.value === "string" ? item.value : String(item.value)}
 							</Text>
@@ -1443,8 +1803,25 @@ export const SettingsPanelContent: React.FC<SettingsPanelContentProps> = ({ onCl
 		)
 	}
 
+	// Determine if we're in a subpage (picker, editor, or waiting state)
+	const isSubpage =
+		isPickingProvider ||
+		isPickingModel ||
+		isPickingFeaturedModel ||
+		isPickingLanguage ||
+		isEnteringApiKey ||
+		isConfiguringBedrock ||
+		isWaitingForCodexAuth ||
+		!!codexAuthError ||
+		isPickingOrganization ||
+		isWaitingForClineAuth ||
+		isShowingOcaEmployeeCheck ||
+		isWaitingForOcaAuth ||
+		isBedrockCustomFlow ||
+		isEditing
+
 	return (
-		<Panel currentTab={currentTab} label="Settings" tabs={TABS}>
+		<Panel currentTab={currentTab} isSubpage={isSubpage} label="Settings" tabs={TABS}>
 			{renderContent()}
 		</Panel>
 	)

cli/src/components/SkillsPanelContent.test.tsx

@@ -0,0 +1,230 @@
+/**
+ * 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

@@ -0,0 +1,257 @@
+/**
+ * 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

@@ -0,0 +1,361 @@
+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/components/WelcomeView.tsx

@@ -7,7 +7,8 @@
 import { Box, Text, useInput } from "ink"
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { StateManager } from "@/core/storage/StateManager"
-import { getProviderDefaultModelId, Mode } from "@/shared/storage"
+import type { ApiProvider } from "@/shared/api"
+import { getProviderDefaultModelId, getProviderModelIdKey, Mode, SettingsKey } from "@/shared/storage"
 import { useStdinContext } from "../context/StdinContext"
 import {
 	checkAndWarnRipgrepMissing,
@@ -73,11 +74,15 @@ export const WelcomeView: React.FC<WelcomeViewProps> = ({ onSubmit, onExit, cont
 		return currentProvider || "cline"
 	}, [controller])
 
-	// Get model ID based on current mode
+	// Get model ID based on current mode and provider
+	// Different providers use different state keys (e.g., cline uses actModeOpenRouterModelId)
 	const modelId = useMemo(() => {
 		const stateManager = StateManager.get()
-		const modelKey = mode === "act" ? "actModeApiModelId" : "planModeApiModelId"
-		return (stateManager.getGlobalSettingsKey(modelKey) as string) || getProviderDefaultModelId(provider)
+		const modelKey = getProviderModelIdKey(provider as ApiProvider, mode)
+		return (
+			(stateManager.getGlobalSettingsKey(modelKey as SettingsKey) as string) ||
+			getProviderDefaultModelId(provider as ApiProvider)
+		)
 	}, [mode, provider])
 
 	const toggleMode = useCallback(() => {

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

@@ -0,0 +1,12 @@
+import { describe, expect, it } from "vitest"
+import { getAllFeaturedModels } 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()
+		}
+	})
+})

cli/src/constants/featured-models.ts

@@ -7,50 +7,62 @@ export interface FeaturedModel {
 	id: string
 	name: string
 	description: string
-	label: string
+	labels: string[]
 }
 
-export const FEATURED_MODELS = {
+export const FEATURED_MODELS: { recommended: FeaturedModel[]; free: FeaturedModel[] } = {
 	recommended: [
 		{
-			id: "anthropic/claude-opus-4.5",
-			name: "Claude Opus 4.5",
-			description: "State-of-the-art for complex coding",
-			label: "Best",
+			id: "google/gemini-3.1-pro-preview",
+			name: "Gemini 3.1 Pro Preview",
+			description: "Latest Gemini release with 1m ctx window and strong coding performance",
+			labels: ["NEW"],
+		},
+		{
+			id: "anthropic/claude-sonnet-4.6",
+			name: "Claude Sonnet 4.6",
+			description: "Latest Sonnet release with strong coding and agent performance",
+			labels: ["NEW"],
+		},
+		{
+			id: "anthropic/claude-opus-4.6",
+			name: "Claude Opus 4.6",
+			description: "Most intelligent model for agents and coding",
+			labels: ["BEST"],
 		},
 		{
 			id: "openai/gpt-5.2-codex",
 			name: "GPT 5.2 Codex",
 			description: "OpenAI's latest with strong coding abilities",
-			label: "New",
+			labels: ["HOT"],
 		},
-		{
-			id: "google/gemini-3-pro-preview",
-			name: "Gemini 3 Pro",
-			description: "1M context window for large codebases",
-			label: "Trending",
-		},
-	] as FeaturedModel[],
+	],
 	free: [
 		{
-			id: "moonshotai/kimi-k2.5",
-			name: "MoonshotAI Kimi K2.5",
-			description: "Topping benchmarks leading open source",
-			label: "FREE",
+			id: "minimax/minimax-m2.5",
+			name: "MiniMax M2.5",
+			description: "MiniMax-M2.5 is a lightweight, state-of-the-art LLM optimized for coding and agentic workflows",
+			labels: ["FREE"],
+		},
+		{
+			id: "z-ai/glm-5",
+			name: "Z-AI GLM5",
+			description: "Z.AI's latest GLM 5 model with strong coding and agent performance",
+			labels: ["FREE"],
 		},
 		{
 			id: "kwaipilot/kat-coder-pro",
 			name: "KAT Coder Pro",
-			description: "Advanced agentic coding model",
-			label: "FREE",
+			description: "KwaiKAT's most advanced agentic coding model in the KAT-Coder series",
+			labels: ["FREE"],
 		},
 		{
 			id: "arcee-ai/trinity-large-preview:free",
 			name: "Trinity Large Preview",
-			description: "US built open source coding model",
-			label: "FREE",
+			description: "Arcee AI's advanced large preview model in the Trinity series",
+			labels: ["FREE"],
 		},
-	] as FeaturedModel[],
+	],
 }
 
 export function getAllFeaturedModels(): FeaturedModel[] {

cli/src/constants/keyboard.ts

@@ -0,0 +1,40 @@
+/**
+ * Keyboard escape sequences for terminal input handling.
+ *
+ * Different terminals send different escape sequences for the same keys.
+ * This file consolidates all known sequences to ensure broad compatibility.
+ *
+ * Note on Ink's useInput limitations:
+ * - Ink parses Home/End keys but doesn't expose them in the key object
+ * - Ink sets input='' for Home/End (they're in nonAlphanumericKeys)
+ * - We use useHomeEndKeys hook to intercept these from raw stdin
+ * - Option+arrow sometimes comes as escape sequence, sometimes as key.meta + arrow
+ */
+
+// Home key escape sequences from various terminals
+export const HOME_SEQUENCES = new Set([
+	"\x1b[H", // CSI H - most common (xterm, Terminal.app)
+	"\x1b[1~", // CSI 1 ~ - Linux console, some xterms
+	"\x1bOH", // SS3 H - xterm application mode
+	"\x1b[7~", // rxvt
+])
+
+// End key escape sequences from various terminals
+export const END_SEQUENCES = new Set([
+	"\x1b[F", // CSI F - most common (xterm, Terminal.app)
+	"\x1b[4~", // CSI 4 ~ - Linux console, some xterms
+	"\x1bOF", // SS3 F - xterm application mode
+	"\x1b[8~", // rxvt
+])
+
+// Option+Left (move word left) escape sequences
+export const OPTION_LEFT_SEQUENCES = new Set([
+	"\x1bb", // Meta+b - emacs style
+	"\x1b[1;3D", // CSI 1;3 D - xterm with modifiers
+])
+
+// Option+Right (move word right) escape sequences
+export const OPTION_RIGHT_SEQUENCES = new Set([
+	"\x1bf", // Meta+f - emacs style
+	"\x1b[1;3C", // CSI 1;3 C - xterm with modifiers
+])

cli/src/controllers/index.ts

@@ -142,6 +142,17 @@ export class CliEnvServiceClient implements EnvServiceClientInterface {
 		printInfo("Shutting down...")
 		return proto.cline.Empty.create()
 	}
+
+	async openExternal(request: proto.cline.StringRequest): Promise<proto.cline.Empty> {
+		const url = request.value || ""
+		if (url) {
+			printInfo(`🌐 Opening: ${url}`)
+			// Dynamically import 'open' to open URL in default browser
+			const { default: open } = await import("open")
+			await open(url)
+		}
+		return proto.cline.Empty.create()
+	}
 }
 
 /**

cli/src/hooks/useHomeEndKeys.ts

@@ -0,0 +1,54 @@
+/**
+ * Hook to detect Home/End keys from raw stdin.
+ *
+ * Ink's useInput hook parses Home/End keys but doesn't expose them in the key object,
+ * and sets input to '' for these keys (because they're in nonAlphanumericKeys).
+ * This hook subscribes to raw stdin events to detect Home/End before Ink processes them.
+ */
+
+import { useStdin } from "ink"
+import { useCallback, useEffect, useRef } from "react"
+
+import { END_SEQUENCES, HOME_SEQUENCES } from "../constants/keyboard"
+
+interface UseHomeEndKeysOptions {
+	onHome: () => void
+	onEnd: () => void
+	isActive?: boolean
+}
+
+/**
+ * Subscribe to raw stdin to detect Home/End keys.
+ * These keys are parsed by Ink but not exposed in useInput's key object.
+ */
+export function useHomeEndKeys({ onHome, onEnd, isActive = true }: UseHomeEndKeysOptions): void {
+	// Use refs to avoid stale closure issues
+	const onHomeRef = useRef(onHome)
+	const onEndRef = useRef(onEnd)
+	onHomeRef.current = onHome
+	onEndRef.current = onEnd
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	const { internal_eventEmitter } = useStdin() as any
+
+	const handleInput = useCallback((data: Buffer | string) => {
+		const s = typeof data === "string" ? data : data.toString()
+
+		if (HOME_SEQUENCES.has(s)) {
+			onHomeRef.current()
+		} else if (END_SEQUENCES.has(s)) {
+			onEndRef.current()
+		}
+	}, [])
+
+	useEffect(() => {
+		if (!isActive || !internal_eventEmitter) {
+			return
+		}
+
+		internal_eventEmitter.on("input", handleInput)
+		return () => {
+			internal_eventEmitter.removeListener("input", handleInput)
+		}
+	}, [isActive, internal_eventEmitter, handleInput])
+}

cli/src/hooks/useOcaAuth.ts

@@ -0,0 +1,92 @@
+/**
+ * Hook for OCA OAuth authentication flow in the CLI.
+ * Handles starting auth, subscribing to status updates, and notifying on success.
+ */
+
+import type { OcaAuthState } from "@shared/proto/cline/oca_account"
+import { useCallback, useEffect, useRef, useState } from "react"
+import type { Controller } from "@/core/controller"
+import { OcaAuthService } from "@/services/auth/oca/OcaAuthService"
+
+interface UseOcaAuthOptions {
+	controller: Controller | undefined
+	/** If provided, controls when subscription is active (for external state management like AuthView's step) */
+	enabled?: boolean
+	onSuccess?: () => void | Promise<void>
+	onError?: (error: Error) => void
+}
+
+interface UseOcaAuthResult {
+	/** Whether we're waiting for auth to complete (only relevant when not using `enabled` prop) */
+	isWaiting: boolean
+	/** Start the OAuth flow - opens browser */
+	startAuth: () => void
+	/** Cancel waiting for auth */
+	cancelAuth: () => void
+	/** The authenticated user, if any */
+	user: OcaAuthState["user"] | null
+	/** Whether user is currently authenticated */
+	isAuthenticated: boolean
+}
+
+export function useOcaAuth({ controller, enabled, onSuccess, onError }: UseOcaAuthOptions): UseOcaAuthResult {
+	const [isWaiting, setIsWaiting] = useState(false)
+	const [user, setUser] = useState<OcaAuthState["user"] | null>(null)
+	const onSuccessRef = useRef(onSuccess)
+	onSuccessRef.current = onSuccess
+
+	// Determine if subscription should be active
+	// If `enabled` is provided, use it; otherwise use internal `isWaiting` state
+	const isSubscriptionActive = enabled !== undefined ? enabled : isWaiting
+
+	const startAuth = useCallback(() => {
+		if (!controller) {
+			return
+		}
+		setIsWaiting(true)
+		OcaAuthService.initialize(controller)
+		OcaAuthService.getInstance()
+			.createAuthRequest()
+			.catch((error) => {
+				setIsWaiting(false)
+				onError?.(error instanceof Error ? error : new Error(String(error)))
+			})
+	}, [controller, onError])
+
+	const cancelAuth = useCallback(() => {
+		setIsWaiting(false)
+	}, [])
+
+	// Check if already authenticated
+	const isAuthenticated = !!user?.uid
+
+	// Subscribe to auth status updates when active
+	useEffect(() => {
+		if (!isSubscriptionActive || !controller) {
+			return
+		}
+
+		let cancelled = false
+
+		const responseHandler = async (authState: OcaAuthState) => {
+			if (cancelled) {
+				return
+			}
+			if (authState.user?.uid) {
+				setUser(authState.user)
+				setIsWaiting(false)
+				await onSuccessRef.current?.()
+			}
+		}
+
+		// Ensure OcaAuthService is initialized before subscribing
+		OcaAuthService.initialize(controller)
+		OcaAuthService.getInstance().subscribeToAuthStatusUpdate({}, responseHandler, `cli-oca-auth-${Date.now()}`)
+
+		return () => {
+			cancelled = true
+		}
+	}, [isSubscriptionActive, controller])
+
+	return { isWaiting, startAuth, cancelAuth, user, isAuthenticated }
+}

cli/src/hooks/useTerminalSize.ts

@@ -1,4 +1,3 @@
-import { useStdout } from "ink"
 import { useCallback, useEffect, useRef, useState } from "react"
 
 /**
@@ -36,7 +35,6 @@ import { useCallback, useEffect, useRef, useState } from "react"
  *   content wrapper to force full remount.
  */
 export function useTerminalSize() {
-	const { stdout } = useStdout()
 	const [size, setSize] = useState({
 		columns: process.stdout.columns || 80,
 		rows: process.stdout.rows || 24,
@@ -47,10 +45,14 @@ export function useTerminalSize() {
 	const refreshAfterResize = useCallback(() => {
 		// Clear terminal + scrollback to wipe stale content from old width
 		// \x1b[2J clears visible screen, \x1b[3J clears scrollback, \x1b[H moves cursor home
-		stdout?.write("\x1b[2J\x1b[3J\x1b[H")
-		// Increment key to force React remount
-		setResizeKey((prev) => prev + 1)
-	}, [stdout])
+		// Use process.stdout directly with callback to ensure clear completes before React re-renders.
+		// Without the callback, the state update can trigger a re-render that interleaves with
+		// the buffered escape sequences, causing visual artifacts in the scrollback.
+		process.stdout.write("\x1b[2J\x1b[3J\x1b[H", () => {
+			// Increment key to force React remount only after clear is flushed
+			setResizeKey((prev) => prev + 1)
+		})
+	}, [])
 
 	useEffect(() => {
 		function updateSize() {

cli/src/hooks/useTextInput.ts

@@ -0,0 +1,225 @@
+/**
+ * Text input hook with cursor management and keyboard shortcut handling.
+ *
+ * Supports essential terminal shortcuts:
+ * - Option+Left/Right: move by word (via escape sequences)
+ * - 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).
+ */
+
+import { useCallback, useRef, useState } from "react"
+
+import { OPTION_LEFT_SEQUENCES, OPTION_RIGHT_SEQUENCES } from "../constants/keyboard"
+
+/**
+ * Keyboard escape sequence types for special key combinations.
+ * Only includes sequences that Ink passes through in the input string.
+ */
+type KeyboardSequence =
+	| "option-left" // Move word left
+	| "option-right" // Move word right
+	| null
+
+/**
+ * Parse keyboard escape sequences for special key combinations.
+ * Only handles Option+arrow - Home/End are handled by useHomeEndKeys.
+ */
+function parseKeyboardSequence(input: string): KeyboardSequence {
+	if (OPTION_LEFT_SEQUENCES.has(input)) {
+		return "option-left"
+	}
+	if (OPTION_RIGHT_SEQUENCES.has(input)) {
+		return "option-right"
+	}
+	return null
+}
+
+/**
+ * Find the start of the previous word from cursor position.
+ */
+export function findWordStart(text: string, cursorPos: number): number {
+	let pos = cursorPos
+	// Skip whitespace before cursor
+	while (pos > 0 && /\s/.test(text[pos - 1])) {
+		pos--
+	}
+	// Skip word characters
+	while (pos > 0 && !/\s/.test(text[pos - 1])) {
+		pos--
+	}
+	return pos
+}
+
+/**
+ * Find the end of the next word from cursor position.
+ */
+export function findWordEnd(text: string, cursorPos: number): number {
+	let pos = cursorPos
+	// Skip word characters
+	while (pos < text.length && !/\s/.test(text[pos])) {
+		pos++
+	}
+	// Skip whitespace
+	while (pos < text.length && /\s/.test(text[pos])) {
+		pos++
+	}
+	return pos
+}
+
+export interface UseTextInputReturn {
+	// State
+	text: string
+	cursorPos: number
+
+	// Text manipulation
+	setText: (text: string | ((prev: string) => string)) => void
+	insertText: (text: string) => void
+	setCursorPos: (pos: number | ((prev: number) => number)) => void
+
+	// Deletion
+	deleteCharBefore: () => void
+
+	// Keyboard shortcut handlers
+	handleKeyboardSequence: (input: string) => boolean
+	handleCtrlShortcut: (key: string) => boolean
+}
+
+/**
+ * Hook for managing text input with cursor and keyboard shortcuts.
+ */
+export function useTextInput(): UseTextInputReturn {
+	const [text, setTextState] = useState("")
+	const [cursorPos, setCursorPosState] = useState(0)
+
+	// Use refs to get current values in callbacks without stale closures
+	const textRef = useRef(text)
+	const cursorRef = useRef(cursorPos)
+	textRef.current = text
+	cursorRef.current = cursorPos
+
+	// Text manipulation
+	const setText = useCallback((newText: string | ((prev: string) => string)) => {
+		setTextState((prev) => {
+			const resolved = typeof newText === "function" ? newText(prev) : newText
+			// Only update cursor to end if setting a direct value (not functional update)
+			if (typeof newText !== "function") {
+				setCursorPosState(resolved.length)
+			}
+			return resolved
+		})
+	}, [])
+
+	const insertText = useCallback((insertedText: string) => {
+		const pos = cursorRef.current
+		setTextState((prev) => prev.slice(0, pos) + insertedText + prev.slice(pos))
+		setCursorPosState(pos + insertedText.length)
+	}, [])
+
+	const setCursorPos = useCallback((pos: number | ((prev: number) => number)) => {
+		setCursorPosState((prev) => {
+			const newPos = typeof pos === "function" ? pos(prev) : pos
+			return Math.max(0, Math.min(textRef.current.length, newPos))
+		})
+	}, [])
+
+	// Deletion
+	const deleteCharBefore = useCallback(() => {
+		const pos = cursorRef.current
+		if (pos > 0) {
+			setTextState((prev) => prev.slice(0, pos - 1) + prev.slice(pos))
+			setCursorPosState(pos - 1)
+		}
+	}, [])
+
+	const deleteWordBefore = useCallback(() => {
+		const pos = cursorRef.current
+		const wordStart = findWordStart(textRef.current, pos)
+		if (wordStart < pos) {
+			setTextState((prev) => prev.slice(0, wordStart) + prev.slice(pos))
+			setCursorPosState(wordStart)
+		}
+	}, [])
+
+	const deleteToStart = useCallback(() => {
+		const pos = cursorRef.current
+		if (pos > 0) {
+			setTextState((prev) => prev.slice(pos))
+			setCursorPosState(0)
+		}
+	}, [])
+
+	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), [])
+	const moveWordLeft = useCallback(() => setCursorPosState((pos) => findWordStart(textRef.current, pos)), [])
+	const moveWordRight = useCallback(() => setCursorPosState((pos) => findWordEnd(textRef.current, pos)), [])
+
+	// Keyboard shortcut handlers
+	const handleKeyboardSequence = useCallback(
+		(input: string): boolean => {
+			const seq = parseKeyboardSequence(input)
+			if (!seq) return false
+
+			switch (seq) {
+				case "option-left":
+					moveWordLeft()
+					return true
+				case "option-right":
+					moveWordRight()
+					return true
+				default:
+					return false
+			}
+		},
+		[moveWordLeft, moveWordRight],
+	)
+
+	const handleCtrlShortcut = useCallback(
+		(key: string): boolean => {
+			switch (key.toLowerCase()) {
+				case "a": // Ctrl+A - start of line
+					moveToStart()
+					return true
+				case "e": // Ctrl+E - end of line
+					moveToEnd()
+					return true
+				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
+				default:
+					return false
+			}
+		},
+		[moveToStart, moveToEnd, deleteToStart, deleteToEnd, deleteWordBefore],
+	)
+
+	return {
+		text,
+		cursorPos,
+		setText,
+		insertText,
+		setCursorPos,
+		deleteCharBefore,
+		handleKeyboardSequence,
+		handleCtrlShortcut,
+	}
+}

cli/src/index.test.ts

@@ -30,7 +30,9 @@ describe("CLI Commands", () => {
 			.option("-v, --verbose", "Show verbose output")
 			.option("-c, --cwd <path>", "Working directory")
 			.option("--config <path>", "Configuration directory")
-			.option("--thinking", "Enable extended thinking")
+			.option("--thinking [tokens]", "Enable extended thinking")
+			.option("--reasoning-effort <effort>", "Reasoning effort")
+			.option("--max-consecutive-mistakes <count>", "Maximum consecutive mistakes")
 			.action(() => {})
 
 		program
@@ -67,7 +69,9 @@ describe("CLI Commands", () => {
 			.option("-v, --verbose", "Verbose output")
 			.option("-c, --cwd <path>", "Working directory")
 			.option("--config <path>", "Configuration directory")
-			.option("--thinking", "Enable extended thinking")
+			.option("--thinking [tokens]", "Enable extended thinking")
+			.option("--reasoning-effort <effort>", "Reasoning effort")
+			.option("--max-consecutive-mistakes <count>", "Maximum consecutive mistakes")
 			.action(() => {})
 	})
 
@@ -146,6 +150,27 @@ describe("CLI Commands", () => {
 			expect(taskCmd.opts().thinking).toBe(true)
 		})
 
+		it("should parse --thinking with token budget", () => {
+			const taskCmd = program.commands.find((c) => c.name() === "task")!
+			const args = ["test prompt", "--thinking", "8000"]
+			taskCmd.parse(args, { from: "user" })
+			expect(taskCmd.opts().thinking).toBe("8000")
+		})
+
+		it("should parse --reasoning-effort option", () => {
+			const taskCmd = program.commands.find((c) => c.name() === "task")!
+			const args = ["test prompt", "--reasoning-effort", "high"]
+			taskCmd.parse(args, { from: "user" })
+			expect(taskCmd.opts().reasoningEffort).toBe("high")
+		})
+
+		it("should parse --max-consecutive-mistakes option", () => {
+			const taskCmd = program.commands.find((c) => c.name() === "task")!
+			const args = ["test prompt", "--max-consecutive-mistakes", "999"]
+			taskCmd.parse(args, { from: "user" })
+			expect(taskCmd.opts().maxConsecutiveMistakes).toBe("999")
+		})
+
 		it("should parse short flags", () => {
 			const taskCmd = program.commands.find((c) => c.name() === "task")!
 			const args = ["test prompt", "-a", "-v", "-m", "gpt-4"]
@@ -281,6 +306,21 @@ describe("CLI Commands", () => {
 			program.parse(["node", "cli", "--thinking"])
 			expect(program.opts().thinking).toBe(true)
 		})
+
+		it("should parse --thinking with token budget", () => {
+			program.parse(["node", "cli", "--thinking", "4096"])
+			expect(program.opts().thinking).toBe("4096")
+		})
+
+		it("should parse --reasoning-effort option", () => {
+			program.parse(["node", "cli", "--reasoning-effort", "medium"])
+			expect(program.opts().reasoningEffort).toBe("medium")
+		})
+
+		it("should parse --max-consecutive-mistakes option", () => {
+			program.parse(["node", "cli", "--max-consecutive-mistakes", "7"])
+			expect(program.opts().maxConsecutiveMistakes).toBe("7")
+		})
 	})
 
 	describe("command structure", () => {

cli/src/utils/browser.ts

@@ -0,0 +1,10 @@
+/**
+ * Opens a URL in the user's default browser.
+ * Uses dynamic import of the 'open' package to open URLs.
+ *
+ * @param url - The URL to open in the browser
+ */
+export async function openUrlInBrowser(url: string): Promise<void> {
+	const { default: open } = await import("open")
+	await open(url)
+}

cli/src/utils/cursor-position.ts

@@ -1,57 +0,0 @@
-/**
- * Query terminal cursor position before Ink mounts
- * Must be called BEFORE render() to avoid escape sequence leaking into Ink's input handling
- */
-
-export async function queryCursorPos(
-	stdin: NodeJS.ReadStream,
-	stdout: NodeJS.WriteStream,
-	{ timeoutMs = 75 } = {},
-): Promise<{ row: number; col: number } | null> {
-	if (!stdin.isTTY || !stdout.isTTY || typeof (stdin as any).setRawMode !== "function") return null
-
-	const ttyIn = stdin as any as { isRaw?: boolean; setRawMode: (b: boolean) => void; on: any; off: any }
-	const wasRaw = !!ttyIn.isRaw
-
-	ttyIn.setRawMode(true)
-	stdin.resume()
-
-	return await new Promise((resolve) => {
-		let buf = ""
-		const onData = (chunk: Buffer) => {
-			buf += chunk.toString("utf8")
-			const m = buf.match(/\x1b\[(\d+);(\d+)R/)
-			if (!m) return
-			cleanup()
-			resolve({ row: Number(m[1]), col: Number(m[2]) })
-		}
-
-		const cleanup = () => {
-			clearTimeout(timer)
-			stdin.off("data", onData)
-			try {
-				ttyIn.setRawMode(wasRaw)
-			} catch {}
-		}
-
-		const timer = setTimeout(() => {
-			cleanup()
-			resolve(null)
-		}, timeoutMs)
-
-		stdin.on("data", onData)
-		stdout.write("\x1b[6n") // DSR: cursor position
-	})
-}
-
-/**
- * Calculate where the robot will be rendered on screen
- */
-export function calculateRobotTopRow(cursorPos: { row: number } | null, terminalRows: number): number {
-	const robotHeight = 12
-	const firstFrameHeight = robotHeight + 8 // robot + welcome text + margins + input + footer
-
-	const startRow = cursorPos?.row ?? 1
-	// If content doesn't fit below cursor, terminal scrolls
-	return Math.max(1, Math.min(startRow, terminalRows - firstFrameHeight + 1))
-}

cli/src/utils/fuzzy-search.ts

@@ -13,6 +13,6 @@ import { Fzf } from "fzf"
  */
 export function fuzzyFilter<T>(items: readonly T[], query: string, selector: (item: T) => string): T[] {
 	if (!query) return [...items]
-	const fzf = new Fzf(items, { selector })
-	return fzf.find(query).map((result) => result.item)
+	const fzf = new Fzf(items as any, { selector } as any)
+	return fzf.find(query).map((result) => result.item) as T[]
 }

cli/src/utils/import-configs.ts

@@ -5,6 +5,7 @@
 import * as fs from "fs"
 import * as os from "os"
 import * as path from "path"
+import { anthropicDefaultModelId, geminiDefaultModelId, openAiNativeDefaultModelId } from "@/shared/api"
 import providersData from "@/shared/providers/providers.json"
 
 // Import source types
@@ -119,17 +120,17 @@ function findOpenCodeAuthPath(): string | null {
  * Map Codex key names to Cline providers
  */
 const CODEX_KEY_MAP: Record<string, { provider: string; keyField: string; modelId?: string }> = {
-	OPENAI_API_KEY: { provider: "openai-native", keyField: "openAiNativeApiKey", modelId: "gpt-4o" },
-	ANTHROPIC_API_KEY: { provider: "anthropic", keyField: "apiKey", modelId: "claude-sonnet-4-20250514" },
+	OPENAI_API_KEY: { provider: "openai-native", keyField: "openAiNativeApiKey", modelId: openAiNativeDefaultModelId },
+	ANTHROPIC_API_KEY: { provider: "anthropic", keyField: "apiKey", modelId: anthropicDefaultModelId },
 }
 
 /**
  * Map OpenCode provider IDs to Cline providers
  */
 const OPENCODE_PROVIDER_MAP: Record<string, { provider: string; keyField: string; modelId?: string }> = {
-	openai: { provider: "openai-native", keyField: "openAiNativeApiKey", modelId: "gpt-4o" },
-	anthropic: { provider: "anthropic", keyField: "apiKey", modelId: "claude-sonnet-4-20250514" },
-	gemini: { provider: "gemini", keyField: "geminiApiKey", modelId: "gemini-2.0-flash-001" },
+	openai: { provider: "openai-native", keyField: "openAiNativeApiKey", modelId: openAiNativeDefaultModelId },
+	anthropic: { provider: "anthropic", keyField: "apiKey", modelId: anthropicDefaultModelId },
+	gemini: { provider: "gemini", keyField: "geminiApiKey", modelId: geminiDefaultModelId },
 	mistral: { provider: "mistral", keyField: "mistralApiKey" },
 	groq: { provider: "groq", keyField: "groqApiKey" },
 	deepseek: { provider: "deepseek", keyField: "deepSeekApiKey" },

cli/src/utils/input.ts

@@ -6,8 +6,12 @@
  * Check if input contains mouse escape sequences from terminal mouse tracking.
  * AsciiMotionCli enables mouse tracking which generates sequences like [<35;46;17M
  * These should be filtered out of text input handlers.
+ *
+ * NOTE: This must NOT filter keyboard escape sequences like Option+arrow keys.
+ * Mouse sequences have specific patterns with coordinates (e.g., [<35;46;17M).
  */
 export function isMouseEscapeSequence(input: string): boolean {
-	// Mouse events look like: [<35;46;17M or contain escape characters
-	return input.includes("\x1b") || input.includes("[<") || /\d+;\d+[Mm]/.test(input)
+	// Mouse events look like: \x1b[<35;46;17M (SGR mouse format)
+	// They contain [< followed by numbers, semicolons, and end with M or m
+	return input.includes("[<") && /\[<\d+;\d+;\d+[Mm]/.test(input)
 }

cli/src/utils/mode-selection.test.ts

@@ -0,0 +1,194 @@
+import { describe, expect, it } from "vitest"
+import { selectOutputMode } from "./mode-selection"
+
+describe("selectOutputMode", () => {
+	describe("interactive mode (Ink)", () => {
+		it("should use interactive mode when both stdin and stdout are TTY", () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: true,
+				stdinWasPiped: false,
+			})
+			expect(result.usePlainTextMode).toBe(false)
+			expect(result.reason).toBe("interactive")
+		})
+	})
+
+	describe("yolo flag", () => {
+		it("should use plain text mode when --yolo flag is set", () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: true,
+				stdinWasPiped: false,
+				yolo: true,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+			expect(result.reason).toBe("yolo_flag")
+		})
+
+		it("should prioritize yolo over other flags", () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: false,
+				stdinIsTTY: false,
+				stdinWasPiped: true,
+				json: true,
+				yolo: true,
+			})
+			expect(result.reason).toBe("yolo_flag")
+		})
+	})
+
+	describe("json flag", () => {
+		it("should use plain text mode when --json flag is set", () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: true,
+				stdinWasPiped: false,
+				json: true,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+			expect(result.reason).toBe("json")
+		})
+	})
+
+	describe("piped stdin", () => {
+		it("should use plain text mode when stdin was piped (echo x | cline)", () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: false, // piped stdin is not a TTY
+				stdinWasPiped: true,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+			expect(result.reason).toBe("piped_stdin")
+		})
+
+		it("should use plain text mode when stdin was piped but empty (echo '' | cline 'prompt')", () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: false,
+				stdinWasPiped: true, // empty pipe still counts as piped
+			})
+			expect(result.usePlainTextMode).toBe(true)
+			expect(result.reason).toBe("piped_stdin")
+		})
+	})
+
+	describe("stdin redirected (< /dev/null)", () => {
+		it("should use plain text mode when stdin is redirected from /dev/null", () => {
+			// cline "prompt" < /dev/null
+			// stdin is not a TTY, but also not a FIFO/file, so stdinWasPiped=false
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: false, // redirected, not a TTY
+				stdinWasPiped: false, // /dev/null is a character device, not FIFO
+			})
+			expect(result.usePlainTextMode).toBe(true)
+			expect(result.reason).toBe("stdin_redirected")
+		})
+	})
+
+	describe("stdout redirected", () => {
+		it("should use plain text mode when stdout is redirected to file", () => {
+			// cline "prompt" > output.txt
+			const result = selectOutputMode({
+				stdoutIsTTY: false,
+				stdinIsTTY: true,
+				stdinWasPiped: false,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+			expect(result.reason).toBe("stdout_redirected")
+		})
+
+		it("should use plain text mode when stdout is piped", () => {
+			// cline "prompt" | grep something
+			const result = selectOutputMode({
+				stdoutIsTTY: false,
+				stdinIsTTY: true,
+				stdinWasPiped: false,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+			expect(result.reason).toBe("stdout_redirected")
+		})
+	})
+
+	describe("GitHub Actions scenarios", () => {
+		it("should use plain text mode in GitHub Actions (stdin is empty FIFO)", () => {
+			// In GitHub Actions: stdin is an empty FIFO pipe
+			// stdinIsTTY=false, stdinWasPiped=true (FIFO detected)
+			const result = selectOutputMode({
+				stdoutIsTTY: true, // GitHub Actions stdout is TTY-like
+				stdinIsTTY: false,
+				stdinWasPiped: true, // empty FIFO still counts as piped
+			})
+			expect(result.usePlainTextMode).toBe(true)
+		})
+
+		it("should use plain text mode with --yolo in CI", () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: false,
+				stdinIsTTY: false,
+				stdinWasPiped: false,
+				yolo: true,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+			expect(result.reason).toBe("yolo_flag")
+		})
+	})
+
+	describe("real-world scenarios", () => {
+		it("cline (no args, interactive terminal)", () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: true,
+				stdinWasPiped: false,
+			})
+			expect(result.usePlainTextMode).toBe(false)
+		})
+
+		it('cline "prompt" (prompt arg, interactive terminal)', () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: true,
+				stdinWasPiped: false,
+			})
+			expect(result.usePlainTextMode).toBe(false)
+		})
+
+		it('cat file | cline "explain"', () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: false,
+				stdinWasPiped: true,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+		})
+
+		it('cline --yolo "prompt"', () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: true,
+				stdinWasPiped: false,
+				yolo: true,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+		})
+
+		it('cline "prompt" < /dev/null', () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: true,
+				stdinIsTTY: false,
+				stdinWasPiped: false,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+		})
+
+		it('cline "prompt" > output.log', () => {
+			const result = selectOutputMode({
+				stdoutIsTTY: false,
+				stdinIsTTY: true,
+				stdinWasPiped: false,
+			})
+			expect(result.usePlainTextMode).toBe(true)
+		})
+	})
+})

cli/src/utils/mode-selection.ts

@@ -0,0 +1,63 @@
+/**
+ * Mode selection logic for CLI - determines whether to use Ink (interactive) or plain text mode
+ *
+ * This is extracted as a pure function for testability. The decision tree:
+ * - Plain text mode when output is redirected (stdout not TTY)
+ * - Plain text mode when input is redirected (stdin not TTY) - Ink requires raw mode
+ * - Plain text mode when stdin was piped (e.g., echo "x" | cline)
+ * - Plain text mode when --json flag is used
+ * - Plain text mode when --yolo flag is used
+ * - Otherwise: Interactive Ink mode
+ */
+
+export interface ModeSelectionInput {
+	/** Is stdout connected to a TTY (interactive terminal)? */
+	stdoutIsTTY: boolean
+	/** Is stdin connected to a TTY (interactive terminal)? */
+	stdinIsTTY: boolean
+	/** Was stdin piped (FIFO or file), even if empty? */
+	stdinWasPiped: boolean
+	/** --json flag for machine-readable output */
+	json?: boolean
+	/** --yolo flag for auto-approve mode */
+	yolo?: boolean
+}
+
+export interface ModeSelectionResult {
+	/** Use plain text mode instead of Ink */
+	usePlainTextMode: boolean
+	/** Reason for the mode selection (for telemetry/debugging) */
+	reason: "interactive" | "yolo_flag" | "json" | "piped_stdin" | "stdin_redirected" | "stdout_redirected"
+}
+
+/**
+ * Determine whether to use plain text mode or interactive Ink mode
+ *
+ * @param input - Environment and option flags
+ * @returns Mode selection result with reason
+ */
+export function selectOutputMode(input: ModeSelectionInput): ModeSelectionResult {
+	// Priority order matters - check most specific flags first
+
+	if (input.yolo) {
+		return { usePlainTextMode: true, reason: "yolo_flag" }
+	}
+
+	if (input.json) {
+		return { usePlainTextMode: true, reason: "json" }
+	}
+
+	if (input.stdinWasPiped) {
+		return { usePlainTextMode: true, reason: "piped_stdin" }
+	}
+
+	if (!input.stdinIsTTY) {
+		return { usePlainTextMode: true, reason: "stdin_redirected" }
+	}
+
+	if (!input.stdoutIsTTY) {
+		return { usePlainTextMode: true, reason: "stdout_redirected" }
+	}
+
+	return { usePlainTextMode: false, reason: "interactive" }
+}