gsd-pi 2.67.0-dev.2142d3e → 2.67.0-dev.2367d7e

package/scripts/link-workspace-packages.cjs

@@ -2,7 +2,8 @@
 /**
  * link-workspace-packages.cjs
  *
- * Creates node_modules/@gsd/* symlinks pointing to packages/* directories.
+ * Creates node_modules/@gsd/* and node_modules/@gsd-build/* symlinks pointing
+ * to shipped packages/* directories.
  *
  * During development, npm workspaces creates these automatically. But in the
  * published tarball, workspace packages are shipped under packages/ (via the
@@ -20,27 +21,33 @@ const { resolve, join } = require('path')
 
 const root = resolve(__dirname, '..')
 const packagesDir = join(root, 'packages')
-const nodeModulesGsd = join(root, 'node_modules', '@gsd')
+const scopeDirs = {
+  '@gsd': join(root, 'node_modules', '@gsd'),
+  '@gsd-build': join(root, 'node_modules', '@gsd-build'),
+}
 
-// Map directory names to package names
+// Map directory names to scoped package names
 const packageMap = {
-  'native': 'native',
-  'pi-agent-core': 'pi-agent-core',
-  'pi-ai': 'pi-ai',
-  'pi-coding-agent': 'pi-coding-agent',
-  'pi-tui': 'pi-tui',
+  'native': { scope: '@gsd', name: 'native' },
+  'pi-agent-core': { scope: '@gsd', name: 'pi-agent-core' },
+  'pi-ai': { scope: '@gsd', name: 'pi-ai' },
+  'pi-coding-agent': { scope: '@gsd', name: 'pi-coding-agent' },
+  'pi-tui': { scope: '@gsd', name: 'pi-tui' },
+  'rpc-client': { scope: '@gsd-build', name: 'rpc-client' },
 }
 
-// Ensure @gsd scope directory exists
-if (!existsSync(nodeModulesGsd)) {
-  mkdirSync(nodeModulesGsd, { recursive: true })
+for (const scopeDir of Object.values(scopeDirs)) {
+  if (!existsSync(scopeDir)) {
+    mkdirSync(scopeDir, { recursive: true })
+  }
 }
 
 let linked = 0
 let copied = 0
-for (const [dir, name] of Object.entries(packageMap)) {
+for (const [dir, pkg] of Object.entries(packageMap)) {
   const source = join(packagesDir, dir)
-  const target = join(nodeModulesGsd, name)
+  const scopeDir = scopeDirs[pkg.scope]
+  const target = join(scopeDir, pkg.name)
 
   if (!existsSync(source)) continue
 
@@ -50,7 +57,7 @@ for (const [dir, name] of Object.entries(packageMap)) {
       const stat = lstatSync(target)
       if (stat.isSymbolicLink()) {
         const linkTarget = readlinkSync(target)
-        if (resolve(join(nodeModulesGsd, linkTarget)) === source || linkTarget === source) {
+        if (resolve(join(scopeDir, linkTarget)) === source || linkTarget === source) {
           continue // Already correct
         }
         unlinkSync(target) // Wrong target, relink

package/src/resources/extensions/claude-code-cli/stream-adapter.ts

@@ -14,6 +14,7 @@ import type {
 	Context,
 	Model,
 	SimpleStreamOptions,
+	ToolCall,
 } from "@gsd/pi-ai";
 import { EventStream } from "@gsd/pi-ai";
 import { execSync } from "node:child_process";
@@ -24,8 +25,26 @@ import type {
 	SDKMessage,
 	SDKPartialAssistantMessage,
 	SDKResultMessage,
+	SDKUserMessage,
 } from "./sdk-types.js";
 
+export interface ExternalToolResultContentBlock {
+	type: string;
+	text?: string;
+	data?: string;
+	mimeType?: string;
+}
+
+export interface ExternalToolResultPayload {
+	content: ExternalToolResultContentBlock[];
+	details?: Record<string, unknown>;
+	isError: boolean;
+}
+
+type ToolCallWithExternalResult = ToolCall & {
+	externalResult?: ExternalToolResultPayload;
+};
+
 // ---------------------------------------------------------------------------
 // Stream factory
 // ---------------------------------------------------------------------------
@@ -153,89 +172,6 @@ export function makeStreamExhaustedErrorMessage(model: string, lastTextContent:
 	return message;
 }
 
-/**
- * Claude Code executes its own internal tool loop inside the SDK call. The
- * streamed and final assistant messages should therefore contain only
- * user-facing content (text/thinking), not replayable tool blocks that GSD
- * would render again.
- */
-function isUserFacingClaudeCodeBlock(block: AssistantMessage["content"][number]): boolean {
-	return block.type === "text" || block.type === "thinking";
-}
-
-function filterUserFacingClaudeCodeContent(
-	blocks: AssistantMessage["content"],
-): AssistantMessage["content"] {
-	return blocks.filter(isUserFacingClaudeCodeBlock);
-}
-
-function remapClaudeCodeContentIndex(
-	blocks: AssistantMessage["content"],
-	contentIndex: number,
-): number {
-	let visibleCount = 0;
-	for (let i = 0; i <= contentIndex && i < blocks.length; i++) {
-		if (isUserFacingClaudeCodeBlock(blocks[i]!)) visibleCount++;
-	}
-	return Math.max(0, visibleCount - 1);
-}
-
-function sanitizeClaudeCodePartial(
-	partial: AssistantMessage,
-): AssistantMessage {
-	return {
-		...partial,
-		content: filterUserFacingClaudeCodeContent(partial.content),
-	};
-}
-
-export function sanitizeClaudeCodeStreamingEvent(
-	event: AssistantMessageEvent,
-): AssistantMessageEvent | null {
-	switch (event.type) {
-		case "toolcall_start":
-		case "toolcall_delta":
-		case "toolcall_end":
-		case "server_tool_use":
-		case "web_search_result":
-			return null;
-		case "text_start":
-		case "text_delta":
-		case "text_end":
-		case "thinking_start":
-		case "thinking_delta":
-		case "thinking_end":
-			return {
-				...event,
-				contentIndex: remapClaudeCodeContentIndex(event.partial.content, event.contentIndex),
-				partial: sanitizeClaudeCodePartial(event.partial),
-			};
-		default:
-			return event;
-	}
-}
-
-export function buildFinalClaudeCodeContent(
-	blocks: AssistantMessage["content"],
-	lastThinkingContent: string,
-	lastTextContent: string,
-	resultText?: string,
-): AssistantMessage["content"] {
-	const finalContent = filterUserFacingClaudeCodeContent(blocks);
-	if (finalContent.length > 0) return finalContent;
-
-	if (lastThinkingContent) {
-		finalContent.push({ type: "thinking", thinking: lastThinkingContent });
-	}
-	if (lastTextContent) {
-		finalContent.push({ type: "text", text: lastTextContent });
-	}
-	if (finalContent.length === 0 && resultText) {
-		finalContent.push({ type: "text", text: resultText });
-	}
-	return finalContent;
-}
-
 // ---------------------------------------------------------------------------
 // SDK options builder
 // ---------------------------------------------------------------------------
@@ -263,6 +199,110 @@ export function buildSdkOptions(modelId: string, prompt: string): Record<string,
 	};
 }
 
+function normalizeToolResultContent(content: unknown): ExternalToolResultContentBlock[] {
+	if (typeof content === "string") {
+		return [{ type: "text", text: content }];
+	}
+
+	if (!Array.isArray(content)) {
+		if (content == null) return [{ type: "text", text: "" }];
+		return [{ type: "text", text: JSON.stringify(content) }];
+	}
+
+	const blocks: ExternalToolResultContentBlock[] = [];
+
+	for (const item of content) {
+		if (typeof item === "string") {
+			blocks.push({ type: "text", text: item });
+			continue;
+		}
+		if (!item || typeof item !== "object") {
+			blocks.push({ type: "text", text: String(item) });
+			continue;
+		}
+
+		const block = item as Record<string, unknown>;
+		if (block.type === "text") {
+			blocks.push({ type: "text", text: typeof block.text === "string" ? block.text : "" });
+			continue;
+		}
+		if (
+			block.type === "image"
+			&& typeof block.data === "string"
+			&& typeof block.mimeType === "string"
+		) {
+			blocks.push({ type: "image", data: block.data, mimeType: block.mimeType });
+			continue;
+		}
+
+		blocks.push({ type: "text", text: JSON.stringify(block) });
+	}
+
+	return blocks.length > 0 ? blocks : [{ type: "text", text: "" }];
+}
+
+export function extractToolResultsFromSdkUserMessage(message: SDKUserMessage): Array<{
+	toolUseId: string;
+	result: ExternalToolResultPayload;
+}> {
+	const extracted: Array<{ toolUseId: string; result: ExternalToolResultPayload }> = [];
+	const seen = new Set<string>();
+	const rawMessage = message.message as Record<string, unknown> | null | undefined;
+	const content = Array.isArray(rawMessage?.content) ? rawMessage.content : [];
+
+	for (const item of content) {
+		if (!item || typeof item !== "object") continue;
+		const block = item as Record<string, unknown>;
+		const type = typeof block.type === "string" ? block.type : "";
+		if (type !== "tool_result" && type !== "mcp_tool_result") continue;
+
+		const toolUseId = typeof block.tool_use_id === "string" ? block.tool_use_id : "";
+		if (!toolUseId || seen.has(toolUseId)) continue;
+		seen.add(toolUseId);
+
+		extracted.push({
+			toolUseId,
+			result: {
+				content: normalizeToolResultContent(block.content),
+				details: {},
+				isError: block.is_error === true,
+			},
+		});
+	}
+
+	if (extracted.length === 0) {
+		const fallback = message.tool_use_result;
+		if (fallback && typeof fallback === "object") {
+			const toolResult = fallback as Record<string, unknown>;
+			const toolUseId = typeof toolResult.tool_use_id === "string" ? toolResult.tool_use_id : "";
+			if (toolUseId) {
+				extracted.push({
+					toolUseId,
+					result: {
+						content: normalizeToolResultContent(toolResult.content),
+						details: {},
+						isError: toolResult.is_error === true,
+					},
+				});
+			}
+		}
+	}
+
+	return extracted;
+}
+
+function attachExternalResultsToToolCalls(
+	toolCalls: AssistantMessage["content"],
+	toolResultsById: ReadonlyMap<string, ExternalToolResultPayload>,
+): void {
+	for (const block of toolCalls) {
+		if (block.type !== "toolCall") continue;
+		const externalResult = toolResultsById.get(block.id);
+		if (!externalResult) continue;
+		(block as ToolCallWithExternalResult).externalResult = externalResult;
+	}
+}
+
 // ---------------------------------------------------------------------------
 // streamSimple implementation
 // ---------------------------------------------------------------------------
@@ -297,6 +337,10 @@ async function pumpSdkMessages(
 	/** Track the last text content seen across all assistant turns for the final message. */
 	let lastTextContent = "";
 	let lastThinkingContent = "";
+	/** Collect tool calls from intermediate SDK turns for tool_execution events. */
+	const intermediateToolCalls: AssistantMessage["content"] = [];
+	/** Preserve real external tool results from Claude Code's synthetic user messages. */
+	const toolResultsById = new Map<string, ExternalToolResultPayload>();
 
 	try {
 		// Dynamic import — the SDK is an optional dependency.
@@ -365,10 +409,9 @@ async function pumpSdkMessages(
 					if (!builder) break;
 
 					const assistantEvent = builder.handleEvent(event);
-					const sanitizedEvent = assistantEvent
-						? sanitizeClaudeCodeStreamingEvent(assistantEvent)
-						: null;
-					if (sanitizedEvent) stream.push(sanitizedEvent);
+					if (assistantEvent) {
+						stream.push(assistantEvent);
+					}
 					break;
 				}
 
@@ -396,9 +439,39 @@ async function pumpSdkMessages(
 								lastTextContent = block.text;
 							} else if (block.type === "thinking" && block.thinking) {
 								lastThinkingContent = block.thinking;
+							} else if (block.type === "toolCall") {
+								// Collect tool calls for externalToolExecution rendering
+								intermediateToolCalls.push(block);
 							}
 						}
 					}
+
+					// Extract tool results from the SDK's synthetic user message
+					// and attach to corresponding tool call blocks immediately.
+					for (const { toolUseId, result } of extractToolResultsFromSdkUserMessage(msg as SDKUserMessage)) {
+						toolResultsById.set(toolUseId, result);
+					}
+					attachExternalResultsToToolCalls(intermediateToolCalls, toolResultsById);
+
+					// Push a synthetic toolcall_end for each tool call from this turn
+					// so the TUI can render tool results in real-time during the SDK
+					// session instead of waiting until the entire session completes.
+					if (builder) {
+						for (const block of builder.message.content) {
+							if (block.type !== "toolCall") continue;
+							const extResult = (block as ToolCallWithExternalResult).externalResult;
+							if (!extResult) continue;
+							// Push a toolcall_end with result attached so the chat-controller
+							// can call updateResult on the pending ToolExecutionComponent.
+							stream.push({
+								type: "toolcall_end",
+								contentIndex: builder.message.content.indexOf(block),
+								toolCall: block,
+								partial: builder.message,
+							});
+						}
+					}
+
 					builder = null;
 					break;
 				}
@@ -406,12 +479,36 @@ async function pumpSdkMessages(
 				// -- Result (terminal) --
 				case "result": {
 					const result = msg as SDKResultMessage;
-					const finalContent = buildFinalClaudeCodeContent(
-						builder?.message.content ?? [],
-						lastThinkingContent,
-						lastTextContent,
-						result.subtype === "success" ? result.result : undefined,
-					);
+
+					// Build final message. Include intermediate tool calls so the
+					// agent loop's externalToolExecution path emits tool_execution
+					// events for proper TUI rendering, followed by the text response.
+					const finalContent: AssistantMessage["content"] = [];
+
+					// Add tool calls from intermediate turns first (renders above text)
+					attachExternalResultsToToolCalls(intermediateToolCalls, toolResultsById);
+					finalContent.push(...intermediateToolCalls);
+
+					// Add text/thinking from the last turn
+					if (builder && builder.message.content.length > 0) {
+						for (const block of builder.message.content) {
+							if (block.type === "text" || block.type === "thinking") {
+								finalContent.push(block);
+							}
+						}
+					} else {
+						if (lastThinkingContent) {
+							finalContent.push({ type: "thinking", thinking: lastThinkingContent });
+						}
+						if (lastTextContent) {
+							finalContent.push({ type: "text", text: lastTextContent });
+						}
+					}
+
+					// Fallback: use the SDK's result text if we have no content
+					if (finalContent.length === 0 && result.subtype === "success" && result.result) {
+						finalContent.push({ type: "text", text: result.result });
+					}
 
 					const finalMessage: AssistantMessage = {
 						role: "assistant",

package/src/resources/extensions/claude-code-cli/tests/stream-adapter.test.ts

@@ -4,15 +4,15 @@ import { mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "nod
 import { join, resolve } from "node:path";
 import { tmpdir } from "node:os";
 import {
+	makeStreamExhaustedErrorMessage,
 	buildPromptFromContext,
-	buildFinalClaudeCodeContent,
 	buildSdkOptions,
+	extractToolResultsFromSdkUserMessage,
 	getClaudeLookupCommand,
-	makeStreamExhaustedErrorMessage,
 	parseClaudeLookupOutput,
-	sanitizeClaudeCodeStreamingEvent,
 } from "../stream-adapter.ts";
-import type { AssistantMessage, Context, Message } from "@gsd/pi-ai";
+import type { Context, Message } from "@gsd/pi-ai";
+import type { SDKUserMessage } from "../sdk-types.ts";
 
 // ---------------------------------------------------------------------------
 // Existing tests — exhausted stream fallback (#2575)
@@ -108,6 +108,65 @@ describe("stream-adapter — full context prompt (#2859)", () => {
 	});
 });
 
+describe("stream-adapter — Claude Code external tool results", () => {
+	test("extractToolResultsFromSdkUserMessage maps tool_result content to tool payloads", () => {
+		const message: SDKUserMessage = {
+			type: "user",
+			session_id: "sess-1",
+			parent_tool_use_id: "tool-bash-1",
+			message: {
+				role: "user",
+				content: [
+					{
+						type: "tool_result",
+						tool_use_id: "tool-bash-1",
+						content: "line 1\nline 2",
+						is_error: false,
+					},
+				],
+			},
+		};
+
+		const results = extractToolResultsFromSdkUserMessage(message);
+		assert.deepEqual(results, [
+			{
+				toolUseId: "tool-bash-1",
+				result: {
+					content: [{ type: "text", text: "line 1\nline 2" }],
+					details: {},
+					isError: false,
+				},
+			},
+		]);
+	});
+
+	test("extractToolResultsFromSdkUserMessage falls back to tool_use_result", () => {
+		const message: SDKUserMessage = {
+			type: "user",
+			session_id: "sess-1",
+			parent_tool_use_id: "tool-read-1",
+			message: { role: "user", content: [] },
+			tool_use_result: {
+				tool_use_id: "tool-read-1",
+				content: "file contents",
+				is_error: true,
+			},
+		};
+
+		const results = extractToolResultsFromSdkUserMessage(message);
+		assert.deepEqual(results, [
+			{
+				toolUseId: "tool-read-1",
+				result: {
+					content: [{ type: "text", text: "file contents" }],
+					details: {},
+					isError: true,
+				},
+			},
+		]);
+	});
+});
+
 describe("stream-adapter — session persistence (#2859)", () => {
 	test("buildSdkOptions enables persistSession by default", () => {
 		const options = buildSdkOptions("claude-sonnet-4-20250514", "test prompt");
@@ -149,18 +208,15 @@ describe("stream-adapter — session persistence (#2859)", () => {
 			process.env.GSD_WORKFLOW_MCP_CWD = "/tmp/project";
 
 			const options = buildSdkOptions("claude-sonnet-4-20250514", "test");
-			assert.deepEqual(options.mcpServers, {
-				"gsd-workflow": {
-					command: "node",
-					args: ["packages/mcp-server/dist/cli.js"],
-					env: {
-						GSD_CLI_PATH: "/tmp/gsd",
-						GSD_PERSIST_WRITE_GATE_STATE: "1",
-						GSD_WORKFLOW_PROJECT_ROOT: "/tmp/project",
-					},
-					cwd: "/tmp/project",
-				},
-			});
+			const mcpServers = options.mcpServers as Record<string, any>;
+			assert.ok(mcpServers?.["gsd-workflow"], "expected gsd-workflow server config");
+			const srv = mcpServers["gsd-workflow"];
+			assert.equal(srv.command, "node");
+			assert.deepEqual(srv.args, ["packages/mcp-server/dist/cli.js"]);
+			assert.equal(srv.cwd, "/tmp/project");
+			assert.equal(srv.env.GSD_CLI_PATH, "/tmp/gsd");
+			assert.equal(srv.env.GSD_PERSIST_WRITE_GATE_STATE, "1");
+			assert.equal(srv.env.GSD_WORKFLOW_PROJECT_ROOT, "/tmp/project");
 		} finally {
 			process.env.GSD_WORKFLOW_MCP_COMMAND = prev.GSD_WORKFLOW_MCP_COMMAND;
 			process.env.GSD_WORKFLOW_MCP_NAME = prev.GSD_WORKFLOW_MCP_NAME;
@@ -170,7 +226,7 @@ describe("stream-adapter — session persistence (#2859)", () => {
 		}
 	});
 
-	test("buildSdkOptions omits workflow MCP server config when env is unset", () => {
+	test("buildSdkOptions auto-discovers bundled MCP server even without env hints", () => {
 		const prev = {
 			GSD_WORKFLOW_MCP_COMMAND: process.env.GSD_WORKFLOW_MCP_COMMAND,
 			GSD_WORKFLOW_MCP_NAME: process.env.GSD_WORKFLOW_MCP_NAME,
@@ -190,7 +246,13 @@ describe("stream-adapter — session persistence (#2859)", () => {
 			process.chdir(emptyDir);
 			const options = buildSdkOptions("claude-sonnet-4-20250514", "test");
 			process.chdir(originalCwd);
-			assert.equal((options as any).mcpServers, undefined);
+			// The bundled CLI may or may not be discoverable depending on
+			// whether the build output exists relative to import.meta.url.
+			// Either outcome is valid — the key invariant is no crash.
+			const mcpServers = (options as any).mcpServers;
+			if (mcpServers) {
+				assert.ok(mcpServers["gsd-workflow"], "if present, must be gsd-workflow");
+			}
 			rmSync(emptyDir, { recursive: true, force: true });
 		} finally {
 			process.env.GSD_WORKFLOW_MCP_COMMAND = prev.GSD_WORKFLOW_MCP_COMMAND;
@@ -227,18 +289,15 @@ describe("stream-adapter — session persistence (#2859)", () => {
 			const resolvedRepoDir = realpathSync(repoDir);
 
 			const options = buildSdkOptions("claude-sonnet-4-20250514", "test");
-			assert.deepEqual(options.mcpServers, {
-				"gsd-workflow": {
-					command: process.execPath,
-					args: [realpathSync(resolve(repoDir, "packages", "mcp-server", "dist", "cli.js"))],
-					env: {
-						GSD_CLI_PATH: "/tmp/gsd",
-						GSD_PERSIST_WRITE_GATE_STATE: "1",
-						GSD_WORKFLOW_PROJECT_ROOT: resolvedRepoDir,
-					},
-					cwd: resolvedRepoDir,
-				},
-			});
+			const mcpServers = options.mcpServers as Record<string, any>;
+			assert.ok(mcpServers?.["gsd-workflow"], "expected gsd-workflow server config");
+			const srv = mcpServers["gsd-workflow"];
+			assert.equal(srv.command, process.execPath);
+			assert.deepEqual(srv.args, [realpathSync(resolve(repoDir, "packages", "mcp-server", "dist", "cli.js"))]);
+			assert.equal(srv.cwd, resolvedRepoDir);
+			assert.equal(srv.env.GSD_CLI_PATH, "/tmp/gsd");
+			assert.equal(srv.env.GSD_PERSIST_WRITE_GATE_STATE, "1");
+			assert.equal(srv.env.GSD_WORKFLOW_PROJECT_ROOT, resolvedRepoDir);
 		} finally {
 			process.chdir(originalCwd);
 			rmSync(repoDir, { recursive: true, force: true });
@@ -252,92 +311,6 @@ describe("stream-adapter — session persistence (#2859)", () => {
 	});
 });
 
-describe("stream-adapter — final content filtering (#3861)", () => {
-	test("buildFinalClaudeCodeContent strips intermediate tool calls from the final assistant message", () => {
-		const finalContent = buildFinalClaudeCodeContent(
-			[
-				{ type: "toolCall", id: "tc_1", name: "Read", arguments: {} },
-				{ type: "thinking", thinking: "Planning next step" },
-				{ type: "text", text: "Done." },
-			] as any,
-			"",
-			"",
-		);
-
-		assert.deepEqual(finalContent, [
-			{ type: "thinking", thinking: "Planning next step" },
-			{ type: "text", text: "Done." },
-		]);
-	});
-
-	test("buildFinalClaudeCodeContent falls back to cached text when the final turn only had tool calls", () => {
-		const finalContent = buildFinalClaudeCodeContent(
-			[
-				{ type: "toolCall", id: "tc_2", name: "Edit", arguments: { file_path: "app.ts" } },
-			] as any,
-			"",
-			"User-facing answer",
-		);
-
-		assert.deepEqual(finalContent, [{ type: "text", text: "User-facing answer" }]);
-	});
-});
-
-describe("stream-adapter — streaming content filtering follow-up (#3867)", () => {
-	function makePartial(content: AssistantMessage["content"]): AssistantMessage {
-		return {
-			role: "assistant",
-			content,
-			api: "anthropic-messages",
-			provider: "claude-code",
-			model: "claude-sonnet-4-20250514",
-			usage: {
-				input: 0,
-				output: 0,
-				cacheRead: 0,
-				cacheWrite: 0,
-				totalTokens: 0,
-				cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-			},
-			stopReason: "stop",
-			timestamp: Date.now(),
-		};
-	}
-
-	test("sanitizeClaudeCodeStreamingEvent strips tool calls from streamed partials and remaps contentIndex", () => {
-		const event = sanitizeClaudeCodeStreamingEvent({
-			type: "text_delta",
-			contentIndex: 2,
-			delta: "Done.",
-			partial: makePartial([
-				{ type: "toolCall", id: "tc_1", name: "ToolSearch", arguments: {} },
-				{ type: "thinking", thinking: "Planning next step" },
-				{ type: "text", text: "Done." },
-			] as any),
-		});
-
-		assert.ok(event, "text events should still be forwarded");
-		assert.equal(event!.type, "text_delta");
-		assert.equal((event! as any).contentIndex, 1);
-		assert.deepEqual((event! as any).partial.content, [
-			{ type: "thinking", thinking: "Planning next step" },
-			{ type: "text", text: "Done." },
-		]);
-	});
-
-	test("sanitizeClaudeCodeStreamingEvent suppresses internal tool streaming events entirely", () => {
-		const event = sanitizeClaudeCodeStreamingEvent({
-			type: "toolcall_start",
-			contentIndex: 0,
-			partial: makePartial([
-				{ type: "toolCall", id: "tc_1", name: "Bash", arguments: {} },
-			] as any),
-		});
-
-		assert.equal(event, null);
-	});
-});
-
 describe("stream-adapter — Windows Claude path lookup (#3770)", () => {
 	test("getClaudeLookupCommand uses where on Windows", () => {
 		assert.equal(getClaudeLookupCommand("win32"), "where claude");