dsh-code-ui 1.6.0 → 1.6.2

package/lib/client.js

@@ -2414,10 +2414,6 @@ window.__ModuleLoader__.load({
         const snap = shell && shell.snapshot
         if (!snap || typeof snap.draftRev !== 'number' || typeof snap.draft !== 'string') return false
         if (snap.phase && snap.phase !== 'plain' && snap.phase !== 'claimed') return false
-        const inputTriggers = store.inputTriggers
-        if (!inputTriggers || !inputTriggers.live || !inputTriggers.live.controllers) return false
-        const controller = inputTriggers.live.controllers.get(sid)
-        if (!controller || typeof controller.execute !== 'function') return false
         let detectLen = snap.draft.length
         const occs = Array.isArray(snap.occurrences) ? snap.occurrences : []
         for (const o of occs) {
@@ -2425,8 +2421,20 @@ window.__ModuleLoader__.load({
         }
         if (detectLen < 0) detectLen = 0
         const label = chipLabelFor(r)
-        const outcome = { insert: { source: 'code-ui', ref: JSON.stringify({ id: r.id, path: r.path, lineStart: r.lineStart, lineEnd: r.lineEnd, kind: r.kind }), label: label, appearance: 'file', clipboardText: label } }
-        return controller.execute(outcome, { start: detectLen, end: detectLen, draftRev: snap.draftRev }) === true
+        const span = { start: detectLen, end: detectLen, draftRev: snap.draftRev }
+        const insert = { source: 'code-ui', ref: JSON.stringify({ id: r.id, path: r.path, lineStart: r.lineStart, lineEnd: r.lineEnd, kind: r.kind }), label: label, appearance: 'file', clipboardText: label }
+        // 0.2.0-rc.x：优先走 shell.insertReference 公共契约（span-CAS，Lexical 离散更新，
+        // 立即渲染）。旧路径（inputTriggers.live.controllers.get(sid)）在 0.2.0 上失效——
+        // controllers 改按 SessionBinding 对象键控，字符串 sid 取不到 controller，
+        // chip 插不进去，发送时才由 submit 补丁附带指针（表现为「引用回车才出现」）。
+        if (typeof shell.insertReference === 'function') {
+          return shell.insertReference(insert, span) === true
+        }
+        const inputTriggers = store.inputTriggers
+        if (!inputTriggers || !inputTriggers.live || !inputTriggers.live.controllers) return false
+        const controller = inputTriggers.live.controllers.get(sid)
+        if (!controller || typeof controller.execute !== 'function') return false
+        return controller.execute({ insert: insert }, span) === true
       } catch (e) { return false }
     }
     // chip ref（JSON 串）→ 引用数据；解析失败返回 null

package/lib/index.js

@@ -8,7 +8,7 @@ import { Remote, bindTypertRemote } from "@deepseek-ai/dsh-typert-protocol";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import z from "@deepseek-ai/schemastery";
 import { spawn } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, watch, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, statSync, watch, writeFileSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -696,7 +696,48 @@ function unwatchAllFiles() {
 }
 
 function rpcHandler(ctx) {
-  const fs = ctx.get("fs");
+  // fs 服务延迟获取：插件 apply 可能早于 base bundle 的 fs-sandbox 行挂载，
+  // apply 时一次性 ctx.get("fs") 会永久取到 undefined（0.2.0-rc.2 实测：
+  // list-dir/stat-path/read-file 全部抛 "Cannot read properties of
+  // undefined (reading 'resolve')"）。改为 inject 等待 + 调用时解析。
+  let fsSvc = null;
+  try { fsSvc = ctx.get("fs") || null; } catch (_) {}
+  try {
+    ctx.inject(["fs"], (c) => { fsSvc = c.fs || fsSvc; });
+  } catch (_) {}
+  // 宿主组合始终无 fs 服务时的原生兜底：与 fs-mkdir/write-file 等磁盘端点
+  // 同一权限模型（编辑器是用户显式操作面，本就读写真实磁盘）。
+  const nativeFsShim = {
+    resolve: async (p) => p,
+    stat: async (p) => {
+      try {
+        const s = statSync(p);
+        return { type: s.isDirectory() ? "directory" : s.isFile() ? "file" : "other" };
+      } catch (_) { return null; }
+    },
+    listDir: async (p) => {
+      const sep = String(p).includes("\\") ? "\\" : "/";
+      return readdirSync(p, { withFileTypes: true }).map((d) => ({
+        name: d.name,
+        path: String(p).replace(/[\\/]+$/, "") + sep + d.name,
+        isDir: d.isDirectory(),
+      }));
+    },
+    readBytes: async (p, _signal, maxBytes) => {
+      const b = readFileSync(p);
+      if (b.length > maxBytes) {
+        const e = new Error("file too large");
+        e.code = "FS_TOO_LARGE";
+        throw e;
+      }
+      return new Uint8Array(b.buffer, b.byteOffset, b.byteLength);
+    },
+    readByteRange: async (p, range) => {
+      const b = readFileSync(p);
+      return new Uint8Array(b.buffer, b.byteOffset, b.byteLength).slice(range.offset, range.offset + range.length);
+    },
+  };
+  const getFs = () => fsSvc || nativeFsShim;
   let currentRootRef = detectWorkspaceRoot(ctx); // 最近一次解析的根：list-dir 的兜底
   // 每会话根目录记忆：sessionId -> 手动设置的根（「以此文件夹为根」）。
   // 按会话隔离——手动根只影响设置它的那个会话，不再全局污染其它会话的自动解析；
@@ -792,8 +833,9 @@ function rpcHandler(ctx) {
       if (endpoint === "list-dir") {
         const path = args.path || currentRootRef;
         if (!path) return ok({ error: "no-root" });
-        const target = await fs.resolve(path);
-        const entries = await fs.listDir(target);
+        const fsvc = getFs();
+        const target = await fsvc.resolve(path);
+        const entries = await fsvc.listDir(target);
         const sep = String(path).includes("\\") ? "\\" : "/";
         const list = entries.map((e) => {
           let name = null;
@@ -820,8 +862,9 @@ function rpcHandler(ctx) {
 
       if (endpoint === "stat-path") {
         if (!args.path) return ok({ error: "no-path" });
-        const target = await fs.resolve(args.path);
-        const info = await fs.stat(target);
+        const fsvc = getFs();
+        const target = await fsvc.resolve(args.path);
+        const info = await fsvc.stat(target);
         // DSH fs.stat 返回 FsInfo { type: 'file' | 'directory' | 'other' }，
         // 没有 isDirectory/isFile 布尔字段；必须按 type 判定（原实现恒为 false，
         // 导致目录路径被误报为「不存在」）。保留遗留字段兼容。
@@ -833,19 +876,20 @@ function rpcHandler(ctx) {
 
       if (endpoint === "read-file") {
         if (!args.path) return ok({ error: "no-path" });
-        const target = await fs.resolve(args.path);
+        const fsvc = getFs();
+        const target = await fsvc.resolve(args.path);
         // 对齐 dsh ≥ 0.1.7-rc.1 的二进制 Remote 结果契约：字节经 Uint8Array 字段返回，
         // gateway 自动投影为 multipart 附件下发；0.1.5/0.1.6 老宿主无投影则走 JSON
         // （Uint8Array 落成下标对象，客户端负责重建），同一份代码两端兼容。
         // 取代旧的 60 万字符文本截断——截断内容若被 Ctrl+S 原样写回会写坏大文件。
         const MAX = 4 * 1024 * 1024; // 单次读取上限 4MB
         try {
-          const bytes = await fs.readBytes(target, undefined, MAX);
+          const bytes = await fsvc.readBytes(target, undefined, MAX);
           return ok({ path: args.path, bytes, truncated: false, size: bytes.length });
         } catch (err) {
-          if (!err || err.code !== "FS_TOO_LARGE" || typeof fs.readByteRange !== "function") throw err;
+          if (!err || err.code !== "FS_TOO_LARGE" || typeof fsvc.readByteRange !== "function") throw err;
           // 超限文件读前 4MB，标记 truncated；客户端据此禁写并提示
-          const bytes = await fs.readByteRange(target, { offset: 0, length: MAX });
+          const bytes = await fsvc.readByteRange(target, { offset: 0, length: MAX });
           return ok({ path: args.path, bytes, truncated: true });
         }
       }

package/package.json

@@ -1,94 +1,94 @@
-{
-  "name": "dsh-code-ui",
-  "version": "1.6.0",
-  "description": "Cursor 风格的 AI 代码编辑器工作台插件（DSH）：文件树、多标签页编辑、语法高亮、引用/翻译行内标签给 AI、右侧停靠/悬浮窗口双布局",
-  "type": "module",
-  "main": "lib/index.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/soGoodayo/dsh-code-ui.git"
-  },
-  "homepage": "https://github.com/soGoodayo/dsh-code-ui#readme",
-  "bugs": {
-    "url": "https://github.com/soGoodayo/dsh-code-ui/issues"
-  },
-  "exports": {
-    ".": {
-      "default": "./lib/index.js"
-    },
-    "./client": {
-      "default": "./lib/client.js"
-    },
-    "./cordis.patch.yml": "./cordis.patch.yml",
-    "./icon": "./icon.svg",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "cordis.patch.yml",
-    "icon.svg",
-    "README.md",
-    "LICENSE"
-  ],
-  "engines": {
-    "dsh": ">=0.1.5-rc.1 <0.3.0"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-ui-slots",
-        "@deepseek-ai/dsh-client-ui-conversation",
-        "@deepseek-ai/dsh-client-ui-settings",
-        "@deepseek-ai/dsh-client-ui-theme"
-      ],
-      "platform": "web"
-    }
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh": ">=0.1.5-rc.1 <0.3.0",
-    "@deepseek-ai/dsh-typert-protocol": ">=0.1.5-rc.1 <0.3.0",
-    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.1 <0.3.0",
-    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.7 <0.3.0",
-    "react": "^18.2.0"
-  },
-  "peerDependenciesMeta": {
-    "@deepseek-ai/dsh-typert-protocol": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-tools": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-settings": {
-      "optional": true
-    }
-  },
-  "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1"
-  },
-  "devDependencies": {
-    "@deepseek-ai/dsh-typert-protocol": "^0.2.0-rc.2",
-    "@types/node": "^26.2.0",
-    "@types/react": "~18.3.1",
-    "react": "^18.3.1",
-    "tsdown": "^0.22.14",
-    "typescript": "^7.0.2"
-  },
-  "scripts": {},
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "license": "MIT",
-  "keywords": [
-    "dsh",
-    "deepseek-harness",
-    "cursor",
-    "editor",
-    "code-ui",
-    "plugin"
-  ],
-  "packageManager": "pnpm@11.23.0+sha512.f00082e5b283a199b74e079da28d155c008fe232f44c8a06ea7ddfa014ecf719fc362f790ecc67b28106ddac2afb24c49a9a079159da560b2ce7d1e98efd11af"
-}
+{
+  "name": "dsh-code-ui",
+  "version": "1.6.2",
+  "description": "Cursor 风格的 AI 代码编辑器工作台插件（DSH）：文件树、多标签页编辑、语法高亮、引用/翻译行内标签给 AI、右侧停靠/悬浮窗口双布局",
+  "type": "module",
+  "main": "lib/index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/soGoodayo/dsh-code-ui.git"
+  },
+  "homepage": "https://github.com/soGoodayo/dsh-code-ui#readme",
+  "bugs": {
+    "url": "https://github.com/soGoodayo/dsh-code-ui/issues"
+  },
+  "exports": {
+    ".": {
+      "default": "./lib/index.js"
+    },
+    "./client": {
+      "default": "./lib/client.js"
+    },
+    "./cordis.patch.yml": "./cordis.patch.yml",
+    "./icon": "./icon.svg",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "cordis.patch.yml",
+    "icon.svg",
+    "README.md",
+    "LICENSE"
+  ],
+  "engines": {
+    "dsh": ">=0.1.5-rc.1 <0.3.0"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-slots",
+        "@deepseek-ai/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-settings",
+        "@deepseek-ai/dsh-client-ui-theme"
+      ],
+      "platform": "web"
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh": ">=0.1.5-rc.1 <0.3.0",
+    "@deepseek-ai/dsh-typert-protocol": ">=0.1.5-rc.1 <0.3.0",
+    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.1 <0.3.0",
+    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.7 <0.3.0",
+    "react": "^18.2.0"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-typert-protocol": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-tools": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-settings": {
+      "optional": true
+    }
+  },
+  "dependencies": {
+    "@deepseek-ai/schemastery": "^3.18.1"
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-typert-protocol": "^0.2.0-rc.2",
+    "@types/node": "^26.2.0",
+    "@types/react": "~18.3.1",
+    "react": "^18.3.1",
+    "tsdown": "^0.22.14",
+    "typescript": "^7.0.2"
+  },
+  "scripts": {},
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "license": "MIT",
+  "keywords": [
+    "dsh",
+    "deepseek-harness",
+    "cursor",
+    "editor",
+    "code-ui",
+    "plugin"
+  ],
+  "packageManager": "pnpm@11.23.0+sha512.f00082e5b283a199b74e079da28d155c008fe232f44c8a06ea7ddfa014ecf719fc362f790ecc67b28106ddac2afb24c49a9a079159da560b2ce7d1e98efd11af"
+}