@vzn/vx 0.0.549 → 0.0.551

package/package.json

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

package/src/orchestrator/doctor.ts

@@ -23,16 +23,19 @@ import {
   computeWorkspaceFingerprint,
   findWorkspaceRoot,
   type LoadReads,
-  loadProjectConfig,
   loadWorkspace,
   lockfilePath,
-  type ProjectMeta,
   resolveCacheDir,
   resolveStoreRoot,
 } from '../workspace/index.js'
 import { flakyTasks, type FlakyTask } from './failure-mode.js'
 import type { VxPlugin } from './plugin.js'
-import { discoverProjects, loadProjects, loadWorkspacePlugins } from './projects.js'
+import {
+  discoverProjects,
+  type LoadProjectsArgs,
+  loadProjects,
+  loadWorkspacePlugins,
+} from './projects.js'
 
 const warnToStderr = (message: string): void => {
   process.stderr.write(`${message}\n`)
@@ -167,23 +170,23 @@ async function collectWorkspaceInfo(
     // The run path's load — a plugin's `project` stage counts — so the
     // doctor's task count is the number a run would see. A broken config
     // must not take the doctor down with it: the count then falls back to
-    // the configs that do load, one by one, the broken ones as zero.
-    try {
-      const loaded = await loadProjects({
+    // the same load, one project at a time, the broken ones as zero.
+    const load = {
+      workspaceRoot: root,
+      cacheDir,
+      plugins,
+      projectMetas: metas,
+      closure: false,
+      lock: null,
+      evalCache: {
+        store: cache,
         workspaceRoot: root,
-        cacheDir,
-        plugins,
-        projectMetas: metas,
-        seeds: 'all',
-        closure: false,
-        lock: null,
-        evalCache: {
-          store: cache,
-          workspaceRoot: root,
-          workspaceFingerprint: await computeWorkspaceFingerprint(root, reads),
-        },
-        warn,
-      })
+        workspaceFingerprint: await computeWorkspaceFingerprint(root, reads),
+      },
+      warn,
+    } as const
+    try {
+      const loaded = await loadProjects({ ...load, seeds: 'all' })
       for (const p of loaded.projects.values()) {
         const tasks = p.config.tasks ?? {}
         taskCount += Object.keys(tasks).length
@@ -197,7 +200,7 @@ async function collectWorkspaceInfo(
         tasks: taskCount,
         sandboxed,
         errors: configErrors,
-      } = await countLoadableTasks(metas, root))
+      } = await countLoadableTasks(load, root))
     }
   } finally {
     cache.close()
@@ -362,18 +365,19 @@ function gitVersion(): string | null {
 }
 
 async function countLoadableTasks(
-  metas: readonly ProjectMeta[],
+  load: Omit<LoadProjectsArgs, 'seeds'> & { closure: false },
   root: string,
 ): Promise<{ tasks: number; sandboxed: number; errors: InfoFacts['configErrors'] }> {
   let tasks = 0
   let sandboxed = 0
   const errors: InfoFacts['configErrors'] = []
+  // No seeds loads nothing and answers which projects an 'all' load seeds.
+  const { configured } = await loadProjects({ ...load, seeds: [] })
   await Promise.all(
-    metas.map(async (meta) => {
-      if (meta.configPath === null) return
+    configured.map(async (meta) => {
       try {
-        const config = await loadProjectConfig(meta.configPath)
-        const declared = Object.values(config.tasks ?? {})
+        const loaded = await loadProjects({ ...load, seeds: [meta.name] })
+        const declared = Object.values(loaded.projects.get(meta.name)?.config.tasks ?? {})
         tasks += declared.length
         for (const t of declared) if (t?.exec?.sandbox !== undefined) sandboxed++
       } catch (err) {
@@ -385,11 +389,12 @@ async function countLoadableTasks(
         // still did).
         const raw = err instanceof Error ? err.message : String(err)
         const bare = raw.startsWith('Project config ') ? raw.slice('Project config '.length) : raw
-        const message = bare.startsWith(`${meta.configPath}:`)
-          ? bare.slice(meta.configPath.length + 1).trimStart()
+        const where = meta.configPath ?? meta.dir
+        const message = bare.startsWith(`${where}:`)
+          ? bare.slice(where.length + 1).trimStart()
           : raw
         errors.push({
-          path: path.relative(root, meta.configPath).split(path.sep).join('/'),
+          path: path.relative(root, where).split(path.sep).join('/'),
           message,
         })
       }

package/src/workspace/config-eval.ts

@@ -175,7 +175,14 @@ self.onmessage = async (e) => {
       fn: typeof mod === 'function',
       changed: report,
     })
-  } catch (err) {
+  } catch (thrown) {
+    // Two syntax errors arrive as one AggregateError, whose own message
+    // names no line; the in-process load reports the first (X-6), so the
+    // hop does too (X-26).
+    const err =
+      thrown?.name === 'AggregateError' && Array.isArray(thrown.errors) && thrown.errors.length > 0
+        ? thrown.errors[0]
+        : thrown
     const report = changed()
     umaskBack()
     postMessage({

package/src/workspace/migrate-scripts.ts

@@ -670,11 +670,14 @@ export function migrateScripts(
   // insomnia's root is named as its `packages/insomnia`: a root config made
   // it a project, and every later run was refused for the duplicate (D-129).
   const clash = outsideName === undefined ? undefined : metas.find((m) => m.name === outsideName)
+  // A root with a config of its own is kept as written, and a run of `vx
+  // init` after the one that mapped it keeps it like a member's (X-27).
+  const rootKept = root !== undefined && root.configPath !== null
   const rootMeta: ProjectMeta | undefined =
     root !== undefined
-      ? root.configPath === null
-        ? root
-        : undefined
+      ? rootKept
+        ? undefined
+        : root
       : outsideName !== undefined && outsideDir !== undefined && clash === undefined
         ? { name: outsideName, dir: outsideDir, packageJson: outside as never, configPath: null }
         : undefined
@@ -722,10 +725,9 @@ export function migrateScripts(
       Object.entries(scripts).filter(([n, v]) => typeof v === 'string' && !out.has(n)),
     )
   }
-  const rootMapped =
-    rootMeta === undefined
-      ? 0
-      : Object.keys(rootScripts(rootMeta)).filter((n) => !LIFECYCLE.test(n)).length
+  const mapsOf = (meta: ProjectMeta | undefined): number =>
+    meta === undefined ? 0 : Object.keys(rootScripts(meta)).filter((n) => !LIFECYCLE.test(n)).length
+  const rootMapped = mapsOf(rootMeta)
   const listed = (names: readonly string[]): string =>
     names.slice(0, 8).join(', ') + (names.length > 8 ? ` and ${names.length - 8} more` : '')
   const outsideScripts = outside?.['scripts']
@@ -750,14 +752,15 @@ export function migrateScripts(
   // Why a root mapped nothing: `eslint .` beside a member's `lint` runs
   // nothing of the workspace, and the note said it did.
   const rootLeftOut = (): string => {
-    if (rootMeta === undefined) return 'run the workspace'
-    const scripts = scriptsOf(rootMeta)
+    const judged = rootKept ? root : rootMeta
+    if (judged === undefined) return 'run the workspace'
+    const scripts = scriptsOf(judged)
     const named = Object.keys(scripts).filter(
       (n) => typeof scripts[n] === 'string' && scripts[n] !== '' && !LIFECYCLE.test(n),
     )
     const runs = runningMembers(
       scripts,
-      rootMeta.dir,
+      judged.dir,
       metas.filter((m) => m !== root).map((m) => m.dir),
     )
     const shared = named.filter((n) => memberTasks.has(n) && !runs.has(n))
@@ -796,7 +799,7 @@ export function migrateScripts(
     notes.push(
       `package.json (the workspace root) not mapped: it has no "name", and vx names a project by it; give it one and run \`vx init\` again to map ${would.length} of its scripts (${would.slice(0, 8).join(', ')}${would.length > 8 ? ', …' : ''})`,
     )
-  } else if (rootName !== undefined) {
+  } else if (rootName !== undefined && !(rootKept && mapsOf(root) > 0)) {
     // A nameless root's vx.config is skipped (vx names projects by their
     // manifest's name), so the hand-written one needs a name first (vuejs/core).
     notes.push(

package/src/workspace/migration.ts

@@ -276,6 +276,12 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
     kept.push(relPosix(root, existing))
     return false
   })
+  // A plan never maps a workspace root that has a config (D-45), even
+  // under `--force`; its file stays, so it is named with the rest (X-27).
+  const rootConfig = metas.find((m) => m.dir === root)?.configPath
+  if (init && rootConfig && !projects.some((p) => p.dir === root && p.tasks.length > 0)) {
+    kept.push(relPosix(root, rootConfig))
+  }
   if (empty && !init) {
     throw new UserError(
       `nothing to migrate: no ${source === 'package.json scripts' ? 'package.json scripts in any workspace member' : 'tasks in ' + source}`,