@vzn/vx 0.0.644 → 0.0.645

package/src/orchestrator/run-context.ts

@@ -553,6 +553,44 @@ export function localBranchScope(
   return branchCacheScope(repo, name)
 }
 
+/**
+ * The refs a remote reads, in order (2026-10-20): the run's own branch,
+ * then the branch it merges into, then the default branch, each once. On
+ * CI from its env (a GitHub pull request's head branch, a merge queue's
+ * queue ref, a GitLab pipeline's ref), else from git: the checked-out
+ * branch, then the default (`origin/HEAD`). A remote plugin keys or scopes
+ * its entries by them (`scope` on turboCache/nxCache); core keys nothing
+ * by them.
+ */
+export function cacheRefs(
+  workspaceRoot: string,
+  baseBranch: string | undefined,
+  env: NodeJS.ProcessEnv = process.env,
+): string[] {
+  const set = (v: string | undefined): string | undefined =>
+    v !== undefined && v.trim() !== '' ? v.trim() : undefined
+  const head = (b: string | undefined) => (b === undefined ? undefined : `refs/heads/${b}`)
+  let own: string | undefined
+  let base: string | undefined
+  if (env['GITHUB_ACTIONS'] === 'true') {
+    own = head(set(env['GITHUB_HEAD_REF'])) ?? set(env['GITHUB_REF'])
+    base = head(set(env['GITHUB_BASE_REF']))
+    const queue = /^refs\/heads\/gh-readonly-queue\/(.+)\/pr-\d+-[0-9a-f]+$/.exec(own ?? '')
+    if (queue !== null) base = head(queue[1])
+  } else if (env['GITLAB_CI'] === 'true') {
+    const tag = set(env['CI_COMMIT_TAG'])
+    own = tag !== undefined ? `refs/tags/${tag}` : head(set(env['CI_COMMIT_REF_NAME']))
+    base = head(set(env['CI_MERGE_REQUEST_TARGET_BRANCH_NAME']))
+  } else {
+    own = head(
+      (readHeadDirect(workspaceRoot) ?? captureGitContext(workspaceRoot, null, env)).branch ??
+        undefined,
+    )
+  }
+  const trunk = head(baseBranch ?? captureDefaultBranch(env, workspaceRoot) ?? undefined)
+  return [...new Set([own, base, trunk].filter((r): r is string => r !== undefined))]
+}
+
 /**
  * The repository's path on its host (`owner/repo`; a GitLab subgroup's
  * `group/sub/repo` whole, as `gitlab()` names it); undefined for a local path.
@@ -591,7 +629,7 @@ function gitConfigSections(workspaceRoot: string): Map<string, Map<string, strin
  * The run's cache scope (owner, 2026-10-17): `VX_CACHE_SCOPE` (empty: none),
  * else a plugin's (`setBranch`, `github()` on Actions; null: the plugin
  * named the run trusted), else, with a cache plugin to share it, the
- * branch's from git. Undefined: the default keys.
+ * branch's from git. Undefined: no scope. It keys plugin entries only.
  */
 export function resolveCacheScope(
   workspaceRoot: string,

package/src/orchestrator/run.ts

@@ -810,6 +810,8 @@ async function runOnBus(
         localWrite: policy.localWrite,
         remote: remoteCacheEnabled && (policy.remoteRead || policy.remoteWrite),
         traffic: prepared.localCache.traffic,
+        downloads: prepared.localCache.downloads,
+        uploads: prepared.localCache.uploads,
         notDownloaded: () => deferredOutputs.pending().length,
       },
       concurrency,

package/src/orchestrator/task-hash.ts

@@ -97,9 +97,7 @@ export interface ComputeHashArgs {
  */
 export async function computeTaskHash(args: ComputeHashArgs): Promise<string> {
   if (isKeyless(args.node.config)) return keylessHash(args.node.id)
-  const key = await taskHash(args)
-  args.cache.noteKey?.(args.node.id, key)
-  return key
+  return taskHash(args)
 }
 
 async function taskHash(args: ComputeHashArgs): Promise<string> {

package/src/report/summary.ts

@@ -10,6 +10,7 @@ import { isGroupTask } from '../graph/index.js'
 import {
   barWidth,
   ERROR,
+  formatBytes,
   formatElapsed,
   gradientRule,
   paint,
@@ -203,6 +204,9 @@ export interface RunContext {
       readonly inFlight: number
       readonly keys: ReadonlyMap<string, { uploading: number; failures: readonly string[] }>
     }
+    /** Bytes the run's remote hits pulled, and its landed uploads pushed (live refs). */
+    downloads?: { readonly bytes: number }
+    uploads?: { readonly bytes: number }
     /** Tasks whose outputs are still in the remote store. */
     notDownloaded: () => number
   }
@@ -335,9 +339,17 @@ export function formatSummarySection(
       ]
       // The layer words are dim; only the counts carry colour (M, 2026-10-15).
       if (local.length > 0) cacheParts.push(`${dim('local')} ${local.join(' ')}`)
+      // Each transfer count is followed by its bytes, dim: what the
+      // remote moved is the cost a hit or an upload paid.
+      const sized = (count: number, glyph: string, bytes: number | undefined): string[] =>
+        count === 0
+          ? []
+          : bytes === undefined || bytes === 0
+            ? n(count, glyph, REMOTE)
+            : [...n(count, glyph, REMOTE), dim(formatBytes(bytes))]
       const remote = [
-        ...n(b.restoredRemote, '\u2193', REMOTE),
-        ...n(b.uploaded, '\u2191', REMOTE),
+        ...sized(b.restoredRemote, '\u2193', layers.downloads?.bytes),
+        ...sized(b.uploaded, '\u2191', layers.uploads?.bytes),
         ...n(b.remoteFailed, '\u2717', ERROR),
         ...n(b.uploading, '\u21e1', ACCENT),
       ]

package/src/settings.ts

@@ -127,7 +127,7 @@ export const SETTINGS: readonly Setting[] = [
     path: 'cache.scope',
     kind: { type: 'string' },
     default: "the branch's, `<owner>/<repo>:<branch>`, with a remote cache off `baseBranch`",
-    doc: "A branch's remote entries (`'vznjs/vx:feat-x'`): tasks the branch changed read the scope's key, the rest the default key; the local cache never uses it. Empty: no scope.",
+    doc: "The branch scope plugin entries are keyed under (`'vznjs/vx:feat-x'`); task keys never carry it. Empty: no scope.",
     config: false,
   },
   {
@@ -192,12 +192,6 @@ export const SETTINGS: readonly Setting[] = [
     default: 'true',
     doc: 'Keep a larger entry as its plain files, which a hit copies or clones out; off, as one `.tar.zst`.',
   },
-  {
-    path: 'cache.store.verify',
-    kind: { type: 'enum', values: ['stat', 'hash', 'none'] },
-    default: 'stat',
-    doc: "What a hit on plain files checks first: each file's size and mtime, every byte, or nothing.",
-  },
   {
     path: 'cache.upload.failures',
     kind: { type: 'enum', values: ['ci', 'local', 'always'] },

package/src/workspace/affected.ts

@@ -14,7 +14,6 @@ import {
   gitSpawnRefusal,
   isExecutableMissing,
   isInstalledPath,
-  isUserError,
   notAWorkTree,
   relPosix,
   UserError,
@@ -741,44 +740,6 @@ function noHistoryRefusal(workspaceRoot: string): UserError | undefined {
   return undefined
 }
 
-/**
- * What a branch changed, for which of its tasks read its cache scope
- * (owner, 2026-10-17): from `base` (a plugin's: a pull request's base
- * commit), else from the merge base with the base branch. No base, or
- * one git cannot resolve (a CI checkout at `fetch-depth: 1`), is no
- * change: every task reads the default key, which costs hits, never
- * correctness, since a key must still match.
- */
-export async function branchChanges(
-  workspaceRoot: string,
-  base: string | undefined,
-  baseBranch: string | undefined,
-  projects: Promise<readonly ProjectMeta[]>,
-  /** The run's own enumeration, so the diff walks nothing a second time. */
-  walked: Pick<AffectedArgs, 'untracked' | 'links'> = {},
-): Promise<AffectedChanges> {
-  const none: AffectedChanges = {
-    projects: new Set(),
-    changed: [],
-    paths: new Map(),
-    whole: new Set(),
-  }
-  const since = base ?? (await baseBranchRef(workspaceRoot, baseBranch))?.ref
-  if (since === undefined) return none
-  try {
-    return await affectedChanges({
-      workspaceRoot,
-      since,
-      projects,
-      configImports: false,
-      ...walked,
-    })
-  } catch (err) {
-    if (!isUserError(err)) throw err
-    return none
-  }
-}
-
 /**
  * The base branch as a ref: `origin/<name>`, else the local branch (a
  * clone with no remote), and whether HEAD is on it. The name is the

package/src/workspace/index.ts

@@ -6,7 +6,6 @@ export {
   type AffectedChanges,
   affectedProjects,
   defaultAffectedBase,
-  branchChanges,
   type FingerprintClaims,
   refIsHead,
 } from './affected.js'