@inixiative/config 0.5.81 → 0.5.83

package/README.md

@@ -85,7 +85,7 @@ Lanes stand alone. A lane with a package missing a checkout, or claimed by ambig
 Blessing is two-phase, so a dependent that needs work never deadlocks a release:
 
 1. **Candidate.** A published version is recorded under `candidates`, and the config release that ends the train carries it, so `check` in any repo's CI accepts it from then on.
-2. **Adopt.** A repo (lane checkout or consumer) whose check fails against the candidates it was moved onto doesn't stop the train. Its checkout is put back as it was, and the train opens `train/adopt-<pkg>-<version>` in a worktree (with the repo's root `.env*` files copied in): the same bump and re-lock, then the repo's `train:adopt` script if its package.json declares one (Foundry's re-records cassettes with `bun run test:live`), all committed, and re-locked onto the new config release so the PR's CI judges it against the candidates. A lane checkout that adopts publishes nothing this run. A consumer that passes against candidates gets the same branch name: its default branch is still on the previous versions until the branch merges. If the adoption's commit is refused (its hooks typecheck), the branch is deleted and the summary says to adopt by hand.
+2. **Adopt.** A repo (lane checkout or consumer) whose check fails against the candidates it was moved onto doesn't stop the train. Its checkout is put back as it was, and the train opens `train/adopt-<pkg>-<version>` in a worktree (the repo's own `worktree:create <base> <branch>` when it declares one, so a template-based repo gets its slot's databases, released with its `worktree:destroy`; otherwise a temporary linked worktree; either way with the repo's ignored `.env*` files copied in where missing): the same bump and re-lock, then the repo's `train:adopt` script if its package.json declares one (Foundry's re-records cassettes with `bun run test:live`), all committed, and re-locked onto the new config release so the PR's CI judges it against the candidates. A lane checkout that adopts publishes nothing this run. A consumer that passes against candidates gets the same branch name: its default branch is still on the previous versions until the branch merges. If the adoption's commit is refused (its hooks typecheck), the branch is deleted and the summary says to adopt by hand.
 3. **Promote.** At the end of each run a candidate is blessed (moved into its lane's section) unless something holds it: its lane stopped; a repo has an adoption branch for it that is not yet on its default branch (opened this run, unmerged, or committed but never pushed); or a repo that declares it was not walked to an outcome this run — another lane's checkout, a skipped or failed one, a consumer without a checkout. A later train finds a waiting adoption branch and opens nothing new; once it merges, the repo is on the candidate and the train promotes it. A candidate every dependent already accepts is blessed in the run that published it. An adoption PR closed without merging holds its candidates until its branch is deleted.
 
 The summary lists what was blessed, every candidate with what holds it, and each pending adoption branch with its PR when `gh` can find one.

package/dist/cli.js

@@ -2,7 +2,15 @@
 
 // src/cli.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync2, mkdtempSync, readdirSync as readdirSync2, readFileSync as readFileSync2, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
+import {
+  existsSync as existsSync2,
+  mkdirSync as mkdirSync2,
+  mkdtempSync,
+  readdirSync as readdirSync2,
+  readFileSync as readFileSync2,
+  rmSync as rmSync2,
+  writeFileSync as writeFileSync2
+} from "fs";
 import { hostname as hostname2, tmpdir } from "os";
 import { basename, dirname as dirname2, join as join2, resolve as resolve2 } from "path";
 
@@ -1266,10 +1274,16 @@ if (command === "train") {
   const waiting = [];
   const walked = /* @__PURE__ */ new Set();
   const worktrees = [];
+  const removeWorktree = ({ repo, path, tooling }) => {
+    if (tooling) {
+      spawnSync2("bun", ["run", "worktree:destroy", basename(path), "--force"], {
+        cwd: repo,
+        stdio: "inherit"
+      });
+    } else git(repo, "worktree", "remove", "--force", path);
+  };
   process.on("exit", () => {
-    for (const { repo, path } of worktrees.splice(0)) {
-      git(repo, "worktree", "remove", "--force", path);
-    }
+    for (const entry of worktrees.splice(0)) removeWorktree(entry);
   });
   const target = () => adoptionTarget(manifest);
   const ready = (checkout) => {
@@ -1337,7 +1351,8 @@ if (command === "train") {
     };
   };
   const relockAndCheck = (checkout, check = true) => effect(`re-lock ${checkout.name}${check ? " and run its check" : ""}`, void 0, () => {
-    if (spawnSync2("bun", ["install"], { cwd: checkout.dir, stdio: "inherit" }).status !== 0) {
+    const install = (...flags) => spawnSync2("bun", ["install", ...flags], { cwd: checkout.dir, stdio: "inherit" }).status === 0;
+    if (!install() && !install("--no-cache")) {
       throw new Abort(`bun install failed in ${checkout.name}`);
     }
     for (const { cwd, names } of staleUpdates(
@@ -1384,15 +1399,29 @@ if (command === "train") {
     return true;
   };
   const worktree = (checkout, branch) => {
-    const path = join2(mkdtempSync(join2(tmpdir(), "inixiative-train-")), basename(checkout.dir));
-    if (git(checkout.dir, "worktree", "add", "--quiet", "-b", branch, path, "HEAD").status !== 0) {
-      throw new Abort(`could not create ${branch} in ${checkout.name}`);
-    }
-    worktrees.push({ repo: checkout.dir, path });
-    for (const name of readdirSync2(checkout.dir)) {
-      if (/^\.env(\..+)?$/.test(name) && !existsSync2(join2(path, name))) {
-        writeFileSync2(join2(path, name), readFileSync2(join2(checkout.dir, name)));
-      }
+    const tooling = !!checkout.pkg.scripts?.["worktree:create"];
+    const path = tooling ? join2(checkout.dir, ".worktrees", branch.replaceAll("/", "-")) : join2(mkdtempSync(join2(tmpdir(), "inixiative-train-")), basename(checkout.dir));
+    const created = tooling ? spawnSync2("bun", ["run", "worktree:create", defaultBranch(checkout.dir), branch], {
+      cwd: checkout.dir,
+      stdio: "inherit"
+    }).status === 0 && existsSync2(path) : git(checkout.dir, "worktree", "add", "--quiet", "-b", branch, path, "HEAD").status === 0;
+    if (!created) throw new Abort(`could not create ${branch} in ${checkout.name}`);
+    worktrees.push({ repo: checkout.dir, path, tooling });
+    const envFiles = git(
+      checkout.dir,
+      "ls-files",
+      "--others",
+      "--ignored",
+      "--exclude-standard",
+      "--",
+      ":(glob)**/.env*"
+    ).stdout.split("\n").filter(
+      (file) => /(^|\/)\.env[^/]*$/.test(file) && !/(^|\/)(node_modules|\.worktrees)\//.test(file)
+    );
+    for (const file of envFiles) {
+      if (existsSync2(join2(path, file))) continue;
+      mkdirSync2(dirname2(join2(path, file)), { recursive: true });
+      writeFileSync2(join2(path, file), readFileSync2(join2(checkout.dir, file)));
     }
     return { ...checkout, dir: path };
   };
@@ -1401,7 +1430,7 @@ if (command === "train") {
       (tree) => tree.repo === checkout.dir && currentBranch(tree.path) === branch
     );
     if (entry) {
-      git(checkout.dir, "worktree", "remove", "--force", entry.path);
+      removeWorktree(entry);
       worktrees.splice(worktrees.indexOf(entry), 1);
     }
     git(checkout.dir, "branch", "-D", branch);
@@ -1425,6 +1454,7 @@ if (command === "train") {
           relockAndCheck(branchCheckout, false);
           const message = moving.length > 0 ? `chore: adopt ${moving.map((name) => `${name}@${manifest.candidates?.[name]}`).join(", ")}` : void 0;
           if (!commitOwned(branchCheckout, packagePaths, true, message)) {
+            console.log(`\u2713 nothing to commit for ${checkout.name} after its re-lock`);
             dropBranch(checkout, branch);
             return false;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inixiative/config",
-  "version": "0.5.81",
+  "version": "0.5.83",
   "description": "Shared toolchain for the inixiative ecosystem: tsconfig/biome/tsup presets, a version manifest (BOM), and a sync/check CLI",
   "type": "module",
   "license": "MIT",

package/versions.json

@@ -13,7 +13,7 @@
     "@types/bun"
   ],
   "ecosystem": {
-    "@inixiative/config": "0.5.81",
+    "@inixiative/config": "0.5.83",
     "@inixiative/json-rules": "3.5.4",
     "@inixiative/permissions": "0.4.0",
     "@inixiative/transitions": "0.5.0",
@@ -24,8 +24,8 @@
   },
   "agentic": {
     "@inixiative/signet": "0.4.0",
-    "@inixiative/archive": "0.18.0",
-    "@inixiative/agent-session": "0.6.3",
+    "@inixiative/archive": "0.19.0",
+    "@inixiative/agent-session": "0.6.4",
     "@inixiative/foundry-core": "0.5.1",
     "@inixiative/foundry": "0.5.3",
     "@inixiative/foundry-acp": "0.1.1"
@@ -48,8 +48,5 @@
         "agentic"
       ]
     }
-  },
-  "candidates": {
-    "@inixiative/archive": "0.19.0"
   }
 }