Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
gateway: a safety refusal that also says the model is retired retires nothing (#3274, CartethyiaQwQ)
yetone6e32942a240f
diff --git a/internal/gateway/fallback.go b/internal/gateway/fallback.goindex 87bd727e8..43b34db31 100644--- a/internal/gateway/fallback.go+++ b/internal/gateway/fallback.go@@ -1106,6 +1106,11 @@ func modelRetired(status int, body []byte) bool {default:return false}+ // the safety filter turning the request away (#3274) is about the+ // request, whatever its message says of the model+ if _, refused := policyRefusal(body); refused {+ return false+ }// the words are matched decoded, too (#1669)body = wordsOf(body)return retiredWords.Match(body) && !quotaWords.Match(body)diff --git a/internal/gateway/gateway.go b/internal/gateway/gateway.goindex f47632a91..12d2998d9 100644--- a/internal/gateway/gateway.go+++ b/internal/gateway/gateway.go@@ -2786,9 +2786,10 @@ func (s *Server) serve(w http.ResponseWriter, r *http.Request, from provider.Proif hw.passing {clientResponseID = call.Usage.ResponseID}- if !hw.passing && modelRetired(hw.code(), hw.errBody()) {+ if !hw.passing && !hw.refused && modelRetired(hw.code(), hw.errBody()) {// the vendor's list may still name it (OpenCode Zen's- // exo-free): it leaves the lists of this provider's models+ // exo-free): it leaves the lists of this provider's models; a+ // refusal is about the request, whatever it says (#3274)provider.Retire(c.p.ID, c.model)}outgrew := false // a failure that didn't say so was the request's lengthdiff --git a/internal/gateway/retired_test.go b/internal/gateway/retired_test.goindex a1ddbd46d..7297cbb8d 100644--- a/internal/gateway/retired_test.go+++ b/internal/gateway/retired_test.go@@ -143,6 +143,11 @@ func TestRetiredWords(t *testing.T) {{401, `{"error":{"code":null,"message":"OpenCode Zen Free: Model glm-5-free is not supported","param":null,"type":"authentication_error"}}`, true},{401, `Model grok-4.7 is not supported for format anthropic`, false},{401, `Invalid API key.`, false},+ // the safety filter's refusal, whatever its message says of the+ // model, is about the request (#3274)+ {400, `{"error":{"type":"invalid_request_error","code":"cyber_policy","message":"This request was flagged by our safety filter. The model m1 is retired.","param":null}}`, false},+ {400, `{"error":{"code":"content_filter","message":"The model m1 has been deprecated."}}`, false},+ {400, `{"error":{"type":"invalid_request_error","code":"model_deprecated","message":"The model m1 is retired."}}`, true},} {if got := modelRetired(c.status, []byte(c.body)); got != c.want {t.Errorf("modelRetired(%d, %s) = %v", c.status, c.body, got)@@ -174,3 +179,31 @@ func TestZenUnsupportedModelLeavesTheListAlone(t *testing.T) {t.Fatalf("the account's other model sat out with it: %d %s", code, body)}}++// A safety filter's refusal whose message also says the model is retired+// is a refusal of the request: the model stays in the provider's lists+// (#3274, CartethyiaQwQ). A retirement said without one still retires.+func TestRefusalSayingRetiredRetiresNothing(t *testing.T) {+ for _, x := range []struct {+ name, body string+ retire bool+ }{+ {"refusal", `{"error":{"type":"invalid_request_error","code":"cyber_policy","message":"This content was flagged for possible cybersecurity risk. The model m1 is retired.","param":null}}`, false},+ {"retired alone", `{"error":{"type":"invalid_request_error","code":"model_deprecated","message":"The model m1 is retired."}}`, true},+ } {+ t.Run(x.name, func(t *testing.T) {+ fresh(t)+ t.Cleanup(func() { provider.Unretire("a", "m1") })+ serveOn(t, "a", "k", []string{"m1"}, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ io.ReadAll(r.Body)+ w.Header().Set("Content-Type", "application/json")+ w.WriteHeader(http.StatusBadRequest)+ io.WriteString(w, x.body)+ }))+ code, body := postAs(t, New(), "", `{"model":"a/m1","messages":[{"role":"user","content":"hi"}]}`)+ if got := provider.Retired("a", "m1"); got != x.retire {+ t.Fatalf("retired %v, want %v (%d %s)", got, x.retire, code, body)+ }+ })+ }+}