@quonfig/cli 0.0.33 → 0.0.35

package/dist/util/git-ops.js

@@ -222,6 +222,41 @@ export const canFastForward = async (dir) => {
         return false;
     }
 };
+/**
+ * Returns true iff origin/main is NOT an ancestor of the local HEAD —
+ * covering both "local strictly behind" and "diverged" in one boolean.
+ *
+ * Used by the clone-path stale-HEAD guard in `qfg push` (qfg-fboj):
+ * either of those two states would otherwise produce a `HEAD..origin/main`
+ * diff that ships REVERSAL deltas to the server, silently undoing
+ * remote-newer commits. Both must refuse.
+ *
+ * Returns false on any git failure (no `origin/main` ref yet, no `.git/`,
+ * etc.) so the caller falls through to its other guards rather than
+ * aborting on an opaque error.
+ */
+export const isLocalBehindOrDivergedFromRemote = async (dir) => {
+    try {
+        const { stdout: localSha } = await runGit(['-C', dir, 'rev-parse', 'HEAD']);
+        const { stdout: remoteSha } = await runGit(['-C', dir, 'rev-parse', 'origin/main']);
+        const local = localSha.trim();
+        const remote = remoteSha.trim();
+        if (local === remote)
+            return false;
+        try {
+            // exit 0 → remote is an ancestor of local → local is strictly ahead, fine.
+            await runGit(['-C', dir, 'merge-base', '--is-ancestor', remote, local]);
+            return false;
+        }
+        catch {
+            // non-zero exit → remote is NOT an ancestor → behind or diverged.
+            return true;
+        }
+    }
+    catch {
+        return false;
+    }
+};
 /**
  * Returns true if local has commits not reachable from origin/main (diverged).
  */
@@ -310,3 +345,50 @@ export const hasAtLeastOneCommit = async (dir) => {
  * Get the URL stripped of credentials for display purposes.
  */
 export const displayUrl = (url) => redactToken(url);
+/**
+ * `git pull --rebase origin main`. Replays local commits on top of the
+ * remote tip. On conflicts, leaves the repo in rebase-in-progress state
+ * with `<<<<<<<` / `=======` / `>>>>>>>` markers planted by git so the
+ * user can resolve via standard git tools (`git rebase --continue` /
+ * `git rebase --abort`).
+ *
+ * Caller is responsible for surfacing recovery instructions; this function
+ * only reports the outcome.
+ */
+export const gitPullRebase = async (dir) => {
+    // Count local-only commits BEFORE the rebase so the success path can
+    // tell the user how many got moved. After a clean rebase, origin/main
+    // is the merge-base and ahead-count == commits-rebased.
+    let commitsRebased = 0;
+    try {
+        const { stdout } = await runGit(['-C', dir, 'rev-list', '--count', 'origin/main..HEAD']);
+        commitsRebased = Number.parseInt(stdout.trim(), 10) || 0;
+    }
+    catch {
+        // Non-fatal — counting is for UX, not correctness.
+    }
+    try {
+        await runGit(['-C', dir, 'pull', '--rebase', 'origin', 'main']);
+        return { kind: 'clean', commitsRebased };
+    }
+    catch (err) {
+        // Distinguish "rebase paused on conflicts" from "rebase never started".
+        // Conflicts: `diff --diff-filter=U` lists the unmerged paths and
+        // `.git/rebase-merge/` is present.
+        try {
+            const { stdout } = await runGit(['-C', dir, 'diff', '--name-only', '--diff-filter=U']);
+            const conflictedFiles = stdout
+                .split('\n')
+                .map((s) => s.trim())
+                .filter(Boolean);
+            if (conflictedFiles.length > 0) {
+                return { kind: 'conflicts', conflictedFiles };
+            }
+        }
+        catch {
+            // Fall through to 'failed' — diff itself errored.
+        }
+        const reason = err instanceof Error ? err.message : String(err);
+        return { kind: 'failed', reason };
+    }
+};

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.0.33";
+declare const _default: "0.0.35";
 export default _default;

package/dist/version.js

@@ -1,2 +1,2 @@
 // AUTO-GENERATED from package.json by scripts/generate-version.mjs — do not edit.
-export default '0.0.33';
+export default '0.0.35';

package/oclif.manifest.json

@@ -1415,6 +1415,12 @@
           "multiple": false,
           "type": "option"
         },
+        "rebase": {
+          "description": "Replay local commits on top of origin/main when the two have diverged. Conflicts are surfaced via standard git markers; resolve with `git rebase --continue`.",
+          "name": "rebase",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "workspace": {
           "description": "Workspace ID (defaults to active profile)",
           "name": "workspace",
@@ -2910,5 +2916,5 @@
       ]
     }
   },
-  "version": "0.0.33"
+  "version": "0.0.35"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "packageManager": "yarn@4.11.0+sha512.4e54aeace9141df2f0177c266b05ec50dc044638157dae128c471ba65994ac802122d7ab35bcd9e81641228b7dcf24867d28e750e0bcae8a05277d600008ad54",
   "name": "@quonfig/cli",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "bugs": {
     "url": "https://github.com/quonfig/cli/issues"
   },