carrick 0.3.105 → 0.3.107

package/dist/hook/refresh.js

@@ -132,7 +132,14 @@ export function refreshInBackground(root, status, options = {}) {
         return null;
     if (!claimRefresh(marker, now, cooldown))
         return null;
-    (options.start ?? startDetached)(binary(env), ["refresh", "--workspace", root], env);
+    // Nobody started this refresh and nobody is reading it, so it does not keep
+    // the machine awake: that hold is for a scan a person is waiting on, and it
+    // comes with a line saying so that this one has nowhere to print
+    // (carrick#1889).
+    (options.start ?? startDetached)(binary(env), ["refresh", "--workspace", root], {
+        ...env,
+        CARRICK_NO_KEEP_AWAKE: "1",
+    });
     return "Carrick: a repo here is connected with no hosted index yet, so a refresh is running in the background. Its rows arrive in the next session.";
 }
 //# sourceMappingURL=refresh.js.map

package/dist/hook/refresh.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../src/hook/refresh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../src/hook/refresh.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,EAAE;AACF,0EAA0E;AAC1E,0EAA0E;AAC1E,8EAA8E;AAC9E,6EAA6E;AAC7E,8CAA8C;AAC9C,EAAE;AACF,qEAAqE;AACrE,iCAAiC;AACjC,EAAE;AACF,+EAA+E;AAC/E,qEAAqE;AACrE,4EAA4E;AAC5E,4EAA4E;AAC5E,sBAAsB;AACtB,wEAAwE;AACxE,6EAA6E;AAC7E,6EAA6E;AAC7E,+EAA+E;AAC/E,+EAA+E;AAC/E,mCAAmC;AACnC,EAAE;AACF,0EAA0E;AAC1E,6EAA6E;AAC7E,oEAAoE;AAEpE,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,iEAAiE;AACjE,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,GAAG,MAAM,CAAC;AAE/C,2EAA2E;AAC3E,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAyB,OAAO,CAAC,GAAG;IAC7D,MAAM,GAAG,GAAG,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;IAC3D,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC;AAC/E,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,mBAAmB,CAAC,MAAoB;IACtD,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,KAAK,cAAc,CAAC,CAAC;AACpF,CAAC;AAED,yEAAyE;AACzE,SAAS,SAAS,CAAC,MAAc;IAC/B,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,cAAc,CAAC,MAAoB,EAAE,MAAc;IACjE,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;IAC7F,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,GAAW,EAAE,QAAgB;IACxE,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,IAAI,KAAK,IAAI,IAAI,GAAG,GAAG,IAAI,GAAG,QAAQ;QAAE,OAAO,KAAK,CAAC;IACzD,MAAM,SAAS,GAAG,GAAG,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC7C,IAAI,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC;gBACH,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAC/B,OAAO,IAAI,CAAC;YACd,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;oBAAE,OAAO,KAAK,CAAC;YACvE,CAAC;YACD,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAC;YACvD,IAAI,GAAG,GAAG,OAAO,GAAG,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAC3C,IAAI,CAAC;gBACH,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC;YAAC,MAAM,CAAC;gBACP,kEAAkE;YACpE,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YACH,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,6CAA6C;QAC/C,CAAC;IACH,CAAC;AACH,CAAC;AASD,SAAS,aAAa,CAAC,OAAe,EAAE,IAAc,EAAE,GAAsB;IAC5E,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7E,KAAK,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CACjC,IAAY,EACZ,MAAoB,EACpB,UAA0B,EAAE;IAE5B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;IACtC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9C,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,QAAQ;QAAE,OAAO,IAAI,CAAC;IACjE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IACtD,4EAA4E;IAC5E,4EAA4E;IAC5E,iEAAiE;IACjE,kBAAkB;IAClB,CAAC,OAAO,CAAC,KAAK,IAAI,aAAa,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE;QAC9E,GAAG,GAAG;QACN,qBAAqB,EAAE,GAAG;KAC3B,CAAC,CAAC;IACH,OAAO,6IAA6I,CAAC;AACvJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carrick",
-  "version": "0.3.105",
+  "version": "0.3.107",
   "description": "Maps your entire TypeScript codebase across services and repositories, giving AI agents full context on existing types, routes, and function behaviours over MCP before they write duplicate or breaking code.",
   "keywords": [
     "typescript",
@@ -58,11 +58,11 @@
     "zod": "^3.23.0"
   },
   "optionalDependencies": {
-    "@carrick-tools/cli-darwin-arm64": "0.3.105",
-    "@carrick-tools/cli-darwin-x64": "0.3.105",
-    "@carrick-tools/cli-linux-arm64": "0.3.105",
-    "@carrick-tools/cli-linux-x64": "0.3.105",
-    "@carrick-tools/cli-win32-x64": "0.3.105"
+    "@carrick-tools/cli-darwin-arm64": "0.3.107",
+    "@carrick-tools/cli-darwin-x64": "0.3.107",
+    "@carrick-tools/cli-linux-arm64": "0.3.107",
+    "@carrick-tools/cli-linux-x64": "0.3.107",
+    "@carrick-tools/cli-win32-x64": "0.3.107"
   },
   "devDependencies": {
     "@types/node": "^24.13.3",

package/plugin/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "carrick",
   "description": "Claude Code plugin for Carrick, which indexes TypeScript codebases across service and repository boundaries. After each edit it adds the file's routes, calls, and cross-service type mismatches to the session, and it registers Carrick's language server. It pairs with the Carrick MCP server, which lets agents search functions by intent rather than name.",
-  "version": "0.3.105",
+  "version": "0.3.107",
   "author": {
     "name": "Carrick",
     "email": "hello@carrick.tools"

package/sidecar/dist/src/capture/anchors.d.ts

@@ -56,8 +56,21 @@ export interface ResolvedAnchor {
      */
     namesUnemittedModule?: true;
 }
-/** Repo-root-relative source file -> extensionless specifier from entryDir. */
-export declare function entryRelativeSpecifier(entryDir: string, repoRoot: string, sourceFile: string): string;
+/**
+ * Repo-root-relative source file -> the specifier the surface entry imports
+ * it by: its path from `entryDir`, in the form the entry resolves.
+ *
+ * With the extension removed (`./a`), where `resolveFromEntry` says the entry
+ * resolves that to the module. It does not always (carrick#1911): under
+ * `module` `node16`..`nodenext` an entry in a `"type": "module"` package is
+ * an ES module, which must name the file the module compiles to, and a `.mts`
+ * or `.cts` module has no extensionless form under any setting. There, and
+ * with no resolver to ask, the specifier is that output name: `./a.js` for
+ * `.ts` and `.tsx`, `./a.mjs` for `.mts`, `./a.cjs` for `.cts`, which every
+ * module setting maps back to the source and, in the stub, to its
+ * declaration.
+ */
+export declare function entryRelativeSpecifier(entryDir: string, repoRoot: string, sourceFile: string, resolveFromEntry?: (specifier: string) => string | undefined): string;
 /**
  * Resolve one anchor against the analysis program. `placeholder` is the
  * anchor's own placeholder alias declaration in the entry file -- the
@@ -73,6 +86,13 @@ export declare function resolveAnchor(program: ts.Program, request: CaptureAncho
      * these resolves through that module instead of dangling in the entry.
      */
     siblingSymbolSpecs?: Map<string, string>;
+    /**
+     * The file a module specifier resolves to from the surface entry, under
+     * the analysis program's own resolution (carrick#1789). A literal's name
+     * is imported through a package specifier only when the entry reaches the
+     * same module by it.
+     */
+    resolveFromEntry?: (specifier: string) => string | undefined;
 }): ResolvedAnchor;
 /**
  * Locate the target node: tightest expression covering the byte span when

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

@@ -8,16 +8,35 @@ import ts from 'typescript';
 import * as path from 'node:path';
 import { printTypeForDestination, substituteUndeclaredNames, undeclaredNamesIn, } from './node-builder.js';
 import { typeIsOrContainsMachinery } from './machinery.js';
+import { installedPackageSpecifier } from './installed-package.js';
+import { realPath } from './service-config.js';
 import { unresolvedAtAnchor, unresolvedSpecifiersReachableFrom, } from './unresolved.js';
-/** Repo-root-relative source file -> extensionless specifier from entryDir. */
-export function entryRelativeSpecifier(entryDir, repoRoot, sourceFile) {
-    const target = path
-        .join(repoRoot, sourceFile)
-        .replace(/\.(ts|tsx|mts|cts)$/, '');
-    let rel = path.relative(entryDir, target).split(path.sep).join('/');
-    if (!rel.startsWith('.'))
-        rel = `./${rel}`;
-    return rel;
+/**
+ * Repo-root-relative source file -> the specifier the surface entry imports
+ * it by: its path from `entryDir`, in the form the entry resolves.
+ *
+ * With the extension removed (`./a`), where `resolveFromEntry` says the entry
+ * resolves that to the module. It does not always (carrick#1911): under
+ * `module` `node16`..`nodenext` an entry in a `"type": "module"` package is
+ * an ES module, which must name the file the module compiles to, and a `.mts`
+ * or `.cts` module has no extensionless form under any setting. There, and
+ * with no resolver to ask, the specifier is that output name: `./a.js` for
+ * `.ts` and `.tsx`, `./a.mjs` for `.mts`, `./a.cjs` for `.cts`, which every
+ * module setting maps back to the source and, in the stub, to its
+ * declaration.
+ */
+export function entryRelativeSpecifier(entryDir, repoRoot, sourceFile, resolveFromEntry) {
+    const target = path.join(repoRoot, sourceFile);
+    const from = (file) => {
+        const rel = path.relative(entryDir, file).split(path.sep).join('/');
+        return rel.startsWith('.') ? rel : `./${rel}`;
+    };
+    const bare = from(target.replace(/\.(ts|tsx|mts|cts)$/, ''));
+    const resolved = resolveFromEntry?.(bare);
+    if (resolved !== undefined && realPath(resolved) === realPath(target))
+        return bare;
+    const kind = /(?:\.d)?\.([cm]?)[jt]sx?$/.exec(target);
+    return kind ? from(`${target.slice(0, kind.index)}.${kind[1]}js`) : bare;
 }
 function moduleExport(checker, sourceFile, name) {
     const moduleSymbol = checker.getSymbolAtLocation(sourceFile);
@@ -56,10 +75,13 @@ export function resolveAnchor(program, request, args) {
         // sibling symbol anchor imports is resolved by that import.
         // carrick#1774: the text names types as they read where it was printed,
         // so a name its source file means by a repo module's export is imported
-        // from that module (a string-union alias printed bare read `any`).
+        // from that module (a string-union alias printed bare read `any`), and
+        // (carrick#1789) a name it imports from a package is imported from that
+        // package. carrick#1836: a name the source file cannot see is imported
+        // from the module the inference recorded it was printed for.
         const scoped = siblingSpec
             ? undefined
-            : qualifyNamesFromSource(text, program, request.source_file, args);
+            : qualifyNamesFromSource(text, program, request.source_file, request.printed_names, args);
         const scopedText = scoped ?? text;
         // carrick#1377: rewrite what nothing declares to `unknown` in place, so
         // one member typed by a module the checkout does not have stops taking
@@ -95,7 +117,7 @@ export function resolveAnchor(program, request, args) {
     if (!sourceFile) {
         return demote(`source file not in program: ${request.source_file}`);
     }
-    const spec = entryRelativeSpecifier(args.entryDir, args.repoRoot, request.source_file);
+    const spec = entryRelativeSpecifier(args.entryDir, args.repoRoot, request.source_file, args.resolveFromEntry);
     if (request.kind === 'symbol') {
         const exported = moduleExport(checker, sourceFile, request.symbol_name);
         if (!exported) {
@@ -390,15 +412,25 @@ function substituteUndeclaredNamesInText(text, program, destination) {
  * member that reads `any`) or a global of the same name (`Notification`).
  * Each reference whose name the source resolves to a type that a module
  * inside the repo exports becomes `import('<module>').<export>`, with its
- * qualifier and type arguments kept. Anything else is left as written: a
- * global, a name only a function body declares, an unexported local, and a
- * type declared outside the repo or under `node_modules`, which the stub does
- * not ship.
+ * qualifier and type arguments kept. A name the source imports from an
+ * installed package becomes `import('<package specifier>').<export>`
+ * (carrick#1789): the stub ships no `node_modules`, but it pins the packages
+ * its surface imports, and the check phase installs them. Anything else is
+ * left as written: a global, a name only a function body declares, an
+ * unexported local, and a type declared outside the repo that no package
+ * import reaches.
+ *
+ * carrick#1836: a name the source file cannot see at all was printed without
+ * its scope (the inferrer's structural printer writes names bare). When the
+ * inference recorded one declaration for it (`printed`), the name is imported
+ * from that declaration's module, under the same repo rule. A name recorded
+ * for two declarations is left as written: the text no longer says which one
+ * a position meant.
  *
  * Returns the rewritten text, or undefined when nothing was rewritten, so a
  * text with no such name stays byte-identical.
  */
-function qualifyNamesFromSource(text, program, sourceFileRel, args) {
+function qualifyNamesFromSource(text, program, sourceFileRel, printed, args) {
     if (!sourceFileRel)
         return undefined;
     const source = program.getSourceFile(path.join(args.repoRoot, sourceFileRel));
@@ -415,6 +447,14 @@ function qualifyNamesFromSource(text, program, sourceFileRel, args) {
         ts.forEachChild(node, collect);
     };
     collect(parsed);
+    const specOf = (file) => {
+        const rel = path.relative(args.repoRoot, file.fileName);
+        if (!rel || rel.startsWith('..') || path.isAbsolute(rel))
+            return undefined;
+        if (rel.split(path.sep).includes('node_modules'))
+            return undefined;
+        return entryRelativeSpecifier(args.entryDir, args.repoRoot, rel.split(path.sep).join('/'), args.resolveFromEntry);
+    };
     const imports = new Map();
     const importFor = (name) => {
         if (imports.has(name))
@@ -423,12 +463,8 @@ function qualifyNamesFromSource(text, program, sourceFileRel, args) {
         const atSource = checker.resolveName(name, source, meaning, false);
         const target = atSource && resolveSymbolAliases(checker, atSource);
         const declaringFile = target?.declarations?.[0]?.getSourceFile();
-        const rel = declaringFile && path.relative(args.repoRoot, declaringFile.fileName);
-        if (target &&
-            declaringFile &&
-            rel &&
-            !rel.startsWith('..') &&
-            !rel.split(path.sep).includes('node_modules')) {
+        const spec = declaringFile && specOf(declaringFile);
+        if (target && declaringFile && spec) {
             const moduleSymbol = checker.getSymbolAtLocation(declaringFile);
             const exported = moduleSymbol
                 ? checker
@@ -436,28 +472,46 @@ function qualifyNamesFromSource(text, program, sourceFileRel, args) {
                     .filter((candidate) => resolveSymbolAliases(checker, candidate) === target)
                 : [];
             const chosen = exported.find((candidate) => candidate.getName() === name) ?? exported[0];
-            if (chosen) {
-                found = {
-                    spec: entryRelativeSpecifier(args.entryDir, args.repoRoot, rel.split(path.sep).join('/')),
-                    exportName: chosen.getName(),
-                };
-            }
+            if (chosen)
+                found = { spec, exportPath: [chosen.getName()] };
         }
+        if (!found && atSource)
+            found = packageImportOf(program, atSource, args.resolveFromEntry);
+        if (!found && !atSource)
+            found = printedImportOf(program, name, printed, specOf);
         imports.set(name, found);
         return found;
     };
     const leftmost = (name) => ts.isIdentifier(name) ? name : leftmost(name.left);
-    const renameLeftmost = (name, to) => ts.isIdentifier(name)
-        ? ts.factory.createIdentifier(to)
-        : ts.factory.createQualifiedName(renameLeftmost(name.left, to), name.right);
+    const entityName = (parts) => parts
+        .slice(1)
+        .reduce((left, part) => ts.factory.createQualifiedName(left, part), ts.factory.createIdentifier(parts[0]));
+    const replaceLeftmost = (name, to) => ts.isIdentifier(name)
+        ? entityName(to)
+        : ts.factory.createQualifiedName(replaceLeftmost(name.left, to), name.right);
+    const dropLeftmost = (name) => ts.isIdentifier(name.left)
+        ? name.right
+        : ts.factory.createQualifiedName(dropLeftmost(name.left), name.right);
+    // What follows `import('<spec>')`: the export path, then the reference's
+    // own qualifier. Through a namespace import the namespace's name goes, and
+    // the next name must be something the package exports.
+    const qualifierFor = (typeName, target) => {
+        if ('exportPath' in target)
+            return replaceLeftmost(typeName, target.exportPath);
+        if (ts.isIdentifier(typeName))
+            return undefined;
+        const qualifier = dropLeftmost(typeName);
+        return target.namespaceExports.has(leftmost(qualifier).text) ? qualifier : undefined;
+    };
     let rewrites = 0;
     const rewrite = (node) => {
         if (ts.isTypeReferenceNode(node)) {
             const name = leftmost(node.typeName).text;
             const target = typeParameters.has(name) ? undefined : importFor(name);
-            if (target) {
+            const qualifier = target && qualifierFor(node.typeName, target);
+            if (target && qualifier) {
                 rewrites += 1;
-                return ts.factory.createImportTypeNode(ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(target.spec)), undefined, renameLeftmost(node.typeName, target.exportName), node.typeArguments?.map((argument) => rewrite(argument)), false);
+                return ts.factory.createImportTypeNode(ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(target.spec)), undefined, qualifier, node.typeArguments?.map((argument) => rewrite(argument)), false);
             }
         }
         return ts.visitEachChild(node, rewrite, /* context */ undefined);
@@ -469,6 +523,96 @@ function qualifyNamesFromSource(text, program, sourceFileRel, args) {
         .createPrinter({ removeComments: true })
         .printNode(ts.EmitHint.Unspecified, rewritten, parsed.getSourceFile());
 }
+/**
+ * carrick#1789: how the surface entry imports `local`, a name the source file
+ * binds with an import from an installed package, or undefined.
+ *
+ * The entry names the module the source's import resolves to by its file
+ * path, as the node builder names a library type it cannot reach by a bare
+ * specifier; the post-emit rewrite turns that path into the package's bare
+ * specifier and pins the installed version (`installedPackageSpecifier`). A
+ * bare specifier in the entry itself would be resolved from the entry: on a
+ * Deno service that goes through the graph's virtual `node_modules`, and the
+ * emitter then reads the package there, cannot name its types from the
+ * service's own modules (TS2742), and skips their declarations.
+ *
+ * Kept only when the module lies inside an installed package and the bare
+ * specifier that package gives resolves from the entry to the same file. So
+ * a tsconfig path alias to the repo's own module, a workspace package linked
+ * from the repo (no installed copy to pin), and an import of another
+ * installed copy than the entry reaches all stay as written.
+ */
+function packageImportOf(program, local, resolveFromEntry) {
+    if (!resolveFromEntry || !(local.flags & ts.SymbolFlags.Alias))
+        return undefined;
+    const declaration = local.declarations?.[0];
+    let statement;
+    let exportName;
+    if (declaration && ts.isImportSpecifier(declaration)) {
+        // `import { "a-b" as name }` has no qualifier an import type can write.
+        const exported = declaration.propertyName ?? declaration.name;
+        if (!ts.isIdentifier(exported))
+            return undefined;
+        statement = declaration.parent.parent.parent;
+        exportName = exported.text;
+    }
+    else if (declaration && ts.isImportClause(declaration)) {
+        statement = declaration.parent;
+        exportName = 'default';
+    }
+    else if (declaration && ts.isNamespaceImport(declaration)) {
+        statement = declaration.parent.parent;
+    }
+    else {
+        return undefined;
+    }
+    if (!ts.isImportDeclaration(statement))
+        return undefined;
+    const checker = program.getTypeChecker();
+    const moduleSymbol = checker.getSymbolAtLocation(statement.moduleSpecifier);
+    const moduleFile = moduleSymbol?.declarations?.find(ts.isSourceFile);
+    if (!moduleSymbol || !moduleFile)
+        return undefined;
+    const installed = installedPackageSpecifier(moduleFile.fileName, exportName);
+    const fromEntry = installed && resolveFromEntry(installed.specifier);
+    if (!fromEntry || realPath(fromEntry) !== realPath(moduleFile.fileName))
+        return undefined;
+    const spec = moduleFile.fileName;
+    const exported = new Set(checker.getExportsOfModule(moduleSymbol).map((symbol) => symbol.getName()));
+    if (exportName === undefined)
+        return { spec, namespaceExports: exported };
+    return exported.has(exportName) ? { spec, exportPath: [exportName] } : undefined;
+}
+/**
+ * carrick#1836: the import for `name` from the one declaration the inference
+ * recorded printing it for, or undefined.
+ *
+ * Undefined when the name was recorded for no declaration or for several,
+ * when the recorded module is not in this program or not inside the repo
+ * (`specOf`), and when its export path does not lead to a type there: a record
+ * that does not check out names nothing, and the text stays as written.
+ */
+function printedImportOf(program, name, printed, specOf) {
+    const recorded = (printed ?? []).filter((entry) => entry.name === name);
+    const identities = new Set(recorded.map((entry) => `${entry.file}\0${entry.export_path.join('.')}`));
+    if (identities.size !== 1)
+        return undefined;
+    const entry = recorded[0];
+    const declaring = program.getSourceFile(entry.file);
+    const spec = declaring && specOf(declaring);
+    if (!declaring || !spec)
+        return undefined;
+    const checker = program.getTypeChecker();
+    let current = checker.getSymbolAtLocation(declaring);
+    for (const part of entry.export_path) {
+        const next = current && checker.getExportsOfModule(current).find((s) => s.getName() === part);
+        current = next && resolveSymbolAliases(checker, next);
+    }
+    if (!current || !(current.flags & (ts.SymbolFlags.Type | ts.SymbolFlags.Namespace))) {
+        return undefined;
+    }
+    return { spec, exportPath: entry.export_path };
+}
 /** The type node of `type __LiteralAnchor = <text>;`, or undefined. */
 function parseLiteralAnchor(text) {
     const parsed = ts.createSourceFile('literal-anchor.ts', `type __LiteralAnchor = ${text};`, ts.ScriptTarget.Latest, true);

package/sidecar/dist/src/capture/api.d.ts

@@ -71,6 +71,36 @@ export interface LiteralAnchorRequest {
      * record's `source_file` stays `<inline>`: the answer is still the text.
      */
     source_file?: string;
+    /**
+     * carrick#1836: what the text's bare names meant where they were printed,
+     * for the names `source_file` cannot resolve. A name listed once is
+     * imported from the module that declares it; a name listed for two
+     * declarations is left as written.
+     */
+    printed_names?: PrintedName[];
+    /**
+     * carrick#1842: the text is a body the call site reads as raw text. Copied
+     * onto the alias's record, where the check phase reads it.
+     */
+    raw_text_read?: true;
+}
+/**
+ * The declaration a bare name in printed type text meant (carrick#1836).
+ *
+ * The v1 inferrer prints some types with no enclosing declaration, and that
+ * print writes every named type by its bare name, whether or not the file the
+ * request names can see it. The compiler knew the symbol when it printed the
+ * name; this is that symbol, recorded as the module that declares it and the
+ * export path that reaches it there (`['Status']`, or `['Billing', 'Kind']`
+ * for a namespace member printed as `Kind`).
+ */
+export interface PrintedName {
+    /** The name as the text prints it: the leftmost part of a reference. */
+    name: string;
+    /** Absolute path of the module that declares it. */
+    file: string;
+    /** Export names from that module down to the declaration. */
+    export_path: string[];
 }
 /**
  * Addressable handler: `export type A = Awaited<ReturnType<typeof
@@ -152,7 +182,10 @@ export type SelfCheckOutcome = 'ok' | 'allowlisted_external' | 'decayed_internal
  *    contract.
  *  - `machinery_envelope`: the return resolved to transport (a
  *    Response/Request-shaped envelope) and no payload was recoverable inside
- *    it or from the handler's returned arguments.
+ *    it or from the handler's returned arguments. On a consumer call result it
+ *    is a decided abstain: what the call's result carrier holds is transport
+ *    the service's wrapper rules verify and read no payload out of, such as a
+ *    request library's own response object (carrick#1841).
  *  - `coerced_input`: a request schema's INPUT is `any`/`unknown` at this
  *    position while its parsed output is concrete, which is what a coercion
  *    declares (carrick#1101). The published type carries the output there, so
@@ -271,6 +304,14 @@ export interface CaptureAliasRecord {
      * entry's other provenance. Absent when every position resolves.
      */
     unresolved_in_tree?: TypeProvenance[];
+    /**
+     * carrick#1842: the alias is a body its call site reads as raw text, from
+     * the literal anchor that published it. The check phase reads a pair with
+     * this on either side unverifiable: raw text states no structural contract,
+     * whether or not the other side's type assigns to `string`. Absent
+     * otherwise, and absent on every record a release before this one stored.
+     */
+    raw_text_read?: true;
 }
 /** Aggregate fidelity metric, emitted per capture (one service). */
 export interface CaptureFidelity {

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

@@ -13,6 +13,7 @@
  *   IsVoid gate fired (TS2344)            -> unverifiable (no body read)
  *   IsFormBody gate fired (TS2344)        -> unverifiable (form-encoded body)
  *   IsByteBody gate fired (TS2344)        -> unverifiable (bytes, even agreeing)
+ *   raw-text read marked on a side        -> unverifiable (text, even agreeing)
  *   assignment-class error                -> incompatible
  *   no diagnostics                        -> compatible     [lowest precedence]
  *
@@ -23,7 +24,7 @@
  * Seam: node builtins + this bundle only.
  */
 import type { CheckVerdict } from './api.js';
-import { type ProbePlan } from './check-probe.js';
+import { type ProbePlan, type Side } from './check-probe.js';
 import { type ScrubContext } from './check-scrub.js';
 import type { PairDeepFindings } from './check-deep.js';
 import { type PairFieldReport } from './check-fields.js';
@@ -65,6 +66,13 @@ export interface ClassifyInput {
      * run, in which case the tsc text stands alone.
      */
     fieldReport?: PairFieldReport;
+    /**
+     * The side whose capture record says it reads the body as raw text
+     * (carrick#1842), the sent side when both do. Read from the record, not the
+     * type: a text read publishes `string`, which no type gate can tell from a
+     * JSON body that is a string.
+     */
+    rawTextSide?: Side;
 }
 /** Classify one pair into exactly one bucket, honouring the precedence order. */
 export declare function classifyPair(input: ClassifyInput): CheckVerdict;

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

@@ -13,6 +13,7 @@
  *   IsVoid gate fired (TS2344)            -> unverifiable (no body read)
  *   IsFormBody gate fired (TS2344)        -> unverifiable (form-encoded body)
  *   IsByteBody gate fired (TS2344)        -> unverifiable (bytes, even agreeing)
+ *   raw-text read marked on a side        -> unverifiable (text, even agreeing)
  *   assignment-class error                -> incompatible
  *   no diagnostics                        -> compatible     [lowest precedence]
  *
@@ -194,6 +195,20 @@ export function classifyPair(input) {
             ...notAFact(`the ${side} body is bytes`, side),
         };
     }
+    // 4d. A body read as raw text (carrick#1842): a `.text()` read, or a request
+    //     library's text format, takes the body unparsed, so `string` there
+    //     states no structural contract. Like bytes, the pair is not compared,
+    //     whether or not the other side's type assigns to `string`.
+    if (input.rawTextSide && plan.spec.protocol === 'http') {
+        const side = input.rawTextSide;
+        return {
+            ...base,
+            bucket: 'unverifiable',
+            gate: `${side}:text`,
+            diagnostic: `the ${side} reads the body as raw text, which has no JSON shape to compare with the other side.`,
+            ...notAFact(`the ${side} reads the body as raw text`, side),
+        };
+    }
     // 5. Assignment-class error on the DECISIVE assignment line -> incompatible.
     //
     // On an `http` pair that line is the JSON wire assignment, not the declared

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

@@ -27,7 +27,7 @@
 import ts from 'typescript';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { collectSpecifiers, isRelative } from './specifiers.js';
+import { collectSpecifiers, declarationCandidates, isDeclarationFileName, isRelative, } from './specifiers.js';
 /** One index per assembled stub, keyed by service name. */
 export function buildPoisonIndexes(ws) {
     const indexes = new Map();
@@ -45,14 +45,14 @@ function buildOne(ws, serviceName, packageDir) {
         return undefined;
     const keyPrefix = `packages/${packageDir}/types`;
     const surfaceFile = `${keyPrefix}/surface.d.ts`;
-    // Collect the whole `.d.ts` tree, keyed as `packages/<dir>/types/<rel>`.
+    // Collect the whole declaration tree, keyed as `packages/<dir>/types/<rel>`.
     const treeAbs = [];
     const walk = (dir) => {
         for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
             const p = path.join(dir, entry.name);
             if (entry.isDirectory())
                 walk(p);
-            else if (entry.name.endsWith('.d.ts'))
+            else if (isDeclarationFileName(entry.name))
                 treeAbs.push(p);
         }
     };
@@ -63,17 +63,7 @@ function buildOne(ws, serviceName, packageDir) {
         if (!isRelative(spec))
             return undefined;
         const base = path.resolve(path.dirname(fromAbs), spec);
-        const candidates = [
-            `${base}.d.ts`,
-            path.join(base, 'index.d.ts'),
-            base.endsWith('.js') ? `${base.slice(0, -3)}.d.ts` : undefined,
-            base, // already `.d.ts`
-        ].filter((c) => c !== undefined);
-        for (const c of candidates) {
-            if (treeAbsSet.has(path.resolve(c)))
-                return c;
-        }
-        return undefined;
+        return declarationCandidates(base).find((candidate) => treeAbsSet.has(candidate));
     };
     // Per-file relative-import adjacency, over the fileKey namespace.
     const adjacency = new Map();

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

@@ -158,7 +158,8 @@ export async function runCheck(opts, onProgress) {
         const spec = opts.pairs.find((p) => p.pair_key === v.pair_key);
         v.pair_id = fnvOfSpec(spec);
     }
-    const { preGated, probing } = preGate(plans, readStubAliasRecords(opts.stubs));
+    const aliasRecords = readStubAliasRecords(opts.stubs);
+    const { preGated, probing } = preGate(plans, aliasRecords);
     writeProbes(ws, probing);
     const errors = [];
     const degraded = [];
@@ -269,6 +270,7 @@ export async function runCheck(opts, onProgress) {
             scrubCtx,
             deepFindings: deepByPair.get(plan.pairId),
             fieldReport: fieldsByPair.get(plan.pairId),
+            rawTextSide: rawTextSideOf(plan, aliasRecords),
         })),
         ...preGated,
         ...unresolved,
@@ -355,6 +357,16 @@ function preGate(plans, aliasRecords) {
     }
     return { preGated, probing };
 }
+/**
+ * The side whose capture record marks its body as read raw (carrick#1842):
+ * the sent side when both are, as the bytes gate names it.
+ */
+function rawTextSideOf(plan, aliasRecords) {
+    return [plan.direction.sent, plan.direction.expected].find((side) => {
+        const endpoint = plan.spec[side];
+        return aliasRecords.get(endpoint.service_name)?.get(endpoint.alias)?.raw_text_read === true;
+    });
+}
 /** First side (producer, then consumer) whose capture recorded a deep decay. */
 function deepDecayOf(plan, aliasRecords) {
     for (const side of ['producer', 'consumer']) {