@ricsam/r5d-worker 0.0.165 → 0.0.166

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.165",
+  "version": "0.0.166",
   "type": "commonjs"
 }

package/dist/mjs/internal-r5dctl.cjs

@@ -20605,7 +20605,7 @@ function resolveEntrypointPath(entrypoint) {
   }
 }
 function getR5dctlVersion() {
-  if (true) return "0.0.165";
+  if (true) return "0.0.166";
   const entrypoint = process.argv[1] ? resolveEntrypointPath(process.argv[1]) : null;
   let current = entrypoint ? import_node_path2.default.dirname(entrypoint) : process.cwd();
   for (let index = 0; index < 12; index += 1) {

package/dist/mjs/main.mjs

@@ -7,7 +7,7 @@ import { startManagerRpc } from "./runtime/releases/rpc-main.mjs";
 import { ManagerRpcConfig } from "./runtime/releases/rpc-protocol.mjs";
 const args = process.argv.slice(2);
 if (args.includes("--version")) {
-  console.log(`r5d-worker ${true ? "0.0.165" : "development"}`);
+  console.log(`r5d-worker ${true ? "0.0.166" : "development"}`);
 } else if (!args.length || args.includes("--help")) {
   console.log(
     "Usage: r5d-worker start --label <label> [--root <dir>] [--base-url <url>] [--token <worker-token>]\n       r5d-worker executor /absolute/private/config.json\n       r5d-worker manager /absolute/private/config.json\n\nRun independently supervised durable runtime services. Provision configuration with r5dinfra."
@@ -15,7 +15,7 @@ if (args.includes("--version")) {
 } else if (args[0] === "start") {
   const runtime = await startPersonalWorker(
     parsePersonalWorkerOptions(args.slice(1)),
-    true ? "0.0.165" : "development"
+    true ? "0.0.166" : "development"
   );
   console.log(`Worker connected: ${runtime.resourceId}`);
   let closing = false;

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.165",
+  "version": "0.0.166",
   "type": "module"
 }

package/dist/mjs/runtime/workspace/outer.mjs

@@ -146,24 +146,22 @@ class OuterRepository {
   async snapshot(inners, options = {}) {
     const limit = options.limitBytes ?? OUTER_SNAPSHOT_LIMIT_BYTES;
     await this.seed(inners);
-    const dependencies = nulSplit(
-      await this.run(["ls-files", "--others", "--exclude-standard", "--directory", "-z", "--", ":(glob)**/node_modules/**"])
-    );
-    if (dependencies.length && !options.allowLargeDiff)
-      throw new OuterSnapshotRefusal("too_large", "An unignored dependency tree exceeds the automatic publication limit", dependencies.slice(0, MAX_REPORTED_PATHS));
     const others = nulSplit(await this.run(["ls-files", "--others", "--exclude-standard", "-z"]));
     const foreign = others.filter((file) => file.endsWith("/")).map((file) => file.slice(0, -1));
+    const collapsed = nulSplit(await this.run(["ls-files", "--others", "--exclude-standard", "--directory", "-z"])).filter((entry) => entry.endsWith("/") && !foreign.includes(entry.slice(0, -1)));
+    const attribute = (paths) => [...new Set(paths.map((file) => collapsed.find((directory) => file.startsWith(directory)) ?? file))].slice(0, MAX_REPORTED_PATHS);
     const tracked = /* @__PURE__ */ new Map();
+    const trackedOf = async (inner) => {
+      let set = tracked.get(inner.root);
+      if (!set) tracked.set(inner.root, set = await inner.tracked());
+      return set;
+    };
     let unexplainedBytes = 0;
     const unexplainedPaths = [];
     for (const file of others) {
       if (file.endsWith("/")) continue;
       const inner = inners.find((candidate) => withinRoot(file, candidate.root));
-      if (inner) {
-        let set = tracked.get(inner.root);
-        if (!set) tracked.set(inner.root, set = await inner.tracked());
-        if (set.has(file.slice(inner.root.length + 1))) continue;
-      }
+      if (inner && (await trackedOf(inner)).has(file.slice(inner.root.length + 1))) continue;
       const stat = await fs.lstat(path.join(this.workTree, file)).catch((error) => {
         if (error.code === "ENOENT" || error.code === "ENOTDIR") return null;
         throw error;
@@ -175,7 +173,7 @@ class OuterRepository {
         throw new OuterSnapshotRefusal(
           "too_large",
           `Unexplained workspace content exceeds the ${limit}-byte automatic publication limit`,
-          unexplainedPaths.slice(0, MAX_REPORTED_PATHS)
+          attribute(unexplainedPaths)
         );
     }
     for (const file of unexplainedPaths) {
@@ -192,9 +190,40 @@ class OuterRepository {
     }
     await this.run(["add", "-A", "--", ".", ...foreign.map((directory) => `:(exclude,literal)${directory}`)]);
     await this.stripUnsupported();
+    await this.evictIgnored(inners, trackedOf);
     const tree = GitOid.parse((await this.run(["write-tree"])).toString("utf8").trim());
     return { tree, unexplainedBytes, unexplainedPaths };
   }
+  /** Under a checkout the outer tree holds exactly what the checkout tracks plus
+   * what it shows as untracked-and-not-ignored. Staging never drops a tracked
+   * file that has since become ignored — npm's cache, published by a cycle that
+   * raced `npm install` while it was still under the limit, then excluded by a
+   * restored `.gitignore` — so such files are removed from the index here. The
+   * working tree is untouched; a fixed ignore file simply cleans what was
+   * published. The seeding invariant holds: a checkout never loses its last
+   * outer entry. */
+  async evictIgnored(inners, trackedOf) {
+    const cached = nulSplit(await this.run(["ls-files", "--cached", "-z"]));
+    const tracked = /* @__PURE__ */ new Map(), untracked = /* @__PURE__ */ new Map();
+    for (const file of cached) {
+      const inner = inners.find((candidate) => withinRoot(file, candidate.root));
+      if (!inner) continue;
+      if ((await trackedOf(inner)).has(file.slice(inner.root.length + 1))) tracked.set(inner.root, (tracked.get(inner.root) ?? 0) + 1);
+      else untracked.set(inner.root, [...untracked.get(inner.root) ?? [], file]);
+    }
+    const paths = [...untracked.values()].flat();
+    if (!paths.length) return;
+    const { code, stdout } = await this.result(["check-ignore", "--no-index", "-z", "--stdin"], `${paths.join("\0")}\0`);
+    if (code !== 0 && code !== 1) throw new WorkspaceError("git_failed", "Outer repository ignore rules are unreadable");
+    const ignored = new Set(nulSplit(stdout));
+    const removals = [];
+    for (const [root, files] of untracked) {
+      const drop = files.filter((file) => ignored.has(file));
+      const survivors = (tracked.get(root) ?? 0) + files.length - drop.length;
+      removals.push(...survivors ? drop : drop.sort().slice(1));
+    }
+    if (removals.length) await this.run(["update-index", "--force-remove", "-z", "--stdin"], `${removals.join("\0")}\0`);
+  }
   /** Staging records a symlink as a link entry, and a nested repository that
    * appeared between the walk and the add as a gitlink. Neither can be
    * materialized on another host; both are dropped from the index without

package/dist/types/runtime/workspace/outer.d.ts

@@ -75,6 +75,15 @@ export declare class OuterRepository {
         allowLargeDiff?: boolean;
         limitBytes?: number;
     }): Promise<OuterSnapshot>;
+    /** Under a checkout the outer tree holds exactly what the checkout tracks plus
+     * what it shows as untracked-and-not-ignored. Staging never drops a tracked
+     * file that has since become ignored — npm's cache, published by a cycle that
+     * raced `npm install` while it was still under the limit, then excluded by a
+     * restored `.gitignore` — so such files are removed from the index here. The
+     * working tree is untouched; a fixed ignore file simply cleans what was
+     * published. The seeding invariant holds: a checkout never loses its last
+     * outer entry. */
+    private evictIgnored;
     /** Staging records a symlink as a link entry, and a nested repository that
      * appeared between the walk and the add as a gitlink. Neither can be
      * materialized on another host; both are dropped from the index without

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.165",
+  "version": "0.0.166",
   "type": "module",
   "main": "./dist/mjs/main.mjs",
   "module": "./dist/mjs/main.mjs",
@@ -21,7 +21,7 @@
     "r5d-worker": "dist/mjs/main.mjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.165",
+    "@ricsam/r5d-api": "^0.0.166",
     "node-pty": "1.1.0",
     "zod": "^4.1.13",
     "picomatch": "^4.0.3"