rename test and add orgs

* refactor & fix: improve account view with better states management

The previous AccountView implementation suffered from several critical state management issues:

- Incorrect info on display: The active account is not ready when component is mounted because the fetching only start on mount but doesn't get reset correctly
- Excessive re-renders: All data was fetched on component mount, causing cascading state updates
- Race conditions: Multiple concurrent API calls and state dependencies created unpredictable behavior, e.g. 403 rate limits errors
- Monolithic state management: All account data, organizations, and auth state was managed in a single massive component
- Poor user experience: Users saw empty states and loading flickers when switching between organizations
- Tight coupling: User and org info logic was deeply embedded within the account view that cause Effect dependency loops

Solution: Centralized Authentication Context

- Extracted auth logic into dedicated ClineAuthContext with organizations state management
- Eliminated prop drilling by providing clineUser, organizations, and activeOrganization at the context level
- Reduced component re-renders by managing auth state separately from UI state
- Performed authentication guard at higher level and only displays user account to authenticated user. The component will get dismounted when user is not autheticated.
- Move handleSignIn and handleSignout into individual functions instead as they are regular functions with no state dependency

* 60secs

* Optimize state updates in AccountView to prevent unnecessary re-renders

Remove conditional checks before setState calls and use functional updates
with deep equality comparison to avoid redundant state changes and
dependency array bloat in useCallback hooks.

* add docs

* fix format

* fix error test

* setuser on logout

.changeset/chilly-sheep-rhyme.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Improve cerebras Qwen model performance by removing thinking tokens from the model input

.changeset/kind-boxes-remember.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Change available Cerebras models - limit to Qwen and llama 3.3 70b

.changeset/many-ligers-beam.md

@@ -1,8 +0,0 @@
----
-"claude-dev": patch
----
-
-Added checkpointTrackerErrorMessage to HistoryItem - restored with task, prevents re-initialization if timed out before
-Never re-init checkpoint tracker if it timed out before
-Warning at 7s that it's taking awhile, timeout and give up at 15s
-Fixed click to open settings - now opens to correct tab

.changeset/moody-crabs-relate.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-fix: mcp servers are not started when disabled

.changeset/nasty-vans-mate.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Refactor Git commit message generation to support output streaming.

.changeset/nine-adults-play.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+DeepSeek R1 0528 support under Hugging Face

.changeset/popular-flies-explode.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Introduce Claude Code support on Windows and fix E2BIG issues

.changeset/smart-jobs-impress.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fixed token counting when using VSCode LM API provider

.changeset/sweet-days-whisper.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+fix: only focus on editor panel that is visible and active to stop input field stealing issue

.changeset/tiny-pants-train.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+trim input value for URL fields

.changeset/wet-spiders-watch.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Change Cerebras Qwen 3 32b context window from 16k to 64k

.eslintrc.json

@@ -20,7 +20,6 @@
 		"no-throw-literal": "warn",
 		"semi": "off",
 		"react-hooks/exhaustive-deps": "off",
-		"eslint-rules/no-protobuf-object-literals": "error",
 		"eslint-rules/no-direct-vscode-api": "warn",
 		"no-restricted-syntax": [
 			"error",

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,7 +5,7 @@ body:
     - type: markdown
       attributes:
           value: |
-              **Important:** All bug reports must be reproducible using Claude 3.5 Sonnet. Cline uses complex prompts so less capable models may not work as expected.
+              **Important:** All bug reports must be reproducible using Claude 4 Sonnet. Cline uses complex prompts so less capable models may not work as expected.
     - type: textarea
       id: what-happened
       attributes:
@@ -24,7 +24,7 @@ body:
               2.
               3.
       validations:
-          required: true
+          required: false
     - type: textarea
       id: logs
       attributes:
@@ -39,20 +39,19 @@ body:
           placeholder: "e.g., cline:anthropic/claude-3.7-sonnet, gemini:gemini-2.5-pro-exp-03-25"
       validations:
           required: true
-    - type: input
-      id: operating-system
-      attributes:
-          label: Operating System
-          description: What operating system are you using?
-          placeholder: "e.g., Windows 11, macOS Sonoma, Ubuntu 22.04"
-      validations:
-          required: true
     - type: textarea
       id: system-info
       attributes:
-          label: System Info
-          description: What system information is relevant to the issue?
-          placeholder: "e.g., CPU: Intel Core i7-11700K, GPU: NVIDIA GeForce RTX 3070, RAM: 32GB DDR4"
+          label: System Information
+          description: What operating system and hardware are you using?
+          placeholder: |
+              Operating System: Windows 11, macOS Sonoma, Ubuntu 22.04, etc.
+              Hardware: CPU, GPU, RAM specifications if relevant
+              e.g.,
+              OS: Windows 11
+              CPU: Intel Core i7-11700K
+              GPU: NVIDIA GeForce RTX 3070
+              RAM: 32GB DDR4
       validations:
           required: true
     - type: input
@@ -63,8 +62,3 @@ body:
           placeholder: "e.g., 1.2.3"
       validations:
           required: true
-    - type: textarea
-      id: additional-context
-      attributes:
-          label: Additional context
-          description: Add any other context about the problem here, such as screenshots or related issues.

.github/ISSUE_TEMPLATE/feature_contribution.yml

@@ -1,116 +0,0 @@
-name: 💡 Feature Proposal & Contribution
-description: Propose a new feature or improvement, and optionally offer to implement feature as a contributor
-labels: ["proposal"]
-body:
-    - type: markdown
-      attributes:
-          value: |
-              **Feature Proposal & Contribution for Cline**
-
-              Thank you for proposing a feature or improvement for Cline! This template helps us understand the problem, evaluate the solution, and coordinate implementation.
-
-              **For detailed proposals:** Please provide comprehensive information to enable fast prioritization and discussion.
-              **For contribution offers:** You can indicate your willingness to implement the feature yourself.
-
-              Before submitting:
-              - Search existing [Issues](https://github.com/cline/cline/issues) and [Discussions](https://github.com/cline/cline/discussions) to avoid duplicates
-              - Read the [Contributing Guide](https://github.com/cline/cline/blob/main/CONTRIBUTING.md) if you plan to contribute
-              - Don't start implementation until the proposal is reviewed and approved
-
-    - type: textarea
-      id: problem-description
-      attributes:
-          label: What problem does this solve?
-          description: |
-              Describe the problem clearly from a user's point of view. Focus on why this matters, who it affects, and when it occurs.
-
-              ✅ Good examples:
-              - "LLM provider returns 400 error when nearing the context window instead of truncating"
-              - "Submit button is invisible in dark mode"
-              - "Users can't easily share their Cline configurations with team members"
-
-              ❌ Avoid vague descriptions:
-              - "Performance is bad"
-              - "UI needs work"
-
-              Your description should include:
-              - Who is affected?
-              - When does it happen?
-              - What's the current vs expected behavior?
-              - What is the impact?
-          placeholder: Be specific about the problem, who it affects, and the impact.
-      validations:
-          required: true
-
-    - type: textarea
-      id: proposed-solution
-      attributes:
-          label: What's the proposed solution?
-          description: |
-              Describe how the problem should be solved. Be specific about UX, system behavior, and any flows that would change.
-
-              ✅ Good examples:
-              - "Add error handling immediately after attempting to create the llm stream and retry after manually truncating"
-              - "Update button styling to ensure contrast in all themes"
-              - "Add export/import functionality in settings with JSON format"
-
-              ❌ Avoid vague solutions:
-              - "Improve performance"
-              - "Fix the bug"
-
-              Your solution should include:
-              - What exactly will change?
-              - How will users interact with it?
-              - What's the expected outcome?
-          placeholder: Describe the proposed changes and how they solve the problem.
-      validations:
-          required: false
-
-    - type: dropdown
-      id: contribution-intent
-      attributes:
-          label: Are you interested in implementing this?
-          description: Let us know if you'd like to contribute to this feature
-          options:
-              - "No, just proposing the idea"
-              - "Yes, I'd like to implement this myself"
-              - "Yes, I'd like to collaborate with others"
-              - "Maybe, depending on complexity and guidance"
-      validations:
-          required: false
-
-    - type: textarea
-      id: implementation-approach
-      attributes:
-          label: Implementation approach (if contributing)
-          description: |
-              **Only fill this out if you selected "Yes" above.**
-
-              How do you plan to implement this? Include:
-              - High-level technical approach
-              - Files/components that would be affected
-              - Any new dependencies required
-              - Potential challenges or considerations you've identified
-
-              This helps us provide better guidance and ensures alignment before you start coding.
-          placeholder: "My implementation approach would be..."
-
-    - type: checkboxes
-      id: checklist
-      attributes:
-          label: Proposal checklist
-          options:
-              - label: I've checked for existing issues or related proposals
-                required: true
-              - label: I understand this needs review before implementation can start
-                required: true
-
-    - type: checkboxes
-      id: contribution-checklist
-      attributes:
-          label: Contribution checklist (if contributing)
-          description: Only check these if you plan to contribute
-          options:
-              - label: I've read the [Contributing Guide](https://github.com/cline/cline/blob/main/CONTRIBUTING.md)
-              - label: I'm willing to make changes based on feedback
-              - label: I understand the code review process and requirements

.github/pull_request_template.md

@@ -2,15 +2,14 @@
 Thank you for contributing to Cline!
 
 ⚠️ Important: Before submitting this PR, please ensure you have:
-- Opened an issue and discussed your proposed changes with the community / contributors
-- Received approval from a core Cline contributor prior to proceeding with the implementation
-- Link the associated issue in the "Related Issue" section
+- For feature requests: Created a discussion in our Feature Requests discussions board https://github.com/cline/cline/discussions/categories/feature-requests and received approval from core maintainers before implementation
+- For all changes: Link the associated issue/discussion in the "Related Issue" section below
 
 Limited exceptions:
-Small bug fixes, typo corrections, minor wording improvements, or simple type fixes that don't change functionality may be submitted directly.
+Small bug fixes, typo corrections, minor wording improvements, or simple type fixes that don't change functionality may be submitted directly without prior discussion.
 
 Why this requirement?
-We deeply appreciate all community contributions - they are the core reason we're able to operate successfully and keep innovating! We welcome community input and want to make it as easy as possible for people to submit quality work. This process helps our core maintainers review new ideas faster and saves contributor time by ensuring you have the go-ahead before spending time on implementation.
+We deeply appreciate all community contributions - they are essential to Cline's success! To ensure the best use of everyone's time and maintain project direction, we use our Feature Requests discussions board to gauge community interest and validate feature ideas before implementation begins. This helps us focus development efforts on features that will benefit the most users.
 -->
 
 ### Related Issue

.gitignore

@@ -15,6 +15,9 @@ pnpm-lock.yaml
 .venv
 .actrc
 
+webview-ui/src/**/*.js
+webview-ui/src/**/*.js.map
+
 # Ignore coverage directories and files
 coverage
 # But don't ignore the coverage scripts in .github/scripts/
@@ -24,11 +27,7 @@ coverage
 
 ## Generated files ##
 src/generated/
-src/core/controller/*/methods.ts
-src/core/controller/*/index.ts
-src/core/controller/grpc-service-config.ts
-src/shared/proto/*.ts
-src/shared/proto/host/*.ts
+src/shared/proto/
 webview-ui/src/services/grpc-client.ts
 
 # E2E Tests

.vscode/launch.json

@@ -6,7 +6,7 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "Run Extension",
+			"name": "Run Extension (production)",
 			"type": "extensionHost",
 			"request": "launch",
 			"args": ["--extensionDevelopmentPath=${workspaceFolder}", "--disable-workspace-trust", "${workspaceFolder}"],
@@ -15,12 +15,35 @@
 			"env": {
 				"IS_DEV": "true",
 				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}",
-				// Use the environment variable to determine the backend URL
-				// Options: "production", "staging", "local"
-				// Require the extension to reload to apply changes
 				"CLINE_ENVIRONMENT": "production"
 			}
 		},
+		{
+			"name": "Run Extension (staging)",
+			"type": "extensionHost",
+			"request": "launch",
+			"args": ["--extensionDevelopmentPath=${workspaceFolder}", "--disable-workspace-trust", "${workspaceFolder}"],
+			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
+			"preLaunchTask": "${defaultBuildTask}",
+			"env": {
+				"IS_DEV": "true",
+				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}",
+				"CLINE_ENVIRONMENT": "staging"
+			}
+		},
+		{
+			"name": "Run Extension (local)",
+			"type": "extensionHost",
+			"request": "launch",
+			"args": ["--extensionDevelopmentPath=${workspaceFolder}", "--disable-workspace-trust", "${workspaceFolder}"],
+			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
+			"preLaunchTask": "${defaultBuildTask}",
+			"env": {
+				"IS_DEV": "true",
+				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}",
+				"CLINE_ENVIRONMENT": "local"
+			}
+		},
 		{
 			"name": "Run Extension (Fresh Install Mode)",
 			"type": "extensionHost",
@@ -48,7 +71,7 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Run Standalone Service",
+			"name": "Run cline-core service",
 			"skipFiles": ["<node_internals>/**"],
 			"sourceMaps": true,
 			"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
@@ -59,11 +82,9 @@
 				// Turns on grpc debug log.
 				//"GRPC_TRACE": "all",
 				//"GRPC_VERBOSITY": "DEBUG",
-				"NODE_PATH": "${workspaceFolder}/dist-standalone/node_modules",
-
-				"HOST_BRIDGE_ADDRESS": "localhost:50052"
+				"NODE_PATH": "${workspaceFolder}/dist-standalone/node_modules"
 			},
-			"program": "standalone.js"
+			"program": "cline-core.js"
 		}
 	]
 }

.vscode/settings.json

@@ -9,5 +9,9 @@
 		"dist": true // set this to false to include "dist" folder in search results
 	},
 	// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
-	"typescript.tsc.autoDetect": "off"
+	"typescript.tsc.autoDetect": "off",
+	// Protobuf settings
+	"protoc": {
+		"options": ["--proto_path=proto"]
+	}
 }

CONTRIBUTING.md

@@ -14,14 +14,11 @@ Bug reports help make Cline better for everyone! Before creating a new issue, pl
 ## Before Contributing
 
 All contributions must begin with a GitHub Issue, unless the change is for small bug fixes, typo corrections, minor wording improvements, or simple type fixes that don't change functionality.
-
-- **Check existing issues**: Search [GitHub Issues](https://github.com/cline/cline/issues).
-- **Create an issue**: Use appropriate templates:
-    - **Contributions:** Use the "Contribution Request" template to propose what you'd like to work on.
-    - **Bugs:** "Bug Report" template for reporting issues.
-    - **Features:** "Detailed Feature Proposal" template for suggesting new features.
-- **Wait for approval**: A core Cline contributor must approve your contribution request before you start implementation.
-- **Claim issues**: Once approved, the issue will be assigned to you.
+**For features and contributions**:
+- First check the [Feature Requests discussions board](https://github.com/cline/cline/discussions/categories/feature-requests) for similar ideas
+- If your idea is new, create a new feature request  
+- Wait for approval from core maintainers before starting implementation
+- Once approved, feel free to begin working on a PR with the help of our community!
 
 **PRs without approved issues may be closed.**
 

buf.yaml

@@ -9,7 +9,6 @@ lint:
 
     except: # Add exceptions for current patterns that contradict STANDARD settings
         - RPC_PASCAL_CASE # rpcs are camel case (start with lowercase)
-        - PACKAGE_DIRECTORY_MATCH # the protos in the cline package are not in a dir named cline.
         - RPC_REQUEST_RESPONSE_UNIQUE # request messages are not unique.
         - RPC_REQUEST_STANDARD_NAME # request messages dont all end with Request
         - RPC_RESPONSE_STANDARD_NAME # response messages dont all end with Response

docs/mcp/adding-mcp-servers-from-github.mdx

@@ -17,6 +17,7 @@ There are multiple places online to find MCP servers:
     -   [mcpservers.org](https://mcpservers.org/)
     -   [mcp.so](https://mcp.so/)
     -   [glama.ai/mcp/servers](https://glama.ai/mcp/servers)
+    -   [mcp.composio.dev](https://mcp.composio.dev/)
 
     These directories allow users to sort the servers by various criteria such as downloads, date, stars, and use case. Each entry provides information such as features, tools, and configuration instructions.
 

docs/troubleshooting/terminal-integration-guide.mdx

@@ -244,13 +244,60 @@ Recent macOS versions have stricter terminal permissions:
 
 ### Windows Issues
 
-#### PowerShell Execution Policy
+If you're using Windows and still experiencing issues with shell integration after trying the previous steps, it's recommended you use Git Bash (or PowerShell).
 
-If commands fail silently:
+### Git Bash
+
+Git Bash is a terminal emulator that provides a Unix-like command line experience on Windows. To use Git Bash, you need to:
+
+1. Download and run the Git for Windows installer from [https://git-scm.com/downloads/win](https://git-scm.com/downloads/win)
+2. Quit and re-open VSCode
+3. Press `Ctrl + Shift + P` to open the Command Palette
+4. Type "Terminal: Select Default Profile" and choose it
+5. Select "Git Bash"
+
+### PowerShell
+
+If you'd still like to use PowerShell, make sure you're using an updated version (at least v7+).
+  - Check your current PowerShell version by running: `$PSVersionTable.PSVersion`
+  - If your version is below 7, [update PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/whats-new/migrating-from-windows-powershell-51-to-powershell-7?view=powershell-7.4#installing-powershell-7).
+
+You may also need to adjust your PowerShell execution policy. By default, PowerShell restricts script execution for security reasons.
+
+#### Understanding PowerShell Execution Policies
+
+PowerShell uses execution policies to determine which scripts can run on your system. Here are the most common policies:
+
+- `Restricted`: No PowerShell scripts can run. This is the default setting.
+- `AllSigned`: All scripts, including local ones, must be signed by a trusted publisher.
+- `RemoteSigned`: Scripts created locally can run, but scripts downloaded from the internet must be signed.
+- `Unrestricted`: No restrictions. Any script can run, though you will be warned before running internet-downloaded scripts.
+
+For development work in VSCode, the `RemoteSigned` policy is generally recommended. It allows locally created scripts to run without restrictions while maintaining security for downloaded scripts. To learn more about PowerShell execution policies and understand the security implications of changing them, visit Microsoft's documentation: [About Execution Policies](https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_execution_policies).
+
+#### Steps to Change the Execution Policy
+
+1. Open PowerShell as an Administrator: Press `Win + X` and select "Windows PowerShell (Administrator)" or "Windows Terminal (Administrator)".
+
+2. Check Current Execution Policy by running this command:
+     ```powershell
+     Get-ExecutionPolicy
+     ```
+   - If the output is already `RemoteSigned`, `Unrestricted`, or `Bypass`, you likely don't need to change your execution policy. These policies should allow shell integration to work.
+   - If the output is `Restricted` or `AllSigned`, you may need to change your policy to enable shell integration.
+
+3. Change the Execution Policy by running the following command:
+     ```powershell
+     Set-ExecutionPolicy RemoteSigned -Scope CurrentUser
+     ```
+   - This sets the policy to `RemoteSigned` for the current user only, which is safer than changing it system-wide.
+
+4. Confirm the Change by typing `Y` and pressing Enter when prompted.
+
+5. Verify the Policy Change by running `Get-ExecutionPolicy` again to confirm the new setting.
+
+6. Restart VSCode and try the shell integration again.
 
-```powershell
-Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-```
 
 #### WSL Integration
 

esbuild.mjs

@@ -1,6 +1,10 @@
-const esbuild = require("esbuild")
-const fs = require("fs")
-const path = require("path")
+import fs from "node:fs"
+import * as esbuild from "esbuild"
+import path from "node:path"
+import { fileURLToPath } from "node:url"
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 
 const production = process.argv.includes("--production")
 const watch = process.argv.includes("--watch")
@@ -127,10 +131,8 @@ const baseConfig = {
 	sourcemap: !production,
 	logLevel: "silent",
 	define: production
-		? {
-				"process.env.IS_DEV": JSON.stringify(!production),
-			}
-		: undefined,
+		? { "import.meta.url": "_importMetaUrl", "process.env.IS_DEV": JSON.stringify(!production) }
+		: { "import.meta.url": "_importMetaUrl" },
 	tsconfig: path.resolve(__dirname, "tsconfig.json"),
 	plugins: [
 		copyWasmFiles,
@@ -141,6 +143,10 @@ const baseConfig = {
 	format: "cjs",
 	sourcesContent: false,
 	platform: "node",
+	define: { "import.meta.url": "_importMetaUrl" },
+	banner: {
+		js: "const _importMetaUrl=require('url').pathToFileURL(__filename)",
+	},
 }
 
 // Extension-specific configuration

eslint-rules/__tests__/no-protobuf-object-literals.test.ts

@@ -1,214 +0,0 @@
-const { RuleTester } = require("eslint")
-const rule = require("../no-protobuf-object-literals")
-
-const ruleTester = new RuleTester({
-	parser: require.resolve("@typescript-eslint/parser"),
-	parserOptions: {
-		ecmaVersion: 2020,
-		sourceType: "module",
-		ecmaFeatures: {
-			jsx: true,
-		},
-	},
-})
-
-ruleTester.run("no-protobuf-object-literals", rule, {
-	valid: [
-		// Valid case: Using .create() method
-		{
-			code: `
-        import { State } from '@shared/proto/state';
-        
-        const state = State.create({
-          stateJson: '{"apiConfig":{"provider":"anthropic","model":"claude-3-haiku"}}'
-        });
-      `,
-		},
-		// Valid case: Using .fromPartial() method
-		{
-			code: `
-        import { ChatSettings } from '@shared/proto/state';
-        
-        const settings = ChatSettings.fromPartial({
-          mode: 0,
-          preferredLanguage: 'en',
-          openAiReasoningEffort: 'thorough'
-        });
-      `,
-		},
-		// Valid case: Object literal not used with protobuf type
-		{
-			code: `
-        interface MyInterface {
-          id: number;
-          name: string;
-        }
-        
-        const obj: MyInterface = {
-          id: 123,
-          name: 'test'
-        };
-      `,
-		},
-		// Valid case: Using object literal for non-protobuf import
-		{
-			code: `
-        import { SomeType } from '@some/other/package';
-
-        const obj: SomeType = {
-          id: 123,
-          name: 'test'
-        };
-      `,
-		},
-		// Valid case: Regular function call with object literal (should not be flagged)
-		{
-			code: `
-        import { State } from '@shared/proto/state';
-
-        // This should not be flagged because it's a regular function call
-        // not directly tied to a protobuf type
-        process({
-          id: 123,
-          name: 'test',
-          data: { nested: true }
-        });
-      `,
-		},
-	],
-	invalid: [
-		// Invalid case: Using object literal with imported protobuf type
-		{
-			code: `
-        import { State } from '@shared/proto/state';
-
-        const state: State = {
-          stateJson: '{"apiConfig":{"provider":"anthropic","model":"claude-3-haiku"}}'
-        };
-      `,
-			output: `
-        import { State } from '@shared/proto/state';
-
-        const state: State = State.create({
-          stateJson: '{"apiConfig":{"provider":"anthropic","model":"claude-3-haiku"}}'
-        });
-      `,
-			errors: [{ messageId: "useProtobufMethod" }],
-		},
-		// Invalid case: Using object literal with namespaced protobuf type
-		{
-			code: `
-        import * as stateProto from '@shared/proto/state';
-
-        const state: stateProto.State = {
-          stateJson: '{"apiConfig":{"provider":"anthropic","model":"claude-3-haiku"}}'
-        };
-      `,
-			output: `
-        import * as stateProto from '@shared/proto/state';
-
-        const state: stateProto.State = stateProto.State.create({
-          stateJson: '{"apiConfig":{"provider":"anthropic","model":"claude-3-haiku"}}'
-        });
-      `,
-			errors: [{ messageId: "useProtobufMethodGeneric" }],
-		},
-		// Invalid case: Using object literal in a return statement (with protobuf return type)
-		{
-			code: `
-        import { ChatSettings } from '@shared/proto/state';
-
-        function createSettings(): ChatSettings {
-          return {
-            mode: 0,
-            preferredLanguage: 'en',
-            openAiReasoningEffort: 'thorough'
-          };
-        }
-      `,
-			output: `
-        import { ChatSettings } from '@shared/proto/state';
-
-        function createSettings(): ChatSettings {
-          return ChatSettings.create({
-            mode: 0,
-            preferredLanguage: 'en',
-            openAiReasoningEffort: 'thorough'
-          });
-        }
-      `,
-			errors: [{ messageId: "useProtobufMethod" }],
-		},
-		// Invalid case: Using object literal in a function parameter (with protobuf types imported)
-		{
-			code: `
-        import { ChatContent } from '@shared/proto/state';
-
-        function processContent(content: ChatContent) {
-          // process the content
-        }
-
-        processContent({
-          message: 'Hello, this is a test message',
-          images: ['image1.png', 'image2.jpg'],
-          files: ['file1.txt', 'file2.pdf']
-        });
-      `,
-			output: `
-        import { ChatContent } from '@shared/proto/state';
-
-        function processContent(content: ChatContent) {
-          // process the content
-        }
-
-        processContent(ChatContent.create({
-          message: 'Hello, this is a test message',
-          images: ['image1.png', 'image2.jpg'],
-          files: ['file1.txt', 'file2.pdf']
-        }));
-      `,
-			errors: [{ messageId: "useProtobufMethodGeneric" }],
-		},
-		// Invalid case: Using object literal in assignment expression
-		{
-			code: `
-        import { State } from '@shared/proto/state';
-
-        let state: State;
-        state = {
-          stateJson: '{"apiConfig":{"provider":"anthropic","model":"claude-3-haiku"}}'
-        };
-      `,
-			output: `
-        import { State } from '@shared/proto/state';
-
-        let state: State;
-        state = State.create({
-          stateJson: '{"apiConfig":{"provider":"anthropic","model":"claude-3-haiku"}}'
-        });
-      `,
-			errors: [{ messageId: "useProtobufMethod" }],
-		},
-		// Test with custom protobufPackages option
-		{
-			code: `
-        import { CustomProto } from 'custom/proto/package';
-
-        const obj: CustomProto = {
-          field1: 'value',
-          field2: 123
-        };
-      `,
-			output: `
-        import { CustomProto } from 'custom/proto/package';
-
-        const obj: CustomProto = CustomProto.create({
-          field1: 'value',
-          field2: 123
-        });
-      `,
-			options: [{ protobufPackages: ["custom/proto"] }],
-			errors: [{ messageId: "useProtobufMethod" }],
-		},
-	],
-})

eslint-rules/index.js

@@ -1,17 +1,14 @@
 // eslint-rules/index.js
-const noProtobufObjectLiterals = require("./no-protobuf-object-literals")
 const noDirectVscodeApi = require("./no-direct-vscode-api")
 
 module.exports = {
 	rules: {
-		"no-protobuf-object-literals": noProtobufObjectLiterals,
 		"no-direct-vscode-api": noDirectVscodeApi,
 	},
 	configs: {
 		recommended: {
 			plugins: ["local"],
 			rules: {
-				"local/no-protobuf-object-literals": "error",
 				"local/no-direct-vscode-api": "warn",
 			},
 		},

eslint-rules/no-direct-vscode-api.js

@@ -29,20 +29,21 @@ const disallowedApis = {
 	"vscode.workspace.applyEdit": {
 		messageId: "useHostBridge",
 	},
-	// "vscode.env.openExternal": {
-	// 	messageId: "useUtils",
-	// },
+	"vscode.window.onDidChangeActiveTextEditor": {
+		messageId: "useHostBridge",
+	},
+	"vscode.env.openExternal": {
+		messageId: "useUtils",
+	},
 	// "vscode.window.showWarningMessage": {
 	// 	messageId: "useHostBridgeShowMessage",
 	// },
 	"vscode.window.showOpenDialog": {
 		messageId: "useHostBridgeShowMessage",
 	},
-	// There are too many warnings for these calls, uncomment the following
-	// when the migration is finished.
-	// "vscode.window.showErrorMessage": {
-	// 	messageId: "useHostBridgeShowMessage",
-	// },
+	"vscode.window.showErrorMessage": {
+		messageId: "useHostBridgeShowMessage",
+	},
 	// "vscode.window.showInformationMessage": {
 	// 	messageId: "useHostBridgeShowMessage",
 	// },
@@ -186,6 +187,10 @@ module.exports = createRule({
 			if (filename.includes("/standalone/runtime-files/")) {
 				return true
 			}
+			// Skip unit tests
+			if (filename.endsWith(".test.ts")) {
+				return true
+			}
 		}
 
 		return {

eslint-rules/no-protobuf-object-literals.js

@@ -1,556 +0,0 @@
-const { ESLintUtils } = require("@typescript-eslint/utils")
-
-const createRule = ESLintUtils.RuleCreator((name) => `https://cline.bot/eslint-rules/${name}`)
-
-module.exports = createRule({
-	name: "no-protobuf-object-literals",
-	meta: {
-		type: "problem",
-		docs: {
-			description: "Enforce using .create() or .fromPartial() for protobuf objects instead of object literals",
-			recommended: "error",
-		},
-		fixable: "code",
-		messages: {
-			useProtobufMethod:
-				"Use {{typeName}}.create() or {{typeName}}.fromPartial() instead of " +
-				"object literal for protobuf type from @shared/proto\n" +
-				"Found: {{code}}\n  Suggestion: " +
-				"{{typeName}}.create({{objectContent}})",
-			useProtobufMethodGeneric:
-				"Use .create() or .fromPartial() instead of object literal for protobuf " +
-				"type from @shared/proto\n  Found: {{code}}",
-		},
-		schema: [
-			{
-				type: "object",
-				properties: {
-					protobufPackages: {
-						type: "array",
-						items: { type: "string" },
-						default: ["shared/proto/"],
-					},
-				},
-				additionalProperties: false,
-			},
-		],
-	},
-	defaultOptions: [{ protobufPackages: ["shared/proto/"] }],
-
-	create(context, [options]) {
-		const protobufPackages = options.protobufPackages
-		const protobufImports = new Set() // Set of imported protobuf types
-		const protobufNamespaceImports = new Set() // For namespace imports like "import * as proto"
-		const safeObjectExpressions = new Set() // Track object expressions in create/fromPartial calls
-
-		return {
-			// Skip object literals inside create() or fromPartial() method calls
-			CallExpression(node) {
-				if (
-					node.callee &&
-					node.callee.type === "MemberExpression" &&
-					(node.callee.property.name === "create" || node.callee.property.name === "fromPartial") &&
-					node.arguments.length > 0 &&
-					node.arguments[0].type === "ObjectExpression"
-				) {
-					// Track this object expression as being used with create/fromPartial
-					safeObjectExpressions.add(node.arguments[0])
-				}
-			},
-
-			// Track imports from protobuf packages
-			ImportDeclaration(node) {
-				const packageName = node.source.value
-
-				if (matchesProtobufPackage(packageName, protobufPackages)) {
-					// This is a protobuf package.
-					node.specifiers.forEach((spec) => {
-						if (spec.type === "ImportSpecifier") {
-							// import { MyRequest } from '@shared/proto'
-							protobufImports.add(spec.imported.name)
-						} else if (spec.type === "ImportNamespaceSpecifier") {
-							// import * as proto from '@shared/proto'
-							protobufNamespaceImports.add(spec.local.name)
-						}
-					})
-				}
-			},
-
-			// Check variable declarations with type annotations
-			"VariableDeclarator > ObjectExpression"(node) {
-				// Skip if this is inside a create/fromPartial call
-				if (safeObjectExpressions.has(node)) {
-					return
-				}
-
-				// Found object literal in variable declaration
-				const declarator = node.parent
-
-				if (declarator.id && declarator.id.typeAnnotation) {
-					const typeName = getTypeName(declarator.id.typeAnnotation.typeAnnotation)
-					if (typeName) {
-						// Check if it's a direct protobuf import
-						if (protobufImports.has(typeName)) {
-							//console.log('🚨 VIOLATION: Using object literal for protobuf type:', typeName);
-							const sourceCode = context.getSourceCode()
-							const declaratorText = sourceCode.getText(declarator)
-							const objectText = sourceCode.getText(node)
-
-							context.report({
-								node,
-								messageId: "useProtobufMethod",
-								data: {
-									typeName,
-									code: declaratorText,
-									objectContent: objectText,
-								},
-								fix(fixer) {
-									// Replace the object literal with Type.create() call
-									return fixer.replaceText(node, `${typeName}.create(${objectText})`)
-								},
-							})
-							return
-						}
-
-						// Check if it's a namespaced protobuf type (e.g., proto.MyRequest)
-						if (isNamespacedProtobufType(protobufNamespaceImports, typeName)) {
-							//console.log('🚨 VIOLATION: Using object literal for namespaced protobuf type:', typeName);
-							const sourceCode = context.getSourceCode()
-							const declaratorText = sourceCode.getText(declarator)
-							context.report({
-								node,
-								messageId: "useProtobufMethodGeneric",
-								data: { code: declaratorText },
-								fix(fixer) {
-									// For namespaced types, use the full type name to call create()
-									return fixer.replaceText(node, `${typeName}.create(${sourceCode.getText(node)})`)
-								},
-							})
-						}
-					}
-				}
-			},
-
-			// Check assignment expressions
-			"AssignmentExpression > ObjectExpression"(node) {
-				// Skip if this is inside a create/fromPartial call
-				if (safeObjectExpressions.has(node)) {
-					return
-				}
-
-				const assignment = node.parent
-
-				// For assignment to variables without inline type annotation
-				if (assignment.left && assignment.right === node) {
-					let typeName = null
-
-					// Check if there's a typeAnnotation directly on the left
-					if (assignment.left.typeAnnotation) {
-						typeName = getTypeName(assignment.left.typeAnnotation.typeAnnotation)
-					}
-					// Otherwise try to infer from the variable name if it's a simple identifier
-					else if (assignment.left.type === "Identifier") {
-						const varName = assignment.left.name
-						// Check variable declarations in the current scope
-						const sourceCode = context.getSourceCode()
-						const scope = sourceCode.getScope(node)
-						const variable = scope.variables.find((v) => v.name === varName)
-						if (variable && variable.defs.length > 0) {
-							const def = variable.defs[0]
-							if (def.node.id && def.node.id.typeAnnotation) {
-								typeName = getTypeName(def.node.id.typeAnnotation.typeAnnotation)
-							}
-						}
-					}
-
-					if (typeName && protobufImports.has(typeName)) {
-						//console.log('🚨 VIOLATION: Using object literal in assignment for protobuf type:', typeName);
-						const sourceCode = context.getSourceCode()
-						const assignmentText = sourceCode.getText(assignment.left) + " = "
-						const objectText = sourceCode.getText(node)
-
-						context.report({
-							node,
-							messageId: "useProtobufMethod",
-							data: {
-								typeName,
-								code: assignmentText + "{",
-								objectContent: objectText,
-							},
-							fix(fixer) {
-								// Replace the object literal with Type.create() call in assignments
-								return fixer.replaceText(node, `${typeName}.create(${objectText})`)
-							},
-						})
-					}
-				}
-			},
-
-			// Check return statements
-			"ReturnStatement > ObjectExpression"(node) {
-				// Skip if this is inside a create/fromPartial call
-				if (safeObjectExpressions.has(node)) {
-					return
-				}
-
-				// Find the parent function to get its return type
-				const functionNode = findParentFunction(node)
-				if (!functionNode) {
-					return
-				}
-
-				// Try to get the return type using our enhanced helper
-				const sourceCode = context.getSourceCode()
-				let returnTypeName = getFunctionReturnType(functionNode, sourceCode)
-
-				// For async functions with Promise<Type> return type, extract the inner type
-				if (returnTypeName && returnTypeName.startsWith("Promise<") && returnTypeName.endsWith(">")) {
-					returnTypeName = returnTypeName.slice(8, -1)
-				}
-
-				// Check if the return type is a protobuf type
-				if (returnTypeName) {
-					if (protobufImports.has(returnTypeName)) {
-						//console.log('🚨 VIOLATION: Return type is a protobuf type:', returnTypeName);
-						const sourceCode = context.getSourceCode()
-						const returnText = sourceCode.getText(node.parent)
-						context.report({
-							node,
-							messageId: "useProtobufMethod",
-							data: {
-								typeName: returnTypeName,
-								code: returnText,
-								objectContent: sourceCode.getText(node),
-							},
-							fix(fixer) {
-								// Replace the object literal with Type.create() call in return statements
-								return fixer.replaceText(node, `${returnTypeName}.create(${sourceCode.getText(node)})`)
-							},
-						})
-						return
-					}
-
-					// Check if it's a namespaced protobuf type
-					if (isNamespacedProtobufType(protobufNamespaceImports, returnTypeName)) {
-						const sourceCode = context.getSourceCode()
-						const returnText = sourceCode.getText(node.parent)
-						//console.log('🚨 VIOLATION: Return type is a namespaced protobuf type:', returnTypeName);
-						context.report({
-							node,
-							messageId: "useProtobufMethodGeneric",
-							data: { code: returnText },
-							fix(fixer) {
-								// For namespaced types in return statements, we need to extract the full type name
-								const objectCode = sourceCode.getText(node)
-								// Since we may not know the exact type, we'll use the more generic namespaced type
-								return fixer.replaceText(node, `${returnTypeName}.create(${objectCode})`)
-							},
-						})
-						return
-					}
-				}
-
-				// Final fallback - if there are any protobuf imports and the function signature
-				// mentions a return type that matches one of the imported types
-				const functionText = functionNode ? sourceCode.getText(functionNode) : ""
-
-				for (const protoType of protobufImports) {
-					// Use more precise regex to match return type patterns specifically
-					// Rather than just checking if the type name appears anywhere in the signature
-					const returnTypeRegex = new RegExp(
-						// Match arrow function return type
-						`=>\\s*:?\\s*${protoType}\\b|` +
-							// Match function declaration return type
-							`\\)\\s*:?\\s*${protoType}\\b|` +
-							// Match Promise return type
-							`\\)\\s*:?\\s*Promise<\\s*${protoType}\\s*>|` +
-							// Match function type in variable declaration
-							`:\\s*\\(.*\\)\\s*=>\\s*${protoType}\\b`,
-					)
-
-					if (returnTypeRegex.test(functionText)) {
-						const returnText = sourceCode.getText(node.parent)
-						//console.log('🚨 VIOLATION: regex matched protobuf type:', functionText);
-						context.report({
-							node,
-							messageId: "useProtobufMethod",
-							data: {
-								typeName: protoType,
-								code: returnText,
-								objectContent: sourceCode.getText(node),
-							},
-							fix(fixer) {
-								// Replace the object literal with Type.create() call
-								return fixer.replaceText(node, `${protoType}.create(${sourceCode.getText(node)})`)
-							},
-						})
-						return
-					}
-				}
-				// Check for namespace imports too
-				for (const namespace of protobufNamespaceImports) {
-					// Similar to above, but for namespaced types
-					const namespaceReturnTypeRegex = new RegExp(
-						// Match arrow function return type
-						`=>\\s*:?\\s*${namespace}\\.\\w+\\b|` +
-							// Match function declaration return type
-							`\\)\\s*:?\\s*${namespace}\\.\\w+\\b|` +
-							// Match Promise return type
-							`\\)\\s*:?\\s*Promise<\\s*${namespace}\\.\\w+\\s*>|` +
-							// Match function type in variable declaration
-							`:\\s*\\(.*\\)\\s*=>\\s*${namespace}\\.\\w+\\b`,
-					)
-
-					if (namespaceReturnTypeRegex.test(functionText)) {
-						const returnText = sourceCode.getText(node.parent)
-						//console.log('🚨 VIOLATION: regex matched namespaced protobuf type:', functionText, "namespace:", namespace);
-						context.report({
-							node,
-							messageId: "useProtobufMethodGeneric",
-							data: { code: returnText },
-							fix(fixer) {
-								// For namespaced types based on function signature patterns
-								// Extract the namespace and type from the function text using more precise patterns
-								const match = functionText.match(
-									new RegExp(
-										// Match return type patterns more precisely
-										`\\)\\s*:?\\s*(${namespace}\\.[\\w]+)\\b|` + // Function declaration
-											`=>\\s*:?\\s*(${namespace}\\.[\\w]+)\\b|` + // Arrow function
-											`Promise<\\s*(${namespace}\\.[\\w]+)\\s*>`, // Promise wrapped
-									),
-								)
-								if (match) {
-									const fullType = match[1] || match[2]
-									return fixer.replaceText(node, `${fullType}.create(${sourceCode.getText(node)})`)
-								}
-								// Fallback - we can't determine the exact type, but we know it's from the namespace
-								// Use a namespace-based approach
-								return fixer.replaceText(node, `${namespace}.create(${sourceCode.getText(node)})`)
-							},
-						})
-						return
-					}
-				}
-			},
-
-			// Check function call arguments (more selective approach)
-			"CallExpression > ObjectExpression"(node) {
-				// Skip if this is inside a create/fromPartial call
-				if (safeObjectExpressions.has(node)) {
-					return
-				}
-
-				// We need to be more selective to avoid false positives
-				// Only warn if:
-				// 1. The function is called on a protobuf namespace
-				// 2. The call argument has a type annotation that matches a protobuf type
-				// 3. The call is to a function that we know takes a protobuf type
-
-				// Check if it's a call on a protobuf namespace
-				if (
-					node.parent.callee &&
-					node.parent.callee.type === "MemberExpression" &&
-					node.parent.callee.object.type === "Identifier"
-				) {
-					const namespace = node.parent.callee.object.name
-					if (protobufNamespaceImports.has(namespace)) {
-						const sourceCode = context.getSourceCode()
-						const callText = sourceCode.getText(node.parent)
-						//console.log('🚨 VIOLATION: Check function call arguments object literal:', callText);
-						context.report({
-							node,
-							messageId: "useProtobufMethodGeneric",
-							data: { code: callText },
-							fix(fixer) {
-								// For calls on a protobuf namespace
-								const memberExpr = node.parent.callee
-								// Try to determine if this is calling a method that expects a specific type
-								const methodName = memberExpr.property.name
-
-								// If method name looks like 'create' + Type, we can infer the type
-								const possibleTypeName = methodName.replace(/^create/, "")
-
-								// Check if namespace has a type with this name
-								// Since we can't directly check at lint time, we'll use the namespace + inferred type
-								if (possibleTypeName && possibleTypeName !== methodName) {
-									return fixer.replaceText(
-										node,
-										`${namespace}.${possibleTypeName}.create(${sourceCode.getText(node)})`,
-									)
-								}
-
-								// Fallback - use a more generic approach with namespace
-								return fixer.replaceText(node, `${namespace}.create(${sourceCode.getText(node)})`)
-							},
-						})
-						return
-					}
-				}
-
-				// For regular function calls with object literals, check if there are protobuf imports
-				// and if the function might expect a protobuf type
-				if (node.parent.callee) {
-					// This is a more permissive check to catch cases like processContent({ ... })
-					// which might be passing a protobuf type
-					const sourceCode = context.getSourceCode()
-					const scope = sourceCode.getScope(node)
-
-					// Try to find the function definition
-					if (node.parent.callee.type === "Identifier") {
-						const functionName = node.parent.callee.name
-						const variable = scope.variables.find((v) => v.name === functionName)
-
-						// If we found the function and it has parameter type annotations
-						// that match protobuf types, flag it
-						if (variable && variable.defs.length > 0) {
-							const def = variable.defs[0]
-							if (def.node.params && node.parent.arguments.indexOf(node) < def.node.params.length) {
-								const param = def.node.params[node.parent.arguments.indexOf(node)]
-								if (param.typeAnnotation) {
-									const typeName = getTypeName(param.typeAnnotation.typeAnnotation)
-									if (
-										typeName &&
-										(protobufImports.has(typeName) ||
-											isNamespacedProtobufType(protobufNamespaceImports, typeName))
-									) {
-										const callText = sourceCode.getText(node.parent)
-										//console.log('🚨 VIOLATION: Function call arguments object literal:', callText);
-										context.report({
-											node,
-											messageId: "useProtobufMethodGeneric",
-											data: { code: callText },
-											fix(fixer) {
-												// For function calls with protobuf type parameters
-												return fixer.replaceText(node, `${typeName}.create(${sourceCode.getText(node)})`)
-											},
-										})
-										return
-									}
-								}
-							}
-						}
-					}
-				}
-			},
-		}
-	},
-})
-
-// Helper functions
-function getTypeName(typeAnnotation) {
-	if (!typeAnnotation) {
-		return null
-	}
-
-	if (typeAnnotation.type === "TSTypeReference") {
-		if (typeAnnotation.typeName.type === "Identifier") {
-			return typeAnnotation.typeName.name
-		} else if (typeAnnotation.typeName.type === "TSQualifiedName") {
-			// Handle namespaced types like proto.MyRequest
-			return `${typeAnnotation.typeName.left.name}.${typeAnnotation.typeName.right.name}`
-		}
-	}
-	return null
-}
-
-function matchesProtobufPackage(packageName, protobufPackages) {
-	return protobufPackages.some((protobufPackage) => {
-		// Remove leading and trailing @ and / from protobufPackage
-		const cleanedPackage = protobufPackage.replace(/^[@\/]/, "").replace(/[\/]$/, "")
-		const pattern = new RegExp(`(.*[@/]|)${escapeRegex(cleanedPackage)}[/].*`)
-		return pattern.test(packageName)
-	})
-}
-
-// Helper function to escape special regex characters
-function escapeRegex(string) {
-	return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
-}
-
-// Helper to extract function return type more reliably
-function getFunctionReturnType(functionNode, sourceCode) {
-	// 1. Check explicit return type annotation
-	if (functionNode.returnType) {
-		return getTypeName(functionNode.returnType.typeAnnotation)
-	}
-
-	// 2. For variable declarations like const foo: (arg: Type) => ReturnType = ...
-	if (functionNode.parent && functionNode.parent.type === "VariableDeclarator") {
-		const declarator = functionNode.parent
-		if (declarator.id && declarator.id.typeAnnotation) {
-			const typeAnnotation = declarator.id.typeAnnotation.typeAnnotation
-
-			// Handle function type annotations
-			if (typeAnnotation.type === "TSFunctionType" && typeAnnotation.typeAnnotation) {
-				return getTypeName(typeAnnotation.typeAnnotation)
-			}
-
-			// Handle type references to function types
-			if (typeAnnotation.type === "TSTypeReference") {
-				// This might be a type like Promise<ReturnType>
-				if (
-					typeAnnotation.typeName.name === "Promise" &&
-					typeAnnotation.typeParameters &&
-					typeAnnotation.typeParameters.params.length > 0
-				) {
-					return getTypeName(typeAnnotation.typeParameters.params[0])
-				}
-			}
-		}
-	}
-
-	// 3. For class methods, check if it's part of an interface implementation
-	if (
-		functionNode.parent &&
-		functionNode.parent.type === "MethodDefinition" &&
-		functionNode.parent.parent &&
-		functionNode.parent.parent.type === "ClassBody"
-	) {
-		const className = getEnclosingClassName(functionNode)
-		const methodName = functionNode.parent.key.name
-
-		if (className && methodName) {
-			// Look for interface declarations in the scope
-			const scope = sourceCode.getScope(functionNode)
-			// This would require more complex scope analysis which is limited in ESLint
-			// For now, we'll return null and rely on other methods
-		}
-	}
-
-	return null
-}
-
-// Helper to get the class name for a method
-function getEnclosingClassName(node) {
-	let current = node.parent
-	while (current) {
-		if (current.type === "ClassDeclaration" && current.id) {
-			return current.id.name
-		}
-		current = current.parent
-	}
-	return null
-}
-function isNamespacedProtobufType(protobufNamespaceImports, typeName) {
-	if (!typeName.includes(".")) {
-		return false
-	}
-
-	const namespace = typeName.split(".")[0]
-	return protobufNamespaceImports.has(namespace)
-}
-
-function findParentFunction(node) {
-	let current = node.parent
-	while (current) {
-		if (
-			current.type === "FunctionDeclaration" ||
-			current.type === "FunctionExpression" ||
-			current.type === "ArrowFunctionExpression"
-		) {
-			return current
-		}
-		current = current.parent
-	}
-	return null
-}

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "claude-dev",
-	"version": "3.19.7",
+	"version": "3.20.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "claude-dev",
-			"version": "3.19.7",
+			"version": "3.20.1",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@anthropic-ai/sdk": "^0.37.0",
@@ -7907,10 +7907,9 @@
 			"integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="
 		},
 		"node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-			"license": "MIT",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
 			}
@@ -17786,10 +17785,9 @@
 			}
 		},
 		"node_modules/tar-fs": {
-			"version": "3.0.8",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.8.tgz",
-			"integrity": "sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg==",
-			"license": "MIT",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.0.tgz",
+			"integrity": "sha512-5Mty5y/sOF1YWj1J6GiBodjlDc05CUR8PKXrsnFAiSG0xA+GHeWLovaZPYUDXkH/1iKRf2+M5+OrRgzC7O9b7w==",
 			"dependencies": {
 				"pump": "^3.0.0",
 				"tar-stream": "^3.1.5"
@@ -18418,10 +18416,9 @@
 			"license": "MIT"
 		},
 		"node_modules/undici": {
-			"version": "6.21.1",
-			"resolved": "https://registry.npmjs.org/undici/-/undici-6.21.1.tgz",
-			"integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==",
-			"license": "MIT",
+			"version": "6.21.3",
+			"resolved": "https://registry.npmjs.org/undici/-/undici-6.21.3.tgz",
+			"integrity": "sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==",
 			"engines": {
 				"node": ">=18.17"
 			}
@@ -25163,9 +25160,9 @@
 			"integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="
 		},
 		"brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
 			"requires": {
 				"balanced-match": "^1.0.0"
 			}
@@ -31801,9 +31798,9 @@
 			}
 		},
 		"tar-fs": {
-			"version": "3.0.8",
-			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.8.tgz",
-			"integrity": "sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.0.tgz",
+			"integrity": "sha512-5Mty5y/sOF1YWj1J6GiBodjlDc05CUR8PKXrsnFAiSG0xA+GHeWLovaZPYUDXkH/1iKRf2+M5+OrRgzC7O9b7w==",
 			"requires": {
 				"bare-fs": "^4.0.1",
 				"bare-path": "^3.0.0",
@@ -32226,9 +32223,9 @@
 			"integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g=="
 		},
 		"undici": {
-			"version": "6.21.1",
-			"resolved": "https://registry.npmjs.org/undici/-/undici-6.21.1.tgz",
-			"integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ=="
+			"version": "6.21.3",
+			"resolved": "https://registry.npmjs.org/undici/-/undici-6.21.3.tgz",
+			"integrity": "sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw=="
 		},
 		"undici-types": {
 			"version": "5.26.5",

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.19.7",
+	"version": "3.20.2",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"
@@ -338,14 +338,14 @@
 	},
 	"scripts": {
 		"vscode:prepublish": "npm run package",
-		"compile": "npm run check-types && npm run lint && node esbuild.js",
-		"compile-standalone": "npm run check-types && npm run lint && node esbuild.js --standalone",
+		"compile": "npm run check-types && npm run lint && node esbuild.mjs",
+		"compile-standalone": "npm run check-types && npm run lint && node esbuild.mjs --standalone",
 		"postcompile-standalone": "node scripts/package-standalone.mjs",
 		"watch": "npm-run-all -p watch:*",
-		"watch:esbuild": "node esbuild.js --watch",
+		"watch:esbuild": "node esbuild.mjs --watch",
 		"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
-		"package": "npm run check-types && npm run build:webview && npm run lint && node esbuild.js --production",
-		"protos": "node scripts/build-proto.mjs && node scripts/generate-server-setup.mjs && node scripts/generate-host-bridge-client.mjs",
+		"package": "npm run check-types && npm run build:webview && npm run lint && node esbuild.mjs --production",
+		"protos": "node scripts/build-proto.mjs",
 		"postprotos": "prettier src/shared/proto src/core/controller src/hosts/ webview-ui/src/services src/generated --write --log-level warn",
 		"clean": "rimraf dist dist-standalone webview-ui/build src/generated out/",
 		"compile-tests": "node ./scripts/build-tests.js",

playwright.config.ts

@@ -1,14 +1,17 @@
 import { defineConfig } from "@playwright/test"
 
-const isGitHubAction = !!process.env.CI
+const isGitHubAction = !!process?.env?.CI
+const isWindow = process?.platform?.startsWith("win")
+
+const DEFAULT_TIMEOUT = isWindow ? 40000 : 20000
 
 export default defineConfig({
 	workers: 1,
 	retries: 1,
 	testDir: "src/test/e2e",
-	timeout: 20000,
+	timeout: DEFAULT_TIMEOUT,
 	expect: {
-		timeout: 20000,
+		timeout: DEFAULT_TIMEOUT,
 	},
 	fullyParallel: true,
 	reporter: isGitHubAction ? [["github"], ["list"]] : [["list"]],

proto/cline/account.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
@@ -127,4 +127,4 @@ message OrganizationUsageTransaction {
   int32 prompt_tokens = 10;
   int32 total_tokens = 11;
   string user_id = 12;
-}
+}

proto/cline/browser.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/cline/checkpoints.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/cline/file.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/cline/mcp.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/cline/models.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/cline/slash.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/cline/state.proto

@@ -1,12 +1,12 @@
 syntax = "proto3";
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
 service StateService {
   rpc getLatestState(EmptyRequest) returns (State);
-  rpc updateTerminalConnectionTimeout(Int64Request) returns (Int64);
+  rpc updateTerminalConnectionTimeout(UpdateTerminalConnectionTimeoutRequest) returns (UpdateTerminalConnectionTimeoutResponse);
   rpc updateTerminalReuseEnabled(BooleanRequest) returns (Empty);
   rpc updateDefaultTerminalProfile(StringRequest) returns (TerminalProfileUpdateResponse);
   rpc getAvailableTerminalProfiles(EmptyRequest) returns (TerminalProfiles);
@@ -109,11 +109,11 @@ message UpdateSettingsRequest {
   optional bool enable_checkpoints_setting = 5;
   optional bool mcp_marketplace_enabled = 6;
   optional ChatSettings chat_settings = 7;
-  optional int64 shell_integration_timeout = 8;
+  optional int32 shell_integration_timeout = 8;
   optional bool terminal_reuse_enabled = 9;
   optional bool mcp_responses_collapsed = 10;
   optional string mcp_display_mode = 11;
-  optional int64 terminal_output_line_limit = 12;
+  optional int32 terminal_output_line_limit = 12;
 }
 
 // Complete API Configuration message
@@ -153,8 +153,8 @@ message ApiConfiguration {
   optional string requesty_api_key = 32;
   optional string together_api_key = 33;
   optional string fireworks_api_key = 34;
-  optional int64 fireworks_model_max_completion_tokens = 35;
-  optional int64 fireworks_model_max_tokens = 36;
+  optional int32 fireworks_model_max_completion_tokens = 35;
+  optional int32 fireworks_model_max_tokens = 36;
   optional string qwen_api_key = 37;
   optional string doubao_api_key = 38;
   optional string mistral_api_key = 39;
@@ -166,7 +166,7 @@ message ApiConfiguration {
   optional string xai_api_key = 45;
   optional string sambanova_api_key = 46;
   optional string cerebras_api_key = 47;
-  optional int64 request_timeout_ms = 48;
+  optional int32 request_timeout_ms = 48;
   optional string sap_ai_core_client_id = 49;
   optional string sap_ai_core_client_secret = 50;
   optional string sap_ai_resource_group = 51;
@@ -178,7 +178,7 @@ message ApiConfiguration {
   // Plan mode configurations
   optional string plan_mode_api_provider = 100;
   optional string plan_mode_api_model_id = 101;
-  optional int64 plan_mode_thinking_budget_tokens = 102;
+  optional int32 plan_mode_thinking_budget_tokens = 102;
   optional string plan_mode_reasoning_effort = 103;
   optional string plan_mode_vscode_lm_model_selector = 104; // JSON string
   optional bool plan_mode_aws_bedrock_custom_selected = 105;
@@ -200,7 +200,7 @@ message ApiConfiguration {
   // Act mode configurations
   optional string act_mode_api_provider = 200;
   optional string act_mode_api_model_id = 201;
-  optional int64 act_mode_thinking_budget_tokens = 202;
+  optional int32 act_mode_thinking_budget_tokens = 202;
   optional string act_mode_reasoning_effort = 203;
   optional string act_mode_vscode_lm_model_selector = 204; // JSON string
   optional bool act_mode_aws_bedrock_custom_selected = 205;
@@ -228,3 +228,11 @@ message ApiConfiguration {
 
   optional string cline_account_id = 303;
 }
+
+message UpdateTerminalConnectionTimeoutRequest {
+  optional int32 timeout_ms = 1;
+}
+
+message UpdateTerminalConnectionTimeoutResponse {
+  optional int32 timeout_ms = 1;
+}

proto/cline/task.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/cline/ui.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/cline/web.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
+import "cline/common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/host/diff.proto

@@ -4,7 +4,7 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
-import "common.proto";
+import "cline/common.proto";
 
 // Provides methods for diff views.
 service DiffService {
@@ -14,6 +14,7 @@ service DiffService {
   rpc getDocumentText(GetDocumentTextRequest) returns (GetDocumentTextResponse);
   // Replace a text selection in the diff.
   rpc replaceText(ReplaceTextRequest) returns (ReplaceTextResponse);
+  rpc scrollDiff(ScrollDiffRequest) returns (ScrollDiffResponse);
   // Truncate the diff document.
   rpc truncateDocument(TruncateDocumentRequest) returns (TruncateDocumentResponse);
   // Save the diff document.
@@ -54,10 +55,17 @@ message ReplaceTextRequest {
 
 message ReplaceTextResponse {}
 
+message ScrollDiffRequest {
+  optional string diff_id = 1;
+  optional int32 line = 2;
+}
+
+message ScrollDiffResponse {}
+
 message TruncateDocumentRequest {
   optional cline.Metadata metadata = 1;
   optional string diff_id = 2;
-  optional int32 end_line = 5;
+  optional int32 end_line = 3;
 }
 
 message TruncateDocumentResponse {}

proto/host/env.proto

@@ -4,7 +4,7 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
-import "common.proto";
+import "cline/common.proto";
 
 // Provides methods for working with the user's environment.
 service EnvService {
@@ -13,7 +13,4 @@ service EnvService {
 
   // Reads text from the system clipboard.
   rpc clipboardReadText(cline.EmptyRequest) returns (cline.String);
-
-  // Opens a URL in the user's default browser or application.
-  rpc openExternal(cline.StringRequest) returns (cline.Empty);
 }

proto/host/watch.proto

@@ -4,7 +4,7 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
-import "common.proto";
+import "cline/common.proto";
 
 /** 
  * The watch service is only here as example of a streaming rpc in the host bridge. 

proto/host/window.proto

@@ -4,7 +4,7 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
-import "common.proto";
+import "cline/common.proto";
 
 // Provides methods for working with IDE windows and editors.
 service WindowService {
@@ -12,8 +12,11 @@ service WindowService {
   rpc showTextDocument(ShowTextDocumentRequest) returns (TextEditorInfo);
   rpc showOpenDialogue(ShowOpenDialogueRequest) returns (SelectedResources);
   rpc showMessage(ShowMessageRequest) returns (SelectedResponse);
-  rpc startProgress(StartProgressRequest) returns (StartProgressResponse);
-  rpc endProgress(EndProgressRequest) returns (cline.Empty);
+  rpc showInputBox(ShowInputBoxRequest) returns (ShowInputBoxResponse);
+  rpc showSaveDialog(ShowSaveDialogRequest) returns (ShowSaveDialogResponse);
+  rpc openFile(OpenFileRequest) returns (OpenFileResponse);
+  rpc getOpenTabs(GetOpenTabsRequest) returns (GetOpenTabsResponse);
+  rpc getVisibleTabs(GetVisibleTabsRequest) returns (GetVisibleTabsResponse);
 }
 
 message ShowTextDocumentRequest {
@@ -74,24 +77,56 @@ message SelectedResponse {
   optional string selected_option = 1;
 }
 
-enum ProgressLocation {
-  NOTIFICATION = 0;
-  SOURCE_CONTROL = 1;
-  WINDOW = 2;
-}
-
-message StartProgressRequest {
+message ShowSaveDialogRequest {
   cline.Metadata metadata = 1;
-  ProgressLocation location = 2;
-  string title = 3;
-  bool cancellable = 4;
+  optional ShowSaveDialogOptions options = 2;
 }
 
-message StartProgressResponse {
-  string progress_id = 1;
+message ShowSaveDialogOptions {
+  optional string default_path = 1;
+  map<string, FileExtensionList> filters = 2;
 }
 
-message EndProgressRequest {
+message FileExtensionList {
+  repeated string extensions = 1;
+}
+
+message ShowSaveDialogResponse {
+  optional string selected_path = 1;
+}
+
+message ShowInputBoxRequest {
   cline.Metadata metadata = 1;
-  string progress_id = 2;
+  string title = 2;
+  optional string prompt = 3;
+  optional string value = 4;
 }
+
+message ShowInputBoxResponse {
+  optional string response = 1;
+}
+
+message OpenFileRequest {
+  cline.Metadata metadata = 1;
+  string file_path = 2;
+}
+
+message OpenFileResponse {
+  // empty
+}
+
+message GetOpenTabsRequest {
+  // empty
+}
+
+message GetOpenTabsResponse {
+  repeated string paths = 1;
+}
+
+message GetVisibleTabsRequest {
+  // empty
+}
+
+message GetVisibleTabsResponse {
+  repeated string paths = 1;
+}

proto/host/workspace.proto

@@ -4,10 +4,14 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
+import "cline/common.proto";
+
 // Provides methods for working with workspaces/projects.
 service WorkspaceService {
   // Returns a list of the top level directories of the workspace.
   rpc getWorkspacePaths(GetWorkspacePathsRequest) returns (GetWorkspacePathsResponse);
+  // Saves an open document if it's dirty
+  rpc saveOpenDocumentIfDirty(SaveOpenDocumentIfDirtyRequest) returns (cline.Empty);
 }
 
 message GetWorkspacePathsRequest {
@@ -22,3 +26,8 @@ message GetWorkspacePathsResponse {
   optional string id = 1;
   repeated string paths = 2;
 }
+
+message SaveOpenDocumentIfDirtyRequest {
+  cline.Metadata metadata = 1;
+  string file_path = 2;
+}

scripts/build-proto-config.mjs

@@ -1,32 +0,0 @@
-// Configuration file for protocol buffer build scripts
-// Contains service name mappings used by both build-proto.js and build-go-proto.js
-
-// List of gRPC services
-// To add a new service, simply add it to this map and run the build scripts
-// The service handler will be automatically discovered and used by grpc-handler.ts
-export const serviceNameMap = {
-	account: "cline.AccountService",
-	browser: "cline.BrowserService",
-	checkpoints: "cline.CheckpointsService",
-	file: "cline.FileService",
-	mcp: "cline.McpService",
-	state: "cline.StateService",
-	task: "cline.TaskService",
-	web: "cline.WebService",
-	models: "cline.ModelsService",
-	slash: "cline.SlashService",
-	ui: "cline.UiService",
-	// Add new services here - no other code changes needed!
-}
-
-// List of host gRPC services (IDE API bridge)
-// These services are implemented in the IDE extension and called by the standalone Cline Core
-export const hostServiceNameMap = {
-	uri: "host.UriService",
-	watch: "host.WatchService",
-	workspace: "host.WorkspaceService",
-	env: "host.EnvService",
-	window: "host.WindowService",
-	diff: "host.DiffService",
-	// Add new host services here
-}

scripts/build-proto.mjs

@@ -1,21 +1,20 @@
 #!/usr/bin/env node
 
-import * as fs from "fs/promises"
-import * as path from "path"
-import { fileURLToPath } from "url"
-import { execSync } from "child_process"
-import { globby } from "globby"
 import chalk from "chalk"
-import os from "os"
-
+import { execSync } from "child_process"
+import * as fs from "fs/promises"
+import { globby } from "globby"
 import { createRequire } from "module"
-import { serviceNameMap } from "./build-proto-config.mjs"
+import os from "os"
+import * as path from "path"
+import { rmrf } from "./file-utils.mjs"
+import { main as generateProtoBusSetup } from "./generate-protobus-setup.mjs"
+import { main as generateHostBridgeClient } from "./generate-host-bridge-client.mjs"
+import { loadProtoDescriptorSet } from "./proto-utils.mjs"
 
 const require = createRequire(import.meta.url)
 const PROTOC = path.join(require.resolve("grpc-tools"), "../bin/protoc")
 
-const SCRIPT_NAME = path.relative(process.cwd(), fileURLToPath(import.meta.url))
-
 const PROTO_DIR = path.resolve("proto")
 const TS_OUT_DIR = path.resolve("src/shared/proto")
 const GRPC_JS_OUT_DIR = path.resolve("src/generated/grpc-js")
@@ -36,13 +35,15 @@ const TS_PROTO_OPTIONS = [
 	"useDate=false", // Timestamp fields will not be automatically converted to Date.
 ]
 
-// Service directories derived from imported serviceNameMap
-const serviceDirs = Object.keys(serviceNameMap).map((serviceKey) => path.join("src/core/controller", serviceKey))
-
 async function main() {
-	console.log(chalk.bold.blue("Starting Protocol Buffer code generation..."))
-
 	await cleanup()
+	await compileProtos()
+	await checkProtos()
+	await generateProtoBusSetup()
+	await generateHostBridgeClient()
+}
+async function compileProtos() {
+	console.log(chalk.bold.blue("Compiling Protocol Buffers..."))
 
 	// Check for Apple Silicon compatibility before proceeding
 	checkAppleSiliconCompatibility()
@@ -52,9 +53,6 @@ async function main() {
 		await fs.mkdir(dir, { recursive: true })
 	}
 
-	// Check for missing proto files for services in serviceNameMap
-	await ensureProtoFilesExist()
-
 	// Process all proto files
 	const protoFiles = await globby("**/*.proto", { cwd: PROTO_DIR, realpath: true })
 	console.log(chalk.cyan(`Processing ${protoFiles.length} proto files from`), PROTO_DIR)
@@ -83,11 +81,6 @@ async function main() {
 
 	log_verbose(chalk.green("Protocol Buffer code generation completed successfully."))
 	log_verbose(chalk.green(`TypeScript files generated in: ${TS_OUT_DIR}`))
-
-	await generateProtoBusServiceConfig()
-	await generateProtoBusMethodRegistrations()
-
-	console.log(chalk.bold.blue("Finished Protocol Buffer code generation."))
 }
 
 async function tsProtoc(outDir, protoFiles, protoOptions) {
@@ -110,267 +103,6 @@ async function tsProtoc(outDir, protoFiles, protoOptions) {
 	}
 }
 
-/**
- * Parse proto files to extract streaming method information
- * @param protoFiles Array of proto file names
- * @param scriptDir Directory containing proto files
- * @returns Map of service names to their streaming methods
- */
-async function parseProtoForStreamingMethods(protoFiles, scriptDir) {
-	log_verbose(chalk.cyan("Parsing proto files for streaming methods..."))
-
-	// Map of service name to array of streaming method names
-	const streamingMethodsMap = new Map()
-
-	for (const protoFile of protoFiles) {
-		const content = await fs.readFile(path.join(scriptDir, protoFile), "utf8")
-
-		// Extract package name
-		const packageMatch = content.match(/package\s+([^;]+);/)
-		const packageName = packageMatch ? packageMatch[1].trim() : "unknown"
-
-		// Extract service definitions
-		const serviceMatches = Array.from(content.matchAll(/service\s+(\w+)\s*\{([^}]+)\}/g))
-		for (const serviceMatch of serviceMatches) {
-			const serviceName = serviceMatch[1]
-			const serviceBody = serviceMatch[2]
-			const fullServiceName = `${packageName}.${serviceName}`
-
-			// Extract method definitions with streaming
-			const methodMatches = Array.from(
-				serviceBody.matchAll(/rpc\s+(\w+)\s*\(\s*(stream\s+)?(\w+)\s*\)\s*returns\s*\(\s*(stream\s+)?(\w+)\s*\)/g),
-			)
-
-			const streamingMethods = []
-			for (const methodMatch of methodMatches) {
-				const methodName = methodMatch[1]
-				const isRequestStreaming = !!methodMatch[2]
-				const requestType = methodMatch[3]
-				const isResponseStreaming = !!methodMatch[4]
-				const responseType = methodMatch[5]
-
-				if (isResponseStreaming) {
-					streamingMethods.push({
-						name: methodName,
-						requestType,
-						responseType,
-						isRequestStreaming,
-					})
-				}
-			}
-
-			if (streamingMethods.length > 0) {
-				streamingMethodsMap.set(fullServiceName, streamingMethods)
-			}
-		}
-	}
-
-	return streamingMethodsMap
-}
-
-async function generateProtoBusMethodRegistrations() {
-	log_verbose(chalk.cyan("Generating method registration files..."))
-
-	// Parse proto files for streaming methods
-	const protoFiles = await globby("*.proto", { cwd: PROTO_DIR })
-	const streamingMethodsMap = await parseProtoForStreamingMethods(protoFiles, PROTO_DIR)
-
-	for (const serviceDir of serviceDirs) {
-		const serviceName = path.basename(serviceDir)
-		const fullServiceName = serviceNameMap[serviceName]
-		const streamingMethods = streamingMethodsMap.get(fullServiceName) || []
-
-		log_verbose(chalk.cyan(`Generating method registrations for ${serviceName}...`))
-
-		// Get all TypeScript files in the service directory
-		const files = await globby("*.ts", { cwd: serviceDir })
-
-		// Filter out index.ts and methods.ts
-		const implementationFiles = files.filter((file) => file !== "index.ts" && file !== "methods.ts")
-
-		// Create the methods.ts file with header
-		let methodsContent = `// AUTO-GENERATED FILE - DO NOT MODIFY DIRECTLY
-// Generated by ${SCRIPT_NAME}
-
-// Import all method implementations
-import { registerMethod } from "./index"\n`
-
-		// Import implementations directly
-		for (const file of implementationFiles) {
-			const baseName = path.basename(file, ".ts")
-			methodsContent += `import { ${baseName} } from "./${baseName}"\n`
-		}
-
-		// Add streaming methods information
-		if (streamingMethods.length > 0) {
-			methodsContent += `\n// Streaming methods for this service
-export const streamingMethods = ${JSON.stringify(
-				streamingMethods.map((m) => m.name),
-				null,
-				2,
-			)}\n`
-		}
-
-		// Add registration function
-		methodsContent += `\n// Register all ${serviceName} service methods
-export function registerAllMethods(): void {
-\t// Register each method with the registry\n`
-
-		// Add registration statements
-		for (const file of implementationFiles) {
-			const baseName = path.basename(file, ".ts")
-			const isStreaming = streamingMethods.some((m) => m.name === baseName)
-
-			if (isStreaming) {
-				methodsContent += `\tregisterMethod("${baseName}", ${baseName}, { isStreaming: true })\n`
-			} else {
-				methodsContent += `\tregisterMethod("${baseName}", ${baseName})\n`
-			}
-		}
-
-		// Close the function
-		methodsContent += `}`
-
-		// Write the methods.ts file
-		const registryFile = path.join(serviceDir, "methods.ts")
-		await writeFileWithMkdirs(registryFile, methodsContent)
-		log_verbose(chalk.green(`Generated ${registryFile}`))
-
-		// Generate index.ts file
-		const capitalizedServiceName = serviceName.charAt(0).toUpperCase() + serviceName.slice(1)
-		const indexContent = `// AUTO-GENERATED FILE - DO NOT MODIFY DIRECTLY
-// Generated by ${SCRIPT_NAME}
-
-import { createServiceRegistry, ServiceMethodHandler, StreamingMethodHandler } from "../grpc-service"
-import { StreamingResponseHandler } from "../grpc-handler"
-import { registerAllMethods } from "./methods"
-
-// Create ${serviceName} service registry
-const ${serviceName}Service = createServiceRegistry("${serviceName}")
-
-// Export the method handler types and registration function
-export type ${capitalizedServiceName}MethodHandler = ServiceMethodHandler
-export type ${capitalizedServiceName}StreamingMethodHandler = StreamingMethodHandler
-export const registerMethod = ${serviceName}Service.registerMethod
-
-// Export the request handlers
-export const handle${capitalizedServiceName}ServiceRequest = ${serviceName}Service.handleRequest
-export const handle${capitalizedServiceName}ServiceStreamingRequest = ${serviceName}Service.handleStreamingRequest
-export const isStreamingMethod = ${serviceName}Service.isStreamingMethod
-
-// Register all ${serviceName} methods
-registerAllMethods()`
-
-		// Write the index.ts file
-		const indexFile = path.join(serviceDir, "index.ts")
-		await writeFileWithMkdirs(indexFile, indexContent)
-		log_verbose(chalk.green(`Generated ${indexFile}`))
-	}
-
-	log_verbose(chalk.green("Method registration files generated successfully."))
-}
-
-/**
- * Generate a service configuration file that maps service names to their handlers
- * This eliminates the need for manual switch/case statements in grpc-handler.ts
- */
-async function generateProtoBusServiceConfig() {
-	log_verbose(chalk.cyan("Generating service configuration file..."))
-
-	const serviceImports = []
-	const serviceConfigs = []
-
-	// Add all services from the serviceNameMap
-	for (const [dirName, fullServiceName] of Object.entries(serviceNameMap)) {
-		const capitalizedName = dirName.charAt(0).toUpperCase() + dirName.slice(1)
-		serviceImports.push(
-			`import { handle${capitalizedName}ServiceRequest, handle${capitalizedName}ServiceStreamingRequest } from "./${dirName}/index"`,
-		)
-		serviceConfigs.push(`
-  "${fullServiceName}": {
-    requestHandler: handle${capitalizedName}ServiceRequest,
-    streamingHandler: handle${capitalizedName}ServiceStreamingRequest
-  }`)
-	}
-
-	const content = `// AUTO-GENERATED FILE - DO NOT MODIFY DIRECTLY
-// Generated by ${SCRIPT_NAME}
-
-import { Controller } from "./index"
-import { StreamingResponseHandler } from "./grpc-handler"
-${serviceImports.join("\n")}
-
-/**
- * Configuration for a service handler
- */
-export interface ServiceHandlerConfig {
-  requestHandler: (controller: Controller, method: string, message: any) => Promise<any>;
-  streamingHandler: (controller: Controller, method: string, message: any, responseStream: StreamingResponseHandler, requestId?: string) => Promise<void>;
-}
-
-/**
- * Map of service names to their handler configurations
- */
-export const serviceHandlers: Record<string, ServiceHandlerConfig> = {${serviceConfigs.join(",")}
-};`
-
-	const configPath = path.resolve("src/core/controller/grpc-service-config.ts")
-	await writeFileWithMkdirs(configPath, content)
-	log_verbose(chalk.green(`Generated service configuration at ${configPath}`))
-}
-
-/**
- * Ensure that a .proto file exists for each service in the serviceNameMap
- * If a .proto file doesn't exist, create a template file
- */
-async function ensureProtoFilesExist() {
-	log_verbose(chalk.cyan("Checking for missing proto files..."))
-
-	// Get existing proto files
-	const existingProtoFiles = await globby("*.proto", { cwd: PROTO_DIR })
-	const existingProtoServices = existingProtoFiles.map((file) => path.basename(file, ".proto"))
-
-	// Check each service in serviceNameMap
-	for (const [serviceName, fullServiceName] of Object.entries(serviceNameMap)) {
-		if (!existingProtoServices.includes(serviceName)) {
-			log_verbose(chalk.yellow(`Creating template proto file for ${serviceName}...`))
-
-			// Extract service class name from full name (e.g., "cline.ModelsService" -> "ModelsService")
-			const serviceClassName = fullServiceName.split(".").pop()
-
-			// Create template proto file
-			const protoContent = `syntax = "proto3";
-
-package cline;
-option java_package = "bot.cline.proto";
-option java_multiple_files = true;
-
-import "common.proto";
-
-// ${serviceClassName} provides methods for managing ${serviceName}
-service ${serviceClassName} {
-  // Add your RPC methods here
-  // Example (String is from common.proto, responses should be generic types):
-  // rpc YourMethod(YourRequest) returns (String);
-}
-
-// Add your message definitions here
-// Example (Requests must always start with Metadata):
-// message YourRequest {
-//   Metadata metadata = 1;
-//   string stringField = 2;
-//   int32 int32Field = 3;
-// }
-`
-
-			// Write the template proto file
-			const protoFilePath = path.join(PROTO_DIR, `${serviceName}.proto`)
-			await fs.writeFile(protoFilePath, protoContent)
-			log_verbose(chalk.green(`Created template proto file at ${protoFilePath}`))
-		}
-	}
-}
-
 async function cleanup() {
 	// Clean up existing generated files
 	log_verbose(chalk.cyan("Cleaning up existing generated TypeScript files..."))
@@ -381,6 +113,7 @@ async function cleanup() {
 	await rmrf("src/standalone/services/host-grpc-client.ts")
 	await rmrf("src/standalone/server-setup.ts")
 	await rmrf("src/hosts/vscode/host-grpc-service-config.ts")
+	await rmrf("src/core/controller/grpc-service-config.ts")
 	const oldhostbridgefiles = [
 		"src/hosts/vscode/workspace/methods.ts",
 		"src/hosts/vscode/workspace/index.ts",
@@ -395,37 +128,35 @@ async function cleanup() {
 		"src/hosts/vscode/uri/methods.ts",
 		"src/hosts/vscode/uri/index.ts",
 	]
-	for (const file of oldhostbridgefiles) {
+	const oldprotobusfiles = [
+		"src/core/controller/account/index.ts",
+		"src/core/controller/account/methods.ts",
+		"src/core/controller/browser/index.ts",
+		"src/core/controller/browser/methods.ts",
+		"src/core/controller/checkpoints/index.ts",
+		"src/core/controller/checkpoints/methods.ts",
+		"src/core/controller/file/index.ts",
+		"src/core/controller/file/methods.ts",
+		"src/core/controller/mcp/index.ts",
+		"src/core/controller/mcp/methods.ts",
+		"src/core/controller/models/index.ts",
+		"src/core/controller/models/methods.ts",
+		"src/core/controller/slash/index.ts",
+		"src/core/controller/slash/methods.ts",
+		"src/core/controller/state/index.ts",
+		"src/core/controller/state/methods.ts",
+		"src/core/controller/task/index.ts",
+		"src/core/controller/task/methods.ts",
+		"src/core/controller/ui/index.ts",
+		"src/core/controller/ui/methods.ts",
+		"src/core/controller/web/index.ts",
+		"src/core/controller/web/methods.ts",
+	]
+	for (const file of [...oldhostbridgefiles, ...oldprotobusfiles]) {
 		await rmrf(file)
 	}
 }
 
-/**
- * Write `contents` to `filePath`, creating any necessary directories in `filePath`.
- */
-async function writeFileWithMkdirs(filePath, content) {
-	await fs.mkdir(path.dirname(filePath), { recursive: true })
-	await fs.writeFile(filePath, content)
-}
-
-/**
- * Remove an empty dir, do nothing if the directory doesn't exist or is not empty.
- */
-async function rmdir(path) {
-	try {
-		await fs.rmdir(path)
-	} catch (error) {
-		if (error.code !== "ENOTEMPTY" && error.code !== "ENOENT") {
-			// Only re-throw if it's not "not empty" or "doesn't exist"
-			throw error
-		}
-	}
-}
-
-async function rmrf(path) {
-	await fs.rm(path, { force: true, recursive: true })
-}
-
 // Check for Apple Silicon compatibility
 function checkAppleSiliconCompatibility() {
 	// Only run check on macOS
@@ -456,6 +187,51 @@ function checkAppleSiliconCompatibility() {
 	}
 }
 
+const int64TypeNames = ["TYPE_INT64", "TYPE_UINT64", "TYPE_SINT64", "TYPE_FIXED64", "TYPE_SFIXED64"]
+
+async function checkProtos() {
+	const proto = await loadProtoDescriptorSet()
+	const int64Fields = []
+
+	for (const [packageName, packageDef] of Object.entries(proto)) {
+		for (const [messageName, def] of Object.entries(packageDef)) {
+			// Skip service definitions
+			if (def && typeof def === "object" && "service" in def) {
+				continue
+			}
+			// Check message fields
+			if (def && def.type && def.type.field) {
+				for (const field of def.type.field) {
+					if (int64TypeNames.includes(field.type)) {
+						const name = `${packageName}.${messageName}.${field.name}`
+						int64Fields.push({
+							name: name,
+							type: field.type,
+						})
+					}
+				}
+			}
+		}
+	}
+
+	if (int64Fields.length > 0) {
+		console.log(chalk.yellow(`\nWarning: Found ${int64Fields.length} fields using 64-bit integer types`))
+		for (const field of int64Fields) {
+			const typeNames = {
+				TYPE_INT64: "int64",
+				TYPE_UINT64: "uint64",
+				TYPE_SINT64: "sint64",
+				TYPE_FIXED64: "fixed64",
+				TYPE_SFIXED64: "sfixed64",
+			}
+			log_verbose(chalk.yellow(`  - ${field.name} (${typeNames[field.type]})`))
+		}
+		log_verbose(chalk.yellow("\nWARNING: 64-bit integer fields detected in proto definitions"))
+		log_verbose(chalk.yellow("JavaScript cannot safely represent integers larger than 2^53-1 (Number.MAX_SAFE_INTEGER)."))
+		log_verbose(chalk.yellow("Consider using string representation for large numbers or implementing BigInt support.\n"))
+	}
+}
+
 function log_verbose(s) {
 	if (process.argv.includes("-v") || process.argv.includes("--verbose")) {
 		console.log(s)

scripts/file-utils.mjs

@@ -0,0 +1,27 @@
+import * as fs from "fs/promises"
+import * as path from "path"
+/**
+ * Write `contents` to `filePath`, creating any necessary directories in `filePath`.
+ */
+export async function writeFileWithMkdirs(filePath, content) {
+	await fs.mkdir(path.dirname(filePath), { recursive: true })
+	await fs.writeFile(filePath, content)
+}
+
+export async function rmrf(path) {
+	await fs.rm(path, { force: true, recursive: true })
+}
+
+/**
+ * Remove an empty dir, do nothing if the directory doesn't exist or is not empty.
+ */
+export async function rmdir(path) {
+	try {
+		await fs.rmdir(path)
+	} catch (error) {
+		if (error.code !== "ENOTEMPTY" && error.code !== "ENOENT") {
+			// Only re-throw if it's not "not empty" or "doesn't exist"
+			throw error
+		}
+	}
+}

scripts/generate-host-bridge-client.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as fs from "fs/promises"
+import { writeFileWithMkdirs } from "./file-utils.mjs"
 import * as path from "path"
 import chalk from "chalk"
 import { loadServicesFromProtoDescriptor, getFqn } from "./proto-utils.mjs"
@@ -15,14 +15,14 @@ const VSCODE_CLIENT_FILE = path.resolve("src/generated/hosts/vscode/hostbridge-g
 /**
  * Main function to generate the host bridge client
  */
-async function main() {
+export async function main() {
 	const { hostServices } = await loadServicesFromProtoDescriptor()
 
 	await generateTypesFile(hostServices)
 	await generateExternalClientFile(hostServices)
 	await generateVscodeClientFile(hostServices)
 
-	console.log(`Generated host bridge client files at:`)
+	console.log(`Generated Host Bridge client files at:`)
 	console.log(`- ${TYPES_FILE}`)
 	console.log(`- ${EXTERNAL_CLIENT_FILE}`)
 	console.log(`- ${VSCODE_CLIENT_FILE}`)
@@ -45,8 +45,7 @@ import { StreamingCallbacks } from "@hosts/host-provider-types"
 ${clientInterfaces.join("\n\n")}
 `
 	// Write output file
-	await fs.mkdir(path.dirname(TYPES_FILE), { recursive: true })
-	await fs.writeFile(TYPES_FILE, content)
+	await writeFileWithMkdirs(TYPES_FILE, content)
 }
 
 /**
@@ -107,8 +106,7 @@ ${imports.join("\n")}
 ${clientImplementations.join("\n\n")}
 `
 	// Write output file
-	await fs.mkdir(path.dirname(EXTERNAL_CLIENT_FILE), { recursive: true })
-	await fs.writeFile(EXTERNAL_CLIENT_FILE, content)
+	await writeFileWithMkdirs(EXTERNAL_CLIENT_FILE, content)
 }
 
 /**
@@ -211,8 +209,7 @@ ${handlerMap.join("\n")}
 `
 
 	// Write output file
-	await fs.mkdir(path.dirname(VSCODE_CLIENT_FILE), { recursive: true })
-	await fs.writeFile(VSCODE_CLIENT_FILE, content)
+	await writeFileWithMkdirs(VSCODE_CLIENT_FILE, content)
 }
 
 function generateVscodeClientImplementation(serviceName, serviceDefinition) {
@@ -237,8 +234,10 @@ const ${name}ServiceRegistry = createServiceRegistry("${name}")
 ${methods}`
 }
 
-// Run the main function
-main().catch((error) => {
-	console.error(chalk.red("Error:"), error)
-	process.exit(1)
-})
+// Only run main if this script is executed directly
+if (import.meta.url === `file://${process.argv[1]}`) {
+	main().catch((error) => {
+		console.error(chalk.red("Error:"), error)
+		process.exit(1)
+	})
+}

scripts/generate-protobus-setup.mjs

@@ -0,0 +1,214 @@
+#!/usr/bin/env node
+
+import { writeFileWithMkdirs } from "./file-utils.mjs"
+import path from "path"
+import { fileURLToPath } from "url"
+import { loadServicesFromProtoDescriptor, getFqn } from "./proto-utils.mjs"
+
+const WEBVIEW_CLIENTS_FILE = path.resolve("webview-ui/src/services/grpc-client.ts")
+const VSCODE_SERVICES_FILE = path.resolve("src/generated/hosts/vscode/protobus-services.ts")
+const VSCODE_SERVICE_TYPES_FILE = path.resolve("src/generated/hosts/vscode/protobus-service-types.ts")
+const STANDALONE_SERVER_SETUP_FILE = path.resolve("src/generated/hosts/standalone/protobus-server-setup.ts")
+
+const SCRIPT_NAME = path.relative(process.cwd(), fileURLToPath(import.meta.url))
+
+export async function main() {
+	const { protobusServices } = await loadServicesFromProtoDescriptor()
+	await generateWebviewProtobusClients(protobusServices)
+	await generateVscodeServiceTypes(protobusServices)
+	await generateVscodeProtobusServers(protobusServices)
+	await generateStandaloneProtobusServiceSetup(protobusServices)
+
+	console.log(`Generated ProtoBus files at:`)
+	console.log(`- ${WEBVIEW_CLIENTS_FILE}`)
+	console.log(`- ${VSCODE_SERVICE_TYPES_FILE}`)
+	console.log(`- ${VSCODE_SERVICES_FILE}`)
+	console.log(`- ${STANDALONE_SERVER_SETUP_FILE}`)
+}
+
+async function generateWebviewProtobusClients(protobusServices) {
+	const clients = []
+
+	for (const [serviceName, def] of Object.entries(protobusServices)) {
+		const rpcs = []
+		for (const [rpcName, rpc] of Object.entries(def.service)) {
+			const requestType = getFqn(rpc.requestType.type.name)
+			const responseType = getFqn(rpc.responseType.type.name)
+
+			if (rpc.requestStream) {
+				throw new Error("Request streaming is not supported")
+			}
+			if (!rpc.responseStream) {
+				rpcs.push(`    static async ${rpcName}(request: ${requestType}): Promise<${responseType}> {
+		return this.makeRequest("${rpcName}", request)
+	}`)
+			} else {
+				rpcs.push(`    static ${rpcName}(request: ${requestType}, callbacks: Callbacks<${responseType}>): ()=>void {
+		return this.makeStreamingRequest("${rpcName}", request, callbacks)
+	}`)
+			}
+		}
+		clients.push(`export class ${serviceName}Client extends ProtoBusClient {
+	static override serviceName: string = "cline.${serviceName}"
+${rpcs.join("\n")}
+}`)
+	}
+
+	// Create output file
+	let output = `// GENERATED CODE -- DO NOT EDIT!
+// Generated by ${SCRIPT_NAME}
+import * as proto from "@shared/proto/index"
+import { ProtoBusClient, Callbacks } from "./grpc-client-base"
+
+${clients.join("\n")}
+`
+	// Write output file
+	await writeFileWithMkdirs(WEBVIEW_CLIENTS_FILE, output)
+}
+
+/**
+ * Generate imports and function to add all the handlers to the server for all services defined in the proto files.
+ */
+async function generateVscodeServiceTypes(protobusServices) {
+	const servers = []
+
+	for (const [serviceName, def] of Object.entries(protobusServices)) {
+		const domain = getDomainName(serviceName)
+		servers.push(`// ${domain} Service Handler Types`)
+		servers.push(`export type ${serviceName}Handlers = {`)
+		for (const [rpcName, rpc] of Object.entries(def.service)) {
+			const requestType = getFqn(rpc.requestType.type.name)
+			const responseType = getFqn(rpc.responseType.type.name)
+			if (rpc.requestStream) {
+				throw new Error("Request streaming is not supported")
+			}
+			if (!rpc.responseStream) {
+				servers.push(`     ${rpcName}:(controller: Controller, request: ${requestType}) => Promise<${responseType}>`)
+			} else {
+				servers.push(
+					`     ${rpcName}:(controller: Controller, request: ${requestType}, responseStream: StreamingResponseHandler<${responseType}>, requestId?: string) => Promise<void>`,
+				)
+			}
+		}
+		servers.push(`}\n`)
+	}
+
+	// Create output file
+	let output = `// GENERATED CODE -- DO NOT EDIT!
+// Generated by ${SCRIPT_NAME}
+import * as proto from "@shared/proto/index"
+import { Controller } from "@core/controller"
+import { StreamingResponseHandler } from "@/core/controller/grpc-handler"
+
+${servers.join("\n")}
+`
+	// Write output file
+	await writeFileWithMkdirs(VSCODE_SERVICE_TYPES_FILE, output)
+}
+
+/**
+ * Generate imports and function to add all the handlers to the server for all services defined in the proto files.
+ */
+async function generateVscodeProtobusServers(protobusServices) {
+	const imports = []
+	const servers = []
+	const serviceMap = []
+	for (const [serviceName, def] of Object.entries(protobusServices)) {
+		const domain = getDomainName(serviceName)
+		const dir = getDirName(serviceName)
+		imports.push(`// ${domain} Service`)
+		servers.push(`const ${serviceName}Handlers: serviceTypes.${serviceName}Handlers = {`)
+		for (const [rpcName, _rpc] of Object.entries(def.service)) {
+			imports.push(`import { ${rpcName} } from "@core/controller/${dir}/${rpcName}"`)
+			servers.push(`    ${rpcName}: ${rpcName},`)
+		}
+		servers.push(`} \n`)
+		serviceMap.push(`    "cline.${serviceName}": ${serviceName}Handlers,`)
+		imports.push("")
+	}
+
+	// Create output file
+	let output = `// GENERATED CODE -- DO NOT EDIT!
+// Generated by ${SCRIPT_NAME}
+import * as serviceTypes from "src/generated/hosts/vscode/protobus-service-types"
+
+${imports.join("\n")}
+${servers.join("\n")}
+export const serviceHandlers: Record<string, any> = {
+${serviceMap.join("\n")}
+}
+`
+	// Write output file
+	await writeFileWithMkdirs(VSCODE_SERVICES_FILE, output)
+}
+
+/**
+ * Generate imports and function to add all the handlers to the server for all services defined in the proto files.
+ */
+async function generateStandaloneProtobusServiceSetup(protobusServices) {
+	const imports = []
+	const handlerSetup = []
+
+	for (const [name, def] of Object.entries(protobusServices)) {
+		const domain = getDomainName(name)
+		const dir = getDirName(name)
+		imports.push(`// ${domain} Service`)
+		handlerSetup.push(`    // ${domain} Service`)
+		handlerSetup.push(`    server.addService(cline.${name}Service, {`)
+		for (const [rpcName, rpc] of Object.entries(def.service)) {
+			imports.push(`import { ${rpcName} } from "@core/controller/${dir}/${rpcName}"`)
+			const requestType = "cline." + rpc.requestType.type.name
+			const responseType = "cline." + rpc.responseType.type.name
+			if (rpc.requestStream) {
+				throw new Error("Request streaming is not supported")
+			}
+			if (rpc.responseStream) {
+				handlerSetup.push(
+					`        ${rpcName}: wrapStreamingResponse<${requestType},${responseType}>(${rpcName}, controller),`,
+				)
+			} else {
+				handlerSetup.push(`         ${rpcName}: wrapper<${requestType},${responseType}>(${rpcName}, controller),`)
+			}
+		}
+		handlerSetup.push(`    });`)
+		imports.push("")
+		handlerSetup.push("")
+	}
+
+	// Create output file
+	let output = `// GENERATED CODE -- DO NOT EDIT!
+// Generated by ${SCRIPT_NAME}
+import * as grpc from "@grpc/grpc-js"
+import { cline } from "@generated/grpc-js"
+import { Controller } from "@core/controller"
+import { GrpcHandlerWrapper, GrpcStreamingResponseHandlerWrapper } from "@hosts/external/grpc-types"
+
+${imports.join("\n")}
+export function addProtobusServices(
+	server: grpc.Server,
+	controller: Controller,
+	wrapper: GrpcHandlerWrapper,
+	wrapStreamingResponse: GrpcStreamingResponseHandlerWrapper,
+): void {
+${handlerSetup.join("\n")}
+}
+`
+	// Write output file
+	await writeFileWithMkdirs(STANDALONE_SERVER_SETUP_FILE, output)
+}
+
+function getDomainName(serviceName) {
+	return serviceName.replace(/Service$/, "")
+}
+function getDirName(serviceName) {
+	const domain = getDomainName(serviceName)
+	return domain.charAt(0).toLowerCase() + domain.slice(1)
+}
+
+// Only run main if this script is executed directly
+if (import.meta.url === `file://${process.argv[1]}`) {
+	main().catch((error) => {
+		console.error(chalk.red("Error:"), error)
+		process.exit(1)
+	})
+}

scripts/generate-server-setup.mjs

@@ -1,118 +0,0 @@
-#!/usr/bin/env node
-
-import * as fs from "fs"
-import path, { dirname } from "path"
-import { fileURLToPath } from "url"
-import { loadServicesFromProtoDescriptor, getFqn } from "./proto-utils.mjs"
-
-const STANDALONE_SERVER_SETUP_FILE = path.resolve("src/generated/standalone/server-setup.ts")
-const WEBVIEW_CLIENTS_FILE = path.resolve("webview-ui/src/services/grpc-client.ts")
-
-const SCRIPT_NAME = path.relative(process.cwd(), fileURLToPath(import.meta.url))
-
-async function main() {
-	const { protobusServices } = await loadServicesFromProtoDescriptor()
-	await generateWebviewProtobusClients(protobusServices)
-	await generateStandaloneProtobusServiceSetup(protobusServices)
-
-	console.log(`Generated ProtoBus files at:`)
-	console.log(`- ${WEBVIEW_CLIENTS_FILE}`)
-	console.log(`- ${STANDALONE_SERVER_SETUP_FILE}`)
-}
-
-async function generateWebviewProtobusClients(protobusServices) {
-	const clients = []
-
-	for (const [serviceName, def] of Object.entries(protobusServices)) {
-		const rpcs = []
-		for (const [rpcName, rpc] of Object.entries(def.service)) {
-			const requestType = getFqn(rpc.requestType.type.name)
-			const responseType = getFqn(rpc.responseType.type.name)
-
-			if (rpc.requestStream) {
-				throw new Error("Request streaming is not supported")
-			}
-			if (!rpc.responseStream) {
-				rpcs.push(`    static async ${rpcName}(request: ${requestType}): Promise<${responseType}> {
-		return this.makeRequest("${rpcName}", request, ${requestType}.toJSON, ${responseType}.fromJSON)
-	}`)
-			} else {
-				rpcs.push(`    static ${rpcName}(request: ${requestType}, callbacks: Callbacks<${responseType}>): ()=>void {
-		return this.makeStreamingRequest("${rpcName}", request, callbacks, ${requestType}.toJSON, ${responseType}.fromJSON)
-	}`)
-			}
-		}
-		clients.push(`export class ${serviceName}Client extends ProtoBusClient {
-	static override serviceName: string = "${serviceName}"
-${rpcs.join("\n")}
-}`)
-	}
-
-	// Create output file
-	let output = `// GENERATED CODE -- DO NOT EDIT!
-// Generated by ${SCRIPT_NAME}
-import * as proto from "@shared/proto/index"
-import { ProtoBusClient, Callbacks } from "./grpc-client-base"
-
-${clients.join("\n")}
-`
-	// Write output file
-	fs.mkdirSync(dirname(WEBVIEW_CLIENTS_FILE), { recursive: true })
-	fs.writeFileSync(WEBVIEW_CLIENTS_FILE, output)
-}
-
-/**
- * Generate imports and function to add all the handlers to the server for all services defined in the proto files.
- */
-async function generateStandaloneProtobusServiceSetup(protobusServices) {
-	const imports = []
-	const handlerSetup = []
-
-	for (const [name, def] of Object.entries(protobusServices)) {
-		const domain = name.replace(/Service$/, "")
-		const dir = domain.charAt(0).toLowerCase() + domain.slice(1)
-		imports.push(`// ${domain} Service`)
-		handlerSetup.push(`    // ${domain} Service`)
-		handlerSetup.push(`    server.addService(cline.${name}Service, {`)
-		for (const [rpcName, rpc] of Object.entries(def.service)) {
-			imports.push(`import { ${rpcName} } from "@core/controller/${dir}/${rpcName}"`)
-			const requestType = "cline." + rpc.requestType.type.name
-			if (rpc.requestStream) {
-				throw new Error("Request streaming is not supported")
-			}
-			if (rpc.responseStream) {
-				handlerSetup.push(`        ${rpcName}: wrapStreamingResponse<${requestType},void>(${rpcName}, controller),`)
-			} else {
-				const responseType = "cline." + rpc.responseType.type.name
-				handlerSetup.push(`         ${rpcName}: wrapper<${requestType},${responseType}>(${rpcName}, controller),`)
-			}
-		}
-		handlerSetup.push(`    });`)
-		imports.push("")
-		handlerSetup.push("")
-	}
-
-	// Create output file
-	let output = `// GENERATED CODE -- DO NOT EDIT!
-// Generated by ${SCRIPT_NAME}
-import * as grpc from "@grpc/grpc-js"
-import { cline } from "@generated/grpc-js"
-import { Controller } from "@core/controller"
-import { GrpcHandlerWrapper, GrpcStreamingResponseHandlerWrapper } from "@hosts/external/grpc-types"
-
-${imports.join("\n")}
-export function addProtobusServices(
-	server: grpc.Server,
-	controller: Controller,
-	wrapper: GrpcHandlerWrapper,
-	wrapStreamingResponse: GrpcStreamingResponseHandlerWrapper,
-): void {
-${handlerSetup.join("\n")}
-}
-`
-	// Write output file
-	fs.mkdirSync(dirname(STANDALONE_SERVER_SETUP_FILE), { recursive: true })
-	fs.writeFileSync(STANDALONE_SERVER_SETUP_FILE, output)
-}
-
-main()

scripts/proto-utils.mjs

@@ -10,7 +10,7 @@ const DESCRIPTOR_SET = path.resolve("dist-standalone/proto/descriptor_set.pb")
 const typeNameToFQN = new Map()
 
 function addTypeNameToFqn(name, fqn) {
-	if (typeNameToFQN.has(name)) {
+	if (typeNameToFQN.has(name) && typeNameToFQN.get(name) !== fqn) {
 		throw new Error(`Proto type ${name} redefined (${fqn}).`)
 	}
 	typeNameToFQN.set(name, fqn)
@@ -23,11 +23,15 @@ export function getFqn(name) {
 	return typeNameToFQN.get(name)
 }
 
-export async function loadServicesFromProtoDescriptor() {
-	// Load service definitions from descriptor set
+export async function loadProtoDescriptorSet() {
 	const descriptorBuffer = await fs.readFile(DESCRIPTOR_SET)
 	const packageDefinition = protoLoader.loadFileDescriptorSetFromBuffer(descriptorBuffer)
-	const proto = grpc.loadPackageDefinition(packageDefinition)
+	return grpc.loadPackageDefinition(packageDefinition)
+}
+
+export async function loadServicesFromProtoDescriptor() {
+	// Load service definitions from descriptor set
+	const proto = await loadProtoDescriptorSet()
 
 	// Extract host services and proto messages from the proto definition
 	const hostServices = {}

src/api/index.ts

@@ -1,5 +1,5 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiConfiguration, ModelInfo } from "../shared/api"
+import { ApiConfiguration, ModelInfo, QwenApiRegions } from "../shared/api"
 import { AnthropicHandler } from "./providers/anthropic"
 import { AwsBedrockHandler } from "./providers/bedrock"
 import { OpenRouterHandler } from "./providers/openrouter"
@@ -166,7 +166,8 @@ function createHandlerForProvider(
 		case "qwen":
 			return new QwenHandler({
 				qwenApiKey: options.qwenApiKey,
-				qwenApiLine: options.qwenApiLine,
+				qwenApiLine:
+					options.qwenApiLine === QwenApiRegions.INTERNATIONAL ? QwenApiRegions.INTERNATIONAL : QwenApiRegions.CHINA,
 				apiModelId: mode === "plan" ? options.planModeApiModelId : options.actModeApiModelId,
 				thinkingBudgetTokens:
 					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,

src/api/providers/qwen.ts

@@ -9,6 +9,7 @@ import {
 	internationalQwenDefaultModelId,
 	MainlandQwenModelId,
 	InternationalQwenModelId,
+	QwenApiRegions,
 } from "@shared/api"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
@@ -17,7 +18,7 @@ import { withRetry } from "../retry"
 
 interface QwenHandlerOptions {
 	qwenApiKey?: string
-	qwenApiLine?: string
+	qwenApiLine?: QwenApiRegions
 	apiModelId?: string
 	thinkingBudgetTokens?: number
 }
@@ -27,7 +28,15 @@ export class QwenHandler implements ApiHandler {
 	private client: OpenAI | undefined
 
 	constructor(options: QwenHandlerOptions) {
-		this.options = options
+		// Ensure options start with defaults but allow overrides
+		this.options = {
+			qwenApiLine: QwenApiRegions.CHINA,
+			...options,
+		}
+	}
+
+	private useChinaApi(): boolean {
+		return this.options.qwenApiLine === QwenApiRegions.CHINA
 	}
 
 	private ensureClient(): OpenAI {
@@ -37,10 +46,9 @@ export class QwenHandler implements ApiHandler {
 			}
 			try {
 				this.client = new OpenAI({
-					baseURL:
-						this.options.qwenApiLine === "china"
-							? "https://dashscope.aliyuncs.com/compatible-mode/v1"
-							: "https://dashscope-intl.aliyuncs.com/compatible-mode/v1",
+					baseURL: this.useChinaApi()
+						? "https://dashscope.aliyuncs.com/compatible-mode/v1"
+						: "https://dashscope-intl.aliyuncs.com/compatible-mode/v1",
 					apiKey: this.options.qwenApiKey,
 				})
 			} catch (error: any) {
@@ -53,7 +61,7 @@ export class QwenHandler implements ApiHandler {
 	getModel(): { id: MainlandQwenModelId | InternationalQwenModelId; info: ModelInfo } {
 		const modelId = this.options.apiModelId
 		// Branch based on API line to let poor typescript know what to do
-		if (this.options.qwenApiLine === "china") {
+		if (this.useChinaApi()) {
 			return {
 				id: (modelId as MainlandQwenModelId) ?? mainlandQwenDefaultModelId,
 				info: mainlandQwenModels[modelId as MainlandQwenModelId] ?? mainlandQwenModels[mainlandQwenDefaultModelId],

src/api/providers/vscode-lm.ts

@@ -1,13 +1,13 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import * as vscode from "vscode"
-import { ApiHandler, SingleCompletionHandler } from "../"
-import { calculateApiCostAnthropic } from "@utils/cost"
 import { ApiStream } from "@api/transform/stream"
 import { convertToVsCodeLmMessages } from "@api/transform/vscode-lm-format"
-import { SELECTOR_SEPARATOR, stringifyVsCodeLmModelSelector } from "@shared/vsCodeSelectorUtils"
 import { ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
-import type { LanguageModelChatSelector as LanguageModelChatSelectorFromTypes } from "./types"
+import { SELECTOR_SEPARATOR, stringifyVsCodeLmModelSelector } from "@shared/vsCodeSelectorUtils"
+import { calculateApiCostAnthropic } from "@utils/cost"
+import * as vscode from "vscode"
+import { ApiHandler, SingleCompletionHandler } from "../"
 import { withRetry } from "../retry"
+import type { LanguageModelChatSelector as LanguageModelChatSelectorFromTypes } from "./types"
 
 interface VsCodeLmHandlerOptions {
 	vsCodeLmModelSelector?: any
@@ -237,7 +237,28 @@ export class VsCodeLmHandler implements ApiHandler, SingleCompletionHandler {
 		}
 	}
 
+	private extractTextFromMessage(message: vscode.LanguageModelChatMessage): string {
+		if (Array.isArray(message.content)) {
+			return message.content
+				.filter((part) => part instanceof vscode.LanguageModelTextPart)
+				.map((part) => (part as vscode.LanguageModelTextPart).value)
+				.join("")
+		}
+		return ""
+	}
+
+	private isClaudeModel(): boolean {
+		return this.client?.family?.startsWith("claude") || false
+	}
+
 	private async countTokens(text: string | vscode.LanguageModelChatMessage): Promise<number> {
+		// For Claude models, use character-to-token ratio instead of VSCode LM's inaccurate counting
+		if (this.isClaudeModel()) {
+			const textContent = typeof text === "string" ? text : this.extractTextFromMessage(text)
+			// Use 4 character-to-token ratio for Claude models
+			return Math.ceil(textContent.length / 4)
+		}
+
 		// Check for required dependencies
 		if (!this.client) {
 			console.warn("Cline <Language Model API>: No client available for token counting")
@@ -304,15 +325,10 @@ export class VsCodeLmHandler implements ApiHandler, SingleCompletionHandler {
 		}
 	}
 
-	private async calculateTotalInputTokens(
-		systemPrompt: string,
-		vsCodeLmMessages: vscode.LanguageModelChatMessage[],
-	): Promise<number> {
-		const systemTokens: number = await this.countTokens(systemPrompt)
-
+	private async calculateTotalInputTokens(vsCodeLmMessages: vscode.LanguageModelChatMessage[]): Promise<number> {
 		const messageTokens: number[] = await Promise.all(vsCodeLmMessages.map((msg) => this.countTokens(msg)))
 
-		return systemTokens + messageTokens.reduce((sum: number, tokens: number): number => sum + tokens, 0)
+		return messageTokens.reduce((sum: number, tokens: number): number => sum + tokens, 0)
 	}
 
 	private ensureCleanState(): void {
@@ -434,7 +450,7 @@ export class VsCodeLmHandler implements ApiHandler, SingleCompletionHandler {
 		this.currentRequestCancellation = new vscode.CancellationTokenSource()
 
 		// Calculate input tokens before starting the stream
-		const totalInputTokens: number = await this.calculateTotalInputTokens(systemPrompt, vsCodeLmMessages)
+		const totalInputTokens: number = await this.calculateTotalInputTokens(vsCodeLmMessages)
 
 		// Accumulate the text and count at the end of the stream to reduce token counting overhead.
 		let accumulatedText: string = ""

src/core/controller/account/accountLoginClicked.ts

@@ -1,6 +1,6 @@
 import { Controller } from "../index"
 import { AuthService } from "@/services/auth/AuthService"
-import { EmptyRequest, String } from "../../../shared/proto/common"
+import { EmptyRequest, String } from "@shared/proto/cline/common"
 
 const authService = AuthService.getInstance()
 

src/core/controller/account/accountLogoutClicked.ts

@@ -1,6 +1,6 @@
 import { AuthService } from "@/services/auth/AuthService"
-import { Empty } from "../../../shared/proto/common"
-import type { EmptyRequest } from "../../../shared/proto/common"
+import { Empty } from "@shared/proto/cline/common"
+import type { EmptyRequest } from "@shared/proto/cline/common"
 import type { Controller } from "../index"
 
 const authService = AuthService.getInstance()

src/core/controller/account/authStateChanged.ts

@@ -1,4 +1,4 @@
-import { AuthStateChangedRequest, AuthState } from "@shared/proto/account"
+import { AuthStateChangedRequest, AuthState } from "@shared/proto/cline/account"
 import type { Controller } from "../index"
 import { updateGlobalState } from "../../storage/state"
 

src/core/controller/account/getOrganizationCredits.ts

@@ -1,5 +1,5 @@
 import type { Controller } from "../index"
-import { GetOrganizationCreditsRequest, OrganizationCreditsData, OrganizationUsageTransaction } from "@shared/proto/account"
+import { GetOrganizationCreditsRequest, OrganizationCreditsData, OrganizationUsageTransaction } from "@shared/proto/cline/account"
 
 /**
  * Handles fetching all organization credits data (balance, usage, payments)
@@ -22,6 +22,11 @@ export async function getOrganizationCredits(
 			controller.accountService.fetchOrganizationUsageTransactionsRPC(request.organizationId),
 		])
 
+		// If balance call fails (returns undefined), throw an error
+		if (!balanceData) {
+			throw new Error("Failed to fetch organization credits data")
+		}
+
 		return OrganizationCreditsData.create({
 			balance: balanceData ? { currentBalance: balanceData.balance / 100 } : { currentBalance: 0 },
 			organizationId: balanceData?.organizationId || "",

src/core/controller/account/getUserCredits.ts

@@ -1,6 +1,6 @@
 import type { Controller } from "../index"
-import type { EmptyRequest } from "@shared/proto/common"
-import { UserCreditsData } from "@shared/proto/account"
+import type { EmptyRequest } from "@shared/proto/cline/common"
+import { UserCreditsData } from "@shared/proto/cline/account"
 
 /**
  * Handles fetching all user credits data (balance, usage, payments)
@@ -21,6 +21,11 @@ export async function getUserCredits(controller: Controller, request: EmptyReque
 			controller.accountService.fetchPaymentTransactionsRPC(),
 		])
 
+		// If either call fails (returns undefined), throw an error
+		if (balance === undefined) {
+			throw new Error("Failed to fetch user credits data")
+		}
+
 		return UserCreditsData.create({
 			balance: balance ? { currentBalance: balance.balance / 100 } : { currentBalance: 0 },
 			usageTransactions: usageTransactions,

src/core/controller/account/getUserOrganizations.ts

@@ -1,6 +1,6 @@
 import type { Controller } from "../index"
-import type { EmptyRequest } from "@shared/proto/common"
-import { UserOrganization, UserOrganizationsResponse } from "@shared/proto/account"
+import type { EmptyRequest } from "@shared/proto/cline/common"
+import { UserOrganization, UserOrganizationsResponse } from "@shared/proto/cline/account"
 
 /**
  * Handles fetching all user credits data (balance, usage, payments)

src/core/controller/account/setUserOrganization.ts

@@ -1,6 +1,6 @@
 import type { Controller } from "../index"
-import { Empty } from "@shared/proto/common"
-import { UserOrganizationUpdateRequest } from "@shared/proto/account"
+import { Empty } from "@shared/proto/cline/common"
+import { UserOrganizationUpdateRequest } from "@shared/proto/cline/account"
 
 /**
  * Handles setting the user's active organization

src/core/controller/browser/discoverBrowser.ts

@@ -1,5 +1,5 @@
-import { BrowserConnection } from "@shared/proto/browser"
-import { EmptyRequest } from "@shared/proto/common"
+import { BrowserConnection } from "@shared/proto/cline/browser"
+import { EmptyRequest } from "@shared/proto/cline/common"
 import { Controller } from "../index"
 import { getAllExtensionState } from "@core/storage/state"
 import { BrowserSession } from "@services/browser/BrowserSession"

src/core/controller/browser/getBrowserConnectionInfo.ts

@@ -1,5 +1,5 @@
-import { BrowserConnectionInfo } from "@shared/proto/browser"
-import { EmptyRequest } from "@shared/proto/common"
+import { BrowserConnectionInfo } from "@shared/proto/cline/browser"
+import { EmptyRequest } from "@shared/proto/cline/common"
 import { Controller } from "../index"
 import { getAllExtensionState } from "@core/storage/state"
 

src/core/controller/browser/getDetectedChromePath.ts

@@ -1,5 +1,5 @@
-import { ChromePath } from "../../../shared/proto/browser"
-import { EmptyRequest } from "../../../shared/proto/common"
+import { ChromePath } from "@shared/proto/cline/browser"
+import { EmptyRequest } from "@shared/proto/cline/common"
 import { Controller } from "../index"
 import { getAllExtensionState } from "../../storage/state"
 import { BrowserSession } from "../../../services/browser/BrowserSession"

src/core/controller/browser/relaunchChromeDebugMode.ts

@@ -1,4 +1,4 @@
-import { EmptyRequest, String as StringMessage } from "../../../shared/proto/common"
+import { EmptyRequest, String as StringMessage } from "@shared/proto/cline/common"
 import { Controller } from "../index"
 import { BrowserSession } from "../../../services/browser/BrowserSession"
 

src/core/controller/browser/testBrowserConnection.ts

@@ -1,5 +1,5 @@
-import { BrowserConnection } from "@shared/proto/browser"
-import { StringRequest } from "@shared/proto/common"
+import { BrowserConnection } from "@shared/proto/cline/browser"
+import { StringRequest } from "@shared/proto/cline/common"
 import { Controller } from "../index"
 import { getAllExtensionState } from "@core/storage/state"
 import { BrowserSession } from "@services/browser/BrowserSession"

src/core/controller/browser/updateBrowserSettings.ts

@@ -1,5 +1,5 @@
-import { UpdateBrowserSettingsRequest } from "../../../shared/proto/browser"
-import { Boolean } from "../../../shared/proto/common"
+import { UpdateBrowserSettingsRequest } from "@shared/proto/cline/browser"
+import { Boolean } from "@shared/proto/cline/common"
 import { Controller } from "../index"
 import { updateGlobalState, getGlobalState } from "../../storage/state"
 import { BrowserSettings as SharedBrowserSettings, DEFAULT_BROWSER_SETTINGS } from "../../../shared/BrowserSettings"

src/core/controller/checkpoints/checkpointDiff.ts

@@ -1,5 +1,5 @@
 import { Controller } from ".."
-import { Empty, Int64Request } from "@shared/proto/common"
+import { Empty, Int64Request } from "@shared/proto/cline/common"
 
 export async function checkpointDiff(controller: Controller, request: Int64Request): Promise<Empty> {
 	if (request.value) {

src/core/controller/checkpoints/checkpointRestore.ts

@@ -1,8 +1,8 @@
 import { HostProvider } from "@/hosts/host-provider"
 import { Controller } from ".."
 import { ClineCheckpointRestore } from "../../../shared/WebviewMessage"
-import { CheckpointRestoreRequest } from "../../../shared/proto/checkpoints"
-import { Empty } from "../../../shared/proto/common"
+import { CheckpointRestoreRequest } from "@shared/proto/cline/checkpoints"
+import { Empty } from "@shared/proto/cline/common"
 import pWaitFor from "p-wait-for"
 import { ShowMessageType } from "@/shared/proto/index.host"
 

src/core/controller/file/copyToClipboard.ts

@@ -1,5 +1,5 @@
 import { Controller } from ".."
-import { Empty, StringRequest } from "@shared/proto/common"
+import { Empty, StringRequest } from "@shared/proto/cline/common"
 import { writeTextToClipboard } from "@/utils/env"
 
 /**

src/core/controller/file/createRuleFile.ts

@@ -1,14 +1,13 @@
 import { Controller } from ".."
-import { RuleFileRequest, RuleFile } from "@shared/proto/file"
-import { FileMethodHandler } from "./index"
+import { RuleFileRequest, RuleFile } from "@shared/proto/cline/file"
 import { refreshClineRulesToggles } from "@core/context/instructions/user-instructions/cline-rules"
 import { createRuleFile as createRuleFileImpl } from "@core/context/instructions/user-instructions/rule-helpers"
 import * as path from "path"
-import { handleFileServiceRequest } from "./index"
 import { refreshWorkflowToggles } from "@/core/context/instructions/user-instructions/workflows"
 import { getCwd, getDesktopDir } from "@/utils/path"
 import { HostProvider } from "@/hosts/host-provider"
-import { ShowMessageRequest, ShowMessageType } from "@/shared/proto/host/window"
+import { ShowMessageType } from "@/shared/proto/host/window"
+import { openFile } from "./openFile"
 
 /**
  * Creates a rule file in either global or workspace rules directory
@@ -17,7 +16,7 @@ import { ShowMessageRequest, ShowMessageType } from "@/shared/proto/host/window"
  * @returns Result with file path and display name
  * @throws Error if operation fails
  */
-export const createRuleFile: FileMethodHandler = async (controller: Controller, request: RuleFileRequest): Promise<RuleFile> => {
+export async function createRuleFile(controller: Controller, request: RuleFileRequest): Promise<RuleFile> {
 	if (
 		typeof request.isGlobal !== "boolean" ||
 		!request.filename ||
@@ -49,7 +48,7 @@ export const createRuleFile: FileMethodHandler = async (controller: Controller,
 			message,
 		})
 		// Still open it for editing
-		await handleFileServiceRequest(controller, "openFile", { value: filePath })
+		await openFile(controller, { value: filePath })
 	} else {
 		if (request.type === "workflow") {
 			await refreshWorkflowToggles(controller.context, cwd)
@@ -58,7 +57,7 @@ export const createRuleFile: FileMethodHandler = async (controller: Controller,
 		}
 		await controller.postStateToWebview()
 
-		await handleFileServiceRequest(controller, "openFile", { value: filePath })
+		await openFile(controller, { value: filePath })
 
 		const message = `Created new ${request.isGlobal ? "global" : "workspace"} ${fileTypeName} file: ${request.filename}`
 		HostProvider.window.showMessage({

src/core/controller/file/deleteRuleFile.ts

@@ -1,10 +1,9 @@
 import { deleteRuleFile as deleteRuleFileImpl } from "@core/context/instructions/user-instructions/rule-helpers"
-import { RuleFile, RuleFileRequest } from "@shared/proto/file"
+import { RuleFile, RuleFileRequest } from "@shared/proto/cline/file"
 import * as path from "path"
 import { Controller } from ".."
-import { FileMethodHandler } from "./index"
 import { HostProvider } from "@/hosts/host-provider"
-import { ShowMessageRequest, ShowMessageType } from "@/shared/proto/host/window"
+import { ShowMessageType } from "@/shared/proto/host/window"
 
 /**
  * Deletes a rule file from either global or workspace rules directory
@@ -13,7 +12,7 @@ import { ShowMessageRequest, ShowMessageType } from "@/shared/proto/host/window"
  * @returns Result with file path and display name
  * @throws Error if operation fails
  */
-export const deleteRuleFile: FileMethodHandler = async (controller: Controller, request: RuleFileRequest): Promise<RuleFile> => {
+export async function deleteRuleFile(controller: Controller, request: RuleFileRequest): Promise<RuleFile> {
 	if (
 		typeof request.isGlobal !== "boolean" ||
 		typeof request.rulePath !== "string" ||

src/core/controller/file/getRelativePaths.ts

@@ -1,9 +1,8 @@
 import { asRelativePath } from "@/utils/path"
-import { RelativePaths, RelativePathsRequest } from "@shared/proto/file"
+import { RelativePaths, RelativePathsRequest } from "@shared/proto/cline/file"
 import * as path from "path"
 import { URI } from "vscode-uri"
 import { Controller } from ".."
-import { FileMethodHandler } from "./index"
 import { isDirectory } from "@/utils/fs"
 
 /**
@@ -12,10 +11,7 @@ import { isDirectory } from "@/utils/fs"
  * @param request The request containing URIs to convert
  * @returns Response with resolved relative paths
  */
-export const getRelativePaths: FileMethodHandler = async (
-	_controller: Controller,
-	request: RelativePathsRequest,
-): Promise<RelativePaths> => {
+export async function getRelativePaths(_controller: Controller, request: RelativePathsRequest): Promise<RelativePaths> {
 	const result = []
 	for (const uriString of request.uris) {
 		try {

src/core/controller/file/openFile.ts

@@ -1,7 +1,6 @@
 import { Controller } from ".."
-import { Empty, StringRequest } from "@shared/proto/common"
+import { Empty, StringRequest } from "@shared/proto/cline/common"
 import { openFile as openFileIntegration } from "@integrations/misc/open-file"
-import { FileMethodHandler } from "./index"
 
 /**
  * Opens a file in the editor
@@ -9,7 +8,7 @@ import { FileMethodHandler } from "./index"
  * @param request The request message containing the file path in the 'value' field
  * @returns Empty response
  */
-export const openFile: FileMethodHandler = async (controller: Controller, request: StringRequest): Promise<Empty> => {
+export async function openFile(_controller: Controller, request: StringRequest): Promise<Empty> {
 	if (request.value) {
 		openFileIntegration(request.value)
 	}

src/core/controller/file/openImage.ts

@@ -1,7 +1,6 @@
 import { Controller } from ".."
-import { Empty, StringRequest } from "@shared/proto/common"
+import { Empty, StringRequest } from "@shared/proto/cline/common"
 import { openImage as openImageIntegration } from "@integrations/misc/open-file"
-import { FileMethodHandler } from "./index"
 
 /**
  * Opens an image in the system viewer
@@ -9,7 +8,7 @@ import { FileMethodHandler } from "./index"
  * @param request The request message containing the image path or data URI in the 'value' field
  * @returns Empty response
  */
-export const openImage: FileMethodHandler = async (controller: Controller, request: StringRequest): Promise<Empty> => {
+export async function openImage(_controller: Controller, request: StringRequest): Promise<Empty> {
 	if (request.value) {
 		await openImageIntegration(request.value)
 	}

src/core/controller/file/openMention.ts

@@ -1,5 +1,5 @@
 import { Controller } from ".."
-import { Empty, StringRequest } from "../../../shared/proto/common"
+import { Empty, StringRequest } from "@shared/proto/cline/common"
 import { openMention as coreOpenMention } from "../../mentions"
 
 /**

src/core/controller/file/openTaskHistory.ts

@@ -1,7 +1,6 @@
 import { Controller } from ".."
-import { Empty, StringRequest } from "@shared/proto/common"
+import { Empty, StringRequest } from "@shared/proto/cline/common"
 import { openFile as openFileIntegration } from "@integrations/misc/open-file"
-import { FileMethodHandler } from "./index"
 import path from "path"
 /**
  * Opens a file in the editor
@@ -9,7 +8,7 @@ import path from "path"
  * @param request The request message containing the file path in the 'value' field
  * @returns Empty response
  */
-export const openTaskHistory: FileMethodHandler = async (controller: Controller, request: StringRequest): Promise<Empty> => {
+export async function openTaskHistory(controller: Controller, request: StringRequest): Promise<Empty> {
 	const globalStoragePath = controller.context.globalStorageUri.fsPath
 	const taskHistoryPath = path.join(globalStoragePath, "tasks", request.value, "api_conversation_history.json")
 	if (request.value) {

src/core/controller/file/refreshRules.ts

@@ -1,5 +1,5 @@
-import { EmptyRequest } from "@shared/proto/common"
-import { RefreshedRules } from "@shared/proto/file"
+import { EmptyRequest } from "@shared/proto/cline/common"
+import { RefreshedRules } from "@shared/proto/cline/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"

src/core/controller/file/searchCommits.ts

@@ -1,9 +1,8 @@
 import { Controller } from ".."
-import { GitCommits } from "@shared/proto/file"
-import { StringRequest } from "@shared/proto/common"
+import { GitCommits } from "@shared/proto/cline/file"
+import { StringRequest } from "@shared/proto/cline/common"
 import { searchCommits as searchCommitsUtil } from "@utils/git"
 import { getWorkspacePath } from "@utils/path"
-import { FileMethodHandler } from "./index"
 import { convertGitCommitsToProtoGitCommits } from "@shared/proto-conversions/file/git-commit-conversion"
 
 /**
@@ -12,7 +11,7 @@ import { convertGitCommitsToProtoGitCommits } from "@shared/proto-conversions/fi
  * @param request The request message containing the search query in the 'value' field
  * @returns GitCommits containing the matching commits
  */
-export const searchCommits: FileMethodHandler = async (controller: Controller, request: StringRequest): Promise<GitCommits> => {
+export async function searchCommits(_controller: Controller, request: StringRequest): Promise<GitCommits> {
 	const cwd = await getWorkspacePath()
 	if (!cwd) {
 		return GitCommits.create({ commits: [] })

src/core/controller/file/searchFiles.ts

@@ -1,8 +1,7 @@
 import { Controller } from ".."
-import { FileSearchRequest, FileSearchResults } from "@shared/proto/file"
+import { FileSearchRequest, FileSearchResults } from "@shared/proto/cline/file"
 import { searchWorkspaceFiles } from "@services/search/file-search"
 import { getWorkspacePath } from "@utils/path"
-import { FileMethodHandler } from "./index"
 import { convertSearchResultsToProtoFileInfos } from "@shared/proto-conversions/file/search-result-conversion"
 
 /**
@@ -11,10 +10,7 @@ import { convertSearchResultsToProtoFileInfos } from "@shared/proto-conversions/
  * @param request The request containing search query and optionally a mentionsRequestId
  * @returns Results containing matching files/folders
  */
-export const searchFiles: FileMethodHandler = async (
-	_controller: Controller,
-	request: FileSearchRequest,
-): Promise<FileSearchResults> => {
+export async function searchFiles(_controller: Controller, request: FileSearchRequest): Promise<FileSearchResults> {
 	const workspacePath = await getWorkspacePath()
 
 	if (!workspacePath) {

src/core/controller/file/selectFiles.ts

@@ -1,7 +1,6 @@
 import { Controller } from ".."
-import { BooleanRequest, StringArrays } from "@shared/proto/common"
+import { BooleanRequest, StringArrays } from "@shared/proto/cline/common"
 import { selectFiles as selectFilesIntegration } from "@integrations/misc/process-files"
-import { FileMethodHandler } from "./index"
 
 /**
  * Prompts the user to select images from the file system and returns them as data URLs
@@ -9,7 +8,7 @@ import { FileMethodHandler } from "./index"
  * @param request Boolean request, with the value defining whether this model supports images
  * @returns Two arrays of image data URLs and other file paths
  */
-export const selectFiles: FileMethodHandler = async (controller: Controller, request: BooleanRequest): Promise<StringArrays> => {
+export async function selectFiles(_controller: Controller, request: BooleanRequest): Promise<StringArrays> {
 	try {
 		const { images, files } = await selectFilesIntegration(request.value)
 		return StringArrays.create({ values1: images, values2: files })

src/core/controller/file/subscribeToWorkspaceUpdates.ts

@@ -1,9 +1,9 @@
 import { Controller } from "../index"
-import { EmptyRequest, StringArray } from "@shared/proto/common"
+import { EmptyRequest, StringArray } from "@shared/proto/cline/common"
 import { StreamingResponseHandler, getRequestRegistry } from "../grpc-handler"
 
 // Keep track of active subscriptions
-const activeWorkspaceUpdateSubscriptions = new Set<StreamingResponseHandler>()
+const activeWorkspaceUpdateSubscriptions = new Set<StreamingResponseHandler<StringArray>>()
 
 /**
  * Subscribe to workspace file updates
@@ -13,9 +13,9 @@ const activeWorkspaceUpdateSubscriptions = new Set<StreamingResponseHandler>()
  * @param requestId The ID of the request (passed by the gRPC handler)
  */
 export async function subscribeToWorkspaceUpdates(
-	controller: Controller,
-	request: EmptyRequest,
-	responseStream: StreamingResponseHandler,
+	_controller: Controller,
+	_request: EmptyRequest,
+	responseStream: StreamingResponseHandler<StringArray>,
 	requestId?: string,
 ): Promise<void> {
 	// Add this subscription to the active subscriptions

src/core/controller/file/toggleClineRule.ts

@@ -1,5 +1,5 @@
-import { ToggleClineRules } from "../../../shared/proto/file"
-import type { ToggleClineRuleRequest } from "../../../shared/proto/file"
+import { ToggleClineRules } from "@shared/proto/cline/file"
+import type { ToggleClineRuleRequest } from "@shared/proto/cline/file"
 import type { Controller } from "../index"
 import { getGlobalState, getWorkspaceState, updateGlobalState, updateWorkspaceState } from "../../../core/storage/state"
 import { ClineRulesToggles as AppClineRulesToggles } from "@shared/cline-rules"

src/core/controller/file/toggleCursorRule.ts

@@ -1,5 +1,5 @@
-import type { ToggleCursorRuleRequest } from "../../../shared/proto/file"
-import { ClineRulesToggles } from "../../../shared/proto/file"
+import type { ToggleCursorRuleRequest } from "@shared/proto/cline/file"
+import { ClineRulesToggles } from "@shared/proto/cline/file"
 import type { Controller } from "../index"
 import { getWorkspaceState, updateWorkspaceState } from "../../../core/storage/state"
 import { ClineRulesToggles as AppClineRulesToggles } from "@shared/cline-rules"

src/core/controller/file/toggleWindsurfRule.ts

@@ -1,5 +1,5 @@
-import type { ToggleWindsurfRuleRequest } from "../../../shared/proto/file"
-import { ClineRulesToggles } from "../../../shared/proto/file"
+import type { ToggleWindsurfRuleRequest } from "@shared/proto/cline/file"
+import { ClineRulesToggles } from "@shared/proto/cline/file"
 import type { Controller } from "../index"
 import { getWorkspaceState, updateWorkspaceState } from "../../../core/storage/state"
 import { ClineRulesToggles as AppClineRulesToggles } from "@shared/cline-rules"

src/core/controller/file/toggleWorkflow.ts

@@ -1,6 +1,6 @@
 import { Controller } from ".."
-import { Metadata } from "../../../shared/proto/common"
-import { ToggleWorkflowRequest, ClineRulesToggles } from "../../../shared/proto/file"
+import { Metadata } from "@shared/proto/cline/common"
+import { ToggleWorkflowRequest, ClineRulesToggles } from "@shared/proto/cline/file"
 import { getWorkspaceState, updateWorkspaceState, getGlobalState, updateGlobalState } from "../../../core/storage/state"
 import { ClineRulesToggles as AppClineRulesToggles } from "../../../shared/cline-rules"
 

src/core/controller/grpc-handler.ts

@@ -1,11 +1,15 @@
 import { Controller } from "./index"
-import { serviceHandlers } from "./grpc-service-config"
+import { serviceHandlers } from "@generated/hosts/vscode/protobus-services"
 import { GrpcRequestRegistry } from "./grpc-request-registry"
 
 /**
  * Type definition for a streaming response handler
  */
-export type StreamingResponseHandler = (response: any, isLast?: boolean, sequenceNumber?: number) => Promise<void>
+export type StreamingResponseHandler<TResponse> = (
+	response: TResponse,
+	isLast?: boolean,
+	sequenceNumber?: number,
+) => Promise<void>
 
 /**
  * Handles gRPC requests from the webview
@@ -41,17 +45,15 @@ export class GrpcHandler {
 			}
 
 			// Get the service handler from the config
-			const serviceConfig = serviceHandlers[service]
-			if (!serviceConfig) {
-				throw new Error(`Unknown service: ${service}`)
-			}
+			const handler = getHandler(service, method)
 
 			// Handle unary request
 			return {
-				message: await serviceConfig.requestHandler(this.controller, method, message),
+				message: await handler(this.controller, message),
 				request_id: requestId,
 			}
 		} catch (error) {
+			console.log("Protobus error:", error)
 			return {
 				error: error instanceof Error ? error.message : String(error),
 				request_id: requestId,
@@ -68,7 +70,7 @@ export class GrpcHandler {
 	 */
 	private async handleStreamingRequest(service: string, method: string, message: any, requestId: string): Promise<void> {
 		// Create a response stream function
-		const responseStream: StreamingResponseHandler = async (
+		const responseStream: StreamingResponseHandler<any> = async (
 			response: any,
 			isLast: boolean = false,
 			sequenceNumber?: number,
@@ -86,23 +88,16 @@ export class GrpcHandler {
 
 		try {
 			// Get the service handler from the config
-			const serviceConfig = serviceHandlers[service]
-			if (!serviceConfig) {
-				throw new Error(`Unknown service: ${service}`)
-			}
-
-			// Check if the service supports streaming
-			if (!serviceConfig.streamingHandler) {
-				throw new Error(`Service ${service} does not support streaming`)
-			}
+			const handler = getHandler(service, method)
 
 			// Handle streaming request and pass the requestId to all streaming handlers
-			await serviceConfig.streamingHandler(this.controller, method, message, responseStream, requestId)
+			await handler(this.controller, message, responseStream, requestId)
 
 			// Don't send a final message here - the stream should stay open for future updates
 			// The stream will be closed when the client disconnects or when the service explicitly ends it
 		} catch (error) {
 			// Send error response
+			console.log("Protobus error:", error)
 			await this.controller.postMessageToWebview({
 				type: "grpc_response",
 				grpc_response: {
@@ -167,6 +162,7 @@ export async function handleGrpcRequest(
 		})
 	} catch (error) {
 		// Send error response
+		console.log("Protobus error:", error)
 		await controller.postMessageToWebview({
 			type: "grpc_response",
 			grpc_response: {
@@ -205,6 +201,19 @@ export async function handleGrpcRequestCancel(
 	}
 }
 
+function getHandler(serviceName: string, methodName: string): any {
+	// Get the service handler from the config
+	const serviceConfig = serviceHandlers[serviceName]
+	if (!serviceConfig) {
+		throw new Error(`Unknown service: ${serviceName}`)
+	}
+	const handler = serviceConfig[methodName]
+	if (!handler) {
+		throw new Error(`Unknown rpc: ${serviceName}.${methodName}`)
+	}
+	return handler
+}
+
 /**
  * Get the request registry instance
  * This allows other parts of the code to access the registry

src/core/controller/grpc-request-registry.ts

@@ -22,7 +22,7 @@ export interface RequestInfo {
 	/**
 	 * The streaming response handler for this request
 	 */
-	responseStream?: StreamingResponseHandler
+	responseStream?: StreamingResponseHandler<any>
 }
 
 /**
@@ -46,7 +46,7 @@ export class GrpcRequestRegistry {
 		requestId: string,
 		cleanup: () => void,
 		metadata?: any,
-		responseStream?: StreamingResponseHandler,
+		responseStream?: StreamingResponseHandler<any>,
 	): void {
 		this.activeRequests.set(requestId, {
 			cleanup,

src/core/controller/grpc-service.ts

@@ -12,7 +12,7 @@ export type ServiceMethodHandler = (controller: Controller, message: any) => Pro
 export type StreamingMethodHandler = (
 	controller: Controller,
 	message: any,
-	responseStream: StreamingResponseHandler,
+	responseStream: StreamingResponseHandler<any>,
 	requestId?: string,
 ) => Promise<void>
 
@@ -109,7 +109,7 @@ export class ServiceRegistry {
 		controller: Controller,
 		method: string,
 		message: any,
-		responseStream: StreamingResponseHandler,
+		responseStream: StreamingResponseHandler<any>,
 		requestId?: string,
 	): Promise<void> {
 		const handler = this.streamingMethodRegistry[method]
@@ -144,7 +144,7 @@ export function createServiceRegistry(serviceName: string) {
 			controller: Controller,
 			method: string,
 			message: any,
-			responseStream: StreamingResponseHandler,
+			responseStream: StreamingResponseHandler<any>,
 			requestId?: string,
 		) => registry.handleStreamingRequest(controller, method, message, responseStream, requestId),
 

src/core/controller/index.ts

@@ -53,7 +53,9 @@ export class Controller {
 	mcpHub: McpHub
 	accountService: ClineAccountService
 	authService: AuthService
-	latestAnnouncementId = "june-25-2025_16:11:00" // update to some unique identifier when we add a new announcement
+	get latestAnnouncementId(): string {
+		return this.context.extension?.packageJSON?.version?.split(".").slice(0, 2).join(".") ?? ""
+	}
 
 	constructor(
 		readonly context: vscode.ExtensionContext,

src/core/controller/mcp/addRemoteMcpServer.ts

@@ -1,6 +1,6 @@
 import { convertMcpServersToProtoMcpServers } from "@/shared/proto-conversions/mcp/mcp-server-conversion"
-import type { AddRemoteMcpServerRequest } from "../../../shared/proto/mcp"
-import { McpServers } from "../../../shared/proto/mcp"
+import type { AddRemoteMcpServerRequest } from "@shared/proto/cline/mcp"
+import { McpServers } from "@shared/proto/cline/mcp"
 import type { Controller } from "../index"
 
 /**

src/core/controller/mcp/deleteMcpServer.ts

@@ -1,7 +1,7 @@
 import type { Controller } from "../index"
-import { McpServers } from "../../../shared/proto/mcp"
+import { McpServers } from "@shared/proto/cline/mcp"
 import { convertMcpServersToProtoMcpServers } from "../../../shared/proto-conversions/mcp/mcp-server-conversion"
-import { StringRequest } from "@/shared/proto/common"
+import { StringRequest } from "@shared/proto/cline/common"
 
 /**
  * Deletes an MCP server

src/core/controller/mcp/downloadMcp.ts

@@ -1,6 +1,6 @@
 import { Controller } from ".."
-import { StringRequest } from "../../../shared/proto/common"
-import { McpDownloadResponse } from "../../../shared/proto/mcp"
+import { StringRequest } from "@shared/proto/cline/common"
+import { McpDownloadResponse } from "@shared/proto/cline/mcp"
 import { McpServer } from "@shared/mcp"
 import axios from "axios"
 import { sendChatButtonClickedEvent } from "../ui/subscribeToChatButtonClicked"

src/core/controller/mcp/getLatestMcpServers.ts

@@ -1,5 +1,5 @@
-import type { Empty } from "@shared/proto/common"
-import { McpServers } from "@shared/proto/mcp"
+import type { Empty } from "@shared/proto/cline/common"
+import { McpServers } from "@shared/proto/cline/mcp"
 import type { Controller } from "../index"
 import { convertMcpServersToProtoMcpServers } from "@/shared/proto-conversions/mcp/mcp-server-conversion"
 

src/core/controller/mcp/openMcpSettings.ts

@@ -1,5 +1,5 @@
 import { Controller } from ".."
-import { Empty, EmptyRequest } from "@shared/proto/common"
+import { Empty, EmptyRequest } from "@shared/proto/cline/common"
 import { openFile as openFileIntegration } from "@integrations/misc/open-file"
 
 /**

src/core/controller/mcp/refreshMcpMarketplace.ts

@@ -1,5 +1,5 @@
-import type { EmptyRequest } from "../../../shared/proto/common"
-import { McpMarketplaceCatalog } from "../../../shared/proto/mcp"
+import type { EmptyRequest } from "@shared/proto/cline/common"
+import { McpMarketplaceCatalog } from "@shared/proto/cline/mcp"
 import type { Controller } from "../index"
 
 /**