@pi-unipi/unipi 2.17.2 → 2.18.0

package/packages/unipi/bundled.js

@@ -26381,8 +26381,8 @@ function buildOverlayTranscript(entries, theme) {
     if (options.blankBefore !== false) {
       pushBlankLine();
     }
-    const firstLine2 = bodyLines.shift() ?? "";
-    lines.push(`${header}${firstLine2 ? ` ${style(firstLine2)}` : ""}`);
+    const firstLine4 = bodyLines.shift() ?? "";
+    lines.push(`${header}${firstLine4 ? ` ${style(firstLine4)}` : ""}`);
     for (const line of bodyLines) {
       lines.push(`${blockIndent}${style(line)}`);
     }
@@ -33186,34 +33186,34 @@ function registerAskUserTools(pi) {
         };
       }
       const response = result2.response;
-      let contentText;
+      let contentText2;
       switch (response.kind) {
         case "selection": {
           const selections = response.selections || [];
-          contentText = selections.length === 1 ? `User selected: ${selections[0]}` : `User selected: ${selections.join(", ")}`;
+          contentText2 = selections.length === 1 ? `User selected: ${selections[0]}` : `User selected: ${selections.join(", ")}`;
           break;
         }
         case "freeform":
-          contentText = `User wrote: ${response.text}`;
+          contentText2 = `User wrote: ${response.text}`;
           break;
         case "combined": {
           const selections = response.selections || [];
           const selText = selections.length === 1 ? selections[0] : selections.join(", ");
-          contentText = `User selected: ${selText} and wrote: ${response.text}`;
+          contentText2 = `User selected: ${selText} and wrote: ${response.text}`;
           break;
         }
         case "end_turn":
           ctx.abort();
-          contentText = "User chose to end the turn.";
+          contentText2 = "User chose to end the turn.";
           break;
         case "new_session":
-          contentText = response.prefill ? `User chose to hand off to: ${response.prefill}` : "User chose a handoff without a prefill.";
+          contentText2 = response.prefill ? `User chose to hand off to: ${response.prefill}` : "User chose a handoff without a prefill.";
           break;
         case "timed_out":
-          contentText = "User did not respond (timed out)";
+          contentText2 = "User did not respond (timed out)";
           break;
         default:
-          contentText = "No response";
+          contentText2 = "No response";
       }
       if (response.kind === "new_session") {
         const prefill = response.prefill || "";
@@ -33265,14 +33265,14 @@ Preparing for new task. Summarize previous work concisely, preserving only what'
         }
         const launchLabel = launcherResult.action === "compact" ? "compact" : "direct";
         if (handoff.status === "editor_prefill") {
-          contentText = `Queued ${launchLabel} handoff fell back to editor prefill: ${handoff.prefill}`;
+          contentText2 = `Queued ${launchLabel} handoff fell back to editor prefill: ${handoff.prefill}`;
         } else if (handoff.status === "failed") {
-          contentText = `Failed to queue ${launchLabel} handoff: ${handoff.prefill ?? prefill}`;
+          contentText2 = `Failed to queue ${launchLabel} handoff: ${handoff.prefill ?? prefill}`;
         } else {
-          contentText = `Queued ${launchLabel} handoff: ${handoff.prefill ?? prefill}`;
+          contentText2 = `Queued ${launchLabel} handoff: ${handoff.prefill ?? prefill}`;
         }
         return {
-          content: [{ type: "text", text: contentText }],
+          content: [{ type: "text", text: contentText2 }],
           details: {
             ...detailsBase,
             response: {
@@ -33287,7 +33287,7 @@ Preparing for new task. Summarize previous work concisely, preserving only what'
         };
       }
       return {
-        content: [{ type: "text", text: contentText }],
+        content: [{ type: "text", text: contentText2 }],
         details: {
           ...detailsBase,
           response
@@ -44693,6 +44693,19 @@ var SEP = " \u2502 ";
 var RESET2 = "\x1B[0m";
 var LEAD_FG = "\x1B[1m\x1B[38;2;181;189;104m";
 var DIM_FG = "\x1B[38;2;120;124;134m";
+function renderFusionStatus(fusion) {
+  const lead = `${fusion.leadName}${fusion.leadEffort ? ` ${fusion.leadEffort}` : ""}`;
+  const side = `${fusion.sidekickName}${fusion.sidekickEffort ? ` ${fusion.sidekickEffort}` : ""}`;
+  const busy = fusion.busy === true;
+  const leadCalls = fusion.leadToolCalls ?? 0;
+  const sidekickCalls = fusion.sidekickToolCalls ?? 0;
+  const totalCalls = leadCalls + sidekickCalls;
+  const saved = fusion.savedUsd !== void 0 && fusion.savedUsd > 5e-3 ? ` \xB7 saved $${fusion.savedUsd.toFixed(2)}` : "";
+  const split = totalCalls > 0 ? ` \xB7 ${String(sidekickCalls)}/${String(totalCalls)} calls` : "";
+  const core = busy ? `${DIM_FG}Fusion \xB7 ${lead}${RESET2} ${LEAD_FG}\u25C6 ${side} \xB7 working${RESET2}` : `${LEAD_FG}Fusion \xB7 ${lead}${RESET2} ${DIM_FG}\u25C6 ${side}${RESET2}`;
+  const tail = `${split}${saved}`;
+  return tail ? `${core}${DIM_FG}${tail}${RESET2}` : core;
+}
 var ANSI_RE = /\x1B(?:\[[0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1b\\)|_[^\x07]*(?:\x07|\x1b\\))/g;
 function stripControls(text) {
   return text.replace(ANSI_RE, "").replace(/[\r\n\t]/g, " ");
@@ -44789,11 +44802,7 @@ var GlanceEditor = class _GlanceEditor extends CustomEditor {
     const winLabel = st.contextWindow > 0 ? `/${fmtTokens(st.contextWindow)}` : "";
     rightParts.push(`${pctLabel}${winLabel}`);
     if (st.fusion) {
-      const lead = `${st.fusion.leadName}${st.fusion.leadEffort ? ` ${st.fusion.leadEffort}` : ""}`;
-      const side = `${st.fusion.sidekickName}${st.fusion.sidekickEffort ? ` ${st.fusion.sidekickEffort}` : ""}`;
-      rightParts.push(
-        `${LEAD_FG}Fusion \xB7 ${lead}${RESET2} ${DIM_FG}\u25C6 ${side}${st.fusion.savedUsd !== void 0 && st.fusion.savedUsd > 5e-3 ? ` \xB7 saved $${st.fusion.savedUsd.toFixed(2)}` : ""}${RESET2}`
-      );
+      rightParts.push(renderFusionStatus(st.fusion));
     } else {
       if (st.modelName) rightParts.push(st.modelName);
       if (st.thinkingLevel && st.thinkingLevel !== "off") {
@@ -51095,6 +51104,8 @@ import { mkdirSync as mkdirSync44, unlinkSync as unlinkSync12, writeFileSync as
 import { tmpdir as tmpdir7 } from "node:os";
 import { dirname as dirname49, join as join75 } from "node:path";
 import { randomUUID as randomUUID11 } from "node:crypto";
+var MAX_EVENTS = 300;
+var MAX_TOOL_OUTPUT = 4e3;
 var emptyUsage = () => ({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 });
 var SidekickRuntime = class {
   cfg;
@@ -51119,6 +51130,37 @@ var SidekickRuntime = class {
   isBusy() {
     return this.pending !== void 0;
   }
+  totalToolCalls() {
+    let total = this.pending?.progress.toolCalls ?? 0;
+    for (const report of this.reports.values()) total += report.toolCalls;
+    return total;
+  }
+  notifyProgress() {
+    try {
+      this.cfg.onProgress?.();
+    } catch {
+    }
+  }
+  appendEvent(event) {
+    const progress = this.pending?.progress;
+    if (!progress) return;
+    progress.events.push(event);
+    if (progress.events.length > MAX_EVENTS) {
+      progress.events.shift();
+      progress.droppedEvents += 1;
+    }
+  }
+  closeOpenText() {
+    const events = this.pending?.progress.events;
+    const last = events?.at(-1);
+    if (last?.kind === "text" && last.open) last.open = false;
+  }
+  toolOutput(result2) {
+    if (typeof result2 === "object" && result2 !== null && Array.isArray(result2.content)) {
+      return result2.content.map((part) => typeof part === "object" && part !== null && typeof part.text === "string" ? part.text : typeof part === "string" ? part : "").filter(Boolean).join("\n").slice(-MAX_TOOL_OUTPUT);
+    }
+    return String(result2 ?? "").slice(-MAX_TOOL_OUTPUT);
+  }
   send(value) {
     if (!this.child?.stdin?.writable) throw new Error("Sidekick process is not writable");
     this.child.stdin.write(`${JSON.stringify(value)}
@@ -51210,19 +51252,39 @@ var SidekickRuntime = class {
     }
     if (this.pending === void 0) return;
     if (message.type === "tool_execution_start") {
+      this.closeOpenText();
       this.pending.progress.toolCalls += 1;
-      const args = message.args === void 0 ? "" : JSON.stringify(message.args).replace(/\s+/gu, " ");
-      const summary = `${String(message.toolName ?? "tool")}(${args})`.slice(0, 40);
+      const args = message.args !== void 0 && typeof message.args === "object" && message.args !== null ? message.args : void 0;
+      const argsText = args === void 0 ? "" : JSON.stringify(args).replace(/\s+/gu, " ");
+      const summary = `${String(message.toolName ?? "tool")}(${argsText})`.slice(0, 40);
       this.pending.progress.recentTools = [...this.pending.progress.recentTools, summary].slice(-6);
+      this.appendEvent({ kind: "tool", toolCallId: String(message.toolCallId ?? ""), name: String(message.toolName ?? "tool"), args, output: "", isError: false, done: false, startedAt: Date.now() });
+      this.notifyProgress();
+    } else if (message.type === "tool_execution_end") {
+      const toolCallId = String(message.toolCallId ?? "");
+      const event = [...this.pending.progress.events].reverse().find((entry) => entry.kind === "tool" && entry.toolCallId === toolCallId);
+      if (event) {
+        event.done = true;
+        event.endedAt = Date.now();
+        event.isError = message.isError === true;
+        event.output = this.toolOutput(message.result);
+      }
+      this.notifyProgress();
     } else if (message.type === "message_update") {
-      const event = message.assistantMessageEvent ?? message;
-      if (event.type === "text_delta") {
-        const delta = typeof event.delta === "string" ? event.delta : typeof event.text === "string" ? event.text : "";
+      const streamEvent = message.assistantMessageEvent ?? message;
+      if (streamEvent.type === "text_delta") {
+        const delta = typeof streamEvent.delta === "string" ? streamEvent.delta : typeof streamEvent.text === "string" ? streamEvent.text : "";
         this.pending.progress.textTail = `${this.pending.progress.textTail}${delta}`.slice(-400);
+        const last = this.pending.progress.events.at(-1);
+        if (last?.kind === "text" && last.open) last.text += delta;
+        else this.appendEvent({ kind: "text", text: delta, open: true });
+        this.notifyProgress();
       }
     } else if (message.type === "message_end") {
       const msg = message.message;
       if (msg?.role === "assistant") {
+        this.closeOpenText();
+        this.notifyProgress();
         if (msg.stopReason === "error" && typeof msg.errorMessage === "string") this.pendingError = msg.errorMessage;
         const usage2 = msg.usage;
         if (usage2) {
@@ -51270,11 +51332,13 @@ var SidekickRuntime = class {
       usage: { ...current.usage },
       toolCalls: current.progress.toolCalls,
       durationMs: Date.now() - current.startedAt,
+      events: current.progress.events.map((event) => ({ ...event })),
       ...error === void 0 ? {} : { error }
     };
     this.reports.set(report.id, report);
     if (this.latestHandoff?.id === report.id) this.latestHandoff.report = report;
     current.resolve(report);
+    this.notifyProgress();
     this.abortRequested = false;
     this.pendingError = void 0;
   }
@@ -51297,7 +51361,7 @@ var SidekickRuntime = class {
       id,
       startedAt,
       usage: emptyUsage(),
-      progress: { toolCalls: 0, recentTools: [], textTail: "", startedAt },
+      progress: { toolCalls: 0, recentTools: [], textTail: "", startedAt, events: [], droppedEvents: 0 },
       resolve: resolve22,
       reject
     };
@@ -51310,7 +51374,9 @@ var SidekickRuntime = class {
     return { id, done };
   }
   progress(id) {
-    if (this.pending !== void 0 && (id === void 0 || id === this.pending.id)) return { ...this.pending.progress, recentTools: [...this.pending.progress.recentTools] };
+    if (this.pending !== void 0 && (id === void 0 || id === this.pending.id)) {
+      return { ...this.pending.progress, recentTools: [...this.pending.progress.recentTools], events: this.pending.progress.events.map((event) => ({ ...event })) };
+    }
     return void 0;
   }
   latest() {
@@ -51387,7 +51453,10 @@ You have a \`sidekick\` tool: a persistent subagent that works alongside you on
 - **Premature implementation briefing.** Working solo you would catch a wrong assumption as you go; when delegating, the sidekick executes what you wrote, and changing course afterwards is expensive. Hold your plan to a higher confidence bar than you would need to start yourself. Every claim your plan depends on must either be verified or explicitly marked as a hypothesis for the sidekick to verify; verification instructions must cover every surface you discovered.
 - **Promoting a delegated hypothesis to a confirmed conclusion.** When a report ranks candidate causes, the ranking is not a verdict. Present a cause as the root cause only if evidence shows its code path actually executes in the reported scenario; otherwise present it as the leading hypothesis and name the check that would settle it.`;
 }
-var FIRST_EDIT_NUDGE = "<system_guidance>You made a direct edit yourself instead of delegating to the sidekick. That is fine for a trivially small change (one you can make and confirm in 1-2 turns with nothing left to test). For anything larger \u2014 multiple files, anything that needs a test run, anything you would want to look over again \u2014 write a brief and hand it to `sidekick` instead: you design and review, it implements and verifies. This reminder is shown once.</system_guidance>";
+var EDIT_NUDGE = "<system_guidance>You made a direct edit yourself instead of delegating to the sidekick. This is a reminder that implementation and verification are to be delegated by default. ONLY implement a step yourself if it is trivially small (you can make the edit AND confirm it in 1-2 of your own turns, with nothing left to test afterwards) or correctness-critical (queries against shared data systems, eval/grading text, pipeline or threshold configuration \u2014 you author and check those regardless of size). For anything else, write a brief and hand it to `sidekick`: you design and review, it implements and verifies.</system_guidance>";
+function bashNudge(count) {
+  return `<system_guidance>You have run ${String(count)} non-trivial shell commands yourself since the last handoff. Builds, test runs, installs, environment setup or repair, and any multi-step shell work are to be delegated to the \`sidekick\` by default; it runs on the same machine and remembers earlier handoffs, so a short brief with the goal, the exact commands or checks you want, and the done-criteria is enough. Keep running commands yourself only when a single read-only command answers a question you need right now, or when the user is waiting on an urgent deliverable.</system_guidance>`;
+}
 function sidekickSystemPrompt(id) {
   return `## Role: Fusion sidekick
 You are the sidekick half of a Fusion pair. A lead agent (${id.leadName}) plans, talks to the user, and reviews; you do the hands-on work it hands you. You run on the same machine and repository as the lead, with your own shell sessions. Your conversation persists across handoffs: remember what you did, what you learned, and which processes you left running.
@@ -51411,9 +51480,97 @@ How you report (your final message is what the lead reads \u2014 make it the who
 Prefer compact, idiomatic code that follows the repository's existing conventions; do not add or remove comments unless asked; do not create documentation files unless asked.`;
 }
 
+// packages/fusion/src/nudge.ts
+var BASH_NUDGE_EVERY = 4;
+var TRIVIAL = /^\s*(?:cd\s+\S+\s*(?:&&|;)\s*)?(?:git\s+(?:status|log|diff|branch|show|remote|rev-parse)|ls|pwd|cat|head|tail|wc|echo|which|type|rg|grep|find|stat|file|du|df|env|printenv|date|whoami|tmux\s+capture-pane|npm\s+(?:view|whoami|ls))\b[^|;&]*$/;
+function isTrivialShell(command) {
+  return TRIVIAL.test(command.trim());
+}
+
 // packages/fusion/src/tools.ts
-import { Box as Box3, Text as Text8 } from "@earendil-works/pi-tui";
+import { Markdown as Markdown2, Text as Text9 } from "@earendil-works/pi-tui";
+import { getMarkdownTheme as getMarkdownTheme2 } from "@earendil-works/pi-coding-agent";
 import { Type as Type11 } from "typebox";
+
+// packages/fusion/src/transcript.ts
+import { Box as Box3, Container as Container3, Text as Text8 } from "@earendil-works/pi-tui";
+var RailComponent = class {
+  constructor(inner, rail) {
+    this.inner = inner;
+    this.rail = rail;
+  }
+  inner;
+  rail;
+  render(width) {
+    return this.inner.render(Math.max(1, width - 2)).map((line) => `${this.rail} ${line}`);
+  }
+  invalidate() {
+    this.inner.invalidate?.();
+  }
+  handleInput(data) {
+    this.inner.handleInput?.(data);
+  }
+};
+function frameSidekick(theme, status, content) {
+  const railColor = status === "working" ? "accent" : status === "completed" ? "success" : "error";
+  const rail = theme.fg(railColor, "\u258D");
+  const boxed = new Box3(1, 0, (text) => theme.bg("customMessageBg", text));
+  boxed.addChild(new RailComponent(content, rail));
+  return boxed;
+}
+function firstLine2(value) {
+  return value.split("\n", 1)[0] ?? "";
+}
+function truncate2(value, max) {
+  return value.length > max ? `${value.slice(0, Math.max(0, max - 1))}\u2026` : value;
+}
+function primaryArg(name, args) {
+  if (!args) return "";
+  const value = name === "bash" ? args.command : name === "read" || name === "edit" || name === "write" ? args.path ?? args.file_path ?? args.filePath : name === "sidekick" ? args.message : Object.values(args).find((entry) => typeof entry === "string");
+  return typeof value === "string" ? truncate2(firstLine2(value), 100) : "";
+}
+function toolComponent(theme, event, expanded) {
+  const title = `${event.isError ? theme.fg("error", "\u2717 ") : ""}${theme.fg("toolTitle", theme.bold(event.name))}`;
+  const argument = primaryArg(event.name, event.args);
+  const lines = [`${title}${argument.length > 0 ? ` ${theme.fg("accent", argument)}` : ""}`];
+  if (!event.done) {
+    lines[0] += theme.fg("warning", " \u22EF running");
+  } else if (event.output.length > 0) {
+    const output = event.output.split("\n");
+    const visible = expanded ? output.slice(-40) : output.slice(-3);
+    lines.push(...visible.map((line) => theme.fg("toolOutput", truncate2(line, 160))));
+  }
+  return new Text8(lines.join("\n"), 0, 0);
+}
+function renderSidekickTranscript(theme, opts) {
+  const box = new Container3();
+  box.addChild(new Text8(opts.header, 0, 0));
+  if (!opts.isPartial && !opts.expanded) {
+    if (opts.report?.text) box.addChild(opts.renderText(opts.report.text));
+    box.addChild(new Text8(theme.fg("dim", `${String(opts.events.length)} steps \xB7 expand to see the transcript`), 0, 0));
+    return box;
+  }
+  const dropped = opts.droppedEvents ?? 0;
+  const start = opts.expanded ? 0 : Math.max(0, opts.events.length - 8);
+  if (opts.expanded && dropped > 0) {
+    box.addChild(new Text8(theme.fg("dim", `\u2026 ${String(dropped)} earliest steps dropped`), 0, 0));
+  } else if (start > 0) {
+    box.addChild(new Text8(theme.fg("dim", `\u2026 ${String(start + dropped)} earlier steps`), 0, 0));
+  }
+  for (const event of opts.events.slice(start)) {
+    if (event.kind === "tool") box.addChild(toolComponent(theme, event, opts.expanded));
+    else if (event.text.trim()) box.addChild(opts.renderText(event.text.trim()));
+  }
+  if (!opts.isPartial && opts.expanded && opts.report?.text) {
+    const last = opts.events.at(-1);
+    if (last?.kind === "text" && last.text.trim() === opts.report.text.trim()) return box;
+    box.addChild(new Text8(theme.fg("dim", "\u2500\u2500 report \u2500\u2500"), 0, 0));
+    box.addChild(opts.renderText(opts.report.text));
+  }
+  return box;
+}
+
+// packages/fusion/src/tools.ts
 var SidekickParams = Type11.Object({
   message: Type11.String({ description: "A concrete implementation or verification brief for the sidekick" }),
   block: Type11.Optional(Type11.Boolean({ description: "Wait for completion (default true)" }))
@@ -51426,6 +51583,9 @@ var ReadSubagentParams = Type11.Object({
 function duration(ms) {
   return `${(ms / 1e3).toFixed(1)}s`;
 }
+function firstLine3(value) {
+  return value.split("\n", 1)[0] ?? "";
+}
 function progressText(runtime, id) {
   const progress = runtime.progress(id);
   if (!progress) return "No active handoff progress.";
@@ -51438,7 +51598,9 @@ ${progress.recentTools.map((tool) => `  ${tool}`).join("\n")}` : "";
 }
 function progressKey(runtime, id) {
   const progress = runtime.progress(id);
-  return progress === void 0 ? "" : `${String(progress.toolCalls)}|${progress.recentTools.join("|")}|${progress.textTail}`;
+  if (!progress) return "";
+  const last = progress.events.at(-1);
+  return `${String(progress.toolCalls)}|${progress.recentTools.join("|")}|${progress.textTail}|${String(progress.events.length)}|${last?.kind === "tool" ? `${String(last.output.length)}|${String(last.done)}` : last?.kind === "text" ? `${String(last.text.length)}|${String(last.open)}` : ""}`;
 }
 function reportText(report) {
   return `${report.text}
@@ -51466,7 +51628,7 @@ async function waitForReport(runtime, id, done, signal, ctx, onUpdate, timeoutMs
     const key = progressKey(runtime, id);
     if (key !== lastProgressKey) {
       lastProgressKey = key;
-      onUpdate?.({ content: [{ type: "text", text: progress }] });
+      onUpdate?.({ content: [{ type: "text", text: progress }], details: { progress: runtime.progress(id) } });
     }
   }
 }
@@ -51480,13 +51642,46 @@ ${report.text}
     details: report
   };
 }
+function transcriptTheme(theme) {
+  return { fg: (color2, text) => theme.fg(color2, text), bold: (text) => theme.bold(text) };
+}
+function markdownText(markdown) {
+  return new Markdown2(markdown, 0, 0, getMarkdownTheme2());
+}
+function contentText(content) {
+  if (!Array.isArray(content)) return String(content ?? "");
+  return content.map((part) => typeof part === "object" && part !== null && typeof part.text === "string" ? part.text : "").filter(Boolean).join("\n");
+}
+function renderToolTranscript(result2, options, theme, label) {
+  const details = result2.details;
+  const progress = details?.progress;
+  const report = progress ? void 0 : details;
+  const events = progress?.events ?? report?.events;
+  const partial = progress !== void 0;
+  const status = partial ? "working" : report?.status === "completed" && !result2.isError ? "completed" : "error";
+  if (!events) return frameSidekick(theme, status, new Text9(contentText(result2.content), 0, 0));
+  const header = partial ? `${theme.fg("accent", theme.bold(`\u25C6 ${label} working`))} ${theme.fg("dim", `\xB7 ${String(progress.toolCalls)} tool calls \xB7 ${duration(Date.now() - progress.startedAt)}`)}` : `${theme.fg(report?.status === "completed" ? "success" : "error", "\u25C6")} ${theme.fg("accent", theme.bold(`${label} ${report?.status ?? "done"}`))} ${theme.fg("dim", report ? `\xB7 ${report.id} \xB7 ${String(report.toolCalls)} tool calls \xB7 ${duration(report.durationMs)} \xB7 in ${String(report.usage.input)} / out ${String(report.usage.output)} tokens` : "")}`;
+  return frameSidekick(theme, status, renderSidekickTranscript(transcriptTheme(theme), {
+    events,
+    droppedEvents: progress?.droppedEvents,
+    header,
+    expanded: options.expanded === true,
+    isPartial: partial,
+    report,
+    renderText: markdownText
+  }));
+}
 function renderCompletionCard2(theme, report) {
-  const tone = report?.status === "completed" ? "toolSuccessBg" : "toolErrorBg";
-  const head = report ? `${theme.fg(report.status === "completed" ? "success" : "error", "\u25C6")} ${theme.fg("accent", theme.bold(`sidekick done \xB7 ${report.id}`))} ${theme.fg("dim", `\xB7 ${String(report.toolCalls)} tool calls \xB7 ${duration(report.durationMs)}`)}` : `${theme.fg("accent", "\u25C6")} ${theme.fg("accent", theme.bold("sidekick done"))}`;
-  const lines = [head, ...report?.text.split("\n").slice(0, 6).map((line) => theme.fg("dim", line)) ?? []];
-  const box = new Box3(1, 0, (text) => theme.bg(tone, text));
-  box.addChild(new Text8(lines.join("\n"), 0, 0));
-  return box;
+  const status = report?.status === "completed" ? "completed" : "error";
+  if (!report) return frameSidekick(theme, "error", new Text9(`${theme.fg("accent", "\u25C6")} ${theme.fg("accent", theme.bold("sidekick done"))}`, 0, 0));
+  return frameSidekick(theme, status, renderSidekickTranscript(transcriptTheme(theme), {
+    events: report.events ?? [],
+    header: `${theme.fg(report.status === "completed" ? "success" : "error", "\u25C6")} ${theme.fg("accent", theme.bold(`sidekick ${report.status}`))} ${theme.fg("dim", `\xB7 ${report.id} \xB7 ${String(report.toolCalls)} tool calls \xB7 ${duration(report.durationMs)}`)}`,
+    expanded: false,
+    isPartial: false,
+    report,
+    renderText: markdownText
+  }));
 }
 function registerFusionTools(pi, deps) {
   pi.registerMessageRenderer("sidekick-completion", (message, _options, theme) => renderCompletionCard2(theme, message.details));
@@ -51495,10 +51690,15 @@ function registerFusionTools(pi, deps) {
     label: "Sidekick",
     description: "Hand off work to your persistent sidekick subagent (one per session; context and shells persist across handoffs; runs on the same machine). block:true (default) waits and returns the report. block:false returns immediately and the report arrives later as a <subagent_completion_notification>. Calling again while a handoff is running injects the message as an interrupt rather than starting a second sidekick.",
     parameters: SidekickParams,
+    renderShell: "self",
+    renderCall: (args, theme) => frameSidekick(theme, "working", new Text9(`${theme.fg("toolTitle", theme.bold("\u25C6 sidekick"))} ${theme.fg("dim", firstLine3(String(args.message)).slice(0, 100))}`, 0, 0)),
+    renderResult: (result2, options, theme) => renderToolTranscript(result2, options, theme, "sidekick"),
     async execute(_toolCallId, params, signal, onUpdate, ctx) {
       const runtime = deps.getRuntime(ctx);
       if (!runtime) return result("Fusion is not active \u2014 pick a Fusion pair with /unipi:model.", void 0, true);
+      const wasBusy = runtime.isBusy();
       const handoff = runtime.handoff(params.message);
+      if (!wasBusy) deps.onHandoffStart?.(ctx);
       if (params.block === false) {
         void handoff.done.then((report) => {
           deps.onReport?.(ctx, report);
@@ -51524,6 +51724,9 @@ ${progressText(runtime, handoff.id)}`);
     label: "Read Sidekick",
     description: "Read a sidekick handoff report by agent_id (omit for the latest). block:true waits for completion (default timeout 2700s when omitted); block:false returns the current progress snapshot immediately.",
     parameters: ReadSubagentParams,
+    renderShell: "self",
+    renderCall: (args, theme) => frameSidekick(theme, "working", new Text9(`${theme.fg("toolTitle", theme.bold("\u25C6 read_subagent"))} ${theme.fg("dim", args.agent_id ?? "latest")}`, 0, 0)),
+    renderResult: (result2, options, theme) => renderToolTranscript(result2, options, theme, "read_subagent"),
     async execute(_toolCallId, params, signal, onUpdate, ctx) {
       const runtime = deps.getRuntime(ctx);
       if (!runtime) return result("Fusion is not active \u2014 pick a Fusion pair with /unipi:model.", void 0, true);
@@ -51610,7 +51813,10 @@ function fusionExtension(pi) {
   if (process.env.UNIPI_FUSION_CHILD === "1") return;
   let active;
   let runtime;
-  let nudged = false;
+  let lastCtx;
+  let leadToolCalls = 0;
+  let editNudgedThisTurn = false;
+  let bashStreak = 0;
   function identity(ctx) {
     const reg = registryOf(ctx);
     const names = (k) => findModel(reg, k)?.name || splitModelKey(k)?.id || k;
@@ -51630,6 +51836,7 @@ function fusionExtension(pi) {
     return estimateSavings(runtime.usage, costOf(lead, preset2.prices[active.lead]), costOf(side, preset2.prices[active.sidekick])).savedUsd;
   }
   function publishStatus(ctx) {
+    lastCtx = ctx;
     const reg = registryOf(ctx);
     const names = (k) => findModel(reg, k)?.name || splitModelKey(k)?.id || k;
     if (active?.kind === "fusion") {
@@ -51638,12 +51845,18 @@ function fusionExtension(pi) {
         leadEffort: active.leadEffort ?? "",
         sidekickName: names(active.sidekick),
         sidekickEffort: active.sidekickEffort ?? "",
-        savedUsd: statusSavings(ctx)
+        savedUsd: statusSavings(ctx),
+        busy: runtime?.isBusy() ?? false,
+        leadToolCalls,
+        sidekickToolCalls: runtime?.totalToolCalls() ?? 0
       });
     } else {
       setSharedFusionStatus(void 0);
     }
   }
+  function publishStatusLater() {
+    if (lastCtx) publishStatus(lastCtx);
+  }
   function leadSessionId(ctx) {
     const manager2 = ctx.sessionManager;
     return manager2?.getSessionId?.() ?? "default";
@@ -51656,7 +51869,8 @@ function fusionExtension(pi) {
         model: active.sidekick,
         thinking: active.sidekickEffort ?? "medium",
         sessionFile: sidekickSessionPath(leadSessionId(ctx)),
-        systemPrompt: sidekickSystemPrompt(identity(ctx))
+        systemPrompt: sidekickSystemPrompt(identity(ctx)),
+        onProgress: () => publishStatusLater()
       });
     }
     return runtime;
@@ -51664,6 +51878,7 @@ function fusionExtension(pi) {
   function stopRuntime() {
     runtime?.kill();
     runtime = void 0;
+    leadToolCalls = 0;
   }
   function savingsStats(ctx) {
     if (active?.kind !== "fusion" || runtime === void 0) return "Fusion is not active \u2014 pick a Fusion pair with /unipi:model.";
@@ -51679,7 +51894,8 @@ Handoffs: ${String(runtime.reports.size)} \xB7 runtime alive: ${String(runtime.i
   }
   registerFusionTools(pi, {
     getRuntime,
-    onReport: (ctx) => publishStatus(ctx)
+    onReport: (ctx) => publishStatus(ctx),
+    onHandoffStart: (ctx) => publishStatus(ctx)
   });
   pi.registerCommand("unipi:fusion-stats", {
     description: "Estimated Fusion savings (sidekick tokens priced at lead rates)",
@@ -51688,10 +51904,31 @@ Handoffs: ${String(runtime.reports.size)} \xB7 runtime alive: ${String(runtime.i
   pi.on("before_agent_start", (event, ctx) => active?.kind === "fusion" ? { systemPrompt: `${event.systemPrompt}
 
 ${leadPolicy(identity(ctx))}` } : void 0);
+  pi.on("turn_start", () => {
+    editNudgedThisTurn = false;
+  });
   pi.on("tool_result", (event) => {
-    if (active?.kind !== "fusion" || nudged || event.toolName !== "edit" && event.toolName !== "write") return;
-    nudged = true;
-    return { content: [...event.content, { type: "text", text: FIRST_EDIT_NUDGE }] };
+    if (active?.kind !== "fusion") return;
+    const toolName = event.toolName;
+    if (toolName === "sidekick" || toolName === "read_subagent") {
+      bashStreak = 0;
+      return;
+    }
+    leadToolCalls += 1;
+    publishStatusLater();
+    if (toolName === "edit" || toolName === "write") {
+      if (editNudgedThisTurn) return;
+      editNudgedThisTurn = true;
+      return { content: [...event.content, { type: "text", text: EDIT_NUDGE }] };
+    }
+    if (toolName !== "bash") return;
+    const command = typeof event.input.command === "string" ? event.input.command : "";
+    if (isTrivialShell(command)) return;
+    bashStreak += 1;
+    if (bashStreak < BASH_NUDGE_EVERY) return;
+    const content = [...event.content, { type: "text", text: bashNudge(bashStreak) }];
+    bashStreak = 0;
+    return { content };
   });
   async function applyResult(ctx, result2, preset2, loaded) {
     if (result2.type === "cancelled") return;
@@ -51824,7 +52061,8 @@ ${String(result2.curation.lead.length)} lead \xB7 ${String(result2.curation.side
   });
   pi.on("session_start", async (_e, ctx) => {
     stopRuntime();
-    nudged = false;
+    editNudgedThisTurn = false;
+    bashStreak = 0;
     modelBykey.clear();
     active = loadPreset(ctx.cwd ?? process.cwd()).preset.active;
     if (active?.kind === "fusion" && (!ctx.model || modelKey(ctx.model) !== active.lead)) {

package/packages/updater/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/updater",
-  "version": "2.17.2",
+  "version": "2.18.0",
   "description": "Auto-updater, changelog browser, and readme browser for Unipi — checks npm registry, renders CHANGELOG.md and README.md files in TUI overlays",
   "type": "module",
   "main": "index.ts",
@@ -34,7 +34,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.17.0"
+    "@pi-unipi/core": "2.18.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.84.0",

package/packages/utility/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/utility",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Utility commands and tools for Pi coding agent — lifecycle, diagnostics, cache, analytics, display, batch execution",
   "type": "module",
   "main": "src/index.ts",
@@ -36,7 +36,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.17.0"
+    "@pi-unipi/core": "2.18.0"
   },
   "devDependencies": {},
   "peerDependencies": {

package/packages/web-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/web-api",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Web search, read, and summarize tools with provider-based backend selection for Pi coding agent",
   "type": "module",
   "main": "src/index.ts",
@@ -31,7 +31,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@pi-unipi/core": "2.17.0",
+    "@pi-unipi/core": "2.18.0",
     "defuddle": "^0.18.1",
     "linkedom": "^0.18.12",
     "wreq-js": "^2.3.0"

package/packages/workflow/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/workflow",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Structured development workflow commands for Pi coding agent",
   "type": "module",
   "main": "index.ts",
@@ -30,7 +30,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.17.0"
+    "@pi-unipi/core": "2.18.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "^0.84.0",