diff --git a/ui/src/components/new-agent/NewAgentSetup.tsx b/ui/src/components/new-agent/NewAgentSetup.tsx index c446c6d558e..d06f3ff3313 100644 --- a/ui/src/components/new-agent/NewAgentSetup.tsx +++ b/ui/src/components/new-agent/NewAgentSetup.tsx @@ -1200,7 +1200,7 @@ function Setup({
{showModel && !usingKimiApi && ( { await models.refetch(); } : undefined)} diff --git a/ui/src/pages/NewAgent.models.test.tsx b/ui/src/pages/NewAgent.models.test.tsx new file mode 100644 index 00000000000..d8f27fd3c77 --- /dev/null +++ b/ui/src/pages/NewAgent.models.test.tsx @@ -0,0 +1,122 @@ +// @vitest-environment jsdom +import { act } from "react"; +import { beforeEach, describe, expect, it, vi } from "vitest"; +import { api, click, container, managedApi, render, settle } from "./NewAgent.test-support"; +import { ModelDropdown } from "@/components/AgentConfigForm"; +import * as modelUtils from "@/lib/model-utils"; + +beforeEach(async () => { + const actual = await vi.importActual("@/components/AgentConfigForm"); + vi.mocked(ModelDropdown).mockImplementation(actual.ModelDropdown); +}); + +async function searchModels(query: string) { + const trigger = container.querySelector('button[aria-label="Model"]'); + expect(trigger).toBeTruthy(); + await act(async () => trigger!.click()); + await settle(); + const input = document.querySelector('input[placeholder="Search models... (type to create)"]'); + expect(input).toBeTruthy(); + await act(async () => { + Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, "value")!.set!.call(input, query); + input!.dispatchEvent(new Event("input", { bubbles: true })); + }); +} + +async function selectModel(label: string) { + const option = [...document.querySelectorAll('[role="option"]')] + .find(node => node.textContent?.includes(label) || node.querySelector("[title]")?.getAttribute("title") === label); + expect(option).toBeTruthy(); + await act(async () => option!.click()); + await settle(); +} + +describe("New agent OpenRouter model selection", () => { + it.each(["opencode_local", "pi_local"])("searches the %s catalog and saves the selected model ID", async adapter => { + api.adapterModels.mockResolvedValue([ + { id: "openrouter/anthropic/claude-sonnet-4.6", label: "Claude Sonnet" }, + { id: "openrouter/z-ai/glm-5", label: "GLM 5" }, + ]); + await render(adapter); + await searchModels("glm-5"); + expect(document.querySelector('[role="option"] [title="openrouter/anthropic/claude-sonnet-4.6"]')).toBeNull(); + await selectModel("openrouter/z-ai/glm-5"); + expect(document.querySelector('[role="listbox"]')).toBeNull(); + await click("Finish setup"); + expect(api.hire).toHaveBeenCalledWith("company-1", expect.objectContaining({ + adapterConfig: expect.objectContaining({ model: "openrouter/z-ai/glm-5" }), + })); + }); + + it.each(["opencode_local", "pi_local"])("accepts a custom model for %s when the catalog is unavailable", async adapter => { + api.adapterModels.mockRejectedValue(new Error("Catalog unavailable")); + await render(adapter); + const model = "openrouter/company/custom-model"; + await searchModels(` ${model} `); + await selectModel("Use manual model"); + expect(container.querySelector('button[aria-label="Model"]')?.textContent).toContain(model); + await click("Finish setup"); + expect(api.hire).toHaveBeenCalledWith("company-1", expect.objectContaining({ + adapterConfig: expect.objectContaining({ model }), + })); + }); + + it("normalizes a custom OpenRouter model ID for the OpenCode connection", async () => { + await render("opencode_local"); + await searchModels("company/new-model"); + await selectModel("Use manual model"); + await click("Finish setup"); + expect(api.hire).toHaveBeenCalledWith("company-1", expect.objectContaining({ + adapterConfig: expect.objectContaining({ model: "openrouter/company/new-model" }), + })); + }); + + it("searches routed OpenRouter models for a single-provider harness", async () => { + const model = "anthropic/claude-sonnet-4.6"; + managedApi.list.mockResolvedValue({ currentUserId: "user-1", canManageConnections: true, connections: [{ + id: "00000000-0000-4000-8000-000000000021", grantId: "00000000-0000-4000-8000-000000000022", + companyId: "company-1", provider: "openrouter", method: "api_key", name: "Company OpenRouter", + ownership: "shared", isDefault: false, status: "connected", + routing: { kind: "openrouter", protocol: "messages", auth: "bearer", models: [{ id: model, label: "Routed Claude Sonnet" }] }, + }] } as any); + await render("claude_local"); + await click("AdvancedCustom Gateway"); + const connection = container.querySelector('[role="combobox"][aria-label="Connection"]')!; + await act(async () => connection.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true }))); + await settle(); + await selectModel("Company OpenRouter"); + await click("Use connection"); + await searchModels("Routed Claude"); + await selectModel(model); + await click("Finish setup"); + expect(api.hire).toHaveBeenCalledWith("company-1", expect.objectContaining({ + adapterConfig: expect.objectContaining({ model }), + runtimeConfig: expect.objectContaining({ aiConnection: expect.objectContaining({ provider: "openrouter" }) }), + })); + }); + + it("bounds search work for a large OpenRouter catalog", async () => { + const size = 600; + api.adapterModels.mockResolvedValue(Array.from({ length: size }, (_, index) => ({ + id: `openrouter/company/model-${index}`, + label: `Company model ${index}`, + }))); + const extractProviderId = modelUtils.extractProviderId; + let calls = 0; + const providerSpy = vi.spyOn(modelUtils, "extractProviderId").mockImplementation(id => { + if (++calls > size * 4) throw new Error("Model search exceeded its linear work limit"); + return extractProviderId(id); + }); + try { + await render("opencode_local"); + await searchModels("model-599"); + expect(calls).toBeGreaterThanOrEqual(size); + expect(calls).toBeLessThanOrEqual(size * 4); + expect(document.querySelectorAll('[role="option"] [title]')).toHaveLength(1); + await selectModel("openrouter/company/model-599"); + expect(container.querySelector('button[aria-label="Model"]')?.textContent).toContain("Company model 599"); + } finally { + providerSpy.mockRestore(); + } + }); +}); diff --git a/ui/src/pages/NewAgent.test-support.tsx b/ui/src/pages/NewAgent.test-support.tsx index dbb8e63ed11..e2a274d884c 100644 --- a/ui/src/pages/NewAgent.test-support.tsx +++ b/ui/src/pages/NewAgent.test-support.tsx @@ -67,7 +67,7 @@ vi.mock("@/lib/router", () => ({ useSearchParams: () => [state.params], })); vi.mock("@/components/AgentConfigForm", () => ({ - ModelDropdown: ({ + ModelDropdown: vi.fn(({ value, onChange, }: { @@ -79,7 +79,7 @@ vi.mock("@/components/AgentConfigForm", () => ({ value={value} onChange={(e) => onChange(e.target.value)} /> - ), + )), AdapterLoginPanel: ({ onConnected }: { onConnected: (id: string) => void }) => (