@mjasnikovs/pi-task 0.40.10 → 0.40.11

package/dist/workers/docs-ecosystems.d.ts

@@ -87,11 +87,15 @@ export interface EcosystemProfile {
      */
     exportGap?: (root: string) => ExportGap;
     /**
-     * Source of `exportGap` AND everything it delegates to, for the index
-     * fingerprint. `String(exportGap)` alone leaves a fix in a helper invisible,
-     * which is the failure `chunkerFingerprint` exists to close one level up.
+     * Source of everything this row contributes to a chunk's CONTENT — `surface`,
+     * `exportGap`, and every function and regex they delegate to.
+     *
+     * Required, and not derived from `String(surface)`, because that has hidden a
+     * real fix three times: `surface` here is the wrapper
+     * `content => rustSurface(content)`, which shows none of `rustSurface`, and
+     * neither gap rule's helpers appear in its entry point either.
      */
-    exportGapFingerprint?: () => string;
+    contentFingerprint: () => string;
     /** The registry's own newest version, for grounding an answer in the present. */
     latest: (name: string, io: EcosystemIo) => Promise<NpmVersionInfo | null>;
     /** True for a file that carries the package's public API surface. */
@@ -144,13 +148,6 @@ export interface NpmProfileHooks {
     resolvePackage?: typeof resolvePackage;
     npmVersionLookup?: typeof npmVersionLookup;
 }
-/**
- * The npm row, with the pieces a caller may have replaced left as parameters.
- *
- * `docsRaw` already takes `resolvePackage` and `npmVersionLookup` as injection
- * hooks, and those hooks must keep reaching the resolution they are injected
- * for. A per-call row carries them; {@link ECOSYSTEMS} holds the plain one.
- */
 export declare function npmProfile(hooks?: NpmProfileHooks): EcosystemProfile;
 /**
  * The package.json manifest, not the lockfile: a lockfile is rewritten by

package/dist/workers/docs-ecosystems.js

@@ -21,8 +21,8 @@ import { runAutoInstall, findDeclaredRange, extractParentPackage, resolveTypeSou
 import { resolvePackage, isDtsFile, isValidModuleName } from './docs-resolve.js';
 import { DECL_SPLIT_RE } from './docs-chunk.js';
 import { npmVersionLookup } from './npm-version.js';
-import { resolveCrate, cratesLatest, crateTarballUrl, crateOf, isValidCrateName, isRustFile, lockedVersion, rustSurface, cargoProjectName, childDirs, lockedDeps, manifestCrates, cargoExportGap, cargoGapFingerprint, cargoSupplementCandidates, CARGO_DECL_SPLIT_RE } from './eco-cargo.js';
-import { resolveHackage, hackageLatest, hackageVersion, hackageTarballUrl, hackageExtractDir, hackageProjectName, supplementCandidates, hackageExportGap, hackageGapFingerprint, findCabalTarball, cachedVersions, resolvedVersions, manifestPackages, isValidHackageName, isHaskellFile, haskellSurface, HACKAGE_DECL_SPLIT_RE, HACKAGE_SKIP_DIRS } from './eco-hackage.js';
+import { resolveCrate, cratesLatest, crateTarballUrl, crateOf, isValidCrateName, isRustFile, lockedVersion, rustSurface, cargoProjectName, childDirs, lockedDeps, manifestCrates, cargoExportGap, cargoContentFingerprint, cargoSupplementCandidates, CARGO_DECL_SPLIT_RE } from './eco-cargo.js';
+import { resolveHackage, hackageLatest, hackageVersion, hackageTarballUrl, hackageExtractDir, hackageProjectName, supplementCandidates, hackageExportGap, hackageContentFingerprint, findCabalTarball, cachedVersions, resolvedVersions, manifestPackages, isValidHackageName, isHaskellFile, haskellSurface, HACKAGE_DECL_SPLIT_RE, HACKAGE_SKIP_DIRS } from './eco-hackage.js';
 import { runChild } from '../shared/child-process.js';
 /**
  * Is any of `names` present at `cwd` or above it?
@@ -101,6 +101,9 @@ function defaultCabalPackageDirs() {
  * hooks, and those hooks must keep reaching the resolution they are injected
  * for. A per-call row carries them; {@link ECOSYSTEMS} holds the plain one.
  */
+/** A `.d.ts` is already declarations only, so npm's extractor is the identity.
+ *  Named rather than inline so `contentFingerprint` can point at it. */
+const npmSurface = (content) => content;
 export function npmProfile(hooks = {}) {
     const resolve = hooks.resolvePackage ?? resolvePackage;
     const versionLookup = hooks.npmVersionLookup ?? npmVersionLookup;
@@ -126,7 +129,10 @@ export function npmProfile(hooks = {}) {
         afterResolve: (pkg, requested, cwd, io) => resolveTypeSourceForDocs(pkg, requested, cwd, io.spawn, resolve, io.signal),
         latest: (name, io) => versionLookup(name, io.signal === undefined ? {} : { signal: io.signal }),
         isSurfaceFile: isDtsFile,
-        surface: content => content,
+        surface: npmSurface,
+        // No gap rule, and a `.d.ts` IS the surface, so there is nothing below the
+        // identity for a fingerprint to miss.
+        contentFingerprint: () => String(npmSurface),
         declSplitRe: DECL_SPLIT_RE,
         typeKeywords: ['interface', 'type', 'class', 'enum'],
         commentPrefix: '//',
@@ -299,9 +305,12 @@ const cargoProfile = {
         return out;
     },
     exportGap: cargoExportGap,
-    exportGapFingerprint: cargoGapFingerprint,
+    contentFingerprint: cargoContentFingerprint,
     latest: (name, io) => cratesLatest(name, io.fetch, io.signal),
     isSurfaceFile: isRustFile,
+    // Wrapped, not passed by reference: `rustSurface` takes two more optional
+    // arguments, and a bare reference would let a `.map(profile.surface)` pass an
+    // index as `insideTrait`. `contentFingerprint` is what covers its source.
     surface: content => rustSurface(content),
     declSplitRe: CARGO_DECL_SPLIT_RE,
     typeKeywords: ['struct', 'trait', 'enum', 'type', 'union'],
@@ -415,7 +424,7 @@ const hackageProfile = {
         return out;
     },
     exportGap: hackageExportGap,
-    exportGapFingerprint: hackageGapFingerprint,
+    contentFingerprint: hackageContentFingerprint,
     latest: (name, io) => hackageLatest(name, io.fetch, io.signal),
     isSurfaceFile: isHaskellFile,
     surface: haskellSurface,

package/dist/workers/docs-index.js

@@ -52,7 +52,8 @@ function computeContentHash(pkg, profile, supplements = []) {
     // leaves a package cached whenever a fix moves some OTHER module — the
     // wrapped `instance` head is in aeson's `Types/FromJSON.hs`, never its entry
     // — and nothing surfaced the duplicate drop in `ingestBody` at all.
-    hash.update(Buffer.from(`${String(profile.surface)}\u0000${String(ingestBody)}`, 'utf8'));
+    hash.update(Buffer.from(`${String(profile.surface)}\u0000${profile.contentFingerprint()}`
+        + `\u0000${String(ingestBody)}`, 'utf8'));
     hash.update(ZERO_SEP);
     // Which packages were folded in, so gaining or losing one re-indexes — and the
     // rule that decides WHICH of their chunks are kept, by source. Hashing the set
@@ -60,7 +61,6 @@ function computeContentHash(pkg, profile, supplements = []) {
     // the chunks the old rule chose.
     hash.update(Buffer.from(supplements.map(s => `${s.name}@${s.version}`).join('\u0000'), 'utf8'));
     hash.update(ZERO_SEP);
-    hash.update(Buffer.from(profile.exportGapFingerprint?.() ?? String(profile.exportGap ?? ''), 'utf8'));
     hash.update(ZERO_SEP);
     if (pkg.entry && fs.existsSync(pkg.entry)) {
         try {

package/dist/workers/eco-cargo.d.ts

@@ -99,16 +99,6 @@ interface Item {
  * finds the end of the item it is in.
  */
 export declare function splitRustItems(src: string): Item[];
-/**
- * Reduce Rust source to its public API surface.
- *
- * Function bodies go — they are the bulk of the file and answer no question the
- * docs tool is asked. Everything a caller can name stays: the item head, its doc
- * comment, its attributes, and for a struct or enum its fields and variants.
- *
- * Inside a `trait` every member is public by definition, so the `pub` test is
- * suspended there; anywhere else a bare or `pub(crate)` item is dropped.
- */
 export declare function rustSurface(src: string, insideTrait?: boolean, topLevel?: boolean): string;
 export declare function isRustFile(name: string): boolean;
 /** The `[package] name` of a cargo project, for labelling its own source. */
@@ -134,14 +124,17 @@ export declare function manifestCrates(cwd: string): Set<string> | undefined;
  */
 export declare function cargoExportGap(root: string): ExportGap;
 /**
- * Source of every function `cargoExportGap` delegates to.
+ * Source of everything this row contributes to a chunk's CONTENT — the surface
+ * extractor, the gap rule, and every function and regex they delegate to.
  *
- * `String(cargoExportGap)` covers only the top level, and the two bugs already
- * found in this pass — a rename split that truncated `Hasher`, a lock read from
- * the wrong root — both lived in helpers. A fix to one of them has to move the
- * index fingerprint or every cached facade keeps the chunks the old rule chose.
+ * `String(fn)` covers only a top level, and three separate bugs have now hidden
+ * one level below it: the chunker (which `chunkerFingerprint` closes), the gap
+ * rule's helpers, and `surface` itself, declared as the wrapper
+ * `content => rustSurface(content)` which shows none of `rustSurface`. A fix that
+ * does not move this leaves every cached crate holding the chunks the old rule
+ * chose.
  */
-export declare function cargoGapFingerprint(): string;
+export declare function cargoContentFingerprint(): string;
 /**
  * Which declared dependencies may be opened to fill the gap.
  *

package/dist/workers/eco-cargo.js

@@ -631,6 +631,37 @@ const LIST_KINDS = new Set(['use']);
  * Inside a `trait` every member is public by definition, so the `pub` test is
  * suspended there; anywhere else a bare or `pub(crate)` item is dropped.
  */
+/** A `#name` interpolation. Rust item syntax has none; a `quote!` template is
+ *  nothing but. Comments come out first — a doctest hides lines with `# use …`. */
+const INTERPOLATION = /#[A-Za-z_(]/;
+function withoutComments(body) {
+    return body
+        .split('\n')
+        .map(l => (/^\s*(?:\/\/|\*)/.test(l) ? '' : l.replace(/\/\/.*$/, '')))
+        .join('\n');
+}
+/**
+ * The body of a `name! { … }` block that WRAPS items, or null.
+ *
+ * tokio declares `pub struct TcpListener` inside `cfg_net! { … }`, and every
+ * async crate does the same: 818 public items across twenty-two crates sit inside
+ * such a block, 441 of them tokio's. Treating the invocation as one opaque item
+ * dropped all of them, `TcpListener` — a ground-truth symbol of the live test —
+ * included.
+ *
+ * The guard is what the body IS, never which macro it is. A `quote!` body is a
+ * token template, and the same measurement found zero public items inside an
+ * interpolating body, so the two populations do not overlap.
+ */
+function macroWrappedItems(item) {
+    if (item.body === null)
+        return null;
+    if (!/^[a-z_][a-z0-9_]*!$/.test(item.head.trim()))
+        return null;
+    if (INTERPOLATION.test(withoutComments(item.body)))
+        return null;
+    return item.body;
+}
 export function rustSurface(src, insideTrait = false, topLevel = true) {
     const out = [];
     const items = splitRustItems(src);
@@ -645,8 +676,12 @@ export function rustSurface(src, insideTrait = false, topLevel = true) {
         out.push(moduleDoc);
     for (const item of items) {
         const headMatch = ITEM_HEAD_RE.exec(item.head);
-        if (!headMatch)
+        if (!headMatch) {
+            const wrapped = macroWrappedItems(item);
+            if (wrapped !== null)
+                out.push(rustSurface(wrapped, insideTrait, false));
             continue;
+        }
         const kind = headMatch[1];
         // A `#[macro_export]` macro IS the crate's API — `anyhow::bail!`,
         // `serde_json::json!`. Dropping every macro answered "no such thing"
@@ -1002,19 +1037,38 @@ export function cargoExportGap(root) {
     };
 }
 /**
- * Source of every function `cargoExportGap` delegates to.
+ * Source of everything this row contributes to a chunk's CONTENT — the surface
+ * extractor, the gap rule, and every function and regex they delegate to.
  *
- * `String(cargoExportGap)` covers only the top level, and the two bugs already
- * found in this pass — a rename split that truncated `Hasher`, a lock read from
- * the wrong root — both lived in helpers. A fix to one of them has to move the
- * index fingerprint or every cached facade keeps the chunks the old rule chose.
+ * `String(fn)` covers only a top level, and three separate bugs have now hidden
+ * one level below it: the chunker (which `chunkerFingerprint` closes), the gap
+ * rule's helpers, and `surface` itself, declared as the wrapper
+ * `content => rustSurface(content)` which shows none of `rustSurface`. A fix that
+ * does not move this leaves every cached crate holding the chunks the old rule
+ * chose.
  */
-export function cargoGapFingerprint() {
-    return [cargoExportGap, runtimeDeps, useTargets, rustSources, moduleOfPath]
+export function cargoContentFingerprint() {
+    return [
+        rustSurface,
+        splitRustItems,
+        macroWrappedItems,
+        withoutComments,
+        keptPreamble,
+        privateTypeNames,
+        implTarget,
+        fieldsOf,
+        cargoExportGap,
+        runtimeDeps,
+        useTargets,
+        rustSources,
+        moduleOfPath
+    ]
         .map(String)
         .concat([
         PUB_USE_RE.source,
         RUST_DECL_RE.source,
+        ITEM_HEAD_RE.source,
+        INTERPOLATION.source,
         CARGO_SKIP_DIRS.join(','),
         [...OWN_PATH_ROOTS].join(',')
     ])

package/dist/workers/eco-hackage.d.ts

@@ -103,9 +103,9 @@ export declare function hackageProjectName(cwd: string): string | null;
 export declare function manifestPackages(cwd: string): Set<string> | undefined;
 /** Every name the extracted surface declares: signatures, heads, constructors, fields. */
 export declare function declaredInSurface(surface: string): Set<string>;
-/** Source of every function {@link hackageExportGap} delegates to — see
- *  `cargoGapFingerprint` for why the top level alone is not enough. */
-export declare function hackageGapFingerprint(): string;
+/** Source of everything this row contributes to a chunk's content — see
+ *  `cargoContentFingerprint` for why a top-level `String(fn)` is not enough. */
+export declare function hackageContentFingerprint(): string;
 export declare function hackageExportGap(root: string): ExportGap;
 /**
  * Which declared dependencies may be opened to fill the gap.

package/dist/workers/eco-hackage.js

@@ -670,9 +670,9 @@ function haskellSources(root) {
     walk(root);
     return out;
 }
-/** Source of every function {@link hackageExportGap} delegates to — see
- *  `cargoGapFingerprint` for why the top level alone is not enough. */
-export function hackageGapFingerprint() {
+/** Source of everything this row contributes to a chunk's content — see
+ *  `cargoContentFingerprint` for why a top-level `String(fn)` is not enough. */
+export function hackageContentFingerprint() {
     return [hackageExportGap, haskellSources, exportListText, declaredInSurface, haskellSurface]
         .map(String)
         .concat([REEXPORT_RE.source, EXPORT_NAME_RE.source])

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mjasnikovs/pi-task",
-    "version": "0.40.10",
+    "version": "0.40.11",
     "description": "Deterministic task planning and spec-orchestration for local models — crash-safe /task pipelines with verify/enforce gates, a real-time remote web view, and web/docs/fetch/worker subagent tools.",
     "type": "module",
     "main": "./dist/index.js",