agent-control-plane 0.1.0

package/tools/tests/test-control-plane-dashboard-runtime-smoke.sh

@@ -0,0 +1,343 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+FLOW_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+SNAPSHOT_BIN="${FLOW_ROOT}/tools/bin/render-dashboard-snapshot.py"
+SERVER_BIN="${FLOW_ROOT}/tools/bin/serve-dashboard.sh"
+RUNTIMECTL_BIN="${FLOW_ROOT}/tools/bin/project-runtimectl.sh"
+
+tmpdir="$(mktemp -d)"
+server_pid=""
+supervisor_pid=""
+heartbeat_pid=""
+shared_loop_pid=""
+controller_pid=""
+cleanup() {
+  local pid=""
+  for pid in "${server_pid}" "${shared_loop_pid}" "${controller_pid}" "${heartbeat_pid}" "${supervisor_pid}"; do
+    [[ -n "${pid}" ]] || continue
+    kill "${pid}" >/dev/null 2>&1 || true
+    wait "${pid}" >/dev/null 2>&1 || true
+  done
+  rm -rf "${tmpdir}"
+}
+trap cleanup EXIT
+
+profile_registry_root="${tmpdir}/profiles"
+profile_dir="${profile_registry_root}/demo"
+runs_root="${tmpdir}/runtime/demo/runs"
+state_root="${tmpdir}/runtime/demo/state"
+recurring_run_dir="${runs_root}/demo-issue-2"
+scheduled_run_dir="${runs_root}/demo-issue-3"
+recurring_worker_key="issue-lane-recurring-general-openclaw-safe"
+scheduled_worker_key="issue-lane-scheduled-1800-openclaw-safe"
+repo_slug="example/demo-control-plane"
+port="18766"
+heartbeat_child_pid_file="${tmpdir}/heartbeat-child.pid"
+heartbeat_script="${tmpdir}/heartbeat-safe-auto.sh"
+supervisor_script="${tmpdir}/project-runtime-supervisor.sh"
+shared_loop_script="${tmpdir}/agent-project-heartbeat-loop"
+
+mkdir -p \
+  "${profile_dir}" \
+  "${recurring_run_dir}" \
+  "${scheduled_run_dir}" \
+  "${state_root}/heartbeat-loop.lock" \
+  "${state_root}/resident-workers/issues/2" \
+  "${state_root}/resident-workers/issues/${recurring_worker_key}" \
+  "${state_root}/resident-workers/issues/${scheduled_worker_key}" \
+  "${state_root}/resident-workers/issue-queue/pending" \
+  "${state_root}/retries/providers" \
+  "${state_root}/scheduled-issues"
+
+cat >"${profile_dir}/control-plane.yaml" <<EOF
+schema_version: "1"
+id: "demo"
+repo:
+  slug: "${repo_slug}"
+  root: "${tmpdir}/repo"
+  default_branch: "main"
+runtime:
+  orchestrator_agent_root: "${tmpdir}/runtime/demo"
+  worktree_root: "${tmpdir}/worktrees"
+  agent_repo_root: "${tmpdir}/repo"
+  runs_root: "${runs_root}"
+  state_root: "${state_root}"
+  history_root: "${tmpdir}/runtime/demo/history"
+  retained_repo_root: "${tmpdir}/repo"
+  vscode_workspace_file: "${tmpdir}/demo.code-workspace"
+session_naming:
+  issue_prefix: "demo-issue-"
+  pr_prefix: "demo-pr-"
+execution:
+  coding_worker: "openclaw"
+  openclaw:
+    model: "primary/model"
+    thinking: "adaptive"
+    timeout_seconds: 900
+EOF
+
+cat >"${recurring_run_dir}/run.env" <<EOF
+TASK_KIND=issue
+TASK_ID=2
+SESSION=demo-issue-2
+MODE=safe
+STARTED_AT=2026-03-27T11:00:00Z
+CODING_WORKER=openclaw
+WORKTREE=${tmpdir}/worktrees/issue-2
+BRANCH=agent/demo/issue-2
+RESIDENT_WORKER_KEY=${recurring_worker_key}
+OPENCLAW_MODEL=primary/model
+EOF
+
+cat >"${recurring_run_dir}/runner.env" <<'EOF'
+RUNNER_STATE=succeeded
+THREAD_ID=thread-demo-2
+LAST_EXIT_CODE=0
+LAST_FAILURE_REASON=''
+UPDATED_AT=2026-03-27T11:03:00Z
+EOF
+
+cat >"${recurring_run_dir}/result.env" <<'EOF'
+OUTCOME=implemented
+ACTION=host-publish-issue-pr
+EOF
+
+cat >"${scheduled_run_dir}/run.env" <<EOF
+TASK_KIND=issue
+TASK_ID=3
+SESSION=demo-issue-3
+MODE=safe
+STARTED_AT=2026-03-27T11:10:00Z
+CODING_WORKER=openclaw
+WORKTREE=${tmpdir}/worktrees/issue-3
+BRANCH=agent/demo/issue-3
+RESIDENT_WORKER_KEY=${scheduled_worker_key}
+OPENCLAW_MODEL=primary/model
+EOF
+
+cat >"${scheduled_run_dir}/runner.env" <<'EOF'
+RUNNER_STATE=succeeded
+THREAD_ID=thread-demo-3
+LAST_EXIT_CODE=0
+LAST_FAILURE_REASON=''
+UPDATED_AT=2026-03-27T11:12:00Z
+EOF
+
+cat >"${scheduled_run_dir}/result.env" <<'EOF'
+OUTCOME=reported
+ACTION=host-comment-scheduled-report
+EOF
+
+cat >"${heartbeat_script}" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+sleep 60
+EOF
+chmod +x "${heartbeat_script}"
+
+cat >"${supervisor_script}" <<EOF
+#!/usr/bin/env bash
+set -euo pipefail
+bash "${heartbeat_script}" >/dev/null 2>&1 &
+child_pid=\$!
+printf '%s\n' "\${child_pid}" >"${heartbeat_child_pid_file}"
+wait "\${child_pid}"
+EOF
+chmod +x "${supervisor_script}"
+
+cat >"${shared_loop_script}" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+sleep 60
+EOF
+chmod +x "${shared_loop_script}"
+
+bash "${supervisor_script}" >/dev/null 2>&1 &
+supervisor_pid="$!"
+
+for _ in $(seq 1 50); do
+  if [[ -s "${heartbeat_child_pid_file}" ]]; then
+    break
+  fi
+  sleep 0.1
+done
+
+heartbeat_pid="$(tr -d '[:space:]' <"${heartbeat_child_pid_file}")"
+if [[ -z "${heartbeat_pid}" ]]; then
+  echo "failed to capture heartbeat pid" >&2
+  exit 1
+fi
+
+printf '%s\n' "${heartbeat_pid}" >"${state_root}/heartbeat-loop.lock/pid"
+printf '%s\n' "${supervisor_pid}" >"${state_root}/runtime-supervisor.pid"
+
+bash "${shared_loop_script}" --repo-slug "${repo_slug}" >/dev/null 2>&1 &
+shared_loop_pid="$!"
+printf '%s\n' "${shared_loop_pid}" >"${state_root}/shared-heartbeat-loop.pid"
+
+sleep 60 >/dev/null 2>&1 &
+controller_pid="$!"
+
+cat >"${state_root}/resident-workers/issues/2/controller.env" <<EOF
+ISSUE_ID=2
+SESSION=demo-issue-2
+CONTROLLER_PID=${controller_pid}
+CONTROLLER_MODE=safe
+CONTROLLER_LOOP_COUNT=4
+CONTROLLER_STATE=waiting-provider
+CONTROLLER_REASON=provider-cooldown
+ACTIVE_RESIDENT_WORKER_KEY=${recurring_worker_key}
+ACTIVE_RESIDENT_LANE_KIND=recurring
+ACTIVE_RESIDENT_LANE_VALUE=general
+ACTIVE_PROVIDER_BACKEND=openclaw
+ACTIVE_PROVIDER_MODEL=primary/model
+ACTIVE_PROVIDER_KEY=openclaw-primary-model
+PROVIDER_SWITCH_COUNT=2
+PROVIDER_FAILOVER_COUNT=1
+PROVIDER_WAIT_COUNT=3
+PROVIDER_WAIT_TOTAL_SECONDS=90
+PROVIDER_LAST_WAIT_SECONDS=30
+UPDATED_AT=2026-03-27T11:13:00Z
+EOF
+
+cat >"${state_root}/resident-workers/issues/${recurring_worker_key}/metadata.env" <<EOF
+RESIDENT_WORKER_KIND=issue
+RESIDENT_WORKER_SCOPE=lane
+RESIDENT_WORKER_KEY=${recurring_worker_key}
+RESIDENT_LANE_KIND=recurring
+RESIDENT_LANE_VALUE=general
+ISSUE_ID=2
+CODING_WORKER=openclaw
+TASK_COUNT=5
+LAST_STATUS=SUCCEEDED
+LAST_STARTED_AT=2026-03-27T11:00:00Z
+LAST_FINISHED_AT=2026-03-27T11:03:00Z
+LAST_RUN_SESSION=demo-issue-2
+LAST_OUTCOME=implemented
+LAST_ACTION=host-publish-issue-pr
+LAST_FAILURE_REASON=
+EOF
+
+cat >"${state_root}/resident-workers/issues/${scheduled_worker_key}/metadata.env" <<EOF
+RESIDENT_WORKER_KIND=issue
+RESIDENT_WORKER_SCOPE=lane
+RESIDENT_WORKER_KEY=${scheduled_worker_key}
+RESIDENT_LANE_KIND=scheduled
+RESIDENT_LANE_VALUE=1800
+ISSUE_ID=3
+CODING_WORKER=openclaw
+TASK_COUNT=2
+LAST_STATUS=SUCCEEDED
+LAST_STARTED_AT=2026-03-27T11:10:00Z
+LAST_FINISHED_AT=2026-03-27T11:12:00Z
+LAST_RUN_SESSION=demo-issue-3
+LAST_OUTCOME=reported
+LAST_ACTION=host-comment-scheduled-report
+LAST_FAILURE_REASON=
+EOF
+
+cat >"${state_root}/scheduled-issues/3.env" <<'EOF'
+INTERVAL_SECONDS=1800
+LAST_STARTED_AT=2026-03-27T11:10:00Z
+NEXT_DUE_AT=2026-03-27T11:40:00Z
+UPDATED_AT=2026-03-27T11:12:00Z
+EOF
+
+cat >"${state_root}/retries/providers/openclaw-primary-model.env" <<'EOF'
+ATTEMPTS=2
+NEXT_ATTEMPT_EPOCH=4102444800
+NEXT_ATTEMPT_AT=2100-01-01T00:00:00Z
+LAST_REASON=provider-quota-limit
+UPDATED_AT=2026-03-27T11:13:00Z
+EOF
+
+cat >"${state_root}/resident-workers/issue-queue/pending/issue-6.env" <<'EOF'
+ISSUE_ID=6
+SESSION=demo-issue-6
+UPDATED_AT=2026-03-27T11:13:30Z
+EOF
+
+snapshot_file="${tmpdir}/snapshot.json"
+api_snapshot_file="${tmpdir}/api-snapshot.json"
+
+ACP_PROFILE_REGISTRY_ROOT="${profile_registry_root}" python3 "${SNAPSHOT_BIN}" --pretty >"${snapshot_file}"
+
+bash "${SERVER_BIN}" --host 127.0.0.1 --port "${port}" --registry-root "${profile_registry_root}" >"${tmpdir}/server.log" 2>&1 &
+server_pid="$!"
+
+for _ in $(seq 1 10); do
+  if curl -fsS "http://127.0.0.1:${port}/api/snapshot.json" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+
+curl -fsS "http://127.0.0.1:${port}/api/snapshot.json" >"${api_snapshot_file}"
+html="$(curl -fsS "http://127.0.0.1:${port}/")"
+
+status_output="$(
+  ACP_PROFILE_REGISTRY_ROOT="${profile_registry_root}" \
+  ACP_PROJECT_RUNTIME_LAUNCHCTL_BIN="/nonexistent" \
+    bash "${RUNTIMECTL_BIN}" status --profile-id demo
+)"
+
+grep -q '^RUNTIME_STATUS=running$' <<<"${status_output}"
+grep -q "^HEARTBEAT_PID=${heartbeat_pid}$" <<<"${status_output}"
+grep -q "^HEARTBEAT_PARENT_PID=${supervisor_pid}$" <<<"${status_output}"
+grep -q "^SHARED_LOOP_PID=${shared_loop_pid}$" <<<"${status_output}"
+grep -q "^SUPERVISOR_PID=${supervisor_pid}$" <<<"${status_output}"
+grep -q '^CONTROLLER_COUNT=1$' <<<"${status_output}"
+
+grep -q 'ACP Worker Dashboard' <<<"${html}"
+grep -q 'Track active runs, resident controllers, queue pressure, and provider failover in one place.' <<<"${html}"
+
+python3 - "${snapshot_file}" "${api_snapshot_file}" <<'PY'
+import json
+import sys
+
+snapshot_path, api_path = sys.argv[1], sys.argv[2]
+snapshot = json.load(open(snapshot_path, encoding="utf-8"))
+api_snapshot = json.load(open(api_path, encoding="utf-8"))
+
+assert snapshot["profile_count"] == 1
+assert api_snapshot["profile_count"] == 1
+
+profile = snapshot["profiles"][0]
+api_profile = api_snapshot["profiles"][0]
+
+assert profile["id"] == "demo"
+assert profile["repo_slug"] == "example/demo-control-plane"
+assert profile["counts"]["implemented_runs"] == 1
+assert profile["counts"]["reported_runs"] == 1
+assert profile["counts"]["blocked_runs"] == 0
+assert profile["counts"]["live_resident_controllers"] == 1
+assert profile["counts"]["resident_workers"] == 2
+assert profile["counts"]["queued_issues"] == 1
+assert profile["counts"]["provider_cooldowns"] == 1
+assert profile["counts"]["scheduled_issues"] == 1
+
+runs = {item["session"]: item for item in profile["runs"]}
+assert runs["demo-issue-2"]["result_kind"] == "implemented"
+assert runs["demo-issue-2"]["action"] == "host-publish-issue-pr"
+assert runs["demo-issue-3"]["result_kind"] == "reported"
+assert runs["demo-issue-3"]["action"] == "host-comment-scheduled-report"
+
+controllers = {item["issue_id"]: item for item in profile["resident_controllers"]}
+controller = controllers["2"]
+assert controller["state"] == "waiting-provider"
+assert controller["controller_live"] is True
+assert controller["provider_failover_count"] == 1
+assert controller["provider_wait_total_seconds"] == 90
+
+workers = {item["key"]: item for item in profile["resident_workers"]}
+assert workers["issue-lane-recurring-general-openclaw-safe"]["last_action"] == "host-publish-issue-pr"
+assert workers["issue-lane-scheduled-1800-openclaw-safe"]["last_action"] == "host-comment-scheduled-report"
+
+assert api_profile["counts"]["implemented_runs"] == 1
+assert api_profile["counts"]["reported_runs"] == 1
+assert api_profile["counts"]["live_resident_controllers"] == 1
+assert api_profile["counts"]["scheduled_issues"] == 1
+PY
+
+echo "control plane dashboard runtime smoke test passed"

package/tools/tests/test-create-follow-up-issue.sh

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+FLOW_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+SCRIPT="${FLOW_ROOT}/tools/bin/create-follow-up-issue.sh"
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+bin_dir="$tmpdir/bin"
+labels_log="$tmpdir/labels.log"
+body_capture="$tmpdir/body.txt"
+mkdir -p "$bin_dir"
+
+cat >"$bin_dir/gh" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [[ "${1:-}" == "issue" && "${2:-}" == "create" ]]; then
+  body_file=""
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --body-file)
+        body_file="${2:-}"
+        shift 2
+        ;;
+      *)
+        shift
+        ;;
+    esac
+  done
+  cat "$body_file" >"${TEST_BODY_CAPTURE:?}"
+  printf 'https://github.com/example/repo/issues/912\n'
+  exit 0
+fi
+
+echo "unexpected gh args: $*" >&2
+exit 1
+EOF
+chmod +x "$bin_dir/gh"
+
+cat >"$bin_dir/agent-github-update-labels" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+printf '%s\n' "$*" >"${TEST_LABELS_LOG:?}"
+EOF
+chmod +x "$bin_dir/agent-github-update-labels"
+
+body_file="$tmpdir/follow-up.md"
+cat >"$body_file" <<'EOF'
+Target slice: mobile settings language cluster
+
+- Keep PR to one route family
+- Reuse account cluster shell
+EOF
+
+TEST_BODY_CAPTURE="$body_capture" \
+TEST_LABELS_LOG="$labels_log" \
+UPDATE_LABELS_BIN="$bin_dir/agent-github-update-labels" \
+PATH="$bin_dir:$PATH" \
+bash "$SCRIPT" \
+  --parent 421 \
+  --title "Mobile settings: split language cluster from umbrella" \
+  --body-file "$body_file" \
+  --label agent-e2e-heavy >"$tmpdir/out.txt"
+
+grep -q '^ISSUE_NUMBER=912$' "$tmpdir/out.txt"
+grep -q '^ISSUE_URL=https://github.com/example/repo/issues/912$' "$tmpdir/out.txt"
+grep -q '^Parent issue: #421$' "$body_capture"
+grep -q 'Target slice: mobile settings language cluster' "$body_capture"
+grep -q -- '--number 912 --add agent-e2e-heavy' "$labels_log"
+
+echo "create follow-up issue test passed"

package/tools/tests/test-dashboard-launchd-bootstrap.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+FLOW_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+BOOTSTRAP_BIN="${FLOW_ROOT}/tools/bin/dashboard-launchd-bootstrap.sh"
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+home_dir="$tmpdir/home"
+runtime_home="$tmpdir/runtime-home"
+profile_registry_root="$tmpdir/profiles"
+capture_dir="$tmpdir/capture"
+sync_script="$tmpdir/sync.sh"
+runtime_serve_script="$runtime_home/skills/openclaw/agent-control-plane/tools/bin/serve-dashboard.sh"
+
+mkdir -p "$home_dir" "$profile_registry_root" "$(dirname "$runtime_serve_script")" "$capture_dir"
+
+cat >"$sync_script" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+printf 'SYNC_SOURCE=%s\n' "$1" >"${ACP_DASHBOARD_CAPTURE_DIR}/sync.log"
+printf 'SYNC_TARGET=%s\n' "$2" >>"${ACP_DASHBOARD_CAPTURE_DIR}/sync.log"
+EOF
+chmod +x "$sync_script"
+
+cat >"$runtime_serve_script" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+printf 'ARGS=%s %s %s %s\n' "$1" "$2" "$3" "$4" >"${ACP_DASHBOARD_CAPTURE_DIR}/serve.log"
+printf 'PROFILE_REGISTRY_ROOT=%s\n' "${ACP_PROFILE_REGISTRY_ROOT:-}" >>"${ACP_DASHBOARD_CAPTURE_DIR}/serve.log"
+printf 'HOME=%s\n' "${HOME:-}" >>"${ACP_DASHBOARD_CAPTURE_DIR}/serve.log"
+printf 'PYTHONDONTWRITEBYTECODE=%s\n' "${PYTHONDONTWRITEBYTECODE:-}" >>"${ACP_DASHBOARD_CAPTURE_DIR}/serve.log"
+EOF
+chmod +x "$runtime_serve_script"
+
+ACP_DASHBOARD_HOME_DIR="$home_dir" \
+ACP_DASHBOARD_SOURCE_HOME="$tmpdir/source-home" \
+ACP_DASHBOARD_RUNTIME_HOME="$runtime_home" \
+ACP_DASHBOARD_PROFILE_REGISTRY_ROOT="$profile_registry_root" \
+ACP_DASHBOARD_HOST="127.0.0.1" \
+ACP_DASHBOARD_PORT="9911" \
+ACP_DASHBOARD_SYNC_SCRIPT="$sync_script" \
+ACP_DASHBOARD_RUNTIME_SERVE_SCRIPT="$runtime_serve_script" \
+ACP_DASHBOARD_CAPTURE_DIR="$capture_dir" \
+bash "$BOOTSTRAP_BIN"
+
+grep -q "^SYNC_SOURCE=$tmpdir/source-home$" "$capture_dir/sync.log"
+grep -q "^SYNC_TARGET=$runtime_home$" "$capture_dir/sync.log"
+grep -q '^ARGS=--host 127.0.0.1 --port 9911$' "$capture_dir/serve.log"
+grep -q "^PROFILE_REGISTRY_ROOT=$profile_registry_root$" "$capture_dir/serve.log"
+grep -q "^HOME=$home_dir$" "$capture_dir/serve.log"
+grep -q '^PYTHONDONTWRITEBYTECODE=1$' "$capture_dir/serve.log"
+
+echo "dashboard launchd bootstrap test passed"

package/tools/tests/test-flow-export-execution-env-exports-repo-id.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+FLOW_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+CONFIG_LIB="${FLOW_ROOT}/tools/bin/flow-config-lib.sh"
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+config_file="$tmpdir/control-plane.yaml"
+
+cat >"$config_file" <<'EOF'
+schema_version: "1"
+id: "demo"
+repo:
+  slug: "example/repo"
+  id: "123"
+  default_branch: "main"
+EOF
+
+output="$(
+  bash -lc 'source "'"$CONFIG_LIB"'"; flow_export_execution_env "'"$config_file"'"; printf "ACP_REPO_ID=%s\nF_LOSNING_REPO_ID=%s\nACP_GITHUB_REPOSITORY_ID=%s\nF_LOSNING_GITHUB_REPOSITORY_ID=%s\n" "${ACP_REPO_ID:-}" "${F_LOSNING_REPO_ID:-}" "${ACP_GITHUB_REPOSITORY_ID:-}" "${F_LOSNING_GITHUB_REPOSITORY_ID:-}"'
+)"
+
+grep -q '^ACP_REPO_ID=123$' <<<"$output"
+grep -q '^F_LOSNING_REPO_ID=123$' <<<"$output"
+grep -q '^ACP_GITHUB_REPOSITORY_ID=123$' <<<"$output"
+grep -q '^F_LOSNING_GITHUB_REPOSITORY_ID=123$' <<<"$output"
+
+echo "flow export execution env exports repo id test passed"

package/tools/tests/test-flow-export-github-cli-auth-env-prefers-git-credential.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+FLOW_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+REAL_CONFIG_LIB="${FLOW_ROOT}/tools/bin/flow-config-lib.sh"
+REAL_SHELL_LIB="${FLOW_ROOT}/tools/bin/flow-shell-lib.sh"
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+bin_dir="$tmpdir/bin"
+mkdir -p "$bin_dir"
+
+cp "$REAL_CONFIG_LIB" "$bin_dir/flow-config-lib.sh"
+cp "$REAL_SHELL_LIB" "$bin_dir/flow-shell-lib.sh"
+
+cat >"$bin_dir/git" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+if [[ "${1:-}" == "credential" && "${2:-}" == "fill" ]]; then
+  cat >/dev/null
+  printf 'protocol=https\n'
+  printf 'host=github.com\n'
+  printf 'username=test-user\n'
+  printf 'password=repo-specific-token\n'
+  exit 0
+fi
+exit 1
+EOF
+chmod +x "$bin_dir/git"
+
+output="$(
+  LIB_PATH="$bin_dir/flow-config-lib.sh" \
+  PATH="$bin_dir:/usr/bin:/bin:/usr/sbin:/sbin" \
+  GITHUB_PERSONAL_ACCESS_TOKEN="env-fallback-token" \
+  bash <<'EOF'
+set -euo pipefail
+source "$LIB_PATH"
+unset GH_TOKEN
+unset GITHUB_TOKEN
+flow_export_github_cli_auth_env "owner/repo"
+printf 'GH_TOKEN=%s\n' "${GH_TOKEN:-}"
+EOF
+)"
+
+grep -q '^GH_TOKEN=repo-specific-token$' <<<"$output"
+
+echo "flow export github cli auth env prefers git credential test passed"

package/tools/tests/test-flow-github-api-repo-fallback-preserves-input.sh

@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+FLOW_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+REAL_CONFIG_LIB="${FLOW_ROOT}/tools/bin/flow-config-lib.sh"
+REAL_SHELL_LIB="${FLOW_ROOT}/tools/bin/flow-shell-lib.sh"
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+bin_dir="$tmpdir/bin"
+mkdir -p "$bin_dir"
+
+cp "$REAL_CONFIG_LIB" "$bin_dir/flow-config-lib.sh"
+cp "$REAL_SHELL_LIB" "$bin_dir/flow-shell-lib.sh"
+
+captured_payload_file="$tmpdir/captured-payload.json"
+cat >"$bin_dir/gh" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [[ "${1:-}" != "api" ]]; then
+  echo "unexpected gh invocation: $*" >&2
+  exit 1
+fi
+
+route="${2:-}"
+shift 2 || true
+
+input_file=""
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --input)
+      input_file="${2:-}"
+      shift 2
+      ;;
+    *)
+      shift
+      ;;
+  esac
+done
+
+case "$route" in
+  repos/example/repo/issues/42)
+    if [[ -n "$input_file" && -f "$input_file" ]]; then
+      cat "$input_file" >/dev/null
+    fi
+    exit 1
+    ;;
+  repositories/123/issues/42)
+    if [[ -z "$input_file" || ! -f "$input_file" ]]; then
+      echo "missing preserved input file" >&2
+      exit 97
+    fi
+    cp "$input_file" "${TEST_CAPTURED_PAYLOAD_FILE:?}"
+    printf '{"number":42,"state":"open"}\n'
+    exit 0
+    ;;
+  *)
+    echo "unexpected gh api route: $route" >&2
+    exit 1
+    ;;
+esac
+EOF
+
+chmod +x "$bin_dir/flow-config-lib.sh" "$bin_dir/flow-shell-lib.sh" "$bin_dir/gh"
+
+output="$(
+  LIB_PATH="$bin_dir/flow-config-lib.sh" \
+  PATH="$bin_dir:/usr/bin:/bin:/usr/sbin:/sbin" \
+  ACP_REPO_ID="123" \
+  ACP_REPO_SLUG="example/repo" \
+  TEST_CAPTURED_PAYLOAD_FILE="$captured_payload_file" \
+  bash <<'EOF'
+set -euo pipefail
+source "$LIB_PATH"
+printf '{"body":"patched body"}' | flow_github_api_repo "example/repo" "issues/42" --method PATCH --input -
+EOF
+)"
+
+test "$(jq -r '.number' <<<"$output")" = "42"
+test "$(jq -r '.state' <<<"$output")" = "open"
+test "$(jq -r '.body' "$captured_payload_file")" = "patched body"
+
+echo "flow github api repo fallback preserves input test passed"