@cortexkit/opencode-magic-context 0.48.0 → 0.49.1

package/dist/v2/{server-7wwc2nga.js → server-1fszbabv.js}

@@ -1,11 +1,11 @@
-import {
-  DEFAULT_LOCAL_EMBEDDING_MODEL
-} from "./server-zm570tr2.js";
 import {
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2,
   isTransientSqliteError2
 } from "./server-kb9nn0a0.js";
+import {
+  DEFAULT_LOCAL_EMBEDDING_MODEL
+} from "./server-cw6521wn.js";
 import {
   isEmbeddingHostBusy2
 } from "./server-qt1qqasc.js";
@@ -15,16 +15,16 @@ import {
 import {
   sanitizeDiagnosticText,
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   estimateTokens
-} from "./server-1r6pmz4f.js";
+} from "./server-kzns2hbz.js";
 import {
   SYNAPSE_DEFAULT_MODEL,
   isSynapseEmbeddingTruncated,
   getSynapseBatchRequestKey,
   SynapseEmbeddingProvider
-} from "./server-4k748ke6.js";
+} from "./server-hb6xhh9q.js";
 import {
   CHUNK_WINDOW_SAFETY_RATIO,
   normalizeCompartmentChunkMaxInputTokens,
@@ -40,7 +40,7 @@ import {
   loadUnembeddedSessionChunkCandidatesPolite,
   countSessionCompartmentEmbedCoverage,
   countUnembeddedSessionCompartmentsPolite
-} from "./server-ezhze64f.js";
+} from "./server-s2st631p.js";
 import {
   saveEmbeddingIfHashMatches,
   getMemoryEmbedCoverage,
@@ -52,14 +52,35 @@ import {
   resolveEmbeddingTextPrefixes,
   getEmbeddingProviderIdentity,
   LocalEmbeddingProvider
-} from "./server-vqpf3167.js";
+} from "./server-ras2sxnc.js";
 import {
   isUserHomeDirectory,
   setBootQuietPeriodForTests
-} from "./server-yczc713m.js";
+} from "./server-8xmq9h3f.js";
 import {
   logSlowWriteTransaction
-} from "./server-aan4q8mx.js";
+} from "./server-3t0q2cqx.js";
+
+// src/shared/background-batch-drain.ts
+async function drainBackgroundBatches(step, options = {}) {
+  const now = options.now ?? (() => performance.now());
+  const deadline = now() + (options.budgetMs ?? 2000);
+  const yieldFn = options.yieldFn ?? (() => new Promise((resolve) => setTimeout(resolve, 0)));
+  let batches = 0;
+  while (now() < deadline) {
+    try {
+      if (!withoutSqliteTransformPass2(() => withSqliteBackgroundWriter2(step)))
+        break;
+    } catch (error) {
+      if (isTransientSqliteError2(error))
+        break;
+      throw error;
+    }
+    batches++;
+    await yieldFn();
+  }
+  return batches;
+}
 
 // src/features/magic-context/storage-embedding-measurements.ts
 import { createHash } from "node:crypto";
@@ -121,27 +142,6 @@ function pruneSynapseBatchLedgerForProject(db, projectIdentity, ttlMs = SYNAPSE_
 // src/features/magic-context/project-embedding-registry.ts
 import { createHash as createHash2, randomUUID } from "node:crypto";
 
-// src/shared/background-batch-drain.ts
-async function drainBackgroundBatches(step, options = {}) {
-  const now = options.now ?? (() => performance.now());
-  const deadline = now() + (options.budgetMs ?? 2000);
-  const yieldFn = options.yieldFn ?? (() => new Promise((resolve) => setTimeout(resolve, 0)));
-  let batches = 0;
-  while (now() < deadline) {
-    try {
-      if (!withoutSqliteTransformPass2(() => withSqliteBackgroundWriter2(step)))
-        break;
-    } catch (error) {
-      if (isTransientSqliteError2(error))
-        break;
-      throw error;
-    }
-    batches++;
-    await yieldFn();
-  }
-  return batches;
-}
-
 // src/features/magic-context/git-commits/storage-git-commit-embeddings.ts
 var saveStatements = new WeakMap;
 var loadProjectStatements = new WeakMap;
@@ -3020,4 +3020,4 @@ function _resetProjectEmbeddingRegistryForTests2() {
   setBootQuietPeriodForTests(null);
 }
 
-export { recordEmbeddingMeasurement, drainBackgroundBatches, saveCommitEmbedding, loadProjectCommitEmbeddings, loadUnembeddedCommits, countEmbeddedCommits, upsertCommits, getLatestIndexedCommitSha, enforceProjectCap, GIT_SWEEP_LEASE_RENEWAL_MS, acquireGitSweepLease, renewGitSweepLease, markGitSweepSuccessAndRelease, parkGitSweepNonIndexable, releaseGitSweepLease, OpenAICompatibleEmbeddingProvider, recordSessionProjectIdentity, hasRecordedSessionProjectIdentity, describeShadowBackfillWriteRefusal2, listShadowBackfillStalls2, getShadowBackfillStopReason2, markProjectLoadUntrusted2, contentSha2562, drainProjectEmbeddingIdentityMaintenance2, drainStaleEmbeddingIdentitiesForProject2, registerProjectEmbedding2, registerProjectShadowEmbedding2, getShadowEmbeddingMeasurementCohort2, getPrimaryEmbeddingMeasurementCohort2, embedShadowTextForProject2, enqueueShadowEmbeddingItems2, getShadowBackfillRemaining2, flushShadowEmbeddingBacklog2, registerProjectInObservationMode2, unregisterProjectShadowEmbedding2, unregisterProjectEmbedding2, getProjectEmbeddingSnapshot2, installProjectEmbeddingSearchBridge2, getProjectChunkEmbeddingModelId2, getProjectEmbeddingMaxInputTokens2, embedTextForProject2, embedBatchForProject2, embedItemsForProject2, embedUnembeddedMemoriesForProject2, embedUnembeddedMemoriesForProjectOutcome2, drainCommitBacklogForProject2, embedUnembeddedCompartmentChunksForProject2, embedSessionCompartmentChunks2, getEmbeddingCoverageStatus2, sweepAllRegisteredProjects2, _setTestProviderFactoryForProject2, _resetProjectEmbeddingRegistryForTests2 };
+export { drainBackgroundBatches, recordEmbeddingMeasurement, saveCommitEmbedding, loadProjectCommitEmbeddings, loadUnembeddedCommits, countEmbeddedCommits, upsertCommits, getLatestIndexedCommitSha, enforceProjectCap, GIT_SWEEP_LEASE_RENEWAL_MS, acquireGitSweepLease, renewGitSweepLease, markGitSweepSuccessAndRelease, parkGitSweepNonIndexable, releaseGitSweepLease, OpenAICompatibleEmbeddingProvider, recordSessionProjectIdentity, hasRecordedSessionProjectIdentity, describeShadowBackfillWriteRefusal2, listShadowBackfillStalls2, getShadowBackfillStopReason2, markProjectLoadUntrusted2, contentSha2562, drainProjectEmbeddingIdentityMaintenance2, drainStaleEmbeddingIdentitiesForProject2, registerProjectEmbedding2, registerProjectShadowEmbedding2, getShadowEmbeddingMeasurementCohort2, getPrimaryEmbeddingMeasurementCohort2, embedShadowTextForProject2, enqueueShadowEmbeddingItems2, getShadowBackfillRemaining2, flushShadowEmbeddingBacklog2, registerProjectInObservationMode2, unregisterProjectShadowEmbedding2, unregisterProjectEmbedding2, getProjectEmbeddingSnapshot2, installProjectEmbeddingSearchBridge2, getProjectChunkEmbeddingModelId2, getProjectEmbeddingMaxInputTokens2, embedTextForProject2, embedBatchForProject2, embedItemsForProject2, embedUnembeddedMemoriesForProject2, embedUnembeddedMemoriesForProjectOutcome2, drainCommitBacklogForProject2, embedUnembeddedCompartmentChunksForProject2, embedSessionCompartmentChunks2, getEmbeddingCoverageStatus2, sweepAllRegisteredProjects2, _setTestProviderFactoryForProject2, _resetProjectEmbeddingRegistryForTests2 };

package/dist/v2/{server-k228xhjg.js → server-2htmbqbv.js}

@@ -4,7 +4,31 @@ import {
 } from "./server-kb9nn0a0.js";
 import {
   logSlowWriteTransaction
-} from "./server-aan4q8mx.js";
+} from "./server-3t0q2cqx.js";
+
+// src/shared/project-directory-key.ts
+import { realpathSync } from "node:fs";
+import path from "node:path";
+function projectDirectoryKey(directory) {
+  const slashed = directory.replaceAll("\\", "/").replace(/^\/\/\?\/UNC\//i, "//").replace(/^\/\/\?\//, "");
+  if (/^[a-z]:\//i.test(slashed) || slashed.startsWith("//")) {
+    return path.win32.normalize(slashed).replaceAll("\\", "/").replace(/\/$/, "").toLowerCase();
+  }
+  return path.resolve(directory);
+}
+function sameProjectDirectory(a, b) {
+  if (a.length === 0 || b.length === 0)
+    return false;
+  return projectDirectoryKey(a) === projectDirectoryKey(b);
+}
+var realpathForCanonicalDirectory = (directory) => realpathSync.native(directory);
+function canonicalProjectDirectory(directory) {
+  let resolved = directory;
+  try {
+    resolved = realpathForCanonicalDirectory(directory);
+  } catch {}
+  return projectDirectoryKey(resolved);
+}
 
 // src/features/magic-context/message-fts-rowid-map.ts
 import { createHash } from "node:crypto";
@@ -168,4 +192,4 @@ function deleteUnmappedMessageFtsRows(db, sessionIds) {
          WHERE rowid > ? AND session_id IN (${placeholders})`).run(state.watermarkRowid, ...sessionIds);
 }
 
-export { recordMessageFtsRowid, recordIndexedMessageTime, startMessageFtsRowidMapBackfill, messageFtsOrdinalRangeIsMapped, deleteUnmappedMessageFtsRows };
+export { projectDirectoryKey, sameProjectDirectory, canonicalProjectDirectory, recordMessageFtsRowid, recordIndexedMessageTime, startMessageFtsRowidMapBackfill, messageFtsOrdinalRangeIsMapped, deleteUnmappedMessageFtsRows };

package/dist/v2/{server-aan4q8mx.js → server-3t0q2cqx.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 
 // src/shared/write-transaction-timing.ts
 var SLOW_WRITE_TRANSACTION_THRESHOLD_MS = 1000;

package/dist/v2/{server-686jg6eb.js → server-4c7jt8gq.js}

@@ -4,13 +4,13 @@ import {
 } from "./server-1zx87sdm.js";
 import {
   estimateTokens
-} from "./server-1r6pmz4f.js";
+} from "./server-kzns2hbz.js";
 import {
   getHarness2
 } from "./server-pavzsdc6.js";
 import {
   sessionLog2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   getTagIdentityWriteGeneration2,
   getSqliteDatabasePath2
@@ -19,7 +19,7 @@ import {
   stableStringify,
   tagOrderConstraintIndex,
   tagIdentityRevisionKey
-} from "./server-52awr2mw.js";
+} from "./server-6byqfbqf.js";
 import {
   DEFAULT_PROTECTED_TOOLS,
   normalizeProtectedToolName,
@@ -62,10 +62,34 @@ function protectedToolTokenCount(tags, counts, calibration) {
 var encoder = new TextEncoder;
 var TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
 var MALFORMED_TAG_PREFIX_REGEX = /^(?:§\d+">§(?:\d+§)?\s*)+/;
+var DANGLING_TAG_GLOBAL_REGEX = /\u00a7\d+(?!\.\d)[^\s\u00a7\w.]?/g;
 var DANGLING_TAG_PREFIX_REGEX = /^(?:\u00a7\d+(?!\.\d)[^\s\u00a7\w.]?\s*)+/;
+var COMPLETE_TAG_PAIR_GLOBAL_REGEX = /\u00a7\d+\u00a7/g;
+var MALFORMED_TAG_GLOBAL_REGEX = /\u00a7\d+">(?:\u00a7(?:\d+\u00a7)?)?/g;
+var STRAY_SECTION_CHAR_REGEX = /\u00a7/g;
 function stripWellFormedLeadingTagPrefix(value) {
   return value.replace(/^(\u00a7\d+\u00a7\s*)+/, "");
 }
+function stripCompleteTagPairsGlobally(value) {
+  return value.replace(COMPLETE_TAG_PAIR_GLOBAL_REGEX, "");
+}
+function stripMalformedTagNotationGlobally(value) {
+  return value.replace(MALFORMED_TAG_GLOBAL_REGEX, "");
+}
+function stripDanglingTagNotationGlobally(value) {
+  return value.replace(DANGLING_TAG_GLOBAL_REGEX, "");
+}
+function stripTagSectionCharacters(value) {
+  return value.replace(STRAY_SECTION_CHAR_REGEX, "");
+}
+function stripPersistedAssistantText(value) {
+  let text = stripWellFormedLeadingTagPrefix(value);
+  text = stripCompleteTagPairsGlobally(text);
+  text = stripMalformedTagNotationGlobally(text);
+  text = stripDanglingTagNotationGlobally(text);
+  text = stripTagSectionCharacters(text);
+  return text.trim();
+}
 function byteSize(value) {
   return encoder.encode(value).length;
 }
@@ -2402,6 +2426,15 @@ function readTagIdentityRevision(db, sessionId) {
   const row = db.prepare("SELECT value FROM schema_migrations_meta WHERE key = ?").get(tagIdentityRevisionKey(sessionId));
   return typeof row?.value === "string" ? row.value : null;
 }
+function captureInitialTagOwnerRevision(db, sessionId, cached, appendedRows) {
+  if (cached.identityRevision !== null || appendedRows === 0)
+    return true;
+  const revision = readTagIdentityRevision(db, sessionId);
+  if (revision !== null && !/^[1-9]\d*:0$/.test(revision))
+    return false;
+  cached.identityRevision = revision;
+  return true;
+}
 function appendedSinceForeignCommit(db, sessionId, cached) {
   tagOwnerShapeChecks += 1;
   const rows = db.prepare(TAG_OWNER_APPENDED_WITH_SHAPE_SQL).all(cached.globalLastRowId, sessionId, tagIdentityRevisionKey(sessionId), sessionId);
@@ -2442,6 +2475,11 @@ function readTagOwnerSummary(db, sessionId, proseRatio, extraRatios = []) {
           rows.push(...page);
         }
       }
+      if (!captureInitialTagOwnerRevision(db, sessionId, cached, rows.length)) {
+        if (offThreadOnly)
+          throw new TagOwnerSummaryNotReady;
+        rows = null;
+      }
     } else {
       if (offThreadOnly)
         db.exec("BEGIN");
@@ -2571,7 +2609,7 @@ function getTagNumberByMessageIdStatement(db) {
 function getAssignableTagNumberByMessageIdStatement(db) {
   let stmt = getAssignableTagNumberByMessageIdStatements.get(db);
   if (!stmt) {
-    stmt = db.prepare(`SELECT tag_number FROM tags
+    stmt = db.prepare(`SELECT tag_number FROM tags INDEXED BY idx_tags_session_message_id
              WHERE session_id = ?
                AND message_id = ?
                AND NOT (
@@ -2672,6 +2710,28 @@ function getInertWhitespaceAssistantTags2(db, sessionId, messageIds) {
     return contentId.length > 0 ? [{ tagNumber: row.tagNumber, contentId }] : [];
   });
 }
+var inertWhitespaceByNumberStatements = new WeakMap;
+function getInertWhitespaceAssistantTagsByNumbers2(db, sessionId, tagNumbers) {
+  if (tagNumbers.length === 0)
+    return [];
+  let statement = inertWhitespaceByNumberStatements.get(db);
+  if (!statement) {
+    statement = db.prepare(`SELECT tags.tag_number AS tagNumber, tags.entry_fingerprint AS entryFingerprint
+             FROM json_each(?) AS wanted CROSS JOIN tags
+             WHERE tags.session_id = ?
+               AND tags.tag_number = wanted.value
+               AND tags.type = 'message'
+               AND tags.status = 'compacted'
+               AND tags.entry_fingerprint LIKE ?
+             ORDER BY tags.tag_number, tags.id`);
+    inertWhitespaceByNumberStatements.set(db, statement);
+  }
+  const rows = statement.all(JSON.stringify([...new Set(tagNumbers)]), sessionId, `${WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX}%`);
+  return rows.flatMap((row) => {
+    const contentId = row.entryFingerprint.slice(WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX.length);
+    return contentId.length > 0 ? [{ tagNumber: row.tagNumber, contentId }] : [];
+  });
+}
 function updateTagDropMode2(db, sessionId, tagNumber, dropMode) {
   getUpdateTagDropModeStatement(db).run(dropMode, sessionId, tagNumber);
 }
@@ -3100,7 +3160,8 @@ function markTagsCompactedByMessageIds2(db, sessionId, messageIds, eligibleTagNu
             SELECT value AS source_id, lower(value) AS folded_id FROM json_each(?)
         )
         SELECT id, tag_number, message_id, tool_owner_message_id FROM tags INDEXED BY ${tagOrderConstraintIndex(db)}
-        WHERE session_id = ? AND status IN ('active', 'dropped') AND (
+        WHERE session_id = ? ${eligibleTagNumbers ? "AND tag_number IN (SELECT value FROM json_each(?))" : ""}
+        AND status IN ('active', 'dropped') AND (
             message_id IN (SELECT source_id FROM ids)
             OR tool_owner_message_id IN (SELECT source_id FROM ids)
             OR (instr(lower(message_id), ':p') > 0 AND
@@ -3109,7 +3170,7 @@ function markTagsCompactedByMessageIds2(db, sessionId, messageIds, eligibleTagNu
                 lower(substr(message_id, 1, instr(lower(message_id), ':file') - 1)) IN (SELECT folded_id FROM ids))
             OR (? AND instr(message_id, ':') > 0)
             OR ?
-        )`).all(JSON.stringify(Array.from(ids)), sessionId, Array.from(ids).some((id) => id.includes(":")) ? 1 : 0, nulPrefixes.size > 0 ? 1 : 0);
+        )`).all(JSON.stringify(Array.from(ids)), sessionId, ...eligibleTagNumbers ? [JSON.stringify([...eligibleTagNumbers])] : [], Array.from(ids).some((id) => id.includes(":")) ? 1 : 0, nulPrefixes.size > 0 ? 1 : 0);
   const candidates = rows.filter((row) => (eligibleTagNumbers === undefined || eligibleTagNumbers.has(row.tag_number)) && matches(row.message_id, row.tool_owner_message_id));
   if (candidates.length === 0)
     return 0;
@@ -3505,4 +3566,4 @@ function deleteToolTagsByOwner(db, sessionId, ownerMsgId) {
   return getDeleteToolTagsByOwnerStatement(db).all(sessionId, ownerMsgId).length;
 }
 
-export { protectedToolTagNumbers, protectedToolTokenCount, stripWellFormedLeadingTagPrefix, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, providerVisiblePart, providerVisibleMessage, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchangedIfEnabled, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, hasPendingDropOps, getPendingOpsCount, clearPendingOps, removePendingOp, getRecentTagOwnerMessageIds2, getActiveTagTokenAggregate2, AGE_RECLAIM_MIN_TOKENS2, getOldestActiveUnprotectedToolTags2, getActiveToolTagsForAgeReclaim2, getTriggerTagTokenUpperBound2, getActiveTagTokenTotalsByMessage2, getPersistedToolTagAccounting2, getAllStatusTagTokenTotalsFlat2, getReasoningTokenEstimatesByMessage2, tryGetReasoningTokenEstimatesByMessage2, getMaxTagNumberByOwnerMessage2, scanTagOwnerSummary2, cachedTagOwnerRatios2, tagOwnerWarmupState2, scanTagOwnerDelta2, installTagOwnerDelta2, installTagOwnerSummary2, isTagOwnerSummaryReady2, tagTokenCountIsNull2, backfillTagTokenCounts2, insertTag2, updateTagStatus2, markWhitespaceAssistantTagInert2, getInertWhitespaceAssistantTags2, updateTagDropMode2, updateCavemanDepth2, updateTagMessageId2, hasPiFallbackMessageTags2, findAdoptableFallbackTags2, adoptFallbackTagMessageId2, foldShrunkPartTags2, hasPiFallbackToolOwnerTags2, findPiFallbackToolOwnerTags2, adoptPiFallbackToolOwnerTag2, adoptPiFallbackMessageTag2, markTagsCompactedByMessageIds2, deleteTagsByMessageId2, getMaxTagNumberBySession2, getTagNumberByMessageId2, getAssignableTagNumberByMessageId2, getMinMessageTagNumberForRawId2, deriveTagLoadFloor2, TAG_SELECT_COLUMNS2, getTagsBySession2, getActiveTagsBySession2, getTailHygieneTags2, getDroppedTagsBySession2, getTagsForPendingOperations2, getTagsByNumbers2, getNewestToolTagNumbers2, getDroppedTagsByNumbers2, getMaxDroppedTagNumber2, getTagById2, getTopNBySize2, getToolTagNumberByOwner2, getNullOwnerToolTag2, adoptNullOwnerToolTag2, getCandidateToolOwners2, pickNearestPriorOwner2 };
+export { protectedToolTagNumbers, protectedToolTokenCount, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, providerVisiblePart, providerVisibleMessage, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchangedIfEnabled, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, hasPendingDropOps, getPendingOpsCount, clearPendingOps, removePendingOp, getRecentTagOwnerMessageIds2, getActiveTagTokenAggregate2, AGE_RECLAIM_MIN_TOKENS2, getOldestActiveUnprotectedToolTags2, getActiveToolTagsForAgeReclaim2, getTriggerTagTokenUpperBound2, getActiveTagTokenTotalsByMessage2, getPersistedToolTagAccounting2, getAllStatusTagTokenTotalsFlat2, getReasoningTokenEstimatesByMessage2, tryGetReasoningTokenEstimatesByMessage2, getMaxTagNumberByOwnerMessage2, scanTagOwnerSummary2, cachedTagOwnerRatios2, tagOwnerWarmupState2, scanTagOwnerDelta2, installTagOwnerDelta2, installTagOwnerSummary2, isTagOwnerSummaryReady2, tagTokenCountIsNull2, backfillTagTokenCounts2, insertTag2, updateTagStatus2, markWhitespaceAssistantTagInert2, getInertWhitespaceAssistantTags2, getInertWhitespaceAssistantTagsByNumbers2, updateTagDropMode2, updateCavemanDepth2, updateTagMessageId2, hasPiFallbackMessageTags2, findAdoptableFallbackTags2, adoptFallbackTagMessageId2, foldShrunkPartTags2, hasPiFallbackToolOwnerTags2, findPiFallbackToolOwnerTags2, adoptPiFallbackToolOwnerTag2, adoptPiFallbackMessageTag2, markTagsCompactedByMessageIds2, deleteTagsByMessageId2, getMaxTagNumberBySession2, getTagNumberByMessageId2, getAssignableTagNumberByMessageId2, getMinMessageTagNumberForRawId2, deriveTagLoadFloor2, TAG_SELECT_COLUMNS2, getTagsBySession2, getActiveTagsBySession2, getTailHygieneTags2, getDroppedTagsBySession2, getTagsForPendingOperations2, getTagsByNumbers2, getNewestToolTagNumbers2, getDroppedTagsByNumbers2, getMaxDroppedTagNumber2, getTagById2, getTopNBySize2, getToolTagNumberByOwner2, getNullOwnerToolTag2, adoptNullOwnerToolTag2, getCandidateToolOwners2, pickNearestPriorOwner2 };

package/dist/v2/{server-xxm59eww.js → server-4enr7s6x.js}

@@ -4,13 +4,13 @@ import {
 import {
   importPluginModule,
   sessionLog2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   isDefaultSessionTitle2
-} from "./server-zxhgvsf9.js";
+} from "./server-676xw7at.js";
 import {
   shouldHoldIgnoredNotification
-} from "./server-xdfwt6kh.js";
+} from "./server-czb2rkpk.js";
 import {
   getErrorMessage
 } from "./server-y8v6yerm.js";
@@ -142,7 +142,7 @@ async function sendIgnoredMessageNow(client, sessionId, text, params, forcePersi
     holdIgnoredNotification({ client, sessionId, text, params, forcePersist }, "during target checks");
     return "queued";
   }
-  const { waitForSafeNotificationTarget } = await importPluginModule(() => import("./safe-notification-target-73ax1p5v.js"));
+  const { waitForSafeNotificationTarget } = await importPluginModule(() => import("./safe-notification-target-y3p1hce9.js"));
   if (await waitForSafeNotificationTarget(client, sessionId) === "skip") {
     sessionLog2(sessionId, "notification skipped (session not titled yet)");
     return "skipped";

package/dist/v2/{server-zxhgvsf9.js → server-676xw7at.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 
 // src/shared/safe-notification-target.ts
 var DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;

package/dist/v2/{server-52awr2mw.js → server-6byqfbqf.js}

@@ -1,6 +1,6 @@
 import {
   sessionLog2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   isKnownAutocommit
 } from "./server-8ajstryz.js";
@@ -353,12 +353,42 @@ function tagOrderConstraintIndex(db) {
 
 // src/features/magic-context/storage-tag-identity-revision.ts
 var TAG_IDENTITY_REVISION_PREFIX = "tag_identity_revision:";
+var TAG_REVISION_PREFIX = "tag_revision:";
+var TAG_TOMBSTONE_OWNER_PREFIX = "tag_revision_owner:";
+var TAG_REVISION_INCARNATION_KEY = "tag_revision_incarnation";
+var tagRevisionIncarnationSql = (value) => `CASE WHEN INSTR(${value}, ':') > 0 THEN SUBSTR(${value}, 1, INSTR(${value}, ':') - 1) ELSE '0' END`;
+var tagRevisionCountSql = (value) => `CAST(CASE WHEN INSTR(${value}, ':') > 0 THEN SUBSTR(${value}, INSTR(${value}, ':') + 1) ELSE ${value} END AS INTEGER)`;
+var ADVANCE = (delta = "1") => `CASE
+    WHEN ${tagRevisionCountSql("value")} <= 9223372036854775807 - ${delta}
+    THEN (${tagRevisionIncarnationSql("value")}) || ':' || CAST(${tagRevisionCountSql("value")} + ${delta} AS TEXT)
+    ELSE NULL END`;
+function tagTombstoneOwnerRange(sessionId) {
+  const stem = `${TAG_TOMBSTONE_OWNER_PREFIX}${JSON.stringify(sessionId)}`;
+  return [`${stem}:`, `${stem};`];
+}
+function tagTombstoneOwnerKey(sessionId, harness) {
+  return `${tagTombstoneOwnerRange(sessionId)[0]}${harness}`;
+}
+function tagRevisionKey(sessionId) {
+  return `${TAG_REVISION_PREFIX}${sessionId}`;
+}
 function tagIdentityRevisionKey(sessionId) {
   return `${TAG_IDENTITY_REVISION_PREFIX}${sessionId}`;
 }
-var BUMP = (session) => `INSERT INTO schema_migrations_meta (key, value)
-        VALUES ('${TAG_IDENTITY_REVISION_PREFIX}' || ${session}, '1')
-        ON CONFLICT(key) DO UPDATE SET value = CAST(CAST(value AS INTEGER) + 1 AS TEXT)`;
+var BUMP = (session, prefix = TAG_IDENTITY_REVISION_PREFIX) => `INSERT INTO schema_migrations_meta (key, value)
+        VALUES ('${prefix}' || ${session}, '1')
+        ON CONFLICT(key) DO UPDATE SET value = ${ADVANCE()}`;
+var TAG_INSERT_CONFLICT_ROWS = `SELECT id, session_id, tag_number FROM tags WHERE id = NEW.id
+    UNION SELECT id, session_id, tag_number FROM tags WHERE session_id = NEW.session_id AND tag_number = NEW.tag_number
+    UNION SELECT id, session_id, tag_number FROM tags
+        WHERE NEW.type = 'tool' AND NEW.tool_owner_message_id IS NOT NULL
+          AND type = 'tool' AND tool_owner_message_id IS NOT NULL
+          AND session_id = NEW.session_id AND message_id = NEW.message_id
+          AND tool_owner_message_id = NEW.tool_owner_message_id`;
+var BUMP_INSERT_CONFLICTS = (prefix) => `INSERT INTO schema_migrations_meta (key, value)
+    SELECT '${prefix}' || session_id, CAST(COUNT(*) AS TEXT)
+    FROM (${TAG_INSERT_CONFLICT_ROWS}) GROUP BY session_id
+    ON CONFLICT(key) DO UPDATE SET value = ${ADVANCE("CAST(excluded.value AS INTEGER)")}`;
 var TRIGGER_SQL = `CREATE TEMP TRIGGER IF NOT EXISTS mc_tag_identity_revision_au
     AFTER UPDATE OF id, session_id, message_id, tag_number, type, tool_owner_message_id, reasoning_token_count
     ON main.tags
@@ -367,15 +397,69 @@ var TRIGGER_SQL = `CREATE TEMP TRIGGER IF NOT EXISTS mc_tag_identity_revision_au
         INSERT INTO schema_migrations_meta (key, value)
             SELECT '${TAG_IDENTITY_REVISION_PREFIX}' || NEW.session_id, '1'
             WHERE NEW.session_id IS NOT OLD.session_id
-            ON CONFLICT(key) DO UPDATE SET value = CAST(CAST(value AS INTEGER) + 1 AS TEXT);
+            ON CONFLICT(key) DO UPDATE SET value = ${ADVANCE()};
     END`;
 function installTagIdentityRevisionTrigger(db) {
+  db.exec(`DROP TRIGGER IF EXISTS temp.mc_tag_identity_revision_au;
+        DROP TRIGGER IF EXISTS temp.mc_tag_revision_bi;
+        DROP TRIGGER IF EXISTS temp.mc_tag_revision_ai;
+        DROP TRIGGER IF EXISTS temp.mc_tag_revision_au;
+        DROP TRIGGER IF EXISTS temp.mc_tag_revision_ad;
+        DROP TRIGGER IF EXISTS temp.mc_tag_revision_seed_ai;`);
+  db.exec(`CREATE TEMP TRIGGER mc_tag_revision_seed_ai AFTER INSERT ON main.schema_migrations_meta
+        WHEN INSTR(NEW.value, ':') = 0 AND (
+          SUBSTR(NEW.key, 1, ${TAG_REVISION_PREFIX.length}) = '${TAG_REVISION_PREFIX}'
+          OR SUBSTR(NEW.key, 1, ${TAG_IDENTITY_REVISION_PREFIX.length}) = '${TAG_IDENTITY_REVISION_PREFIX}')
+        BEGIN
+            INSERT INTO schema_migrations_meta (key, value) VALUES ('${TAG_REVISION_INCARNATION_KEY}', '1')
+                ON CONFLICT(key) DO UPDATE SET value = CAST(CASE
+                    WHEN CAST(value AS INTEGER) < 9223372036854775807 THEN CAST(value AS INTEGER) + 1
+                    ELSE NULL END AS TEXT);
+            UPDATE schema_migrations_meta SET value =
+                (SELECT value FROM schema_migrations_meta WHERE key = '${TAG_REVISION_INCARNATION_KEY}')
+                || ':' || CAST(NEW.value AS TEXT) WHERE key = NEW.key;
+            INSERT INTO schema_migrations_meta (key, value)
+                SELECT '${TAG_REVISION_INCARNATION_KEY}', '1'
+                WHERE SUBSTR(NEW.key, 1, ${TAG_REVISION_PREFIX.length}) = '${TAG_REVISION_PREFIX}'
+                  AND NOT EXISTS (SELECT 1 FROM schema_migrations_meta
+                    WHERE key = '${TAG_IDENTITY_REVISION_PREFIX}' || SUBSTR(NEW.key, ${TAG_REVISION_PREFIX.length + 1}))
+                ON CONFLICT(key) DO UPDATE SET value = CAST(CASE
+                    WHEN CAST(value AS INTEGER) < 9223372036854775807 THEN CAST(value AS INTEGER) + 1
+                    ELSE NULL END AS TEXT);
+            INSERT INTO schema_migrations_meta (key, value)
+                SELECT '${TAG_IDENTITY_REVISION_PREFIX}' || SUBSTR(NEW.key, ${TAG_REVISION_PREFIX.length + 1}),
+                    (SELECT value FROM schema_migrations_meta WHERE key = '${TAG_REVISION_INCARNATION_KEY}') || ':0'
+                WHERE SUBSTR(NEW.key, 1, ${TAG_REVISION_PREFIX.length}) = '${TAG_REVISION_PREFIX}'
+                  AND NOT EXISTS (SELECT 1 FROM schema_migrations_meta
+                    WHERE key = '${TAG_IDENTITY_REVISION_PREFIX}' || SUBSTR(NEW.key, ${TAG_REVISION_PREFIX.length + 1}));
+        END;`);
   db.exec(TRIGGER_SQL);
+  db.exec(`CREATE TEMP TRIGGER IF NOT EXISTS mc_tag_revision_bi BEFORE INSERT ON main.tags BEGIN
+        ${BUMP_INSERT_CONFLICTS(TAG_REVISION_PREFIX)};
+        ${BUMP_INSERT_CONFLICTS(TAG_IDENTITY_REVISION_PREFIX)};
+        UPDATE session_meta SET tags_version = tags_version + 1
+            WHERE session_id IN (SELECT session_id FROM (${TAG_INSERT_CONFLICT_ROWS}));
+    END;`);
+  db.exec(`CREATE TEMP TRIGGER IF NOT EXISTS mc_tag_revision_ai AFTER INSERT ON main.tags BEGIN
+        ${BUMP("NEW.session_id", TAG_REVISION_PREFIX)};
+    END;
+    CREATE TEMP TRIGGER IF NOT EXISTS mc_tag_revision_au AFTER UPDATE ON main.tags BEGIN
+        ${BUMP("OLD.session_id", TAG_REVISION_PREFIX)};
+        INSERT INTO schema_migrations_meta (key, value)
+            SELECT '${TAG_REVISION_PREFIX}' || NEW.session_id, '1'
+            WHERE NEW.session_id IS NOT OLD.session_id
+            ON CONFLICT(key) DO UPDATE SET value = ${ADVANCE()};
+    END;
+    CREATE TEMP TRIGGER IF NOT EXISTS mc_tag_revision_ad AFTER DELETE ON main.tags BEGIN
+        ${BUMP("OLD.session_id", TAG_REVISION_PREFIX)};
+    END;`);
 }
 function deleteTagIdentityRevisions(db, sessionIds) {
-  const statement = db.prepare("DELETE FROM schema_migrations_meta WHERE key = ? AND NOT EXISTS (SELECT 1 FROM tags WHERE session_id = ?)");
-  for (const sessionId of sessionIds)
-    statement.run(tagIdentityRevisionKey(sessionId), sessionId);
+  const statement = db.prepare(`INSERT INTO schema_migrations_meta (key, value) VALUES (?, '1')
+         ON CONFLICT(key) DO UPDATE SET value = ${ADVANCE()}`);
+  for (const sessionId of sessionIds) {
+    statement.run(tagIdentityRevisionKey(sessionId));
+  }
 }
 
 // src/shared/stable-json.ts
@@ -426,4 +510,4 @@ function writeStable(value, seen, pieces) {
   pieces.push("}");
 }
 
-export { getTableColumnNames, ensureColumn, healAllNullColumns, stableStringify, getTemporalDecisions, observeTemporalDecisions, freezeTemporalDecisions, installV95PerfSchema, tagOrderConstraintIndex, tagIdentityRevisionKey, installTagIdentityRevisionTrigger, deleteTagIdentityRevisions };
+export { getTableColumnNames, ensureColumn, healAllNullColumns, stableStringify, getTemporalDecisions, observeTemporalDecisions, freezeTemporalDecisions, installV95PerfSchema, tagOrderConstraintIndex, TAG_TOMBSTONE_OWNER_PREFIX, tagTombstoneOwnerRange, tagTombstoneOwnerKey, tagRevisionKey, tagIdentityRevisionKey, installTagIdentityRevisionTrigger, deleteTagIdentityRevisions };

package/dist/v2/{server-e0vdaae2.js → server-6tcrjfw8.js}

@@ -3,12 +3,12 @@ import {
 } from "./server-fr0wbhdn.js";
 import {
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   ensureColumn,
   healAllNullColumns,
   installV95PerfSchema
-} from "./server-52awr2mw.js";
+} from "./server-6byqfbqf.js";
 import {
   resolveOpenCodeDbPath,
   openCodeDbPathExists,
@@ -20,10 +20,10 @@ import {
 import {
   normalizeStoredProjectPath,
   storedPathBelongsToIdentity
-} from "./server-yczc713m.js";
+} from "./server-8xmq9h3f.js";
 import {
   logSlowWriteTransaction
-} from "./server-aan4q8mx.js";
+} from "./server-3t0q2cqx.js";
 
 // src/features/magic-context/migrations.ts
 import { isMainThread } from "node:worker_threads";

package/dist/v2/{server-qye6ykf7.js → server-7ekna9zs.js}

@@ -1,9 +1,9 @@
 import {
   estimateTokens
-} from "./server-1r6pmz4f.js";
+} from "./server-kzns2hbz.js";
 import {
   stableStringify
-} from "./server-52awr2mw.js";
+} from "./server-6byqfbqf.js";
 
 // src/features/magic-context/tool-definition-tokens.ts
 import { createHash } from "node:crypto";