fix: resolve per-model api and baseUrl override in transport selection

huveewomg · huveewomg · commit 87d6a88bb6a8 · 2026-05-22T12:23:35.000+08:00
diff --git a/src/agents/model-auth.test.ts b/src/agents/model-auth.test.ts
@@ -1093,6 +1093,7 @@ describe("resolveApiKeyForProvider – synthetic local auth for custom providers
         input: ["text"],
         cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
         contextWindow: 8192,
+        maxTokens: 4096,
       },
       cfg: {
         models: {
diff --git a/src/agents/pi-embedded-runner/model.test.ts b/src/agents/pi-embedded-runner/model.test.ts
@@ -709,6 +709,46 @@ describe("resolveModel", () => {
     expect(result.error).toBe("Unknown model: openai/typoed-model");
   });
 
+  it("resolves per-model api and baseUrl override in fallback model", () => {
+    const cfg = {
+      models: {
+        providers: {
+          "my-router": {
+            baseUrl: "http://localhost:8080",
+            api: "ollama",
+            models: [
+              {
+                id: "my-router/claude",
+                name: "Claude via Router",
+                api: "anthropic-messages",
+                input: ["text", "image"],
+                contextWindow: 200_000,
+              },
+              {
+                id: "my-router/gpt",
+                name: "GPT via Router",
+                api: "openai-completions",
+                baseUrl: "http://localhost:8080/v1",
+                input: ["text"],
+                contextWindow: 400_000,
+              },
+            ],
+          },
+        },
+      },
+    } as unknown as OpenClawConfig;
+
+    const claude = resolveModelForTest("my-router", "my-router/claude", "/tmp/agent", cfg);
+    const claudeModel = expectResolvedModel(claude);
+    expect(claudeModel.api).toBe("anthropic-messages");
+    expect(claudeModel.baseUrl).toBe("http://localhost:8080");
+
+    const gpt = resolveModelForTest("my-router", "my-router/gpt", "/tmp/agent", cfg);
+    const gptModel = expectResolvedModel(gpt);
+    expect(gptModel.api).toBe("openai-completions");
+    expect(gptModel.baseUrl).toBe("http://localhost:8080/v1");
+  });
+
   it("defaults baseUrl-only local custom fallback models to chat completions", () => {
     const cfg = {
       agents: {
diff --git a/src/agents/pi-embedded-runner/model.ts b/src/agents/pi-embedded-runner/model.ts
@@ -655,7 +655,7 @@ function applyConfiguredProviderOverrides(params: {
       providerConfig.api ??
       discoveredModel.api ??
       resolveConfiguredProviderDefaultApi(providerConfig),
-    baseUrl: providerConfig.baseUrl ?? discoveredModel.baseUrl,
+    baseUrl: metadataOverrideModel?.baseUrl ?? providerConfig.baseUrl ?? discoveredModel.baseUrl,
     cfg: params.cfg,
     workspaceDir: params.workspaceDir,
     runtimeHooks: params.runtimeHooks,
@@ -913,8 +913,8 @@ function resolveConfiguredFallbackModel(params: {
   }
   const fallbackTransport = resolveProviderTransport({
     provider,
-    api: resolveConfiguredProviderDefaultApi(providerConfig) ?? "openai-responses",
-    baseUrl: providerConfig?.baseUrl,
+    api: normalizeResolvedTransportApi(configuredModel?.api) ?? resolveConfiguredProviderDefaultApi(providerConfig) ?? "openai-responses",
+    baseUrl: configuredModel?.baseUrl ?? providerConfig?.baseUrl,
     cfg,
     workspaceDir,
     runtimeHooks,
