@ricsam/r5d-worker 0.0.55 → 0.0.56

package/dist/mjs/main.mjs

@@ -14,6 +14,7 @@ import {
 import { terminateProcessTree } from "./process-tree.mjs";
 import { openWorkerPortForwardRelay } from "./port-forward-client.mjs";
 import { applyWorkspaceIncidentUpdate, releasePendingWorkspaceHead } from "./workspace-incident-state.mjs";
+import { acquireWorkspaceCommandMutation, runWorkspaceCommand } from "./workspace-command-sync-policy.mjs";
 import {
   isRetryableWorkerServerStatus,
   superviseWorkerRuntime,
@@ -2257,7 +2258,7 @@ async function openPty(input) {
       });
     },
     onExit: (event) => {
-      input.releaseWorkspaceMutation();
+      input.releaseWorkspaceMutation?.();
       activePtys.delete(input.message.ptyId);
       sendWorkerMessage(input.ws, {
         type: "pty_exit",
@@ -2267,7 +2268,7 @@ async function openPty(input) {
       });
     },
     onError: (error) => {
-      input.releaseWorkspaceMutation();
+      input.releaseWorkspaceMutation?.();
       activePtys.delete(input.message.ptyId);
       sendWorkerMessage(input.ws, {
         type: "pty_error",
@@ -2280,7 +2281,7 @@ async function openPty(input) {
   activePtys.set(input.message.ptyId, {
     ...ptyProcess,
     target: input.resolvedTarget.target,
-    releaseWorkspaceMutation: input.releaseWorkspaceMutation
+    ...input.releaseWorkspaceMutation ? { releaseWorkspaceMutation: input.releaseWorkspaceMutation } : {}
   });
 }
 function writePty(ws, message) {
@@ -2826,14 +2827,20 @@ async function startWorker(options) {
           });
           return;
         }
-        const releaseWorkspaceMutation = await workspaceSyncSingleFlight.acquireMutation();
+        const releaseWorkspaceMutation = await acquireWorkspaceCommandMutation(message.target, workspaceSyncSingleFlight);
         let leaseTransferred = false;
         try {
           const resolvedTarget = resolveMessageTarget(message.target);
           process.stdout.write(`[r5d-worker] pty ${message.ptyId}: ${describeWorkerSessionTarget(message.target)}
 `);
-          await openPty({ ws, message, resolvedTarget, planRoot, releaseWorkspaceMutation });
-          leaseTransferred = true;
+          await openPty({
+            ws,
+            message,
+            resolvedTarget,
+            planRoot,
+            ...releaseWorkspaceMutation ? { releaseWorkspaceMutation } : {}
+          });
+          leaseTransferred = releaseWorkspaceMutation !== void 0;
         } catch (error) {
           sendWorkerMessage(ws, {
             type: "pty_error",
@@ -2842,7 +2849,7 @@ async function startWorker(options) {
             error: error instanceof Error ? error.message : String(error)
           });
         } finally {
-          if (!leaseTransferred) releaseWorkspaceMutation();
+          if (!leaseTransferred) releaseWorkspaceMutation?.();
         }
         return;
       }
@@ -2871,12 +2878,13 @@ async function startWorker(options) {
         }
         let result;
         try {
-          result = await workspaceSyncSingleFlight.runMutation(async () => {
+          const runCommand = async () => {
             const resolvedTarget = resolveMessageTarget(message.target);
             process.stdout.write(`[r5d-worker] exec ${message.runId}: ${message.argv.join(" ")}
 `);
             return await executeCommand({ message, resolvedTarget, baseUrl, token, artifactRoot, planRoot });
-          });
+          };
+          result = await runWorkspaceCommand(message.target, workspaceSyncSingleFlight, runCommand);
         } catch (error) {
           result = {
             type: "exec_result",
@@ -2905,7 +2913,7 @@ async function startWorker(options) {
           requestId: message.requestId,
           runId: message.runId
         });
-        void workspaceSyncSingleFlight.runMutation(async () => {
+        const runCommand = async () => {
           const resolvedTarget = resolveMessageTarget(message.target);
           process.stdout.write(`[r5d-worker] exec_start ${message.runId}: ${message.argv.join(" ")}
 `);
@@ -2918,7 +2926,9 @@ async function startWorker(options) {
             artifactRoot,
             planRoot
           });
-        }).catch((error) => {
+        };
+        const execution = runWorkspaceCommand(message.target, workspaceSyncSingleFlight, runCommand);
+        void execution.catch((error) => {
           sendWorkerMessage(ws, {
             type: "exec_start_error",
             requestId: message.requestId,

package/dist/mjs/package.json

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

package/dist/mjs/workspace-command-sync-policy.mjs

@@ -0,0 +1,14 @@
+function shouldSerializeWorkspaceCommand(target) {
+  return target.type === "workspace" && target.rootProfile === "canonical_sync";
+}
+function runWorkspaceCommand(target, coordinator, operation) {
+  return shouldSerializeWorkspaceCommand(target) ? coordinator.runMutation(operation) : Promise.resolve().then(operation);
+}
+function acquireWorkspaceCommandMutation(target, coordinator) {
+  return shouldSerializeWorkspaceCommand(target) ? coordinator.acquireMutation() : Promise.resolve(void 0);
+}
+export {
+  acquireWorkspaceCommandMutation,
+  runWorkspaceCommand,
+  shouldSerializeWorkspaceCommand
+};