@cortexkit/opencode-magic-context 0.49.16 → 0.49.17

package/dist/v2/{server-zs8d0s3b.js → server-g3qma5c0.js}

@@ -1,6 +1,6 @@
 import {
   estimateTokens
-} from "./server-0ppsweh6.js";
+} from "./server-tgnbmwah.js";
 import {
   stableStringify
 } from "./server-pwv4ezb0.js";

package/dist/v2/{server-00hx04yn.js → server-gpvay0xz.js}

@@ -16,11 +16,11 @@ import {
 } from "./server-2ra6pwf3.js";
 import {
   Database2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import {
   normalizeStoredProjectPath,
   storedPathBelongsToIdentity
-} from "./server-e3ftpk7v.js";
+} from "./server-rmygf5pn.js";
 import {
   logSlowWriteTransaction
 } from "./server-6pmqg9m4.js";

package/dist/v2/{server-r9gjxcte.js → server-gtfhttbr.js}

@@ -8,10 +8,10 @@ import {
   withoutSqliteTransformPass2,
   isTransientSqliteError2,
   withPrivilegedWriter2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import {
   scheduleAfterBootQuiet
-} from "./server-e3ftpk7v.js";
+} from "./server-rmygf5pn.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -40,7 +40,7 @@ import {
 } from "./server-fb3zxn06.js";
 import {
   startMessageFtsRowidMapBackfill2
-} from "./server-785mb90s.js";
+} from "./server-1wy7b9de.js";
 import {
   LKG_SLOT_CHUNKS_DDL,
   SESSION_REPLAY_DECISIONS_DDL,
@@ -50,7 +50,7 @@ import {
   hasPendingMigrations,
   getMainThreadMigrationBodyCount,
   runMigrations
-} from "./server-00hx04yn.js";
+} from "./server-gpvay0xz.js";
 import {
   ensureColumn,
   installV95PerfSchema,
@@ -63,7 +63,7 @@ import {
 import {
   setDatabase,
   loadToolDefinitionMeasurements
-} from "./server-zs8d0s3b.js";
+} from "./server-g3qma5c0.js";
 import {
   getErrorMessage
 } from "./server-y8v6yerm.js";
@@ -1219,8 +1219,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-7bpygfv2.js"));
-        const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-q5pgxf0d.js"));
+        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-zdppn4bj.js"));
+        const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-04t0km1z.js"));
         if (signal.aborted)
           return;
         await startMessageTimeBackfill(db, Object.assign(readRawSessionMessages, {

package/dist/v2/{server-gha9x4qq.js → server-h1v0pyxb.js}

@@ -11,10 +11,10 @@ import {
 } from "./server-f2xf5gcb.js";
 import {
   getSynapseLaneIdentity
-} from "./server-rrqpvwqd.js";
+} from "./server-6tmj0s7j.js";
 import {
   inRootAsyncContext2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import {
   computeNormalizedHash
 } from "./server-2bvekkfy.js";

package/dist/v2/{server-hgg55hde.js → server-hy3d3vsx.js}

@@ -3,7 +3,7 @@ import {
 } from "./server-pavzsdc6.js";
 import {
   isUserHomeDirectory
-} from "./server-e3ftpk7v.js";
+} from "./server-rmygf5pn.js";
 import {
   logSlowWriteTransaction
 } from "./server-6pmqg9m4.js";

package/dist/v2/{server-1hcbw661.js → server-kh7dpa1a.js}

@@ -3,7 +3,7 @@ import {
 } from "./server-pavzsdc6.js";
 import {
   prepareCachedStatement2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import {
   UNKNOWN_FIT_RATIO,
   resolveDecisionCalibration,
@@ -23,10 +23,11 @@ import {
   TAG_SELECT_COLUMNS2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-0mzjjw3s.js";
+} from "./server-zyzawhdw.js";
 import {
   OMO_INTERNAL_INITIATOR_MARKER,
   isSystemDirective,
+  removeSystemReminders,
   hasMeaningfulUserText2,
   extractTexts2,
   extractToolResultBodyTokens,
@@ -40,7 +41,7 @@ import {
   formatBlock,
   compactTextForSummary,
   mergeCommitHashes
-} from "./server-0ppsweh6.js";
+} from "./server-tgnbmwah.js";
 import {
   sessionLog2
 } from "./server-f2xf5gcb.js";
@@ -68,18 +69,18 @@ import {
   readRawSeedTailFromDb2,
   readRawSessionBoundaryEndpointsFromDb2,
   prewarmRawSessionOrdinalsForDb
-} from "./server-6714jebr.js";
+} from "./server-xj136kt8.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./server-d8tj10db.js";
+} from "./server-n1prf1g6.js";
 import {
   getToolDefinitionMeasurementSignature,
   getLargestMeasuredToolDefinitionTokens,
   getMeasuredToolDefinitionTokens
-} from "./server-zs8d0s3b.js";
+} from "./server-g3qma5c0.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical
@@ -439,7 +440,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 {
@@ -499,7 +500,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 = ?");
@@ -508,7 +509,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 : "";
@@ -639,6 +640,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/shared/historian-tool-defaults.json
 var historian_tool_defaults_default = {
   ctx_note: "Note ${input.action} ${input.note_ids}: ${input.content} → ${output.truncate(160)}",
@@ -5969,7 +5973,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) {
@@ -5979,7 +5983,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() {
@@ -6153,11 +6157,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);
@@ -6264,9 +6273,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) {
@@ -7158,4 +7166,4 @@ function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
   });
 }
 
-export { detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, TOOL_USE_DISABLED, needsBlockedRead, withBlockedReadInstruction, rememberV1HiddenRun, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, readEpochFloorSnapshot, getProtectionWindowForSession, 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, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, parseProcessedImageMarkers, serializeProcessedImageMarkers, getProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, setPendingCompactionMarkerState, replacePendingCompactionMarkerStateIf, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, getReasoningRemovalState, addRemovedReasoningIds, markDropLeavesReasoning, 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, 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 { detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, clearCachedM0, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, TOOL_USE_DISABLED, needsBlockedRead, withBlockedReadInstruction, rememberV1HiddenRun, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, readEpochFloorSnapshot, getProtectionWindowForSession, 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, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, parseProcessedImageMarkers, serializeProcessedImageMarkers, getProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, setPendingCompactionMarkerState, replacePendingCompactionMarkerStateIf, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, getReasoningRemovalState, addRemovedReasoningIds, markDropLeavesReasoning, 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, 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/v2/{server-vgpab6rd.js → server-my7k4eds.js}

@@ -3,7 +3,7 @@ import {
 } from "./server-pavzsdc6.js";
 import {
   isTransientSqliteError2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import {
   PROMOTABLE_CATEGORIES,
   CATEGORY_DEFAULT_TTL
@@ -14,10 +14,10 @@ import {
 } from "./server-f2xf5gcb.js";
 import {
   managedAuthorityNoteRow
-} from "./server-00hx04yn.js";
+} from "./server-gpvay0xz.js";
 import {
   embedTextForProject2
-} from "./server-kr2kc9dz.js";
+} from "./server-8by8qfec.js";
 import {
   saveEmbeddingIfHashMatches
 } from "./server-4dhv7mqz.js";
@@ -30,7 +30,7 @@ import {
   buildWorkspaceMemorySqlFilter2,
   getMemoryById2,
   updateMemorySeenCount2
-} from "./server-n78avt2p.js";
+} from "./server-n37sebck.js";
 import {
   computeNormalizedHash
 } from "./server-2bvekkfy.js";

package/dist/v2/{server-d8tj10db.js → server-n1prf1g6.js}

@@ -15,7 +15,7 @@ import {
 } from "./server-2ra6pwf3.js";
 import {
   Database2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import {
   closeQuietly
 } from "./server-8ajstryz.js";

package/dist/v2/{server-n78avt2p.js → server-n37sebck.js}

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

package/dist/v2/{server-y5pznjt9.js → server-nj659894.js}

@@ -805,7 +805,7 @@ function parse(text, errors = [], options = ParseOptions.DEFAULT) {
   visit(text, visitor, options);
   return currentParent[0];
 }
-function parseTree(text, errors = [], options = ParseOptions.DEFAULT) {
+function parseTree2(text, errors = [], options = ParseOptions.DEFAULT) {
   let currentParent = { type: "array", offset: -1, length: -1, children: [], parent: undefined };
   function ensurePropertyComplete(endOffset) {
     if (currentParent.type === "property") {
@@ -1193,7 +1193,7 @@ function getNodeType(value) {
 function setProperty(text, originalPath, value, options) {
   const path = originalPath.slice();
   const errors = [];
-  const root = parseTree(text, errors);
+  const root = parseTree2(text, errors);
   let parent = undefined;
   let lastSegment = undefined;
   while (path.length > 0) {
@@ -1366,7 +1366,7 @@ var SyntaxKind;
   SyntaxKind[SyntaxKind["EOF"] = 17] = "EOF";
 })(SyntaxKind || (SyntaxKind = {}));
 var parse2 = parse;
-var parseTree2 = parseTree;
+var parseTree = parseTree2;
 var findNodeAtLocation2 = findNodeAtLocation;
 var getNodeValue2 = getNodeValue;
 var ParseErrorCode;
@@ -1667,7 +1667,7 @@ var TOKEN_COMMA = 5;
 var TOKEN_EOF = 17;
 function parseDocument(text) {
   const errors = [];
-  const root = parseTree2(text, errors, { allowTrailingComma: true });
+  const root = parseTree(text, errors, { allowTrailingComma: true });
   if (!root || errors.length > 0) {
     throw new Error("Cannot edit invalid JSONC");
   }
@@ -3843,4 +3843,4 @@ function loadPluginConfigDetailed(directory, applyRuntimeGlobals = true) {
   };
 }
 
-export { getMagicContextBuiltinCommands, parseJsoncRecovering, readJsoncFile, detectConfigFile, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, resolveLegacyConfigSources, resolveLegacyConfigSourcesForHarness, getProtectedTokensTierOverrides, loadPluginConfigDetailed };
+export { getMagicContextBuiltinCommands, parseTree, parseJsoncRecovering, readJsoncFile, detectConfigFile, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, resolveLegacyConfigSources, resolveLegacyConfigSourcesForHarness, getProtectedTokensTierOverrides, loadPluginConfigDetailed };

package/dist/v2/{server-e3ftpk7v.js → server-rmygf5pn.js}

@@ -4,7 +4,7 @@ import {
 } from "./server-f2xf5gcb.js";
 import {
   inRootAsyncContext2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import {
   projectDirectoryKey
 } from "./server-knvkbfvh.js";
@@ -21,7 +21,7 @@ import path3 from "node:path";
 
 // src/features/magic-context/memory/project-identity-cache.ts
 import { createHash } from "node:crypto";
-import { readFileSync } from "node:fs";
+import { promises as fs, readFileSync } from "node:fs";
 import path from "node:path";
 function cachePath(directory, storageDir = getMagicContextStorageDir()) {
   const hash = createHash("sha256").update(projectDirectoryKey(directory)).digest("hex");
@@ -41,6 +41,35 @@ function readRememberedGitIdentity(directory, storageDir) {
   } catch {}
   return;
 }
+async function pruneMissingProjectIdentities(storageDir = getMagicContextStorageDir()) {
+  const directory = path.join(storageDir, "project-identities");
+  let removed = 0;
+  let entries;
+  try {
+    entries = await fs.readdir(directory);
+  } catch {
+    return 0;
+  }
+  for (const entry of entries) {
+    if (!/^[0-9a-f]{64}\.json$/.test(entry))
+      continue;
+    const file = path.join(directory, entry);
+    try {
+      const record = JSON.parse(await fs.readFile(file, "utf8"));
+      if (typeof record.directory !== "string" || !path.isAbsolute(record.directory) || cachePath(record.directory, storageDir) !== file || !/^git:[0-9a-f]{7,64}$/.test(record.identity))
+        continue;
+      try {
+        await fs.stat(record.directory);
+      } catch (error) {
+        if (error.code !== "ENOENT")
+          continue;
+        await fs.unlink(file);
+        removed++;
+      }
+    } catch {}
+  }
+  return removed;
+}
 
 // src/features/magic-context/memory/unborn-head.ts
 import { readFileSync as readFileSync2, realpathSync, statSync } from "node:fs";
@@ -708,4 +737,4 @@ function setBootQuietPeriodForTests(startAtMs) {
   bootQuietUntilMs = startAtMs === null ? 0 : startAtMs + BOOT_QUIET_MS;
 }
 
-export { setHomeProjectPermission, shouldSkipHomeProjectMemory, ProjectIdentityError, takeDubiousOwnershipProjectIdentityWarning, isUserHomeDirectory, resolveProjectIdentity, directoryHasGitMetadata, describeUnresolvedProjectIdentity, isUsableProjectIdentity, resolveProjectIdentityForSession, normalizeStoredProjectPath, storedPathBelongsToIdentity, beginBootQuietPeriod, scheduleAfterBootQuiet, setBootQuietPeriodForTests };
+export { pruneMissingProjectIdentities, setHomeProjectPermission, shouldSkipHomeProjectMemory, ProjectIdentityError, takeDubiousOwnershipProjectIdentityWarning, isUserHomeDirectory, resolveProjectIdentity, directoryHasGitMetadata, describeUnresolvedProjectIdentity, isUsableProjectIdentity, resolveProjectIdentityForSession, normalizeStoredProjectPath, storedPathBelongsToIdentity, beginBootQuietPeriod, scheduleAfterBootQuiet, setBootQuietPeriodForTests };

package/dist/v2/{server-0ppsweh6.js → server-tgnbmwah.js}

@@ -29,7 +29,27 @@ function isSystemDirective(text) {
   return text.trimStart().startsWith(SYSTEM_DIRECTIVE_PREFIX);
 }
 function removeSystemReminders(text) {
-  return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
+  return removeNestedBlocks(text, ["system-reminder"]).trim();
+}
+function removeNestedBlocks(text, names) {
+  const tags = new RegExp(`<(/?)(${names.join("|")})(?:\\s[^<>]*?)?\\s*(/?)>`, "gi");
+  const stack = [];
+  let end = 0;
+  let result = "";
+  for (const match of text.matchAll(tags)) {
+    if (stack.length === 0)
+      result += text.slice(end, match.index);
+    const name = match[2].toLowerCase();
+    if (match[1]) {
+      if (stack[stack.length - 1] === name)
+        stack.pop();
+    } else if (!match[3])
+      stack.push(name);
+    end = match.index + match[0].length;
+  }
+  if (stack.length === 0)
+    result += text.slice(end);
+  return result;
 }
 
 // src/hooks/magic-context/token-count-exact.ts
@@ -730,4 +750,4 @@ function mergeCommitHashes(existing, next) {
   return merged;
 }
 
-export { textMentionsRecentCommit, OMO_INTERNAL_INITIATOR_MARKER, isSystemDirective, removeSystemReminders, hasMeaningfulUserText2, extractTexts2, extractToolResultBodyTokens, extractToolCallSummaries, getTokenizerNativeMemoryStats, preloadTokenizer, getTokenEstimatorFingerprint, hasTokenizerForFit, tokenCountUsesByteBound, estimateTokens, createTokenCountMemo, estimateFixedPromptTokens, normalizeText, compactRole, formatBlock, compactTextForSummary, mergeCommitHashes };
+export { textMentionsRecentCommit, OMO_INTERNAL_INITIATOR_MARKER, isSystemDirective, removeSystemReminders, removeNestedBlocks, hasMeaningfulUserText2, extractTexts2, extractToolResultBodyTokens, extractToolCallSummaries, getTokenizerNativeMemoryStats, preloadTokenizer, getTokenEstimatorFingerprint, hasTokenizerForFit, tokenCountUsesByteBound, estimateTokens, createTokenCountMemo, estimateFixedPromptTokens, normalizeText, compactRole, formatBlock, compactTextForSummary, mergeCommitHashes };

package/dist/v2/{server-n5q841qn.js → server-vsw8tmm6.js}

@@ -6,7 +6,7 @@ import {
   StaleRouteHandleError,
   SubcClient,
   isConsumerReconnectTransient
-} from "./server-rrqpvwqd.js";
+} from "./server-6tmj0s7j.js";
 import {
   getHarness2
 } from "./server-pavzsdc6.js";
@@ -16,11 +16,11 @@ import {
 } from "./server-f2xf5gcb.js";
 import {
   inRootAsyncContext2
-} from "./server-wafzvyhg.js";
+} from "./server-beht37jy.js";
 import {
   buildCanonicalChunkTextFromFts,
   loadCompartmentChunkEmbeddingsForSearch
-} from "./server-kqpawe1a.js";
+} from "./server-46neh5fa.js";
 import {
   recordEmbeddingMeasurement,
   saveCommitEmbedding,
@@ -37,7 +37,7 @@ import {
   enqueueShadowEmbeddingItems2,
   getProjectEmbeddingSnapshot2,
   embedItemsForProject2
-} from "./server-kr2kc9dz.js";
+} from "./server-8by8qfec.js";
 import {
   getProjectEmbeddings2
 } from "./server-4dhv7mqz.js";
@@ -46,13 +46,13 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./server-aavz8pm6.js";
+} from "./server-zzkj2fch.js";
 import {
   ModuleMemoryAuthorityError2,
   getMemoriesByProject2,
   getMemoriesByProjects2,
   updateMemoryRetrievalCount2
-} from "./server-n78avt2p.js";
+} from "./server-n37sebck.js";
 import {
   getNotes,
   getActivePrimers,
@@ -61,24 +61,27 @@ import {
   sanitizeFtsQuery,
   searchMemoriesFTS,
   searchMemoriesFTSUnion
-} from "./server-vgpab6rd.js";
+} from "./server-my7k4eds.js";
+import {
+  cleanSearchText,
+  keywordRelevance,
+  matchedSearchSnippet,
+  getIndexedMessageCorpusSize2
+} from "./server-3rhpvy84.js";
 import {
   MESSAGE_FTS_SESSION_FILTER_SQL,
   withMessageFtsSessionFilter
 } from "./server-kaqs6h31.js";
 import {
   isRecord
-} from "./server-0mzjjw3s.js";
-import {
-  getIndexedMessageCorpusSize2
-} from "./server-g59aatsz.js";
+} from "./server-zyzawhdw.js";
 import {
   resolveWorkspaceShareCategories,
   resolveWorkspaceIdentitySet,
   expandWorkspaceIdentitySetWithAliases,
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory
-} from "./server-00hx04yn.js";
+} from "./server-gpvay0xz.js";
 import {
   isKnownAutocommit
 } from "./server-8ajstryz.js";
@@ -968,6 +971,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;
@@ -1021,6 +1028,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) {
@@ -1033,7 +1041,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(() => {
@@ -2379,7 +2387,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,
@@ -2456,7 +2464,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,
@@ -2679,10 +2687,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) {
@@ -2960,7 +2965,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);
   }
@@ -3093,6 +3098,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.";

package/dist/v2/{server-6714jebr.js → server-xj136kt8.js}

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