Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
gateway: a refused or empty-failed Codex relay's call carries its route (#2481)
yetone7f0f71a0efb0
diff --git a/docs/subsystems/gui-shell.md b/docs/subsystems/gui-shell.mdindex ff1d04bc6..579176ed3 100644--- a/docs/subsystems/gui-shell.md+++ b/docs/subsystems/gui-shell.md@@ -310,7 +310,9 @@ its story's head has "Request and response", which fetches`GET /api/gateway/call?route=…` (`Server.RouteCall`) only when pressed.A call carries the Routing request it was (`Call.Route`, the trace's`Route.ID`, set where `serve`, the Codex backend and a refused title-record it); a route id is not a call id. When the ring no longer has it,+record it; the Codex backend's refused key and empty failure too, but not+a compaction's, which opens no route: `TestCodexKeyRefusedCarriesItsRoute`);+a route id is not a call id. When the ring no longer has it,the story shows the request archive's copy through `archivePanel` if theroute names one (`Route.Archive`, `call.archiveName()`, set only when thearchive was on for that request), and otherwise says how to turn thediff --git a/internal/gateway/codex_backend.go b/internal/gateway/codex_backend.goindex eeb87c3f7..adcdf2218 100644--- a/internal/gateway/codex_backend.go+++ b/internal/gateway/codex_backend.go@@ -1228,7 +1228,7 @@ func (s *Server) codexUpstreamOn(w http.ResponseWriter, r *http.Request, rest st// models was picked, which goes out with Codex's own sign-inmsg, _ := io.ReadAll(io.LimitReader(res.Body, 1<<20))writeError(w, provider.Responses, res.StatusCode, codexKeyRefused(msg))- s.record(Call{Time: start, From: provider.Responses, To: provider.Responses, Model: modelOf(body),+ s.record(Call{Route: routeOf(tr), Time: start, From: provider.Responses, To: provider.Responses, Model: modelOf(body),Provider: "openai", Agent: callerOf(r).agent, Status: res.StatusCode,Millis: time.Since(start).Milliseconds(), Error: res.Status})end(res.StatusCode, res.Status, 0, 0)@@ -1251,7 +1251,7 @@ func (s *Server) codexUpstreamOn(w http.ResponseWriter, r *http.Request, rest st// as its markup: said where the turn, or the compaction// (outrageous_piglet on Discord), wentfailWith(res.StatusCode, said)- s.record(Call{Time: start, From: provider.Responses, To: provider.Responses, Model: modelOf(body),+ s.record(Call{Route: routeOf(tr), Time: start, From: provider.Responses, To: provider.Responses, Model: modelOf(body),Provider: "openai", Agent: callerOf(r).agent, Kind: callKind(r.Header), Status: res.StatusCode,Millis: time.Since(start).Milliseconds(), Error: said})end(res.StatusCode, said, 0, 0)@@ -1632,6 +1632,16 @@ func codexSaidNothing(rest, model, who string, res *http.Response, msg []byte) ("or pick one of magpie's models in Codex (provider/model, or set it in magpie's Agents view)", true}+// routeOf is the id of the route a Codex relay opened, so the call it+// records is the one the Routing page's "Request and response" opens (#2481);+// 0 for a compaction, which opens none.+func routeOf(tr *Route) int64 {+ if tr == nil {+ return 0+ }+ return tr.ID+}+// apiKey reports whether Codex signed in with an API key rather than a// ChatGPT account.func apiKey(h http.Header) bool {diff --git a/internal/gateway/codex_backend_test.go b/internal/gateway/codex_backend_test.goindex 7415d04d3..492f53264 100644--- a/internal/gateway/codex_backend_test.go+++ b/internal/gateway/codex_backend_test.go@@ -183,6 +183,87 @@ func TestCodexAPIKeyRecordedAsOpenAI(t *testing.T) {}}+// A Codex relay OpenAI refuses (an API key it turns away) is still the+// request its Routing row is: the call it records carries the route, so+// the Routing page's "Request and response" opens it while the recent+// calls have it, instead of saying it is gone (#2481, ggbdpq).+func TestCodexKeyRefusedCarriesItsRoute(t *testing.T) {+ setup(t, provider.Chat, &fake{t: t})+ up := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ w.Header().Set("Content-Type", "application/json")+ w.WriteHeader(http.StatusUnauthorized)+ io.WriteString(w, `{"error":{"message":"Incorrect API key provided: sk-synth***","type":"invalid_request_error","code":"invalid_api_key"}}`)+ }))+ t.Cleanup(up.Close)+ was := codexAPIBase+ codexAPIBase = up.URL + "/v1"+ t.Cleanup(func() { codexAPIBase = was })+ s := New()+ rec := httptest.NewRecorder()+ req := httptest.NewRequest("POST", CodexPath+"/responses", strings.NewReader(`{"model":"gpt-5.5","stream":true,"input":"hi"}`))+ req.Header.Set("Authorization", "Bearer sk-synthetic")+ s.Handler().ServeHTTP(rec, req)+ if rec.Code != http.StatusUnauthorized {+ t.Fatalf("%d %s", rec.Code, rec.Body.String())+ }+ routeHasItsCall(t, s, http.StatusUnauthorized)+}++// A Codex relay the backend fails with nothing said (Codex shows it as+// "Unknown error" alone) is the request its Routing row is too.+func TestCodexEmptyFailureCarriesItsRoute(t *testing.T) {+ chatgpt(t, func(w http.ResponseWriter, r *http.Request) {+ w.WriteHeader(http.StatusInternalServerError)+ })+ s := New()+ rec := httptest.NewRecorder()+ req := httptest.NewRequest("POST", CodexPath+"/responses", strings.NewReader(`{"model":"gpt-5.5","stream":true,"input":"hi"}`))+ req.Header.Set("Authorization", "Bearer chatgpt-token")+ s.Handler().ServeHTTP(rec, req)+ if rec.Code != http.StatusInternalServerError {+ t.Fatalf("%d %s", rec.Code, rec.Body.String())+ }+ routeHasItsCall(t, s, http.StatusInternalServerError)+}++// A compaction failed with nothing said reaches the same exit with no+// route open: Codex is still told what happened and the call is still+// recorded, with no route to carry.+func TestCodexCompactEmptyFailureRecordsNoRoute(t *testing.T) {+ chatgpt(t, func(w http.ResponseWriter, r *http.Request) {+ w.WriteHeader(http.StatusInternalServerError)+ })+ s := New()+ rec := httptest.NewRecorder()+ req := httptest.NewRequest("POST", CodexPath+"/responses/compact", strings.NewReader(`{"model":"gpt-5.5","input":[]}`))+ req.Header.Set("Authorization", "Bearer chatgpt-token")+ s.Handler().ServeHTTP(rec, req)+ if rec.Code != http.StatusInternalServerError || !strings.Contains(rec.Body.String(), "this compaction") {+ t.Fatalf("%d %s", rec.Code, rec.Body.String())+ }+ calls := s.Recent()+ if len(calls) != 1 || calls[0].Status != http.StatusInternalServerError || calls[0].Route != 0 {+ t.Fatalf("recorded %+v", calls)+ }+}++// routeHasItsCall checks that the one route the trace has finds its call,+// the one that answered status.+func routeHasItsCall(t *testing.T, s *Server, status int) {+ t.Helper()+ st := s.Trace(t.Context(), 0, 0)+ if len(st.Routes) != 1 {+ t.Fatalf("routing view has %d routes, want the turn", len(st.Routes))+ }+ c, ok := s.RouteCall(st.Routes[0].ID)+ if !ok {+ t.Fatalf("route %d: no call in the ring, so Request and response says the request is gone though its call is one of the last 40", st.Routes[0].ID)+ }+ if c.Status != status {+ t.Errorf("route %d is the call %d (%d), not the failure (%d)", st.Routes[0].ID, c.ID, c.Status, status)+ }+}+// A compaction signed by another account is that account's, not the// sign-in the request would have relayed on. A request naming another// ChatGPT account than the sign-in magpie reads (a Codex in WSL, or