gsd-pi 2.67.0-dev.5399650 → 2.67.0-dev.6fc2289

package/packages/pi-coding-agent/src/modes/interactive/controllers/input-controller.ts

@@ -1,17 +1,21 @@
 import { dispatchSlashCommand } from "../slash-command-handlers.js";
 import type { InteractiveModeStateHost } from "../interactive-mode-state.js";
+import type { ContextualTips } from "../../../core/contextual-tips.js";
 
 export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 	getSlashCommandContext: () => any;
 	handleBashCommand: (command: string, excludeFromContext?: boolean) => Promise<void>;
 	showWarning: (message: string) => void;
 	showError: (message: string) => void;
+	showTip: (message: string) => void;
 	updateEditorBorderColor: () => void;
 	isExtensionCommand: (text: string) => boolean;
 	isKnownSlashCommand: (text: string) => boolean;
 	queueCompactionMessage: (text: string, mode: "steer" | "followUp") => void;
 	updatePendingMessagesDisplay: () => void;
 	flushPendingBashComponents: () => void;
+	contextualTips: ContextualTips;
+	getContextPercent: () => number | undefined;
 	options?: { submitPromptsDirectly?: boolean };
 }): void {
 	host.defaultEditor.onSubmit = async (text: string) => {
@@ -41,6 +45,10 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 					host.editor.setText(text);
 					return;
 				}
+				// Track included bash commands for double-bang tip
+				if (!isExcluded) {
+					host.contextualTips.recordBashIncluded();
+				}
 				host.editor.addToHistory?.(text);
 				await host.handleBashCommand(command, isExcluded);
 				host.isBashMode = false;
@@ -49,6 +57,17 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 			}
 		}
 
+		// Evaluate contextual tips before sending to agent
+		const tip = host.contextualTips.evaluate({
+			input: text,
+			isStreaming: host.session.isStreaming,
+			thinkingLevel: host.session.thinkingLevel,
+			contextPercent: host.getContextPercent(),
+		});
+		if (tip) {
+			host.showTip(tip);
+		}
+
 		if (host.session.isCompacting) {
 			if (host.isExtensionCommand(text)) {
 				host.editor.addToHistory?.(text);

package/packages/pi-coding-agent/src/modes/interactive/interactive-mode.ts

@@ -82,7 +82,6 @@ import { LoginDialogComponent } from "./components/login-dialog.js";
 import { ModelSelectorComponent, providerDisplayName } from "./components/model-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
 import { ProviderManagerComponent } from "./components/provider-manager.js";
-import { getProviderSetupAction } from "./provider-auth-setup.js";
 import { ScopedModelsSelectorComponent } from "./components/scoped-models-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
 import { SettingsSelectorComponent } from "./components/settings-selector.js";
@@ -91,6 +90,7 @@ import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
+import { ContextualTips } from "../../core/contextual-tips.js";
 import { type SlashCommandContext, dispatchSlashCommand, getAppKeyDisplay } from "./slash-command-handlers.js";
 import { handleAgentEvent } from "./controllers/chat-controller.js";
 import { createExtensionUIContext as buildExtensionUIContext } from "./controllers/extension-ui-controller.js";
@@ -215,6 +215,9 @@ export class InteractiveMode {
 	// Track if editor is in bash mode (text starts with !)
 	private isBashMode = false;
 
+	// Contextual tips — session-scoped, non-intrusive hints
+	private contextualTips = new ContextualTips();
+
 	// Track current bash execution component
 	private bashComponent: BashExecutionComponent | undefined = undefined;
 
@@ -2594,6 +2597,16 @@ export class InteractiveMode {
 		this.ui.requestRender();
 	}
 
+	showTip(message: string): void {
+		this.chatContainer.addChild(new Spacer(1));
+		this.chatContainer.addChild(new Text(theme.fg("dim", `💡 ${message}`), 1, 0));
+		this.ui.requestRender();
+	}
+
+	getContextPercent(): number | undefined {
+		return this.session.getContextUsage()?.percent ?? undefined;
+	}
+
 	showNewVersionNotification(newVersion: string): void {
 		const action = theme.fg("accent", getUpdateInstruction("@gsd/pi-coding-agent"));
 		const updateInstruction = theme.fg("muted", `New version ${newVersion} is available. `) + action;
@@ -3413,21 +3426,9 @@ export class InteractiveMode {
 					this.ui.requestRender();
 				},
 				async (provider: string) => {
+					// Enter key → auth setup for selected provider (#3579)
 					done();
-
-					const action = getProviderSetupAction({
-						provider,
-						authMode: this.session.modelRegistry.getProviderAuthMode(provider),
-						hasAuth: this.session.modelRegistry.authStorage.hasAuth(provider),
-					});
-
-					if (action.kind === "oauth-login") {
-						await this.showLoginDialog(provider);
-						return;
-					}
-
-					this.showStatus(action.message);
-					this.ui.requestRender();
+					await this.showLoginDialog(provider);
 				},
 			);
 			return { component, focus: component };
@@ -3692,6 +3693,9 @@ export class InteractiveMode {
 		this.streamingMessage = undefined;
 		this.pendingTools.clear();
 
+		// Reset contextual tips for the new session
+		this.contextualTips.reset();
+
 		this.chatContainer.addChild(new Spacer(1));
 		this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ New session started")}`, 1, 1));
 		this.ui.requestRender();

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",