@cortexkit/magic-context 0.48.0 → 0.49.0

package/dist/index.js

@@ -2212,8 +2212,12 @@ function flush() {
     let currentSize = getCurrentLogSize(logFile);
     const dataSize = Buffer.byteLength(data);
     if (currentSize > 0 && currentSize + dataSize > MAX_LOG_FILE_BYTES) {
-      rotateLogFile(logFile, currentSize);
-      currentSize = 0;
+      flushesSinceSizeCheck = SIZE_CHECK_INTERVAL_FLUSHES;
+      currentSize = getCurrentLogSize(logFile);
+      if (currentSize > 0 && currentSize + dataSize > MAX_LOG_FILE_BYTES) {
+        rotateLogFile(logFile, currentSize);
+        currentSize = 0;
+      }
     }
     fs.appendFileSync(logFile, data, { encoding: "utf8", mode: 384 });
     buffer = [];
@@ -28995,11 +28999,75 @@ var init_migrations = __esm(async () => {
 
 // ../plugin/src/features/magic-context/storage-tag-identity-revision.ts
 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);
-}
-var TAG_IDENTITY_REVISION_PREFIX = "tag_identity_revision:", 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)`, 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;`);
+}
+var TAG_IDENTITY_REVISION_PREFIX = "tag_identity_revision:", TAG_REVISION_PREFIX = "tag_revision:", TAG_REVISION_INCARNATION_KEY = "tag_revision_incarnation", tagRevisionIncarnationSql = (value) => `CASE WHEN INSTR(${value}, ':') > 0 THEN SUBSTR(${value}, 1, INSTR(${value}, ':') - 1) ELSE '0' END`, tagRevisionCountSql = (value) => `CAST(CASE WHEN INSTR(${value}, ':') > 0 THEN SUBSTR(${value}, INSTR(${value}, ':') + 1) ELSE ${value} END AS INTEGER)`, ADVANCE = (delta = "1") => `CASE
+    WHEN ${tagRevisionCountSql("value")} <= 9223372036854775807 - ${delta}
+    THEN (${tagRevisionIncarnationSql("value")}) || ':' || CAST(${tagRevisionCountSql("value")} + ${delta} AS TEXT)
+    ELSE NULL END`, 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()}`, 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`, 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)")}`, TRIGGER_SQL;
 var init_storage_tag_identity_revision = __esm(() => {
   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
@@ -29009,7 +29077,7 @@ var init_storage_tag_identity_revision = __esm(() => {
         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`;
 });
 
@@ -30381,7 +30449,7 @@ function pickNearestPriorOwner(candidates, currentMessageId, times) {
   }
   return best?.id ?? null;
 }
-var insertTagStatements, updateTagStatusStatements, updateTagDropModeStatements, updateTagMessageIdStatements, getTagNumbersByMessageIdStatements, deleteTagsByMessageIdStatements, getMaxTagNumberBySessionStatements, getTagNumberByMessageIdStatements, getAssignableTagNumberByMessageIdStatements, hasPiFallbackMessageTagStatements, updateTagByteSizeStatements, updateTagInputByteSizeStatements, recentTagOwnerStatements, RECLAIM_HINT_EXCLUDED_TOOLS, getActiveToolTagsForAgeReclaimStatements, scopedActiveTokenTotalStatements, updateTagTokenCountStatements, updateTagInputTokenCountStatements, tagOwnerSummaries, TAG_OWNER_COLUMNS = "id, type, message_id, tool_owner_message_id, tag_number, reasoning_token_count", TAG_OWNER_APPENDED_WITH_SHAPE_SQL, inertWhitespaceStatements, foldStatements, getOwnerScopedToolTagNumbersStatements, getMinMessageTagNumberForRawIdStatements, getActiveTagsBySessionStatements, getNullOwnerToolTagsBySessionStatements, getDroppedTagsBySessionStatements, getMaxDroppedTagNumberStatements, newestToolTagNumberStatements, droppedNumberStatements, tagByIdStatements, getToolTagNumberByOwnerStatements, getNullOwnerToolTagStatements, adoptNullOwnerToolTagStatements, getToolOwnerByTagIdStatements, deleteToolTagsByOwnerStatements;
+var insertTagStatements, updateTagStatusStatements, updateTagDropModeStatements, updateTagMessageIdStatements, getTagNumbersByMessageIdStatements, deleteTagsByMessageIdStatements, getMaxTagNumberBySessionStatements, getTagNumberByMessageIdStatements, getAssignableTagNumberByMessageIdStatements, hasPiFallbackMessageTagStatements, updateTagByteSizeStatements, updateTagInputByteSizeStatements, recentTagOwnerStatements, RECLAIM_HINT_EXCLUDED_TOOLS, getActiveToolTagsForAgeReclaimStatements, scopedActiveTokenTotalStatements, updateTagTokenCountStatements, updateTagInputTokenCountStatements, tagOwnerSummaries, TAG_OWNER_COLUMNS = "id, type, message_id, tool_owner_message_id, tag_number, reasoning_token_count", TAG_OWNER_APPENDED_WITH_SHAPE_SQL, inertWhitespaceStatements, inertWhitespaceByNumberStatements, foldStatements, getOwnerScopedToolTagNumbersStatements, getMinMessageTagNumberForRawIdStatements, getActiveTagsBySessionStatements, getNullOwnerToolTagsBySessionStatements, getDroppedTagsBySessionStatements, getMaxDroppedTagNumberStatements, newestToolTagNumberStatements, droppedNumberStatements, tagByIdStatements, getToolTagNumberByOwnerStatements, getNullOwnerToolTagStatements, adoptNullOwnerToolTagStatements, getToolOwnerByTagIdStatements, deleteToolTagsByOwnerStatements;
 var init_storage_tags = __esm(async () => {
   init_emergency_drop();
   init_tag_owner_id();
@@ -30423,6 +30491,7 @@ var init_storage_tags = __esm(async () => {
     SELECT NULL, NULL, NULL, NULL, NULL, NULL, 1, COUNT(*), MAX(id), (SELECT value FROM schema_migrations_meta WHERE key = ?)
     FROM tags WHERE session_id = ?`;
   inertWhitespaceStatements = new WeakMap;
+  inertWhitespaceByNumberStatements = new WeakMap;
   foldStatements = new WeakMap;
   getOwnerScopedToolTagNumbersStatements = new WeakMap;
   getMinMessageTagNumberForRawIdStatements = new WeakMap;
@@ -30665,29 +30734,44 @@ 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
+    }));
+  });
 }
 function assembleRawMessagePage(messageRows, partRows) {
   const partsByMessageId = new Map;
@@ -31349,11 +31433,124 @@ function readRawSeedTailFromDb(db, sessionId, boundaryId) {
     throw new Error("state_sync materialized boundary is missing from raw storage");
   return messages;
 }
-var RAW_MESSAGE_PARTS_BY_ID_SQL = "SELECT message_id, data, time_updated FROM part WHERE +session_id = ? AND likelihood(message_id = ?, 0.000001) ORDER BY time_created ASC, id ASC", RAW_METADATA_KEEP_CHARS = 16384, RAW_METADATA_KEPT_KEYS, RAW_PART_DATA_SQL, RAW_SUMMARY_TEXT_MAX_CHARS = 8192, RAW_SUMMARY_ARG_MAX_CHARS = 512, RAW_SUMMARY_TOOL_INPUT_KEYS, RAW_SUMMARY_PART_DATA_SQL, ORDINAL_SUMMARY_FLAG_SQL = `(CASE WHEN json_valid(data) = 1
+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 || isRawCompactionSummaryInfo(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 readRawSessionBoundaryEndpointsFromDb(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]));
+  }
+}
+var RAW_MESSAGE_PARTS_BY_ID_SQL = "SELECT message_id, data, time_updated FROM part WHERE +session_id = ? AND likelihood(message_id = ?, 0.000001) ORDER BY time_created ASC, id ASC", RAW_METADATA_KEEP_CHARS = 16384, RAW_METADATA_KEPT_KEYS, RAW_PART_DATA_SQL, rawMessagePageRowsVisited = 0, RAW_SUMMARY_TEXT_MAX_CHARS = 8192, RAW_SUMMARY_ARG_MAX_CHARS = 512, RAW_SUMMARY_TOOL_INPUT_KEYS, RAW_SUMMARY_PART_DATA_SQL, ORDINAL_SUMMARY_FLAG_SQL = `(CASE WHEN json_valid(data) = 1
         THEN COALESCE(json_extract(data, '$.summary'), 0)
         ELSE 0 END = 1)`, ORDINAL_STOP_FLAG_SQL = `(CASE WHEN json_valid(data) = 1
         THEN COALESCE(json_extract(data, '$.finish'), '')
-        ELSE '' END = 'stop')`, ORDINAL_RANGE_FROM_START_SQL, ORDINAL_RANGE_BETWEEN_SQL, ordinalWatermarks, ordinalWatermarkEpochs, ordinalRowsVisited = 0, STABLE_STORE_ATTEMPTS = 3, EXCLUDED_ROW_SQL, SUMMARY_ANCHOR_SPAN = 256, SUMMARY_ANCHOR_LIMIT = 64, summaryCandidateSets, summaryCandidateEpochs, writtenSummaryIds, indexedCountUnsupported, ordinalJsonRowsRead = 0, summaryFullScans = 0, ANCHOR_ROWS_SQL, SUMMARY_FULL_SCAN_SQL, SUMMARY_SCAN_AFTER_SQL, ANCHOR_CHECK_SQL = "SELECT rowid AS rid, id FROM message WHERE rowid IN (SELECT value FROM json_each(?))", ordinalCheckpoints, ordinalSummarySeeds, ORDINAL_LOOKUP_LIMIT = 512, RawOrdinalsNotReady, CANONICAL_COUNT_SQL;
+        ELSE '' END = 'stop')`, ORDINAL_RANGE_FROM_START_SQL, ORDINAL_RANGE_BETWEEN_SQL, ordinalWatermarks, ordinalWatermarkEpochs, ordinalRowsVisited = 0, STABLE_STORE_ATTEMPTS = 3, EXCLUDED_ROW_SQL, SUMMARY_ANCHOR_SPAN = 256, SUMMARY_ANCHOR_LIMIT = 64, summaryCandidateSets, summaryCandidateEpochs, writtenSummaryIds, indexedCountUnsupported, ordinalJsonRowsRead = 0, summaryFullScans = 0, ANCHOR_ROWS_SQL, SUMMARY_FULL_SCAN_SQL, SUMMARY_SCAN_AFTER_SQL, ANCHOR_CHECK_SQL = "SELECT rowid AS rid, id FROM message WHERE rowid IN (SELECT value FROM json_each(?))", ordinalCheckpoints, ordinalSummarySeeds, ORDINAL_LOOKUP_LIMIT = 512, RawOrdinalsNotReady, CANONICAL_COUNT_SQL, 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(?))`, BOUNDARY_MESSAGE_SQL = `
+    SELECT id, data, time_created FROM message
+    WHERE +session_id = ? AND id IN (SELECT value FROM json_each(?))`, 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`, boundaryEndpointCaches, BOUNDARY_ENDPOINT_CACHE_SESSIONS = 16, boundaryEndpointRowsRead = 0;
 var init_read_session_raw = __esm(async () => {
   await __promiseAll([
     init_sqlite(),
@@ -31429,6 +31626,7 @@ END`;
     }
   };
   CANONICAL_COUNT_SQL = new Map;
+  boundaryEndpointCaches = new WeakMap;
 });
 
 // ../plugin/src/hooks/magic-context/raw-ordinal-warmup.ts
@@ -31641,7 +31839,7 @@ function getMessageTimesFromOpenCodeDb(sessionId, messageIds) {
   try {
     withReadOnlySessionDb((db) => {
       const placeholders = messageIds.map(() => "?").join(",");
-      const rows = db.prepare(`SELECT id, time_created FROM message WHERE session_id = ? AND id IN (${placeholders})`).all(sessionId, ...messageIds);
+      const rows = db.prepare(`SELECT id, time_created FROM message WHERE +session_id = ? AND id IN (${placeholders})`).all(sessionId, ...messageIds);
       for (const row of rows) {
         if (typeof row.id === "string" && typeof row.time_created === "number") {
           result.set(row.id, row.time_created);
@@ -31978,6 +32176,7 @@ __export(exports_read_session_chunk, {
   prepareRawSessionOrdinals: () => prepareRawSessionOrdinals,
   primeInMemoryTailRawMessageCache: () => primeInMemoryTailRawMessageCache,
   primeTailRawMessageCache: () => primeTailRawMessageCache,
+  readRawSessionBoundaryEndpoints: () => readRawSessionBoundaryEndpoints,
   readRawSessionMessageById: () => readRawSessionMessageById,
   readRawSessionMessageIdOrdinals: () => readRawSessionMessageIdOrdinals,
   readRawSessionMessageIdOrdinalsForRange: () => readRawSessionMessageIdOrdinalsForRange,
@@ -32390,6 +32589,13 @@ function readRawSessionMessagePartsById(sessionId, messageId, onQuery) {
     return null;
   return withReadOnlySessionDb((db) => readRawSessionMessagePartsByIdFromDb(db, sessionId, messageId, onQuery));
 }
+function readRawSessionBoundaryEndpoints(sessionId, ids, blockIds) {
+  if (sessionProviders.get(sessionId)?.provider)
+    return null;
+  if (!openCodeDbExists())
+    return new Map(ids.map((id) => [id, null]));
+  return withReadOnlySessionDb((db) => readRawSessionBoundaryEndpointsFromDb(db, sessionId, ids, blockIds));
+}
 function hasRawSessionMessageById(sessionId, messageId) {
   const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.hasMessageById)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cortexkit/magic-context",
-    "version": "0.48.0",
+    "version": "0.49.0",
     "description": "Unified CLI for Magic Context — setup, doctor, and migration across OpenCode, Pi, and OMP",
     "keywords": [
         "opencode",