ucn 5.5.0 → 5.5.2

package/core/rust-macro-expansion.js

@@ -96,6 +96,8 @@ function createState(index, inventory = null) {
         textualMemo: new Map(),
         productive: new Map(),
         hygieneSeq: 0,
+        contexts: new Map(),     // file -> calls-pass context (fix #405)
+        resolved: new Map(),     // invocation -> resolveMacro answer
     };
 }
 
@@ -317,6 +319,13 @@ function lineOffset(state, file, line) {
     return starts[Math.min(Math.max(line - 1, 0), starts.length - 1)];
 }
 
+/** Offset just past `line` (its newline included), or the content's end. */
+function lineEndOffset(state, file, line) {
+    lineOffset(state, file, 1);
+    const starts = state.lineStarts.get(file);
+    return line < starts.length ? starts[line] : (readContent(state, file) || '').length;
+}
+
 function pickLatest(candidates) {
     return candidates.reduce((best, candidate) => (!best || candidate.pos > best.pos ? candidate : best), null);
 }
@@ -327,6 +336,16 @@ function pickLatest(candidates) {
  * in scope).
  */
 function resolveMacro(state, file, offset, line, name, qualifier, dollarCratePackage) {
+    // An invocation's answer is asked again by the pass that expands it
+    // (fix #405: fileMayExpand resolved every invocation first).
+    const key = `${file}\0${offset}\0${line}\0${name}\0${qualifier || ''}\0${dollarCratePackage || ''}`;
+    if (state.resolved.has(key)) return state.resolved.get(key);
+    const result = resolveMacroUncached(state, file, offset, line, name, qualifier, dollarCratePackage);
+    state.resolved.set(key, result);
+    return result;
+}
+
+function resolveMacroUncached(state, file, offset, line, name, qualifier, dollarCratePackage) {
     const all = state.inventory.get(name);
     if (!all || all.length === 0) return null;
     const inPackage = pkgRoot => all.filter(def => packageOf(state, def.file)?.root === pkgRoot);
@@ -801,6 +820,9 @@ function flatten(tokens, out = []) {
 
 const MULTI_PUNCT = ['::', '->', '=>', '==', '!=', '<=', '>=', '&&', '||', '+=', '-=', '*=', '/=',
     '%=', '^=', '&=', '|=', '<<', '>>', '..', '//', '/*', '*/'];
+// The two-character joints that start a multi-character punctuation token
+// (a one-character joint, from an empty leaf, starts any that begins with it).
+const MULTI_PUNCT_JOINTS = new Set(MULTI_PUNCT.flatMap(p => [p.slice(0, 2), p[0]]));
 const SPACE_AFTER = new Set([',', ';', ':', '=>', '->', '=', '+', '|', '&&', '||', '==', '!=']);
 const SPACE_BEFORE = new Set(['=>', '->', '=', '+', '{', '==', '!=', '&&', '||']);
 // ASCII letters, digits, '_', quotes (and '#' at a word's end): a leaf that
@@ -832,10 +854,13 @@ function needsSpace(prev, leaf) {
     if (wordEnd && wordStart) return true;
     const a = prev.v;
     const b = leaf.v;
-    if (b === '.' && /^[0-9]/.test(a)) return true;
+    if (b === '.') {
+        const first = String(a).charCodeAt(0);
+        if (first >= 48 && first <= 57) return true;
+    }
     if (!wordEnd && !wordStart) {
         const joint = a.slice(-1) + b[0];
-        if (MULTI_PUNCT.some(p => p.startsWith(joint)) && !(a === '::' || b === '::')) return true;
+        if (MULTI_PUNCT_JOINTS.has(joint) && !(a === '::' || b === '::')) return true;
     }
     if (a === ':' && b === ':') return true;
     if (SPACE_AFTER.has(a) && a !== '::') return !(a === '|' && prev.closer);
@@ -949,7 +974,8 @@ function buildSynthetic(content, regions, keep) {
         region.synthStart = text.length;
         text += region.layout.text;
         region.synthEnd = text.length;
-        addSpan(region.synthStart, region.synthEnd);
+        // A stand-in for an expansion another group reads keeps its length.
+        if (!region.blank) addSpan(region.synthStart, region.synthEnd);
         cursor = region.end;
     }
     copy(cursor, content.length);
@@ -1205,11 +1231,29 @@ const DECLARATION_TYPES = [
     'field_declaration', 'enum_variant', 'associated_type',
 ];
 
-/** (startLine\0name) keys of declarations whose name was produced inside a region. */
-function generatedDeclarations(root, regions) {
+const DECLARATION_TYPE_SET = new Set(DECLARATION_TYPES);
+let declarationWalkTypes = null;
+function declarationWalkTypesOf() {
+    return declarationWalkTypes || (declarationWalkTypes =
+        [...new Set([...DECLARATION_TYPES, ...require('../languages/rust').DECLARATION_NODE_TYPES])]);
+}
+
+/**
+ * (startLine\0name) keys of declarations whose name was produced inside a
+ * region. `within`: the roots spanning the regions and their walked
+ * descendants, when every such declaration lies inside one (else the whole
+ * tree is searched).
+ */
+function generatedDeclarations(root, regions, within = null) {
     const out = new Map();
     if (regions.length === 0) return out;
-    for (const node of root.descendantsOfType(DECLARATION_TYPES)) {
+    const nodes = within
+        ? within.roots.flatMap((spanning, i) => [
+            ...(DECLARATION_TYPE_SET.has(spanning.type) ? [spanning] : []),
+            ...within.walked[i].filter(node => DECLARATION_TYPE_SET.has(node.type)),
+        ])
+        : root.descendantsOfType(DECLARATION_TYPES);
+    for (const node of nodes) {
         const nameNode = node.type === 'impl_item' ? node.childForFieldName('type')
             : node.childForFieldName('name');
         if (!nameNode) continue;
@@ -1244,24 +1288,13 @@ function macroFact(region, origin) {
 }
 
 /**
- * Expand the project macro invocations of one file. Returns the expansion
- * record, or null when the file invokes no project macro in scope.
+ * The invocations of a file the expansion pass reads, in document order:
+ * project macros in scope that are worth expanding. Invocations without a
+ * context or token tree are recorded blind in `rec`.
  */
-function expandFile(state, filePath, mode = 'symbols') {
-    // Hygiene contexts are numbered per file, so an expansion's renamed
-    // locals do not depend on what else this state expanded before.
-    state.hygieneSeq = 0;
-    const index = state.index;
-    const fileEntry = index.files.get(filePath);
-    const content = readContent(state, filePath);
-    if (!fileEntry || content === null) return null;
-    if (!fileMayExpand(state, filePath)) return { sites: 0, blind: [], used: new Map(), expanded: false };
-    const tree = safeParse(state.parser, content, undefined, PARSE_OPTIONS);
-    const rec = { sites: 0, blind: [], used: new Map(), expanded: false };
-    const regions = [];
-    let lineStarts = null;
-    const invocations = tree.rootNode.descendantsOfType('macro_invocation');
-    for (const node of invocations) {
+function plannedInvocations(state, filePath, content, tree, rec, invocations = null) {
+    const plan = [];
+    for (const node of invocations || tree.rootNode.descendantsOfType('macro_invocation')) {
         const id = invocationName(node);
         if (!id || !state.inventory.has(id.name)) continue;
         let inDefinition = false;
@@ -1279,53 +1312,96 @@ function expandFile(state, filePath, mode = 'symbols') {
             context === 'expr')) continue;
         const tokenTree = node.namedChildren.find(child => child.type === 'token_tree');
         if (info.compiled?.passThroughItems && context === 'items' && itemRecoveryPosition(node)) continue;
-        const blind = reason => rec.blind.push({ line, macro: id.name, reason });
-        if (!context) { blind('context'); continue; }
-        if (!tokenTree) { blind('token-error'); continue; }
-        const site = {
-            file: filePath, offset: node.startIndex, line, budget: MAX_OUTPUT_TOKENS,
-            used: rec.used, nestedBlind: [], ambiguous: resolved.ambiguous,
-        };
-        let tokens;
-        try {
-            if (!lineStarts) {
-                lineOffset(state, filePath, 1);
-                lineStarts = state.lineStarts.get(filePath);
-            }
-            const toks = argTokensOf(tokenTree, content, lineStarts);
-            tokens = resolved.alternatives
-                ? expandAlternatives(state, site, resolved, toks, 0, context)
-                : expandTokens(state, site, def, toks, 0);
-        } catch (error) {
-            if (!(error instanceof MacroBlind)) throw error;
-            blind(error.reason);
-            continue;
-        }
-        for (const nested of site.nestedBlind) rec.blind.push({ line, macro: nested.macro, reason: `nested:${nested.reason}` });
-        renameHygienicLocals(tokens);
-        let body = tokens;
-        if (context === 'expr') body = wrapExpression(tokens);
-        const startLine = line;
-        const endLine = node.endPosition.row + 1;
-        const ancestors = new Set();
-        for (let parent = node.parent; parent; parent = parent.parent) {
-            const nameNode = parent.type === 'impl_item' ? parent.childForFieldName('type')
-                : DECLARATION_TYPES.includes(parent.type) ? parent.childForFieldName('name') : null;
-            if (nameNode) {
-                ancestors.add(`${parent.startPosition.row + 1}\0${parent.type === 'impl_item' ? typeNameOf(nameNode) : nameNode.text}`);
-            }
+        if (!context) { rec.blind.push({ line, macro: id.name, reason: 'context' }); continue; }
+        if (!tokenTree) { rec.blind.push({ line, macro: id.name, reason: 'token-error' }); continue; }
+        plan.push({ node, id, resolved, def, context, tokenTree, line });
+    }
+    return plan;
+}
+
+/** Expand one planned invocation: its region, or null (recorded blind). */
+function expandPlanned(state, filePath, content, item, rec) {
+    const { node, id, resolved, def, context, tokenTree, line } = item;
+    const site = {
+        file: filePath, offset: node.startIndex, line, budget: MAX_OUTPUT_TOKENS,
+        used: rec.used, nestedBlind: [], ambiguous: resolved.ambiguous,
+    };
+    let tokens;
+    try {
+        lineOffset(state, filePath, 1);
+        const toks = argTokensOf(tokenTree, content, state.lineStarts.get(filePath));
+        tokens = resolved.alternatives
+            ? expandAlternatives(state, site, resolved, toks, 0, context)
+            : expandTokens(state, site, def, toks, 0);
+    } catch (error) {
+        if (!(error instanceof MacroBlind)) throw error;
+        rec.blind.push({ line, macro: id.name, reason: error.reason });
+        return null;
+    }
+    for (const nested of site.nestedBlind) rec.blind.push({ line, macro: nested.macro, reason: `nested:${nested.reason}` });
+    renameHygienicLocals(tokens);
+    let body = tokens;
+    if (context === 'expr') body = wrapExpression(tokens);
+    const startLine = line;
+    const endLine = node.endPosition.row + 1;
+    const ancestors = new Set();
+    for (let parent = node.parent; parent; parent = parent.parent) {
+        const nameNode = parent.type === 'impl_item' ? parent.childForFieldName('type')
+            : DECLARATION_TYPES.includes(parent.type) ? parent.childForFieldName('name') : null;
+        if (nameNode) {
+            ancestors.add(`${parent.startPosition.row + 1}\0${parent.type === 'impl_item' ? typeNameOf(nameNode) : nameNode.text}`);
         }
-        regions.push({
-            start: node.startIndex, end: node.endIndex, startLine, endLine,
-            macro: id.name, definition: defKey(def), ambiguous: site.ambiguous, ancestors,
-            node, layout: layout(body, startLine, node.startPosition.column, endLine),
-        });
+    }
+    return {
+        start: node.startIndex, end: node.endIndex, startLine, endLine,
+        macro: id.name, definition: defKey(def), ambiguous: site.ambiguous, ancestors,
+        node, layout: layout(body, startLine, node.startPosition.column, endLine),
+    };
+}
+
+/**
+ * Expand the project macro invocations of one file. Returns the expansion
+ * record, or null when the file invokes no project macro in scope.
+ */
+function expandFile(state, filePath, mode = 'symbols') {
+    // Hygiene contexts are numbered per file, so an expansion's renamed
+    // locals do not depend on what else this state expanded before.
+    state.hygieneSeq = 0;
+    const index = state.index;
+    const fileEntry = index.files.get(filePath);
+    const content = readContent(state, filePath);
+    if (!fileEntry || content === null) return null;
+    if (!fileMayExpand(state, filePath)) return { sites: 0, blind: [], used: new Map(), expanded: false };
+    const tree = safeParse(state.parser, content, undefined, PARSE_OPTIONS);
+    const rec = { sites: 0, blind: [], used: new Map(), expanded: false };
+    const regions = [];
+    // Each expansion's hygiene start and expanded length (fix #405): the
+    // calls pass expands one group of units with the same numbering and
+    // the same offsets as a pass over the whole file.
+    const expansions = mode === 'symbols' ? [] : null;
+    // The symbols pass also needs the file's literals and comments: one
+    // walk lists both (fix #405b).
+    const clean = !tree.rootNode.hasError;
+    const walked = mode === 'symbols' && clean
+        ? tree.rootNode.descendantsOfType(['macro_invocation', ...NON_CODE_TOKENS]) : null;
+    const invocations = walked ? walked.filter(node => node.type === 'macro_invocation') : null;
+    const nonCode = walked ? walked.filter(node => node.type !== 'macro_invocation') : [];
+    for (const item of plannedInvocations(state, filePath, content, tree, rec, invocations)) {
+        const hygiene = state.hygieneSeq;
+        const region = expandPlanned(state, filePath, content, item, rec);
+        if (expansions) expansions.push(item.node.startIndex, hygiene, region ? region.layout.text.length : -1);
+        if (region) regions.push(region);
     }
     rec.sites = regions.length;
     if (regions.length === 0) return rec;
     regions.sort((a, b) => a.start - b.start);
+    // The identifiers each expansion outputs.
+    const outputs = mode === 'symbols' ? regions.map(outputWordsOf) : null;
     // Every word the expanded text of the calls pass can hold (fix #375).
-    const words = mode === 'symbols' ? expansionWords(content, regions) : null;
+    const words = mode === 'symbols' ? expansionWords(content, regions, nonCode, outputs) : null;
+    // What each group of units can bear, read before parsing it (fix #405b).
+    const groups = mode === 'symbols' && !tree.rootNode.hasError
+        ? groupRecords(content, regions, nonCode, outputs) : null;
 
     // Parse the expanded file; an expansion that does not parse in its
     // context stays as written (blind), and the rest are parsed again.
@@ -1356,41 +1432,14 @@ function expandFile(state, filePath, mode = 'symbols') {
     if (regions.length === 0) return rec;
 
     const rust = require('../languages/rust');
-    // The expanded file holds no unexpanded item bodies worth recovering
-    // inside its units; the extractors share the included-ranges tree.
-    rust.primeDeclarationTrees(synthetic, state.parser, synthTree);
     const mapper = offsetMapper(regions);
-
-    // Units are re-derived; everything outside them keeps its parse.
-    // (Sorted and disjoint: binary searches.)
-    const unitAtOffset = offset => {
-        let lo = 0;
-        let hi = units.length - 1;
-        while (lo <= hi) {
-            const mid = (lo + hi) >> 1;
-            if (offset < units[mid].start) hi = mid - 1;
-            else if (offset >= units[mid].end) lo = mid + 1;
-            else return units[mid];
-        }
-        return null;
-    };
-    const byLine = (list, line) => {
-        let lo = 0;
-        let hi = list.length - 1;
-        while (lo <= hi) {
-            const mid = (lo + hi) >> 1;
-            if (line < list[mid].startLine) hi = mid - 1;
-            else if (line > list[mid].endLine) lo = mid + 1;
-            else return list[mid];
-        }
-        return null;
-    };
-    const unitAtLine = line => byLine(units, line);
-    const inUnit = record => (Number.isFinite(record.callStart) ? !!unitAtOffset(record.callStart)
-        : !!unitAtLine(record.line));
+    const lookups = unitLookups(units);
     rec.expanded = true;
 
     if (mode === 'symbols') {
+        // The expanded file holds no unexpanded item bodies worth recovering
+        // inside its units; the extractors share the included-ranges tree.
+        rust.primeDeclarationTrees(synthetic, state.parser, synthTree);
         // Declarations of the regions only: the smallest nodes spanning each.
         const spanning = regions.map(region => (region.synthEnd > region.synthStart
             ? synthTree.rootNode.descendantForIndex(region.synthStart, region.synthEnd - 1) : null))
@@ -1401,44 +1450,195 @@ function expandFile(state, filePath, mode = 'symbols') {
             if (last && node.startIndex >= last.startIndex && node.endIndex <= last.endIndex) continue;
             roots.push(node);
         }
-        rec.symbols = generatedSymbols(filePath, rust.parseDeclarationsIn(synthetic, roots), {
-            regions, mapper, generated: generatedDeclarations(synthTree.rootNode, regions),
+        // One walk of each root serves both extractions (fix #405b). In a
+        // file that parses cleanly an expansion stands as whole items,
+        // statements or a wrapped expression, so a declaration named inside
+        // it lies inside the root spanning it; otherwise the whole tree is
+        // searched.
+        const walked = roots.map(root => root.descendantsOfType(declarationWalkTypesOf()));
+        rec.symbols = generatedSymbols(filePath, rust.parseDeclarationsIn(synthetic, roots, {
+            descendants: (root, i) => walked[i],
+        }), {
+            regions, mapper, generated: generatedDeclarations(synthTree.rootNode, regions,
+                tree.rootNode.hasError ? null : { roots, walked }),
         });
         rec.calleeNames = callableNames(regions);
+        rec.expansions = expansions;
+        // Groups as the calls pass reads them apart: only when no expansion
+        // was left blind by a parse error (the pass then reads the file in
+        // one pass, whose groups can differ).
         rec.words = words;
+        if (groups && !rec.blind.some(site => site.reason === 'parse-error')) rec.groups = groups;
         rec.callsPending = true;
         return rec;
     }
 
     // Calls: records of the units from the expanded file, the rest as parsed,
-    // plus the invocations themselves.
+    // plus the invocations themselves (a derivation context, fix #405).
+    rec.context = callsContext(state, filePath, {
+        content, tree, regions, units, synthetic, synthTree, mapper, lookups,
+    });
+    return rec;
+}
+
+/** Binary-search lookups over sorted, disjoint units. */
+function unitLookups(units) {
+    const unitAtOffset = offset => {
+        let lo = 0;
+        let hi = units.length - 1;
+        while (lo <= hi) {
+            const mid = (lo + hi) >> 1;
+            if (offset < units[mid].start) hi = mid - 1;
+            else if (offset >= units[mid].end) lo = mid + 1;
+            else return units[mid];
+        }
+        return null;
+    };
+    const unitAtLine = line => byLine(units, line);
+    const inUnit = record => (Number.isFinite(record.callStart) ? !!unitAtOffset(record.callStart)
+        : !!unitAtLine(record.line));
+    return { unitAtOffset, unitAtLine, inUnit };
+}
+
+function byLine(list, line) {
+    let lo = 0;
+    let hi = list.length - 1;
+    while (lo <= hi) {
+        const mid = (lo + hi) >> 1;
+        if (line < list[mid].startLine) hi = mid - 1;
+        else if (line > list[mid].endLine) lo = mid + 1;
+        else return list[mid];
+    }
+    return null;
+}
+
+// ── Calls pass (fix #405) ─────────────────────────────────────────────────
+//
+// The calls of an expanded file are the parsed records outside its units,
+// the records each unit yields in the expanded file, and the invocations
+// themselves. Units sharing a line form one group (records without a span
+// are placed by line). The extractor keeps no scope across functions, so a
+// group's records do not depend on the other groups: a query that needs
+// the records bearing one name, or those of a line range, reads only the
+// groups that can hold them, and the file's calls are composed, as one pass
+// derives them, when a consumer needs them all. Where the build recorded
+// every expansion's hygiene start and expanded length, a group expands and
+// parses alone with the numbering and the offsets of the whole file;
+// otherwise the file's expansions parse in one pass and each group's
+// records are read from that tree with the other units skipped.
+
+/**
+ * Everything the calls pass of a file shares: its regions, units and their
+ * groups, the expanded file and its tree. Per-group records are added as
+ * groups are read.
+ */
+function callsContext(state, filePath, parts) {
+    const { content, tree, regions, units, synthetic, synthTree, mapper, lookups } = parts;
+    const index = state.index;
+    // Units sharing a line form one group.
+    const groups = groupsOf(units);
+    // Unit spans in the expanded file: a unit starts and ends outside every
+    // region, shifted by the regions before it.
+    const toSynth = offset => {
+        let lo = 0;
+        let hi = regions.length - 1;
+        let before = null;
+        while (lo <= hi) {
+            const mid = (lo + hi) >> 1;
+            if (regions[mid].end <= offset) { before = regions[mid]; lo = mid + 1; } else hi = mid - 1;
+        }
+        return offset + (before ? before.deltaAfter : 0);
+    };
+    for (const unit of units) {
+        unit.synthStart = toSynth(unit.start);
+        unit.synthEnd = toSynth(unit.end);
+    }
     const cached = index.callsCache.get(filePath);
     const original = cached?.calls || [];
-    const invocationStarts = new Set(regions.map(region => region.start));
-    const calls = original.filter(record => !inUnit(record));
-    const seen = new Set();
     // Records without a source span (struct-literal constructors) are placed
     // by line: one the unexpanded parse also has on that line is ordinary
     // code, any other one on an invocation's lines was generated.
-    const spanless = record => `${record.name}\0${record.line}\0${record.isConstructor ? 1 : 0}`;
     const originalSpanless = new Map();
     for (const record of original) {
-        if (Number.isFinite(record.callStart) || !unitAtLine(record.line)) continue;
-        const key = spanless(record);
+        if (Number.isFinite(record.callStart) || !lookups.unitAtLine(record.line)) continue;
+        const key = spanlessKey(record);
         originalSpanless.set(key, (originalSpanless.get(key) || 0) + 1);
     }
+    const rust = require('../languages/rust');
+    return {
+        filePath, content, tree, regions, units, groups, synthetic, synthTree, mapper, lookups,
+        original, originalSpanless, seen: new Set(),
+        itemRecovery: rust.rustExpandedItemRecovery(synthetic, state.parser, synthTree),
+        // An expanded file whose parse holds an error is read in one pass.
+        groupwise: !synthTree.rootNode.hasError,
+        invocations: new Map(),
+        parser: state.parser,
+        live: true,
+    };
+}
+
+function spanlessKey(record) {
+    return `${record.name}\0${record.line}\0${record.isConstructor ? 1 : 0}`;
+}
+
+/** Read the records of the groups `wanted` (indices) not read yet. */
+function readGroups(ctx, wanted) {
+    let targets = wanted.filter(i => ctx.groups[i].records === null);
+    if (targets.length === 0) return;
+    if (ctx.isolated) {
+        readIsolatedGroups(ctx, targets);
+        ctx.readLookups = null;
+        return;
+    }
+    if (!ctx.groupwise) targets = ctx.groups.map((group, i) => i).filter(i => ctx.groups[i].records === null);
+    const target = new Set(targets);
+    const all = target.size === ctx.groups.filter(group => group.records === null).length &&
+        ctx.groups.every(group => group.records === null);
+    const units = ctx.units;
+    // Nodes inside a unit of another group are not read.
+    const skip = all ? null : node => {
+        const start = node.startIndex;
+        let lo = 0;
+        let hi = units.length - 1;
+        while (lo <= hi) {
+            const mid = (lo + hi) >> 1;
+            const unit = units[mid];
+            if (start < unit.synthStart) hi = mid - 1;
+            else if (start >= unit.synthEnd) lo = mid + 1;
+            else return node.endIndex <= unit.synthEnd && !target.has(unit.group);
+        }
+        return false;
+    };
+    for (const i of targets) ctx.groups[i].records = [];
+    const rust = require('../languages/rust');
+    const synthCalls = rust.findCallsInCode(ctx.synthetic, ctx.parser, {
+        tree: ctx.synthTree, itemRecovery: ctx.itemRecovery, skip,
+    });
+    mergeRecords(ctx, synthCalls, {
+        mapper: ctx.mapper, lookups: ctx.lookups, regions: ctx.regions, synthTree: ctx.synthTree,
+        originalSpanless: ctx.originalSpanless,
+        accept: unit => target.has(unit.group), push: (unit, call) => ctx.groups[unit.group].records.push(call),
+    });
+}
+
+/**
+ * The records an expanded file's parse yields for the accepted units, with
+ * source offsets, expansion facts, and repeats dropped (`ctx.seen`).
+ */
+function mergeRecords(ctx, synthCalls, { mapper, lookups, regions, synthTree, originalSpanless, accept, push }) {
     const regionOnLine = line => byLine(regions, line);
-    const synthCalls = rust.findCallsInCode(synthetic, state.parser);
     for (const record of synthCalls) {
         const synthStart = record.callStart;
+        let unit;
         if (Number.isFinite(synthStart)) {
             const mapped = mapper.map(synthStart, false);
-            if (!unitAtOffset(Math.floor(mapped))) continue;
-        } else if (!unitAtLine(record.line)) continue;
+            unit = lookups.unitAtOffset(Math.floor(mapped));
+        } else unit = lookups.unitAtLine(record.line);
+        if (!unit || !accept(unit)) continue;
         const call = { ...record };
         let region = Number.isFinite(synthStart) ? mapper.regionAt(synthStart) : null;
         if (!Number.isFinite(synthStart) && regionOnLine(record.line)) {
-            const key = spanless(record);
+            const key = spanlessKey(record);
             const left = originalSpanless.get(key) || 0;
             if (left > 0) originalSpanless.set(key, left - 1);
             else region = regionOnLine(record.line);
@@ -1463,24 +1663,84 @@ function expandFile(state, filePath, mode = 'symbols') {
                 : `t\0${call.name}\0${call.line}\0${call.isMethod ? 1 : 0}\0${call.receiver || ''}\0` +
                     `${call.receiverType || ''}\0${call.receiverRootType || ''}\0${call.receiverField || ''}\0` +
                     `${call.enclosingFunction?.name || ''}\0${call.argCount ?? ''}`;
-            if (seen.has(key)) continue;
-            seen.add(key);
+            if (ctx.seen.has(key)) continue;
+            ctx.seen.add(key);
         }
-        calls.push(call);
+        push(unit, call);
     }
-    // The invocation stays a call of the macro; the value it produces is
-    // the expansion's, so its own value-flow facts are dropped.
-    for (const record of original) {
-        if (!record.isMacro || !invocationStarts.has(record.callStart)) continue;
-        calls.push({
-            name: record.name, line: record.line, callStart: record.callStart, callEnd: record.callEnd,
-            isMethod: false, isMacro: true,
-            ...(record.receiver && { receiver: record.receiver, isPathMacro: true }),
-            ...(record.macroExpr && { macroExpr: true }),
-            enclosingFunction: record.enclosingFunction,
-            macroExpanded: true,
-        });
+}
+
+/**
+ * The invocations stay calls of their macros; the value one produces is the
+ * expansion's, so its own value-flow facts are dropped. Built once per
+ * context (the same records in every view and in the composed calls).
+ */
+function invocationRecords(ctx) {
+    // Expanded invocations: every region (one pass), the regions of the
+    // groups read so far (groups read apart).
+    const starts = new Set();
+    if (ctx.isolated) {
+        for (const group of ctx.groups) for (const start of group.starts || []) starts.add(start);
+    } else {
+        for (const region of ctx.regions) starts.add(region.start);
     }
+    const out = [];
+    for (const record of ctx.original) {
+        if (!record.isMacro || !starts.has(record.callStart)) continue;
+        let invocation = ctx.invocations.get(record);
+        if (!invocation) {
+            invocation = {
+                name: record.name, line: record.line, callStart: record.callStart, callEnd: record.callEnd,
+                isMethod: false, isMacro: true,
+                ...(record.receiver && { receiver: record.receiver, isPathMacro: true }),
+                ...(record.macroExpr && { macroExpr: true }),
+                enclosingFunction: record.enclosingFunction,
+                macroExpanded: true,
+            };
+            ctx.invocations.set(record, invocation);
+        }
+        out.push(invocation);
+    }
+    return out;
+}
+
+/** Whether a parsed record lies in a unit of a group read so far (all units, one pass). */
+function inReadUnit(ctx, record) {
+    if (!ctx.isolated) return ctx.lookups.inUnit(record);
+    if (!ctx.readLookups) {
+        const units = [];
+        for (const group of ctx.groups) if (group.units) units.push(...group.units);
+        units.sort((a, b) => a.start - b.start);
+        ctx.readLookups = unitLookups(units);
+    }
+    return ctx.readLookups.inUnit(record);
+}
+
+/**
+ * The calls of the file: parsed records outside the units, each group's
+ * records, the invocations; stable by line. Installed in the calls cache
+ * with the facts the file entry derives from them.
+ */
+function composeCalls(index, ctx) {
+    const calls = composedCalls(ctx);
+    installComposedCalls(index, ctx.filePath, calls, ctx.original);
+    return calls;
+}
+
+/** The calls a derivation context composes, stable by line (not installed). */
+function composedCalls(ctx) {
+    readGroups(ctx, ctx.groups.map((group, i) => i));
+    const calls = ctx.original.filter(record => !inReadUnit(ctx, record));
+    for (const group of ctx.groups) for (const record of group.records) calls.push(record);
+    for (const record of invocationRecords(ctx)) calls.push(record);
+    // Stable by line: records keep document order within a line.
+    calls.sort((a, b) => a.line - b.line);
+    return calls;
+}
+
+/** Install a file's composed calls in the calls cache, with the facts the file entry derives from them. */
+function installComposedCalls(index, filePath, calls, original) {
+    const fileEntry = index.files.get(filePath);
     // Shapes of generated calls whose value may be lost (audit-async).
     const { openCallShape } = require('../languages/rust-value-flow');
     const shapes = calls.filter(call => call.macroExpansion && call.name && !call.inMacro && !call.valueConsumed)
@@ -1488,8 +1748,7 @@ function expandFile(state, filePath, mode = 'symbols') {
     if (shapes.length > 0) {
         fileEntry.openCalls = [...new Set([...(fileEntry.openCalls || []), ...shapes])].sort(codeUnitCompare);
     }
-    // Stable by line: records keep document order within a line.
-    calls.sort((a, b) => a.line - b.line);
+    const cached = index.callsCache.get(filePath);
     if (cached) {
         if (index.calleeIndex) index._removeFromCalleeIndex(filePath, original);
         cached.calls = calls;
@@ -1498,8 +1757,6 @@ function expandFile(state, filePath, mode = 'symbols') {
         index.callsCache.set(filePath, { mtime: fileEntry.mtime, hash: fileEntry.hash, calls });
     }
     index.callsCacheDirty = true;
-    rec.expanded = true;
-    return rec;
 }
 
 const CALL_NODES = new Set(['call_expression', 'macro_invocation', 'struct_expression', 'generic_function']);
@@ -1621,11 +1878,12 @@ function callableNames(regions) {
     for (const region of regions) {
         const marks = region.layout.marks;
         for (let i = 0; i < marks.length - 1; i++) {
+            const next = marks[i + 1].leaf.v;
+            if (!(next === '(' || next === '!' || next === '{' ||
+                (next === '::' && marks[i + 2]?.leaf.v === '<'))) continue;
             const leaf = marks[i].leaf;
             if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(leaf.v) || RUST_KEYWORDS.has(leaf.v)) continue;
-            const next = marks[i + 1].leaf.v;
-            if (next === '(' || next === '!' || next === '{' ||
-                (next === '::' && marks[i + 2]?.leaf.v === '<')) names.add(leaf.v);
+            names.add(leaf.v);
         }
     }
     return [...names].sort(codeUnitCompare);
@@ -1634,27 +1892,117 @@ function callableNames(regions) {
 const WORD = /[\p{L}\p{N}_]+/gu;
 const WHOLE_WORD = /^[\p{L}\p{N}_]+$/u;
 
+// Tokens whose text is never an identifier: literals and comments.
+const NON_CODE_TOKENS = ['string_literal', 'raw_string_literal', 'char_literal', 'line_comment', 'block_comment'];
+
 /**
  * The words (identifier-like runs) of the text the calls pass analyzes for
  * these regions: the kept source around them (units and their headers) and
  * every expansion's tokens. A call record derived from that text can bear no
  * other name, so a file whose calls are not derived yet needs deriving only
- * for a name among them (fix #375). Space-separated, sorted.
+ * for a name among them (fix #375). A record's name and written receiver are
+ * identifier tokens, so the text of literals and comments is left out (fix
+ * #405: `"--count"` and `// the count` made a `count` query derive four
+ * test files); kept ranges are whole items and headers, which the calls
+ * pass lexes as the file's own parse did. A file with parse errors is read
+ * whole. Space-separated, sorted.
  */
-function expansionWords(content, regions) {
+function expansionWords(content, regions, nonCode = [], outputs = regions.map(outputWordsOf)) {
     const words = new Set();
-    for (const [start, end] of analysisUnits(regions, 'calls').keep) {
+    scanCodeWords(content, analysisUnits(regions, 'calls').keep, nonCode, words);
+    for (const output of outputs) for (const word of output) words.add(word);
+    return [...words].sort(codeUnitCompare).join(' ');
+}
+
+/** Words of `ranges` (sorted, disjoint) of the source, literals and comments (`nonCode`, sorted) left out. */
+function scanCodeWords(content, ranges, nonCode, words) {
+    const scan = (start, end) => {
+        if (end <= start) return;
         for (const word of content.slice(start, end).match(WORD) || []) words.add(word);
-    }
-    // A record's name is an identifier token (string contents never are;
-    // a non-ASCII identifier is a 'punct' leaf).
-    for (const region of regions) {
-        for (const mark of region.layout.marks) {
-            const leaf = mark.leaf;
-            if (leaf.k === 'ident' || (leaf.k === 'punct' && WHOLE_WORD.test(leaf.v))) words.add(leaf.v);
+    };
+    let next = 0;
+    for (const [start, end] of ranges) {
+        let at = start;
+        while (next < nonCode.length && nonCode[next].endIndex <= at) next++;
+        for (let i = next; i < nonCode.length; i++) {
+            const token = nonCode[i];
+            if (token.startIndex >= end) break;
+            scan(at, Math.min(token.startIndex, end));
+            at = Math.max(at, token.endIndex);
         }
+        scan(at, end);
     }
-    return [...words].sort(codeUnitCompare).join(' ');
+}
+
+/** The identifier tokens an expansion outputs (a non-ASCII identifier is a 'punct' leaf), once each. */
+function outputWordsOf(region) {
+    const words = new Set();
+    for (const mark of region.layout.marks) {
+        const leaf = mark.leaf;
+        if (leaf.k === 'ident' || (leaf.k === 'punct' && WHOLE_WORD.test(leaf.v))) words.add(leaf.v);
+    }
+    return [...words];
+}
+
+/**
+ * The groups of units the calls pass reads apart (fix #405b), each as
+ * [startLine, endLine, expanded length, words]: the identifiers its
+ * expansions output (with those of any expansion in its kept headers) and
+ * the code of its kept headers outside its units (`Self { .. }` names the
+ * impl's type). A record a group derives in the units' own code is written
+ * there, as the file's parsed record on that line is: the calls pass
+ * consults those for the rest (rustPendingRecords). Expanded length: the
+ * text the group's own expansions add, for the cost of reading it.
+ */
+function groupRecords(content, regions, nonCode, outputs) {
+    const { units } = analysisUnits(regions, 'calls');
+    const groups = groupsOf(units);
+    const lookups = unitLookups(units);
+    const members = groups.map(() => []);
+    const groupOf = regions.map((region, i) => {
+        const group = lookups.unitAtOffset(region.start).group;
+        members[group].push(i);
+        return group;
+    });
+    // Expansions are disjoint and sorted: the first one ending after `at`.
+    const firstEndingAfter = at => {
+        let lo = 0;
+        let hi = regions.length;
+        while (lo < hi) {
+            const mid = (lo + hi) >> 1;
+            if (regions[mid].end <= at) lo = mid + 1; else hi = mid;
+        }
+        return lo;
+    };
+    return groups.map((group, gi) => {
+        const keep = analysisUnits(members[gi].map(i => regions[i]), 'calls').keep;
+        const words = new Set();
+        let length = 0;
+        for (const i of members[gi]) {
+            length += regions[i].layout.text.length;
+            for (const word of outputs[i]) words.add(word);
+        }
+        // Expansions inside its kept headers (`impl T for m!() {..}`).
+        for (const [start, end] of keep) {
+            for (let i = firstEndingAfter(start); i < regions.length && regions[i].start < end; i++) {
+                if (groupOf[i] !== gi) for (const word of outputs[i]) words.add(word);
+            }
+        }
+        // Header code: the kept ranges outside the group's units.
+        const headers = [];
+        for (const [start, end] of keep) {
+            let at = start;
+            for (const unit of group.units) {
+                if (unit.end <= at || unit.start >= end) continue;
+                if (unit.start > at) headers.push([at, unit.start]);
+                at = Math.max(at, unit.end);
+            }
+            if (at < end) headers.push([at, end]);
+        }
+        scanCodeWords(content, headers, nonCode, words);
+        // Insertion order is the expansions' and the text's: deterministic.
+        return [group.startLine, group.endLine, length, [...words].join(' ')];
+    });
 }
 
 /** Whether the derived calls of a file pending derivation can bear `name`. */
@@ -1665,8 +2013,56 @@ function rustPendingMayBear(fileEntry, name) {
     if (typeof rec.words !== 'string') return true;
     let words = pendingWordSets.get(rec);
     if (!words) pendingWordSets.set(rec, words = new Set(rec.words.split(' ')));
-    // A raw identifier's token is `r#name`; source text holds both parts.
-    return words.has(name) || words.has(String(name).replace(/^r#/, '')) || words.has(`r#${name}`);
+    return hasWord(words, name);
+}
+
+/**
+ * Whether a recorded group's word list (space-separated) holds `name`, as
+ * hasWord does for a set (fix #405b: one name is asked per group, so the
+ * list is searched rather than split).
+ */
+function groupHasWord(list, name) {
+    const text = String(name);
+    const bare = text.replace(/^r#/, '');
+    return listHasWord(list, text) || (bare !== text && listHasWord(list, bare)) || listHasWord(list, `r#${text}`);
+}
+
+function listHasWord(list, word) {
+    if (!word) return false;
+    for (let at = list.indexOf(word); at >= 0; at = list.indexOf(word, at + 1)) {
+        const end = at + word.length;
+        if ((at === 0 || list.charCodeAt(at - 1) === 32) && (end === list.length || list.charCodeAt(end) === 32)) return true;
+    }
+    return false;
+}
+
+const pendingFileLists = new WeakMap(); // operation content cache -> pending file paths
+
+/**
+ * Files whose macro expansions' calls are not derived yet and whose
+ * expanded text can hold one of `names` (fix #405). The callee index lists
+ * such a file under its parsed records' names and its expansions'
+ * callee-position names, but a derived record can bear any word of the
+ * expanded text (`self.view` passed as a value, `Self { .. }` named by its
+ * impl): a query visits these files too, so the files it reads do not
+ * depend on which files earlier queries derived.
+ */
+function rustPendingFilesBearing(index, names) {
+    const scope = index._opContentCache;
+    let files = scope ? pendingFileLists.get(scope) : undefined;
+    if (!files) {
+        files = [];
+        for (const [filePath, fileEntry] of index.files) {
+            if (fileEntry.rustMacroExpansion?.callsPending) files.push(filePath);
+        }
+        if (scope) pendingFileLists.set(scope, files);
+    }
+    const bearing = [];
+    for (const filePath of files) {
+        const fileEntry = index.files.get(filePath);
+        if (names.some(name => rustPendingMayBear(fileEntry, name))) bearing.push(filePath);
+    }
+    return bearing;
 }
 
 function tokenText(tokens) {
@@ -1771,11 +2167,62 @@ function startRustMacroExpansion(index, pending, options = {}) {
     const files = invokingFiles(index, pending, inventory, names);
     let bytes = 0;
     for (const file of files) bytes += index.files.get(file)?.size || 0;
-    const run = files.length >= PARALLEL_MIN_FILES && bytes >= PARALLEL_MIN_BYTES
-        ? startWorkers(index, files, { ...options, inventory }) : null;
+    // A sequential build has no parse workers to keep (fix #422): when the
+    // planned expansion is large - a crate whose API macros generate most of
+    // its code has little source to parse - fresh workers expand it.
+    let pool = options.pool?.available.length > 0 ? options.pool : null;
+    let ownPool = null;
+    if (!pool && freshExpansionWorthwhile(index, files, inventory)) {
+        ownPool = require('./parallel-build').spawnExpansionPool(index,
+            freshWorkerCount(index, Math.ceil(files.length / FRESH_FILES_PER_WORKER), files.length));
+        pool = ownPool;
+    }
+    const run = files.length >= PARALLEL_MIN_FILES && (bytes >= PARALLEL_MIN_BYTES || ownPool)
+        ? startWorkers(index, files, { ...options, pool, inventory }) : null;
+    if (ownPool) {
+        if (run) {
+            const dispose = run.dispose;
+            run.dispose = () => { dispose(); ownPool.dispose(); };
+        } else {
+            ownPool.dispose();
+        }
+    }
     return { inventory, files, names, results: run };
 }
 
+// Fresh expansion workers start cold (module load, parser warm-up): they
+// pay for themselves from this much planned expansion.
+const FRESH_MIN_SITES = 48;
+const FRESH_MIN_FILES = 12;
+const FRESH_FILES_PER_WORKER = 6;
+
+/**
+ * How many fresh threads to start for `wanted` workers' worth of work over
+ * `files` files: 2 to EXPANSION_WORKERS, never more than an explicit build
+ * worker count (a request for that execution shape) and none when the build
+ * disabled workers; 0 when fewer than two would run.
+ */
+function freshWorkerCount(index, wanted, files) {
+    const limit = index.lastBuildWorkerLimit ?? EXPANSION_WORKERS;
+    const count = Math.min(EXPANSION_WORKERS, limit, files, Math.max(2, wanted));
+    return count >= 2 ? count : 0;
+}
+
+/** Is the planned expansion of a build without kept parse workers worth fresh workers? */
+function freshExpansionWorthwhile(index, files, inventory) {
+    const env = process.env.UCN_FRESH_EXPANSION;
+    if (env === '0' || freshWorkerCount(index, 2, files.length) === 0) return false;
+    if (env === '1') return true;
+    if (files.length < FRESH_MIN_FILES) return false;
+    let sites = 0;
+    for (const file of files) {
+        for (const call of index.callsCache.get(file)?.calls || []) {
+            if (call.isMacro && inventory.has(call.name)) sites++;
+        }
+    }
+    return sites >= FRESH_MIN_SITES;
+}
+
 /**
  * Build-time pass, phase 2b (after the import graph resolved `mod`
  * declarations): apply the expansions of the planned files, expanding in
@@ -1824,7 +2271,10 @@ function applyRustMacroExpansion(index, pending, options = {}, started = undefin
             ...(rec.blind.length > 0 && { blind: rec.blind.sort((a, b) => a.line - b.line ||
                 codeUnitCompare(a.macro, b.macro) || codeUnitCompare(a.reason, b.reason)) }),
             ...(rec.expanded && { expanded: true }),
-            ...(rec.callsPending && { callsPending: true, calleeNames: rec.calleeNames || [], words: rec.words }),
+            ...(rec.callsPending && {
+                callsPending: true, calleeNames: rec.calleeNames || [], words: rec.words, expansions: rec.expansions,
+                ...(rec.groups && { groups: rec.groups }),
+            }),
         };
     }
     return touched || false;
@@ -1847,7 +2297,7 @@ const EXPANSION_WORKERS = 3;
  * to expand their import facts, impl/trait spans and macro invocation
  * records. Also every name a project callable bears.
  */
-function workerSnapshot(index, workload, inventory) {
+function workerSnapshot(index, workload, inventory, fullCalls = false) {
     const expanding = new Set(workload);
     // Invocations resolve at the invoking file, and nested ones also at the
     // defining file.
@@ -1878,7 +2328,10 @@ function workerSnapshot(index, workload, inventory) {
             record.importBindings = (entry.importBindings || [])
                 .filter(binding => inventory.has(binding.alias || binding.name));
         }
-        if (full) {
+        if (full && fullCalls) {
+            // A calls derivation reads every parsed record of the file.
+            record.calls = index.callsCache.get(file)?.calls || [];
+        } else if (full) {
             record.calls = (index.callsCache.get(file)?.calls || [])
                 .filter(call => call.isMacro && !call.macroExpansion && inventory.has(call.name))
                 .map(call => ({
@@ -1949,7 +2402,7 @@ function snapshotIndex(snapshot) {
  * `signal[queueIndex]`), posting each record to `port`; `signal[workerIndex]`
  * is set when this worker is done.
  */
-function runExpansionQueue({ snapshot, files, signal, workerIndex, queueIndex }, port) {
+async function runExpansionQueue({ snapshot, files, signal, workerIndex, queueIndex, mode }, port) {
     const signalArray = new Int32Array(signal);
     try {
         const state = createState(snapshotIndex(JSON.parse(Buffer.from(snapshot).toString('utf8'))));
@@ -1959,11 +2412,15 @@ function runExpansionQueue({ snapshot, files, signal, workerIndex, queueIndex },
             const file = files[next];
             let result;
             try {
-                result = { file, record: expandForWorker(state, file) };
+                result = { file, record: mode === 'calls' ? deriveForWorker(state, file) : expandForWorker(state, file) };
             } catch (error) {
                 result = { file, error: error.message };
             }
             port.postMessage([result]);
+            // Yield between files, as the parse loop does (fix #365): the
+            // native trees of an expansion are freed only when this thread
+            // returns to its event loop (fix #422).
+            await new Promise(resolve => setImmediate(resolve));
         }
     } finally {
         Atomics.store(signalArray, workerIndex, 1);
@@ -1971,6 +2428,12 @@ function runExpansionQueue({ snapshot, files, signal, workerIndex, queueIndex },
     }
 }
 
+/** Worker-side: the whole-file calls derivation of one file (fix #422). */
+function deriveForWorker(state, filePath) {
+    const ctx = expandFile(state, filePath, 'calls')?.context || null;
+    return ctx ? { calls: composedCalls(ctx) } : { none: true };
+}
+
 /** Worker-side: symbols-mode expansion of one file, as plain records. */
 function expandForWorker(state, filePath) {
     const rec = expandFile(state, filePath) || { sites: 0, blind: [], used: new Map(), expanded: false };
@@ -1978,7 +2441,10 @@ function expandForWorker(state, filePath) {
         sites: rec.sites, blind: rec.blind, expanded: rec.expanded,
         usedNames: [...rec.used.values()].map(def => def.name),
         ...(rec.symbols && { symbols: rec.symbols }),
-        ...(rec.callsPending && { callsPending: true, calleeNames: rec.calleeNames, words: rec.words }),
+        ...(rec.callsPending && {
+            callsPending: true, calleeNames: rec.calleeNames, words: rec.words, expansions: rec.expansions,
+            ...(rec.groups && { groups: rec.groups }),
+        }),
     };
 }
 
@@ -2000,7 +2466,8 @@ function startWorkers(index, files, options = {}) {
         codeUnitCompare(a, b));
     // One serialization shared by every worker (a structured clone per
     // worker cost more than the expansion on large workspaces).
-    const encoded = Buffer.from(JSON.stringify(workerSnapshot(index, files, options.inventory)), 'utf8');
+    const encoded = Buffer.from(JSON.stringify(workerSnapshot(index, files, options.inventory,
+        options.mode === 'calls')), 'utf8');
     const snapshot = new SharedArrayBuffer(encoded.length);
     encoded.copy(Buffer.from(snapshot));
     const sab = new SharedArrayBuffer(4 * (count + 1));
@@ -2009,7 +2476,8 @@ function startWorkers(index, files, options = {}) {
     for (let i = 0; i < count; i++) {
         const worker = pool.available[i];
         ports.push(pool.ports[worker]);
-        pool.post(worker, { snapshot, files: ordered, signal: sab, workerIndex: i, queueIndex: count });
+        pool.post(worker, { snapshot, files: ordered, signal: sab, workerIndex: i, queueIndex: count,
+            ...(options.mode === 'calls' && { mode: 'calls' }) });
     }
     // Kept workers this job does not need end now.
     for (const worker of pool.available.slice(count)) pool.retire(worker);
@@ -2051,29 +2519,602 @@ function rustExpandedCalls(index, filePath, rawCalls, { materialize = true } = {
     if (!rec?.callsPending || !Array.isArray(rawCalls)) return rawCalls;
     const hints = (rec.calleeNames || []).map(name => ({ name, line: 0, calleeHint: true }));
     if (!materialize) return hints.length > 0 ? rawCalls.concat(hints) : rawCalls;
-    if (!index._rustMacroState) index._rustMacroState = createState(index);
+    const ctx = pendingContext(index, filePath, { whole: true });
     if (index.calleeIndex && hints.length > 0) index._removeFromCalleeIndex(filePath, hints);
     rec.callsPending = false;
     try {
-        expandFile(index._rustMacroState, filePath, 'calls');
+        if (ctx) composeCalls(index, ctx);
     } catch (error) {
         rec.callsPending = true;
         throw error;
     }
+    finishDerivation(index, filePath, rec);
+    return index.callsCache.get(filePath)?.calls || rawCalls;
+}
+
+function finishDerivation(index, filePath, rec) {
+    index._rustMacroState?.contexts.delete(filePath);
     delete rec.words;
+    delete rec.groups;
+    delete rec.expansions;
     index.macroExpansionDirty = true;
-    return index.callsCache.get(filePath)?.calls || rawCalls;
+}
+
+// Derivation contexts whose trees are kept (fix #405); a context dropped
+// earlier keeps the records of the groups it read.
+const LIVE_CONTEXTS = 3;
+
+/**
+ * The calls-pass context of a file whose expansion calls are pending, or
+ * null when nothing of it expands (its parsed records stand).
+ */
+function pendingContext(index, filePath, { whole = false } = {}) {
+    if (!index._rustMacroState) index._rustMacroState = createState(index);
+    const state = index._rustMacroState;
+    const contexts = state.contexts;
+    let ctx = contexts.get(filePath);
+    if (ctx === null) return null;
+    if (ctx && ctx.live) {
+        contexts.delete(filePath);
+        contexts.set(filePath, ctx);
+        return ctx;
+    }
+    // A file derived whole before any part of it was read is read in one
+    // pass (fix #405b): the groups apart cost the same expansions and parse
+    // plus a second plan of the file's invocations.
+    const fresh = whole && ctx === undefined
+        ? expandFile(state, filePath, 'calls')?.context || null
+        : buildContext(state, filePath);
+    if (fresh && ctx) {
+        // Rebuilt: the groups the dropped context read keep their records.
+        if (fresh.groups.length !== ctx.groups.length || !!fresh.isolated !== !!ctx.isolated) {
+            throw new Error(`Rust macro expansion context changed: ${filePath}`);
+        }
+        for (let i = 0; i < fresh.groups.length; i++) {
+            const kept = ctx.groups[i];
+            if (!kept.records) continue;
+            Object.assign(fresh.groups[i], { records: kept.records, units: kept.units, starts: kept.starts });
+        }
+        fresh.invocations = ctx.invocations;
+        fresh.seen = ctx.seen;
+    }
+    contexts.delete(filePath);
+    contexts.set(filePath, fresh);
+    if (fresh) {
+        let live = 0;
+        for (const [file, other] of [...contexts].reverse()) {
+            if (!other?.live) continue;
+            if (++live <= LIVE_CONTEXTS || file === filePath) continue;
+            contexts.set(file, releaseContext(other));
+        }
+    }
+    return fresh;
+}
+
+/**
+ * A file's calls-pass context: its groups read apart when the build's
+ * record of its expansions still matches its invocations, else one pass
+ * over the whole file. null when nothing of it expands.
+ */
+function buildContext(state, filePath) {
+    const rec = state.index.files.get(filePath)?.rustMacroExpansion;
+    // Expansions the build could not parse in context are read in one pass
+    // (whose retries can also drop a neighbor).
+    if (Array.isArray(rec?.expansions) && !(rec.blind || []).some(site => site.reason === 'parse-error')) {
+        const isolated = isolatedContext(state, filePath, rec.expansions);
+        if (isolated !== undefined) return isolated;
+    }
+    return expandFile(state, filePath, 'calls')?.context || null;
+}
+
+/** What a dropped context keeps: the records it read. */
+function releaseContext(ctx) {
+    return {
+        isolated: ctx.isolated,
+        groups: ctx.groups.map(group => ({ records: group.records, units: group.units, starts: group.starts })),
+        invocations: ctx.invocations,
+        seen: ctx.seen,
+        live: false,
+    };
+}
+
+/**
+ * A context that reads each group apart (fix #405). The build recorded, for
+ * every invocation it expanded, its hygiene start and its expanded length:
+ * a group expands alone with the numbering and the offsets of a pass over
+ * the whole file, every other expansion standing in as a blank of its
+ * length. undefined when that record no longer matches the file's
+ * invocations or the file has parse errors (one pass reads it), null when
+ * nothing of it expands.
+ */
+function isolatedContext(state, filePath, expansions) {
+    const index = state.index;
+    const content = readContent(state, filePath);
+    if (!index.files.get(filePath) || content === null) return undefined;
+    if (!fileMayExpand(state, filePath)) return null;
+    const tree = safeParse(state.parser, content, undefined, PARSE_OPTIONS);
+    if (tree.rootNode.hasError) return undefined;
+    const plan = plannedInvocations(state, filePath, content, tree, { blind: [] });
+    if (plan.length * 3 !== expansions.length) return undefined;
+    const slots = [];
+    for (let i = 0; i < plan.length; i++) {
+        const item = plan[i];
+        if (item.node.startIndex !== expansions[3 * i]) return undefined;
+        item.hygiene = expansions[3 * i + 1];
+        item.length = expansions[3 * i + 2];
+        if (item.length < 0) continue;
+        slots.push({
+            item, node: item.node, start: item.node.startIndex, end: item.node.endIndex,
+            startLine: item.line, endLine: item.node.endPosition.row + 1,
+        });
+    }
+    if (slots.length === 0) return null;
+    slots.sort((a, b) => a.start - b.start);
+    const { units } = analysisUnits(slots, 'calls');
+    const lookups = unitLookups(units);
+    const groups = groupsOf(units);
+    for (const group of groups) group.slots = [];
+    for (const slot of slots) groups[lookups.unitAtOffset(slot.start).group].slots.push(slot);
+    return {
+        isolated: true, filePath, content, tree, slots, groups,
+        original: index.callsCache.get(filePath)?.calls || [],
+        seen: new Set(), invocations: new Map(), parser: state.parser, state, live: true,
+    };
+}
+
+/** Units sharing a line form one group; units get their group's index. */
+function groupsOf(units) {
+    const groups = [];
+    for (const unit of units) {
+        const last = groups[groups.length - 1];
+        if (last && unit.startLine <= last.endLine) {
+            last.units.push(unit);
+            if (unit.endLine > last.endLine) last.endLine = unit.endLine;
+        } else {
+            groups.push({ units: [unit], startLine: unit.startLine, endLine: unit.endLine, records: null });
+        }
+    }
+    for (let i = 0; i < groups.length; i++) for (const unit of groups[i].units) unit.group = i;
+    return groups;
+}
+
+/**
+ * Read groups of an isolated context. Groups whose expanded text parses
+ * without an error read together as alone (each unit is an item of its
+ * container); otherwise each group is read alone.
+ */
+function readIsolatedGroups(ctx, targets) {
+    if (targets.length === 1) {
+        readIsolatedGroup(ctx, targets[0]);
+        return;
+    }
+    const rec = { blind: [], used: new Map() };
+    const wanted = new Set(targets);
+    const mine = new Set(targets.flatMap(i => ctx.groups[i].slots));
+    const expand = slot => expandSlot(ctx, slot, rec);
+    const live = ctx.slots.filter(slot => mine.has(slot)).map(expand);
+    const keep = analysisUnits(live, 'calls').keep;
+    const extras = ctx.slots.filter(slot => !mine.has(slot) &&
+        keep.some(([start, end]) => slot.start < end && slot.end > start)).map(expand);
+    const expanded = live.concat(extras);
+    const bySlot = new Map(expanded.map(region => [region.slot, region]));
+    const all = ctx.slots.map(slot => bySlot.get(slot) || placeholderOf(ctx, slot));
+    const built = buildSynthetic(ctx.content, all, analysisUnits(expanded, 'calls').keep);
+    const synthTree = parseSynthetic(ctx.parser, built.text, built.spans);
+    if (collectErrorRanges(synthTree.rootNode, []).length > 0) {
+        for (const i of targets) readIsolatedGroup(ctx, i);
+        return;
+    }
+    const units = [];
+    for (const i of targets) {
+        const group = ctx.groups[i];
+        const regions = live.filter(region => region.slot && ctx.groups[i].slots.includes(region.slot));
+        group.units = analysisUnits(regions, 'calls').units;
+        for (const unit of group.units) unit.group = i;
+        group.starts = regions.map(region => region.start);
+        group.records = [];
+        units.push(...group.units);
+    }
+    units.sort((a, b) => a.start - b.start);
+    const lookups = unitLookups(units);
+    const originalSpanless = new Map();
+    for (const record of ctx.original) {
+        if (Number.isFinite(record.callStart) || !lookups.unitAtLine(record.line)) continue;
+        const key = spanlessKey(record);
+        originalSpanless.set(key, (originalSpanless.get(key) || 0) + 1);
+    }
+    const rust = require('../languages/rust');
+    const synthCalls = rust.findCallsInCode(built.text, ctx.parser, {
+        tree: synthTree, itemRecovery: rust.rustExpandedItemRecovery(built.text, ctx.parser, synthTree),
+    });
+    mergeRecords(ctx, synthCalls, {
+        mapper: offsetMapper(all), lookups, regions: live, synthTree, originalSpanless,
+        accept: unit => wanted.has(unit.group), push: (unit, call) => ctx.groups[unit.group].records.push(call),
+    });
+}
+
+/** Expand one invocation of an isolated context as the build did. */
+function expandSlot(ctx, slot, rec) {
+    ctx.state.hygieneSeq = slot.item.hygiene;
+    const region = expandPlanned(ctx.state, ctx.filePath, ctx.content, slot.item, rec);
+    if (!region || region.layout.text.length !== slot.item.length) {
+        throw new Error(`Rust macro expansion at ${ctx.filePath}:${slot.startLine} differs from the build's`);
+    }
+    region.slot = slot;
+    return region;
+}
+
+/** A blank of an expansion's length standing in for it (its newlines kept). */
+function placeholderOf(ctx, slot) {
+    if (!ctx.placeholders) ctx.placeholders = new Map();
+    let region = ctx.placeholders.get(slot);
+    if (!region) {
+        const breaks = slot.endLine - slot.startLine;
+        region = {
+            start: slot.start, end: slot.end, startLine: slot.startLine, endLine: slot.endLine, blank: true,
+            layout: { text: ' '.repeat(slot.item.length - breaks) + '\n'.repeat(breaks), marks: [] },
+        };
+        ctx.placeholders.set(slot, region);
+    }
+    // Its offsets are set by the synthetic it stands in.
+    return { ...region };
+}
+
+/** Read one group of an isolated context: its expansions, parsed alone. */
+function readIsolatedGroup(ctx, gi) {
+    const group = ctx.groups[gi];
+    const rec = { blind: [], used: new Map() };
+    const expand = slot => expandSlot(ctx, slot, rec);
+    const mine = new Set(group.slots);
+    let live = group.slots.map(expand);
+    // Expansions inside the kept headers of this group's units
+    // (`impl T for m!() { .. }`) are part of its text.
+    const headerKeep = analysisUnits(live, 'calls').keep;
+    let extras = ctx.slots.filter(slot => !mine.has(slot) &&
+        headerKeep.some(([start, end]) => slot.start < end && slot.end > start)).map(expand);
+    let synthetic = null;
+    let synthTree = null;
+    let all = null;
+    for (let attempt = 0; live.length > 0 && attempt <= ctx.slots.length; attempt++) {
+        const expanded = live.concat(extras);
+        const bySlot = new Map(expanded.map(region => [region.slot, region]));
+        const dropped = new Set(group.slots.filter(slot => !bySlot.has(slot)));
+        // A dropped expansion stays as written, as in one pass.
+        all = ctx.slots.filter(slot => !dropped.has(slot)).map(slot => bySlot.get(slot) || placeholderOf(ctx, slot));
+        const built = buildSynthetic(ctx.content, all, analysisUnits(expanded, 'calls').keep);
+        synthetic = built.text;
+        synthTree = parseSynthetic(ctx.parser, synthetic, built.spans);
+        const errors = collectErrorRanges(synthTree.rootNode, []);
+        const bad = new Set();
+        for (const [start, end] of errors) {
+            for (const region of expanded) {
+                if (start < region.synthEnd && end > region.synthStart) bad.add(region);
+                else if (start === end && start >= region.synthStart && start <= region.synthEnd) bad.add(region);
+            }
+        }
+        if (bad.size === 0) break;
+        live = live.filter(region => !bad.has(region));
+        extras = extras.filter(region => !bad.has(region));
+    }
+    group.units = live.length > 0 ? analysisUnits(live, 'calls').units : [];
+    group.starts = live.map(region => region.start);
+    group.records = [];
+    if (live.length === 0) return;
+    const lookups = unitLookups(group.units);
+    const mapper = offsetMapper(all);
+    const originalSpanless = new Map();
+    for (const record of ctx.original) {
+        if (Number.isFinite(record.callStart) || !lookups.unitAtLine(record.line)) continue;
+        const key = spanlessKey(record);
+        originalSpanless.set(key, (originalSpanless.get(key) || 0) + 1);
+    }
+    const rust = require('../languages/rust');
+    const synthCalls = rust.findCallsInCode(synthetic, ctx.parser, {
+        tree: synthTree, itemRecovery: rust.rustExpandedItemRecovery(synthetic, ctx.parser, synthTree),
+    });
+    mergeRecords(ctx, synthCalls, {
+        mapper, lookups, regions: live, synthTree, originalSpanless,
+        accept: () => true, push: (unit, call) => group.records.push(call),
+    });
+}
+
+/**
+ * Words the records of an isolated group can bear: its lines and its units'
+ * kept headers in the file (literals and comments left out), the text of
+ * every project macro its expansions can transcribe, and the crate names
+ * `$crate` becomes.
+ */
+function isolatedGroupWords(ctx, group) {
+    if (group.words) return group.words;
+    const state = ctx.state;
+    const words = new Set();
+    const ranges = analysisUnits(group.slots, 'calls').keep.concat([[
+        lineOffset(state, ctx.filePath, group.startLine), lineEndOffset(state, ctx.filePath, group.endLine),
+    ]]).sort((a, b) => a[0] - b[0]);
+    if (!ctx.nonCode) ctx.nonCode = ctx.tree.rootNode.descendantsOfType(NON_CODE_TOKENS);
+    const nonCode = ctx.nonCode;
+    const scan = (start, end) => {
+        if (end <= start) return;
+        for (const word of ctx.content.slice(start, end).match(WORD) || []) words.add(word);
+    };
+    let next = 0;
+    let done = 0;
+    for (const [rangeStart, end] of ranges) {
+        let at = Math.max(rangeStart, done);
+        if (end <= at) continue;
+        while (next < nonCode.length && nonCode[next].endIndex <= at) next++;
+        for (let i = next; i < nonCode.length; i++) {
+            const token = nonCode[i];
+            if (token.startIndex >= end) break;
+            scan(at, Math.min(token.startIndex, end));
+            at = Math.max(at, token.endIndex);
+        }
+        scan(at, end);
+        done = end;
+    }
+    for (const word of [...words]) if (state.inventory.has(word)) addTemplateWords(state, word, words);
+    words.add('crate');
+    group.words = words;
+    return words;
+}
+
+/** Words of every definition of macro `name` and the macros they name, transitively. */
+function addTemplateWords(state, name, words) {
+    if (!state.templateWords) state.templateWords = new Map();
+    let own = state.templateWords.get(name);
+    if (!own) {
+        own = new Set();
+        state.templateWords.set(name, own);
+        const pending = [name];
+        const visited = new Set();
+        while (pending.length > 0) {
+            const next = pending.pop();
+            if (visited.has(next)) continue;
+            visited.add(next);
+            for (const def of state.inventory.get(next) || []) {
+                const content = readContent(state, def.file);
+                if (content === null) continue;
+                const text = content.slice(lineOffset(state, def.file, def.startLine), lineOffset(state, def.file, def.endLine + 1));
+                for (const word of text.match(WORD) || []) {
+                    own.add(word);
+                    if (state.inventory.has(word) && !visited.has(word)) pending.push(word);
+                }
+                const crate = packageOf(state, def.file)?.packageName;
+                if (crate) own.add(crate);
+            }
+        }
+    }
+    for (const word of own) words.add(word);
+}
+
+/**
+ * The records of a file whose expansion calls are pending that a consumer
+ * reading only part of them needs (fix #405), in the order the composed
+ * calls hold them and as the same record objects. `name`: the records
+ * `keep` accepts, each of which must bear the name as one of its own
+ * identifier tokens (its name or written receiver); `lines`: [start, end],
+ * the records on those lines; `lineSet`: the records on any of those lines. Only the groups that can hold such records
+ * are read. undefined when the file's calls are not pending, `name` is not
+ * an identifier, or every group is read (the file's calls are then derived
+ * whole by the caller).
+ */
+const IDENTIFIER = /^(?:r#)?[\p{L}_][\p{L}\p{N}_]*$/u;
+// Tenths of a file's unread expanded text from which a view derives the file
+// whole (fix #405b).
+const WHOLE_FILE_SHARE = 9;
+
+function rustPendingRecords(index, filePath, { name = null, keep = null, lines = null, lineSet = null } = {}) {
+    const entry = index.files.get(filePath);
+    if (!entry?.rustMacroExpansion?.callsPending) return undefined;
+    // Hygiene renames locals a transcriber introduces (`x__ucn_h3`): no
+    // source text holds such a name.
+    if (name !== null && (!IDENTIFIER.test(name) || /__ucn_h\d+$/.test(name))) return undefined;
+    const raw = index.callsCache.get(filePath)?.calls;
+    if (!Array.isArray(raw)) return undefined;
+    const matches = record => (!lines || (record.line >= lines[0] && record.line <= lines[1])) &&
+        (!lineSet || lineSet.has(record.line)) && (!keep || keep(record));
+    // No derived record bears a name outside the file's words (#375): the
+    // parsed records then answer, unless one of them bears it.
+    if (name !== null && !rustPendingMayBear(entry, name) && !raw.some(matches)) return [];
+    // The groups recorded at build (fix #405b) are chosen before anything is
+    // parsed: a group can hold a record `matches` accepts when a word its
+    // expansions output or its headers hold is the name, or when a parsed
+    // record on its lines is accepted (the units' own code is written there).
+    const rec = entry.rustMacroExpansion;
+    const recorded = Array.isArray(rec.groups) ? rec.groups : null;
+    let planned = null;
+    if (recorded) {
+        const read = index._rustMacroState?.contexts?.get(filePath)?.groups || null;
+        const parsedOn = name !== null ? parsedRecordLines(raw, matches) : null;
+        planned = [];
+        let wantedLength = 0;
+        let unreadLength = 0;
+        for (let i = 0; i < recorded.length; i++) {
+            const [startLine, endLine, length] = recorded[i];
+            const unread = !read?.[i]?.records;
+            if (unread) unreadLength += length;
+            if (lines && (endLine < lines[0] || startLine > lines[1])) continue;
+            if (lineSet && ![...lineSet].some(line => line >= startLine && line <= endLine)) continue;
+            if (name !== null && !groupHasWord(recorded[i][3], name) &&
+                !parsedOn.some(line => line >= startLine && line <= endLine)) continue;
+            planned.push(i);
+            if (unread) wantedLength += length;
+        }
+        if (planned.length === 0) {
+            // Every group read: the caller derives the file's calls whole.
+            if (read && read.length > 0 && read.every(group => group.records)) return undefined;
+            // No group can hold one: the accepted records are parsed ones
+            // outside every unit, as the composed calls hold them.
+            return raw.filter(matches).sort((a, b) => a.line - b.line);
+        }
+        // Reading most of the expanded text that is still unread costs more
+        // than deriving the file whole (groups read together cost ~5-10%
+        // over one pass), which then answers every later query of the file:
+        // a cost decision, not a semantic one - either way the records are
+        // the composed calls'.
+        if (wantedLength > 0 && wantedLength * 10 >= unreadLength * WHOLE_FILE_SHARE) return undefined;
+    }
+    const ctx = pendingContext(index, filePath);
+    if (!ctx) return raw.filter(matches);
+    // Every group read: the caller derives the file's calls whole.
+    if (ctx.groups.every(group => group.records)) return undefined;
+    let wanted;
+    if (planned && ctx.groups.length === recorded.length && ctx.groups.every((group, i) =>
+        group.startLine === recorded[i][0] && group.endLine === recorded[i][1])) {
+        wanted = planned;
+    } else {
+        wanted = [];
+        for (let i = 0; i < ctx.groups.length; i++) {
+            const group = ctx.groups[i];
+            if (lines && (group.endLine < lines[0] || group.startLine > lines[1])) continue;
+            if (lineSet && ![...lineSet].some(line => line >= group.startLine && line <= group.endLine)) continue;
+            if (name !== null && !groupMayBear(ctx, group, name)) continue;
+            wanted.push(i);
+        }
+    }
+    readGroups(ctx, wanted);
+    if (ctx.groups.every(group => group.records)) return undefined;
+    const out = ctx.original.filter(record => matches(record) && !inReadUnit(ctx, record));
+    for (const i of wanted) for (const record of ctx.groups[i].records) if (matches(record)) out.push(record);
+    for (const record of invocationRecords(ctx)) if (matches(record)) out.push(record);
+    return out.sort((a, b) => a.line - b.line);
+}
+
+/**
+ * Whether a group's records can bear `name`: a word of the group's lines in
+ * the expanded file or of the kept text outside every unit (headers: a
+ * `Self` record bears its impl's type name).
+ */
+function groupMayBear(ctx, group, name) {
+    if (ctx.isolated) return hasWord(isolatedGroupWords(ctx, group), name);
+    if (!ctx.outsideWords) {
+        const words = new Set();
+        let at = 0;
+        for (const unit of ctx.units) {
+            for (const word of ctx.synthetic.slice(at, unit.synthStart).match(WORD) || []) words.add(word);
+            at = Math.max(at, unit.synthEnd);
+        }
+        for (const word of ctx.synthetic.slice(at).match(WORD) || []) words.add(word);
+        ctx.outsideWords = words;
+    }
+    if (hasWord(ctx.outsideWords, name)) return true;
+    if (!group.words) {
+        if (!ctx.synthLineStarts) {
+            const starts = [0];
+            const text = ctx.synthetic;
+            for (let i = text.indexOf('\n'); i >= 0; i = text.indexOf('\n', i + 1)) starts.push(i + 1);
+            ctx.synthLineStarts = starts;
+        }
+        const starts = ctx.synthLineStarts;
+        const from = starts[Math.max(group.startLine - 1, 0)] ?? ctx.synthetic.length;
+        const to = starts[group.endLine] ?? ctx.synthetic.length;
+        group.words = new Set(ctx.synthetic.slice(from, to).match(WORD) || []);
+    }
+    return hasWord(group.words, name);
+}
+
+/** Lines of the parsed records `matches` accepts. */
+function parsedRecordLines(raw, matches) {
+    const out = [];
+    for (const record of raw) if (matches(record)) out.push(record.line);
+    return out;
+}
+
+function hasWord(words, name) {
+    // A raw identifier's token is `r#name`; text holds both parts.
+    return words.has(name) || words.has(String(name).replace(/^r#/, '')) || words.has(`r#${name}`);
+}
+
+/**
+ * Relative paths of the files whose expansion calls are pending with no
+ * part derived yet, sorted.
+ */
+function rustUntouchedPendingFiles(index) {
+    const contexts = index._rustMacroState?.contexts;
+    const out = [];
+    for (const [filePath, entry] of index.files) {
+        if (!entry.rustMacroExpansion?.callsPending) continue;
+        if (contexts?.get(filePath)?.groups?.some(group => group.records)) continue;
+        out.push(entry.relativePath);
+    }
+    return out.sort(codeUnitCompare);
+}
+
+/** Derive whole every file whose expansion calls were derived in part. */
+function completeRustMacroCalls(index) {
+    const contexts = index._rustMacroState?.contexts;
+    if (!contexts || contexts.size === 0) return 0;
+    let done = 0;
+    for (const filePath of [...contexts.keys()].sort(codeUnitCompare)) {
+        if (!index.files.get(filePath)?.rustMacroExpansion?.callsPending) continue;
+        const cached = index.callsCache.get(filePath);
+        if (!cached) continue;
+        rustExpandedCalls(index, filePath, cached.calls);
+        done++;
+    }
+    return done;
 }
 
 /** Derive every pending file's expansion calls (whole-program consumers). */
 function materializeRustMacroCalls(index) {
+    const pending = [];
+    for (const [filePath, entry] of index.files) {
+        if (!entry.rustMacroExpansion?.callsPending || !index.callsCache.get(filePath)) continue;
+        // A file a query derived in part keeps its context's records.
+        if (index._rustMacroState?.contexts.has(filePath)) continue;
+        pending.push(filePath);
+    }
+    // Many files to derive at once (an orientation ranking, a deadcode
+    // audit): fresh workers derive them (fix #422), each whole in one pass
+    // exactly as below.
+    const derived = deriveInWorkers(index, pending);
     for (const [filePath, entry] of index.files) {
         if (!entry.rustMacroExpansion?.callsPending) continue;
         const cached = index.callsCache.get(filePath);
-        if (cached) rustExpandedCalls(index, filePath, cached.calls);
+        if (!cached) continue;
+        const result = derived?.get(filePath);
+        if (result) installDerived(index, filePath, entry.rustMacroExpansion, cached, result);
+        else rustExpandedCalls(index, filePath, cached.calls);
     }
 }
 
+// Expanded text a materialization derives in fresh workers from, and per
+// worker (the build recorded each expansion's length): below it, starting
+// threads costs more than deriving in place.
+const DERIVE_IN_WORKERS_MIN_BYTES = 192 * 1024;
+const DERIVE_BYTES_PER_WORKER = 192 * 1024;
+
+/** Whole-file calls derivations of `files` in fresh workers: Map<file, { calls } | { none }>, or null. */
+function deriveInWorkers(index, files) {
+    const env = process.env.UCN_FRESH_EXPANSION;
+    if (env === '0' || freshWorkerCount(index, 2, files.length) === 0) return null;
+    let bytes = 0;
+    for (const file of files) {
+        const recorded = index.files.get(file)?.rustMacroExpansion?.expansions || [];
+        for (let i = 2; i < recorded.length; i += 3) if (recorded[i] > 0) bytes += recorded[i];
+    }
+    if (env !== '1' && bytes < DERIVE_IN_WORKERS_MIN_BYTES) return null;
+    const inventory = index._rustMacroState?.inventory || macroInventory(index);
+    if (inventory.size === 0) return null;
+    const count = freshWorkerCount(index, Math.ceil(bytes / DERIVE_BYTES_PER_WORKER), files.length);
+    const pool = require('./parallel-build').spawnExpansionPool(index, count);
+    if (!pool) return null;
+    try {
+        const run = startWorkers(index, files, { pool, inventory, mode: 'calls' });
+        return run ? run.collect() : null;
+    } finally {
+        pool.dispose();
+    }
+}
+
+function installDerived(index, filePath, rec, cached, result) {
+    const hints = (rec.calleeNames || []).map(name => ({ name, line: 0, calleeHint: true }));
+    if (index.calleeIndex && hints.length > 0) index._removeFromCalleeIndex(filePath, hints);
+    rec.callsPending = false;
+    if (result.calls) installComposedCalls(index, filePath, result.calls, cached.calls);
+    finishDerivation(index, filePath, rec);
+}
+
 /** Expanded and blind invocation sites, for health and deadcode disclosure. */
 function rustMacroExpansionSummary(index) {
     const summary = { sites: 0, files: 0, blind: { count: 0, fileCount: 0, files: [], sample: [], reasons: {} } };
@@ -2110,4 +3151,8 @@ module.exports = {
     materializeRustMacroCalls,
     rustMacroExpansionSummary,
     rustPendingMayBear,
+    rustPendingFilesBearing,
+    rustPendingRecords,
+    completeRustMacroCalls,
+    rustUntouchedPendingFiles,
 };