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

package/packages/pi-coding-agent/dist/modes/interactive/components/chat-frame.d.ts

@@ -0,0 +1,11 @@
+import { type TimestampFormat } from "./timestamp.js";
+type FrameTone = "assistant" | "user";
+export declare function renderChatFrame(contentLines: string[], width: number, opts: {
+    label: string;
+    tone: FrameTone;
+    timestamp?: number;
+    timestampFormat: TimestampFormat;
+    showTimestamp?: boolean;
+}): string[];
+export {};
+//# sourceMappingURL=chat-frame.d.ts.map

package/packages/pi-coding-agent/dist/modes/interactive/components/chat-frame.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chat-frame.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/components/chat-frame.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEvE,KAAK,SAAS,GAAG,WAAW,GAAG,MAAM,CAAC;AAUtC,wBAAgB,eAAe,CAC9B,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE;IACL,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,CAAC,EAAE,OAAO,CAAC;CACxB,GACC,MAAM,EAAE,CA0CV"}

package/packages/pi-coding-agent/dist/modes/interactive/components/chat-frame.js

@@ -0,0 +1,47 @@
+import { truncateToWidth, visibleWidth } from "@gsd/pi-tui";
+import { theme } from "../theme/theme.js";
+import { formatTimestamp } from "./timestamp.js";
+function trimOuterBlankLines(lines) {
+    let start = 0;
+    let end = lines.length;
+    while (start < end && lines[start].trim().length === 0)
+        start++;
+    while (end > start && lines[end - 1].trim().length === 0)
+        end--;
+    return lines.slice(start, end);
+}
+export function renderChatFrame(contentLines, width, opts) {
+    const outerWidth = Math.max(20, width);
+    const contentWidth = Math.max(1, outerWidth - 2); // "│ " + content
+    const borderColor = opts.tone === "user" ? "borderAccent" : "border";
+    const borderMuted = opts.tone === "user" ? "borderMuted" : "borderMuted";
+    const border = (s) => theme.fg(borderColor, s);
+    const leftRaw = `• ${opts.label}`;
+    const rightRaw = opts.showTimestamp === false || !opts.timestamp
+        ? ""
+        : formatTimestamp(opts.timestamp, opts.timestampFormat);
+    const leftBudget = rightRaw
+        ? Math.max(1, outerWidth - visibleWidth(rightRaw) - 1)
+        : outerWidth;
+    const left = truncateToWidth(leftRaw, leftBudget, "");
+    const leftStyled = opts.tone === "user"
+        ? theme.fg("accent", theme.bold(left))
+        : theme.fg("muted", theme.bold(left));
+    const rightStyled = rightRaw ? theme.fg("dim", rightRaw) : "";
+    const gap = rightRaw.length > 0
+        ? Math.max(1, outerWidth - visibleWidth(leftStyled) - visibleWidth(rightStyled))
+        : Math.max(0, outerWidth - visibleWidth(leftStyled));
+    const headerRow = `${leftStyled}${" ".repeat(gap)}${rightStyled}`;
+    const headerPad = Math.max(0, outerWidth - visibleWidth(headerRow));
+    const sourceLines = trimOuterBlankLines(contentLines);
+    const bodyLines = (sourceLines.length > 0 ? sourceLines : [""]).map((line) => {
+        const clipped = truncateToWidth(line, contentWidth, "");
+        return border("│ ") + clipped;
+    });
+    return [
+        theme.fg(borderMuted, "─".repeat(outerWidth)),
+        headerRow + " ".repeat(headerPad),
+        ...bodyLines,
+    ];
+}
+//# sourceMappingURL=chat-frame.js.map

package/packages/pi-coding-agent/dist/modes/interactive/components/chat-frame.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chat-frame.js","sourceRoot":"","sources":["../../../../src/modes/interactive/components/chat-frame.ts"],"names":[],"mappings":"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","sourcesContent":["import { truncateToWidth, visibleWidth } from \"@gsd/pi-tui\";\nimport { theme } from \"../theme/theme.js\";\nimport { formatTimestamp, type TimestampFormat } from \"./timestamp.js\";\n\ntype FrameTone = \"assistant\" | \"user\";\n\nfunction trimOuterBlankLines(lines: string[]): string[] {\n\tlet start = 0;\n\tlet end = lines.length;\n\twhile (start < end && lines[start].trim().length === 0) start++;\n\twhile (end > start && lines[end - 1].trim().length === 0) end--;\n\treturn lines.slice(start, end);\n}\n\nexport function renderChatFrame(\n\tcontentLines: string[],\n\twidth: number,\n\topts: {\n\t\tlabel: string;\n\t\ttone: FrameTone;\n\t\ttimestamp?: number;\n\t\ttimestampFormat: TimestampFormat;\n\t\tshowTimestamp?: boolean;\n\t},\n): string[] {\n\tconst outerWidth = Math.max(20, width);\n\tconst contentWidth = Math.max(1, outerWidth - 2); // \"│ \" + content\n\tconst borderColor = opts.tone === \"user\" ? \"borderAccent\" : \"border\";\n\tconst borderMuted = opts.tone === \"user\" ? \"borderMuted\" : \"borderMuted\";\n\tconst border = (s: string) => theme.fg(borderColor, s);\n\tconst leftRaw = `• ${opts.label}`;\n\tconst rightRaw =\n\t\topts.showTimestamp === false || !opts.timestamp\n\t\t\t? \"\"\n\t\t\t: formatTimestamp(opts.timestamp, opts.timestampFormat);\n\n\tconst leftBudget = rightRaw\n\t\t? Math.max(1, outerWidth - visibleWidth(rightRaw) - 1)\n\t\t: outerWidth;\n\tconst left = truncateToWidth(leftRaw, leftBudget, \"\");\n\tconst leftStyled =\n\t\topts.tone === \"user\"\n\t\t\t? theme.fg(\"accent\", theme.bold(left))\n\t\t\t: theme.fg(\"muted\", theme.bold(left));\n\tconst rightStyled = rightRaw ? theme.fg(\"dim\", rightRaw) : \"\";\n\tconst gap =\n\t\trightRaw.length > 0\n\t\t\t? Math.max(\n\t\t\t\t\t1,\n\t\t\t\t\touterWidth - visibleWidth(leftStyled) - visibleWidth(rightStyled),\n\t\t\t\t)\n\t\t\t: Math.max(0, outerWidth - visibleWidth(leftStyled));\n\tconst headerRow = `${leftStyled}${\" \".repeat(gap)}${rightStyled}`;\n\tconst headerPad = Math.max(0, outerWidth - visibleWidth(headerRow));\n\n\tconst sourceLines = trimOuterBlankLines(contentLines);\n\tconst bodyLines = (sourceLines.length > 0 ? sourceLines : [\"\"]).map((line) => {\n\t\tconst clipped = truncateToWidth(line, contentWidth, \"\");\n\t\treturn border(\"│ \") + clipped;\n\t});\n\n\treturn [\n\t\ttheme.fg(borderMuted, \"─\".repeat(outerWidth)),\n\t\theaderRow + \" \".repeat(headerPad),\n\t\t...bodyLines,\n\t];\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"user-message.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/components/user-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,KAAK,aAAa,EAAgB,MAAM,aAAa,CAAC;AAEpF,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAKvE;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;IAClD,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,eAAe,CAAkB;gBAE7B,IAAI,EAAE,MAAM,EAAE,aAAa,GAAE,aAAkC,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,GAAE,eAAiC;IAa1I,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;CAmBxC"}
+{"version":3,"file":"user-message.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/components/user-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAEtE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMtD;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;IAClD,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,eAAe,CAAkB;gBAE7B,IAAI,EAAE,MAAM,EAAE,aAAa,GAAE,aAAkC,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,GAAE,eAAiC;IAO1I,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;CAqBxC"}

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

@@ -1,6 +1,6 @@
-import { Container, Markdown, Spacer } from "@gsd/pi-tui";
-import { getMarkdownTheme, theme } from "../theme/theme.js";
-import { formatTimestamp } from "./timestamp.js";
+import { Container, Markdown } from "@gsd/pi-tui";
+import { getMarkdownTheme } from "../theme/theme.js";
+import { renderChatFrame } from "./chat-frame.js";
 const OSC133_ZONE_START = "\x1b]133;A\x07";
 const OSC133_ZONE_END = "\x1b]133;B\x07";
 /**
@@ -11,28 +11,28 @@ export class UserMessageComponent extends Container {
         super();
         this.timestamp = timestamp;
         this.timestampFormat = timestampFormat;
-        this.addChild(new Spacer(1));
-        this.addChild(new Markdown(text, 1, 1, markdownTheme, {
-            bgColor: (text) => theme.bg("userMessageBg", text),
-            color: (text) => theme.fg("userMessageText", text),
-        }));
+        this.addChild(new Markdown(text, 0, 0, markdownTheme));
     }
     render(width) {
-        const lines = super.render(width);
-        if (lines.length === 0) {
-            return lines;
+        const frameWidth = Math.max(20, width);
+        const contentWidth = Math.max(1, frameWidth - 4);
+        const lines = super.render(contentWidth);
+        const framed = renderChatFrame(lines, frameWidth, {
+            label: "You",
+            tone: "user",
+            timestamp: this.timestamp,
+            timestampFormat: this.timestampFormat,
+            showTimestamp: true,
+        });
+        if (framed.length === 0) {
+            return framed;
         }
-        // Insert right-aligned timestamp above the message content
-        if (this.timestamp) {
-            const timeStr = formatTimestamp(this.timestamp, this.timestampFormat);
-            const label = theme.fg("dim", timeStr);
-            const padding = Math.max(0, width - timeStr.length - 1);
-            const timestampLine = " ".repeat(padding) + label;
-            lines.splice(0, 0, timestampLine);
-        }
-        lines[0] = OSC133_ZONE_START + lines[0];
-        lines[lines.length - 1] = lines[lines.length - 1] + OSC133_ZONE_END;
-        return lines;
+        const out = ["", ...framed];
+        const firstFrameLine = 1;
+        const lastFrameLine = out.length - 1;
+        out[firstFrameLine] = OSC133_ZONE_START + out[firstFrameLine];
+        out[lastFrameLine] = out[lastFrameLine] + OSC133_ZONE_END;
+        return out;
     }
 }
 //# sourceMappingURL=user-message.js.map

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;AAyCnG,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,CA2oB7C"}
+{"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

@@ -55,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;
@@ -190,7 +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) {
-                    orphanedSegments = [...renderedSegments];
+                    // 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;
@@ -268,42 +272,76 @@ export async function handleAgentEvent(host, event) {
                         }
                         return false;
                     });
-                    const shouldDropPreToolText = isClaudeCodeProvider && hasMcpToolBlock;
                     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 (shouldDropPreToolText && firstToolIdx >= 0 && i < firstToolIdx) {
-                                continue;
+                        // 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;
                             }
-                            if (runStart === -1)
+                            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 (shouldDropPreToolText && firstToolIdx >= 0) {
+                    if (shouldDropPreToolProse && firstToolIdx >= 0) {
                         if (orphanedSegments.length > 0) {
                             const remainingOrphans = [];
                             for (const orphan of orphanedSegments) {
-                                if (orphan.kind === "text-run") {
+                                if (orphan.kind === "text-run" && orphan.contentType === "text") {
                                     host.chatContainer.removeChild(orphan.component);
                                     if (host.streamingComponent === orphan.component) {
                                         host.streamingComponent = undefined;
@@ -314,15 +352,17 @@ export async function handleAgentEvent(host, event) {
                             }
                             orphanedSegments = remainingOrphans;
                         }
-                        const desiredTextStarts = new Set(desired
+                        const desiredTextKeys = new Set(desired
                             .filter((seg) => seg.kind === "text-run")
-                            .map((seg) => seg.startIndex));
+                            .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" && !desiredTextStarts.has(seg.startIndex)) {
+                            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;
@@ -351,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;
                             }
                         }
@@ -365,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 });
@@ -441,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) {