@neriros/ralphy 2.20.0 → 2.20.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.20.0")
-      return "2.20.0";
+    if ("2.20.1")
+      return "2.20.1";
   } catch {}
   const dirsToTry = [];
   try {
@@ -61356,7 +61356,8 @@ function buildAgentCoordinator(input) {
   const branchByChange = new Map;
   const issueByChange = new Map;
   const prByChange = new Map;
-  const prUnavailable = new Set;
+  const prUnavailable = new Map;
+  const PR_UNAVAILABLE_TTL_MS = 10 * 60 * 1000;
   const stalePingedAt = new Map;
   const useWorktree = args.worktree || cfg.useWorktree;
   const scriptRunner = input.runners?.runScript ?? (async (cmd, cwd2) => {
@@ -61680,44 +61681,90 @@ PR: ${prUrl}` : ""
   }
   async function checkPrConflict(issue) {
     const changeName = changeNameForIssue(issue);
-    if (prUnavailable.has(changeName))
+    if (isPrUnavailable(changeName))
       return null;
-    const branch = branchForChange(changeName);
     let prUrl = prByChange.get(changeName);
     if (!prUrl) {
+      const found = await discoverPrUrl(issue, changeName);
+      if (!found)
+        return null;
+      prUrl = found;
+      prByChange.set(changeName, prUrl);
+    }
+    for (let attempt2 = 0;attempt2 < 3; attempt2++) {
       try {
-        const res = await cmdRunner.run([
-          "gh",
-          "pr",
-          "list",
-          "--head",
-          branch,
-          "--state",
-          "open",
-          "--json",
-          "url",
-          "--jq",
-          ".[0].url // empty"
-        ], projectRoot);
-        const found = res.stdout.trim();
-        if (!found) {
-          prUnavailable.add(changeName);
-          return null;
+        const res = await cmdRunner.run(["gh", "pr", "view", prUrl, "--json", "mergeable", "--jq", ".mergeable"], projectRoot);
+        const mergeable = res.stdout.trim();
+        if (mergeable !== "UNKNOWN") {
+          return { url: prUrl, conflicting: mergeable === "CONFLICTING" };
         }
-        prUrl = found;
-        prByChange.set(changeName, prUrl);
-      } catch {
-        prUnavailable.add(changeName);
+      } catch (err) {
+        onLog(`! gh pr view ${prUrl} failed (conflict scan): ${err.message}`, "yellow");
         return null;
       }
+      await new Promise((r) => setTimeout(r, 2000));
     }
-    try {
-      const res = await cmdRunner.run(["gh", "pr", "view", prUrl, "--json", "mergeable", "--jq", ".mergeable"], projectRoot);
-      const mergeable = res.stdout.trim();
-      return { url: prUrl, conflicting: mergeable === "CONFLICTING" };
-    } catch {
-      return null;
+    onLog(`  ${issue.identifier}: mergeability still UNKNOWN after retries (${prUrl}) \u2014 will recheck next poll`, "gray");
+    return null;
+  }
+  function isPrUnavailable(changeName) {
+    const expiry = prUnavailable.get(changeName);
+    if (expiry === undefined)
+      return false;
+    if (Date.now() >= expiry) {
+      prUnavailable.delete(changeName);
+      return false;
     }
+    return true;
+  }
+  function markPrUnavailable(changeName) {
+    prUnavailable.set(changeName, Date.now() + PR_UNAVAILABLE_TTL_MS);
+  }
+  async function discoverPrUrl(issue, changeName) {
+    const branch = branchForChange(changeName);
+    const tryGh = async (args2) => {
+      try {
+        const res = await cmdRunner.run(args2, projectRoot);
+        const found = res.stdout.trim();
+        return found || null;
+      } catch (err) {
+        onLog(`! gh ${args2[1] ?? ""} failed for ${issue.identifier}: ${err.message}`, "yellow");
+        return null;
+      }
+    };
+    const byBranch = await tryGh([
+      "gh",
+      "pr",
+      "list",
+      "--head",
+      branch,
+      "--state",
+      "open",
+      "--json",
+      "url",
+      "--jq",
+      ".[0].url // empty"
+    ]);
+    if (byBranch)
+      return byBranch;
+    const byIdentifier = await tryGh([
+      "gh",
+      "pr",
+      "list",
+      "--search",
+      `${issue.identifier} in:title state:open`,
+      "--json",
+      "url",
+      "--jq",
+      ".[0].url // empty"
+    ]);
+    if (byIdentifier) {
+      onLog(`  ${issue.identifier}: PR discovered via title search (${byIdentifier})`, "gray");
+      return byIdentifier;
+    }
+    onLog(`  ${issue.identifier}: no open PR found on head=${branch} or title-search; conflict scan skipped for ${PR_UNAVAILABLE_TTL_MS / 60000}m`, "gray");
+    markPrUnavailable(changeName);
+    return null;
   }
   async function fetchDoneCandidates() {
     if (!indicators.setDone)
@@ -61953,36 +62000,15 @@ PR: ${prUrl}` : ""
   }
   async function resolvePrUrlForIssue(issue) {
     const changeName = changeNameForIssue(issue);
-    if (prUnavailable.has(changeName))
+    if (isPrUnavailable(changeName))
       return null;
     const cached = prByChange.get(changeName);
     if (cached)
       return cached;
-    const branch = branchForChange(changeName);
-    try {
-      const res = await cmdRunner.run([
-        "gh",
-        "pr",
-        "list",
-        "--head",
-        branch,
-        "--state",
-        "all",
-        "--json",
-        "url",
-        "--jq",
-        ".[0].url // empty"
-      ], projectRoot);
-      const found = res.stdout.trim();
-      if (!found) {
-        prUnavailable.add(changeName);
-        return null;
-      }
+    const found = await discoverPrUrl(issue, changeName);
+    if (found)
       prByChange.set(changeName, found);
-      return found;
-    } catch {
-      return null;
-    }
+    return found;
   }
   async function fetchPrIssueComments(prUrl) {
     const m = /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/pull\/(\d+)/.exec(prUrl);

package/package.json

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