dsh-comfyui-canvas 0.1.7 → 0.1.9

package/lib/client.js

@@ -524,8 +524,9 @@ function ComfyUISplitToggle(props) {
   var sessionId = String(props.sessionId ?? "root");
   var scope = props.scope;
   var snapshot = React.useSyncExternalStore(
-    function (cb) { return scope.subscribe(cb); },
-    function () { return scope.getSnapshot(); },
+    function (cb) { return scope && typeof scope.subscribe === "function" ? scope.subscribe(cb) : function () {}; },
+    function () { return scope && typeof scope.getSnapshot === "function" ? scope.getSnapshot() : null; },
+    function () { return scope && typeof scope.getSnapshot === "function" ? scope.getSnapshot() : null; },
   );
   var value = (snapshot && snapshot.value) || {};
   var map = value.splitEnabledBySession || {};
@@ -590,7 +591,9 @@ function ComfyUISplitToggle(props) {
     drag.lastW = w;
     // 即时生效（CSS 变量驱动挤压样式），并持久化 railWidth。
     applyRailWidth(w);
-    scope.set("railWidth", w).catch(function () { /* recover handled by scope */ });
+    if (scope && typeof scope.set === "function") {
+      scope.set("railWidth", w).catch(function () { /* recover handled by scope */ });
+    }
     // 拖动中实时重算画布覆盖层与把手位置（rail 左缘随宽度变化），
     // 否则把手会停在起点，脱离 rail 边界。
     var st = canvasState();
@@ -667,14 +670,18 @@ function ComfyUISplitToggle(props) {
     var next = {};
     for (var k in map) next[k] = map[k];
     next[sessionId] = !enabled;
-    scope.set("splitEnabledBySession", next).catch(function () { /* recover handled by scope */ });
+    if (scope && typeof scope.set === "function") {
+      scope.set("splitEnabledBySession", next).catch(function () { /* recover handled by scope */ });
+    }
   };
 
   var toggleRail = function () {
     var next = {};
     for (var k in railClosedMap) next[k] = railClosedMap[k];
     next[sessionId] = !railClosed;
-    scope.set("railClosedBySession", next).catch(function () { /* recover handled by scope */ });
+    if (scope && typeof scope.set === "function") {
+      scope.set("railClosedBySession", next).catch(function () { /* recover handled by scope */ });
+    }
   };
 
   // 顶栏折叠图标（buildCanvas 里 #dsh-comfy-rail-toggle）的点击事件 →
@@ -774,8 +781,9 @@ function ComfyUISplitToggle(props) {
 function ComfyUISettingsRow(props) {
   var scope = props.scope;
   var snapshot = React.useSyncExternalStore(
-    function (cb) { return scope.subscribe(cb); },
-    function () { return scope.getSnapshot(); },
+    function (cb) { return scope && typeof scope.subscribe === "function" ? scope.subscribe(cb) : function () {}; },
+    function () { return scope && typeof scope.getSnapshot === "function" ? scope.getSnapshot() : null; },
+    function () { return scope && typeof scope.getSnapshot === "function" ? scope.getSnapshot() : null; },
   );
   var value = (snapshot && snapshot.value) || {};
   var baseUrl = typeof value.baseUrl === "string" && value.baseUrl ? value.baseUrl : DEFAULT_BASE;
@@ -952,10 +960,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 +980,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 +998,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 +1012,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 +1040,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 +1065,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-comfyui-canvas",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "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" }