@fre4x/comfyui 1.0.62 → 1.0.64

package/dist/index.js

@@ -30630,9 +30630,16 @@ function convertWebUIToAPI(webUIJson, objectInfo) {
   const prompt = {};
   const links = webUIJson.links || [];
   const nodes = webUIJson.nodes || [];
+  const serverNodeIds = /* @__PURE__ */ new Set();
+  for (const node of nodes) {
+    if (!node.id || !node.type || !objectInfo[node.type]) {
+      continue;
+    }
+    serverNodeIds.add(String(node.id));
+  }
   const linkMap = /* @__PURE__ */ new Map();
   for (const link of links) {
-    if (isLinkData(link)) {
+    if (isLinkData(link) && serverNodeIds.has(String(link[3]))) {
       linkMap.set(link[0], link);
     }
   }
@@ -30650,7 +30657,7 @@ function convertWebUIToAPI(webUIJson, objectInfo) {
       for (const input of node.inputs) {
         if (input.name && input.link !== null && input.link !== void 0) {
           const linkData = linkMap.get(input.link);
-          if (Array.isArray(linkData) && linkData.length >= 6) {
+          if (Array.isArray(linkData) && linkData.length >= 6 && String(linkData[3]) === nodeIdStr) {
             const originNodeId = String(linkData[1]);
             const originSlot = linkData[2];
             promptNode.inputs[input.name] = [
@@ -30840,7 +30847,7 @@ async function fetchComfyJson(apiPath, options) {
   }
   return body;
 }
-async function fetchImageBase64(filename, type, subfolder) {
+async function fetchImageAsset(filename, type, subfolder) {
   const params = new URLSearchParams({ filename, type });
   if (subfolder) params.set("subfolder", subfolder);
   const url2 = new URL(
@@ -30853,10 +30860,47 @@ async function fetchImageBase64(filename, type, subfolder) {
   const arrayBuffer = await response.arrayBuffer();
   const mimeType = response.headers.get("content-type") || "image/png";
   return {
-    data: Buffer.from(arrayBuffer).toString("base64"),
+    buffer: Buffer.from(arrayBuffer),
     mimeType
   };
 }
+function createMockImageAsset() {
+  return {
+    buffer: Buffer.from("mock-image-data"),
+    mimeType: "image/png"
+  };
+}
+function getSessionWorkspaceDir() {
+  return process.env.MCP_WORKSPACE_DIR;
+}
+function getSafePathSegments(subfolder) {
+  if (!subfolder) return [];
+  return subfolder.split(/[/\\]/).filter((s) => s.length > 0 && s !== ".." && s !== ".");
+}
+async function saveToWorkspace(promptId, image, asset) {
+  const workspaceDir = getSessionWorkspaceDir();
+  if (!workspaceDir) {
+    return void 0;
+  }
+  const safeFileName = path.basename(image.filename);
+  const safeSubfolderSegments = getSafePathSegments(image.subfolder);
+  const relativePath = path.join(
+    "comfyui",
+    promptId,
+    ...safeSubfolderSegments,
+    safeFileName
+  );
+  const workspacePath = path.join(workspaceDir, relativePath);
+  await fs.mkdir(path.dirname(workspacePath), { recursive: true });
+  await fs.writeFile(workspacePath, asset.buffer);
+  return {
+    workspace_path: workspacePath,
+    relative_path: relativePath,
+    filename: safeFileName,
+    mime_type: asset.mimeType,
+    subfolder: image.subfolder
+  };
+}
 function handleComfyError(error48) {
   if (error48 instanceof ZodError) {
     return createValidationError(
@@ -30881,33 +30925,27 @@ ${detailSummary}` : error48.message
       isError: true
     };
   }
-  return createInternalError(error48);
-}
-async function validateWorkflowPath(targetPath) {
-  const resolvedPath = path.resolve(targetPath);
-  const allowedRoots = getWorkflowDirectories();
-  const isAllowed = allowedRoots.some(
-    (root) => resolvedPath.startsWith(path.resolve(root))
-  );
-  if (!isAllowed) {
-    throw new WorkflowInputError(
-      `Access denied: ${targetPath} is outside allowed workflow directories.`,
-      "workflow_file_path"
-    );
-  }
-  try {
-    await fs.access(resolvedPath);
-    return resolvedPath;
-  } catch {
-    throw new WorkflowInputError(
-      `Workflow file not found: ${targetPath}`,
-      "workflow_file_path",
-      "not_found"
-    );
+  const errorMessage = error48 instanceof Error ? error48.message : String(error48);
+  if (errorMessage.includes("Timeout waiting for workflow")) {
+    return {
+      content: [
+        {
+          type: "text",
+          text: `${errorMessage}.
+
+The workflow is likely still running on the server. You can re-attach to it and wait for completion by calling 'comfyui_wait_for_workflow' again with the same prompt_id.`
+        }
+      ],
+      isError: true
+    };
   }
+  return createInternalError(error48);
 }
 function getWorkflowDirectories(extraPath) {
   const directories = [
+    process.cwd(),
+    path.join(process.cwd(), "workflows"),
+    path.join(homedir(), ".fre4x-comfyui", "workflows"),
     path.join(
       homedir(),
       "comfy",
@@ -30915,9 +30953,7 @@ function getWorkflowDirectories(extraPath) {
       "user",
       "default",
       "workflows"
-    ),
-    path.join(homedir(), ".fre4x-comfyui", "workflows"),
-    path.join(process.cwd(), "workflows")
+    )
   ];
   if (extraPath) {
     directories.push(extraPath);
@@ -30942,12 +30978,6 @@ function normalizeWorkflowFileName(fileName) {
       "output_file_name"
     );
   }
-  if (path.basename(trimmed) !== trimmed) {
-    throw new WorkflowInputError(
-      "Filename must not include directory separators.",
-      "output_file_name"
-    );
-  }
   return trimmed.endsWith(".json") ? trimmed : `${trimmed}.json`;
 }
 function isConnectionValue(value) {
@@ -30961,21 +30991,30 @@ async function getObjectInfo() {
 async function resolveWorkflowReference(args) {
   if (args.workflow_file_path) {
     const targetPath = args.workflow_file_path;
-    if (path.basename(targetPath) === targetPath) {
-      const candidates = getWorkflowNameCandidates(targetPath);
-      for (const dir of getWorkflowDirectories()) {
-        for (const candidate of candidates) {
-          const candidatePath = path.join(dir, candidate);
-          try {
-            const content = await fs.readFile(
-              candidatePath,
-              "utf8"
-            );
-            return {
-              targetPath: candidatePath,
-              content
-            };
-          } catch {
+    try {
+      const resolvedPath = path.resolve(targetPath);
+      const content = await fs.readFile(resolvedPath, "utf8");
+      return {
+        targetPath: resolvedPath,
+        content
+      };
+    } catch {
+      if (path.basename(targetPath) === targetPath) {
+        const candidates = getWorkflowNameCandidates(targetPath);
+        for (const dir of getWorkflowDirectories()) {
+          for (const candidate of candidates) {
+            const candidatePath = path.join(dir, candidate);
+            try {
+              const content = await fs.readFile(
+                candidatePath,
+                "utf8"
+              );
+              return {
+                targetPath: candidatePath,
+                content
+              };
+            } catch {
+            }
           }
         }
       }
@@ -30985,11 +31024,6 @@ async function resolveWorkflowReference(args) {
         "not_found"
       );
     }
-    const validatedPath = await validateWorkflowPath(targetPath);
-    return {
-      targetPath: validatedPath,
-      content: await fs.readFile(validatedPath, "utf8")
-    };
   }
   if (args.workflow_id) {
     const requestedId = args.workflow_id.trim();
@@ -31136,6 +31170,9 @@ function analyzeEditableInputs(prompt) {
       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)) {
       if (!isConnectionValue(value)) {
         continue;
@@ -31156,6 +31193,9 @@ function analyzeEditableInputs(prompt) {
       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)) {
       if (isConnectionValue(value)) {
         continue;
@@ -31206,7 +31246,10 @@ function applyOverrides(prompt, overrides) {
     for (let i = 0; i < parts.length - 1; i++) {
       const part = parts[i];
       if (typeof current[part] !== "object" || current[part] === null) {
-        current[part] = {};
+        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];
     }
@@ -31245,7 +31288,7 @@ var SaveWorkflowSchema = z3.object({
   workflow_file_path: z3.string().optional().describe("Existing workflow path or filename to save."),
   workflow_id: z3.string().optional().describe("Existing workflow identifier to save."),
   overrides: z3.record(z3.string(), z3.unknown()).optional().describe("Dot-notation overrides to persist before saving."),
-  output_file_name: z3.string().optional().describe("Filename to write under ./workflows."),
+  output_file_name: z3.string().optional().describe("Filename to write locally. (default: anchored to ./)"),
   overwrite: z3.boolean().default(false).describe("Replace an existing local file when true."),
   include_prompt: z3.boolean().default(false).describe("Include saved API JSON in structuredContent.")
 });
@@ -31260,8 +31303,11 @@ async function handleInspectNode(args) {
     );
     if (args.node_class) {
       const node = rawInfo[args.node_class];
-      if (!node)
-        return createNotFoundError(`Node class ${args.node_class}`);
+      if (!node) {
+        return createNotFoundError(
+          `Node class '${args.node_class}' not found. Use 'comfyui_inspect_node' without arguments to see all available nodes or use the 'query' parameter to search for it.`
+        );
+      }
       return {
         content: [
           { type: "text", text: JSON.stringify(node, null, 2) }
@@ -31311,19 +31357,7 @@ function getWorkflowId(absolutePath) {
   return crypto.createHash("sha256").update(absolutePath).digest("hex").substring(0, 8);
 }
 async function handleDiscoverWorkflows(args) {
-  const pathsToScan = [
-    path.join(
-      homedir(),
-      "comfy",
-      "ComfyUI",
-      "user",
-      "default",
-      "workflows"
-    ),
-    path.join(homedir(), ".fre4x-comfyui", "workflows"),
-    path.join(process.cwd(), "workflows")
-  ];
-  if (args.directory_path) pathsToScan.push(args.directory_path);
+  const pathsToScan = getWorkflowDirectories(args.directory_path);
   const foundWorkflows = [];
   for (const dir of pathsToScan) {
     try {
@@ -31367,13 +31401,14 @@ async function handleDiscoverWorkflows(args) {
     }
   }
   if (foundWorkflows.length === 0) {
+    const text2 = `No workflows found in searched directories.
+
+Searched paths:
+${pathsToScan.map((p) => `- ${p}`).join("\n")}
+
+Hint: If your workflows are stored elsewhere, provide a custom path using the 'directory_path' parameter.`;
     return {
-      content: [
-        {
-          type: "text",
-          text: `No workflows found in searched directories.`
-        }
-      ],
+      content: [{ type: "text", text: text2 }],
       structuredContent: {
         workflows: [],
         searched_paths: pathsToScan
@@ -31428,6 +31463,7 @@ async function handleWaitForWorkflow(args) {
       args.timeout
     );
     const outputsRecord = historyEntry.outputs || {};
+    const workspaceOutputs = [];
     const content = [];
     let summaryText = `Workflow ${args.prompt_id} completed.
 `;
@@ -31435,36 +31471,54 @@ async function handleWaitForWorkflow(args) {
       if (output && Array.isArray(output.images)) {
         for (const image of output.images) {
           if (image.filename && image.type) {
-            if (!IS_MOCK) {
-              try {
-                const base643 = await fetchImageBase64(
-                  image.filename,
-                  image.type,
-                  image.subfolder
-                );
-                content.push({
-                  type: "image",
-                  data: base643.data,
-                  mimeType: base643.mimeType
-                });
-                summaryText += `Fetched image: ${image.filename}
+            try {
+              const asset = IS_MOCK ? createMockImageAsset() : await fetchImageAsset(
+                image.filename,
+                image.type,
+                image.subfolder
+              );
+              content.push({
+                type: "image",
+                data: asset.buffer.toString("base64"),
+                mimeType: asset.mimeType
+              });
+              summaryText += `Fetched image: ${image.filename}
 `;
-              } catch (e) {
-                summaryText += `Failed to fetch image ${image.filename}: ${String(e)}
+              const summary = await saveToWorkspace(
+                args.prompt_id,
+                image,
+                asset
+              );
+              if (summary) {
+                workspaceOutputs.push(summary);
+                summaryText += `Copied image to workspace: ${summary.relative_path}
 `;
               }
-            } else {
-              summaryText += `Mock image: ${image.filename}
+            } catch (e) {
+              summaryText += `Failed to fetch image ${image.filename}: ${String(e)}
 `;
             }
           }
         }
       }
     }
+    if (IS_MOCK && outputsRecord) {
+      for (const [, output] of Object.entries(outputsRecord)) {
+        if (output && Array.isArray(output.images)) {
+          for (const image of output.images) {
+            summaryText += `Mock image: ${image.filename}
+`;
+          }
+        }
+      }
+    }
     content.unshift({ type: "text", text: summaryText });
     return {
       content,
-      structuredContent: historyEntry
+      structuredContent: {
+        ...historyEntry,
+        workspace_outputs: workspaceOutputs
+      }
     };
   } catch (error48) {
     return handleComfyError(error48);
@@ -31488,7 +31542,20 @@ async function handleGetWorkflow(args) {
       editable_inputs: editableInputs
     };
     if (args.include_prompt) {
-      structuredContent.prompt = loadedWorkflow.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;
     }
     return {
       content: [{ type: "text", text }],
@@ -31519,13 +31586,18 @@ async function handleSaveWorkflow(args) {
     if (args.overrides) {
       applyOverrides(prompt, args.overrides);
     }
-    const workflowsDir = path.join(process.cwd(), "workflows");
-    await fs.mkdir(workflowsDir, { recursive: true });
     const outputFileName = deriveSavedWorkflowFileName(
       sourcePath,
       args.output_file_name
     );
-    const outputPath = path.join(workflowsDir, outputFileName);
+    if (outputFileName.includes("..")) {
+      return createValidationError(
+        "output_file_name",
+        "Directory traversal sequences (..) are not allowed."
+      );
+    }
+    const outputPath = path.resolve(process.cwd(), outputFileName);
+    await fs.mkdir(path.dirname(outputPath), { recursive: true });
     let existedBeforeSave = false;
     try {
       await fs.access(outputPath);
@@ -31555,7 +31627,18 @@ async function handleSaveWorkflow(args) {
       editable_inputs: editableInputs
     };
     if (args.include_prompt) {
-      structuredContent.prompt = 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;
     }
     const persistedChanges = args.overrides && Object.keys(args.overrides).length > 0 ? `Persisted ${Object.keys(args.overrides).length} override(s).` : "No overrides were applied.";
     const text = [
@@ -31609,7 +31692,9 @@ async function handleWorkflowRun(args) {
       content: [
         {
           type: "text",
-          text: `Workflow submitted. prompt_id: ${result.prompt_id}, queue: ${result.number}`
+          text: `Workflow submitted. prompt_id: ${result.prompt_id}, queue: ${result.number}.
+
+To retrieve the final results or check its status later, use the 'comfyui_wait_for_workflow' tool with this prompt_id.`
         }
       ],
       structuredContent: result

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fre4x/comfyui",
-  "version": "1.0.62",
+  "version": "1.0.64",
   "description": "MCP server for ComfyUI. Execute workflows and probe server state remotely.",
   "type": "module",
   "main": "dist/index.js",