fg-devkit 1.12.6 → 1.12.8

package/scripts/fleet-vulns.mjs

@@ -11,6 +11,7 @@ import fs from 'node:fs'
 import path from 'node:path'
 import { spawnSync } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
+import { isFgDevkitRepoDir } from './fleet-project-repos.mjs'
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url))
 const cliArgs = process.argv.slice(2)
@@ -54,8 +55,8 @@ for (const packageJsonPath of packageJsonFiles) {
   try {
     const pkg = readJson(packageJsonPath)
     const repoDir = path.dirname(packageJsonPath)
+    if (isFgDevkitRepoDir(repoDir)) continue
     if (!isPnpmProject(pkg)) continue
-    if (pkg.name === 'fg-devkit') continue
     repos.push(repoDir)
   } catch {
     // Ignore invalid package.json files.

package/scripts/git-commit-push-fleet-common.mjs

@@ -0,0 +1,147 @@
+/**
+ * Stage, commit, and push helpers for fleet maintainer scripts.
+ */
+
+import { spawnSync } from 'node:child_process'
+
+import { formatRepoLabel } from './fleet-repo-picker.mjs'
+import { getCurrentGitBranch, hasGitWorkingTreeChanges } from './git-fleet-common.mjs'
+
+/**
+ * @param {{
+ *   repos: string[]
+ *   projectsRoot: string
+ *   commitMessage: string
+ *   dryRun?: boolean
+ *   logPrefix?: string
+ * }} options
+ * @returns {number}
+ */
+export function runFleetGitCommitPush(options) {
+  const {
+    repos,
+    projectsRoot,
+    commitMessage,
+    dryRun = false,
+    logPrefix = '[fleet-git-commit-push]',
+  } = options
+
+  /** @type {{ label: string, branch: string }[]} */
+  const committed = []
+  /** @type {string[]} */
+  const skipped = []
+  /** @type {{ label: string, reason: string }[]} */
+  const failed = []
+
+  for (const repoDir of repos) {
+    const label = formatRepoLabel(repoDir, projectsRoot)
+    const branch = getCurrentGitBranch(repoDir)
+
+    if (branch === null) {
+      failed.push({ label, reason: 'could not determine current branch' })
+      continue
+    }
+
+    if (!hasGitWorkingTreeChanges(repoDir)) {
+      skipped.push(label)
+      continue
+    }
+
+    if (dryRun) {
+      console.log(
+        `${logPrefix} DRY RUN ${label}: git add -A && git commit && git push (on ${branch})`,
+      )
+      committed.push({ label, branch })
+      continue
+    }
+
+    console.log(`\n${logPrefix} ${label} (${branch})`)
+
+    const stage = spawnSync('git', ['add', '-A'], {
+      cwd: repoDir,
+      encoding: 'utf8',
+      env: process.env,
+    })
+    if (stage.error) {
+      failed.push({ label, reason: stage.error.message })
+      continue
+    }
+    if ((stage.status ?? 1) !== 0) {
+      failed.push({
+        label,
+        reason: stage.stderr?.trim() || `git add exited with code ${stage.status ?? 1}`,
+      })
+      continue
+    }
+
+    const commit = spawnSync('git', ['commit', '-m', commitMessage], {
+      cwd: repoDir,
+      encoding: 'utf8',
+      env: process.env,
+    })
+    if (commit.error) {
+      failed.push({ label, reason: commit.error.message })
+      continue
+    }
+    if ((commit.status ?? 1) !== 0) {
+      failed.push({
+        label,
+        reason: commit.stderr?.trim() || `git commit exited with code ${commit.status ?? 1}`,
+      })
+      continue
+    }
+
+    const push = spawnSync('git', ['push'], {
+      cwd: repoDir,
+      encoding: 'utf8',
+      env: process.env,
+    })
+    if (push.error) {
+      failed.push({ label, reason: push.error.message })
+      continue
+    }
+    if ((push.status ?? 1) !== 0) {
+      failed.push({
+        label,
+        reason: push.stderr?.trim() || `git push exited with code ${push.status ?? 1}`,
+      })
+      continue
+    }
+
+    if (commit.stdout?.trim()) {
+      console.log(commit.stdout.trim())
+    }
+    committed.push({ label, branch })
+  }
+
+  console.log(`\n${logPrefix} Summary`)
+  console.log(`${logPrefix} commit message: ${commitMessage}`)
+  console.log(`${logPrefix} repositories=${repos.length}`)
+
+  if (committed.length > 0) {
+    console.log(`${logPrefix} committed and pushed (${committed.length}):`)
+    for (const item of committed) {
+      console.log(`  - ${item.label} (${item.branch})`)
+    }
+  }
+
+  if (skipped.length > 0) {
+    console.log(`${logPrefix} skipped — no changes (${skipped.length}):`)
+    for (const label of skipped) {
+      console.log(`  - ${label}`)
+    }
+  }
+
+  if (failed.length > 0) {
+    console.log(`${logPrefix} failed (${failed.length}):`)
+    for (const item of failed) {
+      console.log(`  - ${item.label}: ${item.reason}`)
+    }
+  }
+
+  if (repos.length === 0) {
+    console.log(`${logPrefix} No repositories to process.`)
+  }
+
+  return failed.length > 0 ? 1 : 0
+}

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

@@ -0,0 +1,100 @@
+/**
+ * Discard tracked git changes helpers for fleet maintainer scripts.
+ */
+
+import { spawnSync } from 'node:child_process'
+
+import { formatRepoLabel } from './fleet-repo-picker.mjs'
+import { getCurrentGitBranch, hasTrackedGitChanges } from './git-fleet-common.mjs'
+
+/**
+ * @param {{
+ *   repos: string[]
+ *   projectsRoot: string
+ *   dryRun?: boolean
+ *   logPrefix?: string
+ * }} options
+ * @returns {number}
+ */
+export function runFleetGitDiscard(options) {
+  const { repos, projectsRoot, dryRun = false, logPrefix = '[fleet-git-discard]' } = options
+
+  /** @type {{ label: string, branch: string }[]} */
+  const discarded = []
+  /** @type {string[]} */
+  const skipped = []
+  /** @type {{ label: string, reason: string }[]} */
+  const failed = []
+
+  for (const repoDir of repos) {
+    const label = formatRepoLabel(repoDir, projectsRoot)
+    const branch = getCurrentGitBranch(repoDir)
+
+    if (branch === null) {
+      failed.push({ label, reason: 'could not determine current branch' })
+      continue
+    }
+
+    if (!hasTrackedGitChanges(repoDir)) {
+      skipped.push(label)
+      continue
+    }
+
+    if (dryRun) {
+      console.log(`${logPrefix} DRY RUN ${label}: git restore --source=HEAD --staged --worktree . (${branch})`)
+      discarded.push({ label, branch })
+      continue
+    }
+
+    console.log(`\n${logPrefix} ${label} (${branch})`)
+    const restore = spawnSync('git', ['restore', '--source=HEAD', '--staged', '--worktree', '.'], {
+      cwd: repoDir,
+      encoding: 'utf8',
+      env: process.env,
+    })
+
+    if (restore.error) {
+      failed.push({ label, reason: restore.error.message })
+      continue
+    }
+    if ((restore.status ?? 1) !== 0) {
+      failed.push({
+        label,
+        reason: restore.stderr?.trim() || `git restore exited with code ${restore.status ?? 1}`,
+      })
+      continue
+    }
+
+    discarded.push({ label, branch })
+  }
+
+  console.log(`\n${logPrefix} Summary`)
+  console.log(`${logPrefix} repositories=${repos.length}`)
+
+  if (discarded.length > 0) {
+    console.log(`${logPrefix} discarded tracked changes (${discarded.length}):`)
+    for (const item of discarded) {
+      console.log(`  - ${item.label} (${item.branch})`)
+    }
+  }
+
+  if (skipped.length > 0) {
+    console.log(`${logPrefix} skipped — no tracked changes (${skipped.length}):`)
+    for (const label of skipped) {
+      console.log(`  - ${label}`)
+    }
+  }
+
+  if (failed.length > 0) {
+    console.log(`${logPrefix} failed (${failed.length}):`)
+    for (const item of failed) {
+      console.log(`  - ${item.label}: ${item.reason}`)
+    }
+  }
+
+  if (repos.length === 0) {
+    console.log(`${logPrefix} No repositories to process.`)
+  }
+
+  return failed.length > 0 ? 1 : 0
+}

package/scripts/git-fleet-common.mjs

@@ -0,0 +1,120 @@
+/**
+ * Shared git helpers for fleet maintainer scripts.
+ */
+
+import { spawnSync } from 'node:child_process'
+
+/**
+ * @param {string} repoDir
+ * @returns {string | null}
+ */
+export function getCurrentGitBranch(repoDir) {
+  const result = spawnSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+    cwd: repoDir,
+    encoding: 'utf8',
+    env: process.env,
+  })
+  if ((result.status ?? 1) !== 0) {
+    return null
+  }
+  const branch = result.stdout.trim()
+  if (!branch || branch === 'HEAD') {
+    return null
+  }
+  return branch
+}
+
+/**
+ * @param {string} repoDir
+ * @returns {boolean}
+ */
+export function hasGitWorkingTreeChanges(repoDir) {
+  const result = spawnSync('git', ['status', '--porcelain'], {
+    cwd: repoDir,
+    encoding: 'utf8',
+    env: process.env,
+  })
+  if ((result.status ?? 1) !== 0) {
+    return false
+  }
+  return result.stdout.trim().length > 0
+}
+
+/**
+ * @param {string} repoDir
+ * @returns {boolean}
+ */
+export function hasTrackedGitChanges(repoDir) {
+  const result = spawnSync('git', ['status', '--porcelain', '--untracked-files=no'], {
+    cwd: repoDir,
+    encoding: 'utf8',
+    env: process.env,
+  })
+  if ((result.status ?? 1) !== 0) {
+    return false
+  }
+  return result.stdout.trim().length > 0
+}
+
+/**
+ * @param {string[]} cliArgs
+ * @returns {string | null}
+ */
+export function parseCommitMessageArg(cliArgs) {
+  const messageArg = cliArgs.find((arg) => arg.startsWith('--message='))
+  if (messageArg) {
+    return messageArg.slice('--message='.length)
+  }
+  const mIndex = cliArgs.indexOf('-m')
+  if (mIndex !== -1 && cliArgs[mIndex + 1] && !cliArgs[mIndex + 1].startsWith('-')) {
+    return cliArgs[mIndex + 1]
+  }
+  return null
+}
+
+/**
+ * @param {string[]} cliArgs
+ * @returns {string[]}
+ */
+export function filterCommitPushPositionalArgs(cliArgs) {
+  const filtered = []
+  for (let i = 0; i < cliArgs.length; i++) {
+    const arg = cliArgs[i]
+    if (arg === '-m') {
+      i += 1
+      continue
+    }
+    if (arg.startsWith('--message=')) {
+      continue
+    }
+    filtered.push(arg)
+  }
+  return filtered
+}
+
+/**
+ * @param {string[]} cliArgs
+ * @param {string} logPrefix
+ * @returns {Promise<string>}
+ */
+export async function resolveCommitMessage(cliArgs, logPrefix) {
+  const fromArg = parseCommitMessageArg(cliArgs)
+  if (fromArg?.trim()) {
+    return fromArg.trim()
+  }
+  if (process.stdin.isTTY) {
+    try {
+      const inquirerInput = await import('@inquirer/input')
+      const message = await inquirerInput.default({
+        message: 'Commit message',
+        validate: (value) => (value.trim().length > 0 ? true : 'Commit message is required'),
+      })
+      return message.trim()
+    } catch {
+      console.error(`${logPrefix} Could not load @inquirer/input for commit message prompt.`)
+      process.exit(1)
+    }
+  }
+  console.error(`${logPrefix} Commit message required: --message="..." or -m "..."`)
+  process.exit(1)
+}

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

@@ -0,0 +1,90 @@
+/**
+ * Git pull helpers for fleet maintainer scripts.
+ */
+
+import { spawnSync } from 'node:child_process'
+
+import { formatRepoLabel } from './fleet-repo-picker.mjs'
+import { getCurrentGitBranch } from './git-fleet-common.mjs'
+
+/**
+ * @param {{
+ *   repos: string[]
+ *   projectsRoot: string
+ *   dryRun?: boolean
+ *   logPrefix?: string
+ * }} options
+ * @returns {number} Exit code (0 = success, 1 = any failure)
+ */
+export function runFleetGitPull(options) {
+  const { repos, projectsRoot, dryRun = false, logPrefix = '[fleet-git-pull]' } = options
+
+  /** @type {{ label: string, branch: string }[]} */
+  const pulled = []
+  /** @type {{ label: string, reason: string }[]} */
+  const failed = []
+
+  for (const repoDir of repos) {
+    const label = formatRepoLabel(repoDir, projectsRoot)
+    const branch = getCurrentGitBranch(repoDir)
+
+    if (branch === null) {
+      failed.push({ label, reason: 'could not determine current branch' })
+      continue
+    }
+
+    if (dryRun) {
+      console.log(`${logPrefix} DRY RUN ${label}: git pull (on ${branch})`)
+      pulled.push({ label, branch })
+      continue
+    }
+
+    console.log(`\n${logPrefix} ${label} (${branch})`)
+    const pull = spawnSync('git', ['pull'], {
+      cwd: repoDir,
+      encoding: 'utf8',
+      env: process.env,
+    })
+
+    if (pull.error) {
+      failed.push({ label, reason: pull.error.message })
+      continue
+    }
+
+    if ((pull.status ?? 1) !== 0) {
+      const stderr = pull.stderr?.trim()
+      const stdout = pull.stdout?.trim()
+      const detail = stderr || stdout || `git pull exited with code ${pull.status ?? 1}`
+      failed.push({ label, reason: detail })
+      continue
+    }
+
+    if (pull.stdout?.trim()) {
+      console.log(pull.stdout.trim())
+    }
+    pulled.push({ label, branch })
+  }
+
+  console.log(`\n${logPrefix} Summary`)
+  console.log(`${logPrefix} repositories=${repos.length}`)
+
+  if (pulled.length > 0) {
+    console.log(`${logPrefix} pulled (${pulled.length}):`)
+    for (const item of pulled) {
+      console.log(`  - ${item.label} (${item.branch})`)
+    }
+  }
+
+  if (failed.length > 0) {
+    console.log(`${logPrefix} failed (${failed.length}):`)
+    for (const item of failed) {
+      console.log(`  - ${item.label}: ${item.reason}`)
+    }
+  }
+
+  if (repos.length === 0) {
+    console.log(`${logPrefix} No repositories to process.`)
+  }
+
+  return failed.length > 0 ? 1 : 0
+}