agent-control-plane 0.1.8 → 0.1.9

package/bin/pr-risk.sh

@@ -22,11 +22,32 @@ if [[ -f "${PR_LANE_OVERRIDE_FILE}" ]]; then
   source "${PR_LANE_OVERRIDE_FILE}" || true
 fi
 
-PR_JSON="$(gh pr view "$PR_NUMBER" -R "$REPO_SLUG" --json number,title,url,body,isDraft,headRefName,baseRefName,labels,files,mergeStateStatus,reviewDecision,reviewRequests,statusCheckRollup,comments)"
-PR_HEAD_SHA="$(gh api "repos/${REPO_SLUG}/pulls/${PR_NUMBER}" --jq .head.sha)"
-PR_HEAD_COMMITTED_AT="$(gh api "repos/${REPO_SLUG}/commits/${PR_HEAD_SHA}" --jq .commit.committer.date 2>/dev/null || true)"
-REVIEW_COMMENTS_JSON="$(gh api "repos/${REPO_SLUG}/pulls/${PR_NUMBER}/comments")"
-CHECK_RUNS_JSON="$(gh api "repos/${REPO_SLUG}/commits/${PR_HEAD_SHA}/check-runs" 2>/dev/null || printf '{"check_runs":[]}')"
+gh_api_json_matching_or_fallback() {
+  local fallback="${1:?fallback required}"
+  local jq_filter="${2:?jq filter required}"
+  shift 2
+  local output=""
+
+  output="$(gh api "$@" 2>/dev/null || true)"
+  if jq -e "${jq_filter}" >/dev/null 2>&1 <<<"${output}"; then
+    printf '%s\n' "${output}"
+    return 0
+  fi
+
+  printf '%s\n' "${fallback}"
+}
+
+PR_JSON="$(gh pr view "$PR_NUMBER" -R "$REPO_SLUG" --json number,title,url,body,isDraft,headRefName,headRefOid,baseRefName,labels,files,mergeStateStatus,reviewDecision,reviewRequests,statusCheckRollup,comments)"
+PR_HEAD_SHA="$(jq -r '.headRefOid // ""' <<<"$PR_JSON")"
+PR_HEAD_COMMITTED_AT=""
+if [[ -n "${PR_HEAD_SHA}" ]]; then
+  PR_HEAD_COMMITTED_AT="$(gh api "repos/${REPO_SLUG}/commits/${PR_HEAD_SHA}" --jq .commit.committer.date 2>/dev/null || true)"
+fi
+REVIEW_COMMENTS_JSON="$(gh_api_json_matching_or_fallback '[]' 'type == "array"' "repos/${REPO_SLUG}/pulls/${PR_NUMBER}/comments")"
+CHECK_RUNS_JSON='{"check_runs":[]}'
+if [[ -n "${PR_HEAD_SHA}" ]]; then
+  CHECK_RUNS_JSON="$(gh_api_json_matching_or_fallback '{"check_runs":[]}' 'type == "object" and ((.check_runs // []) | type == "array")' "repos/${REPO_SLUG}/commits/${PR_HEAD_SHA}/check-runs")"
+fi
 
 PR_JSON="$PR_JSON" PR_HEAD_SHA="$PR_HEAD_SHA" PR_HEAD_COMMITTED_AT="$PR_HEAD_COMMITTED_AT" REVIEW_COMMENTS_JSON="$REVIEW_COMMENTS_JSON" CHECK_RUNS_JSON="$CHECK_RUNS_JSON" PR_LANE_OVERRIDE="${PR_LANE_OVERRIDE:-}" MANAGED_PR_PREFIXES_JSON="$MANAGED_PR_PREFIXES_JSON" MANAGED_PR_ISSUE_CAPTURE_REGEX="$MANAGED_PR_ISSUE_CAPTURE_REGEX" ALLOW_INFRA_CI_BYPASS="$ALLOW_INFRA_CI_BYPASS" LOCAL_FIRST_PR_POLICY="$LOCAL_FIRST_PR_POLICY" node <<'EOF'
 const { execFileSync } = require('node:child_process');
@@ -251,16 +272,39 @@ const riskReason =
         ? `paths-within-critical-app-allowlist:${criticalAppFiles.join(',')}`
         : `paths-outside-low-risk-allowlist:${disallowed.join(',')}`;
 
+const normalizeRollupCheck = (check) => {
+  const typename = String(check?.__typename || '');
+  if (typename === 'StatusContext') {
+    const name = String(check?.context || 'status-context');
+    const state = String(check?.state || '').toUpperCase();
+    return {
+      name,
+      status: state === 'SUCCESS' || state === 'FAILURE' || state === 'ERROR' ? 'COMPLETED' : state,
+      conclusion: state === 'SUCCESS' ? 'SUCCESS' : state === 'FAILURE' || state === 'ERROR' ? 'FAILURE' : '',
+      reasonField: 'state',
+      rawStatus: String(check?.state || '').toLowerCase() || 'unknown',
+    };
+  }
+
+  return {
+    name: String(check?.name || check?.workflowName || 'check-run'),
+    status: String(check?.status || '').toUpperCase(),
+    conclusion: String(check?.conclusion || '').toUpperCase(),
+    reasonField: 'status',
+    rawStatus: String(check?.status || '').toLowerCase() || 'unknown',
+  };
+};
+
 const pendingChecks = [];
 const checkFailures = [];
-for (const check of checks) {
+for (const rawCheck of checks) {
+  const check = normalizeRollupCheck(rawCheck);
   if (check.status !== 'COMPLETED') {
-    pendingChecks.push(`${check.name}:status-${String(check.status || '').toLowerCase()}`);
+    pendingChecks.push(`${check.name}:${check.reasonField}-${check.rawStatus}`);
     continue;
   }
-  const conclusion = String(check.conclusion || '').toUpperCase();
-  if (conclusion !== 'SUCCESS' && conclusion !== 'SKIPPED') {
-    checkFailures.push(`${check.name}:conclusion-${String(check.conclusion || '').toLowerCase()}`);
+  if (check.conclusion !== 'SUCCESS' && check.conclusion !== 'SKIPPED') {
+    checkFailures.push(`${check.name}:conclusion-${String(check.conclusion || '').toLowerCase() || 'unknown'}`);
   }
 }
 

package/hooks/heartbeat-hooks.sh

@@ -52,7 +52,7 @@ heartbeat_open_agent_pr_issue_ids() {
 
 heartbeat_list_ready_issue_ids() {
   local open_agent_pr_issue_ids
-  local ready_issue_rows issue_id is_blocked retry_out retry_reason
+  local ready_issue_rows issue_id is_blocked retry_reason
   open_agent_pr_issue_ids="$(heartbeat_open_agent_pr_issue_ids)"
 
   ready_issue_rows="$(
@@ -73,8 +73,7 @@ heartbeat_list_ready_issue_ids() {
     [[ -n "${issue_id:-}" ]] || continue
 
     if [[ "${is_blocked:-false}" == "true" ]]; then
-      retry_out="$("${FLOW_TOOLS_DIR}/retry-state.sh" issue "$issue_id" get 2>/dev/null || true)"
-      retry_reason="$(awk -F= '/^LAST_REASON=/{print $2}' <<<"${retry_out:-}")"
+      retry_reason="$(heartbeat_issue_blocked_recovery_reason "$issue_id")"
       if [[ -z "${retry_reason:-}" ]]; then
         continue
       fi
@@ -87,7 +86,7 @@ heartbeat_list_ready_issue_ids() {
 
 heartbeat_list_blocked_recovery_issue_ids() {
   local open_agent_pr_issue_ids
-  local blocked_issue_rows issue_id retry_out retry_reason
+  local blocked_issue_rows issue_id retry_reason
   open_agent_pr_issue_ids="$(heartbeat_open_agent_pr_issue_ids)"
 
   blocked_issue_rows="$(
@@ -105,8 +104,7 @@ heartbeat_list_blocked_recovery_issue_ids() {
 
   while IFS= read -r issue_id; do
     [[ -n "${issue_id:-}" ]] || continue
-    retry_out="$("${FLOW_TOOLS_DIR}/retry-state.sh" issue "$issue_id" get 2>/dev/null || true)"
-    retry_reason="$(awk -F= '/^LAST_REASON=/{print $2}' <<<"${retry_out:-}")"
+    retry_reason="$(heartbeat_issue_blocked_recovery_reason "$issue_id")"
     if [[ -z "${retry_reason:-}" ]]; then
       continue
     fi
@@ -115,6 +113,72 @@ heartbeat_list_blocked_recovery_issue_ids() {
   done <<<"$blocked_issue_rows"
 }
 
+heartbeat_issue_blocked_recovery_reason() {
+  local issue_id="${1:?issue id required}"
+  local retry_out retry_reason issue_json
+
+  retry_out="$("${FLOW_TOOLS_DIR}/retry-state.sh" issue "$issue_id" get 2>/dev/null || true)"
+  retry_reason="$(awk -F= '/^LAST_REASON=/{print $2}' <<<"${retry_out:-}")"
+  if [[ -n "${retry_reason:-}" && "${retry_reason}" != "issue-worker-blocked" ]]; then
+    printf '%s\n' "$retry_reason"
+    return 0
+  fi
+
+  issue_json="$(flow_github_issue_view_json "$REPO_SLUG" "$issue_id" 2>/dev/null || true)"
+  if [[ -z "${issue_json:-}" ]]; then
+    return 0
+  fi
+
+  ISSUE_JSON="${issue_json}" RETRY_REASON="${retry_reason:-}" node <<'EOF'
+const issue = JSON.parse(process.env.ISSUE_JSON || '{}');
+const labels = new Set((issue.labels || []).map((label) => label?.name).filter(Boolean));
+
+if (!labels.has('agent-blocked')) {
+  process.exit(0);
+}
+
+const blockerComment = [...(issue.comments || [])]
+  .reverse()
+  .find((comment) =>
+    /Host-side publish blocked for session|Host-side publish failed for session|Blocked on missing referenced OpenSpec paths for issue|Superseded by focused follow-up issues:|Why it was blocked:|^# Blocker:/i.test(
+      comment?.body || '',
+    ),
+  );
+
+if (!blockerComment || !blockerComment.body) {
+  process.exit(0);
+}
+
+const body = String(blockerComment.body);
+let reason = '';
+
+const explicitFailureReason = body.match(/Failure reason:\s*[\r\n]+-\s*`([^`]+)`/i);
+if (explicitFailureReason) {
+  reason = explicitFailureReason[1];
+} else if (/provider quota is currently exhausted|provider-side rate limit|quota window/i.test(body)) {
+  reason = 'provider-quota-limit';
+} else if (/no publishable delta|no commits ahead of `?origin\/main`?/i.test(body)) {
+  reason = 'no-publishable-delta';
+} else if (/scope guard/i.test(body)) {
+  reason = 'scope-guard-blocked';
+} else if (/verification guard/i.test(body)) {
+  reason = 'verification-guard-blocked';
+} else if (/missing referenced OpenSpec paths/i.test(body)) {
+  reason = 'missing-openspec-paths';
+} else if (/superseded by focused follow-up issues/i.test(body)) {
+  reason = 'superseded-by-follow-ups';
+} else if (/^# Blocker:/im.test(body)) {
+  reason = 'comment-blocked-recovery';
+}
+
+  if (reason) {
+    process.stdout.write(`${reason}\n`);
+  } else if ((process.env.RETRY_REASON || '').trim()) {
+    process.stdout.write(`${String(process.env.RETRY_REASON).trim()}\n`);
+  }
+EOF
+}
+
 heartbeat_list_exclusive_issue_ids() {
   local open_agent_pr_issue_ids
   open_agent_pr_issue_ids="$(heartbeat_open_agent_pr_issue_ids)"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-control-plane",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Help a repo keep GitHub-driven coding agents running reliably without constant human babysitting",
   "homepage": "https://github.com/ducminhnguyen0319/agent-control-plane",
   "bugs": {

package/tools/bin/agent-project-cleanup-session

@@ -92,6 +92,7 @@ cleanup_status="0"
 cleanup_error=""
 cleanup_mode="noop"
 orphan_fallback_used="false"
+active_tmux_session="false"
 
 if [[ -n "$session" ]]; then
   meta_file="${runs_root}/${session}/run.env"
@@ -112,6 +113,10 @@ if [[ -z "$remove_file" ]]; then
   remove_file="$result_file"
 fi
 
+if [[ -n "$session" ]] && tmux has-session -t "$session" 2>/dev/null; then
+  active_tmux_session="true"
+fi
+
 cleanup_tool="${shared_agent_home}/tools/bin/agent-cleanup-worktree"
 archive_tool="${shared_agent_home}/tools/bin/agent-project-archive-run"
 
@@ -178,7 +183,9 @@ cleanup_orphan_worktree_dir() {
   git -C "$repo_root" worktree prune >/dev/null 2>&1 || true
 }
 
-if [[ "$skip_worktree_cleanup" != "true" && -n "$branch_name" ]]; then
+if [[ "$active_tmux_session" == "true" ]]; then
+  cleanup_mode="deferred-active-session"
+elif [[ "$skip_worktree_cleanup" != "true" && -n "$branch_name" ]]; then
   if cleanup_output="$(cleanup_with_branch_tool yes 2>&1)"; then
     cleanup_mode="branch"
   else
@@ -205,7 +212,7 @@ elif [[ "$skip_worktree_cleanup" == "true" ]]; then
 fi
 
 archive_output=""
-if [[ -n "$session" ]]; then
+if [[ -n "$session" && "$active_tmux_session" != "true" ]]; then
   archive_output="$(
     "$archive_tool" \
       --runs-root "$runs_root" \
@@ -227,6 +234,7 @@ printf 'BRANCH=%s\n' "$branch_name"
 printf 'KEEP_REMOTE=%s\n' "$keep_remote"
 printf 'ALLOW_UNMERGED=%s\n' "$allow_unmerged"
 printf 'SKIP_WORKTREE_CLEANUP=%s\n' "$skip_worktree_cleanup"
+printf 'ACTIVE_TMUX_SESSION=%s\n' "$active_tmux_session"
 printf 'CLEANUP_MODE=%s\n' "$cleanup_mode"
 printf 'ORPHAN_FALLBACK_USED=%s\n' "$orphan_fallback_used"
 printf 'CLEANUP_STATUS=%s\n' "$cleanup_status"

package/tools/bin/agent-project-heartbeat-loop

@@ -929,6 +929,9 @@ running_recurring_issue_workers() {
       count=$((count + 1))
     fi
   done <<<"$running_issue_workers_cache"
+  # Also count pending recurring launches that are still in progress
+  # (prevents infinite respawning when workers die before creating tmux sessions)
+  count=$((count + $(pending_recurring_issue_launch_count)))
   printf '%s\n' "$count"
 }
 
@@ -1120,9 +1123,11 @@ build_ordered_ready_issue_ids_cache() {
 
   last_recurring_issue="$(last_launched_recurring_issue_id || true)"
   if [[ -n "$last_recurring_issue" ]]; then
+    local emitted_after_last=0
     for issue_id in "${recurring_ids[@]}"; do
       if [[ "$seen_last" == "yes" ]]; then
         printf '%s\n' "$issue_id"
+        emitted_after_last=$((emitted_after_last + 1))
       fi
       if [[ "$issue_id" == "$last_recurring_issue" ]]; then
         seen_last="yes"
@@ -1131,7 +1136,12 @@ build_ordered_ready_issue_ids_cache() {
   fi
 
   for issue_id in "${recurring_ids[@]}"; do
-    if [[ -n "$last_recurring_issue" && "$seen_last" == "yes" && "$issue_id" == "$last_recurring_issue" ]]; then
+    # Stop the wrap-around once we reach the last-launched issue, but only
+    # when the first loop already emitted at least one issue after it.
+    # When there is exactly one recurring issue (or the last-launched issue
+    # is the final element), emitted_after_last is 0, so we must still
+    # include it here to avoid producing an empty list.
+    if [[ -n "$last_recurring_issue" && "$seen_last" == "yes" && "$issue_id" == "$last_recurring_issue" && "$emitted_after_last" -gt 0 ]]; then
       break
     fi
     printf '%s\n' "$issue_id"
@@ -1143,6 +1153,21 @@ completed_workers() {
   printf '%s\n' "$completed_workers_cache"
 }
 
+reconciled_marker_matches_run() {
+  local run_dir="${1:?run dir required}"
+  local marker_file="${run_dir}/reconciled.ok"
+  local run_env="${run_dir}/run.env"
+  local marker_started_at=""
+  local run_started_at=""
+
+  [[ -f "${marker_file}" && -f "${run_env}" ]] || return 1
+
+  marker_started_at="$(awk -F= '/^STARTED_AT=/{print $2}' "${marker_file}" 2>/dev/null | tr -d '"' | tail -n 1 || true)"
+  run_started_at="$(awk -F= '/^STARTED_AT=/{print $2}' "${run_env}" 2>/dev/null | tr -d '"' | tail -n 1 || true)"
+
+  [[ -n "${marker_started_at}" && -n "${run_started_at}" && "${marker_started_at}" == "${run_started_at}" ]]
+}
+
 ensure_completed_workers_cache() {
   local dir session issue_id status_line status
   if [[ "$completed_workers_cache_loaded" == "yes" ]]; then
@@ -1153,7 +1178,9 @@ ensure_completed_workers_cache() {
     [[ -d "$dir" ]] || continue
     session="${dir##*/}"
     session_matches_prefix "$session" || continue
-    [[ -f "$dir/reconciled.ok" ]] && continue
+    if reconciled_marker_matches_run "$dir"; then
+      continue
+    fi
     if [[ "$session" == "${issue_prefix}"* ]]; then
       issue_id="$(issue_id_from_session "$session" || true)"
       if [[ -n "${issue_id}" ]] && pending_issue_launch_active "${issue_id}"; then

package/tools/bin/agent-project-reconcile-issue-session

@@ -202,6 +202,8 @@ set +a
 
 result_outcome=""
 result_action=""
+run_started_at="${STARTED_AT:-}"
+expected_run_started_at="${ACP_EXPECTED_RUN_STARTED_AT:-${F_LOSNING_EXPECTED_RUN_STARTED_AT:-}}"
 result_file_candidate="${run_dir}/result.env"
 if [[ ! -f "$result_file_candidate" && -n "${RESULT_FILE:-}" && -f "${RESULT_FILE:-}" ]]; then
   result_file_candidate="${RESULT_FILE}"
@@ -215,6 +217,14 @@ if [[ -f "$result_file_candidate" ]]; then
   result_action="${ACTION:-}"
 fi
 
+if [[ -n "${expected_run_started_at}" && "${expected_run_started_at}" != "${run_started_at}" ]]; then
+  printf 'STATUS=STALE-RUN-SKIPPED\n'
+  printf 'SESSION=%s\n' "$session"
+  printf 'EXPECTED_STARTED_AT=%s\n' "${expected_run_started_at}"
+  printf 'ACTUAL_STARTED_AT=%s\n' "${run_started_at}"
+  exit 0
+fi
+
 issue_summary_outcome=""
 issue_summary_action=""
 issue_summary_failure_reason=""
@@ -829,6 +839,46 @@ Next step:
 EOF
 }
 
+infer_issue_blocked_failure_reason() {
+  local comment_file="${run_dir}/issue-comment.md"
+  local current_reason="${1:-}"
+
+  if [[ -n "${current_reason:-}" && "${current_reason}" != "issue-worker-blocked" ]]; then
+    printf '%s\n' "${current_reason}"
+    return 0
+  fi
+
+  [[ -s "${comment_file}" ]] || {
+    printf 'issue-worker-blocked\n'
+    return 0
+  }
+
+  ISSUE_COMMENT_FILE="${comment_file}" node <<'EOF'
+const fs = require('fs');
+
+const path = process.env.ISSUE_COMMENT_FILE || '';
+const body = path ? fs.readFileSync(path, 'utf8') : '';
+let reason = '';
+
+const explicitFailureReason = body.match(/Failure reason:\s*[\r\n]+-\s*`([^`]+)`/i);
+if (explicitFailureReason) {
+  reason = explicitFailureReason[1];
+} else if (/^# Blocker: Verification requirements were not satisfied$/im.test(body)) {
+  reason = 'verification-guard-blocked';
+} else if (/^# Blocker: (All checklist items already completed|Worker produced no publishable delta)$/im.test(body)) {
+  reason = 'no-publishable-commits';
+} else if (/^# Blocker: Change scope was too broad$/im.test(body)) {
+  reason = 'scope-guard-blocked';
+} else if (/^# Blocker: Provider quota is currently exhausted$/im.test(body)) {
+  reason = 'provider-quota-limit';
+} else if (/^# Blocker:/im.test(body)) {
+  reason = 'issue-worker-blocked';
+}
+
+process.stdout.write(`${reason || 'issue-worker-blocked'}\n`);
+EOF
+}
+
 extract_recovery_worktree_from_publish_output() {
   local publish_out="${1:-}"
   awk -F= '/^RECOVERY_WORKTREE=/{print $2}' <<<"$publish_out" | tail -n 1
@@ -844,8 +894,15 @@ require_transition() {
 }
 
 mark_reconciled() {
+  local reconciled_at tmp_file
   if [[ -d "$run_dir" ]]; then
-    touch "${run_dir}/reconciled.ok"
+    reconciled_at="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+    tmp_file="${run_dir}/reconciled.ok.tmp.$$"
+    {
+      printf 'STARTED_AT=%s\n' "${run_started_at}"
+      printf 'RECONCILED_AT=%s\n' "${reconciled_at}"
+    } >"${tmp_file}"
+    mv "${tmp_file}" "${run_dir}/reconciled.ok"
   fi
 }
 
@@ -984,7 +1041,7 @@ case "$status" in
         printf 'ACTION=%s\n' "$result_action"
         exit 0
       fi
-      failure_reason="issue-worker-blocked"
+      failure_reason="$(infer_issue_blocked_failure_reason "${failure_reason:-}")"
       normalize_issue_runner_state "succeeded" "0" ""
       require_transition "issue_schedule_retry" issue_schedule_retry "$failure_reason"
       require_transition "issue_mark_blocked" issue_mark_blocked

package/tools/bin/agent-project-reconcile-pr-session

@@ -168,6 +168,9 @@ fi
 result_outcome=""
 result_action=""
 result_issue_id="${ISSUE_ID:-}"
+result_detail=""
+run_started_at="${STARTED_AT:-}"
+expected_run_started_at="${ACP_EXPECTED_RUN_STARTED_AT:-${F_LOSNING_EXPECTED_RUN_STARTED_AT:-}}"
 host_blocker_file="${run_dir}/host-blocker.md"
 prompt_file="${run_dir}/prompt.md"
 pr_comment_file="${run_dir}/pr-comment.md"
@@ -184,9 +187,18 @@ if [[ -f "$result_file_candidate" ]]; then
   set +a
   result_outcome="${OUTCOME:-}"
   result_action="${ACTION:-}"
+  result_detail="${DETAIL:-}"
   result_issue_id="${ISSUE_ID:-${result_issue_id}}"
 fi
 
+if [[ -n "${expected_run_started_at}" && "${expected_run_started_at}" != "${run_started_at}" ]]; then
+  printf 'STATUS=STALE-RUN-SKIPPED\n'
+  printf 'SESSION=%s\n' "$session"
+  printf 'EXPECTED_STARTED_AT=%s\n' "${expected_run_started_at}"
+  printf 'ACTUAL_STARTED_AT=%s\n' "${run_started_at}"
+  exit 0
+fi
+
 pr_schedule_retry() { :; }
 pr_clear_retry() { :; }
 pr_cleanup_linked_issue_session() { :; }
@@ -225,6 +237,8 @@ clear_provider_quota_cooldown() {
   "${provider_cooldown_script}" clear >/dev/null || true
 }
 
+blocked_runtime_reason=""
+
 owner="${repo_slug%%/*}"
 repo="${repo_slug#*/}"
 pr_view_json="$(flow_github_pr_view_json "$repo_slug" "$pr_number")"
@@ -339,6 +353,11 @@ normalize_pr_result_contract() {
         host-comment-pr-blocker)
           return 0
           ;;
+        host-comment-blocker)
+          result_action="host-comment-pr-blocker"
+          pr_result_contract_note="normalized-legacy-blocked-action"
+          return 0
+          ;;
         requested-changes-or-blocked)
           result_action="host-comment-pr-blocker"
           pr_result_contract_note="normalized-legacy-blocked-action"
@@ -358,8 +377,15 @@ normalize_pr_result_contract() {
 }
 
 mark_reconciled() {
+  local reconciled_at tmp_file
   if [[ -d "$run_dir" ]]; then
-    touch "${run_dir}/reconciled.ok"
+    reconciled_at="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+    tmp_file="${run_dir}/reconciled.ok.tmp.$$"
+    {
+      printf 'STARTED_AT=%s\n' "${run_started_at}"
+      printf 'RECONCILED_AT=%s\n' "${reconciled_at}"
+    } >"${tmp_file}"
+    mv "${tmp_file}" "${run_dir}/reconciled.ok"
   fi
 }
 
@@ -393,6 +419,20 @@ blocked_result_indicates_local_bind_failure() {
   return 1
 }
 
+classify_pr_blocked_runtime_reason() {
+  if [[ "${result_detail:-}" == "worker-tool-exec-empty-command" ]]; then
+    printf 'worker-tool-exec-empty-command\n'
+    return 0
+  fi
+
+  if [[ -f "$session_log_file" ]] && grep -Fq '[tools] exec failed: Provide a command to start.' "$session_log_file"; then
+    printf 'worker-tool-exec-empty-command\n'
+    return 0
+  fi
+
+  return 1
+}
+
 extract_preapproved_host_recovery_commands() {
   [[ -f "$prompt_file" ]] || return 0
   sed -n 's/^.*loopback retry command: `\(.*\)`$/\1/p' "$prompt_file"
@@ -700,18 +740,53 @@ merge_state_prepared() {
   git -C "$pr_worktree" rev-parse -q --verify MERGE_HEAD >/dev/null 2>&1
 }
 
+current_github_login() {
+  flow_export_github_cli_auth_env "${repo_slug}"
+  gh api user --jq '.login // ""' 2>/dev/null || true
+}
+
+pr_author_login() {
+  flow_export_github_cli_auth_env "${repo_slug}"
+  gh pr view "${pr_number}" -R "${repo_slug}" --json author --jq '.author.login // ""' 2>/dev/null || true
+}
+
+pr_is_self_authored_for_current_actor() {
+  local actor_login=""
+  local author_login=""
+
+  actor_login="$(current_github_login)"
+  author_login="$(pr_author_login)"
+  [[ -n "${actor_login}" && -n "${author_login}" && "${actor_login}" == "${author_login}" ]]
+}
+
+pr_remote_head_oid() {
+  flow_export_github_cli_auth_env "${repo_slug}"
+  gh pr view "${pr_number}" -R "${repo_slug}" --json headRefOid --jq '.headRefOid // ""' 2>/dev/null || true
+}
+
+pr_remote_already_has_final_head() {
+  local final_head="${FINAL_HEAD:-}"
+  local remote_head=""
+
+  [[ -n "${final_head}" ]] || return 1
+  remote_head="$(pr_remote_head_oid)"
+  [[ -n "${remote_head}" && "${remote_head}" == "${final_head}" ]]
+}
+
 approve_and_merge() {
   local approve_output
-  if ! approve_output="$(
-    flow_github_api_repo "${repo_slug}" "pulls/${pr_number}/reviews" \
-      --method POST \
-      -f event=APPROVE \
-      -f body="Automated final review passed. Safe low-risk scope, green checks, and host-side merge approved." \
-      2>&1
-  )"; then
-    if ! grep -q "Can not approve your own pull request" <<<"$approve_output"; then
-      printf '%s\n' "$approve_output" >&2
-      return 1
+  if ! pr_is_self_authored_for_current_actor; then
+    if ! approve_output="$(
+      flow_github_api_repo "${repo_slug}" "pulls/${pr_number}/reviews" \
+        --method POST \
+        -f event=APPROVE \
+        -f body="Automated final review passed. Safe low-risk scope, green checks, and host-side merge approved." \
+        2>&1
+    )"; then
+      if ! grep -q "Can not approve your own pull request" <<<"$approve_output"; then
+        printf '%s\n' "$approve_output" >&2
+        return 1
+      fi
     fi
   fi
 
@@ -753,7 +828,14 @@ handle_linked_issue_merge_cleanup() {
 
 handle_updated_branch_result() {
   if [[ -z "$pr_worktree" || ! -d "$pr_worktree" ]]; then
-    if pr_comment_already_posted; then
+    if pr_remote_already_has_final_head; then
+      post_pr_comment_if_present
+      require_transition "pr_clear_retry" pr_clear_retry
+      require_transition "pr_after_updated_branch" pr_after_updated_branch "$pr_number"
+      cleanup_pr_session
+      result_action="${result_action:-host-push-pr-branch}"
+      notify_pr_reconciled
+    elif pr_comment_already_posted; then
       require_transition "pr_clear_retry" pr_clear_retry
       require_transition "pr_after_updated_branch" pr_after_updated_branch "$pr_number"
       cleanup_pr_session
@@ -968,7 +1050,16 @@ elif [[ "$status" == "SUCCEEDED" && "$result_outcome" == "no-change-needed" ]];
     fi
   fi
 elif [[ "$status" == "SUCCEEDED" && "$result_outcome" == "blocked" ]]; then
-  if attempt_blocked_pr_host_verification_recovery; then
+  blocked_runtime_reason="$(classify_pr_blocked_runtime_reason || true)"
+  if [[ -n "${blocked_runtime_reason:-}" ]]; then
+    status="FAILED"
+    failure_reason="${blocked_runtime_reason}"
+    require_transition "pr_schedule_retry" pr_schedule_retry "$failure_reason"
+    require_transition "pr_after_failed" pr_after_failed "$pr_number"
+    cleanup_pr_session
+    result_action="queued-pr-retry"
+    notify_pr_reconciled
+  elif attempt_blocked_pr_host_verification_recovery; then
     handle_updated_branch_result
   else
     post_pr_comment_if_present

package/tools/bin/agent-project-run-claude-session

@@ -61,6 +61,24 @@ resolve_claude_bin() {
     return 0
   fi
 
+  # Well-known install locations for Claude Code CLI.
+  # Detached supervisors and LaunchAgents run with a minimal PATH that
+  # does not include user-local directories, so command -v alone is not
+  # enough.  Try the common locations explicitly.
+  local -a fallback_paths=(
+    "${HOME}/.local/bin/claude"
+    "${HOME}/.claude/local/bin/claude"
+    "/usr/local/bin/claude"
+    "/opt/homebrew/bin/claude"
+  )
+  local p
+  for p in "${fallback_paths[@]}"; do
+    if [[ -x "${p}" ]]; then
+      printf '%s\n' "${p}"
+      return 0
+    fi
+  done
+
   return 1
 }
 
@@ -348,7 +366,7 @@ fi
 
 reconcile_snippet=""
 if [[ -n "$reconcile_command" ]]; then
-  printf -v delayed_reconcile_q '%q' "sleep 2; $reconcile_command"
+  printf -v delayed_reconcile_q '%q' "export ACP_EXPECTED_RUN_STARTED_AT=${started_at_q}; export F_LOSNING_EXPECTED_RUN_STARTED_AT=${started_at_q}; while tmux has-session -t ${session_q} 2>/dev/null; do sleep 1; done; sleep 2; $reconcile_command"
   reconcile_snippet="nohup bash -lc ${delayed_reconcile_q} >> ${output_q} 2>&1 </dev/null &"
 fi
 

package/tools/bin/agent-project-run-codex-session

@@ -256,7 +256,7 @@ fi
 
 reconcile_snippet=""
 if [[ -n "$reconcile_command" ]]; then
-  printf -v delayed_reconcile_q '%q' "sleep 2; $reconcile_command"
+  printf -v delayed_reconcile_q '%q' "export ACP_EXPECTED_RUN_STARTED_AT=${started_at_q}; export F_LOSNING_EXPECTED_RUN_STARTED_AT=${started_at_q}; while tmux has-session -t ${session_q} 2>/dev/null; do sleep 1; done; sleep 2; $reconcile_command"
   reconcile_snippet="nohup bash -lc ${delayed_reconcile_q} >> ${output_q} 2>&1 </dev/null &"
 fi