From b48cb988133129806491e5cb2daf49c570259e4f Mon Sep 17 00:00:00 2001
From: Thomas SharedInbox <sharedinbox@thomas-guettler.de>
Date: Fri, 22 May 2026 21:52:02 +0200
Subject: [PATCH] =?UTF-8?q?fix(agent-loop):=20detect=20agent=20crash=20?=
 =?UTF-8?q?=E2=80=94=20do=20not=20close=20issue=20when=20no=20new=20CI=20r?=
 =?UTF-8?q?un=20appeared?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the agent exits immediately (e.g. rate-limit), the loop was closing the
pending issue against the *previous* CI run, which was still green.

Fix: record the latest CI run ID when an issue agent starts. If the run ID
hasn't changed when the agent exits, the agent pushed nothing → set
State/Question instead of closing.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 scripts/agent_loop.py | 62 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 8 deletions(-)

diff --git a/scripts/agent_loop.py b/scripts/agent_loop.py
index 8d10233..3203b70 100755
--- a/scripts/agent_loop.py
+++ b/scripts/agent_loop.py
@@ -150,7 +150,7 @@ def _read_state() -> dict | None:
     return None
 
 
-def _write_state(pid: int | None, issue: int | None, kind: str, issue_title: str | None = None) -> None:
+def _write_state(pid: int | None, issue: int | None, kind: str, issue_title: str | None = None, session_name: str | None = None, ci_run_id: int | None = None) -> None:
     data: dict = {
         "pid": pid,
         "issue": issue,
@@ -159,6 +159,10 @@ def _write_state(pid: int | None, issue: int | None, kind: str, issue_title: str
     }
     if issue_title is not None:
         data["issue_title"] = issue_title
+    if session_name is not None:
+        data["session_name"] = session_name
+    if ci_run_id is not None:
+        data["ci_run_id_at_start"] = ci_run_id
     STATE_FILE.write_text(json.dumps(data, indent=2))
 
 
@@ -222,6 +226,28 @@ def _agent_age_seconds(state: dict) -> float:
         return 0.0
 
 
+def _git_summary() -> str:
+    """Return a one-line summary of the latest commit and whether it's been pushed."""
+    try:
+        commit = subprocess.run(
+            ["git", "log", "--oneline", "-1"],
+            capture_output=True, text=True, check=True,
+        ).stdout.strip()
+        ahead = subprocess.run(
+            ["git", "rev-list", "--count", "HEAD@{u}..HEAD"],
+            capture_output=True, text=True,
+        )
+        if ahead.returncode == 0 and ahead.stdout.strip() != "0":
+            push_status = f"not pushed ({ahead.stdout.strip()} ahead)"
+        elif ahead.returncode == 0:
+            push_status = "pushed"
+        else:
+            push_status = "no upstream"
+        return f"{commit} [{push_status}]"
+    except Exception:
+        return ""
+
+
 def _kill_agent(state: dict) -> None:
     """Forcefully stop the running agent."""
     pid = state.get("pid")
@@ -310,10 +336,17 @@ def _run_loop() -> int:
                 print(f"Set {_issue_url(issue)} to State/Question.")
             return 1
 
-        print(
-            f"Agent pid={pid!r} ({kind}, {issue_ref}) "
-            f"still running ({age/60:.0f} min). Waiting."
-        )
+        session_name = state.get("session_name")
+        resume_cmd = f"claude --resume {shlex.quote(session_name)}" if session_name else ""
+        git_info = _git_summary()
+        parts = [
+            f"Agent pid={pid!r} ({kind}, {issue_ref}) still running ({age/60:.0f} min). Waiting.",
+        ]
+        if resume_cmd:
+            parts.append(f"  Resume: {resume_cmd}")
+        if git_info:
+            parts.append(f"  Commit: {git_info}")
+        print("\n".join(parts))
         return 0
 
     # Agent not running (or no state) — extract any pending issue, then clean up.
@@ -342,11 +375,22 @@ def _run_loop() -> int:
             "When done, stop."
         )
         pid = _start_agent(prompt, "ci-fix")
-        _write_state(pid, pending_issue, "ci-fix")
+        _write_state(pid, pending_issue, "ci-fix", session_name="ci-fix")
         return 0
 
     # CI is ok (or no run).
     if pending_issue:
+        ci_run_id_at_start = state.get("ci_run_id_at_start") if state else None
+        latest_run_id = run["id"] if run else None
+        if ci_run_id_at_start is not None and latest_run_id == ci_run_id_at_start:
+            # CI run hasn't changed since the agent was launched → agent pushed nothing
+            # (likely crashed or hit a rate limit).
+            print(
+                f"No new CI run since agent started for {_issue_url(pending_issue)} "
+                f"(run id {latest_run_id}) — agent did nothing. Setting to State/Question."
+            )
+            _set_labels(pending_issue, add=[LABEL_QUESTION], remove=[LABEL_IN_PROGRESS])
+            return 0
         _close_issue(pending_issue)
         print(f"CI passed — closed {_issue_url(pending_issue)}.")
         return 0
@@ -391,8 +435,10 @@ Instructions:
 - When the work is done and pushed, stop. The loop will close the issue after CI passes.
 """
 
-    pid = _start_agent(prompt, f"issue-{issue_number}")
-    _write_state(pid, issue_number, "issue", issue_title)
+    session_name = f"issue-{issue_number}"
+    pid = _start_agent(prompt, session_name)
+    current_run_id = run["id"] if run else None
+    _write_state(pid, issue_number, "issue", issue_title, session_name=session_name, ci_run_id=current_run_id)
     return 0