@cortexkit/opencode-magic-context 0.49.35 → 0.49.37

package/dist/v2/{server-fqj6ddpr.js → server-5by3vdzs.js}

@@ -20,7 +20,7 @@ import {
   cortexKitProjectConfigBasePath,
   resolveLegacyConfigSourcesForHarness,
   loadPluginConfigDetailed
-} from "./server-9k0mjef7.js";
+} from "./server-avdveykk.js";
 import {
   catalogOutputReserve,
   getSdkContextLimit,
@@ -33,7 +33,7 @@ import {
   resolvePromptSurface,
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   LIVE_RELOAD_CONFIG_PATHS
-} from "./server-24g8r2d0.js";
+} from "./server-7zacmty5.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -48,7 +48,7 @@ import {
   RawOrdinalsNotReady2,
   dropRawSessionOrdinalCheckpoints2,
   runSessionWarmupWorker
-} from "./server-s9xgyyj9.js";
+} from "./server-tnzbk64q.js";
 import {
   providerMass,
   calibrationForModelKey,
@@ -64,7 +64,7 @@ import {
   foldShrunkPartTags2,
   getTagNumberByMessageId2,
   getActiveTagsBySession2
-} from "./server-bpvsvtph.js";
+} from "./server-xfjjbrkt.js";
 import {
   hasMeaningfulUserText2,
   estimateTokens,
@@ -152,7 +152,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./server-1xesqm5h.js";
+} from "./server-jd7vzwn4.js";
 import {
   BoundedSessionMap
 } from "./server-xy7w7hrd.js";
@@ -162,7 +162,7 @@ import {
   toMessageIndexSource,
   clearIndexedMessagesInTransaction,
   indexSourcesAfterOrdinal
-} from "./server-r3chnxs5.js";
+} from "./server-dfq5vb8j.js";
 import {
   COMPARTMENT_LEASE_RENEWAL_MS,
   getCompartmentLeaseBlocker,
@@ -206,7 +206,7 @@ import {
   getProjectState,
   recordSubagentInvocation,
   getLatestHistorianInvocationId
-} from "./server-qf2kzsh2.js";
+} from "./server-t8y64xj7.js";
 import {
   invalidateAutoEmbedSession
 } from "./server-2amn2s73.js";
@@ -219,13 +219,13 @@ import {
   replaceCompartmentChunkEmbeddings2,
   deleteChunkEmbedBackoffForSession2,
   chunkWindowSourceKey2
-} from "./server-hsf0qsn5.js";
+} from "./server-cp1a03vc.js";
 import {
   isMarkerCandidateBasisCurrent2,
   invalidateMarkerCandidateBasis2,
   readMarkerCandidateBasis2,
   prepareMarkerCandidateBasis2
-} from "./server-xbtw0p9t.js";
+} from "./server-r4430x9m.js";
 import {
   shouldSkipHomeProjectMemory,
   resolveProjectIdentity
@@ -236,7 +236,7 @@ import {
   getProjectChunkEmbeddingModelId2,
   getProjectEmbeddingMaxInputTokens2,
   embedItemsForProject2
-} from "./server-bxpz2dcn.js";
+} from "./server-7acq7815.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY,
@@ -255,13 +255,13 @@ import {
   userFacingFailureCode,
   promoteSessionFactsDurable,
   embedPromotedFacts
-} from "./server-q0z2q2dx.js";
+} from "./server-nq3cb7be.js";
 import {
   getSchemaFenceRejection,
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./server-7ccxt4nq.js";
+} from "./server-g3gqq4ac.js";
 import {
   parseCompartmentOutput,
   resolveWorkspaceShareCategories,
@@ -1566,46 +1566,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'
@@ -1616,10 +1606,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
@@ -1659,7 +1678,7 @@ async function prepareCompactionMarkerCandidates(sessionId, options = {}) {
     return false;
   }
 }
-function injectCompactionMarkerFromBasis(args, validatedBasis) {
+function injectCompactionMarkerFromBasis(args, validatedBasis, preserveExistingLineages = false) {
   const db = getWritableOpenCodeDb();
   if (!isOpenCodeSchemaCompatible(db, getOpenCodeDbPath())) {
     return null;
@@ -1696,14 +1715,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
@@ -1745,7 +1765,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;
@@ -1764,11 +1784,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}`);
       }
@@ -3921,6 +3955,18 @@ function messageId(message) {
   const id = infoOf(message).id;
   return typeof id === "string" ? id : null;
 }
+function recordedAssistantError(message) {
+  const info = infoOf(message);
+  if (info.error != null)
+    return info.error;
+  if (isSettledAssistant(message))
+    return;
+  const parts = message?.parts;
+  if (!Array.isArray(parts))
+    return;
+  const retry = parts.slice().reverse().find((part) => part !== null && typeof part === "object" && part.type === "retry");
+  return retry?.error ?? undefined;
+}
 function isSettledAssistant(message) {
   const info = infoOf(message);
   if (info.role !== "assistant")
@@ -4036,6 +4082,22 @@ async function promptAsyncAndWaitForIdle(client, request, options = {}) {
   let completionBaseline = new Set((await readMessages(session, sessionId, dir, signal)).map(messageId).filter((id) => id !== null));
   const initialBaseline = new Set(completionBaseline);
   activeSessionErrors.set(sessionId, undefined);
+  const failForHostError = async (hostError) => {
+    await abortChildRun(client, sessionId);
+    const error = new Error(`Host recorded session error: ${describeAssistantError(hostError)}`);
+    Object.assign(error, {
+      name: "DreamerProviderOutputFailureError",
+      transient: true,
+      [HOST_SESSION_ERROR]: true,
+      hostError
+    });
+    annotateSubagentInvocationError(error, {
+      attemptedModel: requestModelRef(request),
+      modelConfigKey: options.modelConfigKey,
+      hostError
+    });
+    throw error;
+  };
   try {
     let sent;
     try {
@@ -4070,22 +4132,17 @@ async function promptAsyncAndWaitForIdle(client, request, options = {}) {
       await sleep(pollIntervalMs, signal);
       const hostError = activeSessionErrors.get(sessionId);
       if (hostError !== undefined) {
-        const error = new Error(`Host recorded session error: ${describeAssistantError(hostError)}`);
-        Object.assign(error, {
-          name: "DreamerProviderOutputFailureError",
-          transient: true,
-          [HOST_SESSION_ERROR]: true,
-          hostError
-        });
-        annotateSubagentInvocationError(error, {
-          attemptedModel: requestModelRef(request),
-          modelConfigKey: options.modelConfigKey,
-          hostError
-        });
-        throw error;
+        await failForHostError(hostError);
       }
       const status = await readStatus(session, sessionId, dir, signal);
       const messages = await readMessages(session, sessionId, dir, signal);
+      const latestAssistant = messages.slice().reverse().find((message) => {
+        const id = messageId(message);
+        return id !== null && !completionBaseline.has(id) && infoOf(message).role === "assistant";
+      });
+      const assistantError = recordedAssistantError(latestAssistant);
+      if (assistantError !== undefined)
+        await failForHostError(assistantError);
       if (!sawOutput && messages.some((message) => {
         const id = messageId(message);
         return id !== null && !initialBaseline.has(id) && showsModelOutput(message);
@@ -4380,7 +4437,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 {
@@ -4397,22 +4454,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")
@@ -12027,6 +12096,7 @@ function createV1HiddenCompletionExecutor(client, db, directory) {
     async attempt(handle, request) {
       if (!client)
         throw new Error("Hidden completion client is unavailable");
+      hostErrors.delete(handle.id);
       const identity = runIdentities.get(handle.id);
       const requestedModel = request.body?.model;
       const requestedRef = requestedModel && typeof requestedModel.providerID === "string" && typeof requestedModel.modelID === "string" ? `${requestedModel.providerID}/${requestedModel.modelID}` : undefined;
@@ -12069,9 +12139,9 @@ function createV1HiddenCompletionExecutor(client, db, directory) {
       });
       const assistantFailure = extractLatestAssistantFailure(messages);
       const hostError = hostErrors.get(handle.id);
-      if (assistantFailure) {
-        const finish = assistantFailure.finish ? ` (finish=${assistantFailure.finish})` : "";
-        const error = new Error(`Historian host recorded an assistant error${finish}: ${describeAssistantFailure(assistantFailure.error)}`, hostError === undefined ? undefined : { cause: hostError });
+      if (assistantFailure || hostError !== undefined) {
+        const finish = assistantFailure?.finish ? ` (finish=${assistantFailure.finish})` : "";
+        const error = new Error(`Historian host recorded an assistant error${finish}: ${describeAssistantFailure(assistantFailure?.error ?? hostError)}`, hostError === undefined ? undefined : { cause: hostError });
         annotateSubagentInvocationError(error, {
           attemptedModel: handle.attemptedModel,
           modelConfigKey: handle.modelConfigKey,
@@ -13211,7 +13281,9 @@ function resolveProtectedTailBoundary(ctx) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
-  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages) ?? ctx.storedTokenTotals;
+  const storedWeights = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages);
+  const storedTotals = storedWeights?.totals ?? ctx.storedTokenTotals;
+  const storedRemovedTotals = storedWeights?.summaryRemovedTotals ?? ctx.storedSummaryRemovedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
@@ -13222,6 +13294,14 @@ function resolveProtectedTailBoundary(ctx) {
       return v === undefined ? null : v;
     } : undefined
   });
+  const summaryRemovedIndex = buildTrueRawTokenIndex(ctx.sessionId, messages, {
+    providerShapeVersion: ctx.providerShapeVersion,
+    cacheNamespace: ctx.cacheNamespace,
+    calibration: ctx.calibration,
+    absoluteMessageCount,
+    measure: "summary-removed",
+    storedTotalForMessage: storedRemovedTotals ? (m) => storedRemovedTotals.get(m.id) ?? null : undefined
+  });
   const rawMessageCount = index.rawMessageCount;
   const usagePercentage = clampPercentage(ctx.usage?.percentage ?? 0);
   const usageInputTokens = Math.max(0, Math.round(ctx.usage?.inputTokens ?? 0));
@@ -13253,6 +13333,7 @@ function resolveProtectedTailBoundary(ctx) {
       createdAt,
       rawRangeFingerprint: "",
       trueRawEligibleTokens: 0,
+      summaryRemovedEligibleTokens: 0,
       oversizeAtomicUnit: false,
       boundaryReason: "empty-session"
     };
@@ -13296,6 +13377,7 @@ function resolveProtectedTailBoundary(ctx) {
       createdAt,
       rawRangeFingerprint,
       trueRawEligibleTokens: index.rangeTokens(offset, protectedTailStart),
+      summaryRemovedEligibleTokens: summaryRemovedIndex.rangeTokens(offset, protectedTailStart),
       oversizeAtomicUnit: false,
       boundaryReason: firstOpenArc ? "open-tool-arc" : "manual-full-recomp"
     };
@@ -13372,7 +13454,7 @@ function resolveProtectedTailBoundary(ctx) {
     observeDiagnostics: (value) => {
       headDiagnostics = value;
     },
-    index,
+    index: summaryRemovedIndex,
     protectedTailStart,
     offset,
     arcs,
@@ -13411,6 +13493,7 @@ function resolveProtectedTailBoundary(ctx) {
     createdAt,
     rawRangeFingerprint,
     trueRawEligibleTokens: index.rangeTokens(offset, eligibleEndOrdinal),
+    summaryRemovedEligibleTokens: summaryRemovedIndex.rangeTokens(offset, eligibleEndOrdinal),
     oversizeAtomicUnit: head.oversizeAtomicUnit,
     boundaryReason,
     diagnostics: boundaryDiagnostics({
@@ -13458,8 +13541,11 @@ function resolveBoundaryContext(args) {
   const calibration = sessionDecisionCalibration(args.db, args.sessionId);
   const storedTokenTotalsForMessages = (messageIds, messages = []) => {
     try {
-      const totals = getAllStatusTagTokenTotalsFlat2(args.db, args.sessionId, args.taggerFloor ?? 0, calibration, messageIds).totals;
-      return omitIncompleteFileTokenTotals(args.db, args.sessionId, messages, totals);
+      const weights = getAllStatusTagTokenTotalsFlat2(args.db, args.sessionId, args.taggerFloor ?? 0, calibration, messageIds);
+      return {
+        totals: omitIncompleteFileTokenTotals(args.db, args.sessionId, messages, weights.totals),
+        summaryRemovedTotals: weights.summaryRemovedTotals
+      };
     } catch (error) {
       sessionLog2(args.sessionId, "protected-tail stored-token map unavailable (live fallback):", error);
       return;
@@ -13495,7 +13581,9 @@ function resolveWrapupProtectedTailBoundary(args) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
-  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages) ?? ctx.storedTokenTotals;
+  const storedWeights = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages);
+  const storedTotals = storedWeights?.totals ?? ctx.storedTokenTotals;
+  const storedRemovedTotals = storedWeights?.summaryRemovedTotals ?? ctx.storedSummaryRemovedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
@@ -13506,6 +13594,14 @@ function resolveWrapupProtectedTailBoundary(args) {
       return value === undefined ? null : value;
     } : undefined
   });
+  const summaryRemovedIndex = buildTrueRawTokenIndex(ctx.sessionId, messages, {
+    providerShapeVersion: ctx.providerShapeVersion,
+    cacheNamespace: ctx.cacheNamespace,
+    calibration: ctx.calibration,
+    absoluteMessageCount,
+    measure: "summary-removed",
+    storedTotalForMessage: storedRemovedTotals ? (m) => storedRemovedTotals.get(m.id) ?? null : undefined
+  });
   const rawMessageCount = index.rawMessageCount;
   const anchorRawMessageCount = Math.max(0, Math.min(rawMessageCount, Math.floor(args.anchorRawMessageCount ?? rawMessageCount)));
   const usagePercentage = clampPercentage(ctx.usage?.percentage ?? 0);
@@ -13567,7 +13663,7 @@ function resolveWrapupProtectedTailBoundary(args) {
     observeDiagnostics: (value) => {
       headDiagnostics = value;
     },
-    index,
+    index: summaryRemovedIndex,
     protectedTailStart: targetProtectedTailStart,
     offset,
     arcs: buildToolArcs(messages),
@@ -13604,6 +13700,7 @@ function resolveWrapupProtectedTailBoundary(args) {
     createdAt,
     rawRangeFingerprint,
     trueRawEligibleTokens: index.rangeTokens(offset, targetProtectedTailStart),
+    summaryRemovedEligibleTokens: summaryRemovedIndex.rangeTokens(offset, eligibleEndOrdinal),
     oversizeAtomicUnit: head.oversizeAtomicUnit,
     boundaryReason,
     diagnostics: boundaryDiagnostics({
@@ -14210,7 +14307,7 @@ async function runCompartmentAgent(deps) {
       db,
       sessionId,
       runId: crypto.randomUUID(),
-      trueRawTokens: boundarySnapshot.trueRawEligibleTokens,
+      trueRawTokens: boundarySnapshot.summaryRemovedEligibleTokens,
       usagePercentage: boundarySnapshot.usagePercentage,
       usable,
       perRunCap,

package/dist/v2/{server-5jp38p98.js → server-6emy0v9a.js}

@@ -265,8 +265,7 @@ ${data.output?.output ?? ""}`
       name: part.name,
       providerExecuted: part.executed,
       providerMetadata: (part.executed === true ? sameProvider : reuse) ? metadata(native) : undefined,
-      result: state.status === "error" ? { error: state.error, content: toolContent } : single?.type === "text" ? { type: "text", value: single.text } : { type: "content", value: toolContent },
-      ...state.status === "error" ? { resultType: "error" } : {}
+      result: state.status === "error" ? { type: "error", value: { error: state.error, content: toolContent } } : single?.type === "text" ? { type: "text", value: single.text } : { type: "content", value: toolContent }
     };
     if (part.executed === true)
       content.push(result);

package/dist/v2/{server-rktnzs89.js → server-6vzh6wej.js}

@@ -1,6 +1,6 @@
 import {
   DEFAULT_LOCAL_EMBEDDING_MODEL
-} from "./server-24g8r2d0.js";
+} from "./server-7zacmty5.js";
 import {
   getHarness2
 } from "./server-pavzsdc6.js";

package/dist/v2/{server-qa74bj91.js → server-7094pk3w.js}

@@ -15,7 +15,7 @@ import {
 } from "./server-69m30b21.js";
 import {
   isRecord
-} from "./server-bpvsvtph.js";
+} from "./server-xfjjbrkt.js";
 import {
   cleanSearchText,
   keywordRelevance,
@@ -25,7 +25,7 @@ import {
   isMessageIndexReconciledThrough,
   clearIndexedMessages,
   indexMessagesAfterOrdinal
-} from "./server-r3chnxs5.js";
+} from "./server-dfq5vb8j.js";
 import {
   Priority,
   AdmissionClass,
@@ -40,7 +40,7 @@ import {
   loadCompartmentChunkEmbeddingsForSearch2,
   peekCompartmentChunkSearchPool2,
   warmCompartmentChunkSearchPool2
-} from "./server-hsf0qsn5.js";
+} from "./server-cp1a03vc.js";
 import {
   saveCommitEmbedding,
   loadProjectCommitEmbeddings,
@@ -56,7 +56,7 @@ import {
   enqueueShadowEmbeddingItems2,
   getProjectEmbeddingSnapshot2,
   embedItemsForProject2
-} from "./server-bxpz2dcn.js";
+} from "./server-7acq7815.js";
 import {
   recordEmbeddingMeasurement
 } from "./server-2amn2s73.js";
@@ -68,7 +68,7 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./server-kkxzwa6w.js";
+} from "./server-gkse1wyz.js";
 import {
   ModuleMemoryAuthorityError2,
   getMemoriesByProject2,
@@ -81,7 +81,7 @@ import {
   sanitizeFtsQuery,
   searchMemoriesFTS,
   searchMemoriesFTSUnion
-} from "./server-q0z2q2dx.js";
+} from "./server-nq3cb7be.js";
 import {
   MESSAGE_FTS_SESSION_FILTER_SQL,
   withMessageFtsSessionFilter
@@ -1766,6 +1766,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))
@@ -1774,10 +1775,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);