agent-control-plane 0.1.16 → 0.3.0

package/tools/bin/project-launchd-bootstrap.sh

@@ -4,16 +4,9 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 FLOW_SKILL_DIR="$(cd "${SCRIPT_DIR}/../.." && pwd)"
 HOME_DIR="${ACP_PROJECT_RUNTIME_HOME_DIR:-${HOME:-}}"
-SOURCE_HOME="${ACP_PROJECT_RUNTIME_SOURCE_HOME:-}"
-RUNTIME_HOME="${ACP_PROJECT_RUNTIME_RUNTIME_HOME:-${HOME_DIR}/.agent-runtime/runtime-home}"
 PROFILE_REGISTRY_ROOT="${ACP_PROJECT_RUNTIME_PROFILE_REGISTRY_ROOT:-${ACP_PROFILE_REGISTRY_ROOT:-${HOME_DIR}/.agent-runtime/control-plane/profiles}}"
 PROFILE_ID="${ACP_PROJECT_RUNTIME_PROFILE_ID:-${ACP_PROJECT_ID:-${AGENT_PROJECT_ID:-}}}"
 ENV_FILE="${ACP_PROJECT_RUNTIME_ENV_FILE:-${PROFILE_REGISTRY_ROOT}/${PROFILE_ID}/runtime.env}"
-BASE_PATH="${ACP_PROJECT_RUNTIME_PATH:-/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin}"
-SYNC_SCRIPT="${ACP_PROJECT_RUNTIME_SYNC_SCRIPT:-${FLOW_SKILL_DIR}/tools/bin/sync-shared-agent-home.sh}"
-ENSURE_SYNC_SCRIPT="${ACP_PROJECT_RUNTIME_ENSURE_SYNC_SCRIPT:-${FLOW_SKILL_DIR}/tools/bin/ensure-runtime-sync.sh}"
-RUNTIME_HEARTBEAT_SCRIPT="${ACP_PROJECT_RUNTIME_HEARTBEAT_SCRIPT:-${RUNTIME_HOME}/skills/openclaw/agent-control-plane/tools/bin/heartbeat-safe-auto.sh}"
-ALWAYS_SYNC="${ACP_PROJECT_RUNTIME_ALWAYS_SYNC:-0}"
 
 if [[ -z "${HOME_DIR}" ]]; then
   echo "project launchd bootstrap requires HOME or ACP_PROJECT_RUNTIME_HOME_DIR" >&2
@@ -26,7 +19,6 @@ if [[ -z "${PROFILE_ID}" ]]; then
 fi
 
 export HOME="${HOME_DIR}"
-export PATH="${BASE_PATH}"
 export ACP_PROFILE_REGISTRY_ROOT="${PROFILE_REGISTRY_ROOT}"
 export ACP_PROJECT_ID="${PROFILE_ID}"
 export AGENT_PROJECT_ID="${PROFILE_ID}"
@@ -38,6 +30,17 @@ if [[ -f "${ENV_FILE}" ]]; then
   set +a
 fi
 
+# Resolve launch paths after runtime.env overrides are loaded so launchd can
+# pin the project runtime to a source checkout or alternate runtime home.
+SOURCE_HOME="${ACP_PROJECT_RUNTIME_SOURCE_HOME:-}"
+RUNTIME_HOME="${ACP_PROJECT_RUNTIME_RUNTIME_HOME:-${HOME_DIR}/.agent-runtime/runtime-home}"
+BASE_PATH="${ACP_PROJECT_RUNTIME_PATH:-/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin}"
+SYNC_SCRIPT="${ACP_PROJECT_RUNTIME_SYNC_SCRIPT:-${FLOW_SKILL_DIR}/tools/bin/sync-shared-agent-home.sh}"
+ENSURE_SYNC_SCRIPT="${ACP_PROJECT_RUNTIME_ENSURE_SYNC_SCRIPT:-${FLOW_SKILL_DIR}/tools/bin/ensure-runtime-sync.sh}"
+RUNTIME_HEARTBEAT_SCRIPT="${ACP_PROJECT_RUNTIME_HEARTBEAT_SCRIPT:-${RUNTIME_HOME}/skills/openclaw/agent-control-plane/tools/bin/heartbeat-safe-auto.sh}"
+ALWAYS_SYNC="${ACP_PROJECT_RUNTIME_ALWAYS_SYNC:-0}"
+export PATH="${BASE_PATH}"
+
 if [[ ! -x "${ENSURE_SYNC_SCRIPT}" && ! -x "${SYNC_SCRIPT}" ]]; then
   echo "project launchd bootstrap missing sync helper: ${ENSURE_SYNC_SCRIPT}" >&2
   exit 65

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}" && "${active_session_count}" == "0" && ( -n "${shared_loop}" || "${controller_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/reconcile-bootstrap-lib.sh

@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+# reconcile-bootstrap-lib.sh — shared bootstrap helpers for reconcile scripts.
+# Sourced by both agent-project-reconcile-pr-session and
+# agent-project-reconcile-issue-session to avoid duplicating the bootstrap
+# preamble.
+
+bootstrap_flow_shell_lib() {
+  local candidate=""
+  local skill_name=""
+
+  for candidate in \
+    "${SCRIPT_DIR}/flow-shell-lib.sh" \
+    "${AGENT_CONTROL_PLANE_ROOT:-}/tools/bin/flow-shell-lib.sh" \
+    "${ACP_ROOT:-}/tools/bin/flow-shell-lib.sh" \
+    "${F_LOSNING_FLOW_ROOT:-}/tools/bin/flow-shell-lib.sh" \
+    "${AGENT_FLOW_SKILL_ROOT:-}/tools/bin/flow-shell-lib.sh" \
+    "${SHARED_AGENT_HOME:-}/tools/bin/flow-shell-lib.sh" \
+    "$(pwd)/tools/bin/flow-shell-lib.sh"; do
+    if [[ -n "${candidate}" && -f "${candidate}" ]]; then
+      printf '%s\n' "${candidate}"
+      return 0
+    fi
+  done
+
+  if [[ -n "${SHARED_AGENT_HOME:-}" ]]; then
+    for skill_name in "${AGENT_CONTROL_PLANE_SKILL_NAME:-agent-control-plane}" "${AGENT_CONTROL_PLANE_COMPAT_ALIAS:-}"; do
+      [[ -n "${skill_name}" ]] || continue
+      candidate="${SHARED_AGENT_HOME}/skills/openclaw/${skill_name}/tools/bin/flow-shell-lib.sh"
+      if [[ -f "${candidate}" ]]; then
+        printf '%s\n' "${candidate}"
+        return 0
+      fi
+    done
+  fi
+
+  echo "unable to locate flow-shell-lib.sh for reconcile bootstrap" >&2
+  return 1
+}
+
+FLOW_SHELL_LIB_PATH="$(bootstrap_flow_shell_lib)"
+BOOTSTRAP_TOOLS_DIR="$(cd "$(dirname "${FLOW_SHELL_LIB_PATH}")" && pwd)"
+# shellcheck source=/dev/null
+source "${FLOW_SHELL_LIB_PATH}"
+
+resolve_reconcile_tools_dir() {
+  local candidate_root=""
+  local skill_name=""
+
+  for candidate_root in \
+    "${AGENT_CONTROL_PLANE_ROOT:-}" \
+    "${ACP_ROOT:-}" \
+    "${F_LOSNING_FLOW_ROOT:-}" \
+    "${AGENT_FLOW_SKILL_ROOT:-}"; do
+    if [[ -n "${candidate_root}" && -d "${candidate_root}/tools/bin" ]]; then
+      printf '%s/tools/bin\n' "${candidate_root}"
+      return 0
+    fi
+  done
+
+  if [[ -n "${SHARED_AGENT_HOME:-}" ]]; then
+    if [[ -d "${SHARED_AGENT_HOME}/tools/bin" ]]; then
+      printf '%s/tools/bin\n' "${SHARED_AGENT_HOME}"
+      return 0
+    fi
+    for skill_name in "${AGENT_CONTROL_PLANE_SKILL_NAME:-agent-control-plane}" "${AGENT_CONTROL_PLANE_COMPAT_ALIAS:-}"; do
+      [[ -n "${skill_name}" ]] || continue
+      candidate_root="${SHARED_AGENT_HOME}/skills/openclaw/${skill_name}"
+      if [[ -d "${candidate_root}/tools/bin" ]]; then
+        printf '%s/tools/bin\n' "${candidate_root}"
+        return 0
+      fi
+    done
+  fi
+
+  if [[ -d "${SCRIPT_DIR}" ]]; then
+    printf '%s\n' "${SCRIPT_DIR}"
+    return 0
+  fi
+
+  printf '%s\n' "${BOOTSTRAP_TOOLS_DIR}"
+}
+
+shared_tools_dir="$(resolve_reconcile_tools_dir)"
+resolve_reconcile_helper_path() {
+  local helper_name="${1:?helper name required}"
+  local candidate=""
+
+  for candidate in \
+    "${SCRIPT_DIR}/${helper_name}" \
+    "${BOOTSTRAP_TOOLS_DIR}/${helper_name}" \
+    "${shared_tools_dir}/${helper_name}"; do
+    if [[ -n "${candidate}" && -f "${candidate}" ]]; then
+      printf '%s\n' "${candidate}"
+      return 0
+    fi
+  done
+
+  echo "unable to locate ${helper_name} for reconcile bootstrap" >&2
+  return 1
+}
+
+FLOW_CONFIG_LIB_PATH="$(resolve_reconcile_helper_path "flow-config-lib.sh")"
+# shellcheck source=/dev/null
+source "${FLOW_CONFIG_LIB_PATH}"
+
+require_transition() {
+  local step="${1:?step required}"
+  shift
+  if ! "$@"; then
+    echo "reconcile transition failed: ${step}" >&2
+    exit 1
+  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)"