@vzn/vx-reapi 0.0.640 → 0.0.642

package/README.md

@@ -309,8 +309,11 @@ Once a worker reports EXECUTING, the task's `exec.timeout` (or
 `executeTimeoutMs`) bounds the wait, and the bound holds across a
 re-attach: firing during the backoff between a dropped stream and its
 `WaitExecution`, it ends the task there rather than being lost.
-The run stopping (Ctrl-C, an embedder's abort) cancels the operation
-stream the same way, and an action not yet submitted is not sent.
+The run stopping (Ctrl-C, an embedder's abort) or the task's `exec.timeout`
+closes the stream and cancels the operation with `CancelOperation`, and an
+action not yet submitted is not sent. The task then ends as a killed local
+one does (exit 143, `SIGTERM`): past `exec.timeout` it is `failed (timed
+out)` with its key in `vx last`.
 
 A ByteStream Read, like every unary call, retries UNAVAILABLE,
 RESOURCE_EXHAUSTED and INTERNAL three times (100, 400 and 1600 ms) before it

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vzn/vx-reapi",
-  "version": "0.0.640",
+  "version": "0.0.642",
   "license": "MIT",
   "description": "Bazel Remote Execution API plugin for vx — remote cache (ActionCache + CAS) against NativeLink, BuildBuddy, Buildbarn or bazel-remote.",
   "keywords": [
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@vzn/vx": "^0.0.640"
+    "@vzn/vx": "^0.0.642"
   },
   "repository": {
     "type": "git",

package/src/executor.ts

@@ -17,6 +17,7 @@ import {
   isLiteralPattern,
   isUserError,
   normalizeGlob,
+  restorableOutput,
   UserError,
   withForwardArgs,
 } from '@vzn/vx'
@@ -935,9 +936,20 @@ export function reapiExecutor(client: ReapiClient, opts: ReapiExecutorOptions =
         )
       } catch (err) {
         if (req.signal?.aborted === true) {
-          throw new UserError(
-            `vx/reapi: ${req.taskId}: the run stopped before its remote execution finished`,
-          )
+          // Core aborts on the run's stop and on `exec.timeout`. A refusal
+          // read as a plain failure (exit 1, no key, not timed out), and the
+          // closed stream left the action running on its worker. The action
+          // is cancelled and the task ends as a killed local one does: 143,
+          // which core reports timed out when its timer fired.
+          if (operation !== '') await client.cancelOperation(operation).catch(() => undefined)
+          return {
+            exitCode: 143,
+            durationMs: Math.round((Bun.nanoseconds() - started) / 1e6),
+            stdout: '',
+            stderr: '',
+            violations: [],
+            signal: 'SIGTERM',
+          }
         }
         if (queued.signal.aborted) {
           // Best effort: a server without the service, or one that has lost
@@ -1407,9 +1419,19 @@ export async function materialiseOutputs(
     ...(req.outputs?.workspaceFiles ?? []),
   ].map((g) => normalizeGlob(g))
   const matchers = declared.map((g) => new Bun.Glob(g))
+  // Core's restore gate: a `!` take-back, vx's own files and a
+  // `node_modules` no glob names are no output either.
+  const isOwn = restorableOutput(req.outputs?.files ?? [])
+  const isWs = restorableOutput(req.outputs?.workspaceFiles ?? [], 'workspace')
   const isDeclared = (abs: string): boolean => {
     const rel = toPosix(path.relative(req.workspaceRoot, abs))
-    return declared.includes(rel) || matchers.some((m) => m.match(rel))
+    const own =
+      projectRel === ''
+        ? rel
+        : rel.startsWith(`${projectRel}/`)
+          ? rel.slice(projectRel.length + 1)
+          : undefined
+    return (own !== undefined && isOwn(own)) || isWs(rel)
   }
   // A declared output, or a path under one a literal glob names whole.
   const underDeclared = (rel: string): boolean => {