@pi-unipi/unipi 2.17.2 → 2.18.1

package/CHANGELOG.md

@@ -6,6 +6,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [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
+
+- `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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/unipi",
-  "version": "2.17.2",
+  "version": "2.18.1",
   "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.2",
-    "@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.2",
-    "@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.1",
+    "@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.1",
+    "@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.1",
+    "@pi-unipi/trajectory": "2.18.0",
+    "@pi-unipi/updater": "2.18.1",
+    "@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/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.17.0",
+  "version": "2.18.1",
   "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/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.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.2",
+  "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/fusion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/fusion",
-  "version": "2.17.1",
+  "version": "2.18.1",
   "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.1"
   },
   "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/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");