agent-control-plane 0.1.16 → 0.2.0

package/tools/bin/agent-project-catch-up-merged-prs

@@ -54,8 +54,9 @@ for hook_name in "${optional_hooks[@]}"; do
   fi
 done
 
-ledger_dir="${state_root}/merged-pr-catchup"
-mkdir -p "$ledger_dir"
+merged_ledger_dir="${state_root}/merged-pr-catchup"
+closed_ledger_dir="${state_root}/closed-pr-catchup"
+mkdir -p "$merged_ledger_dir" "$closed_ledger_dir"
 
 get_pr_risk_json() {
   local pr_number="${1:?pr number required}"
@@ -92,16 +93,68 @@ close_issue_if_needed() {
   fi
 }
 
-merged_prs_json="$(flow_github_pr_list_json "$repo_slug" merged "$limit")"
-
-while IFS= read -r pr_number; do
-  [[ -n "$pr_number" ]] || continue
+process_terminal_pr() {
+  local pr_number="${1:?pr number required}"
+  local linked_issue_id="${2:-}"
+  local merged_at="${3:-}"
+  local processed_state="${4:?processed state required}"
+  local ledger_dir=""
+  local ledger_file=""
+
+  case "$processed_state" in
+    merged) ledger_dir="$merged_ledger_dir" ;;
+    closed) ledger_dir="$closed_ledger_dir" ;;
+    *)
+      echo "unsupported terminal PR state: ${processed_state}" >&2
+      return 1
+      ;;
+  esac
 
   ledger_file="${ledger_dir}/${pr_number}.env"
   if [[ -f "$ledger_file" ]]; then
-    continue
+    return 0
+  fi
+
+  PR_NUMBER="$pr_number" pr_clear_retry || true
+  if [[ "$processed_state" == "merged" ]]; then
+    close_issue_if_needed "$pr_number" "$linked_issue_id"
+    if ! PR_NUMBER="$pr_number" pr_after_merged "$pr_number"; then
+      printf 'CATCHUP_FAILED_PR=%s\n' "$pr_number" >&2
+      return 1
+    fi
+  else
+    if ! PR_NUMBER="$pr_number" pr_after_closed "$pr_number"; then
+      printf 'CATCHUP_FAILED_CLOSED_PR=%s\n' "$pr_number" >&2
+      return 1
+    fi
+  fi
+
+  if ! PR_NUMBER="$pr_number" pr_cleanup_merged_residue "$pr_number"; then
+    printf 'CATCHUP_FAILED_RESIDUE=%s\n' "$pr_number" >&2
+    return 1
   fi
 
+  {
+    printf 'PR_NUMBER=%s\n' "$pr_number"
+    printf 'ISSUE_ID=%s\n' "$linked_issue_id"
+    printf 'PR_STATE=%s\n' "$processed_state"
+    printf 'MERGED_AT=%s\n' "$merged_at"
+    printf 'PROCESSED_AT=%s\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  } >"$ledger_file"
+
+  if [[ "$processed_state" == "merged" ]]; then
+    printf 'CATCHUP_MERGED_PR=%s\n' "$pr_number"
+  else
+    printf 'CATCHUP_CLOSED_PR=%s\n' "$pr_number"
+  fi
+}
+
+merged_prs_json="$(flow_github_pr_list_json "$repo_slug" merged "$limit")"
+closed_prs_json="$(flow_github_pr_list_json "$repo_slug" closed "$limit")"
+
+while IFS= read -r pr_number; do
+  [[ -n "$pr_number" ]] || continue
+
   risk_json="$(get_pr_risk_json "$pr_number" 2>/dev/null || true)"
   if [[ -z "$risk_json" ]]; then
     continue
@@ -114,24 +167,27 @@ while IFS= read -r pr_number; do
 
   linked_issue_id="$(jq -r '.linkedIssueId // empty' <<<"$risk_json" 2>/dev/null || true)"
   merged_at="$(jq -r --arg pr "$pr_number" 'map(select((.number | tostring) == $pr)) | .[0].mergedAt // ""' <<<"$merged_prs_json")"
+  process_terminal_pr "$pr_number" "$linked_issue_id" "$merged_at" merged || true
+done < <(jq -r 'sort_by(.mergedAt) | reverse | .[].number' <<<"$merged_prs_json")
 
-  PR_NUMBER="$pr_number" pr_clear_retry || true
-  close_issue_if_needed "$pr_number" "$linked_issue_id"
-  if ! PR_NUMBER="$pr_number" pr_after_merged "$pr_number"; then
-    printf 'CATCHUP_FAILED_PR=%s\n' "$pr_number" >&2
+while IFS= read -r pr_number; do
+  [[ -n "$pr_number" ]] || continue
+
+  merged_at="$(jq -r --arg pr "$pr_number" 'map(select((.number | tostring) == $pr)) | .[0].mergedAt // ""' <<<"$closed_prs_json")"
+  if [[ -n "$merged_at" ]]; then
     continue
   fi
-  if ! PR_NUMBER="$pr_number" pr_cleanup_merged_residue "$pr_number"; then
-    printf 'CATCHUP_FAILED_RESIDUE=%s\n' "$pr_number" >&2
+
+  risk_json="$(get_pr_risk_json "$pr_number" 2>/dev/null || true)"
+  if [[ -z "$risk_json" ]]; then
     continue
   fi
 
-  {
-    printf 'PR_NUMBER=%s\n' "$pr_number"
-    printf 'ISSUE_ID=%s\n' "$linked_issue_id"
-    printf 'MERGED_AT=%s\n' "$merged_at"
-    printf 'PROCESSED_AT=%s\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
-  } >"$ledger_file"
+  is_managed="$(jq -r '.isManagedByAgent // .isAgentBranch // false' <<<"$risk_json" 2>/dev/null || printf 'false\n')"
+  if [[ "$is_managed" != "true" ]]; then
+    continue
+  fi
 
-  printf 'CATCHUP_MERGED_PR=%s\n' "$pr_number"
-done < <(jq -r 'sort_by(.mergedAt) | reverse | .[].number' <<<"$merged_prs_json")
+  linked_issue_id="$(jq -r '.linkedIssueId // empty' <<<"$risk_json" 2>/dev/null || true)"
+  process_terminal_pr "$pr_number" "$linked_issue_id" "" closed || true
+done < <(jq -r 'sort_by(.createdAt) | reverse | .[].number' <<<"$closed_prs_json")

package/tools/bin/agent-project-catch-up-scheduled-issue-retries

@@ -0,0 +1,123 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+usage() {
+  cat <<'EOF'
+Usage:
+  agent-project-catch-up-scheduled-issue-retries --repo-slug <owner/repo> --state-root <path> --hook-file <path> [--limit <n>]
+
+Clear stale retry state for recurring scheduled reporting issues once GitHub
+already reflects the latest terminal status via labels and the issue is not
+currently running.
+EOF
+}
+
+repo_slug=""
+state_root=""
+hook_file=""
+limit="100"
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --repo-slug) repo_slug="${2:-}"; shift 2 ;;
+    --state-root) state_root="${2:-}"; shift 2 ;;
+    --hook-file) hook_file="${2:-}"; shift 2 ;;
+    --limit) limit="${2:-}"; shift 2 ;;
+    --help|-h) usage; exit 0 ;;
+    *) echo "Unknown argument: $1" >&2; usage >&2; exit 1 ;;
+  esac
+done
+
+if [[ -z "$repo_slug" || -z "$state_root" || -z "$hook_file" ]]; then
+  usage >&2
+  exit 1
+fi
+
+if [[ ! -f "$hook_file" ]]; then
+  echo "missing hook file: $hook_file" >&2
+  exit 1
+fi
+
+# shellcheck source=/dev/null
+source "$hook_file"
+
+if ! declare -F issue_clear_retry >/dev/null 2>&1; then
+  issue_clear_retry() { :; }
+fi
+
+ledger_dir="${state_root}/scheduled-issue-retry-catchup"
+retry_dir="${state_root}/retries/issues"
+mkdir -p "$ledger_dir" "$retry_dir"
+
+issue_has_terminal_scheduled_status() {
+  local issue_json="${1:-}"
+  ISSUE_JSON="$issue_json" python3 - <<'PY'
+import json
+import os
+import re
+import sys
+
+issue = json.loads(os.environ.get("ISSUE_JSON", "{}") or "{}")
+state = (issue.get("state") or "").upper()
+labels = {str(item.get("name") or "") for item in (issue.get("labels") or [])}
+body = issue.get("body") or ""
+
+has_schedule = bool(re.search(r'^\s*(?:Agent schedule|Schedule|Cadence)\s*:\s*(?:every\s+)?\d+\s*[mhd]\s*$', body, re.I | re.M))
+if not has_schedule and "agent-scheduled" not in labels:
+    sys.exit(1)
+
+if state != "OPEN":
+    sys.exit(1)
+
+if "agent-running" in labels:
+    sys.exit(1)
+
+terminal_status_labels = {
+    "health-ok",
+    "health-not-ok",
+    "checks-ok",
+    "checks-not-ok",
+    "smoke-ok",
+    "smoke-not-ok",
+}
+if not (labels & terminal_status_labels):
+    sys.exit(1)
+
+sys.exit(0)
+PY
+}
+
+processed=0
+for retry_file in "$retry_dir"/*.env; do
+  [[ -f "$retry_file" ]] || continue
+  if [[ "$processed" -ge "$limit" ]]; then
+    break
+  fi
+
+  issue_id="$(basename "${retry_file%.env}")"
+  [[ -n "$issue_id" ]] || continue
+
+  ledger_file="${ledger_dir}/${issue_id}.env"
+  if [[ -f "$ledger_file" ]]; then
+    continue
+  fi
+
+  issue_json="$(flow_github_issue_view_json "$repo_slug" "$issue_id" 2>/dev/null || true)"
+  [[ -n "$issue_json" && "$issue_json" != "{}" ]] || continue
+
+  if ! issue_has_terminal_scheduled_status "$issue_json"; then
+    continue
+  fi
+
+  retry_reason="$(awk -F= '/^LAST_REASON=/{print $2; exit}' "$retry_file" 2>/dev/null | tr -d '\r' || true)"
+  ISSUE_ID="$issue_id" issue_clear_retry || true
+
+  {
+    printf 'ISSUE_ID=%s\n' "$issue_id"
+    printf 'LAST_REASON=%s\n' "$retry_reason"
+    printf 'PROCESSED_AT=%s\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  } >"$ledger_file"
+
+  printf 'CATCHUP_SCHEDULED_ISSUE=%s\n' "$issue_id"
+  processed=$((processed + 1))
+done

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

@@ -131,6 +131,24 @@ canonicalize_existing_dir() {
   )
 }
 
+canonicalize_dir_or_parent_join() {
+  local target="${1:-}"
+  local resolved=""
+
+  [[ -n "${target}" ]] || return 1
+
+  resolved="$(canonicalize_existing_dir "${target}" || true)"
+  if [[ -n "${resolved}" ]]; then
+    printf '%s\n' "${resolved}"
+    return 0
+  fi
+
+  (
+    cd "$(dirname "${target}")" 2>/dev/null
+    printf '%s/%s\n' "$(pwd -P)" "$(basename "${target}")"
+  ) || return 1
+}
+
 path_is_within_root() {
   local target="${1:-}"
   local root="${2:-}"
@@ -169,6 +187,8 @@ resident_worktree_protected() {
   local resident_worktree=""
   local resident_realpath=""
   local resolved_resident=""
+  local resident_lane_kind=""
+  local resident_last_status=""
 
   [[ -n "${candidate_path}" && -d "${candidate_path}" ]] || return 1
   resolved_candidate="$(canonicalize_existing_dir "${candidate_path}" || true)"
@@ -181,12 +201,19 @@ resident_worktree_protected() {
     [[ -f "${metadata_file}" ]] || continue
     resident_worktree=""
     resident_realpath=""
+    resident_lane_kind=""
+    resident_last_status=""
     set +u
     set -a
     # shellcheck source=/dev/null
     source "${metadata_file}"
     set +a
     set -u
+    resident_lane_kind="${RESIDENT_LANE_KIND:-}"
+    resident_last_status="${LAST_STATUS:-}"
+    if [[ "${resident_lane_kind}" != "recurring" && "${resident_last_status}" != "running" ]]; then
+      continue
+    fi
     resident_worktree="${WORKTREE_REALPATH:-${WORKTREE:-}}"
     [[ -n "${resident_worktree}" && -d "${resident_worktree}" ]] || continue
     resolved_resident="$(canonicalize_existing_dir "${resident_worktree}" || true)"
@@ -268,6 +295,59 @@ active_resident_run_worktree_protected() {
   return 1
 }
 
+clear_resident_worktree_realpath_references() {
+  local removed_path="${1:-}"
+  local resolved_removed=""
+  local resolved_state_root=""
+  local metadata_file=""
+  local resident_realpath=""
+  local tmp_file=""
+  local metadata_worktree_realpath=""
+
+  [[ -n "${removed_path}" ]] || return 0
+
+  resolved_removed="$(canonicalize_dir_or_parent_join "${removed_path}" || true)"
+  [[ -n "${resolved_removed}" ]] || return 0
+
+  resolved_state_root="$(derive_state_root || true)"
+  [[ -n "${resolved_state_root}" && -d "${resolved_state_root}/resident-workers/issues" ]] || return 0
+
+  for metadata_file in "${resolved_state_root}"/resident-workers/issues/*/metadata.env; do
+    [[ -f "${metadata_file}" ]] || continue
+    metadata_worktree_realpath=""
+    set +u
+    set -a
+    # shellcheck source=/dev/null
+    source "${metadata_file}"
+    set +a
+    set -u
+    resident_realpath="${WORKTREE_REALPATH:-${metadata_worktree_realpath:-}}"
+    [[ -n "${resident_realpath}" ]] || continue
+    resident_realpath="$(canonicalize_dir_or_parent_join "${resident_realpath}" || true)"
+    [[ -n "${resident_realpath}" ]] || continue
+    if [[ "${resident_realpath}" != "${resolved_removed}" ]]; then
+      continue
+    fi
+
+    tmp_file="${metadata_file}.tmp.$$"
+    awk '
+      BEGIN { replaced = 0 }
+      /^WORKTREE_REALPATH=/ {
+        print "WORKTREE_REALPATH='\'''\''"
+        replaced = 1
+        next
+      }
+      { print }
+      END {
+        if (replaced == 0) {
+          print "WORKTREE_REALPATH='\'''\''"
+        }
+      }
+    ' "${metadata_file}" >"${tmp_file}"
+    mv "${tmp_file}" "${metadata_file}"
+  done
+}
+
 cleanup_with_branch_tool() {
   local include_path="${1:-yes}"
   local -a cleanup_args
@@ -355,6 +435,10 @@ if [[ -n "$session" && "$active_tmux_session" != "true" ]]; then
   )"
 fi
 
+if [[ "$skip_worktree_cleanup" != "true" && -n "$worktree_path" && ! -d "$worktree_path" ]]; then
+  clear_resident_worktree_realpath_references "$worktree_path"
+fi
+
 if [[ "$cleanup_status" != "0" && -z "$session" ]]; then
   [[ -n "$cleanup_error" ]] && printf '%s\n' "$cleanup_error" >&2
   exit "$cleanup_status"

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

@@ -558,6 +558,9 @@ cleanup_scheduler_caches() {
   if [[ -n "${pr_risk_cache_dir:-}" && -d "${pr_risk_cache_dir}" ]]; then
     rm -rf "${pr_risk_cache_dir}" || true
   fi
+  if declare -F heartbeat_invalidate_snapshot_cache >/dev/null 2>&1; then
+    heartbeat_invalidate_snapshot_cache
+  fi
 }
 
 stage_issue_launch() {
@@ -1482,9 +1485,13 @@ sync_open_agent_issues() {
         --session "${issue_prefix}${issue_id}"
     )"
     status="$(awk -F= '/^STATUS=/{print $2}' <<<"$status_out")"
-    if [[ "$status" == "UNKNOWN" ]]; then
-      heartbeat_sync_issue_labels "$issue_id" >/dev/null || true
-    fi
+    case "$status" in
+      RUNNING)
+        ;;
+      *)
+        heartbeat_sync_issue_labels "$issue_id" >/dev/null || true
+        ;;
+    esac
   done <<<"$running_issue_ids_cache"
 }
 

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

@@ -640,6 +640,9 @@ try {
 
 const changedFilesLower = gitChangedFiles.map((file) => file.toLowerCase());
 const repoHasScript = (scriptName) => Boolean(packageJson?.scripts && Object.prototype.hasOwnProperty.call(packageJson.scripts, scriptName));
+const rootTestScript = String(packageJson?.scripts?.test || '').trim();
+const rootTestScriptUsesNodeTest = /^node\s+--test(?:\s|$)/.test(rootTestScript);
+const rootTestScriptLooksWatchMode = /\B--watch(?:All)?(?:[=\s]|$)|(?:^|\s)vitest\s+watch(?:\s|$)/.test(rootTestScript);
 const commandLooksRunnable = (command) => {
   if (/^npm test(?:\s|$)?/.test(command)) return repoHasScript('test');
   if (/^pnpm test(?:\s|$)?/.test(command)) return repoHasScript('test');
@@ -648,6 +651,14 @@ const commandLooksRunnable = (command) => {
   if (/^node\s+--test(?:\s|$)/.test(command)) return true;
   return true;
 };
+const rootTestFallbackCommand = () => {
+  if (!rootTestScript) return '';
+  if (rootTestScriptUsesNodeTest) return 'npm test';
+  if (!rootTestScriptLooksWatchMode) return 'npm test';
+  if (/\bjest\b/i.test(rootTestScript)) return 'npx jest --runInBand --watchAll=false';
+  if (/\bvitest\b/i.test(rootTestScript)) return 'npx vitest run';
+  return '';
+};
 
 if (promptFile && fs.existsSync(promptFile)) {
   const lines = fs.readFileSync(promptFile, 'utf8').split(/\r?\n/).slice(0, 40);
@@ -678,15 +689,17 @@ if (promptFile && fs.existsSync(promptFile)) {
 }
 
 const changedTestFiles = [...new Set(gitChangedFiles.filter((file) => /\.(?:spec|test)\.[cm]?[jt]sx?$/.test(file)))];
-const rootTestScript = String(packageJson?.scripts?.test || '').trim();
-if (/^node\s+--test(?:\s|$)/.test(rootTestScript)) {
+if (rootTestScriptUsesNodeTest) {
   for (const file of changedTestFiles) {
     addCommand(`node --test ${file}`);
   }
 }
 
-if (commands.length === 0 && rootTestScript) {
-  addCommand('npm test');
+if (commands.length === 0) {
+  const fallbackCommand = rootTestFallbackCommand();
+  if (fallbackCommand) {
+    addCommand(fallbackCommand);
+  }
 }
 
 const filtered = commands.filter((command) => !recordedPassCommands.has(command));
@@ -1382,19 +1395,18 @@ case "$status" in
     failure_reason="$(normalize_issue_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" ]] \
-      || [[ "${failure_reason}" == "provider-quota-limit" ]]; then
-      if [[ -z "${result_outcome:-}" ]]; then
-        result_outcome="blocked"
-      fi
-      if [[ -z "${result_action:-}" ]]; then
-        result_action="host-comment-blocker"
-      fi
+    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"
+    elif [[ "${failure_reason}" == "provider-quota-limit" ]]; 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" "" "" "$failure_reason"
     else
       issue_set_reconcile_summary "$status" "" "" "$failure_reason"
     fi

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

@@ -774,12 +774,12 @@ fi
 
 ${collect_copy_snippet}
 if [[ "\${status}" -eq 0 ]]; then
-  write_state completed "\${status}" '' "\${attempt}" "\$((attempt - 1))"
+  write_state succeeded "\${status}" '' "\${attempt}" "\$((attempt - 1))"
 else
   write_state failed "\${status}" "\${failure_reason}" "\${attempt}" "\$((attempt - 1))"
 fi
 ${reconcile_snippet}
-printf '\n__CLAUDE_EXIT__:%s\n' "\${status}" | tee -a "\${output_file}"
+printf '\n__CODEX_EXIT__:%s\n' "\${status}" | tee -a "\${output_file}"
 exit "\${status}"
 EOF