dsh-image-gen 0.2.3 → 0.2.5

package/lib/types/config.d.ts

@@ -1,7 +1,7 @@
 /** User-facing configuration for supported image providers. */
 import z from '@deepseek-ai/schemastery';
-import { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_COMFYUI_BASE_URL, DEFAULT_COMFYUI_TIMEOUT_MS, DEFAULT_COMFYUI_WORKFLOW_LABEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, type ImageProvider } from './shared.js';
-export { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_COMFYUI_BASE_URL, DEFAULT_COMFYUI_TIMEOUT_MS, DEFAULT_COMFYUI_WORKFLOW_LABEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, type ImageProvider, };
+import { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_COMFYUI_BASE_URL, DEFAULT_COMFYUI_TIMEOUT_MS, DEFAULT_COMFYUI_WORKFLOW_LABEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, activeComfyUIWorkflow, resolveComfyUIWorkflows, type ComfyUIWorkflowEntry, type ImageProvider } from './shared.js';
+export { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_COMFYUI_BASE_URL, DEFAULT_COMFYUI_TIMEOUT_MS, DEFAULT_COMFYUI_WORKFLOW_LABEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, activeComfyUIWorkflow, resolveComfyUIWorkflows, type ComfyUIWorkflowEntry, type ImageProvider, };
 /** Default workspace subfolder that receives generated image files. */
 export declare const DEFAULT_WORKSPACE_FOLDER = "dsh-image-gen";
 /** Google API credential reference. */
@@ -29,9 +29,13 @@ export interface Config {
     dashscopeEndpoint?: string;
     dashscopeModel?: string;
     comfyuiBaseURL?: string;
-    /** ComfyUI API-format workflow JSON imported through the Web settings page. */
+    /** Named ComfyUI workflows managed by the Web settings page. */
+    comfyuiWorkflows?: ComfyUIWorkflowEntry[];
+    /** Name of the workflow ComfyUI calls use by default. */
+    comfyuiActiveWorkflow?: string;
+    /** Legacy single-workflow storage; synced to the active entry for downgrades. */
     comfyuiWorkflowJson?: string;
-    /** Original imported file name, used as a human-readable result label. */
+    /** Original imported file name of the legacy single workflow. */
     comfyuiWorkflowName?: string;
     comfyuiTimeoutMs?: number;
     /** Also write every generated image as a file under the session workspace. */
@@ -70,7 +74,12 @@ export declare function resolveProvider(config: Config): {
 } | {
     provider: 'comfyui';
     baseURL: string;
-    workflowJson: string;
-    workflowName: string;
+    workflows: ComfyUIWorkflowEntry[];
+    workflow?: ComfyUIWorkflowEntry;
     timeoutMs: number;
 };
+/** The workflow a ComfyUI call runs: the requested name when given, else the active one. */
+export declare function selectComfyUIWorkflow(active: {
+    workflows: ComfyUIWorkflowEntry[];
+    workflow?: ComfyUIWorkflowEntry;
+}, requested?: string): ComfyUIWorkflowEntry;

package/lib/types/shared.d.ts

@@ -20,5 +20,36 @@ export declare const DEFAULT_GOOGLE_MODEL = "gemini-3.1-flash-image";
 export declare const DEFAULT_OPENAI_MODEL = "gpt-image-2";
 export declare const DEFAULT_SEEDREAM_MODEL = "doubao-seedream-5-0-260128";
 export declare const DEFAULT_DASHSCOPE_MODEL = "qwen-image-3.0";
+/** One named ComfyUI API-format workflow imported through settings. */
+export interface ComfyUIWorkflowEntry {
+    /** Unique human-readable label; used as the result model and by tool calls. */
+    name: string;
+    /** API-format workflow JSON with {{prompt}} / {{seed}} and optional {{image}} placeholders. */
+    json: string;
+    /** Optional preset prepended to the user prompt on every call of this workflow. */
+    presetPrompt?: string;
+}
+/** Raw ComfyUI workflow fields as persisted through DSH Settings. */
+export interface ComfyUIWorkflowSource {
+    /** Named workflows managed by the Web settings page. */
+    comfyuiWorkflows?: readonly ComfyUIWorkflowEntry[];
+    /** Name of the entry ComfyUI calls use by default. */
+    comfyuiActiveWorkflow?: string;
+    /** Legacy single-workflow storage; synced to the active entry for downgrades. */
+    comfyuiWorkflowJson?: string;
+    comfyuiWorkflowName?: string;
+}
+/** Named workflows, falling back to the legacy single-workflow fields when the list is empty. */
+export declare function resolveComfyUIWorkflows(source: ComfyUIWorkflowSource): ComfyUIWorkflowEntry[];
+/** The workflow ComfyUI calls use by default: the configured active name, else the first entry. */
+export declare function activeComfyUIWorkflow(source: ComfyUIWorkflowSource): ComfyUIWorkflowEntry | undefined;
+/** Derive a workflow label that does not collide with the given existing names. */
+export declare function uniqueComfyUIWorkflowName(name: string, existing: readonly string[]): string;
+/**
+ * Combine a workflow's preset with the user prompt: preset first, user second,
+ * joined by one comma — never doubled when the preset already ends in a
+ * separator, and reduced to the non-empty side when the other is blank.
+ */
+export declare function mergeComfyUIPrompt(preset: string | undefined, user: string): string;
 export declare const DEFAULT_MODELS: Record<ImageProvider, string>;
 export declare const DEFAULT_BASE_URLS: Record<ImageProvider, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-image-gen",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Bring ChatGPT-like image generation to DeepSeek Harness — Gemini, OpenAI, Seedream, DashScope, local ComfyUI & more.",
   "type": "module",
   "author": "shanliuling",
@@ -119,7 +119,7 @@
     "@deepseek-ai/dsh-credentials": "0.1.1-rc.2",
     "@deepseek-ai/dsh-host-webserver": "0.1.1-rc.2",
     "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.2-alpha.2",
     "@deepseek-ai/dsh-tools": "0.1.1-rc.2",
     "@deepseek-ai/schemastery": "3.18.1",
     "@types/node": "^22.20.0",
@@ -127,6 +127,7 @@
     "react": "^18.2.0",
     "tsdown": "^0.22.2",
     "typescript": "^6.0.3",
+    "unrun": "^0.3.1",
     "vitest": "^4.1.8"
   },
   "packageManager": "pnpm@11.7.0"