fg-devkit 1.12.6 → 1.12.7

package/configs/dependency-policy.vue-workspace.json

@@ -1,6 +1,12 @@
 {
   "toolchain": {
-    "packageManager": "pnpm@11.9.0"
+    "packageManager": "pnpm@11.9.0",
+    "node": {
+      "nvmrc": "22",
+      "engines": ">=22.13.0",
+      "jenkinsImage": "node22",
+      "dockerTag": "22-alpine"
+    }
   },
   "managedDependencies": {
     "dependencies": {
@@ -8,13 +14,13 @@
       "@lexical/html": "0.30.0",
       "@lexical/list": "0.30.0",
       "@lexical/rich-text": "0.30.0",
-      "@piwikpro/vue-piwik-pro": "1.7.0",
-      "@sentry/browser": "10.60.0",
+      "@piwikpro/vue-piwik-pro": "1.7.1",
+      "@sentry/browser": "10.68.0",
       "@sentry/tracing": "7.120.4",
-      "@sentry/vue": "10.60.0",
-      "@sentry/wasm": "10.60.0",
-      "@tailwindcss/postcss": "4.3.1",
-      "@tanstack/vue-query": "5.101.1",
+      "@sentry/vue": "10.68.0",
+      "@sentry/wasm": "10.68.0",
+      "@tailwindcss/postcss": "4.3.3",
+      "@tanstack/vue-query": "5.101.4",
       "@types/leaflet": "1.9.21",
       "@unhead/vue": "2.0.5",
       "@vue-leaflet/vue-leaflet": "0.10.1",
@@ -25,23 +31,23 @@
       "chart.js": "4.5.1",
       "content-disposition-header": "0.6.0",
       "date-fns": "4.4.0",
-      "element-plus": "2.14.2",
-      "fds-vue-core": "8.2.1",
+      "element-plus": "2.14.3",
+      "fds-vue-core": "8.3.0",
       "imask": "7.6.1",
       "leaflet": "1.9.4",
       "lexical": "0.30.0",
       "lodash": "4.18.1",
       "lodash-es": "4.18.1",
-      "markdown-it": "14.2.0",
+      "markdown-it": "14.3.0",
       "pinia": "3.0.4",
-      "playwright": "1.61.0",
+      "playwright": "1.62.0",
       "quill": "2.0.3",
       "randexp": "0.5.3",
       "register-service-worker": "1.7.2",
       "vega-embed": "7.1.0",
       "vega-lite": "6.4.3",
-      "vue-chartjs": "5.3.3",
-      "vue-i18n": "11.4.6",
+      "vue-chartjs": "5.3.4",
+      "vue-i18n": "11.4.8",
       "vue-quilly": "1.1.6",
       "vue-router": "4.6.3",
       "vue3-touch-keyboard": "1.3.9",
@@ -53,47 +59,47 @@
       "@chromatic-com/storybook": "5.2.1",
       "@eslint/js": "9.39.1",
       "@intlify/unplugin-vue-i18n": "11.2.4",
-      "@playwright/test": "1.61.0",
-      "@storybook/addon-a11y": "10.4.6",
-      "@storybook/addon-docs": "10.4.6",
-      "@storybook/addon-vitest": "10.4.6",
-      "@storybook/vue3": "10.4.6",
-      "@storybook/vue3-vite": "10.4.6",
-      "@tanstack/vue-query-devtools": "6.1.35",
+      "@playwright/test": "1.62.0",
+      "@storybook/addon-a11y": "10.5.4",
+      "@storybook/addon-docs": "10.5.4",
+      "@storybook/addon-vitest": "10.5.4",
+      "@storybook/vue3": "10.5.4",
+      "@storybook/vue3-vite": "10.5.4",
+      "@tanstack/vue-query-devtools": "6.1.38",
       "@tsconfig/node22": "22.0.5",
       "@types/lodash-es": "4.17.12",
       "@types/node": "22.16.5",
       "@vitest/browser": "3.2.4",
-      "@vue/compiler-dom": "3.5.38",
+      "@vue/compiler-dom": "3.5.40",
       "@vue/eslint-config-standard": "8.0.1",
-      "@vue/server-renderer": "3.5.38",
+      "@vue/server-renderer": "3.5.40",
       "@vue/test-utils": "2.4.11",
       "@vuepic/vue-datepicker": "6.0.3",
       "arg": "5.0.2",
       "babel-eslint": "10.1.0",
-      "eslint-plugin-storybook": "10.4.6",
+      "eslint-plugin-storybook": "10.5.4",
       "globals": "15.11.0",
       "jsdom": "26.1.0",
-      "postcss": "8.5.15",
-      "sass": "1.101.0",
+      "postcss": "8.5.23",
+      "sass": "1.102.0",
       "start-server-and-test": "2.1.3",
-      "storybook": "10.4.6",
-      "tsx": "4.22.4",
-      "vega": "6.2.0",
+      "storybook": "10.5.4",
+      "tsx": "4.23.1",
+      "vega": "6.3.1",
       "vite-plugin-dts": "4.5.4",
-      "vite-plugin-vue-devtools": "8.1.3",
-      "vitest": "4.1.9",
+      "vite-plugin-vue-devtools": "8.2.1",
+      "vitest": "4.1.10",
       "yaml": "2.9.0"
     }
   },
   "managedAnywhere": {
-    "@tailwindcss/vite": "4.3.1",
-    "@vitejs/plugin-vue": "6.0.7",
+    "@tailwindcss/vite": "4.3.3",
+    "@vitejs/plugin-vue": "6.0.8",
     "axios": "1.18.1",
     "dotenv": "16.4.5",
     "qrcode.vue": "3.10.0",
-    "tailwindcss": "4.3.1",
+    "tailwindcss": "4.3.3",
     "vite": "7.3.5",
-    "vue": "3.5.38"
+    "vue": "3.5.40"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-devkit",
-  "version": "1.12.6",
+  "version": "1.12.7",
   "description": "Shared configs, scripts, and DX tooling for Vue / TypeScript frontend repos",
   "type": "module",
   "license": "UNLICENSED",
@@ -34,7 +34,23 @@
     "./scripts/fleet-vulns.mjs": "./scripts/fleet-vulns.mjs",
     "./scripts/fleet-bump-fg-devkit.mjs": "./scripts/fleet-bump-fg-devkit.mjs",
     "./scripts/bump-pnpm-toolchain.mjs": "./scripts/bump-pnpm-toolchain.mjs",
-    "./scripts/fleet-vue-repos.mjs": "./scripts/fleet-vue-repos.mjs",
+    "./scripts/bump-node-toolchain.mjs": "./scripts/bump-node-toolchain.mjs",
+    "./scripts/sync-node-toolchain.mjs": "./scripts/sync-node-toolchain.mjs",
+    "./scripts/node-toolchain-sync.mjs": "./scripts/node-toolchain-sync.mjs",
+    "./scripts/fleet-project-repos.mjs": "./scripts/fleet-project-repos.mjs",
+    "./scripts/fleet-repo-picker.mjs": "./scripts/fleet-repo-picker.mjs",
+    "./scripts/sync-pnpm-toolchain.mjs": "./scripts/sync-pnpm-toolchain.mjs",
+    "./scripts/pnpm-toolchain-sync.mjs": "./scripts/pnpm-toolchain-sync.mjs",
+    "./scripts/fleet-git-pull.mjs": "./scripts/fleet-git-pull.mjs",
+    "./scripts/fleet-git-pull-scoped.mjs": "./scripts/fleet-git-pull-scoped.mjs",
+    "./scripts/git-pull-fleet-common.mjs": "./scripts/git-pull-fleet-common.mjs",
+    "./scripts/git-fleet-common.mjs": "./scripts/git-fleet-common.mjs",
+    "./scripts/git-commit-push-fleet-common.mjs": "./scripts/git-commit-push-fleet-common.mjs",
+    "./scripts/fleet-git-commit-push.mjs": "./scripts/fleet-git-commit-push.mjs",
+    "./scripts/fleet-git-commit-push-scoped.mjs": "./scripts/fleet-git-commit-push-scoped.mjs",
+    "./scripts/git-discard-fleet-common.mjs": "./scripts/git-discard-fleet-common.mjs",
+    "./scripts/fleet-git-discard.mjs": "./scripts/fleet-git-discard.mjs",
+    "./scripts/fleet-git-discard-scoped.mjs": "./scripts/fleet-git-discard-scoped.mjs",
     "./scripts/policy-upgrade.mjs": "./scripts/policy-upgrade.mjs",
     "./scripts/policy-upgrade-commit.mjs": "./scripts/policy-upgrade-commit.mjs",
     "./scripts/audit-override-commit.mjs": "./scripts/audit-override-commit.mjs",
@@ -70,7 +86,7 @@
     ".cursor/rules/core-coding-standards.mdc"
   ],
   "engines": {
-    "node": "^20.19.0 || >=22.12.0"
+    "node": ">=22.13.0"
   },
   "keywords": [
     "eslint",
@@ -85,6 +101,7 @@
     }
   },
   "dependencies": {
+    "@inquirer/checkbox": "4.3.2",
     "@inquirer/confirm": "6.1.1",
     "@inquirer/input": "5.1.2",
     "@inquirer/select": "5.2.1",
@@ -109,8 +126,7 @@
     "vue-tsc": "3.3.5"
   },
   "devDependencies": {
-    "cz-git": "^1.13.1",
-    "czg": "^1.13.1"
-  },
-  "scripts": {}
+    "cz-git": "1.13.1",
+    "czg": "1.13.1"
+  }
 }

package/scaffold/vue/package.json

@@ -15,30 +15,33 @@
     "poeditor:upload": "pnpm exec fg-devkit poeditor-upload"
   },
   "dependencies": {
-    "@tailwindcss/postcss": "4.3.1",
-    "@tailwindcss/vite": "4.3.1",
-    "@tanstack/vue-query": "5.101.1",
+    "@tailwindcss/postcss": "4.3.3",
+    "@tailwindcss/vite": "4.3.3",
+    "@tanstack/vue-query": "5.101.4",
     "axios": "1.18.1",
     "content-disposition-header": "0.6.0",
     "date-fns": "4.4.0",
     "dotenv": "16.4.5",
-    "fds-vue-core": "8.2.1",
+    "fds-vue-core": "8.3.0",
     "pinia": "3.0.4",
     "qrcode.vue": "3.10.0",
-    "vue": "3.5.38",
-    "vue-i18n": "11.4.6",
+    "vue": "3.5.40",
+    "vue-i18n": "11.4.8",
     "vue-router": "4.6.3"
   },
   "devDependencies": {
     "@intlify/unplugin-vue-i18n": "11.2.4",
-    "@tanstack/vue-query-devtools": "6.1.35",
+    "@tanstack/vue-query-devtools": "6.1.38",
     "@types/node": "22.16.5",
-    "@vitejs/plugin-vue": "6.0.7",
-    "fg-devkit": "1.12.6",
+    "@vitejs/plugin-vue": "6.0.8",
+    "fg-devkit": "1.12.7",
     "start-server-and-test": "2.1.3",
-    "tailwindcss": "4.3.1",
-    "tsx": "4.22.4",
+    "tailwindcss": "4.3.3",
+    "tsx": "4.23.1",
     "vite": "7.3.5"
   },
-  "packageManager": "pnpm@11.9.0"
+  "packageManager": "pnpm@11.9.0",
+  "engines": {
+    "node": ">=22.13.0"
+  }
 }

package/scripts/bump-node-toolchain.mjs

@@ -0,0 +1,260 @@
+#!/usr/bin/env node
+/**
+ * Maintainer: sync Node toolchain across fg-devkit and fleet repositories.
+ *
+ * Steps in fg-devkit:
+ *   1. Resolve node policy from CLI or fg-devkit .nvmrc + package.json engines
+ *   2. Write policy.toolchain.node to dependency policy file
+ *   3. Sync fg-devkit repo (scaffold Dockerfile.local included via repo walk)
+ *
+ * Steps per project under projects-root (unless --skip-fleet):
+ *   1. sync-node-toolchain against this checkout's policy file
+ *
+ * Usage (from fg-devkit repository root):
+ *   pnpm exec fg-devkit bump-node-toolchain [nvmrc-version] [projects-root] [options]
+ *
+ * Options:
+ *   --dry-run       Print planned changes without writing files
+ *   --skip-fleet    Only update fg-devkit and policy file
+ *   --engines=RANGE Override engines range (e.g. >=22.13.0); omit to keep policy/fg-devkit value
+ *   --no-engines    Do not set engines.node in package.json files
+ *   --pick          Interactive checkbox to choose fleet repositories (default when TTY)
+ *   --all           Run on all fleet repositories without prompting
+ *   --only=a,b      Run only on matching repos (basename or path under projects root)
+ *
+ * Examples:
+ *   pnpm exec fg-devkit bump-node-toolchain
+ *   pnpm exec fg-devkit bump-node-toolchain 22
+ *   pnpm exec fg-devkit bump-node-toolchain --dry-run
+ *   pnpm exec fg-devkit bump-node-toolchain --skip-fleet
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import {
+  DEFAULT_NODE_TOOLCHAIN_EXCLUDE,
+  collectFleetProjectRepos,
+} from './fleet-project-repos.mjs'
+import { parseFleetSelectionFlags, resolveFleetRepos } from './fleet-repo-picker.mjs'
+import {
+  formatNodeNvmrc,
+  readFgDevkitNodePolicy,
+  resolveExpectedNodePolicy,
+} from './dependency-policy-toolchain.mjs'
+import { syncNodeToolchainInRepo } from './node-toolchain-sync.mjs'
+import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+
+const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const fgDevkitRoot = path.resolve(scriptDir, '..')
+const fgDevkitPkgPath = path.join(fgDevkitRoot, 'package.json')
+const policyPath = resolveDependencyPolicyPath(scriptDir, fgDevkitRoot, [])
+
+const cliArgs = process.argv.slice(2)
+const dryRun = cliArgs.includes('--dry-run')
+const skipFleet = cliArgs.includes('--skip-fleet')
+const noEngines = cliArgs.includes('--no-engines')
+const enginesArg = cliArgs.find((a) => a.startsWith('--engines='))?.slice('--engines='.length)
+const { pick, all, only, filteredArgs: positionalArgs } = parseFleetSelectionFlags(cliArgs)
+
+function readJson(jsonPath) {
+  return JSON.parse(fs.readFileSync(jsonPath, 'utf8'))
+}
+
+function assertFgDevkitMaintainerContext() {
+  if (path.resolve(process.cwd()) !== fgDevkitRoot) {
+    console.error('[bump-node-toolchain] Run from the fg-devkit repository root.')
+    process.exit(1)
+  }
+  try {
+    const pkg = readJson(fgDevkitPkgPath)
+    if (pkg?.name !== 'fg-devkit') {
+      console.error('[bump-node-toolchain] package.json name must be fg-devkit.')
+      process.exit(1)
+    }
+  } catch {
+    console.error('[bump-node-toolchain] Could not read fg-devkit package.json.')
+    process.exit(1)
+  }
+}
+
+function runStep(label, fn) {
+  console.log(`\n[bump-node-toolchain] ${label}`)
+  return fn()
+}
+
+function updatePolicyNodeToolchain(nvmrcArg) {
+  const policy = readJson(policyPath)
+  const fromFgDevkit = readFgDevkitNodePolicy(fgDevkitRoot)
+  if (!fromFgDevkit && !nvmrcArg) {
+    console.error('[bump-node-toolchain] No .nvmrc in fg-devkit and no version argument provided.')
+    process.exit(1)
+  }
+
+  const nvmrc = formatNodeNvmrc(nvmrcArg ?? fromFgDevkit.nvmrc)
+  const engines = noEngines
+    ? null
+    : enginesArg ?? fromFgDevkit?.engines ?? policy.toolchain?.node?.engines ?? `>=${nvmrc}.0`
+
+  const nextNode = {
+    nvmrc,
+    ...(engines ? { engines } : {}),
+    jenkinsImage: `node${nvmrc.split('.')[0]}`,
+    dockerTag: `${nvmrc.split('.')[0]}-alpine`,
+  }
+
+  const next = {
+    ...policy,
+    toolchain: {
+      ...(policy.toolchain ?? {}),
+      node: nextNode,
+    },
+  }
+
+  const current = policy.toolchain?.node
+  const changed =
+    !current ||
+    current.nvmrc !== nextNode.nvmrc ||
+    current.engines !== nextNode.engines ||
+    current.jenkinsImage !== nextNode.jenkinsImage ||
+    current.dockerTag !== nextNode.dockerTag
+
+  if (changed) {
+    if (dryRun) {
+      console.log(`[bump-node-toolchain] DRY RUN policy toolchain.node -> ${JSON.stringify(nextNode)}`)
+    } else {
+      fs.writeFileSync(policyPath, `${JSON.stringify(next, null, 2)}\n`)
+      console.log(`[bump-node-toolchain] Updated policy toolchain.node -> ${JSON.stringify(nextNode)}`)
+    }
+  } else {
+    console.log(`[bump-node-toolchain] Policy toolchain.node already ${JSON.stringify(nextNode)}`)
+  }
+
+  return next
+}
+
+function syncFgDevkitFiles(policy) {
+  if (dryRun) {
+    const changes = syncNodeToolchainInRepo(fgDevkitRoot, policy, { dryRun: true, fgDevkitRoot })
+    for (const change of changes) {
+      console.log(`[bump-node-toolchain] DRY RUN fg-devkit: ${change}`)
+    }
+    return
+  }
+
+  const nvmrc = resolveExpectedNodePolicy(policy, fgDevkitRoot)?.nvmrc
+  if (nvmrc) {
+    fs.writeFileSync(path.join(fgDevkitRoot, '.nvmrc'), `${nvmrc}\n`)
+  }
+
+  const pkg = readJson(fgDevkitPkgPath)
+  const engines = resolveExpectedNodePolicy(policy, fgDevkitRoot)?.engines
+  if (engines) {
+    pkg.engines = { ...(pkg.engines ?? {}), node: engines }
+    fs.writeFileSync(fgDevkitPkgPath, `${JSON.stringify(pkg, null, 2)}\n`)
+  }
+
+  const changes = syncNodeToolchainInRepo(fgDevkitRoot, policy, { fgDevkitRoot })
+  for (const change of changes) {
+    console.log(`[bump-node-toolchain] fg-devkit: ${change}`)
+  }
+}
+
+function syncFleetRepo(repoDir, projectsRoot, policy) {
+  const label = path.relative(projectsRoot, repoDir).split(path.sep).join('/') || path.basename(repoDir)
+  if (dryRun) {
+    const changes = syncNodeToolchainInRepo(repoDir, policy, { dryRun: true, fgDevkitRoot })
+    if (changes.length === 0) {
+      console.log(`[bump-node-toolchain] DRY RUN ${label}: already matches`)
+      return 0
+    }
+    for (const change of changes) {
+      console.log(`[bump-node-toolchain] DRY RUN ${label}: ${change}`)
+    }
+    return 0
+  }
+
+  const changes = syncNodeToolchainInRepo(repoDir, policy, { fgDevkitRoot })
+  if (changes.length === 0) {
+    console.log(`[bump-node-toolchain] OK ${label} (no changes)`)
+    return 0
+  }
+  for (const change of changes) {
+    console.log(`[bump-node-toolchain] ${label}: ${change}`)
+  }
+  console.log(`[bump-node-toolchain] OK ${label}`)
+  return 0
+}
+
+async function main() {
+  assertFgDevkitMaintainerContext()
+
+  const nvmrcArg = positionalArgs.find((a) => /^\d/.test(a))
+  const projectsRootArg = positionalArgs.find((a) => a !== nvmrcArg)
+  const projectsRoot = projectsRootArg
+    ? path.resolve(process.cwd(), projectsRootArg)
+    : path.resolve(fgDevkitRoot, '..')
+
+  const policy = runStep('Update dependency policy', () => updatePolicyNodeToolchain(nvmrcArg))
+  const nodePolicy = resolveExpectedNodePolicy(policy, fgDevkitRoot)
+  console.log(`[bump-node-toolchain] target=${JSON.stringify(nodePolicy)}`)
+  console.log(`[bump-node-toolchain] policy=${policyPath}`)
+
+  runStep('Sync fg-devkit', () => syncFgDevkitFiles(policy))
+
+  if (skipFleet) {
+    console.log('\n[bump-node-toolchain] Done (--skip-fleet). Commit fg-devkit and policy changes.')
+    process.exit(0)
+  }
+
+  if (!fs.existsSync(projectsRoot)) {
+    console.error(`[bump-node-toolchain] projects root not found: ${projectsRoot}`)
+    process.exit(1)
+  }
+
+  const allRepos = collectFleetProjectRepos(projectsRoot, { exclude: DEFAULT_NODE_TOOLCHAIN_EXCLUDE })
+  if (allRepos.length === 0) {
+    console.log(`[bump-node-toolchain] No project repositories under ${projectsRoot}`)
+    process.exit(0)
+  }
+
+  const repos = await resolveFleetRepos(allRepos, projectsRoot, {
+    pick,
+    only,
+    all,
+    message: 'Select projects to sync Node toolchain',
+  })
+
+  console.log(`\n[bump-node-toolchain] Fleet repositories=${repos.length}/${allRepos.length}`)
+  console.log(`[bump-node-toolchain] projectsRoot=${projectsRoot}`)
+
+  let failures = 0
+  for (const repoDir of repos) {
+    const label = path.relative(projectsRoot, repoDir).split(path.sep).join('/') || path.basename(repoDir)
+    console.log(`\n[bump-node-toolchain] Fleet: ${label}`)
+    try {
+      const code = syncFleetRepo(repoDir, projectsRoot, policy)
+      if (code !== 0) {
+        failures += 1
+      }
+    } catch (err) {
+      console.error(`[bump-node-toolchain] FAIL ${label}:`, err)
+      failures += 1
+    }
+  }
+
+  console.log(`\n[bump-node-toolchain] Done: fleet ok=${repos.length - failures}, failed=${failures}`)
+  if (failures > 0) {
+    process.exit(1)
+  }
+
+  if (!dryRun) {
+    console.log('[bump-node-toolchain] Commit changes in fg-devkit, policy, and each updated repo.')
+  }
+}
+
+main().catch((err) => {
+  console.error('[bump-node-toolchain]', err)
+  process.exit(1)
+})

package/scripts/bump-pnpm-toolchain.mjs

@@ -8,10 +8,9 @@
  *   3. Sync dependency policy toolchain, scaffold/vue, and Dockerfile.local
  *   4. corepack prepare + pnpm install
  *
- * Steps per Vue consumer repo under projects-root (unless --skip-fleet):
- *   1. sync-deps against this checkout's policy file (works before fg-devkit is published)
- *   2. corepack prepare + pnpm install
- *   3. check-deps against the same policy file
+ * Steps per pnpm repo under projects-root (unless --skip-fleet):
+ *   Vue + fg-devkit consumers: sync-deps, corepack prepare, pnpm install, check-deps
+ *   Other pnpm repos: sync packageManager (+ Dockerfile pnpm pins), corepack prepare, pnpm install
  *
  * Usage (from fg-devkit repository root):
  *   pnpm exec fg-devkit bump-pnpm-toolchain [version] [projects-root] [options]
@@ -20,6 +19,9 @@
  *   --dry-run       Print planned steps without changing files or running install
  *   --skip-fleet    Only update fg-devkit (policy, scaffold, local install)
  *   --skip-install  Skip corepack prepare and pnpm install
+ *   --pick          Interactive checkbox to choose fleet repositories (default when TTY)
+ *   --all           Run on all fleet repositories without prompting
+ *   --only=a,b      Run only on matching repos (basename or path under projects root)
  *
  * Examples:
  *   pnpm exec fg-devkit bump-pnpm-toolchain
@@ -34,7 +36,12 @@ import { spawnSync } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 
 import { formatPnpmPackageManager } from './dependency-policy-toolchain.mjs'
-import { collectFleetVueRepos } from './fleet-vue-repos.mjs'
+import { collectFleetPnpmRepos } from './fleet-project-repos.mjs'
+import { parseFleetSelectionFlags, resolveFleetRepos } from './fleet-repo-picker.mjs'
+import {
+  isVueFgDevkitConsumerRepo,
+  syncPnpmToolchainInRepo,
+} from './pnpm-toolchain-sync.mjs'
 import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
 import { syncScaffoldVueDepsFromPolicy } from './sync-scaffold-vue-deps.mjs'
 
@@ -47,7 +54,8 @@ const cliArgs = process.argv.slice(2)
 const dryRun = cliArgs.includes('--dry-run')
 const skipFleet = cliArgs.includes('--skip-fleet')
 const skipInstall = cliArgs.includes('--skip-install')
-const positionalArgs = cliArgs.filter((a) => !a.startsWith('-'))
+const { pick, all, only, filteredArgs: positionalArgs } = parseFleetSelectionFlags(cliArgs)
+let projectsRoot = path.resolve(fgDevkitRoot, '..')
 
 function readJson(jsonPath) {
   return JSON.parse(fs.readFileSync(jsonPath, 'utf8'))
@@ -152,50 +160,69 @@ function updateFgDevkitPackageManager(packageManager) {
 }
 
 function syncFleetRepo(repoDir, repoName, packageManager) {
+  const policyManaged = isVueFgDevkitConsumerRepo(repoDir)
+  const relDir = path.relative(projectsRoot, repoDir)
+  const label = relDir === '' || relDir === '.' ? repoName : relDir
+
   if (dryRun) {
-    console.log(`[bump-pnpm-toolchain] DRY RUN ${repoName}: sync-deps ${policyPath}`)
-    console.log(`[bump-pnpm-toolchain] DRY RUN ${repoName}: corepack prepare ${packageManager}`)
-    console.log(`[bump-pnpm-toolchain] DRY RUN ${repoName}: pnpm install`)
-    console.log(`[bump-pnpm-toolchain] DRY RUN ${repoName}: check-deps ${policyPath}`)
+    if (policyManaged) {
+      console.log(`[bump-pnpm-toolchain] DRY RUN ${label}: sync-deps ${policyPath}`)
+    } else {
+      console.log(`[bump-pnpm-toolchain] DRY RUN ${label}: sync packageManager -> ${packageManager}`)
+    }
+    console.log(`[bump-pnpm-toolchain] DRY RUN ${label}: corepack prepare ${packageManager}`)
+    console.log(`[bump-pnpm-toolchain] DRY RUN ${label}: pnpm install`)
+    if (policyManaged) {
+      console.log(`[bump-pnpm-toolchain] DRY RUN ${label}: check-deps ${policyPath}`)
+    }
     return 0
   }
 
-  const syncCode = runNodeScript('sync-dependency-policy.mjs', [policyPath], repoDir)
-  if (syncCode !== 0) {
-    console.error(`[bump-pnpm-toolchain] FAIL ${repoName}: sync-deps exited with code ${syncCode}`)
-    return syncCode
+  if (policyManaged) {
+    const syncCode = runNodeScript('sync-dependency-policy.mjs', [policyPath], repoDir)
+    if (syncCode !== 0) {
+      console.error(`[bump-pnpm-toolchain] FAIL ${label}: sync-deps exited with code ${syncCode}`)
+      return syncCode
+    }
+  } else {
+    const changes = syncPnpmToolchainInRepo(repoDir, packageManager)
+    for (const change of changes) {
+      console.log(`[bump-pnpm-toolchain] ${label}: ${change}`)
+    }
   }
 
   if (!skipInstall) {
     const corepackCode = runCorepackPrepare(packageManager, repoDir)
     if (corepackCode !== 0) {
-      console.error(`[bump-pnpm-toolchain] FAIL ${repoName}: corepack prepare exited with code ${corepackCode}`)
+      console.error(`[bump-pnpm-toolchain] FAIL ${label}: corepack prepare exited with code ${corepackCode}`)
       return corepackCode
     }
 
     const installCode = runPnpmInstall(repoDir)
     if (installCode !== 0) {
-      console.error(`[bump-pnpm-toolchain] FAIL ${repoName}: pnpm install exited with code ${installCode}`)
+      console.error(`[bump-pnpm-toolchain] FAIL ${label}: pnpm install exited with code ${installCode}`)
       return installCode
     }
   }
 
-  const checkCode = runNodeScript('check-dependency-policy.mjs', [policyPath], repoDir)
-  if (checkCode !== 0) {
-    console.error(`[bump-pnpm-toolchain] FAIL ${repoName}: check-deps exited with code ${checkCode}`)
-    return checkCode
+  if (policyManaged) {
+    const checkCode = runNodeScript('check-dependency-policy.mjs', [policyPath], repoDir)
+    if (checkCode !== 0) {
+      console.error(`[bump-pnpm-toolchain] FAIL ${label}: check-deps exited with code ${checkCode}`)
+      return checkCode
+    }
   }
 
-  console.log(`[bump-pnpm-toolchain] OK ${repoName}`)
+  console.log(`[bump-pnpm-toolchain] OK ${label}`)
   return 0
 }
 
-function main() {
+async function main() {
   assertFgDevkitMaintainerContext()
 
   const versionArg = positionalArgs.find((a) => /^(pnpm@)?\d/.test(a))
   const projectsRootArg = positionalArgs.find((a) => a !== versionArg)
-  const projectsRoot = projectsRootArg
+  projectsRoot = projectsRootArg
     ? path.resolve(process.cwd(), projectsRootArg)
     : path.resolve(fgDevkitRoot, '..')
 
@@ -248,13 +275,20 @@ function main() {
     process.exit(1)
   }
 
-  const repos = collectFleetVueRepos(projectsRoot)
-  if (repos.length === 0) {
-    console.log(`[bump-pnpm-toolchain] No Vue repositories with fg-devkit under ${projectsRoot}`)
+  const allRepos = collectFleetPnpmRepos(projectsRoot)
+  if (allRepos.length === 0) {
+    console.log(`[bump-pnpm-toolchain] No pnpm repositories under ${projectsRoot}`)
     process.exit(0)
   }
 
-  console.log(`\n[bump-pnpm-toolchain] Fleet repositories=${repos.length}`)
+  const repos = await resolveFleetRepos(allRepos, projectsRoot, {
+    pick,
+    only,
+    all,
+    message: 'Select pnpm repositories to update',
+  })
+
+  console.log(`\n[bump-pnpm-toolchain] Fleet repositories=${repos.length}/${allRepos.length}`)
 
   let failures = 0
   for (const repoDir of repos) {
@@ -278,4 +312,7 @@ function main() {
   }
 }
 
-main()
+main().catch((err) => {
+  console.error('[bump-pnpm-toolchain]', err)
+  process.exit(1)
+})