Invert family order (Fable first) and uppercase GPT/GLM names

Order model families most-capable first (Fable, Opus, Sonnet, Haiku) and display OpenAI/Cloudflare model names with their acronym uppercased (gpt-5.5 -> GPT-5.5, glm-5.2 -> GLM-5.2).

Generated-By: PostHog Code
Task-Id: ea8239ab-8fc1-46b7-8dc6-d3661caf8800

Author: Twixes

packages/agent/src/gateway-models.test.ts

@@ -35,7 +35,7 @@ describe("formatGatewayModelName", () => {
     ).toBe("Claude Opus 4.8");
   });
 
-  it("formats OpenAI models as raw lowercase model ids", () => {
+  it("uppercases the GPT acronym in OpenAI model ids", () => {
     expect(
       formatGatewayModelName({
         id: "GPT-5.5",
@@ -45,23 +45,23 @@ describe("formatGatewayModelName", () => {
         supports_vision: true,
         allowed: true,
       }),
-    ).toBe("gpt-5.5");
+    ).toBe("GPT-5.5");
   });
 
-  it("strips the openai/ prefix from OpenAI model ids", () => {
+  it("strips the openai/ prefix and uppercases GPT", () => {
     expect(
       formatGatewayModelName({
-        id: "openai/gpt-5.5",
+        id: "openai/gpt-5.6-sol",
         owned_by: "openai",
         context_window: 200000,
         supports_streaming: true,
         supports_vision: true,
         allowed: true,
       }),
-    ).toBe("gpt-5.5");
+    ).toBe("GPT-5.6-sol");
   });
 
-  it("formats Cloudflare models as the lowercase final path segment", () => {
+  it("formats Cloudflare models as the final path segment with GLM uppercased", () => {
     expect(
       formatGatewayModelName({
         id: "@cf/zai-org/glm-5.2",
@@ -71,7 +71,7 @@ describe("formatGatewayModelName", () => {
         supports_vision: false,
         allowed: true,
       }),
-    ).toBe("glm-5.2");
+    ).toBe("GLM-5.2");
   });
 
   it("blocks deprecated Claude gateway models", () => {
@@ -132,17 +132,17 @@ describe("compareModelsForPicker", () => {
       "claude-opus-4-7",
     ];
     const displayed = [...gatewayOrder].sort(compareModelsForPicker);
-    // Each family stays contiguous (both Sonnets together, both Opuses
-    // together) instead of interleaving by raw version number. The menu opens
-    // upward, so the newest flagship family sits closest to the trigger, and
-    // unknown/non-Anthropic models trail the known families.
+    // Families are ordered most-capable first and each stays contiguous (both
+    // Sonnets together, both Opuses together) instead of interleaving by raw
+    // version number. Within a family, versions run oldest-to-newest.
+    // Unknown/non-Anthropic models trail the known families.
     expect(displayed).toEqual([
-      "claude-haiku-4-5",
-      "claude-sonnet-4-6",
-      "claude-sonnet-5",
+      "claude-fable-5",
       "claude-opus-4-7",
       "claude-opus-4-8",
-      "claude-fable-5",
+      "claude-sonnet-4-6",
+      "claude-sonnet-5",
+      "claude-haiku-4-5",
       "claude-mystery",
     ]);
   });

packages/agent/src/gateway-models.ts

@@ -276,10 +276,8 @@ export function getClaudeModelRecency(modelId: string): number {
   return major * 1000 + minor;
 }
 
-// Anthropic model families ordered by tier, fastest/smallest first. The picker
-// menu opens upward (side="top"), so families later in this list sit closer to
-// the trigger.
-const MODEL_FAMILY_ORDER = ["haiku", "sonnet", "opus", "fable"];
+// Anthropic model families ordered by tier, most capable first.
+const MODEL_FAMILY_ORDER = ["fable", "opus", "sonnet", "haiku"];
 
 function getModelFamilyRank(modelId: string): number {
   const id = modelId.toLowerCase();
@@ -292,8 +290,7 @@ function getModelFamilyRank(modelId: string): number {
 // Comparator for the model picker. Groups models by family (tier) first, then
 // orders each family's versions oldest-to-newest. Sorting by version alone
 // interleaves families (e.g. a Sonnet 5 lands between Opus versions), which
-// reads as an arbitrary order; grouping keeps every family contiguous and the
-// newest flagship closest to the trigger.
+// reads as an arbitrary order; grouping keeps every family contiguous.
 export function compareModelsForPicker(a: string, b: string): number {
   const familyDiff = getModelFamilyRank(a) - getModelFamilyRank(b);
   if (familyDiff !== 0) return familyDiff;
@@ -302,13 +299,20 @@ export function compareModelsForPicker(a: string, b: string): number {
 
 const PROVIDER_PREFIXES = ["anthropic/", "openai/", "google-vertex/"];
 
+// Uppercase the leading acronym in a model id so provider prefixes read as
+// their brand (e.g. "gpt-5.5" -> "GPT-5.5", "glm-5.2" -> "GLM-5.2").
+function uppercaseLeadingAcronym(name: string): string {
+  return name.replace(/^[a-z]+/, (prefix) => prefix.toUpperCase());
+}
+
 export function formatGatewayModelName(model: GatewayModel): string {
   if (isCloudflareModel(model)) {
-    return (model.id.split("/").pop() ?? model.id).toLowerCase();
+    const name = (model.id.split("/").pop() ?? model.id).toLowerCase();
+    return uppercaseLeadingAcronym(name);
   }
 
   if (isOpenAIModel(model)) {
-    return stripProviderPrefix(model.id).toLowerCase();
+    return uppercaseLeadingAcronym(stripProviderPrefix(model.id).toLowerCase());
   }
 
   return formatModelId(model.id);