@yemi33/minions 0.1.2358 → 0.1.2360

package/engine/github.js

@@ -1161,7 +1161,7 @@ async function pollPrStatus(config) {
         try {
           const mergeMethod = ['squash', 'merge', 'rebase'].includes(config.engine?.prMergeMethod) ? config.engine.prMergeMethod : 'squash';
           // P-a7c4d2e8 (F1): argv-form merge call — eliminates shell interpolation of slug/prNum/mergeMethod.
-          await shared.shellSafeGh(['pr', 'merge', String(prNum), `--${mergeMethod}`, '--repo', shared.validateGhSlug(slug), '--delete-branch'], { timeout: 30000, maxBuffer: GH_MAX_BUFFER });
+          await shared.shellSafeGh(['pr', 'merge', String(prNum), `--${mergeMethod}`, '--repo', shared.validateGhSlug(slug), '--delete-branch', '--admin'], { timeout: 30000, maxBuffer: GH_MAX_BUFFER });
           pr._autoCompleted = true;
           log('info', `Auto-completed PR ${pr.id}: builds green + review approved → merged (${mergeMethod})`);
           updated = true;

package/engine.js

@@ -1023,22 +1023,44 @@ async function runWorktreeAdd(rootDir, worktreePath, addArgs, gitOpts, worktreeC
 // origin/<mainRef>; the stale-HEAD guard at the top of spawn-agent then
 // trips on every dispatch and the cooldown machinery starves the PR.
 //
-// Returns true only on a confirmed advertised head; ls-remote exit code 2
-// (no matching ref) and any other failure (network/auth) return false so
-// the caller falls back to the existing `-b origin/<mainRef>` path.
+// Returns true only on a confirmed advertised head. ls-remote exit code 2
+// (no matching ref — a clean, authoritative "branch does not exist upstream")
+// returns false so the caller falls back to the `-b origin/<mainRef>` path.
+//
+// Any OTHER failure (network blip, transient auth/401, ADO throttle, timeout)
+// is NOT a confirmed absence — conflating the two caused #767: a transient
+// probe failure against a branch that genuinely exists on origin (e.g. a
+// PR-author's real branch) silently took the fresh-branch fallback and
+// forked a divergent local branch under the same name instead of retrying.
+// We retry once with a short backoff (mirroring `_fetchWithTransientRetry`);
+// if the retry still doesn't cleanly resolve to "not found", we throw so the
+// caller does NOT treat this as a confirmed absence.
 async function probeBranchOnRemote(rootDir, branchName, gitOpts) {
   if (!branchName || !rootDir) return false;
+  const _attemptProbe = () => shared.shellSafeGit(
+    ['ls-remote', '--exit-code', '--heads', 'origin', branchName],
+    { ...gitOpts, cwd: rootDir, timeout: 10000 },
+  );
   try {
-    await shared.shellSafeGit(
-      ['ls-remote', '--exit-code', '--heads', 'origin', branchName],
-      { ...gitOpts, cwd: rootDir, timeout: 10000 },
-    );
+    await _attemptProbe();
     return true;
   } catch (e) {
-    if (e && e.code !== 2) {
-      log('warn', `probeBranchOnRemote: ls-remote --heads origin ${branchName} failed: ${(e.message || '').split('\n')[0].slice(0, 200)} — treating as not-on-remote`);
+    if (e && e.code === 2) return false; // clean, authoritative "not found"
+    const firstErrMsg = adoGitAuth.redactBearer(String(e?.message || e)).split('\n')[0].slice(0, 200);
+    log('warn', `probeBranchOnRemote: ls-remote --heads origin ${branchName} failed (${firstErrMsg}) — retrying once after 1.5s before giving up`);
+    await new Promise(r => setTimeout(r, 1500));
+    try {
+      await _attemptProbe();
+      return true;
+    } catch (e2) {
+      if (e2 && e2.code === 2) return false; // clean, authoritative "not found" on retry
+      const retryErrMsg = adoGitAuth.redactBearer(String(e2?.message || e2)).split('\n')[0].slice(0, 200);
+      log('warn', `probeBranchOnRemote: ls-remote --heads origin ${branchName} retry also failed (${retryErrMsg}) — cannot confirm branch absence, surfacing error`);
+      const probeErr = new Error(`probeBranchOnRemote: could not determine whether origin has ${branchName} after retry: ${retryErrMsg}`);
+      probeErr._probeFailed = true;
+      probeErr._cause = e2;
+      throw probeErr;
     }
-    return false;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.2358",
+  "version": "0.1.2360",
   "description": "Multi-agent AI dev team that runs from ~/.minions/ — five autonomous agents share a single engine, dashboard, and knowledge base",
   "bin": {
     "minions": "bin/minions.js"