agent-control-plane 0.2.0 → 0.3.0

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

@@ -2,82 +2,33 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-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
+RECONCILE_BOOTSTRAP_LIB=""
+for _rbl_candidate in \
+  "${SCRIPT_DIR}/reconcile-bootstrap-lib.sh" \
+  "${AGENT_CONTROL_PLANE_ROOT:-}/tools/bin/reconcile-bootstrap-lib.sh" \
+  "${ACP_ROOT:-}/tools/bin/reconcile-bootstrap-lib.sh" \
+  "${SHARED_AGENT_HOME:-}/tools/bin/reconcile-bootstrap-lib.sh"; do
+  if [[ -n "${_rbl_candidate}" && -f "${_rbl_candidate}" ]]; then
+    RECONCILE_BOOTSTRAP_LIB="${_rbl_candidate}"
+    break
   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
+done
+if [[ -n "${SHARED_AGENT_HOME:-}" && -z "${RECONCILE_BOOTSTRAP_LIB}" ]]; then
+  for _rbl_skill in "${AGENT_CONTROL_PLANE_SKILL_NAME:-agent-control-plane}" "${AGENT_CONTROL_PLANE_COMPAT_ALIAS:-}"; do
+    [[ -n "${_rbl_skill}" ]] || continue
+    _rbl_candidate="${SHARED_AGENT_HOME}/skills/openclaw/${_rbl_skill}/tools/bin/reconcile-bootstrap-lib.sh"
+    if [[ -f "${_rbl_candidate}" ]]; then
+      RECONCILE_BOOTSTRAP_LIB="${_rbl_candidate}"
+      break
     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}"
-}
+fi
+if [[ -z "${RECONCILE_BOOTSTRAP_LIB}" ]]; then
+  echo "unable to locate reconcile-bootstrap-lib.sh" >&2
+  exit 1
+fi
+# shellcheck source=/dev/null
+source "${RECONCILE_BOOTSTRAP_LIB}"
 
 usage() {
   cat <<'EOF'
@@ -89,30 +40,8 @@ allowing project adapters to inject policy hooks.
 EOF
 }
 
-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")"
 FLOW_RESIDENT_WORKER_LIB_PATH="$(resolve_reconcile_helper_path "flow-resident-worker-lib.sh")"
 # shellcheck source=/dev/null
-source "${FLOW_CONFIG_LIB_PATH}"
-# shellcheck source=/dev/null
 source "${FLOW_RESIDENT_WORKER_LIB_PATH}"
 session=""
 repo_slug=""
@@ -1053,15 +982,6 @@ extract_recovery_worktree_from_publish_output() {
   awk -F= '/^RECOVERY_WORKTREE=/{print $2}' <<<"$publish_out" | tail -n 1
 }
 
-require_transition() {
-  local step="${1:?step required}"
-  shift
-  if ! "$@"; then
-    echo "reconcile transition failed: ${step}" >&2
-    exit 1
-  fi
-}
-
 mark_reconciled() {
   local reconciled_at tmp_file
   if [[ -d "$run_dir" ]]; then
@@ -1141,6 +1061,40 @@ update_resident_issue_metadata() {
     "LAST_WORKTREE_REUSED=${last_worktree_reused:-no}"
 }
 
+cleanup_output_value() {
+  local cleanup_output="${1:-}"
+  local key="${2:?key required}"
+  awk -F= -v target_key="${key}" '$1 == target_key { print substr($0, index($0, "=") + 1); exit }' <<<"${cleanup_output}"
+}
+
+warn_cleanup_issue_session() {
+  local cleanup_output="${1:-}"
+  local cleanup_exit="${2:-0}"
+  local cleanup_status=""
+  local cleanup_mode=""
+  local cleanup_error=""
+
+  cleanup_status="$(cleanup_output_value "${cleanup_output}" "CLEANUP_STATUS")"
+  if [[ -z "${cleanup_status}" ]]; then
+    cleanup_status="${cleanup_exit}"
+  fi
+  [[ "${cleanup_status}" != "0" ]] || return 0
+
+  cleanup_mode="$(cleanup_output_value "${cleanup_output}" "CLEANUP_MODE")"
+  cleanup_error="$(cleanup_output_value "${cleanup_output}" "CLEANUP_ERROR")"
+  printf '[%s] issue cleanup warning session=%s status=%s mode=%s\n' \
+    "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
+    "${session}" \
+    "${cleanup_status}" \
+    "${cleanup_mode:-unknown}" >&2
+  if [[ -n "${cleanup_error}" ]]; then
+    printf '[%s] issue cleanup detail session=%s %s\n' \
+      "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
+      "${session}" \
+      "${cleanup_error}" >&2
+  fi
+}
+
 cleanup_issue_session() {
   local -a cleanup_args=(
     --repo-root "$repo_root"
@@ -1156,7 +1110,14 @@ cleanup_issue_session() {
     cleanup_args+=(--skip-worktree-cleanup)
   fi
 
-  "${shared_tools_dir}/agent-project-cleanup-session" "${cleanup_args[@]}" >/dev/null
+  local cleanup_output=""
+  local cleanup_exit="0"
+  if cleanup_output="$("${shared_tools_dir}/agent-project-cleanup-session" "${cleanup_args[@]}" 2>&1)"; then
+    cleanup_exit="0"
+  else
+    cleanup_exit="$?"
+  fi
+  warn_cleanup_issue_session "${cleanup_output}" "${cleanup_exit}"
 }
 
 notify_issue_reconciled() {

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

@@ -2,82 +2,33 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-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
+RECONCILE_BOOTSTRAP_LIB=""
+for _rbl_candidate in \
+  "${SCRIPT_DIR}/reconcile-bootstrap-lib.sh" \
+  "${AGENT_CONTROL_PLANE_ROOT:-}/tools/bin/reconcile-bootstrap-lib.sh" \
+  "${ACP_ROOT:-}/tools/bin/reconcile-bootstrap-lib.sh" \
+  "${SHARED_AGENT_HOME:-}/tools/bin/reconcile-bootstrap-lib.sh"; do
+  if [[ -n "${_rbl_candidate}" && -f "${_rbl_candidate}" ]]; then
+    RECONCILE_BOOTSTRAP_LIB="${_rbl_candidate}"
+    break
   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
+done
+if [[ -n "${SHARED_AGENT_HOME:-}" && -z "${RECONCILE_BOOTSTRAP_LIB}" ]]; then
+  for _rbl_skill in "${AGENT_CONTROL_PLANE_SKILL_NAME:-agent-control-plane}" "${AGENT_CONTROL_PLANE_COMPAT_ALIAS:-}"; do
+    [[ -n "${_rbl_skill}" ]] || continue
+    _rbl_candidate="${SHARED_AGENT_HOME}/skills/openclaw/${_rbl_skill}/tools/bin/reconcile-bootstrap-lib.sh"
+    if [[ -f "${_rbl_candidate}" ]]; then
+      RECONCILE_BOOTSTRAP_LIB="${_rbl_candidate}"
+      break
     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}"
-}
+fi
+if [[ -z "${RECONCILE_BOOTSTRAP_LIB}" ]]; then
+  echo "unable to locate reconcile-bootstrap-lib.sh" >&2
+  exit 1
+fi
+# shellcheck source=/dev/null
+source "${RECONCILE_BOOTSTRAP_LIB}"
 
 usage() {
   cat <<'EOF'
@@ -89,28 +40,6 @@ allowing project adapters to inject policy hooks.
 EOF
 }
 
-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}"
 verification_guard_script="${shared_tools_dir}/branch-verification-guard.sh"
 session=""
 repo_slug=""
@@ -257,6 +186,40 @@ if [[ "$status" == "RUNNING" && "$pr_state" != "MERGED" && "$pr_state" != "CLOSE
   exit 0
 fi
 
+cleanup_output_value() {
+  local cleanup_output="${1:-}"
+  local key="${2:?key required}"
+  awk -F= -v target_key="${key}" '$1 == target_key { print substr($0, index($0, "=") + 1); exit }' <<<"${cleanup_output}"
+}
+
+warn_cleanup_pr_session() {
+  local cleanup_output="${1:-}"
+  local cleanup_exit="${2:-0}"
+  local cleanup_status=""
+  local cleanup_mode=""
+  local cleanup_error=""
+
+  cleanup_status="$(cleanup_output_value "${cleanup_output}" "CLEANUP_STATUS")"
+  if [[ -z "${cleanup_status}" ]]; then
+    cleanup_status="${cleanup_exit}"
+  fi
+  [[ "${cleanup_status}" != "0" ]] || return 0
+
+  cleanup_mode="$(cleanup_output_value "${cleanup_output}" "CLEANUP_MODE")"
+  cleanup_error="$(cleanup_output_value "${cleanup_output}" "CLEANUP_ERROR")"
+  printf '[%s] pr cleanup warning session=%s status=%s mode=%s\n' \
+    "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
+    "${session}" \
+    "${cleanup_status}" \
+    "${cleanup_mode:-unknown}" >&2
+  if [[ -n "${cleanup_error}" ]]; then
+    printf '[%s] pr cleanup detail session=%s %s\n' \
+      "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
+      "${session}" \
+      "${cleanup_error}" >&2
+  fi
+}
+
 review_pass_action_from_result_action() {
   case "${1:-}" in
     host-advance-double-check-2)
@@ -684,15 +647,6 @@ attempt_blocked_pr_host_verification_recovery() {
   return 0
 }
 
-require_transition() {
-  local step="${1:?step required}"
-  shift
-  if ! "$@"; then
-    echo "reconcile transition failed: ${step}" >&2
-    exit 1
-  fi
-}
-
 close_linked_issue_if_open() {
   local issue_id="${1:-}"
   [[ -n "$issue_id" ]] || return 0
@@ -957,13 +911,24 @@ approve_and_merge() {
 }
 
 cleanup_pr_session() {
-  "${shared_tools_dir}/agent-project-cleanup-session" \
-    --repo-root "$repo_root" \
-    --runs-root "$runs_root" \
-    --history-root "$history_root" \
-    --session "$session" \
-    --worktree "$pr_worktree" \
-    --mode pr >/dev/null || true
+  local cleanup_output=""
+  local cleanup_exit="0"
+
+  if cleanup_output="$(
+    "${shared_tools_dir}/agent-project-cleanup-session" \
+      --repo-root "$repo_root" \
+      --runs-root "$runs_root" \
+      --history-root "$history_root" \
+      --session "$session" \
+      --worktree "$pr_worktree" \
+      --mode pr 2>&1
+  )"; then
+    cleanup_exit="0"
+  else
+    cleanup_exit="$?"
+  fi
+
+  warn_cleanup_pr_session "${cleanup_output}" "${cleanup_exit}"
 }
 
 notify_pr_reconciled() {

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

@@ -364,6 +364,16 @@ EOF
   done
 fi
 
+# Always collect result.env from sandbox to artifact_dir
+collect_copy_snippet+=$(
+  cat <<EOF
+if [[ -f ${sandbox_run_dir_q}/result.env ]]; then
+  cp ${sandbox_run_dir_q}/result.env ${artifact_dir_q}/result.env
+fi
+EOF
+)
+collect_copy_snippet+=$'\n'
+
 reconcile_snippet=""
 if [[ -n "$reconcile_command" ]]; then
   printf -v delayed_reconcile_q '%q' "export ACP_EXPECTED_RUN_STARTED_AT=${started_at_q}; export F_LOSNING_EXPECTED_RUN_STARTED_AT=${started_at_q}; while tmux has-session -t ${session_q} 2>/dev/null; do sleep 1; done; sleep 2; $reconcile_command"

package/tools/bin/agent-project-run-codex-resilient

@@ -38,6 +38,23 @@ auth_refresh_poll_seconds="${ACP_CODEX_AUTH_REFRESH_POLL_SECONDS:-${F_LOSNING_CO
 max_quota_autoswitch_attempts="${ACP_CODEX_MAX_AUTOSWITCH_ATTEMPTS:-${F_LOSNING_CODEX_MAX_AUTOSWITCH_ATTEMPTS:-1}}"
 codex_progress_heartbeat_seconds="${ACP_CODEX_PROGRESS_HEARTBEAT_SECONDS:-${F_LOSNING_CODEX_PROGRESS_HEARTBEAT_SECONDS:-30}}"
 codex_stall_seconds="${ACP_CODEX_STALL_SECONDS:-${F_LOSNING_CODEX_STALL_SECONDS:-300}}"
+python_bin=""
+
+resolve_python_bin() {
+  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
+}
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
@@ -92,6 +109,12 @@ case "$codex_stall_seconds" in
   ''|*[!0-9]*) echo "ACP_CODEX_STALL_SECONDS must be numeric" >&2; exit 1 ;;
 esac
 
+python_bin="$(resolve_python_bin || true)"
+if [[ -z "$python_bin" || ! -x "$python_bin" ]]; then
+  echo "unable to resolve a runnable python interpreter for codex supervision" >&2
+  exit 1
+fi
+
 FLOW_SKILL_DIR="$(resolve_flow_skill_dir "${BASH_SOURCE[0]}")"
 state_file="${host_run_dir}/runner.env"
 auth_file="${HOME}/.codex/auth.json"
@@ -177,7 +200,7 @@ run_with_timeout() {
   local timeout_seconds="${1:?timeout seconds required}"
   shift
 
-  /opt/homebrew/bin/python3 - "$timeout_seconds" "$@" <<'PY'
+  "$python_bin" - "$timeout_seconds" "$@" <<'PY'
 import os
 import signal
 import subprocess
@@ -220,6 +243,60 @@ sys.exit(proc.returncode)
 PY
 }
 
+stat_file_size() {
+  local path="${1:?path required}"
+  local value=""
+
+  value="$(stat -f %z "$path" 2>/dev/null || true)"
+  if [[ "$value" =~ ^[0-9]+$ ]]; then
+    printf '%s\n' "$value"
+    return 0
+  fi
+
+  value="$(stat -c %s "$path" 2>/dev/null || true)"
+  if [[ "$value" =~ ^[0-9]+$ ]]; then
+    printf '%s\n' "$value"
+    return 0
+  fi
+
+  "$python_bin" - "$path" <<'PY'
+import os
+import sys
+
+try:
+    print(os.path.getsize(sys.argv[1]))
+except OSError:
+    print("0")
+PY
+}
+
+stat_file_mtime() {
+  local path="${1:?path required}"
+  local value=""
+
+  value="$(stat -f %m "$path" 2>/dev/null || true)"
+  if [[ "$value" =~ ^[0-9]+$ ]]; then
+    printf '%s\n' "$value"
+    return 0
+  fi
+
+  value="$(stat -c %Y "$path" 2>/dev/null || true)"
+  if [[ "$value" =~ ^[0-9]+$ ]]; then
+    printf '%s\n' "$value"
+    return 0
+  fi
+
+  "$python_bin" - "$path" <<'PY'
+import os
+import sys
+
+try:
+    print(int(os.path.getmtime(sys.argv[1])))
+except OSError:
+    print("0")
+PY
+}
+
 auth_fingerprint() {
   if [[ ! -f "$auth_file" ]]; then
     printf 'missing\n'
@@ -227,8 +304,8 @@ auth_fingerprint() {
   fi
 
   local mtime size sha
-  mtime="$(stat -f %m "$auth_file" 2>/dev/null || printf '0')"
-  size="$(stat -f %z "$auth_file" 2>/dev/null || printf '0')"
+  mtime="$(stat_file_mtime "$auth_file" 2>/dev/null || printf '0')"
+  size="$(stat_file_size "$auth_file" 2>/dev/null || printf '0')"
   sha="$(shasum -a 256 "$auth_file" | awk '{print $1}')"
   printf '%s:%s:%s\n' "$mtime" "$size" "$sha"
 }
@@ -256,8 +333,8 @@ quota_switch_signature() {
   fi
 
   local mtime size sha
-  mtime="$(stat -f %m "$quota_switch_state_file" 2>/dev/null || printf '0')"
-  size="$(stat -f %z "$quota_switch_state_file" 2>/dev/null || printf '0')"
+  mtime="$(stat_file_mtime "$quota_switch_state_file" 2>/dev/null || printf '0')"
+  size="$(stat_file_size "$quota_switch_state_file" 2>/dev/null || printf '0')"
   sha="$(shasum -a 256 "$quota_switch_state_file" | awk '{print $1}')"
   printf '%s:%s:%s\n' "$mtime" "$size" "$sha"
 }
@@ -390,7 +467,7 @@ run_quota_autoswitch() {
 new_output_since() {
   local start_size="${1:?start size required}"
   local file_size
-  file_size="$(stat -f %z "$output_file" 2>/dev/null || printf '0')"
+  file_size="$(stat_file_size "$output_file" 2>/dev/null || printf '0')"
   if (( file_size <= start_size )); then
     return 0
   fi
@@ -456,7 +533,7 @@ stream_codex_exec() {
   local progress_file=""
   local line=""
 
-  last_attempt_start_size="$(stat -f %z "$output_file" 2>/dev/null || printf '0')"
+  last_attempt_start_size="$(stat_file_size "$output_file" 2>/dev/null || printf '0')"
   last_attempt_started_epoch="$(date +%s)"
   progress_file="${host_run_dir}/.codex-progress.$$"
   rm -f "$progress_file"
@@ -514,7 +591,7 @@ stream_codex_exec() {
             break
           fi
         else
-          last_progress_epoch="$(stat -f %m "$progress_file" 2>/dev/null || printf '0')"
+          last_progress_epoch="$(stat_file_mtime "$progress_file" 2>/dev/null || printf '0')"
           if [[ -n "$last_progress_epoch" && "$last_progress_epoch" != "0" ]]; then
             idle_for=$((now - last_progress_epoch))
             if (( idle_for >= codex_stall_seconds )); then
@@ -556,7 +633,7 @@ stream_codex_exec() {
 }
 
 extract_thread_id() {
-  /opt/homebrew/bin/python3 -c '
+  "$python_bin" -c '
 import json
 import sys
 

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

@@ -39,10 +39,16 @@ declare -a context_items=()
 declare -a collect_files=()
 
 resolve_codex_bin() {
-  local configured_bin="${CODEX_BIN:-}"
+  local configured_bin="${CODEX_BIN:-${ACP_CODEX_BIN:-${F_LOSNING_CODEX_BIN:-}}}"
   local best_version=""
   local best_bin=""
   local candidate version_line version
+  local -a fallback_paths=(
+    "${HOME}/.local/bin/codex"
+    "${HOME}/.codex/local/bin/codex"
+    "/usr/local/bin/codex"
+    "/opt/homebrew/bin/codex"
+  )
 
   if [[ -n "$configured_bin" && -x "$configured_bin" ]]; then
     printf '%s\n' "$configured_bin"
@@ -50,11 +56,16 @@ resolve_codex_bin() {
   fi
 
   if command -v codex >/dev/null 2>&1; then
-    candidate="$(command -v codex)"
+    command -v codex
+    return 0
+  fi
+
+  for candidate in "${fallback_paths[@]}"; do
     if [[ -x "$candidate" ]]; then
-      best_bin="$candidate"
+      printf '%s\n' "$candidate"
+      return 0
     fi
-  fi
+  done
 
   if [[ -d "${HOME:-}/.nvm/versions/node" ]]; then
     while IFS= read -r candidate; do
@@ -347,7 +358,7 @@ find_logged_artifact_path() {
     if [[ "\$(basename "\${candidate}")" == "\${artifact_name}" && -f "\${candidate}" ]]; then
       printf '%s\n' "\${candidate}"
     fi
-  done < <(grep -oE '/(Users|Volumes|tmp)/[^[:space:])"]+' ${output_q} 2>/dev/null || true)
+  done < <(grep -oE '/[^[:space:])"]+' ${output_q} 2>/dev/null || true)
 }
 recover_logged_artifact() {
   local artifact_name="\${1:?artifact name required}"

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

@@ -233,6 +233,16 @@ EOF
   done
 fi
 
+# Always collect result.env from sandbox to artifact_dir
+collect_copy_snippet+=$(
+  cat <<EOF
+if [[ -f ${sandbox_run_dir_q}/result.env ]]; then
+  cp ${sandbox_run_dir_q}/result.env ${artifact_dir_q}/result.env
+fi
+EOF
+)
+collect_copy_snippet+=$'\n'
+
 reconcile_snippet=""
 if [[ -n "$reconcile_command" ]]; then
   printf -v delayed_reconcile_q '%q' "export ACP_EXPECTED_RUN_STARTED_AT=${started_at_q}; export F_LOSNING_EXPECTED_RUN_STARTED_AT=${started_at_q}; while tmux has-session -t ${session_q} 2>/dev/null; do sleep 1; done; sleep 2; $reconcile_command"