Fall back to execa if VSCode terminal integration fails

.changeset/many-boats-hunt.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Use a fallback terminal if VSCode shell integration fails

.roomodes

@@ -2,7 +2,7 @@
   "customModes": [
     {
       "slug": "test",
-      "name": "Test",
+      "name": "🧪 Test",
       "roleDefinition": "You are Roo, a Jest testing specialist with deep expertise in:\n- Writing and maintaining Jest test suites\n- Test-driven development (TDD) practices\n- Mocking and stubbing with Jest\n- Integration testing strategies\n- TypeScript testing patterns\n- Code coverage analysis\n- Test performance optimization\n\nYour focus is on maintaining high test quality and coverage across the codebase, working primarily with:\n- Test files in __tests__ directories\n- Mock implementations in __mocks__\n- Test utilities and helpers\n- Jest configuration and setup\n\nYou ensure tests are:\n- Well-structured and maintainable\n- Following Jest best practices\n- Properly typed with TypeScript\n- Providing meaningful coverage\n- Using appropriate mocking strategies",
       "groups": [
         "read",
@@ -20,7 +20,7 @@
     },
     {
       "slug": "translate",
-      "name": "Translate",
+      "name": "🌐 Translate",
       "roleDefinition": "You are Roo, a linguistic specialist focused on translating and managing localization files. Your responsibility is to help maintain and update translation files for the application, ensuring consistency and accuracy across all language resources.",
       "groups": [
         "read",

scripts/run-tests.js

@@ -2,7 +2,7 @@
 const { execSync } = require("child_process")
 
 if (process.platform === "win32") {
-	execSync("npm-run-all test:* lint:*", { stdio: "inherit" })
+	execSync("npm-run-all test:*", { stdio: "inherit" })
 } else {
-	execSync("npm-run-all -p test:* lint:*", { stdio: "inherit" })
+	execSync("npm-run-all -p test:*", { stdio: "inherit" })
 }

src/__mocks__/jest.setup.ts

@@ -1,3 +1,15 @@
+import nock from "nock"
+
+nock.disableNetConnect()
+
+export function allowNetConnect(host?: string | RegExp) {
+	if (host) {
+		nock.enableNetConnect(host)
+	} else {
+		nock.enableNetConnect()
+	}
+}
+
 // Mock the logger globally for all tests
 jest.mock("../utils/logging", () => ({
 	logger: {

src/api/providers/__tests__/glama.test.ts

@@ -5,6 +5,36 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import { GlamaHandler } from "../glama"
 import { ApiHandlerOptions } from "../../../shared/api"
 
+// Mock dependencies
+jest.mock("../fetchers/cache", () => ({
+	getModels: jest.fn().mockImplementation(() => {
+		return Promise.resolve({
+			"anthropic/claude-3-7-sonnet": {
+				maxTokens: 8192,
+				contextWindow: 200000,
+				supportsImages: true,
+				supportsPromptCache: true,
+				inputPrice: 3,
+				outputPrice: 15,
+				cacheWritesPrice: 3.75,
+				cacheReadsPrice: 0.3,
+				description: "Claude 3.7 Sonnet",
+				thinking: false,
+				supportsComputerUse: true,
+			},
+			"openai/gpt-4o": {
+				maxTokens: 4096,
+				contextWindow: 128000,
+				supportsImages: true,
+				supportsPromptCache: false,
+				inputPrice: 5,
+				outputPrice: 15,
+				description: "GPT-4o",
+			},
+		})
+	}),
+}))
+
 // Mock OpenAI client
 const mockCreate = jest.fn()
 const mockWithResponse = jest.fn()

src/api/providers/__tests__/openrouter.test.ts

@@ -9,6 +9,38 @@ import { ApiHandlerOptions } from "../../../shared/api"
 // Mock dependencies
 jest.mock("openai")
 jest.mock("delay", () => jest.fn(() => Promise.resolve()))
+jest.mock("../fetchers/cache", () => ({
+	getModels: jest.fn().mockImplementation(() => {
+		return Promise.resolve({
+			"anthropic/claude-3.7-sonnet": {
+				maxTokens: 8192,
+				contextWindow: 200000,
+				supportsImages: true,
+				supportsPromptCache: true,
+				inputPrice: 3,
+				outputPrice: 15,
+				cacheWritesPrice: 3.75,
+				cacheReadsPrice: 0.3,
+				description: "Claude 3.7 Sonnet",
+				thinking: false,
+				supportsComputerUse: true,
+			},
+			"anthropic/claude-3.7-sonnet:thinking": {
+				maxTokens: 128000,
+				contextWindow: 200000,
+				supportsImages: true,
+				supportsPromptCache: true,
+				inputPrice: 3,
+				outputPrice: 15,
+				cacheWritesPrice: 3.75,
+				cacheReadsPrice: 0.3,
+				description: "Claude 3.7 Sonnet with thinking",
+				thinking: true,
+				supportsComputerUse: true,
+			},
+		})
+	}),
+}))
 
 describe("OpenRouterHandler", () => {
 	const mockOptions: ApiHandlerOptions = {

src/api/providers/__tests__/requesty.test.ts

@@ -1,3 +1,5 @@
+// npx jest src/api/providers/__tests__/requesty.test.ts
+
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 import { ApiHandlerOptions, ModelInfo } from "../../../shared/api"
@@ -9,6 +11,22 @@ import { convertToR1Format } from "../../transform/r1-format"
 jest.mock("openai")
 jest.mock("../../transform/openai-format")
 jest.mock("../../transform/r1-format")
+jest.mock("../fetchers/cache", () => ({
+	getModels: jest.fn().mockResolvedValue({
+		"test-model": {
+			maxTokens: 8192,
+			contextWindow: 200_000,
+			supportsImages: true,
+			supportsComputerUse: true,
+			supportsPromptCache: true,
+			inputPrice: 3.0,
+			outputPrice: 15.0,
+			cacheWritesPrice: 3.75,
+			cacheReadsPrice: 0.3,
+			description: "Test model description",
+		},
+	}),
+}))
 
 describe("RequestyHandler", () => {
 	let handler: RequestyHandler

src/api/providers/__tests__/unbound.test.ts

@@ -6,6 +6,58 @@ import { ApiHandlerOptions } from "../../../shared/api"
 
 import { UnboundHandler } from "../unbound"
 
+// Mock dependencies
+jest.mock("../fetchers/cache", () => ({
+	getModels: jest.fn().mockImplementation(() => {
+		return Promise.resolve({
+			"anthropic/claude-3-5-sonnet-20241022": {
+				maxTokens: 8192,
+				contextWindow: 200000,
+				supportsImages: true,
+				supportsPromptCache: true,
+				inputPrice: 3,
+				outputPrice: 15,
+				cacheWritesPrice: 3.75,
+				cacheReadsPrice: 0.3,
+				description: "Claude 3.5 Sonnet",
+				thinking: false,
+				supportsComputerUse: true,
+			},
+			"anthropic/claude-3-7-sonnet-20250219": {
+				maxTokens: 8192,
+				contextWindow: 200000,
+				supportsImages: true,
+				supportsPromptCache: true,
+				inputPrice: 3,
+				outputPrice: 15,
+				cacheWritesPrice: 3.75,
+				cacheReadsPrice: 0.3,
+				description: "Claude 3.7 Sonnet",
+				thinking: false,
+				supportsComputerUse: true,
+			},
+			"openai/gpt-4o": {
+				maxTokens: 4096,
+				contextWindow: 128000,
+				supportsImages: true,
+				supportsPromptCache: false,
+				inputPrice: 5,
+				outputPrice: 15,
+				description: "GPT-4o",
+			},
+			"openai/o3-mini": {
+				maxTokens: 4096,
+				contextWindow: 128000,
+				supportsImages: true,
+				supportsPromptCache: false,
+				inputPrice: 1,
+				outputPrice: 3,
+				description: "O3 Mini",
+			},
+		})
+	}),
+}))
+
 // Mock OpenAI client
 const mockCreate = jest.fn()
 const mockWithResponse = jest.fn()

src/api/providers/fetchers/__tests__/openrouter.test.ts

@@ -13,7 +13,7 @@ nockBack.setMode("lockdown")
 
 describe("OpenRouter API", () => {
 	describe("getOpenRouterModels", () => {
-		it("fetches models and validates schema", async () => {
+		it.skip("fetches models and validates schema", async () => {
 			const { nockDone } = await nockBack("openrouter-models.json")
 
 			const models = await getOpenRouterModels()

src/api/providers/glama.ts

@@ -19,7 +19,7 @@ export class GlamaHandler extends RouterProvider implements SingleCompletionHand
 	constructor(options: ApiHandlerOptions) {
 		super({
 			options,
-			name: "unbound",
+			name: "glama",
 			baseURL: "https://glama.ai/api/gateway/openai/v1",
 			apiKey: options.glamaApiKey,
 			modelId: options.glamaModelId,

src/core/tools/attemptCompletionTool.ts

@@ -13,7 +13,7 @@ import {
 } from "../../shared/tools"
 import { formatResponse } from "../prompts/responses"
 import { telemetryService } from "../../services/telemetry/TelemetryService"
-import { executeCommand } from "./executeCommandTool"
+import { type ExecuteCommandOptions, executeCommand } from "./executeCommandTool"
 
 export async function attemptCompletionTool(
 	cline: Cline,
@@ -82,7 +82,9 @@ export async function attemptCompletionTool(
 					return
 				}
 
-				const [userRejected, execCommandResult] = await executeCommand(cline, command!)
+				const options: ExecuteCommandOptions = { command }
+
+				const [userRejected, execCommandResult] = await executeCommand(cline, options)
 
 				if (userRejected) {
 					cline.didRejectTool = true

src/core/tools/executeCommandTool.ts

@@ -8,10 +8,12 @@ import { ToolUse, AskApproval, HandleError, PushToolResult, RemoveClosingTag, To
 import { formatResponse } from "../prompts/responses"
 import { unescapeHtmlEntities } from "../../utils/text-normalization"
 import { telemetryService } from "../../services/telemetry/TelemetryService"
-import { ExitCodeDetails, RooTerminalProcess } from "../../integrations/terminal/types"
+import { ExitCodeDetails, RooTerminalCallbacks, RooTerminalProcess } from "../../integrations/terminal/types"
 import { TerminalRegistry } from "../../integrations/terminal/TerminalRegistry"
 import { Terminal } from "../../integrations/terminal/Terminal"
 
+class ShellIntegrationError extends Error {}
+
 export async function executeCommandTool(
 	cline: Cline,
 	block: ToolUse,
@@ -52,13 +54,44 @@ export async function executeCommandTool(
 				return
 			}
 
-			const [userRejected, result] = await executeCommand(cline, command, customCwd)
+			const clineProvider = await cline.providerRef.deref()
+			const clineProviderState = await clineProvider?.getState()
+			const { terminalOutputLineLimit = 500, terminalShellIntegrationDisabled = false } = clineProviderState ?? {}
 
-			if (userRejected) {
-				cline.didRejectTool = true
+			const options: ExecuteCommandOptions = {
+				command,
+				customCwd,
+				terminalShellIntegrationDisabled,
+				terminalOutputLineLimit,
 			}
 
-			pushToolResult(result)
+			try {
+				const [rejected, result] = await executeCommand(cline, options)
+
+				if (rejected) {
+					cline.didRejectTool = true
+				}
+
+				pushToolResult(result)
+			} catch (error: unknown) {
+				await cline.say("shell_integration_warning")
+				clineProvider?.setValue("terminalShellIntegrationDisabled", true)
+
+				if (error instanceof ShellIntegrationError) {
+					const [rejected, result] = await executeCommand(cline, {
+						...options,
+						terminalShellIntegrationDisabled: true,
+					})
+
+					if (rejected) {
+						cline.didRejectTool = true
+					}
+
+					pushToolResult(result)
+				} else {
+					pushToolResult(`Command failed to execute in terminal due to a shell integration error.`)
+				}
+			}
 
 			return
 		}
@@ -68,10 +101,21 @@ export async function executeCommandTool(
 	}
 }
 
+export type ExecuteCommandOptions = {
+	command: string
+	customCwd?: string
+	terminalShellIntegrationDisabled?: boolean
+	terminalOutputLineLimit?: number
+}
+
 export async function executeCommand(
 	cline: Cline,
-	command: string,
-	customCwd?: string,
+	{
+		command,
+		customCwd,
+		terminalShellIntegrationDisabled = false,
+		terminalOutputLineLimit = 500,
+	}: ExecuteCommandOptions,
 ): Promise<[boolean, ToolResponse]> {
 	let workingDir: string
 
@@ -94,13 +138,11 @@ export async function executeCommand(
 	let completed = false
 	let result: string = ""
 	let exitDetails: ExitCodeDetails | undefined
+	let shellIntegrationError: string | undefined
 
-	const clineProvider = await cline.providerRef.deref()
-	const clineProviderState = await clineProvider?.getState()
-	const { terminalOutputLineLimit = 500, terminalShellIntegrationDisabled = false } = clineProviderState ?? {}
 	const terminalProvider = terminalShellIntegrationDisabled ? "execa" : "vscode"
 
-	const callbacks = {
+	const callbacks: RooTerminalCallbacks = {
 		onLine: async (output: string, process: RooTerminalProcess) => {
 			const compressed = Terminal.compressTerminalOutput(output, terminalOutputLineLimit)
 			cline.say("command_output", compressed)
@@ -123,13 +165,14 @@ export async function executeCommand(
 			result = Terminal.compressTerminalOutput(output ?? "", terminalOutputLineLimit)
 			completed = true
 		},
-		onShellExecutionComplete: (details: ExitCodeDetails) => {
-			exitDetails = details
-		},
-		onNoShellIntegration: async (message: string) => {
+		onShellExecutionComplete: (details: ExitCodeDetails) => (exitDetails = details),
+	}
+
+	if (terminalProvider === "vscode") {
+		callbacks.onNoShellIntegration = async (error: string) => {
 			telemetryService.captureShellIntegrationError(cline.taskId)
-			await cline.say("shell_integration_warning", message)
-		},
+			shellIntegrationError = error
+		}
 	}
 
 	const terminal = await TerminalRegistry.getOrCreateTerminal(workingDir, !!customCwd, cline.taskId, terminalProvider)
@@ -149,6 +192,10 @@ export async function executeCommand(
 	await process
 	cline.terminalProcess = undefined
 
+	if (shellIntegrationError) {
+		throw new ShellIntegrationError(shellIntegrationError)
+	}
+
 	// Wait for a short delay to ensure all messages are sent to the webview.
 	// This delay allows time for non-awaited promises to be created and
 	// for their associated messages to be sent to the webview, maintaining

src/core/webview/ClineProvider.ts

@@ -1503,8 +1503,10 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 
 		// Add model ID if available
 		const currentCline = this.getCurrentCline()
+
 		if (currentCline?.api) {
 			const { id: modelId } = currentCline.api.getModel()
+
 			if (modelId) {
 				properties.modelId = modelId
 			}