@neriros/ralphy 2.17.0 → 2.17.1

package/dist/cli/index.js

@@ -35029,8 +35029,8 @@ import { readFileSync as readFileSync2 } from "fs";
 import { resolve } from "path";
 function getVersion() {
   try {
-    if ("2.17.0")
-      return "2.17.0";
+    if ("2.17.1")
+      return "2.17.1";
   } catch {}
   const dirsToTry = [];
   try {
@@ -60796,6 +60796,8 @@ async function fixConflictsAndCiLoop(ctx, prUrl, wantFixCi, checkPrConflict) {
       } catch (err) {
         ctx.log(`! conflict check failed: ${err.message}`, "yellow");
       }
+      if (!conflicting && ciConfirmedGreen)
+        return 0;
       if (conflicting) {
         outerAttempt++;
         ciConfirmedGreen = false;
@@ -61442,12 +61444,18 @@ PR: ${prUrl}` : ""
           onPhase: (phase, detail) => onWorkerPhase(changeName, phase, detail)
         },
         checkPrConflict: async (prUrl) => {
-          try {
-            const res = await tracedCmd.run(["gh", "pr", "view", prUrl, "--json", "mergeable", "--jq", ".mergeable"], cwd2);
-            return res.stdout.trim() === "CONFLICTING";
-          } catch {
-            return false;
+          for (let attempt2 = 0;attempt2 < 5; attempt2++) {
+            try {
+              const res = await tracedCmd.run(["gh", "pr", "view", prUrl, "--json", "mergeable", "--jq", ".mergeable"], cwd2);
+              const mergeable = res.stdout.trim();
+              if (mergeable !== "UNKNOWN")
+                return mergeable === "CONFLICTING";
+            } catch {
+              return false;
+            }
+            await new Promise((r) => setTimeout(r, 2000));
           }
+          return false;
         }
       });
       cwdByChange.delete(changeName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neriros/ralphy",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "description": "An iterative AI task execution framework. Orchestrates multi-phase autonomous work using Claude or Codex engines.",
   "keywords": [
     "agent",