Order newest version first, format provider suffixes, trim comments

Sort each family newest-version-first (so Opus 4.8 sits above 4.7 with Fable at the top of the picker), render OpenAI/Cloudflare model names with the acronym uppercased, version attached, and any codename suffix title-cased (gpt-5.6-sol -> "GPT-5.6 Sol"), and trim the code comments to a minimum.

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

Author: Twixes

packages/agent/src/adapters/base-acp-agent.ts

@@ -163,9 +163,6 @@ export abstract class BaseAcpAgent implements Agent {
         // silently dropping them.
         ...(model.allowed ? {} : { _meta: restrictedModelMeta() }),
       }))
-      // Group by family, then oldest-to-newest within each family, so the
-      // picker is deterministic and reads logically instead of interleaving
-      // families by raw version number.
       .sort((a, b) => compareModelsForPicker(a.value, b.value));
 
     // Models the Claude adapter can drive: Anthropic ids, plus Cloudflare `@cf/` ids the gateway

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

@@ -48,7 +48,7 @@ describe("formatGatewayModelName", () => {
     ).toBe("GPT-5.5");
   });
 
-  it("strips the openai/ prefix and uppercases GPT", () => {
+  it("strips the openai/ prefix, uppercases GPT, and title-cases the suffix", () => {
     expect(
       formatGatewayModelName({
         id: "openai/gpt-5.6-sol",
@@ -58,7 +58,7 @@ describe("formatGatewayModelName", () => {
         supports_vision: true,
         allowed: true,
       }),
-    ).toBe("GPT-5.6-sol");
+    ).toBe("GPT-5.6 Sol");
   });
 
   it("formats Cloudflare models as the final path segment with GLM uppercased", () => {
@@ -119,28 +119,24 @@ describe("getClaudeModelRecency", () => {
 });
 
 describe("compareModelsForPicker", () => {
-  it("groups models by family, then orders each family oldest to newest", () => {
+  it("groups models by family, most capable first, newest version first", () => {
     // Models as the gateway might return them — arbitrary order.
     const gatewayOrder = [
       "claude-fable-5",
-      "claude-opus-4-8",
+      "claude-opus-4-7",
       "claude-mystery",
       "claude-sonnet-5",
       "claude-haiku-4-5",
       "claude-sonnet-4-6",
-      "claude-opus-4-7",
+      "claude-opus-4-8",
     ];
     const displayed = [...gatewayOrder].sort(compareModelsForPicker);
-    // 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-fable-5",
-      "claude-opus-4-7",
       "claude-opus-4-8",
-      "claude-sonnet-4-6",
+      "claude-opus-4-7",
       "claude-sonnet-5",
+      "claude-sonnet-4-6",
       "claude-haiku-4-5",
       "claude-mystery",
     ]);

packages/agent/src/gateway-models.ts

@@ -258,16 +258,8 @@ export function getProviderName(ownedBy: string): string {
   return PROVIDER_NAMES[ownedBy] ?? ownedBy;
 }
 
-// Sort key for ordering models oldest-to-newest in pickers. The model menu
-// opens upward (side="top"), so the last item sits closest to the trigger —
-// sorting ascending by this key puts the newest model right under the user's
-// cursor. The key is the version embedded in the model id, e.g.
-// "claude-sonnet-4-6" -> 4006, "claude-opus-4-8" -> 4008, "claude-fable-5" ->
-// 5000; a higher number means a newer model. An id with no recognisable
-// version (a brand-new or unexpected release) ranks as newest so it still
-// surfaces at the end rather than at an arbitrary gateway-determined position.
-// Only the first version group is read, so a trailing date suffix (e.g.
-// "-20251001") is ignored; the minor component is assumed to be < 1000.
+// Version embedded in the model id, e.g. "claude-opus-4-8" -> 4008. Ids with no
+// recognisable version rank newest. A trailing date suffix is ignored.
 export function getClaudeModelRecency(modelId: string): number {
   const match = modelId.toLowerCase().match(/-(\d+)(?:[-.](\d+))?/);
   if (!match) return Number.MAX_SAFE_INTEGER;
@@ -276,43 +268,44 @@ export function getClaudeModelRecency(modelId: string): number {
   return major * 1000 + minor;
 }
 
-// Anthropic model families ordered by tier, most capable first.
+// Families ordered most-capable first; unknown families sort last.
 const MODEL_FAMILY_ORDER = ["fable", "opus", "sonnet", "haiku"];
 
 function getModelFamilyRank(modelId: string): number {
   const id = modelId.toLowerCase();
   const index = MODEL_FAMILY_ORDER.findIndex((family) => id.includes(family));
-  // Non-Anthropic-family models (e.g. Cloudflare `@cf/...`) group after the
-  // known families.
   return index === -1 ? MODEL_FAMILY_ORDER.length : index;
 }
 
-// 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.
+// Group by family, then newest version first within each family.
 export function compareModelsForPicker(a: string, b: string): number {
   const familyDiff = getModelFamilyRank(a) - getModelFamilyRank(b);
   if (familyDiff !== 0) return familyDiff;
-  return getClaudeModelRecency(a) - getClaudeModelRecency(b);
+  return getClaudeModelRecency(b) - getClaudeModelRecency(a);
 }
 
 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());
+// Uppercase the acronym, keep the version attached, title-case any suffix:
+// "gpt-5.6-sol" -> "GPT-5.6 Sol", "glm-5.2" -> "GLM-5.2".
+function formatProviderModelName(modelId: string): string {
+  const [acronym, version, ...suffix] = modelId.split("-");
+  const head = version
+    ? `${acronym.toUpperCase()}-${version}`
+    : acronym.toUpperCase();
+  const tail = suffix.map(
+    (word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase(),
+  );
+  return [head, ...tail].join(" ");
 }
 
 export function formatGatewayModelName(model: GatewayModel): string {
   if (isCloudflareModel(model)) {
-    const name = (model.id.split("/").pop() ?? model.id).toLowerCase();
-    return uppercaseLeadingAcronym(name);
+    return formatProviderModelName(model.id.split("/").pop() ?? model.id);
   }
 
   if (isOpenAIModel(model)) {
-    return uppercaseLeadingAcronym(stripProviderPrefix(model.id).toLowerCase());
+    return formatProviderModelName(stripProviderPrefix(model.id));
   }
 
   return formatModelId(model.id);