agent-control-plane 0.2.0 → 0.4.9

package/tools/bin/flow-resident-worker-lib.sh

@@ -285,6 +285,22 @@ flow_resident_issue_queue_file() {
   printf '%s/issue-%s.env\n' "$(flow_resident_issue_queue_pending_dir "${config_file}")" "${issue_id}"
 }
 
+flow_resident_issue_claim_file() {
+  local config_file="${1:-}"
+  local issue_id="${2:?issue id required}"
+  local claimer_key="${3:?claimer key required}"
+
+  if [[ -z "${config_file}" ]]; then
+    config_file="$(resolve_flow_config_yaml "${BASH_SOURCE[1]:-${BASH_SOURCE[0]}}")"
+  fi
+
+  printf '%s/issue-%s.%s.%s.env\n' \
+    "$(flow_resident_issue_queue_claims_dir "${config_file}")" \
+    "${issue_id}" \
+    "${claimer_key}" \
+    "$$"
+}
+
 flow_resident_issue_controller_file() {
   local config_file="${1:-}"
   local issue_id="${2:?issue id required}"
@@ -342,8 +358,11 @@ flow_resident_issue_enqueue() {
 
   tmp_file="${queue_file}.tmp.$$"
   flow_resident_write_metadata "${tmp_file}" \
+    "STATE_FORMAT_VERSION=1" \
+    "STATE_KIND=pending" \
     "ISSUE_ID=${issue_id}" \
     "QUEUED_BY=${queued_by}" \
+    "UPDATED_AT=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
     "QUEUED_AT=$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
   mv "${tmp_file}" "${queue_file}"
 
@@ -361,6 +380,9 @@ flow_resident_issue_claim_next() {
   local issue_id=""
   local claim_file=""
   local claim_key=""
+  local queued_by=""
+  local queued_at=""
+  local claimed_at=""
 
   if [[ -z "${config_file}" ]]; then
     config_file="$(resolve_flow_config_yaml "${BASH_SOURCE[1]:-${BASH_SOURCE[0]}}")"
@@ -378,8 +400,22 @@ flow_resident_issue_claim_next() {
     [[ -n "${issue_id}" ]] || continue
     [[ "${issue_id}" != "${skip_issue_id}" ]] || continue
 
-    claim_file="${claims_dir}/issue-${issue_id}.${claim_key}.$$"
+    queued_by="$(flow_resident_metadata_value "${queue_file}" "QUEUED_BY" || true)"
+    queued_at="$(flow_resident_metadata_value "${queue_file}" "QUEUED_AT" || true)"
+    claimed_at="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+    claim_file="$(flow_resident_issue_claim_file "${config_file}" "${issue_id}" "${claim_key}")"
     if mv "${queue_file}" "${claim_file}" 2>/dev/null; then
+      flow_resident_write_metadata "${claim_file}" \
+        "STATE_FORMAT_VERSION=1" \
+        "STATE_KIND=claim" \
+        "ISSUE_ID=${issue_id}" \
+        "QUEUED_BY=${queued_by}" \
+        "QUEUED_AT=${queued_at}" \
+        "SESSION=${claimer_key}" \
+        "CLAIMED_BY=${claim_key}" \
+        "CLAIMED_AT=${claimed_at}" \
+        "UPDATED_AT=${claimed_at}" \
+        "CLAIM_FILE=${claim_file}"
       printf 'ISSUE_ID=%s\n' "${issue_id}"
       printf 'CLAIM_FILE=%s\n' "${claim_file}"
       return 0
@@ -441,6 +477,87 @@ flow_resident_issue_controller_reap_file() {
   return 0
 }
 
+flow_resident_issue_reap_stale_claims() {
+  local config_file="${1:-}"
+  local claims_dir=""
+  local claim_file=""
+  local claim_token=""
+  local claim_pid=""
+  local issue_id=""
+  local queued_by=""
+  local queued_at=""
+  local claimed_at=""
+  local existing_pending_file=""
+  local other_claim=""
+  local other_token=""
+  local other_pid=""
+
+  if [[ -z "${config_file}" ]]; then
+    config_file="$(resolve_flow_config_yaml "${BASH_SOURCE[1]:-${BASH_SOURCE[0]}}")"
+  fi
+
+  claims_dir="$(flow_resident_issue_queue_claims_dir "${config_file}")"
+  mkdir -p "${claims_dir}"
+
+  for claim_file in "${claims_dir}"/issue-*.env; do
+    [[ -f "${claim_file}" ]] || continue
+
+    claim_token="${claim_file##*/}"
+    claim_token="${claim_token%.env}"
+    claim_pid="${claim_token##*.}"
+    [[ "${claim_pid}" =~ ^[0-9]+$ ]] || continue
+
+    if flow_resident_controller_pid_live "${claim_pid}" "start-resident-issue-loop.sh"; then
+      continue
+    fi
+
+    issue_id="$(flow_resident_metadata_value "${claim_file}" "ISSUE_ID" || true)"
+    [[ -n "${issue_id}" ]] || issue_id="${claim_token#issue-}"
+    issue_id="${issue_id%%.*}"
+    [[ -n "${issue_id}" ]] || continue
+
+    # If another live claim exists for the same issue, do not re-queue this one.
+    for other_claim in "${claims_dir}/issue-${issue_id}."*; do
+      [[ -f "${other_claim}" ]] || continue
+      other_token="${other_claim##*/}"
+      other_token="${other_token%.env}"
+      other_pid="${other_token##*.}"
+      [[ "${other_pid}" =~ ^[0-9]+$ ]] || continue
+      if [[ "${other_pid}" == "${claim_pid}" ]]; then
+        continue
+      fi
+      if flow_resident_controller_pid_live "${other_pid}" "start-resident-issue-loop.sh"; then
+        issue_id=""
+        break
+      fi
+    done
+    [[ -n "${issue_id}" ]] || continue
+
+    existing_pending_file="$(flow_resident_issue_queue_file "${config_file}" "${issue_id}")"
+    if [[ -f "${existing_pending_file}" ]]; then
+      rm -f "${claim_file}"
+      continue
+    fi
+
+    queued_by="$(flow_resident_metadata_value "${claim_file}" "QUEUED_BY" || true)"
+    queued_at="$(flow_resident_metadata_value "${claim_file}" "QUEUED_AT" || true)"
+    claimed_at="$(flow_resident_metadata_value "${claim_file}" "CLAIMED_AT" || true)"
+
+    [[ -n "${queued_by}" ]] || queued_by="heartbeat"
+    [[ -n "${queued_at}" ]] || queued_at="${claimed_at:-$(date -u +"%Y-%m-%dT%H:%M:%SZ")}"
+
+    flow_resident_write_metadata "${existing_pending_file}" \
+      "STATE_FORMAT_VERSION=1" \
+      "STATE_KIND=pending" \
+      "ISSUE_ID=${issue_id}" \
+      "QUEUED_BY=${queued_by}" \
+      "QUEUED_AT=${queued_at}" \
+      "UPDATED_AT=${claimed_at:-${queued_at}}"
+    rm -f "${claim_file}"
+
+  done
+}
+
 flow_resident_issue_reap_stale_state() {
   local config_file="${1:-}"
   local resident_root=""
@@ -458,6 +575,7 @@ flow_resident_issue_reap_stale_state() {
       reaped=$((reaped + 1))
     fi
   done
+  flow_resident_issue_reap_stale_claims "${config_file}" || true
 
   printf '%s\n' "${reaped}"
 }

package/tools/bin/flow-shell-lib.sh

@@ -5,6 +5,62 @@ flow_canonical_skill_name() {
   printf '%s\n' "${AGENT_CONTROL_PLANE_SKILL_NAME:-agent-control-plane}"
 }
 
+flow_resolve_python_bin() {
+  if [[ -n "${PYTHON_BIN:-}" && -x "${PYTHON_BIN:-}" ]]; then
+    printf '%s\n' "${PYTHON_BIN}"
+    return 0
+  fi
+
+  if command -v python3 >/dev/null 2>&1; then
+    command -v python3
+    return 0
+  fi
+
+  if [[ -x /opt/homebrew/bin/python3 ]]; then
+    printf '%s\n' "/opt/homebrew/bin/python3"
+    return 0
+  fi
+
+  if command -v python >/dev/null 2>&1; then
+    command -v python
+    return 0
+  fi
+
+  return 1
+}
+
+flow_format_epoch_utc() {
+  local epoch="${1:-}"
+  local python_bin=""
+
+  if ! [[ "${epoch}" =~ ^[0-9]+$ ]] || [[ "${epoch}" == "0" ]]; then
+    return 1
+  fi
+
+  if date -u -r "${epoch}" +"%Y-%m-%dT%H:%M:%SZ" >/dev/null 2>&1; then
+    date -u -r "${epoch}" +"%Y-%m-%dT%H:%M:%SZ"
+    return 0
+  fi
+
+  if date -u -d "@${epoch}" +"%Y-%m-%dT%H:%M:%SZ" >/dev/null 2>&1; then
+    date -u -d "@${epoch}" +"%Y-%m-%dT%H:%M:%SZ"
+    return 0
+  fi
+
+  python_bin="$(flow_resolve_python_bin 2>/dev/null || true)"
+  if [[ -n "${python_bin}" ]]; then
+    "${python_bin}" - "${epoch}" <<'PY'
+import datetime
+import sys
+
+print(datetime.datetime.fromtimestamp(int(sys.argv[1]), datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"))
+PY
+    return 0
+  fi
+
+  return 1
+}
+
 flow_compat_skill_alias() {
   printf '%s\n' "${AGENT_CONTROL_PLANE_COMPAT_ALIAS:-}"
 }

package/tools/bin/github-core-rate-limit-state.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=/dev/null
+source "${SCRIPT_DIR}/flow-config-lib.sh"
+
+usage() {
+  cat <<'EOF'
+Usage:
+  github-core-rate-limit-state.sh get
+  github-core-rate-limit-state.sh schedule [reason] [--next-at-epoch <unix-seconds>]
+  github-core-rate-limit-state.sh clear
+EOF
+}
+
+action="${1:-}"
+reason="${2:-github-api-rate-limit}"
+next_at_epoch=""
+
+if [[ $# -lt 1 ]]; then
+  usage >&2
+  exit 1
+fi
+
+shift || true
+if [[ $# -gt 0 ]]; then
+  reason="${1:-github-api-rate-limit}"
+  shift || true
+fi
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --next-at-epoch)
+      next_at_epoch="${2:-}"
+      shift 2
+      ;;
+    --help|-h)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "unknown argument: $1" >&2
+      usage >&2
+      exit 1
+      ;;
+  esac
+done
+
+case "${action}" in
+  get|schedule|clear) ;;
+  *)
+    usage >&2
+    exit 1
+    ;;
+esac
+
+CONFIG_YAML="$(resolve_flow_config_yaml "${BASH_SOURCE[0]}")"
+STATE_ROOT="$(flow_resolve_state_root "${CONFIG_YAML}")"
+COOLDOWNS="$(flow_resolve_retry_cooldowns "${CONFIG_YAML}")"
+
+exec_args=(
+  --state-root "${STATE_ROOT}"
+  --kind github
+  --item-id core-api
+  --action "${action}"
+  --reason "${reason}"
+  --cooldowns "${COOLDOWNS}"
+)
+
+if [[ "${action}" == "schedule" && "${next_at_epoch}" =~ ^[0-9]+$ ]]; then
+  exec_args+=(--next-at-epoch "${next_at_epoch}")
+fi
+
+ACP_STATE_ROOT="${STATE_ROOT}" \
+ACP_RETRY_COOLDOWNS="${COOLDOWNS}" \
+exec bash "${SCRIPT_DIR}/agent-project-retry-state" "${exec_args[@]}"