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

leno23 · leno23 · commit 29c9ce435ae9 · 2026-05-31T16:14:36.000+08:00
diff --git a/src/agents/embedded-agent-runner.e2e.test.ts b/src/agents/embedded-agent-runner.e2e.test.ts
@@ -347,9 +347,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
@@ -525,19 +525,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",
@@ -546,6 +573,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",
diff --git a/src/agents/embedded-agent-runner/model.ts b/src/agents/embedded-agent-runner/model.ts
@@ -1414,6 +1414,38 @@ export async function resolveModelAsync(
     };
   }
   const providerConfig = resolveConfiguredProviderConfig(cfg, normalizedRef.provider);
+  const resolveStaticCatalogAttempt = () => {
+    if (explicitModel || !options?.allowBundledStaticCatalogFallback) {
+      return undefined;
+    }
+    const staticCatalogModel = resolveBundledStaticCatalogModel({
+      provider: normalizedRef.provider,
+      modelId: normalizedRef.model,
+      cfg,
+      workspaceDir,
+    });
+    if (!staticCatalogModel) {
+      return undefined;
+    }
+    const overriddenStaticCatalogModel = applyConfiguredProviderOverrides({
+      provider: normalizedRef.provider,
+      discoveredModel: staticCatalogModel,
+      providerConfig,
+      modelId: normalizedRef.model,
+      cfg,
+      runtimeHooks,
+      workspaceDir,
+      preferDiscoveredModelMetadata: true,
+    });
+    return normalizeResolvedModel({
+      provider: normalizedRef.provider,
+      cfg,
+      agentDir: resolvedAgentDir,
+      workspaceDir,
+      model: overriddenStaticCatalogModel,
+      runtimeHooks,
+    });
+  };
   const authProfile = resolveDynamicModelAuthProfile({
     provider: normalizedRef.provider,
     cfg,
@@ -1460,40 +1492,17 @@ export async function resolveModelAsync(
       runtimeHooks,
     })
       ? explicitModel.model
-      : await resolveDynamicAttempt();
+      : options?.skipAgentDiscovery
+        ? (resolveStaticCatalogAttempt() ?? (await resolveDynamicAttempt()))
+        : await resolveDynamicAttempt();
   if (!model && !explicitModel && options?.retryTransientProviderRuntimeMiss) {
     // Startup can race the first provider-runtime snapshot load on a fresh
     // gateway boot. Retry once before surfacing a user-visible "Unknown model"
     // that disappears on the next message.
     model = await resolveDynamicAttempt();
   }
-  if (!model && !explicitModel && options?.allowBundledStaticCatalogFallback) {
-    const staticCatalogModel = resolveBundledStaticCatalogModel({
-      provider: normalizedRef.provider,
-      modelId: normalizedRef.model,
-      cfg,
-      workspaceDir,
-    });
-    if (staticCatalogModel) {
-      const overriddenStaticCatalogModel = applyConfiguredProviderOverrides({
-        provider: normalizedRef.provider,
-        discoveredModel: staticCatalogModel,
-        providerConfig,
-        modelId: normalizedRef.model,
-        cfg,
-        runtimeHooks,
-        workspaceDir,
-        preferDiscoveredModelMetadata: true,
-      });
-      model = normalizeResolvedModel({
-        provider: normalizedRef.provider,
-        cfg,
-        agentDir: resolvedAgentDir,
-        workspaceDir,
-        model: overriddenStaticCatalogModel,
-        runtimeHooks,
-      });
-    }
+  if (!model && !options?.skipAgentDiscovery) {
+    model = resolveStaticCatalogAttempt();
   }
   if (model && options?.allowBundledStaticCatalogFallback) {
     const staticCatalogModel = resolveBundledStaticCatalogModel({
diff --git a/src/agents/embedded-agent-runner/run.ts b/src/agents/embedded-agent-runner/run.ts
@@ -700,9 +700,10 @@ 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,
             workspaceDir: resolvedWorkspace,
             authProfileId: params.authProfileId,
