Fix auto model for engine (#2170)

e2e-tests/helpers/test_helper.ts

@@ -315,7 +315,12 @@ export class PageObject {
   async setUpDyadPro({
     autoApprove = false,
     localAgent = false,
-  }: { autoApprove?: boolean; localAgent?: boolean } = {}) {
+    localAgentUseAutoModel = false,
+  }: {
+    autoApprove?: boolean;
+    localAgent?: boolean;
+    localAgentUseAutoModel?: boolean;
+  } = {}) {
     await this.baseSetup();
     await this.goToSettingsTab();
     if (autoApprove) {
@@ -328,7 +333,7 @@ export class PageObject {
     await this.goToAppsTab();
     // Select a non-openAI model for local agent mode,
     // since openAI models go to the responses API.
-    if (localAgent) {
+    if (localAgent && !localAgentUseAutoModel) {
       await this.selectModel({
         provider: "Anthropic",
         model: "Claude Opus 4.5",
@@ -800,14 +805,26 @@ export class PageObject {
     // Perform snapshot comparison
     const parsedDump = JSON.parse(dumpContent);
     if (type === "request") {
-      parsedDump["body"]["messages"] = parsedDump["body"]["messages"].map(
-        (message: any) => {
-          if (message.role === "system") {
-            message.content = "[[SYSTEM_MESSAGE]]";
-          }
-          return message;
-        },
-      );
+      if (parsedDump["body"]["input"]) {
+        parsedDump["body"]["input"] = parsedDump["body"]["input"].map(
+          (input: any) => {
+            if (input.role === "system") {
+              input.content = "[[SYSTEM_MESSAGE]]";
+            }
+            return input;
+          },
+        );
+      }
+      if (parsedDump["body"]["messages"]) {
+        parsedDump["body"]["messages"] = parsedDump["body"]["messages"].map(
+          (message: any) => {
+            if (message.role === "system") {
+              message.content = "[[SYSTEM_MESSAGE]]";
+            }
+            return message;
+          },
+        );
+      }
       // Normalize fileIds to be deterministic based on content
       normalizeVersionedFiles(parsedDump);
       expect(
@@ -816,9 +833,15 @@ export class PageObject {
       return;
     }
     expect(
-      prettifyDump(parsedDump["body"]["messages"], {
-        onlyLastMessage: type === "last-message",
-      }),
+      prettifyDump(
+        // responses API
+        parsedDump["body"]["input"] ??
+          // chat completion API
+          parsedDump["body"]["messages"],
+        {
+          onlyLastMessage: type === "last-message",
+        },
+      ),
     ).toMatchSnapshot(name);
   }
 

e2e-tests/local_agent_auto.spec.ts

+import { testSkipIfWindows } from "./helpers/test_helper";
+
+testSkipIfWindows("local-agent - auto model", async ({ po }) => {
+  await po.setUpDyadPro({ localAgent: true, localAgentUseAutoModel: true });
+  await po.importApp("minimal");
+  await po.selectLocalAgentMode();
+
+  await po.sendPrompt("[dump]");
+  await po.snapshotServerDump("request");
+});

src/ipc/utils/get_model_client.ts

@@ -91,7 +91,6 @@ export async function getModelClient(
       const provider = createDyadEngine({
         apiKey: dyadApiKey,
         baseURL: dyadEngineUrl ?? "https://engine.dyad.sh/v1",
-        originalProviderId: model.provider,
         dyadOptions: {
           enableLazyEdits:
             settings.selectedChatMode === "ask"
@@ -214,12 +213,13 @@ function getProModelClient({
       model: createFallback({
         models: [
           // openai requires no prefix.
-          provider.responses(`${GPT_5_2_MODEL_NAME}`),
-          provider(`anthropic/${SONNET_4_5}`),
-          provider(`gemini/${GEMINI_3_FLASH}`),
+          provider.responses(`${GPT_5_2_MODEL_NAME}`, { providerId: "openai" }),
+          provider(`anthropic/${SONNET_4_5}`, { providerId: "anthropic" }),
+          provider(`gemini/${GEMINI_3_FLASH}`, { providerId: "google" }),
         ],
       }),
       // Using openAI as the default provider.
+      // TODO: we should remove this and rely on the provider id passed into the provider().
       builtinProviderId: "openai",
     };
   }
@@ -228,12 +228,12 @@ function getProModelClient({
     model.provider === "openai"
   ) {
     return {
-      model: provider.responses(modelId),
+      model: provider.responses(modelId, { providerId: model.provider }),
       builtinProviderId: model.provider,
     };
   }
   return {
-    model: provider(modelId),
+    model: provider(modelId, { providerId: model.provider }),
     builtinProviderId: model.provider,
   };
 }

src/ipc/utils/llm_engine_provider.ts

@@ -14,7 +14,9 @@ import type { LanguageModel } from "ai";
 const logger = log.scope("llm_engine_provider");
 
 export type ExampleChatModelId = string & {};
-export interface ExampleChatSettings {}
+export interface ChatParams {
+  providerId: string;
+}
 export interface ExampleProviderSettings {
   /**
 Example API key.
@@ -38,7 +40,6 @@ or to provide a custom fetch implementation for e.g. testing.
 */
   fetch?: FetchFunction;
 
-  originalProviderId: string;
   dyadOptions: {
     enableLazyEdits?: boolean;
     enableSmartFilesContext?: boolean;
@@ -51,17 +52,14 @@ export interface DyadEngineProvider {
   /**
 Creates a model for text generation.
 */
-  (modelId: ExampleChatModelId, settings?: ExampleChatSettings): LanguageModel;
+  (modelId: ExampleChatModelId, chatParams: ChatParams): LanguageModel;
 
   /**
 Creates a chat model for text generation.
 */
-  chatModel(
-    modelId: ExampleChatModelId,
-    settings?: ExampleChatSettings,
-  ): LanguageModel;
+  chatModel(modelId: ExampleChatModelId, chatParams: ChatParams): LanguageModel;
 
-  responses(modelId: ExampleChatModelId): LanguageModel;
+  responses(modelId: ExampleChatModelId, chatParams: ChatParams): LanguageModel;
 }
 
 export function createDyadEngine(
@@ -103,7 +101,11 @@ export function createDyadEngine(
   });
 
   // Custom fetch implementation that adds dyad-specific options to the request
-  const createDyadFetch = (): FetchFunction => {
+  const createDyadFetch = ({
+    providerId,
+  }: {
+    providerId: string;
+  }): FetchFunction => {
     return (input: RequestInfo | URL, init?: RequestInit) => {
       // Use default fetch if no init or body
       if (!init || !init.body || typeof init.body !== "string") {
@@ -114,10 +116,7 @@ export function createDyadEngine(
         // Parse the request body to manipulate it
         const parsedBody = {
           ...JSON.parse(init.body),
-          ...getExtraProviderOptions(
-            options.originalProviderId,
-            options.settings,
-          ),
+          ...getExtraProviderOptions(providerId, options.settings),
         };
         const dyadVersionedFiles = parsedBody.dyadVersionedFiles;
         if ("dyadVersionedFiles" in parsedBody) {
@@ -195,25 +194,32 @@ export function createDyadEngine(
     };
   };
 
-  const createChatModel = (modelId: ExampleChatModelId) => {
+  const createChatModel = (
+    modelId: ExampleChatModelId,
+    chatParams: ChatParams,
+  ) => {
     const config = {
       ...getCommonModelConfig(),
-      fetch: createDyadFetch(),
+      fetch: createDyadFetch({ providerId: chatParams.providerId }),
     };
 
     return new OpenAICompatibleChatLanguageModel(modelId, config);
   };
 
-  const createResponsesModel = (modelId: ExampleChatModelId) => {
+  const createResponsesModel = (
+    modelId: ExampleChatModelId,
+    chatParams: ChatParams,
+  ) => {
     const config = {
       ...getCommonModelConfig(),
-      fetch: createDyadFetch(),
+      fetch: createDyadFetch({ providerId: chatParams.providerId }),
     };
 
     return new OpenAIResponsesLanguageModel(modelId, config);
   };
 
-  const provider = (modelId: ExampleChatModelId) => createChatModel(modelId);
+  const provider = (modelId: ExampleChatModelId, chatParams: ChatParams) =>
+    createChatModel(modelId, chatParams);
 
   provider.chatModel = createChatModel;
   provider.responses = createResponsesModel;

testing/fake-llm-server/index.ts

@@ -2,6 +2,7 @@ import express from "express";
 import { createServer } from "http";
 import cors from "cors";
 import { createChatCompletionHandler } from "./chatCompletionHandler";
+import { createResponsesHandler } from "./responsesHandler";
 import {
   handleDeviceCode,
   handleAccessToken,
@@ -152,6 +153,8 @@ app.get("/lmstudio/api/v0/models", (req, res) => {
     `/${provider}/v1/chat/completions`,
     createChatCompletionHandler(provider),
   );
+  // Also add responses API endpoints for each provider
+  app.post(`/${provider}/v1/responses`, createResponsesHandler(provider));
 });
 
 // Azure-specific endpoints (Azure client uses different URL patterns)
@@ -163,6 +166,7 @@ app.post(
 
 // Default test provider handler:
 app.post("/v1/chat/completions", createChatCompletionHandler("."));
+app.post("/v1/responses", createResponsesHandler("."));
 
 // GitHub API Mock Endpoints
 console.log("Setting up GitHub mock endpoints");