agent-control-plane 0.1.16 → 0.2.0

package/tools/bin/flow-resident-worker-lib.sh

@@ -118,7 +118,7 @@ flow_resident_issue_backend_supported() {
   local backend="${1:-}"
 
   case "${backend}" in
-    codex|openclaw|claude)
+    codex|openclaw|claude|ollama|pi)
       return 0
       ;;
     *)

package/tools/bin/flow-shell-lib.sh

@@ -35,7 +35,6 @@ flow_export_compat_env_aliases() {
   flow_export_env_alias_if_unset F_LOSNING_MEMORY_DIR ACP_MEMORY_DIR
   flow_export_env_alias_if_unset F_LOSNING_RETAINED_REPO_ROOT ACP_RETAINED_REPO_ROOT
   flow_export_env_alias_if_unset F_LOSNING_VSCODE_WORKSPACE_FILE ACP_VSCODE_WORKSPACE_FILE
-  flow_export_env_alias_if_unset F_LOSNING_CODING_WORKER ACP_CODING_WORKER
   flow_export_env_alias_if_unset F_LOSNING_CODEX_PROFILE_SAFE ACP_CODEX_PROFILE_SAFE
   flow_export_env_alias_if_unset F_LOSNING_CODEX_PROFILE_BYPASS ACP_CODEX_PROFILE_BYPASS
   flow_export_env_alias_if_unset F_LOSNING_CLAUDE_MODEL ACP_CLAUDE_MODEL
@@ -84,7 +83,6 @@ flow_export_canonical_env_aliases() {
   flow_export_env_alias_if_unset ACP_MEMORY_DIR F_LOSNING_MEMORY_DIR
   flow_export_env_alias_if_unset ACP_RETAINED_REPO_ROOT F_LOSNING_RETAINED_REPO_ROOT
   flow_export_env_alias_if_unset ACP_VSCODE_WORKSPACE_FILE F_LOSNING_VSCODE_WORKSPACE_FILE
-  flow_export_env_alias_if_unset ACP_CODING_WORKER F_LOSNING_CODING_WORKER
   flow_export_env_alias_if_unset ACP_CODEX_PROFILE_SAFE F_LOSNING_CODEX_PROFILE_SAFE
   flow_export_env_alias_if_unset ACP_CODEX_PROFILE_BYPASS F_LOSNING_CODEX_PROFILE_BYPASS
   flow_export_env_alias_if_unset ACP_CLAUDE_MODEL F_LOSNING_CLAUDE_MODEL
@@ -223,6 +221,11 @@ resolve_shared_agent_home() {
     flow_root="$(resolve_flow_skill_dir "${BASH_SOURCE[1]:-${BASH_SOURCE[0]}}")"
   fi
 
+  if flow_is_skill_root "${flow_root}"; then
+    flow_print_dir "${flow_root}"
+    return 0
+  fi
+
   flow_print_dir "${flow_root}/../../.."
 }
 

package/tools/bin/heartbeat-recovery-preflight.sh

@@ -80,6 +80,7 @@ run_preflight_test "heartbeat-no-tmux-sessions" "${TEST_DIR}/test-heartbeat-safe
 run_preflight_test "heartbeat-static-capacity-without-quota-cache" "${TEST_DIR}/test-heartbeat-safe-auto-static-capacity-without-quota-cache.sh"
 run_preflight_test "heartbeat-openclaw-skips-codex-quota" "${TEST_DIR}/test-heartbeat-safe-auto-openclaw-skips-codex-quota.sh"
 run_preflight_test "heartbeat-empty-schedule-label-sync" "${TEST_DIR}/test-heartbeat-sync-issue-labels-empty-schedule.sh"
+run_preflight_test "heartbeat-open-issue-terminal-sync" "${TEST_DIR}/test-heartbeat-sync-open-agent-issues-terminal-clears-running.sh"
 run_preflight_test "heartbeat-open-pr-terminal-sync" "${TEST_DIR}/test-heartbeat-sync-open-agent-prs-terminal-clears-running.sh"
 run_preflight_test "heartbeat-pr-launch-dedup" "${TEST_DIR}/test-heartbeat-loop-pr-launch-dedup.sh"
 run_preflight_test "heartbeat-auth-wait-capacity" "${TEST_DIR}/test-heartbeat-loop-auth-wait-does-not-consume-capacity.sh"

package/tools/bin/heartbeat-safe-auto.sh

@@ -17,6 +17,8 @@ flow_export_execution_env "${CONFIG_YAML}"
 AGENT_ROOT="$(flow_resolve_agent_root "${CONFIG_YAML}")"
 RUNS_ROOT="$(flow_resolve_runs_root "${CONFIG_YAML}")"
 STATE_ROOT="$(flow_resolve_state_root "${CONFIG_YAML}")"
+HISTORY_ROOT="$(flow_resolve_history_root "${CONFIG_YAML}")"
+WORKTREE_ROOT="$(flow_resolve_worktree_root "${CONFIG_YAML}")"
 MEMORY_DIR="${ACP_MEMORY_DIR:-${F_LOSNING_MEMORY_DIR:-${AGENT_CONTROL_PLANE_WORKSPACE:-$HOME/.agent-runtime/control-plane/workspace}/memory}}"
 REPO_SLUG="$(flow_resolve_repo_slug "${CONFIG_YAML}")"
 MAX_CONCURRENT_WORKERS="${ACP_MAX_CONCURRENT_WORKERS:-${F_LOSNING_MAX_CONCURRENT_WORKERS:-20}}"
@@ -29,7 +31,7 @@ MAX_CONCURRENT_BLOCKED_RECOVERY_ISSUE_WORKERS="${ACP_MAX_CONCURRENT_BLOCKED_RECO
 BLOCKED_RECOVERY_COOLDOWN_SECONDS="${ACP_BLOCKED_RECOVERY_COOLDOWN_SECONDS:-${F_LOSNING_BLOCKED_RECOVERY_COOLDOWN_SECONDS:-900}}"
 MAX_OPEN_AGENT_PRS_FOR_RECURRING="${ACP_MAX_OPEN_AGENT_PRS_FOR_RECURRING:-${F_LOSNING_MAX_OPEN_AGENT_PRS_FOR_RECURRING:-12}}"
 MAX_LAUNCHES_PER_HEARTBEAT="${ACP_MAX_LAUNCHES_PER_HEARTBEAT:-${F_LOSNING_MAX_LAUNCHES_PER_HEARTBEAT:-$MAX_CONCURRENT_WORKERS}}"
-CODING_WORKER="${ACP_CODING_WORKER:-${F_LOSNING_CODING_WORKER:-codex}}"
+CODING_WORKER="${ACP_CODING_WORKER:-codex}"
 # The catchup and shared heartbeat passes can legitimately take a few minutes
 # once they reconcile stale sessions, sync labels, and launch multiple workers.
 CATCHUP_TIMEOUT_SECONDS="${ACP_CATCHUP_TIMEOUT_SECONDS:-${F_LOSNING_CATCHUP_TIMEOUT_SECONDS:-180}}"
@@ -67,9 +69,12 @@ AGENT_WORKTREE_AUDIT_TIMEOUT_SECONDS="${ACP_AGENT_WORKTREE_AUDIT_TIMEOUT_SECONDS
 LOCK_DIR="${STATE_ROOT}/heartbeat-loop.lock"
 PID_FILE="${LOCK_DIR}/pid"
 SHARED_LOOP_PID_FILE="${STATE_ROOT}/shared-heartbeat-loop.pid"
+SHARED_LOOP_STATUS_FILE="${STATE_ROOT}/shared-heartbeat-loop.env"
 QUOTA_LOCK_DIR="${STATE_ROOT}/quota-preflight.lock"
 QUOTA_PID_FILE="${QUOTA_LOCK_DIR}/pid"
 
+mkdir -p "${AGENT_ROOT}" "${RUNS_ROOT}" "${STATE_ROOT}" "${HISTORY_ROOT}" "${WORKTREE_ROOT}" "${MEMORY_DIR}"
+
 acquire_lock() {
   mkdir -p "${STATE_ROOT}"
 
@@ -124,6 +129,29 @@ release_quota_lock() {
   rm -rf "${QUOTA_LOCK_DIR}"
 }
 
+write_shared_loop_status() {
+  local state="${1:-}"
+  local status="${2:-}"
+  local timestamp=""
+  local tmp_file=""
+
+  timestamp="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  mkdir -p "${STATE_ROOT}"
+  tmp_file="$(mktemp)"
+  if [[ -f "${SHARED_LOOP_STATUS_FILE}" ]]; then
+    grep -Ev '^(STATE|STATUS|STARTED_AT|UPDATED_AT)=' "${SHARED_LOOP_STATUS_FILE}" >"${tmp_file}" || true
+  fi
+  printf 'STATE=%s\n' "${state}" >>"${tmp_file}"
+  if [[ -n "${status}" ]]; then
+    printf 'STATUS=%s\n' "${status}" >>"${tmp_file}"
+  fi
+  if [[ "${state}" == "running" ]]; then
+    printf 'STARTED_AT=%s\n' "${timestamp}" >>"${tmp_file}"
+  fi
+  printf 'UPDATED_AT=%s\n' "${timestamp}" >>"${tmp_file}"
+  mv "${tmp_file}" "${SHARED_LOOP_STATUS_FILE}"
+}
+
 run_with_timeout() {
   local timeout_seconds="${1:?timeout seconds required}"
   shift
@@ -530,6 +558,7 @@ fi
 derive_dynamic_limits
 
 printf '[%s] shared heartbeat loop start\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+write_shared_loop_status "running" ""
   if ACP_TIMEOUT_CHILD_PID_FILE="${SHARED_LOOP_PID_FILE}" \
   F_LOSNING_TIMEOUT_CHILD_PID_FILE="${SHARED_LOOP_PID_FILE}" \
   run_with_timeout "${HEARTBEAT_LOOP_TIMEOUT_SECONDS}" \
@@ -563,9 +592,11 @@ printf '[%s] shared heartbeat loop start\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
       --heavy-running-label "E2E_ISSUE" \
       --heavy-deferred-key "E2E_DEFERRED" \
       --heavy-deferred-message "E2E-heavy issues remain queued until the single e2e slot is free."; then
+  write_shared_loop_status "idle" "0"
   printf '[%s] shared heartbeat loop end status=0\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
 else
   loop_status=$?
+  write_shared_loop_status "idle" "${loop_status}"
   if [[ "${loop_status}" -eq 124 ]]; then
     printf 'HEARTBEAT_LOOP_TIMEOUT=yes\n'
   fi
@@ -573,21 +604,78 @@ else
   exit "${loop_status}"
 fi
 
-printf '[%s] merged-pr catchup start\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
-if run_with_timeout "${CATCHUP_TIMEOUT_SECONDS}" \
-  env \
-    ACP_RUNS_ROOT="$RUNS_ROOT" \
-    F_LOSNING_RUNS_ROOT="$RUNS_ROOT" \
-    bash "${FLOW_TOOLS_DIR}/agent-project-catch-up-merged-prs" \
-      --repo-slug "$REPO_SLUG" \
-      --state-root "$STATE_ROOT" \
-      --hook-file "$HOOK_FILE" \
-      --limit 100; then
-  printf '[%s] merged-pr catchup end status=0\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
-else
-  catchup_status=$?
-  if [[ "${catchup_status}" -eq 124 ]]; then
-    printf 'CATCHUP_TIMEOUT=yes\n'
+# ── Throttled catch-up passes ──────────────────────────────────────────────────
+# These scripts fetch merged/closed PRs and linked issues which change rarely.
+# Run them at most once every CATCHUP_INTERVAL_SECONDS (default 300 = 5 min)
+# to avoid burning API quota on every heartbeat cycle.
+CATCHUP_INTERVAL_SECONDS="${ACP_CATCHUP_INTERVAL_SECONDS:-${F_LOSNING_CATCHUP_INTERVAL_SECONDS:-300}}"
+CATCHUP_STAMP_FILE="${STATE_ROOT}/last-catchup-timestamp"
+_catchup_now="$(date +%s)"
+_catchup_last="0"
+if [[ -f "${CATCHUP_STAMP_FILE}" ]]; then
+  _catchup_last="$(cat "${CATCHUP_STAMP_FILE}" 2>/dev/null || echo 0)"
+fi
+_catchup_age=$(( _catchup_now - _catchup_last ))
+
+if [[ "${_catchup_age}" -ge "${CATCHUP_INTERVAL_SECONDS}" ]]; then
+  printf '[%s] merged-pr catchup start\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  if run_with_timeout "${CATCHUP_TIMEOUT_SECONDS}" \
+    env \
+      ACP_RUNS_ROOT="$RUNS_ROOT" \
+      F_LOSNING_RUNS_ROOT="$RUNS_ROOT" \
+      bash "${FLOW_TOOLS_DIR}/agent-project-catch-up-merged-prs" \
+        --repo-slug "$REPO_SLUG" \
+        --state-root "$STATE_ROOT" \
+        --hook-file "$HOOK_FILE" \
+        --limit 100; then
+    printf '[%s] merged-pr catchup end status=0\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  else
+    catchup_status=$?
+    if [[ "${catchup_status}" -eq 124 ]]; then
+      printf 'CATCHUP_TIMEOUT=yes\n'
+    fi
+    printf '[%s] merged-pr catchup end status=%s\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" "${catchup_status}"
+  fi
+
+  printf '[%s] linked-pr issue catchup start\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  if run_with_timeout "${CATCHUP_TIMEOUT_SECONDS}" \
+    env \
+      ACP_RUNS_ROOT="$RUNS_ROOT" \
+      F_LOSNING_RUNS_ROOT="$RUNS_ROOT" \
+      bash "${FLOW_TOOLS_DIR}/agent-project-catch-up-issue-pr-links" \
+        --repo-slug "$REPO_SLUG" \
+        --state-root "$STATE_ROOT" \
+        --hook-file "$HOOK_FILE" \
+        --limit 100; then
+    printf '[%s] linked-pr issue catchup end status=0\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  else
+    linked_issue_catchup_status=$?
+    if [[ "${linked_issue_catchup_status}" -eq 124 ]]; then
+      printf 'LINKED_ISSUE_CATCHUP_TIMEOUT=yes\n'
+    fi
+    printf '[%s] linked-pr issue catchup end status=%s\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" "${linked_issue_catchup_status}"
+  fi
+
+  printf '[%s] scheduled-issue retry catchup start\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  if run_with_timeout "${CATCHUP_TIMEOUT_SECONDS}" \
+    env \
+      ACP_RUNS_ROOT="$RUNS_ROOT" \
+      F_LOSNING_RUNS_ROOT="$RUNS_ROOT" \
+      bash "${FLOW_TOOLS_DIR}/agent-project-catch-up-scheduled-issue-retries" \
+        --repo-slug "$REPO_SLUG" \
+        --state-root "$STATE_ROOT" \
+        --hook-file "$HOOK_FILE" \
+        --limit 100; then
+    printf '[%s] scheduled-issue retry catchup end status=0\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  else
+    scheduled_issue_catchup_status=$?
+    if [[ "${scheduled_issue_catchup_status}" -eq 124 ]]; then
+      printf 'SCHEDULED_ISSUE_CATCHUP_TIMEOUT=yes\n'
+    fi
+    printf '[%s] scheduled-issue retry catchup end status=%s\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" "${scheduled_issue_catchup_status}"
   fi
-  printf '[%s] merged-pr catchup end status=%s\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" "${catchup_status}"
+
+  printf '%s' "${_catchup_now}" >"${CATCHUP_STAMP_FILE}"
+else
+  printf '[%s] catchup skipped (age=%ss, interval=%ss)\n' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" "${_catchup_age}" "${CATCHUP_INTERVAL_SECONDS}"
 fi

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

@@ -54,7 +54,7 @@ build_launchd_base_path() {
   local tool_name=""
   local tool_dir=""
 
-  for tool_name in node gh git python3 openclaw codex claude; do
+  for tool_name in node gh git python3 openclaw codex claude ollama pi crush kilo; do
     tool_dir="$(resolved_tool_dir "${tool_name}" || true)"
     append_path_dir path_value "${tool_dir}"
   done
@@ -112,7 +112,14 @@ fi
 PROFILE_ID="$(flow_resolve_adapter_id "${CONFIG_YAML}")"
 profile_slug="$(printf '%s' "${PROFILE_ID}" | tr -c 'A-Za-z0-9._-' '-')"
 HOME_DIR="${ACP_PROJECT_RUNTIME_HOME_DIR:-${HOME:-}}"
-SOURCE_HOME="${ACP_PROJECT_RUNTIME_SOURCE_HOME:-$(cd "${FLOW_SKILL_DIR}/../../.." && pwd)}"
+SOURCE_HOME="${ACP_PROJECT_RUNTIME_SOURCE_HOME:-}"
+if [[ -z "${SOURCE_HOME}" ]]; then
+  if flow_is_skill_root "${FLOW_SKILL_DIR}"; then
+    SOURCE_HOME="${FLOW_SKILL_DIR}"
+  else
+    SOURCE_HOME="$(cd "${FLOW_SKILL_DIR}/../../.." && pwd)"
+  fi
+fi
 RUNTIME_HOME="${ACP_PROJECT_RUNTIME_RUNTIME_HOME:-${HOME_DIR}/.agent-runtime/runtime-home}"
 WORKSPACE_DIR="${ACP_PROJECT_RUNTIME_WORKSPACE_DIR:-${HOME_DIR}/.agent-runtime/control-plane/workspace}"
 PROFILE_REGISTRY_ROOT="${ACP_PROJECT_RUNTIME_PROFILE_REGISTRY_ROOT:-${ACP_PROFILE_REGISTRY_ROOT:-${HOME_DIR}/.agent-runtime/control-plane/profiles}}"
@@ -120,6 +127,7 @@ LAUNCH_AGENTS_DIR="${ACP_PROJECT_RUNTIME_LAUNCH_AGENTS_DIR:-${HOME_DIR}/Library/
 LOG_DIR="${ACP_PROJECT_RUNTIME_LOG_DIR:-${HOME_DIR}/.agent-runtime/logs}"
 LABEL="${label_override:-${ACP_PROJECT_RUNTIME_LAUNCHD_LABEL:-ai.agent.project.${profile_slug}}}"
 BASE_PATH="$(build_launchd_base_path)"
+CODING_WORKER_OVERRIDE="${ACP_PROJECT_RUNTIME_CODING_WORKER:-${ACP_CODING_WORKER:-}}"
 SYNC_SCRIPT="${ACP_PROJECT_RUNTIME_SYNC_SCRIPT:-${FLOW_SKILL_DIR}/tools/bin/sync-shared-agent-home.sh}"
 BOOTSTRAP_SCRIPT="${ACP_PROJECT_RUNTIME_BOOTSTRAP_SCRIPT:-${FLOW_SKILL_DIR}/tools/bin/project-launchd-bootstrap.sh}"
 SUPERVISOR_SCRIPT="${ACP_PROJECT_RUNTIME_SUPERVISOR_SCRIPT:-${FLOW_SKILL_DIR}/tools/bin/project-runtime-supervisor.sh}"
@@ -152,6 +160,15 @@ export AGENT_PROJECT_ID='${PROFILE_ID}'
 export ACP_PROJECT_RUNTIME_PATH='${BASE_PATH}'
 export ACP_PROJECT_RUNTIME_SYNC_SCRIPT='${SYNC_SCRIPT}'
 export ACP_PROFILE_REGISTRY_ROOT='${PROFILE_REGISTRY_ROOT}'
+EOF
+
+if [[ -n "${CODING_WORKER_OVERRIDE}" ]]; then
+  cat >>"${WRAPPER_PATH}" <<EOF
+export ACP_CODING_WORKER='${CODING_WORKER_OVERRIDE}'
+EOF
+fi
+
+cat >>"${WRAPPER_PATH}" <<EOF
 exec bash '${SUPERVISOR_SCRIPT}' --bootstrap-script '${BOOTSTRAP_SCRIPT}' --pid-file '${SUPERVISOR_PID_FILE}' --delay-seconds '${delay_seconds}' --interval-seconds '${interval_seconds}'
 EOF
 chmod +x "${WRAPPER_PATH}"

package/tools/bin/prepare-worktree.sh

@@ -9,10 +9,10 @@ CONFIG_YAML="$(resolve_flow_config_yaml "${BASH_SOURCE[0]}")"
 AGENT_REPO_ROOT="$(flow_resolve_agent_repo_root "${CONFIG_YAML}")"
 CANONICAL_REPO_ROOT="$(flow_resolve_repo_root "${CONFIG_YAML}")"
 DEFAULT_DEPENDENCY_SOURCE_ROOT="$CANONICAL_REPO_ROOT"
-DEPENDENCY_SOURCE_ROOT="${ACP_DEPENDENCY_SOURCE_ROOT:-${F_LOSNING_DEPENDENCY_SOURCE_ROOT:-$DEFAULT_DEPENDENCY_SOURCE_ROOT}}"
-SYNC_DEPENDENCY_BASELINE_SCRIPT="${ACP_SYNC_DEPENDENCY_BASELINE_SCRIPT:-${F_LOSNING_SYNC_DEPENDENCY_BASELINE_SCRIPT:-${SCRIPT_DIR}/sync-dependency-baseline.sh}}"
-PACKAGE_MANAGER_BIN="${ACP_PACKAGE_MANAGER_BIN:-${F_LOSNING_PACKAGE_MANAGER_BIN:-pnpm}}"
-LOCAL_WORKSPACE_INSTALL="${ACP_WORKTREE_LOCAL_INSTALL:-${F_LOSNING_WORKTREE_LOCAL_INSTALL:-false}}"
+DEPENDENCY_SOURCE_ROOT="${ACP_DEPENDENCY_SOURCE_ROOT:-$DEFAULT_DEPENDENCY_SOURCE_ROOT}"
+SYNC_DEPENDENCY_BASELINE_SCRIPT="${ACP_SYNC_DEPENDENCY_BASELINE_SCRIPT:-${SCRIPT_DIR}/sync-dependency-baseline.sh}"
+PACKAGE_MANAGER_BIN="${ACP_PACKAGE_MANAGER_BIN:-pnpm}"
+LOCAL_WORKSPACE_INSTALL="${ACP_WORKTREE_LOCAL_INSTALL:-false}"
 WORKTREE="${1:?usage: prepare-worktree.sh WORKTREE}"
 
 realpath_safe() {

package/tools/bin/profile-activate.sh

@@ -56,8 +56,8 @@ AGENT_REPO_ROOT="$(flow_resolve_agent_repo_root "${CONFIG_YAML}")"
 WORKTREE_ROOT="$(flow_resolve_worktree_root "${CONFIG_YAML}")"
 RUNS_ROOT="$(flow_resolve_runs_root "${CONFIG_YAML}")"
 STATE_ROOT="$(flow_resolve_state_root "${CONFIG_YAML}")"
-CODING_WORKER="${ACP_CODING_WORKER:-${F_LOSNING_CODING_WORKER:-codex}}"
-ACTIVE_PROVIDER_POOL_NAME="${ACP_ACTIVE_PROVIDER_POOL_NAME:-${F_LOSNING_ACTIVE_PROVIDER_POOL_NAME:-}}"
+CODING_WORKER="${ACP_CODING_WORKER:-codex}"
+ACTIVE_PROVIDER_POOL_NAME="${ACP_ACTIVE_PROVIDER_POOL_NAME:-}"
 
 if [[ "${exports_only}" == "1" ]]; then
   printf 'export ACP_PROJECT_ID=%q

package/tools/bin/profile-adopt.sh

@@ -69,8 +69,8 @@ HISTORY_ROOT="$(flow_resolve_history_root "${CONFIG_YAML}")"
 WORKTREE_ROOT="$(flow_resolve_worktree_root "${CONFIG_YAML}")"
 RETAINED_REPO_ROOT="$(flow_resolve_retained_repo_root "${CONFIG_YAML}")"
 VSCODE_WORKSPACE_FILE="$(flow_resolve_vscode_workspace_file "${CONFIG_YAML}")"
-REMOTE_NAME="${ACP_REMOTE_NAME:-${F_LOSNING_REMOTE_NAME:-origin}}"
-SOURCE_REPO_ROOT="${source_repo_root_override:-${ACP_SOURCE_REPO_ROOT:-${F_LOSNING_SOURCE_REPO_ROOT:-${RETAINED_REPO_ROOT}}}}"
+REMOTE_NAME="${ACP_REMOTE_NAME:-origin}"
+SOURCE_REPO_ROOT="${source_repo_root_override:-${ACP_SOURCE_REPO_ROOT:-${RETAINED_REPO_ROOT}}}"
 PROFILE_LINK="${AGENT_ROOT}/control-plane.yaml"
 WORKSPACE_LINK="${AGENT_ROOT}/workspace.code-workspace"
 INSTALLED_PROFILE_DIR="$(dirname "${CONFIG_YAML}")"

package/tools/bin/project-init.sh

@@ -42,7 +42,7 @@ Common options:
   --worktree-root <path>             Worktree parent root
   --retained-repo-root <path>        Retained/manual checkout root
   --vscode-workspace-file <path>     VS Code workspace file
-  --coding-worker <codex|openclaw|claude>
+  --coding-worker <codex|openclaw|claude|ollama|pi|opencode|kilo>
   --claude-model <model>
   --claude-permission-mode <mode>
   --claude-effort <level>

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