polyrepo-cli 1.0.2 → 1.0.3

package/README.md

@@ -30,9 +30,11 @@ with `--dry-run` before anything actually changes.
   safe, non-destructive self-repairs along the way, and
   `--clean-branches` for an interactive local-branch cleanup), and
   cross-package dependency drift.
-- **`switch-master`** — fast-forward selected repos to their up-to-date
+- **`switch-default`** — fast-forward selected repos to their up-to-date
   default branch, whatever it's actually named (`master`, `main`, or
-  anything else — detected per repo, not assumed).
+  anything else — detected per repo, not assumed). `--force` hard-resets
+  a dirty repo to match origin; add `--clean` to also wipe untracked
+  files/directories.
 - **`bump`** — bump a package's version (patch by default, or
   `--minor`/`--major`) through a branch → PR → merge, then tag the
   release. Safe to re-run if a previous attempt was interrupted
@@ -284,8 +286,8 @@ few small, non-destructive self-repairs:
 3. **Remote sync** — two related repairs, both per-repo pointer
    refreshes that never touch a file, branch, or commit:
    - compares each repo's locally cached default-branch name (the
-     same value `switch-master`/`bump`/`tag` all use — see
-     `switch-master` above) against what GitHub actually reports
+     same value `switch-default`/`bump`/`tag` all use — see
+     `switch-default` above) against what GitHub actually reports
      right now. Git never refreshes that local cache on its own, so
      renaming a repo's default branch on GitHub after it was cloned
      would otherwise go unnoticed by every other command forever —
@@ -302,7 +304,7 @@ few small, non-destructive self-repairs:
 4. **Branch sync** — fetches and compares each repo's local default
    branch against `origin/<default>`: **diverged** (both ahead and
    behind — a fast-forward won't work, needs resolving by hand),
-   **behind only** (safe to fast-forward with `switch-master`), or
+   **behind only** (safe to fast-forward with `switch-default`), or
    **ahead only** (local commits not yet pushed). Surfaces this
    before some other command trips over it mid-run instead of after.
 5. **Branch protection** — whether each repo's default branch
@@ -345,7 +347,7 @@ polyrepo doctor --clean-branches
 polyrepo doctor
 ```
 
-### `polyrepo switch-master` (alias `sm`)
+### `polyrepo switch-default` (alias `sd`)
 
 Each repo's **default branch is detected per repo**, not assumed —
 GitHub itself defaults a new repo to `main`, and plenty of people
@@ -374,11 +376,15 @@ working tree is no longer skipped, and each repo gets
 `git checkout -f <default branch>` + `git reset --hard
 origin/<default branch>` instead of the safe fast-forward-only merge —
 uncommitted changes to tracked files and any local-only commits on
-that branch are permanently discarded (untracked files are left
-alone, this isn't `git clean`). The checkbox marks which selected
-repos would lose changes, and the proceed confirmation says how many
-and defaults to "No" instead of "Yes" whenever `--force` would
-actually discard something.
+that branch are permanently discarded. Untracked files are still left
+alone at this point (this isn't `git clean`) — add `--clean` to also
+run `git clean -fd` (removes untracked files/directories that aren't
+gitignored; gitignored paths like `node_modules` are still left
+alone, this doesn't use `-x`). `--clean` only means anything alongside
+`--force` — without it there's nothing to discard in the first place.
+The checkbox marks which selected repos would lose changes, and the
+proceed confirmation says how many and defaults to "No" instead of
+"Yes" whenever `--force` would actually discard something.
 
 **Options:**
 
@@ -387,15 +393,19 @@ actually discard something.
 | `--packages <a,b,c>` | Package list instead of the interactive checkbox. |
 | `--yes` | Skip the "proceed?" confirmation. |
 | `--force` | Discard uncommitted changes and local-only commits on the default branch, hard-resetting it to origin. |
+| `--clean` | With `--force`, also remove untracked files/directories (`git clean -fd`). |
 
 ```bash
-polyrepo switch-master
+polyrepo switch-default
 
 # no checkbox, specific repos, no confirmation — for scripts
-polyrepo switch-master --packages vue-toast-kit,os-detect --yes
+polyrepo switch-default --packages vue-toast-kit,os-detect --yes
 
 # discard local changes on a repo you don't need anymore
-polyrepo switch-master --packages vue-toast-kit --force
+polyrepo switch-default --packages vue-toast-kit --force
+
+# same, but also wipe untracked build output etc.
+polyrepo switch-default --packages vue-toast-kit --force --clean
 ```
 
 ### `polyrepo bump [options]`
@@ -415,7 +425,7 @@ polyrepo switch-master --packages vue-toast-kit --force
    1. `git fetch origin` → `git checkout <default branch>` →
       `git merge --ff-only origin/<default branch>` (the bump branch
       is always created from an up-to-date default branch — detected
-      per repo, see `switch-master` above — not whatever branch the
+      per repo, see `switch-default` above — not whatever branch the
       repo happened to be on);
    2. **checks the state of a previous attempt** — is there already a
       merged PR, an open PR, or just a pushed branch named

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polyrepo-cli",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Interactive CLI for managing a folder of local npm package repos: version bumps through a PR, npm publish, GitHub releases, and cross-package dependency drift checks — all from one tool.",
   "type": "module",
   "bin": {

package/src/changes.js

@@ -6,7 +6,7 @@ const PREVIEW_LIMIT = 5
 // Summarizes what changed on the local default branch since the last `v*`
 // tag (or the last few commits if there's no tag yet), so the bump
 // checklist can show whether a package actually has anything worth
-// releasing. Reflects local repo state — run `polyrepo switch-master`
+// releasing. Reflects local repo state — run `polyrepo switch-default`
 // first if it might be stale. Run through pMap across many repos at once
 // (see describeRecentChangesForAll) — this builds the bump checkbox's
 // preview, and waiting on 3 sequential git calls per repo, 17 times over,

package/src/commands/bump.js

@@ -6,7 +6,7 @@ import { bumpBranchName } from '../config.js'
 import { loadConfig } from '../loadConfig.js'
 import { bumpVersion, replaceVersionInText } from '../version.js'
 import { git } from '../exec.js'
-import { syncMaster } from '../masterSync.js'
+import { syncDefaultBranch } from '../defaultBranchSync.js'
 import { detectBumpState, createPr, mergePr } from '../github.js'
 import { tagName, tagExists, createAndPushTag } from '../tags.js'
 import { describeRecentChangesForAll, formatRecentChanges, fullCommitLinesSince } from '../changes.js'
@@ -111,7 +111,7 @@ async function bumpOne(repo, { dryRun, waitChecks }) {
     return
   }
 
-  const syncResult = syncMaster(repo)
+  const syncResult = syncDefaultBranch(repo)
   if (!syncResult.ok) return fail(syncResult.message)
   ok(`${repo.defaultBranch} is up to date.`)
 
@@ -193,7 +193,7 @@ async function bumpOne(repo, { dryRun, waitChecks }) {
     }
     ok(`Merged PR #${prNumber}.`)
 
-    const resyncResult = syncMaster(repo)
+    const resyncResult = syncDefaultBranch(repo)
     if (!resyncResult.ok) return fail(resyncResult.message)
     ok(`Local ${repo.defaultBranch} synced to origin at ${repo.newVersion}.`)
   } else {

package/src/commands/doctor.js

@@ -151,7 +151,7 @@ async function checkRemoteSync(repos) {
 }
 
 // Whether each repo's local default branch actually matches origin —
-// surfaced here proactively so it's known before a `switch-master` run
+// surfaced here proactively so it's known before a `switch-default` run
 // fails partway on a fast-forward it can't do, or before `bump`/`tag`
 // build a branch from a base that isn't what it looks like locally.
 async function checkBranchSync(repos) {
@@ -186,7 +186,7 @@ async function checkBranchSync(repos) {
   }
   if (behindOnly.length > 0) {
     warn(
-      `${behindOnly.length} repo(s) are behind origin (safe to fast-forward with \`polyrepo switch-master\`): ${behindOnly
+      `${behindOnly.length} repo(s) are behind origin (safe to fast-forward with \`polyrepo switch-default\`): ${behindOnly
         .map((r) => r.repo.dir)
         .join(', ')}`,
     )

package/src/commands/{switchMaster.js → switchDefault.js}

@@ -2,12 +2,12 @@ import { confirm } from '@inquirer/prompts'
 import pc from 'picocolors'
 import { discoverRepos, inspectRepos } from '../repos.js'
 import { loadConfig } from '../loadConfig.js'
-import { syncMaster } from '../masterSync.js'
+import { syncDefaultBranch } from '../defaultBranchSync.js'
 import { selectPackages } from '../selectPackages.js'
 import { heading, stepHeading, ok, fail, warn, columnWidths, formatRow } from '../ui.js'
 import { startSpinner } from '../spinner.js'
 
-export async function switchMasterCommand({ configPath, packages, yes = false, force = false } = {}) {
+export async function switchDefaultCommand({ configPath, packages, yes = false, force = false, clean = false } = {}) {
   const config = loadConfig({ configPath })
   const discovered = discoverRepos(config)
   if (discovered.length === 0) {
@@ -24,7 +24,7 @@ export async function switchMasterCommand({ configPath, packages, yes = false, f
   const selected = await selectPackages({
     items: repos,
     packages,
-    message: "Pick repos to switch to their default branch and update:",
+    message: 'Pick repos to switch to their default branch and update:',
     buildChoice: (all) => {
       const columns = [{ value: (r) => r.dir }]
       const widths = columnWidths(all, columns)
@@ -36,7 +36,7 @@ export async function switchMasterCommand({ configPath, packages, yes = false, f
               r.branch !== r.defaultBranch ? `, default: ${r.defaultBranch}` : ''
             })`,
           ) +
-          (force && !r.clean ? pc.red('  will discard uncommitted changes') : ''),
+          (force && !r.clean ? pc.red(`  will discard uncommitted changes${clean ? ' and untracked files' : ''}`) : ''),
         value: r,
         checked: r.branch !== r.defaultBranch,
       })
@@ -54,7 +54,9 @@ export async function switchMasterCommand({ configPath, packages, yes = false, f
     const proceed = await confirm({
       message:
         force && dirtyCount > 0
-          ? `Switch ${selected.length} repo(s) to their default branch — ${dirtyCount} of them dirty, their uncommitted changes will be permanently discarded. Continue?`
+          ? `Switch ${selected.length} repo(s) to their default branch — ${dirtyCount} of them dirty, their uncommitted changes${
+              clean ? ' and untracked files' : ''
+            } will be permanently discarded. Continue?`
           : `Switch ${selected.length} repo(s) to their default branch and fast-forward?`,
       default: !force,
     })
@@ -74,7 +76,7 @@ export async function switchMasterCommand({ configPath, packages, yes = false, f
       continue
     }
 
-    const result = syncMaster(repo, { force })
+    const result = syncDefaultBranch(repo, { force, clean })
     if (!result.ok) {
       fail(result.message)
       continue
@@ -82,7 +84,7 @@ export async function switchMasterCommand({ configPath, packages, yes = false, f
 
     ok(
       force && !repo.clean
-        ? `Discarded local changes — now on ${repo.defaultBranch}, matching origin.`
+        ? `Discarded local changes${clean ? ' and untracked files' : ''} — now on ${repo.defaultBranch}, matching origin.`
         : `Now on ${repo.defaultBranch}, up to date with origin.`,
     )
   }

package/src/commands/tag.js

@@ -2,7 +2,7 @@ import { confirm } from '@inquirer/prompts'
 import pc from 'picocolors'
 import { discoverRepos, inspectRepos } from '../repos.js'
 import { loadConfig } from '../loadConfig.js'
-import { syncMaster } from '../masterSync.js'
+import { syncDefaultBranch } from '../defaultBranchSync.js'
 import { tagName, tagExists, tagExistsAsync, createAndPushTag } from '../tags.js'
 import { selectPackages } from '../selectPackages.js'
 import { filterByNames } from '../filterByNames.js'
@@ -88,7 +88,7 @@ export async function tagCommand({ configPath, packages, yes = false, dryRun = f
     index += 1
     stepHeading(index, selected.length, `${repo.dir}  ${repo.tag}`)
 
-    const syncResult = syncMaster(repo)
+    const syncResult = syncDefaultBranch(repo)
     if (!syncResult.ok) {
       fail(syncResult.message)
       continue

package/src/{masterSync.js → defaultBranchSync.js}

@@ -7,14 +7,18 @@ import { git } from './exec.js'
 // (detected per repo — see repos.js's detectDefaultBranchAsync) rather
 // than assuming "master", since that isn't universal.
 //
-// `force: true` (only `switch-master --force` sets this) trades the safe
+// `force: true` (only `switch-default --force` sets this) trades the safe
 // fast-forward-only merge for `checkout -f` + `reset --hard` — it discards
 // any uncommitted changes to tracked files and any local commits the
 // default branch has that origin doesn't, unconditionally. Untracked
-// files are left alone (this isn't `git clean`). Callers that don't pass
-// it keep the original safe behavior — bump/tag rely on that, they never
-// force.
-export function syncMaster(repo, { force = false } = {}) {
+// files are left alone unless `clean: true` is also given (only valid
+// together with `force`) — that additionally runs `git clean -fd`,
+// removing untracked files/directories that aren't gitignored (build
+// output that isn't in .gitignore is the common case). `-x` is
+// deliberately not used — gitignored paths like node_modules are left
+// alone even under --clean. Callers that don't pass `force` keep the
+// original safe behavior — bump/tag rely on that, they never force.
+export function syncDefaultBranch(repo, { force = false, clean = false } = {}) {
   const branch = repo.defaultBranch
   if (!git(repo.path, ['fetch', 'origin']).ok) {
     return { ok: false, message: 'git fetch origin failed.' }
@@ -26,6 +30,9 @@ export function syncMaster(repo, { force = false } = {}) {
     if (!git(repo.path, ['reset', '--hard', `origin/${branch}`]).ok) {
       return { ok: false, message: `git reset --hard origin/${branch} failed.` }
     }
+    if (clean && !git(repo.path, ['clean', '-fd']).ok) {
+      return { ok: false, message: 'git clean -fd failed.' }
+    }
     return { ok: true }
   }
   if (!git(repo.path, ['merge', '--ff-only', `origin/${branch}`]).ok) {

package/src/index.js

@@ -6,7 +6,7 @@ import { Command } from 'commander'
 import pc from 'picocolors'
 import { listCommand } from './commands/list.js'
 import { doctorCommand } from './commands/doctor.js'
-import { switchMasterCommand } from './commands/switchMaster.js'
+import { switchDefaultCommand } from './commands/switchDefault.js'
 import { bumpCommand } from './commands/bump.js'
 import { publishCommand } from './commands/publish.js'
 import { tagCommand } from './commands/tag.js'
@@ -94,7 +94,7 @@ function wrapText(text, width) {
 program
   .name('polyrepo')
   .description(
-    'Manage local npm package repos: pick which directories to scan (setup), clone missing ones from GitHub (clone), see their state (list), outdated dependencies (outdated), or open PRs (prs), run a health check (doctor), keep them on an up-to-date default branch (switch-master), release a version through a PR (bump), publish to npm (publish), tag an already-current version (tag), create GitHub Releases (release), or run any command across every repo (exec).',
+    'Manage local npm package repos: pick which directories to scan (setup), clone missing ones from GitHub (clone), see their state (list), outdated dependencies (outdated), or open PRs (prs), run a health check (doctor), keep them on an up-to-date default branch (switch-default), release a version through a PR (bump), publish to npm (publish), tag an already-current version (tag), create GitHub Releases (release), or run any command across every repo (exec).',
   )
   .version(CLI_VERSION)
   .option(
@@ -124,7 +124,7 @@ Examples:
   $ polyrepo list                               Show version + branch for every package
   $ polyrepo outdated                           Show outdated dependencies across every package
   $ polyrepo prs                                List open pull requests across every package
-  $ polyrepo switch-master                      Update selected repos to their latest default branch
+  $ polyrepo switch-default                     Update selected repos to their latest default branch
   $ polyrepo bump --dry-run                     Preview a version bump, nothing is pushed
   $ polyrepo bump --minor --packages a,b --yes  Bump specific packages' minor version, non-interactively
   $ polyrepo publish                            Publish packages that are ahead of the registry
@@ -322,7 +322,7 @@ non-destructive self-repair:
   Branch sync           fetches and compares each repo's local default
                         branch against origin: diverged (needs manual
                         resolution), behind only (safe to fast-forward with
-                        \`switch-master\`), or ahead only (unpushed local
+                        \`switch-default\`), or ahead only (unpushed local
                         commits) — surfaced before a command trips over it.
   Branch protection     whether each repo's default branch actually has
                         GitHub branch protection enabled. Report-only —
@@ -355,8 +355,8 @@ Examples:
   )
 
 program
-  .command('switch-master')
-  .alias('sm')
+  .command('switch-default')
+  .alias('sd')
   .description('Pick repos and switch each to its up-to-date default branch.')
   .option(...PACKAGES_OPTION)
   .option(...YES_OPTION)
@@ -364,6 +364,10 @@ program
     '--force',
     "Discard uncommitted changes and any local-only commits on a repo's default branch, hard-resetting it to match origin.",
   )
+  .option(
+    '--clean',
+    'With --force, also remove untracked files/directories (git clean -fd) — only valid together with --force.',
+  )
   .addHelpText(
     'after',
     `
@@ -380,25 +384,36 @@ to resolve by hand.
 selected repo gets \`git checkout -f <default branch>\` + \`git reset --hard
 origin/<default branch>\` instead of the safe fast-forward-only merge —
 uncommitted changes to tracked files and any local-only commits on that
-branch are permanently discarded (untracked files are left alone, this
-isn't \`git clean\`). The proceed confirmation says how many selected
-repos are dirty and defaults to "No" when --force would actually discard
-something.
+branch are permanently discarded. Untracked files are still left alone
+at this point (this isn't \`git clean\`) — add --clean to also run
+\`git clean -fd\` (removes untracked files/directories that aren't
+gitignored; gitignored paths like node_modules are still left alone,
+this doesn't use -x). --clean only means anything alongside --force —
+without it there's nothing to discard in the first place. The proceed
+confirmation says how many selected repos are dirty and defaults to
+"No" when --force would actually discard something.
 
 Examples:
-  $ polyrepo switch-master
-  $ polyrepo sm --packages vue-toast-kit,os-detect --yes
-  $ polyrepo sm --packages vue-toast-kit --force   Discard its local changes and hard-reset to origin
+  $ polyrepo switch-default
+  $ polyrepo sd --packages vue-toast-kit,os-detect --yes
+  $ polyrepo sd --packages vue-toast-kit --force   Discard its local changes and hard-reset to origin
+  $ polyrepo sd --packages vue-toast-kit --force --clean   Also remove untracked build output etc.
 `,
   )
-  .action((opts) =>
-    switchMasterCommand({
+  .action((opts) => {
+    if (opts.clean && !opts.force) {
+      console.error('--clean only makes sense together with --force.')
+      process.exitCode = 1
+      return
+    }
+    return switchDefaultCommand({
       configPath: program.opts().config,
       packages: opts.packages ? opts.packages.split(',') : undefined,
       yes: Boolean(opts.yes),
       force: Boolean(opts.force),
-    }),
-  )
+      clean: Boolean(opts.clean),
+    })
+  })
 
 program
   .command('bump')

package/src/spinner.js

@@ -9,7 +9,7 @@ const CLEAR_LINE = '\r\x1b[K'
 
 // Covers the "nothing is printed for several seconds" gap while a parallel
 // batch (pMap) is in flight and there's no per-item progress to show yet —
-// list's full mode, doctor, and the initial repo scan in bump/switch-master
+// list's full mode, doctor, and the initial repo scan in bump/switch-default
 // all used to just sit there silently. Falls back to a single static line
 // when stdout isn't a real terminal (piped output, CI logs) — redrawing
 // with carriage returns there would just dump a stream of raw \r bytes

package/src/ui.js

@@ -1,7 +1,7 @@
 import pc from 'picocolors'
 
 // Column width/row-formatting is shared by `printTable` (the `list` output)
-// and by the checkbox choice labels in `bump`/`switch-master`/`publish` —
+// and by the checkbox choice labels in `bump`/`switch-default`/`publish` —
 // so a package name column lines up the same way whether it's shown in a
 // static table or as a pickable list, instead of each command reinventing
 // its own ad-hoc padding (which is how columns used to drift out of line