@neriros/ralphy 2.17.0 → 2.17.2

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.2")
+      return "2.17.2";
   } catch {}
   const dirsToTry = [];
   try {
@@ -35131,6 +35131,7 @@ async function parseArgs(argv) {
     createPr: false,
     fixCi: false,
     maxTickets: 0,
+    projectRoot: undefined,
     jsonOutput: false
   };
   let expectModel = false;
@@ -35149,6 +35150,7 @@ async function parseArgs(argv) {
   let expectConcurrency = false;
   let expectMaxTickets = false;
   let expectIndicator = false;
+  let expectProjectRoot = false;
   for (const arg of argv) {
     if (expectModel) {
       if (VALID_MODELS.has(arg)) {
@@ -35237,6 +35239,11 @@ async function parseArgs(argv) {
       expectIndicator = false;
       continue;
     }
+    if (expectProjectRoot) {
+      result2.projectRoot = arg;
+      expectProjectRoot = false;
+      continue;
+    }
     switch (arg) {
       case "--claude":
         if (result2.engineSet && result2.engine !== "claude") {
@@ -35325,6 +35332,9 @@ async function parseArgs(argv) {
       case "--from-agent":
         result2.fromAgent = true;
         break;
+      case "--project-root":
+        expectProjectRoot = true;
+        break;
       default:
         if (VALID_MODES.has(arg)) {
           result2.mode = arg;
@@ -60796,6 +60806,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 +61454,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);
@@ -73745,8 +73763,11 @@ init_worktree();
 // apps/cli/src/debug.ts
 init_log();
 import { join as join20 } from "path";
+function fmtTs(d) {
+  return d.toISOString().replace("T", " ").slice(0, 23);
+}
 var LOG_LINE_RE = /^\[(.+?)\] \[(.+?)\] (.+)$/;
-function parseLog(content) {
+function parseTextLog(content) {
   return content.split(`
 `).filter(Boolean).flatMap((line) => {
     const m = LOG_LINE_RE.exec(line);
@@ -73758,23 +73779,154 @@ function parseLog(content) {
     return [{ ts, type: m[2], text: m[3] }];
   });
 }
-function fmtTs(d) {
-  return d.toISOString().replace("T", " ").slice(0, 23);
+function parseJsonlLog(content, filterChangeName) {
+  return content.split(`
+`).filter(Boolean).flatMap((line) => {
+    let entry;
+    try {
+      entry = JSON.parse(line);
+    } catch {
+      return [];
+    }
+    const ts = new Date(entry.ts);
+    if (isNaN(ts.getTime()))
+      return [];
+    if (filterChangeName && entry.changeName && entry.changeName !== filterChangeName) {
+      return [];
+    }
+    const cn = entry.changeName ?? "";
+    switch (entry.type) {
+      case "started":
+        return [{ ts, type: "agent", text: `agent started v${entry.version ?? "?"}` }];
+      case "stopped":
+        return [{ ts, type: "agent", text: "agent stopped" }];
+      case "worker_started":
+        return [{ ts, type: "spawn", text: `${cn}: worker spawned` }];
+      case "worker_phase": {
+        const detail = entry.detail ? ` (${entry.detail})` : "";
+        return [{ ts, type: "phase", text: `${cn}: ${entry.phase}${detail}` }];
+      }
+      case "worker_cmd_start":
+        return [
+          {
+            ts,
+            type: "cmd",
+            text: `${cn}: \u2192 ${(entry.cmd ?? []).slice(0, 4).join(" ")}`
+          }
+        ];
+      case "worker_cmd_end":
+        return [
+          {
+            ts,
+            type: "cmd",
+            text: `${cn}: \u2190 ${(entry.cmd ?? []).slice(0, 2).join(" ")} (${entry.durationMs}ms, ${entry.ok ? "ok" : "err"})`
+          }
+        ];
+      case "worker_pr":
+        return [{ ts, type: "pr", text: `${cn}: PR \u2192 ${entry.prUrl}` }];
+      case "worker_exited":
+        return [
+          {
+            ts,
+            type: "exit",
+            text: `${cn}: exited (code ${entry.exitCode ?? "?"})`
+          }
+        ];
+      case "log":
+        return [{ ts, type: "coord", text: entry.text ?? "" }];
+      case "poll_done":
+        return [
+          {
+            ts,
+            type: "poll",
+            text: `poll: found=${entry.found} added=${entry.added}`
+          }
+        ];
+      default:
+        return [];
+    }
+  });
+}
+function detectStuck(lines) {
+  if (lines.length < 10)
+    return null;
+  const recent = lines.slice(-20).filter((l) => l.type === "phase");
+  if (recent.length < 5)
+    return null;
+  const phaseNames = recent.map((l) => l.text.split(": ").slice(1).join(": "));
+  const unique = new Set(phaseNames);
+  if (unique.size !== 1)
+    return null;
+  const phase = phaseNames[0];
+  const all = lines.filter((l) => l.type === "phase" && l.text.includes(phase));
+  const first = all[0];
+  const last2 = all[all.length - 1];
+  const minutesStuck = (last2.ts.getTime() - first.ts.getTime()) / 60000;
+  const prEntry = lines.find((l) => l.type === "pr");
+  const cmdEntry = lines.find((l) => l.type === "cmd" && l.text.includes("gh") && l.text.includes("mergeable"));
+  const watchingPrUrl = prEntry?.text.split("PR \u2192 ")[1] ?? cmdEntry?.text.match(/https:\/\/github\.com\/[^\s)]+/)?.[0];
+  return {
+    phase,
+    count: all.length,
+    firstSeen: first.ts,
+    lastSeen: last2.ts,
+    minutesStuck,
+    watchingPrUrl
+  };
+}
+async function inspectBinary(projectRoot) {
+  const binPath = join20(projectRoot, ".ralph", "bin", "cli.js");
+  const file = Bun.file(binPath);
+  if (!await file.exists())
+    return null;
+  let embeddedVersion;
+  try {
+    const slice2 = await file.slice(0, 50000).text();
+    const m = /"(\d+\.\d+\.\d+)"/.exec(slice2);
+    if (m)
+      embeddedVersion = m[1];
+  } catch {}
+  let builtAt;
+  try {
+    const r = Bun.spawnSync(["stat", "-f", "%Sm", "-t", "%Y-%m-%dT%H:%M:%S", binPath], {
+      stderr: "ignore"
+    });
+    const s = r.stdout.toString().trim();
+    if (s)
+      builtAt = new Date(s);
+  } catch {}
+  return { path: binPath, embeddedVersion, builtAt };
 }
 var SPAWN_RE = /\u25B6 (\S+) \u2192 (\S+)/;
-async function resolveDebugTarget(opts) {
+async function resolveDebugTarget(projectRoot, opts) {
   const agentLogFile = Bun.file(AGENT_LOG_PATH);
-  const agentLines = await agentLogFile.exists() ? parseLog(await agentLogFile.text()) : [];
+  const textLines = await agentLogFile.exists() ? parseTextLog(await agentLogFile.text()) : [];
+  const jsonlLogFile = Bun.file(join20(projectRoot, ".ralph", "agent.log"));
+  const jsonlLines = await jsonlLogFile.exists() ? parseJsonlLog(await jsonlLogFile.text()) : [];
+  const allLines = [...textLines, ...jsonlLines];
   if (opts.name && !opts.issue) {
-    for (const line of agentLines) {
+    for (const line of allLines) {
       const m = SPAWN_RE.exec(line.text);
       if (m && m[2] === opts.name)
         return { changeName: opts.name, identifier: m[1] };
     }
+    for (const line of allLines) {
+      if (line.text.includes(opts.name) && line.text.includes("COD-")) {
+        const id = /COD-\d+/.exec(line.text)?.[0];
+        if (id)
+          return { changeName: opts.name, identifier: id };
+      }
+    }
     return { changeName: opts.name, identifier: undefined };
   }
   if (opts.issue && !opts.name) {
-    for (const line of agentLines) {
+    const pattern = new RegExp(`(cod-${opts.issue.toLowerCase().replace("cod-", "")}[\\w-]+)`);
+    for (const line of allLines) {
+      const m = pattern.exec(line.text);
+      if (m)
+        return { changeName: m[1], identifier: opts.issue };
+    }
+    for (const line of allLines) {
       const m = SPAWN_RE.exec(line.text);
       if (m && m[1] === opts.issue)
         return { changeName: m[2], identifier: opts.issue };
@@ -73844,34 +73996,33 @@ async function fetchGithubPr(changeName) {
   ]) ?? [];
   return { ...pr, checks };
 }
+function fetchMergeableNow(prUrl) {
+  const result2 = Bun.spawnSync(["gh", "pr", "view", prUrl, "--json", "mergeable", "--jq", ".mergeable"], { stderr: "ignore" });
+  return result2.exitCode === 0 ? result2.stdout.toString().trim() : null;
+}
 async function runDebug(opts) {
   const { projectRoot } = opts;
+  const out = (s) => process.stdout.write(s + `
+`);
   const agentLogFile = Bun.file(AGENT_LOG_PATH);
-  const agentLogContent = await agentLogFile.exists() ? await agentLogFile.text() : "";
-  const agentLines = parseLog(agentLogContent);
-  let { changeName, identifier: issueIdentifier } = await resolveDebugTarget({
+  const textLines = await agentLogFile.exists() ? parseTextLog(await agentLogFile.text()) : [];
+  const jsonlLogPath = join20(projectRoot, ".ralph", "agent.log");
+  const jsonlLogFile = Bun.file(jsonlLogPath);
+  const hasJsonlLog = await jsonlLogFile.exists();
+  let { changeName, identifier: issueIdentifier } = await resolveDebugTarget(projectRoot, {
     ...opts.name !== undefined ? { name: opts.name } : {},
     ...opts.issue !== undefined ? { issue: opts.issue } : {}
   });
   if (!changeName) {
-    process.stderr.write(`! Could not resolve a change name for ${opts.issue ?? opts.name}. Has this issue been started?
+    process.stderr.write(`! Could not resolve change name for ${opts.issue ?? opts.name}.
 `);
     process.exit(1);
   }
-  const relevant = agentLines.filter((l) => l.text.includes(changeName) || issueIdentifier !== undefined && l.text.includes(issueIdentifier));
-  if (!issueIdentifier) {
-    for (const line of relevant) {
-      const m = SPAWN_RE.exec(line.text);
-      if (m && m[2] === changeName) {
-        issueIdentifier = m[1];
-        break;
-      }
-    }
-  }
-  const workerLogPath = join20(projectRoot, ".ralph", "logs", `${changeName}.log`);
-  const workerLogFile = Bun.file(workerLogPath);
-  const workerLines = await workerLogFile.exists() ? parseLog(await workerLogFile.text()) : [];
-  const merged = [...relevant, ...workerLines].sort((a, b) => +a.ts - +b.ts);
+  const jsonlLines = hasJsonlLog ? parseJsonlLog(await jsonlLogFile.text(), changeName) : [];
+  const relevantText = textLines.filter((l) => l.text.includes(changeName) || issueIdentifier !== undefined && l.text.includes(issueIdentifier));
+  const workerLogFile = Bun.file(join20(projectRoot, ".ralph", "logs", `${changeName}.log`));
+  const workerLines = await workerLogFile.exists() ? parseTextLog(await workerLogFile.text()) : [];
+  const merged = [...relevantText, ...jsonlLines, ...workerLines].sort((a, b) => +a.ts - +b.ts);
   const seen = new Set;
   const timeline = merged.filter((l) => {
     const key = `${l.ts.getTime()}:${l.type}:${l.text}`;
@@ -73880,8 +74031,24 @@ async function runDebug(opts) {
     seen.add(key);
     return true;
   });
-  const out = (s) => process.stdout.write(s + `
-`);
+  if (!issueIdentifier) {
+    for (const line of timeline) {
+      const m = SPAWN_RE.exec(line.text);
+      if (m && m[2] === changeName) {
+        issueIdentifier = m[1];
+        break;
+      }
+      if (line.text.includes(changeName)) {
+        const id = /(COD|ENG|DEV)-\d+/.exec(line.text)?.[0];
+        if (id) {
+          issueIdentifier = id;
+          break;
+        }
+      }
+    }
+  }
+  const stuck = detectStuck(timeline);
+  const binary = await inspectBinary(projectRoot);
   out(`
 === Ralph Debug: ${changeName}${issueIdentifier ? ` (${issueIdentifier})` : ""} ===
 `);
@@ -73889,12 +74056,30 @@ async function runDebug(opts) {
   if (!timeline.length) {
     out("  (no log entries found)");
   } else {
-    for (const line of timeline) {
-      const prefix = line.type === "output" ? "  \u2502" : "  \xB7";
-      out(`${prefix} ${fmtTs(line.ts)}  [${line.type.padEnd(7)}]  ${line.text}`);
+    if (stuck && timeline.length > 20) {
+      const phaseLines = timeline.filter((l) => l.type === "phase" && l.text.includes(stuck.phase));
+      const nonPhase = timeline.filter((l) => !(l.type === "phase" && l.text.includes(stuck.phase)));
+      for (const line of nonPhase) {
+        const prefix = line.type === "output" ? "  \u2502" : "  \xB7";
+        out(`${prefix} ${fmtTs(line.ts)}  [${line.type.padEnd(7)}]  ${line.text}`);
+      }
+      out(`  \u21BA ... ${phaseLines.length}\xD7 ${stuck.phase} (${stuck.minutesStuck.toFixed(1)} min) ...`);
+    } else {
+      for (const line of timeline) {
+        const prefix = line.type === "output" ? "  \u2502" : "  \xB7";
+        out(`${prefix} ${fmtTs(line.ts)}  [${line.type.padEnd(7)}]  ${line.text}`);
+      }
     }
   }
   out("");
+  if (binary) {
+    out("\u2500\u2500 Installed binary \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+    out(`  Path             : ${binary.path}`);
+    out(`  Embedded version : ${binary.embeddedVersion ?? "(unknown)"}`);
+    if (binary.builtAt)
+      out(`  Built at         : ${fmtTs(binary.builtAt)}`);
+    out("");
+  }
   out("\u2500\u2500 Current Linear state \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
   if (!issueIdentifier) {
     out("  (unknown identifier \u2014 pass --issue to query Linear directly)");
@@ -73916,7 +74101,13 @@ async function runDebug(opts) {
   out("\u2500\u2500 Current GitHub PR \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
   const pr = await fetchGithubPr(changeName);
   if (!pr) {
-    out(`  (no PR found for branch ralph/${changeName})`);
+    if (stuck?.watchingPrUrl) {
+      const m = fetchMergeableNow(stuck.watchingPrUrl);
+      out(`  Watching : ${stuck.watchingPrUrl}`);
+      out(`  Mergeable: ${m ?? "(error fetching)"}`);
+    } else {
+      out(`  (no PR found for branch ralph/${changeName})`);
+    }
   } else {
     const failing = pr.checks.filter((c) => c.conclusion === "FAILURE" || c.conclusion === "failure");
     const pending = pr.checks.filter((c) => c.state === "PENDING" || c.state === "IN_PROGRESS");
@@ -73938,32 +74129,58 @@ async function runDebug(opts) {
   const lastEvent = timeline.at(-1);
   if (lastEvent)
     out(`  Last event : ${fmtTs(lastEvent.ts)}  ${lastEvent.text}`);
-  const exitLine = relevant.find((l) => /exited \(code \d+\)/.test(l.text));
+  const exitLine = timeline.find((l) => /exited \(code \d+\)/.test(l.text));
   if (exitLine) {
     const code = Number(/code (\d+)/.exec(exitLine.text)?.[1]);
-    const meaning = code === 0 ? "success" : code === 70 ? "CI fix loop exhausted its attempt budget" : code === 71 ? "push or PR creation failed (pre-push hook or remote rejection)" : "worker subprocess failed";
+    const meaning = code === 0 ? "success" : code === 70 ? "CI fix loop exhausted its attempt budget" : code === 71 ? "push or PR creation failed" : "worker subprocess failed";
     out(`  Exit code  : ${code} \u2014 ${meaning}`);
   }
-  const logHas = (s) => relevant.some((l) => l.text.includes(s));
+  if (stuck) {
+    out(`  \u26A0 STUCK in ${stuck.phase} \u2014 ${stuck.count} iterations over ${stuck.minutesStuck.toFixed(1)} min`);
+    if (stuck.watchingPrUrl) {
+      const mergeable = fetchMergeableNow(stuck.watchingPrUrl);
+      out(`    Watching  : ${stuck.watchingPrUrl}`);
+      out(`    Mergeable : ${mergeable ?? "(error)"} (live fetch)`);
+      if (mergeable === "MERGEABLE") {
+        out(`    \u2192 PR is MERGEABLE \u2014 loop should have exited. Likely cause:`);
+        if (binary?.embeddedVersion && binary.embeddedVersion < "2.17.1") {
+          out(`      Local binary is v${binary.embeddedVersion} (fix shipped in v2.17.1). Update with:`);
+          out(`      cd ${projectRoot} && bunx @neriros/ralphy@latest make-install`);
+        } else {
+          out(`      This is the conflict-check infinite loop bug (fixed in v2.17.1).`);
+          out(`      Restart the agent after updating to v2.17.1.`);
+        }
+      }
+    }
+  }
+  if (binary) {
+    const embV = binary.embeddedVersion ?? "?";
+    const logV = timeline.find((l) => l.text.includes("agent started"))?.text.match(/v([\d.]+)/)?.[1];
+    if (logV && embV !== logV) {
+      out(`  \u26A0 Version mismatch: binary says v${embV}, agent reported v${logV}`);
+      out(`    The binary reads version from a package.json at runtime \u2014 the actual`);
+      out(`    running code is v${embV}, not v${logV}. Update the local install.`);
+    }
+  }
+  const logHas = (s) => timeline.some((l) => l.text.includes(s));
   if (logHas("setError applied"))
     out("  \u26A0 setError applied \u2014 issue is quarantined in Linear");
   if (logHas("setDone applied"))
     out("  \u2713 setDone applied \u2014 issue marked done in Linear");
   if (logHas("clearConflicted applied"))
-    out("  \u2713 clearConflicted applied \u2014 conflicts resolved");
+    out("  \u2713 clearConflicted applied");
   if (logHas("setConflicted applied"))
     out("  \u26A0 setConflicted applied \u2014 merge conflicts detected");
   if (logHas("skipping PR phase"))
     out("  \u21A9 PR phase skipped \u2014 worker exited non-zero");
   if (pr?.mergeable === "CONFLICTING")
     out("  \u26A0 PR currently has merge conflicts");
-  if (pr?.checks.some((c) => c.conclusion === "FAILURE" || c.conclusion === "failure")) {
+  if (pr?.checks.some((c) => c.conclusion === "FAILURE"))
     out("  \u26A0 PR has failing CI checks");
-  }
   const worktreePath = join20(projectRoot, ".ralph", "worktrees", changeName);
-  const worktreeExists = await Bun.file(join20(worktreePath, ".git")).exists();
-  if (worktreeExists)
+  if (await Bun.file(join20(worktreePath, ".git")).exists()) {
     out(`  Worktree   : ${worktreePath}`);
+  }
   if (!timeline.length)
     out("  (no log entries \u2014 has this change been started yet?)");
   out("");
@@ -74033,7 +74250,7 @@ try {
 `);
       process.exit(1);
     }
-    await runDebug({ name: args.name, projectRoot });
+    await runDebug({ name: args.name, projectRoot: args.projectRoot ?? projectRoot });
     await shutdown();
     process.exit(0);
   }

package/package.json

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