gsd-pi 2.82.0 → 3.0.0-dev.8b8d129d7

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);
+});