carrick 0.3.82 → 0.3.84

package/sidecar/dist/src/capture/check.js

@@ -24,7 +24,8 @@ import { classifyPair, parseTscOutput, } from './check-classify.js';
 import { scrubPaths } from './check-scrub.js';
 import { assembleWorkspace, writeProbes, } from './check-workspace.js';
 import { buildPoisonIndexes } from './check-poison.js';
-import { probeDeepFindings } from './check-deep.js';
+import { openProbeProgram, probeDeepFindings } from './check-deep.js';
+import { pairFieldReports } from './check-fields.js';
 function runProcess(command, args, cwd) {
     return new Promise((resolve, reject) => {
         const child = spawn(command, args, { cwd, stdio: ['ignore', 'pipe', 'pipe'] });
@@ -82,6 +83,9 @@ function unverifiableAll(plans, gate, diagnostic) {
         codes: [],
         resolved: false,
         unresolved_reason: diagnostic,
+        // Nothing was compared here, so there is nothing to observe about the
+        // comparison (carrick#1341). Empty is the honest answer, not a default.
+        notes: [],
     }));
 }
 function sortVerdicts(verdicts) {
@@ -141,6 +145,7 @@ export async function runCheck(opts, onProgress) {
                 codes: [],
                 resolved: false,
                 unresolved_reason: 'one side of this pair has no captured type surface',
+                notes: [],
             });
         }
     }
@@ -185,6 +190,7 @@ export async function runCheck(opts, onProgress) {
             unresolved_reason: hit.kind === 'budget_exhausted'
                 ? `the ${hit.side} type is too deep or wide to verify at '${hit.path}'`
                 : `the ${hit.side} type carries '${hit.kind}' at '${hit.path}'`,
+            notes: [],
         });
     }
     writeProbes(ws, probing);
@@ -279,7 +285,12 @@ export async function runCheck(opts, onProgress) {
     // carries a member-level any/unknown HERE — after install, where the capture
     // could not look (carrick#450). It sets `resolved` and nothing else; no
     // bucket depends on it.
-    const deepByPair = probeDeepFindings(ws.probesDir, probing);
+    const probeProgram = openProbeProgram(ws.probesDir, probing);
+    const deepByPair = probeDeepFindings(probeProgram, probing);
+    // The same program answers which FIELDS differ on a pair the judge called
+    // incompatible (carrick-tools/carrick-cloud#1118). It names what the verdict
+    // is about; it never decides one.
+    const fieldsByPair = pairFieldReports(probeProgram, probing);
     const verdicts = sortVerdicts([
         ...probing.map((plan) => classifyPair({
             plan,
@@ -287,6 +298,7 @@ export async function runCheck(opts, onProgress) {
             poisonReason,
             scrubCtx,
             deepFindings: deepByPair.get(plan.pairId),
+            fieldReport: fieldsByPair.get(plan.pairId),
         })),
         ...preGated,
         ...unresolved,

package/sidecar/dist/src/capture/index.js

@@ -95,7 +95,12 @@ function emptyFidelity() {
         total_aliases: 0,
         by_serialization: { emitted: 0, node_builder: 0, structural_fallback: 0 },
         by_self_check: { ok: 0, allowlisted_external: 0, decayed_internal: 0 },
-        by_anchor_origin: { 'llm-symbol': 0, 'deterministic-infer': 0, 'anchor-backfill': 0 },
+        by_anchor_origin: {
+            'llm-symbol': 0,
+            'deterministic-infer': 0,
+            'anchor-backfill': 0,
+            'manifest-placeholder': 0,
+        },
         usable_rate: 0,
     };
 }

package/sidecar/dist/src/capture/self-check.d.ts

@@ -22,7 +22,12 @@
  * Attribution is per-alias closure: failed specifiers are blamed on an alias
  * only if they occur in a file reachable from that alias's surface statement
  * (import-type seeds, then BFS over relative imports). The spike's
- * file-granularity shortcut is gone.
+ * file-granularity shortcut is gone -- including on the SURFACE file itself,
+ * which holds every alias, so a file-granular bucket there blamed the whole
+ * service for one alias's dangling specifier (cloud#1184). A surface
+ * diagnostic is attributed by `export type` statement span, exactly as
+ * check-poison.ts contains poison; one that no statement covers keeps the
+ * service-wide bucket.
  */
 import ts from 'typescript';
 import type { CaptureAliasRecord } from './api.js';

package/sidecar/dist/src/capture/self-check.js

@@ -22,7 +22,12 @@
  * Attribution is per-alias closure: failed specifiers are blamed on an alias
  * only if they occur in a file reachable from that alias's surface statement
  * (import-type seeds, then BFS over relative imports). The spike's
- * file-granularity shortcut is gone.
+ * file-granularity shortcut is gone -- including on the SURFACE file itself,
+ * which holds every alias, so a file-granular bucket there blamed the whole
+ * service for one alias's dangling specifier (cloud#1184). A surface
+ * diagnostic is attributed by `export type` statement span, exactly as
+ * check-poison.ts contains poison; one that no statement covers keeps the
+ * service-wide bucket.
  */
 import ts from 'typescript';
 import * as fs from 'node:fs';
@@ -73,13 +78,26 @@ function runSelfCheck(args, treeFiles) {
     const program = ts.createProgram(treeFiles, options, args.compilerHost?.(options));
     const checker = program.getTypeChecker();
     const diagnostics = ts.getPreEmitDiagnostics(program);
-    // Failed module specifiers, split external-pinned vs internal, per FILE.
+    const surfaceAbs = path.resolve(args.surfaceAbsPath);
+    const surfaceSource = program.getSourceFile(surfaceAbs);
+    // The surface holds EVERY alias, and every alias's closure starts there, so
+    // a file-granular failure bucket on it blames the whole service for one
+    // alias's dangling specifier (cloud#1184). Attribute by `export type`
+    // statement span, exactly as check-poison.ts contains poison.
+    const aliasAtSurfacePosition = buildSurfaceSpanIndex(surfaceSource);
+    // Failed module specifiers, split external-pinned vs internal, per FILE —
+    // except on the surface, where they are per ALIAS.
     const failuresByFile = new Map();
-    const failuresFor = (fileName) => {
-        let entry = failuresByFile.get(fileName);
+    const surfaceFailuresByAlias = new Map();
+    const emptyFailures = () => ({
+        externalPinned: new Set(),
+        internal: new Set(),
+    });
+    const bucketIn = (map, key) => {
+        let entry = map.get(key);
         if (!entry) {
-            entry = { externalPinned: new Set(), internal: new Set() };
-            failuresByFile.set(fileName, entry);
+            entry = emptyFailures();
+            map.set(key, entry);
         }
         return entry;
     };
@@ -91,7 +109,15 @@ function runSelfCheck(args, treeFiles) {
         if (!m)
             continue;
         const spec = m[1];
-        const bucket = failuresFor(path.resolve(d.file.fileName));
+        const abs = path.resolve(d.file.fileName);
+        // A surface diagnostic outside every alias statement (a file-level import,
+        // a reference directive) is attributable to no alias and keeps the
+        // service-wide file bucket: soundness over precision, the same fallback
+        // check-poison.ts makes.
+        const owner = abs === surfaceAbs ? aliasAtSurfacePosition(d.start) : undefined;
+        const bucket = owner
+            ? bucketIn(surfaceFailuresByAlias, owner)
+            : bucketIn(failuresByFile, abs);
         if (!isRelative(spec) && args.pinned[packageNameOf(spec)]) {
             bucket.externalPinned.add(spec);
         }
@@ -113,8 +139,6 @@ function runSelfCheck(args, treeFiles) {
         }
         adjacency.set(abs, neighbors);
     }
-    const surfaceAbs = path.resolve(args.surfaceAbsPath);
-    const surfaceSource = program.getSourceFile(surfaceAbs);
     const records = [];
     for (const anchor of args.resolved) {
         // Demotions (failureReason present) never reached the surface with a
@@ -131,10 +155,35 @@ function runSelfCheck(args, treeFiles) {
                 surfaceSource,
                 adjacency,
                 failuresByFile,
+                surfaceFailuresByAlias,
             }));
     }
     return records;
 }
+/**
+ * Position -> the alias whose `export type` statement span covers it, for
+ * diagnostics reported on the surface file. `undefined` when no alias
+ * statement covers the position, or when the surface is not in the program.
+ */
+function buildSurfaceSpanIndex(surfaceSource) {
+    if (!surfaceSource)
+        return () => undefined;
+    const spans = [];
+    for (const stmt of surfaceSource.statements) {
+        if (!ts.isTypeAliasDeclaration(stmt))
+            continue;
+        spans.push({
+            alias: stmt.name.text,
+            start: stmt.getStart(surfaceSource),
+            end: stmt.getEnd(),
+        });
+    }
+    return (position) => {
+        if (position === undefined)
+            return undefined;
+        return spans.find((span) => position >= span.start && position <= span.end)?.alias;
+    };
+}
 /** An alias that never reached a capture-native tier: the failure reason was
  * recorded at demotion time; the surface line is `unknown` by construction. */
 function demotedRecord(anchor) {
@@ -195,8 +244,13 @@ function checkedRecord(anchor, ctx) {
     let blamedExternal;
     let internalFailure;
     const danglingSpecifiers = new Set();
-    for (const file of closure) {
-        const failures = ctx.failuresByFile.get(file);
+    // This alias's own surface statement, then the closure's files. The surface
+    // file bucket now holds only the diagnostics no alias statement covers.
+    const closureFailures = [
+        ctx.surfaceFailuresByAlias.get(alias),
+        ...[...closure].map((file) => ctx.failuresByFile.get(file)),
+    ];
+    for (const failures of closureFailures) {
         if (!failures)
             continue;
         if (!blamedExternal)

package/sidecar/dist/src/validators.d.ts

@@ -346,45 +346,45 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         alias: z.ZodString;
         symbol_name: z.ZodString;
         source_file: z.ZodString;
-        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill"]>;
+        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
         array_depth: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         kind: "symbol";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         array_depth?: number | undefined;
     }, {
         kind: "symbol";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         array_depth?: number | undefined;
     }>, z.ZodObject<{
         kind: z.ZodLiteral<"handler_return">;
         alias: z.ZodString;
         symbol_name: z.ZodString;
         source_file: z.ZodString;
-        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill"]>;
+        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
     }, "strip", z.ZodTypeAny, {
         kind: "handler_return";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
     }, {
         kind: "handler_return";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
     }>, z.ZodObject<{
         kind: z.ZodLiteral<"infer">;
         alias: z.ZodString;
         source_file: z.ZodString;
-        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill"]>;
+        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
         span_start: z.ZodOptional<z.ZodNumber>;
         span_end: z.ZodOptional<z.ZodNumber>;
         line_number: z.ZodOptional<z.ZodNumber>;
@@ -394,7 +394,7 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         kind: "infer";
         alias: string;
         source_file: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         line_number?: number | undefined;
         span_start?: number | undefined;
         span_end?: number | undefined;
@@ -404,7 +404,7 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         kind: "infer";
         alias: string;
         source_file: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         line_number?: number | undefined;
         span_start?: number | undefined;
         span_end?: number | undefined;
@@ -414,18 +414,18 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         kind: z.ZodLiteral<"literal">;
         alias: z.ZodString;
         type_text: z.ZodString;
-        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill"]>;
+        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
         source_file: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         kind: "literal";
         alias: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
     }, {
         kind: "literal";
         alias: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
     }>]>, "many">;
@@ -441,19 +441,19 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         array_depth?: number | undefined;
     } | {
         kind: "handler_return";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
     } | {
         kind: "infer";
         alias: string;
         source_file: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         line_number?: number | undefined;
         span_start?: number | undefined;
         span_end?: number | undefined;
@@ -462,7 +462,7 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
     } | {
         kind: "literal";
         alias: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
     })[];
@@ -478,19 +478,19 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         array_depth?: number | undefined;
     } | {
         kind: "handler_return";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
     } | {
         kind: "infer";
         alias: string;
         source_file: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         line_number?: number | undefined;
         span_start?: number | undefined;
         span_end?: number | undefined;
@@ -499,7 +499,7 @@ export declare const CaptureV2RequestSchema: z.ZodObject<{
     } | {
         kind: "literal";
         alias: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
     })[];
@@ -1412,45 +1412,45 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         alias: z.ZodString;
         symbol_name: z.ZodString;
         source_file: z.ZodString;
-        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill"]>;
+        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
         array_depth: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         kind: "symbol";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         array_depth?: number | undefined;
     }, {
         kind: "symbol";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         array_depth?: number | undefined;
     }>, z.ZodObject<{
         kind: z.ZodLiteral<"handler_return">;
         alias: z.ZodString;
         symbol_name: z.ZodString;
         source_file: z.ZodString;
-        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill"]>;
+        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
     }, "strip", z.ZodTypeAny, {
         kind: "handler_return";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
     }, {
         kind: "handler_return";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
     }>, z.ZodObject<{
         kind: z.ZodLiteral<"infer">;
         alias: z.ZodString;
         source_file: z.ZodString;
-        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill"]>;
+        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
         span_start: z.ZodOptional<z.ZodNumber>;
         span_end: z.ZodOptional<z.ZodNumber>;
         line_number: z.ZodOptional<z.ZodNumber>;
@@ -1460,7 +1460,7 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         kind: "infer";
         alias: string;
         source_file: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         line_number?: number | undefined;
         span_start?: number | undefined;
         span_end?: number | undefined;
@@ -1470,7 +1470,7 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         kind: "infer";
         alias: string;
         source_file: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         line_number?: number | undefined;
         span_start?: number | undefined;
         span_end?: number | undefined;
@@ -1480,18 +1480,18 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         kind: z.ZodLiteral<"literal">;
         alias: z.ZodString;
         type_text: z.ZodString;
-        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill"]>;
+        anchor_origin: z.ZodEnum<["llm-symbol", "deterministic-infer", "anchor-backfill", "manifest-placeholder"]>;
         source_file: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         kind: "literal";
         alias: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
     }, {
         kind: "literal";
         alias: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
     }>]>, "many">;
@@ -1507,19 +1507,19 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         array_depth?: number | undefined;
     } | {
         kind: "handler_return";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
     } | {
         kind: "infer";
         alias: string;
         source_file: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         line_number?: number | undefined;
         span_start?: number | undefined;
         span_end?: number | undefined;
@@ -1528,7 +1528,7 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
     } | {
         kind: "literal";
         alias: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
     })[];
@@ -1544,19 +1544,19 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         array_depth?: number | undefined;
     } | {
         kind: "handler_return";
         alias: string;
         source_file: string;
         symbol_name: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
     } | {
         kind: "infer";
         alias: string;
         source_file: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         line_number?: number | undefined;
         span_start?: number | undefined;
         span_end?: number | undefined;
@@ -1565,7 +1565,7 @@ export declare const SidecarRequestSchema: z.ZodDiscriminatedUnion<"action", [z.
     } | {
         kind: "literal";
         alias: string;
-        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill";
+        anchor_origin: "llm-symbol" | "deterministic-infer" | "anchor-backfill" | "manifest-placeholder";
         type_text: string;
         source_file?: string | undefined;
     })[];

package/sidecar/dist/src/validators.js

@@ -186,7 +186,12 @@ export const EmitSurfaceRequestSchema = BaseRequestSchema.extend({
     output_path: z.string().min(1, 'Output path cannot be empty'),
 });
 /** v2 "tsc as serializer" capture (contract in ./capture/api.ts). */
-const AnchorOriginSchema = z.enum(['llm-symbol', 'deterministic-infer', 'anchor-backfill']);
+const AnchorOriginSchema = z.enum([
+    'llm-symbol',
+    'deterministic-infer',
+    'anchor-backfill',
+    'manifest-placeholder',
+]);
 const CaptureAnchorRequestSchema = z.discriminatedUnion('kind', [
     z.object({
         kind: z.literal('symbol'),

package/templates/skills/carrick-census.md

@@ -12,31 +12,37 @@ does.
 
 ## 1. Two wordings
 
-Search twice. One query says what the code is for, the other says how it does
+Ask in two wordings. One says what the code is for, the other says how it does
 it. A purpose wording misses a helper whose description names only its
 mechanism, and a mechanism wording misses one described only by its job.
 
 ```
-search_by_intent({{SCOPE}}, query: "<what it is for>", compact: true, top_k: 20)
-search_by_intent({{SCOPE}}, query: "<how it does it>", compact: true, top_k: 20)
+search_by_intent({{SCOPE}}, query: "<what it is for>", also_phrased_as: ["<how it does it>"], compact: true, top_k: 20)
 ```
 
 `compact: true` returns locator-only rows, which is the shape a census needs.
-Page each query while `has_more` is true:
+One answer holds both wordings, deduped, with `phrasings` naming them and
+`matched_phrasings` on each row saying which ones reached it. Page it while
+`has_more` is true:
 
 ```
-search_by_intent({{SCOPE}}, query: "<the same query>", compact: true, top_k: 20, offset: <next_offset>)
+search_by_intent({{SCOPE}}, query: "<the same query>", also_phrased_as: ["<the same second wording>"], compact: true, top_k: 20, offset: <next_offset>)
 ```
 
+Where the answer carries no `phrasings`, or the field comes back refused, the
+server answering takes one wording per call. Run the second wording as its own
+paged search.
+
 Stop when `has_more` is false. Lower `similarity_threshold` where the tail of a
 page is still on topic.
 
 ## 2. Union
 
-Join the two result sets on `file_path` and `line_number`. A row both wordings
-found is one row. Keep `retrieved_by` and `similarity` on each row, and keep
-which wording found it: a row only one wording reached is the row a single
-search would have lost.
+One answer over both wordings is already deduped, and `matched_phrasings` says
+which wordings reached each row. Two answers are joined here, on `file_path` and
+`line_number`, and a row both wordings found is one row. Either way keep
+`retrieved_by` and `similarity`, and keep which wording found each row. A row
+only one wording reached is the row a single search would have lost.
 
 ## 3. Receipt
 
@@ -44,6 +50,9 @@ Report these numbers before the list, per query where the field is per query:
 
 - rows read, which is the count you paged to;
 - `total_candidates`, the exact size of the ranked list for that query;
+- `hidden_by_threshold` where the answer carries it: how many rows the floor
+  removed, and `best` where it names the closest of them. A count above zero is
+  the case for one more search at a lower `similarity_threshold`;
 - `total_without_intent`, which is index-wide: functions carrying no intent
   text, which no search looked at;
 - `total_intent_carried_forward` where the response states it, which are intents

package/templates/skills/carrick-drift.md

@@ -74,7 +74,13 @@ against a `string` on the other is not a difference.
 | POST /api/orders | UNRESOLVED | NewOrder | OrderDraft | web/src/orders.ts:52 | unresolved; type texts differ on `note` |
 
 Class words, and only these: MATCH, DRIFT, UNRESOLVED, NOT JUDGED, CONSUMER
-UNTYPED, PRODUCER UNTYPED. A reading of the two type texts goes in the verdict
+UNTYPED, PRODUCER UNTYPED. Every operation the answer returned carries one of
+them, the class column is never empty, and the report states operations returned
+against operations classed. Where more than one word fits an operation, the row
+takes the first that applies of DRIFT, PRODUCER UNTYPED, CONSUMER UNTYPED,
+UNRESOLVED, NOT JUDGED, MATCH, because a stored incompatible verdict is the
+finding and a side carrying no type is why nothing past it could be judged.
+A reading of the two type texts goes in the verdict
 column beside the stored state, in the words "type texts differ", so nothing in
 the table reads as a verdict the index did not give you.
 

package/templates/skills/carrick-impact.md

@@ -83,7 +83,9 @@ One table, then the detail.
 | admin-ui | src/api/orders.ts:44 | INCOMPATIBLE | fact |
 
 Verdict words, and only these: COMPATIBLE, INCOMPATIBLE, UNRESOLVED,
-NOT COMPARED. In the same message, state:
+NOT COMPARED. Every consumer call site the answers returned carries one of them
+and the verdict column is never empty, and the report states call sites returned
+against call sites given a verdict. In the same message, state:
 
 - the producers, with file and line;
 - unmatched calls and near misses, listed apart from consumers;