chore: sync upstream through 8bba7a77

config.example.yaml

@@ -185,9 +185,13 @@ routing:
   # CPA preserves the retained credential and concurrency slot instead of redispatching each turn.
   # For OAuth/file credentials, add a top-level numeric "weight" field to the auth JSON.
   # Enable universal session-sticky routing for all clients.
-  # Explicit Claude Code, Codex, OpenCode, and pi session headers are preferred,
-  # followed by prompt_cache_key, Responses conversation IDs, legacy body IDs,
-  # execution or derived session identity, and the existing first-message hash fallback.
+  # Explicit Claude Code, Codex, OpenCode, pi, and generic (X-Session-ID) session headers
+  # are preferred, followed by prompt_cache_key, Responses conversation IDs, legacy body IDs,
+  # execution session identity, Merkle LCP prefix/compaction matching, derived session
+  # identity, and the existing first-message hash fallback.
+  # LCP compaction matching requires at least 2 shared trailing turns; clients whose
+  # compaction replaces all earlier turns with a summary should send X-Session-ID (or
+  # another explicit session ID), or affinity starts a new binding at every compaction.
   # Automatic failover is always enabled when bound auth becomes unavailable.
   # An established binding outranks credential priority: once a session is bound, that
   # credential is kept even if a higher-priority credential recovers. Credential priority
@@ -295,7 +299,7 @@ requests:
   #   default: # Default rules only set parameters when they are missing in the payload.
   #     - models:
   #         - name: "gemini-2.5-pro" # Supports wildcards (e.g., "gemini-*")
-  #           protocol: "gemini" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity
+  #           protocol: "gemini" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity, meta
   #           from-protocol: "responses" # restricts the rule to the source protocol, options: openai, responses, gemini, claude
   #           headers: # all configured request headers must match; values support "*" wildcards
   #             X-Client-Tier: "tenant-*-region-*"
@@ -309,10 +313,15 @@ requests:
   #             - "metadata.disable_payload"
   #       params: # JSON path (gjson/sjson syntax) -> value
   #         "generationConfig.thinkingConfig.thinkingBudget": 32768
+  #     - models:
+  #         - name: "muse-*"
+  #           protocol: "meta"
+  #       params:
+  #         prompt_cache_retention: "24h" # opt into Meta's 24h prompt cache when the client omits prompt_cache_retention
   #   default-raw: # Default raw rules set parameters using raw JSON when missing (must be valid JSON).
   #     - models:
   #         - name: "gemini-2.5-pro" # Supports wildcards (e.g., "gemini-*")
-  #           protocol: "gemini" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity
+  #           protocol: "gemini" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity, meta
   #       params: # JSON path (gjson/sjson syntax) -> raw JSON value (strings are used as-is, must be valid JSON)
   #         "generationConfig.responseJsonSchema": "{\"type\":\"object\",\"properties\":{\"answer\":{\"type\":\"string\"}}}"
   #   override: # Override rules always set parameters, overwriting any existing values.
@@ -325,7 +334,7 @@ requests:
   #         service_tier: priority
   #     - models:
   #         - name: "gpt-*" # Supports wildcards (e.g., "gpt-*")
-  #           protocol: "codex" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity
+  #           protocol: "codex" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity, meta
   #       params: # JSON path (gjson/sjson syntax) -> value
   #         "reasoning.effort": "high"
   #     - models:
@@ -336,13 +345,13 @@ requests:
   #   override-raw: # Override raw rules always set parameters using raw JSON (must be valid JSON).
   #     - models:
   #         - name: "gpt-*" # Supports wildcards (e.g., "gpt-*")
-  #           protocol: "codex" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity
+  #           protocol: "codex" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity, meta
   #       params: # JSON path (gjson/sjson syntax) -> raw JSON value (strings are used as-is, must be valid JSON)
   #         "response_format": "{\"type\":\"json_schema\",\"json_schema\":{\"name\":\"answer\",\"schema\":{\"type\":\"object\"}}}"
   #   filter: # Filter rules remove specified parameters from the payload.
   #     - models:
   #         - name: "gemini-2.5-pro" # Supports wildcards (e.g., "gemini-*")
-  #           protocol: "gemini" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity
+  #           protocol: "gemini" # restricts the rule to a specific protocol, options: openai, gemini, claude, codex, antigravity, meta
   #       params: # JSON paths (gjson/sjson syntax) to remove from the payload
   #         - "generationConfig.thinkingConfig.thinkingBudget"
   #         - "generationConfig.responseJsonSchema"
@@ -488,6 +497,16 @@ upstream:
     # Default false keeps the translation and catalog behavior that predate tool_search support.
     tool-search: false
 
+    # When true, inject Anthropic server-side refusal fallbacks on cloaked Claude requests
+    # when the request body does not already specify fallbacks (claude-opus-5-5 -> claude-opus-4-8,
+    # claude-fable-5-1 -> claude-opus-5). Default false never opts requests into cross-model
+    # fallback unless the caller or requests.payload rules explicitly provide fallbacks.
+    # When fallback occurs, translated OpenAI Chat Completions and Responses payloads report
+    # the actual serving model and attach structured fallback metadata (choices[0].delta.fallback /
+    # choices[0].message.fallback and fallbacks for Chat; response.fallback and response.fallbacks
+    # for Responses).
+    server-side-fallback: false
+
     # Days to retain the cloaked currentDate pin per session in in-memory mode
     # (server.kv-store.disabled: true without Home), so an idle gap or a credential
     # switch cannot re-anchor the date and invalidate earlier thinking signatures and the
@@ -744,6 +763,7 @@ upstream:
 #           max-context-length: 1048576 # optional: override Codex client context window metadata
 #           force-mapping: true    # optional: rewrite response model fields back to the alias
 #           # Preserve thinking blocks with empty signatures for compatible upstreams.
+#           # Also handle compaction_trigger requests with local summary compaction instead of forwarding them upstream.
 #           # client.codex.optimize-multi-agent-v2 applies to both OAuth and API-key credentials.
 #           is-compat: false
 #           # Optional: enable configuration_update for this API-key model; omitted defaults to false.
@@ -807,7 +827,7 @@ upstream:
 #           rebuild-mid-system-message: false # optional: default is false; when true, move messages with role "system" into the top-level Claude system field
 #           native-tool-search: false # optional: default is false; when true, trust this key's custom base-url with Anthropic native tool search (defer_loading + tool_reference) for Codex tool_search; requires upstream.claude.tool-search: true
 #           cloak:                         # optional: explicitly enable request cloaking for non-Claude-Code clients
-#             mode: "auto"                 # "auto" (default inside this block): cloak only when client is not Claude Code
+#             mode: "auto"                 # omitted inherits shared default; explicit "auto": cloak only when client is not Claude Code
 #                                          # "always": cloak every unconfirmed client; confirmed native Claude Code still passes through
 #                                          # "never" / "uncloak": never apply cloaking; on non-CLI API keys, also strip incoming Claude Code identity/billing attribution
 #             # This "cloak" block applies to this api-keys.claude key entry only. For Claude OAuth
@@ -820,6 +840,8 @@ upstream:
 #             sensitive-words:             # optional: words to obfuscate with zero-width characters
 #               - "API"
 #               - "proxy"
+#             sensitive-words-replace:     # optional: literal sensitive-word replacements ("target": "replacement")
+#               "Claude Code": "Claude"
 #             cache-user-id: true          # optional: default is false; set true to reuse cached user_id per API key instead of generating a random one each request
 #             # Every custom tool on a cloaked OAuth request automatically uses a caller-stable opaque mcp__<server>__<tool> alias.
 #
@@ -1192,9 +1214,11 @@ oauth:
 
     # Antigravity provider behavior.
     antigravity:
-      # sensitive-words:              # optional: words to obfuscate with zero-width characters in system instructions
+      # sensitive-words:              # optional: words to obfuscate with combining grapheme joiners (U+034F) in system instructions
       #   - "API"
       #   - "proxy"
+      # sensitive-words-replace:      # optional: literal sensitive-word replacements ("target": "replacement") in system instructions
+      #   "You are Codex, an agent based on GPT-5.": "You are a helpful coding assistant."
       # connection-pool:              # optional: upstream HTTP connection pool settings
       #   enabled: false             # whether to enable connection pooling (default: false)
       #   idle-conn-timeout: "30s"    # idle keep-alive timeout (default: 30s, capped at 210s)
@@ -1214,9 +1238,11 @@ oauth:
 
     # Devin provider behavior.
     # devin:
-    #   sensitive-words:             # optional: words to obfuscate with zero-width characters in system instructions and prompts
+    #   sensitive-words:             # optional: words to remove matching lines in system prompts
     #     - "API"
     #     - "proxy"
+    #   sensitive-words-replace:     # optional: literal sensitive-word replacements ("target": "replacement") in system prompts
+    #     "Claude Code": "Claude"
 
 # Image and video behavior.
 multimedia:

internal/api/handlers/management/auth_files_cooldown_test.go

@@ -1237,8 +1237,14 @@ func (s *targetedRecoveryTestCodexOAuthService) CreateTokenStorage(bundle *codex
 
 func pollOAuthStatusUntilDone(t *testing.T, router http.Handler, state string) map[string]any {
 	t.Helper()
-	deadline := time.Now().Add(5 * time.Second)
-	for time.Now().Before(deadline) {
+	// The OAuth flow polls for its callback file every 500ms, so a slow CI host
+	// needs a generous deadline. Pause between polls so this loop does not
+	// starve the flow goroutine it is waiting on.
+	deadline := time.Now().Add(15 * time.Second)
+	for first := true; time.Now().Before(deadline); first = false {
+		if !first {
+			time.Sleep(10 * time.Millisecond)
+		}
 		w := httptest.NewRecorder()
 		router.ServeHTTP(w, httptest.NewRequest(http.MethodGet, "/v8/management/oauth/status?state="+state, nil))
 		if w.Code != http.StatusOK {

internal/api/handlers/management/config_v8_test.go

@@ -975,3 +975,52 @@ api-keys:
 		}
 	}
 }
+
+func TestConfigV8_SensitiveWordsReplace(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	path := filepath.Join(t.TempDir(), "config.yaml")
+	if err := os.WriteFile(path, []byte("server: {port: 8317}\n"), 0600); err != nil {
+		t.Fatal(err)
+	}
+	cfg, err := config.LoadConfig(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	h := &Handler{cfg: cfg, configFilePath: path}
+	router := gin.New()
+	router.GET("/v8/management/config/*path", h.ConfigV8)
+	router.PUT("/v8/management/config/*path", h.ConfigV8)
+	router.PATCH("/v8/management/config/*path", h.ConfigV8)
+	router.DELETE("/v8/management/config/*path", h.ConfigV8)
+
+	for _, endpoint := range []string{
+		"/v8/management/config/oauth/providers/antigravity/sensitive-words-replace",
+		"/v8/management/config/oauth/providers/devin/sensitive-words-replace",
+	} {
+		w := httptest.NewRecorder()
+		router.ServeHTTP(w, httptest.NewRequest(http.MethodPut, endpoint, strings.NewReader(`{"You are Codex, an agent based on GPT-5.":"You are a helpful coding assistant."}`)))
+		if w.Code != http.StatusOK {
+			t.Fatalf("PUT %s: status=%d body=%s", endpoint, w.Code, w.Body.String())
+		}
+		getRec := httptest.NewRecorder()
+		router.ServeHTTP(getRec, httptest.NewRequest(http.MethodGet, endpoint, nil))
+		if getRec.Code != http.StatusOK || !strings.Contains(getRec.Body.String(), "You are a helpful coding assistant.") {
+			t.Fatalf("GET %s: status=%d body=%s", endpoint, getRec.Code, getRec.Body.String())
+		}
+		delRec := httptest.NewRecorder()
+		router.ServeHTTP(delRec, httptest.NewRequest(http.MethodDelete, endpoint, nil))
+		if delRec.Code != http.StatusOK {
+			t.Fatalf("DELETE %s: status=%d body=%s", endpoint, delRec.Code, delRec.Body.String())
+		}
+	}
+
+	claudePut := httptest.NewRecorder()
+	router.ServeHTTP(claudePut, httptest.NewRequest(
+		http.MethodPut,
+		"/v8/management/config/api-keys/claude",
+		strings.NewReader(`[{"name":"claude-1","keys":[{"api-key":"sk-ant-1","cloak":{"sensitive-words-replace":{"Claude Code":"Claude"}}}] }]`),
+	))
+	if claudePut.Code != http.StatusOK {
+		t.Fatalf("PUT api-keys/claude: status=%d body=%s", claudePut.Code, claudePut.Body.String())
+	}
+}

internal/api/middleware/request_logging.go

@@ -66,6 +66,10 @@ func RequestLoggingMiddleware(logger logging.RequestLogger) gin.HandlerFunc {
 		wrapper.ginContext = c
 		if !loggerEnabled {
 			wrapper.logOnErrorOnly = true
+			deferredAPICapture := logging.NewDeferredAPICapture()
+			wrapper.deferredAPICapture = deferredAPICapture
+			c.Request = c.Request.WithContext(logging.WithDeferredAPICapture(c.Request.Context(), deferredAPICapture))
+			c.Set(logging.DeferredAPIResponseContextKey, deferredAPICapture)
 		}
 		c.Writer = wrapper
 		attachRequestLogSources(c, logger, loggerEnabled && hasMatchedRoute)