pi-herdsman 0.25.0 → 0.26.0

package/dist/index.js

@@ -15,7 +15,7 @@ import { fileURLToPath as fileURLToPath2 } from "node:url";
 // package.json
 var package_default = {
   name: "pi-herdsman",
-  version: "0.25.0",
+  version: "0.26.0",
   type: "module",
   description: "Asynchronous Pi subagents and agent fleet orchestration for parallel coding agents with nested delegation, background work, and supervision in herdr.",
   license: "Apache-2.0",
@@ -944,6 +944,7 @@ function validate(value2, kind) {
       const error2 = v.error;
       const codes = [
         "empty_result",
+        "execution_error",
         "result_too_large",
         "write_failure",
         "aborted"
@@ -5638,7 +5639,7 @@ function coordinationBody(action, args) {
   return typeof text === "string" && text.trim() ? { label, text } : void 0;
 }
 function coordinationHeader(tool, verb, target, theme) {
-  const title = tool === "agent" ? verb === "list" ? "list agents" : verb === "transcript" ? "read agent transcript" : `${verb} agent` : tool === "staff" ? verb === "transcript" ? "read staff transcript" : `${verb} ${verb === "delegate" || verb === "resume" ? "project" : verb === "stop" ? "lead" : "staff"}` : tool === "peer" ? verb === "list" ? "list peers" : "message peer" : `${verb} supervisor`;
+  const title = tool === "agent" ? verb === "list" ? "list agents" : verb === "transcript" ? "read agent transcript" : `${verb} agent` : tool === "staff" ? verb === "transcript" ? "read staff transcript" : `${verb} ${verb === "delegate" || verb === "resume" ? "project" : verb === "stop" ? "lead" : verb === "remove" ? "worktree" : "staff"}` : tool === "peer" ? verb === "list" ? "list peers" : "message peer" : `${verb} supervisor`;
   return `${humanText(theme, "toolTitle", theme.bold(title))}${target ? `  ${humanText(theme, "accent", target)}` : ""}`;
 }
 function renderExpandedCoordinationCall(tool, action, args, theme, header) {
@@ -5843,7 +5844,7 @@ function agentHierarchy(details) {
 }
 function expandedResultLines(tool, action, details, args, theme) {
   const display = value(details.display_name) || value(details.agent) || value(details.label) || value(details.session) || value(args.agent) || value(args.label) || "agent";
-  const heading = action === "list" ? tool === "staff" ? "staff" : tool === "peer" ? "peer" : "agents" : action === "inspect" ? `inspect ${display}` : action === "delegate" || action === "continue" ? `${display} started` : tool === "supervisor" ? "sent to supervisor" : action === "steer" ? "steering queued" : action === "interrupt" ? "interrupt accepted" : tool === "agent" && action === "reply" ? `reply sent to ${display}` : action === "close" ? `${display} closed` : `${action} ${display}`;
+  const heading = action === "list" ? tool === "staff" ? "staff" : tool === "peer" ? "peer" : "agents" : action === "inspect" ? `inspect ${display}` : tool === "staff" && action === "remove" ? "remove worktree" : action === "delegate" || action === "continue" ? `${display} started` : tool === "supervisor" ? "sent to supervisor" : action === "steer" ? "steering queued" : action === "interrupt" ? "interrupt accepted" : tool === "agent" && action === "reply" ? `reply sent to ${display}` : action === "close" ? `${display} closed` : `${action} ${display}`;
   const lines = [heading];
   const fields = [
     ["definition", details.definition ?? details.agent_definition],
@@ -5852,6 +5853,10 @@ function expandedResultLines(tool, action, details, args, theme) {
       details.session ?? details.session_id ?? details.pi_session_id ?? details.chiefSessionId
     ],
     ["branch", tool === "staff" ? details.branch : void 0],
+    [
+      "checkout path",
+      tool === "staff" && action === "remove" ? details.checkout_path : void 0
+    ],
     [
       "task",
       tool === "staff" && action === "resume" ? details.presentation_task : void 0
@@ -5876,6 +5881,12 @@ function expandedResultLines(tool, action, details, args, theme) {
   for (const [label, field] of fields)
     if (field !== void 0 && field !== "")
       lines.push(`${label}: ${String(field)}`);
+  if (tool === "staff" && action === "remove") {
+    lines.push(
+      `checkout: ${details.checkout_removed === true ? "removed" : details.checkout_state === "present" ? "preserved" : `unconfirmed (${value(details.checkout_state) || "unknown"})`}`,
+      `assignment: ${details.assignment_retired === true ? "retired" : details.assignment_retired === false ? "not retired" : "unconfirmed"}`
+    );
+  }
   if (action === "list" && tool === "agent")
     lines.push(
       "",
@@ -6003,6 +6014,12 @@ function renderCoordinationResult(tool, action, result, options, theme, context
       0,
       0
     );
+  if (!failed && tool === "staff" && action === "remove" && expanded && (details.checkout_state !== void 0 || details.checkout_removed !== void 0))
+    return new WidthSafeText(
+      expandedResultLines(tool, action, details, args, theme).join("\n"),
+      0,
+      0
+    );
   if (failed) {
     const raw = resultContent(result);
     const fallback = expanded ? raw.length > 4e3 ? `${raw.slice(0, 3999)}\u2026` : raw || "Operation failed" : collapseDisplayText(raw, 240) || "Operation failed";
@@ -6114,6 +6131,11 @@ ${humanText(theme, "warning", `  ! cleanup warning \xB7 Ctrl+O`)}` : ""),
       0,
       0
     );
+  if (tool === "staff" && action === "remove") {
+    const branch = value(details.branch) || value(args.branch) || "worktree";
+    const outcome = details.checkout_removed === true ? details.assignment_retired === true ? `removed ${branch} \xB7 assignment retired` : `removed ${branch} \xB7 assignment retirement unconfirmed` : details.checkout_state === "present" ? `removal failed \xB7 ${branch} preserved` : `removal outcome unknown \xB7 ${branch}`;
+    return new WidthSafeText(statusLine(theme, "success", "\u2713", outcome), 0, 0);
+  }
   return new WidthSafeText(
     statusLine(theme, "success", "\u2713", `sent to ${display}`),
     0,
@@ -6823,6 +6845,7 @@ import {
 } from "node:fs";
 import { createHash as createHash6, randomUUID as randomUUID7 } from "node:crypto";
 import { basename as basename5, dirname as dirname6, join as join8 } from "node:path";
+import { isDeepStrictEqual } from "node:util";
 function sessionLeadRoleState(entries) {
   const entry = [...entries].reverse().find(
     (candidate) => candidate?.type === "custom" && candidate.customType === "pi-herdsman-role"
@@ -6911,6 +6934,29 @@ function fsyncDirectory(directory) {
     closeSync8(fd);
   }
 }
+function publishRecord(path, content) {
+  const directory = dirname6(path);
+  const temporary = join8(directory, `.${basename5(path)}.${randomUUID7()}.tmp`);
+  let fd;
+  try {
+    fd = openSync8(temporary, "wx", 384);
+    writeFileSync5(fd, content, "utf8");
+    fsyncSync4(fd);
+    closeSync8(fd);
+    fd = void 0;
+    renameSync6(temporary, path);
+    chmodSync7(path, 384);
+    fsyncDirectory(directory);
+    return path;
+  } finally {
+    if (fd !== void 0) closeSync8(fd);
+    try {
+      unlinkSync6(temporary);
+    } catch (error2) {
+      if (error2.code !== "ENOENT") throw error2;
+    }
+  }
+}
 function withChiefMessageLock(path, operation) {
   const lock = `${path}.lock`;
   const lease = acquireProcessLock(lock, { name: "Chief message lock" });
@@ -7035,6 +7081,18 @@ function writeChiefMessageUnlocked(record, runtime, clearQuarantine) {
   mkdirSync7(directory, { recursive: true, mode: 448 });
   chmodSync7(directory, 448);
   const path = chiefMessagePath(runtime, record.toSessionId, record.id);
+  if (record.kind !== "project_assignment") {
+    try {
+      statSync4(path);
+      const existing = readChiefMessage(path);
+      if (!isDeepStrictEqual(existing, record))
+        throw new Error(
+          "Chief message ID already exists with a different payload"
+        );
+    } catch (error2) {
+      if (error2.code !== "ENOENT") throw error2;
+    }
+  }
   const temporary = join8(directory, `.${record.id}.${randomUUID7()}.tmp`);
   const content = `${JSON.stringify(record)}
 `;
@@ -7553,32 +7611,13 @@ function writePeerLeadRecord(runtime, record) {
   const live = livePeerClaim(runtime, record.piSessionId);
   if (live.pid !== record.claim.pid || live.id !== record.claim.id)
     throw new Error("Peer lead process-lock generation changed");
-  const directory = peerDirectory(runtime);
+  peerDirectory(runtime);
   const path = peerLeadRecordPath(runtime, record.piSessionId);
   const content = `${JSON.stringify(record)}
 `;
   if (Buffer.byteLength(content, "utf8") > PEER_LEAD_RECORD_MAX_BYTES)
     throw new Error("Peer lead record is too large");
-  const temporary = join8(directory, `.${basename5(path)}.${randomUUID7()}.tmp`);
-  let fd;
-  try {
-    fd = openSync8(temporary, "wx", 384);
-    writeFileSync5(fd, content, "utf8");
-    fsyncSync4(fd);
-    closeSync8(fd);
-    fd = void 0;
-    renameSync6(temporary, path);
-    chmodSync7(path, 384);
-    fsyncDirectory(directory);
-    return path;
-  } finally {
-    if (fd !== void 0) closeSync8(fd);
-    try {
-      unlinkSync6(temporary);
-    } catch (error2) {
-      if (error2.code !== "ENOENT") throw error2;
-    }
-  }
+  return publishRecord(path, content);
 }
 function removePeerLeadRecord(runtime, piSessionId, expected) {
   const path = peerLeadRecordPath(runtime, piSessionId);
@@ -8026,6 +8065,7 @@ function validProjectMessage(value2) {
       "branch",
       "fromSessionId",
       "text",
+      "kind",
       "createdAt",
       "resultBindings"
     ].includes(key)
@@ -8037,7 +8077,7 @@ function validProjectMessage(value2) {
     "fromSessionId",
     "text",
     "createdAt"
-  ].every((key) => Object.hasOwn(r, key)) && r.version === 2 && UUID3.test(String(r.id)) && validNativeIdentity(r.repoKey) && validNativeIdentity(r.branch) && validSession(r.fromSessionId) && typeof r.text === "string" && r.text.length > 0 && (r.resultBindings === void 0 || Array.isArray(r.resultBindings) && r.resultBindings.every(isResultBinding)) && Number.isInteger(r.createdAt) && r.createdAt >= 0 && Buffer.byteLength(`${JSON.stringify(r)}
+  ].every((key) => Object.hasOwn(r, key)) && r.version === 2 && UUID3.test(String(r.id)) && validNativeIdentity(r.repoKey) && validNativeIdentity(r.branch) && validSession(r.fromSessionId) && typeof r.text === "string" && r.text.length > 0 && (r.kind === void 0 || r.kind === "execution_failure") && (r.resultBindings === void 0 || Array.isArray(r.resultBindings) && r.resultBindings.every(isResultBinding)) && Number.isInteger(r.createdAt) && r.createdAt >= 0 && Buffer.byteLength(`${JSON.stringify(r)}
 `, "utf8") <= COORDINATION_MESSAGE_MAX_BYTES;
 }
 function projectMessageBytes(record) {
@@ -8066,9 +8106,27 @@ function writeProjectMessage(record, runtime) {
     fsyncSync4(fd);
     closeSync8(fd);
     fd = void 0;
-    renameSync6(temporary, path);
-    chmodSync7(path, 384);
-    fsyncDirectory(directory);
+    let existing;
+    try {
+      if (statSync4(path).size > COORDINATION_MESSAGE_MAX_BYTES)
+        throw new Error("large");
+      existing = JSON.parse(readFileSync8(path, "utf8"));
+    } catch (error2) {
+      if (error2.code !== "ENOENT")
+        throw new Error(`Unable to verify existing project message ${path}`, {
+          cause: error2
+        });
+    }
+    if (existing !== void 0) {
+      if (!validProjectMessage(existing) || JSON.stringify(existing) !== JSON.stringify(record))
+        throw new Error(
+          "Project message identity conflicts with durable payload"
+        );
+    } else {
+      renameSync6(temporary, path);
+      chmodSync7(path, 384);
+      fsyncDirectory(directory);
+    }
   } finally {
     if (fd !== void 0) closeSync8(fd);
     try {
@@ -8296,31 +8354,12 @@ function readLeadCoordinationState(runtime, piSessionId) {
 function writeLeadCoordinationState(runtime, state) {
   if (!state.build || !validLeadState(state))
     throw new Error("Invalid lead coordination state");
-  const directory = leadStateDirectory(runtime);
+  leadStateDirectory(runtime);
   const path = leadCoordinationStatePath(runtime, state.piSessionId);
   const content = JSON.stringify(state) + "\n";
   if (Buffer.byteLength(content, "utf8") > LEAD_STATE_MAX_BYTES)
     throw new Error("Lead coordination state is too large");
-  const temporary = join8(directory, `.${basename5(path)}.${randomUUID7()}.tmp`);
-  let fd;
-  try {
-    fd = openSync8(temporary, "wx", 384);
-    writeFileSync5(fd, content, "utf8");
-    fsyncSync4(fd);
-    closeSync8(fd);
-    fd = void 0;
-    renameSync6(temporary, path);
-    chmodSync7(path, 384);
-    fsyncDirectory(directory);
-    return path;
-  } finally {
-    if (fd !== void 0) closeSync8(fd);
-    try {
-      unlinkSync6(temporary);
-    } catch (e) {
-      if (e.code !== "ENOENT") throw e;
-    }
-  }
+  return publishRecord(path, content);
 }
 function invalidateLeadCoordinationState(runtime, piSessionId, expectedInstanceId) {
   const path = leadCoordinationStatePath(runtime, piSessionId);
@@ -10051,6 +10090,30 @@ function createAgentController(pi, options) {
       return false;
     }
   };
+  const recordDependencies = {
+    persistedTranscriptReady: persistedTranscriptReady2,
+    cascadePlan: (items, state) => managedAgentCascadePlanFromSnapshot(items, state, sameIdentity),
+    assertCascadeSafe: (items) => assertManagedAgentCascadeSafe(items, sameIdentity),
+    runtimeForLabel: (label) => runtimes.get(label),
+    sameIdentity,
+    runtimeIdentityState: (runtime) => ({
+      version: 5,
+      build: options.build,
+      runId: runtime.runId,
+      ownerSessionId: runtime.ownerSessionId,
+      workspaceId: runtime.workspaceId,
+      agentLabel: runtime.label,
+      paneId: runtime.paneId,
+      piSessionId: runtime.piSessionId ?? "",
+      piSessionFile: runtime.piSessionFile,
+      cwd: runtime.cwd,
+      updatedAt: 0
+    })
+  };
+  const listRecordDependencies = {
+    ...recordDependencies,
+    persistedTranscriptReady: options.persistedTranscriptReady
+  };
   const snapshots = (context, signal, allWorkspaces = false, allowTranscriptDefinitionFallback = true) => snapshot(
     context,
     signal,
@@ -10096,26 +10159,7 @@ function createAgentController(pi, options) {
     ownerSessionId,
     scope,
     unresolvedMailboxState,
-    {
-      persistedTranscriptReady: options.persistedTranscriptReady,
-      cascadePlan: (items, state) => managedAgentCascadePlanFromSnapshot(items, state, sameIdentity),
-      assertCascadeSafe: (items) => assertManagedAgentCascadeSafe(items, sameIdentity),
-      runtimeForLabel: (label) => runtimes.get(label),
-      sameIdentity,
-      runtimeIdentityState: (runtime) => ({
-        version: 5,
-        build: options.build,
-        runId: runtime.runId,
-        ownerSessionId: runtime.ownerSessionId,
-        workspaceId: runtime.workspaceId,
-        agentLabel: runtime.label,
-        paneId: runtime.paneId,
-        piSessionId: runtime.piSessionId ?? "",
-        piSessionFile: runtime.piSessionFile,
-        cwd: runtime.cwd,
-        updatedAt: 0
-      })
-    }
+    listRecordDependencies
   );
   const leadTabLabel = async (context) => {
     const name = pi.getSessionName() ?? context.sessionManager.getSessionName();
@@ -11043,26 +11087,7 @@ function createAgentController(pi, options) {
       context.sessionManager.getSessionId(),
       scope,
       unresolved,
-      {
-        persistedTranscriptReady: persistedTranscriptReady2,
-        cascadePlan: (items, parent) => managedAgentCascadePlanFromSnapshot(items, parent, sameIdentity),
-        assertCascadeSafe: (items) => assertManagedAgentCascadeSafe(items, sameIdentity),
-        runtimeForLabel: (label) => runtimes.get(label),
-        sameIdentity,
-        runtimeIdentityState: (runtime) => ({
-          version: 5,
-          build: options.build,
-          runId: runtime.runId,
-          ownerSessionId: runtime.ownerSessionId,
-          workspaceId: runtime.workspaceId,
-          agentLabel: runtime.label,
-          paneId: runtime.paneId,
-          piSessionId: runtime.piSessionId ?? "",
-          piSessionFile: runtime.piSessionFile,
-          cwd: runtime.cwd,
-          updatedAt: 0
-        })
-      }
+      recordDependencies
     ).available_tools;
     if (!actions.includes("read_agent_transcript")) {
       if (candidate.presence.kind === "unknown")
@@ -13296,26 +13321,7 @@ ${result.stderr ?? ""}`.trim(),
     ownerSessionId,
     options.scope,
     unresolvedMailboxState,
-    {
-      persistedTranscriptReady: persistedTranscriptReady2,
-      cascadePlan: (snapshot2, state) => managedAgentCascadePlanFromSnapshot(snapshot2, state, sameIdentity),
-      assertCascadeSafe: (items) => assertManagedAgentCascadeSafe(items, sameIdentity),
-      runtimeForLabel: (label) => runtimes.get(label),
-      sameIdentity,
-      runtimeIdentityState: (runtime) => ({
-        version: 5,
-        build: options.build,
-        runId: runtime.runId,
-        ownerSessionId: runtime.ownerSessionId,
-        workspaceId: runtime.workspaceId,
-        agentLabel: runtime.label,
-        paneId: runtime.paneId,
-        piSessionId: runtime.piSessionId ?? "",
-        piSessionFile: runtime.piSessionFile,
-        cwd: runtime.cwd,
-        updatedAt: 0
-      })
-    }
+    recordDependencies
   ).available_tools ?? []).flatMap((tool) => {
     switch (tool) {
       case "list_agents":
@@ -14207,7 +14213,7 @@ function collectSessionUsage(ctx, ownedChildren, openOwnedSession, leadRoots = [
 // extension/managed-agent-runtime.ts
 import { randomUUID as randomUUID9 } from "node:crypto";
 import { Type as Type2 } from "typebox";
-import { isDeepStrictEqual } from "node:util";
+import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
 var DELEGATING_AGENT_ROLE_CHARTER = `## Delegating agent role
 ${DELEGATING_AGENT_SCOPE_DESCRIPTION}
 ${FILE_HANDOFF_GUIDANCE}`;
@@ -14293,7 +14299,7 @@ function sameSessionPath2(left, right) {
 function sameManagedAgentDurableState(left, right) {
   const { updatedAt: _leftUpdatedAt, ...leftDurable } = left;
   const { updatedAt: _rightUpdatedAt, ...rightDurable } = right;
-  return isDeepStrictEqual(leftDurable, rightDurable);
+  return isDeepStrictEqual2(leftDurable, rightDurable);
 }
 function validateManagedAgentIdentity(input) {
   const { state, mailbox, env } = input;
@@ -14352,6 +14358,7 @@ function createManagedAgentExecutionState() {
     assignment: void 0,
     initialized: false,
     latest: "",
+    observation: void 0,
     pendingResult: void 0,
     pendingStateTransition: false,
     pendingInterruptReplacement: void 0,
@@ -15082,7 +15089,7 @@ function registerManagedAgentResultCapture(pi, options) {
   pi.on("message_end", (event, ctx) => {
     const state = options.state();
     if (!state?.activeRequestId || options.pendingResult()) return;
-    const message = event.message ?? event;
+    const message = event.message;
     if (message?.role !== "assistant") return;
     if (options.delegationEnabled && options.hasUndeliveredDirectChildWork(
       state,
@@ -15093,9 +15100,30 @@ function registerManagedAgentResultCapture(pi, options) {
   });
 }
 function registerManagedAgentActivityHandlers(pi, execution, options) {
-  pi.on("turn_end", (_event, ctx) => {
+  pi.on("agent_start", () => {
+    const requestId = execution.assignment?.activeRequestId;
+    execution.observation = requestId ? { requestId } : void 0;
+  });
+  pi.on("agent_before_settle", (event) => {
+    const observation = execution.observation;
+    if (observation && observation.requestId === execution.assignment?.activeRequestId)
+      observation.outcome = event.outcome;
+  });
+  pi.on("turn_end", (event, ctx) => {
     options.touchActivity();
-    if (!execution.assignment?.activeRequestId) return;
+    const state = execution.assignment;
+    if (!state?.activeRequestId) return;
+    if (event?.message?.role === "assistant") {
+      const observation = execution.observation ?? (execution.observation = { requestId: state.activeRequestId });
+      if (observation.requestId === state.activeRequestId) {
+        observation.outcome = event.outcome;
+        observation.responseEntryId = event.messageEntryId;
+        observation.responseText = contentText3(
+          event.message.content,
+          ""
+        ).trim();
+      }
+    }
     const usage = ctx.getContextUsage();
     const percent = usage?.percent == null ? void 0 : Math.round(usage.percent);
     const model = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : void 0;
@@ -15173,6 +15201,7 @@ function registerManagedAgentSettlementHandlers(pi, execution, options) {
       writeAgentState(mailbox, nextState);
       execution.assignment = nextState;
       execution.agentStartedAt = void 0;
+      execution.observation = void 0;
       const model = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : void 0;
       const thinking = ctx.thinkingLevel;
       execution.pendingStateTransition = false;
@@ -15209,7 +15238,10 @@ function registerManagedAgentSettlementHandlers(pi, execution, options) {
       ctx.sessionManager.getEntries()
     ))
       return;
-    const completed = !aborted && Boolean(execution.latest);
+    const observation = execution.observation;
+    const outcome = observation?.requestId === state.activeRequestId ? observation.outcome : void 0;
+    const responseText = observation?.requestId === state.activeRequestId && observation.outcome === "completed" && observation.responseEntryId ? observation.responseText?.trim() ?? "" : "";
+    const completed = !aborted && outcome === "completed" && !!responseText;
     const result = {
       version: 5,
       runId: state.runId,
@@ -15219,10 +15251,10 @@ function registerManagedAgentSettlementHandlers(pi, execution, options) {
       agentLabel: state.agentLabel,
       paneId: state.paneId,
       status: completed ? "completed" : "failed",
-      ...completed ? { text: execution.latest } : {
+      ...completed ? { text: responseText } : {
         error: {
-          code: aborted ? "aborted" : "empty_result",
-          message: aborted ? "Agent execution was cancelled" : "Agent produced no assistant text"
+          code: aborted ? "aborted" : outcome === "error" ? "execution_error" : "empty_result",
+          message: aborted ? "Agent execution was cancelled" : outcome === "error" ? "Agent model execution failed" : "Agent produced no assistant text"
         }
       },
       contextUsage: ctx.getContextUsage(),
@@ -15767,6 +15799,7 @@ This is the session-start definition snapshot. Use list_agents for live Agent st
     reportMetadata: (state, ctx, patch) => metadataPublisher.report(state, ctx, patch),
     setLatest: (value2) => {
       execution.latest = value2;
+      if (!value2) execution.observation = void 0;
     },
     startAgent: () => execution.agentStartedAt = Date.now()
   });
@@ -15777,6 +15810,7 @@ This is the session-start definition snapshot. Use list_agents for live Agent st
     hasUndeliveredDirectChildWork: (state, entries) => (controller?.hasUndeliveredDirectChildWork ?? hasUndeliveredDirectChildWork)(state, entries),
     setLatest: (value2) => {
       execution.latest = value2;
+      if (!value2) execution.observation = void 0;
     }
   });
   registerManagedAgentActivityHandlers(pi, execution, {
@@ -16586,7 +16620,7 @@ function createLeadSessionStartRuntime(host) {
         }
       }
       if (sessionSignal.aborted) return;
-      if (host.roleTransitions.activeManager())
+      if (host.isLead() && host.roleTransitions.chiefModeInactive())
         await host.publishLeadRole(
           ctx,
           "inactive",
@@ -16669,9 +16703,12 @@ This is the session-start definition snapshot. Use list_agents for live Agent st
     async agentSettled(ctx, aborted) {
       host.leadInboxRuntime.agentSettled();
       host.controller.settleAsks(ctx, host.controller.sessionSignal());
-      host.herdRun.agentSettled(ctx, aborted);
-      await host.controller.settleResults(ctx, host.controller.sessionSignal()).catch(() => {
-      });
+      try {
+        await host.herdRun.agentSettled(ctx, aborted);
+      } finally {
+        await host.controller.settleResults(ctx, host.controller.sessionSignal()).catch(() => {
+        });
+      }
     },
     toolCall(event, ctx) {
       if (!host.isCurrentChief(ctx) || (host.currentChiefAllowedTools(ctx) ?? host.chiefTools).includes(
@@ -17535,6 +17572,7 @@ function registerLeadRuntime(pi, options) {
     ...options.coordinationHost,
     currentManager: (...args) => roleTransitions.currentManager(...args),
     currentWorktreeScope: (ctx) => roleTransitions.currentWorktreeScope(ctx),
+    currentProjectAssignment: (ctx) => currentProjectAssignment(ctx),
     projectAssignmentForScope: (...args) => roleTransitions.projectAssignmentForScope(...args),
     publishProjectMessage: (...args) => roleTransitions.publishProjectMessage(...args),
     currentChiefAuthority: (...args) => roleTransitions.currentChiefAuthority(...args),
@@ -17628,7 +17666,12 @@ function registerLeadRuntime(pi, options) {
     );
   };
   const roleHost = options.roleTransitionHost;
+  const effectiveLeadRole = () => leadRuntime.chiefMode === "active" ? "chief" : leadRuntime.controllerRole === "manager" && !leadRuntime.roleSuspended ? "manager" : leadRuntime.roleSuspended ? void 0 : "lead";
   let leadMetadataQueue = Promise.resolve();
+  let tabRenameQueue = Promise.resolve();
+  let tabRenameRevision = 0;
+  let ownedTab;
+  let reportedTabRenameFailure;
   let reportedRoleMetadataFailure;
   const publishLeadRole = (ctx, _mode, generation) => {
     const sessionId = ctx.sessionManager.getSessionId();
@@ -17640,7 +17683,7 @@ function registerLeadRuntime(pi, options) {
         return;
       const paneId = roleHost.paneId();
       if (!paneId) return;
-      const role2 = leadRuntime.chiefMode === "active" ? "chief" : leadRuntime.controllerRole === "manager" && !leadRuntime.roleSuspended ? "manager" : leadRuntime.roleSuspended ? void 0 : "lead";
+      const role2 = effectiveLeadRole();
       const leadName = role2 === "lead" ? roleHost.getSessionName()?.trim() : void 0;
       const args = [
         "pane",
@@ -17691,8 +17734,92 @@ function registerLeadRuntime(pi, options) {
       } catch {
       }
     });
+    scheduleTabRename(ctx, leadMetadataQueue);
     return leadMetadataQueue;
   };
+  const scheduleTabRename = (ctx, afterMetadata) => {
+    const revision = ++tabRenameRevision;
+    const sessionId = ctx.sessionManager.getSessionId();
+    const sessionGeneration = leadRuntime.sessionGeneration;
+    const current = () => revision === tabRenameRevision && sessionGeneration === leadRuntime.sessionGeneration && sessionId === ctx.sessionManager.getSessionId();
+    tabRenameQueue = tabRenameQueue.catch(() => {
+    }).then(async () => {
+      await afterMetadata.catch(() => {
+      });
+      if (!current()) return;
+      const role2 = effectiveLeadRole();
+      if (!role2) return;
+      let label;
+      if (role2 === "chief") label = "Chief";
+      else if (role2 === "manager") label = "Manager";
+      else {
+        try {
+          label = await currentProjectAssignment(ctx) ? "Managed Lead" : "Lead";
+        } catch (error2) {
+          options.sessionStartOptions.appendRoleError(ctx, error2);
+          label = "Lead";
+        }
+      }
+      if (!current()) return;
+      const paneId = roleHost.paneId();
+      if (!paneId) return;
+      const paneResult = await roleHost.runHerdr(pi, ctx, [
+        "pane",
+        "get",
+        paneId
+      ]);
+      if (!current()) return;
+      const pane = paneResult?.pane;
+      if (!pane || pane.pane_id !== paneId || typeof pane.workspace_id !== "string" || !pane.workspace_id || typeof pane.tab_id !== "string" || !pane.tab_id)
+        return;
+      const tabResult = await roleHost.runHerdr(pi, ctx, [
+        "tab",
+        "list",
+        "--workspace",
+        pane.workspace_id
+      ]);
+      if (!current()) return;
+      const tabs = tabResult?.tabs;
+      if (!Array.isArray(tabs)) return;
+      const tabIds = /* @__PURE__ */ new Set();
+      if (tabs.some((entry) => {
+        if (!entry || typeof entry !== "object" || typeof entry.tab_id !== "string" || !entry.tab_id || typeof entry.label !== "string" || !entry.label || tabIds.has(entry.tab_id))
+          return true;
+        tabIds.add(entry.tab_id);
+        return false;
+      }))
+        return;
+      const index = tabs.findIndex((tab2) => tab2.tab_id === pane.tab_id);
+      if (index < 0) return;
+      const tab = tabs[index];
+      if (typeof tab.label !== "string") return;
+      if (tab.label === label) return;
+      const previousLabel = ownedTab?.tabId === tab.tab_id ? ownedTab.label : void 0;
+      if (previousLabel !== void 0 ? tab.label !== previousLabel : tab.label !== String(index + 1) && !["Lead", "Managed Lead", "Manager", "Chief"].includes(tab.label))
+        return;
+      if (!current()) return;
+      await roleHost.runHerdr(pi, ctx, ["tab", "rename", tab.tab_id, label], {
+        noResult: true,
+        timeout: 1e4
+      });
+      ownedTab = { tabId: tab.tab_id, label };
+      reportedTabRenameFailure = void 0;
+    }).catch((error2) => {
+      if (!current()) return;
+      const key = `${sessionId}:${sessionGeneration}`;
+      if (reportedTabRenameFailure === key) return;
+      reportedTabRenameFailure = key;
+      try {
+        roleHost.appendDurableError(
+          pi,
+          ctx,
+          "pi_herdsman_state_error",
+          error2
+        );
+      } catch {
+      }
+    });
+  };
   const queueLeadMetadata = (ctx, metadata) => {
     if (leadRuntime.controllerRole === "manager") {
       void publishLeadRole(
@@ -17839,6 +17966,7 @@ function registerLeadRuntime(pi, options) {
     coordinationHealthy: () => coordinationRuntime.coordinationHealthy(),
     managerDiagnostic,
     managerDiagnosticEvents,
+    assignmentDelivered: (ctx) => void publishLeadRole(ctx, "inactive", leadRuntime.chiefModeGeneration),
     isCurrentChief: (ctx) => options.leadRuntime.chiefMode === "active" && !!options.leadRuntime.chiefLease && options.leadRuntime.chiefLease.descriptor.piSessionId === ctx.sessionManager.getSessionId(),
     prepareSupervisionMessage: (ctx) => supervisionUiRuntime.prepareMessage(ctx),
     livePeerLead: (...args) => coordinationRuntime.livePeerLead(...args),
@@ -18062,11 +18190,26 @@ function registerLeadRuntime(pi, options) {
   herdRunRuntime = createLeadHerdRunRuntime({
     pi,
     entryName: options.herdRunEntryName,
+    activeRole: () => activeLeadRole(options.leadRuntime),
+    isManagedLead: () => !!leadExecution?.managed,
     hasPendingStarts: () => controller.hasPendingStarts(),
     listAgentStates: () => controller.listAgentStates(),
-    currentWorktreeScope: (ctx) => roleTransitions.currentWorktreeScope(ctx),
-    projectAssignmentForScope: (...args) => roleTransitions.projectAssignmentForScope(...args),
+    currentProjectAssignment: (ctx) => currentProjectAssignment(ctx),
     publishProjectMessage: (...args) => roleTransitions.publishProjectMessage(...args),
+    publishChiefFailure: async (ctx, message, reportId, role2, createdAt) => {
+      const chief = await roleTransitions.currentChiefAuthority(ctx);
+      if (!chief) return false;
+      await coordinationRuntime.queueChiefRecord(
+        role2 === "manager" ? "manager_message" : "lead_message",
+        message,
+        ctx,
+        reportId,
+        createdAt,
+        void 0,
+        { piSessionId: chief.piSessionId, leaseId: chief.leaseId }
+      );
+      return true;
+    },
     requestStatusRefresh: () => statusRuntime.requestRefresh(),
     queueLeadPresentation: options.queueLeadPresentation,
     appendDurableError: options.herdRunServices.appendDurableError
@@ -18212,8 +18355,10 @@ function registerLeadRuntime(pi, options) {
       if (assignment) {
         leadExecution = { mode, valid: false, managed: true };
         statusRuntime.requestRefresh();
+        publishLeadRole(ctx, "inactive", leadRuntime.chiefModeGeneration);
         return;
       }
+      publishLeadRole(ctx, "inactive", leadRuntime.chiefModeGeneration);
     } catch (error2) {
       if (signal?.aborted) return;
       leadExecution = {
@@ -18223,6 +18368,7 @@ function registerLeadRuntime(pi, options) {
       };
       statusRuntime.requestRefresh();
       options.sessionStartOptions.appendRoleError(ctx, error2);
+      publishLeadRole(ctx, "inactive", leadRuntime.chiefModeGeneration);
       return;
     }
     try {
@@ -18289,6 +18435,7 @@ function registerLeadRuntime(pi, options) {
     const baseline = leadToolState.getLeadTools() ?? leadToolState.normalizeBaseTools(pi.getActiveTools());
     const targetTools = leadToolState.projectLeadTools(baseline, definition);
     if (!await roleTransitions.takeover(ctx)) return false;
+    publishLeadRole(ctx, "inactive", leadRuntime.chiefModeGeneration);
     try {
       persistLeadExecution("orchestrate", baseline);
       leadToolState.setLeadTools(baseline);
@@ -18398,6 +18545,10 @@ function registerLeadRuntime(pi, options) {
     "agent_start",
     (_event, ctx) => agentEvents.agentStart(ctx)
   );
+  pi.on(
+    "agent_before_settle",
+    (event) => herdRunRuntime.beforeSettle(event)
+  );
   pi.on(
     "agent_settled",
     (event, ctx) => agentEvents.agentSettled(ctx, event.aborted)
@@ -18415,10 +18566,10 @@ function registerLeadRuntime(pi, options) {
     if (!options.hasPane()) return;
     options.queueLeadPresentation(ctx, event?.name ?? options.sessionName());
   });
-  pi.on(
-    "turn_end",
-    (_event, ctx) => options.queueLeadPresentation(ctx)
-  );
+  pi.on("turn_end", (event, ctx) => {
+    herdRunRuntime.turnEnd(event);
+    options.queueLeadPresentation(ctx);
+  });
   pi.on(
     "session_compact",
     (_event, ctx) => options.queueLeadPresentation(ctx)
@@ -19435,103 +19586,400 @@ function createLeadSupervisionRuntime(host) {
 }
 function createLeadHerdRunRuntime(host) {
   let leadAgentStartedAt;
+  let leadReportId;
   let herdRunStartedAt;
+  let herdReportId;
   let leadSettled = true;
+  let observation;
   let lastSettledRun;
-  const latestMeaningfulAssistantResponse = (ctx, startedAt) => {
-    const entries = ctx.sessionManager.getBranch();
-    for (let i = entries.length - 1; i >= 0; i--) {
-      const entry = entries[i];
-      if (entry.type !== "message" || entry.message.role !== "assistant")
-        continue;
-      if ((entry.message.timestamp ?? 0) < startedAt) continue;
-      const text = contentText4(entry.message.content, "").trim();
-      if (text) return text;
+  const publishProjectHandoff = async (ctx, message, reportId = herdReportId, kind, createdAt = Date.now(), target) => {
+    const role2 = host.activeRole();
+    if (kind === "execution_failure" && !reportId) return false;
+    if (target === "project") {
+      if (role2 !== "lead") return false;
+      const assignment = await host.currentProjectAssignment(ctx);
+      if (!assignment) return false;
+      return !!await host.publishProjectMessage(
+        ctx,
+        assignment,
+        message,
+        [],
+        "herd_run",
+        reportId,
+        kind
+      );
     }
+    if (target === "chief") {
+      if (kind !== "execution_failure" || role2 === "chief") return false;
+      if (role2 === "lead" && await host.currentProjectAssignment(ctx))
+        return false;
+      return host.publishChiefFailure(ctx, message, reportId, role2, createdAt);
+    }
+    return false;
   };
-  const publishProjectHandoff = async (ctx, message) => {
-    const scope = await host.currentWorktreeScope(ctx);
-    if (!scope) return;
-    const assignment = host.projectAssignmentForScope(
-      scope,
-      ctx.sessionManager.getSessionId()
-    );
-    if (!assignment) return;
-    await host.publishProjectMessage(ctx, assignment, message, [], "herd_run");
-  };
+  let finishing;
+  let idleFinishing;
   const maybeFinish = (ctx) => {
-    if (herdRunStartedAt === void 0 || !leadSettled) return;
+    if (finishing) return finishing;
+    if (herdRunStartedAt === void 0 || !leadSettled)
+      return Promise.resolve();
     const sessionId = ctx.sessionManager.getSessionId();
     if (host.hasPendingStarts() || host.listAgentStates().some(
       ({ state }) => state.ownerSessionId === sessionId
     ))
-      return;
+      return Promise.resolve();
     const startedAt = herdRunStartedAt;
     const completedAt = Date.now();
-    try {
-      host.pi.appendEntry(host.entryName, {
-        phase: "finished",
-        sessionId,
-        startedAt,
-        completedAt
-      });
-      herdRunStartedAt = void 0;
-      host.requestStatusRefresh();
-      host.queueLeadPresentation(ctx);
-      const outcome = lastSettledRun;
-      lastSettledRun = void 0;
-      const message = outcome?.aborted ? "Lead execution was cancelled before a completed response." : outcome?.summary ? `Herd run settled.
+    finishing = (async () => {
+      try {
+        const outcome = lastSettledRun;
+        if (outcome?.outcome === "completed") {
+          const message = outcome.summary ? `Herd run settled.
 
-${outcome.summary}` : "Herd run settled.";
-      void publishProjectHandoff(ctx, message).catch(
-        (error2) => host.appendDurableError(host.pi, ctx, "pi_herdsman_state_error", error2)
-      );
-    } catch (error2) {
-      host.appendDurableError(host.pi, ctx, "pi_herdsman_state_error", error2);
-    }
-  };
-  const begin = (ctx) => {
-    if (herdRunStartedAt !== void 0) return;
-    const startedAt = leadAgentStartedAt ?? Date.now();
-    herdRunStartedAt = startedAt;
-    host.queueLeadPresentation(ctx);
-    try {
-      host.pi.appendEntry(host.entryName, {
-        phase: "started",
-        sessionId: ctx.sessionManager.getSessionId(),
-        startedAt
-      });
-    } catch (error2) {
-      host.appendDurableError(host.pi, ctx, "pi_herdsman_state_error", error2);
-    }
-    host.requestStatusRefresh();
-  };
-  return {
-    begin,
-    maybeFinish,
+${outcome.summary}` : "Herd run settled without a verified Lead integration summary.";
+          let reportMessage = message;
+          let pending;
+          const managed = host.isManagedLead();
+          if (managed) {
+            const entries = ctx.sessionManager.getEntries();
+            pending = entries.find(
+              (entry) => entry?.type === "custom" && entry.customType === host.entryName && entry.data?.sessionId === sessionId && entry.data?.phase === "report_pending" && entry.data?.reportId === herdReportId
+            )?.data;
+            reportMessage = pending?.message ?? message;
+            if (!pending)
+              host.pi.appendEntry(host.entryName, {
+                phase: "report_pending",
+                sessionId,
+                startedAt,
+                reportId: herdReportId,
+                message: reportMessage,
+                target: "project"
+              });
+          }
+          const assignment = managed ? pending ? pending.target === "project" ? await host.currentProjectAssignment(ctx) : void 0 : await host.currentProjectAssignment(ctx) : void 0;
+          if (managed && !assignment) return;
+          if (assignment) {
+            if (!await host.publishProjectMessage(
+              ctx,
+              assignment,
+              reportMessage,
+              [],
+              "herd_run",
+              herdReportId
+            ))
+              return;
+            host.pi.appendEntry(host.entryName, {
+              phase: "report_sent",
+              sessionId,
+              startedAt,
+              reportId: herdReportId
+            });
+          }
+        } else if (outcome) {
+          const entries = ctx.sessionManager.getEntries();
+          const pending = entries.find(
+            (entry) => entry?.type === "custom" && entry.customType === host.entryName && entry.data?.sessionId === sessionId && entry.data?.phase === "report_pending" && entry.data?.runReportId === herdReportId
+          )?.data;
+          if (pending) {
+            const sent = entries.some(
+              (entry) => entry?.type === "custom" && entry.customType === host.entryName && entry.data?.sessionId === sessionId && entry.data?.phase === "report_sent" && entry.data?.reportId === pending.reportId
+            );
+            if (!sent) {
+              if (!await publishProjectHandoff(
+                ctx,
+                pending.message,
+                pending.reportId,
+                pending.kind,
+                pending.createdAt,
+                pending.target
+              ))
+                return;
+              host.pi.appendEntry(host.entryName, {
+                phase: "report_sent",
+                sessionId,
+                startedAt: pending.startedAt,
+                reportId: pending.reportId,
+                runReportId: herdReportId
+              });
+            }
+          }
+        } else if (!outcome) {
+          const pending = ctx.sessionManager.getEntries().find(
+            (entry) => entry?.type === "custom" && entry.customType === host.entryName && entry.data?.sessionId === sessionId && entry.data?.phase === "report_pending" && entry.data?.reportId === herdReportId
+          )?.data;
+          const message = pending?.message ?? "Lead execution outcome was not preserved across restoration; work remains unresolved.";
+          const reportCreatedAt = typeof pending?.createdAt === "number" && Number.isFinite(pending.createdAt) ? pending.createdAt : Date.now();
+          const target = pending ? pending.target : host.isManagedLead() ? "project" : "chief";
+          if (!pending)
+            host.pi.appendEntry(host.entryName, {
+              phase: "report_pending",
+              sessionId,
+              startedAt,
+              reportId: herdReportId,
+              message,
+              kind: "execution_failure",
+              createdAt: reportCreatedAt,
+              target
+            });
+          if (!await publishProjectHandoff(
+            ctx,
+            message,
+            herdReportId,
+            "execution_failure",
+            reportCreatedAt,
+            target
+          ))
+            return;
+          host.pi.appendEntry(host.entryName, {
+            phase: "report_sent",
+            sessionId,
+            startedAt,
+            reportId: herdReportId
+          });
+        }
+        host.pi.appendEntry(host.entryName, {
+          phase: "finished",
+          sessionId,
+          startedAt,
+          completedAt,
+          reportId: herdReportId
+        });
+        lastSettledRun = void 0;
+        herdRunStartedAt = void 0;
+        herdReportId = void 0;
+        host.requestStatusRefresh();
+        host.queueLeadPresentation(ctx);
+      } catch (error2) {
+        host.appendDurableError(host.pi, ctx, "pi_herdsman_state_error", error2);
+      }
+    })().finally(() => {
+      finishing = void 0;
+    });
+    return finishing;
+  };
+  const begin = (ctx) => {
+    if (herdRunStartedAt !== void 0) return;
+    const startedAt = leadAgentStartedAt ?? Date.now();
+    herdRunStartedAt = startedAt;
+    herdReportId = randomUUID10();
+    host.queueLeadPresentation(ctx);
+    try {
+      host.pi.appendEntry(host.entryName, {
+        phase: "started",
+        sessionId: ctx.sessionManager.getSessionId(),
+        startedAt,
+        reportId: herdReportId
+      });
+    } catch (error2) {
+      host.appendDurableError(host.pi, ctx, "pi_herdsman_state_error", error2);
+    }
+    host.requestStatusRefresh();
+  };
+  const restorePendingReports = async (ctx, entries) => {
+    const pending = /* @__PURE__ */ new Map();
+    for (const entry of entries) {
+      if (entry?.type !== "custom" || entry.customType !== host.entryName)
+        continue;
+      const data = entry.data;
+      if (data?.sessionId !== ctx.sessionManager.getSessionId() || typeof data.reportId !== "string")
+        continue;
+      if (data.phase === "report_pending" && typeof data.message === "string") {
+        const previous = pending.get(data.reportId);
+        const createdAt = typeof data.createdAt === "number" && Number.isFinite(data.createdAt) ? data.createdAt : data.startedAt;
+        if (previous && (previous.message !== data.message || previous.kind !== data.kind || previous.createdAt !== createdAt || previous.runReportId !== data.runReportId || previous.target !== data.target))
+          throw new Error(
+            "Lead report identity conflicts with durable payload"
+          );
+        pending.set(data.reportId, {
+          startedAt: data.startedAt,
+          message: data.message,
+          kind: data.kind,
+          createdAt,
+          runReportId: data.runReportId,
+          target: data.target === "project" || data.target === "chief" ? data.target : void 0
+        });
+      }
+      if (data.phase === "report_sent") pending.delete(data.reportId);
+    }
+    for (const [reportId, report] of pending) {
+      if (await publishProjectHandoff(
+        ctx,
+        report.message,
+        reportId,
+        report.kind,
+        report.createdAt,
+        report.target
+      ))
+        host.pi.appendEntry(host.entryName, {
+          phase: "report_sent",
+          sessionId: ctx.sessionManager.getSessionId(),
+          startedAt: report.startedAt,
+          reportId,
+          ...report.runReportId ? { runReportId: report.runReportId } : {}
+        });
+    }
+  };
+  return {
+    begin,
+    maybeFinish,
     agentStarted: () => {
       leadAgentStartedAt = Date.now();
+      leadReportId = randomUUID10();
+      observation = {};
       leadSettled = false;
     },
-    agentSettled: (ctx, aborted) => {
+    turnEnd: (event) => {
+      if (!observation || event?.message?.role !== "assistant") return;
+      observation = {
+        outcome: event.outcome,
+        responseEntryId: event.messageEntryId,
+        responseText: contentText4(event.message.content, "").trim()
+      };
+    },
+    beforeSettle: (event) => {
+      if (observation) observation.outcome = event?.outcome;
+    },
+    agentSettled: async (ctx, aborted) => {
       const turnStartedAt = leadAgentStartedAt;
       leadAgentStartedAt = void 0;
       const herdOwnsHandoff = herdRunStartedAt !== void 0;
-      const summary = !aborted && turnStartedAt !== void 0 ? latestMeaningfulAssistantResponse(ctx, turnStartedAt) : void 0;
-      if (herdOwnsHandoff) lastSettledRun = { aborted, summary };
+      const current = observation;
+      observation = void 0;
+      const successful = !aborted && current?.outcome === "completed" && current.responseEntryId !== void 0;
+      const summary = successful ? current.responseText : void 0;
+      if (herdOwnsHandoff)
+        lastSettledRun = { aborted, outcome: current?.outcome, summary };
       leadSettled = true;
-      maybeFinish(ctx);
-      if (!herdOwnsHandoff && turnStartedAt !== void 0) {
-        const message = aborted ? "Lead execution was cancelled before a completed response." : summary;
-        if (message)
-          void publishProjectHandoff(ctx, message).catch(
-            (error2) => host.appendDurableError(
-              host.pi,
+      if (!successful && !aborted && turnStartedAt !== void 0) {
+        const reportCreatedAt = Date.now();
+        const partial = current?.responseText?.slice(0, 1e3);
+        const detail = partial ? `
+
+Partial response (not completed):
+${partial}` : "";
+        const message = `${current?.outcome === "error" ? "Lead model execution failed before completion." : "Lead execution settled without verified completion."}${detail}`;
+        try {
+          const target = host.activeRole() === "lead" && host.isManagedLead() ? "project" : "chief";
+          host.pi.appendEntry(host.entryName, {
+            phase: "report_pending",
+            sessionId: ctx.sessionManager.getSessionId(),
+            startedAt: turnStartedAt,
+            reportId: leadReportId,
+            ...herdOwnsHandoff ? { runReportId: herdReportId } : {},
+            message,
+            kind: "execution_failure",
+            createdAt: reportCreatedAt,
+            target
+          });
+          const published = await publishProjectHandoff(
+            ctx,
+            message,
+            leadReportId,
+            "execution_failure",
+            reportCreatedAt,
+            target
+          );
+          if (published)
+            host.pi.appendEntry(host.entryName, {
+              phase: "report_sent",
+              sessionId: ctx.sessionManager.getSessionId(),
+              startedAt: turnStartedAt,
+              reportId: leadReportId,
+              ...herdOwnsHandoff ? { runReportId: herdReportId } : {}
+            });
+        } catch (error2) {
+          host.appendDurableError(
+            host.pi,
+            ctx,
+            "pi_herdsman_state_error",
+            error2
+          );
+        }
+      } else if (aborted && turnStartedAt !== void 0) {
+        const reportCreatedAt = Date.now();
+        const message = "Lead execution was cancelled before a completed response.";
+        try {
+          host.pi.appendEntry(host.entryName, {
+            phase: "report_pending",
+            sessionId: ctx.sessionManager.getSessionId(),
+            startedAt: turnStartedAt,
+            reportId: leadReportId,
+            createdAt: reportCreatedAt,
+            ...herdOwnsHandoff ? { runReportId: herdReportId } : {},
+            message,
+            target: "project"
+          });
+          if (await publishProjectHandoff(
+            ctx,
+            message,
+            leadReportId,
+            void 0,
+            reportCreatedAt,
+            "project"
+          ))
+            host.pi.appendEntry(host.entryName, {
+              phase: "report_sent",
+              sessionId: ctx.sessionManager.getSessionId(),
+              startedAt: turnStartedAt,
+              reportId: leadReportId,
+              ...herdOwnsHandoff ? { runReportId: herdReportId } : {}
+            });
+        } catch (error2) {
+          host.appendDurableError(
+            host.pi,
+            ctx,
+            "pi_herdsman_state_error",
+            error2
+          );
+        }
+      } else if (!herdOwnsHandoff && successful && summary && turnStartedAt !== void 0 && leadReportId) {
+        try {
+          if (host.isManagedLead()) {
+            const sessionId = ctx.sessionManager.getSessionId();
+            const pending = ctx.sessionManager.getEntries().some(
+              (entry) => entry?.type === "custom" && entry.customType === host.entryName && entry.data?.sessionId === sessionId && entry.data?.phase === "report_pending" && entry.data?.reportId === leadReportId
+            );
+            if (!pending)
+              host.pi.appendEntry(host.entryName, {
+                phase: "report_pending",
+                sessionId,
+                startedAt: turnStartedAt,
+                reportId: leadReportId,
+                message: summary,
+                target: "project"
+              });
+          }
+          const assignment = !host.isManagedLead() || ctx.sessionManager.getEntries().some(
+            (entry) => entry?.type === "custom" && entry.customType === host.entryName && entry.data?.sessionId === ctx.sessionManager.getSessionId() && entry.data?.phase === "report_pending" && entry.data?.reportId === leadReportId && entry.data?.target !== "project"
+          ) ? void 0 : await host.currentProjectAssignment(ctx);
+          if (assignment) {
+            if (await host.publishProjectMessage(
               ctx,
-              "pi_herdsman_state_error",
-              error2
-            )
+              assignment,
+              summary,
+              [],
+              "herd_run",
+              leadReportId
+            ))
+              host.pi.appendEntry(host.entryName, {
+                phase: "report_sent",
+                sessionId: ctx.sessionManager.getSessionId(),
+                startedAt: turnStartedAt,
+                reportId: leadReportId
+              });
+          }
+        } catch (error2) {
+          host.appendDurableError(
+            host.pi,
+            ctx,
+            "pi_herdsman_state_error",
+            error2
           );
+        }
+      }
+      await maybeFinish(ctx);
+      if (!herdOwnsHandoff && turnStartedAt !== void 0) {
+        leadReportId = void 0;
       }
     },
     restoreSession: (entries, sessionId) => {
@@ -19541,19 +19989,103 @@ ${outcome.summary}` : "Herd run settled.";
         sessionId,
         host.entryName
       );
-      lastSettledRun = void 0;
+      herdReportId = restoreHerdRunReportId(entries, sessionId, host.entryName);
+      if (herdRunStartedAt !== void 0 && !herdReportId) {
+        herdReportId = randomUUID10();
+        host.pi.appendEntry(host.entryName, {
+          phase: "started",
+          sessionId,
+          startedAt: herdRunStartedAt,
+          reportId: herdReportId
+        });
+      }
+      const hasReportIntent = entries.some(
+        (entry) => entry?.type === "custom" && entry.customType === host.entryName && entry.data?.sessionId === sessionId && !!herdReportId && (entry.data?.reportId === herdReportId || entry.data?.runReportId === herdReportId) && entry.data?.phase === "report_sent"
+      );
+      const hasUnsentHerdIntent = entries.some((entry) => {
+        const data = entry?.data;
+        return entry?.type === "custom" && entry.customType === host.entryName && data?.sessionId === sessionId && data?.phase === "report_pending" && !!herdReportId && (data.reportId === herdReportId || data.runReportId === herdReportId) && !entries.some(
+          (sent) => sent?.type === "custom" && sent.customType === host.entryName && sent.data?.sessionId === sessionId && sent.data?.phase === "report_sent" && sent.data?.reportId === data.reportId
+        );
+      });
+      lastSettledRun = hasReportIntent && !hasUnsentHerdIntent ? { aborted: false, outcome: "reported" } : void 0;
       leadSettled = herdRunStartedAt === void 0;
     },
     finishIfIdle: (ctx) => {
-      if (herdRunStartedAt !== void 0 && ctx.isIdle()) {
-        leadSettled = true;
-        maybeFinish(ctx);
-      }
+      if (!ctx.isIdle()) return;
+      if (idleFinishing) return;
+      idleFinishing = (async () => {
+        await restorePendingReports(ctx, ctx.sessionManager.getEntries());
+        const currentEntries = ctx.sessionManager.getEntries();
+        const hasUnsentHerdIntent = currentEntries.some((entry) => {
+          const data = entry?.data;
+          return entry?.type === "custom" && entry.customType === host.entryName && data?.sessionId === ctx.sessionManager.getSessionId() && data?.phase === "report_pending" && !!herdReportId && (data.reportId === herdReportId || data.runReportId === herdReportId) && !currentEntries.some(
+            (sent) => sent?.type === "custom" && sent.customType === host.entryName && sent.data?.sessionId === ctx.sessionManager.getSessionId() && sent.data?.phase === "report_sent" && sent.data?.reportId === data.reportId
+          );
+        });
+        if (hasUnsentHerdIntent) return;
+        if (herdReportId && currentEntries.some(
+          (entry) => entry?.type === "custom" && entry.customType === host.entryName && entry.data?.sessionId === ctx.sessionManager.getSessionId() && entry.data?.phase === "report_sent" && (entry.data?.reportId === herdReportId || entry.data?.runReportId === herdReportId)
+        ))
+          lastSettledRun = { aborted: false, outcome: "reported" };
+        if (herdRunStartedAt !== void 0) {
+          leadSettled = true;
+          if (!lastSettledRun) {
+            const pending = ctx.sessionManager.getEntries().find(
+              (entry) => entry?.type === "custom" && entry.customType === host.entryName && entry.data?.sessionId === ctx.sessionManager.getSessionId() && entry.data?.phase === "report_pending" && entry.data?.reportId === herdReportId
+            )?.data;
+            const message = pending?.message ?? "Lead execution outcome was not preserved across restoration; work remains unresolved.";
+            const reportCreatedAt = typeof pending?.createdAt === "number" && Number.isFinite(pending.createdAt) ? pending.createdAt : Date.now();
+            const target = pending ? pending.target : host.isManagedLead() ? "project" : "chief";
+            if (!pending)
+              host.pi.appendEntry(host.entryName, {
+                phase: "report_pending",
+                sessionId: ctx.sessionManager.getSessionId(),
+                startedAt: herdRunStartedAt,
+                reportId: herdReportId,
+                message,
+                kind: "execution_failure",
+                createdAt: reportCreatedAt,
+                target
+              });
+            const published = await publishProjectHandoff(
+              ctx,
+              message,
+              herdReportId,
+              "execution_failure",
+              reportCreatedAt,
+              target
+            );
+            if (published)
+              host.pi.appendEntry(host.entryName, {
+                phase: "report_sent",
+                sessionId: ctx.sessionManager.getSessionId(),
+                startedAt: herdRunStartedAt,
+                reportId: herdReportId
+              });
+            if (published)
+              lastSettledRun = { aborted: false, outcome: "reported" };
+          }
+          await maybeFinish(ctx);
+        }
+      })().catch(
+        (error2) => host.appendDurableError(
+          host.pi,
+          ctx,
+          "pi_herdsman_state_error",
+          error2
+        )
+      ).finally(() => {
+        idleFinishing = void 0;
+      });
     },
     startedAt: () => herdRunStartedAt,
     shutdown: () => {
       leadAgentStartedAt = void 0;
       herdRunStartedAt = void 0;
+      herdReportId = void 0;
+      leadReportId = void 0;
+      observation = void 0;
       lastSettledRun = void 0;
       leadSettled = true;
     }
@@ -19579,6 +20111,18 @@ function restoreHerdRunStartedAt(entries, sessionId, entryName) {
   }
   return active;
 }
+function restoreHerdRunReportId(entries, sessionId, entryName) {
+  let reportId;
+  for (const entry of entries) {
+    if (entry?.type !== "custom" || entry.customType !== entryName) continue;
+    const data = entry.data;
+    if (data?.sessionId !== sessionId) continue;
+    if (data.phase === "started" && typeof data.reportId === "string")
+      reportId = data.reportId;
+    if (data.phase === "finished") reportId = void 0;
+  }
+  return reportId;
+}
 function createLeadProjectRuntime(host) {
   const stopExecution = async (session, target, ctx, signal) => {
     const release = claimDelegationLock(target.workspace_id, session);
@@ -19654,6 +20198,345 @@ function createLeadProjectRuntime(host) {
       )
     );
   };
+  const inspectRemovalTarget = async (branch, ctx, signal) => {
+    const manager = await host.currentManager(ctx);
+    const lease = host.managerLease();
+    if (!manager || !lease || !host.sameManagerDescriptor(manager, lease.descriptor))
+      throw new Error("Manager lease is no longer active");
+    const group = await host.worktreeGroupScope(
+      host.pi,
+      ctx,
+      manager.workspaceId,
+      signal
+    );
+    if (group.repoKey !== manager.repoKey || group.primaryWorkspaceId !== manager.workspaceId)
+      throw new Error("Manager worktree group is not authoritative");
+    const topology = await host.runHerdr(
+      host.pi,
+      ctx,
+      ["worktree", "list", "--workspace", manager.workspaceId],
+      { signal }
+    );
+    if (topology?.source?.source_workspace_id !== manager.workspaceId || topology?.source?.repo_key !== manager.repoKey || typeof topology?.source?.source_checkout_path !== "string" || !Array.isArray(topology?.worktrees))
+      throw new Error("Herdr worktree topology is not authoritative");
+    const assignments = host.listProjectAssignments(host.supervisionRuntime(), manager.repoKey).filter((assignment2) => assignment2.branch === branch);
+    if (assignments.length !== 1)
+      throw new Error("Branch is not one exact current project assignment");
+    const assignment = assignments[0];
+    const current = host.readProjectAssignment(
+      host.supervisionRuntime(),
+      manager.repoKey,
+      branch
+    );
+    if (!current || current.id !== assignment.id || current.repoKey !== manager.repoKey)
+      throw new Error("Project assignment changed during removal");
+    const matches = topology.worktrees.filter(
+      (worktree2) => worktree2?.branch === branch
+    );
+    if (matches.length !== 1)
+      throw new Error("Branch does not identify exactly one Herdr worktree");
+    const worktree = matches[0];
+    if (typeof worktree.path !== "string" || !worktree.path || worktree.is_linked_worktree !== true)
+      throw new Error("Herdr worktree checkout path is unavailable");
+    const checkoutPath = resolve6(worktree.path);
+    if (checkoutPath === resolve6(topology.source.source_checkout_path))
+      throw new Error("The Manager's primary checkout cannot be removed");
+    if (worktree.open_workspace_id === manager.workspaceId)
+      throw new Error("The Manager's primary workspace cannot be removed");
+    if (!assignment.piSessionFile)
+      throw new Error(
+        "Project checkout provenance is unavailable; worktree preserved"
+      );
+    if (assignment.piSessionFile) {
+      try {
+        const session = host.SessionManager.open(assignment.piSessionFile);
+        if (session.getSessionId() !== assignment.id || resolve6(session.getCwd()) !== checkoutPath)
+          throw new Error();
+      } catch {
+        throw new Error(
+          "Persisted project session provenance does not match the checkout; worktree preserved"
+        );
+      }
+    }
+    const [gitRoot, gitCommonDir, gitInventory] = await Promise.all([
+      host.pi.exec("git", ["rev-parse", "--show-toplevel"], {
+        cwd: checkoutPath,
+        signal,
+        timeout: 1e4
+      }),
+      host.pi.exec(
+        "git",
+        ["rev-parse", "--path-format=absolute", "--git-common-dir"],
+        { cwd: checkoutPath, signal, timeout: 1e4 }
+      ),
+      host.pi.exec("git", ["worktree", "list", "--porcelain", "-z"], {
+        cwd: topology.source.source_checkout_path,
+        signal,
+        timeout: 1e4
+      })
+    ]);
+    let gitWorktrees;
+    try {
+      gitWorktrees = parseGitWorktreeInventory(
+        String(gitInventory.stdout ?? "")
+      );
+      if (gitRoot.code !== 0 || gitRoot.killed || gitRoot.stderr?.trim() || gitCommonDir.code !== 0 || gitCommonDir.killed || gitCommonDir.stderr?.trim() || gitInventory.code !== 0 || gitInventory.killed || gitInventory.stderr?.trim() || realpathSync5(String(gitRoot.stdout ?? "").trim()) !== realpathSync5(checkoutPath) || realpathSync5(String(gitCommonDir.stdout ?? "").trim()) !== realpathSync5(manager.repoKey) || !gitWorktrees || gitWorktrees.filter(
+        (entry) => resolve6(entry.path) === checkoutPath && entry.branch === branch
+      ).length !== 1)
+        throw new Error();
+    } catch {
+      throw new Error(
+        "Git could not verify the exact linked checkout and repository; worktree preserved"
+      );
+    }
+    const git = await host.pi.exec(
+      "git",
+      ["status", "--porcelain=v1", "--untracked-files=all"],
+      { cwd: checkoutPath, signal, timeout: 1e4 }
+    );
+    if (git.code !== 0 || git.killed || git.stderr?.trim() || git.stdout?.trim())
+      throw new Error(
+        "Checkout is dirty or could not be verified; worktree preserved"
+      );
+    const leads = await host.liveLead(ctx, assignment.id);
+    if (leads.length > 1)
+      throw new Error(
+        "Assigned Lead identity is ambiguous; worktree preserved"
+      );
+    if (leads.length === 1) {
+      const lead = leads[0];
+      const state = host.readLeadCoordinationState(
+        host.supervisionRuntime(),
+        assignment.id
+      );
+      host.requireCompatibleBuild(
+        host.HERDSMAN_BUILD,
+        state?.build,
+        "remove_worktree",
+        `Lead ${assignment.id}`
+      );
+      if (!worktree.open_workspace_id || lead.workspace_id !== worktree.open_workspace_id || !state || (state.role ?? "lead") !== "lead" || state.piSessionId !== assignment.id)
+        throw new Error(
+          "Assigned Lead placement is ambiguous; worktree preserved"
+        );
+    }
+    return {
+      manager,
+      assignment,
+      worktree,
+      checkoutPath,
+      sourceCheckoutPath: topology.source.source_checkout_path,
+      liveLead: leads[0]
+    };
+  };
+  const assertNoUnrelatedPiExecution = async (target, ctx, signal) => {
+    if (!target.worktree.open_workspace_id) return;
+    const inventory = await host.herdrSessionSnapshot(host.pi, ctx, signal);
+    const owned = /* @__PURE__ */ new Set([target.assignment.id]);
+    const states = host.scanAgentStates().states.map(({ state }) => state);
+    let changed = true;
+    while (changed) {
+      changed = false;
+      for (const state of states) {
+        if (state.workspaceId === target.worktree.open_workspace_id && owned.has(state.ownerSessionId) && !owned.has(state.piSessionId)) {
+          owned.add(state.piSessionId);
+          changed = true;
+        }
+      }
+    }
+    if (inventory.agents.some(
+      (agent) => agent.workspace_id === target.worktree.open_workspace_id && host.isPiAgent(agent) && !owned.has(host.herdrSessionId(agent) ?? "")
+    ))
+      throw new Error(
+        "Unrelated or ambiguously identified Pi execution occupies the worktree; worktree preserved"
+      );
+  };
+  const removeWorktree = async (branch, ctx, signal) => {
+    if (activeRole() !== "manager")
+      throw new Error("Only Managers can remove project worktrees");
+    if (!ctx.hasUI)
+      throw new Error("Worktree removal requires interactive confirmation");
+    const operationSignal = signal ?? ctx.signal;
+    operationSignal?.throwIfAborted();
+    const candidate = await inspectRemovalTarget(branch, ctx, operationSignal);
+    await assertNoUnrelatedPiExecution(candidate, ctx, operationSignal);
+    const answer = await ctx.ui.input(
+      `Remove worktree for branch ${branch} at ${candidate.checkoutPath} from project ${candidate.manager.repoKey}? This removes the checkout and associated Herdr workspace; running managed execution may be stopped. The Git branch and Pi conversation remain, and the project assignment is retired after removal. Type remove to confirm.`,
+      void 0,
+      { signal: operationSignal }
+    );
+    operationSignal?.throwIfAborted();
+    if (answer !== "remove")
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Removal of ${branch} cancelled; no changes made.`
+          }
+        ],
+        details: { ok: false, action: "remove", branch, cancelled: true }
+      };
+    return host.withProjectWorkLock(
+      `${candidate.manager.repoKey}\0${branch}`,
+      async () => {
+        let reopened = false;
+        let leadStopped = false;
+        const removed = await host.withProjectAssignmentLock(
+          candidate.manager.repoKey,
+          branch,
+          async () => {
+            operationSignal?.throwIfAborted();
+            const current = await inspectRemovalTarget(
+              branch,
+              ctx,
+              operationSignal
+            );
+            if (current.assignment.id !== candidate.assignment.id || current.checkoutPath !== candidate.checkoutPath || !host.sameManagerDescriptor(current.manager, candidate.manager))
+              throw new Error(
+                "Removal target changed during confirmation; worktree preserved"
+              );
+            await assertNoUnrelatedPiExecution(current, ctx, operationSignal);
+            if (current.liveLead) {
+              try {
+                await stopExecution(
+                  current.assignment.id,
+                  current.liveLead,
+                  ctx,
+                  operationSignal
+                );
+                leadStopped = true;
+              } catch (error2) {
+                throw new Error(
+                  `Managed execution could not be stopped; worktree was preserved: ${error2 instanceof Error ? error2.message : String(error2)}`
+                );
+              }
+            }
+            const inventory = await host.herdrSessionSnapshot(
+              host.pi,
+              ctx,
+              operationSignal
+            );
+            const occupants = inventory.agents.filter(
+              (agent) => agent.workspace_id === current.worktree.open_workspace_id && host.isPiAgent(agent)
+            );
+            if (occupants.length)
+              throw new Error(
+                `${leadStopped ? "Assigned Lead stopped; " : ""}unrelated or remaining Pi execution occupies the worktree; removal was not attempted`
+              );
+            let workspaceId = current.worktree.open_workspace_id;
+            if (!workspaceId) {
+              const opened = await host.runHerdr(
+                host.pi,
+                ctx,
+                [
+                  "worktree",
+                  "open",
+                  "--workspace",
+                  current.manager.workspaceId,
+                  "--branch",
+                  branch,
+                  "--no-focus"
+                ],
+                { signal: operationSignal }
+              );
+              workspaceId = opened?.workspace?.workspace_id;
+              if (!workspaceId || workspaceId === current.manager.workspaceId || opened?.worktree?.branch !== branch || resolve6(opened?.worktree?.path ?? "") !== current.checkoutPath)
+                throw new Error(
+                  "Herdr reopened a different or ambiguous worktree; checkout preserved"
+                );
+              reopened = true;
+            }
+            let final;
+            try {
+              final = await inspectRemovalTarget(
+                branch,
+                ctx,
+                operationSignal
+              );
+            } catch (error2) {
+              if (!leadStopped) throw error2;
+              throw new Error(
+                `Assigned Lead stopped; checkout was preserved because final verification failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+              );
+            }
+            if (final.assignment.id !== current.assignment.id || final.worktree.open_workspace_id !== workspaceId || final.checkoutPath !== current.checkoutPath)
+              throw new Error(
+                "Removal target changed before native removal; worktree preserved"
+              );
+            try {
+              operationSignal?.throwIfAborted();
+              return {
+                result: await host.runHerdr(
+                  host.pi,
+                  ctx,
+                  ["worktree", "remove", "--workspace", workspaceId],
+                  { signal: operationSignal }
+                )
+              };
+            } catch (error2) {
+              return {
+                error: error2 instanceof Error ? error2.message : String(error2),
+                reopened
+              };
+            }
+          }
+        ).catch((error2) => {
+          if (!leadStopped && !reopened) throw error2;
+          throw new Error(
+            `${leadStopped ? "Assigned Lead stopped; " : ""}${reopened ? "Herdr workspace reopened; " : ""}worktree removal did not complete: ${error2 instanceof Error ? error2.message : String(error2)}`
+          );
+        });
+        let assignmentRetired = false;
+        let retirementError;
+        const checkoutState = gitPathStatus(candidate.checkoutPath);
+        const checkoutRemoved = checkoutState === "absent";
+        try {
+          await host.reconcileProjectAssignments(
+            ctx,
+            candidate.manager.repoKey,
+            candidate.manager.workspaceId,
+            candidate.sourceCheckoutPath,
+            true,
+            branch
+          );
+          assignmentRetired = !host.readProjectAssignment(
+            host.supervisionRuntime(),
+            candidate.manager.repoKey,
+            branch
+          );
+        } catch (error2) {
+          assignmentRetired = !host.readProjectAssignment(
+            host.supervisionRuntime(),
+            candidate.manager.repoKey,
+            branch
+          );
+          retirementError = error2 instanceof Error ? error2.message : String(error2);
+        }
+        return {
+          content: [
+            {
+              type: "text",
+              text: checkoutRemoved ? assignmentRetired ? `${leadStopped ? "Assigned Lead stopped; " : ""}removed checkout for ${branch}; assignment retired. Git branch and Pi conversation preserved.` : `${leadStopped ? "Assigned Lead stopped; " : ""}checkout removed for ${branch}; assignment retirement is unconfirmed${retirementError ? `: ${retirementError}` : "."}` : checkoutState === "present" ? `${leadStopped ? "Assigned Lead stopped; " : ""}worktree removal was not confirmed for ${branch}; checkout remains and assignment ${assignmentRetired ? "was retired" : "was not retired"}${"error" in removed ? `: ${removed.error}` : "."}` : `${leadStopped ? "Assigned Lead stopped; " : ""}worktree removal result is unknown for ${branch}; assignment ${assignmentRetired ? "was retired" : "retirement is unconfirmed"}${"error" in removed ? `: ${removed.error}` : "."}`
+            }
+          ],
+          details: {
+            ok: checkoutRemoved && assignmentRetired,
+            action: "remove",
+            branch,
+            checkout_path: candidate.checkoutPath,
+            lead_stopped: leadStopped,
+            checkout_removed: checkoutRemoved,
+            assignment_retired: assignmentRetired,
+            forced: false,
+            checkout_state: checkoutRemoved ? "removed" : checkoutState,
+            ..."error" in removed ? { removal_error: removed.error } : {},
+            ..."error" in removed && removed.reopened ? { workspace_reopened: true } : {},
+            ...retirementError ? { retirement_error: retirementError } : {}
+          }
+        };
+      }
+    );
+  };
   const {
     pi,
     leadRuntime,
@@ -20330,6 +21213,11 @@ function createLeadProjectRuntime(host) {
         throw new Error("Only Managers can control project work");
       return activateProjectLead(params, ctx, signal);
     }
+    if (params.action === "remove") {
+      if (activeRole() !== "manager")
+        throw new Error("Only Managers can remove project worktrees");
+      return removeWorktree(params.branch, ctx, signal);
+    }
     if (params.action === "stop") {
       if (activeRole() !== "manager")
         throw new Error("Only Managers can control project work");
@@ -20546,7 +21434,13 @@ function createLeadProjectRuntime(host) {
       next_action: "Report activity returns asynchronously; continue only independent work, otherwise end the turn. Do not poll."
     });
   };
-  return { stopExecution, stop, activateProjectLead, executeStaff };
+  return {
+    stopExecution,
+    stop,
+    activateProjectLead,
+    removeWorktree,
+    executeStaff
+  };
 }
 function readLeadSessionIds(inventory, mailboxes, workspaceId, dependencies) {
   const panes = inventory.panes;
@@ -21257,6 +22151,7 @@ function createLeadCoordinationRuntime(host) {
           return 0;
         importResultBindings2(pi, ctx, record.resultBindings, "project_message");
         const backlog = record.createdAt < manager.createdAt;
+        const actionableFailure = backlog && record.kind === "execution_failure";
         pi.sendMessage(
           {
             customType: "pi-herdsman-project_message",
@@ -21271,7 +22166,7 @@ ${record.text}`,
               fromSessionId: record.fromSessionId
             }
           },
-          backlog ? { triggerTurn: false } : { deliverAs: "followUp", triggerTurn: true }
+          backlog && !actionableFailure ? { triggerTurn: false } : { deliverAs: "followUp", triggerTurn: true }
         );
         if (hasProjectMessageReceipt(record)) consumeProjectMessage(record);
         return 1;
@@ -21701,7 +22596,18 @@ function createLeadInboxRuntime(host) {
                 outcome: "resolved",
                 triggerTurn: options?.triggerTurn === true
               });
-            return result;
+            await result;
+            if (projectAssignment) {
+              try {
+                host.assignmentDelivered?.(ctx);
+              } catch (error2) {
+                try {
+                  appendDurableError2(pi, ctx, "pi_herdsman_state_error", error2);
+                } catch {
+                }
+              }
+            }
+            return;
           } catch (error2) {
             managerDiagnostic("inbox_catch", { category: "send" });
             if (projectAssignment)
@@ -22221,7 +23127,7 @@ function createLeadRoleTransitions(state, host) {
       lease.release();
     }
   };
-  const publishProjectMessage = async (ctx, assignment, message, files = [], operation = "message_supervisor") => {
+  const publishProjectMessage = async (ctx, assignment, message, files = [], operation = "message_supervisor", reportId, kind) => {
     const sessionId = ctx.sessionManager.getSessionId();
     const runtime = host.supervisionRuntime();
     const current = host.readProjectAssignment(
@@ -22230,7 +23136,7 @@ function createLeadRoleTransitions(state, host) {
       assignment.branch
     );
     if (!current || current.id !== sessionId) return void 0;
-    const id = randomUUID10();
+    const id = reportId ?? randomUUID10();
     const createdAt = Date.now();
     const prepared = await host.prepareCoordinationInput(
       ctx,
@@ -22245,6 +23151,7 @@ function createLeadRoleTransitions(state, host) {
         branch: assignment.branch,
         fromSessionId: sessionId,
         text: candidate,
+        ...kind ? { kind } : {},
         ...resultBindings.length ? { resultBindings: [...resultBindings] } : {},
         createdAt
       })
@@ -22256,6 +23163,7 @@ function createLeadRoleTransitions(state, host) {
       branch: assignment.branch,
       fromSessionId: sessionId,
       text: prepared.text,
+      ...kind ? { kind } : {},
       ...prepared.resultBindings.length ? { resultBindings: prepared.resultBindings } : {},
       createdAt
     };
@@ -22269,6 +23177,18 @@ function createLeadRoleTransitions(state, host) {
           assignment.branch
         );
         if (!latest || latest.id !== sessionId) return void 0;
+        const existing = listProjectMessages(
+          runtime,
+          assignment.repoKey,
+          assignment.branch
+        ).find((candidate) => candidate.id === id);
+        if (existing) {
+          if (existing.fromSessionId !== sessionId || existing.text !== record.text || existing.kind !== record.kind || JSON.stringify(existing.resultBindings ?? []) !== JSON.stringify(record.resultBindings ?? []))
+            throw new Error(
+              "Project message identity conflicts with durable payload"
+            );
+          return existing;
+        }
         host.writeProjectMessage(record, runtime);
         return record;
       }
@@ -23393,7 +24313,8 @@ var MANAGER_TOOLS = [
   ...STAFF_TOOLS,
   "delegate_project",
   "resume_project",
-  "stop_lead"
+  "stop_lead",
+  "remove_worktree"
 ];
 var LEAD_COORDINATION_TOOLS = [
   ...AGENT_COORDINATION_TOOLS,
@@ -23408,7 +24329,7 @@ ${LEAD_SUPERVISOR_PEER_GUIDANCE}
 For assigned project work, automatic result handoffs contain summary text but no file attachments. When the Manager needs an actual artifact for review, decision-making, or onward delegation, explicitly transfer the relevant evidence through message_supervisor.files.
 ${FILE_HANDOFF_GUIDANCE}`;
 var MANAGER_ROLE_CONTRACT = `## Manager role
-You are the verified Manager for this Pi session. Supervise only project Leads established by exact current project assignments; configuration changes operating guidance and ordinary tool availability, never authority. Project execution belongs to assigned Leads and their Agent trees. Coordination messages and reports are nonterminal and do not establish completion.`;
+You are the verified Manager for this Pi session. Supervise only project Leads established by exact current project assignments; configuration changes operating guidance and ordinary tool availability, never authority. Project execution belongs to assigned Leads and their Agent trees. Coordination messages and reports are nonterminal and do not establish completion. Use remove_worktree only for an explicitly requested checkout-removal action; never infer removal from completion, review, or inactivity. The user must confirm interactively.`;
 var SUPERVISION_CONTEXT_TYPE = "pi-herdsman-supervision-context";
 var SUPERVISOR_STATE_TYPE = "pi-herdsman-supervisor-state";
 var STALE_AFTER_MS = 10 * 6e4;
@@ -23926,7 +24847,8 @@ Use reply_agent with agent="${ask.agentLabel}" to answer this question.`,
     ...STAFF_TOOLS,
     "delegate_project",
     "resume_project",
-    "stop_lead"
+    "stop_lead",
+    "remove_worktree"
   ];
   if (processRole === "managed-agent") {
     leadStatusRuntime = createAgentStatusRuntime();
@@ -24078,6 +25000,7 @@ ${globalInstructions}
       writeChiefMessage,
       herdrSessionSnapshot,
       isPiAgent,
+      listProjectAssignments,
       herdrSessionId,
       messageLimits: messageLimits2,
       prepareMessageInput,
@@ -24378,9 +25301,48 @@ ${summary}`,
       });
       if (process.env.HERDR_PANE_ID)
         pi.registerCommand("manager", {
-          description: "Activate Manager mode, or open its overview when already active",
-          getArgumentCompletions: (prefix) => ["leave"].filter((value2) => value2.startsWith(prefix.trim())).map((value2) => ({ value: value2, label: value2 })),
+          description: "Activate Manager mode, open its overview, or remove an assigned worktree",
+          getArgumentCompletions: (prefix) => {
+            const input = prefix.trimStart();
+            const [command, branchPrefix] = input.split(/\s+/u);
+            if (!command)
+              return ["leave", "remove"].map((value2) => ({
+                value: value2,
+                label: value2
+              }));
+            if (command !== "remove")
+              return input.includes(" ") ? null : ["leave", "remove"].filter((value2) => value2.startsWith(command)).map((value2) => ({ value: value2, label: value2 }));
+            if (input.trim().split(/\s+/u).length > 2) return null;
+            const lease = leadRuntime.managerLease;
+            if (!lease) return [];
+            try {
+              return listProjectAssignments(
+                supervisionRuntime(),
+                lease.descriptor.repoKey
+              ).map(({ branch }) => branch).filter((branch) => branch.startsWith(branchPrefix ?? "")).map((branch) => ({
+                value: `remove ${branch}`,
+                label: branch
+              }));
+            } catch {
+              return [];
+            }
+          },
           handler: async (rawArgs, ctx) => {
+            const args = rawArgs.trim().split(/\s+/u).filter(Boolean);
+            if (args[0] === "remove") {
+              if (args.length !== 2) {
+                ctx.ui.notify("Usage: /manager remove <branch>", "error");
+                return;
+              }
+              const result = await leadRuntimes.projectRuntime.removeWorktree(
+                args[1],
+                ctx
+              );
+              ctx.ui.notify(
+                result.content[0]?.text ?? `Removal of ${args[1]} finished.`
+              );
+              return;
+            }
             await leadCommandRuntime.runRoleCommand("manager", rawArgs, ctx);
           }
         });
@@ -24548,6 +25510,23 @@ ${summary}`,
           renderCall: (a, t, c) => renderCoordinationCall("staff", "resume", a, t, c),
           renderResult: (r, o, t, c) => renderCoordinationResult("staff", "resume", r, o, t, c)
         });
+        pi.registerTool({
+          ...staffTool,
+          name: "remove_worktree",
+          label: "remove worktree",
+          description: "Remove an exact assigned project worktree with human confirmation. Preserves its Git branch and Pi conversation; never forces removal.",
+          parameters: staffBranchParameters,
+          promptSnippet: void 0,
+          execute: (id, p, signal, update, ctx) => staffTool.execute(
+            id,
+            { action: "remove", branch: p.branch },
+            signal,
+            update,
+            ctx
+          ),
+          renderCall: (a, t, c) => renderCoordinationCall("staff", "remove", a, t, c),
+          renderResult: (r, o, t, c) => renderCoordinationResult("staff", "remove", r, o, t, c)
+        });
         pi.registerTool({
           ...staffTool,
           name: "stop_lead",