agent-control-plane 0.1.16 → 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=""
@@ -640,6 +569,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 +580,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 +618,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));
@@ -1040,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
@@ -1128,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"
@@ -1143,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() {
@@ -1382,19 +1356,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-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"
@@ -774,12 +784,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