Refine context coverage and diagnostic projections

Author: GlitterKill

src/context/engine.ts

@@ -1134,6 +1134,9 @@ function sortOmitted(
   return [...omitted].sort(
     (left, right) =>
       left.tier - right.tier ||
+      // A missing card is first coverage; skeleton and hot path are upgrades.
+      (left.rung === "card" ? 0 : 1) -
+        (right.rung === "card" ? 0 : 1) ||
       left.rank - right.rank ||
       left.symbolId.localeCompare(right.symbolId) ||
       left.rung.localeCompare(right.rung),

src/context/select.ts

@@ -527,6 +527,9 @@ function compareOmittedPriority(
 ): number {
   return (
     left.tier - right.tier ||
+    // A missing card is first coverage; skeleton and hot path are upgrades.
+    (left.rung === "card" ? 0 : 1) -
+      (right.rung === "card" ? 0 : 1) ||
     left.rank - right.rank ||
     left.symbolId.localeCompare(right.symbolId) ||
     left.rung.localeCompare(right.rung)

src/mcp/tools/repo.ts

@@ -981,7 +981,7 @@ export async function handleRepoStatus(
             liveIndexStatus,
           }
         : {}),
-      memories,
+      ...(memories !== undefined ? { memories } : {}),
       derivedState: statusDerivedState,
     };
   };

src/mcp/tools/search-edit/index.ts

@@ -4,6 +4,7 @@
  */
 
 import { attachRawContext } from "../../token-usage.js";
+import { extractProjectionRequestOptions } from "../../request-normalization.js";
 import { parseActionHandlerArgs } from "../../../gateway/dispatch-spine.js";
 import {
   SearchEditRequestSchema,
@@ -102,15 +103,18 @@ function compactStoredSummary(
   };
 }
 
-function compactRetrievalEvidence(evidence: RetrievalEvidence): RetrievalEvidence {
+function compactRetrievalEvidence(
+  evidence: RetrievalEvidence,
+  includeDiagnostics: boolean,
+): RetrievalEvidence {
   const topRanksPerSource = Object.fromEntries(
     Object.entries(evidence.topRanksPerSource).map(([source, ranks]) => [
       source,
       ranks.slice(0, MAX_RETRIEVAL_EVIDENCE_ITEMS),
     ]),
   );
 
-  return {
+  const compacted: RetrievalEvidence = {
     ...evidence,
     topRanksPerSource,
     ...(evidence.feedbackBoosts
@@ -144,11 +148,17 @@ function compactRetrievalEvidence(evidence: RetrievalEvidence): RetrievalEvidenc
         }
       : {}),
   };
+  if (!includeDiagnostics) {
+    delete compacted.fusionLatencyMs;
+    delete compacted.diagnosticTimings;
+  }
+  return compacted;
 }
 
 async function handlePreview(
   request: Extract<SearchEditRequest, { mode: "preview" }>,
   context: ToolContext | undefined,
+  includeDiagnostics: boolean,
 ): Promise<SearchEditResponse> {
   const preview = await planSearchEditPreview({
     repoId: request.repoId,
@@ -199,7 +209,10 @@ async function handlePreview(
     expiresAt: new Date(stored.expiresAt).toISOString(),
     ...(preview.summary.partial ? { partial: true } : {}),
     ...(preview.retrievalEvidence
-      ? { retrievalEvidence: compactRetrievalEvidence(preview.retrievalEvidence) }
+      ? { retrievalEvidence: compactRetrievalEvidence(
+          preview.retrievalEvidence,
+          includeDiagnostics,
+        ) }
       : {}),
   };
   const rawBytes = computeAggregateRawBytes(stored);
@@ -304,9 +317,10 @@ export async function handleSearchEdit(
   args: unknown,
   context?: ToolContext,
 ): Promise<SearchEditResponse> {
+  const { includeDiagnostics = false } = extractProjectionRequestOptions(args);
   const request = parseActionHandlerArgs(SearchEditRequestSchema, args);
   if (request.mode === "preview") {
-    return handlePreview(request, context);
+    return handlePreview(request, context, includeDiagnostics);
   }
   return handleApply(request);
 }

tests/integration/search-edit-tool.test.ts

@@ -1416,6 +1416,26 @@ describe("sdl.search.edit", { concurrency: false }, () => {
       hasSources || hasFallback,
       `retrievalEvidence should expose sources or fallbackReason; got ${JSON.stringify(ev)}`,
     );
+    assert.strictEqual(ev.fusionLatencyMs, undefined);
+    assert.strictEqual(ev.diagnosticTimings, undefined);
+
+    const diagnosticPreview = (await handleSearchEdit({
+      mode: "preview",
+      repoId: REPO_ID,
+      targeting: "text",
+      query: {
+        literal: "oldName",
+        replacement: "newName",
+        global: true,
+      },
+      editMode: "replacePattern",
+      filters: { extensions: [".txt"] },
+      includeDiagnostics: true,
+    })) as SearchEditPreviewResponse;
+
+    assert.ok(
+      diagnosticPreview.retrievalEvidence?.fusionLatencyMs !== undefined,
+    );
   });
 
   it("apply rejects an expired planHandle (fail-closed on TTL)", async () => {

tests/unit/context-v2.test.ts

@@ -978,6 +978,16 @@ describe("ContextEngineV2 pure contracts", () => {
       [[rankOne.symbolId, "card"]],
     );
     assert.equal(result.omitted.byReason.budget, 3);
+    assert.deepEqual(
+      result.omitted.highestRanked.map(({ symbolId, rung }) => [symbolId, rung]),
+      [[rankTwo.symbolId, "card"]],
+    );
+    assert.deepEqual(result.nextActions, [
+      {
+        id: "symbol.getCard",
+        args: { symbolIds: [rankTwo.symbolId] },
+      },
+    ]);
   });
 
   it("canonicalizes evidence, edges, lanes, and recovery actions", () => {

tests/unit/repo-status-health.test.ts

@@ -41,6 +41,19 @@ describe("repo status health fields", () => {
     assert.ok(source.includes("serverInfo: getServerInfo(),"));
   });
 
+  it("omits memories when repo status has none to surface", () => {
+    // ponytail: source-adjacent guard until repo status dependencies have injection seams.
+    const source = readFileSync(
+      new URL("../../src/mcp/tools/repo.ts", import.meta.url),
+      "utf8",
+    );
+
+    assert.ok(
+      source.includes("...(memories !== undefined ? { memories } : {}),"),
+    );
+    assert.doesNotMatch(source, /^\s{6}memories,$/m);
+  });
+
   it("opens and closes the root without enumerating it", async () => {
     const root = mkdtempSync(join(tmpdir(), "sdl-root-bounded-probe-"));
     let opens = 0;