From 9454f76c0c7bfa4854cb9b955ad0afb3100fa7ec Mon Sep 17 00:00:00 2001
From: Dotta <bippadotta@protonmail.com>
Date: Thu, 5 Mar 2026 07:27:48 -0600
Subject: [PATCH] Fix issue active-run fallback to match issue context

---
 server/src/routes/agents.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/src/routes/agents.ts b/server/src/routes/agents.ts
index 80d84335..607c451a 100644
--- a/server/src/routes/agents.ts
+++ b/server/src/routes/agents.ts
@@ -1366,7 +1366,12 @@ export function agentRoutes(db: Db) {
     }
 
     if (!run && issue.assigneeAgentId && issue.status === "in_progress") {
-      run = await heartbeat.getActiveRunForAgent(issue.assigneeAgentId);
+      const candidateRun = await heartbeat.getActiveRunForAgent(issue.assigneeAgentId);
+      const candidateContext = asRecord(candidateRun?.contextSnapshot);
+      const candidateIssueId = asNonEmptyString(candidateContext?.issueId);
+      if (candidateRun && candidateIssueId === issue.id) {
+        run = candidateRun;
+      }
     }
     if (!run) {
       res.json(null);