toolroll 0.9.59 → 0.9.61

package/dist/worktree.js

@@ -23,7 +23,7 @@
  * over `.git` internals corrupts both.
  */
 import { createHash, randomBytes } from "node:crypto";
-import { existsSync, readFileSync, writeFileSync, rmSync, realpathSync, mkdirSync, readdirSync } from "node:fs";
+import { existsSync, readFileSync, writeFileSync, rmSync, realpathSync, mkdirSync, readdirSync, renameSync } from "node:fs";
 import { hostname } from "node:os";
 import { dirname, join } from "node:path";
 import { run } from "./exec.js";
@@ -42,6 +42,61 @@ import { markNeverIndex } from "./never-index.js";
 export const MARKER = ".standing-orders-lease";
 /** Checkouts this process is leasing or removing right now: a lease and storage retention never overlap on one. */
 const busy = new Map();
+// Outside the checkout so removal cannot erase the reservation before git and the row update finish.
+const reservationPath = (path) => `${path}.occupancy`;
+function reservation(path) {
+    try {
+        const note = JSON.parse(readFileSync(reservationPath(path), "utf8"));
+        if (Number.isSafeInteger(note.pid) && note.pid > 0 && typeof note.host === "string" && typeof note.token === "string")
+            return note;
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return null;
+    }
+    // An unreadable reservation is occupied, never a reason to delete someone's checkout.
+    return { pid: 0, host: "unknown", bootId: null, token: "unknown" };
+}
+function reservationAlive(note) {
+    if (note.pid === 0 || note.host !== hostname())
+        return true;
+    if (note.bootId !== null && provenDeadByBootChange(note))
+        return false;
+    try {
+        process.kill(note.pid, 0);
+        return true;
+    }
+    catch (error) {
+        return error.code !== "ESRCH";
+    }
+}
+/** A short store transaction arbitrates marker creation/recovery, never git, a scan or deletion.
+ * Atomic rename publishes a complete owner; a crash cannot leave a half-written reservation. */
+function reserveCheckout(store, path) {
+    const note = { pid: process.pid, host: hostname(), bootId: currentBootId(), token: randomBytes(12).toString("hex") };
+    const file = reservationPath(path), temp = `${file}.${note.token}`;
+    const held = store.transact(() => {
+        const prior = reservation(path);
+        if (prior !== null && reservationAlive(prior))
+            return false;
+        try {
+            mkdirSync(dirname(path), { recursive: true });
+            writeFileSync(temp, JSON.stringify(note), { flag: "wx", mode: 0o600 });
+            renameSync(temp, file);
+            return true;
+        }
+        catch {
+            return false;
+        }
+        finally {
+            rmSync(temp, { force: true });
+        }
+    });
+    if (!held)
+        return null;
+    return () => store.transact(() => { if (reservation(path)?.token === note.token)
+        rmSync(file, { force: true }); });
+}
 /** What a kept checkout drops once its run ends (only where .gitignore hides it): dependencies and build output. */
 export const SLIM_NAMES = ["node_modules", "dist", "build", "out", ".next", ".nuxt", ".svelte-kit", ".turbo", ".parcel-cache", "coverage", "target"];
 /** Creating a worktree copies a tree; it is local work but not instant. */
@@ -94,6 +149,9 @@ export function recordWorktreeProcess(store, path, runner, pid, leaseEpoch) {
 }
 /** Read-only occupancy witness shared with stop settlement. */
 export function worktreeProcessOccupancy(path) {
+    const reserved = reservation(path);
+    if (reserved !== null && (reserved.pid !== process.pid || reserved.host !== hostname()) && reservationAlive(reserved))
+        return { held: true, by: reserved.pid };
     const note = join(path, MARKER);
     if (!existsSync(note))
         return { held: false };
@@ -176,6 +234,8 @@ export class WorktreePool {
     store;
     options;
     runner;
+    /** Carried to the independent storage sweep process. */
+    get root() { return this.options.root; }
     constructor(store, options) {
         this.store = store;
         this.options = options;
@@ -237,17 +297,18 @@ export class WorktreePool {
     }
     async lease(request) {
         const target = worktreePath(this.options.root, request.repo, request.branch);
-        if (busy.get(target) === "removing")
-            return { ok: false, reason: "in-use", message: `${target} is being removed; try again in a moment` };
-        const mine = !busy.has(target);
-        if (mine)
-            busy.set(target, "leasing");
+        if (busy.has(target))
+            return { ok: false, reason: "in-use", message: `${target} is busy; try again in a moment` };
+        const release = reserveCheckout(this.store, target);
+        if (release === null)
+            return { ok: false, reason: "in-use", message: `${target} is busy; try again in a moment` };
+        busy.set(target, "leasing");
         try {
             return await this.leaseNow(request);
         }
         finally {
-            if (mine)
-                busy.delete(target);
+            release();
+            busy.delete(target);
         }
     }
     async leaseNow(request) {
@@ -688,7 +749,10 @@ export class WorktreePool {
         for (const row of rows) {
             if (removed.length >= max)
                 break;
-            if (row.releasedAt === null || row.runner !== null || busy.has(row.path) || !wanted(row, false))
+            if (row.releasedAt === null || row.runner !== null || busy.has(row.path))
+                continue;
+            const selected = wanted(row, false);
+            if (!(typeof selected === "boolean" ? selected : await selected))
                 continue;
             if (!existsSync(row.path) || !idle(row, row.releasedAt))
                 continue;
@@ -699,11 +763,18 @@ export class WorktreePool {
             }
             if (busy.has(row.path))
                 continue;
+            const release = reserveCheckout(this.store, row.path);
+            if (release === null)
+                continue;
             busy.set(row.path, "removing");
             try {
                 // A lease, or a task coming back, since the listing wins: look again right before removing.
                 const now = this.store.getWorktree(row.path);
-                if (!idle(now, row.releasedAt) || !wanted(now, true))
+                if (!idle(now, row.releasedAt))
+                    continue;
+                // Landed cleanup rechecks Git here; existing synchronous guards keep their synchronous path.
+                const allowed = wanted(now, true);
+                if (!(typeof allowed === "boolean" ? allowed : await allowed))
                     continue;
                 const gone = await this.removeWorkingCopy(row);
                 if (!gone) {
@@ -713,6 +784,7 @@ export class WorktreePool {
                 removed.push(row);
             }
             finally {
+                release();
                 busy.delete(row.path);
             }
         }
@@ -735,6 +807,9 @@ export class WorktreePool {
             .filter(one => { const name = one.split("/").at(-1); return SLIM_NAMES.includes(name) && (deps || name !== "node_modules"); });
         if (drop.length === 0)
             return { ok: true, dropped: [], bytes: 0 };
+        const release = reserveCheckout(this.store, row.path);
+        if (release === null)
+            return { ok: false, message: `${row.path} is in use` };
         busy.set(row.path, "removing");
         const note = join(row.path, MARKER);
         let held = false;
@@ -759,6 +834,7 @@ export class WorktreePool {
         finally {
             if (held)
                 rmSync(note, { force: true });
+            release();
             busy.delete(row.path);
         }
     }
@@ -775,8 +851,14 @@ export class WorktreePool {
         const occupied = this.inUse(path);
         if (occupied.held)
             return { ok: false, message: `${path} is being used by process ${occupied.by} — it can't be discarded now` };
+        const release = reserveCheckout(this.store, path);
+        if (release === null)
+            return { ok: false, message: `${path} is in use` };
         busy.set(path, "removing");
         try {
+            const fresh = this.store.getWorktree(path);
+            if (fresh === null || fresh.runner !== null || fresh.releasedAt !== row.releasedAt || this.inUse(path).held)
+                return { ok: false, message: `${path} is in use` };
             if (!existsSync(path)) {
                 this.store.transact(() => { const still = this.store.getWorktree(path); if (still !== null && still.runner === null && still.releasedAt === row.releasedAt)
                     this.store.forgetWorktree(path); });
@@ -785,6 +867,7 @@ export class WorktreePool {
             return (await this.removeWorkingCopy(row)) ? { ok: true, row } : { ok: false, message: `git would not remove ${path}` };
         }
         finally {
+            release();
             busy.delete(path);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolroll",
-  "version": "0.9.59",
+  "version": "0.9.61",
   "description": "A control plane for unattended coding agents — queue tasks, walk away, come back to pull requests. Agents build in leased worktrees, never touch your default branch, and interrupt you only for decisions that need a human.",
   "directories": {
     "doc": "docs"
@@ -62,16 +62,36 @@
     "node": ">=22.13.0"
   },
   "devDependencies": {
+    "@radix-ui/react-collapsible": "1.1.20",
+    "@radix-ui/react-dialog": "1.1.23",
+    "@radix-ui/react-dropdown-menu": "2.1.24",
+    "@radix-ui/react-label": "2.1.15",
+    "@radix-ui/react-radio-group": "1.4.7",
+    "@radix-ui/react-select": "2.3.7",
+    "@radix-ui/react-separator": "1.1.15",
+    "@radix-ui/react-slot": "1.3.3",
+    "@radix-ui/react-switch": "1.3.7",
+    "@radix-ui/react-tabs": "1.1.21",
+    "@radix-ui/react-tooltip": "1.2.16",
     "@tailwindcss/cli": "4.3.3",
     "@types/mailparser": "3.9.0",
     "@types/node": "26.6.4",
     "@types/react": "19.3.0",
     "@types/react-dom": "19.3.0",
+    "@xyflow/react": "12.12.0",
+    "class-variance-authority": "0.7.1",
+    "clsx": "2.1.1",
     "esbuild": "0.28.2",
     "happy-dom": "20.14.5",
+    "lucide-react": "1.52.0",
+    "react": "19.3.0",
+    "react-dom": "19.3.0",
+    "sonner": "2.0.8",
+    "tailwind-merge": "3.7.0",
     "tailwindcss": "4.3.3",
     "tsx": "4.23.15",
     "typescript": "7.0.2",
+    "use-stick-to-bottom": "1.1.6",
     "vitest": "4.1.11"
   },
   "files": [
@@ -96,32 +116,12 @@
     }
   },
   "dependencies": {
-    "@radix-ui/react-collapsible": "1.1.20",
-    "@radix-ui/react-dialog": "1.1.23",
-    "@radix-ui/react-dropdown-menu": "2.1.24",
-    "@radix-ui/react-label": "2.1.15",
-    "@radix-ui/react-radio-group": "1.4.7",
-    "@radix-ui/react-select": "2.3.7",
-    "@radix-ui/react-separator": "1.1.15",
-    "@radix-ui/react-slot": "1.3.3",
-    "@radix-ui/react-switch": "1.3.7",
-    "@radix-ui/react-tabs": "1.1.21",
-    "@radix-ui/react-tooltip": "1.2.16",
     "@slack/socket-mode": "3.1.0",
-    "@xyflow/react": "12.12.0",
-    "class-variance-authority": "0.7.1",
-    "clsx": "2.1.1",
     "discord.js": "14.27.0",
     "imapflow": "2.2.5",
-    "lucide-react": "1.52.0",
     "mailparser": "3.9.36",
     "nodemailer": "10.0.15",
-    "react": "19.3.0",
-    "react-dom": "19.3.0",
-    "sonner": "2.0.8",
-    "tailwind-merge": "3.7.0",
     "typescript-parser": "npm:typescript@6.0.3",
-    "use-stick-to-bottom": "1.1.6",
     "yaml": "2.9.1",
     "zod": "^4.6.5"
   }