@lyhue1991/dsh-soup 0.5.2 → 0.5.3

package/lib/codemirror-modules.js

@@ -0,0 +1,33 @@
+import * as commands from '@codemirror/commands'
+import * as css from '@codemirror/lang-css'
+import * as html from '@codemirror/lang-html'
+import * as javascript from '@codemirror/lang-javascript'
+import * as json from '@codemirror/lang-json'
+import * as markdown from '@codemirror/lang-markdown'
+import * as python from '@codemirror/lang-python'
+import * as sql from '@codemirror/lang-sql'
+import * as xml from '@codemirror/lang-xml'
+import * as language from '@codemirror/language'
+import * as highlight from '@lezer/highlight'
+import * as state from '@codemirror/state'
+import * as view from '@codemirror/view'
+
+const modules = {
+  '@codemirror/commands': commands,
+  '@codemirror/lang-css': css,
+  '@codemirror/lang-html': html,
+  '@codemirror/lang-javascript': javascript,
+  '@codemirror/lang-json': json,
+  '@codemirror/lang-markdown': markdown,
+  '@codemirror/lang-python': python,
+  '@codemirror/lang-sql': sql,
+  '@codemirror/lang-xml': xml,
+  '@codemirror/language': language,
+  '@lezer/highlight': highlight,
+  '@codemirror/state': state,
+  '@codemirror/view': view,
+}
+
+for (const [id, exports] of Object.entries(modules)) {
+  window.__ModuleLoader__.load({ id, factory: () => exports })
+}

package/lib/index.js

@@ -11,7 +11,7 @@
  * 仅 open/trash 这类"唤起系统"的动作按 `process.platform` 分支选命令。
  */
 
-import { rename, mkdir, writeFile, appendFile, open as openFile, stat, realpath } from 'node:fs/promises'
+import { rename, mkdir, writeFile, appendFile, open as openFile, rm, stat, realpath } from 'node:fs/promises'
 import { createReadStream } from 'node:fs'
 import { randomBytes } from 'node:crypto'
 import path from 'node:path'
@@ -390,7 +390,7 @@ export function apply(ctx) {
   }
 
   // ------------------------------------------------------------------
-  // 文件只读预览：read（文本/图片/二进制三态）；无 write——预览-only 不提供保存
+  // 文件预览/编辑：read（文本/图片/二进制三态）+ write（mtime/size 防覆盖保存）
   // ------------------------------------------------------------------
   /** 文本读取上限（超过则截断标记 truncated）。8 MB——HTML 常含内联 base64 图片，2 MB 太紧。 */
   const TEXT_MAX_BYTES = 8 * 1024 * 1024
@@ -413,7 +413,49 @@ export function apply(ctx) {
   }
 
   /**
-   * 读取文件供 tab 展示：图片返回 base64，文本返回内容（可截断），
+   * 保存预览编辑：mtime/size 防覆盖 + 同目录临时文件原子替换。
+   * fsync 无法通过 node:fs/promises 便携获得；rename 前先 close 已落盘，
+   * 已满足 UI 编辑场景的崩溃一致性下限，并保留写失败时原文件不变。
+   */
+  async function writeFileForEditor(pathArg, contentArg, expectedMtime, expectedSize, sessionIdArg) {
+    const rp = await confine(pathArg, '保存路径', sessionIdArg)
+    const content = typeof contentArg === 'string' ? contentArg : ''
+    const bytes = Buffer.from(content, 'utf8')
+    if (bytes.length > TEXT_MAX_BYTES) {
+      return { ok: false, error: `内容超过 ${TEXT_MAX_BYTES} 字节，禁止保存` }
+    }
+    let before
+    try {
+      before = await stat(rp)
+    } catch (err) {
+      if (err && err.code === 'ENOENT') return { ok: false, conflict: true, error: '文件已被删除，保存已取消' }
+      return { ok: false, error: `无法读取原文件: ${String((err && err.message) || err)}` }
+    }
+    if (before.isDirectory()) return { ok: false, error: '目标是目录，不支持保存' }
+    if (expectedMtime !== undefined && (Number(expectedMtime) !== before.mtimeMs
+      || Number(expectedSize) !== before.size)) {
+      return {
+        ok: false,
+        conflict: true,
+        error: '文件已被其他程序修改，请重新加载后再保存',
+        mtime: before.mtimeMs,
+        size: before.size,
+      }
+    }
+    const tempPath = `${rp}.dsh-soup-${process.pid}-${Date.now()}-${randomBytes(4).toString('hex')}.tmp`
+    try {
+      await writeFile(tempPath, bytes)
+      await rename(tempPath, rp)
+      const after = await stat(rp)
+      return { ok: true, size: after.size, mtime: after.mtimeMs }
+    } catch (err) {
+      await rm(tempPath, { force: true })
+      return { ok: false, error: `保存失败: ${String((err && err.message) || err)}` }
+    }
+  }
+
+  /**
+   * 读取文件供 tab 展示：图片返回 base64，文本返回内容与版本（可截断），
    * 二进制只返回元信息。统一走 node:fs/promises（跨平台、无 shell 注入面）。
    */
   async function readFileForView(path) {
@@ -715,6 +757,15 @@ export function apply(ctx) {
         const rp = await confine(args.path, '文件路径', sessionIdArg)
         return readFileForView(rp)
       }
+      case 'write': {
+        return writeFileForEditor(
+          args.path,
+          args.content,
+          args.expectedMtime,
+          args.expectedSize,
+          sessionIdArg,
+        )
+      }
       case 'download': {
         // 流式下载签发：围栏校验通过后发一张一次性、2 分钟时效的票据 URL，
         // 真正的字节由 /api/dsh-soup/dl 流式发送——任意大小文件零内存放大。

package/package.json

@@ -1,15 +1,38 @@
 {
   "name": "@lyhue1991/dsh-soup",
   "description": "DSH 项目资源管理器：右侧 details 列文件树（并列网格、宽度对齐宿主 details 合同 300-520px），有 Session log 时在其右侧、空白新会话在输入框上方右端提供 📁 切换按钮；支持多选、双击展开/打开、右键菜单（打开/系统打开/重命名/废纸篓/新建/复制路径）、拖拽移动、上传。文件「打开」在会话区新增「文件」标签页（原生 conversation.view，与对话/轨迹同级）：文本可编辑 ⌘S 保存、图片预览、二进制提示。附带模型吞吐徽标：输入框正上方显示「正在等待模型...」与彩色 t/s 徽标（数据来自 llm/stream 真实流）。附带 GoalBar 多行展示：把原生单行截断 GoalBar 放开为多行完整显示，编辑用 textarea，工具与数据仍走原生 goal。",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "type": "module",
   "main": "lib/index.js",
+  "scripts": {
+    "build": "esbuild lib/client.entry.js --bundle --format=iife --platform=browser --target=es2020 --outfile=lib/client.bundle.js",
+    "prepublishOnly": "npm run build",
+    "test": "npm run build && node --test test/client-goal.spec.mjs test/host.spec.mjs"
+  },
   "exports": {
     ".": "./lib/index.js",
-    "./client": "./lib/client.js",
+    "./client": "./lib/client.bundle.js",
     "./cordis.patch.yml": "./cordis.patch.yml",
     "./package.json": "./package.json"
   },
+  "dependencies": {
+    "@codemirror/commands": "^6.10.2",
+    "@codemirror/lang-css": "^6.3.1",
+    "@codemirror/lang-html": "^6.4.11",
+    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/lang-markdown": "^6.5.0",
+    "@codemirror/lang-python": "^6.2.1",
+    "@codemirror/lang-sql": "^6.10.0",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/language": "^6.12.1",
+    "@codemirror/state": "^6.5.4",
+    "@codemirror/view": "^6.39.14",
+    "@lezer/highlight": "^1.0.0"
+  },
+  "devDependencies": {
+    "esbuild": "^0.25.12"
+  },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"