lockwire 0.1.31 → 0.1.33

package/dist/moves.js

@@ -0,0 +1,243 @@
+/**
+ * Cross-file moves: a bound symbol that is gone from its file (or whose code there changed) may have
+ * moved, unchanged, to another one. This finds where its code as stamped lives now, so `check` can say
+ * so and `lockwire repoint` can re-point the claim in one step instead of by hand.
+ *
+ * "The same code" means the symbol's normalized body hashes as stamped, so comments, formatting and
+ * local names don't matter, but any change to what it does does. A symbol with no body to compare (an
+ * interface, a type alias) must match on its signature instead. The search reads every source file once
+ * per run, parses only the files that declare the symbol (or its class), and gives up at a deadline rather
+ * than hold a hook up: an unfinished search names no new home, since the one it missed could be another.
+ */
+import { readFile } from "node:fs/promises";
+import { fileAtCommit } from "./changed.js";
+import { langForPath } from "./grammar.js";
+import { fingerprint, fingerprintSet } from "./hash.js";
+import { resolveInsideRepo, walkFilesWithin } from "./repo.js";
+import { dataFormatOf } from "./values.js";
+/**
+ * `body` fingerprints that say nothing about a symbol: none at all (a type, an overload signature) or an
+ * empty block (`{}`). Two functions with the same parameters "match" on these without being related.
+ */
+const NO_BODY = new Set([fingerprint(""), fingerprint("{ }")]);
+export const isTrivialBody = (bodyFingerprint) => bodyFingerprint === "" || NO_BODY.has(bodyFingerprint);
+/** The `deps` of a symbol that calls nothing: likewise no evidence. */
+export const NO_DEPS = fingerprintSet([]);
+/**
+ * A signature's fingerprints with the `export` modifier as written, removed and added: moving a
+ * private helper into a module of its own usually means exporting it, and that is part of the move,
+ * not a change to the contract a claim describes.
+ */
+export function sigFingerprints(sig) {
+    const out = new Set([fingerprint(sig)]);
+    const tail = / \[([^[\]]*)\]$/;
+    const lines = sig.split("\n");
+    if (!lines.every((l) => tail.test(l)))
+        return out;
+    const rewrite = (withExport) => lines
+        .map((l) => l.replace(tail, (_, mods) => {
+        const set = new Set(mods ? mods.split(",") : []);
+        if (withExport)
+            set.add("export");
+        else
+            set.delete("export");
+        return ` [${[...set].sort().join(",")}]`;
+    }))
+        .join("\n");
+    out.add(fingerprint(rewrite(false)));
+    out.add(fingerprint(rewrite(true)));
+    return out;
+}
+/** Files over this size (minified bundles, generated code) are neither indexed nor parsed. */
+const MAX_FILE_CHARS = 2_000_000;
+const PY_DECL = /\b(?:def|class)\s+([A-Za-z_]\w*)/g;
+/**
+ * The ways a TS/JS symbol is declared, for finding the files that might define one: a declaration
+ * keyword, a method or field at the start of a line (modifiers allowed), and `x.name = …` for CommonJS
+ * exports and prototype methods. It only narrows what is parsed, so it errs towards matching too much.
+ */
+const JS_DECL = [
+    /\b(?:function\*?|class|interface|type|enum|namespace|const|let|var)\s+([A-Za-z_$][\w$]*)/g,
+    /^[ \t]*(?:(?:public|private|protected|static|async|readonly|abstract|override|declare|get|set)\s+)*\*?\s*([A-Za-z_$][\w$]*)\s*[(<=:?!]/gm,
+    /\.([A-Za-z_$][\w$]*)\s*=[^=]/g,
+];
+/** The names a source file declares (see {@link JS_DECL}), for the index. */
+function declaredNames(path, content) {
+    const names = new Set();
+    for (const re of langForPath(path) === "python" ? [PY_DECL] : JS_DECL) {
+        re.lastIndex = 0;
+        for (let m = re.exec(content); m; m = re.exec(content))
+            if (m[1])
+                names.add(m[1]);
+    }
+    return names;
+}
+/**
+ * The repository's source files for one run: read once into an index of the names each one declares
+ * (not their text, which in a big repository is more than is worth holding), and parsed on demand,
+ * only the files that declare the name being looked for. A name every file uses (`get`) is declared
+ * in far fewer.
+ */
+export class SourceIndex {
+    repoRoot;
+    config;
+    symbolsOf;
+    deadline;
+    byName = null;
+    complete = true;
+    parsed = new Map();
+    constructor(repoRoot, config, symbolsOf, 
+    /** A `Date.now()` timestamp to stop at. */
+    deadline = Number.POSITIVE_INFINITY) {
+        this.repoRoot = repoRoot;
+        this.config = config;
+        this.symbolsOf = symbolsOf;
+        this.deadline = deadline;
+    }
+    async load() {
+        if (this.byName)
+            return this.byName;
+        const byName = new Map();
+        const walk = walkFilesWithin(this.repoRoot, this.config.exclude, this.deadline, {
+            skipSymlinks: true,
+        });
+        this.complete = walk.complete;
+        for (const rel of walk.files) {
+            if (!langForPath(rel))
+                continue;
+            if (Date.now() > this.deadline) {
+                this.complete = false;
+                break;
+            }
+            const content = await this.read(rel);
+            if (content === null || content.length > MAX_FILE_CHARS)
+                continue;
+            for (const id of declaredNames(rel, content)) {
+                const list = byName.get(id);
+                if (list)
+                    list.push(rel);
+                else
+                    byName.set(id, [rel]);
+            }
+        }
+        this.byName = byName;
+        return byName;
+    }
+    async read(rel) {
+        const abs = resolveInsideRepo(this.repoRoot, rel);
+        if (!abs)
+            return null;
+        try {
+            return await readFile(abs, "utf8");
+        }
+        catch {
+            return null; // unreadable: it can't be where the code went
+        }
+    }
+    async symbolsIn(path, version) {
+        const key = `${version}|${path}`;
+        const hit = this.parsed.get(key);
+        if (hit)
+            return hit;
+        let symbols = null;
+        try {
+            const content = await this.read(path);
+            if (content !== null)
+                symbols = await this.symbolsOf(path, content, version);
+        }
+        catch {
+            // a file that doesn't parse has no symbols to offer
+        }
+        const list = [];
+        for (const [symbol, s] of symbols?.bySymbolPath ?? [])
+            list.push({
+                path,
+                symbol,
+                body: fingerprint(s.bodyNormalized),
+                sigs: sigFingerprints(s.sigTokens),
+            });
+        this.parsed.set(key, list);
+        return list;
+    }
+    /** Whether `s`'s file already held this code, under the same name, at `commit`. */
+    async existedAt(commit, s, stamped, trivialBody, version) {
+        const text = fileAtCommit(this.repoRoot, commit, s.path);
+        if (text === null)
+            return false;
+        try {
+            const before = (await this.symbolsOf(s.path, text, version))?.bySymbolPath.get(s.symbol);
+            if (!before)
+                return false;
+            return trivialBody
+                ? sigFingerprints(before.sigTokens).has(stamped.sig)
+                : fingerprint(before.bodyNormalized) === stamped.body;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Where `anchor`'s symbol, as stamped, lives now outside `anchor.target.path`, or null when nowhere
+     * (or when the search ran out of time before it could be sure).
+     */
+    async findMove(anchor, version, 
+    /** `path#symbol`s other claims are bound to: that code is theirs, not where this claim's went. */
+    taken = new Set()) {
+        const { path, symbol } = anchor.target;
+        if (!symbol || dataFormatOf(path) || !langForPath(path))
+            return null;
+        // A method is found through its class, under the same dotted path (`Client.get` in another file):
+        // a class that moved takes its methods along, while a method of the same name and body in some
+        // other class (`__init__` in hundreds of them) isn't where this one went.
+        const head = symbol.slice(0, symbol.indexOf(".") < 0 ? undefined : symbol.indexOf("."));
+        const stamped = anchor.fingerprints;
+        const trivialBody = isTrivialBody(stamped.body);
+        const python = langForPath(path) === "python";
+        const files = (await this.load()).get(head) ?? [];
+        // An unfinished search can't tell "in one place" from "in one of the places it got to".
+        if (!this.complete)
+            return null;
+        const found = [];
+        for (const file of files) {
+            if (file === path)
+                continue;
+            // Code doesn't move between Python and the TS/JS family: the fingerprints can't agree anyway.
+            if ((langForPath(file) === "python") !== python)
+                continue;
+            if (Date.now() > this.deadline)
+                return null;
+            for (const s of await this.symbolsIn(file, version)) {
+                if (s.symbol !== symbol || taken.has(`${s.path}#${s.symbol}`))
+                    continue;
+                const sigMatches = s.sigs.has(stamped.sig);
+                if (trivialBody ? sigMatches : s.body === stamped.body)
+                    found.push(s);
+            }
+        }
+        // Code that was already in that file when the claim was stamped is a twin that was always there, not
+        // where this claim's code went (two copies of a helper, one of them deleted).
+        const stampedAt = anchor.linked.commit;
+        if (stampedAt && found.length > 0) {
+            const fresh = [];
+            for (const s of found)
+                if (!(await this.existedAt(stampedAt, s, stamped, trivialBody, version)))
+                    fresh.push(s);
+            found.splice(0, found.length, ...fresh);
+        }
+        if (found.length === 0)
+            return null;
+        const candidates = found.map((s) => ({ path: s.path, symbol: s.symbol }));
+        // Several copies of the same code: prefer the one whose signature also matches.
+        let best = found;
+        for (const narrow of [(s) => s.sigs.has(stamped.sig)]) {
+            if (best.length <= 1)
+                break;
+            const fewer = best.filter(narrow);
+            if (fewer.length > 0)
+                best = fewer;
+        }
+        const only = best.length === 1 ? best[0] : undefined;
+        return { ...(only ? { to: { path: only.path, symbol: only.symbol } } : {}), candidates };
+    }
+}
+//# sourceMappingURL=moves.js.map

package/dist/moves.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"moves.js","sourceRoot":"","sources":["../src/moves.ts"],"names":[],"mappings":"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"}

package/dist/reexports.d.ts

@@ -0,0 +1,26 @@
+import type { Node } from "web-tree-sitter";
+import { type LangId } from "./grammar.js";
+export interface ReExport {
+    /** The name this module exposes. */
+    name: string;
+    /** Where it comes from, as written: `./new`, `.core`, `pkg.core`. */
+    from: string;
+    /** Its name in that module; `*` when `name` is the whole module (`export * as ns`, `import * as ns`). */
+    imported: string;
+}
+export interface ReExports {
+    named: ReExport[];
+    /** Modules re-exported whole: `export * from "./x"`, `from .x import *`. */
+    star: string[];
+}
+export declare const NO_REEXPORTS: ReExports;
+export declare function extractReExports(root: Node, lang: LangId): ReExports;
+/**
+ * The repo-relative file `specifier` names when imported from `fromFile`, or null when it isn't a
+ * file in this repository lockwire can read (a package, a path alias, a compiled extension module).
+ * TS/JS: relative specifiers only, with the usual extension and `index` lookups, and `./x.js` for
+ * `x.ts`. Python: relative imports from the file's package, and absolute ones from the repository
+ * root or any directory above the file (`src/`), as a module or a package `__init__.py`.
+ */
+export declare function resolveModule(repoRoot: string, fromFile: string, specifier: string): string | null;
+//# sourceMappingURL=reexports.d.ts.map

package/dist/reexports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reexports.d.ts","sourceRoot":"","sources":["../src/reexports.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAe,MAAM,cAAc,CAAC;AAGxD,MAAM,WAAW,QAAQ;IACvB,oCAAoC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,yGAAyG;IACzG,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,4EAA4E;IAC5E,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,eAAO,MAAM,YAAY,EAAE,SAAmC,CAAC;AAoF/D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,CAEpE;AAaD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI,CAmCf"}

package/dist/reexports.js

@@ -0,0 +1,174 @@
+/**
+ * Names a module makes available without defining them: `export { foo } from "./new"`, `export *`,
+ * `import { foo } from "./new"; export { foo }`, and Python's module-level `from .new import foo`.
+ * A file that keeps a moved symbol's old name this way for compatibility still answers for it, so an
+ * anchor on `old.ts#foo` resolves to where `foo` is really defined (see `resolveTarget`).
+ */
+import { existsSync, statSync } from "node:fs";
+import { posix } from "node:path";
+import { langForPath } from "./grammar.js";
+import { resolveInsideRepo } from "./repo.js";
+export const NO_REEXPORTS = { named: [], star: [] };
+const stringValue = (n) => {
+    if (!n)
+        return null;
+    const frag = n.namedChildren.find((c) => c?.type === "string_fragment");
+    return frag ? frag.text : n.text.replace(/^['"`]|['"`]$/g, "");
+};
+function tsReExports(root) {
+    const out = { named: [], star: [] };
+    // What each imported name is, for `import { foo } from "./x"; export { foo }`.
+    const imports = new Map();
+    for (const imp of root.namedChildren) {
+        if (imp?.type !== "import_statement")
+            continue;
+        const from = stringValue(imp.childForFieldName("source"));
+        const clause = imp.namedChildren.find((c) => c?.type === "import_clause");
+        if (!from || !clause)
+            continue;
+        for (const c of clause.namedChildren) {
+            if (!c)
+                continue;
+            if (c.type === "identifier")
+                imports.set(c.text, { from, imported: "default" });
+            else if (c.type === "namespace_import") {
+                const id = c.namedChildren.find((x) => x?.type === "identifier");
+                if (id)
+                    imports.set(id.text, { from, imported: "*" });
+            }
+            else if (c.type === "named_imports")
+                for (const s of c.namedChildren) {
+                    if (s?.type !== "import_specifier")
+                        continue;
+                    const name = s.childForFieldName("name")?.text;
+                    const alias = s.childForFieldName("alias")?.text;
+                    if (name)
+                        imports.set(alias ?? name, { from, imported: name });
+                }
+        }
+    }
+    for (const exp of root.namedChildren) {
+        if (exp?.type !== "export_statement")
+            continue;
+        const from = stringValue(exp.childForFieldName("source"));
+        const clause = exp.namedChildren.find((c) => c?.type === "export_clause");
+        const ns = exp.namedChildren.find((c) => c?.type === "namespace_export");
+        if (clause) {
+            for (const s of clause.namedChildren) {
+                if (s?.type !== "export_specifier")
+                    continue;
+                const local = s.childForFieldName("name")?.text;
+                const name = s.childForFieldName("alias")?.text ?? local;
+                if (!local || !name)
+                    continue;
+                if (from)
+                    out.named.push({ name, from, imported: local });
+                else {
+                    const imp = imports.get(local);
+                    if (imp)
+                        out.named.push({ name, ...imp });
+                }
+            }
+        }
+        else if (ns && from) {
+            const id = ns.namedChildren.find((c) => c?.type === "identifier");
+            if (id)
+                out.named.push({ name: id.text, from, imported: "*" });
+        }
+        else if (from && exp.children.some((c) => c?.type === "*"))
+            out.star.push(from);
+    }
+    return out;
+}
+/** Module-level only: an import inside a function is that function's business, not the module's. */
+function pyReExports(root) {
+    const out = { named: [], star: [] };
+    for (const imp of root.descendantsOfType("import_from_statement")) {
+        if (!imp)
+            continue;
+        let local = false;
+        for (let p = imp.parent; p; p = p.parent)
+            if (["function_definition", "class_definition", "lambda"].includes(p.type))
+                local = true;
+        if (local)
+            continue;
+        const from = imp.childForFieldName("module_name")?.text;
+        if (!from)
+            continue;
+        if (imp.namedChildren.some((c) => c?.type === "wildcard_import")) {
+            out.star.push(from);
+            continue;
+        }
+        for (const n of imp.childrenForFieldName("name")) {
+            if (!n)
+                continue;
+            if (n.type === "aliased_import") {
+                const name = n.childForFieldName("name")?.text;
+                const alias = n.childForFieldName("alias")?.text;
+                if (name && alias)
+                    out.named.push({ name: alias, from, imported: name });
+            }
+            else
+                out.named.push({ name: n.text, from, imported: n.text });
+        }
+    }
+    return out;
+}
+export function extractReExports(root, lang) {
+    return lang === "python" ? pyReExports(root) : tsReExports(root);
+}
+const isFile = (repoRoot, rel) => {
+    const abs = resolveInsideRepo(repoRoot, rel);
+    try {
+        return abs !== null && existsSync(abs) && statSync(abs).isFile();
+    }
+    catch {
+        return false;
+    }
+};
+const TS_EXTS = [".ts", ".tsx", ".mts", ".cts", ".d.ts", ".js", ".jsx", ".mjs", ".cjs"];
+/**
+ * The repo-relative file `specifier` names when imported from `fromFile`, or null when it isn't a
+ * file in this repository lockwire can read (a package, a path alias, a compiled extension module).
+ * TS/JS: relative specifiers only, with the usual extension and `index` lookups, and `./x.js` for
+ * `x.ts`. Python: relative imports from the file's package, and absolute ones from the repository
+ * root or any directory above the file (`src/`), as a module or a package `__init__.py`.
+ */
+export function resolveModule(repoRoot, fromFile, specifier) {
+    const lang = langForPath(fromFile);
+    if (!lang)
+        return null;
+    const dir = posix.dirname(fromFile);
+    const pick = (paths) => paths.find((p) => !p.startsWith("..") && langForPath(p) && isFile(repoRoot, p)) ?? null;
+    if (lang !== "python") {
+        if (!specifier.startsWith("./") && !specifier.startsWith("../"))
+            return null;
+        const base = posix.normalize(posix.join(dir, specifier));
+        const stem = base.replace(/\.(m|c)?jsx?$/, "");
+        return pick([
+            base,
+            ...(stem !== base ? [`${stem}.ts`, `${stem}.tsx`, `${stem}.mts`, `${stem}.cts`] : []),
+            ...TS_EXTS.map((e) => `${base}${e}`),
+            ...TS_EXTS.map((e) => `${base}/index${e}`),
+        ]);
+    }
+    const dots = /^\.*/.exec(specifier)?.[0].length ?? 0;
+    const parts = specifier.slice(dots).split(".").filter(Boolean);
+    const asModule = (root) => {
+        const p = posix.join(root, ...parts);
+        return parts.length === 0
+            ? [posix.join(root, "__init__.py")]
+            : [`${p}.py`, `${p}.pyi`, posix.join(p, "__init__.py")];
+    };
+    if (dots > 0) {
+        let root = dir;
+        for (let i = 1; i < dots; i++)
+            root = posix.dirname(root);
+        return pick(asModule(root === "." ? "" : root));
+    }
+    const roots = [""];
+    for (let d = dir; d !== "." && d !== "" && d !== "/"; d = posix.dirname(d))
+        roots.splice(1, 0, d);
+    return pick(roots.flatMap(asModule));
+}
+//# sourceMappingURL=reexports.js.map

package/dist/reexports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reexports.js","sourceRoot":"","sources":["../src/reexports.ts"],"names":[],"mappings":"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"}

package/dist/tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,KAAK,EAAU,YAAY,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGpF,MAAM,MAAM,QAAQ;AAClB,2EAA2E;AACzE,cAAc;AAChB,gEAAgE;GAC9D,aAAa;AACf,qFAAqF;GACnF,eAAe;AACjB,gFAAgF;GAC9E,cAAc;AAChB,yEAAyE;GACvE,gBAAgB;AAClB,2CAA2C;GACzC,gBAAgB;AAClB,+EAA+E;GAC7E,UAAU,CAAC;AAEf,MAAM,WAAW,IAAI;IACnB;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,wEAAwE;IACxE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAqGD;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,EAAE,CAAC,CAgCjB;AAgCD,gFAAgF;AAChF,MAAM,WAAW,cAAc;IAC7B,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,2FAA2F;IAC3F,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,wHAAwH;IACxH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,2DAA2D;IAC3D,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,IAAI,CAAC;IACX,8DAA8D;IAC9D,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,0EAA0E;IAC1E,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,GAAG,EAAE,cAAc,CAAC;IACpB,gFAAgF;IAChF,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB;AA8FD,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,WAAW,CAAC,CA+BtB;AAID,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX;;;OAGG;IACH,MAAM,EAAE,UAAU,GAAG,eAAe,GAAG,SAAS,CAAC;IACjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,SAAS,EAAE,IAAI,EAAE,CAAC;CACnB;AAeD;;;;;GAKG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAEzB;AAyJD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,MAAM,CAYxE"}
+{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,KAAK,EAAU,YAAY,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGpF,MAAM,MAAM,QAAQ;AAClB,2EAA2E;AACzE,cAAc;AAChB,gEAAgE;GAC9D,aAAa;AACf,qFAAqF;GACnF,eAAe;AACjB,gFAAgF;GAC9E,cAAc;AAChB,yEAAyE;GACvE,gBAAgB;AAClB,2CAA2C;GACzC,gBAAgB;AAClB,+EAA+E;GAC7E,UAAU,CAAC;AAEf,MAAM,WAAW,IAAI;IACnB;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,wEAAwE;IACxE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AA2HD;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,EAAE,CAAC,CAgCjB;AAgCD,gFAAgF;AAChF,MAAM,WAAW,cAAc;IAC7B,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,2FAA2F;IAC3F,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,wHAAwH;IACxH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,2DAA2D;IAC3D,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,IAAI,CAAC;IACX,8DAA8D;IAC9D,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,0EAA0E;IAC1E,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,GAAG,EAAE,cAAc,CAAC;IACpB,gFAAgF;IAChF,OAAO,EAAE,YAAY,EAAE,CAAC;CACzB;AAqGD,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,WAAW,CAAC,CA+BtB;AAID,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX;;;OAGG;IACH,MAAM,EAAE,UAAU,GAAG,eAAe,GAAG,SAAS,CAAC;IACjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,SAAS,EAAE,IAAI,EAAE,CAAC;CACnB;AAeD;;;;;GAKG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,EACtB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAEzB;AAyJD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,MAAM,CAYxE"}

package/dist/tasks.js

@@ -11,7 +11,7 @@
  */
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
-import { ack, check, linkDoc, markerReader, resolveTargetInText, versionOf } from "./actions.js";
+import { ack, check, linkDoc, markerReader, resolveTarget, resolveTargetInText, versionOf, } from "./actions.js";
 import { commitsTouching, fileAtCommit } from "./changed.js";
 import { describeDrift } from "./format.js";
 import { fingerprint } from "./hash.js";
@@ -59,9 +59,31 @@ const RESOLUTIONS = {
         "Check the sentence is true of its target (lockwire_task_context shows the target), fix it if not, then call lockwire_resolve to start checking it.",
     ],
 };
+/** The usual resolutions, with re-pointing first when the claim's code moved to another file. */
+function resolutionsOf(kind, r) {
+    const to = r.moved?.to;
+    if (to)
+        return [
+            `The code this claim describes moved, unchanged, to ${label(to)}: call lockwire_repoint for this anchor to point the claim and its marker there. If the sentence names the old file, fix that wording too.`,
+            ...RESOLUTIONS[kind],
+        ];
+    if (r.similar)
+        return [
+            `${label(r.similar)} has the same signature as the missing symbol: if it was renamed to it, call lockwire_repoint for this anchor with \`to\` set to ${label(r.similar)}; the claim stays flagged if its code also changed, so you can review it.`,
+            ...RESOLUTIONS[kind],
+        ];
+    if (r.moved)
+        return [
+            `The code this claim describes is now in several places (${r.moved.candidates.map(label).join(", ")}): pick the one the claim is about and call lockwire_repoint with it as \`to\`.`,
+            ...RESOLUTIONS[kind],
+        ];
+    return RESOLUTIONS[kind];
+}
 function summaryOf(kind, r) {
     const target = label(r.anchor.target);
     const what = describeDrift(r);
+    if (r.moved?.to)
+        return `${target} moved to ${label(r.moved.to)}`;
     switch (kind) {
         case "value-wrong":
             return `the claim says ${r.value?.claimed.join(", ") || "something else"} but ${target} is ${r.value?.now}`;
@@ -133,7 +155,7 @@ export async function listTasks(repoRoot, config, paths) {
             claim: marker?.claimExcerpt ?? r.anchor.claim?.excerpt ?? null,
             target: label(r.anchor.target),
             summary: summaryOf(kind, r),
-            resolutions: RESOLUTIONS[kind],
+            resolutions: resolutionsOf(kind, r),
         });
     }
     for (const u of result.unlinked) {
@@ -184,10 +206,16 @@ async function snapshotNow(repoRoot, config, target) {
     if (!existsSync(abs))
         return { source: null, note: `${target.path} does not exist` };
     try {
-        const r = await resolveTargetInText(target, await readFile(abs, "utf8"), config);
-        if (!r.found)
+        // Through re-exports, as `check` resolves it: a name kept at the old path shows the code it stands for.
+        const r = await resolveTarget(repoRoot, target, config);
+        if (!r?.found)
             return { source: null, note: `${label(target)} was not found in ${target.path}` };
-        return cap(r.source ?? "");
+        return {
+            ...cap(r.source ?? ""),
+            ...(r.definedAt
+                ? { note: `defined in ${label(r.definedAt)}, re-exported from ${target.path}` }
+                : {}),
+        };
     }
     catch (err) {
         return { source: null, note: err instanceof Error ? err.message : String(err) };