From dd678737c733879c061633004e8766dc0faceb26 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 6 Apr 2026 09:55:07 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20fix:=20agent=20identity=20resolution=20c?=
 =?UTF-8?q?opy-pasted=205=20times=20=E2=80=94=20use=20resolve=5Fagent=5Fid?=
 =?UTF-8?q?entity()=20(#280)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 gardener/gardener-run.sh     | 5 +----
 planner/planner-run.sh       | 5 +----
 predictor/predictor-run.sh   | 5 +----
 review/review-pr.sh          | 5 +----
 supervisor/supervisor-run.sh | 5 +----
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/gardener/gardener-run.sh b/gardener/gardener-run.sh
index 00ea611..ac659e3 100755
--- a/gardener/gardener-run.sh
+++ b/gardener/gardener-run.sh
@@ -68,10 +68,7 @@ log "--- Gardener run start ---"
 resolve_forge_remote
 
 # ── Resolve agent identity for .profile repo ────────────────────────────
-if [ -z "${AGENT_IDENTITY:-}" ] && [ -n "${FORGE_GARDENER_TOKEN:-}" ]; then
-  AGENT_IDENTITY=$(curl -sf -H "Authorization: token ${FORGE_GARDENER_TOKEN}" \
-    "${FORGE_URL:-http://localhost:3000}/api/v1/user" 2>/dev/null | jq -r '.login // empty' 2>/dev/null || true)
-fi
+resolve_agent_identity || true
 
 # ── Load formula + context ───────────────────────────────────────────────
 load_formula_or_profile "gardener" "$FACTORY_ROOT/formulas/run-gardener.toml" || exit 1
diff --git a/planner/planner-run.sh b/planner/planner-run.sh
index 47e057f..2bbfab8 100755
--- a/planner/planner-run.sh
+++ b/planner/planner-run.sh
@@ -56,10 +56,7 @@ log "--- Planner run start ---"
 resolve_forge_remote
 
 # ── Resolve agent identity for .profile repo ────────────────────────────
-if [ -z "${AGENT_IDENTITY:-}" ] && [ -n "${FORGE_PLANNER_TOKEN:-}" ]; then
-  AGENT_IDENTITY=$(curl -sf -H "Authorization: token ${FORGE_PLANNER_TOKEN}" \
-    "${FORGE_URL:-http://localhost:3000}/api/v1/user" 2>/dev/null | jq -r '.login // empty' 2>/dev/null || true)
-fi
+resolve_agent_identity || true
 
 # ── Load formula + context ───────────────────────────────────────────────
 load_formula_or_profile "planner" "$FACTORY_ROOT/formulas/run-planner.toml" || exit 1
diff --git a/predictor/predictor-run.sh b/predictor/predictor-run.sh
index b76ae64..f87001b 100755
--- a/predictor/predictor-run.sh
+++ b/predictor/predictor-run.sh
@@ -57,10 +57,7 @@ log "--- Predictor run start ---"
 resolve_forge_remote
 
 # ── Resolve agent identity for .profile repo ────────────────────────────
-if [ -z "${AGENT_IDENTITY:-}" ] && [ -n "${FORGE_PREDICTOR_TOKEN:-}" ]; then
-  AGENT_IDENTITY=$(curl -sf -H "Authorization: token ${FORGE_PREDICTOR_TOKEN}" \
-    "${FORGE_URL:-http://localhost:3000}/api/v1/user" 2>/dev/null | jq -r '.login // empty' 2>/dev/null || true)
-fi
+resolve_agent_identity || true
 
 # ── Load formula + context ───────────────────────────────────────────────
 load_formula_or_profile "predictor" "$FACTORY_ROOT/formulas/run-predictor.toml" || exit 1
diff --git a/review/review-pr.sh b/review/review-pr.sh
index 8a9a29d..63784dd 100755
--- a/review/review-pr.sh
+++ b/review/review-pr.sh
@@ -61,10 +61,7 @@ fi
 # =============================================================================
 # RESOLVE AGENT IDENTITY FOR .PROFILE REPO
 # =============================================================================
-if [ -z "${AGENT_IDENTITY:-}" ] && [ -n "${FORGE_TOKEN:-}" ]; then
-  AGENT_IDENTITY=$(curl -sf -H "Authorization: token ${FORGE_TOKEN}" \
-    "${FORGE_URL:-http://localhost:3000}/api/v1/user" 2>/dev/null | jq -r '.login // empty' 2>/dev/null || true)
-fi
+resolve_agent_identity || true
 
 # =============================================================================
 # MEMORY GUARD
diff --git a/supervisor/supervisor-run.sh b/supervisor/supervisor-run.sh
index 907c228..d911385 100755
--- a/supervisor/supervisor-run.sh
+++ b/supervisor/supervisor-run.sh
@@ -62,10 +62,7 @@ resolve_forge_remote
 cleanup_stale_crashed_worktrees 24
 
 # ── Resolve agent identity for .profile repo ────────────────────────────
-if [ -z "${AGENT_IDENTITY:-}" ] && [ -n "${FORGE_SUPERVISOR_TOKEN:-}" ]; then
-  AGENT_IDENTITY=$(curl -sf -H "Authorization: token ${FORGE_SUPERVISOR_TOKEN}" \
-    "${FORGE_URL:-http://localhost:3000}/api/v1/user" 2>/dev/null | jq -r '.login // empty' 2>/dev/null || true)
-fi
+resolve_agent_identity || true
 
 # ── Collect pre-flight metrics ────────────────────────────────────────────
 log "Running preflight.sh"