@vzn/vx 0.0.422 → 0.0.424

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vzn/vx",
-  "version": "0.0.422",
+  "version": "0.0.424",
   "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.422",
-    "@vzn/vx-linux-arm64": "0.0.422",
-    "@vzn/vx-darwin-x64": "0.0.422",
-    "@vzn/vx-darwin-arm64": "0.0.422"
+    "@vzn/vx-linux-x64": "0.0.424",
+    "@vzn/vx-linux-arm64": "0.0.424",
+    "@vzn/vx-darwin-x64": "0.0.424",
+    "@vzn/vx-darwin-arm64": "0.0.424"
   },
   "dependencies": {
     "@anthropic-ai/sandbox-runtime": "^0.0.76"

package/src/cli/watch.ts

@@ -205,6 +205,11 @@ export async function watchCmd(args: readonly string[]): Promise<number> {
   const swept = await sweepConfigs(allProjects, workspaceRoot, load, opts.tasks)
   const watched = await watchedProjects(workspaceRoot, allProjects, scope, load, swept.staged)
   const ws = await loadCliWorkspace(workspaceRoot)
+  const claimsOf = (plugins: Parameters<typeof fingerprintClaims>[0]): Set<string> =>
+    new Set([
+      ...fingerprintClaims(plugins).keys(),
+      ...(opts.frozen === true ? [LOCKFILE_NAME] : []),
+    ])
   return await runWatchLoop({
     opts,
     held,
@@ -232,6 +237,10 @@ export async function watchCmd(args: readonly string[]): Promise<number> {
       const now = await watchedProjects(workspaceRoot, all, inScope(all), load, sweep.staged)
       return {
         projects: now,
+        // A plugin the workspace config gained since claims its file from
+        // the cycle that loaded it; read once, its edits started nothing
+        // until a restart.
+        claimedRootFiles: claimsOf((await loadCliWorkspace(workspaceRoot)).plugins),
         memberBases: memberBaseDirs(workspace),
         workspaceWide: sweep.workspaceWide,
         workspaceInputs: sweep.workspaceInputs,
@@ -246,10 +255,7 @@ export async function watchCmd(args: readonly string[]): Promise<number> {
     // Under --frozen every cycle's configs are the lock's, so a re-lock is
     // the one edit that changes what a cycle runs; unheard, the loop ran
     // the old lock until a restart (item 971).
-    claimedRootFiles: new Set([
-      ...fingerprintClaims(ws.plugins).keys(),
-      ...(opts.frozen === true ? [LOCKFILE_NAME] : []),
-    ]),
+    claimedRootFiles: claimsOf(ws.plugins),
     // The RESOLVED cache dir, not the `.vx` literal — see `makeWatchIgnore`.
     cacheDir: opts.cacheDir ?? ws.cacheDir,
   })
@@ -296,6 +302,7 @@ interface WatchLoopArgs {
 
 interface Rediscovered {
   projects: readonly ProjectMeta[]
+  claimedRootFiles: ReadonlySet<string>
   memberBases: readonly string[]
   workspaceWide: boolean
   workspaceInputs: readonly string[]
@@ -319,6 +326,7 @@ async function runWatchLoop(args: WatchLoopArgs): Promise<number> {
   let outputs = args.outputs
   let inputs = args.inputs
   let uncached = args.uncached
+  let claimedRootFiles = args.claimedRootFiles
   let configImportFiles = args.configImports
   let wsConfigImportFiles = args.workspaceConfigImports
   // A dev server stays up while the loop idles; the cycle that replaces it
@@ -398,12 +406,7 @@ async function runWatchLoop(args: WatchLoopArgs): Promise<number> {
   // project would otherwise trigger every save during `bun install` —
   // and vx's own cache writes would trigger a cycle that writes again.
   let isIgnoredPath = makeWatchIgnore(cacheDir, outputs, inputs)
-  let matters = makeRootEventFilter(
-    workspaceRoot,
-    projectDirs,
-    workspaceInputs,
-    args.claimedRootFiles,
-  )
+  let matters = makeRootEventFilter(workspaceRoot, projectDirs, workspaceInputs, claimedRootFiles)
   /** Since the last cycle, a member came or went, or a file that shapes the watched set changed (`shapesWatchedSet`). */
   let reread = false
 
@@ -466,7 +469,7 @@ async function runWatchLoop(args: WatchLoopArgs): Promise<number> {
               isWorkspaceFingerprintFile(filename) ||
               isWorkspaceConfigFile(filename) ||
               filename === 'package.json' ||
-              args.claimedRootFiles.has(filename)
+              claimedRootFiles.has(filename)
             ) {
               if (shapesWatchedSet(filename) || filename === LOCKFILE_NAME) reread = true
               trigger(`root ${filename}`, path.join(workspaceRoot, filename))
@@ -608,18 +611,14 @@ async function runWatchLoop(args: WatchLoopArgs): Promise<number> {
     outputs = next.outputs
     inputs = next.inputs
     uncached = next.uncached
+    claimedRootFiles = next.claimedRootFiles
     configImportFiles = next.configImports
     wsConfigImportFiles = next.workspaceConfigImports
     packageDirs = next.packageDirs
     memberBases = next.memberBases
     armBases()
     isIgnoredPath = makeWatchIgnore(cacheDir, outputs, inputs)
-    matters = makeRootEventFilter(
-      workspaceRoot,
-      projectDirs,
-      workspaceInputs,
-      args.claimedRootFiles,
-    )
+    matters = makeRootEventFilter(workspaceRoot, projectDirs, workspaceInputs, claimedRootFiles)
     if (next.workspaceWide !== workspaceWide) {
       // A task started or stopped declaring `workspaceFiles`: the other
       // arm's shape. Until item 891 the choice was made once, at start, and

package/src/workspace/migration.ts

@@ -256,6 +256,18 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   const configName = `vx.config.${format}`
   const workspaceName = `vx.workspace.${format}`
   const empty = plan.projects.length === 0
+  // `vx init` never overwrites a member's config: a half-adopted workspace
+  // keeps each one it has, by name, and gets the rest (M-52). It refused
+  // the whole workspace, and `--force` would have replaced the hand-written
+  // file; `--force` still replaces, as asked.
+  const kept: string[] = []
+  const projects = plan.projects.filter((p) => {
+    if (!init || force || p.tasks.length === 0) return true
+    const existing = metas.find((m) => m.dir === p.dir)?.configPath
+    if (!existing) return true
+    kept.push(relPosix(root, existing))
+    return false
+  })
   if (empty && !init) {
     throw new UserError(
       `nothing to migrate: no ${source === 'package.json scripts' ? 'package.json scripts in any workspace member' : 'tasks in ' + source}`,
@@ -263,7 +275,7 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   }
 
   const files: { relPath: string; abs: string; contents: string }[] = []
-  for (const p of plan.projects) {
+  for (const p of projects) {
     if (p.tasks.length === 0) continue
     const abs = path.join(p.dir, configName)
     files.push({
@@ -291,7 +303,7 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
     const conflicts = new Set<string>()
     // A discovered project with ANY existing vx config (.ts/.mjs/.js) — refuse
     // so we never shadow a hand-written config with a fresh .ts.
-    for (const p of plan.projects) {
+    for (const p of projects) {
       if (p.tasks.length === 0) continue
       const meta = metas.find((m) => m.dir === p.dir)
       if (meta?.configPath) conflicts.add(relPosix(root, meta.configPath))
@@ -316,7 +328,7 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   // order, and the report said "written" for a file the run never loaded
   // (item 1033).
   const replaced: string[] = []
-  for (const p of plan.projects) {
+  for (const p of projects) {
     if (p.tasks.length === 0) continue
     const existing = metas.find((m) => m.dir === p.dir)?.configPath
     if (existing && existing !== path.join(p.dir, configName)) replaced.push(existing)
@@ -337,7 +349,7 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   let todoCount = 0
   let clean = 0
   let cached = false
-  for (const p of plan.projects) {
+  for (const p of projects) {
     for (const t of p.tasks) {
       if (t.todos.length === 0 && t.task !== null) clean++
       if (t.task !== null && 'cache' in t.task) cached = true
@@ -408,8 +420,13 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
       }
     }
     report.push(...plan.notes)
-    report.push(dry ? 'files (dry run, nothing written):' : 'files written:')
+    if (files.length === 0) report.push(dry ? 'no files (dry run)' : 'no files written')
+    else report.push(dry ? 'files (dry run, nothing written):' : 'files written:')
     for (const f of files) report.push(`  ${f.relPath}`)
+    if (kept.length > 0) {
+      report.push('kept (each already has a vx config):')
+      for (const f of kept) report.push(`  ${f}`)
+    }
     if (replaced.length > 0) {
       report.push(dry ? 'would replace (dry run):' : 'replaced:')
       for (const f of replaced) report.push(`  ${relPosix(root, f)}`)