@akanjs/devkit 3.0.0-alpha.111 → 3.0.0-alpha.113

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "3.0.0-alpha.111",
+  "version": "3.0.0-alpha.113",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -44,7 +44,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "3.0.0-alpha.111",
+    "akanjs": "3.0.0-alpha.113",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "dayjs": "^1.11.20",

package/subspace.test.ts

@@ -202,6 +202,21 @@ describe("Subspace push", () => {
     expect(manifest.akan.source.hash).toMatch(/^[0-9a-f]{32}$/);
   });
 
+  test("ships a library file the workspace deleted, instead of reading it off the clone's stale index", async () => {
+    const { wsRoot, bareRoot, workRoot, subspace } = await makeMirror("moved-served", "moved-private", "moved-kit");
+    expect((await subspace.push("develop", { verify: false })).outcome).toBe("pushed");
+
+    await rm(path.join(wsRoot, "libs/moved-kit/common/helper.ts"));
+    await write(path.join(wsRoot, "libs/moved-kit/common/renamed.ts"), "export const helper = 1;\n");
+    await git(wsRoot, ["add", "-A"]);
+    await git(wsRoot, ["commit", "--quiet", "-m", "move the helper"]);
+
+    expect((await subspace.push("develop", { verify: false })).outcome).toBe("pushed");
+    const subspaceRoot = await cloneSubspace(workRoot, bareRoot, "moved-check");
+    expect(await FileSys.fileExists(path.join(subspaceRoot, "libs/moved-kit/common/helper.ts"))).toBe(false);
+    expect(await FileSys.fileExists(path.join(subspaceRoot, "libs/moved-kit/common/renamed.ts"))).toBe(true);
+  });
+
   test("is idempotent — a second push with no workspace change is skipped", async () => {
     const { subspace } = await makeMirror("idem-served", "idem-private", "idem-kit");
     expect((await subspace.push("develop", { verify: false })).outcome).toBe("pushed");

package/subspace.ts

@@ -232,7 +232,7 @@ export class Subspace {
     }
     const clone = new Executor(`subspace-${this.name}`, this.#clonePath);
     await clone.spawn("git", ["fetch", "--quiet", "origin", branch]);
-    await clone.spawn("git", ["checkout", "--quiet", "-B", branch, `origin/${branch}`]);
+    await clone.spawn("git", ["checkout", "--quiet", "-f", "-B", branch, `origin/${branch}`]);
     await clone.spawn("git", ["clean", "-qfd"]);
     return clone;
   }
@@ -462,10 +462,17 @@ export class Subspace {
       "--",
       `libs/${lib}`,
     ]);
-    const files = listed
+    const candidates = listed
       .split("\0")
       .filter((file) => !!file && !this.#isSubspaceOwned(file))
       .sort();
+    //* `--cached` reads the clone's index, which the slice replaced the members without updating — so it still
+    //* names every file the workspace has deleted or moved since the last push, and opening one throws. The
+    //* index is only reconciled by the `git add -A` a push commits with, long after the stamp is written.
+    const present = await Promise.all(
+      candidates.map(async (file) => await FileSys.entryExists(path.join(this.#clonePath, file))),
+    );
+    const files = candidates.filter((_, index) => present[index]);
     const hasher = new Bun.CryptoHasher("sha256");
     for (const file of files) {
       const content = await FileSys.readText(path.join(this.#clonePath, file));