v3.16.3 Release Notes

v3.16.3 Release Notes

.changeset/blue-moons-mate.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Put all the navigation state and message handling and navigation functions in the extension state context instead of the app.tsx

.changeset/famous-shoes-beam.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Migrate setActiveQuote to protobus

.changeset/good-dingos-try.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Migrate toggleToolAutoApprove to protobus

.changeset/hot-dodos-rhyme.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-togglePlanActMode protobus migration

.changeset/hungry-worms-draw.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Migrate toggleClineRule to protobus

.changeset/little-gifts-invite.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-taskCompletionViewChanges protobus migration

.changeset/long-zebras-yawn.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-copyToClipboard protobus migration

.changeset/old-crews-reply.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-scrollToSetting protobus migration

.changeset/pink-deers-burn.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-migrate accountLogoutClicked to protobus

.changeset/six-candles-check.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Migrate restartMcpServer to protobus

.changeset/sour-ravens-sin.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Migrate toggleCursorRule to protobus

.changeset/spotty-jeans-march.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-browserRelaunchResult protobus migration

.changeset/tame-windows-compete.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Remind VS code users of clines existence(Open Cline on AutoUpdate+KeyboardShortcuts+Lightbulb icons)

.changeset/wild-gifts-switch.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Migrate the deleteMcpServer message to protobus

.clinerules/workflows/pr-review.md

@@ -0,0 +1,351 @@
+You have access to the `gh` terminal command. I already authenticated it for you. Please review it to use the PR that I asked you to review. You're already in the `cline` repo.
+
+<detailed_sequence_of_steps>
+# GitHub PR Review Process - Detailed Sequence of Steps
+
+## 1. Gather PR Information
+1. Get the PR title, description, and comments:
+   ```bash
+   gh pr view <PR-number> --json title,body,comments
+   ```
+
+2. Get the full diff of the PR:
+   ```bash
+   gh pr diff <PR-number>
+   ```
+
+## 2. Understand the Context
+1. Identify which files were modified in the PR:
+   ```bash
+   gh pr view <PR-number> --json files
+   ```
+
+2. Examine the original files in the main branch to understand the context:
+   ```xml
+   <read_file>
+   <path>path/to/file</path>
+   </read_file>
+   ```
+
+3. For specific sections of a file, you can use search_files:
+   ```xml
+   <search_files>
+   <path>path/to/directory</path>
+   <regex>search term</regex>
+   <file_pattern>*.ts</file_pattern>
+   </search_files>
+   ```
+
+## 3. Analyze the Changes
+1. For each modified file, understand:
+   - What was changed
+   - Why it was changed (based on PR description)
+   - How it affects the codebase
+   - Potential side effects
+
+2. Look for:
+   - Code quality issues
+   - Potential bugs
+   - Performance implications
+   - Security concerns
+   - Test coverage
+
+## 4. Ask for User Confirmation
+1. Before making a decision, ask the user if you should approve the PR, providing your assessment and justification:
+   ```xml
+   <ask_followup_question>
+   <question>Based on my review of PR #<PR-number>, I recommend [approving/requesting changes]. Here's my justification:
+   
+   [Detailed justification with key points about the PR quality, implementation, and any concerns]
+   
+   Would you like me to proceed with this recommendation?</question>
+   <options>["Yes, approve the PR", "Yes, request changes", "No, I'd like to discuss further"]</options>
+   </ask_followup_question>
+   ```
+
+## 5. Ask if User Wants a Comment Drafted
+1. After the user decides on approval/rejection, ask if they would like a comment drafted:
+   ```xml
+   <ask_followup_question>
+   <question>Would you like me to draft a comment for this PR that you can copy and paste?</question>
+   <options>["Yes, please draft a comment", "No, I'll handle the comment myself"]</options>
+   </ask_followup_question>
+   ```
+
+2. If the user wants a comment drafted, provide a well-structured comment they can copy:
+   ```
+   Thank you for this PR! Here's my assessment:
+
+   [Detailed assessment with key points about the PR quality, implementation, and any suggestions]
+
+   [Include specific feedback on code quality, functionality, and testing]
+   ```
+
+## 6. Make a Decision
+1. Approve the PR if it meets quality standards:
+   ```bash
+   # For single-line comments:
+   gh pr review <PR-number> --approve --body "Your approval message"
+   
+   # For multi-line comments with proper whitespace formatting:
+   cat << EOF | gh pr review <PR-number> --approve --body-file -
+   Thanks @username for this PR! The implementation looks good.
+
+   I particularly like how you've handled X and Y.
+
+   Great work!
+   EOF
+   ```
+
+2. Request changes if improvements are needed:
+   ```bash
+   # For single-line comments:
+   gh pr review <PR-number> --request-changes --body "Your feedback message"
+   
+   # For multi-line comments with proper whitespace formatting:
+   cat << EOF | gh pr review <PR-number> --request-changes --body-file -
+   Thanks @username for this PR!
+
+   The implementation looks promising, but there are a few things to address:
+
+   1. Issue one
+   2. Issue two
+
+   Please make these changes and we can merge this.
+   EOF
+   ```
+
+   Note: The `cat << EOF | ... --body-file -` approach preserves all whitespace and formatting without requiring temporary files. The `-` parameter tells the command to read from standard input.
+</detailed_sequence_of_steps>
+
+<example_review_process>
+# Example PR Review Process
+
+Let's walk through a real example of reviewing PR #3627 which fixes the thinking mode calculation for Claude 3.7 models.
+
+## Step 1: Gather PR Information
+
+```bash
+# Get PR details
+gh pr view 3627 --json title,body,comments
+
+# Get the full diff
+gh pr diff 3627
+```
+
+## Step 2: Understand the Context
+
+```xml
+# Examine the original files to understand what's being changed
+<read_file>
+<path>src/shared/api.ts</path>
+</read_file>
+
+# Look at the ThinkingBudgetSlider component implementation
+<read_file>
+<path>webview-ui/src/components/settings/ThinkingBudgetSlider.tsx</path>
+</read_file>
+
+# Check how thinking mode is currently handled in API providers
+<search_files>
+<path>src/api/providers</path>
+<regex>reasoningOn</regex>
+<file_pattern>*.ts</file_pattern>
+</search_files>
+```
+
+## Step 3: Analyze the Changes
+
+From the PR information and code examination, we can see that:
+
+1. The PR fixes an issue with the thinking mode budget calculation for Claude 3.7 models
+2. Currently, the thinking budget is incorrectly calculated as 80% of maxTokens (8192), resulting in 6553 tokens
+3. Claude 3.7 actually supports a much larger thinking budget (up to 64000 tokens)
+4. The PR adds a `thinkingConfig` property with `maxBudget: 64000` to model definitions
+5. It updates API handlers to use this value when reasoning mode is enabled
+6. It enhances the slider component to calculate max values based on model-specific percentages
+7. Comprehensive tests were added to verify the calculations
+
+## Step 4: Ask for User Confirmation
+
+```xml
+<ask_followup_question>
+<question>Based on my review of PR #3627, I recommend approving this PR. Here's my justification:
+
+1. The PR correctly fixes the thinking mode budget calculation for Claude 3.7 models
+2. It properly implements the thinkingConfig.maxBudget property (64000) for Claude 3.7 models
+3. It applies the appropriate percentage (50%) for the slider calculation
+4. The changes are well-tested with comprehensive unit tests
+5. The implementation is clean and follows the project's coding standards
+6. The PR includes helpful screenshots demonstrating the fix
+
+Would you like me to proceed with approving this PR?</question>
+<options>["Yes, approve the PR", "No, I'd like to discuss further", "Let me review it myself first"]</options>
+</ask_followup_question>
+```
+
+## Step 5: Ask if User Wants a Comment Drafted
+
+```xml
+<ask_followup_question>
+<question>Would you like me to draft a comment for this PR that you can copy and paste?</question>
+<options>["Yes, please draft a comment", "No, I'll handle the comment myself"]</options>
+</ask_followup_question>
+```
+
+## Step 6: Make a Decision
+
+```bash
+# Option 1: Simple one-line comment
+gh pr review 3627 --approve --body "This PR looks good! It correctly fixes the thinking mode budget calculation for Claude 3.7 models."
+
+# Option 2: Multi-line comment with proper whitespace formatting
+cat << EOF | gh pr review 3627 --approve --body-file -
+This PR looks good! It correctly fixes the thinking mode budget calculation for Claude 3.7 models.
+
+I particularly like:
+1. The proper implementation of thinkingConfig.maxBudget property (64000)
+2. The appropriate percentage (50%) for the slider calculation
+3. The comprehensive unit tests
+4. The clean implementation that follows project coding standards
+
+Great work!
+EOF
+```
+</example_review_process>
+
+<common_gh_commands>
+# Common GitHub CLI Commands for PR Review
+
+## Basic PR Commands
+```bash
+# List open PRs
+gh pr list
+
+# View a specific PR
+gh pr view <PR-number>
+
+# View PR with specific fields
+gh pr view <PR-number> --json title,body,comments,files,commits
+
+# Check PR status
+gh pr status
+```
+
+## Diff and File Commands
+```bash
+# Get the full diff of a PR
+gh pr diff <PR-number>
+
+# List files changed in a PR
+gh pr view <PR-number> --json files
+
+# Check out a PR locally
+gh pr checkout <PR-number>
+```
+
+## Review Commands
+```bash
+# Approve a PR (single-line comment)
+gh pr review <PR-number> --approve --body "Your approval message"
+
+# Approve a PR (multi-line comment with proper whitespace)
+cat << EOF | gh pr review <PR-number> --approve --body-file -
+Your multi-line
+approval message with
+
+proper whitespace formatting
+EOF
+
+# Request changes on a PR (single-line comment)
+gh pr review <PR-number> --request-changes --body "Your feedback message"
+
+# Request changes on a PR (multi-line comment with proper whitespace)
+cat << EOF | gh pr review <PR-number> --request-changes --body-file -
+Your multi-line
+change request with
+
+proper whitespace formatting
+EOF
+
+# Add a comment review (without approval/rejection)
+gh pr review <PR-number> --comment --body "Your comment message"
+
+# Add a comment review with proper whitespace
+cat << EOF | gh pr review <PR-number> --comment --body-file -
+Your multi-line
+comment with
+
+proper whitespace formatting
+EOF
+```
+
+## Additional Commands
+```bash
+# View PR checks status
+gh pr checks <PR-number>
+
+# View PR commits
+gh pr view <PR-number> --json commits
+
+# Merge a PR (if you have permission)
+gh pr merge <PR-number> --merge
+```
+</common_gh_commands>
+
+<general_guidelines_for_commenting>
+When reviewing a PR, please talk normally and like a friendly reviwer. You should keep it short, and start out by thanking the author of the pr and @ mentioning them. 
+
+Whether or not you approve the PR, you should then give a quick summary of the changes without being too verbose or definitive, staying humble like that this is your understanding of the changes. Kind of how I'm talking to you right now.
+
+If you have any suggestions, or things that need to be changed, request changes instead of approving the PR.
+
+Leaving inline comments in code is good, but only do so if you have something specific to say about the code. And make sure you leave those comments first, and then request changes in the PR with a short comment explaining the overall theme of what you're asking them to change.
+</general_guidelines_for_commenting>
+
+<example_comments_that_i_have_written_before>
+<brief_approve_comment>
+Looks good, though we should make this generic for all providers & models at some point
+</brief_approve_comment>
+<brief_approve_comment>
+Will this work for models that may not match across OR/Gemini? Like the thinking models?
+</brief_approve_comment>
+<approve_comment>
+This looks great! I like how you've handled the global endpoint support - adding it to the ModelInfo interface makes total sense since it's just another capability flag, similar to how we handle other model features.
+
+The filtered model list approach is clean and will be easier to maintain than hardcoding which models work with global endpoints. And bumping the genai library was obviously needed for this to work.
+
+Thanks for adding the docs about the limitations too - good for users to know they can't use context caches with global endpoints but might get fewer 429 errors.
+</approve_comment>
+<requesst_changes_comment>
+This is awesome. Thanks @scottsus.
+
+My main concern though - does this work for all the possible VS Code themes? We struggled with this initially which is why it's not super styled currently. Please test and share screenshots with the different themes to make sure before we can merge
+</request_changes_comment>
+<request_changes_comment>
+Hey, the PR looks good overall but I'm concerned about removing those timeouts. Those were probably there for a reason - VSCode's UI can be finicky with timing.
+
+Could you add back the timeouts after focusing the sidebar? Something like:
+
+```typescript
+await vscode.commands.executeCommand("claude-dev.SidebarProvider.focus")
+await setTimeoutPromise(100)  // Give UI time to update
+visibleWebview = WebviewProvider.getSidebarInstance()
+```
+</request_changes_comment>
+<request_changes_comment>
+Heya @alejandropta thanks for working on this! 
+
+A few notes:
+1 - Adding additional info to the environment variables is fairly problematic because env variables get appended to **every single message**. I don't think this is justifiable for a somewhat niche use case. 
+2 - Adding this option to settings to include that could be an option, but we want our options to be simple and straightforward for new users
+3 - We're working on revisualizing the way our settings page is displayed/organized, and this could potentially be reconciled once that is in and our settings page is more clearly delineated. 
+
+So until the settings page is update, and this is added to settings in a way that's clean and doesn't confuse new users, I don't think we can merge this. Please bear with us.
+</request_changes_comment>
+<request_changes_comment>
+Also, don't forget to add a changeset since this fixes a user-facing bug.
+
+The architectural change is solid - moving the focus logic to the command handlers makes sense. Just don't want to introduce subtle timing issues by removing those timeouts.
+</request_changes_comment>
+</example_comments_that_i_have_written_before>

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.16.3]
+
+-   Add devstral-small-2505 to the Mistral model list, a new specialized coding model from Mistral AI (Thanks @BarreiroT!)
+-   Add documentation links to rules & workflows UI
+-   Add support for Streameable HTTP Transport for MCPs (Thanks @alejandropta!)
+-   Improve error handling for Mistral SDK API
+
+## [3.16.2]
+
+-   Add support for Gemini 2.5 Flash Preview 05-20 model to Vertex AI provider with massive 1M token context window (Thanks @omercelik!)
+-   Add keyboard shortcut (Cmd+') to quickly focus Cline from anywhere in VS Code
+-   Add lightbulb actions for selected text with options to "Add to Cline", "Explain with Cline", and "Improve with Cline"
+-   Automatically focus Cline window after extension updates
+
 ## [3.16.1]
 
 -   Add Enable auto approve toggle switch, allowing users to easily turn auto-approve functionality on or off without losing their action settings

docs/docs.json

@@ -74,8 +74,24 @@
 			{
 				"group": "Features",
 				"pages": [
+					"features/auto-approve",
+					"features/checkpoints",
 					"features/cline-rules",
+					"features/drag-and-drop",
+					"features/plan-and-act",
 					"features/slash-commands/workflows",
+					"features/editing-messages",
+					{
+						"group": "@ Mentions",
+						"pages": [
+							"features/at-mentions/overview",
+							"features/at-mentions/file-mentions",
+							"features/at-mentions/terminal-mentions",
+							"features/at-mentions/problem-mentions",
+							"features/at-mentions/git-mentions",
+							"features/at-mentions/url-mentions"
+						]
+					},
 					{
 						"group": "Slash Commands",
 						"pages": [
@@ -84,6 +100,16 @@
 							"features/slash-commands/smol",
 							"features/slash-commands/report-bug"
 						]
+					},
+					{
+						"group": "Commands & Shortcuts",
+						"pages": [
+							"features/commands-and-shortcuts/overview",
+							"features/commands-and-shortcuts/code-commands",
+							"features/commands-and-shortcuts/terminal-integration",
+							"features/commands-and-shortcuts/git-integration",
+							"features/commands-and-shortcuts/keyboard-shortcuts"
+						]
 					}
 				]
 			},
@@ -91,11 +117,8 @@
 				"group": "Exploring Cline's Tools",
 				"pages": [
 					"exploring-clines-tools/cline-tools-guide",
-					"exploring-clines-tools/plan-and-act-modes-a-guide-to-effective-ai-development",
-					"exploring-clines-tools/checkpoints",
 					"exploring-clines-tools/new-task-tool",
-					"exploring-clines-tools/remote-browser-support",
-					"exploring-clines-tools/slash-commands"
+					"exploring-clines-tools/remote-browser-support"
 				]
 			},
 			{

docs/exploring-clines-tools/checkpoints.mdx

@@ -1,114 +0,0 @@
----
-title: "Checkpoints and Messages"
-description: "When working with AI coding assistants, it's easy to lose control as they make rapid changes to your codebase. That's why we built Checkpoints - your safety net for experimenting confidently."
----
-
-Checkpoints automatically save snapshots of your workspace after each step in a task. This powerful feature lets you:
-
--   Track and review changes made during a task
--   Roll back to any previous point if needed
--   Experiment confidently with auto-approve mode
--   Maintain full control over your workspace
-
-### ⚙️ How Checkpoints Work
-
-Cline creates a checkpoint after each tool use (file edits, commands, etc.). These checkpoints:
-
--   Work alongside your Git workflow without interference
--   Maintain context between restores
--   Use a shadow Git repository to track changes
-
-For example, if you're working on a feature and Cline makes multiple file changes, each change creates a checkpoint. This means you can review each modification and, if needed, roll back to any point without affecting your main Git repository.
-
-#### Viewing Changes & Restoring to Checkpoint
-
-After each tool use, you can:
-
-1. Click the "Compare" button to see modified files
-2. Click the "Restore" button to open restore options
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/image%20(13).png"
-		alt="Checkpoint comparison and restore options"
-	/>
-</Frame>
-
-#### Rolling Back
-
-To restore to a previous point:
-
-1. Click the "Restore" button next to any step
-2. Choose from three options:
-    - **Restore Task and Workspace**: Reset both codebase and task to that point
-    - **Restore Task Only**: Keep codebase changes but revert task context
-    - **Restore Workspace Only**: Reset codebase while preserving task context
-
-Example: If Cline makes changes you don't like while styling a component, you can use "Restore Workspace Only" to revert the code changes while keeping the conversation context, allowing you to try a different approach.
-
-### 💡 Use Cases
-
-Checkpoints let you be more experimental with Cline. While human coding is often methodical and iterative, AI can make substantial changes quickly. Checkpoints help you track these changes and revert if needed.
-
-#### 1. Using Auto-Approve Mode
-
--   Provides safety net for rapid iterations
--   Makes it easy to undo unexpected results
-
-#### 2. Testing Different Approaches
-
--   Try multiple solutions confidently
--   Compare different implementations
--   Quickly revert to working states
--   Ideal for exploring different design patterns or architectural approaches
-
-<Frame caption="In this case, I didn't like the changes Cline made to my robot dog-walking website (still working on the robots) and I wanted to revert both the codebase and the task to before any changes were made so I could start fresh.">
-	<img src="https://storage.googleapis.com/cline_public_images/docs/assets/checkpointsDemo.gif" alt="Checkpoint restore demo" />
-</Frame>
-
-### ✨ Best Practices
-
-1. Use checkpoints as safety nets when experimenting
-2. Leverage auto-approve mode more confidently, knowing you can always roll back
-3. Restore selectively based on needs:
-
-    - Use "Restore Task and Workspace" for a fresh start, reversing changes to files and the task conversation.
-    - Use "Restore Task Only" to try different prompts, but leave all files as they exist
-    - Use "Restore Workspace Only" to attempt different implementations, or prune context from the task
-
-🛟 Checkpoints are your safety net when working with Cline, enabling you to experiment freely while maintaining full control over your codebase. Whether you're refactoring a complex component, trying different implementation approaches, or using auto-approve mode for rapid development, checkpoints ensure you can always review changes and roll back if needed.
-
-#### 🗑️ Deleting Checkpoints
-
-You can delete all checkpoints by using the **"Delete All History"** button in the task history menu. Note that this will also delete all tasks. Checkpoints are stored in VS Code's globalStorage.
-
----
-
-## Editing Messages
-
-Cline allows you to edit chat messages in a task after they've been submitted (with the exception of the message that started the task).
-
-Perhaps you didn't get the results you wanted, thought of a better way to phrase your request, or need to add more information. Editing your message allows you to re-submit a request without starting over or restoring your files or workspace with checkpoints. There are two Restore options:
-
--   **"Restore Chat"** restores just the task state and re-submits an API request to your provider with your edited message.
-
--   **"Restore All"** restores both the task state and workspace state before re-submitting an API request. "Workspace state" refers to the condition of your workspace (files, content, etc.) at different points in the conversation.
-
-**Interactive Editing:**
-
--   Messages can be clicked to enter edit mode
--   Cline automatically selects all text when entering edit mode
-
-**Keyboard Shortcuts:**
-
--   Escape: Exit edit mode
--   Enter: Restore just the task
--   Cmd/Ctrl + Enter: Restore the task and workspace
--   Shift + Enter: Insert new line / line break
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/message-editing.png"
-		alt="Message editing interface"
-	/>
-</Frame>

docs/exploring-clines-tools/new-task-tool.mdx

@@ -29,6 +29,11 @@ As a quick alternative to Cline suggesting the `newtask` tool or defining comple
 -   **Action:** Cline will propose creating a new task, typically suggesting context based on the current session (similar to its default behavior when using the tool). You will still get the `ask_followup_question` prompt to confirm and potentially modify the context before the new task is created.
 -   **Benefit:** Provides a fast, user-initiated way to leverage the `new_task` functionality for branching explorations or managing long sessions without waiting for Cline to suggest it.
 
+<Note>
+	For more details on using the `/newtask` slash command, see the [New Task Command](/features/slash-commands/new-task)
+	documentation.
+</Note>
+
 #### Default Behavior (Without `.clinerules`)
 
 By default, without specific `.clinerules` dictating its behavior:

docs/exploring-clines-tools/slash-commands.mdx

@@ -1,57 +0,0 @@
----
-title: "Slash Commands"
----
-
-#### Overview
-
-Cline provides slash commands as a quick way to invoke specific tools or actions directly from the chat input, offering shortcuts for common operations. This page details the available slash commands and their usage.
-
-#### /newtask
-
-The `/newtask` slash command provides a fast, user-initiated way to leverage the `new_task` tool's functionality for branching explorations or managing long sessions without waiting for Cline to suggest it.
-
-**Functionality:**
-
-1. **Initiation:** Typing `/newtask` in the chat input signals Cline to prepare for starting a new task session.
-2. **Context Proposal:** Cline proposes creating a new task and typically suggests context to preload based on the current session (summarizing key aspects like current work, technical concepts, relevant files, problems solved, and next steps).
-3. **User Confirmation:** You will receive a confirmation prompt (via the `ask_followup_question` tool) displaying the proposed context. You can approve it directly or modify the context before the new task begins.
-4. **New Session:** Upon confirmation, Cline ends the current task session and immediately starts a new one, preloaded with the approved context.
-
-**Benefit:** Allows you to cleanly branch your work or start a new phase while carrying over essential background information ("knowledge transfer") without manual copying or losing the thread of the previous session.
-
-#### /smol (alias /compact)
-
-The `/smol` slash command (with `/compact` as an alias) allows you to condense the chat history **within your current task**. This is useful when a conversation becomes very long, potentially impacting performance or making it harder for the model to maintain focus.
-
-**Functionality:**
-
-1. **Initiation:** Typing `/smol` or `/compact` tells Cline you want to condense the current chat history. You can optionally add instructions after the command to guide the summarization process (e.g., `/smol focus only on the database changes` or `/smol be concise, use bullet points`).
-2. **Summarization:** Cline analyzes the conversation history, considering any additional instructions provided, and generates a summary focusing on key elements: recent discussion points, important decisions, technical concepts, relevant files, problems solved, and planned next steps. Cline determines the appropriate length and detail for the summary. It retains the beginning and very recent parts of the chat while summarizing the middle sections.
-3. **User Confirmation:** Cline presents this generated summary to you via a confirmation prompt and asks if it accurately reflects the essential context.
-4. **Condensing:** If you approve the summary, Cline replaces the summarized middle portion of the chat history in its active context with the generated summary. This reduces the overall token count for subsequent interactions within the _same task_.
-5. **Feedback:** If you reject the summary or provide feedback, Cline will retain the original history and incorporate your feedback for future actions.
-
-**Benefit:** Helps maintain focus and manage token usage during very long, continuous tasks (like deep debugging or extended feature development) without needing to start an entirely new task session. Allows user guidance on the summarization focus.
-
-#### When to Use Which?
-
-Choosing between `/newtask` and `/smol` depends on your goal:
-
--   Use `/smol` (or `/compact`) when:
-    -   You want to continue the **same task**, but the chat history has become very long or costly.
-    -   You need to reduce token usage for upcoming interactions within the current workflow.
-    -   Example: Deep debugging session where you want to summarize previous steps before continuing.
--   Use `/newtask` when:
-    -   You have finished one phase of work and want to start a **fresh, related task**.
-    -   You want to branch your exploration while preserving key context from the previous session.
-    -   Example: Moving from developing Feature A to starting work on Feature B, carrying over relevant architectural decisions.
-
-#### Why Manage Context?
-
-While Cline supports large context windows, actively managing context using tools and commands like `/newtask` and `/smol` is often beneficial:
-
--   **Performance:** Large language models can sometimes experience performance degradation or lose focus when context windows become extremely full (e.g., over 50-75% capacity, depending on the model). Condensing or resetting context can help maintain optimal performance.
--   **Relevance:** Summarizing or starting fresh ensures the most relevant information is prioritized in the context window.
--   **Cost:** Reducing the number of tokens sent to the model in each turn can help manage costs, especially with more expensive models.
-
-Using `/newtask` and `/smol` provides you with direct control over the conversation context, allowing for more efficient and effective interaction with Cline.

docs/features/at-mentions/file-mentions.mdx

@@ -0,0 +1,45 @@
+---
+title: "File Mentions"
+sidebarTitle: "File Mentions"
+---
+
+File mentions let you pull any file from your workspace directly into your conversation with Cline. No more copying and pasting code snippets - just type `@/` and point to the file you need help with.
+
+When you type `@/` in the chat, Cline shows your workspace files. Navigate through folders, select the file you want, and it's instantly available to Cline - complete with all imports, related functions, and surrounding context.
+
+I use file mentions constantly when debugging. Instead of trying to figure out which parts of my code to copy over, I just reference the file directly:
+
+```
+I'm getting this error when my form submits: @terminal
+
+Here's my component: @/src/components/ContactForm.jsx
+
+And the API endpoint: @/src/api/contact.js
+
+What am I missing?
+```
+
+This gives Cline everything it needs - the error message, the component code, and the API endpoint - all without me having to copy anything. Cline can see imports, dependencies, and all the surrounding context that might be causing the issue.
+
+File mentions shine when you're dealing with complex bugs that span multiple files. Before, I'd have to carefully copy each relevant file, making sure I didn't miss anything important. Now I just reference each file with `@/` and Cline gets the complete picture.
+
+Next time you're stuck on a problem, try using file mentions instead of copying code. You'll save time and get better answers because Cline has all the context it needs.
+
+## How It Works Under the Hood
+
+When you use a file mention in your message, here's what happens behind the scenes:
+
+1. When you send your message, Cline detects the `@/path/to/file` pattern in your text
+2. The extension resolves the file path relative to your workspace root
+3. It checks if the file is binary (like an image) or text-based
+4. For text files, it reads the complete file content
+5. The file content is appended to your message in a structured format:
+    ```
+    <file_content path="path/to/file">
+    [Complete file content]
+    </file_content>
+    ```
+6. This enhanced message with the embedded file content is sent to the AI
+7. The AI can now "see" the complete file content as if you had copied and pasted it
+
+This seamless process happens automatically whenever you use a file mention, giving the AI full context without you having to manually copy anything.

docs/features/at-mentions/folder-mentions.mdx

@@ -0,0 +1,58 @@
+---
+title: "Folder Mentions"
+sidebarTitle: "Folder Mentions"
+---
+
+Folder mentions let you bring entire directories into your conversation with Cline. Just type `@/` followed by a folder path ending with a slash, and Cline gets access to the folder structure and its contents.
+
+When you type `@/` in chat, Cline shows your workspace files and folders. Navigate to the folder you want, make sure to include the trailing slash, and Cline will see the folder's structure and contents.
+
+I use folder mentions when I need help understanding or refactoring a whole section of my codebase. Instead of referencing individual files one by one, I can just point to the entire directory:
+
+```
+I'm trying to understand how the authentication flow works in my app.
+Can you explain the structure and relationships between the files in @/src/auth/?
+```
+
+Cline can then see all the files in the auth directory, their contents, and how they relate to each other. This gives it the full context to explain complex interactions between multiple files.
+
+Folder mentions are also perfect for getting help with project organization. When I'm unsure if my project structure makes sense, I'll ask Cline to review it:
+
+```
+I'm setting up a new React project. Does this folder structure make sense? @/src/
+What would you change to make it more maintainable as the project grows?
+```
+
+Next time you're working with multiple related files, try using folder mentions instead of referencing each file individually. You'll get more comprehensive help because Cline can see the bigger picture of how everything fits together.
+
+## How It Works Under the Hood
+
+When you use a folder mention in your message, here's what happens behind the scenes:
+
+1. When you send your message, Cline detects the `@/path/to/folder/` pattern (with trailing slash) in your text
+2. The extension resolves the folder path relative to your workspace root
+3. It calls `fs.readdir()` to get a list of all files and subdirectories in that folder
+4. For each file in the directory, it checks if it's binary or text-based
+5. For text files, it extracts the complete content
+6. The folder structure and file contents are appended to your message in a structured format:
+
+    ```
+    <folder_content path="path/to/folder">
+    ├── file1.txt
+    ├── file2.js
+    └── subfolder/
+
+    <file_content path="path/to/folder/file1.txt">
+    [File content]
+    </file_content>
+
+    <file_content path="path/to/folder/file2.js">
+    [File content]
+    </file_content>
+    </folder_content>
+    ```
+
+7. This enhanced message with the embedded folder structure and file contents is sent to the AI
+8. The AI can now "see" both the directory structure and the content of files within that directory
+
+This process happens automatically whenever you use a folder mention, giving the AI a comprehensive view of your project structure and file contents.

docs/features/at-mentions/git-mentions.mdx

@@ -0,0 +1,84 @@
+---
+title: "Git Mentions"
+sidebarTitle: "Git Mentions"
+---
+
+Git mentions let you bring your repository's history and changes directly into your conversation with Cline. You can reference uncommitted changes with `@git-changes` or specific commits with `@[commit-hash]`.
+
+When you type `@` in chat, you can select "Git Changes" from the menu or type `@git-changes` directly. For specific commits, type `@` followed by the commit hash (at least 7 characters). Cline will immediately see the git status, diffs, commit messages, and other relevant information.
+
+I use git mentions constantly when I'm trying to understand code changes or troubleshoot issues introduced by recent commits. Instead of trying to copy and paste diffs or commit logs, I just ask:
+
+```
+I think this commit broke our authentication flow: @a1b2c3d
+
+Can you explain what changed and why it might be causing the issue?
+```
+
+This gives Cline the complete commit information, including the commit message, author, date, and the full diff. Cline can then analyze exactly what changed and how it might affect other parts of the codebase.
+
+The `@git-changes` mention is perfect when you're working on changes and want feedback before committing:
+
+```
+Here are my current changes: @git-changes
+
+I'm trying to implement a new feature for user profiles. Does my approach make sense?
+Are there any potential issues or improvements you'd suggest?
+```
+
+This shows Cline all your uncommitted changes, including new files, modified files, and their diffs. Cline can then review your changes and provide feedback on your implementation.
+
+Git mentions are especially powerful when combined with file mentions. When I'm investigating a bug, I'll often reference both:
+
+```
+I think this commit introduced a bug: @a1b2c3d
+
+Here's the current implementation: @/src/components/Auth.jsx
+
+How can I fix the issue while preserving the intended functionality?
+```
+
+Next time you're working with code changes or investigating issues, try using git mentions instead of manually describing or copying changes. You'll get more accurate help because Cline can see exactly what changed and in what context.
+
+## How It Works Under the Hood
+
+When you use git mentions in your message, here's what happens behind the scenes:
+
+### For Git Changes (`@git-changes`)
+
+1. When you send your message, Cline detects the `@git-changes` pattern in your text
+2. The extension runs git commands to get the current working state of your repository
+3. It captures the output of `git status` and `git diff` to see all uncommitted changes
+4. This information is appended to your message in a structured format:
+
+    ```
+    <git_working_state>
+    On branch main
+    Changes not staged for commit:
+      modified: src/components/Button.jsx
+      modified: src/styles/main.css
+
+    [Complete diff output with all changes]
+    </git_working_state>
+    ```
+
+### For Specific Commits (`@[commit-hash]`)
+
+1. When you send your message, Cline detects the `@` followed by a commit hash pattern
+2. The extension runs `git show` and related commands to get information about that commit
+3. It retrieves the commit message, author, date, and the complete diff
+4. This information is appended to your message in a structured format:
+
+    ```
+    <git_commit hash="a1b2c3d">
+    commit a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r8s9t
+    Author: Developer Name <dev@example.com>
+    Date: Mon May 20 14:30:45 2025 -0700
+
+    Fix authentication bug in login form
+
+    [Complete diff output showing all changes in the commit]
+    </git_commit>
+    ```
+
+This process happens automatically whenever you use git mentions, giving the AI complete visibility into your code changes without you having to copy and paste diffs or commit logs.

docs/features/at-mentions/overview.mdx

@@ -0,0 +1,118 @@
+---
+title: "@ Mentions Overview"
+sidebarTitle: "Overview"
+---
+
+@ mentions are one of Cline's most powerful features, letting you seamlessly bring external context into your conversations. Instead of copying and pasting code, error messages, or documentation, you can simply reference them with an @ symbol.
+
+<Frame>
+	<img src="https://storage.googleapis.com/cline_public_images/docs/assets/at-mentions.png" alt="@ Mentions Overview" />
+</Frame>
+
+When you type `@` in the chat input, Cline shows a menu of available mention types. These mentions let you reference files, folders, problems, terminal output, git changes, and even web content directly in your conversations.
+
+## Available @ Mentions
+
+Cline supports several types of @ mentions, each designed to bring different kinds of context into your conversations:
+
+<Columns cols={2}>
+  <Card title="File Mentions" icon="file" href="/features/at-mentions/file-mentions">
+    Reference any file in your workspace with `@/path/to/file`. Cline sees the complete file content, including imports, related
+    functions, and surrounding context.
+  </Card>
+
+{" "}
+
+<Card title="Folder Mentions" icon="folder" href="/features/at-mentions/folder-mentions">
+	Reference entire directories with `@/path/to/folder/`. Cline sees the folder structure and all file contents, perfect for
+	understanding complex interactions between multiple files.
+</Card>
+
+{" "}
+
+<Card title="Problem Mentions" icon="triangle-exclamation" href="/features/at-mentions/problem-mentions">
+	Use `@problems` to show Cline all the errors and warnings in your workspace. Cline sees the complete list with file locations
+	and error messages.
+</Card>
+
+{" "}
+
+<Card title="Terminal Mentions" icon="terminal" href="/features/at-mentions/terminal-mentions">
+	Use `@terminal` to share your recent terminal output. Cline sees the complete output with formatting preserved, perfect for
+	debugging build errors or test failures.
+</Card>
+
+{" "}
+
+<Card title="Git Mentions" icon="code-branch" href="/features/at-mentions/git-mentions">
+	Reference uncommitted changes with `@git-changes` or specific commits with `@[commit-hash]`. Cline sees the complete diff,
+	commit message, and other relevant information.
+</Card>
+
+  <Card title="URL Mentions" icon="globe" href="/features/at-mentions/url-mentions">
+    Reference web content with `@https://example.com`. Cline fetches and sees the complete webpage content, perfect for
+    referencing documentation or GitHub issues.
+  </Card>
+</Columns>
+
+## Why @ Mentions Matter
+
+@ mentions transform how you interact with Cline by:
+
+1. **Eliminating copy-paste**: No more copying and pasting code, error messages, or terminal output. Just reference them directly.
+
+2. **Preserving context**: Cline sees the complete context, including imports, related functions, and surrounding code that might be relevant.
+
+3. **Maintaining formatting**: Terminal output, error messages, and web content keep their formatting, making them easier to understand.
+
+4. **Enabling complex workflows**: Combine multiple @ mentions to give Cline a complete picture of your problem:
+
+    ```
+    I'm getting these errors: @problems
+
+    Here's my component: @/src/components/Form.jsx
+    And the API endpoint: @/src/api/users.js
+
+    The error happens when I submit: @terminal
+
+    I think this commit might have caused it: @a1b2c3d
+    ```
+
+## Getting Started
+
+To use @ mentions:
+
+1. Type `@` in the chat input
+2. Select the type of mention from the menu or continue typing
+3. For files and folders, navigate through your workspace structure
+4. Send your message as usual
+
+Cline will automatically process the mentions and include the referenced content in the context sent to the AI.
+
+Try using @ mentions in your next conversation with Cline - you'll be amazed at how much more efficient and effective your interactions become when you can seamlessly bring in external context.
+
+## How It Works Under the Hood
+
+When you use @ mentions in your messages, there's a sophisticated process happening behind the scenes:
+
+1. **Detection**: When you send a message, Cline scans the text for @ mention patterns using regular expressions
+2. **Processing**: For each detected mention, Cline:
+    - Determines the mention type (file, folder, problems, terminal, git, URL)
+    - Fetches the relevant content (file contents, terminal output, etc.)
+    - Formats the content appropriately
+3. **Enhancement**: The original message is enhanced with structured data:
+
+    ```
+    Your original message with @/path/to/file
+
+    <file_content path="/path/to/file">
+    [Complete file content]
+    </file_content>
+    ```
+
+4. **Context Inclusion**: This enhanced message with all the embedded content is sent to the AI model
+5. **Seamless Response**: The AI can now "see" all the referenced content as if you had manually copied and pasted it
+
+This entire process happens automatically and seamlessly whenever you use @ mentions, giving the AI complete context without you having to manually copy anything.
+
+Each type of @ mention has its own specific implementation details, which you can find in their respective documentation pages.

docs/features/at-mentions/problem-mentions.mdx

@@ -0,0 +1,52 @@
+---
+title: "Problem Mentions"
+sidebarTitle: "Problem Mentions"
+---
+
+The problems mention gives Cline instant access to all the errors and warnings in your workspace. Just type `@problems` and Cline can see every diagnostic issue VSCode has detected.
+
+When you type `@` in chat, select "Problems" from the menu or just type `@problems` directly. Cline will immediately see all the errors and warnings from your workspace, complete with file locations and error messages.
+
+I use the problems mention constantly when I'm stuck on build errors or TypeScript issues. Instead of trying to describe the errors or copy them one by one, I just ask:
+
+```
+I'm getting these TypeScript errors and I'm not sure how to fix them: @problems
+
+Can you help me understand what's wrong and how to fix it?
+```
+
+This gives Cline the complete list of errors with their exact locations and messages. Cline can then analyze the patterns across multiple errors and suggest comprehensive solutions.
+
+The problems mention is especially powerful when combined with file mentions. When I'm dealing with complex type errors, I'll reference both:
+
+```
+I'm getting these type errors: @problems
+
+Here's my component: @/src/components/DataTable.tsx
+And the types file: @/src/types/api.ts
+
+How can I fix these issues?
+```
+
+This approach gives Cline everything it needs - the exact errors, the component code, and the type definitions - all without me having to copy anything manually.
+
+Next time you're stuck on errors, try using `@problems` instead of copying error messages. You'll get more accurate help because Cline can see the complete error context and locations.
+
+## How It Works Under the Hood
+
+When you use the problems mention in your message, here's what happens behind the scenes:
+
+1. When you send your message, Cline detects the `@problems` pattern in your text
+2. The extension calls VSCode's built-in `vscode.languages.getDiagnostics()` API to get all errors and warnings
+3. It formats these diagnostics into a structured text representation with file paths, line numbers, and error messages
+4. The formatted problems list is appended to your message in a structured format:
+    ```
+    <workspace_diagnostics>
+    /path/to/file.js:10:5 - error TS2322: Type 'string' is not assignable to type 'number'.
+    /path/to/file.js:15:3 - warning: This variable is never used.
+    </workspace_diagnostics>
+    ```
+5. This enhanced message with the embedded diagnostics is sent to the AI
+6. The AI can now "see" all the errors and warnings in your workspace, complete with their locations and messages
+
+This process happens automatically whenever you use the problems mention, giving the AI a comprehensive view of all the issues in your workspace without you having to copy them manually.

docs/features/at-mentions/terminal-mentions.mdx

@@ -0,0 +1,60 @@
+---
+title: "Terminal Mentions"
+sidebarTitle: "Terminal Mentions"
+---
+
+The terminal mention lets you bring your terminal output directly into your conversation with Cline. Just type `@terminal` and Cline can see the recent output from your terminal.
+
+When you type `@` in chat, select "Terminal" from the menu or just type `@terminal` directly. Cline will immediately see the recent output from your active terminal, including error messages, build logs, or command results.
+
+I use the terminal mention all the time when I'm dealing with build errors, test failures, or debugging output. Instead of trying to copy and paste terminal output (which often loses formatting), I just ask:
+
+```
+I'm getting this error when running my tests: @terminal
+
+What's causing this and how can I fix it?
+```
+
+This gives Cline the complete terminal output with all its formatting intact. Cline can then analyze the error messages, stack traces, and surrounding context to provide more accurate help.
+
+The terminal mention is especially powerful when combined with file mentions. When I'm debugging a failed API call, I'll reference both:
+
+```
+I'm getting this error when calling my API: @terminal
+
+Here's my API client code: @/src/api/client.js
+And the endpoint implementation: @/src/server/routes/users.js
+
+What am I doing wrong?
+```
+
+This approach gives Cline everything it needs - the exact error output, the client code, and the server implementation - all without me having to copy anything manually.
+
+Next time you're running into issues with command output or build errors, try using `@terminal` instead of copying the output. You'll get more accurate help because Cline can see the complete terminal context with proper formatting.
+
+## How It Works Under the Hood
+
+When you use the terminal mention in your message, here's what happens behind the scenes:
+
+1. When you send your message, Cline detects the `@terminal` pattern in your text
+2. The extension calls `getLatestTerminalOutput()` which accesses VSCode's terminal API
+3. It captures the recent output buffer from your active terminal
+4. The terminal output is appended to your message in a structured format:
+
+    ```
+    <terminal_output>
+    $ npm run test
+    > project@1.0.0 test
+    > jest
+
+    FAIL src/components/__tests__/Button.test.js
+    ● Button component › renders correctly
+
+    [Complete terminal output with formatting preserved]
+    </terminal_output>
+    ```
+
+5. This enhanced message with the embedded terminal output is sent to the AI
+6. The AI can now "see" the complete terminal output with all formatting preserved
+
+This process happens automatically whenever you use the terminal mention, giving the AI access to your command results, error messages, and other terminal output without you having to copy it manually.

docs/features/at-mentions/url-mentions.mdx

@@ -0,0 +1,65 @@
+---
+title: "URL Mentions"
+sidebarTitle: "URL Mentions"
+---
+
+URL mentions let you bring web content directly into your conversation with Cline. Just type `@` followed by any URL, and Cline can see the content of that webpage without you having to copy and paste anything.
+
+When you type `@` in chat followed by a URL (like `@https://example.com`), Cline will fetch the content of that webpage and include it in the context. This works for documentation pages, GitHub issues, Stack Overflow questions, or any other web content you want to reference.
+
+I use URL mentions constantly when I'm working with external APIs or libraries. Instead of trying to explain how an API works or copying documentation snippets, I just reference the docs directly:
+
+```
+I'm trying to implement authentication with this API: @https://api.example.com/docs/auth
+
+Can you help me write the code to get an access token based on these docs?
+```
+
+This gives Cline the complete documentation page, so it can see all the authentication requirements, endpoints, parameters, and examples. Cline can then provide more accurate and comprehensive help based on the official documentation.
+
+URL mentions are especially useful for referencing GitHub issues or discussions:
+
+```
+I'm trying to fix this issue in our project: @https://github.com/our-org/our-repo/issues/123
+
+Here's my current implementation: @/src/components/Feature.jsx
+
+What changes do I need to make to address the issue?
+```
+
+This shows Cline the complete GitHub issue, including the description, comments, and any code snippets or screenshots. Cline can then help you implement a solution that directly addresses the reported issue.
+
+Next time you're working with external documentation or online resources, try using URL mentions instead of copying and pasting content. You'll get more accurate help because Cline can see the complete context of the webpage, including formatting, code examples, and surrounding information.
+
+## How It Works Under the Hood
+
+When you use a URL mention in your message, here's what happens behind the scenes:
+
+1. When you send your message, Cline detects the `@http://...` or `@https://...` pattern in your text
+2. The extension launches a headless browser (Puppeteer) in the background
+3. It navigates to the URL and waits for the page to load completely
+4. The browser captures the page content, including text, formatting, and code examples
+5. The content is converted to a Markdown format that preserves the structure
+6. This content is appended to your message in a structured format:
+
+    ```
+    <url_content url="https://example.com/docs">
+    # Example API Documentation
+
+    ## Authentication
+
+    To authenticate with the API, you need to...
+
+    const token = await api.authenticate({
+      username: 'user',
+      password: 'pass'
+    });
+
+    [Complete webpage content in Markdown format]
+    </url_content>
+    ```
+
+7. The browser is then closed to free up resources
+8. This enhanced message with the embedded webpage content is sent to the AI
+
+This process happens automatically whenever you use a URL mention, giving the AI access to the complete content of the webpage without you having to copy and paste anything.

docs/features/auto-approve.mdx

@@ -0,0 +1,59 @@
+The Auto Approve menu lets you set fine-grained permissions on what you allow Cline to do in an automated way.
+
+<Frame>
+	<img src="https://storage.googleapis.com/cline_public_images/docs/assets/auto-approve.png" alt="Auto Approve" />
+</Frame>
+
+## How it works
+
+By default, Cline will ask for your permission before calling any tool, including reading or writing files.
+
+If you want to allow Cline to do something without asking, you can set the Auto Approve permission for that tool.
+
+## Permission Options
+
+-   **Read project files**
+
+    -   Allows Cline to read files within your current workspace without asking
+    -   **Read all files**
+        -   Extends read permission to files outside your workspace (system files, config files, etc.)
+
+-   **Edit project files**
+
+    -   Allows Cline to modify files within your current workspace without confirmation
+    -   **Edit all files**
+        -   Extends modification permission to files outside your workspace
+
+-   **Execute safe commands**
+
+    -   Allows execution of terminal commands that the model deems non-destructive
+    -   **Execute all commands**
+        -   Permits execution of any terminal command without asking
+
+-   **Use the browser**
+
+    -   Allows Cline to use the browser tool to fetch web content
+
+-   **Use MCP servers**
+
+    -   Permits connection to and usage of MCP servers for extended functionality
+
+-   **Maximum requests**
+    -   Sets the number of consecutive automated actions Cline can take before requiring your input
+
+## Best Practices
+
+Personally, I like to keep auto-editing disabled because it gives me a chance to review changes every step of the way.
+
+For most serious development workflows, I recommend starting with:
+
+-   Auto-approving read access to project files
+-   Setting a reasonable maximum request limit (10-20)
+
+This gives Cline enough freedom to explore your codebase without constant interruptions, while still requiring permission for edits or potentially destructive actions.
+
+As you build more trust in Cline's capabilities with your specific projects, you can gradually increase the permissions to match your comfort level.
+
+Remember that you can always adjust these settings as your needs change - tighten permissions for critical production work, or loosen them when prototyping and exploring.
+
+You can even use the quick "star" actions to quickly toggle your auto-approved selections on and off as you go.

docs/features/checkpoints.mdx

@@ -0,0 +1,79 @@
+---
+title: "Checkpoints"
+sidebarTitle: "Checkpoints"
+---
+
+Checkpoints automatically save snapshots of your workspace after each step in a task. This feature lets you track changes, roll back when needed, and experiment confidently with your code.
+
+## How Checkpoints Work
+
+Cline creates a checkpoint after each tool use (file edits, commands, etc.). These checkpoints:
+
+-   Work alongside your Git workflow without interference
+-   Maintain context between restores
+-   Use a shadow Git repository to track changes
+
+For example, if you're working on a feature and Cline makes multiple file changes, each change creates a checkpoint. This means you can review each modification and, if needed, roll back to any point without affecting your main Git repository.
+
+## Viewing Changes & Restoring
+
+After each tool use, you can:
+
+1. Click the "Compare" button to see modified files
+2. Click the "Restore" button to open restore options
+
+<Frame>
+	<img
+		src="https://storage.googleapis.com/cline_public_images/docs/assets/image%20(13).png"
+		alt="Checkpoint comparison and restore options"
+	/>
+</Frame>
+
+## Restore Options
+
+To restore to a previous point:
+
+1. Click the "Restore" button next to any step
+2. Choose from three options:
+    - **Restore Task and Workspace**: Reset both codebase and task to that point
+    - **Restore Task Only**: Keep codebase changes but revert task context
+    - **Restore Workspace Only**: Reset codebase while preserving task context
+
+Example: If Cline makes changes you don't like while styling a component, you can use "Restore Workspace Only" to revert the code changes while keeping the conversation context, allowing you to try a different approach.
+
+<Frame caption="Reverting both codebase and task to before any changes were made to start fresh">
+	<img src="https://storage.googleapis.com/cline_public_images/docs/assets/checkpointsDemo.gif" alt="Checkpoint restore demo" />
+</Frame>
+
+## Use Cases
+
+Checkpoints let you be more experimental with Cline. While human coding is often methodical and iterative, AI can make substantial changes quickly. Checkpoints help you track these changes and revert if needed.
+
+### Using Auto-Approve Mode
+
+-   Provides safety net for rapid iterations
+-   Makes it easy to undo unexpected results
+
+### Testing Different Approaches
+
+-   Try multiple solutions confidently
+-   Compare different implementations
+-   Quickly revert to working states
+-   Ideal for exploring different design patterns or architectural approaches
+
+## Best Practices
+
+1. Use checkpoints as safety nets when experimenting
+2. Leverage auto-approve mode more confidently, knowing you can always roll back
+3. Restore selectively based on needs:
+    - Use "Restore Task and Workspace" for a fresh start
+    - Use "Restore Task Only" to try different prompts, but keep file changes
+    - Use "Restore Workspace Only" to attempt different implementations while preserving conversation context
+
+## Relationship with Message Editing
+
+The [message editing feature](/features/editing-messages) uses checkpoints under the hood when you select the "Restore All" option. This allows you to not only edit and resubmit your message but also restore your workspace to the state it was in at that point in the conversation.
+
+## Deleting Checkpoints
+
+You can delete all checkpoints by using the **"Delete All History"** button in the task history menu. Note that this will also delete all tasks. Checkpoints are stored in VS Code's globalStorage.

docs/features/commands-and-shortcuts/code-commands.mdx

@@ -0,0 +1,129 @@
+---
+title: "Code Commands"
+sidebarTitle: "Code Commands"
+---
+
+Cline's code commands bring AI assistance directly into your editor, letting you interact with your code without leaving your workflow. With a simple right-click, you can add code to Cline, and through the lightbulb menu, you can fix errors, get explanations, or improve your code.
+
+## Available Code Commands
+
+When you interact with code in your editor, you can access Cline commands in two ways:
+
+### Right-Click Context Menu
+
+When you right-click on selected code, you'll see:
+
+<Frame>
+	<img src="https://storage.googleapis.com/cline_public_images/docs/assets/code-commands.png" alt="Right Click Menu" />
+</Frame>
+
+#### Add to Cline
+
+The "Add to Cline" command sends your selected code to the Cline chat panel. This is perfect for:
+
+-   Asking questions about specific code snippets
+-   Requesting improvements or optimizations
+-   Getting explanations of complex logic
+
+When you use this command, Cline automatically includes:
+
+-   The file path (as a file mention)
+-   The selected code with proper formatting
+-   The programming language for accurate syntax highlighting
+
+### Lightbulb Menu (Code Actions)
+
+When you see a lightbulb icon in your editor, click it to access these Cline commands:
+
+<Frame>
+	<img src="https://storage.googleapis.com/cline_public_images/docs/assets/lightbulb-actions.png" alt="Lightbulb Menu" />
+</Frame>
+
+#### Fix with Cline
+
+The "Fix with Cline" command appears in the lightbulb menu when your code has errors or warnings. This command:
+
+1. Captures the selected code
+2. Identifies the errors or warnings from VSCode's diagnostics
+3. Sends both to Cline with a request to fix the issues
+4. Provides a solution that addresses the specific problems
+
+This is incredibly useful for quickly resolving syntax errors, linter warnings, or type issues without having to manually describe the problem.
+
+#### Explain with Cline
+
+The "Explain with Cline" command helps you understand complex code. When you select code and use this command from the lightbulb menu, Cline:
+
+1. Analyzes the selected code
+2. Provides a clear explanation of what the code does
+3. Breaks down complex logic into understandable parts
+4. Highlights important patterns or techniques used
+
+#### Improve with Cline
+
+The "Improve with Cline" command helps you enhance your code. When you select code and use this command from the lightbulb menu, Cline:
+
+1. Analyzes the selected code for potential improvements
+2. Suggests optimizations, refactorings, or better practices
+3. Explains the reasoning behind the suggested changes
+4. Provides improved code that maintains the original functionality
+
+## How to Use Code Commands
+
+Using Cline's code commands is simple:
+
+### For Right-Click Commands:
+
+1. Select the code you want to work with
+2. Right-click to open the context menu
+3. Choose "Add to Cline"
+4. View the result in the Cline chat panel
+
+### For Lightbulb Menu Commands:
+
+1. Select the code you want to work with
+2. Look for the lightbulb icon that appears in the editor gutter
+3. Click the lightbulb to see available actions
+4. Choose the appropriate Cline command (Fix, Explain, or Improve)
+5. View the result in the Cline chat panel
+
+After using any command, you can:
+
+-   Ask follow-up questions
+-   Request modifications to the solution
+-   Apply the changes back to your code
+
+## How It Works Under the Hood
+
+When you use a code command, here's what happens behind the scenes:
+
+1. **Code Selection**: The extension captures your selected code and its context
+2. **Metadata Collection**: Cline gathers important metadata:
+
+    - File path and name
+    - Programming language
+    - Any associated diagnostics (errors/warnings)
+    - Surrounding code context when relevant
+
+3. **Command Processing**:
+
+    - For "Add to Cline," the code is formatted and sent to the chat panel
+    - For "Fix with Cline," the code and diagnostics are analyzed and a fix is generated
+    - For "Explain with Cline," the code is analyzed to provide a clear explanation
+    - For "Improve with Cline," the code is analyzed for potential optimizations and improvements
+
+4. **Integration with Chat**: The results appear in the Cline chat panel, where you can:
+    - See the AI's response
+    - Ask follow-up questions
+    - Apply suggested changes
+
+This seamless integration between your editor and Cline's AI capabilities makes it easy to get assistance without disrupting your coding flow.
+
+## Tips for Effective Use
+
+-   **Select complete logical units**: When possible, select entire functions, classes, or modules to give Cline complete context
+-   **Include imports**: For language-specific help, include relevant imports so Cline understands dependencies
+-   **Combine with @ mentions**: For complex issues, use code commands along with file or problem mentions for more context
+-   **Use keyboard shortcuts**: Speed up your workflow by [assigning keyboard shortcuts](/features/commands-and-shortcuts/keyboard-shortcuts) to common code commands
+
+Next time you're struggling with a piece of code, try using Cline's code commands instead of switching to a separate chat interface. You'll be amazed at how much more efficient your workflow becomes when AI assistance is integrated directly into your editor.

docs/features/commands-and-shortcuts/git-integration.mdx

@@ -0,0 +1,71 @@
+---
+title: "Generate Commit Message"
+sidebarTitle: "Generate Commit Message"
+---
+
+Cline's Git integration brings AI assistance directly to your version control workflow. Generate commit messages without leaving your editor.
+
+## Generate Commit Message
+
+One of the most useful Git integrations is the ability to automatically generate meaningful commit messages:
+
+<Frame>
+	<img
+		src="https://storage.googleapis.com/cline_public_images/docs/assets/generate-commit-message-with-cline.png"
+		alt="Generate Commit Message with Cline"
+	/>
+</Frame>
+
+1. Make your changes and stage them in Git
+2. Click the robot icon in the Source Control view or run the "Generate Commit Message with Cline" command
+3. Cline analyzes your changes and generates a descriptive commit message
+4. The message is automatically inserted into the commit message input box
+
+The generated commit messages:
+
+-   Start with a concise summary (50-72 characters)
+-   Use imperative mood (e.g., "Add feature" not "Added feature")
+-   Describe what was changed and why
+-   Follow Git best practices
+
+This feature saves time and ensures your commit history is consistent and informative.
+
+<Tip>
+	For information about using `@git-changes` and `@[commit-hash]` mentions in your chat messages, see the [Git
+	Mentions](/features/at-mentions/git-mentions) documentation.
+</Tip>
+
+## How It Works
+
+When you use Cline's commit message generation feature, here's what happens behind the scenes:
+
+1. Cline retrieves the current Git diff using `getWorkingState()`
+2. It formats this diff into a specialized prompt for the AI
+3. The AI analyzes the changes and generates an appropriate commit message
+4. The message is extracted and inserted into the Git commit message input box
+
+This process uses your current Cline API configuration, so the quality of the generated messages matches your chosen AI model.
+
+## Tips for Effective Use
+
+-   **Generate commit messages for complex changes**: The AI excels at summarizing multiple related changes into a coherent message.
+
+-   **Review and edit generated messages**: While the AI generates high-quality messages, it's always good practice to review and adjust them if needed.
+
+-   **Stage related changes together**: For the best results, stage related changes together so the AI can generate a cohesive message.
+
+-   **Use for consistent commit history**: Using the generate commit message feature helps maintain a consistent style across your commit history.
+
+## How It Works Under the Hood
+
+The commit message generation leverages VSCode's Git extension API to access repository information:
+
+1. When you trigger the command:
+    - Cline gets the current diff
+    - It sends this to the AI with specific instructions for commit message formatting
+    - It parses the AI's response
+    - It accesses the Git extension API to set the commit message
+
+This integration with Git makes it easy to generate high-quality commit messages without disrupting your workflow.
+
+Next time you're struggling to write a good commit message, try using Cline's commit message generation. You'll save time and improve your version control workflow with AI assistance right where you need it.

docs/features/commands-and-shortcuts/keyboard-shortcuts.mdx

@@ -0,0 +1,103 @@
+---
+title: "Keyboard Shortcuts"
+sidebarTitle: "Keyboard Shortcuts"
+---
+
+Cline's keyboard shortcuts let you access AI assistance without taking your hands off the keyboard. Speed up your workflow by using hotkeys for common Cline actions.
+
+## Default Keyboard Shortcuts
+
+Cline comes with the following built-in keyboard shortcuts to streamline your workflow:
+
+| Action                  | Windows/Linux | macOS   | Condition                    | Description                               |
+| ----------------------- | ------------- | ------- | ---------------------------- | ----------------------------------------- |
+| Add to Cline            | `Ctrl+'`      | `Cmd+'` | When text is selected        | Adds selected code to Cline chat          |
+| Focus Chat Input        | `Ctrl+'`      | `Cmd+'` | When no text is selected     | Focuses the Cline chat input field        |
+| Generate Commit Message | (unset)       | (unset) | When Git is the SCM provider | Available through the Source Control view |
+
+## Available Commands for Custom Shortcuts
+
+While Cline has only a few default keyboard shortcuts, you can assign your own shortcuts to any of these commands:
+
+| Command ID                                                                               | Description                                   |
+| ---------------------------------------------------------------------------------------- | --------------------------------------------- |
+| [`cline.openInNewTab`](/features/commands-and-shortcuts/overview)                        | Opens Cline in a new editor tab               |
+| [`cline.addToChat`](/features/commands-and-shortcuts/code-commands)                      | Adds selected code to Cline chat              |
+| [`cline.addTerminalOutputToChat`](/features/commands-and-shortcuts/terminal-integration) | Adds terminal output to Cline                 |
+| `cline.focusChatInput`                                                                   | Focuses the Cline chat input field            |
+| [`cline.generateGitCommitMessage`](/features/commands-and-shortcuts/git-integration)     | Generates a commit message for staged changes |
+| [`cline.explainCode`](/features/commands-and-shortcuts/code-commands)                    | Explains selected code                        |
+| [`cline.improveCode`](/features/commands-and-shortcuts/code-commands)                    | Suggests improvements for selected code       |
+| [`cline.fixWithCline`](/features/commands-and-shortcuts/code-commands)                   | Fixes code with errors                        |
+| `claude-dev.SidebarProvider.focus`                                                       | Opens and focuses the Cline sidebar           |
+
+## Customizing Keyboard Shortcuts
+
+You can customize Cline's keyboard shortcuts to match your preferences:
+
+1. Open the Keyboard Shortcuts editor in VSCode:
+
+    - Press `Ctrl+K Ctrl+S` (Windows/Linux) or `Cmd+K Cmd+S` (macOS)
+    - Or go to File > Preferences > Keyboard Shortcuts
+
+2. Search for "Cline" to see all available commands
+
+3. Click on the pencil icon next to any command to change its shortcut
+
+4. Press the keys you want to assign to that command
+
+5. Press Enter to save the new shortcut
+
+## Suggested Custom Shortcuts
+
+Here are some suggested shortcuts you might find useful:
+
+| Action                | Suggested Shortcut             | Command ID                                | Description                   |
+| --------------------- | ------------------------------ | ----------------------------------------- | ----------------------------- |
+| Open Cline Sidebar    | `Ctrl+Shift+C` / `Cmd+Shift+C` | `claude-dev.SidebarProvider.focus`        | Opens the Cline sidebar panel |
+| New Task              | `Alt+N`                        | `cline.plusButtonClicked`                 | Starts a new Cline task       |
+| Add Terminal to Cline | `Alt+T`                        | `cline.addTerminalOutputToChat`           | Adds terminal output to Cline |
+| Clear Current Task    | `Alt+C`                        | (Requires custom keybinding to UI action) | Clears the current task       |
+
+## Keyboard-Only Workflow
+
+With the right shortcuts, you can use Cline without ever touching the mouse:
+
+1. Select code with keyboard navigation (`Shift+Arrow` keys)
+2. Send to Cline with `Ctrl+'` / `Cmd+'`
+3. Type your question and press Enter
+4. Review the response and apply suggestions
+
+## Editor Integration Shortcuts
+
+Cline's keyboard shortcuts integrate seamlessly with VSCode's built-in shortcuts:
+
+-   Use VSCode's selection shortcuts (`Ctrl+L` / `Cmd+L` to select line, etc.) before sending code to Cline
+-   Combine with VSCode's split editor shortcuts to view code and Cline side by side
+-   Use VSCode's terminal focus shortcut (`` Ctrl+` `` / `` Cmd+` ``) before capturing terminal output
+
+## Tips for Effective Use
+
+-   **Learn the default shortcut first**: The `Ctrl+'` / `Cmd+'` shortcut is versatile - it adds selected code to chat when text is selected, or focuses the chat input when nothing is selected
+-   **Create muscle memory**: Use keyboard shortcuts consistently to build habits
+-   **Customize for your workflow**: Assign shortcuts to commands you use frequently
+-   **Consider ergonomics**: Choose shortcuts that are comfortable for your keyboard layout
+
+Keyboard shortcuts may seem like a small optimization, but they can significantly speed up your workflow when using Cline regularly. By keeping your hands on the keyboard, you maintain your coding flow while still getting AI assistance exactly when you need it.
+
+## How to Find All Available Commands
+
+To see all Cline commands that can be assigned shortcuts:
+
+1. Open the Command Palette (`Ctrl+Shift+P` / `Cmd+Shift+P`)
+2. Type "Cline" to filter the list
+3. Browse the available commands
+
+<Frame>
+	<img
+		src="https://storage.googleapis.com/cline_public_images/docs/assets/editor-integration.png"
+		alt="Editor Integration Overview"
+	/>
+</Frame>
+
+This helps you discover features you might not have known about and assign shortcuts to the ones you use most frequently.

docs/features/commands-and-shortcuts/overview.mdx

@@ -0,0 +1,65 @@
+---
+title: "Commands & Shortcuts Overview"
+sidebarTitle: "Overview"
+---
+
+Cline integrates directly into VSCode's interface, letting you access AI assistance without disrupting your workflow. These integrations appear as commands in context menus, keyboard shortcuts, and quick fixes throughout the editor.
+
+<Frame>
+	<img
+		src="https://storage.googleapis.com/cline_public_images/docs/assets/editor-integration.png"
+		alt="Editor Integration Overview"
+	/>
+</Frame>
+
+### What are Editor Integrations?
+
+Editor integrations are commands and shortcuts that let you use Cline right where you're working. Instead of switching to the Cline panel first, you can select code, right-click, and immediately send it to Cline for help.
+These integrations appear in different places throughout VSCode:
+
+-   In the editor context menu (right-click menu) - "Add to Cline"
+-   In the terminal context menu - "Add to Cline"
+-   In the Source Control view - "Generate Commit Message"
+-   As keyboard shortcuts - Various Cline commands
+-   As Quick Fix options (lightbulb menu) - "Fix with Cline", "Explain with Cline", "Improve with Cline"
+
+### Available Editor Integrations
+
+Cline offers several editor integrations, each designed to enhance different aspects of your development workflow:
+
+<Columns cols={2}>
+  <Card title="Code Commands" icon="code" href="/features/commands-and-shortcuts/code-commands">
+    Right-click on code to add it to Cline, or use the lightbulb menu to fix errors, explain code, or improve it. Cline sees the complete code context, including imports and surrounding functions.
+  </Card>
+
+{" "}
+
+<Card title="Terminal Integration" icon="terminal" href="/features/commands-and-shortcuts/terminal-integration">
+	Add terminal output to Cline with a right-click or use `@terminal` mentions. Perfect for debugging build errors, test
+	failures, or runtime issues.
+</Card>
+
+{" "}
+
+<Card title="Git Integration" icon="code-branch" href="/features/commands-and-shortcuts/git-integration">
+	Generate commit messages, explain diffs, or analyze changes with Cline's Git integration. Cline understands your version
+	control context.
+</Card>
+
+{" "}
+
+<Card title="Keyboard Shortcuts" icon="keyboard" href="/features/commands-and-shortcuts/keyboard-shortcuts">
+	Speed up your workflow with keyboard shortcuts for common Cline actions. Quickly add code to chat, fix errors, or improve your code.
+</Card>
+</Columns>
+
+### How They Work
+
+When you use these commands, Cline:
+
+-   Captures the relevant context (selected code, file path, terminal output, etc.)
+-   Focuses the Cline interface
+-   Creates a conversation with the captured context
+-   In some cases, automatically generates a suggested prompt
+
+Behind the scenes, these commands use VSCode's extension API to register commands, access editor state, and control VSCode's interface.

docs/features/commands-and-shortcuts/terminal-integration.mdx

@@ -0,0 +1,81 @@
+---
+title: "Terminal Integration"
+sidebarTitle: "Terminal Integration"
+---
+
+Cline's terminal integration lets you bring your terminal output directly into your conversations with Cline. Instead of copying and pasting error messages or command results, you can send them to Cline with a simple right-click in the terminal.
+
+<Frame>
+	<img
+		src="https://storage.googleapis.com/cline_public_images/docs/assets/terminal-integration.png"
+		alt="Terminal Integration"
+	/>
+</Frame>
+
+## Right-Click Terminal Integration
+
+When you're working in the VSCode terminal and see output you want to discuss with Cline:
+
+1. Right-click in the terminal
+2. Select "Add to Cline" from the context menu
+3. The terminal output is immediately sent to the Cline chat panel
+
+This is perfect for:
+
+-   Debugging build errors
+-   Understanding test failures
+-   Analyzing command output
+-   Getting help with error messages
+
+The right-click terminal integration is especially useful when you're already working in the terminal and encounter an issue.
+
+Instead of switching context to the Cline chat panel and typing a description of the problem, you can send the terminal output directly to Cline with just a couple of clicks.
+
+Alternatively, you can use the [`@terminal`](/features/at-mentions/terminal-mentions) mention to send the full terminal output to Cline.
+
+<Tip>
+	For information about using `@terminal` mentions in your chat messages, see the [Terminal
+	Mentions](/features/at-mentions/terminal-mentions) documentation.
+</Tip>
+
+## How Terminal Integration Works
+
+When you use the right-click terminal integration, Cline:
+
+1. Captures the terminal output with all formatting preserved
+2. Includes the complete context, including command history and results
+3. Formats it appropriately for the AI to understand
+4. Enables the AI to see exactly what you're seeing
+
+This gives Cline the full context it needs to provide accurate help with terminal-related issues.
+
+## Behind the Scenes
+
+The terminal integration uses a clever technique to capture terminal output:
+
+1. When you trigger the integration, Cline:
+
+    - Temporarily saves your current clipboard content
+    - Selects all terminal content (or uses your existing selection)
+    - Copies it to the clipboard
+    - Reads the clipboard to get the terminal content
+    - Restores your original clipboard content
+
+2. The terminal content is then:
+    - Formatted with proper syntax highlighting
+    - Added to your message or sent as a new message
+    - Enhanced with additional context when needed
+
+This approach ensures that all terminal output, including colors and formatting, is accurately captured without affecting your clipboard.
+
+## Tips for Effective Use
+
+-   **Use terminal integration for error messages**: When you encounter an error in the terminal, sending it to Cline often results in faster resolution than trying to describe the error.
+
+-   **Select specific output when needed**: By default, the integration captures all terminal content, but you can also select specific lines before right-clicking to focus on just the relevant output.
+
+-   **Combine with file mentions**: After sending terminal output to Cline, you can enhance your question by mentioning relevant files using the @ mentions feature.
+
+-   **Use for build and test output**: Terminal integration is particularly useful for understanding complex build errors or test failures that span multiple lines.
+
+Next time you're staring at a cryptic error message in your terminal, try using Cline's terminal integration instead of copying and pasting. You'll get more accurate help because Cline can see the complete terminal context with proper formatting.

docs/features/drag-and-drop.mdx

@@ -0,0 +1,14 @@
+---
+title: "Drag & Drop"
+sidebarTitle: "Drag & Drop"
+---
+
+Dragging and dropping files into Cline is a quick way to add images, code, and other files to your conversations.
+
+<Note>Due to VS Code quirks, to drag and drop files into the Cline chat input, you need to hold `Shift` while dragging.</Note>
+
+Dragging and dropping workspace files into Cline will automatically create a [file mention](/features/at-mentions/file-mentions). This allows you to reference the file in your conversation without needing to type out the path.
+
+### Supported File Types
+
+Cline supports dragging external images from your file system, as well as files from your workspace.

docs/features/editing-messages.mdx

@@ -0,0 +1,67 @@
+---
+title: "Editing Messages"
+sidebarTitle: "Editing Messages"
+---
+
+Cline allows you to edit chat messages in a task after they've been submitted. This feature lets you refine your requests without starting a new task, helping you get better results with minimal disruption to your workflow.
+
+## When to Edit Messages
+
+You might want to edit a message when:
+
+-   You didn't get the results you wanted
+-   You thought of a better way to phrase your request
+-   You need to add more information or context
+-   You made a typo or error in your original message
+
+## How to Edit Messages
+
+1. Click on any message in the conversation (except the initial task message)
+2. Edit the text as needed
+3. Use the restore options to resubmit your request
+
+<Frame>
+	<img
+		src="https://storage.googleapis.com/cline_public_images/docs/assets/message-editing.png"
+		alt="Message editing interface"
+	/>
+</Frame>
+
+## Restore Options
+
+When you edit a message, you have two options for restoring:
+
+### Restore Chat
+
+The "Restore Chat" option:
+
+-   Restores just the task state
+-   Re-submits an API request with your edited message
+-   Preserves all file changes made up to that point
+-   Is useful when you want to keep the current state of your workspace
+
+### Restore All
+
+The "Restore All" option:
+
+-   Restores both the task state and workspace state
+-   Re-submits an API request with your edited message
+-   Reverts your workspace to how it was at that point in the conversation
+-   Uses [checkpoints](/features/checkpoints) under the hood to restore your workspace
+-   Is useful when you want to try a completely different approach
+
+## Keyboard Shortcuts
+
+When editing a message, you can use these keyboard shortcuts:
+
+-   **Escape**: Exit edit mode without making changes
+-   **Enter**: Restore just the task (equivalent to "Restore Chat")
+-   **Cmd/Ctrl + Enter**: Restore the task and workspace (equivalent to "Restore All")
+-   **Shift + Enter**: Insert a new line / line break in your message
+
+## Best Practices
+
+-   Use message editing for minor adjustments to your requests
+-   For major changes in direction, consider starting a new task
+-   When using "Restore All," be aware that any file changes made after that message will be reverted
+-   Edit messages closer to the beginning of a conversation to avoid losing significant progress

docs/features/plan-and-act.mdx

@@ -1,9 +1,8 @@
 ---
-title: "Plan & Act Modes: A Guide to Effective AI Development"
+title: "Plan & Act"
+sidebarTitle: "Plan & Act"
 ---
 
-## Overview
-
 Plan & Act modes represent Cline's approach to structured AI development, emphasizing thoughtful planning before implementation. This dual-mode system helps developers create more maintainable, accurate code while reducing iteration time.
 
 <Frame>
@@ -13,21 +12,23 @@ Plan & Act modes represent Cline's approach to structured AI development, emphas
 	/>
 </Frame>
 
-### Understanding the Modes
+#### Plan Mode: Think First
 
-#### Plan Mode
+Plan mode is where you and Cline figure out what you're trying to build and how you'll build it. In this mode, Cline:
 
--   Optimized for context gathering and strategy
--   Cannot make changes to your codebase
--   Focused on understanding requirements and creating implementation plans
--   Enables full file reading for comprehensive project understanding
+-   Can read your entire codebase to understand the context
+-   Won't make any changes to your files
+-   Focuses on understanding requirements and creating a strategy
+-   Helps identify potential issues before you write a single line of code
 
-#### Act Mode
+#### Act Mode: Build It
 
--   Streamlined for implementation based on established plans
--   Has access to all of Cline's building capabilities
--   Maintains context from the planning phase
--   Can execute changes to your codebase
+Once you've got a plan, you switch to Act mode. Now Cline:
+
+-   Has all the building capabilities at its disposal
+-   Can make changes to your codebase
+-   Still remembers everything from your planning session
+-   Executes the strategy you worked out together
 
 <Frame>
 	<img src="https://storage.googleapis.com/cline_public_images/docs/assets/image%20(5).png" alt="Act mode capabilities" />
@@ -35,6 +36,14 @@ Plan & Act modes represent Cline's approach to structured AI development, emphas
 
 ### Workflow Guide
 
+When I'm working on a new feature or fixing a complex bug, here's what works for me:
+
+1. I start in Plan mode and tell Cline what I want to build
+2. Cline helps me explore the codebase, looking at relevant files
+3. Together we figure out the best approach, considering edge cases and potential issues
+4. When I'm confident in our plan, I switch to Act mode
+5. Cline implements the solution based on our planning
+
 #### 1. Start with Plan Mode
 
 Begin every significant development task in Plan mode:
@@ -108,24 +117,26 @@ Complex projects often require multiple plan-act cycles:
 
 -   Use Plan mode to explore edge cases before implementation
 -   Switch back to Plan when encountering unexpected complexity
--   Leverage file reading to validate assumptions early
+-   Leverage [file reading](/features/at-mentions/file-mentions) to validate assumptions early
 -   Have Cline write markdown files of the plan for future reference
 
 ### Common Patterns
 
-#### When to Use Plan Mode
+#### When to Use Each Mode
 
--   Starting new features
--   Debugging complex issues
--   Architectural decisions
--   Requirements analysis
+I've found Plan mode works best when:
 
-#### When to Use Act Mode
+-   Starting something new where the approach isn't obvious
+-   Debugging a tricky issue where I'm not sure what's wrong
+-   Making architectural decisions that will affect multiple parts of the codebase
+-   Trying to understand a complex workflow or feature
 
--   Implementing agreed solutions
--   Making routine changes
--   Following established patterns
--   Executing test cases
+And Act mode is perfect for:
+
+-   Implementing a solution we've already planned out
+-   Making routine changes where the approach is clear
+-   Following established patterns in the codebase
+-   Running tests and making minor adjustments
 
 <Frame>
 	<img src="https://storage.googleapis.com/cline_public_images/docs/assets/image%20(6).png" alt="Mode usage patterns" />
@@ -142,4 +153,4 @@ Share your experiences and improvements:
 
 ---
 
-Remember: The time invested in planning pays dividends in implementation quality and maintenance efficiency
+Remember: The time invested in planning pays dividends in implementation quality and maintenance efficiency.

docs/features/slash-commands/workflows.mdx

@@ -9,7 +9,7 @@ To invoke a workflow, type `/[workflow-name.md]` in the chat.
 
 ## How to Create and Use Workflows
 
-Workflows live alongside Cline Rules. Creating one is straightforward:
+Workflows live alongside [Cline Rules](/features/cline-rules). Creating one is straightforward:
 
 <Frame>
 	<img src="https://storage.googleapis.com/cline_public_images/docs/assets/workflows.png" alt="Workflows tab in Cline" />
@@ -22,9 +22,9 @@ Workflows live alongside Cline Rules. Creating one is straightforward:
 
 The real power comes from how you structure your workflow files. You can:
 
--   Leverage Cline's built-in tools like `ask_followup_question`, `read_file`, and `search_files`
+-   Leverage Cline's [built-in tools](/exploring-clines-tools/cline-tools-guide) like `ask_followup_question`, `read_file`, `search_files`, and `new_task`
 -   Use command-line tools you already have installed like `gh` or `docker`
--   Reference external MCP tool calls like Slack or Whatsapp
+-   Reference external [MCP tool calls](/mcp/mcp-overview) like Slack or Whatsapp
 -   Chain multiple actions together in a specific sequence
 
 ## Real-world Example
@@ -133,13 +133,39 @@ You have access to the `gh` terminal command. I already authenticated it for you
 1. Approve the PR if it meets quality standards:
 
     ```bash
+    # For single-line comments:
     gh pr review <PR-number> --approve --body "Your approval message"
+
+    # For multi-line comments with proper whitespace formatting:
+    cat << EOF | gh pr review <PR-number> --approve --body-file -
+    Thanks @username for this PR! The implementation looks good.
+
+    I particularly like how you've handled X and Y.
+
+    Great work!
+    EOF
     ```
 
 2. Request changes if improvements are needed:
+
     ```bash
+    # For single-line comments:
     gh pr review <PR-number> --request-changes --body "Your feedback message"
+
+    # For multi-line comments with proper whitespace formatting:
+    cat << EOF | gh pr review <PR-number> --request-changes --body-file -
+    Thanks @username for this PR!
+
+    The implementation looks promising, but there are a few things to address:
+
+    1. Issue one
+    2. Issue two
+
+    Please make these changes and we can merge this.
+    EOF
     ```
+
+    Note: The `cat << EOF | ... --body-file -` approach preserves all whitespace and formatting without requiring temporary files. The `-` parameter tells the command to read from standard input.
     </detailed_sequence_of_steps>
 
 <example_review_process>
@@ -221,7 +247,21 @@ Would you like me to proceed with approving this PR?</question>
 ## Step 6: Make a Decision
 
 ```bash
-gh pr review 3627 --approve --body "This PR looks good! It correctly fixes the thinking mode budget calculation for Claude 3.7 models by using the appropriate maxBudget value (64000) and applying the right percentage (50%) for the slider. The changes are well-tested and the implementation is clean."
+# Option 1: Simple one-line comment
+gh pr review 3627 --approve --body "This PR looks good! It correctly fixes the thinking mode budget calculation for Claude 3.7 models."
+
+# Option 2: Multi-line comment with proper whitespace formatting
+cat << EOF | gh pr review 3627 --approve --body-file -
+This PR looks good! It correctly fixes the thinking mode budget calculation for Claude 3.7 models.
+
+I particularly like:
+1. The proper implementation of thinkingConfig.maxBudget property (64000)
+2. The appropriate percentage (50%) for the slider calculation
+3. The comprehensive unit tests
+4. The clean implementation that follows project coding standards
+
+Great work!
+EOF
 ```
 
 </example_review_process>
@@ -262,14 +302,38 @@ gh pr checkout <PR-number>
 ## Review Commands
 
 ```bash
-# Approve a PR
+# Approve a PR (single-line comment)
 gh pr review <PR-number> --approve --body "Your approval message"
 
-# Request changes on a PR
+# Approve a PR (multi-line comment with proper whitespace)
+cat << EOF | gh pr review <PR-number> --approve --body-file -
+Your multi-line
+approval message with
+
+proper whitespace formatting
+EOF
+
+# Request changes on a PR (single-line comment)
 gh pr review <PR-number> --request-changes --body "Your feedback message"
 
+# Request changes on a PR (multi-line comment with proper whitespace)
+cat << EOF | gh pr review <PR-number> --request-changes --body-file -
+Your multi-line
+change request with
+
+proper whitespace formatting
+EOF
+
 # Add a comment review (without approval/rejection)
 gh pr review <PR-number> --comment --body "Your comment message"
+
+# Add a comment review with proper whitespace
+cat << EOF | gh pr review <PR-number> --comment --body-file -
+Your multi-line
+comment with
+
+proper whitespace formatting
+EOF
 ```
 
 ## Additional Commands
@@ -286,6 +350,64 @@ gh pr merge <PR-number> --merge
 ```
 
 </common_gh_commands>
+
+<general_guidelines_for_commenting>
+When reviewing a PR, please talk normally and like a friendly reviwer. You should keep it short, and start out by thanking the author of the pr and @ mentioning them.
+
+Whether or not you approve the PR, you should then give a quick summary of the changes without being too verbose or definitive, staying humble like that this is your understanding of the changes. Kind of how I'm talking to you right now.
+
+If you have any suggestions, or things that need to be changed, request changes instead of approving the PR.
+
+Leaving inline comments in code is good, but only do so if you have something specific to say about the code. And make sure you leave those comments first, and then request changes in the PR with a short comment explaining the overall theme of what you're asking them to change.
+</general_guidelines_for_commenting>
+
+<example_comments_that_i_have_written_before>
+<brief_approve_comment>
+Looks good, though we should make this generic for all providers & models at some point
+</brief_approve_comment>
+<brief_approve_comment>
+Will this work for models that may not match across OR/Gemini? Like the thinking models?
+</brief_approve_comment>
+<approve_comment>
+This looks great! I like how you've handled the global endpoint support - adding it to the ModelInfo interface makes total sense since it's just another capability flag, similar to how we handle other model features.
+
+The filtered model list approach is clean and will be easier to maintain than hardcoding which models work with global endpoints. And bumping the genai library was obviously needed for this to work.
+
+Thanks for adding the docs about the limitations too - good for users to know they can't use context caches with global endpoints but might get fewer 429 errors.
+</approve_comment>
+<requesst_changes_comment>
+This is awesome. Thanks @scottsus.
+
+My main concern though - does this work for all the possible VS Code themes? We struggled with this initially which is why it's not super styled currently. Please test and share screenshots with the different themes to make sure before we can merge
+</request_changes_comment>
+<request_changes_comment>
+Hey, the PR looks good overall but I'm concerned about removing those timeouts. Those were probably there for a reason - VSCode's UI can be finicky with timing.
+
+Could you add back the timeouts after focusing the sidebar? Something like:
+
+```typescript
+await vscode.commands.executeCommand("claude-dev.SidebarProvider.focus")
+await setTimeoutPromise(100) // Give UI time to update
+visibleWebview = WebviewProvider.getSidebarInstance()
+```
+
+</request_changes_comment>
+<request_changes_comment>
+Heya @alejandropta thanks for working on this!
+
+A few notes:
+1 - Adding additional info to the environment variables is fairly problematic because env variables get appended to **every single message**. I don't think this is justifiable for a somewhat niche use case.
+2 - Adding this option to settings to include that could be an option, but we want our options to be simple and straightforward for new users
+3 - We're working on revisualizing the way our settings page is displayed/organized, and this could potentially be reconciled once that is in and our settings page is more clearly delineated.
+
+So until the settings page is update, and this is added to settings in a way that's clean and doesn't confuse new users, I don't think we can merge this. Please bear with us.
+</request_changes_comment>
+<request_changes_comment>
+Also, don't forget to add a changeset since this fixes a user-facing bug.
+
+The architectural change is solid - moving the focus logic to the command handlers makes sense. Just don't want to introduce subtle timing issues by removing those timeouts.
+</request_changes_comment>
+</example_comments_that_i_have_written_before>
 ````
 
 When I get a new PR to review, I used to manually gather context: checking the PR description, examining the diff, looking at surrounding files, and finally forming an opinion. Now I just:
@@ -294,7 +416,7 @@ When I get a new PR to review, I used to manually gather context: checking the P
 2. Paste in the PR number
 3. Let Cline handle everything else
 
-My workflow uses the `gh` command-line tool to:
+My workflow uses the `gh` command-line tool and Cline's built in `ask_followup_question` to:
 
 -   Pull the PR description and comments
 -   Examine the diff

esbuild.js

@@ -134,14 +134,6 @@ const baseConfig = {
 		aliasResolverPlugin,
 		/* add to the end of plugins array */
 		esbuildProblemMatcherPlugin,
-		{
-			name: "alias-plugin",
-			setup(build) {
-				build.onResolve({ filter: /^pkce-challenge$/ }, (args) => {
-					return { path: require.resolve("pkce-challenge/dist/index.browser.js") }
-				})
-			},
-		},
 	],
 	format: "cjs",
 	sourcesContent: false,

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "claude-dev",
-	"version": "3.16.0",
+	"version": "3.16.3",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "claude-dev",
-			"version": "3.16.0",
+			"version": "3.16.3",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.12.4",
@@ -19,7 +19,7 @@
 				"@grpc/grpc-js": "^1.9.15",
 				"@grpc/reflection": "^1.0.4",
 				"@mistralai/mistralai": "^1.5.0",
-				"@modelcontextprotocol/sdk": "^1.7.0",
+				"@modelcontextprotocol/sdk": "^1.11.1",
 				"@opentelemetry/api": "^1.4.1",
 				"@opentelemetry/exporter-trace-otlp-http": "^0.39.1",
 				"@opentelemetry/resources": "^1.30.1",
@@ -7600,17 +7600,17 @@
 			"license": "BSD-2-Clause"
 		},
 		"node_modules/@modelcontextprotocol/sdk": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.7.0.tgz",
-			"integrity": "sha512-IYPe/FLpvF3IZrd/f5p5ffmWhMc3aEMuM2wGJASDqC2Ge7qatVCdbfPx3n/5xFeb19xN0j/911M2AaFuircsWA==",
-			"license": "MIT",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.1.tgz",
+			"integrity": "sha512-9LfmxKTb1v+vUS1/emSk1f5ePmTLkb9Le9AxOB5T0XM59EUumwcS45z05h7aiZx3GI0Bl7mjb3FMEglYj+acuQ==",
 			"dependencies": {
 				"content-type": "^1.0.5",
 				"cors": "^2.8.5",
+				"cross-spawn": "^7.0.3",
 				"eventsource": "^3.0.2",
 				"express": "^5.0.1",
 				"express-rate-limit": "^7.5.0",
-				"pkce-challenge": "^4.1.0",
+				"pkce-challenge": "^5.0.0",
 				"raw-body": "^3.0.0",
 				"zod": "^3.23.8",
 				"zod-to-json-schema": "^3.24.1"
@@ -21465,10 +21465,9 @@
 			}
 		},
 		"node_modules/pkce-challenge": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-4.1.0.tgz",
-			"integrity": "sha512-ZBmhE1C9LcPoH9XZSdwiPtbPHZROwAnMy+kIFQVrnMCxY4Cudlz3gBOpzilgc0jOgRaiT3sIWfpMomW2ar2orQ==",
-			"license": "MIT",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
+			"integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==",
 			"engines": {
 				"node": ">=16.20.0"
 			}
@@ -31509,16 +31508,17 @@
 			"integrity": "sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw=="
 		},
 		"@modelcontextprotocol/sdk": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.7.0.tgz",
-			"integrity": "sha512-IYPe/FLpvF3IZrd/f5p5ffmWhMc3aEMuM2wGJASDqC2Ge7qatVCdbfPx3n/5xFeb19xN0j/911M2AaFuircsWA==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.1.tgz",
+			"integrity": "sha512-9LfmxKTb1v+vUS1/emSk1f5ePmTLkb9Le9AxOB5T0XM59EUumwcS45z05h7aiZx3GI0Bl7mjb3FMEglYj+acuQ==",
 			"requires": {
 				"content-type": "^1.0.5",
 				"cors": "^2.8.5",
+				"cross-spawn": "^7.0.3",
 				"eventsource": "^3.0.2",
 				"express": "^5.0.1",
 				"express-rate-limit": "^7.5.0",
-				"pkce-challenge": "^4.1.0",
+				"pkce-challenge": "^5.0.0",
 				"raw-body": "^3.0.0",
 				"zod": "^3.23.8",
 				"zod-to-json-schema": "^3.24.1"
@@ -41248,9 +41248,9 @@
 			"dev": true
 		},
 		"pkce-challenge": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-4.1.0.tgz",
-			"integrity": "sha512-ZBmhE1C9LcPoH9XZSdwiPtbPHZROwAnMy+kIFQVrnMCxY4Cudlz3gBOpzilgc0jOgRaiT3sIWfpMomW2ar2orQ=="
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
+			"integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ=="
 		},
 		"pony-cause": {
 			"version": "1.1.1",

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.16.1",
+	"version": "3.16.3",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"
@@ -341,7 +341,7 @@
 		"@grpc/grpc-js": "^1.9.15",
 		"@grpc/reflection": "^1.0.4",
 		"@mistralai/mistralai": "^1.5.0",
-		"@modelcontextprotocol/sdk": "^1.7.0",
+		"@modelcontextprotocol/sdk": "^1.11.1",
 		"@opentelemetry/api": "^1.4.1",
 		"@opentelemetry/exporter-trace-otlp-http": "^0.39.1",
 		"@opentelemetry/resources": "^1.30.1",

proto/file.proto

@@ -16,6 +16,9 @@ service FileService {
  
   // Opens an image in the system viewer
   rpc openImage(StringRequest) returns (Empty);
+  
+  // Opens a mention (file, path, git commit, problem, terminal, or URL)
+  rpc openMention(StringRequest) returns (Empty);
 
   // Deletes a rule file from either global or workspace rules directory
   rpc deleteRuleFile(RuleFileRequest) returns (RuleFile);
@@ -40,6 +43,28 @@ service FileService {
 
   // Toggle a Cursor rule (enable or disable)
   rpc toggleCursorRule(ToggleCursorRuleRequest) returns (ClineRulesToggles);
+  
+  // Toggle a Windsurf rule (enable or disable)
+  rpc toggleWindsurfRule(ToggleWindsurfRuleRequest) returns (ClineRulesToggles);
+  
+  // Refreshes all rule toggles (Cline, External, and Workflows)
+  rpc refreshRules(EmptyRequest) returns (RefreshedRules);
+}
+
+// Response for refreshRules operation
+message RefreshedRules {
+  ClineRulesToggles global_cline_rules_toggles = 1;
+  ClineRulesToggles local_cline_rules_toggles = 2;
+  ClineRulesToggles local_cursor_rules_toggles = 3;
+  ClineRulesToggles local_windsurf_rules_toggles = 4;
+  ClineRulesToggles workflow_toggles = 5;
+}
+
+// Request to toggle a Windsurf rule
+message ToggleWindsurfRuleRequest {
+  Metadata metadata = 1;
+  string rule_path = 2;   // Path to the rule file
+  bool enabled = 3;       // Whether to enable or disable the rule
 }
 
 // Request to convert a list of URIs to relative paths

proto/mcp.proto

@@ -14,6 +14,7 @@ service McpService {
   rpc restartMcpServer(StringRequest) returns (McpServers);
   rpc deleteMcpServer(StringRequest) returns (McpServers);
   rpc toggleToolAutoApprove(ToggleToolAutoApproveRequest) returns (McpServers);
+  rpc refreshMcpMarketplace(EmptyRequest) returns (McpMarketplaceCatalog);
 }
 
 message ToggleMcpServerRequest {
@@ -85,3 +86,28 @@ message McpServer {
 message McpServers {
   repeated McpServer mcp_servers = 1;
 }
+
+message McpMarketplaceItem {
+  string mcp_id = 1;
+  string github_url = 2;
+  string name = 3;
+  string author = 4;
+  string description = 5;
+  string codicon_icon = 6;
+  string logo_url = 7;
+  string category = 8;
+  repeated string tags = 9;
+  bool requires_api_key = 10;
+  optional string readme_content = 11;
+  optional string llms_installation_content = 12;
+  bool is_recommended = 13;
+  int32 github_stars = 14;
+  int32 download_count = 15;
+  string created_at = 16;
+  string updated_at = 17;
+  string last_github_sync = 18;
+}
+
+message McpMarketplaceCatalog {
+  repeated McpMarketplaceItem items = 1;
+}

proto/state.proto

@@ -9,6 +9,7 @@ service StateService {
   rpc toggleFavoriteModel(StringRequest) returns (Empty);
   rpc resetState(EmptyRequest) returns (Empty);
   rpc togglePlanActMode(TogglePlanActModeRequest) returns (Empty);
+  rpc updateTerminalConnectionTimeout(Int64Request) returns (Int64);
 }
 
 message State {

src/api/providers/mistral.ts

@@ -19,13 +19,23 @@ export class MistralHandler implements ApiHandler {
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const stream = await this.client.chat.stream({
-			model: this.getModel().id,
-			// max_completion_tokens: this.getModel().info.maxTokens,
-			temperature: 0,
-			messages: [{ role: "system", content: systemPrompt }, ...convertToMistralMessages(messages)],
-			stream: true,
-		})
+		const stream = await this.client.chat
+			.stream({
+				model: this.getModel().id,
+				// max_completion_tokens: this.getModel().info.maxTokens,
+				temperature: 0,
+				messages: [{ role: "system", content: systemPrompt }, ...convertToMistralMessages(messages)],
+				stream: true,
+			})
+			.catch((err) => {
+				// The Mistal SDK uses statusCode instead of status
+				// However, if they introduce status for something, I don't want to override it
+				if ("statusCode" in err && !("status" in err)) {
+					err.status = err.statusCode
+				}
+
+				throw err
+			})
 
 		for await (const chunk of stream) {
 			const delta = chunk.data.choices[0]?.delta

src/core/controller/file/methods.ts

@@ -9,11 +9,14 @@ import { deleteRuleFile } from "./deleteRuleFile"
 import { getRelativePaths } from "./getRelativePaths"
 import { openFile } from "./openFile"
 import { openImage } from "./openImage"
+import { openMention } from "./openMention"
+import { refreshRules } from "./refreshRules"
 import { searchCommits } from "./searchCommits"
 import { searchFiles } from "./searchFiles"
 import { selectImages } from "./selectImages"
 import { toggleClineRule } from "./toggleClineRule"
 import { toggleCursorRule } from "./toggleCursorRule"
+import { toggleWindsurfRule } from "./toggleWindsurfRule"
 
 // Register all file service methods
 export function registerAllMethods(): void {
@@ -24,9 +27,12 @@ export function registerAllMethods(): void {
 	registerMethod("getRelativePaths", getRelativePaths)
 	registerMethod("openFile", openFile)
 	registerMethod("openImage", openImage)
+	registerMethod("openMention", openMention)
+	registerMethod("refreshRules", refreshRules)
 	registerMethod("searchCommits", searchCommits)
 	registerMethod("searchFiles", searchFiles)
 	registerMethod("selectImages", selectImages)
 	registerMethod("toggleClineRule", toggleClineRule)
 	registerMethod("toggleCursorRule", toggleCursorRule)
+	registerMethod("toggleWindsurfRule", toggleWindsurfRule)
 }

src/core/controller/file/openMention.ts

@@ -0,0 +1,14 @@
+import { Controller } from ".."
+import { Empty, StringRequest } from "../../../shared/proto/common"
+import { openMention as coreOpenMention } from "../../mentions"
+
+/**
+ * Opens a mention (file path, problem, terminal, or URL)
+ * @param controller The controller instance
+ * @param request The string request containing the mention text
+ * @returns Empty response
+ */
+export async function openMention(controller: Controller, request: StringRequest): Promise<Empty> {
+	coreOpenMention(request.value)
+	return Empty.create()
+}

src/core/controller/file/refreshRules.ts

@@ -0,0 +1,32 @@
+import { EmptyRequest } from "@shared/proto/common"
+import { RefreshedRules } from "@shared/proto/file"
+import type { Controller } from "../index"
+import { refreshClineRulesToggles } from "@core/context/instructions/user-instructions/cline-rules"
+import { refreshExternalRulesToggles } from "@core/context/instructions/user-instructions/external-rules"
+import { refreshWorkflowToggles } from "@core/context/instructions/user-instructions/workflows"
+import { cwd } from "@core/task"
+
+/**
+ * Refreshes all rule toggles (Cline, External, and Workflows)
+ * @param controller The controller instance
+ * @param _request The empty request
+ * @returns RefreshedRules containing updated toggles for all rule types
+ */
+export async function refreshRules(controller: Controller, _request: EmptyRequest): Promise<RefreshedRules> {
+	try {
+		const { globalToggles, localToggles } = await refreshClineRulesToggles(controller.context, cwd)
+		const { cursorLocalToggles, windsurfLocalToggles } = await refreshExternalRulesToggles(controller.context, cwd)
+		const workflowToggles = await refreshWorkflowToggles(controller.context, cwd)
+
+		return {
+			globalClineRulesToggles: { toggles: globalToggles },
+			localClineRulesToggles: { toggles: localToggles },
+			localCursorRulesToggles: { toggles: cursorLocalToggles },
+			localWindsurfRulesToggles: { toggles: windsurfLocalToggles },
+			workflowToggles: { toggles: workflowToggles },
+		}
+	} catch (error) {
+		console.error("Failed to refresh rules:", error)
+		throw error
+	}
+}

src/core/controller/file/toggleWindsurfRule.ts

@@ -0,0 +1,30 @@
+import type { ToggleWindsurfRuleRequest, ClineRulesToggles } from "../../../shared/proto/file"
+import type { Controller } from "../index"
+import { getWorkspaceState, updateWorkspaceState } from "../../../core/storage/state"
+import { ClineRulesToggles as AppClineRulesToggles } from "@shared/cline-rules"
+
+/**
+ * Toggles a Windsurf rule (enable or disable)
+ * @param controller The controller instance
+ * @param request The toggle request
+ * @returns The updated Windsurf rule toggles
+ */
+export async function toggleWindsurfRule(controller: Controller, request: ToggleWindsurfRuleRequest): Promise<ClineRulesToggles> {
+	const { rulePath, enabled } = request
+
+	if (!rulePath || typeof enabled !== "boolean") {
+		console.error("toggleWindsurfRule: Missing or invalid parameters", {
+			rulePath,
+			enabled: typeof enabled === "boolean" ? enabled : `Invalid: ${typeof enabled}`,
+		})
+		throw new Error("Missing or invalid parameters for toggleWindsurfRule")
+	}
+
+	// Update the toggles
+	const toggles = ((await getWorkspaceState(controller.context, "localWindsurfRulesToggles")) as AppClineRulesToggles) || {}
+	toggles[rulePath] = enabled
+	await updateWorkspaceState(controller.context, "localWindsurfRulesToggles", toggles)
+
+	// Return the toggles directly
+	return { toggles: toggles }
+}

src/core/controller/index.ts

@@ -32,7 +32,6 @@ import { fileExistsAtPath } from "@utils/fs"
 import { getWorkingState } from "@utils/git"
 import { extractCommitMessage } from "@integrations/git/commit-message-generator"
 import { getTotalTasksSize } from "@utils/storage"
-import { openMention } from "../mentions"
 import { ensureMcpServersDirectoryExists, ensureSettingsDirectoryExists, GlobalFileNames } from "../storage/disk"
 import {
 	getAllExtensionState,
@@ -306,6 +305,11 @@ export class Controller {
 					}
 				}
 				break
+			case "togglePlanActMode":
+				if (message.chatSettings) {
+					await this.togglePlanActModeWithChatSettings(message.chatSettings, message.chatContent)
+				}
+				break
 			case "optionsResponse":
 				await this.postMessageToWebview({
 					type: "invoke",
@@ -317,20 +321,11 @@ export class Controller {
 				await updateGlobalState(this.context, "lastShownAnnouncementId", this.latestAnnouncementId)
 				await this.postStateToWebview()
 				break
-			case "refreshClineRules":
-				await refreshClineRulesToggles(this.context, cwd)
-				await refreshExternalRulesToggles(this.context, cwd)
-				await refreshWorkflowToggles(this.context, cwd)
-				await this.postStateToWebview()
-				break
 			case "openInBrowser":
 				if (message.url) {
 					vscode.env.openExternal(vscode.Uri.parse(message.url))
 				}
 				break
-			case "openMention":
-				openMention(message.text)
-				break
 			case "showAccountViewClicked": {
 				await this.postMessageToWebview({ type: "action", action: "accountButtonClicked" })
 				break
@@ -350,10 +345,6 @@ export class Controller {
 				await this.fetchMcpMarketplace(message.bool)
 				break
 			}
-			case "silentlyRefreshMcpMarketplace": {
-				await this.silentlyRefreshMcpMarketplace()
-				break
-			}
 			// case "openMcpMarketplaceServerDetails": {
 			// 	if (message.text) {
 			// 		const response = await fetch(`https://api.cline.bot/v1/mcp/marketplace/item?mcpId=${message.mcpId}`)
@@ -389,19 +380,6 @@ export class Controller {
 
 			// 	break
 			// }
-			case "toggleWindsurfRule": {
-				const { rulePath, enabled } = message
-				if (rulePath && typeof enabled === "boolean") {
-					const toggles =
-						((await getWorkspaceState(this.context, "localWindsurfRulesToggles")) as ClineRulesToggles) || {}
-					toggles[rulePath] = enabled
-					await updateWorkspaceState(this.context, "localWindsurfRulesToggles", toggles)
-					await this.postStateToWebview()
-				} else {
-					console.error("toggleWindsurfRule: Missing or invalid parameters")
-				}
-				break
-			}
 			case "toggleWorkflow": {
 				const { workflowPath, enabled } = message
 				if (workflowPath && typeof enabled === "boolean") {
@@ -439,13 +417,6 @@ export class Controller {
 				break
 			}
 			// telemetry
-			case "openSettings": {
-				await this.postMessageToWebview({
-					type: "action",
-					action: "settingsButtonClicked",
-				})
-				break
-			}
 			case "telemetrySetting": {
 				if (message.telemetrySetting) {
 					await this.updateTelemetrySetting(message.telemetrySetting)
@@ -529,21 +500,6 @@ export class Controller {
 				break
 			}
 
-			case "updateTerminalConnectionTimeout": {
-				if (message.shellIntegrationTimeout !== undefined) {
-					const timeout = message.shellIntegrationTimeout
-
-					if (typeof timeout === "number" && !isNaN(timeout) && timeout > 0) {
-						await updateGlobalState(this.context, "shellIntegrationTimeout", timeout)
-						await this.postStateToWebview()
-					} else {
-						console.warn(
-							`Invalid shell integration timeout value received: ${timeout}. ` + `Expected a positive number.`,
-						)
-					}
-				}
-				break
-			}
 			// Add more switch case statements here as more webview message commands
 			// are created within the webview context (i.e. inside media/main.js)
 		}
@@ -859,6 +815,40 @@ export class Controller {
 		}
 	}
 
+	private async fetchMcpMarketplaceFromApiRPC(silent: boolean = false): Promise<McpMarketplaceCatalog | undefined> {
+		try {
+			const response = await axios.get("https://api.cline.bot/v1/mcp/marketplace", {
+				headers: {
+					"Content-Type": "application/json",
+				},
+			})
+
+			if (!response.data) {
+				throw new Error("Invalid response from MCP marketplace API")
+			}
+
+			const catalog: McpMarketplaceCatalog = {
+				items: (response.data || []).map((item: any) => ({
+					...item,
+					githubStars: item.githubStars ?? 0,
+					downloadCount: item.downloadCount ?? 0,
+					tags: item.tags ?? [],
+				})),
+			}
+
+			// Store in global state
+			await updateGlobalState(this.context, "mcpMarketplaceCatalog", catalog)
+			return catalog
+		} catch (error) {
+			console.error("Failed to fetch MCP marketplace:", error)
+			if (!silent) {
+				const errorMessage = error instanceof Error ? error.message : "Failed to fetch MCP marketplace"
+				throw new Error(errorMessage)
+			}
+			return undefined
+		}
+	}
+
 	async silentlyRefreshMcpMarketplace() {
 		try {
 			const catalog = await this.fetchMcpMarketplaceFromApi(true)
@@ -873,6 +863,20 @@ export class Controller {
 		}
 	}
 
+	/**
+	 * RPC variant that silently refreshes the MCP marketplace catalog and returns the result
+	 * Unlike silentlyRefreshMcpMarketplace, this doesn't post a message to the webview
+	 * @returns MCP marketplace catalog or undefined if refresh failed
+	 */
+	async silentlyRefreshMcpMarketplaceRPC() {
+		try {
+			return await this.fetchMcpMarketplaceFromApiRPC(true)
+		} catch (error) {
+			console.error("Failed to silently refresh MCP marketplace (RPC):", error)
+			return undefined
+		}
+	}
+
 	private async fetchMcpMarketplace(forceRefresh: boolean = false) {
 		try {
 			// Check if we have cached data

src/core/controller/mcp/methods.ts

@@ -6,6 +6,7 @@ import { registerMethod } from "./index"
 import { addRemoteMcpServer } from "./addRemoteMcpServer"
 import { deleteMcpServer } from "./deleteMcpServer"
 import { downloadMcp } from "./downloadMcp"
+import { refreshMcpMarketplace } from "./refreshMcpMarketplace"
 import { restartMcpServer } from "./restartMcpServer"
 import { toggleMcpServer } from "./toggleMcpServer"
 import { toggleToolAutoApprove } from "./toggleToolAutoApprove"
@@ -17,6 +18,7 @@ export function registerAllMethods(): void {
 	registerMethod("addRemoteMcpServer", addRemoteMcpServer)
 	registerMethod("deleteMcpServer", deleteMcpServer)
 	registerMethod("downloadMcp", downloadMcp)
+	registerMethod("refreshMcpMarketplace", refreshMcpMarketplace)
 	registerMethod("restartMcpServer", restartMcpServer)
 	registerMethod("toggleMcpServer", toggleMcpServer)
 	registerMethod("toggleToolAutoApprove", toggleToolAutoApprove)

src/core/controller/mcp/refreshMcpMarketplace.ts

@@ -0,0 +1,27 @@
+import type { EmptyRequest } from "../../../shared/proto/common"
+import type { McpMarketplaceCatalog } from "../../../shared/proto/mcp"
+import type { Controller } from "../index"
+
+/**
+ * RPC handler that silently refreshes the MCP marketplace catalog
+ * @param controller Controller instance
+ * @param _request Empty request
+ * @returns MCP marketplace catalog
+ */
+export async function refreshMcpMarketplace(controller: Controller, _request: EmptyRequest): Promise<McpMarketplaceCatalog> {
+	try {
+		// Call the RPC variant which returns the result directly
+		const catalog = await controller.silentlyRefreshMcpMarketplaceRPC()
+
+		if (catalog) {
+			// Types are structurally identical, use direct type assertion
+			return catalog as McpMarketplaceCatalog
+		}
+
+		// Return empty catalog if nothing was fetched
+		return { items: [] }
+	} catch (error) {
+		console.error("Failed to refresh MCP marketplace:", error)
+		return { items: [] }
+	}
+}

src/core/controller/state/methods.ts

@@ -8,6 +8,7 @@ import { resetState } from "./resetState"
 import { subscribeToState } from "./subscribeToState"
 import { toggleFavoriteModel } from "./toggleFavoriteModel"
 import { togglePlanActMode } from "./togglePlanActMode"
+import { updateTerminalConnectionTimeout } from "./updateTerminalConnectionTimeout"
 
 // Streaming methods for this service
 export const streamingMethods = ["subscribeToState"]
@@ -20,4 +21,5 @@ export function registerAllMethods(): void {
 	registerMethod("subscribeToState", subscribeToState, { isStreaming: true })
 	registerMethod("toggleFavoriteModel", toggleFavoriteModel)
 	registerMethod("togglePlanActMode", togglePlanActMode)
+	registerMethod("updateTerminalConnectionTimeout", updateTerminalConnectionTimeout)
 }

src/core/controller/state/updateTerminalConnectionTimeout.ts

@@ -0,0 +1,27 @@
+import { Controller } from ".."
+import { Int64, Int64Request } from "../../../shared/proto/common"
+import { updateGlobalState } from "../../storage/state"
+
+/**
+ * Updates the terminal connection timeout setting
+ * @param controller The controller instance
+ * @param request The request containing the timeout value in milliseconds
+ * @returns The updated timeout value
+ */
+export async function updateTerminalConnectionTimeout(controller: Controller, request: Int64Request): Promise<Int64> {
+	try {
+		const timeout = request.value
+
+		if (typeof timeout === "number" && !isNaN(timeout) && timeout > 0) {
+			// Update the global state directly
+			await updateGlobalState(controller.context, "shellIntegrationTimeout", timeout)
+			return { value: timeout }
+		} else {
+			console.warn(`Invalid shell integration timeout value received: ${timeout}. Expected a positive number.`)
+			throw new Error("Invalid timeout value. Expected a positive number.")
+		}
+	} catch (error) {
+		console.error(`Failed to update terminal connection timeout: ${error}`)
+		throw error
+	}
+}

src/services/mcp/McpHub.ts

@@ -30,6 +30,7 @@ import { arePathsEqual } from "@utils/path"
 import { secondsToMs } from "@utils/time"
 import { GlobalFileNames } from "@core/storage/disk"
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
 import { ExtensionMessage } from "@shared/ExtensionMessage"
 
 // Default timeout for internal MCP data requests in milliseconds; is not the same as the user facing timeout stored as DEFAULT_MCP_TIMEOUT_SECONDS
@@ -38,10 +39,10 @@ const DEFAULT_REQUEST_TIMEOUT_MS = 5000
 export type McpConnection = {
 	server: McpServer
 	client: Client
-	transport: StdioClientTransport | SSEClientTransport
+	transport: StdioClientTransport | SSEClientTransport | StreamableHTTPClientTransport
 }
 
-export type McpTransportType = "stdio" | "sse"
+export type McpTransportType = "stdio" | "sse" | "http"
 
 export type McpServerConfig = z.infer<typeof ServerConfigSchema>
 
@@ -54,22 +55,23 @@ const BaseConfigSchema = z.object({
 })
 
 const SseConfigSchema = BaseConfigSchema.extend({
+	transportType: z.literal("sse"),
 	url: z.string().url(),
-}).transform((config) => ({
-	...config,
-	transportType: "sse" as const,
-}))
+})
 
 const StdioConfigSchema = BaseConfigSchema.extend({
+	transportType: z.literal("stdio"),
 	command: z.string(),
 	args: z.array(z.string()).optional(),
 	env: z.record(z.string()).optional(),
-}).transform((config) => ({
-	...config,
-	transportType: "stdio" as const,
-}))
+})
 
-const ServerConfigSchema = z.union([StdioConfigSchema, SseConfigSchema])
+const StreamableHTTPConfigSchema = BaseConfigSchema.extend({
+	transportType: z.literal("http"),
+	url: z.string().url(),
+})
+
+const ServerConfigSchema = z.discriminatedUnion("transportType", [StdioConfigSchema, SseConfigSchema, StreamableHTTPConfigSchema])
 
 const McpSettingsSchema = z.object({
 	mcpServers: z.record(ServerConfigSchema),
@@ -183,7 +185,7 @@ export class McpHub {
 
 	private async connectToServerRPC(
 		name: string,
-		config: z.infer<typeof StdioConfigSchema> | z.infer<typeof SseConfigSchema>,
+		config: z.infer<typeof StdioConfigSchema> | z.infer<typeof SseConfigSchema> | z.infer<typeof StreamableHTTPConfigSchema>,
 	): Promise<void> {
 		// Remove existing connection if it exists (should never happen, the connection should be deleted beforehand)
 		this.connections = this.connections.filter((conn) => conn.server.name !== name)
@@ -200,10 +202,12 @@ export class McpHub {
 				},
 			)
 
-			let transport: StdioClientTransport | SSEClientTransport
+			let transport: StdioClientTransport | SSEClientTransport | StreamableHTTPClientTransport
 
 			if (config.transportType === "sse") {
 				transport = new SSEClientTransport(new URL(config.url), {})
+			} else if (config.transportType === "http") {
+				transport = new StreamableHTTPClientTransport(new URL(config.url), {})
 			} else {
 				transport = new StdioClientTransport({
 					command: config.command,
@@ -297,7 +301,7 @@ export class McpHub {
 
 	private async connectToServer(
 		name: string,
-		config: z.infer<typeof StdioConfigSchema> | z.infer<typeof SseConfigSchema>,
+		config: z.infer<typeof StdioConfigSchema> | z.infer<typeof SseConfigSchema> | z.infer<typeof StreamableHTTPConfigSchema>,
 	): Promise<void> {
 		// Remove existing connection if it exists (should never happen, the connection should be deleted beforehand)
 		this.connections = this.connections.filter((conn) => conn.server.name !== name)
@@ -314,10 +318,12 @@ export class McpHub {
 				},
 			)
 
-			let transport: StdioClientTransport | SSEClientTransport
+			let transport: StdioClientTransport | SSEClientTransport | StreamableHTTPClientTransport
 
 			if (config.transportType === "sse") {
 				transport = new SSEClientTransport(new URL(config.url), {})
+			} else if (config.transportType === "http") {
+				transport = new StreamableHTTPClientTransport(new URL(config.url), {})
 			} else {
 				transport = new StdioClientTransport({
 					command: config.command,
@@ -778,7 +784,7 @@ export class McpHub {
 			console.error(`Failed to parse timeout configuration for server ${serverName}: ${error}`)
 		}
 
-		return await connection.client.request(
+		const result = await connection.client.request(
 			{
 				method: "tools/call",
 				params: {
@@ -791,6 +797,11 @@ export class McpHub {
 				timeout,
 			},
 		)
+
+		return {
+			...result,
+			content: result.content ?? [],
+		}
 	}
 
 	/**

src/shared/WebviewMessage.ts

@@ -16,22 +16,19 @@ export interface WebviewMessage {
 		| "reportBug"
 		| "didShowAnnouncement"
 		| "openInBrowser"
-		| "openMention"
 		| "showChatView"
-		| "refreshClineRules"
 		| "openMcpSettings"
 		| "autoApprovalSettings"
+		| "togglePlanActMode"
 		| "openExtensionSettings"
 		| "requestVsCodeLmModels"
 		| "showAccountViewClicked"
 		| "authStateChanged"
 		| "authCallback"
 		| "fetchMcpMarketplace"
-		| "silentlyRefreshMcpMarketplace"
 		| "searchCommits"
 		| "fetchLatestMcpServersFromHub"
 		| "telemetrySetting"
-		| "openSettings"
 		| "invoke"
 		| "updateSettings"
 		| "clearAllTaskHistory"
@@ -41,9 +38,7 @@ export interface WebviewMessage {
 		| "searchFiles"
 		| "grpc_request"
 		| "grpc_request_cancel"
-		| "toggleWindsurfRule"
 		| "toggleWorkflow"
-		| "updateTerminalConnectionTimeout"
 
 	text?: string
 	disabled?: boolean

src/shared/api.ts

@@ -483,6 +483,19 @@ export const vertexModels = {
 			outputPrice: 3.5,
 		},
 	},
+	"gemini-2.5-flash-preview-05-20": {
+		maxTokens: 65536,
+		contextWindow: 1_048_576,
+		supportsImages: true,
+		supportsPromptCache: false,
+		supportsGlobalEndpoint: true,
+		inputPrice: 0.15,
+		outputPrice: 0.6,
+		thinkingConfig: {
+			maxBudget: 24576,
+			outputPrice: 3.5,
+		},
+	},
 	"gemini-2.0-flash-thinking-exp-01-21": {
 		maxTokens: 65_536,
 		contextWindow: 1_048_576,
@@ -601,6 +614,18 @@ export const geminiModels = {
 			},
 		],
 	},
+	"gemini-2.5-flash-preview-05-20": {
+		maxTokens: 65536,
+		contextWindow: 1_048_576,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 0.15,
+		outputPrice: 0.6,
+		thinkingConfig: {
+			maxBudget: 24576,
+			outputPrice: 3.5,
+		},
+	},
 	"gemini-2.5-flash-preview-04-17": {
 		maxTokens: 65536,
 		contextWindow: 1_048_576,
@@ -1367,7 +1392,7 @@ export const doubaoModels = {
 // Mistral
 // https://docs.mistral.ai/getting-started/models/models_overview/
 export type MistralModelId = keyof typeof mistralModels
-export const mistralDefaultModelId: MistralModelId = "codestral-2501"
+export const mistralDefaultModelId: MistralModelId = "devstral-small-2505"
 export const mistralModels = {
 	"mistral-large-2411": {
 		maxTokens: 131_000,
@@ -1457,6 +1482,14 @@ export const mistralModels = {
 		inputPrice: 0.3,
 		outputPrice: 0.9,
 	},
+	"devstral-small-2505": {
+		maxTokens: 128_000,
+		contextWindow: 131_072,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 0.1,
+		outputPrice: 0.3,
+	},
 } as const satisfies Record<string, ModelInfo>
 
 // LiteLLM

src/shared/proto/file.ts

@@ -10,6 +10,24 @@ import { Empty, EmptyRequest, Metadata, StringArray, StringRequest } from "./com
 
 export const protobufPackage = "cline"
 
+/** Response for refreshRules operation */
+export interface RefreshedRules {
+	globalClineRulesToggles?: ClineRulesToggles | undefined
+	localClineRulesToggles?: ClineRulesToggles | undefined
+	localCursorRulesToggles?: ClineRulesToggles | undefined
+	localWindsurfRulesToggles?: ClineRulesToggles | undefined
+	workflowToggles?: ClineRulesToggles | undefined
+}
+
+/** Request to toggle a Windsurf rule */
+export interface ToggleWindsurfRuleRequest {
+	metadata?: Metadata | undefined
+	/** Path to the rule file */
+	rulePath: string
+	/** Whether to enable or disable the rule */
+	enabled: boolean
+}
+
 /** Request to convert a list of URIs to relative paths */
 export interface RelativePathsRequest {
 	metadata?: Metadata | undefined
@@ -123,6 +141,252 @@ export interface ToggleCursorRuleRequest {
 	enabled: boolean
 }
 
+function createBaseRefreshedRules(): RefreshedRules {
+	return {
+		globalClineRulesToggles: undefined,
+		localClineRulesToggles: undefined,
+		localCursorRulesToggles: undefined,
+		localWindsurfRulesToggles: undefined,
+		workflowToggles: undefined,
+	}
+}
+
+export const RefreshedRules: MessageFns<RefreshedRules> = {
+	encode(message: RefreshedRules, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+		if (message.globalClineRulesToggles !== undefined) {
+			ClineRulesToggles.encode(message.globalClineRulesToggles, writer.uint32(10).fork()).join()
+		}
+		if (message.localClineRulesToggles !== undefined) {
+			ClineRulesToggles.encode(message.localClineRulesToggles, writer.uint32(18).fork()).join()
+		}
+		if (message.localCursorRulesToggles !== undefined) {
+			ClineRulesToggles.encode(message.localCursorRulesToggles, writer.uint32(26).fork()).join()
+		}
+		if (message.localWindsurfRulesToggles !== undefined) {
+			ClineRulesToggles.encode(message.localWindsurfRulesToggles, writer.uint32(34).fork()).join()
+		}
+		if (message.workflowToggles !== undefined) {
+			ClineRulesToggles.encode(message.workflowToggles, writer.uint32(42).fork()).join()
+		}
+		return writer
+	},
+
+	decode(input: BinaryReader | Uint8Array, length?: number): RefreshedRules {
+		const reader = input instanceof BinaryReader ? input : new BinaryReader(input)
+		let end = length === undefined ? reader.len : reader.pos + length
+		const message = createBaseRefreshedRules()
+		while (reader.pos < end) {
+			const tag = reader.uint32()
+			switch (tag >>> 3) {
+				case 1: {
+					if (tag !== 10) {
+						break
+					}
+
+					message.globalClineRulesToggles = ClineRulesToggles.decode(reader, reader.uint32())
+					continue
+				}
+				case 2: {
+					if (tag !== 18) {
+						break
+					}
+
+					message.localClineRulesToggles = ClineRulesToggles.decode(reader, reader.uint32())
+					continue
+				}
+				case 3: {
+					if (tag !== 26) {
+						break
+					}
+
+					message.localCursorRulesToggles = ClineRulesToggles.decode(reader, reader.uint32())
+					continue
+				}
+				case 4: {
+					if (tag !== 34) {
+						break
+					}
+
+					message.localWindsurfRulesToggles = ClineRulesToggles.decode(reader, reader.uint32())
+					continue
+				}
+				case 5: {
+					if (tag !== 42) {
+						break
+					}
+
+					message.workflowToggles = ClineRulesToggles.decode(reader, reader.uint32())
+					continue
+				}
+			}
+			if ((tag & 7) === 4 || tag === 0) {
+				break
+			}
+			reader.skip(tag & 7)
+		}
+		return message
+	},
+
+	fromJSON(object: any): RefreshedRules {
+		return {
+			globalClineRulesToggles: isSet(object.globalClineRulesToggles)
+				? ClineRulesToggles.fromJSON(object.globalClineRulesToggles)
+				: undefined,
+			localClineRulesToggles: isSet(object.localClineRulesToggles)
+				? ClineRulesToggles.fromJSON(object.localClineRulesToggles)
+				: undefined,
+			localCursorRulesToggles: isSet(object.localCursorRulesToggles)
+				? ClineRulesToggles.fromJSON(object.localCursorRulesToggles)
+				: undefined,
+			localWindsurfRulesToggles: isSet(object.localWindsurfRulesToggles)
+				? ClineRulesToggles.fromJSON(object.localWindsurfRulesToggles)
+				: undefined,
+			workflowToggles: isSet(object.workflowToggles) ? ClineRulesToggles.fromJSON(object.workflowToggles) : undefined,
+		}
+	},
+
+	toJSON(message: RefreshedRules): unknown {
+		const obj: any = {}
+		if (message.globalClineRulesToggles !== undefined) {
+			obj.globalClineRulesToggles = ClineRulesToggles.toJSON(message.globalClineRulesToggles)
+		}
+		if (message.localClineRulesToggles !== undefined) {
+			obj.localClineRulesToggles = ClineRulesToggles.toJSON(message.localClineRulesToggles)
+		}
+		if (message.localCursorRulesToggles !== undefined) {
+			obj.localCursorRulesToggles = ClineRulesToggles.toJSON(message.localCursorRulesToggles)
+		}
+		if (message.localWindsurfRulesToggles !== undefined) {
+			obj.localWindsurfRulesToggles = ClineRulesToggles.toJSON(message.localWindsurfRulesToggles)
+		}
+		if (message.workflowToggles !== undefined) {
+			obj.workflowToggles = ClineRulesToggles.toJSON(message.workflowToggles)
+		}
+		return obj
+	},
+
+	create<I extends Exact<DeepPartial<RefreshedRules>, I>>(base?: I): RefreshedRules {
+		return RefreshedRules.fromPartial(base ?? ({} as any))
+	},
+	fromPartial<I extends Exact<DeepPartial<RefreshedRules>, I>>(object: I): RefreshedRules {
+		const message = createBaseRefreshedRules()
+		message.globalClineRulesToggles =
+			object.globalClineRulesToggles !== undefined && object.globalClineRulesToggles !== null
+				? ClineRulesToggles.fromPartial(object.globalClineRulesToggles)
+				: undefined
+		message.localClineRulesToggles =
+			object.localClineRulesToggles !== undefined && object.localClineRulesToggles !== null
+				? ClineRulesToggles.fromPartial(object.localClineRulesToggles)
+				: undefined
+		message.localCursorRulesToggles =
+			object.localCursorRulesToggles !== undefined && object.localCursorRulesToggles !== null
+				? ClineRulesToggles.fromPartial(object.localCursorRulesToggles)
+				: undefined
+		message.localWindsurfRulesToggles =
+			object.localWindsurfRulesToggles !== undefined && object.localWindsurfRulesToggles !== null
+				? ClineRulesToggles.fromPartial(object.localWindsurfRulesToggles)
+				: undefined
+		message.workflowToggles =
+			object.workflowToggles !== undefined && object.workflowToggles !== null
+				? ClineRulesToggles.fromPartial(object.workflowToggles)
+				: undefined
+		return message
+	},
+}
+
+function createBaseToggleWindsurfRuleRequest(): ToggleWindsurfRuleRequest {
+	return { metadata: undefined, rulePath: "", enabled: false }
+}
+
+export const ToggleWindsurfRuleRequest: MessageFns<ToggleWindsurfRuleRequest> = {
+	encode(message: ToggleWindsurfRuleRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+		if (message.metadata !== undefined) {
+			Metadata.encode(message.metadata, writer.uint32(10).fork()).join()
+		}
+		if (message.rulePath !== "") {
+			writer.uint32(18).string(message.rulePath)
+		}
+		if (message.enabled !== false) {
+			writer.uint32(24).bool(message.enabled)
+		}
+		return writer
+	},
+
+	decode(input: BinaryReader | Uint8Array, length?: number): ToggleWindsurfRuleRequest {
+		const reader = input instanceof BinaryReader ? input : new BinaryReader(input)
+		let end = length === undefined ? reader.len : reader.pos + length
+		const message = createBaseToggleWindsurfRuleRequest()
+		while (reader.pos < end) {
+			const tag = reader.uint32()
+			switch (tag >>> 3) {
+				case 1: {
+					if (tag !== 10) {
+						break
+					}
+
+					message.metadata = Metadata.decode(reader, reader.uint32())
+					continue
+				}
+				case 2: {
+					if (tag !== 18) {
+						break
+					}
+
+					message.rulePath = reader.string()
+					continue
+				}
+				case 3: {
+					if (tag !== 24) {
+						break
+					}
+
+					message.enabled = reader.bool()
+					continue
+				}
+			}
+			if ((tag & 7) === 4 || tag === 0) {
+				break
+			}
+			reader.skip(tag & 7)
+		}
+		return message
+	},
+
+	fromJSON(object: any): ToggleWindsurfRuleRequest {
+		return {
+			metadata: isSet(object.metadata) ? Metadata.fromJSON(object.metadata) : undefined,
+			rulePath: isSet(object.rulePath) ? globalThis.String(object.rulePath) : "",
+			enabled: isSet(object.enabled) ? globalThis.Boolean(object.enabled) : false,
+		}
+	},
+
+	toJSON(message: ToggleWindsurfRuleRequest): unknown {
+		const obj: any = {}
+		if (message.metadata !== undefined) {
+			obj.metadata = Metadata.toJSON(message.metadata)
+		}
+		if (message.rulePath !== "") {
+			obj.rulePath = message.rulePath
+		}
+		if (message.enabled !== false) {
+			obj.enabled = message.enabled
+		}
+		return obj
+	},
+
+	create<I extends Exact<DeepPartial<ToggleWindsurfRuleRequest>, I>>(base?: I): ToggleWindsurfRuleRequest {
+		return ToggleWindsurfRuleRequest.fromPartial(base ?? ({} as any))
+	},
+	fromPartial<I extends Exact<DeepPartial<ToggleWindsurfRuleRequest>, I>>(object: I): ToggleWindsurfRuleRequest {
+		const message = createBaseToggleWindsurfRuleRequest()
+		message.metadata =
+			object.metadata !== undefined && object.metadata !== null ? Metadata.fromPartial(object.metadata) : undefined
+		message.rulePath = object.rulePath ?? ""
+		message.enabled = object.enabled ?? false
+		return message
+	},
+}
+
 function createBaseRelativePathsRequest(): RelativePathsRequest {
 	return { metadata: undefined, uris: [] }
 }
@@ -1412,6 +1676,15 @@ export const FileServiceDefinition = {
 			responseStream: false,
 			options: {},
 		},
+		/** Opens a mention (file, path, git commit, problem, terminal, or URL) */
+		openMention: {
+			name: "openMention",
+			requestType: StringRequest,
+			requestStream: false,
+			responseType: Empty,
+			responseStream: false,
+			options: {},
+		},
 		/** Deletes a rule file from either global or workspace rules directory */
 		deleteRuleFile: {
 			name: "deleteRuleFile",
@@ -1484,6 +1757,24 @@ export const FileServiceDefinition = {
 			responseStream: false,
 			options: {},
 		},
+		/** Toggle a Windsurf rule (enable or disable) */
+		toggleWindsurfRule: {
+			name: "toggleWindsurfRule",
+			requestType: ToggleWindsurfRuleRequest,
+			requestStream: false,
+			responseType: ClineRulesToggles,
+			responseStream: false,
+			options: {},
+		},
+		/** Refreshes all rule toggles (Cline, External, and Workflows) */
+		refreshRules: {
+			name: "refreshRules",
+			requestType: EmptyRequest,
+			requestStream: false,
+			responseType: RefreshedRules,
+			responseStream: false,
+			options: {},
+		},
 	},
 } as const
 

src/shared/proto/mcp.ts

@@ -6,7 +6,7 @@
 
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire"
-import { Empty, Metadata, StringRequest } from "./common"
+import { Empty, EmptyRequest, Metadata, StringRequest } from "./common"
 
 export const protobufPackage = "cline"
 
@@ -115,6 +115,31 @@ export interface McpServers {
 	mcpServers: McpServer[]
 }
 
+export interface McpMarketplaceItem {
+	mcpId: string
+	githubUrl: string
+	name: string
+	author: string
+	description: string
+	codiconIcon: string
+	logoUrl: string
+	category: string
+	tags: string[]
+	requiresApiKey: boolean
+	readmeContent?: string | undefined
+	llmsInstallationContent?: string | undefined
+	isRecommended: boolean
+	githubStars: number
+	downloadCount: number
+	createdAt: string
+	updatedAt: string
+	lastGithubSync: string
+}
+
+export interface McpMarketplaceCatalog {
+	items: McpMarketplaceItem[]
+}
+
 function createBaseToggleMcpServerRequest(): ToggleMcpServerRequest {
 	return { metadata: undefined, serverName: "", disabled: false }
 }
@@ -1091,6 +1116,419 @@ export const McpServers: MessageFns<McpServers> = {
 	},
 }
 
+function createBaseMcpMarketplaceItem(): McpMarketplaceItem {
+	return {
+		mcpId: "",
+		githubUrl: "",
+		name: "",
+		author: "",
+		description: "",
+		codiconIcon: "",
+		logoUrl: "",
+		category: "",
+		tags: [],
+		requiresApiKey: false,
+		readmeContent: undefined,
+		llmsInstallationContent: undefined,
+		isRecommended: false,
+		githubStars: 0,
+		downloadCount: 0,
+		createdAt: "",
+		updatedAt: "",
+		lastGithubSync: "",
+	}
+}
+
+export const McpMarketplaceItem: MessageFns<McpMarketplaceItem> = {
+	encode(message: McpMarketplaceItem, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+		if (message.mcpId !== "") {
+			writer.uint32(10).string(message.mcpId)
+		}
+		if (message.githubUrl !== "") {
+			writer.uint32(18).string(message.githubUrl)
+		}
+		if (message.name !== "") {
+			writer.uint32(26).string(message.name)
+		}
+		if (message.author !== "") {
+			writer.uint32(34).string(message.author)
+		}
+		if (message.description !== "") {
+			writer.uint32(42).string(message.description)
+		}
+		if (message.codiconIcon !== "") {
+			writer.uint32(50).string(message.codiconIcon)
+		}
+		if (message.logoUrl !== "") {
+			writer.uint32(58).string(message.logoUrl)
+		}
+		if (message.category !== "") {
+			writer.uint32(66).string(message.category)
+		}
+		for (const v of message.tags) {
+			writer.uint32(74).string(v!)
+		}
+		if (message.requiresApiKey !== false) {
+			writer.uint32(80).bool(message.requiresApiKey)
+		}
+		if (message.readmeContent !== undefined) {
+			writer.uint32(90).string(message.readmeContent)
+		}
+		if (message.llmsInstallationContent !== undefined) {
+			writer.uint32(98).string(message.llmsInstallationContent)
+		}
+		if (message.isRecommended !== false) {
+			writer.uint32(104).bool(message.isRecommended)
+		}
+		if (message.githubStars !== 0) {
+			writer.uint32(112).int32(message.githubStars)
+		}
+		if (message.downloadCount !== 0) {
+			writer.uint32(120).int32(message.downloadCount)
+		}
+		if (message.createdAt !== "") {
+			writer.uint32(130).string(message.createdAt)
+		}
+		if (message.updatedAt !== "") {
+			writer.uint32(138).string(message.updatedAt)
+		}
+		if (message.lastGithubSync !== "") {
+			writer.uint32(146).string(message.lastGithubSync)
+		}
+		return writer
+	},
+
+	decode(input: BinaryReader | Uint8Array, length?: number): McpMarketplaceItem {
+		const reader = input instanceof BinaryReader ? input : new BinaryReader(input)
+		let end = length === undefined ? reader.len : reader.pos + length
+		const message = createBaseMcpMarketplaceItem()
+		while (reader.pos < end) {
+			const tag = reader.uint32()
+			switch (tag >>> 3) {
+				case 1: {
+					if (tag !== 10) {
+						break
+					}
+
+					message.mcpId = reader.string()
+					continue
+				}
+				case 2: {
+					if (tag !== 18) {
+						break
+					}
+
+					message.githubUrl = reader.string()
+					continue
+				}
+				case 3: {
+					if (tag !== 26) {
+						break
+					}
+
+					message.name = reader.string()
+					continue
+				}
+				case 4: {
+					if (tag !== 34) {
+						break
+					}
+
+					message.author = reader.string()
+					continue
+				}
+				case 5: {
+					if (tag !== 42) {
+						break
+					}
+
+					message.description = reader.string()
+					continue
+				}
+				case 6: {
+					if (tag !== 50) {
+						break
+					}
+
+					message.codiconIcon = reader.string()
+					continue
+				}
+				case 7: {
+					if (tag !== 58) {
+						break
+					}
+
+					message.logoUrl = reader.string()
+					continue
+				}
+				case 8: {
+					if (tag !== 66) {
+						break
+					}
+
+					message.category = reader.string()
+					continue
+				}
+				case 9: {
+					if (tag !== 74) {
+						break
+					}
+
+					message.tags.push(reader.string())
+					continue
+				}
+				case 10: {
+					if (tag !== 80) {
+						break
+					}
+
+					message.requiresApiKey = reader.bool()
+					continue
+				}
+				case 11: {
+					if (tag !== 90) {
+						break
+					}
+
+					message.readmeContent = reader.string()
+					continue
+				}
+				case 12: {
+					if (tag !== 98) {
+						break
+					}
+
+					message.llmsInstallationContent = reader.string()
+					continue
+				}
+				case 13: {
+					if (tag !== 104) {
+						break
+					}
+
+					message.isRecommended = reader.bool()
+					continue
+				}
+				case 14: {
+					if (tag !== 112) {
+						break
+					}
+
+					message.githubStars = reader.int32()
+					continue
+				}
+				case 15: {
+					if (tag !== 120) {
+						break
+					}
+
+					message.downloadCount = reader.int32()
+					continue
+				}
+				case 16: {
+					if (tag !== 130) {
+						break
+					}
+
+					message.createdAt = reader.string()
+					continue
+				}
+				case 17: {
+					if (tag !== 138) {
+						break
+					}
+
+					message.updatedAt = reader.string()
+					continue
+				}
+				case 18: {
+					if (tag !== 146) {
+						break
+					}
+
+					message.lastGithubSync = reader.string()
+					continue
+				}
+			}
+			if ((tag & 7) === 4 || tag === 0) {
+				break
+			}
+			reader.skip(tag & 7)
+		}
+		return message
+	},
+
+	fromJSON(object: any): McpMarketplaceItem {
+		return {
+			mcpId: isSet(object.mcpId) ? globalThis.String(object.mcpId) : "",
+			githubUrl: isSet(object.githubUrl) ? globalThis.String(object.githubUrl) : "",
+			name: isSet(object.name) ? globalThis.String(object.name) : "",
+			author: isSet(object.author) ? globalThis.String(object.author) : "",
+			description: isSet(object.description) ? globalThis.String(object.description) : "",
+			codiconIcon: isSet(object.codiconIcon) ? globalThis.String(object.codiconIcon) : "",
+			logoUrl: isSet(object.logoUrl) ? globalThis.String(object.logoUrl) : "",
+			category: isSet(object.category) ? globalThis.String(object.category) : "",
+			tags: globalThis.Array.isArray(object?.tags) ? object.tags.map((e: any) => globalThis.String(e)) : [],
+			requiresApiKey: isSet(object.requiresApiKey) ? globalThis.Boolean(object.requiresApiKey) : false,
+			readmeContent: isSet(object.readmeContent) ? globalThis.String(object.readmeContent) : undefined,
+			llmsInstallationContent: isSet(object.llmsInstallationContent)
+				? globalThis.String(object.llmsInstallationContent)
+				: undefined,
+			isRecommended: isSet(object.isRecommended) ? globalThis.Boolean(object.isRecommended) : false,
+			githubStars: isSet(object.githubStars) ? globalThis.Number(object.githubStars) : 0,
+			downloadCount: isSet(object.downloadCount) ? globalThis.Number(object.downloadCount) : 0,
+			createdAt: isSet(object.createdAt) ? globalThis.String(object.createdAt) : "",
+			updatedAt: isSet(object.updatedAt) ? globalThis.String(object.updatedAt) : "",
+			lastGithubSync: isSet(object.lastGithubSync) ? globalThis.String(object.lastGithubSync) : "",
+		}
+	},
+
+	toJSON(message: McpMarketplaceItem): unknown {
+		const obj: any = {}
+		if (message.mcpId !== "") {
+			obj.mcpId = message.mcpId
+		}
+		if (message.githubUrl !== "") {
+			obj.githubUrl = message.githubUrl
+		}
+		if (message.name !== "") {
+			obj.name = message.name
+		}
+		if (message.author !== "") {
+			obj.author = message.author
+		}
+		if (message.description !== "") {
+			obj.description = message.description
+		}
+		if (message.codiconIcon !== "") {
+			obj.codiconIcon = message.codiconIcon
+		}
+		if (message.logoUrl !== "") {
+			obj.logoUrl = message.logoUrl
+		}
+		if (message.category !== "") {
+			obj.category = message.category
+		}
+		if (message.tags?.length) {
+			obj.tags = message.tags
+		}
+		if (message.requiresApiKey !== false) {
+			obj.requiresApiKey = message.requiresApiKey
+		}
+		if (message.readmeContent !== undefined) {
+			obj.readmeContent = message.readmeContent
+		}
+		if (message.llmsInstallationContent !== undefined) {
+			obj.llmsInstallationContent = message.llmsInstallationContent
+		}
+		if (message.isRecommended !== false) {
+			obj.isRecommended = message.isRecommended
+		}
+		if (message.githubStars !== 0) {
+			obj.githubStars = Math.round(message.githubStars)
+		}
+		if (message.downloadCount !== 0) {
+			obj.downloadCount = Math.round(message.downloadCount)
+		}
+		if (message.createdAt !== "") {
+			obj.createdAt = message.createdAt
+		}
+		if (message.updatedAt !== "") {
+			obj.updatedAt = message.updatedAt
+		}
+		if (message.lastGithubSync !== "") {
+			obj.lastGithubSync = message.lastGithubSync
+		}
+		return obj
+	},
+
+	create<I extends Exact<DeepPartial<McpMarketplaceItem>, I>>(base?: I): McpMarketplaceItem {
+		return McpMarketplaceItem.fromPartial(base ?? ({} as any))
+	},
+	fromPartial<I extends Exact<DeepPartial<McpMarketplaceItem>, I>>(object: I): McpMarketplaceItem {
+		const message = createBaseMcpMarketplaceItem()
+		message.mcpId = object.mcpId ?? ""
+		message.githubUrl = object.githubUrl ?? ""
+		message.name = object.name ?? ""
+		message.author = object.author ?? ""
+		message.description = object.description ?? ""
+		message.codiconIcon = object.codiconIcon ?? ""
+		message.logoUrl = object.logoUrl ?? ""
+		message.category = object.category ?? ""
+		message.tags = object.tags?.map((e) => e) || []
+		message.requiresApiKey = object.requiresApiKey ?? false
+		message.readmeContent = object.readmeContent ?? undefined
+		message.llmsInstallationContent = object.llmsInstallationContent ?? undefined
+		message.isRecommended = object.isRecommended ?? false
+		message.githubStars = object.githubStars ?? 0
+		message.downloadCount = object.downloadCount ?? 0
+		message.createdAt = object.createdAt ?? ""
+		message.updatedAt = object.updatedAt ?? ""
+		message.lastGithubSync = object.lastGithubSync ?? ""
+		return message
+	},
+}
+
+function createBaseMcpMarketplaceCatalog(): McpMarketplaceCatalog {
+	return { items: [] }
+}
+
+export const McpMarketplaceCatalog: MessageFns<McpMarketplaceCatalog> = {
+	encode(message: McpMarketplaceCatalog, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+		for (const v of message.items) {
+			McpMarketplaceItem.encode(v!, writer.uint32(10).fork()).join()
+		}
+		return writer
+	},
+
+	decode(input: BinaryReader | Uint8Array, length?: number): McpMarketplaceCatalog {
+		const reader = input instanceof BinaryReader ? input : new BinaryReader(input)
+		let end = length === undefined ? reader.len : reader.pos + length
+		const message = createBaseMcpMarketplaceCatalog()
+		while (reader.pos < end) {
+			const tag = reader.uint32()
+			switch (tag >>> 3) {
+				case 1: {
+					if (tag !== 10) {
+						break
+					}
+
+					message.items.push(McpMarketplaceItem.decode(reader, reader.uint32()))
+					continue
+				}
+			}
+			if ((tag & 7) === 4 || tag === 0) {
+				break
+			}
+			reader.skip(tag & 7)
+		}
+		return message
+	},
+
+	fromJSON(object: any): McpMarketplaceCatalog {
+		return {
+			items: globalThis.Array.isArray(object?.items) ? object.items.map((e: any) => McpMarketplaceItem.fromJSON(e)) : [],
+		}
+	},
+
+	toJSON(message: McpMarketplaceCatalog): unknown {
+		const obj: any = {}
+		if (message.items?.length) {
+			obj.items = message.items.map((e) => McpMarketplaceItem.toJSON(e))
+		}
+		return obj
+	},
+
+	create<I extends Exact<DeepPartial<McpMarketplaceCatalog>, I>>(base?: I): McpMarketplaceCatalog {
+		return McpMarketplaceCatalog.fromPartial(base ?? ({} as any))
+	},
+	fromPartial<I extends Exact<DeepPartial<McpMarketplaceCatalog>, I>>(object: I): McpMarketplaceCatalog {
+		const message = createBaseMcpMarketplaceCatalog()
+		message.items = object.items?.map((e) => McpMarketplaceItem.fromPartial(e)) || []
+		return message
+	},
+}
+
 export type McpServiceDefinition = typeof McpServiceDefinition
 export const McpServiceDefinition = {
 	name: "McpService",
@@ -1152,6 +1590,14 @@ export const McpServiceDefinition = {
 			responseStream: false,
 			options: {},
 		},
+		refreshMcpMarketplace: {
+			name: "refreshMcpMarketplace",
+			requestType: EmptyRequest,
+			requestStream: false,
+			responseType: McpMarketplaceCatalog,
+			responseStream: false,
+			options: {},
+		},
 	},
 } as const
 

src/shared/proto/state.ts

@@ -6,7 +6,7 @@
 
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire"
-import { Empty, EmptyRequest, Metadata, StringRequest } from "./common"
+import { Empty, EmptyRequest, Int64, Int64Request, Metadata, StringRequest } from "./common"
 
 export const protobufPackage = "cline"
 
@@ -436,6 +436,14 @@ export const StateServiceDefinition = {
 			responseStream: false,
 			options: {},
 		},
+		updateTerminalConnectionTimeout: {
+			name: "updateTerminalConnectionTimeout",
+			requestType: Int64Request,
+			requestStream: false,
+			responseType: Int64,
+			responseStream: false,
+			options: {},
+		},
 	},
 } as const
 

src/standalone/server-setup.ts

@@ -24,6 +24,7 @@ import { checkpointRestore } from "../core/controller/checkpoints/checkpointRest
 import { copyToClipboard } from "../core/controller/file/copyToClipboard"
 import { openFile } from "../core/controller/file/openFile"
 import { openImage } from "../core/controller/file/openImage"
+import { openMention } from "../core/controller/file/openMention"
 import { deleteRuleFile } from "../core/controller/file/deleteRuleFile"
 import { createRuleFile } from "../core/controller/file/createRuleFile"
 import { searchCommits } from "../core/controller/file/searchCommits"
@@ -32,6 +33,8 @@ import { getRelativePaths } from "../core/controller/file/getRelativePaths"
 import { searchFiles } from "../core/controller/file/searchFiles"
 import { toggleClineRule } from "../core/controller/file/toggleClineRule"
 import { toggleCursorRule } from "../core/controller/file/toggleCursorRule"
+import { toggleWindsurfRule } from "../core/controller/file/toggleWindsurfRule"
+import { refreshRules } from "../core/controller/file/refreshRules"
 
 // Mcp Service
 import { toggleMcpServer } from "../core/controller/mcp/toggleMcpServer"
@@ -41,6 +44,7 @@ import { downloadMcp } from "../core/controller/mcp/downloadMcp"
 import { restartMcpServer } from "../core/controller/mcp/restartMcpServer"
 import { deleteMcpServer } from "../core/controller/mcp/deleteMcpServer"
 import { toggleToolAutoApprove } from "../core/controller/mcp/toggleToolAutoApprove"
+import { refreshMcpMarketplace } from "../core/controller/mcp/refreshMcpMarketplace"
 
 // Models Service
 import { getOllamaModels } from "../core/controller/models/getOllamaModels"
@@ -60,6 +64,7 @@ import { subscribeToState } from "../core/controller/state/subscribeToState"
 import { toggleFavoriteModel } from "../core/controller/state/toggleFavoriteModel"
 import { resetState } from "../core/controller/state/resetState"
 import { togglePlanActMode } from "../core/controller/state/togglePlanActMode"
+import { updateTerminalConnectionTimeout } from "../core/controller/state/updateTerminalConnectionTimeout"
 
 // Task Service
 import { cancelTask } from "../core/controller/task/cancelTask"
@@ -116,6 +121,7 @@ export function addServices(
 		copyToClipboard: wrapper(copyToClipboard, controller),
 		openFile: wrapper(openFile, controller),
 		openImage: wrapper(openImage, controller),
+		openMention: wrapper(openMention, controller),
 		deleteRuleFile: wrapper(deleteRuleFile, controller),
 		createRuleFile: wrapper(createRuleFile, controller),
 		searchCommits: wrapper(searchCommits, controller),
@@ -124,6 +130,8 @@ export function addServices(
 		searchFiles: wrapper(searchFiles, controller),
 		toggleClineRule: wrapper(toggleClineRule, controller),
 		toggleCursorRule: wrapper(toggleCursorRule, controller),
+		toggleWindsurfRule: wrapper(toggleWindsurfRule, controller),
+		refreshRules: wrapper(refreshRules, controller),
 	})
 
 	// Mcp Service
@@ -135,6 +143,7 @@ export function addServices(
 		restartMcpServer: wrapper(restartMcpServer, controller),
 		deleteMcpServer: wrapper(deleteMcpServer, controller),
 		toggleToolAutoApprove: wrapper(toggleToolAutoApprove, controller),
+		refreshMcpMarketplace: wrapper(refreshMcpMarketplace, controller),
 	})
 
 	// Models Service
@@ -160,6 +169,7 @@ export function addServices(
 		toggleFavoriteModel: wrapper(toggleFavoriteModel, controller),
 		resetState: wrapper(resetState, controller),
 		togglePlanActMode: wrapper(togglePlanActMode, controller),
+		updateTerminalConnectionTimeout: wrapper(updateTerminalConnectionTimeout, controller),
 	})
 
 	// Task Service

webview-ui/src/components/browser/BrowserSettingsMenu.tsx

@@ -13,7 +13,7 @@ interface ConnectionInfo {
 }
 
 export const BrowserSettingsMenu = () => {
-	const { browserSettings } = useExtensionState()
+	const { browserSettings, navigateToSettings } = useExtensionState()
 	const containerRef = useRef<HTMLDivElement>(null)
 	const [showInfoPopover, setShowInfoPopover] = useState(false)
 	const [connectionInfo, setConnectionInfo] = useState<ConnectionInfo>({
@@ -65,10 +65,8 @@ export const BrowserSettingsMenu = () => {
 	}, [showInfoPopover])
 
 	const openBrowserSettings = () => {
-		// First open the settings panel
-		vscode.postMessage({
-			type: "openSettings",
-		})
+		// First open the settings panel using direct navigation
+		navigateToSettings()
 
 		// After a short delay, send a message to scroll to browser settings
 		setTimeout(async () => {

webview-ui/src/components/chat/ChatTextArea.tsx

@@ -966,9 +966,12 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 			}
 			setTimeout(() => {
 				const newMode = chatSettings.mode === "plan" ? "act" : "plan"
-				StateServiceClient.togglePlanActMode({
+				vscode.postMessage({
+					type: "togglePlanActMode",
 					chatSettings: {
 						mode: newMode,
+						preferredLanguage: chatSettings.preferredLanguage,
+						openAIReasoningEffort: chatSettings.openAIReasoningEffort,
 					},
 					chatContent: {
 						message: inputValue.trim() ? inputValue : undefined,

webview-ui/src/components/chat/TaskHeader.tsx

@@ -11,7 +11,7 @@ import Thumbnails from "@/components/common/Thumbnails"
 import { normalizeApiConfiguration } from "@/components/settings/ApiOptions"
 import { validateSlashCommand } from "@/utils/slash-commands"
 import TaskTimeline from "./TaskTimeline"
-import { TaskServiceClient } from "@/services/grpc-client"
+import { TaskServiceClient, FileServiceClient } from "@/services/grpc-client"
 import HeroTooltip from "@/components/common/HeroTooltip"
 
 interface TaskHeaderProps {
@@ -597,7 +597,7 @@ export const highlightMentions = (text: string, withShadow = true) => {
 					key={index}
 					className={withShadow ? "mention-context-highlight-with-shadow" : "mention-context-highlight"}
 					style={{ cursor: "pointer" }}
-					onClick={() => vscode.postMessage({ type: "openMention", text: part })}>
+					onClick={() => FileServiceClient.openMention({ value: part })}>
 					@{part}
 				</span>
 			)

webview-ui/src/components/cline-rules/ClineRulesToggleModal.tsx

@@ -4,10 +4,12 @@ import { useExtensionState } from "@/context/ExtensionStateContext"
 import { CODE_BLOCK_BG_COLOR } from "@/components/common/CodeBlock"
 import { vscode } from "@/utils/vscode"
 import { FileServiceClient } from "@/services/grpc-client"
-import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
+import { VSCodeButton, VSCodeLink } from "@vscode/webview-ui-toolkit/react"
 import RulesToggleList from "./RulesToggleList"
 import Tooltip from "@/components/common/Tooltip"
 import styled from "styled-components"
+import { ClineRulesToggles, RefreshedRules, ToggleWindsurfRuleRequest } from "@shared/proto/file"
+import { EmptyRequest } from "@shared/proto/common"
 
 const ClineRulesToggleModal: React.FC = () => {
 	const {
@@ -19,6 +21,8 @@ const ClineRulesToggleModal: React.FC = () => {
 		setGlobalClineRulesToggles,
 		setLocalClineRulesToggles,
 		setLocalCursorRulesToggles,
+		setLocalWindsurfRulesToggles,
+		setWorkflowToggles,
 	} = useExtensionState()
 	const [isVisible, setIsVisible] = useState(false)
 	const buttonRef = useRef<HTMLDivElement>(null)
@@ -30,7 +34,28 @@ const ClineRulesToggleModal: React.FC = () => {
 
 	useEffect(() => {
 		if (isVisible) {
-			vscode.postMessage({ type: "refreshClineRules" })
+			FileServiceClient.refreshRules({} as EmptyRequest)
+				.then((response: RefreshedRules) => {
+					// Update state with the response data using all available setters
+					if (response.globalClineRulesToggles?.toggles) {
+						setGlobalClineRulesToggles(response.globalClineRulesToggles.toggles)
+					}
+					if (response.localClineRulesToggles?.toggles) {
+						setLocalClineRulesToggles(response.localClineRulesToggles.toggles)
+					}
+					if (response.localCursorRulesToggles?.toggles) {
+						setLocalCursorRulesToggles(response.localCursorRulesToggles.toggles)
+					}
+					if (response.localWindsurfRulesToggles?.toggles) {
+						setLocalWindsurfRulesToggles(response.localWindsurfRulesToggles.toggles)
+					}
+					if (response.workflowToggles?.toggles) {
+						setWorkflowToggles(response.workflowToggles.toggles)
+					}
+				})
+				.catch((error) => {
+					console.error("Failed to refresh rules:", error)
+				})
 		}
 	}, [isVisible])
 
@@ -94,11 +119,18 @@ const ClineRulesToggleModal: React.FC = () => {
 	}
 
 	const toggleWindsurfRule = (rulePath: string, enabled: boolean) => {
-		vscode.postMessage({
-			type: "toggleWindsurfRule",
+		FileServiceClient.toggleWindsurfRule({
 			rulePath,
 			enabled,
-		})
+		} as ToggleWindsurfRuleRequest)
+			.then((response: ClineRulesToggles) => {
+				if (response.toggles) {
+					setLocalWindsurfRulesToggles(response.toggles)
+				}
+			})
+			.catch((error) => {
+				console.error("Error toggling Windsurf rule:", error)
+			})
 	}
 
 	const toggleWorkflow = (workflowPath: string, enabled: boolean) => {
@@ -190,7 +222,13 @@ const ClineRulesToggleModal: React.FC = () => {
 						{currentView === "rules" ? (
 							<p>
 								Rules allow you to provide Cline with system-level guidance. Think of them as a persistent way to
-								include context and preferences for your projects or globally for every conversation.
+								include context and preferences for your projects or globally for every conversation.{" "}
+								<VSCodeLink
+									href="https://docs.cline.bot/features/cline-rules"
+									style={{ display: "inline" }}
+									className="text-xs">
+									Docs
+								</VSCodeLink>
 							</p>
 						) : (
 							<p>
@@ -201,7 +239,13 @@ const ClineRulesToggleModal: React.FC = () => {
 								text-[var(--vscode-foreground)] font-bold">
 									/workflow-name
 								</span>{" "}
-								in the chat.
+								in the chat.{" "}
+								<VSCodeLink
+									href="https://docs.cline.bot/features/slash-commands/workflows"
+									style={{ display: "inline" }}
+									className="text-xs">
+									Docs
+								</VSCodeLink>
 							</p>
 						)}
 					</div>

webview-ui/src/components/common/TelemetryBanner.tsx

@@ -1,6 +1,7 @@
 import { VSCodeButton, VSCodeLink } from "@vscode/webview-ui-toolkit/react"
 import { memo, useState } from "react"
 import styled from "styled-components"
+import { useExtensionState } from "@/context/ExtensionStateContext"
 import { vscode } from "@/utils/vscode"
 import { TelemetrySetting } from "@shared/TelemetrySetting"
 
@@ -45,9 +46,11 @@ const ButtonContainer = styled.div`
 `
 
 const TelemetryBanner = () => {
+	const { navigateToSettings } = useExtensionState()
+
 	const handleOpenSettings = () => {
 		handleClose()
-		vscode.postMessage({ type: "openSettings" })
+		navigateToSettings()
 	}
 
 	const handleClose = () => {

webview-ui/src/components/mcp/configuration/McpConfigurationView.tsx

@@ -3,6 +3,7 @@ import { useEffect, useState } from "react"
 import styled from "styled-components"
 import { useExtensionState } from "@/context/ExtensionStateContext"
 import { vscode } from "@/utils/vscode"
+import { McpServiceClient } from "@/services/grpc-client"
 import AddRemoteServerForm from "./tabs/add-server/AddRemoteServerForm"
 import McpMarketplaceView from "./tabs/marketplace/McpMarketplaceView"
 import InstalledServersView from "./tabs/installed/InstalledServersView"
@@ -28,9 +29,20 @@ const McpConfigurationView = ({ onDone, initialTab }: McpViewProps) => {
 		}
 	}, [mcpMarketplaceEnabled, activeTab])
 
+	// Get setter for MCP marketplace catalog from context
+	const { setMcpMarketplaceCatalog } = useExtensionState()
+
 	useEffect(() => {
 		if (mcpMarketplaceEnabled) {
-			vscode.postMessage({ type: "silentlyRefreshMcpMarketplace" })
+			McpServiceClient.refreshMcpMarketplace({})
+				.then((response) => {
+					// Types are structurally identical, use response directly
+					setMcpMarketplaceCatalog(response)
+				})
+				.catch((error) => {
+					console.error("Error refreshing MCP marketplace:", error)
+				})
+
 			vscode.postMessage({ type: "fetchLatestMcpServersFromHub" })
 		}
 	}, [mcpMarketplaceEnabled])

webview-ui/src/components/settings/SettingsView.tsx

@@ -115,9 +115,12 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 			switch (message.type) {
 				case "didUpdateSettings":
 					if (pendingTabChange) {
-						StateServiceClient.togglePlanActMode({
+						vscode.postMessage({
+							type: "togglePlanActMode",
 							chatSettings: {
 								mode: pendingTabChange,
+								preferredLanguage: chatSettings.preferredLanguage,
+								openAIReasoningEffort: chatSettings.openAIReasoningEffort,
 							},
 						})
 						setPendingTabChange(null)

webview-ui/src/components/settings/TerminalSettingsSection.tsx

@@ -1,7 +1,8 @@
 import React, { useState } from "react"
 import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
 import { useExtensionState } from "@/context/ExtensionStateContext"
-import { vscode } from "@/utils/vscode"
+import { StateServiceClient } from "@/services/grpc-client"
+import { Int64, Int64Request } from "@shared/proto/common"
 
 export const TerminalSettingsSection: React.FC = () => {
 	const { shellIntegrationTimeout, setShellIntegrationTimeout } = useExtensionState()
@@ -26,11 +27,17 @@ export const TerminalSettingsSection: React.FC = () => {
 		// Update local state
 		setShellIntegrationTimeout(timeout)
 
-		// Send to extension
-		vscode.postMessage({
-			type: "updateTerminalConnectionTimeout",
-			shellIntegrationTimeout: timeout,
-		})
+		// Send to extension using gRPC
+		StateServiceClient.updateTerminalConnectionTimeout({
+			value: timeout,
+		} as Int64Request)
+			.then((response: Int64) => {
+				setShellIntegrationTimeout(response.value)
+				setInputValue((response.value / 1000).toString())
+			})
+			.catch((error) => {
+				console.error("Failed to update terminal connection timeout:", error)
+			})
 	}
 
 	const handleInputBlur = () => {

webview-ui/src/context/ExtensionStateContext.tsx

@@ -54,6 +54,9 @@ interface ExtensionStateContextType extends ExtensionState {
 	setGlobalClineRulesToggles: (toggles: Record<string, boolean>) => void
 	setLocalClineRulesToggles: (toggles: Record<string, boolean>) => void
 	setLocalCursorRulesToggles: (toggles: Record<string, boolean>) => void
+	setLocalWindsurfRulesToggles: (toggles: Record<string, boolean>) => void
+	setWorkflowToggles: (toggles: Record<string, boolean>) => void
+	setMcpMarketplaceCatalog: (value: McpMarketplaceCatalog) => void
 
 	// Navigation state setters
 	setShowMcp: (value: boolean) => void
@@ -499,6 +502,7 @@ export const ExtensionStateContextProvider: React.FC<{
 				shellIntegrationTimeout: value,
 			})),
 		setMcpServers: (mcpServers: McpServer[]) => setMcpServers(mcpServers),
+		setMcpMarketplaceCatalog: (catalog: McpMarketplaceCatalog) => setMcpMarketplaceCatalog(catalog),
 		setShowMcp,
 		closeMcpView,
 		setChatSettings: (value) => {
@@ -532,6 +536,16 @@ export const ExtensionStateContextProvider: React.FC<{
 				...prevState,
 				localCursorRulesToggles: toggles,
 			})),
+		setLocalWindsurfRulesToggles: (toggles) =>
+			setState((prevState) => ({
+				...prevState,
+				localWindsurfRulesToggles: toggles,
+			})),
+		setWorkflowToggles: (toggles) =>
+			setState((prevState) => ({
+				...prevState,
+				workflowToggles: toggles,
+			})),
 		setMcpTab,
 	}