opencode-swarm 7.200.13 → 7.200.14

package/dist/cli/{index-a01knv2b.js → index-sm64f3fc.js}

@@ -17,14 +17,14 @@ import {
   protectedRoots,
   redactDecisionLineForArchive,
   stableCanonicalStringify
-} from "./index-fh22ndnh.js";
+} from "./index-sxna6jn9.js";
 import {
   detectStraySwarmDirs,
   readDoctorArtifact,
   removeStraySwarmDir,
   resolvePlanParallelizationFlag,
   runConfigDoctor
-} from "./index-pxf512yn.js";
+} from "./index-j3me99q7.js";
 import {
   archiveEvidence,
   checkRequirementCoverage,
@@ -36,7 +36,7 @@ import {
   sanitizeTaskId,
   saveEvidence,
   validateProjectRoot
-} from "./index-nfjwshs6.js";
+} from "./index-fhrcyexn.js";
 import {
   EvaluationTaskV1Schema,
   GateAuditManifestV1Schema,
@@ -107,16 +107,16 @@ import {
   skillContractDigest,
   splitSkillFrontmatter,
   syncBundledProjectSkillsIfMissingAsync
-} from "./index-v4g6rm68.js";
+} from "./index-39v48pf0.js";
 import {
   buildEscalationBriefing,
   readRecentEscalations
-} from "./index-1nnrz6yd.js";
+} from "./index-vv9k85h0.js";
 import {
   alreadyCuratedThisGeneration,
   claimNextScanBatch,
   resolveCohortId
-} from "./index-6xaft4r3.js";
+} from "./index-gx2a1xgp.js";
 import {
   CURATOR_CONSOLIDATION_PROMPT,
   CURATOR_INIT_PROMPT,
@@ -135,13 +135,13 @@ import {
   getGroupCommitWriter,
   importLegacyJsonl,
   readPriorDriftReports
-} from "./index-hs96g7xz.js";
+} from "./index-pdaycg02.js";
 import {
   assertNoUnsettledCoderDispatch,
   listCoderSettlementWalStates,
   recoverCoderSettlement,
   recoverStaleCoderSettlements
-} from "./index-7811ftfy.js";
+} from "./index-b7y19187.js";
 import {
   TASK_WORKFLOW_SCHEMA_MARKER,
   compareTaskWorkflowStateRank,
@@ -155,7 +155,7 @@ import {
   readTaskEvidenceState,
   transitionTaskWorkflowEvidenceWithStatus,
   withTaskEvidenceTransaction
-} from "./index-h8ta8mva.js";
+} from "./index-1520thw9.js";
 import {
   fastForwardToRefAsync,
   parsePorcelainV2Snapshot,
@@ -289,7 +289,7 @@ import {
   writeAtomicJson,
   writePrWorkflowAtomicJson,
   writeStateWhileLocked
-} from "./index-9zw7mh20.js";
+} from "./index-t6dkmt0c.js";
 import {
   MAX_PENDING_SCOPE_BINDINGS,
   canonicalWorkspaceIdentity,
@@ -298,7 +298,7 @@ import {
   clearScopeBindings,
   readAuthoritativeScopeBindingSet,
   readDeclaredScopeFilesFromBindings
-} from "./index-sx4fm1d2.js";
+} from "./index-25v6n1t3.js";
 import {
   DEFAULT_QA_GATES,
   computeProfileHash,
@@ -349,7 +349,7 @@ import {
   swarmOverwriteCandidates,
   trackedDirtyCandidates,
   transientBackoff
-} from "./index-dkg8meb8.js";
+} from "./index-g3mrxex7.js";
 import {
   EPIC_MODE_CONFIG_DISABLED_MESSAGE,
   PlanRecoverySupersededError,
@@ -381,7 +381,7 @@ import {
   updateEpicRecord,
   updateTaskStatus,
   withPlanLifecycleLock
-} from "./index-xfdx40ba.js";
+} from "./index-ne0s5g10.js";
 import {
   containsControlChars,
   containsPathTraversal,
@@ -398,7 +398,7 @@ import {
   resolveSpeckitProjection,
   validateSpeckit,
   writeProjectedSpecSync
-} from "./index-165v1k07.js";
+} from "./index-szwmgbm4.js";
 import {
   clearWorktreeMergeStatus,
   getAllWorktreeMergeFailures,
@@ -421,7 +421,7 @@ import {
   replayFromLedgerWithStatus,
   resolvePlanningProfile,
   takeSnapshotEvent
-} from "./index-h59n1rx5.js";
+} from "./index-phdf1pjq.js";
 import {
   MAX_COORDINATION_STATE_LIST_ROWS,
   deleteCoordinationImports,
@@ -485,7 +485,7 @@ import {
   recordHiveKnowledgeEvent,
   recordKnowledgeEvent,
   resolveKnowledgeEventsPath
-} from "./index-9v10n049.js";
+} from "./index-vqxvdx7n.js";
 import {
   commitDisplayedMembership,
   commitEmptyRetrieval,
@@ -498,7 +498,7 @@ import {
   queryLiveMemberships,
   reconcilePhaseClose,
   recordPhaseCloseIntent
-} from "./index-8kta0a96.js";
+} from "./index-yc5e6yr5.js";
 import {
   sanitizeContextText
 } from "./index-m9zzj4ee.js";
@@ -519,7 +519,7 @@ import {
   validateActionableFields,
   validateLesson,
   validateSkillPath
-} from "./index-3jewj7q3.js";
+} from "./index-wj3a023e.js";
 import {
   MAX_CURATION_PROPOSALS,
   authorizeCuration,
@@ -558,7 +558,7 @@ import {
   transactFile,
   transactKnowledge,
   wordBigrams
-} from "./index-qg38v82w.js";
+} from "./index-gsyv2s9g.js";
 import {
   readTailJsonl,
   readTailJsonlDetailed,
@@ -582,7 +582,7 @@ import {
 } from "./index-erp7fk72.js";
 import {
   resolveWorktreeIsolationConfig
-} from "./index-8az4qgz7.js";
+} from "./index-6cnppnh7.js";
 import {
   RetrospectiveEvidenceSchema
 } from "./index-g22dps7x.js";
@@ -603,7 +603,7 @@ import {
   loadPluginConfig,
   loadPluginConfigWithMeta,
   resolveEpicConfig
-} from "./index-6kdyc1s7.js";
+} from "./index-5mbyavx0.js";
 import {
   DEFAULT_HARNESS_EVOLUTION_CONFIG,
   DEFAULT_HARNESS_OPT_CONFIG,
@@ -625,7 +625,7 @@ import {
   resolveContextWindow,
   resolveGeneratedAgentRole,
   stripKnownSwarmPrefix
-} from "./index-cc2vkpg7.js";
+} from "./index-11aqm3bt.js";
 import {
   KNOWLEDGE_SCHEMA_VERSION,
   OUTCOME_BLOCK_THRESHOLD,
@@ -647,7 +647,7 @@ import {
   recoveryReadErrored,
   startupOrphanRecovery,
   writeWorkflowWalFile
-} from "./index-krrn8eg3.js";
+} from "./index-mem1hrkw.js";
 import {
   assertSettlementArtifactsRemovable,
   isPathUnderSwarmWorktreeBase,
@@ -658,7 +658,7 @@ import {
   removeWorktree,
   resolveWorktreeBaseDir,
   withSettlementArtifactLifecycle
-} from "./index-q0gtj1px.js";
+} from "./index-szwa4tek.js";
 import {
   estimateCharsForTokens,
   estimateTokens,
@@ -1716,6 +1716,83 @@ var SidecarCandidateSchema = exports_external.discriminatedUnion("row_format_fam
     invariant_violated: exports_external.string().min(1)
   }).strict()
 ]);
+var BIDI_RANGES = [
+  [8234, 8238],
+  [8294, 8297]
+];
+function isBidiCodePoint(code) {
+  for (let i = 0;i < BIDI_RANGES.length; i++) {
+    const [lo, hi] = BIDI_RANGES[i];
+    if (code >= lo && code <= hi)
+      return true;
+  }
+  return false;
+}
+function sanitizeString(value) {
+  let result = "";
+  for (let i = 0;i < value.length; i++) {
+    const code = value.codePointAt(i) ?? 0;
+    if (code > 65535) {
+      result += value[i];
+      i++;
+      result += value[i];
+    } else if (code === 0) {
+      result += "\\u0000";
+    } else if (code === 27) {
+      if (i + 1 < value.length && value[i + 1] === "[") {
+        i++;
+        while (i + 1 < value.length) {
+          const next = value.charCodeAt(i + 1);
+          if (next >= 48 && next <= 63) {
+            i++;
+          } else if (next >= 32 && next <= 47) {
+            i++;
+          } else if (next >= 64 && next <= 126) {
+            i++;
+            break;
+          } else {
+            break;
+          }
+        }
+      } else if (i + 1 < value.length && value[i + 1] === "]") {
+        i++;
+        while (i + 1 < value.length) {
+          const next = value.charCodeAt(i + 1);
+          if (next === 7) {
+            i++;
+            break;
+          } else if (next === 27 && i + 2 < value.length && value[i + 2] === "\\") {
+            i += 2;
+            break;
+          } else {
+            i++;
+          }
+        }
+      } else if (i + 1 < value.length) {
+        const next = value.charCodeAt(i + 1);
+        if (next >= 32 && next <= 47) {
+          i++;
+          while (i + 1 < value.length) {
+            const b = value.charCodeAt(i + 1);
+            if (b >= 48 && b <= 126) {
+              i++;
+              break;
+            } else if (b >= 32 && b <= 47) {
+              i++;
+            } else {
+              break;
+            }
+          }
+        } else if (next >= 48 && next <= 126) {
+          i++;
+        }
+      }
+    } else if (isBidiCodePoint(code)) {} else {
+      result += value[i];
+    }
+  }
+  return result;
+}
 
 // src/background/candidate-parser.ts
 var ArtifactInputSchema = exports_external.object({
@@ -7723,17 +7800,47 @@ async function teardownEphemeralSession(session, sessionId, options = {}) {
 }
 var DEFAULT_EPHEMERAL_VERIFY_TIMEOUT_MS = 2000;
 var DEFAULT_EPHEMERAL_MAX_DELETE_ATTEMPTS = 3;
+var TRANSIENT_TRANSPORT_ERROR_CODES = new Set([
+  "ECONNRESET",
+  "ECONNREFUSED",
+  "EAI_AGAIN",
+  "ETIMEDOUT",
+  "ENOTFOUND",
+  "EPIPE",
+  "UND_ERR_SOCKET"
+]);
+function isTransientTransportError(err) {
+  if (typeof err !== "object" || err === null)
+    return false;
+  if (err instanceof TypeError)
+    return true;
+  const coded = err;
+  if (typeof coded.code === "string" && TRANSIENT_TRANSPORT_ERROR_CODES.has(coded.code)) {
+    return true;
+  }
+  return coded.name === "AbortError";
+}
 async function sessionExists(session, sessionId, verifyTimeoutMs) {
   if (typeof session.get !== "function")
-    return true;
+    return "alive";
+  const verifyTimeoutError = new Error(`ephemeral session verify timed out after ${verifyTimeoutMs}ms`);
   try {
-    const result = await withTimeout(session.get({ path: { id: sessionId } }), verifyTimeoutMs, new Error(`ephemeral session verify timed out after ${verifyTimeoutMs}ms`));
+    const result = await withTimeout(session.get({ path: { id: sessionId } }), verifyTimeoutMs, verifyTimeoutError);
     const body = result?.data;
-    if (body === undefined || body === null)
-      return false;
-    return true;
-  } catch {
-    return false;
+    if (body === undefined || body === null) {
+      const envelopeError = result?.error;
+      if (envelopeError !== undefined && envelopeError !== null && isTransientTransportError(envelopeError)) {
+        return "unreadable";
+      }
+      return "gone";
+    }
+    return "alive";
+  } catch (err) {
+    if (err === verifyTimeoutError)
+      return "unreadable";
+    if (isTransientTransportError(err))
+      return "unreadable";
+    return "gone";
   }
 }
 async function teardownEphemeralSessionVerified(session, sessionId, options = {}) {
@@ -7756,9 +7863,19 @@ async function teardownEphemeralSessionVerified(session, sessionId, options = {}
       skipAbort: deleteAttempts > 0 ? true : options.skipAbort
     });
     deleteAttempts += 1;
-    const alive = await _internals18.sessionExists(session, sessionId, verifyTimeoutMs);
-    if (!alive)
+    const existence = await _internals18.sessionExists(session, sessionId, verifyTimeoutMs);
+    if (existence === "gone") {
       return { ok: true, sessionId, attempts: deleteAttempts };
+    }
+    if (existence === "unreadable") {
+      return {
+        ok: false,
+        sessionId,
+        attempts: deleteAttempts,
+        kind: "ephemeral-session-teardown-unverified",
+        reason: "verify-unreadable"
+      };
+    }
     if (deleteAttempts >= attempts) {
       return {
         ok: false,
@@ -7775,6 +7892,7 @@ var _internals18 = {
   boundedAbort: boundedAbortEphemeralSession,
   boundedDelete: boundedDeleteEphemeralSession,
   sessionExists,
+  isTransientTransportError,
   log
 };
 
@@ -9675,7 +9793,7 @@ function isLaneOwnedByCurrentSession(branchName, expectedSessionId) {
   return extracted === expectedSessionId;
 }
 async function inspectStandardWorktreeCollisionOwnership(identity) {
-  const collisionOwnership = await import("./worktree-collision-ownership-k471ygv7.js");
+  const collisionOwnership = await import("./worktree-collision-ownership-vt740r91.js");
   return collisionOwnership.inspectStandardWorktreeCollisionOwnership(identity);
 }
 async function runRecoveryGit(directory, args, timeoutMs = 15000) {
@@ -9878,7 +9996,7 @@ async function precreateStandardWorktreeSession(args) {
                 if (lateChildSessionId) {
                   const verification = await teardownEphemeralSessionVerified(client.session, lateChildSessionId);
                   if (!verification.ok) {
-                    pushAdvisory(ensureAgentSession(args.parentSessionID), `WORKTREE_RECOVERY_CHILD_SESSION_LEAKED: recovery child session ${lateChildSessionId} survived verified teardown (${verification.reason}); it holds the lane swarm.db at ${collision.worktreePath}. Retry the dispatch or restart the host to release it.`);
+                    pushAdvisory(ensureAgentSession(args.parentSessionID), `WORKTREE_RECOVERY_CHILD_SESSION_LEAKED: recovery child session ${lateChildSessionId} was not confirmed deleted by verified teardown (${verification.reason}); it holds the lane swarm.db at ${collision.worktreePath}. Retry the dispatch or restart the host to release it.`);
                   }
                 }
               }, resolveSessionCreateTimeoutMs(args));
@@ -9928,7 +10046,7 @@ async function precreateStandardWorktreeSession(args) {
           if (recoveredChildSessionId) {
             const verification = await teardownEphemeralSessionVerified(client.session, recoveredChildSessionId);
             if (!verification.ok) {
-              pushAdvisory(ensureAgentSession(args.parentSessionID), `WORKTREE_RECOVERY_CHILD_SESSION_LEAKED: recovery child session ${recoveredChildSessionId} survived verified teardown (${verification.reason}); it holds the lane swarm.db at ${collision.worktreePath}. Retry the dispatch or restart the host to release it.`);
+              pushAdvisory(ensureAgentSession(args.parentSessionID), `WORKTREE_RECOVERY_CHILD_SESSION_LEAKED: recovery child session ${recoveredChildSessionId} was not confirmed deleted by verified teardown (${verification.reason}); it holds the lane swarm.db at ${collision.worktreePath}. Retry the dispatch or restart the host to release it.`);
             }
           }
           hardStopStandardWorktreeLifecycle(args.parentSessionID, `STANDARD_WORKTREE_RECOVERY_SESSION_CREATE_FAILED: ${error2 instanceof Error ? error2.message : String(error2)}. The PREPARED claim was rolled back and recovery re-dispatch was blocked.`);
@@ -10103,7 +10221,7 @@ async function precreateStandardWorktreeSession(args) {
   const laneProfile = computeLaneRuntimeProfile(worktreeConfig.runtime_isolation, laneIndex, handle.worktreePath);
   if (laneProfile) {
     try {
-      const { writeLaneProfileToDiskReal } = await import("./core-vx7fxf4y.js");
+      const { writeLaneProfileToDiskReal } = await import("./core-pqpsbekk.js");
       await writeLaneProfileToDiskReal(handle.worktreePath, laneProfile.laneIndex, laneProfile.envOverrides);
     } catch {}
   }
@@ -10136,7 +10254,7 @@ async function precreateStandardWorktreeSession(args) {
               lanePath: handle.worktreePath,
               branchName: handle.branchName,
               taskId: args.taskId,
-              reason: `late child session ${lateChildSessionId} survived verified teardown (${verification.reason})`
+              reason: `late child session ${lateChildSessionId} was not confirmed deleted by verified teardown (${verification.reason})`
             });
           }
         }
@@ -11103,7 +11221,7 @@ async function finishStandardWorktreeDispatch(directory, dispatch, config, callI
       }
       clearWorktreeMergeStatus(statusKey);
       try {
-        const { removeLaneProfileFromDiskReal } = await import("./core-vx7fxf4y.js");
+        const { removeLaneProfileFromDiskReal } = await import("./core-pqpsbekk.js");
         await removeLaneProfileFromDiskReal(dispatch.handle.worktreePath, dispatch.laneIndex);
       } catch {}
       const state = serializationStateBySessionID.get(dispatch.parentSessionID);
@@ -17471,7 +17589,7 @@ var INJECTION_PATTERNS = [
   /\bDAN\s*MODE/gi,
   /\bBYPASS/gi
 ];
-function sanitizeString(input) {
+function sanitizeString2(input) {
   if (!input || typeof input !== "string") {
     return "";
   }
@@ -17532,9 +17650,9 @@ function detectRepetitionLoop(trajectory, config) {
           severity: severity2,
           category: "coordination_error",
           stepRange: [data.startStep, data.endStep],
-          description: `Agent "${sanitizeString(agent)}" performed "${sanitizeString(action2)}" on "${sanitizeString(target)}" ${data.count} times within ${windowSize} steps`,
-          affectedAgents: [sanitizeString(agent)],
-          affectedTargets: [sanitizeString(target)],
+          description: `Agent "${sanitizeString2(agent)}" performed "${sanitizeString2(action2)}" on "${sanitizeString2(target)}" ${data.count} times within ${windowSize} steps`,
+          affectedAgents: [sanitizeString2(agent)],
+          affectedTargets: [sanitizeString2(target)],
           occurrenceCount: data.count
         });
       }
@@ -17582,12 +17700,12 @@ function detectPingPong(trajectory, config) {
           severity: "high",
           category: "coordination_error",
           stepRange: [delegateEntries[i].step, delegateEntries[endIndex].step],
-          description: `Ping-pong delegation detected: "${sanitizeString(firstAgent)}" and "${sanitizeString(secondAgent)}" alternating on "${sanitizeString(target)}"`,
+          description: `Ping-pong delegation detected: "${sanitizeString2(firstAgent)}" and "${sanitizeString2(secondAgent)}" alternating on "${sanitizeString2(target)}"`,
           affectedAgents: [
-            sanitizeString(firstAgent),
-            sanitizeString(secondAgent)
+            sanitizeString2(firstAgent),
+            sanitizeString2(secondAgent)
           ],
-          affectedTargets: [sanitizeString(target)],
+          affectedTargets: [sanitizeString2(target)],
           occurrenceCount: roundTrips
         });
       }
@@ -17624,9 +17742,9 @@ function detectExpansionDrift(trajectory, config) {
           ],
           description: `Scope expansion detected: ${previousTargets.size} unique targets \u2192 ${recentTargets.size} unique targets (${expansionRatio.toFixed(1)}x increase)`,
           affectedAgents: [
-            ...new Set(recentWindow.map((e) => sanitizeString(e.agent)))
+            ...new Set(recentWindow.map((e) => sanitizeString2(e.agent)))
           ],
-          affectedTargets: [...recentTargets].map((t) => sanitizeString(t)),
+          affectedTargets: [...recentTargets].map((t) => sanitizeString2(t)),
           occurrenceCount: Math.floor(expansionRatio * 10) / 10
         });
       }
@@ -17695,9 +17813,9 @@ function detectStuckOnTest(trajectory, config) {
           severity: "high",
           category: "reasoning_error",
           stepRange: [cycleStart, cycleEnd],
-          description: `Stuck on test detected: ${cycleCount} edit-test cycles on "${sanitizeString(file)}"`,
-          affectedAgents: data.agents.map((a) => sanitizeString(a)),
-          affectedTargets: [sanitizeString(file)],
+          description: `Stuck on test detected: ${cycleCount} edit-test cycles on "${sanitizeString2(file)}"`,
+          affectedAgents: data.agents.map((a) => sanitizeString2(a)),
+          affectedTargets: [sanitizeString2(file)],
           occurrenceCount: cycleCount
         });
       }
@@ -17735,10 +17853,10 @@ function detectContextThrash(trajectory, config) {
           stepRange: [trajectory[runStart].step, trajectory[runEnd].step],
           description: `Context thrash detected: unique targets grew monotonically from ${priorCount} to ${finalCount} over ${runLength} steps`,
           affectedAgents: [
-            ...new Set(trajectory.slice(runStart, runEnd + 1).map((e) => sanitizeString(e.agent)))
+            ...new Set(trajectory.slice(runStart, runEnd + 1).map((e) => sanitizeString2(e.agent)))
           ],
           affectedTargets: [
-            ...new Set(trajectory.slice(runStart, runEnd + 1).map((e) => sanitizeString(e.target)))
+            ...new Set(trajectory.slice(runStart, runEnd + 1).map((e) => sanitizeString2(e.target)))
           ],
           occurrenceCount: runLength
         });
@@ -29653,7 +29771,7 @@ function clearCriticalShownIds(sessionID) {
 async function rehydratePrSubscriptions(sessionID, directory) {
   const map = new Map;
   try {
-    const { listActive: listActive2 } = await import("./pr-subscriptions-zx205zj2.js");
+    const { listActive: listActive2 } = await import("./pr-subscriptions-wmzs42h3.js");
     const records = await listActive2(directory);
     for (const record of records) {
       if (record.sessionID !== sessionID)
@@ -40294,7 +40412,7 @@ async function handleAttestCommand(directory, args, sessionID) {
 `);
   }
   const taskId = args[0];
-  const { executeAttestTask } = await import("./attest-task-pvwft49v.js");
+  const { executeAttestTask } = await import("./attest-task-1bhnpxsr.js");
   const result = await executeAttestTask({
     task_id: taskId,
     working_directory: directory,
@@ -47486,9 +47604,9 @@ function hashContent(content) {
   return createHash28("sha1").update(content).digest("hex");
 }
 async function loadConfigForPolicyCurator(directory) {
-  const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-9spe6r4w.js");
+  const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-art9xdhq.js");
   try {
-    const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-ffz00br0.js");
+    const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-h91a4abf.js");
     const { config: loadedConfig } = loadPluginConfigWithMeta2(directory);
     return KnowledgeConfigSchema2.parse(loadedConfig.knowledge ?? {});
   } catch {
@@ -50546,7 +50664,7 @@ async function resolveCuratorLLMDelegate(directory, mode, sessionId) {
   const seam = _internals49.createCuratorLLMDelegate;
   if (seam)
     return seam(directory, mode, sessionId);
-  const { createCuratorLLMDelegate } = await import("./curator-llm-factory-cn47pa0k.js");
+  const { createCuratorLLMDelegate } = await import("./curator-llm-factory-r2rsrmz4.js");
   return createCuratorLLMDelegate(directory, mode, sessionId);
 }
 async function reconcileCloseTerminalStateForPlan(directory, targetPlan, options) {
@@ -50941,7 +51059,7 @@ async function runFinalizeStage(ctx) {
     }
   }
   try {
-    const { CuratorConfigSchema: CCS } = await import("./schema-9spe6r4w.js");
+    const { CuratorConfigSchema: CCS } = await import("./schema-art9xdhq.js");
     const { config: pmLoadedConfig } = _internals49.loadPluginConfigWithMeta(ctx.directory);
     const curatorCfg = CCS.parse(pmLoadedConfig.curator ?? {});
     if (curatorCfg.enabled && curatorCfg.postmortem_enabled) {
@@ -55014,7 +55132,7 @@ function adviseClosingStop(directory) {
 }
 async function writeSnapshot(directory, state) {
   try {
-    const { ensureSnapshotCoordinationReady } = await import("./snapshot-coordination-init-namz3ae3.js");
+    const { ensureSnapshotCoordinationReady } = await import("./snapshot-coordination-init-1v237k29.js");
     await ensureSnapshotCoordinationReady(directory);
     if (closingStopAdvisedRoots.size > 0) {
       closingStopAdvisedRoots.delete(canonicalProjectKey(directory));
@@ -58243,7 +58361,7 @@ function planMerges(active, threshold, maxComparisons, maxMerges) {
   };
 }
 async function sweepActiveNearDuplicates(directory, options = {}) {
-  const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-ffz00br0.js");
+  const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-h91a4abf.js");
   const { config } = loadPluginConfigWithMeta2(directory);
   const sweepConfig = config.learning?.dedup_sweep;
   if (sweepConfig?.enabled === false)
@@ -59367,7 +59485,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-k6gtr0fh.js");
+        const skillModule = await import("./skill-generator-bbzwn7ny.js");
         for (const cand of skillCandidates) {
           if (cand.confidence < (config.min_skill_confidence ?? DEFAULT_SKILL_MIN_CONFIDENCE)) {
             continue;
@@ -59839,7 +59957,7 @@ async function applyCuratorKnowledgeUpdates(directory, recommendations, knowledg
     } catch {}
   }
   if (contradictedEntries.length > 0 && knowledgeConfig.contradiction_threshold_action === "quarantine") {
-    const { maybeQuarantineOnContradiction } = await import("./knowledge-escalator-t29wynav.js");
+    const { maybeQuarantineOnContradiction } = await import("./knowledge-escalator-h8j3v62j.js");
     for (const { id } of contradictedEntries) {
       try {
         await maybeQuarantineOnContradiction(directory, id, knowledgeConfig.contradiction_quarantine_threshold, knowledgeConfig.contradiction_quarantine_window_days);
@@ -60671,7 +60789,7 @@ async function runCuratorPostMortem(directory, options = {}) {
       warnings.push("Failed to collect knowledge summary.");
     }
     try {
-      const { getScanStatus } = await import("./scan-cursor-6zb8bjmp.js");
+      const { getScanStatus } = await import("./scan-cursor-rxpkxhj3.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.`);
@@ -60843,9 +60961,9 @@ var _internals71 = {
   verifyPostMortemKnowledgeActions,
   repairPostMortemActions,
   loadDefaultKnowledgeConfig: async (directory) => {
-    const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-9spe6r4w.js");
+    const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-art9xdhq.js");
     try {
-      const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-ffz00br0.js");
+      const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-h91a4abf.js");
       const loaded = loadPluginConfigWithMeta2(directory);
       return KnowledgeConfigSchema2.parse(loaded.config.knowledge ?? {});
     } catch {
@@ -60853,11 +60971,11 @@ var _internals71 = {
     }
   },
   applyCuratorKnowledgeUpdates: async (directory, recommendations, knowledgeConfig, generation) => {
-    const { applyCuratorKnowledgeUpdates: applyCuratorKnowledgeUpdates2 } = await import("./curator-0nv1asjc.js");
+    const { applyCuratorKnowledgeUpdates: applyCuratorKnowledgeUpdates2 } = await import("./curator-sxq06cgw.js");
     return applyCuratorKnowledgeUpdates2(directory, recommendations, knowledgeConfig, generation);
   },
   checkHivePromotions: async (entries2, knowledgeConfig, directory) => {
-    const { checkHivePromotions } = await import("./hive-promoter-r8z673jn.js");
+    const { checkHivePromotions } = await import("./hive-promoter-sstdct9j.js");
     return checkHivePromotions(entries2, knowledgeConfig, directory);
   },
   applyProposalTriage: async (directory, triage) => {
@@ -60866,7 +60984,7 @@ var _internals71 = {
       activateProposal,
       listSkills: listSkills2,
       sanitizeSlug
-    } = await import("./skill-generator-k6gtr0fh.js");
+    } = await import("./skill-generator-bbzwn7ny.js");
     const result = {
       approved: [],
       rejected: [],
@@ -60908,7 +61026,7 @@ var _internals71 = {
     return result;
   },
   readPriorDriftReports: async (directory) => {
-    const { readPriorDriftReports: readPriorDriftReports2 } = await import("./curator-drift-4e5nsjec.js");
+    const { readPriorDriftReports: readPriorDriftReports2 } = await import("./curator-drift-yb05q3a8.js");
     return readPriorDriftReports2(directory);
   },
   readSwarmKnowledge: (directory) => readKnowledge(resolveSwarmKnowledgePath(directory))
@@ -71179,9 +71297,9 @@ var _internals79 = {
   loadPluginConfigWithMeta,
   loadCuratorDeps: async () => {
     const [{ CuratorConfigSchema }, curator, { createCuratorLLMDelegate }] = await Promise.all([
-      import("./schema-9spe6r4w.js"),
-      import("./curator-0nv1asjc.js"),
-      import("./curator-llm-factory-cn47pa0k.js")
+      import("./schema-art9xdhq.js"),
+      import("./curator-sxq06cgw.js"),
+      import("./curator-llm-factory-r2rsrmz4.js")
     ]);
     return { CuratorConfigSchema, curator, createCuratorLLMDelegate };
   }
@@ -73629,7 +73747,7 @@ async function computeCurationDiagnostics(directory, entries2) {
   let scanCompleted = false;
   let scanRemaining = 0;
   try {
-    const { getScanStatus } = await import("./scan-cursor-6zb8bjmp.js");
+    const { getScanStatus } = await import("./scan-cursor-rxpkxhj3.js");
     const status = await getScanStatus(directory);
     scanGeneration = status.generation;
     scanCompleted = status.completed;
@@ -73639,10 +73757,10 @@ async function computeCurationDiagnostics(directory, entries2) {
   try {
     const { isLinked: isLinked2 } = await import("./knowledge-link-r7e2t5c1.js");
     if (isLinked2(directory)) {
-      const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-9spe6r4w.js");
+      const { KnowledgeConfigSchema: KnowledgeConfigSchema2 } = await import("./schema-art9xdhq.js");
       let config;
       try {
-        const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-ffz00br0.js");
+        const { loadPluginConfigWithMeta: loadPluginConfigWithMeta2 } = await import("./index-h91a4abf.js");
         const loaded = loadPluginConfigWithMeta2(directory);
         config = KnowledgeConfigSchema2.parse(loaded.config.knowledge ?? {});
       } catch {
@@ -75122,7 +75240,7 @@ async function handleDoctorCommand(directory, args) {
   const result = runConfigDoctor(config, directory, planParallelizationEnabled);
   let output;
   if (enableAutoFix && result.hasAutoFixableIssues) {
-    const { runConfigDoctorWithFixes } = await import("./config-doctor-qh3aba3c.js");
+    const { runConfigDoctorWithFixes } = await import("./config-doctor-m4c4f4j3.js");
     const fixResult = await runConfigDoctorWithFixes(directory, config, true, {
       applyLossy: true
     });
@@ -75160,7 +75278,7 @@ async function handleDoctorCommand(directory, args) {
 `;
   }
   try {
-    const { runModelPreflight } = await import("./model-preflight-0n10a18z.js");
+    const { runModelPreflight } = await import("./model-preflight-2592b0fv.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") : [];
@@ -75194,7 +75312,7 @@ async function handleDoctorCommand(directory, args) {
     }
   } catch {}
   try {
-    const { renderKnowledgeReceiptPhaseIdSection } = await import("./doctor-knowledge-receipt-phase-id-5qs5w6jz.js");
+    const { renderKnowledgeReceiptPhaseIdSection } = await import("./doctor-knowledge-receipt-phase-id-7z98yg2z.js");
     output += await renderKnowledgeReceiptPhaseIdSection(directory, enableAutoFix);
   } catch {}
   const strayDirs = detectStraySwarmDirs(directory);
@@ -77211,7 +77329,7 @@ async function handleEvidenceCommand(directory, args) {
   return formatTaskEvidenceMarkdown(evidenceData);
 }
 async function handleEvidenceSummaryCommand(directory) {
-  const { buildEvidenceSummary } = await import("./evidence-summary-service-fbhdnww1.js");
+  const { buildEvidenceSummary } = await import("./evidence-summary-service-y3g4tg5y.js");
   const artifact = await buildEvidenceSummary(directory);
   if (!artifact) {
     return "No plan found. Run `/swarm plan` to check plan status.";
@@ -84519,7 +84637,7 @@ var MAX_INCOMPLETE_TASKS = 20;
 function escapeHtml(str) {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
-function sanitizeString2(str, maxLength) {
+function sanitizeString3(str, maxLength) {
   if (!str)
     return "";
   const sanitized = String(str).replace(RTL_OVERRIDE_PATTERN, "");
@@ -84561,11 +84679,11 @@ function extractCurrentPhaseFromPlan2(plan) {
   for (const phase of plan.phases) {
     for (const task of phase.tasks) {
       if (task.status === "in_progress") {
-        currentTask = sanitizeString2(task.id, MAX_TASK_ID_LENGTH);
+        currentTask = sanitizeString3(task.id, MAX_TASK_ID_LENGTH);
       }
       if (task.status !== "completed") {
         if (incompleteTasks.length < MAX_INCOMPLETE_TASKS) {
-          incompleteTasks.push(sanitizeString2(task.id, MAX_TASK_ID_LENGTH));
+          incompleteTasks.push(sanitizeString3(task.id, MAX_TASK_ID_LENGTH));
         }
       }
     }
@@ -84584,7 +84702,7 @@ function parseSessionState(content) {
     if (state.activeAgent && typeof state.activeAgent === "object") {
       const entries2 = Object.entries(state.activeAgent);
       if (entries2.length > 0) {
-        activeAgent = sanitizeString2(entries2[entries2.length - 1][1], MAX_TASK_ID_LENGTH);
+        activeAgent = sanitizeString3(entries2[entries2.length - 1][1], MAX_TASK_ID_LENGTH);
       }
     }
     let delegationState = null;
@@ -84594,7 +84712,7 @@ function parseSessionState(content) {
       let maxDepth = 0;
       for (const [, chain] of chains) {
         if (Array.isArray(chain) && chain.length > 0) {
-          const sanitizedChain = chain.map((e) => `${sanitizeString2(e.from, MAX_TASK_ID_LENGTH)}->${sanitizeString2(e.to, MAX_TASK_ID_LENGTH)}`).join(" | ");
+          const sanitizedChain = chain.map((e) => `${sanitizeString3(e.from, MAX_TASK_ID_LENGTH)}->${sanitizeString3(e.to, MAX_TASK_ID_LENGTH)}`).join(" | ");
           activeChains.push(sanitizedChain);
           maxDepth = Math.max(maxDepth, chain.length);
         }
@@ -84613,8 +84731,8 @@ function parseSessionState(content) {
         const sess = session;
         if (sess.lastGateFailure && sess.currentTaskId) {
           pendingQA = {
-            taskId: sanitizeString2(sess.lastGateFailure.taskId, MAX_TASK_ID_LENGTH),
-            lastFailure: sanitizeString2(sess.lastGateFailure.tool, MAX_TASK_ID_LENGTH)
+            taskId: sanitizeString3(sess.lastGateFailure.taskId, MAX_TASK_ID_LENGTH),
+            lastFailure: sanitizeString3(sess.lastGateFailure.tool, MAX_TASK_ID_LENGTH)
           };
           break;
         }
@@ -84635,7 +84753,7 @@ function extractDecisions(content) {
   for (const decision of extractContextDecisions(content)) {
     const cleaned = decision.text.replace(/\u2705/g, "").trim();
     if (cleaned) {
-      const sanitized = sanitizeString2(cleaned, MAX_DECISION_LENGTH);
+      const sanitized = sanitizeString3(cleaned, MAX_DECISION_LENGTH);
       if (sanitized) {
         decisions.push(sanitized);
       }
@@ -84686,11 +84804,11 @@ async function getHandoffData(directory) {
       const phaseMatch = planMdContent.match(/^## Phase (\d+):?\s*(.+)?$/m);
       const taskMatch = planMdContent.match(/^- \[ \] (\d+\.\d+)/g);
       if (phaseMatch) {
-        planInfo.currentPhase = sanitizeString2(`Phase ${phaseMatch[1]}${phaseMatch[2] ? `: ${phaseMatch[2]}` : ""}`, MAX_TASK_ID_LENGTH);
+        planInfo.currentPhase = sanitizeString3(`Phase ${phaseMatch[1]}${phaseMatch[2] ? `: ${phaseMatch[2]}` : ""}`, MAX_TASK_ID_LENGTH);
       }
       if (taskMatch) {
         const rawTasks = taskMatch.map((t) => t.replace("- [ ] ", ""));
-        planInfo.incompleteTasks = rawTasks.map((t) => sanitizeString2(t, MAX_TASK_ID_LENGTH)).slice(0, MAX_INCOMPLETE_TASKS);
+        planInfo.incompleteTasks = rawTasks.map((t) => sanitizeString3(t, MAX_TASK_ID_LENGTH)).slice(0, MAX_INCOMPLETE_TASKS);
         if (!planInfo.currentTask && planInfo.incompleteTasks.length > 0) {
           planInfo.currentTask = planInfo.incompleteTasks[0];
         }
@@ -84700,7 +84818,7 @@ async function getHandoffData(directory) {
   const contextContent = await readSwarmFileAsync(directory, "context.md");
   const recentDecisions = _internals97.extractDecisions(contextContent);
   const rawPhaseMetrics = _internals97.extractPhaseMetrics(contextContent);
-  const phaseMetrics = sanitizeString2(rawPhaseMetrics, 1000);
+  const phaseMetrics = sanitizeString3(rawPhaseMetrics, 1000);
   let delegationState = null;
   if (sessionState?.delegationState) {
     delegationState = {
@@ -84873,7 +84991,7 @@ var _internals97 = {
   formatHandoffMarkdown,
   formatContinuationPrompt,
   escapeHtml,
-  sanitizeString: sanitizeString2,
+  sanitizeString: sanitizeString3,
   validatePlanPhases,
   extractCurrentPhaseFromPlan: extractCurrentPhaseFromPlan2,
   parseSessionState,
@@ -95108,6 +95226,36 @@ function makeAdmissionError(cause) {
   return new MemoryMigrationLockError("storage", `memory-family-migration: destination lock acquisition failed${code ? ` (${code})` : ""}`, cause);
 }
 var MAX_BACKUPS = 5;
+var MEMBER_RECENCY_KEYS = {
+  "memories.jsonl": ["updatedAt", "updated_at"],
+  "proposals.jsonl": ["reviewedAt"]
+};
+function rowRecency(row, keys) {
+  if (typeof row !== "object" || row === null)
+    return;
+  const o = row;
+  for (const key of keys) {
+    const value = o[key];
+    if (typeof value === "string") {
+      const ms2 = Date.parse(value);
+      if (!Number.isNaN(ms2))
+        return ms2;
+    }
+  }
+  return;
+}
+function rowId(row) {
+  if (typeof row !== "object" || row === null)
+    return null;
+  const o = row;
+  return typeof o.id === "string" ? o.id : null;
+}
+function rowIsTombstone(row) {
+  if (typeof row !== "object" || row === null)
+    return false;
+  const metadata = row.metadata;
+  return typeof metadata === "object" && metadata !== null && metadata.deleted === true;
+}
 function readJsonl3(filePath) {
   if (!existsSync64(filePath))
     return [];
@@ -95128,26 +95276,96 @@ function readJsonl3(filePath) {
     return [];
   }
 }
-function appendUnionById2(destination, source) {
+function appendUnionById2(destination, source, options = {}) {
+  const memberFilename = options.memberFilename ?? "memories.jsonl";
+  const recencyKeys = MEMBER_RECENCY_KEYS[memberFilename] ?? [];
   const result = [...destination];
-  const seen = new Set(result.map((r) => {
-    const o = r;
-    return typeof o.id === "string" ? o.id : JSON.stringify(r);
-  }));
+  const effectiveLast = new Map;
+  const seenRowJson = new Set;
+  for (const row of destination) {
+    const id = rowId(row);
+    if (id !== null)
+      effectiveLast.set(id, row);
+    seenRowJson.add(JSON.stringify(row));
+  }
   let added = 0;
   let skipped = 0;
+  let superseded = 0;
+  const unresolvedCollisions = [];
+  const resurrectedIds = [];
   for (const src of source) {
-    const o = src;
-    const id = typeof o.id === "string" ? o.id : JSON.stringify(src);
-    if (seen.has(id)) {
+    const id = rowId(src);
+    if (id === null) {
+      const json = JSON.stringify(src);
+      if (seenRowJson.has(json)) {
+        skipped++;
+        continue;
+      }
+      result.push(src);
+      seenRowJson.add(json);
+      added++;
+      continue;
+    }
+    const destRow = effectiveLast.get(id);
+    if (destRow === undefined) {
+      result.push(src);
+      effectiveLast.set(id, src);
+      added++;
+      continue;
+    }
+    if (JSON.stringify(destRow) === JSON.stringify(src)) {
+      skipped++;
+      continue;
+    }
+    if (recencyKeys.length === 0) {
+      unresolvedCollisions.push(id);
       skipped++;
       continue;
     }
+    const destRecency = rowRecency(destRow, recencyKeys);
+    const srcRecency = rowRecency(src, recencyKeys);
+    let sourceWins;
+    if (memberFilename === "proposals.jsonl") {
+      if (destRecency === undefined && srcRecency === undefined) {
+        unresolvedCollisions.push(id);
+        skipped++;
+        continue;
+      }
+      sourceWins = destRecency === undefined ? true : srcRecency === undefined ? false : srcRecency > destRecency;
+    } else {
+      if (destRecency === undefined || srcRecency === undefined) {
+        unresolvedCollisions.push(id);
+        skipped++;
+        continue;
+      }
+      sourceWins = srcRecency > destRecency;
+    }
+    if (!sourceWins) {
+      if (rowIsTombstone(destRow) && !rowIsTombstone(src)) {
+        superseded++;
+      } else {
+        skipped++;
+      }
+      continue;
+    }
+    if (rowIsTombstone(destRow) && !rowIsTombstone(src)) {
+      resurrectedIds.push(id);
+      result.push(src);
+      effectiveLast.set(id, src);
+      continue;
+    }
     result.push(src);
-    seen.add(id);
-    added++;
+    effectiveLast.set(id, src);
+    superseded++;
   }
-  return { merged: result, added, skipped };
+  return {
+    merged: result,
+    added,
+    skipped,
+    superseded,
+    unresolvedCollisions,
+    resurrectedIds
+  };
 }
 function appendUnionOutcomeEvents(destination, source) {
   const result = destination.map(validateOutcomeEvent);
@@ -95219,9 +95437,84 @@ async function mergeStagedSqlite(destStoragePath, stagedPath) {
         } catch {}
       }
     }
-    return { merged: await countRowsSafe(destDbPath), skipped: 0 };
+    return {
+      merged: await countRowsSafe(destDbPath),
+      skipped: 0,
+      audit: {
+        filename: "memory.db",
+        resurrectedIds: [],
+        supersededCount: 0,
+        unresolvedCollisions: []
+      }
+    };
   }
   try {
+    let tableColumns = function(schema, table) {
+      try {
+        const rows = db.query(`PRAGMA ${schema}.table_info(${table})`).all();
+        return rows.map((r) => r.name);
+      } catch {
+        return [];
+      }
+    }, mergeMemoryItemsRecency = function() {
+      const destCols = tableColumns("main", "memory_items");
+      const stagedCols = tableColumns("staged", "memory_items");
+      const shared = destCols.filter((c) => stagedCols.includes(c));
+      const shapesMatch = destCols.length > 0 && destCols.length === stagedCols.length && shared.length === destCols.length;
+      if (!shapesMatch || !shared.includes("updated_at")) {
+        const result2 = db.run("INSERT OR IGNORE INTO memory_items SELECT * FROM staged.memory_items;");
+        return {
+          merged: result2.changes ?? 0,
+          skipped: 0,
+          resurrectedIds: [],
+          supersededCount: 0
+        };
+      }
+      const overlaps = db.query(`SELECT destination.id AS id,
+				        destination.deleted AS dest_deleted,
+				        source.deleted AS src_deleted,
+				        destination.updated_at AS dest_at,
+				        source.updated_at AS src_at
+				 FROM memory_items AS destination
+				 JOIN staged.memory_items AS source ON source.id = destination.id`).all();
+      const resurrectedIds = [];
+      let supersededCount = 0;
+      for (const row of overlaps) {
+        const srcNewer = row.src_at > row.dest_at;
+        if (row.dest_deleted === 1 && row.src_deleted === 0 && srcNewer) {
+          resurrectedIds.push(row.id);
+        } else if (srcNewer) {
+          supersededCount++;
+        } else if (row.dest_deleted === 1 && row.src_deleted === 0) {
+          supersededCount++;
+        }
+      }
+      const colList = shared.join(", ");
+      const plainSet = shared.filter((c) => c !== "id" && c !== "valid_from" && c !== "supersedes_reason");
+      const setList = plainSet.map((c) => `${c} = excluded.${c}`).join(`,
+`);
+      const validFromClause = shared.includes("valid_from") ? `,
+valid_from = memory_items.valid_from` : "";
+      const supersedesClause = shared.includes("supersedes_reason") ? `,
+supersedes_reason = COALESCE(excluded.supersedes_reason, memory_items.supersedes_reason)` : "";
+      const result = db.run(`INSERT INTO memory_items (${colList})
+			SELECT ${colList} FROM staged.memory_items WHERE true
+			ON CONFLICT(id) DO UPDATE SET
+				${setList}${validFromClause}${supersedesClause}
+			WHERE excluded.updated_at > memory_items.updated_at;`);
+      const merged = result.changes ?? 0;
+      const stagedCount = db.query("SELECT COUNT(*) AS n FROM staged.memory_items").get()?.n ?? 0;
+      const newIds = Math.max(0, stagedCount - overlaps.length);
+      const updated = Math.min(Math.max(0, merged - newIds), overlaps.length);
+      const skipped = Math.max(0, overlaps.length - updated);
+      if (updated > 0) {
+        const ftsTable = db.query("SELECT COUNT(*) AS n FROM sqlite_master WHERE type='table' AND name='memory_items_fts'").get()?.n ?? 0;
+        if (ftsTable > 0) {
+          db.run("DELETE FROM memory_items_fts;");
+        }
+      }
+      return { merged, skipped, resurrectedIds, supersededCount };
+    };
     const { loadDatabaseCtor: loadDatabaseCtor2 } = await import("./sqlite-loader-amp9z7ty.js");
     const Db = loadDatabaseCtor2();
     const db = new Db(destDbPath);
@@ -95251,13 +95544,32 @@ async function mergeStagedSqlite(destStoragePath, stagedPath) {
         "memory_outcomes"
       ];
       let merged = 0;
+      let skippedCollisions = 0;
       let skippedDueToError = 0;
       const failedTables = [];
+      const unresolvedCollisions = [];
+      let resurrectedIds = [];
+      let supersededCount = 0;
       for (const table of tables) {
         try {
           const stashed = db.query(`SELECT COUNT(*) AS n FROM staged.sqlite_master WHERE type='table' AND name='${table}'`).get();
           if (!stashed || stashed.n === 0)
             continue;
+          if (table === "memory_items") {
+            const outcome = mergeMemoryItemsRecency();
+            merged += outcome.merged;
+            skippedCollisions += outcome.skipped;
+            resurrectedIds = outcome.resurrectedIds;
+            supersededCount = outcome.supersededCount;
+            continue;
+          }
+          if (table === "memory_proposals") {
+            const collided = db.query(`SELECT destination.id AS id
+								 FROM memory_proposals AS destination
+								 JOIN staged.memory_proposals AS source ON source.id = destination.id`).all();
+            for (const row of collided)
+              unresolvedCollisions.push(row.id);
+          }
           if (table === "memory_outcomes") {
             const overlaps = db.query(`SELECT destination.id,
 								        destination.event_json AS destination_json,
@@ -95288,7 +95600,16 @@ async function mergeStagedSqlite(destStoragePath, stagedPath) {
       if (failedTables.length > 0) {
         warn(`[memory-family-migration] ${failedTables.length} table(s) skipped during SQLite ATTACH merge: ${failedTables.join(", ")}`);
       }
-      return { merged, skipped: skippedDueToError };
+      return {
+        merged,
+        skipped: skippedDueToError + skippedCollisions,
+        audit: {
+          filename: "memory.db",
+          resurrectedIds,
+          supersededCount,
+          unresolvedCollisions
+        }
+      };
     } catch (error2) {
       if (transactionActive) {
         try {
@@ -95347,6 +95668,7 @@ async function migrateMemoryFamily(destRoot, sourceRoot) {
     throw makeAdmissionError(error2);
   }
   const perMember = [];
+  const auditEntries = [];
   try {
     for (const member of MEMORY_FAMILY) {
       if (member.mergeStrategy === "skip")
@@ -95355,32 +95677,92 @@ async function migrateMemoryFamily(destRoot, sourceRoot) {
       const destPath = path126.join(destStoragePath, member.filename);
       if (member.mergeStrategy === "sqlite-file-copy") {
         if (!existsSync64(srcPath)) {
-          perMember.push({ filename: member.filename, merged: 0, skipped: 0 });
+          perMember.push({
+            filename: member.filename,
+            merged: 0,
+            skipped: 0,
+            superseded: 0
+          });
           continue;
         }
         const staged = stageSqliteDb(sourceStoragePath, destStoragePath);
         if (!staged) {
-          perMember.push({ filename: member.filename, merged: 0, skipped: 0 });
+          perMember.push({
+            filename: member.filename,
+            merged: 0,
+            skipped: 0,
+            superseded: 0
+          });
           continue;
         }
-        const { merged, skipped } = await mergeStagedSqlite(destStoragePath, staged.stagedPath);
-        perMember.push({ filename: member.filename, merged, skipped });
+        const { merged, skipped, audit } = await mergeStagedSqlite(destStoragePath, staged.stagedPath);
+        perMember.push({
+          filename: member.filename,
+          merged,
+          skipped,
+          superseded: audit.supersededCount
+        });
+        if (audit.resurrectedIds.length > 0 || audit.supersededCount > 0 || audit.unresolvedCollisions.length > 0) {
+          auditEntries.push(audit);
+        }
         continue;
       }
       if (member.mergeStrategy === "append-union") {
         if (!existsSync64(srcPath)) {
-          perMember.push({ filename: member.filename, merged: 0, skipped: 0 });
+          perMember.push({
+            filename: member.filename,
+            merged: 0,
+            skipped: 0,
+            superseded: 0
+          });
           continue;
         }
         const srcData = readJsonl3(srcPath);
         const destData = readJsonl3(destPath);
-        const { merged, added, skipped } = member.filename === "outcome-events.jsonl" ? appendUnionOutcomeEvents(destData, srcData) : appendUnionById2(destData, srcData);
+        if (member.filename === "outcome-events.jsonl") {
+          const { merged: merged2, added: added2, skipped: skipped2 } = appendUnionOutcomeEvents(destData, srcData);
+          const serialized2 = serializeJsonl(merged2);
+          if (!validateSerializedJsonl(serialized2)) {
+            throw new Error(`memory-family-migration: validation failed for ${member.filename}; aborting before commit`);
+          }
+          await atomicWriteFile(destPath, serialized2);
+          perMember.push({
+            filename: member.filename,
+            merged: added2,
+            skipped: skipped2,
+            superseded: 0
+          });
+          continue;
+        }
+        const {
+          merged,
+          added,
+          skipped,
+          superseded,
+          unresolvedCollisions,
+          resurrectedIds
+        } = appendUnionById2(destData, srcData, {
+          memberFilename: member.filename
+        });
         const serialized = serializeJsonl(merged);
         if (!validateSerializedJsonl(serialized)) {
           throw new Error(`memory-family-migration: validation failed for ${member.filename}; aborting before commit`);
         }
         await atomicWriteFile(destPath, serialized);
-        perMember.push({ filename: member.filename, merged: added, skipped });
+        perMember.push({
+          filename: member.filename,
+          merged: added,
+          skipped,
+          superseded
+        });
+        if (resurrectedIds.length > 0 || superseded > 0 || unresolvedCollisions.length > 0) {
+          auditEntries.push({
+            filename: member.filename,
+            resurrectedIds,
+            supersededCount: superseded,
+            unresolvedCollisions
+          });
+        }
       }
     }
     if (isCohortRoot(sourceRoot)) {
@@ -95410,7 +95792,7 @@ async function migrateMemoryFamily(destRoot, sourceRoot) {
       } catch {}
     }
   }
-  return { perMember };
+  return { perMember, audit: auditEntries };
 }
 var _internals104 = {
   appendUnionById: appendUnionById2,
@@ -101322,15 +101704,19 @@ ${formatStatus2(directory)}`;
   evictAndCloseForRoot(localRoot);
   let totalMerged = 0;
   let totalSkipped = 0;
+  let totalSuperseded = 0;
   let familySummary = "";
+  let familyAuditNote = "";
   try {
     const result = await migrateMemoryFamily(cohortRoot, localRoot);
     for (const m of result.perMember) {
       totalMerged += m.merged;
       totalSkipped += m.skipped;
+      totalSuperseded += m.superseded;
     }
-    familySummary = result.perMember.filter((m) => m.merged > 0 || m.skipped > 0).map((m) => `    ${m.filename}: ${m.merged} merged, ${m.skipped} kept`).join(`
+    familySummary = result.perMember.filter((m) => m.merged > 0 || m.skipped > 0 || m.superseded > 0).map((m) => `    ${m.filename}: ${m.merged} merged, ${m.skipped} kept${m.superseded > 0 ? `, ${m.superseded} recency-resolved` : ""}`).join(`
 `);
+    familyAuditNote = formatFamilyAuditNote(result.audit);
   } catch (error2) {
     return `\u274C Failed to migrate the memory family into the cohort store: ${error2 instanceof Error ? error2.message : String(error2)}`;
   }
@@ -101364,20 +101750,48 @@ ${formatStatus2(directory)}`;
 (Re-linked from previous memory link "${existing.linkId}".)` : "";
   const familyNote = familySummary ? `
 ${familySummary}` : "";
+  const auditNote = familyAuditNote ? `
+${familyAuditNote}` : "";
   return [
     `\uD83D\uDD17 Linked this worktree's memory to shared cohort store "${linkId}".`,
-    `  migrated the memory family (${totalMerged} new, ${totalSkipped} already present).`,
+    `  migrated the memory family (${totalMerged} new, ${totalSkipped} already present${totalSuperseded > 0 ? `, ${totalSuperseded} resolved by recency` : ""}).`,
     `  shared at: ${cohortRoot.cohortRoot}`,
-    "All worktrees linked to this id now read and write the same memory." + relinkNote + familyNote
+    "All worktrees linked to this id now read and write the same memory." + relinkNote + familyNote + auditNote
   ].join(`
 `);
 }
+function formatFamilyAuditNote(audit) {
+  const resurrected = [...new Set(audit.flatMap((m) => m.resurrectedIds))];
+  const unresolved = [...new Set(audit.flatMap((m) => m.unresolvedCollisions))];
+  const totalSuperseded = audit.reduce((sum, m) => sum + m.supersededCount, 0);
+  const fmtIds = (ids) => {
+    const shown = ids.slice(0, 5).map((raw) => {
+      const id = sanitizeString(raw);
+      return id.length > 40 ? `${id.slice(0, 39)}\u2026` : id;
+    });
+    const more = ids.length > 5 ? ` +${ids.length - 5} more` : "";
+    return `ids: ${shown.join(", ")}${more}`;
+  };
+  const lines = [];
+  if (resurrected.length > 0) {
+    lines.push(`\u26A0 ${resurrected.length} record(s) deleted in one store were re-added from the other (${fmtIds(resurrected)}).`);
+  }
+  if (totalSuperseded > 0) {
+    lines.push(`\u2139 ${totalSuperseded} record collision(s) resolved by recency \u2014 the newer state won.`);
+  }
+  if (unresolved.length > 0) {
+    lines.push(`\u26A0 ${unresolved.length} collision(s) had no recency signal; the pre-existing version was kept (${fmtIds(unresolved)}).`);
+  }
+  return lines.join(`
+`);
+}
 async function handleMemoryUnlinkCommand(directory, args) {
   const noCopy = args.includes("--no-copy");
   const pointer = readMemoryLinkPointer(directory);
   if (!pointer) {
     return "\u2139\uFE0F Memory is not linked. Nothing to unlink.";
   }
+  let unlinkAuditNote = "";
   const cohortDir = resolveLinkDir(pointer.linkId);
   const localRoot = wrapLocalRoot(directory);
   const cohortRoot = {
@@ -101392,7 +101806,8 @@ async function handleMemoryUnlinkCommand(directory, args) {
   evictAndCloseForRoot(cohortRoot);
   if (!noCopy) {
     try {
-      await migrateMemoryFamily(localRoot, cohortRoot);
+      const result = await migrateMemoryFamily(localRoot, cohortRoot);
+      unlinkAuditNote = formatFamilyAuditNote(result.audit);
     } catch (error2) {
       return `\u274C Failed to copy the cohort memory family back to local storage: ${error2 instanceof Error ? error2.message : String(error2)}`;
     }
@@ -101406,7 +101821,8 @@ async function handleMemoryUnlinkCommand(directory, args) {
   return [
     `\uD83D\uDD13 Unlinked memory. ${copyNote}`,
     `  The shared cohort store at ${cohortRoot.cohortRoot} is NOT deleted`,
-    "  (other worktrees may still be linked to it)."
+    "  (other worktrees may still be linked to it).",
+    ...unlinkAuditNote ? [unlinkAuditNote] : []
   ].join(`
 `);
 }
@@ -101649,7 +102065,7 @@ function createCuratorLLMDelegate(directory, mode = "init", sessionId) {
     }
     const sdkOpts = signal ? { signal } : {};
     try {
-      const { getSwarmAgents: getSwarmAgents2, resolveFallbackModel: resolveFallbackModel2 } = await import("./index-1w9mc5ck.js");
+      const { getSwarmAgents: getSwarmAgents2, resolveFallbackModel: resolveFallbackModel2 } = await import("./index-r160hfq9.js");
       const createResult = await client.session.create({
         ...sessionId ? {
           body: {
@@ -103748,7 +104164,7 @@ async function cancelPrFeedbackLoopUnlocked(directory, sessionID, reason) {
     clearedEvents: []
   };
   try {
-    const { cancelPrFeedbackPublication: cancelPrFeedbackPublication2 } = await import("./pr-workflow-gate-04ypha5r.js");
+    const { cancelPrFeedbackPublication: cancelPrFeedbackPublication2 } = await import("./pr-workflow-gate-regg66xa.js");
     await cancelPrFeedbackPublication2(directory, sessionID, reason);
   } catch (err) {
     warn(`[pr-feedback-loop] cancelPrFeedbackPublication failed (fail-open): ${err instanceof Error ? err.message : String(err)}`);
@@ -120388,7 +120804,7 @@ function buildDetailedHelp(commandName, entry) {
 async function handleHelpCommand(ctx) {
   const targetCommand = ctx.args.join(" ");
   if (!targetCommand) {
-    const { buildHelpText } = await import("./index-0g2nvyn9.js");
+    const { buildHelpText } = await import("./index-ztezaknp.js");
     return buildHelpText();
   }
   const tokens = targetCommand.split(/\s+/);
@@ -120402,7 +120818,7 @@ async function handleHelpCommand(ctx) {
 > Note: \`/swarm ${resolved.key}\` is a deprecated alias for \`/swarm ${aliasTarget}\`.` : detailed;
   }
   const similar = _internals38.findSimilarCommands(targetCommand);
-  const { buildHelpText: fullHelp } = await import("./index-0g2nvyn9.js");
+  const { buildHelpText: fullHelp } = await import("./index-ztezaknp.js");
   if (similar.length > 0) {
     return `Command '/swarm ${targetCommand}' not found.
 
@@ -120730,7 +121146,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail explain": {
     handler: async (ctx) => {
-      const { handleGuardrailExplain } = await import("./guardrail-explain-ga6m57w3.js");
+      const { handleGuardrailExplain } = await import("./guardrail-explain-zhq6djgr.js");
       return handleGuardrailExplain(ctx.directory, ctx.args);
     },
     description: "Dry-run: show what the guardrails would do to a command or write target (executes nothing)",
@@ -120740,7 +121156,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail reset": {
     handler: async (ctx) => {
-      const { handleGuardrailReset } = await import("./guardrail-reset-ezjd8vtv.js");
+      const { handleGuardrailReset } = await import("./guardrail-reset-3k2x5vsr.js");
       return handleGuardrailReset(ctx.args, ctx.sessionID);
     },
     description: "Reset one exact active invocation/action circuit after repair",
@@ -120761,7 +121177,7 @@ var COMMAND_REGISTRY = {
   },
   "guardrail-log": {
     handler: async (ctx) => {
-      const { handleGuardrailLog } = await import("./guardrail-log-aekacstp.js");
+      const { handleGuardrailLog } = await import("./guardrail-log-enq4hp9f.js");
       return handleGuardrailLog(ctx.directory, ctx.args);
     },
     description: "Read the guardrail decision log (use --blocks-only for blocks)",