@pi-unipi/unipi 2.17.1 → 2.18.0

package/CHANGELOG.md

@@ -6,6 +6,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [2.18.0] — 2026-09-16
+
+### Changed
+
+- `fusion`: **sidekick blocks have their own tint.** `sidekick`/`read_subagent` use pi's `renderShell: "self"` and paint the theme's `customMessageBg` (violet in the dark theme) instead of the grey/green/red ordinary tool backgrounds, with a `▍` left rail coloured by state (accent working · success completed · error failed) — `frameSidekick()`/`RailComponent` in `src/transcript.ts`; the completion card uses the same frame.
+- `fusion`: **a running sidekick now renders like a regular agent transcript.** The `sidekick`/`read_subagent` tool blocks and the `sidekick-completion` card previously squeezed everything into one card — six 40-char tool summaries and a 400-char text tail with the sidekick's messages run together. The runtime now keeps a structured event log per handoff (`SidekickEvent`: assistant text blocks and tool calls with primary argument, trimmed output, error/running state; capped at 300 events / 4000 chars of output) and `renderSidekickTranscript()` in `src/transcript.ts` renders it: each tool on its own line (`bash ls -la /tmp/x` + last 3 output lines), each assistant message as its own markdown paragraph, `⋯ running` on the in-flight tool. Collapsed shows the last 8 steps while running and the report text when finished; pi's expand toggle (Ctrl+O) shows the full transcript.
+- `fusion`/`footer`: **the footer now shows which half of the Fusion pair is working.** While a handoff runs the sidekick is lit with ` · working` and the lead dims; the slot also shows the lead/sidekick tool-call split (`◆ DeepSeek Flash high · 61/185 calls`). `SharedFusionStatus` gains `busy`, `leadToolCalls`, `sidekickToolCalls`; the runtime republishes on every sidekick tool call (`onProgress`) and on handoff start/end (`SidekickRuntime.totalToolCalls()`, `renderFusionStatus()` in `glance-editor.ts`). Motivated by a real session where the lead ran 124 shell commands itself and delegated once — the static `Fusion · Lead ◆ Sidekick` label made that invisible.
+- `fusion`: **delegation nudges are now recurring, matching Devin's harness.** The one-time first-edit reminder is replaced by `EDIT_NUDGE` on every direct `edit`/`write` (at most once per agent turn) plus `bashNudge(n)` after every 4 consecutive non-trivial lead `bash` calls without a handoff (`isTrivialShell()` in `src/nudge.ts` exempts read-only commands such as `git status`, `ls`, `rg`); a `sidekick`/`read_subagent` call resets the streak.
+
+## [2.17.2] — 2026-09-15
+
+### Fixed
+
+- `footer`: **the startup update prompt no longer becomes unclosable after ~3.5s.** The deferred Glance editor install (`installGlanceEditor` in `src/index.ts`) calls `setEditorComponent()`, which internally re-focuses the editor and silently stole keyboard focus from whatever overlay was open — the updater prompt kept rendering while `q`/`n`/Esc typed into the input box. The install now snapshots the focused overlay (`tui.isOverlayFocused()` / `getFocusedComponent()`) and restores it after the swap, protecting the updater prompt, the boot dashboard, and any other overlay. New `tests/glance-focus.test.ts`.
+- `updater`: **the update prompt now shows the release notes for the version being offered.** It previously parsed the `CHANGELOG.md` shipped with the *installed* package, which by definition never contains the newer version's entry, so it only ever showed an empty `Unreleased` header. New `src/remote-changelog.ts` fetches `raw.githubusercontent.com/Neuron-Mr-White/unipi/v<latest>/CHANGELOG.md` (5s timeout, falls back to `main` when the tag is not pushed yet, then to the local file when offline) and caches tag-served content under `~/.unipi/cache/updater/changelog-<version>.md`. `parseChangelog()` is split into `parseChangelogContent()` + a file wrapper; `getNewerVersions()` drops an empty `Unreleased` entry; the empty state reads `No changelog available for <version> (offline?)`.
+
 ## [2.17.1] — 2026-09-15
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/unipi",
-  "version": "2.17.1",
+  "version": "2.18.0",
   "description": "All-in-one extension suite for Pi coding agent",
   "type": "module",
   "license": "MIT",
@@ -84,29 +84,29 @@
     "typebox": "^1.1.38"
   },
   "dependencies": {
-    "@pi-unipi/ask-user": "2.17.0",
-    "@pi-unipi/background-tasks": "2.17.0",
-    "@pi-unipi/btw": "2.17.0",
-    "@pi-unipi/command-enchantment": "2.17.0",
-    "@pi-unipi/compactor": "2.17.0",
-    "@pi-unipi/core": "2.17.0",
-    "@pi-unipi/footer": "2.17.0",
-    "@pi-unipi/image": "2.17.0",
-    "@pi-unipi/fusion": "2.17.1",
-    "@pi-unipi/info-screen": "2.17.0",
-    "@pi-unipi/input-shortcuts": "2.17.0",
-    "@pi-unipi/kanboard": "2.17.0",
-    "@pi-unipi/mcp": "2.17.0",
-    "@pi-unipi/memory": "2.17.0",
-    "@pi-unipi/milestone": "2.17.0",
-    "@pi-unipi/notify": "2.17.0",
-    "@pi-unipi/ralph": "2.17.0",
-    "@pi-unipi/subagents": "2.17.0",
-    "@pi-unipi/trajectory": "2.17.0",
-    "@pi-unipi/updater": "2.17.0",
-    "@pi-unipi/utility": "2.17.0",
-    "@pi-unipi/web-api": "2.17.0",
-    "@pi-unipi/workflow": "2.17.0"
+    "@pi-unipi/ask-user": "2.18.0",
+    "@pi-unipi/background-tasks": "2.18.0",
+    "@pi-unipi/btw": "2.18.0",
+    "@pi-unipi/command-enchantment": "2.18.0",
+    "@pi-unipi/compactor": "2.18.0",
+    "@pi-unipi/core": "2.18.0",
+    "@pi-unipi/footer": "2.18.0",
+    "@pi-unipi/image": "2.18.0",
+    "@pi-unipi/fusion": "2.18.0",
+    "@pi-unipi/info-screen": "2.18.0",
+    "@pi-unipi/input-shortcuts": "2.18.0",
+    "@pi-unipi/kanboard": "2.18.0",
+    "@pi-unipi/mcp": "2.18.0",
+    "@pi-unipi/memory": "2.18.0",
+    "@pi-unipi/milestone": "2.18.0",
+    "@pi-unipi/notify": "2.18.0",
+    "@pi-unipi/ralph": "2.18.0",
+    "@pi-unipi/subagents": "2.18.0",
+    "@pi-unipi/trajectory": "2.18.0",
+    "@pi-unipi/updater": "2.18.0",
+    "@pi-unipi/utility": "2.18.0",
+    "@pi-unipi/web-api": "2.18.0",
+    "@pi-unipi/workflow": "2.18.0"
   },
   "devDependencies": {
     "@earendil-works/pi-agent-core": "^0.84.0",

package/packages/ask-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/ask-user",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Structured user input tool for Pi coding agent — single-select, multi-select, freeform",
   "type": "module",
   "main": "index.ts",
@@ -40,7 +40,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/autocomplete/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/command-enchantment",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Enhanced TUI autocomplete for /unipi:* commands — colored, sorted, and grouped by package",
   "type": "module",
   "main": "src/index.ts",

package/packages/background-tasks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/background-tasks",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Background tasks for UniPi — durable shell jobs and delegated background agents with a footer dock",
   "type": "module",
   "main": "src/index.ts",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@earendil-works/pi-ai": "^0.84.0",
-    "@pi-unipi/core": "2.17.0",
+    "@pi-unipi/core": "2.18.0",
     "turndown": "^7.2.4"
   },
   "devDependencies": {

package/packages/btw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/btw",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "A pi extension for parallel side conversations with /unipi:btw — part of the Unipi suite",
   "type": "module",
   "main": "extensions/btw.ts",
@@ -37,7 +37,7 @@
     "@earendil-works/pi-tui": "^0.84.0"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.17.0"
+    "@pi-unipi/core": "2.18.0"
   },
   "pi": {
     "extensions": [

package/packages/compactor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/compactor",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Context engine for Pi — zero-LLM compaction, session continuity, sandbox execution, and tool display optimization",
   "type": "module",
   "main": "src/index.ts",
@@ -34,8 +34,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.17.0",
-    "@pi-unipi/info-screen": "2.17.0",
+    "@pi-unipi/core": "2.18.0",
+    "@pi-unipi/info-screen": "2.18.0",
     "@earendil-works/pi-agent-core": "^0.84.0"
   },
   "peerDependencies": {

package/packages/core/fusion-status.ts

@@ -18,6 +18,12 @@ export interface SharedFusionStatus {
   sidekickEffort: string;
   /** Estimated savings compared with pricing all sidekick usage at lead rates. */
   savedUsd?: number;
+  /** A handoff is running on the sidekick right now. */
+  busy?: boolean;
+  /** Tool calls made directly by the lead in this session while Fusion was active. */
+  leadToolCalls?: number;
+  /** Tool calls made by the sidekick across all handoffs (completed + in flight). */
+  sidekickToolCalls?: number;
 }
 
 const KEY = Symbol.for("unipi.fusion.status");

package/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/core",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Shared utilities, event types, and constants for Unipi extension suite",
   "type": "module",
   "license": "MIT",

package/packages/footer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/footer",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "Persistent status bar for Unipi — subscribes to UNIPI_EVENTS and renders key stats from all unipi packages",
   "type": "module",
   "main": "index.ts",
@@ -32,8 +32,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.17.0",
-    "@pi-unipi/background-tasks": "2.17.0"
+    "@pi-unipi/core": "2.18.0",
+    "@pi-unipi/background-tasks": "2.18.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.84.0",

package/packages/footer/src/glance-editor.ts

@@ -40,7 +40,7 @@ export interface GlanceStatus {
 	 * `Fusion · <lead> <effort> ◆ <sidekick>` — lead lit, sidekick muted —
 	 * and the plain thinking slot is suppressed (efforts are inline).
 	 */
-	fusion: { leadName: string; leadEffort: string; sidekickName: string; sidekickEffort: string; savedUsd?: number } | null;
+	fusion: { leadName: string; leadEffort: string; sidekickName: string; sidekickEffort: string; savedUsd?: number; busy?: boolean; leadToolCalls?: number; sidekickToolCalls?: number } | null;
 }
 
 const BORDER = {
@@ -57,6 +57,26 @@ const RESET = "\x1b[0m";
 const LEAD_FG = "\x1b[1m\x1b[38;2;181;189;104m"; // bold accent (matches success tint)
 const DIM_FG = "\x1b[38;2;120;124;134m"; // muted grey
 
+type FusionDisplay = NonNullable<GlanceStatus["fusion"]>;
+
+export function renderFusionStatus(fusion: FusionDisplay): string {
+	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 !== undefined && fusion.savedUsd > 0.005
+		? ` · saved $${fusion.savedUsd.toFixed(2)}`
+		: "";
+	const split = totalCalls > 0 ? ` · ${String(sidekickCalls)}/${String(totalCalls)} calls` : "";
+	const core = busy
+		? `${DIM_FG}Fusion · ${lead}${RESET} ${LEAD_FG}◆ ${side} · working${RESET}`
+		: `${LEAD_FG}Fusion · ${lead}${RESET} ${DIM_FG}◆ ${side}${RESET}`;
+	const tail = `${split}${saved}`;
+	return tail ? `${core}${DIM_FG}${tail}${RESET}` : core;
+}
+
 /**
  * Every invisible sequence pi-tui embeds in editor lines: CSI SGR, OSC 133
  * prompt-zone markers (`\x1b]133;A\x07`), and CURSOR_MARKER (`\x1b_pi:c\x07`,
@@ -226,13 +246,7 @@ export class GlanceEditor extends CustomEditor {
 		const winLabel = st.contextWindow > 0 ? `/${fmtTokens(st.contextWindow)}` : "";
 		rightParts.push(`${pctLabel}${winLabel}`);
 		if (st.fusion) {
-			// The working lead is lit; the sidekick stays muted. Efforts are
-			// inline so the separate thinking slot is dropped.
-			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 · ${lead}${RESET} ${DIM_FG}◆ ${side}${st.fusion.savedUsd !== undefined && st.fusion.savedUsd > 0.005 ? ` · saved $${st.fusion.savedUsd.toFixed(2)}` : ""}${RESET}`,
-			);
+			rightParts.push(renderFusionStatus(st.fusion));
 		} else {
 			if (st.modelName) rightParts.push(st.modelName);
 			if (st.thinkingLevel && st.thinkingLevel !== "off") {

package/packages/footer/src/index.ts

@@ -153,13 +153,10 @@ export default function footerExtension(pi: ExtensionAPI): void {
     // Glance-style input surface (pi-glance-inspired). Preserves all default
     // editor behavior via CustomEditor subclassing; only paint differs.
     //
-    // FOCUS-SAFETY DEFERRAL: setEditorComponent() internally calls
-    // ui.setFocus(newEditor). info-screen (loaded before us) opens its boot
-    // dashboard during ITS session_start handler, so our session_start runs
-    // while that overlay owns keyboard focus. Swapping now would steal focus
-    // and strand the dashboard unclosable (q/Esc would type into the editor).
-    // The boot overlay auto-closes after ~2s; we install after a grace period
-    // longer than any sane bootTimeoutMs.
+    // FOCUS-SAFETY DEFERRAL: the timer remains a grace period for the boot
+    // dashboard, but installGlanceEditor also restores any overlay focus after
+    // setEditorComponent() calls ui.setFocus(newEditor). This covers the
+    // updater prompt too, so q/Esc cannot be stranded in the editor.
     state.glanceInstallTimer = setTimeout(() => installGlanceEditor(state, ctx), 3500);
 
     // Sync TPS cursor with persisted assistant messages so streaming-hook
@@ -420,6 +417,15 @@ function installGlanceEditor(
 ): void {
   if (st.glanceInstalled || !st.piContext || !st.glanceMode) return;
   try {
+    const tui = st.tuiRef as (import("@earendil-works/pi-tui").TUI & {
+      isOverlayFocused?: () => boolean;
+      getFocusedComponent?: () => import("@earendil-works/pi-tui").Component | null;
+    }) | null | undefined;
+    const overlayFocused = tui !== undefined && tui !== null
+      && (typeof tui.isOverlayFocused === "function" ? tui.isOverlayFocused() : tui.hasOverlay());
+    const overlayOwner = overlayFocused && typeof tui?.getFocusedComponent === "function"
+      ? tui.getFocusedComponent() ?? null
+      : null;
     const piCtx = st.piContext as Record<string, unknown> | undefined;
     const cwd = (piCtx?.sessionManager as any)?.getCwd?.() ?? (piCtx as any)?.cwd ?? process.cwd();
     const workspace = String(cwd).split("/").filter(Boolean).pop() ?? "~";
@@ -445,6 +451,7 @@ function installGlanceEditor(
         };
       }),
     );
+    if (overlayOwner && tui) tui.setFocus(overlayOwner);
     st.glanceInstalled = true;
   } catch {
     st.glanceInstalled = false;

package/packages/fusion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/fusion",
-  "version": "2.17.1",
+  "version": "2.18.0",
   "description": "Devin-style model picker, fusion presets (lead + sidekick), and Local Fusion runtime for UniPi",
   "type": "module",
   "main": "src/index.ts",
@@ -32,8 +32,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.17.0",
-    "@pi-unipi/subagents": "2.17.0"
+    "@pi-unipi/core": "2.18.0",
+    "@pi-unipi/subagents": "2.18.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "^0.84.0",

package/packages/fusion/src/index.ts

@@ -37,7 +37,8 @@ import { ModelPicker, type PickerModel, type PickerResult } from "./picker.js";
 import { PresetEditor, type PresetEditorResult } from "./preset-editor.js";
 import { SidekickRuntime } from "./sidekick-runtime.js";
 import { estimateSavings } from "./savings.js";
-import { FIRST_EDIT_NUDGE, leadPolicy, sidekickSystemPrompt, type FusionIdentity } from "./prompts.js";
+import { EDIT_NUDGE, bashNudge, leadPolicy, sidekickSystemPrompt, type FusionIdentity } from "./prompts.js";
+import { isTrivialShell, BASH_NUDGE_EVERY } from "./nudge.js";
 import { registerFusionTools } from "./tools.js";
 
 export const MODEL_COMMAND = `${UNIPI_PREFIX}model`;
@@ -113,7 +114,10 @@ export default function fusionExtension(pi: ExtensionAPI): void {
 
   let active: ActiveSelection | undefined;
   let runtime: SidekickRuntime | undefined;
-  let nudged = false;
+  let lastCtx: ExtensionContext | undefined;
+  let leadToolCalls = 0;
+  let editNudgedThisTurn = false;
+  let bashStreak = 0;
 
   function identity(ctx: ExtensionContext): FusionIdentity {
     const reg = registryOf(ctx);
@@ -136,6 +140,7 @@ export default function fusionExtension(pi: ExtensionAPI): void {
   }
 
   function publishStatus(ctx: ExtensionContext): void {
+    lastCtx = ctx;
     const reg = registryOf(ctx);
     const names = (k: string) => findModel(reg, k)?.name || splitModelKey(k)?.id || k;
     if (active?.kind === "fusion") {
@@ -147,12 +152,19 @@ export default function fusionExtension(pi: ExtensionAPI): void {
         sidekickName: names(active.sidekick),
         sidekickEffort: active.sidekickEffort ?? "",
         savedUsd: statusSavings(ctx),
+        busy: runtime?.isBusy() ?? false,
+        leadToolCalls,
+        sidekickToolCalls: runtime?.totalToolCalls() ?? 0,
       });
     } else {
       setSharedFusionStatus(undefined);
     }
   }
 
+  function publishStatusLater(): void {
+    if (lastCtx) publishStatus(lastCtx);
+  }
+
   function leadSessionId(ctx: ExtensionContext): string {
     const manager = ctx.sessionManager as { getSessionId?: () => string | undefined } | undefined;
     return manager?.getSessionId?.() ?? "default";
@@ -167,6 +179,7 @@ export default function fusionExtension(pi: ExtensionAPI): void {
         thinking: active.sidekickEffort ?? "medium",
         sessionFile: sidekickSessionPath(leadSessionId(ctx)),
         systemPrompt: sidekickSystemPrompt(identity(ctx)),
+        onProgress: () => publishStatusLater(),
       });
     }
     return runtime;
@@ -175,6 +188,7 @@ export default function fusionExtension(pi: ExtensionAPI): void {
   function stopRuntime(): void {
     runtime?.kill();
     runtime = undefined;
+    leadToolCalls = 0;
   }
 
   function savingsStats(ctx: ExtensionContext): string {
@@ -193,16 +207,38 @@ export default function fusionExtension(pi: ExtensionAPI): void {
   registerFusionTools(pi, {
     getRuntime,
     onReport: (ctx) => publishStatus(ctx),
+    onHandoffStart: (ctx) => publishStatus(ctx),
   });
   pi.registerCommand("unipi:fusion-stats", {
     description: "Estimated Fusion savings (sidekick tokens priced at lead rates)",
     handler: async (_args, ctx) => ctx.ui.notify(savingsStats(ctx), "info"),
   });
   pi.on("before_agent_start", (event, ctx) => active?.kind === "fusion" ? { systemPrompt: `${event.systemPrompt}\n\n${leadPolicy(identity(ctx))}` } : undefined);
+  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: string = 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" as const, 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" as const, text: bashNudge(bashStreak) }];
+    bashStreak = 0;
+    return { content };
   });
 
   async function applyResult(ctx: ExtensionContext, result: PickerResult, preset: FusionPreset, loaded: { globalPath: string; projectPath: string; hasProjectLayer: boolean }): Promise<void> {
@@ -355,7 +391,8 @@ export default function fusionExtension(pi: ExtensionAPI): void {
 
   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/fusion/src/nudge.ts

@@ -0,0 +1,7 @@
+export const BASH_NUDGE_EVERY = 4;
+
+const 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[^|;&]*$/;
+
+export function isTrivialShell(command: string): boolean {
+  return TRIVIAL.test(command.trim());
+}

package/packages/fusion/src/prompts.ts

@@ -68,9 +68,25 @@ You have a \`sidekick\` tool: a persistent subagent that works alongside you on
 - **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.`;
 }
 
-/** One-time reminder appended to the lead's first direct edit/write while Fusion is active. */
-export const 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 — multiple files, anything that needs a test run, anything you would want to look over again — write a brief and hand it to `sidekick` instead: you design and review, it implements and verifies. This reminder is shown once.</system_guidance>";
+/**
+ * Recurring reminder appended to a direct edit/write by the lead while Fusion
+ * is active (at most once per agent turn). Mirrors Devin's harness, which
+ * re-issues this guidance on every direct implementation action rather than once.
+ */
+export const 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 — 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>";
+
+/** Kept for compatibility with earlier imports; the nudge is no longer one-time. */
+export const FIRST_EDIT_NUDGE = EDIT_NUDGE;
+
+/**
+ * Appended after the lead has run several consecutive non-trivial shell
+ * commands itself without a handoff. Builds, tests, installs, environment
+ * repair and multi-step shell work are the sidekick's job by default.
+ */
+export function bashNudge(count: number): string {
+  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>`;
+}
 
 export function sidekickSystemPrompt(id: FusionIdentity): string {
   return `## Role: Fusion sidekick

package/packages/fusion/src/sidekick-runtime.ts

@@ -14,6 +14,7 @@ export interface SidekickSpawnConfig {
   systemPrompt: string;
   spawn?: typeof defaultSpawn;
   command?: { command: string; args: string[] };
+  onProgress?: () => void;
 }
 
 export interface SidekickUsage {
@@ -24,11 +25,20 @@ export interface SidekickUsage {
   cost: number;
 }
 
+export type SidekickEvent =
+  | { kind: "text"; text: string; open: boolean }
+  | { kind: "tool"; toolCallId: string; name: string; args: Record<string, unknown> | undefined; output: string; isError: boolean; done: boolean; startedAt: number; endedAt?: number };
+
+export const MAX_EVENTS = 300;
+export const MAX_TOOL_OUTPUT = 4000;
+
 export interface HandoffProgress {
   toolCalls: number;
   recentTools: string[];
   textTail: string;
   startedAt: number;
+  events: SidekickEvent[];
+  droppedEvents: number;
 }
 
 export interface HandoffReport {
@@ -38,6 +48,7 @@ export interface HandoffReport {
   usage: SidekickUsage;
   toolCalls: number;
   durationMs: number;
+  events: SidekickEvent[];
   error?: string;
 }
 
@@ -79,6 +90,47 @@ export class SidekickRuntime {
     return this.pending !== undefined;
   }
 
+  totalToolCalls(): number {
+    let total = this.pending?.progress.toolCalls ?? 0;
+    for (const report of this.reports.values()) total += report.toolCalls;
+    return total;
+  }
+
+  private notifyProgress(): void {
+    try {
+      this.cfg.onProgress?.();
+    } catch {
+      // Progress updates must not affect the handoff.
+    }
+  }
+
+  private appendEvent(event: SidekickEvent): void {
+    const progress = this.pending?.progress;
+    if (!progress) return;
+    progress.events.push(event);
+    if (progress.events.length > MAX_EVENTS) {
+      progress.events.shift();
+      progress.droppedEvents += 1;
+    }
+  }
+
+  private closeOpenText(): void {
+    const events = this.pending?.progress.events;
+    const last = events?.at(-1);
+    if (last?.kind === "text" && last.open) last.open = false;
+  }
+
+  private toolOutput(result: unknown): string {
+    if (typeof result === "object" && result !== null && Array.isArray((result as { content?: unknown }).content)) {
+      return ((result as { content: unknown[] }).content)
+        .map((part) => typeof part === "object" && part !== null && typeof (part as { text?: unknown }).text === "string" ? (part as { text: string }).text : typeof part === "string" ? part : "")
+        .filter(Boolean)
+        .join("\n")
+        .slice(-MAX_TOOL_OUTPUT);
+    }
+    return String(result ?? "").slice(-MAX_TOOL_OUTPUT);
+  }
+
   private send(value: Record<string, unknown>): void {
     if (!this.child?.stdin?.writable) throw new Error("Sidekick process is not writable");
     this.child.stdin.write(`${JSON.stringify(value)}\n`);
@@ -169,19 +221,39 @@ export class SidekickRuntime {
     }
     if (this.pending === undefined) return;
     if (message.type === "tool_execution_start") {
+      this.closeOpenText();
       this.pending.progress.toolCalls += 1;
-      const args = message.args === undefined ? "" : JSON.stringify(message.args).replace(/\s+/gu, " ");
-      const summary = `${String(message.toolName ?? "tool")}(${args})`.slice(0, 40);
+      const args = message.args !== undefined && typeof message.args === "object" && message.args !== null ? message.args as Record<string, unknown> : undefined;
+      const argsText = args === undefined ? "" : 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 is Extract<SidekickEvent, { kind: "tool" }> => 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) as Record<string, unknown>;
-      if (event.type === "text_delta") {
-        const delta = typeof event.delta === "string" ? event.delta : typeof event.text === "string" ? event.text : "";
+      const streamEvent = (message.assistantMessageEvent ?? message) as Record<string, unknown>;
+      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 as Record<string, unknown> | undefined;
       if (msg?.role === "assistant") {
+        this.closeOpenText();
+        this.notifyProgress();
         if (msg.stopReason === "error" && typeof msg.errorMessage === "string") this.pendingError = msg.errorMessage;
         const usage = msg.usage as Record<string, unknown> | undefined;
         if (usage) {
@@ -231,11 +303,13 @@ export class SidekickRuntime {
       usage: { ...current.usage },
       toolCalls: current.progress.toolCalls,
       durationMs: Date.now() - current.startedAt,
+      events: current.progress.events.map((event) => ({ ...event })),
       ...(error === undefined ? {} : { 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 = undefined;
   }
@@ -259,7 +333,7 @@ export class SidekickRuntime {
       id,
       startedAt,
       usage: emptyUsage(),
-      progress: { toolCalls: 0, recentTools: [], textTail: "", startedAt },
+      progress: { toolCalls: 0, recentTools: [], textTail: "", startedAt, events: [], droppedEvents: 0 },
       resolve,
       reject,
     };
@@ -273,7 +347,9 @@ export class SidekickRuntime {
   }
 
   progress(id?: string): HandoffProgress | undefined {
-    if (this.pending !== undefined && (id === undefined || id === this.pending.id)) return { ...this.pending.progress, recentTools: [...this.pending.progress.recentTools] };
+    if (this.pending !== undefined && (id === undefined || id === this.pending.id)) {
+      return { ...this.pending.progress, recentTools: [...this.pending.progress.recentTools], events: this.pending.progress.events.map((event) => ({ ...event })) };
+    }
     return undefined;
   }