fix(agent): use static catalog for embedded model fast path

wyf027 · wyf027 · commit 2c0efefa5257 · 2026-06-13T17:30:22.000+08:00
diff --git a/src/agents/embedded-agent-runner.e2e.test.ts b/src/agents/embedded-agent-runner.e2e.test.ts
@@ -352,9 +352,12 @@ describe("runEmbeddedAgent", () => {
     expect(resolveModelCall?.[1]).toBe("openrouter/auto");
     expect(resolveModelCall?.[2]).toBe(agentDir);
     expect(resolveModelCall?.[3]).toBe(cfg);
-    expect(
-      (resolveModelCall?.[4] as { skipAgentDiscovery?: boolean } | undefined)?.skipAgentDiscovery,
-    ).toBe(true);
+    expect(resolveModelCall?.[4]).toEqual(
+      expect.objectContaining({
+        allowBundledStaticCatalogFallback: true,
+        skipAgentDiscovery: true,
+      }),
+    );
     expect(ensureOpenClawModelsJsonMock).not.toHaveBeenCalled();
   });
 
diff --git a/src/agents/embedded-agent-runner/model.test.ts b/src/agents/embedded-agent-runner/model.test.ts
@@ -544,19 +544,46 @@ describe("resolveModel", () => {
       maxTokens: 8192,
     });
 
+    const runtimeHooks = createRuntimeHooks();
+    const prepareProviderDynamicModel = vi.fn(async () => {});
+    const reasoningEffortMap = {
+      off: "none",
+      minimal: "none",
+      low: "high",
+      medium: "high",
+      high: "high",
+      xhigh: "high",
+      adaptive: "high",
+      max: "high",
+    };
+    const normalizeProviderResolvedModelWithPlugin = vi.fn(({ context }) => ({
+      ...context.model,
+      compat: {
+        ...context.model.compat,
+        supportsStore: false,
+        supportsReasoningEffort: true,
+        maxTokensField: "max_tokens",
+        reasoningEffortMap,
+      },
+    }));
     const result = await resolveModelAsync(
       "mistral",
       "mistral-medium-3-5",
       "/tmp/agent",
       undefined,
       {
         allowBundledStaticCatalogFallback: true,
-        runtimeHooks: createRuntimeHooks(),
+        runtimeHooks: {
+          ...runtimeHooks,
+          normalizeProviderResolvedModelWithPlugin,
+          prepareProviderDynamicModel,
+        },
         skipAgentDiscovery: true,
       },
     );
 
-    expectRecordFields(expectResolvedModel(result), {
+    const model = expectResolvedModel(result);
+    expectRecordFields(model, {
       provider: "mistral",
       id: "mistral-medium-3-5",
       api: "openai-completions",
@@ -565,6 +592,22 @@ describe("resolveModel", () => {
       contextWindow: 262144,
       maxTokens: 8192,
     });
+    expect(model.compat).toMatchObject({
+      supportsStore: false,
+      supportsReasoningEffort: true,
+      maxTokensField: "max_tokens",
+      reasoningEffortMap,
+    });
+    expect(normalizeProviderResolvedModelWithPlugin).toHaveBeenCalledWith(
+      expect.objectContaining({
+        provider: "mistral",
+        context: expect.objectContaining({
+          provider: "mistral",
+          modelId: "mistral-medium-3-5",
+        }),
+      }),
+    );
+    expect(prepareProviderDynamicModel).not.toHaveBeenCalled();
     expect(resolveBundledStaticCatalogModelMock).toHaveBeenCalledWith({
       provider: "mistral",
       modelId: "mistral-medium-3-5",
@@ -627,7 +670,7 @@ describe("resolveModel", () => {
     expect(discoverModels).not.toHaveBeenCalled();
   });
 
-  it("falls back to bundled static catalog rows without agent discovery", async () => {
+  it("uses bundled static catalog rows before dynamic hooks without agent discovery", async () => {
     const cfg = {
       models: {
         providers: {
@@ -682,8 +725,8 @@ describe("resolveModel", () => {
         cfg,
       }),
     );
-    expect(prepareProviderDynamicModel).toHaveBeenCalled();
-    expect(runProviderDynamicModel).toHaveBeenCalled();
+    expect(prepareProviderDynamicModel).not.toHaveBeenCalled();
+    expect(runProviderDynamicModel).not.toHaveBeenCalled();
     expect(discoverAuthStorage).not.toHaveBeenCalled();
     expect(discoverModels).not.toHaveBeenCalled();
   });
diff --git a/src/agents/embedded-agent-runner/model.ts b/src/agents/embedded-agent-runner/model.ts
@@ -1656,7 +1656,9 @@ export async function resolveModelAsync(
   let model =
     explicitModel?.kind === "resolved" && !providerRuntimeMetadataShouldWin
       ? explicitModel.model
-      : undefined;
+      : options?.skipAgentDiscovery && !explicitModel && !providerRuntimeMetadataShouldWin
+        ? await resolveStaticCatalogFallbackModel()
+        : undefined;
   model ??= await resolveDynamicAttempt();
   if (!model && !explicitModel && options?.retryTransientProviderRuntimeMiss) {
     // Startup can race the first provider-runtime snapshot load on a fresh
diff --git a/src/agents/embedded-agent-runner/run.ts b/src/agents/embedded-agent-runner/run.ts
@@ -743,11 +743,11 @@ export async function runEmbeddedAgent(
           agentDir,
           params.config,
           {
-            // Plugin dynamic model hooks can resolve explicit model refs without
-            // first generating OpenClaw models.json. This keeps one-shot model runs from
-            // blocking on unrelated provider discovery.
+            // Static catalogs and plugin dynamic model hooks can resolve explicit model refs
+            // without first generating OpenClaw models.json. This keeps one-shot model runs
+            // from blocking on unrelated provider discovery.
+            allowBundledStaticCatalogFallback: true,
             skipAgentDiscovery: true,
-            allowBundledStaticCatalogFallback: pluginHarnessOwnsTransport,
             preferBundledStaticCatalogTransport: pluginHarnessOwnsTransport,
             workspaceDir: resolvedWorkspace,
             authProfileId: params.authProfileId,
