Align Claude Desktop model mapping with Claude Code three-role tiers

Claude Desktop's 3P validation only accepts claude-{sonnet,opus,haiku}-* role IDs, so providers must map every tier. Bring the Desktop mapping flow in line with Claude Code and fix the fallout that broke sub-agent Haiku calls. - Proxy form: replace the dynamic route list with fixed Sonnet/Opus/Haiku tiers; blank tiers backfill from the first filled tier (Sonnet first) on submit and inherit its supports1m flag - Backend: add a role-keyword fallback in map_proxy_request_model so dated official names (e.g. claude-haiku-4-5-20251001) resolve to the right tier, guarded by is_claude_safe_model_id so [1m]-suffixed IDs stay rejected - Tighten is_claude_safe_model_id / isClaudeSafeRoute to reject degenerate role IDs like "claude-sonnet-" - Fix the seed-effect race where normalizing empty routes to three blank tiers blocked the default-route backfill - Sync switch hints, placeholders, and the zh/en/ja/zh-TW locales to the three-role-ID rule - Update zh/en/ja user manual (2.1, 2.6), calling out legacy Claude IDs (claude-3-5-sonnet-...) as a rejected example Tests: 282 frontend + 34 backend claude_desktop; typecheck, clippy, fmt clean.
2026-07-30 02:14:43 +08:00 · 2026-05-29 22:27:47 +08:00
parent 058c9fb8e5
commit 94cc3d103a
13 changed files with 574 additions and 363 deletions
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { QueryClientProvider } from "@tanstack/react-query";
 import type { ComponentProps } from "react";
 import { describe, expect, it, vi } from "vitest";
@@ -13,18 +13,20 @@ vi.mock("@/lib/api/providers", () => ({

 function renderForm(
  initialData: ComponentProps<typeof ClaudeDesktopProviderForm>["initialData"],
+  onSubmit = vi.fn(),
 ) {
  const queryClient = createTestQueryClient();
-  return render(
+  const view = render(
    <QueryClientProvider client={queryClient}>
      <ClaudeDesktopProviderForm
        submitLabel="保存"
-        onSubmit={vi.fn()}
+        onSubmit={onSubmit}
        onCancel={vi.fn()}
        initialData={initialData}
      />
    </QueryClientProvider>,
  );
+  return { ...view, onSubmit };
 }

 describe("ClaudeDesktopProviderForm", () => {
@@ -47,16 +49,17 @@ describe("ClaudeDesktopProviderForm", () => {
      },
    });

-    const input = screen.getByPlaceholderText(
+    // 固定三档（Sonnet / Opus / Haiku）下有三个菜单显示名输入，取 Sonnet（首个）。
+    const input = screen.getAllByPlaceholderText(
      "DeepSeek V4 Pro",
-    ) as HTMLInputElement;
+    )[0] as HTMLInputElement;
    input.focus();

    fireEvent.change(input, { target: { value: "DeepSeek V4 Pro" } });

-    const currentInput = screen.getByPlaceholderText(
+    const currentInput = screen.getAllByPlaceholderText(
      "DeepSeek V4 Pro",
-    ) as HTMLInputElement;
+    )[0] as HTMLInputElement;
    expect(currentInput).toHaveValue("DeepSeek V4 Pro");
    expect(document.activeElement).toBe(currentInput);
  });
@@ -81,16 +84,174 @@ describe("ClaudeDesktopProviderForm", () => {
    });

    const input = screen.getByPlaceholderText(
-      "claude-deepseek-chat",
+      "claude-sonnet-4-6",
    ) as HTMLInputElement;
    input.focus();

    fireEvent.change(input, { target: { value: "claude-12345" } });

    const currentInput = screen.getByPlaceholderText(
-      "claude-deepseek-chat",
+      "claude-sonnet-4-6",
    ) as HTMLInputElement;
    expect(currentInput).toHaveValue("claude-12345");
    expect(document.activeElement).toBe(currentInput);
  });
+
+  it("代理模式始终渲染 Sonnet / Opus / Haiku 三档（即使只配了一档）", () => {
+    renderForm({
+      name: "Proxy Provider",
+      settingsConfig: {
+        env: {
+          ANTHROPIC_BASE_URL: "https://api.example.com",
+          ANTHROPIC_AUTH_TOKEN: "sk-test",
+        },
+      },
+      meta: {
+        claudeDesktopMode: "proxy",
+        claudeDesktopModelRoutes: {
+          "claude-sonnet-4-6": { model: "upstream-sonnet" },
+        },
+      },
+    });
+
+    // 固定三档：每档各一个「菜单显示名」输入框，无论初始只配了几档。
+    expect(screen.getAllByPlaceholderText("DeepSeek V4 Pro")).toHaveLength(3);
+  });
+
+  it("代理模式初始无路由且默认路由未就绪时不渲染空三档", () => {
+    // mock 的 getClaudeDesktopDefaultRoutes 返回 []，模拟默认路由尚未就绪。
+    // 修复前：normalizeProxyRows([]) 会渲染 3 条空行并把 routes.length 撑到 3，
+    // 永久挡住 seed effect 的默认路由回填。修复后应保持空、等待 seed。
+    renderForm({
+      name: "Proxy Provider",
+      settingsConfig: {
+        env: {
+          ANTHROPIC_BASE_URL: "https://api.example.com",
+          ANTHROPIC_AUTH_TOKEN: "sk-test",
+        },
+      },
+      meta: {
+        claudeDesktopMode: "proxy",
+        claudeDesktopModelRoutes: {},
+      },
+    });
+
+    expect(screen.queryAllByPlaceholderText("DeepSeek V4 Pro")).toHaveLength(0);
+  });
+
+  it("保存模型映射时补齐固定三档并把留空档回填为 Sonnet 模型", async () => {
+    const onSubmit = vi.fn();
+    renderForm(
+      {
+        name: "Proxy Provider",
+        settingsConfig: {
+          env: {
+            ANTHROPIC_BASE_URL: "https://api.example.com",
+            ANTHROPIC_AUTH_TOKEN: "sk-test",
+          },
+        },
+        meta: {
+          claudeDesktopMode: "proxy",
+          claudeDesktopModelRoutes: {
+            "claude-old": {
+              model: "upstream-old",
+            },
+          },
+        },
+      },
+      onSubmit,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "保存" }));
+
+    await waitFor(() => expect(onSubmit).toHaveBeenCalled());
+    const submitted = onSubmit.mock.calls[0][0];
+    // claude-old 迁移到 Sonnet；留空的 Opus / Haiku 回填为 Sonnet 的上游模型，
+    // 保证落库三档齐全，子 agent 调用的 Haiku 始终可解析。
+    expect(submitted.meta.claudeDesktopModelRoutes).toMatchObject({
+      "claude-sonnet-4-6": {
+        model: "upstream-old",
+        labelOverride: "upstream-old",
+      },
+      "claude-opus-4-8": { model: "upstream-old" },
+      "claude-haiku-4-5": { model: "upstream-old" },
+    });
+    expect(
+      Object.keys(submitted.meta.claudeDesktopModelRoutes).sort(),
+    ).toEqual(["claude-haiku-4-5", "claude-opus-4-8", "claude-sonnet-4-6"]);
+  });
+
+  it("回填空档时继承 Sonnet 的 1M 声明", async () => {
+    const onSubmit = vi.fn();
+    renderForm(
+      {
+        name: "Proxy Provider",
+        settingsConfig: {
+          env: {
+            ANTHROPIC_BASE_URL: "https://api.example.com",
+            ANTHROPIC_AUTH_TOKEN: "sk-test",
+          },
+        },
+        meta: {
+          claudeDesktopMode: "proxy",
+          claudeDesktopModelRoutes: {
+            "claude-sonnet-4-6": { model: "deepseek-v4-pro", supports1m: true },
+          },
+        },
+      },
+      onSubmit,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "保存" }));
+
+    await waitFor(() => expect(onSubmit).toHaveBeenCalled());
+    const routes = onSubmit.mock.calls[0][0].meta.claudeDesktopModelRoutes;
+    // 留空的 Opus / Haiku 回填同一上游模型，1M 声明应与 Sonnet 一致。
+    expect(routes["claude-sonnet-4-6"]).toMatchObject({
+      model: "deepseek-v4-pro",
+      supports1m: true,
+    });
+    expect(routes["claude-opus-4-8"]).toMatchObject({
+      model: "deepseek-v4-pro",
+      supports1m: true,
+    });
+    expect(routes["claude-haiku-4-5"]).toMatchObject({
+      model: "deepseek-v4-pro",
+      supports1m: true,
+    });
+  });
+
+  it("保存直连模型列表时不会保留旧 route 作为隐藏映射目标", async () => {
+    const onSubmit = vi.fn();
+    renderForm(
+      {
+        name: "Direct Provider",
+        settingsConfig: {
+          env: {
+            ANTHROPIC_BASE_URL: "https://api.example.com",
+            ANTHROPIC_AUTH_TOKEN: "sk-test",
+          },
+        },
+        meta: {
+          claudeDesktopMode: "direct",
+          claudeDesktopModelRoutes: {
+            "claude-old": {
+              model: "claude-old",
+            },
+          },
+        },
+      },
+      onSubmit,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "保存" }));
+
+    await waitFor(() => expect(onSubmit).toHaveBeenCalled());
+    const submitted = onSubmit.mock.calls[0][0];
+    expect(submitted.meta.claudeDesktopModelRoutes).toMatchObject({
+      "claude-sonnet-4-6": {
+        model: "claude-sonnet-4-6",
+      },
+    });
+  });
 });