carrick 0.3.106 → 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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carrick",
-  "version": "0.3.106",
+  "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.106",
-    "@carrick-tools/cli-darwin-x64": "0.3.106",
-    "@carrick-tools/cli-linux-arm64": "0.3.106",
-    "@carrick-tools/cli-linux-x64": "0.3.106",
-    "@carrick-tools/cli-win32-x64": "0.3.106"
+    "@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.106",
+  "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

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

@@ -11,15 +11,32 @@ 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);
@@ -100,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) {
@@ -436,7 +453,7 @@ function qualifyNamesFromSource(text, program, sourceFileRel, printed, args) {
             return undefined;
         if (rel.split(path.sep).includes('node_modules'))
             return undefined;
-        return entryRelativeSpecifier(args.entryDir, args.repoRoot, rel.split(path.sep).join('/'));
+        return entryRelativeSpecifier(args.entryDir, args.repoRoot, rel.split(path.sep).join('/'), args.resolveFromEntry);
     };
     const imports = new Map();
     const importFor = (name) => {

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/index.js

@@ -34,13 +34,13 @@ import { entryRelativeSpecifier, resolveAnchor } from './anchors.js';
 import { findAugmentationFiles } from './augmentations.js';
 import { installedVersions, lockfileVersions } from './lockfile.js';
 import { rewriteEmittedSpecifiers } from './paths-rewrite.js';
-import { typesPackageOf, withInstalledPackages } from './installed-package.js';
+import { installedPackageSpecifier, typesPackageOf, withInstalledPackages } from './installed-package.js';
 import { selfCheckStub } from './self-check.js';
 import { collectSpecifiers, isRelative, packageNameOf } from './specifiers.js';
 import { DenoProject, findDenoConfig } from './deno-project.js';
 import { emitsAlike, ProjectGraph } from './project-references.js';
 import { findServiceTsconfig } from './service-config.js';
-import { placeEmittedTree } from './outside-root.js';
+import { placeEmittedTree, surfaceModuleInTree } from './outside-root.js';
 import { WriteGuard } from './guarded-fs.js';
 export { DenoProject, findDenoConfig } from './deno-project.js';
 export { serviceConfigPath } from './project-references.js';
@@ -351,7 +351,14 @@ export function captureStub(opts) {
     if (emitPartial) {
         errors.push(`declaration emit was partial: kept ${emitted.size} emitted file(s); ` +
             'aliases referencing unemitted modules are demoted to structural_fallback');
-        resolved = demoteDanglingAliases({ resolved, emitted, declarationSources, staging, surfaceDeclaration });
+        resolved = demoteDanglingAliases({
+            resolved,
+            emitted,
+            declarationSources,
+            staging,
+            entryDir,
+            surfaceDeclaration,
+        });
     }
     // ---- Relocate the emitted tree into the stub package ----
     const typesDir = path.join(stubDir, 'types');
@@ -520,43 +527,47 @@ export function captureStub(opts) {
     };
 }
 /**
- * Partial-emit demotion: with the set of modules that DID reach the tree
- * (emitted .d.ts plus verbatim declaration sources), demote every anchor
- * whose alias text references a relative module absent from that set, and
+ * Partial-emit demotion: demote every anchor whose alias text names, by a
+ * relative or an absolute path, a module the stub will not resolve, and
  * rewrite the demoted aliases' lines in the emitted surface to `unknown`.
+ *
+ * A path resolves when the tree holds its module (`surfaceModuleInTree`: an
+ * emitted declaration inside rootDir or outside it, or a verbatim declaration
+ * source), read from where the entry was written, not from where the surface
+ * sits in the tree. An absolute path into an installed package resolves too
+ * (carrick#1773): no emit writes that module, and the specifier rewrite turns
+ * the path into the package's bare specifier and a pin, as it does when the
+ * emit is whole. A relative path into a package is not rewritten, so it stays
+ * demoted (carrick#1857).
+ *
  * Anchors already demoted stay as they are; anchors whose text is
  * self-contained (node-builder structural prints, literal object text) are
  * untouched even when their source file failed to emit — their surface line
  * references nothing that can dangle.
  */
 function demoteDanglingAliases(args) {
-    // Extensionless, entryDir-relative POSIX module ids present in the tree.
-    const treeModules = new Set();
-    let surfaceKey;
-    for (const fileName of args.emitted.keys()) {
-        const rel = path.relative(args.staging, fileName).split(path.sep).join('/');
-        if (path.basename(rel) === args.surfaceDeclaration)
-            surfaceKey = fileName;
-        if (rel.endsWith('.d.ts'))
-            treeModules.add(rel.slice(0, -'.d.ts'.length));
-    }
-    for (const rel of args.declarationSources.keys()) {
-        if (rel.endsWith('.d.ts'))
-            treeModules.add(rel.slice(0, -'.d.ts'.length));
-    }
-    // Deno's temporary surface lives in the cache inside the emitted tree.
-    const surfaceDir = surfaceKey ? path.posix.dirname(path.relative(args.staging, surfaceKey).split(path.sep).join('/')) : '.';
-    const moduleInTree = (spec) => {
-        const id = path.posix.normalize(path.posix.join(surfaceDir, spec));
-        if (id.startsWith('..'))
-            return false;
-        return treeModules.has(id) || treeModules.has(`${id}/index`);
+    const surfaceKey = [...args.emitted.keys()].find((fileName) => path.basename(fileName) === args.surfaceDeclaration);
+    const inTree = surfaceModuleInTree({
+        emitted: args.emitted.keys(),
+        declarationSources: args.declarationSources.keys(),
+        staging: args.staging,
+        entryDir: args.entryDir,
+        surfaceDeclaration: args.surfaceDeclaration,
+    });
+    const resolves = new Map();
+    const moduleResolves = (spec) => {
+        let answer = resolves.get(spec);
+        if (answer === undefined) {
+            answer = inTree(spec) || (spec.startsWith('/') && installedPackageSpecifier(spec) !== undefined);
+            resolves.set(spec, answer);
+        }
+        return answer;
     };
     const demoted = new Set();
     const next = args.resolved.map((anchor) => {
         if (anchor.failureReason !== undefined)
             return anchor;
-        const dangling = [...collectSpecifiers(anchor.aliasText)].find((spec) => isRelative(spec) && !moduleInTree(spec));
+        const dangling = [...collectSpecifiers(anchor.aliasText)].find((spec) => isRelative(spec) && !moduleResolves(spec));
         if (dangling === undefined)
             return anchor;
         demoted.add(anchor.request.alias);
@@ -661,6 +672,20 @@ function resolveAnchors(opts, parsed, ctx, deno) {
                     placeholders.set(stmt.name.text, stmt);
             }
         }
+        // A module specifier as the entry resolves it, under the program's own
+        // resolution (the Deno graph's, for a Deno service). Asked once per
+        // specifier: every anchor of a module asks for the same one.
+        const entryMode = entrySource?.impliedNodeFormat;
+        const fromEntry = new Map();
+        const resolveFromEntry = (specifier) => {
+            if (!fromEntry.has(specifier)) {
+                fromEntry.set(specifier, (deno
+                    ? deno.resolve(specifier, ctx.entryPath, options)
+                    : ts.resolveModuleName(specifier, ctx.entryPath, options, ts.sys, undefined, undefined, entryMode)
+                        .resolvedModule)?.resolvedFileName);
+            }
+            return fromEntry.get(specifier);
+        };
         // A literal anchor whose text is a bare identifier resolves through a
         // sibling symbol anchor's module when one names the same symbol.
         const siblingSymbolSpecs = new Map();
@@ -668,16 +693,9 @@ function resolveAnchors(opts, parsed, ctx, deno) {
             if (anchor.kind !== 'symbol')
                 continue;
             if (!siblingSymbolSpecs.has(anchor.symbol_name)) {
-                siblingSymbolSpecs.set(anchor.symbol_name, entryRelativeSpecifier(ctx.entryDir, ctx.repoRoot, anchor.source_file));
+                siblingSymbolSpecs.set(anchor.symbol_name, entryRelativeSpecifier(ctx.entryDir, ctx.repoRoot, anchor.source_file, resolveFromEntry));
             }
         }
-        // A module specifier as the entry resolves it, under the program's own
-        // resolution (the Deno graph's, for a Deno service).
-        const entryMode = entrySource?.impliedNodeFormat;
-        const resolveFromEntry = (specifier) => (deno
-            ? deno.resolve(specifier, ctx.entryPath, options)
-            : ts.resolveModuleName(specifier, ctx.entryPath, options, ts.sys, undefined, undefined, entryMode)
-                .resolvedModule)?.resolvedFileName;
         return opts.anchors.map((request) => resolveAnchor(program, request, {
             repoRoot: ctx.repoRoot,
             entryDir: ctx.entryDir,

package/sidecar/dist/src/capture/installed-package.d.ts

@@ -41,6 +41,8 @@ export interface InstalledPackageSpecifier {
  * deciding whether a runtime name is covered by a pinned types package.
  */
 export declare function typesPackageOf(name: string): string;
+/** A path or specifier without its script, source or declaration extension. */
+export declare function withoutExtension(subpath: string): string;
 /**
  * A compiler host that also resolves the packages an absolute specifier was
  * rewritten into, each from its own install directory. The capture's

package/sidecar/dist/src/capture/installed-package.js

@@ -101,7 +101,8 @@ function existingFile(spec) {
     }
     return undefined;
 }
-function withoutExtension(subpath) {
+/** A path or specifier without its script, source or declaration extension. */
+export function withoutExtension(subpath) {
     return subpath.replace(/(?:\.d)?\.(?:ts|mts|cts|js|mjs|cjs|tsx|jsx)$/, '');
 }
 /** Every string target an exports value names, whatever its conditions. */

package/sidecar/dist/src/capture/outside-root.d.ts

@@ -39,3 +39,22 @@ export declare function placeEmittedTree(args: {
     entryDir: string;
     surfaceDeclaration: string;
 }): PlacedTree;
+/**
+ * A test for whether the tree holds the module a specifier in the surface
+ * entry names (carrick#1773).
+ *
+ * The specifier is read the way the placement above reads one: resolved from
+ * the surface's SOURCE-side directory, so an absolute path stays what it is
+ * and `../` leaves rootDir, then looked up among the source-side paths of the
+ * declarations the tree holds. Those are every emitted declaration, inside
+ * rootDir or placed under `OUTSIDE_DIR`, and the declaration sources shipped
+ * verbatim (`declarationSources`, relative to rootDir).
+ */
+export declare function surfaceModuleInTree(args: {
+    /** tsc's file name for each emitted declaration. */
+    emitted: Iterable<string>;
+    declarationSources: Iterable<string>;
+    staging: string;
+    entryDir: string;
+    surfaceDeclaration: string;
+}): (spec: string) => boolean;

package/sidecar/dist/src/capture/outside-root.js

@@ -15,6 +15,7 @@
  * A capture whose program stays inside rootDir is placed exactly as before.
  */
 import * as path from 'node:path';
+import { withoutExtension } from './installed-package.js';
 import { rewriteSpecifiers } from './specifiers.js';
 /** Tree directory holding declarations of sources outside rootDir. */
 export const OUTSIDE_DIR = '__outside__';
@@ -31,13 +32,12 @@ export function placeEmittedTree(args) {
     const sourceSideOf = new Map();
     const outsideFiles = [];
     for (const fileName of args.emitted.keys()) {
+        sourceSideOf.set(fileName, sourceSidePath(fileName, args.staging, args.entryDir));
         const rel = posix(path.relative(args.staging, fileName));
         if (escapes(rel)) {
             outsideFiles.push(fileName);
-            sourceSideOf.set(fileName, path.resolve(fileName));
             continue;
         }
-        sourceSideOf.set(fileName, path.join(args.entryDir, rel));
         relOf.set(fileName, path.basename(rel) === args.surfaceDeclaration ? 'surface.d.ts' : rel);
     }
     const outside = new Map();
@@ -82,6 +82,43 @@ export function placeEmittedTree(args) {
     }
     return { relOf, textOf, outside, rewrites };
 }
+/**
+ * Where tsc would have written an emitted declaration in the source tree. A
+ * file under the staging dir mirrors rootDir; one outside it arrived at its
+ * source's own path.
+ */
+function sourceSidePath(fileName, staging, entryDir) {
+    const rel = posix(path.relative(staging, fileName));
+    return escapes(rel) ? path.resolve(fileName) : path.join(entryDir, rel);
+}
+/**
+ * A test for whether the tree holds the module a specifier in the surface
+ * entry names (carrick#1773).
+ *
+ * The specifier is read the way the placement above reads one: resolved from
+ * the surface's SOURCE-side directory, so an absolute path stays what it is
+ * and `../` leaves rootDir, then looked up among the source-side paths of the
+ * declarations the tree holds. Those are every emitted declaration, inside
+ * rootDir or placed under `OUTSIDE_DIR`, and the declaration sources shipped
+ * verbatim (`declarationSources`, relative to rootDir).
+ */
+export function surfaceModuleInTree(args) {
+    const held = new Set();
+    let surfaceDir = args.entryDir;
+    for (const fileName of args.emitted) {
+        const sourceSide = sourceSidePath(fileName, args.staging, args.entryDir);
+        if (path.basename(sourceSide) === args.surfaceDeclaration)
+            surfaceDir = path.dirname(sourceSide);
+        held.add(sourceSide.replace(DECLARATION_EXT, ''));
+    }
+    for (const rel of args.declarationSources) {
+        held.add(path.join(args.entryDir, rel).replace(DECLARATION_EXT, ''));
+    }
+    return (spec) => {
+        const target = path.resolve(surfaceDir, withoutExtension(spec));
+        return held.has(target) || held.has(path.join(target, 'index'));
+    };
+}
 function posix(p) {
     return p.split(path.sep).join('/');
 }

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

@@ -32,7 +32,7 @@
 import ts from 'typescript';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { collectSpecifiers, isRelative, packageNameOf } from './specifiers.js';
+import { collectSpecifiers, declarationCandidates, isDeclarationFileName, isRelative, packageNameOf, } from './specifiers.js';
 import { repairDanglingImports } from './repair-dangling.js';
 import { findDisqualifyingTopTypes, findUnresolvedPlaceholders, isErrorPlaceholder, provenanceOf, unemittedModuleProvenance, unresolvedInTreeProvenance, } from './deep-walk.js';
 export function selfCheckStub(args) {
@@ -43,7 +43,7 @@ export function selfCheckStub(args) {
             const p = path.join(dir, entry.name);
             if (entry.isDirectory())
                 walk(p);
-            else if (entry.name.endsWith('.d.ts'))
+            else if (isDeclarationFileName(entry.name))
                 treeFiles.push(p);
         }
     };
@@ -464,15 +464,5 @@ function resolveTreeSpecifier(fromAbs, spec, tree) {
     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 candidate of candidates) {
-        if (tree.has(candidate))
-            return candidate;
-    }
-    return undefined;
+    return declarationCandidates(base).find((candidate) => tree.has(candidate));
 }

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

@@ -4,6 +4,20 @@
  * pattern matching for the post-emit rewrite pass.
  */
 export declare function isRelative(spec: string): boolean;
+/** A declaration file of any module format: `.d.ts`, `.d.mts`, `.d.cts`. */
+export declare function isDeclarationFileName(name: string): boolean;
+/**
+ * The declaration files a relative specifier can name in a stub's tree, in
+ * the order tried, given the path it resolves to from the file that holds it.
+ *
+ * A specifier names its module with no extension (`./a`: `a.d.ts`, or the
+ * directory's `index.d.ts`), by the file the module compiles to (`./a.js`:
+ * `a.d.ts`, `./a.mjs`: `a.d.mts`, `./a.cjs`: `a.d.cts`), or by the
+ * declaration file itself. The surface names an anchor's module the second
+ * way where the first does not resolve (carrick#1911), and so does any source
+ * written for `node16`..`nodenext`.
+ */
+export declare function declarationCandidates(resolved: string): string[];
 /** zod -> zod, @scope/pkg/sub -> @scope/pkg, pkg/sub -> pkg */
 export declare function packageNameOf(spec: string): string;
 /** Extract every module specifier mentioned in a .d.ts text: `from "x"`,

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

@@ -3,9 +3,34 @@
  * declaration text, external/internal classification, and tsconfig-`paths`
  * pattern matching for the post-emit rewrite pass.
  */
+import * as path from 'node:path';
 export function isRelative(spec) {
     return spec.startsWith('./') || spec.startsWith('../') || spec.startsWith('/');
 }
+/** A declaration file of any module format: `.d.ts`, `.d.mts`, `.d.cts`. */
+export function isDeclarationFileName(name) {
+    return /\.d\.[cm]?ts$/.test(name);
+}
+/**
+ * The declaration files a relative specifier can name in a stub's tree, in
+ * the order tried, given the path it resolves to from the file that holds it.
+ *
+ * A specifier names its module with no extension (`./a`: `a.d.ts`, or the
+ * directory's `index.d.ts`), by the file the module compiles to (`./a.js`:
+ * `a.d.ts`, `./a.mjs`: `a.d.mts`, `./a.cjs`: `a.d.cts`), or by the
+ * declaration file itself. The surface names an anchor's module the second
+ * way where the first does not resolve (carrick#1911), and so does any source
+ * written for `node16`..`nodenext`.
+ */
+export function declarationCandidates(resolved) {
+    const output = /\.([cm]?)jsx?$/.exec(resolved);
+    return [
+        `${resolved}.d.ts`,
+        path.join(resolved, 'index.d.ts'),
+        ...(output ? [`${resolved.slice(0, output.index)}.d.${output[1]}ts`] : []),
+        resolved,
+    ];
+}
 /** zod -> zod, @scope/pkg/sub -> @scope/pkg, pkg/sub -> pkg */
 export function packageNameOf(spec) {
     const parts = spec.split('/');

package/sidecar/dist/src/function-line-index.d.ts

@@ -0,0 +1,30 @@
+/**
+ * The function a line names, from an index built once per source file
+ * (carrick#1915).
+ *
+ * A signature request carries only the line its function starts on, and a
+ * signature pass sends one request per unannotated slot: thousands of
+ * lookups, several per function and many per file. Answering each by walking
+ * the file's every node cost the file's size per slot, and was 81% of the
+ * pass on a 2,345-file program. Here the file is walked once, over the
+ * compiler's own nodes, and each lookup reads the few entries near its line.
+ *
+ * The index belongs to the compiler's source file node, not to the file's
+ * name: replacing a file's text gives it a new node, so a file rewritten for
+ * one reading (the unwidened reading, the retype check) and then restored is
+ * indexed again each time, and never answered from positions it no longer has.
+ */
+import { type ArrowFunction, type FunctionDeclaration, type FunctionExpression, type MethodDeclaration, type SourceFile } from 'ts-morph';
+/** The declarations a line can name. */
+export type LineFunction = FunctionDeclaration | ArrowFunction | FunctionExpression | MethodDeclaration;
+/**
+ * The function whose declaration starts at, or within `LINE_TOLERANCE` lines
+ * of, the given line: the closest, then the smallest, then the first in the
+ * file. A function starting after the line is passed over when a statement
+ * that opens on the line or after it, on a line before the function's, does
+ * not contain the function. Undefined when no function is left.
+ *
+ * These are `TypeInferrer.findFunctionByLine`'s rules, which says why each is
+ * there; this is where they are computed.
+ */
+export declare function functionAtLine(sourceFile: SourceFile, line: number): LineFunction | undefined;