agent-control-plane 0.2.0 → 0.4.9

package/tools/bin/agent-project-retry-state

@@ -1,10 +1,14 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=/dev/null
+source "${SCRIPT_DIR}/flow-shell-lib.sh"
+
 usage() {
   cat <<'EOF'
 Usage:
-  agent-project-retry-state --state-root <path> --kind issue|pr|provider --item-id <id> --action get|schedule|clear [--reason <text>] [--cooldowns <csv>]
+  agent-project-retry-state --state-root <path> --kind issue|pr|provider|github --item-id <id> --action get|schedule|clear [--reason <text>] [--cooldowns <csv>] [--next-at-epoch <unix-seconds>]
 
 Generic retry/cooldown state manager for project adapters.
 
@@ -12,6 +16,7 @@ Examples:
   agent-project-retry-state --state-root /tmp/state --kind issue --item-id 123 --action get
   agent-project-retry-state --state-root /tmp/state --kind pr --item-id 77 --action schedule --reason worker-exit-failed
   agent-project-retry-state --state-root /tmp/state --kind provider --item-id openclaw-stepfun-free --action schedule --reason provider-quota-limit
+  agent-project-retry-state --state-root /tmp/state --kind github --item-id core-api --action schedule --reason github-api-rate-limit --next-at-epoch 4102444800
 EOF
 }
 
@@ -21,6 +26,7 @@ item_id=""
 action=""
 reason=""
 cooldowns_csv="${AGENT_PROJECT_RETRY_COOLDOWNS:-300,900,1800,3600}"
+next_at_epoch_override=""
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
@@ -30,6 +36,7 @@ while [[ $# -gt 0 ]]; do
     --action) action="${2:-}"; shift 2 ;;
     --reason) reason="${2:-}"; shift 2 ;;
     --cooldowns) cooldowns_csv="${2:-}"; shift 2 ;;
+    --next-at-epoch) next_at_epoch_override="${2:-}"; shift 2 ;;
     --help|-h) usage; exit 0 ;;
     *) echo "Unknown argument: $1" >&2; usage >&2; exit 1 ;;
   esac
@@ -41,8 +48,8 @@ if [[ -z "$state_root" || -z "$kind" || -z "$item_id" || -z "$action" ]]; then
 fi
 
 case "$kind" in
-  issue|pr|provider) ;;
-  *) echo "--kind must be issue, pr, or provider" >&2; exit 1 ;;
+  issue|pr|provider|github) ;;
+  *) echo "--kind must be issue, pr, provider, or github" >&2; exit 1 ;;
 esac
 
 case "$action" in
@@ -98,7 +105,7 @@ write_state() {
 
   new_updated_at="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
   if [[ "$new_next_epoch" != "0" ]]; then
-    new_next_at="$(date -u -r "$new_next_epoch" +"%Y-%m-%dT%H:%M:%SZ")"
+    new_next_at="$(flow_format_epoch_utc "$new_next_epoch")"
   fi
 
   cat >"$state_file" <<EOF
@@ -115,10 +122,14 @@ case "$action" in
     ;;
   schedule)
     attempts=$((attempts + 1))
-    cooldown_seconds="$(cooldown_seconds_for_attempt "$attempts")"
-    next_attempt_epoch=$((now_epoch + cooldown_seconds))
+    if [[ "${next_at_epoch_override}" =~ ^[0-9]+$ ]] && (( next_at_epoch_override > now_epoch )); then
+      next_attempt_epoch="${next_at_epoch_override}"
+    else
+      cooldown_seconds="$(cooldown_seconds_for_attempt "$attempts")"
+      next_attempt_epoch=$((now_epoch + cooldown_seconds))
+    fi
     write_state "$attempts" "$next_attempt_epoch" "$reason"
-    next_attempt_at="$(date -u -r "$next_attempt_epoch" +"%Y-%m-%dT%H:%M:%SZ")"
+    next_attempt_at="$(flow_format_epoch_utc "$next_attempt_epoch")"
     last_reason="$reason"
     updated_at="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
     ;;

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"
@@ -113,6 +136,15 @@ config_yaml="$(resolve_flow_config_yaml "${BASH_SOURCE[0]}")"
 issue_session_prefix="$(flow_resolve_issue_session_prefix "${config_yaml}")"
 pr_session_prefix="$(flow_resolve_pr_session_prefix "${config_yaml}")"
 
+# Keep npm-backed verification steps isolated from any broken user-global cache state.
+npm_cache_dir="${NPM_CONFIG_CACHE:-${npm_config_cache:-}}"
+if [[ -z "${npm_cache_dir}" ]]; then
+  npm_cache_dir="${ACP_NPM_CACHE_DIR:-${F_LOSNING_NPM_CACHE_DIR:-${HOME}/.agent-runtime/npm-cache}}"
+fi
+export NPM_CONFIG_CACHE="${npm_cache_dir}"
+export npm_config_cache="${npm_cache_dir}"
+mkdir -p "${npm_cache_dir}" 2>/dev/null || true
+
 thread_id=""
 attempt=0
 resume_count=0
@@ -177,7 +209,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 +252,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 +313,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 +342,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 +476,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 +542,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 +600,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
@@ -546,17 +632,16 @@ stream_codex_exec() {
   rm -f "$stream_fifo"
   rm -f "$progress_file"
 
-  if wait "$producer_pid"; then
-    last_exit_code="0"
-  else
-    last_exit_code="$?"
-  fi
+  set +e
+  wait "$producer_pid" 2>/dev/null
+  last_exit_code="$?"
+  set -e
 
   update_thread_id_from_output "$last_attempt_start_size"
 }
 
 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"

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

@@ -283,6 +283,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-opencode-session

@@ -240,6 +240,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-sync-source-repo-main

@@ -0,0 +1,163 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=/dev/null
+source "${SCRIPT_DIR}/flow-config-lib.sh"
+
+CONFIG_YAML="${ACP_SOURCE_REPO_SYNC_CONFIG_YAML:-$(resolve_flow_config_yaml "${BASH_SOURCE[0]}")}"
+REPO_SLUG="$(flow_resolve_repo_slug "${CONFIG_YAML}")"
+SOURCE_REPO_ROOT="$(flow_resolve_source_repo_root "${CONFIG_YAML}")"
+DEFAULT_BRANCH="$(flow_resolve_default_branch "${CONFIG_YAML}")"
+STATE_ROOT="$(flow_resolve_state_root "${CONFIG_YAML}")"
+SYNC_STATE_FILE="${STATE_ROOT}/source-repo-main-sync.env"
+FORGE_PROVIDER="$(flow_forge_provider)"
+REMOTE_OVERRIDE="${ACP_SOURCE_SYNC_REMOTE:-${F_LOSNING_SOURCE_SYNC_REMOTE:-}}"
+
+write_state() {
+  local status="${1:-}"
+  local remote_name="${2:-}"
+  local remote_sha="${3:-}"
+  local local_sha="${4:-}"
+  local detail="${5:-}"
+
+  mkdir -p "$(dirname "${SYNC_STATE_FILE}")"
+  {
+    printf 'STATUS=%s\n' "${status}"
+    printf 'UPDATED_AT=%s\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+    printf 'SOURCE_REPO_ROOT=%s\n' "${SOURCE_REPO_ROOT}"
+    printf 'DEFAULT_BRANCH=%s\n' "${DEFAULT_BRANCH}"
+    printf 'REMOTE_NAME=%s\n' "${remote_name}"
+    printf 'REMOTE_SHA=%s\n' "${remote_sha}"
+    printf 'LOCAL_SHA=%s\n' "${local_sha}"
+    printf 'DETAIL=%s\n' "${detail}"
+  } >"${SYNC_STATE_FILE}"
+}
+
+git_ref_sha() {
+  local repo_root="${1:?repo root required}"
+  local ref_name="${2:?ref required}"
+  git -C "${repo_root}" rev-parse --verify --quiet "${ref_name}" 2>/dev/null || true
+}
+
+git_has_remote() {
+  local repo_root="${1:?repo root required}"
+  local remote_name="${2:?remote required}"
+  git -C "${repo_root}" remote get-url "${remote_name}" >/dev/null 2>&1
+}
+
+discover_remote_name() {
+  local remote_name=""
+
+  if [[ -n "${REMOTE_OVERRIDE}" ]] && git_has_remote "${SOURCE_REPO_ROOT}" "${REMOTE_OVERRIDE}"; then
+    printf '%s\n' "${REMOTE_OVERRIDE}"
+    return 0
+  fi
+
+  case "${FORGE_PROVIDER}" in
+    gitea)
+      if git_has_remote "${SOURCE_REPO_ROOT}" "gitea"; then
+        printf 'gitea\n'
+        return 0
+      fi
+      ;;
+    github)
+      if git_has_remote "${SOURCE_REPO_ROOT}" "origin"; then
+        printf 'origin\n'
+        return 0
+      fi
+      ;;
+  esac
+
+  while IFS= read -r remote_name; do
+    [[ -n "${remote_name}" ]] || continue
+    if [[ "$(flow_git_remote_repo_slug "${SOURCE_REPO_ROOT}" "${remote_name}" 2>/dev/null || true)" == "${REPO_SLUG}" ]]; then
+      printf '%s\n' "${remote_name}"
+      return 0
+    fi
+  done < <(git -C "${SOURCE_REPO_ROOT}" remote)
+
+  return 1
+}
+
+if [[ -z "${SOURCE_REPO_ROOT}" ]]; then
+  write_state "skipped" "" "" "" "source-repo-root-unset"
+  printf 'SOURCE_REPO_SYNC_STATUS=skipped\nSOURCE_REPO_SYNC_REASON=source-repo-root-unset\n'
+  exit 0
+fi
+
+if [[ ! -d "${SOURCE_REPO_ROOT}/.git" && ! -f "${SOURCE_REPO_ROOT}/.git" ]]; then
+  write_state "skipped" "" "" "" "source-repo-not-git"
+  printf 'SOURCE_REPO_SYNC_STATUS=skipped\nSOURCE_REPO_SYNC_REASON=source-repo-not-git\nSOURCE_REPO_ROOT=%s\n' "${SOURCE_REPO_ROOT}"
+  exit 0
+fi
+
+REMOTE_NAME="$(discover_remote_name || true)"
+if [[ -z "${REMOTE_NAME}" ]]; then
+  write_state "skipped" "" "" "" "remote-not-found"
+  printf 'SOURCE_REPO_SYNC_STATUS=skipped\nSOURCE_REPO_SYNC_REASON=remote-not-found\nSOURCE_REPO_ROOT=%s\n' "${SOURCE_REPO_ROOT}"
+  exit 0
+fi
+
+if ! git -C "${SOURCE_REPO_ROOT}" fetch "${REMOTE_NAME}" "+refs/heads/${DEFAULT_BRANCH}:refs/remotes/${REMOTE_NAME}/${DEFAULT_BRANCH}" --prune >/dev/null 2>&1; then
+  write_state "failed" "${REMOTE_NAME}" "" "" "fetch-failed"
+  printf 'SOURCE_REPO_SYNC_STATUS=failed\nSOURCE_REPO_SYNC_REASON=fetch-failed\nSOURCE_REPO_ROOT=%s\nREMOTE_NAME=%s\n' "${SOURCE_REPO_ROOT}" "${REMOTE_NAME}"
+  exit 1
+fi
+
+remote_sha="$(git_ref_sha "${SOURCE_REPO_ROOT}" "refs/remotes/${REMOTE_NAME}/${DEFAULT_BRANCH}")"
+local_branch_sha="$(git_ref_sha "${SOURCE_REPO_ROOT}" "refs/heads/${DEFAULT_BRANCH}")"
+current_branch="$(git -C "${SOURCE_REPO_ROOT}" symbolic-ref --quiet --short HEAD 2>/dev/null || true)"
+
+if [[ -z "${remote_sha}" || -z "${local_branch_sha}" ]]; then
+  write_state "failed" "${REMOTE_NAME}" "${remote_sha}" "${local_branch_sha}" "missing-branch-ref"
+  printf 'SOURCE_REPO_SYNC_STATUS=failed\nSOURCE_REPO_SYNC_REASON=missing-branch-ref\nSOURCE_REPO_ROOT=%s\nREMOTE_NAME=%s\n' "${SOURCE_REPO_ROOT}" "${REMOTE_NAME}"
+  exit 1
+fi
+
+if [[ "${remote_sha}" == "${local_branch_sha}" ]]; then
+  write_state "unchanged" "${REMOTE_NAME}" "${remote_sha}" "${local_branch_sha}" "already-current"
+  printf 'SOURCE_REPO_SYNC_STATUS=unchanged\nSOURCE_REPO_ROOT=%s\nREMOTE_NAME=%s\nSOURCE_REPO_SYNC_SHA=%s\n' "${SOURCE_REPO_ROOT}" "${REMOTE_NAME}" "${remote_sha}"
+  exit 0
+fi
+
+if [[ "${current_branch}" == "${DEFAULT_BRANCH}" ]]; then
+  if [[ -n "$(git -C "${SOURCE_REPO_ROOT}" status --porcelain 2>/dev/null || true)" ]]; then
+    write_state "blocked" "${REMOTE_NAME}" "${remote_sha}" "${local_branch_sha}" "working-tree-dirty"
+    printf 'SOURCE_REPO_SYNC_STATUS=blocked\nSOURCE_REPO_SYNC_REASON=working-tree-dirty\nSOURCE_REPO_ROOT=%s\nREMOTE_NAME=%s\nLOCAL_SHA=%s\nREMOTE_SHA=%s\n' \
+      "${SOURCE_REPO_ROOT}" "${REMOTE_NAME}" "${local_branch_sha}" "${remote_sha}"
+    exit 0
+  fi
+
+  if git -C "${SOURCE_REPO_ROOT}" merge-base --is-ancestor "${local_branch_sha}" "${remote_sha}" >/dev/null 2>&1; then
+    git -C "${SOURCE_REPO_ROOT}" merge --ff-only "refs/remotes/${REMOTE_NAME}/${DEFAULT_BRANCH}" >/dev/null
+    updated_sha="$(git_ref_sha "${SOURCE_REPO_ROOT}" "refs/heads/${DEFAULT_BRANCH}")"
+    write_state "updated" "${REMOTE_NAME}" "${remote_sha}" "${updated_sha}" "fast-forward-checked-out-branch"
+    printf 'SOURCE_REPO_SYNC_STATUS=updated\nSOURCE_REPO_ROOT=%s\nREMOTE_NAME=%s\nSOURCE_REPO_SYNC_SHA=%s\n' "${SOURCE_REPO_ROOT}" "${REMOTE_NAME}" "${updated_sha}"
+    exit 0
+  fi
+
+  if git -C "${SOURCE_REPO_ROOT}" merge --no-edit "refs/remotes/${REMOTE_NAME}/${DEFAULT_BRANCH}" >/dev/null 2>&1; then
+    updated_sha="$(git_ref_sha "${SOURCE_REPO_ROOT}" "refs/heads/${DEFAULT_BRANCH}")"
+    write_state "updated" "${REMOTE_NAME}" "${remote_sha}" "${updated_sha}" "merge-checked-out-branch"
+    printf 'SOURCE_REPO_SYNC_STATUS=updated\nSOURCE_REPO_ROOT=%s\nREMOTE_NAME=%s\nSOURCE_REPO_SYNC_SHA=%s\n' "${SOURCE_REPO_ROOT}" "${REMOTE_NAME}" "${updated_sha}"
+    exit 0
+  fi
+
+  git -C "${SOURCE_REPO_ROOT}" merge --abort >/dev/null 2>&1 || true
+  write_state "blocked" "${REMOTE_NAME}" "${remote_sha}" "${local_branch_sha}" "merge-conflict"
+  printf 'SOURCE_REPO_SYNC_STATUS=blocked\nSOURCE_REPO_SYNC_REASON=merge-conflict\nSOURCE_REPO_ROOT=%s\nREMOTE_NAME=%s\nLOCAL_SHA=%s\nREMOTE_SHA=%s\n' \
+    "${SOURCE_REPO_ROOT}" "${REMOTE_NAME}" "${local_branch_sha}" "${remote_sha}"
+  exit 0
+fi
+
+if ! git -C "${SOURCE_REPO_ROOT}" merge-base --is-ancestor "${local_branch_sha}" "${remote_sha}" >/dev/null 2>&1; then
+  write_state "blocked" "${REMOTE_NAME}" "${remote_sha}" "${local_branch_sha}" "local-main-diverged"
+  printf 'SOURCE_REPO_SYNC_STATUS=blocked\nSOURCE_REPO_SYNC_REASON=local-main-diverged\nSOURCE_REPO_ROOT=%s\nREMOTE_NAME=%s\nLOCAL_SHA=%s\nREMOTE_SHA=%s\n' \
+    "${SOURCE_REPO_ROOT}" "${REMOTE_NAME}" "${local_branch_sha}" "${remote_sha}"
+  exit 0
+fi
+
+git -C "${SOURCE_REPO_ROOT}" update-ref "refs/heads/${DEFAULT_BRANCH}" "${remote_sha}" "${local_branch_sha}"
+write_state "updated" "${REMOTE_NAME}" "${remote_sha}" "${remote_sha}" "fast-forward-local-ref"
+printf 'SOURCE_REPO_SYNC_STATUS=updated\nSOURCE_REPO_ROOT=%s\nREMOTE_NAME=%s\nSOURCE_REPO_SYNC_SHA=%s\n' "${SOURCE_REPO_ROOT}" "${REMOTE_NAME}" "${remote_sha}"

package/tools/bin/agent-project-worker-status

@@ -117,13 +117,6 @@ if [[ "$status" == "UNKNOWN" && -f "$output_file" ]]; then
   fi
 fi
 
-if [[ "$status" == "UNKNOWN" && -z "$failure_reason" ]]; then
-  failure_reason="$(failure_reason_from_output || true)"
-  if [[ -n "$failure_reason" ]]; then
-    status="FAILED"
-  fi
-fi
-
 if [[ "$status" == "UNKNOWN" && -n "$runner_state" ]]; then
   case "$runner_state" in
     running|waiting-auth-refresh|switching-account)
@@ -133,6 +126,7 @@ if [[ "$status" == "UNKNOWN" && -n "$runner_state" ]]; then
       # Check BEFORE stale result.env to avoid false SUCCEEDED when a prior
       # cycle's result.env happens to exist.
       status="FAILED"
+      failure_reason="$(failure_reason_from_output || true)"
       if [[ -z "$failure_reason" ]]; then
         failure_reason="runner-aborted-before-completion"
       fi
@@ -146,10 +140,19 @@ fi
 if [[ "$status" == "UNKNOWN" && -f "$result_file" ]]; then
   # A worker that managed to persist result.env already completed its contract,
   # even if the tmux session disappeared before the exit marker was flushed.
+  # Check BEFORE failure_reason_from_output so that a completed result.env
+  # is not overridden by transient failure text in the log.
   status="SUCCEEDED"
   result_only_completion="yes"
 fi
 
+if [[ "$status" == "UNKNOWN" && -z "$failure_reason" ]]; then
+  failure_reason="$(failure_reason_from_output || true)"
+  if [[ -n "$failure_reason" ]]; then
+    status="FAILED"
+  fi
+fi
+
 if [[ "$status" == "UNKNOWN" && -f "$output_file" ]]; then
   if rg -qi "You've hit your usage limit|You have reached your Codex usage limits|visit https://chatgpt.com/codex/settings/usage|Upgrade to Pro|rate limit exceeded|quota exceeded|usage cap (reached|exceeded)|usage quota (reached|exceeded)" "$output_file"; then
     status="FAILED"

package/tools/bin/cleanup-worktree.sh

@@ -37,11 +37,16 @@ if [[ -n "$SESSION" ]]; then
   ARGS+=(--session "$SESSION")
 fi
 
+cleanup_exit=0
 AGENT_PROJECT_WORKTREE_ROOT="$WORKTREE_ROOT" \
 F_LOSNING_WORKTREE_ROOT="$WORKTREE_ROOT" \
-  bash "${FLOW_TOOLS_DIR}/agent-project-cleanup-session" "${ARGS[@]}" >/dev/null
+  bash "${FLOW_TOOLS_DIR}/agent-project-cleanup-session" "${ARGS[@]}" >/dev/null || cleanup_exit=$?
 
 F_LOSNING_AGENT_REPO_ROOT="$AGENT_REPO_ROOT" \
 F_LOSNING_RETAINED_REPO_ROOT="$RETAINED_REPO_ROOT" \
 F_LOSNING_VSCODE_WORKSPACE_FILE="$VSCODE_WORKSPACE_FILE" \
   "${FLOW_TOOLS_DIR}/sync-vscode-workspace.sh" >/dev/null 2>&1 || true
+
+if [[ "$cleanup_exit" -ne 0 ]]; then
+  exit "$cleanup_exit"
+fi