agent-control-plane 0.1.14 → 0.2.0

package/tools/bin/project-runtimectl.sh

@@ -168,13 +168,15 @@ join_by_comma() {
 runtime_started() {
   local heartbeat=""
   local shared_loop=""
-  local supervisor=""
+  local active_sessions=""
+  local pending_pids=""
 
   heartbeat="$(heartbeat_pid)"
   shared_loop="$(shared_loop_pid)"
-  supervisor="$(supervisor_pid)"
+  active_sessions="$(collect_active_tmux_sessions | sort -u)"
+  pending_pids="$(collect_pending_launch_pids | sort -u)"
 
-  [[ -n "${heartbeat}" || -n "${shared_loop}" || -n "${supervisor}" ]]
+  [[ -n "${heartbeat}" || -n "${shared_loop}" || -n "${active_sessions}" || -n "${pending_pids}" ]]
 }
 
 wait_for_runtime_start() {
@@ -197,6 +199,13 @@ sync_stamp_value() {
     | sed -e "s/^'//" -e "s/'$//"
 }
 
+shared_loop_status_value() {
+  local key="${1:?key required}"
+  local file="${STATE_ROOT}/shared-heartbeat-loop.env"
+  [[ -f "${file}" ]] || return 1
+  awk -F= -v target="${key}" '$1 == target {print $2; exit}' "${file}" 2>/dev/null
+}
+
 tmux_session_exists() {
   local session="${1:-}"
   [[ -n "${TMUX_BIN}" && -n "${session}" ]] || return 1
@@ -218,14 +227,53 @@ collect_run_sessions() {
   done < <(find "${RUNS_ROOT}" -mindepth 2 -maxdepth 2 -type f -name run.env 2>/dev/null | sort -u)
 }
 
+list_tmux_sessions() {
+  [[ -n "${TMUX_BIN}" ]] || return 0
+  "${TMUX_BIN}" list-sessions -F '#S' 2>/dev/null || true
+}
+
+collect_profile_tmux_sessions() {
+  local issue_prefix=""
+  local pr_prefix=""
+  local session=""
+
+  issue_prefix="$(flow_resolve_issue_session_prefix "${CONFIG_YAML}")"
+  pr_prefix="$(flow_resolve_pr_session_prefix "${CONFIG_YAML}")"
+
+  while IFS= read -r session; do
+    [[ -n "${session}" ]] || continue
+    case "${session}" in
+      "${issue_prefix}"*|"${pr_prefix}"*)
+        printf '%s\n' "${session}"
+        ;;
+    esac
+  done < <(list_tmux_sessions)
+}
+
 collect_active_tmux_sessions() {
+  local known_sessions=""
   local session=""
+  known_sessions="$(collect_run_sessions | sort -u)"
+
   while IFS= read -r session; do
     [[ -n "${session}" ]] || continue
-    if tmux_session_exists "${session}"; then
+    if tmux_session_exists "${session}" && grep -Fxq "${session}" <<<"${known_sessions}"; then
       printf '%s\n' "${session}"
     fi
-  done < <(collect_run_sessions)
+  done < <(collect_profile_tmux_sessions)
+}
+
+collect_stale_tmux_sessions() {
+  local known_sessions=""
+  local session=""
+  known_sessions="$(collect_run_sessions | sort -u)"
+
+  while IFS= read -r session; do
+    [[ -n "${session}" ]] || continue
+    if tmux_session_exists "${session}" && ! grep -Fxq "${session}" <<<"${known_sessions}"; then
+      printf '%s\n' "${session}"
+    fi
+  done < <(collect_profile_tmux_sessions)
 }
 
 collect_repo_shared_loop_pids() {
@@ -336,15 +384,21 @@ print_status() {
   local supervisor=""
   local controller_pids=""
   local active_sessions=""
+  local stale_sessions=""
   local pending_pids=""
   local runtime_status="stopped"
   local controller_count="0"
   local active_session_count="0"
+  local stale_session_count="0"
   local pending_count="0"
   local launchd_state=""
   local runtime_sync_status=""
   local runtime_sync_updated_at=""
   local runtime_sync_fingerprint=""
+  local shared_loop_state=""
+  local shared_loop_last_status=""
+  local shared_loop_started_at=""
+  local shared_loop_updated_at=""
 
   heartbeat="$(heartbeat_pid)"
   shared_loop="$(shared_loop_pid)"
@@ -352,16 +406,18 @@ print_status() {
   heartbeat_parent="$(heartbeat_parent_pid)"
   controller_pids="$(collect_controller_pids | sort -u)"
   active_sessions="$(collect_active_tmux_sessions | sort -u)"
+  stale_sessions="$(collect_stale_tmux_sessions | sort -u)"
   pending_pids="$(collect_pending_launch_pids | sort -u)"
 
   [[ -n "${controller_pids}" ]] && controller_count="$(printf '%s\n' "${controller_pids}" | awk 'NF {c+=1} END {print c+0}')"
   [[ -n "${active_sessions}" ]] && active_session_count="$(printf '%s\n' "${active_sessions}" | awk 'NF {c+=1} END {print c+0}')"
+  [[ -n "${stale_sessions}" ]] && stale_session_count="$(printf '%s\n' "${stale_sessions}" | awk 'NF {c+=1} END {print c+0}')"
   [[ -n "${pending_pids}" ]] && pending_count="$(printf '%s\n' "${pending_pids}" | awk 'NF {c+=1} END {print c+0}')"
 
-  if [[ -n "${heartbeat}" || -n "${shared_loop}" || -n "${supervisor}" || "${controller_count}" != "0" || "${active_session_count}" != "0" ]]; then
+  if [[ -n "${heartbeat}" || -n "${shared_loop}" || "${active_session_count}" != "0" ]]; then
     runtime_status="running"
   fi
-  if [[ -z "${heartbeat}" && -z "${supervisor}" && ( -n "${shared_loop}" || "${controller_count}" != "0" || "${active_session_count}" != "0" ) ]]; then
+  if [[ "${runtime_status}" != "running" && ( -n "${supervisor}" || "${controller_count}" != "0" || "${pending_count}" != "0" || "${stale_session_count}" != "0" ) ]]; then
     runtime_status="partial"
   fi
 
@@ -369,6 +425,10 @@ print_status() {
   runtime_sync_status="$(sync_stamp_value "SYNC_STATUS" || true)"
   runtime_sync_updated_at="$(sync_stamp_value "UPDATED_AT" || true)"
   runtime_sync_fingerprint="$(sync_stamp_value "SOURCE_FINGERPRINT" || true)"
+  shared_loop_state="$(shared_loop_status_value "STATE" || true)"
+  shared_loop_last_status="$(shared_loop_status_value "STATUS" || true)"
+  shared_loop_started_at="$(shared_loop_status_value "STARTED_AT" || true)"
+  shared_loop_updated_at="$(shared_loop_status_value "UPDATED_AT" || true)"
 
   printf 'PROFILE_ID=%s\n' "${PROFILE_ID}"
   printf 'CONFIG_YAML=%s\n' "${CONFIG_YAML}"
@@ -382,12 +442,18 @@ print_status() {
   printf 'HEARTBEAT_PID=%s\n' "${heartbeat}"
   printf 'HEARTBEAT_PARENT_PID=%s\n' "${heartbeat_parent}"
   printf 'SHARED_LOOP_PID=%s\n' "${shared_loop}"
+  printf 'SHARED_LOOP_STATE=%s\n' "${shared_loop_state}"
+  printf 'SHARED_LOOP_LAST_STATUS=%s\n' "${shared_loop_last_status}"
+  printf 'SHARED_LOOP_STARTED_AT=%s\n' "${shared_loop_started_at}"
+  printf 'SHARED_LOOP_UPDATED_AT=%s\n' "${shared_loop_updated_at}"
   printf 'SUPERVISOR_PID=%s\n' "${supervisor}"
   printf 'CONTROLLER_COUNT=%s\n' "${controller_count}"
   printf 'ACTIVE_TMUX_SESSION_COUNT=%s\n' "${active_session_count}"
+  printf 'STALE_TMUX_SESSION_COUNT=%s\n' "${stale_session_count}"
   printf 'PENDING_LAUNCH_COUNT=%s\n' "${pending_count}"
   printf 'CONTROLLER_PIDS=%s\n' "$(printf '%s\n' "${controller_pids}" | join_by_comma)"
   printf 'ACTIVE_TMUX_SESSIONS=%s\n' "$(printf '%s\n' "${active_sessions}" | join_by_comma)"
+  printf 'STALE_TMUX_SESSIONS=%s\n' "$(printf '%s\n' "${stale_sessions}" | join_by_comma)"
   printf 'PENDING_LAUNCH_PIDS=%s\n' "$(printf '%s\n' "${pending_pids}" | join_by_comma)"
   printf 'SYNC_STAMP_FILE=%s\n' "${SYNC_STAMP_FILE}"
   printf 'RUNTIME_SYNC_STATUS=%s\n' "${runtime_sync_status}"
@@ -452,12 +518,18 @@ clear_running_labels_after_stop() {
   fi
 
   issue_json="$(flow_github_issue_list_json "${REPO_SLUG}" open 100 2>/dev/null || printf '[]\n')"
+  if [[ "${issue_json}" == "[]" ]]; then
+    issue_json="$(gh issue list -R "${REPO_SLUG}" --state open --limit 100 --json number,labels 2>/dev/null || printf '[]\n')"
+  fi
   while IFS= read -r number; do
     [[ -n "${number}" ]] || continue
     bash "${UPDATE_LABELS_SCRIPT}" --repo-slug "${REPO_SLUG}" --number "${number}" --remove agent-running >/dev/null 2>&1 || true
   done < <(jq -r '.[] | select(any(.labels[]?; .name == "agent-running")) | .number' <<<"${issue_json}" 2>/dev/null || true)
 
   pr_json="$(flow_github_pr_list_json "${REPO_SLUG}" open 100 2>/dev/null || printf '[]\n')"
+  if [[ "${pr_json}" == "[]" ]]; then
+    pr_json="$(gh pr list -R "${REPO_SLUG}" --state open --limit 100 --json number,labels 2>/dev/null || printf '[]\n')"
+  fi
   while IFS= read -r number; do
     [[ -n "${number}" ]] || continue
     bash "${UPDATE_LABELS_SCRIPT}" --repo-slug "${REPO_SLUG}" --number "${number}" --remove agent-running >/dev/null 2>&1 || true
@@ -466,6 +538,7 @@ clear_running_labels_after_stop() {
 
 stop_runtime() {
   local -a tmux_sessions=()
+  local -a stale_tmux_sessions=()
   local -a pid_targets=()
   local session=""
   local pid=""
@@ -476,6 +549,11 @@ stop_runtime() {
     tmux_sessions+=("${session}")
   done < <(collect_active_tmux_sessions | sort -u)
 
+  while IFS= read -r session; do
+    [[ -n "${session}" ]] || continue
+    stale_tmux_sessions+=("${session}")
+  done < <(collect_stale_tmux_sessions | sort -u)
+
   while IFS= read -r pid; do
     [[ -n "${pid}" ]] || continue
     pid_targets+=("${pid}")
@@ -501,6 +579,9 @@ stop_runtime() {
     for session in "${tmux_sessions[@]+"${tmux_sessions[@]}"}"; do
       "${TMUX_BIN}" kill-session -t "${session}" >/dev/null 2>&1 || true
     done
+    for session in "${stale_tmux_sessions[@]+"${stale_tmux_sessions[@]}"}"; do
+      "${TMUX_BIN}" kill-session -t "${session}" >/dev/null 2>&1 || true
+    done
   fi
 
   terminate_pid_list TERM "${pid_targets[@]+"${pid_targets[@]}"}"
@@ -513,8 +594,10 @@ stop_runtime() {
   printf 'LAUNCHD_STOPPED=%s\n' "${launchd_stopped}"
   printf 'STOPPED_PID_COUNT=%s\n' "$(printf '%s\n' "${pid_targets[@]+"${pid_targets[@]}"}" | awk 'NF {c+=1} END {print c+0}')"
   printf 'STOPPED_TMUX_SESSION_COUNT=%s\n' "$(printf '%s\n' "${tmux_sessions[@]+"${tmux_sessions[@]}"}" | awk 'NF {c+=1} END {print c+0}')"
+  printf 'STOPPED_STALE_TMUX_SESSION_COUNT=%s\n' "$(printf '%s\n' "${stale_tmux_sessions[@]+"${stale_tmux_sessions[@]}"}" | awk 'NF {c+=1} END {print c+0}')"
   printf 'STOPPED_PIDS=%s\n' "$(printf '%s\n' "${pid_targets[@]+"${pid_targets[@]}"}" | join_by_comma)"
   printf 'STOPPED_TMUX_SESSIONS=%s\n' "$(printf '%s\n' "${tmux_sessions[@]+"${tmux_sessions[@]}"}" | join_by_comma)"
+  printf 'STOPPED_STALE_TMUX_SESSIONS=%s\n' "$(printf '%s\n' "${stale_tmux_sessions[@]+"${stale_tmux_sessions[@]}"}" | join_by_comma)"
 }
 
 start_runtime() {

package/tools/bin/provider-cooldown-state.sh

@@ -65,13 +65,13 @@ resolve_backend() {
     return 0
   fi
 
-  if [[ -n "${ACP_ACTIVE_PROVIDER_BACKEND:-${F_LOSNING_ACTIVE_PROVIDER_BACKEND:-}}" ]]; then
-    printf '%s\n' "${ACP_ACTIVE_PROVIDER_BACKEND:-${F_LOSNING_ACTIVE_PROVIDER_BACKEND:-}}"
+  if [[ -n "${ACP_ACTIVE_PROVIDER_BACKEND:-}" ]]; then
+    printf '%s\n' "${ACP_ACTIVE_PROVIDER_BACKEND:-}"
     return 0
   fi
 
-  if [[ -n "${ACP_CODING_WORKER:-${F_LOSNING_CODING_WORKER:-}}" ]]; then
-    printf '%s\n' "${ACP_CODING_WORKER:-${F_LOSNING_CODING_WORKER:-}}"
+  if [[ -n "${ACP_CODING_WORKER:-}" ]]; then
+    printf '%s\n' "${ACP_CODING_WORKER:-}"
     return 0
   fi
 
@@ -79,7 +79,7 @@ resolve_backend() {
 }
 
 resolve_codex_label() {
-  local configured_label="${ACP_ACTIVE_PROVIDER_LABEL:-${F_LOSNING_ACTIVE_PROVIDER_LABEL:-}}"
+  local configured_label="${ACP_ACTIVE_PROVIDER_LABEL:-}"
   local codex_quota_bin=""
   local active_label=""
 
@@ -88,8 +88,8 @@ resolve_codex_label() {
     return 0
   fi
 
-  if [[ -n "${ACP_CODEX_QUOTA_LABEL:-${F_LOSNING_CODEX_QUOTA_LABEL:-}}" ]]; then
-    printf '%s\n' "${ACP_CODEX_QUOTA_LABEL:-${F_LOSNING_CODEX_QUOTA_LABEL:-}}"
+  if [[ -n "${ACP_CODEX_QUOTA_LABEL:-}" ]]; then
+    printf '%s\n' "${ACP_CODEX_QUOTA_LABEL:-}"
     return 0
   fi
 
@@ -108,7 +108,7 @@ resolve_codex_label() {
 resolve_model() {
   local resolved_backend="${1:?backend required}"
   local raw_model="${2:-}"
-  local active_provider_model="${ACP_ACTIVE_PROVIDER_MODEL:-${F_LOSNING_ACTIVE_PROVIDER_MODEL:-}}"
+  local active_provider_model="${ACP_ACTIVE_PROVIDER_MODEL:-}"
 
   if [[ -n "${raw_model}" ]]; then
     printf '%s\n' "${raw_model}"
@@ -121,8 +121,8 @@ resolve_model() {
         printf '%s\n' "${OPENCLAW_MODEL}"
       elif [[ -n "${active_provider_model}" ]]; then
         printf '%s\n' "${active_provider_model}"
-      elif [[ -n "${ACP_OPENCLAW_MODEL:-${F_LOSNING_OPENCLAW_MODEL:-}}" ]]; then
-        printf '%s\n' "${ACP_OPENCLAW_MODEL:-${F_LOSNING_OPENCLAW_MODEL:-}}"
+      elif [[ -n "${ACP_OPENCLAW_MODEL:-}" ]]; then
+        printf '%s\n' "${ACP_OPENCLAW_MODEL:-}"
       else
         flow_config_get "${CONFIG_YAML}" "execution.openclaw.model"
       fi
@@ -132,8 +132,8 @@ resolve_model() {
         printf '%s\n' "${CLAUDE_MODEL}"
       elif [[ -n "${active_provider_model}" ]]; then
         printf '%s\n' "${active_provider_model}"
-      elif [[ -n "${ACP_CLAUDE_MODEL:-${F_LOSNING_CLAUDE_MODEL:-}}" ]]; then
-        printf '%s\n' "${ACP_CLAUDE_MODEL:-${F_LOSNING_CLAUDE_MODEL:-}}"
+      elif [[ -n "${ACP_CLAUDE_MODEL:-}" ]]; then
+        printf '%s\n' "${ACP_CLAUDE_MODEL:-}"
       else
         flow_config_get "${CONFIG_YAML}" "execution.claude.model"
       fi
@@ -143,8 +143,8 @@ resolve_model() {
         printf '%s\n' "${CODEX_PROFILE_SAFE}"
       elif [[ -n "${active_provider_model}" ]]; then
         printf '%s\n' "${active_provider_model}"
-      elif [[ -n "${ACP_CODEX_PROFILE_SAFE:-${F_LOSNING_CODEX_PROFILE_SAFE:-}}" ]]; then
-        printf '%s\n' "${ACP_CODEX_PROFILE_SAFE:-${F_LOSNING_CODEX_PROFILE_SAFE:-}}"
+      elif [[ -n "${ACP_CODEX_PROFILE_SAFE:-}" ]]; then
+        printf '%s\n' "${ACP_CODEX_PROFILE_SAFE:-}"
       else
         flow_config_get "${CONFIG_YAML}" "execution.safe_profile"
       fi

package/tools/bin/render-flow-config.sh

@@ -17,9 +17,6 @@ CONFIG_YAML="$(resolve_flow_config_yaml "${BASH_SOURCE[0]}")"
 for _clean in ACP_CODING_WORKER ACP_OPENCLAW_MODEL ACP_CLAUDE_MODEL \
   ACP_CLAUDE_TIMEOUT_SECONDS ACP_CLAUDE_MAX_ATTEMPTS ACP_CLAUDE_RETRY_BACKOFF_SECONDS \
   ACP_OPENCLAW_THINKING ACP_OPENCLAW_TIMEOUT_SECONDS \
-  F_LOSNING_CODING_WORKER F_LOSNING_OPENCLAW_MODEL F_LOSNING_CLAUDE_MODEL \
-  F_LOSNING_CLAUDE_TIMEOUT_SECONDS F_LOSNING_CLAUDE_MAX_ATTEMPTS F_LOSNING_CLAUDE_RETRY_BACKOFF_SECONDS \
-  F_LOSNING_OPENCLAW_THINKING F_LOSNING_OPENCLAW_TIMEOUT_SECONDS \
   CODING_WORKER; do
   unset "${_clean}" 2>/dev/null || true
 done
@@ -69,33 +66,33 @@ if [[ -f "${PROFILE_NOTES}" ]]; then
 else
   printf 'PROFILE_NOTES_EXISTS=no\n'
 fi
-printf 'EFFECTIVE_REPO_ROOT=%s\n' "$(config_or_env 'ACP_REPO_ROOT F_LOSNING_REPO_ROOT' repo.root)"
-printf 'EFFECTIVE_AGENT_REPO_ROOT=%s\n' "$(config_or_env 'ACP_AGENT_REPO_ROOT F_LOSNING_AGENT_REPO_ROOT' runtime.agent_repo_root)"
-printf 'EFFECTIVE_WORKTREE_ROOT=%s\n' "$(config_or_env 'ACP_WORKTREE_ROOT F_LOSNING_WORKTREE_ROOT' runtime.worktree_root)"
-printf 'EFFECTIVE_RUNS_ROOT=%s\n' "$(config_or_env 'ACP_RUNS_ROOT F_LOSNING_RUNS_ROOT' runtime.runs_root)"
-printf 'EFFECTIVE_STATE_ROOT=%s\n' "$(config_or_env 'ACP_STATE_ROOT F_LOSNING_STATE_ROOT' runtime.state_root)"
-printf 'EFFECTIVE_RETAINED_REPO_ROOT=%s\n' "$(config_or_env 'ACP_RETAINED_REPO_ROOT F_LOSNING_RETAINED_REPO_ROOT' runtime.retained_repo_root)"
-printf 'EFFECTIVE_VSCODE_WORKSPACE_FILE=%s\n' "$(config_or_env 'ACP_VSCODE_WORKSPACE_FILE F_LOSNING_VSCODE_WORKSPACE_FILE' runtime.vscode_workspace_file)"
-printf 'EFFECTIVE_CODING_WORKER=%s\n' "$(config_or_env 'ACP_CODING_WORKER F_LOSNING_CODING_WORKER' execution.coding_worker)"
-printf 'EFFECTIVE_PROVIDER_QUOTA_COOLDOWNS=%s\n' "$(config_or_env 'ACP_PROVIDER_QUOTA_COOLDOWNS F_LOSNING_PROVIDER_QUOTA_COOLDOWNS' execution.provider_quota.cooldowns)"
-printf 'EFFECTIVE_PROVIDER_POOL_ORDER=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_ORDER F_LOSNING_PROVIDER_POOL_ORDER' execution.provider_pool_order)"
-printf 'EFFECTIVE_PROVIDER_POOL_NAME=%s\n' "$(config_or_env 'ACP_ACTIVE_PROVIDER_POOL_NAME F_LOSNING_ACTIVE_PROVIDER_POOL_NAME')"
-printf 'EFFECTIVE_PROVIDER_POOL_BACKEND=%s\n' "$(config_or_env 'ACP_ACTIVE_PROVIDER_BACKEND F_LOSNING_ACTIVE_PROVIDER_BACKEND')"
-printf 'EFFECTIVE_PROVIDER_POOL_MODEL=%s\n' "$(config_or_env 'ACP_ACTIVE_PROVIDER_MODEL F_LOSNING_ACTIVE_PROVIDER_MODEL')"
-printf 'EFFECTIVE_PROVIDER_POOL_KEY=%s\n' "$(config_or_env 'ACP_ACTIVE_PROVIDER_KEY F_LOSNING_ACTIVE_PROVIDER_KEY')"
-printf 'EFFECTIVE_PROVIDER_POOLS_EXHAUSTED=%s\n' "$(config_or_env 'ACP_PROVIDER_POOLS_EXHAUSTED F_LOSNING_PROVIDER_POOLS_EXHAUSTED')"
-printf 'EFFECTIVE_PROVIDER_POOL_SELECTION_REASON=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_SELECTION_REASON F_LOSNING_PROVIDER_POOL_SELECTION_REASON')"
-printf 'EFFECTIVE_PROVIDER_POOL_NEXT_ATTEMPT_EPOCH=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_NEXT_ATTEMPT_EPOCH F_LOSNING_PROVIDER_POOL_NEXT_ATTEMPT_EPOCH')"
-printf 'EFFECTIVE_PROVIDER_POOL_NEXT_ATTEMPT_AT=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_NEXT_ATTEMPT_AT F_LOSNING_PROVIDER_POOL_NEXT_ATTEMPT_AT')"
-printf 'EFFECTIVE_PROVIDER_POOL_LAST_REASON=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_LAST_REASON F_LOSNING_PROVIDER_POOL_LAST_REASON')"
-printf 'EFFECTIVE_CODEX_PROFILE_SAFE=%s\n' "$(config_or_env 'ACP_CODEX_PROFILE_SAFE F_LOSNING_CODEX_PROFILE_SAFE' execution.safe_profile)"
-printf 'EFFECTIVE_CODEX_PROFILE_BYPASS=%s\n' "$(config_or_env 'ACP_CODEX_PROFILE_BYPASS F_LOSNING_CODEX_PROFILE_BYPASS' execution.bypass_profile)"
-printf 'EFFECTIVE_CLAUDE_MODEL=%s\n' "$(config_or_env 'ACP_CLAUDE_MODEL F_LOSNING_CLAUDE_MODEL' execution.claude.model)"
-printf 'EFFECTIVE_CLAUDE_PERMISSION_MODE=%s\n' "$(config_or_env 'ACP_CLAUDE_PERMISSION_MODE F_LOSNING_CLAUDE_PERMISSION_MODE' execution.claude.permission_mode)"
-printf 'EFFECTIVE_CLAUDE_EFFORT=%s\n' "$(config_or_env 'ACP_CLAUDE_EFFORT F_LOSNING_CLAUDE_EFFORT' execution.claude.effort)"
-printf 'EFFECTIVE_CLAUDE_TIMEOUT_SECONDS=%s\n' "$(config_or_env 'ACP_CLAUDE_TIMEOUT_SECONDS F_LOSNING_CLAUDE_TIMEOUT_SECONDS' execution.claude.timeout_seconds)"
-printf 'EFFECTIVE_CLAUDE_MAX_ATTEMPTS=%s\n' "$(config_or_env 'ACP_CLAUDE_MAX_ATTEMPTS F_LOSNING_CLAUDE_MAX_ATTEMPTS' execution.claude.max_attempts)"
-printf 'EFFECTIVE_CLAUDE_RETRY_BACKOFF_SECONDS=%s\n' "$(config_or_env 'ACP_CLAUDE_RETRY_BACKOFF_SECONDS F_LOSNING_CLAUDE_RETRY_BACKOFF_SECONDS' execution.claude.retry_backoff_seconds)"
-printf 'EFFECTIVE_OPENCLAW_MODEL=%s\n' "$(config_or_env 'ACP_OPENCLAW_MODEL F_LOSNING_OPENCLAW_MODEL' execution.openclaw.model)"
-printf 'EFFECTIVE_OPENCLAW_THINKING=%s\n' "$(config_or_env 'ACP_OPENCLAW_THINKING F_LOSNING_OPENCLAW_THINKING' execution.openclaw.thinking)"
-printf 'EFFECTIVE_OPENCLAW_TIMEOUT_SECONDS=%s\n' "$(config_or_env 'ACP_OPENCLAW_TIMEOUT_SECONDS F_LOSNING_OPENCLAW_TIMEOUT_SECONDS' execution.openclaw.timeout_seconds)"
+printf 'EFFECTIVE_REPO_ROOT=%s\n' "$(config_or_env 'ACP_REPO_ROOT' repo.root)"
+printf 'EFFECTIVE_AGENT_REPO_ROOT=%s\n' "$(config_or_env 'ACP_AGENT_REPO_ROOT' runtime.agent_repo_root)"
+printf 'EFFECTIVE_WORKTREE_ROOT=%s\n' "$(config_or_env 'ACP_WORKTREE_ROOT' runtime.worktree_root)"
+printf 'EFFECTIVE_RUNS_ROOT=%s\n' "$(config_or_env 'ACP_RUNS_ROOT' runtime.runs_root)"
+printf 'EFFECTIVE_STATE_ROOT=%s\n' "$(config_or_env 'ACP_STATE_ROOT' runtime.state_root)"
+printf 'EFFECTIVE_RETAINED_REPO_ROOT=%s\n' "$(config_or_env 'ACP_RETAINED_REPO_ROOT' runtime.retained_repo_root)"
+printf 'EFFECTIVE_VSCODE_WORKSPACE_FILE=%s\n' "$(config_or_env 'ACP_VSCODE_WORKSPACE_FILE' runtime.vscode_workspace_file)"
+printf 'EFFECTIVE_CODING_WORKER=%s\n' "$(config_or_env 'ACP_CODING_WORKER' execution.coding_worker)"
+printf 'EFFECTIVE_PROVIDER_QUOTA_COOLDOWNS=%s\n' "$(config_or_env 'ACP_PROVIDER_QUOTA_COOLDOWNS' execution.provider_quota.cooldowns)"
+printf 'EFFECTIVE_PROVIDER_POOL_ORDER=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_ORDER' execution.provider_pool_order)"
+printf 'EFFECTIVE_PROVIDER_POOL_NAME=%s\n' "$(config_or_env 'ACP_ACTIVE_PROVIDER_POOL_NAME')"
+printf 'EFFECTIVE_PROVIDER_POOL_BACKEND=%s\n' "$(config_or_env 'ACP_ACTIVE_PROVIDER_BACKEND')"
+printf 'EFFECTIVE_PROVIDER_POOL_MODEL=%s\n' "$(config_or_env 'ACP_ACTIVE_PROVIDER_MODEL')"
+printf 'EFFECTIVE_PROVIDER_POOL_KEY=%s\n' "$(config_or_env 'ACP_ACTIVE_PROVIDER_KEY')"
+printf 'EFFECTIVE_PROVIDER_POOLS_EXHAUSTED=%s\n' "$(config_or_env 'ACP_PROVIDER_POOLS_EXHAUSTED')"
+printf 'EFFECTIVE_PROVIDER_POOL_SELECTION_REASON=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_SELECTION_REASON')"
+printf 'EFFECTIVE_PROVIDER_POOL_NEXT_ATTEMPT_EPOCH=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_NEXT_ATTEMPT_EPOCH')"
+printf 'EFFECTIVE_PROVIDER_POOL_NEXT_ATTEMPT_AT=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_NEXT_ATTEMPT_AT')"
+printf 'EFFECTIVE_PROVIDER_POOL_LAST_REASON=%s\n' "$(config_or_env 'ACP_PROVIDER_POOL_LAST_REASON')"
+printf 'EFFECTIVE_CODEX_PROFILE_SAFE=%s\n' "$(config_or_env 'ACP_CODEX_PROFILE_SAFE' execution.safe_profile)"
+printf 'EFFECTIVE_CODEX_PROFILE_BYPASS=%s\n' "$(config_or_env 'ACP_CODEX_PROFILE_BYPASS' execution.bypass_profile)"
+printf 'EFFECTIVE_CLAUDE_MODEL=%s\n' "$(config_or_env 'ACP_CLAUDE_MODEL' execution.claude.model)"
+printf 'EFFECTIVE_CLAUDE_PERMISSION_MODE=%s\n' "$(config_or_env 'ACP_CLAUDE_PERMISSION_MODE' execution.claude.permission_mode)"
+printf 'EFFECTIVE_CLAUDE_EFFORT=%s\n' "$(config_or_env 'ACP_CLAUDE_EFFORT' execution.claude.effort)"
+printf 'EFFECTIVE_CLAUDE_TIMEOUT_SECONDS=%s\n' "$(config_or_env 'ACP_CLAUDE_TIMEOUT_SECONDS' execution.claude.timeout_seconds)"
+printf 'EFFECTIVE_CLAUDE_MAX_ATTEMPTS=%s\n' "$(config_or_env 'ACP_CLAUDE_MAX_ATTEMPTS' execution.claude.max_attempts)"
+printf 'EFFECTIVE_CLAUDE_RETRY_BACKOFF_SECONDS=%s\n' "$(config_or_env 'ACP_CLAUDE_RETRY_BACKOFF_SECONDS' execution.claude.retry_backoff_seconds)"
+printf 'EFFECTIVE_OPENCLAW_MODEL=%s\n' "$(config_or_env 'ACP_OPENCLAW_MODEL' execution.openclaw.model)"
+printf 'EFFECTIVE_OPENCLAW_THINKING=%s\n' "$(config_or_env 'ACP_OPENCLAW_THINKING' execution.openclaw.thinking)"
+printf 'EFFECTIVE_OPENCLAW_TIMEOUT_SECONDS=%s\n' "$(config_or_env 'ACP_OPENCLAW_TIMEOUT_SECONDS' execution.openclaw.timeout_seconds)"

package/tools/bin/run-codex-task.sh

@@ -35,7 +35,7 @@ RECONCILE_COMMAND=""
 ADAPTER_ID="$(flow_resolve_adapter_id "${CONFIG_YAML}")"
 ISSUE_SESSION_PREFIX="$(flow_resolve_issue_session_prefix "${CONFIG_YAML}")"
 PR_SESSION_PREFIX="$(flow_resolve_pr_session_prefix "${CONFIG_YAML}")"
-CODING_WORKER="${ACP_CODING_WORKER:-${F_LOSNING_CODING_WORKER:-codex}}"
+CODING_WORKER="${ACP_CODING_WORKER:-codex}"
 CODEX_PROFILE_SAFE="${ACP_CODEX_PROFILE_SAFE:-${F_LOSNING_CODEX_PROFILE_SAFE:-${CODEX_PROFILE_SAFE:-f_losning_safe_auto}}}"
 CODEX_PROFILE_BYPASS="${ACP_CODEX_PROFILE_BYPASS:-${F_LOSNING_CODEX_PROFILE_BYPASS:-${CODEX_PROFILE_BYPASS:-f_losning_yolo}}}"
 if [[ "$MODE" == "bypass" ]]; then
@@ -64,23 +64,47 @@ RESIDENT_OPENCLAW_CONFIG_PATH="${ACP_RESIDENT_OPENCLAW_CONFIG_PATH:-${F_LOSNING_
 OPENCLAW_MODEL="${OPENCLAW_MODEL:-${ACP_OPENCLAW_MODEL:-${F_LOSNING_OPENCLAW_MODEL:-openrouter/qwen/qwen3.6-plus-preview:free}}}"
 OPENCLAW_THINKING="${OPENCLAW_THINKING:-${ACP_OPENCLAW_THINKING:-${F_LOSNING_OPENCLAW_THINKING:-low}}}"
 OPENCLAW_TIMEOUT_SECONDS="${OPENCLAW_TIMEOUT_SECONDS:-${ACP_OPENCLAW_TIMEOUT_SECONDS:-${F_LOSNING_OPENCLAW_TIMEOUT_SECONDS:-900}}}"
+OLLAMA_MODEL="${ACP_OLLAMA_MODEL:-${F_LOSNING_OLLAMA_MODEL:-qwen2.5-coder:7b}}"
+OLLAMA_BASE_URL="${ACP_OLLAMA_BASE_URL:-${F_LOSNING_OLLAMA_BASE_URL:-http://localhost:11434}}"
+OLLAMA_TIMEOUT_SECONDS="${ACP_OLLAMA_TIMEOUT_SECONDS:-${F_LOSNING_OLLAMA_TIMEOUT_SECONDS:-900}}"
+PI_MODEL="${ACP_PI_MODEL:-${F_LOSNING_PI_MODEL:-openrouter/qwen/qwen3.6-plus:free}}"
+PI_THINKING="${ACP_PI_THINKING:-${F_LOSNING_PI_THINKING:-low}}"
+PI_TIMEOUT_SECONDS="${ACP_PI_TIMEOUT_SECONDS:-${F_LOSNING_PI_TIMEOUT_SECONDS:-900}}"
+PI_STALL_SECONDS="${ACP_PI_STALL_SECONDS:-${F_LOSNING_PI_STALL_SECONDS:-300}}"
+OPENCODE_MODEL="${ACP_OPENCODE_MODEL:-${F_LOSNING_OPENCODE_MODEL:-anthropic/claude-sonnet-4-20250514}}"
+OPENCODE_TIMEOUT_SECONDS="${ACP_OPENCODE_TIMEOUT_SECONDS:-${F_LOSNING_OPENCODE_TIMEOUT_SECONDS:-900}}"
+KILO_MODEL="${ACP_KILO_MODEL:-${F_LOSNING_KILO_MODEL:-anthropic/claude-sonnet-4-20250514}}"
+KILO_TIMEOUT_SECONDS="${ACP_KILO_TIMEOUT_SECONDS:-${F_LOSNING_KILO_TIMEOUT_SECONDS:-900}}"
 printf -v SESSION_Q '%q' "$SESSION"
 printf -v CONFIG_YAML_Q '%q' "$CONFIG_YAML"
 printf -v ADAPTER_ID_Q '%q' "$ADAPTER_ID"
-RECONCILE_ENV_PREFIX="ACP_PROJECT_ID=${ADAPTER_ID_Q} AGENT_PROJECT_ID=${ADAPTER_ID_Q} AGENT_CONTROL_PLANE_CONFIG=${CONFIG_YAML_Q} ACP_CONFIG=${CONFIG_YAML_Q}"
+printf -v CANONICAL_REPO_ROOT_Q '%q' "$CANONICAL_REPO_ROOT"
+RECONCILE_ENV_PREFIX="ACP_PROJECT_ID=${ADAPTER_ID_Q} AGENT_PROJECT_ID=${ADAPTER_ID_Q} AGENT_CONTROL_PLANE_CONFIG=${CONFIG_YAML_Q} ACP_CONFIG=${CONFIG_YAML_Q} ACP_ROOT=${CANONICAL_REPO_ROOT_Q} AGENT_CONTROL_PLANE_ROOT=${CANONICAL_REPO_ROOT_Q}"
+
+# The materialized skills surface is cleaned up after each heartbeat cycle.
+# Reconcile runs post-tmux via nohup, after the skills dir is gone.
+# Use the permanent runtime-home/tools/bin path derived from AGENT_PLATFORM_HOME.
+_runtime_tools_bin="${AGENT_PLATFORM_HOME:-${HOME}/.agent-runtime}/runtime-home/tools/bin"
+if [[ -f "${_runtime_tools_bin}/reconcile-pr-worker.sh" ]]; then
+  RECONCILE_ISSUE_BIN="${_runtime_tools_bin}/reconcile-issue-worker.sh"
+  RECONCILE_PR_BIN="${_runtime_tools_bin}/reconcile-pr-worker.sh"
+else
+  RECONCILE_ISSUE_BIN="${WORKSPACE_DIR}/bin/reconcile-issue-worker.sh"
+  RECONCILE_PR_BIN="${WORKSPACE_DIR}/bin/reconcile-pr-worker.sh"
+fi
 
 case "$SESSION" in
   "${ISSUE_SESSION_PREFIX}"*)
     TASK_KIND="issue"
     TASK_ID="${ISSUE_ID:-${SESSION#${ISSUE_SESSION_PREFIX}}}"
     if [[ "${RESIDENT_WORKER_ENABLED}" != "yes" ]]; then
-      RECONCILE_COMMAND="${RECONCILE_ENV_PREFIX} ${WORKSPACE_DIR}/bin/reconcile-issue-worker.sh ${SESSION_Q}"
+      RECONCILE_COMMAND="${RECONCILE_ENV_PREFIX} ${RECONCILE_ISSUE_BIN} ${SESSION_Q}"
     fi
     ;;
   "${PR_SESSION_PREFIX}"*)
     TASK_KIND="pr"
     TASK_ID="${PR_NUMBER:-${SESSION#${PR_SESSION_PREFIX}}}"
-    RECONCILE_COMMAND="${RECONCILE_ENV_PREFIX} ${WORKSPACE_DIR}/bin/reconcile-pr-worker.sh ${SESSION_Q}"
+    RECONCILE_COMMAND="${RECONCILE_ENV_PREFIX} ${RECONCILE_PR_BIN} ${SESSION_Q}"
     ;;
 esac
 
@@ -219,11 +243,36 @@ case "$CODING_WORKER" in
     bash "${FLOW_TOOLS_DIR}/agent-project-run-openclaw-session" "${ARGS[@]}"
     ;;
   opencode)
+    ARGS+=(
+      --opencode-model "${OPENCODE_MODEL}"
+      --opencode-timeout-seconds "${OPENCODE_TIMEOUT_SECONDS}"
+    )
     bash "${FLOW_TOOLS_DIR}/agent-project-run-opencode-session" "${ARGS[@]}"
     ;;
   kilo)
+    ARGS+=(
+      --kilo-model "${KILO_MODEL}"
+      --kilo-timeout-seconds "${KILO_TIMEOUT_SECONDS}"
+    )
     bash "${FLOW_TOOLS_DIR}/agent-project-run-kilo-session" "${ARGS[@]}"
     ;;
+  ollama)
+    ARGS+=(
+      --ollama-model "${OLLAMA_MODEL}"
+      --ollama-base-url "${OLLAMA_BASE_URL}"
+      --ollama-timeout-seconds "${OLLAMA_TIMEOUT_SECONDS}"
+    )
+    bash "${FLOW_TOOLS_DIR}/agent-project-run-ollama-session" "${ARGS[@]}"
+    ;;
+  pi)
+    ARGS+=(
+      --pi-model "${PI_MODEL}"
+      --pi-thinking "${PI_THINKING}"
+      --pi-timeout-seconds "${PI_TIMEOUT_SECONDS}"
+      --pi-stall-seconds "${PI_STALL_SECONDS}"
+    )
+    bash "${FLOW_TOOLS_DIR}/agent-project-run-pi-session" "${ARGS[@]}"
+    ;;
   *)
     echo "unsupported coding worker: ${CODING_WORKER}" >&2
     exit 1

package/tools/bin/scaffold-profile.sh

@@ -22,7 +22,7 @@ Options:
   --worktree-root <path>             Worktree parent root
   --retained-repo-root <path>        Optional retained/manual checkout root
   --vscode-workspace-file <path>     Optional VS Code workspace file
-  --coding-worker <codex|openclaw|claude>
+  --coding-worker <codex|openclaw|claude|ollama|pi|opencode|kilo>
                                      Default coding backend (default: openclaw)
   --claude-model <model>             Claude model alias or full name
   --claude-permission-mode <mode>    Claude permission mode (default: acceptEdits)
@@ -97,9 +97,9 @@ if [[ ! "$profile_id" =~ ^[a-z0-9][a-z0-9-]*$ ]]; then
 fi
 
 case "$coding_worker" in
-  codex|openclaw|claude) ;;
+  codex|openclaw|claude|ollama|pi|opencode|kilo) ;;
   *)
-    echo "--coding-worker must be codex, openclaw, or claude" >&2
+    echo "--coding-worker must be codex, openclaw, claude, ollama, pi, opencode, or kilo" >&2
     exit 1
     ;;
 esac
@@ -271,6 +271,21 @@ execution:
     model: "${openclaw_model}"
     thinking: "${openclaw_thinking}"
     timeout_seconds: ${openclaw_timeout_seconds}
+  ollama:
+    model: "qwen2.5-coder:7b"
+    base_url: "http://localhost:11434"
+    timeout_seconds: 900
+  pi:
+    model: "openrouter/qwen/qwen3.6-plus:free"
+    thinking: "low"
+    timeout_seconds: 900
+    stall_seconds: 300
+  opencode:
+    model: "anthropic/claude-sonnet-4-20250514"
+    timeout_seconds: 900
+  kilo:
+    model: "anthropic/claude-sonnet-4-20250514"
+    timeout_seconds: 900
   review_requires_independent_final_review: true
   verification:
     web_playwright_command: "pnpm exec playwright test"

package/tools/bin/start-issue-worker.sh

@@ -30,7 +30,7 @@ LOCAL_INSTALL_POLICY_BIN="${WORKSPACE_DIR}/bin/issue-requires-local-workspace-in
 SESSION="${ISSUE_SESSION_PREFIX}${ISSUE_ID}"
 RUN_DIR="${RUNS_ROOT}/${SESSION}"
 UPDATE_LABELS_BIN="${WORKSPACE_DIR}/bin/agent-github-update-labels"
-CODING_WORKER="${ACP_CODING_WORKER:-${F_LOSNING_CODING_WORKER:-codex}}"
+CODING_WORKER="${ACP_CODING_WORKER:-codex}"
 launch_success="no"
 label_rollback_armed="no"
 RECURRING_CHECKLIST_SYNC_BIN="${FLOW_TOOLS_DIR}/sync-recurring-issue-checklist.sh"
@@ -54,6 +54,9 @@ rollback_labels_on_failure() {
   if [[ "${label_rollback_armed}" != "yes" || "${launch_success}" == "yes" ]]; then
     return 0
   fi
+  if [[ -d "${RUN_DIR}" && ! -f "${RUN_DIR}/run.env" && ! -f "${RUN_DIR}/runner.env" && ! -f "${RUN_DIR}/result.env" ]]; then
+    rm -rf "${RUN_DIR}" >/dev/null 2>&1 || true
+  fi
   if [[ -x "${UPDATE_LABELS_BIN}" ]]; then
     bash "${UPDATE_LABELS_BIN}" --repo-slug "${REPO_SLUG}" --number "${ISSUE_ID}" --remove agent-running >/dev/null 2>&1 || true
   fi

package/tools/bin/start-pr-fix-worker.sh

@@ -33,6 +33,9 @@ rollback_labels_on_failure() {
   if [[ "${label_rollback_armed}" != "yes" || "${launch_success}" == "yes" ]]; then
     return 0
   fi
+  if [[ -d "${RUN_DIR}" && ! -f "${RUN_DIR}/run.env" && ! -f "${RUN_DIR}/runner.env" && ! -f "${RUN_DIR}/result.env" ]]; then
+    rm -rf "${RUN_DIR}" >/dev/null 2>&1 || true
+  fi
   if [[ -x "${UPDATE_LABELS_BIN}" ]]; then
     bash "${UPDATE_LABELS_BIN}" --repo-slug "${REPO_SLUG}" --number "${PR_NUMBER}" --remove agent-running >/dev/null 2>&1 || true
   fi
@@ -130,6 +133,34 @@ PR_LINKED_ISSUE_ID="$(jq -r '.linkedIssueId // ""' <<<"$RISK_JSON")"
 PR_FILES_TEXT="$(jq -r '.files[] | "- " + .' <<<"$RISK_JSON")"
 PR_REPO_ROOT="$(flow_resolve_repo_root "${CONFIG_YAML}")"
 PR_DEPENDENCY_SOURCE_ROOT="${ACP_DEPENDENCY_SOURCE_ROOT:-${F_LOSNING_DEPENDENCY_SOURCE_ROOT:-$PR_REPO_ROOT}}"
+render_pr_context_reads_text() {
+  local repo_root="${1:?repo root required}"
+  local -a candidate_paths=(
+    "${repo_root}/AGENTS.md"
+    "${repo_root}/openspec/AGENT_RULES.md"
+    "${repo_root}/openspec/AGENTS.md"
+    "${repo_root}/openspec/project.md"
+    "${repo_root}/openspec/CONVENTIONS.md"
+    "${repo_root}/docs/TESTING_AND_SEED_POLICY.md"
+  )
+  local -a existing_paths=()
+  local candidate_path=""
+
+  for candidate_path in "${candidate_paths[@]}"; do
+    if [[ -f "${candidate_path}" ]]; then
+      existing_paths+=("${candidate_path}")
+    fi
+  done
+
+  if [[ "${#existing_paths[@]}" -eq 0 ]]; then
+    printf '%s\n' '- No repo-specific context files were found under the expected AGENTS/OpenSpec/testing-doc locations; rely on the current diff and nearby source.'
+    return 0
+  fi
+
+  printf '%s\n' "${existing_paths[@]}" | sed 's/^/- `/' | sed 's/$/`/'
+}
+
+PR_CONTEXT_READS_TEXT="$(render_pr_context_reads_text "${PR_REPO_ROOT}")"
 PR_CHECK_FAILURES_TEXT="$(jq -r '(.checkFailures + .pendingChecks)[]? | "- " + .' <<<"$RISK_JSON")"
 if [[ -z "$PR_CHECK_FAILURES_TEXT" ]]; then
   PR_CHECK_FAILURES_TEXT="- none reported"
@@ -290,6 +321,7 @@ PR_MERGE_STATE_STATUS="$PR_MERGE_STATE_STATUS" \
 PR_MERGEABLE_STATUS="$PR_MERGEABLE_STATUS" \
 PR_CHECKS_TEXT="$PR_CHECKS_TEXT" \
 PR_FILES_TEXT="$PR_FILES_TEXT" \
+PR_CONTEXT_READS_TEXT="$PR_CONTEXT_READS_TEXT" \
 PR_CHECK_FAILURES_TEXT="$PR_CHECK_FAILURES_TEXT" \
 PR_MISSING_REASONS_TEXT="$PR_MISSING_REASONS_TEXT" \
 PR_REVIEW_FINDINGS_TEXT="$PR_REVIEW_FINDINGS_TEXT" \
@@ -400,6 +432,7 @@ const replacements = {
   '{PR_MERGEABLE_STATUS}': process.env.PR_MERGEABLE_STATUS || '',
   '{PR_CHECKS_TEXT}': process.env.PR_CHECKS_TEXT || '',
   '{PR_FILES_TEXT}': process.env.PR_FILES_TEXT || '',
+  '{PR_CONTEXT_READS_TEXT}': process.env.PR_CONTEXT_READS_TEXT || '',
   '{PR_CHECK_FAILURES_TEXT}': process.env.PR_CHECK_FAILURES_TEXT || '',
   '{PR_MISSING_REASONS_TEXT}': process.env.PR_MISSING_REASONS_TEXT || '',
   '{PR_REVIEW_FINDINGS_TEXT}': process.env.PR_REVIEW_FINDINGS_TEXT || '',