dsh-comfyui 0.5.3 → 0.5.4

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/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/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.3",
+  "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",