@opencode/ai 2.1.2 → 2.1.4

package/dist/route/client.d.ts

@@ -46,7 +46,6 @@ export interface Route<Body, Prepared = unknown, Compact extends CompactionOpera
     readonly streamPrepared: (prepared: Prepared, request: LLMRequest, runtime: TransportRuntime, options?: StreamOptions) => Stream.Stream<LLMEvent, AIError>;
 }
 export type AnyRoute<Compact extends CompactionOperations | undefined = CompactionOperations | undefined> = Route<any, any, Compact>;
-export type HttpOptionsInput = HttpOptions.Input;
 export type RouteLanguageModelInput = Omit<LanguageModel.Input, "provider" | "route">;
 export type RouteRoutedLanguageModelInput = Omit<LanguageModel.Input, "route">;
 export interface RouteDefaults {
@@ -71,7 +70,6 @@ export interface RoutePatch<Body, Prepared> extends RouteDefaultsInput {
     readonly endpoint?: EndpointPatch<Body>;
 }
 type RouteMappedLanguageModelInput = RouteLanguageModelInput | RouteRoutedLanguageModelInput;
-export declare const generationOptions: (input: GenerationOptions.Input | undefined) => GenerationOptions | undefined;
 export interface Interface {
     readonly compact: CompactMethod;
     readonly stream: StreamMethod;
@@ -214,222 +212,6 @@ export declare function stream(request: LLMRequest, options?: StreamOptions): St
 export declare function generate(request: LLMRequest, options?: StreamOptions): Effect.Effect<LLMResponse, AIError, Service>;
 export declare function compact(request: CheckpointRequest, options: TriggerCompactOptions): Effect.Effect<CompactionCheckpointResponse, AIError, Service>;
 export declare function compact(request: CompactionRequest, options?: EndpointCompactOptions): Effect.Effect<CompactionResponse, AIError, Service>;
-export declare const streamRequest: (request: LLMRequest, options?: StreamOptions) => Stream.Stream<{
-    readonly type: "step-start";
-    readonly index: number;
-} | {
-    readonly type: "text-start";
-    readonly id: string;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "text-delta";
-    readonly id: string;
-    readonly text: string;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "text-end";
-    readonly id: string;
-    readonly text?: string | undefined;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "reasoning-start";
-    readonly id: string;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "reasoning-delta";
-    readonly id: string;
-    readonly text: string;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "reasoning-end";
-    readonly id: string;
-    readonly text?: string | undefined;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "tool-input-start";
-    readonly id: string;
-    readonly name: string;
-    readonly namespace?: string | undefined;
-    readonly providerExecuted?: boolean | undefined;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "tool-input-delta";
-    readonly id: string;
-    readonly name: string;
-    readonly namespace?: string | undefined;
-    readonly text: string;
-    readonly input?: unknown;
-} | {
-    readonly type: "tool-input-end";
-    readonly id: string;
-    readonly name: string;
-    readonly namespace?: string | undefined;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "tool-input-error";
-    readonly id: string;
-    readonly name: string;
-    readonly namespace?: string | undefined;
-    readonly raw: string;
-} | {
-    readonly type: "tool-call";
-    readonly id: string;
-    readonly name: string;
-    readonly namespace?: string | undefined;
-    readonly input: unknown;
-    readonly providerExecuted?: boolean | undefined;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "tool-result";
-    readonly id: string;
-    readonly name: string;
-    readonly namespace?: string | undefined;
-    readonly result: {
-        readonly type: "json";
-        readonly value: unknown;
-    } | {
-        readonly type: "text";
-        readonly value: unknown;
-    } | {
-        readonly type: "error";
-        readonly value: unknown;
-    } | {
-        readonly type: "content";
-        readonly value: readonly ({
-            readonly type: "text";
-            readonly text: string;
-        } | {
-            readonly type: "file";
-            readonly uri: string;
-            readonly mime: string;
-            readonly name?: string | undefined;
-        })[];
-    };
-    readonly output?: {
-        readonly structured: unknown;
-        readonly content: readonly ({
-            readonly type: "text";
-            readonly text: string;
-        } | {
-            readonly type: "file";
-            readonly uri: string;
-            readonly mime: string;
-            readonly name?: string | undefined;
-        })[];
-    } | undefined;
-    readonly providerExecuted?: boolean | undefined;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "tool-error";
-    readonly id: string;
-    readonly name: string;
-    readonly namespace?: string | undefined;
-    readonly message: string;
-    readonly error?: unknown;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "step-finish";
-    readonly index: number;
-    readonly reason: {
-        readonly normalized: "content-filter" | "error" | "length" | "stop" | "tool-calls" | "unknown";
-        readonly raw?: string | undefined;
-        readonly category?: string | undefined;
-        readonly explanation?: string | undefined;
-    };
-    readonly usage?: import("../schema/events.js").Usage | undefined;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "finish";
-    readonly reason: {
-        readonly normalized: "content-filter" | "error" | "length" | "stop" | "tool-calls" | "unknown";
-        readonly raw?: string | undefined;
-        readonly category?: string | undefined;
-        readonly explanation?: string | undefined;
-    };
-    readonly usage?: import("../schema/events.js").Usage | undefined;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "media";
-    readonly media: import("../media.js").Asset;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | {
-    readonly type: "provider-error";
-    readonly message: string;
-    readonly classification?: "context-overflow" | "payload-too-large" | undefined;
-    readonly providerMetadata?: {
-        readonly [x: string]: {
-            readonly [x: string]: unknown;
-        };
-    } | undefined;
-} | ({
-    readonly type: "compaction";
-    readonly provider: string & import("effect/Brand").Brand<"AI.ProviderID">;
-    readonly id?: string | undefined;
-    readonly encrypted?: string | undefined;
-    readonly text?: string | null | undefined;
-} & ({
-    readonly encrypted: string;
-    readonly text?: never;
-} | {
-    readonly text: string | null;
-    readonly encrypted?: never;
-})), AIError, LLMClientService>;
 export declare const layer: Layer.Layer<Service, never, RequestExecutor.Service>;
 export declare const Route: {
     readonly make: typeof make;

package/dist/route/client.js

@@ -32,7 +32,7 @@ const mergeRouteDefaults = (base, patch) => {
         ...base,
         ...patch,
         headers,
-        generation: mergeGenerationOptions(generationOptions(base?.generation), generationOptions(patch.generation)),
+        generation: mergeGenerationOptions(base?.generation, patch.generation),
         providerOptions: mergeProviderOptions(base?.providerOptions, patch.providerOptions),
         http: mergeHttpOptions(base?.http, HttpOptions.make(patch.http), headers === undefined ? undefined : new HttpOptions({ headers })),
     };
@@ -43,7 +43,6 @@ const mergeHeaders = (...items) => {
         return undefined;
     return Object.fromEntries(entries);
 };
-export const generationOptions = (input) => input === undefined ? undefined : GenerationOptions.make(input);
 export function canCompact(request, options) {
     if (options?.mechanism === "trigger")
         return request.model.route.compact?.trigger !== undefined;
@@ -126,8 +125,8 @@ function makeFromTransport(input) {
                     id: id ?? routeInput.id,
                     provider: provider ?? routeInput.provider,
                     providerMetadataKey: providerMetadataKey ??
-                        (provider !== undefined && String(provider) !== String(routeInput.provider)
-                            ? String(provider)
+                        (provider !== undefined && provider !== routeInput.provider
+                            ? provider
                             : routeInput.providerMetadataKey),
                     auth: auth ?? routeInput.auth,
                     endpoint: endpoint ? Endpoint.merge(routeInput.endpoint, endpoint) : routeInput.endpoint,
@@ -271,9 +270,6 @@ export function compact(request, options) {
         return yield* unsupportedCompaction(request, options?.mechanism);
     });
 }
-export const streamRequest = (request, options) => Stream.unwrap(Effect.gen(function* () {
-    return (yield* Service).stream(request, options);
-}));
 export const layer = Layer.effect(Service, Effect.gen(function* () {
     const executor = yield* RequestExecutor.Service;
     const stream = streamRequestWith({ http: executor });

package/dist/route/executor-service.js

@@ -3,7 +3,7 @@ import { HttpContext } from "../schema/errors.js";
 export class RequestExecutorService extends Context.Service()("@opencode/AI/RequestExecutor") {
 }
 export const Service = RequestExecutorService;
-export const headerDetails = (headers) => Object.fromEntries(Object.entries(headers).map(([name, value]) => [name, String(value)]));
+export const headerDetails = (headers) => Object.fromEntries(Object.entries(headers).map(([name, value]) => [name, value]));
 export const responseHttp = (response) => new HttpContext({
     url: response.request.url,
     status: response.status,

package/dist/route/transport/http.js

@@ -6,13 +6,6 @@ import { Framing } from "../framing.js";
 import * as ProviderShared from "../../protocols/shared.js";
 import { AIError, DEFAULT_CHUNK_TIMEOUT_MS, DEFAULT_HTTP_TIMEOUT_MS, mergeJsonRecords, TransportError, } from "../../schema/index.js";
 import { RequestExecutor } from "../executor.js";
-const applyQuery = (url, query) => {
-    if (!query)
-        return url;
-    const next = new URL(url);
-    Object.entries(query).forEach(([key, value]) => next.searchParams.set(key, value));
-    return next.toString();
-};
 const bodyWithOverlay = (body, request, encodeBody) => Effect.gen(function* () {
     if (request.http?.body === undefined)
         return { jsonBody: body, bodyText: encodeBody(body) };
@@ -23,7 +16,11 @@ const bodyWithOverlay = (body, request, encodeBody) => Effect.gen(function* () {
     return yield* ProviderShared.invalidRequest("http.body can only overlay JSON object request bodies");
 });
 export const jsonRequestParts = (input) => Effect.gen(function* () {
-    const url = applyQuery(renderEndpoint(input.endpoint, { request: input.request, body: input.body }).toString(), input.request.http?.query);
+    const endpoint = renderEndpoint(input.endpoint, { request: input.request, body: input.body });
+    if (input.request.http?.query) {
+        Object.entries(input.request.http.query).forEach(([key, value]) => endpoint.searchParams.set(key, value));
+    }
+    const url = endpoint.toString();
     const body = yield* bodyWithOverlay(input.body, input.request, input.encodeBody);
     const headers = yield* Auth.toEffect(input.auth)({
         request: input.request,

package/dist/schema/errors.d.ts

@@ -153,7 +153,7 @@ declare const TimeoutError_base: Schema.Class<TimeoutError, Schema.TaggedStruct<
     readonly body: Schema.optional<Schema.String>;
     readonly http: Schema.optional<typeof HttpContext>;
     readonly cause: Schema.optional<Schema.Defect>;
-    readonly timeoutMs: Schema.optional<Schema.Number>;
+    readonly timeoutMs: Schema.optional<Schema.Int>;
 }>, import("effect/Cause").YieldableError>;
 /** A caller-supplied deadline elapsed, such as `Generation.await` polling past its `Poll.timeout`. */
 export declare class TimeoutError extends TimeoutError_base {

package/dist/schema/errors.js

@@ -104,7 +104,7 @@ export class UnknownProviderError extends Schema.TaggedError("AI.Error.UnknownPr
 /** A caller-supplied deadline elapsed, such as `Generation.await` polling past its `Poll.timeout`. */
 export class TimeoutError extends Schema.TaggedError("AI.Error.Timeout")("Timeout", {
     ...ReasonFields,
-    timeoutMs: Schema.optional(Schema.Number),
+    timeoutMs: Schema.optional(NonNegativeInt),
 }) {
 }
 export const AIErrorReason = Schema.Union([

package/dist/schema/messages.js

@@ -1,9 +1,10 @@
-import { Schema } from "effect";
+import { Option, Schema } from "effect";
 import { withStatics } from "@opencode/schema/schema";
 import { Tool } from "@opencode/schema/tool";
 import { CacheHint, CachePolicy, GenerationOptions, HttpOptions, JsonSchema, LanguageModelSchema, ProviderMetadata, ProviderOptions, ReasoningEffort, } from "./options.js";
 import { ProviderID } from "./ids.js";
 import { Media } from "../media.js";
+import { Json } from "../utils/json.js";
 export const MessageRole = Schema.Literals(["system", "user", "assistant", "tool"]);
 const systemPartSchema = Schema.Struct({
     type: Schema.Literal("text"),
@@ -89,15 +90,11 @@ export const ToolOutput = withStatics(Schema.Struct({
         return { type: "content", value: output.content };
     },
 });
+const encodeJsonOption = Schema.encodeUnknownOption(Json);
 const toolResultText = (value) => {
     if (typeof value === "string")
         return value;
-    try {
-        return JSON.stringify(value) ?? String(value);
-    }
-    catch {
-        return String(value);
-    }
+    return Option.getOrElse(encodeJsonOption(value), () => String(value));
 };
 export const ToolCallPart = withStatics(Schema.Struct({
     type: Schema.Literal("tool-call"),

package/dist/speech-client.d.ts

@@ -24,14 +24,6 @@ export declare const SpeechClient: {
         readonly type: "finish";
         readonly audio: import("./media.js").Asset;
         readonly usage?: {
-            readonly type: "tokens";
-            readonly input?: number | undefined;
-            readonly output?: number | undefined;
-            readonly total?: number | undefined;
-            readonly details?: {
-                readonly [x: string]: unknown;
-            } | undefined;
-        } | {
             readonly type: "seconds";
             readonly seconds: number;
         } | {
@@ -43,6 +35,14 @@ export declare const SpeechClient: {
         } | {
             readonly type: "compute";
             readonly seconds: number;
+        } | {
+            readonly type: "tokens";
+            readonly input?: number | undefined;
+            readonly output?: number | undefined;
+            readonly total?: number | undefined;
+            readonly details?: {
+                readonly [x: string]: unknown;
+            } | undefined;
         } | undefined;
         readonly notices?: readonly {
             readonly type: "filtered" | "moderated" | "other";
@@ -60,7 +60,9 @@ export declare const SpeechClient: {
         } | undefined;
     } | import("./generation.js").Observation, import("./index.js").AIError, SpeechClientService>;
     readonly start: (request: SpeechRequestFor) => import("effect/Effect").Effect<import("./generation.js").Generation<SpeechResponse>, import("./index.js").AIError, SpeechClientService>;
-    readonly resume: (model: import("./speech.js").SpeechModel<import("./media-model.js").MediaModel.Options>, token: unknown) => import("effect/Effect").Effect<import("./generation.js").Generation<SpeechResponse>, import("./index.js").AIError, SpeechClientService>;
+    readonly resume: (model: import("./speech.js").SpeechModel<{
+        readonly [x: string]: unknown;
+    }>, token: unknown) => import("effect/Effect").Effect<import("./generation.js").Generation<SpeechResponse>, import("./index.js").AIError, SpeechClientService>;
     readonly Service: typeof SpeechClientService;
 };
 export {};