pi-better-harness 0.34.0 → 0.34.2

package/extensions/task-context/plan-presentation.ts

@@ -86,7 +86,7 @@ export function renderPlanPresentation(
     for (const line of wrapTextWithAnsi(content, Math.max(1, size - 2))) lines.push(`  ${line}`);
   }
 
-  const labelWidth = Math.min(12, Math.max(4, ...plan.rows.map((row) => visibleWidth(planText(row.label)))));
+  const labelWidth = Math.min(12, Math.max(1, ...plan.rows.map((row) => visibleWidth(planText(row.label)))));
   const statusWidth = Math.min(24, Math.max(0, ...plan.rows.map((row) =>
     visibleWidth(planText(row.statusLabel ?? statusStyle(row.status).label)))));
   const indices = full || expanded ? plan.rows.map((_, index) => index) : compactRowIndices(plan.rows);
@@ -102,7 +102,7 @@ export function renderPlanPresentation(
     const label = truncateToWidth(planText(row.label), labelWidth);
     const prefix = (index === selectedIndex ? theme.fg("accent", "› ") : "  ") +
       theme.fg(style.color, style.glyph) + " " + theme.fg("dim", label) +
-      " ".repeat(Math.max(0, labelWidth - visibleWidth(label)) + 2);
+      " ".repeat(Math.max(0, labelWidth - visibleWidth(label)) + 1);
     const titleColor = row.status === "blocked" ? "warning" : row.status === "failed" ? "error" :
       row.status === "in_progress" || row.status === "implemented" || row.status === "reviewed" ? "text" : "muted";
     const badge = planText(row.statusLabel ?? style.label);

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

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-background-tasks",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "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

@@ -348,20 +348,60 @@ type MainListWidget = Component & {
   handleMouse(event: WidgetMouseEvent): WidgetMouseResult | undefined;
 };
 
+const BACK_TO_MAIN = "← main (Esc)";
+const BACK_TARGET = "back-to-main";
+
+function highlightPointerTarget(theme: unknown, line: string, width: number): string {
+  const colors = theme as { bg?(color: string, value: string): string } | undefined;
+  return colors?.bg?.("selectedBg", line + " ".repeat(Math.max(0, width - visibleWidth(line))))
+    ?? themeFgFromTheme(theme)("accent", line);
+}
+
+function createPointerNavigation(targetAt: (event: WidgetMouseEvent) => string | undefined, activate: (target: string) => boolean) {
+  let hovered: string | undefined;
+  let pressed: { target: string; y: number } | undefined;
+  return {
+    get hovered() { return hovered; },
+    reset() { hovered = undefined; pressed = undefined; },
+    handleMouse(event: WidgetMouseEvent): WidgetMouseResult | undefined {
+      if (event.type === "move" || event.type === "leave") {
+        const target = event.type === "leave" ? undefined : targetAt(event);
+        const changed = hovered !== target;
+        hovered = target;
+        return changed || target ? { handled: true, render: changed } : undefined;
+      }
+      if (event.button !== "left" || event.shift || event.alt || event.ctrl) {
+        pressed = undefined;
+        return undefined;
+      }
+      if (event.type === "press") {
+        const target = targetAt(event);
+        pressed = target ? { target, y: event.y } : undefined;
+        return target ? { handled: true, render: false } : undefined;
+      }
+      if (event.type !== "click") return undefined;
+      const claim = pressed;
+      pressed = undefined;
+      if (!claim || claim.y !== event.y || targetAt(event) !== claim.target || !activate(claim.target)) return undefined;
+      return { handled: true, render: true };
+    },
+  };
+}
+
 function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, deps: HostDeps): MainListWidget {
   const requestRender = () => tui.requestRender?.();
   state().mainListRequestRender = requestRender;
   // navigatorId per rendered line, so a pointer row resolves by structure, never by row text.
   let lineOwners: Array<string | undefined> = [];
   let lineWidth = MAIN_LIST_FALLBACK_WIDTH;
-  // Pi synthesizes a click only for the component that handled the initial press.
-  let pressedRow: { navigatorId: string; y: number } | undefined;
   const rowAt = (event: WidgetMouseEvent): string | undefined => {
     const width = Number.isFinite(event.width) && event.width > 0 ? Math.floor(event.width) : lineWidth;
     if (!Number.isFinite(event.x) || event.x < 0 || event.x >= width) return undefined;
     if (!Number.isInteger(event.y) || event.y < 0 || event.y >= lineOwners.length) return undefined;
-    return lineOwners[event.y];
+    const id = lineOwners[event.y];
+    return id && listRows().some((row) => row.navigatorId === id) ? id : undefined;
   };
+  const pointer = createPointerNavigation(rowAt, openNavigatorRow);
   return {
     render(width: number): string[] {
       const rows = listRows();
@@ -369,7 +409,7 @@ function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, d
       if (!rows.length) {
         state().lastMainListLines = undefined;
         lineOwners = [];
-        pressedRow = undefined;
+        pointer.reset();
         return [];
       }
       const layout = buildMainListLayout(rows, renderWidth(width), deps.truncate, themeFgFromTheme(theme), {
@@ -379,41 +419,24 @@ function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, d
       lineWidth = renderWidth(width);
       // The leading gap line belongs to the widget too, so its slot stays ownerless.
       lineOwners = [undefined, ...layout.owners];
-      const lines = ["", ...layout.lines];
+      const lines = ["", ...layout.lines].map((line, index) =>
+        pointer.hovered && lineOwners[index] === pointer.hovered ? highlightPointerTarget(theme, line, lineWidth) : line);
       state().lastMainListLines = lines;
       return lines;
     },
     handleMouse(event: WidgetMouseEvent): WidgetMouseResult | undefined {
-      // Only an unmodified left press is ours; every other gesture reaches the host untouched.
-      if (event.button !== "left" || event.shift === true || event.alt === true || event.ctrl === true) {
-        pressedRow = undefined;
-        return undefined;
-      }
-      if (event.type === "press") {
-        pressedRow = undefined;
-        const navigatorId = rowAt(event);
-        if (!navigatorId || !listRows().some((row) => row.navigatorId === navigatorId)) return undefined;
-        pressedRow = { navigatorId, y: event.y };
-        return { handled: true, render: false };
-      }
-      if (event.type !== "click") return undefined;
-      const pressed = pressedRow;
-      pressedRow = undefined;
-      // A click after another component's press, or after the layout moved, is not the row we claimed.
-      if (!pressed || pressed.y !== event.y || rowAt(event) !== pressed.navigatorId) return undefined;
-      if (!openNavigatorRow(pressed.navigatorId)) return undefined;
-      return { handled: true, render: true };
+      return pointer.handleMouse(event);
     },
     invalidate() {
       state().lastMainListLines = undefined;
       lineOwners = [];
-      pressedRow = undefined;
+      pointer.reset();
     },
     dispose() {
       const s = state();
       if (s.mainListRequestRender === requestRender) s.mainListRequestRender = undefined;
       lineOwners = [];
-      pressedRow = undefined;
+      pointer.reset();
     },
   };
 }
@@ -958,6 +981,22 @@ function createOverlayComponent(
   let closed = false;
   let transcriptDetail: BackgroundWorkDetail | null = null;
   let transcriptComponent: Component | null = null;
+  let pointerTargets: Array<string | undefined> = [];
+  let pointerWidth = 0;
+  const pointer = createPointerNavigation((event) => {
+    if (closed || !Number.isInteger(event.y) || !Number.isFinite(event.x) || event.x < 0 || event.x >= pointerWidth) return undefined;
+    const target = pointerTargets[event.y];
+    if (target === BACK_TARGET) return event.x >= 3 && event.x < 3 + visibleWidth(BACK_TO_MAIN) ? target : undefined;
+    return target && listRows().some((row) => row.navigatorId === target) ? target : undefined;
+  }, (target) => {
+    if (target === BACK_TARGET) { backToMain(); return true; }
+    refreshRows();
+    const index = overlayState.rows.findIndex((row) => row.navigatorId === target);
+    if (index < 0) return false;
+    selectOverlayRow(index);
+    openDetail();
+    return true;
+  });
 
   const fg = (color: string, value: string) => theme?.fg ? theme.fg(color, value) : value;
 
@@ -1036,6 +1075,11 @@ function createOverlayComponent(
     try { done(null); } catch { /* ignore */ }
   }
 
+  function backToMain(): void {
+    unfocusMainList();
+    close();
+  }
+
   function handleCloseKey(): void {
     const row = selectedRow();
     if (!row || row.parentRow) return;
@@ -1101,14 +1145,17 @@ function createOverlayComponent(
     render(width: number) {
       closeIfEditorReplaced();
       refreshRows();
-      const railLines = buildMainListLines(overlayState.rows, width, deps.truncate, fg, {
+      const rail = buildMainListLayout(overlayState.rows, width, deps.truncate, fg, {
         selectedId: selectedRow()?.navigatorId,
         focused: true,
       });
+      const railLines = rail.lines;
       const editorLines = renderEditorLines(width);
       const bottomLines = [...railLines, ...editorLines];
       const overlayRows = state().detailOverlayRows;
       const detailRows = overlayRows === undefined ? undefined : Math.max(1, overlayRows - bottomLines.length);
+      const backControl = pointer.hovered === BACK_TARGET
+        ? highlightPointerTarget(theme, BACK_TO_MAIN, visibleWidth(BACK_TO_MAIN)) : undefined;
       let contentLines: string[];
       if (detail?.transcript && deps.createTranscriptComponent) {
         if (transcriptDetail !== detail || !transcriptComponent) {
@@ -1121,18 +1168,30 @@ function createOverlayComponent(
           width,
           deps.truncate,
           fg,
-          { minRows: detailRows, maxRows: detailRows, bottomFooter: false, logTailRows },
+          { minRows: detailRows, maxRows: detailRows, bottomFooter: false, logTailRows, backControl },
         );
       } else {
         transcriptDetail = null;
         transcriptComponent = null;
-        contentLines = buildDetailLines(detail, width, deps.truncate, fg, { expandedSections, logTailRows, minRows: detailRows, maxRows: detailRows, bottomFooter: false });
+        contentLines = buildDetailLines(detail, width, deps.truncate, fg, { expandedSections, logTailRows, minRows: detailRows, maxRows: detailRows, bottomFooter: false, backControl });
       }
-      if (overlayRows === undefined || detailRows === undefined) return [...contentLines, ...bottomLines];
-      const fittedContent = contentLines.slice(0, detailRows);
-      while (fittedContent.length < detailRows) fittedContent.push("");
-      // A terminal shorter than rail + editor keeps the bottom rows (the input frame) and drops the top.
-      return [...fittedContent, ...bottomLines].slice(-Math.max(1, overlayRows));
+      const fittedContent = detailRows === undefined ? contentLines : contentLines.slice(0, detailRows);
+      if (detailRows !== undefined) while (fittedContent.length < detailRows) fittedContent.push("");
+      const contentTargets = fittedContent.map((_, index) => index === 1 ? BACK_TARGET : undefined);
+      const allLines = [...fittedContent, ...bottomLines];
+      const allTargets = [...contentTargets, ...rail.owners, ...editorLines.map(() => undefined)];
+      // Match hit targets to the same viewport clipping as the visible lines.
+      const start = overlayRows === undefined ? 0 : Math.max(0, allLines.length - Math.max(1, overlayRows));
+      pointerTargets = allTargets.slice(start);
+      pointerWidth = renderWidth(width);
+      return allLines.slice(start).map((line, index) => {
+        if (!pointer.hovered || pointerTargets[index] !== pointer.hovered) return line;
+        if (pointer.hovered === BACK_TARGET) return line;
+        return highlightPointerTarget(theme, line, width);
+      });
+    },
+    handleMouse(event: WidgetMouseEvent): WidgetMouseResult | undefined {
+      return pointer.handleMouse(event);
     },
     handleInput(data: string) {
       if (closed) return;
@@ -1151,7 +1210,7 @@ function createOverlayComponent(
       else if (deps.matchKey(data, "left")) {
         const mainIdx = overlayState.rows.findIndex((row) => row.parentRow && row.id === "main");
         if (mainIdx >= 0) selectOverlayRow(mainIdx);
-        close();
+        backToMain();
       }
       else if (deps.matchKey(data, "enter")) {
         const row = selectedRow();
@@ -1179,8 +1238,7 @@ function createOverlayComponent(
         requestRender();
       }
       else if (deps.matchKey(data, "escape")) {
-        unfocusMainList();
-        close();
+        backToMain();
       }
     },
     /** Show another row's detail in this overlay (the main list moved while it was unfocused). */
@@ -1195,8 +1253,10 @@ function createOverlayComponent(
     },
     /** Close the overlay (done), e.g. when the navigator is disposed. */
     dismiss() { close(); },
-    invalidate() { transcriptComponent?.invalidate(); },
+    invalidate() { pointer.reset(); pointerTargets = []; transcriptComponent?.invalidate(); },
     dispose() {
+      pointer.reset();
+      pointerTargets = [];
       clearCloseArm();
       detailScheduler.dispose();
     },
@@ -1233,14 +1293,14 @@ function buildTranscriptDetailLines(
   width: number,
   truncate: (s: string, width: number) => string,
   fg: (color: string, value: string) => string,
-  options: { minRows?: number; maxRows?: number; bottomFooter?: boolean; logTailRows?: number } = {},
+  options: { minRows?: number; maxRows?: number; bottomFooter?: boolean; logTailRows?: number; backControl?: string } = {},
 ): string[] {
-  const actions = [...(detail.footerActions ?? ["x close"]), "Esc close"].join(" · ");
+  const actions = [...(detail.footerActions ?? ["x close"])].join(" · ");
   const tailRows = options.logTailRows ?? DEFAULT_LOG_TAIL_ROWS;
   let shownTranscriptLines = transcriptLines.length ? transcriptLines.slice(-tailRows) : ["   (no transcript yet)"];
   const lines: string[] = [
     fg("accent", rule(detail.title, width)),
-    dim(`   ← main · ${actions}`, fg),
+    `   ${options.backControl ?? fg("accent", BACK_TO_MAIN)}${dim(` · ${actions}`, fg)}`,
     "",
     `   status   ${fg(toneColor(detail.statusTone, detail.status), detail.status)}`,
   ];
@@ -1264,7 +1324,7 @@ function buildTranscriptDetailLines(
   lines.push(...shownTranscriptLines);
   lines.push("");
   if (options.bottomFooter === false) return lines.map((line) => safeTruncate(line, width, truncate));
-  const footerLines = [dim(`   ← main · ${actions}`, fg), dim(rule("", width), fg)];
+  const footerLines = [dim(`   ${BACK_TO_MAIN} · ${actions}`, fg), dim(rule("", width), fg)];
   padBeforeFooter(lines, footerLines.length, options.minRows);
   lines.push(...footerLines);
   return lines.map((line) => safeTruncate(line, width, truncate));
@@ -1320,10 +1380,10 @@ function buildDetailLines(
   width: number,
   truncate: (s: string, width: number) => string,
   fg: (color: string, value: string) => string,
-  options: { expandedSections?: Set<string>; logTailRows?: number; minRows?: number; maxRows?: number; bottomFooter?: boolean } = {},
+  options: { expandedSections?: Set<string>; logTailRows?: number; minRows?: number; maxRows?: number; bottomFooter?: boolean; backControl?: string } = {},
 ): string[] {
   if (!detail) {
-    const lines = [rule("Work unavailable", width), dim("   ← back · Esc close", fg), ""];
+    const lines = [rule("Work unavailable", width), `   ${options.backControl ?? fg("accent", BACK_TO_MAIN)}`, ""];
     if (options.bottomFooter === false) return lines.map((line) => safeTruncate(line, width, truncate));
     const footerLines = [dim(rule("", width), fg)];
     padBeforeFooter(lines, footerLines.length, options.minRows);
@@ -1336,8 +1396,8 @@ function buildDetailLines(
   const foldedAction = toggleableSectionId
     ? (options.expandedSections?.has(toggleableSectionId) ? "Enter collapse" : "Enter expand")
     : null;
-  const actions = [foldedAction, ...(detail.footerActions?.length ? detail.footerActions : ["x close"]), "l 10/25", "Esc close"].filter(Boolean).join(" · ");
-  lines.push(dim(`   ← back · ${actions}`, fg));
+  const actions = [foldedAction, ...(detail.footerActions?.length ? detail.footerActions : ["x close"]), "l 10/25"].filter(Boolean).join(" · ");
+  lines.push(`   ${options.backControl ?? fg("accent", BACK_TO_MAIN)}${dim(` · ${actions}`, fg)}`);
   lines.push("");
   lines.push(`   status   ${fg(toneColor(detail.statusTone, detail.status), detail.status)}`);
   if (detail.subtitle) lines.push(`   summary  ${detail.subtitle}`);
@@ -1393,7 +1453,7 @@ function buildDetailLines(
   }
   lines.push("");
   if (options.bottomFooter === false) return lines.map((line) => safeTruncate(line, width, truncate));
-  const footerLines = [dim(`   ← back · ${actions}`, fg), dim(rule("", width), fg)];
+  const footerLines = [dim(`   ${BACK_TO_MAIN} · ${actions}`, fg), dim(rule("", width), fg)];
   padBeforeFooter(lines, footerLines.length, options.minRows);
   lines.push(...footerLines);
   return lines.map((line) => safeTruncate(line, width, truncate));

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

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

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

@@ -890,7 +890,7 @@ export default function (pi: ExtensionAPI): void {
             const fg = typeof theme?.fg === "function"
               ? (color: string, value: string) => theme.fg(color as never, value)
               : undefined;
-            return [renderGoalClockLine(goal, width, undefined, fg), ""];
+            return [renderGoalClockLine(goal, width, undefined, fg)];
           },
         };
       },

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

@@ -19,6 +19,29 @@ Use `pi-better-subagents` when you want Pi to launch independent agent work with
 - Live background-work navigator for active runs.
 - Harness-owned run timing: every run gets a no-progress wake (10 min), while wall-clock soft deadlines and hard ceilings are opt-in so productive agents are not stopped solely for taking a long time. Configure per spawn with `deadline_minutes`, `grace_minutes`, `max_minutes`, `stuck_minutes`, or globally in `config.json` / `PI_SUBAGENT_*_MINUTES`. See [usage notes](docs/usage.md#run-timing-deadline-ceiling-stuck).
 
+Every single or batch launch automatically joins one shared supervision watcher in the
+foreground Pi process. The last active run's exit or stop tears it down; a later
+launch starts it again. No separate background task or coordinator heartbeat is
+needed. Completion delivery retries use the callback batcher's own timer. Lost-run
+alerts retain supervision until their handoff is handled, so lost work is not silent.
+
+## Worker Ownership
+
+Every child launch, including clean, batch and unsandboxed launches, loads a Pi
+hook that keeps external CI/PR monitoring with its coordinator. Workers finish
+their assigned implementation or diagnosis, run focused checks, push only when
+authorized, write the result, and return. Pending CI is a valid handoff, not a pass.
+
+The hook refuses recognized `gh run watch`, `gh pr checks --watch`, and bundled
+delivery-watcher commands through `bash` and `run_application`. Short status reads,
+failed-log retrieval, and legitimate long local tests and builds remain allowed.
+If background tools are explicitly available to a child, recognized watcher
+commands are refused there too. Coordinator sessions are unaffected.
+
+This is an operational ownership guard, not a security boundary or a classifier
+for arbitrary programs. Indirect scripts and custom polling implementations still
+rely on the worker handoff contract. Command permissions and timeouts are unchanged.
+
 ## Install
 
 ```sh

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

@@ -1,5 +1,5 @@
-import { Input, SelectList, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import type { OperationField, OperationList, OperationView } from "./agent-inspection.ts";
+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 type { AgentSessionOverrides, AgentSettingKey } from "./agent-session-settings.ts";
 
@@ -19,9 +19,6 @@ function stateLabel(entry: OperationView): string {
     return "unresolved";
 }
 
-function fieldLine(label: string, field: OperationField): string {
-    return `${label.padEnd(8)} ${field.value ?? "(unset)"}  ${field.source === "role-default" ? "inherited" : field.source === "agent-override" ? "override" : "absent"}`;
-}
 
 function modelLabel(entry: OperationView): string {
     return entry.actualModel ?? entry.requestedModel ?? entry.fields?.model.value ?? "not resolved";
@@ -49,6 +46,7 @@ export function catalogColumns(entry: OperationView | null, width: number): stri
 }
 
 function wrapLine(text: string, width: number): string[] {
+    if (text.includes("\x1b")) return wrapTextWithAnsi(text, width);
     const rows: string[] = [];
     let row = "";
     for (const { segment } of new Intl.Segmenter(undefined, { granularity: "grapheme" }).segment(text)) {
@@ -62,31 +60,67 @@ function wrapLine(text: string, width: number): string[] {
     return rows;
 }
 
-export function catalogDetailLines(entry: OperationView, editable = false): string[] {
+function settingLines(label: string, value: string, origin: string, width: number, marker = "  ", theme?: Theme): string[] {
+    const title = (text: string) => theme?.fg(marker === "> " ? "accent" : "muted", text) ?? text;
+    const source = (text: string) => theme?.fg("dim", text) ?? text;
+    if (width < 54) return [title(`${marker}${label}`), ...wrapLine(`${value}  ${source(origin)}`, Math.max(1, width - 4)).map((row) => `    ${row}`)];
+    const valueWidth = Math.max(1, width - 34);
+    return wrapLine(value, valueWidth).map((row, index) =>
+        `${index === 0 ? title(marker + label.padEnd(10)) : " ".repeat(12)}${cell(row, valueWidth)}  ${index === 0 ? source(origin) : ""}`.trimEnd());
+}
+
+export function catalogDetailLines(entry: OperationView, editable = false, width = 80, controls: string[] = [], theme?: Theme): string[] {
+    const label = (text: string) => theme?.fg("muted", text) ?? text;
+    const heading = (text: string) => label(theme?.bold?.(text) ?? text);
+    const contentWidth = Math.max(1, width - 4);
+    const columnWidth = width >= 90 ? Math.floor((contentWidth - 4) / 2) : contentWidth;
+    const fact = (title: string, value: string) => wrapLine(value, Math.max(1, columnWidth - 13))
+        .map((text, index) => `${index === 0 ? label(title.padEnd(13)) : " ".repeat(13)}${text}`);
+    const identity = [
+        ...fact("ID", entry.id),
+        ...fact("Kind", entry.identity.kind ?? "unknown"),
+        ...(entry.role ? fact("Base role", `${entry.role.id ?? "(missing)"}${entry.role.found ? "" : " (missing)"}`) : []),
+    ];
+    const state = [
+        ...fact("Status", stateLabel(entry)),
+        ...fact("Scope", entry.identity.scope ?? "unknown"),
+        ...(entry.instructionMode ? fact("Instructions", entry.instructionMode) : []),
+    ];
+    const overview = width >= 90
+        ? Array.from({ length: Math.max(identity.length, state.length) }, (_, i) =>
+            `${cell(identity[i] ?? "", columnWidth)}    ${state[i] ?? ""}`.trimEnd())
+        : [...identity, ...state];
     const lines = [
-        `${entry.identity.name || entry.id}  ·  ${entry.identity.kind ?? "unknown"}`,
-        entry.id,
+        theme?.fg("accent", `${entry.identity.name || entry.id}  ·  ${entry.identity.kind ?? "unknown"}`) ?? `${entry.identity.name || entry.id}  ·  ${entry.identity.kind ?? "unknown"}`,
+        ...(entry.identity.description ? wrapLine(entry.identity.description, contentWidth) : []),
         "",
-        `Status    ${stateLabel(entry)}  ·  ${entry.launchabilityReason}`,
-        `Source    ${entry.identity.scope ?? "unknown"}  ·  ${entry.identity.path ?? "(none)"}`,
-        ...(entry.identity.description ? [`About     ${entry.identity.description}`] : []),
-        ...(entry.role ? [`Base role ${entry.role.id ?? "(missing)"}${entry.role.found ? "" : "  ·  missing"}`] : []),
-        ...(entry.instructionMode ? [`Instructions ${entry.instructionMode}`] : []),
+        ...overview,
         "",
-        "Configuration",
+        heading("Configuration"),
+        ...(contentWidth >= 54 ? [label(settingLines("SETTING", "VALUE", "ORIGIN", contentWidth)[0])] : []),
+        ...controls,
         ...(entry.fields ? [
-            ...(!editable ? [fieldLine("Model", entry.fields.model), fieldLine("Effort", entry.fields.effort)] : []),
-            fieldLine("Tier", entry.fields.tier),
+            ...(!editable ? ["model", "effort"].flatMap((key) => {
+                const field = entry.fields![key as "model" | "effort"];
+                return settingLines(key === "model" ? "Model" : "Effort", field.value ?? "(unset)", field.inherited || field.source === "role-default" ? "inherited" : field.source === "agent-override" ? "override" : "absent", contentWidth, "  ", theme);
+            }) : []),
+            ...settingLines("Tier", entry.fields.tier.value ?? "(unset)", entry.fields.tier.source === "role-default" ? "inherited" : entry.fields.tier.source === "agent-override" ? "override" : "absent", contentWidth, "  ", theme),
         ] : []),
-        `Actual   ${entry.actualModel ?? "not resolved"}${entry.actualEffort ? `  ·  ${entry.actualEffort}` : ""}`,
-        ...(entry.validation.length ? ["", "Diagnostics", ...entry.validation.map((item) => `${item.blocking ? "!" : "·"} ${item.message}`)] : []),
-        ...(entry.shadowed.length ? ["", "Shadowed sources", ...entry.shadowed.map((source) => `${source.scope}  ${source.path}`)] : []),
-        ...(entry.restrictions.length ? ["", "Execution restrictions", ...entry.restrictions.map((item) => `${item.honored ? "honored" : "not honored"}  ${item.name}`)] : []),
+        `${label("Actual")}   ${entry.actualModel ?? "not resolved"}${entry.actualEffort ? `  ·  ${entry.actualEffort}` : ""}`,
+        "",
+        heading("Effective prompt"),
+        ...(entry.instructions?.trim() ? entry.instructions.split(/\r\n|\r|\n/) : ["(No resolved instructions)"]),
         "",
-        "Effective prompt",
-        "Press p to read the complete resolved instructions.",
+        heading("Launch resolution"),
+        entry.launchabilityReason,
+        "",
+        heading("Definition source"),
+        entry.identity.path ?? "(none)",
+        ...(entry.validation.length ? ["", heading("Diagnostics"), ...entry.validation.map((item) => `${item.blocking ? "!" : "·"} ${item.message}`)] : []),
+        ...(entry.shadowed.length ? ["", heading("Shadowed sources"), ...entry.shadowed.map((source) => `${source.scope}  ${source.path}`)] : []),
+        ...(entry.restrictions.length ? ["", heading("Execution restrictions"), ...entry.restrictions.map((item) => `${item.honored ? "honored" : "not honored"}  ${item.name}`)] : []),
     ];
-    return lines;
+    return lines.flatMap((text) => text ? wrapLine(text, contentWidth).map((row) => `  ${row}`) : [""]);
 }
 
 export function createCatalogComponent(
@@ -103,6 +137,8 @@ export function createCatalogComponent(
     let query = "";
     let scroll = 0;
     let settingRow = 0;
+    let settingPositions: number[] = [];
+    let revealSetting = false;
     let picker: SelectList | undefined;
     let filterPicker: ((filter: string) => void) | undefined;
     let pickerKey: AgentSettingKey | undefined;
@@ -159,11 +195,11 @@ export function createCatalogComponent(
         [entry.id, entry.identity.name, entry.identity.description, entry.role?.id]
             .some((value) => value?.toLowerCase().includes(query.toLowerCase())));
     const selected = () => filtered().find((entry) => entry.id === selectedId);
-    const detailRows = (entry: OperationView, width: number) => (mode === "prompt"
+    const detailRows = (entry: OperationView, width: number, controls: string[] = []) => (mode === "prompt"
         ? [`${entry.identity.name || entry.id}  ·  effective instructions`, "", ...(entry.instructions?.split("\n") ?? ["(none)"])]
-        : catalogDetailLines(entry, !!editor))
+        : catalogDetailLines(entry, !!editor, width, controls, theme))
         .flatMap((text) => text ? wrapLine(text, Math.max(1, width - 2)) : [""]);
-    let lastDetailWidth = 80;
+
 
     return {
         get focused() { return focused; },
@@ -174,21 +210,20 @@ export function createCatalogComponent(
             const footerRows = (editor && mode !== "prompt" ? 2 : 0) + (message ? 2 : 0);
             const diagnosticRows = Math.min(catalog.diagnostics.length, 3);
             const listSize = Math.max(1, height - 5 - footerRows - diagnosticRows - 1);
-            const controlRows = editor && mode === "detail" ? (safeWidth < 42 ? 5 : 3) : 0;
-            const detailSize = Math.max(1, height - 5 - footerRows - controlRows);
+            const detailSize = Math.max(1, height - 5 - footerRows);
             const fit = (lines: string[]) => {
                 const result = lines.slice(0, height).map(line);
                 while (result.length < height) result.push("");
                 return result;
             };
-            lastDetailWidth = safeWidth;
+
             const line = (text: string) => truncateToWidth(text, safeWidth);
             const rows = filtered();
             const current = selected();
-            const detailLines = current ? detailRows(current, safeWidth) : [];
+
             const selectedIndex = rows.findIndex((entry) => entry.id === selectedId);
             const start = Math.max(0, Math.min(selectedIndex - Math.floor(listSize / 2), rows.length - listSize));
-            scroll = Math.max(0, Math.min(scroll, detailLines.length - detailSize));
+
             if (picker) return fit([
                 theme.fg("accent", `Agents / ${pickerKey}`), "",
                 ...(pickerKey === "model" ? search.render(safeWidth) : []),
@@ -203,23 +238,29 @@ export function createCatalogComponent(
                     const ownSession = Object.hasOwn(own ?? {}, key);
                     const roleSession = field?.inherited && Object.hasOwn(editor?.settings()[current.role?.id ?? ""] ?? {}, key);
                     const origin = ownSession && own?.[key] === null ? "inherit / session" : ownSession ? "session" : roleSession ? "inherited / session" : field?.inherited ? "inherited" : "catalog";
-                    const value = `${field?.value ?? "(unset)"}  ${origin}`;
-                    const text = `${settingRow === index ? "> " : "  "}${label.padEnd(18)} ${value}`;
-                    if (safeWidth < 42) {
-                        const title = `${settingRow === index ? "> " : "  "}${label}`;
-                        return [settingRow === index ? highlight(title, safeWidth) : title, `  ${truncateToWidth(value, Math.max(1, safeWidth - 2))}`];
-                    }
-                    return [settingRow === index ? highlight(text, safeWidth) : text];
+                    return settingLines(label, field?.value ?? "(unset)", origin, Math.max(1, safeWidth - 4), settingRow === index ? "> " : "  ", theme);
                 }),
-                "",
             ] : [];
+            const detailLines = current ? detailRows(current, safeWidth, controls) : [];
+            if (editor && mode === "detail") {
+                settingPositions = ["Model", "Effort"].map((label) => detailLines.findIndex((text) =>
+                    new RegExp(`^  [> ] ${label}(?:\\s|$)`).test(text.replace(/\x1b\[[0-9;]*m/g, ""))));
+                if (revealSetting && settingPositions[settingRow] >= 0) {
+                    const position = settingPositions[settingRow];
+                    if (position < scroll) scroll = position;
+                    else if (position >= scroll + detailSize) scroll = position - detailSize + 1;
+                }
+                revealSetting = false;
+            }
+            scroll = Math.max(0, Math.min(scroll, detailLines.length - detailSize));
             const lines = mode !== "list" && current ? [
                 theme.fg("accent", mode === "prompt" ? "Agents / prompt" : editor ? `Agents / ${current.identity.name || current.id}` : "Agents / inspect"),
                 theme.fg("dim", mode === "prompt" ? "← details  ·  ↑↓ scroll  ·  Esc back" : `${editor ? "Enter change  ·  " : ""}p prompt  ·  ← list  ·  ↑↓ ${editor ? "select / scroll" : "scroll"}  ·  Esc back`),
                 "",
-                ...controls,
+
                 ...detailLines.slice(scroll, scroll + detailSize).map((text, i) =>
-                    i === 0 && scroll === 0 ? theme.fg("accent", text) : text),
+                    i === 0 && scroll === 0 ? theme.fg("accent", text)
+                        : text),
                 "",
                 theme.fg("dim", `Showing ${scroll + 1}-${Math.min(scroll + detailSize, detailLines.length)} of ${detailLines.length} lines`),
             ] : [
@@ -261,8 +302,12 @@ export function createCatalogComponent(
                 else { close(); return; }
             } else if (matchesKey(data, "up") || matchesKey(data, "down")) {
                 const delta = matchesKey(data, "down") ? 1 : -1;
-                if (mode === "detail" && editor && scroll === 0 && (delta < 0 || settingRow === 0)) settingRow = Math.max(0, Math.min(1, settingRow + delta));
-                else if (mode !== "list" && selected()) scroll = Math.max(0, Math.min(detailRows(selected()!, lastDetailWidth).length - 1, scroll + delta));
+                if (mode === "detail" && editor && scroll <= (settingPositions[1] ?? 0)
+                    && ((delta > 0 && settingRow === 0) || (delta < 0 && settingRow === 1))) {
+                    settingRow += delta;
+                    revealSetting = true;
+                }
+                else if (mode !== "list" && selected()) scroll = Math.max(0, scroll + delta);
                 else if (rows.length) selectedId = rows[Math.max(0, Math.min(rows.length - 1, rows.findIndex((entry) => entry.id === selectedId) + delta))]?.id;
             } else if (matchesKey(data, "enter") && mode === "list" && selected()) {
                 mode = "detail";
@@ -274,6 +319,7 @@ export function createCatalogComponent(
             } else if (editor && (data === "e" || data === "E") && mode === "detail" && selected()) {
                 settingRow = 0;
                 scroll = 0;
+                revealSetting = true;
             } else if (editor && mode === "detail" && (matchesKey(data, "enter") || data === " ")) {
                 try { edit(); } catch (cause) { report(cause instanceof Error ? cause.message : String(cause), true); }
             } else if (mode === "list" && matchesKey(data, "backspace")) {

package/node_modules/pi-better-subagents/child-ownership.ts

@@ -0,0 +1,130 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { parse } from "shell-quote";
+import { STEER_FILE_ENV } from "./child-steer.ts";
+
+export const WORKER_HANDOFF = "Worker ownership: complete your assigned implementation or diagnosis, run focused checks, push only when authorized, write the requested result, then return. Pending CI is a handoff, not a failed implementation or a CI pass. The coordinator owns CI/PR monitoring, review scheduling, readiness, enqueueing and merge. Do not start external delivery watchers or background monitoring. Short status reads and failed-log retrieval for diagnosis are allowed. Legitimate local tests and builds may run to completion within their command limits.";
+const REFUSAL = "Worker ownership: CI/PR monitoring belongs to the coordinator. Return the PR/run ID, pushed HEAD and current evidence with CI pending; do not retry the watcher through another tool or script. Local tests/builds and short diagnostic status/log reads remain allowed.";
+const WATCH_SCRIPTS = new Set(["watch-pr-delivery.mjs", "watch-delivery.mjs", "watch-candidate-delivery.mjs"]);
+const nameOf = (value: string) => value.replaceAll("\\", "/").split("/").at(-1)!.replace(/\.exe$/i, "");
+
+// Preserve command boundaries without treating multiline strings or heredoc data as commands.
+function commandLines(command: string): string[] {
+    const lines: string[] = [];
+    const documents: { delimiter: string; tabs: boolean }[] = [];
+    let quote = "", escaped = false, out = "";
+    for (const line of command.split("\n")) {
+        if (documents.length) {
+            const document = documents[0]!;
+            if ((document.tabs ? line.replace(/^\t+/, "") : line) === document.delimiter) documents.shift();
+            continue;
+        }
+        let comment = false;
+        for (const char of `${line}\n`) {
+            if (!quote && !escaped && char === "#" && (!out || /[\s;&|()<>]$/.test(out))) comment = true;
+            if (comment && char !== "\n") continue;
+            if (escaped) { out += char === "\n" ? "" : `\\${char}`; escaped = false; continue; }
+            if (char === "\\" && quote !== "'") { escaped = true; continue; }
+            if (char === quote) quote = "";
+            else if (!quote && (char === "'" || char === '"')) quote = char;
+            if (char !== "\n" || quote) { out += char; continue; }
+            lines.push(out);
+            try {
+                const tokens = parse(out);
+                for (let i = 0; i < tokens.length; i++) {
+                    const token = tokens[i], delimiter = tokens[i + 1];
+                    if (typeof token === "object" && "op" in token && ["<<", "<<-"].includes(token.op) && typeof delimiter === "string") {
+                        documents.push({ delimiter, tabs: token.op === "<<-" });
+                    }
+                }
+            } catch { /* The command tool, not this operational guard, validates shell syntax. */ }
+            out = "";
+        }
+    }
+    if (out) lines.push(out);
+    return lines;
+}
+
+function shellWatcher(command: string, depth: number): boolean {
+    if (depth > 3) return false;
+    let tokens;
+    try { tokens = commandLines(command).flatMap((line) => [...parse(line), { op: ";" as const }]); } catch { return false; }
+    let words: string[] = [];
+    let redirect = false;
+    for (const token of tokens) {
+        if (typeof token === "string" || ("op" in token && token.op === "glob")) {
+            if (redirect) { redirect = false; continue; }
+            words.push(typeof token === "string" ? token : token.pattern);
+        } else if ("op" in token && ["<", ">", ">>", ">&", "<&", ">|", "<>", "&>", "&>>", "<<", "<<-", "<<<"].includes(token.op)) {
+            if (words.length === 1 && /^\d+$/.test(words[0]!)) words = [];
+            redirect = true;
+        } else {
+            if (argvWatcher(words, depth + 1)) return true;
+            words = [];
+            redirect = false;
+        }
+    }
+    return argvWatcher(words, depth + 1);
+}
+
+function argvWatcher(input: readonly string[], depth = 0): boolean {
+    if (depth > 4) return false;
+    let words = [...input];
+    while (/^[A-Za-z_][A-Za-z_0-9]*=/.test(words[0] ?? "")) words.shift();
+    if (nameOf(words[0] ?? "") === "env") {
+        words.shift();
+        while (words.length) {
+            if (["-u", "--unset", "-C", "--chdir"].includes(words[0]!)) words.splice(0, 2);
+            else if (words[0] === "--" || words[0]!.startsWith("-") || /^[A-Za-z_][A-Za-z_0-9]*=/.test(words[0]!)) words.shift();
+            else break;
+        }
+    }
+    const program = nameOf(words.shift() ?? "");
+    if (["bash", "sh", "zsh", "dash"].includes(program)) {
+        const at = words.findIndex((word) => /^-[^-]*c/.test(word));
+        return at >= 0 && typeof words[at + 1] === "string" && shellWatcher(words[at + 1]!, depth + 1);
+    }
+    if (words.includes("--help") || words.includes("-h")) return false;
+    if (program === "gh") {
+        while (words.length) {
+            if (["--repo", "-R", "--hostname"].includes(words[0]!)) words.splice(0, 2);
+            else if (/^(?:--repo=.+|--hostname=.+|-R.+)$/.test(words[0]!)) words.shift();
+            else break;
+        }
+        return (words[0] === "run" && words[1] === "watch") ||
+            (words[0] === "pr" && words[1] === "checks" && words.slice(2).some((word) => ["--watch", "--watch=true"].includes(word)));
+    }
+    if (WATCH_SCRIPTS.has(program)) return true;
+    if (program === "node" || program === "nodejs") {
+        while (words[0]?.startsWith("-")) {
+            if (["-e", "--eval", "-p", "--print"].includes(words[0])) return false;
+            const takesValue = ["--import", "--loader", "--require", "-r"].includes(words[0]);
+            words.splice(0, takesValue ? 2 : 1);
+        }
+        return WATCH_SCRIPTS.has(nameOf(words[0] ?? ""));
+    }
+    return false;
+}
+
+/** Recognizes supported watcher entrypoints, not arbitrary program semantics or a security boundary. */
+export function workerMonitoringRefusal(toolName: string, input: unknown): string | undefined {
+    if (!input || typeof input !== "object") return;
+    const value = input as Record<string, unknown>;
+    const argv = toolName === "run_application" && typeof value.executable === "string" &&
+        (value.args === undefined || (Array.isArray(value.args) && value.args.every((arg) => typeof arg === "string")))
+        ? [value.executable, ...((value.args ?? []) as string[])] : undefined;
+    if (argv && argvWatcher(argv)) return REFUSAL;
+    if (["bash", "remote_bash", "bg_task", "bg_task_spawn", "bg_task_watch"].includes(toolName)) {
+        if (typeof value.command === "string" && shellWatcher(value.command, 0)) return REFUSAL;
+        if (Array.isArray(value.argv) && value.argv.every((arg) => typeof arg === "string") && argvWatcher(value.argv)) return REFUSAL;
+    }
+}
+
+export default function childOwnership(pi: Pick<ExtensionAPI, "on">, env: NodeJS.ProcessEnv = process.env): void {
+    // This marker is supplied by the parent on every child launch, including clean/unsandboxed runs.
+    if (!env[STEER_FILE_ENV]) return;
+    pi.on("before_agent_start", (event) => ({ systemPrompt: `${event.systemPrompt}\n\n${WORKER_HANDOFF}` }));
+    pi.on("tool_call", (event) => {
+        const reason = workerMonitoringRefusal(event.toolName, event.input);
+        if (reason) return { block: true, reason };
+    });
+}

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

@@ -879,7 +879,7 @@ function reconcileHealth(): void {
         if (meta && meta.completionCallbackPendingAt !== undefined && meta.completionCallbackSentAt === undefined && meta.completionCallbackSuppressedAt === undefined) enqueueCompletionCallback(pi!, meta.id);
     }
     pruneProgressCache();
-    if (!needsMonitoring(listMetasForParent(process.pid)) && !hasPendingFailureCallbacks()) stopHealthTicker();
+    syncHealthTicker();
 }
 
 /** Release progress state for runs that are no longer live (lost, stopped, or finished by any path). */
@@ -948,10 +948,10 @@ function reconcileAbandonedRuns(now: number = Date.now()): number {
     return adopted;
 }
 
-function hasPendingFailureCallbacks(): boolean {
-    return listMetasForParent(process.pid).some((m) => ownedByThisParent(m) && m.callback !== false &&
-        m.completionCallbackPendingAt !== undefined && m.completionCallbackSentAt === undefined && m.completionCallbackSuppressedAt === undefined &&
-        !callbackSuppressionReason(m));
+/** Completion batches own their retry timer; only supervision keeps this one alive. */
+function syncHealthTicker(): void {
+    if (needsMonitoring(listMetasForParent(process.pid))) ensureHealthTicker();
+    else stopHealthTicker();
 }
 
 /** Start the reconciliation loop if it isn't already running. */
@@ -1099,6 +1099,7 @@ function navigatorCloseRun(id: string) {
     healthLogCache.delete(id);
     resetChildEventLogCursor(id);
     resetParseRunCursor(id);
+    syncHealthTicker();
     return outcome;
 }
 
@@ -1451,14 +1452,14 @@ function finalizeRun(pi: ExtensionAPI, ctx: ExtensionContext, id: string, code:
     // Host-facing wrapper around first-party finalizer (finalization.ts).
     // Coherent child-exit evidence may supersede provisional orphaned/lost
     // reconciliation; finalization.ts enforces canExitFinalize + lifecycle authority.
-    const result = finalizeRunCore(id, code, {
+    finalizeRunCore(id, code, {
         renderWidget,
         notify: (message, level) => {
             try { ctx.ui.notify(message, level); } catch { /* ignore */ }
         },
         sendMessage: () => enqueueCompletionCallback(pi, id),
     });
-    if (result.applied && hasPendingFailureCallbacks()) ensureHealthTicker();
+    syncHealthTicker();
 }
 
 function timingSchemaFields() {
@@ -1785,9 +1786,10 @@ export default function (pi: ExtensionAPI) {
         const { args: resolvedExtArgs, missing } = extensionArgs(resolution, resolveExtensionPath);
         const trustedExtArgs = [...new Set(taskTools?.trusted.map((tool) => tool.loadPath) ?? [])]
             .filter((path) => !resolvedExtArgs.includes(path)).flatMap((path) => ["--extension", path]);
-        // The harness's own child control extension (no tools, no command I/O) rides along in every
-        // mode, including clean: it is how a soft-deadline steer reaches the child session.
-        const extArgs = [...resolvedExtArgs, ...trustedExtArgs, "--extension", childSteerExtensionPath()]
+        // Harness child controls ride along in every mode, including clean and unsandboxed runs.
+        // They deliver deadline steers and keep external monitoring with the coordinator.
+        const extArgs = [...resolvedExtArgs, ...trustedExtArgs,
+            "--extension", childSteerExtensionPath(), "--extension", join(selfDir(), "child-ownership.ts")]
             .map((value, index, all) => sandboxEnabled && all[index - 1] === "--extension" ? canonicalizePath(value) : value);
         if (sandboxEnabled && resolution.mode === "inherit") {
             throw new Error("Task confinement requires explicit extensions; inheritExtensions is unsupported while sandboxing is enabled.");
@@ -1938,7 +1940,7 @@ export default function (pi: ExtensionAPI) {
             "The tools param is both the tool allowlist AND what determines which extensions load in the child (e.g. tools='read,bash,web_fetch' loads only the web-tools package). Ask for the tools the task needs and nothing more; clean:true gives a built-ins-only child. Without an agent or role, pick a model with the model param (e.g. 'xai/grok-4.5@high'); providerless model patterns are resolved by Pi, while provider/model is deterministic and loads mapped provider extensions.",
             ...CATALOG_GUIDELINES,
             "Subagent sandboxing defaults to off. Human settings in /sandbox control file, credential-file, command, and network permissions; sandbox:false cannot override an enabled human profile. Set sandbox:true to request kernel confinement, including without published settings. Set callback:false to finish quietly — then read the result on demand via subagent_result.",
-            "Every run has harness-owned stall detection: no progress for stuck_minutes (default 10) wakes you once without stopping the run. Elapsed-time limits are opt-in: deadline_minutes steers the child to wrap up and later stops it after grace_minutes, while max_minutes stops it without grace. Do not set elapsed-time limits merely because a task may take a while; use them only when the work needs a real wall-clock bound.",
+            "Every launch automatically joins one shared harness-owned watcher, including batch launches; it stops when the last active run ends. Do not start a separate heartbeat or background watcher for subagents. No progress for stuck_minutes (default 10) wakes you once without stopping the run. Elapsed-time limits are opt-in: deadline_minutes steers the child to wrap up and later stops it after grace_minutes, while max_minutes stops it without grace. Do not set elapsed-time limits merely because a task may take a while; use them only when the work needs a real wall-clock bound.",
             "Use git_clone_workspace:true when the subagent will mutate Git in a sandbox. The parent prepares a disposable, self-contained clone with a real .git/ directory inside the sandbox root, so linked-worktree metadata outside the sandbox cannot stall the child.",
         ],
         parameters: Type.Object({
@@ -2263,7 +2265,10 @@ export default function (pi: ExtensionAPI) {
     const acceptanceResultTool = subagentResultTool(Type, toolSession);
     pi.registerTool(acceptanceResultTool);
     publishAcceptanceHooks(acceptanceResultTool);
-    const acceptanceStopTool = subagentStopTool(Type, { onStopped: renderWidget });
+    const acceptanceStopTool = subagentStopTool(Type, { onStopped: () => {
+        renderWidget();
+        syncHealthTicker();
+    } });
     acceptanceStopToolRef = acceptanceStopTool;
     pi.registerTool(acceptanceStopTool);
     publishAcceptanceHooks();
@@ -2475,10 +2480,8 @@ export default function (pi: ExtensionAPI) {
         // Clear the retired legacy widget so the shared navigator is the only
         // list surface for running/orphaned subagents.
         renderWidget();
-        // Resume supervision reconciliation + durable health-callback recovery
-        // across /reload while current-parent work still needs the ticker
-        // (running/orphaned, or unmarked lost); it stops itself when idle.
-        if (needsMonitoring(listMetasForParent(process.pid)) || hasPendingFailureCallbacks()) ensureHealthTicker();
+        // Reattach one watcher after reload; ordinary completion retries belong to the batcher.
+        syncHealthTicker();
     });
 
     pi.on("session_before_switch", () => {

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

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-subagents",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "Pi extension for detached, sandboxed subagent runs that keep the foreground session free.",
   "license": "MIT",
   "type": "module",
@@ -62,6 +62,7 @@
   },
   "dependencies": {
     "proper-lockfile": "^4.1.2",
+    "shell-quote": "1.12.0",
     "smol-toml": "1.9.0",
     "yaml": "^2.9.1"
   }

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

@@ -348,20 +348,60 @@ type MainListWidget = Component & {
   handleMouse(event: WidgetMouseEvent): WidgetMouseResult | undefined;
 };
 
+const BACK_TO_MAIN = "← main (Esc)";
+const BACK_TARGET = "back-to-main";
+
+function highlightPointerTarget(theme: unknown, line: string, width: number): string {
+  const colors = theme as { bg?(color: string, value: string): string } | undefined;
+  return colors?.bg?.("selectedBg", line + " ".repeat(Math.max(0, width - visibleWidth(line))))
+    ?? themeFgFromTheme(theme)("accent", line);
+}
+
+function createPointerNavigation(targetAt: (event: WidgetMouseEvent) => string | undefined, activate: (target: string) => boolean) {
+  let hovered: string | undefined;
+  let pressed: { target: string; y: number } | undefined;
+  return {
+    get hovered() { return hovered; },
+    reset() { hovered = undefined; pressed = undefined; },
+    handleMouse(event: WidgetMouseEvent): WidgetMouseResult | undefined {
+      if (event.type === "move" || event.type === "leave") {
+        const target = event.type === "leave" ? undefined : targetAt(event);
+        const changed = hovered !== target;
+        hovered = target;
+        return changed || target ? { handled: true, render: changed } : undefined;
+      }
+      if (event.button !== "left" || event.shift || event.alt || event.ctrl) {
+        pressed = undefined;
+        return undefined;
+      }
+      if (event.type === "press") {
+        const target = targetAt(event);
+        pressed = target ? { target, y: event.y } : undefined;
+        return target ? { handled: true, render: false } : undefined;
+      }
+      if (event.type !== "click") return undefined;
+      const claim = pressed;
+      pressed = undefined;
+      if (!claim || claim.y !== event.y || targetAt(event) !== claim.target || !activate(claim.target)) return undefined;
+      return { handled: true, render: true };
+    },
+  };
+}
+
 function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, deps: HostDeps): MainListWidget {
   const requestRender = () => tui.requestRender?.();
   state().mainListRequestRender = requestRender;
   // navigatorId per rendered line, so a pointer row resolves by structure, never by row text.
   let lineOwners: Array<string | undefined> = [];
   let lineWidth = MAIN_LIST_FALLBACK_WIDTH;
-  // Pi synthesizes a click only for the component that handled the initial press.
-  let pressedRow: { navigatorId: string; y: number } | undefined;
   const rowAt = (event: WidgetMouseEvent): string | undefined => {
     const width = Number.isFinite(event.width) && event.width > 0 ? Math.floor(event.width) : lineWidth;
     if (!Number.isFinite(event.x) || event.x < 0 || event.x >= width) return undefined;
     if (!Number.isInteger(event.y) || event.y < 0 || event.y >= lineOwners.length) return undefined;
-    return lineOwners[event.y];
+    const id = lineOwners[event.y];
+    return id && listRows().some((row) => row.navigatorId === id) ? id : undefined;
   };
+  const pointer = createPointerNavigation(rowAt, openNavigatorRow);
   return {
     render(width: number): string[] {
       const rows = listRows();
@@ -369,7 +409,7 @@ function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, d
       if (!rows.length) {
         state().lastMainListLines = undefined;
         lineOwners = [];
-        pressedRow = undefined;
+        pointer.reset();
         return [];
       }
       const layout = buildMainListLayout(rows, renderWidth(width), deps.truncate, themeFgFromTheme(theme), {
@@ -379,41 +419,24 @@ function createMainListWidget(tui: { requestRender?(): void }, theme: unknown, d
       lineWidth = renderWidth(width);
       // The leading gap line belongs to the widget too, so its slot stays ownerless.
       lineOwners = [undefined, ...layout.owners];
-      const lines = ["", ...layout.lines];
+      const lines = ["", ...layout.lines].map((line, index) =>
+        pointer.hovered && lineOwners[index] === pointer.hovered ? highlightPointerTarget(theme, line, lineWidth) : line);
       state().lastMainListLines = lines;
       return lines;
     },
     handleMouse(event: WidgetMouseEvent): WidgetMouseResult | undefined {
-      // Only an unmodified left press is ours; every other gesture reaches the host untouched.
-      if (event.button !== "left" || event.shift === true || event.alt === true || event.ctrl === true) {
-        pressedRow = undefined;
-        return undefined;
-      }
-      if (event.type === "press") {
-        pressedRow = undefined;
-        const navigatorId = rowAt(event);
-        if (!navigatorId || !listRows().some((row) => row.navigatorId === navigatorId)) return undefined;
-        pressedRow = { navigatorId, y: event.y };
-        return { handled: true, render: false };
-      }
-      if (event.type !== "click") return undefined;
-      const pressed = pressedRow;
-      pressedRow = undefined;
-      // A click after another component's press, or after the layout moved, is not the row we claimed.
-      if (!pressed || pressed.y !== event.y || rowAt(event) !== pressed.navigatorId) return undefined;
-      if (!openNavigatorRow(pressed.navigatorId)) return undefined;
-      return { handled: true, render: true };
+      return pointer.handleMouse(event);
     },
     invalidate() {
       state().lastMainListLines = undefined;
       lineOwners = [];
-      pressedRow = undefined;
+      pointer.reset();
     },
     dispose() {
       const s = state();
       if (s.mainListRequestRender === requestRender) s.mainListRequestRender = undefined;
       lineOwners = [];
-      pressedRow = undefined;
+      pointer.reset();
     },
   };
 }
@@ -958,6 +981,22 @@ function createOverlayComponent(
   let closed = false;
   let transcriptDetail: BackgroundWorkDetail | null = null;
   let transcriptComponent: Component | null = null;
+  let pointerTargets: Array<string | undefined> = [];
+  let pointerWidth = 0;
+  const pointer = createPointerNavigation((event) => {
+    if (closed || !Number.isInteger(event.y) || !Number.isFinite(event.x) || event.x < 0 || event.x >= pointerWidth) return undefined;
+    const target = pointerTargets[event.y];
+    if (target === BACK_TARGET) return event.x >= 3 && event.x < 3 + visibleWidth(BACK_TO_MAIN) ? target : undefined;
+    return target && listRows().some((row) => row.navigatorId === target) ? target : undefined;
+  }, (target) => {
+    if (target === BACK_TARGET) { backToMain(); return true; }
+    refreshRows();
+    const index = overlayState.rows.findIndex((row) => row.navigatorId === target);
+    if (index < 0) return false;
+    selectOverlayRow(index);
+    openDetail();
+    return true;
+  });
 
   const fg = (color: string, value: string) => theme?.fg ? theme.fg(color, value) : value;
 
@@ -1036,6 +1075,11 @@ function createOverlayComponent(
     try { done(null); } catch { /* ignore */ }
   }
 
+  function backToMain(): void {
+    unfocusMainList();
+    close();
+  }
+
   function handleCloseKey(): void {
     const row = selectedRow();
     if (!row || row.parentRow) return;
@@ -1101,14 +1145,17 @@ function createOverlayComponent(
     render(width: number) {
       closeIfEditorReplaced();
       refreshRows();
-      const railLines = buildMainListLines(overlayState.rows, width, deps.truncate, fg, {
+      const rail = buildMainListLayout(overlayState.rows, width, deps.truncate, fg, {
         selectedId: selectedRow()?.navigatorId,
         focused: true,
       });
+      const railLines = rail.lines;
       const editorLines = renderEditorLines(width);
       const bottomLines = [...railLines, ...editorLines];
       const overlayRows = state().detailOverlayRows;
       const detailRows = overlayRows === undefined ? undefined : Math.max(1, overlayRows - bottomLines.length);
+      const backControl = pointer.hovered === BACK_TARGET
+        ? highlightPointerTarget(theme, BACK_TO_MAIN, visibleWidth(BACK_TO_MAIN)) : undefined;
       let contentLines: string[];
       if (detail?.transcript && deps.createTranscriptComponent) {
         if (transcriptDetail !== detail || !transcriptComponent) {
@@ -1121,18 +1168,30 @@ function createOverlayComponent(
           width,
           deps.truncate,
           fg,
-          { minRows: detailRows, maxRows: detailRows, bottomFooter: false, logTailRows },
+          { minRows: detailRows, maxRows: detailRows, bottomFooter: false, logTailRows, backControl },
         );
       } else {
         transcriptDetail = null;
         transcriptComponent = null;
-        contentLines = buildDetailLines(detail, width, deps.truncate, fg, { expandedSections, logTailRows, minRows: detailRows, maxRows: detailRows, bottomFooter: false });
+        contentLines = buildDetailLines(detail, width, deps.truncate, fg, { expandedSections, logTailRows, minRows: detailRows, maxRows: detailRows, bottomFooter: false, backControl });
       }
-      if (overlayRows === undefined || detailRows === undefined) return [...contentLines, ...bottomLines];
-      const fittedContent = contentLines.slice(0, detailRows);
-      while (fittedContent.length < detailRows) fittedContent.push("");
-      // A terminal shorter than rail + editor keeps the bottom rows (the input frame) and drops the top.
-      return [...fittedContent, ...bottomLines].slice(-Math.max(1, overlayRows));
+      const fittedContent = detailRows === undefined ? contentLines : contentLines.slice(0, detailRows);
+      if (detailRows !== undefined) while (fittedContent.length < detailRows) fittedContent.push("");
+      const contentTargets = fittedContent.map((_, index) => index === 1 ? BACK_TARGET : undefined);
+      const allLines = [...fittedContent, ...bottomLines];
+      const allTargets = [...contentTargets, ...rail.owners, ...editorLines.map(() => undefined)];
+      // Match hit targets to the same viewport clipping as the visible lines.
+      const start = overlayRows === undefined ? 0 : Math.max(0, allLines.length - Math.max(1, overlayRows));
+      pointerTargets = allTargets.slice(start);
+      pointerWidth = renderWidth(width);
+      return allLines.slice(start).map((line, index) => {
+        if (!pointer.hovered || pointerTargets[index] !== pointer.hovered) return line;
+        if (pointer.hovered === BACK_TARGET) return line;
+        return highlightPointerTarget(theme, line, width);
+      });
+    },
+    handleMouse(event: WidgetMouseEvent): WidgetMouseResult | undefined {
+      return pointer.handleMouse(event);
     },
     handleInput(data: string) {
       if (closed) return;
@@ -1151,7 +1210,7 @@ function createOverlayComponent(
       else if (deps.matchKey(data, "left")) {
         const mainIdx = overlayState.rows.findIndex((row) => row.parentRow && row.id === "main");
         if (mainIdx >= 0) selectOverlayRow(mainIdx);
-        close();
+        backToMain();
       }
       else if (deps.matchKey(data, "enter")) {
         const row = selectedRow();
@@ -1179,8 +1238,7 @@ function createOverlayComponent(
         requestRender();
       }
       else if (deps.matchKey(data, "escape")) {
-        unfocusMainList();
-        close();
+        backToMain();
       }
     },
     /** Show another row's detail in this overlay (the main list moved while it was unfocused). */
@@ -1195,8 +1253,10 @@ function createOverlayComponent(
     },
     /** Close the overlay (done), e.g. when the navigator is disposed. */
     dismiss() { close(); },
-    invalidate() { transcriptComponent?.invalidate(); },
+    invalidate() { pointer.reset(); pointerTargets = []; transcriptComponent?.invalidate(); },
     dispose() {
+      pointer.reset();
+      pointerTargets = [];
       clearCloseArm();
       detailScheduler.dispose();
     },
@@ -1233,14 +1293,14 @@ function buildTranscriptDetailLines(
   width: number,
   truncate: (s: string, width: number) => string,
   fg: (color: string, value: string) => string,
-  options: { minRows?: number; maxRows?: number; bottomFooter?: boolean; logTailRows?: number } = {},
+  options: { minRows?: number; maxRows?: number; bottomFooter?: boolean; logTailRows?: number; backControl?: string } = {},
 ): string[] {
-  const actions = [...(detail.footerActions ?? ["x close"]), "Esc close"].join(" · ");
+  const actions = [...(detail.footerActions ?? ["x close"])].join(" · ");
   const tailRows = options.logTailRows ?? DEFAULT_LOG_TAIL_ROWS;
   let shownTranscriptLines = transcriptLines.length ? transcriptLines.slice(-tailRows) : ["   (no transcript yet)"];
   const lines: string[] = [
     fg("accent", rule(detail.title, width)),
-    dim(`   ← main · ${actions}`, fg),
+    `   ${options.backControl ?? fg("accent", BACK_TO_MAIN)}${dim(` · ${actions}`, fg)}`,
     "",
     `   status   ${fg(toneColor(detail.statusTone, detail.status), detail.status)}`,
   ];
@@ -1264,7 +1324,7 @@ function buildTranscriptDetailLines(
   lines.push(...shownTranscriptLines);
   lines.push("");
   if (options.bottomFooter === false) return lines.map((line) => safeTruncate(line, width, truncate));
-  const footerLines = [dim(`   ← main · ${actions}`, fg), dim(rule("", width), fg)];
+  const footerLines = [dim(`   ${BACK_TO_MAIN} · ${actions}`, fg), dim(rule("", width), fg)];
   padBeforeFooter(lines, footerLines.length, options.minRows);
   lines.push(...footerLines);
   return lines.map((line) => safeTruncate(line, width, truncate));
@@ -1320,10 +1380,10 @@ function buildDetailLines(
   width: number,
   truncate: (s: string, width: number) => string,
   fg: (color: string, value: string) => string,
-  options: { expandedSections?: Set<string>; logTailRows?: number; minRows?: number; maxRows?: number; bottomFooter?: boolean } = {},
+  options: { expandedSections?: Set<string>; logTailRows?: number; minRows?: number; maxRows?: number; bottomFooter?: boolean; backControl?: string } = {},
 ): string[] {
   if (!detail) {
-    const lines = [rule("Work unavailable", width), dim("   ← back · Esc close", fg), ""];
+    const lines = [rule("Work unavailable", width), `   ${options.backControl ?? fg("accent", BACK_TO_MAIN)}`, ""];
     if (options.bottomFooter === false) return lines.map((line) => safeTruncate(line, width, truncate));
     const footerLines = [dim(rule("", width), fg)];
     padBeforeFooter(lines, footerLines.length, options.minRows);
@@ -1336,8 +1396,8 @@ function buildDetailLines(
   const foldedAction = toggleableSectionId
     ? (options.expandedSections?.has(toggleableSectionId) ? "Enter collapse" : "Enter expand")
     : null;
-  const actions = [foldedAction, ...(detail.footerActions?.length ? detail.footerActions : ["x close"]), "l 10/25", "Esc close"].filter(Boolean).join(" · ");
-  lines.push(dim(`   ← back · ${actions}`, fg));
+  const actions = [foldedAction, ...(detail.footerActions?.length ? detail.footerActions : ["x close"]), "l 10/25"].filter(Boolean).join(" · ");
+  lines.push(`   ${options.backControl ?? fg("accent", BACK_TO_MAIN)}${dim(` · ${actions}`, fg)}`);
   lines.push("");
   lines.push(`   status   ${fg(toneColor(detail.statusTone, detail.status), detail.status)}`);
   if (detail.subtitle) lines.push(`   summary  ${detail.subtitle}`);
@@ -1393,7 +1453,7 @@ function buildDetailLines(
   }
   lines.push("");
   if (options.bottomFooter === false) return lines.map((line) => safeTruncate(line, width, truncate));
-  const footerLines = [dim(`   ← back · ${actions}`, fg), dim(rule("", width), fg)];
+  const footerLines = [dim(`   ${BACK_TO_MAIN} · ${actions}`, fg), dim(rule("", width), fg)];
   padBeforeFooter(lines, footerLines.length, options.minRows);
   lines.push(...footerLines);
   return lines.map((line) => safeTruncate(line, width, truncate));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-harness",
-  "version": "0.34.0",
+  "version": "0.34.2",
   "description": "Pi extension bundle for a write sandbox, subagents, background tasks, SSH, goals, and Outcome & Todo.",
   "license": "MIT",
   "type": "module",
@@ -53,12 +53,13 @@
     "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.0",
-    "pi-better-goal": "0.10.2",
+    "pi-better-background-tasks": "0.12.1",
+    "pi-better-goal": "0.10.3",
     "pi-better-sandbox": "0.14.0",
     "pi-better-ssh": "0.1.3",
-    "pi-better-subagents": "0.22.0",
+    "pi-better-subagents": "0.22.2",
     "proper-lockfile": "^4.1.2",
+    "shell-quote": "1.12.0",
     "smol-toml": "1.9.0",
     "yaml": "^2.9.1"
   },