@ai-fux/fux-dsh-comfymcp 0.5.0 → 0.5.1

package/index.js

@@ -25,7 +25,7 @@ import { createWorkbenchMethods } from './lib/workbench.js'
 import * as persist from './lib/persist.js'
 
 export const name = '@ai-fux/fux-dsh-comfymcp'
-export const version = '0.5.0'
+export const version = '0.5.1'
 export const description =
   'comfy-mcp 对接：自然语言设计可运行 ComfyUI 工作流、定制表单确认、强制保存运行与成果物回显。'
 

package/lib/bridge.js

@@ -44,16 +44,26 @@ export class ComfymcpBridge {
       ((cfg) => {
         // 远程模式：直连 comfy-mcp 的 Streamable HTTP 端点（不 spawn 本地 stdio 宿主）
         if (cfg.embeddedServer !== true) return createHostFacade(this.newHttpClient(cfg), { log: (line) => this.log(line) })
-        return new McpStdioClient({
-          command: cfg.hostCommand,
-          args: this.hostArgs(cfg),
-          requestTimeoutMs: cfg.requestTimeoutMs,
-          callTimeoutMs: cfg.callTimeoutMs,
-          env: { ...process.env, COMFY_MCP_ENDPOINT: cfg.endpoint },
-          log: (line) => this.log(line),
-        })
+        // 内置模式：优先 stdio 宿主子进程。宿主入口解析不到（npm 全新安装形态不含
+        // TS 宿主工程，FIX202610170239）→ 回退直连内嵌 comfy-mcp 的 HTTP 端点，
+        // 绝不 spawn 占位入口（node DSH_COMFYMCP_HOST_ENTRY_NOT_CONFIGURED 必败重试）。
+        const host = this.resolveHostEntry(process.env)
+        if (host.entry !== '') {
+          return new McpStdioClient({
+            command: cfg.hostCommand,
+            args: [host.entry],
+            requestTimeoutMs: cfg.requestTimeoutMs,
+            callTimeoutMs: cfg.callTimeoutMs,
+            env: { ...process.env, COMFY_MCP_ENDPOINT: cfg.endpoint },
+            log: (line) => this.log(line),
+          })
+        }
+        this.hostFallback = { reason: 'host-entry-unresolved', candidates: host.candidates ?? [] }
+        this.log(`宿主入口未解析（npm 安装形态不含 TS 宿主工程）→ 回退 HTTP 直连 ${cfg.endpoint}；需要 stdio 宿主时配置 hostEntry 或放置 ${host.candidates?.[0] ?? ''}`)
+        return createHostFacade(this.newHttpClient(cfg), { log: (line) => this.log(line) })
       })
     this.client = null
+    this.hostFallback = null
     this.embedded = null
     this.pluginDir = typeof options.pluginDir === 'string' ? options.pluginDir : ''
     this.runs = new Map()
@@ -82,9 +92,10 @@ export class ComfymcpBridge {
     })
   }
 
-  /** 当前传输方式：远程＝streamable-http，内置＝stdio 宿主。 */
+  /** 当前传输方式：远程＝streamable-http；内置＝stdio 宿主，宿主缺失回退 HTTP 时为 streamable-http-fallback。 */
   transport() {
-    return this.config.embeddedServer === true ? 'stdio' : 'streamable-http'
+    if (this.config.embeddedServer !== true) return 'streamable-http'
+    return this.hostFallback ? 'streamable-http-fallback' : 'stdio'
   }
 
   /**
@@ -140,7 +151,7 @@ export class ComfymcpBridge {
     return { ...this.config }
   }
 
-  /** Resolve a usable host entry: explicit config, env, then conventional workspace paths. */
+  /** Resolve a usable host entry: explicit config, env, then existence-checked conventional paths. */
   resolveHostEntry(env = {}) {
     if (typeof this.config.hostEntry === 'string' && this.config.hostEntry.trim().length > 0) {
       return { entry: this.config.hostEntry.trim(), source: 'config' }
@@ -149,11 +160,21 @@ export class ComfymcpBridge {
     if (typeof fromEnv === 'string' && fromEnv.trim().length > 0) {
       return { entry: fromEnv.trim(), source: 'env' }
     }
-    return { entry: '', source: 'unset', candidates: candidateHostEntries('') }
+    // 约定候选路径：存在性探测（只认绝对路径，相对路径依赖 cwd 不可靠），命中即用
+    for (const candidate of candidateHostEntries(this.pluginDir)) {
+      if (!isAbsolute(candidate)) continue
+      try {
+        if (existsSync(candidate)) return { entry: candidate, source: 'candidate' }
+      } catch {
+        /* ignore */
+      }
+    }
+    return { entry: '', source: 'unset', candidates: candidateHostEntries(this.pluginDir) }
   }
 
   clientOrNull() {
     if (this.client === null) {
+      this.hostFallback = null
       this.client = this.clientFactory(this.config)
     }
     return this.client
@@ -266,10 +287,10 @@ export class ComfymcpBridge {
       error: '',
     }
     try {
-      const transport = this.transport()
       const client = await this.ensureReady()
+      const transport = this.transport()
       if (transport === 'stdio') {
-        const entry = this.resolveHostEntry()
+        const entry = this.resolveHostEntry(process.env)
         if (entry.entry === '') {
           result.error =
             'MCP 宿主入口未配置：设置 hostEntry 指向 projects/dsh-comfymcp/mcp/bin/fux-comfymcp-host.mjs（或环境变量 DSH_COMFYMCP_HOST_ENTRY）'
@@ -278,6 +299,7 @@ export class ComfymcpBridge {
         result.host = { ...client.status(), transport, entry: entry.entry, entrySource: entry.source }
       } else {
         result.host = { ...client.status(), transport, entry: this.config.endpoint, entrySource: 'endpoint' }
+        if (this.hostFallback) result.host.fallback = { ...this.hostFallback }
       }
       const status = await client.callTool('connection_status', {}, 20000)
       result.remote = status?.structuredContent ?? null

package/lib/config.js

@@ -192,6 +192,9 @@ export function candidateHostEntries(pluginDir) {
   const entries = []
   if (pluginDir) {
     const normalized = pluginDir.replaceAll('\\', '/')
+    // 插件包内约定：vendor/fux-comfymcp-host.mjs（与 vendor/comfy-mcp-server.mjs 同层）。
+    // 当前 npm 包不含 TS 宿主工程；留此约定供手工放置或未来打包自包含宿主。
+    entries.push(`${normalized}/vendor/fux-comfymcp-host.mjs`)
     const marker = '/node_modules/'
     const cut = normalized.lastIndexOf(marker)
     if (cut > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-fux/fux-dsh-comfymcp",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "type": "module",
   "description": "DSH 插件：对接 comfy-mcp 服务（自然语言设计可运行工作流、定制表单、运行与成果物回显）。",
   "license": "MIT",