@pi-unipi/fusion 2.18.0 → 2.19.0

package/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/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/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/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 {

package/src/tools.ts

@@ -60,7 +60,7 @@ async function waitForReport(
   ctx: ExtensionContext,
   onUpdate?: (update: unknown) => void,
   timeoutMs = 2700000,
-): Promise<{ report?: HandoffReport; interrupted?: string; aborted?: boolean }> {
+): Promise<{ report?: HandoffReport; interrupted?: string; aborted?: boolean; error?: string }> {
   const started = Date.now();
   let lastProgressKey = "";
   while (true) {
@@ -72,8 +72,14 @@ async function waitForReport(
     const remaining = timeoutMs - (Date.now() - started);
     if (remaining <= 0) return {};
     const timer = new Promise<undefined>((resolve) => setTimeout(() => resolve(undefined), Math.min(500, remaining)));
-    const report = await Promise.race([done, timer]);
-    if (report !== undefined) return { report };
+    const outcome = await Promise.race([
+      done.then((report) => ({ report }), (error) => ({ error: error instanceof Error ? error.message : String(error) })),
+      timer,
+    ]);
+    if (outcome !== undefined) {
+      if ("error" in outcome) return { error: outcome.error };
+      return { report: outcome.report };
+    }
     const progress = progressText(runtime, id);
     const key = progressKey(runtime, id);
     if (key !== lastProgressKey) {
@@ -175,6 +181,7 @@ export function registerFusionTools(pi: ExtensionAPI, deps: FusionToolDeps): voi
         deps.onReport?.(ctx, waited.report);
         return result(reportText(waited.report), waited.report, waited.report.status !== "completed");
       }
+      if (waited.error) return result(`Handoff ${handoff.id} failed: ${waited.error}`, undefined, true);
       if (waited.aborted) return result(`${progressText(runtime, handoff.id)}\nHandoff ${handoff.id} aborted.`, undefined, true);
       if (waited.interrupted) return result(`A user message arrived while the sidekick (agent_id ${handoff.id}) was working. The handoff continues in the background. Act on the user's message first, then call read_subagent({agent_id:"${handoff.id}", block:true}) to collect the report or sidekick({message}) to redirect it.\n${waited.interrupted}`);
       return result(`Handoff ${handoff.id} is still running.\n${progressText(runtime, handoff.id)}`);
@@ -205,6 +212,7 @@ export function registerFusionTools(pi: ExtensionAPI, deps: FusionToolDeps): voi
         deps.onReport?.(ctx, waited.report);
         return result(reportText(waited.report), waited.report, waited.report.status !== "completed");
       }
+      if (waited.error) return result(`Handoff ${id} failed: ${waited.error}`, undefined, true);
       if (waited.aborted) return result(`Handoff ${id} aborted.`, undefined, true);
       if (waited.interrupted) return result(`A user message arrived while the sidekick (agent_id ${id}) was working.\n${waited.interrupted}`);
       return result(`Handoff ${id} is still running.\n${progressText(runtime, id)}`);