opencode-swarm 7.199.0 → 7.199.2

package/dist/cli/{index-79b9re6h.js → index-skg220qc.js}

@@ -8,14 +8,14 @@ import {
   protectedRoots,
   redactDecisionLineForArchive,
   stableCanonicalStringify
-} from "./index-kxaxf3en.js";
+} from "./index-kwh4b9cm.js";
 import {
   detectStraySwarmDirs,
   readDoctorArtifact,
   removeStraySwarmDir,
   resolvePlanParallelizationFlag,
   runConfigDoctor
-} from "./index-42dtc5nd.js";
+} from "./index-hfsyvkn0.js";
 import {
   archiveEvidence,
   checkRequirementCoverage,
@@ -27,7 +27,7 @@ import {
   sanitizeTaskId,
   saveEvidence,
   validateProjectRoot
-} from "./index-zg5gnn3m.js";
+} from "./index-y4kjbf12.js";
 import {
   JAVA_SYMBOL_GRAMMAR,
   LANGUAGE_REGISTRY,
@@ -56,7 +56,7 @@ import {
   runEvaluation,
   runExternalTool,
   withDisposableWorktree
-} from "./index-jccs3fgn.js";
+} from "./index-dyp5807d.js";
 import {
   EvaluationTaskV1Schema,
   GateAuditManifestV1Schema,
@@ -89,7 +89,7 @@ import {
   alreadyCuratedThisGeneration,
   claimNextScanBatch,
   resolveCohortId
-} from "./index-y9ckbta5.js";
+} from "./index-r9s68beh.js";
 import {
   CURATOR_CONSOLIDATION_PROMPT,
   CURATOR_INIT_PROMPT,
@@ -108,13 +108,13 @@ import {
   getGroupCommitWriter,
   importLegacyJsonl,
   readPriorDriftReports
-} from "./index-r52wrpb7.js";
+} from "./index-ve0ncsnc.js";
 import {
   assertNoUnsettledCoderDispatch,
   listCoderSettlementWalStates,
   recoverCoderSettlement,
   recoverStaleCoderSettlements
-} from "./index-ye9bze9s.js";
+} from "./index-bz5h9ttt.js";
 import {
   BUNDLED_PROJECT_SKILL_ROOT,
   DEFAULT_SKILL_MIN_CONFIDENCE,
@@ -137,12 +137,13 @@ import {
   skillContractDigest,
   splitSkillFrontmatter,
   syncBundledProjectSkillsIfMissingAsync
-} from "./index-mefad009.js";
+} from "./index-9qc7d3q2.js";
 import {
   buildEscalationBriefing,
   readRecentEscalations
-} from "./index-jjsjjefm.js";
+} from "./index-wz8zc7w3.js";
 import {
+  fastForwardToRefAsync,
   parsePorcelainV2Snapshot,
   resolveCommitCountSince,
   resolveCommitCountSinceAsync,
@@ -154,13 +155,16 @@ import {
   resolveCurrentUpstreamRemoteRef,
   resolveExactRemoteBranchHead,
   resolveExactRemoteBranchHeadAsync,
+  resolveIsAncestorAsync,
   resolveIsExactSingleChildCommit,
   resolveIsExactSingleChildCommitAsync,
   resolveIsWorkingTreeClean,
   resolveIsWorkingTreeCleanAsync,
+  resolveLocalRefHeadAsync,
   resolvePrFeedbackTrackingCandidatesAsync,
   resolvePrReviewDiffStats,
   resolvePrReviewDiffStatsAsync,
+  resolvePrWorkflowChangedPathSetAsync,
   resolvePrWorkflowRevisionDigest,
   resolvePrWorkflowRevisionDigestDetailed,
   resolvePrWorkflowRevisionDigestDetailedAsync,
@@ -168,8 +172,10 @@ import {
   resolveRemoteRefsContainingHeadAsync,
   resolveRemoteUrlIdentity,
   resolveRemoteUrlIdentityAsync,
+  resolveRepoTopLevelAsync,
+  resolveWorkingTreeDirtyPathsAsync,
   switchPrFeedbackTrackingCandidateAsync
-} from "./index-9ztsfved.js";
+} from "./index-hz2609qt.js";
 import {
   buildCorrelationId,
   buildIssueUrl,
@@ -225,7 +231,7 @@ import {
   swarmOverwriteCandidates,
   trackedDirtyCandidates,
   transientBackoff
-} from "./index-gds6c8qt.js";
+} from "./index-4py6w3hy.js";
 import {
   EPIC_MODE_CONFIG_DISABLED_MESSAGE,
   PlanRecoverySupersededError,
@@ -257,7 +263,7 @@ import {
   updateEpicRecord,
   updateTaskStatus,
   withPlanLifecycleLock
-} from "./index-tnrq0pg8.js";
+} from "./index-mb3y5cgy.js";
 import {
   containsControlChars,
   containsPathTraversal,
@@ -274,7 +280,7 @@ import {
   resolveSpeckitProjection,
   validateSpeckit,
   writeProjectedSpecSync
-} from "./index-zd15v0gr.js";
+} from "./index-xapmt05a.js";
 import {
   clearWorktreeMergeStatus,
   getAllWorktreeMergeFailures,
@@ -306,7 +312,7 @@ import {
   transitionTaskWorkflowEvidenceWithStatus,
   withTaskEvidenceTransaction,
   writeWorkflowWalFile
-} from "./index-vbm2ykr9.js";
+} from "./index-46sgm9rd.js";
 import {
   isPathUnderSwarmWorktreeBase,
   listLiveLaneOwners,
@@ -315,7 +321,7 @@ import {
   recordLiveLaneOwner,
   removeWorktree,
   resolveWorktreeBaseDir
-} from "./index-2f9tsejp.js";
+} from "./index-cpdcscwt.js";
 import {
   GitBinaryMissingError,
   GitSpawnCwdError,
@@ -358,7 +364,7 @@ import {
   scanBackgroundCoderReservationsForAdmission,
   scanDelegationsForRecovery,
   sweepStaleDelegations
-} from "./index-3gwh8c9d.js";
+} from "./index-hj76n215.js";
 import {
   MAX_EVENT_LOG_ENTRIES,
   _internals,
@@ -370,7 +376,7 @@ import {
   recordHiveKnowledgeEvent,
   recordKnowledgeEvent,
   resolveKnowledgeEventsPath
-} from "./index-mzsj4kkv.js";
+} from "./index-t6gsqe10.js";
 import {
   commitDisplayedMembership,
   commitEmptyRetrieval,
@@ -383,7 +389,7 @@ import {
   queryLiveMemberships,
   reconcilePhaseClose,
   recordPhaseCloseIntent
-} from "./index-bjzxbxpw.js";
+} from "./index-c2eqtpk1.js";
 import {
   sanitizeContextText
 } from "./index-m9zzj4ee.js";
@@ -414,7 +420,7 @@ import {
   validateActionableFields,
   validateLesson,
   validateSkillPath
-} from "./index-e5ecn73v.js";
+} from "./index-67ad9qbe.js";
 import {
   MAX_CURATION_PROPOSALS,
   authorizeCuration,
@@ -425,7 +431,7 @@ import {
 } from "./index-rtry5xyf.js";
 import {
   resolveWorktreeIsolationConfig
-} from "./index-vh87e91s.js";
+} from "./index-km9tjdgw.js";
 import {
   RetrospectiveEvidenceSchema
 } from "./index-g22dps7x.js";
@@ -437,7 +443,7 @@ import {
   clearScopeBindings,
   readAuthoritativeScopeBindingSet,
   readDeclaredScopeFilesFromBindings
-} from "./index-b5k6etf9.js";
+} from "./index-jrdepg4w.js";
 import {
   approvedSnapshotCoversPlan,
   clearPlanLedgerForReset,
@@ -454,17 +460,18 @@ import {
   replayFromLedgerWithStatus,
   resolvePlanningProfile,
   takeSnapshotEvent
-} from "./index-26h8fb7t.js";
+} from "./index-djtqb6b7.js";
 import {
   CORE_EVENT_LOCKED,
   appendCoreEventSync,
   appendCoreEventsSync,
   finalizeCoreEventsForClose,
+  getCoderRetryEscalationActions,
   getCoreEventCoverage,
   hasSpecDriftAuditEvent,
   hasTaskRepairAuditEvent,
   readCoreEvents
-} from "./index-awt5dpam.js";
+} from "./index-h349p91m.js";
 import {
   DEFAULT_QA_GATES,
   computeProfileHash,
@@ -543,7 +550,7 @@ import {
   transactFile,
   transactKnowledge,
   wordBigrams
-} from "./index-1fwm8vqr.js";
+} from "./index-eyt9ryhd.js";
 import {
   readTailJsonl,
   readTailJsonlDetailed,
@@ -628,7 +635,7 @@ import {
   loadPluginConfig,
   loadPluginConfigWithMeta,
   resolveEpicConfig
-} from "./index-qdwccqv5.js";
+} from "./index-vd6s2mxq.js";
 import {
   GIT_BINARY_ENV_VAR,
   addDeferredWarning,
@@ -661,7 +668,7 @@ import {
   resolveContextWindow,
   resolveGeneratedAgentRole,
   stripKnownSwarmPrefix
-} from "./index-3x07b03s.js";
+} from "./index-5mbpybdm.js";
 import {
   AGENT_TOOL_MAP,
   ALL_AGENT_NAMES,
@@ -687,7 +694,7 @@ import {
   init_agent_names,
   init_constants,
   init_tool_metadata
-} from "./index-hqrkr9ag.js";
+} from "./index-xfzkq1k4.js";
 import {
   KNOWLEDGE_SCHEMA_VERSION,
   OUTCOME_BLOCK_THRESHOLD,
@@ -835,6 +842,7 @@ init_loader();
 // src/hooks/pr-workflow-gate.ts
 init_zod();
 import { createHash as createHash25, randomUUID as randomUUID6 } from "crypto";
+import { realpathSync as realpathSync5 } from "fs";
 import * as fsp5 from "fs/promises";
 import * as path34 from "path";
 
@@ -3463,7 +3471,7 @@ async function importLegacyPrWorkflowGateStateIfNeeded(directory, sessionID, all
       return null;
     throw error2;
   }
-  const legacy = allowSalvagedImport ? (await (await import("./pr-workflow-gate-74j5mcxh.js")).readPrWorkflowGateStateForRecovery(directory, sessionID))?.state ?? null : await readPrWorkflowGateStateFileFromDisk(filePath, sessionID);
+  const legacy = allowSalvagedImport ? (await (await import("./pr-workflow-gate-zqwde6r6.js")).readPrWorkflowGateStateForRecovery(directory, sessionID))?.state ?? null : await readPrWorkflowGateStateFileFromDisk(filePath, sessionID);
   if (!legacy)
     return null;
   const namespace = workflowGateStateCoordinationNamespace(sessionID);
@@ -3597,7 +3605,7 @@ async function deleteStateWhileLocked(directory, sessionID, options = {}) {
   let recoveryState = null;
   if (!currentAuthoritative) {
     if (options.allowSalvagedRead) {
-      const { readPrWorkflowGateStateForRecovery } = await import("./pr-workflow-gate-74j5mcxh.js");
+      const { readPrWorkflowGateStateForRecovery } = await import("./pr-workflow-gate-zqwde6r6.js");
       recoveryState = (await readPrWorkflowGateStateForRecovery(directory, normalizedSessionID))?.state ?? null;
     }
     if (!recoveryState) {
@@ -11476,7 +11484,7 @@ function isLaneOwnedByCurrentSession(branchName, expectedSessionId) {
   return extracted === expectedSessionId;
 }
 async function inspectStandardWorktreeCollisionOwnership(identity) {
-  const collisionOwnership = await import("./worktree-collision-ownership-3r669yvh.js");
+  const collisionOwnership = await import("./worktree-collision-ownership-81wpkagz.js");
   return collisionOwnership.inspectStandardWorktreeCollisionOwnership(identity);
 }
 async function runRecoveryGit(directory, args, timeoutMs = 15000) {
@@ -11904,7 +11912,7 @@ async function precreateStandardWorktreeSession(args) {
   const laneProfile = computeLaneRuntimeProfile(worktreeConfig.runtime_isolation, laneIndex, handle.worktreePath);
   if (laneProfile) {
     try {
-      const { writeLaneProfileToDiskReal } = await import("./core-pz87qafz.js");
+      const { writeLaneProfileToDiskReal } = await import("./core-5bqceeft.js");
       await writeLaneProfileToDiskReal(handle.worktreePath, laneProfile.laneIndex, laneProfile.envOverrides);
     } catch {}
   }
@@ -12898,7 +12906,7 @@ async function finishStandardWorktreeDispatch(directory, dispatch, config, callI
       }
       clearWorktreeMergeStatus(statusKey);
       try {
-        const { removeLaneProfileFromDiskReal } = await import("./core-pz87qafz.js");
+        const { removeLaneProfileFromDiskReal } = await import("./core-5bqceeft.js");
         await removeLaneProfileFromDiskReal(dispatch.handle.worktreePath, dispatch.laneIndex);
       } catch {}
       const state = serializationStateBySessionID.get(dispatch.parentSessionID);
@@ -20936,9 +20944,23 @@ async function repairTaskWorkflowUnderPlanLock(options) {
         transitionId: existingWal.transitionId
       };
     }
-    if (existingWal === null && options.currentPlanStatus !== "completed" && options.currentPlanStatus !== "blocked" && options.currentPlanStatus !== "closed") {
+    if (existingWal === null && options.currentPlanStatus !== "completed" && options.currentPlanStatus !== "blocked" && options.currentPlanStatus !== "closed" && options.currentPlanStatus !== "in_progress") {
       throw new Error(`TASK_REPAIR_NOT_BACKWARD: cannot create a repair from plan status ${options.currentPlanStatus}`);
     }
+    if (existingWal === null && options.currentPlanStatus === "in_progress") {
+      let wedgeEscalated = false;
+      try {
+        wedgeEscalated = getCoderRetryEscalationActions(options.directory, options.taskId, snapshot.retryEpoch).has("user_escalation") && snapshot.retryCount >= 3;
+      } catch (error2) {
+        if (error2 instanceof Error && error2.message === "CORE_EVENT_AUTHORITY_INDEX_UNREADABLE") {
+          throw new Error("TASK_REPAIR_ESCALATION_INDEX_UNREADABLE: cannot verify the retry-escalation wedge evidence for an in_progress repair " + "(the core-event authority index is unreadable). The unreadable index is not content-restored: a later authority write rebuilds it from subsequent events only, so escalation evidence already folded out of the retained events window stays lost, and producers may refuse while the index is unreadable. " + "Recovery without discarding the events trail: re-dispatching the task re-runs the retry ladder from scratch and re-records the rungs; /swarm reset is the destructive full reset (it clears the plan, the events trail, and run state \u2014 session state is reset-session's charter and survives). Admission refuses to guess.");
+        }
+        throw error2;
+      }
+      if (!wedgeEscalated) {
+        throw new Error(`TASK_REPAIR_NOT_BACKWARD: cannot create a repair from plan status ${options.currentPlanStatus} \u2014 an in_progress task is repairable only once the coder retry ladder has recorded a durable user_escalation for its current retry epoch with retryCount at the threshold; no such record is visible for this task.`);
+      }
+    }
     const wal = existingWal ?? {
       version: 1,
       state: "PREPARED",
@@ -29586,7 +29608,7 @@ function clearCriticalShownIds(sessionID) {
 async function rehydratePrSubscriptions(sessionID, directory) {
   const map = new Map;
   try {
-    const { listActive: listActive2 } = await import("./pr-subscriptions-cn13b19x.js");
+    const { listActive: listActive2 } = await import("./pr-subscriptions-e92eg4ts.js");
     const records = await listActive2(directory);
     for (const record of records) {
       if (record.sessionID !== sessionID)
@@ -29814,6 +29836,9 @@ var PrFeedbackStageARecordSchema = exports_external.object({
     source: exports_external.string().min(1),
     validatorContract: exports_external.object({ path: exports_external.string().min(1), id: exports_external.string().min(1) }).strict().optional()
   }).strict()).max(256).optional(),
+  baseRef: exports_external.string().min(1).max(256).optional(),
+  baseSha: exports_external.string().regex(/^(?:[0-9a-f]{40}|[0-9a-f]{64})$/).optional(),
+  baseVerification: exports_external.enum(["caller-asserted", "none"]).optional(),
   validatedAt: exports_external.string().min(1)
 }).strict();
 var PrFeedbackGateBatchRecordSchema = exports_external.object({
@@ -31456,45 +31481,87 @@ async function bindPrWorkflowHeadWhileLocked(directory, normalizedSessionID, prH
     throw error2;
   }
 }
-async function rebindPrFeedbackHead(directory, sessionID, prHeadSha) {
-  const state = await requireBoundState2(directory, sessionID, "PR_FEEDBACK");
-  const normalizedHead = normalizePrHeadSha(prHeadSha);
-  if (state.prFeedbackReadyToPublish) {
-    throw new Error("BLOCKED: PR_FEEDBACK rebind is refused while publication is armed; complete the workflow (or push the bound commit) before rebinding.");
+async function maybeFastForwardRebindHead(directory, normalizedHead) {
+  const tracking = await _test_exports2.resolveCurrentUpstreamPushTargetAsync(directory).catch(() => null);
+  if (!tracking?.remoteTrackingRef)
+    return;
+  const trackingHead = await _test_exports2.resolveLocalRefHeadAsync(directory, tracking.remoteTrackingRef);
+  if (!trackingHead || trackingHead !== normalizedHead.toLowerCase())
+    return;
+  const currentHead = (await _test_exports2.resolveCurrentGitHeadAsync(directory))?.trim().toLowerCase();
+  if (!currentHead)
+    return;
+  if (currentHead === normalizedHead.toLowerCase())
+    return;
+  const ancestry = await _test_exports2.resolveIsAncestorAsync(directory, currentHead, normalizedHead);
+  if (ancestry === null) {
+    throw new Error(`BLOCKED: PR_FEEDBACK rebind fast-forward could not verify whether "${normalizedHead}" is a descendant of the current HEAD "${currentHead}" (the ancestry probe timed out or its output was truncated); nothing moved \u2014 retry the rebind`);
   }
-  const rebindRead = readDelegationsDetailed(directory);
-  if (rebindRead.status === "uncertain") {
-    throw new Error(`BLOCKED: PR_FEEDBACK rebind refused while the delegation store is unreadable after ${rebindRead.attempts} attempts (${rebindRead.reason}); in-flight lanes are UNKNOWN. Restore the store before rebinding.`);
+  if (!ancestry) {
+    throw new Error(`BLOCKED: PR_FEEDBACK rebind fast-forward refused: the bound tracking ref ${tracking.remoteTrackingRef} points at "${normalizedHead}", which is not a descendant of the current HEAD "${currentHead}"; resolve the divergence manually (push the repair, then rebind) \u2014 the gate never merges or rebases`);
   }
-  const openLanes = rebindRead.records.filter((record) => record.parentSessionId === state.sessionID && record.mode?.startsWith("swarm-pr-") && (record.status === "pending" || record.status === "running"));
-  if (openLanes.length > 0) {
-    throw new Error(`BLOCKED: PR_FEEDBACK rebind refused while ${openLanes.length} PR workflow lane(s) are still in flight; collect their results first.`);
+  if (await _test_exports2.resolveIsWorkingTreeCleanAsync(directory) !== true) {
+    throw new Error("BLOCKED: PR_FEEDBACK rebind fast-forward requires a clean index and working tree; clean the tree first, then rebind");
   }
-  if (normalizedHead === state.prHeadSha) {
-    throw new Error(`BLOCKED: PR_FEEDBACK rebind to the current intake head "${normalizedHead}" is a no-op; a rebind must move to a genuinely new verified PR head after merge/rebase repair.`);
+  const moved = await _test_exports2.fastForwardToRefAsync(directory, tracking.remoteTrackingRef);
+  if (!moved) {
+    throw new Error(`BLOCKED: PR_FEEDBACK rebind fast-forward to ${tracking.remoteTrackingRef} failed or timed out; if git left an index.lock or a partially updated tree, remove the lock / restore the tree manually before retrying \u2014 otherwise a plain retry of the rebind completes it`);
   }
-  await assertCurrentCheckoutHead(directory, normalizedHead, state.mode);
-  await assertPrFeedbackTrackingCheckout(directory, normalizedHead);
-  const nextState = {
-    ...state,
-    prHeadSha: normalizedHead,
-    prFeedbackStageA: undefined,
-    prFeedbackVerifications: undefined,
-    prFeedbackGateBatches: undefined,
-    prFeedbackRebindCount: (state.prFeedbackRebindCount ?? 0) + 1,
-    updatedAt: isoNow()
-  };
-  try {
-    appendCoreEventSync(directory, {
-      type: "pr_feedback_rebound",
-      timestamp: isoNow(),
-      sessionID: state.sessionID,
-      previousPrHeadSha: state.prHeadSha,
+}
+async function rebindPrFeedbackHead(directory, sessionID, prHeadSha) {
+  return withPrWorkflowCheckoutMutationLock(directory, async () => {
+    const state = await requireBoundState2(directory, sessionID, "PR_FEEDBACK");
+    const normalizedHead = normalizePrHeadSha(prHeadSha).toLowerCase();
+    if (state.prFeedbackReadyToPublish) {
+      throw new Error("BLOCKED: PR_FEEDBACK rebind is refused while publication is armed; complete the workflow (or push the bound commit) before rebinding.");
+    }
+    const rebindRead = readDelegationsDetailed(directory);
+    if (rebindRead.status === "uncertain") {
+      throw new Error(`BLOCKED: PR_FEEDBACK rebind refused while the delegation store is unreadable after ${rebindRead.attempts} attempts (${rebindRead.reason}); in-flight lanes are UNKNOWN. Restore the store before rebinding.`);
+    }
+    const openLanes = rebindRead.records.filter((record) => record.parentSessionId === state.sessionID && record.mode?.startsWith("swarm-pr-") && (record.status === "pending" || record.status === "running"));
+    if (openLanes.length > 0) {
+      throw new Error(`BLOCKED: PR_FEEDBACK rebind refused while ${openLanes.length} PR workflow lane(s) are still in flight; collect their results first.`);
+    }
+    if (normalizedHead === state.prHeadSha) {
+      throw new Error(`BLOCKED: PR_FEEDBACK rebind to the current intake head "${normalizedHead}" is a no-op; a rebind must move to a genuinely new verified PR head after merge/rebase repair.`);
+    }
+    try {
+      await maybeFastForwardRebindHead(directory, normalizedHead);
+      await assertCurrentCheckoutHead(directory, normalizedHead, state.mode);
+      await assertPrFeedbackTrackingCheckout(directory, normalizedHead);
+    } catch (error2) {
+      const currentHead = (await _test_exports2.resolveCurrentGitHeadAsync(directory).catch(() => null))?.trim().toLowerCase();
+      if (currentHead !== undefined && currentHead !== null && currentHead !== (state.prHeadSha ?? "").toLowerCase() && error2 instanceof Error) {
+        throw new Error(`BLOCKED: ${error2.message} NOTE: the checkout HEAD is "${currentHead}" while the bound intake head is still "${state.prHeadSha}" \u2014 the fast-forward already moved HEAD; a plain retry of the same rebind completes it`, { cause: error2 });
+      }
+      throw error2;
+    }
+    const nextState = {
+      ...state,
       prHeadSha: normalizedHead,
-      rebindCount: nextState.prFeedbackRebindCount
-    });
-  } catch {}
-  return withSessionStateMutation(directory, state.sessionID, async () => writeStateWhileLocked(directory, nextState));
+      prFeedbackStageA: undefined,
+      prFeedbackVerifications: undefined,
+      prFeedbackGateBatches: undefined,
+      prFeedbackRebindCount: (state.prFeedbackRebindCount ?? 0) + 1,
+      updatedAt: isoNow()
+    };
+    try {
+      appendCoreEventSync(directory, {
+        type: "pr_feedback_rebound",
+        timestamp: isoNow(),
+        sessionID: state.sessionID,
+        previousPrHeadSha: state.prHeadSha,
+        prHeadSha: normalizedHead,
+        rebindCount: nextState.prFeedbackRebindCount
+      });
+    } catch {}
+    try {
+      return await withSessionStateMutation(directory, state.sessionID, async () => writeStateWhileLocked(directory, nextState));
+    } catch (error2) {
+      throw new Error(`BLOCKED: PR_FEEDBACK rebind moved the checkout toward "${normalizedHead}" but could not persist the rebind state (${error2 instanceof Error ? error2.message : String(error2)}); HEAD is already at the new head \u2014 retry the same rebind to complete it`, { cause: error2 });
+    }
+  });
 }
 async function bindPrReviewBase(directory, sessionID, options) {
   let state = await bindPrWorkflowHead(directory, sessionID, options.prHeadSha);
@@ -31538,7 +31605,12 @@ async function assertCurrentCheckoutHead(directory, expectedHead, mode = "PR_REV
 }
 async function assertPrReviewCleanCheckout(directory, mode = "PR_REVIEW") {
   if (await _test_exports2.resolveIsWorkingTreeCleanAsync(directory) !== true) {
-    throw new Error(`BLOCKED: ${mode} requires a clean index and working tree at the exact PR head`);
+    const dirtyPaths = await _test_exports2.resolveWorkingTreeDirtyPathsAsync(directory);
+    const sanitizePath = (value) => value.replace(/[\p{Cc}]/gu, (ch) => `\\u${ch.charCodeAt(0).toString(16).padStart(4, "0")}`);
+    const shown = dirtyPaths ? dirtyPaths.slice(0, PR_WORKFLOW_DIRTY_PATH_DISCLOSURE_LIMIT).map(sanitizePath) : [];
+    const total = dirtyPaths ? dirtyPaths.length : 0;
+    const detail = shown.length > 0 ? ` Dirty paths (first ${shown.length} of ${total}): ${shown.join(", ")}.` : "";
+    throw new Error(`BLOCKED: ${mode} requires a clean index and working tree at the exact PR head.${detail}`);
   }
 }
 async function assertPrFeedbackTrackingCheckout(directory, prHeadSha) {
@@ -33048,6 +33120,11 @@ async function recordPrFeedbackStageA(directory, sessionID, revisionDigest, chec
       feedbackItemIds: reproductionFeedbackItemIds,
       applicableCategories: normalizedCategories,
       applicableObligations,
+      ...options.baseIdentity !== undefined ? {
+        baseRef: options.baseIdentity.baseRef,
+        baseSha: options.baseIdentity.baseSha
+      } : {},
+      baseVerification: options.baseIdentity?.baseVerification,
       validatedAt: isoNow()
     },
     prFeedbackGateBatches: retainsGateBatches ? [...state.prFeedbackGateBatches ?? []] : [],
@@ -35332,11 +35409,19 @@ async function enforcePrWorkflowToolBefore(directory, sessionID, toolName, args,
   const isDetachedFeedbackCheckout = Boolean(detachedFeedbackSwitchMatch?.[1] && isSafeGitRefToken(detachedFeedbackSwitchMatch[1])) || /^gh\s+pr\s+checkout\b.*\s--detach(?:\s|$)/i.test(command);
   const containsGitCommitShell = isShellCommandRequiringVerification && /\bgit\b(?:(?![;&|]).){0,200}\bcommit\b/i.test(command);
   const isStandaloneGitCommitShell = containsGitCommitShell && isSafeStandaloneGitCommit(command);
+  const isStandaloneGitAddShell = isShellCommandRequiringVerification && isSafeStandaloneGitAdd(command);
   const isPublicationShell = isShellCommandRequiringVerification && (/\bgit\b(?:(?![;&|]).){0,200}\bpush\b/i.test(command) || /\bgh\s+(?:api|pr|issue|run)\b/i.test(command));
-  const isPublicationTool = !isInternalWorkflowTool && isRemoteMutationTool;
+  const isTrustedObserveTool = trustedCapability === "observe" && isTrustedWorkflowTool;
+  const isPublicationTool = !isInternalWorkflowTool && !isTrustedObserveTool && isRemoteMutationTool;
   const isCoderTask = isDirectAgentTask && requestedRoles.length > 0 && requestedRoles.every((role) => role === "coder");
   const blockedShellDiagnosis = isShellTool && command && !isReadOnlyShell && shellPermissionEnvelope ? ` ${describeBlockedPrReviewShellCommand(command, shellPermissionEnvelope)}` : "";
   if (state.mode === "PR_REVIEW") {
+    if (normalizedTool === "test_runner" && state.prHeadSha) {
+      throw new Error("BLOCKED: PR_REVIEW test_runner would execute inside the bound checkout at the exact PR head and its outputs (snapshot files, fixtures) would dirty the tree; run validation through dispatch_lanes_async lanes or PR_FEEDBACK Stage A");
+    }
+    if (normalizedTool === "swarm_command" && isPrWorkflowRecoverySwarmCommandArgs(args)) {
+      return;
+    }
     let hasAuthorizedDirectReentry = false;
     if (isDirectAgentTask && requestedAgentFields.length === 1 && requestedAgentFields[0] === "subagent_type" && requestedRoles.length === 1 && (requestedRoles[0] === "reviewer" || requestedRoles[0] === "test_engineer") && callID) {
       hasAuthorizedDirectReentry = await hasActivePrReviewReentryAuthorization(directory, sessionID, {
@@ -35355,6 +35440,9 @@ async function enforcePrWorkflowToolBefore(directory, sessionID, toolName, args,
   if (isDirectAgentTask && !isCoderTask) {
     throw new Error("BLOCKED: PR_FEEDBACK reviewer, test, critic, explorer, and unknown agent lanes require structured dispatch_lanes_async provenance");
   }
+  if (normalizedTool === "swarm_command" && isPrWorkflowRecoverySwarmCommandArgs(args)) {
+    return;
+  }
   if (!isInternalWorkflowTool && !isDirectAgentTask && !isDirectWrite && !isShellTool && !isNamedReadOnlyTool) {
     throw new Error("BLOCKED: PR_FEEDBACK rejects unclassified plugin/MCP tools; use positively classified observation tools, built-in structured write tools after verification, or the workflow controller" + describePrWorkflowControllerToolNames(state.mode));
   }
@@ -35406,9 +35494,43 @@ async function enforcePrWorkflowToolBefore(directory, sessionID, toolName, args,
   if (!state.prHeadSha && isCanonicalReviewCheckout)
     return;
   if (isStandaloneGitCommitShell) {
+    const messageFile = extractStandaloneGitCommitMessageFile(command);
+    if (messageFile !== null) {
+      const cwdBase = resolveStandaloneGitCommandCwd(command, directory);
+      const resolvedFile = path34.resolve(cwdBase, messageFile);
+      const containmentRoot = await _test_exports2.resolveRepoTopLevelAsync(directory);
+      if (isPathInsideRepository(resolvedFile, directory) || containmentRoot !== null && isPathInsideRepository(resolvedFile, containmentRoot)) {
+        throw new Error(`BLOCKED: PR_FEEDBACK commit -F message file "${messageFile}" resolves inside the repository; an in-repo message file would dirty the clean-tree arming check. The message file must live outside the repository; author it with the prepare_pr_feedback_commit_message tool and pass the returned path`);
+      }
+    }
     await assertPrFeedbackReadyToPublish(directory, sessionID);
     return;
   }
+  if (isStandaloneGitAddShell) {
+    const stagedPaths2 = extractStandaloneGitAddPaths(command);
+    const changedPaths = state.prHeadSha ? await _test_exports2.resolvePrWorkflowChangedPathSetAsync(directory, state.prHeadSha) : null;
+    const foldToken = (token) => token.replace(/\\/g, "/").replace(/^\.\//, "");
+    const tokenAdmitted = (token) => {
+      if (changedPaths === null)
+        return false;
+      const folded = foldToken(token);
+      if (changedPaths.has(folded))
+        return true;
+      let foldedMatches = 0;
+      for (const member of changedPaths) {
+        if (member.toLowerCase() === folded.toLowerCase()) {
+          foldedMatches += 1;
+          if (foldedMatches > 1)
+            return false;
+        }
+      }
+      return foldedMatches === 1;
+    };
+    if (changedPaths !== null && stagedPaths2.length > 0 && stagedPaths2.every(tokenAdmitted)) {
+      await assertPrFeedbackReadyToPublish(directory, sessionID);
+      return;
+    }
+  }
   if (isPublicationShell || isPublicationTool) {
     throw new Error("BLOCKED: PR_FEEDBACK publication is not armed; finish every ordered gate, create the one approved commit, and call complete_pr_workflow before publishing");
   }
@@ -35422,6 +35544,8 @@ async function enforcePrWorkflowToolBefore(directory, sessionID, toolName, args,
     return;
   if (normalizedTool === "abort_pr_workflow")
     return;
+  if (normalizedTool === "rebind_pr_feedback_head" || isTrustedObserveTool)
+    return;
   await assertPrFeedbackVerificationSettled(directory, sessionID);
 }
 async function readPrReviewReentryBindingContext(directory, sessionID) {
@@ -35872,6 +35996,12 @@ var _test_exports2 = {
   resolveCommitCountSinceAsync,
   resolveIsWorkingTreeClean,
   resolveIsWorkingTreeCleanAsync,
+  resolveLocalRefHeadAsync,
+  resolveIsAncestorAsync,
+  fastForwardToRefAsync,
+  resolveRepoTopLevelAsync,
+  resolvePrWorkflowChangedPathSetAsync,
+  resolveWorkingTreeDirtyPathsAsync,
   resolveIsExactSingleChildCommit,
   resolveIsExactSingleChildCommitAsync,
   resolvePrReviewDiffStats,
@@ -36061,9 +36191,12 @@ var PR_REVIEW_CONTROLLER_TOOLS = new Set([
   "write_pr_review_artifact",
   "write_pr_review_trigger_eval"
 ]);
+var PR_WORKFLOW_DIRTY_PATH_DISCLOSURE_LIMIT = 5;
 var PR_FEEDBACK_CONTROLLER_TOOLS = new Set([
   "invalidate_pr_feedback_publication",
+  "prepare_pr_feedback_commit_message",
   "prepare_pr_feedback_scope",
+  "rebind_pr_feedback_head",
   "run_pr_feedback_stage_a"
 ]);
 function isPrWorkflowControllerTool(mode, toolName) {
@@ -36442,6 +36575,194 @@ function describeShellSyntaxViolation(command) {
       return "Reason: compound-syntax (;, &&, |, <, >, backtick, or $()/@()). Run ONE command per call; a single leading `cd <dir> &&` and a trailing `2>&1` are tolerated for reads only.";
   }
 }
+function isPrWorkflowRecoverySwarmCommandArgs(args) {
+  const raw = typeof args?.command === "string" ? args.command : typeof args?.subcommand === "string" ? args.subcommand : "";
+  const parts = raw.trim().toLowerCase().split(/\s+/).filter(Boolean);
+  if (parts.length === 0)
+    return false;
+  if (parts[0] === "diagnose")
+    return true;
+  return parts[0] === "guardrail" && parts[1] === "reset";
+}
+function isSafeStandaloneGitAdd(command) {
+  if (hasUnsafeShellControlSyntax(command))
+    return false;
+  const match = /^git\s+add\s+--\s+(.+)$/i.exec(command.trim());
+  if (!match)
+    return false;
+  const paths = extractStandaloneGitAddPaths(command);
+  return paths.length > 0 && paths.every((token) => isSanctionedAddPath(token));
+}
+function isSanctionedAddPath(token) {
+  if (token.length === 0)
+    return false;
+  if (/["'`\\]/.test(token))
+    return false;
+  if (/[*?[\]]/.test(token))
+    return false;
+  if (token.includes(":"))
+    return false;
+  if (token.startsWith("-"))
+    return false;
+  return true;
+}
+function extractStandaloneGitAddPaths(command) {
+  const tokens = tokenizeStandaloneGitCommand(command);
+  if (tokens.length < 3)
+    return [];
+  if (tokens[0].quoted || tokens[0].text.toLowerCase() !== "git")
+    return [];
+  if (tokens[1].quoted || tokens[1].text.toLowerCase() !== "add")
+    return [];
+  const separator = tokens[2];
+  if (!separator || separator.text !== "--")
+    return [];
+  return tokens.slice(3).map((token) => token.text).filter(Boolean);
+}
+function tokenizeStandaloneGitCommand(command) {
+  const tokens = [];
+  let current = "";
+  let started = false;
+  let beganQuoted = false;
+  let inQuotes = false;
+  const flush = () => {
+    if (started) {
+      tokens.push({ text: current, quoted: beganQuoted });
+    }
+    current = "";
+    started = false;
+    beganQuoted = false;
+  };
+  for (const ch of command) {
+    if (ch === '"') {
+      if (!started) {
+        started = true;
+        beganQuoted = true;
+      }
+      inQuotes = !inQuotes;
+      continue;
+    }
+    if (!inQuotes && (ch === " " || ch === "\t" || ch === `
+`)) {
+      flush();
+      continue;
+    }
+    started = true;
+    current += ch;
+  }
+  flush();
+  return tokens;
+}
+function standaloneGitCommitSubcommandIndex(tokens) {
+  for (let i = 0;i < tokens.length; i += 1) {
+    if (!tokens[i].quoted && tokens[i].text === "commit")
+      return i;
+  }
+  return -1;
+}
+function extractStandaloneGitCommitMessageFile(command) {
+  const tokens = tokenizeStandaloneGitCommand(command);
+  const subcommand = standaloneGitCommitSubcommandIndex(tokens);
+  if (subcommand < 0)
+    return null;
+  let lastMessageFile = null;
+  for (let i = subcommand + 1;i < tokens.length; i += 1) {
+    const token = tokens[i];
+    const text = token.text.replace(/^\^+/, "");
+    if (text === "--")
+      break;
+    if (text === "-F" || text === "--file") {
+      const value = tokens[i + 1];
+      lastMessageFile = value === undefined ? null : value.text;
+      continue;
+    }
+    if (GIT_COMMIT_VALUE_TAKING_OPTIONS.has(text)) {
+      i += 1;
+      continue;
+    }
+    if (text.startsWith("--")) {
+      const eq = text.indexOf("=");
+      if (eq < 0) {
+        if (/^--fil$/i.test(text)) {
+          const value = tokens[i + 1];
+          lastMessageFile = value === undefined ? null : value.text;
+          i += 1;
+        }
+        continue;
+      }
+      const name = text.slice(2, eq).toLowerCase();
+      if (name === "file" || name === "fil") {
+        lastMessageFile = text.slice(eq + 1);
+      }
+      continue;
+    }
+    if (text.startsWith("-") && text.length > 1) {
+      let consumedNext = false;
+      for (let p = 1;p < text.length; p += 1) {
+        const c = text[p];
+        if (c === "F") {
+          const rest = text.slice(p + 1);
+          if (rest.length > 0) {
+            lastMessageFile = rest;
+          } else {
+            lastMessageFile = tokens[i + 1]?.text ?? null;
+            consumedNext = true;
+          }
+          break;
+        }
+        if ("cCmt".includes(c)) {
+          if (p + 1 >= text.length)
+            consumedNext = true;
+          break;
+        }
+      }
+      if (consumedNext)
+        i += 1;
+    }
+  }
+  return lastMessageFile;
+}
+var GIT_COMMIT_VALUE_TAKING_OPTIONS = new Set([
+  "-m",
+  "--message",
+  "-c",
+  "--reedit-message",
+  "-C",
+  "--reuse-message",
+  "-t",
+  "--template",
+  "--fixup",
+  "--squash",
+  "--author",
+  "--date",
+  "--cleanup",
+  "--trailer",
+  "--pathspec-from-file"
+]);
+function resolveStandaloneGitCommandCwd(command, directory) {
+  const tokens = tokenizeStandaloneGitCommand(command);
+  const subcommand = standaloneGitCommitSubcommandIndex(tokens);
+  const limit = subcommand >= 0 ? subcommand : tokens.length;
+  for (let i = 0;i < limit; i += 1) {
+    if (!tokens[i].quoted && tokens[i].text === "-C" && tokens[i + 1]) {
+      return path34.resolve(directory, tokens[i + 1].text);
+    }
+  }
+  return directory;
+}
+function isPathInsideRepository(target, repoRoot) {
+  const lexicalInside = (value, root) => {
+    const rel = path34.relative(root, value);
+    return rel === "" || !rel.startsWith("..") && !path34.isAbsolute(rel);
+  };
+  if (lexicalInside(target, repoRoot))
+    return true;
+  try {
+    return lexicalInside(realpathSync5(target), realpathSync5(repoRoot));
+  } catch {
+    return false;
+  }
+}
 function isSafeStandaloneGitCommit(command) {
   if (hasUnsafeShellControlSyntax(command))
     return false;
@@ -42660,8 +42981,8 @@ init_schema();
 init_logger();
 
 // src/tools/repo-graph/safe-realpath.ts
-import { realpathSync as realpathSync6 } from "fs";
-function safeRealpathSync(targetPath, fallback, realpathResolver = realpathSync6) {
+import { realpathSync as realpathSync7 } from "fs";
+function safeRealpathSync(targetPath, fallback, realpathResolver = realpathSync7) {
   try {
     return realpathResolver(targetPath);
   } catch (error2) {
@@ -46658,9 +46979,9 @@ function hashContent(content) {
   return createHash29("sha1").update(content).digest("hex");
 }
 async function loadConfigForPolicyCurator(directory) {
-  const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-qv9bvhyz.js");
+  const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-jw861rj0.js");
   try {
-    const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-71g0ps66.js");
+    const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-mbygjbj8.js");
     const { config: loadedConfig } = loadPluginConfigWithMeta2(directory);
     return KnowledgeConfigSchema2.parse(loadedConfig.knowledge ?? {});
   } catch {
@@ -49718,7 +50039,7 @@ async function resolveCuratorLLMDelegate(directory, mode, sessionId) {
   const seam = _internals50.createCuratorLLMDelegate;
   if (seam)
     return seam(directory, mode, sessionId);
-  const { createCuratorLLMDelegate } = await import("./curator-llm-factory-cg1p6ysr.js");
+  const { createCuratorLLMDelegate } = await import("./curator-llm-factory-nbprwszt.js");
   return createCuratorLLMDelegate(directory, mode, sessionId);
 }
 async function reconcileCloseTerminalStateForPlan(directory, targetPlan, options) {
@@ -50113,7 +50434,7 @@ async function runFinalizeStage(ctx) {
     }
   }
   try {
-    const { CuratorConfigSchema: CCS } = await import("./schema-qv9bvhyz.js");
+    const { CuratorConfigSchema: CCS } = await import("./schema-jw861rj0.js");
     const { config: pmLoadedConfig } = _internals50.loadPluginConfigWithMeta(ctx.directory);
     const curatorCfg = CCS.parse(pmLoadedConfig.curator ?? {});
     if (curatorCfg.enabled && curatorCfg.postmortem_enabled) {
@@ -54146,7 +54467,7 @@ function serializeAgentSession(s) {
 }
 async function writeSnapshot(directory, state) {
   try {
-    const { ensureSnapshotCoordinationReady } = await import("./snapshot-coordination-init-7c0s65jw.js");
+    const { ensureSnapshotCoordinationReady } = await import("./snapshot-coordination-init-11qb0jbs.js");
     await ensureSnapshotCoordinationReady(directory);
     const snapshot = {
       version: 3,
@@ -57286,7 +57607,7 @@ function planMerges(active, threshold, maxComparisons, maxMerges) {
   };
 }
 async function sweepActiveNearDuplicates(directory, options = {}) {
-  const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-71g0ps66.js");
+  const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-mbygjbj8.js");
   const { config } = loadPluginConfigWithMeta2(directory);
   const sweepConfig = config.learning?.dedup_sweep;
   if (sweepConfig?.enabled === false)
@@ -58410,7 +58731,7 @@ async function runCuratorPhase(directory, phase, agentsDispatched, config, knowl
     }
     if (config.skill_generation_enabled === true && skillCandidates.length > 0) {
       try {
-        const skillModule = await import("./skill-generator-19ckpm74.js");
+        const skillModule = await import("./skill-generator-dd1w9p3t.js");
         for (const cand of skillCandidates) {
           if (cand.confidence < (config.min_skill_confidence ?? DEFAULT_SKILL_MIN_CONFIDENCE)) {
             continue;
@@ -58882,7 +59203,7 @@ async function applyCuratorKnowledgeUpdates(directory, recommendations, knowledg
     } catch {}
   }
   if (contradictedEntries.length > 0 && knowledgeConfig.contradiction_threshold_action === "quarantine") {
-    const { maybeQuarantineOnContradiction } = await import("./knowledge-escalator-w7b32ak4.js");
+    const { maybeQuarantineOnContradiction } = await import("./knowledge-escalator-k1mssp9r.js");
     for (const { id } of contradictedEntries) {
       try {
         await maybeQuarantineOnContradiction(directory, id, knowledgeConfig.contradiction_quarantine_threshold, knowledgeConfig.contradiction_quarantine_window_days);
@@ -59714,7 +60035,7 @@ async function runCuratorPostMortem(directory, options = {}) {
       warnings.push("Failed to collect knowledge summary.");
     }
     try {
-      const { getScanStatus } = await import("./scan-cursor-4xxfc42h.js");
+      const { getScanStatus } = await import("./scan-cursor-yehnf9jt.js");
       const scanStatus = await getScanStatus(directory);
       if (scanStatus.remaining_estimate > 0) {
         warnings.push(`Fair scan: reviewed ${knowledgeSummary.length} entries this sweep (generation ${scanStatus.generation}); ${scanStatus.remaining_estimate} more eligible entries will be visited in future curation sweeps.`);
@@ -59886,9 +60207,9 @@ var _internals72 = {
   verifyPostMortemKnowledgeActions,
   repairPostMortemActions,
   loadDefaultKnowledgeConfig: async (directory) => {
-    const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-qv9bvhyz.js");
+    const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-jw861rj0.js");
     try {
-      const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-71g0ps66.js");
+      const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-mbygjbj8.js");
       const loaded = loadPluginConfigWithMeta2(directory);
       return KnowledgeConfigSchema2.parse(loaded.config.knowledge ?? {});
     } catch {
@@ -59896,11 +60217,11 @@ var _internals72 = {
     }
   },
   applyCuratorKnowledgeUpdates: async (directory, recommendations, knowledgeConfig, generation) => {
-    const { applyCuratorKnowledgeUpdates: applyCuratorKnowledgeUpdates2 } = await import("./curator-fvnptcnw.js");
+    const { applyCuratorKnowledgeUpdates: applyCuratorKnowledgeUpdates2 } = await import("./curator-b3zn9w9q.js");
     return applyCuratorKnowledgeUpdates2(directory, recommendations, knowledgeConfig, generation);
   },
   checkHivePromotions: async (entries2, knowledgeConfig, directory) => {
-    const { checkHivePromotions } = await import("./hive-promoter-bmdgnmnf.js");
+    const { checkHivePromotions } = await import("./hive-promoter-2dnv2xrg.js");
     return checkHivePromotions(entries2, knowledgeConfig, directory);
   },
   applyProposalTriage: async (directory, triage) => {
@@ -59909,7 +60230,7 @@ var _internals72 = {
       activateProposal,
       listSkills: listSkills2,
       sanitizeSlug
-    } = await import("./skill-generator-19ckpm74.js");
+    } = await import("./skill-generator-dd1w9p3t.js");
     const result = {
       approved: [],
       rejected: [],
@@ -59951,7 +60272,7 @@ var _internals72 = {
     return result;
   },
   readPriorDriftReports: async (directory) => {
-    const { readPriorDriftReports: readPriorDriftReports2 } = await import("./curator-drift-c1x7jdxj.js");
+    const { readPriorDriftReports: readPriorDriftReports2 } = await import("./curator-drift-ka477rrz.js");
     return readPriorDriftReports2(directory);
   },
   readSwarmKnowledge: (directory) => readKnowledge(resolveSwarmKnowledgePath(directory))
@@ -70221,9 +70542,9 @@ var _internals80 = {
   loadPluginConfigWithMeta,
   loadCuratorDeps: async () => {
     const [{ CuratorConfigSchema }, curator, { createCuratorLLMDelegate }] = await Promise.all([
-      import("./schema-qv9bvhyz.js"),
-      import("./curator-fvnptcnw.js"),
-      import("./curator-llm-factory-cg1p6ysr.js")
+      import("./schema-jw861rj0.js"),
+      import("./curator-b3zn9w9q.js"),
+      import("./curator-llm-factory-nbprwszt.js")
     ]);
     return { CuratorConfigSchema, curator, createCuratorLLMDelegate };
   }
@@ -72673,7 +72994,7 @@ async function computeCurationDiagnostics(directory, entries2) {
   let scanCompleted = false;
   let scanRemaining = 0;
   try {
-    const { getScanStatus } = await import("./scan-cursor-4xxfc42h.js");
+    const { getScanStatus } = await import("./scan-cursor-yehnf9jt.js");
     const status = await getScanStatus(directory);
     scanGeneration = status.generation;
     scanCompleted = status.completed;
@@ -72683,10 +73004,10 @@ async function computeCurationDiagnostics(directory, entries2) {
   try {
     const { isLinked: isLinked2 } = await import("./knowledge-link-1f91bzcc.js");
     if (isLinked2(directory)) {
-      const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-qv9bvhyz.js");
+      const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-jw861rj0.js");
       let config;
       try {
-        const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-71g0ps66.js");
+        const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-mbygjbj8.js");
         const loaded = loadPluginConfigWithMeta2(directory);
         config = KnowledgeConfigSchema2.parse(loaded.config.knowledge ?? {});
       } catch {
@@ -74142,7 +74463,7 @@ async function handleDoctorCommand(directory, args) {
   const result = runConfigDoctor(config, directory, planParallelizationEnabled);
   let output;
   if (enableAutoFix && result.hasAutoFixableIssues) {
-    const { runConfigDoctorWithFixes } = await import("./config-doctor-2tcp28sc.js");
+    const { runConfigDoctorWithFixes } = await import("./config-doctor-20pd12nw.js");
     const fixResult = await runConfigDoctorWithFixes(directory, config, true, {
       applyLossy: true
     });
@@ -74180,7 +74501,7 @@ async function handleDoctorCommand(directory, args) {
 `;
   }
   try {
-    const { runModelPreflight } = await import("./model-preflight-k92fnbq8.js");
+    const { runModelPreflight } = await import("./model-preflight-ks9j40t5.js");
     const preflight = await runModelPreflight(config, swarmState.opencodeClient, { generatedAgentNames: swarmState.generatedAgentNames });
     const missingSelection = preflight.resolutions.filter((resolution) => resolution.status === "missing-selection");
     const unresolved = preflight.catalogAvailable ? preflight.resolutions.filter((resolution) => resolution.status === "unresolved") : [];
@@ -74214,7 +74535,7 @@ async function handleDoctorCommand(directory, args) {
     }
   } catch {}
   try {
-    const { renderKnowledgeReceiptPhaseIdSection } = await import("./doctor-knowledge-receipt-phase-id-xwyb5sf8.js");
+    const { renderKnowledgeReceiptPhaseIdSection } = await import("./doctor-knowledge-receipt-phase-id-nrk52ak6.js");
     output += await renderKnowledgeReceiptPhaseIdSection(directory, enableAutoFix);
   } catch {}
   const strayDirs = detectStraySwarmDirs(directory);
@@ -76231,7 +76552,7 @@ async function handleEvidenceCommand(directory, args) {
   return formatTaskEvidenceMarkdown(evidenceData);
 }
 async function handleEvidenceSummaryCommand(directory) {
-  const { buildEvidenceSummary } = await import("./evidence-summary-service-47cptvea.js");
+  const { buildEvidenceSummary } = await import("./evidence-summary-service-qrr8zjhj.js");
   const artifact = await buildEvidenceSummary(directory);
   if (!artifact) {
     return "No plan found. Run `/swarm plan` to check plan status.";
@@ -77526,7 +77847,7 @@ import { spawnSync as spawnSync5 } from "child_process";
 import * as fs55 from "fs";
 import {
   readFileSync as readFileSync44,
-  realpathSync as realpathSync10,
+  realpathSync as realpathSync11,
   statSync as statSync34,
   unlinkSync as unlinkSync17,
   writeFileSync as writeFileSync16
@@ -77803,8 +78124,8 @@ function isMissingExecutableFailure(message) {
 }
 function resolveContainedRegularFile(workingDir, filePath) {
   try {
-    const realWorkingDir = realpathSync10(path100.resolve(workingDir));
-    const realFilePath = realpathSync10(path100.resolve(realWorkingDir, filePath));
+    const realWorkingDir = realpathSync11(path100.resolve(workingDir));
+    const realFilePath = realpathSync11(path100.resolve(realWorkingDir, filePath));
     const relativePath2 = path100.relative(realWorkingDir, realFilePath);
     if (relativePath2 === "" || relativePath2 === ".." || relativePath2.startsWith(`..${path100.sep}`) || path100.isAbsolute(relativePath2)) {
       return;
@@ -90938,7 +91259,7 @@ ${USAGE14}`;
 
 // src/commands/memory.ts
 init_loader();
-import { existsSync as existsSync66, readFileSync as readFileSync60, realpathSync as realpathSync15, statSync as statSync42 } from "fs";
+import { existsSync as existsSync66, readFileSync as readFileSync60, realpathSync as realpathSync16, statSync as statSync42 } from "fs";
 import * as path132 from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 // src/memory/evaluation.ts
@@ -94439,7 +94760,7 @@ import {
   fstatSync as fstatSync8,
   openSync as openSync21,
   readSync as readSync14,
-  realpathSync as realpathSync14,
+  realpathSync as realpathSync15,
   statSync as statSync41
 } from "fs";
 var import_proper_lockfile12 = __toESM(require_proper_lockfile(), 1);
@@ -99975,7 +100296,7 @@ function parseEvaluateArgs(directory, args) {
       }
       let realFixtures;
       try {
-        realFixtures = realpathSync15(resolvedFixtures);
+        realFixtures = realpathSync16(resolvedFixtures);
       } catch {
         return {
           error: "--fixtures <directory> must be an existing directory inside the project or the bundled fixtures directory (path could not be resolved)"
@@ -99986,7 +100307,7 @@ function parseEvaluateArgs(directory, args) {
         path132.join(PACKAGE_ROOT, "tests", "fixtures", "memory-recall")
       ].map((root) => {
         try {
-          return realpathSync15(root);
+          return realpathSync16(root);
         } catch {
           return null;
         }
@@ -100037,7 +100358,7 @@ function parseEvaluateArgs(directory, args) {
         };
       }
       try {
-        manifestPath = realpathSync15(resolvedManifest);
+        manifestPath = realpathSync16(resolvedManifest);
         if (statSync42(manifestPath).size > MAX_HELDOUT_MANIFEST_BYTES) {
           return {
             error: `--manifest <file> exceeds the ${MAX_HELDOUT_MANIFEST_BYTES}-byte limit`
@@ -100045,7 +100366,7 @@ function parseEvaluateArgs(directory, args) {
         }
         const realRoots = [projectRoot, bundledRoot].map((root) => {
           try {
-            return realpathSync15(root);
+            return realpathSync16(root);
           } catch {
             return null;
           }
@@ -100658,7 +100979,7 @@ function createCuratorLLMDelegate(directory, mode = "init", sessionId) {
     }
     const sdkOpts = signal ? { signal } : {};
     try {
-      const { getSwarmAgents: getSwarmAgents2, resolveFallbackModel: resolveFallbackModel2 } = await import("./index-kjhsssaq.js");
+      const { getSwarmAgents: getSwarmAgents2, resolveFallbackModel: resolveFallbackModel2 } = await import("./index-qksw8p51.js");
       const createResult = await client.session.create({
         ...sessionId ? {
           body: {
@@ -102756,7 +103077,7 @@ async function cancelPrFeedbackLoopUnlocked(directory, sessionID, reason) {
     clearedEvents: []
   };
   try {
-    const { cancelPrFeedbackPublication: cancelPrFeedbackPublication2 } = await import("./pr-workflow-gate-74j5mcxh.js");
+    const { cancelPrFeedbackPublication: cancelPrFeedbackPublication2 } = await import("./pr-workflow-gate-zqwde6r6.js");
     await cancelPrFeedbackPublication2(directory, sessionID, reason);
   } catch (err) {
     warn(`[pr-feedback-loop] cancelPrFeedbackPublication failed (fail-open): ${err instanceof Error ? err.message : String(err)}`);
@@ -112712,7 +113033,7 @@ async function handleResetSessionCommand(directory, args, sessionID) {
     "",
     "Session state cleared. Plan, evidence, and knowledge preserved.",
     "",
-    "In-memory circuit breakers and revision limits have been cleared. Durable per-task retry gates (the coder retry circuit breaker, bound to commit settlement in the events audit log and .swarm/evidence/) intentionally survive this reset. If a task is blocked with TASK_RETRY_CRITIC_REQUIRED waiting for a critic_sounding_board APPROVED verdict that was already obtained, have the architect record it with the approve_retry_sounding_board tool. A task left at rework_required also survives this reset; when the Stage B verdict did not require a code change, the architect can exit it with the recover_rework_task tool (issue #2755)."
+    "In-memory circuit breakers and revision limits have been cleared. Durable per-task retry gates (the coder retry circuit breaker, bound to commit settlement in the events audit log and .swarm/evidence/) intentionally survive this reset. If a task is blocked with TASK_RETRY_CRITIC_REQUIRED waiting for a critic_sounding_board APPROVED verdict that was already obtained, have the architect record it with the approve_retry_sounding_board tool. A task left at rework_required also survives this reset; when the Stage B verdict did not require a code change, the architect can exit it with the recover_rework_task tool (issue #2755). A task wedged at TASK_RETRY_USER_ESCALATION_REQUIRED is exited with the audited update_task_status force repair (issue #3389; see docs/troubleshooting/recovery-runbook.md), which reopens the task " + "and clears the retry circuit \u2014 the task's plan status must " + "already be in_progress; a task still pending in the plan takes one ordinary in_progress status update first."
   ].join(`
 `);
 }
@@ -116189,7 +116510,7 @@ async function deterministicSeed(input) {
 }
 
 // src/services/skill-optimizer/smoke.ts
-import { existsSync as existsSync77, lstatSync as lstatSync16, readFileSync as readFileSync71, realpathSync as realpathSync23 } from "fs";
+import { existsSync as existsSync77, lstatSync as lstatSync16, readFileSync as readFileSync71, realpathSync as realpathSync24 } from "fs";
 import * as path155 from "path";
 
 // src/hooks/spawn-helper.ts
@@ -116282,7 +116603,7 @@ var _internals143 = {
     const rel = path155.relative(path155.resolve(root), path155.resolve(target));
     return rel.startsWith("..") || path155.isAbsolute(rel);
   },
-  realpath: (p) => realpathSync23(p),
+  realpath: (p) => realpathSync24(p),
   evaluateSkillChange,
   isRejectedSkillContent,
   spawnAsync
@@ -116648,7 +116969,7 @@ async function runValidationWithTransientRetry(input, candidateContent, baseline
       if (!input.dispatcher) {
         throw new Error("no evaluation dispatcher available (cannot run validation)");
       }
-      const { createModelEvaluationExecutor: createModelEvaluationExecutor2 } = await import("./runner-qe3fkzx5.js");
+      const { createModelEvaluationExecutor: createModelEvaluationExecutor2 } = await import("./runner-7sd43gan.js");
       const executor = createModelEvaluationExecutor2(input.dispatcher, input.sessionId);
       const result = await withProtectedSetIntegrity([evalInputRoot, ...protectedRoots(input.directory)], () => _internals144.evaluateCandidateV1({
         projectRoot: input.directory,
@@ -119241,7 +119562,7 @@ function buildDetailedHelp(commandName, entry) {
 async function handleHelpCommand(ctx) {
   const targetCommand = ctx.args.join(" ");
   if (!targetCommand) {
-    const { buildHelpText } = await import("./index-4hnxtssf.js");
+    const { buildHelpText } = await import("./index-zvjrymp9.js");
     return buildHelpText();
   }
   const tokens = targetCommand.split(/\s+/);
@@ -119255,7 +119576,7 @@ async function handleHelpCommand(ctx) {
 > Note: \`/swarm ${resolved.key}\` is a deprecated alias for \`/swarm ${aliasTarget}\`.` : detailed;
   }
   const similar = _internals39.findSimilarCommands(targetCommand);
-  const { buildHelpText: fullHelp } = await import("./index-4hnxtssf.js");
+  const { buildHelpText: fullHelp } = await import("./index-zvjrymp9.js");
   if (similar.length > 0) {
     return `Command '/swarm ${targetCommand}' not found.
 
@@ -119583,7 +119904,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail explain": {
     handler: async (ctx) => {
-      const { handleGuardrailExplain } = await import("./guardrail-explain-0ap0a51w.js");
+      const { handleGuardrailExplain } = await import("./guardrail-explain-6xd6r3f5.js");
       return handleGuardrailExplain(ctx.directory, ctx.args);
     },
     description: "Dry-run: show what the guardrails would do to a command or write target (executes nothing)",
@@ -119593,7 +119914,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail reset": {
     handler: async (ctx) => {
-      const { handleGuardrailReset } = await import("./guardrail-reset-3fq8xdjf.js");
+      const { handleGuardrailReset } = await import("./guardrail-reset-ha3w0nby.js");
       return handleGuardrailReset(ctx.args, ctx.sessionID);
     },
     description: "Reset one exact active invocation/action circuit after repair",
@@ -119614,7 +119935,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail-log": {
     handler: async (ctx) => {
-      const { handleGuardrailLog } = await import("./guardrail-log-xw37f7ws.js");
+      const { handleGuardrailLog } = await import("./guardrail-log-qn1sqjs9.js");
       return handleGuardrailLog(ctx.directory, ctx.args);
     },
     description: "Read the guardrail decision log (use --blocks-only for blocks)",
@@ -120816,7 +121137,7 @@ function resolveRegistryEntry(key) {
 init_constants();
 init_warning_buffer();
 var ARCHITECT_MEMORY_OUTCOME_GUIDANCE = `After using recalled memory or a graph answer, call \`swarm_memory_outcome\` to record whether it was \`useful\`, a \`dead_end\`, or \`corrected\`, with the relevant file/symbol anchors. If you correct a memory-backed claim, record \`corrected\` and include the corrected explanation in \`correction\`.`;
-var ARCHITECT_PROMPT_BUDGET_CHARS = 163000;
+var ARCHITECT_PROMPT_BUDGET_CHARS = 164000;
 var ARCHITECT_TOOL_DESCRIPTION_PROMPT_CAP_CHARS = 240;
 function estimateModelTokens(text) {
   return Math.ceil(text.length / 4);
@@ -121787,8 +122108,8 @@ HARD CONSTRAINTS (apply regardless of skill load success):
 - RUN THE MECHANICAL GATES: after fixes, call \`run_pr_feedback_stage_a\` with distinct repository-valid array-form build, typecheck, lint, exact \`["git", "diff", "--check"]\`, and reproduction commands; the reproduction declares exact selected test/package/path \`targets\`. Arbitrary/no-op, mutating, publishing, fix/update, wrapper/eval, selector-free, or duplicate commands fail closed, and content plus HEAD/index/refs/upstream/Git-config state must remain unchanged around every command. Then dispatch exactly one fresh lane at a time, in order, with \`max_concurrent: 1\`: \`swarm-pr-feedback:stage-b-reviewer\`, \`:stage-b-test\`, \`:closeout-reviewer\`, and \`:closeout-critic\`. Every lane owns the complete immutable \`feedback_item_ids\` and uses the matching \`workflow_lane\`. Free-form verdicts, direct Task calls, parallel or out-of-order lanes, stale digests, missing or duplicate item rows, and speed/time rationalizations do not satisfy the gate.
 - RESTART AFTER EDITS: any content change after Stage A invalidates Stage A and all later verdicts. Restart the entire mechanical gate sequence; do not reuse a prior reviewer or critic conversation.
 - DO NOT PUBLISH EARLY: commits, pushes, PR comments/updates, review-thread mutations, and other remote writes remain blocked until every ordered feedback gate settles positively on the same revision digest.
-- After every local gate passes, EITHER path terminates: (a) content changes \u2014 create the reviewed commit with one standalone \`git commit\`, then call \`complete_pr_workflow\` once. It requires a clean index/worktree and a non-merge direct child whose sole parent is the immutable intake head before binding that post-commit HEAD and arming publication. Push only with \`git push <bound-remote> <bound-commit>:refs/heads/<bound-branch>\`; the literal bound commit and exact bound branch are required, and force flags, wrappers, aliases, fetch-based local-ref forgery, extra refspecs, \`git -C\`, and other remote writes fail closed. Perform read-only remote checks, then call \`complete_pr_workflow\` a second time with the same immutable verification \`pr_head_sha\`; the second call clears only after both the actual remote ref and its local tracking ref resolve to the exact bound commit. Only then perform any explicitly authorized PR comment/body/thread writes. (b) verified no-change \u2014 when EVERY ledger item is verified DISPROVED, PRE_EXISTING, NEEDS_MORE_EVIDENCE, or NEEDS_USER_DECISION in the settled verification lanes, call \`complete_pr_workflow\` with the intake head while HEAD equals it and the tree is clean; it returns \`verified-no-change\` and clears the gate terminally with no commit and no push (an empty commit is still forbidden).
-- BASE-SYNC REBIND: when base drift or merge conflicts force a merge/rebase, do NOT abort ad-hoc \u2014 finish the repair, fetch and check out the new authoritative PR head, then call \`rebind_pr_feedback_head\` with the new full SHA. It moves the immutable intake head, keeps the inventory, and invalidates Stage A plus every gate receipt; re-run the entire mechanical ladder on the new ancestry. It refuses a no-op rebind, an armed gate, and in-flight lanes.
+- After every local gate passes, EITHER path terminates: (a) content changes \u2014 stage exact changed-set paths with \`git add -- <paths>\`, commit with one standalone \`git commit\` (a trailer-bearing message goes via \`prepare_pr_feedback_commit_message\` + \`git commit -F <path>\`), then call \`complete_pr_workflow\` once. It requires a clean index/worktree and a non-merge direct child whose sole parent is the immutable intake head before binding that post-commit HEAD and arming publication. Push only with \`git push <bound-remote> <bound-commit>:refs/heads/<bound-branch>\`; the literal bound commit and exact bound branch are required, and force flags, wrappers, aliases, fetch-based local-ref forgery, extra refspecs, \`git -C\`, and other remote writes fail closed. Perform read-only remote checks, then call \`complete_pr_workflow\` a second time with the same immutable verification \`pr_head_sha\`; the second call clears only after both the actual remote ref and its local tracking ref resolve to the exact bound commit. Only then perform any explicitly authorized PR comment/body/thread writes. (b) verified no-change \u2014 when EVERY ledger item is verified DISPROVED, PRE_EXISTING, NEEDS_MORE_EVIDENCE, or NEEDS_USER_DECISION in the settled verification lanes, call \`complete_pr_workflow\` with the intake head while HEAD equals it and the tree is clean; it returns \`verified-no-change\` and clears the gate terminally with no commit and no push (an empty commit is still forbidden).
+- BASE-SYNC REBIND: when base drift or merge conflicts force a merge/rebase, do NOT abort ad-hoc \u2014 finish the repair, fetch the advanced remote head, then call \`rebind_pr_feedback_head\` with the new full SHA; it fast-forwards the branch when the bound tracking ref already points at that head over a clean ancestor checkout. It moves the immutable intake head, keeps the inventory, and invalidates Stage A plus every gate receipt; re-run the entire mechanical ladder on the new ancestry. It refuses a no-op rebind, an armed gate, a diverged ref, and in-flight lanes.
 - Patch only confirmed items plus the tests/docs they require; report closure status for every ledger item including disproved ones.
 - ABORT/CANCEL IF UNRECOVERABLE: before arming, if checkout/bind or recovery fails, call \`abort_pr_workflow\` with \`mode: "PR_FEEDBACK"\`, \`kind: "recovery"\`, and a one-line \`reason\`. Plain aborts refuse while armed. To cancel armed publication, call \`abort_pr_workflow\` with \`kind: "cancel-publication"\`, \`cancel_publication: true\`, and a non-empty \`reason\`; it records \`cancelled_without_publication\` with observed head; never grants push authority. Do not substitute a plain abort. To change content, call \`invalidate_pr_feedback_publication\` and rerun the ladder. A published generation is never cleared by abort; use \`complete_pr_workflow\` for remote verification. Do NOT abort/cancel while recovery remains.
 - Do NOT resolve or mark GitHub review threads resolved unless the user explicitly instructs it.