dsh-comfyui 0.5.2 → 0.5.4

package/README.en.md

@@ -20,10 +20,10 @@
 >
 > | dsh-comfyui | Paired DeepSeek Harness | Notes |
 > | --- | --- | --- |
-> | **0.4.0 (latest, `latest` tag)** | **>= 0.1.2** | From 0.4.0 this plugin uses the new settings service API |
+> | **0.5.x (latest, `latest` tag)** | **>= 0.1.2** (incl. 0.1.5 / 0.1.6 / 0.1.7 prereleases) | From 0.5.3 the settings page works with dsh 0.1.7's settings model (saves apply live, no restart) |
 > | **0.3.x (beta line, `beta` tag)** | **0.1.1** | On older dsh versions stay on the 0.3.x line |
 >
-> Install: `dsh plugin --profile web add dsh-comfyui` (latest 0.4.0) / `dsh plugin --profile web add dsh-comfyui@beta` (0.3.x for older hosts).
+> Install: `dsh plugin --profile web add dsh-comfyui` (latest 0.5.x) / `dsh plugin --profile web add dsh-comfyui@beta` (0.3.x for older hosts).
 
 ## Features
 

package/README.md

@@ -20,10 +20,10 @@
 >
 > | dsh-comfyui | 配对的 DeepSeek Harness | 说明 |
 > | --- | --- | --- |
-> | **0.4.0（最新，`latest` tag）** | **≥ 0.1.2** | 0.4.0 起使用新版 settings 服务 API |
+> | **0.5.x（最新，`latest` tag）** | **≥ 0.1.2**（含 0.1.5 / 0.1.6 / 0.1.7 预发布版） | 0.5.3 起兼容 dsh 0.1.7 的设置机制（设置页保存直接生效，无需重启） |
 > | **0.3.x（beta 线，`beta` tag）** | **0.1.1** | 老版本 dsh 请留在 0.3.x 线 |
 >
-> 安装：`dsh plugin --profile web add dsh-comfyui`（装最新 0.4.0）/ `dsh plugin --profile web add dsh-comfyui@beta`（老宿主装 0.3.x）。
+> 安装：`dsh plugin --profile web add dsh-comfyui`（装最新 0.5.x）/ `dsh plugin --profile web add dsh-comfyui@beta`（老宿主装 0.3.x）。
 
 ## 功能
 

package/lib/analyze.js

@@ -5,7 +5,7 @@
  * graph links (with bypassed and dangling nodes excluded). The analysis feeds
  * the extract (拆分) choices in the panel and the agent-facing skill.
  */
-import { normalizeLinks } from './graph.js';
+import { isVirtualNodeType, normalizeLinks, resolveVirtualLinks } from './graph.js';
 function isObject(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -28,11 +28,15 @@ export function analyzeGraph(graph) {
         return { ok: false, error: '无法解析图文件（缺少 nodes/links）' };
     }
     const nodes = graph.nodes;
-    const links = normalizeLinks(graph.links);
+    // Virtual nodes (Set/Get wireless links, rgthree mode relays) are rewired
+    // out first, exactly as conversion does, so components follow the real data
+    // flow and the virtual nodes themselves never show up as components or as
+    // dangling nodes (Issue #8).
+    const links = resolveVirtualLinks(graph.nodes, normalizeLinks(graph.links));
     const groups = Array.isArray(graph.groups) ? graph.groups : [];
-    const active = nodes.filter((node) => node.mode !== 4);
+    const active = nodes.filter((node) => node.mode !== 4 && !isVirtualNodeType(node.type));
     const activeById = new Map(active.map((node) => [node.id, node]));
-    const bypassedCount = nodes.length - active.length;
+    const bypassedCount = nodes.filter((node) => node.mode === 4).length;
     // Dangling nodes: active but touching no link at all.
     const linkedIds = new Set();
     for (const link of links) {

package/lib/config.d.ts

@@ -1,86 +1,93 @@
 /**
  * dsh-comfyui host configuration. The same schema drives the Loader entry
- * config (cordis.yml patch) and the `comfyui:` settings section the browser
- * settings page writes, so one shape covers both doors into the same values.
+ * config (cordis.yml patch) and the settings page, so one shape covers both
+ * doors into the same values.
+ *
+ * Fields the plugin reads at use time are `.volatile()`: since dsh 0.1.7 the
+ * settings service only edits volatile fields (anything else fails with
+ * "Plugin entry has no volatile fields", Issue #11), and the Loader commits a
+ * volatile-only change into the running references without restarting the
+ * plugin. `dataDir` / `maxAssets` / `outputDir` stay ordinary: the store is
+ * built from them at startup, so a change there restarts the plugin.
  */
 import z from '@deepseek-ai/schemastery';
-export declare const Config: z<Schemastery.ObjectS<{
+export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     /** ComfyUI HTTP server base URL. */
-    baseUrl: z<string, string>;
+    baseUrl: z<string, string, "volatile-defined">;
     /** Environment-variable name of the optional API key (credentials ref). */
-    apiKeyEnv: z<string, string>;
+    apiKeyEnv: z<string, string, "volatile-defined">;
     /** Per-request connect/read timeout for the ComfyUI HTTP client. */
-    connectTimeoutMs: z<number, number>;
+    connectTimeoutMs: z<number, number, "volatile-defined">;
     /** How long a synchronous generation (or background job) waits for workflow completion. */
-    timeoutMs: z<number, number>;
+    timeoutMs: z<number, number, "volatile-defined">;
     /** History polling interval while waiting for completion. */
-    pollIntervalMs: z<number, number>;
+    pollIntervalMs: z<number, number, "volatile-defined">;
     /** Max media items returned per completed workflow. */
-    maxMediaItems: z<number, number>;
+    maxMediaItems: z<number, number, "volatile-defined">;
     /** Max bytes the media proxy streams for one file. */
-    maxMediaBytes: z<number, number>;
+    maxMediaBytes: z<number, number, "volatile-defined">;
     /** Directory for plugin data (workflow library, asset index); empty means DSH_HOME/data/dsh-comfyui. */
-    dataDir: z<string, string>;
+    dataDir: z<string, string, "defined">;
     /** Max asset records kept in the asset index. */
-    maxAssets: z<number, number>;
+    maxAssets: z<number, number, "defined">;
     /** Directory holding the per-workflow skill packs. Empty = `<dataDir>/skills`.
      * Separate from `dataDir` on purpose: packs are documents a user may want on
      * another drive, in a synced folder, or under version control, while the
      * JSON state files belong with the rest of the plugin data. Must be absolute;
      * a relative value is ignored. */
-    skillsDir: z<string, string>;
+    skillsDir: z<string, string, "volatile-defined">;
     /** External base URL for generated media (e.g. http://192.168.1.5:3080). Empty = auto-detect the browser's request host, then http://127.0.0.1:<webServerPort>. */
-    mediaHost: z<string, string>;
+    mediaHost: z<string, string, "volatile-defined">;
     /** ComfyUI's output directory on this machine, used to delete asset files
      * from the panel. Empty = infer it from the file paths ComfyUI reports;
      * deletion falls back to removing the index record when neither works
      * (e.g. a ComfyUI running on another host). */
-    outputDir: z<string, string>;
+    outputDir: z<string, string, "defined">;
     /** ComfyUI install root(s) on this machine (absolute paths). Multiple
      * entries are allowed because ComfyUI folders can be mapped/mounted (extra
      * models dirs, several installs, portable copies). The agent reads them to
      * locate ComfyUI files directly (workflows, models, the TTS-Audio-Suite
      * voice library) without guessing or asking the user. */
-    comfyuiDirs: z<string[], string[]>;
-}>, Schemastery.ObjectT<{
+    comfyuiDirs: z<NoInfer<string[]>, NoInfer<string[]>, "volatile-defined">;
+}>>, Schemastery.ObjectT<NoInfer<{
     /** ComfyUI HTTP server base URL. */
-    baseUrl: z<string, string>;
+    baseUrl: z<string, string, "volatile-defined">;
     /** Environment-variable name of the optional API key (credentials ref). */
-    apiKeyEnv: z<string, string>;
+    apiKeyEnv: z<string, string, "volatile-defined">;
     /** Per-request connect/read timeout for the ComfyUI HTTP client. */
-    connectTimeoutMs: z<number, number>;
+    connectTimeoutMs: z<number, number, "volatile-defined">;
     /** How long a synchronous generation (or background job) waits for workflow completion. */
-    timeoutMs: z<number, number>;
+    timeoutMs: z<number, number, "volatile-defined">;
     /** History polling interval while waiting for completion. */
-    pollIntervalMs: z<number, number>;
+    pollIntervalMs: z<number, number, "volatile-defined">;
     /** Max media items returned per completed workflow. */
-    maxMediaItems: z<number, number>;
+    maxMediaItems: z<number, number, "volatile-defined">;
     /** Max bytes the media proxy streams for one file. */
-    maxMediaBytes: z<number, number>;
+    maxMediaBytes: z<number, number, "volatile-defined">;
     /** Directory for plugin data (workflow library, asset index); empty means DSH_HOME/data/dsh-comfyui. */
-    dataDir: z<string, string>;
+    dataDir: z<string, string, "defined">;
     /** Max asset records kept in the asset index. */
-    maxAssets: z<number, number>;
+    maxAssets: z<number, number, "defined">;
     /** Directory holding the per-workflow skill packs. Empty = `<dataDir>/skills`.
      * Separate from `dataDir` on purpose: packs are documents a user may want on
      * another drive, in a synced folder, or under version control, while the
      * JSON state files belong with the rest of the plugin data. Must be absolute;
      * a relative value is ignored. */
-    skillsDir: z<string, string>;
+    skillsDir: z<string, string, "volatile-defined">;
     /** External base URL for generated media (e.g. http://192.168.1.5:3080). Empty = auto-detect the browser's request host, then http://127.0.0.1:<webServerPort>. */
-    mediaHost: z<string, string>;
+    mediaHost: z<string, string, "volatile-defined">;
     /** ComfyUI's output directory on this machine, used to delete asset files
      * from the panel. Empty = infer it from the file paths ComfyUI reports;
      * deletion falls back to removing the index record when neither works
      * (e.g. a ComfyUI running on another host). */
-    outputDir: z<string, string>;
+    outputDir: z<string, string, "defined">;
     /** ComfyUI install root(s) on this machine (absolute paths). Multiple
      * entries are allowed because ComfyUI folders can be mapped/mounted (extra
      * models dirs, several installs, portable copies). The agent reads them to
      * locate ComfyUI files directly (workflows, models, the TTS-Audio-Suite
      * voice library) without guessing or asking the user. */
-    comfyuiDirs: z<string[], string[]>;
-}>>;
+    comfyuiDirs: z<NoInfer<string[]>, NoInfer<string[]>, "volatile-defined">;
+}>>, "plain">;
 export type Config = {
     /** ComfyUI HTTP server base URL. */
     baseUrl: string;
@@ -109,3 +116,12 @@ export type Config = {
     /** ComfyUI install root(s) on this machine; the agent uses them to locate files directly. */
     comfyuiDirs: string[];
 };
+/**
+ * Resolve the Loader's parsed entry config into the plain object the plugin
+ * reads. Call again after `loader/volatile-update`: the references are the
+ * same objects, now holding the new values.
+ * @param raw - parsed entry config; fields may be volatile references.
+ * @param defaultDataDir - data directory used when `dataDir` is empty.
+ * @returns a fully populated plain config.
+ */
+export declare function resolveConfig(raw: Partial<Record<keyof Config, unknown>>, defaultDataDir: string): Config;

package/lib/config.js

@@ -1,24 +1,31 @@
 /**
  * dsh-comfyui host configuration. The same schema drives the Loader entry
- * config (cordis.yml patch) and the `comfyui:` settings section the browser
- * settings page writes, so one shape covers both doors into the same values.
+ * config (cordis.yml patch) and the settings page, so one shape covers both
+ * doors into the same values.
+ *
+ * Fields the plugin reads at use time are `.volatile()`: since dsh 0.1.7 the
+ * settings service only edits volatile fields (anything else fails with
+ * "Plugin entry has no volatile fields", Issue #11), and the Loader commits a
+ * volatile-only change into the running references without restarting the
+ * plugin. `dataDir` / `maxAssets` / `outputDir` stay ordinary: the store is
+ * built from them at startup, so a change there restarts the plugin.
  */
 import z from '@deepseek-ai/schemastery';
 export const Config = z.object({
     /** ComfyUI HTTP server base URL. */
-    baseUrl: z.string().default('http://127.0.0.1:8188'),
+    baseUrl: z.string().default('http://127.0.0.1:8188').volatile(),
     /** Environment-variable name of the optional API key (credentials ref). */
-    apiKeyEnv: z.string().default('COMFYUI_API_KEY'),
+    apiKeyEnv: z.string().default('COMFYUI_API_KEY').volatile(),
     /** Per-request connect/read timeout for the ComfyUI HTTP client. */
-    connectTimeoutMs: z.number().min(1_000).max(60_000).default(10_000),
+    connectTimeoutMs: z.number().min(1_000).max(60_000).default(10_000).volatile(),
     /** How long a synchronous generation (or background job) waits for workflow completion. */
-    timeoutMs: z.number().min(5_000).max(3_600_000).default(900_000),
+    timeoutMs: z.number().min(5_000).max(3_600_000).default(900_000).volatile(),
     /** History polling interval while waiting for completion. */
-    pollIntervalMs: z.number().min(200).max(10_000).default(1_000),
+    pollIntervalMs: z.number().min(200).max(10_000).default(1_000).volatile(),
     /** Max media items returned per completed workflow. */
-    maxMediaItems: z.number().min(1).max(50).default(12),
+    maxMediaItems: z.number().min(1).max(50).default(12).volatile(),
     /** Max bytes the media proxy streams for one file. */
-    maxMediaBytes: z.number().min(64 * 1024).max(512 * 1024 * 1024).default(64 * 1024 * 1024),
+    maxMediaBytes: z.number().min(64 * 1024).max(512 * 1024 * 1024).default(64 * 1024 * 1024).volatile(),
     /** Directory for plugin data (workflow library, asset index); empty means DSH_HOME/data/dsh-comfyui. */
     dataDir: z.string().default(''),
     /** Max asset records kept in the asset index. */
@@ -28,9 +35,9 @@ export const Config = z.object({
      * another drive, in a synced folder, or under version control, while the
      * JSON state files belong with the rest of the plugin data. Must be absolute;
      * a relative value is ignored. */
-    skillsDir: z.string().default(''),
+    skillsDir: z.string().default('').volatile(),
     /** External base URL for generated media (e.g. http://192.168.1.5:3080). Empty = auto-detect the browser's request host, then http://127.0.0.1:<webServerPort>. */
-    mediaHost: z.string().default(''),
+    mediaHost: z.string().default('').volatile(),
     /** ComfyUI's output directory on this machine, used to delete asset files
      * from the panel. Empty = infer it from the file paths ComfyUI reports;
      * deletion falls back to removing the index record when neither works
@@ -41,5 +48,45 @@ export const Config = z.object({
      * models dirs, several installs, portable copies). The agent reads them to
      * locate ComfyUI files directly (workflows, models, the TTS-Audio-Suite
      * voice library) without guessing or asking the user. */
-    comfyuiDirs: z.array(z.string()).default([]),
+    comfyuiDirs: z.array(z.string()).default([]).volatile(),
 });
+/** The volatile-reference protocol shared across cosmokit copies (Symbol.for). */
+const VOLATILE_WRITE = Symbol.for('cosmokit.volatile.write');
+/** Read a config value that may be a volatile reference (dsh 0.1.7+) or a plain value (older hosts). */
+function current(value) {
+    if (typeof value === 'object' && value !== null && VOLATILE_WRITE in value) {
+        return value.get();
+    }
+    return value;
+}
+/**
+ * Resolve the Loader's parsed entry config into the plain object the plugin
+ * reads. Call again after `loader/volatile-update`: the references are the
+ * same objects, now holding the new values.
+ * @param raw - parsed entry config; fields may be volatile references.
+ * @param defaultDataDir - data directory used when `dataDir` is empty.
+ * @returns a fully populated plain config.
+ */
+export function resolveConfig(raw, defaultDataDir) {
+    const str = (value, fallback) => (typeof value === 'string' ? value : fallback);
+    const num = (value, fallback) => (typeof value === 'number' ? value : fallback);
+    const dataDir = str(current(raw.dataDir), '');
+    const dirs = current(raw.comfyuiDirs);
+    return {
+        baseUrl: str(current(raw.baseUrl), 'http://127.0.0.1:8188'),
+        apiKeyEnv: str(current(raw.apiKeyEnv), 'COMFYUI_API_KEY'),
+        connectTimeoutMs: num(current(raw.connectTimeoutMs), 10_000),
+        timeoutMs: num(current(raw.timeoutMs), 900_000),
+        pollIntervalMs: num(current(raw.pollIntervalMs), 1_000),
+        maxMediaItems: num(current(raw.maxMediaItems), 12),
+        maxMediaBytes: num(current(raw.maxMediaBytes), 64 * 1024 * 1024),
+        dataDir: dataDir !== '' ? dataDir : defaultDataDir,
+        maxAssets: num(current(raw.maxAssets), 200),
+        skillsDir: str(current(raw.skillsDir), ''),
+        mediaHost: str(current(raw.mediaHost), ''),
+        outputDir: str(current(raw.outputDir), ''),
+        comfyuiDirs: Array.isArray(dirs)
+            ? dirs.filter((dir) => typeof dir === 'string' && dir.trim() !== '')
+            : [],
+    };
+}

package/lib/convert.js

@@ -7,7 +7,7 @@
  * Reroute / bypassed (mode 4) nodes are skipped with their links rewired.
  * Nodes the conversion cannot represent fail loudly with the offending type.
  */
-import { normalizeLinks } from './graph.js';
+import { isVirtualNodeType, normalizeLinks, resolveVirtualLinks } from './graph.js';
 /** Node types that exist only in the UI and carry no data flow. */
 const UI_ONLY = new Set(['Note', 'StickyNote', 'Reroute', 'Fast Groups Bypasser (rgthree)']);
 function isObject(value) {
@@ -253,7 +253,9 @@ export function convertGraphToApi(graph, objectInfo, options) {
     // normalizeLinks accepts both the legacy positional rows and the v0.4
     // frontend's object entries; anything unreadable is skipped, exactly like
     // the old array-only guard did.
-    for (const link of normalizeLinks(rawLinks))
+    // Set/Get wireless links and rgthree mode relays are rewired out before
+    // anything resolves a link (Issue #8), shared with analyzeGraph.
+    for (const link of resolveVirtualLinks(rawNodes, normalizeLinks(rawLinks)))
         links.set(link[0], link);
     const nodesById = new Map(nodes.map((node) => [node.id, node]));
     const included = options?.includeNodeIds;
@@ -272,7 +274,7 @@ export function convertGraphToApi(graph, objectInfo, options) {
     const brokenInputs = new Map();
     const dropReasons = new Map();
     for (const node of candidates) {
-        if (node.type === '' || UI_ONLY.has(node.type))
+        if (node.type === '' || UI_ONLY.has(node.type) || isVirtualNodeType(node.type))
             continue;
         if (node.mode === 4)
             continue;

package/lib/graph.d.ts

@@ -13,3 +13,32 @@ export type GraphLink = [number, number, number, number, number, string];
 export declare function normalizeLink(raw: unknown): GraphLink | undefined;
 /** Normalize a whole `links` array, skipping entries that are not readable. */
 export declare function normalizeLinks(raw: unknown): GraphLink[];
+/**
+ * Frontend-only nodes whose links are rewired or dropped before analysis and
+ * conversion (Issue #8). None of them exists on the server.
+ *
+ * - KJNodes `SetNode` / `GetNode`: "wireless" links paired by name. A GetNode's
+ *   output is the value wired into the SetNode of the same name (and a
+ *   SetNode's own passthrough output is its input).
+ * - rgthree `Mute / Bypass Relay` / `Repeater`: their `OPT_CONNECTION` links
+ *   only propagate mute/bypass mode between nodes and carry no data. The mode
+ *   they set is already saved on each target node, so the links are dropped.
+ */
+export declare const SET_NODE = "SetNode";
+export declare const GET_NODE = "GetNode";
+/** Whether a node type is one of the virtual nodes {@link resolveVirtualLinks} removes. */
+export declare function isVirtualNodeType(type: string): boolean;
+/**
+ * Rewire the virtual nodes out of a graph's links, keeping link ids stable so
+ * node `inputs[].link` references stay valid.
+ *
+ * A GetNode resolves to the SetNode of the same name with the greatest `order`
+ * below its own (the scope rule the frontend applies), falling back to any
+ * SetNode of that name. A GetNode without a matching, wired SetNode (e.g. an
+ * empty optional slot) resolves to nothing, so its consumer stays unconnected.
+ * @param rawNodes - the graph's `nodes` array as saved.
+ * @param links - normalized links.
+ * @returns links with virtual-node hops replaced by their real origins, and
+ *   every link touching a virtual node otherwise removed.
+ */
+export declare function resolveVirtualLinks(rawNodes: unknown, links: GraphLink[]): GraphLink[];

package/lib/graph.js

@@ -46,3 +46,102 @@ export function normalizeLinks(raw) {
     }
     return links;
 }
+/**
+ * Frontend-only nodes whose links are rewired or dropped before analysis and
+ * conversion (Issue #8). None of them exists on the server.
+ *
+ * - KJNodes `SetNode` / `GetNode`: "wireless" links paired by name. A GetNode's
+ *   output is the value wired into the SetNode of the same name (and a
+ *   SetNode's own passthrough output is its input).
+ * - rgthree `Mute / Bypass Relay` / `Repeater`: their `OPT_CONNECTION` links
+ *   only propagate mute/bypass mode between nodes and carry no data. The mode
+ *   they set is already saved on each target node, so the links are dropped.
+ */
+export const SET_NODE = 'SetNode';
+export const GET_NODE = 'GetNode';
+const MODE_LINK_NODES = new Set(['Mute / Bypass Relay (rgthree)', 'Mute / Bypass Repeater (rgthree)']);
+/** Whether a node type is one of the virtual nodes {@link resolveVirtualLinks} removes. */
+export function isVirtualNodeType(type) {
+    return type === SET_NODE || type === GET_NODE || MODE_LINK_NODES.has(type);
+}
+function virtualNodeFacts(raw) {
+    if (!isObject(raw))
+        return undefined;
+    const id = typeof raw.id === 'number' ? raw.id : Number(raw.id);
+    if (!Number.isFinite(id))
+        return undefined;
+    const values = Array.isArray(raw.widgets_values) ? raw.widgets_values : [];
+    const name = typeof values[0] === 'string' && values[0].trim() !== '' ? values[0] : undefined;
+    const inputs = Array.isArray(raw.inputs) ? raw.inputs : [];
+    const wired = inputs.find((entry) => isObject(entry) && typeof entry.link === 'number');
+    return {
+        id,
+        type: typeof raw.type === 'string' ? raw.type : '',
+        order: typeof raw.order === 'number' ? raw.order : Number.MAX_SAFE_INTEGER,
+        name,
+        firstInputLink: wired?.link,
+    };
+}
+/**
+ * Rewire the virtual nodes out of a graph's links, keeping link ids stable so
+ * node `inputs[].link` references stay valid.
+ *
+ * A GetNode resolves to the SetNode of the same name with the greatest `order`
+ * below its own (the scope rule the frontend applies), falling back to any
+ * SetNode of that name. A GetNode without a matching, wired SetNode (e.g. an
+ * empty optional slot) resolves to nothing, so its consumer stays unconnected.
+ * @param rawNodes - the graph's `nodes` array as saved.
+ * @param links - normalized links.
+ * @returns links with virtual-node hops replaced by their real origins, and
+ *   every link touching a virtual node otherwise removed.
+ */
+export function resolveVirtualLinks(rawNodes, links) {
+    const facts = new Map();
+    for (const raw of Array.isArray(rawNodes) ? rawNodes : []) {
+        const node = virtualNodeFacts(raw);
+        if (node !== undefined && isVirtualNodeType(node.type))
+            facts.set(node.id, node);
+    }
+    if (facts.size === 0)
+        return links;
+    const linkById = new Map(links.map((link) => [link[0], link]));
+    const setters = new Map();
+    for (const node of facts.values()) {
+        if (node.type !== SET_NODE || node.name === undefined)
+            continue;
+        const list = setters.get(node.name) ?? [];
+        list.push(node);
+        setters.set(node.name, list);
+    }
+    const setterFor = (getter) => {
+        const candidates = getter.name === undefined ? [] : setters.get(getter.name) ?? [];
+        const before = candidates.filter((node) => node.order < getter.order);
+        const pool = before.length > 0 ? before : candidates;
+        return pool.reduce((best, node) => (best === undefined || node.order > best.order ? node : best), undefined);
+    };
+    /** The real [originId, originSlot] behind an origin, or undefined when it resolves to nothing. */
+    const realOrigin = (originId, originSlot, seen) => {
+        const node = facts.get(originId);
+        if (node === undefined)
+            return [originId, originSlot];
+        if (seen.has(originId))
+            return undefined;
+        seen.add(originId);
+        if (MODE_LINK_NODES.has(node.type))
+            return undefined;
+        const source = node.type === GET_NODE ? setterFor(node) : node;
+        const upstream = source?.firstInputLink === undefined ? undefined : linkById.get(source.firstInputLink);
+        return upstream === undefined ? undefined : realOrigin(upstream[1], upstream[2], seen);
+    };
+    const out = [];
+    for (const link of links) {
+        // Links INTO a virtual node only feed the resolution above.
+        if (facts.has(link[3]))
+            continue;
+        const origin = realOrigin(link[1], link[2], new Set());
+        if (origin === undefined)
+            continue;
+        out.push(origin[0] === link[1] && origin[1] === link[2] ? link : [link[0], origin[0], origin[1], link[3], link[4], link[5]]);
+    }
+    return out;
+}

package/lib/index.d.ts

@@ -21,4 +21,4 @@ export declare const inject: string[];
  * The plugin body. The loader validates the entry config against `Config`
  * (defaults applied), then hands the resolved object to apply.
  */
-export declare function apply(ctx: Context, entryConfig: Partial<ConfigType>): Promise<void>;
+export declare function apply(ctx: Context, entryConfig: Partial<Record<keyof ConfigType, unknown>>): Promise<void>;

package/lib/index.js

@@ -1,6 +1,6 @@
 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';
@@ -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,
@@ -323,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/skill.js

@@ -66,6 +66,9 @@ TTS-Audio-Suite（\`{comfyuiDir}/custom_nodes/tts_audio_suite\`）的"🎭 Chara
 - **\`control_after_generate\` 占位**：名为 \`seed\`/\`noise_seed\` 的 INT（或 object_info 显式声明 \`control_after_generate\`）前面端会渲染生成后控制下拉，其值占据 widgets_values 一个槽位但无 API 输入——提取时消费该值但不写入工作流，否则后续 widget 全部错位（如 TTS-Audio-Suite 的 seed 后跟 "fixed"）。
 - **对象型 widgets_values**（如 VHS_VideoCombine）按名取值，跳过内部状态（\`videopreview\` 等带 \`hidden\` 的对象）。
 - **Reroute 与 bypass（mode 4）节点直通**：输出跟随其第一条有连线的输入。
+- **虚拟节点先改线再转换**（分析与转换共用同一规则）：KJNodes \`SetNode\`/\`GetNode\` 按名称配对——\`GetNode\` 的输出接到同名 \`SetNode\` 的上游（同名多个时取 \`order\` 小于它的最大者），找不到对应 \`SetNode\` 的消费端保持未连接；rgthree \`Mute / Bypass Relay\`/\`Repeater\` 的连线只传播静音/绕过状态、不传数据，直接丢弃（状态已保存在各节点的 \`mode\` 里）。
+- **DynamicCombo V3 保持扁平**：主输入的值是所选 option key 字符串，子控件以 \`主名.子名\` 平铺（如 \`codec: "auto"\`），不要包成 \`{ key, inputs }\`——服务端会自己重组，包起来反而匹配不上，节点在 execute 时报缺参数。
+- **子图（subgraph）实例不支持**：遇到请让用户在 ComfyUI 里把子图转换回普通节点后再提取。
 - **未注册的 UI-only 节点**：若是 \`Primitive*\` 内联其第一个 widget 值；有输出被使用且非 Primitive → 报错。
 - **输出槽位越界**（保存图里 SaveImage 声称 2 个输出但服务端只有 1 个）→ 断开该引用并给警告。
 - **必需输入缺失**（required 里没有、且非 lazy/template 类型）→ 明确报错（源图本身断线），不产出"能转但跑不起来"的工作流。\`COMFY_AUTOGROW_V3\`/带 \`template\`/带 \`lazy\` 的输入豁免。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-comfyui",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "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",