dsh-draw 0.1.3 → 0.2.2

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];
+}

package/lib/types/router.d.ts

@@ -9,7 +9,7 @@
  */
 import type { ResolvedConfig, ResolvedEngineConfig } from './config.js';
 import { type EngineDeps, type ProducedImage } from './engine.js';
-import { type StandardImageRequest } from './translate.js';
+import type { StandardImageRequest } from './translate.js';
 /** One recorded attempt against one engine, success or failure. */
 export interface AttemptView {
     /** Engine id. */
@@ -131,8 +131,6 @@ export declare class EngineRouter {
     private chainOrder;
     /** Why an engine may not even be attempted: disabled, cooling down. */
     private skipReason;
-    /** Translate the standard request against one engine (the pure translate step). */
-    private translate;
     /** Record a success: reset consecutive failures and cooldown. */
     private recordSuccess;
     /** Record a failure: bump the counter, trip cooldown at the threshold, and build the attempt view. */

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

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

package/lib/types/router.js

@@ -7,9 +7,9 @@
  *
  * @module dsh-draw/router
  */
-import { callEngine, EngineCallError } from './engine.js';
+import { EngineCallError } from './engine.js';
+import { providerFor } from './provider.js';
 import { sanitizeError, sanitizeText, sanitizeUrl } from './sanitize.js';
-import { translateRequest } from './translate.js';
 /**
  * The engine chain with per-engine health and cooldown. All mutations are
  * synchronous bookkeeping guarded by `generate`'s single-writer path (the
@@ -56,7 +56,7 @@ export class EngineRouter {
             }
             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, code: 'ok' });
                 return {
@@ -172,10 +172,6 @@ export class EngineRouter {
         }
         return undefined;
     }
-    /** 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);

package/lib/types/session-events.d.ts

@@ -1,17 +1,19 @@
 /**
  * The dsh-draw session event: one durable record per completed generation
  * (tool call or panel regenerate), appended to the owning session log. It is
- * log-only (`ignorable`) and exists so quota accounting and the durable audit
- * trail are reconstructable from the log alone. The model-visible input and
- * output of the call ride the loop-owned `tool/call` and `tool/result`
- * events; this event carries the accounting facts those events do not.
+ * log-only and exists so quota accounting and the durable audit trail are
+ * reconstructable from the log alone. The model-visible input and output of
+ * the call ride the loop-owned `tool/call` and `tool/result` events; this
+ * event carries the accounting facts those events do not.
  *
  * The event type is declared only here, so plugin paths append it through
  * {@link commitDrawGenerated}: the adaptive gate (event-gate.ts) appends only
- * when the host knows the type or honors the `ignorable` envelope, and
- * otherwise records the payload in the in-memory fallback ledger (live-session
- * quota keeps working; the durable trail resumes once the host gains a plugin
- * event surface).
+ * when the host knows the type or honors the `ignorable` envelope (pre-0.1.2
+ * host lines), and otherwise records the payload in the in-memory fallback
+ * ledger (live-session quota keeps working; the durable trail resumes once
+ * the host gains a plugin event surface). `0.1.2-alpha.1` removed the
+ * envelope and fails closed on unknown event types at read, so the probe
+ * reports no support there and every commit degrades to the ledger.
  *
  * @module dsh-draw/session-events
  */

package/lib/types/session-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-events.d.ts","sourceRoot":"","sources":["../../src/session-events.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAEhD,OAAO,QAAQ,gCAAgC,CAAC;IAC9C,UAAU,eAAe;QACvB;;;WAGG;QACH,gBAAgB,EAAE,kBAAkB,CAAA;KACrC;CACF;AAED,qDAAqD;AACrD,MAAM,WAAW,kBAAkB;IACjC,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAA;IACd,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,yEAAyE;IACzE,MAAM,EAAE,MAAM,GAAG,YAAY,CAAA;IAC7B,gEAAgE;IAChE,MAAM,EAAE,MAAM,CAAA;IACd,qDAAqD;IACrD,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,CAAA;IAClD,6CAA6C;IAC7C,OAAO,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;IAC3C,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,8CAA8C;IAC9C,KAAK,EAAE,MAAM,CAAA;IACb,8CAA8C;IAC9C,aAAa,EAAE,SAAS,MAAM,EAAE,CAAA;IAChC,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAA;CAClB;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,kBAAkB;;;;;;WAE9E;AAYD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAiBvI;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,kBAAkB,EAAE,CAE3F;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,OAAO,0BAA0B,EAAE,YAAY,CAAC,gBAAgB,CAAC,EAAE,CAElI"}
+{"version":3,"file":"session-events.d.ts","sourceRoot":"","sources":["../../src/session-events.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAEhD,OAAO,QAAQ,gCAAgC,CAAC;IAC9C,UAAU,eAAe;QACvB;;;WAGG;QACH,gBAAgB,EAAE,kBAAkB,CAAA;KACrC;CACF;AAED,qDAAqD;AACrD,MAAM,WAAW,kBAAkB;IACjC,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAA;IACd,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,yEAAyE;IACzE,MAAM,EAAE,MAAM,GAAG,YAAY,CAAA;IAC7B,gEAAgE;IAChE,MAAM,EAAE,MAAM,CAAA;IACd,qDAAqD;IACrD,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,CAAA;IAClD,6CAA6C;IAC7C,OAAO,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;IAC3C,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,8CAA8C;IAC9C,KAAK,EAAE,MAAM,CAAA;IACb,8CAA8C;IAC9C,aAAa,EAAE,SAAS,MAAM,EAAE,CAAA;IAChC,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAA;CAClB;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,kBAAkB;;;;;;WAE9E;AAaD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAiBvI;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,kBAAkB,EAAE,CAE3F;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,OAAO,0BAA0B,EAAE,YAAY,CAAC,gBAAgB,CAAC,EAAE,CAElI"}

package/lib/types/session-events.js

@@ -1,17 +1,19 @@
 /**
  * The dsh-draw session event: one durable record per completed generation
  * (tool call or panel regenerate), appended to the owning session log. It is
- * log-only (`ignorable`) and exists so quota accounting and the durable audit
- * trail are reconstructable from the log alone. The model-visible input and
- * output of the call ride the loop-owned `tool/call` and `tool/result`
- * events; this event carries the accounting facts those events do not.
+ * log-only and exists so quota accounting and the durable audit trail are
+ * reconstructable from the log alone. The model-visible input and output of
+ * the call ride the loop-owned `tool/call` and `tool/result` events; this
+ * event carries the accounting facts those events do not.
  *
  * The event type is declared only here, so plugin paths append it through
  * {@link commitDrawGenerated}: the adaptive gate (event-gate.ts) appends only
- * when the host knows the type or honors the `ignorable` envelope, and
- * otherwise records the payload in the in-memory fallback ledger (live-session
- * quota keeps working; the durable trail resumes once the host gains a plugin
- * event surface).
+ * when the host knows the type or honors the `ignorable` envelope (pre-0.1.2
+ * host lines), and otherwise records the payload in the in-memory fallback
+ * ledger (live-session quota keeps working; the durable trail resumes once
+ * the host gains a plugin event surface). `0.1.2-alpha.1` removed the
+ * envelope and fails closed on unknown event types at read, so the probe
+ * reports no support there and every commit degrades to the ledger.
  *
  * @module dsh-draw/session-events
  */
@@ -29,7 +31,8 @@ export function appendDrawGenerated(session, event) {
 }
 /**
  * In-memory accounting ledger for hosts whose session log cannot carry
- * `draw/generated` safely (rc.6/rc.7 static whitelist, no ignorable envelope).
+ * `draw/generated` safely (rc.6/rc.7 static whitelist and the envelope-less
+ * `0.1.2-alpha.1`, which fails closed on unknown types at read).
  * Keyed by Session identity: the entries live exactly as long as the session.
  */
 const fallbackLedger = new WeakMap();

package/lib/types/version.d.ts

@@ -7,5 +7,5 @@
  * @module dsh-draw/version
  */
 /** Plugin version; must equal the `version` field in `package.json`. */
-export declare const PLUGIN_VERSION = "0.1.3";
+export declare const PLUGIN_VERSION = "0.2.2";
 //# sourceMappingURL=version.d.ts.map

package/lib/types/version.js

@@ -7,4 +7,4 @@
  * @module dsh-draw/version
  */
 /** Plugin version; must equal the `version` field in `package.json`. */
-export const PLUGIN_VERSION = '0.1.3';
+export const PLUGIN_VERSION = '0.2.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-draw",
-  "version": "0.1.3",
+  "version": "0.2.2",
   "description": "Unified static-image generation router for DeepSeek Harness: one image_generate tool with standard parameters, config-driven OpenAI-compatible engine routing (OpenAI Images, Zhipu CogView, and any compatible endpoint) with health-aware fallback, durable workspace attachment results, per-session quota accounting, an in-conversation result card, and a Plugins settings panel that stores API keys as credential references.",
   "repository": {
     "type": "git",
@@ -57,7 +57,6 @@
       "platform": "web",
       "inject": [
         "@deepseek-ai/dsh-client-connection",
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-settings",
@@ -89,7 +88,9 @@
       "attachments:write"
     ],
     "compatibility": {
-      "dshVersions": ["0.1.1-rc.2"]
+      "dshVersions": [
+        "0.1.1-rc.2"
+      ]
     },
     "capability": {
       "id": "image-generate-tool",
@@ -129,7 +130,29 @@
     "@deepseek-ai/dsh-session": ">=0.1.0-rc.8 <0.2.0",
     "@deepseek-ai/dsh-tools": ">=0.1.0-rc.8 <0.2.0",
     "@deepseek-ai/dsh-typert-protocol": ">=0.1.0-rc.8 <0.2.0",
-    "@deepseek-ai/schemastery": "^3.18.0"
+    "@deepseek-ai/schemastery": "^3.18.0",
+    "@deepseek-ai/dsh-client-connection": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-locale": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-ui-tool": ">=0.1.1-rc.2 <0.2.0"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-client-connection": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-locale": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-settings": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-slots": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-tool": {
+      "optional": true
+    }
   },
   "dependencies": {
     "tsdown": "^0.22.14",
@@ -147,7 +170,6 @@
     "@deepseek-ai/dsh-brand": "0.1.1-rc.2",
     "@deepseek-ai/dsh-client-connection": "0.1.1-rc.2",
     "@deepseek-ai/dsh-client-locale": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-runtime": "0.1.1-rc.2",
     "@deepseek-ai/dsh-client-ui-settings": "0.1.1-rc.2",
     "@deepseek-ai/dsh-client-ui-slots": "0.1.1-rc.2",
     "@deepseek-ai/dsh-client-ui-tool": "0.1.1-rc.2",
@@ -180,5 +202,9 @@
     "verify:self-contained": "node scripts/verify-self-contained.mjs",
     "verify:artifacts": "node scripts/verify-artifacts.mjs"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "funding": {
+    "type": "individual",
+    "url": "https://github.com/sponsors/PerryLink"
+  }
 }

package/src/client/DrawResultCard.tsx

@@ -13,8 +13,7 @@
 
 import { createElement as h, useState, type ReactElement } from 'react'
 import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
-import type { ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client'
-import { presentDrawResult } from './present.ts'
+import { presentDrawResult, type ToolCallBlock } from './present.ts'
 
 /**
  * Standard owner currency for one keyed tool view (mirror of the harness

package/src/client/index.ts

@@ -8,7 +8,9 @@
  * @module dsh-draw/client
  */
 
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client'
+import type { Context as ClientContext } from '@deepseek-ai/cordis'
+// Type-only: activates the ctx.remote Context merge (TypertClientRemote).
+import type {} from '@deepseek-ai/dsh-api-remotes/client'
 import type {} from '@deepseek-ai/dsh-client-locale/client'
 // Type-only: pulls the 'settings.plugins.tab' SlotMap declaration into this
 // program so the tab registration typechecks against the real declaration.
@@ -44,6 +46,18 @@ export const name = 'dsh-draw'
 /** Services the browser half reads; `remote.draw` appears once the contribution mounts. */
 export const inject = ['slots', 'locale', 'remote', 'sessions']
 
+/**
+ * Structural face of the slots service. Declared locally because the owning
+ * merge publishes differently across host lines (the removed
+ * `dsh-client-runtime` on 0.1.1-rc.2, the unpublished ui-renderer domain on
+ * 0.1.2-alpha.1); the runtime contract is structural and read through
+ * `ctx.get` without a dependency edge.
+ */
+interface SlotsFace {
+  inject(slot: string, callback: () => unknown): void
+  register(options: unknown, component: unknown): unknown
+}
+
 /**
  * Browser plugin body: dictionaries, the scoped stylesheet, the Remote
  * contribution mount, the result card, and the settings tab registration.
@@ -60,6 +74,7 @@ export async function apply(ctx: ClientContext): Promise<void> {
 
   ctx.inject(['remote.draw'], (scope) => {
     const t = scope.locale.bind(NS)
+    const slots = scope.get('slots') as SlotsFace
     const unwrap = <T>(result: RemoteResult<T>, method: string): T => {
       if (!result.ok) {
         throw new Error(`draw.${method} failed: ${result.error.code}: ${result.error.message}`)
@@ -67,7 +82,7 @@ export async function apply(ctx: ClientContext): Promise<void> {
       return result.value
     }
 
-    scope.slots.inject('tool.call.toolview', () => scope.slots.register({
+    slots.inject('tool.call.toolview', () => slots.register({
       name: 'tool.call.toolview',
       key: 'image_generate',
       locale: NS,
@@ -80,7 +95,7 @@ export async function apply(ctx: ClientContext): Promise<void> {
       }),
     }, DrawResultCard))
 
-    scope.slots.inject('settings.plugins.tab', () => scope.slots.register({
+    slots.inject('settings.plugins.tab', () => slots.register({
       name: 'settings.plugins.tab',
       id: 'draw',
       order: 40,

package/src/client/present.ts

@@ -7,9 +7,50 @@
  * @module dsh-draw/client/present
  */
 
-import type { ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client'
 import type { DrawStatusSnapshot } from '../wire.ts'
 
+/**
+ * Local structural contract for the frozen tool-call block the card reads.
+ * Declared locally because the owning packages publish the block union
+ * differently across host lines: the published `0.1.1-rc.2` line keeps it in
+ * the removed `dsh-client-runtime` package, and the unreleased
+ * `0.1.2-alpha.1` host owns it in the unpublished `dsh-client-ui-chat`. The
+ * runtime contract is structural — the presenter only discriminates on
+ * `kind` and reads the call head, error flag, and meta.
+ */
+
+/** One frozen running tool call (no `kind`; the presenter's first guard drops it). */
+export interface RunningToolCallBlock {
+  /** Tool call identity, stable across running and settled forms. */
+  callId: string
+  /** Wire tool name. */
+  name: string
+  /** Verbatim serialized arguments. */
+  argsRaw: string
+  /** Owning turn. */
+  turn: number
+  /** Owning step. */
+  step: number
+  /** Unix epoch ms when the call was logged. */
+  time: number
+}
+
+/** One settled tool result (fields the presenter reads). */
+export interface SettledToolResultBlock {
+  kind: 'tool-result'
+  isError: boolean
+  /** Call head; null when window truncation left the call outside. */
+  call: { name: string; argsRaw: string } | null
+  /** Tool-owned presentation metadata (the card's engine/quota/limits facts). */
+  meta?: unknown
+}
+
+/** Frozen running-or-settled tool block. */
+export type ToolCallBlock = RunningToolCallBlock | SettledToolResultBlock
+
+/** Settled tool-result node only. */
+export type ToolResultNode = SettledToolResultBlock
+
 /** One image of the presented result card. */
 export interface PresentedImage {
   attachmentId: string

package/src/config.ts

@@ -70,6 +70,9 @@ 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. */
@@ -80,6 +83,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). */
@@ -123,6 +128,7 @@ export const DEFAULT_ENGINES: ReadonlyArray<Required<EngineConfig>> = Object.fre
     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,
@@ -135,6 +141,7 @@ export const DEFAULT_ENGINES: ReadonlyArray<Required<EngineConfig>> = Object.fre
     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,
@@ -162,6 +169,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. */
@@ -205,6 +214,7 @@ export const Config: z<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'] as const),
     enabled: z.boolean(),
     sizeMap: z.object({
       square: z.string().min(1).max(64),
@@ -269,6 +279,10 @@ export function resolveConfig(config: Config | undefined): ResolvedConfig {
     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 === undefined ? DEFAULT_SIZE_MAP : engine.sizeMap
     for (const key of ['square', 'landscape', 'portrait', 'auto'] as const) {
       const value = sizeMap[key]
@@ -295,6 +309,7 @@ export function resolveConfig(config: Config | undefined): ResolvedConfig {
       baseUrl: baseUrl.replace(/\/+$/u, ''),
       model,
       apiKeyRef,
+      provider,
       enabled,
       sizeMap: Object.freeze({ ...sizeMap }),
       qualitySupported,

package/src/event-gate.ts

@@ -3,9 +3,11 @@
  * package's types, so it sits outside every host's `KNOWN_SESSION_EVENT_TYPES`:
  * hosts whose session reader validates a static whitelist (rc.6/rc.7) refuse to
  * reopen a session containing the event unless it carries the `ignorable`
- * envelope — and those hosts' `Session.append` cannot stamp it. The gate
- * therefore appends only when the type is host-known or a mount-time probe
- * proves envelope support; otherwise the accounting payload goes to the
+ * envelope — and those hosts' `Session.append` cannot stamp it. The
+ * `0.1.2-alpha.1` host removed the envelope entirely and fails closed on
+ * unknown event types at read, so the probe never reports support there. The
+ * gate therefore appends only when the type is host-known or a mount-time
+ * probe proves envelope support; otherwise the accounting payload goes to the
  * in-memory fallback ledger (see session-events.ts) so quota keeps working for
  * the live session without poisoning the log.
  *
@@ -44,15 +46,16 @@ export function makeEventGate(knownTypes: ReadonlySet<string>, ignorableAppend =
   }
 }
 
-/** The append face the probe needs; rc.6 types declare no envelope parameter. */
+/** The append face the probe needs; envelope-less hosts declare no options parameter. */
 type EnvelopeAppend = (type: string, data: unknown, opts: { ignorable: boolean }) => { ignorable?: boolean } | undefined
 
 /**
  * Probe whether the host `Session.append` stamps the ignorable envelope. Runs
  * on a fully detached SessionStore — never host persistence — appending one
  * probe event with `{ ignorable: true }` and reading the marker back. rc.6's
- * append silently drops the unknown options key (probe false); every failure
- * is contained as "unsupported".
+ * append silently drops the unknown options key (probe false), and the
+ * envelope-less `0.1.2-alpha.1` append takes no options at all (probe false);
+ * every failure is contained as "unsupported".
  *
  * @returns whether the envelope is honored.
  */