Merge branch 'main' into main

Author: F915

apps/vscode-e2e/fixtures/task-hello-world.json

@@ -2,13 +2,13 @@
 	"fixtures": [
 		{
 			"match": {
-				"userMessage": "Hello world, what is your name? Respond with 'My name is ...'"
+				"userMessage": "TASK_HELLO_WORLD_SMOKE"
 			},
 			"response": {
 				"toolCalls": [
 					{
 						"name": "attempt_completion",
-						"arguments": "{\"result\":\"My name is Zoo! I'm your AI coding assistant, here to help you with development tasks.\"}",
+						"arguments": "{\"result\":\"My name is Zoo.\"}",
 						"id": "call_task_hello_world_001"
 					}
 				]

apps/vscode-e2e/src/fixtures/subtasks.ts

@@ -177,9 +177,13 @@ export function addSubtaskFixtures(mock: InstanceType<typeof LLMock>) {
 		},
 	})
 
+	// Issue #561: parent prompt embeds SAME_CHILD_MARKER verbatim, so parent-resume turns
+	// also match a bare substring check. Exclude the parent marker to let them fall through.
 	mock.addFixture({
 		match: {
-			userMessage: new RegExp(SUBTASK_XPROFILE_SAME_CHILD_MARKER),
+			predicate: (req) =>
+				requestContains(req, [SUBTASK_XPROFILE_SAME_CHILD_MARKER]) &&
+				!requestContains(req, [SUBTASK_XPROFILE_PARENT_MARKER]),
 		},
 		response: {
 			toolCalls: [
@@ -212,6 +216,8 @@ export function addSubtaskFixtures(mock: InstanceType<typeof LLMock>) {
 		},
 	})
 
+	// Safe as bare regex: DIFFERENT_CHILD_MARKER is NOT embedded in SUBTASK_XPROFILE_PARENT_PROMPT,
+	// so parent-resume turns never contain it. If that ever changes, add an exclusion predicate.
 	mock.addFixture({
 		match: {
 			userMessage: new RegExp(SUBTASK_XPROFILE_DIFFERENT_CHILD_MARKER),

apps/vscode-e2e/src/suite/task.test.ts

@@ -21,7 +21,7 @@ suite("Roo Code Task", function () {
 
 		const taskId = await api.startNewTask({
 			configuration: { mode: "ask", alwaysAllowModeSwitch: true, autoApprovalEnabled: true },
-			text: "Hello world, what is your name? Respond with 'My name is ...'",
+			text: "TASK_HELLO_WORLD_SMOKE: what is your name?",
 		})
 
 		await waitUntilCompleted({ api, taskId })

knip.json

@@ -21,6 +21,7 @@
 				"@types/node-cache",
 				"@types/vscode",
 				"@vscode/codicons",
+				"@vscode/ripgrep",
 				"esbuild-wasm",
 				"sambanova-ai-provider",
 				"tree-sitter-wasms",

packages/types/src/providers/openai.ts

@@ -24,6 +24,32 @@ export const openAiNativeModels = {
 		description:
 			"GPT-5.1 Codex Max: Our most intelligent coding model optimized for long-horizon, agentic coding tasks",
 	},
+	"gpt-5.5": {
+		maxTokens: 128000,
+		contextWindow: 1_050_000,
+		includedTools: ["apply_patch"],
+		excludedTools: ["apply_diff", "write_to_file"],
+		supportsImages: true,
+		supportsPromptCache: true,
+		supportsReasoningEffort: ["none", "low", "medium", "high", "xhigh"],
+		reasoningEffort: "medium",
+		inputPrice: 5.0,
+		outputPrice: 30.0,
+		cacheReadsPrice: 0.5,
+		longContextPricing: {
+			thresholdTokens: 272_000,
+			inputPriceMultiplier: 2,
+			outputPriceMultiplier: 1.5,
+			appliesToServiceTiers: ["default", "flex"],
+		},
+		supportsVerbosity: true,
+		supportsTemperature: false,
+		tiers: [
+			{ name: "flex", contextWindow: 1_050_000, inputPrice: 2.5, outputPrice: 15.0, cacheReadsPrice: 0.25 },
+			{ name: "priority", contextWindow: 1_050_000, inputPrice: 12.5, outputPrice: 75.0, cacheReadsPrice: 1.25 },
+		],
+		description: "GPT-5.5: A new class of intelligence for coding and professional work",
+	},
 	"gpt-5.4": {
 		maxTokens: 128000,
 		contextWindow: 1_050_000,

packages/types/src/vscode.ts

@@ -46,6 +46,8 @@ export const commandIds = [
 	"acceptInput",
 	"focusPanel",
 	"toggleAutoApprove",
+
+	"showRipgrepDiagnostic",
 ] as const
 
 export type CommandId = (typeof commandIds)[number]

src/activate/__tests__/registerCommands.spec.ts

@@ -81,6 +81,10 @@ vi.mock("../../i18n", () => ({
 	t: (key: string) => key,
 }))
 
+vi.mock("../../services/ripgrep/diagnostic", () => ({
+	registerRipgrepDiagnosticCommand: vi.fn().mockReturnValue({ dispose: vi.fn() }),
+}))
+
 describe("getVisibleProviderOrLog", () => {
 	let mockOutputChannel: vscode.OutputChannel
 
@@ -172,6 +176,14 @@ describe("registerCommands handlers", () => {
 		setPanel(undefined, "tab")
 	})
 
+	it("registers the ripgrep diagnostic command and stores its disposable in context.subscriptions", async () => {
+		const { registerRipgrepDiagnosticCommand } = await import("../../services/ripgrep/diagnostic")
+		const mock = vi.mocked(registerRipgrepDiagnosticCommand)
+		const disposable = mock.mock.results[0]?.value
+		expect(mock).toHaveBeenCalled()
+		expect(mockContext.subscriptions).toContain(disposable)
+	})
+
 	it("settingsButtonClicked posts both settingsButtonClicked and didBecomeVisible actions", () => {
 		handlers["zoo-code.settingsButtonClicked"]()
 

src/activate/registerCommands.ts

@@ -13,6 +13,7 @@ import { handleNewTask } from "./handleTask"
 import { CodeIndexManager } from "../services/code-index/manager"
 import { importSettingsWithFeedback } from "../core/config/importExport"
 import { MdmService } from "../services/mdm/MdmService"
+import { registerRipgrepDiagnosticCommand } from "../services/ripgrep/diagnostic"
 import { t } from "../i18n"
 
 /**
@@ -68,9 +69,27 @@ export const registerCommands = (options: RegisterCommandOptions) => {
 		const command = getCommand(id as CommandId)
 		context.subscriptions.push(vscode.commands.registerCommand(command, callback))
 	}
+
+	context.subscriptions.push(registerRipgrepDiagnosticCommand())
 }
 
-const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOptions): Record<CommandId, any> => ({
+// `showRipgrepDiagnostic` is registered separately by
+// `registerRipgrepDiagnosticCommand` (above), which owns the OutputChannel
+// lifecycle alongside the command registration, so it's intentionally
+// excluded from this map.
+//
+// Callback shape mirrors VS Code's own `commands.registerCommand` signature
+// (`(...args: any[]) => any`), with the return narrowed to `unknown` so
+// callers must inspect before using. `any[]` for args is unavoidable: the
+// callbacks here are heterogeneous (`importSettings` takes an optional
+// `filePath?: string`, others take none) and VS Code dispatches positional
+// args dynamically.
+type CommandCallback = (...args: any[]) => unknown
+const getCommandsMap = ({
+	context,
+	outputChannel,
+	provider,
+}: RegisterCommandOptions): Record<Exclude<CommandId, "showRipgrepDiagnostic">, CommandCallback> => ({
 	activationCompleted: () => {},
 	plusButtonClicked: async () => {
 		const visibleProvider = getVisibleProviderOrLog(outputChannel)

src/api/providers/__tests__/openai-native.spec.ts

@@ -267,6 +267,21 @@ describe("OpenAiNativeHandler", () => {
 			expect(modelInfo.info.supportsReasoningEffort).toEqual(["low", "medium", "high", "xhigh"])
 		})
 
+		it("should return GPT-5.5 model info when selected", () => {
+			const gpt55Handler = new OpenAiNativeHandler({
+				...mockOptions,
+				apiModelId: "gpt-5.5",
+			})
+
+			const modelInfo = gpt55Handler.getModel()
+			expect(modelInfo.id).toBe("gpt-5.5")
+			expect(modelInfo.info.maxTokens).toBe(128000)
+			expect(modelInfo.info.contextWindow).toBe(1_050_000)
+			expect(modelInfo.info.supportsVerbosity).toBe(true)
+			expect(modelInfo.info.supportsReasoningEffort).toEqual(["none", "low", "medium", "high", "xhigh"])
+			expect(modelInfo.info.reasoningEffort).toBe("medium")
+		})
+
 		it("should return GPT-5.4 model info when selected", () => {
 			const gpt54Handler = new OpenAiNativeHandler({
 				...mockOptions,
@@ -430,6 +445,56 @@ describe("OpenAiNativeHandler", () => {
 			expect(textChunks[1].text).toBe(" world")
 		})
 
+		it("should handle GPT-5.5 model with Responses API", async () => {
+			const mockFetch = vitest.fn().mockResolvedValue({
+				ok: true,
+				body: new ReadableStream({
+					start(controller) {
+						controller.enqueue(
+							new TextEncoder().encode(
+								'data: {"type":"response.output_item.added","item":{"type":"text","text":"GPT-5.5 reply"}}\n\n',
+							),
+						)
+						controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n"))
+						controller.close()
+					},
+				}),
+			})
+			global.fetch = mockFetch as any
+
+			mockResponsesCreate.mockRejectedValue(new Error("SDK not available"))
+
+			handler = new OpenAiNativeHandler({
+				...mockOptions,
+				apiModelId: "gpt-5.5",
+			})
+
+			const stream = handler.createMessage(systemPrompt, messages)
+			const chunks: any[] = []
+			for await (const chunk of stream) {
+				chunks.push(chunk)
+			}
+
+			expect(mockFetch).toHaveBeenCalledWith(
+				"https://api.openai.com/v1/responses",
+				expect.objectContaining({
+					body: expect.any(String),
+				}),
+			)
+			const body = (mockFetch.mock.calls[0][1] as any).body as string
+			const parsedBody = JSON.parse(body)
+			expect(parsedBody.model).toBe("gpt-5.5")
+			expect(parsedBody.max_output_tokens).toBe(128000)
+			expect(parsedBody.temperature).toBeUndefined()
+			expect(parsedBody.include).toEqual(["reasoning.encrypted_content"])
+			expect(parsedBody.reasoning?.effort).toBe("medium")
+			expect(parsedBody.text?.verbosity).toBe("medium")
+
+			const textChunks = chunks.filter((chunk) => chunk.type === "text")
+			expect(textChunks).toHaveLength(1)
+			expect(textChunks[0].text).toBe("GPT-5.5 reply")
+		})
+
 		it("should handle GPT-5.4 model with Responses API", async () => {
 			const mockFetch = vitest.fn().mockResolvedValue({
 				ok: true,

src/esbuild.mjs

@@ -126,7 +126,7 @@ async function main() {
 		// global-agent must be external because it dynamically patches Node.js http/https modules
 		// which breaks when bundled. It needs access to the actual Node.js module instances.
 		// undici must be bundled because our VSIX is packaged with `--no-dependencies`.
-		external: ["vscode", "esbuild", "global-agent"],
+		external: ["vscode", "esbuild", "global-agent", "@vscode/ripgrep"],
 	}
 
 	/**