dsh-comfyui 0.5.0 → 0.5.1

package/lib/analyze.d.ts

@@ -20,7 +20,9 @@ export interface GraphGroupLike {
 }
 export interface GraphLike {
     nodes: GraphNodeLike[];
-    links: Array<[number, number, number, number, number, string] | number[]>;
+    /** Saved rows are positional or object entries depending on the frontend
+     * version — always consumed through {@link normalizeLinks}. */
+    links: unknown[];
     groups?: GraphGroupLike[];
 }
 export interface IsolatedNode {

package/lib/analyze.js

@@ -5,6 +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';
 function isObject(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -27,7 +28,7 @@ export function analyzeGraph(graph) {
         return { ok: false, error: '无法解析图文件（缺少 nodes/links）' };
     }
     const nodes = graph.nodes;
-    const links = graph.links;
+    const links = normalizeLinks(graph.links);
     const groups = Array.isArray(graph.groups) ? graph.groups : [];
     const active = nodes.filter((node) => node.mode !== 4);
     const activeById = new Map(active.map((node) => [node.id, node]));

package/lib/convert.d.ts

@@ -1,12 +1,3 @@
-/**
- * Convert a ComfyUI UI-graph workflow (the format the ComfyUI frontend saves
- * to the server via /api/userdata) into the API format accepted by POST
- * /prompt. Modeled on the frontend's convertToApiFormat: input links become
- * [nodeId, slot] references, widgets_values are zipped onto input names in
- * object_info order (control_after_generate is the extra seed widget), and
- * Reroute / bypassed (mode 4) nodes are skipped with their links rewired.
- * Nodes the conversion cannot represent fail loudly with the offending type.
- */
 export interface ApiWorkflow {
     [nodeId: string]: {
         class_type: string;

package/lib/convert.js

@@ -1,3 +1,13 @@
+/**
+ * Convert a ComfyUI UI-graph workflow (the format the ComfyUI frontend saves
+ * to the server via /api/userdata) into the API format accepted by POST
+ * /prompt. Modeled on the frontend's convertToApiFormat: input links become
+ * [nodeId, slot] references, widgets_values are zipped onto input names in
+ * object_info order (control_after_generate is the extra seed widget), and
+ * 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';
 /** 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) {
@@ -195,13 +205,11 @@ export function convertGraphToApi(graph, objectInfo, options) {
         };
     });
     const links = new Map();
-    for (const raw of rawLinks) {
-        if (!Array.isArray(raw) || raw.length < 6)
-            continue;
-        const link = raw;
-        if (typeof link[0] === 'number')
-            links.set(link[0], link);
-    }
+    // 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))
+        links.set(link[0], link);
     const nodesById = new Map(nodes.map((node) => [node.id, node]));
     const included = options?.includeNodeIds;
     const candidates = included !== undefined ? nodes.filter((node) => included.has(node.id)) : nodes;

package/lib/graph.d.ts

@@ -0,0 +1,15 @@
+/**
+ * ComfyUI UI-graph link normalization. The frontend changed how saved graphs
+ * serialize the `links` array: rows used to be positional
+ * (`[id, originId, originSlot, targetId, targetSlot, type]`), while the v0.4
+ * frontend writes object entries
+ * (`{ id, origin_id, origin_slot, target_id, target_slot, type }`). Analysis
+ * and conversion both want one canonical shape, so both go through
+ * {@link normalizeLinks} before touching a graph.
+ */
+/** Canonical link row: [linkId, originId, originSlot, targetId, targetSlot, type]. */
+export type GraphLink = [number, number, number, number, number, string];
+/** Normalize one link entry; undefined when the entry is not a readable link. */
+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[];

package/lib/graph.js

@@ -0,0 +1,48 @@
+/**
+ * ComfyUI UI-graph link normalization. The frontend changed how saved graphs
+ * serialize the `links` array: rows used to be positional
+ * (`[id, originId, originSlot, targetId, targetSlot, type]`), while the v0.4
+ * frontend writes object entries
+ * (`{ id, origin_id, origin_slot, target_id, target_slot, type }`). Analysis
+ * and conversion both want one canonical shape, so both go through
+ * {@link normalizeLinks} before touching a graph.
+ */
+function isObject(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/** Normalize one link entry; undefined when the entry is not a readable link. */
+export function normalizeLink(raw) {
+    if (Array.isArray(raw)) {
+        if (raw.length < 6)
+            return undefined;
+        const [id, origin, originSlot, target, targetSlot, type] = raw;
+        if (typeof id !== 'number' || typeof origin !== 'number' ||
+            typeof originSlot !== 'number' || typeof target !== 'number' ||
+            typeof targetSlot !== 'number') {
+            return undefined;
+        }
+        return [id, origin, originSlot, target, targetSlot, typeof type === 'string' ? type : ''];
+    }
+    if (isObject(raw)) {
+        const { id, origin_id: origin, origin_slot: originSlot, target_id: target, target_slot: targetSlot, type } = raw;
+        if (typeof id !== 'number' || typeof origin !== 'number' ||
+            typeof originSlot !== 'number' || typeof target !== 'number' ||
+            typeof targetSlot !== 'number') {
+            return undefined;
+        }
+        return [id, origin, originSlot, target, targetSlot, typeof type === 'string' ? type : ''];
+    }
+    return undefined;
+}
+/** Normalize a whole `links` array, skipping entries that are not readable. */
+export function normalizeLinks(raw) {
+    if (!Array.isArray(raw))
+        return [];
+    const links = [];
+    for (const entry of raw) {
+        const link = normalizeLink(entry);
+        if (link !== undefined)
+            links.push(link);
+    }
+    return links;
+}

package/lib/index.js

@@ -217,7 +217,9 @@ export async function apply(ctx, entryConfig) {
             const entries = await client.listUserData('workflows');
             const library = await store.listWorkflows();
             return entries
-                .filter((entry) => entry.type === 'file' && entry.name.endsWith('.json'))
+                // Dot entries are ComfyUI bookkeeping (e.g. `.index.json`), not graphs.
+                .filter((entry) => entry.type === 'file' && entry.name.endsWith('.json')
+                && entry.name.split(/[\\/]/).every((segment) => !segment.startsWith('.')))
                 .map((entry) => {
                 const derived = library.filter((workflow) => workflow.comfyuiFile === entry.name);
                 return {
@@ -319,7 +321,12 @@ export async function apply(ctx, entryConfig) {
     // service simply never registers it, and the entry config stands as composed.
     let source = () => resolved;
     ctx.inject(['settings'], (settingsCtx) => {
-        settingsCtx.settings.installSection(ctx, COMFYUI_NS, Config, resolved, {
+        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');
+            return;
+        }
+        settings.installSection(ctx, COMFYUI_NS, Config, resolved, {
             setSource: (current) => {
                 source = current;
             },

package/package.json

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