gsd-pi 2.73.1 → 2.74.0-dev.16f2f3b

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

@@ -88,7 +88,7 @@ function createHost() {
     };
     return host;
 }
-test("chat-controller keeps tool output ahead of delayed assistant text for external tool streams", async () => {
+test("chat-controller renders content blocks in content[] index order (tool-first stream)", async () => {
     // ToolExecutionComponent uses the global theme singleton.
     // Install a minimal no-op theme implementation for this unit test.
     globalThis[Symbol.for("@gsd/pi-coding-agent:theme")] = {
@@ -107,7 +107,6 @@ test("chat-controller keeps tool output ahead of delayed assistant text for exte
         arguments: { cmd: "echo hi" },
     };
     await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
-    assert.equal(host.streamingComponent, undefined, "assistant component should be deferred at message_start");
     assert.equal(host.chatContainer.children.length, 0, "nothing should render before content arrives");
     await handleAgentEvent(host, {
         type: "message_update",
@@ -126,10 +125,9 @@ test("chat-controller keeps tool output ahead of delayed assistant text for exte
             partial: makeAssistant([toolCall]),
         },
     });
-    assert.equal(host.streamingComponent, undefined, "assistant text container should remain deferred for tool-only updates");
+    // content[0] = toolCall → ToolExecutionComponent renders first
     assert.equal(host.chatContainer.children.length, 1, "tool execution block should render immediately");
     assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
-    // Re-assert required host method before the text-bearing update path.
     host.getMarkdownThemeWithSettings = () => ({});
     await handleAgentEvent(host, {
         type: "message_update",
@@ -141,11 +139,12 @@ test("chat-controller keeps tool output ahead of delayed assistant text for exte
             partial: makeAssistant([toolCall, { type: "text", text: "done" }]),
         },
     });
-    assert.equal(host.chatContainer.children.length, 2, "assistant content should render after existing tool output");
+    // content[0]=toolCall, content[1]=text → order: tool, then text
+    assert.equal(host.chatContainer.children.length, 2, "text run should render after tool in content[] order");
     assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
     assert.equal(host.chatContainer.children[1]?.constructor?.name, "AssistantMessageComponent");
 });
-test("chat-controller keeps serverToolUse output ahead of assistant text when external results arrive", async () => {
+test("chat-controller renders serverToolUse before trailing text matching content[] index order", async () => {
     globalThis[Symbol.for("@gsd/pi-coding-agent:theme")] = {
         fg: (_key, text) => text,
         bg: (_key, text) => text,
@@ -171,7 +170,7 @@ test("chat-controller keeps serverToolUse output ahead of assistant text when ex
             partial: makeAssistant([serverToolUse]),
         },
     });
-    assert.equal(host.streamingComponent, undefined, "assistant content should stay deferred while only tool content streams");
+    // content[0] = serverToolUse → ToolExecutionComponent renders first
     assert.equal(host.chatContainer.children.length, 1, "server tool block should render immediately");
     assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
     host.getMarkdownThemeWithSettings = () => ({});
@@ -195,10 +194,218 @@ test("chat-controller keeps serverToolUse output ahead of assistant text when ex
             partial: resultMessage,
         },
     });
-    assert.equal(host.chatContainer.children.length, 2, "assistant text should render after existing server tool output");
+    // content[0]=serverToolUse, content[1]=text → order: tool, then text
+    assert.equal(host.chatContainer.children.length, 2, "text run should render after server tool in content[] order");
     assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
     assert.equal(host.chatContainer.children[1]?.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,
+        bold: (text) => text,
+        italic: (text) => text,
+        truncate: (text) => text,
+    };
+    const host = createHost();
+    host.getMarkdownThemeWithSettings = () => ({});
+    const mcpTool = {
+        type: "toolCall",
+        id: "mcp-tool-1",
+        name: "read",
+        mcpServer: "filesystem",
+        arguments: { filePath: "/tmp/demo.txt" },
+    };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    // Provisional assistant text arrives first.
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "Let me inspect the workspace first." }]),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 0,
+            delta: "Let me inspect the workspace first.",
+            partial: makeAssistant([{ type: "text", text: "Let me inspect the workspace first." }]),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 1);
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "AssistantMessageComponent");
+    // 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]),
+        assistantMessageEvent: {
+            type: "toolcall_end",
+            contentIndex: 1,
+            toolCall: {
+                ...mcpTool,
+                externalResult: {
+                    content: [{ type: "text", text: "file preview" }],
+                    details: {},
+                    isError: false,
+                },
+            },
+            partial: makeAssistant([{ type: "text", text: "Let me inspect the workspace first." }, mcpTool]),
+        },
+    });
+    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: 2,
+            delta: "Which missing feature matters most to you?",
+            partial: makeAssistant(finalContent),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 2);
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolExecutionComponent");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "AssistantMessageComponent");
+    // 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 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,
+        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-shrink-1",
+        name: "glob",
+        mcpServer: "filesystem",
+        arguments: { pattern: "**/*" },
+    };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    // Sub-turn 1: generate longer provisional text content.
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "Old provisional preface." }, { type: "text", text: "More old text." }]),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 1,
+            delta: "More old text.",
+            partial: makeAssistant([{ type: "text", text: "Old provisional preface." }, { type: "text", text: "More old text." }]),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 1, "first sub-turn text run should render");
+    // Sub-turn 2 starts (content shrink): old component is orphaned by design.
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "New provisional text before tool." }]),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 0,
+            delta: "New provisional text before tool.",
+            partial: makeAssistant([{ type: "text", text: "New provisional text before tool." }]),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 2, "shrink keeps prior text until MCP tool context appears");
+    // 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]),
+        assistantMessageEvent: {
+            type: "toolcall_end",
+            contentIndex: 1,
+            toolCall: {
+                ...mcpTool,
+                externalResult: {
+                    content: [{ type: "text", text: "glob output" }],
+                    details: {},
+                    isError: false,
+                },
+            },
+            partial: makeAssistant([{ type: "text", text: "New provisional text before tool." }, mcpTool]),
+        },
+    });
+    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",
+        message: makeAssistant(finalContent),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 1,
+            delta: "Final visible question?",
+            partial: makeAssistant(finalContent),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 2);
+    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,
@@ -385,4 +592,360 @@ test("chat-controller does not pin when there are no tool calls", async () => {
     });
     assert.equal(host.pinnedMessageContainer.children.length, 0, "pinned zone should stay empty without tool calls");
 });
+// Regression test for issue #4144: interleaved text/tool content must render in content[] index order.
+// Stream: [text "A", toolCall T1, text "B", toolCall T2, text "C"]
+// Expected chatContainer order: textRun(A), toolExec(T1), textRun(B), toolExec(T2), textRun(C)
+// Each AssistantMessageComponent must render ONLY its own text — no duplication after message_end.
+test("chat-controller renders interleaved text and tool blocks in content[] index order (#4144)", 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 t1 = { type: "toolCall", id: "t1", name: "tool_one", arguments: {} };
+    const t2 = { type: "toolCall", id: "t2", name: "tool_two", arguments: {} };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    // Stream text "A" at index 0
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "A" }]),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 0,
+            delta: "A",
+            partial: makeAssistant([{ type: "text", text: "A" }]),
+        },
+    });
+    // Stream toolCall T1 at index 1
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "A" }, t1]),
+        assistantMessageEvent: {
+            type: "toolcall_end",
+            contentIndex: 1,
+            toolCall: {
+                ...t1,
+                externalResult: { content: [{ type: "text", text: "result1" }], details: {}, isError: false },
+            },
+            partial: makeAssistant([{ type: "text", text: "A" }, t1]),
+        },
+    });
+    // Stream text "B" at index 2
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "A" }, t1, { type: "text", text: "B" }]),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 2,
+            delta: "B",
+            partial: makeAssistant([{ type: "text", text: "A" }, t1, { type: "text", text: "B" }]),
+        },
+    });
+    // Stream toolCall T2 at index 3
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "A" }, t1, { type: "text", text: "B" }, t2]),
+        assistantMessageEvent: {
+            type: "toolcall_end",
+            contentIndex: 3,
+            toolCall: {
+                ...t2,
+                externalResult: { content: [{ type: "text", text: "result2" }], details: {}, isError: false },
+            },
+            partial: makeAssistant([{ type: "text", text: "A" }, t1, { type: "text", text: "B" }, t2]),
+        },
+    });
+    // Stream text "C" at index 4
+    const finalContent = [
+        { type: "text", text: "A" }, t1, { type: "text", text: "B" }, t2, { type: "text", text: "C" },
+    ];
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(finalContent),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 4,
+            delta: "C",
+            partial: makeAssistant(finalContent),
+        },
+    });
+    // Finalize — exercises the message_end path where a buggy setRange(undefined) would cause duplication
+    await handleAgentEvent(host, { type: "message_end", message: makeAssistant(finalContent) });
+    // Assert interleaved order: textRun(A), toolExec(T1), textRun(B), toolExec(T2), textRun(C)
+    assert.equal(host.chatContainer.children.length, 5, "should have 5 children in interleaved order");
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "AssistantMessageComponent", "index 0: text run A");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "ToolExecutionComponent", "index 1: tool T1");
+    assert.equal(host.chatContainer.children[2]?.constructor?.name, "AssistantMessageComponent", "index 2: text run B");
+    assert.equal(host.chatContainer.children[3]?.constructor?.name, "ToolExecutionComponent", "index 3: tool T2");
+    assert.equal(host.chatContainer.children[4]?.constructor?.name, "AssistantMessageComponent", "index 4: text run C");
+    // Helper: collect the text of all Markdown children inside an AssistantMessageComponent.
+    // Structure: AssistantMessageComponent (Container) -> contentContainer (children[0]) -> Markdown nodes.
+    function getRenderedTexts(comp) {
+        const contentContainer = comp.children?.[0];
+        if (!contentContainer)
+            return [];
+        return (contentContainer.children ?? [])
+            .filter((c) => c.constructor?.name === "Markdown")
+            .map((c) => c.text);
+    }
+    // Each text-run component must contain only its own text — no cross-contamination after message_end
+    assert.deepEqual(getRenderedTexts(host.chatContainer.children[0]), ["A"], "text run A must contain only 'A'");
+    assert.deepEqual(getRenderedTexts(host.chatContainer.children[2]), ["B"], "text run B must contain only 'B'");
+    assert.deepEqual(getRenderedTexts(host.chatContainer.children[4]), ["C"], "text run C must contain only 'C'");
+});
+test("chat-controller does not duplicate text when content is [text, tool, text] (interleaved stream)", 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 t1 = { type: "toolCall", id: "t1", name: "tool_one", arguments: {} };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    // Step 1: text "A" at index 0
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "A" }]),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 0,
+            delta: "A",
+            partial: makeAssistant([{ type: "text", text: "A" }]),
+        },
+    });
+    // Step 2: toolCall at index 1
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "A" }, t1]),
+        assistantMessageEvent: {
+            type: "toolcall_end",
+            contentIndex: 1,
+            toolCall: {
+                ...t1,
+                externalResult: { content: [{ type: "text", text: "result1" }], details: {}, isError: false },
+            },
+            partial: makeAssistant([{ type: "text", text: "A" }, t1]),
+        },
+    });
+    // Step 3: text "B" at index 2
+    const finalContent = [{ type: "text", text: "A" }, t1, { type: "text", text: "B" }];
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(finalContent),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 2,
+            delta: "B",
+            partial: makeAssistant(finalContent),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 3);
+    assert.equal(host.chatContainer.children[0]?.constructor?.name, "AssistantMessageComponent");
+    assert.equal(host.chatContainer.children[1]?.constructor?.name, "ToolExecutionComponent");
+    assert.equal(host.chatContainer.children[2]?.constructor?.name, "AssistantMessageComponent");
+    const firstText = host.chatContainer.children[0];
+    const secondText = host.chatContainer.children[2];
+    assert.notEqual(firstText, secondText, "text-before-tool and text-after-tool must be separate component instances");
+    assert.deepEqual(firstText.range, { startIndex: 0, endIndex: 0 }, "first text-run covers only content[0]");
+    assert.deepEqual(secondText.range, { startIndex: 2, endIndex: 2 }, "second text-run covers only content[2]");
+    // Finalize — regression guard: range must NOT be cleared on message_end (would cause duplication)
+    await handleAgentEvent(host, { type: "message_end", message: makeAssistant(finalContent) });
+    assert.deepEqual(secondText.range, { startIndex: 2, endIndex: 2 }, "range must not be cleared on message_end (would cause duplication)");
+});
+// Regression for the claude-code sub-turn bug that followed #4144:
+// an adapter can reset content[] back to 0/1 mid-lifecycle when a new provider
+// sub-turn begins. The segment walker must NOT update prior-sub-turn text-run
+// components in place (which would destroy earlier history) and must NOT reuse
+// stale tool registrations for a new tool at the same contentIndex. Prior
+// sub-turn children must stay frozen; new sub-turn segments must append after
+// them, and the pinned "Latest Output" mirror must re-evaluate for the new sub-turn.
+test("chat-controller freezes prior sub-turn and appends new segments when content shrinks", 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 t1 = { type: "toolCall", id: "t1", name: "tool_one", arguments: {} };
+    const t2 = { type: "toolCall", id: "t2", name: "tool_two", arguments: {} };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    // Sub-turn 1: grow to [A, T1, B]
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "A" }]),
+        assistantMessageEvent: {
+            type: "text_delta", contentIndex: 0, delta: "A",
+            partial: makeAssistant([{ type: "text", text: "A" }]),
+        },
+    });
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "A" }, t1]),
+        assistantMessageEvent: {
+            type: "toolcall_end", contentIndex: 1,
+            toolCall: { ...t1, externalResult: { content: [{ type: "text", text: "r1" }], details: {}, isError: false } },
+            partial: makeAssistant([{ type: "text", text: "A" }, t1]),
+        },
+    });
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "A" }, t1, { type: "text", text: "B" }]),
+        assistantMessageEvent: {
+            type: "text_delta", contentIndex: 2, delta: "B",
+            partial: makeAssistant([{ type: "text", text: "A" }, t1, { type: "text", text: "B" }]),
+        },
+    });
+    assert.equal(host.chatContainer.children.length, 3, "sub-turn 1 renders 3 children");
+    const priorA = host.chatContainer.children[0];
+    const priorT1 = host.chatContainer.children[1];
+    const priorB = host.chatContainer.children[2];
+    // Sub-turn boundary: adapter resets content[] to [C]
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "C" }]),
+        assistantMessageEvent: {
+            type: "text_delta", contentIndex: 0, delta: "C",
+            partial: makeAssistant([{ type: "text", text: "C" }]),
+        },
+    });
+    // Prior 3 children must still exist in DOM — and a NEW text-run for "C" appended after them.
+    assert.equal(host.chatContainer.children.length, 4, "shrink must append new segment, not replace prior history");
+    assert.equal(host.chatContainer.children[0], priorA, "prior A component stays at index 0");
+    assert.equal(host.chatContainer.children[1], priorT1, "prior T1 component stays at index 1");
+    assert.equal(host.chatContainer.children[2], priorB, "prior B component stays at index 2");
+    assert.notEqual(host.chatContainer.children[3], priorA, "new C text-run must be a different component from prior A");
+    assert.equal(host.chatContainer.children[3]?.constructor?.name, "AssistantMessageComponent");
+    // Prior A component must still render "A", not be overwritten with "C".
+    function getRenderedTexts(comp) {
+        const contentContainer = comp.children?.[0];
+        if (!contentContainer)
+            return [];
+        return (contentContainer.children ?? [])
+            .filter((c) => c.constructor?.name === "Markdown")
+            .map((c) => c.text);
+    }
+    assert.deepEqual(getRenderedTexts(priorA), ["A"], "prior A text-run must still contain 'A' after shrink");
+    assert.deepEqual(getRenderedTexts(priorB), ["B"], "prior B text-run must still contain 'B' after shrink");
+    assert.deepEqual(getRenderedTexts(host.chatContainer.children[3]), ["C"], "new text-run must contain only 'C'");
+    // Sub-turn 2 grows with a new tool T2 at contentIndex=1.
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "C" }, t2]),
+        assistantMessageEvent: {
+            type: "toolcall_end", contentIndex: 1,
+            toolCall: { ...t2, externalResult: { content: [{ type: "text", text: "r2" }], details: {}, isError: false } },
+            partial: makeAssistant([{ type: "text", text: "C" }, t2]),
+        },
+    });
+    // T2 must be appended after the new C text-run, not conflated with the stale T1 registration.
+    assert.equal(host.chatContainer.children.length, 5, "new tool appends after new text-run");
+    assert.equal(host.chatContainer.children[4]?.constructor?.name, "ToolExecutionComponent");
+    assert.notEqual(host.chatContainer.children[4], priorT1, "new T2 must be a different component from prior T1");
+    // Finalize so the module-level pinned spinner (setInterval) is torn down and the test process can exit.
+    await handleAgentEvent(host, { type: "message_end", message: makeAssistant([{ type: "text", text: "C" }, t2]) });
+});
+// Regression: after a sub-turn shrink, lastPinnedText must be cleared so the
+// pinned "Latest Output" mirror can display text from the new sub-turn instead
+// of staying frozen on a stale snapshot (the "bottom green stays" symptom).
+test("chat-controller updates pinned zone after sub-turn shrink", 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 t1 = { type: "toolCall", id: "t1", name: "tool_one", arguments: {} };
+    const t2 = { type: "toolCall", id: "t2", name: "tool_two", arguments: {} };
+    await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) });
+    // Sub-turn 1 with pinnable text before a tool → populates pinned zone with "first".
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "first" }, t1]),
+        assistantMessageEvent: {
+            type: "toolcall_end", contentIndex: 1,
+            toolCall: { ...t1, externalResult: { content: [{ type: "text", text: "r1" }], details: {}, isError: false } },
+            partial: makeAssistant([{ type: "text", text: "first" }, t1]),
+        },
+    });
+    const pinnedMarkdown = host.pinnedMessageContainer.children[1];
+    assert.equal(pinnedMarkdown?.text, "first", "pinned zone seeded with sub-turn 1 text");
+    // Sub-turn boundary: content resets to [second, t2].
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "second" }, t2]),
+        assistantMessageEvent: {
+            type: "toolcall_end", contentIndex: 1,
+            toolCall: { ...t2, externalResult: { content: [{ type: "text", text: "r2" }], details: {}, isError: false } },
+            partial: makeAssistant([{ type: "text", text: "second" }, t2]),
+        },
+    });
+    // Pinned markdown must now reflect the new sub-turn's text, not stay frozen on "first".
+    assert.equal(pinnedMarkdown?.text, "second", "pinned zone must update after sub-turn shrink (#4144 regression)");
+    // Finalize so the module-level pinned spinner (setInterval) is torn down and the test process can exit.
+    await handleAgentEvent(host, { type: "message_end", message: makeAssistant([{ type: "text", text: "second" }, t2]) });
+});
+test("chat-controller: agent_end without message_end must not remove streaming component from DOM (regression #4197)", async () => {
+    const host = createHost();
+    await handleAgentEvent(host, {
+        type: "message_start",
+        message: makeAssistant([]),
+    });
+    // Simulate partial streaming that creates an AssistantMessageComponent
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant([{ type: "text", text: "partial answer" }]),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 0,
+            delta: "partial answer",
+            partial: makeAssistant([{ type: "text", text: "partial answer" }]),
+        },
+    });
+    // Precondition: component is in DOM
+    assert.equal(host.chatContainer.children.length, 1, "streaming component must be in DOM after message_update");
+    const comp = host.chatContainer.children[0];
+    // Simulate abort: agent_end fires WITHOUT message_end
+    await handleAgentEvent(host, { type: "agent_end" });
+    assert.equal(host.chatContainer.children.length, 1, "agent_end must NOT remove the streaming component from the DOM (issue #4197)");
+    assert.equal(host.chatContainer.children[0], comp, "the same component instance must remain in the DOM after agent_end");
+});
+test("chat-controller: agent_end after message_end must not alter DOM", async () => {
+    const host = createHost();
+    const content = [{ type: "text", text: "complete answer" }];
+    await handleAgentEvent(host, {
+        type: "message_start",
+        message: makeAssistant([]),
+    });
+    await handleAgentEvent(host, {
+        type: "message_update",
+        message: makeAssistant(content),
+        assistantMessageEvent: {
+            type: "text_delta",
+            contentIndex: 0,
+            delta: "complete answer",
+            partial: makeAssistant(content),
+        },
+    });
+    await handleAgentEvent(host, {
+        type: "message_end",
+        message: makeAssistant(content),
+    });
+    const countAfterMessageEnd = host.chatContainer.children.length;
+    assert.ok(countAfterMessageEnd > 0, "component must be present after message_end");
+    await handleAgentEvent(host, { type: "agent_end" });
+    assert.equal(host.chatContainer.children.length, countAfterMessageEnd, "agent_end after message_end must not add or remove DOM nodes");
+});
 //# sourceMappingURL=chat-controller-ordering.test.js.map