Sync upstream v7.0.6 → v7.2.15 (preserve ampeco patches) - #3
Merged
Conversation
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Add Codex Switch tool to README
- Removed obsolete Redis protocol test cases and helper functions that were no longer relevant due to recent architecture changes. - Streamlined remaining test files to align with updated Redis handling and connection management logic.
- Registered new models: `gemini-3-flash-agent` and `gemini-3.5-flash-low` with detailed specifications. - Includes support for dynamic thinking levels and extended context capabilities.
- Added new reasoning levels: `none`, `minimal`, and `unsupported` to Codex model configurations. - Introduced metadata sanitization and normalization for reasoning levels in API response. - Extended unit tests to cover reasoning levels validation and metadata sanitation logic.
- Added new model `gemini-3.5-flash` to the registry with enhanced intelligence and speed capabilities. - Supports extended thinking levels (`minimal`, `low`, `medium`, `high`) and dynamic adjustments. - Expanded generation methods, including content creation and token counting.
… capabilities - Registered `gemini-3.5-flash` model with dynamic thinking levels and extended token limits. - Supports multiple generation methods, including cached and batch content creation.
- Updated `ConvertClaudeRequestToGemini` to ignore empty `text` entries during processing. - Added unit tests to ensure empty `text` parts are skipped correctly. Closes: router-for-me#3485
Add reasoning_effort to usage event payloads
…eue operations - Added support for advanced RESP commands (`AUTH`, `SUBSCRIBE`, `RPOP`, `LPOP`) with extended functionality. - Implemented queue operations for usage events via `RPOP` and `LPOP` commands. - Introduced subscription handling with new Pub/Sub message features and error handling improvements. - Updated Redis connection logic to enforce authentication requirements and validate inputs. - Expanded related unit tests to cover new scenarios and edge cases.
…roject-id-onboard fix: require antigravity project id
fix: scope antigravity credits fallback gate
…-length-stream-errors-dev fix codex context length stream errors
Add cluster-specific docker-compose configuration for CLIProxyAPI
fix(auth): update import paths to v7 for registry and executor
…nversion - Updated `ConvertClaudeRequestToGemini` logic to treat `system` role as `developer`. - Added unit test case to validate the behavior. Closes: router-for-me#3510
- Registered `grok-build-0.1` model with enhanced context length and agentic engineering support. - Supports dynamic thinking levels for improved software workflows.
- Acknowledged APIKEY.FUN as a sponsor with details on their services and exclusive project-specific benefits. - Updated Japanese (README_JA.md), Chinese (README_CN.md), and English (README.md) documentation. - Added new sponsorship image (`assets/apikey.png`).
…etching - Introduced `fetch_codex_models` CLI command to fetch and save Codex model catalogs in JSON format. - Supports configuration via flags or `config.yaml` for flexible setup. - Enhanced `fetch_antigravity_models` with `config.yaml` support and improved auth directory resolution logic.
- Included `RequestID` field in `homeRequestLogPayload` for better log categorization. - Updated `forwardRequestLogToHome` and related components to handle `RequestID`. - Added new test cases to validate `RequestID` propagation in streaming requests.
- Introduced `FileBodySource` to support large request log sections stored in temp files. - Added file-backed support for WebSocket timeline and API WebSocket timeline logging. - Updated `LogRequest` and middleware to integrate optional file-backed sources. - Implemented clean-up mechanisms to manage temporary log files after processing.
- Introduced parsing logic to handle `websockets` field in auth files. - Extended `PatchAuthFileFields` to update `websockets` and arbitrary nested metadata fields. - Added tests to validate `websockets` parsing, updating, and persistence.
…quest-schema-cleanup fix: clean Gemini CLI request schemas
… improved SSE handling - Introduced `GPTImage2BaseModel` configuration for hosted image generation tools with validation for "gpt-" prefix. - Added logic to dynamically resolve and apply the base model in Codex executor workflows. - Enhanced server-sent events (SSE) implementation with keep-alive tickers and error events for stream reliability. - Updated configuration file examples and internal documentation.
…nses - Updated WebSocket response repair tests to validate incremental preservation of response calls and outputs. - Added new test cases for custom tool responses ensuring accurate handling of output cache and call cache. - Refactored `repairResponsesWebsocketToolCallsWithCaches` to handle orphan outputs more consistently. - Adjusted input filtering logic for clearer incremental repair behavior. Closes: router-for-me#3569
- Updated `response.output_item.done` to use `item.summary.0.text` instead of `item.summary.text`.
…quirements - Added `sanitizeClaudeWebSearchDomains` to remove empty `allowed_domains` and `blocked_domains` fields for built-in web_search tools, addressing ambiguity errors from Anthropic. - Integrated domain sanitization into the Claude message preparation pipeline. - Added test cases to validate correct handling of empty and non-empty domain fields across various tool types. Closes: router-for-me#2681
…ntegration - Added `ConvertClaudeToolResultContent` to standardize Claude tool_result content, preserving JSON structure and splitting out base64-encoded images. - Updated Gemini and Gemini-CLI translators to use the new utility for generating deterministic function responses and inline image parts. - Added comprehensive test cases for content types and edge cases, ensuring correct handling of string, JSON, and image blocks. Closes: router-for-me#2781
…e credential fallback logic - Introduced `disable-claude-cloak-mode` configuration to globally disable Claude cloak mode with credential-level overrides. - Enhanced `getCloakConfigFromAuth` to support fallback to metadata for cloak settings. - Updated cloak configuration precedence logic, integrating global, credential, and default modes. - Updated config and watcher diff handling to include `disable-claude-cloak-mode`. Closes: router-for-me#2789
- Added information about exclusive retail availability of Claude Max 200 and GPT Pro 200 premium accounts. - Enhanced descriptions of VisionCoder's offerings in README files (EN, JA, CN).
Keep RPC streaming executor callback scopes alive until async streams close, detach nested host.model.execute_stream contexts from request cancellation, and clean up the stream bridge on stream completion.
…rgets (router-for-me#3865) * feat(plugin): add ModelRouter before auth with single-slot routing targets ## Motivation Plugins that need to change execution based on the **original inbound request** (protocol format, raw body, headers, query, stream flag, metadata, etc.) often resorted to virtual/trampoline models or routing inside interceptors. This commit adds **ModelRouter**: a pluggable layer **before** model-to-provider resolution and AuthManager credential selection, so plugins can declare who executes a request without spoofing the client model name. This is a **new capability**, not a bugfix on the existing chain. With no ModelRouter plugins loaded, behavior matches upstream. ## Pipeline placement - `execute`, `stream`, and `count` (and image paths via AuthManager) call `applyModelRouter()` before building `coreexecutor.Request`. - Routing runs **before** the request interceptor (before auth), so routers see the client’s original context. After a plugin executor is chosen, the existing **after-auth interceptor → response/stream interceptor** chain still applies. - Internal `ExecuteModel` / `ExecuteModelStream` (host callbacks) support `SkipRouterPluginID` so nested calls do not re-enter the same router. ## Routing API (single slot, mutually exclusive) `ModelRouteResponse` uses **one target slot** to avoid ambiguity when both `TargetExecutorPluginID` and `TargetProvider` were set and the host ignored one: | Field | Meaning | |-------|---------| | `Handled` | `false`: this router declines; try the next router or default path | | `TargetKind` | `self` \| `executor` \| `provider` (pick one) | | `Target` | `self`/`executor`: plugin ID; `provider`: built-in provider key | | `TargetModel` | Optional on `provider` only; empty keeps client `RequestedModel` | | `Reason` | Optional diagnostic text | - **self**: the router plugin’s own executor (`Target` normalized to the router’s plugin ID). - **executor**: another plugin’s executor; host pre-checks with `executorPluginReady()` (executor declared and provider identifier resolvable) to avoid handled routes that 500 at execution. - **provider**: skip registry model resolution; fixed built-in AuthManager path; optional `TargetModel` for execution model only—**does not** change outward requested-model metadata. Routers run in **descending plugin priority** (tie-break: ascending plugin ID). Panic, error, invalid target, or unavailable executor/provider → log and **fall through to the next router**; if none handle, use the original provider+auth flow. ## Context exposed to routers `ModelRouteRequest` includes: - `SourceFormat`, `RequestedModel`, `Stream` - `Headers`, `Query`, `Body` (defensive copies) - `Metadata` (best-effort read-only context snapshot) - `AvailableProviders`: built-in provider keys with at least one **non-disabled** auth (`AuthManager.AvailableProviders()`). **Does not** reflect per-model cooldown or transient unavailability—treat as an optimistic snapshot. Adds `AuthManager.HasProviderAuth()` and `AvailableProviders()`, excluding `Disabled` and `StatusDisabled` auths consistently with credential selection. ## Host and RPC - Go plugins: `pluginapi.ModelRouter` + `RouteModel()`. - RPC plugins: `pluginabi.MethodModelRoute` (`model.route`), capability flag `model_router`. - `pluginhost.Host` implements `RouteModel` / `RouteModelExcept`; handlers use `SetModelRouterHost` or a `PluginHost` type assertion; **direct executor** paths use `ExecutePluginExecutor*` / `CountPluginExecutor`. - No bundled example ModelRouter plugin; capability is active only when a third-party plugin declares `model_router` and loads. ## Plugin RPC schema (policy A, upstream-aligned) - `pluginabi.SchemaVersion` stays **1**: capability additions (`model_router`, `model.route`) do not bump the number; increment only on breaking RPC JSON changes. - Host sends `schema_version` at register; reject only if the plugin declares a **higher** version than the host. - No unpublished “ModelRouter requires schema ≥ 3” gate (v3 single-slot API was never public). - Existing plugins and examples without `model_router` (`schema_version: 1`) need no changes. - RPC ModelRouter: `schema_version: 1` + `model_router: true` + implement `model.route`. ## Path consistency within this commit - Provider routes reuse image-only model checks (e.g. `gpt-image-2`) on the normalized model, same as the default AuthManager path. - `count` aligned with execute/stream: `SkipRouterPluginID`, query/headers injection, interceptor skip semantics. - Handlers: `modelRoutersEnabled` treats hosts without `HasModelRouters` as disabled (same as before ModelRouter existed); `pluginhost.Host` implements the detector. - API docs: `ModelRouter` explicitly includes built-in **provider** targets (in addition to plugin executors and the router’s own executor). ## Testing go test ./internal/pluginhost ./sdk/api/handlers ./sdk/pluginapi ./sdk/pluginabi ./sdk/cliproxy/auth go build -o test-output ./cmd/server && rm test-output go test ./... * fix(handlers): address ModelRouter review feedback - Use modelExecutionQuery for plugin executor and AuthManager paths so inbound URL query matches router/header behavior - Guard queryFromContext when gin Request.URL is nil - Read plugin executor stream chunks via nextStreamChunk to exit on cancel - Drop redundant clonePluginMetadata on capability record meta Tests cover query propagation, stream cancel, and nil URL safety. * feat(plugin): add Claude web search router example Add a Claude Code web_search ModelRouter example that can route matching Claude requests through Antigravity, Codex, xAI, or Tavily. The plugin includes executor orchestration, backend fallback/penalty handling, Tavily API key support, Claude-compatible response assembly, stream forwarding, and focused unit coverage for detection, fallback routing, model resolution, penalties, stream forwarding, and Tavily behavior. Verification: go test -count=1 ./... in examples/plugin/claude-web-search-router/go; go build -buildmode=c-shared for the plugin; go build ./cmd/server; live local CPA curl coverage for plugin load, four explicit routes, fallback, and Codex spark routing. * fix(pluginhost): validate executor routes before fallback * fix(pluginhost): skip oauth-only executor routes
- Included CatAPI information in README files (EN, JA, CN) to acknowledge sponsorship. - Added CatAPI logo and sign-up link with credit claim details. - Updated project assets to include CatAPI logo.
…handlers - Updated `openai_videos_handlers` to extract and set `video_url` from payloads when available. - Enhanced unit tests to validate correct `video_url` extraction and inclusion in responses.
…call streams (router-for-me#3868) * fix(translator): emit Claude server tool blocks for Codex web_search_call streams Map Codex Responses streaming web_search_call events to Claude SSE server_tool_use and web_search_tool_result blocks, with deduplication and a focused stream regression test. * fix(translator): stabilize Codex web_search fallback tool_use IDs Reuse the active fallback web_search tool_use ID across later stream events so tool_result blocks stay paired when upstream omits item IDs. This is defensive hardening; live Codex streams already provide ws_* IDs. * fix(translator): emit Codex web_search blocks from populated items Wait for output_item.done before emitting Claude web_search tool_use and tool_result blocks, and avoid deduping early added/completed events that arrive before action.query is available. Matches live Responses stream ordering seen in local tmux verification. * fix(translator): map Codex web_search_call items in non-stream Claude responses Emit server_tool_use and web_search_tool_result blocks from completed response.output web_search_call items, matching the streaming translator. * fix(translator): keep non-stream web_search on end_turn and dedupe output items Do not treat server web_search_call items as client tool_use for stop_reason. Skip duplicate or query-less open_page web_search output items in non-stream translation, matching spark live behavior.
…responses - Introduced `applyResponsesFunctionCallNamespaceFields` to manage name and namespace settings in response items. - Added `splitResponsesQualifiedFunctionCallFromRequest` for handling qualified names and matching them with namespaces. - Updated response generation logic to preserve namespace and function call structure in multiple response pathways. - Expanded unit tests to validate namespace and function call restoration in both stream and non-stream scenarios.
…fic test - Refactored content block start/stop logic into `startCodexTextBlock` and `stopCodexTextBlock` for better readability and reusability. - Updated logic to ensure proper handling of "output_text" block events to avoid ghost stop emissions. - Added `TestConvertCodexResponseToClaude_StreamTextBeforeToolCallsDoesNotEmitGhostStop` to validate content block start/stop behavior in streamed responses.
…host-async-reload Fix async plugin reload races
…e and expand test coverage - Changed default plugin `Enabled` state from `true` to `false` across configurations, runtime logic, and YAML defaults. - Added helper function `enabledPluginConfigs` for generating plugin configs with `Enabled` set explicitly. - Expanded unit tests in `pluginhost`, `config`, and `management` to validate behavior changes for disabled plugins, default settings, and skipped load scenarios.
- Added `isCodexUsageLimitError` to detect and handle `usage_limit_reached` errors from Codex responses. - Updated `newCodexStatusErr` to treat usage limit errors as HTTP 429 with proper `RetryAfter` handling. - Enhanced test coverage to validate usage limit error handling, including reset time parsing and retry behavior. Closes: router-for-me#2886
Use the agy CLI User-Agent family (antigravity/cli/{version} darwin/arm64)
on CPA macOS/arm64 hosts instead of the legacy hub-style antigravity/{version}
string. Resolve the cached version from the CLI auto-updater manifest
(darwin_arm64.json), then the GCS latest pointer, then antigravity-cli GCS
prefix listing, with fallback 1.0.8 when all sources fail.
Update AntigravityUserAgent helpers and executor default UA comment to match.
…cli-ua-upstream-dev feat(misc): align Antigravity runtime UA with agy CLI version sources
…logic - Introduced `xaiNormalizeReasoningSummaryData` and related functions to normalize `reasoning_text` events into `reasoning_summary` shapes for standardization. - Updated WebSocket and streaming logic to process normalized reasoning summary events correctly. - Enhanced tests to validate normalization, order of events, and output structure in both stream and non-stream scenarios.
…roxy handling - Added auth binding logic to tie video requests to specific authentication IDs. - Enhanced video content handlers to support proxy configuration based on selected auth. - Introduced helper functions for creating HTTP clients with direct or global proxy fallback. - Expanded unit tests to validate auth binding, proxy usage, and fallback behavior.
…essage generation - Refactored `ConvertOpenAIResponsesRequestToClaude` logic to align tool use with corresponding tool results. - Introduced helper functions for appending and flushing pending reasoning and tool use messages. - Expanded tests to validate message order and content consistency when processing tool calls and results.
Sync the fork from its previous baseline (upstream v7.0.6) up to v7.2.15 (305 upstream commits, 563 files), bringing in all upstream bugfixes and features while preserving the ampeco patch series. Conflict resolutions (5 files): - internal/translator/openai/claude/openai_claude_request.go Kept Patch 2 (stripCacheControl) alongside upstream's new shouldMapClaudeThinkingToGPTReasoning helper. Upstream does not strip cache_control, so the patch remains additive. - internal/translator/openai/claude/openai_claude_request_test.go Unioned imports (bytes + encoding/base64 + fmt). - internal/translator/openai/claude/openai_claude_response_test.go Kept both Patch 1 reasoning-fallback tests and upstream's new tests. - .github/workflows/release.yaml Took upstream's refactor (named "Fetch tags" step, setup-go@v6) and extended Patch 4's antigravity catalog strip to ALL FOUR build jobs (build-hosted, build-linux-glibc, build-linux-no-plugin, build-freebsd); upstream split the single v7.0.6 build job into four, each refreshing the catalog, so the strip must run after each refresh. - README.md Kept the fork README (intentionally fork-specific). Auto-merged with no conflict: Patch 3 (claude_executor.go OAuth Bearer) and Patch 4's in-tree internal/registry/models/models.json. Dropped: an uncommitted working-tree fix for Claude->Codex role:"system" handling (router-for-me#3634) — upstream already converts role:"system" to "developer" in codex_claude_request.go, verified empirically. Validation: go build ./... OK; all documented patch tests pass; go test ./... green except TestXAIExecutorOmitsUnsupportedReasoningEffort, which fails identically on pristine upstream/main (pre-existing upstream issue, unrelated to this sync). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Brings the fork up to date with upstream router-for-me/CLIProxyAPI:
v7.0.6 → v7.2.15 (305 commits, 563 files), merged via a merge commit so
both histories are preserved and the diff is reviewable. The ampeco patch
series is carried forward intact.
Conflict resolutions (5 files)
new shouldMapClaudeThinkingToGPTReasoning (upstream doesn't strip
cache_control, so the patch stays additive).
and upstream's new tests.
step, setup-go@v6) AND extended Patch 4's antigravity catalog strip to all 4
build jobs (upstream split the single build job into four, each refreshing
the catalog).
Auto-merged cleanly: Patch 3 (claude_executor.go OAuth Bearer) and Patch 4's
in-tree models.json (verified: 0 Claude entries in antigravity).
Dropped
An uncommitted WIP fix for Claude→Codex role:"system" (router-for-me#3634) — upstream
already converts role:"system" → "developer" in codex_claude_request.go.
Verified empirically.
Validation
go build ./... OK; all documented patch tests pass; go test ./... green except
TestXAIExecutorOmitsUnsupportedReasoningEffort, which fails identically on
pristine upstream/main (pre-existing upstream issue, unrelated to this sync).
Follow-up
Per README, cut a vX.Y.Z-ampeco release tag after merge.