Merge branch 'main' into cloud-skills-dependency-autobundle

Author: tatoalo

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

@@ -55,6 +55,18 @@ describe("formatGatewayModelName", () => {
     ).toBe("gpt-5.5");
   });
 
+  it("formats Cloudflare models as the lowercase final path segment", () => {
+    expect(
+      formatGatewayModelName({
+        id: "@cf/zai-org/glm-5.2",
+        owned_by: "cloudflare",
+        context_window: 128000,
+        supports_streaming: true,
+        supports_vision: false,
+      }),
+    ).toBe("glm-5.2");
+  });
+
   it("blocks deprecated Claude gateway models", () => {
     expect(isBlockedModelId("claude-opus-4-5")).toBe(true);
     expect(isBlockedModelId("claude-opus-4-6")).toBe(true);

packages/agent/src/gateway-models.ts

@@ -221,6 +221,10 @@ export function getClaudeModelRecency(modelId: string): number {
 const PROVIDER_PREFIXES = ["anthropic/", "openai/", "google-vertex/"];
 
 export function formatGatewayModelName(model: GatewayModel): string {
+  if (isCloudflareModel(model)) {
+    return (model.id.split("/").pop() ?? model.id).toLowerCase();
+  }
+
   if (isOpenAIModel(model)) {
     return stripProviderPrefix(model.id).toLowerCase();
   }

packages/ui/src/features/sessions/components/UnifiedModelSelector.tsx

@@ -31,7 +31,7 @@ const ADAPTER_ICONS: Record<AgentAdapter, React.ReactNode> = {
 };
 
 const ADAPTER_LABELS: Record<AgentAdapter, string> = {
-  claude: "Claude",
+  claude: "Claude Code",
   codex: "Codex",
 };