@cortexkit/opencode-magic-context 0.49.16 → 0.49.17

package/dist/{index-cj9g0j7a.js → index-fb2qxs2y.js}

@@ -14,10 +14,10 @@ import {
   withoutSqliteTransformPass2,
   isTransientSqliteError2,
   withPrivilegedWriter2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   scheduleAfterBootQuiet
-} from "./index-a8bvhwqs.js";
+} from "./index-2vxtcb95.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -42,7 +42,7 @@ import {
 } from "./index-fb3zxn06.js";
 import {
   startMessageFtsRowidMapBackfill2
-} from "./index-dqe8pq4x.js";
+} from "./index-a6mc0v4d.js";
 import {
   LKG_SLOT_CHUNKS_DDL,
   SESSION_REPLAY_DECISIONS_DDL,
@@ -52,7 +52,7 @@ import {
   hasPendingMigrations,
   getMainThreadMigrationBodyCount,
   runMigrations
-} from "./index-wk0n1cgt.js";
+} from "./index-qn7xstt2.js";
 import {
   installTagIdentityRevisionTrigger,
   ensureColumn,
@@ -65,7 +65,7 @@ import {
 import {
   setDatabase,
   loadToolDefinitionMeasurements
-} from "./index-n6m03s3n.js";
+} from "./index-ke416mdc.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";
@@ -1277,8 +1277,8 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
       state.running = startMessageFtsRowidMapBackfill2(db, signal).then(async () => {
         if (signal.aborted || !readsOpenCodeStore)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-4pwqxm5a.js"));
-        const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-8egzkd3z.js"));
+        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-4zp09ejb.js"));
+        const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-73mmm76q.js"));
         if (signal.aborted)
           return;
         await startMessageTimeBackfill(db, Object.assign(readRawSessionMessages, {

package/dist/{index-nd7m2a5a.js → index-hqhm3wke.js}

@@ -4,7 +4,7 @@ import {
 } from "./index-1zx87sdm.js";
 import {
   estimateTokens
-} from "./index-hqkczed7.js";
+} from "./index-c5pytzne.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -14,7 +14,7 @@ import {
 import {
   getTagIdentityWriteGeneration2,
   getSqliteDatabasePath2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   tagIdentityRevisionKey,
   tagOrderConstraintIndex,
@@ -2279,6 +2279,17 @@ function getUpdateTagDropModeStatement(db) {
 }
 var updateTagByteSizeStatements = new WeakMap;
 var updateTagInputByteSizeStatements = new WeakMap;
+function getUpdateTagByteSizeStatement(db) {
+  let stmt = updateTagByteSizeStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("UPDATE tags SET byte_size = ? WHERE session_id = ? AND tag_number = ?");
+    updateTagByteSizeStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function updateTagByteSize2(db, sessionId, tagNumber, newByteSize) {
+  getUpdateTagByteSizeStatement(db).run(newByteSize, sessionId, tagNumber);
+}
 var RECENT_OWNER_SCAN_PAGE_SIZE = 128;
 var recentTagOwnerStatements = new WeakMap;
 function ownerMessageIdForTagRow(row) {
@@ -2477,6 +2488,17 @@ function getActiveTagTokenTotalsByMessage2(db, sessionId, messageIds) {
 }
 var updateTagTokenCountStatements = new WeakMap;
 var updateTagInputTokenCountStatements = new WeakMap;
+function getUpdateTagTokenCountStatement(db) {
+  let stmt = updateTagTokenCountStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("UPDATE tags SET token_count = MAX(COALESCE(token_count, 0), ?) WHERE session_id = ? AND tag_number = ?");
+    updateTagTokenCountStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function updateTagTokenCount2(db, sessionId, tagNumber, newTokenCount) {
+  getUpdateTagTokenCountStatement(db).run(newTokenCount, sessionId, tagNumber);
+}
 function getPersistedToolTagAccounting2(db, sessionId, tagNumber) {
   const row = db.prepare(`SELECT byte_size AS byteSize,
                     token_count AS tokenCount,
@@ -3848,4 +3870,4 @@ function deleteToolTagsByOwner(db, sessionId, ownerMsgId) {
   return getDeleteToolTagsByOwnerStatement(db).all(sessionId, ownerMsgId).length;
 }
 
-export { protectedToolTagNumbers, protectedToolTokenCount, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, currentReclaimableToolOutputCount, isRecord, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, providerVisiblePart, providerVisibleMessage, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchangedIfEnabled, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, hasPendingDropOps, getPendingOpsCount, clearPendingOps, removePendingOp, getRecentTagOwnerMessageIds2, getActiveTagTokenAggregate2, AGE_RECLAIM_MIN_TOKENS2, getOldestActiveUnprotectedToolTags2, getActiveToolTagsForAgeReclaim2, getTriggerTagTokenUpperBound2, getActiveTagTokenTotalsByMessage2, getPersistedToolTagAccounting2, getAllStatusTagTokenTotalsFlat2, getReasoningTokenEstimatesByMessage2, tryGetReasoningTokenEstimatesByMessage2, getMaxTagNumberByOwnerMessage2, scanTagOwnerSummary2, cachedTagOwnerRatios2, tagOwnerWarmupState2, scanTagOwnerDelta2, installTagOwnerDelta2, installTagOwnerSummary2, isTagOwnerSummaryReady2, tagTokenCountIsNull2, backfillTagTokenCounts2, insertTag2, updateTagStatus2, markTagDropped2, markWhitespaceAssistantTagInert2, getInertWhitespaceAssistantTags2, getInertWhitespaceAssistantTagsByNumbers2, updateTagDropMode2, updateCavemanDepth2, updateTagMessageId2, hasPiFallbackMessageTags2, findAdoptableFallbackTags2, adoptFallbackTagMessageId2, foldShrunkPartTags2, hasPiFallbackToolOwnerTags2, findPiFallbackToolOwnerTags2, adoptPiFallbackToolOwnerTag2, adoptPiFallbackMessageTag2, markTagsCompactedByMessageIds2, deleteTagsByMessageId2, getMaxTagNumberBySession2, getTagNumberByMessageId2, getAssignableTagNumberByMessageId2, getMinMessageTagNumberForRawId2, deriveTagLoadFloor2, TAG_SELECT_COLUMNS2, getTagsBySession2, getActiveTagsBySession2, getTailHygieneTags2, getDroppedTagsBySession2, getTagsForPendingOperations2, getTagsByNumbers2, getNewestToolTagNumbers2, getDroppedTagsByNumbers2, getMaxDroppedTagNumber2, getTagById2, getTopNBySize2, getToolTagNumberByOwner2, getNullOwnerToolTag2, adoptNullOwnerToolTag2, getCandidateToolOwners2, pickNearestPriorOwner2 };
+export { protectedToolTagNumbers, protectedToolTokenCount, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, currentReclaimableToolOutputCount, isRecord, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, providerVisiblePart, providerVisibleMessage, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchangedIfEnabled, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, hasPendingDropOps, getPendingOpsCount, clearPendingOps, removePendingOp, updateTagByteSize2, getRecentTagOwnerMessageIds2, getActiveTagTokenAggregate2, AGE_RECLAIM_MIN_TOKENS2, getOldestActiveUnprotectedToolTags2, getActiveToolTagsForAgeReclaim2, getTriggerTagTokenUpperBound2, getActiveTagTokenTotalsByMessage2, updateTagTokenCount2, getPersistedToolTagAccounting2, getAllStatusTagTokenTotalsFlat2, getReasoningTokenEstimatesByMessage2, tryGetReasoningTokenEstimatesByMessage2, getMaxTagNumberByOwnerMessage2, scanTagOwnerSummary2, cachedTagOwnerRatios2, tagOwnerWarmupState2, scanTagOwnerDelta2, installTagOwnerDelta2, installTagOwnerSummary2, isTagOwnerSummaryReady2, tagTokenCountIsNull2, backfillTagTokenCounts2, insertTag2, updateTagStatus2, markTagDropped2, markWhitespaceAssistantTagInert2, getInertWhitespaceAssistantTags2, getInertWhitespaceAssistantTagsByNumbers2, updateTagDropMode2, updateCavemanDepth2, updateTagMessageId2, hasPiFallbackMessageTags2, findAdoptableFallbackTags2, adoptFallbackTagMessageId2, foldShrunkPartTags2, hasPiFallbackToolOwnerTags2, findPiFallbackToolOwnerTags2, adoptPiFallbackToolOwnerTag2, adoptPiFallbackMessageTag2, markTagsCompactedByMessageIds2, deleteTagsByMessageId2, getMaxTagNumberBySession2, getTagNumberByMessageId2, getAssignableTagNumberByMessageId2, getMinMessageTagNumberForRawId2, deriveTagLoadFloor2, TAG_SELECT_COLUMNS2, getTagsBySession2, getActiveTagsBySession2, getTailHygieneTags2, getDroppedTagsBySession2, getTagsForPendingOperations2, getTagsByNumbers2, getNewestToolTagNumbers2, getDroppedTagsByNumbers2, getMaxDroppedTagNumber2, getTagById2, getTopNBySize2, getToolTagNumberByOwner2, getNullOwnerToolTag2, adoptNullOwnerToolTag2, getCandidateToolOwners2, pickNearestPriorOwner2 };

package/dist/{index-5mwk1nek.js → index-jn12fvvh.js}

@@ -4,7 +4,7 @@ import {
 } from "./index-j75v2476.js";
 import {
   sendStatusNotification2
-} from "./index-b17m64g9.js";
+} from "./index-s74zqahq.js";
 import {
   formatConflictShort
 } from "./index-kee4kn5j.js";

package/dist/{index-n6m03s3n.js → index-ke416mdc.js}

@@ -1,6 +1,6 @@
 import {
   estimateTokens
-} from "./index-hqkczed7.js";
+} from "./index-c5pytzne.js";
 import {
   stableStringify
 } from "./index-bp5083x2.js";

package/dist/{index-6a6dq53h.js → index-kmdj7dsq.js}

@@ -3,21 +3,21 @@ import {
 } from "./index-kaqs6h31.js";
 import {
   getSqliteDatabasePath2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   runSessionWarmupWorker
-} from "./index-7pa32z07.js";
+} from "./index-s734jcsr.js";
 import {
   estimateTokens
-} from "./index-hqkczed7.js";
+} from "./index-c5pytzne.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb
-} from "./index-mtw9e71a.js";
+} from "./index-kq82mtg0.js";
 import {
   hasRawMessageProvider2,
   readRawSessionMessageIdOrdinalsForRange2
-} from "./index-j6zw70pf.js";
+} from "./index-p7m7j0cp.js";
 
 // src/tools/ctx-expand/search-archive.ts
 var archiveReadsOnThisThread = 0;

package/dist/{index-mtw9e71a.js → index-kq82mtg0.js}

@@ -15,11 +15,11 @@ import {
 } from "./index-58e3y90n.js";
 import {
   Database2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   forgetRawSessionOrdinalWatermark2,
   forgetRawSessionSummaryRows2
-} from "./index-7pa32z07.js";
+} from "./index-s734jcsr.js";
 import {
   closeQuietly
 } from "./index-8ajstryz.js";

package/dist/{index-n78avt2p.js → index-n37sebck.js}

@@ -1,6 +1,6 @@
 import {
   withPrivilegedWriter2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   MEMORY_CATEGORY_ORDER_SQL
 } from "./index-fr0wbhdn.js";

package/dist/{index-v63beg1z.js → index-nkpmm9q8.js}

@@ -3,16 +3,16 @@ import {
 } from "./index-j75v2476.js";
 import {
   clearEmergencyRecovery
-} from "./index-j6zw70pf.js";
+} from "./index-p7m7j0cp.js";
 import {
   requestPendingMaterialization,
   dropSlot,
   executeContextRecomp
-} from "./index-ayym1x7f.js";
+} from "./index-a7c4r5re.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode
-} from "./index-wv9n2zcq.js";
+} from "./index-v8awdgvd.js";
 
 // src/hooks/magic-context/recomp-orchestrator.ts
 function resolveLiveModelKey(liveSessionState, sessionId) {

package/dist/{index-j6zw70pf.js → index-p7m7j0cp.js}

@@ -23,10 +23,11 @@ import {
   TAG_SELECT_COLUMNS2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-nd7m2a5a.js";
+} from "./index-hqhm3wke.js";
 import {
   OMO_INTERNAL_INITIATOR_MARKER,
   isSystemDirective,
+  removeSystemReminders,
   hasMeaningfulUserText2,
   extractTexts2,
   extractToolResultBodyTokens,
@@ -40,10 +41,10 @@ import {
   formatBlock,
   compactTextForSummary,
   mergeCommitHashes
-} from "./index-hqkczed7.js";
+} from "./index-c5pytzne.js";
 import {
   prepareCachedStatement2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   stableStringify
 } from "./index-bp5083x2.js";
@@ -68,18 +69,18 @@ import {
   readRawSeedTailFromDb2,
   readRawSessionBoundaryEndpointsFromDb2,
   prewarmRawSessionOrdinalsForDb
-} from "./index-7pa32z07.js";
+} from "./index-s734jcsr.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-mtw9e71a.js";
+} from "./index-kq82mtg0.js";
 import {
   getToolDefinitionMeasurementSignature,
   getLargestMeasuredToolDefinitionTokens,
   getMeasuredToolDefinitionTokens
-} from "./index-n6m03s3n.js";
+} from "./index-ke416mdc.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical
@@ -1821,7 +1822,7 @@ function isSessionMetaRow(row) {
   if (row === null || typeof row !== "object")
     return false;
   const r = row;
-  return typeof r.session_id === "string" && isNumberOrNull(r.last_response_time) && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isStringOrNull(r.cached_m0_mural_data_url) && isStringOrNull(r.cached_m0_mural_hash) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isStringOrNull(r.cached_m0_workspace_fingerprint) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.cached_m0_system_hash) && isStringOrNull(r.cached_m0_tool_set_hash) && isStringOrNull(r.cached_m0_model_key) && isStringOrNull(r.cached_m0_project_identity) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.last_usage_context_limit) && isNumberOrNull(r.prior_boundary_ordinal) && isNumberOrNull(r.protected_tail_policy_version) && isNumberOrNull(r.protected_tail_drain_window_started_at) && isNumberOrNull(r.protected_tail_drain_tokens) && isNumberOrNull(r.recovery_no_eligible_head_count) && isNumberOrNull(r.force_emergency_bypass_window_start) && isNumberOrNull(r.force_emergency_bypass_used) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.upgrade_reminder_last_sent_at) && isNumberOrNull(r.upgrade_reminder_count) && isNumberOrNull(r.pi_stable_id_scheme) && isNumberOrNull(r.tool_reclaim_watermark);
+  return typeof r.session_id === "string" && isNumberOrNull(r.last_response_time) && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && isNumberOrNull(r.is_subagent) && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isStringOrNull(r.cached_m0_mural_data_url) && isStringOrNull(r.cached_m0_mural_hash) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isStringOrNull(r.cached_m0_workspace_fingerprint) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.cached_m0_system_hash) && isStringOrNull(r.cached_m0_tool_set_hash) && isStringOrNull(r.cached_m0_model_key) && isStringOrNull(r.cached_m0_project_identity) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.last_usage_context_limit) && isNumberOrNull(r.prior_boundary_ordinal) && isNumberOrNull(r.protected_tail_policy_version) && isNumberOrNull(r.protected_tail_drain_window_started_at) && isNumberOrNull(r.protected_tail_drain_tokens) && isNumberOrNull(r.recovery_no_eligible_head_count) && isNumberOrNull(r.force_emergency_bypass_window_start) && isNumberOrNull(r.force_emergency_bypass_used) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.upgrade_reminder_last_sent_at) && isNumberOrNull(r.upgrade_reminder_count) && isNumberOrNull(r.pi_stable_id_scheme) && isNumberOrNull(r.tool_reclaim_watermark);
 }
 function getDefaultSessionMeta(sessionId) {
   return {
@@ -1881,7 +1882,7 @@ function getDefaultSessionMeta(sessionId) {
   };
 }
 var sessionMetaExistsStatements = new WeakMap;
-function ensureSessionMetaRow(db, sessionId, initialIsSubagent = false) {
+function ensureSessionMetaRow(db, sessionId, initialIsSubagent = getHarness2() === "opencode2" ? null : false) {
   let exists = sessionMetaExistsStatements.get(db);
   if (!exists) {
     exists = prepareCachedStatement2(db, "SELECT 1 FROM session_meta WHERE session_id = ?");
@@ -1890,7 +1891,7 @@ function ensureSessionMetaRow(db, sessionId, initialIsSubagent = false) {
   if (exists.get(sessionId))
     return;
   const defaults = getDefaultSessionMeta(sessionId);
-  db.prepare("INSERT OR IGNORE INTO session_meta (session_id, harness, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, observed_safe_input_tokens, cache_alert_sent, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, cleared_reasoning_through_tag) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(sessionId, getHarness2(), defaults.lastResponseTime, defaults.cacheTtl, defaults.counter, defaults.lastNudgeTokens, defaults.lastNudgeBand ?? "", defaults.lastTransformError ?? "", initialIsSubagent ? 1 : 0, defaults.lastContextPercentage, defaults.lastInputTokens, defaults.observedSafeInputTokens, defaults.cacheAlertSent ? 1 : 0, defaults.timesExecuteThresholdReached, defaults.compartmentInProgress ? 1 : 0, defaults.systemPromptHash ?? "", defaults.clearedReasoningThroughTag);
+  db.prepare("INSERT OR IGNORE INTO session_meta (session_id, harness, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, observed_safe_input_tokens, cache_alert_sent, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, cleared_reasoning_through_tag) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(sessionId, getHarness2(), defaults.lastResponseTime, defaults.cacheTtl, defaults.counter, defaults.lastNudgeTokens, defaults.lastNudgeBand ?? "", defaults.lastTransformError ?? "", initialIsSubagent === null ? null : initialIsSubagent ? 1 : 0, defaults.lastContextPercentage, defaults.lastInputTokens, defaults.observedSafeInputTokens, defaults.cacheAlertSent ? 1 : 0, defaults.timesExecuteThresholdReached, defaults.compartmentInProgress ? 1 : 0, defaults.systemPromptHash ?? "", defaults.clearedReasoningThroughTag);
 }
 function toSessionMeta(row) {
   const nudgeBandRaw = typeof row.last_nudge_band === "string" ? row.last_nudge_band : "";
@@ -2021,6 +2022,9 @@ function clearCachedM0M1(db, sessionId) {
     return;
   db.prepare(`UPDATE session_meta SET ${setClauses.join(", ")} WHERE session_id = ?`).run(...values, sessionId);
 }
+function clearCachedM0(db, sessionId) {
+  clearCachedM0M1(db, sessionId);
+}
 
 // src/features/magic-context/storage-replay-document.ts
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -6103,7 +6107,7 @@ class ToolMutationBatch {
     this.partsToRemove.add(servedPart(occurrence));
     this.affectedMessages.add(occurrence.message);
   }
-  wouldStrandConversationEnd(occurrences) {
+  wouldStrandConversationEnd(occurrences, plannedRemovals) {
     const served = this.servedMessages ?? this.messages;
     let end;
     for (let i = served.length - 1;i >= 0 && end === undefined; i -= 1) {
@@ -6113,7 +6117,7 @@ class ToolMutationBatch {
     if (!end || !occurrences.some((occurrence) => occurrence.message === end))
       return false;
     const leaving = new Set(occurrences.map(servedPart));
-    const survives = (part) => !leaving.has(part) && !this.partsToRemove.has(part);
+    const survives = (part) => !leaving.has(part) && !this.partsToRemove.has(part) && !plannedRemovals?.has(part);
     return end.info.role === "assistant" ? !end.parts.some((part) => partHasCompletedResult(part) && survives(part)) : !end.parts.some((part) => hasMeaningfulPart(part) && survives(part));
   }
   finalize() {
@@ -6287,11 +6291,16 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
         return null;
       return toolInputStringBytes(readRawInput());
     },
-    wouldStrandConversationEnd: () => {
+    wouldStrandConversationEnd: (plannedRemovals) => {
       const entry = index.get(compositeKey);
       if (!entry || entry.occurrences.length === 0)
         return false;
-      return batch.wouldStrandConversationEnd(entry.occurrences);
+      return batch.wouldStrandConversationEnd(entry.occurrences, plannedRemovals);
+    },
+    notePlannedRemoval: (plannedRemovals) => {
+      for (const occurrence of index.get(compositeKey)?.occurrences ?? []) {
+        plannedRemovals.add(servedPart(occurrence));
+      }
     },
     prepareDrop: () => {
       const entry = index.get(compositeKey);
@@ -6398,9 +6407,8 @@ function withRawMessageProvider2(sessionId, provider, fn) {
   cleanup();
   return result;
 }
-var SYSTEM_REMINDER_BLOCK_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
 function cleanUserText2(text) {
-  return stripOutsideSteeringWrappers(text, (segment) => segment.replace(SYSTEM_REMINDER_BLOCK_REGEX, "").replace(OMO_INTERNAL_INITIATOR_MARKER, "")).trim();
+  return stripOutsideSteeringWrappers(text, (segment) => removeSystemReminders(segment).replace(OMO_INTERNAL_INITIATOR_MARKER, "")).trim();
 }
 function hasMeaningfulChunkUserText(parts) {
   for (const part of parts) {
@@ -7292,4 +7300,4 @@ function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
   });
 }
 
-export { isToolFreeHiddenAgent, TOOL_USE_DISABLED, ZEN_READ_AGENT_SUFFIX, needsBlockedRead, withBlockedReadInstruction, rememberV1HiddenRun, shapeV1HiddenMessage, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, createDroppedInputToolExecuteBeforeHook, isEditTool, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, readEpochFloorSnapshot, getProtectionWindowForSession, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, withReplayEnvelopeSnapshot, invalidateReplayEnvelopeSnapshot, isRustMarkerAdmissionFenced, setRustMarkerAdmissionFence, ReplayDocumentError, readReplayEnvelope, readReplayDocument, updateReplayDocument, writeReplayDocument, isEmergencyRecoveryArmed, isProviderOverflowReconfirmed, isProviderOverflowFailClosedProven, getEmergencyRecoveryArmedAt, describeProtectedTailDrainBudgetSkip, loadPersistedUsage, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, resetProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, getPersistedReasoningWatermark, setPersistedReasoningWatermark, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, removeNoteNudgeAnchorByMessageId, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, removeAutoSearchHintDecisionByMessageId, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, removeStrippedPlaceholderId, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, parseProcessedImageMarkers, serializeProcessedImageMarkers, getProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, setPendingCompactionMarkerState, replacePendingCompactionMarkerStateIf, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, getSessionsWithPendingMarker, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, getReasoningRemovalState, addRemovedReasoningIds, markDropLeavesReasoning, detectThinkingBindingMismatch, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, isSentinel, replaySentinelByMessageIds, isInActiveAnthropicTurn, activeAnthropicTurnStart, hasAnthropicReasoning, stripSystemInjectedMessages, stripDroppedPlaceholderMessages, replayClearedReasoning, replayStrippedInlineThinking, clearOldReasoning, stripClearedReasoning, stripInlineThinking, findReasoningBearingAssistantIds, findLatestAssistantReasoningMutationExemptMessage, snapshotTrailingBlankSourceDecisions, findTrailingBlankDecisionCandidates, applyFrozenTrailingBlankDecisions, stripReasoningFromAssistantIds, findMergedReasoningStripDecisions, stripReasoningFromMergedAssistants, getEmptyImageParts, stripProcessedImages, projectOpencodeReasoningBudgetCutoff, DEFAULT_KEEP_REASONING_TOKENS, resolveKeepReasoningTokens, reasoningStepCost, reasoningBudgetCutoff, reasoningTextAndOpaque, opencodeReasoningBudgetCutoff, describeFinalWireTail, estimatePartImageTokens, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, estimateAppendedWireTokens, 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, visitRawSessionMessagesAsync2, 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 };
+export { isToolFreeHiddenAgent, TOOL_USE_DISABLED, ZEN_READ_AGENT_SUFFIX, needsBlockedRead, withBlockedReadInstruction, rememberV1HiddenRun, shapeV1HiddenMessage, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, createDroppedInputToolExecuteBeforeHook, isEditTool, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, readEpochFloorSnapshot, getProtectionWindowForSession, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, clearCachedM0, withReplayEnvelopeSnapshot, invalidateReplayEnvelopeSnapshot, isRustMarkerAdmissionFenced, setRustMarkerAdmissionFence, ReplayDocumentError, readReplayEnvelope, readReplayDocument, updateReplayDocument, writeReplayDocument, isEmergencyRecoveryArmed, isProviderOverflowReconfirmed, isProviderOverflowFailClosedProven, getEmergencyRecoveryArmedAt, describeProtectedTailDrainBudgetSkip, loadPersistedUsage, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, resetProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, getPersistedReasoningWatermark, setPersistedReasoningWatermark, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, getChannel2NudgeClaim, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, removeNoteNudgeAnchorByMessageId, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, removeAutoSearchHintDecisionByMessageId, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, removeStrippedPlaceholderId, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, armThinkingBindingRecovery, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, parseProcessedImageMarkers, serializeProcessedImageMarkers, getProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, setPendingCompactionMarkerState, replacePendingCompactionMarkerStateIf, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, getSessionsWithPendingMarker, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, getReasoningRemovalState, addRemovedReasoningIds, markDropLeavesReasoning, detectThinkingBindingMismatch, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, isSentinel, replaySentinelByMessageIds, isInActiveAnthropicTurn, activeAnthropicTurnStart, hasAnthropicReasoning, stripSystemInjectedMessages, stripDroppedPlaceholderMessages, replayClearedReasoning, replayStrippedInlineThinking, clearOldReasoning, stripClearedReasoning, stripInlineThinking, findReasoningBearingAssistantIds, findLatestAssistantReasoningMutationExemptMessage, snapshotTrailingBlankSourceDecisions, findTrailingBlankDecisionCandidates, applyFrozenTrailingBlankDecisions, stripReasoningFromAssistantIds, findMergedReasoningStripDecisions, stripReasoningFromMergedAssistants, getEmptyImageParts, stripProcessedImages, projectOpencodeReasoningBudgetCutoff, DEFAULT_KEEP_REASONING_TOKENS, resolveKeepReasoningTokens, reasoningStepCost, reasoningBudgetCutoff, reasoningTextAndOpaque, opencodeReasoningBudgetCutoff, describeFinalWireTail, estimatePartImageTokens, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, estimateAppendedWireTokens, 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, visitRawSessionMessagesAsync2, 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/{index-wk0n1cgt.js → index-qn7xstt2.js}

@@ -16,11 +16,11 @@ import {
 } from "./index-58e3y90n.js";
 import {
   Database2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   normalizeStoredProjectPath,
   storedPathBelongsToIdentity
-} from "./index-a8bvhwqs.js";
+} from "./index-2vxtcb95.js";
 import {
   logSlowWriteTransaction
 } from "./index-k29z4aqh.js";

package/dist/{index-saews2s3.js → index-rr2bb45z.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-pavzsdc6.js";
 import {
   isUserHomeDirectory
-} from "./index-a8bvhwqs.js";
+} from "./index-2vxtcb95.js";
 import {
   logSlowWriteTransaction
 } from "./index-k29z4aqh.js";

package/dist/{index-7pa32z07.js → index-s734jcsr.js}

@@ -8,7 +8,7 @@ import {
   inRootAsyncContext2,
   getSqliteDatabasePath2,
   releaseIndexOwner2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 
 // src/hooks/magic-context/raw-ordinal-warmup.ts
 import { Worker } from "node:worker_threads";

package/dist/{index-b17m64g9.js → index-s74zqahq.js}

@@ -10,7 +10,7 @@ import {
 } from "./index-y9f76s3f.js";
 import {
   shouldHoldIgnoredNotification
-} from "./index-mtw9e71a.js";
+} from "./index-kq82mtg0.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";

package/dist/{index-wv9n2zcq.js → index-v8awdgvd.js}

@@ -7,17 +7,17 @@ import {
 } from "./index-pavzsdc6.js";
 import {
   isTransientSqliteError2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   PROMOTABLE_CATEGORIES,
   CATEGORY_DEFAULT_TTL
 } from "./index-fr0wbhdn.js";
 import {
   managedAuthorityNoteRow
-} from "./index-wk0n1cgt.js";
+} from "./index-qn7xstt2.js";
 import {
   embedTextForProject2
-} from "./index-qrahzcqv.js";
+} from "./index-ze7mvk54.js";
 import {
   saveEmbeddingIfHashMatches
 } from "./index-4dhv7mqz.js";
@@ -30,7 +30,7 @@ import {
   buildWorkspaceMemorySqlFilter2,
   getMemoryById2,
   updateMemorySeenCount2
-} from "./index-n78avt2p.js";
+} from "./index-n37sebck.js";
 import {
   computeNormalizedHash
 } from "./index-2bvekkfy.js";

package/dist/{index-4qfy7v57.js → index-vrzjhftj.js}

@@ -6,7 +6,7 @@ import {
   StaleRouteHandleError,
   SubcClient,
   isConsumerReconnectTransient
-} from "./index-fkx2qnvw.js";
+} from "./index-6x57ar45.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -18,11 +18,11 @@ import {
 } from "./index-j75v2476.js";
 import {
   inRootAsyncContext2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   buildCanonicalChunkTextFromFts,
   loadCompartmentChunkEmbeddingsForSearch
-} from "./index-hehkf6zm.js";
+} from "./index-b5vqckbw.js";
 import {
   recordEmbeddingMeasurement,
   saveCommitEmbedding,
@@ -39,7 +39,7 @@ import {
   enqueueShadowEmbeddingItems2,
   getProjectEmbeddingSnapshot2,
   embedItemsForProject2
-} from "./index-qrahzcqv.js";
+} from "./index-ze7mvk54.js";
 import {
   getProjectEmbeddings2
 } from "./index-4dhv7mqz.js";
@@ -48,13 +48,13 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./index-9nkg2dzk.js";
+} from "./index-24fezq97.js";
 import {
   ModuleMemoryAuthorityError2,
   getMemoriesByProject2,
   getMemoriesByProjects2,
   updateMemoryRetrievalCount2
-} from "./index-n78avt2p.js";
+} from "./index-n37sebck.js";
 import {
   USER_FACING_FAILURES,
   getNotes,
@@ -63,24 +63,27 @@ import {
   sanitizeFtsQuery,
   searchMemoriesFTS,
   searchMemoriesFTSUnion
-} from "./index-wv9n2zcq.js";
+} from "./index-v8awdgvd.js";
+import {
+  cleanSearchText,
+  keywordRelevance,
+  matchedSearchSnippet,
+  getIndexedMessageCorpusSize2
+} from "./index-cwzfcbtq.js";
 import {
   MESSAGE_FTS_SESSION_FILTER_SQL,
   withMessageFtsSessionFilter
 } from "./index-kaqs6h31.js";
 import {
   isRecord
-} from "./index-nd7m2a5a.js";
-import {
-  getIndexedMessageCorpusSize2
-} from "./index-p4vde22c.js";
+} from "./index-hqhm3wke.js";
 import {
   resolveWorkspaceShareCategories,
   resolveWorkspaceIdentitySet,
   expandWorkspaceIdentitySetWithAliases,
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory
-} from "./index-wk0n1cgt.js";
+} from "./index-qn7xstt2.js";
 import {
   isKnownAutocommit
 } from "./index-8ajstryz.js";
@@ -970,6 +973,10 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
     embedded: 0,
     nonIndexable: false
   };
+  if (projectPath.startsWith("dir:")) {
+    result.nonIndexable = true;
+    return result;
+  }
   if (indexInProgress.has(projectPath)) {
     log2(`[git-commits] index already in progress for ${projectPath}, skipping`);
     return result;
@@ -1023,6 +1030,7 @@ async function embedUnembeddedCommits(db, projectPath) {
   embedInProgress.add(projectPath);
   const startedAt = Date.now();
   const deadline = startedAt + EMBED_SWEEP_MAX_WALL_CLOCK_MS;
+  const signal = AbortSignal.timeout(EMBED_SWEEP_MAX_WALL_CLOCK_MS);
   let total = 0;
   try {
     while (Date.now() < deadline && total < EMBED_MAX_PER_SWEEP) {
@@ -1035,7 +1043,7 @@ async function embedUnembeddedCommits(db, projectPath) {
           id: `commit:${row.sha}`,
           text: row.message,
           contentSha256: contentSha2562(row.message)
-        })), undefined, db, projectPath);
+        })), signal, db, projectPath);
         if (!result)
           break;
         db.transaction(() => {
@@ -2381,7 +2389,7 @@ function searchMessagesInSnapshot(args, sessionFirst) {
       const filtered = rows.slice(0, limit);
       return filtered.map((row, rank) => ({
         source: "message",
-        content: previewText(row.content),
+        content: matchedSearchSnippet(row.content, args.query) || previewText(row.content),
         score: linearDecayScore(rank, filtered.length),
         messageOrdinal: row.messageOrdinal,
         messageId: row.messageId,
@@ -2458,7 +2466,7 @@ function searchMessagesInSnapshot(args, sessionFirst) {
     const ranked = [...fused.values()].sort((a, b) => b.score !== a.score ? b.score - a.score : a.row.messageOrdinal - b.row.messageOrdinal).slice(0, resultLimit);
     return ranked.map((entry, rank) => ({
       source: "message",
-      content: previewText(entry.row.content),
+      content: matchedSearchSnippet(entry.row.content, args.query) || previewText(entry.row.content),
       score: linearDecayScore(rank, ranked.length),
       messageOrdinal: entry.row.messageOrdinal,
       messageId: entry.row.messageId,
@@ -2681,10 +2689,7 @@ function mergeMessageAndCompartmentResults(args) {
     }
   }
   const ranked = [...fused.values()].sort((left, right) => right.score !== left.score ? right.score - left.score : left.tieOrdinal - right.tieOrdinal).slice(0, args.limit);
-  return ranked.map((entry, rank) => ({
-    ...entry.result,
-    score: linearDecayScore(rank, ranked.length)
-  }));
+  return ranked.map((entry) => entry.result);
 }
 function getSourceBoost(result) {
   switch (result.source) {
@@ -2962,7 +2967,7 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     if (options.diagnostics) {
       options.diagnostics.suppressedLiveMessageMatches = outcome.suppressedLiveMessageMatches;
     }
-    messageResults = outcome.results;
+    messageResults = outcome.results.filter((result) => result.messageId !== options.excludeMessageId);
     if (lanes)
       lanes.message_fts = (outcome.laneResults ?? outcome.results).slice(0, 25);
   }
@@ -3095,6 +3100,12 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
       }).immediate();
     }
   }
+  if (options.autoHint) {
+    return results.map((result) => ({
+      ...result,
+      relevanceScore: cleanSearchText(result.source === "compartment" ? result.title : result.content).length === 0 ? 0 : result.source === "message" || ("matchType" in result) && result.source !== "compartment" && result.matchType !== "semantic" ? keywordRelevance(trimmedQuery, result.content) : result.score
+    }));
+  }
   return results;
 }
 var SEARCH_NOTE_EXPAND_HINT = "Use ctx_expand(start=N-10, end=N) around any note @msg anchor above to read the surrounding conversation context.";