Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
provider: two Codex windows no longer write client-shapes.json on every request (#3394)
yetonea84d2ec80fd4
diff --git a/internal/provider/client_shapes_test.go b/internal/provider/client_shapes_test.gonew file mode 100644index 000000000..d8ff47dfa--- /dev/null+++ b/internal/provider/client_shapes_test.go@@ -0,0 +1,44 @@+package provider++import (+ "net/http"+ "os"+ "testing"+)++// Two Codex windows each send their own X-Codex-Window-Id. Taken as part+// of Codex's shape, every request of one after the other's read, marshalled+// and synced client-shapes.json again (#3394).+func TestClientShapeWrittenOnceForTwoWindows(t *testing.T) {+ t.Setenv("XDG_CONFIG_HOME", t.TempDir())+ clientShapes.Lock()+ clientShapes.written = nil+ clientShapes.Unlock()+ window := func(id, ua string) http.Header {+ return http.Header{+ "User-Agent": {ua},+ "Originator": {"codex_exec"},+ "X-Codex-Window-Id": {id},+ "X-Stainless-Retry-Count": {"0"},+ }+ }+ const ua = "codex_exec/0.162.1 (Mac OS 26.2.0; arm64) kitty"+ SawClient(ClientCodex, window("a:0", ua))+ if clientShape(ClientCodex).Get("Originator") != "codex_exec" {+ t.Fatal("Codex's shape was not kept")+ }+ if err := os.Remove(clientShapesPath()); err != nil {+ t.Fatal(err)+ }+ for i := 0; i < 10; i++ {+ SawClient(ClientCodex, window("b:0", ua))+ SawClient(ClientCodex, window("a:0", ua))+ }+ if _, err := os.Stat(clientShapesPath()); err == nil {+ t.Fatal("client-shapes.json was written again for another window's request")+ }+ SawClient(ClientCodex, window("b:0", "codex_exec/0.163.0 (Mac OS 26.2.0; arm64) kitty"))+ if got := clientShape(ClientCodex).Get("User-Agent"); got != "codex_exec/0.163.0 (Mac OS 26.2.0; arm64) kitty" {+ t.Fatalf("a new Codex version's User-Agent was not kept: %q", got)+ }+}diff --git a/internal/provider/test_as.go b/internal/provider/test_as.goindex ac77c7217..a4e16e222 100644--- a/internal/provider/test_as.go+++ b/internal/provider/test_as.go@@ -113,11 +113,13 @@ func clientShapesPath() string {// shapeHeader is one of client's headers a test asks with: not what is// this conversation's or this turn's alone (its session, thread or turn,-// a request id, a subagent's kind), nor the betas this request asked for,-// nor anything that signs it.+// a request id, a subagent's kind, the Codex window it came from, a+// retry's count), nor the betas this request asked for, nor anything that+// signs it. One that differs between two of the client's windows would+// write the file again on each of their requests (#3394).func shapeHeader(k string) bool {k = strings.ToLower(k)- for _, s := range []string{"session", "thread", "conversation", "turn", "request-id", "authorization", "api-key", "attestation", "subagent", "luna-reserve"} {+ for _, s := range []string{"session", "thread", "conversation", "turn", "request-id", "window", "retry-count", "authorization", "api-key", "attestation", "subagent", "luna-reserve"} {if strings.Contains(k, s) {return false}