pi-herdsman 0.23.0 → 0.24.0

package/dist/index.js

@@ -15,7 +15,7 @@ import { fileURLToPath as fileURLToPath2 } from "node:url";
 // package.json
 var package_default = {
   name: "pi-herdsman",
-  version: "0.23.0",
+  version: "0.24.0",
   type: "module",
   description: "Asynchronous Pi subagents and agent fleet orchestration for parallel coding agents with nested delegation, background work, and supervision in herdr.",
   license: "Apache-2.0",
@@ -4415,6 +4415,9 @@ function layoutStatusRows(rows, width, options = {}) {
   }) ?? layouts.at(-1);
   return rows.map((row) => ({
     label: row.label,
+    labelStart: visibleWidth(
+      `${row.tree}${row.spinner} ${padVisible(row.definition, columns.definitionWidth)}  `
+    ),
     ...row.paneId ? { paneId: row.paneId } : {},
     ...row.sessionId ? { sessionId: row.sessionId } : {},
     text: renderStatusLine(row, columns, layout, available, options.theme)
@@ -4451,6 +4454,8 @@ function managerPresentationSnapshot(manager) {
     displayName: manager.displayName,
     project: manager.project,
     workspaceId: manager.workspaceId,
+    paneId: manager.paneId,
+    tabId: manager.tabId,
     runtimeState: manager.runtimeState,
     agentCounts: manager.agentCounts,
     leadCounts: manager.leadCounts,
@@ -4639,15 +4644,23 @@ var MANAGER_METADATA_LAYOUTS = [
   { elapsed: false, context: true },
   { elapsed: false, context: false }
 ];
-function renderSupervisionLeads(reports, width, options = {}, selectedLead) {
+function identifyingLabelVisible(text, label, width, expectedStart) {
+  if (expectedStart !== void 0)
+    return label.length > 0 && expectedStart + visibleWidth(label) <= width;
+  const start = text.lastIndexOf(label);
+  return label.length > 0 && start >= 0 && visibleWidth(text.slice(0, start + label.length)) <= width;
+}
+function renderSupervisionRows(reports, width, options = {}, selectedLead) {
   const status = options.status ?? "fresh";
   const role2 = options.role ?? "chief";
   if (status === "unavailable")
     return [
-      safeLine(
-        `${themed(options.theme, "success", "\u25CF")} ${themed(options.theme, "muted", `${role2} \xB7 unavailable`)}`,
-        width
-      )
+      {
+        text: safeLine(
+          `${themed(options.theme, "success", "\u25CF")} ${themed(options.theme, "muted", `${role2} \xB7 unavailable`)}`,
+          width
+        )
+      }
     ];
   const displays = orderedSupervisionLeads(presentationReports(reports));
   const groups = groupOrderedSupervisedLeads(displays);
@@ -4695,16 +4708,25 @@ function renderSupervisionLeads(reports, width, options = {}, selectedLead) {
       })
     ) ?? MANAGER_METADATA_LAYOUTS.at(-1);
     return [
-      safeLine(header, width),
+      { text: safeLine(header, width) },
       ...visible.map((item, index) => {
         const branch = index === visible.length - 1 && !remaining ? "\u2514\u2500" : "\u251C\u2500";
         const lead = item.lead;
         const navigation = lead && lead.lead === selectedLead ? ">" : "";
         if (item.kind === "lead")
-          return safeLine(
-            `${themed(options.theme, lifecycleColor(item.lead.runtimeState), `${branch} ${navigation}${supervisionLeadMarker(item.lead)}`)} ${themed(options.theme, "muted", `${item.lead.branch ?? item.lead.displayName} \xB7 Lead`)}`,
-            width
-          );
+          return {
+            text: safeLine(
+              `${themed(options.theme, lifecycleColor(item.lead.runtimeState), `${branch} ${navigation}${supervisionLeadMarker(item.lead)}`)} ${themed(options.theme, "muted", `${item.lead.branch ?? item.lead.displayName} \xB7 Lead`)}`,
+              width
+            ),
+            ...status === "fresh" ? {
+              label: item.lead.branch ?? item.lead.displayName,
+              intent: {
+                kind: "session",
+                sessionId: item.lead.lead
+              }
+            } : {}
+          };
         const marker = item.work.status === "active" && lead ? `${lead.runtimeState === "blocked" ? "!" : ""}${supervisionLeadMarker(lead)}` : workMarkers[item.work.status];
         const prefix = `${branch} ${navigation}${marker} `;
         const suffix = ` \xB7 ${item.work.status}`;
@@ -4718,48 +4740,64 @@ function renderSupervisionLeads(reports, width, options = {}, selectedLead) {
         );
         const markerColor = item.work.status === "active" && lead ? lifecycleColor(lead.runtimeState) : item.work.status === "active" ? "success" : item.work.status === "conflict" ? "warning" : "muted";
         const markerText = themed(options.theme, markerColor, marker);
-        const branchText = themed(
-          options.theme,
-          "muted",
-          safeLine(
-            item.work.branch,
-            width - visibleWidth(prefix) - visibleWidth(suffix) - telemetryWidth
-          )
-        );
-        return safeLine(
-          `${themed(options.theme, "muted", `${branch} ${navigation}`)}${markerText} ${branchText}${themed(options.theme, "muted", suffix)}${telemetry.map((value2) => themed(options.theme, "muted", `  ${value2}`)).join("")}`,
-          width
-        );
+        const branchWidth = width - visibleWidth(prefix) - visibleWidth(suffix) - telemetryWidth;
+        const displayedBranch = safeLine(item.work.branch, branchWidth);
+        const branchText = themed(options.theme, "muted", displayedBranch);
+        return {
+          text: safeLine(
+            `${themed(options.theme, "muted", `${branch} ${navigation}`)}${markerText} ${branchText}${themed(options.theme, "muted", suffix)}${telemetry.map((value2) => themed(options.theme, "muted", `  ${value2}`)).join("")}`,
+            width
+          ),
+          ...status === "fresh" && item.work.status === "active" && lead && displayedBranch === item.work.branch ? {
+            label: item.work.branch,
+            intent: { kind: "session", sessionId: lead.lead }
+          } : {}
+        };
       }),
-      ...remaining ? [safeLine(`\u2514\u2500 \u2026 ${remaining} more \xB7 /manager`, width)] : []
+      ...remaining ? [{ text: safeLine(`\u2514\u2500 \u2026 ${remaining} more \xB7 /manager`, width) }] : []
     ];
   }
   return [
-    safeLine(header, width),
+    { text: safeLine(header, width) },
     ...shown.flatMap((lead, index) => {
       const branch = index === shown.length - 1 && hidden === 0 ? "\u2514\u2500" : "\u251C\u2500";
       const marker = supervisionLeadMarker(lead);
       const navigation = lead.lead === selectedLead ? ">" : "";
       const indicators = navigation;
       const counts = lead.leadCounts;
-      const row = safeLine(
-        `${themed(options.theme, lifecycleColor(lead.runtimeState), `${branch} ${indicators}${marker}`)} ${themed(options.theme, "muted", `${lead.displayName}${counts?.total ? ` \xB7 ${counts.total} lead${counts.total === 1 ? "" : "s"}` : ""}${lead.agentCounts?.total ? ` \xB7 ${lead.agentCounts.total} agent${lead.agentCounts.total === 1 ? "" : "s"}` : ""}`)}`,
-        width
-      );
+      const intent = status === "fresh" ? { kind: "session", sessionId: lead.lead } : void 0;
+      const row = {
+        text: safeLine(
+          `${themed(options.theme, lifecycleColor(lead.runtimeState), `${branch} ${indicators}${marker}`)} ${themed(options.theme, "muted", `${lead.displayName}${counts?.total ? ` \xB7 ${counts.total} lead${counts.total === 1 ? "" : "s"}` : ""}${lead.agentCounts?.total ? ` \xB7 ${lead.agentCounts.total} agent${lead.agentCounts.total === 1 ? "" : "s"}` : ""}`)}`,
+          width
+        ),
+        ...intent ? { intent } : {},
+        ...intent ? { label: lead.displayName } : {}
+      };
       const children = (lead.leads ?? []).slice(0, 3);
       const childIndent = branch === "\u2514\u2500" ? "   " : "\u2502  ";
       return [
         row,
         ...children.map((child, childIndex) => {
           const childBranch = childIndex === children.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
-          return safeLine(
-            `${themed(options.theme, "muted", `${childIndent}${childBranch} ${child.branch ?? child.display_name} \xB7 `)}${themed(options.theme, lifecycleColor(child.runtime_state), child.runtime_state)}${themed(options.theme, "muted", `${child.agent_counts.total ? ` \xB7 ${child.agent_counts.total} agent${child.agent_counts.total === 1 ? "" : "s"}` : ""}`)}`,
-            width
-          );
+          return {
+            text: safeLine(
+              `${themed(options.theme, "muted", `${childIndent}${childBranch} ${child.branch ?? child.display_name} \xB7 `)}${themed(options.theme, lifecycleColor(child.runtime_state), child.runtime_state)}${themed(options.theme, "muted", `${child.agent_counts.total ? ` \xB7 ${child.agent_counts.total} agent${child.agent_counts.total === 1 ? "" : "s"}` : ""}`)}`,
+              width
+            ),
+            ...status === "fresh" ? {
+              label: child.branch ?? child.display_name,
+              intent: {
+                kind: "session",
+                sessionId: child.session,
+                parentSessionId: lead.lead
+              }
+            } : {}
+          };
         })
       ];
     }),
-    ...hidden > 0 ? [safeLine(`\u2514\u2500 \u2026 ${hidden} more \xB7 /${role2}`, width)] : []
+    ...hidden > 0 ? [{ text: safeLine(`\u2514\u2500 \u2026 ${hidden} more \xB7 /${role2}`, width) }] : []
   ];
 }
 function formatSupervisionNotification(reports, status = "fresh") {
@@ -4920,15 +4958,39 @@ function formatSupervisionContext(snapshot, options) {
   }
   return [...included, closing].join("\n");
 }
-function createSupervisionWidget(getLeads, getStatus, role2 = "chief", theme) {
+function createSupervisionWidget(getLeads, getStatus, role2 = "chief", theme, onFocus) {
+  let renderedWidth = -1;
+  let hits = [];
   return {
     render(width) {
-      return renderSupervisionLeads(getLeads(), width, {
+      renderedWidth = width;
+      const rows = renderSupervisionRows(getLeads(), width, {
         status: getStatus(),
         ordinaryCap: 6,
         role: role2,
         theme
-      }).filter((line) => line.length > 0);
+      }).filter(({ text }) => text.length > 0);
+      hits = [];
+      rows.forEach((row, index) => {
+        if (row.intent && row.label && identifyingLabelVisible(row.text, row.label, width))
+          hits.push({
+            row: index,
+            from: 0,
+            to: Math.min(width, visibleWidth(row.text)),
+            intent: row.intent
+          });
+      });
+      return rows.map(({ text }) => text);
+    },
+    handleMouse(event) {
+      if (event.type !== "click" || event.button !== "left" || event.width !== renderedWidth)
+        return;
+      const hit = hits.find(
+        ({ row, from, to }) => row === event.y && event.x >= from && event.x < to
+      );
+      if (!hit || !onFocus) return;
+      onFocus(hit.intent);
+      return { handled: true, render: false };
     },
     invalidate() {
     }
@@ -5001,22 +5063,38 @@ function safeDisplaySegment(value2) {
   return value2.replace(/\u001b\][^\u0007]*(?:\u0007|\u001b\\)/gu, "").replace(/\u001b\[[0-?]*[ -/]*[@-~]/gu, "").replace(/[\u0000-\u001f\u007f]/gu, " ").replace(/\s+/gu, " ").trim();
 }
 function renderBreadcrumb(segments, width) {
-  if (width <= 0) return "";
-  const names2 = segments.map(safeDisplaySegment).filter(Boolean);
-  const current = names2.at(-1) ?? "?";
+  if (width <= 0) return { text: "", hits: [] };
+  const visible = segments.map((segment) => ({ ...segment, text: safeDisplaySegment(segment.text) })).filter((segment) => segment.text);
+  const current = visible.at(-1) ?? { text: "?" };
   const marker = "\u25CF";
-  if (width <= visibleWidth(marker)) return truncateToWidth(marker, width, "");
+  if (width <= visibleWidth(marker))
+    return { text: truncateToWidth(marker, width, ""), hits: [] };
   const prefix = `${marker} `;
   const available = width - visibleWidth(prefix);
-  if (available <= 0) return marker;
-  const currentText = tailTruncate(current, available);
-  let result = `${prefix}${currentText}`;
-  for (let index = names2.length - 2; index >= 0; index--) {
-    const candidate = `${prefix}${names2[index]} \u2192 ${result.slice(prefix.length)}`;
-    if (visibleWidth(candidate) <= width) result = candidate;
+  if (available <= 0) return { text: marker, hits: [] };
+  const currentText = tailTruncate(current.text, available);
+  const included = [{ ...current, text: currentText }];
+  for (let index = visible.length - 2; index >= 0; index--) {
+    const candidate = [visible[index], ...included];
+    const candidateText = `${prefix}${candidate.map(({ text: text2 }) => text2).join(" \u2192 ")}`;
+    if (visibleWidth(candidateText) <= width) included.unshift(visible[index]);
     else break;
   }
-  return result;
+  const text = `${prefix}${included.map(({ text: text2 }) => text2).join(" \u2192 ")}`;
+  const hits = [];
+  let x = visibleWidth(prefix);
+  included.forEach((segment, index) => {
+    const segmentWidth = visibleWidth(segment.text);
+    if (index < included.length - 1 && segment.sessionId)
+      hits.push({
+        row: 0,
+        from: x,
+        to: x + segmentWidth,
+        intent: { kind: "session", sessionId: segment.sessionId }
+      });
+    x += segmentWidth + (index < included.length - 1 ? visibleWidth(" \u2192 ") : 0);
+  });
+  return { text, hits };
 }
 function renderToolMetadata(tools, width) {
   if (!tools?.length || width <= 0) return "";
@@ -6412,8 +6490,12 @@ var StatusWidget = class {
   timer;
   invalidateUI;
   theme;
-  constructor(invalidateUI, theme) {
+  onFocus;
+  renderedWidth = -1;
+  hits = [];
+  constructor(invalidateUI, theme, onFocus) {
     this.invalidateUI = invalidateUI;
+    this.onFocus = onFocus;
     this.theme = theme ?? {
       fg: (_color, text) => text,
       bold: (text) => text
@@ -6421,6 +6503,8 @@ var StatusWidget = class {
   }
   setSnapshot(snapshot) {
     this.snapshot = snapshot;
+    this.hits = [];
+    this.renderedWidth = -1;
     const animated = snapshot.agents.some(
       (agent) => agent.state === "working" || agent.state === "settling" || agent.state === "starting"
     );
@@ -6440,20 +6524,36 @@ var StatusWidget = class {
   }
   render(width) {
     const s = this.snapshot;
+    this.renderedWidth = width;
+    this.hits = [];
     const suffix = s.unavailable ? "unavailable" : `${formatStatusCounts(s.agents)}${s.stale ? " \xB7 stale" : ""}`;
     const availableWidth = Math.max(0, width);
     const execution = s.execution ? ` \xB7 ${s.execution.kind === "managed" ? "managed" : s.execution.mode}` : "";
     const elapsed = formatElapsed(s.herdRunStartedAt, Date.now());
     let run = !s.identityOnly && elapsed ? ` \xB7 ${elapsed}` : "";
     const suffixText = s.identityOnly || !suffix ? "" : `  ${suffix}`;
-    const breadcrumbSegments = s.breadcrumb ?? ["?"];
-    const breadcrumb = renderBreadcrumb(breadcrumbSegments, availableWidth);
+    const breadcrumbSegments = s.breadcrumb ?? [{ text: "?" }];
+    const renderedBreadcrumb = renderBreadcrumb(
+      breadcrumbSegments,
+      availableWidth
+    );
+    const breadcrumb = renderedBreadcrumb.text;
+    if (!s.stale && !s.unavailable) this.hits.push(...renderedBreadcrumb.hits);
     const remainingWidth = Math.max(
       0,
       availableWidth - visibleWidth(breadcrumb)
     );
     const executionFits = !!execution && visibleWidth(execution) + visibleWidth(suffixText) <= remainingWidth;
     const shownExecution = executionFits ? execution : "";
+    if (!s.stale && !s.unavailable && executionFits && s.execution?.kind === "managed") {
+      const from = visibleWidth(breadcrumb) + visibleWidth(" \xB7 ");
+      this.hits.push({
+        row: 0,
+        from,
+        to: from + visibleWidth("managed"),
+        intent: { kind: "assigned-manager" }
+      });
+    }
     const tools = renderToolMetadata(
       s.ownTools,
       Math.max(
@@ -6471,24 +6571,55 @@ var StatusWidget = class {
     const header = `${styledBreadcrumb}${styledExecution}${styledTools}${styledRun}${styledSuffix}`;
     const out = [truncateToWidth(header, availableWidth, "\u2026")];
     if (s.identityOnly) return out;
-    out.push(
-      ...renderStatusRows(s.agents, {
-        now: Date.now(),
-        frame: this.frame,
-        width: Math.max(0, width),
-        theme: this.theme
-      }).map(({ text }) => text)
-    );
+    const rows = renderStatusRows(s.agents, {
+      now: Date.now(),
+      frame: this.frame,
+      width: Math.max(0, width),
+      theme: this.theme
+    });
+    out.push(...rows.map(({ text }) => text));
+    if (!s.stale && !s.unavailable)
+      rows.forEach((row, index) => {
+        const agent = s.agents.find(
+          ({ label, sessionId }) => label === row.label && sessionId === row.sessionId
+        );
+        if (!row.sessionId || !identifyingLabelVisible(
+          row.text,
+          row.label,
+          availableWidth,
+          row.labelStart
+        ) || s.agents.filter(({ sessionId }) => sessionId === row.sessionId).length !== 1 || !agent || agent.state === "unknown" || agent.state === "lost" || agent.state === "starting")
+          return;
+        this.hits.push({
+          row: index + 1,
+          from: 0,
+          to: Math.min(availableWidth, visibleWidth(row.text)),
+          intent: { kind: "session", sessionId: row.sessionId }
+        });
+      });
     return out;
   }
+  handleMouse(event) {
+    if (event.type !== "click" || event.button !== "left" || event.width !== this.renderedWidth)
+      return;
+    const hit = this.hits.find(
+      ({ row, from, to }) => row === event.y && event.x >= from && event.x < to
+    );
+    if (!hit || !this.onFocus) return;
+    this.onFocus(hit.intent);
+    return { handled: true, render: false };
+  }
   dispose() {
     if (this.timer) clearInterval(this.timer);
     this.timer = void 0;
     this.invalidateUI = void 0;
+    this.onFocus = void 0;
+    this.hits = [];
+    this.renderedWidth = -1;
   }
 };
-function createStatusWidget(invalidate, theme) {
-  return new StatusWidget(invalidate, theme);
+function createStatusWidget(invalidate, theme, onFocus) {
+  return new StatusWidget(invalidate, theme, onFocus);
 }
 
 // extension/config.ts
@@ -7116,8 +7247,6 @@ async function drainCoordinationInbox(options) {
       }
       continue;
     }
-    const deliverAs = options.deliveryMode ? options.deliveryMode(record) : "followUp";
-    if (!deliverAs) continue;
     let token;
     const clearTransaction = async () => {
       if (token === void 0) return;
@@ -7133,6 +7262,12 @@ async function drainCoordinationInbox(options) {
       await clearTransaction();
       continue;
     }
+    const deliverAs = options.deliveryMode ? options.deliveryMode(record) : "followUp";
+    const wasAlreadyDelivered = options.isDelivered(record.id);
+    if (!deliverAs && !wasAlreadyDelivered) {
+      await clearTransaction();
+      continue;
+    }
     let authorized;
     try {
       authorized = await options.isAuthorized(record);
@@ -7180,29 +7315,35 @@ async function drainCoordinationInbox(options) {
           options.sessionId,
           record.id
         );
-        await options.sendMessage(
-          {
-            customType: `pi-herdsman-${record.kind}`,
-            content: deliveredMessageContent(record),
-            display: true,
-            details: {
-              id: record.id,
-              leaseId: record.leaseId,
-              fromSessionId: record.fromSessionId,
-              toSessionId: record.toSessionId,
-              leadSessionId: record.leadSessionId,
-              ...record.branch ? { branch: record.branch } : {}
-            }
-          },
-          { deliverAs, triggerTurn: true },
-          record
-        );
-        await options.transaction?.revalidate(token, "after-send");
+        if (!options.isDelivered(record.id)) {
+          await options.sendMessage(
+            {
+              customType: `pi-herdsman-${record.kind}`,
+              content: deliveredMessageContent(record),
+              display: true,
+              details: {
+                id: record.id,
+                leaseId: record.leaseId,
+                fromSessionId: record.fromSessionId,
+                toSessionId: record.toSessionId,
+                leadSessionId: record.leadSessionId,
+                ...record.branch ? { branch: record.branch } : {}
+              }
+            },
+            { deliverAs: deliverAs ?? "followUp", triggerTurn: true },
+            record
+          );
+          await options.transaction?.revalidate(token, "after-send");
+        }
       } catch {
         await clearTransaction();
         continue;
       }
-      delivered += 1;
+      if (!options.isDelivered(record.id)) {
+        await clearTransaction();
+        continue;
+      }
+      if (!wasAlreadyDelivered) delivered += 1;
       try {
         await options.transaction?.revalidate(token, "before-accepted");
         assertChiefMessageNotQuarantined(
@@ -7218,6 +7359,7 @@ async function drainCoordinationInbox(options) {
       }
     } else {
       try {
+        if (!wasAlreadyDelivered) delivered += 1;
         await options.transaction?.revalidate(token, "already-delivered");
         assertChiefMessageNotQuarantined(
           options.runtime,
@@ -8333,7 +8475,7 @@ function buildAgentStatusSnapshot(view, ctx, host) {
     stale: false,
     unavailable: false,
     ...herdStartedAt !== void 0 ? { herdRunStartedAt: herdStartedAt } : {},
-    breadcrumb: host.scope.kind === "lead" ? ["lead"] : statusBreadcrumb(
+    breadcrumb: host.scope.kind === "lead" ? [{ text: "lead" }] : statusBreadcrumb(
       view,
       host.environmentIdentity(ctx),
       host.identityFromEnvironment(),
@@ -8354,6 +8496,7 @@ function createAgentStatusRuntime() {
   let statusInFlight = false;
   let requestActive = false;
   let statusPrimed = false;
+  let focusInFlight = false;
   let lastValidStatus = {
     agents: [],
     stale: false,
@@ -8468,7 +8611,28 @@ function createAgentStatusRuntime() {
       clearTimer();
       statusContext = ctx;
       ctx.ui.setWidget("pi-herdsman", (tui, theme) => {
-        const widget = createStatusWidget(() => tui.requestRender(), theme);
+        let widget;
+        widget = createStatusWidget(
+          () => tui.requestRender(),
+          theme,
+          (intent) => {
+            if (generation !== statusGeneration || ctx !== statusContext || statusWidgetGeneration !== generation || statusWidget !== widget)
+              return;
+            const focus = options?.focusTarget;
+            if (!focus || focusInFlight) return;
+            const isCurrent = () => generation === statusGeneration && ctx === statusContext && statusWidgetGeneration === generation && statusWidget === widget;
+            focusInFlight = true;
+            void focus(ctx, intent, isCurrent).catch((error2) => {
+              if (generation === statusGeneration && ctx === statusContext)
+                ctx.ui.notify(
+                  String(error2).replace(/^Error: /u, ""),
+                  "warning"
+                );
+            }).finally(() => {
+              if (generation === statusGeneration) focusInFlight = false;
+            });
+          }
+        );
         widget.setSnapshot(widgetSnapshot(lastValidStatus));
         if (generation === statusGeneration && ctx === statusContext) {
           statusWidget = widget;
@@ -8488,12 +8652,14 @@ function createAgentStatusRuntime() {
       statusWidget?.dispose();
       statusWidget = void 0;
       requestActive = false;
+      focusInFlight = false;
       statusPrimed = false;
     },
     prepareSession: (ctx, beforeActivate) => {
       clearTimer();
       statusRefresh = false;
       statusInFlight = false;
+      focusInFlight = false;
       removeWidget();
       statusWidgetGeneration = 0;
       statusContext = void 0;
@@ -8516,6 +8682,7 @@ function createAgentStatusRuntime() {
       clearTimer();
       statusRefresh = false;
       statusInFlight = false;
+      focusInFlight = false;
       removeWidget();
       statusWidgetGeneration = 0;
       statusContext = void 0;
@@ -8861,39 +9028,50 @@ function visibleAgentSnapshots(snapshot, scope, ownerSessionId) {
   return visible;
 }
 function statusBreadcrumb(snapshot, candidate, identity, sameIdentity) {
-  if (!candidate) return ["?"];
-  const current = snapshot.agents.find(
+  if (!candidate) return [{ text: "?" }];
+  const matches = snapshot.agents.filter(
     ({ state }) => sameIdentity(state, candidate)
   );
+  const current = matches.length === 1 ? matches[0] : void 0;
   if (!current)
     return [
-      "?",
-      identity.definition && identity.label ? displayIdentity(identity.definition, identity.label) : identity.definition ?? "?"
+      { text: "?" },
+      {
+        text: identity.definition && identity.label ? displayIdentity(identity.definition, identity.label) : identity.definition ?? "?"
+      }
     ];
   const definitions = [
-    displayIdentity(current.agentDefinition, current.state.agentLabel)
+    {
+      text: displayIdentity(current.agentDefinition, current.state.agentLabel),
+      sessionId: current.state.piSessionId
+    }
   ];
   const visited = /* @__PURE__ */ new Set([current.state.piSessionId]);
   let ownerSessionId = current.state.ownerSessionId;
   while (true) {
-    const parent = snapshot.agents.find(
+    const parents = snapshot.agents.filter(
       ({ state }) => state.piSessionId === ownerSessionId
     );
+    if (parents.length > 1) return [{ text: "?" }, ...definitions.reverse()];
+    const parent = parents[0];
     if (parent) {
       if (visited.has(parent.state.piSessionId))
-        return ["?", ...definitions.reverse()];
+        return [{ text: "?" }, ...definitions.reverse()];
       visited.add(parent.state.piSessionId);
-      definitions.push(
-        displayIdentity(parent.agentDefinition, parent.state.agentLabel)
-      );
+      definitions.push({
+        text: displayIdentity(parent.agentDefinition, parent.state.agentLabel),
+        sessionId: parent.state.piSessionId
+      });
       ownerSessionId = parent.state.ownerSessionId;
       continue;
     }
     if (snapshot.mailboxes.some(
       ({ state }) => state.piSessionId === ownerSessionId
     ))
-      return ["?", ...definitions.reverse()];
-    return snapshot.leadSessionIds.includes(ownerSessionId) ? ["lead", ...definitions.reverse()] : ["?", ...definitions.reverse()];
+      return [{ text: "?" }, ...definitions.reverse()];
+    return snapshot.leadSessionIds.filter(
+      (sessionId) => sessionId === ownerSessionId
+    ).length === 1 ? [{ text: "lead", sessionId: ownerSessionId }, ...definitions.reverse()] : [{ text: "?" }, ...definitions.reverse()];
   }
 }
 function sessionAgentIdentity(entries, sessionId) {
@@ -14354,6 +14532,7 @@ function createManagedAgentLeafStatus(options) {
   let context;
   let generation = 0;
   let inFlight = false;
+  let focusInFlight = false;
   let breadcrumb;
   let ownTools;
   const ownToolsSnapshot = () => ownTools ? { ownTools } : {};
@@ -14368,6 +14547,7 @@ function createManagedAgentLeafStatus(options) {
     }
     context = void 0;
     inFlight = false;
+    focusInFlight = false;
   };
   const refresh = async (ctx, activeGeneration) => {
     if (activeGeneration !== generation || ctx !== context || inFlight) return;
@@ -14400,11 +14580,13 @@ function createManagedAgentLeafStatus(options) {
           stale: false,
           unavailable: true,
           breadcrumb: breadcrumb ?? [
-            "?",
-            process.env.PI_HERDSMAN_AGENT_DEFINITION && process.env.PI_HERDSMAN_LABEL ? displayIdentity(
-              process.env.PI_HERDSMAN_AGENT_DEFINITION,
-              process.env.PI_HERDSMAN_LABEL
-            ) : process.env.PI_HERDSMAN_AGENT_DEFINITION ?? "?"
+            { text: "?" },
+            {
+              text: process.env.PI_HERDSMAN_AGENT_DEFINITION && process.env.PI_HERDSMAN_LABEL ? displayIdentity(
+                process.env.PI_HERDSMAN_AGENT_DEFINITION,
+                process.env.PI_HERDSMAN_LABEL
+              ) : process.env.PI_HERDSMAN_AGENT_DEFINITION ?? "?"
+            }
           ],
           ...ownToolsSnapshot(),
           identityOnly: true
@@ -14422,17 +14604,39 @@ function createManagedAgentLeafStatus(options) {
       const activeGeneration = generation;
       context = ctx;
       ctx.ui.setWidget("pi-herdsman", (tui, theme) => {
-        const next = createStatusWidget(() => tui.requestRender(), theme);
+        let next;
+        next = createStatusWidget(
+          () => tui.requestRender(),
+          theme,
+          (intent) => {
+            if (activeGeneration !== generation || ctx !== context || widget !== next || focusInFlight)
+              return;
+            if (!options.focusTarget) return;
+            focusInFlight = true;
+            const isCurrent = () => activeGeneration === generation && ctx === context && widget === next;
+            void options.focusTarget(ctx, intent, isCurrent).catch((error2) => {
+              if (activeGeneration === generation && ctx === context)
+                ctx.ui.notify(
+                  String(error2).replace(/^Error: /u, ""),
+                  "warning"
+                );
+            }).finally(() => {
+              if (activeGeneration === generation) focusInFlight = false;
+            });
+          }
+        );
         next.setSnapshot({
           agents: [],
           stale: false,
           unavailable: true,
           breadcrumb: [
-            "?",
-            process.env.PI_HERDSMAN_AGENT_DEFINITION && process.env.PI_HERDSMAN_LABEL ? displayIdentity(
-              process.env.PI_HERDSMAN_AGENT_DEFINITION,
-              process.env.PI_HERDSMAN_LABEL
-            ) : process.env.PI_HERDSMAN_AGENT_DEFINITION ?? "?"
+            { text: "?" },
+            {
+              text: process.env.PI_HERDSMAN_AGENT_DEFINITION && process.env.PI_HERDSMAN_LABEL ? displayIdentity(
+                process.env.PI_HERDSMAN_AGENT_DEFINITION,
+                process.env.PI_HERDSMAN_LABEL
+              ) : process.env.PI_HERDSMAN_AGENT_DEFINITION ?? "?"
+            }
           ],
           ...ownToolsSnapshot(),
           identityOnly: true
@@ -15131,6 +15335,72 @@ function registerManagedAgentRuntime(pi, options) {
       clearPendingStart: (label, expected) => controller.clearPendingStart(label, expected),
       runtimeForLabel: (label) => controller.runtimeForLabel(label),
       ownToolsSnapshot: () => ({}),
+      focusTarget: async (ctx, intent, isCurrent) => {
+        if (intent.kind !== "session")
+          throw new Error("Manager navigation is unavailable from an Agent.");
+        const signal = controller.sessionSignal();
+        if (!signal) throw new Error("Agent session is no longer active.");
+        const ownerSessionId = ctx.sessionManager.getSessionId();
+        const view = await controller.agentSnapshotView(
+          ctx,
+          scope,
+          signal,
+          true,
+          false
+        );
+        const fresh = buildAgentStatusSnapshot(view, ctx, {
+          scope,
+          listedAgentRecord: controller.listedAgentRecord,
+          runtimeForLabel: controller.runtimeForLabel,
+          environmentIdentity: (context) => managedAgentEnvironmentIdentity(context, options.build),
+          identityFromEnvironment: () => ({
+            definition: process.env.PI_HERDSMAN_AGENT_DEFINITION,
+            label: process.env.PI_HERDSMAN_LABEL
+          }),
+          sameIdentity: sameManagedAgentIdentity,
+          ownToolsSnapshot: () => ({})
+        });
+        const currentIdentity = managedAgentEnvironmentIdentity(
+          ctx,
+          options.build
+        );
+        const breadcrumb = currentIdentity ? statusBreadcrumb(
+          view,
+          currentIdentity,
+          {
+            definition: process.env.PI_HERDSMAN_AGENT_DEFINITION,
+            label: process.env.PI_HERDSMAN_LABEL
+          },
+          sameManagedAgentIdentity
+        ) : [];
+        const statusTarget = fresh.agents.filter(
+          (agent) => agent.sessionId === intent.sessionId
+        );
+        const isAncestor = breadcrumb.some(
+          (segment) => segment.sessionId === intent.sessionId
+        );
+        if (!isCurrent() || signal.aborted || ctx.sessionManager.getSessionId() !== ownerSessionId || statusTarget.length !== 1 && !isAncestor)
+          throw new Error("Agent changed; reopen status.");
+        if (statusTarget.length === 1 && (statusTarget[0].state === "unknown" || statusTarget[0].state === "lost" || statusTarget[0].state === "starting" || !statusTarget[0].paneId))
+          throw new Error("Agent changed; reopen status.");
+        const { agents } = await listAllHerdrAgents(pi, ctx, signal);
+        const live = agents.filter(
+          (agent) => herdrSessionId(agent) === intent.sessionId && typeof agent.pane_id === "string"
+        );
+        if (signal.aborted || !isCurrent() || live.length !== 1 || statusTarget.length === 1 && live[0].pane_id !== statusTarget[0].paneId)
+          throw new Error("Agent changed; reopen status.");
+        const current = await runHerdr(
+          pi,
+          ctx,
+          ["agent", "get", live[0].pane_id],
+          { signal }
+        );
+        if (signal.aborted || !isCurrent() || herdrSessionId(current?.agent) !== intent.sessionId || current?.agent?.pane_id !== live[0].pane_id || current?.agent?.workspace_id !== live[0].workspace_id || current?.agent?.tab_id !== live[0].tab_id)
+          throw new Error("Agent changed; reopen status.");
+        await runHerdr(pi, ctx, ["agent", "focus", current.agent.pane_id], {
+          signal
+        });
+      },
       loadSnapshot: async (ctx) => {
         const view = await controller.agentSnapshotView(
           ctx,
@@ -15187,7 +15457,52 @@ This is the session-start definition snapshot. Use list_agents for live Agent st
     ),
     identity: (ctx) => managedAgentEnvironmentIdentity(ctx, options.build),
     sameIdentity: sameManagedAgentIdentity,
-    signal: () => metadataPublisher.signal
+    signal: () => metadataPublisher.signal,
+    focusTarget: async (ctx, intent, isCurrent) => {
+      if (intent.kind !== "session")
+        throw new Error("Manager navigation is unavailable from an Agent.");
+      const signal = metadataPublisher.signal;
+      const sessionId = ctx.sessionManager.getSessionId();
+      const snapshot = await managedAgentSnapshots(
+        pi,
+        ctx,
+        options.controllerOptions.snapshotDependencies,
+        signal,
+        true,
+        false,
+        void 0,
+        false
+      );
+      const identity = managedAgentEnvironmentIdentity(ctx, options.build);
+      const breadcrumb = identity ? statusBreadcrumb(
+        snapshot,
+        identity,
+        {
+          definition: process.env.PI_HERDSMAN_AGENT_DEFINITION,
+          label: process.env.PI_HERDSMAN_LABEL
+        },
+        sameManagedAgentIdentity
+      ) : [];
+      if (signal?.aborted || !isCurrent() || ctx.sessionManager.getSessionId() !== sessionId || !breadcrumb.some((segment) => segment.sessionId === intent.sessionId))
+        throw new Error("Agent ancestry changed; reopen status.");
+      const { agents } = await listAllHerdrAgents(pi, ctx, signal);
+      const matches = agents.filter(
+        (agent) => herdrSessionId(agent) === intent.sessionId && typeof agent.pane_id === "string"
+      );
+      if (signal?.aborted || !isCurrent() || matches.length !== 1)
+        throw new Error("Agent changed; reopen status.");
+      const current = await runHerdr(
+        pi,
+        ctx,
+        ["agent", "get", matches[0].pane_id],
+        { signal }
+      );
+      if (signal?.aborted || !isCurrent() || herdrSessionId(current?.agent) !== intent.sessionId || current?.agent?.pane_id !== matches[0].pane_id || current?.agent?.workspace_id !== matches[0].workspace_id || current?.agent?.tab_id !== matches[0].tab_id)
+        throw new Error("Agent changed; reopen status.");
+      await runHerdr(pi, ctx, ["agent", "focus", current.agent.pane_id], {
+        signal
+      });
+    }
   });
   const mutateAgentState = (update) => {
     const state = execution.assignment;
@@ -16196,6 +16511,12 @@ function createLeadSessionStartRuntime(host) {
         }
       }
       if (sessionSignal.aborted) return;
+      if (host.roleTransitions.activeManager())
+        await host.publishLeadRole(
+          ctx,
+          "inactive",
+          host.roleTransitions.currentRoleGeneration()
+        );
       if (needsLeadRoster) {
         try {
           const definitions = await host.visibleAgentDefinitionMetadata(
@@ -16266,6 +16587,7 @@ This is the session-start definition snapshot. Use list_agents for live Agent st
       host.herdRun.agentStarted();
     },
     async agentSettled(ctx, aborted) {
+      host.leadInboxRuntime.agentSettled();
       host.controller.settleAsks(ctx, host.controller.sessionSignal());
       host.herdRun.agentSettled(ctx, aborted);
       await host.controller.settleResults(ctx, host.controller.sessionSignal()).catch(() => {
@@ -17145,41 +17467,67 @@ function registerLeadRuntime(pi, options) {
   };
   const roleHost = options.roleTransitionHost;
   let leadMetadataQueue = Promise.resolve();
-  const publishLeadRole = (ctx, mode, generation) => {
-    const paneId = roleHost.paneId();
-    if (!paneId) return Promise.resolve();
-    const activeRole = () => activeLeadRole(leadRuntime);
-    const leadName = mode === "inactive" && activeRole() === "lead" ? roleHost.getSessionName()?.trim() : void 0;
-    const args = [
-      "pane",
-      "report-metadata",
-      paneId,
-      "--source",
-      "pi-herdsman:lead",
-      "--title",
-      mode === "active" ? "chief" : activeRole() === "manager" ? "Pi Herdsman manager" : leadName || "Pi Herdsman lead",
-      ...mode === "active" ? ["--token", "pi_herdsman_role=chief"] : mode === "inactive" ? ["--token", `pi_herdsman_role=${activeRole()}`] : ["--clear-token", "pi_herdsman_role"]
-    ];
-    if (mode === "inactive" && activeRole() === "lead")
-      args.push(
-        leadName ? "--token" : "--clear-token",
-        leadName ? `pi_herdsman_name=${leadName}` : "pi_herdsman_name"
-      );
-    if (mode !== "inactive" || activeRole() !== "lead")
-      args.push(
-        "--clear-token",
-        "pi_herdsman_herd_run_started_at",
-        "--clear-token",
-        "pi_herdsman_context_percent"
-      );
+  let reportedRoleMetadataFailure;
+  const publishLeadRole = (ctx, _mode, generation) => {
+    const sessionId = ctx.sessionManager.getSessionId();
+    const sessionGeneration = leadRuntime.sessionGeneration;
+    const failureKey = `${sessionId}:${sessionGeneration}:${generation}`;
     leadMetadataQueue = leadMetadataQueue.catch(() => {
     }).then(async () => {
-      if (generation !== leadRuntime.chiefModeGeneration) return;
+      if (generation !== leadRuntime.chiefModeGeneration || sessionGeneration !== leadRuntime.sessionGeneration || sessionId !== ctx.sessionManager.getSessionId())
+        return;
+      const paneId = roleHost.paneId();
+      if (!paneId) return;
+      const role2 = leadRuntime.chiefMode === "active" ? "chief" : leadRuntime.controllerRole === "manager" && !leadRuntime.roleSuspended ? "manager" : leadRuntime.roleSuspended ? void 0 : "lead";
+      const leadName = role2 === "lead" ? roleHost.getSessionName()?.trim() : void 0;
+      const args = [
+        "pane",
+        "report-metadata",
+        paneId,
+        "--source",
+        "pi-herdsman:lead",
+        "--title",
+        role2 === "chief" ? "chief" : role2 === "manager" ? "Pi Herdsman manager" : leadName || "Pi Herdsman lead",
+        ...role2 ? ["--token", `pi_herdsman_role=${role2}`] : ["--clear-token", "pi_herdsman_role"]
+      ];
+      if (role2 === "lead")
+        args.push(
+          leadName ? "--token" : "--clear-token",
+          leadName ? `pi_herdsman_name=${leadName}` : "pi_herdsman_name"
+        );
+      else
+        args.push(
+          "--clear-token",
+          "pi_herdsman_name",
+          "--clear-token",
+          "pi_herdsman_ask"
+        );
+      if (role2 !== "lead")
+        args.push(
+          "--clear-token",
+          "pi_herdsman_herd_run_started_at",
+          "--clear-token",
+          "pi_herdsman_context_percent"
+        );
       await roleHost.runHerdr(pi, ctx, args, {
         noResult: true,
         timeout: 1e4
       });
-    }).catch(() => {
+      reportedRoleMetadataFailure = void 0;
+    }).catch((error2) => {
+      if (sessionGeneration !== leadRuntime.sessionGeneration || sessionId !== ctx.sessionManager.getSessionId())
+        return;
+      if (reportedRoleMetadataFailure === failureKey) return;
+      reportedRoleMetadataFailure = failureKey;
+      try {
+        roleHost.appendDurableError(
+          pi,
+          ctx,
+          "pi_herdsman_state_error",
+          error2
+        );
+      } catch {
+      }
     });
     return leadMetadataQueue;
   };
@@ -17192,8 +17540,30 @@ function registerLeadRuntime(pi, options) {
       );
       return;
     }
+    const sessionId = ctx.sessionManager.getSessionId();
+    const sessionGeneration = leadRuntime.sessionGeneration;
     leadMetadataQueue = leadMetadataQueue.catch(() => {
-    }).then(() => roleHost.reportLeadMetadata(pi, ctx, metadata)).catch(() => {
+    }).then(() => {
+      if (sessionGeneration !== leadRuntime.sessionGeneration || sessionId !== ctx.sessionManager.getSessionId() || leadRuntime.controllerRole !== "lead" || leadRuntime.roleSuspended)
+        return;
+      return roleHost.reportLeadMetadata(pi, ctx, metadata).then(() => {
+        reportedRoleMetadataFailure = void 0;
+      });
+    }).catch((error2) => {
+      if (sessionGeneration !== leadRuntime.sessionGeneration || sessionId !== ctx.sessionManager.getSessionId())
+        return;
+      const failureKey = `${sessionId}:${sessionGeneration}:${leadRuntime.chiefModeGeneration}`;
+      if (reportedRoleMetadataFailure === failureKey) return;
+      reportedRoleMetadataFailure = failureKey;
+      try {
+        roleHost.appendDurableError(
+          pi,
+          ctx,
+          "pi_herdsman_state_error",
+          error2
+        );
+      } catch {
+      }
     });
   };
   const persistRole = (role2) => {
@@ -17408,13 +17778,88 @@ function registerLeadRuntime(pi, options) {
     const execution = isLead && assignmentVerified ? assignment ? { kind: "managed" } : leadExecution?.valid ? { kind: "ordinary", mode: leadExecution.mode } : void 0 : void 0;
     return { ...snapshot, ...execution ? { execution } : {} };
   };
+  const focusTarget = async (ctx, intent, isCurrent) => {
+    const sessionId = ctx.sessionManager.getSessionId();
+    const signal = controller.sessionSignal();
+    const current = () => !!signal && !signal.aborted && isCurrent() && ctx.sessionManager.getSessionId() === sessionId && activeLeadRole(options.leadRuntime) === "lead" && !options.leadRuntime.roleSuspended;
+    if (!current()) throw new Error("Navigation is no longer available.");
+    if (intent.kind === "assigned-manager") {
+      const scope = await roleTransitions.currentWorktreeScope(ctx);
+      if (!current() || !scope)
+        throw new Error("Managed project assignment changed.");
+      const assignment = roleTransitions.projectAssignmentForScope(
+        scope,
+        sessionId
+      );
+      const manager = await roleTransitions.currentManager(ctx);
+      if (!current() || !assignment || !manager || manager.repoKey !== assignment.repoKey)
+        throw new Error("Managed project Manager is unavailable.");
+      const target2 = await verifiedHerdrAgent(manager, {
+        listAgents: async () => (await options.identityHost.listAgents(ctx)).agents,
+        getAgent: async (paneId) => (await options.identityHost.getAgent(ctx, paneId))?.agent,
+        expectedSession: options.identityHost.expectedSession,
+        isPiAgent: options.identityHost.isPiAgent,
+        matchesExpectedSession: options.identityHost.matchesExpectedSession
+      });
+      const currentManager = await roleTransitions.currentManager(ctx);
+      const currentScope = await roleTransitions.currentWorktreeScope(ctx);
+      const currentAssignment = currentScope ? roleTransitions.projectAssignmentForScope(currentScope, sessionId) : void 0;
+      if (!current() || !target2 || !currentAssignment || currentAssignment.id !== assignment.id || currentAssignment.repoKey !== assignment.repoKey || currentAssignment.branch !== assignment.branch || !currentManager || currentManager.repoKey !== assignment.repoKey || !options.projectHost.sameManagerDescriptor(currentManager, manager))
+        throw new Error("Managed project Manager changed.");
+      await options.commandHost.runHerdr(
+        pi,
+        ctx,
+        ["agent", "focus", target2.pane_id],
+        {
+          signal
+        }
+      );
+      return;
+    }
+    const fresh = await loadStatusSnapshot(ctx, signal, false);
+    const matches = fresh.agents.filter(
+      (agent) => agent.sessionId === intent.sessionId && agent.state !== "lost" && agent.state !== "unknown" && agent.state !== "starting" && !!agent.paneId
+    );
+    if (!current() || fresh.stale || fresh.unavailable || matches.length !== 1)
+      throw new Error("Agent changed; reopen Running.");
+    const target = matches[0];
+    const live = await identityRuntime.liveAgent(ctx, target.sessionId);
+    if (!current() || live.length !== 1 || live[0].pane_id !== target.paneId)
+      throw new Error("Agent changed; reopen Running.");
+    const verified = await verifiedHerdrAgent(
+      {
+        piSessionId: target.sessionId,
+        paneId: target.paneId,
+        tabId: live[0].tab_id,
+        workspaceId: live[0].workspace_id
+      },
+      {
+        listAgents: async () => (await options.identityHost.listAgents(ctx)).agents,
+        getAgent: async (paneId) => (await options.identityHost.getAgent(ctx, paneId))?.agent,
+        expectedSession: options.identityHost.expectedSession,
+        isPiAgent: options.identityHost.isPiAgent,
+        matchesExpectedSession: options.identityHost.matchesExpectedSession
+      }
+    );
+    if (!current() || !verified)
+      throw new Error("Agent changed; reopen Running.");
+    await options.commandHost.runHerdr(
+      pi,
+      ctx,
+      ["agent", "focus", verified.pane_id],
+      {
+        signal
+      }
+    );
+  };
   statusRuntime.configure({
     ...options.statusSnapshotHost,
     pendingStartEntries: () => controller.pendingStartEntries(),
     hasPendingStart: (label) => controller.hasPendingStart(label),
     clearPendingStart: (label, expected) => controller.clearPendingStart(label, expected),
     loadSnapshot: (ctx) => loadStatusSnapshot(ctx, controller.sessionSignal(), false),
-    runtimeForLabel: (label) => controller.runtimeForLabel(label)
+    runtimeForLabel: (label) => controller.runtimeForLabel(label),
+    focusTarget
   });
   let projectRuntime;
   const projectHost = options.projectHost;
@@ -18218,6 +18663,8 @@ function createLeadSupervisionRuntime(host) {
   let overviewGeneration = 0;
   let renderOverview;
   let renderWidget;
+  let widgetFocusInFlight = false;
+  let supervisionWidgetGeneration = 0;
   const generation = (ctx) => [
     host.state.chiefModeGeneration,
     host.state.sessionGeneration,
@@ -18286,6 +18733,108 @@ function createLeadSupervisionRuntime(host) {
     });
     return inFlight;
   };
+  const focusLead = async (ctx, leadId, parentManagerSessionId, isCurrent = () => true) => {
+    const currentGeneration = generation(ctx);
+    const fresh = await loadSnapshot(ctx);
+    if (!isCurrent() || currentGeneration !== generation(ctx))
+      throw new Error("Lead changed; reopen staff.");
+    if (host.activeRole() === "manager" && host.managerSupervisionItems(fresh).filter(
+      (item) => item.kind === "lead" ? item.lead.lead === leadId : item.work.status === "active" && item.lead?.lead === leadId
+    ).length !== 1)
+      throw new Error("Lead is no longer available.");
+    const managers = host.listManagerDescriptors(host.supervisionRuntime());
+    const verifyManager = async (sessionId, report) => {
+      const candidates = managers.filter(
+        (candidate) => candidate.piSessionId === sessionId
+      );
+      if (candidates.length !== 1) return void 0;
+      const descriptor = candidates[0];
+      const agents = await host.listAllHerdrAgents(host.pi, ctx, ctx.signal);
+      const placements = agents.agents.filter(
+        (candidate) => host.isPiAgent(candidate) && host.herdrSessionId(candidate) === sessionId && candidate.pane_id === descriptor.paneId && candidate.tab_id === descriptor.tabId && candidate.workspace_id === descriptor.workspaceId && (!report || report.paneId === descriptor.paneId && report.tabId === descriptor.tabId && report.workspaceId === descriptor.workspaceId)
+      );
+      return placements.length === 1 ? { descriptor, paneId: descriptor.paneId } : void 0;
+    };
+    let lead;
+    let parent;
+    let verifiedParent;
+    if (parentManagerSessionId) {
+      parent = host.presentationReports(fresh).find(
+        (candidate) => candidate.role === "manager" && candidate.lead === parentManagerSessionId
+      );
+      const children = parent?.leads?.filter(
+        (candidate) => candidate.session === leadId
+      );
+      if (!parent || children?.length !== 1)
+        throw new Error("Lead changed; reopen staff.");
+      lead = { lead: leadId };
+    } else {
+      const matches2 = host.presentationReports(fresh).filter((candidate) => candidate.lead === leadId);
+      if (matches2.length !== 1) throw new Error("Lead changed; reopen staff.");
+      lead = matches2[0];
+    }
+    if (parent || lead.role === "manager") {
+      const managerSessionId = parent?.lead ?? lead.lead;
+      const report = parent ?? lead;
+      const manager = await verifyManager(managerSessionId, report);
+      if (!manager || !isCurrent() || currentGeneration !== generation(ctx))
+        throw new Error("Manager changed; reopen staff.");
+      verifiedParent = manager.descriptor;
+      if (!parent) {
+        const currentManagers = host.listManagerDescriptors(host.supervisionRuntime()).filter((descriptor) => descriptor.piSessionId === managerSessionId);
+        if (!isCurrent() || currentManagers.length !== 1 || !host.sameManagerDescriptor(currentManagers[0], manager.descriptor))
+          throw new Error("Manager changed; reopen staff.");
+        const currentAgent2 = await host.runHerdr(
+          host.pi,
+          ctx,
+          ["agent", "get", manager.paneId],
+          { signal: ctx.signal }
+        );
+        if (!isCurrent() || host.herdrSessionId(currentAgent2?.agent) !== managerSessionId || currentAgent2?.agent?.pane_id !== manager.paneId || currentAgent2?.agent?.tab_id !== manager.descriptor.tabId || currentAgent2?.agent?.workspace_id !== manager.descriptor.workspaceId)
+          throw new Error("Manager changed; reopen staff.");
+        const finalManagers = host.listManagerDescriptors(host.supervisionRuntime()).filter((descriptor) => descriptor.piSessionId === managerSessionId);
+        if (!isCurrent() || finalManagers.length !== 1 || !host.sameManagerDescriptor(finalManagers[0], manager.descriptor))
+          throw new Error("Manager changed; reopen staff.");
+        await host.runHerdr(host.pi, ctx, ["agent", "focus", manager.paneId], {
+          signal: ctx.signal
+        });
+        return;
+      }
+    }
+    const coordination = host.readLeadCoordinationState(
+      host.supervisionRuntime(),
+      leadId
+    );
+    if (!coordination || coordination.piSessionId !== leadId || lead.instanceId !== void 0 && coordination.instanceId !== lead.instanceId)
+      throw new Error("Lead changed; reopen staff.");
+    const verified = await host.listAllHerdrAgents(host.pi, ctx, ctx.signal);
+    if (!isCurrent() || currentGeneration !== generation(ctx))
+      throw new Error("Lead changed; reopen staff.");
+    const matches = verified.agents.filter(
+      (candidate) => host.isPiAgent(candidate) && host.herdrSessionId(candidate) === leadId && typeof candidate?.pane_id === "string" && (parentManagerSessionId || candidate?.pane_id === lead.paneId && candidate?.tab_id === lead.tabId && candidate?.workspace_id === lead.workspaceId)
+    );
+    if (matches.length !== 1) throw new Error("Lead changed; reopen staff.");
+    if (currentGeneration !== generation(ctx) || !isCurrent() || verifiedParent && !host.listManagerDescriptors(host.supervisionRuntime()).some(
+      (descriptor) => host.sameManagerDescriptor(descriptor, verifiedParent)
+    ))
+      throw new Error("Manager changed; reopen staff.");
+    const currentAgent = await host.runHerdr(
+      host.pi,
+      ctx,
+      ["agent", "get", matches[0].pane_id],
+      { signal: ctx.signal }
+    );
+    if (!isCurrent() || host.herdrSessionId(currentAgent?.agent) !== leadId || currentAgent?.agent?.pane_id !== matches[0].pane_id || currentAgent?.agent?.workspace_id !== matches[0].workspace_id || currentAgent?.agent?.tab_id !== matches[0].tab_id)
+      throw new Error("Lead changed; reopen staff.");
+    await host.runHerdr(
+      host.pi,
+      ctx,
+      ["agent", "focus", currentAgent.agent.pane_id],
+      {
+        signal: ctx.signal
+      }
+    );
+  };
   const nextOverviewGeneration = () => ++overviewGeneration;
   const openOverview = async (ctx, uiActions) => {
     if (ctx.mode !== "tui") {
@@ -18591,25 +19140,7 @@ function createLeadSupervisionRuntime(host) {
     openOverview,
     loadSnapshot: loadSupervisionSnapshot,
     directReports,
-    focusLead: async (ctx, leadId) => {
-      const fresh = await loadSnapshot(ctx);
-      const lead = host.presentationReports(fresh).find((candidate) => candidate.lead === leadId);
-      if (!lead) throw new Error("Lead changed; reopen staff.");
-      const coordination = host.readLeadCoordinationState(
-        host.supervisionRuntime(),
-        lead.lead
-      );
-      if (!coordination || coordination.piSessionId !== lead.lead || lead.instanceId !== void 0 && coordination.instanceId !== lead.instanceId)
-        throw new Error("Lead changed; reopen staff.");
-      const verified = await host.listAllHerdrAgents(host.pi, ctx, ctx.signal);
-      const matches = verified.agents.filter(
-        (candidate) => candidate?.pane_id === lead.paneId && candidate?.tab_id === lead.tabId && candidate?.workspace_id === lead.workspaceId && host.isPiAgent(candidate) && host.herdrSessionId(candidate) === lead.lead
-      );
-      if (matches.length !== 1) throw new Error("Lead changed; reopen staff.");
-      await host.runHerdr(host.pi, ctx, ["agent", "focus", lead.paneId], {
-        signal: ctx.signal
-      });
-    },
+    focusLead,
     focusChief: async (ctx) => {
       const confirmed = await ctx.ui.confirm(
         "Focus Chief?",
@@ -18655,13 +19186,35 @@ function createLeadSupervisionRuntime(host) {
     registerWidget: (ctx, role2) => {
       if (ctx.mode !== "tui" || !ctx.hasUI) return;
       try {
+        const widgetGeneration = ++supervisionWidgetGeneration;
         ctx.ui.setWidget("pi-herdsman-staff", (tui, theme) => {
           renderWidget = () => tui.requestRender();
           return createSupervisionWidget(
             () => snapshot,
             () => status(ctx),
             role2,
-            theme
+            theme,
+            (intent) => {
+              if (widgetFocusInFlight || widgetGeneration !== supervisionWidgetGeneration || generation(ctx) !== generationId || status(ctx) !== "fresh")
+                return;
+              if (intent.kind !== "session") return;
+              widgetFocusInFlight = true;
+              const isCurrent = () => widgetGeneration === supervisionWidgetGeneration && uiContext === ctx && generation(ctx) === generationId;
+              void focusLead(
+                ctx,
+                intent.sessionId,
+                intent.parentSessionId,
+                isCurrent
+              ).catch((error2) => {
+                if (isCurrent())
+                  ctx.ui.notify(
+                    String(error2).replace(/^Error: /u, ""),
+                    "warning"
+                  );
+              }).finally(() => {
+                widgetFocusInFlight = false;
+              });
+            }
           );
         });
       } catch {
@@ -18670,6 +19223,8 @@ function createLeadSupervisionRuntime(host) {
       }
     },
     removeWidget: (ctx) => {
+      supervisionWidgetGeneration++;
+      widgetFocusInFlight = false;
       try {
         ctx.ui.setWidget("pi-herdsman-staff", void 0);
       } catch {
@@ -20593,6 +21148,8 @@ function createLeadInboxRuntime(host) {
   let chiefInboxTimer;
   let chiefInboxGeneration = 0;
   let chiefInboxAbortController;
+  let currentSubmittedAt;
+  let settledSubmissions = /* @__PURE__ */ new Set();
   const chiefStartPreflights = [];
   const {
     leadRuntime,
@@ -20651,7 +21208,7 @@ function createLeadInboxRuntime(host) {
     );
     if (index >= 0) chiefStartPreflights.splice(index, 1);
   };
-  const messageDelivered = (ctx, record) => record.toSessionId === ctx.sessionManager.getSessionId() && ctx.sessionManager.getBranch().some(
+  const messageDelivered = (ctx, record) => record.toSessionId === ctx.sessionManager.getSessionId() && ctx.sessionManager.getEntries().some(
     (entry) => entry?.customType === `pi-herdsman-${record.kind}` && entry?.details?.id === record.id && entry?.details?.leaseId === record.leaseId && entry?.details?.fromSessionId === record.fromSessionId && entry?.details?.leadSessionId === record.leadSessionId && entry?.details?.branch === record.branch
   );
   const projectAssignmentAuthorized = (authorized, reason) => {
@@ -20790,11 +21347,25 @@ function createLeadInboxRuntime(host) {
       return !!chief && !!state2 && chief.piSessionId === record.fromSessionId && chief.leaseId === record.leaseId && record.leadSessionId === sessionId;
     }
     const scope = await host.currentWorktreeScope(ctx);
-    if (!scope || !host.projectAssignmentForScope(scope, sessionId))
-      return false;
+    if (!scope) throw new Error("Project scope cannot be verified");
+    if (!host.projectAssignmentForScope(scope, sessionId)) return false;
     const manager = await currentManager(ctx, scope);
-    const state = readLeadCoordinationState2(supervisionRuntime2(), sessionId);
-    return !!manager && !!state && record.leaseId === manager.leaseId && record.fromSessionId === manager.piSessionId && record.leadSessionId === sessionId && record.kind === "manager_message";
+    let state;
+    try {
+      state = readLeadCoordinationState2(supervisionRuntime2(), sessionId);
+    } catch (error2) {
+      const cause = error2 instanceof Error ? error2.cause : void 0;
+      if (cause instanceof SyntaxError || cause instanceof Error && ["invalid lead state", "lead state too large"].includes(
+        cause.message
+      ))
+        return false;
+      throw error2;
+    }
+    if (!manager)
+      throw new Error("Manager authority is temporarily unavailable");
+    if (!state)
+      throw new Error("Lead coordination state is temporarily unavailable");
+    return (state.role ?? "lead") === "lead" && record.leaseId === manager.leaseId && record.fromSessionId === manager.piSessionId && record.leadSessionId === sessionId && record.kind === "manager_message";
   };
   const startChiefInbox = (ctx) => {
     const generation = ++chiefInboxGeneration;
@@ -20805,6 +21376,9 @@ function createLeadInboxRuntime(host) {
     const isCurrent = () => generation === chiefInboxGeneration && !chiefInboxAbortController?.signal.aborted;
     if (chiefInboxTimer) clearTimeout(chiefInboxTimer);
     const transactions = /* @__PURE__ */ new Map();
+    const submittedAt = /* @__PURE__ */ new Map();
+    currentSubmittedAt = submittedAt;
+    settledSubmissions = /* @__PURE__ */ new Set();
     const revalidateTransaction = (token, phase) => {
       const transaction = token;
       if (transaction?.generation !== chiefInboxGeneration || transaction.sessionId !== ctx.sessionManager.getSessionId() || transaction.instanceId !== getLeadInstanceId() || chiefInboxAbortController?.signal.aborted || chiefInboxAbortController?.signal !== transaction.signal || leadRuntime.chiefMode !== transaction.role || transaction.role === "active" && chiefStartPreflightHeld(ctx) || transaction.role === "inactive" && (!coordinationHealthy() || leadRuntime.roleSuspended)) {
@@ -20823,6 +21397,13 @@ function createLeadInboxRuntime(host) {
           appendDurableError2(pi, ctx, "pi_herdsman_state_error", error2);
         },
         deliveryMode: (record) => {
+          const attempted = submittedAt.get(record.id);
+          if (attempted !== void 0 && !messageDelivered(ctx, record)) {
+            const elapsed = Date.now() - attempted;
+            const settled = settledSubmissions.has(record.id);
+            if (!ctx.isIdle() || ctx.hasPendingMessages() || elapsed < (settled ? 1e3 : 3e4))
+              return void 0;
+          }
           const role2 = activeRole();
           const supervisorDownlink = role2 === "lead" && (record.kind === "chief_message" || record.kind === "manager_message") || role2 === "manager" && record.kind === "chief_message";
           if (supervisorDownlink) return "steer";
@@ -20921,7 +21502,17 @@ function createLeadInboxRuntime(host) {
               };
             }
             importResultBindings2(pi, ctx, resultBindings, record.kind);
-            const result = await pi.sendMessage(payload, options);
+            if (messageDelivered(ctx, record)) return;
+            let result;
+            try {
+              result = pi.sendMessage(payload, options);
+            } catch (error2) {
+              submittedAt.delete(record.id);
+              settledSubmissions.delete(record.id);
+              throw error2;
+            }
+            submittedAt.set(record.id, Date.now());
+            settledSubmissions.delete(record.id);
             if (projectAssignment)
               managerDiagnostic("project_assignment_send", {
                 outcome: "resolved",
@@ -20967,9 +21558,13 @@ function createLeadInboxRuntime(host) {
               }
           }
         },
-        accepted: async (_record) => {
+        accepted: async (record) => {
+          submittedAt.delete(record.id);
+          settledSubmissions.delete(record.id);
         },
         rejected: (record) => {
+          submittedAt.delete(record.id);
+          settledSubmissions.delete(record.id);
           if (!record.build || !sameRuntimeBuild2(record.build, HERDSMAN_BUILD2))
             ctx.ui.notify(
               record.build ? `Rejected Pi Herdsman coordination from ${formatRuntimeBuild2(record.build)}; local build is ${formatRuntimeBuild2(HERDSMAN_BUILD2)}. Restart the stale Pi session.` : "Rejected coordination from a Pi Herdsman runtime without build identity. Restart the stale Pi session.",
@@ -21084,9 +21679,15 @@ function createLeadInboxRuntime(host) {
     },
     clearTimer,
     beginSession: () => {
+      currentSubmittedAt?.clear();
+      settledSubmissions.clear();
       chiefInboxAbortController?.abort();
       chiefInboxAbortController = new AbortController();
     },
+    agentSettled: () => {
+      for (const id of currentSubmittedAt?.keys() ?? [])
+        settledSubmissions.add(id);
+    },
     beginShutdown: () => {
       chiefInboxGeneration++;
       clearTimer();
@@ -22426,6 +23027,7 @@ function createLeadRoleTransitions(state, host) {
     suspendMalformedRole,
     shouldRestoreChief: (persistedRole) => persistedRole === "chief" && state.controllerRole === "lead" && !state.roleSuspended,
     activeChiefGeneration: () => state.chiefMode === "active" ? state.chiefModeGeneration : void 0,
+    currentRoleGeneration: () => state.chiefModeGeneration,
     mayPublishLeadPresence: () => state.chiefMode === "inactive" && !state.roleSuspended && host.coordinationHealthy(),
     canStartChiefInbox: () => !state.roleSuspended && (state.chiefMode === "inactive" || state.chiefMode === "active") && (state.chiefMode === "active" || host.coordinationHealthy()),
     activeManager: () => state.controllerRole === "manager" && !state.roleSuspended,
@@ -23298,12 +23900,14 @@ ${globalInstructions}
       definitionRoster: () => startupDefinitionRoster,
       isStaffTool: (name) => STAFF_TOOLS.includes(name)
     };
-    const initialStatusBreadcrumb = controllerScope.kind === "lead" ? ["lead"] : [
-      "?",
-      process.env.PI_HERDSMAN_AGENT_DEFINITION && process.env.PI_HERDSMAN_LABEL ? displayIdentity(
-        process.env.PI_HERDSMAN_AGENT_DEFINITION,
-        process.env.PI_HERDSMAN_LABEL
-      ) : process.env.PI_HERDSMAN_AGENT_DEFINITION ?? "?"
+    const initialStatusBreadcrumb = controllerScope.kind === "lead" ? [{ text: "lead" }] : [
+      { text: "?" },
+      {
+        text: process.env.PI_HERDSMAN_AGENT_DEFINITION && process.env.PI_HERDSMAN_LABEL ? displayIdentity(
+          process.env.PI_HERDSMAN_AGENT_DEFINITION,
+          process.env.PI_HERDSMAN_LABEL
+        ) : process.env.PI_HERDSMAN_AGENT_DEFINITION ?? "?"
+      }
     ];
     let ownTools;
     const ownToolsSnapshot = () => ownTools ? { ownTools } : {};