fg-devkit 1.12.6 → 1.12.8

package/scripts/fleet-git-discard-scoped.mjs

@@ -0,0 +1,93 @@
+#!/usr/bin/env node
+/**
+ * Maintainer: discard tracked git changes in chosen repositories.
+ *
+ * Usage (from fg-devkit repository root):
+ *   pnpm exec fg-devkit fleet-git-discard-scoped [projects-root] [options]
+ *
+ * Options:
+ *   --dry-run         Print planned discards without changing files
+ *   --fg-devkit-only  Only process the fg-devkit repository
+ *   --pick            Interactive checkbox to choose repositories (default when TTY)
+ *   --all             Run on all git repositories under projects root without prompting
+ *   --only=a,b        Run only on matching repos (basename or path under projects root)
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import { collectFleetGitRepos } from './fleet-project-repos.mjs'
+import { parseFleetSelectionFlags, resolveFleetRepos } from './fleet-repo-picker.mjs'
+import { runFleetGitDiscard } from './git-discard-fleet-common.mjs'
+
+const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const fgDevkitRoot = path.resolve(scriptDir, '..')
+const fgDevkitPkgPath = path.join(fgDevkitRoot, 'package.json')
+const LOG_PREFIX = '[fleet-git-discard-scoped]'
+
+const cliArgs = process.argv.slice(2)
+const dryRun = cliArgs.includes('--dry-run')
+const fgDevkitOnly = cliArgs.includes('--fg-devkit-only')
+const { pick, all, only, filteredArgs: positionalArgs } = parseFleetSelectionFlags(cliArgs)
+
+const projectsRootArg = positionalArgs[0]
+let projectsRoot = projectsRootArg
+  ? path.resolve(process.cwd(), projectsRootArg)
+  : path.resolve(fgDevkitRoot, '..')
+
+function assertFgDevkitMaintainerContext() {
+  if (path.resolve(process.cwd()) !== fgDevkitRoot) {
+    console.error(`${LOG_PREFIX} Run from the fg-devkit repository root.`)
+    process.exit(1)
+  }
+  try {
+    const pkg = JSON.parse(fs.readFileSync(fgDevkitPkgPath, 'utf8'))
+    if (pkg?.name !== 'fg-devkit') {
+      console.error(`${LOG_PREFIX} package.json name must be fg-devkit.`)
+      process.exit(1)
+    }
+  } catch {
+    console.error(`${LOG_PREFIX} Could not read fg-devkit package.json.`)
+    process.exit(1)
+  }
+}
+
+async function main() {
+  assertFgDevkitMaintainerContext()
+
+  if (!fgDevkitOnly && !fs.existsSync(projectsRoot)) {
+    console.error(`${LOG_PREFIX} projects root not found: ${projectsRoot}`)
+    process.exit(1)
+  }
+
+  let repos
+  if (fgDevkitOnly) {
+    repos = [fgDevkitRoot]
+    projectsRoot = path.dirname(fgDevkitRoot)
+  } else {
+    const allRepos = collectFleetGitRepos(projectsRoot)
+    repos = await resolveFleetRepos(allRepos, projectsRoot, {
+      pick,
+      all,
+      only,
+      message: 'Select repositories to discard tracked changes',
+    })
+  }
+
+  console.log(`${LOG_PREFIX} projectsRoot=${projectsRoot}`)
+  console.log(`${LOG_PREFIX} repositories=${repos.length}`)
+
+  const exitCode = runFleetGitDiscard({
+    repos,
+    projectsRoot,
+    dryRun,
+    logPrefix: LOG_PREFIX,
+  })
+  process.exit(exitCode)
+}
+
+main().catch((err) => {
+  console.error(LOG_PREFIX, err)
+  process.exit(1)
+})

package/scripts/fleet-git-discard.mjs

@@ -0,0 +1,66 @@
+#!/usr/bin/env node
+/**
+ * Maintainer: discard tracked git changes in every repository under projects root.
+ *
+ * Usage (from fg-devkit repository root):
+ *   pnpm exec fg-devkit fleet-git-discard [projects-root] [--dry-run]
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import { collectFleetGitRepos } from './fleet-project-repos.mjs'
+import { runFleetGitDiscard } from './git-discard-fleet-common.mjs'
+
+const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const fgDevkitRoot = path.resolve(scriptDir, '..')
+const fgDevkitPkgPath = path.join(fgDevkitRoot, 'package.json')
+const LOG_PREFIX = '[fleet-git-discard]'
+
+const cliArgs = process.argv.slice(2)
+const dryRun = cliArgs.includes('--dry-run')
+const projectsRootArg = cliArgs.find((a) => !a.startsWith('-'))
+const projectsRoot = projectsRootArg
+  ? path.resolve(process.cwd(), projectsRootArg)
+  : path.resolve(fgDevkitRoot, '..')
+
+function assertFgDevkitMaintainerContext() {
+  if (path.resolve(process.cwd()) !== fgDevkitRoot) {
+    console.error(`${LOG_PREFIX} Run from the fg-devkit repository root.`)
+    process.exit(1)
+  }
+  try {
+    const pkg = JSON.parse(fs.readFileSync(fgDevkitPkgPath, 'utf8'))
+    if (pkg?.name !== 'fg-devkit') {
+      console.error(`${LOG_PREFIX} package.json name must be fg-devkit.`)
+      process.exit(1)
+    }
+  } catch {
+    console.error(`${LOG_PREFIX} Could not read fg-devkit package.json.`)
+    process.exit(1)
+  }
+}
+
+function main() {
+  assertFgDevkitMaintainerContext()
+
+  if (!fs.existsSync(projectsRoot)) {
+    console.error(`${LOG_PREFIX} projects root not found: ${projectsRoot}`)
+    process.exit(1)
+  }
+
+  const repos = collectFleetGitRepos(projectsRoot)
+  console.log(`${LOG_PREFIX} projectsRoot=${projectsRoot}`)
+  console.log(`${LOG_PREFIX} repositories=${repos.length}`)
+
+  const exitCode = runFleetGitDiscard({
+    repos,
+    projectsRoot,
+    dryRun,
+    logPrefix: LOG_PREFIX,
+  })
+  process.exit(exitCode)
+}
+
+main()

package/scripts/fleet-git-pull-scoped.mjs

@@ -0,0 +1,92 @@
+#!/usr/bin/env node
+/**
+ * Maintainer: git pull on the current branch for a chosen set of repositories.
+ *
+ * Usage (from fg-devkit repository root):
+ *   pnpm exec fg-devkit fleet-git-pull-scoped [projects-root] [options]
+ *
+ * Options:
+ *   --dry-run         Print planned pulls without running git pull
+ *   --fg-devkit-only  Only pull the fg-devkit repository
+ *   --pick            Interactive checkbox to choose repositories (default when TTY)
+ *   --all             Run on all git repositories under projects root without prompting
+ *   --only=a,b        Run only on matching repos (basename or path under projects root)
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import { collectFleetGitRepos } from './fleet-project-repos.mjs'
+import { parseFleetSelectionFlags, resolveFleetRepos } from './fleet-repo-picker.mjs'
+import { runFleetGitPull } from './git-pull-fleet-common.mjs'
+
+const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const fgDevkitRoot = path.resolve(scriptDir, '..')
+const fgDevkitPkgPath = path.join(fgDevkitRoot, 'package.json')
+
+const cliArgs = process.argv.slice(2)
+const dryRun = cliArgs.includes('--dry-run')
+const fgDevkitOnly = cliArgs.includes('--fg-devkit-only')
+const { pick, all, only, filteredArgs: positionalArgs } = parseFleetSelectionFlags(cliArgs)
+
+const projectsRootArg = positionalArgs[0]
+let projectsRoot = projectsRootArg
+  ? path.resolve(process.cwd(), projectsRootArg)
+  : path.resolve(fgDevkitRoot, '..')
+
+function assertFgDevkitMaintainerContext() {
+  if (path.resolve(process.cwd()) !== fgDevkitRoot) {
+    console.error('[fleet-git-pull-scoped] Run from the fg-devkit repository root.')
+    process.exit(1)
+  }
+  try {
+    const pkg = JSON.parse(fs.readFileSync(fgDevkitPkgPath, 'utf8'))
+    if (pkg?.name !== 'fg-devkit') {
+      console.error('[fleet-git-pull-scoped] package.json name must be fg-devkit.')
+      process.exit(1)
+    }
+  } catch {
+    console.error('[fleet-git-pull-scoped] Could not read fg-devkit package.json.')
+    process.exit(1)
+  }
+}
+
+async function main() {
+  assertFgDevkitMaintainerContext()
+
+  if (!fgDevkitOnly && !fs.existsSync(projectsRoot)) {
+    console.error(`[fleet-git-pull-scoped] projects root not found: ${projectsRoot}`)
+    process.exit(1)
+  }
+
+  let repos
+  if (fgDevkitOnly) {
+    repos = [fgDevkitRoot]
+    projectsRoot = path.dirname(fgDevkitRoot)
+  } else {
+    const allRepos = collectFleetGitRepos(projectsRoot)
+    repos = await resolveFleetRepos(allRepos, projectsRoot, {
+      pick,
+      all,
+      only,
+      message: 'Select repositories to git pull (current branch)',
+    })
+  }
+
+  console.log(`[fleet-git-pull-scoped] projectsRoot=${projectsRoot}`)
+  console.log(`[fleet-git-pull-scoped] repositories=${repos.length}`)
+
+  const exitCode = runFleetGitPull({
+    repos,
+    projectsRoot,
+    dryRun,
+    logPrefix: '[fleet-git-pull-scoped]',
+  })
+  process.exit(exitCode)
+}
+
+main().catch((err) => {
+  console.error('[fleet-git-pull-scoped]', err)
+  process.exit(1)
+})

package/scripts/fleet-git-pull.mjs

@@ -0,0 +1,65 @@
+#!/usr/bin/env node
+/**
+ * Maintainer: git pull on the current branch for every git repository under projects root.
+ *
+ * Usage (from fg-devkit repository root):
+ *   pnpm exec fg-devkit fleet-git-pull [projects-root] [--dry-run]
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import { collectFleetGitRepos } from './fleet-project-repos.mjs'
+import { runFleetGitPull } from './git-pull-fleet-common.mjs'
+
+const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const fgDevkitRoot = path.resolve(scriptDir, '..')
+const fgDevkitPkgPath = path.join(fgDevkitRoot, 'package.json')
+
+const cliArgs = process.argv.slice(2)
+const dryRun = cliArgs.includes('--dry-run')
+const projectsRootArg = cliArgs.find((a) => !a.startsWith('-'))
+const projectsRoot = projectsRootArg
+  ? path.resolve(process.cwd(), projectsRootArg)
+  : path.resolve(fgDevkitRoot, '..')
+
+function assertFgDevkitMaintainerContext() {
+  if (path.resolve(process.cwd()) !== fgDevkitRoot) {
+    console.error('[fleet-git-pull] Run from the fg-devkit repository root.')
+    process.exit(1)
+  }
+  try {
+    const pkg = JSON.parse(fs.readFileSync(fgDevkitPkgPath, 'utf8'))
+    if (pkg?.name !== 'fg-devkit') {
+      console.error('[fleet-git-pull] package.json name must be fg-devkit.')
+      process.exit(1)
+    }
+  } catch {
+    console.error('[fleet-git-pull] Could not read fg-devkit package.json.')
+    process.exit(1)
+  }
+}
+
+function main() {
+  assertFgDevkitMaintainerContext()
+
+  if (!fs.existsSync(projectsRoot)) {
+    console.error(`[fleet-git-pull] projects root not found: ${projectsRoot}`)
+    process.exit(1)
+  }
+
+  const repos = collectFleetGitRepos(projectsRoot)
+  console.log(`[fleet-git-pull] projectsRoot=${projectsRoot}`)
+  console.log(`[fleet-git-pull] repositories=${repos.length}`)
+
+  const exitCode = runFleetGitPull({
+    repos,
+    projectsRoot,
+    dryRun,
+    logPrefix: '[fleet-git-pull]',
+  })
+  process.exit(exitCode)
+}
+
+main()

package/scripts/fleet-project-repos.mjs

@@ -0,0 +1,173 @@
+/**
+ * Discover project repository roots under a projects directory.
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+
+/** Repos excluded from all fleet-wide repository scans. */
+export const DEFAULT_FLEET_REPO_EXCLUDE = new Set(['fg-devkit'])
+
+/**
+ * @param {string} repoDir
+ * @returns {boolean}
+ */
+export function isFgDevkitRepoDir(repoDir) {
+  if (path.basename(repoDir) === 'fg-devkit') {
+    return true
+  }
+  try {
+    const pkg = JSON.parse(fs.readFileSync(path.join(repoDir, 'package.json'), 'utf8'))
+    return pkg?.name === 'fg-devkit'
+  } catch {
+    return false
+  }
+}
+
+/**
+ * @param {string} projectsRoot
+ * @param {{ exclude?: Set<string> | string[] }} [options]
+ * @returns {string[]} Absolute repo directory paths, sorted.
+ */
+export function collectFleetProjectRepos(projectsRoot, options = {}) {
+  const exclude = new Set([...DEFAULT_FLEET_REPO_EXCLUDE, ...(options.exclude ?? [])])
+
+  if (!fs.existsSync(projectsRoot)) {
+    return []
+  }
+
+  const repos = []
+  for (const item of fs.readdirSync(projectsRoot, { withFileTypes: true })) {
+    if (!item.isDirectory()) continue
+    if (item.name === 'node_modules' || item.name.startsWith('.')) continue
+    if (exclude.has(item.name)) continue
+
+    const repoDir = path.join(projectsRoot, item.name)
+    if (isFgDevkitRepoDir(repoDir)) continue
+    const hasPackageJson = fs.existsSync(path.join(repoDir, 'package.json'))
+    const hasJenkinsfile = fs.existsSync(path.join(repoDir, 'Jenkinsfile'))
+    if (!hasPackageJson && !hasJenkinsfile) continue
+
+    repos.push(repoDir)
+  }
+
+  return repos.sort((a, b) => a.localeCompare(b))
+}
+
+/**
+ * Top-level git repositories directly under projectsRoot (directory contains `.git`).
+ *
+ * @param {string} projectsRoot
+ * @returns {string[]}
+ */
+export function collectFleetGitRepos(projectsRoot) {
+  if (!fs.existsSync(projectsRoot)) {
+    return []
+  }
+
+  const repos = []
+  for (const item of fs.readdirSync(projectsRoot, { withFileTypes: true })) {
+    if (!item.isDirectory()) continue
+    if (item.name === 'node_modules' || item.name.startsWith('.')) continue
+
+    const repoDir = path.join(projectsRoot, item.name)
+    if (isFgDevkitRepoDir(repoDir)) continue
+    if (fs.existsSync(path.join(repoDir, '.git'))) {
+      repos.push(repoDir)
+    }
+  }
+
+  return repos.sort((a, b) => a.localeCompare(b))
+}
+
+/** Repos that intentionally maintain multiple Node versions or non-pnpm tooling. */
+export const DEFAULT_NODE_TOOLCHAIN_EXCLUDE = new Set(['jenkins-dockerfile', 'vulnerability-test'])
+
+/** Repos excluded from fleet-wide pnpm toolchain bumps (non-pnpm or special tooling). */
+export const DEFAULT_PNPM_TOOLCHAIN_EXCLUDE = new Set(['jenkins-dockerfile', 'vulnerability-test'])
+
+/**
+ * @param {string} dir
+ * @param {Record<string, unknown>} pkg
+ * @returns {boolean}
+ */
+export function isPnpmPackageJsonDir(dir, pkg) {
+  if (typeof pkg?.packageManager === 'string' && pkg.packageManager.startsWith('pnpm@')) {
+    return true
+  }
+  return fs.existsSync(path.join(dir, 'pnpm-lock.yaml'))
+}
+
+/**
+ * Discover repositories under projectsRoot that use pnpm (packageManager or pnpm-lock.yaml).
+ *
+ * @param {string} projectsRoot
+ * @param {{ exclude?: Set<string> | string[], skipScaffoldVue?: boolean }} [options]
+ * @returns {string[]} Absolute repo directory paths, sorted.
+ */
+export function collectFleetPnpmRepos(projectsRoot, options = {}) {
+  const exclude = new Set([
+    ...DEFAULT_FLEET_REPO_EXCLUDE,
+    ...DEFAULT_PNPM_TOOLCHAIN_EXCLUDE,
+    ...(options.exclude ?? []),
+  ])
+  const { skipScaffoldVue = true } = options
+
+  if (!fs.existsSync(projectsRoot)) {
+    return []
+  }
+
+  function shouldSkipPackageJsonDir(relDir) {
+    const topLevel = relDir.split(path.sep)[0]
+    if (exclude.has(topLevel)) {
+      return true
+    }
+    if (!skipScaffoldVue) {
+      return false
+    }
+    const normalized = relDir.split(path.sep).join('/')
+    if (normalized === 'scaffold/vue' || normalized.endsWith('/scaffold/vue')) {
+      return true
+    }
+    return false
+  }
+
+  const SKIP_DIR_NAMES = new Set([
+    'node_modules',
+    '.git',
+    '.next',
+    'dist',
+    'build',
+    'coverage',
+    'storybook-static',
+  ])
+
+  function walk(dir, acc = []) {
+    for (const item of fs.readdirSync(dir, { withFileTypes: true })) {
+      if (SKIP_DIR_NAMES.has(item.name) || item.name.startsWith('.')) continue
+      const p = path.join(dir, item.name)
+      if (item.isDirectory()) walk(p, acc)
+      else if (item.name === 'package.json') acc.push(p)
+    }
+    return acc
+  }
+
+  const repos = []
+  for (const packageJsonPath of walk(projectsRoot)) {
+    try {
+      const repoDir = path.dirname(packageJsonPath)
+      const relDir = path.relative(projectsRoot, repoDir)
+      if (shouldSkipPackageJsonDir(relDir)) continue
+      if (isFgDevkitRepoDir(repoDir)) continue
+
+      const pkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
+      if (!isPnpmPackageJsonDir(repoDir, pkg)) continue
+
+      repos.push(repoDir)
+    } catch {
+      // Ignore invalid package.json files.
+    }
+  }
+
+  return [...new Set(repos)].sort((a, b) => a.localeCompare(b))
+}

package/scripts/fleet-repo-picker.mjs

@@ -0,0 +1,190 @@
+/**
+ * Interactive and CLI-based fleet repository selection for toolchain scripts.
+ */
+
+import path from 'node:path'
+
+/**
+ * @param {string} repoDir
+ * @param {string} projectsRoot
+ * @returns {string}
+ */
+export function formatRepoLabel(repoDir, projectsRoot) {
+  const rel = path.relative(projectsRoot, repoDir).split(path.sep).join('/')
+  return rel === '' || rel === '.' ? path.basename(repoDir) : rel
+}
+
+/**
+ * @param {string[]} cliArgs
+ * @returns {string[] | null}
+ */
+export function parseFleetOnlyArg(cliArgs) {
+  const onlyArg = cliArgs.find((a) => a.startsWith('--only='))
+  if (!onlyArg) {
+    return null
+  }
+  return onlyArg
+    .slice('--only='.length)
+    .split(',')
+    .map((part) => part.trim())
+    .filter(Boolean)
+}
+
+/**
+ * @param {string[]} repos
+ * @param {string} projectsRoot
+ * @param {string[]} selectors Basename or path relative to projectsRoot.
+ * @returns {string[]}
+ */
+export function filterReposByOnly(repos, projectsRoot, selectors) {
+  const normalizedSelectors = selectors.map((sel) => sel.split(path.sep).join('/'))
+  return repos.filter((repoDir) => {
+    const label = formatRepoLabel(repoDir, projectsRoot)
+    const base = path.basename(repoDir)
+    return normalizedSelectors.some(
+      (sel) => sel === label || sel === base || label.endsWith(`/${sel}`),
+    )
+  })
+}
+
+/**
+ * @param {string} message
+ * @param {string[]} repos
+ * @param {string} projectsRoot
+ * @returns {Promise<string[]>}
+ */
+async function promptFleetRepoCheckbox(message, repos, projectsRoot) {
+  let checkboxPrompt
+  try {
+    const inquirerCheckbox = await import('@inquirer/checkbox')
+    checkboxPrompt = inquirerCheckbox.default
+  } catch {
+    return promptFleetRepoInput(message, repos, projectsRoot)
+  }
+
+  const choices = repos.map((repoDir) => ({
+    name: formatRepoLabel(repoDir, projectsRoot),
+    value: repoDir,
+    checked: true,
+  }))
+
+  const selected = await checkboxPrompt({
+    message,
+    choices,
+    pageSize: Math.min(20, choices.length),
+    loop: false,
+  })
+
+  return selected
+}
+
+/**
+ * @param {string} message
+ * @param {string[]} repos
+ * @param {string} projectsRoot
+ * @returns {Promise<string[]>}
+ */
+async function promptFleetRepoInput(message, repos, projectsRoot) {
+  const inquirerInput = await import('@inquirer/input')
+  const labels = repos.map((repoDir) => formatRepoLabel(repoDir, projectsRoot))
+  console.log('\n[fleet-picker] Available repositories:')
+  for (const label of labels) {
+    console.log(`  - ${label}`)
+  }
+
+  const answer = await inquirerInput.default({
+    message: `${message} (comma-separated; empty = all)`,
+    default: '',
+  })
+
+  const trimmed = answer.trim()
+  if (!trimmed) {
+    return repos
+  }
+
+  const selected = filterReposByOnly(
+    repos,
+    projectsRoot,
+    trimmed.split(',').map((part) => part.trim()),
+  )
+  if (selected.length === 0) {
+    console.error('[fleet-picker] No repositories matched your input.')
+    process.exit(1)
+  }
+  return selected
+}
+
+/**
+ * @param {string[]} repos
+ * @param {string} projectsRoot
+ * @param {{ pick?: boolean, only?: string[] | null, all?: boolean, message?: string }} options
+ * @returns {Promise<string[]>}
+ */
+export async function resolveFleetRepos(repos, projectsRoot, options = {}) {
+  const {
+    pick = false,
+    only = null,
+    all = false,
+    message = 'Select repositories to update',
+  } = options
+
+  if (only?.length) {
+    const filtered = filterReposByOnly(repos, projectsRoot, only)
+    if (filtered.length === 0) {
+      console.error(`[fleet-picker] No repositories matched --only=${only.join(',')}`)
+      process.exit(1)
+    }
+    return filtered
+  }
+
+  const shouldPrompt = pick || (process.stdin.isTTY && !all)
+  if (!shouldPrompt || repos.length === 0) {
+    return repos
+  }
+
+  const selected = await promptFleetRepoCheckbox(message, repos, projectsRoot)
+  if (selected.length === 0) {
+    console.log('[fleet-picker] No repositories selected.')
+    process.exit(0)
+  }
+  return selected
+}
+
+/** CLI flags consumed by bump-*-toolchain scripts (not positional arguments). */
+const TOOLCHAIN_CLI_FLAGS = new Set([
+  '--dry-run',
+  '--skip-fleet',
+  '--skip-install',
+  '--pick',
+  '--all',
+  '--no-engines',
+  '--fg-devkit-only',
+])
+
+/**
+ * @param {string} arg
+ * @returns {boolean}
+ */
+function isToolchainCliFlag(arg) {
+  return TOOLCHAIN_CLI_FLAGS.has(arg) || arg.startsWith('--only=') || arg.startsWith('--engines=')
+}
+
+/**
+ * @param {string[]} cliArgs
+ * @returns {string[]}
+ */
+export function filterToolchainPositionalArgs(cliArgs) {
+  return cliArgs.filter((arg) => !isToolchainCliFlag(arg))
+}
+
+/**
+ * @param {string[]} cliArgs
+ * @returns {{ pick: boolean, all: boolean, only: string[] | null, filteredArgs: string[] }}
+ */
+export function parseFleetSelectionFlags(cliArgs) {
+  const pick = cliArgs.includes('--pick')
+  const all = cliArgs.includes('--all')
+  const only = parseFleetOnlyArg(cliArgs)
+  const filteredArgs = filterToolchainPositionalArgs(cliArgs)
+  return { pick, all, only, filteredArgs }
+}

package/scripts/fleet-vue-repos.mjs

@@ -4,6 +4,7 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
+import { isFgDevkitRepoDir } from './fleet-project-repos.mjs'
 
 /**
  * @param {string} projectsRoot
@@ -40,8 +41,9 @@ export function collectFleetVueRepos(projectsRoot, options = {}) {
     try {
       const relDir = path.relative(projectsRoot, path.dirname(packageJsonPath))
       if (shouldSkipPackageJsonDir(relDir)) continue
+      const repoDir = path.dirname(packageJsonPath)
+      if (isFgDevkitRepoDir(repoDir)) continue
       const pkg = readJson(packageJsonPath)
-      if (pkg?.name === 'fg-devkit') continue
       if (!pkg.dependencies?.vue && !pkg.devDependencies?.vue) continue
       if (!pkg.dependencies?.['fg-devkit'] && !pkg.devDependencies?.['fg-devkit']) continue
       repos.push(path.dirname(packageJsonPath))