pi-herdsman 0.22.0 → 0.22.2

package/dist/index.js

@@ -8,14 +8,14 @@ import {
   SessionManager as SessionManager2
 } from "@earendil-works/pi-coding-agent";
 import { readFileSync as readFileSync9, statSync as statSync7, unlinkSync as unlinkSync9 } from "node:fs";
-import { basename as basename6, dirname as dirname7, resolve as resolve6 } from "node:path";
+import { basename as basename6, dirname as dirname7, resolve as resolve7 } from "node:path";
 import { setTimeout as delay2 } from "node:timers/promises";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // package.json
 var package_default = {
   name: "pi-herdsman",
-  version: "0.22.0",
+  version: "0.22.2",
   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,
@@ -1076,7 +1135,7 @@ function parseControlMarker(text) {
   return UUID2.test(id) && id.length === 36 ? id : void 0;
 }
 function waitForState(path, predicate, options) {
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     let done = false;
     let abortListener;
     const finish = (error2, state) => {
@@ -1086,7 +1145,7 @@ function waitForState(path, predicate, options) {
       clearInterval(interval);
       if (abortListener && options.signal)
         options.signal.removeEventListener("abort", abortListener);
-      error2 ? reject(error2) : resolve7(state);
+      error2 ? reject(error2) : resolve8(state);
     };
     const check = () => {
       try {
@@ -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;
@@ -15612,6 +15722,7 @@ import { visibleWidth as visibleWidth2 } from "@earendil-works/pi-tui";
 import { contentText as contentText4, getSupportedThinkingLevels } from "@earendil-works/pi-ai";
 import { randomUUID as randomUUID10 } from "node:crypto";
 import { realpathSync as realpathSync5, statSync as statSync6, unlinkSync as unlinkSync8 } from "node:fs";
+import { isAbsolute as isAbsolute5, resolve as resolve6 } from "node:path";
 var LEAD_INSTANCE_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
 function createLeadRuntimeState() {
   return {
@@ -15866,6 +15977,13 @@ function createLeadSessionStartRuntime(host) {
         ...host.ownToolsSnapshot()
       });
       const activeManager = host.isLead() && host.roleTransitions.activeManager();
+      if (activeManager && !sessionSignal.aborted) {
+        try {
+          await host.roleTransitions.reconcileCurrentManagerAssignments(ctx);
+        } catch (error2) {
+          host.appendRoleError(ctx, error2);
+        }
+      }
       if (host.isLead() && (host.roleTransitions.chiefModeActive() || activeManager)) {
         host.startSupervisionUI(ctx);
       } else host.leadStatusRuntime.start(ctx);
@@ -16107,19 +16225,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) => {
@@ -16777,6 +16897,7 @@ function registerLeadRuntime(pi, options) {
     pi,
     isCurrentChief: (ctx) => options.leadRuntime.chiefMode === "active" && !!options.leadRuntime.chiefLease && options.leadRuntime.chiefLease.descriptor.piSessionId === ctx.sessionManager.getSessionId(),
     currentManager: (...args) => roleTransitions.currentManager(...args),
+    reconcileProjectAssignments: (...args) => roleTransitions.reconcileProjectAssignments(...args),
     currentChief: (...args) => roleTransitions.currentChief(...args),
     currentChiefAuthority: (...args) => roleTransitions.currentChiefAuthority(...args),
     latestMessageText: (ctx) => coordinationRuntime.latestCustomMessageText(
@@ -16790,6 +16911,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 +17068,7 @@ function registerLeadRuntime(pi, options) {
   };
   const roleTransitionServices = {
     ...roleHost,
+    removeProjectAssignment: removeProjectAssignment2,
     controllerScope: { kind: "lead" },
     activationGuard,
     advancePeerPresenceGeneration: () => coordinationRuntime.advancePresenceGeneration(),
@@ -17018,7 +17148,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,9 +17244,11 @@ function registerLeadRuntime(pi, options) {
   const projectHost = options.projectHost;
   const projectServices = {
     ...projectHost,
+    writeProjectAssignment: writeProjectAssignment2,
     liveAgent,
     liveLead,
     currentManager: (...args) => roleTransitions.currentManager(...args),
+    reconcileProjectAssignments: (...args) => roleTransitions.reconcileProjectAssignments(...args),
     sameManagerDescriptor: projectHost.sameManagerDescriptor,
     withProjectWorkLock: (...args) => roleTransitions.withProjectWorkLock(...args),
     withProjectAssignmentLock: (...args) => roleTransitions.withProjectAssignmentLock(...args),
@@ -17588,6 +17723,8 @@ function createLeadSupervisionRuntime(host) {
         manager.workspaceId,
         ctx.signal
       );
+      if (group.repoKey !== manager.repoKey || group.primaryWorkspaceId !== manager.workspaceId)
+        throw new Error("Manager workspace is not the assigned project");
       const [leads, topology] = await Promise.all([
         directReports(ctx, suppliedInventory, suppliedAgents),
         host.runHerdr(
@@ -17597,8 +17734,15 @@ function createLeadSupervisionRuntime(host) {
           { signal: ctx.signal }
         )
       ]);
-      if (topology?.source?.repo_key !== group.repoKey || !Array.isArray(topology?.worktrees))
+      if (topology?.source?.repo_key !== group.repoKey || topology?.source?.source_workspace_id !== group.primaryWorkspaceId || !Array.isArray(topology?.worktrees))
         throw new Error("Herdr worktree topology is not authoritative");
+      if (typeof topology.source.source_checkout_path === "string")
+        await host.reconcileProjectAssignments?.(
+          ctx,
+          group.repoKey,
+          group.primaryWorkspaceId,
+          topology.source.source_checkout_path
+        );
       const assignments = host.listProjectAssignments(
         host.supervisionRuntime(),
         group.repoKey
@@ -17891,6 +18035,8 @@ function createLeadSupervisionRuntime(host) {
   let generationId;
   let stale = false;
   let timer;
+  let redrawTimer;
+  let uiContext;
   let inFlight;
   let pending;
   let overviewGeneration = 0;
@@ -18355,15 +18501,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;
     }
   };
 }
@@ -18613,7 +18779,8 @@ function createLeadProjectRuntime(host) {
     stopHerdrAgentPreservingPane: stopHerdrAgentPreservingPane2,
     expectedSession: expectedSession3,
     liveLead,
-    withProjectWorkLock
+    withProjectWorkLock,
+    withProjectAssignmentLock
   } = host;
   const {
     activeRole,
@@ -18683,35 +18850,44 @@ function createLeadProjectRuntime(host) {
       );
     const primaryWorkspaceId = group.primaryWorkspaceId;
     const runtime = supervisionRuntime2();
-    const existing = readProjectAssignment2(
-      runtime,
-      manager.repoKey,
-      operation.branch
+    const branch = operation.branch;
+    const topology = await runHerdr2(
+      pi,
+      ctx,
+      ["worktree", "list", "--workspace", primaryWorkspaceId],
+      { signal }
     );
+    if (topology?.source?.source_workspace_id !== primaryWorkspaceId || topology?.source?.repo_key !== manager.repoKey || !Array.isArray(topology?.worktrees))
+      throw new Error("Herdr worktree topology is not authoritative");
+    if (operation.action === "resume")
+      await host.reconcileProjectAssignments(
+        ctx,
+        manager.repoKey,
+        primaryWorkspaceId,
+        typeof topology.source.source_checkout_path === "string" ? topology.source.source_checkout_path : "",
+        true,
+        branch
+      );
+    const existing = readProjectAssignment2(runtime, manager.repoKey, branch);
     if (existing && existing.repoKey !== manager.repoKey)
       throw new Error("Project assignment belongs to another repository");
     if (operation.action === "delegate" && existing)
       throw new Error(
-        `Work already exists on ${operation.branch}; resume it with resume_project.`
+        `Work already exists on ${branch}; resume it with resume_project.`
       );
     if (operation.action === "resume" && !existing)
       throw new Error(
-        `No existing work was found on ${operation.branch}; start it with delegate_project and a task.`
+        `No existing work was found on ${branch}; start it with delegate_project and a task.`
       );
     const presentationTask = operation.action === "resume" ? projectTaskSummary(existing.text) : void 0;
     const id = operation.action === "resume" ? existing.id : operation.id;
-    const branch = operation.branch;
-    const topology = await runHerdr2(
-      pi,
-      ctx,
-      ["worktree", "list", "--workspace", primaryWorkspaceId],
-      { signal }
-    );
-    if (topology?.source?.source_workspace_id !== primaryWorkspaceId || topology?.source?.repo_key !== manager.repoKey || !Array.isArray(topology?.worktrees))
-      throw new Error("Herdr worktree topology is not authoritative");
     const branchWorktrees = topology.worktrees.filter(
       (worktree) => worktree?.branch === branch
     );
+    if (operation.action === "resume" && branchWorktrees.length === 0)
+      throw new Error(
+        "Worktree availability could not be verified; the existing assignment was preserved. Retry when repository access is available."
+      );
     if (branchWorktrees.length > 1)
       throw new Error(`Multiple Herdr worktrees match branch ${branch}`);
     const live = operation.action === "resume" ? await liveAgent(ctx, existing.id) : [];
@@ -18830,7 +19006,6 @@ function createLeadProjectRuntime(host) {
         text: prepared.text,
         ...prepared.resultBindings.length ? { resultBindings: prepared.resultBindings } : {}
       };
-      writeProjectAssignment2(runtime, assignment);
     }
     const promptPaths = [];
     try {
@@ -18877,6 +19052,8 @@ function createLeadProjectRuntime(host) {
             );
         }
       } else {
+        if (operation.action === "resume")
+          throw new Error("The existing project checkout is unavailable");
         const args = [
           "worktree",
           "create",
@@ -18886,44 +19063,7 @@ function createLeadProjectRuntime(host) {
           assignment.branch,
           "--no-focus"
         ];
-        if (operation.action === "resume") {
-          let savedCwd;
-          if (assignment.piSessionFile) {
-            const saved = SessionManager3.open(assignment.piSessionFile);
-            if (saved.getSessionId() !== assignment.id)
-              throw new Error(
-                "Persisted project session identity does not match"
-              );
-            savedCwd = saved.getCwd();
-          } else {
-            const saved = (await SessionManager3.listAll()).filter(
-              (session) => session.id === assignment.id
-            );
-            if (saved.length > 1)
-              throw new Error(
-                `Pi session ${assignment.id} is ambiguous; project work was preserved.`
-              );
-            if (saved.length === 1) {
-              const sessionFile = saved[0].path;
-              if (typeof sessionFile !== "string" || !sessionFile)
-                throw new Error(
-                  "Legacy project session has no exact file path"
-                );
-              const session = SessionManager3.open(sessionFile);
-              if (session.getSessionId() !== assignment.id)
-                throw new Error(
-                  "Persisted project session identity does not match"
-                );
-              savedCwd = session.getCwd();
-              assignment = await persistLeadSessionFile(
-                assignment,
-                realpathSync5(sessionFile)
-              );
-            }
-          }
-          args.push("--base", assignment.branch);
-          if (savedCwd) args.push("--path", savedCwd);
-        } else args.push("--base", operation.base ?? "HEAD");
+        args.push("--base", operation.base ?? "HEAD");
         const created = await runHerdr2(pi, ctx, args, { signal });
         workspaceId = created?.workspace?.workspace_id;
         paneId = created?.root_pane?.pane_id;
@@ -18938,6 +19078,40 @@ function createLeadProjectRuntime(host) {
         (value2) => typeof value2 === "string" && value2
       ))
         throw new Error("Herdr did not return exact worktree identities");
+      if (operation.action === "delegate") {
+        const [common, branchResult] = await Promise.all([
+          pi.exec(
+            "git",
+            ["rev-parse", "--path-format=absolute", "--git-common-dir"],
+            { cwd, signal, timeout: 1e4 }
+          ),
+          pi.exec("git", ["symbolic-ref", "--quiet", "--short", "HEAD"], {
+            cwd,
+            signal,
+            timeout: 1e4
+          })
+        ]);
+        if (common.code !== 0 || common.killed || common.stderr?.trim() || branchResult.code !== 0 || branchResult.killed || branchResult.stderr?.trim() || !isAbsolute5(String(common.stdout ?? "").trim()) || realpathSync5(String(common.stdout).trim()) !== realpathSync5(manager.repoKey) || String(branchResult.stdout ?? "").trim() !== assignment.branch)
+          throw new Error(
+            "Herdr checkout does not match the assigned repository and branch"
+          );
+        const fresh = await currentManager(ctx);
+        if (!fresh || !sameManagerDescriptor2(fresh, manager))
+          throw new Error(
+            "Manager changed before project assignment was published"
+          );
+        await withProjectAssignmentLock(
+          manager.repoKey,
+          assignment.branch,
+          () => {
+            if (readProjectAssignment2(runtime, manager.repoKey, assignment.branch))
+              throw new Error(
+                `Work already exists on ${assignment.branch}; resume it with resume_project.`
+              );
+            writeProjectAssignment2(runtime, assignment);
+          }
+        );
+      }
       await assertUnoccupied(workspaceId);
       let lead;
       let startedLead = false;
@@ -19909,8 +20083,8 @@ function createLeadCoordinationRuntime(host) {
   const enterCoordinationPublication = async () => {
     const previous = coordinationPublication;
     let release;
-    coordinationPublication = new Promise((resolve7) => {
-      release = resolve7;
+    coordinationPublication = new Promise((resolve8) => {
+      release = resolve8;
     });
     await previous;
     return release;
@@ -20966,12 +21140,75 @@ async function resolveLeadControllerRole(state, ctx, requestedRole, deps, option
     );
   }
 }
+function gitPathStatus(path) {
+  try {
+    return statSync6(path).isDirectory() ? "present" : "unknown";
+  } catch (error2) {
+    const code = error2.code;
+    return code === "ENOENT" || code === "ENOTDIR" ? "absent" : "unknown";
+  }
+}
+function parseGitWorktreeInventory(output) {
+  if (!output.endsWith("\0\0")) return void 0;
+  const fields = output.split("\0");
+  if (fields.pop() !== "") return void 0;
+  const records = [];
+  let record = [];
+  for (const field of fields) {
+    if (field) record.push(field);
+    else if (record.length) {
+      records.push(record);
+      record = [];
+    }
+  }
+  if (record.length) records.push(record);
+  if (!records.length) return void 0;
+  const worktrees = [];
+  for (const values of records) {
+    if (!values[0]?.startsWith("worktree ")) return void 0;
+    let path;
+    let head;
+    let branch;
+    let bare = false;
+    let detached = false;
+    let locked = false;
+    let prunable = false;
+    const seen = /* @__PURE__ */ new Set();
+    for (const value2 of values) {
+      const key = value2.startsWith("worktree ") ? "worktree" : value2.startsWith("HEAD ") ? "HEAD" : value2.startsWith("branch refs/heads/") ? "branch" : value2 === "detached" || value2 === "bare" ? value2 : /^locked(?: |$)/.test(value2) ? "locked" : /^prunable(?: |$)/.test(value2) ? "prunable" : void 0;
+      if (key && seen.has(key)) return void 0;
+      if (key) seen.add(key);
+      if (value2.startsWith("worktree ") && !path) path = value2.slice(9);
+      else if (value2.startsWith("HEAD ") && !head) head = value2.slice(5);
+      else if (value2.startsWith("branch refs/heads/") && !branch)
+        branch = value2.slice("branch refs/heads/".length);
+      else if (value2 === "detached" || value2 === "bare") {
+        if (value2 === "bare") bare = true;
+        else detached = true;
+      } else if (/^locked(?: .*)?$/.test(value2)) locked = true;
+      else if (/^prunable(?: .*)?$/.test(value2)) prunable = true;
+      else if (!/^[^\s]+(?: .*)?$/.test(value2)) return void 0;
+    }
+    if (!path || !isAbsolute5(path) || (bare ? !!branch || detached : !head || !/^(?:[0-9a-f]{40}|[0-9a-f]{64})$/.test(head) || !branch && !detached) || branch !== void 0 && !branch)
+      return void 0;
+    worktrees.push({
+      path,
+      ...branch ? { branch } : {},
+      ...detached ? { detached: true } : {},
+      ...locked ? { locked: true } : {},
+      ...prunable ? { prunable: true } : {}
+    });
+  }
+  if (new Set(worktrees.map((worktree) => worktree.path)).size !== worktrees.length)
+    return void 0;
+  return worktrees;
+}
 function createLeadRoleTransitions(state, host) {
   const projectWorkLocks = /* @__PURE__ */ new Map();
   const withProjectWorkLock = async (key, operation) => {
     const previous = projectWorkLocks.get(key);
     let release;
-    const current = new Promise((resolve7) => release = resolve7);
+    const current = new Promise((resolve8) => release = resolve8);
     projectWorkLocks.set(key, current);
     await previous;
     try {
@@ -21184,29 +21421,177 @@ function createLeadRoleTransitions(state, host) {
     const assignment = scope ? projectAssignmentForScope(scope, ctx.sessionManager.getSessionId()) : void 0;
     return assignment ? currentManager(ctx, scope) : host.currentChiefAuthority(ctx);
   };
-  const removeProjectAssignmentState = (assignment, ctx) => {
+  const removeProjectAssignmentState = (assignment, _ctx) => {
     const runtime = host.supervisionRuntime();
     const current = host.readProjectAssignment(
       runtime,
       assignment.repoKey,
       assignment.branch
     );
-    if (!current || current.id !== assignment.id) return false;
+    if (!current || current.repoKey !== assignment.repoKey || current.branch !== assignment.branch || current.id !== assignment.id)
+      return false;
+    host.removeProjectMessages(runtime, assignment.repoKey, assignment.branch);
     host.removeProjectAssignment(
       runtime,
       assignment.repoKey,
       assignment.branch
     );
+    return true;
+  };
+  const gitWorktreeInventory = async (ctx, repoKey, primaryWorkspaceId, sourceCheckoutPath) => {
+    if (!isAbsolute5(sourceCheckoutPath)) return void 0;
     try {
-      host.removeProjectMessages(
-        runtime,
-        assignment.repoKey,
-        assignment.branch
+      const scope = await host.worktreeGroupScope(
+        ctx,
+        primaryWorkspaceId,
+        ctx.signal
       );
-    } catch (error2) {
-      host.appendDurableError(host.pi, ctx, "pi_herdsman_state_error", error2);
+      if (scope.repoKey !== repoKey || scope.primaryWorkspaceId !== primaryWorkspaceId)
+        return void 0;
+      const rootResult = await host.pi.exec(
+        "git",
+        ["rev-parse", "--path-format=absolute", "--git-common-dir"],
+        { cwd: sourceCheckoutPath, signal: ctx.signal, timeout: 1e4 }
+      );
+      if (rootResult.code !== 0 || rootResult.killed || rootResult.stderr?.trim())
+        return void 0;
+      const commonDir = String(rootResult.stdout ?? "").trim();
+      if (!commonDir || !isAbsolute5(commonDir)) return void 0;
+      const result = await host.pi.exec(
+        "git",
+        ["worktree", "list", "--porcelain", "-z"],
+        { cwd: sourceCheckoutPath, signal: ctx.signal, timeout: 1e4 }
+      );
+      if (result.code !== 0 || result.killed || result.stderr?.trim())
+        return void 0;
+      const inventory = parseGitWorktreeInventory(String(result.stdout ?? ""));
+      if (!inventory || realpathSync5(commonDir) !== realpathSync5(repoKey) || gitPathStatus(sourceCheckoutPath) !== "present")
+        return void 0;
+      return inventory;
+    } catch {
+      return void 0;
     }
-    return true;
+  };
+  const reconcileProjectAssignments = async (ctx, repoKey, primaryWorkspaceId, sourceCheckoutPath, projectWorkLocked = false, onlyBranch, retryLockContention = false) => {
+    const manager = await currentManager(ctx);
+    if (!manager || manager.repoKey !== repoKey || manager.workspaceId !== primaryWorkspaceId)
+      return;
+    const assignments = listProjectAssignments(
+      host.supervisionRuntime(),
+      repoKey
+    );
+    const initialInventory = await gitWorktreeInventory(
+      ctx,
+      repoKey,
+      primaryWorkspaceId,
+      sourceCheckoutPath
+    );
+    if (!initialInventory) return;
+    const knownCheckoutPath = (assignment) => {
+      if (!assignment.piSessionFile) return void 0;
+      try {
+        const session = host.SessionManager.open(assignment.piSessionFile);
+        if (session.getSessionId() !== assignment.id) return void 0;
+        return resolve6(session.getCwd());
+      } catch {
+        return void 0;
+      }
+    };
+    const checkoutMaySurvive = (assignment, inventory) => {
+      const cwd = knownCheckoutPath(assignment);
+      if (cwd)
+        return inventory.some(
+          (worktree) => resolve6(worktree.path) === cwd && gitPathStatus(worktree.path) !== "absent"
+        );
+      return inventory.some(
+        (worktree) => resolve6(worktree.path) !== resolve6(sourceCheckoutPath) && gitPathStatus(worktree.path) !== "absent"
+      );
+    };
+    for (const observed of assignments) {
+      if (onlyBranch && observed.branch !== onlyBranch) continue;
+      if (checkoutMaySurvive(observed, initialInventory)) continue;
+      const initialMatches = initialInventory.filter(
+        (worktree) => worktree.branch === observed.branch
+      );
+      if (initialMatches.length > 1 || initialMatches.some(
+        (worktree) => worktree.locked || !worktree.prunable || gitPathStatus(worktree.path) !== "absent"
+      ))
+        continue;
+      const retireIfAbsent = async () => {
+        const latestManager = await currentManager(ctx);
+        if (!latestManager || !host.sameManagerDescriptor(latestManager, manager))
+          return;
+        const retireUnderAssignmentLock = async () => {
+          const latestManager2 = await currentManager(ctx);
+          if (!latestManager2 || !host.sameManagerDescriptor(latestManager2, manager))
+            return;
+          const current = host.readProjectAssignment(
+            host.supervisionRuntime(),
+            repoKey,
+            observed.branch
+          );
+          if (!current || current.repoKey !== repoKey || current.branch !== observed.branch || current.id !== observed.id)
+            return;
+          const inventory = await gitWorktreeInventory(
+            ctx,
+            repoKey,
+            primaryWorkspaceId,
+            sourceCheckoutPath
+          );
+          if (!inventory) return;
+          if (checkoutMaySurvive(current, inventory)) return;
+          const matches = inventory.filter(
+            (worktree) => worktree.branch === observed.branch
+          );
+          if (matches.length > 1 || matches.some(
+            (worktree) => worktree.locked || !worktree.prunable || gitPathStatus(worktree.path) !== "absent"
+          ))
+            return;
+          removeProjectAssignmentState(current, ctx);
+        };
+        const deadline = retryLockContention ? Date.now() + 3e4 : 0;
+        for (; ; ) {
+          try {
+            await withProjectAssignmentLock(
+              repoKey,
+              observed.branch,
+              retireUnderAssignmentLock
+            );
+            return;
+          } catch (error2) {
+            if (!(error2 instanceof ProcessLockOccupiedError)) throw error2;
+            if (!retryLockContention) return;
+            if (ctx.signal.aborted) throw ctx.signal.reason;
+            if (Date.now() >= deadline) throw error2;
+            await host.delay(50, void 0, { signal: ctx.signal });
+          }
+        }
+      };
+      if (projectWorkLocked) await retireIfAbsent();
+      else
+        await withProjectWorkLock(
+          `${repoKey}\0${observed.branch}`,
+          retireIfAbsent
+        );
+    }
+  };
+  const reconcileCurrentManagerAssignments = async (ctx) => {
+    const manager = await currentManager(ctx);
+    if (!manager) return;
+    const topology = await host.runHerdr(
+      host.pi,
+      ctx,
+      ["worktree", "list", "--workspace", manager.workspaceId],
+      { signal: ctx.signal }
+    );
+    if (topology?.source?.repo_key !== manager.repoKey || topology?.source?.source_workspace_id !== manager.workspaceId || typeof topology?.source?.source_checkout_path !== "string")
+      throw new Error("Manager worktree topology is not authoritative");
+    await reconcileProjectAssignments(
+      ctx,
+      manager.repoKey,
+      manager.workspaceId,
+      topology.source.source_checkout_path
+    );
   };
   const takeover = async (ctx) => {
     if (activeLeadRole(state) !== "lead" || state.chiefMode === "active" || state.roleSuspended)
@@ -21245,38 +21630,31 @@ function createLeadRoleTransitions(state, host) {
     return true;
   };
   const retireRemovedProjectWork = async (removed, ctx, signal) => {
-    const runtime = host.supervisionRuntime();
-    const observed = host.readProjectAssignment(
-      runtime,
-      removed.repoKey,
-      removed.branch
-    );
-    if (!observed) return;
-    const scope = await currentWorktreeScope(ctx);
+    let scope;
+    try {
+      scope = await currentWorktreeScope(ctx);
+    } catch (error2) {
+      if (error2 instanceof OperationError && error2.detail.details?.herdrCode === "workspace_not_found")
+        return;
+      throw error2;
+    }
     if (!scope || scope.repoKey !== removed.repoKey) return;
-    await withProjectWorkLock(
-      `${removed.repoKey}\0${removed.branch}`,
-      async () => {
-        const deadline = Date.now() + 3e4;
-        for (; ; ) {
-          if (signal.aborted)
-            throw signal.reason ?? new Error("operation aborted");
-          try {
-            await withProjectAssignmentLock(
-              removed.repoKey,
-              removed.branch,
-              async () => {
-                removeProjectAssignmentState(observed, ctx);
-              }
-            );
-            return;
-          } catch (error2) {
-            if (!(error2 instanceof ProcessLockOccupiedError) || Date.now() >= deadline)
-              throw error2;
-            await host.delay(50, void 0, { signal });
-          }
-        }
-      }
+    const topology = await host.runHerdr(
+      host.pi,
+      ctx,
+      ["worktree", "list", "--workspace", scope.primaryWorkspaceId],
+      { signal }
+    );
+    if (topology?.source?.repo_key !== removed.repoKey || topology?.source?.source_workspace_id !== scope.primaryWorkspaceId || typeof topology?.source?.source_checkout_path !== "string")
+      return;
+    await reconcileProjectAssignments(
+      ctx,
+      removed.repoKey,
+      scope.primaryWorkspaceId,
+      topology.source.source_checkout_path,
+      false,
+      removed.branch,
+      true
     );
   };
   const beginShutdownRole = () => {
@@ -21545,6 +21923,11 @@ function createLeadRoleTransitions(state, host) {
       host.advancePeerPresenceGeneration();
       if (host.coordinationHealthy()) await host.schedulePeerPresence(ctx);
       await host.publishLeadRole(ctx, "inactive", state.chiefModeGeneration);
+      try {
+        await reconcileCurrentManagerAssignments(ctx);
+      } catch (error2) {
+        host.appendDurableError(host.pi, ctx, "pi_herdsman_state_error", error2);
+      }
       return "Manager mode active.";
     } catch (error2) {
       state.controllerRole = "lead";
@@ -21886,11 +22269,13 @@ function createLeadRoleTransitions(state, host) {
     withProjectAssignmentLock,
     publishProjectMessage,
     currentManager,
+    reconcileCurrentManagerAssignments,
     currentChief,
     currentChiefAuthority,
     currentSupervisor,
     takeover,
     retireRemovedProjectWork,
+    reconcileProjectAssignments,
     clearLeadContext: () => {
       state.leadContext = void 0;
     }
@@ -22560,9 +22945,9 @@ Use reply_agent with agent="${ask.agentLabel}" to answer this question.`,
   const reconcileRoleTools = () => roleTransitions.reconcileRoleTools();
   const isCurrentChief = (ctx) => leadRuntime.chiefMode === "active" && !!leadRuntime.chiefLease && leadRuntime.chiefLease.descriptor.piSessionId === ctx.sessionManager.getSessionId();
   const chiefSystemPrompt = (options) => {
-    const agentDir = resolve6(getAgentDir4());
+    const agentDir = resolve7(getAgentDir4());
     const globalInstructions = (options?.contextFiles ?? []).filter(
-      ({ path, content }) => typeof path === "string" && typeof content === "string" && resolve6(dirname7(path)) === agentDir && content.length > 0
+      ({ path, content }) => typeof path === "string" && typeof content === "string" && resolve7(dirname7(path)) === agentDir && content.length > 0
     ).map(({ content }) => content).join("\n\n");
     return [
       CHIEF_ROLE_CHARTER,
@@ -22597,6 +22982,7 @@ ${globalInstructions}
     paneId: () => process.env.HERDR_PANE_ID,
     getSessionName: () => pi.getSessionName(),
     runHerdr,
+    SessionManager: SessionManager2,
     reportLeadMetadata,
     workspaceId: () => process.env.HERDR_WORKSPACE_ID,
     identity: {
@@ -23310,7 +23696,6 @@ ${summary}`,
           appendDurableError
         },
         statusSnapshotHost: {
-          hasStateIssues: () => listAgentStateIssues().length > 0,
           environmentIdentity: (ctx) => managedAgentEnvironmentIdentity(ctx, HERDSMAN_BUILD),
           identityFromEnvironment: () => ({
             definition: process.env.PI_HERDSMAN_AGENT_DEFINITION,