github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 07:52:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(agents): fall back to agents.defaults.model when agent has no model config (#24210)

Browse Source 
Merged via /review-pr -> /prepare-pr -> /merge-pr.

Prepared head SHA: 0f272b1027
Co-authored-by: bianbiandashen <16240681+bianbiandashen@users.noreply.github.com>
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Reviewed-by: @gumadeiras
This commit is contained in:
边黎安
2026-02-23 16:18:55 +08:00
committed by GitHub
parent db32677f1d
commit a4c373935f
39 changed files with 434 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/commands/auth-choice.test.ts
View File

@@ -1,6 +1,7 @@
import fs from "node:fs/promises";
import type { OAuthCredentials } from "@mariozechner/pi-ai";
import { afterEach, describe, expect, it, vi } from "vitest";
import { resolveAgentModelPrimaryValue } from "../config/model-input.js";
import type { WizardPrompter } from "../wizard/prompts.js";
import { applyAuthChoice, resolvePreferredProviderForAuthChoice } from "./auth-choice.js";
import { GOOGLE_GEMINI_DEFAULT_MODEL } from "./google-gemini-model-default.js";
@@ -278,7 +279,9 @@ describe("applyAuthChoice", () => {
provider: "huggingface",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toMatch(/^huggingface\/.+/);
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toMatch(
/^huggingface\/.+/,
);
expect((await readAuthProfile("huggingface:default"))?.key).toBe("hf-test-token");
});
@@ -310,7 +313,7 @@ describe("applyAuthChoice", () => {
expect.objectContaining({ message: "Select Z.AI endpoint", initialValue: "global" }),
);
expect(result.config.models?.providers?.zai?.baseUrl).toBe(ZAI_CODING_CN_BASE_URL);
expect(result.config.agents?.defaults?.model?.primary).toBe("zai/glm-5");
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe("zai/glm-5");
expect((await readAuthProfile("zai:default"))?.key).toBe("zai-test-key");
});
@@ -368,7 +371,9 @@ describe("applyAuthChoice", () => {
expect.objectContaining({ message: "Select Z.AI endpoint" }),
);
expect(result.config.models?.providers?.zai?.baseUrl).toBe(ZAI_CODING_GLOBAL_BASE_URL);
expect(result.config.agents?.defaults?.model?.primary).toBe("zai/glm-4.5");
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"zai/glm-4.5",
);
});
it("maps apiKey + tokenProvider=huggingface to huggingface-api-key flow", async () => {
@@ -396,7 +401,9 @@ describe("applyAuthChoice", () => {
provider: "huggingface",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toMatch(/^huggingface\/.+/);
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toMatch(
/^huggingface\/.+/,
);
expect(text).not.toHaveBeenCalled();
expect((await readAuthProfile("huggingface:default"))?.key).toBe("hf-token-provider-test");
@@ -425,7 +432,9 @@ describe("applyAuthChoice", () => {
provider: "together",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toMatch(/^together\/.+/);
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toMatch(
/^together\/.+/,
);
expect(text).not.toHaveBeenCalled();
expect(confirm).not.toHaveBeenCalled();
expect((await readAuthProfile("together:default"))?.key).toBe(
@@ -456,7 +465,9 @@ describe("applyAuthChoice", () => {
provider: "kimi-coding",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toMatch(/^kimi-coding\/.+/);
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toMatch(
/^kimi-coding\/.+/,
);
expect(text).not.toHaveBeenCalled();
expect(confirm).not.toHaveBeenCalled();
expect((await readAuthProfile("kimi-coding:default"))?.key).toBe("sk-kimi-token-provider-test");
@@ -485,7 +496,9 @@ describe("applyAuthChoice", () => {
provider: "google",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toBe(GOOGLE_GEMINI_DEFAULT_MODEL);
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
GOOGLE_GEMINI_DEFAULT_MODEL,
);
expect(text).not.toHaveBeenCalled();
expect(confirm).not.toHaveBeenCalled();
expect((await readAuthProfile("google:default"))?.key).toBe("sk-gemini-token-provider-test");
@@ -514,7 +527,9 @@ describe("applyAuthChoice", () => {
provider: "litellm",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toMatch(/^litellm\/.+/);
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toMatch(
/^litellm\/.+/,
);
expect(text).not.toHaveBeenCalled();
expect(confirm).not.toHaveBeenCalled();
expect((await readAuthProfile("litellm:default"))?.key).toBe("sk-litellm-token-provider-test");
@@ -612,7 +627,11 @@ describe("applyAuthChoice", () => {
provider,
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary?.startsWith(modelPrefix)).toBe(true);
expect(
resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)?.startsWith(
modelPrefix,
),
).toBe(true);
expect((await readAuthProfile(profileId))?.key).toBe(token);
},
);
@@ -642,7 +661,9 @@ describe("applyAuthChoice", () => {
provider: "google",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toBe("openai/gpt-4o-mini");
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"openai/gpt-4o-mini",
);
expect(result.agentModelOverride).toBe(GOOGLE_GEMINI_DEFAULT_MODEL);
expect((await readAuthProfile("google:default"))?.key).toBe("sk-gemini-test");
});
@@ -706,7 +727,9 @@ describe("applyAuthChoice", () => {
provider: "synthetic",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toMatch(/^synthetic\/.+/);
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toMatch(
/^synthetic\/.+/,
);
expect((await readAuthProfile("synthetic:default"))?.key).toBe("sk-synthetic-env");
});
@@ -731,7 +754,9 @@ describe("applyAuthChoice", () => {
provider: "xai",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toBe("openai/gpt-4o-mini");
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"openai/gpt-4o-mini",
);
expect(result.agentModelOverride).toBe("xai/grok-4");
expect((await readAuthProfile("xai:default"))?.key).toBe("sk-xai-test");
@@ -761,7 +786,9 @@ describe("applyAuthChoice", () => {
setDefaultModel: true,
});
expect(result.config.agents?.defaults?.model?.primary).toBe("github-copilot/gpt-4o");
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"github-copilot/gpt-4o",
);
} finally {
if (previousIsTTYDescriptor) {
Object.defineProperty(stdin, "isTTY", previousIsTTYDescriptor);
@@ -794,7 +821,9 @@ describe("applyAuthChoice", () => {
expect(text).toHaveBeenCalledWith(
expect.objectContaining({ message: "Enter OpenCode Zen API key" }),
);
expect(result.config.agents?.defaults?.model?.primary).toBe("anthropic/claude-opus-4-5");
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"anthropic/claude-opus-4-5",
);
expect(result.config.models?.providers?.["opencode-zen"]).toBeUndefined();
expect(result.agentModelOverride).toBe("opencode/claude-opus-4-6");
});
@@ -868,7 +897,9 @@ describe("applyAuthChoice", () => {
provider: "openrouter",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toBe("openrouter/auto");
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"openrouter/auto",
);
expect((await readAuthProfile("openrouter:default"))?.key).toBe("sk-openrouter-test");
@@ -963,7 +994,7 @@ describe("applyAuthChoice", () => {
provider: "vercel-ai-gateway",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toBe(
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"vercel-ai-gateway/anthropic/claude-opus-4.6",
);
@@ -1001,7 +1032,7 @@ describe("applyAuthChoice", () => {
provider: "cloudflare-ai-gateway",
mode: "api_key",
});
expect(result.config.agents?.defaults?.model?.primary).toBe(
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"cloudflare-ai-gateway/claude-sonnet-4-5",
);
@@ -1178,7 +1209,9 @@ describe("applyAuthChoice", () => {
provider: "qwen-portal",
mode: "oauth",
});
expect(result.config.agents?.defaults?.model?.primary).toBe("qwen-portal/coder-model");
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"qwen-portal/coder-model",
);
expect(result.config.models?.providers?.["qwen-portal"]).toMatchObject({
baseUrl: "https://portal.qwen.ai/v1",
apiKey: "qwen-oauth",
@@ -1252,7 +1285,9 @@ describe("applyAuthChoice", () => {
provider: "minimax-portal",
mode: "oauth",
});
expect(result.config.agents?.defaults?.model?.primary).toBe("minimax-portal/MiniMax-M2.1");
expect(resolveAgentModelPrimaryValue(result.config.agents?.defaults?.model)).toBe(
"minimax-portal/MiniMax-M2.1",
);
expect(result.config.models?.providers?.["minimax-portal"]).toMatchObject({
baseUrl: "https://api.minimax.io/anthropic",
apiKey: "minimax-oauth",