fix(core): align Copilot response continuation (#41452)

rekram1-node · web-flow · commit 35c610c41040 · 2026-08-09T18:06:01.000-05:00
diff --git a/packages/core/src/github-copilot/responses/convert-to-openai-responses-input.ts b/packages/core/src/github-copilot/responses/convert-to-openai-responses-input.ts
@@ -127,7 +127,7 @@ export async function convertToOpenAIResponsesInput({
               input.push({
                 role: "assistant",
                 content: [{ type: "output_text", text: part.text }],
-                id: (part.providerOptions?.copilot?.itemId as string) ?? undefined,
+                id: store ? ((part.providerOptions?.copilot?.itemId as string) ?? undefined) : undefined,
               })
               break
             }
@@ -143,7 +143,7 @@ export async function convertToOpenAIResponsesInput({
                 input.push({
                   type: "local_shell_call",
                   call_id: part.toolCallId,
-                  id: (part.providerOptions?.copilot?.itemId as string) ?? undefined,
+                  id: store ? ((part.providerOptions?.copilot?.itemId as string) ?? undefined) : undefined,
                   action: {
                     type: "exec",
                     command: parsedInput.action.command,
@@ -162,7 +162,7 @@ export async function convertToOpenAIResponsesInput({
                 call_id: part.toolCallId,
                 name: part.toolName,
                 arguments: JSON.stringify(part.input),
-                id: (part.providerOptions?.copilot?.itemId as string) ?? undefined,
+                id: store ? ((part.providerOptions?.copilot?.itemId as string) ?? undefined) : undefined,
               })
               break
             }
@@ -206,50 +206,20 @@ export async function convertToOpenAIResponsesInput({
                       summary: [],
                     }
                   }
-                } else {
-                  const summaryParts: Array<{
-                    type: "summary_text"
-                    text: string
-                  }> = []
-
-                  if (part.text.length > 0) {
-                    summaryParts.push({
-                      type: "summary_text",
-                      text: part.text,
-                    })
-                  } else if (reasoningMessage !== undefined) {
-                    warnings.push({
-                      type: "other",
-                      message: `Cannot append empty reasoning part to existing reasoning sequence. Skipping reasoning part: ${JSON.stringify(part)}.`,
-                    })
-                  }
-
-                  if (reasoningMessage === undefined) {
-                    reasoningMessages[reasoningId] = {
-                      type: "reasoning",
-                      id: reasoningId,
-                      encrypted_content: providerOptions?.reasoningEncryptedContent,
-                      summary: summaryParts,
-                    }
-                    input.push(reasoningMessages[reasoningId])
-                  } else {
-                    reasoningMessage.summary.push(...summaryParts)
+                } else if (providerOptions?.reasoningEncryptedContent != null && reasoningMessage === undefined) {
+                  reasoningMessages[reasoningId] = {
+                    type: "reasoning",
+                    id: reasoningId,
+                    encrypted_content: providerOptions.reasoningEncryptedContent,
+                    summary: [],
                   }
+                  input.push(reasoningMessages[reasoningId])
                 }
               } else {
-                const encryptedContent = providerOptions?.reasoningEncryptedContent
-                if (encryptedContent != null) {
-                  input.push({
-                    type: "reasoning",
-                    encrypted_content: encryptedContent,
-                    summary: part.text.length > 0 ? [{ type: "summary_text", text: part.text }] : [],
-                  })
-                } else {
-                  warnings.push({
-                    type: "other",
-                    message: `Non-OpenAI reasoning parts are not supported. Skipping reasoning part: ${JSON.stringify(part)}.`,
-                  })
-                }
+                warnings.push({
+                  type: "other",
+                  message: `Non-OpenAI reasoning parts are not supported. Skipping reasoning part: ${JSON.stringify(part)}.`,
+                })
               }
               break
             }
diff --git a/packages/core/src/github-copilot/responses/openai-responses-api-types.ts b/packages/core/src/github-copilot/responses/openai-responses-api-types.ts
@@ -71,7 +71,7 @@ export type OpenAIResponsesComputerCall = {
 
 export type OpenAIResponsesLocalShellCall = {
   type: "local_shell_call"
-  id: string
+  id?: string
   call_id: string
   action: {
     type: "exec"
@@ -205,7 +205,7 @@ export type OpenAIResponsesTool =
 
 export type OpenAIResponsesReasoning = {
   type: "reasoning"
-  id?: string
+  id: string
   encrypted_content?: string | null
   summary: Array<{
     type: "summary_text"
diff --git a/packages/core/src/github-copilot/responses/openai-responses-language-model.ts b/packages/core/src/github-copilot/responses/openai-responses-language-model.ts
@@ -198,12 +198,13 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
       providerOptions,
       schema: openaiResponsesProviderOptionsSchema,
     })
+    const store = openaiOptions?.store ?? false
 
     const { input, warnings: inputWarnings } = await convertToOpenAIResponsesInput({
       prompt,
       systemMessageMode: modelConfig.systemMessageMode,
       fileIdPrefixes: this.config.fileIdPrefixes,
-      store: openaiOptions?.store ?? true,
+      store,
       hasLocalShellTool: hasOpenAITool("openai.local_shell"),
     })
 
@@ -214,9 +215,12 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
     let include: OpenAIResponsesIncludeOptions = openaiOptions?.include
 
     function addInclude(key: OpenAIResponsesIncludeValue) {
+      if (include?.includes(key)) return
       include = include != null ? [...include, key] : [key]
     }
 
+    addInclude("reasoning.encrypted_content")
+
     function hasOpenAITool(id: string) {
       return tools?.find((tool) => tool.type === "provider" && tool.id === id) != null
     }
@@ -282,7 +286,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
       metadata: openaiOptions?.metadata,
       parallel_tool_calls: openaiOptions?.parallelToolCalls,
       previous_response_id: openaiOptions?.previousResponseId,
-      store: openaiOptions?.store,
+      store,
       user: openaiOptions?.user,
       instructions: openaiOptions?.instructions,
       service_tier: openaiOptions?.serviceTier,
@@ -840,7 +844,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
       {
         canonicalId: string // the item.id from output_item.added
         encryptedContent?: string | null
-        summaryParts: number[]
+        summaryParts: Record<number, "active" | "can-conclude" | "concluded">
       }
     > = {}
 
@@ -960,11 +964,14 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
                   },
                 })
               } else if (isResponseOutputItemAddedReasoningChunk(value)) {
-                if (activeReasoning[value.output_index]) return
+                if (activeReasoning[value.output_index]) {
+                  currentReasoningOutputIndex = value.output_index
+                  return
+                }
                 activeReasoning[value.output_index] = {
                   canonicalId: value.item.id,
                   encryptedContent: value.item.encrypted_content,
-                  summaryParts: [0],
+                  summaryParts: { 0: "active" },
                 }
                 currentReasoningOutputIndex = value.output_index
 
@@ -1118,14 +1125,14 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
               } else if (isResponseOutputItemDoneReasoningChunk(value)) {
                 const activeReasoningPart = activeReasoning[value.output_index]
                 if (activeReasoningPart) {
-                  const summaryIndex = activeReasoningPart.summaryParts.at(-1)
-                  if (summaryIndex !== undefined) {
+                  for (const [summaryIndex, status] of Object.entries(activeReasoningPart.summaryParts)) {
+                    if (status === "concluded") continue
                     controller.enqueue({
                       type: "reasoning-end",
                       id: `${activeReasoningPart.canonicalId}:${summaryIndex}`,
                       providerMetadata: {
                         copilot: {
-                          itemId: activeReasoningPart.canonicalId,
+                          itemId: value.item.id,
                           reasoningEncryptedContent: value.item.encrypted_content ?? null,
                         },
                       },
@@ -1230,18 +1237,19 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
                 currentReasoningOutputIndex !== null ? activeReasoning[currentReasoningOutputIndex] : null
 
               // the first reasoning start is pushed in isResponseOutputItemAddedReasoningChunk.
-              if (activeItem && value.summary_index > 0 && !activeItem.summaryParts.includes(value.summary_index)) {
-                const previousSummaryIndex = activeItem.summaryParts.at(-1)
-                if (previousSummaryIndex !== undefined) {
+              if (activeItem && value.summary_index > 0 && activeItem.summaryParts[value.summary_index] === undefined) {
+                for (const [summaryIndex, status] of Object.entries(activeItem.summaryParts)) {
+                  if (status !== "can-conclude") continue
                   controller.enqueue({
                     type: "reasoning-end",
-                    id: `${activeItem.canonicalId}:${previousSummaryIndex}`,
+                    id: `${activeItem.canonicalId}:${summaryIndex}`,
                     providerMetadata: {
                       copilot: { itemId: activeItem.canonicalId },
                     },
                   })
+                  activeItem.summaryParts[Number(summaryIndex)] = "concluded"
                 }
-                activeItem.summaryParts.push(value.summary_index)
+                activeItem.summaryParts[value.summary_index] = "active"
 
                 controller.enqueue({
                   type: "reasoning-start",
@@ -1254,6 +1262,22 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
                   },
                 })
               }
+            } else if (isResponseReasoningSummaryPartDoneChunk(value)) {
+              const activeItem =
+                currentReasoningOutputIndex !== null ? activeReasoning[currentReasoningOutputIndex] : null
+              if (!activeItem || activeItem.summaryParts[value.summary_index] !== "active") return
+              if (body.store === false) {
+                activeItem.summaryParts[value.summary_index] = "can-conclude"
+                return
+              }
+              controller.enqueue({
+                type: "reasoning-end",
+                id: `${activeItem.canonicalId}:${value.summary_index}`,
+                providerMetadata: {
+                  copilot: { itemId: activeItem.canonicalId },
+                },
+              })
+              activeItem.summaryParts[value.summary_index] = "concluded"
             } else if (isResponseReasoningSummaryTextDeltaChunk(value)) {
               const activeItem =
                 currentReasoningOutputIndex !== null ? activeReasoning[currentReasoningOutputIndex] : null
@@ -1316,6 +1340,16 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
               controller.enqueue({ type: "text-end", id: currentTextId })
               currentTextId = null
             }
+            for (const activeItem of Object.values(activeReasoning)) {
+              for (const [summaryIndex, status] of Object.entries(activeItem.summaryParts)) {
+                if (status === "concluded") continue
+                controller.enqueue({
+                  type: "reasoning-end",
+                  id: `${activeItem.canonicalId}:${summaryIndex}`,
+                  providerMetadata: { copilot: { itemId: activeItem.canonicalId } },
+                })
+              }
+            }
 
             const providerMetadata: SharedV3ProviderMetadata = {
               copilot: {
@@ -1564,6 +1598,12 @@ const responseReasoningSummaryTextDeltaSchema = z.object({
   delta: z.string(),
 })
 
+const responseReasoningSummaryPartDoneSchema = z.object({
+  type: z.literal("response.reasoning_summary_part.done"),
+  item_id: z.string(),
+  summary_index: z.number(),
+})
+
 const openaiResponsesChunkSchema = z.union([
   textDeltaChunkSchema,
   responseFinishedChunkSchema,
@@ -1576,6 +1616,7 @@ const openaiResponsesChunkSchema = z.union([
   responseCodeInterpreterCallCodeDoneSchema,
   responseAnnotationAddedSchema,
   responseReasoningSummaryPartAddedSchema,
+  responseReasoningSummaryPartDoneSchema,
   responseReasoningSummaryTextDeltaSchema,
   errorChunkSchema,
   z.object({ type: z.string() }).loose(), // fallback for unknown chunks
@@ -1664,6 +1705,12 @@ function isResponseReasoningSummaryPartAddedChunk(
   return chunk.type === "response.reasoning_summary_part.added"
 }
 
+function isResponseReasoningSummaryPartDoneChunk(
+  chunk: z.infer<typeof openaiResponsesChunkSchema>,
+): chunk is z.infer<typeof responseReasoningSummaryPartDoneSchema> {
+  return chunk.type === "response.reasoning_summary_part.done"
+}
+
 function isResponseReasoningSummaryTextDeltaChunk(
   chunk: z.infer<typeof openaiResponsesChunkSchema>,
 ): chunk is z.infer<typeof responseReasoningSummaryTextDeltaSchema> {
diff --git a/packages/core/src/plugin/provider/github-copilot.ts b/packages/core/src/plugin/provider/github-copilot.ts
@@ -1,5 +1,4 @@
 import type { IntegrationOAuthMethodRegistration } from "@opencode-ai/plugin/effect/integration"
-import { Message } from "@opencode-ai/ai"
 import { Effect, Option, Schema, Semaphore, Stream } from "effect"
 import { Catalog } from "../../catalog"
 import { Credential } from "../../credential"
@@ -202,12 +201,7 @@ export const GithubCopilotPlugin = define({
           if (!loaded.models.has(Model.ID.make(id))) evt.model.remove(item.provider.id, id)
         }
         for (const [id, model] of loaded.models) {
-          evt.model.update(item.provider.id, id, (draft) => {
-            Object.assign(draft, structuredClone(model))
-            if (Provider.packageName(draft.package) === "@ai-sdk/github-copilot") {
-              draft.settings = Provider.mergeOverlay(draft.settings, { store: false })
-            }
-          })
+          evt.model.update(item.provider.id, id, (draft) => Object.assign(draft, structuredClone(model)))
         }
       } else if (loaded.baseURL) {
         for (const id of item.models.keys()) {
@@ -255,28 +249,6 @@ export const GithubCopilotPlugin = define({
         applyHeaders(evt.request.headers, token, ctx.app, requestMetadata(evt.request.url, body), true)
       }),
     )
-    yield* ctx.session.hook("context", (evt) =>
-      Effect.sync(() => {
-        if (evt.model.providerID !== Provider.ID.githubCopilot) return
-        evt.messages = evt.messages.map(
-          (message) =>
-            new Message({
-              ...message,
-              content: message.content.map((part) => {
-                if (!("providerMetadata" in part)) return part
-                const metadata = part.providerMetadata?.copilot
-                if (metadata === undefined || !("itemId" in metadata)) return part
-                const next = { ...metadata }
-                delete next.itemId
-                return {
-                  ...part,
-                  providerMetadata: { ...part.providerMetadata, copilot: next },
-                }
-              }),
-            }),
-        )
-      }),
-    )
     yield* ctx.aisdk.hook(
       "language",
       Effect.fn(function* (evt) {
diff --git a/packages/core/test/github-copilot/openai-responses-language-model.test.ts b/packages/core/test/github-copilot/openai-responses-language-model.test.ts
diff --git a/packages/core/test/plugin/provider-github-copilot.test.ts b/packages/core/test/plugin/provider-github-copilot.test.ts
