@cortexkit/opencode-magic-context 0.41.0 → 0.41.1

package/dist/index.js

@@ -1,3 +1,12 @@
+import {
+  ANNOUNCEMENT_FEATURES,
+  ANNOUNCEMENT_FOOTER,
+  ANNOUNCEMENT_VERSION,
+  compareSemverCore,
+  isValidSemver,
+  markAnnouncementSeen,
+  shouldShowAnnouncement
+} from "./index-dmvy29z0.js";
 import {
   CANONICAL_DREAM_TASKS,
   buildDreamTaskRuntimeConfigs,
@@ -8,12 +17,12 @@ import {
   leaseKindFor,
   processedDreamTaskItems,
   userMemoryCollectionEnabled
-} from "./index-knna83k0.js";
+} from "./index-9j3tx8hy.js";
 import {
   resolveHistorianAgentOverrides,
   resolveHistorianModel,
   resolveOpenCodeAgentOverrides
-} from "./index-bf799gbq.js";
+} from "./index-d1mxrd3p.js";
 import {
   AGE_RECLAIM_MIN_TOKENS,
   AdmissionClass,
@@ -139,6 +148,7 @@ import {
   demoteTrailingBlankKeepDecisions,
   deriveTagLoadFloor,
   detectOverflow,
+  directoryHasGitMetadata,
   dismissNote,
   dismissUserMemory,
   drainAuthority,
@@ -232,6 +242,7 @@ import {
   getOverflowState,
   getPendingCompactionMarkerState,
   getPendingOps,
+  getPendingOpsCount,
   getPendingSmartNotes,
   getPersistedCompactionMarkerState,
   getPersistedNoteNudge,
@@ -494,7 +505,7 @@ import {
   verificationFileExists,
   withContentLanguageDirective,
   withRawSessionMessageCache
-} from "./index-w8rkbhn6.js";
+} from "./index-dh0vfghk.js";
 import {
   deriveHistorianChunkTokens,
   deriveTriggerBudget,
@@ -509,7 +520,7 @@ import {
   setStoragePrivatePermissionEnforcement,
   setWindowOverlayPath,
   shouldEnforcePrivateStoragePermissions
-} from "./index-2bykz3bx.js";
+} from "./index-2d4kf2ve.js";
 import {
   clearIgnoredMessages,
   describeError,
@@ -517,7 +528,7 @@ import {
   getErrorMessage,
   sendIgnoredMessage,
   sendUserPrompt
-} from "./index-88za3sz8.js";
+} from "./index-zwjhba2r.js";
 import {
   advanceToolReclaimWatermark,
   clearSession,
@@ -526,7 +537,7 @@ import {
   markSessionCleanupPending,
   retryPendingSessionCleanups,
   updateSessionMeta
-} from "./index-x9dmzyp5.js";
+} from "./index-z893kjyt.js";
 import {
   modelRefLookupOrder,
   piModelRefToCanonical
@@ -539,28 +550,19 @@ import {
   isMidTurn,
   openCodeDbExists,
   withReadOnlySessionDb
-} from "./index-jmwq2wxr.js";
+} from "./index-b9j85d29.js";
 import {
   cleanupConflictWarnings,
   detectConflicts,
   resolveCompactionForBoot,
   sendConflictWarning
-} from "./index-dmgbar7r.js";
+} from "./index-eq9wr75c.js";
 import {
   detectConfigFile,
   isPrototypePollutionKey,
   parseJsonc,
   stripJsonComments
 } from "./index-8mtsfhyg.js";
-import {
-  ANNOUNCEMENT_FEATURES,
-  ANNOUNCEMENT_FOOTER,
-  ANNOUNCEMENT_VERSION,
-  compareSemverCore,
-  isValidSemver,
-  markAnnouncementSeen,
-  shouldShowAnnouncement
-} from "./index-dmvy29z0.js";
 import {
   acknowledgeNotifications,
   drainNotifications,
@@ -568,13 +570,13 @@ import {
   pushNotification,
   registerNotificationSink
 } from "./index-d62ypazr.js";
-import"./index-26ds03jd.js";
+import"./index-vnz6jvdc.js";
 import {
   getLoggerDiagnostics,
   hasShareabilitySensitiveText,
   log,
   sessionLog
-} from "./index-b4gv9f7g.js";
+} from "./index-4x691bz5.js";
 import {
   getDataDir,
   getHarness,
@@ -16680,7 +16682,7 @@ function getAsyncModule() {
   asyncModulePromise ??= (async () => {
     const [{ default: singlefileAsyncifyVariant }, { newQuickJSAsyncWASMModuleFromVariant }] = await Promise.all([
       import("./index-rgdqj8nj.js").then((m)=>__toESM(m.default,1)),
-      import("./index-rpgg35ms.js")
+      import("./index-8sseka65.js")
     ]);
     return newQuickJSAsyncWASMModuleFromVariant(singlefileAsyncifyVariant);
   })();
@@ -21940,6 +21942,7 @@ function fallbackConfig(config, provider) {
   return {
     provider: "local",
     model: model || DEFAULT_LOCAL_EMBEDDING_MODEL,
+    local_runtime: raw.local_runtime === "native" || raw.local_runtime === "wasm" ? raw.local_runtime : "auto",
     ...maxInputTokens !== undefined ? { max_input_tokens: maxInputTokens } : {}
   };
 }
@@ -23253,8 +23256,16 @@ var GIT_COMMIT_SOURCE_BOOST = 1.2;
 var PRIMER_SOURCE_BOOST = 1.25;
 var messageSearchStatements = new WeakMap;
 var messageSearchStatementsWithCutoff = new WeakMap;
+var messageSearchDiagnosticStatements = new WeakMap;
 var batchedMessageSearchStatements = new WeakMap;
 var batchedFtsCountStatements = new WeakMap;
+function createUnifiedSearchDiagnostics() {
+  return {
+    suppressedVisibleMemoryIds: [],
+    suppressedLiveMessageMatches: 0,
+    gitCommitUnavailable: null
+  };
+}
 function normalizeLimit(limit) {
   if (typeof limit !== "number" || !Number.isFinite(limit)) {
     return DEFAULT_UNIFIED_SEARCH_LIMIT;
@@ -23345,6 +23356,51 @@ function getMessageSearchStatementWithCutoff(db) {
   }
   return stmt;
 }
+function getMessageSearchDiagnosticStatement(db) {
+  let stmt = messageSearchDiagnosticStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`
+            WITH matches AS MATERIALIZED (
+                SELECT
+                    message_ordinal AS messageOrdinal,
+                    message_id AS messageId,
+                    role,
+                    content,
+                    CAST(message_ordinal AS INTEGER) AS ordinalValue,
+                    bm25(message_history_fts) AS ftsRank
+                FROM message_history_fts
+                WHERE session_id = ? AND message_history_fts MATCH ?
+            ),
+            eligible AS (
+                SELECT * FROM matches
+                WHERE ordinalValue <= ?
+                ORDER BY ftsRank, ordinalValue ASC
+                LIMIT ?
+            ),
+            summary AS (
+                SELECT COUNT(*) AS suppressedCount
+                FROM matches
+                WHERE ordinalValue > ?
+            )
+            SELECT
+                eligible.messageOrdinal,
+                eligible.messageId,
+                eligible.role,
+                eligible.content,
+                eligible.ftsRank,
+                summary.suppressedCount,
+                0 AS summaryOnly
+            FROM eligible CROSS JOIN summary
+            UNION ALL
+            SELECT NULL, NULL, NULL, NULL, NULL, summary.suppressedCount, 1
+            FROM summary
+            WHERE NOT EXISTS (SELECT 1 FROM eligible)
+            ORDER BY summaryOnly ASC, ftsRank ASC, messageOrdinal ASC
+        `);
+    messageSearchDiagnosticStatements.set(db, stmt);
+  }
+  return stmt;
+}
 function getBatchedFtsCountStatement(db, queryCount, cutoff) {
   let statements = batchedFtsCountStatements.get(db);
   if (!statements) {
@@ -23485,10 +23541,8 @@ function mergeMemoryResults(args) {
   const memoryById = new Map(args.memories.map((memory) => [memory.id, memory]));
   const candidateIds = new Set([...args.semanticScores.keys(), ...args.ftsScores.keys()]);
   const results = [];
+  const suppressedVisibleIds = [];
   for (const id of candidateIds) {
-    if (args.visibleMemoryIds?.has(id)) {
-      continue;
-    }
     const memory = memoryById.get(id);
     if (!memory) {
       continue;
@@ -23510,6 +23564,10 @@ function mergeMemoryResults(args) {
     if (score <= 0) {
       continue;
     }
+    if (args.visibleMemoryIds?.has(id)) {
+      suppressedVisibleIds.push(id);
+      continue;
+    }
     results.push({
       source: "memory",
       content: previewText(memory.content),
@@ -23520,20 +23578,23 @@ function mergeMemoryResults(args) {
       sourceName: args.sourceNameByMemoryId?.get(memory.id)
     });
   }
-  return results.sort((left, right) => {
-    if (right.score !== left.score) {
-      return right.score - left.score;
-    }
-    return left.memoryId - right.memoryId;
-  }).slice(0, args.limit);
+  return {
+    results: results.sort((left, right) => {
+      if (right.score !== left.score) {
+        return right.score - left.score;
+      }
+      return left.memoryId - right.memoryId;
+    }).slice(0, args.limit),
+    suppressedVisibleIds: suppressedVisibleIds.sort((left, right) => left - right)
+  };
 }
 async function searchMemories(args) {
   if (!args.memoryEnabled) {
-    return [];
+    return { results: [], suppressedVisibleIds: [] };
   }
   const memories = args.workspace?.isWorkspaced ? getMemoriesByProjects(args.db, args.workspace.expandedIdentities, ["active", "permanent"], Date.now(), args.workspace.ownIdentities, args.workspace.shareCategories) : getMemoriesByProject(args.db, args.projectPath);
   if (memories.length === 0) {
-    return [];
+    return { results: [], suppressedVisibleIds: [] };
   }
   const ftsMatches = getFtsMatches({
     db: args.db,
@@ -23610,6 +23671,21 @@ function runMessageFtsQuery(db, sessionId, ftsQuery, fetchLimit, cutoff) {
   }
   return result;
 }
+function runMessageFtsQueryWithDiagnostics(args) {
+  if (args.ftsQuery.length === 0)
+    return { rows: [], suppressedCount: 0 };
+  const rawRows = getMessageSearchDiagnosticStatement(args.db).all(args.sessionId, args.ftsQuery, args.cutoff, args.fetchLimit, args.cutoff).map((row) => row);
+  const suppressedCount = rawRows[0]?.suppressedCount ?? 0;
+  const rows = [];
+  for (const row of rawRows) {
+    if (row.summaryOnly === 1)
+      continue;
+    const normalized = normalizeMessageSearchRow(row, args.cutoff);
+    if (normalized)
+      rows.push(normalized);
+  }
+  return { rows, suppressedCount };
+}
 function getBatchedMessageSearchStatement(db, queryCount, cutoff) {
   let statements = batchedMessageSearchStatements.get(db);
   if (!statements) {
@@ -23676,7 +23752,20 @@ function searchMessages(args) {
   const baseQuery = sanitizeFtsQuery(args.query.trim());
   const probes = args.probes ?? [];
   if (probes.length === 0) {
-    const filtered = runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff).slice(0, args.limit);
+    const outcome = args.diagnostics && cutoff !== null ? runMessageFtsQueryWithDiagnostics({
+      db: args.db,
+      sessionId: args.sessionId,
+      ftsQuery: baseQuery,
+      fetchLimit,
+      cutoff
+    }) : {
+      rows: runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff),
+      suppressedCount: 0
+    };
+    if (args.diagnostics) {
+      args.diagnostics.suppressedLiveMessageMatches = outcome.suppressedCount;
+    }
+    const filtered = outcome.rows.slice(0, args.limit);
     return filtered.map((row, rank) => ({
       source: "message",
       content: previewText(row.content),
@@ -23689,8 +23778,19 @@ function searchMessages(args) {
   const sanitizedProbes = probes.map((probe) => ({ probe, query: sanitizeFtsQuery(probe) })).filter((entry) => entry.query.length > 0);
   const corpusSize = getIndexedMessageCorpusSize(args.db, args.sessionId, cutoff);
   const probeCounts = countSessionFtsMatchesBatch(args.db, args.sessionId, sanitizedProbes.map((entry) => entry.query), cutoff);
+  const collectBaseDiagnostics = args.diagnostics !== undefined && cutoff !== null;
+  const baseOutcome = collectBaseDiagnostics && baseQuery.length > 0 ? runMessageFtsQueryWithDiagnostics({
+    db: args.db,
+    sessionId: args.sessionId,
+    ftsQuery: baseQuery,
+    fetchLimit,
+    cutoff
+  }) : null;
+  if (args.diagnostics) {
+    args.diagnostics.suppressedLiveMessageMatches = baseOutcome?.suppressedCount ?? 0;
+  }
   const searchQueries = [
-    ...baseQuery.length > 0 ? [baseQuery] : [],
+    ...!collectBaseDiagnostics && baseQuery.length > 0 ? [baseQuery] : [],
     ...sanitizedProbes.map((entry) => entry.query)
   ];
   const rowsByQuery = runMessageFtsQueriesBatch(args.db, args.sessionId, searchQueries, fetchLimit, cutoff);
@@ -23698,10 +23798,11 @@ function searchMessages(args) {
   let queryIndex = 0;
   if (baseQuery.length > 0) {
     queryLists.push({
-      rows: rowsByQuery[queryIndex] ?? [],
+      rows: baseOutcome?.rows ?? rowsByQuery[queryIndex] ?? [],
       weight: 1
     });
-    queryIndex += 1;
+    if (!collectBaseDiagnostics)
+      queryIndex += 1;
   }
   const probeWeights = new Map;
   sanitizedProbes.forEach((entry, probeIndex) => {
@@ -24088,6 +24189,9 @@ function memoriesToIdLookupResults(args) {
   }));
 }
 function resolveMemoriesByIdsForSearch(args) {
+  if (args.diagnostics) {
+    args.diagnostics.suppressedVisibleMemoryIds = [];
+  }
   if (args.ids.length === 0) {
     return null;
   }
@@ -24098,16 +24202,22 @@ function resolveMemoriesByIdsForSearch(args) {
   }
   const memoriesById = new Map(fetched.map((memory) => [memory.id, memory]));
   const ordered = [];
+  const suppressedVisibleIds = new Set;
   for (const id of args.ids) {
     const memory = memoriesById.get(id);
     if (!memory)
       continue;
-    if (args.visibleMemoryIds?.has(id))
+    if (args.visibleMemoryIds?.has(id)) {
+      suppressedVisibleIds.add(id);
       continue;
+    }
     ordered.push(memory);
     if (ordered.length >= args.limit)
       break;
   }
+  if (args.diagnostics) {
+    args.diagnostics.suppressedVisibleMemoryIds = [...suppressedVisibleIds].sort((left, right) => left - right);
+  }
   if (ordered.length === 0) {
     return null;
   }
@@ -24129,6 +24239,11 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
   }
   const limit = normalizeLimit(options.limit);
   const tierLimit = Math.max(limit * 3, DEFAULT_UNIFIED_SEARCH_LIMIT);
+  if (options.diagnostics) {
+    options.diagnostics.suppressedVisibleMemoryIds = [];
+    options.diagnostics.suppressedLiveMessageMatches = 0;
+    options.diagnostics.gitCommitUnavailable = null;
+  }
   const embeddingEnabled = options.embeddingEnabled ?? true;
   const embedQuery = options.embedQuery ?? embedText;
   const isEmbeddingRuntimeEnabled = options.isEmbeddingRuntimeEnabled ?? isEmbeddingEnabled;
@@ -24138,6 +24253,9 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
   const runMemory = activeSources.has("memory") && memoryFeatureEnabled;
   const runMessages = activeSources.has("message");
   const runGitCommits = activeSources.has("git_commit") && gitCommitsEnabled;
+  if (options.diagnostics && activeSources.has("git_commit") && options.gitRepositoryAvailable === false) {
+    options.diagnostics.gitCommitUnavailable = "no_git_repository";
+  }
   const runPrimers = activeSources.has("primer") && memoryFeatureEnabled;
   const runNotes = activeSources.has("note");
   const runCompartmentChunks = runMessages && memoryFeatureEnabled && embeddingEnabled;
@@ -24154,7 +24272,8 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
     query: trimmedQuery,
     limit: tierLimit,
     maxOrdinal: options.maxMessageOrdinal,
-    probes: messageProbes
+    probes: messageProbes,
+    diagnostics: options.diagnostics
   }) : [];
   const capturedQuery = await queryEmbeddingPromise;
   const embeddingSnapshot = getProjectEmbeddingSnapshot(projectPath);
@@ -24178,7 +24297,7 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
     compartments: compartmentResults,
     limit: tierLimit
   });
-  const [memoryResults, gitCommitResults, primerResults, noteResults] = await Promise.all([
+  const [memoryOutcome, gitCommitResults, primerResults, noteResults] = await Promise.all([
     runMemory ? searchMemories({
       db,
       projectPath,
@@ -24189,7 +24308,10 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
       queryModelId: embeddingModelId && embeddingModelId !== "off" ? embeddingModelId : null,
       workspace,
       visibleMemoryIds: options.visibleMemoryIds
-    }) : Promise.resolve([]),
+    }) : Promise.resolve({
+      results: [],
+      suppressedVisibleIds: []
+    }),
     runGitCommits ? Promise.resolve(searchGitCommits({
       db,
       projectPath,
@@ -24215,8 +24337,11 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
       probes: messageProbes
     })) : Promise.resolve([])
   ]);
+  if (options.diagnostics) {
+    options.diagnostics.suppressedVisibleMemoryIds = memoryOutcome.suppressedVisibleIds;
+  }
   const results = [
-    ...memoryResults,
+    ...memoryOutcome.results,
     ...primerResults,
     ...messageLikeResults,
     ...gitCommitResults,
@@ -24254,6 +24379,123 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
   }
   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.";
+function formatSearchAge(timestampMs) {
+  const ageMs = Date.now() - timestampMs;
+  if (ageMs < 0)
+    return "future";
+  const days = Math.floor(ageMs / (24 * 60 * 60 * 1000));
+  if (days <= 0)
+    return "today";
+  if (days === 1)
+    return "1d ago";
+  if (days < 30)
+    return `${days}d ago`;
+  const months = Math.floor(days / 30);
+  if (months === 1)
+    return "1mo ago";
+  if (months < 12)
+    return `${months}mo ago`;
+  const years = Math.floor(days / 365);
+  return years === 1 ? "1y ago" : `${years}y ago`;
+}
+function formatUnifiedSearchResult(result, index, currentSessionId) {
+  if (result.source === "memory") {
+    const source = result.sourceName ? ` source=${result.sourceName}` : "";
+    return [
+      `[${index}] [memory] score=${result.score.toFixed(2)} id=${result.memoryId} category=${result.category}${source} match=${result.matchType}`,
+      result.content
+    ].join(`
+`);
+  }
+  if (result.source === "git_commit") {
+    return [
+      `[${index}] [git_commit] score=${result.score.toFixed(2)} sha=${result.shortSha} ${formatSearchAge(result.committedAtMs)} match=${result.matchType}`,
+      result.content
+    ].join(`
+`);
+  }
+  if (result.source === "primer") {
+    return [
+      `[${index}] [primer] score=${result.score.toFixed(2)} id=${result.primerId} support=${result.support} match=${result.matchType}`,
+      result.content
+    ].join(`
+`);
+  }
+  if (result.source === "note") {
+    const anchor = result.anchorOrdinal !== null && result.sourceSessionId === currentSessionId ? ` @msg ${result.anchorOrdinal}` : "";
+    return [
+      `[${index}] [note] score=${result.score.toFixed(2)} id=#${result.noteId} status=${result.status} ${formatSearchAge(result.createdAt)}${anchor}`,
+      result.content
+    ].join(`
+`);
+  }
+  if (result.source === "compartment") {
+    return [
+      `[${index}] [message] score=${result.score.toFixed(2)} compartment_id=${result.compartmentId} range=${result.startOrdinal}-${result.endOrdinal} match=${result.matchType} title=${result.title}`,
+      result.snippet ? `Snippet: ${result.snippet}` : result.content
+    ].join(`
+`);
+  }
+  const expandStart = Math.max(1, result.messageOrdinal - 3);
+  const expandEnd = result.messageOrdinal + 3;
+  return [
+    `[${index}] [message] score=${result.score.toFixed(2)} ordinal=${result.messageOrdinal} range=${expandStart}-${expandEnd} role=${result.role}`,
+    result.content
+  ].join(`
+`);
+}
+function formatSearchDiagnosticLines(results, diagnostics) {
+  if (!diagnostics)
+    return [];
+  const lines = [];
+  const visibleIds = [...diagnostics.suppressedVisibleMemoryIds].sort((left, right) => left - right);
+  if (visibleIds.length > 0) {
+    const count = visibleIds.length;
+    const noun = count === 1 ? "match" : "matches";
+    const ids = visibleIds.join(", ");
+    if (results.some((result) => result.source === "memory")) {
+      lines.push(`Memories: ${count} additional ${noun} suppressed because ${count === 1 ? "it is" : "they are"} already visible in your project-memory block (ids ${ids}).`);
+    } else {
+      lines.push(`Memories: ${count} ${noun} found, all already visible in your project-memory block (ids ${ids}).`);
+    }
+  }
+  if (diagnostics.suppressedLiveMessageMatches > 0) {
+    const count = diagnostics.suppressedLiveMessageMatches;
+    lines.push(`Message history: ${count} raw-message ${count === 1 ? "match is" : "matches are"} newer than the last compartment boundary (already in your context).`);
+  }
+  if (diagnostics.gitCommitUnavailable === "no_git_repository") {
+    lines.push("Git commits: no git repository — commit search unavailable for this project.");
+  }
+  return lines;
+}
+function formatSearchResults(query, results, currentSessionId, diagnostics) {
+  const diagnosticLines = formatSearchDiagnosticLines(results, diagnostics);
+  if (results.length === 0) {
+    if (diagnosticLines.length > 0) {
+      return `No hidden results found for "${query}".
+
+${diagnosticLines.join(`
+`)}`;
+    }
+    return `No results found for "${query}" across notes, memories, primers, git commits, or message history.`;
+  }
+  const bodyParts = results.map((result, index) => formatUnifiedSearchResult(result, index + 1, currentSessionId));
+  if (diagnosticLines.length > 0)
+    bodyParts.push(diagnosticLines.join(`
+`));
+  if (results.some((result) => result.source === "message" || result.source === "compartment")) {
+    bodyParts.push("Use ctx_expand(start, end) with the range from any message result above to read the full conversation context.");
+  }
+  if (results.some((result) => result.source === "note" && result.anchorOrdinal !== null && result.sourceSessionId === currentSessionId)) {
+    bodyParts.push(SEARCH_NOTE_EXPAND_HINT);
+  }
+  return `Found ${results.length} result${results.length === 1 ? "" : "s"} for "${query}":
+
+${bodyParts.join(`
+
+`)}`;
+}
 
 // src/hooks/magic-context/caveman.ts
 var PRESERVATION_PATTERNS = [
@@ -25602,7 +25844,7 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
   const forceMaterializationPercentage = escalationBands(executeThresholdPercentage).forceMaterializationPercentage;
   if (usage.percentage >= forceMaterializationPercentage) {
     if (projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
-      sessionLog(sessionId, `compartment trigger: skipping force band ${forceMaterializationPercentage}% because projected post-drop usage is ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%)`);
+      sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — force band is ${forceMaterializationPercentage}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on the next eligible execute pass`);
       return { shouldFire: false };
     }
     sessionLog(sessionId, `compartment trigger: force-firing at ${usage.percentage.toFixed(1)}% (projected post-drop ${formatProjectedPostDropPercentage(projectedPostDropPercentage)})`);
@@ -25663,7 +25905,7 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     return { shouldFire: false };
   }
   if (projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
-    sessionLog(sessionId, `compartment trigger: not firing at ${usage.percentage.toFixed(1)}% because projected post-drop usage is ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%)`);
+    sessionLog(sessionId, `historian redundancy skip: summarizer not needed this pass — usage is ${usage.percentage.toFixed(1)}%; queued/automatic drops are projected to reclaim to ${projectedPostDropPercentage.toFixed(1)}% (target ${relativePostDropTarget.toFixed(1)}%) on the next eligible execute pass`);
     return { shouldFire: false };
   }
   if (!tailInfo.hasProtectedEligibleHead || !tailInfo.isMeaningful) {
@@ -27565,9 +27807,9 @@ function registerRpcHandlers(rpcServer, args) {
     return { count: buildCompartmentCount(db, sessionId, moduleStatus) };
   });
   const buildManagedCtx = async (db) => {
-    const { deriveHistorianChunkTokens: deriveHistorianChunkTokens2, resolveHistorianContextLimit: resolveHistorianContextLimit2 } = await import("./derive-budgets-3xfyphvk.js");
-    const { resolveHistorianModel: resolveHistorianModel2 } = await import("./model-resolution-jgrkt0z2.js");
-    const { userMemoryCollectionEnabled: userMemoryCollectionEnabled2 } = await import("./task-config-ty08ptc2.js");
+    const { deriveHistorianChunkTokens: deriveHistorianChunkTokens2, resolveHistorianContextLimit: resolveHistorianContextLimit2 } = await import("./derive-budgets-bb7mrpzs.js");
+    const { resolveHistorianModel: resolveHistorianModel2 } = await import("./model-resolution-6w6wzw18.js");
+    const { userMemoryCollectionEnabled: userMemoryCollectionEnabled2 } = await import("./task-config-gv6s04fp.js");
     const DEFAULT_HISTORIAN_TIMEOUT_MS2 = 600000;
     const historianModel = resolveHistorianModel2(config, "opencode");
     return {
@@ -27598,8 +27840,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp: runManagedRecomp2 } = await import("./recomp-orchestrator-1w4xj6jt.js");
-    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-kn34g7mx.js");
+    const { runManagedRecomp: runManagedRecomp2 } = await import("./recomp-orchestrator-w7xg48e3.js");
+    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-bw7eex6w.js");
     log(`[rpc] recomp requested for session ${sessionId}`);
     const ctx = await buildManagedCtx(db);
     runManagedRecomp2(ctx, sessionId).then((message) => {
@@ -27617,8 +27859,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedUpgrade: runManagedUpgrade2 } = await import("./recomp-orchestrator-1w4xj6jt.js");
-    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-kn34g7mx.js");
+    const { runManagedUpgrade: runManagedUpgrade2 } = await import("./recomp-orchestrator-w7xg48e3.js");
+    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-bw7eex6w.js");
     log(`[rpc] session-upgrade requested for session ${sessionId}`);
     const ctx = await buildManagedCtx(db);
     runManagedUpgrade2(ctx, sessionId).then((message) => {
@@ -27634,7 +27876,7 @@ function registerRpcHandlers(rpcServer, args) {
     if (!db)
       return { ok: false, error: "db unavailable" };
     try {
-      const { updateSessionMeta: updateSessionMeta2 } = await import("./storage-meta-session-snbzd26z.js");
+      const { updateSessionMeta: updateSessionMeta2 } = await import("./storage-meta-session-gr4zn7sq.js");
       updateSessionMeta2(db, sessionId, { upgradeRemindedAt: Date.now() });
       return { ok: true };
     } catch (error) {
@@ -28261,15 +28503,31 @@ function detectMidTurnBypassReason(input) {
 }
 function applyMidTurnDeferral(input) {
   if (input.base === "defer") {
-    return { midTurnAdjustedSchedulerDecision: "defer", sideEffect: "none" };
+    return {
+      midTurnAdjustedSchedulerDecision: "defer",
+      sideEffect: "none",
+      deferReason: "scheduler_defer"
+    };
   }
   if (input.bypassReason !== "none") {
-    return { midTurnAdjustedSchedulerDecision: "execute", sideEffect: "none" };
+    return {
+      midTurnAdjustedSchedulerDecision: "execute",
+      sideEffect: "none",
+      deferReason: null
+    };
   }
   if (input.midTurn) {
-    return { midTurnAdjustedSchedulerDecision: "defer", sideEffect: "set-flag" };
+    return {
+      midTurnAdjustedSchedulerDecision: "defer",
+      sideEffect: "set-flag",
+      deferReason: "mid_turn_boundary"
+    };
   }
-  return { midTurnAdjustedSchedulerDecision: "execute", sideEffect: "none" };
+  return {
+    midTurnAdjustedSchedulerDecision: "execute",
+    sideEffect: "none",
+    deferReason: null
+  };
 }
 
 // src/hooks/magic-context/cache-busting-signals.ts
@@ -32964,6 +33222,10 @@ async function runPostTransformPhase(args) {
   const shouldReadPendingOps = !compactionOff && (materializationRequested || args.schedulerDecision === "execute" || forceMaterialization || foldExecutedThisPass || compartmentRunning);
   const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
   const hasPendingUserOps = pendingOps.length > 0;
+  const formatPendingOpsDepth = () => {
+    const depth = getPendingOpsCount(args.db, args.sessionId);
+    return depth === null ? "not loaded (deferred pass)" : String(depth);
+  };
   const shouldApplyPendingOps = !compactionOff && (args.schedulerDecision === "execute" || materializationRequested || forceMaterialization || foldExecutedThisPass) && (!compartmentRunning || bypassCompartmentGate);
   const shouldRunHeuristics = !compactionOff && (!compartmentRunning || bypassCompartmentGate) && (materializationRequested || forceMaterialization || foldExecutedThisPass || emergencyDropEligible || args.schedulerDecision === "execute" && (!alreadyRanThisTurn || !args.fullFeatureMode));
   const isCacheBustingPass = shouldApplyPendingOps || shouldRunHeuristics;
@@ -32983,10 +33245,15 @@ async function runPostTransformPhase(args) {
     const subagentRerun = !args.fullFeatureMode && alreadyRanThisTurn && args.schedulerDecision === "execute" && !isExplicitFlush && !forceMaterialization;
     const reason = isExplicitFlush ? "explicit_flush" : deferredMaterialize ? "deferred_materialization" : forceMaterialization ? `force_materialization (${args.contextUsage.percentage.toFixed(1)}% >= ${args.forceMaterializationPercentage}%)` : foldExecutedThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : subagentRerun ? `scheduler_execute_subagent_rerun (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})` : `scheduler_execute (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})`;
     sessionLog(args.sessionId, `heuristics WILL RUN — reason=${reason}, context=${args.contextUsage.percentage.toFixed(1)}%, turn=${args.currentTurnId}`);
+  } else if (args.schedulerDeferReason !== undefined && args.schedulerDeferReason !== null) {
+    sessionLog(args.sessionId, `heuristics WILL NOT RUN — reason=${args.schedulerDeferReason}`);
   }
   if (alreadyRanThisTurn && args.schedulerDecision === "execute" && !materializationRequested && args.fullFeatureMode) {
     sessionLog(args.sessionId, `transform: skipping heuristics (already ran for turn ${args.currentTurnId})`);
   }
+  if (!shouldApplyPendingOps && args.schedulerDeferReason !== undefined && args.schedulerDeferReason !== null) {
+    sessionLog(args.sessionId, `pending ops WILL NOT APPLY — reason=${args.schedulerDeferReason} pendingOps=${formatPendingOpsDepth()} context=${args.contextUsage.percentage.toFixed(1)}%`);
+  }
   if (compartmentRunning && hasPendingUserOps) {
     if (bypassCompartmentGate) {
       const bypassReason = forceMaterialization ? `emergency >=${args.forceMaterializationPercentage}%` : "m0 hard fold";
@@ -33021,7 +33288,7 @@ async function runPostTransformPhase(args) {
   try {
     if (shouldApplyPendingOps) {
       const applyReason = isExplicitFlush ? "explicit_flush" : deferredMaterialize ? "deferred_materialization" : foldExecutedThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : `scheduler_execute (scheduler=${args.schedulerDecision})`;
-      sessionLog(args.sessionId, `pending ops WILL APPLY — reason=${applyReason}, pendingOps=${pendingOps.length}, context=${args.contextUsage.percentage.toFixed(1)}%`);
+      sessionLog(args.sessionId, `pending ops WILL APPLY — reason=${applyReason}, pendingOps=${formatPendingOpsDepth()}, context=${args.contextUsage.percentage.toFixed(1)}%`);
       const tApply = performance.now();
       pendingOpsDidMutate = applyPendingOperations(args.sessionId, args.db, args.targets, args.protectedTags, undefined, pendingOps);
       if (pendingOpsDidMutate) {
@@ -36295,7 +36562,11 @@ function createTransform(deps) {
       sessionId,
       effectiveExecuteThresholdPercentage
     });
-    const { midTurnAdjustedSchedulerDecision, sideEffect } = applyMidTurnDeferral({
+    const {
+      midTurnAdjustedSchedulerDecision,
+      sideEffect,
+      deferReason: schedulerDeferReason
+    } = applyMidTurnDeferral({
       base: schedulerDecisionEarly,
       bypassReason,
       midTurn
@@ -36664,6 +36935,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       contextUsage,
       usableWindow: resolvedContextLimit ?? 0,
       schedulerDecision,
+      schedulerDeferReason,
       fullFeatureMode,
       compactionOff,
       canRunCompartments,
@@ -37298,6 +37570,32 @@ function createEventHandler2(deps) {
   };
 }
 
+// src/hooks/magic-context/format-embed-failure.ts
+function formatEmbedFailureSummary(embedded, remaining, failure) {
+  const compartment = `compartment${embedded === 1 ? "" : "s"}`;
+  if (!failure) {
+    return `Embedded ${embedded} ${compartment}; ${remaining} could not be embedded (the provider returned no result). Run /ctx-embed start again to retry them.`;
+  }
+  const retry = " Run /ctx-embed start again to retry them.";
+  switch (failure.class) {
+    case "substitution_rejected":
+      return `Embedded ${embedded} ${compartment}; ${remaining} rejected: ${failure.reason}. Fix: set embedding.model to the served spelling.`;
+    case "http_error": {
+      const fix = failure.reason.startsWith("HTTP 401") || failure.reason.startsWith("HTTP 403") ? " Fix: check embedding.api_key." : failure.reason.startsWith("HTTP 402") ? " Fix: check provider quota or billing." : failure.reason.startsWith("HTTP 404") ? " Fix: check embedding.endpoint and embedding.model." : failure.retryable ? retry : " Fix: check embedding.endpoint, embedding.model, and credentials.";
+      return `Embedded ${embedded} ${compartment}; ${remaining} failed: ${failure.reason}.${fix}`;
+    }
+    case "invalid_envelope":
+      return `Embedded ${embedded} ${compartment}; ${remaining} failed: ${failure.reason}. Fix: configure an OpenAI-compatible embedding endpoint that returns data[].embedding.`;
+    case "certification_refusal":
+      return `Embedded ${embedded} ${compartment}; ${remaining} rejected: ${failure.reason}. Fix: recertify SYNAPSE or configure embedding.fallback_provider, then run /ctx-embed start again.`;
+    case "credential_required":
+      return `Embedded ${embedded} ${compartment}; ${remaining} rejected: ${failure.reason}. Fix: reauthenticate SYNAPSE, then run /ctx-embed start again.`;
+    case "empty_result":
+    case "transport_error":
+      return `Embedded ${embedded} ${compartment}; ${remaining} failed: ${failure.reason}.${failure.retryable ? retry : ""}`;
+  }
+}
+
 // src/hooks/magic-context/text-complete.ts
 function createTextCompleteHandler() {
   return async (_input, output) => {
@@ -38372,7 +38670,7 @@ function createMagicContextHook(deps) {
         return terminal("skipped", msg);
       }
       case "stalled":
-        return terminal("skipped", `Embedded ${outcome.embedded} compartments; ${outcome.remaining} could not be embedded (the provider returned no result). Run /ctx-embed start again to retry them.`);
+        return terminal("skipped", formatEmbedFailureSummary(outcome.embedded, outcome.remaining, outcome.failure));
       default:
         return terminal("done", `Embedded ${outcome.embedded} compartment${outcome.embedded === 1 ? "" : "s"} of history for semantic search${runFailed > 0 ? ` (${runFailed} failed)` : ""}.`);
     }
@@ -41379,90 +41677,6 @@ function normalizeSources(sources) {
   }
   return result;
 }
-function formatAge2(committedAtMs) {
-  const ageMs = Date.now() - committedAtMs;
-  if (ageMs < 0)
-    return "future";
-  const days = Math.floor(ageMs / (24 * 60 * 60 * 1000));
-  if (days <= 0)
-    return "today";
-  if (days === 1)
-    return "1d ago";
-  if (days < 30)
-    return `${days}d ago`;
-  const months = Math.floor(days / 30);
-  if (months === 1)
-    return "1mo ago";
-  if (months < 12)
-    return `${months}mo ago`;
-  const years = Math.floor(days / 365);
-  return years === 1 ? "1y ago" : `${years}y ago`;
-}
-var NOTE_EXPAND_HINT = "Use ctx_expand(start=N-10, end=N) around any note @msg anchor above to read the surrounding conversation context.";
-function formatResult(result, index, currentSessionId) {
-  if (result.source === "memory") {
-    const source = result.sourceName ? ` source=${result.sourceName}` : "";
-    return [
-      `[${index}] [memory] score=${result.score.toFixed(2)} id=${result.memoryId} category=${result.category}${source} match=${result.matchType}`,
-      result.content
-    ].join(`
-`);
-  }
-  if (result.source === "git_commit") {
-    return [
-      `[${index}] [git_commit] score=${result.score.toFixed(2)} sha=${result.shortSha} ${formatAge2(result.committedAtMs)} match=${result.matchType}`,
-      result.content
-    ].join(`
-`);
-  }
-  if (result.source === "primer") {
-    return [
-      `[${index}] [primer] score=${result.score.toFixed(2)} id=${result.primerId} support=${result.support} match=${result.matchType}`,
-      result.content
-    ].join(`
-`);
-  }
-  if (result.source === "note") {
-    const anchor = result.anchorOrdinal !== null && result.sourceSessionId === currentSessionId ? ` @msg ${result.anchorOrdinal}` : "";
-    return [
-      `[${index}] [note] score=${result.score.toFixed(2)} id=#${result.noteId} status=${result.status} ${formatAge2(result.createdAt)}${anchor}`,
-      result.content
-    ].join(`
-`);
-  }
-  if (result.source === "compartment") {
-    return [
-      `[${index}] [message] score=${result.score.toFixed(2)} compartment_id=${result.compartmentId} range=${result.startOrdinal}-${result.endOrdinal} match=${result.matchType} title=${result.title}`,
-      result.snippet ? `Snippet: ${result.snippet}` : result.content
-    ].join(`
-`);
-  }
-  const expandStart = Math.max(1, result.messageOrdinal - 3);
-  const expandEnd = result.messageOrdinal + 3;
-  return [
-    `[${index}] [message] score=${result.score.toFixed(2)} ordinal=${result.messageOrdinal} range=${expandStart}-${expandEnd} role=${result.role}`,
-    result.content
-  ].join(`
-`);
-}
-function formatSearchResults(query, results, currentSessionId) {
-  if (results.length === 0) {
-    return `No results found for "${query}" across notes, memories, primers, git commits, or message history.`;
-  }
-  const bodyParts = results.map((result, index) => formatResult(result, index + 1, currentSessionId));
-  if (results.some((result) => result.source === "message" || result.source === "compartment")) {
-    bodyParts.push("Use ctx_expand(start, end) with the range from any message result above to read the full conversation context.");
-  }
-  if (results.some((result) => result.source === "note" && result.anchorOrdinal !== null && result.sourceSessionId === currentSessionId)) {
-    bodyParts.push(NOTE_EXPAND_HINT);
-  }
-  const body = bodyParts.join(`
-
-`);
-  return `Found ${results.length} result${results.length === 1 ? "" : "s"} for "${query}":
-
-${body}`;
-}
 var ctxSearchArgsShape = {
   query: tool5.schema.string().optional().describe("Search query. Matches against memory content, Primers, git commit messages, and raw user/assistant message text."),
   limit: tool5.schema.number().optional().describe("Maximum results to return (default: 10)"),
@@ -41493,6 +41707,7 @@ function createCtxSearchTool(deps) {
       const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, toolContext.sessionID);
       const messageOrdinalCutoff = lastCompartmentEnd >= 0 ? lastCompartmentEnd : 0;
       const visibleMemoryIds = getVisibleMemoryIds(deps.db, toolContext.sessionID);
+      const diagnostics = createUnifiedSearchDiagnostics();
       const projectPath = deps.resolveProjectPath(toolContext.directory);
       if (!projectPath) {
         return "Error: Could not resolve project identity for search.";
@@ -41509,10 +41724,11 @@ function createCtxSearchTool(deps) {
           projectPath,
           ids: idShape,
           limit: Math.max(normalizeLimit3(args.limit), idShape.length),
-          visibleMemoryIds
+          visibleMemoryIds,
+          diagnostics
         });
-        if (idResults !== null) {
-          return formatSearchResults(query, idResults, toolContext.sessionID);
+        if (idResults !== null || diagnostics.suppressedVisibleMemoryIds.length > 0) {
+          return formatSearchResults(query, idResults ?? [], toolContext.sessionID, diagnostics);
         }
       }
       const results = await unifiedSearch(deps.db, toolContext.sessionID, projectPath, query, {
@@ -41529,9 +41745,11 @@ function createCtxSearchTool(deps) {
         gitCommitsEnabled,
         sources: normalizeSources(args.sources),
         visibleMemoryIds,
+        diagnostics,
+        gitRepositoryAvailable: typeof toolContext.directory === "string" ? directoryHasGitMetadata(toolContext.directory) : undefined,
         explicitSearch: true
       });
-      return formatSearchResults(query, results, toolContext.sessionID);
+      return formatSearchResults(query, results, toolContext.sessionID, diagnostics);
     }
   });
 }
@@ -41980,7 +42198,7 @@ var server = async (ctx) => {
 `);
     setTimeout(async () => {
       try {
-        const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-kn34g7mx.js");
+        const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-bw7eex6w.js");
         const clientWithSessions = ctx.client;
         const sessions = await Promise.resolve(clientWithSessions.session?.list?.()).catch(() => null);
         const sessionList = Array.isArray(sessions) ? sessions : sessions?.data;
@@ -42173,7 +42391,7 @@ var server = async (ctx) => {
   {
     const fence = getSchemaFenceRejection();
     if (fence) {
-      import("./conflict-warning-hook-xj1r88a7.js").then(({ sendSchemaFenceWarning }) => sendSchemaFenceWarning(ctx.client, ctx.directory, fence));
+      import("./conflict-warning-hook-rf17b6et.js").then(({ sendSchemaFenceWarning }) => sendSchemaFenceWarning(ctx.client, ctx.directory, fence));
     }
   }
   if (conflictResult?.hasConflict) {
@@ -42194,7 +42412,7 @@ var server = async (ctx) => {
       } = await import("./announcement-3g9xg433.js");
       if (shouldShowAnnouncement2()) {
         setTimeout(() => {
-          import("./conflict-warning-hook-xj1r88a7.js").then(({ sendStartupAnnouncement }) => sendStartupAnnouncement(ctx.client, ctx.directory, ANNOUNCEMENT_VERSION2, ANNOUNCEMENT_FEATURES2, ANNOUNCEMENT_FOOTER2, markAnnouncementSeen2)).catch(() => {});
+          import("./conflict-warning-hook-rf17b6et.js").then(({ sendStartupAnnouncement }) => sendStartupAnnouncement(ctx.client, ctx.directory, ANNOUNCEMENT_VERSION2, ANNOUNCEMENT_FEATURES2, ANNOUNCEMENT_FOOTER2, markAnnouncementSeen2)).catch(() => {});
         }, 8000);
       }
     } catch {}