gsd-pi 2.73.1-dev.d987996 → 2.74.0-dev.0306a2e

package/packages/pi-coding-agent/dist/modes/interactive/components/dynamic-border.js

@@ -20,6 +20,7 @@ export class DynamicBorder {
         this.spinnerFrames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
         this.spinnerIndex = 0;
         this.spinnerInterval = null;
+        this.lastExternalRender = 0;
         this.color = color;
         this.label = label;
     }
@@ -28,7 +29,7 @@ export class DynamicBorder {
     }
     /**
      * Start an animated spinner that prepends to the label.
-     * The spinner rotates every 80ms and triggers a re-render via the TUI.
+     * The spinner rotates every 200ms and triggers a re-render via the TUI.
      */
     startSpinner(ui, colorFn) {
         this.stopSpinner();
@@ -36,8 +37,12 @@ export class DynamicBorder {
         this.spinnerIndex = 0;
         this.spinnerInterval = setInterval(() => {
             this.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length;
-            ui.requestRender();
-        }, 80);
+            // Only trigger standalone render if no other source rendered recently.
+            // During active streaming, message_update already calls requestRender().
+            if (Date.now() - this.lastExternalRender > 200) {
+                ui.requestRender();
+            }
+        }, 200);
         ui.requestRender();
     }
     /**
@@ -57,6 +62,7 @@ export class DynamicBorder {
         // No cached state to invalidate currently
     }
     render(width) {
+        this.lastExternalRender = Date.now();
         const spinnerPrefix = this.spinnerInterval && this.spinnerColorFn
             ? this.spinnerColorFn(this.spinnerFrames[this.spinnerIndex]) + " "
             : "";

package/packages/pi-coding-agent/dist/modes/interactive/components/dynamic-border.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-border.js","sourceRoot":"","sources":["../../../../src/modes/interactive/components/dynamic-border.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Component, TUI } from \"@gsd/pi-tui\";\nimport { visibleWidth } from \"@gsd/pi-tui\";\nimport { theme } from \"../theme/theme.js\";\n\n/**\n * Dynamic border component that adjusts to viewport width.\n * Supports an optional animated spinner in the label area.\n *\n * Note: When used from extensions loaded via jiti, the global `theme` may be undefined\n * because jiti creates a separate module cache. Always pass an explicit color\n * function when using DynamicBorder in components exported for extension use.\n */\nexport class DynamicBorder implements Component {\n\tprivate color: (str: string) => string;\n\tprivate label?: string;\n\tprivate spinnerFrames = [\"⠋\", \"⠙\", \"⠹\", \"⠸\", \"⠼\", \"⠴\", \"⠦\", \"⠧\", \"⠇\", \"⠏\"];\n\tprivate spinnerIndex = 0;\n\tprivate spinnerInterval: NodeJS.Timeout | null = null;\n\tprivate spinnerColorFn?: (str: string) => string;\n\n\tconstructor(color: (str: string) => string = (str) => {\n\t\ttry { return theme.fg(\"border\", str); } catch { return str; }\n\t}, label?: string) {\n\t\tthis.color = color;\n\t\tthis.label = label;\n\t}\n\n\tsetLabel(label: string | undefined): void {\n\t\tthis.label = label;\n\t}\n\n\t/**\n\t * Start an animated spinner that prepends to the label.\n\t * The spinner rotates every 80ms and triggers a re-render via the TUI.\n\t */\n\tstartSpinner(ui: TUI, colorFn: (str: string) => string): void {\n\t\tthis.stopSpinner();\n\t\tthis.spinnerColorFn = colorFn;\n\t\tthis.spinnerIndex = 0;\n\t\tthis.spinnerInterval = setInterval(() => {\n\t\t\tthis.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length;\n\t\t\tui.requestRender();\n\t\t}, 80);\n\t\tui.requestRender();\n\t}\n\n\t/**\n\t * Stop the spinner animation. The border reverts to a static label.\n\t */\n\tstopSpinner(): void {\n\t\tif (this.spinnerInterval) {\n\t\t\tclearInterval(this.spinnerInterval);\n\t\t\tthis.spinnerInterval = null;\n\t\t}\n\t\tthis.spinnerColorFn = undefined;\n\t}\n\n\tget isSpinning(): boolean {\n\t\treturn this.spinnerInterval !== null;\n\t}\n\n\tinvalidate(): void {\n\t\t// No cached state to invalidate currently\n\t}\n\n\trender(width: number): string[] {\n\t\tconst spinnerPrefix = this.spinnerInterval && this.spinnerColorFn\n\t\t\t? this.spinnerColorFn(this.spinnerFrames[this.spinnerIndex]) + \" \"\n\t\t\t: \"\";\n\n\t\tif (this.label) {\n\t\t\tconst labelText = ` ${spinnerPrefix}${this.label} `;\n\t\t\tconst labelVisible = visibleWidth(labelText);\n\t\t\tconst leading = \"── \";\n\t\t\tconst remaining = Math.max(0, width - labelVisible - leading.length);\n\t\t\tconst trailing = \"─\".repeat(Math.max(1, remaining));\n\t\t\t// Color leading and trailing separately so embedded ANSI in the\n\t\t\t// spinner/label doesn't bleed into the trailing dashes.\n\t\t\treturn [this.color(leading) + labelText + this.color(trailing)];\n\t\t}\n\t\treturn [this.color(\"─\".repeat(Math.max(1, width)))];\n\t}\n}\n"]}
+{"version":3,"file":"dynamic-border.js","sourceRoot":"","sources":["../../../../src/modes/interactive/components/dynamic-border.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Component, TUI } from \"@gsd/pi-tui\";\nimport { visibleWidth } from \"@gsd/pi-tui\";\nimport { theme } from \"../theme/theme.js\";\n\n/**\n * Dynamic border component that adjusts to viewport width.\n * Supports an optional animated spinner in the label area.\n *\n * Note: When used from extensions loaded via jiti, the global `theme` may be undefined\n * because jiti creates a separate module cache. Always pass an explicit color\n * function when using DynamicBorder in components exported for extension use.\n */\nexport class DynamicBorder implements Component {\n\tprivate color: (str: string) => string;\n\tprivate label?: string;\n\tprivate spinnerFrames = [\"⠋\", \"⠙\", \"⠹\", \"⠸\", \"⠼\", \"⠴\", \"⠦\", \"⠧\", \"⠇\", \"⠏\"];\n\tprivate spinnerIndex = 0;\n\tprivate spinnerInterval: NodeJS.Timeout | null = null;\n\tprivate spinnerColorFn?: (str: string) => string;\n\tprivate lastExternalRender = 0;\n\n\tconstructor(color: (str: string) => string = (str) => {\n\t\ttry { return theme.fg(\"border\", str); } catch { return str; }\n\t}, label?: string) {\n\t\tthis.color = color;\n\t\tthis.label = label;\n\t}\n\n\tsetLabel(label: string | undefined): void {\n\t\tthis.label = label;\n\t}\n\n\t/**\n\t * Start an animated spinner that prepends to the label.\n\t * The spinner rotates every 200ms and triggers a re-render via the TUI.\n\t */\n\tstartSpinner(ui: TUI, colorFn: (str: string) => string): void {\n\t\tthis.stopSpinner();\n\t\tthis.spinnerColorFn = colorFn;\n\t\tthis.spinnerIndex = 0;\n\t\tthis.spinnerInterval = setInterval(() => {\n\t\t\tthis.spinnerIndex = (this.spinnerIndex + 1) % this.spinnerFrames.length;\n\t\t\t// Only trigger standalone render if no other source rendered recently.\n\t\t\t// During active streaming, message_update already calls requestRender().\n\t\t\tif (Date.now() - this.lastExternalRender > 200) {\n\t\t\t\tui.requestRender();\n\t\t\t}\n\t\t}, 200);\n\t\tui.requestRender();\n\t}\n\n\t/**\n\t * Stop the spinner animation. The border reverts to a static label.\n\t */\n\tstopSpinner(): void {\n\t\tif (this.spinnerInterval) {\n\t\t\tclearInterval(this.spinnerInterval);\n\t\t\tthis.spinnerInterval = null;\n\t\t}\n\t\tthis.spinnerColorFn = undefined;\n\t}\n\n\tget isSpinning(): boolean {\n\t\treturn this.spinnerInterval !== null;\n\t}\n\n\tinvalidate(): void {\n\t\t// No cached state to invalidate currently\n\t}\n\n\trender(width: number): string[] {\n\t\tthis.lastExternalRender = Date.now();\n\t\tconst spinnerPrefix = this.spinnerInterval && this.spinnerColorFn\n\t\t\t? this.spinnerColorFn(this.spinnerFrames[this.spinnerIndex]) + \" \"\n\t\t\t: \"\";\n\n\t\tif (this.label) {\n\t\t\tconst labelText = ` ${spinnerPrefix}${this.label} `;\n\t\t\tconst labelVisible = visibleWidth(labelText);\n\t\t\tconst leading = \"── \";\n\t\t\tconst remaining = Math.max(0, width - labelVisible - leading.length);\n\t\t\tconst trailing = \"─\".repeat(Math.max(1, remaining));\n\t\t\t// Color leading and trailing separately so embedded ANSI in the\n\t\t\t// spinner/label doesn't bleed into the trailing dashes.\n\t\t\treturn [this.color(leading) + labelText + this.color(trailing)];\n\t\t}\n\t\treturn [this.color(\"─\".repeat(Math.max(1, width)))];\n\t}\n}\n"]}

package/packages/pi-coding-agent/dist/modes/interactive/components/dynamic-border.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=dynamic-border.test.d.ts.map

package/packages/pi-coding-agent/dist/modes/interactive/components/dynamic-border.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dynamic-border.test.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/components/dynamic-border.test.ts"],"names":[],"mappings":""}

package/packages/pi-coding-agent/dist/modes/interactive/components/dynamic-border.test.js

@@ -0,0 +1,52 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { DynamicBorder } from "./dynamic-border.js";
+function makeTUI() {
+    return {
+        renderCount: 0,
+        requestRender() {
+            this.renderCount++;
+        },
+    };
+}
+describe("DynamicBorder spinner", () => {
+    it("suppresses standalone render when an external render occurred recently", () => {
+        const border = new DynamicBorder((s) => s);
+        const tui = makeTUI();
+        border.startSpinner(tui, (s) => s);
+        // startSpinner calls requestRender once immediately
+        assert.equal(tui.renderCount, 1, "initial render on startSpinner");
+        // Simulate an externally-triggered render (e.g. from streaming)
+        border.render(80);
+        // Access the private interval callback by advancing the timer
+        // Instead, we directly test the render-batching logic:
+        // After render() sets lastExternalRender, a spinner tick within 200ms
+        // should NOT call requestRender.
+        const anyBorder = border;
+        assert.ok(Date.now() - anyBorder.lastExternalRender < 200, "lastExternalRender should be recent after render()");
+        border.stopSpinner();
+    });
+    it("triggers standalone render when no external render occurred recently", async () => {
+        const border = new DynamicBorder((s) => s);
+        const tui = makeTUI();
+        // Set lastExternalRender to a time well in the past
+        const anyBorder = border;
+        anyBorder.lastExternalRender = 0;
+        border.startSpinner(tui, (s) => s);
+        const initialCount = tui.renderCount;
+        // Wait for one spinner tick (200ms interval + buffer)
+        await new Promise((r) => setTimeout(r, 250));
+        assert.ok(tui.renderCount > initialCount, "spinner should trigger requestRender when no recent external render");
+        border.stopSpinner();
+    });
+    it("updates lastExternalRender on each render() call", () => {
+        const border = new DynamicBorder((s) => s);
+        const anyBorder = border;
+        const before = Date.now();
+        border.render(80);
+        const after = Date.now();
+        assert.ok(anyBorder.lastExternalRender >= before);
+        assert.ok(anyBorder.lastExternalRender <= after);
+    });
+});
+//# sourceMappingURL=dynamic-border.test.js.map

package/packages/pi-coding-agent/dist/modes/interactive/components/dynamic-border.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dynamic-border.test.js","sourceRoot":"","sources":["../../../../src/modes/interactive/components/dynamic-border.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAQ,MAAM,WAAW,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,SAAS,OAAO;IACf,OAAO;QACN,WAAW,EAAE,CAAC;QACd,aAAa;YACZ,IAAI,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC;KACD,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QACjF,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;QAEtB,MAAM,CAAC,YAAY,CAAC,GAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1C,oDAAoD;QACpD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE,gCAAgC,CAAC,CAAC;QAEnE,gEAAgE;QAChE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAElB,8DAA8D;QAC9D,uDAAuD;QACvD,sEAAsE;QACtE,iCAAiC;QACjC,MAAM,SAAS,GAAG,MAAa,CAAC;QAChC,MAAM,CAAC,EAAE,CACR,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,kBAAkB,GAAG,GAAG,EAC/C,oDAAoD,CACpD,CAAC;QAEF,MAAM,CAAC,WAAW,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACrF,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;QAEtB,oDAAoD;QACpD,MAAM,SAAS,GAAG,MAAa,CAAC;QAChC,SAAS,CAAC,kBAAkB,GAAG,CAAC,CAAC;QAEjC,MAAM,CAAC,YAAY,CAAC,GAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,YAAY,GAAG,GAAG,CAAC,WAAW,CAAC;QAErC,sDAAsD;QACtD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAE7C,MAAM,CAAC,EAAE,CACR,GAAG,CAAC,WAAW,GAAG,YAAY,EAC9B,qEAAqE,CACrE,CAAC;QAEF,MAAM,CAAC,WAAW,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC3D,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,MAAa,CAAC;QAEhC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEzB,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,kBAAkB,IAAI,MAAM,CAAC,CAAC;QAClD,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,kBAAkB,IAAI,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["import assert from \"node:assert/strict\";\nimport { describe, it, mock } from \"node:test\";\n\nimport { DynamicBorder } from \"./dynamic-border.js\";\n\nfunction makeTUI() {\n\treturn {\n\t\trenderCount: 0,\n\t\trequestRender() {\n\t\t\tthis.renderCount++;\n\t\t},\n\t};\n}\n\ndescribe(\"DynamicBorder spinner\", () => {\n\tit(\"suppresses standalone render when an external render occurred recently\", () => {\n\t\tconst border = new DynamicBorder((s) => s);\n\t\tconst tui = makeTUI();\n\n\t\tborder.startSpinner(tui as any, (s) => s);\n\t\t// startSpinner calls requestRender once immediately\n\t\tassert.equal(tui.renderCount, 1, \"initial render on startSpinner\");\n\n\t\t// Simulate an externally-triggered render (e.g. from streaming)\n\t\tborder.render(80);\n\n\t\t// Access the private interval callback by advancing the timer\n\t\t// Instead, we directly test the render-batching logic:\n\t\t// After render() sets lastExternalRender, a spinner tick within 200ms\n\t\t// should NOT call requestRender.\n\t\tconst anyBorder = border as any;\n\t\tassert.ok(\n\t\t\tDate.now() - anyBorder.lastExternalRender < 200,\n\t\t\t\"lastExternalRender should be recent after render()\",\n\t\t);\n\n\t\tborder.stopSpinner();\n\t});\n\n\tit(\"triggers standalone render when no external render occurred recently\", async () => {\n\t\tconst border = new DynamicBorder((s) => s);\n\t\tconst tui = makeTUI();\n\n\t\t// Set lastExternalRender to a time well in the past\n\t\tconst anyBorder = border as any;\n\t\tanyBorder.lastExternalRender = 0;\n\n\t\tborder.startSpinner(tui as any, (s) => s);\n\t\tconst initialCount = tui.renderCount;\n\n\t\t// Wait for one spinner tick (200ms interval + buffer)\n\t\tawait new Promise((r) => setTimeout(r, 250));\n\n\t\tassert.ok(\n\t\t\ttui.renderCount > initialCount,\n\t\t\t\"spinner should trigger requestRender when no recent external render\",\n\t\t);\n\n\t\tborder.stopSpinner();\n\t});\n\n\tit(\"updates lastExternalRender on each render() call\", () => {\n\t\tconst border = new DynamicBorder((s) => s);\n\t\tconst anyBorder = border as any;\n\n\t\tconst before = Date.now();\n\t\tborder.render(80);\n\t\tconst after = Date.now();\n\n\t\tassert.ok(anyBorder.lastExternalRender >= before);\n\t\tassert.ok(anyBorder.lastExternalRender <= after);\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;AA0BnG,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,CAsf7C"}
+{"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,CAuzB7C"}

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

@@ -6,6 +6,14 @@ import { DynamicBorder } from "../components/dynamic-border.js";
 import { appKey } from "../components/keybinding-hints.js";
 // Tracks the last processed content index to avoid re-scanning all blocks on every message_update
 let lastProcessedContentIndex = 0;
+// Tracks the previous content[] length so we can detect when an adapter resets
+// 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));
@@ -50,8 +58,11 @@ export async function handleAgentEvent(host, event) {
     // Reset content index tracker and pinned state when a new assistant message starts
     if (event.type === "message_start" && event.message.role === "assistant") {
         lastProcessedContentIndex = 0;
+        lastContentLength = 0;
         lastPinnedText = "";
         hasToolsInTurn = false;
+        renderedSegments = [];
+        orphanedSegments = [];
         if (pinnedBorder)
             pinnedBorder.stopSpinner();
         pinnedBorder = undefined;
@@ -71,6 +82,9 @@ export async function handleAgentEvent(host, event) {
                     host.pinnedMessageContainer.clear();
                     lastPinnedText = "";
                     hasToolsInTurn = false;
+                    renderedSegments = [];
+                    orphanedSegments = [];
+                    lastContentLength = 0;
                     if (pinnedBorder)
                         pinnedBorder.stopSpinner();
                     pinnedBorder = undefined;
@@ -167,12 +181,27 @@ export async function handleAgentEvent(host, event) {
                     }
                 }
                 const contentBlocks = host.streamingMessage.content;
-                // Some adapters reuse a single assistant lifecycle while internally
-                // spanning multiple provider turns. When a new turn starts, content
-                // length can shrink back to 0/1; reset scan index to avoid skipping.
-                if (lastProcessedContentIndex >= contentBlocks.length) {
+                // Some adapters (notably claude-code) reuse a single assistant
+                // lifecycle while internally spanning multiple provider sub-turns.
+                // When a new sub-turn starts, content[] length shrinks back to 0/1.
+                // The scan loop needs its index reset, AND the segment walker's
+                // renderedSegments map must be cleared so existing text-run
+                // components don't get overwritten in place with new sub-turn
+                // 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;
+                }
+                else if (lastProcessedContentIndex >= contentBlocks.length) {
                     lastProcessedContentIndex = 0;
                 }
+                lastContentLength = contentBlocks.length;
                 for (let i = lastProcessedContentIndex; i < contentBlocks.length; i++) {
                     const content = contentBlocks[i];
                     if (content.type === "toolCall") {
@@ -228,19 +257,166 @@ export async function handleAgentEvent(host, event) {
                         });
                     }
                 }
-                // Render assistant text/thinking after tool components so mixed
-                // streams keep chronological ordering in the chat container.
-                const hasToolBlocks = hasAssistantToolBlocks(host.streamingMessage);
-                if (!host.streamingComponent && hasVisibleAssistantContent(host.streamingMessage)) {
-                    host.streamingComponent = new AssistantMessageComponent(undefined, host.hideThinkingBlock, host.getMarkdownThemeWithSettings(), host.settingsManager.getTimestampFormat());
-                    host.chatContainer.addChild(host.streamingComponent);
-                }
-                if (host.streamingComponent) {
-                    if (hasToolBlocks) {
-                        host.chatContainer.removeChild(host.streamingComponent);
-                        host.chatContainer.addChild(host.streamingComponent);
+                // Segment walker: render content blocks in stream order, append-only.
+                // 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 blockType = b.type === "text" || b.type === "thinking" ? b.type : undefined;
+                        const isTextLike = blockType === "text" || blockType === "thinking";
+                        const isTool = b.type === "toolCall" || b.type === "serverToolUse";
+                        // For Claude Code MCP turns, prune only pre-tool prose, never thinking.
+                        const shouldSkipProse = shouldDropPreToolProse && firstToolIdx >= 0 && i < firstToolIdx && blockType === "text";
+                        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 {
+                            closeRun();
+                            if (isTool) {
+                                desired.push({ kind: "tool", contentIndex: i, toolId: b.id });
+                            }
+                        }
+                    }
+                    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) {
+                        if (seg.kind === "tool") {
+                            // Tool segments are already handled above via pendingTools; just
+                            // register them in renderedSegments if not yet tracked.
+                            const existing = renderedSegments.find((s) => s.kind === "tool" && s.contentIndex === seg.contentIndex);
+                            if (!existing) {
+                                const comp = host.pendingTools.get(seg.toolId);
+                                if (comp) {
+                                    renderedSegments.push({ kind: "tool", contentIndex: seg.contentIndex, component: comp });
+                                }
+                            }
+                        }
+                        else {
+                            // text-run segment
+                            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 });
+                                host.chatContainer.addChild(comp);
+                                renderedSegments.push({
+                                    kind: "text-run",
+                                    startIndex: seg.startIndex,
+                                    endIndex: seg.endIndex,
+                                    contentType: seg.contentType,
+                                    component: comp,
+                                });
+                                host.streamingComponent = comp;
+                            }
+                        }
+                    }
+                    // Update all trailing text-run segments with the latest message so
+                    // streaming text grows in place.
+                    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 && 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 });
+                            }
+                            seg.component.updateContent(host.streamingMessage);
+                        }
+                    }
+                    // Keep streamingComponent pointing at the last text-run for message_end compatibility.
+                    const lastTextSeg = [...renderedSegments].reverse().find((s) => s.kind === "text-run");
+                    if (lastTextSeg && lastTextSeg.kind === "text-run") {
+                        host.streamingComponent = lastTextSeg.component;
                     }
-                    host.streamingComponent.updateContent(host.streamingMessage);
                 }
                 // Update index: fully processed blocks won't need re-scanning.
                 // Keep the last block's index (it may still be accumulating data),
@@ -304,11 +480,113 @@ 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(), host.settingsManager.getTimestampFormat(), { 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.chatContainer.addChild(host.streamingComponent);
                 }
                 if (host.streamingComponent) {
+                    host.streamingComponent.setShowMetadata(true);
                     host.streamingComponent.updateContent(host.streamingMessage);
                 }
                 if (host.streamingMessage.stopReason === "aborted" || host.streamingMessage.stopReason === "error") {
@@ -332,6 +610,9 @@ 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
                 // (e.g. form elicitation) after the assistant message ends.
@@ -378,11 +659,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.