unirepo-cli 0.5.2 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unirepo-cli",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "CLI tool for creating and managing git-subtree monorepos — run your agents across repos",
   "type": "module",
   "bin": {

package/src/commands/reset.js

@@ -0,0 +1,104 @@
+import {
+  git,
+  getMonorepoRoot,
+  getRemoteBranch,
+  getSubtreePrefixes,
+  setConfiguredSubtreeBranch,
+  unsetConfiguredSubtreePushBranch,
+  setLastPushedRef,
+  hasUncommittedChanges,
+} from '../git.js';
+import { validateGitSubtree, validateInsideMonorepo } from '../validate.js';
+import * as ui from '../ui.js';
+
+export async function runReset({ subtrees: requestedSubtrees, branch, dryRun }) {
+  const cwd = getMonorepoRoot(process.cwd());
+
+  ui.header('Resetting subtrees');
+  ui.blank();
+
+  validateGitSubtree();
+  validateInsideMonorepo(cwd);
+
+  if (hasUncommittedChanges(cwd)) {
+    ui.error('You have uncommitted changes. Commit or stash before resetting.');
+    ui.blank();
+    process.exit(1);
+  }
+
+  const allPrefixes = getSubtreePrefixes(cwd);
+
+  let prefixes;
+  if (requestedSubtrees && requestedSubtrees.length > 0) {
+    const names = new Set(allPrefixes.map((p) => p.name));
+    for (const name of requestedSubtrees) {
+      if (!names.has(name)) {
+        throw new Error(`"${name}" is not a tracked subtree. Run "unirepo status" to see available subtrees.`);
+      }
+    }
+    prefixes = allPrefixes.filter((p) => requestedSubtrees.includes(p.name));
+  } else {
+    prefixes = allPrefixes;
+  }
+
+  if (prefixes.length === 0) {
+    ui.info('No tracked subtrees found. Nothing to reset.');
+    ui.blank();
+    return;
+  }
+
+  // Use the remote's actual default branch — not the stored config which may be a stale feature branch.
+  const targets = prefixes.map((p) => ({
+    ...p,
+    upstreamBranch: branch || getRemoteBranch(cwd, p.name) || 'main',
+  }));
+
+  const uniqueBranches = [...new Set(targets.map((t) => t.upstreamBranch))];
+  if (uniqueBranches.length === 1) {
+    ui.info(`Resetting all subtrees to branch: ${uniqueBranches[0]}`);
+  } else {
+    ui.info('Resetting subtrees to their upstream default branches');
+  }
+  ui.blank();
+
+  if (dryRun) {
+    const commands = targets.flatMap((t) => [
+      `git subtree pull --squash --prefix="${t.name}" "${t.name}" "${t.upstreamBranch}"`,
+      `git config unirepo.subtree.${t.name}.branch "${t.upstreamBranch}"`,
+      `git config --unset unirepo.subtree.${t.name}.pushBranch`,
+    ]);
+    ui.dryRun(commands);
+    return;
+  }
+
+  let succeeded = 0;
+  let failed = 0;
+
+  for (let i = 0; i < targets.length; i++) {
+    const target = targets[i];
+    ui.repoStep(i + 1, targets.length, target.name, 'Resetting');
+    ui.repoDetail('Branch', target.upstreamBranch);
+
+    try {
+      git(`subtree pull --squash --prefix="${target.name}" "${target.name}" "${target.upstreamBranch}"`, { cwd });
+      const headRef = git('rev-parse HEAD', { cwd, silent: true });
+      setConfiguredSubtreeBranch(cwd, target.name, target.upstreamBranch);
+      unsetConfiguredSubtreePushBranch(cwd, target.name);
+      setLastPushedRef(cwd, target.name, headRef);
+      ui.success(`${target.name} reset to ${target.upstreamBranch}`);
+      succeeded++;
+    } catch (err) {
+      ui.error(`Failed to reset ${target.name}: ${err.message}`);
+      failed++;
+    }
+
+    ui.blank();
+  }
+
+  if (failed === 0) {
+    ui.success(`All ${succeeded} subtree(s) reset`);
+  } else {
+    ui.warning(`${succeeded} reset, ${failed} failed`);
+  }
+  ui.blank();
+}

package/src/git.js

@@ -316,6 +316,17 @@ export function setConfiguredSubtreePushBranch(cwd, prefixName, branch) {
   );
 }
 
+/**
+ * Remove the push/head branch override for a subtree from local git config.
+ */
+export function unsetConfiguredSubtreePushBranch(cwd, prefixName) {
+  git(`config --unset ${quoteShellArg(getSubtreePushBranchConfigKey(prefixName))}`, {
+    cwd,
+    silent: true,
+    allowFailure: true,
+  });
+}
+
 /**
  * Get the SHA of the last HEAD that was successfully pushed for a subtree.
  */

package/src/index.js

@@ -9,6 +9,7 @@ import { runStatus } from './commands/status.js';
 import { runPush } from './commands/push.js';
 import { runBranch } from './commands/branch.js';
 import { runPr } from './commands/pr.js';
+import { runReset } from './commands/reset.js';
 import { pathToFileURL } from 'node:url';
 import { realpathSync } from 'node:fs';
 
@@ -73,6 +74,7 @@ const COMMAND_USAGE = {
   push: 'Usage: unirepo push [subtree...] [--branch <name>] [--dry-run]',
   branch: 'Usage: unirepo branch [name]',
   pr: 'Usage: unirepo pr [subtree...] --title <title> [--body <text>] [--base <name>] [--head <name>] [--draft] [--dry-run]',
+  reset: 'Usage: unirepo reset [subtree...] [--branch <name>] [--dry-run]',
 };
 
 const COMMAND_FLAGS = {
@@ -84,6 +86,7 @@ const COMMAND_FLAGS = {
   push: new Set(['branch', 'dryRun']),
   branch: new Set(),
   pr: new Set(['title', 'body', 'base', 'head', 'draft', 'dryRun']),
+  reset: new Set(['branch', 'dryRun']),
 };
 
 const FLAG_NAMES = {
@@ -227,6 +230,15 @@ export async function main() {
       break;
     }
 
+    case 'reset': {
+      await runReset({
+        subtrees: positional.length > 0 ? positional : undefined,
+        branch: flags.branch,
+        dryRun: flags.dryRun || false,
+      });
+      break;
+    }
+
     default:
       ui.error(`Unknown command: ${command}`);
       ui.blank();

package/src/templates.js

@@ -21,6 +21,12 @@ This repository is a git-subtree monorepo.
 
 ## CLI
 
+If \`unirepo\` is not installed, install it first:
+
+\`\`\`bash
+npm install -g unirepo-cli
+\`\`\`
+
 Preferred when the \`unirepo\` CLI is available:
 
 \`\`\`bash
@@ -67,10 +73,15 @@ git subtree pull --prefix=<subtree> <remote-or-url> <branch> --squash
 
 3. Make changes inside one or more subtree directories.
 
-4. Commit in the monorepo. Prefer one commit per subtree unless the change is intentionally coupled.
+4. Commit in the monorepo. Use one commit per subtree when the changes are independent. When a change is tightly coupled across subtrees (e.g. a shared type change that requires simultaneous updates in both the library and the consumer), commit all affected subtrees together in a single commit so the intent is clear.
 \`\`\`bash
+# Single subtree
 git add <subtree>/
 git commit -m "feat(<subtree>): ..."
+
+# Coupled change across subtrees
+git add <subtree-a>/ <subtree-b>/
+git commit -m "feat: ..."
 \`\`\`
 
 5. Inspect what changed before pushing.
@@ -136,4 +147,6 @@ export const GITIGNORE = `.DS_Store
 
 *.swp
 *.swo
+
+AGENTS.md
 `;

package/src/ui.js

@@ -181,6 +181,7 @@ ${chalk.bold('Commands:')}
   ${chalk.green('push')} [subtree...]            Push changed subtrees upstream
   ${chalk.green('pr')}   [subtree...]            Open PRs for changed subtree repos
   ${chalk.green('branch')} [name]               Create or show the workspace branch
+  ${chalk.green('reset')} [subtree...]           Pull from upstream main and align all push branches
   ${chalk.green('version')}                     Show the installed CLI version
 
 ${chalk.bold('Global options:')}
@@ -207,6 +208,10 @@ ${chalk.bold('Push options:')}
   --branch <name>             Branch name for all selected subtree pushes
   --dry-run                   Show commands without executing
 
+${chalk.bold('Reset options:')}
+  --branch <name>             Branch to pull from and align push targets to (default: each subtree's upstream default)
+  --dry-run                   Show commands without executing
+
 ${chalk.bold('PR options:')}
   --title <title>             Shared PR title (required)
   --body <text>               Shared PR description
@@ -238,6 +243,9 @@ ${chalk.bold('Examples:')}
   ${chalk.dim('# Override one subtree push/PR branch via local git config')}
   git config unirepo.subtree.api.pushBranch feature-api
 
+  ${chalk.dim('# After merging a feature, reset all subtrees back to main')}
+  npx unirepo reset
+
   ${chalk.dim('# Push changes upstream')}
   npx unirepo push --dry-run