@ricsam/r5d-worker 0.0.15 → 0.0.16

package/dist/cjs/main.cjs

@@ -58,7 +58,7 @@ const LEGACY_BUILD_IT_NOW_REMOTE_NAME = "build-it-now";
 const activeProcesses = /* @__PURE__ */ new Map();
 const cancelledProcessRuns = /* @__PURE__ */ new Set();
 const activePtys = /* @__PURE__ */ new Map();
-const branchLocks = /* @__PURE__ */ new Map();
+let currentWorkerSocket = null;
 let containerRegistryCredential = null;
 let visibleGitIdentity = null;
 function defaultConfigPath() {
@@ -690,31 +690,6 @@ function resolveProjectFilePath(branchPath, virtualPath) {
   assertInsideBranch(branchPath, absolutePath);
   return { absolutePath, virtualPath: repoRelativePath ? `/${repoRelativePath}` : "/", repoRelativePath };
 }
-function branchLockKey(projectId, branchName) {
-  return `${projectId}:${branchName}`;
-}
-async function withBranchLock(projectId, branchName, fn) {
-  const key = branchLockKey(projectId, branchName);
-  const previous = branchLocks.get(key) ?? Promise.resolve();
-  let release = () => {
-  };
-  const next = new Promise((resolve) => {
-    release = resolve;
-  });
-  const queued = previous.catch(() => {
-  }).then(() => next);
-  branchLocks.set(key, queued);
-  await previous.catch(() => {
-  });
-  try {
-    return await fn();
-  } finally {
-    release();
-    if (branchLocks.get(key) === queued) {
-      branchLocks.delete(key);
-    }
-  }
-}
 function resolveRemoteUrl(baseUrl, remoteUrl) {
   if (/^https?:\/\//i.test(remoteUrl)) {
     return remoteUrl;
@@ -1660,7 +1635,16 @@ async function executeCommand(input) {
         ...planProcessEnv
       }
     });
-    activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
+    activeProcesses.set(input.message.runId, {
+      process: subprocess,
+      projectId: input.projectId,
+      sessionId: input.message.sessionId ?? "",
+      branchName: input.message.branchName,
+      argv: input.message.argv,
+      command: input.message.argv.join(" "),
+      cwd: input.message.cwd,
+      startedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
     if (input.message.timeoutMs) {
       timeout = setTimeout(() => {
         subprocess.kill("SIGTERM");
@@ -1698,9 +1682,7 @@ async function executeCommand(input) {
 }
 async function executeStreamingCommand(input) {
   const startedAt = Date.now();
-  let timeout;
   let started = false;
-  let timedOut = false;
   try {
     if (cancelledProcessRuns.delete(input.message.runId)) {
       sendWorkerMessage(input.ws, {
@@ -1750,19 +1732,22 @@ async function executeStreamingCommand(input) {
         ...planProcessEnv
       }
     });
-    activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
+    activeProcesses.set(input.message.runId, {
+      process: subprocess,
+      projectId: input.projectId,
+      sessionId: input.message.sessionId,
+      branchName: input.message.branchName,
+      argv: input.message.argv,
+      command: input.message.command,
+      cwd: input.message.cwd,
+      startedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
     started = true;
     sendWorkerMessage(input.ws, {
       type: "exec_started",
       requestId: input.message.requestId,
       runId: input.message.runId
     });
-    if (input.message.timeoutMs) {
-      timeout = setTimeout(() => {
-        timedOut = true;
-        subprocess.kill("SIGTERM");
-      }, input.message.timeoutMs);
-    }
     const [exitCode] = await Promise.all([
       subprocess.exited,
       streamCommandOutput(subprocess.stdout, (data) => {
@@ -1786,8 +1771,7 @@ async function executeStreamingCommand(input) {
       type: "exec_exit",
       runId: input.message.runId,
       exitCode,
-      durationMs: Date.now() - startedAt,
-      ...timedOut ? { timedOut: true } : {}
+      durationMs: Date.now() - startedAt
     });
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -1807,15 +1791,36 @@ async function executeStreamingCommand(input) {
       });
     }
   } finally {
-    if (timeout) {
-      clearTimeout(timeout);
-    }
     activeProcesses.delete(input.message.runId);
     cancelledProcessRuns.delete(input.message.runId);
   }
 }
 function sendWorkerMessage(ws, message) {
-  ws.send(JSON.stringify(message));
+  const target = currentWorkerSocket ?? ws;
+  try {
+    target.send(JSON.stringify(message));
+  } catch (error) {
+    process.stderr.write(`[r5d-worker] failed to send ${message.type}: ${error instanceof Error ? error.message : String(error)}
+`);
+  }
+}
+function buildActiveProcessReports() {
+  return Array.from(activeProcesses.entries()).filter(([, active]) => active.sessionId.length > 0).map(([runId, active]) => ({
+    runId,
+    projectId: active.projectId,
+    sessionId: active.sessionId,
+    branchName: active.branchName,
+    argv: active.argv,
+    command: active.command,
+    ...active.cwd ? { cwd: active.cwd } : {},
+    startedAt: active.startedAt
+  }));
+}
+function sendActiveProcessReport(ws) {
+  sendWorkerMessage(ws, {
+    type: "active_processes",
+    processes: buildActiveProcessReports()
+  });
 }
 const PTY_BRIDGE_SCRIPT = String.raw`
 const readline = require("node:readline");
@@ -2158,6 +2163,7 @@ async function startWorker(options) {
     }
   });
   ws.addEventListener("open", () => {
+    currentWorkerSocket = ws;
     const hello = {
       type: "hello",
       hostInfo: {
@@ -2172,6 +2178,7 @@ async function startWorker(options) {
       }
     };
     ws.send(JSON.stringify(hello));
+    sendActiveProcessReport(ws);
     process.stdout.write("[r5d-worker] connected\n");
   });
   ws.addEventListener("message", (event) => {
@@ -2194,31 +2201,29 @@ async function startWorker(options) {
           const branches = project.branches.length > 0 ? project.branches : [project.defaultBranch || "main"];
           for (const branchName of branches) {
             try {
-              await withBranchLock(project.projectId, branchName, async () => {
-                ensureBranchWorkspace({
-                  projectId: project.projectId,
+              ensureBranchWorkspace({
+                projectId: project.projectId,
+                baseUrl,
+                token,
+                projectRoot,
+                syncRoot,
+                branchName,
+                manifest: project
+              });
+              try {
+                await syncProjectPlans({
                   baseUrl,
                   token,
-                  projectRoot,
-                  syncRoot,
+                  projectId: project.projectId,
                   branchName,
-                  manifest: project
+                  planRoot
                 });
-                try {
-                  await syncProjectPlans({
-                    baseUrl,
-                    token,
-                    projectId: project.projectId,
-                    branchName,
-                    planRoot
-                  });
-                } catch (error) {
-                  process.stderr.write(
-                    `[r5d-worker] plan sync skipped for ${project.projectId}/${branchName}: ${error instanceof Error ? error.message : String(error)}
+              } catch (error) {
+                process.stderr.write(
+                  `[r5d-worker] plan sync skipped for ${project.projectId}/${branchName}: ${error instanceof Error ? error.message : String(error)}
 `
-                  );
-                }
-              });
+                );
+              }
             } catch (error) {
               process.stderr.write(
                 `[r5d-worker] failed to sync ${project.repoSlug}/${branchName}: ${error instanceof Error ? error.message : String(error)}
@@ -2246,7 +2251,7 @@ async function startWorker(options) {
             requestId: message.requestId,
             runId: message.runId,
             cancelled: true,
-            message: active ? `Sent SIGTERM to ${active.command.join(" ")}` : "Cancellation queued before command start"
+            message: active ? `Sent SIGTERM to ${active.command}` : "Cancellation queued before command start"
           })
         );
         return;
@@ -2276,11 +2281,17 @@ async function startWorker(options) {
         const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
         process.stdout.write(`[r5d-worker] exec ${message.runId}: ${message.argv.join(" ")}
 `);
-        const result = await withBranchLock(
-          message.projectId,
-          message.branchName,
-          () => executeCommand({ message, projectId: message.projectId, baseUrl, token, projectRoot, syncRoot, artifactRoot, planRoot, manifest })
-        );
+        const result = await executeCommand({
+          message,
+          projectId: message.projectId,
+          baseUrl,
+          token,
+          projectRoot,
+          syncRoot,
+          artifactRoot,
+          planRoot,
+          manifest
+        });
         ws.send(JSON.stringify(result));
         return;
       }
@@ -2295,11 +2306,18 @@ async function startWorker(options) {
           const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
           process.stdout.write(`[r5d-worker] exec_start ${message.runId}: ${message.argv.join(" ")}
 `);
-          void withBranchLock(
-            message.projectId,
-            message.branchName,
-            () => executeStreamingCommand({ ws, message, projectId: message.projectId, baseUrl, token, projectRoot, syncRoot, artifactRoot, planRoot, manifest })
-          ).catch((error) => {
+          void executeStreamingCommand({
+            ws,
+            message,
+            projectId: message.projectId,
+            baseUrl,
+            token,
+            projectRoot,
+            syncRoot,
+            artifactRoot,
+            planRoot,
+            manifest
+          }).catch((error) => {
             sendWorkerMessage(ws, {
               type: "exec_start_error",
               requestId: message.requestId,
@@ -2321,11 +2339,16 @@ async function startWorker(options) {
         try {
           const manifest = manifestByProjectId.get(message.projectId);
           const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
-          const result = await withBranchLock(
-            message.projectId,
-            message.branchName,
-            () => executeOperation({ message, projectId: message.projectId, baseUrl, token, projectRoot, syncRoot, artifactRoot, manifest })
-          );
+          const result = await executeOperation({
+            message,
+            projectId: message.projectId,
+            baseUrl,
+            token,
+            projectRoot,
+            syncRoot,
+            artifactRoot,
+            manifest
+          });
           ws.send(
             JSON.stringify({
               type: "operation_result",
@@ -2360,10 +2383,31 @@ async function startWorker(options) {
     });
   });
   ws.addEventListener("close", (event) => {
+    if (currentWorkerSocket === ws) {
+      currentWorkerSocket = null;
+    }
     closeAllPtys();
     const reason = event.reason ? `: ${event.reason}` : "";
     process.stderr.write(`[r5d-worker] disconnected (${event.code}${reason})
 `);
+    if (activeProcesses.size > 0) {
+      const delayMs = 2e3;
+      process.stderr.write(`[r5d-worker] ${activeProcesses.size} process(es) still active; reconnecting in ${delayMs}ms
+`);
+      const reconnect = () => {
+        void startWorker(options).catch((error) => {
+          process.stderr.write(`[r5d-worker] reconnect failed: ${error instanceof Error ? error.message : String(error)}
+`);
+          if (activeProcesses.size > 0) {
+            setTimeout(reconnect, delayMs);
+            return;
+          }
+          process.exit(1);
+        });
+      };
+      setTimeout(reconnect, delayMs);
+      return;
+    }
     process.exit(event.code === 1e3 ? 0 : 1);
   });
   ws.addEventListener("error", (event) => {

package/dist/cjs/package.json

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

package/dist/mjs/main.mjs

@@ -18,7 +18,7 @@ const LEGACY_BUILD_IT_NOW_REMOTE_NAME = "build-it-now";
 const activeProcesses = /* @__PURE__ */ new Map();
 const cancelledProcessRuns = /* @__PURE__ */ new Set();
 const activePtys = /* @__PURE__ */ new Map();
-const branchLocks = /* @__PURE__ */ new Map();
+let currentWorkerSocket = null;
 let containerRegistryCredential = null;
 let visibleGitIdentity = null;
 function defaultConfigPath() {
@@ -650,31 +650,6 @@ function resolveProjectFilePath(branchPath, virtualPath) {
   assertInsideBranch(branchPath, absolutePath);
   return { absolutePath, virtualPath: repoRelativePath ? `/${repoRelativePath}` : "/", repoRelativePath };
 }
-function branchLockKey(projectId, branchName) {
-  return `${projectId}:${branchName}`;
-}
-async function withBranchLock(projectId, branchName, fn) {
-  const key = branchLockKey(projectId, branchName);
-  const previous = branchLocks.get(key) ?? Promise.resolve();
-  let release = () => {
-  };
-  const next = new Promise((resolve) => {
-    release = resolve;
-  });
-  const queued = previous.catch(() => {
-  }).then(() => next);
-  branchLocks.set(key, queued);
-  await previous.catch(() => {
-  });
-  try {
-    return await fn();
-  } finally {
-    release();
-    if (branchLocks.get(key) === queued) {
-      branchLocks.delete(key);
-    }
-  }
-}
 function resolveRemoteUrl(baseUrl, remoteUrl) {
   if (/^https?:\/\//i.test(remoteUrl)) {
     return remoteUrl;
@@ -1620,7 +1595,16 @@ async function executeCommand(input) {
         ...planProcessEnv
       }
     });
-    activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
+    activeProcesses.set(input.message.runId, {
+      process: subprocess,
+      projectId: input.projectId,
+      sessionId: input.message.sessionId ?? "",
+      branchName: input.message.branchName,
+      argv: input.message.argv,
+      command: input.message.argv.join(" "),
+      cwd: input.message.cwd,
+      startedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
     if (input.message.timeoutMs) {
       timeout = setTimeout(() => {
         subprocess.kill("SIGTERM");
@@ -1658,9 +1642,7 @@ async function executeCommand(input) {
 }
 async function executeStreamingCommand(input) {
   const startedAt = Date.now();
-  let timeout;
   let started = false;
-  let timedOut = false;
   try {
     if (cancelledProcessRuns.delete(input.message.runId)) {
       sendWorkerMessage(input.ws, {
@@ -1710,19 +1692,22 @@ async function executeStreamingCommand(input) {
         ...planProcessEnv
       }
     });
-    activeProcesses.set(input.message.runId, { process: subprocess, command: input.message.argv });
+    activeProcesses.set(input.message.runId, {
+      process: subprocess,
+      projectId: input.projectId,
+      sessionId: input.message.sessionId,
+      branchName: input.message.branchName,
+      argv: input.message.argv,
+      command: input.message.command,
+      cwd: input.message.cwd,
+      startedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
     started = true;
     sendWorkerMessage(input.ws, {
       type: "exec_started",
       requestId: input.message.requestId,
       runId: input.message.runId
     });
-    if (input.message.timeoutMs) {
-      timeout = setTimeout(() => {
-        timedOut = true;
-        subprocess.kill("SIGTERM");
-      }, input.message.timeoutMs);
-    }
     const [exitCode] = await Promise.all([
       subprocess.exited,
       streamCommandOutput(subprocess.stdout, (data) => {
@@ -1746,8 +1731,7 @@ async function executeStreamingCommand(input) {
       type: "exec_exit",
       runId: input.message.runId,
       exitCode,
-      durationMs: Date.now() - startedAt,
-      ...timedOut ? { timedOut: true } : {}
+      durationMs: Date.now() - startedAt
     });
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -1767,15 +1751,36 @@ async function executeStreamingCommand(input) {
       });
     }
   } finally {
-    if (timeout) {
-      clearTimeout(timeout);
-    }
     activeProcesses.delete(input.message.runId);
     cancelledProcessRuns.delete(input.message.runId);
   }
 }
 function sendWorkerMessage(ws, message) {
-  ws.send(JSON.stringify(message));
+  const target = currentWorkerSocket ?? ws;
+  try {
+    target.send(JSON.stringify(message));
+  } catch (error) {
+    process.stderr.write(`[r5d-worker] failed to send ${message.type}: ${error instanceof Error ? error.message : String(error)}
+`);
+  }
+}
+function buildActiveProcessReports() {
+  return Array.from(activeProcesses.entries()).filter(([, active]) => active.sessionId.length > 0).map(([runId, active]) => ({
+    runId,
+    projectId: active.projectId,
+    sessionId: active.sessionId,
+    branchName: active.branchName,
+    argv: active.argv,
+    command: active.command,
+    ...active.cwd ? { cwd: active.cwd } : {},
+    startedAt: active.startedAt
+  }));
+}
+function sendActiveProcessReport(ws) {
+  sendWorkerMessage(ws, {
+    type: "active_processes",
+    processes: buildActiveProcessReports()
+  });
 }
 const PTY_BRIDGE_SCRIPT = String.raw`
 const readline = require("node:readline");
@@ -2118,6 +2123,7 @@ async function startWorker(options) {
     }
   });
   ws.addEventListener("open", () => {
+    currentWorkerSocket = ws;
     const hello = {
       type: "hello",
       hostInfo: {
@@ -2132,6 +2138,7 @@ async function startWorker(options) {
       }
     };
     ws.send(JSON.stringify(hello));
+    sendActiveProcessReport(ws);
     process.stdout.write("[r5d-worker] connected\n");
   });
   ws.addEventListener("message", (event) => {
@@ -2154,31 +2161,29 @@ async function startWorker(options) {
           const branches = project.branches.length > 0 ? project.branches : [project.defaultBranch || "main"];
           for (const branchName of branches) {
             try {
-              await withBranchLock(project.projectId, branchName, async () => {
-                ensureBranchWorkspace({
-                  projectId: project.projectId,
+              ensureBranchWorkspace({
+                projectId: project.projectId,
+                baseUrl,
+                token,
+                projectRoot,
+                syncRoot,
+                branchName,
+                manifest: project
+              });
+              try {
+                await syncProjectPlans({
                   baseUrl,
                   token,
-                  projectRoot,
-                  syncRoot,
+                  projectId: project.projectId,
                   branchName,
-                  manifest: project
+                  planRoot
                 });
-                try {
-                  await syncProjectPlans({
-                    baseUrl,
-                    token,
-                    projectId: project.projectId,
-                    branchName,
-                    planRoot
-                  });
-                } catch (error) {
-                  process.stderr.write(
-                    `[r5d-worker] plan sync skipped for ${project.projectId}/${branchName}: ${error instanceof Error ? error.message : String(error)}
+              } catch (error) {
+                process.stderr.write(
+                  `[r5d-worker] plan sync skipped for ${project.projectId}/${branchName}: ${error instanceof Error ? error.message : String(error)}
 `
-                  );
-                }
-              });
+                );
+              }
             } catch (error) {
               process.stderr.write(
                 `[r5d-worker] failed to sync ${project.repoSlug}/${branchName}: ${error instanceof Error ? error.message : String(error)}
@@ -2206,7 +2211,7 @@ async function startWorker(options) {
             requestId: message.requestId,
             runId: message.runId,
             cancelled: true,
-            message: active ? `Sent SIGTERM to ${active.command.join(" ")}` : "Cancellation queued before command start"
+            message: active ? `Sent SIGTERM to ${active.command}` : "Cancellation queued before command start"
           })
         );
         return;
@@ -2236,11 +2241,17 @@ async function startWorker(options) {
         const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
         process.stdout.write(`[r5d-worker] exec ${message.runId}: ${message.argv.join(" ")}
 `);
-        const result = await withBranchLock(
-          message.projectId,
-          message.branchName,
-          () => executeCommand({ message, projectId: message.projectId, baseUrl, token, projectRoot, syncRoot, artifactRoot, planRoot, manifest })
-        );
+        const result = await executeCommand({
+          message,
+          projectId: message.projectId,
+          baseUrl,
+          token,
+          projectRoot,
+          syncRoot,
+          artifactRoot,
+          planRoot,
+          manifest
+        });
         ws.send(JSON.stringify(result));
         return;
       }
@@ -2255,11 +2266,18 @@ async function startWorker(options) {
           const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
           process.stdout.write(`[r5d-worker] exec_start ${message.runId}: ${message.argv.join(" ")}
 `);
-          void withBranchLock(
-            message.projectId,
-            message.branchName,
-            () => executeStreamingCommand({ ws, message, projectId: message.projectId, baseUrl, token, projectRoot, syncRoot, artifactRoot, planRoot, manifest })
-          ).catch((error) => {
+          void executeStreamingCommand({
+            ws,
+            message,
+            projectId: message.projectId,
+            baseUrl,
+            token,
+            projectRoot,
+            syncRoot,
+            artifactRoot,
+            planRoot,
+            manifest
+          }).catch((error) => {
             sendWorkerMessage(ws, {
               type: "exec_start_error",
               requestId: message.requestId,
@@ -2281,11 +2299,16 @@ async function startWorker(options) {
         try {
           const manifest = manifestByProjectId.get(message.projectId);
           const projectRoot = projectRootFor(projectsRoot, message.projectId, manifestByProjectId);
-          const result = await withBranchLock(
-            message.projectId,
-            message.branchName,
-            () => executeOperation({ message, projectId: message.projectId, baseUrl, token, projectRoot, syncRoot, artifactRoot, manifest })
-          );
+          const result = await executeOperation({
+            message,
+            projectId: message.projectId,
+            baseUrl,
+            token,
+            projectRoot,
+            syncRoot,
+            artifactRoot,
+            manifest
+          });
           ws.send(
             JSON.stringify({
               type: "operation_result",
@@ -2320,10 +2343,31 @@ async function startWorker(options) {
     });
   });
   ws.addEventListener("close", (event) => {
+    if (currentWorkerSocket === ws) {
+      currentWorkerSocket = null;
+    }
     closeAllPtys();
     const reason = event.reason ? `: ${event.reason}` : "";
     process.stderr.write(`[r5d-worker] disconnected (${event.code}${reason})
 `);
+    if (activeProcesses.size > 0) {
+      const delayMs = 2e3;
+      process.stderr.write(`[r5d-worker] ${activeProcesses.size} process(es) still active; reconnecting in ${delayMs}ms
+`);
+      const reconnect = () => {
+        void startWorker(options).catch((error) => {
+          process.stderr.write(`[r5d-worker] reconnect failed: ${error instanceof Error ? error.message : String(error)}
+`);
+          if (activeProcesses.size > 0) {
+            setTimeout(reconnect, delayMs);
+            return;
+          }
+          process.exit(1);
+        });
+      };
+      setTimeout(reconnect, delayMs);
+      return;
+    }
     process.exit(event.code === 1e3 ? 0 : 1);
   });
   ws.addEventListener("error", (event) => {

package/dist/mjs/package.json

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

package/package.json

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