diff --git a/internal/client/codex/models/models.go b/internal/client/codex/models/models.go index d15faca40e..1c145cb645 100644 --- a/internal/client/codex/models/models.go +++ b/internal/client/codex/models/models.go @@ -573,6 +573,9 @@ func nullCodexClientRequiredOptions(entry map[string]any) { entry["tool_mode"] = "direct" entry["use_responses_lite"] = false entry["supports_reasoning_effort_updates"] = false + if _, exists := entry["supports_image_detail_original"]; exists { + entry["supports_image_detail_original"] = false + } entry["upgrade"] = nil entry["availability_nux"] = nil } @@ -772,7 +775,7 @@ func applyCodexClientInputModalitiesMetadata(entry map[string]any, modalities [] } entry["input_modalities"] = codexModalities if hasImageModality(codexModalities) { - entry["supports_image_detail_original"] = true + entry["supports_image_detail_original"] = false } else { delete(entry, "supports_image_detail_original") } diff --git a/internal/client/codex/models/models_test.go b/internal/client/codex/models/models_test.go index 843784790e..5709114f8b 100644 --- a/internal/client/codex/models/models_test.go +++ b/internal/client/codex/models/models_test.go @@ -86,8 +86,8 @@ func TestCodexClientModelsResponse_InputModalitiesFromRegistry(t *testing.T) { if got, _ := modalities[1].(string); got != "image" { t.Fatalf("input_modalities[1] = %q, want image", got) } - if got, ok := visionEntry["supports_image_detail_original"].(bool); !ok || !got { - t.Fatalf("supports_image_detail_original = %#v, want true", visionEntry["supports_image_detail_original"]) + if got, ok := visionEntry["supports_image_detail_original"].(bool); !ok || got { + t.Fatalf("supports_image_detail_original = %#v, want false for non-Codex model", visionEntry["supports_image_detail_original"]) } if textOnlyEntry == nil { @@ -117,8 +117,8 @@ func TestCodexClientModelsResponse_InputModalitiesFromRegistry(t *testing.T) { if got, _ := mixedModalities[1].(string); got != "image" { t.Fatalf("mixed input_modalities[1] = %q, want image", got) } - if got, ok := mixedEntry["supports_image_detail_original"].(bool); !ok || !got { - t.Fatalf("mixed supports_image_detail_original = %#v, want true", mixedEntry["supports_image_detail_original"]) + if got, ok := mixedEntry["supports_image_detail_original"].(bool); !ok || got { + t.Fatalf("mixed supports_image_detail_original = %#v, want false for non-Codex model", mixedEntry["supports_image_detail_original"]) } if imageEntry == nil { @@ -956,8 +956,8 @@ func TestCodexClientModelsResponse_UnrelatedCustomProviderRetainsFallback(t *tes if !okMods || len(mods) != 2 { t.Fatalf("unrelated model input_modalities = %#v, want generic [text image]", entry["input_modalities"]) } - if got, _ := entry["supports_image_detail_original"].(bool); !got { - t.Errorf("supports_image_detail_original = %v, want true for generic fallback", got) + if got, ok := entry["supports_image_detail_original"].(bool); !ok || got { + t.Errorf("supports_image_detail_original = %#v, want false for generic fallback", entry["supports_image_detail_original"]) } } @@ -1874,3 +1874,112 @@ func TestCodexClientModelsResponse_DoesNotLeakResponsesLiteOrCodeModeToNonCodexR } } } + +func TestCodexClientModelsResponse_DoesNotAdvertiseImageDetailOriginalForClaudeOrNonCodexRoutes_Issue7209(t *testing.T) { + modelRegistry := registry.GetGlobalRegistry() + claudeClientID := "codex-claude-image-detail-original-test" + codexClientID := "codex-native-image-detail-original-test" + claudeAlias := "claude-backed-astra-issue7209" + mixedAlias := "mixed-claude-codex-astra-issue7209" + + modelRegistry.RegisterClient(claudeClientID, "claude", []*registry.ModelInfo{ + { + ID: "claude-opus-5-5", + DisplayName: "Claude Opus 5.5", + SupportedInputModalities: []string{"text", "image"}, + }, + { + ID: "claude-sonnet-5-5", + DisplayName: "Claude Sonnet 5.5", + SupportedInputModalities: []string{"text", "image"}, + }, + { + ID: "claude-haiku-5-5", + DisplayName: "Claude Haiku 5.5", + SupportedInputModalities: []string{"text", "image"}, + }, + { + ID: "claude-fable-5-1", + DisplayName: "Claude Fable 5.1", + SupportedInputModalities: []string{"text", "image"}, + }, + { + ID: claudeAlias, + MetadataModelID: "gpt-6-astra", + DisplayName: "Claude Backed Astra", + SupportedInputModalities: []string{"text", "image"}, + }, + { + ID: mixedAlias, + MetadataModelID: "gpt-6-astra", + DisplayName: "Mixed Claude Codex Astra", + SupportedInputModalities: []string{"text", "image"}, + }, + }) + modelRegistry.RegisterClient(codexClientID, "codex", []*registry.ModelInfo{ + { + ID: "gpt-6-astra", + MetadataModelID: "gpt-6-astra", + DisplayName: "GPT 6.0 Astra", + }, + { + ID: mixedAlias, + MetadataModelID: "gpt-6-astra", + DisplayName: "Mixed Claude Codex Astra", + }, + }) + t.Cleanup(func() { + modelRegistry.UnregisterClient(claudeClientID) + modelRegistry.UnregisterClient(codexClientID) + }) + + available := []map[string]any{ + {"id": "gpt-6-astra"}, + {"id": "claude-opus-5-5"}, + {"id": "claude-sonnet-5-5"}, + {"id": "claude-haiku-5-5"}, + {"id": "claude-fable-5-1"}, + {"id": claudeAlias}, + {"id": mixedAlias}, + } + + resp := BuildResponseForClient(available, modelRegistry.GetModelProviders, false, "0.166.0") + models, ok := resp["models"].([]map[string]any) + if !ok || len(models) != len(available) { + t.Fatalf("models = %#v, want %d entries", resp["models"], len(available)) + } + + bySlug := make(map[string]map[string]any, len(models)) + for _, entry := range models { + bySlug[stringModelValue(entry, "slug")] = entry + } + + native := bySlug["gpt-6-astra"] + if native == nil { + t.Fatal("missing gpt-6-astra entry") + } + if got, ok := native["supports_image_detail_original"].(bool); !ok || !got { + t.Errorf("gpt-6-astra supports_image_detail_original = %#v, want true", native["supports_image_detail_original"]) + } + + for _, slug := range []string{ + "claude-opus-5-5", + "claude-sonnet-5-5", + "claude-haiku-5-5", + "claude-fable-5-1", + claudeAlias, + mixedAlias, + } { + entry := bySlug[slug] + if entry == nil { + t.Fatalf("missing %s entry", slug) + } + modalities, okMods := entry["input_modalities"].([]any) + if !okMods || !hasImageModality(modalities) { + t.Errorf("%s input_modalities = %#v, want image modality preserved", slug, entry["input_modalities"]) + } + if got, ok := entry["supports_image_detail_original"].(bool); !ok || got { + t.Errorf("%s supports_image_detail_original = %#v, want false", slug, entry["supports_image_detail_original"]) + } + } +}