@ricsam/r5d-worker 0.0.75 → 0.0.76

package/dist/cjs/main.cjs

@@ -2290,6 +2290,15 @@ async function startWorker(options) {
 `);
   process.stdout.write(`[r5d-worker] server: ${baseUrl}
 `);
+  const snapshotCleanup = (0, import_project_worktrees.cleanupStaleProjectWorktreeSnapshots)();
+  if (snapshotCleanup.removed.length > 0) {
+    process.stdout.write(`[r5d-worker] removed ${snapshotCleanup.removed.length} stale project snapshot(s)
+`);
+  }
+  for (const failure of snapshotCleanup.failed) {
+    process.stderr.write(`[r5d-worker] failed to remove stale project snapshot ${failure.path}: ${failure.error}
+`);
+  }
   runGit(["--version"]);
   await verifyR5dctlAuth(baseUrl, token);
   import_node_fs.default.mkdirSync(projectsRoot, { recursive: true });

package/dist/cjs/package.json

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

package/dist/cjs/project-worktrees.cjs

@@ -28,6 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var project_worktrees_exports = {};
 __export(project_worktrees_exports, {
+  PROJECT_WORKTREE_SNAPSHOT_PREFIX: () => PROJECT_WORKTREE_SNAPSHOT_PREFIX,
+  cleanupStaleProjectWorktreeSnapshots: () => cleanupStaleProjectWorktreeSnapshots,
   createLinkedProjectBranch: () => createLinkedProjectBranch,
   deleteLinkedProjectBranch: () => deleteLinkedProjectBranch,
   deleteProjectMirrorBranch: () => deleteProjectMirrorBranch,
@@ -47,6 +49,10 @@ var import_node_os = __toESM(require("node:os"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_managed_paths = require("./managed-paths.cjs");
 var import_working_tree_mirror = require("./working-tree-mirror.cjs");
+const PROJECT_WORKTREE_SNAPSHOT_PREFIX = "r5d-project-worktrees-";
+const PROJECT_WORKTREE_SNAPSHOT_NAME = new RegExp(
+  `^${PROJECT_WORKTREE_SNAPSHOT_PREFIX.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}([1-9]\\d*)-([A-Za-z0-9]{6})$`
+);
 function projectWorktreeConfigurationFingerprint(input) {
   return (0, import_node_crypto.createHash)("sha256").update(
     JSON.stringify({
@@ -167,17 +173,63 @@ function hasCompatibleLinkedProjectWorktreeLayout(input) {
     return kind === null || kind === "file" && commonGitDirectory(checkoutPath) === primaryCommonDir;
   });
 }
+function createProjectWorktreeSnapshotRoot() {
+  return import_node_fs.default.mkdtempSync(import_node_path.default.join(import_node_os.default.tmpdir(), `${PROJECT_WORKTREE_SNAPSHOT_PREFIX}${process.pid}-`));
+}
 function snapshotBranchTrees(projectRoot, branches) {
-  const root = import_node_fs.default.mkdtempSync(import_node_path.default.join(import_node_os.default.tmpdir(), "r5d-project-worktrees-"));
+  const root = createProjectWorktreeSnapshotRoot();
   const paths = /* @__PURE__ */ new Map();
-  for (const { branchName } of branches) {
-    const checkoutPath = branchPath(projectRoot, branchName);
-    if (!import_node_fs.default.existsSync(checkoutPath)) continue;
-    const snapshotPath = import_node_path.default.join(root, ...branchName.split("/"));
-    (0, import_working_tree_mirror.mirrorWorkingTree)({ sourceRoot: checkoutPath, targetRoot: snapshotPath, sourceMode: "all", deletionMode: "all" });
-    paths.set(branchName, snapshotPath);
+  try {
+    for (const { branchName } of branches) {
+      const checkoutPath = branchPath(projectRoot, branchName);
+      if (!import_node_fs.default.existsSync(checkoutPath)) continue;
+      const snapshotPath = import_node_path.default.join(root, ...branchName.split("/"));
+      (0, import_working_tree_mirror.mirrorWorkingTree)({ sourceRoot: checkoutPath, targetRoot: snapshotPath, sourceMode: "all", deletionMode: "all" });
+      paths.set(branchName, snapshotPath);
+    }
+    return { root, paths };
+  } catch (error) {
+    import_node_fs.default.rmSync(root, { recursive: true, force: true });
+    throw error;
+  }
+}
+function isProcessAlive(processId) {
+  try {
+    process.kill(processId, 0);
+    return true;
+  } catch (error) {
+    return error.code !== "ESRCH";
+  }
+}
+function cleanupStaleProjectWorktreeSnapshots(input = {}) {
+  const temporaryRoot = import_node_path.default.resolve(input.temporaryRoot ?? import_node_os.default.tmpdir());
+  const processAlive = input.processAlive ?? isProcessAlive;
+  const removed = [];
+  const failed = [];
+  let entries;
+  try {
+    entries = import_node_fs.default.readdirSync(temporaryRoot, { withFileTypes: true });
+  } catch (error) {
+    if (error.code === "ENOENT") return { removed, failed };
+    return { removed, failed: [{ path: temporaryRoot, error: error instanceof Error ? error.message : String(error) }] };
+  }
+  for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) {
+    const match = PROJECT_WORKTREE_SNAPSHOT_NAME.exec(entry.name);
+    if (!match) continue;
+    const ownerProcessId = Number(match[1]);
+    if (!Number.isSafeInteger(ownerProcessId) || processAlive(ownerProcessId)) continue;
+    const candidate = import_node_path.default.join(temporaryRoot, entry.name);
+    try {
+      const stat = import_node_fs.default.lstatSync(candidate);
+      if (!stat.isDirectory() || stat.isSymbolicLink()) continue;
+      import_node_fs.default.rmSync(candidate, { recursive: true, force: true });
+      removed.push(candidate);
+    } catch (error) {
+      if (error.code === "ENOENT") continue;
+      failed.push({ path: candidate, error: error instanceof Error ? error.message : String(error) });
+    }
   }
-  return { root, paths };
+  return { removed, failed };
 }
 function configureRepository(input) {
   if (tryGit(input.primaryPath, ["remote", "get-url", "origin"])) {
@@ -373,7 +425,7 @@ function createLinkedProjectBranch(input) {
   });
   if (overlappingWorktree) throw new Error(`Project branch folder overlaps linked worktree ${overlappingWorktree}`);
   const sourceHead = git(sourcePath, ["rev-parse", "HEAD"], "resolve source branch head");
-  const snapshotRoot = import_node_fs.default.mkdtempSync(import_node_path.default.join(import_node_os.default.tmpdir(), "r5d-project-branch-"));
+  const snapshotRoot = createProjectWorktreeSnapshotRoot();
   try {
     (0, import_working_tree_mirror.mirrorWorkingTree)({ sourceRoot: sourcePath, targetRoot: snapshotRoot, sourceMode: "git", deletionMode: "all" });
     git(sourcePath, ["branch", input.branchName, sourceHead], `create project branch ${input.branchName}`);
@@ -491,6 +543,8 @@ const projectWorktreesTestHarness = {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PROJECT_WORKTREE_SNAPSHOT_PREFIX,
+  cleanupStaleProjectWorktreeSnapshots,
   createLinkedProjectBranch,
   deleteLinkedProjectBranch,
   deleteProjectMirrorBranch,

package/dist/mjs/main.mjs

@@ -26,6 +26,7 @@ import {
 } from "./supervisor.mjs";
 import { managedProjectRoot, validateManagedBranchName } from "./managed-paths.mjs";
 import {
+  cleanupStaleProjectWorktreeSnapshots,
   createLinkedProjectBranch,
   deleteLinkedProjectBranch,
   deleteProjectMirrorBranch,
@@ -2266,6 +2267,15 @@ async function startWorker(options) {
 `);
   process.stdout.write(`[r5d-worker] server: ${baseUrl}
 `);
+  const snapshotCleanup = cleanupStaleProjectWorktreeSnapshots();
+  if (snapshotCleanup.removed.length > 0) {
+    process.stdout.write(`[r5d-worker] removed ${snapshotCleanup.removed.length} stale project snapshot(s)
+`);
+  }
+  for (const failure of snapshotCleanup.failed) {
+    process.stderr.write(`[r5d-worker] failed to remove stale project snapshot ${failure.path}: ${failure.error}
+`);
+  }
   runGit(["--version"]);
   await verifyR5dctlAuth(baseUrl, token);
   fs.mkdirSync(projectsRoot, { recursive: true });

package/dist/mjs/package.json

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

package/dist/mjs/project-worktrees.mjs

@@ -4,6 +4,10 @@ import os from "node:os";
 import path from "node:path";
 import { validateManagedBranchName } from "./managed-paths.mjs";
 import { mirrorWorkingTree } from "./working-tree-mirror.mjs";
+const PROJECT_WORKTREE_SNAPSHOT_PREFIX = "r5d-project-worktrees-";
+const PROJECT_WORKTREE_SNAPSHOT_NAME = new RegExp(
+  `^${PROJECT_WORKTREE_SNAPSHOT_PREFIX.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}([1-9]\\d*)-([A-Za-z0-9]{6})$`
+);
 function projectWorktreeConfigurationFingerprint(input) {
   return createHash("sha256").update(
     JSON.stringify({
@@ -124,17 +128,63 @@ function hasCompatibleLinkedProjectWorktreeLayout(input) {
     return kind === null || kind === "file" && commonGitDirectory(checkoutPath) === primaryCommonDir;
   });
 }
+function createProjectWorktreeSnapshotRoot() {
+  return fs.mkdtempSync(path.join(os.tmpdir(), `${PROJECT_WORKTREE_SNAPSHOT_PREFIX}${process.pid}-`));
+}
 function snapshotBranchTrees(projectRoot, branches) {
-  const root = fs.mkdtempSync(path.join(os.tmpdir(), "r5d-project-worktrees-"));
+  const root = createProjectWorktreeSnapshotRoot();
   const paths = /* @__PURE__ */ new Map();
-  for (const { branchName } of branches) {
-    const checkoutPath = branchPath(projectRoot, branchName);
-    if (!fs.existsSync(checkoutPath)) continue;
-    const snapshotPath = path.join(root, ...branchName.split("/"));
-    mirrorWorkingTree({ sourceRoot: checkoutPath, targetRoot: snapshotPath, sourceMode: "all", deletionMode: "all" });
-    paths.set(branchName, snapshotPath);
+  try {
+    for (const { branchName } of branches) {
+      const checkoutPath = branchPath(projectRoot, branchName);
+      if (!fs.existsSync(checkoutPath)) continue;
+      const snapshotPath = path.join(root, ...branchName.split("/"));
+      mirrorWorkingTree({ sourceRoot: checkoutPath, targetRoot: snapshotPath, sourceMode: "all", deletionMode: "all" });
+      paths.set(branchName, snapshotPath);
+    }
+    return { root, paths };
+  } catch (error) {
+    fs.rmSync(root, { recursive: true, force: true });
+    throw error;
+  }
+}
+function isProcessAlive(processId) {
+  try {
+    process.kill(processId, 0);
+    return true;
+  } catch (error) {
+    return error.code !== "ESRCH";
+  }
+}
+function cleanupStaleProjectWorktreeSnapshots(input = {}) {
+  const temporaryRoot = path.resolve(input.temporaryRoot ?? os.tmpdir());
+  const processAlive = input.processAlive ?? isProcessAlive;
+  const removed = [];
+  const failed = [];
+  let entries;
+  try {
+    entries = fs.readdirSync(temporaryRoot, { withFileTypes: true });
+  } catch (error) {
+    if (error.code === "ENOENT") return { removed, failed };
+    return { removed, failed: [{ path: temporaryRoot, error: error instanceof Error ? error.message : String(error) }] };
+  }
+  for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) {
+    const match = PROJECT_WORKTREE_SNAPSHOT_NAME.exec(entry.name);
+    if (!match) continue;
+    const ownerProcessId = Number(match[1]);
+    if (!Number.isSafeInteger(ownerProcessId) || processAlive(ownerProcessId)) continue;
+    const candidate = path.join(temporaryRoot, entry.name);
+    try {
+      const stat = fs.lstatSync(candidate);
+      if (!stat.isDirectory() || stat.isSymbolicLink()) continue;
+      fs.rmSync(candidate, { recursive: true, force: true });
+      removed.push(candidate);
+    } catch (error) {
+      if (error.code === "ENOENT") continue;
+      failed.push({ path: candidate, error: error instanceof Error ? error.message : String(error) });
+    }
   }
-  return { root, paths };
+  return { removed, failed };
 }
 function configureRepository(input) {
   if (tryGit(input.primaryPath, ["remote", "get-url", "origin"])) {
@@ -330,7 +380,7 @@ function createLinkedProjectBranch(input) {
   });
   if (overlappingWorktree) throw new Error(`Project branch folder overlaps linked worktree ${overlappingWorktree}`);
   const sourceHead = git(sourcePath, ["rev-parse", "HEAD"], "resolve source branch head");
-  const snapshotRoot = fs.mkdtempSync(path.join(os.tmpdir(), "r5d-project-branch-"));
+  const snapshotRoot = createProjectWorktreeSnapshotRoot();
   try {
     mirrorWorkingTree({ sourceRoot: sourcePath, targetRoot: snapshotRoot, sourceMode: "git", deletionMode: "all" });
     git(sourcePath, ["branch", input.branchName, sourceHead], `create project branch ${input.branchName}`);
@@ -447,6 +497,8 @@ const projectWorktreesTestHarness = {
   commandArgs: (args, auth) => ["git", ...NON_RECURSIVE_GIT_CONFIG, ...authArgs(auth), ...args]
 };
 export {
+  PROJECT_WORKTREE_SNAPSHOT_PREFIX,
+  cleanupStaleProjectWorktreeSnapshots,
   createLinkedProjectBranch,
   deleteLinkedProjectBranch,
   deleteProjectMirrorBranch,

package/dist/types/project-worktrees.d.ts

@@ -1,3 +1,4 @@
+export declare const PROJECT_WORKTREE_SNAPSHOT_PREFIX = "r5d-project-worktrees-";
 export type GitHttpAuth = {
     extraHeaderUrl: string;
     header: string;
@@ -32,6 +33,16 @@ export declare function hasLinkedProjectWorktreeLayout(input: {
     primaryBranchName: string;
     branches: readonly Pick<ProjectWorktreeBranch, "branchName">[];
 }): boolean;
+export declare function cleanupStaleProjectWorktreeSnapshots(input?: {
+    temporaryRoot?: string;
+    processAlive?: (processId: number) => boolean;
+}): {
+    removed: string[];
+    failed: Array<{
+        path: string;
+        error: string;
+    }>;
+};
 export declare function ensureProjectWorktrees(input: {
     projectRoot: string;
     primaryBranchName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.75",
+  "version": "0.0.76",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",