@neriros/ralphy 3.3.0 → 3.3.2

package/dist/shell/index.js

@@ -18928,8 +18928,8 @@ import { readFileSync } from "fs";
 import { resolve } from "path";
 function getVersion() {
   try {
-    if ("3.3.0")
-      return "3.3.0";
+    if ("3.3.2")
+      return "3.3.2";
   } catch {}
   const dirsToTry = [];
   try {
@@ -63946,6 +63946,21 @@ function readState(changeDir) {
     throw new Error(".ralph-state.json not found");
   return StateSchema.parse(JSON.parse(raw));
 }
+function tryReadStateRaw(changeDir) {
+  const filePath = join7(changeDir, STATE_FILE2);
+  const text = getStorage().read(filePath);
+  if (text === null)
+    return { state: null, raw: null };
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return { state: null, raw: null };
+  }
+  const raw = parsed && typeof parsed === "object" ? parsed : {};
+  const result2 = StateSchema.safeParse(parsed);
+  return { state: result2.success ? result2.data : null, raw };
+}
 function writeState(changeDir, state) {
   const filePath = join7(changeDir, STATE_FILE2);
   getStorage().write(filePath, JSON.stringify(state, null, 2) + `
@@ -70613,9 +70628,9 @@ function useLoop(opts) {
       const tasksDir = join11(opts.tasksDir, opts.name);
       const storage = getStorage();
       let currentState;
-      const existingStateRaw = storage.read(join11(stateDir, ".ralph-state.json"));
-      if (existingStateRaw !== null) {
-        currentState = readState(stateDir);
+      const { state: parsedState, raw: rawState } = tryReadStateRaw(stateDir);
+      if (parsedState !== null) {
+        currentState = parsedState;
         if (currentState.engine !== opts.engine || currentState.model !== opts.model) {
           currentState = {
             ...currentState,
@@ -70625,6 +70640,9 @@ function useLoop(opts) {
           writeState(stateDir, currentState);
         }
       } else {
+        if (rawState !== null) {
+          addInfo(`.ralph-state.json was malformed \u2014 reinitialising. External fields (linearComments) preserved.`);
+        }
         currentState = buildInitialState({
           name: opts.name,
           prompt: opts.prompt,
@@ -70633,6 +70651,9 @@ function useLoop(opts) {
           manualTest: opts.manualTest,
           createPr: opts.createPr ?? false
         });
+        if (rawState !== null && rawState.linearComments) {
+          currentState.linearComments = rawState.linearComments;
+        }
         writeState(stateDir, currentState);
       }
       const isResume2 = currentState.iteration > 0;
@@ -70661,6 +70682,27 @@ function useLoop(opts) {
         }
         const tasksContent = storage.read(join11(tasksDir, MISSION_TASKS_FILENAME));
         const agentTasksContent = storage.read(join11(tasksDir, AGENT_TASKS_FILENAME));
+        if (tasksContent === null && currentState.iteration > 0 && typeof opts.changeStore.listChanges === "function") {
+          let stillActive = true;
+          try {
+            const active = await opts.changeStore.listChanges();
+            stillActive = active.includes(opts.name);
+          } catch {
+            stillActive = true;
+          }
+          if (!stillActive) {
+            addInfo(`tasks.md not found and change "${opts.name}" is no longer active \u2014 it was archived externally. Exiting.`);
+            currentState = {
+              ...currentState,
+              status: "completed",
+              lastModified: new Date().toISOString()
+            };
+            writeState(stateDir, currentState);
+            setState(currentState);
+            finalStopReason = "completed";
+            break;
+          }
+        }
         if (tasksContent !== null) {
           const remaining = countUnchecked(tasksContent);
           const agentRemaining = agentTasksContent !== null ? countUnchecked(agentTasksContent) : 0;
@@ -92471,7 +92513,7 @@ var MarkerSchema, GetIndicatorSchema, SetIndicatorSchema, IndicatorsSchema, Proj
 var init_schema = __esm(() => {
   init_zod2();
   MarkerSchema = exports_external2.object({
-    type: exports_external2.enum(["label", "status", "attachment"]),
+    type: exports_external2.enum(["label", "status", "attachment", "project"]),
     value: exports_external2.string().min(1)
   });
   GetIndicatorSchema = exports_external2.object({
@@ -92796,6 +92838,17 @@ linear:
     # setError:
     #   type: label
     #   value: "ralph:error"
+    #
+    # # Project-based filter / assignment
+    # # getTodo can filter by Linear project name, and setInProgress can
+    # # reassign the issue into a different project.
+    # getTodo:
+    #   filter:
+    #     - type: project
+    #       value: "Ralph Queue"
+    # setInProgress:
+    #   type: project
+    #   value: "Ralph In Progress"
 ---
 You are working on {{ issue.identifier }}: {{ issue.title }}.
 
@@ -93603,15 +93656,18 @@ function partition2(markers) {
   const statuses = [];
   const labels = [];
   const attachmentSubtitles = [];
+  const projects = [];
   for (const m of markers) {
     if (m.type === "status")
       statuses.push(m.value);
     else if (m.type === "label")
       labels.push(m.value);
-    else
+    else if (m.type === "attachment")
       attachmentSubtitles.push(m.value);
+    else if (m.type === "project")
+      projects.push(m.value);
   }
-  return { statuses, labels, attachmentSubtitles };
+  return { statuses, labels, attachmentSubtitles, projects };
 }
 function buildIssueFilter(spec) {
   const where = {};
@@ -93627,7 +93683,7 @@ function buildIssueFilter(spec) {
   }
   const inc = spec.include ?? [];
   if (inc.length > 0) {
-    const { statuses, labels, attachmentSubtitles } = partition2(inc);
+    const { statuses, labels, attachmentSubtitles, projects } = partition2(inc);
     const branches = [];
     if (statuses.length > 0)
       branches.push({ state: { name: { in: statuses } } });
@@ -93643,6 +93699,8 @@ function buildIssueFilter(spec) {
         }
       });
     }
+    if (projects.length > 0)
+      branches.push({ project: { name: { in: projects } } });
     for (const b of branches)
       Object.assign(where, b);
   } else {
@@ -93650,7 +93708,23 @@ function buildIssueFilter(spec) {
   }
   const exc = spec.exclude ?? [];
   if (exc.length > 0) {
-    const { statuses, labels, attachmentSubtitles: excludedSubtitles } = partition2(exc);
+    const {
+      statuses,
+      labels,
+      attachmentSubtitles: excludedSubtitles,
+      projects: excludedProjects
+    } = partition2(exc);
+    if (excludedProjects.length > 0) {
+      const current = where.project;
+      const noProject = { project: { name: { nin: excludedProjects } } };
+      if (current === undefined)
+        Object.assign(where, noProject);
+      else {
+        const existingAnd = where.and ?? [];
+        where.and = [...existingAnd, { project: current }, noProject];
+        delete where.project;
+      }
+    }
     if (excludedSubtitles.length > 0) {
       const existingAnd = where.and ?? [];
       where.and = [
@@ -93709,10 +93783,14 @@ async function fetchMentionScanIssues(apiKey, spec) {
         id identifier title description url priority createdAt
         state { name type }
         assignee { id email name }
+        project { id name }
         labels { nodes { name } }
         relations(first: 50) {
           nodes { type relatedIssue { id state { type } } }
         }
+        comments(first: 50) {
+          nodes { id body createdAt user { name email } }
+        }
       }
     }
   }`;
@@ -93728,10 +93806,12 @@ async function fetchMentionScanIssues(apiKey, spec) {
     url: n.url,
     state: n.state,
     assignee: n.assignee,
+    project: n.project ?? null,
     labels: n.labels.nodes.map((l) => l.name),
     priority: n.priority,
     createdAt: n.createdAt ?? "",
-    blockedByIds: (n.relations?.nodes ?? []).filter((r) => r.type === "blocked_by" && !DONE_STATE_TYPES.has(r.relatedIssue.state.type)).map((r) => r.relatedIssue.id)
+    blockedByIds: (n.relations?.nodes ?? []).filter((r) => r.type === "blocked_by" && !DONE_STATE_TYPES.has(r.relatedIssue.state.type)).map((r) => r.relatedIssue.id),
+    comments: n.comments?.nodes ?? []
   }));
 }
 async function fetchOpenIssues(apiKey, spec) {
@@ -93742,6 +93822,7 @@ async function fetchOpenIssues(apiKey, spec) {
         id identifier title description url priority createdAt
         state { name type }
         assignee { id email name }
+        project { id name }
         labels { nodes { name } }
         relations(first: 50) {
           nodes {
@@ -93764,6 +93845,7 @@ async function fetchOpenIssues(apiKey, spec) {
     url: n.url,
     state: n.state,
     assignee: n.assignee,
+    project: n.project ?? null,
     labels: n.labels.nodes.map((l) => l.name),
     priority: n.priority,
     createdAt: n.createdAt ?? "",
@@ -93956,25 +94038,55 @@ async function updateAttachmentSubtitle(apiKey, attachmentId, subtitle) {
   });
 }
 async function upsertRalphyAttachment(apiKey, issueId, issueUrl, subtitle) {
-  const attachments = await fetchIssueAttachments(apiKey, issueId);
-  const existing = attachments.find((a) => a.title === RALPHY_ATTACHMENT_TITLE);
+  const attachments = await fetchIssueAttachments(apiKey, issueId, {
+    titleFilter: RALPHY_ATTACHMENT_TITLE
+  });
+  const existing = attachments[0];
   if (existing) {
     await updateAttachmentSubtitle(apiKey, existing.id, subtitle);
   } else {
     await createRalphyAttachment(apiKey, issueId, issueUrl, subtitle);
   }
 }
-async function fetchIssueAttachments(apiKey, issueId) {
-  const query = `query IssueAttachments($id: String!) {
+async function fetchIssueAttachments(apiKey, issueId, options) {
+  const titleFilter = options?.titleFilter;
+  const query = titleFilter !== undefined ? `query IssueAttachments($id: String!, $titleFilter: String!) {
+    issue(id: $id) {
+      attachments(filter: { title: { eq: $titleFilter } }, first: 25) {
+        nodes { id url sourceType title }
+      }
+    }
+  }` : `query IssueAttachments($id: String!) {
     issue(id: $id) {
       attachments(first: 25) {
         nodes { id url sourceType title }
       }
     }
   }`;
-  const data = await linearRequest(apiKey, query, { id: issueId });
+  const variables = titleFilter !== undefined ? { id: issueId, titleFilter } : { id: issueId };
+  const data = await linearRequest(apiKey, query, variables);
   return data.issue?.attachments?.nodes ?? [];
 }
+async function fetchAttachmentsForIssues(apiKey, issueIds) {
+  const out = new Map;
+  if (issueIds.length === 0)
+    return out;
+  const query = `query IssuesAttachments($ids: [ID!]!) {
+    issues(filter: { id: { in: $ids } }, first: 250) {
+      nodes {
+        id
+        attachments(first: 25) {
+          nodes { id url sourceType title }
+        }
+      }
+    }
+  }`;
+  const data = await linearRequest(apiKey, query, { ids: issueIds });
+  for (const node2 of data.issues.nodes) {
+    out.set(node2.id, node2.attachments?.nodes ?? []);
+  }
+  return out;
+}
 async function fetchWorkflowStates(apiKey, teamKey) {
   const query = `query States($team: String!) {
     workflowStates(filter: { team: { key: { eq: $team } } }, first: 50) {
@@ -94073,14 +94185,40 @@ function issueMatchesGetIndicator(issue2, indicator) {
     return false;
   const labels = new Set(issue2.labels.map((l) => l.toLowerCase()));
   const stateName = issue2.state.name.toLowerCase();
+  const projectName = issue2.project?.name.toLowerCase() ?? null;
   return indicator.filter.some((m) => {
     if (m.type === "label")
       return labels.has(m.value.toLowerCase());
     if (m.type === "status")
       return stateName === m.value.toLowerCase();
+    if (m.type === "project") {
+      if (projectName === null)
+        return false;
+      return projectName === m.value.toLowerCase();
+    }
     return false;
   });
 }
+async function fetchProjectIdByName(apiKey, name) {
+  const query = `query ProjectId($name: String!) {
+    projects(filter: { name: { eq: $name } }, first: 1) {
+      nodes { id }
+    }
+  }`;
+  const data = await linearRequest(apiKey, query, {
+    name
+  });
+  return data.projects.nodes[0]?.id ?? null;
+}
+async function setIssueProject(apiKey, issueId, projectId) {
+  const mutation = `mutation SetProject($id: String!, $projectId: String!) {
+    issueUpdate(id: $id, input: { projectId: $projectId }) { success }
+  }`;
+  await linearRequest(apiKey, mutation, {
+    id: issueId,
+    projectId
+  });
+}
 async function createIssue(apiKey, input) {
   const mutation = `mutation CreateIssue($input: IssueCreateInput!) {
     issueCreate(input: $input) {
@@ -94917,6 +95055,64 @@ async function seedWorktreeMcpConfig(projectRoot, worktreeCwd) {
 }
 var init_worktree = () => {};
 
+// apps/agent/src/agent/pr-url/index.ts
+function escapeRegex2(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+async function discoverPrUrlFromGitHub(identifier, runner, cwd2, onLog) {
+  if (!identifier)
+    return null;
+  const slug = identifier.toLowerCase();
+  let rows;
+  try {
+    const res = await runner.run([
+      "gh",
+      "pr",
+      "list",
+      "--search",
+      `${identifier} in:title`,
+      "--state",
+      "all",
+      "--json",
+      "url,state,headRefName,title,updatedAt"
+    ], cwd2);
+    const text = res.stdout.trim();
+    rows = text ? JSON.parse(text) : [];
+  } catch (err) {
+    onLog?.(`! gh pr list (${identifier}) failed: ${err.message}`, "yellow");
+    return null;
+  }
+  const idRe = new RegExp(`\\b${escapeRegex2(identifier)}\\b`, "i");
+  const matches2 = rows.filter((r) => Boolean(r.url) && (idRe.test(r.title ?? "") || (r.headRefName ?? "").toLowerCase().includes(slug)));
+  if (matches2.length === 0)
+    return null;
+  const open = matches2.filter((r) => r.state === "OPEN");
+  const pool = open.length > 0 ? open : matches2;
+  pool.sort((a, b) => (b.updatedAt ?? "").localeCompare(a.updatedAt ?? ""));
+  return pool[0]?.url ?? null;
+}
+function createPrUrlCache(ttlMs = 5 * 60 * 1000, now2 = Date.now) {
+  const map3 = new Map;
+  return {
+    get(issueId) {
+      const e = map3.get(issueId);
+      if (!e)
+        return;
+      if (now2() - e.fetchedAt >= ttlMs) {
+        map3.delete(issueId);
+        return;
+      }
+      return e.url;
+    },
+    set(issueId, url2) {
+      map3.set(issueId, { url: url2, fetchedAt: now2() });
+    },
+    invalidate(issueId) {
+      map3.delete(issueId);
+    }
+  };
+}
+
 // apps/agent/src/agent/ci.ts
 async function runGhWithRetry(cmd, runner, cwd2, onRetry, sleep2 = (ms) => new Promise((r) => setTimeout(r, ms))) {
   let lastErr;
@@ -94988,6 +95184,14 @@ ${truncated}`);
 
 `);
 }
+async function safeSha(getHeadSha) {
+  try {
+    const sha = (await getHeadSha()).trim();
+    return sha || null;
+  } catch {
+    return null;
+  }
+}
 async function fixCiUntilGreen(deps, opts) {
   for (let attempt2 = 1;attempt2 <= opts.maxAttempts; attempt2++) {
     let pollN = 0;
@@ -95017,10 +95221,18 @@ async function fixCiUntilGreen(deps, opts) {
 \`\`\`
 ${logs}
 \`\`\``;
+        const shaBefore = deps.getHeadSha ? await safeSha(deps.getHeadSha) : null;
         const code = await deps.runTaskWithSteering(steering);
         if (code !== 0) {
           deps.log(`! task loop exited code ${code} during CI fix attempt ${attempt2}`, "red");
         }
+        if (shaBefore !== null) {
+          const shaAfter = await safeSha(deps.getHeadSha);
+          if (shaAfter !== null && shaAfter === shaBefore) {
+            deps.log(`! worker produced no new commits on CI fix attempt ${attempt2} \u2014 failure looks external (e.g. rate-limited deploy). Giving up CI watch.`, "yellow");
+            return { success: false, attempts: attempt2, reason: "no-progress" };
+          }
+        }
         try {
           deps.onPhase?.("ci-fix", `attempt ${attempt2}/${opts.maxAttempts} \xB7 pushing fix`);
           await deps.pushBranch();
@@ -95128,6 +95340,33 @@ async function classifyDiffAgainstMeta(runner, cwd2, base2, metaOnlyFiles) {
   const onlyMeta = files.every((f2) => metaSet.has(f2.replace(/\\/g, "/")));
   return { files, onlyMeta };
 }
+async function branchAlreadyMerged(runner, cwd2, branch, base2) {
+  try {
+    const r = await runner.run([
+      "gh",
+      "pr",
+      "list",
+      "--head",
+      branch,
+      "--state",
+      "merged",
+      "--json",
+      "number",
+      "--jq",
+      ".[0].number // empty"
+    ], cwd2);
+    if (r.stdout.trim() !== "")
+      return true;
+  } catch {}
+  try {
+    const r = await runner.run(["git", "cherry", base2, "HEAD"], cwd2);
+    const lines = r.stdout.split(`
+`).map((s) => s.trim()).filter(Boolean);
+    if (lines.length > 0 && lines.every((l) => l.startsWith("-")))
+      return true;
+  } catch {}
+  return false;
+}
 async function createPullRequest(input, runner) {
   const base2 = input.base ?? "main";
   const log2 = await runner.run(["git", "log", "--oneline", `${base2}..HEAD`, "--no-merges"], input.cwd);
@@ -95137,6 +95376,9 @@ async function createPullRequest(input, runner) {
   if (metaOnlyFiles.length > 0) {
     const classification = await classifyDiffAgainstMeta(runner, input.cwd, base2, metaOnlyFiles);
     if (classification.onlyMeta && classification.files.length > 0) {
+      if (await branchAlreadyMerged(runner, input.cwd, input.branch, base2)) {
+        return null;
+      }
       return {
         url: null,
         created: false,
@@ -95431,6 +95673,10 @@ async function fixConflictsAndCiLoop(ctx, prUrl, wantFixCi, checkPrConflict) {
         pushBranch: async () => {
           await ctx.cmd.run(["git", "push", "origin", ctx.branch], ctx.cwd);
         },
+        getHeadSha: async () => {
+          const r = await ctx.cmd.run(["git", "rev-parse", "HEAD"], ctx.cwd);
+          return r.stdout.trim();
+        },
         log: ctx.log,
         sleep: (ms) => new Promise((r) => setTimeout(r, ms))
       }, {
@@ -96259,6 +96505,46 @@ async function pickOpenPrUrlFromAttachments(urls, issueIdent, cmd, cwd2, onLog)
   }
   return { url: null, sawNonOpenPr };
 }
+async function resolveDependencyBaseBranchImpl(issue2, runner, runnerCwd, deps) {
+  const blockerIds = issue2.blockedByIds;
+  if (blockerIds.length === 0)
+    return null;
+  let attachmentsByBlocker;
+  try {
+    attachmentsByBlocker = await fetchAttachmentsForIssues(deps.apiKey, blockerIds);
+  } catch (err) {
+    deps.onLog(`! could not fetch attachments for blockers of ${issue2.identifier}: ${err.message}`, "yellow");
+    return null;
+  }
+  const candidates = [];
+  for (const blockerId of blockerIds) {
+    const attachments = attachmentsByBlocker.get(blockerId) ?? [];
+    const prUrls = attachments.map((a) => a.url).filter((url2) => /^https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/\d+/.test(url2));
+    const openHeads = [];
+    for (const url2 of prUrls) {
+      try {
+        const res = await runner.run(["gh", "pr", "view", url2, "--json", "state,headRefName", "--jq", "."], runnerCwd);
+        const parsed = JSON.parse(res.stdout.trim());
+        if (parsed.state === "OPEN" && parsed.headRefName) {
+          openHeads.push(parsed.headRefName);
+        }
+      } catch (err) {
+        deps.onLog(`! gh pr view failed for ${url2} (blocker of ${issue2.identifier}): ${err.message}`, "yellow");
+      }
+    }
+    if (openHeads.length === 1) {
+      candidates.push(openHeads[0]);
+    } else if (openHeads.length > 1) {
+      deps.onLog(`  ${issue2.identifier}: blocker ${blockerId} has ${openHeads.length} open PRs \u2014 skipping dependency base resolution`, "gray");
+    }
+  }
+  if (candidates.length === 1)
+    return candidates[0];
+  if (candidates.length > 1) {
+    deps.onLog(`  ${issue2.identifier}: ${candidates.length} blockers have open PRs \u2014 falling back to default base`, "gray");
+  }
+  return null;
+}
 function githubReactionSlug(emoji3) {
   switch (emoji3) {
     case "\uD83D\uDC40":
@@ -96333,7 +96619,7 @@ ${c.body.trim()}`;
   ].join(`
 `);
 }
-function escapeRegex2(s) {
+function escapeRegex3(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function buildMentionTaskBody(trigger, issueUrl) {
@@ -96477,6 +96763,16 @@ function buildAgentCoordinator(input) {
     } else if (m.type === "attachment") {
       await upsertRalphyAttachment(apiKey, issue2.id, issue2.url, m.value);
       onLog(`  \u2192 ${issue2.identifier} attachment='${m.value}'`, "gray");
+    } else if (m.type === "project") {
+      const projectId = await fetchProjectIdByName(apiKey, m.value);
+      if (!projectId) {
+        const err = new Error("Linear project not found");
+        err.project = m.value;
+        err.issue = issue2.identifier;
+        throw err;
+      }
+      await setIssueProject(apiKey, issue2.id, projectId);
+      onLog(`  \u2192 ${issue2.identifier} project='${m.value}'`, "gray");
     } else {
       const id = await resolveLabelId(issue2, m.value);
       if (!id) {
@@ -96527,6 +96823,7 @@ function buildAgentCoordinator(input) {
   const prByChange = new Map;
   const prUnavailable = new Map;
   const PR_UNAVAILABLE_TTL_MS = 10 * 60 * 1000;
+  const prUrlByIssue = createPrUrlCache(5 * 60 * 1000);
   const stalePingedAt = new Map;
   const lastHandledReviewActivity = new Map;
   const useWorktree = args.worktree || cfg.useWorktree;
@@ -96872,6 +97169,9 @@ PR: ${prUrl}` : ""
         registerPr: (cn, url2) => {
           prByChange.set(cn, url2);
           prUnavailable.delete(cn);
+          const issue2 = issueByChange.get(cn);
+          if (issue2)
+            prUrlByIssue.invalidate(issue2.id);
           input.onWorkerPr?.(cn, url2);
         },
         ...onWorkerPhase && {
@@ -96929,6 +97229,7 @@ PR: ${prUrl}` : ""
       }
       if (state && state !== "OPEN") {
         markPrUnavailable(changeName);
+        prUrlByIssue.invalidate(issue2.id);
         return null;
       }
       if (m && m !== "UNKNOWN") {
@@ -96966,32 +97267,9 @@ PR: ${prUrl}` : ""
     prUnavailable.set(changeName, Date.now() + PR_UNAVAILABLE_TTL_MS);
   }
   async function discoverPrUrl(issue2, 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 ${issue2.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 fromGitHub = await discoverPrUrlFromGitHub(issue2.identifier, cmdRunner, projectRoot, onLog);
+    if (fromGitHub)
+      return fromGitHub;
     const fromLinear = await discoverPrUrlFromLinear(issue2);
     if (fromLinear.url) {
       onLog(`  ${issue2.identifier}: PR discovered via Linear attachment (${fromLinear.url})`, "gray");
@@ -97001,48 +97279,12 @@ PR: ${prUrl}` : ""
       markPrUnavailable(changeName);
       return null;
     }
-    onLog(`  ${issue2.identifier}: no open PR found on head=${branch} or Linear attachments; conflict scan skipped for ${PR_UNAVAILABLE_TTL_MS / 60000}m`, "gray");
+    onLog(`  ${issue2.identifier}: no PR found via GitHub search or Linear attachments; conflict scan skipped for ${PR_UNAVAILABLE_TTL_MS / 60000}m`, "gray");
     markPrUnavailable(changeName);
     return null;
   }
   async function resolveDependencyBaseBranch(issue2, runner, runnerCwd) {
-    const blockerIds = issue2.blockedByIds;
-    if (blockerIds.length === 0)
-      return null;
-    const candidates = [];
-    for (const blockerId of blockerIds) {
-      let attachments;
-      try {
-        attachments = await fetchIssueAttachments(apiKey, blockerId);
-      } catch (err) {
-        onLog(`! could not fetch attachments for blocker ${blockerId} of ${issue2.identifier}: ${err.message}`, "yellow");
-        continue;
-      }
-      const prUrls = attachments.map((a) => a.url).filter((url2) => /^https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/\d+/.test(url2));
-      const openHeads = [];
-      for (const url2 of prUrls) {
-        try {
-          const res = await runner.run(["gh", "pr", "view", url2, "--json", "state,headRefName", "--jq", "."], runnerCwd);
-          const parsed = JSON.parse(res.stdout.trim());
-          if (parsed.state === "OPEN" && parsed.headRefName) {
-            openHeads.push(parsed.headRefName);
-          }
-        } catch (err) {
-          onLog(`! gh pr view failed for ${url2} (blocker of ${issue2.identifier}): ${err.message}`, "yellow");
-        }
-      }
-      if (openHeads.length === 1) {
-        candidates.push(openHeads[0]);
-      } else if (openHeads.length > 1) {
-        onLog(`  ${issue2.identifier}: blocker ${blockerId} has ${openHeads.length} open PRs \u2014 skipping dependency base resolution`, "gray");
-      }
-    }
-    if (candidates.length === 1)
-      return candidates[0];
-    if (candidates.length > 1) {
-      onLog(`  ${issue2.identifier}: ${candidates.length} blockers have open PRs \u2014 falling back to default base`, "gray");
-    }
-    return null;
+    return resolveDependencyBaseBranchImpl(issue2, runner, runnerCwd, { apiKey, onLog });
   }
   async function discoverPrUrlFromLinear(issue2) {
     let attachments;
@@ -97090,17 +97332,7 @@ PR: ${prUrl}` : ""
       onLog(`! mention scan: rate limited, deferring rest of scan to next poll`, "yellow");
     };
     for (const issue2 of candidates) {
-      let comments = [];
-      try {
-        comments = await fetchIssueComments(apiKey, issue2.id);
-      } catch (err) {
-        if (isRateLimitedError(err)) {
-          logRateLimited();
-          break;
-        }
-        onLog(`! mention scan: Linear comments failed for ${issue2.identifier}: ${formatLinearError(err)}`, "yellow");
-        continue;
-      }
+      const comments = issue2.comments ?? [];
       const lastRalphPickup = findLastRalphPickupISO(comments);
       if (wantMention) {
         for (const c of comments) {
@@ -97322,17 +97554,21 @@ PR: ${prUrl}` : ""
     return latest;
   }
   function containsHandle(body, handle) {
-    const re = new RegExp(`(^|\\s|[^A-Za-z0-9_])${escapeRegex2(handle)}\\b`, "i");
+    const re = new RegExp(`(^|\\s|[^A-Za-z0-9_])${escapeRegex3(handle)}\\b`, "i");
     return re.test(body);
   }
   async function resolvePrUrlForIssue(issue2) {
     const changeName = changeNameForIssue(issue2);
     if (isPrUnavailable(changeName))
       return null;
-    const cached2 = prByChange.get(changeName);
-    if (cached2)
+    const inflight = prByChange.get(changeName);
+    if (inflight)
+      return inflight;
+    const cached2 = prUrlByIssue.get(issue2.id);
+    if (cached2 !== undefined)
       return cached2;
     const found = await discoverPrUrl(issue2, changeName);
+    prUrlByIssue.set(issue2.id, found);
     if (found)
       prByChange.set(changeName, found);
     return found;
@@ -99309,7 +99545,7 @@ function bucketChecks(rollup, prState) {
     return "fail";
   return "pass";
 }
-async function fetchPrStatus(url2, runner, cwd2) {
+async function fetchPrStatus(url2, runner, cwd2, transition) {
   let stdout;
   try {
     const out = await runner.run(["gh", "pr", "view", url2, "--json", PR_VIEW_FIELDS], cwd2);
@@ -99330,6 +99566,9 @@ async function fetchPrStatus(url2, runner, cwd2) {
   const state = stateUpper === "OPEN" || stateUpper === "CLOSED" || stateUpper === "MERGED" ? stateUpper : "OPEN";
   const mergeableUpper = (raw.mergeable ?? "UNKNOWN").toUpperCase();
   const mergeable = mergeableUpper === "MERGEABLE" || mergeableUpper === "CONFLICTING" ? mergeableUpper : "UNKNOWN";
+  if (transition && transition.priorState !== state) {
+    transition.onTransition(state);
+  }
   return {
     kind: "ok",
     state,
@@ -99583,10 +99822,20 @@ ${bucket.label}: error fetching from Linear \u2014 ${error48}
     }
   }
   const rows = [...seen.values()];
+  try {
+    const attachmentsByIssue = await fetchAttachmentsForIssues(apiKey, rows.map((r) => r.issueId));
+    for (const row of rows) {
+      const attachments = attachmentsByIssue.get(row.issueId) ?? [];
+      row.prUrl = findPullRequestUrl(attachments);
+    }
+  } catch {}
   await Promise.all(rows.map(async (row) => {
+    if (row.prUrl)
+      return;
     try {
-      const attachments = await fetchIssueAttachments(apiKey, row.issueId);
-      row.prUrl = findPullRequestUrl(attachments);
+      const fromGitHub = await discoverPrUrlFromGitHub(row.identifier, runner, cwd2);
+      if (fromGitHub)
+        row.prUrl = fromGitHub;
     } catch {}
   }));
   await Promise.all(rows.map(async (row) => {

package/package.json

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