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

package/client.js

@@ -332,7 +332,7 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__ !== undefined) {
         run: function (d) { return (d.autoUnloadModel === true ? '跑完卸载模型' : '不卸载（热加载）') + ' · ' + (text(d.runTimeoutMin).length > 0 ? d.runTimeoutMin + ' 分钟上限' : '不限时长') },
         quick: function (d) { return text(d.quickCommands).length > 0 ? '已自定义' : '内置「抽卡」' },
         storage: function (d) { var kind = text(d.storage).toLowerCase(); return kind === 'minio' ? 'MinIO（S3）' : kind === 'oss' ? '阿里云 OSS' : '本地目录' },
-        form: function (d) { return d.autoAcceptForm === true ? '倒计时 ' + (text(d.autoAcceptFormSec).length > 0 ? d.autoAcceptFormSec : '30') + ' 秒自动采用推荐值' : '一直等待作答' },
+        form: function (d) { return (d.autoAcceptForm === true ? '倒计时 ' + (text(d.autoAcceptFormSec).length > 0 ? d.autoAcceptFormSec : '30') + ' 秒自动采用推荐值' : '一直等待作答') + ' · ask_user ' + (d.timedAsk !== false ? '倒计时 30 秒' : '阻塞等待') },
         dev: function (d) { return d.devMode === true ? '已开启（允许改插件源码）' : '关闭（严禁改插件源码）' },
       }
 
@@ -378,7 +378,7 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__ !== undefined) {
         var initial = react.useState({
           endpoint: '', authToken: '', workflowDirs: '', saveSubdir: '', artifactsDir: '', hostEntry: '', autoUnloadModel: true, embeddedServer: false, comfyuiUrl: '', backendEntry: '',
           storage: 'local', storageEndpoint: '', storageBucket: '', storageRegion: '', storageAccessKey: '', storageSecret: '', storagePrefix: '',
-          homeDir: '', dataDir: '', quickCommands: '', downloadDir: '', autoAcceptForm: false, autoAcceptFormSec: '30', devMode: false,
+          homeDir: '', dataDir: '', quickCommands: '', downloadDir: '', autoAcceptForm: false, autoAcceptFormSec: '30', timedAsk: true, devMode: false,
         })
         var draft = initial[0]
         var setDraft = initial[1]
@@ -440,6 +440,7 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__ !== undefined) {
                 quickCommands: text(config.quickCommands),
                 autoAcceptForm: config.autoAcceptForm === true,
               devMode: config.devMode === true,
+                timedAsk: config.timedAsk !== false,
                 autoAcceptFormSec: text(config.autoAcceptFormSec),
                 downloadDir: text(config.downloadDir),
                 runTimeoutMin: text(config.runTimeoutMin),
@@ -463,7 +464,7 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__ !== undefined) {
         function isDirty() {
           return ['endpoint', 'authToken', 'workflowDirs', 'saveSubdir', 'artifactsDir', 'hostEntry', 'autoUnloadModel', 'embeddedServer', 'comfyuiUrl', 'backendEntry',
             'storage', 'storageEndpoint', 'storageBucket', 'storageRegion', 'storageAccessKey', 'storageSecret', 'storagePrefix',
-            'homeDir', 'dataDir', 'quickCommands', 'downloadDir', 'runTimeoutMin', 'autoAcceptForm', 'autoAcceptFormSec', 'devMode'].some(function (key) {
+            'homeDir', 'dataDir', 'quickCommands', 'downloadDir', 'runTimeoutMin', 'autoAcceptForm', 'autoAcceptFormSec', 'timedAsk', 'devMode'].some(function (key) {
             return text(draft[key]) !== text(savedConfig[key])
           })
         }
@@ -515,6 +516,7 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__ !== undefined) {
             quickCommands: draft.quickCommands,
             autoAcceptForm: draft.autoAcceptForm === true,
             devMode: draft.devMode === true,
+            timedAsk: draft.timedAsk !== false,
             autoAcceptFormSec: draft.autoAcceptFormSec,
             downloadDir: draft.downloadDir,
             runTimeoutMin: draft.runTimeoutMin,
@@ -545,6 +547,7 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__ !== undefined) {
               autoAcceptForm: applied.autoAcceptForm === true,
               autoAcceptFormSec: text(applied.autoAcceptFormSec),
               devMode: applied.devMode === true,
+              timedAsk: applied.timedAsk !== false,
                 downloadDir: text(applied.downloadDir),
                 runTimeoutMin: text(applied.runTimeoutMin),
               }
@@ -641,7 +644,7 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__ !== undefined) {
             description: '模型检索模板与「必须先保存再运行」的落点；多个目录用分号分隔。保存子目录保证每次运行可回溯。',
           },
             h(Field, { label: '工作流目录（分号分隔）' },
-              h(TextInput, { value: draft.workflowDirs, mono: true, placeholder: 'F:\\Comfy\\ComfyUI\\user\\default\\workflows', onChange: function (value) { edit('workflowDirs', value) } })),
+              h(TextInput, { value: draft.workflowDirs, mono: true, placeholder: '/path/to/ComfyUI/user/default/workflows', onChange: function (value) { edit('workflowDirs', value) } })),
             h(Field, { label: '保存子目录', hint: '每次运行先保存到该子目录，保证可回溯' },
               h(TextInput, { value: draft.saveSubdir, placeholder: 'dsh-generated', onChange: function (value) { edit('saveSubdir', value) } })),
             h(Field, { label: '产物下载目录', hint: '留空使用 DSH 数据目录' },
@@ -755,6 +758,12 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__ !== undefined) {
             }),
             h(Field, { label: '倒计时秒数', hint: '自动确认前的等待时间；缺省 30 秒（最少 1 秒，非法值按 30 秒处理），仅开关开启时生效' },
               h(TextInput, { value: draft.autoAcceptFormSec, mono: true, placeholder: '30', onChange: function (value) { edit('autoAcceptFormSec', value) } })),
+            h(SwitchRow, {
+              label: 'ask_user 倒计时卡片（30 秒到期不阻塞）',
+              checked: draft.timedAsk !== false,
+              onChange: function (value) { edit('timedAsk', value) },
+            }),
+            h(Hint, { hint: '作用于全局 ask_user_question 提问（经 preset-standard 覆盖生效）：开启后提问卡片自带 30 秒可见倒计时，到期模型按推荐值继续、问题仍可后答；关闭则阻塞等待作答。保存后需重启 DSH 生效。', always: true }),
           ),
 
           h(Section, {

package/cordis.patch.yml

@@ -1,3 +1,12 @@
+# fux-dsh-comfymcp bundle patch：两段操作。
+# ① 插件自身行：全部路径类配置不落机器绝对路径（Linux/新机零手工修正）——
+#    内嵌模式服务端走插件包内 vendor/，主目录/工作流/产物缺省派生自 DSH 内置数据目录；
+#    真实 ComfyUI 后端等高级入口经设置页按机器填写（优先级：env > 覆盖层 > 行配置 > 默认）。
+# ② 覆盖 shipped preset-standard：ask_user_question 切计时模式（吸收原 @local/dsh-preset-timed-ask
+#    预设包，该包退役）。mode 由本插件覆盖层 timedAsk 开关驱动（设置页「ask_user 倒计时卡片」，
+#    写 $DSH_HOME/comfymcp/config-overlay.json，重启 DSH 生效；缺省/读不到 → timed）。
+#    来源：dsh-web-app/presets/standard.patch.yml（仅 tool-ask-user 条目不同）。
+#    注意：DSH 升级若 preset-standard 有变更，需同步本段（官方 README 同样要求手工维护该覆盖）。
 - insert:
     - id: fux-dsh-comfymcp
       # 行 name = 包名（运行时按包名对行）；id 用去 scope 短 id（模板规约）。
@@ -7,10 +16,11 @@
       config:
         endpoint: http://127.0.0.1:18800/mcp
         hostCommand: node
-        hostEntry: F:\AgentWorkplace\dsh\dsh-13188-comfymcp\projects\dsh-comfymcp\mcp\bin\fux-comfymcp-host.mjs
+        # hostEntry 缺省为空：内嵌模式走插件包内 vendor/comfy-mcp-server.mjs；
+        # 仅远程 spawn 模式才需要在设置页显式填宿主入口。
         # 工作流/产物/结构化数据统一收敛在插件主目录下（缺省 DSH 内置数据目录
-        # $DSH_HOME/comfymcp/，子目录 workflows|artifacts|data）；需要检索 ComfyUI
-        # 自带模板库时在设置页追加该目录即可。
+        # $DSH_HOME/comfymcp/，子目录 workflows|artifacts|data，node:path 派生跨平台）；
+        # 需要检索 ComfyUI 自带模板库时在设置页追加该目录即可。
         # workflowDirs: []
         saveSubdir: dsh-generated
         artifactsDir: ''
@@ -25,6 +35,149 @@
         embeddedServer: true
         # ComfyUI 服务地址：官方默认端口 8188；ComfyUI 在别的机器时改成 http://<IP>:8188（设置页可改，保存热重启内置服务）
         comfyuiUrl: http://127.0.0.1:8188
-        embeddedBackend: stdio
-        embeddedBackendCommand: node
-        embeddedBackendArgs: F:\AgentWorkplace\dsh\dsh-1-comfy-p\projects\dsh-comfyui\mcp\bin\fux-comfyui-mcp.mjs
+        # 内嵌后端缺省 mock（零依赖开箱跑通全链路）。接真实 ComfyUI：设置页「后端入口」
+        # 指向 ComfyUI 的 MCP 桥接程序（如 fux-comfyui-mcp.mjs），后端类型随入口自动切 stdio。
+        # embeddedBackend: mock
+        # embeddedBackendCommand: node
+        # embeddedBackendArgs: ''
+- id: preset-standard
+  name: '@deepseek-ai/dsh-agent-preset'
+  config:
+    id: standard
+    order: 1
+    plugins:
+      - id: persona
+        name: '@deepseek-ai/dsh-persona'
+        config:
+          suffix: Your working directory is {{cwd}}.
+          prefix: You are a coding agent powered by the {{model}} model.
+      - id: agent-instructions
+        name: '@deepseek-ai/dsh-agent-instructions'
+        config:
+          maxBytes: 65536
+      - id: tool-bash
+        name: '@deepseek-ai/dsh-tool-bash'
+        disabled: !!js process.platform === 'win32'
+      - id: tool-pwsh
+        name: '@deepseek-ai/dsh-tool-pwsh'
+        disabled: !!js process.platform !== 'win32'
+      - id: tool-fs
+        name: '@deepseek-ai/dsh-tool-fs'
+      - id: tool-fs-search
+        name: '@deepseek-ai/dsh-tool-fs-search'
+        config:
+          sampleOverCapGlobResults: false
+      - id: tool-jobs
+        name: '@deepseek-ai/dsh-tool-jobs'
+      - id: skill-filesystem
+        name: '@deepseek-ai/dsh-skill-filesystem'
+      - id: tool-skill
+        name: '@deepseek-ai/dsh-tool-skill'
+      - id: command-goal
+        name: '@deepseek-ai/dsh-command-goal'
+      - id: tool-goal
+        name: '@deepseek-ai/dsh-tool-goal'
+      - id: planning
+        name: cordis:group
+        group: true
+        isolate:
+          planMode: true
+        config:
+          - id: plan-mode
+            name: '@deepseek-ai/dsh-plan-mode'
+            config:
+              section: |
+                You are in plan mode. Stay in plan mode until exit_plan_mode succeeds or the user switches the session mode. Imperative language to implement changes means plan the implementation, not execute it. A user's conversational agreement — including an answer confirming something you asked — approves nothing and does not end plan mode; fold the confirmed decision into the plan and submit it through exit_plan_mode.
+
+                Explore first. Use non-mutating reads, searches, static analysis, and checks to ground the plan in the actual repository. Do not edit or write files, change configuration, run formatters or code generation that rewrites tracked files, commit, or otherwise carry out the plan. Prefer existing functions and patterns over new machinery.
+
+                The tool catalog stays the same across modes for request-cache stability. These plan-mode rules override any later tool description or guidance that suggests using mutation tools; those tools remain listed to keep the tool catalog unchanged. Do not use todo_write to track this planning phase: it tracks implementation after an approved plan, while the plan itself belongs in exit_plan_mode.
+
+                Resolve discoverable facts by inspection. Use ask_user_question only for user-owned choices or material ambiguity that inspection cannot answer. Do not ask the user where code lives or how current behavior works when you can find it.
+      - id: compaction
+        name: cordis:group
+        group: true
+        isolate:
+          compaction: true
+          toolResultPruner: true
+        config:
+          - id: compaction-basic
+            name: '@deepseek-ai/dsh-compaction-basic'
+          - id: command-compact
+            name: '@deepseek-ai/dsh-command-compact'
+          - id: tool-result-pruner
+            name: '@deepseek-ai/dsh-compaction-tool-result-pruner'
+            config:
+              thresholdChars: 8192
+              headChars: 4096
+              tailChars: 1024
+      - id: delegation
+        name: cordis:group
+        group: true
+        isolate:
+          workflowEngine: true
+        config:
+          - id: tool-subagent-control
+            name: '@deepseek-ai/dsh-tool-subagent-control'
+          - id: tool-subagent-list-agents
+            name: '@deepseek-ai/dsh-tool-subagent-control/list-agents'
+          - id: tool-subagent
+            name: '@deepseek-ai/dsh-tool-subagent'
+            config:
+              provider: spawn
+              toolName: subagent
+              modelSelectionSettings: true
+              backgroundMode: continuable
+          - id: tool-subagent-fork
+            name: '@deepseek-ai/dsh-tool-subagent'
+            config:
+              provider: fork
+              toolName: subagent_fork
+              backgroundMode: continuable
+          - id: tool-subagent-codex
+            name: '@deepseek-ai/dsh-tool-subagent'
+            disabled: true
+            config:
+              provider: codex
+              toolName: subagent_codex
+              backgroundMode: one-shot
+              maxDepth: provider-managed
+          - id: tool-subagent-claude-code
+            name: '@deepseek-ai/dsh-tool-subagent'
+            disabled: true
+            config:
+              provider: claude-code
+              toolName: subagent_claude_code
+              backgroundMode: one-shot
+              maxDepth: provider-managed
+          - id: workflow-ptc
+            name: '@deepseek-ai/dsh-workflow-ptc'
+            config:
+              provider: spawn
+          - id: tool-workflow
+            name: '@deepseek-ai/dsh-tool-workflow'
+          - id: tool-ralph
+            name: '@deepseek-ai/dsh-tool-ralph'
+            disabled: true
+            config:
+              subagentProvider: spawn
+              maxRounds: 64
+      - id: tool-ask-user
+        name: '@deepseek-ai/dsh-tool-ask-user'
+        config:
+          mode: !!js (function(){try{var o=JSON.parse(require('fs').readFileSync(require('path').join(process.env.DSH_HOME||require('path').join(process.cwd(),'data','.dsh'),'comfymcp','config-overlay.json'),'utf8'));return o.timedAsk===false?'legacy':'timed'}catch(e){return 'timed'}})()
+          timeout: 30
+      - id: tool-todo
+        name: '@deepseek-ai/dsh-tool-todo'
+        config:
+          allowParallelInProgress: true
+      - id: tool-web
+        name: '@deepseek-ai/dsh-tool-web'
+        config:
+          fetch: true
+          searchTimeoutMs: 60000
+      - id: present
+        name: '@deepseek-ai/dsh-tool-present'
+      - id: tool-plugin-manager
+        name: '@deepseek-ai/dsh-plugin-manager/tools'
+        disabled: true

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.4.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

@@ -38,13 +38,16 @@ export const DEFAULTS = Object.freeze({
   runTimeoutMin: 30,
   autoAcceptForm: false,
   autoAcceptFormSec: 30,
+  // ask_user 倒计时卡片开关（本插件 patch 覆盖 preset-standard 时经 !!js 读取覆盖层本键，
+  // true→mode:timed（30 秒可见倒计时，到期 pending 不阻塞）；false→legacy 阻塞等待。重启 DSH 生效。
+  timedAsk: true,
   // 开发模式（默认关）：开启才允许大模型在交互中定位并修复插件源码、用 comfymcp_dev 出报告；
   // 关闭时严禁修改任何插件源码，必须遵循插件规则执行。
   devMode: false,
 })
 
 const NUMBER_KEYS = new Set(['requestTimeoutMs', 'callTimeoutMs', 'controlPort', 'runTimeoutMin', 'autoAcceptFormSec'])
-const BOOLEAN_KEYS = new Set(['autoUnloadModel', 'autoConnect', 'embeddedServer', 'autoAcceptForm', 'devMode'])
+const BOOLEAN_KEYS = new Set(['autoUnloadModel', 'autoConnect', 'embeddedServer', 'autoAcceptForm', 'timedAsk', 'devMode'])
 const LIST_KEYS = new Set(['workflowDirs'])
 
 /**
@@ -189,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/lib/persist.js

@@ -73,6 +73,7 @@ export const OVERLAY_KEYS = [
   'runTimeoutMin',
   'autoAcceptForm',
   'autoAcceptFormSec',
+  'timedAsk',
   'devMode',
 ]
 

package/package.json

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