@cortexkit/pi-magic-context 0.49.35 → 0.49.36

package/dist/{index-mkh1cm5k.js → index-c1dqxr10.js}

@@ -5,13 +5,16 @@ import {
 } from "./index-2qtx0q6h.js";
 import {
   registerExitAbort
-} from "./index-399p688g.js";
+} from "./index-8sqebjzk.js";
 import {
   log2
 } from "./index-gymgz20n.js";
+import {
+  reuseWorker
+} from "./index-wfqysrwq.js";
 import {
   createWorkerShutdown
-} from "./index-54wmg4rj.js";
+} from "./index-x2n261wp.js";
 
 // ../plugin/src/hooks/magic-context/read-session-raw.ts
 import { isMainThread } from "node:worker_threads";
@@ -60,6 +63,7 @@ function runSessionWarmupWorker(input, options) {
       clearTimeout(deadline);
       options.signal?.removeEventListener("abort", abort);
       if (worker) {
+        worker.off("online", startDeadline);
         activeWorkers.delete(worker);
         const stopped = shutdown?.close() ?? worker.terminate();
         worker.unref();
@@ -77,6 +81,10 @@ function runSessionWarmupWorker(input, options) {
       deadline = setTimeout(() => finish({ failure, detail: `no reply within ${ms} ms` }), ms);
       deadline.unref?.();
     };
+    const startDeadline = () => {
+      if (!settled)
+        arm("not-accepted", options.acceptMs ?? ACCEPT_TIMEOUT_MS);
+    };
     const abort = () => finish({ failure: "stopped", detail: "stopped" });
     if (options.signal?.aborted) {
       abort();
@@ -84,8 +92,14 @@ function runSessionWarmupWorker(input, options) {
     }
     options.signal?.addEventListener("abort", abort, { once: true });
     try {
-      worker = inRootAsyncContext2(() => new Worker(options.entry ?? defaultEntry(), {
+      worker = inRootAsyncContext2(() => options.entry ? new Worker(options.entry, {
         workerData: { ...input, openCancellation: openCancellation.buffer }
+      }) : reuseWorker(defaultEntry(), {
+        workerData: {
+          ...input,
+          job: rawWorkerJobKind(input),
+          openCancellation: openCancellation.buffer
+        }
       }));
       shutdown = createWorkerShutdown(worker, "raw-ordinal-warmup", WARMUP_CLOSE_DEADLINE_MS);
     } catch (error) {
@@ -94,7 +108,10 @@ function runSessionWarmupWorker(input, options) {
     }
     worker.unref();
     activeWorkers.set(worker, (failure) => finish({ failure, detail: "stopped" }));
-    arm("not-accepted", options.acceptMs ?? ACCEPT_TIMEOUT_MS);
+    if (options.entry)
+      startDeadline();
+    else
+      worker.once("online", startDeadline);
     worker.on("message", (reply) => {
       if (reply.kind === "accepted")
         arm("no-result", options.resultMs ?? RESULT_TIMEOUT_MS);
@@ -124,6 +141,19 @@ function runSessionWarmupWorker(input, options) {
     worker.on("exit", (code) => finish({ failure: "exited", detail: `exit code ${code}` }));
   });
 }
+function rawWorkerJobKind(input) {
+  if (input.indexMessage)
+    return "index-message";
+  if (input.ftsRowidBackfill)
+    return "fts-rowid-backfill";
+  if (input.searchArchive)
+    return "search-archive";
+  if (input.exactOrdinalIds)
+    return "exact-ordinal-ids";
+  if (input.tagRatio !== undefined)
+    return input.tagState ? "tag-delta" : "tag-summary";
+  return "ordinal-scan";
+}
 function prewarmRawSessionOrdinalsForDb(db, sessionId, options = {}) {
   if (isRawSessionSummaryWarm2(db, sessionId))
     return Promise.resolve("warm");

package/dist/{index-rgvqh5x7.js → index-ck8wj35v.js}

@@ -5,7 +5,7 @@ import {
 } from "./index-2qtx0q6h.js";
 import {
   runSessionWarmupWorker
-} from "./index-mkh1cm5k.js";
+} from "./index-c1dqxr10.js";
 import {
   logSlowWriteTransaction
 } from "./index-0wtm7g7f.js";

package/dist/{index-fzm8fm4z.js → index-dgqjq8sg.js}

@@ -52,11 +52,11 @@ import {
 } from "./index-2qtx0q6h.js";
 import {
   noteRawSessionSummaryRowWritten2
-} from "./index-mkh1cm5k.js";
+} from "./index-c1dqxr10.js";
 import {
   piHarnessKindFromExecutable,
   getErrorMessage
-} from "./index-11knwv2h.js";
+} from "./index-a7sj2bam.js";
 import {
   getOrCreateSessionMeta,
   updateSessionMeta,
@@ -70,10 +70,10 @@ import {
   renderMessageByOrdinal2,
   renderVerboseRange2,
   renderItemByTag2
-} from "./index-d21rhpbd.js";
+} from "./index-p9jfa33t.js";
 import {
   getLastIndexedOrdinal
-} from "./index-8m82cez2.js";
+} from "./index-kj49vs41.js";
 import {
   setNoteLastReadAt,
   getPersistedCompactionMarkerState,
@@ -83,7 +83,7 @@ import {
   hasRawMessageProvider2,
   setRawMessageProvider2,
   readSessionChunk2
-} from "./index-svqk0701.js";
+} from "./index-mx757f3g.js";
 import {
   stableStringify
 } from "./index-yacs388s.js";
@@ -120,7 +120,7 @@ import {
   unregisterProjectEmbedding2,
   getProjectEmbeddingSnapshot2,
   embedTextForProject2
-} from "./index-a11nmw5t.js";
+} from "./index-z7dktknj.js";
 import {
   directoryHasGitMetadata,
   resolveProjectIdentityForSession,
@@ -133,7 +133,7 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-yg42q9bc.js";
+} from "./index-f6y7mdq9.js";
 import {
   TODO_STATUSES,
   TODO_PRIORITIES,
@@ -144,7 +144,7 @@ import {
   getInertWhitespaceAssistantTagsByNumbers2,
   getTagNumberByMessageId2,
   getTagsBySession2
-} from "./index-yhsmjvqa.js";
+} from "./index-pwp6zyx3.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration
@@ -174,10 +174,10 @@ import {
   isMarkerCandidateBasisCurrent2,
   invalidateMarkerCandidateBasis2,
   readMarkerCandidateBasis2
-} from "./index-d0w84hy5.js";
+} from "./index-y90fxz4t.js";
 import {
   renderSearchArchive2
-} from "./index-m68qfjte.js";
+} from "./index-ry84c8dr.js";
 import {
   computeNormalizedHash
 } from "./index-9x1f96r8.js";
@@ -5017,46 +5017,36 @@ function isCompactionMarkerIntentAbsent(marker, targetEndMessageId) {
 function withCompactionMarkerPublicationLock(operation) {
   return runMarkerWriteTransaction(getWritableOpenCodeDb(), "compaction-marker-replace", operation);
 }
-function inspectCompactionMarkerPublication(sessionId, recognized, summaryText) {
+function inspectCompactionMarkerPublication(sessionId, recognized, summaryText, targetBoundaryMessageId, preferred) {
   const db = getWritableOpenCodeDb();
   const basis = readMarkerCandidateBasis2(db, sessionId);
   if (!basis)
     return { kind: "deferred" };
   const pairs = [];
   for (const id of basis.ids) {
-    const rows = db.prepare(`SELECT m.id AS summaryId, p.message_id AS boundaryId, p.id AS partId
-             FROM message m JOIN part p ON p.message_id = json_extract(m.data, '$.parentID')
-               AND +p.session_id = m.session_id
-             WHERE m.id = ? AND m.session_id = ? AND json_extract(m.data, '$.summary') = 1
-               AND COALESCE(json_extract(m.data, '$.finish'), '') <> ''
-               AND json_extract(p.data, '$.type') = 'compaction'`).all(id, sessionId);
-    pairs.push(...rows);
-  }
-  if (pairs.length > 1)
-    return { kind: "ambiguous" };
-  if (pairs.length === 0) {
-    for (const marker of recognized) {
-      if (db.prepare(`SELECT 1 FROM message WHERE id = ?
-                UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(marker.summaryMessageId, marker.compactionPartId, marker.summaryPartId))
-        return { kind: "ambiguous" };
-    }
-    return { kind: "verified", marker: null };
-  }
-  const pair = pairs[0];
-  const marker = recognized.find((item) => item.summaryMessageId === pair.summaryId && item.boundaryMessageId === pair.boundaryId && item.compactionPartId === pair.partId);
-  if (!marker)
-    return { kind: "ambiguous" };
-  for (const other of recognized) {
-    if (other.summaryMessageId === marker.summaryMessageId && other.compactionPartId === marker.compactionPartId && other.summaryPartId === marker.summaryPartId)
-      continue;
-    if (db.prepare(`SELECT 1 FROM message WHERE id = ?
-            UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(other.summaryMessageId, other.compactionPartId, other.summaryPartId))
+    const rows = db.prepare(`SELECT m.id AS summaryId, p.message_id AS boundaryId, p.id AS partId,
+                        p.data AS compactionData
+              FROM message m LEFT JOIN part p ON p.message_id = json_extract(m.data, '$.parentID')
+                AND +p.session_id = m.session_id
+                AND json_extract(p.data, '$.type') = 'compaction'
+               WHERE m.id = ? AND m.session_id = ? AND json_extract(m.data, '$.summary') = 1
+                 AND json_extract(m.data, '$.providerID') = 'magic-context'`).all(id, sessionId);
+    const canonical = rows.filter((row) => isMcCanonicalCompactionPartData(JSON.parse(row.compactionData ?? "null")));
+    if (rows.length > 0 && canonical.length === 0)
       return { kind: "ambiguous" };
+    pairs.push(...canonical);
   }
-  const row = db.prepare(`SELECT c.data AS compactionData FROM message m
+  const verified = [];
+  for (const pair of pairs) {
+    if (pair.partId === null)
+      return { kind: "ambiguous" };
+    if (verified.some((marker) => marker.boundaryMessageId === pair.boundaryId))
+      return { kind: "ambiguous" };
+    const row = db.prepare(`SELECT c.data AS compactionData, t.id AS summaryPartId,
+                    m.time_created AS timeCreated FROM message m
          JOIN message b ON b.id = ? AND b.session_id = m.session_id
          JOIN part c ON c.id = ? AND c.message_id = b.id AND c.session_id = m.session_id
-         JOIN part t ON t.id = ? AND t.message_id = m.id AND t.session_id = m.session_id
+         JOIN part t ON t.message_id = m.id AND t.session_id = m.session_id
          WHERE m.id = ? AND m.session_id = ?
            AND json_extract(b.data, '$.role') = 'user'
            AND json_extract(m.data, '$.role') = 'assistant'
@@ -5067,10 +5057,39 @@ function inspectCompactionMarkerPublication(sessionId, recognized, summaryText)
            AND json_extract(m.data, '$.providerID') = 'magic-context'
            AND json_extract(m.data, '$.modelID') = 'magic-context'
            AND json_extract(t.data, '$.type') = 'text' AND json_extract(t.data, '$.text') = ?
-           AND (SELECT COUNT(*) FROM part p WHERE p.message_id = m.id AND +p.session_id = m.session_id) = 1`).get(marker.boundaryMessageId, marker.compactionPartId, marker.summaryPartId, marker.summaryMessageId, sessionId, summaryText);
-  if (!row || !isMcCanonicalCompactionPartData(JSON.parse(row.compactionData)) || findBoundaryUserMessage(sessionId, marker.boundaryMessageId)?.id !== marker.boundaryMessageId)
-    return { kind: "ambiguous" };
-  return { kind: "verified", marker };
+           AND (SELECT COUNT(*) FROM part p WHERE p.message_id = m.id AND +p.session_id = m.session_id) = 1`).get(pair.boundaryId, pair.partId, pair.summaryId, sessionId, summaryText);
+    const order = compareOpenCodeMessagesByCanonicalOrder(sessionId, pair.boundaryId, targetBoundaryMessageId);
+    const isRecorded = preferred && preferred.summaryMessageId === pair.summaryId && preferred.boundaryMessageId === pair.boundaryId && preferred.compactionPartId === pair.partId && preferred.summaryPartId === row?.summaryPartId;
+    if (!row || !isMcCanonicalCompactionPartData(JSON.parse(row.compactionData)) || findBoundaryUserMessage(sessionId, pair.boundaryId)?.id !== pair.boundaryId || order === null || order > 0 && !isRecorded)
+      return { kind: "ambiguous" };
+    verified.push({
+      boundaryMessageId: pair.boundaryId,
+      summaryMessageId: pair.summaryId,
+      compactionPartId: pair.partId,
+      summaryPartId: row.summaryPartId,
+      timeCreated: row.timeCreated
+    });
+  }
+  const matches = (left, right) => left.summaryMessageId === right.summaryMessageId && left.boundaryMessageId === right.boundaryMessageId && left.compactionPartId === right.compactionPartId && left.summaryPartId === right.summaryPartId;
+  for (const marker of recognized) {
+    if (verified.some((item) => matches(item, marker)))
+      continue;
+    if (db.prepare(`SELECT 1 FROM message WHERE id = ?
+            UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(marker.summaryMessageId, marker.compactionPartId, marker.summaryPartId))
+      return { kind: "ambiguous" };
+  }
+  verified.sort((left, right) => right.timeCreated - left.timeCreated || (left.summaryMessageId < right.summaryMessageId ? 1 : -1));
+  const state = (marker) => {
+    if (!marker)
+      return null;
+    const { timeCreated: _, ...ids } = marker;
+    return ids;
+  };
+  return {
+    kind: "verified",
+    marker: state(preferred && verified.find((item) => matches(item, preferred)) || verified[0]),
+    markerAtTarget: state(verified.find((item) => item.boundaryMessageId === targetBoundaryMessageId))
+  };
 }
 var LEGACY_MARKER_LINEAGE_SQL = `SELECT m.id
     FROM message m
@@ -5100,7 +5119,7 @@ function removeLegacyMarkerLineageRows(db, args) {
            AND COALESCE(json_extract(data, '$.type'), '') = 'compaction'
            AND COALESCE(json_extract(data, '$.auto'), 0) = 1`).run(args.sessionId, args.boundaryMessageId, args.compactionPartId);
 }
-function injectCompactionMarkerFromBasis(args, validatedBasis) {
+function injectCompactionMarkerFromBasis(args, validatedBasis, preserveExistingLineages = false) {
   const db = getWritableOpenCodeDb();
   if (!isOpenCodeSchemaCompatible(db, getOpenCodeDbPath())) {
     return null;
@@ -5137,14 +5156,15 @@ function injectCompactionMarkerFromBasis(args, validatedBasis) {
     runMarkerWriteTransaction(db, "compaction-marker-inject", () => {
       if (!validatedBasis && !isMarkerCandidateBasisCurrent2(db, basis))
         throw new Error("host store changed after marker candidate preparation; marker unchanged");
-      removeLegacyMarkerLineageRows(db, {
-        sessionId: args.sessionId,
-        boundaryMessageId: boundary.id,
-        candidateIds: basis.ids,
-        summaryText: args.summaryText,
-        summaryMessageId: summaryMsgId,
-        compactionPartId
-      });
+      if (!preserveExistingLineages)
+        removeLegacyMarkerLineageRows(db, {
+          sessionId: args.sessionId,
+          boundaryMessageId: boundary.id,
+          candidateIds: basis.ids,
+          summaryText: args.summaryText,
+          summaryMessageId: summaryMsgId,
+          compactionPartId
+        });
       db.prepare(`INSERT INTO part (id, message_id, session_id, time_created, time_updated, data)
                  VALUES (?, ?, ?, ?, ?, ?)
                  ON CONFLICT(id) DO UPDATE SET
@@ -5186,7 +5206,7 @@ function injectCompactionMarkerFromBasis(args, validatedBasis) {
 
 class MarkerCandidateUnavailableError extends Error {
 }
-function replaceCompactionMarker(existing, args) {
+function replaceCompactionMarker(existing, args, preserveExistingLineages = false) {
   let connection;
   let entered = false;
   let readyToCommit = false;
@@ -5205,11 +5225,25 @@ function replaceCompactionMarker(existing, args) {
       if (!isMarkerCandidateBasisCurrent2(db, basis))
         throw new MarkerCandidateUnavailableError("host store changed after marker candidate preparation; marker unchanged");
       if (existing) {
+        const referenced = db.prepare(`WITH deleted(id) AS (VALUES (?), (?), (?)), surviving(data) AS (
+                            SELECT data FROM part WHERE session_id = ?
+                              AND id NOT IN (SELECT id FROM deleted)
+                              AND json_extract(data, '$.type') = 'compaction'
+                            UNION ALL
+                            SELECT data FROM message WHERE session_id = ?
+                              AND id NOT IN (SELECT id FROM deleted)
+                        )
+                        SELECT 1 FROM surviving
+                        WHERE json_extract(data, '$.tail_start_id') IN (SELECT id FROM deleted)
+                           OR json_extract(data, '$.compaction.tail_start_id') IN (SELECT id FROM deleted)
+                        LIMIT 1`).get(existing.summaryMessageId, existing.summaryPartId, existing.compactionPartId, args.sessionId, args.sessionId);
+        if (referenced)
+          throw new Error("a surviving tail_start_id references a recorded marker row; marker unchanged");
         db.prepare("DELETE FROM part WHERE id = ?").run(existing.summaryPartId);
         db.prepare("DELETE FROM message WHERE id = ?").run(existing.summaryMessageId);
         db.prepare("DELETE FROM part WHERE id = ?").run(existing.compactionPartId);
       }
-      const replacement = injectCompactionMarkerFromBasis(args, basis);
+      const replacement = injectCompactionMarkerFromBasis(args, basis, preserveExistingLineages);
       if (!replacement) {
         throw new Error(`failed to inject replacement marker at ordinal ${args.endOrdinal}`);
       }
@@ -5291,7 +5325,7 @@ function publishRecoverableCompactionMarker(db, args, targetIsCurrent) {
         if (!validTarget || !pendingBoundary || !pendingTarget || !samePair(pending, planCompactionMarker({ ...args, endMessageId: pendingTarget }, pendingBoundary)))
           pending = null;
       }
-      const inspection = inspectCompactionMarkerPublication(sessionId, [intended, ...previous ? [previous] : [], ...pending ? [pending] : []], args.summaryText);
+      const inspection = inspectCompactionMarkerPublication(sessionId, [intended, ...previous ? [previous] : [], ...pending ? [pending] : []], args.summaryText, boundary.id, previous);
       if (inspection.kind === "deferred") {
         reason = "candidate-preparation";
         return {
@@ -5308,22 +5342,34 @@ function publishRecoverableCompactionMarker(db, args, targetIsCurrent) {
       }
       cut = "definitely-no-cut";
       const host = inspection.marker;
-      if (host && (pending && samePair(host, pending) || samePair(host, intended))) {
-        const adopted = pending && samePair(host, pending) ? pending : intended;
-        recovered = adopted === pending ? "pending-intent-recovered" : "adopted-existing-pair";
+      if (inspection.markerAtTarget) {
+        const hostOrder = host ? compareOpenCodeMessagesByCanonicalOrder(sessionId, host.boundaryMessageId, boundary.id) : 0;
+        if (hostOrder === null || hostOrder > 0) {
+          reason = "ahead-of-target-left-alone";
+          return {
+            kind: cut,
+            error: new Error("a later recorded host cut prevents target adoption")
+          };
+        }
+        intended = { ...intended, ...inspection.markerAtTarget };
+        recovered = pending && samePair(intended, pending) ? "pending-intent-recovered" : "adopted-existing-pair";
         cut = "uncertain";
-        if (samePair(host, intended))
-          return { kind: "committed", marker: host };
-        persist(adopted);
+        return { kind: "committed", marker: inspection.markerAtTarget };
+      }
+      if (host && pending && samePair(host, pending)) {
+        recovered = "pending-intent-recovered";
+        cut = "uncertain";
+        persist(pending);
       }
       writingState = true;
       raw = compareAndSetCompactionMarkerPublicationState(db, sessionId, raw, previous, intended);
       writingState = false;
       cut = "uncertain";
-      const replacement = replaceCompactionMarker(host, {
+      const ownedHost = host && (previous && samePair(host, previous) || pending && samePair(host, pending)) ? host : null;
+      const replacement = replaceCompactionMarker(ownedHost, {
         ...args,
         resolvedBoundary: boundary
-      });
+      }, true);
       if (recovered && replacement.kind !== "committed")
         return { kind: "uncertain", error: replacement.error };
       if (replacement.kind !== "committed")
@@ -8147,6 +8193,20 @@ var DreamerParamsSchema = _Object_({
     description: "Active same-project/category memory that survives a curate consolidation"
   }))
 }, { additionalProperties: true });
+function rejectInvalidMemoryArguments(args) {
+  if (args === null || typeof args !== "object")
+    return;
+  const record = args;
+  if (record.content !== undefined && typeof record.content !== "string") {
+    throw new Error("Error: 'content' must be a string.");
+  }
+  if (record.reason !== undefined && typeof record.reason !== "string") {
+    throw new Error("Error: 'reason' must be a string.");
+  }
+  if (record.ids !== undefined && (!Array.isArray(record.ids) || record.ids.some((id) => typeof id !== "number" || !Number.isSafeInteger(id) || id < 1))) {
+    throw new Error("Error: 'ids' must be an array of positive memory IDs.");
+  }
+}
 function ok2(text) {
   return { content: [{ type: "text", text }], details: undefined };
 }
@@ -8271,6 +8331,10 @@ function createCtxMemoryTool(deps) {
     label: "Magic Context: Memory",
     description: CTX_MEMORY_DESCRIPTION,
     parameters: dreamerAllowed ? DreamerParamsSchema : PrimaryParamsSchema,
+    prepareArguments(args) {
+      rejectInvalidMemoryArguments(args);
+      return args;
+    },
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       params = unwrapImitatedReducedArgs(params, ["action"], {
         action: { type: "enum", values: ALL_ACTIONS },
@@ -9199,6 +9263,17 @@ var ParamsSchema2 = _Object_({
     description: "Skip this many newest rows (default 0)."
   }))
 }, { additionalProperties: true });
+function rejectInvalidNoteArguments(args) {
+  if (args === null || typeof args !== "object")
+    return;
+  const record = args;
+  if (record.content !== undefined && typeof record.content !== "string") {
+    throw new Error("Error: 'content' must be a string.");
+  }
+  if (record.note_ids !== undefined && (!Array.isArray(record.note_ids) || record.note_ids.some((id) => typeof id !== "number" || !Number.isSafeInteger(id) || id < 1))) {
+    throw new Error("Error: 'note_ids' must be an array of positive note IDs.");
+  }
+}
 function ok3(text) {
   return { content: [{ type: "text", text }], details: undefined };
 }
@@ -9261,6 +9336,10 @@ function createCtxNoteTool(deps) {
     label: "Magic Context: Notes",
     description: smartNoteSurface ? CTX_NOTE_DESCRIPTION : withoutSmartNoteText(CTX_NOTE_DESCRIPTION),
     parameters,
+    prepareArguments(args) {
+      rejectInvalidNoteArguments(args);
+      return args;
+    },
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       params = unwrapImitatedReducedArgs(params, ["action", "content"], {
         action: {

package/dist/{index-yg42q9bc.js → index-f6y7mdq9.js}

@@ -24,13 +24,13 @@ import {
 } from "./index-2qtx0q6h.js";
 import {
   runSessionWarmupWorker
-} from "./index-mkh1cm5k.js";
+} from "./index-c1dqxr10.js";
 import {
   buildCanonicalChunkTextFromFts2,
   loadCompartmentChunkEmbeddingsForSearch2,
   peekCompartmentChunkSearchPool2,
   warmCompartmentChunkSearchPool2
-} from "./index-2p691ayw.js";
+} from "./index-f9qet7y8.js";
 import {
   saveCommitEmbedding,
   loadProjectCommitEmbeddings,
@@ -47,7 +47,7 @@ import {
   getProjectEmbeddingSnapshot2,
   embedTextForProject2,
   embedItemsForProject2
-} from "./index-a11nmw5t.js";
+} from "./index-z7dktknj.js";
 import {
   recordEmbeddingMeasurement
 } from "./index-hgd00nas.js";
@@ -63,7 +63,7 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./index-vgfk2xa5.js";
+} from "./index-jbkwszd5.js";
 import {
   getMemorySelectColumns2,
   isMemoryRow2,
@@ -91,7 +91,7 @@ import {
   clearIndexedMessages,
   indexSingleMessage,
   indexMessagesAfterOrdinal
-} from "./index-8m82cez2.js";
+} from "./index-kj49vs41.js";
 import {
   MESSAGE_FTS_SESSION_FILTER_SQL,
   withMessageFtsSessionFilter
@@ -1886,6 +1886,7 @@ var RERANK_MODEL = "gte-reranker-modernbert-base-f32";
 var RERANK_LANE_LIMIT = 25;
 var DEADLINE_MS = 1500;
 var DOCUMENT_BYTES = 1024;
+var proseWordSegmenter = new Intl.Segmenter(undefined, { granularity: "word" });
 function isProseQuery(query) {
   const text = query.trim();
   if (!text || /[\n;]|^["'`]|["'`]$/.test(text))
@@ -1894,10 +1895,10 @@ function isProseQuery(query) {
     return false;
   if (/\b(?:[A-Z][A-Z_]+:|\w*(?:Error|Exception):)|\bat\s+\S+\s*\(/.test(text))
     return false;
-  const words = text.replace(/[?!.]$/, "").split(/\s+/);
+  const words = /(?![a-zA-Z])\p{L}/u.test(text) ? [...proseWordSegmenter.segment(text)].filter((word) => word.isWordLike).map((word) => word.segment) : text.replace(/[?!.]$/, "").split(/\s+/);
   if (words.length < 3)
     return false;
-  const plain = words.filter((word) => /^[a-zA-Z]+(?:['’-][a-zA-Z]+)*$/.test(word));
+  const plain = words.filter((word) => /^[\p{L}\p{M}]+(?:['’-][\p{L}\p{M}]+)*$/u.test(word));
   if (/^(?:how|why|what|where|when|which|who)\b/i.test(text))
     return plain.length >= 3;
   return words.length >= 4 && plain.length >= 3 && !/[\\/]|::|=/.test(text);

package/dist/{index-2p691ayw.js → index-f9qet7y8.js}

@@ -13,7 +13,7 @@ import {
 } from "./index-rzfr7wdv.js";
 import {
   messageFtsOrdinalRangeIsMapped2
-} from "./index-rgvqh5x7.js";
+} from "./index-ck8wj35v.js";
 import {
   isKnownAutocommit
 } from "./index-nrzkqte4.js";

package/dist/{index-6y6v2wvn.js → index-gxqmh9hq.js}

@@ -1,12 +1,12 @@
 import {
   registerExitAbort
-} from "./index-399p688g.js";
+} from "./index-8sqebjzk.js";
 import {
   inRootAsyncContext2
 } from "./index-2qtx0q6h.js";
 import {
   createWorkerShutdown
-} from "./index-54wmg4rj.js";
+} from "./index-x2n261wp.js";
 
 // ../plugin/src/tools/ctx-expand/v2-archive-reader.ts
 import { Worker } from "node:worker_threads";
@@ -138,10 +138,10 @@ async function serveV2ArchiveReads2(port, openConnections) {
   ] = await Promise.all([
     import("./sqlite-v89bj0yy.js"),
     import("./store-reader-2m80zs5z.js"),
-    import("./store-kabezr25.js"),
-    import("./read-session-chunk-nbcznexm.js"),
-    import("./render-d931g2vv.js"),
-    import("./search-archive-a76pp30g.js"),
+    import("./store-v60q7dje.js"),
+    import("./read-session-chunk-jxq427v6.js"),
+    import("./render-2wan3bfh.js"),
+    import("./search-archive-pgrv04gv.js"),
     import("./expand-attachments-8sxeyj26.js")
   ]);
   const pool = new V2StoreReaderPool;

package/dist/{index-vgfk2xa5.js → index-jbkwszd5.js}

@@ -15,7 +15,7 @@ import {
   OpenAICompatibleEmbeddingProvider,
   getProjectEmbeddingSnapshot2,
   embedBatchForProject2
-} from "./index-a11nmw5t.js";
+} from "./index-z7dktknj.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-9p40dgkm.js";

package/dist/{index-8m82cez2.js → index-kj49vs41.js}

@@ -9,13 +9,13 @@ import {
 } from "./index-wt7vmyj4.js";
 import {
   cleanUserText2
-} from "./index-svqk0701.js";
+} from "./index-mx757f3g.js";
 import {
   recordMessageFtsRowid2,
   recordIndexedMessageTime2,
   messageFtsOrdinalRangeIsMapped2,
   deleteUnmappedMessageFtsRows2
-} from "./index-rgvqh5x7.js";
+} from "./index-ck8wj35v.js";
 import {
   logSlowWriteTransaction
 } from "./index-0wtm7g7f.js";

package/dist/{index-svqk0701.js → index-mx757f3g.js}

@@ -23,7 +23,7 @@ import {
   TAG_SELECT_COLUMNS2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-yhsmjvqa.js";
+} from "./index-pwp6zyx3.js";
 import {
   OMO_INTERNAL_INITIATOR_MARKER,
   isSystemDirective,
@@ -71,7 +71,7 @@ import {
   hasRawSessionMessageByIdFromDb2,
   readRawSeedTailFromDb2,
   readRawSessionBoundaryEndpointsFromDb2
-} from "./index-mkh1cm5k.js";
+} from "./index-c1dqxr10.js";
 import {
   markHostUnservedRow,
   isHostUnservedRow
@@ -102,6 +102,8 @@ var OVERFLOW_PATTERNS = [
   /request entity too large/i,
   /context length is only \d+ tokens/i,
   /input length.*exceeds.*context length/i,
+  /\bContextWindowExceededError\b/i,
+  /\bthe input \(\d+ tokens?\) is longer than the model's context length \(\d+ tokens?\)/i,
   /prompt too long; exceeded (?:max )?context length/i,
   /too large for model with \d+ maximum context length/i,
   /model_context_window_exceeded/i,
@@ -124,6 +126,10 @@ var LIMIT_EXTRACTION_PATTERNS = [
   },
   { pattern: /context size[^0-9]{0,40}(\d{4,})\s*tokens?/i, provenance: "combined" },
   { pattern: /exceeds? the context length of (\d+)/i, provenance: "combined" },
+  {
+    pattern: /\bthe input \(\d+ tokens?\) is longer than the model's context length \((\d+) tokens?\)/i,
+    provenance: "combined"
+  },
   {
     pattern: />\s*(\d+)\s*(?:tokens?\s*)?(?:maximum|max|limit)\b/i,
     provenance: "prompt_only"
@@ -262,7 +268,9 @@ function parseReportedInputTokens(message) {
     /input token count\s*\(?\s*(\d+)/i,
     /input length\s*(\d+)/i,
     /prompt was\s*(\d+)/i,
-    /messages resulted in\s*(\d+)\s*tokens?/i
+    /messages resulted in\s*(\d+)\s*tokens?/i,
+    /\bthe input \((\d+) tokens?\) is longer than the model's context length \(\d+ tokens?\)/i,
+    /\(\s*(\d+)\s+in the messages,\s*\d+\s+in the completion\s*\)/i
   ];
   for (const pattern of patterns) {
     const raw = message.match(pattern)?.[1];
@@ -3126,7 +3134,7 @@ function looksImageLike(part) {
   const type = typeof part.type === "string" ? part.type.toLowerCase() : "";
   const mime = typeof part.mime === "string" ? part.mime.toLowerCase() : "";
   const mediaType = typeof part.mediaType === "string" ? part.mediaType.toLowerCase() : "";
-  return type.includes("image") || mime.startsWith("image/") || mediaType.startsWith("image/") || part.image_url !== undefined || part.imageUrl !== undefined || part.image !== undefined;
+  return type.includes("image") || mime.startsWith("image/") || mediaType.startsWith("image/") || part.image_url !== undefined || part.imageUrl !== undefined || part.image !== undefined || type.includes("file") && (typeof part.url === "string" && part.url.startsWith("data:image/") || typeof part.data === "string" && /^(?:data:image\/|\/9j\/|iVBORw0KGgo|R0lGOD)/.test(part.data));
 }
 function defaultImageTokenHeuristic(part) {
   if (isRecord(part)) {
@@ -3490,7 +3498,7 @@ function buildTrueRawTokenIndex(sessionId, messages, options) {
     } else {
       const raw = tokenForMessage(message, options);
       const seed = options.calibration;
-      total = seed ? (raw.toolInput + raw.toolOutput) * seed.toolsRatio + (raw.text + raw.reasoning + raw.other) * seed.proseRatio + raw.image : raw.total;
+      total = options.measure === "summary-removed" ? raw.text * (seed?.proseRatio ?? 1) + raw.toolInput * (seed?.toolsRatio ?? 1) : seed ? (raw.toolInput + raw.toolOutput) * seed.toolsRatio + (raw.text + raw.reasoning + raw.other) * seed.proseRatio + raw.image : raw.total;
     }
     tokensByOrdinal.set(message.ordinal, total);
     idsByOrdinal.set(message.ordinal, message.id);