Sync upstream v7.2.15 → v7.2.73 (preserve ampeco patches 1-5)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,7 +18,7 @@ Our team doesn't have any GODs or ORACLEs or MIND READERs. Please make sure to a
 A clear and concise description of what the bug is.
 
 **CLI Type**
-What type of CLI account do you use?  (gemini-cli, gemini, codex, claude code or openai-compatibility)
+What type of CLI account do you use?  (gemini, codex, claude code or openai-compatibility)
 
 **Model Name**
 What model are you using? (example: gemini-2.5-pro, claude-sonnet-4-20250514, gpt-5, etc.)

.github/scripts/refresh-model-catalogs.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+models_repository="${MODELS_REPOSITORY_URL:-https://github.com/router-for-me/models.git}"
+models_ref="${MODELS_REPOSITORY_REF:-main}"
+catalog_dir="${MODEL_CATALOG_DIR:-internal/registry/models}"
+codex_catalog="$catalog_dir/codex_client_models.json"
+codex_candidate="$(mktemp)"
+trap 'rm -f "$codex_candidate"' EXIT
+
+git fetch --depth 1 "$models_repository" "$models_ref"
+git show FETCH_HEAD:models.json > "$catalog_dir/models.json"
+
+if git show FETCH_HEAD:codex_client_models.json > "$codex_candidate" &&
+  go run ./cmd/validate_codex_models --file "$codex_candidate"; then
+	mv "$codex_candidate" "$codex_catalog"
+	printf 'Refreshed validated Codex client model catalog.\n'
+else
+	printf '::warning::Remote Codex client model catalog is missing or invalid; using embedded fallback.\n'
+fi
+
+go run ./cmd/validate_codex_models --file "$codex_catalog"
+
+# --- ampeco Patch 4: strip Claude entries from the antigravity catalog ---
+# Antigravity's published catalog advertises Claude models served by Google's
+# cloudcode-pa.googleapis.com. With those entries present, an antigravity OAuth
+# becomes eligible alongside the Anthropic OAuth pool for `claude-*` selector
+# picks; session-affinity then pins entire Claude Code sessions to the
+# antigravity OAuth, exhausting its small Sonnet quota within hours. Strip them
+# post-refresh so the antigravity OAuth is Gemini-only.
+python3 - <<'PY'
+import json
+p = "internal/registry/models/models.json"
+with open(p) as f:
+    d = json.load(f)
+if "antigravity" in d:
+    before = len(d["antigravity"])
+    d["antigravity"] = [
+        m for m in d["antigravity"]
+        if not (
+            m.get("id", "").startswith("claude-")
+            or m.get("type", "") == "claude"
+            or m.get("owned_by", "") == "anthropic"
+        )
+    ]
+    after = len(d["antigravity"])
+    print(f"antigravity catalog: {before} -> {after} entries ({before - after} claude stripped)")
+with open(p, "w") as f:
+    json.dump(d, f, indent=2)
+    f.write("\n")
+PY

.github/workflows/docker-image.yml

@@ -15,10 +15,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+          cache: true
       - name: Refresh models catalog
-        run: |
-          git fetch --depth 1 https://github.com/router-for-me/models.git main
-          git show FETCH_HEAD:models.json > internal/registry/models/models.json
+        run: bash .github/scripts/refresh-model-catalogs.sh
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
@@ -50,10 +53,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+          cache: true
       - name: Refresh models catalog
-        run: |
-          git fetch --depth 1 https://github.com/router-for-me/models.git main
-          git show FETCH_HEAD:models.json > internal/registry/models/models.json
+        run: bash .github/scripts/refresh-model-catalogs.sh
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub

.github/workflows/pr-test-build.yml

@@ -12,15 +12,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Refresh models catalog
-        run: |
-          git fetch --depth 1 https://github.com/router-for-me/models.git main
-          git show FETCH_HEAD:models.json > internal/registry/models/models.json
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
           cache: true
+      - name: Refresh models catalog
+        run: bash .github/scripts/refresh-model-catalogs.sh
       - name: Build
         run: |
           go build -o test-output ./cmd/server

.github/workflows/release.yaml

@@ -127,51 +127,16 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
+      - uses: actions/setup-go@v6
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          cache: true
       - name: Refresh models catalog
         shell: bash
-        run: |
-          set -euo pipefail
-          git fetch --depth 1 https://github.com/router-for-me/models.git main
-          git show FETCH_HEAD:models.json > internal/registry/models/models.json
-      - name: Strip Claude entries from antigravity catalog (ampeco Patch 4)
-        # Antigravity's published catalog advertises Claude models served by
-        # Google's cloudcode-pa.googleapis.com. With those entries present, an
-        # antigravity OAuth becomes eligible alongside the Anthropic OAuth pool
-        # for `claude-*` selector picks. Session-affinity then pins entire
-        # Claude Code sessions (parent + sub-agents) to the antigravity OAuth
-        # whenever the parent request was a Gemini call, exhausting
-        # Antigravity's small Sonnet quota within hours. Strip them post-refresh
-        # so the antigravity OAuth is Gemini-only.
-        shell: bash
-        run: |
-          python3 - <<'PY'
-          import json
-          p = "internal/registry/models/models.json"
-          with open(p) as f:
-              d = json.load(f)
-          if "antigravity" in d:
-              before = len(d["antigravity"])
-              d["antigravity"] = [
-                  m for m in d["antigravity"]
-                  if not (
-                      m.get("id", "").startswith("claude-")
-                      or m.get("type", "") == "claude"
-                      or m.get("owned_by", "") == "anthropic"
-                  )
-              ]
-              after = len(d["antigravity"])
-              print(f"antigravity catalog: {before} -> {after} entries ({before - after} claude stripped)")
-          with open(p, "w") as f:
-              json.dump(d, f, indent=2)
-              f.write("\n")
-          PY
+        run: bash .github/scripts/refresh-model-catalogs.sh
       - name: Fetch tags
         shell: bash
         run: git fetch --force --tags
-      - uses: actions/setup-go@v6
-        with:
-          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - uses: actions/cache@v4
         with:
           path: |
@@ -289,44 +254,13 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
+      - uses: actions/setup-go@v6
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          cache: true
       - name: Refresh models catalog
         shell: bash
-        run: |
-          set -euo pipefail
-          git fetch --depth 1 https://github.com/router-for-me/models.git main
-          git show FETCH_HEAD:models.json > internal/registry/models/models.json
-      - name: Strip Claude entries from antigravity catalog (ampeco Patch 4)
-        # Antigravity's published catalog advertises Claude models served by
-        # Google's cloudcode-pa.googleapis.com. With those entries present, an
-        # antigravity OAuth becomes eligible alongside the Anthropic OAuth pool
-        # for `claude-*` selector picks. Session-affinity then pins entire
-        # Claude Code sessions (parent + sub-agents) to the antigravity OAuth
-        # whenever the parent request was a Gemini call, exhausting
-        # Antigravity's small Sonnet quota within hours. Strip them post-refresh
-        # so the antigravity OAuth is Gemini-only.
-        shell: bash
-        run: |
-          python3 - <<'PY'
-          import json
-          p = "internal/registry/models/models.json"
-          with open(p) as f:
-              d = json.load(f)
-          if "antigravity" in d:
-              before = len(d["antigravity"])
-              d["antigravity"] = [
-                  m for m in d["antigravity"]
-                  if not (
-                      m.get("id", "").startswith("claude-")
-                      or m.get("type", "") == "claude"
-                      or m.get("owned_by", "") == "anthropic"
-                  )
-              ]
-              after = len(d["antigravity"])
-              print(f"antigravity catalog: {before} -> {after} entries ({before - after} claude stripped)")
-          with open(p, "w") as f:
-              json.dump(d, f, indent=2)
-              f.write("\n")
-          PY
+        run: bash .github/scripts/refresh-model-catalogs.sh
       - name: Fetch tags
         shell: bash
         run: git fetch --force --tags
@@ -452,51 +386,16 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
+      - uses: actions/setup-go@v6
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          cache: true
       - name: Refresh models catalog
         shell: bash
-        run: |
-          set -euo pipefail
-          git fetch --depth 1 https://github.com/router-for-me/models.git main
-          git show FETCH_HEAD:models.json > internal/registry/models/models.json
-      - name: Strip Claude entries from antigravity catalog (ampeco Patch 4)
-        # Antigravity's published catalog advertises Claude models served by
-        # Google's cloudcode-pa.googleapis.com. With those entries present, an
-        # antigravity OAuth becomes eligible alongside the Anthropic OAuth pool
-        # for `claude-*` selector picks. Session-affinity then pins entire
-        # Claude Code sessions (parent + sub-agents) to the antigravity OAuth
-        # whenever the parent request was a Gemini call, exhausting
-        # Antigravity's small Sonnet quota within hours. Strip them post-refresh
-        # so the antigravity OAuth is Gemini-only.
-        shell: bash
-        run: |
-          python3 - <<'PY'
-          import json
-          p = "internal/registry/models/models.json"
-          with open(p) as f:
-              d = json.load(f)
-          if "antigravity" in d:
-              before = len(d["antigravity"])
-              d["antigravity"] = [
-                  m for m in d["antigravity"]
-                  if not (
-                      m.get("id", "").startswith("claude-")
-                      or m.get("type", "") == "claude"
-                      or m.get("owned_by", "") == "anthropic"
-                  )
-              ]
-              after = len(d["antigravity"])
-              print(f"antigravity catalog: {before} -> {after} entries ({before - after} claude stripped)")
-          with open(p, "w") as f:
-              json.dump(d, f, indent=2)
-              f.write("\n")
-          PY
+        run: bash .github/scripts/refresh-model-catalogs.sh
       - name: Fetch tags
         shell: bash
         run: git fetch --force --tags
-      - uses: actions/setup-go@v6
-        with:
-          go-version: ${{ env.GO_VERSION }}
-          cache: true
       - uses: actions/cache@v4
         with:
           path: |
@@ -594,7 +493,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       TARGET: ${{ matrix.target }}
-      GOARCH: ${{ matrix.goarch }}
+      TARGET_GOARCH: ${{ matrix.goarch }}
       ASSET_ARCH: ${{ matrix.asset_arch }}
       ASSET_SUFFIX: ${{ matrix.asset_suffix }}
     strategy:
@@ -615,47 +514,14 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - name: Refresh models catalog
-        run: |
-          git fetch --depth 1 https://github.com/router-for-me/models.git main
-          git show FETCH_HEAD:models.json > internal/registry/models/models.json
-      - name: Strip Claude entries from antigravity catalog (ampeco Patch 4)
-        # Antigravity's published catalog advertises Claude models served by
-        # Google's cloudcode-pa.googleapis.com. With those entries present, an
-        # antigravity OAuth becomes eligible alongside the Anthropic OAuth pool
-        # for `claude-*` selector picks. Session-affinity then pins entire
-        # Claude Code sessions (parent + sub-agents) to the antigravity OAuth
-        # whenever the parent request was a Gemini call, exhausting
-        # Antigravity's small Sonnet quota within hours. Strip them post-refresh
-        # so the antigravity OAuth is Gemini-only.
-        run: |
-          python3 - <<'PY'
-          import json
-          p = "internal/registry/models/models.json"
-          with open(p) as f:
-              d = json.load(f)
-          if "antigravity" in d:
-              before = len(d["antigravity"])
-              d["antigravity"] = [
-                  m for m in d["antigravity"]
-                  if not (
-                      m.get("id", "").startswith("claude-")
-                      or m.get("type", "") == "claude"
-                      or m.get("owned_by", "") == "anthropic"
-                  )
-              ]
-              after = len(d["antigravity"])
-              print(f"antigravity catalog: {before} -> {after} entries ({before - after} claude stripped)")
-          with open(p, "w") as f:
-              json.dump(d, f, indent=2)
-              f.write("\n")
-          PY
-      - name: Fetch tags
-        run: git fetch --force --tags
       - uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
           cache: true
+      - name: Refresh models catalog
+        run: bash .github/scripts/refresh-model-catalogs.sh
+      - name: Fetch tags
+        run: git fetch --force --tags
       - uses: actions/cache@v4
         with:
           path: |
@@ -710,7 +576,7 @@ jobs:
         run: |
           set -euo pipefail
           mkdir -p "dist/${TARGET}/bin"
-          CGO_ENABLED=0 GOOS=freebsd GOARCH="$GOARCH" go build -buildvcs=false \
+          CGO_ENABLED=0 GOOS=freebsd GOARCH="$TARGET_GOARCH" go build -buildvcs=false \
             -ldflags="-s -w -X main.Version=${RELEASE_VERSION} -X main.Commit=${COMMIT} -X main.BuildDate=${BUILD_DATE}" \
             -o "dist/${TARGET}/bin/cli-proxy-api" ./cmd/server/
       - name: Package FreeBSD archive

.gitignore

@@ -25,6 +25,7 @@ static/*
 
 # Authentication data
 auths/*
+/auths
 !auths/.gitkeep
 
 # Documentation
@@ -38,6 +39,7 @@ GEMINI.md
 .worktrees/
 .codex/*
 .claude/*
+.claude
 .gemini/*
 .serena/*
 .agent/*

README.md

@@ -26,11 +26,11 @@ When the credential's API key starts with `sk-ant-oat01-`, route via `Authorizat
 
 ### Patch 4 — strip Claude entries from the `antigravity` model catalog
 
-`internal/registry/models/models.json` and `.github/workflows/release.yaml` (post-refresh step).
+`internal/registry/models/models.json` and `.github/scripts/refresh-model-catalogs.sh` (post-refresh strip; the script is invoked by every build job in `release.yaml`).
 
 Antigravity's published catalog includes `claude-opus-4-6-thinking` and `claude-sonnet-4-6` because Google's AI Code Assist tier resells Claude models via `cloudcode-pa.googleapis.com`. With those entries present, an antigravity OAuth becomes eligible alongside the Anthropic OAuth pool when the selector picks for `claude-*` routes. Session-affinity then pins entire Claude Code sessions (parent + sub-agents) to the antigravity OAuth whenever the parent request was a Gemini call, exhausting Antigravity's small Sonnet quota within hours.
 
-Strip every entry whose `id` starts with `claude-`, whose `type` is `claude`, or whose `owned_by` is `anthropic` from the `antigravity` array. Applied both to the in-tree `models.json` (so `go test ./...` and local dev see the patched shape) and to the release workflow's post-refresh step (so upstream catalog refreshes during tagged builds re-apply the strip automatically). After the patch the antigravity OAuth is Gemini-only and Claude requests fall through to the Anthropic OAuth pool.
+Strip every entry whose `id` starts with `claude-`, whose `type` is `claude`, or whose `owned_by` is `anthropic` from the `antigravity` array. Applied both to the in-tree `models.json` (so `go test ./...` and local dev see the patched shape) and to `.github/scripts/refresh-model-catalogs.sh` (so upstream catalog refreshes during tagged builds re-apply the strip automatically). After the patch the antigravity OAuth is Gemini-only and Claude requests fall through to the Anthropic OAuth pool.
 
 ## Tests