opencode-swarm 7.187.2 → 7.188.0

package/dist/cli/{index-tq6sbcys.js → index-aahk3yq1.js}

@@ -8,14 +8,14 @@ import {
   protectedRoots,
   redactDecisionLineForArchive,
   stableCanonicalStringify
-} from "./index-3g3n9fjq.js";
+} from "./index-1wzsp7ag.js";
 import {
   detectStraySwarmDirs,
   readDoctorArtifact,
   removeStraySwarmDir,
   resolvePlanParallelizationFlag,
   runConfigDoctor
-} from "./index-pqffq9mm.js";
+} from "./index-64s3825r.js";
 import {
   archiveEvidence,
   checkRequirementCoverage,
@@ -27,7 +27,7 @@ import {
   sanitizeTaskId,
   saveEvidence,
   validateProjectRoot
-} from "./index-f6pft90q.js";
+} from "./index-2bdebshy.js";
 import {
   JAVA_SYMBOL_GRAMMAR,
   LANGUAGE_REGISTRY,
@@ -48,7 +48,7 @@ import {
   runEvaluation,
   runExternalTool,
   withDisposableWorktree
-} from "./index-n55exns2.js";
+} from "./index-x73e0zkb.js";
 import {
   EvaluationTaskV1Schema,
   GateAuditManifestV1Schema,
@@ -65,7 +65,7 @@ import {
   saveGateAuditResult,
   savePromotionDecision,
   saveTaskSetSnapshot
-} from "./index-26zs9wsj.js";
+} from "./index-jd3hvnqn.js";
 import {
   canonicalHash,
   canonicalJson,
@@ -81,7 +81,7 @@ import {
   alreadyCuratedThisGeneration,
   claimNextScanBatch,
   resolveCohortId
-} from "./index-4g39nne8.js";
+} from "./index-af1qsczg.js";
 import {
   CURATOR_CONSOLIDATION_PROMPT,
   CURATOR_INIT_PROMPT,
@@ -100,13 +100,13 @@ import {
   getGroupCommitWriter,
   importLegacyJsonl,
   readPriorDriftReports
-} from "./index-tkm2rj27.js";
+} from "./index-jj222n0z.js";
 import {
   assertNoUnsettledCoderDispatch,
   listCoderSettlementWalStates,
   recoverCoderSettlement,
   recoverStaleCoderSettlements
-} from "./index-85cx1mmb.js";
+} from "./index-78ag9dsc.js";
 import {
   BUNDLED_PROJECT_SKILL_ROOT,
   DEFAULT_SKILL_MIN_CONFIDENCE,
@@ -127,11 +127,11 @@ import {
   retireSkill,
   selectCandidateEntries,
   syncBundledProjectSkillsIfMissingAsync
-} from "./index-3ckfawjf.js";
+} from "./index-0dvkbkhg.js";
 import {
   buildEscalationBriefing,
   readRecentEscalations
-} from "./index-rtdxyjrg.js";
+} from "./index-w4309fkk.js";
 import {
   parsePorcelainV2Snapshot,
   resolveCommitCountSince,
@@ -180,7 +180,7 @@ import {
   sweepStale,
   unsubscribe,
   updateSnapshot
-} from "./index-3y0nr248.js";
+} from "./index-41v699sv.js";
 import {
   WORKTREE_LIFECYCLE_LOCK_FILE,
   recordWorktreeProvisioningOwner,
@@ -195,6 +195,7 @@ import {
   yieldToEventLoop
 } from "./index-q7sjgr1y.js";
 import {
+  GIT_STATUS_ARGS,
   ROLLBACK_GIT_KIND,
   ROLLBACK_PHASE_KIND,
   backupSwarmStateBeforeReset,
@@ -204,11 +205,13 @@ import {
   executeDestructivePurge,
   issueConfirmToken,
   measureGitDestruction,
+  parseTrackedDirtyPaths,
   previewDestructivePurge,
+  recheckBeforeDestructive,
   resolveWorkingDirectory,
   swarmOverwriteCandidates,
   trackedDirtyCandidates
-} from "./index-dqberkr3.js";
+} from "./index-dfyjz036.js";
 import {
   MAX_TRANSIENT_RETRIES,
   PlanRecoverySupersededError,
@@ -235,7 +238,7 @@ import {
   transientBackoff,
   updateTaskStatus,
   withPlanLifecycleLock
-} from "./index-z04d01pv.js";
+} from "./index-8b0gmpm6.js";
 import {
   containsControlChars,
   containsPathTraversal,
@@ -251,7 +254,7 @@ import {
   resolveSpeckitProjection,
   validateSpeckit,
   writeProjectedSpecSync
-} from "./index-efbhea00.js";
+} from "./index-xgr0rjhh.js";
 import {
   clearWorktreeMergeStatus,
   getAllWorktreeMergeFailures,
@@ -282,7 +285,7 @@ import {
   transitionTaskWorkflowEvidenceWithStatus,
   withTaskEvidenceTransaction,
   writeWorkflowWalFile
-} from "./index-b308erem.js";
+} from "./index-00mqbc83.js";
 import {
   isPathUnderSwarmWorktreeBase,
   listLiveLaneOwners,
@@ -291,7 +294,7 @@ import {
   recordLiveLaneOwner,
   removeWorktree,
   resolveWorktreeBaseDir
-} from "./index-jh9nrshe.js";
+} from "./index-ggdwbsc3.js";
 import {
   DEFAULT_STALE_DELEGATION_TIMEOUT_MS,
   DELEGATION_COMPACTION_HIGH_WATER_BYTES,
@@ -325,7 +328,7 @@ import {
   scanBackgroundCoderReservationsForAdmission,
   scanDelegationsForRecovery,
   sweepStaleDelegations
-} from "./index-exj7czz9.js";
+} from "./index-8xzsncfk.js";
 import {
   MAX_EVENT_LOG_ENTRIES,
   _internals,
@@ -337,7 +340,7 @@ import {
   recordHiveKnowledgeEvent,
   recordKnowledgeEvent,
   resolveKnowledgeEventsPath
-} from "./index-kc635w60.js";
+} from "./index-6qef1jtq.js";
 import {
   commitDisplayedMembership,
   commitEmptyRetrieval,
@@ -350,7 +353,7 @@ import {
   queryLiveMemberships,
   reconcilePhaseClose,
   recordPhaseCloseIntent
-} from "./index-j5db3v56.js";
+} from "./index-8tqt8fbf.js";
 import {
   sanitizeContextText
 } from "./index-m9zzj4ee.js";
@@ -381,18 +384,18 @@ import {
   validateActionableFields,
   validateLesson,
   validateSkillPath
-} from "./index-xv0t2sed.js";
+} from "./index-txecan4h.js";
 import {
   MAX_CURATION_PROPOSALS,
   authorizeCuration,
   buildConfigFingerprintInput
-} from "./index-n8kqhxay.js";
+} from "./index-rwabrcsg.js";
 import {
   cohortConfigFingerprint
 } from "./index-rtry5xyf.js";
 import {
   resolveWorktreeIsolationConfig
-} from "./index-tngc1erw.js";
+} from "./index-bd4agttq.js";
 import {
   RetrospectiveEvidenceSchema
 } from "./index-kbkk7vnh.js";
@@ -404,7 +407,7 @@ import {
   clearScopeBindings,
   readAuthoritativeScopeBindingSet,
   readDeclaredScopeFilesFromBindings
-} from "./index-310h5192.js";
+} from "./index-k333nq26.js";
 import {
   clearPlanLedgerForReset,
   computePlanStructureHash,
@@ -420,7 +423,7 @@ import {
   replayFromLedgerWithStatus,
   resolvePlanningProfile,
   takeSnapshotEvent
-} from "./index-7fxy1s86.js";
+} from "./index-zwbheerv.js";
 import {
   CORE_EVENT_LOCKED,
   appendCoreEventSync,
@@ -430,7 +433,7 @@ import {
   hasSpecDriftAuditEvent,
   hasTaskRepairAuditEvent,
   readCoreEvents
-} from "./index-e9ry78z5.js";
+} from "./index-b9pz70d0.js";
 import {
   DEFAULT_QA_GATES,
   computeProfileHash,
@@ -478,7 +481,7 @@ import {
   observeModelLimitResolution,
   observeStoreHealth,
   readLearningHealth
-} from "./index-v9y0230d.js";
+} from "./index-mb1reyw3.js";
 import {
   appendKnowledge,
   appendRejectedLesson,
@@ -509,7 +512,7 @@ import {
   transactFile,
   transactKnowledge,
   wordBigrams
-} from "./index-y81jjedn.js";
+} from "./index-4ws5agzc.js";
 import {
   readTailJsonl,
   readTailJsonlDetailed,
@@ -530,13 +533,13 @@ import {
   resolveLinkDir,
   sanitizeLinkId,
   writeLinkPointer
-} from "./index-n45kz69m.js";
+} from "./index-zwgh0gty.js";
 import {
   atomicWriteFile
-} from "./index-6t7ygevg.js";
+} from "./index-7sbyvk99.js";
 import {
   withEvidenceLock
-} from "./index-jyxgkp4a.js";
+} from "./index-0v2svrev.js";
 import {
   assertProjectRoot
 } from "./index-t7hmqgjy.js";
@@ -550,7 +553,7 @@ import {
   pseudonymousRef,
   resolveLineageSalt,
   telemetry
-} from "./index-dx6bhbd6.js";
+} from "./index-4htcpbs4.js";
 import {
   SESSION_KEY_SEPARATOR,
   canonicalRootKey,
@@ -590,7 +593,7 @@ import {
   loadGateOverrides,
   loadPluginConfig,
   loadPluginConfigWithMeta
-} from "./index-w0bvez8c.js";
+} from "./index-nf22t88g.js";
 import {
   addDeferredWarning,
   advisoryWarn,
@@ -622,7 +625,7 @@ import {
   resolveContextWindow,
   resolveGeneratedAgentRole,
   stripKnownSwarmPrefix
-} from "./index-b5tthmy2.js";
+} from "./index-7vrnbtsk.js";
 import {
   AGENT_TOOL_MAP,
   ALL_AGENT_NAMES,
@@ -3411,7 +3414,7 @@ async function importLegacyPrWorkflowGateStateIfNeeded(directory, sessionID, all
       return null;
     throw error2;
   }
-  const legacy = allowSalvagedImport ? (await (await import("./pr-workflow-gate-qtq1wq95.js")).readPrWorkflowGateStateForRecovery(directory, sessionID))?.state ?? null : await readPrWorkflowGateStateFileFromDisk(filePath, sessionID);
+  const legacy = allowSalvagedImport ? (await (await import("./pr-workflow-gate-dhzvaqj8.js")).readPrWorkflowGateStateForRecovery(directory, sessionID))?.state ?? null : await readPrWorkflowGateStateFileFromDisk(filePath, sessionID);
   if (!legacy)
     return null;
   const namespace = workflowGateStateCoordinationNamespace(sessionID);
@@ -3498,7 +3501,7 @@ async function deleteStateWhileLocked(directory, sessionID, options = {}) {
   let recoveryState = null;
   if (!currentAuthoritative) {
     if (options.allowSalvagedRead) {
-      const { readPrWorkflowGateStateForRecovery } = await import("./pr-workflow-gate-qtq1wq95.js");
+      const { readPrWorkflowGateStateForRecovery } = await import("./pr-workflow-gate-dhzvaqj8.js");
       recoveryState = (await readPrWorkflowGateStateForRecovery(directory, normalizedSessionID))?.state ?? null;
     }
     if (!recoveryState) {
@@ -15071,7 +15074,7 @@ function isLaneOwnedByCurrentSession(branchName, expectedSessionId) {
   return extracted === expectedSessionId;
 }
 async function inspectStandardWorktreeCollisionOwnership(identity) {
-  const collisionOwnership = await import("./worktree-collision-ownership-455bdcnk.js");
+  const collisionOwnership = await import("./worktree-collision-ownership-d890zzka.js");
   return collisionOwnership.inspectStandardWorktreeCollisionOwnership(identity);
 }
 async function runRecoveryGit(directory, args, timeoutMs = 15000) {
@@ -15497,7 +15500,7 @@ async function precreateStandardWorktreeSession(args) {
   const laneProfile = computeLaneRuntimeProfile(worktreeConfig.runtime_isolation, laneIndex, handle.worktreePath);
   if (laneProfile) {
     try {
-      const { writeLaneProfileToDiskReal } = await import("./core-2bywxc4w.js");
+      const { writeLaneProfileToDiskReal } = await import("./core-r7ypbkzn.js");
       await writeLaneProfileToDiskReal(handle.worktreePath, laneProfile.laneIndex, laneProfile.envOverrides);
     } catch {}
   }
@@ -16476,7 +16479,7 @@ async function finishStandardWorktreeDispatch(directory, dispatch, config, callI
       }
       clearWorktreeMergeStatus(statusKey);
       try {
-        const { removeLaneProfileFromDiskReal } = await import("./core-2bywxc4w.js");
+        const { removeLaneProfileFromDiskReal } = await import("./core-r7ypbkzn.js");
         await removeLaneProfileFromDiskReal(dispatch.handle.worktreePath, dispatch.laneIndex);
       } catch {}
       const state = serializationStateBySessionID.get(dispatch.parentSessionID);
@@ -22236,12 +22239,18 @@ function resetScopedModelSelection(scope, expectedGeneration) {
   }
   return scopedModelOverrides.delete(key);
 }
-function clearScopedModelSelectionsForSession(sessionID) {
+function clearScopedModelSelectionsForSession(sessionID, opts) {
   const normalizedSessionID = normalizeText(sessionID);
+  const primaryScopes = opts?.primaryScopes ?? true;
   for (const [key, entry] of scopedModelOverrides) {
-    if (key.startsWith(`${normalizedSessionID}\u241F`)) {
-      scopedModelOverrides.delete(entry.key);
+    if (!key.startsWith(`${normalizedSessionID}\u241F`))
+      continue;
+    if (!primaryScopes) {
+      const invocationID = key.split("\u241F")[1] ?? "";
+      if (invocationID === "")
+        continue;
     }
+    scopedModelOverrides.delete(entry.key);
   }
 }
 function getScopedModelSelectionSnapshot() {
@@ -22266,12 +22275,13 @@ function resetScopedModelSelectionStateForTests() {
 
 // src/models/task-model-routing.ts
 var PENDING_TASK_MODEL_ROUTE_TTL_MS = 30 * 60000;
+var sessionChatAgentBySession = new Map;
 var routesByParentCall = new Map;
 var routeKeyByChildSession = new Map;
 function normalizeText2(value) {
   return value?.trim() ?? "";
 }
-function clearPendingTaskModelRoutesForSession(sessionID) {
+function clearPendingTaskModelRoutesForSession(sessionID, mode = "session") {
   const normalizedSessionID = normalizeText2(sessionID);
   for (const [key, route] of routesByParentCall) {
     if (route.parentSessionID === normalizedSessionID || route.childSessionID === normalizedSessionID) {
@@ -22281,7 +22291,12 @@ function clearPendingTaskModelRoutesForSession(sessionID) {
       }
     }
   }
-  clearScopedModelSelectionsForSession(normalizedSessionID);
+  clearScopedModelSelectionsForSession(normalizedSessionID, {
+    primaryScopes: mode === "session"
+  });
+  if (mode === "session") {
+    sessionChatAgentBySession.delete(normalizedSessionID);
+  }
 }
 function getPendingTaskModelRouteSnapshot() {
   return [...routesByParentCall.values()].map((route) => ({ ...route }));
@@ -22295,6 +22310,7 @@ function getTaskModelRoutingStateSnapshot() {
 function clearAllTaskModelRoutingState() {
   routesByParentCall.clear();
   routeKeyByChildSession.clear();
+  sessionChatAgentBySession.clear();
   resetScopedModelSelectionStateForTests();
 }
 
@@ -23494,7 +23510,7 @@ function beginInvocation(sessionId, agentName) {
   const lastId = session.lastInvocationIdByAgent[stripped] || 0;
   if (lastId > 0) {
     clearInvocationActionCircuits(sessionId, lastId);
-    clearPendingTaskModelRoutesForSession(sessionId);
+    clearPendingTaskModelRoutesForSession(sessionId, "invocation");
   }
   const newId = lastId + 1;
   session.lastInvocationIdByAgent[stripped] = newId;
@@ -24030,7 +24046,7 @@ function clearCriticalShownIds(sessionID) {
 async function rehydratePrSubscriptions(sessionID, directory) {
   const map = new Map;
   try {
-    const { listActive: listActive2 } = await import("./pr-subscriptions-g4f9rehb.js");
+    const { listActive: listActive2 } = await import("./pr-subscriptions-1frpr34c.js");
     const records = await listActive2(directory);
     for (const record of records) {
       if (record.sessionID !== sessionID)
@@ -36641,6 +36657,9 @@ async function handleClarifyCommand(_directory2, args) {
   return "[MODE: CLARIFY-SPEC] Please enter MODE: CLARIFY-SPEC and clarify the existing spec.";
 }
 
+// src/commands/close/align-stage.ts
+init_logger();
+
 // src/commands/close/internals.ts
 import * as fsSync2 from "fs";
 import { promises as fs23 } from "fs";
@@ -37058,6 +37077,36 @@ var _internals38 = {
 };
 
 // src/commands/close/align-stage.ts
+function renderRecheckRefusal(reason, newDirtyPaths) {
+  const listed = newDirtyPaths.slice(0, 10);
+  const overflow = newDirtyPaths.length - listed.length;
+  const swarmHint = newDirtyPaths.some((p) => p.startsWith(".swarm/")) ? "One or more changed paths are under .swarm/ \u2014 this project tracks swarm runtime state in git. Consider `git rm -r --cached .swarm/` and re-adding `.swarm/` to .git/info/exclude; close never confirms runtime state as destructive scope." : undefined;
+  return [
+    `\uD83D\uDED1 Git alignment aborted (fail-closed): ${reason} \u2014 this destructive scope was never confirmed${listed[0] ? ` (first: ${listed[0]})` : ""}.`,
+    ...listed.map((p) => `  - ${p}`),
+    ...overflow > 0 ? [`  \u2026 and ${overflow} more`] : [],
+    ...swarmHint ? [swarmHint] : [],
+    "Nothing was reset or checked out; the session is finalized (finalize/archive/clean completed). Complete git alignment manually if still wanted."
+  ].join(`
+`);
+}
+async function guardResetWithRecheck(real, cwd, options) {
+  const recheck = recheckBeforeDestructive(cwd, options?.expectedDirtyPaths ?? []);
+  if (recheck.ok) {
+    return real(cwd, { pruneBranches: options?.pruneBranches });
+  }
+  log(`[close-align] re-check refused destructive reset: ${recheck.reason} (${recheck.newDirtyPaths.length} newly-dirty path(s))`);
+  return {
+    success: false,
+    targetBranch: "",
+    previousBranch: "",
+    message: renderRecheckRefusal(recheck.reason, recheck.newDirtyPaths),
+    branchDeleted: false,
+    changesDiscarded: false,
+    warnings: [],
+    recheckRefused: true
+  };
+}
 async function runAlignStage(ctx) {
   const pruneBranches = ctx.args.includes("--prune-branches");
   let gitAlignResult = "";
@@ -37065,8 +37114,14 @@ async function runAlignStage(ctx) {
   const gitStatus = _internals38.getGitRepositoryStatus(ctx.directory);
   if (gitStatus.isRepo) {
     const aggressiveResult = await _internals38.resetToMainAfterMerge(ctx.directory, {
-      pruneBranches
+      pruneBranches,
+      expectedDirtyPaths: ctx.purgeGateDirtyPaths ?? []
     });
+    if (aggressiveResult.recheckRefused) {
+      gitAlignResult = aggressiveResult.message;
+      ctx.warnings.push(aggressiveResult.message);
+      return { gitAlignResult, prunedBranches };
+    }
     if (aggressiveResult.success) {
       gitAlignResult = aggressiveResult.message;
       for (const w of aggressiveResult.warnings) {
@@ -40538,9 +40593,9 @@ function hashContent(content) {
   return createHash27("sha1").update(content).digest("hex");
 }
 async function loadConfigForPolicyCurator(directory) {
-  const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-yxq3bjmd.js");
+  const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-4fxm5b9r.js");
   try {
-    const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-33345434.js");
+    const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-6zpfvs4t.js");
     const { config: loadedConfig } = loadPluginConfigWithMeta2(directory);
     return KnowledgeConfigSchema2.parse(loadedConfig.knowledge ?? {});
   } catch {
@@ -43598,7 +43653,7 @@ async function resolveCuratorLLMDelegate(directory, mode, sessionId) {
   const seam = _internals38.createCuratorLLMDelegate;
   if (seam)
     return seam(directory, mode, sessionId);
-  const { createCuratorLLMDelegate } = await import("./curator-llm-factory-4g2nvr76.js");
+  const { createCuratorLLMDelegate } = await import("./curator-llm-factory-gnx5wyx0.js");
   return createCuratorLLMDelegate(directory, mode, sessionId);
 }
 async function reconcileCloseTerminalStateForPlan(directory, targetPlan, options) {
@@ -43993,7 +44048,7 @@ async function runFinalizeStage(ctx) {
     }
   }
   try {
-    const { CuratorConfigSchema: CCS } = await import("./schema-yxq3bjmd.js");
+    const { CuratorConfigSchema: CCS } = await import("./schema-4fxm5b9r.js");
     const { config: pmLoadedConfig } = _internals38.loadPluginConfigWithMeta(ctx.directory);
     const curatorCfg = CCS.parse(pmLoadedConfig.curator ?? {});
     if (curatorCfg.enabled && curatorCfg.postmortem_enabled) {
@@ -46179,7 +46234,7 @@ function serializeAgentSession(s) {
 }
 async function writeSnapshot(directory, state) {
   try {
-    const { ensureSnapshotCoordinationReady } = await import("./snapshot-coordination-init-8gbxw9sa.js");
+    const { ensureSnapshotCoordinationReady } = await import("./snapshot-coordination-init-pqsgthaa.js");
     await ensureSnapshotCoordinationReady(directory);
     const snapshot = {
       version: 3,
@@ -46688,6 +46743,16 @@ function isReadinessEntryClosing(entry) {
 }
 var entries = new Map;
 var nextAttemptId = 1;
+var supersessionStats = { count: 0 };
+function recordSupersession(trigger) {
+  supersessionStats.count += 1;
+  try {
+    telemetry.planRecoverySuperseded({
+      count: supersessionStats.count,
+      trigger
+    });
+  } catch {}
+}
 function isRetryableArchiveError(error2) {
   const code = error2?.code;
   return code === "EBUSY" || code === "EPERM" || code === "EACCES";
@@ -46846,6 +46911,7 @@ function startSnapshotCoordinationInitialization(directory) {
     if (outcome === "superseded") {
       entry.state = "superseded";
       entry.error = "coordination initialization superseded by a newer hydration generation";
+      recordSupersession("coordination_fence");
       return;
     }
     entry.state = "succeeded";
@@ -46854,6 +46920,7 @@ function startSnapshotCoordinationInitialization(directory) {
       if (entry.state !== "closing" && entries.get(root) === entry) {
         entry.state = "superseded";
         entry.error = error2.message;
+        recordSupersession("plan_recovery");
       }
     } else {
       entry.state = "failed";
@@ -46866,7 +46933,7 @@ function startSnapshotCoordinationInitialization(directory) {
   entry.underlying = underlying;
   entries.set(root, entry);
   withTimeout(underlying, _snapshotCoordinationInternals.timeoutMs, new Error("coordination initialization timed out")).catch((error2) => {
-    if (!entry.settled && entries.get(root) === entry) {
+    if (!entry.settled && entry.state !== "closing" && entries.get(root) === entry) {
       entry.state = "timed_out";
       entry.error = error2 instanceof Error ? error2.message : String(error2);
       advisoryWarn("[opencode-swarm] SQLite coordination initialization is still running; authority operations remain fail-closed.");
@@ -47008,6 +47075,7 @@ function runCloseGateGit(args, cwd) {
     cwd,
     encoding: "utf8",
     timeout: 1e4,
+    maxBuffer: 1024 * 1024,
     windowsHide: true,
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -47026,28 +47094,8 @@ function isRealGitRepository(directory) {
   return fsSync7.existsSync(path59.join(directory, ".git", "HEAD"));
 }
 function evaluateClosePurgeGate(directory, swarmDir) {
-  const statusOutput = _closeGateInternals.runGit(["status", "--porcelain"], directory);
-  const dirtyPaths = [];
-  if (statusOutput !== null) {
-    for (const line of statusOutput.split(`
-`)) {
-      if (!line)
-        continue;
-      if (line.startsWith("??"))
-        continue;
-      const filePath = line.slice(3).trim().replace(/^"|"$/g, "");
-      if (!filePath)
-        continue;
-      if (line.startsWith("R") && filePath.includes(" -> ")) {
-        for (const side of filePath.split(" -> ")) {
-          if (side)
-            dirtyPaths.push(side);
-        }
-      } else {
-        dirtyPaths.push(filePath);
-      }
-    }
-  }
+  const statusOutput = _closeGateInternals.runGit([...GIT_STATUS_ARGS], directory);
+  const dirtyPaths = statusOutput === null ? [] : parseTrackedDirtyPaths(statusOutput);
   const candidates = dirtyPaths.map((p) => ({
     path: path59.join(directory, p),
     reason: "uncommitted tracked change \u2014 discarded by git alignment"
@@ -47246,7 +47294,8 @@ This project was already finalized in a previous /swarm close run. The plan has
       timestamp: "",
       archiveDir: "",
       archiveSuffix: "",
-      args
+      args,
+      purgeGateDirtyPaths: purgeGate.dirtyPaths
     };
     ctx.fullAuto = options.sessionID ? _internals38.detectFullAuto(directory, options.sessionID) : false;
     await runFinalizeStage(ctx);
@@ -49195,7 +49244,7 @@ function planMerges(active, threshold, maxComparisons, maxMerges) {
   };
 }
 async function sweepActiveNearDuplicates(directory, options = {}) {
-  const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-33345434.js");
+  const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-6zpfvs4t.js");
   const { config } = loadPluginConfigWithMeta2(directory);
   const sweepConfig = config.learning?.dedup_sweep;
   if (sweepConfig?.enabled === false)
@@ -50319,7 +50368,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-pyf95aqw.js");
+        const skillModule = await import("./skill-generator-qk0gpwhq.js");
         for (const cand of skillCandidates) {
           if (cand.confidence < (config.min_skill_confidence ?? DEFAULT_SKILL_MIN_CONFIDENCE)) {
             continue;
@@ -50791,7 +50840,7 @@ async function applyCuratorKnowledgeUpdates(directory, recommendations, knowledg
     } catch {}
   }
   if (contradictedEntries.length > 0 && knowledgeConfig.contradiction_threshold_action === "quarantine") {
-    const { maybeQuarantineOnContradiction } = await import("./knowledge-escalator-fnqctvxz.js");
+    const { maybeQuarantineOnContradiction } = await import("./knowledge-escalator-w043k3ah.js");
     for (const { id } of contradictedEntries) {
       try {
         await maybeQuarantineOnContradiction(directory, id, knowledgeConfig.contradiction_quarantine_threshold, knowledgeConfig.contradiction_quarantine_window_days);
@@ -51623,7 +51672,7 @@ async function runCuratorPostMortem(directory, options = {}) {
       warnings.push("Failed to collect knowledge summary.");
     }
     try {
-      const { getScanStatus } = await import("./scan-cursor-8taj944f.js");
+      const { getScanStatus } = await import("./scan-cursor-nm6h3gdd.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.`);
@@ -51795,9 +51844,9 @@ var _internals56 = {
   verifyPostMortemKnowledgeActions,
   repairPostMortemActions,
   loadDefaultKnowledgeConfig: async (directory) => {
-    const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-yxq3bjmd.js");
+    const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-4fxm5b9r.js");
     try {
-      const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-33345434.js");
+      const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-6zpfvs4t.js");
       const loaded = loadPluginConfigWithMeta2(directory);
       return KnowledgeConfigSchema2.parse(loaded.config.knowledge ?? {});
     } catch {
@@ -51805,11 +51854,11 @@ var _internals56 = {
     }
   },
   applyCuratorKnowledgeUpdates: async (directory, recommendations, knowledgeConfig, generation) => {
-    const { applyCuratorKnowledgeUpdates: applyCuratorKnowledgeUpdates2 } = await import("./curator-dvhf6jex.js");
+    const { applyCuratorKnowledgeUpdates: applyCuratorKnowledgeUpdates2 } = await import("./curator-m1f5tpmq.js");
     return applyCuratorKnowledgeUpdates2(directory, recommendations, knowledgeConfig, generation);
   },
   checkHivePromotions: async (entries2, knowledgeConfig, directory) => {
-    const { checkHivePromotions } = await import("./hive-promoter-bp3rz0q6.js");
+    const { checkHivePromotions } = await import("./hive-promoter-knbj0apv.js");
     return checkHivePromotions(entries2, knowledgeConfig, directory);
   },
   applyProposalTriage: async (directory, triage) => {
@@ -51818,7 +51867,7 @@ var _internals56 = {
       activateProposal,
       listSkills: listSkills2,
       sanitizeSlug
-    } = await import("./skill-generator-pyf95aqw.js");
+    } = await import("./skill-generator-qk0gpwhq.js");
     const result = {
       approved: [],
       rejected: [],
@@ -51860,7 +51909,7 @@ var _internals56 = {
     return result;
   },
   readPriorDriftReports: async (directory) => {
-    const { readPriorDriftReports: readPriorDriftReports2 } = await import("./curator-drift-xx8pp4g9.js");
+    const { readPriorDriftReports: readPriorDriftReports2 } = await import("./curator-drift-4e9p7afg.js");
     return readPriorDriftReports2(directory);
   },
   readSwarmKnowledge: (directory) => readKnowledge(resolveSwarmKnowledgePath(directory))
@@ -60293,7 +60342,7 @@ function wireCloseInternals() {
     sleep,
     collectGarbageBestEffort,
     getGitRepositoryStatus,
-    resetToMainAfterMerge,
+    resetToMainAfterMerge: (cwd, options) => guardResetWithRecheck(resetToMainAfterMerge, cwd, options),
     resetToRemoteBranch,
     loadPluginConfigWithMeta,
     curateAndStoreSwarm,
@@ -60304,7 +60353,7 @@ function wireCloseInternals() {
     archiveEvidence,
     endAgentSession,
     flushAndDrainTelemetry: async () => {
-      const { flushAndDrainTelemetry } = await import("./telemetry-xwj899pd.js");
+      const { flushAndDrainTelemetry } = await import("./telemetry-d0j31j5d.js");
       return flushAndDrainTelemetry();
     },
     finalizeContextTelemetry,
@@ -61663,9 +61712,9 @@ var _internals66 = {
   loadPluginConfigWithMeta,
   loadCuratorDeps: async () => {
     const [{ CuratorConfigSchema }, curator, { createCuratorLLMDelegate }] = await Promise.all([
-      import("./schema-yxq3bjmd.js"),
-      import("./curator-dvhf6jex.js"),
-      import("./curator-llm-factory-4g2nvr76.js")
+      import("./schema-4fxm5b9r.js"),
+      import("./curator-m1f5tpmq.js"),
+      import("./curator-llm-factory-gnx5wyx0.js")
     ]);
     return { CuratorConfigSchema, curator, createCuratorLLMDelegate };
   }
@@ -64063,7 +64112,7 @@ async function computeCurationDiagnostics(directory, entries2) {
   let scanCompleted = false;
   let scanRemaining = 0;
   try {
-    const { getScanStatus } = await import("./scan-cursor-8taj944f.js");
+    const { getScanStatus } = await import("./scan-cursor-nm6h3gdd.js");
     const status = await getScanStatus(directory);
     scanGeneration = status.generation;
     scanCompleted = status.completed;
@@ -64071,19 +64120,19 @@ async function computeCurationDiagnostics(directory, entries2) {
   } catch {}
   let configMatch = null;
   try {
-    const { isLinked: isLinked2 } = await import("./knowledge-link-93nzznwd.js");
+    const { isLinked: isLinked2 } = await import("./knowledge-link-9gx2djyd.js");
     if (isLinked2(directory)) {
-      const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-yxq3bjmd.js");
+      const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-4fxm5b9r.js");
       let config;
       try {
-        const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-33345434.js");
+        const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-6zpfvs4t.js");
         const loaded = loadPluginConfigWithMeta2(directory);
         config = KnowledgeConfigSchema2.parse(loaded.config.knowledge ?? {});
       } catch {
         config = KnowledgeConfigSchema2.parse({});
       }
       const { cohortConfigFingerprint: cohortConfigFingerprint2 } = await import("./config-fingerprint-v22xh5a2.js");
-      const { buildConfigFingerprintInput: buildConfigFingerprintInput2, readCohortConfigFingerprint } = await import("./curation-policy-sr29thf5.js");
+      const { buildConfigFingerprintInput: buildConfigFingerprintInput2, readCohortConfigFingerprint } = await import("./curation-policy-v64ctcbd.js");
       const currentFp = cohortConfigFingerprint2(buildConfigFingerprintInput2(config));
       const cohortFp = await readCohortConfigFingerprint(directory);
       configMatch = cohortFp === null ? null : currentFp === cohortFp;
@@ -65532,7 +65581,7 @@ async function handleDoctorCommand(directory, args) {
   const result = runConfigDoctor(config, directory, planParallelizationEnabled);
   let output;
   if (enableAutoFix && result.hasAutoFixableIssues) {
-    const { runConfigDoctorWithFixes } = await import("./config-doctor-312afzhr.js");
+    const { runConfigDoctorWithFixes } = await import("./config-doctor-pfwj6c8d.js");
     const fixResult = await runConfigDoctorWithFixes(directory, config, true, {
       applyLossy: true
     });
@@ -65570,7 +65619,7 @@ async function handleDoctorCommand(directory, args) {
 `;
   }
   try {
-    const { runModelPreflight } = await import("./model-preflight-2kje0sp0.js");
+    const { runModelPreflight } = await import("./model-preflight-pt6n1re7.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") : [];
@@ -65604,7 +65653,7 @@ async function handleDoctorCommand(directory, args) {
     }
   } catch {}
   try {
-    const { renderKnowledgeReceiptPhaseIdSection } = await import("./doctor-knowledge-receipt-phase-id-m239pgbz.js");
+    const { renderKnowledgeReceiptPhaseIdSection } = await import("./doctor-knowledge-receipt-phase-id-mdvra07t.js");
     output += await renderKnowledgeReceiptPhaseIdSection(directory, enableAutoFix);
   } catch {}
   const strayDirs = detectStraySwarmDirs(directory);
@@ -66501,7 +66550,7 @@ async function handleEvidenceCommand(directory, args) {
   return formatTaskEvidenceMarkdown(evidenceData);
 }
 async function handleEvidenceSummaryCommand(directory) {
-  const { buildEvidenceSummary } = await import("./evidence-summary-service-9et04fjh.js");
+  const { buildEvidenceSummary } = await import("./evidence-summary-service-64nqgkaw.js");
   const artifact = await buildEvidenceSummary(directory);
   if (!artifact) {
     return "No plan found. Run `/swarm plan` to check plan status.";
@@ -90952,7 +91001,7 @@ function createCuratorLLMDelegate(directory, mode = "init", sessionId) {
     }
     const sdkOpts = signal ? { signal } : {};
     try {
-      const { getSwarmAgents: getSwarmAgents2, resolveFallbackModel: resolveFallbackModel2 } = await import("./index-9jafghwk.js");
+      const { getSwarmAgents: getSwarmAgents2, resolveFallbackModel: resolveFallbackModel2 } = await import("./index-j5ecgr3f.js");
       const createResult = await client.session.create({
         ...sessionId ? {
           body: {
@@ -93289,7 +93338,7 @@ async function cancelPrFeedbackLoopUnlocked(directory, sessionID, reason) {
     clearedEvents: []
   };
   try {
-    const { cancelPrFeedbackPublication: cancelPrFeedbackPublication2 } = await import("./pr-workflow-gate-qtq1wq95.js");
+    const { cancelPrFeedbackPublication: cancelPrFeedbackPublication2 } = await import("./pr-workflow-gate-dhzvaqj8.js");
     await cancelPrFeedbackPublication2(directory, sessionID, reason);
   } catch (err) {
     warn(`[pr-feedback-loop] cancelPrFeedbackPublication failed (fail-open): ${err instanceof Error ? err.message : String(err)}`);
@@ -107030,7 +107079,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-verr6er5.js");
+      const { createModelEvaluationExecutor: createModelEvaluationExecutor2 } = await import("./runner-x8sbydkw.js");
       const executor = createModelEvaluationExecutor2(input.dispatcher, input.sessionId);
       const result = await withProtectedSetIntegrity([evalInputRoot, ...protectedRoots(input.directory)], () => _internals128.evaluateCandidateV1({
         projectRoot: input.directory,
@@ -109659,7 +109708,7 @@ function buildDetailedHelp(commandName, entry) {
 async function handleHelpCommand(ctx) {
   const targetCommand = ctx.args.join(" ");
   if (!targetCommand) {
-    const { buildHelpText } = await import("./index-tmp07h7b.js");
+    const { buildHelpText } = await import("./index-qe3e6z5c.js");
     return buildHelpText();
   }
   const tokens = targetCommand.split(/\s+/);
@@ -109673,7 +109722,7 @@ async function handleHelpCommand(ctx) {
 > Note: \`/swarm ${resolved.key}\` is a deprecated alias for \`/swarm ${aliasTarget}\`.` : detailed;
   }
   const similar = _internals27.findSimilarCommands(targetCommand);
-  const { buildHelpText: fullHelp } = await import("./index-tmp07h7b.js");
+  const { buildHelpText: fullHelp } = await import("./index-qe3e6z5c.js");
   if (similar.length > 0) {
     return `Command '/swarm ${targetCommand}' not found.
 
@@ -110001,7 +110050,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail explain": {
     handler: async (ctx) => {
-      const { handleGuardrailExplain } = await import("./guardrail-explain-8n4fx9zv.js");
+      const { handleGuardrailExplain } = await import("./guardrail-explain-e6z5x5jt.js");
       return handleGuardrailExplain(ctx.directory, ctx.args);
     },
     description: "Dry-run: show what the guardrails would do to a command or write target (executes nothing)",
@@ -110011,7 +110060,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail reset": {
     handler: async (ctx) => {
-      const { handleGuardrailReset } = await import("./guardrail-reset-k3mrq25e.js");
+      const { handleGuardrailReset } = await import("./guardrail-reset-zr13a010.js");
       return handleGuardrailReset(ctx.args, ctx.sessionID);
     },
     description: "Reset one exact active invocation/action circuit after repair",
@@ -110032,7 +110081,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail-log": {
     handler: async (ctx) => {
-      const { handleGuardrailLog } = await import("./guardrail-log-9gmfvnd7.js");
+      const { handleGuardrailLog } = await import("./guardrail-log-x53wpnp0.js");
       return handleGuardrailLog(ctx.directory, ctx.args);
     },
     description: "Read the guardrail decision log (use --blocks-only for blocks)",
@@ -110442,7 +110491,7 @@ var COMMAND_REGISTRY = {
       sessionID: ctx.sessionID
     }),
     description: "Use /swarm finalize to finalize the swarm project and archive evidence",
-    details: "Idempotent 4-stage terminal finalization: (1) finalize writes retrospectives for in-progress phases, (2) archive creates timestamped bundle of swarm artifacts and evidence, (3) clean removes active-state files for a clean slate, (4) align performs aggressive git reset --hard to the default remote branch, discarding uncommitted changes and gitignored build artifacts (user-created untracked files are preserved); falls back to a cautious reset that preserves uncommitted changes when the aggressive path cannot proceed. WARNING: alignment discards local changes and gitignored files. Resets agent sessions, delegation chains, and active-agent mappings. Reads .swarm/close-lessons.md for explicit lessons and runs curation. Cleanup: knowledge.jsonl is preserved; plan.json, plan.md, events.jsonl, handoff.*, run-memory.jsonl, and summaries/ are removed. Use --skill-review to run the quota-bounded skill_improver in proposal mode. Use --dry-run to preview what finalize would archive, clean, and align without taking the lock or changing anything.",
+    details: "Idempotent 4-stage terminal finalization: (1) finalize writes retrospectives for in-progress phases, (2) archive creates timestamped bundle of swarm artifacts and evidence, (3) clean removes active-state files for a clean slate, (4) align performs aggressive git reset --hard to the default remote branch, discarding uncommitted changes and gitignored build artifacts (user-created untracked files are preserved); falls back to a cautious reset that preserves uncommitted changes when the aggressive path cannot proceed. Alignment re-verifies the tracked tree immediately before its destructive reset and aborts fail-closed (leaving alignment undone) when tracked files changed after the close gate was verified or the status cannot be re-read (#2953). WARNING: alignment discards local changes and gitignored files. Resets agent sessions, delegation chains, and active-agent mappings. Reads .swarm/close-lessons.md for explicit lessons and runs curation. Cleanup: knowledge.jsonl is preserved; plan.json, plan.md, events.jsonl, handoff.*, run-memory.jsonl, and summaries/ are removed. Use --skill-review to run the quota-bounded skill_improver in proposal mode. Use --dry-run to preview what finalize would archive, clean, and align without taking the lock or changing anything.",
     args: "--prune-branches, --skill-review, --dry-run",
     category: "core",
     toolPolicy: "none"