agent-control-plane 0.3.0 → 0.4.9

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

@@ -129,8 +129,23 @@ LABEL="${label_override:-${ACP_PROJECT_RUNTIME_LAUNCHD_LABEL:-ai.agent.project.$
 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}"
+RUNTIME_SKILL_DIR="${RUNTIME_HOME}/skills/openclaw/agent-control-plane"
+BOOTSTRAP_SCRIPT="${ACP_PROJECT_RUNTIME_BOOTSTRAP_SCRIPT:-}"
+if [[ -z "${BOOTSTRAP_SCRIPT}" ]]; then
+  if [[ -x "${RUNTIME_SKILL_DIR}/tools/bin/project-launchd-bootstrap.sh" ]]; then
+    BOOTSTRAP_SCRIPT="${RUNTIME_SKILL_DIR}/tools/bin/project-launchd-bootstrap.sh"
+  else
+    BOOTSTRAP_SCRIPT="${FLOW_SKILL_DIR}/tools/bin/project-launchd-bootstrap.sh"
+  fi
+fi
+SUPERVISOR_SCRIPT="${ACP_PROJECT_RUNTIME_SUPERVISOR_SCRIPT:-}"
+if [[ -z "${SUPERVISOR_SCRIPT}" ]]; then
+  if [[ -x "${RUNTIME_SKILL_DIR}/tools/bin/project-runtime-supervisor.sh" ]]; then
+    SUPERVISOR_SCRIPT="${RUNTIME_SKILL_DIR}/tools/bin/project-runtime-supervisor.sh"
+  else
+    SUPERVISOR_SCRIPT="${FLOW_SKILL_DIR}/tools/bin/project-runtime-supervisor.sh"
+  fi
+fi
 STATE_ROOT="$(flow_resolve_state_root "${CONFIG_YAML}")"
 SUPERVISOR_PID_FILE="${STATE_ROOT}/runtime-supervisor.pid"
 ENV_FILE="${ACP_PROJECT_RUNTIME_ENV_FILE:-${PROFILE_REGISTRY_ROOT}/${PROFILE_ID}/runtime.env}"

package/tools/bin/project-init.sh

@@ -34,7 +34,12 @@ runtime copy.
 
 Common options:
   --profile-id <id>                  Profile id, e.g. billing-api
-  --repo-slug <owner/repo>           GitHub repo slug
+  --repo-slug <owner/repo>           Forge repo slug
+  --forge-provider <github|gitea>    Forge provider for this profile
+  --gitea-base-url <url>             Base URL for a local/self-hosted Gitea instance
+  --gitea-token <token>              Gitea API token written to profile runtime.env
+  --gitea-username <user>            Gitea username written to profile runtime.env
+  --gitea-password <pass>            Gitea password written to profile runtime.env
   --profile-home <path>              Installed profile registry root
   --repo-root <path>                 Canonical repo root
   --agent-repo-root <path>           Agent-owned anchor repo root
@@ -68,6 +73,11 @@ EOF
 
 profile_id=""
 repo_slug=""
+forge_provider=""
+gitea_base_url=""
+gitea_token=""
+gitea_username=""
+gitea_password=""
 profile_home=""
 repo_root=""
 agent_repo_root=""
@@ -98,6 +108,11 @@ while [[ $# -gt 0 ]]; do
   case "$1" in
     --profile-id) profile_id="${2:-}"; shift 2 ;;
     --repo-slug) repo_slug="${2:-}"; shift 2 ;;
+    --forge-provider) forge_provider="${2:-}"; shift 2 ;;
+    --gitea-base-url) gitea_base_url="${2:-}"; shift 2 ;;
+    --gitea-token) gitea_token="${2:-}"; shift 2 ;;
+    --gitea-username) gitea_username="${2:-}"; shift 2 ;;
+    --gitea-password) gitea_password="${2:-}"; shift 2 ;;
     --profile-home) profile_home="${2:-}"; shift 2 ;;
     --repo-root) repo_root="${2:-}"; shift 2 ;;
     --agent-repo-root) agent_repo_root="${2:-}"; shift 2 ;;
@@ -144,6 +159,11 @@ SOURCE_HOME="${source_home:-${ACP_PROJECT_INIT_SOURCE_HOME:-$(cd "${FLOW_SKILL_D
 RUNTIME_HOME="${runtime_home:-${ACP_PROJECT_INIT_RUNTIME_HOME:-${HOME}/.agent-runtime/runtime-home}}"
 
 scaffold_cmd=(bash "${SCAFFOLD_SCRIPT}" --profile-id "${profile_id}" --repo-slug "${repo_slug}")
+[[ -n "${forge_provider}" ]] && scaffold_cmd+=(--forge-provider "${forge_provider}")
+[[ -n "${gitea_base_url}" ]] && scaffold_cmd+=(--gitea-base-url "${gitea_base_url}")
+[[ -n "${gitea_token}" ]] && scaffold_cmd+=(--gitea-token "${gitea_token}")
+[[ -n "${gitea_username}" ]] && scaffold_cmd+=(--gitea-username "${gitea_username}")
+[[ -n "${gitea_password}" ]] && scaffold_cmd+=(--gitea-password "${gitea_password}")
 [[ -n "${profile_home}" ]] && scaffold_cmd+=(--profile-home "${profile_home}")
 [[ -n "${repo_root}" ]] && scaffold_cmd+=(--repo-root "${repo_root}")
 [[ -n "${agent_repo_root}" ]] && scaffold_cmd+=(--agent-repo-root "${agent_repo_root}")

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

@@ -54,7 +54,11 @@ if [[ -x "${ENSURE_SYNC_SCRIPT}" ]]; then
   if [[ "${ALWAYS_SYNC}" == "1" ]]; then
     ensure_args=(--force "${ensure_args[@]}")
   fi
-  bash "${ENSURE_SYNC_SCRIPT}" "${ensure_args[@]}"
+  if [[ "${FLOW_SKILL_DIR}" == "${RUNTIME_HOME}"/* ]]; then
+    printf 'RUNTIME_SYNC_SKIPPED=active-runtime-home\n'
+  else
+    bash "${ENSURE_SYNC_SCRIPT}" "${ensure_args[@]}"
+  fi
 elif [[ "${ALWAYS_SYNC}" == "1" || ! -x "${RUNTIME_HEARTBEAT_SCRIPT}" ]]; then
   if [[ -z "${SOURCE_HOME}" ]]; then
     SOURCE_HOME="${FLOW_SKILL_DIR}"

package/tools/bin/project-runtimectl.sh

@@ -110,6 +110,7 @@ LAUNCHD_PLIST="${ACP_PROJECT_RUNTIME_LAUNCHD_PLIST:-${LAUNCH_AGENTS_DIR}/${LAUNC
 SOURCE_HOME="${ACP_PROJECT_RUNTIME_SOURCE_HOME:-}"
 RUNTIME_HOME="${ACP_PROJECT_RUNTIME_RUNTIME_HOME:-$(resolve_runtime_home)}"
 SYNC_STAMP_FILE="${RUNTIME_HOME}/.agent-control-plane-runtime-sync.env"
+SOURCE_REPO_SYNC_STATE_FILE="${STATE_ROOT}/source-repo-main-sync.env"
 
 case "${delay_seconds}" in
   ''|*[!0-9]*) echo "--delay-seconds must be numeric" >&2; exit 64 ;;
@@ -199,6 +200,13 @@ sync_stamp_value() {
     | sed -e "s/^'//" -e "s/'$//"
 }
 
+source_repo_sync_value() {
+  local key="${1:?key required}"
+  [[ -f "${SOURCE_REPO_SYNC_STATE_FILE}" ]] || return 1
+  awk -F= -v target="${key}" '$1 == target {print $2; exit}' "${SOURCE_REPO_SYNC_STATE_FILE}" 2>/dev/null \
+    | sed -e "s/^'//" -e "s/'$//"
+}
+
 shared_loop_status_value() {
   local key="${1:?key required}"
   local file="${STATE_ROOT}/shared-heartbeat-loop.env"
@@ -399,6 +407,15 @@ print_status() {
   local shared_loop_last_status=""
   local shared_loop_started_at=""
   local shared_loop_updated_at=""
+  local source_repo_sync_status=""
+  local source_repo_sync_updated_at=""
+  local source_repo_sync_root=""
+  local source_repo_sync_branch=""
+  local source_repo_sync_remote=""
+  local source_repo_sync_remote_sha=""
+  local source_repo_sync_local_sha=""
+  local source_repo_sync_detail=""
+  local source_repo_sync_aligned="unknown"
 
   heartbeat="$(heartbeat_pid)"
   shared_loop="$(shared_loop_pid)"
@@ -429,6 +446,23 @@ print_status() {
   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)"
+  source_repo_sync_status="$(source_repo_sync_value "STATUS" || true)"
+  source_repo_sync_updated_at="$(source_repo_sync_value "UPDATED_AT" || true)"
+  source_repo_sync_root="$(source_repo_sync_value "SOURCE_REPO_ROOT" || true)"
+  source_repo_sync_branch="$(source_repo_sync_value "DEFAULT_BRANCH" || true)"
+  source_repo_sync_remote="$(source_repo_sync_value "REMOTE_NAME" || true)"
+  source_repo_sync_remote_sha="$(source_repo_sync_value "REMOTE_SHA" || true)"
+  source_repo_sync_local_sha="$(source_repo_sync_value "LOCAL_SHA" || true)"
+  source_repo_sync_detail="$(source_repo_sync_value "DETAIL" || true)"
+  if [[ -n "${source_repo_sync_status}" ]]; then
+    if [[ -n "${source_repo_sync_remote_sha}" && -n "${source_repo_sync_local_sha}" && "${source_repo_sync_remote_sha}" == "${source_repo_sync_local_sha}" ]]; then
+      source_repo_sync_aligned="yes"
+    elif [[ "${source_repo_sync_status}" == "blocked" || "${source_repo_sync_status}" == "failed" ]]; then
+      source_repo_sync_aligned="no"
+    else
+      source_repo_sync_aligned="unknown"
+    fi
+  fi
 
   printf 'PROFILE_ID=%s\n' "${PROFILE_ID}"
   printf 'CONFIG_YAML=%s\n' "${CONFIG_YAML}"
@@ -459,6 +493,16 @@ print_status() {
   printf 'RUNTIME_SYNC_STATUS=%s\n' "${runtime_sync_status}"
   printf 'RUNTIME_SYNC_UPDATED_AT=%s\n' "${runtime_sync_updated_at}"
   printf 'RUNTIME_SYNC_FINGERPRINT=%s\n' "${runtime_sync_fingerprint}"
+  printf 'SOURCE_REPO_SYNC_STATE_FILE=%s\n' "${SOURCE_REPO_SYNC_STATE_FILE}"
+  printf 'SOURCE_REPO_SYNC_STATUS=%s\n' "${source_repo_sync_status}"
+  printf 'SOURCE_REPO_SYNC_UPDATED_AT=%s\n' "${source_repo_sync_updated_at}"
+  printf 'SOURCE_REPO_SYNC_ROOT=%s\n' "${source_repo_sync_root}"
+  printf 'SOURCE_REPO_SYNC_BRANCH=%s\n' "${source_repo_sync_branch}"
+  printf 'SOURCE_REPO_SYNC_REMOTE=%s\n' "${source_repo_sync_remote}"
+  printf 'SOURCE_REPO_SYNC_REMOTE_SHA=%s\n' "${source_repo_sync_remote_sha}"
+  printf 'SOURCE_REPO_SYNC_LOCAL_SHA=%s\n' "${source_repo_sync_local_sha}"
+  printf 'SOURCE_REPO_SYNC_DETAIL=%s\n' "${source_repo_sync_detail}"
+  printf 'SOURCE_REPO_SYNC_ALIGNED=%s\n' "${source_repo_sync_aligned}"
 }
 
 terminate_pid_list() {
@@ -518,7 +562,7 @@ 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
+  if [[ "${issue_json}" == "[]" ]] && ! flow_using_gitea; 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
@@ -527,7 +571,7 @@ clear_running_labels_after_stop() {
   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
+  if [[ "${pr_json}" == "[]" ]] && ! flow_using_gitea; 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

package/tools/bin/resident-issue-controller-lib.sh

@@ -401,7 +401,7 @@ controller_wait_for_provider_capacity() {
         if (( wait_completed_epoch >= wait_started_epoch )); then
           PROVIDER_LAST_WAIT_SECONDS=$((wait_completed_epoch - wait_started_epoch))
           PROVIDER_WAIT_TOTAL_SECONDS=$((PROVIDER_WAIT_TOTAL_SECONDS + PROVIDER_LAST_WAIT_SECONDS))
-          PROVIDER_LAST_WAIT_COMPLETED_AT="$(date -u -r "${wait_completed_epoch}" +"%Y-%m-%dT%H:%M:%SZ")"
+          PROVIDER_LAST_WAIT_COMPLETED_AT="$(flow_format_epoch_utc "${wait_completed_epoch}")"
         fi
       fi
       NEXT_WAKE_EPOCH=""
@@ -418,7 +418,7 @@ controller_wait_for_provider_capacity() {
     if [[ -z "${wait_started_epoch}" ]]; then
       wait_started_epoch="$(date +%s)"
       PROVIDER_WAIT_COUNT=$((PROVIDER_WAIT_COUNT + 1))
-      PROVIDER_LAST_WAIT_STARTED_AT="$(date -u -r "${wait_started_epoch}" +"%Y-%m-%dT%H:%M:%SZ")"
+      PROVIDER_LAST_WAIT_STARTED_AT="$(flow_format_epoch_utc "${wait_started_epoch}")"
     fi
 
     PROVIDER_WAITED="yes"

package/tools/bin/scaffold-profile.sh

@@ -14,7 +14,12 @@ Create a new installed project profile, profile templates, and profile notes.
 
 Options:
   --profile-id <id>                  Profile id, e.g. billing-api
-  --repo-slug <owner/repo>           GitHub repo slug
+  --repo-slug <owner/repo>           Forge repo slug
+  --forge-provider <github|gitea>    Forge provider (default: github)
+  --gitea-base-url <url>             Base URL for a local/self-hosted Gitea instance
+  --gitea-token <token>              Gitea API token written to profile runtime.env
+  --gitea-username <user>            Gitea username written to profile runtime.env
+  --gitea-password <pass>            Gitea password written to profile runtime.env
   --profile-home <path>              Profile registry root (default: ~/.agent-runtime/control-plane/profiles)
   --repo-root <path>                 Canonical repo root
   --agent-repo-root <path>           Agent-owned anchor repo root (defaults to repo root)
@@ -40,6 +45,11 @@ EOF
 
 profile_id=""
 repo_slug=""
+forge_provider="github"
+gitea_base_url=""
+gitea_token=""
+gitea_username=""
+gitea_password=""
 profile_home=""
 repo_root=""
 agent_repo_root=""
@@ -63,6 +73,11 @@ while [[ $# -gt 0 ]]; do
   case "$1" in
     --profile-id) profile_id="${2:-}"; shift 2 ;;
     --repo-slug) repo_slug="${2:-}"; shift 2 ;;
+    --forge-provider) forge_provider="${2:-}"; shift 2 ;;
+    --gitea-base-url) gitea_base_url="${2:-}"; shift 2 ;;
+    --gitea-token) gitea_token="${2:-}"; shift 2 ;;
+    --gitea-username) gitea_username="${2:-}"; shift 2 ;;
+    --gitea-password) gitea_password="${2:-}"; shift 2 ;;
     --profile-home) profile_home="${2:-}"; shift 2 ;;
     --repo-root) repo_root="${2:-}"; shift 2 ;;
     --agent-repo-root) agent_repo_root="${2:-}"; shift 2 ;;
@@ -104,6 +119,14 @@ case "$coding_worker" in
     ;;
 esac
 
+case "$forge_provider" in
+  github|gitea) ;;
+  *)
+    echo "--forge-provider must be github or gitea" >&2
+    exit 1
+    ;;
+esac
+
 case "$claude_effort" in
   low|medium|high|max) ;;
   *)
@@ -133,6 +156,7 @@ profile_home="${profile_home:-$(resolve_flow_profile_registry_root)}"
 profiles_dir="${profile_home}"
 profile_dir="${profiles_dir}/${profile_id}"
 profile_yaml="${profile_dir}/control-plane.yaml"
+profile_runtime_env="${profile_dir}/runtime.env"
 profile_templates_dir="${profile_dir}/templates"
 profile_readme="${profile_dir}/README.md"
 
@@ -228,9 +252,9 @@ session_naming:
   pr_worktree_branch_prefix: "${pr_worktree_branch_prefix}"
   managed_pr_branch_globs: "${managed_pr_branch_globs}"
 queue:
-  source: "github"
+  source: "${forge_provider}"
   issue_labels:
-    ready: "agent-ready"
+    ready: ""
     running: "agent-running"
     blocked: "agent-blocked"
     heavy: "agent-e2e-heavy"
@@ -366,7 +390,38 @@ policies:
 EOF
 }
 
+write_profile_runtime_env() {
+  local target_file="${1:?target file required}"
+
+  : >"$target_file"
+  {
+    printf 'ACP_FORGE_PROVIDER=%s\n' "${forge_provider}"
+    printf 'F_LOSNING_FORGE_PROVIDER=%s\n' "${forge_provider}"
+    if [[ "${forge_provider}" == "gitea" ]]; then
+      if [[ -n "${gitea_base_url}" ]]; then
+        printf 'ACP_GITEA_BASE_URL=%s\n' "${gitea_base_url}"
+        printf 'GITEA_BASE_URL=%s\n' "${gitea_base_url}"
+      fi
+      if [[ -n "${gitea_token}" ]]; then
+        printf 'ACP_GITEA_TOKEN=%s\n' "${gitea_token}"
+        printf 'GITEA_TOKEN=%s\n' "${gitea_token}"
+      fi
+      if [[ -n "${gitea_username}" ]]; then
+        printf 'ACP_GITEA_USERNAME=%s\n' "${gitea_username}"
+        printf 'GITEA_USERNAME=%s\n' "${gitea_username}"
+      fi
+      if [[ -n "${gitea_password}" ]]; then
+        printf 'ACP_GITEA_PASSWORD=%s\n' "${gitea_password}"
+        printf 'GITEA_PASSWORD=%s\n' "${gitea_password}"
+      fi
+      printf 'ACP_SOURCE_SYNC_REMOTE=gitea\n'
+      printf 'F_LOSNING_SOURCE_SYNC_REMOTE=gitea\n'
+    fi
+  } >"$target_file"
+}
+
 write_profile_yaml "$profile_yaml"
+write_profile_runtime_env "$profile_runtime_env"
 write_profile_readme "$profile_readme"
 
 if compgen -G "${flow_skill_dir}/tools/templates/*.md" >/dev/null; then
@@ -375,15 +430,18 @@ fi
 
 profile_home_real="$(mkdir -p "$profile_home" && cd "$profile_home" && pwd -P)"
 profile_yaml_real="$(cd "$(dirname "$profile_yaml")" && pwd -P)/$(basename "$profile_yaml")"
+profile_runtime_env_real="$(cd "$(dirname "$profile_runtime_env")" && pwd -P)/$(basename "$profile_runtime_env")"
 profile_templates_dir_real="$(cd "$profile_templates_dir" && pwd -P)"
 profile_readme_real="$(cd "$(dirname "$profile_readme")" && pwd -P)/$(basename "$profile_readme")"
 
 printf 'PROFILE_ID=%s\n' "$profile_id"
 printf 'PROFILE_HOME=%s\n' "$profile_home_real"
 printf 'PROFILE_YAML=%s\n' "$profile_yaml_real"
+printf 'PROFILE_RUNTIME_ENV=%s\n' "$profile_runtime_env_real"
 printf 'PROFILE_TEMPLATE_DIR=%s\n' "$profile_templates_dir_real"
 printf 'PROFILE_README=%s\n' "$profile_readme_real"
 printf 'REPO_SLUG=%s\n' "$repo_slug"
+printf 'FORGE_PROVIDER=%s\n' "$forge_provider"
 printf 'CODING_WORKER=%s\n' "$coding_worker"
 printf 'NEXT_STEP=ACP_PROJECT_ID=%s bash %s/tools/bin/render-flow-config.sh\n' "$profile_id" "$flow_skill_dir"
 printf 'NEXT_STEP=bash %s/tools/bin/sync-shared-agent-home.sh\n' "$flow_skill_dir"

package/tools/bin/start-pr-fix-worker.sh

@@ -169,11 +169,41 @@ PR_MISSING_REASONS_TEXT="$(jq -r '.missingReasons[]? | "- " + .' <<<"$RISK_JSON"
 if [[ -z "$PR_MISSING_REASONS_TEXT" ]]; then
   PR_MISSING_REASONS_TEXT="- none"
 fi
-PR_PULL_JSON="$(flow_github_api_repo "${REPO_SLUG}" "pulls/${PR_NUMBER}")"
-PR_HEAD_SHA="$(jq -r '.head.sha' <<<"$PR_PULL_JSON")"
-PR_MERGEABLE_STATUS="$(jq -r 'if .mergeable == null then "UNKNOWN" else (.mergeable | tostring | ascii_upcase) end' <<<"$PR_PULL_JSON")"
+PR_PULL_JSON="$(flow_github_api_repo "${REPO_SLUG}" "pulls/${PR_NUMBER}" 2>/dev/null || printf '{}\n')"
+PR_HEAD_SHA="$(jq -r '.head.sha // .headRefOid // ""' <<<"$PR_PULL_JSON")"
+PR_MERGEABLE_STATUS="$(jq -r 'if .mergeable == null then "UNKNOWN" else (.mergeable | tostring | ascii_upcase) end' <<<"$PR_PULL_JSON" 2>/dev/null || printf 'UNKNOWN\n')"
+
+pr_comments_json() {
+  local review_route="pulls/${PR_NUMBER}/comments"
+  local issue_route="issues/${PR_NUMBER}/comments"
+  local payload=""
+
+  if flow_using_gitea; then
+    payload="$(flow_github_api_repo "${REPO_SLUG}" "${issue_route}" 2>/dev/null || true)"
+  else
+    payload="$(flow_github_api_repo "${REPO_SLUG}" "${review_route}" 2>/dev/null || true)"
+  fi
+
+  if jq -e 'type == "array"' >/dev/null 2>&1 <<<"${payload}"; then
+    printf '%s\n' "${payload}"
+    return 0
+  fi
+
+  printf '[]\n'
+}
+
+pr_issue_comments_json() {
+  local payload=""
+  payload="$(flow_github_api_repo "${REPO_SLUG}" "issues/${PR_NUMBER}/comments" 2>/dev/null || true)"
+  if jq -e 'type == "array"' >/dev/null 2>&1 <<<"${payload}"; then
+    printf '%s\n' "${payload}"
+    return 0
+  fi
+  printf '[]\n'
+}
+
 PR_REVIEW_FINDINGS_TEXT="$(
-  flow_github_api_repo "${REPO_SLUG}" "pulls/${PR_NUMBER}/comments" \
+  pr_comments_json \
     | jq -r --arg head_sha "$PR_HEAD_SHA" '
         map(select(
           (.user.login == "chatgpt-codex-connector[bot]")
@@ -195,7 +225,7 @@ PR_REVIEW_FINDINGS_TEXT="$(
       '
 )"
 PR_BLOCKER_SUMMARY_TEXT="$(
-  flow_github_api_repo "${REPO_SLUG}" "issues/${PR_NUMBER}/comments" \
+  pr_issue_comments_json \
     | jq -r '
         map(select((.body // "") | startswith("## PR final review blocker")))
         | if length == 0 then
@@ -225,12 +255,17 @@ PR_LOCAL_HOST_BLOCKER_SUMMARY_TEXT="$(latest_history_artifact_content "host-bloc
 
 WORKTREE_OUT="$("${WORKSPACE_DIR}/bin/new-pr-worktree.sh" "$PR_NUMBER" "$PR_HEAD_REF")"
 WORKTREE="$(awk -F= '/^WORKTREE=/{print $2}' <<<"$WORKTREE_OUT")"
+PR_BASE_REMOTE="$(flow_resolve_forge_primary_remote "${WORKTREE}" "${REPO_SLUG}" 2>/dev/null || true)"
+if [[ -z "${PR_BASE_REMOTE}" ]]; then
+  PR_BASE_REMOTE="origin"
+fi
+PR_BASE_TRACKING_REF="${PR_BASE_REMOTE}/${PR_BASE_REF}"
 PR_HOST_MERGE_STATUS="not-applicable"
 PR_HOST_MERGE_SUMMARY_TEXT="- not-applicable"
 
 materialize_host_merge_repair() {
   local merge_output=""
-  if merge_output="$(git -C "$WORKTREE" merge --no-commit --no-ff "origin/${PR_BASE_REF}" 2>&1)"; then
+  if merge_output="$(git -C "$WORKTREE" merge --no-commit --no-ff "${PR_BASE_TRACKING_REF}" 2>&1)"; then
     PR_HOST_MERGE_STATUS="clean"
     if [[ -n "$merge_output" ]]; then
       PR_HOST_MERGE_SUMMARY_TEXT="$(printf '%s\n' "$merge_output")"
@@ -271,14 +306,14 @@ else
   PR_CONFLICT_PATHS_TEXT="$(
     (
       cd "$WORKTREE"
-      base_sha="$(git merge-base HEAD "origin/${PR_BASE_REF}" 2>/dev/null || true)"
+      base_sha="$(git merge-base HEAD "${PR_BASE_TRACKING_REF}" 2>/dev/null || true)"
       if [[ -z "$base_sha" ]]; then
         printf '%s\n' "- unable to compute merge-base"
         exit 0
       fi
 
       conflict_paths="$(
-        git merge-tree "$base_sha" HEAD "origin/${PR_BASE_REF}" \
+        git merge-tree "$base_sha" HEAD "${PR_BASE_TRACKING_REF}" \
           | awk '
               /^changed in both$/ { capture=1; next }
               capture && /^(  base|  our|  their)  / {
@@ -333,6 +368,7 @@ PR_HOST_MERGE_SUMMARY_TEXT="$PR_HOST_MERGE_SUMMARY_TEXT" \
 PR_REPO_ROOT="$PR_REPO_ROOT" \
 PR_DEPENDENCY_SOURCE_ROOT="$PR_DEPENDENCY_SOURCE_ROOT" \
 PR_WORKTREE="$WORKTREE" \
+PR_BASE_TRACKING_REF="$PR_BASE_TRACKING_REF" \
 PR_WEB_PLAYWRIGHT_COMMAND="$WEB_PLAYWRIGHT_COMMAND" \
 REPO_SLUG="$REPO_SLUG" \
 TEMPLATE_FILE="$TEMPLATE_FILE" \
@@ -359,11 +395,11 @@ let requiredTargetedVerificationText = '- none';
 let preApprovedVerificationFallbacksText = '- none';
 try {
   const worktree = process.env.PR_WORKTREE || '';
-  const baseRef = process.env.PR_BASE_REF || 'main';
+  const baseTrackingRef = process.env.PR_BASE_TRACKING_REF || `origin/${process.env.PR_BASE_REF || 'main'}`;
   if (worktree) {
     const changedFiles = execFileSync(
       'git',
-      ['-C', worktree, 'diff', '--name-only', '--diff-filter=ACMR', `origin/${baseRef}...HEAD`],
+      ['-C', worktree, 'diff', '--name-only', '--diff-filter=ACMR', `${baseTrackingRef}...HEAD`],
       { encoding: 'utf8' },
     )
       .split('\n')
@@ -423,6 +459,7 @@ const replacements = {
   '{PR_URL}': process.env.PR_URL || '',
   '{PR_HEAD_REF}': process.env.PR_HEAD_REF || '',
   '{PR_BASE_REF}': process.env.PR_BASE_REF || '',
+  '{PR_BASE_TRACKING_REF}': process.env.PR_BASE_TRACKING_REF || '',
   '{PR_BODY}': process.env.PR_BODY || '',
   '{REPO_SLUG}': process.env.REPO_SLUG || '',
   '{PR_RISK}': process.env.PR_RISK || '',

package/tools/bin/start-resident-issue-loop.sh

@@ -243,12 +243,12 @@ record_scheduled_next_due() {
   now_epoch="$(date +%s)"
   next_due_epoch=$((now_epoch + interval_seconds))
   NEXT_WAKE_EPOCH="${next_due_epoch}"
-  NEXT_WAKE_AT="$(date -u -r "${next_due_epoch}" +"%Y-%m-%dT%H:%M:%SZ")"
+  NEXT_WAKE_AT="$(flow_format_epoch_utc "${next_due_epoch}")"
   state_file="${SCHEDULED_STATE_DIR}/${ISSUE_ID}.env"
   cat >"${state_file}" <<EOF
 INTERVAL_SECONDS=${interval_seconds}
 LAST_STARTED_EPOCH=${now_epoch}
-LAST_STARTED_AT=$(date -u -r "${now_epoch}" +"%Y-%m-%dT%H:%M:%SZ")
+LAST_STARTED_AT=$(flow_format_epoch_utc "${now_epoch}")
 NEXT_DUE_EPOCH=${next_due_epoch}
 NEXT_DUE_AT=${NEXT_WAKE_AT}
 UPDATED_AT=$(date -u +"%Y-%m-%dT%H:%M:%SZ")

package/tools/dashboard/app.js

@@ -111,9 +111,10 @@ function renderOverview(snapshot) {
       acc.cooldowns += profile.counts.provider_cooldowns;
       acc.queue += profile.counts.queued_issues;
       acc.alerts += profile.counts.alerts || 0;
+      acc.pendingGithubWrites += profile.counts.pending_github_writes || 0;
       return acc;
     },
-    { activeRuns: 0, runningRuns: 0, implementedRuns: 0, reportedRuns: 0, blockedRuns: 0, controllers: 0, cooldowns: 0, queue: 0, alerts: 0 },
+    { activeRuns: 0, runningRuns: 0, implementedRuns: 0, reportedRuns: 0, blockedRuns: 0, controllers: 0, cooldowns: 0, queue: 0, alerts: 0, pendingGithubWrites: 0 },
   );
 
   overviewNode.innerHTML = [
@@ -125,6 +126,7 @@ function renderOverview(snapshot) {
     ["Blocked", totals.blockedRuns],
     ["Live Controllers", totals.controllers],
     ["Provider Cooldowns", totals.cooldowns],
+    ["Pending GitHub Writes", totals.pendingGithubWrites],
     ["Alerts", totals.alerts],
     ["Queued Issues", totals.queue],
   ]
@@ -237,6 +239,8 @@ function renderProfile(profile) {
     ["Live controllers", profile.counts.live_resident_controllers],
     ["Stale controllers", profile.counts.stale_resident_controllers],
     ["Provider cooldowns", profile.counts.provider_cooldowns],
+    ["Pending GitHub writes", profile.counts.pending_github_writes || 0],
+    ["Failed GitHub writes", profile.counts.failed_github_writes || 0],
     ["Alerts", profile.counts.alerts || 0],
     ["Issue retries", profile.counts.active_retries],
     ["Queued issues", profile.counts.queued_issues],
@@ -378,6 +382,26 @@ function renderProfile(profile) {
     "No claimed issues.",
   );
 
+  const githubOutbox = profile.github_outbox || { counts: {}, pending: [] };
+  const githubOutboxTable = renderTable(
+    [
+      { label: "Type", render: (row) => row.type || "n/a" },
+      { label: "Target", render: (row) => `${row.kind || row.type || "write"} #${row.number || "?"}` },
+      {
+        label: "Payload",
+        render: (row) => {
+          if (row.type === "labels") {
+            return `+${row.add_count || 0} / -${row.remove_count || 0}`;
+          }
+          return row.body_preview || "n/a";
+        },
+      },
+      { label: "Created", render: (row) => row.created_at ? `${relativeTime(row.created_at)}<div class="muted">${row.created_at}</div>` : "n/a" },
+    ],
+    githubOutbox.pending || [],
+    "No pending GitHub write intents.",
+  );
+
   const codexRotationPanel =
     profile.coding_worker === "codex"
       ? `
@@ -452,6 +476,11 @@ function renderProfile(profile) {
           <h3>Claimed Issues</h3>
           ${claimsTable}
         </section>
+        <section class="panel">
+          <h3>GitHub Outbox</h3>
+          <p class="panel-subtitle">Local write intents queued while ACP defers or retries GitHub sync. Pending ${githubOutbox.counts?.pending || 0}, sent ${githubOutbox.counts?.sent || 0}, failed ${githubOutbox.counts?.failed || 0}.</p>
+          ${githubOutboxTable}
+        </section>
       </section>
     </article>
   `;

package/tools/dashboard/dashboard_snapshot.py

@@ -697,6 +697,57 @@ def collect_pr_retries(state_root: Path) -> list[dict[str, Any]]:
     return items
 
 
+def collect_github_outbox(state_root: Path) -> dict[str, Any]:
+    outbox_root = state_root / "github-outbox"
+    pending_root = outbox_root / "pending"
+    sent_root = outbox_root / "sent"
+    failed_root = outbox_root / "failed"
+
+    def list_items(root: Path, limit: int | None = None) -> list[dict[str, Any]]:
+        if not root.is_dir():
+            return []
+
+        items: list[dict[str, Any]] = []
+        for path in sorted(root.glob("*.json"), key=lambda item: item.stat().st_mtime, reverse=True):
+            payload = read_json_file(path)
+            items.append(
+                {
+                    "type": str(payload.get("type", "")),
+                    "repo_slug": str(payload.get("repo_slug", "")),
+                    "number": str(payload.get("number", "")),
+                    "kind": str(payload.get("kind", "")),
+                    "created_at": str(payload.get("created_at", "")),
+                    "updated_at": file_mtime_iso(path),
+                    "file": str(path),
+                    "add_count": len(payload.get("add", []) or []),
+                    "remove_count": len(payload.get("remove", []) or []),
+                    "body_preview": summarize_whitespace(str(payload.get("body", "")))[:120],
+                }
+            )
+            if limit is not None and len(items) >= limit:
+                break
+        return items
+
+    all_pending_items = list_items(pending_root)
+    pending_items = all_pending_items[:20]
+    sent_items = list_items(sent_root, limit=5)
+    failed_items = list_items(failed_root, limit=5)
+
+    return {
+        "pending": pending_items,
+        "sent_recent": sent_items,
+        "failed_recent": failed_items,
+        "counts": {
+            "pending": len(all_pending_items),
+            "sent": len(list(sent_root.glob("*.json"))) if sent_root.is_dir() else 0,
+            "failed": len(list(failed_root.glob("*.json"))) if failed_root.is_dir() else 0,
+            "pending_comments": sum(1 for item in all_pending_items if item["type"] == "comment"),
+            "pending_approvals": sum(1 for item in all_pending_items if item["type"] == "approval"),
+            "pending_label_updates": sum(1 for item in all_pending_items if item["type"] == "labels"),
+        },
+    }
+
+
 def resolve_history_root(render_env: dict[str, str], yaml_env: dict[str, str], runs_root: Path) -> Path:
     configured = (
         render_env.get("EFFECTIVE_HISTORY_ROOT", "").strip()
@@ -726,6 +777,7 @@ def build_profile_snapshot(profile_id: str, registry_root: Path) -> dict[str, An
     retries = collect_issue_retries(state_root)
     pr_retries = collect_pr_retries(state_root)
     queue = collect_issue_queue(state_root)
+    github_outbox = collect_github_outbox(state_root)
     alerts = [alert for run in (runs + recent_history) for alert in run.get("alerts", [])]
     codex_rotation = collect_codex_rotation(render_env)
 
@@ -773,6 +825,8 @@ def build_profile_snapshot(profile_id: str, registry_root: Path) -> dict[str, An
             "active_retries": sum(1 for item in retries if not item.get("ready", True)),
             "scheduled_issues": len(scheduled),
             "alerts": len(alerts),
+            "pending_github_writes": github_outbox["counts"]["pending"],
+            "failed_github_writes": github_outbox["counts"]["failed"],
         },
         "runs": runs,
         "recent_history": recent_history,
@@ -784,6 +838,7 @@ def build_profile_snapshot(profile_id: str, registry_root: Path) -> dict[str, An
         "issue_retries": retries,
         "pr_retries": pr_retries,
         "issue_queue": queue,
+        "github_outbox": github_outbox,
     }
 
 

package/tools/templates/pr-fix-template.md

@@ -11,6 +11,7 @@ PR metadata:
 - PR: {PR_NUMBER} - {PR_TITLE}
 - URL: {PR_URL}
 - Base branch: {PR_BASE_REF}
+- Base tracking ref: {PR_BASE_TRACKING_REF}
 - Head branch: {PR_HEAD_REF}
 - Linked issue: {PR_LINKED_ISSUE_ID}
 - Risk classification: {PR_RISK}
@@ -55,7 +56,7 @@ Required flow:
 
 1. Inspect the current diff and the failing/pending CI signals first:
    - `openspec list` if the repo uses OpenSpec
-   - `git diff --stat origin/main...HEAD`
+   - `git diff --stat {PR_BASE_TRACKING_REF}...HEAD`
    - `git status --short`
    - if `Merge state` is not `CLEAN` or `Mergeable` is `FALSE`, treat branch drift/conflicts as the concrete blocker first
    - if `Actionable current-head review findings` is not `- none`, treat those findings as the concrete blockers to address first
@@ -68,6 +69,7 @@ Required flow:
    - do not run `git fetch`, `git merge`, `git rebase`, `git commit`, `git push`, or other Git metadata-writing commands from inside this worker; host-side wrappers own those steps
 3. If the blocker is branch drift or a merge conflict, use the already-prepared local refs and make the smallest branch-local source update needed to restore mergeability on this PR branch. Keep the resolution scoped to the PR intent; do not rewrite unrelated code.
    - Treat `Current local merge-conflict paths` as the authoritative conflict list to clear.
+   - Treat `{PR_BASE_TRACKING_REF}` as the authoritative base ref for any read-only diff or merge-base inspection.
    - Do not stop after fixing only one file if other conflict paths remain.
    - Before you declare success, rerun local merge simulation and confirm there are no remaining conflict paths for this branch against `{PR_BASE_REF}`.
 4. Make the smallest change that fixes the concrete PR blockers on this existing branch.