Merge pull request 'fix(agents): rename xai provider key to xai-oc to avoid opencode catalog collision' (#119 ) from hotfix/xai-provider-name-collision into main

fix(agents): rename xai provider key to xai-oc to avoid opencode catalog collision (#118 )
opencode ships a built-in `xai` model-catalog entry (a real @ai-sdk/xai integration with Responses-API support). Naming our custom OpenAI-compatible shim `xai` too made opencode's --auto permission-check path assume the catalog's provider object once a `permission` block is present (always, in this pipeline) and call .responses(), which our shim doesn't implement — crashing every @lead/@ops run with "Z.responses is not a function". Reproduced locally with the production config shape on opencode 1.17.13; renaming the provider key to xai-oc (model id xai-oc/grok-4.5) fixes it reliably across repeated fresh-state runs.
2026-07-30 13:08:37 +02:00 · 2026-07-30 14:08:21 +03:00 · 2026-07-27 15:49:45 +02:00 · 2026-07-27 16:49:20 +03:00 · 2026-07-27 15:43:21 +02:00 · 2026-07-27 16:43:05 +03:00
8 changed files with 42 additions and 21 deletions
@@ -212,7 +212,6 @@ jobs:
        id: run
        env:
          SCRIPTS: ${{ runner.temp }}/agents-scripts
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
          XAI_API_KEY: ${{ secrets.XAI_API_KEY }}
          # SELF_TOKEN = the RUNNING agent's OWN token (TOKEN_PM for @pm, TOKEN_OPS for @ops, …).
          # Only this agent's token is placed in its process env, so no agent can act as another.
@@ -25,7 +25,7 @@
    "desc": "Senior dev — complex, multi-file implementation (GLM-5.2 via Ollama Cloud, text-only)."
  },
  "lead": {
-    "model": "xai/grok-4.5",
+    "model": "xai-oc/grok-4.5",
    "vision": true,
    "mode": "pr",
    "skills": [
@@ -43,7 +43,7 @@
    "desc": "QA / reviewer — reviews PRs: reads the diff, drives a headless browser (Playwright) to verify behavior, posts specific recommendations on the PR and the pass/fail verdict on the issue. Never edits code, never merges."
  },
  "ops": {
-    "model": "anthropic/claude-opus-4-8",
+    "model": "xai-oc/grok-4.5",
    "vision": false,
    "mode": "comment",
    "skills": [
@@ -38,7 +38,7 @@ COST=${COST:-0}; INP=${INP:-0}; OUT=${OUT:-0}; CR=${CR:-0}; CW=${CW:-0}; RE=${RE
 IN_TOTAL=$(( INP + CR + CW ))                          # total input context processed
 # Cost label: ollama / ollama-cloud models are SUBSCRIPTION-billed (GPU-time against the plan, no
 # $/token price exists), so a "$0.0000" there would be misleading — label it a subscription instead.
-# Metered providers (anthropic/…) get the real dollar cost opencode computed.
+# Metered providers (xai-oc/…) get the real dollar cost opencode computed.
 case "${MODEL:-}" in
  ollama*|*"/ollama"*) COSTF="subscription" ;;
  *) COSTF=$(awk -v c="$COST" 'BEGIN{printf "$%.4f", c+0}') ;;
@@ -38,22 +38,30 @@ esac
 SKILLS="${SKILLS:-[]}"
 PERM=$(jq -nc --argjson s "$SKILLS" '
  {skill: ( {"*":"deny"} + (reduce $s[] as $k ({}; . + {($k):"allow"})) )}')
-# Two ollama providers: local self-hosted (ornith) + Ollama Cloud (gemma4/kimi-k2.7-code/glm-5.2/minimax-m3).
-# The provider `models:` maps are DERIVED from agents.json (the single source of truth, shared with
-# route.sh) so every model an agent is routed to is always declared in the provider config.
-# `ollama-cloud/` prefix models go to the cloud provider; `ollama/` prefix models go to the local
-# provider. `xai/` prefix models go to the xAI provider (OpenAI-compatible, https://api.x.ai/v1).
-# Built-in providers (e.g. `anthropic/claude-opus-4-8` for @ops) are not derived here.
+# Three OpenAI-compatible providers: local self-hosted ollama (ornith) + Ollama Cloud
+# (gemma4/kimi-k2.7-code/glm-5.2/minimax-m3) + xAI (grok-4.5). The provider `models:` maps are
+# DERIVED from agents.json (the single source of truth, shared with route.sh) so every model an
+# agent is routed to is always declared in the provider config. `ollama-cloud/` prefix models go to
+# the cloud provider; `ollama/` prefix models go to the local provider; `xai-oc/` prefix models go
+# to our xAI shim (OpenAI-compatible, https://api.x.ai/v1). No other built-in providers remain.
+#
+# The provider key is `xai-oc`, NOT `xai` — opencode ships a built-in `xai` entry in its own model
+# catalog (a real @ai-sdk/xai integration that implements the Responses API). Naming our custom
+# openai-compatible shim `xai` collides with that catalog entry: opencode's --auto permission-check
+# path then assumes the catalog's provider (which has `.responses()`) and crashes with
+# "Z.responses is not a function" on every run once a `permission` block is present (i.e. always in
+# this pipeline). Confirmed by reproducing locally with the production config shape on opencode
+# 1.17.13 — renaming the key to `xai-oc` avoids the collision entirely. See issue #118.
 # See issue #31.
 AGENTS_JSON="${SCRIPTS:-$(dirname -- "$0")}/agents.json"
 CLOUD_MODELS=$(jq -r '[.[] | .model | select(startswith("ollama-cloud/")) | sub("^ollama-cloud/";"")] | map({(.):{}}) | add // {}' "$AGENTS_JSON")
 LOCAL_MODELS=$(jq -r '[.[] | .model | select(startswith("ollama/")) | sub("^ollama/";"")] | map({(.):{}}) | add // {"ornith:35b":{}}' "$AGENTS_JSON")
-XAI_MODELS=$(jq -r '[.[] | .model | select(startswith("xai/")) | sub("^xai/";"")] | map({(.):{}}) | add // {}' "$AGENTS_JSON")
+XAI_MODELS=$(jq -r '[.[] | .model | select(startswith("xai-oc/")) | sub("^xai-oc/";"")] | map({(.):{}}) | add // {}' "$AGENTS_JSON")
 jq -n --argjson mcp "$MCP" --argjson perm "$PERM" --argjson cloud "$CLOUD_MODELS" --argjson local "$LOCAL_MODELS" --argjson xai "$XAI_MODELS" --arg url "$OLLAMA_URL" --arg ckey "$OLLAMA_CLOUD_API_KEY" --arg xkey "$XAI_API_KEY" '{
  provider: {
    ollama: {npm:"@ai-sdk/openai-compatible", options:{baseURL:($url+"/v1")}, models:$local},
    "ollama-cloud": {npm:"@ai-sdk/openai-compatible", options:{baseURL:"https://ollama.com/v1", apiKey:$ckey}, models:$cloud},
-    xai: {npm:"@ai-sdk/openai-compatible", options:{baseURL:"https://api.x.ai/v1", apiKey:$xkey}, models:$xai}
+    "xai-oc": {npm:"@ai-sdk/openai-compatible", options:{baseURL:"https://api.x.ai/v1", apiKey:$xkey}, models:$xai}
  },
  permission: $perm,
  mcp: $mcp
@@ -334,7 +334,14 @@ if [ -n "$(git status --porcelain)" ]; then
  git add -A
  git commit -m "@$NAME: issue #$NUM"
 fi
-git push origin "HEAD:$BRANCH" || true
+if git push origin "HEAD:$BRANCH"; then
+  :
+else
+  status=$?
+  echo "git push failed for $BRANCH (exit $status)"
+  post "$(printf '⚠️ Push to branch `%s` failed (git exit %s). The PR will not open until the push succeeds. Please check the Actions log.%s' "$BRANCH" "$status" "$activity")"
+  exit 0
+fi
 git fetch -q origin 2>/dev/null || true

 prbody=$(printf '%s\n\n---\nResolves #%s' "$prdesc" "$NUM")
@@ -360,14 +367,21 @@ url=$(printf '%s' "$resp" | jq -r '.html_url // empty' 2>/dev/null)
 prnum=$(printf '%s' "$resp" | jq -r '.number // empty' 2>/dev/null)
 if [ -z "$url" ]; then
  title="@$NAME: $TITLE"
-  resp=$(curl -sS -X POST "${hdr[@]}" "$API/pulls" \
+  resp_body=/tmp/pr_create_resp.json
+  http_status=$(curl -sS -o "$resp_body" -w '%{http_code}' -X POST "${hdr[@]}" "$API/pulls" \
    -d "$(jq -nc --arg t "$title" --arg h "$br" --arg b "$prbody" \
          '{title:$t, head:$h, base:"main", body:$b}')")
-  echo "PR create ($br): $resp"
+  resp=$(cat "$resp_body" 2>/dev/null || true)
+  echo "PR create ($br): HTTP $http_status — $resp"
  url=$(printf '%s' "$resp" | jq -r '.html_url // empty' 2>/dev/null)
  prnum=$(printf '%s' "$resp" | jq -r '.number // empty' 2>/dev/null)
 fi
-[ -z "$url" ] && { echo "PR open/lookup failed for $br — posting reply on issue instead"; post "$(printf '%s%s' "$reply" "$activity")"; exit 0; }
+if [ -z "$url" ]; then
+  err_msg=$(printf '%s' "$resp" | jq -r 'if type=="object" and .message then .message else "(no error message in response)" end' 2>/dev/null)
+  echo "PR open/lookup failed for $br — HTTP $http_status — response: $resp"
+  post "$(printf '⚠️ Failed to open PR for branch `%s`.\n\nHTTP status: %s\nGitea message: %s%s' "$br" "$http_status" "$err_msg" "$activity")"
+  exit 0
+fi

 # Posts to the PR thread when we have a PR number, else to the origin issue ($NUM).
 prpost() {
@@ -3,7 +3,7 @@
 # plain-text reply (/tmp/agent_out.md) plus the raw event stream (/tmp/events.jsonl).
 #
 # Required env (provided by the workflow step):
-#   ANTHROPIC_API_KEY SELF_TOKEN NAME MODEL VISION MODE HAS_IMAGES BRANCH AUTOPILOT NUM TITLE
+#   XAI_API_KEY SELF_TOKEN NAME MODEL VISION MODE HAS_IMAGES BRANCH AUTOPILOT NUM TITLE
 #   IBODY CMT
 #   FILES   (the opencode -f image flags, from the imgs step output)
 #   AUTOPILOT is 'true' when the issue carries the `autopilot` label (label-gated autopilot mode).
@@ -107,7 +107,7 @@ curl -sS -X POST -H "Authorization: token $SELF_TOKEN" "$API/orgs/{org}/labels"
 3. Commit the standard caller so it gets the agents — `PUT /repos/{owner}/{repo}/contents/.gitea/workflows/ai-agent.yml`
   with base64 `content`, `message`, `branch:"main"` (copy the exact caller from the `agents` repo README).
 4. Add the agent bot users as collaborators: `PUT /repos/{owner}/{repo}/collaborators/{username}` (`{"permission":"write"}`).
-5. Ensure the repo can run agents — the org must hold the runtime secrets (ANTHROPIC_API_KEY, SELF_TOKEN,
+5. Ensure the repo can run agents — the org must hold the runtime secrets (XAI_API_KEY, SELF_TOKEN,
   TOKEN_* , OLLAMA_URL, OLLAMA_CLOUD_API_KEY); set any missing via the secrets calls above.

 ## Packages / container registry
@@ -10,9 +10,9 @@ Shared **AI dev-team** workflow for Gitea Actions, reusable across repos. It giv
 | `@pm` | `ollama-cloud/minimax-m3:cloud` | yes | comment | `gitea-api` | Product manager & orchestrator — plans, picks the dev, hands finished PRs to `@qa`, reports back to the issue creator (autopilot: merges approved PRs itself). Issue thread only; never edits files, never reads the PR diff. |
 | `@junior` | `ollama-cloud/kimi-k2.7-code:cloud` | no | pr | — | Junior dev — small, low-risk changes (mostly YAML/compose/config). Text-only, cannot read images. Defers complex or image tasks to `@senior` or `@lead`. |
 | `@senior` | `ollama-cloud/glm-5.2:cloud` | no | pr | `gitea-api` | Senior dev — complex, multi-file implementation (GLM-5.2 via Ollama Cloud, text-only). |
-| `@lead` | `anthropic/claude-opus-4-8` | yes | pr | `gitea-api` | Tech lead — the hardest problems, architecture, and final calls. |
+| `@lead` | `xai-oc/grok-4.5` | yes | pr | `gitea-api` | Tech lead — the hardest problems, architecture, and final calls. |
 | `@qa` | `ollama-cloud/minimax-m3:cloud` | yes | comment | `gitea-api` | QA / reviewer — reads the PR diff, drives a headless browser (Playwright) to verify behavior; recommendations on the PR, pass/fail verdict on the issue. Never edits code, never merges. |
-| `@ops` | `anthropic/claude-opus-4-8` | no | comment | `gitea-admin` | Gitea operator — administers the instance itself (create orgs/users/repos, labels, secrets, scoped per-user tokens, bootstrap repos). Comments only; never edits code. Confirms before destructive actions. |
+| `@ops` | `xai-oc/grok-4.5` | no | comment | `gitea-admin` | Gitea operator — administers the instance itself (create orgs/users/repos, labels, secrets, scoped per-user tokens, bootstrap repos). Comments only; never edits code. Confirms before destructive actions. |
 | `@intern` | `ollama/ornith:35b` | no | pr | — | Intern — very basic tasks only, routed to the local Ollama model (`ornith:35b`). Text-only, cannot read images. Escalates anything non-trivial to `@junior`, `@senior` or `@lead`. |

 The registry `.gitea/workflows/scripts/agents.json` is the source of truth for this mapping — if you
@@ -111,7 +111,7 @@ points `$SCRIPTS` at it. Keep the workflow and its scripts moving together on `m

 | Secret | For |
 |--------|-----|
-| `ANTHROPIC_API_KEY` | `@lead` (and `@pm`/`@senior`/`@qa` if on Claude) |
+| `XAI_API_KEY` | `@lead`, `@ops` (and any other agent switched to a `xai-oc/…` model) |
 | `OLLAMA_URL`, `OLLAMA_CLOUD_API_KEY` | local ornith / Ollama Cloud (gemma4, kimi-k2.7-code, glm-5.2, minimax-m3) |
 | `TOKEN_PM`,`TOKEN_SENIOR`,`TOKEN_JUNIOR`,`TOKEN_LEAD`,`TOKEN_QA` | **primary** — each agent's own Gitea-user PAT. The running agent gets *only its own* token (as `SELF_TOKEN`) so it posts, commits and comments as itself, and its `gitea-api` skill acts with its own scopes. Scopes: devs + `TOKEN_PM` carry `write:repository` (`@pm` is the only agent that merges, autopilot only); `TOKEN_QA` is `read:repository` + `write:issue` (reviews, never merges). |
 | `TOKEN_OPS` | `@ops` only — the admin PAT behind the `gitea-admin` skill (create orgs/users/repos, manage labels & secrets, mint scoped tokens). Injected into the agent process only when the agent is `@ops`. |
Author	SHA1	Message	Date
ffaerber	e040247097	Merge pull request 'fix(agents): rename xai provider key to xai-oc to avoid opencode catalog collision' (#119 ) from hotfix/xai-provider-name-collision into main ci / lint (push) Successful in 14s Details	2026-07-30 13:08:37 +02:00
Felix Faerber	c8efc17729	fix(agents): rename xai provider key to xai-oc to avoid opencode catalog collision (#118 ) ci / lint (pull_request) Successful in 17s Details opencode ships a built-in `xai` model-catalog entry (a real @ai-sdk/xai integration with Responses-API support). Naming our custom OpenAI-compatible shim `xai` too made opencode's --auto permission-check path assume the catalog's provider object once a `permission` block is present (always, in this pipeline) and call .responses(), which our shim doesn't implement — crashing every @lead/@ops run with "Z.responses is not a function". Reproduced locally with the production config shape on opencode 1.17.13; renaming the provider key to xai-oc (model id xai-oc/grok-4.5) fixes it reliably across repeated fresh-state runs.	2026-07-30 14:08:21 +03:00
ffaerber	60f9e95ecc	Merge pull request 'hotfix: wire the xai provider into install-opencode.sh' (#115 ) from hotfix/xai-provider-wiring into main ci / lint (push) Successful in 14s Details	2026-07-27 15:49:45 +02:00
Felix Faerber	dd25c0ac2b	hotfix: wire the xai provider into install-opencode.sh ci / lint (pull_request) Successful in 21s Details PR #114 pointed @lead/@ops at xai/grok-4.5 but never gave opencode a provider config for it — xai is not a built-in like anthropic was, it needs the same explicit OpenAI-compatible block as ollama/ollama-cloud (confirmed by the prior, never-merged investigation in PR #110). Without this, any @lead/@ops run fails immediately on an unresolvable provider. Adds the xai provider block (baseURL https://api.x.ai/v1, models derived from agents.json) and passes XAI_API_KEY into the Install-opencode step (it was already added to the Run-agent step in #114).	2026-07-27 16:49:20 +03:00
ffaerber	8ae6abd9d0	Merge pull request 'chore: switch @lead/@ops from Anthropic to xAI grok-4.5' (#114 ) from chore/xai-grok-4.5 into main ci / lint (push) Successful in 17s Details	2026-07-27 15:43:21 +02:00
Felix Faerber	b30db8a4c9	chore: switch @lead/@ops from Anthropic to xAI grok-4.5 ci / lint (pull_request) Successful in 15s Details Removes the last Anthropic-model usage from the agent registry. XAI_API_KEY was already provisioned as an org secret; wire it into the run-agent step and update every doc/comment that referenced ANTHROPIC_API_KEY or claude-opus-4-8.	2026-07-27 16:43:05 +03:00
ffaerber	6955bc4f71	Merge pull request '@junior: publish.sh: PR-creation and push failures are silently swallowed' (#113 ) from ai/issue-112 into main ci / lint (push) Successful in 32s Details	2026-07-27 15:33:43 +02:00
junior	0a06c813bc	publish.sh: address review — fix PR-failure format, capture HTTP status, append activity to push failure	2026-07-27 13:32:47 +00:00
junior	c4fb117b93	publish.sh: surface PR-open and git-push failures as issue comments ci / lint (pull_request) Successful in 13s Details	2026-07-27 13:30:49 +00:00