@opencode/ai 2.0.20 → 2.0.22

package/dist/protocols/openai-chat.d.ts

@@ -12,6 +12,7 @@ declare const OpenAIChatCacheControl: Schema.Struct<{
     readonly type: Schema.Literal<"ephemeral">;
     readonly ttl: Schema.optional<Schema.String>;
 }>;
+type OpenAIChatCacheControl = Schema.Schema.Type<typeof OpenAIChatCacheControl>;
 declare const ExtraContent: Schema.Struct<{
     readonly google: Schema.Struct<{
         readonly thought_signature: Schema.String;
@@ -94,7 +95,14 @@ export declare const bodyFields: {
         }>]>>]>;
     }>, Schema.StructWithRest<Schema.Struct<{
         readonly role: Schema.Literal<"assistant">;
-        readonly content: Schema.NullOr<Schema.String>;
+        readonly content: Schema.NullOr<Schema.Union<readonly [Schema.String, Schema.$Array<Schema.Struct<{
+            readonly type: Schema.Literal<"text">;
+            readonly text: Schema.String;
+            readonly cache_control: Schema.optional<Schema.Struct<{
+                readonly type: Schema.Literal<"ephemeral">;
+                readonly ttl: Schema.optional<Schema.String>;
+            }>>;
+        }>>]>>;
         readonly tool_calls: Schema.optional<Schema.$Array<Schema.Struct<{
             readonly id: Schema.String;
             readonly type: Schema.tag<"function">;
@@ -112,18 +120,17 @@ export declare const bodyFields: {
         readonly reasoning: Schema.optional<Schema.String>;
         readonly reasoning_text: Schema.optional<Schema.String>;
         readonly reasoning_details: Schema.optional<Schema.Unknown>;
-        readonly cache_control: Schema.optional<Schema.Struct<{
-            readonly type: Schema.Literal<"ephemeral">;
-            readonly ttl: Schema.optional<Schema.String>;
-        }>>;
     }>, readonly [Schema.$Record<Schema.String, Schema.Unknown>]>, Schema.Struct<{
         readonly role: Schema.Literal<"tool">;
         readonly tool_call_id: Schema.String;
-        readonly content: Schema.String;
-        readonly cache_control: Schema.optional<Schema.Struct<{
-            readonly type: Schema.Literal<"ephemeral">;
-            readonly ttl: Schema.optional<Schema.String>;
-        }>>;
+        readonly content: Schema.Union<readonly [Schema.String, Schema.$Array<Schema.Struct<{
+            readonly type: Schema.Literal<"text">;
+            readonly text: Schema.String;
+            readonly cache_control: Schema.optional<Schema.Struct<{
+                readonly type: Schema.Literal<"ephemeral">;
+                readonly ttl: Schema.optional<Schema.String>;
+            }>>;
+        }>>]>;
     }>]>>;
     tools: Schema.optional<Schema.$Array<Schema.Struct<{
         readonly type: Schema.tag<"function">;
@@ -207,7 +214,14 @@ declare const OpenAIChatBody: Schema.Struct<{
         }>]>>]>;
     }>, Schema.StructWithRest<Schema.Struct<{
         readonly role: Schema.Literal<"assistant">;
-        readonly content: Schema.NullOr<Schema.String>;
+        readonly content: Schema.NullOr<Schema.Union<readonly [Schema.String, Schema.$Array<Schema.Struct<{
+            readonly type: Schema.Literal<"text">;
+            readonly text: Schema.String;
+            readonly cache_control: Schema.optional<Schema.Struct<{
+                readonly type: Schema.Literal<"ephemeral">;
+                readonly ttl: Schema.optional<Schema.String>;
+            }>>;
+        }>>]>>;
         readonly tool_calls: Schema.optional<Schema.$Array<Schema.Struct<{
             readonly id: Schema.String;
             readonly type: Schema.tag<"function">;
@@ -225,18 +239,17 @@ declare const OpenAIChatBody: Schema.Struct<{
         readonly reasoning: Schema.optional<Schema.String>;
         readonly reasoning_text: Schema.optional<Schema.String>;
         readonly reasoning_details: Schema.optional<Schema.Unknown>;
-        readonly cache_control: Schema.optional<Schema.Struct<{
-            readonly type: Schema.Literal<"ephemeral">;
-            readonly ttl: Schema.optional<Schema.String>;
-        }>>;
     }>, readonly [Schema.$Record<Schema.String, Schema.Unknown>]>, Schema.Struct<{
         readonly role: Schema.Literal<"tool">;
         readonly tool_call_id: Schema.String;
-        readonly content: Schema.String;
-        readonly cache_control: Schema.optional<Schema.Struct<{
-            readonly type: Schema.Literal<"ephemeral">;
-            readonly ttl: Schema.optional<Schema.String>;
-        }>>;
+        readonly content: Schema.Union<readonly [Schema.String, Schema.$Array<Schema.Struct<{
+            readonly type: Schema.Literal<"text">;
+            readonly text: Schema.String;
+            readonly cache_control: Schema.optional<Schema.Struct<{
+                readonly type: Schema.Literal<"ephemeral">;
+                readonly ttl: Schema.optional<Schema.String>;
+            }>>;
+        }>>]>;
     }>]>>;
     tools: Schema.optional<Schema.$Array<Schema.Struct<{
         readonly type: Schema.tag<"function">;
@@ -302,6 +315,8 @@ export declare const OpenAIChatEvent: Schema.StructWithRest<Schema.Struct<{
             readonly total_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
             readonly cached_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
             readonly prompt_cache_hit_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
+            readonly cache_read_input_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
+            readonly cache_created_input_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
             readonly prompt_tokens_details: Schema.optional<Schema.NullOr<Schema.StructWithRest<Schema.Struct<{
                 readonly cached_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
                 readonly cache_write_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
@@ -319,6 +334,8 @@ export declare const OpenAIChatEvent: Schema.StructWithRest<Schema.Struct<{
         readonly total_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
         readonly cached_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
         readonly prompt_cache_hit_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
+        readonly cache_read_input_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
+        readonly cache_created_input_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
         readonly prompt_tokens_details: Schema.optional<Schema.NullOr<Schema.StructWithRest<Schema.Struct<{
             readonly cached_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
             readonly cache_write_tokens: Schema.optional<Schema.NullOr<Schema.Number>>;
@@ -360,7 +377,7 @@ export interface ParserState {
     readonly requireFinishReason: boolean;
 }
 interface LoweringOptions {
-    readonly cacheControl?: (cache: CacheHint | undefined) => Schema.Schema.Type<typeof OpenAIChatCacheControl> | undefined;
+    readonly cacheControl?: (cache: CacheHint | undefined) => OpenAIChatCacheControl | undefined;
     readonly toolCallID?: (id: string) => string;
 }
 export declare const fromRequest: (request: LLMRequest<import("../schema/options.js").LanguageModel<{
@@ -425,15 +442,18 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
         })[];
     } | {
         readonly [x: string]: unknown;
-        readonly content: string | null;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[] | null;
         readonly role: "assistant";
         readonly reasoning?: string | undefined;
         readonly reasoning_content?: string | undefined;
         readonly reasoning_text?: string | undefined;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
         readonly tool_calls?: readonly {
             readonly function: {
                 readonly name: string;
@@ -449,13 +469,16 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
         }[] | undefined;
         readonly reasoning_details?: unknown;
     } | {
-        readonly content: string;
         readonly role: "tool";
         readonly tool_call_id: string;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[];
     })[];
     tools: {
         readonly function: {
@@ -539,15 +562,18 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
         })[];
     } | {
         readonly [x: string]: unknown;
-        readonly content: string | null;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[] | null;
         readonly role: "assistant";
         readonly reasoning?: string | undefined;
         readonly reasoning_content?: string | undefined;
         readonly reasoning_text?: string | undefined;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
         readonly tool_calls?: readonly {
             readonly function: {
                 readonly name: string;
@@ -563,13 +589,16 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
         }[] | undefined;
         readonly reasoning_details?: unknown;
     } | {
-        readonly content: string;
         readonly role: "tool";
         readonly tool_call_id: string;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[];
     })[];
     tools: {
         readonly function: {
@@ -646,15 +675,18 @@ export declare const protocol: Protocol<{
         })[];
     } | {
         readonly [x: string]: unknown;
-        readonly content: string | null;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[] | null;
         readonly role: "assistant";
         readonly reasoning?: string | undefined;
         readonly reasoning_content?: string | undefined;
         readonly reasoning_text?: string | undefined;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
         readonly tool_calls?: readonly {
             readonly function: {
                 readonly name: string;
@@ -670,13 +702,16 @@ export declare const protocol: Protocol<{
         }[] | undefined;
         readonly reasoning_details?: unknown;
     } | {
-        readonly content: string;
         readonly role: "tool";
         readonly tool_call_id: string;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[];
     })[];
     readonly stream: true;
     readonly max_completion_tokens?: number | undefined;
@@ -724,6 +759,7 @@ export declare const protocol: Protocol<{
     } | null | undefined;
     readonly usage?: {
         readonly [x: string]: unknown;
+        readonly cache_read_input_tokens?: number | null | undefined;
         readonly cached_tokens?: number | null | undefined;
         readonly prompt_tokens?: number | null | undefined;
         readonly completion_tokens?: number | null | undefined;
@@ -734,6 +770,7 @@ export declare const protocol: Protocol<{
             readonly cache_write_tokens?: number | null | undefined;
         } | null | undefined;
         readonly prompt_cache_hit_tokens?: number | null | undefined;
+        readonly cache_created_input_tokens?: number | null | undefined;
         readonly completion_tokens_details?: {
             readonly [x: string]: unknown;
             readonly reasoning_tokens?: number | null | undefined;
@@ -763,6 +800,7 @@ export declare const protocol: Protocol<{
         } | null | undefined;
         readonly usage?: {
             readonly [x: string]: unknown;
+            readonly cache_read_input_tokens?: number | null | undefined;
             readonly cached_tokens?: number | null | undefined;
             readonly prompt_tokens?: number | null | undefined;
             readonly completion_tokens?: number | null | undefined;
@@ -773,6 +811,7 @@ export declare const protocol: Protocol<{
                 readonly cache_write_tokens?: number | null | undefined;
             } | null | undefined;
             readonly prompt_cache_hit_tokens?: number | null | undefined;
+            readonly cache_created_input_tokens?: number | null | undefined;
             readonly completion_tokens_details?: {
                 readonly [x: string]: unknown;
                 readonly reasoning_tokens?: number | null | undefined;
@@ -831,15 +870,18 @@ export declare const httpTransport: HttpTransport.HttpJsonTransport<{
         })[];
     } | {
         readonly [x: string]: unknown;
-        readonly content: string | null;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[] | null;
         readonly role: "assistant";
         readonly reasoning?: string | undefined;
         readonly reasoning_content?: string | undefined;
         readonly reasoning_text?: string | undefined;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
         readonly tool_calls?: readonly {
             readonly function: {
                 readonly name: string;
@@ -855,13 +897,16 @@ export declare const httpTransport: HttpTransport.HttpJsonTransport<{
         }[] | undefined;
         readonly reasoning_details?: unknown;
     } | {
-        readonly content: string;
         readonly role: "tool";
         readonly tool_call_id: string;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[];
     })[];
     readonly stream: true;
     readonly max_completion_tokens?: number | undefined;
@@ -947,15 +992,18 @@ export declare const route: Route<{
         })[];
     } | {
         readonly [x: string]: unknown;
-        readonly content: string | null;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[] | null;
         readonly role: "assistant";
         readonly reasoning?: string | undefined;
         readonly reasoning_content?: string | undefined;
         readonly reasoning_text?: string | undefined;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
         readonly tool_calls?: readonly {
             readonly function: {
                 readonly name: string;
@@ -971,13 +1019,16 @@ export declare const route: Route<{
         }[] | undefined;
         readonly reasoning_details?: unknown;
     } | {
-        readonly content: string;
         readonly role: "tool";
         readonly tool_call_id: string;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[];
     })[];
     readonly stream: true;
     readonly max_completion_tokens?: number | undefined;

package/dist/protocols/openai-chat.js

@@ -83,12 +83,13 @@ const ReasoningDetail = Schema.Union([
 ]);
 const decodeReasoningDetail = Schema.decodeUnknownOption(ReasoningDetail);
 const knownReasoningDetails = (details) => details.flatMap((detail) => Option.toArray(decodeReasoningDetail(detail)));
+const OpenAIChatTextContent = Schema.Struct({
+    type: Schema.Literal("text"),
+    text: Schema.String,
+    cache_control: Schema.optional(OpenAIChatCacheControl),
+});
 const OpenAIChatUserContent = Schema.Union([
-    Schema.Struct({
-        type: Schema.Literal("text"),
-        text: Schema.String,
-        cache_control: Schema.optional(OpenAIChatCacheControl),
-    }),
+    OpenAIChatTextContent,
     Schema.Struct({
         type: Schema.Literal("image_url"),
         image_url: Schema.Struct({ url: Schema.String }),
@@ -109,19 +110,17 @@ const OpenAIChatMessage = Schema.Union([
     }),
     Schema.StructWithRest(Schema.Struct({
         role: Schema.Literal("assistant"),
-        content: Schema.NullOr(Schema.String),
+        content: Schema.NullOr(Schema.Union([Schema.String, Schema.Array(OpenAIChatTextContent)])),
         tool_calls: optionalArray(OpenAIChatAssistantToolCall),
         reasoning_content: Schema.optional(Schema.String),
         reasoning: Schema.optional(Schema.String),
         reasoning_text: Schema.optional(Schema.String),
         reasoning_details: Schema.optional(Schema.Unknown),
-        cache_control: Schema.optional(OpenAIChatCacheControl),
     }), [Schema.Record(Schema.String, Schema.Unknown)]),
     Schema.Struct({
         role: Schema.Literal("tool"),
         tool_call_id: Schema.String,
-        content: Schema.String,
-        cache_control: Schema.optional(OpenAIChatCacheControl),
+        content: Schema.Union([Schema.String, Schema.Array(OpenAIChatTextContent)]),
     }),
 ]).pipe(Schema.toTaggedUnion("role"));
 const OpenAIChatToolChoice = Schema.Union([
@@ -162,9 +161,11 @@ const OpenAIChatUsage = Schema.StructWithRest(Schema.Struct({
     prompt_tokens: optionalNull(Schema.Number),
     completion_tokens: optionalNull(Schema.Number),
     total_tokens: optionalNull(Schema.Number),
-    // Zai reports cache hits as top-level `cached_tokens`; DeepSeek uses `prompt_cache_hit_tokens`.
+    // Provider-specific cache accounting fields.
     cached_tokens: optionalNull(Schema.Number),
     prompt_cache_hit_tokens: optionalNull(Schema.Number),
+    cache_read_input_tokens: optionalNull(Schema.Number),
+    cache_created_input_tokens: optionalNull(Schema.Number),
     prompt_tokens_details: optionalNull(Schema.StructWithRest(Schema.Struct({
         cached_tokens: optionalNull(Schema.Number),
         cache_write_tokens: optionalNull(Schema.Number),
@@ -305,7 +306,7 @@ const lowerAssistantMessage = Effect.fn("OpenAIChat.lowerAssistantMessage")(func
         if (!ProviderShared.supportsContent(part, ["text", "reasoning", "tool-call"]))
             return yield* ProviderShared.unsupportedContent("OpenAI Chat", "assistant", ["text", "reasoning", "tool-call"]);
         if (part.type === "text") {
-            content.push(part);
+            content.push({ type: "text", text: part.text, cache_control: options.cacheControl?.(part.cache) });
             continue;
         }
         if (part.type === "reasoning") {
@@ -347,14 +348,17 @@ const lowerAssistantMessage = Effect.fn("OpenAIChat.lowerAssistantMessage")(func
             return nativeReasoning ?? (requireReasoning ? "" : undefined);
         return text;
     })();
-    const cached = message.content.findLast((part) => "cache" in part && part.cache !== undefined);
-    const cacheControl = options.cacheControl?.(cached && "cache" in cached ? cached.cache : undefined);
     const result = {
         role: "assistant",
-        content: content.length > 0 ? content.map((part) => part.text).join("") : toolCalls.length > 0 ? null : "",
+        content: (() => {
+            if (content.some((part) => part.cache_control !== undefined))
+                return content;
+            if (content.length === 0 && toolCalls.length > 0)
+                return null;
+            return content.map((part) => part.text).join("");
+        })(),
         ...(toolCalls.length > 0 ? { tool_calls: toolCalls } : {}),
         ...(details !== undefined ? { reasoning_details: details } : {}),
-        ...(cacheControl !== undefined ? { cache_control: cacheControl } : {}),
     };
     if (field === undefined || reasoningText === undefined)
         return result;
@@ -367,27 +371,23 @@ const lowerToolMessages = Effect.fn("OpenAIChat.lowerToolMessages")(function* (m
         if (!ProviderShared.supportsContent(part, ["tool-result"]))
             return yield* ProviderShared.unsupportedContent("OpenAI Chat", "tool", ["tool-result"]);
         if (part.result.type !== "content") {
-            messages.push({
-                role: "tool",
-                tool_call_id: options.toolCallID?.(part.id) ?? part.id,
-                content: ProviderShared.toolResultText(part),
-                cache_control: options.cacheControl?.(part.cache),
-            });
+            messages.push(toolMessage(options.toolCallID?.(part.id) ?? part.id, ProviderShared.toolResultText(part), options.cacheControl?.(part.cache)));
             continue;
         }
         const content = part.result.value;
         const text = content.filter((item) => item.type === "text").map((item) => item.text);
-        messages.push({
-            role: "tool",
-            tool_call_id: options.toolCallID?.(part.id) ?? part.id,
-            content: text.join("\n"),
-            cache_control: options.cacheControl?.(part.cache),
-        });
+        messages.push(toolMessage(options.toolCallID?.(part.id) ?? part.id, text.join("\n"), options.cacheControl?.(part.cache)));
         const files = content.filter((item) => item.type === "file");
         attachments.push(...(yield* Effect.forEach(files, (item) => lowerMedia(ProviderShared.toolFileMedia(item)))));
     }
     return { messages, attachments };
 });
+// Chat cache breakpoints belong on text content parts, not on the message itself.
+const toolMessage = (toolCallID, text, cacheControl) => ({
+    role: "tool",
+    tool_call_id: toolCallID,
+    content: cacheControl === undefined ? text : [{ type: "text", text, cache_control: cacheControl }],
+});
 const lowerMessage = Effect.fn("OpenAIChat.lowerMessage")(function* (message, reasoningField, requireReasoning, options) {
     if (message.role === "user")
         return [yield* lowerUserMessage(message, options)];
@@ -452,24 +452,25 @@ const lowerMessages = Effect.fn("OpenAIChat.lowerMessages")(function* (request,
             bridgeTools();
         if (message.role === "system") {
             const part = yield* ProviderShared.wrappedSystemUpdate("OpenAI Chat", message);
+            const cacheControl = options.cacheControl?.(part.cache);
             if (pendingAttachments.length > 0) {
                 messages.push({
                     role: "user",
                     content: [
                         ...pendingAttachments.splice(0),
-                        { type: "text", text: part.text, cache_control: options.cacheControl?.(part.cache) },
+                        { type: "text", text: part.text, cache_control: cacheControl },
                     ],
                 });
                 continue;
             }
             const previous = messages.at(-1);
             if (previous?.role === "user" && typeof previous.content === "string")
-                messages[messages.length - 1] = options.cacheControl?.(part.cache)
+                messages[messages.length - 1] = cacheControl
                     ? {
                         role: "user",
                         content: [
                             { type: "text", text: previous.content },
-                            { type: "text", text: part.text, cache_control: options.cacheControl(part.cache) },
+                            { type: "text", text: part.text, cache_control: cacheControl },
                         ],
                     }
                     : { role: "user", content: `${previous.content}\n${part.text}` };
@@ -478,14 +479,14 @@ const lowerMessages = Effect.fn("OpenAIChat.lowerMessages")(function* (request,
                     role: "user",
                     content: [
                         ...previous.content,
-                        { type: "text", text: part.text, cache_control: options.cacheControl?.(part.cache) },
+                        { type: "text", text: part.text, cache_control: cacheControl },
                     ],
                 };
             else
-                messages.push(options.cacheControl?.(part.cache)
+                messages.push(cacheControl
                     ? {
                         role: "user",
-                        content: [{ type: "text", text: part.text, cache_control: options.cacheControl(part.cache) }],
+                        content: [{ type: "text", text: part.text, cache_control: cacheControl }],
                     }
                     : { role: "user", content: part.text });
             continue;
@@ -720,17 +721,19 @@ const mapFinishReason = Effect.fn("OpenAIChat.mapFinishReason")(function* (event
 // satisfied on both sides.
 // Providers differ on cache-hit location: OpenAI uses
 // `prompt_tokens_details.cached_tokens`, DeepSeek uses
-// `prompt_cache_hit_tokens`, and Zai uses top-level `cached_tokens`.
+// `prompt_cache_hit_tokens`, Zai uses top-level `cached_tokens`, and
+// DigitalOcean uses top-level `cache_read_input_tokens` / `cache_created_input_tokens`.
 const mapUsage = (usage, providerMetadataKey) => {
     if (!usage)
         return undefined;
     const input = usage.prompt_tokens ?? undefined;
     const output = usage.completion_tokens ?? undefined;
-    const cached = (usage.prompt_tokens_details?.cached_tokens ??
+    const cached = usage.prompt_tokens_details?.cached_tokens ??
         usage.prompt_cache_hit_tokens ??
         usage.cached_tokens ??
-        undefined);
-    const cacheWrite = usage.prompt_tokens_details?.cache_write_tokens ?? undefined;
+        usage.cache_read_input_tokens ??
+        undefined;
+    const cacheWrite = usage.prompt_tokens_details?.cache_write_tokens ?? usage.cache_created_input_tokens ?? undefined;
     const reasoning = usage.completion_tokens_details?.reasoning_tokens ?? undefined;
     const nonCached = ProviderShared.subtractTokens(input, ProviderShared.sumTokens(cached, cacheWrite));
     return new Usage({

package/dist/protocols/openai-compatible-chat.d.ts

@@ -53,15 +53,18 @@ export declare const route: Route<{
         })[];
     } | {
         readonly [x: string]: unknown;
-        readonly content: string | null;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[] | null;
         readonly role: "assistant";
         readonly reasoning?: string | undefined;
         readonly reasoning_content?: string | undefined;
         readonly reasoning_text?: string | undefined;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
         readonly tool_calls?: readonly {
             readonly function: {
                 readonly name: string;
@@ -77,13 +80,16 @@ export declare const route: Route<{
         }[] | undefined;
         readonly reasoning_details?: unknown;
     } | {
-        readonly content: string;
         readonly role: "tool";
         readonly tool_call_id: string;
-        readonly cache_control?: {
-            readonly type: "ephemeral";
-            readonly ttl?: string | undefined;
-        } | undefined;
+        readonly content: string | readonly {
+            readonly type: "text";
+            readonly text: string;
+            readonly cache_control?: {
+                readonly type: "ephemeral";
+                readonly ttl?: string | undefined;
+            } | undefined;
+        }[];
     })[];
     readonly stream: true;
     readonly max_completion_tokens?: number | undefined;

package/dist/protocols/openai-responses.js

@@ -111,8 +111,8 @@ const adapter = {
     name: NAME,
     restoreHostedToolItem: (item) => (Schema.is(OpenAIResponsesHostedToolItem)(item) ? item : undefined),
 };
-// GPT-6 Astra, Sol, and Luna accept `configuration_update` only in standard mode (not `reasoning.mode: "pro"` or
-// `-pro` slugs), and never alongside automatic `context_management` compaction.
+// GPT-6 and later default to `configuration_update` support, except in `reasoning.mode: "pro"`
+// or alongside automatic `context_management` compaction.
 const supportsEffortUpdates = (request) => {
     if (request.providerOptions?.contextManagement !== undefined)
         return false;
@@ -121,7 +121,8 @@ const supportsEffortUpdates = (request) => {
     const override = request.model.compatibility?.supportsEffortUpdates;
     if (override !== undefined)
         return override;
-    return /(?:^|\/)gpt-6-(?:astra|sol|luna)$/i.test(request.model.id);
+    const match = /(?:^|\/)gpt-(\d+)(?:\.\d+)?(?:-|$)/i.exec(request.model.id);
+    return match !== null && Number(match[1]) >= 6;
 };
 const nativeImageToolInput = (tool) => {
     const native = tool.native?.openai;

package/dist/protocols/utils/cache.d.ts

@@ -1,6 +1,11 @@
+import type { CacheHint } from "../../schema/index.js";
 export interface Breakpoints {
     remaining: number;
     dropped: number;
 }
 export declare const newBreakpoints: (cap: number) => Breakpoints;
 export declare const ttlBucket: (ttlSeconds: number | undefined) => "1h" | undefined;
+export declare const cacheControl: () => (cache: CacheHint | undefined) => {
+    type: "ephemeral";
+    ttl: "1h" | undefined;
+} | undefined;

package/dist/protocols/utils/cache.js

@@ -1,5 +1,13 @@
-// Shared counter and TTL mapping for provider cache-marker lowering.
 export const newBreakpoints = (cap) => ({ remaining: cap, dropped: 0 });
 // Requests of at least one hour use the explicit `"1h"` bucket; shorter
 // requests omit the wire TTL and use the provider default.
 export const ttlBucket = (ttlSeconds) => ttlSeconds !== undefined && ttlSeconds >= 3600 ? "1h" : undefined;
+export const cacheControl = () => {
+    const breakpoints = newBreakpoints(4);
+    return (cache) => {
+        if (cache === undefined || breakpoints.remaining === 0)
+            return undefined;
+        breakpoints.remaining -= 1;
+        return { type: "ephemeral", ttl: ttlBucket(cache.ttlSeconds) };
+    };
+};