@vzn/vx 0.0.37 → 0.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vzn/vx",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "description": "An open, extensible monorepo task runner.",
   "type": "module",
   "exports": {
@@ -17,10 +17,10 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "@vzn/vx-linux-x64": "0.0.37",
-    "@vzn/vx-linux-arm64": "0.0.37",
-    "@vzn/vx-darwin-x64": "0.0.37",
-    "@vzn/vx-darwin-arm64": "0.0.37"
+    "@vzn/vx-linux-x64": "0.0.39",
+    "@vzn/vx-linux-arm64": "0.0.39",
+    "@vzn/vx-darwin-x64": "0.0.39",
+    "@vzn/vx-darwin-arm64": "0.0.39"
   },
   "dependencies": {
     "@anthropic-ai/sandbox-runtime": "^0.0.76"

package/src/cli/last.ts

@@ -14,7 +14,7 @@ import {
   listInvocations,
   type RunSummaryRow,
 } from '../orchestrator/index.js'
-import { UserError } from '../util/index.js'
+import { formatElapsed, UserError } from '../util/index.js'
 import { findWorkspaceRoot } from '../workspace/index.js'
 import { cliCacheDir, parseCacheDirFlag, warnToStderr } from './workspace-config.js'
 
@@ -78,12 +78,7 @@ export function parseLastArgs(args: readonly string[]): LastArgs {
 
 const fmtWhen = (ms: number): string => new Date(ms).toISOString()
 
-function fmtMs(ms: number): string {
-  if (ms < 1000) return `${Math.round(ms)}ms`
-  if (ms < 60_000) return `${(ms / 1000).toFixed(2)}s`
-  const m = Math.floor(ms / 60_000)
-  return `${m}m ${Math.round((ms - m * 60_000) / 1000)}s`
-}
+const fmtMs = (ms: number): string => formatElapsed(ms, true)
 
 /**
  * What an executed task used — its peak RSS and its CPU parallelism (CPU

package/src/orchestrator/summary.ts

@@ -8,6 +8,7 @@ import type { FlakyFinding } from './failure-mode.js'
 import { paint, type ColorSupport } from './colors.js'
 import { tallyOutcomes } from './tally.js'
 import { isGroupTask } from '../graph/index.js'
+import { formatElapsed } from '../util/index.js'
 
 const NO_COLOR: ColorSupport = { enabled: false }
 
@@ -421,6 +422,5 @@ export function formatFlakySection(findings: readonly FlakyFinding[]): string[]
 }
 
 export function formatDuration(ms: number): string {
-  if (ms < 1000) return `${Math.round(ms)}ms`
-  return `${(ms / 1000).toFixed(2)}s`
+  return formatElapsed(ms)
 }

package/src/util/index.ts

@@ -17,7 +17,7 @@ export {
 } from './errors.js'
 export { xxh3, xxh3hex } from './hash.js'
 export { mark, printTimings, span } from './timing.js'
-export { clampInt, MAX_TIMEOUT_MS, parseDecimalInt } from './num.js'
+export { clampInt, formatElapsed, MAX_TIMEOUT_MS, parseDecimalInt } from './num.js'
 export {
   asTrees,
   BUN_GLOB_WILDCARDS,

package/src/util/num.ts

@@ -35,3 +35,17 @@ export function parseDecimalInt(input: string): number | null {
   const n = Number(input)
   return Number.isSafeInteger(n) ? n : null
 }
+
+/**
+ * `ms` as vx prints a duration: whole milliseconds below a second, seconds
+ * to two places, and with `minutes` whole minutes and seconds from a
+ * minute on. Rounded to the unit shown BEFORE the unit is chosen: 999.6 ms
+ * printed `1000ms`, 59,996 ms `60.00s` and 119,600 ms `1m 60s` (item 1034).
+ */
+export function formatElapsed(ms: number, minutes = false): string {
+  if (Math.round(ms) < 1000) return `${Math.round(ms)}ms`
+  const hundredths = Math.round(ms / 10)
+  if (!minutes || hundredths < 6000) return `${(hundredths / 100).toFixed(2)}s`
+  const s = Math.round(ms / 1000)
+  return `${Math.floor(s / 60)}m ${s % 60}s`
+}

package/src/workspace/config-schema.ts

@@ -822,18 +822,7 @@ function isEnvName(name: unknown): name is string {
  * trimmed away by the reader (item 1000).
  */
 function assertTaskName(name: string, configPath: string): void {
-  const why =
-    name.trim().length === 0
-      ? 'is empty'
-      : name.trim() !== name
-        ? 'has surrounding whitespace'
-        : name.includes('#')
-          ? "holds '#', which separates a project from its task"
-          : name.includes('*')
-            ? "holds '*', which makes it a pattern"
-            : name.startsWith('^') || name.startsWith('!')
-              ? `starts with '${name[0]}', which names dependencies' tasks or negates`
-              : null
+  const why = taskNameProblem(name)
   if (why === null) return
   throw new UserError(
     `${configPath}: task name ${JSON.stringify(name)} ${why} — dependsOn, cache.inputs.tasks and ` +
@@ -841,6 +830,21 @@ function assertTaskName(name: string, configPath: string): void {
   )
 }
 
+/** Why `name` cannot be a task name, or null; `vx init` skips such a script (item 1033). */
+export function taskNameProblem(name: string): string | null {
+  return name.trim().length === 0
+    ? 'is empty'
+    : name.trim() !== name
+      ? 'has surrounding whitespace'
+      : name.includes('#')
+        ? "holds '#', which separates a project from its task"
+        : name.includes('*')
+          ? "holds '*', which makes it a pattern"
+          : name.startsWith('^') || name.startsWith('!')
+            ? `starts with '${name[0]}', which names dependencies' tasks or negates`
+            : null
+}
+
 /** The graph's `*`-only task glob (`compileTaskPattern`), mirrored: `*` is the sole metacharacter. */
 function taskPatternRegExp(pattern: string): RegExp {
   const escaped = pattern.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*')

package/src/workspace/migrate-scripts.ts

@@ -24,6 +24,7 @@
 // `<pm> run <other>` becomes a GROUP over `<other>`, so the graph sees the
 // dependency instead of a package-manager subprocess it cannot cache.
 
+import { taskNameProblem } from './config-schema.js'
 import type { ProjectMeta } from './workspace.js'
 import {
   foldScriptHooks,
@@ -116,10 +117,19 @@ export function migrateScripts(metas: readonly ProjectMeta[]): MigrationPlan {
   const projects: GeneratedProject[] = []
   for (const meta of metas) {
     const scripts = scriptsOf(meta)
-    const names = Object.keys(scripts).filter(
+    const runnable = Object.keys(scripts).filter(
       (n) => typeof scripts[n] === 'string' && scripts[n] !== '',
     )
-    if (names.length === 0) continue
+    // A script whose name no task may carry (`lint#fix`, `^up`) was written
+    // as one, and the next run refused the whole config (item 1033). It is
+    // left out, with a TODO, and a script delegating to it keeps its
+    // command rather than naming it as an edge.
+    const refused = runnable.flatMap((n) => {
+      const why = taskNameProblem(n)
+      return why === null ? [] : [[n, why] as const]
+    })
+    const names = runnable.filter((n) => taskNameProblem(n) === null)
+    if (runnable.length === 0) continue
     const hasBuild = names.includes('build')
     const has = (n: string): boolean => names.includes(n)
     const tasks: GeneratedTask[] = []
@@ -173,6 +183,15 @@ export function migrateScripts(metas: readonly ProjectMeta[]): MigrationPlan {
       }
       tasks.push({ name, todos, task })
     }
+    for (const [name, why] of refused) {
+      tasks.push({
+        name,
+        todos: [
+          `script ${JSON.stringify(name)} not migrated: its name ${why} — rename the script, or add it by hand under another name`,
+        ],
+        task: null,
+      })
+    }
     upstreamBuildOnWorker(tasks)
     if (tasks.length > 0) projects.push({ name: meta.name, dir: meta.dir, importLines: [], tasks })
   }

package/src/workspace/migration.ts

@@ -5,10 +5,12 @@
 // tool wrote it. Core knows no source format here: a mapper returns a
 // `MigrationPlan` and this file does the rest.
 
+import { unlink } from 'node:fs/promises'
 import path from 'node:path'
 import { relPosix, UserError } from '../util/index.js'
 import type { ProjectMeta } from './workspace.js'
 import { loadWorkspace, unreachedHint, unreachedPackages } from './workspace.js'
+import { WORKSPACE_CONFIG_FILENAMES } from './project-loader.js'
 
 /**
  * Escape an arbitrary string into a single-quoted TS literal. Escapes
@@ -164,13 +166,10 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
   }
   // A migrated workspace must declare its executor and cache — nothing is
   // applied by default. Emit the workspace file unless the repo already has
-  // one in any supported extension.
+  // one in any extension the loader reads: a hand-written `.mts` was missed,
+  // and the `.ts` written beside it won by load order (item 1033).
   const hasWorkspaceFile = (
-    await Promise.all(
-      ['vx.workspace.ts', 'vx.workspace.mjs', 'vx.workspace.js'].map((n) =>
-        Bun.file(path.join(root, n)).exists(),
-      ),
-    )
+    await Promise.all(WORKSPACE_CONFIG_FILENAMES.map((n) => Bun.file(path.join(root, n)).exists()))
   ).some(Boolean)
   if (!hasWorkspaceFile) {
     const abs = path.join(root, workspaceName)
@@ -201,12 +200,23 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
     }
   }
 
+  // Under --force a project's config of another extension is REPLACED: the
+  // new one was written beside it, the loader read one of the two by its
+  // order, and the report said "written" for a file the run never loaded
+  // (item 1033).
+  const replaced: string[] = []
+  for (const p of plan.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)
+  }
   if (dry) {
     for (const f of files) {
       process.stdout.write(`── ${f.relPath} ──\n${f.contents}\n`)
     }
   } else {
     for (const f of files) await Bun.write(f.abs, f.contents)
+    for (const f of replaced) await unlink(f)
   }
 
   const todoList: string[] = []
@@ -258,6 +268,10 @@ export async function applyMigration(args: ApplyMigrationArgs): Promise<number>
     report.push(...plan.notes)
     report.push(dry ? 'files (dry run, nothing written):' : 'files written:')
     for (const f of files) report.push(`  ${f.relPath}`)
+    if (replaced.length > 0) {
+      report.push(dry ? 'would replace (dry run):' : 'replaced:')
+      for (const f of replaced) report.push(`  ${relPosix(root, f)}`)
+    }
   }
   const firstTask =
     plan.projects.flatMap((p) => p.tasks.map((t) => t.name)).find((n) => n === 'build') ??
@@ -345,7 +359,14 @@ function renderConfigFile(
   for (const t of p.tasks) {
     for (const todo of t.todos) lines.push(`    // TODO(vx-migrate): ${todo}`)
     if (t.task === null) continue // skipped target — the TODO above explains
-    const key = IDENT.test(t.name) ? t.name : quoteTsLiteral(t.name)
+    // `__proto__: {…}` in a literal SETS the prototype, quoted or not, and
+    // the run refused the config (item 1033); a computed key is a property.
+    const key =
+      t.name === '__proto__'
+        ? `[${quoteTsLiteral(t.name)}]`
+        : IDENT.test(t.name)
+          ? t.name
+          : quoteTsLiteral(t.name)
     lines.push(`    ${key}: ${renderValue(t.task, '    ')},`)
   }
   lines.push('  },', format === 'ts' ? '} satisfies ProjectConfig' : '}', '')