docs: add workflow guide for adding settings to Cline

.changeset/brave-dragons-dress.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-improve cline command permission validation logic. add cline command permission man page documentation

.changeset/calm-foxes-learn.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Add code-simplifier skill for refining code clarity and maintainability

.changeset/chilly-dancers-lick.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+docs: add workflow guide for adding settings to Cline

.changeset/deep-heads-leave.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Exclude files without extensions (and dotfiles) from getDiffSet results if they are binary

.changeset/eight-birds-bet.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix Cerebras rate limiting by using conservative max_tokens (16K) instead of model maximum.

.changeset/fix-claude-code-model-detection.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fixed Auto Compact not triggering when using Claude Code provider. Short model aliases like "sonnet" and "opus" are now correctly recognized as Claude 4+ models.

.changeset/fix-history-filters.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix Workspace and Favorites history filters to work independently instead of being mutually exclusive

.changeset/fix-mcp-404-handling.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fixed connection failures with remote MCP servers that return 404 instead of 405 for SSE stream checks. This was causing "Failed to open SSE stream: Not Found" errors after the v3.46.0 SDK upgrade.

.changeset/many-hotels-admire.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+feat(prompts): modify prompts for parallel tool usage in claude and gemini 3 models

.changeset/remove-auto-open.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Stop automatically opening Cline sidebar on extension update - only show a notification

.changeset/remove-zai-glm-4-6.md

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

.changeset/rotten-colts-rest.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+add supportsReasoning property to Baseten models

.changeset/shy-tips-work.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Wiring-up "conditionals" for Cline Rules files.

.changeset/ssh-remote-drag-drop.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Fix drag & drop files from SSH remote workspaces into chat

.changeset/three-areas-cheer.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+fix regression that broke JSON parsing for SAP AI Core provider in native API mode for claude models

.changeset/tricky-brooms-jump.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Updated switch component to adhere to 3:1 contrast accessibility standard for both light and dark vscode themes

.changeset/wicked-chicken-peel.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix Baseten model selector issue in model picker modal mode

.changeset/young-breads-rest.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Remove hooks feature setting and make it always enabled (except on Windows).

.cline/skills/code-simplifier/SKILL.md

@@ -1,48 +0,0 @@
----
-name: code-simplifier
-description: Simplify and refine code for clarity, consistency, and maintainability while preserving all functionality. Focuses on recently modified code unless instructed otherwise.
----
-
-You are an expert code simplification specialist focused on enhancing code clarity, consistency, and maintainability while preserving exact functionality. Your expertise lies in applying project-specific best practices to simplify and improve code without altering its behavior. You prioritize readable, explicit code over overly compact solutions. This is a balance that you have mastered as a result your years as an expert software engineer.
-
-You will analyze recently modified code and apply refinements that:
-
-1. **Preserve Functionality**: Never change what the code does - only how it does it. All original features, outputs, and behaviors must remain intact.
-
-2. **Apply Project Standards**: Follow the established coding standards from the project's configuration files (e.g., `.clinerules/`, `.editorconfig`, linter configs, README, CONTRIBUTING) including patterns like:
-   - Consistent import/include ordering and organization
-   - Idiomatic function and method declaration style for the language
-   - Explicit type annotations where the language supports them
-   - Framework-appropriate patterns and conventions
-   - Language-idiomatic error handling
-   - Consistent naming conventions (camelCase, snake_case, etc.)
-
-3. **Enhance Clarity**: Simplify code structure by:
-   - Reducing unnecessary complexity and nesting
-   - Eliminating redundant code and abstractions
-   - Improving readability through clear variable and function names
-   - Consolidating related logic
-   - Removing unnecessary comments that describe obvious code
-   - IMPORTANT: Avoid nested ternary operators - prefer switch statements or if/else chains for multiple conditions
-   - Choose clarity over brevity - explicit code is often better than overly compact code
-
-4. **Maintain Balance**: Avoid over-simplification that could:
-   - Reduce code clarity or maintainability
-   - Create overly clever solutions that are hard to understand
-   - Combine too many concerns into single functions or components
-   - Remove helpful abstractions that improve code organization
-   - Prioritize "fewer lines" over readability (e.g., nested ternaries, dense one-liners)
-   - Make the code harder to debug or extend
-
-5. **Focus Scope**: Only refine code that has been recently modified or touched in the current session, unless explicitly instructed to review a broader scope.
-
-Your refinement process:
-
-1. Identify the recently modified code sections
-2. Analyze for opportunities to improve elegance and consistency
-3. Apply project-specific best practices and coding standards
-4. Ensure all functionality remains unchanged
-5. Verify the refined code is simpler and more maintainable
-6. Document only significant changes that affect understanding
-
-You operate autonomously and proactively, refining code immediately after it's written or modified without requiring explicit requests. Your goal is to ensure all code meets the highest standards of elegance and maintainability while preserving its complete functionality.

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

@@ -1,196 +0,0 @@
----
-name: create-pull-request
-description: Create a GitHub pull request following project conventions. Use when the user asks to create a PR, submit changes for review, or open a pull request. Handles commit analysis, branch management, and PR creation using the gh CLI tool.
----
-
-# Create Pull Request
-
-This skill guides you through creating a well-structured GitHub pull request that follows project conventions and best practices.
-
-## Prerequisites Check
-
-Before proceeding, verify the following:
-
-### 1. Check if `gh` CLI is installed
-
-```bash
-gh --version
-```
-
-If not installed, inform the user:
-> The GitHub CLI (`gh`) is required but not installed. Please install it:
-> - macOS: `brew install gh`
-> - Other: https://cli.github.com/
-
-### 2. Check if authenticated with GitHub
-
-```bash
-gh auth status
-```
-
-If not authenticated, guide the user to run `gh auth login`.
-
-### 3. Verify clean working directory
-
-```bash
-git status
-```
-
-If there are uncommitted changes, ask the user whether to:
-- Commit them as part of this PR
-- Stash them temporarily
-- Discard them (with caution)
-
-## Gather Context
-
-### 1. Identify the current branch
-
-```bash
-git branch --show-current
-```
-
-Ensure you're not on `main` or `master`. If so, ask the user to create or switch to a feature branch.
-
-### 2. Find the base branch
-
-```bash
-git remote show origin | grep "HEAD branch"
-```
-
-This is typically `main` or `master`.
-
-### 3. Analyze recent commits relevant to this PR
-
-```bash
-git log origin/main..HEAD --oneline --no-decorate
-```
-
-Review these commits to understand:
-- What changes are being introduced
-- The scope of the PR (single feature/fix or multiple changes)
-- Whether commits should be squashed or reorganized
-
-### 4. Review the diff
-
-```bash
-git diff origin/main..HEAD --stat
-```
-
-This shows which files changed and helps identify the type of change.
-
-## Information Gathering
-
-Before creating the PR, you need the following information. Check if it can be inferred from:
-- Commit messages
-- Branch name (e.g., `fix/issue-123`, `feature/new-login`)
-- Changed files and their content
-
-If any critical information is missing, use `ask_followup_question` to ask the user:
-
-### Required Information
-
-1. **Related Issue Number**: Look for patterns like `#123`, `fixes #123`, or `closes #123` in commit messages
-2. **Description**: What problem does this solve? Why were these changes made?
-3. **Type of Change**: Bug fix, new feature, breaking change, refactor, cosmetic, documentation, or workflow
-4. **Test Procedure**: How was this tested? What could break?
-
-### Example clarifying question
-
-If the issue number is not found:
-> I couldn't find a related issue number in the commit messages or branch name. What GitHub issue does this PR address? (Enter the issue number, e.g., "123" or "N/A" for small fixes)
-
-## Git Best Practices
-
-Before creating the PR, consider these best practices:
-
-### Commit Hygiene
-
-1. **Atomic commits**: Each commit should represent a single logical change
-2. **Clear commit messages**: Follow conventional commit format when possible
-3. **No merge commits**: Prefer rebasing over merging to keep history clean
-
-### Branch Management
-
-1. **Rebase on latest main** (if needed):
-   ```bash
-   git fetch origin
-   git rebase origin/main
-   ```
-
-2. **Squash if appropriate**: If there are many small "WIP" commits, consider interactive rebase:
-   ```bash
-   git rebase -i origin/main
-   ```
-   Only suggest this if commits appear messy and the user is comfortable with rebasing.
-
-### Push Changes
-
-Ensure all commits are pushed:
-```bash
-git push origin HEAD
-```
-
-If the branch was rebased, you may need:
-```bash
-git push origin HEAD --force-with-lease
-```
-
-## Create the Pull Request
-
-**IMPORTANT**: Read and use the PR template at `.github/pull_request_template.md`. The PR body format must **strictly match** the template structure. Do not deviate from the template format.
-
-When filling out the template:
-- Replace `#XXXX` with the actual issue number, or keep as `#XXXX` if no issue exists (for small fixes)
-- Fill in all sections with relevant information gathered from commits and context
-- Mark the appropriate "Type of Change" checkbox(es)
-- Complete the "Pre-flight Checklist" items that apply
-
-### Create PR with gh CLI
-
-```bash
-gh pr create --title "PR_TITLE" --body "PR_BODY" --base main
-```
-
-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
-
-After creating the PR:
-
-1. **Display the PR URL** so the user can review it
-2. **Remind about CI checks**: Tests and linting will run automatically
-3. **Suggest next steps**:
-   - Add reviewers if needed: `gh pr edit --add-reviewer USERNAME`
-   - Add labels if needed: `gh pr edit --add-label "bug"`
-
-## Error Handling
-
-### Common Issues
-
-1. **No commits ahead of main**: The branch has no changes to submit
-   - Ask if the user meant to work on a different branch
-
-2. **Branch not pushed**: Remote doesn't have the branch
-   - Push the branch first: `git push -u origin HEAD`
-
-3. **PR already exists**: A PR for this branch already exists
-   - Show the existing PR: `gh pr view`
-   - Ask if they want to update it instead
-
-4. **Merge conflicts**: Branch conflicts with base
-   - Guide user through resolving conflicts or rebasing
-
-## Summary Checklist
-
-Before finalizing, ensure:
-- [ ] `gh` CLI is installed and authenticated
-- [ ] Working directory is clean
-- [ ] All commits are pushed
-- [ ] Branch is up-to-date with base branch
-- [ ] Related issue number is identified, or placeholder is used
-- [ ] PR description follows the template exactly
-- [ ] Appropriate type of change is selected
-- [ ] Pre-flight checklist items are addressed

.clinerules/general.md

@@ -1,194 +0,0 @@
-This file is the secret sauce for working effectively in this codebase. It captures tribal knowledge—the nuanced, non-obvious patterns that make the difference between a quick fix and hours of back-and-forth & human intervention.
-
-**When to add to this file:**
-- User had to intervene, correct, or hand-hold
-- Multiple back-and-forth attempts were needed to get something working
-- You discovered something that required reading many files to understand
-- A change touched files you wouldn't have guessed
-- Something worked differently than you expected
-- User explicitly asks to "add this to CLAUDE.md"
-
-**Proactively suggest additions** when any of the above happen—don't wait to be asked.
-
-**What NOT to add:** Stuff you can figure out from reading a few files, obvious patterns, or standard practices. This file should be high-signal, not comprehensive.
-
-## Miscellaneous
-- This is a VS Code extension—check `package.json` for available scripts before trying to verify builds (e.g., `npm run compile`, not `npm run build`).
-- When creating PRs, if the change is user-facing and significant enough to warrant a changelog entry, run `npm run changeset` and create a patch changeset. Never create minor or major version bumps. Skip changesets for trivial fixes, internal refactors, or minor UI tweaks that users wouldn't notice.
-- When adding new feature flags, see this PR as a reference https://github.com/cline/cline/pull/7566
-- Additional instructions about making requests: @.clinerules/network.md
-
-## gRPC/Protobuf Communication
-The extension and webview communicate via gRPC-like protocol over VS Code message passing.
-
-**Proto files live in `proto/`** (e.g., `proto/cline/task.proto`, `proto/cline/ui.proto`)
-- Each feature domain has its own `.proto` file
-- For simple data, use shared types in `proto/cline/common.proto` (`StringRequest`, `Empty`, `Int64Request`)
-- For complex data, define custom messages in the feature's `.proto` file
-- Naming: Services `PascalCaseService`, RPCs `camelCase`, Messages `PascalCase`
-- For streaming responses, use `stream` keyword (see `subscribeToAuthCallback` in `account.proto`)
-
-**Run `npm run protos`** after any proto changes—generates types in:
-- `src/shared/proto/` - Shared type definitions
-- `src/generated/grpc-js/` - Service implementations
-- `src/generated/nice-grpc/` - Promise-based clients
-- `src/generated/hosts/` - Generated handlers
-
-**Adding new enum values** (like a new `ClineSay` type) requires updating conversion mappings in `src/shared/proto-conversions/cline-message.ts`
-
-**Adding new RPC methods** requires:
-- Handler in `src/core/controller/<domain>/`
-- Call from webview via generated client: `UiServiceClient.scrollToSettings(StringRequest.create({ value: "browser" }))`
-
-**Example—the `explain-changes` feature touched:**
-- `proto/cline/task.proto` - Added `ExplainChangesRequest` message and `explainChanges` RPC
-- `proto/cline/ui.proto` - Added `GENERATE_EXPLANATION = 29` to `ClineSay` enum
-- `src/shared/ExtensionMessage.ts` - Added `ClineSayGenerateExplanation` type
-- `src/shared/proto-conversions/cline-message.ts` - Added mapping for new say type
-- `src/core/controller/task/explainChanges.ts` - Handler implementation
-- `webview-ui/src/components/chat/ChatRow.tsx` - UI rendering
-
-## Adding a New API Provider
-When adding a new provider (e.g., "openai-codex"), you must update the proto conversion layer in THREE places or the provider will silently reset to Anthropic:
-
-1. `proto/cline/models.proto` - Add to the `ApiProvider` enum (e.g., `OPENAI_CODEX = 40;`)
-2. `convertApiProviderToProto()` in `src/shared/proto-conversions/models/api-configuration-conversion.ts` - Add case mapping string to proto enum
-3. `convertProtoToApiProvider()` in the same file - Add case mapping proto enum back to string
-
-**Why this matters:** Without these, the provider string hits the `default` case and returns `ANTHROPIC`. The webview, provider list, and handler all work fine, but the state silently resets when it round-trips through proto serialization. No error is thrown.
-
-**Other files to update when adding a provider:**
-- `src/shared/api.ts` - Add to `ApiProvider` union type, define models
-- `src/shared/providers/providers.json` - Add to provider list for dropdown
-- `src/core/api/index.ts` - Register handler in `createHandlerForProvider()`
-- `webview-ui/src/components/settings/utils/providerUtils.ts` - Add cases in `getModelsForProvider()` and `normalizeApiConfiguration()`
-- `webview-ui/src/utils/validate.ts` - Add validation case
-- `webview-ui/src/components/settings/ApiOptions.tsx` - Render provider component
-
-## Responses API Providers (OpenAI Codex, OpenAI Native)
-Providers using OpenAI's Responses API require native tool calling. XML tools don't work with the Responses API.
-
-**Symptoms of broken native tool calling:**
-- Tools get called multiple times (e.g., `ask_followup_question` asks the same question twice)
-- Tool arguments get duplicated or malformed
-- The model responds but tools aren't recognized
-
-**Root causes to check:**
-1. **Provider missing from `isNextGenModelProvider()`** in `src/utils/model-utils.ts`. The native variant matchers (e.g., `native-gpt-5/config.ts`) call this function. If your provider isn't in the list, the matcher returns false and falls back to XML tools.
-
-2. **Model missing `apiFormat: ApiFormat.OPENAI_RESPONSES`** in its model info (`src/shared/api.ts`). This property signals that the model requires native tool calling. The task runner in `src/core/task/index.ts` checks this and forces `enableNativeToolCalls: true` regardless of user settings.
-
-**When adding a new Responses API provider:**
-1. Add provider to `isNextGenModelProvider()` list in `src/utils/model-utils.ts`
-2. Set `apiFormat: ApiFormat.OPENAI_RESPONSES` on all models that use the Responses API
-3. The variant matcher and task runner will handle the rest automatically
-
-## Adding Tools to System Prompt
-This is tricky—multiple prompt variants and configs. **Always search for existing similar tools first and follow their pattern.** Look at the full chain from prompt definition → variant configs → handler → UI before implementing.
-
-1. **Add to `ClineDefaultTool` enum** in `src/shared/tools.ts`
-2. **Tool definition** in `src/core/prompts/system-prompt/tools/` (create file like `generate_explanation.ts`)
-   - Define variants for each `ModelFamily` (generic, next-gen, xs, etc.)
-   - Export variants array (e.g., `export const my_tool_variants = [GENERIC, NATIVE_NEXT_GEN, XS]`)
-   - **Fallback behavior**: If a variant isn't defined for a model family, `ClineToolSet.getToolByNameWithFallback()` automatically falls back to GENERIC. So you only need to export `[GENERIC]` unless the tool needs model-specific behavior.
-3. **Register in `src/core/prompts/system-prompt/tools/init.ts`** - Import and spread into `allToolVariants`
-4. **Add to variant configs** - Each model family has its own config in `src/core/prompts/system-prompt/variants/*/config.ts`. Add your tool's enum to the `.tools()` list:
-   - `generic/config.ts`, `next-gen/config.ts`, `gpt-5/config.ts`, `native-gpt-5/config.ts`, `native-gpt-5-1/config.ts`, `native-next-gen/config.ts`, `gemini-3/config.ts`, `glm/config.ts`, `hermes/config.ts`, `xs/config.ts`
-   - **Important**: If you add to a variant's config, make sure the tool spec exports a variant for that ModelFamily (or relies on GENERIC fallback)
-5. **Create handler** in `src/core/task/tools/handlers/`
-6. **Wire up in `ToolExecutor.ts`** if needed for execution flow
-7. **Add to tool parsing** in `src/core/assistant-message/index.ts` if needed
-8. **If tool has UI feedback**: add `ClineSay` enum in proto, update `src/shared/ExtensionMessage.ts`, update `src/shared/proto-conversions/cline-message.ts`, update `webview-ui/src/components/chat/ChatRow.tsx`
-
-## Modifying System Prompt
-**Read these first:** `src/core/prompts/system-prompt/README.md`, `tools/README.md`, `__tests__/README.md`
-
-System prompt is modular: **components** (reusable sections) + **variants** (model-specific configs) + **templates** (with `{{PLACEHOLDER}}` resolution).
-
-**Key directories:**
-- `components/` - Shared sections: `rules.ts`, `capabilities.ts`, `editing_files.ts`, etc.
-- `variants/` - Model-specific: `generic/`, `next-gen/`, `xs/`, `gpt-5/`, `gemini-3/`, `hermes/`, `glm/`, etc.
-- `templates/` - Template engine and placeholder definitions
-
-**Variant tiers (ask user which to modify):**
-- **Next-gen** (Claude 4, GPT-5, Gemini 2.5): `next-gen/`, `native-next-gen/`, `native-gpt-5/`, `native-gpt-5-1/`, `gemini-3/`, `gpt-5/`
-- **Standard** (default fallback): `generic/`
-- **Local/small models**: `xs/`, `hermes/`, `glm/`
-
-**How overrides work:** Variants can override components via `componentOverrides` in their `config.ts`, or provide a custom template in `template.ts` (e.g., `next-gen/template.ts` exports `rules_template`). If no override, the shared component from `components/` is used.
-
-**Example: Adding a rule to RULES section**
-1. Check if variant overrides rules: look for `rules_template` in `variants/*/template.ts` or `componentOverrides.RULES` in `config.ts`
-2. If shared: modify `components/rules.ts`
-3. If overridden: modify that variant's template
-4. XS variant is special—has heavily condensed inline content in `template.ts`
-
-**After any changes, regenerate snapshots:**
-```bash
-UPDATE_SNAPSHOTS=true npm run test:unit
-```
-Snapshots live in `__tests__/__snapshots__/`. Tests validate across model families and context variations (browser, MCP, focus chain).
-
-## Modifying Default Slash Commands
-Three places need updates:
-- `src/core/slash-commands/index.ts` - Command definitions
-- `src/core/prompts/commands.ts` - System prompt integration
-- `webview-ui/src/utils/slash-commands.ts` - Webview autocomplete
-
-## Adding New Global State Keys
-Adding a new key to global state requires updates in multiple places. Missing any step causes silent failures.
-
-Required steps:
-1. Type definition in `src/shared/storage/state-keys.ts` - Add to `GlobalState` or `Settings` interface
-2. Read from globalState in `src/core/storage/utils/state-helpers.ts`:
-   - Add `const myKey = context.globalState.get<GlobalStateAndSettings["myKey"]>("myKey")` in `readGlobalStateFromDisk()`
-   - Add to the return object: `myKey: myKey ?? defaultValue,`
-3. StateManager handles read/write via `setGlobalState()`/`getGlobalStateKey()` after initialization
-
-Common mistake: Adding only the return value without the `context.globalState.get()` call. This compiles but the value is always `undefined` on load.
-
-## 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()`.
-
-Exception: State needed immediately at extension startup (before cache is ready)
-
-When Window A sets state and immediately opens Window B, the new window's StateManager cache is populated from `context.globalState` during initialization. If you need to read state in Window B right at startup (e.g., in `common.ts` during `initialize()`), read directly from `context.globalState.get()` instead of StateManager's cache.
-
-Example pattern (see `lastShownAnnouncementId` and `worktreeAutoOpenPath`):
-```typescript
-// Writing (normal pattern)
-controller.stateManager.setGlobalState("myKey", value)
-
-// Reading at startup in common.ts (bypass cache)
-const value = context.globalState.get<string>("myKey")
-```
-
-This is only needed for cross-window state read during the brief startup window before StateManager cache is fully usable. Normal state access after initialization should use StateManager.
-
-## ChatRow Cancelled/Interrupted States
-When a ChatRow displays a loading/in-progress state (spinner), you must handle what happens when the task is cancelled. This is non-obvious because cancellation doesn't update the message content—you have to infer it from context.
-
-**The pattern:**
-1. A message has a `status` field (e.g., `"generating"`, `"complete"`, `"error"`) stored in `message.text` as JSON
-2. When cancelled mid-operation, the status stays `"generating"` forever—no one updates it
-3. To detect cancellation, check TWO conditions:
-   - `!isLast` — if this message is no longer the last message, something else happened after it (interrupted)
-   - `lastModifiedMessage?.ask === "resume_task" || "resume_completed_task"` — task was just cancelled and is waiting to resume
-
-**Example from `generate_explanation`:**
-```tsx
-const wasCancelled =
-    explanationInfo.status === "generating" &&
-    (!isLast ||
-        lastModifiedMessage?.ask === "resume_task" ||
-        lastModifiedMessage?.ask === "resume_completed_task")
-const isGenerating = explanationInfo.status === "generating" && !wasCancelled
-```
-
-**Why both checks?**
-- `!isLast` catches: cancelled → resumed → did other stuff → this old message is stale
-- `lastModifiedMessage?.ask === "resume_task"` catches: just cancelled, hasn't resumed yet, this message is still technically "last"
-
-**See also:** `BrowserSessionRow.tsx` uses similar pattern with `isLastApiReqInterrupted` and `isLastMessageResume`.
-
-**Backend side:** When streaming is cancelled, clean up properly (close tabs, clear comments, etc.) by checking `taskState.abort` after the streaming function returns.

.clinerules/workflows/adding-settings.md

@@ -0,0 +1,162 @@
+# Adding a Setting to Cline
+
+Add a new user-facing setting (boolean toggle, dropdown, etc.) to Cline.
+
+## Overview
+
+Settings in Cline flow through multiple layers:
+1. **Proto definition** → TypeScript generation
+2. **Backend state management** → reading, writing, persistence
+3. **State broadcasting** → sending to webview
+4. **Frontend** → displaying and updating
+
+**Common gotcha**: Forgetting to include the setting in `getStateToPostToWebview()` causes the setting to reset when navigating away from settings or toggling other settings.
+
+## Step 1: Proto Definition
+
+Add the field to both messages in `proto/cline/state.proto`:
+
+1. **GlobalState** (for persistence):
+```protobuf
+message GlobalState {
+  // ... existing fields
+  optional bool your_setting = NEXT_NUMBER;
+}
+```
+
+2. **UpdateSettingsRequest** (for updates from UI):
+```protobuf
+message UpdateSettingsRequest {
+  // ... existing fields
+  optional bool your_setting = NEXT_NUMBER;
+}
+```
+
+Generate TypeScript:
+```bash
+npm run proto:generate
+```
+
+## Step 2: TypeScript Type Definitions
+
+### `src/shared/storage/state-keys.ts`
+
+Add to the `Settings` interface:
+```typescript
+export interface Settings {
+  // ... existing
+  yourSetting: boolean
+}
+```
+
+### `src/shared/ExtensionMessage.ts`
+
+Add to the `ExtensionState` interface:
+```typescript
+export interface ExtensionState {
+  // ... existing
+  yourSetting?: boolean
+}
+```
+
+## Step 3: Backend State Management
+
+### `src/core/storage/utils/state-helpers.ts`
+
+Add reading from storage (with default value):
+```typescript
+// Near other similar reads (~line 320)
+const yourSetting = context.globalState.get<GlobalStateAndSettings["yourSetting"]>("yourSetting")
+
+// In the return object (~line 690)
+return {
+  // ... existing
+  yourSetting: yourSetting ?? false, // default value
+}
+```
+
+### `src/core/controller/state/updateSettings.ts`
+
+Add handling for the setting update:
+```typescript
+if (request.yourSetting !== undefined) {
+  controller.stateManager.setGlobalState("yourSetting", !!request.yourSetting)
+}
+```
+
+## Step 4: State Broadcasting (CRITICAL)
+
+### `src/core/controller/index.ts`
+
+**This is the most commonly missed step!**
+
+In `getStateToPostToWebview()`:
+
+1. **Read the setting** (near other similar reads ~line 867):
+```typescript
+const yourSetting = this.stateManager.getGlobalSettingsKey("yourSetting")
+```
+
+2. **Include in return object** (~line 968):
+```typescript
+return {
+  // ... existing
+  yourSetting,
+}
+```
+
+Without this, the setting will appear to save but will reset when the UI refreshes.
+
+## Step 5: Frontend
+
+### `webview-ui/src/context/ExtensionStateContext.tsx`
+
+Add default value in `defaultState`:
+```typescript
+const defaultState: ExtensionState = {
+  // ... existing
+  yourSetting: false,
+}
+```
+
+### UI Component (e.g., `FeatureSettingsSection.tsx`)
+
+1. **Extract from context**:
+```typescript
+const { yourSetting } = useExtensionState()
+```
+
+2. **Render the control**:
+```tsx
+<VSCodeCheckbox
+  checked={yourSetting}
+  onChange={(e: any) => {
+    const checked = e.target.checked === true
+    updateSetting("yourSetting", checked)
+  }}>
+  Your Setting Label
+</VSCodeCheckbox>
+```
+
+## Checklist
+
+- [ ] `proto/cline/state.proto` - GlobalState field
+- [ ] `proto/cline/state.proto` - UpdateSettingsRequest field
+- [ ] `npm run proto:generate`
+- [ ] `src/shared/storage/state-keys.ts` - Settings interface
+- [ ] `src/shared/ExtensionMessage.ts` - ExtensionState interface
+- [ ] `src/core/storage/utils/state-helpers.ts` - read with default
+- [ ] `src/core/controller/state/updateSettings.ts` - handle update
+- [ ] `src/core/controller/index.ts` - **getStateToPostToWebview()** (read + return)
+- [ ] `webview-ui/src/context/ExtensionStateContext.tsx` - default state
+- [ ] UI component - display and onChange handler
+
+## Testing
+
+1. Toggle the setting ON
+2. Navigate away from settings (e.g., to chat)
+3. Return to settings - verify setting is still ON
+4. Toggle a DIFFERENT setting
+5. Verify your setting didn't reset
+6. Reload the window - verify persistence
+

.env.example

@@ -72,12 +72,12 @@ POSTHOG_TELEMETRY_ENABLED=true          # Enable PostHog telemetry (default: tru
 # Example configurations:
 #
 # Console debugging (logs only):
-#   OTEL_TELEMETRY_ENABLED=true
+#   OTEL_TELEMETRY_ENABLED=1
 #   OTEL_LOGS_EXPORTER=console
 #   TEL_DEBUG_DIAGNOSTICS=true
 #
 # OTLP with gRPC (insecure, for local testing):
-#   OTEL_TELEMETRY_ENABLED=true
+#   OTEL_TELEMETRY_ENABLED=1
 #   OTEL_LOGS_EXPORTER=otlp
 #   OTEL_EXPORTER_OTLP_PROTOCOL=grpc
 #   OTEL_EXPORTER_OTLP_ENDPOINT=localhost:4317
@@ -85,37 +85,12 @@ POSTHOG_TELEMETRY_ENABLED=true          # Enable PostHog telemetry (default: tru
 #   OTEL_EXPORTER_OTLP_HEADERS=authorization=Bearer your-token
 #
 # OTLP with HTTP/JSON (production):
-#   OTEL_TELEMETRY_ENABLED=true
+#   OTEL_TELEMETRY_ENABLED=1
 #   OTEL_LOGS_EXPORTER=otlp
 #   OTEL_EXPORTER_OTLP_PROTOCOL=http/json
 #   OTEL_EXPORTER_OTLP_ENDPOINT=https://otel.example.com
 #   OTEL_EXPORTER_OTLP_HEADERS=authorization=Bearer your-token
 
-# ============================================================================
-# OBJECT STORE CONFIGURATION
-# ============================================================================
-# TO ENABLE S3 OR R2 STORAGE, UNCOMMENT AND FILL IN THE FOLLOWING:
-# CLINE_STORAGE_ADAPTER="s3" # Options: "s3" or "r2"
-# CLINE_STORAGE_BUCKET="cline"
-# CLINE_STORAGE_ACCESS_KEY_ID="key"
-# CLINE_STORAGE_SECRET_ACCESS_KEY="secrets"
-# 
-# [OPTIONAL FIELDS FOR R2]
-# CLINE_STORAGE_ACCOUNT_ID = "account-id" 
-# Default R2 endpoint (if not set): "https://<CLINE_STORAGE_ACCOUNT_ID>.r2.cloudflarestorage.com"
-# CLINE_STORAGE_ENDPOINT = "http://localhost:8333"
-# 
-# [OPTIONAL FIELDS FOR S3]
-# CLINE_STORAGE_REGION = "us-west-1" # AWS Bucket Region (default: "us-east-1")
-# Default S3 endpoint (if not set): "https://s3.<CLINE_STORAGE_REGION>.amazonaws.com"
-# CLINE_STORAGE_ENDPOINT = "http://localhost:8333"
-# 
-# [OPTIONAL FIELDS FOR ALL STORAGE TYPES]
-# CLINE_STORAGE_SYNC_INTERVAL_MS = 30000 # Interval for sync worker in milliseconds
-# CLINE_STORAGE_SYNC_MAX_RETRIES = 5     # Max retries for failed sync operations
-# CLINE_STORAGE_SYNC_BATCH_SIZE = 10     # Number of files to sync in each batch
-# CLINE_STORAGE_SYNC_BACKFILL_ENABLED = false # Enable backfill of existing data on startup
-
 # ============================================================================
 # OPTIONAL DEVELOPMENT SETTINGS
 # ============================================================================

.github/CODEOWNERS

@@ -1,3 +1,4 @@
 /docs/
 /.github/   @saoudrizwan @garoth @sjf
 /README.md  @saoudrizwan @nickbaumann98
+/src/core/storage/ @celestial-vault @abeatrix

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

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

.github/workflows/npm-main.yaml

@@ -1,130 +0,0 @@
-name: Publish NPM Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      confirm_publish:
-        description: 'Type "publish" to confirm you want to publish to NPM'
-        required: true
-        type: string
-
-permissions:
-  contents: read
-  checks: write  # Required by test workflow
-  pull-requests: write  # Required by test workflow
-
-jobs:
-  test:
-    uses: ./.github/workflows/test.yml
-
-  publish-npm-release:
-    needs: test
-    name: Publish Cline CLI to NPM
-    if: github.repository == 'cline/cline' && github.ref == 'refs/heads/main' && github.event.inputs.confirm_publish == 'publish'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.x'
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.24'
-          cache-dependency-path: cli/go.sum
-
-      # 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 (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 }}
-          ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
-          CLINE_ENVIRONMENT: production
-          OTEL_TELEMETRY_ENABLED: "1"
-          OTEL_METRICS_EXPORTER: otlp
-          OTEL_LOGS_EXPORTER: otlp
-          OTEL_EXPORTER_OTLP_PROTOCOL: ${{ secrets.OTEL_EXPORTER_OTLP_PROTOCOL }}
-          OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
-          OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.OTEL_EXPORTER_OTLP_HEADERS }}
-          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: Summary
-        run: |
-          echo "✅ Successfully published cline@${{ steps.version.outputs.version }} to NPM with tag 'latest'"
-          echo ""
-          echo "📦 Install with: npm install -g cline"
-          echo "🔗 NPM: https://www.npmjs.com/package/cline/v/${{ steps.version.outputs.version }}"

.github/workflows/npm-nightly.yaml

@@ -1,175 +0,0 @@
-name: Publish NPM Nightly
-
-on:
-  schedule:
-    - cron: '0 12 * * *'  # 4 AM PST (UTC-8) = 12 UTC
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  checks: write  # Required by test workflow
-  pull-requests: write  # Required by test workflow
-
-jobs:
-  test:
-    uses: ./.github/workflows/test.yml
-
-  publish-npm-nightly:
-    needs: test
-    name: Publish Cline CLI (Nightly) to NPM
-    if: github.repository == 'cline/cline' && github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Check for recent commits
-        id: check_commits
-        run: |
-          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
-          else
-            echo "Found recent commits, proceeding with publish"
-            echo "skip=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Setup Node.js
-        if: steps.check_commits.outputs.skip != 'true'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.x'
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Setup Go
-        if: steps.check_commits.outputs.skip != 'true'
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.24'
-          cache-dependency-path: cli/go.sum
-
-      # Cache root dependencies - only reuse if package-lock.json exactly matches
-      - name: Cache root dependencies
-        if: steps.check_commits.outputs.skip != 'true'
-        uses: actions/cache@v4
-        id: root-cache
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
-
-      # 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., "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
-
-      - name: Update cli/package.json with nightly version
-        if: steps.check_commits.outputs.skip != 'true'
-        run: |
-          # Update version with timestamp-based nightly version
-          node -e "
-            const fs = require('fs');
-            const pkg = JSON.parse(fs.readFileSync('cli/package.json', 'utf8'));
-            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: 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 }}
-          ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
-          CLINE_ENVIRONMENT: production
-          OTEL_TELEMETRY_ENABLED: "1"
-          OTEL_METRICS_EXPORTER: otlp
-          OTEL_LOGS_EXPORTER: otlp
-          OTEL_EXPORTER_OTLP_PROTOCOL: ${{ secrets.OTEL_EXPORTER_OTLP_PROTOCOL }}
-          OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }}
-          OTEL_EXPORTER_OTLP_HEADERS: ${{ secrets.OTEL_EXPORTER_OTLP_HEADERS }}
-          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
-          npm publish --tag nightly --access public
-
-      - name: Summary
-        if: steps.check_commits.outputs.skip != 'true'
-        run: |
-          echo "✅ Successfully published cline@${{ steps.version.outputs.version }} to NPM with tag 'nightly'"
-          echo ""
-          echo "📦 Install with: npm install -g cline@nightly"
-          echo "🔗 NPM: https://www.npmjs.com/package/cline/v/${{ steps.version.outputs.version }}"

.github/workflows/test.yml

@@ -187,11 +187,20 @@ jobs:
               if: steps.webview-cache.outputs.cache-hit != 'true'
               run: cd webview-ui && npm ci
 
+            - name: Setup Go
+              uses: actions/setup-go@v5
+              with:
+                  go-version: '1.24'
+                  cache-dependency-path: cli/go.sum
+
+            - name: Build CLI binaries
+              run: npm run compile-cli-all-platforms
+
             - name: Download ripgrep binaries
               run: npm run download-ripgrep
 
-            - name: Compile Standalone
-              run: npm run compile-standalone
+            - name: Compile NPM package
+              run: npm run compile-standalone-npm
 
             - name: Install testing platform dependencies
               if: steps.testing-platform-cache.outputs.cache-hit != 'true'
@@ -204,7 +213,7 @@ jobs:
               # 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
+                npm run test:tp-orchestrator -- tests/specs/ --count=1 --coverage || true
 
             - name: Save Coverage Reports
               uses: actions/upload-artifact@v4

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

@@ -1,26 +1,17 @@
 name: Trigger Jetbrains Plugin <-> Cline Tests
 on:
   pull_request_target:
-    types: [opened, reopened]
-  issue_comment:
-    types: [created]
+    types: [opened, synchronize, reopened]
 permissions:
   contents: read
-  pull-requests: read
 concurrency:
-  group: jetbrains-trigger-${{ github.event.pull_request.number || github.event.issue.number }}
+  group: jetbrains-trigger-${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:
   trigger-integration-test:
     name: Run Tests
     runs-on: ubuntu-latest
-    # Run on PR open/reopen, or when someone comments /test-jetbrains on a PR
-    if: |
-      github.event_name == 'pull_request_target' ||
-      (github.event_name == 'issue_comment' &&
-       github.event.issue.pull_request &&
-       contains(github.event.comment.body, '/test-jetbrains'))
     steps:
       - name: Generate GitHub App Token
         id: app-token
@@ -31,28 +22,16 @@ jobs:
           owner: cline
           repositories: intellij-plugin
 
-      - name: Get PR details (for issue_comment trigger)
-        id: pr-details
-        if: github.event_name == 'issue_comment'
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          PR_DATA=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.issue.number }})
-          echo "head_ref=$(echo "$PR_DATA" | jq -r '.head.ref')" >> $GITHUB_OUTPUT
-          echo "head_sha=$(echo "$PR_DATA" | jq -r '.head.sha')" >> $GITHUB_OUTPUT
-          echo "title=$(echo "$PR_DATA" | jq -r '.title')" >> $GITHUB_OUTPUT
-          echo "html_url=$(echo "$PR_DATA" | jq -r '.html_url')" >> $GITHUB_OUTPUT
-
       - name: Sanitize untrusted inputs
         id: sanitize
         env:
-          RAW_BRANCH_NAME: ${{ github.event_name == 'pull_request_target' && github.head_ref || steps.pr-details.outputs.head_ref }}
-          RAW_PR_TITLE: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.title || steps.pr-details.outputs.title }}
+          RAW_BRANCH_NAME: ${{ github.head_ref }}
+          RAW_PR_TITLE: ${{ github.event.pull_request.title }}
         run: |
           # Sanitize branch name for JSON
           BRANCH_NAME_JSON=$(jq -n --arg b "$RAW_BRANCH_NAME" '$b')
           echo "branch_name=$BRANCH_NAME_JSON" >> $GITHUB_OUTPUT
-
+          
           # Sanitize PR title for JSON
           PR_TITLE_JSON=$(jq -n --arg t "$RAW_PR_TITLE" '$t')
           echo "pr_title=$PR_TITLE_JSON" >> $GITHUB_OUTPUT
@@ -61,9 +40,6 @@ jobs:
         env:
           BRANCH_NAME: ${{ steps.sanitize.outputs.branch_name }}
           PR_TITLE: ${{ steps.sanitize.outputs.pr_title }}
-          PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
-          PR_SHA: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || steps.pr-details.outputs.head_sha }}
-          PR_URL: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.html_url || steps.pr-details.outputs.html_url }}
         run: |
           curl -X POST \
             -H "Authorization: Bearer ${{ steps.app-token.outputs.token }}" \
@@ -75,23 +51,19 @@ jobs:
           {
             "event_type": "cline-pr-check",
             "client_payload": {
-              "pr_number": "$PR_NUMBER",
+              "pr_number": "${{ github.event.number }}",
               "branch_name": $BRANCH_NAME,
               "action": "${{ github.event.action }}",
-              "sha": "$PR_SHA",
+              "sha": "${{ github.event.pull_request.head.sha }}",
               "pr_title": $PR_TITLE,
-              "pr_url": "$PR_URL"
+              "pr_url": "${{ github.event.pull_request.html_url }}"
             }
           }
           EOF
 
       - name: Log trigger details
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
-          PR_SHA: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || steps.pr-details.outputs.head_sha }}
         run: |
           echo "Triggered IntelliJ Plugin integration test for:"
-          echo "  PR #$PR_NUMBER"
-          echo "  Trigger: ${{ github.event_name }}"
+          echo "  PR #${{ github.event.number }}"
           echo "  Action: ${{ github.event.action }}"
-          echo "  SHA: $PR_SHA"
+          echo "  SHA: ${{ github.event.pull_request.head.sha }}"

.gitignore

@@ -29,8 +29,6 @@ coverage-unit
 
 *evals.env
 .env
-.secrets
-.github/act/.secrets
 
 .worktrees
 
@@ -41,8 +39,3 @@ webview-ui/src/services/grpc-client.ts
 
 # E2E Tests
 test-results
-
-/.github/act
-/pkg
-.secrets
-

.vscodeignore

@@ -1,8 +1,6 @@
 # Default
 .vscode/**
 .vscode-test/**
-.worktrees/**
-CLAUDE.local.md
 out/
 dist-standalone/
 node_modules/

CHANGELOG.md

@@ -1,106 +1,12 @@
 # Changelog
 
-## [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
-
-## [3.50.0]
-
-### Added
-
-- Add gpt-5.2-codex OpenAI model support
-- Add create-pull-request skill
-
-### Fixed
-
-- Fix the selection of remotely configured providers
-- Fix act_mode_respond to prevent consecutive calls
-- Fix invalid tool call IDs when switching between model formats
-
-## [3.49.1]
-
-### Added
-
-- Add telemetry to track usage of skills feature
-- Add version headers to Cline backend requests
-- Phase in Responses API usage instead of defaulting for every supported model
-
-### Fixed
-
-- Fix workflow slash command search to be case-insensitive
-- Fix model display in ModelPickerModal when using LiteLLM
-- Fix LiteLLM model fetching with default base URL
-- Fix crash when OpenAI-compatible APIs send usage chunks with empty or null choices arrays at end of streaming
-- Fix model ID for Kat Coder Pro Free model
-
-## [3.49.0]
-
-- Enable configuring an OTEL collector at runtime
-- Removing Minimax-2.1 from free model list as the free trial has ended
-- Improved image display in MCP responses
-- Auto-sync remote MCP servers from remote config to local settings
-
-## [3.48.0]
-
-### Added
-
-- Add Skills system for reusable, on-demand agent instructions
-- Add new websearch tooling in Cline provider
-- Add zai-glm-4.7 to Cerebras model list
-- Add model refresh and improve reasoning support for Vercel AI Gateway
-
-### Fixed
-
-- Revert #8341 due to regressions in diff view/document truncation (see #8423, #8429)
-- Fixed extension crash when using context menu selector
-
-## [3.47.0]
-
-### Added
-
-- Added experimental support for Background Edits (allows editing files in background without opening the diff view)
-- Updated free model to MiniMax M2.1 (replacing MiniMax M2)
-- Added support for Azure based identity authentication in OpenAI Compatible provider and Azure OpenAI
-- Add `supportsReasoning` property to Baseten models
-
-### Fixed
-
-- Prevent expired token usage in authenticated requests
-- Exclude binary files without extensions from diffs
-- Preserve file endings and trailing newlines
-- Fix Cerebras rate limiting
-- Fix Auto Compact for Claude Code provider
-- Make Workspace and Favorites history filters independent
-- Fix remote MCP server connection failures (404 response handling)
-- Disable native tool calling for Deepseek 3.2 speciale
-- Show notification instead of opening sidebar on update
-- Fix Baseten model selector
-
-### Refactored
-
-- Modify prompts for parallel tool usage in Claude and Gemini 3 models
-
 ## [3.46.1]
 
 ### Fixed
 
 - Remove GLM 4.6 from free models
 
+
 ## [3.46.0]
 
 ### Added

CLAUDE.md

@@ -1,2 +1,129 @@
-@.clinerules/general.md
-@.clinerules/network.md
+# CLAUDE.md
+
+This file is the secret sauce for working effectively in this codebase. It captures tribal knowledge—the nuanced, non-obvious patterns that make the difference between a quick fix and hours of back-and-forth & human intervention.
+
+**When to add to this file:**
+- User had to intervene, correct, or hand-hold
+- Multiple back-and-forth attempts were needed to get something working
+- You discovered something that required reading many files to understand
+- A change touched files you wouldn't have guessed
+- Something worked differently than you expected
+- User explicitly asks to "add this to CLAUDE.md"
+
+**Proactively suggest additions** when any of the above happen—don't wait to be asked.
+
+**What NOT to add:** Stuff you can figure out from reading a few files, obvious patterns, or standard practices. This file should be high-signal, not comprehensive.
+
+## Miscellaneous
+- This is a VS Code extension—check `package.json` for available scripts before trying to verify builds (e.g., `npm run compile`, not `npm run build`).
+- When creating PRs, if the change is user-facing and significant enough to warrant a changelog entry, run `npm run changeset` and create a patch changeset. Never create minor or major version bumps. Skip changesets for trivial fixes, internal refactors, or minor UI tweaks that users wouldn't notice.
+
+## gRPC/Protobuf Communication
+The extension and webview communicate via gRPC-like protocol over VS Code message passing.
+
+**Proto files live in `proto/`** (e.g., `proto/cline/task.proto`, `proto/cline/ui.proto`)
+- Each feature domain has its own `.proto` file
+- For simple data, use shared types in `proto/cline/common.proto` (`StringRequest`, `Empty`, `Int64Request`)
+- For complex data, define custom messages in the feature's `.proto` file
+- Naming: Services `PascalCaseService`, RPCs `camelCase`, Messages `PascalCase`
+- For streaming responses, use `stream` keyword (see `subscribeToAuthCallback` in `account.proto`)
+
+**Run `npm run protos`** after any proto changes—generates types in:
+- `src/shared/proto/` - Shared type definitions
+- `src/generated/grpc-js/` - Service implementations
+- `src/generated/nice-grpc/` - Promise-based clients
+- `src/generated/hosts/` - Generated handlers
+
+**Adding new enum values** (like a new `ClineSay` type) requires updating conversion mappings in `src/shared/proto-conversions/cline-message.ts`
+
+**Adding new RPC methods** requires:
+- Handler in `src/core/controller/<domain>/`
+- Call from webview via generated client: `UiServiceClient.scrollToSettings(StringRequest.create({ value: "browser" }))`
+
+**Example—the `explain-changes` feature touched:**
+- `proto/cline/task.proto` - Added `ExplainChangesRequest` message and `explainChanges` RPC
+- `proto/cline/ui.proto` - Added `GENERATE_EXPLANATION = 29` to `ClineSay` enum
+- `src/shared/ExtensionMessage.ts` - Added `ClineSayGenerateExplanation` type
+- `src/shared/proto-conversions/cline-message.ts` - Added mapping for new say type
+- `src/core/controller/task/explainChanges.ts` - Handler implementation
+- `webview-ui/src/components/chat/ChatRow.tsx` - UI rendering
+
+## Adding Tools to System Prompt
+This is tricky—multiple prompt variants and configs. **Always search for existing similar tools first and follow their pattern.** Look at the full chain from prompt definition → variant configs → handler → UI before implementing.
+
+1. **Add to `ClineDefaultTool` enum** in `src/shared/tools.ts`
+2. **Tool definition** in `src/core/prompts/system-prompt/tools/` (create file like `generate_explanation.ts`)
+   - Define variants for each `ModelFamily` (generic, next-gen, xs, etc.)
+   - Export variants array (e.g., `export const my_tool_variants = [GENERIC, NATIVE_NEXT_GEN, XS]`)
+   - **Fallback behavior**: If a variant isn't defined for a model family, `ClineToolSet.getToolByNameWithFallback()` automatically falls back to GENERIC. So you only need to export `[GENERIC]` unless the tool needs model-specific behavior.
+3. **Register in `src/core/prompts/system-prompt/tools/init.ts`** - Import and spread into `allToolVariants`
+4. **Add to variant configs** - Each model family has its own config in `src/core/prompts/system-prompt/variants/*/config.ts`. Add your tool's enum to the `.tools()` list:
+   - `generic/config.ts`, `next-gen/config.ts`, `gpt-5/config.ts`, `native-gpt-5/config.ts`, `native-gpt-5-1/config.ts`, `native-next-gen/config.ts`, `gemini-3/config.ts`, `glm/config.ts`, `hermes/config.ts`, `xs/config.ts`
+   - **Important**: If you add to a variant's config, make sure the tool spec exports a variant for that ModelFamily (or relies on GENERIC fallback)
+5. **Create handler** in `src/core/task/tools/handlers/`
+6. **Wire up in `ToolExecutor.ts`** if needed for execution flow
+7. **Add to tool parsing** in `src/core/assistant-message/index.ts` if needed
+8. **If tool has UI feedback**: add `ClineSay` enum in proto, update `src/shared/ExtensionMessage.ts`, update `src/shared/proto-conversions/cline-message.ts`, update `webview-ui/src/components/chat/ChatRow.tsx`
+
+## Modifying System Prompt
+**Read these first:** `src/core/prompts/system-prompt/README.md`, `tools/README.md`, `__tests__/README.md`
+
+System prompt is modular: **components** (reusable sections) + **variants** (model-specific configs) + **templates** (with `{{PLACEHOLDER}}` resolution).
+
+**Key directories:**
+- `components/` - Shared sections: `rules.ts`, `capabilities.ts`, `editing_files.ts`, etc.
+- `variants/` - Model-specific: `generic/`, `next-gen/`, `xs/`, `gpt-5/`, `gemini-3/`, `hermes/`, `glm/`, etc.
+- `templates/` - Template engine and placeholder definitions
+
+**Variant tiers (ask user which to modify):**
+- **Next-gen** (Claude 4, GPT-5, Gemini 2.5): `next-gen/`, `native-next-gen/`, `native-gpt-5/`, `native-gpt-5-1/`, `gemini-3/`, `gpt-5/`
+- **Standard** (default fallback): `generic/`
+- **Local/small models**: `xs/`, `hermes/`, `glm/`
+
+**How overrides work:** Variants can override components via `componentOverrides` in their `config.ts`, or provide a custom template in `template.ts` (e.g., `next-gen/template.ts` exports `rules_template`). If no override, the shared component from `components/` is used.
+
+**Example: Adding a rule to RULES section**
+1. Check if variant overrides rules: look for `rules_template` in `variants/*/template.ts` or `componentOverrides.RULES` in `config.ts`
+2. If shared: modify `components/rules.ts`
+3. If overridden: modify that variant's template
+4. XS variant is special—has heavily condensed inline content in `template.ts`
+
+**After any changes, regenerate snapshots:**
+```bash
+UPDATE_SNAPSHOTS=true npm run test:unit
+```
+Snapshots live in `__tests__/__snapshots__/`. Tests validate across model families and context variations (browser, MCP, focus chain).
+
+## Modifying Default Slash Commands
+Three places need updates:
+- `src/core/slash-commands/index.ts` - Command definitions
+- `src/core/prompts/commands.ts` - System prompt integration
+- `webview-ui/src/utils/slash-commands.ts` - Webview autocomplete
+
+## ChatRow Cancelled/Interrupted States
+When a ChatRow displays a loading/in-progress state (spinner), you must handle what happens when the task is cancelled. This is non-obvious because cancellation doesn't update the message content—you have to infer it from context.
+
+**The pattern:**
+1. A message has a `status` field (e.g., `"generating"`, `"complete"`, `"error"`) stored in `message.text` as JSON
+2. When cancelled mid-operation, the status stays `"generating"` forever—no one updates it
+3. To detect cancellation, check TWO conditions:
+   - `!isLast` — if this message is no longer the last message, something else happened after it (interrupted)
+   - `lastModifiedMessage?.ask === "resume_task" || "resume_completed_task"` — task was just cancelled and is waiting to resume
+
+**Example from `generate_explanation`:**
+```tsx
+const wasCancelled =
+    explanationInfo.status === "generating" &&
+    (!isLast ||
+        lastModifiedMessage?.ask === "resume_task" ||
+        lastModifiedMessage?.ask === "resume_completed_task")
+const isGenerating = explanationInfo.status === "generating" && !wasCancelled
+```
+
+**Why both checks?**
+- `!isLast` catches: cancelled → resumed → did other stuff → this old message is stale
+- `lastModifiedMessage?.ask === "resume_task"` catches: just cancelled, hasn't resumed yet, this message is still technically "last"
+
+**See also:** `BrowserSessionRow.tsx` uses similar pattern with `isLastApiReqInterrupted` and `isLastMessageResume`.
+
+**Backend side:** When streaming is cancelled, clean up properly (close tabs, clear comments, etc.) by checking `taskState.abort` after the streaming function returns.

biome.jsonc

@@ -147,29 +147,6 @@
 				"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": [
-				"**",
-				"!**/webview-ui/**",
-				"!**/evals/**",
-				"!**/standalone/**",
-				"!**/e2e/**",
-				"!**/test/**",
-				"!**/__tests__/**",
-				"!**/*.test.ts",
-				"!**/*.stories.ts",
-				"!src/dev/**",
-				"!**/*.mjs",
-				"!**/*.js",
-				"!**/scripts/**",
-				"!**/*.tsx",
-				"!**/testing-platform/**"
-			]
-		},
 		{
 			"includes": [
 				"**",

cli/cmd/cline/main.go

@@ -10,12 +10,11 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/huh"
+	"github.com/charmbracelet/lipgloss"
 	"github.com/cline/cli/pkg/cli"
 	"github.com/cline/cli/pkg/cli/auth"
 	"github.com/cline/cli/pkg/cli/display"
 	"github.com/cline/cli/pkg/cli/global"
-	"github.com/cline/cli/pkg/cli/output"
-	"github.com/cline/cli/pkg/cli/slash"
 	"github.com/cline/cli/pkg/common"
 	"github.com/cline/grpc-go/cline"
 	"github.com/spf13/cobra"
@@ -38,9 +37,8 @@ var (
 
 func main() {
 	rootCmd := &cobra.Command{
-		Use:     "cline [prompt]",
-		Short:   "Cline CLI - AI-powered coding assistant",
-		Version: global.CliVersion,
+		Use:   "cline [prompt]",
+		Short: "Cline CLI - AI-powered coding assistant",
 		Long: `A command-line interface for interacting with Cline AI coding assistant.
 
 Start a new task by providing a prompt:
@@ -72,6 +70,8 @@ see the manual page: man cline`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
 
+			var instanceAddress string
+
 			// Validate workspace paths exist
 			if err := common.ValidateDirsExist(workspaces); err != nil {
 				return err
@@ -88,13 +88,13 @@ see the manual page: man cline`,
 				if global.Config.Verbose {
 					fmt.Println("Starting new Cline instance...")
 				}
-				instance, err := global.Instances.StartNewInstance(ctx, allWorkspaces...)
+				instance, err := global.Clients.StartNewInstance(ctx, allWorkspaces...)
 				if err != nil {
 					return fmt.Errorf("failed to start new instance: %w", err)
 				}
-				global.Config.CoreAddress = instance.CoreAddress
+				instanceAddress = instance.Address
 				if global.Config.Verbose {
-					fmt.Printf("Started instance at %s\n\n", global.Config.CoreAddress)
+					fmt.Printf("Started instance at %s\n\n", instanceAddress)
 				}
 
 				// Set up cleanup on exit
@@ -102,35 +102,38 @@ see the manual page: man cline`,
 					if global.Config.Verbose {
 						fmt.Println("\nCleaning up instance...")
 					}
-					registry := global.Instances.GetRegistry()
-					if err := global.KillInstanceByAddress(context.Background(), registry, global.Config.CoreAddress); err != nil {
+					registry := global.Clients.GetRegistry()
+					if err := global.KillInstanceByAddress(context.Background(), registry, instanceAddress); err != nil {
 						if global.Config.Verbose {
 							fmt.Printf("Warning: Failed to clean up instance: %v\n", err)
 						}
 					}
 				}()
-			}
 
-			// Check if user has credentials configured
-			if !isUserReadyToUse(ctx) {
-				// Create renderer for welcome messages
-				renderer := display.NewRenderer(global.Config.OutputFormat)
-				fmt.Printf("\n%s\n\n", renderer.Dim("Hey there! Looks like you're new here. Let's get you set up"))
+				// Check if user has credentials configured
+				if !isUserReadyToUse(ctx, instanceAddress) {
+					// Create renderer for welcome messages
+					renderer := display.NewRenderer(global.Config.OutputFormat)
+					fmt.Printf("\n%s\n\n", renderer.Dim("Hey there! Looks like you're new here. Let's get you set up"))
 
-				if err := auth.HandleAuthMenuNoArgs(ctx); err != nil {
-					// Check if user cancelled - exit cleanly
-					if err == huh.ErrUserAborted {
-						return nil
+					if err := auth.HandleAuthMenuNoArgs(ctx); err != nil {
+						// Check if user cancelled - exit cleanly
+						if err == huh.ErrUserAborted {
+							return nil
+						}
+						return fmt.Errorf("auth setup failed: %w", err)
 					}
-					return fmt.Errorf("auth setup failed: %w", err)
-				}
 
-				// Re-check after auth wizard
-				if !isUserReadyToUse(ctx) {
-					return fmt.Errorf("credentials still not configured - please run 'cline auth' to complete setup")
-				}
+					// Re-check after auth wizard
+					if !isUserReadyToUse(ctx, instanceAddress) {
+						return fmt.Errorf("credentials still not configured - please run 'cline auth' to complete setup")
+					}
 
-				fmt.Printf("\n%s\n\n", renderer.Dim("✓ Setup complete, you can now use the Cline CLI"))
+					fmt.Printf("\n%s\n\n", renderer.Dim("✓ Setup complete, you can now use the Cline CLI"))
+				}
+			} else {
+				// User specified --address flag, use that
+				instanceAddress = coreAddress
 			}
 
 			// Get content from both args and stdin
@@ -139,13 +142,10 @@ see the manual page: man cline`,
 				return fmt.Errorf("failed to read prompt: %w", err)
 			}
 
-			// If no prompt (or just a mode switch with no message), show interactive input
-			// Loop to allow mode switches without a message
-			bannerShown := false
-			for prompt == "" {
+			// If no prompt from args or stdin, show interactive input
+			if prompt == "" {
 				// Pass the mode flag and workspaces to banner so it shows correct info
-				prompt, err = promptForInitialTask(ctx, mode, allWorkspaces, !bannerShown)
-				bannerShown = true
+				prompt, err = promptForInitialTask(ctx, instanceAddress, mode, allWorkspaces)
 				if err != nil {
 					// Check if user cancelled - exit cleanly without error
 					if err == huh.ErrUserAborted {
@@ -153,23 +153,6 @@ see the manual page: man cline`,
 					}
 					return err
 				}
-
-				// Check if user entered a mode switch command
-				if newMode, remaining, isModeSwitch := slash.ParseModeSwitch(prompt); isModeSwitch {
-					mode = newMode
-					prompt = remaining
-					// If just a mode switch with no message, continue loop to re-prompt
-					if prompt == "" {
-						renderer := display.NewRenderer(global.Config.OutputFormat)
-						if mode == "act" {
-							fmt.Printf("\n%s\n\n", renderer.Success("Switched to act mode"))
-						} else {
-							fmt.Printf("\n%s\n\n", renderer.Success("Switched to plan mode"))
-						}
-						continue
-					}
-				}
-
 				if prompt == "" {
 					return fmt.Errorf("prompt required")
 				}
@@ -187,15 +170,13 @@ see the manual page: man cline`,
 				Mode:       mode,
 				Settings:   settings,
 				Yolo:       yolo,
-				Address:    global.Config.CoreAddress,
+				Address:    instanceAddress,
 				Verbose:    verbose,
 				Workspaces: allWorkspaces,
 			})
 		},
 	}
 
-	rootCmd.SetVersionTemplate(cli.VersionString())
-
 	rootCmd.PersistentFlags().StringVar(&coreAddress, "address", fmt.Sprintf("localhost:%d", common.DEFAULT_CLINE_CORE_PORT), "Cline Core gRPC address")
 	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output")
 	rootCmd.PersistentFlags().StringVarP(&outputFormat, "output-format", "F", "rich", "output format (rich|json|plain)")
@@ -223,30 +204,51 @@ see the manual page: man cline`,
 	}
 }
 
-func promptForInitialTask(ctx context.Context, modeFlag string, workspaces []string, showBanner bool) (string, error) {
-	// Show session banner before the initial input (only on first prompt)
-	if showBanner {
-		showSessionBanner(ctx, modeFlag, workspaces)
+func promptForInitialTask(ctx context.Context, instanceAddress, modeFlag string, workspaces []string) (string, error) {
+	// Show session banner before the initial input
+	showSessionBanner(ctx, instanceAddress, modeFlag, workspaces)
+
+	var prompt string
+
+	// Create custom theme with mode-colored cursor and title
+	theme := huh.ThemeCharm()
+
+	// Set cursor and title color based on mode
+	modeColor := lipgloss.Color("3") // Yellow for plan
+	if modeFlag == "act" {
+		modeColor = lipgloss.Color("39") // Blue for act
 	}
 
-	prompt, err := output.PromptForInitialTask(
-		"Start a new Cline task",
-		"/plan or /act to switch modes\ntab to autocomplete commands\nctrl+e to open editor\nctrl+c to exit",
-		modeFlag,
-		slash.NewRegistry(ctx),
-	)
+	theme.Focused.TextInput.Cursor = theme.Focused.TextInput.Cursor.Foreground(modeColor)
+	theme.Focused.Title = theme.Focused.Title.Foreground(modeColor)
+
+	form := huh.NewForm(
+		huh.NewGroup(
+			huh.NewText().
+				Title("Start a new Cline task").
+				Description("What would you like Cline to help you with?").
+				Placeholder("e.g., Create a REST API with authentication...").
+				Lines(5).
+				Value(&prompt),
+		),
+	).WithWidth(48).WithTheme(theme)
+
+	err := form.Run()
 	if err != nil {
-		if err == output.ErrUserAborted {
+		// Check if user cancelled with Control-C
+		if err == huh.ErrUserAborted {
+			// Return a special error that indicates clean cancellation
+			// This allows deferred cleanup to run
 			return "", huh.ErrUserAborted
 		}
 		return "", err
 	}
 
-	return prompt, nil
+	return strings.TrimSpace(prompt), nil
 }
 
 // showSessionBanner displays session info before initial prompt
-func showSessionBanner(ctx context.Context, modeFlag string, workspaces []string) {
+func showSessionBanner(ctx context.Context, instanceAddress, modeFlag string, workspaces []string) {
 	bannerInfo := display.BannerInfo{
 		Version: global.CliVersion,
 		Mode:    modeFlag, // Use the mode from command flag, not state
@@ -260,18 +262,21 @@ func showSessionBanner(ctx context.Context, modeFlag string, workspaces []string
 	bannerInfo.Workdirs = workspaces
 
 	// Get provider/model using auth functions (same logic as auth menu)
-	if providerList, err := auth.GetProviderConfigurations(ctx); err == nil {
-		// Show provider/model for the mode we'll be using
-		var providerDisplay *auth.ProviderDisplay
-		if bannerInfo.Mode == "plan" && providerList.PlanProvider != nil {
-			providerDisplay = providerList.PlanProvider
-		} else if bannerInfo.Mode == "act" && providerList.ActProvider != nil {
-			providerDisplay = providerList.ActProvider
-		}
+	manager, err := cli.NewTaskManagerForAddress(ctx, instanceAddress)
+	if err == nil {
+		if providerList, err := auth.GetProviderConfigurations(ctx, manager); err == nil {
+			// Show provider/model for the mode we'll be using
+			var providerDisplay *auth.ProviderDisplay
+			if bannerInfo.Mode == "plan" && providerList.PlanProvider != nil {
+				providerDisplay = providerList.PlanProvider
+			} else if bannerInfo.Mode == "act" && providerList.ActProvider != nil {
+				providerDisplay = providerList.ActProvider
+			}
 
-		if providerDisplay != nil {
-			bannerInfo.Provider = auth.GetProviderIDForEnum(providerDisplay.Provider)
-			bannerInfo.ModelID = providerDisplay.ModelID
+			if providerDisplay != nil {
+				bannerInfo.Provider = auth.GetProviderIDForEnum(providerDisplay.Provider)
+				bannerInfo.ModelID = providerDisplay.ModelID
+			}
 		}
 	}
 
@@ -284,22 +289,25 @@ func showSessionBanner(ctx context.Context, modeFlag string, workspaces []string
 // isUserReadyToUse checks if the user has completed initial setup
 // Returns true if welcomeViewCompleted flag is set OR user is authenticated
 // Matches extension logic: welcomeViewCompleted = Boolean(globalState.welcomeViewCompleted || user?.uid)
-func isUserReadyToUse(ctx context.Context) bool {
-	grpcClient, err := global.GetClientForAddress(ctx, global.Config.CoreAddress)
+func isUserReadyToUse(ctx context.Context, instanceAddress string) bool {
+	manager, err := cli.NewTaskManagerForAddress(ctx, instanceAddress)
 	if err != nil {
 		return false
 	}
 
-	state, err := grpcClient.State.GetLatestState(ctx, &cline.EmptyRequest{})
+	// Get state
+	state, err := manager.GetClient().State.GetLatestState(ctx, &cline.EmptyRequest{})
 	if err != nil {
 		return false
 	}
 
+	// Parse state JSON
 	stateMap := make(map[string]interface{})
 	if err := json.Unmarshal([]byte(state.StateJson), &stateMap); err != nil {
 		return false
 	}
 
+	// Check 1: welcomeViewCompleted flag
 	if welcomeCompleted, ok := stateMap["welcomeViewCompleted"].(bool); ok && welcomeCompleted {
 		return true
 	}

cli/e2e/default_update_test.go

@@ -23,7 +23,7 @@ func TestMultiInstanceDefaultUnchanged(t *testing.T) {
 	if len(out1.CoreInstances) != 1 {
 		t.Fatalf("expected 1 instance, got %d", len(out1.CoreInstances))
 	}
-	firstAddr := out1.CoreInstances[0].CoreAddress
+	firstAddr := out1.CoreInstances[0].Address
 	waitForAddressHealthy(t, firstAddr, defaultTimeout)
 
 	// Start second instance
@@ -56,29 +56,29 @@ func TestDefaultJsonUpdateAfterRemoval(t *testing.T) {
 
 	// Choose second as new default
 	target := out.CoreInstances[1]
-	waitForAddressHealthy(t, target.CoreAddress, defaultTimeout)
+	waitForAddressHealthy(t, target.Address, defaultTimeout)
 
 	// Set as default
-	_ = mustRunCLI(ctx, t, "instance", "use", target.CoreAddress)
+	_ = mustRunCLI(ctx, t, "instance", "use", target.Address)
 
 	// Verify default switched
 	out = listInstancesJSON(ctx, t)
-	if out.DefaultInstance != target.CoreAddress {
-		t.Fatalf("default_instance not updated to %s (got %s)", target.CoreAddress, out.DefaultInstance)
+	if out.DefaultInstance != target.Address {
+		t.Fatalf("default_instance not updated to %s (got %s)", target.Address, out.DefaultInstance)
 	}
 
 	// Kill the default instance using runtime PID discovery
-	corePID := getCorePID(t, target.CoreAddress)
+	corePID := getCorePID(t, target.Address)
 	if corePID <= 0 {
-		t.Fatalf("could not find PID for core process at %s", target.CoreAddress)
+		t.Fatalf("could not find PID for core process at %s", target.Address)
 	}
-	t.Logf("Killing cline-core process PID %d for instance %s", corePID, target.CoreAddress)
+	t.Logf("Killing cline-core process PID %d for instance %s", corePID, target.Address)
 	if err := syscall.Kill(corePID, syscall.SIGKILL); err != nil {
 		t.Fatalf("kill pid %d: %v", corePID, err)
 	}
 
 	// Wait for removal
-	waitForAddressRemoved(t, target.CoreAddress, longTimeout)
+	waitForAddressRemoved(t, target.Address, longTimeout)
 
 	// Clean up dangling host process (SIGKILL leaves these behind by design)
 	t.Logf("Cleaning up dangling host process on port %d", target.HostPort())
@@ -91,7 +91,7 @@ func TestDefaultJsonUpdateAfterRemoval(t *testing.T) {
 	if len(out.CoreInstances) > 0 {
 		found := false
 		for _, it := range out.CoreInstances {
-			if out.DefaultInstance == it.CoreAddress {
+			if out.DefaultInstance == it.Address {
 				found = true
 				break
 			}

cli/e2e/helpers_test.go

@@ -117,7 +117,7 @@ func listInstancesJSON(ctx context.Context, t *testing.T) common.InstancesOutput
 
 func hasAddress(in common.InstancesOutput, addr string) bool {
 	for _, it := range in.CoreInstances {
-		if it.CoreAddress == addr {
+		if it.Address == addr {
 			return true
 		}
 	}
@@ -126,7 +126,7 @@ func hasAddress(in common.InstancesOutput, addr string) bool {
 
 func getByAddress(in common.InstancesOutput, addr string) (common.CoreInstanceInfo, bool) {
 	for _, it := range in.CoreInstances {
-		if it.CoreAddress == addr {
+		if it.Address == addr {
 			return it, true
 		}
 	}
@@ -313,7 +313,7 @@ func getCorePIDViaRPC(t *testing.T, address string) int {
 	defer cancel()
 
 	// Get client for the address
-	client, err := global.Instances.GetRegistry().GetClient(ctx, address)
+	client, err := global.Clients.GetRegistry().GetClient(ctx, address)
 	if err != nil {
 		t.Logf("Warning: failed to get client for %s, falling back to lsof: %v", address, err)
 		return getCorePIDViaLsof(t, address)

cli/e2e/mixed_stress_test.go

@@ -26,7 +26,7 @@ func TestMixedLocalhostVs127Coexist(t *testing.T) {
 		t.Fatalf("expected at least 1 instance")
 	}
 	inst := out.CoreInstances[0]
-	waitForAddressHealthy(t, inst.CoreAddress, defaultTimeout)
+	waitForAddressHealthy(t, inst.Address, defaultTimeout)
 
 	// Manually add a SQLite entry for the same port but 127.0.0.1 host
 	addr127 := fmt.Sprintf("127.0.0.1:%d", inst.CorePort())
@@ -37,12 +37,12 @@ func TestMixedLocalhostVs127Coexist(t *testing.T) {
 	}
 
 	// Verify both addresses appear and are healthy
-	waitForAddressHealthy(t, inst.CoreAddress, defaultTimeout)
+	waitForAddressHealthy(t, inst.Address, defaultTimeout)
 	waitForAddressHealthy(t, addr127, defaultTimeout)
 
 	out = listInstancesJSON(ctx, t)
-	if !hasAddress(out, inst.CoreAddress) || !hasAddress(out, addr127) {
-		t.Fatalf("expected both %s and %s present", inst.CoreAddress, addr127)
+	if !hasAddress(out, inst.Address) || !hasAddress(out, addr127) {
+		t.Fatalf("expected both %s and %s present", inst.Address, addr127)
 	}
 }
 
@@ -58,7 +58,7 @@ func TestStartStopStress(t *testing.T) {
 		before := listInstancesJSON(ctx, t)
 		beforeSet := map[string]struct{}{}
 		for _, it := range before.CoreInstances {
-			beforeSet[it.CoreAddress] = struct{}{}
+			beforeSet[it.Address] = struct{}{}
 		}
 
 		// Start a new instance
@@ -69,8 +69,8 @@ func TestStartStopStress(t *testing.T) {
 		waitFor(t, defaultTimeout, func() (bool, string) {
 			after := listInstancesJSON(ctx, t)
 			for _, it := range after.CoreInstances {
-				if _, ok := beforeSet[it.CoreAddress]; !ok {
-					newAddr = it.CoreAddress
+				if _, ok := beforeSet[it.Address]; !ok {
+					newAddr = it.Address
 					return true, ""
 				}
 			}
@@ -88,12 +88,12 @@ func TestStartStopStress(t *testing.T) {
 		}
 
 		// Get PID using runtime discovery
-		corePID := getCorePID(t, info.CoreAddress)
+		corePID := getCorePID(t, info.Address)
 		if corePID <= 0 {
-			t.Fatalf("could not find PID for new instance at %s", info.CoreAddress)
+			t.Fatalf("could not find PID for new instance at %s", info.Address)
 		}
 
-		t.Logf("Killing new instance %s (PID %d) for iteration %d", info.CoreAddress, corePID, i)
+		t.Logf("Killing new instance %s (PID %d) for iteration %d", info.Address, corePID, i)
 		if err := syscall.Kill(corePID, syscall.SIGKILL); err != nil {
 			t.Fatalf("kill pid %d: %v", corePID, err)
 		}

cli/e2e/sqlite_helper.go

@@ -55,7 +55,7 @@ func readInstancesFromSQLite(t *testing.T, clineDir string) []common.CoreInstanc
 
 		// Create InstanceInfo
 		info := common.CoreInstanceInfo{
-			CoreAddress:        heldBy,
+			Address:            heldBy,
 			HostServiceAddress: lockTarget,
 			Status:             grpc_health_v1.HealthCheckResponse_UNKNOWN, // Will be updated by health check
 			LastSeen:           time.Unix(lockedAt/1000, 0),                // Convert from milliseconds

cli/e2e/start_list_test.go

@@ -29,7 +29,7 @@ func TestStartAndList(t *testing.T) {
 		t.Fatalf("expected 1 instance, got %d", len(out.CoreInstances))
 	}
 
-	addr := out.CoreInstances[0].CoreAddress
+	addr := out.CoreInstances[0].Address
 	t.Logf("Instance address: %s, status: %s", addr, out.CoreInstances[0].Status)
 
 	t.Logf("Waiting for address %s to become healthy...", addr)
@@ -44,8 +44,8 @@ func TestStartAndList(t *testing.T) {
 	if out.DefaultInstance == "" {
 		t.Fatalf("default_instance not set")
 	}
-	if out.DefaultInstance != out.CoreInstances[0].CoreAddress {
-		t.Fatalf("expected default_instance=%s, got %s", out.CoreInstances[0].CoreAddress, out.DefaultInstance)
+	if out.DefaultInstance != out.CoreInstances[0].Address {
+		t.Fatalf("expected default_instance=%s, got %s", out.CoreInstances[0].Address, out.DefaultInstance)
 	}
 
 	t.Logf("TestStartAndList completed successfully")
@@ -64,7 +64,7 @@ func TestTaskNewDefault(t *testing.T) {
 	if len(out.CoreInstances) != 1 {
 		t.Fatalf("expected 1 instance, got %d", len(out.CoreInstances))
 	}
-	addr := out.CoreInstances[0].CoreAddress
+	addr := out.CoreInstances[0].Address
 	waitForAddressHealthy(t, addr, defaultTimeout)
 
 	// Create a new task at default (success is sufficient)
@@ -108,21 +108,21 @@ func TestCrashCleanup(t *testing.T) {
 
 	// Test 1: Graceful shutdown (SIGTERM) - should clean up both processes
 	gracefulTarget := out.CoreInstances[0]
-	waitForAddressHealthy(t, gracefulTarget.CoreAddress, defaultTimeout)
+	waitForAddressHealthy(t, gracefulTarget.Address, defaultTimeout)
 
 	// Get PID using runtime discovery
-	gracefulPID := getCorePID(t, gracefulTarget.CoreAddress)
+	gracefulPID := getCorePID(t, gracefulTarget.Address)
 	if gracefulPID <= 0 {
-		t.Fatalf("could not find PID for graceful target at %s", gracefulTarget.CoreAddress)
+		t.Fatalf("could not find PID for graceful target at %s", gracefulTarget.Address)
 	}
 
-	t.Logf("Testing graceful shutdown (SIGTERM) for instance %s (PID %d)", gracefulTarget.CoreAddress, gracefulPID)
+	t.Logf("Testing graceful shutdown (SIGTERM) for instance %s (PID %d)", gracefulTarget.Address, gracefulPID)
 	if err := syscall.Kill(gracefulPID, syscall.SIGTERM); err != nil {
 		t.Fatalf("kill SIGTERM pid %d: %v", gracefulPID, err)
 	}
 
 	// Wait for registry cleanup
-	waitForAddressRemoved(t, gracefulTarget.CoreAddress, longTimeout)
+	waitForAddressRemoved(t, gracefulTarget.Address, longTimeout)
 
 	// Verify both core and host ports are freed (no dangling processes)
 	waitForPortsClosed(t, gracefulTarget.CorePort(), gracefulTarget.HostPort(), defaultTimeout)
@@ -132,21 +132,21 @@ func TestCrashCleanup(t *testing.T) {
 
 	// Test 2: Crash cleanup (SIGKILL) - creates dangling host process that we must clean up
 	crashTarget := out.CoreInstances[1]
-	waitForAddressHealthy(t, crashTarget.CoreAddress, defaultTimeout)
+	waitForAddressHealthy(t, crashTarget.Address, defaultTimeout)
 
 	// Get PID using runtime discovery
-	crashPID := getCorePID(t, crashTarget.CoreAddress)
+	crashPID := getCorePID(t, crashTarget.Address)
 	if crashPID <= 0 {
-		t.Fatalf("could not find PID for crash target at %s", crashTarget.CoreAddress)
+		t.Fatalf("could not find PID for crash target at %s", crashTarget.Address)
 	}
 
-	t.Logf("Testing crash cleanup (SIGKILL) for instance %s (PID %d)", crashTarget.CoreAddress, crashPID)
+	t.Logf("Testing crash cleanup (SIGKILL) for instance %s (PID %d)", crashTarget.Address, crashPID)
 	if err := syscall.Kill(crashPID, syscall.SIGKILL); err != nil {
 		t.Fatalf("kill SIGKILL pid %d: %v", crashPID, err)
 	}
 
 	// Wait for registry cleanup
-	waitForAddressRemoved(t, crashTarget.CoreAddress, longTimeout)
+	waitForAddressRemoved(t, crashTarget.Address, longTimeout)
 
 	// Verify the instance is removed from SQLite (no file to check anymore)
 	// The waitForAddressRemoved already confirms the instance is gone from the registry

cli/man/cline.1

@@ -298,64 +298,6 @@ cline task view
 \f[I]# Start interactive chat with this task\f[R]
 cline task chat
 .EE
-.SH ENVIRONMENT
-.TP
-\f[B]CLINE_COMMAND_PERMISSIONS\f[R]
-JSON configuration for restricting which shell commands Cline can
-execute.
-When set, commands are validated against allow/deny patterns before
-execution.
-When not set, all commands are allowed (backward compatibility).
-.RS
-.PP
-Format:
-\f[CR]{"allow": ["pattern1", "pattern2"], "deny": ["pattern3"], "allowRedirects": true}\f[R]
-.PP
-\f[B]Fields:\f[R]
-.IP \(bu 2
-\f[B]allow\f[R] (array of strings): Glob patterns for allowed commands.
-If specified, only matching commands are permitted.
-Uses \f[CR]*\f[R] to match any characters and \f[CR]?\f[R] to match a
-single character.
-.IP \(bu 2
-\f[B]deny\f[R] (array of strings): Glob patterns for denied commands.
-Deny rules take precedence over allow rules.
-.IP \(bu 2
-\f[B]allowRedirects\f[R] (boolean): Whether to allow shell redirects
-(\f[CR]>\f[R], \f[CR]>>\f[R], \f[CR]<\f[R], etc.).
-Defaults to false.
-.PP
-\f[B]Rule evaluation:\f[R]
-.IP "1." 3
-Check for dangerous characters (backticks outside single quotes,
-unquoted newlines)
-.IP "2." 3
-Parse command into segments split by operators (\f[CR]&&\f[R],
-\f[CR]||\f[R], \f[CR]|\f[R], \f[CR];\f[R])
-.IP "3." 3
-If redirects detected and \f[CR]allowRedirects\f[R] is not true, command
-is denied
-.IP "4." 3
-Each segment is validated against deny rules first, then allow rules
-.IP "5." 3
-Subshell contents (\f[CR]$(...)\f[R] and \f[CR](...)\f[R]) are
-recursively validated
-.IP "6." 3
-All segments must pass for the command to be allowed
-.PP
-\f[B]Examples:\f[R]
-.IP
-.EX
-\f[I]# Allow only npm and git commands\f[R]
-export CLINE_COMMAND_PERMISSIONS=\(aq{"allow": ["npm *", "git *"]}\(aq
-
-\f[I]# Allow development commands but deny dangerous ones\f[R]
-export CLINE_COMMAND_PERMISSIONS=\(aq{"allow": ["npm *", "git *", "node *"], "deny": ["rm \-rf *", "sudo *"]}\(aq
-
-\f[I]# Allow file operations with redirects\f[R]
-export CLINE_COMMAND_PERMISSIONS=\(aq{"allow": ["cat *", "echo *"], "allowRedirects": true}\(aq
-.EE
-.RE
 .SH ARCHITECTURE
 Cline operates on a three\-layer architecture:
 .TP

cli/man/cline.1.md

@@ -323,42 +323,6 @@ cline task view
 cline task chat
 ```
 
-# ENVIRONMENT
-
-**CLINE_COMMAND_PERMISSIONS**
-
-:   JSON configuration for restricting which shell commands Cline can execute. When set, commands are validated against allow/deny patterns before execution. When not set, all commands are allowed.
-
-    Format: `{"allow": ["pattern1", "pattern2"], "deny": ["pattern3"], "allowRedirects": true}`
-
-    **Fields:**
-
-    - **allow** (array of strings): Glob patterns for allowed commands. If specified, only matching commands are permitted. Uses `*` to match any characters and `?` to match a single character. Setting allow on anything will deny all others.
-    - **deny** (array of strings): Glob patterns for denied commands. Deny rules take precedence over allow rules.
-    - **allowRedirects** (boolean): Whether to allow shell redirects (`>`, `>>`, `<`, etc.). Defaults to false.
-
-    **Rule evaluation:**
-
-    1. Check for dangerous characters (backticks outside single quotes, unquoted newlines)
-    2. Parse command into segments split by operators (`&&`, `||`, `|`, `;`)
-    3. If redirects detected and `allowRedirects` is not true, command is denied
-    4. Each segment is validated against deny rules first, then allow rules
-    5. Subshell contents (`$(...)` and `(...)`) are recursively validated
-    6. All segments must pass for the command to be allowed
-
-    **Examples:**
-
-    ```bash
-    # Allow only npm and git commands.
-    export CLINE_COMMAND_PERMISSIONS='{"allow": ["npm *", "git *"]}'
-
-    # Allow development commands but deny dangerous ones. Deny not strictly required here since allow is set.
-    export CLINE_COMMAND_PERMISSIONS='{"allow": ["npm *", "git *", "node *"], "deny": ["rm -rf *", "sudo *"]}'
-
-    # Allow file operations with redirects
-    export CLINE_COMMAND_PERMISSIONS='{"allow": ["cat *", "echo *"], "allowRedirects": true}'
-    ```
-
 # ARCHITECTURE
 
 Cline operates on a three-layer architecture:

cli/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cline",
-	"version": "1.0.10",
+	"version": "1.0.3",
 	"description": "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
 	"main": "cline-core.js",
 	"bin": {

cli/pkg/cli/auth/auth_menu.go

@@ -46,21 +46,21 @@ const (
 // It spawns a fresh instance for auth operations and cleans it up when done
 func RunAuthFlow(ctx context.Context, args []string) error {
 	// Spawn a fresh instance for auth operations
-	instanceInfo, err := global.Instances.StartNewInstance(ctx)
+	instanceInfo, err := global.Clients.StartNewInstance(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to start auth instance: %w", err)
 	}
 
 	// Cleanup when done (success, error, or panic)
 	defer func() {
-		verboseLog("Shutting down auth instance at %s", instanceInfo.CoreAddress)
-		if err := global.KillInstanceByAddress(context.Background(), global.Instances.GetRegistry(), instanceInfo.CoreAddress); err != nil {
+		verboseLog("Shutting down auth instance at %s", instanceInfo.Address)
+		if err := global.KillInstanceByAddress(context.Background(), global.Clients.GetRegistry(), instanceInfo.Address); err != nil {
 			verboseLog("Warning: Failed to kill auth instance: %v", err)
 		}
 	}()
 
 	// Store instance address in context for all auth handlers to use
-	authCtx := context.WithValue(ctx, authInstanceAddressKey, instanceInfo.CoreAddress)
+	authCtx := context.WithValue(ctx, authInstanceAddressKey, instanceInfo.Address)
 
 	// Route to existing auth flow
 	return HandleAuthCommand(authCtx, args)
@@ -108,10 +108,12 @@ func HandleAuthMenuNoArgs(ctx context.Context) error {
 	// Get current provider config for display
 	var currentProvider string
 	var currentModel string
-	if providerList, err := GetProviderConfigurations(ctx); err == nil {
-		if providerList.ActProvider != nil {
-			currentProvider = GetProviderDisplayName(providerList.ActProvider.Provider)
-			currentModel = providerList.ActProvider.ModelID
+	if manager, err := createTaskManager(ctx); err == nil {
+		if providerList, err := GetProviderConfigurations(ctx, manager); err == nil {
+			if providerList.ActProvider != nil {
+				currentProvider = GetProviderDisplayName(providerList.ActProvider.Provider)
+				currentModel = providerList.ActProvider.ModelID
+			}
 		}
 	}
 

cli/pkg/cli/auth/providers_list.go

@@ -29,17 +29,13 @@ type ProviderListResult struct {
 }
 
 // GetProviderConfigurations retrieves and parses provider configurations from Cline Core state
-func GetProviderConfigurations(ctx context.Context) (*ProviderListResult, error) {
+func GetProviderConfigurations(ctx context.Context, manager *task.Manager) (*ProviderListResult, error) {
 	if global.Config.Verbose {
 		fmt.Println("[DEBUG] Retrieving provider configurations from Cline Core")
 	}
 
 	// Get latest state from Cline Core
-	grpcClient, err := global.GetDefaultClient(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get provider configs due to unable to get gRPC client: %w", err)
-	}
-	state, err := grpcClient.State.GetLatestState(ctx, &cline.EmptyRequest{})
+	state, err := manager.GetClient().State.GetLatestState(ctx, &cline.EmptyRequest{})
 	if err != nil {
 		return nil, fmt.Errorf("failed to get state: %w", err)
 	}

cli/pkg/cli/auth/update_api_configurations.go

@@ -358,9 +358,6 @@ func AddProviderPartial(ctx context.Context, manager *task.Manager, provider cli
 		if openRouterInfo, ok := modelInfo.(*cline.OpenRouterModelInfo); ok {
 			apiConfig.PlanModeOpenRouterModelInfo = openRouterInfo
 			apiConfig.ActModeOpenRouterModelInfo = openRouterInfo
-		} else if ocaInfo, ok := modelInfo.(*cline.OcaModelInfo); ok {
-			apiConfig.PlanModeOcaModelInfo = ocaInfo
-			apiConfig.ActModeOcaModelInfo = ocaInfo
 		}
 	}
 
@@ -429,9 +426,6 @@ func UpdateProviderPartial(ctx context.Context, manager *task.Manager, provider
 		if openRouterInfo, ok := updates.ModelInfo.(*cline.OpenRouterModelInfo); ok {
 			apiConfig.PlanModeOpenRouterModelInfo = openRouterInfo
 			apiConfig.ActModeOpenRouterModelInfo = openRouterInfo
-		} else if ocaInfo, ok := updates.ModelInfo.(*cline.OcaModelInfo); ok {
-			apiConfig.PlanModeOcaModelInfo = ocaInfo
-			apiConfig.ActModeOcaModelInfo = ocaInfo
 		}
 	}
 

cli/pkg/cli/auth/wizard_byo.go

@@ -190,7 +190,7 @@ func (pw *ProviderWizard) handleAddOcaProvider() error {
 	}
 
 	// Step 3: Select model
-	modelID, modelInfo, err := pw.selectModel(cline.ApiProvider_OCA, "")
+	modelID, _, err := pw.selectModel(cline.ApiProvider_OCA, "")
 	if err != nil {
 		return fmt.Errorf("model selection failed: %w", err)
 	}
@@ -198,7 +198,7 @@ func (pw *ProviderWizard) handleAddOcaProvider() error {
 	// Step 4: Apply the OCA model configuration and set as active
 	updates := ProviderUpdatesPartial{
 		ModelID:   &modelID,
-		ModelInfo: modelInfo,
+		ModelInfo: nil,
 	}
 
 	if err := UpdateProviderPartial(pw.ctx, pw.manager, cline.ApiProvider_OCA, updates, true); err != nil {
@@ -215,7 +215,7 @@ func (pw *ProviderWizard) handleAddOcaProvider() error {
 
 // handleListProviders retrieves and displays configured providers
 func (pw *ProviderWizard) handleListProviders() error {
-	result, err := GetProviderConfigurations(pw.ctx)
+	result, err := GetProviderConfigurations(pw.ctx, pw.manager)
 	if err != nil {
 		return fmt.Errorf("failed to retrieve provider configurations: %w", err)
 	}
@@ -413,7 +413,7 @@ func (pw *ProviderWizard) manualModelEntry(provider cline.ApiProvider) (string,
 // handleChangeModel allows changing the model for any configured provider
 func (pw *ProviderWizard) handleChangeModel() error {
 	// Step 1: Get current provider configurations
-	result, err := GetProviderConfigurations(pw.ctx)
+	result, err := GetProviderConfigurations(pw.ctx, pw.manager)
 	if err != nil {
 		return fmt.Errorf("failed to retrieve provider configurations: %w", err)
 	}
@@ -585,11 +585,11 @@ func getProviderModelIDFromState(stateData map[string]interface{}, provider clin
 	return ""
 }
 
-// getProviderAPIKeyFromState retrieves the API key for a specific provider from state
+ // getProviderAPIKeyFromState retrieves the API key for a specific provider from state
 func getProviderAPIKeyFromState(stateData map[string]interface{}, provider cline.ApiProvider) string {
 	// OCA uses account authentication, not API keys. Consider it "present" if authenticated.
 	if provider == cline.ApiProvider_OCA {
-		if state, _ := GetLatestOCAState(context.TODO(), 2*time.Second); state != nil && state.User != nil {
+		if state, _ := GetLatestOCAState(context.TODO(), 2 * time.Second); state != nil && state.User != nil {
 			// Return a sentinel non-empty string so upstream checks pass.
 			return "OCA_AUTH_VERIFIED"
 		}
@@ -648,7 +648,7 @@ func convertMapToOpenRouterModelInfo(data map[string]interface{}) *cline.OpenRou
 // handleRemoveProvider allows removing a configured provider by clearing its API key
 func (pw *ProviderWizard) handleRemoveProvider() error {
 	// Step 1: Get current provider configurations
-	result, err := GetProviderConfigurations(pw.ctx)
+	result, err := GetProviderConfigurations(pw.ctx, pw.manager)
 	if err != nil {
 		return fmt.Errorf("failed to retrieve provider configurations: %w", err)
 	}
@@ -748,6 +748,7 @@ func (pw *ProviderWizard) clearProviderAPIKey(provider cline.ApiProvider) error
 	return RemoveProviderPartial(pw.ctx, pw.manager, provider)
 }
 
+
 func signOutOca(ctx context.Context) error {
 	client, err := global.GetDefaultClient(ctx)
 	if err != nil {

cli/pkg/cli/config.go

@@ -40,7 +40,7 @@ func ensureConfigManager(ctx context.Context, address string) error {
 		}
 
 		// Always set the instance we're using as the default
-		registry := global.Instances.GetRegistry()
+		registry := global.Clients.GetRegistry()
 		if err := registry.SetDefaultInstance(instanceAddress); err != nil {
 			// Log warning but don't fail - this is not critical
 			fmt.Printf("Warning: failed to set default instance: %v\n", err)
@@ -123,11 +123,11 @@ func setCommand() *cobra.Command {
 		Use:     "set <key=value> [key=value...]",
 		Aliases: []string{"s"},
 		Short:   "Set configuration variables",
-		Long: `Set one or more global configuration variables using key=value format.
+		Long:    `Set one or more global configuration variables using key=value format.
 		
 This command merges the provided settings with existing values, preserving
 unspecified fields. Only the fields you explicitly set will be updated.`,
-		Args: cobra.MinimumNArgs(1),
+		Args:    cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
 

cli/pkg/cli/config/manager.go

@@ -32,8 +32,8 @@ func NewManager(ctx context.Context, address string) (*Manager, error) {
 
 	// Get the actual address being used
 	clientAddress := address
-	if address == "" && global.Instances != nil {
-		clientAddress = global.Instances.GetRegistry().GetDefaultInstance()
+	if address == "" && global.Clients != nil {
+		clientAddress = global.Clients.GetRegistry().GetDefaultInstance()
 	}
 
 	return &Manager{
@@ -110,6 +110,7 @@ func (m *Manager) ListSettings(ctx context.Context) error {
 		"dictationSettings",
 		"autoCondenseThreshold",
 		"autoApprovalSettings",
+		"hooksEnabled",
 	}
 
 	// Render each field using the renderer

cli/pkg/cli/config/settings_renderer.go

@@ -79,7 +79,7 @@ func RenderField(key string, value interface{}, censor bool) error {
 		"planActSeparateModelsSetting", "enableCheckpointsSetting",
 		"terminalReuseEnabled", "mcpResponsesCollapsed", "strictPlanModeEnabled",
 		"useAutoCondense", "yoloModeToggled", "shellIntegrationTimeout",
-		"terminalOutputLineLimit", "autoCondenseThreshold":
+		"terminalOutputLineLimit", "autoCondenseThreshold", "hooksEnabled":
 		fmt.Printf("%s: %s\n", camelToKebab(key), formatValue(value, key, censor))
 		return nil
 

cli/pkg/cli/display/hook_renderer.go

@@ -1,144 +0,0 @@
-package display
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/cline/cli/pkg/cli/types"
-)
-
-// HookRenderer renders hook status messages in a CLI-native style.
-//
-// Goals:
-// - Match ToolRenderer’s markdown look
-// - Keep executions ungrouped
-// - Render status + high-signal metadata (script paths, error summary)
-//
-// Note: hook stdout/stderr currently arrives as separate `hook_output_stream` messages.
-// The CLI suppresses those by default and prints them only in --verbose mode.
-// Future work could group streamed output under the corresponding hook block.
-//
-// It returns markdown (or rendered markdown when enabled); callers should print the
-// returned string.
-
-type HookRenderer struct {
-	mdRenderer   *MarkdownRenderer
-	outputFormat string
-}
-
-func NewHookRenderer(mdRenderer *MarkdownRenderer, outputFormat string) *HookRenderer {
-	return &HookRenderer{mdRenderer: mdRenderer, outputFormat: outputFormat}
-}
-
-func (hr *HookRenderer) RenderHookStatus(h types.HookMessage) string {
-	statusText := strings.TrimSpace(h.Status)
-	if statusText == "" {
-		statusText = "unknown"
-	}
-
-	// Header: aligned with ToolRenderer’s phrasing so transcripts scan consistently.
-	// Example: "### Cline hook completed: PreToolUse (tool: read_file) (exit 0)"
-	var headerBuilder strings.Builder
-	headerBuilder.WriteString(fmt.Sprintf("### Cline hook %s: %s", statusText, h.HookName))
-	if h.ToolName != "" {
-		headerBuilder.WriteString(" ")
-		headerBuilder.WriteString(fmt.Sprintf("(tool: %s)", h.ToolName))
-	}
-	if statusText == "failed" && h.ExitCode != 0 {
-		headerBuilder.WriteString(" ")
-		headerBuilder.WriteString(fmt.Sprintf("(exit %d)", h.ExitCode))
-	}
-	header := headerBuilder.String()
-
-	var lines []string
-	lines = append(lines, header)
-
-	// Pending tool info (PreToolUse): show one high-signal line directly under the header.
-	if h.PendingToolInfo != nil {
-		if pending := hr.formatPendingToolInfo(h.PendingToolInfo); pending != "" {
-			lines = append(lines, fmt.Sprintf("- Pending: %s", pending))
-		}
-	}
-
-	// Script paths: one per line.
-	paths := make([]string, 0, len(h.ScriptPaths))
-	for _, p := range h.ScriptPaths {
-		p = strings.TrimSpace(p)
-		if p != "" {
-			paths = append(paths, p)
-		}
-	}
-
-	if len(paths) == 0 {
-		// Fallback when no script paths are provided.
-		lines = append(lines, "- *(no hook scripts found)*")
-	} else {
-		for _, p := range paths {
-			lines = append(lines, fmt.Sprintf("- Running hook: `%s`", p))
-		}
-	}
-
-	// On failure, show a minimal summary (full stderr reserved for verbose).
-	if statusText == "failed" && h.Error != nil {
-		if msg := strings.TrimSpace(h.Error.Message); msg != "" {
-			lines = append(lines, fmt.Sprintf("- Error: %s", msg))
-		}
-		// If we have a specific script path, include it as a hint.
-		if sp := strings.TrimSpace(h.Error.ScriptPath); sp != "" {
-			lines = append(lines, fmt.Sprintf("- Script: `%s`", sp))
-		}
-	}
-
-	markdown := strings.Join(lines, "\n")
-	return hr.renderMarkdown(markdown)
-}
-
-func (hr *HookRenderer) formatPendingToolInfo(info *types.ToolInfo) string {
-	if info == nil {
-		return ""
-	}
-	tool := strings.TrimSpace(info.Tool)
-	if tool == "" {
-		return ""
-	}
-
-	// Keep this intentionally compact and readable.
-	// Format: "<tool> <identifier>" where identifier is the most relevant param.
-	var ident string
-	switch {
-	case strings.TrimSpace(info.Path) != "":
-		ident = strings.TrimSpace(info.Path)
-	case strings.TrimSpace(info.Command) != "":
-		ident = strings.TrimSpace(info.Command)
-	case strings.TrimSpace(info.Url) != "":
-		ident = strings.TrimSpace(info.Url)
-	case strings.TrimSpace(info.McpTool) != "" && strings.TrimSpace(info.McpServer) != "":
-		ident = fmt.Sprintf("%s %s", strings.TrimSpace(info.McpServer), strings.TrimSpace(info.McpTool))
-	case strings.TrimSpace(info.ResourceUri) != "":
-		ident = strings.TrimSpace(info.ResourceUri)
-	case strings.TrimSpace(info.Regex) != "":
-		ident = strings.TrimSpace(info.Regex)
-	default:
-		ident = ""
-	}
-
-	if ident != "" {
-		return fmt.Sprintf("%s %s", tool, ident)
-	}
-	return tool
-}
-
-func (hr *HookRenderer) renderMarkdown(markdown string) string {
-	// Align with ToolRenderer: in plain mode or non-TTY, return markdown as-is.
-	if hr.outputFormat == "plain" || !isTTY() {
-		return markdown
-	}
-	if hr.mdRenderer == nil {
-		return markdown
-	}
-	rendered, err := hr.mdRenderer.Render(markdown)
-	if err != nil {
-		return markdown
-	}
-	return rendered
-}

cli/pkg/cli/display/hook_renderer_test.go

@@ -1,69 +0,0 @@
-package display
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/cline/cli/pkg/cli/types"
-)
-
-func TestHookRenderer_RenderHookStatus_FailedShowsErrorAndScript(t *testing.T) {
-	hr := NewHookRenderer(nil, "plain")
-
-	msg := hr.RenderHookStatus(types.HookMessage{
-		HookName:    "PreToolUse",
-		ToolName:    "execute_command",
-		Status:      "failed",
-		ExitCode:    2,
-		ScriptPaths: []string{"repo/.clinerules/hooks/PreToolUse"},
-		Error: &types.HookError{
-			Message:    "boom",
-			ScriptPath: "repo/.clinerules/hooks/PreToolUse",
-		},
-	})
-
-	if !strings.Contains(msg, "### Cline hook failed: PreToolUse") {
-		t.Fatalf("expected header in rendered output, got: %q", msg)
-	}
-	if !strings.Contains(msg, "- Error: boom") {
-		t.Fatalf("expected error line in rendered output, got: %q", msg)
-	}
-	if !strings.Contains(msg, "- Script: `repo/.clinerules/hooks/PreToolUse`") {
-		t.Fatalf("expected script line in rendered output, got: %q", msg)
-	}
-}
-
-func TestHookRenderer_RenderHookStatus_PendingToolInfoAppearsDirectlyUnderHeader(t *testing.T) {
-	hr := NewHookRenderer(nil, "plain")
-
-	msg := hr.RenderHookStatus(types.HookMessage{
-		HookName: "PreToolUse",
-		ToolName: "write_to_file",
-		Status:   "running",
-		PendingToolInfo: &types.ToolInfo{
-			Tool: "write_to_file",
-			Path: "src/foo.ts",
-		},
-		ScriptPaths: []string{"repo/.clinerules/hooks/PreToolUse"},
-	})
-
-	header := "### Cline hook running: PreToolUse"
-	pending := "- Pending: write_to_file src/foo.ts"
-	runningHook := "- Running hook: `repo/.clinerules/hooks/PreToolUse`"
-
-	headerIdx := strings.Index(msg, header)
-	if headerIdx == -1 {
-		t.Fatalf("expected header %q in output, got: %q", header, msg)
-	}
-	pendingIdx := strings.Index(msg, pending)
-	if pendingIdx == -1 {
-		t.Fatalf("expected pending line %q in output, got: %q", pending, msg)
-	}
-	runningIdx := strings.Index(msg, runningHook)
-	if runningIdx == -1 {
-		t.Fatalf("expected running hook line %q in output, got: %q", runningHook, msg)
-	}
-	if !(headerIdx < pendingIdx && pendingIdx < runningIdx) {
-		t.Fatalf("expected header < pending < runningHook ordering, got indexes header=%d pending=%d running=%d\nfull=%q", headerIdx, pendingIdx, runningIdx, msg)
-	}
-}

cli/pkg/cli/display/segment_streamer.go

@@ -39,12 +39,9 @@ func NewStreamingSegment(sayType, prefix string, mdRenderer *MarkdownRenderer, s
 	// Render rich header immediately when creating segment (if in rich mode and TTY)
 	if shouldMarkdown && outputFormat != "plain" && isTTY() {
 		header := ss.generateRichHeader()
-		// Skip empty headers.
-		if strings.TrimSpace(header) != "" {
-			rendered, _ := mdRenderer.Render(header)
-			output.Println("")
-			output.Print(rendered)
-		}
+		rendered, _ := mdRenderer.Render(header)
+		output.Println("")
+		output.Print(rendered)
 	}
 
 	return ss
@@ -113,9 +110,6 @@ func (ss *StreamingSegment) renderFinal(currentBuffer string) {
 		if err := json.Unmarshal([]byte(currentBuffer), &tool); err == nil {
 			bodyContent = ss.toolRenderer.GenerateToolContentBody(&tool)
 		}
-	} else if ss.sayType == string(types.SayTypeHookStatus) {
-		// Hooks are rendered via the state stream; nothing to render here.
-		bodyContent = ""
 	} else if ss.sayType == string(types.SayTypeCommand) {
 		// Command output
 		bodyContent = "```shell\n" + currentBuffer + "\n```"
@@ -166,10 +160,6 @@ func (ss *StreamingSegment) generateRichHeader() string {
 		
 	case string(types.SayTypeTool):
 		return ss.generateToolHeader()
-
-	case string(types.SayTypeHookStatus):
-		// Hooks are rendered from the state stream; don’t emit a partial-stream header.
-		return ""
 		
 	case "ask":
 		// Check the specific ask type

cli/pkg/cli/display/segment_streamer_test.go

@@ -1,20 +0,0 @@
-package display
-
-import (
-	"testing"
-
-	"github.com/cline/cli/pkg/cli/types"
-)
-
-func TestStreamingSegment_generateRichHeader_HookIsEmpty(t *testing.T) {
-	ss := &StreamingSegment{
-		sayType: string(types.SayTypeHookStatus),
-		prefix:  "HOOK",
-		msg:     &types.ClineMessage{},
-	}
-
-	header := ss.generateRichHeader()
-	if header != "" {
-		t.Fatalf("expected empty header for hook segments to avoid double-render, got: %q", header)
-	}
-}

cli/pkg/cli/display/streaming.go

@@ -38,18 +38,6 @@ func (s *StreamingDisplay) HandlePartialMessage(msg *types.ClineMessage) error {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
-	// Render hooks from the state stream only (not partial stream) to avoid duplicates.
-	//
-	// Rationale: hook status messages are often updated/reordered by the backend (e.g. PreToolUse
-	// hooks are moved above the corresponding tool message). The state stream represents the
-	// authoritative, “final” message ordering, while the partial stream is best-effort for
-	// incremental display.
-	//
-	// Only suppress *partial* hook messages; complete ones still flow through dedupe.
-	if msg.Partial && msg.Say == string(types.SayTypeHookStatus) {
-		return nil
-	}
-
 	// Check for deduplication
 	if s.dedupe.IsDuplicate(msg) {
 		return nil
@@ -103,11 +91,7 @@ func (s *StreamingDisplay) HandlePartialMessage(msg *types.ClineMessage) error {
 
 func (s *StreamingDisplay) shouldRenderMarkdown(sayType string) bool {
 	switch sayType {
-	case string(types.SayTypeReasoning),
-		string(types.SayTypeText),
-		string(types.SayTypeCompletionResult),
-		string(types.SayTypeTool),
-		"ask":
+	case string(types.SayTypeReasoning), string(types.SayTypeText), string(types.SayTypeCompletionResult), string(types.SayTypeTool), "ask":
 		return true
 	default:
 		return false
@@ -126,8 +110,6 @@ func (s *StreamingDisplay) getPrefix(sayType string) string {
 		return "ASK"
 	case string(types.SayTypeCommand):
 		return "TERMINAL"
-	case string(types.SayTypeHookStatus):
-		return "HOOK"
 	default:
 		return strings.ToUpper(sayType)
 	}

cli/pkg/cli/display/system_renderer.go

@@ -264,6 +264,6 @@ func (sr *SystemMessageRenderer) RenderInfo(title, message string) error {
 func (sr *SystemMessageRenderer) RenderCheckpoint(timestamp string, id int64) error {
 	markdown := fmt.Sprintf("## [%s] Checkpoint created `%d`", timestamp, id)
 	rendered := sr.renderer.RenderMarkdown(markdown)
-	fmt.Print(rendered)
+	fmt.Printf(rendered)
 	return nil
 }

cli/pkg/cli/display/tool_renderer.go

@@ -339,13 +339,6 @@ func (tr *ToolRenderer) RenderCommandOutput(output string) string {
 	return result.String()
 }
 
-func (tr *ToolRenderer) RenderCommandPermissionDenied(command string) string {
-	command = strings.TrimSpace(command)
-	rendered := tr.renderMarkdown("### Command was denied")
-	message := fmt.Sprintf("Cline does not have permission to execute this command: `%s`", command)
-	return fmt.Sprintf("\n%s\n\n%s\n", rendered, message)
-}
-
 // RenderUserResponse renders user approval/rejection feedback
 func (tr *ToolRenderer) RenderUserResponse(approved bool, feedback string) string {
 	var symbol, status string

cli/pkg/cli/global/cline-clients.go

@@ -14,20 +14,21 @@ import (
 	"github.com/cline/grpc-go/cline"
 )
 
-type ClineInstances struct {
-	registry *InstanceRegistry
+// ClineClients manages Cline instances using the new registry system
+type ClineClients struct {
+	registry *ClientRegistry
 }
 
-// NewClineInstances creates a new ClineInstances instance
-func NewClineInstances(configPath string) *ClineInstances {
-	registry := NewInstanceRegistry(configPath)
-	return &ClineInstances{
+// NewClineClients creates a new ClineClients instance
+func NewClineClients(configPath string) *ClineClients {
+	registry := NewClientRegistry(configPath)
+	return &ClineClients{
 		registry: registry,
 	}
 }
 
 // Initialize performs cleanup of stale instances
-func (c *ClineInstances) Initialize(ctx context.Context) error {
+func (c *ClineClients) Initialize(ctx context.Context) error {
 	// Clean up stale entries (direct SQLite operations)
 	_ = c.registry.CleanupStaleInstances(ctx)
 
@@ -35,8 +36,7 @@ func (c *ClineInstances) Initialize(ctx context.Context) error {
 }
 
 // StartNewInstance starts a new Cline instance and waits for cline-core to self-register
-// An "instance" is a pair of cline-core and cline-host processes
-func (c *ClineInstances) StartNewInstance(ctx context.Context, workspaces ...string) (*common.CoreInstanceInfo, error) {
+func (c *ClineClients) StartNewInstance(ctx context.Context, workspaces ...string) (*common.CoreInstanceInfo, error) {
 	// Find available ports
 	corePort, hostPort, err := common.FindAvailablePortPair()
 	if err != nil {
@@ -102,7 +102,7 @@ func (c *ClineInstances) StartNewInstance(ctx context.Context, workspaces ...str
 
 	if Config.Verbose {
 		fmt.Println("Services started and registered successfully!")
-		fmt.Printf("  Address: %s\n", instance.CoreAddress)
+		fmt.Printf("  Address: %s\n", instance.Address)
 		fmt.Printf("  Core Port: %d\n", instance.CorePort())
 		fmt.Printf("  Host Bridge Port: %d\n", instance.HostPort())
 		fmt.Printf("  Process PID: %d\n", coreCmd.Process.Pid)
@@ -120,7 +120,7 @@ func (c *ClineInstances) StartNewInstance(ctx context.Context, workspaces ...str
 }
 
 // StartNewInstanceAtPort starts a new Cline instance at the specified port and waits for self-registration
-func (c *ClineInstances) StartNewInstanceAtPort(ctx context.Context, corePort int, workspaces ...string) (*common.CoreInstanceInfo, error) {
+func (c *ClineClients) StartNewInstanceAtPort(ctx context.Context, corePort int, workspaces ...string) (*common.CoreInstanceInfo, error) {
 	// Find available host port (core port + 1000)
 	hostPort := corePort + 1000
 	coreAddress := fmt.Sprintf("localhost:%d", corePort)
@@ -189,7 +189,7 @@ func (c *ClineInstances) StartNewInstanceAtPort(ctx context.Context, corePort in
 
 	if Config.Verbose {
 		fmt.Println("Services started and registered successfully!")
-		fmt.Printf("  Address: %s\n", instance.CoreAddress)
+		fmt.Printf("  Address: %s\n", instance.Address)
 		fmt.Printf("  Core Port: %d\n", instance.CorePort())
 		fmt.Printf("  Host Bridge Port: %d\n", instance.HostPort())
 		fmt.Printf("  Process PID: %d\n", coreCmd.Process.Pid)
@@ -207,12 +207,12 @@ func (c *ClineInstances) StartNewInstanceAtPort(ctx context.Context, corePort in
 }
 
 // GetRegistry returns the client registry
-func (c *ClineInstances) GetRegistry() *InstanceRegistry {
+func (c *ClineClients) GetRegistry() *ClientRegistry {
 	return c.registry
 }
 
 // EnsureInstanceAtAddress ensures an instance exists at the given address, starting one if needed
-func (c *ClineInstances) EnsureInstanceAtAddress(ctx context.Context, address string) error {
+func (c *ClineClients) EnsureInstanceAtAddress(ctx context.Context, address string) error {
 	// Expect host:port everywhere
 	normalized := address
 	if normalized == "" {
@@ -230,7 +230,7 @@ func (c *ClineInstances) EnsureInstanceAtAddress(ctx context.Context, address st
 		return fmt.Errorf("invalid address format %s", address)
 	}
 
-	//	Use IPv6-compatible localhost detection
+	// Use IPv6-compatible localhost detection
 	if common.IsLocalAddress(host) {
 		_, err := c.StartNewInstanceAtPort(ctx, port)
 		if err != nil {
@@ -305,7 +305,7 @@ func startClineHost(hostPort int, workspaces []string) (*exec.Cmd, error) {
 }
 
 // KillInstanceByAddress kills a Cline instance by its address
-func KillInstanceByAddress(ctx context.Context, registry *InstanceRegistry, address string) error {
+func KillInstanceByAddress(ctx context.Context, registry *ClientRegistry, address string) error {
 	// Check if the instance exists in the registry
 	_, err := registry.GetInstance(address)
 	if err != nil {
@@ -355,9 +355,9 @@ func KillInstanceByAddress(ctx context.Context, registry *InstanceRegistry, addr
 				defaultInstance := registry.GetDefaultInstance()
 				if defaultInstance == address || defaultInstance == "" {
 					if len(instances) > 0 {
-						if err := registry.SetDefaultInstance(instances[0].CoreAddress); err == nil {
+						if err := registry.SetDefaultInstance(instances[0].Address); err == nil {
 							if Config.Verbose {
-								fmt.Printf("Updated default instance to: %s\n", instances[0].CoreAddress)
+								fmt.Printf("Updated default instance to: %s\n", instances[0].Address)
 							}
 						}
 					}

cli/pkg/cli/global/global.go

@@ -22,8 +22,8 @@ type GlobalConfig struct {
 }
 
 var (
-	Config    *GlobalConfig
-	Instances *ClineInstances
+	Config  *GlobalConfig
+	Clients *ClineClients
 
 	// Version info - set at build time via ldflags
 	// Version is the Cline Core version (from root package.json)
@@ -37,16 +37,11 @@ var (
 
 func InitializeGlobalConfig(cfg *GlobalConfig) error {
 	if cfg.ConfigPath == "" {
-		// Check CLINE_DIR environment variable first
-		if clineDir := os.Getenv("CLINE_DIR"); clineDir != "" {
-			cfg.ConfigPath = clineDir
-		} else {
-			homeDir, err := os.UserHomeDir()
-			if err != nil {
-				return fmt.Errorf("failed to get home directory: %w", err)
-			}
-			cfg.ConfigPath = filepath.Join(homeDir, ".cline")
+		homeDir, err := os.UserHomeDir()
+		if err != nil {
+			return fmt.Errorf("failed to get home directory: %w", err)
 		}
+		cfg.ConfigPath = filepath.Join(homeDir, ".cline")
 	}
 
 	// Ensure .cline directory exists
@@ -61,11 +56,11 @@ func InitializeGlobalConfig(cfg *GlobalConfig) error {
 	// Otherwise lipgloss auto-detects terminal capabilities (default behavior)
 
 	Config = cfg
-	Instances = NewClineInstances(cfg.ConfigPath)
+	Clients = NewClineClients(cfg.ConfigPath)
 
 	// Initialize the clients registry
 	ctx := context.Background()
-	if err := Instances.Initialize(ctx); err != nil {
+	if err := Clients.Initialize(ctx); err != nil {
 		return fmt.Errorf("failed to initialize clients: %w", err)
 	}
 
@@ -76,25 +71,25 @@ func InitializeGlobalConfig(cfg *GlobalConfig) error {
 func GetDefaultClient(ctx context.Context) (*client.ClineClient, error) {
 	if Config.CoreAddress != "" && Config.CoreAddress != fmt.Sprintf("localhost:%d", common.DEFAULT_CLINE_CORE_PORT) {
 		// User specified a specific address, use that
-		return Instances.GetRegistry().GetClient(ctx, Config.CoreAddress)
+		return Clients.GetRegistry().GetClient(ctx, Config.CoreAddress)
 	}
 
 	// Use the default instance from registry
-	return Instances.GetRegistry().GetDefaultClient(ctx)
+	return Clients.GetRegistry().GetDefaultClient(ctx)
 }
 
 // GetClientForAddress returns a client for a specific address
 func GetClientForAddress(ctx context.Context, address string) (*client.ClineClient, error) {
-	return Instances.GetRegistry().GetClient(ctx, address)
+	return Clients.GetRegistry().GetClient(ctx, address)
 }
 
 // EnsureDefaultInstance ensures a default instance exists
 func EnsureDefaultInstance(ctx context.Context) error {
-	if Instances == nil {
+	if Clients == nil {
 		return fmt.Errorf("global clients not initialized")
 	}
 
-	registry := Instances.GetRegistry()
+	registry := Clients.GetRegistry()
 
 	// First, check if there are any instances already registered in SQLite
 	instances := registry.ListInstances()
@@ -108,12 +103,11 @@ func EnsureDefaultInstance(ctx context.Context) error {
 	if registry.GetDefaultInstance() == "" {
 		// No instances exist, start a new one
 		// Note: StartNewInstance will automatically set it as default since it's the first instance
-		_, err := Instances.StartNewInstance(ctx)
+		_, err := Clients.StartNewInstance(ctx)
 		if err != nil {
 			return fmt.Errorf("failed to start new default instance: %w", err)
 		}
 	}
 
 	return nil
-}
-
+}

cli/pkg/cli/global/registry.go

@@ -18,28 +18,28 @@ import (
 	"google.golang.org/grpc/health/grpc_health_v1"
 )
 
-// InstanceRegistry manages Cline client connections using direct SQLite operations
-type InstanceRegistry struct {
+// ClientRegistry manages Cline client connections using direct SQLite operations
+type ClientRegistry struct {
 	lockManager *sqlite.LockManager
 	configPath  string
 }
 
-// NewInstanceRegistry creates a new instance registry
-func NewInstanceRegistry(configPath string) *InstanceRegistry {
+// NewClientRegistry creates a new client registry
+func NewClientRegistry(configPath string) *ClientRegistry {
 	lockManager, err := sqlite.NewLockManager(configPath)
 	if err != nil {
 		// Log error but continue - we can still function without SQLite
 		log.Fatalf("Warning: Failed to initialize SQLite lock manager: %v\n", err)
 	}
 
-	return &InstanceRegistry{
+	return &ClientRegistry{
 		lockManager: lockManager,
 		configPath:  configPath,
 	}
 }
 
 // GetDefaultInstance returns the default instance address from settings file
-func (r *InstanceRegistry) GetDefaultInstance() string {
+func (r *ClientRegistry) GetDefaultInstance() string {
 	defaultAddr, err := sqlite.GetDefaultInstance(r.configPath)
 	if err != nil {
 		return ""
@@ -48,7 +48,7 @@ func (r *InstanceRegistry) GetDefaultInstance() string {
 }
 
 // SetDefaultInstance sets the default instance (writes default.json)
-func (r *InstanceRegistry) SetDefaultInstance(address string) error {
+func (r *ClientRegistry) SetDefaultInstance(address string) error {
 	// Verify the instance exists in SQLite
 	if r.lockManager != nil {
 		exists, err := r.lockManager.HasInstanceAtAddress(address)
@@ -64,7 +64,7 @@ func (r *InstanceRegistry) SetDefaultInstance(address string) error {
 }
 
 // GetInstance returns instance information directly from SQLite
-func (r *InstanceRegistry) GetInstance(address string) (*common.CoreInstanceInfo, error) {
+func (r *ClientRegistry) GetInstance(address string) (*common.CoreInstanceInfo, error) {
 	if r.lockManager == nil {
 		return nil, fmt.Errorf("lock manager not available")
 	}
@@ -73,7 +73,7 @@ func (r *InstanceRegistry) GetInstance(address string) (*common.CoreInstanceInfo
 }
 
 // GetClient returns a connected client for the given address (created on-demand)
-func (r *InstanceRegistry) GetClient(ctx context.Context, address string) (*client.ClineClient, error) {
+func (r *ClientRegistry) GetClient(ctx context.Context, address string) (*client.ClineClient, error) {
 	// Verify instance exists in SQLite
 	if r.lockManager != nil {
 		exists, err := r.lockManager.HasInstanceAtAddress(address)
@@ -104,7 +104,7 @@ func (r *InstanceRegistry) GetClient(ctx context.Context, address string) (*clie
 }
 
 // GetDefaultClient returns a client for the default instance
-func (r *InstanceRegistry) GetDefaultClient(ctx context.Context) (*client.ClineClient, error) {
+func (r *ClientRegistry) GetDefaultClient(ctx context.Context) (*client.ClineClient, error) {
 	defaultAddr := r.GetDefaultInstance()
 	if defaultAddr == "" {
 		return nil, fmt.Errorf("no default instance configured")
@@ -117,7 +117,7 @@ func (r *InstanceRegistry) GetDefaultClient(ctx context.Context) (*client.ClineC
 			// Database is unavailable - Return error instead of attempting cleanup
 			return nil, fmt.Errorf("cannot verify default instance: database unavailable: %w", err)
 		}
-
+		
 		if !exists {
 			// Instance doesn't exist in database but config file references it
 			// This is a stale config - remove it and try to find another instance
@@ -127,14 +127,14 @@ func (r *InstanceRegistry) GetDefaultClient(ctx context.Context) (*client.ClineC
 			} else {
 				fmt.Printf("Removed stale default instance config (instance %s not found in database)\n", defaultAddr)
 			}
-
+			
 			// Try to find and set a new default instance
 			instances := r.ListInstances()
 			if len(instances) > 0 {
 				if err := r.EnsureDefaultInstance(instances); err != nil {
 					return nil, fmt.Errorf("failed to set new default instance: %w", err)
 				}
-
+				
 				// Retry with the new default
 				newDefaultAddr := r.GetDefaultInstance()
 				if newDefaultAddr != "" {
@@ -142,7 +142,7 @@ func (r *InstanceRegistry) GetDefaultClient(ctx context.Context) (*client.ClineC
 					return r.GetClient(ctx, newDefaultAddr)
 				}
 			}
-
+			
 			return nil, fmt.Errorf("no default instance configured")
 		}
 	}
@@ -151,7 +151,7 @@ func (r *InstanceRegistry) GetDefaultClient(ctx context.Context) (*client.ClineC
 }
 
 // ListInstances returns all registered instances directly from SQLite
-func (r *InstanceRegistry) ListInstances() []*common.CoreInstanceInfo {
+func (r *ClientRegistry) ListInstances() []*common.CoreInstanceInfo {
 	if r.lockManager == nil {
 		return []*common.CoreInstanceInfo{}
 	}
@@ -170,7 +170,7 @@ func (r *InstanceRegistry) ListInstances() []*common.CoreInstanceInfo {
 }
 
 // HasInstanceAtAddress checks if an instance exists at the given address (delegates to SQLite)
-func (r *InstanceRegistry) HasInstanceAtAddress(address string) bool {
+func (r *ClientRegistry) HasInstanceAtAddress(address string) bool {
 	if r.lockManager == nil {
 		return false
 	}
@@ -185,7 +185,7 @@ func (r *InstanceRegistry) HasInstanceAtAddress(address string) bool {
 }
 
 // CleanupStaleInstances removes stale instances using direct SQLite operations
-func (r *InstanceRegistry) CleanupStaleInstances(ctx context.Context) error {
+func (r *ClientRegistry) CleanupStaleInstances(ctx context.Context) error {
 	if r.lockManager == nil {
 		return nil
 	}
@@ -202,15 +202,15 @@ func (r *InstanceRegistry) CleanupStaleInstances(ctx context.Context) error {
 			// Try to gracefully shutdown the paired host process before cleanup
 
 			fmt.Printf("Attempting to shutdown dangling host service %s for stale cline core instance %s\n",
-				instance.HostServiceAddress, instance.CoreAddress)
+				instance.HostServiceAddress, instance.Address)
 			r.tryShutdownHostProcess(instance.HostServiceAddress)
 
 			// Remove from SQLite database
-			if err := r.lockManager.RemoveInstanceLock(instance.CoreAddress); err != nil {
-				return fmt.Errorf("failed to remove stale instance %s: %w", instance.CoreAddress, err)
+			if err := r.lockManager.RemoveInstanceLock(instance.Address); err != nil {
+				return fmt.Errorf("failed to remove stale instance %s: %w", instance.Address, err)
 			}
 
-			fmt.Printf("Removed stale instance: %s\n", instance.CoreAddress)
+			fmt.Printf("Removed stale instance: %s\n", instance.Address)
 		}
 	}
 
@@ -218,7 +218,8 @@ func (r *InstanceRegistry) CleanupStaleInstances(ctx context.Context) error {
 }
 
 // tryShutdownHostProcess attempts to gracefully shutdown a host process via RPC
-func (r *InstanceRegistry) tryShutdownHostProcess(hostServiceAddress string) {
+// Best effort, don't throw errors i guess
+func (r *ClientRegistry) tryShutdownHostProcess(hostServiceAddress string) {
 	err := common.RetryOperation(3, 2*time.Second, func() error {
 		// Create context with timeout
 		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
@@ -251,7 +252,7 @@ func (r *InstanceRegistry) tryShutdownHostProcess(hostServiceAddress string) {
 }
 
 // ListInstancesCleaned performs cleanup and returns instances with health checks
-func (r *InstanceRegistry) ListInstancesCleaned(ctx context.Context) ([]*common.CoreInstanceInfo, error) {
+func (r *ClientRegistry) ListInstancesCleaned(ctx context.Context) ([]*common.CoreInstanceInfo, error) {
 	// 1. Clean up stale entries (best-effort)
 	_ = r.CleanupStaleInstances(ctx)
 
@@ -267,7 +268,7 @@ func (r *InstanceRegistry) ListInstancesCleaned(ctx context.Context) ([]*common.
 }
 
 // EnsureDefaultInstance ensures a default instance is set if instances exist but no default is configured
-func (r *InstanceRegistry) EnsureDefaultInstance(instances []*common.CoreInstanceInfo) error {
+func (r *ClientRegistry) EnsureDefaultInstance(instances []*common.CoreInstanceInfo) error {
 	currentDefault := r.GetDefaultInstance()
 
 	// If we have no instances, clear any stale default and remove settings file
@@ -282,13 +283,13 @@ func (r *InstanceRegistry) EnsureDefaultInstance(instances []*common.CoreInstanc
 
 	// If we have instances but no default, pick the first one
 	if currentDefault == "" {
-		return sqlite.SetDefaultInstance(r.configPath, instances[0].CoreAddress)
+		return sqlite.SetDefaultInstance(r.configPath, instances[0].Address)
 	}
 
 	// Validate current default still exists in the instances
 	defaultExists := false
 	for _, instance := range instances {
-		if instance.CoreAddress == currentDefault {
+		if instance.Address == currentDefault {
 			defaultExists = true
 			break
 		}
@@ -296,7 +297,7 @@ func (r *InstanceRegistry) EnsureDefaultInstance(instances []*common.CoreInstanc
 
 	if !defaultExists {
 		// Current default doesn't exist, pick a new one from available instances
-		return sqlite.SetDefaultInstance(r.configPath, instances[0].CoreAddress)
+		return sqlite.SetDefaultInstance(r.configPath, instances[0].Address)
 	}
 
 	return nil

cli/pkg/cli/handlers/handler.go

@@ -25,7 +25,6 @@ type DisplayContext struct {
 	State          *types.ConversationState
 	Renderer       *display.Renderer
 	ToolRenderer   *display.ToolRenderer
-	HookRenderer   *display.HookRenderer
 	SystemRenderer *display.SystemMessageRenderer
 	IsLast          bool
 	IsPartial       bool

cli/pkg/cli/handlers/say_handlers.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/cline/cli/pkg/cli/clerror"
-	"github.com/cline/cli/pkg/cli/output"
 	"github.com/cline/cli/pkg/cli/types"
+	"github.com/cline/cli/pkg/cli/output"
 )
 
 // SayHandler handles SAY type messages
@@ -90,12 +90,6 @@ func (h *SayHandler) Handle(msg *types.ClineMessage, dc *DisplayContext) error {
 		return h.handleInfo(msg, dc)
 	case string(types.SayTypeTaskProgress):
 		return h.handleTaskProgress(msg, dc)
-	case string(types.SayTypeHookStatus):
-		return h.handleHookStatus(msg, dc)
-	case string(types.SayTypeHookOutputStream):
-		return h.handleHookOutputStream(msg, dc)
-	case string(types.SayTypeCommandPermissionDenied):
-		return h.handleCommandPermissionDenied(msg, dc)
 	default:
 		return h.handleDefault(msg, dc)
 	}
@@ -248,18 +242,19 @@ func (h *SayHandler) handleCompletionResult(msg *types.ClineMessage, dc *Display
 }
 
 func formatUserMessage(text string) string {
-	lines := strings.Split(text, "\n")
-
-	// Wrap each line in backticks
-	for i, line := range lines {
-		if line != "" {
-			lines[i] = fmt.Sprintf("`%s`", line)
-		}
-	}
-
-	return strings.Join(lines, "\n")
+    lines := strings.Split(text, "\n")
+    
+    // Wrap each line in backticks
+    for i, line := range lines {
+        if line != "" {
+            lines[i] = fmt.Sprintf("`%s`", line)
+        }
+    }
+    
+    return strings.Join(lines, "\n")
 }
 
+
 // handleUserFeedback handles user feedback messages
 func (h *SayHandler) handleUserFeedback(msg *types.ClineMessage, dc *DisplayContext) error {
 	if msg.Text != "" {
@@ -348,18 +343,6 @@ func (h *SayHandler) handleCommandOutput(msg *types.ClineMessage, dc *DisplayCon
 	return nil
 }
 
-func (h *SayHandler) handleCommandPermissionDenied(msg *types.ClineMessage, dc *DisplayContext) error {
-	if msg.Text == "" {
-		return nil
-	}
-
-	// Use unified ToolRenderer
-	rendered := dc.ToolRenderer.RenderCommandPermissionDenied(msg.Text)
-	output.Print(rendered)
-
-	return nil
-}
-
 func (h *SayHandler) handleTool(msg *types.ClineMessage, dc *DisplayContext) error {
 	var tool types.ToolMessage
 	if err := json.Unmarshal([]byte(msg.Text), &tool); err != nil {
@@ -534,16 +517,5 @@ func (h *SayHandler) handleTaskProgress(msg *types.ClineMessage, dc *DisplayCont
 
 // handleDefault handles unknown SAY message types
 func (h *SayHandler) handleDefault(msg *types.ClineMessage, dc *DisplayContext) error {
-	// Debug: log unhandled say types to help identify missing cases using output.Printf for CLI consistency
-	if dc.Verbose {
-		output.Printf("[DEBUG] Unhandled SAY type: '%s' (text preview: %s)\n", msg.Say, truncateForDisplay(msg.Text, 50))
-	}
 	return dc.Renderer.RenderMessage("SAY", msg.Text, true)
 }
-
-func truncateForDisplay(text string, maxLen int) string {
-	if len(text) <= maxLen {
-		return text
-	}
-	return text[:maxLen] + "..."
-}

cli/pkg/cli/handlers/say_handlers_hooks.go

@@ -1,198 +0,0 @@
-package handlers
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/cline/cli/pkg/cli/output"
-	"github.com/cline/cli/pkg/cli/types"
-)
-
-// Hook-specific SAY handlers and helpers.
-// Kept in a separate file to keep say_handlers.go focused on routing.
-
-// handleHookStatus handles hook execution status messages.
-func (h *SayHandler) handleHookStatus(msg *types.ClineMessage, dc *DisplayContext) error {
-	hook, err := parseHookMessage(msg.Text)
-	if err != nil {
-		// Fallback to basic output if JSON parsing fails
-		return dc.Renderer.RenderMessage("HOOK", msg.Text, true)
-	}
-
-	logHookDebug(hook, dc)
-	hook.ScriptPaths = formatHookPaths(hook.ScriptPaths)
-
-	return renderHookStatus(hook, dc)
-}
-
-// handleHookOutputStream handles streaming output from hooks.
-//
-// Hook stdout/stderr currently arrives line-by-line from the backend as
-// `hook_output_stream` messages. The CLI intentionally suppresses these by default
-// to keep the transcript high-signal.
-//
-// In --verbose mode, we print each non-empty line prefixed with "HOOK>" for easy grepping.
-// Future work could associate these lines with a specific hook execution and render them
-// as a grouped section under the hook status header.
-func (h *SayHandler) handleHookOutputStream(msg *types.ClineMessage, dc *DisplayContext) error {
-	if !dc.Verbose {
-		return nil
-	}
-
-	line := strings.TrimRight(msg.Text, "\n")
-	if strings.TrimSpace(line) == "" {
-		return nil
-	}
-
-	output.Printf("HOOK> %s\n", line)
-	return nil
-}
-
-func parseHookMessage(jsonText string) (types.HookMessage, error) {
-	var hook types.HookMessage
-	if err := json.Unmarshal([]byte(jsonText), &hook); err != nil {
-		return types.HookMessage{}, err
-	}
-	return hook, nil
-}
-
-func logHookDebug(hook types.HookMessage, dc *DisplayContext) {
-	if dc.Verbose {
-		output.Printf("[DEBUG] Hook parsed: name=%s, status=%s, toolName=%s, scriptPaths=%v\n",
-			hook.HookName, hook.Status, hook.ToolName, hook.ScriptPaths)
-	}
-}
-
-func formatHookPaths(paths []string) []string {
-	if len(paths) == 0 {
-		return paths
-	}
-	formatted := make([]string, 0, len(paths))
-	for _, p := range paths {
-		if strings.TrimSpace(p) == "" {
-			continue
-		}
-		formatted = append(formatted, formatHookPath(p))
-	}
-	return formatted
-}
-
-func renderHookStatus(hook types.HookMessage, dc *DisplayContext) error {
-	if dc.HookRenderer != nil {
-		rendered := dc.HookRenderer.RenderHookStatus(hook)
-		// Match ToolRenderer’s spacing: one leading newline, one trailing newline.
-		output.Print("\n")
-		output.Print(rendered)
-		output.Print("\n")
-		return nil
-	}
-
-	// Fallback: if HookRenderer not available
-	return dc.Renderer.RenderMessage("HOOK", fmt.Sprintf("%s %s", hook.HookName, hook.Status), true)
-}
-
-func formatHookPath(fullPath string) string {
-	// Normalize for display and prefix checks. This is display-only; do not use for IO.
-	normalized := normalizeSlashes(fullPath)
-
-	// If this is a repo-scoped hook script (i.e. lives under <repo>/.clinerules/hooks/),
-	// always include the repo name for disambiguation even in single-repo workspaces.
-	//
-	// This intentionally runs before workspace-relative formatting, which would otherwise
-	// collapse to ".clinerules/hooks/..." and lose the repo context.
-	if p, ok := tryRepoScopedHooksPath(normalized); ok {
-		return p
-	}
-
-	// Prefer workspace-relative paths first for readability, since most hook scripts
-	// live inside the current project.
-	if p, ok := tryWorkspaceRelativeHookPath(normalized); ok {
-		return p
-	}
-
-	// Follow existing CLI pattern: resolve home via os.UserHomeDir.
-	if p, ok := tryHomeTildePath(normalized); ok {
-		return p
-	}
-
-	// Secondary heuristic: if hook lives under <repo>/.clinerules, collapse to repo-relative.
-	if p, ok := tryRepoRelativeHookPath(normalized); ok {
-		return p
-	}
-
-	return fallbackLastComponents(normalized, 3)
-}
-
-func normalizeSlashes(p string) string {
-	return filepath.ToSlash(p)
-}
-
-func tryWorkspaceRelativeHookPath(normalizedPath string) (string, bool) {
-	root, err := os.Getwd()
-	if err != nil {
-		return "", false
-	}
-	
-	// filepath.Rel expects OS-native paths, so we need to convert the normalized path
-	// back to OS-native format before calling Rel, then normalize the result for display.
-	targetOS := filepath.FromSlash(normalizedPath)
-	rel, err := filepath.Rel(root, targetOS)
-	if err != nil {
-		return "", false
-	}
-	// If it's not within the workspace, Rel will start with "..".
-	if rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
-		return "", false
-	}
-	return normalizeSlashes(rel), true
-}
-
-func tryHomeTildePath(normalizedPath string) (string, bool) {
-	homeDir, err := os.UserHomeDir()
-	if err != nil || strings.TrimSpace(homeDir) == "" {
-		return "", false
-	}
-	homeDir = normalizeSlashes(homeDir)
-	if !strings.HasPrefix(normalizedPath, homeDir) {
-		return "", false
-	}
-	rel := strings.TrimPrefix(normalizedPath, homeDir)
-	rel = strings.TrimPrefix(rel, "/")
-	return "~/" + rel, true
-}
-
-func tryRepoRelativeHookPath(normalizedPath string) (string, bool) {
-	parts := strings.Split(normalizedPath, "/")
-	for i, part := range parts {
-		if part == ".clinerules" && i > 0 {
-			repoName := parts[i-1]
-			return repoName + "/" + strings.Join(parts[i:], "/"), true
-		}
-	}
-	return "", false
-}
-
-// tryRepoScopedHooksPath returns a repo-prefixed path like
-// "myrepo/.clinerules/hooks/PreToolUse" when the given path points to a hook script
-// under a repo's .clinerules/hooks directory.
-//
-// This is more specific than tryRepoRelativeHookPath and is used to ensure hook script
-// paths always include repo context.
-func tryRepoScopedHooksPath(normalizedPath string) (string, bool) {
-	// Fast path check to avoid split work.
-	if !strings.Contains(normalizedPath, "/.clinerules/hooks/") {
-		return "", false
-	}
-	return tryRepoRelativeHookPath(normalizedPath)
-}
-
-func fallbackLastComponents(normalizedPath string, n int) string {
-	parts := strings.Split(normalizedPath, "/")
-	if len(parts) >= n {
-		return strings.Join(parts[len(parts)-n:], "/")
-	}
-	return normalizedPath
-}

cli/pkg/cli/handlers/say_handlers_hooks_test.go

@@ -1,41 +0,0 @@
-package handlers
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestFormatHookPath_PrefersWorkspaceRelative(t *testing.T) {
-	// Create a stable workspace root (avoid TempDir's nested ".../001" patterns)
-	// so that workspace-relative formatting is deterministic.
-	root := filepath.Join(t.TempDir(), "workspace")
-	if err := os.MkdirAll(root, 0o755); err != nil {
-		t.Fatalf("MkdirAll: %v", err)
-	}
-	oldWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Getwd: %v", err)
-	}
-	defer func() { _ = os.Chdir(oldWd) }()
-	if err := os.Chdir(root); err != nil {
-		t.Fatalf("Chdir: %v", err)
-	}
-
-	inside := filepath.Join(root, ".clinerules", "hooks", "pre.sh")
-	got := formatHookPath(inside)
-	// Repo-scoped hook scripts should always include the repo name (the directory
-	// immediately containing .clinerules) even when running inside that repo.
-	expected := "workspace/" + filepath.ToSlash(filepath.Join(".clinerules", "hooks", "pre.sh"))
-	if got != expected {
-		t.Fatalf("expected formatted path to be %q. got=%q", expected, got)
-	}
-}
-
-func TestFormatHookPath_FallsBackToLastComponents(t *testing.T) {
-	// Use an obviously non-workspace path (relative, but not prefixed with cwd).
-	got := formatHookPath("/var/tmp/foo/bar/baz.sh")
-	if got != "foo/bar/baz.sh" {
-		t.Fatalf("expected last 3 components fallback, got=%q", got)
-	}
-}

cli/pkg/cli/handlers/say_handlers_test.go

@@ -1,35 +0,0 @@
-package handlers
-
-import (
-	"os"
-	"testing"
-)
-
-func TestFormatHookPath_HomeDirToTilde(t *testing.T) {
-	home, err := os.UserHomeDir()
-	if err != nil || home == "" {
-		t.Skip("home dir not available; skipping")
-	}
-
-	got := formatHookPath(home + "/Documents/Cline/Hooks/TaskStart")
-	want := "~/Documents/Cline/Hooks/TaskStart"
-	if got != want {
-		t.Fatalf("expected %q, got %q", want, got)
-	}
-}
-
-func TestFormatHookPath_WorkspaceRepoRelative(t *testing.T) {
-	got := formatHookPath("/Users/alice/dev/repo-name/.clinerules/hooks/TaskStart")
-	want := "repo-name/.clinerules/hooks/TaskStart"
-	if got != want {
-		t.Fatalf("expected %q, got %q", want, got)
-	}
-}
-
-func TestFormatHookPath_FallbackLast3Components(t *testing.T) {
-	got := formatHookPath("/a/b/c/d/e")
-	want := "c/d/e"
-	if got != want {
-		t.Fatalf("expected %q, got %q", want, got)
-	}
-}

cli/pkg/cli/instances.go

@@ -92,12 +92,12 @@ func newInstanceKillCommand() *cobra.Command {
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if global.Instances == nil {
+			if global.Clients == nil {
 				return fmt.Errorf("clients not initialized")
 			}
 
 			ctx := cmd.Context()
-			registry := global.Instances.GetRegistry()
+			registry := global.Clients.GetRegistry()
 
 			if killAllCLI {
 				return killAllCLIInstances(ctx, registry)
@@ -112,7 +112,7 @@ func newInstanceKillCommand() *cobra.Command {
 	return cmd
 }
 
-func killAllCLIInstances(ctx context.Context, registry *global.InstanceRegistry) error {
+func killAllCLIInstances(ctx context.Context, registry *global.ClientRegistry) error {
 	// Get all instances from registry
 	instances, err := registry.ListInstancesCleaned(ctx)
 	if err != nil {
@@ -135,7 +135,7 @@ func killAllCLIInstances(ctx context.Context, registry *global.InstanceRegistry)
 					cliInstances = append(cliInstances, instance)
 				} else {
 					skippedNonCLI++
-					fmt.Printf("⊘ Skipping %s instance: %s\n", platform, instance.CoreAddress)
+					fmt.Printf("⊘ Skipping %s instance: %s\n", platform, instance.Address)
 				}
 			}
 		}
@@ -160,16 +160,16 @@ func killAllCLIInstances(ctx context.Context, registry *global.InstanceRegistry)
 
 	// Kill all CLI instances
 	for _, instance := range cliInstances {
-		result := killInstanceProcess(ctx, registry, instance.CoreAddress)
+		result := killInstanceProcess(ctx, registry, instance.Address)
 		killResults = append(killResults, result)
 
 		if result.err != nil {
-			fmt.Printf("✗ Failed to kill %s: %v\n", instance.CoreAddress, result.err)
+			fmt.Printf("✗ Failed to kill %s: %v\n", instance.Address, result.err)
 		} else if result.alreadyDead {
-			fmt.Printf("⚠ Instance %s appears to be already dead\n", instance.CoreAddress)
+			fmt.Printf("⚠ Instance %s appears to be already dead\n", instance.Address)
 		} else {
-			fmt.Printf("✓ Killed %s (PID %d)\n", instance.CoreAddress, result.pid)
-			killedAddresses[instance.CoreAddress] = true
+			fmt.Printf("✓ Killed %s (PID %d)\n", instance.Address, result.pid)
+			killedAddresses[instance.Address] = true
 		}
 	}
 
@@ -190,8 +190,8 @@ func killAllCLIInstances(ctx context.Context, registry *global.InstanceRegistry)
 			// Check if any of the killed instances are still in the registry
 			stillPresent := []string{}
 			for _, remaining := range remainingInstances {
-				if killedAddresses[remaining.CoreAddress] {
-					stillPresent = append(stillPresent, remaining.CoreAddress)
+				if killedAddresses[remaining.Address] {
+					stillPresent = append(stillPresent, remaining.Address)
 				}
 			}
 
@@ -247,7 +247,7 @@ type killResult struct {
 	err         error
 }
 
-func killInstanceProcess(ctx context.Context, registry *global.InstanceRegistry, address string) killResult {
+func killInstanceProcess(ctx context.Context, registry *global.ClientRegistry, address string) killResult {
 	// Get gRPC client and process info
 	client, err := registry.GetClient(ctx, address)
 	if err != nil {
@@ -276,12 +276,12 @@ func newInstanceListCommand() *cobra.Command {
 		Short:   "List all registered Cline instances",
 		Long:    `List all registered Cline instances with their status and connection details.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if global.Instances == nil {
+			if global.Clients == nil {
 				return fmt.Errorf("clients not initialized")
 			}
 
 			ctx := cmd.Context()
-			registry := global.Instances.GetRegistry()
+			registry := global.Clients.GetRegistry()
 
 			// Load, cleanup stale local entries, and update health
 			instances, err := registry.ListInstancesCleaned(ctx)
@@ -310,7 +310,7 @@ func newInstanceListCommand() *cobra.Command {
 			var rows []instanceRow
 			for _, instance := range instances {
 				isDefault := ""
-				if instance.CoreAddress == defaultInstance {
+				if instance.Address == defaultInstance {
 					isDefault = "✓"
 				}
 
@@ -324,7 +324,7 @@ func newInstanceListCommand() *cobra.Command {
 				platform := platformNA
 				if instance.Status == grpc_health_v1.HealthCheckResponse_SERVING {
 					// Get PID from core
-					if client, err := registry.GetClient(ctx, instance.CoreAddress); err == nil {
+					if client, err := registry.GetClient(ctx, instance.Address); err == nil {
 						if processInfo, err := client.State.GetProcessInfo(ctx, &cline.EmptyRequest{}); err == nil {
 							pid = fmt.Sprintf("%d", processInfo.ProcessId)
 							// Update version from RPC if available
@@ -341,7 +341,7 @@ func newInstanceListCommand() *cobra.Command {
 				}
 
 				rows = append(rows, instanceRow{
-					address:   instance.CoreAddress,
+					address:   instance.Address,
 					status:    instance.Status.String(),
 					version:   instance.Version,
 					lastSeen:  lastSeen,
@@ -407,7 +407,7 @@ func newInstanceListCommand() *cobra.Command {
 
 						fmt.Print(strings.TrimLeft(rendered, "\n"))
 					}
-					fmt.Println()
+					fmt.Println("\n")
 				}
 			}
 
@@ -428,11 +428,11 @@ func newInstanceDefaultCommand() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			address := args[0]
 
-			if global.Instances == nil {
+			if global.Clients == nil {
 				return fmt.Errorf("clients not initialized")
 			}
 
-			registry := global.Instances.GetRegistry()
+			registry := global.Clients.GetRegistry()
 
 			// Verify the instance exists
 			_, err := registry.GetInstance(address)
@@ -464,34 +464,34 @@ func newInstanceNewCommand() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
 
-			if global.Instances == nil {
+			if global.Clients == nil {
 				return fmt.Errorf("clients not initialized")
 			}
 
 			fmt.Println("Starting new Cline instance...")
 
-			instance, err := global.Instances.StartNewInstance(ctx)
+			instance, err := global.Clients.StartNewInstance(ctx)
 			if err != nil {
 				return fmt.Errorf("failed to start instance: %w", err)
 			}
 
 			fmt.Printf("Successfully started new instance:\n")
-			fmt.Printf("  Address: %s\n", instance.CoreAddress)
+			fmt.Printf("  Address: %s\n", instance.Address)
 			fmt.Printf("  Core Port: %d\n", instance.CorePort())
 			fmt.Printf("  Host Bridge Port: %d\n", instance.HostPort())
 
-			registry := global.Instances.GetRegistry()
+			registry := global.Clients.GetRegistry()
 
 			// If --default flag provided, set this instance as the default
 			if setDefault {
-				if err := registry.SetDefaultInstance(instance.CoreAddress); err != nil {
+				if err := registry.SetDefaultInstance(instance.Address); err != nil {
 					fmt.Printf("Warning: Failed to set as default: %v\n", err)
 				} else {
 					fmt.Printf("  Status: Set as default instance\n")
 				}
 			} else {
 				// Otherwise, check if EnsureDefaultInstance already set it as default
-				if registry.GetDefaultInstance() == instance.CoreAddress {
+				if registry.GetDefaultInstance() == instance.Address {
 					fmt.Printf("  Status: Default instance\n")
 				}
 			}
@@ -503,4 +503,4 @@ func newInstanceNewCommand() *cobra.Command {
 	cmd.Flags().BoolVarP(&setDefault, "default", "d", false, "set as default instance")
 
 	return cmd
-}
+}

cli/pkg/cli/output/input_model.go

@@ -348,7 +348,7 @@ func (m *InputModel) handleSubmit() (tea.Model, tea.Cmd) {
 				return ChangeInputTypeMsg{
 					InputType:   InputTypeFeedback,
 					Title:       "Your feedback",
-					Placeholder: "/plan or /act to switch modes\nctrl+e to open editor\nctrl+c to exit",
+					Placeholder: "/plan or /act to switch modes\nctrl+e to open editor",
 				}
 			}
 		}
@@ -547,74 +547,3 @@ func (m *InputModel) openEditor() tea.Cmd {
 func (m *InputModel) SetSlashRegistry(registry *slash.Registry) {
 	m.completion.SetRegistry(registry)
 }
-
-// initialPromptWrapper wraps InputModel to capture the submit result for initial task prompts
-type initialPromptWrapper struct {
-	model     *InputModel
-	result    string
-	cancelled bool
-}
-
-func (w *initialPromptWrapper) Init() tea.Cmd {
-	return w.model.Init()
-}
-
-func (w *initialPromptWrapper) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	switch msg := msg.(type) {
-	case InputSubmitMsg:
-		w.result = msg.Value
-		clearCodes := w.model.ClearScreen()
-		if clearCodes != "" {
-			fmt.Print(clearCodes)
-		}
-		return w, tea.Quit
-
-	case InputCancelMsg:
-		w.cancelled = true
-		clearCodes := w.model.ClearScreen()
-		if clearCodes != "" {
-			fmt.Print(clearCodes)
-		}
-		return w, tea.Quit
-	}
-
-	// Forward to wrapped model
-	_, cmd := w.model.Update(msg)
-	return w, cmd
-}
-
-func (w *initialPromptWrapper) View() string {
-	return w.model.View()
-}
-
-// ErrUserAborted is returned when the user cancels the input prompt
-var ErrUserAborted = fmt.Errorf("user aborted")
-
-// PromptForInitialTask displays an interactive prompt for the initial task with slash command autocomplete.
-// Returns the entered text, or ErrUserAborted if cancelled.
-func PromptForInitialTask(title, placeholder, mode string, registry *slash.Registry) (string, error) {
-	model := NewInputModelWithRegistry(
-		InputTypeMessage,
-		title,
-		placeholder,
-		mode,
-		registry,
-	)
-
-	wrapper := &initialPromptWrapper{
-		model: &model,
-	}
-
-	p := tea.NewProgram(wrapper)
-
-	_, err := p.Run()
-	if err != nil {
-		return "", fmt.Errorf("input prompt failed: %w", err)
-	}
-
-	if wrapper.cancelled {
-		return "", ErrUserAborted
-	}
-
-	return strings.TrimSpace(wrapper.result), nil
-}

cli/pkg/cli/slash/registry.go

@@ -2,11 +2,10 @@ package slash
 
 import (
 	"context"
-	"fmt"
 	"strings"
 	"sync"
 
-	"github.com/cline/cli/pkg/cli/global"
+	"github.com/cline/grpc-go/client"
 	"github.com/cline/grpc-go/cline"
 )
 
@@ -33,31 +32,25 @@ var cliLocalCommands = []Command{
 }
 
 // NewRegistry creates a new slash command registry
-func NewRegistry(ctx context.Context) *Registry {
-	defaultCommands := append([]Command{}, cliLocalCommands...)
-	r := &Registry{
-		commands: defaultCommands,
+func NewRegistry() *Registry {
+	return &Registry{
+		commands: make([]Command, 0),
 	}
-	r.FetchFromBackend(ctx)
-	return r
 }
 
 // FetchFromBackend fetches available commands from cline-core backend
-func (r *Registry) FetchFromBackend(ctx context.Context) error {
-	grpcClient, err := global.GetDefaultClient(ctx)
-	if err != nil && global.Config.Verbose {
-		fmt.Printf("Warning: could not get gRPC client: %v\n", err)
-		return nil
-	}
-	resp, err := grpcClient.Slash.GetAvailableSlashCommands(ctx, &cline.EmptyRequest{})
-	if err != nil && global.Config.Verbose {
-		fmt.Printf("Warning: could not get gRPC client: %v\n", err)
-		return nil
+func (r *Registry) FetchFromBackend(ctx context.Context, c *client.ClineClient) error {
+	resp, err := c.Slash.GetAvailableSlashCommands(ctx, &cline.EmptyRequest{})
+	if err != nil {
+		return err
 	}
 
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
+	// Start with CLI-local commands
+	r.commands = append([]Command{}, cliLocalCommands...)
+
 	// Add backend commands (only CLI-compatible ones)
 	for _, cmd := range resp.Commands {
 		if cmd.CliCompatible {
@@ -73,6 +66,17 @@ func (r *Registry) FetchFromBackend(ctx context.Context) error {
 	return nil
 }
 
+// GetCommands returns all available commands
+func (r *Registry) GetCommands() []Command {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+
+	// Return a copy to avoid race conditions
+	result := make([]Command, len(r.commands))
+	copy(result, r.commands)
+	return result
+}
+
 // GetMatching returns commands that start with the given prefix (case-insensitive)
 func (r *Registry) GetMatching(prefix string) []Command {
 	r.mu.RLock()
@@ -119,24 +123,3 @@ func (r *Registry) HasCommands() bool {
 	defer r.mu.RUnlock()
 	return len(r.commands) > 0
 }
-
-// ParseModeSwitch checks if message starts with /act or /plan and extracts the mode and remaining message.
-// Returns (mode, remainingMessage, isModeSwitch).
-// This is a package-level function so it can be used both during initial task creation
-// and during interactive input handling.
-func ParseModeSwitch(message string) (string, string, bool) {
-	trimmed := strings.TrimSpace(message)
-	lower := strings.ToLower(trimmed)
-
-	if strings.HasPrefix(lower, "/plan") {
-		remaining := strings.TrimSpace(trimmed[5:])
-		return "plan", remaining, true
-	}
-
-	if strings.HasPrefix(lower, "/act") {
-		remaining := strings.TrimSpace(trimmed[4:])
-		return "act", remaining, true
-	}
-
-	return "", message, false
-}

cli/pkg/cli/sqlite/locks.go

@@ -19,20 +19,20 @@ import (
 // Handles localhost/127.0.0.1 equivalence by returning both forms.
 func normalizeAddressVariants(address string) []string {
 	variants := []string{address}
-
+	
 	// Extract host and port
 	host, port, err := net.SplitHostPort(address)
 	if err != nil {
 		return variants
 	}
-
+	
 	// Add the alternate form for localhost/127.0.0.1
 	if host == "localhost" {
 		variants = append(variants, net.JoinHostPort("127.0.0.1", port))
 	} else if host == "127.0.0.1" {
 		variants = append(variants, net.JoinHostPort("localhost", port))
 	}
-
+	
 	return variants
 }
 
@@ -182,7 +182,7 @@ func (lm *LockManager) GetInstanceInfo(address string) (*common.CoreInstanceInfo
 
 	query := common.SelectInstanceLockByHolderSQL
 	variants := normalizeAddressVariants(address)
-
+	
 	var heldBy, lockTarget string
 	var lockedAt int64
 	var lastErr error
@@ -193,7 +193,7 @@ func (lm *LockManager) GetInstanceInfo(address string) (*common.CoreInstanceInfo
 		if err == nil {
 			// Found it!
 			return &common.CoreInstanceInfo{
-				CoreAddress:        heldBy,
+				Address:            heldBy,
 				HostServiceAddress: lockTarget,
 				Status:             grpc_health_v1.HealthCheckResponse_UNKNOWN,
 				LastSeen:           time.Unix(lockedAt/1000, 0),
@@ -204,7 +204,7 @@ func (lm *LockManager) GetInstanceInfo(address string) (*common.CoreInstanceInfo
 			lastErr = err
 		}
 	}
-
+	
 	// None of the variants were found
 	if lastErr != nil {
 		return nil, fmt.Errorf("failed to query instance: %w", lastErr)
@@ -235,7 +235,7 @@ func (lm *LockManager) ListInstancesWithHealthCheck(ctx context.Context) ([]*com
 		}
 
 		info := &common.CoreInstanceInfo{
-			CoreAddress:        lock.HeldBy,
+			Address:            lock.HeldBy,
 			HostServiceAddress: lock.LockTarget,
 			Status:             status,
 			LastSeen:           time.Unix(lock.LockedAt/1000, 0),

cli/pkg/cli/task.go

@@ -80,7 +80,7 @@ func ensureTaskManager(ctx context.Context, address string) error {
 		}
 
 		// Always set the instance we're using as the default
-		registry := global.Instances.GetRegistry()
+		registry := global.Clients.GetRegistry()
 		if err := registry.SetDefaultInstance(instanceAddress); err != nil {
 			// Log warning but don't fail - this is not critical
 			fmt.Printf("Warning: failed to set default instance: %v\n", err)
@@ -91,10 +91,10 @@ func ensureTaskManager(ctx context.Context, address string) error {
 
 // ensureInstanceAtAddress ensures an instance exists at the given address
 func ensureInstanceAtAddress(ctx context.Context, address string) error {
-	if global.Instances == nil {
+	if global.Clients == nil {
 		return fmt.Errorf("global clients not initialized")
 	}
-	return global.Instances.EnsureInstanceAtAddress(ctx, address)
+	return global.Clients.EnsureInstanceAtAddress(ctx, address)
 }
 
 func newTaskNewCommand() *cobra.Command {
@@ -117,7 +117,7 @@ func newTaskNewCommand() *cobra.Command {
 			ctx := cmd.Context()
 
 			// Check if an instance exists when no address specified
-			if address == "" && global.Instances.GetRegistry().GetDefaultInstance() == "" {
+			if address == "" && global.Clients.GetRegistry().GetDefaultInstance() == "" {
 				fmt.Println("No instances available for creating tasks")
 				return nil
 			}
@@ -230,7 +230,7 @@ func newTaskSendCommand() *cobra.Command {
 			ctx := cmd.Context()
 
 			// Check if an instance exists when no address specified
-			if address == "" && global.Instances.GetRegistry().GetDefaultInstance() == "" {
+			if address == "" && global.Clients.GetRegistry().GetDefaultInstance() == "" {
 				fmt.Println("No instances available for sending messages")
 				return nil
 			}
@@ -620,6 +620,11 @@ func CleanupTaskManager() {
 	}
 }
 
+// NewTaskManagerForAddress is an exported wrapper around task.NewManagerForAddress
+func NewTaskManagerForAddress(ctx context.Context, address string) (*task.Manager, error) {
+	return task.NewManagerForAddress(ctx, address)
+}
+
 // CreateAndFollowTask creates a new task and immediately follows it in interactive mode
 // This is used by the root command to provide a streamlined UX
 func CreateAndFollowTask(ctx context.Context, prompt string, opts TaskOptions) error {

cli/pkg/cli/task/input_handler.go

@@ -13,41 +13,38 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/cline/cli/pkg/cli/global"
 	"github.com/cline/cli/pkg/cli/output"
-	"github.com/cline/cli/pkg/cli/slash"
 	"github.com/cline/cli/pkg/cli/types"
 )
 
 // InputHandler manages interactive user input during follow mode
 type InputHandler struct {
-	manager              *Manager
-	coordinator          *StreamCoordinator
-	cancelFunc           context.CancelFunc
-	mu                   sync.RWMutex
-	isRunning            bool
-	pollTicker           *time.Ticker
-	program              *tea.Program
-	programRunning       bool
-	programDoneChan      chan struct{} // Signals when program actually exits
-	resultChan           chan output.InputSubmitMsg
-	cancelChan           chan struct{}
-	feedbackApproval     bool                // Track if we're in feedback after approval
-	feedbackApproved     bool                // Track the approval decision
-	approvalMessage      *types.ClineMessage // Store the approval message for determining action
-	slashCommandRegistry *slash.Registry     // Slash command registry for autocomplete
-	ctx                  context.Context     // Context for restart callback
+	manager          *Manager
+	coordinator      *StreamCoordinator
+	cancelFunc       context.CancelFunc
+	mu               sync.RWMutex
+	isRunning        bool
+	pollTicker       *time.Ticker
+	program          *tea.Program
+	programRunning   bool
+	programDoneChan  chan struct{} // Signals when program actually exits
+	resultChan       chan output.InputSubmitMsg
+	cancelChan       chan struct{}
+	feedbackApproval bool                // Track if we're in feedback after approval
+	feedbackApproved bool                // Track the approval decision
+	approvalMessage  *types.ClineMessage // Store the approval message for determining action
+	ctx              context.Context     // Context for restart callback
 }
 
 // NewInputHandler creates a new input handler
 func NewInputHandler(manager *Manager, coordinator *StreamCoordinator, cancelFunc context.CancelFunc) *InputHandler {
 	return &InputHandler{
-		manager:              manager,
-		coordinator:          coordinator,
-		cancelFunc:           cancelFunc,
-		isRunning:            false,
-		pollTicker:           time.NewTicker(500 * time.Millisecond),
-		resultChan:           make(chan output.InputSubmitMsg, 1),
-		slashCommandRegistry: slash.NewRegistry(context.Background()),
-		cancelChan:           make(chan struct{}, 1),
+		manager:     manager,
+		coordinator: coordinator,
+		cancelFunc:  cancelFunc,
+		isRunning:   false,
+		pollTicker:  time.NewTicker(500 * time.Millisecond),
+		resultChan:  make(chan output.InputSubmitMsg, 1),
+		cancelChan:  make(chan struct{}, 1),
 	}
 }
 
@@ -166,7 +163,7 @@ func (ih *InputHandler) Start(ctx context.Context, errChan chan error) {
 
 			if shouldSend {
 				// Check for mode switch commands first
-				newMode, remainingMessage, isModeSwitch := slash.ParseModeSwitch(message)
+				newMode, remainingMessage, isModeSwitch := ih.parseModeSwitch(message)
 				if isModeSwitch {
 					// Create styles for mode switch messages (respect global color profile)
 					actStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("39")).Bold(true)
@@ -287,9 +284,9 @@ func (ih *InputHandler) promptForInput(ctx context.Context) (string, bool, error
 	model := output.NewInputModelWithRegistry(
 		output.InputTypeMessage,
 		"Cline is ready for your message...",
-		"/plan or /act to switch modes\ntab to autocomplete commands\nctrl+e to open editor\nctrl+c to exit",
+		"/plan or /act to switch modes\nctrl+e to open editor\ntab to autocomplete commands",
 		currentMode,
-		ih.slashCommandRegistry,
+		ih.manager.GetSlashRegistry(),
 	)
 
 	return ih.runInputProgram(ctx, model)
@@ -305,7 +302,7 @@ func (ih *InputHandler) promptForApproval(ctx context.Context, msg *types.ClineM
 		"Let Cline use this tool?",
 		"",
 		ih.manager.GetCurrentMode(),
-		ih.slashCommandRegistry,
+		ih.manager.GetSlashRegistry(), // Pass registry for feedback input after approval
 	)
 
 	message, shouldSend, err := ih.runInputProgram(ctx, model)
@@ -481,6 +478,24 @@ func (w *inputProgramWrapper) View() string {
 	return w.model.View()
 }
 
+// parseModeSwitch checks if message starts with /act or /plan and extracts the mode and remaining message
+func (ih *InputHandler) parseModeSwitch(message string) (string, string, bool) {
+	trimmed := strings.TrimSpace(message)
+	lower := strings.ToLower(trimmed)
+
+	if strings.HasPrefix(lower, "/plan") {
+		remaining := strings.TrimSpace(trimmed[5:])
+		return "plan", remaining, true
+	}
+
+	if strings.HasPrefix(lower, "/act") {
+		remaining := strings.TrimSpace(trimmed[4:])
+		return "act", remaining, true
+	}
+
+	return "", message, false
+}
+
 // handleSpecialCommand processes special commands like /cancel, /exit
 func (ih *InputHandler) handleSpecialCommand(ctx context.Context, message string) bool {
 	switch strings.ToLower(strings.TrimSpace(message)) {

cli/pkg/cli/task/manager.go

@@ -14,6 +14,7 @@ import (
 	"github.com/cline/cli/pkg/cli/display"
 	"github.com/cline/cli/pkg/cli/global"
 	"github.com/cline/cli/pkg/cli/handlers"
+	"github.com/cline/cli/pkg/cli/slash"
 	"github.com/cline/cli/pkg/cli/types"
 	"github.com/cline/grpc-go/client"
 	"github.com/cline/grpc-go/cline"
@@ -32,11 +33,11 @@ type Manager struct {
 	clientAddress    string
 	state            *types.ConversationState
 	renderer         *display.Renderer
-	hookRenderer     *display.HookRenderer
 	toolRenderer     *display.ToolRenderer
 	systemRenderer   *display.SystemMessageRenderer
 	streamingDisplay *display.StreamingDisplay
 	handlerRegistry  *handlers.HandlerRegistry
+	slashRegistry    *slash.Registry
 	isStreamingMode  bool
 	isInteractive    bool
 	currentMode      string // "plan" or "act"
@@ -47,7 +48,6 @@ func NewManager(client *client.ClineClient) *Manager {
 	state := types.NewConversationState()
 	renderer := display.NewRenderer(global.Config.OutputFormat)
 	toolRenderer := display.NewToolRenderer(renderer.GetMdRenderer(), global.Config.OutputFormat)
-	hookRenderer := display.NewHookRenderer(renderer.GetMdRenderer(), global.Config.OutputFormat)
 	systemRenderer := display.NewSystemMessageRenderer(renderer, renderer.GetMdRenderer(), global.Config.OutputFormat)
 	streamingDisplay := display.NewStreamingDisplay(state, renderer)
 
@@ -61,11 +61,11 @@ func NewManager(client *client.ClineClient) *Manager {
 		clientAddress:    "", // Will be set when client is provided
 		state:            state,
 		renderer:         renderer,
-		hookRenderer:     hookRenderer,
 		toolRenderer:     toolRenderer,
 		systemRenderer:   systemRenderer,
 		streamingDisplay: streamingDisplay,
 		handlerRegistry:  registry,
+		slashRegistry:    slash.NewRegistry(),
 		currentMode:      "plan", // Default mode
 	}
 }
@@ -80,6 +80,9 @@ func NewManagerForAddress(ctx context.Context, address string) (*Manager, error)
 	manager := NewManager(client)
 	manager.clientAddress = address
 
+	// Fetch slash commands from backend (non-blocking, errors are logged)
+	manager.fetchSlashCommands(ctx)
+
 	return manager, nil
 }
 
@@ -93,13 +96,29 @@ func NewManagerForDefault(ctx context.Context) (*Manager, error) {
 	manager := NewManager(client)
 
 	// Get the default instance address
-	if global.Instances != nil {
-		manager.clientAddress = global.Instances.GetRegistry().GetDefaultInstance()
+	if global.Clients != nil {
+		manager.clientAddress = global.Clients.GetRegistry().GetDefaultInstance()
 	}
 
+	// Fetch slash commands from backend (non-blocking, errors are logged)
+	manager.fetchSlashCommands(ctx)
+
 	return manager, nil
 }
 
+// fetchSlashCommands fetches available slash commands from the backend
+// This is non-blocking and errors are logged but don't prevent manager creation
+func (m *Manager) fetchSlashCommands(ctx context.Context) {
+	if err := m.slashRegistry.FetchFromBackend(ctx, m.client); err != nil {
+		if global.Config.Verbose {
+			m.renderer.RenderDebug("Failed to fetch slash commands: %v", err)
+		}
+		// Non-fatal: CLI-local commands are still available
+	} else if global.Config.Verbose {
+		m.renderer.RenderDebug("Loaded %d slash commands", len(m.slashRegistry.GetCommands()))
+	}
+}
+
 // SwitchToInstance switches the manager to use a different Cline instance
 func (m *Manager) SwitchToInstance(ctx context.Context, address string) error {
 	m.mu.Lock()
@@ -970,15 +989,6 @@ func (m *Manager) processStateUpdate(stateUpdate *cline.State, coordinator *Stre
 				coordinator.MarkProcessedInCurrentTurn(msgKey)
 			}
 
-		case msg.Say == string(types.SayTypeCommandPermissionDenied):
-			msgKey := fmt.Sprintf("%d", msg.Timestamp)
-			if !coordinator.IsProcessedInCurrentTurn(msgKey) {
-				fmt.Println()
-				m.displayMessage(msg, false, false, i)
-
-				coordinator.MarkProcessedInCurrentTurn(msgKey)
-			}
-
 		case msg.Say == string(types.SayTypeBrowserActionLaunch):
 			msgKey := fmt.Sprintf("%d", msg.Timestamp)
 			if !coordinator.IsProcessedInCurrentTurn(msgKey) {
@@ -1033,26 +1043,6 @@ func (m *Manager) processStateUpdate(stateUpdate *cline.State, coordinator *Stre
 				coordinator.MarkProcessedInCurrentTurn(msgKey)
 			}
 
-		case msg.Say == string(types.SayTypeHookStatus):
-			msgKey := fmt.Sprintf("%d", msg.Timestamp)
-			if !coordinator.IsProcessedInCurrentTurn(msgKey) {
-				fmt.Println()
-				m.displayMessage(msg, false, false, i)
-
-				coordinator.MarkProcessedInCurrentTurn(msgKey)
-			}
-
-		case msg.Say == string(types.SayTypeHookOutputStream):
-			// Hook stdout/stderr streaming arrives as hook_output_stream messages.
-			// These are intentionally suppressed unless verbose (see SayHandler.handleHookOutputStream),
-			// but we still need to route them through the normal handler pipeline in streaming/follow
-			// mode so verbose users actually see `HOOK> ...` lines.
-			msgKey := fmt.Sprintf("%d", msg.Timestamp)
-			if !coordinator.IsProcessedInCurrentTurn(msgKey) {
-				m.displayMessage(msg, false, false, i)
-				coordinator.MarkProcessedInCurrentTurn(msgKey)
-			}
-
 		case msg.Say == string(types.SayTypeAPIReqStarted):
 			msgKey := fmt.Sprintf("%d", msg.Timestamp)
 			apiInfo := types.APIRequestInfo{Cost: -1}
@@ -1187,11 +1177,9 @@ func (m *Manager) displayMessage(msg *types.ClineMessage, isLast, isPartial bool
 			State:           m.state,
 			Renderer:        m.renderer,
 			ToolRenderer:    m.toolRenderer,
-			HookRenderer:    m.hookRenderer,
 			SystemRenderer:  m.systemRenderer,
 			IsLast:          isLast,
 			IsPartial:       isPartial,
-			Verbose:         global.Config.Verbose,
 			MessageIndex:    messageIndex,
 			IsStreamingMode: isStreaming,
 			IsInteractive:   isInteractive,
@@ -1298,6 +1286,11 @@ func (m *Manager) GetCurrentMode() string {
 	return m.currentMode
 }
 
+// GetSlashRegistry returns the slash command registry
+func (m *Manager) GetSlashRegistry() *slash.Registry {
+	return m.slashRegistry
+}
+
 // extractModeFromState extracts the current mode from state JSON
 func (m *Manager) extractModeFromState(stateJson string) string {
 	var rawState map[string]interface{}

cli/pkg/cli/task/settings_parser.go

@@ -290,12 +290,12 @@ func setSimpleField(settings *cline.Settings, key, value string) error {
 			return err
 		}
 		settings.ActModeAwsBedrockCustomSelected = boolPtr(val)
-	case "azure_identity":
+	case "hooks_enabled":
 		val, err := parseBool(value)
 		if err != nil {
 			return err
 		}
-		settings.AzureIdentity = boolPtr(val)
+		settings.HooksEnabled = boolPtr(val)
 
 	// Integer fields
 	case "request_timeout_ms":

cli/pkg/cli/types/messages.go

@@ -47,11 +47,11 @@ const (
 	AskTypeResumeTask          AskType = "resume_task"
 	AskTypeResumeCompletedTask AskType = "resume_completed_task"
 	AskTypeMistakeLimitReached AskType = "mistake_limit_reached"
-	AskTypeBrowserActionLaunch AskType = "browser_action_launch"
-	AskTypeUseMcpServer        AskType = "use_mcp_server"
-	AskTypeNewTask             AskType = "new_task"
-	AskTypeCondense            AskType = "condense"
-	AskTypeReportBug           AskType = "report_bug"
+	AskTypeBrowserActionLaunch    AskType = "browser_action_launch"
+	AskTypeUseMcpServer           AskType = "use_mcp_server"
+	AskTypeNewTask                AskType = "new_task"
+	AskTypeCondense               AskType = "condense"
+	AskTypeReportBug              AskType = "report_bug"
 )
 
 // SayType represents different types of SAY messages
@@ -87,11 +87,6 @@ const (
 	SayTypeLoadMcpDocumentation    SayType = "load_mcp_documentation"
 	SayTypeInfo                    SayType = "info"
 	SayTypeTaskProgress            SayType = "task_progress"
-	// Hook status streaming from the backend.
-	// These values must match the backend "say" strings emitted by the extension.
-	SayTypeHookStatus              SayType = "hook_status"
-	SayTypeHookOutputStream        SayType = "hook_output_stream"
-	SayTypeCommandPermissionDenied SayType = "command_permission_denied"
 )
 
 // ToolMessage represents a tool-related message
@@ -150,42 +145,6 @@ type APIRequestRetryStatus struct {
 	ErrorSnippet string `json:"errorSnippet,omitempty"`
 }
 
-// HookMessage represents hook execution metadata sent from the backend
-type HookMessage struct {
-	HookName        string     `json:"hookName"`                  // Type of hook (TaskStart, PreToolUse, etc.)
-	ToolName        string     `json:"toolName,omitempty"`        // Optional tool name for tool-specific hooks
-	Status          string     `json:"status"`                    // "running", "completed", "cancelled", or "failed"
-	ScriptPaths     []string   `json:"scriptPaths,omitempty"`     // Full paths to hook script(s)
-	PendingToolInfo *ToolInfo  `json:"pendingToolInfo,omitempty"` // Metadata about the pending tool execution (PreToolUse)
-	ExitCode        int        `json:"exitCode,omitempty"`        // Exit code for completed/failed hooks
-	HasJsonResponse bool       `json:"hasJsonResponse,omitempty"` // Whether hook returned JSON
-	Error           *HookError `json:"error,omitempty"`           // Error details if hook failed
-}
-
-// ToolInfo represents a compact subset of tool parameters for UI display.
-// This mirrors the extension's pendingToolInfo shape and is used by the CLI to
-// show what tool the PreToolUse hook is gating.
-type ToolInfo struct {
-	Tool        string `json:"tool"`
-	Path        string `json:"path,omitempty"`
-	Command     string `json:"command,omitempty"`
-	Content     string `json:"content,omitempty"`
-	Diff        string `json:"diff,omitempty"`
-	Regex       string `json:"regex,omitempty"`
-	Url         string `json:"url,omitempty"`
-	McpTool     string `json:"mcpTool,omitempty"`
-	McpServer   string `json:"mcpServer,omitempty"`
-	ResourceUri string `json:"resourceUri,omitempty"`
-}
-
-// HookError represents structured error information from a failed hook
-type HookError struct {
-	Type       string `json:"type"`                 // Error type: "execution", "timeout", "validation", etc.
-	Message    string `json:"message"`              // Human-readable error message
-	Details    string `json:"details,omitempty"`    // Additional error details
-	ScriptPath string `json:"scriptPath,omitempty"` // Path to script that failed
-}
-
 // GetTimestamp returns a formatted timestamp string
 func (m *ClineMessage) GetTimestamp() string {
 	return time.Unix(m.Timestamp/1000, 0).Format("15:04:05")
@@ -365,12 +324,6 @@ func convertProtoSayType(sayType cline.ClineSay) string {
 		return string(SayTypeInfo)
 	case cline.ClineSay_TASK_PROGRESS:
 		return string(SayTypeTaskProgress)
-	case cline.ClineSay_HOOK_STATUS:
-		return string(SayTypeHookStatus)
-	case cline.ClineSay_HOOK_OUTPUT_STREAM:
-		return string(SayTypeHookOutputStream)
-	case cline.ClineSay_COMMAND_PERMISSION_DENIED:
-		return string(SayTypeCommandPermissionDenied)
 	default:
 		return "unknown"
 	}

cli/pkg/cli/version.go

@@ -8,19 +8,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// VersionString returns the full version information string
-func VersionString() string {
-	return fmt.Sprintf(`Cline CLI
-Cline CLI Version:  %s
-Cline Core Version: %s
-Commit:             %s
-Built:              %s
-Built by:           %s
-Go version:         %s
-OS/Arch:            %s/%s
-`, global.CliVersion, global.Version, global.Commit, global.Date, global.BuiltBy, runtime.Version(), runtime.GOOS, runtime.GOARCH)
-}
-
 // NewVersionCommand creates the version command
 func NewVersionCommand() *cobra.Command {
 	var short bool
@@ -31,11 +18,21 @@ func NewVersionCommand() *cobra.Command {
 		Short:   "Show version information",
 		Long:    `Display version information for the Cline CLI.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
+			// Versions are injected at build time via ldflags
 			if short {
 				fmt.Println(global.CliVersion)
 				return nil
 			}
-			fmt.Print(VersionString())
+
+			fmt.Printf("Cline CLI\n")
+			fmt.Printf("Cline CLI Version:  %s\n", global.CliVersion)
+			fmt.Printf("Cline Core Version: %s\n", global.Version)
+			fmt.Printf("Commit:             %s\n", global.Commit)
+			fmt.Printf("Built:              %s\n", global.Date)
+			fmt.Printf("Built by:           %s\n", global.BuiltBy)
+			fmt.Printf("Go version:         %s\n", runtime.Version())
+			fmt.Printf("OS/Arch:            %s/%s\n", runtime.GOOS, runtime.GOARCH)
+
 			return nil
 		},
 	}

cli/pkg/common/types.go

@@ -10,7 +10,7 @@ import (
 // This is the canonical definition used across all CLI packages
 type CoreInstanceInfo struct {
 	// Full core address including port
-	CoreAddress string `json:"address"`
+	Address string `json:"address"`
 	// Host bridge service address that core holds (host is ALWAYS running on localhost FYI)
 	HostServiceAddress string                                           `json:"host_port"`
 	Status             grpc_health_v1.HealthCheckResponse_ServingStatus `json:"status"`
@@ -20,7 +20,7 @@ type CoreInstanceInfo struct {
 }
 
 func (c *CoreInstanceInfo) CorePort() int {
-	_, port, _ := ParseHostPort(c.CoreAddress)
+	_, port, _ := ParseHostPort(c.Address)
 	return port
 }
 

cli/pkg/hostbridge/diff.go

@@ -47,10 +47,7 @@ func (s *DiffService) generateDiffID() string {
 	return fmt.Sprintf("diff_%d_%d", os.Getpid(), id)
 }
 
-// splitLines splits content into lines, preserving trailing newlines.
-// This matches the behavior of JavaScript's String.split("\n"):
-// - "hello\nworld\n" -> ["hello", "world", ""]
-// - "hello\nworld" -> ["hello", "world"]
+// splitLines splits content into lines, preserving line ending information
 func splitLines(content string) []string {
 	if content == "" {
 		return []string{}
@@ -68,9 +65,10 @@ func splitLines(content string) []string {
 		}
 	}
 
-	// Always add the last segment - if content ends with newline, this will be
-	// an empty string which preserves the trailing newline when joined back
-	lines = append(lines, current)
+	// Add the last line if it doesn't end with newline
+	if current != "" {
+		lines = append(lines, current)
+	}
 
 	return lines
 }
@@ -178,19 +176,9 @@ func (s *DiffService) ReplaceText(ctx context.Context, req *proto.ReplaceTextReq
 		endLine = startLine
 	}
 
-	// Check if we're replacing to the end of the document
-	replacingToEnd := endLine >= len(session.lines)
-
 	// Split new content into lines
 	newLines := splitLines(newContent)
 
-	// Remove trailing empty line for proper splicing, BUT only when NOT replacing
-	// to the end of the document. When replacing to the end, keep the trailing
-	// empty string to preserve trailing newlines from the content.
-	if !replacingToEnd && len(newLines) > 0 && newLines[len(newLines)-1] == "" {
-		newLines = newLines[:len(newLines)-1]
-	}
-
 	// Ensure we have enough lines in the current content
 	for len(session.lines) < endLine {
 		session.lines = append(session.lines, "")

cli/pkg/hostbridge/disabled/watch.go

@@ -0,0 +1,39 @@
+package hostbridge
+
+import (
+	"log"
+
+	"github.com/cline/grpc-go/host"
+)
+
+// WatchService implements the host.WatchServiceServer interface
+type WatchService struct {
+	host.UnimplementedWatchServiceServer
+	coreAddress string
+	verbose     bool
+}
+
+// NewWatchService creates a new WatchService
+func NewWatchService(coreAddress string, verbose bool) *WatchService {
+	return &WatchService{
+		coreAddress: coreAddress,
+		verbose:     verbose,
+	}
+}
+
+// SubscribeToFile subscribes to file change notifications
+func (s *WatchService) SubscribeToFile(req *host.SubscribeToFileRequest, stream host.WatchService_SubscribeToFileServer) error {
+	if s.verbose {
+		log.Printf("SubscribeToFile called for path: %s", req.GetPath())
+	}
+
+	// For console implementation, we'll just log that we would watch the file
+	// In a real implementation, we'd use fsnotify or similar to watch file changes
+	log.Printf("[Cline] Would watch file: %s", req.GetPath())
+
+	// Keep the stream open but don't send any events for now
+	// In a real implementation, we'd send FileChangeEvent messages when files change
+	<-stream.Context().Done()
+
+	return nil
+}

cli/pkg/hostbridge/disabled/workspace.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"os"
 
-	"github.com/cline/grpc-go/cline"
 	"github.com/cline/grpc-go/host"
 )
 
@@ -44,25 +43,24 @@ func (s *WorkspaceService) GetWorkspacePaths(ctx context.Context, req *host.GetW
 // SaveOpenDocumentIfDirty saves an open document if it has unsaved changes
 func (s *WorkspaceService) SaveOpenDocumentIfDirty(ctx context.Context, req *host.SaveOpenDocumentIfDirtyRequest) (*host.SaveOpenDocumentIfDirtyResponse, error) {
 	if s.verbose {
-		log.Printf("SaveOpenDocumentIfDirty called for path: %v", req.FilePath)
+		log.Printf("SaveOpenDocumentIfDirty called for path: %s", req.GetPath())
 	}
 
 	// For console implementation, we'll assume the document is already saved
 	// In a real implementation, we'd check if the file has unsaved changes
-	f := false
 	return &host.SaveOpenDocumentIfDirtyResponse{
-		WasSaved: &f, // Assume no changes to save
+		WasSaved: false, // Assume no changes to save
 	}, nil
 }
 
 // GetDiagnostics returns diagnostic information for a file
 func (s *WorkspaceService) GetDiagnostics(ctx context.Context, req *host.GetDiagnosticsRequest) (*host.GetDiagnosticsResponse, error) {
 	if s.verbose {
-		log.Printf("GetDiagnostics called")
+		log.Printf("GetDiagnostics called for path: %s", req.GetPath())
 	}
 
 	// For console implementation, return empty diagnostics
 	return &host.GetDiagnosticsResponse{
-		FileDiagnostics: []*cline.FileDiagnostics{},
+		Diagnostics: []*host.Diagnostic{},
 	}, nil
 }

docs/docs.json

@@ -115,7 +115,6 @@
 							},
 							"features/auto-approve",
 							"features/auto-compact",
-							"features/background-edit",
 							"features/checkpoints",
 							"features/cline-rules",
 							{
@@ -148,10 +147,8 @@
 									"features/hooks/samples"
 								]
 							},
-							"features/jupyter-notebooks",
 							"features/multiroot-workspace",
 							"features/plan-and-act",
-							"features/skills",
 							{
 								"group": "Slash Commands",
 								"pages": [
@@ -178,7 +175,6 @@
 									"features/tasks/task-management"
 								]
 							},
-							"features/worktrees",
 							"features/yolo-mode"
 						]
 					},
@@ -199,7 +195,6 @@
 									"provider-config/anthropic",
 									"provider-config/claude-code",
 									"provider-config/openai",
-									"provider-config/openai-codex",
 									"provider-config/openrouter",
 									"provider-config/cerebras",
 									"provider-config/deepseek",

docs/enterprise-solutions/monitoring/opentelemetry_override.mdx

@@ -58,59 +58,59 @@ Enable OpenTelemetry and configure an OTLP endpoint:
 
 ```bash
 # Enable OpenTelemetry
-export CLINE_OTEL_TELEMETRY_ENABLED=true
+export OTEL_TELEMETRY_ENABLED=1
 
 # Configure metrics and logs export
-export CLINE_OTEL_METRICS_EXPORTER=otlp
-export CLINE_OTEL_LOGS_EXPORTER=otlp
+export OTEL_METRICS_EXPORTER=otlp
+export OTEL_LOGS_EXPORTER=otlp
 
 # Set your OTLP endpoint
-export CLINE_OTEL_EXPORTER_OTLP_ENDPOINT=https://your-collector:4317
+export OTEL_EXPORTER_OTLP_ENDPOINT=https://your-collector:4317
 
 # Optional: Set protocol (default is grpc)
-export CLINE_OTEL_EXPORTER_OTLP_PROTOCOL=grpc
+export OTEL_EXPORTER_OTLP_PROTOCOL=grpc
 ```
 
 ### Environment Variables
 
 | Variable | Description | Default |
 |----------|-------------|---------|
-| `CLINE_OTEL_TELEMETRY_ENABLED` | Enable OpenTelemetry (`true`) | Disabled |
-| `CLINE_OTEL_METRICS_EXPORTER` | Metrics exporter type (`console`, `otlp`, or both) | None |
-| `CLINE_OTEL_LOGS_EXPORTER` | Logs exporter type (`console`, `otlp`, or both) | None |
-| `CLINE_OTEL_EXPORTER_OTLP_ENDPOINT` | OTLP endpoint URL | None |
-| `CLINE_OTEL_EXPORTER_OTLP_PROTOCOL` | Protocol (`grpc`, `http/protobuf`, `http/json`) | `grpc` |
-| `CLINE_OTEL_EXPORTER_OTLP_INSECURE` | Allow insecure connections | `false` |
-| `CLINE_OTEL_EXPORTER_OTLP_HEADERS` | Custom headers (comma-separated `key=value` pairs) | None |
+| `OTEL_TELEMETRY_ENABLED` | Enable OpenTelemetry (`1` or `true`) | Disabled |
+| `OTEL_METRICS_EXPORTER` | Metrics exporter type (`console`, `otlp`, or both) | None |
+| `OTEL_LOGS_EXPORTER` | Logs exporter type (`console`, `otlp`, or both) | None |
+| `OTEL_EXPORTER_OTLP_ENDPOINT` | OTLP endpoint URL | None |
+| `OTEL_EXPORTER_OTLP_PROTOCOL` | Protocol (`grpc`, `http/protobuf`, `http/json`) | `grpc` |
+| `OTEL_EXPORTER_OTLP_INSECURE` | Allow insecure connections | `false` |
+| `OTEL_EXPORTER_OTLP_HEADERS` | Custom headers (comma-separated `key=value` pairs) | None |
 
 ### Advanced Configuration
 
 **Separate endpoints for metrics and logs:**
 ```bash
-export CLINE_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=https://metrics-collector:4317
-export CLINE_OTEL_EXPORTER_OTLP_LOGS_ENDPOINT=https://logs-collector:4317
+export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=https://metrics-collector:4317
+export OTEL_EXPORTER_OTLP_LOGS_ENDPOINT=https://logs-collector:4317
 ```
 
 **Custom headers for authentication:**
 ```bash
-export CLINE_OTEL_EXPORTER_OTLP_HEADERS="api-key=your-key,x-custom-header=value"
+export OTEL_EXPORTER_OTLP_HEADERS="api-key=your-key,x-custom-header=value"
 ```
 
 **Multiple exporters (console + OTLP):**
 ```bash
-export CLINE_OTEL_METRICS_EXPORTER=console,otlp
-export CLINE_OTEL_LOGS_EXPORTER=console,otlp
+export OTEL_METRICS_EXPORTER=console,otlp
+export OTEL_LOGS_EXPORTER=console,otlp
 ```
 
 **Export intervals:**
 ```bash
 # Metrics export interval in milliseconds (default: 60000)
-export CLINE_OTEL_METRIC_EXPORT_INTERVAL=30000
+export OTEL_METRIC_EXPORT_INTERVAL=30000
 
 # Logs batch size and timeout
-export CLINE_OTEL_LOG_BATCH_SIZE=512
-export CLINE_OTEL_LOG_BATCH_TIMEOUT=5000
-export CLINE_OTEL_LOG_MAX_QUEUE_SIZE=2048
+export OTEL_LOG_BATCH_SIZE=512
+export OTEL_LOG_BATCH_TIMEOUT=5000
+export OTEL_LOG_MAX_QUEUE_SIZE=2048
 ```
 
 ## Integration Examples
@@ -120,11 +120,11 @@ export CLINE_OTEL_LOG_MAX_QUEUE_SIZE=2048
 Export to Datadog using their OTLP endpoint:
 
 ```bash
-export CLINE_OTEL_TELEMETRY_ENABLED=true
-export CLINE_OTEL_METRICS_EXPORTER=otlp
-export CLINE_OTEL_LOGS_EXPORTER=otlp
-export CLINE_OTEL_EXPORTER_OTLP_ENDPOINT=https://api.datadoghq.com
-export CLINE_OTEL_EXPORTER_OTLP_HEADERS="dd-api-key=YOUR_DD_API_KEY"
+export OTEL_TELEMETRY_ENABLED=1
+export OTEL_METRICS_EXPORTER=otlp
+export OTEL_LOGS_EXPORTER=otlp
+export OTEL_EXPORTER_OTLP_ENDPOINT=https://api.datadoghq.com
+export OTEL_EXPORTER_OTLP_HEADERS="dd-api-key=YOUR_DD_API_KEY"
 ```
 
 ### New Relic
@@ -132,11 +132,11 @@ export CLINE_OTEL_EXPORTER_OTLP_HEADERS="dd-api-key=YOUR_DD_API_KEY"
 Export to New Relic:
 
 ```bash
-export CLINE_OTEL_TELEMETRY_ENABLED=true
-export CLINE_OTEL_METRICS_EXPORTER=otlp
-export CLINE_OTEL_LOGS_EXPORTER=otlp
-export CLINE_OTEL_EXPORTER_OTLP_ENDPOINT=https://otlp.nr-data.net:4317
-export CLINE_OTEL_EXPORTER_OTLP_HEADERS="api-key=YOUR_NEW_RELIC_LICENSE_KEY"
+export OTEL_TELEMETRY_ENABLED=1
+export OTEL_METRICS_EXPORTER=otlp
+export OTEL_LOGS_EXPORTER=otlp
+export OTEL_EXPORTER_OTLP_ENDPOINT=https://otlp.nr-data.net:4317
+export OTEL_EXPORTER_OTLP_HEADERS="api-key=YOUR_NEW_RELIC_LICENSE_KEY"
 ```
 
 ### Grafana Cloud
@@ -144,11 +144,11 @@ export CLINE_OTEL_EXPORTER_OTLP_HEADERS="api-key=YOUR_NEW_RELIC_LICENSE_KEY"
 Export to Grafana Cloud:
 
 ```bash
-export CLINE_OTEL_TELEMETRY_ENABLED=true
-export CLINE_OTEL_METRICS_EXPORTER=otlp
-export CLINE_OTEL_LOGS_EXPORTER=otlp
-export CLINE_OTEL_EXPORTER_OTLP_ENDPOINT=https://otlp-gateway-prod-us-central-0.grafana.net/otlp
-export CLINE_OTEL_EXPORTER_OTLP_HEADERS="Authorization=Basic YOUR_BASE64_CREDENTIALS"
+export OTEL_TELEMETRY_ENABLED=1
+export OTEL_METRICS_EXPORTER=otlp
+export OTEL_LOGS_EXPORTER=otlp
+export OTEL_EXPORTER_OTLP_ENDPOINT=https://otlp-gateway-prod-us-central-0.grafana.net/otlp
+export OTEL_EXPORTER_OTLP_HEADERS="Authorization=Basic YOUR_BASE64_CREDENTIALS"
 ```
 
 
@@ -158,9 +158,9 @@ Test your configuration with console output before sending to a real endpoint:
 
 ```bash
 # Enable console output to see what data would be exported
-export CLINE_OTEL_TELEMETRY_ENABLED=true
-export CLINE_OTEL_METRICS_EXPORTER=console
-export CLINE_OTEL_LOGS_EXPORTER=console
+export OTEL_TELEMETRY_ENABLED=1
+export OTEL_METRICS_EXPORTER=console
+export OTEL_LOGS_EXPORTER=console
 ```
 
 Then launch Cline and check the console output for metrics and logs.
@@ -171,20 +171,20 @@ Then launch Cline and check the console output for metrics and logs.
 
 1. **Verify OpenTelemetry is enabled:**
    ```bash
-   echo $CLINE_OTEL_TELEMETRY_ENABLED
+   echo $OTEL_TELEMETRY_ENABLED
    ```
-   Should output `true`
+   Should output `1` or `true`
 
 2. **Check exporters are configured:**
    ```bash
-   echo $CLINE_OTEL_METRICS_EXPORTER
-   echo $CLINE_OTEL_LOGS_EXPORTER
+   echo $OTEL_METRICS_EXPORTER
+   echo $OTEL_LOGS_EXPORTER
    ```
 
 3. **Test with console exporter first:**
    ```bash
-   export CLINE_OTEL_METRICS_EXPORTER=console
-   export CLINE_OTEL_LOGS_EXPORTER=console
+   export OTEL_METRICS_EXPORTER=console
+   export OTEL_LOGS_EXPORTER=console
    ```
 
 ### Connection Errors
@@ -196,7 +196,7 @@ Then launch Cline and check the console output for metrics and logs.
 
 2. **Check if insecure mode is needed:**
    ```bash
-   export CLINE_OTEL_EXPORTER_OTLP_INSECURE=true
+   export OTEL_EXPORTER_OTLP_INSECURE=true
    ```
 
 3. **Verify authentication headers:**

docs/features/auto-approve.mdx

@@ -48,7 +48,7 @@ These labels match what you see in the Auto Approve menu.
 | Execute all commands | Run commands marked as requiring approval | Requires “Execute safe commands” |
 | Use the browser | Allows use of the browser tool for web fetching and searching | Proxy issues can apply |
 | Use MCP servers | Use MCP tools and access MCP resources | Some servers also have per-tool auto-approve |
-| Enable notifications | Notifies you about long-running auto-approved commands | Accessible directly in the Auto Approve menu |
+| Enable notifications | Notifies you about long-running auto-approved commands | Helpful for terminal work |
 
 <Warning>
 	“Read all files” and “Edit all files” only matter if their base toggle is enabled. They extend access outside your workspace.
@@ -92,9 +92,6 @@ These are examples, not guarantees.
 
 Auto-approved actions can run for a while, especially long terminal commands. If you enable notifications, Cline can notify you when an auto-approved command has been running for a while and may need attention.
 
-The **Enable notifications** toggle is located at the bottom of the Auto Approve menu, below a separator line. This puts the notification setting right where you manage your auto-approval permissions, making it easy to discover and adjust.
-
-
 ## Recommendations
 
 A good default setup is:

docs/features/background-edit.mdx

@@ -1,51 +0,0 @@
----
-title: "Background Edit"
-sidebarTitle: "Background Edit"
----
-
-Background Edit lets Cline make file changes without opening the diff editor, so you can keep writing code while Cline works on other files in the background.
-
-<Note>
-  This feature is marked as experimental.
-</Note>
-
-## How It Works
-
-By default, Cline opens a side-by-side diff editor tab for each file it modifies. With Background Edit enabled:
-
-- Edits write directly to your files without opening new tabs
-- Changes appear as collapsible diff blocks in the chat panel
-- Your editor focus stays on whatever file you had open
-
-## Enabling Background Edit
-
-1. Click the settings icon (gear) in the top-right corner of the Cline panel
-2. Go to "**Feature Settings**"
-3. Toggle "**Enable Background Edit**" on
-
-## Viewing Changes
-
-File changes display directly in the chat panel with:
-
-- **File action icons** showing whether the file was added, updated, or deleted
-- **Stats** showing additions (+) and deletions (-) at a glance
-- **Collapsible diffs** you can expand or collapse by clicking the file header
-- **Real-time streaming** as changes appear line-by-line
-
-Green highlights additions, red highlights deletions.
-
-## When to Use It
-
-This feature works well when you:
-
-- Use [auto-approve mode](/features/auto-approve) and prefer reviewing changes after the fact
-- Work on tasks with many small file changes
-- Want to stay focused on your current file
-
-Stick with the default diff editor if you prefer reviewing each change before it saves, or need to make inline edits to Cline's proposed changes.
-
-## Relationship with Other Features
-
-- **Checkpoints**: Still created after each file operation
-- **Auto-approve**: Pairs well for uninterrupted workflows
-- **Message editing**: Restoring from a previous message works as expected

docs/features/jupyter-notebooks.mdx

@@ -1,112 +0,0 @@
----
-title: "Jupyter Notebooks"
-description: "AI-assisted editing of Jupyter notebooks with cell-level context awareness"
----
-
-# Jupyter Notebooks
-
-Cline provides comprehensive support for Jupyter notebooks (`.ipynb` files), enabling AI-assisted editing with full cell-level context awareness. This feature was developed in collaboration with Amazon to bring AI coding assistance to data science workflows.
-
-## Getting started
-
-Jupyter notebook support is a built-in feature of Cline. To use it, you just need to have the Jupyter notebook extension enabled in VS Code. Once you open any `.ipynb` file, you'll see AI-assisted buttons in your notebook interface.
-
-## How to use
-
-### Generate Cell
-
-Click the sparkle icon (✨) in the notebook toolbar to generate new cells with AI assistance.
-
-![Generate Cell demo](../assets/jupyter-generate-cell.gif)
-
-**How it works:** The AI receives context from surrounding cells, so it understands the variables and imports already in scope. This means you can reference existing DataFrames, functions, and other objects without re-explaining them.
-
-**Example prompt:** "Create a visualization showing the correlation matrix of numeric columns with a heatmap"
-
-The cell is inserted with proper notebook JSON structure, preserving metadata and ready to execute.
-
-### Explain Cell
-
-Click the Explain button in any cell's title bar to get a detailed explanation of what the cell does.
-
-This is useful for:
-
-- Revisiting old notebooks
-- Onboarding to a teammate's analysis
-- Understanding complex transformations
-
-**How it works:** Cline extracts the full cell context, including outputs, so explanations can reference actual results like column names, row counts, and computed values.
-
-### Improve Cell
-
-Click the Improve button in any cell's title bar to enhance existing cells with AI suggestions.
-
-![Explain and Improve Cell demo](../assets/jupyter-explain-improve-cell.gif)
-
-Use this to:
-
-- Optimize slow pandas operations
-- Add error handling
-- Refactor for clarity
-- Convert loops to vectorized operations
-
-**How it works:** Cline suggests improvements while preserving the cell's position and metadata in the notebook structure. The AI explains what was changed and why.
-
-## How cell context works
-
-Unlike traditional file editing, Jupyter notebooks are JSON documents containing arrays of cells. Each cell has its own type, source content, metadata, execution count, and outputs.
-
-When you use a Jupyter command, Cline extracts structured context that includes:
-
-- **Cell type** (code, markdown, or raw)
-- **Source content** as an array of lines
-- **Cell metadata** and configuration
-- **Execution count** for code cells
-- **Outputs** including data, text, and error traces
-
-This structured representation allows the AI to understand not just the code, but its context within the notebook and its actual output.
-
-### JSON structure preservation
-
-Cline is designed to work carefully with the cell JSON structure, aiming to:
-
-- Keep cell boundaries intact
-- Preserve execution counts
-- Maintain cell metadata
-- Keep outputs associated with their source cells
-
-The AI is specifically prompted to preserve notebook structure, though you should always review changes to ensure your notebook format remains correct.
-
-## Keyboard shortcuts
-
-You can bind any of these commands to keyboard shortcuts for faster access:
-
-1. Open VS Code keyboard shortcuts (Cmd/Ctrl + K, Cmd/Ctrl + S)
-2. Search for `cline.jupyterGenerateCell`, `cline.jupyterExplainCell`, or `cline.jupyterImproveCell`
-3. Assign your preferred key combinations
-
-## Tips for best results
-
-**For Generate Cell:**
-- Be specific about what you want the cell to do
-- Reference existing variables by name (the AI can see them)
-- Mention preferred libraries if you have a preference (e.g., "use seaborn" or "use plotly")
-
-**For Explain Cell:**
-- Works best on cells that have been executed (outputs provide additional context)
-- Good for complex chained operations like pandas groupby/merge sequences
-
-**For Improve Cell:**
-- Mention what aspect you want to improve (performance, readability, error handling)
-- The AI will explain the changes it suggests
-
-## Limitations
-
-- Notebook support requires the Jupyter notebook extension to be enabled in VS Code
-- Cell context extraction depends on VS Code's notebook API
-- Very large notebooks may require more context than some models can handle efficiently
-
-## Related
-
-- [Cline Tools Guide](/exploring-clines-tools/cline-tools-guide) -- Overview of all Cline commands
-- [Model Selection Guide](/core-features/model-selection-guide) -- Choosing the right model for your workflow

docs/features/skills.mdx

@@ -1,231 +0,0 @@
----
-title: "Skills"
-sidebarTitle: "Skills"
-description: "Extend Cline with reusable, on-demand instruction sets for specialized tasks"
----
-
-Skills are modular instruction sets that extend Cline's capabilities for specific tasks. Each skill packages detailed guidance, workflows, and optional resources that Cline loads only when relevant to your request.
-
-Unlike rules (which are always active), skills load on-demand. You can install dozens of skills without affecting context or performance because Cline only sees the skill name and description until it's actually needed.
-
-<Note>
-Skills is an experimental feature. Enable it in Settings → Features → Enable Skills.
-</Note>
-
-## Why Skills?
-
-Consider how you'd onboard a new team member: you wouldn't dump every document on them at once. You'd give them a brief overview, then point them to detailed guides when they're working on specific tasks.
-
-Skills work the same way:
-- **At startup**: Cline sees only a brief description of each skill
-- **When triggered**: Cline loads the full instructions for that specific skill
-- **As needed**: Skills can bundle additional files that Cline reads only when referenced
-
-This progressive loading means you can package extensive domain knowledge without burning context tokens on information that isn't relevant to the current task.
-
-## Creating a Skill
-
-Every skill is a directory containing a `SKILL.md` file with YAML frontmatter:
-
-```
-my-skill/
-├── SKILL.md          # Required: main instructions
-├── docs/             # Optional: additional documentation
-│   └── advanced.md
-└── scripts/          # Optional: utility scripts
-    └── helper.sh
-```
-
-The `SKILL.md` file has two parts: metadata and instructions.
-
-```yaml
----
-name: my-skill
-description: Brief description of what this skill does and when to use it.
----
-
-# My Skill
-
-Detailed instructions for Cline to follow when this skill is activated.
-
-## Steps
-
-1. First, do this
-2. Then do that
-3. For advanced usage, see [advanced.md](docs/advanced.md)
-```
-
-**Required fields:**
-- `name`: Must exactly match the directory name
-- `description`: Tells Cline when to use this skill (max 1024 characters)
-
-The description is critical because it's how Cline decides whether to activate a skill. Be specific about what the skill does and when it should be used.
-
-## Where Skills Live
-
-Skills can be stored in two locations:
-
-**Global Skills** apply to all your projects:
-- **macOS/Linux:** `~/.cline/skills/`
-- **Windows:** `C:\Users\USERNAME\.cline\skills\`
-
-**Project Skills** apply only to the current workspace:
-- `.cline/skills/` (recommended)
-- `.clinerules/skills/`
-- `.claude/skills/` (for Claude Code compatibility)
-
-When a global skill and project skill have the same name, the global skill takes precedence. This lets you customize skills for your personal workflow while still using project defaults.
-
-## Managing Skills
-
-Click the scale icon below the chat input to open the rules and workflows panel. When skills are enabled, you'll see a Skills tab where you can:
-
-- View all available skills (global and workspace)
-- Toggle individual skills on or off
-- Create new skills from a template
-- Delete skills you no longer need
-
-Skills are enabled by default when discovered. Toggle them off if you want them available but not active for the current project.
-
-## How Cline Uses Skills
-
-When you send a message, Cline sees a list of available skills with their descriptions. If your request matches a skill's description, Cline activates it using the `use_skill` tool, which loads the full instructions.
-
-For example, if you have a skill for deploying to AWS:
-
-```yaml
----
-name: aws-deploy
-description: Deploy applications to AWS using CDK. Use when deploying, updating infrastructure, or managing AWS resources.
----
-```
-
-Asking "deploy this to AWS" would trigger Cline to activate the skill, load its detailed instructions, and follow them to complete your request.
-
-## Example: Data Analysis Skill
-
-Here's a practical skill for data analysis tasks. Create a directory called `data-analysis/` with this `SKILL.md`:
-
-```yaml
----
-name: data-analysis
-description: Analyze data files and generate insights. Use when working with CSV, Excel, or JSON data files that need exploration, cleaning, or visualization.
----
-```
-
-Then add the instructions in the body of the file:
-
-````markdown
-# Data Analysis
-
-When analyzing data files, follow this workflow:
-
-## 1. Understand the Data
-
-- Read a sample of the file to understand its structure
-- Identify column types and data quality issues
-- Note any missing values or anomalies
-
-## 2. Ask Clarifying Questions
-
-Before diving in, ask the user:
-- What specific insights are they looking for?
-- Are there any known data quality issues?
-- What format do they want for the output?
-
-## 3. Perform Analysis
-
-Use pandas for data manipulation:
-
-```python
-import pandas as pd
-
-# Load and explore
-df = pd.read_csv("data.csv")
-print(df.head())
-print(df.describe())
-print(df.info())
-```
-
-For visualization, prefer matplotlib or seaborn depending on complexity.
-
-## 4. Present Findings
-
-- Start with a summary of key insights
-- Support findings with specific numbers
-- Include visualizations where they add clarity
-- End with recommendations or next steps
-````
-
-## Bundling Supporting Files
-
-Skills can include additional files that Cline accesses only when needed:
-
-```
-complex-skill/
-├── SKILL.md
-├── docs/
-│   ├── setup.md
-│   └── troubleshooting.md
-├── templates/
-│   └── config.yaml
-└── scripts/
-    └── validate.py
-```
-
-Reference these in your instructions:
-
-````markdown
-For initial setup, follow [setup.md](docs/setup.md).
-
-Use the config template at `templates/config.yaml` as a starting point.
-
-Run the validation script to check your configuration:
-```bash
-python scripts/validate.py
-```
-````
-
-Cline reads these files using `read_file` when the instructions reference them. Scripts can be executed directly, with only the output entering the context (not the script code itself).
-
-## Ideas for Skills
-
-Skills shine when you have tasks that:
-- Require detailed, multi-step workflows
-- Need domain-specific knowledge or best practices
-- Would otherwise require repeating the same instructions across conversations
-
-Some possibilities:
-
-- **Release management**: Version bumping, changelog generation, git tagging, and publishing
-- **Code review**: Your team's specific review checklist and quality standards
-- **Database migrations**: Safely evolving schemas with rollback procedures
-- **API integration**: Connecting to specific third-party services with proper error handling
-- **Documentation**: Your preferred structure, style guide, and tooling
-- **Debugging workflows**: Systematic approaches to diagnosing specific types of issues
-- **Infrastructure**: Terraform/CDK patterns for your cloud setup
-
-The best skills encode institutional knowledge that would otherwise live only in experienced developers' heads.
-
-## Skills vs Rules vs Workflows
-
-| Feature | Purpose | When Active |
-|---------|---------|-------------|
-| **Rules** | Define how Cline should behave | Always (or contextually) |
-| **Workflows** | Step-by-step task automation | Invoked with `/workflow.md` |
-| **Skills** | Domain expertise loaded on-demand | Triggered by matching requests |
-
-**Rules** set constraints and preferences (like "always use TypeScript" or "follow this style guide").
-
-**Workflows** are explicit sequences you invoke for specific tasks (like `/release.md` for a release process).
-
-**Skills** are expertise that Cline activates automatically when relevant (like data analysis knowledge when you're working with CSV files).
-
-Use rules for ongoing constraints, workflows for explicit automation, and skills for domain knowledge that should be available but not always active.
-
-## Related Features
-
-- [Cline Rules](/features/cline-rules) for always-active project guidance
-- [Workflows](/features/slash-commands/workflows/index) for explicit task automation
-- [Hooks](/features/hooks/index) for injecting custom logic at key moments
-

docs/features/slash-commands/workflows/best-practices.mdx

@@ -120,38 +120,8 @@ Controls a built-in browser to interact with websites or local servers. Useful f
 </browser_action>
 ```
 
-### Leveraging MCP Tools
-
-MCP tools allow Cline to interact with external services like GitHub, Slack, or databases. You can reference them in your workflows using natural language or explicit XML tags for deterministic control.
-
-#### Natural Language (Heuristic)
-
-Most of the time, the simplest way to use an MCP tool is to describe the action you want Cline to take.
-
-```markdown
-1. Fetch the latest issues from the github-repo MCP server.
-2. Summarize the critical bugs.
-3. Post the summary to the #engineering channel using the slack-notifications MCP.
-```
-
-#### Explicit XML Tag (Deterministic)
-
-For critical automation where you need exact control over parameters, use the `use_mcp_tool` tag.
-
-```xml
-<use_mcp_tool>
-  <server_name>github-repo-manager</server_name>
-  <tool_name>create_issue</tool_name>
-  <arguments>
-    {
-      "owner": "cline",
-      "repo": "cline",
-      "title": "Automated Bug Report",
-      "body": "Found a regression in the latest build."
-    }
-  </arguments>
-</use_mcp_tool>
-```
+### Leverage MCP Tools
+You can use Model Context Protocol (MCP) tools within your workflows to interact with external services like GitHub, Slack, or databases. This allows you to create powerful end-to-end automations.
 
 ### Manage Context Window
 Be mindful of Cline's context window. If a workflow is too long or processes too much data, it might exceed the token limit.

docs/features/web-tools.mdx

@@ -1,55 +0,0 @@
----
-title: "Web Tools"
-sidebarTitle: "Web Tools"
-description: "Search the web and fetch content from URLs directly within Cline"
----
-
-Web Tools give Cline the ability to search the internet and fetch content from specific URLs during your tasks. This is useful when you need up-to-date information, documentation lookups, or research that goes beyond your local codebase and the LLM's internal knowledge.
-
-<Warning>
-	Web Tools require the **Cline provider**. They are not available when using other providers like OpenRouter, Anthropic, AWS Bedrock, etc.
-</Warning>
-
-## How Web Tools Work
-
-Cline has two web tools:
-
-- **web_search**: Searches the web and returns a list of relevant webpages based on your query
-- **web_fetch**: Fetches and analyzes content from a specific URL
-
-When Cline determines that web information would help complete your task, it will use these tools automatically. The tools call Cline's backend API, which handles the search or fetch operation and returns the results.
-
-## Enabling Web Tools
-
-Web Tools are available when using the Cline provider. To use them:
-
-1. Make sure you're signed in to Cline
-2. Ensure you're using the Cline provider
-3. Enable the Web Tools toggle in the Feature Settings menu
-
-<Note>
-	Web tools can be auto-approved using the "Use the browser" setting in [Auto Approve](/features/auto-approve).
-</Note>
-
-## Use Cases
-
-### Looking Up Documentation
-
-When working with unfamiliar libraries or APIs:
-- Search for official documentation
-- Fetch specific API reference pages
-- Get examples and usage patterns
-
-### Research Before Implementation
-
-Before implementing a feature:
-- Search for best practices and common patterns
-- Find recent discussions about approaches
-- Look up known issues or limitations
-
-### Checking Latest Information
-
-For time-sensitive information:
-- Latest release notes and changelogs
-- Recent bug fixes or security updates
-- Current recommended versions

docs/features/worktrees.mdx

@@ -1,270 +0,0 @@
----
-title: "Worktrees"
-sidebarTitle: "Worktrees"
----
-
-Worktrees let you work on multiple branches simultaneously, each in its own folder. This enables Cline to work on tasks in parallel across separate VS Code windows, or lets Cline work independently while you continue coding in your main workspace.
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/worktrees-overview.png"
-		alt="Worktrees view showing multiple linked worktrees"
-	/>
-</Frame>
-
-## What Are Git Worktrees?
-
-A Git worktree is a linked copy of your repository in a separate folder, checked out to a specific branch. All worktrees share the same Git history and `.git` directory, but each has its own working directory with different code checked out.
-
-Key concepts:
-- **Main worktree**: Your original repository folder where the `.git` directory lives
-- **Linked worktrees**: Additional folders you create, each checked out to a different branch
-- **Shared history**: All worktrees share commits, branches, and Git configuration
-
-<Tip>
-  Unlike regular branch switching, worktrees let you have multiple branches checked out at the same time in different folders. This means you can have VS Code windows open for different features simultaneously.
-</Tip>
-
-## Why Use Worktrees with Cline?
-
-Worktrees solve a common problem: **Cline takes over your VS Code window while working on a task**. With worktrees, you can:
-
-1. **Run Cline in parallel** - Have Cline work on multiple tasks simultaneously, each in its own worktree and VS Code window
-2. **Keep working while Cline works** - Let Cline handle a task in a separate worktree while you continue coding in your main workspace
-3. **Isolate experimental changes** - Test risky changes in a worktree without affecting your main branch
-4. **Quick context switching** - Jump between features without stashing or committing incomplete work
-
-## Getting Started
-
-### Quick Launch (Recommended)
-
-The fastest way to start using worktrees is the **New Worktree Window** button on Cline's home screen:
-
-1. Click **New Worktree Window** on the home screen
-2. Enter a branch name and folder path (defaults are auto-filled)
-3. Click **Create & Open**
-
-A new VS Code window opens with your worktree, and Cline automatically opens ready to work.
-
-<Tip>
-  The home screen also shows your current branch and worktree path. Click it to open the full Worktrees view.
-</Tip>
-
-### Full Worktrees View
-
-For more control, open the full Worktrees view by clicking the **Worktrees** button in the Cline sidebar header, or by clicking your current branch info on the home screen:
-
-<Steps>
-  <Step title="Create a New Worktree">
-    Click **New Worktree** at the bottom of the view. Enter a branch name and path (defaults are auto-filled).
-  </Step>
-  <Step title="Open in New Window">
-    Once created, click the **Open in new window** button to open the worktree in a separate VS Code window. Cline will automatically open in the new window.
-  </Step>
-</Steps>
-
-## Typical Workflow
-
-Here's how a typical worktree session looks:
-
-<Steps>
-  <Step title="Create a new worktree">
-    Click **New Worktree Window** on the home screen or use the Worktrees view. A new VS Code window opens with Cline ready to go.
-  </Step>
-  <Step title="Do your work">
-    Work on your feature or let Cline handle a task. Make commits as you go.
-  </Step>
-  <Step title="Close the worktree window">
-    When you're done, close the worktree's VS Code window.
-  </Step>
-  <Step title="Merge from your primary worktree">
-    Back in your main VS Code window, open the Worktrees view and click the **merge button** on the worktree you just worked in. This merges the branch and optionally deletes the worktree.
-  </Step>
-</Steps>
-
-## Managing Worktrees
-
-### Viewing Worktrees
-
-The Worktrees view shows all worktrees for your repository:
-
-- **Current**: The worktree you're currently in (highlighted)
-- **Main**: The primary worktree where your `.git` directory lives (cannot be deleted)
-- **Locked**: Worktrees that are locked to prevent accidental deletion
-
-### Opening Worktrees
-
-Each worktree has two open options:
-- **Open in current window**: Replace your current workspace with the worktree
-- **Open in new window**: Open the worktree in a separate VS Code window (recommended for parallel Cline sessions)
-
-Either way, Cline automatically opens in the new workspace, ready to start a task.
-
-### Deleting Worktrees
-
-Click the trash icon on any linked worktree to delete it. A confirmation dialog will show you exactly what will be deleted:
-- The branch itself
-- All project files in the worktree folder
-
-<Warning>
-  Deleting a worktree permanently removes the branch and all files in that folder. Make sure any important changes are committed and pushed first.
-</Warning>
-
-<Note>
-  You cannot delete the main worktree. It's the primary repository where your `.git` directory lives.
-</Note>
-
-### Merging Worktrees
-
-When you're done working in a worktree and ready to merge your changes back to the main branch:
-
-1. Click the **merge icon** (git merge symbol) on any linked worktree
-2. Review the merge details in the confirmation modal
-3. Choose whether to delete the worktree after merging
-4. Click **Merge**
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/worktrees-merge.png"
-		alt="Merge worktree modal"
-	/>
-</Frame>
-
-#### Handling Merge Conflicts
-
-If your branch has conflicts with the main branch, Cline will detect them and show you the conflicting files. You have two options:
-
-1. **Ask Cline to Resolve & Merge** - Creates a new Cline task with a prompt asking Cline to resolve the conflicts, complete the merge, and clean up the worktree
-2. **Resolve Manually** - Close the modal and resolve conflicts yourself using your preferred Git tools
-
-<Tip>
-  The "Ask Cline to Resolve" option is particularly useful for complex conflicts. Cline will analyze the conflicting files and attempt to merge them intelligently based on the intent of both branches.
-</Tip>
-
-## .worktreeinclude: Automatic File Copying
-
-When you create a new worktree, it starts with a fresh checkout—no `node_modules`, no build artifacts, no IDE settings. This means you'd normally need to run `npm install` or similar setup commands.
-
-The `.worktreeinclude` file solves this by automatically copying specified files to new worktrees.
-
-### How It Works
-
-1. Create a `.worktreeinclude` file in your repository root
-2. Add glob patterns for files you want copied (using `.gitignore` syntax)
-3. When Cline creates a new worktree, files matching **both** `.worktreeinclude` **and** `.gitignore` are copied automatically
-
-<Note>
-  Only files that are both matched by `.worktreeinclude` AND listed in `.gitignore` are copied. This prevents accidentally duplicating tracked files.
-</Note>
-
-### Example `.worktreeinclude`
-
-```gitignore
-# Copy node_modules to avoid npm install
-node_modules/
-
-# Copy IDE settings
-.vscode/
-
-# Copy build cache
-.next/
-dist/
-
-# Copy environment files (if gitignored)
-.env.local
-```
-
-### Creating a `.worktreeinclude` File
-
-The Worktrees view will show a tip if you don't have a `.worktreeinclude` file. If you have a `.gitignore`, you can click **Create from .gitignore** to create one pre-filled with your gitignore contents. Then edit it to keep only the patterns you want copied.
-
-<Tip>
-  For most JavaScript/TypeScript projects, just including `node_modules/` in your `.worktreeinclude` saves significant setup time for each new worktree.
-</Tip>
-
-### Pro Tip: Symlink to .gitignore
-
-Since `.gitignore` usually contains most of the files you'd want copied to new worktrees (dependencies, environment files, build caches, etc.), you can create a symlink so they stay in sync automatically:
-
-```bash
-# In your repository root
-ln -s .gitignore .worktreeinclude
-```
-
-Now whenever you update your `.gitignore`, your `.worktreeinclude` will have the same patterns. This is especially useful for projects where gitignored files are exactly what you want copied—no need to maintain two separate files.
-
-<Note>
-  If you need different patterns than your `.gitignore`, create a regular `.worktreeinclude` file instead of a symlink.
-</Note>
-
-## Best Practices
-
-<AccordionGroup>
-  <Accordion title="For Parallel Cline Sessions">
-    1. **Create purpose-specific worktrees** - Name branches clearly (e.g., `cline/refactor-auth`, `cline/add-tests`)
-    2. **Open in new windows** - Always use "Open in new window" for true parallelism
-    3. **Use .worktreeinclude** - Set up automatic file copying to reduce setup time
-  </Accordion>
-  <Accordion title="For Solo Development">
-    1. **Keep your main branch clean** - Use worktrees for experimental or risky changes
-    2. **Quick feature switches** - Instead of stashing, create a worktree for interruptions
-    3. **Review in isolation** - Create worktrees to review PRs without disrupting your work
-  </Accordion>
-  <Accordion title="Worktree Hygiene">
-    1. **Delete unused worktrees** - Remove worktrees when their branches are merged
-    2. **Use meaningful names** - Branch names should indicate the worktree's purpose
-    3. **Check for stale worktrees** - Periodically review and clean up old worktrees
-  </Accordion>
-</AccordionGroup>
-
-## Limitations
-
-Worktrees are not available in certain workspace configurations:
-
-- **Multi-root workspaces**: If you have multiple folders open in VS Code, worktrees are disabled. Open a single repository folder instead.
-- **Subfolder of a repository**: If you've opened a subfolder within a Git repository (not the root), worktrees are disabled. Open the repository root folder instead.
-
-The Worktrees view will display a message explaining the limitation if either of these applies to your workspace.
-
-## Troubleshooting
-
-<AccordionGroup>
-  <Accordion title="Branch already exists error">
-    Git doesn't allow the same branch to be checked out in multiple worktrees. Either:
-    - Use a different branch name
-    - Delete the existing worktree using that branch
-  </Accordion>
-  <Accordion title="Worktree folder already exists">
-    The path you specified already contains files. Choose a different path or delete the existing folder first.
-  </Accordion>
-  <Accordion title="Can't delete worktree">
-    If a worktree is locked, you'll need to unlock it first using `git worktree unlock <path>` in the terminal. If the worktree has uncommitted changes, you may need to use force delete.
-  </Accordion>
-  <Accordion title=".worktreeinclude files not copying">
-    Make sure the files you want copied are:
-    1. Listed in your `.worktreeinclude` file
-    2. Also listed in your `.gitignore` (only gitignored files are copied)
-    3. Actually exist in your current worktree
-  </Accordion>
-</AccordionGroup>
-
-## Technical Details
-
-<AccordionGroup>
-  <Accordion title="How Worktrees Work Internally">
-    - Worktrees are a native Git feature (`git worktree` command)
-    - All worktrees share the same `.git` directory and object database
-    - Each worktree has its own index, working directory, and HEAD
-    - Worktree list is stored in `.git/worktrees/`
-  </Accordion>
-  <Accordion title="Storage Considerations">
-    - Each worktree contains a full checkout of the repository
-    - `.worktreeinclude` can significantly increase worktree size (e.g., copying `node_modules`)
-    - Consider your disk space when creating many worktrees
-  </Accordion>
-  <Accordion title="Relationship with Checkpoints">
-    Worktrees are separate from Cline's [checkpoint system](/features/checkpoints). Each worktree has its own checkpoint history. Checkpoints track changes within a single worktree, while worktrees let you work across multiple branches simultaneously.
-  </Accordion>
-</AccordionGroup>
-
-Worktrees unlock true parallel development with Cline. Create a worktree, open it in a new window, and let Cline work independently while you continue coding!

docs/getting-started/selecting-your-model.mdx

@@ -25,28 +25,11 @@ The easiest way to get started is with **Cline** as your provider:
 
 ## Alternative: Use Another Provider
 
-If you prefer to use your own accounts or API keys, you have several options:
-
-### Sign in with OpenAI (Recommended)
-
-The easiest way to use OpenAI models is with **OpenAI Codex**—no API keys needed:
-
-1. Select **"OpenAI Codex"** from the API Provider dropdown
-2. Click **"Sign in with OpenAI"**
-3. Authorize Cline in your browser
-4. Choose your model
-
-<Card title="OpenAI Codex Setup Guide" icon="key" href="/provider-config/openai-codex">
-  See the full setup guide with screenshots and troubleshooting tips.
-</Card>
-
-### Other Providers
-
-You can also use API keys with these providers:
+If you prefer to use your own API keys, you can select from providers like:
 
 - **OpenRouter** - Great value, multiple models
 - **Anthropic** - Direct access to Claude models  
-- **OpenAI** - Access to GPT models via API key
+- **OpenAI** - Access to GPT models
 - **Google Gemini** - Google's AI models
 - **Ollama** - Run models locally on your computer
 

docs/provider-config/cerebras.mdx

@@ -18,7 +18,7 @@ Cerebras delivers the world's fastest AI inference through their revolutionary w
 
 Cline supports the following Cerebras models:
 
--   `zai-glm-4.7` - Highly capable general-purpose model on Cerebras (up to 1,000 tokens/s), competitive with leading proprietary models on coding tasks.
+-   `zai-glm-4.6` - Intelligent general purpose model with 1,500 tokens/s
 -   `qwen-3-235b-a22b-instruct-2507` - Advanced instruction-following model
 -   `qwen-3-235b-a22b-thinking-2507` - Reasoning model with step-by-step thinking
 -   `llama-3.3-70b` - Meta's Llama 3.3 model optimized for speed
@@ -89,7 +89,7 @@ Works with any OpenAI-compatible tool—Cursor, Continue.dev, Cline, or any othe
 
 -   **Speed Advantage:** Cerebras excels at making reasoning models practical for real-time use. Perfect for agentic workflows that require multiple LLM calls.
 -   **Free Tier:** Start with the free model to experience Cerebras speed before upgrading to paid plans.
--   **Context Windows:** Models support context windows ranging from 64K to 131K tokens for including substantial code context.
+-   **Context Windows:** Models support context windows ranging from 64K to 128K tokens for including substantial code context.
 -   **Rate Limits:** Generous rate limits designed for development workflows. Check your dashboard for current limits.
 -   **Pricing:** Competitive pricing with significant speed advantages. Visit [Cerebras Cloud](https://cloud.cerebras.ai/) for current rates.
 -   **Real-Time Applications:** Ideal for applications where AI response time matters—code generation, debugging, and interactive development.

docs/provider-config/openai-codex.mdx

@@ -1,105 +0,0 @@
----
-title: "OpenAI Codex"
-sidebarTitle: "OpenAI Codex"
-description: "Connect your OpenAI account to Cline via OAuth for seamless access to OpenAI models."
----
-
-OpenAI Codex lets you connect your OpenAI account directly to Cline using OAuth, meaning you don't need to manage API keys. Simply sign in with your OpenAI account through a one-click browser authentication, and you'll automatically have access to all the models available on your OpenAI plan. No additional configuration required. 
-
-<Tip>
-If you prefer to use API keys instead, see the [OpenAI (API Key)](/provider-config/openai) provider configuration.
-</Tip>
-
-## Prerequisites
-
-- An [OpenAI account](https://platform.openai.com/signup)
-- An active OpenAI subscription or API access plan
-
-<Note>
-The models available to you depend on your OpenAI account's subscription tier. See [OpenAI's pricing page](https://openai.com/pricing) for details on what's included in each plan.
-</Note>
-
-## Connecting Your OpenAI Account
-
-<Steps>
-  <Step title="Open Cline Settings">
-    Click the settings gear icon in the top-right corner of the Cline extension.
-  </Step>
-  <Step title="Select OpenAI Codex Provider">
-    Choose **"OpenAI Codex"** from the "API Provider" dropdown menu.
-  </Step>
-  <Step title="Sign In with OpenAI">
-    Click the **"Sign in with OpenAI"** button. This will open a browser window for authentication.
-  </Step>
-  <Step title="Authorize Cline">
-    In the browser window that opens:
-    1. Sign in to your OpenAI account (if not already signed in)
-    2. Review the permissions Cline is requesting
-    3. Click **"Authorize"** to grant access
-  </Step>
-  <Step title="Select Your Model">
-    Once authorized, you'll be returned to Cline. Choose your desired model from the **"Model"** dropdown.
-  </Step>
-</Steps>
-
-<Note>
-If a model doesn't appear in your dropdown, it may not be available on your OpenAI subscription tier.
-</Note>
-
-For the most current list of available models and their capabilities, see the official [OpenAI Models documentation](https://platform.openai.com/docs/models).
-
-## Managing Your Connection
-
-### Disconnecting Your Account
-
-To disconnect your OpenAI account from Cline:
-
-1. Open Cline Settings
-2. With OpenAI Codex selected as the provider, click **"Sign out"**
-3. Confirm the disconnection
-
-This removes the OAuth connection. You can reconnect at any time by signing in again.
-
-### Token Refresh
-
-OAuth tokens are automatically refreshed by Cline. If you encounter authentication errors:
-
-1. Try disconnecting and reconnecting your account
-2. Ensure your OpenAI account is in good standing
-3. Check that your subscription is active
-
-## Troubleshooting
-
-### "Authentication failed" error
-
-- Ensure you're signing in with the correct OpenAI account
-- Check that your OpenAI subscription is active
-- Try clearing your browser cache and signing in again
-
-### Models not appearing
-
-- The available models depend on your OpenAI subscription tier
-- Some models may require specific plan upgrades
-- Check [OpenAI's pricing page](https://openai.com/pricing) for model availability by plan
-
-### OAuth window doesn't open
-
-- Check if pop-ups are blocked in your browser
-- Try using a different browser
-- Ensure you have a stable internet connection
-
-### Connection keeps expiring
-
-- This is rare but can happen if your OpenAI account session expired
-- Disconnect and reconnect to refresh your authentication
-
-## Good to Know
-
-Cline only requests the permissions necessary to make API calls on your behalf. Your OpenAI credentials are never stored by Cline.
-
-When using OpenAI Codex, Cline accesses models through your OpenAI/ChatGPT subscription. There is no separate per-token API billing or consumption of OpenAI API credits for this provider; usage and limits are governed by your ChatGPT (or OpenAI account) subscription plan, not by Cline.
-
-## Related Documentation
-
-- [OpenAI (API Key)](/provider-config/openai): Alternative configuration using API keys
-- [Model Selection Guide](/core-features/model-selection-guide): Help choosing the right model

docs/provider-config/openai-compatible.mdx

@@ -16,7 +16,7 @@ This document focuses on setting up providers _other than_ the official OpenAI A
 The key to using an OpenAI-compatible provider with Cline is to configure these main settings:
 
 1.  **Base URL:** This is the API endpoint specific to the provider. It will _not_ be `https://api.openai.com/v1` (that URL is for the official OpenAI API).
-2.  **API Key:** This is the secret key you obtain from your chosen provider. (or **Use Azure Identity Authentication**)
+2.  **API Key:** This is the secret key you obtain from your chosen provider.
 3.  **Model ID:** This is the specific name or identifier for the model you wish to use.
 
 You'll find these settings in the Cline settings panel (click the ⚙️ icon):
@@ -25,7 +25,6 @@ You'll find these settings in the Cline settings panel (click the ⚙️ icon):
 -   **Base URL:** Enter the base URL provided by your chosen provider. **This is a crucial step.**
 -   **API Key:** Enter your API key from the provider.
 -   **Model:** Choose or enter the model ID.
--   **Use Azure Identity Authentication:** Check the box to authenticate with your Azure managed identity (Note that this will not trigger the authentication, it will use the existing one (e.g., "az login"))
 -   **Model Configuration:** This section allows you to customize advanced parameters for the model, such as:
     -   Max Output Tokens
     -   Context Window size

docs/provider-config/openai.mdx

@@ -16,17 +16,20 @@ Cline supports accessing models directly through the official OpenAI API.
 
 ### Supported Models
 
-Cline is compatible with a variety of OpenAI models, including common choices from OpenAI's featured/frontier lists:
+Cline is compatible with a variety of OpenAI models, including but not limited to:
 
--   `gpt-5.2`
--   `gpt-5.2-codex`
--   `gpt-5-mini`
--   `gpt-5-nano`
--   `gpt-4.1`
+-   'o3'
+-   `o3-mini` (medium reasoning effort)
+-   'o4-mini'
+-   `o3-mini-high` (high reasoning effort)
+-   `o3-mini-low` (low reasoning effort)
+-   `o1`
+-   `o1-preview`
+-   `o1-mini`
 -   `gpt-4o`
 -   `gpt-4o-mini`
--   `o3`
--   `o4-mini`
+-   'gpt-4.1'
+-   'gpt-4.1-mini'
 
 For the most current list of available models and their capabilities, please refer to the official [OpenAI Models documentation](https://platform.openai.com/docs/models).
 

docs/running-models-locally/ollama.mdx

@@ -73,16 +73,16 @@ Open VS Code and configure Cline:
 
 ### Recommended Models
 
-For the best experience with Cline, use **Qwen 2.5 Coder 32B**. This model provides strong coding capabilities and reliable tool use for local development.
+For the best experience with Cline, use **Qwen3 Coder 30B**. This model provides strong coding capabilities and reliable tool use for local development.
 
 To download it:
 ```bash
-ollama pull qwen2.5-coder:32b
+ollama run qwen3-coder-30b
 ```
 
 Other capable models include:
-- `mistral-small:latest` - Good balance of performance and speed
-- `codellama:34b-code` - Optimized for coding tasks
+- `mistral-small` - Good balance of performance and speed
+- `devstral-small` - Optimized for coding tasks
 
 ### Important Notes
 

package.json

@@ -2,7 +2,7 @@
 	"name": "claude-dev",
 	"displayName": "Cline",
 	"description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.",
-	"version": "3.52.0",
+	"version": "3.46.1",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"
@@ -201,24 +201,6 @@
 				"title": "Improve with Cline",
 				"category": "Cline"
 			},
-			{
-				"command": "cline.jupyterGenerateCell",
-				"title": "Generate Jupyter Cell with Cline",
-				"category": "Cline",
-				"icon": "$(sparkle)"
-			},
-			{
-				"command": "cline.jupyterExplainCell",
-				"title": "Explain Jupyter Cell with Cline",
-				"category": "Cline",
-				"icon": "$(question)"
-			},
-			{
-				"command": "cline.jupyterImproveCell",
-				"title": "Improve Jupyter Cell with Cline",
-				"category": "Cline",
-				"icon": "$(lightbulb)"
-			},
 			{
 				"command": "cline.openWalkthrough",
 				"title": "Open Walkthrough",
@@ -322,25 +304,6 @@
 					"when": "config.git.enabled && scmProvider == git && cline.isGeneratingCommit"
 				}
 			],
-			"notebook/toolbar": [
-				{
-					"command": "cline.jupyterGenerateCell",
-					"group": "navigation/add@1",
-					"when": "notebookType == 'jupyter-notebook'"
-				}
-			],
-			"notebook/cell/title": [
-				{
-					"command": "cline.jupyterExplainCell",
-					"group": "inline@1",
-					"when": "notebookType == 'jupyter-notebook'"
-				},
-				{
-					"command": "cline.jupyterImproveCell",
-					"group": "inline@2",
-					"when": "notebookType == 'jupyter-notebook'"
-				}
-			],
 			"commandPalette": [
 				{
 					"command": "cline.generateGitCommitMessage",
@@ -383,10 +346,11 @@
 		"compile-cli": "scripts/build-cli.sh",
 		"compile-cli-all-platforms": "scripts/build-cli-all-platforms.sh",
 		"compile-cli-man-page": "pandoc cli/man/cline.1.md -s -t man -o cli/man/cline.1",
+		"build:npm": "scripts/build-npm-package.sh",
 		"test:install": "bash scripts/test-install.sh",
 		"dev:cli:watch": "node scripts/dev-cli-watch.mjs",
 		"postcompile-standalone": "node scripts/package-standalone.mjs",
-		"postcompile-standalone-npm": "node scripts/package-npm.mjs",
+		"postcompile-standalone-npm": "node scripts/package-standalone.mjs --target=npm",
 		"dev": "npm run protos && npm run watch",
 		"watch": "npm-run-all -p watch:*",
 		"watch:esbuild": "node esbuild.mjs --watch",
@@ -403,7 +367,7 @@
 		"clean:all": "npm run clean:build && npm run clean:deps",
 		"compile-tests": "node ./scripts/build-tests.js",
 		"watch-tests": "tsc -p . -w --outDir out",
-		"check-types": "npm run protos && npx tsc --noEmit && cd webview-ui && npx tsc --noEmit",
+		"check-types": "npm run protos && npx tsc --noEmit && cd webview-ui && npx tsc -b --noEmit",
 		"lint": "biome lint --no-errors-on-unmatched --files-ignore-unknown=true --diagnostic-level=error && npm run lint:proto",
 		"lint:proto": "bash ./scripts/proto-lint.sh",
 		"format": "biome format --changed --no-errors-on-unmatched --files-ignore-unknown=true --diagnostic-level=error",
@@ -440,10 +404,6 @@
 		"storybook": "cd webview-ui && npm run storybook"
 	},
 	"lint-staged": {
-		"src/shared/storage/state-keys.ts": [
-			"node scripts/generate-state-proto.mjs",
-			"git add proto/cline/state.proto"
-		],
 		"*": [
 			"biome check --write --staged --no-errors-on-unmatched --files-ignore-unknown=true"
 		]
@@ -457,12 +417,10 @@
 		"@types/clone-deep": "^4.0.4",
 		"@types/diff": "^5.2.1",
 		"@types/get-folder-size": "^3.0.4",
-		"@types/js-yaml": "^4.0.9",
 		"@types/mocha": "^10.0.7",
 		"@types/node": "20.x",
 		"@types/pdf-parse": "^1.1.4",
 		"@types/proxyquire": "^1.3.31",
-		"@types/shell-quote": "^1.7.5",
 		"@types/should": "^11.2.0",
 		"@types/sinon": "^17.0.4",
 		"@types/turndown": "^5.0.5",
@@ -498,7 +456,6 @@
 		"@anthropic-ai/vertex-sdk": "^0.6.4",
 		"@aws-sdk/client-bedrock-runtime": "^3.922.0",
 		"@aws-sdk/credential-providers": "^3.922.0",
-		"@azure/identity": "^4.13.0",
 		"@bufbuild/protobuf": "^2.2.5",
 		"@cerebras/cerebras_cloud_sdk": "^1.35.0",
 		"@google-cloud/vertexai": "^1.9.3",
@@ -529,13 +486,11 @@
 		"@playwright/test": "^1.55.1",
 		"@sap-ai-sdk/ai-api": "^2.1.0",
 		"@sap-ai-sdk/orchestration": "^2.1.0",
-		"@sap-cloud-sdk/connectivity": "^4.2.0",
 		"@streamparser/json": "^0.0.22",
 		"@tailwindcss/vite": "^4.1.14",
 		"@types/uuid": "^10.0.0",
 		"@vscode/codicons": "^0.0.36",
 		"archiver": "^7.0.1",
-		"aws4fetch": "^1.0.20",
 		"axios": "^1.12.0",
 		"better-sqlite3": "^12.4.1",
 		"cheerio": "^1.0.0",
@@ -570,13 +525,11 @@
 		"p-timeout": "^6.1.4",
 		"p-wait-for": "^5.0.2",
 		"pdf-parse": "^1.1.1",
-		"picomatch": "^4.0.3",
 		"posthog-node": "^5.8.0",
 		"puppeteer-chromium-resolver": "^23.0.0",
 		"puppeteer-core": "^23.4.0",
 		"reconnecting-eventsource": "^1.6.4",
 		"serialize-error": "^11.0.3",
-		"shell-quote": "^1.8.3",
 		"simple-git": "^3.27.0",
 		"strip-ansi": "^7.1.2",
 		"tailwindcss": "^4.1.14",

proto/cline/account.proto

@@ -44,13 +44,6 @@ service AccountService {
 
   // Returns a link the webview can use to redirect back to the user's IDE.
   rpc getRedirectUrl(EmptyRequest) returns (String);
-
-  // OpenAI Codex OAuth authentication
-  // Starts the OAuth flow and opens browser for user to sign in with ChatGPT Plus/Pro
-  rpc openAiCodexSignIn(EmptyRequest) returns (Empty);
-
-  // Signs out of OpenAI Codex and clears stored credentials
-  rpc openAiCodexSignOut(EmptyRequest) returns (Empty);
 }
 
 message AuthStateChangedRequest {

proto/cline/file.proto

@@ -81,18 +81,6 @@ service FileService {
 
   // Deletes an existing hook file
   rpc deleteHook(DeleteHookRequest) returns (DeleteHookResponse);
-
-  // Refreshes all skill toggles (discovers skills and their enabled state)
-  rpc refreshSkills(EmptyRequest) returns (RefreshedSkills);
-
-  // Toggles a skill on or off
-  rpc toggleSkill(ToggleSkillRequest) returns (SkillsToggles);
-
-  // Creates a new skill from template
-  rpc createSkillFile(CreateSkillRequest) returns (SkillsToggles);
-
-  // Deletes an existing skill directory
-  rpc deleteSkillFile(DeleteSkillRequest) returns (SkillsToggles);
 }
 
 // Response for refreshRules operation
@@ -290,45 +278,3 @@ message DeleteHookRequest {
 message DeleteHookResponse {
   HooksToggles hooks_toggles = 1;
 }
-
-// Skill information structure
-message SkillInfo {
-  string name = 1; // Name of the skill (matches directory name)
-  string description = 2; // Description from SKILL.md frontmatter
-  string path = 3; // Full path to SKILL.md file
-  bool enabled = 4; // Whether the skill is enabled
-}
-
-// Response for refreshSkills operation
-message RefreshedSkills {
-  repeated SkillInfo global_skills = 1;
-  repeated SkillInfo local_skills = 2;
-}
-
-// Maps from skill path to enabled/disabled status
-message SkillsToggles {
-  map<string, bool> global_skills_toggles = 1;
-  map<string, bool> local_skills_toggles = 2;
-}
-
-// Request to toggle a skill
-message ToggleSkillRequest {
-  Metadata metadata = 1;
-  string skill_path = 2; // Path to the skill directory
-  bool is_global = 3; // Whether this is a global or workspace skill
-  bool enabled = 4; // Whether to enable or disable the skill
-}
-
-// Request to create a skill
-message CreateSkillRequest {
-  Metadata metadata = 1;
-  string skill_name = 2; // Name of the skill to create
-  bool is_global = 3; // Whether to create in global or workspace skills directory
-}
-
-// Request to delete a skill
-message DeleteSkillRequest {
-  Metadata metadata = 1;
-  string skill_path = 2; // Path to the skill directory
-  bool is_global = 3; // Whether this is a global or workspace skill
-}