@pi-unipi/unipi 3.0.0-alpha.25 → 3.0.0-alpha.26

package/CHANGELOG.md

@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [3.0.0-alpha.26] — 2026-10-04
+
+### Fixed
+- `fusion`: the "Non-trivial shell work since last handoff" nudge fires at most once per agent run instead of repeating on every 4th non-trivial shell command; a sidekick handoff still resets the streak but no longer re-arms the nudge, and a new prompt arms it again. (UNI-87)
+- `long-horizon`: mode-control tools are now truly OFF in pi's active tool set outside their mode (previously registered/active and only hidden from the provider payload), so pi's tool snippets and other modules no longer see them. Fresh and resumed sessions start with them off; resolving into a mode (command, judge, or active owner) turns that mode's tools on. (UNI-90)
+- `info-screen`: scope order now reads biggest first — footer legend `g global  p project  s session`, Compactor savings tiles global → project → session, Memory tiles global → project → share.
+- `info-screen`: Skills page tags each source with its real scope (`g` for user/agents/unipi/package skills, `p` for project skills) instead of implying session scope; the Tools page's tool list is tagged `s` (the active set is per session).
+- `info-screen`: Usage page leaves one blank line between the model share bar and the ranked model rows.
+
 ## [3.0.0-alpha.25] — 2026-10-04
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/unipi",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "All-in-one extension suite for Pi coding agent",
   "type": "module",
   "license": "MIT",
@@ -83,26 +83,26 @@
     "typebox": "^1.1.38"
   },
   "dependencies": {
-    "@pi-unipi/ask-user": "3.0.0-alpha.25",
-    "@pi-unipi/background-tasks": "3.0.0-alpha.25",
-    "@pi-unipi/btw": "3.0.0-alpha.25",
-    "@pi-unipi/command-enchantment": "3.0.0-alpha.25",
-    "@pi-unipi/compactor": "3.0.0-alpha.25",
-    "@pi-unipi/core": "3.0.0-alpha.25",
-    "@pi-unipi/footer": "3.0.0-alpha.25",
-    "@pi-unipi/fusion": "3.0.0-alpha.25",
-    "@pi-unipi/info-screen": "3.0.0-alpha.25",
-    "@pi-unipi/input-shortcuts": "3.0.0-alpha.25",
-    "@pi-unipi/kanboard": "3.0.0-alpha.25",
-    "@pi-unipi/mcp": "3.0.0-alpha.25",
-    "@pi-unipi/memory": "3.0.0-alpha.25",
-    "@pi-unipi/notify": "3.0.0-alpha.25",
-    "@pi-unipi/skill-registry": "3.0.0-alpha.25",
-    "@pi-unipi/subagents": "3.0.0-alpha.25",
-    "@pi-unipi/updater": "3.0.0-alpha.25",
-    "@pi-unipi/utility": "3.0.0-alpha.25",
-    "@pi-unipi/web-api": "3.0.0-alpha.25",
-    "@pi-unipi/workflow": "3.0.0-alpha.25"
+    "@pi-unipi/ask-user": "3.0.0-alpha.26",
+    "@pi-unipi/background-tasks": "3.0.0-alpha.26",
+    "@pi-unipi/btw": "3.0.0-alpha.26",
+    "@pi-unipi/command-enchantment": "3.0.0-alpha.26",
+    "@pi-unipi/compactor": "3.0.0-alpha.26",
+    "@pi-unipi/core": "3.0.0-alpha.26",
+    "@pi-unipi/footer": "3.0.0-alpha.26",
+    "@pi-unipi/fusion": "3.0.0-alpha.26",
+    "@pi-unipi/info-screen": "3.0.0-alpha.26",
+    "@pi-unipi/input-shortcuts": "3.0.0-alpha.26",
+    "@pi-unipi/kanboard": "3.0.0-alpha.26",
+    "@pi-unipi/mcp": "3.0.0-alpha.26",
+    "@pi-unipi/memory": "3.0.0-alpha.26",
+    "@pi-unipi/notify": "3.0.0-alpha.26",
+    "@pi-unipi/skill-registry": "3.0.0-alpha.26",
+    "@pi-unipi/subagents": "3.0.0-alpha.26",
+    "@pi-unipi/updater": "3.0.0-alpha.26",
+    "@pi-unipi/utility": "3.0.0-alpha.26",
+    "@pi-unipi/web-api": "3.0.0-alpha.26",
+    "@pi-unipi/workflow": "3.0.0-alpha.26"
   },
   "devDependencies": {
     "@earendil-works/pi-agent-core": "^0.87.1",

package/packages/ask-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/ask-user",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "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": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/autocomplete/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/command-enchantment",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "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": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "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.87.1",
-    "@pi-unipi/core": "3.0.0-alpha.25",
+    "@pi-unipi/core": "3.0.0-alpha.26",
     "turndown": "^7.2.4"
   },
   "devDependencies": {

package/packages/btw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/btw",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "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.87.1"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "pi": {
     "extensions": [

package/packages/compactor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/compactor",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Compaction for Pi — lossless zero-LLM or model summaries, rebuilt from full history, with session recall",
   "type": "module",
   "main": "src/index.ts",
@@ -33,8 +33,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25",
-    "@pi-unipi/info-screen": "3.0.0-alpha.25",
+    "@pi-unipi/core": "3.0.0-alpha.26",
+    "@pi-unipi/info-screen": "3.0.0-alpha.26",
     "@earendil-works/pi-agent-core": "^0.87.1"
   },
   "peerDependencies": {

package/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/core",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "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": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "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": "3.0.0-alpha.25",
-    "@pi-unipi/background-tasks": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26",
+    "@pi-unipi/background-tasks": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/fusion/package.json

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

package/packages/fusion/src/index.ts

@@ -231,6 +231,11 @@ export default function fusionExtension(pi: ExtensionAPI): void {
   let leadToolCalls = 0;
   let editNudgedThisTurn = false;
   let bashStreak = 0;
+  // The shell-delegation nudge fires at most ONCE per agent run (per user
+  // prompt): pi restarts the handler state on every before_agent_start, and
+  // sidekick/read_subagent handoffs keep resetting bashStreak, but neither
+  // may re-arm the nudge within the same run.
+  let bashNudgedThisRun = false;
 
   const wakeLine = createSidekickWakeLine({
     isBusy: () => runtime?.isBusy() === true,
@@ -378,6 +383,7 @@ export default function fusionExtension(pi: ExtensionAPI): void {
   // replacing `systemPrompt`, which nukes the cached prefix). The section is
   // present only while Fusion is active.
   pi.on("before_agent_start", (event, ctx) => {
+    bashNudgedThisRun = false;
     syncFusionTools(); // safety net: re-sync after any module re-juggled tools
     if (active?.kind === "fusion") {
       event.systemPromptOptions.sections["fusion-lead-policy"] = leadPolicy(identity(ctx));
@@ -418,8 +424,10 @@ export default function fusionExtension(pi: ExtensionAPI): void {
     if (toolName !== "bash") return;
     const command = typeof event.input.command === "string" ? event.input.command : "";
     if (isTrivialShell(command)) return;
+    if (bashNudgedThisRun) return;
     bashStreak += 1;
     if (bashStreak < BASH_NUDGE_EVERY) return;
+    bashNudgedThisRun = true;
     const annotation = bashNudge(bashStreak);
     const synopsis = "Non-trivial shell work since last handoff";
     const content = [...event.content, { type: "text" as const, text: annotation }];
@@ -633,6 +641,7 @@ export default function fusionExtension(pi: ExtensionAPI): void {
     stopRuntime();
     editNudgedThisTurn = false;
     bashStreak = 0;
+    bashNudgedThisRun = false;
     modelBykey.clear();
     active = loadPreset(ctx.cwd ?? process.cwd()).preset.active;
     mirrorStartup(ctx.cwd ?? process.cwd());

package/packages/info-screen/README.md

@@ -12,7 +12,7 @@ See what your session costs, what fills its context and what compaction saved yo
 
 - **Startup splash.** Unicrab says hello when Pi starts. The splash shows how fast Pi got ready, the session you came back to, today's spend and any update. It does not take your keys. It closes after `bootTimeoutMs`.
 - **Dashboard.** `/unipi:info` opens a set of pages. The first page is about this session.
-- **Scope tags.** A small letter before a number gives its scope: `s` is this session, `p` is this project and `g` is all projects on this machine.
+- **Scope tags.** A small letter before a number gives its scope: `g` is all projects on this machine, `p` is this project and `s` is this session.
 - **Fast open.** The dashboard opens at once on cached numbers. Then it updates the page that you look at.
 
 ## Quick start
@@ -63,7 +63,7 @@ splash waits for that overlay to close.
 | Tools | Each tool, with a colour for its source. Active tools have a full dot. |
 | Skills | Each skill, with a colour for where it lives. |
 | Modules | What each UniPi module adds: tools, commands, settings and keys. Other extensions. |
-| Compactor | Tokens and money that compaction saved, for `s`, `p` and `g`. Each compaction in this session. |
+| Compactor | Tokens and money that compaction saved, for `g`, `p` and `s`. Each compaction in this session. |
 | MCP · Memory · Web · Updates · Keys | The state of each module. MCP servers show `g` or `p` for the config that they come from. |
 
 ### The context bucket

package/packages/info-screen/core-groups.ts

@@ -14,6 +14,7 @@ import { collectSession, renderSession, sessionData, type SessionCtxLike } from
 import { renderUsage, usageData, type UsageRaw } from "./pages/usage.js";
 import { setCompactorHistorySource } from "./pages/modules.js";
 import { inventoryData, renderInventory, renderModules, type ModulesRaw, type Named } from "./pages/inventory.js";
+import type { Scope } from "./palette.js";
 
 // ─── load tracking ─────────────────────────────────────────────────────────
 
@@ -222,7 +223,7 @@ export function registerCoreGroups(): void {
       const activeCount = active ? items.filter((i) => i.active).length : undefined;
       return inventoryData(items, activeCount);
     },
-    render: (pc) => renderInventory(pc, "tools", "no tools registered"),
+    render: (pc) => renderInventory(pc, "tools", "no tools registered", "s"),
   });
 
   infoRegistry.registerGroup({
@@ -245,7 +246,10 @@ export function registerCoreGroups(): void {
       } catch {
         items = [];
       }
-      return inventoryData(items);
+      // Skills install per machine except project-local ones — the tags make
+      // that explicit (most skills are global, not session-scoped).
+      const groupScopes: Record<string, Scope> = { project: "p", user: "g", agents: "g", unipi: "g", package: "g" };
+      return inventoryData(items, undefined, groupScopes);
     },
     render: (pc) => renderInventory(pc, "skills", "add skills under ~/.pi/agent/skills or .pi/skills"),
   });

package/packages/info-screen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/info-screen",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Unicrab startup splash and the /unipi:info dashboard — this session, context, usage, compaction savings",
   "type": "module",
   "main": "index.ts",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/info-screen/pages/inventory.ts

@@ -10,7 +10,8 @@
 import { compact, fitTo, grid, rightTo, shareBar, type RGB } from "@pi-unipi/core";
 import { visibleWidth } from "@earendil-works/pi-tui";
 import type { GroupData, PageContext } from "../types.js";
-import { dim, empty, legend, muted, section, tiles } from "../tui/page-kit.js";
+import type { Scope } from "../palette.js";
+import { dim, empty, legend, muted, section, tag, tiles } from "../tui/page-kit.js";
 
 export interface Named {
   name: string;
@@ -22,6 +23,8 @@ export interface InventoryRaw {
   items: Named[];
   groups: Array<[string, number]>;
   activeCount?: number;
+  /** Scope per group label, shown as a one-cell tag in the legend. */
+  groupScopes?: Record<string, Scope>;
 }
 
 const GROUP_COLORS: RGB[] = [[0, 200, 240], [240, 120, 24], [190, 150, 240], [120, 200, 120], [240, 192, 48], [230, 120, 200], [78, 201, 176], [140, 140, 160]];
@@ -33,7 +36,7 @@ function colorMap(groups: ReadonlyArray<[string, number]>): Map<string, RGB> {
   return m;
 }
 
-export function inventoryData(items: Named[], activeCount?: number): GroupData {
+export function inventoryData(items: Named[], activeCount?: number, groupScopes?: Record<string, Scope>): GroupData {
   const counts = new Map<string, number>();
   for (const i of items) counts.set(i.group, (counts.get(i.group) ?? 0) + 1);
   const groups = [...counts.entries()].sort((a, b) => b[1] - a[1]);
@@ -42,7 +45,7 @@ export function inventoryData(items: Named[], activeCount?: number): GroupData {
     const gb = groups.findIndex(([g]) => g === b.group);
     return ga - gb || a.name.localeCompare(b.name);
   });
-  const raw: InventoryRaw = { items: sorted, groups, activeCount };
+  const raw: InventoryRaw = { items: sorted, groups, activeCount, groupScopes };
   return {
     total: { value: String(items.length) },
     groups: { value: groups.map(([g, n]) => `${n} ${g}`).join(", ") },
@@ -50,7 +53,7 @@ export function inventoryData(items: Named[], activeCount?: number): GroupData {
   };
 }
 
-export function renderInventory(pc: PageContext, noun: string, emptyHint: string): string[] {
+export function renderInventory(pc: PageContext, noun: string, emptyHint: string, headerScope?: Scope): string[] {
   const raw = pc.data.raw?.raw as InventoryRaw | undefined;
   if (!raw || raw.items.length === 0) return empty(pc, `No ${noun} loaded`, emptyHint);
   const p = pc.paint;
@@ -63,10 +66,10 @@ export function renderInventory(pc: PageContext, noun: string, emptyHint: string
   out.push(...tiles(pc, headline));
   out.push("");
   out.push(fitTo(shareBar(p, raw.groups.map(([g, n]) => ({ value: n, color: colors.get(g)! })), pc.width, "▆"), pc.width));
-  out.push(...legend(pc, raw.groups.map(([g, n]) => ({ label: `${g} ${n}`, color: colors.get(g)! }))));
+  out.push(...legend(pc, raw.groups.map(([g, n]) => ({ label: `${g} ${n}`, color: colors.get(g)!, scope: raw.groupScopes?.[g] }))));
   out.push("");
 
-  out.push(section(pc, `all ${noun}`, dim(p, "● active  ○ off")));
+  out.push(section(pc, `all ${noun}`, dim(p, "● active  ○ off"), headerScope));
   const items = raw.items.map((i) => {
     const c = colors.get(i.group) ?? [140, 140, 160];
     const mark = i.active === false ? p.rgb(c, "○") : p.rgb(c, "●");

package/packages/info-screen/pages/modules.ts

@@ -110,9 +110,9 @@ export function renderCompactor(pc: PageContext): string[] {
   out.push(section(pc, "saved by compaction", dim(p, "tokens not re-sent · ≈ money not spent")));
   out.push(
     ...tiles(pc, [
-      { label: "session", value: moneyShort(sess.dollars), sub: `${compact(sess.avoided)} tok · ${sess.count}×`, scope: "s", stops: [[0, 160, 200], [0, 200, 240], [160, 230, 255]] },
-      ...(hist.project ? [{ label: "project", value: moneyShort(hist.project.dollars), sub: `${compact(hist.project.avoided)} tok · ${hist.project.count}×`, scope: "p" as const, stops: [[70, 150, 70], [120, 200, 120], [190, 240, 190]] as RGB[] }] : []),
       ...(hist.global ? [{ label: "global", value: moneyShort(hist.global.dollars), sub: `${compact(hist.global.avoided)} tok · ${hist.global.count}×`, scope: "g" as const, stops: [CRAB.amber, CRAB.gold, CRAB.cream] }] : []),
+      ...(hist.project ? [{ label: "project", value: moneyShort(hist.project.dollars), sub: `${compact(hist.project.avoided)} tok · ${hist.project.count}×`, scope: "p" as const, stops: [[70, 150, 70], [120, 200, 120], [190, 240, 190]] as RGB[] }] : []),
+      { label: "session", value: moneyShort(sess.dollars), sub: `${compact(sess.avoided)} tok · ${sess.count}×`, scope: "s", stops: [[0, 160, 200], [0, 200, 240], [160, 230, 255]] },
     ]),
   );
 
@@ -287,8 +287,8 @@ export function renderMemory(pc: PageContext): string[] {
   const out: string[] = [];
   out.push(
     ...tiles(pc, [
-      { label: "project", value: compact(raw.projectCount), sub: raw.project, scope: "p" },
       { label: "global", value: compact(raw.total), sub: "all projects", scope: "g" },
+      { label: "project", value: compact(raw.projectCount), sub: raw.project, scope: "p" },
       { label: "share", value: `${raw.total ? Math.round((raw.projectCount / raw.total) * 100) : 0}%`, sub: "project / global" },
     ]),
   );

package/packages/info-screen/pages/usage.ts

@@ -150,6 +150,7 @@ export function renderUsage(pc: PageContext): string[] {
       out.push(fitTo(`${p.rgb(MODEL_COLORS[0]!, "●")} ${p.bold(m[0])}  ${dim(p, "every token this month")}  ${p.bold(useCost ? money(m[1]) : compact(m[2]))}`, pc.width));
     } else {
       out.push(fitTo(shareBar(p, raw.models.map((m, i) => ({ value: metric(m), color: MODEL_COLORS[i % MODEL_COLORS.length]! })), pc.width, "▆"), pc.width));
+      out.push("");
       // Ranked list: bars scaled to the TOTAL (so they read as shares, not "max = full").
       const nameW = Math.min(26, Math.max(...raw.models.map((m) => m[0].length)) + 1);
       const valW = 14;

package/packages/info-screen/tui/page-kit.ts

@@ -25,13 +25,13 @@ import {
 import type { GroupData, PageContext } from "../types.js";
 import { accentRamp, shade, SCOPE_COLOR, SCOPE_WORD, type Scope } from "../palette.js";
 
-/** One-cell scope tag: `s` session (cyan) · `p` project (green) · `g` global (amber). */
+/** One-cell scope tag: `g` global (amber) · `p` project (green) · `s` session (cyan). */
 export function tag(p: Paint, scope: Scope): string {
   return p.bold(p.rgb(SCOPE_COLOR[scope], scope));
 }
 
-/** `s session  p project  g global` — legend for the footer. */
-export function scopeLegend(p: Paint, scopes: readonly Scope[] = ["s", "p", "g"]): string {
+/** `g global  p project  s session` — legend for the footer, biggest scope first. */
+export function scopeLegend(p: Paint, scopes: readonly Scope[] = ["g", "p", "s"]): string {
   return scopes.map((sc) => `${tag(p, sc)} ${p.fg("dim", SCOPE_WORD[sc])}`).join("  ");
 }
 
@@ -138,13 +138,14 @@ export function rankBars(
   });
 }
 
-/** `■ input 42%  ■ output 9%  …` legend, wrapped onto as many rows as needed. */
-export function legend(pc: PageContext, items: ReadonlyArray<{ label: string; color: RGB }>): string[] {
+/** `■ input 42%  ■ output 9%  …` legend, wrapped onto as many rows as needed.
+ *  An entry may carry a one-cell scope tag: `■ g user 30`. */
+export function legend(pc: PageContext, items: ReadonlyArray<{ label: string; color: RGB; scope?: Scope }>): string[] {
   const p = pc.paint;
   const rows: string[] = [];
   let cur = "";
   for (const i of items) {
-    const piece = `${p.rgb(i.color, "■")} ${muted(p, i.label)}`;
+    const piece = `${p.rgb(i.color, "■")} ${i.scope ? `${tag(p, i.scope)} ` : ""}${muted(p, i.label)}`;
     if (cur && visibleWidth(cur) + 3 + visibleWidth(piece) > pc.width) {
       rows.push(fitTo(cur, pc.width));
       cur = piece;

package/packages/input-shortcuts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/input-shortcuts",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Keyboard shortcuts for stash/restore, undo/redo, clipboard, and thinking toggle — chord-based overlay system",
   "type": "module",
   "main": "src/index.ts",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/kanboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/kanboard",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Kanboard v3 — deferred-work board: CLI/daemon bridge, task runner and skill",
   "type": "module",
   "main": "index.ts",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",
@@ -48,10 +48,10 @@
     "themes": []
   },
   "optionalDependencies": {
-    "@pi-unipi/kanboard-linux-x64": "3.0.0-alpha.25",
-    "@pi-unipi/kanboard-linux-arm64": "3.0.0-alpha.25",
-    "@pi-unipi/kanboard-darwin-x64": "3.0.0-alpha.25",
-    "@pi-unipi/kanboard-darwin-arm64": "3.0.0-alpha.25",
-    "@pi-unipi/kanboard-win32-x64": "3.0.0-alpha.25"
+    "@pi-unipi/kanboard-linux-x64": "3.0.0-alpha.26",
+    "@pi-unipi/kanboard-linux-arm64": "3.0.0-alpha.26",
+    "@pi-unipi/kanboard-darwin-x64": "3.0.0-alpha.26",
+    "@pi-unipi/kanboard-darwin-arm64": "3.0.0-alpha.26",
+    "@pi-unipi/kanboard-win32-x64": "3.0.0-alpha.26"
   }
 }

package/packages/long-horizon/index.ts

@@ -78,6 +78,11 @@ export default function longHorizon(pi: ExtensionAPI): void {
   const owner = new OwnerCoordinator({
     statePath,
     onChange: (_snapshot, event: OwnerEvent) => {
+      // Owner transitions sync pi's active set (UNI-90): activate/resume/restore
+      // outside before_agent_start must expose the owner's mode tools at once.
+      // `gate` below is initialized in this same synchronous body before any
+      // transition can fire, so the forward reference is safe.
+      gate.onOwnerChanged(event);
       if (ownerEventClearsStash(event)) {
         stash.take();
         stashMetaState = { meta: undefined, kickoff: false };
@@ -378,6 +383,8 @@ export default function longHorizon(pi: ExtensionAPI): void {
   // reattaches the owner's tool surface; the continuation arms a recovery
   // fragment for the first post-restart turn.
   pi.on("session_start", () => {
+    // Mode tools start OFF; a restored active owner re-syncs them ON below.
+    gate.resetModeTools();
     const restored = owner.restore();
     machine.restore();
     // Only a truly drivable goal arms the recovery fragment; a paused goal

package/packages/long-horizon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/long-horizon",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Long-horizon execution for Pi — mode-gated /goal /ralph /swarm /graph orchestration with a TypeSafe prompt judge",
   "type": "module",
   "main": "index.ts",
@@ -37,7 +37,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/long-horizon/src/gate.ts

@@ -19,7 +19,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { emitEvent, isChildProcess, UNIPI_EVENTS, setSharedLongHorizonMode } from "@pi-unipi/core";
 import { LH_MODES, MODE_REGISTRY, modeForOwnerKind, type LhMode } from "./modes.js";
-import type { OwnerCoordinator, OwnerState } from "./owner.js";
+import type { OwnerCoordinator, OwnerEvent, OwnerState } from "./owner.js";
 import { resolveMode, type ResolutionSource } from "./judge/resolve.js";
 import type { FetchLike } from "./judge/typesafe.js";
 import { loadSettings, type LongHorizonSettings } from "./settings.js";
@@ -102,6 +102,28 @@ export function filterPayloadTools<T>(payload: T, mode: LhMode): T {
   return { ...record, tools: filtered } as T;
 }
 
+/**
+ * The gate owns mode-tool membership in pi's ACTIVE tool set: the payload
+ * filter alone leaves the tools declared in the system prompt, visible to
+ * pi's active-set consumers and to every other module. Touches ONLY names in
+ * ALL_MODE_TOOLS — adds the mode's controlTools, removes the rest — and
+ * preserves the order of every other tool. Skips setActiveTools when
+ * membership already matches (prefix-cache and re-entrancy safety). Returns
+ * whether the active set changed. (pi ignores unregistered names; harmless.)
+ */
+export function syncModeTools(
+  pi: Pick<ExtensionAPI, "getActiveTools" | "setActiveTools">,
+  mode: LhMode,
+): boolean {
+  const current = pi.getActiveTools();
+  const wanted = new Set<string>(MODE_REGISTRY[mode].controlTools);
+  if (ALL_MODE_TOOLS.every((name) => current.includes(name) === wanted.has(name))) return false;
+  const kept = current.filter((name) => !ALL_MODE_TOOLS.includes(name) || wanted.has(name));
+  const additions = [...wanted].filter((name) => !kept.includes(name));
+  pi.setActiveTools([...kept, ...additions]);
+  return true;
+}
+
 function ownerPresenceLine(owner?: OwnerState, parked?: OwnerState): string {
   // Presence only — numbers change every settlement and would bust the prefix
   // cache. Live status rides tail messages (continuation hints), not here.
@@ -152,6 +174,10 @@ export class Gate {
   setExplicit(mode: LhMode): void {
     this.pendingExplicit = mode;
     this.sessionOverride = null;
+    // The command's own next turn re-resolves and re-syncs; syncing now covers
+    // the gap where the kickoff rides a path that never re-enters
+    // before_agent_start (mid-run stash delivery → agent.continue()).
+    if (this.pi) syncModeTools(this.pi, mode);
   }
 
   /** Pin the session to a mode (/unipi:regular, goal stop): every later turn resolves to it. */
@@ -160,6 +186,7 @@ export class Gate {
     this.pendingExplicit = null;
     setSharedLongHorizonMode(mode);
     if (this.pi) {
+      syncModeTools(this.pi, mode);
       emitEvent(this.pi, UNIPI_EVENTS.LONG_HORIZON_MODE_RESOLVED, {
         mode,
         source: "explicit",
@@ -167,6 +194,43 @@ export class Gate {
     }
   }
 
+  /**
+   * Owner transitions between turns sync the active set too (UNI-90): an owner
+   * activated, resumed, or restored OUTSIDE before_agent_start — slash
+   * commands, command runners (/unipi:continue, unipi:goal-start/resume),
+   * crash recovery — flips its mode's tools on immediately, so a kickoff
+   * delivered via agent.continue() (which never re-enters
+   * before_agent_start) still has them. Wired from index's single owner
+   * onChange closure; suspend/finish/clear deliberately sync nothing (the
+   * next turn's resolution is authoritative, and a suspend-and-switch already
+   * synced its new mode via setExplicit). Best-effort: never throws.
+   */
+  onOwnerChanged(event: OwnerEvent): void {
+    try {
+      if (!this.pi) return;
+      if (event.type !== "activated" && event.type !== "resumed" && event.type !== "restored") return;
+      if (isChildProcess() && process.env.UNIPI_LH_ALLOW_CHILD !== "1") return;
+      const owner = event.type === "restored" ? event.snapshot.active : event.owner;
+      if (!owner) return;
+      syncModeTools(this.pi, modeForOwnerKind(owner.kind));
+    } catch {
+      // An owner transition must never fail because of tool syncing.
+    }
+  }
+
+  /** Fresh or resumed sessions start with the mode tools OFF; a restored
+   *  active owner re-syncs its mode's tools ON right after via
+   *  onOwnerChanged. Wired from index's single session_start handler so the
+   *  extension keeps exactly one. Best-effort: never throws. */
+  resetModeTools(): void {
+    try {
+      if (!this.pi) return;
+      syncModeTools(this.pi, "none");
+    } catch {
+      // Session start must never fail because of tool syncing.
+    }
+  }
+
   current(): GateState | null {
     return this.turn;
   }
@@ -221,6 +285,11 @@ export class Gate {
     // background by the entry renderer registered in index.ts.
     pi.on("before_agent_start", async (event) => {
       const state = await this.resolveForTurn(event.prompt);
+      // pi's live loadout is authoritative for this turn (agent-session honors
+      // setActiveTools from before_agent_start unless a handler edited
+      // systemPromptOptions.selectedTools), so flip the mode tools before
+      // anything else consumes the resolution.
+      syncModeTools(pi, state.mode);
       // Shared holder the footer pulls each render (timing-independent), plus
       // the event for the badge/other listeners.
       setSharedLongHorizonMode(state.mode);

package/packages/mcp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/mcp",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "MCP server management extension for Pi coding agent — browse, add, configure, and use MCP servers",
   "type": "module",
   "main": "src/index.ts",
@@ -30,7 +30,7 @@
     "test": "npx tsx --test tests/**/*.test.ts"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/memory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/memory",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Persistent cross-session memory on MemPalace (auto-installed): daemon-routed writes, shared palace with other agents, for Pi coding agent",
   "type": "module",
   "main": "index.ts",
@@ -42,8 +42,8 @@
     "README.md"
   ],
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25",
-    "@pi-unipi/info-screen": "3.0.0-alpha.25",
+    "@pi-unipi/core": "3.0.0-alpha.26",
+    "@pi-unipi/info-screen": "3.0.0-alpha.26",
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {

package/packages/notify/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/notify",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Cross-platform notification extension for Pi — native OS, Gotify, and Telegram notifications for agent lifecycle events",
   "type": "module",
   "main": "index.ts",
@@ -34,7 +34,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25",
+    "@pi-unipi/core": "3.0.0-alpha.26",
     "node-notifier": "^10.0.1"
   },
   "peerDependencies": {

package/packages/skill-registry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/skill-registry",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Skill registry for pi — per-project skill on/off, a skill vault, and jev-judged skill exposure",
   "type": "module",
   "license": "MIT",
@@ -33,7 +33,7 @@
   },
   "main": "index.ts",
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/subagents",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Subagents for UniPi — Devin-model independent child agents",
   "type": "module",
   "main": "src/index.ts",
@@ -9,8 +9,8 @@
     "test": "npx tsx --test src/__tests__/*.test.ts"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25",
-    "@pi-unipi/utility": "3.0.0-alpha.25",
+    "@pi-unipi/core": "3.0.0-alpha.26",
+    "@pi-unipi/utility": "3.0.0-alpha.26",
     "@earendil-works/pi-agent-core": "^0.87.1",
     "acorn": "8.18.0"
   },

package/packages/unipi/bundled.js

@@ -3432,7 +3432,7 @@ var init_hub = __esm({
         const rows = [];
         for (const def of defs) {
           const layers = settingsLayers(def.namespace, this.cwd);
-          const tag2 = `${layers.global ? "G" : "-"}${layers.project ? "P" : "-"}`;
+          const tag3 = `${layers.global ? "G" : "-"}${layers.project ? "P" : "-"}`;
           const sections = def.schema;
           const advanced = sections.filter((sec) => sec.advanced === true);
           const plain = sections.filter((sec) => sec.advanced !== true);
@@ -3441,7 +3441,7 @@ var init_hub = __esm({
               kind: "header",
               id: `${def.namespace}::${section3.title}`,
               label: `${def.label} \u2014 ${section3.title}`,
-              layerTag: tag2,
+              layerTag: tag3,
               namespace: def.namespace
             });
             for (const field of section3.fields) {
@@ -3468,7 +3468,7 @@ var init_hub = __esm({
                 kind: "header",
                 id: `${def.namespace}::${section3.title}`,
                 label: `${def.label} \u2014 ${section3.title}`,
-                layerTag: tag2,
+                layerTag: tag3,
                 namespace: def.namespace,
                 advancedOf: def.namespace
               });
@@ -4107,8 +4107,8 @@ var init_hub = __esm({
           return this.exactRow(dim(`  ${row.label}`), inner);
         }
         if (row.kind === "header") {
-          const tag2 = row.layerTag ? ` [${row.layerTag}]` : "";
-          return hubHeaderBand({ inner, text: `${row.label}${tag2}`, namespace: row.namespace });
+          const tag3 = row.layerTag ? ` [${row.layerTag}]` : "";
+          return hubHeaderBand({ inner, text: `${row.label}${tag3}`, namespace: row.namespace });
         }
         const field = row.field;
         if (field.type === "page") {
@@ -11910,9 +11910,9 @@ function splitCommand(command) {
   const heredoc = /<<-?\s*(['"]?)([A-Za-z_][A-Za-z0-9_]*)\1[^\n]*\n/g;
   let at = 0;
   for (let m = heredoc.exec(command); m; m = heredoc.exec(command)) {
-    const tag2 = m[2];
+    const tag3 = m[2];
     const bodyStart = m.index + m[0].length;
-    const end = new RegExp(`^[\\t ]*${tag2}[\\t ]*$`, "m");
+    const end = new RegExp(`^[\\t ]*${tag3}[\\t ]*$`, "m");
     const rest = command.slice(bodyStart);
     const close = end.exec(rest);
     if (!close) continue;
@@ -16175,6 +16175,15 @@ function filterPayloadTools(payload, mode) {
   if (filtered.length === tools.length) return payload;
   return { ...record, tools: filtered };
 }
+function syncModeTools(pi, mode) {
+  const current = pi.getActiveTools();
+  const wanted = new Set(MODE_REGISTRY[mode].controlTools);
+  if (ALL_MODE_TOOLS.every((name) => current.includes(name) === wanted.has(name))) return false;
+  const kept = current.filter((name) => !ALL_MODE_TOOLS.includes(name) || wanted.has(name));
+  const additions = [...wanted].filter((name) => !kept.includes(name));
+  pi.setActiveTools([...kept, ...additions]);
+  return true;
+}
 function ownerPresenceLine(owner, parked) {
   const parts = [];
   if (owner) parts.push(`an active ${owner.kind} owner is driving this session`);
@@ -16216,6 +16225,7 @@ var Gate = class {
   setExplicit(mode) {
     this.pendingExplicit = mode;
     this.sessionOverride = null;
+    if (this.pi) syncModeTools(this.pi, mode);
   }
   /** Pin the session to a mode (/unipi:regular, goal stop): every later turn resolves to it. */
   setSessionMode(mode) {
@@ -16223,12 +16233,46 @@ var Gate = class {
     this.pendingExplicit = null;
     setSharedLongHorizonMode(mode);
     if (this.pi) {
+      syncModeTools(this.pi, mode);
       emitEvent(this.pi, UNIPI_EVENTS.LONG_HORIZON_MODE_RESOLVED, {
         mode,
         source: "explicit"
       });
     }
   }
+  /**
+   * Owner transitions between turns sync the active set too (UNI-90): an owner
+   * activated, resumed, or restored OUTSIDE before_agent_start — slash
+   * commands, command runners (/unipi:continue, unipi:goal-start/resume),
+   * crash recovery — flips its mode's tools on immediately, so a kickoff
+   * delivered via agent.continue() (which never re-enters
+   * before_agent_start) still has them. Wired from index's single owner
+   * onChange closure; suspend/finish/clear deliberately sync nothing (the
+   * next turn's resolution is authoritative, and a suspend-and-switch already
+   * synced its new mode via setExplicit). Best-effort: never throws.
+   */
+  onOwnerChanged(event) {
+    try {
+      if (!this.pi) return;
+      if (event.type !== "activated" && event.type !== "resumed" && event.type !== "restored") return;
+      if (isChildProcess() && process.env.UNIPI_LH_ALLOW_CHILD !== "1") return;
+      const owner = event.type === "restored" ? event.snapshot.active : event.owner;
+      if (!owner) return;
+      syncModeTools(this.pi, modeForOwnerKind(owner.kind));
+    } catch {
+    }
+  }
+  /** Fresh or resumed sessions start with the mode tools OFF; a restored
+   *  active owner re-syncs its mode's tools ON right after via
+   *  onOwnerChanged. Wired from index's single session_start handler so the
+   *  extension keeps exactly one. Best-effort: never throws. */
+  resetModeTools() {
+    try {
+      if (!this.pi) return;
+      syncModeTools(this.pi, "none");
+    } catch {
+    }
+  }
   current() {
     return this.turn;
   }
@@ -16270,6 +16314,7 @@ var Gate = class {
     this.pi = pi;
     pi.on("before_agent_start", async (event) => {
       const state2 = await this.resolveForTurn(event.prompt);
+      syncModeTools(pi, state2.mode);
       setSharedLongHorizonMode(state2.mode);
       emitEvent(pi, UNIPI_EVENTS.LONG_HORIZON_MODE_RESOLVED, {
         mode: state2.mode,
@@ -18431,6 +18476,7 @@ function longHorizon(pi) {
   const owner = new OwnerCoordinator({
     statePath: statePath2,
     onChange: (_snapshot, event) => {
+      gate.onOwnerChanged(event);
       if (ownerEventClearsStash(event)) {
         stash.take();
         stashMetaState = { meta: void 0, kickoff: false };
@@ -18671,6 +18717,7 @@ function longHorizon(pi) {
     goalEstimateOn: () => loadSettings().goalProgress !== "off"
   }, machine, toolset);
   pi.on("session_start", () => {
+    gate.resetModeTools();
     const restored = owner.restore();
     machine.restore();
     const goalStatus = machine.get()?.status;
@@ -20925,11 +20972,11 @@ function mergeDirs(src, dst, conflictsDir) {
   } catch {
   }
 }
-function moveToConflicts(file, tag2) {
+function moveToConflicts(file, tag3) {
   if (!file) return;
   try {
     fs12.mkdirSync(CONFLICTS_DIR(), { recursive: true });
-    const name = `${tag2}-${path14.basename(file)}`;
+    const name = `${tag3}-${path14.basename(file)}`;
     fs12.renameSync(file, path14.join(CONFLICTS_DIR(), name));
   } catch {
   }
@@ -22200,7 +22247,7 @@ import { visibleWidth as visibleWidth13 } from "@earendil-works/pi-tui";
 function tag(p, scope) {
   return p.bold(p.rgb(SCOPE_COLOR[scope], scope));
 }
-function scopeLegend(p, scopes = ["s", "p", "g"]) {
+function scopeLegend(p, scopes = ["g", "p", "s"]) {
   return scopes.map((sc) => `${tag(p, sc)} ${p.fg("dim", SCOPE_WORD[sc])}`).join("  ");
 }
 function spaced(text) {
@@ -22269,7 +22316,7 @@ function legend(pc, items) {
   const rows = [];
   let cur = "";
   for (const i of items) {
-    const piece = `${p.rgb(i.color, "\u25A0")} ${muted(p, i.label)}`;
+    const piece = `${p.rgb(i.color, "\u25A0")} ${i.scope ? `${tag(p, i.scope)} ` : ""}${muted(p, i.label)}`;
     if (cur && visibleWidth13(cur) + 3 + visibleWidth13(piece) > pc.width) {
       rows.push(fitTo(cur, pc.width));
       cur = piece;
@@ -22391,9 +22438,9 @@ function renderCompactor(pc) {
   out.push(section(pc, "saved by compaction", dim2(p, "tokens not re-sent \xB7 \u2248 money not spent")));
   out.push(
     ...tiles(pc, [
-      { label: "session", value: moneyShort(sess.dollars), sub: `${compact(sess.avoided)} tok \xB7 ${sess.count}\xD7`, scope: "s", stops: [[0, 160, 200], [0, 200, 240], [160, 230, 255]] },
+      ...hist.global ? [{ label: "global", value: moneyShort(hist.global.dollars), sub: `${compact(hist.global.avoided)} tok \xB7 ${hist.global.count}\xD7`, scope: "g", stops: [CRAB.amber, CRAB.gold, CRAB.cream] }] : [],
       ...hist.project ? [{ label: "project", value: moneyShort(hist.project.dollars), sub: `${compact(hist.project.avoided)} tok \xB7 ${hist.project.count}\xD7`, scope: "p", stops: [[70, 150, 70], [120, 200, 120], [190, 240, 190]] }] : [],
-      ...hist.global ? [{ label: "global", value: moneyShort(hist.global.dollars), sub: `${compact(hist.global.avoided)} tok \xB7 ${hist.global.count}\xD7`, scope: "g", stops: [CRAB.amber, CRAB.gold, CRAB.cream] }] : []
+      { label: "session", value: moneyShort(sess.dollars), sub: `${compact(sess.avoided)} tok \xB7 ${sess.count}\xD7`, scope: "s", stops: [[0, 160, 200], [0, 200, 240], [160, 230, 255]] }
     ])
   );
   if (best.avoided > 0) {
@@ -22522,8 +22569,8 @@ function renderMemory(pc) {
   const out = [];
   out.push(
     ...tiles(pc, [
-      { label: "project", value: compact(raw.projectCount), sub: raw.project, scope: "p" },
       { label: "global", value: compact(raw.total), sub: "all projects", scope: "g" },
+      { label: "project", value: compact(raw.projectCount), sub: raw.project, scope: "p" },
       { label: "share", value: `${raw.total ? Math.round(raw.projectCount / raw.total * 100) : 0}%`, sub: "project / global" }
     ])
   );
@@ -23695,6 +23742,7 @@ function renderUsage(pc) {
       out.push(fitTo(`${p.rgb(MODEL_COLORS[0], "\u25CF")} ${p.bold(m[0])}  ${dim2(p, "every token this month")}  ${p.bold(useCost ? money(m[1]) : compact(m[2]))}`, pc.width));
     } else {
       out.push(fitTo(shareBar(p, raw.models.map((m, i) => ({ value: metric(m), color: MODEL_COLORS[i % MODEL_COLORS.length] })), pc.width, "\u2586"), pc.width));
+      out.push("");
       const nameW = Math.min(26, Math.max(...raw.models.map((m) => m[0].length)) + 1);
       const valW = 14;
       const barW = Math.max(6, pc.width - nameW - valW - 5);
@@ -23721,7 +23769,7 @@ function colorMap(groups) {
   groups.forEach(([g], i) => m.set(g, GROUP_COLORS[i % GROUP_COLORS.length]));
   return m;
 }
-function inventoryData(items, activeCount) {
+function inventoryData(items, activeCount, groupScopes) {
   const counts = /* @__PURE__ */ new Map();
   for (const i of items) counts.set(i.group, (counts.get(i.group) ?? 0) + 1);
   const groups = [...counts.entries()].sort((a, b) => b[1] - a[1]);
@@ -23730,14 +23778,14 @@ function inventoryData(items, activeCount) {
     const gb = groups.findIndex(([g]) => g === b.group);
     return ga - gb || a.name.localeCompare(b.name);
   });
-  const raw = { items: sorted, groups, activeCount };
+  const raw = { items: sorted, groups, activeCount, groupScopes };
   return {
     total: { value: String(items.length) },
     groups: { value: groups.map(([g, n]) => `${n} ${g}`).join(", ") },
     raw: { value: "", raw }
   };
 }
-function renderInventory(pc, noun, emptyHint) {
+function renderInventory(pc, noun, emptyHint, headerScope) {
   const raw = pc.data.raw?.raw;
   if (!raw || raw.items.length === 0) return empty(pc, `No ${noun} loaded`, emptyHint);
   const p = pc.paint;
@@ -23749,9 +23797,9 @@ function renderInventory(pc, noun, emptyHint) {
   out.push(...tiles(pc, headline));
   out.push("");
   out.push(fitTo(shareBar(p, raw.groups.map(([g2, n]) => ({ value: n, color: colors.get(g2) })), pc.width, "\u2586"), pc.width));
-  out.push(...legend(pc, raw.groups.map(([g2, n]) => ({ label: `${g2} ${n}`, color: colors.get(g2) }))));
+  out.push(...legend(pc, raw.groups.map(([g2, n]) => ({ label: `${g2} ${n}`, color: colors.get(g2), scope: raw.groupScopes?.[g2] }))));
   out.push("");
-  out.push(section(pc, `all ${noun}`, dim2(p, "\u25CF active  \u25CB off")));
+  out.push(section(pc, `all ${noun}`, dim2(p, "\u25CF active  \u25CB off"), headerScope));
   const items = raw.items.map((i) => {
     const c2 = colors.get(i.group) ?? [140, 140, 160];
     const mark = i.active === false ? p.rgb(c2, "\u25CB") : p.rgb(c2, "\u25CF");
@@ -23983,7 +24031,7 @@ function registerCoreGroups() {
       const activeCount = active ? items.filter((i) => i.active).length : void 0;
       return inventoryData(items, activeCount);
     },
-    render: (pc) => renderInventory(pc, "tools", "no tools registered")
+    render: (pc) => renderInventory(pc, "tools", "no tools registered", "s")
   });
   infoRegistry.registerGroup({
     id: "skills",
@@ -24003,7 +24051,8 @@ function registerCoreGroups() {
       } catch {
         items = [];
       }
-      return inventoryData(items);
+      const groupScopes = { project: "p", user: "g", agents: "g", unipi: "g", package: "g" };
+      return inventoryData(items, void 0, groupScopes);
     },
     render: (pc) => renderInventory(pc, "skills", "add skills under ~/.pi/agent/skills or .pi/skills")
   });
@@ -28424,8 +28473,8 @@ function normalizeContextUsage(value) {
   return { tokens, contextWindow, percent };
 }
 function parseContextUsageXml(xml) {
-  const readNumber = (tag2) => {
-    const match = new RegExp(`<${tag2}>(.*?)</${tag2}>`, "i").exec(xml);
+  const readNumber = (tag3) => {
+    const match = new RegExp(`<${tag3}>(.*?)</${tag3}>`, "i").exec(xml);
     if (!match) return void 0;
     const raw = match[1]?.trim();
     if (raw === "null" || raw === "?") return null;
@@ -31194,8 +31243,8 @@ function elementToMarkdown(element) {
       }
     } else if (node.nodeType === 1) {
       const el = node;
-      const tag2 = el.tagName?.toLowerCase();
-      switch (tag2) {
+      const tag3 = el.tagName?.toLowerCase();
+      switch (tag3) {
         case "h1":
           lines3.push("");
           lines3.push(`# ${extractTextContent(el)}`);
@@ -31215,7 +31264,7 @@ function elementToMarkdown(element) {
         case "h5":
         case "h6":
           lines3.push("");
-          lines3.push(`${"#".repeat(parseInt(tag2[1]))} ${extractTextContent(el)}`);
+          lines3.push(`${"#".repeat(parseInt(tag3[1]))} ${extractTextContent(el)}`);
           lines3.push("");
           break;
         case "p":
@@ -42098,11 +42147,11 @@ function getEnhancedUnipiItems(prefix, descriptionOverrides = /* @__PURE__ */ ne
     const color2 = PACKAGE_COLORS[pkg] ?? "";
     const label = PACKAGE_LABELS[pkg] ?? pkg;
     const desc = descriptionOverrides.get(cmd) ?? COMMAND_DESCRIPTIONS[cmd] ?? "";
-    const tag2 = colorize(color2, `[${label}]`);
+    const tag3 = colorize(color2, `[${label}]`);
     return {
       value: cmd,
       label: cmd,
-      description: desc ? `${tag2} ${desc}` : tag2
+      description: desc ? `${tag3} ${desc}` : tag3
     };
   });
 }
@@ -51936,8 +51985,8 @@ var PresetEditor = class {
         if (m.key === active.lead) tags.push("active lead");
         if (m.key === active.sidekick) tags.push("active sidekick");
       }
-      const tag2 = tags.length > 0 ? ` ${t.fg("dim", `(${tags.join(", ")})`)}` : "";
-      lines3.push(truncateToWidth39(` ${ptr} ${l} ${s}  ${name}${tag2}`, Math.max(1, width - 1)));
+      const tag3 = tags.length > 0 ? ` ${t.fg("dim", `(${tags.join(", ")})`)}` : "";
+      lines3.push(truncateToWidth39(` ${ptr} ${l} ${s}  ${name}${tag3}`, Math.max(1, width - 1)));
     }
     if (list.length > win) lines3.push(t.fg("dim", `  ${String(start + 1)}-${String(end)} of ${String(list.length)}`));
     lines3.push("");
@@ -52409,6 +52458,7 @@ function fusionExtension(pi) {
   let leadToolCalls = 0;
   let editNudgedThisTurn = false;
   let bashStreak = 0;
+  let bashNudgedThisRun = false;
   const wakeLine = createSidekickWakeLine({
     isBusy: () => runtime?.isBusy() === true,
     progress: () => runtime?.progress(),
@@ -52531,6 +52581,7 @@ Handoffs: ${String(runtime.reports.size)} \xB7 runtime alive: ${String(runtime.i
     handler: async (_args, ctx) => ctx.ui.notify(savingsStats(ctx), "info")
   });
   pi.on("before_agent_start", (event, ctx) => {
+    bashNudgedThisRun = false;
     syncFusionTools();
     if (active?.kind === "fusion") {
       event.systemPromptOptions.sections["fusion-lead-policy"] = leadPolicy(identity(ctx));
@@ -52569,8 +52620,10 @@ Handoffs: ${String(runtime.reports.size)} \xB7 runtime alive: ${String(runtime.i
     if (toolName !== "bash") return;
     const command = typeof event.input.command === "string" ? event.input.command : "";
     if (isTrivialShell(command)) return;
+    if (bashNudgedThisRun) return;
     bashStreak += 1;
     if (bashStreak < BASH_NUDGE_EVERY) return;
+    bashNudgedThisRun = true;
     const annotation = bashNudge(bashStreak);
     const synopsis = "Non-trivial shell work since last handoff";
     const content = [...event.content, { type: "text", text: annotation }];
@@ -52753,6 +52806,7 @@ ${String(result2.curation.lead.length)} lead \xB7 ${String(result2.curation.side
     stopRuntime();
     editNudgedThisTurn = false;
     bashStreak = 0;
+    bashNudgedThisRun = false;
     modelBykey.clear();
     active = loadPreset(ctx.cwd ?? process.cwd()).preset.active;
     mirrorStartup(ctx.cwd ?? process.cwd());

package/packages/updater/package.json

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

package/packages/utility/package.json

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

package/packages/watchdog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/watchdog",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Jev watchdog for long-running tool calls and background tasks — judges stuck work via TypeSafe System One and kills or warns",
   "type": "module",
   "main": "index.ts",
@@ -32,8 +32,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/background-tasks": "3.0.0-alpha.25",
-    "@pi-unipi/core": "3.0.0-alpha.25"
+    "@pi-unipi/background-tasks": "3.0.0-alpha.26",
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.87.1",

package/packages/web-api/package.json

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

package/packages/workflow/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/workflow",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "Plan mode and permission modes for the Pi coding agent",
   "type": "module",
   "main": "index.ts",
@@ -27,7 +27,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "3.0.0-alpha.25"
+    "@pi-unipi/core": "3.0.0-alpha.26"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "^0.87.1",