@vzn/vx 0.0.601 → 0.0.603

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vzn/vx",
-  "version": "0.0.601",
+  "version": "0.0.603",
   "description": "The fastest task runner and build cache for JavaScript monorepos.",
   "type": "module",
   "exports": {
@@ -21,10 +21,10 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "@vzn/vx-linux-x64": "0.0.601",
-    "@vzn/vx-linux-arm64": "0.0.601",
-    "@vzn/vx-darwin-x64": "0.0.601",
-    "@vzn/vx-darwin-arm64": "0.0.601"
+    "@vzn/vx-linux-x64": "0.0.603",
+    "@vzn/vx-linux-arm64": "0.0.603",
+    "@vzn/vx-darwin-x64": "0.0.603",
+    "@vzn/vx-darwin-arm64": "0.0.603"
   },
   "dependencies": {
     "@anthropic-ai/sandbox-runtime": "^0.0.76"

package/src/cli/watch-filter.ts

@@ -272,6 +272,7 @@ export function makeRootEventFilter(
       (isWorkspaceFingerprintFile(rel) ||
         isWorkspaceConfigFile(rel) ||
         rel === 'package.json' ||
+        rel === '.gitignore' ||
         claimedRootFiles.has(rel))
     ) {
       return true

package/src/cli/watch.ts

@@ -164,7 +164,15 @@ export async function watchCmd(args: readonly string[]): Promise<number> {
   const workspaceRoot = await findWorkspaceRoot(cwd, reads)
   const workspace = await loadWorkspace(workspaceRoot, reads)
   const allProjects = await discoverCliProjects(workspace)
-  const anchored = opts.tasks.filter((t) => t.includes('#')).map((t) => t.slice(0, t.indexOf('#')))
+  // `//#check` is the root project's task, named by its package.json name
+  // as the run names it (prepare.ts, D-39): taken literally, no project
+  // was in scope and the watch exited 1 after a green run.
+  const rootDir = path.resolve(workspaceRoot)
+  const rootName = allProjects.find((p) => path.resolve(p.dir) === rootDir)?.name
+  const anchored = opts.tasks
+    .filter((t) => t.includes('#'))
+    .map((t) => t.slice(0, t.indexOf('#')))
+    .map((p) => (p === '//' && rootName !== undefined ? rootName : p))
   const named =
     anchored.length === opts.tasks.length
       ? new Set(anchored)
@@ -586,6 +594,7 @@ async function runWatchLoop(args: WatchLoopArgs): Promise<void> {
               isWorkspaceFingerprintFile(filename) ||
               isWorkspaceConfigFile(filename) ||
               filename === 'package.json' ||
+              filename === '.gitignore' ||
               claimedRootFiles.has(filename)
             ) {
               if (shapesWatchedSet(filename) || filename === LOCKFILE_NAME) reread = true
@@ -845,6 +854,15 @@ async function runWatchLoop(args: WatchLoopArgs): Promise<void> {
           base,
           arm(base, false, (filename) => {
             if (isIgnoredWatchPath(filename)) return
+            // Inputs are gitignore-aware: an edit here changes what the
+            // members' keys read, and `vx run` would miss on it.
+            if (filename === '.gitignore') {
+              trigger(
+                path.relative(workspaceRoot, path.join(base, filename)),
+                path.join(base, filename),
+              )
+              return
+            }
             // Only a member coming or going. On macOS a non-recursive watcher
             // also reports a member whose CONTENTS changed (FSEvents names the
             // directory a write landed in), so a task writing into its own

package/src/graph/task-graph.ts

@@ -1389,7 +1389,7 @@ interface Side {
   node: TaskNode
   globs: readonly string[]
   reads: boolean
-  /** The project's root-relative dir for a rebased `files` output. */
+  /** The project's root-relative dir for rebased `files` globs. */
   rel?: string
 }
 
@@ -1407,7 +1407,9 @@ interface Side {
  * scope mirrors `detectOutputCollisions`: `inputs.files` against another
  * same-project task's `outputs.files`; root-anchored `inputs.workspaceFiles`
  * against every other task's `outputs.workspaceFiles` and, with the root
- * known, its `outputs.files` rebased to the root. A task's own outputs are
+ * known, its `outputs.files` rebased to the root; and, with the root known,
+ * `inputs.files` rebased to the root against another task's
+ * `outputs.workspaceFiles`, which may land in any project (X-135). A task's own outputs are
  * already subtracted from its inputs, and an output the reader's `!` entries
  * take back whole is no overlap. A keyed group is exempt: the default
  * `build` reads `**` of a config-less dependency and runs nothing, and its
@@ -1416,6 +1418,8 @@ interface Side {
 function detectInputOverlaps(nodes: Map<string, TaskNode>, workspaceRoot?: string): void {
   const byProject = new Map<string, Side[]>()
   const rooted: Side[] = []
+  const wsWriters: Side[] = []
+  const filesReaders: TaskNode[] = []
   const filesWriters: TaskNode[] = []
   let projectReaders = false
   let rootReaders = false
@@ -1433,12 +1437,17 @@ function detectInputOverlaps(nodes: Map<string, TaskNode>, workspaceRoot?: strin
       bucket(n.projectName).push({ node: n, globs: outFiles, reads: false })
       filesWriters.push(n)
     }
-    if (outWs.length > 0) rooted.push({ node: n, globs: outWs, reads: false })
+    if (outWs.length > 0) {
+      const side = { node: n, globs: outWs, reads: false }
+      rooted.push(side)
+      wsWriters.push(side)
+    }
     if (isGroupTask(n)) continue
     const inFiles = splitNegations(cache.inputs.files).positive
     const inWs = splitNegations(cache.inputs.workspaceFiles ?? []).positive
     if (inFiles.length > 0) {
       bucket(n.projectName).push({ node: n, globs: inFiles, reads: true })
+      filesReaders.push(n)
       projectReaders = true
     }
     if (inWs.length > 0) {
@@ -1458,6 +1467,23 @@ function detectInputOverlaps(nodes: Map<string, TaskNode>, workspaceRoot?: strin
       }
     }
   }
+  if (projectReaders && wsWriters.length > 0 && workspaceRoot !== undefined) {
+    const sides = [...wsWriters]
+    for (const node of filesReaders) {
+      const rel = relPosix(workspaceRoot, node.projectDir)
+      const globs = splitNegations(node.config.cache!.inputs.files).positive.map((g) =>
+        rel === '' ? g : `${rel}/${g}`,
+      )
+      sides.push({ node, globs, reads: true, rel })
+    }
+    for (const [i, j] of overlapCandidates(
+      sides,
+      (s) => s.globs,
+      (s) => s.reads,
+    )) {
+      readsOutputs(sides[i]!, sides[j]!, 'files')
+    }
+  }
   if (!rootReaders) return
   if (workspaceRoot !== undefined) {
     for (const node of filesWriters) {
@@ -1481,6 +1507,8 @@ function readsOutputs(x: Side, y: Side, field: 'files' | 'workspaceFiles'): void
   if (x.reads === y.reads || x.node === y.node) return
   const [reader, writer] = x.reads ? [x, y] : [y, x]
   const cache = reader.node.config.cache!
+  // A reader rebased to the root (X-135) speaks in its project's terms.
+  const at = reader.rel === undefined || reader.rel === '' ? '' : `${reader.rel}/`
   // What the reader's key never reads: its `!` entries and its own outputs.
   const takeBack = [
     ...splitNegations(field === 'files' ? cache.inputs.files : (cache.inputs.workspaceFiles ?? []))
@@ -1488,18 +1516,19 @@ function readsOutputs(x: Side, y: Side, field: 'files' | 'workspaceFiles'): void
     ...splitNegations(
       field === 'files' ? cache.outputs.files : (cache.outputs.workspaceFiles ?? []),
     ).positive,
-  ]
+  ].map((g) => at + g)
   for (const go of writer.globs) {
     if (outputTakenBack(go, takeBack)) continue
     for (const gi of reader.globs) {
       if (!outputsOverlap(gi, go)) continue
       const shown =
         writer.rel === undefined || writer.rel === '' ? go : go.slice(writer.rel.length + 1)
+      const out = at !== '' && go.startsWith(at) ? go.slice(at.length) : go
       throw new UserError(
-        `${reader.node.id} reads ${JSON.stringify(gi)} in cache.inputs.${field}, which matches ` +
+        `${reader.node.id} reads ${JSON.stringify(gi.slice(at.length))} in cache.inputs.${field}, which matches ` +
           `${writer.node.id}'s output ${JSON.stringify(shown)} — a task's key must not read ` +
           `another task's outputs (the dependency's key already cascades through dependsOn). ` +
-          `Exclude it: add ${JSON.stringify(`!${go}`)} to ${reader.node.id}'s ` +
+          `Exclude it: add ${JSON.stringify(`!${out}`)} to ${reader.node.id}'s ` +
           `cache.inputs.${field}, or set rules: { upfrontKeys: false } in vx.workspace.ts to ` +
           `let it wait for its producer.`,
       )