fix(route): resume an existing ai/issue-N branch instead of losing re-triggered work

When an agent was re-triggered on an issue that already had a branch/open PR, route.sh created a fresh branch from main (git checkout -b), so the push back was rejected non-fast-forward and the new commits were silently dropped (|| true) -- the run reported success and re-announced the stale PR, but the work was gone (observed on issue #17 run #88). Resume the existing branch when it exists, so new commits fast-forward onto it and update its PR; only branch from main when none exists. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Merge pull request 'fix: quote run-name (bare # was a YAML comment)' (#45 ) from fix/run-name-quoting into main
2026-07-04 13:21:04 +03:00 · 2026-07-04 11:33:29 +02:00 · 2026-07-04 12:33:27 +03:00 · 2026-07-04 11:29:54 +02:00
3 changed files with 9 additions and 3 deletions
@@ -1,5 +1,5 @@
 name: ai-agent
-run-name: ai-agent · #${{ github.event.issue.number }}
+run-name: "ai-agent · #${{ github.event.issue.number }}"   # quotes required: bare # starts a YAML comment
 # Standard caller for the shared AI-agent workflow (ffaerber/agents). Copy this file VERBATIM into
 # any repo that should get the agents — it is identical in every repo. All logic + scripts live in
 # agents/.gitea/workflows/; scripts are fetched from @main at run time. The `jobs.agent` wrapper is
@@ -55,7 +55,13 @@ if [ -n "$IS_PR" ]; then                     # comment on a PR -> resume its bra
  ref=$(curl -s -H "Authorization: token $GT" "$API/pulls/$NUM" | jq -r .head.ref)
  git fetch origin "$ref" && git checkout "$ref"
  { echo "branch=$ref"; echo "new=false"; } >> "$GITHUB_OUTPUT"
-else                                         # comment on an issue -> new branch
+elif git ls-remote --exit-code --heads origin "ai/issue-$NUM" >/dev/null 2>&1; then
+  # comment on an issue whose branch ALREADY exists (a prior run / open PR) -> RESUME it, so new
+  # commits fast-forward onto the same branch and update its PR. Branching fresh from main here would
+  # be rejected on push as non-fast-forward and the new work would be silently lost (see issue #17).
+  git fetch origin "ai/issue-$NUM" && git checkout "ai/issue-$NUM"
+  { echo "branch=ai/issue-$NUM"; echo "new=false"; } >> "$GITHUB_OUTPUT"
+else                                         # comment on an issue, no branch yet -> new branch
  git checkout -b "ai/issue-$NUM"
  { echo "branch=ai/issue-$NUM"; echo "new=true"; } >> "$GITHUB_OUTPUT"
  # For dev agents, publish the branch immediately and tell the maintainer where to watch.
@@ -35,7 +35,7 @@ it is the source of truth, and `agents` itself uses the same file:

 ```yaml
 name: ai-agent
-run-name: ai-agent · #${{ github.event.issue.number }}
+run-name: "ai-agent · #${{ github.event.issue.number }}"   # quotes required: bare # starts a YAML comment
 # Standard caller for the shared AI-agent workflow (ffaerber/agents). Copy this file VERBATIM into
 # any repo that should get the agents — it is identical in every repo. All logic + scripts live in
 # agents/.gitea/workflows/; scripts are fetched from @main at run time. The `jobs.agent` wrapper is
Author	SHA1	Message	Date
Felix FaerberandClaude Opus 4.8	d803ee7cf5	fix(route): resume an existing ai/issue-N branch instead of losing re-triggered work When an agent was re-triggered on an issue that already had a branch/open PR, route.sh created a fresh branch from main (git checkout -b), so the push back was rejected non-fast-forward and the new commits were silently dropped (\|\| true) -- the run reported success and re-announced the stale PR, but the work was gone (observed on issue #17 run #88). Resume the existing branch when it exists, so new commits fast-forward onto it and update its PR; only branch from main when none exists. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-04 13:21:04 +03:00
ffaerber	1d248bc675	Merge pull request 'fix: quote run-name (bare # was a YAML comment)' (#45 ) from fix/run-name-quoting into main	2026-07-04 11:33:29 +02:00
Felix FaerberandClaude Opus 4.8	1fd32f0ff6	fix: quote run-name so the issue number is not eaten as a YAML comment Bare '#' starts a YAML comment, so run-name resolved to 'ai-agent ·' with the number dropped. Quote the value. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-07-04 12:33:27 +03:00
ffaerber	e9fad6bfad	Merge pull request 'chore: title agent runs by issue number (run-name)' (#43 ) from chore/run-name into main	2026-07-04 11:29:54 +02:00