pi-herdsman 0.20.0 → 0.20.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.20.0",
+  version: "0.20.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",
@@ -6128,10 +6128,7 @@ var StatusWidget = class {
     const s = this.snapshot;
     const suffix = s.unavailable ? "unavailable" : `${formatStatusCounts(s.agents)}${s.stale ? " \xB7 stale" : ""}`;
     const availableWidth = Math.max(0, width);
-    const breadcrumb = renderBreadcrumb(
-      s.breadcrumb ?? ["herd"],
-      availableWidth
-    );
+    const breadcrumb = renderBreadcrumb(s.breadcrumb ?? ["?"], availableWidth);
     const elapsed = formatElapsed(s.herdRunStartedAt, Date.now());
     const run = !s.identityOnly && elapsed ? ` \xB7 ${elapsed}` : "";
     const suffixText = s.identityOnly || !suffix ? "" : `  ${suffix}`;
@@ -7378,8 +7375,10 @@ function claimManagerLease(identity, runtime = supervisionRuntime()) {
   };
 }
 var PROJECT_ASSIGNMENT_MAX_BYTES = 1024 * 1024;
+var PROJECT_ASSIGNMENT_FILE_MAX_BYTES = PROJECT_ASSIGNMENT_MAX_BYTES * 2;
 function projectAssignmentBytes(assignment) {
-  return Buffer.byteLength(`${JSON.stringify(assignment)}
+  const { piSessionFile: _, ...payload } = assignment;
+  return Buffer.byteLength(`${JSON.stringify(payload)}
 `, "utf8");
 }
 function projectAssignmentPath(runtime, repoKey, branch) {
@@ -7395,17 +7394,17 @@ function validProjectAssignment(value2) {
   if (!value2 || typeof value2 !== "object" || Array.isArray(value2)) return false;
   const r = value2;
   const required = ["version", "id", "repoKey", "branch", "text"];
-  const optional = ["resultBindings"];
+  const optional = ["piSessionFile", "resultBindings"];
   return required.every((key) => Object.hasOwn(r, key)) && Object.keys(r).every(
     (key) => required.includes(key) || optional.includes(key)
-  ) && Object.keys(r).length >= required.length && r.version === 2 && UUID3.test(String(r.id)) && validNativeIdentity(r.repoKey) && validNativeIdentity(r.branch) && typeof r.text === "string" && r.text.length > 0 && (r.resultBindings === void 0 || Array.isArray(r.resultBindings) && r.resultBindings.every(isResultBinding));
+  ) && Object.keys(r).length >= required.length && r.version === 2 && UUID3.test(String(r.id)) && validNativeIdentity(r.repoKey) && validNativeIdentity(r.branch) && typeof r.text === "string" && r.text.length > 0 && (r.piSessionFile === void 0 || typeof r.piSessionFile === "string" && r.piSessionFile.length > 0) && (r.resultBindings === void 0 || Array.isArray(r.resultBindings) && r.resultBindings.every(isResultBinding));
 }
 function writeProjectAssignment(runtime, assignment) {
   if (!validProjectAssignment(assignment))
     throw new Error("Invalid project assignment");
   const content = `${JSON.stringify(assignment)}
 `;
-  if (projectAssignmentBytes(assignment) > PROJECT_ASSIGNMENT_MAX_BYTES)
+  if (projectAssignmentBytes(assignment) > PROJECT_ASSIGNMENT_MAX_BYTES || Buffer.byteLength(content, "utf8") > PROJECT_ASSIGNMENT_FILE_MAX_BYTES)
     throw new Error("Project assignment is too large");
   const path = projectAssignmentPath(
     runtime,
@@ -7444,7 +7443,7 @@ function readProjectAssignment(runtime, repoKey, branch) {
 function readProjectAssignmentFile(path, repoKey, branch) {
   let value2;
   try {
-    if (statSync4(path).size > PROJECT_ASSIGNMENT_MAX_BYTES)
+    if (statSync4(path).size > PROJECT_ASSIGNMENT_FILE_MAX_BYTES)
       throw new Error("file is too large");
     value2 = JSON.parse(readFileSync8(path, "utf8"));
   } catch (error2) {
@@ -7454,6 +7453,8 @@ function readProjectAssignmentFile(path, repoKey, branch) {
   }
   if (!validProjectAssignment(value2))
     throw projectAssignmentReadError(path, "invalid assignment schema");
+  if (projectAssignmentBytes(value2) > PROJECT_ASSIGNMENT_MAX_BYTES)
+    throw projectAssignmentReadError(path, "assignment payload is too large");
   if (value2.repoKey !== repoKey || basename5(dirname6(path)) !== createHash6("sha256").update(repoKey).digest("hex") || branch !== void 0 && value2.branch !== branch || basename5(path) !== `${createHash6("sha256").update(value2.branch).digest("hex")}.json`)
     throw projectAssignmentReadError(path, "assignment identity mismatch");
   return value2;
@@ -7977,7 +7978,7 @@ function buildAgentStatusSnapshot(view, ctx, host) {
     stale: false,
     unavailable: false,
     ...herdStartedAt !== void 0 ? { herdRunStartedAt: herdStartedAt } : {},
-    breadcrumb: host.scope.kind === "lead" ? ["herd"] : statusBreadcrumb(
+    breadcrumb: host.scope.kind === "lead" ? ["lead"] : statusBreadcrumb(
       view,
       host.environmentIdentity(ctx),
       host.identityFromEnvironment(),
@@ -8000,8 +8001,7 @@ function createAgentStatusRuntime() {
   let lastValidStatus = {
     agents: [],
     stale: false,
-    unavailable: true,
-    breadcrumb: ["herd"]
+    unavailable: true
   };
   const widgetSnapshot = (snapshot) => {
     const pendingStarts = options?.pendingStartEntries() ?? [];
@@ -8045,11 +8045,12 @@ function createAgentStatusRuntime() {
     }
     statusInFlight = true;
     try {
-      lastValidStatus = await configured.loadSnapshot(ctx);
+      const snapshot = await configured.loadSnapshot(ctx);
       if (generation !== statusGeneration || ctx !== statusContext) return;
-      reconcilePendingStarts(lastValidStatus);
+      lastValidStatus = snapshot;
+      reconcilePendingStarts(snapshot);
       if (generation === statusGeneration && ctx === statusContext && statusWidgetGeneration === generation)
-        statusWidget?.setSnapshot(widgetSnapshot(lastValidStatus));
+        statusWidget?.setSnapshot(widgetSnapshot(snapshot));
     } catch {
       if (generation === statusGeneration && ctx === statusContext)
         statusWidget?.setSnapshot(
@@ -8102,8 +8103,7 @@ function createAgentStatusRuntime() {
       statusContext = ctx;
       ctx.ui.setWidget("pi-herdsman", (tui, theme) => {
         const widget = createStatusWidget(() => tui.requestRender(), theme);
-        const initial = options?.initialWidgetSnapshot?.();
-        if (initial) widget.setSnapshot(initial);
+        widget.setSnapshot(widgetSnapshot(lastValidStatus));
         if (generation === statusGeneration && ctx === statusContext) {
           statusWidget = widget;
           statusWidgetGeneration = generation;
@@ -8129,6 +8129,11 @@ function createAgentStatusRuntime() {
       statusWidgetGeneration = 0;
       statusContext = void 0;
       requestActive = false;
+      lastValidStatus = {
+        agents: [],
+        stale: false,
+        unavailable: true
+      };
       beforeActivate?.();
       statusContext = ctx;
       return ++statusGeneration;
@@ -8506,7 +8511,7 @@ function statusBreadcrumb(snapshot, candidate, identity, sameIdentity) {
       ({ state }) => state.piSessionId === ownerSessionId
     ))
       return ["?", ...definitions.reverse()];
-    return snapshot.leadSessionIds.includes(ownerSessionId) ? ["herd", ...definitions.reverse()] : ["?", ...definitions.reverse()];
+    return snapshot.leadSessionIds.includes(ownerSessionId) ? ["lead", ...definitions.reverse()] : ["?", ...definitions.reverse()];
   }
 }
 function sessionAgentIdentity(entries, sessionId) {
@@ -15301,7 +15306,7 @@ import { getSelectListTheme } from "@earendil-works/pi-coding-agent";
 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 { statSync as statSync6, unlinkSync as unlinkSync8 } from "node:fs";
+import { realpathSync as realpathSync5, statSync as statSync6, unlinkSync as unlinkSync8 } from "node:fs";
 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 {
@@ -15973,7 +15978,7 @@ function createLeadCommandRuntime(host) {
     },
     async showSessionStats(ctx) {
       const managerActive = host.roleActive("manager");
-      const stats = await host.collectOwnedSessionUsage(ctx, managerActive);
+      const stats = host.collectOwnedSessionUsage(ctx);
       ctx.ui.notify(
         host.formatSessionUsage(
           stats.current,
@@ -16485,6 +16490,9 @@ function registerLeadRuntime(pi, options) {
     currentManager: (...args) => roleTransitions.currentManager(...args),
     sameManagerDescriptor: projectHost.sameManagerDescriptor,
     withProjectWorkLock: (...args) => roleTransitions.withProjectWorkLock(...args),
+    withProjectAssignmentLock: (...args) => roleTransitions.withProjectAssignmentLock(...args),
+    supervisedSessionFile: (agent, sessionId) => options.supervisionHost.supervisedSessionFile(agent, sessionId),
+    sameObservedSessionPath,
     activeRole: () => activeLeadRole(options.leadRuntime),
     managerLease: () => options.leadRuntime.managerLease,
     currentChiefAuthority: (...args) => roleTransitions.currentChiefAuthority(...args),
@@ -16517,8 +16525,8 @@ function registerLeadRuntime(pi, options) {
   });
   const commandRuntime = createLeadCommandRuntime({
     ...options.commandHost,
-    collectOwnedSessionUsage: async (ctx, managerScopeOrLeadIds) => {
-      const managerActive = typeof managerScopeOrLeadIds === "boolean" ? managerScopeOrLeadIds : activeLeadRole(options.leadRuntime) === "manager" && !options.leadRuntime.roleSuspended;
+    collectOwnedSessionUsage: (ctx) => {
+      const managerActive = activeLeadRole(options.leadRuntime) === "manager" && !options.leadRuntime.roleSuspended;
       if (!managerActive)
         return options.commandHost.collectOwnedSessionUsage(ctx);
       const lease = options.leadRuntime.managerLease;
@@ -16529,7 +16537,7 @@ function registerLeadRuntime(pi, options) {
       );
       return options.commandHost.collectOwnedSessionUsage(
         ctx,
-        assignments.map((assignment) => assignment.id)
+        assignments.map(({ id, piSessionFile }) => ({ id, piSessionFile }))
       );
     },
     isLead: () => true,
@@ -17681,6 +17689,8 @@ function createLeadProjectRuntime(host) {
     HERDSMAN_BUILD: HERDSMAN_BUILD2,
     HERDSMAN_EXTENSION_PATH: HERDSMAN_EXTENSION_PATH2,
     SessionManager: SessionManager3,
+    supervisedSessionFile: supervisedSessionFile2,
+    sameObservedSessionPath: sameObservedSessionPath2,
     currentManager,
     sameManagerDescriptor: sameManagerDescriptor2,
     worktreeGroupScope: worktreeGroupScope2,
@@ -17721,6 +17731,33 @@ function createLeadProjectRuntime(host) {
     prepareCoordinationInput,
     stopProjectLead: projectStop
   } = host;
+  const persistLeadSessionFile = async (assignment, piSessionFile) => host.withProjectAssignmentLock(
+    assignment.repoKey,
+    assignment.branch,
+    () => {
+      const current = host.readProjectAssignment(
+        host.supervisionRuntime(),
+        assignment.repoKey,
+        assignment.branch
+      );
+      if (!current || current.id !== assignment.id)
+        throw new Error("Project assignment changed during Lead activation");
+      if (current.piSessionFile) {
+        if (!sameObservedSessionPath2(current.piSessionFile, piSessionFile))
+          throw new Error(
+            "Lead session path conflicts with persisted project identity"
+          );
+        return current;
+      }
+      const bound = { ...current, piSessionFile };
+      host.writeProjectAssignment(host.supervisionRuntime(), bound);
+      return bound;
+    }
+  );
+  const bindLeadSessionFile = async (assignment, lead) => {
+    const piSessionFile = supervisedSessionFile2(lead, assignment.id);
+    return piSessionFile ? persistLeadSessionFile(assignment, piSessionFile) : assignment;
+  };
   const activateProjectLead = async (params, ctx, signal) => {
     const repoKey = leadRuntime.managerLease?.descriptor.repoKey;
     if (!repoKey) throw new Error("Manager lease is no longer active");
@@ -17806,6 +17843,7 @@ function createLeadProjectRuntime(host) {
         operationName,
         `Lead ${id}`
       );
+      await bindLeadSessionFile(existing, live[0]);
       writeChiefMessage2({
         version: 2,
         build: HERDSMAN_BUILD2,
@@ -17952,15 +17990,42 @@ function createLeadProjectRuntime(host) {
           "--no-focus"
         ];
         if (operation.action === "resume") {
-          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.`
+          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 (saved[0]?.cwd) args.push("--path", saved[0].cwd);
+          if (savedCwd) args.push("--path", savedCwd);
         } else args.push("--base", operation.base ?? "HEAD");
         const created = await runHerdr2(pi, ctx, args, { signal });
         workspaceId = created?.workspace?.workspace_id;
@@ -18177,6 +18242,7 @@ function createLeadProjectRuntime(host) {
         operationName,
         `Lead ${assignment.id}`
       );
+      assignment = await bindLeadSessionFile(assignment, lead);
       writeChiefMessage2({
         version: 2,
         build: HERDSMAN_BUILD2,
@@ -18233,6 +18299,7 @@ function createLeadProjectRuntime(host) {
         );
       }
       await assertManagerCurrent();
+      await bindLeadSessionFile(assignment, rediscovered);
       return {
         content: [
           {
@@ -21012,46 +21079,31 @@ function retiredManagedSession(manager) {
   const entries = manager.getEntries();
   return !!sessionAgentIdentity(entries, sessionId) && sessionContextRetired(entries, sessionId);
 }
-async function collectOwnedSessionUsage(ctx, managerScopeOrLeadIds) {
-  const managedLeadIds = Array.isArray(managerScopeOrLeadIds) ? managerScopeOrLeadIds : void 0;
-  if (!managedLeadIds?.length)
+function collectOwnedSessionUsage(ctx, managedLeads) {
+  if (managedLeads === void 0)
     return collectSessionUsage(
       ctx,
       ownedAssignmentChildren,
       openOwnedAssignmentSession
     );
-  const wanted = new Set(managedLeadIds);
-  const signal = ctx.signal;
-  let sessions;
-  try {
-    sessions = await SessionManager2.listAll(void 0, signal);
-  } catch (error2) {
-    if (signal?.aborted) throw error2;
-    return collectSessionUsage(
-      ctx,
-      ownedAssignmentChildren,
-      openOwnedAssignmentSession,
-      [],
-      false
-    );
-  }
-  const matches = /* @__PURE__ */ new Map();
-  for (const session of sessions) {
-    if (!wanted.has(session.id)) continue;
-    const paths = matches.get(session.id) ?? [];
-    paths.push(session.path);
-    matches.set(session.id, paths);
+  const pathsById = /* @__PURE__ */ new Map();
+  for (const { id, piSessionFile } of managedLeads) {
+    if (!pathsById.has(id)) pathsById.set(id, /* @__PURE__ */ new Set());
+    if (!piSessionFile) continue;
+    try {
+      pathsById.get(id).add(canonicalSessionPath(piSessionFile));
+    } catch {
+    }
   }
   const roots = [];
   let complete = true;
-  for (const id of wanted) {
-    const paths = matches.get(id) ?? [];
-    if (paths.length !== 1) {
+  for (const [id, paths] of pathsById) {
+    if (paths.size !== 1) {
       complete = false;
       continue;
     }
     try {
-      const manager = SessionManager2.open(paths[0]);
+      const manager = SessionManager2.open(paths.values().next().value);
       if (manager.getSessionId() !== id) {
         complete = false;
         continue;
@@ -21771,7 +21823,7 @@ ${globalInstructions}
       definitionRoster: () => startupDefinitionRoster,
       isStaffTool: (name) => STAFF_TOOLS.includes(name)
     };
-    const initialStatusBreadcrumb = controllerScope.kind === "lead" ? ["herd"] : [
+    const initialStatusBreadcrumb = controllerScope.kind === "lead" ? ["lead"] : [
       "?",
       process.env.PI_HERDSMAN_AGENT_DEFINITION && process.env.PI_HERDSMAN_LABEL ? displayIdentity(
         process.env.PI_HERDSMAN_AGENT_DEFINITION,