dsh-draw 0.1.2 → 0.2.1

package/lib/index.js

@@ -39,6 +39,7 @@ const DEFAULT_ENGINES = Object.freeze([Object.freeze({
 	baseUrl: "https://api.openai.com/v1",
 	model: "gpt-image-1",
 	apiKeyRef: "OPENAI_API_KEY",
+	provider: "openai",
 	enabled: true,
 	sizeMap: Object.freeze({
 		square: "1024x1024",
@@ -55,6 +56,7 @@ const DEFAULT_ENGINES = Object.freeze([Object.freeze({
 	baseUrl: "https://open.bigmodel.cn/api/paas/v4",
 	model: "cogview-3-flash",
 	apiKeyRef: "ZHIPU_API_KEY",
+	provider: "openai",
 	enabled: true,
 	sizeMap: Object.freeze({
 		square: "1024x1024",
@@ -81,6 +83,11 @@ const Config = z.object({
 		baseUrl: z.string().min(1).max(2048),
 		model: z.string().min(1).max(128),
 		apiKeyRef: z.string().min(1).max(128),
+		provider: z.union([
+			"openai",
+			"replicate",
+			"fal"
+		]),
 		enabled: z.boolean(),
 		sizeMap: z.object({
 			square: z.string().min(1).max(64),
@@ -141,6 +148,8 @@ function resolveConfig(config) {
 		if (model === "") throw new Error(`dsh-draw: engine "${id}" model must be a non-empty string of at most 128 characters`);
 		const apiKeyRef = typeof engine.apiKeyRef === "string" && API_KEY_REF_PATTERN.test(engine.apiKeyRef) ? engine.apiKeyRef : "";
 		if (apiKeyRef === "") throw new Error(`dsh-draw: engine "${id}" apiKeyRef ${JSON.stringify(engine.apiKeyRef)} must be an environment-variable name`);
+		const provider = engine.provider ?? "openai";
+		if (provider !== "openai" && provider !== "replicate" && provider !== "fal") throw new Error(`dsh-draw: engine "${id}" provider must be one of "openai", "replicate", "fal", got ${JSON.stringify(provider)}`);
 		const sizeMap = engine.sizeMap === void 0 ? DEFAULT_SIZE_MAP : engine.sizeMap;
 		for (const key of [
 			"square",
@@ -166,6 +175,7 @@ function resolveConfig(config) {
 			baseUrl: baseUrl.replace(/\/+$/u, ""),
 			model,
 			apiKeyRef,
+			provider,
 			enabled,
 			sizeMap: Object.freeze({ ...sizeMap }),
 			qualitySupported,
@@ -948,6 +958,163 @@ async function downloadImageUrl(engine, url, credential, deps, signal) {
 	}
 }
 //#endregion
+//#region src/provider.ts
+/** The OpenAI-compatible adapter: delegates to the existing `/images/generations` path. */
+const openaiProvider = {
+	vocabulary: "openai",
+	generate(engine, request, deps, signal) {
+		return callEngine(engine, translateRequest(engine, request), deps, signal);
+	}
+};
+/** Replicate prediction polling interval (ms). */
+const REPLICATE_POLL_INTERVAL_MS = 1e3;
+/** Maximum prediction polls before the call fails as a slow request. */
+const REPLICATE_MAX_POLLS = 120;
+/** Parse one concrete `WIDTHxHEIGHT` size string into dimensions. */
+function dimensionsOf(size) {
+	const match = /^(\d{2,5})x(\d{2,5})$/u.exec(size);
+	if (match === null) return void 0;
+	return {
+		width: Number(match[1]),
+		height: Number(match[2])
+	};
+}
+/** Resolve an engine credential, failing closed when it is unconfigured. */
+async function requireCredential(engine, deps) {
+	const credential = await deps.resolveCredential(engine.apiKeyRef);
+	if (credential === void 0) throw new EngineCallError("credential", "unconfigured", `engine "${engine.id}" has no resolved credential reference ${engine.apiKeyRef}`);
+	return credential;
+}
+/** Parse a JSON response body, failing with a structured parse error. */
+function parseJson(engine, body) {
+	let parsed;
+	try {
+		parsed = JSON.parse(new TextDecoder().decode(body));
+	} catch (cause) {
+		throw new EngineCallError("parse", "parse", `engine "${engine.id}" returned a non-JSON response`, { cause });
+	}
+	if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new EngineCallError("parse", "parse", `engine "${engine.id}" returned a non-object payload`);
+	return parsed;
+}
+/** Download one image URL with an explicit authorization header value. */
+async function downloadImage(engine, url, authorization, deps, signal) {
+	const response = await deps.transport.request({
+		method: "GET",
+		url,
+		headers: { authorization },
+		...signal === void 0 ? {} : { signal }
+	});
+	if (response.status < 200 || response.status >= 300) throw new EngineCallError("request", "http", `engine "${engine.id}" image download failed with HTTP ${response.status}`, { status: response.status });
+	return response.body;
+}
+/** Sleep without swallowing the caller's abort (checked by the caller's loop). */
+function sleep(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/** The provider registry, keyed by vocabulary. */
+const PROVIDERS = Object.freeze({
+	openai: openaiProvider,
+	replicate: {
+		vocabulary: "replicate",
+		async generate(engine, request, deps, signal) {
+			const credential = await requireCredential(engine, deps);
+			const dimensions = dimensionsOf(engine.sizeMap[request.size ?? "square"]);
+			const input = {
+				prompt: request.prompt,
+				num_outputs: request.count ?? 1,
+				...dimensions === void 0 ? {} : {
+					width: dimensions.width,
+					height: dimensions.height
+				}
+			};
+			const create = await deps.transport.request({
+				method: "POST",
+				url: `${engine.baseUrl}/models/${engine.model}/predictions`,
+				headers: {
+					"content-type": "application/json",
+					authorization: `Bearer ${credential}`
+				},
+				body: new TextEncoder().encode(JSON.stringify({ input })),
+				...signal === void 0 ? {} : { signal }
+			});
+			if (create.status === 401 || create.status === 403) throw new EngineCallError("request", "auth", `engine "${engine.id}" rejected the credential (HTTP ${create.status})`, { status: create.status });
+			if (create.status < 200 || create.status >= 300) throw new EngineCallError("request", "http", `engine "${engine.id}" failed with HTTP ${create.status}`, { status: create.status });
+			let prediction = parseJson(engine, create.body);
+			const id = typeof prediction["id"] === "string" ? prediction["id"] : "";
+			const urls = typeof prediction["urls"] === "object" && prediction["urls"] !== null ? prediction["urls"] : {};
+			const pollUrl = typeof urls["get"] === "string" && urls["get"] !== "" ? urls["get"] : `${engine.baseUrl}/predictions/${id}`;
+			for (let poll = 0; poll < REPLICATE_MAX_POLLS; poll += 1) {
+				signal?.throwIfAborted();
+				const status = typeof prediction["status"] === "string" ? prediction["status"] : "";
+				if (status === "succeeded") break;
+				if (status === "failed" || status === "canceled") throw new EngineCallError("request", "http", `engine "${engine.id}" prediction ${status}`);
+				await sleep(REPLICATE_POLL_INTERVAL_MS);
+				const polled = await deps.transport.request({
+					method: "GET",
+					url: pollUrl,
+					headers: { authorization: `Bearer ${credential}` },
+					...signal === void 0 ? {} : { signal }
+				});
+				if (polled.status < 200 || polled.status >= 300) throw new EngineCallError("request", "http", `engine "${engine.id}" prediction poll failed with HTTP ${polled.status}`, { status: polled.status });
+				prediction = parseJson(engine, polled.body);
+			}
+			if (prediction["status"] !== "succeeded") throw new EngineCallError("request", "http", `engine "${engine.id}" prediction did not finish within ${REPLICATE_MAX_POLLS} polls`);
+			const output = prediction["output"];
+			if (!Array.isArray(output)) throw new EngineCallError("parse", "parse", `engine "${engine.id}" prediction has no output array`);
+			const images = [];
+			for (const item of output) {
+				if (typeof item !== "string" || item === "") throw new EngineCallError("parse", "parse", `engine "${engine.id}" prediction returned a non-URL output entry`);
+				images.push({
+					data: await downloadImage(engine, item, `Bearer ${credential}`, deps, signal),
+					mediaType: engine.imageMediaType
+				});
+			}
+			if (images.length === 0) throw new EngineCallError("parse", "parse", `engine "${engine.id}" prediction returned no images`);
+			return images;
+		}
+	},
+	fal: {
+		vocabulary: "fal",
+		async generate(engine, request, deps, signal) {
+			const credential = await requireCredential(engine, deps);
+			const body = {
+				prompt: request.prompt,
+				image_size: engine.sizeMap[request.size ?? "square"],
+				num_images: request.count ?? 1
+			};
+			const response = await deps.transport.request({
+				method: "POST",
+				url: `${engine.baseUrl}/${engine.model}`,
+				headers: {
+					"content-type": "application/json",
+					authorization: `Key ${credential}`
+				},
+				body: new TextEncoder().encode(JSON.stringify(body)),
+				...signal === void 0 ? {} : { signal }
+			});
+			if (response.status === 401 || response.status === 403) throw new EngineCallError("request", "auth", `engine "${engine.id}" rejected the credential (HTTP ${response.status})`, { status: response.status });
+			if (response.status < 200 || response.status >= 300) throw new EngineCallError("request", "http", `engine "${engine.id}" failed with HTTP ${response.status}`, { status: response.status });
+			const entries = parseJson(engine, response.body)["images"];
+			if (!Array.isArray(entries)) throw new EngineCallError("parse", "parse", `engine "${engine.id}" response has no images array`);
+			const images = [];
+			for (const raw of entries) {
+				const url = typeof raw === "object" && raw !== null ? raw["url"] : void 0;
+				if (typeof url !== "string" || url === "") throw new EngineCallError("parse", "parse", `engine "${engine.id}" returned an image entry without a URL`);
+				images.push({
+					data: await downloadImage(engine, url, `Key ${credential}`, deps, signal),
+					mediaType: engine.imageMediaType
+				});
+			}
+			if (images.length === 0) throw new EngineCallError("parse", "parse", `engine "${engine.id}" returned no images`);
+			return images;
+		}
+	}
+});
+/** Resolve the provider for one vocabulary (always present — the config gate restricts the value). */
+function providerFor(vocabulary) {
+	return PROVIDERS[vocabulary];
+}
+//#endregion
 //#region src/router.ts
 /**
 * The engine chain with per-engine health and cooldown. All mutations are
@@ -1001,7 +1168,7 @@ var EngineRouter = class {
 			}
 			tried += 1;
 			try {
-				const images = await callEngine(engine, this.translate(engine, request), deps, signal);
+				const images = await providerFor(engine.provider).generate(engine, request, deps, signal);
 				this.recordSuccess(engine.id);
 				attempts.push({
 					engine: engine.id,
@@ -1145,10 +1312,6 @@ var EngineRouter = class {
 			message: `engine "${engine.id}" is cooling down after repeated failures`
 		};
 	}
-	/** Translate the standard request against one engine (the pure translate step). */
-	translate(engine, request) {
-		return translateRequest(engine, request);
-	}
 	/** Record a success: reset consecutive failures and cooldown. */
 	recordSuccess(engineId) {
 		const health = this.health.get(engineId);
@@ -1185,13 +1348,14 @@ var EngineRouter = class {
 //#region src/version.ts
 /**
 * The plugin version, hardcoded beside `package.json` so the release script
-* bumps both and `tests/version.spec.ts` trips when they drift. Served in the
-* `draw/status` snapshot so the settings panel shows which plugin build runs.
+* bumps both and the version tripwire in `tests/session-events.spec.ts` trips
+* when they drift. Served in the `draw/status` snapshot so the settings panel
+* shows which plugin build runs.
 *
 * @module dsh-draw/version
 */
 /** Plugin version; must equal the `version` field in `package.json`. */
-const PLUGIN_VERSION = "0.1.2";
+const PLUGIN_VERSION = "0.2.1";
 //#endregion
 //#region src/service.ts
 /**
@@ -1554,4 +1718,4 @@ async function apply(ctx, config) {
 	logger.info(`image generation enabled: ${resolved.engines.map((engine) => engine.id).join(", ")} (preferred ${resolved.defaultEngine})`);
 }
 //#endregion
-export { Config, DEFAULT_ENGINES, DRAW_INVOCATIONS, DrawService, Drawer, EngineCallError, EngineRouter, HttpError, PLUGIN_VERSION, REDACTED, appendDrawGenerated, apply, callEngine, checkQuotaBytes, checkQuotaGenerations, commitDrawGenerated, defaultHttpTransport, drawGeneratedEvents, engineById, fallbackDrawGeneratedEvents, fusedSignal, imageGenerateTool, imageToWire, inject, makeEventGate, makeHostEventGate, name, normalizeRequest, probeIgnorableAppend, probeToWire, quotaState, resolveConfig, sanitizeError, sanitizeText, sanitizeUrl, statusToView, translateRequest };
+export { Config, DEFAULT_ENGINES, DRAW_INVOCATIONS, DrawService, Drawer, EngineCallError, EngineRouter, HttpError, PLUGIN_VERSION, PROVIDERS, REDACTED, appendDrawGenerated, apply, callEngine, checkQuotaBytes, checkQuotaGenerations, commitDrawGenerated, defaultHttpTransport, drawGeneratedEvents, engineById, fallbackDrawGeneratedEvents, fusedSignal, imageGenerateTool, imageToWire, inject, makeEventGate, makeHostEventGate, name, normalizeRequest, probeIgnorableAppend, probeToWire, providerFor, quotaState, resolveConfig, sanitizeError, sanitizeText, sanitizeUrl, statusToView, translateRequest };

package/lib/types/client/present.d.ts

@@ -74,7 +74,9 @@ export interface PresentedDrawPanel {
  * Project the panel snapshot onto the settings row model.
  *
  * @param snapshot - the `draw/status` wire snapshot.
+ * @param now - clock override for the cooldown flag (default {@link Date.now});
+ *   injected so the presenter stays a pure function of its inputs.
  * @returns the presented panel model.
  */
-export declare function presentDrawPanel(snapshot: DrawStatusSnapshot): PresentedDrawPanel;
+export declare function presentDrawPanel(snapshot: DrawStatusSnapshot, now?: () => number): PresentedDrawPanel;
 //# sourceMappingURL=present.d.ts.map

package/lib/types/client/present.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"present.d.ts","sourceRoot":"","sources":["../../../src/client/present.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEpD,8CAA8C;AAC9C,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb;AAED,uCAAuC;AACvC,MAAM,WAAW,mBAAmB;IAClC,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAA;IACd,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,8CAA8C;IAC9C,YAAY,EAAE,OAAO,CAAA;IACrB,mCAAmC;IACnC,MAAM,EAAE,SAAS,cAAc,EAAE,CAAA;IACjC,8CAA8C;IAC9C,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7C,wBAAwB;IACxB,MAAM,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAA;IACpD,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;CAC1C;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,mBAAmB,GAAG,SAAS,CAuCvF;AAED,sDAAsD;AACtD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,oBAAoB,EAAE,OAAO,CAAA;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,kBAAkB,EAAE,OAAO,CAAA;IAC3B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,WAAW,EAAE,OAAO,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACzB;AAED,uCAAuC;AACvC,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAA;IACtC,KAAK,EAAE;QAAE,wBAAwB,EAAE,MAAM,CAAC;QAAC,kBAAkB,EAAE,MAAM,CAAA;KAAE,CAAA;IACvE,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,kBAAkB,CAqBjF"}
+{"version":3,"file":"present.d.ts","sourceRoot":"","sources":["../../../src/client/present.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEpD,8CAA8C;AAC9C,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb;AAED,uCAAuC;AACvC,MAAM,WAAW,mBAAmB;IAClC,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAA;IACd,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,8CAA8C;IAC9C,YAAY,EAAE,OAAO,CAAA;IACrB,mCAAmC;IACnC,MAAM,EAAE,SAAS,cAAc,EAAE,CAAA;IACjC,8CAA8C;IAC9C,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7C,wBAAwB;IACxB,MAAM,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAA;IACpD,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;CAC1C;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,mBAAmB,GAAG,SAAS,CAuCvF;AAED,sDAAsD;AACtD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,oBAAoB,EAAE,OAAO,CAAA;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,kBAAkB,EAAE,OAAO,CAAA;IAC3B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,WAAW,EAAE,OAAO,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACzB;AAED,uCAAuC;AACvC,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAA;IACtC,KAAK,EAAE;QAAE,wBAAwB,EAAE,MAAM,CAAC;QAAC,kBAAkB,EAAE,MAAM,CAAA;KAAE,CAAA;IACvE,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,GAAE,MAAM,MAAiB,GAAG,kBAAkB,CAqB/G"}

package/lib/types/client/present.js

@@ -60,9 +60,11 @@ export function presentDrawResult(block) {
  * Project the panel snapshot onto the settings row model.
  *
  * @param snapshot - the `draw/status` wire snapshot.
+ * @param now - clock override for the cooldown flag (default {@link Date.now});
+ *   injected so the presenter stays a pure function of its inputs.
  * @returns the presented panel model.
  */
-export function presentDrawPanel(snapshot) {
+export function presentDrawPanel(snapshot, now = Date.now) {
     return {
         pluginVersion: snapshot.pluginVersion,
         engines: snapshot.engines.map(engine => ({
@@ -76,7 +78,7 @@ export function presentDrawPanel(snapshot) {
             ...(engine.credential.source !== undefined ? { credentialSource: engine.credential.source } : {}),
             credentialWritable: engine.credential.writable,
             consecutiveFailures: engine.health.consecutiveFailures,
-            coolingDown: engine.health.cooldownUntil !== null && engine.health.cooldownUntil > Date.now(),
+            coolingDown: engine.health.cooldownUntil !== null && engine.health.cooldownUntil > now(),
             lastError: engine.health.lastError,
         })),
         quota: { maxGenerationsPerSession: snapshot.quota.maxGenerationsPerSession, maxBytesPerSession: snapshot.quota.maxBytesPerSession },

package/lib/types/config.d.ts

@@ -51,6 +51,8 @@ export interface EngineSizeMap {
 }
 /** Whether generated images arrive as base64 payloads or downloadable URLs. */
 export type EngineResponseFormat = 'b64_json' | 'url';
+/** The image-generation vocabularies a configured engine may declare (provider seam). */
+export type EngineVocabulary = 'openai' | 'replicate' | 'fal';
 /** One OpenAI-compatible image-generation endpoint the router may use. */
 export interface EngineConfig {
     /** Stable engine id used in tool args, results, and the settings panel. */
@@ -61,6 +63,8 @@ export interface EngineConfig {
     model: string;
     /** Credential reference (environment-variable name) the API key resolves from; never a literal key. */
     apiKeyRef: string;
+    /** Which request/response vocabulary this engine speaks (default `openai`). */
+    provider?: EngineVocabulary;
     /** Whether the router may use this engine (default true). */
     enabled?: boolean;
     /** Standard-size → concrete-size translation (default: the OpenAI sizes). */
@@ -109,6 +113,8 @@ export interface ResolvedEngineConfig {
     model: string;
     /** Credential reference the API key resolves from. */
     apiKeyRef: string;
+    /** Request/response vocabulary this engine speaks. */
+    provider: EngineVocabulary;
     /** Whether the router may use this engine. */
     enabled: boolean;
     /** Standard-size → concrete-size translation. */

package/lib/types/config.d.ts.map

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

package/lib/types/config.js

@@ -42,6 +42,7 @@ export const DEFAULT_ENGINES = Object.freeze([
         baseUrl: 'https://api.openai.com/v1',
         model: 'gpt-image-1',
         apiKeyRef: 'OPENAI_API_KEY',
+        provider: 'openai',
         enabled: true,
         sizeMap: Object.freeze({ square: '1024x1024', landscape: '1536x1024', portrait: '1024x1536', auto: 'auto' }),
         qualitySupported: true,
@@ -54,6 +55,7 @@ export const DEFAULT_ENGINES = Object.freeze([
         baseUrl: 'https://open.bigmodel.cn/api/paas/v4',
         model: 'cogview-3-flash',
         apiKeyRef: 'ZHIPU_API_KEY',
+        provider: 'openai',
         enabled: true,
         sizeMap: Object.freeze({ square: '1024x1024', landscape: '1344x768', portrait: '768x1344', auto: '1024x1024' }),
         qualitySupported: false,
@@ -76,6 +78,7 @@ export const Config = z.object({
         baseUrl: z.string().min(1).max(2048),
         model: z.string().min(1).max(128),
         apiKeyRef: z.string().min(1).max(128),
+        provider: z.union(['openai', 'replicate', 'fal']),
         enabled: z.boolean(),
         sizeMap: z.object({
             square: z.string().min(1).max(64),
@@ -141,6 +144,10 @@ export function resolveConfig(config) {
         const apiKeyRef = typeof engine.apiKeyRef === 'string' && API_KEY_REF_PATTERN.test(engine.apiKeyRef) ? engine.apiKeyRef : '';
         if (apiKeyRef === '')
             throw new Error(`dsh-draw: engine "${id}" apiKeyRef ${JSON.stringify(engine.apiKeyRef)} must be an environment-variable name`);
+        const provider = engine.provider ?? 'openai';
+        if (provider !== 'openai' && provider !== 'replicate' && provider !== 'fal') {
+            throw new Error(`dsh-draw: engine "${id}" provider must be one of "openai", "replicate", "fal", got ${JSON.stringify(provider)}`);
+        }
         const sizeMap = engine.sizeMap === undefined ? DEFAULT_SIZE_MAP : engine.sizeMap;
         for (const key of ['square', 'landscape', 'portrait', 'auto']) {
             const value = sizeMap[key];
@@ -170,6 +177,7 @@ export function resolveConfig(config) {
             baseUrl: baseUrl.replace(/\/+$/u, ''),
             model,
             apiKeyRef,
+            provider,
             enabled,
             sizeMap: Object.freeze({ ...sizeMap }),
             qualitySupported,

package/lib/types/index.d.ts

@@ -25,6 +25,7 @@ export { imageGenerateTool } from './tool.js';
 export { DrawService } from './service.js';
 export { defaultHttpTransport, fusedSignal, type HttpTransport, type HttpRequest, type HttpResponse, HttpError } from './http.js';
 export { callEngine, EngineCallError, type EngineDeps, type ProducedImage } from './engine.js';
+export { providerFor, PROVIDERS, type EngineProvider, type EngineVocabulary } from './provider.js';
 export { translateRequest, normalizeRequest, type StandardImageRequest } from './translate.js';
 export { quotaState, checkQuotaGenerations, checkQuotaBytes, type QuotaLimits, type QuotaState } from './quota.js';
 export { sanitizeUrl, sanitizeText, sanitizeError, REDACTED } from './sanitize.js';

package/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAMlD,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAA;AAQnD,eAAO,MAAM,IAAI,aAAa,CAAA;AAE9B,oEAAoE;AACpE,eAAO,MAAM,MAAM,UAAY,CAAA;AAE/B,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,MAAM,IAAI,UAAU,EAAE,KAAK,cAAc,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAChI,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAA;AAClG,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAA;AAClI,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACjI,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,KAAK,UAAU,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAA;AAC9F,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAC9F,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AAClH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAClF,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACzJ,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAChI,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAK7G;;;;;;;GAOG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoCvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAMlD,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAA;AAQnD,eAAO,MAAM,IAAI,aAAa,CAAA;AAE9B,oEAAoE;AACpE,eAAO,MAAM,MAAM,UAAY,CAAA;AAE/B,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,MAAM,IAAI,UAAU,EAAE,KAAK,cAAc,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAChI,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAA;AAClG,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAA;AAClI,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACjI,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,KAAK,UAAU,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAA;AAC9F,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAClG,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAC9F,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AAClH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAClF,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACzJ,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAChI,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAK7G;;;;;;;GAOG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoCvE"}

package/lib/types/index.js

@@ -31,6 +31,7 @@ export { imageGenerateTool } from './tool.js';
 export { DrawService } from './service.js';
 export { defaultHttpTransport, fusedSignal, HttpError } from './http.js';
 export { callEngine, EngineCallError } from './engine.js';
+export { providerFor, PROVIDERS } from './provider.js';
 export { translateRequest, normalizeRequest } from './translate.js';
 export { quotaState, checkQuotaGenerations, checkQuotaBytes } from './quota.js';
 export { sanitizeUrl, sanitizeText, sanitizeError, REDACTED } from './sanitize.js';

package/lib/types/provider.d.ts

@@ -0,0 +1,39 @@
+/**
+ * The engine-provider seam: one adapter per image-generation vocabulary. The
+ * OpenAI provider is the existing OpenAI-compatible `POST /images/generations`
+ * adapter; `replicate` and `fal` adapters speak those vendors' native request
+ * and response shapes (prediction polling and `fal.run` queue respectively).
+ * A configured engine declares its vocabulary (`provider`); the router
+ * dispatches through {@link providerFor}, so cooldown fallback, quota, and the
+ * audit path stay vocabulary-agnostic.
+ *
+ * @module dsh-draw/provider
+ */
+import type { ResolvedEngineConfig } from './config.js';
+import { type EngineDeps, type ProducedImage } from './engine.js';
+import type { StandardImageRequest } from './translate.js';
+/** The image-generation vocabularies a configured engine may declare. */
+export type EngineVocabulary = 'openai' | 'replicate' | 'fal';
+/**
+ * One engine adapter: translates the standard tool request into a vendor
+ * request, calls it, and returns produced image bytes. A provider must never
+ * leak the credential — `deps.resolveCredential` resolves it per call.
+ */
+export interface EngineProvider {
+    /** Which vocabulary this adapter speaks. */
+    readonly vocabulary: EngineVocabulary;
+    /**
+     * Generate images for one standardized request.
+     * @param engine - resolved engine configuration.
+     * @param request - normalized standard request.
+     * @param deps - transport and credential resolution.
+     * @param signal - caller cancellation.
+     * @returns the produced images.
+     */
+    generate(engine: ResolvedEngineConfig, request: StandardImageRequest, deps: EngineDeps, signal?: AbortSignal): Promise<ProducedImage[]>;
+}
+/** The provider registry, keyed by vocabulary. */
+export declare const PROVIDERS: Readonly<Record<EngineVocabulary, EngineProvider>>;
+/** Resolve the provider for one vocabulary (always present — the config gate restricts the value). */
+export declare function providerFor(vocabulary: EngineVocabulary): EngineProvider;
+//# sourceMappingURL=provider.d.ts.map

package/lib/types/provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,EAGL,KAAK,UAAU,EACf,KAAK,aAAa,EACnB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAG1D,yEAAyE;AACzE,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,WAAW,GAAG,KAAK,CAAA;AAE7D;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,4CAA4C;IAC5C,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAA;IACrC;;;;;;;OAOG;IACH,QAAQ,CAAC,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAA;CACxI;AAwLD,kDAAkD;AAClD,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAIvE,CAAA;AAEF,sGAAsG;AACtG,wBAAgB,WAAW,CAAC,UAAU,EAAE,gBAAgB,GAAG,cAAc,CAExE"}

package/lib/types/provider.js

@@ -0,0 +1,192 @@
+/**
+ * The engine-provider seam: one adapter per image-generation vocabulary. The
+ * OpenAI provider is the existing OpenAI-compatible `POST /images/generations`
+ * adapter; `replicate` and `fal` adapters speak those vendors' native request
+ * and response shapes (prediction polling and `fal.run` queue respectively).
+ * A configured engine declares its vocabulary (`provider`); the router
+ * dispatches through {@link providerFor}, so cooldown fallback, quota, and the
+ * audit path stay vocabulary-agnostic.
+ *
+ * @module dsh-draw/provider
+ */
+import { callEngine, EngineCallError, } from './engine.js';
+import { translateRequest } from './translate.js';
+/** The OpenAI-compatible adapter: delegates to the existing `/images/generations` path. */
+const openaiProvider = {
+    vocabulary: 'openai',
+    generate(engine, request, deps, signal) {
+        return callEngine(engine, translateRequest(engine, request), deps, signal);
+    },
+};
+/** Replicate prediction polling interval (ms). */
+const REPLICATE_POLL_INTERVAL_MS = 1_000;
+/** Maximum prediction polls before the call fails as a slow request. */
+const REPLICATE_MAX_POLLS = 120;
+/** Parse one concrete `WIDTHxHEIGHT` size string into dimensions. */
+function dimensionsOf(size) {
+    const match = /^(\d{2,5})x(\d{2,5})$/u.exec(size);
+    if (match === null)
+        return undefined;
+    return { width: Number(match[1]), height: Number(match[2]) };
+}
+/** Resolve an engine credential, failing closed when it is unconfigured. */
+async function requireCredential(engine, deps) {
+    const credential = await deps.resolveCredential(engine.apiKeyRef);
+    if (credential === undefined) {
+        throw new EngineCallError('credential', 'unconfigured', `engine "${engine.id}" has no resolved credential reference ${engine.apiKeyRef}`);
+    }
+    return credential;
+}
+/** Parse a JSON response body, failing with a structured parse error. */
+function parseJson(engine, body) {
+    let parsed;
+    try {
+        parsed = JSON.parse(new TextDecoder().decode(body));
+    }
+    catch (cause) {
+        throw new EngineCallError('parse', 'parse', `engine "${engine.id}" returned a non-JSON response`, { cause });
+    }
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+        throw new EngineCallError('parse', 'parse', `engine "${engine.id}" returned a non-object payload`);
+    }
+    return parsed;
+}
+/** Download one image URL with an explicit authorization header value. */
+async function downloadImage(engine, url, authorization, deps, signal) {
+    const response = await deps.transport.request({
+        method: 'GET',
+        url,
+        headers: { authorization },
+        ...(signal === undefined ? {} : { signal }),
+    });
+    if (response.status < 200 || response.status >= 300) {
+        throw new EngineCallError('request', 'http', `engine "${engine.id}" image download failed with HTTP ${response.status}`, { status: response.status });
+    }
+    return response.body;
+}
+/** Sleep without swallowing the caller's abort (checked by the caller's loop). */
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+/** The Replicate adapter: create a prediction, poll to completion, then download its output URLs. */
+const replicateProvider = {
+    vocabulary: 'replicate',
+    async generate(engine, request, deps, signal) {
+        const credential = await requireCredential(engine, deps);
+        const dimensions = dimensionsOf(engine.sizeMap[request.size ?? 'square']);
+        const input = {
+            prompt: request.prompt,
+            num_outputs: request.count ?? 1,
+            ...(dimensions === undefined ? {} : { width: dimensions.width, height: dimensions.height }),
+        };
+        const create = await deps.transport.request({
+            method: 'POST',
+            url: `${engine.baseUrl}/models/${engine.model}/predictions`,
+            headers: { 'content-type': 'application/json', authorization: `Bearer ${credential}` },
+            body: new TextEncoder().encode(JSON.stringify({ input })),
+            ...(signal === undefined ? {} : { signal }),
+        });
+        if (create.status === 401 || create.status === 403) {
+            throw new EngineCallError('request', 'auth', `engine "${engine.id}" rejected the credential (HTTP ${create.status})`, { status: create.status });
+        }
+        if (create.status < 200 || create.status >= 300) {
+            throw new EngineCallError('request', 'http', `engine "${engine.id}" failed with HTTP ${create.status}`, { status: create.status });
+        }
+        let prediction = parseJson(engine, create.body);
+        const id = typeof prediction['id'] === 'string' ? prediction['id'] : '';
+        const urls = typeof prediction['urls'] === 'object' && prediction['urls'] !== null
+            ? prediction['urls']
+            : {};
+        const pollUrl = typeof urls['get'] === 'string' && urls['get'] !== '' ? urls['get'] : `${engine.baseUrl}/predictions/${id}`;
+        for (let poll = 0; poll < REPLICATE_MAX_POLLS; poll += 1) {
+            signal?.throwIfAborted();
+            const status = typeof prediction['status'] === 'string' ? prediction['status'] : '';
+            if (status === 'succeeded')
+                break;
+            if (status === 'failed' || status === 'canceled') {
+                throw new EngineCallError('request', 'http', `engine "${engine.id}" prediction ${status}`);
+            }
+            await sleep(REPLICATE_POLL_INTERVAL_MS);
+            const polled = await deps.transport.request({
+                method: 'GET',
+                url: pollUrl,
+                headers: { authorization: `Bearer ${credential}` },
+                ...(signal === undefined ? {} : { signal }),
+            });
+            if (polled.status < 200 || polled.status >= 300) {
+                throw new EngineCallError('request', 'http', `engine "${engine.id}" prediction poll failed with HTTP ${polled.status}`, { status: polled.status });
+            }
+            prediction = parseJson(engine, polled.body);
+        }
+        if (prediction['status'] !== 'succeeded') {
+            throw new EngineCallError('request', 'http', `engine "${engine.id}" prediction did not finish within ${REPLICATE_MAX_POLLS} polls`);
+        }
+        const output = prediction['output'];
+        if (!Array.isArray(output)) {
+            throw new EngineCallError('parse', 'parse', `engine "${engine.id}" prediction has no output array`);
+        }
+        const images = [];
+        for (const item of output) {
+            if (typeof item !== 'string' || item === '') {
+                throw new EngineCallError('parse', 'parse', `engine "${engine.id}" prediction returned a non-URL output entry`);
+            }
+            images.push({ data: await downloadImage(engine, item, `Bearer ${credential}`, deps, signal), mediaType: engine.imageMediaType });
+        }
+        if (images.length === 0) {
+            throw new EngineCallError('parse', 'parse', `engine "${engine.id}" prediction returned no images`);
+        }
+        return images;
+    },
+};
+/** The fal.ai adapter: POST the `fal.run` queue endpoint and download the returned image URLs. */
+const falProvider = {
+    vocabulary: 'fal',
+    async generate(engine, request, deps, signal) {
+        const credential = await requireCredential(engine, deps);
+        const body = {
+            prompt: request.prompt,
+            image_size: engine.sizeMap[request.size ?? 'square'],
+            num_images: request.count ?? 1,
+        };
+        const response = await deps.transport.request({
+            method: 'POST',
+            url: `${engine.baseUrl}/${engine.model}`,
+            headers: { 'content-type': 'application/json', authorization: `Key ${credential}` },
+            body: new TextEncoder().encode(JSON.stringify(body)),
+            ...(signal === undefined ? {} : { signal }),
+        });
+        if (response.status === 401 || response.status === 403) {
+            throw new EngineCallError('request', 'auth', `engine "${engine.id}" rejected the credential (HTTP ${response.status})`, { status: response.status });
+        }
+        if (response.status < 200 || response.status >= 300) {
+            throw new EngineCallError('request', 'http', `engine "${engine.id}" failed with HTTP ${response.status}`, { status: response.status });
+        }
+        const payload = parseJson(engine, response.body);
+        const entries = payload['images'];
+        if (!Array.isArray(entries)) {
+            throw new EngineCallError('parse', 'parse', `engine "${engine.id}" response has no images array`);
+        }
+        const images = [];
+        for (const raw of entries) {
+            const url = typeof raw === 'object' && raw !== null ? raw['url'] : undefined;
+            if (typeof url !== 'string' || url === '') {
+                throw new EngineCallError('parse', 'parse', `engine "${engine.id}" returned an image entry without a URL`);
+            }
+            images.push({ data: await downloadImage(engine, url, `Key ${credential}`, deps, signal), mediaType: engine.imageMediaType });
+        }
+        if (images.length === 0) {
+            throw new EngineCallError('parse', 'parse', `engine "${engine.id}" returned no images`);
+        }
+        return images;
+    },
+};
+/** The provider registry, keyed by vocabulary. */
+export const PROVIDERS = Object.freeze({
+    openai: openaiProvider,
+    replicate: replicateProvider,
+    fal: falProvider,
+});
+/** Resolve the provider for one vocabulary (always present — the config gate restricts the value). */
+export function providerFor(vocabulary) {
+    return PROVIDERS[vocabulary];
+}