agent-control-plane 0.1.7 → 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/hooks/issue-reconcile-hooks.sh

@@ -7,6 +7,7 @@ source "${HOOK_SCRIPT_DIR}/../tools/bin/flow-config-lib.sh"
 
 FLOW_SKILL_DIR="$(cd "${HOOK_SCRIPT_DIR}/.." && pwd)"
 CONFIG_YAML="$(resolve_flow_config_yaml "${BASH_SOURCE[0]}")"
+PROFILE_ID="$(flow_resolve_adapter_id "${CONFIG_YAML}")"
 ADAPTER_BIN_DIR="${FLOW_SKILL_DIR}/bin"
 FLOW_TOOLS_DIR="${FLOW_SKILL_DIR}/tools/bin"
 REPO_SLUG="$(flow_resolve_repo_slug "${CONFIG_YAML}")"
@@ -15,6 +16,12 @@ STATE_ROOT="$(flow_resolve_state_root "${CONFIG_YAML}")"
 RUNS_ROOT="$(flow_resolve_runs_root "${CONFIG_YAML}")"
 BLOCKED_RECOVERY_STATE_DIR="${STATE_ROOT}/blocked-recovery-issues"
 
+issue_kick_scheduler() {
+  ACP_PROJECT_ID="${PROFILE_ID}" \
+  AGENT_PROJECT_ID="${PROFILE_ID}" \
+    "${FLOW_TOOLS_DIR}/kick-scheduler.sh" "${1:-2}" >/dev/null || true
+}
+
 issue_clear_blocked_recovery_state() {
   rm -f "${BLOCKED_RECOVERY_STATE_DIR}/${ISSUE_ID}.env" 2>/dev/null || true
 }
@@ -194,7 +201,7 @@ issue_after_pr_created() {
   if [[ "$(jq -r '.eligibleForAutoMerge' <<<"$risk_json")" == "true" ]]; then
     bash "${FLOW_TOOLS_DIR}/agent-github-update-labels" --repo-slug "${REPO_SLUG}" --number "$pr_number" --add agent-automerge >/dev/null || true
   fi
-  "${FLOW_TOOLS_DIR}/kick-scheduler.sh" 5 >/dev/null || true
+  issue_kick_scheduler 5
 }
 
 issue_after_reconciled() {
@@ -213,5 +220,5 @@ issue_after_reconciled() {
     esac
   fi
 
-  "${FLOW_TOOLS_DIR}/kick-scheduler.sh" 2 >/dev/null || true
+  issue_kick_scheduler 2
 }

package/hooks/pr-reconcile-hooks.sh

@@ -7,6 +7,7 @@ source "${HOOK_SCRIPT_DIR}/../tools/bin/flow-config-lib.sh"
 
 FLOW_SKILL_DIR="$(cd "${HOOK_SCRIPT_DIR}/.." && pwd)"
 CONFIG_YAML="$(resolve_flow_config_yaml "${BASH_SOURCE[0]}")"
+PROFILE_ID="$(flow_resolve_adapter_id "${CONFIG_YAML}")"
 ADAPTER_BIN_DIR="${FLOW_SKILL_DIR}/bin"
 FLOW_TOOLS_DIR="${FLOW_SKILL_DIR}/tools/bin"
 RUNS_ROOT="$(flow_resolve_runs_root "${CONFIG_YAML}")"
@@ -19,6 +20,12 @@ ISSUE_SESSION_PREFIX="$(flow_resolve_issue_session_prefix "${CONFIG_YAML}")"
 PR_WORKTREE_BRANCH_PREFIX="$(flow_resolve_pr_worktree_branch_prefix "${CONFIG_YAML}")"
 PR_LANE_OVERRIDE_DIR="${STATE_ROOT}/pr-lane-overrides"
 
+pr_kick_scheduler() {
+  ACP_PROJECT_ID="${PROFILE_ID}" \
+  AGENT_PROJECT_ID="${PROFILE_ID}" \
+    "${FLOW_TOOLS_DIR}/kick-scheduler.sh" "${1:-2}" >/dev/null || true
+}
+
 pr_best_effort_update_labels() {
   bash "${FLOW_TOOLS_DIR}/agent-github-update-labels" "$@" >/dev/null 2>&1 || true
 }
@@ -131,14 +138,14 @@ pr_after_merged() {
   pr_clear_lane_override "$pr_number"
   pr_best_effort_update_labels --repo-slug "${REPO_SLUG}" --number "$pr_number" --remove agent-running --remove agent-automerge --remove agent-repair-queued --remove agent-fix-needed --remove agent-manual-fix-override --remove agent-ci-refresh --remove agent-ci-bypassed --remove agent-double-check-1/2 --remove agent-double-check-2/2 --remove agent-human-review --remove agent-human-approved --remove agent-blocked --remove agent-handoff --remove agent-exclusive
   pr_refresh_linked_issue_checklist "$pr_number"
-  "${FLOW_TOOLS_DIR}/kick-scheduler.sh" 5 >/dev/null || true
+  pr_kick_scheduler 5
 }
 
 pr_after_closed() {
   local pr_number="${1:?pr number required}"
   pr_clear_lane_override "$pr_number"
   pr_best_effort_update_labels --repo-slug "${REPO_SLUG}" --number "$pr_number" --remove agent-running --remove agent-automerge --remove agent-repair-queued --remove agent-fix-needed --remove agent-manual-fix-override --remove agent-ci-refresh --remove agent-ci-bypassed --remove agent-double-check-1/2 --remove agent-double-check-2/2 --remove agent-human-review --remove agent-human-approved --remove agent-blocked --remove agent-handoff --remove agent-exclusive
-  "${FLOW_TOOLS_DIR}/kick-scheduler.sh" 5 >/dev/null || true
+  pr_kick_scheduler 5
 }
 
 pr_automerge_allowed() {
@@ -189,7 +196,7 @@ pr_after_double_check_advanced() {
   pr_set_lane_override "$pr_number" "double-check-${next_stage}"
   pr_best_effort_update_labels --repo-slug "${REPO_SLUG}" --number "$pr_number" --remove agent-running --remove agent-automerge --remove agent-repair-queued --remove agent-fix-needed --remove agent-manual-fix-override --remove agent-ci-refresh --remove agent-human-review --remove agent-human-approved --remove agent-double-check-1/2 --remove agent-double-check-2/2 --add "$next_label"
   pr_best_effort_sync_pr_labels "$pr_number"
-  "${FLOW_TOOLS_DIR}/kick-scheduler.sh" 5 >/dev/null || true
+  pr_kick_scheduler 5
 }
 
 pr_after_updated_branch() {
@@ -221,5 +228,5 @@ pr_after_failed() {
 }
 
 pr_after_reconciled() {
-  "${FLOW_TOOLS_DIR}/kick-scheduler.sh" 2 >/dev/null || true
+  pr_kick_scheduler 2
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-control-plane",
-  "version": "0.1.7",
+  "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": {
@@ -40,7 +40,7 @@
   "scripts": {
     "doctor": "node ./npm/bin/agent-control-plane.js doctor",
     "smoke": "node ./npm/bin/agent-control-plane.js smoke",
-    "test": "bash tools/tests/test-agent-control-plane-npm-cli.sh && bash tools/tests/test-profile-adopt-skip-anchor-sync-creates-agent-repo-root.sh && bash tools/tests/test-vendored-codex-quota-claude-oauth-only.sh && bash tools/tests/test-package-smoke-command.sh"
+    "test": "bash tools/tests/test-agent-control-plane-npm-cli.sh && bash tools/tests/test-agent-project-detached-launch-stable-cwd.sh && bash tools/tests/test-agent-project-claude-session-wrapper-reaps-child-on-term.sh && bash tools/tests/test-agent-project-claude-session-wrapper-does-not-retry-provider-quota.sh && bash tools/tests/test-agent-project-reconcile-issue-provider-quota-schedules-provider-cooldown.sh && bash tools/tests/test-pr-reconcile-hooks-refreshes-recurring-issue-checklist.sh && bash tools/tests/test-issue-reconcile-hooks-kick-scheduler-uses-profile.sh && bash tools/tests/test-profile-adopt-skip-anchor-sync-creates-agent-repo-root.sh && bash tools/tests/test-vendored-codex-quota-claude-oauth-only.sh && bash tools/tests/test-package-smoke-command.sh"
   },
   "keywords": [
     "agents",

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-detached-launch

@@ -6,6 +6,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/flow-config-lib.sh"
 CONFIG_YAML="$(resolve_flow_config_yaml "${BASH_SOURCE[0]}")"
 STATE_ROOT="$(flow_resolve_state_root "${CONFIG_YAML}")"
+AGENT_REPO_ROOT="$(flow_resolve_agent_repo_root "${CONFIG_YAML}")"
+REPO_ROOT="$(flow_resolve_repo_root "${CONFIG_YAML}")"
 
 usage() {
   cat <<'EOF'
@@ -66,6 +68,21 @@ if [[ -n "${pending_key}" ]]; then
   pending_file="${pending_dir}/${pending_key}.pid"
 fi
 
+launch_cwd="${ACP_LAUNCH_CWD:-${F_LOSNING_LAUNCH_CWD:-}}"
+if [[ -z "${launch_cwd}" ]]; then
+  for candidate in "${AGENT_REPO_ROOT}" "${REPO_ROOT}" "${STATE_ROOT}" "${HOME:-}" "/"; do
+    if [[ -n "${candidate}" && -d "${candidate}" ]]; then
+      launch_cwd="${candidate}"
+      break
+    fi
+  done
+fi
+
+if [[ -z "${launch_cwd}" || ! -d "${launch_cwd}" ]]; then
+  echo "could not determine a stable working directory for detached launch" >&2
+  exit 1
+fi
+
 python_bin="${PYTHON_BIN:-$(command -v python3 || true)}"
 if [[ -z "${python_bin}" ]]; then
   echo "python3 is required for detached launch" >&2
@@ -73,14 +90,15 @@ if [[ -z "${python_bin}" ]]; then
 fi
 
 launch_pid="$(
-  "${python_bin}" - "${log_file}" "${pending_file}" "$@" <<'PY'
+  "${python_bin}" - "${log_file}" "${pending_file}" "${launch_cwd}" "$@" <<'PY'
 import subprocess
 import sys
 from pathlib import Path
 
 log_file = Path(sys.argv[1])
 pending_file = sys.argv[2]
-argv = sys.argv[3:]
+launch_cwd = sys.argv[3]
+argv = sys.argv[4:]
 
 with log_file.open("ab", buffering=0) as log_handle:
     proc = subprocess.Popen(
@@ -88,6 +106,7 @@ with log_file.open("ab", buffering=0) as log_handle:
         stdin=subprocess.DEVNULL,
         stdout=log_handle,
         stderr=subprocess.STDOUT,
+        cwd=launch_cwd,
         start_new_session=True,
     )
 
@@ -102,6 +121,7 @@ printf 'LAUNCH_MODE=detached\n'
 printf 'LAUNCH_NAME=%s\n' "${launch_name}"
 printf 'LAUNCH_PID=%s\n' "${launch_pid}"
 printf 'LAUNCH_LOG=%s\n' "${log_file}"
+printf 'LAUNCH_CWD=%s\n' "${launch_cwd}"
 if [[ -n "${pending_file}" ]]; then
   printf 'LAUNCH_PENDING_FILE=%s\n' "${pending_file}"
 fi

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=""
@@ -794,6 +804,81 @@ ${publish_out}
 EOF
 }
 
+build_issue_runtime_blocker_comment() {
+  local runtime_reason="${1:-worker-exit-failed}"
+  local worker_name="${CODING_WORKER:-worker}"
+
+  case "${runtime_reason}" in
+    provider-quota-limit)
+      cat <<EOF
+# Blocker: Provider quota is currently exhausted
+
+This recurring run stopped before implementation because the configured ${worker_name} account hit a provider-side rate limit.
+
+Why it was blocked:
+- the worker reached Anthropic's current request limit for this account
+- ACP recorded the quota hit and will retry after the configured cooldown instead of looping indefinitely
+
+Next step:
+- wait for the current quota window to reset, or switch this profile to another available provider/account
+EOF
+      return 0
+      ;;
+  esac
+
+  cat <<EOF
+# Blocker: Worker session failed before publish
+
+The worker exited before ACP could publish or reconcile a result for this cycle.
+
+Failure reason:
+- \`${runtime_reason}\`
+
+Next step:
+- inspect the run logs for this session and re-queue once the underlying worker issue is resolved
+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
@@ -809,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
 }
 
@@ -949,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
@@ -1106,9 +1198,17 @@ case "$status" in
     failure_reason="${failure_reason:-worker-exit-failed}"
     schedule_provider_quota_cooldown "${failure_reason}"
     normalize_issue_runner_state "failed" "${LAST_EXIT_CODE:-}" "${failure_reason}"
+    if [[ "${result_outcome:-}" == "blocked" && "${result_action:-}" == "host-comment-blocker" ]]; then
+      if [[ ! -s "${run_dir}/issue-comment.md" ]]; then
+        write_issue_comment_artifact "$(build_issue_runtime_blocker_comment "${failure_reason}")" || true
+      fi
+      post_issue_comment_if_present
+      issue_set_reconcile_summary "$status" "$result_outcome" "$result_action" "$failure_reason"
+    else
+      issue_set_reconcile_summary "$status" "" "" "$failure_reason"
+    fi
     require_transition "issue_schedule_retry" issue_schedule_retry "${failure_reason}"
     require_transition "issue_mark_ready" issue_mark_ready
-    issue_set_reconcile_summary "$status" "" "" "$failure_reason"
     cleanup_issue_session
     notify_issue_reconciled
     ;;
@@ -1120,6 +1220,12 @@ mark_reconciled
 printf 'STATUS=%s\n' "$status"
 printf 'ISSUE_ID=%s\n' "$issue_id"
 printf 'PR_NUMBER=%s\n' "$pr_number"
+if [[ -n "${issue_summary_outcome:-}" ]]; then
+  printf 'OUTCOME=%s\n' "${issue_summary_outcome}"
+fi
+if [[ -n "${issue_summary_action:-}" ]]; then
+  printf 'ACTION=%s\n' "${issue_summary_action}"
+fi
 if [[ -n "$failure_reason" ]]; then
   printf 'FAILURE_REASON=%s\n' "$failure_reason"
 fi