fg-devkit 1.21.5 → 1.23.1

package/scripts/{resolve-dependency-policy-path.mjs → lib/resolve-dependency-policy-path.mjs}

@@ -7,6 +7,7 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
+import { fgDevkitRoot } from './common.mjs'
 
 const DEFAULT_POLICY = 'dependency-policy.vue-workspace.json'
 
@@ -16,12 +17,12 @@ const DEFAULT_POLICY = 'dependency-policy.vue-workspace.json'
  * - Absolute path: used as-is
  * - Relative path: if it exists under cwd, use it; else fg-devkit/configs/<arg>
  */
-export function resolveDependencyPolicyPath(scriptDir, cwd, argv) {
+export function resolveDependencyPolicyPath(cwd, argv) {
   // Optional policy path is argv[2] only when it is not an option flag
   // (e.g. `policy-upgrade --interactive` must use the default policy file).
   const arg = argv[2]
   if (!arg || arg.startsWith('-')) {
-    return path.resolve(scriptDir, '../configs', DEFAULT_POLICY)
+    return path.join(fgDevkitRoot, 'configs', DEFAULT_POLICY)
   }
   if (path.isAbsolute(arg)) {
     return arg
@@ -30,5 +31,5 @@ export function resolveDependencyPolicyPath(scriptDir, cwd, argv) {
   if (fs.existsSync(fromCwd)) {
     return fromCwd
   }
-  return path.resolve(scriptDir, '../configs', arg)
+  return path.join(fgDevkitRoot, 'configs', arg)
 }

package/scripts/piwik.mjs

@@ -37,14 +37,14 @@ import {
   planLocalPull,
   renderTable,
   rewriteDimensionNumbers,
-} from './piwik-dimensions.mjs'
+} from './lib/piwik-dimensions.mjs'
 import {
   assertApiConfig,
   createPiwikClient,
   loadLocalDimensions,
   resolveEnvironmentPair,
   resolvePiwikConfig,
-} from './piwik-common.mjs'
+} from './lib/piwik-common.mjs'
 
 const COMMANDS = new Set(['list', 'diff', 'add', 'update', 'sync', 'pull', 'compare', 'migrate'])
 
@@ -83,7 +83,7 @@ slot is not the local slot.`)
 }
 
 /**
- * @param {import('./piwik-dimensions.mjs').LocalDimension[]} locals
+ * @param {import('./lib/piwik-dimensions.mjs').LocalDimension[]} locals
  */
 function printLocal(locals) {
   for (const scope of SCOPES) {
@@ -100,7 +100,7 @@ function printLocal(locals) {
 }
 
 /**
- * @param {import('./piwik-dimensions.mjs').RemoteDimension[]} dimensions
+ * @param {import('./lib/piwik-dimensions.mjs').RemoteDimension[]} dimensions
  * @param {Record<string, { used?: number, available?: number, left?: number }>} slots
  */
 function printRemote(dimensions, slots) {
@@ -149,7 +149,7 @@ async function confirmApply(message, config) {
 /**
  * @param {ReturnType<typeof createPiwikClient>} client
  * @param {ReturnType<typeof resolvePiwikConfig>} config
- * @param {import('./piwik-dimensions.mjs').LocalDimension[]} creates
+ * @param {import('./lib/piwik-dimensions.mjs').LocalDimension[]} creates
  */
 async function applyCreates(client, config, creates) {
   for (const local of creates) {
@@ -179,7 +179,7 @@ async function applyCreates(client, config, creates) {
 /**
  * @param {ReturnType<typeof createPiwikClient>} client
  * @param {string} websiteId
- * @param {{ local: import('./piwik-dimensions.mjs').LocalDimension, remote: import('./piwik-dimensions.mjs').RemoteDimension }[]} updates
+ * @param {{ local: import('./lib/piwik-dimensions.mjs').LocalDimension, remote: import('./lib/piwik-dimensions.mjs').RemoteDimension }[]} updates
  */
 async function applyUpdates(client, websiteId, updates) {
   for (const { local, remote } of updates) {

package/scripts/poeditor-download.mjs

@@ -18,7 +18,7 @@ import {
   loadPoeditorConfig,
   parseFlags,
   resolvePathFromCwd,
-} from './poeditor-common.mjs'
+} from './lib/poeditor-common.mjs'
 
 async function exportLanguage({ token, projectId, language, format }) {
   const params = new URLSearchParams({

package/scripts/poeditor-upload.mjs

@@ -13,7 +13,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 
-import { getFlagValue, getPoeditorToken, loadPoeditorConfig, parseFlags, resolvePathFromCwd } from './poeditor-common.mjs'
+import { getFlagValue, getPoeditorToken, loadPoeditorConfig, parseFlags, resolvePathFromCwd } from './lib/poeditor-common.mjs'
 
 const MIN_UPLOAD_INTERVAL_MS = 20_000
 const MAX_UPLOAD_RETRIES = 3

package/scripts/policy-outdated.mjs

@@ -11,15 +11,10 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { spawnSync } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
-import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+import { resolveDependencyPolicyPath } from './lib/resolve-dependency-policy-path.mjs'
+import { readJson } from './lib/common.mjs'
 
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const policyPath = resolveDependencyPolicyPath(scriptDir, process.cwd(), process.argv)
-
-function readJson(p) {
-  return JSON.parse(fs.readFileSync(p, 'utf8'))
-}
+const policyPath = resolveDependencyPolicyPath(process.cwd(), process.argv)
 
 const policy = readJson(policyPath)
 const deps = {

package/scripts/policy-upgrade-commit.mjs

@@ -17,10 +17,12 @@ import {
   collectOverrideChanges,
   collectOverrides,
   formatOverrideValue,
-} from './override-changes.mjs'
+} from './lib/override-changes.mjs'
+import { readJson, runGit, stageExistingFiles } from './lib/common.mjs'
 
 const require = createRequire(import.meta.url)
 const cwd = process.cwd()
+const GIT = { cwd, tag: '[policy-upgrade-commit]' }
 const scriptDir = path.dirname(fileURLToPath(import.meta.url))
 const packageJsonPath = path.join(cwd, 'package.json')
 const PRUNE_FLAG = '--prune-overrides'
@@ -59,19 +61,6 @@ function runNcu(args = []) {
   return result.status ?? 1
 }
 
-function runGit(args) {
-  const result = spawnSync('git', args, {
-    stdio: 'inherit',
-    cwd,
-    env: process.env,
-  })
-  if (result.error) {
-    console.error('[policy-upgrade-commit]', result.error.message)
-    return 1
-  }
-  return result.status ?? 1
-}
-
 function runPruneOverridesFix() {
   console.log('[policy-upgrade-commit] Pruning overrides that no longer affect pnpm audit…')
   const result = spawnSync(process.execPath, [path.join(scriptDir, 'prune-overrides.mjs'), '--fix'], {
@@ -86,16 +75,6 @@ function runPruneOverridesFix() {
   return result.status ?? 1
 }
 
-function stageExistingFiles(files) {
-  const existingFiles = files.filter((filePath) => fs.existsSync(path.join(cwd, filePath)))
-  if (existingFiles.length === 0) return 0
-  return runGit(['add', '--', ...existingFiles])
-}
-
-function readJson(jsonPath) {
-  return JSON.parse(fs.readFileSync(jsonPath, 'utf8'))
-}
-
 function collectPackageVersionChanges(beforePackage, afterPackage) {
   const before = {
     ...(beforePackage.dependencies ?? {}),
@@ -144,7 +123,7 @@ function buildCommitMessage(changed) {
 }
 
 function commitChanges(prefix, subject, body) {
-  const stageExitCode = stageExistingFiles(['package.json', 'pnpm-lock.yaml', 'pnpm-workspace.yaml'])
+  const stageExitCode = stageExistingFiles(['package.json', 'pnpm-lock.yaml', 'pnpm-workspace.yaml'], GIT)
   if (stageExitCode !== 0) {
     return stageExitCode
   }
@@ -153,7 +132,7 @@ function commitChanges(prefix, subject, body) {
     console.log(body)
   }
   const commitArgs = body ? ['commit', '-m', subject, '-m', body] : ['commit', '-m', subject]
-  return runGit(commitArgs)
+  return runGit(commitArgs, GIT).status
 }
 
 function pruneAndCommitOverrides() {

package/scripts/policy-upgrade.mjs

@@ -15,14 +15,13 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { spawnSync } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
 import { createRequire } from 'node:module'
-import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+import { resolveDependencyPolicyPath } from './lib/resolve-dependency-policy-path.mjs'
 import { syncScaffoldVueDepsFromPolicy } from './sync-scaffold-vue-deps.mjs'
+import { fgDevkitRoot, readJson, runGit, stageExistingFiles } from './lib/common.mjs'
 
 const require = createRequire(import.meta.url)
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const fgDevkitRoot = path.resolve(scriptDir, '..')
+const GIT = { cwd: fgDevkitRoot, tag: '[policy-upgrade]' }
 
 if (process.argv.includes('--help') || process.argv.includes('-h')) {
   console.log(`Usage:
@@ -36,13 +35,9 @@ Examples:
 
 const argPolicy = process.argv[2]
 const hasPolicyArg = Boolean(argPolicy) && !argPolicy.startsWith('-')
-const policyPath = resolveDependencyPolicyPath(scriptDir, process.cwd(), process.argv)
+const policyPath = resolveDependencyPolicyPath(process.cwd(), process.argv)
 const ncuArgs = hasPolicyArg ? process.argv.slice(3) : process.argv.slice(2)
 
-function readJson(p) {
-  return JSON.parse(fs.readFileSync(p, 'utf8'))
-}
-
 function collectPolicyVersions(policy) {
   return {
     ...(policy.managedDependencies?.dependencies ?? {}),
@@ -72,25 +67,6 @@ function buildCommitMessage(changed) {
   return { subject: `dep(): bump ${changed.length} packages`, body }
 }
 
-function runGit(args) {
-  const result = spawnSync('git', args, {
-    stdio: 'inherit',
-    cwd: fgDevkitRoot,
-    env: process.env,
-  })
-  if (result.error) {
-    console.error('[policy-upgrade]', result.error.message)
-    return 1
-  }
-  return result.status ?? 1
-}
-
-function stageExistingFiles(files) {
-  const existingFiles = files.filter((filePath) => fs.existsSync(path.join(fgDevkitRoot, filePath)))
-  if (existingFiles.length === 0) return 0
-  return runGit(['add', '--', ...existingFiles])
-}
-
 function toRepoRelative(absolutePath) {
   return path.relative(fgDevkitRoot, absolutePath)
 }
@@ -188,7 +164,7 @@ const stageExitCode = stageExistingFiles([
   toRepoRelative(policyPath),
   'scaffold/vue/package.json',
   'scaffold/vue/Dockerfile.local',
-])
+], GIT)
 if (stageExitCode !== 0) {
   process.exit(stageExitCode)
 }
@@ -199,4 +175,4 @@ if (body) {
   console.log(body)
 }
 const commitArgs = body ? ['commit', '-m', subject, '-m', body] : ['commit', '-m', subject]
-process.exit(runGit(commitArgs))
+process.exit(runGit(commitArgs, GIT).status)

package/scripts/policy-vulns.mjs

@@ -11,15 +11,10 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { spawnSync } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
-import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+import { resolveDependencyPolicyPath } from './lib/resolve-dependency-policy-path.mjs'
+import { readJson } from './lib/common.mjs'
 
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const policyPath = resolveDependencyPolicyPath(scriptDir, process.cwd(), process.argv)
-
-function readJson(p) {
-  return JSON.parse(fs.readFileSync(p, 'utf8'))
-}
+const policyPath = resolveDependencyPolicyPath(process.cwd(), process.argv)
 
 const policy = readJson(policyPath)
 console.log(`[policy-vulns] policy=${policyPath}`)

package/scripts/prune-overrides.mjs

@@ -23,9 +23,11 @@ import {
   collectOverrideChanges,
   collectOverrides,
   formatOverrideValue,
-} from './override-changes.mjs'
+} from './lib/override-changes.mjs'
+import { runGit } from './lib/common.mjs'
 
 const ROOT = process.cwd()
+const GIT = { cwd: ROOT, tag: '[prune-overrides]' }
 const WORKSPACE_FILE = 'pnpm-workspace.yaml'
 const COPIED_FILES = ['package.json', 'pnpm-lock.yaml', WORKSPACE_FILE, '.npmrc']
 
@@ -49,19 +51,6 @@ Pass --commit to apply the deletions and auto-commit.`)
 
 const shouldFix = args.fix || args.commit
 
-function runGit(gitArgs) {
-  const result = spawnSync('git', gitArgs, {
-    stdio: 'inherit',
-    cwd: ROOT,
-    env: process.env,
-  })
-  if (result.error) {
-    console.error('[prune-overrides]', result.error.message)
-    return 1
-  }
-  return result.status ?? 1
-}
-
 function commitOverrideChanges(beforeOverrides, afterOverrides) {
   const changed = collectOverrideChanges(beforeOverrides, afterOverrides)
   if (changed.length === 0) {
@@ -83,7 +72,7 @@ function commitOverrideChanges(beforeOverrides, afterOverrides) {
     return 1
   }
 
-  const stageExitCode = runGit(['add', '--', ...files])
+  const stageExitCode = runGit(['add', '--', ...files], GIT).status
   if (stageExitCode !== 0) {
     return stageExitCode
   }
@@ -94,7 +83,7 @@ function commitOverrideChanges(beforeOverrides, afterOverrides) {
     console.log(body)
   }
   const commitArgs = body ? ['commit', '-m', subject, '-m', body] : ['commit', '-m', subject]
-  return runGit(commitArgs)
+  return runGit(commitArgs, GIT).status
 }
 
 function runPnpm(cwd, pnpmArgs, { allowFailure = false } = {}) {

package/scripts/prune-release-age-exclude.mjs

@@ -24,7 +24,7 @@ import {
   planReleaseAgeExcludePrune,
   readWorkspaceList,
   rewriteWorkspaceList,
-} from './audit-fix-plan.mjs'
+} from './lib/audit-fix-plan.mjs'
 
 const TAG = '[prune-release-age-exclude]'
 const KEY = 'minimumReleaseAgeExclude'

package/scripts/refresh-dependency-policy-from-repos.mjs

@@ -26,19 +26,17 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
 
-import { collectPinViolations } from './dependency-policy-pins.mjs'
-import { collectToolchainPolicyViolations } from './dependency-policy-toolchain.mjs'
+import { collectPinViolations } from './lib/dependency-policy-pins.mjs'
+import { collectToolchainPolicyViolations } from './lib/dependency-policy-toolchain.mjs'
 import { syncScaffoldVueDepsFromPolicy } from './sync-scaffold-vue-deps.mjs'
+import { fgDevkitRoot } from './lib/common.mjs'
 
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const fgDevkitRoot = path.resolve(scriptDir, '..')
 const fgDevkitPackageJsonPath = path.join(fgDevkitRoot, 'package.json')
 
 const projectsRoot = process.argv[2]
   ? path.resolve(process.cwd(), process.argv[2])
-  : path.resolve(scriptDir, '../..')
+  : path.resolve(fgDevkitRoot, '..')
 
 const policyPath = process.argv[3]
   ? path.resolve(process.cwd(), process.argv[3])
@@ -56,7 +54,7 @@ try {
 /** Relative paths under projectsRoot whose package.json files are ignored (maintainer choice). */
 /** Relative path prefixes under projectsRoot to skip when scanning (add repo names as needed). */
 const SKIP_DIR_PREFIXES = []
-const EXTRA_TOOLING_EXCLUDES = new Set(['husky', 'lint-staged', '@rushstack/eslint-patch', 'jsonc-eslint-parser', 'yaml-eslint-parser'])
+const EXTRA_TOOLING_EXCLUDES = new Set(['@rushstack/eslint-patch', 'jsonc-eslint-parser', 'yaml-eslint-parser'])
 const EXCLUDED_POLICY_PACKAGES = (() => {
   try {
     const pkg = JSON.parse(fs.readFileSync(fgDevkitPackageJsonPath, 'utf8'))

package/scripts/release.sh

@@ -79,7 +79,8 @@ is_fg_devkit_repo="$(
 sync_fg_devkit_package_files() {
   if [[ "$is_fg_devkit_repo" == "yes" && -f "./scripts/sync-scaffold-vue-deps.mjs" && -f "./scaffold/vue/package.json" ]]; then
     node ./scripts/sync-scaffold-vue-deps.mjs
-    git add package.json scaffold/vue/package.json
+    # Stage everything sync-scaffold-vue-deps can write, or the release leaves it uncommitted.
+    git add package.json scaffold/vue/package.json configs/dependency-policy.vue-workspace.json
   else
     git add package.json
   fi

package/scripts/scaffold-vue.mjs

@@ -26,10 +26,8 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
+import { fgDevkitRoot } from './lib/common.mjs'
 
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const fgDevkitRoot = path.resolve(scriptDir, '..')
 const scaffoldRoot = path.join(fgDevkitRoot, 'scaffold/vue')
 
 /** True if the directory does not exist, is empty, or only contains a fresh clone (.git). */

package/scripts/sync-consumer-lefthook.mjs

@@ -2,9 +2,7 @@
 /**
  * Syncs Lefthook setup into a consuming repo:
  * - writes lefthook.yml from fg-devkit template
- * - removes legacy .husky directory (if present)
- * - removes legacy lint-staged config block from package.json
- * - removes legacy prepare hook scripts for husky/lefthook bootstrap
+ * - removes a legacy `prepare` script that bootstrapped lefthook (hooks are installed by setup-lefthook)
  *
  * Usage:
  *   node node_modules/fg-devkit/scripts/sync-consumer-lefthook.mjs
@@ -13,15 +11,12 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
+import { fgDevkitRoot } from './lib/common.mjs'
 
 const projectRoot = process.cwd()
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-const fgRoot = path.resolve(scriptDir, '..')
 
-const lefthookTemplate = path.join(fgRoot, 'configs', 'lefthook.yml')
+const lefthookTemplate = path.join(fgDevkitRoot, 'configs', 'lefthook.yml')
 const lefthookTarget = path.join(projectRoot, 'lefthook.yml')
-const huskyDir = path.join(projectRoot, '.husky')
 const packageJsonPath = path.join(projectRoot, 'package.json')
 
 if (!fs.existsSync(lefthookTemplate)) {
@@ -42,25 +37,13 @@ try {
   process.exit(1)
 }
 
-pkg.scripts = pkg.scripts && typeof pkg.scripts === 'object' ? pkg.scripts : {}
-if (
-  pkg.scripts.prepare &&
-  (pkg.scripts.prepare.includes('husky') || pkg.scripts.prepare.includes('setup-lefthook'))
-) {
-  delete pkg.scripts.prepare
-}
-
-if (pkg['lint-staged'] !== undefined) {
-  delete pkg['lint-staged']
-}
+const removePrepare = pkg.scripts?.prepare?.includes('setup-lefthook')
+if (removePrepare) delete pkg.scripts.prepare
 
 try {
   fs.copyFileSync(lefthookTemplate, lefthookTarget)
-  fs.writeFileSync(packageJsonPath, `${JSON.stringify(pkg, null, 2)}\n`, 'utf8')
-  if (fs.existsSync(huskyDir)) {
-    fs.rmSync(huskyDir, { recursive: true, force: true })
-  }
-  console.log('[sync-consumer-lefthook] Synced lefthook.yml and removed .husky/lint-staged legacy setup.')
+  if (removePrepare) fs.writeFileSync(packageJsonPath, `${JSON.stringify(pkg, null, 2)}\n`, 'utf8')
+  console.log('[sync-consumer-lefthook] Synced lefthook.yml.')
 } catch (err) {
   console.error(`[sync-consumer-lefthook] ${err.message}`)
   process.exit(1)

package/scripts/sync-core-coding-standards.mjs

@@ -10,24 +10,9 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
+import { findFgDevkitPackageRoot } from './lib/common.mjs'
 
 const projectRoot = process.cwd()
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
-
-function findFgDevkitPackageRoot() {
-  const candidates = [
-    path.resolve(scriptDir, '..'),
-    path.join(projectRoot, 'node_modules', 'fg-devkit'),
-    path.join(projectRoot, 'node_modules', 'fds-vue-core', 'node_modules', 'fg-devkit'),
-  ]
-  for (const p of candidates) {
-    if (fs.existsSync(path.join(p, 'package.json'))) {
-      return p
-    }
-  }
-  return null
-}
 
 function getConsumerPackageName() {
   const pkgPath = path.join(projectRoot, 'package.json')
@@ -45,7 +30,7 @@ function getConsumerPackageName() {
   return 'consumer-project'
 }
 
-const fgRoot = findFgDevkitPackageRoot()
+const fgRoot = findFgDevkitPackageRoot(projectRoot)
 if (!fgRoot) {
   console.error(
     '[sync-core-coding-standards] Could not find fg-devkit (install fg-devkit or a package that bundles it, e.g. fds-vue-core).',

package/scripts/sync-dependency-check-suppressions-commit.mjs

@@ -13,16 +13,16 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { spawnSync } from 'node:child_process'
 import { parseArgs } from 'node:util'
-import { filterSuppressions, normalizeAdvisories, parseAuditJson, parseSuppressions } from './audit-fix-plan.mjs'
+import { filterSuppressions, normalizeAdvisories, parseAuditJson, parseSuppressions } from './lib/audit-fix-plan.mjs'
+import { fileDiffersFromHead, findFgDevkitPackageRoot, runGit } from './lib/common.mjs'
 
 const TAG = '[sync-dependency-check-suppressions]'
 const FILE_NAME = 'dependency-check-suppressions.xml'
 const COMMIT_MESSAGE = 'chore(repo): sync dependency-check suppressions'
 const projectRoot = process.cwd()
-const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const GIT = { cwd: projectRoot, tag: TAG }
 
 const { values: args } = parseArgs({
   options: {
@@ -42,45 +42,6 @@ pnpm audit reports in this repo, and auto-commits it.
   process.exit(0)
 }
 
-function findFgDevkitPackageRoot() {
-  const candidates = [
-    path.resolve(scriptDir, '..'),
-    path.join(projectRoot, 'node_modules', 'fg-devkit'),
-    path.join(projectRoot, 'node_modules', 'fds-vue-core', 'node_modules', 'fg-devkit'),
-  ]
-  for (const candidate of candidates) {
-    if (fs.existsSync(path.join(candidate, 'package.json'))) {
-      return candidate
-    }
-  }
-  return null
-}
-
-function runGit(gitArgs, options = {}) {
-  const result = spawnSync('git', gitArgs, {
-    stdio: options.capture ? 'pipe' : 'inherit',
-    encoding: options.capture ? 'utf8' : undefined,
-    cwd: projectRoot,
-    env: process.env,
-  })
-  if (result.error) {
-    console.error(TAG, result.error.message)
-    return { status: 1, stdout: '' }
-  }
-  return { status: result.status ?? 1, stdout: result.stdout ?? '' }
-}
-
-function fileDiffersFromHead(filePath) {
-  const absolutePath = path.join(projectRoot, filePath)
-  if (!fs.existsSync(absolutePath)) return false
-
-  const tracked = runGit(['ls-files', '--error-unmatch', '--', filePath], { capture: true })
-  if (tracked.status !== 0) return true
-
-  const diff = runGit(['diff', '--quiet', 'HEAD', '--', filePath], { capture: true })
-  return diff.status !== 0
-}
-
 /** GHSA ids `pnpm audit` reports in this repo. Exits on audit failure so nothing is written blindly. */
 function reportedGhsas() {
   const result = spawnSync('pnpm', ['audit', '--json'], {
@@ -97,7 +58,7 @@ function reportedGhsas() {
   return new Set(normalizeAdvisories(parseAuditJson(result.stdout)).map((advisory) => advisory.ghsa))
 }
 
-const fgRoot = findFgDevkitPackageRoot()
+const fgRoot = findFgDevkitPackageRoot(projectRoot)
 if (!fgRoot) {
   console.error(`${TAG} Could not find fg-devkit (install fg-devkit or a package that bundles it, e.g. fds-vue-core).`)
   process.exit(1)
@@ -137,13 +98,13 @@ if (!args.all) {
 fs.writeFileSync(targetPath, content)
 console.log(`${TAG} Updated ${FILE_NAME}.`)
 
-if (!fileDiffersFromHead(FILE_NAME)) {
+if (!fileDiffersFromHead(FILE_NAME, GIT)) {
   console.log(`${TAG} No changes to commit.`)
   process.exit(0)
 }
 
-const stage = runGit(['add', '--', FILE_NAME])
+const stage = runGit(['add', '--', FILE_NAME], GIT)
 if (stage.status !== 0) process.exit(stage.status)
 
 console.log(`${TAG} Auto-committing: ${COMMIT_MESSAGE}`)
-process.exit(runGit(['commit', '-m', COMMIT_MESSAGE]).status)
+process.exit(runGit(['commit', '-m', COMMIT_MESSAGE], GIT).status)