fix(codex): restore prompt cache continuity for Codex requests #2374
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| package executor | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/http" | ||
| "strings" | ||
|
|
||
| "github.com/google/uuid" | ||
| cliproxyauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth" | ||
| cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor" | ||
| log "github.com/sirupsen/logrus" | ||
| "github.com/tidwall/gjson" | ||
| "github.com/tidwall/sjson" | ||
| ) | ||
|
|
||
| type codexContinuity struct { | ||
| Key string | ||
| Source string | ||
| } | ||
|
|
||
| func metadataString(meta map[string]any, key string) string { | ||
| if len(meta) == 0 { | ||
| return "" | ||
| } | ||
| raw, ok := meta[key] | ||
| if !ok || raw == nil { | ||
| return "" | ||
| } | ||
| switch v := raw.(type) { | ||
| case string: | ||
| return strings.TrimSpace(v) | ||
| case []byte: | ||
| return strings.TrimSpace(string(v)) | ||
| default: | ||
| return "" | ||
| } | ||
| } | ||
|
|
||
| func principalString(raw any) string { | ||
| switch v := raw.(type) { | ||
| case string: | ||
| return strings.TrimSpace(v) | ||
| case fmt.Stringer: | ||
| return strings.TrimSpace(v.String()) | ||
| default: | ||
| return strings.TrimSpace(fmt.Sprintf("%v", raw)) | ||
| } | ||
| } | ||
|
|
||
| func resolveCodexContinuity(ctx context.Context, auth *cliproxyauth.Auth, req cliproxyexecutor.Request, opts cliproxyexecutor.Options) codexContinuity { | ||
| if promptCacheKey := strings.TrimSpace(gjson.GetBytes(req.Payload, "prompt_cache_key").String()); promptCacheKey != "" { | ||
| return codexContinuity{Key: promptCacheKey, Source: "prompt_cache_key"} | ||
| } | ||
| if executionSession := metadataString(opts.Metadata, cliproxyexecutor.ExecutionSessionMetadataKey); executionSession != "" { | ||
| return codexContinuity{Key: executionSession, Source: "execution_session"} | ||
| } | ||
| if ginCtx := ginContextFrom(ctx); ginCtx != nil { | ||
| if ginCtx.Request != nil { | ||
| if v := strings.TrimSpace(ginCtx.GetHeader("Idempotency-Key")); v != "" { | ||
| return codexContinuity{Key: v, Source: "idempotency_key"} | ||
| } | ||
| } | ||
| if v, exists := ginCtx.Get("apiKey"); exists && v != nil { | ||
| if trimmed := principalString(v); trimmed != "" { | ||
| return codexContinuity{Key: uuid.NewSHA1(uuid.NameSpaceOID, []byte("cli-proxy-api:codex:prompt-cache:"+trimmed)).String(), Source: "client_principal"} | ||
| } | ||
| } | ||
| } | ||
| if auth != nil { | ||
| if authID := strings.TrimSpace(auth.ID); authID != "" { | ||
| return codexContinuity{Key: uuid.NewSHA1(uuid.NameSpaceOID, []byte("cli-proxy-api:codex:prompt-cache:auth:"+authID)).String(), Source: "auth_id"} | ||
| } | ||
| } | ||
| return codexContinuity{} | ||
| } | ||
|
|
||
| func applyCodexContinuityBody(rawJSON []byte, continuity codexContinuity) []byte { | ||
| if continuity.Key == "" { | ||
| return rawJSON | ||
| } | ||
| rawJSON, _ = sjson.SetBytes(rawJSON, "prompt_cache_key", continuity.Key) | ||
| return rawJSON | ||
| } | ||
|
|
||
| func applyCodexContinuityHeaders(headers http.Header, continuity codexContinuity) { | ||
| if headers == nil || continuity.Key == "" { | ||
| return | ||
| } | ||
| headers.Set("session_id", continuity.Key) | ||
| } | ||
|
|
||
| func logCodexRequestDiagnostics(ctx context.Context, auth *cliproxyauth.Auth, req cliproxyexecutor.Request, opts cliproxyexecutor.Options, headers http.Header, body []byte, continuity codexContinuity) { | ||
| if !log.IsLevelEnabled(log.DebugLevel) { | ||
| return | ||
| } | ||
| entry := logWithRequestID(ctx) | ||
| authID := "" | ||
| authFile := "" | ||
| if auth != nil { | ||
| authID = strings.TrimSpace(auth.ID) | ||
| authFile = strings.TrimSpace(auth.FileName) | ||
| } | ||
| selectedAuthID := metadataString(opts.Metadata, cliproxyexecutor.SelectedAuthMetadataKey) | ||
| executionSessionID := metadataString(opts.Metadata, cliproxyexecutor.ExecutionSessionMetadataKey) | ||
| entry.Debugf( | ||
| "codex request diagnostics auth_id=%s selected_auth_id=%s auth_file=%s exec_session=%s continuity_source=%s session_id=%s prompt_cache_key=%s prompt_cache_retention=%s store=%t has_instructions=%t reasoning_effort=%s reasoning_summary=%s chatgpt_account_id=%t originator=%s model=%s source_format=%s", | ||
| authID, | ||
| selectedAuthID, | ||
| authFile, | ||
| executionSessionID, | ||
| continuity.Source, | ||
| strings.TrimSpace(headers.Get("session_id")), | ||
| gjson.GetBytes(body, "prompt_cache_key").String(), | ||
| gjson.GetBytes(body, "prompt_cache_retention").String(), | ||
| gjson.GetBytes(body, "store").Bool(), | ||
| gjson.GetBytes(body, "instructions").Exists(), | ||
| gjson.GetBytes(body, "reasoning.effort").String(), | ||
| gjson.GetBytes(body, "reasoning.summary").String(), | ||
| strings.TrimSpace(headers.Get("Chatgpt-Account-Id")) != "", | ||
| strings.TrimSpace(headers.Get("Originator")), | ||
| req.Model, | ||
| opts.SourceFormat.String(), | ||
| ) | ||
| } | ||
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In
resolveCodexContinuity,Idempotency-Keyis chosen before stable identities (client_principal/auth_id), so any client that sends a different idempotency key per request will get a differentprompt_cache_key/session_idon every turn. That breaks the continuity this change is trying to restore (cache/session reuse across turns) and can regress performance for common retry-safe clients that auto-generate per-request idempotency keys. Consider demoting this source below stable caller/auth-derived keys (or only using it for explicit retry contexts).Useful? React with 👍 / 👎.