@opencode/ai 2.1.3 → 2.1.4

package/dist/experimental/evaluation.js

@@ -1,5 +1,6 @@
 import { Effect, Schema } from "effect";
-import { AIError, HttpOptions, InvalidRequestError, ModelID, ProviderID, ProviderMetadata, Usage, } from "../schema/index.js";
+import { tryRequest } from "../media-model.js";
+import { AIError, HttpOptions, ModelID, ProviderID, ProviderMetadata, Usage, } from "../schema/index.js";
 import { EvaluationClient, Service } from "./evaluation-client.js";
 export const EvaluationInput = Schema.Union([Schema.String, Schema.JsonObject, Schema.Array(Schema.Json)]);
 const EvaluationCriterion = Schema.NullOr(EvaluationInput);
@@ -99,15 +100,7 @@ export function request(input) {
     });
 }
 export function run(input) {
-    return Effect.try({
-        try: () => request(input),
-        catch: (cause) => new AIError({
-            reason: new InvalidRequestError({
-                message: cause instanceof Error ? cause.message : String(cause),
-                cause,
-            }),
-        }),
-    }).pipe(Effect.flatMap(EvaluationClient.evaluate));
+    return tryRequest(() => request(input)).pipe(Effect.flatMap(EvaluationClient.evaluate));
 }
 export const Evaluation = {
     request,

package/dist/image-client.d.ts

@@ -21,14 +21,6 @@ export declare const ImageClient: {
     } | {
         readonly type: "finish";
         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;
         } | {
@@ -40,6 +32,14 @@ export declare const ImageClient: {
         } | {
             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";

package/dist/image.d.ts

@@ -597,14 +597,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
         }>;
     };
     readonly isAnyOf: <const Keys>(keys: readonly Keys[]) => (value: {
-        readonly type: "generation-queued";
-        readonly id: string;
-        readonly position?: number | undefined;
-    } | {
-        readonly type: "generation-progress";
-        readonly id: string;
-        readonly progress?: number | undefined;
-    } | {
         readonly type: "image-partial";
         readonly index: number;
         readonly image: Media.Asset;
@@ -612,17 +604,17 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
         readonly type: "image";
         readonly index: number;
         readonly image: Media.Asset;
+    } | {
+        readonly type: "generation-queued";
+        readonly id: string;
+        readonly position?: number | undefined;
+    } | {
+        readonly type: "generation-progress";
+        readonly id: string;
+        readonly progress?: number | undefined;
     } | {
         readonly type: "finish";
         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;
         } | {
@@ -634,6 +626,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
         } | {
             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";
@@ -650,18 +650,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             };
         } | undefined;
     }) => value is Extract<{
-        readonly type: "generation-queued";
-        readonly id: string;
-        readonly position?: number | undefined;
-    }, {
-        readonly type: Keys;
-    }> | Extract<{
-        readonly type: "generation-progress";
-        readonly id: string;
-        readonly progress?: number | undefined;
-    }, {
-        readonly type: Keys;
-    }> | Extract<{
         readonly type: "image-partial";
         readonly index: number;
         readonly image: Media.Asset;
@@ -673,17 +661,21 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
         readonly image: Media.Asset;
     }, {
         readonly type: Keys;
+    }> | Extract<{
+        readonly type: "generation-queued";
+        readonly id: string;
+        readonly position?: number | undefined;
+    }, {
+        readonly type: Keys;
+    }> | Extract<{
+        readonly type: "generation-progress";
+        readonly id: string;
+        readonly progress?: number | undefined;
+    }, {
+        readonly type: Keys;
     }> | Extract<{
         readonly type: "finish";
         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;
         } | {
@@ -695,6 +687,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
         } | {
             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";
@@ -717,14 +717,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
         finish: (u: unknown) => u is {
             readonly type: "finish";
             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;
             } | {
@@ -736,6 +728,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             } | {
                 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";
@@ -878,14 +878,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             }>>>;
             readonly providerMetadata: Schema.optional<Schema.$Record<Schema.String, Schema.$Record<Schema.String, Schema.Unknown>>>;
         }> as M["Type"]["type"]]: (value: M["Type"]) => any; }>(value: {
-            readonly type: "generation-queued";
-            readonly id: string;
-            readonly position?: number | undefined;
-        } | {
-            readonly type: "generation-progress";
-            readonly id: string;
-            readonly progress?: number | undefined;
-        } | {
             readonly type: "image-partial";
             readonly index: number;
             readonly image: Media.Asset;
@@ -893,17 +885,17 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             readonly type: "image";
             readonly index: number;
             readonly image: Media.Asset;
+        } | {
+            readonly type: "generation-queued";
+            readonly id: string;
+            readonly position?: number | undefined;
+        } | {
+            readonly type: "generation-progress";
+            readonly id: string;
+            readonly progress?: number | undefined;
         } | {
             readonly type: "finish";
             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;
             } | {
@@ -915,6 +907,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             } | {
                 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";
@@ -1035,14 +1035,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             }>>>;
             readonly providerMetadata: Schema.optional<Schema.$Record<Schema.String, Schema.$Record<Schema.String, Schema.Unknown>>>;
         }> as M["Type"]["type"]]: (value: M["Type"]) => any; }>(cases: Cases): (value: {
-            readonly type: "generation-queued";
-            readonly id: string;
-            readonly position?: number | undefined;
-        } | {
-            readonly type: "generation-progress";
-            readonly id: string;
-            readonly progress?: number | undefined;
-        } | {
             readonly type: "image-partial";
             readonly index: number;
             readonly image: Media.Asset;
@@ -1050,17 +1042,17 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             readonly type: "image";
             readonly index: number;
             readonly image: Media.Asset;
+        } | {
+            readonly type: "generation-queued";
+            readonly id: string;
+            readonly position?: number | undefined;
+        } | {
+            readonly type: "generation-progress";
+            readonly id: string;
+            readonly progress?: number | undefined;
         } | {
             readonly type: "finish";
             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;
             } | {
@@ -1072,6 +1064,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             } | {
                 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";
@@ -1194,14 +1194,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             }>>>;
             readonly providerMetadata: Schema.optional<Schema.$Record<Schema.String, Schema.$Record<Schema.String, Schema.Unknown>>>;
         }> as M["Type"]["type"]]+?: (value: M["Type"]) => any; } & { [K in Exclude<keyof Cases, "finish" | "generation-progress" | "generation-queued" | "image" | "image-partial">]: never; }, OrElse extends (value: Exclude<{
-            readonly type: "generation-queued";
-            readonly id: string;
-            readonly position?: number | undefined;
-        } | {
-            readonly type: "generation-progress";
-            readonly id: string;
-            readonly progress?: number | undefined;
-        } | {
             readonly type: "image-partial";
             readonly index: number;
             readonly image: Media.Asset;
@@ -1209,17 +1201,17 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             readonly type: "image";
             readonly index: number;
             readonly image: Media.Asset;
+        } | {
+            readonly type: "generation-queued";
+            readonly id: string;
+            readonly position?: number | undefined;
+        } | {
+            readonly type: "generation-progress";
+            readonly id: string;
+            readonly progress?: number | undefined;
         } | {
             readonly type: "finish";
             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;
             } | {
@@ -1231,6 +1223,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             } | {
                 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";
@@ -1247,14 +1247,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
                 };
             } | undefined;
         }, { readonly [K in "type"]: keyof Cases; }>) => any>(value: {
-            readonly type: "generation-queued";
-            readonly id: string;
-            readonly position?: number | undefined;
-        } | {
-            readonly type: "generation-progress";
-            readonly id: string;
-            readonly progress?: number | undefined;
-        } | {
             readonly type: "image-partial";
             readonly index: number;
             readonly image: Media.Asset;
@@ -1262,17 +1254,17 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             readonly type: "image";
             readonly index: number;
             readonly image: Media.Asset;
+        } | {
+            readonly type: "generation-queued";
+            readonly id: string;
+            readonly position?: number | undefined;
+        } | {
+            readonly type: "generation-progress";
+            readonly id: string;
+            readonly progress?: number | undefined;
         } | {
             readonly type: "finish";
             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;
             } | {
@@ -1284,6 +1276,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             } | {
                 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";
@@ -1404,14 +1404,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             }>>>;
             readonly providerMetadata: Schema.optional<Schema.$Record<Schema.String, Schema.$Record<Schema.String, Schema.Unknown>>>;
         }> as M["Type"]["type"]]+?: (value: M["Type"]) => any; } & { [K in Exclude<keyof Cases, "finish" | "generation-progress" | "generation-queued" | "image" | "image-partial">]: never; }, OrElse extends (value: Exclude<{
-            readonly type: "generation-queued";
-            readonly id: string;
-            readonly position?: number | undefined;
-        } | {
-            readonly type: "generation-progress";
-            readonly id: string;
-            readonly progress?: number | undefined;
-        } | {
             readonly type: "image-partial";
             readonly index: number;
             readonly image: Media.Asset;
@@ -1419,17 +1411,17 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             readonly type: "image";
             readonly index: number;
             readonly image: Media.Asset;
+        } | {
+            readonly type: "generation-queued";
+            readonly id: string;
+            readonly position?: number | undefined;
+        } | {
+            readonly type: "generation-progress";
+            readonly id: string;
+            readonly progress?: number | undefined;
         } | {
             readonly type: "finish";
             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;
             } | {
@@ -1441,6 +1433,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             } | {
                 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";
@@ -1457,14 +1457,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
                 };
             } | undefined;
         }, { readonly [K in "type"]: keyof Cases; }>) => any>(cases: Cases, orElse: OrElse): (value: {
-            readonly type: "generation-queued";
-            readonly id: string;
-            readonly position?: number | undefined;
-        } | {
-            readonly type: "generation-progress";
-            readonly id: string;
-            readonly progress?: number | undefined;
-        } | {
             readonly type: "image-partial";
             readonly index: number;
             readonly image: Media.Asset;
@@ -1472,17 +1464,17 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             readonly type: "image";
             readonly index: number;
             readonly image: Media.Asset;
+        } | {
+            readonly type: "generation-queued";
+            readonly id: string;
+            readonly position?: number | undefined;
+        } | {
+            readonly type: "generation-progress";
+            readonly id: string;
+            readonly progress?: number | undefined;
         } | {
             readonly type: "finish";
             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;
             } | {
@@ -1494,6 +1486,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             } | {
                 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";
@@ -1536,14 +1536,6 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
         finish: (u: unknown) => u is {
             readonly type: "finish";
             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;
             } | {
@@ -1555,6 +1547,14 @@ export declare const ImageEvent: Schema.Union<readonly [Schema.Struct<{
             } | {
                 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";