gsd-pi 2.82.0 → 3.0.0-dev.04f5ccf82

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

@@ -1,4 +1,5 @@
-// GSD-2 Interactive Chat Controller
+// Project/App: GSD-2
+// File Purpose: Interactive TUI chat stream controller.
 import { Loader, Markdown, Spacer, Text } from "@gsd/pi-tui";
 
 import type { InteractiveModeEvent, InteractiveModeStateHost } from "../interactive-mode-state.js";
@@ -31,18 +32,77 @@ type RenderedSegment =
 	| { kind: "tool"; contentIndex: number; component: ToolExecutionComponent }
 	| { kind: "tool-summary"; component: ToolPhaseSummaryComponent; phases: ToolExecutionPhase[] };
 
+type DesiredSegment =
+	| { kind: "text-run"; startIndex: number; endIndex: number; contentType: "text" | "thinking" }
+	| { kind: "tool"; contentIndex: number; toolId: string };
+
 let renderedSegments: RenderedSegment[] = [];
 // When providers reuse one assistant lifecycle across internal sub-turns,
 // a content[] shrink resets renderedSegments. Keep the displaced segments so
 // claude-code MCP pruning can remove stale provisional text later.
 let orphanedSegments: RenderedSegment[] = [];
 
+function getVisibleTextLikeBlockType(block: any): "text" | "thinking" | undefined {
+	if (block?.type === "text" && typeof block.text === "string" && block.text.trim().length > 0) return "text";
+	if (block?.type === "thinking" && typeof block.thinking === "string" && block.thinking.trim().length > 0) return "thinking";
+	return undefined;
+}
+
+function buildDesiredSegments(
+	blocks: Array<any>,
+	options: { shouldSkipTextBlock?: (block: any, index: number) => boolean } = {},
+): DesiredSegment[] {
+	const desired: DesiredSegment[] = [];
+	let runStart = -1;
+	let runEnd = -1;
+	let runType: "text" | "thinking" | undefined;
+	const closeRun = () => {
+		if (runStart !== -1 && runType) {
+			desired.push({ kind: "text-run", startIndex: runStart, endIndex: runEnd, contentType: runType });
+			runStart = -1;
+			runEnd = -1;
+			runType = undefined;
+		}
+	};
+
+	for (let i = 0; i < blocks.length; i++) {
+		const block = blocks[i];
+		const blockType = getVisibleTextLikeBlockType(block);
+		const isInvisibleTextLike = blockType === undefined && (block?.type === "text" || block?.type === "thinking");
+		const isTool = block?.type === "toolCall" || block?.type === "serverToolUse";
+
+		if (blockType) {
+			if (options.shouldSkipTextBlock?.(block, i)) {
+				closeRun();
+				continue;
+			}
+			if (runStart === -1) {
+				runStart = i;
+				runEnd = i;
+				runType = blockType;
+			} else if (runType !== blockType) {
+				closeRun();
+				runStart = i;
+				runEnd = i;
+				runType = blockType;
+			} else {
+				runEnd = i;
+			}
+		} else {
+			if (isInvisibleTextLike) continue;
+			closeRun();
+			if (isTool) {
+				desired.push({ kind: "tool", contentIndex: i, toolId: block.id });
+			}
+		}
+	}
+	closeRun();
+
+	return desired;
+}
+
 function hasVisibleAssistantContent(message: { content: Array<any> }): boolean {
-	return message.content.some(
-		(c) =>
-			(c.type === "text" && typeof c.text === "string" && c.text.trim().length > 0)
-			|| (c.type === "thinking" && typeof c.thinking === "string" && c.thinking.trim().length > 0),
-	);
+	return message.content.some((c) => getVisibleTextLikeBlockType(c) !== undefined);
 }
 
 function hasAssistantToolBlocks(message: { content: Array<any> }): boolean {
@@ -470,59 +530,14 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					// Only prune provisional pre-tool prose after post-tool prose exists,
 					// so MCP tool-only windows do not blank the assistant content.
 					const shouldDropPreToolProse = isClaudeCodeProvider && hasMcpToolBlock && hasPostToolText;
-					type DesiredSegment =
-						| { kind: "text-run"; startIndex: number; endIndex: number; contentType: "text" | "thinking" }
-						| { kind: "tool"; contentIndex: number; toolId: string };
-				const desired: DesiredSegment[] = [];
-				let runStart = -1;
-				let runEnd = -1;
-				let runType: "text" | "thinking" | undefined;
-				const closeRun = () => {
-					if (runStart !== -1 && runType) {
-						desired.push({ kind: "text-run", startIndex: runStart, endIndex: runEnd, contentType: runType });
-						runStart = -1;
-						runEnd = -1;
-						runType = undefined;
-						}
-					};
-				for (let i = 0; i < blocks.length; i++) {
-					const b = blocks[i];
-					const blockType = b.type === "text" || b.type === "thinking" ? b.type : undefined;
-					const isTextLike = blockType === "text" || blockType === "thinking";
-					const isTool = b.type === "toolCall" || b.type === "serverToolUse";
-					// For Claude Code MCP turns, prune only pre-tool prose, never thinking.
-					const textValue = blockType === "text" && typeof b?.text === "string" ? b.text : "";
-					const isLikelyQuestion = blockType === "text" && typeof textValue === "string" && /\?\s*$/.test(textValue.trim());
-					const shouldSkipProse = shouldDropPreToolProse
-						&& firstToolIdx >= 0
-						&& i < firstToolIdx
-						&& blockType === "text"
-						&& !isLikelyQuestion;
-					if (shouldSkipProse) {
-						closeRun();
-						continue;
-					}
-						if (isTextLike) {
-							if (runStart === -1) {
-								runStart = i;
-								runEnd = i;
-								runType = blockType;
-							} else if (runType !== blockType) {
-								closeRun();
-								runStart = i;
-								runEnd = i;
-								runType = blockType;
-							} else {
-								runEnd = i;
-							}
-						} else {
-							closeRun();
-							if (isTool) {
-								desired.push({ kind: "tool", contentIndex: i, toolId: b.id });
-							}
-						}
-					}
-					closeRun();
+					const desired = buildDesiredSegments(blocks, {
+						shouldSkipTextBlock: (block: any, index: number) => {
+							if (!shouldDropPreToolProse || firstToolIdx < 0 || index >= firstToolIdx) return false;
+							if (getVisibleTextLikeBlockType(block) !== "text") return false;
+							const textValue = typeof block?.text === "string" ? block.text : "";
+							return !/\?\s*$/.test(textValue.trim());
+						},
+					});
 
 					// Claude Code MCP can emit provisional pre-tool prose that gets
 					// superseded by post-tool output. Prune stale text-run segments so
@@ -710,6 +725,22 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 						pinnedTextComponent = undefined;
 						host.pinnedMessageContainer.clear();
 						lastPinnedText = "";
+						if (!host.loadingAnimation) {
+							host.statusContainer.clear();
+							host.loadingAnimation = new Loader(
+								host.ui,
+								(spinner) => theme.fg("accent", spinner),
+								(text) => theme.fg("muted", text),
+								host.defaultWorkingMessage,
+							);
+							host.statusContainer.addChild(host.loadingAnimation);
+							if (host.pendingWorkingMessage !== undefined) {
+								if (host.pendingWorkingMessage) {
+									host.loadingAnimation.setMessage(host.pendingWorkingMessage);
+								}
+								host.pendingWorkingMessage = undefined;
+							}
+						}
 					}
 				}
 
@@ -742,49 +773,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					// ranges/components don't keep stale partial indices.
 					if (renderedSegments.length > 0) {
 						const finalBlocks = host.streamingMessage.content;
-						type DesiredSegment =
-							| { kind: "text-run"; startIndex: number; endIndex: number; contentType: "text" | "thinking" }
-							| { kind: "tool"; contentIndex: number; toolId: string };
-						const desired: DesiredSegment[] = [];
-						let runStart = -1;
-						let runEnd = -1;
-						let runType: "text" | "thinking" | undefined;
-						const closeRun = () => {
-							if (runStart !== -1 && runType) {
-								desired.push({ kind: "text-run", startIndex: runStart, endIndex: runEnd, contentType: runType });
-								runStart = -1;
-								runEnd = -1;
-								runType = undefined;
-							}
-						};
-
-						for (let i = 0; i < finalBlocks.length; i++) {
-							const block = finalBlocks[i] as any;
-							const blockType = block?.type === "text" || block?.type === "thinking" ? block.type : undefined;
-							const isTextLike = blockType === "text" || blockType === "thinking";
-							const isTool = block?.type === "toolCall" || block?.type === "serverToolUse";
-
-							if (isTextLike) {
-								if (runStart === -1) {
-									runStart = i;
-									runEnd = i;
-									runType = blockType;
-								} else if (runType !== blockType) {
-									closeRun();
-									runStart = i;
-									runEnd = i;
-									runType = blockType;
-								} else {
-									runEnd = i;
-								}
-							} else {
-								closeRun();
-								if (isTool) {
-									desired.push({ kind: "tool", contentIndex: i, toolId: block.id });
-								}
-							}
-						}
-						closeRun();
+						const desired = buildDesiredSegments(finalBlocks);
 
 						const toolComponentsById = new Map<string, ToolExecutionComponent>();
 						for (const [toolId, component] of host.pendingTools.entries()) {

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

@@ -45,7 +45,7 @@ function createMockHost() {
 		toolOutputExpanded: false,
 		hideThinkingBlock: false,
 		isBashMode: false,
-		onInputCallback: undefined,
+		onInputCallback: undefined as ((text: string) => void) | undefined,
 		isInitialized: true,
 		loadingAnimation: undefined,
 		pendingWorkingMessage: undefined,
@@ -146,6 +146,20 @@ describe("input-controller pending images", () => {
 		assert.equal(host.pendingImages.length, 0);
 		assert.equal(promptCalls.length, 0); // bash commands don't go through prompt
 	});
+
+	it("preserves pending images when using onInputCallback path", async () => {
+		let callbackText = "";
+		host.onInputCallback = (text: string) => {
+			callbackText = text;
+		};
+		host.pendingImages.push({ ...TEST_IMAGE });
+
+		await host.defaultEditor.onSubmit!("[Image #1] describe");
+
+		assert.equal(callbackText, "[Image #1] describe");
+		assert.equal(host.pendingImages.length, 1);
+		assert.equal(promptCalls.length, 0);
+	});
 });
 
 type HostOptions = {

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

@@ -71,9 +71,6 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 			}
 		}
 
-		// Consume pending images for prompt submissions
-		const images = consumePendingImages(host);
-
 		// Evaluate contextual tips before sending to agent
 		const tip = host.contextualTips.evaluate({
 			input: text,
@@ -85,6 +82,15 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 			host.showTip(tip);
 		}
 
+		if (host.onInputCallback) {
+			host.onInputCallback(text);
+			host.editor.addToHistory?.(text);
+			return;
+		}
+
+		// Consume pending images for prompt submissions
+		const images = consumePendingImages(host);
+
 		if (host.session.isCompacting) {
 			if (host.isExtensionCommand(text)) {
 				host.editor.addToHistory?.(text);
@@ -112,12 +118,6 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 
 		host.flushPendingBashComponents();
 
-		if (host.onInputCallback) {
-			host.onInputCallback(text);
-			host.editor.addToHistory?.(text);
-			return;
-		}
-
 		if (host.options?.submitPromptsDirectly) {
 			host.editor.addToHistory?.(text);
 			try {

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

@@ -1,7 +1,13 @@
+// Project/App: GSD-2
+// File Purpose: Regression tests for interactive assistant replay ordering.
 import assert from "node:assert/strict";
 import { test } from "node:test";
+import stripAnsi from "strip-ansi";
 
-import { buildAssistantReplaySegments } from "./interactive-mode.js";
+import { buildAssistantReplaySegments, getToolExpansionStartupHint } from "./interactive-mode.js";
+import { initTheme } from "./theme/theme.js";
+
+initTheme("dark", false);
 
 test("buildAssistantReplaySegments preserves tool-first ordering", () => {
 	const segments = buildAssistantReplaySegments([
@@ -42,3 +48,26 @@ test("buildAssistantReplaySegments ignores non-rendered non-tool blocks", () =>
 		{ kind: "assistant", startIndex: 2, endIndex: 2 },
 	]);
 });
+
+test("buildAssistantReplaySegments skips empty GPT reasoning blocks before tools", () => {
+	const segments = buildAssistantReplaySegments([
+		{ type: "thinking", thinking: "", thinkingSignature: "encrypted" },
+		{ type: "text", text: "   " },
+		{ type: "toolCall", id: "t1", name: "read", arguments: { filePath: "todo.js" } },
+	]);
+
+	assert.deepEqual(segments, [
+		{ kind: "tool", contentIndex: 2 },
+	]);
+});
+
+test("tool expansion startup hint reflects the default expansion state", () => {
+	const keybindings = {
+		getKeys(action: string) {
+			return action === "expandTools" ? ["ctrl+o"] : [];
+		},
+	} as any;
+
+	assert.match(stripAnsi(getToolExpansionStartupHint(true, keybindings)), /ctrl\+o.*collapse tools/);
+	assert.match(stripAnsi(getToolExpansionStartupHint(false, keybindings)), /ctrl\+o.*expand tools/);
+});

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

@@ -134,6 +134,13 @@ export type AssistantReplaySegment =
 	| { kind: "assistant"; startIndex: number; endIndex: number }
 	| { kind: "tool"; contentIndex: number };
 
+function isVisibleAssistantReplayText(block: any): boolean {
+	return (
+		(block?.type === "text" && typeof block.text === "string" && block.text.trim().length > 0)
+		|| (block?.type === "thinking" && typeof block.thinking === "string" && block.thinking.trim().length > 0)
+	);
+}
+
 /**
  * Build replay segments for historical assistant messages so rebuild paths
  * preserve the original content[] ordering between assistant prose and tools.
@@ -141,34 +148,46 @@ export type AssistantReplaySegment =
 export function buildAssistantReplaySegments(contentBlocks: Array<any>): AssistantReplaySegment[] {
 	const segments: AssistantReplaySegment[] = [];
 	let runStart = -1;
+	let runEnd = -1;
+
+	const closeRun = () => {
+		if (runStart !== -1) {
+			segments.push({ kind: "assistant", startIndex: runStart, endIndex: runEnd });
+			runStart = -1;
+			runEnd = -1;
+		}
+	};
 
 	for (let i = 0; i < contentBlocks.length; i++) {
 		const block = contentBlocks[i];
-		const isAssistantText = block?.type === "text" || block?.type === "thinking";
+		const isAssistantText = isVisibleAssistantReplayText(block);
+		const isInvisibleAssistantText = block?.type === "text" || block?.type === "thinking";
 		const isTool = block?.type === "toolCall" || block?.type === "serverToolUse";
 
 		if (isAssistantText) {
 			if (runStart === -1) runStart = i;
+			runEnd = i;
 			continue;
 		}
 
-		if (runStart !== -1) {
-			segments.push({ kind: "assistant", startIndex: runStart, endIndex: i - 1 });
-			runStart = -1;
-		}
+		if (isInvisibleAssistantText) continue;
+
+		closeRun();
 
 		if (isTool) {
 			segments.push({ kind: "tool", contentIndex: i });
 		}
 	}
 
-	if (runStart !== -1) {
-		segments.push({ kind: "assistant", startIndex: runStart, endIndex: contentBlocks.length - 1 });
-	}
+	closeRun();
 
 	return segments;
 }
 
+export function getToolExpansionStartupHint(toolOutputExpanded: boolean, keybindings: KeybindingsManager): string {
+	return appKeyHint(keybindings, "expandTools", toolOutputExpanded ? "to collapse tools" : "to expand tools");
+}
+
 type CompactionQueuedMessage = {
 	text: string;
 	mode: "steer" | "followUp";
@@ -293,7 +312,7 @@ export class InteractiveMode {
 	private pendingTools = new Map<string, ToolExecutionComponent>();
 
 	// Tool output expansion state
-	private toolOutputExpanded = false;
+	private toolOutputExpanded = true;
 
 	// Pasted image tracking
 	private pendingImages: ImageContent[] = [];
@@ -545,7 +564,7 @@ export class InteractiveMode {
 				hint("cycleThinkingLevel", "to cycle thinking level"),
 				rawKeyHint(`${appKey(kb, "cycleModelForward")}/${appKey(kb, "cycleModelBackward")}`, "to cycle models"),
 				hint("selectModel", "to select model"),
-				hint("expandTools", "to expand tools"),
+				getToolExpansionStartupHint(this.toolOutputExpanded, kb),
 				hint("toggleThinking", "to expand thinking"),
 				hint("externalEditor", "for external editor"),
 				rawKeyHint("/", "for commands"),

package/packages/pi-coding-agent/src/tests/system-prompt-file-safety.test.ts

@@ -0,0 +1,22 @@
+// GSD-2 pi-coding-agent system prompt file-safety regression tests.
+
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import { buildSystemPrompt } from "../core/system-prompt.js";
+
+test("buildSystemPrompt: read and write tools require reading before overwrite", () => {
+	const prompt = buildSystemPrompt({ selectedTools: ["read", "write"] });
+
+	assert.match(prompt, /before editing or overwriting/i);
+	assert.match(prompt, /Before write creates or replaces a file, verify the target path/i);
+	assert.match(prompt, /if it exists, read it first/i);
+	assert.match(prompt, /Use write only for new files or complete rewrites after verifying the target path/i);
+});
+
+test("buildSystemPrompt: write-only tool guidance does not reference unavailable read tool", () => {
+	const prompt = buildSystemPrompt({ selectedTools: ["write"] });
+
+	assert.doesNotMatch(prompt, /read it first/i);
+	assert.match(prompt, /Use write only for new files or complete rewrites after verifying the target path/i);
+});