gsd-pi 2.74.0-dev.14c45ac → 2.74.0-dev.20f79a8

package/packages/pi-coding-agent/dist/core/chat-controller-ordering.test.js

@@ -199,7 +199,54 @@ test("chat-controller renders serverToolUse before trailing text matching conten
     assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
     assert.equal(host.chatContainer.children[1]?.constructor?.name, "AssistantMessageComponent");
 });
-test("chat-controller drops provisional pre-tool text for claude-code MCP turns", async () => {
+test("chat-controller replays final message_end content when result adds unstreamed trailing text", async () => {
+    globalThis[Symbol.for("@gsd/pi-coding-agent:theme")] = {
+        fg: (_key, text) => text,
+        bg: (_key, text) => text,
+        bold: (text) => text,
+        italic: (text) => text,
+        truncate: (text) => text,
+    };
+    const host = createHost();
+    host.getMarkdownThemeWithSettings = () => ({});
+    const tool = {
+        type: "toolCall",
+        id: "mcp-end-replay-1",
+        name: "read",
+        mcpServer: "filesystem",
+        arguments: { filePath: "/tmp/demo.txt" },
+    };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    const streamedContent = [
+        tool,
+        { type: "thinking", thinking: "I am analyzing tool output..." },
+    ];
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(streamedContent),
+        assistantMessageEvent: {
+            type: "thinking_delta",
+            contentIndex: 1,
+            delta: "I am analyzing tool output...",
+            partial: makeAssistant(streamedContent),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 2, "streaming shows tool + thinking only");
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "AssistantMessageComponent");
+    // Final payload includes trailing text that never arrived as message_update.
+    const finalContent = [
+        tool,
+        { type: "thinking", thinking: "I am analyzing tool output..." },
+        { type: "text", text: "Correct anything important I missed?" },
+    ];
+    await handleAgentEvent(host, { type: "message_end", message: makeAssistant(finalContent) });
+    assert.equal(host.chatContainer.children.length, 3, "message_end should replay and include trailing text segment");
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "AssistantMessageComponent");
+    assert.equal(host.chatContainer.children[2]?.constructor?.name, "AssistantMessageComponent");
+});
+test("chat-controller keeps pre-tool prose visible until post-tool prose arrives, then prunes it", async () => {
     globalThis[Symbol.for("@gsd/pi-coding-agent:theme")] = {
         fg: (_key, text) => text,
         bg: (_key, text) => text,
@@ -230,7 +277,7 @@ test("chat-controller drops provisional pre-tool text for claude-code MCP turns"
     });
     assert.equal(host.chatContainer.children.length, 1);
     assert.equal(host.chatContainer.children[0]?.constructor?.name, "AssistantMessageComponent");
-    // MCP tool appears; provisional text should be removed from the chat stack.
+    // MCP tool appears; provisional text should remain visible until post-tool prose exists.
     await handleAgentEvent(host, {
         type: "message_update",
         message: makeAssistant([{ type: "text", text: "Let me inspect the workspace first." }, mcpTool]),
@@ -248,16 +295,21 @@ test("chat-controller drops provisional pre-tool text for claude-code MCP turns"
             partial: makeAssistant([{ type: "text", text: "Let me inspect the workspace first." }, mcpTool]),
         },
     });
-    assert.equal(host.chatContainer.children.length, 1, "provisional pre-tool text should be pruned");
-    assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
-    // Final assistant output should render below the tool.
-    const finalContent = [mcpTool, { type: "text", text: "Which missing feature matters most to you?" }];
+    assert.equal(host.chatContainer.children.length, 2, "pre-tool prose should remain during tool-only window");
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "AssistantMessageComponent");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "ToolExecutionComponent");
+    // Post-tool prose arrives: pre-tool prose should now be pruned.
+    const finalContent = [
+        { type: "text", text: "Let me inspect the workspace first." },
+        mcpTool,
+        { type: "text", text: "Which missing feature matters most to you?" },
+    ];
     await handleAgentEvent(host, {
         type: "message_update",
         message: makeAssistant(finalContent),
         assistantMessageEvent: {
             type: "text_delta",
-            contentIndex: 1,
+            contentIndex: 2,
             delta: "Which missing feature matters most to you?",
             partial: makeAssistant(finalContent),
         },
@@ -268,6 +320,123 @@ test("chat-controller drops provisional pre-tool text for claude-code MCP turns"
     // Finalize to tear down any pinned spinner state.
     await handleAgentEvent(host, { type: "message_end", message: makeAssistant(finalContent) });
 });
+test("chat-controller keeps pre-tool thinking visible for claude-code MCP turns without post-tool prose", async () => {
+    globalThis[Symbol.for("@gsd/pi-coding-agent:theme")] = {
+        fg: (_key, text) => text,
+        bg: (_key, text) => text,
+        bold: (text) => text,
+        italic: (text) => text,
+        truncate: (text) => text,
+    };
+    const host = createHost();
+    host.getMarkdownThemeWithSettings = () => ({});
+    const mcpTool = {
+        type: "toolCall",
+        id: "mcp-tool-thinking-1",
+        name: "read",
+        mcpServer: "filesystem",
+        arguments: { filePath: "/tmp/demo.txt" },
+    };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    const thinkingOnly = [{ type: "thinking", thinking: "I should inspect the workspace." }];
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(thinkingOnly),
+        assistantMessageEvent: {
+            type: "thinking_delta",
+            contentIndex: 0,
+            delta: "I should inspect the workspace.",
+            partial: makeAssistant(thinkingOnly),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 1);
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "AssistantMessageComponent");
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([thinkingOnly[0], mcpTool]),
+        assistantMessageEvent: {
+            type: "toolcall_end",
+            contentIndex: 1,
+            toolCall: {
+                ...mcpTool,
+                externalResult: {
+                    content: [{ type: "text", text: "file preview" }],
+                    details: {},
+                    isError: false,
+                },
+            },
+            partial: makeAssistant([thinkingOnly[0], mcpTool]),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 2, "thinking should remain visible while only tool output is present");
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "AssistantMessageComponent");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "ToolExecutionComponent");
+    await handleAgentEvent(host, { type: "message_end", message: makeAssistant([thinkingOnly[0], mcpTool]) });
+});
+test("chat-controller keeps pre-tool question text for claude-code MCP when post-tool prose exists", async () => {
+    globalThis[Symbol.for("@gsd/pi-coding-agent:theme")] = {
+        fg: (_key, text) => text,
+        bg: (_key, text) => text,
+        bold: (text) => text,
+        italic: (text) => text,
+        truncate: (text) => text,
+    };
+    const host = createHost();
+    host.getMarkdownThemeWithSettings = () => ({});
+    const mcpTool = {
+        type: "toolCall",
+        id: "mcp-tool-question-1",
+        name: "glob",
+        mcpServer: "filesystem",
+        arguments: { pattern: "**/*" },
+    };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    const questionText = { type: "text", text: "Which file should I inspect?" };
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([questionText]),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 0,
+            delta: questionText.text,
+            partial: makeAssistant([questionText]),
+        },
+    });
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([questionText, mcpTool]),
+        assistantMessageEvent: {
+            type: "toolcall_end",
+            contentIndex: 1,
+            toolCall: {
+                ...mcpTool,
+                externalResult: {
+                    content: [{ type: "text", text: "glob output" }],
+                    details: {},
+                    isError: false,
+                },
+            },
+            partial: makeAssistant([questionText, mcpTool]),
+        },
+    });
+    const postTool = { type: "text", text: "I'll review that next." };
+    const finalContent = [questionText, mcpTool, postTool];
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(finalContent),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 2,
+            delta: postTool.text,
+            partial: makeAssistant(finalContent),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 3, "question text should remain alongside MCP tool and post-tool prose");
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "AssistantMessageComponent", "pre-tool question stays visible");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "ToolExecutionComponent", "tool renders in the middle");
+    assert.equal(host.chatContainer.children[2]?.constructor?.name, "AssistantMessageComponent", "post-tool prose renders last");
+    await handleAgentEvent(host, { type: "message_end", message: makeAssistant(finalContent) });
+});
 test("chat-controller prunes orphaned provisional text after claude-code sub-turn shrink when MCP tools appear", async () => {
     globalThis[Symbol.for("@gsd/pi-coding-agent:theme")] = {
         fg: (_key, text) => text,
@@ -310,7 +479,7 @@ test("chat-controller prunes orphaned provisional text after claude-code sub-tur
         },
     });
     assert.equal(host.chatContainer.children.length, 2, "shrink keeps prior text until MCP tool context appears");
-    // MCP tool appears in sub-turn 2: both old orphaned text and current pre-tool text should be pruned.
+    // MCP tool appears in sub-turn 2: tool-only windows keep provisional prose visible.
     await handleAgentEvent(host, {
         type: "message_update",
         message: makeAssistant([{ type: "text", text: "New provisional text before tool." }, mcpTool]),
@@ -328,8 +497,10 @@ test("chat-controller prunes orphaned provisional text after claude-code sub-tur
             partial: makeAssistant([{ type: "text", text: "New provisional text before tool." }, mcpTool]),
         },
     });
-    assert.equal(host.chatContainer.children.length, 1, "stale text runs should be removed once MCP tool is present");
-    assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
+    assert.equal(host.chatContainer.children.length, 3, "stale text runs are deferred until post-tool prose arrives");
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "AssistantMessageComponent");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "AssistantMessageComponent");
+    assert.equal(host.chatContainer.children[2]?.constructor?.name, "ToolExecutionComponent");
     const finalContent = [mcpTool, { type: "text", text: "Final visible question?" }];
     await handleAgentEvent(host, {
         type: "message_update",
@@ -346,6 +517,109 @@ test("chat-controller prunes orphaned provisional text after claude-code sub-tur
     assert.equal(host.chatContainer.children[1]?.constructor?.name, "AssistantMessageComponent");
     await handleAgentEvent(host, { type: "message_end", message: makeAssistant(finalContent) });
 });
+test("chat-controller prunes orphans from multiple sub-turn shrinks before MCP post-tool prose", async () => {
+    globalThis[Symbol.for("@gsd/pi-coding-agent:theme")] = {
+        fg: (_key, text) => text,
+        bg: (_key, text) => text,
+        bold: (text) => text,
+        italic: (text) => text,
+        truncate: (text) => text,
+    };
+    const host = createHost();
+    host.getMarkdownThemeWithSettings = () => ({});
+    const mcpTool = {
+        type: "toolCall",
+        id: "mcp-tool-multi-shrink-1",
+        name: "glob",
+        mcpServer: "filesystem",
+        arguments: { pattern: "**/*" },
+    };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    // Sub-turn 1: 3 text blocks (merged into one text-run).
+    const subTurn1 = [
+        { type: "text", text: "First provisional A." },
+        { type: "text", text: "First provisional B." },
+        { type: "text", text: "First provisional C." },
+    ];
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(subTurn1),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 2,
+            delta: "First provisional C.",
+            partial: makeAssistant(subTurn1),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 1, "first sub-turn renders 1 text-run");
+    // Sub-turn 2 (first shrink 3 → 2 blocks).
+    const subTurn2 = [
+        { type: "text", text: "Second provisional A." },
+        { type: "text", text: "Second provisional B." },
+    ];
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(subTurn2),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 1,
+            delta: "Second provisional B.",
+            partial: makeAssistant(subTurn2),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 2, "first shrink appends, keeps prior text as frozen history");
+    // Sub-turn 3 (second shrink 2 → 1 block). This is the critical step —
+    // without orphan accumulation, sub-turn 1's orphaned segment would be
+    // dropped from tracking here and later strand in the container.
+    const subTurn3 = [{ type: "text", text: "Third provisional." }];
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(subTurn3),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 0,
+            delta: "Third provisional.",
+            partial: makeAssistant(subTurn3),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 3, "second shrink appends again, still no prune (no post-tool text)");
+    // MCP tool appears — tool-only window still keeps provisional prose visible.
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "Third provisional." }, mcpTool]),
+        assistantMessageEvent: {
+            type: "toolcall_end",
+            contentIndex: 1,
+            toolCall: {
+                ...mcpTool,
+                externalResult: {
+                    content: [{ type: "text", text: "glob output" }],
+                    details: {},
+                    isError: false,
+                },
+            },
+            partial: makeAssistant([{ type: "text", text: "Third provisional." }, mcpTool]),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 4, "tool-only window keeps all three provisional text-runs");
+    // Final post-tool text arrives — prune must drop ALL three pre-tool
+    // provisional text-runs across both shrinks, leaving only tool + final text.
+    const finalContent = [mcpTool, { type: "text", text: "Final answer." }];
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(finalContent),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 1,
+            delta: "Final answer.",
+            partial: makeAssistant(finalContent),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 2, "all pre-tool provisional segments from every shrink must be pruned once post-tool prose arrives");
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "AssistantMessageComponent");
+    await handleAgentEvent(host, { type: "message_end", message: makeAssistant(finalContent) });
+});
 test("chat-controller pins latest assistant text above editor when tool calls are present", async () => {
     globalThis[Symbol.for("@gsd/pi-coding-agent:theme")] = {
         fg: (_key, text) => text,