pi-better-harness 0.35.0 → 0.35.2

package/README.md

@@ -55,8 +55,8 @@ optional interface is off. See the [usage guide](docs/usage.md#outcome--todo).
 
 Subagent and background-task rows can be clicked to open their existing navigator
 details. Enter and keyboard controls remain available, and editor input stays
-passive. No permanent status bar is added; existing critical permission and
-paused notices remain unchanged.
+passive. Harness packages do not write to Pi's status bar. Goal holds and resume
+instructions remain available through `/goal`; permission checks are unchanged.
 
 ## Screenshots
 

package/extensions/task-context/index.ts

@@ -90,7 +90,6 @@ const UpdatePlanSchema = Type.Object({
 
 type WorkflowPlanInput = Omit<RushPlanUpdate, "event"> & { path?: string; event?: string };
 
-const LEGACY_PLAN_NAV_STATUS_KEY = "pi-better-plan-nav";
 const goalHeaderRuntime = (goal: GoalSnapshot) => ({ status: goal.status, clock: formatClockDuration(goalTiming(goal).activeSeconds) });
 const PLAN_ACTIONS: readonly AutocompleteItem[] = [
   { value: "clear", label: "clear", description: "Remove the current Todo without changing its outcome" },
@@ -289,7 +288,6 @@ export default function taskContextExtension(pi: ExtensionAPI): void {
     if ((enabled || display) && rushBinding) loadRushPlan(ctx);
     displayMode = state.displayMode;
     expanded = state.expanded;
-    if (ctx.hasUI) ctx.ui.setStatus(LEGACY_PLAN_NAV_STATUS_KEY, undefined);
     refresh(true);
     if (enabled) scheduleCompletedPlanClear();
   };
@@ -695,7 +693,6 @@ export default function taskContextExtension(pi: ExtensionAPI): void {
     refreshWidget = undefined;
     widgetContext = undefined;
     try {
-      ctx.ui.setStatus(LEGACY_PLAN_NAV_STATUS_KEY, undefined);
       ctx.ui.setWidget(EXTENSION_NAME, undefined);
     } catch { /* best-effort cleanup */ }
     legacyPlanMask?.dispose();

package/node_modules/pi-better-background-tasks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-background-tasks",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Pi extension for durable background shell tasks, watchers, logs, and status inspection.",
   "license": "MIT",
   "type": "module",

package/node_modules/pi-better-background-tasks/src/shared-navigator.ts

@@ -175,18 +175,15 @@ export function isNavigatorUiAvailable(ctx: ExtensionContext | undefined): boole
 }
 
 export function navigatorFooterHint(_count: number): string | null {
-  // Retain the compatibility helper so refresh/reload clears any old badge.
+  // Retain the compatibility helper without publishing a badge.
   return null;
 }
 
 export function applyNavigatorFooter(ui: { setStatus(key: string, value: string | undefined): void }, count: number): string | null {
-  const hint = navigatorFooterHint(count);
-  ui.setStatus(NAVIGATOR_STATUS_KEY, hint ?? undefined);
-  return hint;
+  return navigatorFooterHint(count);
 }
 
 export function applyCloseConfirmFooter(ui: { setStatus(key: string, value: string | undefined): void }, hint: string | null | undefined): string | null {
-  ui.setStatus(CLOSE_CONFIRM_STATUS_KEY, hint ?? undefined);
   return hint ?? null;
 }
 
@@ -219,8 +216,6 @@ export function disposeBackgroundWorkNavigator(ctx?: ExtensionContext): void {
   s.uiCtx = undefined;
   if (activeCtx && isNavigatorUiAvailable(activeCtx)) {
     const ui = activeCtx.ui;
-    try { applyNavigatorFooter(ui as any, 0); } catch { /* ignore */ }
-    try { applyCloseConfirmFooter(ui as any, null); } catch { /* ignore */ }
     try { (ui as any).setWidget?.(MAIN_LIST_WIDGET_KEY, undefined); } catch { /* ignore */ }
   }
   s.lastHint = undefined;
@@ -241,12 +236,6 @@ export function refreshBackgroundWorkNavigator(ctx?: ExtensionContext): void {
   const activeCtx = isNavigatorUiAvailable(ctx) ? ctx : s.uiCtx;
   if (!isNavigatorUiAvailable(activeCtx)) return;
   try {
-    const count = visibleCount();
-    const hint = navigatorFooterHint(count);
-    if (hint !== s.lastHint) {
-      applyNavigatorFooter(activeCtx!.ui as any, count);
-      s.lastHint = hint;
-    }
     refreshMainListWidget();
   } catch { /* ignore */ }
 }
@@ -271,7 +260,6 @@ function clearMainListCloseArm(): void {
   s.mainListCloseArmTimer = undefined;
   if (!s.mainListCloseArm) return;
   s.mainListCloseArm = undefined;
-  try { applyCloseConfirmFooter((s.uiCtx as any).ui, null); } catch { /* ignore */ }
 }
 
 function refreshMainListWidget(): void {
@@ -293,6 +281,7 @@ function refreshMainListWidget(): void {
   const nextSignature = rows.length ? mainListSignature(rows, {
     selectedId: s.mainListFocused ? s.mainListSelectedId : undefined,
     focused: s.mainListFocused === true,
+    closeHint: closeHintFor(rows.find((row) => row.navigatorId === s.mainListCloseArm?.id)),
   }) : undefined;
   const changed = nextSignature !== s.lastMainListSignature;
   s.lastMainListSignature = nextSignature;
@@ -416,6 +405,9 @@ function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, d
         selectedId: state().mainListFocused ? state().mainListSelectedId : undefined,
         focused: state().mainListFocused === true,
       });
+      const armedRow = rows.find((row) => row.navigatorId === state().mainListCloseArm?.id);
+      const hint = closeHintFor(armedRow);
+      if (hint) { layout.lines.push(deps.truncate(`   ${hint}`, renderWidth(width))); layout.owners.push(undefined); }
       lineWidth = renderWidth(width);
       // The leading gap line belongs to the widget too, so its slot stays ownerless.
       lineOwners = [undefined, ...layout.owners];
@@ -630,9 +622,10 @@ function statusIndicator(row: InternalRow, now = Date.now()): { glyph: string; c
   return { glyph: RUNNING_DOT_GLYPH, color: "accent" };
 }
 
-function mainListSignature(rows: InternalRow[], options: { selectedId?: string; focused?: boolean } = {}): string {
+function mainListSignature(rows: InternalRow[], options: { selectedId?: string; focused?: boolean; closeHint?: string | null } = {}): string {
   return JSON.stringify({
     focused: options.focused === true,
+    closeHint: options.closeHint ?? null,
     selectedId: options.focused === true ? options.selectedId ?? null : null,
     rows: rows.map((row) => ({
       navigatorId: row.navigatorId,
@@ -863,7 +856,6 @@ function handleMainListCloseKey(): void {
   }
   clearMainListCloseArm();
   s.mainListCloseArm = { id: row.navigatorId, armedAt: now };
-  try { applyCloseConfirmFooter((s.uiCtx as any).ui, closeHintFor(row)); } catch { /* ignore */ }
   s.mainListCloseArmTimer = setTimeout(() => {
     clearMainListCloseArm();
     refreshMainListWidget();
@@ -1034,7 +1026,6 @@ function createOverlayComponent(
     closeArmTimer = undefined;
     if (closeArm) {
       closeArm = undefined;
-      try { applyCloseConfirmFooter((state().uiCtx as any).ui, null); } catch { /* ignore */ }
     }
   }
 
@@ -1108,11 +1099,9 @@ function createOverlayComponent(
     }
     clearCloseArm();
     closeArm = { id: row.navigatorId, armedAt: now };
-    try { applyCloseConfirmFooter((state().uiCtx as any).ui, closeHintFor(row)); } catch { /* ignore */ }
     closeArmTimer = setTimeout(() => {
       closeArmTimer = undefined;
       closeArm = undefined;
-      try { applyCloseConfirmFooter((state().uiCtx as any).ui, null); } catch { /* ignore */ }
       requestRender();
     }, CLOSE_ARM_MS);
     closeArmTimer.unref?.();
@@ -1149,6 +1138,9 @@ function createOverlayComponent(
         selectedId: selectedRow()?.navigatorId,
         focused: true,
       });
+      const armedRow = overlayState.rows.find((row) => row.navigatorId === closeArm?.id);
+      const hint = closeHintFor(armedRow);
+      if (hint) { rail.lines.push(deps.truncate(`   ${hint}`, renderWidth(width))); rail.owners.push(undefined); }
       const railLines = rail.lines;
       const editorLines = renderEditorLines(width);
       const bottomLines = [...railLines, ...editorLines];

package/node_modules/pi-better-goal/README.md

@@ -14,7 +14,7 @@ Use `pi-better-goal` when a Pi session should keep an explicit objective visible
 
 - `/goal` runtime for starting, pausing, resuming, completing, and clearing the current objective.
 - `/goal settings` opens an interactive settings page in the TUI. Select a row with Up/Down and toggle with Space/Enter; changes save immediately, and Escape closes the page. All three controls default to `on`. Automatic continuation controls idle and background-drain wakes; conversational resume controls the agent's Escape-pause resume tool; **Pause on Esc** controls whether editor Escape pauses the active goal. Goal kickoff, `/goal resume`, and `alt+g` remain available with these controls off. For scripts or non-interactive sessions, use `/goal settings auto-continue on|off`, `/goal settings conversational-resume on|off`, and `/goal settings pause-on-escape on|off`; bare `/goal settings` prints the saved values outside the TUI.
-- `escape` pauses the active goal by default, and it stays paused while you talk to the agent. With **Pause on Esc** off, observed editor Escape leaves the goal active while preserving native streaming interruption and menu/dialog cancellation. Automatic continuation remains independent. Hosts without terminal/focus inspection and unknown custom editors retain generic abort-to-pause behavior because they cannot identify Escape reliably. With conversational resume enabled, say "go" (the agent then calls `goal_resume`), or use `/goal resume` or `alt+g`. `/goal pause` resumes only through `/goal resume` or `alt+g`. The status line shows the available resume path, and paused goals are never poked. On a macOS terminal without Option-as-Meta, `alt+g` types `©`; use `/goal resume` there.
+- `escape` pauses the active goal by default, and it stays paused while you talk to the agent. With **Pause on Esc** off, observed editor Escape leaves the goal active while preserving native streaming interruption and menu/dialog cancellation. Automatic continuation remains independent. Hosts without terminal/focus inspection and unknown custom editors retain generic abort-to-pause behavior because they cannot identify Escape reliably. With conversational resume enabled, say "go" (the agent then calls `goal_resume`), or use `/goal resume` or `alt+g`. `/goal pause` resumes only through `/goal resume` or `alt+g`. Paused goals are never poked. On a macOS terminal without Option-as-Meta, `alt+g` types `©`; use `/goal resume` there.
 - Background work that finishes while an `ask_user_question` is pending is handed to the agent right after the answer.
 - A compact goal widget that does not replace Pi's footer.
 - Background activity tracking for subagents and other registered providers.

package/node_modules/pi-better-goal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-goal",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Pi extension for goal tracking with background-aware continuation.",
   "license": "MIT",
   "type": "module",

package/node_modules/pi-better-goal/src/index.ts

@@ -374,7 +374,7 @@ export default function (pi: ExtensionAPI): void {
    * Chat `notify` appends lines above the Working/bash status region. While the
    * agent is streaming, that height change desyncs Pi main-screen differential
    * rendering and stacks "Working..." / "Elapsed Xs" into scrollback. Keep
-   * mid-stream feedback out of the transcript; use the footer status instead.
+   * mid-stream non-error feedback out of the transcript.
    */
   const notifyGoal = (
     ctx: ExtensionContext,
@@ -385,11 +385,6 @@ export default function (pi: ExtensionAPI): void {
       return;
     }
     if (isForegroundBusy(ctx) && type !== "error") {
-      try {
-        ctx.ui.setStatus(EXTENSION_NAME, message);
-      } catch {
-        // Footer status is best-effort only.
-      }
       return;
     }
     ctx.ui.notify(message, type);
@@ -424,7 +419,6 @@ export default function (pi: ExtensionAPI): void {
     clearIdleContinuation();
     syncPollingState();
     syncResumeTool(goal);
-    applyStatus(ctx);
     // Force a full redraw when the dock height changes (absent ↔ visible clock).
     refreshGoalWidget?.(!wasVisible || !isGoalClockVisible(goal));
   };
@@ -443,7 +437,6 @@ export default function (pi: ExtensionAPI): void {
     clearIdleContinuation();
     syncPollingState();
     syncResumeTool(null);
-    applyStatus(ctx);
     refreshGoalWidget?.(wasVisible);
   };
 
@@ -726,41 +719,9 @@ export default function (pi: ExtensionAPI): void {
       pi.events.emit(EVENT_TERMINAL_ATTENTION, snapshot);
       if (execution !== executionGeneration) return null;
     }
-    applyStatus(ctx);
-
     return snapshot;
   };
 
-  /** Footer status from the goal state and the latest activity snapshot. */
-  const statusText = (ctx: ExtensionContext, snapshot: ActivitySnapshot | null): string | undefined => {
-    const goal = getGoal(ctx);
-    let waitingOnAnswer = 0;
-    if (snapshot) {
-      for (const activeAtStart of pendingQuestions.values()) {
-        waitingOnAnswer += finishedSinceQuestion(activeAtStart, snapshot).length;
-      }
-    }
-    if (waitingOnAnswer > 0) return `${waitingOnAnswer} background done; waiting on your answer`;
-    if (goal?.status === "paused") return pausedGoalStatus(goal, preferences.conversationalResume);
-    if (snapshot?.backgroundRunning) return undefined;
-    const continuation = goal ? currentContinuationState(ctx, goal.goalId) : null;
-    if (continuation?.blocked) return "waiting: no progress";
-    const goalStall = observeGoalStall(goal, continuation, {
-      foregroundRunning,
-      backgroundRunning: snapshot?.backgroundRunning ?? false,
-    });
-    return goalStall?.state === "stalled" ? "goal stalled" : undefined;
-  };
-
-  function applyStatus(ctx: ExtensionContext): void {
-    if (!ctx.hasUI) return;
-    try {
-      ctx.ui.setStatus(EXTENSION_NAME, statusText(ctx, latestSnapshot));
-    } catch {
-      // UI status is best-effort only.
-    }
-  }
-
   /**
    * `goal_resume` is in the model's tool list only while an escape-paused goal
    * waits. Pi activates newly registered tools by default, so this also removes
@@ -918,7 +879,6 @@ export default function (pi: ExtensionAPI): void {
     preferences = writeGoalPreference(key, enabled);
     if (previous.autoContinue !== preferences.autoContinue) clearIdleContinuation();
     syncResumeTool(getGoal(ctx));
-    applyStatus(ctx);
     if (!previous.autoContinue && preferences.autoContinue) {
       const snapshot = await publishSnapshot(ctx);
       const goal = getGoal(ctx);
@@ -1578,7 +1538,6 @@ export default function (pi: ExtensionAPI): void {
     if (blocked) {
       refreshGoalWidget?.();
       if (ctx.hasUI) {
-        ctx.ui.setStatus(EXTENSION_NAME, "waiting: no progress");
         ctx.ui.notify(
           `Goal automatic continuation is waiting after ${noProgressRetries} identical retries (${evidence.summary}). Use /goal resume or alt+g to resume it.`,
           "warning",
@@ -1630,7 +1589,6 @@ export default function (pi: ExtensionAPI): void {
     latestSnapshot = null;
     collectionPending = false;
     try {
-      ctx.ui.setStatus(EXTENSION_NAME, undefined);
       ctx.ui.setWidget(EXTENSION_NAME, undefined);
     } catch {
       // Best-effort cleanup.

package/node_modules/pi-better-ssh/README.md

@@ -93,7 +93,7 @@ A profile sets defaults for later `remote_bash` calls. `use` accepts a configure
 }
 ```
 
-Call `ssh_profile` with `status` to inspect the active profile or `clear` to remove it. A footer chip shows the active target, workdir, and whether its mux is up or down. An explicit `host`, `workdir`, or environment entry on `remote_bash` takes precedence over the corresponding profile default.
+Call `ssh_profile` with `status` to inspect the active profile or `clear` to remove it. An explicit `host`, `workdir`, or environment entry on `remote_bash` takes precedence over the corresponding profile default.
 
 ## ControlMaster
 

package/node_modules/pi-better-ssh/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-ssh",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Pi extension for safe synchronous remote bash commands over reusable SSH connections.",
   "license": "MIT",
   "type": "module",

package/node_modules/pi-better-ssh/src/index.ts

@@ -21,8 +21,6 @@ import { executeRemoteBash, resolveRemoteBashConnection } from "./remote-bash.js
 import type { RemoteBashDependencies, RemoteBashResult } from "./remote-bash.js";
 import { resolveSshCommand } from "./shared-ssh-core/index.js";
 
-const STATUS_KEY = "pi-better-ssh";
-
 const RemoteBashParams = Type.Object({
   command: Type.String({ description: "Bash command string to execute remotely." }),
   host: Type.Optional(Type.String({ description: "SSH Host alias or user@host target. Optional when an active SSH profile supplies the host." })),
@@ -114,11 +112,7 @@ export function registerSshExtension(pi: ExtensionAPI, dependencies: RegisterSsh
     ...dependencies,
     muxRegistry,
     getActiveProfile: () => activeProfile,
-    onResult: (result, params, ctx) => {
-      if (activeProfile && params.host === undefined) {
-        setFooter(ctx, activeProfile, result.mux.state);
-      }
-    },
+    onResult: () => {},
   });
 
   const resolveMuxTarget = (params: {
@@ -158,22 +152,11 @@ export function registerSshExtension(pi: ExtensionAPI, dependencies: RegisterSsh
     }
   };
 
-  const setFooter = (ctx: ExtensionContext, profile: SshProfile | undefined, muxState?: "up" | "down"): void => {
-    try {
-      ctx.ui.setStatus(STATUS_KEY, profile ? formatSshProfileChip(profile, muxState ?? "down") : undefined);
-    } catch {
-      // Footer status is best-effort in non-interactive and partial harness contexts.
-    }
-  };
-
-  const refreshFooter = async (ctx: ExtensionContext) => {
+  const refreshMux = async (ctx: ExtensionContext) => {
     if (!activeProfile) {
-      setFooter(ctx, undefined);
       return undefined;
     }
-    const mux = await queryMux(activeProfile, ctx.sessionManager.getSessionId());
-    setFooter(ctx, activeProfile, mux.state);
-    return mux;
+    return queryMux(activeProfile, ctx.sessionManager.getSessionId());
   };
 
   pi.registerTool({
@@ -192,19 +175,18 @@ export function registerSshExtension(pi: ExtensionAPI, dependencies: RegisterSsh
         const aliases = listSshHostAliases(dependencies.sshConfigPath);
         activeProfile = createSshProfile(params, aliases, dependencies.sshConfigPath);
         pi.appendEntry(SSH_PROFILE_ENTRY_TYPE, profileStateEntry(activeProfile));
-        const mux = await refreshFooter(ctx);
+        const mux = await refreshMux(ctx);
         const details = { action: "use" as const, active: activeProfile, mux };
         return { content: [{ type: "text" as const, text: `Active SSH profile: ${formatSshProfileChip(activeProfile, mux?.state ?? "down")}` }], details };
       }
       if (params.action === "clear") {
         activeProfile = undefined;
         pi.appendEntry(SSH_PROFILE_ENTRY_TYPE, profileStateEntry(undefined));
-        setFooter(ctx, undefined);
         const details = { action: "clear" as const, active: null };
         return { content: [{ type: "text" as const, text: "Active SSH profile cleared." }], details };
       }
 
-      const mux = activeProfile ? await refreshFooter(ctx) : undefined;
+      const mux = activeProfile ? await refreshMux(ctx) : undefined;
       const details = { action: "status" as const, active: activeProfile ?? null, ...(mux ? { mux } : {}) };
       return {
         content: [{
@@ -235,12 +217,6 @@ export function registerSshExtension(pi: ExtensionAPI, dependencies: RegisterSsh
           ? await muxRegistry.statusAll(sessionScope)
           : await muxRegistry.stopAll(sessionScope);
         const masters = results.map(muxResultDetails);
-        if (activeProfile) {
-          const activeTarget = resolveMuxTarget({ host: activeProfile.host }).identity.target;
-          const activeMux = masters.find((master) => master.target === activeTarget);
-          if (params.action === "stop") setFooter(ctx, activeProfile, "down");
-          else if (activeMux) setFooter(ctx, activeProfile, activeMux.state === "up" ? "up" : "down");
-        }
         const details = { action: params.action, scope: "all" as const, masters };
         return { content: [{ type: "text" as const, text: formatMuxResults(masters) }], details };
       }
@@ -250,12 +226,6 @@ export function registerSshExtension(pi: ExtensionAPI, dependencies: RegisterSsh
         ? await muxRegistry.statusTarget(resolved, sessionScope)
         : await muxRegistry.stopTarget(resolved, sessionScope);
       const masters = [muxResultDetails(result)];
-      if (activeProfile) {
-        const activeTarget = resolveMuxTarget({ host: activeProfile.host }).identity.target;
-        if (resolved.identity.target === activeTarget) {
-          setFooter(ctx, activeProfile, result.state === "up" ? "up" : "down");
-        }
-      }
       const details = { action: params.action, scope: "target" as const, masters };
       return { content: [{ type: "text" as const, text: formatMuxResults(masters) }], details };
     },
@@ -263,11 +233,10 @@ export function registerSshExtension(pi: ExtensionAPI, dependencies: RegisterSsh
 
   const restore = async (ctx: ExtensionContext): Promise<void> => {
     activeProfile = restoreSshProfile(ctx.sessionManager.getBranch());
-    await refreshFooter(ctx);
+    await refreshMux(ctx);
   };
   pi.on("session_start", async (_event, ctx) => restore(ctx));
   pi.on("session_tree", async (_event, ctx) => restore(ctx));
-  pi.on("session_shutdown", async (_event, ctx) => setFooter(ctx, undefined));
 }
 
 export default function sshExtension(pi: ExtensionAPI): void {

package/node_modules/pi-better-subagents/agent-commands.ts

@@ -11,6 +11,7 @@ import { isAbsolute, resolve } from "node:path";
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { presentCatalog, presentCatalogEntry, type LaunchEnricher, type OperationView } from "./agent-inspection.ts";
 import { createCatalogComponent } from "./catalog-ui.ts";
+import type { ScopedModelLike } from "./catalog-editor.ts";
 import {
     CATALOG_SCHEMA_VERSION,
     DiagnosticCodes,
@@ -95,6 +96,11 @@ export interface AgentCommandHost {
     hasUI: boolean;
     mode?: "tui" | "rpc" | "json" | "print";
     isProjectTrusted(): boolean;
+    /**
+     * Session model scope from `ctx.scopedModels`. Empty or absent means no
+     * scope, which Pi treats as "all available models are usable".
+     */
+    scopedModels?: readonly ScopedModelLike[];
     ui: AgentCommandUi;
 }
 
@@ -150,10 +156,20 @@ export function executeAgentsCommandContext(args: string, ctx: ExtensionCommandC
         hasUI: ctx.hasUI,
         mode: ctx.mode,
         isProjectTrusted: () => ctx.isProjectTrusted(),
+        scopedModels: scopedModelsFromContext(ctx),
         ui: ctx.ui,
     }, deps);
 }
 
+/**
+ * Older Pi versions do not expose `ctx.scopedModels`, so they retain the
+ * unscoped picker. Current hosts use an empty array when no scope is configured.
+ */
+function scopedModelsFromContext(ctx: ExtensionCommandContext): readonly ScopedModelLike[] {
+    const scoped = (ctx as unknown as { scopedModels?: unknown }).scopedModels;
+    return Array.isArray(scoped) ? scoped as readonly ScopedModelLike[] : [];
+}
+
 export async function executeAgentsCommand(args: string, host: AgentCommandHost, deps: AgentCommandDeps = {}): Promise<AgentCommandResult> {
     const parsed = parseCommandArgs(args);
     if (parsed.positionals.length === 0 && parsed.flags.size === 0 && host.mode === "tui" && host.hasUI && host.ui.custom) parsed.positionals.push("list");
@@ -729,6 +745,7 @@ async function finishInspection(host: AgentCommandHost, commandResult: AgentComm
                 createCatalogComponent(entries, theme, () => tui.requestRender(), () => done(), view?.id, deps.sessionSettings ? {
                     get: () => presentCatalog(readCatalog(location(host, deps)), deps.enrich),
                     models: () => deps.editableModels?.() ?? [],
+                    scopedModels: () => host.scopedModels ?? [],
                     settings: () => deps.sessionSettings!.snapshot(),
                     change: (id, key, value) => deps.sessionSettings!.change(id, key, value),
                     save(id) {

package/node_modules/pi-better-subagents/catalog-editor.ts

@@ -0,0 +1,125 @@
+/**
+ * Model choices for the agent catalog's session-settings picker.
+ *
+ * Pi scopes model selection with `--models` / `enabledModels` and exposes the
+ * resolved set to extensions as `ctx.scopedModels`. Pi's contract for that
+ * field (pi-coding-agent extension types): "Empty when no scoping is
+ * configured (all available models are usable)." Pi's own `/model` selector
+ * applies the same rule: it starts in the `scoped` view when the resolved set
+ * is non-empty and in the `all` view when it is empty.
+ *
+ * The catalog picker follows those semantics, because an agent's model is a
+ * per-session preference rather than a second model policy:
+ *
+ * - non-empty scope: offer exactly the scoped models, in the order the session
+ *   configured them;
+ * - empty scope: nothing is restricted, so fall back to the foreground
+ *   registry's available models, which is what the picker offered before
+ *   scoping existed.
+ *
+ * A saved preference outside the scope is never rewritten: it stays on the
+ * definition and in the detail view, but the picker does not offer it, so the
+ * scope is the only source of selectable models. Only in the no-scope fallback
+ * does the current value stay in the list when it is no longer available, which
+ * is what the picker did before scoping existed. Nothing here validates or
+ * restricts launches: catalog and launch resolution keep using the value they
+ * already had.
+ */
+
+/** Structural view of one `ctx.scopedModels` entry (`{ model, thinkingLevel? }`). */
+export interface ScopedModelLike {
+    readonly model?: { readonly provider?: unknown; readonly id?: unknown } | null;
+    readonly provider?: unknown;
+    readonly id?: unknown;
+}
+
+export type CatalogModelScope = "scoped" | "all";
+
+export interface CatalogModelChoices {
+    /** Values the picker offers, in display order. */
+    values: string[];
+    /** `scoped` when the session restricts models; `all` when the fallback applies. */
+    scope: CatalogModelScope;
+    /** True when no session scope was configured and available models were used. */
+    fallback: boolean;
+    /**
+     * Saved value the offered set does not contain. Scoped mode leaves it out of
+     * `values`; the no-scope fallback keeps it in `values` so it stays selectable.
+     */
+    retained?: string;
+}
+
+function asRecord(value: unknown): Record<string, unknown> | undefined {
+    return typeof value === "object" && value !== null ? value as Record<string, unknown> : undefined;
+}
+
+function referencePart(value: unknown): string | undefined {
+    if (typeof value !== "string") return undefined;
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+}
+
+/**
+ * Canonical `provider/model` reference for a scoped model entry.
+ * Accepts `{ model: { provider, id } }` (Pi's shape) and a bare
+ * `{ provider, id }` so callers can pass either.
+ */
+export function modelReference(entry: unknown): string | undefined {
+    const record = asRecord(entry);
+    if (!record) return undefined;
+    const scoped = asRecord(record.model) ?? record;
+    const provider = referencePart(scoped.provider);
+    const id = referencePart(scoped.id);
+    return provider && id ? `${provider}/${id}` : undefined;
+}
+
+/** Scoped model references, in session order, with malformed and duplicate entries dropped. */
+export function scopedModelReferences(scoped: readonly unknown[] | null | undefined): string[] {
+    const seen = new Set<string>();
+    const references: string[] = [];
+    for (const entry of scoped ?? []) {
+        const reference = modelReference(entry);
+        if (!reference || seen.has(reference)) continue;
+        seen.add(reference);
+        references.push(reference);
+    }
+    return references;
+}
+
+/**
+ * Picker choices for the model field.
+ *
+ * `scoped` is the session scope (`ctx.scopedModels`); `available` is the
+ * foreground registry's available models used only when the scope is empty;
+ * `current` is the saved catalog/session value, reported through `retained`
+ * when the offered set does not contain it.
+ */
+export function catalogModelChoices(input: {
+    scoped?: readonly unknown[] | null;
+    available?: readonly string[] | null;
+    current?: string | null;
+}): CatalogModelChoices {
+    const scoped = scopedModelReferences(input.scoped);
+    const fallback = scoped.length === 0;
+    const values = fallback
+        ? [...new Set((input.available ?? []).map((value) => value.trim()).filter((value) => value.length > 0))].sort()
+        : [...scoped];
+    const current = referencePart(input.current);
+    const retained = current && !values.includes(current) ? current : undefined;
+    if (retained && fallback) values.push(retained);
+    return { values, scope: fallback ? "all" : "scoped", fallback, ...(retained ? { retained } : {}) };
+}
+
+/** One-line note above the model list explaining where the options come from. */
+export function catalogModelScopeLabel(choices: CatalogModelChoices): string {
+    if (choices.fallback) return "All available models \u00b7 no session scope";
+    const count = choices.values.length;
+    const scope = `Session model scope \u00b7 ${count} model${count === 1 ? "" : "s"}`;
+    return choices.retained ? `${scope} \u00b7 saved value is outside this scope` : scope;
+}
+
+/** Option label; only the retained saved value of the no-scope fallback is annotated. */
+export function catalogModelOptionLabel(choices: CatalogModelChoices, value: string): string {
+    if (choices.scope !== "all" || !choices.retained || value !== choices.retained) return value;
+    return `${value} \u00b7 saved, unavailable`;
+}

package/node_modules/pi-better-subagents/catalog-ui.ts

@@ -1,13 +1,17 @@
 import { Input, SelectList, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import type { OperationList, OperationView } from "./agent-inspection.ts";
 import { EFFORT_LEVELS } from "./catalog-schema.ts";
+import { catalogModelChoices, catalogModelOptionLabel, catalogModelScopeLabel, type ScopedModelLike } from "./catalog-editor.ts";
 import type { AgentSessionOverrides, AgentSettingKey } from "./agent-session-settings.ts";
 
 type Theme = { fg(color: string, text: string): string; bg?(color: string, text: string): string; bold?(text: string): string; inverse?(text: string): string };
 
 export interface CatalogEditor {
     get(): OperationList;
+    /** Available foreground models, used only when the session scope is empty. */
     models(): readonly string[];
+    /** Session model scope (`ctx.scopedModels`). Empty or absent means no scope. */
+    scopedModels?(): readonly ScopedModelLike[];
     settings(): AgentSessionOverrides;
     change(id: string, key: AgentSettingKey, value: string | null): void;
     save(id: string): { ok: boolean; message: string };
@@ -142,6 +146,7 @@ export function createCatalogComponent(
     let picker: SelectList | undefined;
     let filterPicker: ((filter: string) => void) | undefined;
     let pickerKey: AgentSettingKey | undefined;
+    let modelScopeNote: string | undefined;
     const search = new Input();
     let focused = false;
     let message = "";
@@ -162,8 +167,15 @@ export function createCatalogComponent(
         if (!current || !editor) return;
         if (!current.definitionValid) { report("Repair the catalog definition before editing.", true); return; }
         const key: AgentSettingKey = settingRow === 0 ? "model" : "effort";
-        const values = key === "model" ? [...new Set([...(editor.models()), ...(current.fields?.model.value ? [current.fields.model.value] : [])])].sort() : [...EFFORT_LEVELS];
-        const items = [{ value: "", label: "Inherit" }, ...values.map((value) => ({ value, label: value }))];
+        // Pi treats an empty scope as unrestricted. Scoped choices never include
+        // an out-of-scope saved value; the detail view still displays it.
+        const choices = key === "model"
+            ? catalogModelChoices({ scoped: editor.scopedModels?.(), available: editor.models(), current: current.fields?.model.value })
+            : undefined;
+        modelScopeNote = choices ? catalogModelScopeLabel(choices) : undefined;
+        const items = [{ value: "", label: "Inherit" }, ...(choices
+            ? choices.values.map((value) => ({ value, label: catalogModelOptionLabel(choices, value) }))
+            : EFFORT_LEVELS.map((value) => ({ value, label: value })))];
         pickerKey = key;
         search.setValue("");
         search.focused = focused && key === "model";
@@ -189,7 +201,11 @@ export function createCatalogComponent(
             picker.onSelect = onSelect;
         };
         filterPicker("");
-        picker!.setSelectedIndex(Math.max(0, items.findIndex((item) => item.value === current.fields?.[key].value)));
+        // A saved value the scope does not offer is not in the list. Highlight
+        // the first offered model instead of "Inherit" so Enter does not clear
+        // the saved preference by accident.
+        const currentIndex = items.findIndex((item) => item.value === current.fields?.[key].value);
+        picker!.setSelectedIndex(Math.max(0, currentIndex >= 0 ? currentIndex : choices && choices.scope === "scoped" ? 1 : 0));
     }
     const filtered = () => catalog.entries.filter((entry) =>
         [entry.id, entry.identity.name, entry.identity.description, entry.role?.id]
@@ -226,6 +242,7 @@ export function createCatalogComponent(
 
             if (picker) return fit([
                 theme.fg("accent", `Agents / ${pickerKey}`), "",
+                ...(pickerKey === "model" && modelScopeNote ? [theme.fg("dim", modelScopeNote), ""] : []),
                 ...(pickerKey === "model" ? search.render(safeWidth) : []),
                 ...picker.render(safeWidth),
                 ...(message ? [theme.fg(error ? "error" : "muted", message)] : []),

package/node_modules/pi-better-subagents/docs/agent-catalog-lifecycle.md

@@ -51,7 +51,9 @@ new sessions start from catalog defaults.
 The catalog host supplies a live `getSessionSettings` getter so inspection
 reflects edits made while the overlay is open. `loadLaunchSnapshot` reads that
 getter once and freezes the overlay for each batch. Later edits cannot alter
-already-admitted jobs. Model choices come from the current Pi model registry.
+already-admitted jobs. Model choices come from the session's Pi model scope
+(`ctx.scopedModels`); an empty scope is no restriction, so they fall back to the
+current Pi model registry's available models.
 
 Ctrl+S saves only the selected definition's own preferences, never flattened
 inherited settings. Bundled roles are copied to user scope; existing user and

package/node_modules/pi-better-subagents/docs/agent-catalog-operations.md

@@ -10,7 +10,9 @@ In an interactive TUI, `/agents`, `/agents list`, and `/agents show` open a focu
 
 ### Model and effort edits
 
-When lifecycle supplies `sessionSettings`, press `e` in detail to edit Model or Effort. Up/Down selects the setting and Enter opens its choices. Model choices come from the foreground registry, plus the current preference if unavailable; type to filter model names. Effort choices use the existing catalog effort levels. Escape cancels an unselected choice. Only these two fields are editable; instructions, base role, tier, and execution controls are unchanged.
+When lifecycle supplies `sessionSettings`, press `e` in detail to edit Model or Effort. Up/Down selects the setting and Enter opens its choices. Model choices follow the session's model scope (`ctx.scopedModels`, the same resolved set `/scoped-models` shows), with a header row naming the source, and type filters the names. A saved value outside the scope stays on the definition and in the detail view but is not offered by the picker; the header says so instead. An empty scope means no restriction in Pi, so the picker falls back to the foreground registry's available models, keeping a current preference that is no longer available labelled `saved`. Effort choices use the existing catalog effort levels. Escape cancels an unselected choice. Only these two fields are editable; instructions, base role, tier, and execution controls are unchanged.
+
+The scope affects only the picker. Launch and runtime model resolution keep reading the catalog/session preference as before, and the package imposes no global model restriction.
 
 A selected value immediately appends a custom entry to the current session branch. It does not write a catalog file. Reloading the extension or session restores the active branch's edits. Branches share their common ancestor settings but subsequent edits do not cross to siblings. Role edits flow into named agents that inherit that field. Choosing `Inherit` removes the selected definition's own value, including a saved agent override, instead of storing an explicit null preference. For a role with no parent, that removes its default. Later role/file edits remain live.
 

package/node_modules/pi-better-subagents/docs/agent-catalog.md

@@ -74,6 +74,10 @@ Credential-like keys (`token`, `apiKey`, `password`, `connectionString`, and sim
 
 ## Sources
 
+For external consumers, the repo-root `agent-catalog.yaml` publishes the shared
+definitions through a [Git subscription contract](catalog-subscription.md).
+This publication mechanism does not change local source precedence below.
+
 Precedence is project, then personal, then bundled. The higher source replaces the whole definition. Omitted agent fields inherit from the effective role, not from the shadowed agent.
 
 | Scope | Path |

package/node_modules/pi-better-subagents/docs/usage.md

@@ -615,10 +615,8 @@ is unchanged in every mode.
   still running, press `←` to focus the main-window subagent list above the
   input line.
 - If the editor contains text, `←` keeps normal cursor-left behavior.
-- While running runs exist, the default footer shows `← subagents · N`. The
-  live widget also includes a secondary `← to navigate` hint on its title line
-  for terminals that do not render the default footer status. The hint clears
-  when no non-dismissed current-parent run is still running.
+- The work list shows a navigation hint while running work is visible. The
+  subagent navigator does not write to the status bar.
 - While the main-window list is focused, the title hint changes to
   `Enter to view · x to stop`; the selected row is marked with `›`. Press
   `↓` from the bottom row to return to the input line.
@@ -660,7 +658,7 @@ is unchanged in every mode.
 ### Two-press `x` stop/dismiss
 
 - First `x` on the selected (list) or viewed (detail) run arms the action for three
-  seconds and shows a footer hint: `x again to stop <name>` while running, or
+  seconds and shows a hint in the navigator: `x again to stop <name>` while running, or
   `x again to dismiss <name>` when terminal.
 - Second `x` within the window, on the **same** run, acts:
   - **Running** — stop the process group (shared `subagent_stop` semantics),
@@ -671,7 +669,7 @@ is unchanged in every mode.
 
 ### Dismissal is navigator-only
 
-Dismissed runs leave the navigator list and footer count. Logs, prompt, session
+Dismissed runs leave the navigator list. Logs, prompt, session
 data, metadata, and id-based tool access stay intact. `subagent_list`,
 `subagent_output`, `subagent_result`, and `subagent_stop` still resolve dismissed
 run ids. Dismissal survives `/reload` as dismissed in the navigator.
@@ -679,9 +677,8 @@ run ids. Dismissal survives `/reload` as dismissed in the navigator.
 ### Reload and teardown
 
 `/reload` and session restart reinstall the empty-editor wrapper without stacking
-duplicate handlers, republish the footer count, and clear any leftover overlay
-timers or close-confirm state. Session shutdown disposes open navigator timers
-and clears navigator footer statuses (TUI only).
+duplicate handlers and clear any leftover overlay timers or close-confirm
+state. Session shutdown disposes open navigator timers.
 
 ## Design notes
 

package/node_modules/pi-better-subagents/index.ts

@@ -20,8 +20,6 @@ import { CustomEditor } from "@earendil-works/pi-coding-agent";
 import { matchesKey, Key, truncateToWidth, type AutocompleteItem } from "@earendil-works/pi-tui";
 import { Type } from "@earendil-works/pi-ai";
 import {
-    CLOSE_CONFIRM_STATUS_KEY,
-    NAVIGATOR_STATUS_KEY,
     disposeBackgroundWorkNavigator,
     ensureBackgroundWorkNavigator,
     isNavigatorUiAvailable,
@@ -986,13 +984,11 @@ export function setIdentityProbeForTests(probe: ProcessProbe | undefined): void
 //
 // Human-facing TUI surface. Glue points, all gated on isNavigatorUiAvailable so
 // print/RPC sessions never see any of it:
-//   1. footer hint `← subagents · N` via the DEFAULT footer status mechanism
-//      (setStatus — the full footer is never replaced);
-//   2. an editor wrapper that intercepts bare ← only when the editor is empty
+//   1. an editor wrapper that intercepts bare ← only when the editor is empty
 //      and at least one non-dismissed current-parent run is running,
 //      delegating everything else to the wrapped
 //      editor (composition via navigator.mjs, tested with fakes);
-//   3. a focused overlay (ctx.ui.custom(..., { overlay: true })) listing the
+//   2. a focused overlay (ctx.ui.custom(..., { overlay: true })) listing the
 //      #44 navigatorVisibleRuns newest first, with Enter → live detail view
 //      that refreshes once per second (#46) and two-press `x` Close (#47).
 //      Detail + close-arm timers dispose on back, Escape, overlay close,
@@ -1103,14 +1099,6 @@ function navigatorCloseRun(id: string) {
     return outcome;
 }
 
-/** Publish/clear the Close confirmation footer hint (TUI only). */
-function publishCloseConfirmHint(ctx: ExtensionContext, hint: string | null): void {
-    if (!isNavigatorUiAvailable(ctx)) return;
-    try {
-        ctx.ui.setStatus(CLOSE_CONFIRM_STATUS_KEY, hint ?? undefined);
-    } catch { /* ignore */ }
-}
-
 function statusTone(status: string): BackgroundWorkRow["statusTone"] {
     switch (status) {
         case "running": return "running";
@@ -1409,7 +1397,7 @@ function openNavigator(ctx: ExtensionContext, initialDetailId?: string): void {
     ensureNavigator(ctx);
 }
 
-/** Publish/clear the running-only `← subagents · N` footer hint (dirty-checked). */
+/** Refresh the shared navigator after run changes. */
 function updateNavigatorFooter(ctx: ExtensionContext | undefined): void {
     refreshBackgroundWorkNavigator(ctx);
 }
@@ -2460,8 +2448,6 @@ export default function (pi: ExtensionAPI) {
         // - Drop any leftover overlay timers/confirm state from a prior session
         //   (defensive if the host skipped session_shutdown before re-start).
         // - Reinstall the editor wrapper without stacking (marked factory).
-        // - Clear + republish footer statuses (pi clears extension statuses on
-        //   session switch/reload; dirty-check only dedupes within a session).
         // - Repaint the widget even if its last in-memory lines match; the host
         //   may have dropped extension UI during reload/session replacement.
         ensureSubagentProvider();
@@ -2471,9 +2457,6 @@ export default function (pi: ExtensionAPI) {
         disposeBackgroundWorkNavigator(ctx);
         widgetNavActive = false;
         widgetNavSelectedId = undefined;
-        if (isNavigatorUiAvailable(ctx)) {
-            try { ctx.ui.setStatus(CLOSE_CONFIRM_STATUS_KEY, undefined); } catch { /* ignore */ }
-        }
         ensureNavigator(ctx);
         publishAcceptanceHooks();
         updateNavigatorFooter(ctx);
@@ -2522,14 +2505,7 @@ export default function (pi: ExtensionAPI) {
         // Always dispose navigator detail timers (no UI call — just clearInterval).
         // Safe in every mode; the dispose hook is only set when a TUI overlay opened.
         disposeBackgroundWorkNavigator(ctx);
-        // Widget clear is intentional in every mode that exposes ui (incl. RPC
-        // — pi docs: setWidget works in both TUI and RPC). Navigator cleanup
-        // is TUI-only: the footer hint is never published outside TUI, so
-        // clearing it in RPC would be a pure UI leak (setStatus subagents-nav).
+        // Widget clear is intentional in every mode that exposes ui, including RPC.
         try { ctx.ui.setWidget("subagents", WIDGET_CLEAR); } catch { /* ignore */ }
-        if (isNavigatorUiAvailable(ctx)) {
-            try { ctx.ui.setStatus(NAVIGATOR_STATUS_KEY, undefined); } catch { /* ignore */ }
-            try { ctx.ui.setStatus(CLOSE_CONFIRM_STATUS_KEY, undefined); } catch { /* ignore */ }
-        }
     });
 }

package/node_modules/pi-better-subagents/navigator.mjs

@@ -37,29 +37,18 @@ export const DETAIL_TICK_MS = 1000;
 /** Two-press Close confirmation window (ms). Exclusive at the boundary. */
 export const CLOSE_ARM_MS = 3000;
 
-/** Footer status key for the `← subagents · N` hint (default footer mechanism). */
+/** Legacy status keys retained for compatibility. */
 export const NAVIGATOR_STATUS_KEY = "subagents-nav";
 
-/** Footer status key for the Close confirmation hint (coexists with count hint). */
 export const CLOSE_CONFIRM_STATUS_KEY = "subagents-close";
 
-/**
- * Footer hint text: `← subagents · N` while at least one visible
- * current-parent run exists, null when none (caller clears the status).
- */
+/** Legacy footer helpers no longer write status. */
 export function navigatorFooterHint(count) {
-    return count > 0 ? `← subagents · ${count}` : null;
+    return null;
 }
 
-/**
- * Publish the footer hint through pi's default footer status mechanism.
- * Sets `← subagents · N` for count ≥ 1, clears the status at 0. Returns the
- * hint (or null) so callers can dirty-check. NEVER touches the footer itself.
- */
 export function applyNavigatorFooter(ui, count) {
-    const hint = navigatorFooterHint(count);
-    ui.setStatus(NAVIGATOR_STATUS_KEY, hint ?? undefined);
-    return hint;
+    return navigatorFooterHint(count);
 }
 
 // ---------------------------------------------------------------------------
@@ -79,13 +68,8 @@ export function closeConfirmHint(row) {
     return stoppable ? `x again to stop ${label}` : `x again to dismiss ${label}`;
 }
 
-/**
- * Publish/clear the Close confirmation hint through pi's default footer status
- * mechanism (a dedicated key so it coexists with `← subagents · N`).
- * Pass null/undefined to clear.
- */
+/** Preserve the hint for compatibility without writing status. */
 export function applyCloseConfirmFooter(ui, hint) {
-    ui.setStatus(CLOSE_CONFIRM_STATUS_KEY, hint ?? undefined);
     return hint ?? null;
 }
 

package/node_modules/pi-better-subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-subagents",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "description": "Pi extension for detached, sandboxed subagent runs that keep the foreground session free.",
   "license": "MIT",
   "type": "module",

package/node_modules/pi-better-subagents/shared-navigator.ts

@@ -175,18 +175,15 @@ export function isNavigatorUiAvailable(ctx: ExtensionContext | undefined): boole
 }
 
 export function navigatorFooterHint(_count: number): string | null {
-  // Retain the compatibility helper so refresh/reload clears any old badge.
+  // Retain the compatibility helper without publishing a badge.
   return null;
 }
 
 export function applyNavigatorFooter(ui: { setStatus(key: string, value: string | undefined): void }, count: number): string | null {
-  const hint = navigatorFooterHint(count);
-  ui.setStatus(NAVIGATOR_STATUS_KEY, hint ?? undefined);
-  return hint;
+  return navigatorFooterHint(count);
 }
 
 export function applyCloseConfirmFooter(ui: { setStatus(key: string, value: string | undefined): void }, hint: string | null | undefined): string | null {
-  ui.setStatus(CLOSE_CONFIRM_STATUS_KEY, hint ?? undefined);
   return hint ?? null;
 }
 
@@ -219,8 +216,6 @@ export function disposeBackgroundWorkNavigator(ctx?: ExtensionContext): void {
   s.uiCtx = undefined;
   if (activeCtx && isNavigatorUiAvailable(activeCtx)) {
     const ui = activeCtx.ui;
-    try { applyNavigatorFooter(ui as any, 0); } catch { /* ignore */ }
-    try { applyCloseConfirmFooter(ui as any, null); } catch { /* ignore */ }
     try { (ui as any).setWidget?.(MAIN_LIST_WIDGET_KEY, undefined); } catch { /* ignore */ }
   }
   s.lastHint = undefined;
@@ -241,12 +236,6 @@ export function refreshBackgroundWorkNavigator(ctx?: ExtensionContext): void {
   const activeCtx = isNavigatorUiAvailable(ctx) ? ctx : s.uiCtx;
   if (!isNavigatorUiAvailable(activeCtx)) return;
   try {
-    const count = visibleCount();
-    const hint = navigatorFooterHint(count);
-    if (hint !== s.lastHint) {
-      applyNavigatorFooter(activeCtx!.ui as any, count);
-      s.lastHint = hint;
-    }
     refreshMainListWidget();
   } catch { /* ignore */ }
 }
@@ -271,7 +260,6 @@ function clearMainListCloseArm(): void {
   s.mainListCloseArmTimer = undefined;
   if (!s.mainListCloseArm) return;
   s.mainListCloseArm = undefined;
-  try { applyCloseConfirmFooter((s.uiCtx as any).ui, null); } catch { /* ignore */ }
 }
 
 function refreshMainListWidget(): void {
@@ -293,6 +281,7 @@ function refreshMainListWidget(): void {
   const nextSignature = rows.length ? mainListSignature(rows, {
     selectedId: s.mainListFocused ? s.mainListSelectedId : undefined,
     focused: s.mainListFocused === true,
+    closeHint: closeHintFor(rows.find((row) => row.navigatorId === s.mainListCloseArm?.id)),
   }) : undefined;
   const changed = nextSignature !== s.lastMainListSignature;
   s.lastMainListSignature = nextSignature;
@@ -416,6 +405,9 @@ function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, d
         selectedId: state().mainListFocused ? state().mainListSelectedId : undefined,
         focused: state().mainListFocused === true,
       });
+      const armedRow = rows.find((row) => row.navigatorId === state().mainListCloseArm?.id);
+      const hint = closeHintFor(armedRow);
+      if (hint) { layout.lines.push(deps.truncate(`   ${hint}`, renderWidth(width))); layout.owners.push(undefined); }
       lineWidth = renderWidth(width);
       // The leading gap line belongs to the widget too, so its slot stays ownerless.
       lineOwners = [undefined, ...layout.owners];
@@ -630,9 +622,10 @@ function statusIndicator(row: InternalRow, now = Date.now()): { glyph: string; c
   return { glyph: RUNNING_DOT_GLYPH, color: "accent" };
 }
 
-function mainListSignature(rows: InternalRow[], options: { selectedId?: string; focused?: boolean } = {}): string {
+function mainListSignature(rows: InternalRow[], options: { selectedId?: string; focused?: boolean; closeHint?: string | null } = {}): string {
   return JSON.stringify({
     focused: options.focused === true,
+    closeHint: options.closeHint ?? null,
     selectedId: options.focused === true ? options.selectedId ?? null : null,
     rows: rows.map((row) => ({
       navigatorId: row.navigatorId,
@@ -863,7 +856,6 @@ function handleMainListCloseKey(): void {
   }
   clearMainListCloseArm();
   s.mainListCloseArm = { id: row.navigatorId, armedAt: now };
-  try { applyCloseConfirmFooter((s.uiCtx as any).ui, closeHintFor(row)); } catch { /* ignore */ }
   s.mainListCloseArmTimer = setTimeout(() => {
     clearMainListCloseArm();
     refreshMainListWidget();
@@ -1034,7 +1026,6 @@ function createOverlayComponent(
     closeArmTimer = undefined;
     if (closeArm) {
       closeArm = undefined;
-      try { applyCloseConfirmFooter((state().uiCtx as any).ui, null); } catch { /* ignore */ }
     }
   }
 
@@ -1108,11 +1099,9 @@ function createOverlayComponent(
     }
     clearCloseArm();
     closeArm = { id: row.navigatorId, armedAt: now };
-    try { applyCloseConfirmFooter((state().uiCtx as any).ui, closeHintFor(row)); } catch { /* ignore */ }
     closeArmTimer = setTimeout(() => {
       closeArmTimer = undefined;
       closeArm = undefined;
-      try { applyCloseConfirmFooter((state().uiCtx as any).ui, null); } catch { /* ignore */ }
       requestRender();
     }, CLOSE_ARM_MS);
     closeArmTimer.unref?.();
@@ -1149,6 +1138,9 @@ function createOverlayComponent(
         selectedId: selectedRow()?.navigatorId,
         focused: true,
       });
+      const armedRow = overlayState.rows.find((row) => row.navigatorId === closeArm?.id);
+      const hint = closeHintFor(armedRow);
+      if (hint) { rail.lines.push(deps.truncate(`   ${hint}`, renderWidth(width))); rail.owners.push(undefined); }
       const railLines = rail.lines;
       const editorLines = renderEditorLines(width);
       const bottomLines = [...railLines, ...editorLines];

package/node_modules/pi-better-subagents/task-guard.ts

@@ -7,6 +7,8 @@ import { SANDBOX_POLICY_CHANNEL, SANDBOX_POLICY_REQUEST_CHANNEL } from "./permis
 import { failureDispositionTool, intentBashDefinition } from "./child-incidents.ts";
 import { DISPOSITION_TOOL } from "./incident-model.ts";
 import { SandboxDiagnostics, diagnosticPackageVersion } from "./shared-sandbox-diagnostics.ts";
+import { fileURLToPath } from "node:url";
+import { claimTaskToolOwner } from "./task-tool-owner.ts";
 
 const TRUSTED_INLINE_SOURCE = "<inline:task-sandbox>";
 
@@ -31,7 +33,7 @@ export function trustedToolRefusal(policy: TaskPolicy, name: string, sourcePath:
     return undefined;
 }
 
-export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (error: unknown) => never): void {
+export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (error: unknown) => never, ownedTools = false): void {
     const policy = parseTaskPolicy(input);
     const support = describeSandboxSupport();
     if (!support.supported) throw new Error(`Task sandbox unavailable: ${support.reason}`);
@@ -54,9 +56,10 @@ export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (erro
             diagnosticsWarned = true;
         },
     });
-    const boundary = installTaskTools(pi, { controller, cwd: process.cwd(), shellPath: () => shellPath,
+    const toolApi = ownedTools ? { ...pi, registerTool: claimTaskToolOwner(pi) } : pi;
+    const installBoundary = () => installTaskTools(toolApi, { controller, cwd: process.cwd(), shellPath: () => shellPath,
         diagnostics,
-        trustedSources: [TRUSTED_INLINE_SOURCE],
+        trustedSources: [ownedTools ? fileURLToPath(new URL("./task-tool-owner.ts", import.meta.url)) : TRUSTED_INLINE_SOURCE],
         // Structured command intent (#315): validated before the confined command runs.
         bashDefinition: (cwd, operations) => intentBashDefinition(cwd, operations) as any,
         applyPatch: policy.applyPatch,
@@ -66,6 +69,9 @@ export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (erro
         admitExtensionTool: (name, _input, sourcePath) => (name === DISPOSITION_TOOL && sourcePath === TRUSTED_INLINE_SOURCE) ||
             trustedToolRefusal(policy, name, sourcePath) === undefined,
     });
+    // Defer owned registrations until after SDK duplicate-name diagnostics.
+    // The final session_start handler still installs and verifies them before activation.
+    let boundary = ownedTools ? undefined : installBoundary();
     pi.registerTool(failureDispositionTool(() => currentCwd) as any);
     const profile = Object.freeze({ enabled: true, ...policy.permissions });
     const status = Object.freeze({
@@ -80,6 +86,7 @@ export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (erro
         try {
             shellPath = SettingsManager.create(ctx.cwd, policy.agentDir, { projectTrusted: false }).getShellPath();
             currentCwd = ctx.cwd;
+            boundary ??= installBoundary();
             boundary.register(ctx.cwd);
             const builtins: readonly string[] = policy.applyPatch ? [...TASK_BUILTINS, ...GUARDED_TASK_TOOLS] : TASK_BUILTINS;
             const known = new Set<string>(builtins);

package/node_modules/pi-better-subagents/task-runtime.mjs

@@ -29,9 +29,12 @@ try {
   const guard = await load.import(fileURLToPath(new URL("./task-guard.ts", import.meta.url)), { default: true });
   if (typeof guard !== "function") throw new Error("Task guard has no extension factory.");
   const { main } = await import(pathToFileURL(join(dirname(sdkEntry), "main.js")).href);
-  await main(args, {
+  // SDK tool names belong to the first extension registering them. Reserve a
+  // source before provider/trusted packages, but keep activation in the final guard.
+  const ownerPath = fileURLToPath(new URL("./task-tool-owner.ts", import.meta.url));
+  await main(["--extension", ownerPath, ...args], {
     extensionFactories: [{ name: "task-sandbox", factory: async (pi) => {
-      try { await guard(pi, policy, fail); } catch (error) { fail(error); }
+      try { await guard(pi, policy, fail, true); } catch (error) { fail(error); }
     } }],
   });
 } catch (error) {

package/node_modules/pi-better-subagents/task-tool-owner.ts

@@ -0,0 +1,21 @@
+/** Loaded before third-party extensions so guarded tools win SDK name resolution. */
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
+const CLAIM_CHANNEL = "pi-better-subagents:claim-task-tool-owner";
+type RegisterTool = ExtensionAPI["registerTool"];
+
+export default function taskToolOwner(pi: ExtensionAPI): void {
+    const unsubscribe = pi.events.on(CLAIM_CHANNEL, (claim) => {
+        if (typeof claim !== "function") return;
+        unsubscribe();
+        claim(pi.registerTool.bind(pi));
+    });
+}
+
+/** Hand registration to the final guard without changing the SDK's source attribution. */
+export function claimTaskToolOwner(pi: ExtensionAPI): RegisterTool {
+    let register: RegisterTool | undefined;
+    pi.events.emit(CLAIM_CHANNEL, (owner: RegisterTool) => { register = owner; });
+    if (!register) throw new Error("Task tool owner was not installed before extension loading.");
+    return register;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-harness",
-  "version": "0.35.0",
+  "version": "0.35.2",
   "description": "Pi extension bundle for a write sandbox, subagents, background tasks, SSH, goals, and Outcome & Todo.",
   "license": "MIT",
   "type": "module",
@@ -54,11 +54,11 @@
     "test": "node --import tsx --import ../../scripts/isolate-registry.mjs --test test/*.test.mjs test/task-context/*.test.ts"
   },
   "dependencies": {
-    "pi-better-background-tasks": "0.12.1",
-    "pi-better-goal": "0.10.3",
+    "pi-better-background-tasks": "0.12.2",
+    "pi-better-goal": "0.10.4",
     "pi-better-sandbox": "0.14.0",
-    "pi-better-ssh": "0.1.3",
-    "pi-better-subagents": "0.23.0",
+    "pi-better-ssh": "0.1.4",
+    "pi-better-subagents": "0.23.2",
     "proper-lockfile": "^4.1.2",
     "shell-quote": "1.12.0",
     "smol-toml": "1.9.0",