gsd-pi 2.74.0-dev.b741afb → 2.74.0-dev.ffbcc03

package/packages/pi-coding-agent/dist/modes/interactive/components/user-message.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-message.js","sourceRoot":"","sources":["../../../../src/modes/interactive/components/user-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAsB,MAAM,EAAQ,MAAM,aAAa,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAwB,MAAM,gBAAgB,CAAC;AAEvE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;AAC3C,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAEzC;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAIlD,YAAY,IAAY,EAAE,gBAA+B,gBAAgB,EAAE,EAAE,SAAkB,EAAE,kBAAmC,eAAe;QAClJ,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ,CACZ,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE;YACvC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,EAAE,IAAI,CAAC;YAC1D,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC;SAC1D,CAAC,CACF,CAAC;IACH,CAAC;IAEQ,MAAM,CAAC,KAAa;QAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACd,CAAC;QAED,2DAA2D;QAC3D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YACtE,MAAM,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACxD,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;YAClD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;QACnC,CAAC;QAED,KAAK,CAAC,CAAC,CAAC,GAAG,iBAAiB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACxC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,eAAe,CAAC;QACpE,OAAO,KAAK,CAAC;IACd,CAAC;CACD","sourcesContent":["import { Container, Markdown, type MarkdownTheme, Spacer, Text } from \"@gsd/pi-tui\";\nimport { getMarkdownTheme, theme } from \"../theme/theme.js\";\nimport { formatTimestamp, type TimestampFormat } from \"./timestamp.js\";\n\nconst OSC133_ZONE_START = \"\\x1b]133;A\\x07\";\nconst OSC133_ZONE_END = \"\\x1b]133;B\\x07\";\n\n/**\n * Component that renders a user message with a right-aligned timestamp.\n */\nexport class UserMessageComponent extends Container {\n\tprivate timestamp: number | undefined;\n\tprivate timestampFormat: TimestampFormat;\n\n\tconstructor(text: string, markdownTheme: MarkdownTheme = getMarkdownTheme(), timestamp?: number, timestampFormat: TimestampFormat = \"date-time-iso\") {\n\t\tsuper();\n\t\tthis.timestamp = timestamp;\n\t\tthis.timestampFormat = timestampFormat;\n\t\tthis.addChild(new Spacer(1));\n\t\tthis.addChild(\n\t\t\tnew Markdown(text, 1, 1, markdownTheme, {\n\t\t\t\tbgColor: (text: string) => theme.bg(\"userMessageBg\", text),\n\t\t\t\tcolor: (text: string) => theme.fg(\"userMessageText\", text),\n\t\t\t}),\n\t\t);\n\t}\n\n\toverride render(width: number): string[] {\n\t\tconst lines = super.render(width);\n\t\tif (lines.length === 0) {\n\t\t\treturn lines;\n\t\t}\n\n\t\t// Insert right-aligned timestamp above the message content\n\t\tif (this.timestamp) {\n\t\t\tconst timeStr = formatTimestamp(this.timestamp, this.timestampFormat);\n\t\t\tconst label = theme.fg(\"dim\", timeStr);\n\t\t\tconst padding = Math.max(0, width - timeStr.length - 1);\n\t\t\tconst timestampLine = \" \".repeat(padding) + label;\n\t\t\tlines.splice(0, 0, timestampLine);\n\t\t}\n\n\t\tlines[0] = OSC133_ZONE_START + lines[0];\n\t\tlines[lines.length - 1] = lines[lines.length - 1] + OSC133_ZONE_END;\n\t\treturn lines;\n\t}\n}\n"]}
+{"version":3,"file":"user-message.js","sourceRoot":"","sources":["../../../../src/modes/interactive/components/user-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAsB,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;AAC3C,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAEzC;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,SAAS;IAIlD,YAAY,IAAY,EAAE,gBAA+B,gBAAgB,EAAE,EAAE,SAAkB,EAAE,kBAAmC,eAAe;QAClJ,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;IACxD,CAAC;IAEQ,MAAM,CAAC,KAAa;QAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE;YACjD,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,MAAM;YACZ,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM,GAAG,GAAG,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;QAC5B,MAAM,cAAc,GAAG,CAAC,CAAC;QACzB,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;QACrC,GAAG,CAAC,cAAc,CAAC,GAAG,iBAAiB,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC;QAC9D,GAAG,CAAC,aAAa,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC;QAC1D,OAAO,GAAG,CAAC;IACZ,CAAC;CACD","sourcesContent":["import { Container, Markdown, type MarkdownTheme } from \"@gsd/pi-tui\";\nimport { getMarkdownTheme } from \"../theme/theme.js\";\nimport { type TimestampFormat } from \"./timestamp.js\";\nimport { renderChatFrame } from \"./chat-frame.js\";\n\nconst OSC133_ZONE_START = \"\\x1b]133;A\\x07\";\nconst OSC133_ZONE_END = \"\\x1b]133;B\\x07\";\n\n/**\n * Component that renders a user message with a right-aligned timestamp.\n */\nexport class UserMessageComponent extends Container {\n\tprivate timestamp: number | undefined;\n\tprivate timestampFormat: TimestampFormat;\n\n\tconstructor(text: string, markdownTheme: MarkdownTheme = getMarkdownTheme(), timestamp?: number, timestampFormat: TimestampFormat = \"date-time-iso\") {\n\t\tsuper();\n\t\tthis.timestamp = timestamp;\n\t\tthis.timestampFormat = timestampFormat;\n\t\tthis.addChild(new Markdown(text, 0, 0, markdownTheme));\n\t}\n\n\toverride render(width: number): string[] {\n\t\tconst frameWidth = Math.max(20, width);\n\t\tconst contentWidth = Math.max(1, frameWidth - 4);\n\t\tconst lines = super.render(contentWidth);\n\t\tconst framed = renderChatFrame(lines, frameWidth, {\n\t\t\tlabel: \"You\",\n\t\t\ttone: \"user\",\n\t\t\ttimestamp: this.timestamp,\n\t\t\ttimestampFormat: this.timestampFormat,\n\t\t\tshowTimestamp: true,\n\t\t});\n\t\tif (framed.length === 0) {\n\t\t\treturn framed;\n\t\t}\n\t\tconst out = [\"\", ...framed];\n\t\tconst firstFrameLine = 1;\n\t\tconst lastFrameLine = out.length - 1;\n\t\tout[firstFrameLine] = OSC133_ZONE_START + out[firstFrameLine];\n\t\tout[lastFrameLine] = out[lastFrameLine] + OSC133_ZONE_END;\n\t\treturn out;\n\t}\n}\n"]}

package/packages/pi-coding-agent/dist/modes/interactive/controllers/chat-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-controller.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/controllers/chat-controller.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAqCnG,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAgBxE;AAWD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,4BAA4B,EAAE,MAAM,GAAG,CAAC;IACxC,gBAAgB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACxD,qBAAqB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC;IACpD,2BAA2B,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,CAAC;IACvD,sBAAsB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,uBAAuB,EAAE,MAAM,IAAI,CAAC;IACpC,oBAAoB,EAAE,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,4BAA4B,EAAE,MAAM,IAAI,CAAC;IACzC,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,uBAAuB,EAAE,MAAM,IAAI,CAAC;IACpC,wBAAwB,EAAE;QAAE,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;CAChD,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAukB7C"}
+{"version":3,"file":"chat-controller.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/controllers/chat-controller.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AA+CnG,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAgBxE;AAWD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,wBAAwB,GAAG;IACvE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,4BAA4B,EAAE,MAAM,GAAG,CAAC;IACxC,gBAAgB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACxD,qBAAqB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC;IACpD,2BAA2B,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,CAAC;IACvD,sBAAsB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,uBAAuB,EAAE,MAAM,IAAI,CAAC;IACpC,oBAAoB,EAAE,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,4BAA4B,EAAE,MAAM,IAAI,CAAC;IACzC,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,uBAAuB,EAAE,MAAM,IAAI,CAAC;IACpC,wBAAwB,EAAE;QAAE,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;CAChD,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8zB7C"}

package/packages/pi-coding-agent/dist/modes/interactive/controllers/chat-controller.js

@@ -10,6 +10,10 @@ let lastProcessedContentIndex = 0;
 // the assistant content array for a new provider sub-turn within one lifecycle.
 let lastContentLength = 0;
 let renderedSegments = [];
+// 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 = [];
 function hasVisibleAssistantContent(message) {
     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));
@@ -51,6 +55,7 @@ export async function handleAgentEvent(host, event) {
         await host.init();
     }
     host.footer.invalidate();
+    const timestampFormat = host.settingsManager.getTimestampFormat();
     // Reset content index tracker and pinned state when a new assistant message starts
     if (event.type === "message_start" && event.message.role === "assistant") {
         lastProcessedContentIndex = 0;
@@ -58,6 +63,7 @@ export async function handleAgentEvent(host, event) {
         lastPinnedText = "";
         hasToolsInTurn = false;
         renderedSegments = [];
+        orphanedSegments = [];
         if (pinnedBorder)
             pinnedBorder.stopSpinner();
         pinnedBorder = undefined;
@@ -78,6 +84,7 @@ export async function handleAgentEvent(host, event) {
                     lastPinnedText = "";
                     hasToolsInTurn = false;
                     renderedSegments = [];
+                    orphanedSegments = [];
                     lastContentLength = 0;
                     if (pinnedBorder)
                         pinnedBorder.stopSpinner();
@@ -184,6 +191,10 @@ export async function handleAgentEvent(host, event) {
                 // content (#4144 regression). Prior sub-turn children stay in
                 // chatContainer as frozen history; new segments append after them.
                 if (contentBlocks.length < lastContentLength) {
+                    // Accumulate across successive shrinks — overwriting would drop
+                    // segments displaced by an earlier shrink, leaving them stranded
+                    // in chatContainer once the prune pass finally runs.
+                    orphanedSegments = [...orphanedSegments, ...renderedSegments];
                     renderedSegments = [];
                     lastPinnedText = "";
                     lastProcessedContentIndex = 0;
@@ -251,28 +262,119 @@ export async function handleAgentEvent(host, event) {
                 // Build desired segment plan from content[].
                 {
                     const blocks = host.streamingMessage.content;
+                    const isClaudeCodeProvider = host.streamingMessage.provider === "claude-code";
+                    const hasMcpToolBlock = blocks.some((b) => {
+                        if (b?.type === "toolCall") {
+                            return typeof b?.mcpServer === "string" || String(b?.name ?? "").startsWith("mcp__");
+                        }
+                        if (b?.type === "serverToolUse") {
+                            return typeof b?.mcpServer === "string" || String(b?.name ?? "").startsWith("mcp__");
+                        }
+                        return false;
+                    });
+                    const firstToolIdx = blocks.findIndex((b) => b.type === "toolCall" || b.type === "serverToolUse");
+                    const hasPostToolText = firstToolIdx >= 0
+                        && blocks.some((b, idx) => (idx > firstToolIdx
+                            && b?.type === "text"
+                            && typeof b?.text === "string"
+                            && b.text.trim().length > 0));
+                    // 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;
                     const desired = [];
                     let runStart = -1;
+                    let runEnd = -1;
+                    let runType;
+                    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 isText = b.type === "text" || b.type === "thinking";
+                        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";
-                        if (isText) {
-                            if (runStart === -1)
+                        // 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 {
-                            if (runStart !== -1) {
-                                desired.push({ kind: "text-run", startIndex: runStart, endIndex: i - 1 });
-                                runStart = -1;
-                            }
+                            closeRun();
                             if (isTool) {
                                 desired.push({ kind: "tool", contentIndex: i, toolId: b.id });
                             }
                         }
                     }
-                    if (runStart !== -1) {
-                        desired.push({ kind: "text-run", startIndex: runStart, endIndex: blocks.length - 1 });
+                    closeRun();
+                    // Claude Code MCP can emit provisional pre-tool prose that gets
+                    // superseded by post-tool output. Prune stale text-run segments so
+                    // the final assistant output remains below tool output.
+                    if (shouldDropPreToolProse && firstToolIdx >= 0) {
+                        if (orphanedSegments.length > 0) {
+                            const remainingOrphans = [];
+                            for (const orphan of orphanedSegments) {
+                                if (orphan.kind === "text-run" && orphan.contentType === "text") {
+                                    host.chatContainer.removeChild(orphan.component);
+                                    if (host.streamingComponent === orphan.component) {
+                                        host.streamingComponent = undefined;
+                                    }
+                                    continue;
+                                }
+                                remainingOrphans.push(orphan);
+                            }
+                            orphanedSegments = remainingOrphans;
+                        }
+                        const desiredTextKeys = new Set(desired
+                            .filter((seg) => seg.kind === "text-run")
+                            .map((seg) => `${seg.contentType}:${seg.startIndex}`));
+                        const desiredToolIndices = new Set(desired
+                            .filter((seg) => seg.kind === "tool")
+                            .map((seg) => seg.contentIndex));
+                        const nextRendered = [];
+                        for (const seg of renderedSegments) {
+                            if (seg.kind === "text-run"
+                                && seg.contentType === "text"
+                                && !desiredTextKeys.has(`${seg.contentType}:${seg.startIndex}`)) {
+                                host.chatContainer.removeChild(seg.component);
+                                if (host.streamingComponent === seg.component) {
+                                    host.streamingComponent = undefined;
+                                }
+                                continue;
+                            }
+                            if (seg.kind === "tool" && !desiredToolIndices.has(seg.contentIndex)) {
+                                continue;
+                            }
+                            nextRendered.push(seg);
+                        }
+                        renderedSegments = nextRendered;
                     }
                     // Append any newly needed segments (never reorder existing ones).
                     for (const seg of desired) {
@@ -289,11 +391,17 @@ export async function handleAgentEvent(host, event) {
                         }
                         else {
                             // text-run segment
-                            const existing = renderedSegments.find((s) => s.kind === "text-run" && s.startIndex === seg.startIndex);
+                            const existing = renderedSegments.find((s) => s.kind === "text-run" && s.startIndex === seg.startIndex && s.contentType === seg.contentType);
                             if (!existing) {
-                                const comp = new AssistantMessageComponent(undefined, host.hideThinkingBlock, host.getMarkdownThemeWithSettings(), host.settingsManager.getTimestampFormat(), { startIndex: seg.startIndex, endIndex: seg.endIndex });
+                                const comp = new AssistantMessageComponent(undefined, host.hideThinkingBlock, host.getMarkdownThemeWithSettings(), timestampFormat, { startIndex: seg.startIndex, endIndex: seg.endIndex });
                                 host.chatContainer.addChild(comp);
-                                renderedSegments.push({ kind: "text-run", startIndex: seg.startIndex, endIndex: seg.endIndex, component: comp });
+                                renderedSegments.push({
+                                    kind: "text-run",
+                                    startIndex: seg.startIndex,
+                                    endIndex: seg.endIndex,
+                                    contentType: seg.contentType,
+                                    component: comp,
+                                });
                                 host.streamingComponent = comp;
                             }
                         }
@@ -303,7 +411,7 @@ export async function handleAgentEvent(host, event) {
                     for (const seg of renderedSegments) {
                         if (seg.kind === "text-run") {
                             // Find corresponding desired segment to get current endIndex
-                            const d = desired.find((ds) => ds.kind === "text-run" && ds.startIndex === seg.startIndex);
+                            const d = desired.find((ds) => ds.kind === "text-run" && ds.startIndex === seg.startIndex && ds.contentType === seg.contentType);
                             if (d && d.kind === "text-run" && d.endIndex !== seg.endIndex) {
                                 seg.endIndex = d.endIndex;
                                 seg.component.setRange({ startIndex: seg.startIndex, endIndex: seg.endIndex });
@@ -379,8 +487,109 @@ export async function handleAgentEvent(host, event) {
                 const shouldRenderAssistant = hasVisibleAssistantContent(host.streamingMessage)
                     || ((host.streamingMessage.stopReason === "aborted" || host.streamingMessage.stopReason === "error")
                         && !hasAssistantToolBlocks(host.streamingMessage));
+                // The final message_end payload can contain additional text/thinking
+                // blocks that never arrived via message_update (e.g. SDK result
+                // aggregation). Rebuild this in-flight turn from final content so
+                // ranges/components don't keep stale partial indices.
+                if (renderedSegments.length > 0) {
+                    const finalBlocks = host.streamingMessage.content;
+                    const desired = [];
+                    let runStart = -1;
+                    let runEnd = -1;
+                    let runType;
+                    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];
+                        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 toolComponentsById = new Map();
+                    for (const [toolId, component] of host.pendingTools.entries()) {
+                        toolComponentsById.set(toolId, component);
+                    }
+                    for (const seg of renderedSegments) {
+                        host.chatContainer.removeChild(seg.component);
+                        if (seg.kind === "tool") {
+                            const priorBlocks = host.streamingMessage.content;
+                            const priorBlock = priorBlocks[seg.contentIndex];
+                            if (priorBlock?.id && !toolComponentsById.has(priorBlock.id)) {
+                                toolComponentsById.set(priorBlock.id, seg.component);
+                            }
+                        }
+                    }
+                    renderedSegments = [];
+                    host.streamingComponent = undefined;
+                    for (const seg of desired) {
+                        if (seg.kind === "tool") {
+                            const finalBlock = finalBlocks[seg.contentIndex];
+                            let component = toolComponentsById.get(seg.toolId);
+                            if (!component && finalBlock?.id) {
+                                component = host.pendingTools.get(finalBlock.id);
+                            }
+                            if (!component && finalBlock?.type === "toolCall") {
+                                component = new ToolExecutionComponent(finalBlock.name, finalBlock.arguments, { showImages: host.settingsManager.getShowImages() }, host.getRegisteredToolDefinition(finalBlock.name), host.ui);
+                                component.setExpanded(host.toolOutputExpanded);
+                                host.pendingTools.set(finalBlock.id, component);
+                                toolComponentsById.set(finalBlock.id, component);
+                            }
+                            else if (!component && finalBlock?.type === "serverToolUse") {
+                                component = new ToolExecutionComponent(finalBlock.name, finalBlock.input ?? {}, { showImages: host.settingsManager.getShowImages() }, undefined, host.ui);
+                                component.setExpanded(host.toolOutputExpanded);
+                                host.pendingTools.set(finalBlock.id, component);
+                                toolComponentsById.set(finalBlock.id, component);
+                            }
+                            if (component) {
+                                host.chatContainer.addChild(component);
+                                renderedSegments.push({ kind: "tool", contentIndex: seg.contentIndex, component });
+                            }
+                            continue;
+                        }
+                        const comp = new AssistantMessageComponent(undefined, host.hideThinkingBlock, host.getMarkdownThemeWithSettings(), timestampFormat, { startIndex: seg.startIndex, endIndex: seg.endIndex });
+                        comp.updateContent(host.streamingMessage);
+                        host.chatContainer.addChild(comp);
+                        renderedSegments.push({
+                            kind: "text-run",
+                            startIndex: seg.startIndex,
+                            endIndex: seg.endIndex,
+                            contentType: seg.contentType,
+                            component: comp,
+                        });
+                        host.streamingComponent = comp;
+                    }
+                }
                 if (!host.streamingComponent && shouldRenderAssistant) {
-                    host.streamingComponent = new AssistantMessageComponent(undefined, host.hideThinkingBlock, host.getMarkdownThemeWithSettings(), host.settingsManager.getTimestampFormat());
+                    host.streamingComponent = new AssistantMessageComponent(undefined, host.hideThinkingBlock, host.getMarkdownThemeWithSettings(), timestampFormat);
                     host.chatContainer.addChild(host.streamingComponent);
                 }
                 if (host.streamingComponent) {
@@ -409,6 +618,7 @@ export async function handleAgentEvent(host, event) {
                 host.streamingComponent = undefined;
                 host.streamingMessage = undefined;
                 renderedSegments = [];
+                orphanedSegments = [];
                 lastContentLength = 0;
                 // Clear pinned output once the message is finalized in the chat
                 // container — prevents duplicate display when the agent continues
@@ -456,11 +666,15 @@ export async function handleAgentEvent(host, event) {
                 host.loadingAnimation = undefined;
                 host.statusContainer.clear();
             }
-            if (host.streamingComponent) {
-                host.chatContainer.removeChild(host.streamingComponent);
-                host.streamingComponent = undefined;
-                host.streamingMessage = undefined;
+            if (host.streamingComponent && host.streamingMessage) {
+                host.streamingComponent.setShowMetadata(true);
+                host.streamingComponent.updateContent(host.streamingMessage);
             }
+            host.streamingComponent = undefined;
+            host.streamingMessage = undefined;
+            renderedSegments = [];
+            orphanedSegments = [];
+            lastContentLength = 0;
             host.pendingTools.clear();
             // Pinned output is only useful while work is actively streaming.
             // Keep chat history as the single source after completion.