dsh-comfyui-canvas 0.1.6 → 0.1.8

package/README.md

@@ -3,7 +3,7 @@
 > [中文](README.zh.md) · English
 
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
-[![Version](https://img.shields.io/badge/version-0.1.6-brightgreen.svg)](https://github.com/wbin0001/dsh-comfyui-canvas/releases)
+[![Version](https://img.shields.io/badge/version-0.1.7-brightgreen.svg)](https://github.com/wbin0001/dsh-comfyui-canvas/releases)
 [![GitHub Stars](https://img.shields.io/github/stars/wbin0001/dsh-comfyui-canvas.svg?style=social)](https://github.com/wbin0001/dsh-comfyui-canvas)
 [![DSH](https://img.shields.io/badge/DSH-v0.1.x-blueviolet.svg)](https://github.com/DeepSeek-Harness/DSH)
 [![ComfyUI](https://img.shields.io/badge/ComfyUI-0.34+-orange.svg)](https://github.com/comfyanonymous/ComfyUI)

package/README.zh.md

@@ -3,7 +3,7 @@
 > 中文 · [English](README.md)
 
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
-[![Version](https://img.shields.io/badge/version-0.1.6-brightgreen.svg)](https://github.com/wbin0001/dsh-comfyui-canvas/releases)
+[![Version](https://img.shields.io/badge/version-0.1.7-brightgreen.svg)](https://github.com/wbin0001/dsh-comfyui-canvas/releases)
 [![GitHub Stars](https://img.shields.io/github/stars/wbin0001/dsh-comfyui-canvas.svg?style=social)](https://github.com/wbin0001/dsh-comfyui-canvas)
 [![DSH](https://img.shields.io/badge/DSH-v0.1.x-blueviolet.svg)](https://github.com/DeepSeek-Harness/DSH)
 [![ComfyUI](https://img.shields.io/badge/ComfyUI-0.34+-orange.svg)](https://github.com/comfyanonymous/ComfyUI)

package/comfyui-bridge/ComfyUI-DSH-Canvas/__init__.py

@@ -9,7 +9,7 @@
 
 # Bridge release version. The DSH plugin compares this against its embedded
 # copy (see version.json) to decide whether an update is needed.
-__version__ = "0.1.6"
+__version__ = "0.1.7"
 
 import os
 import time

package/comfyui-bridge/ComfyUI-DSH-Canvas/version.json

@@ -1,4 +1,4 @@
 {
   "name": "ComfyUI-DSH-Canvas",
-  "version": "0.1.6"
+  "version": "0.1.7"
 }

package/lib/client.js

@@ -952,10 +952,16 @@ function ComfyUISettingsRow(props) {
   );
 }
 
-var inject = ["slots", "settingsScope"];
+var inject = ["slots"];
 
 function apply(ctx) {
-  var scope = ctx.settingsScope.bind({ namespace: NAMESPACE });
+  // 2026-09-24: 核心 #4587 移除了客户端 settingsScope 服务，且 cordis ctx 代理对
+// 未注入服务的属性访问（ctx.settingsScope）会直接抛 "cannot get property...
+// without inject"，导致客户端 apply 失败。改用 ctx.get()（缺失返回 undefined）。
+var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScope") : undefined;
+  var scope = settingsScopeService && typeof settingsScopeService.bind === "function"
+    ? settingsScopeService.bind({ namespace: NAMESPACE })
+    : undefined;
   // 画布顶栏「重启 / 关闭 ComfyUI」按钮 → 写 settings.comfyControl，
   // host watcher 执行 kill / restart（结果由可达性探测反映到状态圆点）。
   document.addEventListener("dsh-comfyui-control", function (e) {
@@ -966,7 +972,7 @@ function apply(ctx) {
   });
   // 让画布 iframe 使用设置里的地址（并跟随变更）。
   var syncConfig = function () {
-    var snap = scope.getSnapshot();
+    var snap = scope ? scope.getSnapshot() : undefined;
     var v = snap && snap.value;
     var base = v && typeof v.baseUrl === "string" && v.baseUrl
       ? v.baseUrl : DEFAULT_BASE;
@@ -984,7 +990,7 @@ function apply(ctx) {
     // 实时应用右侧面板宽度（发布 CSS 变量，分屏挤压样式引用）。
     applyRailWidth(v?.railWidth != null ? v.railWidth : DEFAULT_RAIL);
   };
-  scope.subscribe(syncConfig);
+  if (scope) scope.subscribe(syncConfig);
 
   // 全局看门狗：保证分屏标记与真实分屏态一致，杜绝 data-dsh-split-on 残留。
   // 挤压规则只在 html[data-dsh-split-on="1"] 时生效；一旦残留打上该属性，
@@ -998,7 +1004,7 @@ function apply(ctx) {
     return tab ? (tab.textContent || "").trim() : "";
   };
   var enforceSplitMarker = function () {
-    var snap = scope.getSnapshot();
+    var snap = scope ? scope.getSnapshot() : undefined;
     var v = snap && snap.value ? snap.value : {};
     var map = v.splitEnabledBySession || {};
     var anyEnabled = Object.keys(map).some(function (k) { return map[k] === true; });
@@ -1026,7 +1032,7 @@ function apply(ctx) {
     }
   };
   var splitWatchdog = null;
-  scope.subscribe(enforceSplitMarker);
+  if (scope) scope.subscribe(enforceSplitMarker);
   if (typeof MutationObserver === "function") {
     splitWatchdog = new MutationObserver(enforceSplitMarker);
     splitWatchdog.observe(
@@ -1051,14 +1057,16 @@ function apply(ctx) {
   var onNarrow = function () {
     var now = narrowQuery ? narrowQuery.matches : (window.innerWidth < 1200);
     if (now && !narrowWas) {
-      var snap = scope.getSnapshot();
+      var snap = scope ? scope.getSnapshot() : undefined;
       var v = snap && snap.value ? snap.value : {};
       var map = v.splitEnabledBySession || {};
       var anyEnabled = Object.keys(map).some(function (k) { return map[k] === true; });
       if (anyEnabled) {
         var cleared = {};
         for (var k in map) cleared[k] = false;
-        scope.set("splitEnabledBySession", cleared).catch(function () { /* recover handled by scope */ });
+        if (scope && typeof scope.set === "function") {
+          scope.set("splitEnabledBySession", cleared).catch(function () { /* recover handled by scope */ });
+        }
         // 同步清理 DOM，避免 settings 异步落地前挤压样式/画布残留。
         document.documentElement.removeAttribute("data-dsh-split-on");
         document.documentElement.removeAttribute("data-dsh-rail-closed");

package/lib/index.js

@@ -303,6 +303,8 @@ export function apply(ctx) {
   // Function-level handle to the settings scope (used by comfyui_config's
   // activeView read); undefined when the settings service is unavailable.
   let settingsScope = undefined
+  // Assigned after a successful settings.register; no-op until then.
+  let safeUpdate = () => undefined
   // The background process handle of the ComfyUI launched by this plugin, so
   // the canvas header's stop/restart buttons can kill it directly.
   let comfyProc = null
@@ -344,6 +346,12 @@ export function apply(ctx) {
     try {
       const scope = settings.register(NAMESPACE, ConfigSchema, { applies: 'live' })
       settingsScope = scope
+      // Every queued settings write is a promise. try/catch CANNOT see its
+      // rejection, and an unhandled rejection is fatal to boot (installFailLoud
+      // reports it as "fatal load failure"). Funnel all writes through here.
+      safeUpdate = (patch) => {
+        try { void Promise.resolve(scope.update(patch)).catch(() => undefined) } catch { /* best effort */ }
+      }
       resolveBase = () => {
         const value = scope.get()
         const base = (value?.baseUrl || DEFAULT_BASE).replace(/\/+$/, '')
@@ -362,7 +370,7 @@ export function apply(ctx) {
         void (async () => {
           const fail = (message) => {
             console.error(`[dsh-comfyui-canvas] ${message}`)
-            try { scope.update({ launchError: message }) } catch { /* best effort */ }
+            safeUpdate({ launchError: message })
           }
           try {
             const cmd = (value?.launchCommand || '').trim()
@@ -371,7 +379,7 @@ export function apply(ctx) {
               return
             }
             // Clear any stale error from a previous attempt before launching.
-            try { scope.update({ launchError: '' }) } catch { /* best effort */ }
+            safeUpdate({ launchError: '' })
             const workdir = (value?.comfyuiDir || '').trim() || undefined
             const shell = ctx.get?.('shell')
             if (shell && typeof shell.start === 'function') {
@@ -405,7 +413,7 @@ export function apply(ctx) {
             }
           } finally {
             launching = false
-            try { scope.update({ launchRequested: false }) } catch { /* best effort */ }
+            safeUpdate({ launchRequested: false })
           }
         })()
       })
@@ -426,7 +434,7 @@ export function apply(ctx) {
             const base = resolveBase()
             const result = await probeBridgeAuth(base, token)
             try {
-              scope.update({ bridgeProbe: result, probeRequested: false })
+              safeUpdate({ bridgeProbe: result, probeRequested: false })
             } catch { /* best effort */ }
           } finally {
             probing = false
@@ -439,7 +447,7 @@ export function apply(ctx) {
       try {
         const pkgPath = fileURLToPath(new URL('../package.json', import.meta.url))
         const version = String(JSON.parse(readFileSync(pkgPath, 'utf8')).version || '')
-        if (version) scope.update({ pluginVersion: version })
+        if (version) safeUpdate({ pluginVersion: version })
       } catch { /* best effort */ }
 
       // Plugin-update watcher: the settings page sets updateRequest with
@@ -455,7 +463,7 @@ export function apply(ctx) {
         updatingPlugin = true
         void (async () => {
           const setState = (patch) => {
-            try { scope.update(patch) } catch { /* best effort */ }
+            safeUpdate(patch)
           }
           try {
             const action = req.action === 'update' ? 'update' : 'check'
@@ -545,7 +553,7 @@ export function apply(ctx) {
         controlling = true
         void (async () => {
           const setState = (patch) => {
-            try { scope.update(patch) } catch { /* best effort */ }
+            safeUpdate(patch)
           }
           try {
             const action = ctrl.action === 'restart' ? 'restart' : 'stop'
@@ -810,6 +818,9 @@ export function apply(ctx) {
       },
       matrix: {
         type: 'object',
+        // Required by the tool-schema compiler: object params must declare
+        // additionalProperties explicitly (see packages/core/tools/src/schema.ts).
+        additionalProperties: true,
         description: 'Declarative parameter sweep: {fields: [{nodeId, key, values}], mode: "zip"|"product"}. Expanded into runs. Use this OR runs, not both.',
       },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-comfyui-canvas",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Give DeepSeek Harness agents live control of your ComfyUI canvas (local or cloud): embed it as a split-screen tab, then read/edit/run workflows, debug errors, fetch output images, and batch-sweep parameters straight from the chat. Ships the ComfyUI-side bridge node.",
   "type": "module",
   "main": "lib/index.js",
@@ -49,8 +49,7 @@
     "client": {
       "platform": "web",
       "inject": [
-        "@deepseek-ai/dsh-client-ui-settings",
-        "@deepseek-ai/dsh-client-runtime"
+        "@deepseek-ai/dsh-client-ui-settings"
       ]
     },
     "bundle": { "patch": "./cordis.patch.yml" }