unirepo-cli 0.5.0 → 0.5.2

package/package.json

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

package/src/commands/add.js

@@ -1,9 +1,9 @@
-import { git, detectDefaultBranch, extractRepoName, setConfiguredSubtreeBranch } from '../git.js';
+import { git, detectDefaultBranch, extractRepoName, getMonorepoRoot, setConfiguredSubtreeBranch } from '../git.js';
 import { validateGitSubtree, validateUrls, validateInsideMonorepo, validateNameAvailable, validateReachable } from '../validate.js';
 import * as ui from '../ui.js';
 
 export async function runAdd({ url, prefix, branch, fullHistory }) {
-  const cwd = process.cwd();
+  const cwd = getMonorepoRoot(process.cwd());
 
   // ── Preflight ────────────────────────────────────────────────────────────
   ui.header('Adding repository');

package/src/commands/branch.js

@@ -2,6 +2,7 @@ import {
   git,
   getConfiguredSubtreePushBranch,
   getCurrentBranch,
+  getMonorepoRoot,
   getSubtreePrefixes,
   getTrackedSubtreeBranch,
   resolveSubtreePushBranch,
@@ -10,7 +11,7 @@ import { validateInsideMonorepo } from '../validate.js';
 import * as ui from '../ui.js';
 
 export async function runBranch({ name }) {
-  const cwd = process.cwd();
+  const cwd = getMonorepoRoot(process.cwd());
 
   validateInsideMonorepo(cwd);
 

package/src/commands/pr.js

@@ -1,6 +1,7 @@
 import {
   getConfiguredSubtreePushBranch,
   getCurrentBranch,
+  getMonorepoRoot,
   getSubtreePrefixes,
   getChangedSubtrees,
   getTrackedSubtreeBranch,
@@ -62,7 +63,7 @@ export function planPrTargets({
 }
 
 export async function runPr({ subtrees: requestedSubtrees, title, body, base, head, draft, dryRun }) {
-  const cwd = process.cwd();
+  const cwd = getMonorepoRoot(process.cwd());
 
   ui.header('Creating pull requests');
   ui.blank();

package/src/commands/pull.js

@@ -1,4 +1,4 @@
-import { git, getSubtreePrefixes, getTrackedSubtreeBranch, hasRemoteBranch, setConfiguredSubtreeBranch } from '../git.js';
+import { git, getMonorepoRoot, getSubtreePrefixes, getTrackedSubtreeBranch, hasRemoteBranch, setConfiguredSubtreeBranch } from '../git.js';
 import { validateGitSubtree, validateInsideMonorepo } from '../validate.js';
 import * as ui from '../ui.js';
 
@@ -49,7 +49,7 @@ export function resolvePullUpstreamBranch({ requestedBranch, trackedBranch }) {
 }
 
 export async function runPull({ subtrees: requestedSubtrees, branch, fullHistory }) {
-  const cwd = process.cwd();
+  const cwd = getMonorepoRoot(process.cwd());
 
   ui.header('Pulling subtrees');
   ui.blank();

package/src/commands/push.js

@@ -2,16 +2,18 @@ import {
   git,
   getConfiguredSubtreePushBranch,
   getCurrentBranch,
+  getMonorepoRoot,
   getSubtreePrefixes,
   getChangedSubtrees,
   hasUncommittedChanges,
   resolveSubtreePushBranch,
+  setLastPushedRef,
 } from '../git.js';
 import { validateGitSubtree, validateInsideMonorepo } from '../validate.js';
 import * as ui from '../ui.js';
 
 export async function runPush({ subtrees: requestedSubtrees, branch, dryRun }) {
-  const cwd = process.cwd();
+  const cwd = getMonorepoRoot(process.cwd());
 
   // ── Preflight ────────────────────────────────────────────────────────────
   ui.header('Pushing subtrees');
@@ -92,6 +94,8 @@ export async function runPush({ subtrees: requestedSubtrees, branch, dryRun }) {
     ui.pushSlow();
     try {
       git(`subtree push --prefix="${target.name}" "${target.name}" "${target.pushBranch}"`, { cwd });
+      const headRef = git('rev-parse HEAD', { cwd, silent: true });
+      setLastPushedRef(cwd, target.name, headRef);
       ui.success(`${target.name} pushed`);
       succeeded++;
     } catch (err) {

package/src/commands/status.js

@@ -1,6 +1,7 @@
 import {
   getConfiguredSubtreePushBranch,
   getCurrentBranch,
+  getMonorepoRoot,
   getSubtreePrefixes,
   getChangedSubtrees,
   getTrackedSubtreeBranch,
@@ -31,7 +32,7 @@ export function buildStatusSubtrees({
 }
 
 export async function runStatus({ json }) {
-  const cwd = process.cwd();
+  const cwd = getMonorepoRoot(process.cwd());
 
   validateInsideMonorepo(cwd);
 

package/src/git.js

@@ -14,6 +14,10 @@ function getSubtreePushBranchConfigKey(prefixName) {
   return `unirepo.subtree.${prefixName}.pushBranch`;
 }
 
+function getSubtreeLastPushedRefKey(prefixName) {
+  return `unirepo.subtree.${prefixName}.lastPushedRef`;
+}
+
 /**
  * Execute a git command and return trimmed stdout.
  * @param {string} args - git arguments
@@ -199,15 +203,15 @@ export function getChangedSubtrees(cwd) {
       continue;
     }
 
-    // Check 2: committed changes since the last subtree add/pull merge
+    // Check 2: committed changes since the last push (or last subtree merge as fallback)
     try {
-      const mergeCommit = findLastSubtreeMerge(cwd, prefix.name);
-      if (mergeCommit) {
-        // Are there any commits after the merge that touch this prefix?
-        const commits = execSync(
-          `git log --oneline "${mergeCommit}..HEAD" -- "${prefix.name}"`,
-          { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }
-        ).trim();
+      const lastPushedRef = getLastPushedRef(cwd, prefix.name);
+      const anchor = lastPushedRef || findLastSubtreeMerge(cwd, prefix.name);
+      if (anchor) {
+        const commits = git(
+          `log --oneline ${quoteShellArg(anchor + '..HEAD')} -- ${quoteShellArg(prefix.name)}`,
+          { cwd, silent: true, allowFailure: true }
+        );
         if (commits) {
           changed.push(prefix);
         }
@@ -312,6 +316,43 @@ export function setConfiguredSubtreePushBranch(cwd, prefixName, branch) {
   );
 }
 
+/**
+ * Get the SHA of the last HEAD that was successfully pushed for a subtree.
+ */
+export function getLastPushedRef(cwd, prefixName) {
+  return git(`config --get ${quoteShellArg(getSubtreeLastPushedRefKey(prefixName))}`, {
+    cwd,
+    silent: true,
+    allowFailure: true,
+  }) || null;
+}
+
+/**
+ * Persist the HEAD SHA that was last successfully pushed for a subtree.
+ */
+export function setLastPushedRef(cwd, prefixName, ref) {
+  git(
+    `config ${quoteShellArg(getSubtreeLastPushedRefKey(prefixName))} ${quoteShellArg(ref)}`,
+    { cwd, silent: true }
+  );
+}
+
+/**
+ * Resolve the root of the git work tree (the monorepo root), even when called
+ * from inside a subtree subdirectory.
+ */
+export function getMonorepoRoot(cwd) {
+  try {
+    return execSync('git rev-parse --show-toplevel', {
+      cwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+  } catch {
+    return cwd;
+  }
+}
+
 /**
  * Resolve the effective push/head branch for a subtree.
  */