Sqlite3 for Global Storage

- Add centered ASCII Cline logo
- Add "What can I do for you?" prompt
- Add bordered input field (blue for Act mode, yellow for Plan mode)
- Display model ID and Plan/Act toggle below input
- Tab to switch between Plan and Act modes
- Two-step Esc to exit (first press highlights, second exits)
- Full-width responsive layout
- Properly exit process when user cancels

.changeset/big-cows-ring.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Add claude 4.5 haiku

.changeset/clean-shrimps-repeat.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+fix: finalize document content during approval flow

.changeset/clear-rockets-happen.md

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

.changeset/cuddly-phones-count.md

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

.changeset/eleven-experts-win.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Expose --version in cline cli command

.changeset/fine-apes-fetch.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+fix: prevent duplicate diff errors when parallel tool calling is enabled

.changeset/fine-wombats-pump.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Log Persistence errors to PostHog

.changeset/five-years-nail.md

@@ -0,0 +1,13 @@
+---
+"claude-dev": patch
+---
+
+feat: add OpenAI Codex (ChatGPT Plus/Pro) provider
+
+Users with ChatGPT Plus or Pro subscriptions can now use GPT-5 models directly through Cline without needing an API key. Authentication is handled via OAuth through OpenAI's authentication system.
+
+Models available:
+- gpt-5.2-codex (default)
+- gpt-5.1-codex-max
+- gpt-5.1-codex-mini
+- gpt-5.2

.changeset/fix-diff-boundary-validation.md

@@ -0,0 +1,9 @@
+---
+"claude-dev": patch
+---
+
+Fix two bugs in DiffViewProvider file editing:
+
+1. **Line boundary validation**: Add `safelyTruncateDocument()` to prevent out-of-bounds line errors on JetBrains hosts (fixes #8423, #8429). The gRPC protocol strictly validates line numbers, causing "truncateDocument INTERNAL: Wrong line" errors when `truncateDocument()` was called with a line number >= document line count.
+
+2. **Content concatenation on final update**: When replacing content without a trailing newline, the old content at line N+1 was concatenated to the new content. Fixed by extending the replacement range to cover the entire document on final update.

.changeset/fix-ollama-model-names.md

@@ -0,0 +1,9 @@
+---
+"claude-dev": patch
+---
+
+docs: fix outdated Ollama model names in documentation
+
+Updated recommended Ollama models to use correct identifiers:
+- Changed qwen3-coder-30b to qwen2.5-coder:32b
+- Changed devstral-small to codellama:34b-code

.changeset/flat-doodles-kiss.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+OpenAI GPT-5 Codex models are now using Apply Patch tool for diff edits.

.changeset/gold-tigers-wish.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix issue where tool call ids are invalid when switching between models using the chat completion format and the responses api format.

.changeset/jupyter-notebook-diff-fix.md

@@ -0,0 +1,10 @@
+---
+"claude-dev": patch
+---
+
+fix: improve Jupyter notebook diff view and reduce LLM context for notebook edits
+
+- Restore switchToSpecializedEditor() for Jupyter notebook diff views that was accidentally removed during rebase
+- Open .ipynb files in Jupyter notebook editor after save instead of leaving stale diff view
+- Strip notebook outputs from content sent to LLM, reducing context by 95% (196KB → 9KB)
+

.changeset/lucky-worlds-stand.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+fix: add chat output on skill use

.changeset/neat-seals-guess.md

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

.changeset/quiet-lions-visit.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Adding telemetry for background exec terminal

.changeset/ready-doodles-try.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+This pull request introduces comprehensive Jupyter Notebook support for Cline, enabling AI-assisted editing of `.ipynb` files with full cell-level context awareness. The feature allows users to seamlessly work with Jupyter notebooks using Cline's AI capabilities while preserving the notebook's JSON structure.

.changeset/small-bugs-complain.md

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

.changeset/small-foxes-shine.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+fix: removes retry message from UI after retry succeeds

.changeset/smart-paws-sip.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Support native tool calling for LM Studio and Ollama provider

.changeset/social-rockets-lead.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+fixing integration tests from testing framework

.changeset/solid-rats-flash.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+add claude 4.5 opus into sap provider.

.changeset/stale-emus-hug.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Limite Vertex and LiteLLM options when they're remote configured

.changeset/sweet-coins-rush.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix crash when the Context Menu has a type but no options

.changeset/tender-berries-search.md

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

.changeset/wacky-ends-relax.md

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

.changeset/wicked-icons-fix.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Throttle the remote config fetch

.changeset/wild-ears-poke.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Improve history view filter menu

.changeset/worktree-management-ui.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Add git worktree management UI for running parallel Cline sessions

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

@@ -147,29 +147,14 @@ When filling out the template:
 
 ### Create PR with gh CLI
 
-**Use a temporary file for the PR body** to avoid shell escaping issues, newline problems, and other command-line flakiness:
-
-1. Write the PR body to a temporary file:
-   ```
-   /tmp/pr-body.md
-   ```
-
-2. Create the PR using the file:
-   ```bash
-   gh pr create --title "PR_TITLE" --body-file /tmp/pr-body.md --base main
-   ```
-
-3. Clean up the temporary file:
-   ```bash
-   rm /tmp/pr-body.md
-   ```
-
-For draft PRs:
 ```bash
-gh pr create --title "PR_TITLE" --body-file /tmp/pr-body.md --base main --draft
+gh pr create --title "PR_TITLE" --body "PR_BODY" --base main
 ```
 
-**Why use a file?** Passing complex markdown with newlines, special characters, and checkboxes directly via `--body` is error-prone. The `--body-file` flag handles all content reliably.
+Alternatively, create as draft if the user wants review before marking ready:
+```bash
+gh pr create --title "PR_TITLE" --body "PR_BODY" --base main --draft
+```
 
 ## Post-Creation
 

.clinerules/cli.md

@@ -1,33 +0,0 @@
-# CLI Development
-
-The CLI lives in `cli/` and uses React Ink for terminal UI.
-
-- If needed, look at `cli/src/constants/colors.ts` for re-used terminal colors, e.g. `COLORS.primaryBlue` highlight color (selections, spinners, success states).
-- Never use `dimColor` with gray (e.g. `<Text color="gray" dimColor>`) - it's too hard to read. Use `color="gray"` for secondary text and normal foreground (no color) for primary text.
-- When thinking about how to handle state or messages from core, look at webview for how it communicates with the vs code extension.
-- When updating the webview, consider and suggest to the user to update the CLI TUI since we want to provide a similar experience to our terminal users as we do our vs code extension users.
-
-## Adding New API Providers
-
-When adding a new API provider to the extension, you must also update the CLI:
-
-1. **Update `cli/src/components/ModelPicker.tsx`**: Add the provider to the `providerModels` map so `getDefaultModelId()` returns the correct default model. Import the models and default ID from `@shared/api`:
-   ```typescript
-   import { newProviderDefaultModelId, newProviderModels } from "@/shared/api"
-
-   export const providerModels = {
-     // ...existing providers
-     "new-provider": { models: newProviderModels, defaultId: newProviderDefaultModelId },
-   }
-   ```
-
-2. **Use `applyProviderConfig()` for auth flows**: When implementing OAuth or other auth flows for the provider, use the shared utility at `cli/src/utils/provider-config.ts`:
-   ```typescript
-   import { applyProviderConfig } from "../utils/provider-config"
-
-   // After successful auth:
-   await applyProviderConfig({ providerId: "new-provider", controller })
-   ```
-   This handles setting provider, default model, API key mapping, state persistence, and rebuilding the API handler.
-
-3. **Provider-specific auth**: If the provider uses OAuth (like `openai-codex`), add handling in `SettingsPanelContent.tsx`'s `handleProviderSelect` callback. See the existing Codex OAuth flow as a reference.

.clinerules/general.md

@@ -147,17 +147,6 @@ Required steps:
 
 Common mistake: Adding only the return value without the `context.globalState.get()` call. This compiles but the value is always `undefined` on load.
 
-Settings plumbing gotcha: if a key is user-toggleable from settings, wire both controller update paths:
-- `src/core/controller/state/updateSettings.ts` for webview `updateSetting(...)`
-- `src/core/controller/state/updateSettingsCli.ts` for CLI/ACP settings updates
-Missing one path causes a toggle to appear to change in one surface while the backend state stays unchanged.
-
-Webview toggle gotcha: settings changes must also round-trip back in state payloads.
-- Add the field to `UpdateSettingsRequest` in `proto/cline/state.proto` (for webview update requests), then run `npm run protos`
-- Include the key in `Controller.getStateToPostToWebview()` (`src/core/controller/index.ts`)
-- Ensure `ExtensionState` and webview defaults include the key (`src/shared/ExtensionMessage.ts`, `webview-ui/src/context/ExtensionStateContext.tsx`)
-If this round-trip wiring is missing, the backend value can update but the toggle in webview appears stuck or reverts.
-
 ## StateManager Cache vs Direct globalState Access
 StateManager uses an in-memory cache populated during `StateManager.initialize(context)` in `common.ts`. For most state, use `controller.stateManager.setGlobalState()`/`getGlobalStateKey()`.
 

.clinerules/storage.md

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

.codex/environments/environment.toml

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

.env.example

@@ -16,6 +16,13 @@
 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,2 +1,3 @@
-/.github/   @saoudrizwan @arafatkatze @maxpaulus43 @candieduniverse
-/README.md  @saoudrizwan @juanpflores
+/docs/
+/.github/   @saoudrizwan @garoth @sjf
+/README.md  @saoudrizwan @nickbaumann98

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

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

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

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

@@ -1,70 +0,0 @@
-name: Smoke Tests
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'src/core/**'
-      - 'src/shared/**'
-      - 'proto/**'
-      - 'evals/**'
-      - '.github/workflows/cline-evals-regression.yml'
-  pull_request:
-    paths:
-      - 'src/core/**'
-      - 'src/shared/**'
-      - 'proto/**'
-      - 'evals/**'
-      - '.github/workflows/cline-evals-regression.yml'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: smoke-tests-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  smoke-tests:
-    name: Smoke Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build and install CLI
-        run: |
-          npm run protos
-          cd cli && npm install && npm run build && npm link
-          echo "$(npm config get prefix)/bin" >> $GITHUB_PATH
-
-      - name: Verify CLI
-        run: cline --version
-
-      - name: Run smoke tests
-        env:
-          CLINE_API_KEY: ${{ secrets.CLINE_API_KEY }}
-        run: |
-          cline auth -p cline -k "$CLINE_API_KEY" -m "anthropic/claude-sonnet-4.5"
-          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

@@ -0,0 +1,312 @@
+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,16 +80,13 @@ 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_call:
+  workflow_dispatch:
     inputs:
       confirm_publish:
         description: 'Type "publish" to confirm you want to publish to NPM'
@@ -9,10 +9,9 @@ on:
         type: string
 
 permissions:
-  contents: write # Required for pushing tags
-  id-token: write # Required for npm trusted publishing (OIDC)
-  checks: write # Required by test workflow
-  pull-requests: write # Required by test workflow
+  contents: read
+  checks: write  # Required by test workflow
+  pull-requests: write  # Required by test workflow
 
 jobs:
   test:
@@ -21,7 +20,7 @@ jobs:
   publish-npm-release:
     needs: test
     name: Publish Cline CLI to NPM
-    if: github.repository == 'cline/cline' && github.ref == 'refs/heads/main' && inputs.confirm_publish == 'publish'
+    if: github.repository == 'cline/cline' && github.ref == 'refs/heads/main' && github.event.inputs.confirm_publish == 'publish'
     runs-on: ubuntu-latest
 
     steps:
@@ -31,23 +30,62 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "24.x"
-          registry-url: "https://registry.npmjs.org"
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
 
-      - 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: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24'
+          cache-dependency-path: cli/go.sum
 
-      - name: Generate Protos
-        run: npm run protos
+      # Cache root dependencies - only reuse if package-lock.json exactly matches
+      - name: Cache root dependencies
+        uses: actions/cache@v4
+        id: root-cache
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
+
+      # Cache webview-ui dependencies - only reuse if package-lock.json exactly matches
+      - name: Cache webview-ui dependencies
+        uses: actions/cache@v4
+        id: webview-cache
+        with:
+          path: webview-ui/node_modules
+          key: ${{ runner.os }}-npm-webview-${{ hashFiles('webview-ui/package-lock.json') }}
+
+      - name: Install root dependencies
+        if: steps.root-cache.outputs.cache-hit != 'true'
+        run: npm 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: Read release version
         id: version
         run: |
-          # Read version from cli/package.json
+          # Read version from cli/package.json (stable version)
           VERSION=$(node -p "require('./cli/package.json').version")
           echo "Release version: $VERSION"
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
+      - name: Download ripgrep binaries
+        run: npm run download-ripgrep
+
+      - name: Clean previous builds
+        run: rm -rf dist-standalone
+
+      - name: Generate Protos (First Pass)
+        run: npm run protos && npm run protos-go
+
+      - name: Compile CLI
+        run: npm run compile-cli
+
+      - name: Compile CLI for all platforms
+        run: npm run compile-cli-all-platforms
+
       - name: Build standalone NPM package
         env:
           TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
@@ -59,32 +97,31 @@ jobs:
           OTEL_EXPORTER_OTLP_PROTOCOL: ${{ secrets.OTEL_EXPORTER_OTLP_PROTOCOL }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.OTEL_EXPORTER_OTLP_HEADERS }}
-        run: node scripts/package-npm.mjs
+          POSTHOG_TELEMETRY_ENABLED: "true"
+        run: npm run compile-standalone-npm
+
+      - name: Generate Protos (Second Pass - Bug Workaround)
+        run: npm run protos && npm run protos-go
 
       - name: Verify build output
         run: |
           echo "Checking dist-standalone directory..."
           ls -la dist-standalone/
-
+          
           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 | 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,19 +1,14 @@
 name: Publish NPM Nightly
 
 on:
-  workflow_call:
-    inputs:
-      force_publish:
-        description: "Force publish even if there are no commits in the last 24 hours"
-        required: false
-        type: boolean
-        default: false
+  schedule:
+    - cron: '0 12 * * *'  # 4 AM PST (UTC-8) = 12 UTC
+  workflow_dispatch:
 
 permissions:
   contents: read
-  id-token: write # Required for npm trusted publishing (OIDC)
-  checks: write # Required by test workflow
-  pull-requests: write # Required by test workflow
+  checks: write  # Required by test workflow
+  pull-requests: write  # Required by test workflow
 
 jobs:
   test:
@@ -32,12 +27,6 @@ jobs:
       - name: Check for recent commits
         id: check_commits
         run: |
-          if [ "${{ inputs.force_publish }}" = "true" ]; then
-            echo "force_publish enabled, proceeding with publish"
-            echo "skip=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
           if [ $(git rev-list --count HEAD --since="24 hours ago") -eq 0 ]; then
             echo "No commits in last 24 hours, skipping publish"
             echo "skip=true" >> $GITHUB_OUTPUT
@@ -50,30 +39,55 @@ jobs:
         if: steps.check_commits.outputs.skip != 'true'
         uses: actions/setup-node@v4
         with:
-          node-version: "24.x"
-          registry-url: "https://registry.npmjs.org"
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
 
-      - name: Install root dependencies and CLI dependencies
+      - name: Setup Go
         if: steps.check_commits.outputs.skip != 'true'
-        run: npm ci --include=optional # this will also install cli deps because "cli" in included in root package.json workspaces field
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24'
+          cache-dependency-path: cli/go.sum
 
-      - name: Generate Protos
+      # Cache root dependencies - only reuse if package-lock.json exactly matches
+      - name: Cache root dependencies
         if: steps.check_commits.outputs.skip != 'true'
-        run: npm run protos
+        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
+        if: steps.check_commits.outputs.skip != 'true'
+        uses: actions/cache@v4
+        id: webview-cache
+        with:
+          path: webview-ui/node_modules
+          key: ${{ runner.os }}-npm-webview-${{ hashFiles('webview-ui/package-lock.json') }}
+
+      - name: Install root dependencies
+        if: steps.check_commits.outputs.skip != 'true' && steps.root-cache.outputs.cache-hit != 'true'
+        run: npm ci --include=optional
+
+      - name: Install webview-ui dependencies
+        if: steps.check_commits.outputs.skip != 'true' && steps.webview-cache.outputs.cache-hit != 'true'
+        run: cd webview-ui && npm ci --include=optional
 
       - name: Generate nightly version with timestamp
         if: steps.check_commits.outputs.skip != 'true'
         id: version
         run: |
-          # Read base version from cli/package.json (e.g., "2.0.0")
+          # Read base version from cli/package.json (e.g., "1.0.9")
           BASE_VERSION=$(node -p "require('./cli/package.json').version")
-
+          
           # Generate timestamp (Unix epoch seconds)
           TIMESTAMP=$(date +%s)
-
+          
           # Create unique nightly version: 1.0.9-nightly.1736365200
           VERSION="${BASE_VERSION}-nightly.${TIMESTAMP}"
-
+          
           echo "Base version: $BASE_VERSION"
           echo "Generated nightly version: $VERSION"
           echo "version=$VERSION" >> $GITHUB_OUTPUT
@@ -88,11 +102,31 @@ jobs:
             pkg.version = '${{ steps.version.outputs.version }}';
             fs.writeFileSync('cli/package.json', JSON.stringify(pkg, null, '\t'));
           "
-
+          
           echo "Using version ${{ steps.version.outputs.version }} for build"
           cat cli/package.json | grep '"version"'
 
-      - name: Build and package CLI
+      - name: Download ripgrep binaries
+        if: steps.check_commits.outputs.skip != 'true'
+        run: npm run download-ripgrep
+
+      - name: Clean previous builds
+        if: steps.check_commits.outputs.skip != 'true'
+        run: rm -rf dist-standalone
+
+      - name: Generate Protos (First Pass)
+        if: steps.check_commits.outputs.skip != 'true'
+        run: npm run protos && npm run protos-go
+
+      - name: Compile CLI
+        if: steps.check_commits.outputs.skip != 'true'
+        run: npm run compile-cli
+
+      - name: Compile CLI for all platforms
+        if: steps.check_commits.outputs.skip != 'true'
+        run: npm run compile-cli-all-platforms
+
+      - name: Build standalone NPM package
         if: steps.check_commits.outputs.skip != 'true'
         env:
           TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
@@ -104,22 +138,29 @@ jobs:
           OTEL_EXPORTER_OTLP_PROTOCOL: ${{ secrets.OTEL_EXPORTER_OTLP_PROTOCOL }}
           OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
           OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.OTEL_EXPORTER_OTLP_HEADERS }}
-        run: node scripts/package-npm.mjs
+          POSTHOG_TELEMETRY_ENABLED: "true"
+        run: npm run compile-standalone-npm
+
+      - name: Generate Protos (Second Pass - Bug Workaround)
+        if: steps.check_commits.outputs.skip != 'true'
+        run: npm run protos && npm run protos-go
 
       - name: Verify build output
         if: steps.check_commits.outputs.skip != 'true'
         run: |
           echo "Checking dist-standalone directory..."
           ls -la dist-standalone/
-
+          
           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 | 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

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

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

.github/workflows/publish-nightly.yml

@@ -36,14 +36,30 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  # Keep publish environment aligned with test workflow/tooling lockfile expectations.
-                  # Newer LTS (Node 24 / npm 11) can make `npm list` fail with ELSPROBLEMS during vsce packaging.
-                  node-version: 22
+                  node-version: "lts/*"
+
+            # Cache root dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache root dependencies
+              uses: actions/cache@v4
+              id: root-cache
+              with:
+                  path: node_modules
+                  key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
+
+            # Cache webview-ui dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache webview-ui dependencies
+              uses: actions/cache@v4
+              id: webview-cache
+              with:
+                  path: webview-ui/node_modules
+                  key: ${{ runner.os }}-npm-webview-${{ hashFiles('webview-ui/package-lock.json') }}
 
             - name: Install root dependencies
+              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,12 +42,30 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: 22
+                  node-version: "lts/*"
+
+            # Cache root dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache root dependencies
+              uses: actions/cache@v4
+              id: root-cache
+              with:
+                  path: node_modules
+                  key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
+
+            # Cache webview-ui dependencies - only reuse if package-lock.json exactly matches
+            - name: Cache webview-ui dependencies
+              uses: actions/cache@v4
+              id: webview-cache
+              with:
+                  path: webview-ui/node_modules
+                  key: ${{ runner.os }}-npm-webview-${{ hashFiles('webview-ui/package-lock.json') }}
 
             - name: Install root dependencies
+              if: steps.root-cache.outputs.cache-hit != 'true'
               run: npm install --include=optional
 
             - name: Install webview-ui dependencies
+              if: steps.webview-cache.outputs.cache-hit != 'true'
               run: cd webview-ui && npm install --include=optional
 
             - name: Install Publishing Tools

.github/workflows/test.yml

@@ -28,17 +28,27 @@ jobs:
               uses: actions/setup-node@v4
               with:
                   node-version: 22
-                  cache: 'npm'
-                  cache-dependency-path: |
-                      package-lock.json
-                      webview-ui/package-lock.json
+
+            - 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') }}
 
             - 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)
@@ -63,17 +73,27 @@ jobs:
               uses: actions/setup-node@v4
               with:
                   node-version: 22
-                  cache: 'npm'
-                  cache-dependency-path: |
-                      package-lock.json
-                      webview-ui/package-lock.json
+
+            - 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') }}
 
             - 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
@@ -115,11 +135,6 @@ 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
@@ -141,18 +156,35 @@ jobs:
               uses: actions/setup-node@v4
               with:
                   node-version: 22
-                  cache: 'npm'
-                  cache-dependency-path: |
-                      package-lock.json
-                      webview-ui/package-lock.json
-                      testing-platform/package-lock.json
+                  
+            - 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') }}
 
             - 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
@@ -162,11 +194,17 @@ 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
-              run: npm run test:tp-orchestrator -- tests/specs/ --count=1 --coverage
+              # 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
 
             - name: Save Coverage Reports
               uses: actions/upload-artifact@v4

.gitignore

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

.gitmodules

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

CHANGELOG.md

@@ -1,197 +1,10 @@
 # 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
-
-## [3.53.0]
-
-### Fixed
-
-- Removed grok model from free tier
-
-## [3.52.0]
-
-### Added
-
-- Users with ChatGPT Plus or Pro subscriptions can now use GPT-5 models directly through Cline without needing an API key. Authentication is handled via OAuth through OpenAI's authentication system.
-- Grok models are now moving out of free tier and into paid plans.
-- Introduces comprehensive Jupyter Notebook support for Cline, enabling AI-assisted editing of `.ipynb` files with full cell-level context awareness.
-
-### Fixed
-
-- Bugs in DiffViewProvider for file editing
-- Ollama's recommended models to use correct identifiers
-
 ## [3.51.0]
 
 ### Added
 
-- Adding OpenAI gpt-5.2-codex model to the model picker
+- Adding OpenAI gpt-5.2-codex  model to the model picker
 
 ## [3.50.0]
 
@@ -1924,4 +1737,4 @@ Add Opus 4.1 through Claude Code
 
 ## [0.0.6]
 
-- Initial release
+- Initial release

CLAUDE.md

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

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2026 Cline Bot Inc.
+   Copyright 2025 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 © 2026 Cline Bot Inc.](./LICENSE)
+[Apache 2.0 © 2025 Cline Bot Inc.](./LICENSE)

SECURITY.md

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

assets/icons/social/discord.svg

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

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

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

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

@@ -1,3 +0,0 @@
-<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": "./node_modules/@biomejs/biome/configuration_schema.json",
+	"$schema": "https://biomejs.dev/schemas/2.1.4/schema.json",
 	"vcs": {
 		"enabled": true,
 		"clientKind": "git",
@@ -28,59 +28,58 @@
 		"rules": {
 			"recommended": true,
 			"correctness": {
-				"useExhaustiveDependencies": "info",
+				"useExhaustiveDependencies": "off",
 				"noUndeclaredVariables": "off",
-				"noEmptyPattern": "info",
+				"noEmptyPattern": "off",
 				"useJsxKeyInIterable": "off",
 				"noInnerDeclarations": "off",
-				"useHookAtTopLevel": "info",
-				"useYield": "info",
+				"useHookAtTopLevel": "off",
+				"useYield": "off",
 				"noConstructorReturn": "off",
 				"noInvalidPositionAtImportRule": "off",
 				"noSwitchDeclarations": "off",
 				"noUnusedImports": "error"
 			},
-			"a11y": "info",
+			"a11y": "off",
 			"style": {
 				"useNodejsImportProtocol": "off",
 				"useImportType": "off",
-				"useBlockStatements": "off",
+				"useBlockStatements": "warn",
 				"useNamingConvention": "off",
 				"useThrowOnlyError": "info",
 				"useConsistentArrayType": "off",
 				"noParameterAssign": "off",
 				"useAsConstAssertion": "off",
 				"useDefaultParameterLast": "off",
-				"noNonNullAssertion": "info",
+				"noNonNullAssertion": "off",
 				"useEnumInitializers": "off",
-				"useSelfClosingElements": "info",
+				"useSelfClosingElements": "off",
 				"useSingleVarDeclarator": "off",
-				"useNumberNamespace": "info",
-				"noInferrableTypes": "info",
-				"useTemplate": "info",
-				"noUselessElse": "info"
+				"useNumberNamespace": "off",
+				"noInferrableTypes": "off",
+				"useTemplate": "off",
+				"noUselessElse": "off"
 			},
 			"suspicious": {
 				"noDoubleEquals": "warn",
 				"noImplicitAnyLet": "info",
 				"noThenProperty": "off",
-				"noAsyncPromiseExecutor": "info",
+				"noAsyncPromiseExecutor": "off",
 				"noImportAssign": "off",
-				"noExplicitAny": "info",
-				"noControlCharactersInRegex": "warn",
+				"noExplicitAny": "off",
+				"noControlCharactersInRegex": "off",
 				"noShadowRestrictedNames": "off",
 				"noArrayIndexKey": "info",
-				"noAssignInExpressions": "info",
-				"useIterableCallbackReturn": "info"
+				"noAssignInExpressions": "info"
 			},
 			"complexity": {
-				"noUselessConstructor": "info",
-				"useOptionalChain": "info",
-				"noBannedTypes": "warn",
-				"useLiteralKeys": "info",
-				"noUselessCatch": "info",
-				"noUselessSwitchCase": "info",
-				"noStaticOnlyClass": "info"
+				"noUselessConstructor": "off",
+				"useOptionalChain": "off",
+				"noBannedTypes": "off",
+				"useLiteralKeys": "off",
+				"noUselessCatch": "off",
+				"noUselessSwitchCase": "off",
+				"noStaticOnlyClass": "off"
 			},
 			"security": {
 				"noDangerouslySetInnerHtml": "info"
@@ -95,11 +94,6 @@
 		"lineEnding": "lf",
 		"formatWithErrors": true
 	},
-	"css": {
-		"parser": {
-			"tailwindDirectives": true
-		}
-	},
 	"javascript": {
 		"formatter": {
 			"semicolons": "asNeeded",
@@ -118,21 +112,19 @@
 		}
 	},
 	"files": {
-		"ignoreUnknown": true,
 		"includes": [
 			"**",
-			// 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"
+			"!**/dist",
+			"!**/dist-*",
+			"!**/out",
+			"!**/evals",
+			"!**/playwright",
+			"!**/test-results",
+			"!**/node_modules",
+			"!**/webview-ui/build",
+			"!**/generated",
+			"!**/proto",
+			"!**/tests/specs"
 		]
 	},
 	"plugins": [
@@ -142,58 +134,29 @@
 		{
 			"includes": [
 				"**",
-				"!!**/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"
+				"!**/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"
 			]
 		},
 		{
-			// Do not use console logging directly, use the Logger service instead.
-			"plugins": [
-				"src/dev/grit/console-log.grit"
-			],
 			"includes": [
 				"**",
-				"!!**/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"
-			]
-		},
-		{
-			"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-ts/README.md

@@ -0,0 +1,297 @@
+# Cline CLI (TypeScript)
+
+A TypeScript CLI implementation of Cline that reuses the core TypeScript codebase. This allows you to run Cline tasks directly from the terminal while sharing 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 the CLI
+npm run compile-cli-ts
+```
+
+Or install the CLI globally:
+
+```bash
+cd cli-ts
+npm install
+npm run 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 |
+|--------|-------------|
+| `-i, --images <paths...>` | Image file paths to include with the task |
+| `-v, --verbose` | Show verbose output |
+| `-c, --cwd <path>` | Working directory |
+| `--config <path>` | Configuration directory |
+| `--thinking` | Enable extended thinking (1024 token budget) |
+
+## Development
+
+```bash
+# Build and link the package to your terminal
+npm run link
+
+# Set your provider (No Cline provider support yet)
+cline auth
+
+# Run a task
+cline task "Tell me about this codebase"
+```
+
+### Build
+
+```bash
+# Development build with source maps
+npm run build
+
+# Production build (minified)
+npm run build:production
+```
+
+### Watch Mode
+
+```bash
+npm run watch
+```
+
+### Type Checking
+
+```bash
+npm run typecheck
+```
+
+## Architecture
+
+The CLI reuses the core Cline TypeScript codebase:
+
+- **Controller** (`@core/controller`): Manages task lifecycle and state
+- **Task** (`@core/task`): Executes Cline tasks using the AI API
+- **StateManager** (`@core/storage`): Handles persistent state storage
+
+CLI-specific implementations:
+
+- `cli-host-bridge.ts`: CLI implementations of host bridge services
+- `cli-webview-provider.ts`: WebviewProvider that outputs to terminal
+- `cli-comment-review.ts`: Comment review controller for terminal
+- `vscode-context.ts`: Mock VSCode extension context
+- `display.ts`: Terminal output formatting utilities
+
+## 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.
+
+## Comparison with Go CLI
+
+This TypeScript CLI differs from the Go CLI (`cli/` directory):
+
+| Feature | Go CLI | TypeScript CLI |
+|---------|--------|----------------|
+| Language | Go | TypeScript |
+| Core sharing | Uses gRPC to communicate | Direct imports |
+| Startup time | Fast | Moderate |
+| Dependencies | Standalone binary | Requires Node.js |
+| Best for | Production deployment | Development, debugging |
+
+Choose the TypeScript CLI when you need to debug or modify the core Cline logic. Choose the Go CLI for production deployment with faster startup.
+
+## Troubleshooting
+
+### Build Errors
+
+If you encounter build errors, ensure you've:
+1. Run `npm install` in the repository root
+2. Run `npm run protos` to generate proto files
+3. Have all peer dependencies installed
+
+### Missing Dependencies
+
+The CLI imports from the parent project. If you see import errors:
+```bash
+cd ..  # Go to repository root
+npm install
+npm run protos
+```
+
+### Permission Denied
+
+Make the CLI executable:
+```bash
+chmod +x dist/cli.js
+```

cli-ts/esbuild.mjs

@@ -1,23 +1,20 @@
 import fs from "node:fs"
 import path from "node:path"
 import { fileURLToPath } from "node:url"
-import dotenv from "dotenv"
 import * as esbuild from "esbuild"
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 const rootDir = path.resolve(__dirname, "..")
 
-// Load .env from repo root
-dotenv.config({ path: path.join(rootDir, ".env") })
-
 const production = process.argv.includes("--production")
 const watch = process.argv.includes("--watch")
 
 /**
  * Plugin to resolve path aliases from the parent project
+ * @type {import('esbuild').Plugin}
  */
-const aliasResolverPlugin: esbuild.Plugin = {
+const aliasResolverPlugin = {
 	name: "alias-resolver",
 	setup(build) {
 		const aliases = {
@@ -66,18 +63,6 @@ const aliasResolverPlugin: esbuild.Plugin = {
 					}
 				}
 
-				// Handle .js -> .ts extension mapping (common in ESM TypeScript projects)
-				if (importPath.endsWith(".js")) {
-					const tsPath = importPath.replace(/\.js$/, ".ts")
-					if (fs.existsSync(tsPath)) {
-						return { path: tsPath }
-					}
-					const tsxPath = importPath.replace(/\.js$/, ".tsx")
-					if (fs.existsSync(tsxPath)) {
-						return { path: tsxPath }
-					}
-				}
-
 				// If nothing worked, return the original path and let esbuild handle the error
 				return { path: importPath }
 			})
@@ -87,22 +72,23 @@ const aliasResolverPlugin: esbuild.Plugin = {
 
 /**
  * Plugin to redirect vscode imports to our shim
+ * @type {import('esbuild').Plugin}
  */
-const vscodeStubPlugin: esbuild.Plugin = {
+const vscodeStubPlugin = {
 	name: "vscode-stub",
 	setup(build) {
 		// Redirect 'vscode' imports to our shim
-		build.onResolve({ filter: /^vscode$/ }, () => {
+		build.onResolve({ filter: /^vscode$/ }, (args) => {
 			return { path: path.join(__dirname, "src", "vscode-shim.ts") }
 		})
 	},
 }
 
-const esbuildProblemMatcherPlugin: esbuild.Plugin = {
+const esbuildProblemMatcherPlugin = {
 	name: "esbuild-problem-matcher",
 	setup(build) {
 		build.onStart(() => {
-			console.log("[cli esbuild] Build started...")
+			console.log("[cli-ts] Build started...")
 		})
 		build.onEnd((result) => {
 			result.errors.forEach(({ text, location }) => {
@@ -111,13 +97,13 @@ const esbuildProblemMatcherPlugin: esbuild.Plugin = {
 					console.error(`    ${location.file}:${location.line}:${location.column}:`)
 				}
 			})
-			console.log("[cli esbuild] Build finished")
+			console.log("[cli-ts] Build finished")
 		})
 	},
 }
 
 // Plugin to stub out optional devtools module
-const stubOptionalModulesPlugin: esbuild.Plugin = {
+const stubOptionalModulesPlugin = {
 	name: "stub-optional-modules",
 	setup(build) {
 		build.onResolve({ filter: /^react-devtools-core$/ }, () => {
@@ -126,7 +112,7 @@ const stubOptionalModulesPlugin: esbuild.Plugin = {
 	},
 }
 
-const copyWasmFiles: esbuild.Plugin = {
+const copyWasmFiles = {
 	name: "copy-wasm-files",
 	setup(build) {
 		build.onEnd(() => {
@@ -178,37 +164,21 @@ const copyWasmFiles: esbuild.Plugin = {
 	},
 }
 
-const buildEnvVars: Record<string, string> = {
+const buildEnvVars = {
 	"process.env.IS_STANDALONE": JSON.stringify("true"),
 	"process.env.IS_CLI": JSON.stringify("true"),
 }
 
-const buildTimeEnvs = [
-	"TELEMETRY_SERVICE_API_KEY",
-	"ERROR_SERVICE_API_KEY",
-	"POSTHOG_TELEMETRY_ENABLED",
-	"OTEL_TELEMETRY_ENABLED",
-	"OTEL_LOGS_EXPORTER",
-	"OTEL_METRICS_EXPORTER",
-	"OTEL_EXPORTER_OTLP_PROTOCOL",
-	"OTEL_EXPORTER_OTLP_ENDPOINT",
-	"OTEL_EXPORTER_OTLP_HEADERS",
-	"OTEL_METRIC_EXPORT_INTERVAL",
-	"CLINE_ENVIRONMENT",
-]
-
-buildTimeEnvs.forEach((envVar) => {
-	if (process.env[envVar]) {
-		console.log(`[cli esbuild] ${envVar} env var is set`)
-		buildEnvVars[`process.env.${envVar}`] = JSON.stringify(process.env[envVar])
-	}
-})
-
 if (production) {
 	buildEnvVars["process.env.IS_DEV"] = "false"
 }
 
-const config: esbuild.BuildOptions = {
+// Set the environment
+if (process.env.CLINE_ENVIRONMENT) {
+	buildEnvVars["process.env.CLINE_ENVIRONMENT"] = JSON.stringify(process.env.CLINE_ENVIRONMENT)
+}
+
+const config = {
 	entryPoints: [path.join(__dirname, "src", "index.ts")],
 	bundle: true,
 	minify: production,
@@ -223,19 +193,7 @@ const config: esbuild.BuildOptions = {
 	target: "node20",
 	outfile: path.join(__dirname, "dist", "cli.mjs"),
 	// These modules need to load files from the module directory at runtime
-	external: [
-		"@grpc/reflection",
-		"grpc-health-check",
-		"better-sqlite3",
-		"ink",
-		"ink-spinner",
-		"ink-picture",
-		"react",
-		"aws4fetch",
-		"pino",
-		"pino-roll",
-		"@vscode/ripgrep", // Uses __dirname to locate the binary
-	],
+	external: ["@grpc/reflection", "grpc-health-check", "better-sqlite3", "ink", "ink-spinner", "react"],
 	supported: { "top-level-await": true },
 	banner: {
 		js: `#!/usr/bin/env node
@@ -254,7 +212,7 @@ async function main() {
 	const ctx = await esbuild.context(config)
 	if (watch) {
 		await ctx.watch()
-		console.log("[cli] Watching for changes...")
+		console.log("[cli-ts] Watching for changes...")
 	} else {
 		await ctx.rebuild()
 		await ctx.dispose()

cli-ts/package.json

@@ -0,0 +1,48 @@
+{
+	"name": "@cline/cli",
+	"version": "1.0.0",
+	"description": "Cline CLI - TypeScript implementation that reuses core Cline functionality",
+	"main": "dist/cli.mjs",
+	"bin": {
+		"clinedev": "./dist/cli.mjs"
+	},
+	"type": "module",
+	"scripts": {
+		"build": "node esbuild.mjs",
+		"build:production": "node esbuild.mjs --production",
+		"watch": "node esbuild.mjs --watch",
+		"dev": "npm run watch",
+		"clean": "rimraf dist",
+		"typecheck": "tsc --noEmit",
+		"link": "npm run build && npm link",
+		"test": "vitest",
+		"test:run": "vitest run"
+	},
+	"keywords": [
+		"cline",
+		"cli",
+		"ai",
+		"coding-assistant"
+	],
+	"author": "Cline Bot Inc.",
+	"license": "Apache-2.0",
+	"devDependencies": {
+		"@types/node": "20.x",
+		"@types/prompts": "^2.4.9",
+		"@types/react": "^18.3.27",
+		"esbuild": "^0.25.0",
+		"ink-testing-library": "^4.0.0",
+		"rimraf": "^6.0.1",
+		"typescript": "^5.4.5",
+		"vitest": "^4.0.17"
+	},
+	"dependencies": {
+		"chalk": "^5.3.0",
+		"commander": "^12.1.0",
+		"ink": "^5.0.1",
+		"ink-spinner": "^5.0.0",
+		"ora": "^8.0.1",
+		"prompts": "^2.4.2",
+		"react": "^18.3.0"
+	}
+}

cli-ts/src/components/AccountInfoView.tsx

@@ -35,7 +35,7 @@ function formatBalance(balance: number | null): string {
 	return `$${(balance / 1000000).toFixed(2)}`
 }
 
-export const AccountInfoView: React.FC<AccountInfoViewProps> = React.memo(({ controller }) => {
+export const AccountInfoView: React.FC<AccountInfoViewProps> = ({ controller }) => {
 	const [provider, setProvider] = useState<string | null>(null)
 	const [balance, setBalance] = useState<number | null>(null)
 	const [organization, setOrganization] = useState<ClineAccountOrganization | null>(null)
@@ -191,4 +191,4 @@ export const AccountInfoView: React.FC<AccountInfoViewProps> = React.memo(({ con
 			</Box>
 		</Box>
 	)
-})
+}

cli-ts/src/components/App.test.tsx

@@ -5,14 +5,9 @@ import { beforeEach, describe, expect, it, vi } from "vitest"
 import { App } from "./App"
 
 // Mock the child components to isolate App routing logic
-vi.mock("./ChatView", () => ({
-	ChatView: ({ taskId, controller }: any) =>
-		React.createElement(Text, null, `ChatView: ${taskId || "no-id"} controller=${controller ? "present" : "none"}`),
-}))
-
-vi.mock("./TaskJsonView", () => ({
-	TaskJsonView: ({ taskId, verbose }: any) =>
-		React.createElement(Text, null, `TaskJsonView: ${taskId || "no-id"} verbose=${String(verbose)}`),
+vi.mock("./TaskView", () => ({
+	TaskView: ({ taskId, verbose }: any) =>
+		React.createElement(Text, null, `TaskView: ${taskId || "no-id"} verbose=${String(verbose)}`),
 }))
 
 vi.mock("./HistoryView", () => ({
@@ -27,19 +22,14 @@ vi.mock("./AuthView", () => ({
 	AuthView: ({ quickSetup }: any) => React.createElement(Text, null, `AuthView: ${quickSetup?.provider || "no-provider"}`),
 }))
 
+vi.mock("./WelcomeView", () => ({
+	WelcomeView: () => React.createElement(Text, null, "WelcomeView"),
+}))
+
 vi.mock("../context/TaskContext", () => ({
 	TaskContextProvider: ({ children }: any) => children,
 }))
 
-vi.mock("../context/StdinContext", () => ({
-	StdinProvider: ({ children }: any) => children,
-}))
-
-// Mock useTerminalSize to prevent EventEmitter memory leak warnings from resize listeners
-vi.mock("../hooks/useTerminalSize", () => ({
-	useTerminalSize: () => ({ columns: 80, rows: 24, resizeKey: 0 }),
-}))
-
 describe("App", () => {
 	const mockController = {
 		dispose: vi.fn(),
@@ -51,15 +41,9 @@ describe("App", () => {
 	})
 
 	describe("view routing", () => {
-		it("should render ChatView when view is task", () => {
+		it("should render TaskView when view is task", () => {
 			const { lastFrame } = render(<App controller={mockController} taskId="test-task" view="task" />)
-			expect(lastFrame()).toContain("ChatView")
-			expect(lastFrame()).toContain("test-task")
-		})
-
-		it("should render TaskJsonView when view is task with jsonOutput", () => {
-			const { lastFrame } = render(<App controller={mockController} jsonOutput={true} taskId="test-task" view="task" />)
-			expect(lastFrame()).toContain("TaskJsonView")
+			expect(lastFrame()).toContain("TaskView")
 			expect(lastFrame()).toContain("test-task")
 		})
 
@@ -82,21 +66,22 @@ describe("App", () => {
 		})
 
 		it("should render AuthView when view is auth", () => {
-			const { lastFrame } = render(<App controller={mockController} view="auth" />)
+			const { lastFrame } = render(<App authQuickSetup={{ provider: "openai" }} controller={mockController} view="auth" />)
 			expect(lastFrame()).toContain("AuthView")
+			expect(lastFrame()).toContain("openai")
 		})
 
-		it("should render ChatView when view is welcome", () => {
+		it("should render WelcomeView when view is welcome", () => {
 			const { lastFrame } = render(
 				<App controller={mockController} onWelcomeExit={() => {}} onWelcomeSubmit={() => {}} view="welcome" />,
 			)
-			expect(lastFrame()).toContain("ChatView")
+			expect(lastFrame()).toContain("WelcomeView")
 		})
 	})
 
 	describe("default props", () => {
-		it("should use default verbose=false with jsonOutput", () => {
-			const { lastFrame } = render(<App controller={mockController} jsonOutput={true} view="task" />)
+		it("should use default verbose=false", () => {
+			const { lastFrame } = render(<App controller={mockController} view="task" />)
 			expect(lastFrame()).toContain("verbose=false")
 		})
 
@@ -107,19 +92,14 @@ describe("App", () => {
 	})
 
 	describe("props passing", () => {
-		it("should pass verbose to TaskJsonView", () => {
-			const { lastFrame } = render(<App controller={mockController} jsonOutput={true} verbose={true} view="task" />)
+		it("should pass verbose to TaskView", () => {
+			const { lastFrame } = render(<App controller={mockController} verbose={true} view="task" />)
 			expect(lastFrame()).toContain("verbose=true")
 		})
 
-		it("should pass taskId to ChatView", () => {
+		it("should pass taskId to TaskView", () => {
 			const { lastFrame } = render(<App controller={mockController} taskId="my-task-123" view="task" />)
 			expect(lastFrame()).toContain("my-task-123")
 		})
-
-		it("should pass controller to ChatView", () => {
-			const { lastFrame } = render(<App controller={mockController} view="task" />)
-			expect(lastFrame()).toContain("controller=present")
-		})
 	})
 })

cli-ts/src/components/App.tsx

@@ -5,14 +5,12 @@
 
 import { Box } from "ink"
 import React, { ReactNode, useCallback, useState } from "react"
-import { StdinProvider } from "../context/StdinContext"
 import { TaskContextProvider } from "../context/TaskContext"
-import { useTerminalSize } from "../hooks/useTerminalSize"
 import { AuthView } from "./AuthView"
-import { ChatView } from "./ChatView"
 import { ConfigView } from "./ConfigView"
 import { HistoryView } from "./HistoryView"
-import { TaskJsonView } from "./TaskJsonView"
+import { TaskView } from "./TaskView"
+import { WelcomeView } from "./WelcomeView"
 
 export type ViewType = "task" | "history" | "config" | "auth" | "welcome"
 
@@ -44,11 +42,8 @@ interface SkillInfo {
 interface AppProps {
 	view: ViewType
 	taskId?: string
-	controller?: any
-	// Output Style
 	verbose?: boolean
-	jsonOutput?: boolean
-	// Status Callbacks
+	controller?: any
 	onComplete?: () => void
 	onError?: () => void
 	// For history view
@@ -81,20 +76,22 @@ 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
-	initialPrompt?: string
-	initialImages?: string[]
-	// Stdin support
-	isRawModeSupported?: boolean
 }
 
 export const App: React.FC<AppProps> = ({
 	view: initialView,
 	taskId,
 	verbose = false,
-	jsonOutput = false,
 	controller,
 	onComplete,
 	onError,
@@ -126,13 +123,10 @@ export const App: React.FC<AppProps> = ({
 	globalSkills,
 	localSkills,
 	onToggleSkill,
+	authQuickSetup,
 	onWelcomeSubmit,
 	onWelcomeExit,
-	initialPrompt,
-	initialImages,
-	isRawModeSupported = true,
 }) => {
-	const { resizeKey } = useTerminalSize()
 	const [currentView, setCurrentView] = useState<ViewType>(initialView)
 	const [selectedTaskId, setSelectedTaskId] = useState<string | undefined>(taskId)
 
@@ -146,7 +140,7 @@ export const App: React.FC<AppProps> = ({
 	}, [])
 
 	// Handle welcome submit when navigating internally (e.g., from auth -> welcome)
-	const _handleInternalWelcomeSubmit = useCallback(
+	const handleInternalWelcomeSubmit = useCallback(
 		async (prompt: string, imagePaths: string[]) => {
 			if (onWelcomeSubmit) {
 				// If external handler provided, use it
@@ -182,6 +176,14 @@ export const App: React.FC<AppProps> = ({
 	let content: ReactNode
 
 	switch (currentView) {
+		case "task":
+			content = (
+				<TaskContextProvider controller={controller}>
+					<TaskView onComplete={onComplete} onError={onError} taskId={selectedTaskId} verbose={verbose} />
+				</TaskContextProvider>
+			)
+			break
+
 		case "history":
 			content = (
 				<HistoryView
@@ -229,38 +231,18 @@ export const App: React.FC<AppProps> = ({
 					onComplete={onComplete}
 					onError={onError}
 					onNavigateToWelcome={handleNavigateToWelcome}
+					quickSetup={authQuickSetup}
 				/>
 			)
 			break
 
-		case "task":
 		case "welcome":
-			content = (
-				<TaskContextProvider controller={controller}>
-					{jsonOutput ? (
-						<TaskJsonView onComplete={onComplete} onError={onError} taskId={selectedTaskId} verbose={verbose} />
-					) : (
-						<ChatView
-							controller={controller}
-							initialImages={initialImages}
-							initialPrompt={initialPrompt}
-							onComplete={onComplete}
-							onError={onError}
-							onExit={onWelcomeExit}
-							taskId={selectedTaskId}
-						/>
-					)}
-				</TaskContextProvider>
-			)
+			content = <WelcomeView controller={controller} onExit={onWelcomeExit} onSubmit={handleInternalWelcomeSubmit} />
 			break
 
 		default:
 			content = null
 	}
 
-	return (
-		<StdinProvider isRawModeSupported={isRawModeSupported}>
-			<Box key={resizeKey}>{content}</Box>
-		</StdinProvider>
-	)
+	return <Box>{content}</Box>
 }

cli-ts/src/components/AskPrompt.tsx

@@ -3,14 +3,13 @@
  * Handles different types of user interactions (text input, confirmations, choices)
  */
 
-import type { ClineAsk, ClineMessage } from "@shared/ExtensionMessage"
+import type { ClineAsk } from "@shared/ExtensionMessage"
 import { Box, Text, useApp, useInput } from "ink"
 import React, { useCallback, useEffect, useRef, useState } from "react"
-import { useStdinContext } from "../context/StdinContext"
 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
@@ -61,7 +60,7 @@ function getPromptType(ask: ClineAsk, text: string): PromptType {
 
 export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 	const { exit } = useApp()
-	const { isRawModeSupported } = useStdinContext()
+
 	const controller = useTaskController()
 	const lastAskMessage = useLastCompletedAskMessage()
 	const [textInput, setTextInput] = useState("")
@@ -109,11 +108,6 @@ export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 	// Handle keyboard input
 	useInput(
 		(input, key) => {
-			// Filter out mouse escape sequences
-			if (isMouseEscapeSequence(input)) {
-				return
-			}
-
 			if (!lastAskMessage || responded) {
 				return
 			}
@@ -145,10 +139,10 @@ export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 					setTextInput((prev) => prev.slice(0, -1))
 				} else if (input && !key.ctrl && !key.meta) {
 					// Check if it's a number for option selection (only when no text typed yet)
-					const num = Number.parseInt(input, 10)
+					const num = parseInt(input, 10)
 					if (textInput === "" && !Number.isNaN(num) && num >= 1 && num <= parts.options.length) {
 						const selectedOption = parts.options[num - 1]
-						sendResponse("messageResponse", selectedOption)
+						sendResponse("optionSelected", selectedOption)
 					} else {
 						// Regular character input for free text
 						setTextInput((prev) => prev + input)
@@ -201,7 +195,7 @@ export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 				}
 			}
 		},
-		{ isActive: isRawModeSupported && !!lastAskMessage && !responded },
+		{ isActive: !!lastAskMessage && !responded },
 	)
 
 	if (!lastAskMessage || responded) {
@@ -237,9 +231,11 @@ export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 							<Text>{icon} </Text>
 							<Text color="cyan">Or type: </Text>
 							<Text>{textInput}</Text>
-							<Text inverse> </Text>
+							<Text color="gray">▌</Text>
 						</Box>
-						<Text color="gray">(Enter number to select, or type response + Enter)</Text>
+						<Text color="gray" dimColor>
+							(Enter number to select, or type response + Enter)
+						</Text>
 					</Box>
 				)
 			}
@@ -251,9 +247,11 @@ export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 						<Text>{icon} </Text>
 						<Text color="cyan">Reply: </Text>
 						<Text>{textInput}</Text>
-						<Text inverse> </Text>
+						<Text color="gray">▌</Text>
 					</Box>
-					<Text color="gray">(Type your response and press Enter)</Text>
+					<Text color="gray" dimColor>
+						(Type your response and press Enter)
+					</Text>
 				</Box>
 			)
 		}
@@ -277,9 +275,11 @@ export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 							<Text>{icon} </Text>
 							<Text color="cyan">Or type: </Text>
 							<Text>{textInput}</Text>
-							<Text inverse> </Text>
+							<Text color="gray">▌</Text>
 						</Box>
-						<Text color="gray">(Enter number to select, or type response + Enter)</Text>
+						<Text color="gray" dimColor>
+							(Enter number to select, or type response + Enter)
+						</Text>
 					</Box>
 				)
 			}
@@ -291,9 +291,11 @@ export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 						<Text>{icon} </Text>
 						<Text color="cyan">Reply: </Text>
 						<Text>{textInput}</Text>
-						<Text inverse> </Text>
+						<Text color="gray">▌</Text>
 					</Box>
-					<Text color="gray">(Type response + Enter, or just Enter to switch to Act mode)</Text>
+					<Text color="gray" dimColor>
+						(Type response + Enter, or just Enter to switch to Act mode)
+					</Text>
 				</Box>
 			)
 		}
@@ -327,9 +329,11 @@ export const AskPrompt: React.FC<AskPromptProps> = ({ onRespond }) => {
 						<Text>{icon} </Text>
 						<Text color="cyan">Follow-up: </Text>
 						<Text>{textInput}</Text>
-						<Text inverse> </Text>
+						<Text color="gray">▌</Text>
 					</Box>
-					<Text color="gray">(Type follow-up question + Enter, or q to exit)</Text>
+					<Text color="gray" dimColor>
+						(Type follow-up question + Enter, or q to exit)
+					</Text>
 				</Box>
 			)
 
@@ -371,72 +375,3 @@ 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 "❔"
-		}
-	}
-	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-ts/src/components/AuthView.tsx

@@ -0,0 +1,577 @@
+/**
+ * Auth view component
+ * Handles interactive authentication and provider configuration
+ */
+
+import { Box, Text, useApp, useInput } from "ink"
+import React, { useCallback, useEffect, useMemo, useState } from "react"
+import { StateManager } from "@/core/storage/StateManager"
+import { AuthService } from "@/services/auth/AuthService"
+import { API_PROVIDERS_LIST } from "@/shared/api"
+import { secretStorage } from "@/shared/storage/ClineSecretStorage"
+import { ProviderToApiKeyMap } from "../utils/provider-map"
+import { LoadingSpinner } from "./Spinner"
+
+type AuthStep = "menu" | "provider" | "apikey" | "modelid" | "baseurl" | "saving" | "success" | "error" | "cline_auth"
+
+interface AuthViewProps {
+	controller: any
+	onComplete?: () => void
+	onError?: () => void
+	onNavigateToWelcome?: () => void
+	// Quick setup options
+	quickSetup?: {
+		provider?: string
+		apikey?: string
+		modelid?: string
+		baseurl?: string
+	}
+}
+
+interface SelectItem {
+	label: string
+	value: string
+}
+
+/**
+ * Format separator
+ */
+function formatSeparator(char: string = "─", width: number = 60): string {
+	return char.repeat(Math.max(width, 10))
+}
+
+/**
+ * Capitalize provider name for display
+ */
+function capitalize(str: string): string {
+	return str
+		.split("-")
+		.map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+		.join(" ")
+}
+
+/**
+ * Select component with keyboard navigation
+ */
+const Select: React.FC<{
+	items: SelectItem[]
+	onSelect: (value: string) => void
+	label?: string
+}> = ({ items, onSelect, label }) => {
+	const [selectedIndex, setSelectedIndex] = useState(0)
+
+	useInput((input, key) => {
+		if (key.upArrow) {
+			setSelectedIndex((prev) => (prev > 0 ? prev - 1 : items.length - 1))
+		} else if (key.downArrow) {
+			setSelectedIndex((prev) => (prev < items.length - 1 ? prev + 1 : 0))
+		} else if (key.return) {
+			onSelect(items[selectedIndex].value)
+		}
+	})
+
+	return (
+		<Box flexDirection="column">
+			{label && (
+				<Text bold color="cyan">
+					{label}
+				</Text>
+			)}
+			{items.map((item, index) => (
+				<Box key={item.value}>
+					<Text color={index === selectedIndex ? "green" : undefined}>
+						{index === selectedIndex ? "❯ " : "  "}
+						{item.label}
+					</Text>
+				</Box>
+			))}
+			<Text color="gray" dimColor>
+				(Use arrow keys to navigate, Enter to select)
+			</Text>
+		</Box>
+	)
+}
+
+/**
+ * Text input component
+ */
+const TextInput: React.FC<{
+	value: string
+	onChange: (value: string) => void
+	onSubmit: (value: string) => void
+	label: string
+	placeholder?: string
+	isPassword?: boolean
+}> = ({ value, onChange, onSubmit, label, placeholder, isPassword }) => {
+	useInput((input, key) => {
+		if (key.return) {
+			onSubmit(value)
+		} else if (key.backspace || key.delete) {
+			onChange(value.slice(0, -1))
+		} else if (input && !key.ctrl && !key.meta) {
+			onChange(value + input)
+		}
+	})
+
+	const displayValue = isPassword ? "•".repeat(value.length) : value
+
+	return (
+		<Box flexDirection="column">
+			<Text bold color="cyan">
+				{label}
+			</Text>
+			<Box>
+				<Text color="white">{displayValue || placeholder || ""}</Text>
+				<Text color="gray">▌</Text>
+			</Box>
+			<Text color="gray" dimColor>
+				(Type your input and press Enter{value ? "" : ", or press Enter to skip"})
+			</Text>
+		</Box>
+	)
+}
+
+export const AuthView: React.FC<AuthViewProps> = ({ controller, onComplete, onError, onNavigateToWelcome, quickSetup }) => {
+	const { exit } = useApp()
+	const [step, setStep] = useState<AuthStep>(quickSetup ? "saving" : "menu")
+	const [selectedProvider, setSelectedProvider] = useState<string>(
+		StateManager.get().getApiConfiguration().actModeApiProvider ||
+			StateManager.get().getApiConfiguration().planModeApiProvider ||
+			"",
+	)
+	const [apiKey, setApiKey] = useState("")
+	const [modelId, setModelId] = useState("")
+	const [baseUrl, setBaseUrl] = useState("")
+	const [errorMessage, setErrorMessage] = useState("")
+	const [authStatus, setAuthStatus] = useState<string>("")
+
+	// Sort providers alphabetically
+	const sortedProviders = useMemo(() => API_PROVIDERS_LIST.slice().sort(), [])
+
+	// Get configured providers (those with API keys set)
+	const configuredProviders = useMemo(() => {
+		try {
+			const config = StateManager.get().getApiConfiguration()
+			const configured = new Set<string>()
+
+			for (const provider of sortedProviders) {
+				const keyField = ProviderToApiKeyMap[provider]
+				if (!keyField) {
+					continue
+				}
+
+				const fields = Array.isArray(keyField) ? keyField : [keyField]
+				const hasKey = fields.some((field) => {
+					const value = (config as Record<string, unknown>)[field]
+					return value !== undefined && value !== null && value !== ""
+				})
+
+				if (hasKey) {
+					configured.add(provider)
+				}
+			}
+
+			return configured
+		} catch {
+			return new Set<string>()
+		}
+	}, [sortedProviders, ProviderToApiKeyMap])
+
+	// Main menu items
+	const mainMenuItems: SelectItem[] = [
+		{ label: "Sign in to Cline", value: "cline_auth" },
+		{ label: "Configure BYO API provider", value: "configure_byo" },
+		{ label: "Exit", value: "exit" },
+	]
+
+	// Provider menu items
+	const providerItems: SelectItem[] = useMemo(
+		() =>
+			sortedProviders.map((p: string) => ({
+				label: `${capitalize(p)}${configuredProviders.has(p) ? " (configured)" : ""}`,
+				value: p,
+			})),
+		[sortedProviders, configuredProviders],
+	)
+
+	// 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") {
+			return
+		}
+
+		let cancelled = false
+
+		// Create a streaming response handler that receives auth state updates
+		const responseHandler = async (authState: { user?: { email?: string } }, _isLast?: boolean) => {
+			if (cancelled) {
+				return
+			}
+
+			if (authState.user && authState.user.email) {
+				// Auth succeeded - save configuration and transition to success
+				const stateManager = StateManager.get()
+				const config: Record<string, string> = {
+					actModeApiProvider: "cline",
+					planModeApiProvider: "cline",
+					actModeApiModelId: "anthropic/claude-sonnet-4.5",
+					planModeApiModelId: "anthropic/claude-sonnet-4.5",
+					apiProvider: "cline",
+				}
+				stateManager.setApiConfiguration(config)
+				stateManager.flushPendingState()
+
+				setSelectedProvider("cline")
+				setModelId("anthropic/claude-sonnet-4.5")
+				setStep("success")
+			}
+		}
+
+		// Subscribe to auth status updates
+		const authService = AuthService.getInstance(controller)
+		authService.subscribeToAuthStatusUpdate(controller, {}, responseHandler, `cli-auth-${Date.now()}`)
+
+		return () => {
+			cancelled = true
+		}
+	}, [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")
+		}
+	}
+
+	const handleMainMenuSelect = useCallback(
+		(value: string) => {
+			if (value === "exit") {
+				exit()
+				onComplete?.()
+			} else if (value === "cline_auth") {
+				setStep("cline_auth")
+				setAuthStatus("Starting authentication...")
+				AuthService.getInstance(controller).createAuthRequest()
+			} else if (value === "configure_byo") {
+				setStep("provider")
+			}
+		},
+		[exit, onComplete, controller],
+	)
+
+	const handleProviderSelect = useCallback(
+		(value: string) => {
+			setSelectedProvider(value)
+			if (value === "cline") {
+				setStep("cline_auth")
+				setAuthStatus("Starting authentication...")
+				AuthService.getInstance(controller).createAuthRequest()
+			} else {
+				setStep("apikey")
+			}
+		},
+		[controller],
+	)
+
+	const handleApiKeySubmit = useCallback(
+		(value: string) => {
+			if (!value.trim() || !selectedProvider) {
+				// Don't allow empty
+				return
+			}
+
+			// Use provider-specific API key field
+			const foundKey = ProviderToApiKeyMap[selectedProvider] || "apiKey"
+			const providerKey = Array.isArray(foundKey) ? foundKey[0] : foundKey
+
+			secretStorage.store(providerKey, value)
+
+			setApiKey(value)
+			setStep("modelid")
+		},
+		[selectedProvider],
+	)
+
+	const handleModelIdSubmit = useCallback(
+		(value: string) => {
+			if (value.trim()) {
+				setModelId(value)
+			}
+			// Only show baseurl step for OpenAI-like providers
+			if (["openai", "openai-native"].includes(selectedProvider)) {
+				setStep("baseurl")
+			} else {
+				setStep("saving")
+				saveConfiguration(value, "")
+			}
+		},
+		[selectedProvider],
+	)
+
+	const handleBaseUrlSubmit = useCallback(
+		(value: string) => {
+			setBaseUrl(value)
+			setStep("saving")
+			saveConfiguration(modelId, value)
+		},
+		[modelId],
+	)
+
+	const saveConfiguration = useCallback(
+		async (model: string, base: string) => {
+			try {
+				const stateManager = StateManager.get()
+				const config: Record<string, string> = {
+					actModeApiProvider: selectedProvider,
+					planModeApiProvider: selectedProvider,
+					actModeApiModelId: model,
+					planModeApiModelId: model,
+					apiProvider: selectedProvider,
+				}
+
+				if (base) {
+					config.openAiBaseUrl = base
+				}
+				stateManager.setApiConfiguration(config)
+				stateManager.flushPendingState()
+				setStep("success")
+			} catch (error) {
+				setErrorMessage(error instanceof Error ? error.message : String(error))
+				setStep("error")
+			}
+		},
+		[selectedProvider],
+	)
+
+	// Success screen menu items
+	const successMenuItems: SelectItem[] = useMemo(() => {
+		const items: SelectItem[] = []
+		if (onNavigateToWelcome) {
+			items.push({ label: "Start a task", value: "welcome" })
+		}
+		items.push({ label: "Exit", value: "exit" })
+		return items
+	}, [onNavigateToWelcome])
+
+	// Error screen menu items
+	const errorMenuItems: SelectItem[] = useMemo(() => {
+		const items: SelectItem[] = [{ label: "Try again", value: "retry" }]
+		if (onNavigateToWelcome) {
+			items.push({ label: "Start a task", value: "welcome" })
+		}
+		items.push({ label: "Exit", value: "exit" })
+		return items
+	}, [onNavigateToWelcome])
+
+	const handleSuccessMenuSelect = useCallback(
+		(value: string) => {
+			if (value === "welcome") {
+				onNavigateToWelcome?.()
+			} else if (value === "exit") {
+				onComplete?.()
+				exit()
+			}
+		},
+		[onNavigateToWelcome, onComplete, exit],
+	)
+
+	const handleErrorMenuSelect = useCallback(
+		(value: string) => {
+			if (value === "retry") {
+				// Reset state and go back to menu
+				setErrorMessage("")
+				setApiKey("")
+				setModelId("")
+				setBaseUrl("")
+				setSelectedProvider("")
+				setStep("menu")
+			} else if (value === "welcome") {
+				onNavigateToWelcome?.()
+			} else if (value === "exit") {
+				onError?.()
+				exit()
+			}
+		},
+		[onNavigateToWelcome, onError, exit],
+	)
+
+	return (
+		<Box flexDirection="column">
+			<Text bold color="white">
+				🔐 Cline Authentication
+			</Text>
+			<Text color="gray">{formatSeparator()}</Text>
+			<Text> </Text>
+
+			{step === "menu" && (
+				<Select items={mainMenuItems} label="What would you like to do?" onSelect={handleMainMenuSelect} />
+			)}
+
+			{step === "provider" && <Select items={providerItems} label="Select a provider:" onSelect={handleProviderSelect} />}
+
+			{step === "apikey" && (
+				<TextInput
+					isPassword={true}
+					label="Enter your API key:"
+					onChange={setApiKey}
+					onSubmit={handleApiKeySubmit}
+					value={apiKey}
+				/>
+			)}
+
+			{step === "modelid" && (
+				<TextInput
+					label="Enter the model ID (e.g., gpt-4, claude-sonnet-4.5):"
+					onChange={setModelId}
+					onSubmit={handleModelIdSubmit}
+					placeholder="model-id"
+					value={modelId}
+				/>
+			)}
+
+			{step === "baseurl" && (
+				<TextInput
+					label="Enter base URL (optional, press Enter to skip):"
+					onChange={setBaseUrl}
+					onSubmit={handleBaseUrlSubmit}
+					placeholder="https://api.example.com/v1"
+					value={baseUrl}
+				/>
+			)}
+
+			{step === "saving" && (
+				<Box>
+					<LoadingSpinner />
+					<Text color="cyan"> Saving configuration...</Text>
+				</Box>
+			)}
+
+			{step === "cline_auth" && (
+				<Box flexDirection="column">
+					<Box>
+						<LoadingSpinner />
+						<Text color="cyan"> {authStatus || "Authenticating with Cline..."}</Text>
+					</Box>
+					<Text color="gray" dimColor>
+						A browser window should open. Complete the sign-in process there.
+					</Text>
+				</Box>
+			)}
+
+			{step === "success" && (
+				<Box flexDirection="column">
+					<Text bold color="green">
+						✓ Successfully configured authentication
+					</Text>
+					<Text color="gray">{formatSeparator()}</Text>
+					<Box flexDirection="column" marginLeft={2}>
+						<Text>
+							<Text color="cyan">Provider:</Text> {capitalize(selectedProvider)}
+						</Text>
+						<Text>
+							<Text color="cyan">Model:</Text> {modelId}
+						</Text>
+						{baseUrl && (
+							<Text>
+								<Text color="cyan">Base URL:</Text> {baseUrl}
+							</Text>
+						)}
+						<Text>
+							<Text color="cyan">API Key:</Text> Configured
+						</Text>
+					</Box>
+					<Text color="gray">{formatSeparator()}</Text>
+					<Text color="white">You can now use Cline with this provider.</Text>
+					<Text> </Text>
+					<Select items={successMenuItems} label="What would you like to do?" onSelect={handleSuccessMenuSelect} />
+				</Box>
+			)}
+
+			{step === "error" && (
+				<Box flexDirection="column">
+					<Text bold color="red">
+						✗ Configuration failed
+					</Text>
+					<Text color="gray">{formatSeparator()}</Text>
+					<Text color="red">{errorMessage}</Text>
+					<Text> </Text>
+					<Select items={errorMenuItems} label="What would you like to do?" onSelect={handleErrorMenuSelect} />
+				</Box>
+			)}
+		</Box>
+	)
+}

cli-ts/src/components/CheckpointMenu.tsx

@@ -6,7 +6,6 @@
 import type { ClineMessage } from "@shared/ExtensionMessage"
 import { Box, Text, useInput } from "ink"
 import React, { useState } from "react"
-import { useStdinContext } from "../context/StdinContext"
 
 export type RestoreType = "task" | "workspace" | "taskAndWorkspace"
 
@@ -79,63 +78,63 @@ const RESTORE_TYPE_OPTIONS: { type: RestoreType; label: string; description: str
 ]
 
 export const CheckpointMenu: React.FC<CheckpointMenuProps> = ({ messages, onSelect, onCancel }) => {
-	const { isRawModeSupported } = useStdinContext()
 	const checkpoints = getCheckpointOptions(messages)
 	const [selectedCheckpoint, setSelectedCheckpoint] = useState(0)
 	const [selectedRestoreType, setSelectedRestoreType] = useState(0)
 	const [stage, setStage] = useState<"checkpoint" | "restoreType">("checkpoint")
 
-	useInput(
-		(input, key) => {
-			if (key.escape) {
-				if (stage === "restoreType") {
-					setStage("checkpoint")
-				} else {
-					onCancel()
-				}
-				return
+	useInput((input, key) => {
+		if (key.escape) {
+			if (stage === "restoreType") {
+				setStage("checkpoint")
+			} else {
+				onCancel()
 			}
+			return
+		}
 
-			if (stage === "checkpoint") {
-				if (key.upArrow) {
-					setSelectedCheckpoint((i) => Math.max(0, i - 1))
-				} else if (key.downArrow) {
-					setSelectedCheckpoint((i) => Math.min(checkpoints.length - 1, i + 1))
-				} else if (key.return && checkpoints.length > 0) {
-					setStage("restoreType")
-				}
-			} else if (stage === "restoreType") {
-				if (key.upArrow) {
-					setSelectedRestoreType((i) => Math.max(0, i - 1))
-				} else if (key.downArrow) {
-					setSelectedRestoreType((i) => Math.min(RESTORE_TYPE_OPTIONS.length - 1, i + 1))
-				} else if (key.return) {
-					const checkpoint = checkpoints[selectedCheckpoint]
-					const restoreType = RESTORE_TYPE_OPTIONS[selectedRestoreType]
-					if (checkpoint && restoreType) {
-						onSelect(checkpoint.ts, restoreType.type)
-					}
+		if (stage === "checkpoint") {
+			if (key.upArrow) {
+				setSelectedCheckpoint((i) => Math.max(0, i - 1))
+			} else if (key.downArrow) {
+				setSelectedCheckpoint((i) => Math.min(checkpoints.length - 1, i + 1))
+			} else if (key.return && checkpoints.length > 0) {
+				setStage("restoreType")
+			}
+		} else if (stage === "restoreType") {
+			if (key.upArrow) {
+				setSelectedRestoreType((i) => Math.max(0, i - 1))
+			} else if (key.downArrow) {
+				setSelectedRestoreType((i) => Math.min(RESTORE_TYPE_OPTIONS.length - 1, i + 1))
+			} else if (key.return) {
+				const checkpoint = checkpoints[selectedCheckpoint]
+				const restoreType = RESTORE_TYPE_OPTIONS[selectedRestoreType]
+				if (checkpoint && restoreType) {
+					onSelect(checkpoint.ts, restoreType.type)
 				}
 			}
+		}
 
-			// Quick number selection for checkpoints
-			if (stage === "checkpoint") {
-				const num = Number.parseInt(input, 10)
-				if (!Number.isNaN(num) && num >= 1 && num <= checkpoints.length) {
-					setSelectedCheckpoint(num - 1)
-					setStage("restoreType")
-				}
+		// Quick number selection for checkpoints
+		if (stage === "checkpoint") {
+			const num = parseInt(input, 10)
+			if (!Number.isNaN(num) && num >= 1 && num <= checkpoints.length) {
+				setSelectedCheckpoint(num - 1)
+				setStage("restoreType")
 			}
-		},
-		{ isActive: isRawModeSupported },
-	)
+		}
+	})
 
 	if (checkpoints.length === 0) {
 		return (
 			<Box borderColor="yellow" borderStyle="round" flexDirection="column" marginTop={1} paddingLeft={1} paddingRight={1}>
 				<Text color="yellow">No checkpoints available</Text>
-				<Text color="gray">Checkpoints are created at task completion points</Text>
-				<Text color="gray">Press Escape to close</Text>
+				<Text color="gray" dimColor>
+					Checkpoints are created at task completion points
+				</Text>
+				<Text color="gray" dimColor>
+					Press Escape to close
+				</Text>
 			</Box>
 		)
 	}
@@ -146,7 +145,9 @@ export const CheckpointMenu: React.FC<CheckpointMenuProps> = ({ messages, onSele
 				<Text bold color="cyan">
 					Restore Checkpoint
 				</Text>
-				<Text color="gray">Select a checkpoint to restore (↑/↓ or number, Enter to select, Escape to cancel)</Text>
+				<Text color="gray" dimColor>
+					Select a checkpoint to restore (↑/↓ or number, Enter to select, Escape to cancel)
+				</Text>
 				<Box flexDirection="column" marginTop={1}>
 					{checkpoints.map((cp, idx) => {
 						const isSelected = idx === selectedCheckpoint
@@ -157,9 +158,9 @@ export const CheckpointMenu: React.FC<CheckpointMenuProps> = ({ messages, onSele
 								<Text color={isSelected ? "green" : "gray"}>{isSelected ? "> " : "  "}</Text>
 								<Text color={isSelected ? "white" : "gray"}>{idx + 1}. </Text>
 								<Text color={isSelected ? "cyan" : undefined}>{cp.label}</Text>
-								<Text color="gray">
-									{" "}
-									- {dateStr} {timeStr}
+								<Text color="gray"> - </Text>
+								<Text dimColor>
+									{dateStr} {timeStr}
 								</Text>
 							</Box>
 						)
@@ -176,7 +177,7 @@ export const CheckpointMenu: React.FC<CheckpointMenuProps> = ({ messages, onSele
 			<Text bold color="cyan">
 				Restore Type
 			</Text>
-			<Text color="gray">
+			<Text color="gray" dimColor>
 				Restoring to: {selectedCp?.label} ({selectedCp?.date.toLocaleString()})
 			</Text>
 			<Box flexDirection="column" marginTop={1}>
@@ -191,13 +192,17 @@ export const CheckpointMenu: React.FC<CheckpointMenuProps> = ({ messages, onSele
 								</Text>
 							</Box>
 							<Box marginLeft={4}>
-								<Text color="gray">{opt.description}</Text>
+								<Text color="gray" dimColor>
+									{opt.description}
+								</Text>
 							</Box>
 						</Box>
 					)
 				})}
 			</Box>
-			<Text color="gray">(↑/↓ to select, Enter to confirm, Escape to go back)</Text>
+			<Text color="gray" dimColor marginTop={1}>
+				(↑/↓ to select, Enter to confirm, Escape to go back)
+			</Text>
 		</Box>
 	)
 }

cli-ts/src/components/ConfigView.tsx

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

cli-ts/src/components/ConfigViewComponents.tsx

@@ -4,7 +4,6 @@
 
 import { Box, Text, useInput } from "ink"
 import React, { useState } from "react"
-import { useStdinContext } from "../context/StdinContext"
 
 // ============================================================================
 // Types & Constants
@@ -46,19 +45,16 @@ export interface SkillInfo {
 	enabled: boolean
 }
 
-export interface ObjectEditorState {
-	source: "global" | "workspace"
-	key: string
-	path: string[]
-	value: Record<string, unknown>
-	selectedIndex: number
-	isEditingValue: boolean
-	editValue: string
-}
+export const EXCLUDED_KEYS = new Set([
+	"taskHistory",
+	"primaryRootIndex",
+	"subagentsEnabled",
+	"subagentTerminalOutputLineLimit",
+	"welcomeViewCompleted",
+	"isNewUser",
+])
 
-export const EXCLUDED_KEYS = new Set(["taskHistory", "primaryRootIndex", "welcomeViewCompleted", "isNewUser"])
-
-export const EDITABLE_TYPES: Set<ValueType> = new Set(["string", "number", "boolean", "object"])
+export const EDITABLE_TYPES: Set<ValueType> = new Set(["string", "number", "boolean"])
 export const MAX_VISIBLE = 12
 export const SEPARATOR = "─".repeat(80)
 
@@ -127,10 +123,10 @@ export function formatValue(value: unknown, maxLen = 50): string {
 	}
 	if (typeof value === "object") {
 		const json = JSON.stringify(value)
-		return json.length > maxLen ? `${json.slice(0, maxLen - 3)}...` : json
+		return json.length > maxLen ? json.slice(0, maxLen - 3) + "..." : json
 	}
 	const str = String(value)
-	return str.length > maxLen ? `${str.slice(0, maxLen - 3)}...` : str
+	return str.length > maxLen ? str.slice(0, maxLen - 3) + "..." : str
 }
 
 export function parseValue(input: string, type: ValueType): unknown {
@@ -138,7 +134,7 @@ export function parseValue(input: string, type: ValueType): unknown {
 		return input.toLowerCase() === "true" || input === "1"
 	}
 	if (type === "number") {
-		const num = Number.parseFloat(input)
+		const num = parseFloat(input)
 		return Number.isNaN(num) ? 0 : num
 	}
 	if (type === "object") {
@@ -196,22 +192,17 @@ interface TextInputProps {
 }
 
 export const TextInput: React.FC<TextInputProps> = ({ label, onChange, onCancel, onSubmit, type, value }) => {
-	const { isRawModeSupported } = useStdinContext()
-
-	useInput(
-		(input, key) => {
-			if (key.escape) {
-				onCancel()
-			} else if (key.return) {
-				onSubmit(value)
-			} else if (key.backspace || key.delete) {
-				onChange(value.slice(0, -1))
-			} else if (input && !key.ctrl && !key.meta) {
-				onChange(value + input)
-			}
-		},
-		{ isActive: isRawModeSupported },
-	)
+	useInput((input, key) => {
+		if (key.escape) {
+			onCancel()
+		} else if (key.return) {
+			onSubmit(value)
+		} else if (key.backspace || key.delete) {
+			onChange(value.slice(0, -1))
+		} else if (input && !key.ctrl && !key.meta) {
+			onChange(value + input)
+		}
+	})
 
 	return (
 		<Box flexDirection="column" marginTop={1}>
@@ -220,9 +211,11 @@ export const TextInput: React.FC<TextInputProps> = ({ label, onChange, onCancel,
 			</Text>
 			<Box>
 				<Text color="white">{value}</Text>
-				<Text color="cyan">|</Text>
+				<Text color="gray">▌</Text>
 			</Box>
-			<Text color="gray">Type: {type} • Enter to save • Esc to cancel</Text>
+			<Text color="gray" dimColor>
+				Type: {type} • Enter to save • Esc to cancel
+			</Text>
 		</Box>
 	)
 }
@@ -235,21 +228,17 @@ interface BooleanSelectProps {
 }
 
 export const BooleanSelect: React.FC<BooleanSelectProps> = ({ label, onCancel, onSelect, value }) => {
-	const { isRawModeSupported } = useStdinContext()
 	const [selected, setSelected] = useState(value)
 
-	useInput(
-		(_input, key) => {
-			if (key.escape) {
-				onCancel()
-			} else if (key.return) {
-				onSelect(selected)
-			} else if (key.upArrow || key.downArrow) {
-				setSelected((prev) => !prev)
-			}
-		},
-		{ isActive: isRawModeSupported },
-	)
+	useInput((_input, key) => {
+		if (key.escape) {
+			onCancel()
+		} else if (key.return) {
+			onSelect(selected)
+		} else if (key.upArrow || key.downArrow) {
+			setSelected((prev) => !prev)
+		}
+	})
 
 	return (
 		<Box flexDirection="column" marginTop={1}>
@@ -260,7 +249,9 @@ export const BooleanSelect: React.FC<BooleanSelectProps> = ({ label, onCancel, o
 				<Text color={selected ? "green" : undefined}>{selected ? "❯ " : "  "}true</Text>
 				<Text color={!selected ? "green" : undefined}>{!selected ? "❯ " : "  "}false</Text>
 			</Box>
-			<Text color="gray">↑/↓ to toggle • Enter to save • Esc to cancel</Text>
+			<Text color="gray" dimColor>
+				↑/↓ to toggle • Enter to save • Esc to cancel
+			</Text>
 		</Box>
 	)
 }
@@ -275,7 +266,12 @@ export const ConfigRow: React.FC<{ entry: ConfigEntry; isSelected: boolean }> =
 				<Text color="cyan">{entry.key}</Text>
 				<Text color="gray">: </Text>
 				<Text color={valueColor}>{formatValue(entry.value)}</Text>
-				{!entry.isEditable && <Text color="gray"> (read-only)</Text>}
+				{!entry.isEditable && (
+					<Text color="gray" dimColor>
+						{" "}
+						(read-only)
+					</Text>
+				)}
 			</Text>
 		</Box>
 	)
@@ -296,7 +292,11 @@ export const ToggleRow: React.FC<{
 				<Text color={entry.enabled ? "green" : "red"}>{entry.enabled ? "●" : "○"}</Text>
 				<Text> </Text>
 				<Text color="white">{fileName}</Text>
-				{showType && <Text color="gray">{typeLabel}</Text>}
+				{showType && (
+					<Text color="gray" dimColor>
+						{typeLabel}
+					</Text>
+				)}
 			</Text>
 		</Box>
 	)
@@ -336,8 +336,8 @@ export const SkillRow: React.FC<{
 			</Box>
 			{skill.description && (
 				<Box marginLeft={4}>
-					<Text color="gray">
-						{skill.description.length > 60 ? `${skill.description.slice(0, 57)}...` : skill.description}
+					<Text color="gray" dimColor>
+						{skill.description.length > 60 ? skill.description.slice(0, 57) + "..." : skill.description}
 					</Text>
 				</Box>
 			)}
@@ -382,169 +382,3 @@ export const SectionHeader: React.FC<{ title: string }> = ({ title }) => (
 		</Text>
 	</Box>
 )
-
-interface ObjectEditorPanelProps {
-	state: ObjectEditorState
-	setState: React.Dispatch<React.SetStateAction<ObjectEditorState | null>>
-	onClose: () => void
-	onPersist: (nextObject: Record<string, unknown>) => void
-	getObjectAtPath: (root: Record<string, unknown>, path: string[]) => Record<string, unknown>
-	setObjectValueAtPath: (root: Record<string, unknown>, path: string[], key: string, value: unknown) => Record<string, unknown>
-}
-
-export const ObjectEditorPanel: React.FC<ObjectEditorPanelProps> = ({
-	state,
-	setState,
-	onClose,
-	onPersist,
-	getObjectAtPath,
-	setObjectValueAtPath,
-}) => {
-	const { isRawModeSupported } = useStdinContext()
-	const currentNode = getObjectAtPath(state.value, state.path)
-	const objectEntries = Object.entries(currentNode).sort(([a], [b]) => a.localeCompare(b))
-	const selectedEntry = objectEntries[state.selectedIndex]
-	const breadcrumb = [state.key, ...state.path].join(" › ")
-
-	useInput(
-		(input, key) => {
-			if (state.isEditingValue) {
-				if (key.escape) {
-					setState((prev) => (prev ? { ...prev, isEditingValue: false, editValue: "" } : prev))
-					return
-				}
-				if (key.return) {
-					if (!selectedEntry) {
-						setState((prev) => (prev ? { ...prev, isEditingValue: false, editValue: "" } : prev))
-						return
-					}
-					const [entryKey, entryValue] = selectedEntry
-					let parsed: unknown = state.editValue
-					if (typeof entryValue === "boolean") {
-						parsed = state.editValue.toLowerCase() === "true" || state.editValue === "1"
-					} else if (typeof entryValue === "number") {
-						const maybeNum = Number(state.editValue)
-						parsed = Number.isNaN(maybeNum) ? 0 : maybeNum
-					}
-					const nextObject = setObjectValueAtPath(state.value, state.path, entryKey, parsed)
-					onPersist(nextObject)
-					setState((prev) => (prev ? { ...prev, value: nextObject, isEditingValue: false, editValue: "" } : prev))
-					return
-				}
-				if (key.backspace || key.delete) {
-					setState((prev) => (prev ? { ...prev, editValue: prev.editValue.slice(0, -1) } : prev))
-					return
-				}
-				if (input && !key.ctrl && !key.meta) {
-					setState((prev) => (prev ? { ...prev, editValue: prev.editValue + input } : prev))
-				}
-				return
-			}
-
-			if (key.escape) {
-				if (state.path.length > 0) {
-					setState((prev) => (prev ? { ...prev, path: prev.path.slice(0, -1), selectedIndex: 0 } : prev))
-				} else {
-					onClose()
-				}
-				return
-			}
-
-			if (key.upArrow || input === "k") {
-				setState((prev) =>
-					prev
-						? {
-								...prev,
-								selectedIndex:
-									objectEntries.length > 0
-										? prev.selectedIndex > 0
-											? prev.selectedIndex - 1
-											: objectEntries.length - 1
-										: 0,
-							}
-						: prev,
-				)
-				return
-			}
-			if (key.downArrow || input === "j") {
-				setState((prev) =>
-					prev
-						? {
-								...prev,
-								selectedIndex:
-									objectEntries.length > 0
-										? prev.selectedIndex < objectEntries.length - 1
-											? prev.selectedIndex + 1
-											: 0
-										: 0,
-							}
-						: prev,
-				)
-				return
-			}
-
-			if (key.return || key.tab) {
-				if (!selectedEntry) {
-					return
-				}
-				const [entryKey, entryValue] = selectedEntry
-				if (typeof entryValue === "boolean") {
-					const nextObject = setObjectValueAtPath(state.value, state.path, entryKey, !entryValue)
-					onPersist(nextObject)
-					setState((prev) => (prev ? { ...prev, value: nextObject } : prev))
-					return
-				}
-				if (entryValue && typeof entryValue === "object" && !Array.isArray(entryValue)) {
-					setState((prev) => (prev ? { ...prev, path: [...prev.path, entryKey], selectedIndex: 0 } : prev))
-					return
-				}
-				setState((prev) =>
-					prev
-						? { ...prev, isEditingValue: true, editValue: entryValue !== undefined ? String(entryValue) : "" }
-						: prev,
-				)
-			}
-		},
-		{ isActive: isRawModeSupported },
-	)
-
-	return (
-		<Box flexDirection="column">
-			<Text bold color="white">
-				⚙️ Edit Nested Object
-			</Text>
-			<Text color="gray">{SEPARATOR}</Text>
-			<Text color="cyan">{breadcrumb}</Text>
-			{state.isEditingValue ? (
-				<Box flexDirection="column" marginTop={1}>
-					<Box>
-						<Text color="white">{state.editValue}</Text>
-						<Text color="cyan">|</Text>
-					</Box>
-					<Text color="gray">Enter to save • Esc to cancel</Text>
-				</Box>
-			) : (
-				<Box flexDirection="column" marginTop={1}>
-					{objectEntries.length === 0 ? (
-						<Text color="gray">No nested keys at this level.</Text>
-					) : (
-						objectEntries.map(([key, value], idx) => {
-							const isSelected = idx === state.selectedIndex
-							const valueText =
-								value && typeof value === "object" && !Array.isArray(value) ? "{...}" : String(value)
-							return (
-								<Text color={isSelected ? "cyan" : undefined} key={key}>
-									{isSelected ? "❯ " : "  "}
-									<Text color="cyan">{key}</Text>
-									<Text color="gray">: </Text>
-									<Text color="white">{valueText}</Text>
-								</Text>
-							)
-						})
-					)}
-					<Text color="gray">↑/↓ Navigate • Enter/Tab Edit or drill in • Esc Back/Close</Text>
-				</Box>
-			)}
-		</Box>
-	)
-}

cli-ts/src/components/ConfigViewWrapper.tsx

@@ -12,7 +12,6 @@ import React, { useCallback, useEffect, useState } from "react"
 
 import type { Controller } from "@/core/controller"
 import { HostProvider } from "@/hosts/host-provider"
-import { StdinProvider } from "../context/StdinContext"
 import { ConfigView } from "./ConfigView"
 
 interface HookInfo {
@@ -40,7 +39,6 @@ interface ConfigViewWrapperProps {
 	workspaceState: Record<string, unknown>
 	hooksEnabled: boolean
 	skillsEnabled: boolean
-	isRawModeSupported?: boolean
 }
 
 export const ConfigViewWrapper: React.FC<ConfigViewWrapperProps> = ({
@@ -50,7 +48,6 @@ export const ConfigViewWrapper: React.FC<ConfigViewWrapperProps> = ({
 	workspaceState: initialWorkspaceState,
 	hooksEnabled,
 	skillsEnabled,
-	isRawModeSupported = true,
 }) => {
 	// Settings state (managed locally for UI updates)
 	const [globalStateLocal, setGlobalStateLocal] = useState<Record<string, unknown>>(initialGlobalState)
@@ -270,32 +267,30 @@ export const ConfigViewWrapper: React.FC<ConfigViewWrapperProps> = ({
 	)
 
 	return (
-		<StdinProvider isRawModeSupported={isRawModeSupported}>
-			<ConfigView
-				dataDir={dataDir}
-				globalClineRulesToggles={globalClineRulesToggles}
-				globalHooks={globalHooks}
-				globalSkills={globalSkills}
-				globalState={globalStateLocal}
-				globalWorkflowToggles={globalWorkflowToggles}
-				hooksEnabled={hooksEnabled}
-				localAgentsRulesToggles={localAgentsRulesToggles}
-				localClineRulesToggles={localClineRulesToggles}
-				localCursorRulesToggles={localCursorRulesToggles}
-				localSkills={localSkills}
-				localWindsurfRulesToggles={localWindsurfRulesToggles}
-				localWorkflowToggles={localWorkflowToggles}
-				onOpenFolder={handleOpenFolder}
-				onToggleHook={handleToggleHook}
-				onToggleRule={handleToggleRule}
-				onToggleSkill={handleToggleSkill}
-				onToggleWorkflow={handleToggleWorkflow}
-				onUpdateGlobal={handleUpdateGlobal}
-				onUpdateWorkspace={handleUpdateWorkspace}
-				skillsEnabled={skillsEnabled}
-				workspaceHooks={workspaceHooksState}
-				workspaceState={workspaceStateLocal}
-			/>
-		</StdinProvider>
+		<ConfigView
+			dataDir={dataDir}
+			globalClineRulesToggles={globalClineRulesToggles}
+			globalHooks={globalHooks}
+			globalSkills={globalSkills}
+			globalState={globalStateLocal}
+			globalWorkflowToggles={globalWorkflowToggles}
+			hooksEnabled={hooksEnabled}
+			localAgentsRulesToggles={localAgentsRulesToggles}
+			localClineRulesToggles={localClineRulesToggles}
+			localCursorRulesToggles={localCursorRulesToggles}
+			localSkills={localSkills}
+			localWindsurfRulesToggles={localWindsurfRulesToggles}
+			localWorkflowToggles={localWorkflowToggles}
+			onOpenFolder={handleOpenFolder}
+			onToggleHook={handleToggleHook}
+			onToggleRule={handleToggleRule}
+			onToggleSkill={handleToggleSkill}
+			onToggleWorkflow={handleToggleWorkflow}
+			onUpdateGlobal={handleUpdateGlobal}
+			onUpdateWorkspace={handleUpdateWorkspace}
+			skillsEnabled={skillsEnabled}
+			workspaceHooks={workspaceHooksState}
+			workspaceState={workspaceStateLocal}
+		/>
 	)
 }

cli-ts/src/components/DiffView.tsx

@@ -0,0 +1,175 @@
+/**
+ * DiffView component for displaying file diffs in Ink
+ * Shows unified diff output with colored lines for additions/deletions
+ */
+
+import { Box, Text } from "ink"
+import React from "react"
+
+interface DiffViewProps {
+	/** File path being displayed */
+	path: string
+	/** For newFileCreated: the full content of the new file */
+	content?: string
+	/** For editedExistingFile: the unified diff string */
+	diff?: string
+	/** Maximum lines to display before truncating */
+	maxLines?: number
+}
+
+interface DiffLine {
+	type: "add" | "remove" | "context" | "header"
+	lineNumber?: number
+	content: string
+}
+
+/**
+ * Parse a unified diff string into structured lines
+ */
+function parseDiff(diff: string): DiffLine[] {
+	const lines = diff.split("\n")
+	const result: DiffLine[] = []
+	let oldLine = 0
+	let newLine = 0
+
+	for (const line of lines) {
+		if (line.startsWith("@@")) {
+			// Parse hunk header like @@ -1,5 +1,7 @@
+			const match = line.match(/@@ -(\d+),?\d* \+(\d+),?\d* @@/)
+			if (match) {
+				oldLine = parseInt(match[1], 10)
+				newLine = parseInt(match[2], 10)
+			}
+			result.push({ type: "header", content: line })
+		} else if (line.startsWith("+") && !line.startsWith("+++")) {
+			result.push({ type: "add", lineNumber: newLine, content: line.slice(1) })
+			newLine++
+		} else if (line.startsWith("-") && !line.startsWith("---")) {
+			result.push({ type: "remove", lineNumber: oldLine, content: line.slice(1) })
+			oldLine++
+		} else if (line.startsWith(" ")) {
+			result.push({ type: "context", lineNumber: newLine, content: line.slice(1) })
+			oldLine++
+			newLine++
+		} else if (line.startsWith("---") || line.startsWith("+++")) {
+			// File headers - skip or show as header
+			result.push({ type: "header", content: line })
+		}
+	}
+
+	return result
+}
+
+/**
+ * Format line number with padding
+ */
+function formatLineNumber(num: number | undefined, width: number): string {
+	if (num === undefined) {
+		return " ".repeat(width)
+	}
+	return String(num).padStart(width, " ")
+}
+
+/**
+ * Renders a new file with all lines shown as additions
+ */
+const NewFileView: React.FC<{ path: string; content: string; maxLines: number }> = ({ path, content, maxLines }) => {
+	const lines = content.split("\n")
+	const displayLines = lines.slice(0, maxLines)
+	const lineNumWidth = String(lines.length).length
+	// Calculate max line length for padding
+	const maxLineLength = Math.max(...displayLines.map((l) => l.length), 40)
+
+	return (
+		<Box flexDirection="column">
+			<Text bold color="green">
+				+ {path} (new file)
+			</Text>
+			{displayLines.map((line, idx) => (
+				<Box key={idx}>
+					<Text dimColor>{formatLineNumber(idx + 1, lineNumWidth)} </Text>
+					<Text backgroundColor="rgb(117, 176, 111)" color="white">
+						+{line.padEnd(maxLineLength)}
+					</Text>
+				</Box>
+			))}
+			{lines.length > maxLines && <Text dimColor>... and {lines.length - maxLines} more lines</Text>}
+		</Box>
+	)
+}
+
+/**
+ * Renders a unified diff with colored additions and deletions
+ */
+const UnifiedDiffView: React.FC<{ path: string; diff: string; maxLines: number }> = ({ path, diff, maxLines }) => {
+	const diffLines = parseDiff(diff)
+	const displayLines = diffLines.slice(0, maxLines)
+	const maxLineNum = Math.max(...diffLines.filter((l) => l.lineNumber !== undefined).map((l) => l.lineNumber!), 0)
+	const lineNumWidth = String(maxLineNum).length || 3
+	// Calculate max line length for padding
+	const maxLineLength = Math.max(...diffLines.map((l) => l.content.length), 40)
+
+	return (
+		<Box flexDirection="column">
+			<Text bold color="blue">
+				~ {path} (modified)
+			</Text>
+			{displayLines.map((line, idx) => {
+				switch (line.type) {
+					case "header":
+						return (
+							<Text color="cyan" key={idx}>
+								{line.content}
+							</Text>
+						)
+					case "add":
+						return (
+							<Box key={idx}>
+								<Text dimColor>{formatLineNumber(line.lineNumber, lineNumWidth)} </Text>
+								<Text backgroundColor="rgb(117, 176, 111)" color="white">
+									+{line.content.padEnd(maxLineLength)}
+								</Text>
+							</Box>
+						)
+					case "remove":
+						return (
+							<Box key={idx}>
+								<Text dimColor>{formatLineNumber(line.lineNumber, lineNumWidth)} </Text>
+								<Text backgroundColor="rgb(246, 48, 73)" color="white">
+									-{line.content.padEnd(maxLineLength)}
+								</Text>
+							</Box>
+						)
+					case "context":
+						return (
+							<Box key={idx}>
+								<Text dimColor>{formatLineNumber(line.lineNumber, lineNumWidth)} </Text>
+								<Text> {line.content.padEnd(maxLineLength)}</Text>
+							</Box>
+						)
+					default:
+						return null
+				}
+			})}
+			{diffLines.length > maxLines && <Text dimColor>... and {diffLines.length - maxLines} more lines</Text>}
+		</Box>
+	)
+}
+
+/**
+ * DiffView component that renders either a new file or a unified diff
+ */
+export const DiffView: React.FC<DiffViewProps> = ({ path, content, diff, maxLines = 20 }) => {
+	// For new files, show all content as additions
+	if (content && !diff) {
+		return <NewFileView content={content} maxLines={maxLines} path={path} />
+	}
+
+	// For edited files, show the unified diff
+	if (diff) {
+		return <UnifiedDiffView diff={diff} maxLines={maxLines} path={path} />
+	}
+
+	// Fallback if neither content nor diff is provided
+	return <Text color="blue">{path} (no diff available)</Text>
+}

cli-ts/src/components/FileMentionMenu.tsx

@@ -0,0 +1,99 @@
+/**
+ * File mention menu component for CLI
+ * Displays a list of matching files when user types @
+ */
+
+import { Box, Text } from "ink"
+import React from "react"
+import type { FileSearchResult } from "../utils/file-search"
+
+interface FileMentionMenuProps {
+	results: FileSearchResult[]
+	selectedIndex: number
+	isLoading: boolean
+	query: string
+}
+
+/**
+ * Truncate path from the left if too long, keeping the filename visible
+ */
+function truncatePath(filePath: string, maxLength: number = 50): string {
+	if (filePath.length <= maxLength) {
+		return filePath
+	}
+	return "..." + filePath.slice(-(maxLength - 3))
+}
+
+export const FileMentionMenu: React.FC<FileMentionMenuProps> = ({ results, selectedIndex, isLoading, query }) => {
+	if (isLoading) {
+		return (
+			<Box flexDirection="column" marginBottom={1} paddingLeft={1} paddingRight={1}>
+				<Text color="gray">Searching files...</Text>
+			</Box>
+		)
+	}
+
+	if (results.length === 0) {
+		return (
+			<Box flexDirection="column" marginBottom={1} paddingLeft={1} paddingRight={1}>
+				<Text color="gray">{query ? `No files matching "${query}"` : "Type to search files..."}</Text>
+			</Box>
+		)
+	}
+
+	// Show max 8 items, centered around selected item
+	const maxVisible = 8
+	let startIndex = 0
+	let endIndex = results.length
+
+	if (results.length > maxVisible) {
+		// Center the selected item in the visible window
+		const halfWindow = Math.floor(maxVisible / 2)
+		startIndex = Math.max(0, selectedIndex - halfWindow)
+		endIndex = Math.min(results.length, startIndex + maxVisible)
+
+		// Adjust if we're near the end
+		if (endIndex - startIndex < maxVisible) {
+			startIndex = Math.max(0, endIndex - maxVisible)
+		}
+	}
+
+	const visibleResults = results.slice(startIndex, endIndex)
+
+	return (
+		<Box flexDirection="column" marginBottom={1} paddingLeft={1} paddingRight={1}>
+			{startIndex > 0 && (
+				<Text color="gray" dimColor>
+					↑ {startIndex} more...
+				</Text>
+			)}
+
+			{visibleResults.map((result, idx) => {
+				const actualIndex = startIndex + idx
+				const isSelected = actualIndex === selectedIndex
+				const displayPath = truncatePath(result.path)
+
+				return (
+					<Box key={result.path}>
+						<Text backgroundColor={isSelected ? "blue" : undefined} color={isSelected ? "white" : undefined}>
+							{isSelected ? "❯ " : "  "}
+							{displayPath}
+						</Text>
+					</Box>
+				)
+			})}
+
+			{endIndex < results.length && (
+				<Text color="gray" dimColor>
+					↓ {results.length - endIndex} more...
+				</Text>
+			)}
+
+			<Box>
+				<Text color="cyan" dimColor>
+					↑/↓ to select, Tab/Enter to insert
+				</Text>
+			</Box>
+		</Box>
+	)
+}

cli-ts/src/components/FocusChain.tsx

@@ -115,7 +115,7 @@ const Header: React.FC<{
 	const isCompleted = completedCount === totalCount
 
 	const displayText = isCompleted ? "All tasks completed!" : currentTodo?.text || "To-Do list"
-	const truncatedText = displayText.length > 50 ? `${displayText.substring(0, 47)}...` : displayText
+	const truncatedText = displayText.length > 50 ? displayText.substring(0, 47) + "..." : displayText
 
 	return (
 		<Box flexDirection="row" gap={1}>

cli-ts/src/components/HistoryView.test.tsx

@@ -28,11 +28,6 @@ vi.mock("@/shared/proto/cline/common", () => ({
 	},
 }))
 
-// Mock useTerminalSize to prevent EventEmitter memory leak warnings from resize listeners
-vi.mock("../hooks/useTerminalSize", () => ({
-	useTerminalSize: () => ({ columns: 80, rows: 24, resizeKey: 0 }),
-}))
-
 // Import after mocks are set up
 import { HistoryView } from "./HistoryView"
 

cli-ts/src/components/HistoryView.tsx

@@ -3,13 +3,11 @@
  * Displays task history with keyboard navigation
  */
 
-import { Box, Text, useInput } from "ink"
+import { Box, Text, useInput, useStdout } from "ink"
 import React, { useCallback, useState } from "react"
 import { Controller } from "@/core/controller"
 import { showTaskWithId } from "@/core/controller/task/showTaskWithId"
 import { StringRequest } from "@/shared/proto/cline/common"
-import { useStdinContext } from "../context/StdinContext"
-import { useTerminalSize } from "../hooks/useTerminalSize"
 
 interface TaskHistoryItem {
 	id: string
@@ -40,7 +38,7 @@ interface HistoryViewProps {
 /**
  * Format separator
  */
-function formatSeparator(char = "─", width = 80): string {
+function formatSeparator(char: string = "─", width: number = 80): string {
 	return char.repeat(Math.max(width, 10))
 }
 
@@ -53,14 +51,14 @@ export const HistoryView: React.FC<HistoryViewProps> = ({
 	onPageChange,
 	allItems,
 }) => {
-	const { isRawModeSupported } = useStdinContext()
 	const [selectedIndex, setSelectedIndex] = useState(0)
 	const [internalPage, setInternalPage] = useState(pagination?.page ?? 1)
-	const { rows: terminalRows } = useTerminalSize()
+	const { stdout } = useStdout()
 
 	// Calculate visible count based on terminal height to prevent overflow
 	// Each item takes ~5 lines (date, id, task text, cost/model, margin)
 	// Reserve lines for header (title, hint, pagination, separator) and footer (separator)
+	const terminalRows = stdout?.rows ?? 24
 	const headerLines = (pagination?.totalPages ?? 1) > 1 ? 5 : 4
 	const footerLines = 1
 	const availableRows = terminalRows - headerLines - footerLines
@@ -105,26 +103,23 @@ export const HistoryView: React.FC<HistoryViewProps> = ({
 		[useInternalPagination, onPageChange],
 	)
 
-	useInput(
-		(input, key) => {
-			if (key.upArrow || input === "k") {
-				setSelectedIndex((prev) => Math.max(0, prev - 1))
-			} else if (key.downArrow || input === "j") {
-				setSelectedIndex((prev) => Math.min(pageItems.length - 1, prev + 1))
-			} else if (key.return && pageItems[selectedIndex]) {
-				onSelect(pageItems[selectedIndex])
-			} else if (key.leftArrow && hasPrevPage) {
-				handlePageChange(currentPage - 1)
-			} else if (key.rightArrow && hasNextPage) {
-				handlePageChange(currentPage + 1)
-			} else if (input === "n" && hasNextPage) {
-				handlePageChange(currentPage + 1)
-			} else if (input === "p" && hasPrevPage) {
-				handlePageChange(currentPage - 1)
-			}
-		},
-		{ isActive: isRawModeSupported },
-	)
+	useInput((input, key) => {
+		if (key.upArrow) {
+			setSelectedIndex((prev) => Math.max(0, prev - 1))
+		} else if (key.downArrow) {
+			setSelectedIndex((prev) => Math.min(pageItems.length - 1, prev + 1))
+		} else if (key.return && pageItems[selectedIndex]) {
+			onSelect(pageItems[selectedIndex])
+		} else if (key.leftArrow && hasPrevPage) {
+			handlePageChange(currentPage - 1)
+		} else if (key.rightArrow && hasNextPage) {
+			handlePageChange(currentPage + 1)
+		} else if (input === "n" && hasNextPage) {
+			handlePageChange(currentPage + 1)
+		} else if (input === "p" && hasPrevPage) {
+			handlePageChange(currentPage - 1)
+		}
+	})
 
 	// Calculate visible window around selected item
 	const halfVisible = Math.floor(effectiveVisibleCount / 2)
@@ -142,17 +137,16 @@ export const HistoryView: React.FC<HistoryViewProps> = ({
 	return (
 		<Box flexDirection="column">
 			<Text bold color="white">
-				{`📜 Task History (${totalCount} total)`}
+				{"📜 Task History (" + totalCount + " total)"}
 			</Text>
-			<Text color="gray">Use ↑↓/j/k to navigate, Enter to select</Text>
-
+			<Text dimColor>Use ↑↓ to navigate, Enter to select</Text>
 			{totalPages > 1 && (
 				<Box>
-					<Text color="gray">
+					<Text dimColor>
 						Page {currentPage} of {totalPages}{" "}
 					</Text>
-					{hasPrevPage ? <Text color="blue">[← prev] </Text> : <Text color="gray">[← prev] </Text>}
-					{hasNextPage ? <Text color="blue">[next →]</Text> : <Text color="gray">[next →]</Text>}
+					{hasPrevPage ? <Text color="blue">[← prev] </Text> : <Text dimColor>[← prev] </Text>}
+					{hasNextPage ? <Text color="blue">[next →]</Text> : <Text dimColor>[next →]</Text>}
 				</Box>
 			)}
 			<Text>{formatSeparator()}</Text>
@@ -161,7 +155,7 @@ export const HistoryView: React.FC<HistoryViewProps> = ({
 				<Text>No task history available.</Text>
 			) : (
 				<Box flexDirection="column">
-					{showUpIndicator && <Text color="gray">{`  ↑ ${startIndex} more above`}</Text>}
+					{showUpIndicator && <Text dimColor>{"  ↑ " + startIndex + " more above"}</Text>}
 					{visibleTasks.map((task, index) => {
 						const actualIndex = startIndex + index
 						const isSelected = actualIndex === selectedIndex
@@ -173,7 +167,7 @@ export const HistoryView: React.FC<HistoryViewProps> = ({
 							<Box flexDirection="column" key={`${task.id}-${actualIndex}`} marginBottom={1}>
 								<Box>
 									<Text color={isSelected ? "green" : undefined}>{isSelected ? "> " : "  "}</Text>
-									<Text color="gray">{date}</Text>
+									<Text dimColor>{date}</Text>
 								</Box>
 								<Box marginLeft={4}>
 									<Text color="cyan">{task.id}</Text>
@@ -186,18 +180,18 @@ export const HistoryView: React.FC<HistoryViewProps> = ({
 								</Box>
 								{typeof task.totalCost === "number" && (
 									<Box marginLeft={4}>
-										<Text color="gray">Cost: ${task.totalCost ? task.totalCost.toFixed(4) : "0"}</Text>
+										<Text dimColor>Cost: ${task.totalCost ? task.totalCost.toFixed(4) : "0"}</Text>
 									</Box>
 								)}
 								{task.modelId && (
 									<Box marginLeft={4}>
-										<Text color="gray">Model: {task.modelId}</Text>
+										<Text dimColor>Model: {task.modelId}</Text>
 									</Box>
 								)}
 							</Box>
 						)
 					})}
-					{showDownIndicator && <Text color="gray">{`  ↓ ${pageItems.length - endIndex} more below`}</Text>}
+					{showDownIndicator && <Text dimColor>{"  ↓ " + (items.length - endIndex) + " more below"}</Text>}
 				</Box>
 			)}
 

cli-ts/src/components/MessageList.tsx

@@ -0,0 +1,34 @@
+/**
+ * Message list component
+ * Renders all messages from the task
+ */
+
+import { Box } from "ink"
+import React from "react"
+import { useTaskState } from "../context/TaskContext"
+import { MessageRow } from "./MessageRow"
+
+interface MessageListProps {
+	verbose?: boolean
+}
+
+export const MessageList: React.FC<MessageListProps> = ({ verbose = false }) => {
+	const state = useTaskState()
+	const messages = state.clineMessages || []
+
+	// Filter out some noisy messages when not verbose
+	const messagesToShow = verbose
+		? messages
+		: messages.filter((m) => {
+				// Show everything in non-verbose mode for now
+				return true
+			})
+
+	return (
+		<Box flexDirection="column">
+			{messagesToShow.map((message, idx) => (
+				<MessageRow key={`${message.ts}-${idx}`} message={message} verbose={verbose} />
+			))}
+		</Box>
+	)
+}

cli-ts/src/components/MessageRow.tsx

@@ -0,0 +1,378 @@
+/**
+ * Individual message row component
+ * Renders a single ClineMessage based on its type
+ */
+
+import type { ClineAsk, ClineMessage, ClineSay } from "@shared/ExtensionMessage"
+import { Box, Text } from "ink"
+import React from "react"
+import { jsonParseSafe } from "../utils/parser"
+import { DiffView } from "./DiffView"
+
+interface MessageRowProps {
+	message: ClineMessage
+	verbose?: boolean
+}
+
+/**
+ * Get emoji icon for message type
+ */
+export 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 "  "
+		}
+	}
+}
+
+/**
+ * Format timestamp
+ */
+function formatTimestamp(ts: number): string {
+	const date = new Date(ts)
+	return date.toLocaleTimeString("en-US", {
+		hour12: false,
+		hour: "2-digit",
+		minute: "2-digit",
+		second: "2-digit",
+	})
+}
+
+/**
+ * Render ask message based on type
+ */
+const AskMessageContent: React.FC<{ message: ClineMessage; verbose?: boolean }> = ({ message, verbose }) => {
+	const ask = message.ask as ClineAsk
+	const text = message.text || ""
+
+	switch (ask) {
+		case "followup":
+		case "plan_mode_respond": {
+			const parts = jsonParseSafe(text, {
+				response: undefined as string | undefined,
+				question: undefined as string | undefined,
+			})
+
+			if (parts.question) {
+				return (
+					<Text>
+						<Text color="cyan">Question:</Text> {parts.question}
+					</Text>
+				)
+			}
+			if (parts.response) {
+				return (
+					<Text>
+						<Text color="cyan">[{ask}]</Text> {parts.response}
+					</Text>
+				)
+			}
+			return null
+		}
+
+		case "command":
+			return (
+				<Text>
+					<Text color="magenta">Execute command?</Text> <Text dimColor>{text}</Text>
+				</Text>
+			)
+
+		case "tool":
+			return (
+				<Text>
+					<Text color="blue">Use tool?</Text> {text}
+				</Text>
+			)
+
+		case "completion_result":
+			return (
+				<Text>
+					<Text color="green">Task completed</Text> {text ? `- ${text}` : ""}
+				</Text>
+			)
+
+		case "api_req_failed":
+			return (
+				<Text>
+					<Text color="red">API request failed</Text> {text}
+				</Text>
+			)
+
+		case "resume_task":
+		case "resume_completed_task":
+			return (
+				<Text>
+					<Text color="cyan">Resume task?</Text> {text}
+				</Text>
+			)
+
+		case "browser_action_launch":
+			return (
+				<Text>
+					<Text color="cyan">Launch browser?</Text> {text}
+				</Text>
+			)
+
+		case "use_mcp_server":
+			return (
+				<Text>
+					<Text color="cyan">Use MCP server?</Text> {text}
+				</Text>
+			)
+
+		default:
+			return verbose ? (
+				<Text>
+					<Text color="gray">[ASK:{ask}]</Text> {text}
+				</Text>
+			) : null
+	}
+}
+
+/**
+ * Render say message based on type
+ */
+const SayMessageContent: React.FC<{ message: ClineMessage; verbose?: boolean }> = ({ message, verbose }) => {
+	const say = message.say as ClineSay
+	const text = message.text || ""
+
+	switch (say) {
+		case "task":
+			return (
+				<Text bold>
+					<Text color="white">Task:</Text> {text}
+				</Text>
+			)
+
+		case "text":
+			return <Text>{text}</Text>
+
+		case "reasoning":
+			return (
+				<Text color="yellow">
+					<Text italic>{text}</Text>
+				</Text>
+			)
+
+		case "error":
+			return (
+				<Text color="red">
+					<Text bold>Error:</Text> {text}
+				</Text>
+			)
+
+		case "completion_result":
+			return (
+				<Text color="green">
+					<Text bold>Completed:</Text> {text}
+				</Text>
+			)
+
+		case "user_feedback":
+			return (
+				<Text>
+					<Text color="green">User:</Text> {text}
+				</Text>
+			)
+
+		case "command":
+			return (
+				<Text>
+					<Text color="magenta">Command:</Text> <Text dimColor>{text}</Text>
+				</Text>
+			)
+
+		case "command_output": {
+			const lines = text.split("\n")
+			const displayLines = lines.slice(0, 10)
+			return (
+				<Box flexDirection="column">
+					<Text dimColor>Output:</Text>
+					{displayLines.map((line, idx) => (
+						<Text dimColor key={idx}>
+							{line}
+						</Text>
+					))}
+					{lines.length > 10 && <Text dimColor> ... and {lines.length - 10} more lines</Text>}
+				</Box>
+			)
+		}
+
+		case "tool": {
+			const { tool, content, path } = jsonParseSafe(text, {
+				tool: undefined as string | undefined,
+				content: undefined as string | undefined,
+				path: undefined as string | undefined,
+				diff: undefined as string | undefined,
+			})
+			if (path) {
+				if (tool === "newFileCreated") {
+					return <DiffView content={content} path={path} />
+				}
+				// if (tool === "editedExistingFile") {
+				// 	return <DiffView diff={diff} path={path} />
+				// }
+			}
+
+			return (
+				<Text>
+					<Text color="blue">{text}</Text>
+				</Text>
+			)
+		}
+
+		case "api_req_started": {
+			const { cost, tokensOut, cacheWrites, cacheReads, tokensIn } = jsonParseSafe(text, {
+				cost: 0 as number,
+				tokensIn: 0 as number,
+				tokensOut: 0 as number,
+				cacheWrites: 0 as number,
+				cacheReads: 0 as number,
+			})
+			return verbose ? (
+				<Text dimColor>{text}</Text>
+			) : (
+				<Text dimColor>
+					Cost: {cost} | Tokens In: {tokensIn} | Tokens Out: {tokensOut} | Cache Writes: {cacheWrites} | Cache Reads:{" "}
+					{cacheReads}
+				</Text>
+			)
+		}
+
+		case "api_req_finished":
+			return null
+
+		case "checkpoint_created":
+			return <Text dimColor>Checkpoint created: {message.lastCheckpointHash}</Text>
+
+		case "info":
+			return <Text color="cyan">{text}</Text>
+
+		case "browser_action":
+		case "browser_action_launch":
+			return (
+				<Text>
+					<Text color="cyan">Browser:</Text> {text}
+				</Text>
+			)
+
+		case "browser_action_result":
+			return <Text dimColor>Browser result {text ? `- ${text.substring(0, 100)}...` : ""}</Text>
+
+		case "mcp_server_request_started":
+			return <Text color="cyan">MCP request started {text}</Text>
+
+		case "mcp_server_response":
+			return <Text color="cyan">MCP response {text ? text.substring(0, 200) : ""}</Text>
+
+		default:
+			return verbose ? (
+				<Text dimColor>
+					[SAY:{say}] {text}
+				</Text>
+			) : null
+	}
+}
+
+export const MessageRow: React.FC<MessageRowProps> = ({ message, verbose = false }) => {
+	const icon = getCliMessagePrefixIcon(message)
+	const timestamp = formatTimestamp(message.ts)
+
+	// Don't render silent messages
+	if (message.say === "api_req_finished") {
+		return null
+	}
+
+	if (message.say === "text" && message.text?.trim() === "") {
+		return null
+	}
+
+	const content =
+		message.type === "ask" ? (
+			<AskMessageContent message={message} verbose={verbose} />
+		) : (
+			<SayMessageContent message={message} verbose={verbose} />
+		)
+
+	// command_output and tool return a Box, which can't be nested inside Text
+	if (message.say === "command_output" || message.say === "tool") {
+		return (
+			<Box flexDirection="column">
+				<Box>
+					<Text dimColor>{timestamp} </Text>
+					<Text>{icon} </Text>
+				</Box>
+				{content}
+			</Box>
+		)
+	}
+
+	return (
+		<Box flexDirection="column">
+			<Box>
+				<Text dimColor>{timestamp} </Text>
+				<Text>{icon} </Text>
+				{content}
+			</Box>
+		</Box>
+	)
+}

cli-ts/src/components/Spinner.tsx

@@ -7,11 +7,14 @@ import Spinner from "ink-spinner"
 import React from "react"
 
 interface LoadingSpinnerProps {
-	mode?: "act" | "plan"
+	message?: string
 }
 
-export const LoadingSpinner: React.FC<LoadingSpinnerProps> = ({ mode = "act" }) => {
-	const message = mode === "plan" ? "Planning" : "Thinking"
+const LOADING_TEXT_IDEAS = ["Thinking", "Loading", "Processing", "Working", "Calculating", "Analyzing", "Exploring"]
+
+export const LoadingSpinner: React.FC<LoadingSpinnerProps> = ({
+	message = LOADING_TEXT_IDEAS[Math.floor(Math.random() * LOADING_TEXT_IDEAS.length)],
+}) => {
 	return (
 		<Box>
 			<Text color="cyan">

cli-ts/src/components/TaskView.tsx

@@ -0,0 +1,184 @@
+/**
+ * Task view component
+ * Main view for running a task - displays messages and handles user input
+ */
+
+import { exit } from "node:process"
+import { CheckpointRestoreRequest } from "@shared/proto/cline/checkpoints"
+import { Box, Text, useInput } from "ink"
+import React, { useCallback, useEffect, useMemo, useState } from "react"
+import { checkpointRestore } from "@/core/controller/checkpoints/checkpointRestore"
+import { StateManager } from "@/core/storage/StateManager"
+import { useTaskContext, useTaskState } from "../context/TaskContext"
+import { useCompletionSignals, useIsSpinnerActive } from "../hooks/useStateSubscriber"
+import { AskPrompt } from "./AskPrompt"
+import { CheckpointMenu, RestoreType } from "./CheckpointMenu"
+import { FocusChain } from "./FocusChain"
+import { MessageList } from "./MessageList"
+import { LoadingSpinner } from "./Spinner"
+
+interface TaskViewProps {
+	taskId?: string
+	verbose?: boolean
+	onComplete?: () => void
+	onError?: () => void
+}
+
+/**
+ * Format separator line
+ */
+function formatSeparator(char: string = "═", width: number = 60): string {
+	return char.repeat(Math.max(width, 10))
+}
+
+export const TaskView: React.FC<TaskViewProps> = ({ taskId: _taskId, verbose = false, onComplete, onError }) => {
+	const state = useTaskState()
+	const { isTaskComplete, getCompletionMessage } = useCompletionSignals()
+	const isSpinnerActive = useIsSpinnerActive()
+	const { setIsComplete, lastError, controller } = useTaskContext()
+	const [showCheckpointMenu, setShowCheckpointMenu] = useState(false)
+	const [restoreStatus, setRestoreStatus] = useState<"idle" | "restoring" | "success" | "error">("idle")
+	const [restoreMessage, setRestoreMessage] = useState<string | null>(null)
+
+	const yolo = useMemo(() => StateManager.get().getGlobalSettingsKey("yoloModeToggled"), [])
+
+	// Handle task completion
+	useEffect(() => {
+		if (isTaskComplete()) {
+			setIsComplete(true)
+
+			// Check if it's an error
+			const completionMsg = getCompletionMessage()
+			if (completionMsg?.say === "error" || completionMsg?.ask === "api_req_failed") {
+				onError?.()
+			} else {
+				onComplete?.()
+			}
+
+			if (yolo) {
+				exit()
+			}
+		}
+	}, [isTaskComplete, setIsComplete, onComplete, onError, getCompletionMessage])
+
+	// Handle checkpoint restore
+	const handleCheckpointRestore = useCallback(
+		async (messageTs: number, restoreType: RestoreType) => {
+			setShowCheckpointMenu(false)
+			setRestoreStatus("restoring")
+			setRestoreMessage(`Restoring checkpoint (${restoreType})...`)
+
+			try {
+				await checkpointRestore(
+					controller,
+					CheckpointRestoreRequest.create({
+						number: messageTs,
+						restoreType: restoreType,
+					}),
+				)
+				setRestoreStatus("success")
+				setRestoreMessage("Checkpoint restored successfully")
+				// Clear success message after a delay
+				setTimeout(() => {
+					setRestoreStatus("idle")
+					setRestoreMessage(null)
+				}, 3000)
+			} catch (error) {
+				setRestoreStatus("error")
+				setRestoreMessage(`Failed to restore: ${error instanceof Error ? error.message : String(error)}`)
+				// Clear error message after a delay
+				setTimeout(() => {
+					setRestoreStatus("idle")
+					setRestoreMessage(null)
+				}, 5000)
+			}
+		},
+		[controller],
+	)
+
+	// Handle Ctrl+R to open checkpoint menu
+	useInput(
+		(input, key) => {
+			// Ctrl+R to open checkpoint menu
+			if (key.ctrl && input === "r") {
+				setShowCheckpointMenu(true)
+				return
+			}
+		},
+		{ isActive: !showCheckpointMenu },
+	)
+
+	return (
+		<Box flexDirection="column">
+			{/* Task header */}
+			{state.currentTaskItem && (
+				<Box flexDirection="column" marginBottom={1}>
+					<Text>{formatSeparator("═")}</Text>
+					<Text bold color="white">
+						📋 Task: {state.currentTaskItem.id}
+					</Text>
+					{state.currentTaskItem.task && (
+						<Text dimColor>
+							{state.currentTaskItem.task.substring(0, 80)}
+							{state.currentTaskItem.task.length > 80 ? "..." : ""}
+						</Text>
+					)}
+					<Box>
+						<Text>{formatSeparator("═")}</Text>
+					</Box>
+					<Text color="gray" dimColor>
+						(Ctrl+R to restore checkpoint)
+					</Text>
+				</Box>
+			)}
+
+			{/* Error message if any */}
+			{lastError && (
+				<Box flexDirection="column" marginBottom={1}>
+					<Text bold color="red">
+						Error: {lastError}
+					</Text>
+				</Box>
+			)}
+
+			{/* Restore status message */}
+			{restoreMessage && (
+				<Box flexDirection="column" marginBottom={1}>
+					<Text bold color={restoreStatus === "error" ? "red" : restoreStatus === "success" ? "green" : "yellow"}>
+						{restoreStatus === "restoring" ? "⏳ " : restoreStatus === "success" ? "✓ " : "✗ "}
+						{restoreMessage}
+					</Text>
+				</Box>
+			)}
+
+			{/* Checkpoint menu */}
+			{showCheckpointMenu && (
+				<CheckpointMenu
+					messages={state.clineMessages || []}
+					onCancel={() => setShowCheckpointMenu(false)}
+					onSelect={handleCheckpointRestore}
+				/>
+			)}
+
+			{/* Focus Chain / To-Do List */}
+			{state.currentFocusChainChecklist && (
+				<Box marginBottom={1}>
+					<FocusChain focusChainChecklist={state.currentFocusChainChecklist} />
+				</Box>
+			)}
+
+			{/* Messages list */}
+			<MessageList verbose={verbose} />
+
+			{/* Loading spinner */}
+			{isSpinnerActive && (
+				<Box marginTop={1}>
+					<LoadingSpinner />
+				</Box>
+			)}
+
+			{/* User input prompt */}
+			{!yolo && <AskPrompt />}
+		</Box>
+	)
+}

cli-ts/src/components/WelcomeView.tsx

@@ -4,12 +4,10 @@
  * Supports file mentions with @
  */
 
+import type { Mode } from "@shared/storage/types"
 import { Box, Text, useInput } from "ink"
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { StateManager } from "@/core/storage/StateManager"
-import type { ApiProvider } from "@/shared/api"
-import { getProviderDefaultModelId, getProviderModelIdKey, Mode, SettingsKey } from "@/shared/storage"
-import { useStdinContext } from "../context/StdinContext"
 import {
 	checkAndWarnRipgrepMissing,
 	extractMentionQuery,
@@ -18,7 +16,6 @@ import {
 	insertMention,
 	searchWorkspaceFiles,
 } from "../utils/file-search"
-import { isMouseEscapeSequence } from "../utils/input"
 import { parseImagesFromInput } from "../utils/parser"
 import { AccountInfoView } from "./AccountInfoView"
 import { FileMentionMenu } from "./FileMentionMenu"
@@ -54,7 +51,6 @@ const RIPGREP_WARNING_DURATION_MS = 5000
 const MAX_SEARCH_RESULTS = 15
 
 export const WelcomeView: React.FC<WelcomeViewProps> = ({ onSubmit, onExit, controller }) => {
-	const { isRawModeSupported } = useStdinContext()
 	const [textInput, setTextInput] = useState("")
 	const [fileResults, setFileResults] = useState<FileSearchResult[]>([])
 	const [selectedIndex, setSelectedIndex] = useState(0)
@@ -66,24 +62,12 @@ export const WelcomeView: React.FC<WelcomeViewProps> = ({ onSubmit, onExit, cont
 		return stateManager.getGlobalSettingsKey("mode") || "act"
 	})
 
-	const provider = useMemo(() => {
-		const stateManager = StateManager.get()
-		const mode = stateManager.getGlobalSettingsKey("mode") as string
-		const providerKey = mode === "act" ? "actModeApiProvider" : "planModeApiProvider"
-		const currentProvider = stateManager.getGlobalSettingsKey(providerKey) as string
-		return currentProvider || "cline"
-	}, [])
-
-	// Get model ID based on current mode and provider
-	// Different providers use different state keys (e.g., cline uses actModeOpenRouterModelId)
+	// Get model ID based on current mode
 	const modelId = useMemo(() => {
 		const stateManager = StateManager.get()
-		const modelKey = getProviderModelIdKey(provider as ApiProvider, mode)
-		return (
-			(stateManager.getGlobalSettingsKey(modelKey as SettingsKey) as string) ||
-			getProviderDefaultModelId(provider as ApiProvider)
-		)
-	}, [mode, provider])
+		const modelKey = mode === "act" ? "actModeApiModelId" : "planModeApiModelId"
+		return (stateManager.getGlobalSettingsKey(modelKey) as string) || "claude-sonnet-4-20250514"
+	}, [mode])
 
 	const toggleMode = useCallback(() => {
 		const newMode: Mode = mode === "act" ? "plan" : "act"
@@ -165,74 +149,66 @@ export const WelcomeView: React.FC<WelcomeViewProps> = ({ onSubmit, onExit, cont
 				clearTimeout(r.searchTimeout)
 			}
 		}
-	}, [mentionInfo.inMentionMode, mentionInfo.query, workspacePath, mentionInfo])
+	}, [mentionInfo.inMentionMode, mentionInfo.query, workspacePath])
 
-	useInput(
-		(input, key) => {
-			// Filter out mouse escape sequences
-			if (isMouseEscapeSequence(input)) {
+	useInput((input, key) => {
+		const inMenu = mentionInfo.inMentionMode && fileResults.length > 0
+
+		// Menu navigation
+		if (inMenu) {
+			if (key.upArrow) {
+				setSelectedIndex((i) => (i > 0 ? i - 1 : fileResults.length - 1))
 				return
 			}
-
-			const inMenu = mentionInfo.inMentionMode && fileResults.length > 0
-
-			// Menu navigation
-			if (inMenu) {
-				if (key.upArrow) {
-					setSelectedIndex((i) => (i > 0 ? i - 1 : fileResults.length - 1))
-					return
-				}
-				if (key.downArrow) {
-					setSelectedIndex((i) => (i < fileResults.length - 1 ? i + 1 : 0))
-					return
-				}
-				if (key.tab || key.return) {
-					const file = fileResults[selectedIndex]
-					if (file) {
-						setTextInput(insertMention(textInput, mentionInfo.atIndex, file.path))
-						setFileResults([])
-						setSelectedIndex(0)
-					}
-					return
-				}
-				if (key.escape) {
+			if (key.downArrow) {
+				setSelectedIndex((i) => (i < fileResults.length - 1 ? i + 1 : 0))
+				return
+			}
+			if (key.tab || key.return) {
+				const file = fileResults[selectedIndex]
+				if (file) {
+					setTextInput(insertMention(textInput, mentionInfo.atIndex, file.path))
 					setFileResults([])
 					setSelectedIndex(0)
-					return
 				}
+				return
 			}
+			if (key.escape) {
+				setFileResults([])
+				setSelectedIndex(0)
+				return
+			}
+		}
 
-			// Normal input handling
-			if (key.tab && !mentionInfo.inMentionMode) {
-				toggleMode()
-				return
+		// Normal input handling
+		if (key.tab && !mentionInfo.inMentionMode) {
+			toggleMode()
+			return
+		}
+		if (key.return && !mentionInfo.inMentionMode) {
+			if (prompt.trim() || imagePaths.length > 0) {
+				onSubmit(prompt.trim(), imagePaths)
 			}
-			if (key.return && !mentionInfo.inMentionMode) {
-				if (prompt.trim() || imagePaths.length > 0) {
-					onSubmit(prompt.trim(), imagePaths)
-				}
-				return
+			return
+		}
+		if (key.escape && !mentionInfo.inMentionMode) {
+			if (escPressedOnce) {
+				onExit?.()
+			} else {
+				setEscPressedOnce(true)
 			}
-			if (key.escape && !mentionInfo.inMentionMode) {
-				if (escPressedOnce) {
-					onExit?.()
-				} else {
-					setEscPressedOnce(true)
-				}
-				return
-			}
-			if (key.backspace || key.delete) {
-				setTextInput((prev) => prev.slice(0, -1))
-				setEscPressedOnce(false)
-				return
-			}
-			if (input && !key.ctrl && !key.meta && !key.upArrow && !key.downArrow && !key.tab) {
-				setTextInput((prev) => prev + input)
-				setEscPressedOnce(false)
-			}
-		},
-		{ isActive: isRawModeSupported },
-	)
+			return
+		}
+		if (key.backspace || key.delete) {
+			setTextInput((prev) => prev.slice(0, -1))
+			setEscPressedOnce(false)
+			return
+		}
+		if (input && !key.ctrl && !key.meta && !key.upArrow && !key.downArrow && !key.tab) {
+			setTextInput((prev) => prev + input)
+			setEscPressedOnce(false)
+		}
+	})
 
 	const borderColor = mode === "act" ? "blue" : "yellow"
 
@@ -247,8 +223,8 @@ export const WelcomeView: React.FC<WelcomeViewProps> = ({ onSubmit, onExit, cont
 
 			{/* Cline logo - centered */}
 			<Box alignItems="center" flexDirection="column">
+				{/* biome-ignore lint/suspicious/noArrayIndexKey: static array that never changes */}
 				{CLINE_LOGO.map((line, idx) => (
-					// biome-ignore lint/suspicious/noArrayIndexKey: static array that never changes
 					<Text color="white" key={idx}>
 						{line}
 					</Text>
@@ -280,13 +256,15 @@ export const WelcomeView: React.FC<WelcomeViewProps> = ({ onSubmit, onExit, cont
 				paddingRight={1}
 				width="100%">
 				<Text>{textInput}</Text>
-				<Text inverse> </Text>
+				<Text color="gray">▌</Text>
 			</Box>
 
 			{/* Model ID and Mode toggle row */}
 			<Box justifyContent="space-between" width="100%">
 				{/* Model ID on left */}
-				<Text color="gray">{modelId}</Text>
+				<Text color="gray" dimColor>
+					{modelId}
+				</Text>
 
 				{/* Mode toggle on right */}
 				<Box gap={1}>
@@ -300,7 +278,9 @@ export const WelcomeView: React.FC<WelcomeViewProps> = ({ onSubmit, onExit, cont
 							{mode === "act" ? "●" : "○"} Act
 						</Text>
 					</Box>
-					<Text color="gray">(Tab)</Text>
+					<Text color="gray" dimColor>
+						(Tab)
+					</Text>
 				</Box>
 			</Box>
 
@@ -323,8 +303,10 @@ export const WelcomeView: React.FC<WelcomeViewProps> = ({ onSubmit, onExit, cont
 
 			{/* Help text */}
 			<Box>
-				<Text color="gray">Enter to submit · @ to mention files · </Text>
-				<Text bold={escPressedOnce} color={escPressedOnce ? "white" : "gray"}>
+				<Text color="gray" dimColor>
+					Enter to submit · @ to mention files ·{" "}
+				</Text>
+				<Text bold={escPressedOnce} color={escPressedOnce ? "white" : "gray"} dimColor={!escPressedOnce}>
 					{escPressedOnce ? "Press Esc again to exit" : "Esc to exit"}
 				</Text>
 			</Box>

cli-ts/src/context/TaskContext.tsx

@@ -15,7 +15,6 @@ interface TaskContextType {
 	setIsComplete: (complete: boolean) => void
 	lastError: string | null
 	setLastError: (error: string | null) => void
-	clearState: () => void
 }
 
 const TaskContext = createContext<TaskContextType | undefined>(undefined)
@@ -47,13 +46,6 @@ export const TaskContextProvider: React.FC<TaskContextProviderProps> = ({ contro
 		const handleStateUpdate = async () => {
 			try {
 				const newState = await controller.getStateToPostToWebview()
-				// Ignore transient empty messages state during cancel/reinit
-				// When clearTask() runs, messages briefly become [] before new task loads them
-				const hadMessages = (stateRef.current.clineMessages?.length ?? 0) > 0
-				const hasMessages = (newState.clineMessages?.length ?? 0) > 0
-				if (hadMessages && !hasMessages) {
-					return
-				}
 				setState(newState)
 			} catch (error) {
 				setLastError(error instanceof Error ? error.message : String(error))
@@ -92,14 +84,6 @@ export const TaskContextProvider: React.FC<TaskContextProviderProps> = ({ contro
 		}
 	}, [controller])
 
-	// Force clear state (bypasses the empty messages check for intentional clears like /clear)
-	const clearState = () => {
-		setState({
-			clineMessages: [],
-			currentTaskItem: null,
-		} as unknown as Partial<ExtensionState>)
-	}
-
 	const value: TaskContextType = {
 		state,
 		controller,
@@ -107,7 +91,6 @@ export const TaskContextProvider: React.FC<TaskContextProviderProps> = ({ contro
 		setIsComplete,
 		lastError,
 		setLastError,
-		clearState,
 	}
 
 	return <TaskContext.Provider value={value}>{children}</TaskContext.Provider>

cli-ts/src/controllers/CliWebviewProvider.ts

@@ -3,9 +3,14 @@
  * Instead of rendering to a webview, this outputs to the terminal
  */
 
+import type * as vscode from "vscode"
 import { WebviewProvider } from "@/core/webview"
 
 export class CliWebviewProvider extends WebviewProvider {
+	constructor(context: vscode.ExtensionContext) {
+		super(context)
+	}
+
 	override getWebviewUrl(path: string): string {
 		// CLI doesn't have webview URLs
 		return `file://${path}`

cli-ts/src/controllers/index.ts

@@ -11,9 +11,6 @@ import type {
 } from "@generated/hosts/host-bridge-client-types"
 import type { HostBridgeClientProvider, StreamingCallbacks } from "@hosts/host-provider-types"
 import * as proto from "@shared/proto/index"
-import { StateManager } from "@/core/storage/StateManager"
-import { ClineClient } from "@/shared/cline"
-import { version as CLI_VERSION } from "../../package.json"
 import { printError, printInfo, printWarning } from "../utils/display"
 
 /**
@@ -79,13 +76,7 @@ export class CliDiffServiceClient implements DiffServiceClientInterface {
  * CLI implementation of EnvService - handles environment operations
  */
 export class CliEnvServiceClient implements EnvServiceClientInterface {
-	private clipboardContent = ""
-
-	private getTelemetrySetting(): proto.host.Setting {
-		// Read from StateManager - defaults to ENABLED if not set or "unset"
-		const setting = StateManager.get().getGlobalSettingsKey("telemetrySetting")
-		return setting === "disabled" ? proto.host.Setting.DISABLED : proto.host.Setting.ENABLED
-	}
+	private clipboardContent: string = ""
 
 	async clipboardWriteText(request: proto.cline.StringRequest): Promise<proto.cline.Empty> {
 		this.clipboardContent = request.value || ""
@@ -99,9 +90,8 @@ export class CliEnvServiceClient implements EnvServiceClientInterface {
 
 	async getHostVersion(_request: proto.cline.EmptyRequest): Promise<proto.host.GetHostVersionResponse> {
 		return proto.host.GetHostVersionResponse.create({
-			version: CLI_VERSION,
-			platform: "Cline CLI - Node.js",
-			clineType: ClineClient.Cli,
+			version: "1.0.0",
+			platform: "Cline CLI",
 		})
 	}
 
@@ -112,7 +102,7 @@ export class CliEnvServiceClient implements EnvServiceClientInterface {
 
 	async getTelemetrySettings(_request: proto.cline.EmptyRequest): Promise<proto.host.GetTelemetrySettingsResponse> {
 		return proto.host.GetTelemetrySettingsResponse.create({
-			isEnabled: this.getTelemetrySetting(),
+			isEnabled: proto.host.Setting.DISABLED,
 		})
 	}
 
@@ -123,36 +113,17 @@ export class CliEnvServiceClient implements EnvServiceClientInterface {
 		// Send initial settings
 		callbacks.onResponse(
 			proto.host.TelemetrySettingsEvent.create({
-				isEnabled: this.getTelemetrySetting(),
+				isEnabled: proto.host.Setting.DISABLED,
 			}),
 		)
 		// Return unsubscribe function
 		return () => {}
 	}
 
-	debugLog(request: proto.cline.StringRequest): Promise<proto.cline.Empty> {
-		const message = request.value || ""
-		if (process.env.IS_DEV) {
-			printInfo(`[DebugLog] ${message}`)
-		}
-		return Promise.resolve(proto.cline.Empty.create())
-	}
-
 	async shutdown(_request: proto.cline.EmptyRequest): Promise<proto.cline.Empty> {
 		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()
-	}
 }
 
 /**
@@ -182,6 +153,7 @@ export class CliWindowServiceClient implements WindowServiceClientInterface {
 			case proto.host.ShowMessageType.WARNING:
 				printWarning(message)
 				break
+			case proto.host.ShowMessageType.INFORMATION:
 			default:
 				printInfo(message)
 				break
@@ -286,13 +258,6 @@ export class CliWorkspaceServiceClient implements WorkspaceServiceClientInterfac
 		printInfo(`⚙️  Executing: ${request.command}`)
 		return proto.host.ExecuteCommandInTerminalResponse.create({})
 	}
-
-	async openFolder(request: proto.host.OpenFolderRequest): Promise<proto.host.OpenFolderResponse> {
-		const path = request.path || ""
-		this.workspacePath = path
-		printInfo(`📂 Opening folder: ${path}`)
-		return proto.host.OpenFolderResponse.create({ success: true })
-	}
 }
 
 /**

cli-ts/src/hooks/useStateSubscriber.ts

@@ -29,7 +29,7 @@ export const useProcessedMessages = () => {
  * Detect if a message has just been completed (is asking for user input)
  */
 export const useCompletedAskMessages = () => {
-	const { state } = useTaskContext()
+	const { state, controller } = useTaskContext()
 	const processed = useProcessedMessages()
 
 	const getCompletedAskMessages = useCallback(() => {
@@ -58,7 +58,7 @@ export const useCompletedAskMessages = () => {
  */
 export const useLastCompletedAskMessage = () => {
 	const { state } = useTaskContext()
-	const _processed = useProcessedMessages()
+	const processed = useProcessedMessages()
 
 	const getLastCompletedAskMessage = useCallback((): ClineMessage | null => {
 		if (!state.clineMessages) {
@@ -124,19 +124,18 @@ export const useCompletionSignals = () => {
 
 /**
  * Check if spinner should be shown (when API is thinking)
- * Returns an object with isActive flag and startTime timestamp
  */
-export const useIsSpinnerActive = (): { isActive: boolean; startTime?: number } => {
+export const useIsSpinnerActive = (): boolean => {
 	const { state } = useTaskContext()
 
 	if (!state.clineMessages || state.clineMessages.length === 0) {
-		return { isActive: false }
+		return false
 	}
 
 	// If the last message is a completed ask message, don't show spinner (waiting for user input)
 	const lastMessage = state.clineMessages[state.clineMessages.length - 1]
 	if (lastMessage?.type === "ask" && !lastMessage.partial) {
-		return { isActive: false }
+		return false
 	}
 
 	// Look for most recent api_req_started that isn't followed by api_req_finished
@@ -151,12 +150,9 @@ export const useIsSpinnerActive = (): { isActive: boolean; startTime?: number }
 					break
 				}
 			}
-			if (!hasFinished) {
-				return { isActive: true, startTime: msg.ts }
-			}
-			return { isActive: false }
+			return !hasFinished
 		}
 	}
 
-	return { isActive: false }
+	return false
 }

cli-ts/src/index.test.ts

@@ -30,9 +30,7 @@ describe("CLI Commands", () => {
 			.option("-v, --verbose", "Show verbose output")
 			.option("-c, --cwd <path>", "Working directory")
 			.option("--config <path>", "Configuration directory")
-			.option("--thinking [tokens]", "Enable extended thinking")
-			.option("--reasoning-effort <effort>", "Reasoning effort")
-			.option("--max-consecutive-mistakes <count>", "Maximum consecutive mistakes")
+			.option("--thinking", "Enable extended thinking")
 			.action(() => {})
 
 		program
@@ -69,9 +67,7 @@ describe("CLI Commands", () => {
 			.option("-v, --verbose", "Verbose output")
 			.option("-c, --cwd <path>", "Working directory")
 			.option("--config <path>", "Configuration directory")
-			.option("--thinking [tokens]", "Enable extended thinking")
-			.option("--reasoning-effort <effort>", "Reasoning effort")
-			.option("--max-consecutive-mistakes <count>", "Maximum consecutive mistakes")
+			.option("--thinking", "Enable extended thinking")
 			.action(() => {})
 	})
 
@@ -150,27 +146,6 @@ 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"]
@@ -306,21 +281,6 @@ 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-ts/src/index.ts

@@ -0,0 +1,525 @@
+/**
+ * Cline CLI - TypeScript implementation with React Ink
+ */
+
+import path from "node:path"
+import { exit } from "node:process"
+import type { ApiProvider } from "@shared/api"
+import { Command } from "commander"
+import { render } from "ink"
+import React from "react"
+import { Controller } from "@/core/controller"
+import { StateManager } from "@/core/storage/StateManager"
+import { AuthHandler } from "@/hosts/external/AuthHandler"
+import { HostProvider } from "@/hosts/host-provider"
+import { FileEditProvider } from "@/integrations/editor/FileEditProvider"
+import { StandaloneTerminalManager } from "@/integrations/terminal/standalone/StandaloneTerminalManager"
+import { ErrorService } from "@/services/error/ErrorService"
+import { initializeDistinctId } from "@/services/logging/distinctId"
+import { App } from "./components/App"
+import { createCliHostBridgeProvider } from "./controllers"
+import { CliCommentReviewController } from "./controllers/CliCommentReviewController"
+import { CliWebviewProvider } from "./controllers/CliWebviewProvider"
+import { restoreConsole } from "./utils/console"
+import { print, printError, printInfo, printWarning, separator } from "./utils/display"
+import { parseImagesFromInput, processImagePaths } from "./utils/parser"
+import { getProviderModelIdKey } from "./utils/provider-map"
+import { initializeCliContext } from "./vscode-context"
+
+const VERSION = "0.0.0"
+
+// Track active context for graceful shutdown
+let activeContext: CliContext | null = null
+let isShuttingDown = false
+
+function setupSignalHandlers() {
+	const shutdown = async (signal: string) => {
+		if (isShuttingDown) {
+			// Force exit on second signal
+			process.exit(1)
+		}
+		isShuttingDown = true
+		printWarning(`\n${signal} received, shutting down...`)
+
+		try {
+			if (activeContext) {
+				const task = activeContext.controller.task
+				if (task) {
+					task.abortTask()
+				}
+				await activeContext.controller.stateManager.flushPendingState()
+				await activeContext.controller.dispose()
+			}
+			await ErrorService.get().dispose()
+		} catch {
+			// Best effort cleanup
+		}
+		process.exit(0)
+	}
+
+	process.on("SIGINT", () => shutdown("SIGINT"))
+	process.on("SIGTERM", () => shutdown("SIGTERM"))
+}
+
+setupSignalHandlers()
+
+interface CliContext {
+	extensionContext: any
+	dataDir: string
+	extensionDir: string
+	workspacePath: string
+	controller: Controller
+}
+
+interface InitOptions {
+	config?: string
+	cwd?: string
+	verbose?: boolean
+	enableAuth?: boolean
+}
+
+/**
+ * Initialize all CLI infrastructure and return context needed for commands
+ */
+async function initializeCli(options: InitOptions): Promise<CliContext> {
+	const workspacePath = options.cwd || process.cwd()
+	const { extensionContext, DATA_DIR, EXTENSION_DIR } = initializeCliContext({
+		clineDir: options.config,
+		workspaceDir: workspacePath,
+	})
+
+	if (options.enableAuth) {
+		AuthHandler.getInstance().setEnabled(true)
+	}
+
+	const logToChannel = options.verbose ? (message: string) => printInfo(message) : () => {}
+
+	HostProvider.initialize(
+		() => new CliWebviewProvider(extensionContext),
+		() => new FileEditProvider(),
+		() => new CliCommentReviewController(),
+		() => new StandaloneTerminalManager(),
+		createCliHostBridgeProvider(workspacePath),
+		logToChannel,
+		async () => (options.enableAuth ? AuthHandler.getInstance().getCallbackUrl() : ""),
+		async (name: string) => path.join(process.cwd(), name),
+		EXTENSION_DIR,
+		DATA_DIR,
+	)
+
+	await ErrorService.initialize()
+	await StateManager.initialize(extensionContext)
+
+	const webview = HostProvider.get().createWebviewProvider() as CliWebviewProvider
+	const controller = webview.controller
+
+	await initializeDistinctId(extensionContext)
+
+	const ctx = { extensionContext, dataDir: DATA_DIR, extensionDir: EXTENSION_DIR, workspacePath, controller }
+	activeContext = ctx
+	return ctx
+}
+
+/**
+ * Run an Ink app with proper cleanup handling
+ */
+async function runInkApp(element: React.ReactElement, cleanup: () => Promise<void>): Promise<void> {
+	const { waitUntilExit, unmount } = render(element)
+
+	try {
+		await waitUntilExit()
+	} finally {
+		try {
+			unmount()
+		} catch {
+			// Already unmounted
+		}
+		restoreConsole()
+		await cleanup()
+	}
+}
+
+/**
+ * Wait for a condition with timeout
+ */
+function waitForCondition(check: () => boolean, timeoutMs: number, intervalMs: number = 100): Promise<boolean> {
+	return new Promise((resolve) => {
+		const startTime = Date.now()
+		const poll = () => {
+			if (check()) {
+				resolve(true)
+				return
+			}
+			if (Date.now() - startTime > timeoutMs) {
+				resolve(false)
+				return
+			}
+			setTimeout(poll, intervalMs)
+		}
+		poll()
+	})
+}
+
+/**
+ * Run a task with the given prompt
+ */
+async function runTask(
+	prompt: string,
+	options: {
+		act?: boolean
+		plan?: boolean
+		model?: string
+		verbose?: boolean
+		cwd?: string
+		config?: string
+		thinking?: boolean
+		yolo?: boolean
+		images?: string[]
+	},
+	existingContext?: CliContext,
+) {
+	const ctx = existingContext || (await initializeCli(options))
+
+	// Parse images from the prompt text (e.g., @/path/to/image.png)
+	const { prompt: cleanPrompt, imagePaths: parsedImagePaths } = parseImagesFromInput(prompt)
+
+	// Combine parsed image paths with explicit --images option
+	const allImagePaths = [...(options.images || []), ...parsedImagePaths]
+	// Convert image file paths to base64 data URLs
+	const imageDataUrls = await processImagePaths(allImagePaths)
+
+	// Use clean prompt (with image refs removed)
+	const taskPrompt = cleanPrompt || prompt
+
+	if (options.plan) {
+		StateManager.get().setGlobalState("mode", "plan")
+	} else if (options.act) {
+		StateManager.get().setGlobalState("mode", "act")
+	}
+
+	if (options.model) {
+		const selectedMode = (StateManager.get().getGlobalSettingsKey("mode") || "act") as "act" | "plan"
+
+		// Get the current provider for the selected mode
+		const providerKey = selectedMode === "act" ? "actModeApiProvider" : "planModeApiProvider"
+		const currentProvider = StateManager.get().getGlobalSettingsKey(providerKey) as ApiProvider
+
+		// Update the generic model ID for the current mode
+		const modelKey = selectedMode === "act" ? "actModeApiModelId" : "planModeApiModelId"
+		StateManager.get().setGlobalState(modelKey, options.model)
+
+		// Also update the provider-specific model ID key if applicable
+		const providerModelKey = getProviderModelIdKey(currentProvider, selectedMode)
+		if (providerModelKey) {
+			StateManager.get().setGlobalState(providerModelKey, options.model)
+		}
+	}
+
+	// Set thinking budget based on --thinking flag
+	const thinkingBudget = options.thinking ? 1024 : 0
+	const currentMode = StateManager.get().getGlobalSettingsKey("mode") || "act"
+	const thinkingKey = currentMode === "act" ? "actModeThinkingBudgetTokens" : "planModeThinkingBudgetTokens"
+	StateManager.get().setGlobalState(thinkingKey, thinkingBudget)
+
+	// Set yolo mode based on --yolo flag
+	if (options.yolo) {
+		StateManager.get().setGlobalState("yoloModeToggled", true)
+	}
+
+	await StateManager.get().flushPendingState()
+
+	printInfo(`Starting Cline task...`)
+	printInfo(`Working directory: ${ctx.workspacePath}`)
+	if (imageDataUrls.length > 0) {
+		printInfo(`Images attached: ${imageDataUrls.length}`)
+	}
+	print(separator())
+
+	let isComplete = false
+	let taskError = false
+
+	const { waitUntilExit, unmount } = render(
+		React.createElement(App, {
+			view: "task",
+			taskId: taskPrompt.substring(0, 30),
+			verbose: options.verbose,
+			controller: ctx.controller,
+			onComplete: () => {
+				isComplete = true
+			},
+			onError: () => {
+				taskError = true
+				isComplete = true
+			},
+		}),
+	)
+
+	await ctx.controller.initTask(taskPrompt, imageDataUrls.length > 0 ? imageDataUrls : undefined)
+
+	const completed = await waitForCondition(() => isComplete, 10 * 60 * 1000)
+	if (!completed) {
+		printError("Task timeout")
+	}
+
+	// Brief delay for final render
+	await new Promise((resolve) => setTimeout(resolve, 100))
+
+	try {
+		await waitUntilExit()
+		if (taskError) {
+			process.exit(1)
+		}
+	} catch (error) {
+		printError(`Task failed: ${error instanceof Error ? error.message : String(error)}`)
+		process.exit(1)
+	} finally {
+		try {
+			unmount()
+		} catch {
+			// Already unmounted
+		}
+		restoreConsole()
+		await ctx.controller.stateManager.flushPendingState()
+		await ctx.controller.dispose()
+		await ErrorService.get().dispose()
+		exit(0)
+	}
+}
+
+/**
+ * List task history
+ */
+async function listHistory(options: { config?: string; limit?: number; page?: number }) {
+	const ctx = await initializeCli(options)
+
+	const taskHistory = StateManager.get().getGlobalStateKey("taskHistory") || []
+	// Sort by timestamp (newest first) before pagination
+	const sortedHistory = [...taskHistory].sort((a: any, b: any) => (b.ts || 0) - (a.ts || 0))
+	const limit = typeof options.limit === "string" ? parseInt(options.limit, 10) : options.limit || 10
+	const initialPage = typeof options.page === "string" ? parseInt(options.page, 10) : options.page || 1
+	const totalCount = sortedHistory.length
+	const totalPages = Math.ceil(totalCount / limit)
+
+	if (sortedHistory.length === 0) {
+		printInfo("No task history found.")
+		await ctx.controller.stateManager.flushPendingState()
+		await ctx.controller.dispose()
+		await ErrorService.get().dispose()
+		exit(0)
+		return
+	}
+
+	await runInkApp(
+		React.createElement(App, {
+			view: "history",
+			historyItems: [],
+			historyAllItems: sortedHistory,
+			controller: ctx.controller,
+			historyPagination: { page: initialPage, totalPages, totalCount, limit },
+		}),
+		async () => {
+			await ctx.controller.stateManager.flushPendingState()
+			await ctx.controller.dispose()
+			await ErrorService.get().dispose()
+			exit(0)
+		},
+	)
+}
+
+/**
+ * Show current configuration
+ */
+async function showConfig(options: { config?: string }) {
+	const ctx = await initializeCli(options)
+	const stateManager = StateManager.get()
+
+	// Dynamically import the wrapper to avoid circular dependencies
+	const { ConfigViewWrapper } = await import("./components/ConfigViewWrapper")
+
+	// Check feature flags
+	const hooksEnabled = stateManager.getGlobalSettingsKey("hooksEnabled") ?? false
+	const skillsEnabled = stateManager.getGlobalSettingsKey("skillsEnabled") ?? false
+
+	await runInkApp(
+		React.createElement(ConfigViewWrapper, {
+			controller: ctx.controller,
+			dataDir: ctx.dataDir,
+			globalState: stateManager.getAllGlobalStateEntries(),
+			workspaceState: stateManager.getAllWorkspaceStateEntries(),
+			hooksEnabled,
+			skillsEnabled,
+		}),
+		async () => {
+			await ctx.controller.stateManager.flushPendingState()
+			await ctx.controller.dispose()
+			await ErrorService.get().dispose()
+			exit(0)
+		},
+	)
+}
+
+/**
+ * Run authentication flow
+ */
+async function runAuth(options: {
+	provider?: string
+	apikey?: string
+	modelid?: string
+	baseurl?: string
+	verbose?: boolean
+	cwd?: string
+	config?: string
+}) {
+	const ctx = await initializeCli({ ...options, enableAuth: true })
+
+	const hasQuickSetupFlags = options.provider || options.apikey || options.modelid || options.baseurl
+	const quickSetup = hasQuickSetupFlags
+		? { provider: options.provider, apikey: options.apikey, modelid: options.modelid, baseurl: options.baseurl }
+		: undefined
+
+	let authError = false
+
+	await runInkApp(
+		React.createElement(App, {
+			view: "auth",
+			controller: ctx.controller,
+			onComplete: () => {
+				exit(0)
+			},
+			onError: () => {
+				authError = true
+			},
+			authQuickSetup: quickSetup,
+		}),
+		async () => {
+			await ctx.controller.stateManager.flushPendingState()
+			await ctx.controller.dispose()
+			await ErrorService.get().dispose()
+			exit(0)
+		},
+	)
+
+	if (authError) {
+		process.exit(1)
+	}
+}
+
+// Setup CLI commands
+const program = new Command()
+
+program.name("cline").description("Cline CLI - AI coding assistant in your terminal").version(VERSION)
+
+// Enable positional options to avoid conflicts between root and subcommand options with the same name
+program.enablePositionalOptions()
+
+program
+	.command("task")
+	.alias("t")
+	.description("Run a new task")
+	.argument("<prompt>", "The task prompt")
+	.option("-a, --act", "Run in act mode")
+	.option("-p, --plan", "Run in plan mode")
+	.option("-y, --yolo", "Enable yolo mode (auto-approve actions)")
+	.option("-m, --model <model>", "Model to use for the task")
+	.option("-i, --images <paths...>", "Image file paths to include with the task")
+	.option("-v, --verbose", "Show verbose output")
+	.option("-c, --cwd <path>", "Working directory for the task")
+	.option("--config <path>", "Path to Cline configuration directory")
+	.option("--thinking", "Enable extended thinking (1024 token budget)")
+	.action((prompt, options) => runTask(prompt, options))
+
+program
+	.command("history")
+	.alias("h")
+	.description("List task history")
+	.option("-n, --limit <number>", "Number of tasks to show", "10")
+	.option("-p, --page <number>", "Page number (1-based)", "1")
+	.option("--config <path>", "Path to Cline configuration directory")
+	.action(listHistory)
+
+program
+	.command("config")
+	.description("Show current configuration")
+	.option("--config <path>", "Path to Cline configuration directory")
+	.action(showConfig)
+
+program
+	.command("auth")
+	.description("Authenticate a provider and configure what model is used")
+	.option("-p, --provider <id>", "Provider ID for quick setup (e.g., openai-native, anthropic)")
+	.option("-k, --apikey <key>", "API key for the provider")
+	.option("-m, --modelid <id>", "Model ID to configure (e.g., gpt-4o, claude-sonnet-4-5-20250929)")
+	.option("-b, --baseurl <url>", "Base URL (optional, only for openai provider)")
+	.option("-v, --verbose", "Show verbose output")
+	.option("-c, --cwd <path>", "Working directory for the task")
+	.option("--config <path>", "Path to Cline configuration directory")
+	.action(runAuth)
+
+program
+	.command("version")
+	.description("Show Cline CLI version number")
+	.action(() => printInfo(`Cline CLI version: ${VERSION}`))
+/**
+ * Show welcome prompt and run task with user input
+ */
+async function showWelcome(options: { verbose?: boolean; cwd?: string; config?: string; thinking?: boolean }) {
+	const ctx = await initializeCli({ ...options, enableAuth: true })
+
+	let submittedPrompt: string | null = null
+	let submittedImagePaths: string[] = []
+
+	const { waitUntilExit, unmount } = render(
+		React.createElement(App, {
+			view: "welcome",
+			controller: ctx.controller,
+			onWelcomeSubmit: (prompt: string, imagePaths: string[]) => {
+				submittedPrompt = prompt
+				submittedImagePaths = imagePaths
+				unmount()
+			},
+			onWelcomeExit: () => {
+				unmount()
+				exit(0)
+			},
+		}),
+	)
+
+	try {
+		await waitUntilExit()
+	} catch {
+		// App unmounted after prompt submission
+	}
+
+	restoreConsole()
+
+	if (submittedPrompt || submittedImagePaths.length > 0) {
+		// Run the task with the submitted prompt and images, reusing the existing context
+		await runTask(submittedPrompt || "", { ...options, images: submittedImagePaths }, ctx)
+	} else {
+		// User exited without submitting - clean up and exit
+		await ctx.controller.stateManager.flushPendingState()
+		await ctx.controller.dispose()
+		await ErrorService.get().dispose()
+		exit(0)
+	}
+}
+
+// Interactive mode (default when no command given)
+program
+	.argument("[prompt]", "Task prompt (starts task immediately)")
+	.option("-i, --images <paths...>", "Image file paths to include with the task")
+	.option("-v, --verbose", "Show verbose output")
+	.option("-c, --cwd <path>", "Working directory")
+	.option("--config <path>", "Configuration directory")
+	.option("--thinking", "Enable extended thinking (1024 token budget)")
+	.action(async (prompt, options) => {
+		if (prompt) {
+			await runTask(prompt, options)
+		} else {
+			// Show welcome prompt if no prompt given
+			await showWelcome(options)
+		}
+	})
+
+// Parse and run
+program.parse()

cli-ts/src/utils/console.ts

@@ -21,7 +21,6 @@ if (!isVerbose) {
 	console.warn = () => {}
 	console.error = () => {}
 	console.debug = () => {}
-	console.info = () => {}
 }
 
 /**

cli-ts/src/utils/display.ts

@@ -112,48 +112,49 @@ function getMessageIcon(message: ClineMessage): string {
 			default:
 				return "❔"
 		}
-	}
-	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 "ℹ️ "
-		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 "ℹ️ "
+			default:
+				return "  "
+		}
 	}
 }
 
 /**
  * Format a ClineMessage for terminal display
  */
-export function formatMessage(message: ClineMessage, verbose = false): string {
+export function formatMessage(message: ClineMessage, verbose: boolean = false): string {
 	const icon = getMessageIcon(message)
 	const timestamp = formatTimestamp(message.ts)
 	const lines: string[] = []
@@ -243,7 +244,7 @@ function formatSayMessage(message: ClineMessage, prefix: string, verbose: boolea
 
 		case "command_output":
 			const output = message.text || ""
-			const truncated = output.length > 500 ? `${output.substring(0, 500)}...` : output
+			const truncated = output.length > 500 ? output.substring(0, 500) + "..." : output
 			return `${prefix} ${style.dim("Output:")} ${truncated}`
 
 		case "tool":
@@ -288,7 +289,7 @@ function formatSayMessage(message: ClineMessage, prefix: string, verbose: boolea
 /**
  * Display a horizontal separator
  */
-export function separator(char = "─", width = 60): string {
+export function separator(char: string = "─", width: number = 60): string {
 	return style.dim(char.repeat(width))
 }
 
@@ -308,7 +309,7 @@ export function taskHeader(taskId: string, task?: string): string {
 /**
  * Format the current state for display
  */
-export function formatState(state: ExtensionState, verbose = false): string {
+export function formatState(state: ExtensionState, verbose: boolean = false): string {
 	const lines: string[] = []
 
 	if (state.currentTaskItem) {
@@ -319,7 +320,7 @@ export function formatState(state: ExtensionState, verbose = false): string {
 	if (state.clineMessages && state.clineMessages.length > 0) {
 		const messagesToShow = verbose
 			? state.clineMessages
-			: state.clineMessages.filter((_m) => {
+			: state.clineMessages.filter((m) => {
 					// Filter out noisy messages in non-verbose mode
 					// if (m.say === "api_req_started" || m.say === "api_req_finished") return false
 					return true
@@ -343,7 +344,7 @@ export class Spinner {
 	private frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
 	private frameIndex = 0
 	private interval: NodeJS.Timeout | null = null
-	private message = ""
+	private message: string = ""
 
 	start(message: string) {
 		this.message = message
@@ -366,7 +367,7 @@ export class Spinner {
 		if (finalMessage) {
 			process.stdout.write(`\r${style.success("✓")} ${finalMessage}\n`)
 		} else {
-			process.stdout.write(`\r${" ".repeat(this.message.length + 4)}\r`)
+			process.stdout.write("\r" + " ".repeat(this.message.length + 4) + "\r")
 		}
 	}
 
@@ -391,7 +392,7 @@ export function clearLine() {
 /**
  * Move cursor up n lines
  */
-export function cursorUp(n = 1) {
+export function cursorUp(n: number = 1) {
 	process.stdout.write(`\x1b[${n}A`)
 }
 
@@ -443,7 +444,7 @@ export async function promptUser(question: string): Promise<string> {
 	})
 
 	return new Promise((resolve) => {
-		rl.question(`${style.info(question)} `, (answer: string) => {
+		rl.question(style.info(question) + " ", (answer: string) => {
 			rl.close()
 			resolve(answer.trim())
 		})
@@ -457,15 +458,3 @@ export async function promptConfirmation(question: string): Promise<boolean> {
 	const answer = await promptUser(`${question} ${style.dim("(y/n)")}`)
 	return answer.toLowerCase() === "y" || answer.toLowerCase() === "yes"
 }
-
-/**
- * Set the terminal session title using OSC escape sequence.
- * Works in most modern terminal emulators (iTerm2, Terminal.app, GNOME Terminal, etc.)
- */
-export function setTerminalTitle(title: string): void {
-	if (process.stdout.isTTY) {
-		const maxLength = 80
-		const truncated = title.length > maxLength ? `${title.slice(0, maxLength)}...` : title
-		process.stdout.write(`\x1b]0;${truncated}\x07`)
-	}
-}

cli-ts/src/utils/file-search.ts

@@ -8,7 +8,6 @@ import { promises as fs } from "node:fs"
 import { basename, dirname, join, relative } from "node:path"
 import { createInterface } from "node:readline"
 import type { Fzf, FzfResultItem } from "fzf"
-import { Logger } from "@/shared/services/Logger"
 
 export interface FileSearchResult {
 	path: string
@@ -183,9 +182,9 @@ export async function listWorkspaceFiles(workspacePath: string, limit = 5000): P
 
 function countGaps(positions: Iterable<number>): number {
 	let gaps = 0
-	let prev = Number.NEGATIVE_INFINITY
+	let prev = -Infinity
 	for (const pos of positions) {
-		if (prev !== Number.NEGATIVE_INFINITY && pos - prev > 1) {
+		if (prev !== -Infinity && pos - prev > 1) {
 			gaps++
 		}
 		prev = pos
@@ -229,7 +228,7 @@ export async function searchWorkspaceFiles(
 			.slice(0, limit)
 			.map((r) => r.item)
 	} catch (error) {
-		Logger.error("File search error:", error)
+		console.error("File search error:", error)
 		return []
 	}
 }
@@ -252,8 +251,6 @@ export function extractMentionQuery(text: string): { inMentionMode: boolean; que
 export function insertMention(text: string, atIndex: number, filePath: string): string {
 	const endIndex = text.indexOf(" ", atIndex)
 	const end = endIndex === -1 ? text.length : endIndex
-	// Ensure path starts with / for proper mention format
-	const normalizedPath = filePath.startsWith("/") ? filePath : `/${filePath}`
-	const mention = normalizedPath.includes(" ") ? `@"${normalizedPath}"` : `@${normalizedPath}`
-	return `${text.slice(0, atIndex) + mention} ${text.slice(end).trimStart()}`
+	const mention = filePath.includes(" ") ? `@"${filePath}"` : `@${filePath}`
+	return text.slice(0, atIndex) + mention + " " + text.slice(end).trimStart()
 }

cli-ts/src/utils/provider-map.ts

@@ -1,29 +1,6 @@
+import { ApiProvider } from "@/shared/api"
+
 // Map providers to their specific model ID keys
-
-import { Secrets, SettingsKey } from "@shared/storage/state-keys"
-import {
-	ApiProvider,
-	anthropicDefaultModelId,
-	basetenDefaultModelId,
-	bedrockDefaultModelId,
-	deepSeekDefaultModelId,
-	fireworksDefaultModelId,
-	geminiDefaultModelId,
-	groqDefaultModelId,
-	huaweiCloudMaasDefaultModelId,
-	huggingFaceDefaultModelId,
-	internationalQwenDefaultModelId,
-	liteLlmDefaultModelId,
-	minimaxDefaultModelId,
-	moonshotDefaultModelId,
-	nousResearchDefaultModelId,
-	openAiNativeDefaultModelId,
-	openRouterDefaultModelId,
-	requestyDefaultModelId,
-	sapAiCoreDefaultModelId,
-	xaiDefaultModelId,
-} from "../api"
-
 // Note: "cline" provider uses the same model ID key as "openrouter"
 const ProviderKeyMap: Partial<Record<ApiProvider, string>> = {
 	openrouter: "OpenRouterModelId",
@@ -47,8 +24,7 @@ const ProviderKeyMap: Partial<Record<ApiProvider, string>> = {
 	"vercel-ai-gateway": "VercelAiGatewayModelId",
 } as const
 
-export const ProviderToApiKeyMap: Partial<Record<ApiProvider, keyof Secrets | (keyof Secrets)[]>> = {
-	cline: ["clineApiKey", "clineAccountId"],
+export const ProviderToApiKeyMap: Partial<Record<ApiProvider, string | string[]>> = {
 	anthropic: "apiKey",
 	openrouter: "openRouterApiKey",
 	bedrock: ["awsAccessKey", "awsBedrockApiKey"],
@@ -84,54 +60,25 @@ export const ProviderToApiKeyMap: Partial<Record<ApiProvider, keyof Secrets | (k
 	hicap: "hicapApiKey",
 	nousResearch: "nousResearchApiKey",
 	sapaicore: ["sapAiCoreClientId", "sapAiCoreClientSecret"],
-} as const
-
-const ProviderDefaultModelMap: Partial<Record<ApiProvider, string>> = {
-	anthropic: anthropicDefaultModelId,
-	openrouter: openRouterDefaultModelId,
-	cline: openRouterDefaultModelId,
-	openai: openAiNativeDefaultModelId,
-	ollama: "",
-	lmstudio: "",
-	litellm: liteLlmDefaultModelId,
-	requesty: requestyDefaultModelId,
-	together: openRouterDefaultModelId,
-	fireworks: fireworksDefaultModelId,
-	sapaicore: sapAiCoreDefaultModelId,
-	groq: groqDefaultModelId,
-	baseten: basetenDefaultModelId,
-	huggingface: huggingFaceDefaultModelId,
-	"huawei-cloud-maas": huaweiCloudMaasDefaultModelId,
-	oca: liteLlmDefaultModelId,
-	aihubmix: openRouterDefaultModelId,
-	bedrock: bedrockDefaultModelId,
-	hicap: "",
-	nousResearch: nousResearchDefaultModelId,
-	"vercel-ai-gateway": openRouterDefaultModelId,
-	xai: xaiDefaultModelId,
-	gemini: geminiDefaultModelId,
-	minimax: minimaxDefaultModelId,
-	moonshot: moonshotDefaultModelId,
-	qwen: internationalQwenDefaultModelId,
-	deepseek: deepSeekDefaultModelId,
+	cline: "clineAccountId",
 } as const
 
 /**
  * Get the provider-specific model ID key for a given provider and mode.
  * Different providers store their model IDs in different state keys.
  */
-export function getProviderModelIdKey(provider: ApiProvider, mode: "act" | "plan"): SettingsKey {
+export function getProviderModelIdKey(
+	provider: ApiProvider,
+	mode: "act" | "plan",
+): keyof import("@shared/storage/state-keys").Settings | null {
+	const prefix = mode === "act" ? "actMode" : "planMode"
+
 	const keySuffix = ProviderKeyMap[provider]
 	if (keySuffix) {
-		// E.g. actModeOpenAiModelId, planModeOpenAiModelId, etc.
-		return `${mode}Mode${keySuffix}` as SettingsKey
+		return `${prefix}${keySuffix}` as keyof import("@shared/storage/state-keys").Settings
 	}
 
 	// For providers without a specific key (anthropic, gemini, bedrock, etc.),
 	// they use the generic actModeApiModelId/planModeApiModelId
-	return `${mode}ModeApiModelId`
-}
-
-export function getProviderDefaultModelId(provider: ApiProvider): string | null {
-	return ProviderDefaultModelMap[provider] || ""
+	return null
 }