@ricsam/r5d-worker 0.0.124 → 0.0.125

package/README.md

@@ -89,7 +89,7 @@ The launcher owns admission, OS isolation, budgets, and diagnostic evidence. Its
 
 Requests must be processed concurrently so cancellation and cleanup cannot wait behind queued admission. Controller RPCs are bounded (10 seconds, or 90 seconds for acquisition); external policy must reject excessive queue waits within that bound. Controller loss or protocol failure stops command admission, preserves uncertain outcomes for recovery, reaps ordinary children, and restarts the runtime through its supervisor. It never falls back to direct spawning. Shutdown closes controller stdin; the controller must reap its jobs before exiting.
 
-Cancellation is checked again immediately before spawn. Transient disconnects preserve commands and terminals; expiry of the five-minute execution lease cancels agent work and closes terminals. File operations, communication recovery, and cancellation do not enter launcher admission. Internal worker maintenance subprocesses are also outside this hook. The worker reports its own view of every lane (holders and queue, by run id) to the server with `capacity_report` whenever an admission changes; the platform exposes it through `r5dctl ps list` and `r5dctl workspace status`. Deployment-specific limits and service protection are documented in [Worker deployment resources](../../docs/worker-deployment-resources.md).
+Cancellation is checked again immediately before spawn. A `cancel` carrying `scope: "unstarted"` is the server giving up on a start whose budget expired: it revokes only a launch that has not spawned (capacity queue, mount hold, preparation) and leaves a running process alone; `cancel_result.outcome` reports `unstarted`, `started`, `stopped`, or `unknown` (no record of the run; the cancellation is remembered so a later arrival is refused). Transient disconnects preserve commands and terminals; expiry of the five-minute execution lease cancels agent work and closes terminals. File operations, communication recovery, and cancellation do not enter launcher admission. Internal worker maintenance subprocesses are also outside this hook. The worker reports its own view of every lane (holders and queue, by run id) to the server with `capacity_report` whenever an admission changes; the platform exposes it through `r5dctl ps list` and `r5dctl workspace status`. Deployment-specific limits and service protection are documented in [Worker deployment resources](../../docs/worker-deployment-resources.md).
 
 When the connected `r5d-browser` requests a port forward, the worker opens each relayed connection only to `127.0.0.1` on the requested worker port. Browser-side and worker-side ports may differ. The worker never opens a public listener, and a disconnected worker leaves the browser's long-lived mapping unavailable until the same worker label reconnects.
 

package/dist/cjs/command-launcher.cjs

@@ -245,7 +245,9 @@ class WorkerCommandLauncher {
         if (!argv.length) throw new Error("Command argv must not be empty");
         return [...prefix, ...argv];
       },
-      cancel: () => this.cancel(request.id),
+      cancel: async () => {
+        await this.cancel(request.id);
+      },
       diagnose: async () => {
         this.assertHealthy();
         if (!this.child) return void 0;
@@ -261,9 +263,10 @@ class WorkerCommandLauncher {
       release: () => this.releaseRecord(record)
     };
   }
+  /** Revoke a launch. Returns whether this launcher still held it (queued or acquired, not yet released). */
   async cancel(id) {
     const record = this.launches.get(id);
-    if (!record || record.released) return;
+    if (!record || record.released) return false;
     record.revoked = true;
     record.rejectAdmission(new CommandLaunchCancelledError());
     if (this.child) {
@@ -273,6 +276,7 @@ class WorkerCommandLauncher {
         throw this.fail(error instanceof Error ? error : new Error(String(error)));
       }
     }
+    return true;
   }
   async cancelSession(sessionId) {
     await this.cancelMatching((_id, ownerSessionId) => ownerSessionId === sessionId);

package/dist/cjs/main.cjs

@@ -325,9 +325,10 @@ function unregisterPendingReservation(key, controller) {
 }
 function abortPendingReservation(key, reason) {
   const pending = pendingReservationAborts.get(key);
-  if (!pending) return;
+  if (!pending) return false;
   pendingReservationAborts.delete(key);
   pending.controller.abort(new import_workspace_mount_hold_fence.WorkspaceMountHoldAbortedError(reason));
+  return true;
 }
 function abortPendingReservations(reason, sessionId) {
   for (const [key, pending] of [...pendingReservationAborts]) {
@@ -3191,32 +3192,38 @@ async function reapCompletedCredentialBearingProcessGroup(runId, subprocess) {
     );
   }
 }
-async function cancelProcessRun(runId) {
+async function cancelProcessRun(runId, scope) {
+  const spawned = activeProcesses.get(runId);
+  if (scope === "unstarted" && spawned) return { cancelled: false, message: `${spawned.command} already started`, outcome: "started" };
+  if (!spawned) cancelledProcessRuns.add(runId);
+  const revocation = workerCommandLauncher?.cancel(runId);
   let resourceCancellationError;
+  let launchRevoked = false;
   try {
-    await workerCommandLauncher?.cancel(runId);
+    launchRevoked = await revocation ?? false;
   } catch (error) {
     resourceCancellationError = error instanceof Error ? error.message : String(error);
   }
-  const active = activeProcesses.get(runId);
   let cancelled = resourceCancellationError === void 0;
   let cancelMessage;
-  if (active) {
+  let outcome;
+  if (spawned) {
+    outcome = "stopped";
     try {
-      closeProcessStdin(active);
-      await (0, import_process_tree.terminateProcessTree)(active.process);
-      cancelMessage = `Stopped ${active.command}`;
+      closeProcessStdin(spawned);
+      await (0, import_process_tree.terminateProcessTree)(spawned.process);
+      cancelMessage = `Stopped ${spawned.command}`;
     } catch (error) {
       cancelled = false;
-      cancelMessage = `Failed to stop ${active.command}: ${error instanceof Error ? error.message : String(error)}`;
+      cancelMessage = `Failed to stop ${spawned.command}: ${error instanceof Error ? error.message : String(error)}`;
     }
   } else {
-    cancelledProcessRuns.add(runId);
-    abortPendingReservation(`run:${runId}`, "Cancellation queued before command start");
+    const reservationAborted = abortPendingReservation(`run:${runId}`, "Cancellation queued before command start");
+    outcome = launchRevoked || reservationAborted ? "unstarted" : "unknown";
     cancelMessage = "Cancellation queued before command start";
   }
   if (resourceCancellationError) cancelMessage += `; job resource termination failed: ${resourceCancellationError}`;
-  return { cancelled, message: cancelMessage };
+  return { cancelled, message: cancelMessage, outcome };
 }
 function closeProcessStdin(active) {
   if (!active?.stdin) {
@@ -6168,7 +6175,7 @@ async function startWorker(options, projectRuntime = {
       const operationRequestId = "requestId" in message && typeof message.requestId === "string" && message.type !== "workspace_config" ? message.requestId : void 0;
       if (message.type === "cancel") {
         const admission = recoveryJournal.admit({ ...message, requestId: message.requestId });
-        const cancelled = await cancelProcessRun(message.runId);
+        const cancelled = await cancelProcessRun(message.runId, message.scope);
         let admitted;
         try {
           admitted = await admission;
@@ -6194,7 +6201,8 @@ async function startWorker(options, projectRuntime = {
             requestId: message.requestId,
             runId: message.runId,
             cancelled: cancelled.cancelled,
-            message: cancelled.message
+            message: cancelled.message,
+            outcome: cancelled.outcome
           })
         );
         return;

package/dist/cjs/package.json

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

package/dist/mjs/command-launcher.mjs

@@ -216,7 +216,9 @@ class WorkerCommandLauncher {
         if (!argv.length) throw new Error("Command argv must not be empty");
         return [...prefix, ...argv];
       },
-      cancel: () => this.cancel(request.id),
+      cancel: async () => {
+        await this.cancel(request.id);
+      },
       diagnose: async () => {
         this.assertHealthy();
         if (!this.child) return void 0;
@@ -232,9 +234,10 @@ class WorkerCommandLauncher {
       release: () => this.releaseRecord(record)
     };
   }
+  /** Revoke a launch. Returns whether this launcher still held it (queued or acquired, not yet released). */
   async cancel(id) {
     const record = this.launches.get(id);
-    if (!record || record.released) return;
+    if (!record || record.released) return false;
     record.revoked = true;
     record.rejectAdmission(new CommandLaunchCancelledError());
     if (this.child) {
@@ -244,6 +247,7 @@ class WorkerCommandLauncher {
         throw this.fail(error instanceof Error ? error : new Error(String(error)));
       }
     }
+    return true;
   }
   async cancelSession(sessionId) {
     await this.cancelMatching((_id, ownerSessionId) => ownerSessionId === sessionId);

package/dist/mjs/main.mjs

@@ -346,9 +346,10 @@ function unregisterPendingReservation(key, controller) {
 }
 function abortPendingReservation(key, reason) {
   const pending = pendingReservationAborts.get(key);
-  if (!pending) return;
+  if (!pending) return false;
   pendingReservationAborts.delete(key);
   pending.controller.abort(new WorkspaceMountHoldAbortedError(reason));
+  return true;
 }
 function abortPendingReservations(reason, sessionId) {
   for (const [key, pending] of [...pendingReservationAborts]) {
@@ -3212,32 +3213,38 @@ async function reapCompletedCredentialBearingProcessGroup(runId, subprocess) {
     );
   }
 }
-async function cancelProcessRun(runId) {
+async function cancelProcessRun(runId, scope) {
+  const spawned = activeProcesses.get(runId);
+  if (scope === "unstarted" && spawned) return { cancelled: false, message: `${spawned.command} already started`, outcome: "started" };
+  if (!spawned) cancelledProcessRuns.add(runId);
+  const revocation = workerCommandLauncher?.cancel(runId);
   let resourceCancellationError;
+  let launchRevoked = false;
   try {
-    await workerCommandLauncher?.cancel(runId);
+    launchRevoked = await revocation ?? false;
   } catch (error) {
     resourceCancellationError = error instanceof Error ? error.message : String(error);
   }
-  const active = activeProcesses.get(runId);
   let cancelled = resourceCancellationError === void 0;
   let cancelMessage;
-  if (active) {
+  let outcome;
+  if (spawned) {
+    outcome = "stopped";
     try {
-      closeProcessStdin(active);
-      await terminateProcessTree(active.process);
-      cancelMessage = `Stopped ${active.command}`;
+      closeProcessStdin(spawned);
+      await terminateProcessTree(spawned.process);
+      cancelMessage = `Stopped ${spawned.command}`;
     } catch (error) {
       cancelled = false;
-      cancelMessage = `Failed to stop ${active.command}: ${error instanceof Error ? error.message : String(error)}`;
+      cancelMessage = `Failed to stop ${spawned.command}: ${error instanceof Error ? error.message : String(error)}`;
     }
   } else {
-    cancelledProcessRuns.add(runId);
-    abortPendingReservation(`run:${runId}`, "Cancellation queued before command start");
+    const reservationAborted = abortPendingReservation(`run:${runId}`, "Cancellation queued before command start");
+    outcome = launchRevoked || reservationAborted ? "unstarted" : "unknown";
     cancelMessage = "Cancellation queued before command start";
   }
   if (resourceCancellationError) cancelMessage += `; job resource termination failed: ${resourceCancellationError}`;
-  return { cancelled, message: cancelMessage };
+  return { cancelled, message: cancelMessage, outcome };
 }
 function closeProcessStdin(active) {
   if (!active?.stdin) {
@@ -6189,7 +6196,7 @@ async function startWorker(options, projectRuntime = {
       const operationRequestId = "requestId" in message && typeof message.requestId === "string" && message.type !== "workspace_config" ? message.requestId : void 0;
       if (message.type === "cancel") {
         const admission = recoveryJournal.admit({ ...message, requestId: message.requestId });
-        const cancelled = await cancelProcessRun(message.runId);
+        const cancelled = await cancelProcessRun(message.runId, message.scope);
         let admitted;
         try {
           admitted = await admission;
@@ -6215,7 +6222,8 @@ async function startWorker(options, projectRuntime = {
             requestId: message.requestId,
             runId: message.runId,
             cancelled: cancelled.cancelled,
-            message: cancelled.message
+            message: cancelled.message,
+            outcome: cancelled.outcome
           })
         );
         return;

package/dist/mjs/package.json

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

package/dist/types/command-launcher.d.ts

@@ -86,7 +86,8 @@ export declare class WorkerCommandLauncher {
     capacityReport(): CommandLaunchCapacityReport;
     private notifyCapacityChange;
     acquire(request: CommandLaunchRequest): Promise<CommandLaunchLease>;
-    cancel(id: string): Promise<void>;
+    /** Revoke a launch. Returns whether this launcher still held it (queued or acquired, not yet released). */
+    cancel(id: string): Promise<boolean>;
     cancelSession(sessionId: string): Promise<void>;
     cancelMatching(matches: (id: string, sessionId?: string) => boolean): Promise<void>;
     close(): Promise<void>;

package/dist/types/main.d.ts

@@ -141,6 +141,8 @@ export type WorkerSessionTarget = {
     ownerUserId: string;
     rootProfile: "visible_projects" | "canonical_sync";
 };
+type WorkerCancelScope = "unstarted";
+type WorkerCancelOutcome = "unstarted" | "started" | "stopped" | "unknown";
 type WorkerClientMessage = WorkerRecoveryClientMessage | {
     type: "capacity_report";
     capacity: import("./command-launcher").CommandLaunchCapacityReport & {
@@ -262,6 +264,8 @@ type WorkerClientMessage = WorkerRecoveryClientMessage | {
     runId: string;
     cancelled: boolean;
     message?: string;
+    /** `unstarted`: a launch that had not spawned was revoked; `started`: a spawned process was left alone; `stopped`; `unknown`: no record, cancellation recorded. */
+    outcome?: WorkerCancelOutcome;
 } | {
     type: "pong";
 } | {
@@ -533,6 +537,8 @@ type WorkerServerMessage = WorkerRecoveryServerMessage | {
     type: "cancel";
     requestId: string;
     runId: string;
+    /** `unstarted`: the server's start-deadline abandonment; never touch a spawned process. */
+    scope?: WorkerCancelScope;
 } | {
     type: "ping";
 };

package/package.json

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