@pi-unipi/unipi 2.18.0 → 2.19.0

package/CHANGELOG.md

@@ -6,6 +6,35 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [2.19.0] — 2026-09-16
+
+### Added
+
+- `notify`: **unanswered blocking prompts are re-sent until someone acts** — `ask_user_prompt` and `permission_request` were fire-once, so a missed push left the agent parked with no further signal. New `renotify` config block (default on: `intervalMs: 120000`, `maxRepeats: 3`) re-dispatches the same title and message with a `(still waiting)` suffix at priority `high`; the loop is cancelled by any terminal keypress, `herdr:blocked` with `active: false`, `agent_start`, or session end, and re-arming replaces the pending timer (`armRenotify`/`disarmRenotify` in `events.ts`). New **Re-notify** tab in `/unipi:notify-settings` (Space toggles, `+`/`−` adjust interval and repeats). `maxRepeats: 0` sends the initial notification only.
+
+### Changed
+
+- `notify`: **blocking prompts now dispatch at `high` priority** (`ask_user_prompt`/`permission_request` → ntfy 5, Gotify 8, breaking through DND) while `agent_end`/`agent_settled` dispatch at `low`. `dispatchNotification` already accepted a priority — the event path just never passed one; an explicit `notify_user` priority still wins.
+- `fusion`: **a sidekick handoff now stays open while its background tasks run.** `SidekickRuntime` counts in-flight `bg_run` calls (`openBgTasks`, only when `notifyOnCompletion`/`triggerOnCompletion` are not `false`), and on `agent_settled` with tasks still running it holds the handoff instead of collecting the report at an intermediate checkpoint. The background-task completion message decrements the count; with none left and the agent settled, a `settleGraceMs` timer (new spawn-config option, default 3000, `unref`'d) waits for the follow-up turn before requesting the last assistant text, and `agent_start` clears it.
+- `fusion`: **a sidekick prompt rejected as "already processing" is retried once** as a pi `followUp` (`streamingBehavior: "followUp"`, guarded by `retriedPrompt`) instead of failing the handoff; a second rejection finishes it as an error. `PendingHandoff` is now resolve-only.
+
+### Fixed
+
+- `notify`: **no duplicate "agent finished" notification while a background task is still running.** `agent_end`/`agent_settled` notified for the intermediate turn that launched a `triggerOnCompletion` task and again when the wake started its own turn, making the session look finished when it wasn't. The lifecycle handlers now skip dispatch while the background-tasks shared registry reports a running wake-pending task; the registry is read off the `Symbol.for("unipi.background-tasks.shared-registry")` global, so there is no dependency or load-order coupling (synchronous, never blocks the lifecycle hook).
+- `notify`: **`silenceAfterInput` no longer mutes blocking prompts.** Submitting a prompt with a keypress could silence the permission request that arrived seconds later — precisely the notification that must not be missed. `ask_user_prompt`/`permission_request` now bypass the quiet window, threaded through the existing `eventType` argument (`isBlockingEvent` in `activity.ts`); no new config.
+- `fusion`: **a failed sidekick handoff is reported as a structured error result.** `waitForReport` races the handoff rejection into an `{ error }` outcome and `sidekick`/`read_subagent` return `Handoff <id> failed: <message>` with `isError`, instead of the rejection escaping through the race.
+
+## [2.18.1] — 2026-09-16
+
+### Fixed
+
+- `updater`: update prompt / changelog detail bodies wrap to the overlay width instead of being truncated (was rendered at terminal width then chopped to the 80% overlay); footers advertise `↑/↓ j/k`.
+- `subagents`: process-backed children now receive `--no-extensions` when the agent sets `extensions: false` (`childExtensionsArg` in `pi-args.ts`); builtin `reviewer` sets `extensions: false` so parent extensions can no longer change its read-only tool surface (#37).
+
+### Changed
+
+- `btw`: the side-conversation session is read-only (`read, grep, find, ls`, no bash/edit/write) with an explicit read-only system instruction (#37).
+
 ## [2.18.0] — 2026-09-16
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/unipi",
-  "version": "2.18.0",
+  "version": "2.19.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.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"
+    "@pi-unipi/ask-user": "2.19.0",
+    "@pi-unipi/background-tasks": "2.19.0",
+    "@pi-unipi/btw": "2.19.0",
+    "@pi-unipi/command-enchantment": "2.19.0",
+    "@pi-unipi/compactor": "2.19.0",
+    "@pi-unipi/core": "2.19.0",
+    "@pi-unipi/footer": "2.19.0",
+    "@pi-unipi/image": "2.19.0",
+    "@pi-unipi/fusion": "2.19.0",
+    "@pi-unipi/info-screen": "2.19.0",
+    "@pi-unipi/input-shortcuts": "2.19.0",
+    "@pi-unipi/kanboard": "2.19.0",
+    "@pi-unipi/mcp": "2.19.0",
+    "@pi-unipi/memory": "2.19.0",
+    "@pi-unipi/milestone": "2.19.0",
+    "@pi-unipi/notify": "2.19.0",
+    "@pi-unipi/ralph": "2.19.0",
+    "@pi-unipi/subagents": "2.19.0",
+    "@pi-unipi/trajectory": "2.19.0",
+    "@pi-unipi/updater": "2.19.0",
+    "@pi-unipi/utility": "2.19.0",
+    "@pi-unipi/web-api": "2.19.0",
+    "@pi-unipi/workflow": "2.19.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.18.0",
+  "version": "2.19.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.18.0"
+    "@pi-unipi/core": "2.19.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.18.0",
+  "version": "2.19.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.18.0",
+  "version": "2.19.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.18.0",
+    "@pi-unipi/core": "2.19.0",
     "turndown": "^7.2.4"
   },
   "devDependencies": {

package/packages/btw/README.md

@@ -2,7 +2,7 @@
 
 Side conversations that run in parallel. Ask a question using `/unipi:btw` while the main agent keeps working — the answer streams into a modal overlay without interrupting the current task.
 
-BTW opens a real Pi sub-session with coding-tool access. Use it to clarify something, explore an idea, or think through next steps without derailing the main turn. When you're ready, inject the thread back or summarize it.
+BTW opens a real Pi sub-session with read-only file and search access. Use it to clarify something, explore an idea, or think through next steps without derailing the main turn. It cannot run commands or modify files; when you're ready, inject the thread back or summarize it.
 
 Based on [pi-btw](https://github.com/Neuron-Mr-White/pi-btw) by Dan Bachelder.
 
@@ -47,8 +47,8 @@ The BTW overlay opens top-centered so the main session remains visible underneat
 ## How It Works
 
 1. `/unipi:btw` creates or reuses a BTW sub-session
-2. Your question runs in a real Pi session with tool access
-3. The answer streams into the BTW modal overlay
+2. Your question runs in a real Pi session with read/search tool access (`read`, `grep`, `find`, `ls`)
+3. The read-only answer streams into the BTW modal overlay
 4. The thread continues until you clear it or inject it back
 
 `/unipi:btw-inject` sends the full thread to the main agent as a user message. If Pi is busy, it queues as a follow-up. `/unipi:btw-summarize` does the same but summarizes first.

package/packages/btw/extensions/btw.ts

@@ -2,7 +2,7 @@
  * @pi-unipi/btw — Side Conversation Extension
  *
  * A /unipi:btw side conversation channel that opens a real pi sub-session
- * with coding-tool access, running immediately even while the main
+ * with read-only coding-tool access, running immediately even while the main
  * agent is still busy.
  *
  * Based on pi-btw by Dan Bachelder, adapted for the Unipi suite.
@@ -64,6 +64,7 @@ const BTW_SYSTEM_PROMPT = [
   "If no main session messages are provided, treat this as a fully contextless tangent thread and rely only on the user's words plus your general instructions.",
   "Focus on answering the user's side questions, helping them think through ideas, or planning next steps.",
   "Do not act as if you need to continue unfinished work from the main session unless the user explicitly asks you to prepare something for injection back to it.",
+  "This aside is read-only: you can read and search files but cannot run commands or modify anything. Never claim to have edited, written, or executed something. If the user wants changes made, tell them to hand this thread off to the main session instead. Use /unipi:btw-inject or /unipi:btw-summarize to hand it off.",
 ].join(" ");
 
 const BTW_SUMMARIZE_SYSTEM_PROMPT =
@@ -1355,7 +1356,7 @@ export default function (pi: ExtensionAPI) {
       model: ctx.model,
       modelRuntime: sessionModelRuntime(ctx),
       thinkingLevel: pi.getThinkingLevel() as SessionThinkingLevel,
-      tools: ["read", "bash", "edit", "write"],
+      tools: ["read", "grep", "find", "ls"],
       resourceLoader: createBtwResourceLoader(ctx),
     });
 

package/packages/btw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/btw",
-  "version": "2.18.0",
+  "version": "2.19.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.18.0"
+    "@pi-unipi/core": "2.19.0"
   },
   "pi": {
     "extensions": [

package/packages/btw/skills/btw/SKILL.md

@@ -7,6 +7,8 @@ description: Helps you use the /unipi:btw side-conversation workflow effectively
 
 Use this skill when the user wants to work in parallel with the main agent instead of derailing the current turn.
 
+BTW side sessions are read-only: they can read and search files with `read`, `grep`, `find`, and `ls`, but cannot run commands or modify files. Send requested changes to the main session with `/unipi:btw-inject` or `/unipi:btw-summarize`.
+
 ## When to use BTW
 
 Prefer the BTW workflow when the user wants to:

package/packages/compactor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/compactor",
-  "version": "2.18.0",
+  "version": "2.19.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.18.0",
-    "@pi-unipi/info-screen": "2.18.0",
+    "@pi-unipi/core": "2.19.0",
+    "@pi-unipi/info-screen": "2.19.0",
     "@earendil-works/pi-agent-core": "^0.84.0"
   },
   "peerDependencies": {

package/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/core",
-  "version": "2.18.0",
+  "version": "2.19.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.18.0",
+  "version": "2.19.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.18.0",
-    "@pi-unipi/background-tasks": "2.18.0"
+    "@pi-unipi/core": "2.19.0",
+    "@pi-unipi/background-tasks": "2.19.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.84.0",

package/packages/fusion/README.md

@@ -92,8 +92,11 @@ persist across handoffs. The sidekick's context compacts independently of the
 lead's (it is its own pi session). `sidekick({message, block:true})` waits by
 default; `block:false` returns immediately and delivers a
 `<subagent_completion_notification>`. Calling it while busy steers the same
-handoff. `read_subagent({agent_id?, block?, timeout?})` reads or waits for a
-handoff.
+handoff. Background tasks keep that handoff open through their completion
+notification and any follow-up turn, so the report is not released at an
+intermediate checkpoint. If a prompt arrives while the child is processing,
+Fusion retries it once with pi's `followUp` streaming behavior.
+`read_subagent({agent_id?, block?, timeout?})` reads or waits for a handoff.
 
 The child receives `UNIPI_FUSION_CHILD=1` and `UNIPI_SUBAGENT_CHILD=1`; the
 Fusion extension guard prevents child processes from registering Fusion tools,

package/packages/fusion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/fusion",
-  "version": "2.18.0",
+  "version": "2.19.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.18.0",
-    "@pi-unipi/subagents": "2.18.0"
+    "@pi-unipi/core": "2.19.0",
+    "@pi-unipi/subagents": "2.19.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "^0.84.0",

package/packages/fusion/src/picker.ts

@@ -14,10 +14,11 @@
  *   $10 / 1M   $0.25 / 1M     $50 / 1M   $0.2 / 1M       $1.2 / 1M
  *   ↑/↓ select · ←/→ effort · tab lead · Enter confirm · esc cancel
  *
- * Row order: the active selection pinned first, then the Fusion row (when a
- * pair is configured), then recent (≤5, MRU), then the preset models, then
- * EVERY other available model — the catalogue is never hidden, the preset
- * only controls ordering. Typing filters all rows except the pinned one.
+ * Row order: the active selection pinned first, then the always-visible Fusion
+ * row (disabled with a setup hint when no pair is configured), then recent
+ * (≤5, MRU), then the preset models, then EVERY other available model — the
+ * catalogue is never hidden, the preset only controls ordering. Typing filters
+ * all rows except the pinned one.
  *
  * ←/→ steps the highlighted row's effort. Per-model effort is remembered for
  * plain model rows; the Fusion row keeps its own lead/sidekick efforts so
@@ -219,7 +220,7 @@ export class ModelPicker {
       out.push({ kind: "model", key: active.model });
       seen.add(active.model);
     }
-    if (!pinnedFusion && this.fusionAvailable()) out.push({ kind: "fusion" });
+    if (!pinnedFusion) out.push({ kind: "fusion" });
 
     const ordered: ModelKey[] = [
       ...this.state.recent,
@@ -268,6 +269,18 @@ export class ModelPicker {
       return;
     }
 
+    const disabledFusion = row?.kind === "fusion" && !this.fusionAvailable();
+    if (
+      disabledFusion &&
+      (matchesKey(data, Key.tab) ||
+        matchesKey(data, Key.left) ||
+        matchesKey(data, Key.right) ||
+        matchesKey(data, Key.enter) ||
+        data === "\r")
+    ) {
+      return;
+    }
+
     if (inDropdown) {
       const items = this.dropdownItems();
       if (matchesKey(data, Key.up)) {
@@ -406,11 +419,12 @@ export class ModelPicker {
   private renderRow(row: Row, highlighted: boolean, width: number): string {
     const t = this.theme;
     const pointer = highlighted ? t.fg("accent", "❭") : t.fg("dim", "·");
+    const disabledFusion = row.kind === "fusion" && !this.fusionAvailable();
     // The Fusion composite gets the check when it is the active selection —
     // same affordance a single active model gets on its own row.
     const marker =
       row.kind === "fusion"
-        ? this.state.active?.kind === "fusion"
+        ? !disabledFusion && this.state.active?.kind === "fusion"
           ? t.fg("success", "✓")
           : " "
         : this.markerFor(row.key);
@@ -418,9 +432,13 @@ export class ModelPicker {
     const nameRaw = row.kind === "fusion" ? "Fusion" : this.nameOf(row.key, NAME_COL - 1);
     const name =
       row.kind === "fusion"
-        ? highlighted
-          ? t.fg("accent", t.bold(nameRaw))
-          : t.fg("text", nameRaw)
+        ? disabledFusion
+          ? highlighted
+            ? t.fg("muted", t.bold(nameRaw))
+            : t.fg("dim", nameRaw)
+          : highlighted
+            ? t.fg("accent", t.bold(nameRaw))
+            : t.fg("text", nameRaw)
         : working
           ? t.fg("accent", t.bold(nameRaw))
           : highlighted
@@ -431,25 +449,33 @@ export class ModelPicker {
     const badgeGlyph = badge === undefined ? "" : ` ${t.fg(badge === "new" ? "success" : badge === "promotion" ? "accent" : "warning", "✱")}`;
 
     const level = row.kind === "fusion" ? this.fusionLeadEffort : this.effortFor(row.key);
-    const arrowsOn = highlighted && this.focus === "effort";
+    const arrowsOn = !disabledFusion && highlighted && this.focus === "effort";
     const left = arrowsOn ? t.fg("accent", "←") : " ";
     const right = arrowsOn ? t.fg("accent", "→") : " ";
-    const label = highlighted ? t.fg("accent", effortLabel(level)) : t.fg("muted", effortLabel(level));
+    const label = disabledFusion
+      ? t.fg("dim", effortLabel(level))
+      : highlighted
+        ? t.fg("accent", effortLabel(level))
+        : t.fg("muted", effortLabel(level));
 
-    let line = `${pointer} ${marker} ${pad(`${name}${badgeGlyph}`, NAME_COL)} ${left} ${this.bar(level, highlighted)} ${right} ${pad(label, 8)}`;
+    let line = `${pointer} ${marker} ${pad(`${name}${badgeGlyph}`, NAME_COL)} ${left} ${this.bar(level, !disabledFusion && highlighted)} ${right} ${pad(label, 8)}`;
 
     if (row.kind === "fusion") {
-      const leadName = this.nameOf(this.lead, 14);
-      const sideName = this.nameOf(this.sidekick, 14);
-      const leadFocused = highlighted && this.focus === "lead";
-      const sideFocused = highlighted && this.focus === "sidekick";
-      const leadText = leadFocused
-        ? `${t.fg("accent", t.bold("Lead"))} ${t.fg("accent", leadName)} ${t.fg("accent", "▾")}`
-        : `${t.fg("dim", "Lead")} ${t.fg("text", leadName)} ${t.fg("dim", "▾")}`;
-      const sideText = sideFocused
-        ? `${t.fg("accent", t.bold("Sidekick"))} ${t.fg("accent", sideName)} ${t.fg("accent", "▾")}`
-        : `${t.fg("dim", "Sidekick")} ${t.fg("text", sideName)} ${t.fg("dim", "▾")}`;
-      line += `   ${leadText}   ${sideText}`;
+      if (disabledFusion) {
+        line += `   ${t.fg("dim", "not configured — run /unipi:fusion-preset")}`;
+      } else {
+        const leadName = this.nameOf(this.lead, 14);
+        const sideName = this.nameOf(this.sidekick, 14);
+        const leadFocused = highlighted && this.focus === "lead";
+        const sideFocused = highlighted && this.focus === "sidekick";
+        const leadText = leadFocused
+          ? `${t.fg("accent", t.bold("Lead"))} ${t.fg("accent", leadName)} ${t.fg("accent", "▾")}`
+          : `${t.fg("dim", "Lead")} ${t.fg("text", leadName)} ${t.fg("dim", "▾")}`;
+        const sideText = sideFocused
+          ? `${t.fg("accent", t.bold("Sidekick"))} ${t.fg("accent", sideName)} ${t.fg("accent", "▾")}`
+          : `${t.fg("dim", "Sidekick")} ${t.fg("text", sideName)} ${t.fg("dim", "▾")}`;
+        line += `   ${leadText}   ${sideText}`;
+      }
     }
     return truncateToWidth(line, Math.max(1, width - 1));
   }
@@ -478,6 +504,7 @@ export class ModelPicker {
   private renderPricePanel(row: Row | undefined, width: number): string[] {
     const t = this.theme;
     if (row === undefined) return [];
+    const disabledFusion = row.kind === "fusion" && !this.fusionAvailable();
     const primaryKey = row.kind === "fusion" ? this.lead : row.key;
     const primary = primaryKey === undefined ? undefined : this.modelsByKey.get(primaryKey);
     const side = row.kind === "fusion" && this.sidekick !== undefined ? this.modelsByKey.get(this.sidekick) : undefined;
@@ -505,18 +532,20 @@ export class ModelPicker {
     const head = cols.map(([h]) => pad(t.fg("dim", h), colWidth)).join("");
     const vals = cols.map(([, v]) => pad(t.fg("text", v), colWidth)).join("");
     const desc =
-      row.kind === "fusion"
-        ? t.fg("dim", "Pairs frontier intelligence with cost-efficient execution")
-        : primary?.reasoning
-          ? t.fg("dim", "Reasoning model · ←/→ adjusts thinking effort")
-          : t.fg("dim", "Non-reasoning model · effort is ignored by the provider");
+      disabledFusion
+        ? t.fg("warning", "Run /unipi:fusion-preset to enable Fusion — a powerful lead model plans and reviews while a cheaper sidekick executes, for frontier performance at lower cost")
+        : row.kind === "fusion"
+          ? t.fg("dim", "Pairs frontier intelligence with cost-efficient execution")
+          : primary?.reasoning
+            ? t.fg("dim", "Reasoning model · ←/→ adjusts thinking effort")
+            : t.fg("dim", "Non-reasoning model · effort is ignored by the provider");
     const badges = this.state.models.some((m) => m.badge !== undefined)
       ? `${t.fg("success", "✱")} ${t.fg("dim", "New")}  ${t.fg("accent", "✱")} ${t.fg("dim", "Promotion")}  ${t.fg("warning", "✱")} ${t.fg("dim", "Beta")} ${t.fg("dim", "·")}`
       : "";
     const noPricing = row.kind === "fusion"
       ? !hasPricing(primaryCost) || !hasPricing(sideCost)
       : !hasPricing(primaryCost);
-    const pricing = noPricing ? t.fg("dim", " · no pricing data from provider") : "";
+    const pricing = !disabledFusion && noPricing ? t.fg("dim", " · no pricing data from provider") : "";
     const description = `${badges}${badges.length > 0 ? " " : ""}${desc}${pricing}`;
     return [truncateToWidth(`  ${head}`, width - 1), truncateToWidth(`  ${vals}`, width - 1), truncateToWidth(`  ${description}`, width - 1)];
   }
@@ -524,7 +553,9 @@ export class ModelPicker {
   private hintLine(row: Row | undefined): string {
     const t = this.theme;
     const parts: string[] = [];
-    if (row?.kind === "fusion" && this.focus !== "effort") {
+    if (row?.kind === "fusion" && !this.fusionAvailable()) {
+      parts.push("↑↓ select", "esc cancel");
+    } else if (row?.kind === "fusion" && this.focus !== "effort") {
       parts.push("↑↓ select", `tab ${this.focus === "lead" ? "sidekick" : "effort"}`, "↵ apply", "esc collapse");
     } else {
       parts.push("↑↓ select");

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

@@ -15,6 +15,7 @@ export interface SidekickSpawnConfig {
   spawn?: typeof defaultSpawn;
   command?: { command: string; args: string[] };
   onProgress?: () => void;
+  settleGraceMs?: number;
 }
 
 export interface SidekickUsage {
@@ -54,11 +55,15 @@ export interface HandoffReport {
 
 interface PendingHandoff {
   id: string;
+  message: string;
   startedAt: number;
   usage: SidekickUsage;
   progress: HandoffProgress;
+  retriedPrompt: boolean;
+  openBgTasks: number;
+  settled: boolean;
+  settleTimer?: NodeJS.Timeout;
   resolve: (report: HandoffReport) => void;
-  reject: (error: Error) => void;
 }
 
 const emptyUsage = (): SidekickUsage => ({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 });
@@ -193,16 +198,35 @@ export class SidekickRuntime {
     }
   }
 
+  private requestLastAssistantText(): void {
+    const current = this.pending;
+    if (current === undefined) return;
+    this.responseText = (text) => this.finish(this.abortRequested ? "aborted" : this.pendingError === undefined ? "completed" : "error", text, this.pendingError);
+    this.responseError = (error) => this.finish("error", undefined, error.message);
+    try {
+      this.send({ type: "get_last_assistant_text" });
+    } catch (error) {
+      this.finish("error", undefined, error instanceof Error ? error.message : String(error));
+    }
+  }
+
   private handleMessage(message: Record<string, unknown>): void {
     if (message.type === "response") {
       const command = message.command;
       if (command === "prompt" && message.success === false) {
-        const error = new Error(String(message.error ?? "Sidekick prompt rejected"));
+        const errorText = String(message.error ?? "Sidekick prompt rejected");
         const current = this.pending;
-        this.pending = undefined;
-        this.responseError = undefined;
-        this.responseText = undefined;
-        current?.reject(error);
+        if (current === undefined) return;
+        if (/already processing/i.test(errorText) && !current.retriedPrompt) {
+          current.retriedPrompt = true;
+          try {
+            this.send({ id: current.id, type: "prompt", message: current.message, streamingBehavior: "followUp" });
+          } catch (error) {
+            this.finish("error", undefined, error instanceof Error ? error.message : String(error));
+          }
+        } else {
+          this.finish("error", undefined, errorText);
+        }
       } else if (command === "get_last_assistant_text") {
         const data = message.data as Record<string, unknown> | undefined;
         const text = typeof data?.text === "string" ? data.text : this.pending?.progress.textTail ?? "";
@@ -224,6 +248,7 @@ export class SidekickRuntime {
       this.closeOpenText();
       this.pending.progress.toolCalls += 1;
       const args = message.args !== undefined && typeof message.args === "object" && message.args !== null ? message.args as Record<string, unknown> : undefined;
+      if (message.toolName === "bg_run" && args?.notifyOnCompletion !== false && args?.triggerOnCompletion !== false) this.pending.openBgTasks += 1;
       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);
@@ -237,6 +262,7 @@ export class SidekickRuntime {
         event.endedAt = Date.now();
         event.isError = message.isError === true;
         event.output = this.toolOutput(message.result);
+        if (event.name === "bg_run" && event.isError) this.pending.openBgTasks = Math.max(0, this.pending.openBgTasks - 1);
       }
       this.notifyProgress();
     } else if (message.type === "message_update") {
@@ -251,7 +277,19 @@ export class SidekickRuntime {
       }
     } else if (message.type === "message_end") {
       const msg = message.message as Record<string, unknown> | undefined;
-      if (msg?.role === "assistant") {
+      if (msg?.role === "custom" && msg.customType === "background-task-notification") {
+        this.pending.openBgTasks = Math.max(0, this.pending.openBgTasks - 1);
+        if (this.pending.openBgTasks === 0 && this.pending.settled) {
+          clearTimeout(this.pending.settleTimer);
+          this.pending.settleTimer = setTimeout(() => {
+            const current = this.pending;
+            if (current === undefined || !current.settled || current.openBgTasks > 0) return;
+            this.requestLastAssistantText();
+          }, this.cfg.settleGraceMs ?? 3000);
+          this.pending.settleTimer.unref();
+        }
+        this.notifyProgress();
+      } else if (msg?.role === "assistant") {
         this.closeOpenText();
         this.notifyProgress();
         if (msg.stopReason === "error" && typeof msg.errorMessage === "string") this.pendingError = msg.errorMessage;
@@ -267,16 +305,18 @@ export class SidekickRuntime {
           });
         }
       }
+    } else if (message.type === "agent_start") {
+      clearTimeout(this.pending.settleTimer);
+      this.pending.settleTimer = undefined;
+      this.pending.settled = false;
+      this.notifyProgress();
     } else if (message.type === "agent_settled") {
-      this.responseText = undefined;
-      this.responseError = undefined;
-      this.responseText = (text) => this.finish(this.abortRequested ? "aborted" : this.pendingError === undefined ? "completed" : "error", text, this.pendingError);
-      this.responseError = (error) => this.finish("error", undefined, error.message);
-      try {
-        this.send({ type: "get_last_assistant_text" });
-      } catch (error) {
-        this.finish("error", undefined, error instanceof Error ? error.message : String(error));
+      this.pending.settled = true;
+      if (this.pending.openBgTasks > 0) {
+        this.notifyProgress();
+        return;
       }
+      this.requestLastAssistantText();
     }
   }
 
@@ -293,6 +333,8 @@ export class SidekickRuntime {
   private finish(status: HandoffReport["status"], text?: string, error?: string): void {
     const current = this.pending;
     if (current === undefined) return;
+    clearTimeout(current.settleTimer);
+    current.settleTimer = undefined;
     this.pending = undefined;
     this.responseText = undefined;
     this.responseError = undefined;
@@ -323,19 +365,20 @@ export class SidekickRuntime {
     const id = randomUUID();
     const startedAt = Date.now();
     let resolve!: (report: HandoffReport) => void;
-    let reject!: (error: Error) => void;
-    const done = new Promise<HandoffReport>((res, rej) => {
+    const done = new Promise<HandoffReport>((res) => {
       resolve = res;
-      reject = rej;
     });
     this.pendingError = undefined;
     this.pending = {
       id,
+      message,
       startedAt,
       usage: emptyUsage(),
       progress: { toolCalls: 0, recentTools: [], textTail: "", startedAt, events: [], droppedEvents: 0 },
+      retriedPrompt: false,
+      openBgTasks: 0,
+      settled: false,
       resolve,
-      reject,
     };
     this.latestHandoff = { id, done };
     try {