pi-herdsman 0.22.0 → 0.22.1

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.22.0",
+  version: "0.22.1",
   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",
@@ -302,6 +302,7 @@ import {
   rmdirSync as rmdirSync2,
   statSync,
   unlinkSync as unlinkSync2,
+  watch,
   writeSync as writeSync2
 } from "node:fs";
 import { basename as basename2, dirname as dirname2, join as join3 } from "node:path";
@@ -568,6 +569,64 @@ var LIMITS = {
   result: 4 * 1024 * 1024
 };
 var root = join3(herdsmanDataRoot(), "runtime", "mailboxes-v5");
+function observeMailbox(directory, relevant, reconcile, onError) {
+  let watcher;
+  let scheduled;
+  let stopped = false;
+  let errorReported = false;
+  const schedule = () => {
+    if (stopped || scheduled) return;
+    scheduled = setImmediate(() => {
+      scheduled = void 0;
+      if (stopped) return;
+      try {
+        reconcile();
+      } catch (error2) {
+        onError(error2);
+      }
+    });
+  };
+  const attach = () => {
+    if (stopped || watcher) return;
+    try {
+      const next = watch(
+        directory,
+        { persistent: false },
+        (_event, filename) => {
+          const name = filename?.toString();
+          if (!name || relevant(name)) schedule();
+        }
+      );
+      next.on("error", (error2) => {
+        next.close();
+        if (watcher === next) watcher = void 0;
+        if (!stopped && !errorReported) {
+          errorReported = true;
+          onError(error2);
+        }
+      });
+      watcher = next;
+    } catch (error2) {
+      if (!errorReported) {
+        errorReported = true;
+        onError(error2);
+      }
+    }
+  };
+  attach();
+  const timer = setInterval(() => {
+    attach();
+    schedule();
+  }, 1e3);
+  timer.unref?.();
+  return () => {
+    stopped = true;
+    clearInterval(timer);
+    if (scheduled) clearImmediate(scheduled);
+    watcher?.close();
+    watcher = void 0;
+  };
+}
 function agentMailboxPath(workspaceId, agentLabel) {
   return join3(
     root,
@@ -2144,16 +2203,51 @@ var MAX_PROCESS_CMDLINE_BYTES = 4 * 1024;
 var POLL_INTERVAL = 75;
 var INITIAL_RATIO = 0.65;
 var AGENT_SPLIT_RATIO = 0.5;
-var LIFECYCLE_SUBSCRIPTIONS = [
+var HERDR_EVENT_SUBSCRIPTIONS = [
+  { type: "workspace.created" },
+  { type: "workspace.updated" },
+  { type: "workspace.metadata_updated" },
+  { type: "workspace.renamed" },
+  { type: "pane.created" },
   { type: "pane.closed" },
   { type: "pane.exited" },
   { type: "pane.moved" },
+  { type: "pane.updated" },
+  { type: "pane.agent_detected" },
+  { type: "pane.agent_status_changed" },
+  { type: "tab.created" },
   { type: "tab.closed" },
+  { type: "tab.renamed" },
   { type: "workspace.closed" },
+  { type: "worktree.created" },
+  { type: "worktree.opened" },
   { type: "worktree.removed" }
 ];
-var LIFECYCLE_SUBSCRIPTION_ID = "pi-herdsman:lifecycle";
-var LIFECYCLE_RECONNECT_MS = 1e3;
+var HERDR_EVENT_SUBSCRIPTION_ID = "pi-herdsman:events";
+var HERDR_EVENT_RECONNECT_MS = 1e3;
+var PRESENTATION_MIN_INTERVAL_MS = 2e3;
+var LIFECYCLE_EVENTS = /* @__PURE__ */ new Set([
+  "workspace_created",
+  "workspace_closed",
+  "pane_created",
+  "pane_closed",
+  "pane_exited",
+  "pane_moved",
+  "tab_created",
+  "tab_closed",
+  "worktree_created",
+  "worktree_opened",
+  "worktree_removed"
+]);
+var PRESENTATION_EVENTS = /* @__PURE__ */ new Set([
+  "workspace_updated",
+  "workspace_metadata_updated",
+  "workspace_renamed",
+  "pane_updated",
+  "pane_agent_detected",
+  "pane_agent_status_changed",
+  "tab_renamed"
+]);
 var MAX_EVENT_BUFFER_BYTES = 1024 * 1024;
 var HERDR_AGENT_STATE_EXTENSION = join5(
   getAgentDir3(),
@@ -2493,10 +2587,31 @@ async function herdrSessionSnapshot(pi, ctx, signal) {
 function watchHerdrLifecycle(socketPath2, signal, onChange) {
   let socket;
   let retry;
+  let presentationTimer;
+  let nextPresentationAt = 0;
+  const invalidatePresentation = () => {
+    if (presentationTimer || signal.aborted) return;
+    presentationTimer = setTimeout(
+      () => {
+        presentationTimer = void 0;
+        if (signal.aborted) return;
+        nextPresentationAt = Date.now() + PRESENTATION_MIN_INTERVAL_MS;
+        onChange(void 0, "presentation");
+      },
+      Math.max(0, nextPresentationAt - Date.now())
+    );
+    presentationTimer.unref?.();
+  };
+  const flushPresentation = () => {
+    if (presentationTimer) clearTimeout(presentationTimer);
+    presentationTimer = void 0;
+    nextPresentationAt = Date.now() + PRESENTATION_MIN_INTERVAL_MS;
+  };
   const connect = () => {
     if (signal.aborted) return;
     let buffer = "";
     let subscribed = false;
+    let disconnectReported = false;
     const current = createConnection(socketPath2);
     socket = current;
     current.setEncoding("utf8");
@@ -2508,9 +2623,9 @@ function watchHerdrLifecycle(socketPath2, signal, onChange) {
     current.once("connect", () => {
       current.write(
         `${JSON.stringify({
-          id: LIFECYCLE_SUBSCRIPTION_ID,
+          id: HERDR_EVENT_SUBSCRIPTION_ID,
           method: "events.subscribe",
-          params: { subscriptions: LIFECYCLE_SUBSCRIPTIONS }
+          params: { subscriptions: HERDR_EVENT_SUBSCRIPTIONS }
         })}
 `
       );
@@ -2534,23 +2649,45 @@ function watchHerdrLifecycle(socketPath2, signal, onChange) {
           drop();
           return;
         }
+        if (message?.id === HERDR_EVENT_SUBSCRIPTION_ID && message?.error) {
+          if (message.error.code === "events_lost" && !signal.aborted) {
+            disconnectReported = true;
+            flushPresentation();
+            onChange(void 0, "reconcile");
+          }
+          drop();
+          return;
+        }
         if (!subscribed) {
-          if (message?.id !== LIFECYCLE_SUBSCRIPTION_ID || message?.error || !message?.result) {
+          if (signal.aborted || message?.id !== HERDR_EVENT_SUBSCRIPTION_ID || message?.result?.type !== "subscription_started") {
             drop();
             return;
           }
           subscribed = true;
-          onChange();
+          flushPresentation();
+          onChange(void 0, "reconcile");
           continue;
         }
-        onChange(removedHerdrWorktree(message));
+        if (signal.aborted) return;
+        const event = message?.event;
+        const category = LIFECYCLE_EVENTS.has(event) ? "lifecycle" : PRESENTATION_EVENTS.has(event) ? "presentation" : void 0;
+        if (category === "presentation") invalidatePresentation();
+        else if (category) {
+          flushPresentation();
+          onChange(removedHerdrWorktree(message), category);
+        }
       }
     });
     current.on("error", drop);
     current.once("close", () => {
       if (socket === current) socket = void 0;
       if (signal.aborted) return;
-      retry = setTimeout(connect, LIFECYCLE_RECONNECT_MS);
+      if (subscribed && !disconnectReported) {
+        disconnectReported = true;
+        flushPresentation();
+        onChange(void 0, "reconcile");
+      }
+      retry = setTimeout(connect, HERDR_EVENT_RECONNECT_MS);
       retry.unref?.();
     });
   };
@@ -2558,6 +2695,7 @@ function watchHerdrLifecycle(socketPath2, signal, onChange) {
     "abort",
     () => {
       if (retry) clearTimeout(retry);
+      if (presentationTimer) clearTimeout(presentationTimer);
       socket?.destroy();
     },
     { once: true }
@@ -3895,7 +4033,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { contentText as contentText2 } from "@earendil-works/pi-ai";
 import { realpathSync as realpathSync3, statSync as statSync5 } from "node:fs";
-import { watchFile, unwatchFile, unlinkSync as unlinkSync7 } from "node:fs";
+import { unlinkSync as unlinkSync7 } from "node:fs";
 import { createHash as createHash7, randomUUID as randomUUID8 } from "node:crypto";
 import { homedir as homedir3 } from "node:os";
 import { join as join9, resolve as resolve4 } from "node:path";
@@ -8090,7 +8228,7 @@ function projectSupervision(options) {
 // extension/agent-controller.ts
 function buildAgentStatusSnapshot(view, ctx, host) {
   const ownerSessionId = ctx.sessionManager.getSessionId();
-  const unresolvedMailboxState = host.scope.kind === "lead" && host.hasStateIssues?.();
+  const unresolvedMailboxState = host.scope.kind === "lead" && view.stateIssues.length > 0;
   const listed = view.visible.map(
     (snapshot) => host.listedAgentRecord(
       view,
@@ -8262,6 +8400,7 @@ function createAgentStatusRuntime() {
       if (ctx.mode !== "tui" || !ctx.hasUI) return;
       const primed = statusPrimed && ctx === statusContext;
       const generation = ctx === statusContext && requestActive ? statusGeneration : ++statusGeneration;
+      clearTimer();
       statusContext = ctx;
       ctx.ui.setWidget("pi-herdsman", (tui, theme) => {
         const widget = createStatusWidget(() => tui.requestRender(), theme);
@@ -8273,7 +8412,8 @@ function createAgentStatusRuntime() {
         return widget;
       });
       requestActive = true;
-      statusTimer = setInterval(() => void refresh(ctx, generation), 2e3);
+      statusTimer = setInterval(() => void refresh(ctx, generation), 1e4);
+      statusTimer.unref?.();
       statusPrimed = false;
       if (!primed) void refresh(ctx, generation);
     },
@@ -8506,11 +8646,6 @@ pending-result agent work still blocks escalation.`;
 function durableIdentityKey(state) {
   return `${state.workspaceId}\0${state.piSessionId}`;
 }
-function durableParentCandidates(snapshot, child) {
-  return snapshot.filter(
-    ({ state }) => state.workspaceId === child.workspaceId && state.piSessionId === child.ownerSessionId
-  );
-}
 function directChildStates(parent) {
   return listAgentStates().filter(
     ({ state }) => state.workspaceId === parent.workspaceId && state.ownerSessionId === parent.piSessionId
@@ -8635,37 +8770,31 @@ function visibleAgentSnapshots(snapshot, scope, ownerSessionId) {
   );
   if (scope.kind === "managed-agent") return direct;
   const visible = [...direct];
-  const visibleIdentities = new Set(
-    direct.map(({ state }) => durableIdentityKey(state))
-  );
-  const pending = agents.filter(
-    ({ state }) => state.ownerSessionId !== ownerSessionId
-  );
-  while (pending.length) {
-    let progressed = false;
-    for (let index = pending.length - 1; index >= 0; index--) {
-      const agent = pending[index];
-      const parents = durableParentCandidates(agents, agent.state);
-      if (parents.length !== 1) continue;
-      const parent = parents[0];
-      if (!visibleIdentities.has(durableIdentityKey(parent.state))) continue;
-      visible.push({ ...agent, parentLabel: parent.state.agentLabel });
-      visibleIdentities.add(durableIdentityKey(agent.state));
-      pending.splice(index, 1);
-      progressed = true;
-    }
-    if (!progressed) break;
+  const byIdentity = /* @__PURE__ */ new Map();
+  const childrenByOwner = /* @__PURE__ */ new Map();
+  for (const agent of agents) {
+    const identity = durableIdentityKey(agent.state);
+    const owner = `${agent.state.workspaceId}\0${agent.state.ownerSessionId}`;
+    const identityCandidates = byIdentity.get(identity) ?? [];
+    identityCandidates.push(agent);
+    byIdentity.set(identity, identityCandidates);
+    const children = childrenByOwner.get(owner) ?? [];
+    children.push(agent);
+    childrenByOwner.set(owner, children);
+  }
+  const seen = new Set(direct);
+  for (let index = 0; index < visible.length; index++) {
+    const parent = visible[index];
+    const identity = durableIdentityKey(parent.state);
+    if (byIdentity.get(identity)?.length !== 1) continue;
+    for (const child of childrenByOwner.get(identity) ?? []) {
+      if (seen.has(child)) continue;
+      seen.add(child);
+      visible.push({ ...child, parentLabel: parent.state.agentLabel });
+    }
   }
   return visible;
 }
-function unknownAgentRecords() {
-  return listAgentStateIssues().map(({ diagnostic }) => ({
-    state: "unknown",
-    available_tools: [],
-    managed: true,
-    diagnostic
-  }));
-}
 function statusBreadcrumb(snapshot, candidate, identity, sameIdentity) {
   if (!candidate) return ["?"];
   const current = snapshot.agents.find(
@@ -9417,11 +9546,25 @@ function assertManagedAgentCascadeSafe(snapshots, sameIdentity, deliveredRootRes
 async function managedAgentSnapshots(pi, ctx, dependencies, signal, proveLead = false, allWorkspaces = false, suppliedInventory, allowTranscriptDefinitionFallback = true) {
   const inventory = suppliedInventory ?? await herdrSessionSnapshot(pi, ctx, signal);
   const currentWorkspaceId = process.env.HERDR_WORKSPACE_ID ?? ctx.cwd;
-  const allMailboxes = listAgentStates();
+  const { states: allMailboxes, issues: stateIssues } = scanAgentStates();
   const mailboxes = allWorkspaces ? allMailboxes : allMailboxes.filter(
     ({ state }) => state.workspaceId === currentWorkspaceId
   );
-  const agents = mailboxes.map(({ path, state }) => {
+  const pendingOwners = /* @__PURE__ */ new Set();
+  const completedResultsPending = mailboxes.map(({ path, state }) => {
+    let pending = false;
+    if (state.completedRequestId) {
+      try {
+        pending = !!readResult(path, state.completedRequestId);
+      } catch {
+        pending = true;
+      }
+    }
+    if (state.resultError || state.activeRequestId || pending)
+      pendingOwners.add(`${state.workspaceId}\0${state.ownerSessionId}`);
+    return pending;
+  });
+  const agents = mailboxes.map(({ path, state }, index) => {
     const presence = managedAgentPresence(state, inventory);
     const agent = presence.kind === "live" ? presence.agent : void 0;
     let agentDefinition;
@@ -9440,14 +9583,7 @@ async function managedAgentSnapshots(pi, ctx, dependencies, signal, proveLead =
     const piSessionId = session?.kind === "id" ? session.value : state.piSessionId;
     const piSessionPath = session?.kind === "path" ? session.value : state.piSessionFile;
     const lifecycleState = agent ? normalizeHerdrLifecycleState(agent) : "unknown";
-    let completionPending = false;
-    if (state.completedRequestId) {
-      try {
-        completionPending = !!readResult(path, state.completedRequestId);
-      } catch {
-        completionPending = true;
-      }
-    }
+    const completionPending = completedResultsPending[index];
     const handoffPending = unacknowledgedRequestExists(path, state);
     const liveState = agent ? agentControlState(
       lifecycleState,
@@ -9457,19 +9593,7 @@ async function managedAgentSnapshots(pi, ctx, dependencies, signal, proveLead =
       !!state.pendingAskId,
       !!state.resultError
     ) : "unknown";
-    const pendingDirectChildWork = mailboxes.some(
-      ({ path: childPath, state: child }) => {
-        if (child.workspaceId !== state.workspaceId || child.ownerSessionId !== state.piSessionId)
-          return false;
-        if (child.resultError || child.activeRequestId) return true;
-        if (!child.completedRequestId) return false;
-        try {
-          return !!readResult(childPath, child.completedRequestId);
-        } catch {
-          return true;
-        }
-      }
-    );
+    const pendingDirectChildWork = pendingOwners.has(durableIdentityKey(state));
     const waitingForChildren = liveState === "settling" && !!state.activeRequestId && !completionPending && !handoffPending && !state.resultError && pendingDirectChildWork;
     const existingLiveProjection = waitingForChildren ? "blocked" : liveState;
     const projectedState = completionPending || state.resultError ? "settling" : presence.kind === "lost" ? "lost" : presence.kind === "unknown" ? "unknown" : existingLiveProjection;
@@ -9512,7 +9636,13 @@ async function managedAgentSnapshots(pi, ctx, dependencies, signal, proveLead =
     } catch {
     }
   }
-  return { agents, mailboxes, liveAgents: inventory.agents, leadSessionIds };
+  return {
+    agents,
+    mailboxes,
+    stateIssues,
+    liveAgents: inventory.agents,
+    leadSessionIds
+  };
 }
 function listedAgentRecord(view, snapshot, ownerSessionId, scope, unresolvedMailboxState, dependencies) {
   const { listed, state, presence, parentLabel } = snapshot;
@@ -9581,9 +9711,7 @@ function createAgentController(pi, options) {
   const runtimes = /* @__PURE__ */ new Map();
   const pendingStarts = /* @__PURE__ */ new Map();
   const resultWatchers = /* @__PURE__ */ new Map();
-  const resultWatchRetries = /* @__PURE__ */ new Map();
   const askWatchers = /* @__PURE__ */ new Map();
-  const askWatchRetries = /* @__PURE__ */ new Map();
   const resultDeliveryInFlight = /* @__PURE__ */ new Set();
   const askDeliveryInFlight = /* @__PURE__ */ new Set();
   const resultDeliveryRetries = /* @__PURE__ */ new Map();
@@ -10279,7 +10407,8 @@ function createAgentController(pi, options) {
         runtime.startedAt = Date.now();
         runtime.contextPercent = void 0;
         watchResult(runtime, context, signal);
-        watchAsk(runtime, context, signal);
+        if (runtime.activeRequestId === requestId)
+          watchAsk(runtime, context, signal);
       }
       return requestId;
     } finally {
@@ -10520,7 +10649,12 @@ function createAgentController(pi, options) {
       scope,
       context.sessionManager.getSessionId()
     );
-    const unknown = scope?.kind === "lead" ? unknownAgentRecords() : [];
+    const unknown = scope?.kind === "lead" ? snapshot2.stateIssues.map(({ diagnostic }) => ({
+      state: "unknown",
+      available_tools: [],
+      managed: true,
+      diagnostic
+    })) : [];
     const unresolved = unknown.length > 0;
     const agents = visible.map(
       (item) => listRecord(
@@ -10630,7 +10764,7 @@ function createAgentController(pi, options) {
         "Agent belongs to another owner session",
         "transcript"
       );
-    const unresolved = scope?.kind === "lead" && listAgentStateIssues().length > 0;
+    const unresolved = scope?.kind === "lead" && view.stateIssues.length > 0;
     const actions = listedAgentRecord(
       view,
       candidate,
@@ -11106,21 +11240,13 @@ function createAgentController(pi, options) {
     if (!id) return;
     cancelResultRetry(resultDeliveryRetries, runtime, id);
     cancelResultRetry(resultCleanupRetries, runtime, id);
-    const path = `${runtime.mailboxPath}/result-${id}.json`;
-    const retry = resultWatchRetries.get(path);
-    if (retry) clearTimeout(retry);
-    resultWatchRetries.delete(path);
-    const watcher = resultWatchers.get(path);
-    if (watcher) unwatchFile(path, watcher);
+    const path = join9(runtime.mailboxPath, `result-${id}.json`);
+    resultWatchers.get(path)?.();
     resultWatchers.delete(path);
   };
   const stopAskWatcher = (runtime) => {
     const path = agentStatePath(runtime.mailboxPath);
-    const retry = askWatchRetries.get(path);
-    if (retry) clearTimeout(retry);
-    askWatchRetries.delete(path);
-    const watcher = askWatchers.get(path);
-    if (watcher) unwatchFile(path, watcher);
+    askWatchers.get(path)?.();
     askWatchers.delete(path);
   };
   const invalidateRuntime = (label) => {
@@ -11141,29 +11267,10 @@ function createAgentController(pi, options) {
     runtime.startedAt = void 0;
     runtimes.delete(label);
   };
-  const watch = (path, watchers, retries, context, check, retry) => {
-    watchers.set(path, check);
-    try {
-      check();
-      if (watchers.get(path) !== check) return;
-      watchFile(path, { interval: 250 }, check);
-    } catch (error2) {
-      watchers.delete(path);
-      options.reportWatcherError(context, error2);
-      if (!retries.has(path)) {
-        retries.set(
-          path,
-          setTimeout(() => {
-            retries.delete(path);
-            retry();
-          }, 250)
-        );
-      }
-    }
-  };
   const watchResult = (runtime, context, signal, requestId = runtime.activeRequestId) => {
     if (!requestId) return;
-    const path = `${runtime.mailboxPath}/result-${requestId}.json`;
+    const filename = `result-${requestId}.json`;
+    const path = join9(runtime.mailboxPath, filename);
     stopResultWatcher(runtime, requestId);
     const check = () => {
       if (active && runtimes.get(runtime.label) === runtime)
@@ -11173,10 +11280,14 @@ function createAgentController(pi, options) {
         } catch {
         }
     };
-    watch(path, resultWatchers, resultWatchRetries, context, check, () => {
-      if (runtime.activeRequestId === requestId && active)
-        watchResult(runtime, context, signal, requestId);
-    });
+    const stop = observeMailbox(
+      runtime.mailboxPath,
+      (name) => name === filename,
+      check,
+      (error2) => options.reportWatcherError(context, error2)
+    );
+    resultWatchers.set(path, stop);
+    check();
   };
   const watchAsk = (runtime, context, signal) => {
     const path = agentStatePath(runtime.mailboxPath);
@@ -11189,21 +11300,16 @@ function createAgentController(pi, options) {
         if (error2 instanceof OperationError && error2.detail.category === "incompatible_build")
           return;
         options.reportWatcherError(context, error2);
-        if (!askWatchRetries.has(path))
-          askWatchRetries.set(
-            path,
-            setTimeout(() => {
-              askWatchRetries.delete(path);
-              if (active && runtimes.get(runtime.label) === runtime)
-                watchAsk(runtime, context, signal);
-            }, 250)
-          );
       }
     };
-    watch(path, askWatchers, askWatchRetries, context, check, () => {
-      if (active && runtimes.get(runtime.label) === runtime)
-        watchAsk(runtime, context, signal);
-    });
+    const stop = observeMailbox(
+      runtime.mailboxPath,
+      (name) => name === "state.json" || name === "ask.json",
+      check,
+      (error2) => options.reportWatcherError(context, error2)
+    );
+    askWatchers.set(path, stop);
+    check();
   };
   const resultIdentity = (runtime, requestId) => ({
     runId: runtime.runId,
@@ -11717,6 +11823,8 @@ function createAgentController(pi, options) {
       runtime.task = void 0;
       runtime.startedAt = void 0;
       runtime.contextPercent = void 0;
+      if (pendingStarts.get(runtime.label)?.requestId === result.requestId)
+        pendingStarts.delete(runtime.label);
       if (!await finalizeDeliveredResult(runtime, result, context, signal))
         scheduleResultCleanupRetry(runtime, result, context, signal);
       clearCleanupError(runtime, "Result delivery failed; retrying:");
@@ -12025,6 +12133,7 @@ function createAgentController(pi, options) {
       const pendingStart = {
         label,
         definition: agentDefinition,
+        requestId: assignment.requestId,
         ...p.task !== void 0 ? { task: p.task } : {},
         startedAt: Date.now(),
         ...scope.kind === "managed-agent" && process.env.PI_HERDSMAN_LABEL ? { parentLabel: process.env.PI_HERDSMAN_LABEL } : {}
@@ -12265,7 +12374,6 @@ ${result.stderr ?? ""}`.trim(),
           p.action,
           assignmentInput.resultBindings
         );
-        pendingStart.requestId = requestId;
         accepted = true;
         options.onChanged();
         return {
@@ -12277,7 +12385,7 @@ ${result.stderr ?? ""}`.trim(),
           pane_id: runtime.paneId,
           session_id: runtime.piSessionId,
           session_path: runtime.piSessionFile,
-          request_id: runtime.activeRequestId
+          request_id: requestId
         };
       } catch (caught) {
         if (promptWriteFailed) throw caught;
@@ -12943,7 +13051,7 @@ ${result.stderr ?? ""}`.trim(),
       ...snapshot2,
       visible: visibleAgentSnapshots(snapshot2, options.scope, ownerSessionId)
     };
-    const unresolvedMailboxState = options.scope?.kind === "lead" && listAgentStateIssues().length > 0;
+    const unresolvedMailboxState = options.scope?.kind === "lead" && snapshot2.stateIssues.length > 0;
     const now = Date.now();
     const ownedRuns = new Set(
       snapshot2.agents.filter(({ state }) => state.ownerSessionId === ownerSessionId).map(({ state }) => state.runId)
@@ -13418,11 +13526,15 @@ ${result.stderr ?? ""}`.trim(),
     };
     requestHealthScan();
     if (process.env.HERDR_SOCKET_PATH) {
-      watchHerdrLifecycle(process.env.HERDR_SOCKET_PATH, signal, (removed) => {
-        options.onChanged();
-        requestHealthScan();
-        if (removed) options.onWorktreeRemoved?.(removed, ctx, signal);
-      });
+      watchHerdrLifecycle(
+        process.env.HERDR_SOCKET_PATH,
+        signal,
+        (removed, category) => {
+          options.onChanged();
+          if (category !== "presentation") requestHealthScan();
+          if (removed) options.onWorktreeRemoved?.(removed, ctx, signal);
+        }
+      );
     }
     schedule();
   };
@@ -13524,14 +13636,10 @@ ${result.stderr ?? ""}`.trim(),
     },
     shutdown() {
       active = false;
-      for (const [path, watcher] of resultWatchers) unwatchFile(path, watcher);
-      for (const [path, watcher] of askWatchers) unwatchFile(path, watcher);
+      for (const watcher of resultWatchers.values()) watcher();
+      for (const watcher of askWatchers.values()) watcher();
       resultWatchers.clear();
       askWatchers.clear();
-      for (const timer of resultWatchRetries.values()) clearTimeout(timer);
-      for (const timer of askWatchRetries.values()) clearTimeout(timer);
-      resultWatchRetries.clear();
-      askWatchRetries.clear();
       for (const timer of resultDeliveryRetries.values()) clearTimeout(timer);
       for (const timer of resultCleanupRetries.values()) clearTimeout(timer);
       for (const timer of askDeliveryRetries.values()) clearTimeout(timer);
@@ -13874,7 +13982,7 @@ function createManagedAgentExecutionState() {
     resultWriteAttempts: 0,
     retryTimer: void 0,
     stateRetryTimer: void 0,
-    requestPumpTimer: void 0,
+    stopRequestObserver: void 0,
     stateErrorReported: false,
     resultErrorReported: false,
     agentContext: void 0,
@@ -14202,7 +14310,7 @@ function createManagedAgentLeafStatus(options) {
         else next.dispose();
         return next;
       });
-      timer = setInterval(() => void refresh(ctx, activeGeneration), 2e3);
+      timer = setInterval(() => void refresh(ctx, activeGeneration), 1e4);
       void refresh(ctx, activeGeneration);
     }
   };
@@ -15007,8 +15115,8 @@ This is the session-start definition snapshot. Use list_agents for live Agent st
     }));
   };
   const resetRequestPump = () => {
-    if (execution.requestPumpTimer) clearInterval(execution.requestPumpTimer);
-    execution.requestPumpTimer = void 0;
+    execution.stopRequestObserver?.();
+    execution.stopRequestObserver = void 0;
     requestState.reset();
   };
   const clearAgentRuntimes = () => controller?.clearRuntimes();
@@ -15573,12 +15681,13 @@ function registerManagedAgentSessionStartHandler(pi, execution, options) {
       if (options.delegationEnabled)
         options.startControllerHealthScanner(ctx, metadataSignal);
       execution.initialized = true;
-      options.pumpRequest(ctx);
-      execution.requestPumpTimer = setInterval(
+      execution.stopRequestObserver = observeMailbox(
+        mailbox,
+        (name) => /^request-.*\.json$/.test(name),
         () => options.pumpRequest(ctx),
-        250
+        (error2) => options.appendError(ctx, error2)
       );
-      execution.requestPumpTimer.unref?.();
+      options.pumpRequest(ctx);
       if (!options.delegationEnabled && ctx.mode === "tui" && ctx.hasUI)
         options.startLeafStatus(ctx);
       const model = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : void 0;
@@ -15596,6 +15705,7 @@ function registerManagedAgentSessionStartHandler(pi, execution, options) {
       );
     } catch (error2) {
       execution.initialized = false;
+      options.resetRequestPump();
       options.statusRuntime.clear();
       options.setControllerReady(false);
       execution.assignment = void 0;
@@ -16107,19 +16217,21 @@ function createLeadCommandRuntime(host) {
     async openDefinitionsMenu(ctx) {
       let selectedDefinition;
       const loadDefinitions = async () => {
-        const { definitions, projectTrusted } = await host.contextAgentDefinitions(ctx);
+        const { definitions, leadDefinitions } = await host.contextAgentDefinitions(ctx);
         return {
           definitions,
           leadDefinitions: [
             FLEXIBLE_LEAD_DEFINITION_NAME,
             ORCHESTRATOR_LEAD_DEFINITION_NAME,
             MANAGED_LEAD_DEFINITION_NAME
-          ].map(
-            (name) => host.discoverLeadDefinition(
-              name,
-              projectTrusted ? { projectRoot: ctx.cwd } : {}
-            )
-          )
+          ].map((name) => {
+            const definition = leadDefinitions.find(
+              (candidate) => candidate.name === name
+            );
+            if (!definition)
+              throw new Error(`Lead definition ${name} not found`);
+            return definition;
+          })
         };
       };
       const resolveDefinition = async (name) => {
@@ -16790,6 +16902,14 @@ function registerLeadRuntime(pi, options) {
       return !!file2?.isFile() && file2.size > 0;
     })
   });
+  const writeProjectAssignment2 = (...args) => {
+    options.projectHost.writeProjectAssignment(...args);
+    supervisionUiRuntime.requestRefresh();
+  };
+  const removeProjectAssignment2 = (...args) => {
+    options.roleTransitionHost.removeProjectAssignment(...args);
+    supervisionUiRuntime.requestRefresh();
+  };
   const clearSupervisionUI = (removeWidget = true) => {
     supervisionUiRuntime.stopPeriodic();
     if (removeWidget && leadRuntime.leadContext)
@@ -16939,6 +17059,7 @@ function registerLeadRuntime(pi, options) {
   };
   const roleTransitionServices = {
     ...roleHost,
+    removeProjectAssignment: removeProjectAssignment2,
     controllerScope: { kind: "lead" },
     activationGuard,
     advancePeerPresenceGeneration: () => coordinationRuntime.advancePresenceGeneration(),
@@ -17018,7 +17139,10 @@ function registerLeadRuntime(pi, options) {
     ...options.controllerServices,
     scope: { kind: "lead" },
     build: options.build,
-    onChanged: () => statusRuntime.requestRefresh(),
+    onChanged: () => {
+      statusRuntime.requestRefresh();
+      supervisionUiRuntime.requestRefresh();
+    },
     onWorkChanged: (ctx) => herdRunRuntime?.maybeFinish(ctx),
     onWorktreeRemoved: (removed, ctx, signal) => {
       void roleTransitions.retireRemovedProjectWork(removed, ctx, signal).then(async () => {
@@ -17111,6 +17235,7 @@ function registerLeadRuntime(pi, options) {
   const projectHost = options.projectHost;
   const projectServices = {
     ...projectHost,
+    writeProjectAssignment: writeProjectAssignment2,
     liveAgent,
     liveLead,
     currentManager: (...args) => roleTransitions.currentManager(...args),
@@ -17891,6 +18016,8 @@ function createLeadSupervisionRuntime(host) {
   let generationId;
   let stale = false;
   let timer;
+  let redrawTimer;
+  let uiContext;
   let inFlight;
   let pending;
   let overviewGeneration = 0;
@@ -18355,15 +18482,35 @@ function createLeadSupervisionRuntime(host) {
     },
     startPeriodic: (ctx) => {
       if (timer) clearInterval(timer);
-      timer = setInterval(() => void refresh(ctx), 2e3);
+      if (redrawTimer) clearInterval(redrawTimer);
+      timer = void 0;
+      redrawTimer = void 0;
+      uiContext = void 0;
+      if (ctx.mode !== "tui" || !ctx.hasUI) return;
+      uiContext = ctx;
+      timer = setInterval(() => {
+        if (uiContext === ctx) void refresh(ctx);
+      }, 1e4);
       timer.unref?.();
+      if (host.activeRole() === "manager") {
+        redrawTimer = setInterval(() => {
+          if (uiContext === ctx) renderWidget?.();
+        }, 2e3);
+        redrawTimer.unref?.();
+      }
+    },
+    requestRefresh: () => {
+      if (uiContext) void refresh(uiContext);
     },
     stopPeriodic: () => {
       pending = void 0;
+      uiContext = void 0;
       renderOverview = void 0;
       renderWidget = void 0;
       if (timer) clearInterval(timer);
       timer = void 0;
+      if (redrawTimer) clearInterval(redrawTimer);
+      redrawTimer = void 0;
     }
   };
 }
@@ -23310,7 +23457,6 @@ ${summary}`,
           appendDurableError
         },
         statusSnapshotHost: {
-          hasStateIssues: () => listAgentStateIssues().length > 0,
           environmentIdentity: (ctx) => managedAgentEnvironmentIdentity(ctx, HERDSMAN_BUILD),
           identityFromEnvironment: () => ({
             definition: process.env.PI_HERDSMAN_AGENT_DEFINITION,