dsh-comfyui 0.5.1 → 0.5.3

package/lib/index.js

@@ -1,10 +1,10 @@
 import { homedir } from 'node:os';
 import { isAbsolute, join } from 'node:path';
-import { Config } from './config.js';
+import { Config, resolveConfig } from './config.js';
 import { ComfyUIClient, CLIENT_ID } from './comfyui.js';
 import { ComfyUIStore } from './store.js';
 import { QueueTracker } from './queue.js';
-import { convertGraphToApi } from './convert.js';
+import { convertGraphToApi, flattenDynamicCombos } from './convert.js';
 import { analyzeGraph } from './analyze.js';
 import { ProgressTracker } from './progress.js';
 import { COMFYUI_SKILL } from './skill.js';
@@ -66,23 +66,10 @@ function defaultDataDir() {
  * (defaults applied), then hands the resolved object to apply.
  */
 export async function apply(ctx, entryConfig) {
-    const resolved = {
-        baseUrl: entryConfig.baseUrl ?? 'http://127.0.0.1:8188',
-        apiKeyEnv: entryConfig.apiKeyEnv ?? 'COMFYUI_API_KEY',
-        connectTimeoutMs: entryConfig.connectTimeoutMs ?? 10_000,
-        timeoutMs: entryConfig.timeoutMs ?? 900_000,
-        pollIntervalMs: entryConfig.pollIntervalMs ?? 1_000,
-        maxMediaItems: entryConfig.maxMediaItems ?? 12,
-        maxMediaBytes: entryConfig.maxMediaBytes ?? 64 * 1024 * 1024,
-        dataDir: entryConfig.dataDir !== undefined && entryConfig.dataDir !== '' ? entryConfig.dataDir : defaultDataDir(),
-        maxAssets: entryConfig.maxAssets ?? 200,
-        skillsDir: entryConfig.skillsDir ?? '',
-        mediaHost: entryConfig.mediaHost ?? '',
-        outputDir: entryConfig.outputDir ?? '',
-        comfyuiDirs: Array.isArray(entryConfig.comfyuiDirs)
-            ? entryConfig.comfyuiDirs.filter((dir) => typeof dir === 'string' && dir.trim() !== '')
-            : [],
-    };
+    // Volatile fields arrive as references on dsh 0.1.7+ (plain values on older
+    // hosts); `resolved` is the one plain object every consumer reads, refreshed
+    // in place when the Loader commits a settings-page change.
+    const resolved = resolveConfig(entryConfig, defaultDataDir());
     const store = new ComfyUIStore(resolved.dataDir, resolved.maxAssets);
     await store.init();
     // Per-workflow skill packs default to `<dataDir>/skills`; `skillsDir` moves
@@ -113,11 +100,27 @@ export async function apply(ctx, entryConfig) {
     // only broadcasts them to the submitting client. Node's global WebSocket
     // (undici) cannot set auth headers, so a remote server behind an
     // authenticating proxy simply shows no progress.
+    const progressUrl = () => resolved.baseUrl.replace(/^http:/, 'ws:').replace(/^https:/, 'wss:').replace(/\/$/, '') + `/ws?clientId=${CLIENT_ID}`;
+    let attachedUrl = progressUrl();
     ctx.effect(() => {
-        const wsUrl = resolved.baseUrl.replace(/^http:/, 'ws:').replace(/^https:/, 'wss:').replace(/\/$/, '') + `/ws?clientId=${CLIENT_ID}`;
-        progress.attach(wsUrl);
+        progress.attach(attachedUrl);
         return () => progress.dispose();
     }, 'dsh-comfyui: progress');
+    /** Pick up a new config in place; a new baseUrl re-points the progress socket. */
+    const refreshConfig = (next) => {
+        Object.assign(resolved, next);
+        const url = progressUrl();
+        if (url !== attachedUrl) {
+            attachedUrl = url;
+            progress.dispose();
+            progress.attach(url);
+        }
+    };
+    // dsh 0.1.7+: a settings-page save commits volatile values into the same
+    // references without restarting the plugin, then notifies this fiber.
+    ctx.on('loader/volatile-update', (() => {
+        refreshConfig(resolveConfig(entryConfig, defaultDataDir()));
+    }));
     const hostHint = createHostHint();
     const runtime = {
         getConfig: () => resolved,
@@ -164,7 +167,8 @@ export async function apply(ctx, entryConfig) {
         },
         queue: async (workflow, meta) => {
             const client = runtime.createClient(await resolveApiKey(ctx, resolved.apiKeyEnv));
-            let prompt = workflow;
+            // Heals library entries saved with the pre-0.5.2 wrapped DynamicCombo shape (Issue #10).
+            let prompt = flattenDynamicCombos(workflow);
             if (meta.parameters !== undefined && meta.parameters.length > 0) {
                 const objectInfo = await objectInfoCached(client);
                 const slots = await store.loadSlots();
@@ -322,18 +326,25 @@ export async function apply(ctx, entryConfig) {
     let source = () => resolved;
     ctx.inject(['settings'], (settingsCtx) => {
         const settings = settingsCtx.settings;
-        if (typeof settings.installSection !== 'function') {
-            ctx.logger.warn('comfyui: settings service lacks installSection — settings page stays read-only, entry config stands');
+        if (typeof settings.installSection === 'function') {
+            // dsh 0.1.2–0.1.5: the section registry keeps its own copy of the values.
+            settings.installSection(ctx, COMFYUI_NS, Config, resolved, {
+                setSource: (current) => {
+                    source = current;
+                },
+                onChange: () => {
+                    refreshConfig(resolveConfig(source(), defaultDataDir()));
+                },
+            });
             return;
         }
-        settings.installSection(ctx, COMFYUI_NS, Config, resolved, {
-            setSource: (current) => {
-                source = current;
-            },
-            onChange: () => {
-                Object.assign(resolved, source());
-            },
-        });
+        // dsh 0.1.7+: forms are projected from the volatile Config fields and a
+        // save arrives through loader/volatile-update above. This plugin ships its
+        // own settings page, so opt out of any auto-generated one.
+        if (typeof settings.configure === 'function') {
+            const configure = settings.configure.bind(settings);
+            settingsCtx.effect(() => configure({ auto: false }, ctx.fiber), 'dsh-comfyui: settings page policy');
+        }
     });
     ctx.effect(() => {
         const disposers = registerComfyUITools(ctx, runtime);

package/lib/routes.js

@@ -250,7 +250,14 @@ export function mountComfyUIRoutes(ctx, runtime) {
                 });
             }
             catch (error) {
-                sendJson(response, 200, { ok: false, error: errorMessage(error), latencyMs: Date.now() - startedAt });
+                // Name the probed address: a save that never persisted leaves the
+                // default 127.0.0.1:8188 in force, and a bare "fetch failed" reads
+                // like a network problem with the address the user typed (Issue #11).
+                sendJson(response, 200, {
+                    ok: false,
+                    error: `${errorMessage(error)}（探测地址 ${runtime.getConfig().baseUrl}）`,
+                    latencyMs: Date.now() - startedAt,
+                });
             }
         }),
     }));
@@ -1428,7 +1435,12 @@ export function mountComfyUIRoutes(ctx, runtime) {
                 const client = runtime.createClient(await runtime.getApiKey());
                 const entry = await client.getHistory(promptId);
                 if (entry === undefined) {
-                    sendJson(response, 200, { ok: true, status: 'unknown' });
+                    // No history entry: still waiting in ComfyUI's queue, or evicted.
+                    // Tell the two apart so the background card keeps polling a long
+                    // queue instead of timing it out as "gone".
+                    const queue = await client.getQueue();
+                    const waiting = [...queue.queue_running, ...queue.queue_pending].some((item) => item.prompt_id === promptId);
+                    sendJson(response, 200, { ok: true, status: waiting ? 'queued' : 'unknown' });
                     return;
                 }
                 const statusStr = entry.status?.status_str;

package/lib/tools.js

@@ -263,7 +263,7 @@ function summarizeFields(fields, required) {
         else if (typeof typeOrList === 'string') {
             entry.type = typeOrList;
         }
-        if (optionsRecord !== undefined && 'default' in optionsRecord) {
+        if (optionsRecord !== undefined && optionsRecord.default !== undefined) {
             entry.default = optionsRecord.default;
         }
         out.push(entry);
@@ -307,16 +307,23 @@ function objectInfoDefinition(runtime) {
                 : entries.filter(([name]) => name.toLowerCase().includes(filter));
             const nodes = filtered.slice(0, 60).map(([classType, def]) => ({
                 class_type: classType,
-                display_name: def.display_name,
+                // Omitted rather than assigned undefined: a key holding undefined makes the
+                // whole result fail DSH's lossless-JSON validation. The render type already
+                // declares display_name optional.
+                ...(def.display_name !== undefined ? { display_name: def.display_name } : {}),
                 description: (def.description ?? '').slice(0, 200),
                 required: summarizeFields(def.input?.required, true),
                 optional: summarizeFields(def.input?.optional, false),
             }));
+            const hint = filtered.length > nodes.length
+                ? `filter matched ${filtered.length} nodes, showing first ${nodes.length} — narrow the filter for more`
+                : undefined;
             return {
                 total: entries.length,
                 shown: nodes.length,
                 filter: filter ?? null,
-                hint: filtered.length > nodes.length ? `filter matched ${filtered.length} nodes, showing first ${nodes.length} — narrow the filter for more` : undefined,
+                // Omitted rather than assigned undefined, same reason as display_name.
+                ...(hint !== undefined ? { hint } : {}),
                 nodes,
             };
         },
@@ -409,12 +416,13 @@ function workflowDefinition(runtime, ctx) {
                             lines.push(`  技能包${skill.required ? '（运行前必读）' : ''}: ${skill.summary}${extra} — 运行前先 action: skill { id: "${workflow.id}" }`);
                         }
                         for (const param of workflow.parameters ?? []) {
-                            const def = typeof param.default === 'string' ? `"${param.default}"` : String(param.default);
+                            const label = param.label ?? param.name;
+                            const def = param.default === undefined ? '' : `，默认 ${typeof param.default === 'string' ? `"${param.default}"` : String(param.default)}`;
                             const options = Array.isArray(param.options) && param.options.length > 0 ? `，可选: ${param.options.join(' / ')}` : '';
                             const upload = param.upload !== undefined
                                 ? `，上传类型: ${param.upload}${param.upload === 'media' ? `（${param.subfolder ?? ''}/，空值=移除该参考位）` : ''}`
                                 : '';
-                            lines.push(`  ${param.name}(${param.label}${param.random === true ? '，随机' : ''}，默认 ${def}${options}${upload})`);
+                            lines.push(`  ${param.name}(${label}${param.random === true ? '，随机' : ''}${def}${options}${upload})`);
                         }
                     }
                     const loadArea = data.loadArea;
@@ -506,7 +514,13 @@ function workflowDefinition(runtime, ctx) {
                         parameters: (parameters ?? []).map(({ name: pname, label, type, default: def, random, numberKind, options, upload }) => {
                             // DSH validates tool output as lossless JSON: JSON.stringify drops
                             // undefined keys, so omit optional fields instead of passing undefined.
-                            const entry = { name: pname, label, type, default: def };
+                            const entry = { name: pname };
+                            if (label !== undefined)
+                                entry.label = label;
+                            if (type !== undefined)
+                                entry.type = type;
+                            if (def !== undefined)
+                                entry.default = def;
                             if (random !== undefined)
                                 entry.random = random;
                             // Tells the model whether decimals are accepted; absent means the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-comfyui",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Let the DeepSeek Harness agent smartly drive a local or remote ComfyUI to generate anything, with workflow and asset management panels, per-workflow skill packs, a companion skill and a same-origin media proxy. / 让 DeepSeek Harness 的 Agent 智能驱动本地或远程 ComfyUI 生成任何内容。附带工作流、资产管理面板与技能包管理挂载。配套 skill 与同源媒体代理。",
   "repository": {
     "type": "git",
@@ -49,12 +49,12 @@
     "node": ">=22.19"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.0",
+    "@deepseek-ai/schemastery": "^3.18.4",
     "fflate": "^0.8.3"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.4"
+    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.4 || ^0.1.5-alpha.1 || ^0.1.6-alpha.1 || ^0.1.7-alpha.1"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",