@cortexkit/opencode-magic-context 0.49.11 → 0.49.13

package/dist/{index-xztdf9t7.js → index-qkd9zz0p.js}

@@ -3,7 +3,7 @@ import {
   importPluginModule,
   writeForwardedLogLine2,
   log2
-} from "./index-mvvephtj.js";
+} from "./index-j75v2476.js";
 import {
   inRootAsyncContext2,
   registerSlowWriteReporter2,
@@ -18,7 +18,7 @@ import {
 import {
   bootQuietRemainingMs,
   scheduleAfterBootQuiet
-} from "./index-0jz47061.js";
+} from "./index-a8bvhwqs.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -26,7 +26,7 @@ import {
 import {
   getMagicContextStorageDir,
   getLegacyOpenCodeMagicContextStorageDir
-} from "./index-0sahzkwr.js";
+} from "./index-g2q4htwp.js";
 import {
   isOwnRpcServerRecord,
   isPidAlive,
@@ -37,13 +37,13 @@ import {
   parseRpcPortFile,
   inspectProcessesAsync,
   inspectWindowsProcessesSync
-} from "./index-q28hsbpg.js";
+} from "./index-nj7yykkx.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fb3zxn06.js";
 import {
   startMessageFtsRowidMapBackfill
-} from "./index-mp2kghkv.js";
+} from "./index-dyvbsvga.js";
 import {
   LKG_SLOT_CHUNKS_DDL,
   SESSION_REPLAY_DECISIONS_DDL,
@@ -53,12 +53,12 @@ import {
   hasPendingMigrations,
   getMainThreadMigrationBodyCount,
   runMigrations
-} from "./index-a865mj02.js";
+} from "./index-wk0n1cgt.js";
 import {
   installTagIdentityRevisionTrigger,
   ensureColumn,
   installV95PerfSchema
-} from "./index-g7jkrz0x.js";
+} from "./index-bp5083x2.js";
 import {
   resolveOpenCodeDbPath,
   hasV1MessageTables
@@ -66,10 +66,16 @@ import {
 import {
   setDatabase,
   loadToolDefinitionMeasurements
-} from "./index-9jvab89d.js";
+} from "./index-n6m03s3n.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";
+import {
+  closeQuietly
+} from "./index-8ajstryz.js";
+import {
+  logSlowWriteTransaction
+} from "./index-k29z4aqh.js";
 import {
   shouldEnforcePrivateStoragePermissions,
   ensureStorageDirectorySync,
@@ -78,12 +84,6 @@ import {
   copyStorageTreeSync,
   tightenStorageTreeSync
 } from "./index-fvnzcnww.js";
-import {
-  closeQuietly
-} from "./index-8ajstryz.js";
-import {
-  logSlowWriteTransaction
-} from "./index-150zz6fh.js";
 
 // src/features/magic-context/fail-closed-block.ts
 var FAIL_CLOSED_DOCTOR_COMMAND = "npx @cortexkit/magic-context@latest doctor";
@@ -1270,8 +1270,8 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
       startMessageFtsRowidMapBackfill(db).then(async () => {
         if (!readsOpenCodeStore)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-y3hhsbzw.js"));
-        const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-nb5hhnrt.js"));
+        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-ax05f7gr.js"));
+        const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-qjge9044.js"));
         await startMessageTimeBackfill(db, Object.assign(readRawSessionMessages, {
           readPage: readRawSessionMessagePage
         }));
@@ -2762,4 +2762,4 @@ function getDatabasePersistenceError(db) {
   return persistenceErrorByDatabase.get(db) ?? null;
 }
 
-export { FAIL_CLOSED_DOCTOR_COMMAND, formatFailClosedBlockingMessage, formatFailClosedBlockingSummary, createFailClosedBlockingError, isFailClosedBlockingError, shouldBypassFailClosedBlock, resolveAgentNameFromMessages, createFailClosedController, recordHookInitFailure, clearHookInitFailure, getLastHookInitFailure, startBootDeadline, getUnconfirmedMigrationHolders, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, BOOT_SQLITE_BUSY_TIMEOUT_MS, getDatabasePath, getPersistedSchemaVersion, setSqlitePragmaConfig, runSqliteOptimize, initializeDatabase, openDatabase, openCurrentDatabase, openDatabaseAsync, isDatabasePersisted, getDatabasePersistenceError };
+export { FAIL_CLOSED_DOCTOR_COMMAND, formatFailClosedBlockingMessage, formatFailClosedBlockingSummary, createFailClosedBlockingError, isFailClosedBlockingError, shouldBypassFailClosedBlock, resolveAgentNameFromMessages, createFailClosedController, recordHookInitFailure, clearHookInitFailure, getLastHookInitFailure, startBootDeadline, getUnconfirmedMigrationHolders, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, BOOT_SQLITE_BUSY_TIMEOUT_MS, getDatabasePath, getPersistedSchemaVersion, enforceSchemaFence, setSqlitePragmaConfig, runSqliteOptimize, initializeDatabase, openDatabase, openCurrentDatabase, openDatabaseAsync, isDatabasePersisted, getDatabasePersistenceError };

package/dist/index-saews2s3.js

@@ -0,0 +1,229 @@
+import {
+  getHarness2
+} from "./index-pavzsdc6.js";
+import {
+  isUserHomeDirectory
+} from "./index-a8bvhwqs.js";
+import {
+  logSlowWriteTransaction
+} from "./index-k29z4aqh.js";
+
+// src/features/magic-context/session-project-storage.ts
+var SESSION_CHUNK_REPAIR_BATCH_SIZE = 100;
+var upsertSessionProjectStatements = new WeakMap;
+var repairSessionChunkProjectStatements = new WeakMap;
+var misScopedProjectChunkStatements = new WeakMap;
+var MIS_SCOPED_PROJECT_CHUNK_IDS_SQL = `
+    SELECT e.id FROM compartment_chunk_embeddings e
+    JOIN session_projects sp ON sp.session_id = e.session_id AND sp.harness = e.harness
+    WHERE e.project_path = ? AND sp.project_path <> e.project_path
+    UNION ALL
+    SELECT e.id FROM session_projects sp
+    JOIN compartment_chunk_embeddings e ON e.session_id = sp.session_id
+    WHERE sp.project_path = ? AND e.harness = sp.harness AND e.project_path <> sp.project_path`;
+function getUpsertSessionProjectStatement(db) {
+  let stmt = upsertSessionProjectStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`INSERT INTO session_projects (session_id, harness, project_path, updated_at)
+             VALUES (?, ?, ?, ?)
+             ON CONFLICT(session_id, harness) DO UPDATE SET
+                 project_path = excluded.project_path,
+                 updated_at = excluded.updated_at
+             WHERE session_projects.project_path <> excluded.project_path`);
+    upsertSessionProjectStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getRepairSessionChunkProjectStatement(db) {
+  let stmt = repairSessionChunkProjectStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`UPDATE compartment_chunk_embeddings
+             SET project_path = ?
+             WHERE id IN (
+                 SELECT id
+                 FROM compartment_chunk_embeddings
+                 WHERE session_id = ?
+                   AND harness = ?
+                   AND project_path <> ?
+                 LIMIT ?
+             )`);
+    repairSessionChunkProjectStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function findMisScopedCompartmentChunkEmbeddingIdsForProject(db, projectPath) {
+  return db.prepare(`SELECT id FROM (${MIS_SCOPED_PROJECT_CHUNK_IDS_SQL}) LIMIT 25`).all(projectPath, projectPath).map(({ id }) => id);
+}
+function recordSessionProjectIdentity(db, sessionId, projectPath) {
+  if (!sessionId || !projectPath)
+    return;
+  if (!projectPath.startsWith("git:") && !projectPath.startsWith("dir:") && isUserHomeDirectory(projectPath))
+    return;
+  const harness = getHarness2();
+  const now = Date.now();
+  let previousProjectPath;
+  db.transaction(() => {
+    const existing = db.prepare("SELECT project_path FROM session_projects WHERE session_id = ? AND harness = ?").get(sessionId, harness);
+    previousProjectPath = existing?.project_path;
+    getUpsertSessionProjectStatement(db).run(sessionId, harness, projectPath, now);
+    getRepairSessionChunkProjectStatement(db).run(projectPath, sessionId, harness, projectPath, SESSION_CHUNK_REPAIR_BATCH_SIZE);
+  }).immediate();
+  return previousProjectPath === projectPath ? undefined : { previousProjectPath, projectPath };
+}
+function hasRecordedSessionProjectIdentity(db, sessionId) {
+  const row = db.prepare("SELECT 1 AS found FROM session_projects WHERE session_id = ? AND harness = ?").get(sessionId, getHarness2());
+  return row?.found === 1;
+}
+function repairMisScopedCompartmentChunkEmbeddingsForProject(db, projectPath, ids = findMisScopedCompartmentChunkEmbeddingIdsForProject(db, projectPath)) {
+  if (!projectPath || ids.length === 0)
+    return 0;
+  return db.prepare(`UPDATE compartment_chunk_embeddings
+        SET project_path = (SELECT sp.project_path FROM session_projects sp
+            WHERE sp.session_id = compartment_chunk_embeddings.session_id
+              AND sp.harness = compartment_chunk_embeddings.harness)
+        WHERE id IN (${ids.map(() => "?").join(",")}) AND EXISTS (
+            SELECT 1 FROM session_projects sp
+            WHERE sp.session_id = compartment_chunk_embeddings.session_id
+              AND sp.harness = compartment_chunk_embeddings.harness
+              AND sp.project_path <> compartment_chunk_embeddings.project_path
+              AND (sp.project_path = ? OR compartment_chunk_embeddings.project_path = ?)
+        )`).run(...ids, projectPath, projectPath).changes;
+}
+
+// src/features/magic-context/git-commits/sweep-coordinator.ts
+var GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
+var GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
+var GIT_SWEEP_NON_INDEXABLE_REPROBE_MS = 24 * 60 * 60 * 1000;
+var GIT_SWEEP_LEASE_RENEWAL_MS = 60 * 1000;
+function runImmediate(db, body) {
+  db.exec("BEGIN IMMEDIATE");
+  const transactionStartedAt = performance.now();
+  let committed = false;
+  try {
+    const result = body();
+    db.exec("COMMIT");
+    committed = true;
+    logSlowWriteTransaction("git_sweep_lease", transactionStartedAt);
+    return result;
+  } finally {
+    if (!committed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
+}
+function rowToState(row) {
+  return {
+    projectPath: row.project_path,
+    leaseHolder: row.lease_holder,
+    leaseExpiresAt: row.lease_expires_at,
+    lastSweptAt: row.last_swept_at
+  };
+}
+function getGitSweepCoordinatorState(db, projectPath) {
+  const row = db.prepare(`SELECT project_path, lease_holder, lease_expires_at, last_swept_at
+             FROM git_sweep_coordinator
+             WHERE project_path = ?`).get(projectPath);
+  return row ? rowToState(row) : null;
+}
+function acquireGitSweepLease(db, projectPath, holderId, options = {}) {
+  const cooldownMs = options.cooldownMs ?? GIT_SWEEP_COOLDOWN_MS;
+  const leaseTtlMs = options.leaseTtlMs ?? GIT_SWEEP_LEASE_TTL_MS;
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const row = getGitSweepCoordinatorState(db, projectPath);
+    if (row?.leaseHolder && row.leaseExpiresAt !== null && row.leaseExpiresAt > now) {
+      return {
+        acquired: false,
+        projectPath,
+        reason: "lease_active",
+        leaseHolder: row.leaseHolder,
+        leaseExpiresAt: row.leaseExpiresAt,
+        lastSweptAt: row.lastSweptAt,
+        nextAllowedAt: null
+      };
+    }
+    if (!options.ignoreCooldown && row?.lastSweptAt !== null && row?.lastSweptAt !== undefined) {
+      const nextAllowedAt = row.lastSweptAt + cooldownMs;
+      if (nextAllowedAt > now) {
+        return {
+          acquired: false,
+          projectPath,
+          reason: "cooldown_active",
+          leaseHolder: row.leaseHolder,
+          leaseExpiresAt: row.leaseExpiresAt,
+          lastSweptAt: row.lastSweptAt,
+          nextAllowedAt
+        };
+      }
+    }
+    const leaseExpiresAt = now + leaseTtlMs;
+    db.prepare(`INSERT INTO git_sweep_coordinator (
+                 project_path,
+                 lease_holder,
+                 lease_expires_at,
+                 last_swept_at
+             ) VALUES (?, ?, ?, NULL)
+             ON CONFLICT(project_path) DO UPDATE SET
+                 lease_holder = excluded.lease_holder,
+                 lease_expires_at = excluded.lease_expires_at`).run(projectPath, holderId, leaseExpiresAt);
+    return {
+      acquired: true,
+      projectPath,
+      holderId,
+      acquiredAt: now,
+      leaseExpiresAt
+    };
+  });
+}
+function renewGitSweepLease(db, projectPath, holderId, leaseTtlMs = GIT_SWEEP_LEASE_TTL_MS) {
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const leaseExpiresAt = now + leaseTtlMs;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_expires_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(leaseExpiresAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function markGitSweepSuccessAndRelease(db, projectPath, holderId) {
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(now, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function parkGitSweepNonIndexable(db, projectPath, holderId, reprobeMs = GIT_SWEEP_NON_INDEXABLE_REPROBE_MS) {
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const sweptAt = now + reprobeMs - GIT_SWEEP_COOLDOWN_MS;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(sweptAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function releaseGitSweepLease(db, projectPath, holderId) {
+  runImmediate(db, () => {
+    db.prepare(`UPDATE git_sweep_coordinator
+             SET lease_holder = NULL,
+                 lease_expires_at = NULL
+             WHERE project_path = ?
+               AND lease_holder = ?`).run(projectPath, holderId);
+  });
+}
+
+export { findMisScopedCompartmentChunkEmbeddingIdsForProject, recordSessionProjectIdentity, hasRecordedSessionProjectIdentity, repairMisScopedCompartmentChunkEmbeddingsForProject, GIT_SWEEP_LEASE_RENEWAL_MS, acquireGitSweepLease, renewGitSweepLease, markGitSweepSuccessAndRelease, parkGitSweepNonIndexable, releaseGitSweepLease };

package/dist/{index-kkvxnbt8.js → index-sj89f3b0.js}

@@ -6,7 +6,7 @@ import {
   getTemporalDecisions,
   freezeTemporalDecisions,
   stableStringify
-} from "./index-g7jkrz0x.js";
+} from "./index-bp5083x2.js";
 import {
   protectedToolTagNumbers,
   byteSize,
@@ -47,6 +47,7 @@ import {
   backfillTagTokenCounts2,
   insertTag2,
   updateTagStatus2,
+  markTagDropped2,
   markWhitespaceAssistantTagInert2,
   getInertWhitespaceAssistantTags2,
   updateTagDropMode2,
@@ -69,16 +70,16 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-f8cn4xqa.js";
+} from "./index-fwefky9w.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
   estimateTokens
-} from "./index-gjvjh960.js";
+} from "./index-hqkczed7.js";
 import {
   log2,
   sessionLog2
-} from "./index-mvvephtj.js";
+} from "./index-j75v2476.js";
 import {
   inRootAsyncContext2,
   getTagIdentityWriteGeneration2,
@@ -88,12 +89,12 @@ import {
 } from "./index-wafzvyhg.js";
 import {
   isValidLanguageCode
-} from "./index-w28y7d0z.js";
+} from "./index-1sarmj9z.js";
 import {
   getProjectEmbeddingSnapshot2,
   embedTextForProject2,
   embedBatchForProject2
-} from "./index-se1w3v2m.js";
+} from "./index-y1qysm3q.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";
@@ -189,7 +190,7 @@ import {
   extractToolCallObservation,
   ToolMutationBatch,
   createToolDropTarget
-} from "./index-qr1mkc2y.js";
+} from "./index-b16gpywn.js";
 import {
   getMaxM0MutationId,
   rememberUnpublishedAutoSearchNoHint,
@@ -201,6 +202,7 @@ import {
   advanceToolReclaimWatermark,
   requestPendingMaterialization,
   pendingMaterializationOrigin,
+  hasPendingMaterializationOrigin,
   clearPendingMaterialization,
   saveSourceContent,
   replaceSourceContent,
@@ -223,31 +225,31 @@ import {
   peekNoteNudgeText,
   markNoteNudgeDelivered,
   getActiveCompartmentRun
-} from "./index-z7avx6rw.js";
+} from "./index-2jr1smmh.js";
 import {
   runSessionWarmupWorker
-} from "./index-angx1s0k.js";
+} from "./index-mmfa86mt.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-bzp9s8z2.js";
+} from "./index-1d289pq2.js";
 import {
   BoundedSessionMap
-} from "./index-0j6crjgh.js";
+} from "./index-v13skev1.js";
 import {
   renderUserFacingFailure
-} from "./index-yhrrx7qa.js";
-import {
-  getErrorMessage
-} from "./index-y8v6yerm.js";
+} from "./index-bxdg2nbt.js";
 import {
   normalizeProtectedToolName,
   mergeProtectedTools
 } from "./index-d9vfe7xq.js";
+import {
+  getErrorMessage
+} from "./index-y8v6yerm.js";
 import {
   logSlowWriteTransaction
-} from "./index-150zz6fh.js";
+} from "./index-k29z4aqh.js";
 
 // src/features/magic-context/tagger.ts
 var TOOL_COMPOSITE_KEY_SEP = "\x00";
@@ -2829,13 +2831,20 @@ function foldBustsServedPrefix(reason, before, after) {
   return CACHE_LOSING_FOLD_REASONS.has(reason ?? "") || foldChangesServedPrefix(before, after);
 }
 function prepareLegacyToolSkeletonConversions(db, sessionId, targets, options = {}) {
-  const readRows = (connection) => connection.prepare(`SELECT tag_number AS tagNumber, drop_mode AS dropMode, message_id AS callId
-               FROM tags
-              WHERE session_id = ? AND type = 'tool' AND status = 'dropped'
-                AND drop_mode IN ('truncated', 'full')
-              ORDER BY tag_number`).all(sessionId);
+  const candidates = [...targets.keys()].sort((a, b) => a - b);
+  const readRows = (connection) => {
+    if (candidates.length === 0)
+      return [];
+    const statement = connection.prepare(`SELECT tag_number AS tagNumber, drop_mode AS dropMode, message_id AS callId
+             FROM tags WHERE session_id = ? AND tag_number = ?
+               AND type = 'tool' AND status = 'dropped'
+               AND drop_mode IN ('truncated', 'full')`);
+    return candidates.flatMap((tagNumber) => {
+      const row = statement.get(sessionId, tagNumber);
+      return row ? [row] : [];
+    });
+  };
   const rows = readRows(db);
-  const identity = JSON.stringify(rows);
   const converted = new Map;
   for (const row of rows) {
     const target = targets.get(row.tagNumber);
@@ -2856,7 +2865,10 @@ function prepareLegacyToolSkeletonConversions(db, sessionId, targets, options =
   }
   return {
     converted,
-    isCurrent: (connection) => JSON.stringify(readRows(connection)) === identity,
+    isCurrent: (connection) => {
+      const current = readRows(connection);
+      return current.length === rows.length && current.every((row, index) => row.tagNumber === rows[index].tagNumber && row.dropMode === rows[index].dropMode && row.callId === rows[index].callId);
+    },
     persist: (connection) => {
       for (const [tagNumber, mode] of converted)
         updateTagDropMode2(connection, sessionId, tagNumber, mode);
@@ -2943,9 +2955,7 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
           try {
             db.transaction(() => {
               startedAt = performance.now();
-              if (mode)
-                updateTagDropMode2(db, sessionId, pendingOp.tagId, mode);
-              updateTagStatus2(db, sessionId, pendingOp.tagId, "dropped");
+              markTagDropped2(db, sessionId, pendingOp.tagId, mode);
               if (!synthetic)
                 removePendingOp(db, sessionId, pendingOp.tagId);
             }).immediate();
@@ -5279,6 +5289,25 @@ function finalizeMessageRepresentation2(messages, resolvedProviderID, options) {
   }
   return { clearedParts, mergedReasoningParts };
 }
+function legacyPublishedHeadChanged(args) {
+  if (!args.pendingCompartmentInjection || !args.readLastServedMessages)
+    return false;
+  const served = args.readLastServedMessages();
+  if (served === null)
+    return true;
+  const previous = served[0];
+  if (!Array.isArray(previous?.parts) || !args.pendingCompartmentInjection)
+    return false;
+  const text = previous.parts.find((part) => typeof part === "object" && part !== null && ("type" in part) && part.type === "text" && ("text" in part))?.text;
+  if (typeof text !== "string")
+    return false;
+  const block = `<session-history>
+${args.pendingCompartmentInjection.block}
+</session-history>`;
+  return text !== block && !text.startsWith(`${block}
+
+`);
+}
 async function runPostTransformPhase2(args) {
   const tPostprocessSetup = performance.now();
   const compactionOff = args.compactionOff === true;
@@ -5489,11 +5518,6 @@ async function runPostTransformPhase2(args) {
     }
     sessionLog2(args.sessionId, `m[0] HARD fold decision: reason=${m0MaterializeReason ?? foldDueDecision.reason ?? (foldExecutedThisPass ? "drift" : "soft_refresh")} executed=${foldExecutedThisPass} bustsServedPrefix=${foldBustsServedPrefixThisPass}`);
   }
-  if (args.normalizeRecoveryTail && (foldBustsServedPrefixThisPass || firstRenderBust)) {
-    args.normalizeRecoveryTail();
-    args.tags = getTagsBySession2(args.db, args.sessionId);
-    newTargets = protectNewTagMutations(args.messages, args.targets, retainedThinking, args.thinkingBindingRecoveryEnabledForModel === true);
-  }
   logTransformTiming(args.sessionId, "pp.prefixPreflight", tPostprocessSetup, `foldExecuted=${foldExecutedThisPass} m1Refreshed=${publishedM1RefreshedThisPass}`);
   const tPassDecisions = performance.now();
   const frontToolCandidates = args.tags.filter((tag) => tag.type === "tool" && tag.status === "active" && args.targets.get(tag.tagNumber)?.canDrop?.());
@@ -5520,13 +5544,18 @@ async function runPostTransformPhase2(args) {
     subagentExecute: !args.fullFeatureMode && args.schedulerDecision === "execute",
     hardFold: foldBustsServedPrefixThisPass || firstRenderBust || idleExpiryRebuild,
     force: emergencyDropEligible && (args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0),
-    explicitFlush: isExplicitFlush || deferredMaterialize && !prefixPreflightFailed,
-    publishedHistory: publishedM1RefreshedThisPass || !m0M1EnabledForFold && (args.pendingCompartmentInjection?.compartmentCount ?? 0) > 0 && (args.historyRebuiltThisPass || args.rebuiltHistoryFromInitialPrepare || args.canConsumeDeferredLate && args.deferredHistoryWasPendingAtPassStart)
+    explicitFlush: isExplicitFlush && hasPendingMaterializationOrigin(args.pendingMaterializationSessions, args.sessionId, "user_flush"),
+    publishedHistory: !prefixPreflightFailed && (publishedM1RefreshedThisPass || !m0M1EnabledForFold && (args.pendingCompartmentInjection?.compartmentCount ?? 0) > 0 && legacyPublishedHeadChanged(args))
   };
   const publishedWorkDrainAllowed = !compactionOff && (!activeThinkingPrefixHold || firstRenderBust || idleExpiryRebuild || emergencyDropEligible) && hasReclaimRide(rideSignals);
   const shouldApplyPendingOps = publishedWorkDrainAllowed;
   const shouldRunHeuristics = publishedWorkDrainAllowed && (rideSignals.publishedHistory || materializationRequested || forceMaterialization || foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || emergencyDropEligible || args.schedulerDecision === "execute" && (!alreadyRanThisTurn || !args.fullFeatureMode));
   const isCacheBustingPass = publishedWorkDrainAllowed;
+  if (args.normalizeRecoveryTail && isCacheBustingPass) {
+    args.normalizeRecoveryTail();
+    args.tags = getTagsBySession2(args.db, args.sessionId);
+    newTargets = protectNewTagMutations(args.messages, args.targets, retainedThinking, args.thinkingBindingRecoveryEnabledForModel === true);
+  }
   const reclaimDistance = isCacheBustingPass ? toolReclaimDistanceEntries(args.messages, args.targets) : [];
   const canEditWholePrefix = isCacheBustingPass && !activeThinkingPrefixHold;
   const previousTemporalDecisions = args.temporalCandidates && !compactionOff ? new Map([

package/dist/{index-jw4gbfkv.js → index-v10f1rjv.js}

@@ -3,21 +3,21 @@ import {
 } from "./index-pavzsdc6.js";
 import {
   getMagicContextStorageDir
-} from "./index-0sahzkwr.js";
+} from "./index-g2q4htwp.js";
 import {
   log2,
   sessionLog2
-} from "./index-mvvephtj.js";
+} from "./index-j75v2476.js";
 import {
   localBudget,
   calibrationForModelKey
 } from "./index-1zx87sdm.js";
-import {
-  writeStorageFileAtomicSync
-} from "./index-fvnzcnww.js";
 import {
   modelRefLookupOrder
 } from "./index-avwt563y.js";
+import {
+  writeStorageFileAtomicSync
+} from "./index-fvnzcnww.js";
 
 // src/shared/models-dev-cache.ts
 import { readFileSync } from "node:fs";

package/dist/{index-0j6crjgh.js → index-v13skev1.js}

@@ -5,7 +5,7 @@ import {
   tagRevisionKey,
   tagIdentityRevisionKey,
   deleteTagIdentityRevisions
-} from "./index-g7jkrz0x.js";
+} from "./index-bp5083x2.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -13,30 +13,36 @@ import {
   removeSystemReminders,
   hasMeaningfulUserText2,
   extractTexts2
-} from "./index-gjvjh960.js";
+} from "./index-hqkczed7.js";
 import {
   getMagicContextStorageDir
-} from "./index-0sahzkwr.js";
+} from "./index-g2q4htwp.js";
 import {
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2
 } from "./index-wafzvyhg.js";
 import {
   cleanUserText2
-} from "./index-qr1mkc2y.js";
+} from "./index-b16gpywn.js";
 import {
   recordMessageFtsRowid,
   recordIndexedMessageTime,
   messageFtsOrdinalRangeIsMapped,
   deleteUnmappedMessageFtsRows
-} from "./index-mp2kghkv.js";
+} from "./index-dyvbsvga.js";
 import {
   isPidAlive,
   readProcessStartTime
-} from "./index-q28hsbpg.js";
+} from "./index-nj7yykkx.js";
 import {
   deleteChunkEmbedBackoffForSession
-} from "./index-9159kk15.js";
+} from "./index-3kx0kg0f.js";
+import {
+  closeQuietly
+} from "./index-8ajstryz.js";
+import {
+  logSlowWriteTransaction
+} from "./index-k29z4aqh.js";
 import {
   ensurePrivateStorageDirectorySync,
   writeStorageFileSync,
@@ -44,12 +50,6 @@ import {
   syncStorageDirectorySync,
   writeStorageFileDurableAtomicSync
 } from "./index-fvnzcnww.js";
-import {
-  closeQuietly
-} from "./index-8ajstryz.js";
-import {
-  logSlowWriteTransaction
-} from "./index-150zz6fh.js";
 
 // src/shared/bounded-session-map.ts
 class BoundedSessionMap {