@vzn/vx 0.0.279 → 0.0.280

package/package.json

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

package/src/cli/help.ts

@@ -61,7 +61,7 @@ export function helpText(pluginCommands: readonly string[] = []): string {
     '                             foo, @scope/*, ./packages/foo, foo..., ...foo,',
     '                             foo^..., !foo, [<since>]',
     '      --affected[=<base>]  Sugar for --filter "...[<base>]". Default base =',
-    '                             origin/HEAD (falls back to HEAD~1).',
+    '                             affectedBase, else origin/HEAD, else HEAD~1.',
     "  pkg#task                 Run a specific project's task directly.",
     '',
     'Execution (for run):',
@@ -216,6 +216,9 @@ export function flagHint(verb: string, arg: string): string {
   if (!arg.startsWith('-')) return ''
   const name = arg.replace(/=.*$/, '')
   const flags = acceptedFlags(verb)
+  // `--json` is gh's and Nx's spelling; a verb with `--format` reads it
+  // there, and no edit budget reaches `--format json` from `--json`.
+  if (name === '--json' && flags.includes('--format')) return ' (did you mean --format json?)'
   // A flag cut short at a word (`--dry` for prune's `--dry-run`, which
   // `vx run` spells `--dry`) is too many edits away for either budget.
   const cut = flags.filter((f) => f.startsWith(`${name}-`))

package/src/cli/run.ts

@@ -17,6 +17,7 @@ import type { ContinueMode } from '../graph/index.js'
 import { type CachePolicy, FULL_CACHE_POLICY, parseCachePolicy } from '../cache/index.js'
 import { findCwdSelection, pickTask, resolveFilters } from './select.js'
 import { nxTargetHint, taskNamesHere } from './task-verb.js'
+import { loadCliWorkspace } from './workspace-config.js'
 import { MAX_TIMEOUT_MS, isUserError, parseDecimalInt, machineParallelism } from '../util/index.js'
 import { formatGraphDot, formatPlanJson, formatPlanText } from './plan-format.js'
 
@@ -464,6 +465,9 @@ export async function resolveRunOptions(
   if (parsed.affected !== undefined) {
     const root = await findWorkspaceRoot(cwd)
     let base = parsed.affected
+    // The workspace's `affectedBase` — or a plugin's `config` stage, from
+    // nx.json's `defaultBase` or `TURBO_SCM_BASE` — comes before the guess.
+    if (base === '') base = (await loadCliWorkspace(root)).workspaceConfig?.affectedBase ?? ''
     if (base === '') {
       try {
         base = await defaultAffectedBase(root)

package/src/config.ts

@@ -22,6 +22,12 @@ export interface WorkspaceConfig {
    * folded into a cache key.
    */
   cacheRetention?: { olderThan?: string; maxSize?: string }
+  /**
+   * The git ref a bare `--affected` compares with (`origin/develop`).
+   * `--affected=<base>` overrides it. Omitted → `origin/HEAD`, else
+   * `HEAD~1`. Never folded into a cache key.
+   */
+  affectedBase?: string
   /**
    * Plugins registered for this workspace, consulted in this order once
    * per `vx run`: each fills any of the pipeline stages and capabilities

package/src/workspace/config-schema.ts

@@ -35,6 +35,7 @@ const WORKSPACE_FIELDS = new Set([
   'cacheDir',
   'timeout',
   'cacheRetention',
+  'affectedBase',
   'plugins',
 ])
 
@@ -105,6 +106,12 @@ export function validateWorkspace(config: WorkspaceConfig, configPath: string):
     assertTimeoutInRange(config.timeout, `${configPath}: \`timeout\``)
   }
   if (config.cacheRetention !== undefined) validateRetention(config.cacheRetention, configPath)
+  if (config.affectedBase !== undefined) {
+    // A leading '-' would reach git as an option, not a ref.
+    if (typeof config.affectedBase !== 'string' || !/^[^-\s]\S*$/.test(config.affectedBase)) {
+      throw new UserError(`${configPath}: \`affectedBase\` must be a git ref like 'origin/main'`)
+    }
+  }
   if (config.plugins !== undefined) {
     if (!Array.isArray(config.plugins)) {
       throw new UserError(`${configPath}: \`plugins\` must be an array of plugin objects`)
@@ -768,7 +775,7 @@ const FOREIGN_FIELDS: ReadonlyMap<ReadonlySet<string>, Readonly<Record<string, s
         'a cache plugin in `plugins` (`turboCache()` or `nxCache()` from `@vzn/vx-migrate`)',
       parallel: '`concurrency`',
       cacheDirectory: '`cacheDir`',
-      defaultBase: 'the base in `--affected=<base>` (default `origin/HEAD`)',
+      defaultBase: '`affectedBase`',
       tasksRunnerOptions: 'a cache plugin in `plugins` (`nxCache()` from `@vzn/vx-migrate`)',
       globalPassThroughEnv: '`exec.env.passThrough` on the tasks it passes to',
     },