gsd-pi 2.67.0-dev.1cd1e0f → 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,17 +14,37 @@ import type {
 	Context,
 	Model,
 	SimpleStreamOptions,
+	ToolCall,
 } from "@gsd/pi-ai";
 import { EventStream } from "@gsd/pi-ai";
 import { execSync } from "node:child_process";
 import { PartialMessageBuilder, ZERO_USAGE, mapUsage } from "./partial-builder.js";
+import { buildWorkflowMcpServers } from "../gsd/workflow-mcp.js";
 import type {
 	SDKAssistantMessage,
 	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
 // ---------------------------------------------------------------------------
@@ -152,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
 // ---------------------------------------------------------------------------
@@ -246,6 +183,7 @@ export function buildFinalClaudeCodeContent(
  * beta flags, and other configuration without mocking the full SDK.
  */
 export function buildSdkOptions(modelId: string, prompt: string): Record<string, unknown> {
+	const mcpServers = buildWorkflowMcpServers();
 	return {
 		pathToClaudeCodeExecutable: getClaudePath(),
 		model: modelId,
@@ -256,10 +194,115 @@ export function buildSdkOptions(modelId: string, prompt: string): Record<string,
 		allowDangerouslySkipPermissions: true,
 		settingSources: ["project"],
 		systemPrompt: { type: "preset", preset: "claude_code" },
+		...(mcpServers ? { mcpServers } : {}),
 		betas: modelId.includes("sonnet") ? ["context-1m-2025-08-07"] : [],
 	};
 }
 
+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
 // ---------------------------------------------------------------------------
@@ -294,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.
@@ -362,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;
 				}
 
@@ -393,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;
 				}
@@ -403,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",