@vzn/vx-reapi 0.0.639 → 0.0.641

package/README.md

@@ -441,15 +441,15 @@ the packages a build needs. The answer is the design doc's §7.4 recipe,
 ```ts
 install: {
   exec: { command: 'pnpm install --frozen-lockfile', remote: 'only' },
+  inputs: { files: ['package.json', 'pnpm-lock.yaml'] },
   cache: {
-    inputs: { files: ['package.json', 'pnpm-lock.yaml'] },
     outputs: { files: ['node_modules/**'] },
   },
 },
 build: {
   dependsOn: ['install'],
   exec: { command: 'tsc -p .' },
-  cache: { inputs: { files: ['src/**'] }, outputs: { files: ['dist/**'] } },
+  inputs: { files: ['src/**'] }, cache: { outputs: { files: ['dist/**'] } },
 },
 ```
 
@@ -487,7 +487,7 @@ sorted by name — the proto requires that, so equivalent Commands hash alike:
 - **`exec.env.define`** — literal `name: value` pairs from the task config.
   They read the same on every machine, so they are safe to put into the
   action identity, and they are already in the vx cache key.
-- **`cache.inputs.env`** — the values this machine resolved for those names,
+- **`inputs.env`** — the values this machine resolved for those names,
   for each name the task's local child would get too (it is also in
   `exec.env.passThrough`). They are in the vx cache key by definition, so a
   change to one already produces a different action. A name unset here, or
@@ -511,6 +511,6 @@ the worker has its own. Two reasons, and both matter:
   can name its digest.
 
 So a task that needs a value on a worker must `define` it (config literal) or
-list it in both `cache.inputs.env` and `exec.env.passThrough` (host value,
+list it in both `inputs.env` and `exec.env.passThrough` (host value,
 keyed, and seen by a local run the same way). A task whose command reads
 a `passThrough` secret is one to keep local with `exec: { remote: false }`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vzn/vx-reapi",
-  "version": "0.0.639",
+  "version": "0.0.641",
   "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.639"
+    "@vzn/vx": "^0.0.641"
   },
   "repository": {
     "type": "git",

package/src/executor.ts

@@ -17,6 +17,7 @@ import {
   isLiteralPattern,
   isUserError,
   normalizeGlob,
+  restorableOutput,
   UserError,
   withForwardArgs,
 } from '@vzn/vx'
@@ -1269,7 +1270,7 @@ export function globToOutputPath(glob: string): string {
 }
 
 /**
- * The action's environment: `cache.inputs.env` (values read from THIS
+ * The action's environment: `inputs.env` (values read from THIS
  * machine's environment, already folded into the cache key) plus
  * `exec.env.define` (literals from the task config). A define wins on
  * collision — it is the more explicit statement of intent. An `inputs.env`
@@ -1407,9 +1408,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 ?? [])
   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 => {