dsh-chat-embed 0.6.0 → 0.6.1

package/README.md

@@ -20,7 +20,7 @@
 | `locale/{en,zh}.json` | 插件管理器里显示的标题与简介 |
 | `cordis.patch.yml` | 组合补丁：向 profile 插入 `id: chat-embed` 的 loader 行 |
 | `scripts/verify-bundle.mjs` | 门禁：语法 / 清单 / loader 契约 / 服务注册表 / 显示资源 |
-| `test/` | 纯 Node 契约测试（伪造 DOM + 伪造桌面桥），57 项 |
+| `test/` | 纯 Node 契约测试（伪造 DOM + 伪造桌面桥 + 伪造 asar），81 项 |
 | `docs/architecture.md` | 内嵌契约、席位架构、壳补丁、升级复验清单（**接到项目先读这份**） |
 | `tools/shell-patch/` | 可选的桌面壳补丁：持久分区（跨重启免登录）+ 关闭磁盘缓存 |
 | `清理聊天缓存.cmd` / `restore-shell-patch.cmd` | 缓存回收 / 还原原版壳 |
@@ -190,6 +190,8 @@ node tools/shell-patch/patch-asar.cjs --help                     # 查看参数
 
 「检查补丁配置」调用 Host 侧只读探针（`GET /dsh-chat-embed/patch-check`），报告安装目录、`app.asar` 是否可写、是否已打补丁、补丁点是否还在（壳版本是否兼容）、备份与待替换文件是否存在、`app.asar` 的大小与内容哈希；报告同时复制到剪贴板，方便直接贴出去。
 
+**不需要自己装 Node.js**：探针会找出桌面版自带的 Node 运行时（`~/.dsh/dsh-runtimes/*/dependencies/node/`），并把一条完整可复制的命令写进报告——含正确的 Node 路径、补丁脚本路径和 `--resources` 安装目录（自定义/便携安装也能用）。
+
 Host 侧还注册了只读工具 **`dsh_chat_embed_patch_check`**：可以直接问 agent「我的聊天为什么重启后要重新登录」，它会自己去查这些事实，而不是让你跑命令再贴输出。
 
 补丁做两件事：`persist:` 固定分区（登录落盘）+ `cache:false`（不落 Chromium 缓存）。
@@ -212,7 +214,7 @@ dsh-chat-embed/
 ├── package.json               # 包名/版本、dsh.bundle.patch、dsh.client、exports/files
 ├── cordis.patch.yml           # 组合补丁：插入 id=chat-embed 的 loader 行
 ├── index.js                   # Host 半侧：补丁探针（HTTP + agent 工具）
-├── client.js                  # Client 半侧（约 3870 行，手写产物）
+├── client.js                  # Client 半侧（约 3912 行，手写产物）
 ├── locale/{en,zh}.json        # 插件管理器显示用 meta
 ├── icon.svg                   # 插件图标（插件管理器显示）
 ├── assets/
@@ -262,7 +264,7 @@ git clone <repo-url> dsh-chat-embed
 cd dsh-chat-embed
 
 # 无需安装依赖；直接跑门禁与测试
-npm run check     # 语法 + 清单 + 显示资源 + 服务注册表 + 76 项测试
+npm run check     # 语法 + 清单 + 显示资源 + 服务注册表 + 81 项测试
 npm test          # 只跑测试
 ```
 
@@ -313,6 +315,7 @@ plugin_manager { "action": "install_bundle", "target": "<本仓库克隆路径>"
 
 | 版本 | 变化 |
 | --- | --- |
+| `0.6.1` | 探针找出桌面版自带的 Node 运行时，自检报告与「复制补丁说明」直接给出可执行命令（含 `--resources`，支持自定义安装目录）；无需用户另装 Node |
 | `0.6.0` | 补丁可观测性：四态检测（未打 / 已开启 / **升级后失效** / 未检测）、未开启时的风险提示、菜单内「检查补丁配置」自检（Host 只读探针 `GET /dsh-chat-embed/patch-check`）、agent 工具 `dsh_chat_embed_patch_check`；Host 半侧改为读取真实 `app.asar`（`original-fs`，绕过 Electron 的 asar 目录拦截） |
 | `0.5.4` | 语言切换即时生效：翻译器改为 locale 绑定的单一来源，监听 `locale/change` 重渲染（不再依赖未注入的 `props.t`）；补语言切换测试 |
 | `0.5.3` | 修复 `locale` 探针（`t` 作用域错误）并补测试；诊断读数在测试环境下的 `<html lang>` 兼容 |

package/client.js

@@ -103,7 +103,7 @@ window.__ModuleLoader__.load({
     let openRightTabImpl = () => {}
 
     /** Build identity, surfaced in the panel so a packaged app can be diagnosed. */
-    const BUILD = '0.6.0'
+    const BUILD = '0.6.1'
 
     /** Where a re-applied instance finds the one it must take over from. */
     const INSTANCE_KEY = '__DSH_CHAT_EMBED_INSTANCE__'
@@ -2433,23 +2433,36 @@ window.__ModuleLoader__.load({
      * @param {(key: string) => string} t
      * @returns {string}
      */
-    function patchInstructions(t) {
-      return [
-        t('persistLabel') + '：' + t('persistHint'),
-        '',
-        '1) 在插件包目录（或仓库根目录）执行：',
-        '   node tools/shell-patch/patch-asar.cjs build',
-        '   脚本会自动探测安装目录并逐字节校验，生成 app.asar.new。',
-        '',
-        '2) 完全退出 DSH 后替换（任选其一）：',
-        '   - 运行 tools/shell-patch/watchdog.ps1，退出瞬间自动替换；',
-        '   - 手动把 resources\\app.asar.new 改名为 app.asar。',
-        '',
-        '3) 重启 DSH，回到这里应显示「' + t('persistOn') + '」。',
-        '',
-        '回滚：restore-shell-patch.cmd（把 app.asar.orig 换回去）。',
-        'Windows 之外的安装目录请用 --resources 指定。',
-      ].join('\n')
+    /**
+     * The clipboard copy behind "copy the patch instructions".
+     *
+     * The Host's probe supplies the exact command — including the Node binary
+     * that ships with the desktop app, so the user is not asked to install one.
+     *
+     * @param {(key: string) => string} t
+     * @param {any} [probe]
+     * @returns {string}
+     */
+    function patchInstructions(t, probe) {
+      const info = probe !== undefined && probe !== null ? probe : {}
+      const command =
+        typeof info.patchCommand === 'string' && info.patchCommand !== ''
+          ? info.patchCommand
+          : 'node tools/shell-patch/patch-asar.cjs build'
+      const lines = [t('persistLabel') + '：' + t('persistHint'), '']
+      lines.push('1) 执行下面这条命令（Desk 自带的 Node 运行时；无需另装 Node）：')
+      lines.push('   ' + command)
+      lines.push('   脚本会自动探测安装目录并逐字节校验，生成 app.asar.new。')
+      lines.push('')
+      lines.push('2) 完全退出 DSH 后替换（任选其一）：')
+      lines.push('   - 运行 tools/shell-patch/watchdog.ps1，退出瞬间自动替换；')
+      lines.push('   - 手动把 resources\\app.asar.new 改名为 app.asar。')
+      lines.push('')
+      lines.push('3) 重启 DSH，回到这里应显示「' + t('persistOn') + '」。')
+      lines.push('')
+      lines.push('回滚：restore-shell-patch.cmd（把 app.asar.orig 换回去）。')
+      lines.push('Windows 之外的安装目录请用 --resources 指定。')
+      return lines.join('\n')
     }
 
     /**
@@ -2461,6 +2474,9 @@ window.__ModuleLoader__.load({
      */
     const patchCheck = { running: false, report: '' }
 
+    /** One-shot cache of the Host probe, so both actions read the same facts. */
+    const patchProbe = { loaded: false, value: undefined }
+
     /**
      * Ask the Host half for the shell facts and render a copyable report.
      * Nothing here writes: the button only inspects.
@@ -2468,11 +2484,15 @@ window.__ModuleLoader__.load({
      * @param {(key: string) => string} t
      * @returns {Promise<void>}
      */
-    async function runPatchCheck(t) {
-      if (patchCheck.running) return
-      patchCheck.running = true
-      notify()
-      let report = ''
+    /**
+     * Ask the Host for the shell facts once per session. Both the copy action
+     * and the self-check read it, so the instructions never disagree with the
+     * report.
+     *
+     * @returns {Promise<any>} the probe, or undefined when the route is absent
+     */
+    async function fetchProbe() {
+      if (patchProbe.loaded) return patchProbe.value
       try {
         // The Host half serves this route; a relative fetch therefore works in
         // both the desktop app and the Web GUI, under any deployment prefix.
@@ -2481,7 +2501,23 @@ window.__ModuleLoader__.load({
           headers: { accept: 'application/json' },
           cache: 'no-store',
         })
-        const probe = response.ok ? await response.json() : undefined
+        patchProbe.value = response.ok ? await response.json() : undefined
+      } catch (error) {
+        patchProbe.value = undefined
+        void error
+      }
+      patchProbe.loaded = true
+      return patchProbe.value
+    }
+
+    async function runPatchCheck(t) {
+      if (patchCheck.running) return
+      patchCheck.running = true
+      notify()
+      let report = ''
+      try {
+        patchProbe.loaded = false
+        const probe = await fetchProbe()
         report = formatPatchReport(t, probe)
       } catch (error) {
         report = formatPatchReport(t, undefined) + '\n' + t('copyFailed') + ': ' + messageOf(error)
@@ -2516,6 +2552,10 @@ window.__ModuleLoader__.load({
       row('补丁点', probe.patchSite === true ? '存在' : probe.patchSite === false ? '不存在（壳版本不匹配）' : '未知')
       row('已打补丁', probe.patched === true ? '是' : probe.patched === false ? '否' : '未知')
       row('node', probe.node)
+      row('补丁命令', probe.patchCommand)
+      if (probe.nodeBinary === undefined) {
+        lines.push('（没有找到可用的 Node 运行时，需要先安装 Node.js 22 或更新）')
+      }
       row('说明', probe.detail)
       return lines.join('\n')
     }
@@ -3417,7 +3457,7 @@ window.__ModuleLoader__.load({
                         className: 'dce-menu-item',
                         'data-patch-help': 'true',
                         onClick: () => {
-                          void copyText(patchInstructions(t))
+                          void fetchProbe().then((probe) => copyText(patchInstructions(t, probe)))
                         },
                       },
                       h('span', { className: 'dce-menu-label' }, t('persistCopy')),
@@ -3712,6 +3752,8 @@ window.__ModuleLoader__.load({
         storePersistenceSeen,
         livePartitionState,
         patchInstructions,
+        fetchProbe,
+        patchProbe,
         formatPatchReport,
         runPatchCheck,
         patchCheck,

package/docs/architecture.md

@@ -3,7 +3,7 @@
 本文记录 `client.js` 里每一条**反直觉**的实现决策、支撑它的证据，以及升级桌面壳时必须重新验证的清单。
 
 目标运行环境：**`@deepseek-ai/dsh-desktop 0.2.2-rc.1`（Electron / Chromium）**。
-当前实现：**v0.6.0**（`client.js` 约 3871 行，76 项契约测试）。
+当前实现：**v0.6.1**（`client.js` 约 3912 行，81 项契约测试）。
 
 > **架构一句话**：聊天页直接渲染在**席位的布局盒**里（`.dce-panel.dce-inline`，`width/height:100%`），几何完全交给 CSS；席位只有两个 —— 中央主面板（`main`）和右栏聊天 tab —— 二者互斥，**哪边点哪边接管**，切换时 guest 重建一次并回到上次会话。
 
@@ -330,7 +330,7 @@ Host 半侧另有两条只读通道，专门用来回答"为什么重启后要
 
 | 通道 | 内容 |
 | --- | --- |
-| `GET /dsh-chat-embed/patch-check` | 安装目录、`app.asar` 是否可写、是否已打补丁、补丁点是否还存在、备份与待替换文件、大小与内容哈希 |
+| `GET /dsh-chat-embed/patch-check` | 安装目录、`app.asar` 是否可写、是否已打补丁、补丁点是否还存在、备份与待替换文件、大小与内容哈希、**可执行的补丁命令**（含自带 Node 运行时路径与 `--resources`） |
 | agent 工具 `dsh_chat_embed_patch_check` | 同一份读数，供模型直接查询（只读，无需审批） |
 
 > 读取 `app.asar` 必须走 Electron 的 `original-fs`：被补丁过的 `node:fs` 会把以 `.asar` 结尾的路径当成目录，`readFileSync` 直接 ENOENT。探针优先用 `original-fs`，普通 Node 下回落到 `node:fs`。

package/docs/publishing.md

@@ -5,13 +5,13 @@
 ## 版本与提交约定
 
 - 同时改 `package.json` 的 `version` 与 `client.js` 的 `BUILD`，两者必须一致；
-- 门禁必须绿：`npm run check`（`verify-bundle` + 76 项契约测试）；
+- 门禁必须绿：`npm run check`（`verify-bundle` + 81 项契约测试）；
 - 代码注释/提交信息英文，文档中文。
 
 ## 发版步骤
 
 ```powershell
-npm run check            # 门禁：verify-bundle + 76 项测试（prepublishOnly 也会跑）
+npm run check            # 门禁：verify-bundle + 81 项测试（prepublishOnly 也会跑）
 npm run pack:dist        # 产出 dist\dsh-chat-embed-<版本>.tgz
 gh release create v0.5.0 dist\dsh-chat-embed-0.5.0.tgz --title "v0.5.0" --notes-file dist\release-notes.md
 ```
@@ -31,8 +31,8 @@ Get-FileHash $env:TEMP\check\dsh-chat-embed-0.5.0.tgz -Algorithm SHA256
 | --- | --- |
 | 仓库 | <https://github.com/poluce/dsh-chat-embed> |
 | Release | <https://github.com/poluce/dsh-chat-embed/releases> |
-| 分发包 | `dsh-chat-embed-0.6.0.tgz`（16 个文件，约 70 kB） |
-| npm | `dsh-chat-embed@0.6.0`（<https://www.npmjs.com/package/dsh-chat-embed>，维护者 `poluce_auto`） |
+| 分发包 | `dsh-chat-embed-0.6.1.tgz`（16 个文件，约 70 kB） |
+| npm | `dsh-chat-embed@0.6.1`（<https://www.npmjs.com/package/dsh-chat-embed>，维护者 `poluce_auto`） |
 | 商店图标 | `assets/icon-180.png`（180×180 PNG） |
 | 商店截图 | `assets/screenshots/` + 仓库根 `screenshots.json`（6 张） |
 

package/index.js

@@ -18,10 +18,11 @@
  */
 
 import { createHash } from 'node:crypto'
-import { accessSync, constants, existsSync, readFileSync, statSync } from 'node:fs'
+import { accessSync, constants, existsSync, readdirSync, readFileSync, statSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { createRequire } from 'node:module'
+import { fileURLToPath } from 'node:url'
 
 export const name = 'dsh-chat-embed'
 
@@ -153,6 +154,72 @@ function readAsarEntry(file, entry) {
   return buffer.toString('utf8', offset, offset + Number(node.size))
 }
 
+/**
+ * Locate a Node binary that can run the patch tool.
+ *
+ * DSH runs every profile on its own packaged runtime, so the archive can be
+ * patched without the user installing Node. The order is: the runtime this
+ * Host is already running on, the managed runtime directory, then a system
+ * `node` on PATH.
+ *
+ * @returns {string | undefined} an absolute path, or undefined when none exists
+ */
+function findNodeBinary() {
+  const candidates = []
+  // A Node-hosted dsh reports its own executable.
+  if (typeof process.execPath === 'string' && process.execPath !== '' && /node(.exe)?$/i.test(process.execPath)) {
+    candidates.push(process.execPath)
+  }
+  // The managed runtime the desktop app installs beside its own data.
+  const home = process.env.DSH_HOME !== undefined && process.env.DSH_HOME !== '' ? process.env.DSH_HOME : join(homedir(), '.dsh')
+  const runtimes = join(home, 'dsh-runtimes')
+  try {
+    for (const entry of readdirSync(runtimes)) {
+      const base = join(runtimes, entry, 'dependencies', 'node', 'bin')
+      candidates.push(join(base, process.platform === 'win32' ? 'node.exe' : 'node'))
+    }
+  } catch (error) {
+    void error
+  }
+  if (process.platform === 'win32' && process.env.ProgramFiles !== undefined) {
+    candidates.push(join(process.env.ProgramFiles, 'nodejs', 'node.exe'))
+  } else {
+    candidates.push('/usr/local/bin/node')
+    candidates.push('/usr/bin/node')
+  }
+  for (const candidate of candidates) {
+    if (typeof candidate === 'string' && candidate !== '' && existsSync(candidate)) return candidate
+  }
+  return undefined
+}
+
+/**
+ * @param {string} node absolute path to a Node binary
+ * @param {string} script absolute path to patch-asar.cjs
+ * @param {string} [resources] install directory, so a non-standard location works
+ * @returns {string} a copy-pasteable command line
+ */
+function patchCommand(node, script, resources) {
+  const quote = (value) => (value.includes(' ') ? '"' + value + '"' : value)
+  const parts = [quote(node), quote(script), 'build']
+  // The tool only searches the usual install locations. When the Host found the
+  // shell somewhere else (a portable or custom install), it must say where.
+  if (typeof resources === 'string' && resources !== '') parts.push('--resources', quote(resources))
+  return parts.join(' ')
+}
+
+/**
+ * Locate the patch tool inside this package, so the reported command points at
+ * a file that actually exists on the user's disk.
+ *
+ * @returns {string | undefined}
+ */
+function findPatchScript() {
+  const here = dirname(fileURLToPath(import.meta.url))
+  const candidate = join(here, 'tools', 'shell-patch', 'patch-asar.cjs')
+  return existsSync(candidate) ? candidate : undefined
+}
+
 /**
  * Inspect the desktop shell and the optional patch. Read-only: no file here is
  * written, so this is safe to call from a diagnostics button.
@@ -222,6 +289,13 @@ function inspectShell(resources) {
   } catch (error) {
     report.detail = '解析 app.asar 失败：' + firstLine(error)
   }
+  // The user needs a Node binary to run the patch tool. The desktop app ships
+  // its own runtime, so nobody has to install one — report the exact command
+  // instead of telling them to install Node first.
+  report.patchScript = findPatchScript()
+  report.nodeBinary = findNodeBinary()
+  report.patchCommand =
+    report.nodeBinary === undefined ? undefined : patchCommand(report.nodeBinary, report.patchScript, resolved)
   return report
 }
 
@@ -332,4 +406,14 @@ export function apply(ctx) {
 }
 
 /** Exposed for tests and for the patch checker to reuse without a Context. */
-export const internals = { inspectShell, detectResources, readAsarEntry, readRealFile, resourcesCandidates, PROBE_PATH }
+export const internals = {
+  inspectShell,
+  detectResources,
+  readAsarEntry,
+  readRealFile,
+  resourcesCandidates,
+  findNodeBinary,
+  findPatchScript,
+  patchCommand,
+  PROBE_PATH,
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-chat-embed",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "author": "poluce <fishsummer@126.com>",
   "description": "Multi-tab AI chat embed for the DeepSeek Harness desktop app: DeepSeek, 豆包, ChatGPT, MiniMax, Kimi, Gemini and Grok, each signed in separately.",
   "type": "module",