opencode-swarm 7.172.4 → 7.173.0

package/dist/cli/{index-1c1n8aax.js → index-e8tscab8.js}

@@ -2,10 +2,10 @@
 import {
   autoCommitDirty,
   cleanUntrackedFiles
-} from "./index-y1qc2cpp.js";
+} from "./index-nrsnman7.js";
 import {
   validateSwarmPath
-} from "./index-2n16srdc.js";
+} from "./index-evf5r7bk.js";
 import {
   bunSpawn,
   classifySpawnFailure
@@ -15,7 +15,7 @@ import {
   atomicWriteFile,
   taskEvidencePath,
   withTaskEvidenceLock
-} from "./index-01mjyjdt.js";
+} from "./index-kdyvk541.js";
 import {
   telemetry
 } from "./index-jmn35na4.js";
@@ -476,6 +476,62 @@ function parseConflictFiles(output) {
   return files;
 }
 var GIT_OBJECT_ID_PATTERN = /^[0-9a-f]{40}$|^[0-9a-f]{64}$/;
+async function matchesSourceHeadWorkingTree(primaryDir, sourceHead) {
+  const mergeBase = await runGit(["merge-base", "HEAD", sourceHead], primaryDir);
+  if (mergeBase.exitCode !== 0) {
+    return {
+      landed: false,
+      error: mergeBase.stderr.trim() || `git merge-base exited ${mergeBase.exitCode}`
+    };
+  }
+  const incoming = await runGit([
+    "diff",
+    "--name-status",
+    "--no-renames",
+    mergeBase.stdout.trim(),
+    sourceHead,
+    "--"
+  ], primaryDir);
+  if (incoming.exitCode !== 0) {
+    return {
+      landed: false,
+      error: incoming.stderr.trim() || incoming.stdout.trim() || `git diff exited ${incoming.exitCode}`
+    };
+  }
+  for (const line of incoming.stdout.split(`
+`)) {
+    if (!line)
+      continue;
+    const tabIndex = line.indexOf("\t");
+    if (tabIndex < 0)
+      continue;
+    const status = line.slice(0, tabIndex);
+    const filePath = line.slice(tabIndex + 1);
+    if (filePath.startsWith('"'))
+      return { landed: false };
+    if (status === "A") {
+      const worktreePath = path3.join(primaryDir, filePath);
+      if (!fs3.existsSync(worktreePath))
+        return { landed: false };
+      const expected = await runGit(["rev-parse", `${sourceHead}:${filePath}`], primaryDir);
+      const actual = await runGit(["hash-object", "--", filePath], primaryDir);
+      if (expected.exitCode !== 0 || actual.exitCode !== 0) {
+        return {
+          landed: false,
+          error: expected.stderr.trim() || actual.stderr.trim() || `git content probe exited ${expected.exitCode}/${actual.exitCode}`
+        };
+      }
+      if (actual.stdout.trim() !== expected.stdout.trim()) {
+        return { landed: false };
+      }
+      continue;
+    }
+    const diff = await runGit(["diff", "--quiet", sourceHead, "--", filePath], primaryDir);
+    if (diff.exitCode !== 0)
+      return { landed: false };
+  }
+  return { landed: true, method: "worktree-match" };
+}
 function abortArgsForStrategy(strategy) {
   return strategy === "rebase" ? ["rebase", "--abort"] : strategy === "cherry-pick" ? ["cherry-pick", "--abort"] : ["merge", "--abort"];
 }
@@ -764,6 +820,58 @@ async function mergeLaneBranch(primaryDir, branchName, strategy) {
     case "merge":
       result = await runGit(["merge", "--no-edit", branchName], primaryDir);
       break;
+    case "squash-unstaged": {
+      const mergeBaseResult = await runGit(["merge-base", "HEAD", branchName], primaryDir);
+      const mergeBase = mergeBaseResult.stdout.trim();
+      if (mergeBaseResult.exitCode !== 0 || !GIT_OBJECT_ID_PATTERN.test(mergeBase)) {
+        return {
+          error: `Unable to determine merge base for squash-unstaged landing of ${branchName}`
+        };
+      }
+      const incomingResult = await runGit([
+        "diff",
+        "--name-status",
+        "-z",
+        "--find-renames",
+        `${mergeBase}..${branchName}`
+      ], primaryDir);
+      if (incomingResult.exitCode !== 0) {
+        return {
+          error: `Unable to enumerate incoming paths for squash-unstaged landing of ${branchName}`
+        };
+      }
+      const parsedIncoming = parseIncomingPaths(incomingResult.stdout, currentPathCasePolicy());
+      if ("error" in parsedIncoming || parsedIncoming.paths.size === 0) {
+        return {
+          error: `No parsable incoming paths for squash-unstaged landing of ${branchName}`
+        };
+      }
+      const incomingPaths = [...parsedIncoming.paths.values()];
+      const squashResult = await runGit(["merge", "--squash", "--no-commit", branchName], primaryDir);
+      if (squashResult.exitCode !== 0) {
+        const combined = `${squashResult.stderr}
+${squashResult.stdout}`;
+        const restore = await runGit(["checkout", "-q", "HEAD", "--", ...incomingPaths], primaryDir);
+        if (/CONFLICT/i.test(combined)) {
+          return {
+            conflict: true,
+            files: parseConflictFiles(combined),
+            message: squashResult.stderr.trim() || squashResult.stdout.trim() || "squash merge reported a conflict"
+          };
+        }
+        if (restore.exitCode !== 0) {
+          advisoryWarn(`[worktree] mergeLaneBranch: squash merge failed and targeted restore also failed for ${branchName}: ${restore.stderr.trim() || restore.stdout.trim()}`);
+        }
+        return {
+          error: squashResult.stderr.trim() || squashResult.stdout.trim() || "squash merge failed"
+        };
+      }
+      const resetResult = await runGit(["reset", "-q", "HEAD", "--", ...incomingPaths], primaryDir);
+      if (resetResult.exitCode !== 0) {
+        advisoryWarn(`[worktree] mergeLaneBranch: targeted unstage failed for ${branchName} (${resetResult.stderr.trim() || resetResult.stdout.trim()}); lane changes remain staged`);
+      }
+      return { merged: true, strategy };
+    }
     case "rebase":
       result = await runGit(["rebase", branchName], primaryDir);
       break;
@@ -911,6 +1019,9 @@ async function reconcileLandedMerge(primaryDir, provenance) {
       return { landed: true, method: "ancestry" };
     }
     if (ancestry.exitCode === 1) {
+      if (provenance.strategy === "merge") {
+        return matchesSourceHeadWorkingTree(primaryDir, provenance.sourceHead);
+      }
       return { landed: false };
     }
     return {
@@ -1024,7 +1135,7 @@ async function attemptMergeBackFromDirty(worktreePath, branchName, primaryDir, s
     if (reconciliation.landed) {
       return {
         merged: true,
-        strategy,
+        strategy: reconciliation.method === "worktree-match" ? "squash-unstaged" : strategy,
         autoCommitted: false,
         cleaned: false,
         reconciled: true,
@@ -1140,6 +1251,8 @@ async function attemptMergeBackFromDirty(worktreePath, branchName, primaryDir, s
       cleaned,
       message: `Primary checkout has overlapping dirty paths with incoming lane changes: ${finalOverlapSnapshot.snapshot.overlapPaths.join(", ")}`,
       conflictFiles: finalOverlapSnapshot.snapshot.overlapPaths,
+      code: "SETTLEMENT_OVERLAP_BLOCKED",
+      recoveryHint: `ACTION: commit or stash your local changes to the overlapping paths (or run /swarm recover for the preserved lane), then re-dispatch the lane. Overlapping paths: ${finalOverlapSnapshot.snapshot.overlapPaths.join(", ")}`,
       ...provenance ? { provenance } : {}
     };
   }
@@ -1151,11 +1264,12 @@ async function attemptMergeBackFromDirty(worktreePath, branchName, primaryDir, s
       ...provenance ? { provenance } : {}
     };
   }
-  const mergeResult = await mergeLaneBranch(primaryDir, branchName, strategy);
+  const landingStrategy = strategy === "merge" && !options.commitLanding ? "squash-unstaged" : strategy;
+  const mergeResult = await mergeLaneBranch(primaryDir, branchName, landingStrategy);
   if ("merged" in mergeResult && mergeResult.merged) {
     return {
       merged: true,
-      strategy,
+      strategy: landingStrategy,
       autoCommitted,
       cleaned,
       ...provenance ? { reconciled: false, provenance } : {}

package/dist/cli/{index-68bp6sak.js → index-ejrqyrsr.js}

@@ -1,14 +1,14 @@
 // @bun
 import {
   observeStoreHealth
-} from "./index-yxegcfy5.js";
+} from "./index-43dmpa9w.js";
 import {
   telemetry
 } from "./index-jmn35na4.js";
 import {
   init_schema,
   stripKnownSwarmPrefix
-} from "./index-d21qcjr6.js";
+} from "./index-pserzhck.js";
 import {
   init_constants
 } from "./index-5frh43fj.js";

package/dist/cli/{index-2n16srdc.js → index-evf5r7bk.js}

@@ -7,7 +7,7 @@ import {
   readCachedTextFile,
   wasObservedToExist,
   wasRecentlyWrittenByThisProcess
-} from "./index-8p30wyx0.js";
+} from "./index-bsnpv4xd.js";
 import {
   SwarmError
 } from "./index-c1ggtmpm.js";

package/dist/cli/{index-szezqd2a.js → index-fb5rj8sk.js}

@@ -11,16 +11,16 @@ import {
 } from "./index-ae75rja9.js";
 import {
   resolveKnowledgeStoreDir
-} from "./index-ksjpc8s8.js";
+} from "./index-yzwb6ja4.js";
 import {
   atomicWriteFile
-} from "./index-01mjyjdt.js";
+} from "./index-kdyvk541.js";
 import {
   require_proper_lockfile
 } from "./index-7g4c7s5r.js";
 import {
   readCachedParsedFile
-} from "./index-8p30wyx0.js";
+} from "./index-bsnpv4xd.js";
 import {
   init_knowledge_types,
   isActiveStatus
@@ -739,7 +739,7 @@ async function applyConfidenceFloorAction(directory, touched, options) {
   const {
     readAuthoritativeKnowledgeCounterRollups,
     effectiveRetrievalOutcomes
-  } = await import("./knowledge-events-ctn3yfqx.js");
+  } = await import("./knowledge-events-nfcgfhq2.js");
   const rollups = await readAuthoritativeKnowledgeCounterRollups(directory);
   const flagIds = new Set;
   for (const e of atFloor) {
@@ -806,11 +806,11 @@ async function applyConfidenceFloorAction(directory, touched, options) {
     });
   }
   if (action === "quarantine" && toQuarantine.length > 0) {
-    const { quarantineEntry } = await import("./knowledge-validator-f5xhqqxr.js");
-    const { KnowledgeConfigSchema } = await import("./schema-n50qbvmt.js");
+    const { quarantineEntry } = await import("./knowledge-validator-e7nten5a.js");
+    const { KnowledgeConfigSchema } = await import("./schema-gws3yx52.js");
     let config;
     try {
-      const { loadPluginConfigWithMeta } = await import("./index-2qv69ydg.js");
+      const { loadPluginConfigWithMeta } = await import("./index-1r2avghn.js");
       const { config: loadedConfig } = loadPluginConfigWithMeta(directory);
       config = KnowledgeConfigSchema.parse(loadedConfig.knowledge ?? {});
     } catch {

package/dist/cli/{index-y6bqbe76.js → index-fnx0jzf7.js}

@@ -4,7 +4,7 @@ import {
   getProjectDb,
   projectDbExists,
   withImmediateTransaction
-} from "./index-jg2s11sg.js";
+} from "./index-dktpzjy9.js";
 
 // src/db/coordination-store.ts
 import { createHash } from "crypto";

package/dist/cli/{index-16rwxf4m.js → index-fxac6j9v.js}

@@ -22,66 +22,66 @@ import {
   resolveFallbackModel,
   resolvePrimaryAgentNames,
   stripSwarmPrefix
-} from "./index-fn7ny88p.js";
+} from "./index-njdy6w9x.js";
 import"./index-hnvmj9wx.js";
-import"./index-9h6zhnk0.js";
-import"./index-68bp6sak.js";
-import"./index-j8z3t7dv.js";
-import"./index-1t4v24tw.js";
-import"./index-d9g9stnf.js";
-import"./index-qzptb0gf.js";
+import"./index-hhws1xkc.js";
+import"./index-ejrqyrsr.js";
+import"./index-wr4m11x4.js";
+import"./index-0y9fqm5d.js";
+import"./index-btxf9k1r.js";
+import"./index-z35ynvj4.js";
 import"./index-txdagbh7.js";
 import"./index-z2deqhpp.js";
 import"./index-fpbcxykc.js";
-import"./index-zpksgw8w.js";
-import"./index-2negdnww.js";
-import"./index-zfzbn9a7.js";
+import"./index-915wxcgs.js";
+import"./index-mq2y8qpg.js";
+import"./index-sftt3gdv.js";
 import {
   createExplorerAgent
 } from "./index-fyfbpz4f.js";
-import"./index-rxakec16.js";
+import"./index-7gkdxs00.js";
 import"./index-0hgmsyfp.js";
 import"./index-zsrtt42s.js";
-import"./index-1c119trs.js";
-import"./index-a1187fx5.js";
-import"./index-j7zrvqnf.js";
+import"./index-m08ee28a.js";
+import"./index-ndvgkxpf.js";
+import"./index-0dfhahxm.js";
 import"./index-pt7h91zc.js";
 import"./index-q7sjgr1y.js";
-import"./index-1c1n8aax.js";
-import"./index-y1qc2cpp.js";
-import"./index-36143n94.js";
-import"./index-5qfqwbvg.js";
-import"./index-2n16srdc.js";
+import"./index-e8tscab8.js";
+import"./index-nrsnman7.js";
+import"./index-1pnw3jkr.js";
+import"./index-8xkr8p2b.js";
+import"./index-evf5r7bk.js";
 import"./index-2s7dvzff.js";
-import"./index-her1kqcr.js";
-import"./index-efbdfkw9.js";
+import"./index-nztmfgvw.js";
+import"./index-m51cmzxt.js";
 import"./index-rtry5xyf.js";
-import"./index-3rkjybes.js";
+import"./index-tztqvzf5.js";
 import"./index-frcemc0b.js";
 import"./index-wrt875kh.js";
-import"./index-bbhgnn4j.js";
-import"./index-5tjd3cne.js";
-import"./index-kerhh5q4.js";
-import"./index-b395nw9b.js";
-import"./index-y6bqbe76.js";
-import"./index-jg2s11sg.js";
+import"./index-3n16qq3z.js";
+import"./index-gd40ehzt.js";
+import"./index-mt8pbzda.js";
+import"./index-za1kvsa0.js";
+import"./index-fnx0jzf7.js";
+import"./index-dktpzjy9.js";
 import"./index-rdm3px0g.js";
 import"./index-ry16d01s.js";
-import"./index-yxegcfy5.js";
-import"./index-szezqd2a.js";
+import"./index-43dmpa9w.js";
+import"./index-fb5rj8sk.js";
 import"./index-vzm6zre7.js";
 import"./index-ae75rja9.js";
-import"./index-ksjpc8s8.js";
-import"./index-01mjyjdt.js";
+import"./index-yzwb6ja4.js";
+import"./index-kdyvk541.js";
 import"./index-7g4c7s5r.js";
 import"./index-jmn35na4.js";
-import"./index-8p30wyx0.js";
+import"./index-bsnpv4xd.js";
 import"./index-1xnse449.js";
 import"./index-c1ggtmpm.js";
-import"./index-gqkfha6x.js";
+import"./index-579nzg03.js";
 import"./index-0mhftbpp.js";
 import"./index-a1w58b47.js";
-import"./index-d21qcjr6.js";
+import"./index-pserzhck.js";
 import"./index-5frh43fj.js";
 import"./index-bk5tah7q.js";
 import"./index-gknz3bv1.js";

package/dist/cli/{index-5tjd3cne.js → index-gd40ehzt.js}

@@ -2,17 +2,17 @@
 import {
   derivePlanId,
   derivePlanIdentityHash
-} from "./index-y6bqbe76.js";
+} from "./index-fnx0jzf7.js";
 import {
   getProjectDb,
   projectDbExists,
   withImmediateTransaction,
   withProjectDbReadOnly
-} from "./index-jg2s11sg.js";
+} from "./index-dktpzjy9.js";
 import {
   assertProjectRoot,
   withEvidenceLock
-} from "./index-01mjyjdt.js";
+} from "./index-kdyvk541.js";
 import {
   emit
 } from "./index-jmn35na4.js";
@@ -22,11 +22,11 @@ import {
   TaskStatusSchema,
   init_loader,
   loadPluginConfig
-} from "./index-gqkfha6x.js";
+} from "./index-579nzg03.js";
 import {
   init_package,
   package_default
-} from "./index-d21qcjr6.js";
+} from "./index-pserzhck.js";
 import {
   criticalWarn,
   init_logger,

package/dist/cli/{index-9h6zhnk0.js → index-hhws1xkc.js}

@@ -9,7 +9,7 @@ import {
   readEvaluationRun,
   saveEvaluationRun,
   saveTaskSetSnapshot
-} from "./index-qzptb0gf.js";
+} from "./index-z35ynvj4.js";
 import {
   canonicalHash,
   computeCandidateInputContentHash,

package/dist/cli/{index-01mjyjdt.js → index-kdyvk541.js}

@@ -7,7 +7,7 @@ import {
 } from "./index-jmn35na4.js";
 import {
   atomicWriteFileAnyRoot
-} from "./index-8p30wyx0.js";
+} from "./index-bsnpv4xd.js";
 import {
   init_logger,
   warn

package/dist/cli/{index-1c119trs.js → index-m08ee28a.js}

@@ -2,10 +2,10 @@
 import {
   captureWorkspaceSnapshotAsync,
   changedFilesSinceSnapshotAsync
-} from "./index-a1187fx5.js";
+} from "./index-ndvgkxpf.js";
 import {
   removeWorktreeProvisioningOwner
-} from "./index-j7zrvqnf.js";
+} from "./index-0dfhahxm.js";
 import {
   SOURCE_WORKTREE_GONE_STAGE,
   ensureTaskGateRequirementsReceiptForSettledTransition,
@@ -14,16 +14,16 @@ import {
   reconcileLandedMerge,
   withTaskEvidenceTransaction,
   writeWorkflowWalFile
-} from "./index-1c1n8aax.js";
+} from "./index-e8tscab8.js";
 import {
   validateSwarmPath
-} from "./index-2n16srdc.js";
+} from "./index-evf5r7bk.js";
 import {
   appendCoreEventSync
-} from "./index-kerhh5q4.js";
+} from "./index-mt8pbzda.js";
 import {
   tryAcquireLock
-} from "./index-01mjyjdt.js";
+} from "./index-kdyvk541.js";
 import {
   canonicalRootKeyFresh
 } from "./index-1xnse449.js";
@@ -191,7 +191,12 @@ function settlementTransitionEvent(wal) {
     transitionId: wal.transitionId
   };
 }
-async function commitPrepared(directory, wal) {
+function withLandedUnstaged(worktree, landedUnstaged) {
+  if (worktree === undefined || landedUnstaged === undefined)
+    return worktree;
+  return { ...worktree, landedUnstaged };
+}
+async function commitPrepared(directory, wal, options) {
   return withTaskEvidenceTransaction(directory, wal.taskId, wal.actor, async (transaction) => {
     let lockedWal = await readWal(walPath(directory, wal.taskId), wal.taskId);
     if (lockedWal === null)
@@ -211,7 +216,8 @@ async function commitPrepared(directory, wal) {
         lockedWal = {
           ...lockedWal,
           state: "COMMITTED",
-          cleanupComplete: lockedWal.worktree === undefined
+          cleanupComplete: lockedWal.worktree === undefined,
+          worktree: withLandedUnstaged(lockedWal.worktree, options?.landedUnstaged)
         };
         await writeWal(walPath(directory, wal.taskId), lockedWal);
         await appendSettlementEvent(directory, "settled", lockedWal, {
@@ -231,7 +237,8 @@ async function commitPrepared(directory, wal) {
     lockedWal = {
       ...lockedWal,
       state: "COMMITTED",
-      cleanupComplete: lockedWal.worktree === undefined
+      cleanupComplete: lockedWal.worktree === undefined,
+      worktree: withLandedUnstaged(lockedWal.worktree, options?.landedUnstaged)
     };
     await writeWal(walPath(directory, wal.taskId), lockedWal);
     await appendSettlementEvent(directory, "settled", lockedWal);
@@ -320,7 +327,9 @@ async function settleCoderDispatch(options) {
       if (wal.accepted !== options.accepted || wal.testEngineerExempt !== options.testEngineerExempt || wal.settlementFailed !== (options.settlementFailed === true)) {
         throw new Error("CODER_SETTLEMENT_IDEMPOTENCY_CONFLICT");
       }
-      return commitPrepared(options.directory, wal);
+      return commitPrepared(options.directory, wal, {
+        landedUnstaged: options.landedUnstaged
+      });
     }
     if (wal.state === "ABORTED") {
       throw new Error("CODER_SETTLEMENT_IDEMPOTENCY_CONFLICT");
@@ -339,7 +348,9 @@ async function settleCoderDispatch(options) {
       await writeWal(filePath, prepared);
     liveDispatches.delete(dispatchKey(options.directory, options.taskId, options.transitionId));
     try {
-      return await commitPrepared(options.directory, prepared);
+      return await commitPrepared(options.directory, prepared, {
+        landedUnstaged: options.landedUnstaged
+      });
     } finally {
       const finalWal = await readWal(filePath, options.taskId);
       if (finalWal !== null && finalWal.state === "COMMITTED") {
@@ -482,14 +493,15 @@ function probeBranchExists(directory, branchName) {
     return false;
   throw new Error(`CODER_SETTLEMENT_CLEANUP_UNCERTAIN: git show-ref exited with status ${String(result.status)}`);
 }
-async function cleanupRecoveredWorktree(directory, descriptor) {
+async function cleanupRecoveredWorktree(directory, descriptor, options) {
+  const retainBranch = options?.retainBranch ?? descriptor.landedUnstaged === true;
   const branchExists = () => _internals.branchExists(directory, descriptor.branchName);
   const hasResidue = existsSync(descriptor.worktreePath) || branchExists();
   const {
     awaitingMergeByCallID,
     cleanupStandardWorktreeForCallId,
     standardWorktreeByCallID
-  } = await import("./worktree-isolation-8yh97cgh.js");
+  } = await import("./worktree-isolation-tv749n96.js");
   standardWorktreeByCallID.delete(descriptor.callID);
   if (hasResidue)
     awaitingMergeByCallID.set(descriptor.callID, {
@@ -503,9 +515,9 @@ async function cleanupRecoveredWorktree(directory, descriptor) {
       queuedAt: Date.now()
     });
   if (hasResidue) {
-    await cleanupStandardWorktreeForCallId(descriptor.callID, "success", directory, descriptor.worktreeDir ?? undefined);
+    await cleanupStandardWorktreeForCallId(descriptor.callID, "success", directory, descriptor.worktreeDir ?? undefined, retainBranch ? { retainBranch: true } : undefined);
   }
-  if (existsSync(descriptor.worktreePath) || branchExists()) {
+  if (existsSync(descriptor.worktreePath) || branchExists() && !retainBranch) {
     throw new Error("CODER_SETTLEMENT_WORKTREE_CLEANUP_UNVERIFIED");
   }
   const provisioningOwner = descriptor.provisioningOwner ?? (descriptor.reservationId !== undefined && descriptor.generation !== undefined ? {
@@ -588,6 +600,7 @@ async function recoverCoderSettlement(directory, taskId) {
         if (wal.mergeProvenance) {
           const landed = await reconcileLandedMerge(directory, wal.mergeProvenance);
           if (landed.landed) {
+            const landedUnstaged = landed.method === "worktree-match";
             wal = {
               ...wal,
               state: "PREPARED",
@@ -596,11 +609,18 @@ async function recoverCoderSettlement(directory, taskId) {
               testEngineerExempt: isMarkdownOnlyTaskChange(wal.context.declaredFiles, observed2)
             };
             await writeWal(filePath, wal);
-            const committed2 = await commitPrepared(directory, wal);
-            await cleanupRecoveredWorktree(directory, worktree);
+            const committed2 = await commitPrepared(directory, wal, {
+              landedUnstaged
+            });
+            await cleanupRecoveredWorktree(directory, worktree, {
+              retainBranch: landedUnstaged
+            });
+            const reconciledWal = await readWal(filePath, taskId);
+            if (reconciledWal === null) {
+              throw new Error("CODER_SETTLEMENT_WAL_MISSING");
+            }
             await writeWal(filePath, {
-              ...wal,
-              state: "COMMITTED",
+              ...reconciledWal,
               cleanupComplete: true
             });
             return committed2;
@@ -613,7 +633,7 @@ async function recoverCoderSettlement(directory, taskId) {
           awaitingMergeByCallID,
           finishStandardWorktreeDispatch,
           standardWorktreeByCallID
-        } = await import("./worktree-isolation-8yh97cgh.js");
+        } = await import("./worktree-isolation-tv749n96.js");
         const descriptor = wal.worktree;
         const reconstructedDispatch = {
           callID: descriptor.callID,
@@ -654,7 +674,7 @@ async function recoverCoderSettlement(directory, taskId) {
             };
             await writeWal(filePath, wal);
           },
-          onMerged: async () => {
+          onMerged: async (mergedResult) => {
             wal = {
               ...wal,
               state: "PREPARED",
@@ -662,7 +682,9 @@ async function recoverCoderSettlement(directory, taskId) {
               testEngineerExempt: isMarkdownOnlyTaskChange(wal.context.declaredFiles, observed2)
             };
             await writeWal(filePath, wal);
-            recovered = await commitPrepared(directory, wal);
+            recovered = await commitPrepared(directory, wal, {
+              landedUnstaged: mergedResult.strategy === "squash-unstaged"
+            });
           }
         });
         if (mergeResult.outcome !== "merged" || recovered === null) {
@@ -671,7 +693,9 @@ async function recoverCoderSettlement(directory, taskId) {
           }
           throw new Error(`CODER_SETTLEMENT_MERGE_RECOVERY_REQUIRED: transition ${wal.transitionId} for task ${taskId} worktree merge-back did not reach merged (${filePath}, state ${wal.state}, outcome ${mergeResult.outcome}${mergeResult.outcome === "failed" && mergeResult.message ? `: ${mergeResult.message}` : ""}). Run /swarm recover ${taskId} (or /swarm reset-session), then retry; do not remove the WAL by hand.`);
         }
-        await cleanupRecoveredWorktree(directory, descriptor);
+        await cleanupRecoveredWorktree(directory, descriptor, {
+          retainBranch: mergeResult.strategy === "squash-unstaged"
+        });
         const committedWal = await readWal(filePath, taskId);
         if (committedWal === null) {
           throw new Error("CODER_SETTLEMENT_WAL_MISSING");

package/dist/cli/{index-efbdfkw9.js → index-m51cmzxt.js}

@@ -11,7 +11,7 @@ import {
   readLinkPointer,
   resolveKnowledgeStoreDir,
   resolveLinkDir
-} from "./index-ksjpc8s8.js";
+} from "./index-yzwb6ja4.js";
 
 // src/knowledge/curation-policy.ts
 import { readFile as readFile2 } from "fs/promises";

package/dist/cli/{index-2negdnww.js → index-mq2y8qpg.js}

@@ -3,7 +3,7 @@ import {
   queryHistoricalOutcomes,
   readKnowledgeEvents,
   recordKnowledgeEvent
-} from "./index-5qfqwbvg.js";
+} from "./index-8xkr8p2b.js";
 import {
   jaccardBigram,
   readKnowledge,
@@ -11,7 +11,7 @@ import {
   resolveSwarmKnowledgePath,
   transactKnowledge,
   wordBigrams
-} from "./index-szezqd2a.js";
+} from "./index-fb5rj8sk.js";
 import {
   init_knowledge_types,
   isActiveStatus
@@ -224,11 +224,11 @@ async function maybeQuarantineOnContradiction(directory, entryId, threshold, win
         alreadyInactive: true
       };
     }
-    const { quarantineEntry } = await import("./knowledge-validator-f5xhqqxr.js");
+    const { quarantineEntry } = await import("./knowledge-validator-e7nten5a.js");
     let policyConfig;
     try {
-      const { KnowledgeConfigSchema } = await import("./schema-n50qbvmt.js");
-      const { loadPluginConfigWithMeta } = await import("./index-2qv69ydg.js");
+      const { KnowledgeConfigSchema } = await import("./schema-gws3yx52.js");
+      const { loadPluginConfigWithMeta } = await import("./index-1r2avghn.js");
       const { config: loadedConfig } = loadPluginConfigWithMeta(directory);
       policyConfig = KnowledgeConfigSchema.parse(loadedConfig.knowledge ?? {});
     } catch {

package/dist/cli/{index-kerhh5q4.js → index-mt8pbzda.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   observeStoreHealth
-} from "./index-yxegcfy5.js";
+} from "./index-43dmpa9w.js";
 import {
   telemetry
 } from "./index-jmn35na4.js";