@cortexkit/opencode-magic-context 0.48.0 → 0.49.0

package/dist/v2/{server-sggvvzhb.js → server-1tk82krw.js}

@@ -5,32 +5,37 @@ import {
   removeSystemReminders,
   hasMeaningfulUserText2,
   extractTexts2
-} from "./server-1r6pmz4f.js";
+} from "./server-kzns2hbz.js";
 import {
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2
 } from "./server-kb9nn0a0.js";
 import {
+  TAG_TOMBSTONE_OWNER_PREFIX,
+  tagTombstoneOwnerRange,
+  tagTombstoneOwnerKey,
+  tagRevisionKey,
+  tagIdentityRevisionKey,
   deleteTagIdentityRevisions
-} from "./server-52awr2mw.js";
+} from "./server-6byqfbqf.js";
 import {
   cleanUserText2
-} from "./server-2fbhp79z.js";
+} from "./server-4ez8mntn.js";
 import {
   recordMessageFtsRowid,
   recordIndexedMessageTime,
   messageFtsOrdinalRangeIsMapped,
   deleteUnmappedMessageFtsRows
-} from "./server-k228xhjg.js";
+} from "./server-3j4d00kf.js";
 import {
   deleteChunkEmbedBackoffForSession
-} from "./server-ezhze64f.js";
+} from "./server-ss95ky04.js";
 import {
   closeQuietly
 } from "./server-8ajstryz.js";
 import {
   logSlowWriteTransaction
-} from "./server-aan4q8mx.js";
+} from "./server-3t0q2cqx.js";
 
 // src/features/magic-context/compression-depth-storage.ts
 var incrementDepthStatements = new WeakMap;
@@ -168,6 +173,17 @@ function deleteSessionScopedRows(db, sessionIds, harness, options = {}) {
   if (deletableSessionIds.length === 0)
     return 0;
   const placeholders = deletableSessionIds.map(() => "?").join(", ");
+  const harnessTables = SESSION_SCOPED_TABLES.filter((definition) => definition.harnessScoped);
+  if (options.preserveTagRevisionTombstones) {
+    const owners = db.prepare(harnessTables.map((definition) => `SELECT session_id, harness FROM ${definition.table} WHERE session_id IN (${placeholders})${definition.extraPredicate ? ` AND ${definition.extraPredicate}` : ""}`).join(" UNION ")).all(...harnessTables.flatMap(() => deletableSessionIds));
+    const record = db.prepare("INSERT OR IGNORE INTO schema_migrations_meta (key, value) VALUES (?, ?)");
+    for (const owner of owners)
+      record.run(tagTombstoneOwnerKey(owner.session_id, owner.harness), owner.harness);
+    const fallback = db.prepare(`INSERT INTO schema_migrations_meta (key, value)
+            SELECT ?, ? WHERE NOT EXISTS (SELECT 1 FROM schema_migrations_meta WHERE key >= ? AND key < ?)`);
+    for (const id of deletableSessionIds)
+      fallback.run(tagTombstoneOwnerKey(id, getHarness2()), getHarness2(), ...tagTombstoneOwnerRange(id));
+  }
   for (const sessionId of deletableSessionIds)
     deleteChunkEmbedBackoffForSession(db, sessionId);
   for (const definition of SESSION_SCOPED_TABLES) {
@@ -194,6 +210,20 @@ function deleteSessionScopedRows(db, sessionIds, harness, options = {}) {
       statement.run(...deletableSessionIds);
   }
   deleteSessionActivity(db, deletableSessionIds);
+  if (!options.preserveTagRevisionTombstones) {
+    const retireOwner = db.prepare(harness === undefined ? "DELETE FROM schema_migrations_meta WHERE key >= ? AND key < ?" : "DELETE FROM schema_migrations_meta WHERE key = ?");
+    const survivingRows = harnessTables.map((definition) => `EXISTS (SELECT 1 FROM ${definition.table} WHERE session_id = ?${definition.extraPredicate ? ` AND ${definition.extraPredicate}` : ""})`).join(" OR ");
+    const retire = db.prepare(`DELETE FROM schema_migrations_meta WHERE key IN (?, ?)
+            AND NOT (${survivingRows})
+            AND NOT EXISTS (SELECT 1 FROM schema_migrations_meta AS owners WHERE owners.key >= ? AND owners.key < ?)`);
+    for (const id of deletableSessionIds) {
+      if (harness === undefined)
+        retireOwner.run(...tagTombstoneOwnerRange(id));
+      else
+        retireOwner.run(tagTombstoneOwnerKey(id, harness));
+      retire.run(tagIdentityRevisionKey(id), tagRevisionKey(id), ...harnessTables.map(() => id), ...tagTombstoneOwnerRange(id));
+    }
+  }
   return deletableSessionIds.length;
 }
 
@@ -650,12 +680,19 @@ function persistMessageHistoryOrphanSweepState(db, cursor, lastSweptAt, harness)
              last_swept_at = excluded.last_swept_at`).run(harness, cursor, lastSweptAt);
 }
 function getOpenCodeSessionScopedCandidateSourceSql(harness) {
-  return SESSION_SCOPED_TABLES.filter((definition) => definition.harnessScoped === true).map((definition) => {
+  const sources = SESSION_SCOPED_TABLES.filter((definition) => definition.harnessScoped === true).map((definition) => {
     const predicates = ["session_id IS NOT NULL", `harness = '${harness}'`];
     if (definition.extraPredicate)
       predicates.push(definition.extraPredicate);
     return `SELECT session_id FROM ${definition.table} WHERE ${predicates.join(" AND ")}`;
-  }).join(`
+  });
+  const jsonId = `SUBSTR(key, ${TAG_TOMBSTONE_OWNER_PREFIX.length + 1}, LENGTH(key) - ${TAG_TOMBSTONE_OWNER_PREFIX.length + harness.length + 1})`;
+  sources.push(`SELECT CASE WHEN json_valid(${jsonId}) THEN
+        CASE WHEN json_type(${jsonId}) = 'text' THEN json_extract(${jsonId}, '$') END END AS session_id
+        FROM schema_migrations_meta WHERE value = '${harness}'
+        AND key >= '${TAG_TOMBSTONE_OWNER_PREFIX}' AND key < '${TAG_TOMBSTONE_OWNER_PREFIX.slice(0, -1)};'
+        AND SUBSTR(key, -${harness.length + 1}) = ':${harness}'`);
+  return sources.join(`
 UNION
 `);
 }

package/dist/v2/{server-vqpf3167.js → server-2s6ayq3t.js}

@@ -8,10 +8,10 @@ import {
   getMagicContextStorageDir,
   importPluginModule,
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   getSynapseLaneIdentity
-} from "./server-4k748ke6.js";
+} from "./server-hb6xhh9q.js";
 import {
   computeNormalizedHash
 } from "./server-2bvekkfy.js";

package/dist/v2/{server-z2037m6z.js → server-2s9qz6n7.js}

@@ -1,11 +1,11 @@
 import {
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   getSdkWindowGeometry,
   getSdkContextLimit,
   getSdkInputLimit
-} from "./server-v06jcv0w.js";
+} from "./server-8k2agx29.js";
 import {
   localBudget,
   calibrationForModelKey

package/dist/v2/{server-k228xhjg.js → server-3j4d00kf.js}

@@ -4,7 +4,7 @@ import {
 } from "./server-kb9nn0a0.js";
 import {
   logSlowWriteTransaction
-} from "./server-aan4q8mx.js";
+} from "./server-3t0q2cqx.js";
 
 // src/features/magic-context/message-fts-rowid-map.ts
 import { createHash } from "node:crypto";

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-2fbhp79z.js → server-4ez8mntn.js}

@@ -12,7 +12,7 @@ import {
   providerVisiblePart,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-686jg6eb.js";
+} from "./server-c5rrgrcd.js";
 import {
   OMO_INTERNAL_INITIATOR_MARKER,
   isSystemDirective,
@@ -29,13 +29,13 @@ import {
   formatBlock,
   compactTextForSummary,
   mergeCommitHashes
-} from "./server-1r6pmz4f.js";
+} from "./server-kzns2hbz.js";
 import {
   sessionLog2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   stableStringify
-} from "./server-52awr2mw.js";
+} from "./server-6byqfbqf.js";
 import {
   renderToolTemplate
 } from "./server-mfkzp7qj.js";
@@ -53,19 +53,20 @@ import {
   readRawSessionMessageByIdFromDb2,
   hasRawSessionMessageByIdFromDb2,
   readRawSeedTailFromDb2,
+  readRawSessionBoundaryEndpointsFromDb2,
   prewarmRawSessionOrdinalsForDb
-} from "./server-g5r0n3b6.js";
+} from "./server-7h861yms.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./server-xdfwt6kh.js";
+} from "./server-pj4pjv02.js";
 import {
   getToolDefinitionMeasurementSignature,
   getLargestMeasuredToolDefinitionTokens,
   getMeasuredToolDefinitionTokens
-} from "./server-qye6ykf7.js";
+} from "./server-7ekna9zs.js";
 import {
   canonicalModelIdentity
 } from "./server-avwt563y.js";
@@ -2680,6 +2681,13 @@ function readRawSessionMessagePartsById2(sessionId, messageId, onQuery) {
     return null;
   return withReadOnlySessionDb((db) => readRawSessionMessagePartsByIdFromDb2(db, sessionId, messageId, onQuery));
 }
+function readRawSessionBoundaryEndpoints2(sessionId, ids, blockIds) {
+  if (sessionProviders.get(sessionId)?.provider)
+    return null;
+  if (!openCodeDbExists())
+    return new Map(ids.map((id) => [id, null]));
+  return withReadOnlySessionDb((db) => readRawSessionBoundaryEndpointsFromDb2(db, sessionId, ids, blockIds));
+}
 function hasRawSessionMessageById2(sessionId, messageId) {
   const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.hasMessageById)
@@ -3202,4 +3210,4 @@ function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
   });
 }
 
-export { detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, describeFinalWireTail, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, estimateAppendedWireTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, neutralizedReasoningSource, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, neutralizeWholeMessage, isSentinel, replaySentinelByMessageIds, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessageIdOrdinals2, readRawSessionMessagePartsById2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, RAW_SESSION_TAG_KEY_PAGE_SIZE2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, getProtectedTailStartOrdinal2, readSessionChunk2, getRawSessionMessageIdsThrough2, readRawSessionSeedTail2 };
+export { detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, describeFinalWireTail, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, estimateAppendedWireTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, neutralizedReasoningSource, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, neutralizeWholeMessage, isSentinel, replaySentinelByMessageIds, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessageIdOrdinals2, readRawSessionMessagePartsById2, readRawSessionBoundaryEndpoints2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, RAW_SESSION_TAG_KEY_PAGE_SIZE2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, getProtectedTailStartOrdinal2, readSessionChunk2, getRawSessionMessageIdsThrough2, readRawSessionSeedTail2 };

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-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";

package/dist/v2/{server-g5r0n3b6.js → server-7h861yms.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   getSqliteDatabasePath2,
   releaseIndexOwner2
@@ -171,30 +171,46 @@ function readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWaterma
   const pageSize = Math.min(Math.max(1, Math.floor(limit)), remaining);
   if (pageSize === 0)
     return [];
-  const parameters = [sessionId];
-  if (after)
-    parameters.push(after.timeCreated, after.timeCreated, after.timeCreated, after.id);
-  parameters.push(pageSize);
-  if (!after)
-    parameters.push(Math.max(0, Math.floor(afterOrdinal)));
-  return db.prepare(`SELECT id, data, time_created, time_updated
-             FROM message
-             WHERE session_id = ?
-                ${after ? "AND time_created >= ? AND (time_created > ? OR (time_created = ? AND id > ?))" : ""}
-                AND NOT (
-                   CASE WHEN json_valid(data) = 1
-                        THEN COALESCE(json_extract(data, '$.summary'), 0)
-                        ELSE 0 END = 1
-                   AND CASE WHEN json_valid(data) = 1
-                            THEN COALESCE(json_extract(data, '$.finish'), '')
-                            ELSE '' END = 'stop'
-               )
-             ORDER BY time_created ASC, id ASC
-             LIMIT ? ${after ? "" : "OFFSET ?"}`).all(...parameters).filter(isRawMessageRow).map((row, index) => ({
-    ...row,
-    ordinal: Math.floor(afterOrdinal) + index + 1
-  }));
+  return withReadSnapshot(db, () => {
+    const ordinal = Math.max(0, Math.floor(afterOrdinal));
+    const points = currentOrdinalCheckpoints(db, sessionId)?.scan.checkpoints ?? [];
+    let low = 0;
+    let high = points.length;
+    while (low < high) {
+      const middle = Math.floor((low + high) / 2);
+      if (points[middle].ordinal <= ordinal)
+        low = middle + 1;
+      else
+        high = middle;
+    }
+    const floor = points[low - 1];
+    const useFloor = floor && (!after || compareOrdinalKeys(floor, after) > 0);
+    const anchor = useFloor ? floor : after;
+    const skip = anchor === after && after ? 0 : ordinal - (floor?.ordinal ?? 0);
+    if (skip > ORDINAL_LOOKUP_LIMIT) {
+      prewarmRawSessionOrdinalsForDb(db, sessionId);
+      throw new RawOrdinalsNotReady;
+    }
+    const rawLimit = skip + pageSize + ORDINAL_LOOKUP_LIMIT;
+    const rows = db.prepare(`SELECT id, data, time_created, time_updated, ${EXCLUDED_ROW_SQL} AS excluded
+                FROM message WHERE id IN (
+                    SELECT id FROM message WHERE session_id = ?
+                    ${anchor ? "AND (time_created, id) > (?, ?)" : ""}
+                    ORDER BY time_created, id LIMIT ?)
+                ORDER BY time_created, id`).all(sessionId, ...anchor ? [anchor.timeCreated, anchor.id] : [], rawLimit);
+    rawMessagePageRowsVisited += rows.length;
+    const eligible = rows.filter((row) => row.excluded !== 1);
+    if (eligible.length <= skip && rows.length === rawLimit) {
+      prewarmRawSessionOrdinalsForDb(db, sessionId);
+      throw new RawOrdinalsNotReady;
+    }
+    return eligible.slice(skip, skip + pageSize).filter(isRawMessageRow).map((row, index) => ({
+      ...row,
+      ordinal: ordinal + index + 1
+    }));
+  });
 }
+var rawMessagePageRowsVisited = 0;
 function assembleRawMessagePage(messageRows, partRows) {
   const partsByMessageId = new Map;
   for (const part of partRows) {
@@ -994,6 +1010,125 @@ function readRawSeedTailFromDb2(db, sessionId, boundaryId) {
     throw new Error("state_sync materialized boundary is missing from raw storage");
   return messages;
 }
+var BOUNDARY_ORDINAL_SQL = `
+    SELECT id, ordinal FROM (
+        SELECT id, ROW_NUMBER() OVER (ORDER BY time_created, id) AS ordinal
+        FROM message
+        WHERE session_id = ?
+          AND typeof(id) = 'text' AND typeof(data) = 'text'
+          AND CASE WHEN json_valid(data) THEN NOT (
+                COALESCE(json_type(data, '$.summary'), '') = 'true'
+                AND COALESCE(json_extract(data, '$.finish'), '') = 'stop'
+              ) ELSE 1 END
+    )
+    WHERE id IN (SELECT value FROM json_each(?))`;
+var BOUNDARY_MESSAGE_SQL = `
+    SELECT id, data, time_created FROM message
+    WHERE +session_id = ? AND id IN (SELECT value FROM json_each(?))`;
+var BOUNDARY_BLOCK_COUNT_SQL = `
+    SELECT message_id AS id, SUM(
+        CASE
+            WHEN NOT json_valid(data) OR json_type(data) <> 'object' THEN 0
+            ELSE CASE (CASE WHEN json_type(data, '$.type') = 'text'
+                            THEN json_extract(data, '$.type') ELSE 'unknown' END)
+                WHEN 'text' THEN CASE WHEN json_type(data, '$.ignored') = 'true' THEN 0 ELSE 1 END
+                WHEN 'reasoning' THEN 1
+                WHEN 'thinking' THEN 1
+                WHEN 'redacted_thinking' THEN 1
+                WHEN 'tool' THEN 1 + CASE
+                    WHEN json_type(data, '$.state') = 'object'
+                     AND json_type(data, '$.state.status') = 'text'
+                     AND json_extract(data, '$.state.status') IN ('completed', 'error')
+                    THEN 1 ELSE 0 END
+                WHEN 'compaction' THEN 0
+                WHEN 'step-finish' THEN 0
+                WHEN 'snapshot' THEN 0
+                WHEN 'patch' THEN 0
+                WHEN 'agent' THEN 0
+                WHEN 'retry' THEN 0
+                ELSE 1
+            END
+        END) AS blocks
+    FROM part
+    WHERE +session_id = ?
+      AND message_id IN (SELECT value FROM json_each(?))
+      AND typeof(message_id) = 'text' AND typeof(data) = 'text'
+    GROUP BY message_id`;
+var boundaryEndpointCaches = new WeakMap;
+var BOUNDARY_ENDPOINT_CACHE_SESSIONS = 16;
+var boundaryEndpointRowsRead = 0;
+function readBoundaryEndpointRows(db, sessionId, ids, blockIds, into) {
+  if (ids.length > 0) {
+    boundaryEndpointRowsRead += ids.length;
+    const wanted = JSON.stringify(ids);
+    const ordinals = new Map;
+    for (const row of db.prepare(BOUNDARY_ORDINAL_SQL).all(sessionId, wanted)) {
+      ordinals.set(row.id, row.ordinal);
+    }
+    const rows = db.prepare(BOUNDARY_MESSAGE_SQL).all(sessionId, wanted);
+    for (const id of ids)
+      into.set(id, null);
+    for (const row of rows) {
+      if (!isRawMessageRow(row) || typeof row.time_created !== "number")
+        continue;
+      const info = parseJsonRecord(row.data);
+      if (!info || isRawCompactionSummaryInfo2(info))
+        continue;
+      into.set(row.id, {
+        ordinal: ordinals.get(row.id) ?? null,
+        createdAt: row.time_created
+      });
+    }
+  }
+  const servable = blockIds.filter((id) => {
+    const endpoint = into.get(id);
+    return endpoint && endpoint.lastBlockIndex === undefined;
+  });
+  if (servable.length === 0)
+    return;
+  const counts = new Map;
+  for (const row of db.prepare(BOUNDARY_BLOCK_COUNT_SQL).all(sessionId, JSON.stringify(servable))) {
+    counts.set(row.id, row.blocks);
+  }
+  for (const id of servable) {
+    const endpoint = into.get(id);
+    if (!endpoint)
+      continue;
+    const blocks = counts.get(id) ?? 0;
+    into.set(id, { ...endpoint, lastBlockIndex: blocks > 0 ? blocks - 1 : 0 });
+  }
+}
+function readRawSessionBoundaryEndpointsFromDb2(db, sessionId, ids, blockIds = []) {
+  const wanted = [...new Set(ids)];
+  const wantedBlocks = [...new Set(blockIds)];
+  let sessions = boundaryEndpointCaches.get(db);
+  if (!sessions) {
+    sessions = new Map;
+    boundaryEndpointCaches.set(db, sessions);
+  }
+  for (let attempt = 1;; attempt += 1) {
+    const before = readStoreStamp(db);
+    const cached = sessions.get(sessionId);
+    const reuse = attempt === 1 && cached && sameStoreStamp(cached.stamp, before);
+    const endpoints = new Map(reuse ? cached.endpoints : []);
+    const missing = wanted.filter((id) => !endpoints.has(id));
+    withReadSnapshot(db, () => readBoundaryEndpointRows(db, sessionId, missing, wantedBlocks, endpoints));
+    const unchanged = before !== null && sameStoreStamp(before, readStoreStamp(db));
+    if (unchanged) {
+      sessions.delete(sessionId);
+      sessions.set(sessionId, { stamp: before, endpoints });
+      while (sessions.size > BOUNDARY_ENDPOINT_CACHE_SESSIONS) {
+        const oldest = sessions.keys().next().value;
+        if (oldest === undefined)
+          break;
+        sessions.delete(oldest);
+      }
+    } else if (reuse) {
+      continue;
+    }
+    return new Map(wanted.map((id) => [id, endpoints.get(id) ?? null]));
+  }
+}
 
 // src/hooks/magic-context/raw-ordinal-warmup.ts
 var ACCEPT_TIMEOUT_MS = 2000;
@@ -1134,4 +1269,4 @@ function recordFailure(key, sessionId, failure, detail) {
   log2(`[magic-context] WARN canonical ordinal warm-up failed for ${sessionId} (${failure}: ${detail}); counts remain bounded and callers must defer or retry`);
 }
 
-export { isStrictGapHealingMessage2, isRawCompactionSummaryInfo2, readRawSessionMessagesFromDb2, readRawSessionMessagePageFromDb2, readRawSessionMessageSummaryPageFromDb2, countRawSessionMessageOrdinalsFromDb2, readRawSessionMessageIdOrdinalsForRangeFromDb2, readRawSessionMessageOrdinalPageFromDb2, countStoredRawSessionMessagesFromDb2, readRawSessionTailFromDb2, extractInMemoryMessageViews2, buildInMemoryTailRawMessages2, readRawSessionMessagePartsByIdFromDb2, forgetRawSessionOrdinalWatermark2, forgetRawSessionSummaryRows2, noteRawSessionSummaryRowWritten2, rawOrdinalSummarySeed2, scanRawSessionSummaryRows2, getRawSessionSummaryEpoch2, installRawSessionSummaryScan2, isRawSessionSummaryWarm2, readRawSessionMessageOrdinalByIdFromDb2, readRawSessionMessageByIdFromDb2, hasRawSessionMessageByIdFromDb2, readRawSeedTailFromDb2, runSessionWarmupWorker, prewarmRawSessionOrdinalsForDb };
+export { isStrictGapHealingMessage2, isRawCompactionSummaryInfo2, readRawSessionMessagesFromDb2, readRawSessionMessagePageFromDb2, readRawSessionMessageSummaryPageFromDb2, countRawSessionMessageOrdinalsFromDb2, readRawSessionMessageIdOrdinalsForRangeFromDb2, readRawSessionMessageOrdinalPageFromDb2, countStoredRawSessionMessagesFromDb2, readRawSessionTailFromDb2, extractInMemoryMessageViews2, buildInMemoryTailRawMessages2, readRawSessionMessagePartsByIdFromDb2, forgetRawSessionOrdinalWatermark2, forgetRawSessionSummaryRows2, noteRawSessionSummaryRowWritten2, rawOrdinalSummarySeed2, scanRawSessionSummaryRows2, getRawSessionSummaryEpoch2, installRawSessionSummaryScan2, isRawSessionSummaryWarm2, readRawSessionMessageOrdinalByIdFromDb2, readRawSessionMessageByIdFromDb2, hasRawSessionMessageByIdFromDb2, readRawSeedTailFromDb2, readRawSessionBoundaryEndpointsFromDb2, runSessionWarmupWorker, prewarmRawSessionOrdinalsForDb };

package/dist/v2/{server-v06jcv0w.js → server-8k2agx29.js}

@@ -5,7 +5,7 @@ import {
   getDataDir,
   getMagicContextStorageDir,
   sessionLog2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   writeStorageFileAtomicSync
 } from "./server-1bc61ans.js";