agent-control-plane 0.2.0 → 0.4.9

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 || '',