@fre4x/comfyui 1.0.64 → 1.0.65-beta.1

package/dist/index.js

@@ -30501,8 +30501,10 @@ var MOCK_FIXTURES = {
       name: "KSampler",
       display_name: "KSampler",
       description: "",
+      python_module: "",
       category: "sampling",
-      output_node: false
+      output_node: false,
+      has_intermediate_output: false
     },
     CheckpointLoaderSimple: {
       input: {
@@ -30526,9 +30528,15 @@ var MOCK_FIXTURES = {
         }
       },
       output: ["MODEL", "CLIP", "VAE"],
+      output_is_list: [false, false, false],
+      output_name: ["MODEL", "CLIP", "VAE"],
       name: "CheckpointLoaderSimple",
       display_name: "Load Checkpoint",
-      category: "loaders"
+      description: "",
+      python_module: "",
+      category: "loaders",
+      output_node: false,
+      has_intermediate_output: false
     }
   },
   prompt_response: {
@@ -30577,8 +30585,11 @@ var UI_CONTROL_VALUES = /* @__PURE__ */ new Set([
   "decrement",
   "randomize"
 ]);
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
 function isWebUIFormat(json2) {
-  return typeof json2 === "object" && json2 !== null && Array.isArray(json2.nodes) && Array.isArray(json2.links);
+  return isRecord(json2) && Array.isArray(json2.nodes) && Array.isArray(json2.links);
 }
 function isLinkData(link) {
   return Array.isArray(link) && link.length >= 6 && typeof link[0] === "number" && typeof link[1] === "number" && typeof link[2] === "number" && typeof link[3] === "number" && typeof link[4] === "number" && typeof link[5] === "string";
@@ -30738,16 +30749,41 @@ var WorkflowInputError = class extends Error {
     this.name = "WorkflowInputError";
   }
 };
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null;
 }
+function isComfyPromptNode(value) {
+  return isRecord2(value) && typeof value.class_type === "string" && isRecord2(value.inputs);
+}
+function isUiOnlyPromptNode(nodeId, node) {
+  return nodeId === "meta" || ["Note", "MarkdownNote", "PrimitiveNode"].includes(node.class_type);
+}
+function extractRunnablePromptNodes(prompt) {
+  const runnablePrompt = {};
+  for (const [nodeId, rawNode] of Object.entries(prompt)) {
+    if (!isComfyPromptNode(rawNode) || isUiOnlyPromptNode(nodeId, rawNode)) {
+      continue;
+    }
+    runnablePrompt[nodeId] = rawNode;
+  }
+  if (Object.keys(runnablePrompt).length === 0) {
+    throw new WorkflowInputError(
+      "Workflow prompt does not contain any runnable ComfyUI nodes.",
+      "workflow"
+    );
+  }
+  return runnablePrompt;
+}
+function toStructuredContent(value) {
+  return isRecord2(value) ? value : {};
+}
 function summarizeNodeErrors(nodeErrors) {
-  if (!isRecord(nodeErrors)) {
+  if (!isRecord2(nodeErrors)) {
     return [];
   }
   const lines = [];
   for (const [nodeId, rawNodeError] of Object.entries(nodeErrors)) {
-    if (!isRecord(rawNodeError)) {
+    if (!isRecord2(rawNodeError)) {
       continue;
     }
     const classType = typeof rawNodeError.class_type === "string" ? ` (${rawNodeError.class_type})` : "";
@@ -30755,7 +30791,7 @@ function summarizeNodeErrors(nodeErrors) {
     const missingInputs = [];
     const otherMessages = [];
     for (const rawError of rawErrors) {
-      if (!isRecord(rawError)) {
+      if (!isRecord2(rawError)) {
         continue;
       }
       const errorType = rawError.type;
@@ -30785,11 +30821,11 @@ function summarizeNodeErrors(nodeErrors) {
   return lines;
 }
 function summarizeComfyErrorDetails(details) {
-  if (!isRecord(details)) {
+  if (!isRecord2(details)) {
     return "";
   }
   const lines = [];
-  const errorDetails = isRecord(details.error) ? details.error : void 0;
+  const errorDetails = isRecord2(details.error) ? details.error : void 0;
   if (typeof errorDetails?.message === "string") {
     lines.push(errorDetails.message);
   } else if (typeof details.message === "string") {
@@ -30921,7 +30957,7 @@ function handleComfyError(error48) {
 ${detailSummary}` : error48.message
         }
       ],
-      structuredContent: error48.details || {},
+      structuredContent: toStructuredContent(error48.details),
       isError: true
     };
   }
@@ -30984,9 +31020,7 @@ function isConnectionValue(value) {
   return Array.isArray(value) && value.length >= 2 && (typeof value[0] === "string" || typeof value[0] === "number") && typeof value[1] === "number";
 }
 async function getObjectInfo() {
-  return IS_MOCK ? MOCK_FIXTURES.object_info : await fetchComfyJson(
-    "/object_info"
-  );
+  return IS_MOCK ? MOCK_FIXTURES.object_info : await fetchComfyJson("/object_info");
 }
 async function resolveWorkflowReference(args) {
   if (args.workflow_file_path) {
@@ -31064,7 +31098,7 @@ async function resolveWorkflowReference(args) {
   );
 }
 async function normalizeWorkflowPrompt(workflow) {
-  if (!isRecord(workflow)) {
+  if (!isRecord2(workflow)) {
     throw new WorkflowInputError(
       "Workflow must be a JSON object.",
       "workflow"
@@ -31079,15 +31113,15 @@ async function normalizeWorkflowPrompt(workflow) {
       await getObjectInfo()
     );
   }
-  const prompt = isRecord(normalizedWorkflow.prompt) && normalizedWorkflow.prompt ? normalizedWorkflow.prompt : normalizedWorkflow;
-  if (!isRecord(prompt)) {
+  const promptCandidate = isRecord2(normalizedWorkflow.prompt) && normalizedWorkflow.prompt ? normalizedWorkflow.prompt : normalizedWorkflow;
+  if (!isRecord2(promptCandidate)) {
     throw new WorkflowInputError(
       "Workflow prompt must be a JSON object.",
       "workflow"
     );
   }
   return {
-    prompt,
+    prompt: extractRunnablePromptNodes(promptCandidate),
     sourceFormat
   };
 }
@@ -31165,15 +31199,8 @@ function formatValuePreview(value) {
 }
 function analyzeEditableInputs(prompt) {
   const consumerMap = /* @__PURE__ */ new Map();
-  for (const [nodeId, rawNode] of Object.entries(prompt)) {
-    if (!isRecord(rawNode) || !isRecord(rawNode.inputs)) {
-      continue;
-    }
-    const classType = typeof rawNode.class_type === "string" ? rawNode.class_type : "";
-    if (!classType || ["Note", "MarkdownNote", "PrimitiveNode"].includes(classType) || nodeId === "meta") {
-      continue;
-    }
-    for (const [inputName, value] of Object.entries(rawNode.inputs)) {
+  for (const [nodeId, node] of Object.entries(prompt)) {
+    for (const [inputName, value] of Object.entries(node.inputs)) {
       if (!isConnectionValue(value)) {
         continue;
       }
@@ -31181,35 +31208,28 @@ function analyzeEditableInputs(prompt) {
       const consumers = consumerMap.get(sourceNodeId) ?? [];
       consumers.push({
         inputName,
-        classType,
+        classType: node.class_type,
         nodeId
       });
       consumerMap.set(sourceNodeId, consumers);
     }
   }
   const editableInputs = [];
-  for (const [nodeId, rawNode] of Object.entries(prompt)) {
-    if (!isRecord(rawNode) || !isRecord(rawNode.inputs)) {
-      continue;
-    }
-    const classType = typeof rawNode.class_type === "string" ? rawNode.class_type : "";
-    if (!classType || ["Note", "MarkdownNote", "PrimitiveNode"].includes(classType) || nodeId === "meta") {
-      continue;
-    }
-    for (const [inputName, value] of Object.entries(rawNode.inputs)) {
+  for (const [nodeId, node] of Object.entries(prompt)) {
+    for (const [inputName, value] of Object.entries(node.inputs)) {
       if (isConnectionValue(value)) {
         continue;
       }
       editableInputs.push({
         path: `${nodeId}.inputs.${inputName}`,
         node_id: nodeId,
-        class_type: classType,
+        class_type: node.class_type,
         input_name: inputName,
         value,
         value_preview: formatValuePreview(value),
         role: inferEditableRole(
           nodeId,
-          classType,
+          node.class_type,
           inputName,
           consumerMap
         )
@@ -31245,13 +31265,14 @@ function applyOverrides(prompt, overrides) {
     let current = prompt;
     for (let i = 0; i < parts.length - 1; i++) {
       const part = parts[i];
-      if (typeof current[part] !== "object" || current[part] === null) {
+      const next = current[part];
+      if (!isRecord2(next)) {
         throw new WorkflowInputError(
           `Invalid override path: '${key}'. The segment '${part}' does not exist or is not an object. Please check the editable inputs using 'comfyui_get_workflow' to find the correct path.`,
           "overrides"
         );
       }
-      current = current[part];
+      current = next;
     }
     current[parts[parts.length - 1]] = value;
   }
@@ -31298,9 +31319,7 @@ var WaitForWorkflowSchema = z3.object({
 });
 async function handleInspectNode(args) {
   try {
-    const rawInfo = IS_MOCK ? MOCK_FIXTURES.object_info : await fetchComfyJson(
-      "/object_info"
-    );
+    const rawInfo = await getObjectInfo();
     if (args.node_class) {
       const node = rawInfo[args.node_class];
       if (!node) {
@@ -31312,7 +31331,7 @@ async function handleInspectNode(args) {
         content: [
           { type: "text", text: JSON.stringify(node, null, 2) }
         ],
-        structuredContent: node
+        structuredContent: { ...node }
       };
     }
     let classes = Object.keys(rawInfo);
@@ -31446,9 +31465,16 @@ async function waitForWorkflowResult(prompt_id, timeout_seconds) {
   const start = Date.now();
   const end = start + timeout_seconds * 1e3;
   while (Date.now() < end) {
-    const history = IS_MOCK ? MOCK_FIXTURES.history : await fetchComfyJson(
-      `/history/${prompt_id}`
-    ).catch(() => ({}));
+    let history = MOCK_FIXTURES.history;
+    if (!IS_MOCK) {
+      try {
+        history = await fetchComfyJson(
+          `/history/${prompt_id}`
+        );
+      } catch {
+        history = {};
+      }
+    }
     if (history?.[prompt_id]) {
       return history[prompt_id];
     }
@@ -31542,20 +31568,7 @@ async function handleGetWorkflow(args) {
       editable_inputs: editableInputs
     };
     if (args.include_prompt) {
-      const filteredPrompt = {};
-      for (const [nodeId, node] of Object.entries(
-        loadedWorkflow.prompt
-      )) {
-        if (isRecord(node)) {
-          const classType = typeof node.class_type === "string" ? node.class_type : "";
-          if (classType && !["Note", "MarkdownNote", "PrimitiveNode"].includes(
-            classType
-          ) && nodeId !== "meta") {
-            filteredPrompt[nodeId] = node;
-          }
-        }
-      }
-      structuredContent.prompt = filteredPrompt;
+      structuredContent.prompt = loadedWorkflow.prompt;
     }
     return {
       content: [{ type: "text", text }],
@@ -31627,18 +31640,7 @@ async function handleSaveWorkflow(args) {
       editable_inputs: editableInputs
     };
     if (args.include_prompt) {
-      const filteredPrompt = {};
-      for (const [nodeId, node] of Object.entries(prompt)) {
-        if (isRecord(node)) {
-          const classType = typeof node.class_type === "string" ? node.class_type : "";
-          if (classType && !["Note", "MarkdownNote", "PrimitiveNode"].includes(
-            classType
-          ) && nodeId !== "meta") {
-            filteredPrompt[nodeId] = node;
-          }
-        }
-      }
-      structuredContent.prompt = filteredPrompt;
+      structuredContent.prompt = prompt;
     }
     const persistedChanges = args.overrides && Object.keys(args.overrides).length > 0 ? `Persisted ${Object.keys(args.overrides).length} override(s).` : "No overrides were applied.";
     const text = [
@@ -31678,7 +31680,7 @@ async function handleWorkflowRun(args) {
             text: formatWorkflowNodeErrors(result.node_errors)
           }
         ],
-        structuredContent: result,
+        structuredContent: { ...result },
         isError: true
       };
     }
@@ -31697,7 +31699,7 @@ async function handleWorkflowRun(args) {
 To retrieve the final results or check its status later, use the 'comfyui_wait_for_workflow' tool with this prompt_id.`
         }
       ],
-      structuredContent: result
+      structuredContent: { ...result }
     };
   } catch (error48) {
     return handleComfyError(error48);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fre4x/comfyui",
-  "version": "1.0.64",
+  "version": "1.0.65-beta.1",
   "description": "MCP server for ComfyUI. Execute workflows and probe server state remotely.",
   "type": "module",
   "main": "dist/index.js",
@@ -15,9 +15,9 @@
     "dev": "tsx watch src/index.ts",
     "typecheck": "node --max-old-space-size=4096 ../node_modules/typescript/bin/tsc --noEmit",
     "prepublishOnly": "npm run typecheck && npm run build",
-    "test": "vitest run --exclude dist",
-    "test:watch": "vitest",
-    "test:e2e": "cross-env COMFYUI_E2E=true vitest run src/e2e.test.ts",
+    "test": "node ../scripts/run-vitest.mjs run --exclude dist",
+    "test:watch": "node ../scripts/run-vitest.mjs",
+    "test:e2e": "cross-env COMFYUI_E2E=true node ../scripts/run-vitest.mjs run src/e2e.test.ts",
     "inspector": "npm run build && node ../scripts/run-official-inspector.mjs node dist/index.js"
   },
   "dependencies": {