Propagate request id properly for OpenAI Response API model (e.g. GPT 5.2) (#2876)

src/__tests__/local_agent_handler.test.ts

@@ -254,6 +254,7 @@ vi.mock("@/ipc/utils/token_utils", () => ({
 vi.mock("@/ipc/utils/provider_options", () => ({
   getProviderOptions: vi.fn(() => ({})),
   getAiHeaders: vi.fn(() => ({})),
+  DYAD_INTERNAL_REQUEST_ID_HEADER: "x-dyad-internal-request-id",
 }));
 
 vi.mock("@/ipc/utils/mcp_manager", () => ({

src/ipc/handlers/compaction/compaction_handler.ts

@@ -24,7 +24,11 @@ import {
   type CompactionMessage,
 } from "./compaction_storage";
 import { getPostCompactionMessages } from "./compaction_utils";
-import { getProviderOptions, getAiHeaders } from "@/ipc/utils/provider_options";
+import {
+  getProviderOptions,
+  getAiHeaders,
+  DYAD_INTERNAL_REQUEST_ID_HEADER,
+} from "@/ipc/utils/provider_options";
 import { escapeXmlContent } from "../../../../shared/xmlEscape";
 
 const logger = log.scope("compaction_handler");
@@ -174,9 +178,12 @@ export async function performCompaction(
 
     const summaryResult = streamText({
       model: modelClient.model,
-      headers: getAiHeaders({
+      headers: {
+        ...getAiHeaders({
           builtinProviderId: modelClient.builtinProviderId,
         }),
+        [DYAD_INTERNAL_REQUEST_ID_HEADER]: dyadRequestId,
+      },
       providerOptions: getProviderOptions({
         dyadAppId: 0,
         dyadRequestId,

src/ipc/utils/llm_engine_provider.ts

@@ -8,6 +8,7 @@ import {
 
 import log from "electron-log";
 import { getExtraProviderOptions } from "./thinking_utils";
+import { DYAD_INTERNAL_REQUEST_ID_HEADER } from "./provider_options";
 import type { UserSettings } from "../../lib/schemas";
 import type { LanguageModel } from "ai";
 
@@ -118,6 +119,7 @@ export function createDyadEngine(
           ...JSON.parse(init.body),
           ...getExtraProviderOptions(providerId, options.settings),
         };
+
         const dyadVersionedFiles = parsedBody.dyadVersionedFiles;
         if ("dyadVersionedFiles" in parsedBody) {
           delete parsedBody.dyadVersionedFiles;
@@ -126,7 +128,14 @@ export function createDyadEngine(
         if ("dyadFiles" in parsedBody) {
           delete parsedBody.dyadFiles;
         }
-        const requestId = parsedBody.dyadRequestId;
+        // Read from body (OpenAICompatible models spread providerOptions into
+        // the body) with a fallback to an internal header (OpenAIResponses
+        // models don't forward providerOptions, so we pass it via header).
+        const requestId =
+          parsedBody.dyadRequestId ??
+          (init.headers as Record<string, string> | undefined)?.[
+            DYAD_INTERNAL_REQUEST_ID_HEADER
+          ];
         if ("dyadRequestId" in parsedBody) {
           delete parsedBody.dyadRequestId;
         }
@@ -173,10 +182,12 @@ export function createDyadEngine(
         }
 
         // Return modified request with files included and requestId in headers
+        const { [DYAD_INTERNAL_REQUEST_ID_HEADER]: _, ...outgoingHeaders } =
+          (init.headers as Record<string, string>) ?? {};
         const modifiedInit = {
           ...init,
           headers: {
-            ...init.headers,
+            ...outgoingHeaders,
             ...(modifiedRequestId && {
               "X-Dyad-Request-Id": modifiedRequestId,
             }),

src/ipc/utils/provider_options.ts

@@ -86,6 +86,11 @@ export function getProviderOptions({
   return providerOptions;
 }
 
+// Header used to pass the request ID through AI SDK models that don't forward
+// providerOptions into the request body (e.g. OpenAIResponsesLanguageModel).
+export const DYAD_INTERNAL_REQUEST_ID_HEADER =
+  "x-dyad-internal-request-id" as const;
+
 export interface GetAiHeadersParams {
   builtinProviderId: string | undefined;
 }

src/pro/main/ipc/handlers/local_agent/local_agent_handler.ts

@@ -24,7 +24,11 @@ import { getDyadAppPath } from "@/paths/paths";
 import { getModelClient } from "@/ipc/utils/get_model_client";
 import { safeSend } from "@/ipc/utils/safe_sender";
 import { getMaxTokens, getTemperature } from "@/ipc/utils/token_utils";
-import { getProviderOptions, getAiHeaders } from "@/ipc/utils/provider_options";
+import {
+  getProviderOptions,
+  getAiHeaders,
+  DYAD_INTERNAL_REQUEST_ID_HEADER,
+} from "@/ipc/utils/provider_options";
 
 import {
   AgentToolName,
@@ -649,9 +653,12 @@ export async function handleLocalAgentStream(
         try {
           const streamResult = streamText({
             model: modelClient.model,
-            headers: getAiHeaders({
+            headers: {
+              ...getAiHeaders({
                 builtinProviderId: modelClient.builtinProviderId,
               }),
+              [DYAD_INTERNAL_REQUEST_ID_HEADER]: dyadRequestId,
+            },
             providerOptions: getProviderOptions({
               dyadAppId: chat.app.id,
               dyadRequestId,