opencode-img 0.1.1 → 0.2.0

package/dist/image.d.ts

@@ -3,18 +3,27 @@ export interface DecodedImage {
     data: Uint8Array;
     revisedPrompt?: string;
 }
+/**
+ * Decode a base64 image payload, rejecting empty or invalid data so a
+ * zero-byte or corrupt image never reaches the filesystem.
+ */
+export declare function decodeBase64Image(encoded: unknown): Uint8Array;
 /**
  * Pull the first image out of an OpenAI Images response.
  *
  * GPT image models and DALL·E models configured with `response_format=b64_json`
- * both return `data[0].b64_json`. The bytes are decoded here and checked for
- * emptiness so a zero-byte or corrupt payload never reaches the filesystem.
+ * both return `data[0].b64_json`.
  */
 export declare function decodeImageResponse(payload: unknown): DecodedImage;
 /** The MIME type OpenAI returns for a given output format. */
 export declare function mimeTypeForOutputFormat(format: OutputFormat | undefined): string;
 /** The MIME type of a reference image, or `undefined` for an unsupported type. */
 export declare function mimeTypeForReferencePath(filePath: string): string | undefined;
+/**
+ * The MIME type implied by an image's magic bytes, for adapters that cannot
+ * name the output format up front. Defaults to PNG.
+ */
+export declare function mimeTypeForImageBytes(bytes: Uint8Array): string;
 /** The extensions the edits endpoint accepts for reference images. */
 export declare const SUPPORTED_REFERENCE_EXTENSIONS: string[];
 //# sourceMappingURL=image.d.ts.map

package/dist/image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,UAAU,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAYD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,CA6BlE;AAED,8DAA8D;AAC9D,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,GAAG,MAAM,CAUhF;AASD,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAI7E;AAED,sEAAsE;AACtE,eAAO,MAAM,8BAA8B,UAAiC,CAAA"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,UAAU,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAYD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAY9D;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,CAgBlE;AAED,8DAA8D;AAC9D,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,GAAG,MAAM,CAUhF;AASD,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAI7E;AAOD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAW/D;AAED,sEAAsE;AACtE,eAAO,MAAM,8BAA8B,UAAiC,CAAA"}

package/dist/image.js

@@ -1,14 +1,30 @@
 import { ImageToolError } from "./errors.js";
 const BASE64_PATTERN = /^[A-Za-z0-9+/]*={0,2}$/;
 function malformed(detail) {
-    return new ImageToolError("malformed_response", "decode image response", `OpenAI returned image data that could not be read: ${detail}.`);
+    return new ImageToolError("malformed_response", "decode image response", `The image response could not be read: ${detail}.`);
+}
+/**
+ * Decode a base64 image payload, rejecting empty or invalid data so a
+ * zero-byte or corrupt image never reaches the filesystem.
+ */
+export function decodeBase64Image(encoded) {
+    if (typeof encoded !== "string" || encoded === "") {
+        throw malformed("the image entry had no base64 payload");
+    }
+    if (encoded.length % 4 !== 0 || !BASE64_PATTERN.test(encoded)) {
+        throw malformed("the base64 payload was not valid base64");
+    }
+    const bytes = Buffer.from(encoded, "base64");
+    if (bytes.byteLength === 0) {
+        throw malformed("the decoded image was empty");
+    }
+    return bytes;
 }
 /**
  * Pull the first image out of an OpenAI Images response.
  *
  * GPT image models and DALL·E models configured with `response_format=b64_json`
- * both return `data[0].b64_json`. The bytes are decoded here and checked for
- * emptiness so a zero-byte or corrupt payload never reaches the filesystem.
+ * both return `data[0].b64_json`.
  */
 export function decodeImageResponse(payload) {
     if (typeof payload !== "object" || payload === null) {
@@ -19,18 +35,7 @@ export function decodeImageResponse(payload) {
         throw malformed("the response contained no images");
     }
     const first = data[0];
-    const encoded = first?.b64_json;
-    if (typeof encoded !== "string" || encoded === "") {
-        throw malformed("the image entry had no base64 payload");
-    }
-    if (encoded.length % 4 !== 0 || !BASE64_PATTERN.test(encoded)) {
-        throw malformed("the base64 payload was not valid base64");
-    }
-    const bytes = Buffer.from(encoded, "base64");
-    if (bytes.byteLength === 0) {
-        throw malformed("the decoded image was empty");
-    }
-    const decoded = { data: bytes };
+    const decoded = { data: decodeBase64Image(first?.b64_json) };
     if (typeof first.revised_prompt === "string" && first.revised_prompt !== "") {
         decoded.revisedPrompt = first.revised_prompt;
     }
@@ -61,6 +66,28 @@ export function mimeTypeForReferencePath(filePath) {
         return undefined;
     return MIME_BY_EXTENSION[filePath.slice(dot).toLowerCase()];
 }
+function startsWith(bytes, signature) {
+    if (bytes.length < signature.length)
+        return false;
+    return signature.every((byte, index) => bytes[index] === byte);
+}
+/**
+ * The MIME type implied by an image's magic bytes, for adapters that cannot
+ * name the output format up front. Defaults to PNG.
+ */
+export function mimeTypeForImageBytes(bytes) {
+    if (startsWith(bytes, [0x89, 0x50, 0x4e, 0x47]))
+        return "image/png";
+    if (startsWith(bytes, [0xff, 0xd8, 0xff]))
+        return "image/jpeg";
+    if (startsWith(bytes, [0x47, 0x49, 0x46, 0x38]))
+        return "image/gif";
+    if (startsWith(bytes, [0x52, 0x49, 0x46, 0x46]) &&
+        startsWith(bytes.subarray(8), [0x57, 0x45, 0x42, 0x50])) {
+        return "image/webp";
+    }
+    return "image/png";
+}
 /** The extensions the edits endpoint accepts for reference images. */
 export const SUPPORTED_REFERENCE_EXTENSIONS = Object.keys(MIME_BY_EXTENSION);
 //# sourceMappingURL=image.js.map

package/dist/image.js.map

@@ -1 +1 @@
-{"version":3,"file":"image.js","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAQ5C,MAAM,cAAc,GAAG,wBAAwB,CAAA;AAE/C,SAAS,SAAS,CAAC,MAAc;IAC/B,OAAO,IAAI,cAAc,CACvB,oBAAoB,EACpB,uBAAuB,EACvB,sDAAsD,MAAM,GAAG,CAChE,CAAA;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAClD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACpD,MAAM,SAAS,CAAC,yCAAyC,CAAC,CAAA;IAC5D,CAAC;IAED,MAAM,IAAI,GAAI,OAA8B,CAAC,IAAI,CAAA;IACjD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9C,MAAM,SAAS,CAAC,kCAAkC,CAAC,CAAA;IACrD,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAqD,CAAA;IACzE,MAAM,OAAO,GAAG,KAAK,EAAE,QAAQ,CAAA;IAC/B,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;QAClD,MAAM,SAAS,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9D,MAAM,SAAS,CAAC,yCAAyC,CAAC,CAAA;IAC5D,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC5C,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,SAAS,CAAC,6BAA6B,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,OAAO,GAAiB,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;IAC7C,IAAI,OAAO,KAAK,CAAC,cAAc,KAAK,QAAQ,IAAI,KAAK,CAAC,cAAc,KAAK,EAAE,EAAE,CAAC;QAC5E,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC,cAAc,CAAA;IAC9C,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,uBAAuB,CAAC,MAAgC;IACtE,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,MAAM;YACT,OAAO,YAAY,CAAA;QACrB,KAAK,MAAM;YACT,OAAO,YAAY,CAAA;QACrB,KAAK,KAAK,CAAC;QACX,KAAK,SAAS;YACZ,OAAO,WAAW,CAAA;IACtB,CAAC;AACH,CAAC;AAED,MAAM,iBAAiB,GAAqC;IAC1D,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;CACtB,CAAA;AAED,kFAAkF;AAClF,MAAM,UAAU,wBAAwB,CAAC,QAAgB;IACvD,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACrC,IAAI,GAAG,KAAK,CAAC,CAAC;QAAE,OAAO,SAAS,CAAA;IAChC,OAAO,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAA;AAC7D,CAAC;AAED,sEAAsE;AACtE,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA"}
+{"version":3,"file":"image.js","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -3,8 +3,8 @@ import { Plugin } from "@opencode/plugin";
  * opencode-img — an OpenCode V2 plugin that adds the `gpt_imagegen` tool.
  *
  * Relative output and reference-image paths resolve against the session
- * directory. The OpenAI API key comes from `OPENAI_API_KEY`, then the OpenAI
- * connection the user made with `/connect`.
+ * directory. Each provider's API key comes from its environment variable, then
+ * the OpenCode integration connection the user made with `/connect`.
  */
 declare const _default: Plugin.Plugin;
 export default _default;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAMzC;;;;;;GAMG;;AACH,wBAuBE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAgCzC;;;;;;GAMG;;AACH,wBA2BE"}

package/dist/index.js

@@ -1,25 +1,42 @@
 import { Plugin } from "@opencode/plugin";
 import { createGptImagegenTool } from "./tool.js";
-/** OpenCode's built-in integration id for OpenAI. */
-const OPENAI_INTEGRATION_ID = "openai";
+/**
+ * Read the plugin options into the tool's defaults.
+ *
+ * A malformed option is ignored rather than failing the load; the provider id
+ * and the model are validated when the tool runs, where the error can name the
+ * call.
+ */
+function readDefaults(options) {
+    const provider = options.provider;
+    const defaultProvider = typeof provider === "string" && provider.trim() !== "" ? provider : undefined;
+    const models = options.models;
+    const defaultModels = typeof models === "object" && models !== null
+        ? Object.fromEntries(Object.entries(models).filter((entry) => typeof entry[1] === "string" && entry[1] !== ""))
+        : undefined;
+    return { defaultProvider, defaultModels };
+}
 /**
  * opencode-img — an OpenCode V2 plugin that adds the `gpt_imagegen` tool.
  *
  * Relative output and reference-image paths resolve against the session
- * directory. The OpenAI API key comes from `OPENAI_API_KEY`, then the OpenAI
- * connection the user made with `/connect`.
+ * directory. Each provider's API key comes from its environment variable, then
+ * the OpenCode integration connection the user made with `/connect`.
  */
 export default Plugin.define({
     id: "opencode-img",
     async setup(ctx) {
+        const { defaultProvider, defaultModels } = readDefaults(ctx.options);
         await ctx.tool.transform((editor) => {
             editor.add(createGptImagegenTool({
+                defaultProvider,
+                defaultModels,
                 resolveSessionDirectory: async (sessionID) => {
                     const session = await ctx.session.get({ sessionID });
                     return session.location.directory;
                 },
-                resolveApiKey: async () => {
-                    const connection = await ctx.integration.connection.active(OPENAI_INTEGRATION_ID);
+                resolveConnectionKey: async (integrationID) => {
+                    const connection = await ctx.integration.connection.active(integrationID);
                     if (!connection)
                         return undefined;
                     const credential = await ctx.integration.connection.resolve(connection);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,qDAAqD;AACrD,MAAM,qBAAqB,GAAG,QAAQ,CAAA;AAEtC;;;;;;GAMG;AACH,eAAe,MAAM,CAAC,MAAM,CAAC;IAC3B,EAAE,EAAE,cAAc;IAClB,KAAK,CAAC,KAAK,CAAC,GAAG;QACb,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE;YAClC,MAAM,CAAC,GAAG,CACR,qBAAqB,CAAC;gBACpB,uBAAuB,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;oBAC3C,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;oBACpD,OAAO,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAA;gBACnC,CAAC;gBACD,aAAa,EAAE,KAAK,IAAI,EAAE;oBACxB,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAA;oBACjF,IAAI,CAAC,UAAU;wBAAE,OAAO,SAAS,CAAA;oBACjC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;oBACvE,IAAI,UAAU,EAAE,IAAI,KAAK,KAAK,IAAI,OAAO,UAAU,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;wBACrE,OAAO,UAAU,CAAC,GAAG,CAAA;oBACvB,CAAC;oBACD,OAAO,SAAS,CAAA;gBAClB,CAAC;aACF,CAAC,CACH,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD;;;;;;GAMG;AACH,SAAS,YAAY,CAAC,OAA0C;IAI9D,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;IACjC,MAAM,eAAe,GACnB,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAA;IAE/E,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,MAAM,aAAa,GACjB,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;QAC3C,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAC3B,CAAC,KAAK,EAA6B,EAAE,CACnC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAClD,CACF;QACH,CAAC,CAAC,SAAS,CAAA;IAEf,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,CAAA;AAC3C,CAAC;AAED;;;;;;GAMG;AACH,eAAe,MAAM,CAAC,MAAM,CAAC;IAC3B,EAAE,EAAE,cAAc;IAClB,KAAK,CAAC,KAAK,CAAC,GAAG;QACb,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAEpE,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE;YAClC,MAAM,CAAC,GAAG,CACR,qBAAqB,CAAC;gBACpB,eAAe;gBACf,aAAa;gBACb,uBAAuB,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;oBAC3C,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;oBACpD,OAAO,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAA;gBACnC,CAAC;gBACD,oBAAoB,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE;oBAC5C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;oBACzE,IAAI,CAAC,UAAU;wBAAE,OAAO,SAAS,CAAA;oBACjC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;oBACvE,IAAI,UAAU,EAAE,IAAI,KAAK,KAAK,IAAI,OAAO,UAAU,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;wBACrE,OAAO,UAAU,CAAC,GAAG,CAAA;oBACvB,CAAC;oBACD,OAAO,SAAS,CAAA;gBAClB,CAAC;aACF,CAAC,CACH,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA"}

package/dist/openai-provider.d.ts

@@ -1,10 +1,15 @@
-import type { ImageProvider } from "./provider.ts";
+import { type GenerationSettings, type GenerationSettingsInput } from "./config.ts";
+import type { ImageProvider, ImageProviderOptions } from "./provider.ts";
 export declare const DEFAULT_BASE_URL = "https://api.openai.com/v1";
-export interface OpenAIImageProviderOptions {
-    apiKey: string;
-    baseUrl?: string;
-    fetch?: typeof globalThis.fetch;
-}
+/** The OpenAI image model used when the caller does not name one. */
+export declare const OPENAI_DEFAULT_MODEL = "gpt-image-1.5";
+/**
+ * Resolve the generation settings for the OpenAI models.
+ *
+ * The OpenAI path keeps two model-family rules: an explicit `outputFormat` is
+ * rejected for DALL·E, and the output format is reconciled with the output path.
+ */
+export declare function resolveOpenAISettings(input: GenerationSettingsInput, targetPath: string): GenerationSettings;
 /**
  * Create the OpenAI adapter for the internal {@link ImageProvider} seam.
  *
@@ -12,5 +17,5 @@ export interface OpenAIImageProviderOptions {
  * With reference images it becomes a multipart request to `/images/edits` and
  * every image is attached under the `image[]` field.
  */
-export declare function createOpenAIImageProvider(options: OpenAIImageProviderOptions): ImageProvider;
+export declare function createOpenAIImageProvider(options: ImageProviderOptions): ImageProvider;
 //# sourceMappingURL=openai-provider.d.ts.map

package/dist/openai-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-provider.d.ts","sourceRoot":"","sources":["../src/openai-provider.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAA6B,MAAM,eAAe,CAAA;AAE7E,eAAO,MAAM,gBAAgB,8BAA8B,CAAA;AAE3D,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;CAChC;AA8DD;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,0BAA0B,GAClC,aAAa,CAiFf"}
+{"version":3,"file":"openai-provider.d.ts","sourceRoot":"","sources":["../src/openai-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC7B,MAAM,aAAa,CAAA;AAIpB,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAA6B,MAAM,eAAe,CAAA;AAEnG,eAAO,MAAM,gBAAgB,8BAA8B,CAAA;AAE3D,qEAAqE;AACrE,eAAO,MAAM,oBAAoB,kBAAkB,CAAA;AAEnD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,uBAAuB,EAC9B,UAAU,EAAE,MAAM,GACjB,kBAAkB,CAmBpB;AAuCD;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAkDtF"}

package/dist/openai-provider.js

@@ -1,26 +1,29 @@
-import { isGptImageModel } from "./config.js";
-import { ImageToolError } from "./errors.js";
+import { isGptImageModel, outputFormatForExtension, reconcileOutputFormat, resolveSettings, } from "./config.js";
+import { invalidArgument } from "./errors.js";
+import { sendJsonRequest } from "./http.js";
 import { decodeImageResponse, mimeTypeForOutputFormat } from "./image.js";
 export const DEFAULT_BASE_URL = "https://api.openai.com/v1";
-const MAX_ERROR_DETAIL = 500;
-function isAbort(error, signal) {
-    return ((error instanceof Error && error.name === "AbortError") || signal?.aborted === true);
-}
-function safeErrorDetail(body) {
-    const trimmed = body.trim();
-    if (trimmed === "")
-        return "no response body";
-    try {
-        const parsed = JSON.parse(trimmed);
-        const message = parsed.error?.message;
-        if (typeof message === "string" && message !== "") {
-            return message.slice(0, MAX_ERROR_DETAIL);
-        }
+/** The OpenAI image model used when the caller does not name one. */
+export const OPENAI_DEFAULT_MODEL = "gpt-image-1.5";
+/**
+ * Resolve the generation settings for the OpenAI models.
+ *
+ * The OpenAI path keeps two model-family rules: an explicit `outputFormat` is
+ * rejected for DALL·E, and the output format is reconciled with the output path.
+ */
+export function resolveOpenAISettings(input, targetPath) {
+    const settings = resolveSettings(input, OPENAI_DEFAULT_MODEL);
+    if (isGptImageModel(settings.model)) {
+        return reconcileOutputFormat(settings, targetPath);
+    }
+    if (settings.outputFormat !== undefined) {
+        throw invalidArgument("`outputFormat` is only supported by the GPT image models; DALL·E models always return PNG.");
     }
-    catch {
-        // Not JSON; fall through to the raw text.
+    const extensionFormat = outputFormatForExtension(targetPath);
+    if (extensionFormat !== undefined && extensionFormat !== "png") {
+        throw invalidArgument(`DALL·E models always return PNG, so \`outputPath\` cannot end in \`.${extensionFormat}\`.`);
     }
-    return trimmed.slice(0, MAX_ERROR_DETAIL);
+    return settings;
 }
 /**
  * The settings the request carries, as ordered field/value pairs. One mapping
@@ -75,44 +78,27 @@ export function createOpenAIImageProvider(options) {
     async function send(request, operation, signal) {
         const hasReferences = (request.references?.length ?? 0) > 0;
         const url = hasReferences ? `${baseUrl}/images/edits` : `${baseUrl}/images/generations`;
-        let response;
-        try {
-            response = hasReferences
-                ? await fetchImpl(url, {
+        const payload = await sendJsonRequest({
+            provider: "OpenAI",
+            operation,
+            fetchImpl,
+            url,
+            init: hasReferences
+                ? {
                     method: "POST",
                     headers: { Authorization: `Bearer ${apiKey}` },
                     body: buildEditForm(request),
-                    signal,
-                })
-                : await fetchImpl(url, {
+                }
+                : {
                     method: "POST",
                     headers: {
                         Authorization: `Bearer ${apiKey}`,
                         "Content-Type": "application/json",
                     },
                     body: JSON.stringify(buildGenerationBody(request)),
-                    signal,
-                });
-        }
-        catch (error) {
-            if (isAbort(error, signal)) {
-                throw new ImageToolError("cancelled", operation, "The image request was cancelled.", {
-                    cause: error,
-                });
-            }
-            throw new ImageToolError("api_error", operation, `Could not reach OpenAI while trying to ${operation}: ${error.message}.`, { cause: error });
-        }
-        if (!response.ok) {
-            const detail = safeErrorDetail(await response.text().catch(() => ""));
-            throw new ImageToolError("api_error", operation, `OpenAI returned HTTP ${response.status} while trying to ${operation}: ${detail}`);
-        }
-        let payload;
-        try {
-            payload = await response.json();
-        }
-        catch (error) {
-            throw new ImageToolError("malformed_response", operation, "OpenAI returned a response body that was not valid JSON.", { cause: error });
-        }
+                },
+            signal,
+        });
         const decoded = decodeImageResponse(payload);
         const result = {
             data: decoded.data,

package/dist/openai-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai-provider.js","sourceRoot":"","sources":["../src/openai-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai-provider.js","sourceRoot":"","sources":["../src/openai-provider.ts"],"names":[],"mappings":"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"}

package/dist/provider.d.ts

@@ -15,12 +15,18 @@ export interface ImageResult {
     mimeType: string;
     revisedPrompt?: string;
 }
+/** Options a provider factory receives when the tool builds an adapter. */
+export interface ImageProviderOptions {
+    apiKey: string;
+    baseUrl?: string;
+    fetch?: typeof globalThis.fetch;
+}
 /**
  * The internal seam between the tool and an image service.
  *
- * It stays private to the package: the tool depends on this interface, and the
- * OpenAI adapter implements it. A second service would be added by writing
- * another implementation, not by exposing a plugin registry.
+ * It stays private to the package: the tool picks an implementation through the
+ * internal registry in `providers.ts`. Adding a service means adding an
+ * implementation there, not exposing a public plugin API.
  */
 export interface ImageProvider {
     generate(request: ImageRequest, signal?: AbortSignal): Promise<ImageResult>;

package/dist/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAErD,4DAA4D;AAC5D,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,UAAU,CAAA;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,UAAU,CAAC,EAAE,cAAc,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CAC5E"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAErD,4DAA4D;AAC5D,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,UAAU,CAAA;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,UAAU,CAAC,EAAE,cAAc,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,UAAU,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,2EAA2E;AAC3E,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;CAChC;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CAC5E"}

package/dist/providers.d.ts

@@ -0,0 +1,32 @@
+import type { GenerationSettings, GenerationSettingsInput } from "./config.ts";
+import type { ImageProvider, ImageProviderOptions } from "./provider.ts";
+/** The provider used when the caller does not name one. */
+export declare const DEFAULT_PROVIDER = "openai";
+export interface ImageProviderDefinition {
+    /** The id used in the tool's `provider` input. */
+    readonly id: string;
+    /** Environment variables that can supply the key, checked in order. */
+    readonly envVars: readonly string[];
+    /** OpenCode integration id whose connection can supply the key. */
+    readonly integrationID: string;
+    /** Validate the request settings and reconcile the output format with the path. */
+    readonly resolveSettings: (input: GenerationSettingsInput, targetPath: string) => GenerationSettings;
+    /** Build the adapter for this provider. */
+    readonly create: (options: ImageProviderOptions) => ImageProvider;
+}
+/** The registered provider ids. */
+export declare function providerIds(): string[];
+/** Look up a provider definition, or fail with the known ids. */
+export declare function getProvider(id: string): ImageProviderDefinition;
+export interface ApiKeySources {
+    /** Environment variables the key can come from. */
+    env: Record<string, string | undefined>;
+    /** Resolve a key from an OpenCode integration connection. */
+    connectionKey?: (integrationID: string) => Promise<string | undefined>;
+}
+/**
+ * Find a provider's API key: its environment variables first, then its OpenCode
+ * integration connection. Fails before any network request when none is present.
+ */
+export declare function resolveProviderKey(definition: ImageProviderDefinition, sources: ApiKeySources): Promise<string>;
+//# sourceMappingURL=providers.d.ts.map

package/dist/providers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../src/providers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAc9E,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AAExE,2DAA2D;AAC3D,eAAO,MAAM,gBAAgB,WAAW,CAAA;AAExC,MAAM,WAAW,uBAAuB;IACtC,kDAAkD;IAClD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,uEAAuE;IACvE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;IACnC,mEAAmE;IACnE,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,mFAAmF;IACnF,QAAQ,CAAC,eAAe,EAAE,CACxB,KAAK,EAAE,uBAAuB,EAC9B,UAAU,EAAE,MAAM,KACf,kBAAkB,CAAA;IACvB,2CAA2C;IAC3C,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,aAAa,CAAA;CAClE;AAgCD,mCAAmC;AACnC,wBAAgB,WAAW,IAAI,MAAM,EAAE,CAEtC;AAED,iEAAiE;AACjE,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,uBAAuB,CAQ/D;AAED,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IACvC,6DAA6D;IAC7D,aAAa,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CACvE;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,uBAAuB,EACnC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,CAcjB"}

package/dist/providers.js

@@ -0,0 +1,60 @@
+import { ImageToolError, invalidArgument } from "./errors.js";
+import { createGeminiImageProvider, resolveGeminiSettings, } from "./gemini-provider.js";
+import { createGrokImageProvider, resolveGrokSettings, } from "./grok-provider.js";
+import { createOpenAIImageProvider, resolveOpenAISettings, } from "./openai-provider.js";
+/** The provider used when the caller does not name one. */
+export const DEFAULT_PROVIDER = "openai";
+/**
+ * The internal provider registry.
+ *
+ * It stays private to the package. The tool routes to an entry here, and adding
+ * a service means adding an entry, not exposing a public plugin API.
+ */
+const PROVIDERS = {
+    openai: {
+        envVars: ["OPENAI_API_KEY"],
+        integrationID: "openai",
+        resolveSettings: resolveOpenAISettings,
+        create: createOpenAIImageProvider,
+    },
+    gemini: {
+        envVars: ["GEMINI_API_KEY", "GOOGLE_API_KEY", "GOOGLE_GENERATIVE_AI_API_KEY"],
+        integrationID: "google",
+        resolveSettings: resolveGeminiSettings,
+        create: createGeminiImageProvider,
+    },
+    grok: {
+        envVars: ["XAI_API_KEY"],
+        integrationID: "xai",
+        resolveSettings: resolveGrokSettings,
+        create: createGrokImageProvider,
+    },
+};
+/** The registered provider ids. */
+export function providerIds() {
+    return Object.keys(PROVIDERS);
+}
+/** Look up a provider definition, or fail with the known ids. */
+export function getProvider(id) {
+    const spec = PROVIDERS[id];
+    if (spec === undefined) {
+        throw invalidArgument(`Unknown provider \`${id}\`. Known providers: ${providerIds().join(", ")}.`);
+    }
+    return { id, ...spec };
+}
+/**
+ * Find a provider's API key: its environment variables first, then its OpenCode
+ * integration connection. Fails before any network request when none is present.
+ */
+export async function resolveProviderKey(definition, sources) {
+    for (const name of definition.envVars) {
+        const value = sources.env[name];
+        if (typeof value === "string" && value !== "")
+            return value;
+    }
+    const fromConnection = await sources.connectionKey?.(definition.integrationID);
+    if (typeof fromConnection === "string" && fromConnection !== "")
+        return fromConnection;
+    throw new ImageToolError("missing_api_key", "validate API key", `No ${definition.id} API key was found. Set ${definition.envVars.join(" or ")}, or connect the ${definition.integrationID} integration in OpenCode (run /connect).`);
+}
+//# sourceMappingURL=providers.js.map

package/dist/providers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"providers.js","sourceRoot":"","sources":["../src/providers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7D,OAAO,EACL,yBAAyB,EACzB,qBAAqB,GACtB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACL,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACL,yBAAyB,EACzB,qBAAqB,GACtB,MAAM,sBAAsB,CAAA;AAG7B,2DAA2D;AAC3D,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAA;AAqBxC;;;;;GAKG;AACH,MAAM,SAAS,GAAgD;IAC7D,MAAM,EAAE;QACN,OAAO,EAAE,CAAC,gBAAgB,CAAC;QAC3B,aAAa,EAAE,QAAQ;QACvB,eAAe,EAAE,qBAAqB;QACtC,MAAM,EAAE,yBAAyB;KAClC;IACD,MAAM,EAAE;QACN,OAAO,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,8BAA8B,CAAC;QAC7E,aAAa,EAAE,QAAQ;QACvB,eAAe,EAAE,qBAAqB;QACtC,MAAM,EAAE,yBAAyB;KAClC;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,mBAAmB;QACpC,MAAM,EAAE,uBAAuB;KAChC;CACF,CAAA;AAED,mCAAmC;AACnC,MAAM,UAAU,WAAW;IACzB,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;AAC/B,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,WAAW,CAAC,EAAU;IACpC,MAAM,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC,CAAA;IAC1B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,eAAe,CACnB,sBAAsB,EAAE,wBAAwB,WAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC5E,CAAA;IACH,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,CAAA;AACxB,CAAC;AASD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,UAAmC,EACnC,OAAsB;IAEtB,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE;YAAE,OAAO,KAAK,CAAA;IAC7D,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC9E,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,KAAK,EAAE;QAAE,OAAO,cAAc,CAAA;IAEtF,MAAM,IAAI,cAAc,CACtB,iBAAiB,EACjB,kBAAkB,EAClB,MAAM,UAAU,CAAC,EAAE,2BAA2B,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,UAAU,CAAC,aAAa,0CAA0C,CACpK,CAAA;AACH,CAAC"}

package/dist/tool.d.ts

@@ -3,14 +3,18 @@ export declare const TOOL_NAME = "gpt_imagegen";
 export interface GptImagegenDependencies {
     /** Resolve the OpenCode session directory used as the base for relative paths. */
     resolveSessionDirectory: (sessionID: string) => Promise<string>;
-    /** Environment source for `OPENAI_API_KEY`; defaults to `process.env`. */
+    /** Environment source for provider keys; defaults to `process.env`. */
     env?: Record<string, string | undefined>;
     /**
-     * Resolve a key from OpenCode's OpenAI connection. Consulted only when the
-     * option and the environment variable are absent.
+     * Resolve a key from an OpenCode integration connection. Consulted only when
+     * none of the provider's environment variables are set.
      */
-    resolveApiKey?: () => Promise<string | undefined>;
-    /** Override the OpenAI API base URL. */
+    resolveConnectionKey?: (integrationID: string) => Promise<string | undefined>;
+    /** Provider used when a call does not name one. Defaults to `openai`. */
+    defaultProvider?: string;
+    /** Per-provider default model, overriding each provider's built-in default. */
+    defaultModels?: Readonly<Record<string, string>>;
+    /** Override the provider API base URL. */
     baseUrl?: string;
     /** Inject a fetch implementation (used by tests). */
     fetch?: typeof globalThis.fetch;

package/dist/tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../src/tool.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,IAAI,QAAQ,EAAqC,MAAM,+BAA+B,CAAA;AAcxG,eAAO,MAAM,SAAS,iBAAiB,CAAA;AASvC,MAAM,WAAW,uBAAuB;IACtC,kFAAkF;IAClF,uBAAuB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/D,0EAA0E;IAC1E,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IACxC;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IACjD,wCAAwC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,qDAAqD;IACrD,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;CAChC;AAyHD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,uBAAuB,GAAG,QAAQ,CAmErF"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../src/tool.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,IAAI,QAAQ,EAAqC,MAAM,+BAA+B,CAAA;AAQxG,eAAO,MAAM,SAAS,iBAAiB,CAAA;AASvC,MAAM,WAAW,uBAAuB;IACtC,kFAAkF;IAClF,uBAAuB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/D,uEAAuE;IACvE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IACxC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAC7E,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAChD,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,qDAAqD;IACrD,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;CAChC;AA2GD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,uBAAuB,GAAG,QAAQ,CA6ErF"}