dsh-plugin-workbench 0.0.8 → 0.0.9

package/CHANGELOG.md

@@ -4,6 +4,17 @@
 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，
 版本号遵循 [Semantic Versioning](https://semver.org/lang/zh-CN/)。
 
+## [0.0.9] - 2026-08-21
+
+### Added
+
+- **布局补丁自动修复（自愈）**：插件 host 端在启动时自动检测
+  `dsh-client-ui-layout` 客户端 bundle 是否还带 explorer 列补丁；若已被
+  DSH 升级 / `pnpm install` 覆盖还原（这正是 workbench 列无声消失的根因），
+  会自动重跑 `scripts/patch-layout.mjs` 重打。幂等（已打则跳过）、非阻塞
+  （spawn 后台执行，不影响启动）、安全（锚点不匹配时脚本 abort 不写文件，
+  仅记录警告，插件照常启动）。
+
 ## [0.0.8] - 2026-08-20
 
 ### Fixed

package/README.md

@@ -11,7 +11,8 @@
 粘贴 / 在系统中打开 / 在资源管理器打开）+ 图片内联预览，每个工作区独立保存状态。
 装上之后，DSH 网页就是一个轻量代码编辑器。
 
-> ⚠️ 安装后需打一个布局补丁（见下方安装节）。
+> ⚠️ 安装后需打一个布局补丁（见下方安装节）；0.0.9 起插件启动时会自动检测并重打，
+> DSH 升级覆盖 bundle 后无需再手动跑。
 
 ## 功能
 
@@ -53,14 +54,17 @@
 
 无需环境变量或配置文件，安装后打一次布局补丁即可：
 
-- **布局补丁**：`node node_modules/dsh-plugin-workbench/scripts/patch-layout.mjs`
-  （针对 `dsh-client-ui-layout@0.1.0-rc.6` 编写，DSH 升级覆盖 bundle 后需重跑）；
+- **布局补丁**：插件 host 端启动时自动检测并重跑 `scripts/patch-layout.mjs`
+  （幂等、非阻塞；针对 `dsh-client-ui-layout@0.1.0-rc.6` 编写）。DSH 升级覆盖
+  bundle 后插件会自动补回；若自动重打失败（锚点失效），可手动运行
+  `node node_modules/dsh-plugin-workbench/scripts/patch-layout.mjs`；
 - **行为偏好**（自动换行、亮暗主题、标签布局、文件树展开状态）按工作区持久化，无需手动配置；
 - **文件操作通道**：经 loopback RPC `/dsh-plugin-files`，写操作显式以 `danger-full-access` 执行，无外部配置项。
 
 ## 安装
 
 > 布局补丁针对 `dsh-client-ui-layout@0.1.0-rc.6` 编写，其他版本需更新锚点。
+> 0.0.9 起插件启动时自动检测并重打补丁（详见「配置」节）。
 
 ```powershell
 # npm（推荐）
@@ -86,6 +90,9 @@ node node_modules/dsh-plugin-workbench/scripts/patch-layout.mjs
 # 重启 dsh web
 ```
 
+> 0.0.9 起插件启动时会自动检测并重打布局补丁，DSH 升级后无需再手动跑；
+> 仅当自动重打失败（锚点失效）时才需手动执行上面的命令。
+
 ## 开发
 
 ```powershell
@@ -107,7 +114,8 @@ dsh plugin --profile web remove dsh-plugin-workbench
   右键菜单的新建/重命名/删除同样经该通道（loopback 信任，与编辑器保存一致）
 - 图片预览走同源路由 `/dsh-plugin-files/raw/<path>`：仅响应图片扩展名，
   先经 `ctx.fs.resolve → stat`（沙箱一致的路径解析）再读取字节，20MB 上限
-- DSH 升级会覆盖布局 bundle，需重新运行补丁脚本；锚点失效时更新 `scripts/patch-layout.mjs`
+- DSH 升级会覆盖布局 bundle；0.0.9 起插件启动时自动检测并重打补丁，
+  无需手动重跑；锚点失效时需更新 `scripts/patch-layout.mjs`
 - 本仓库不包含 DSH 编译产物
 
 ## 参与贡献

package/lib/index.js

@@ -1,7 +1,9 @@
 import { spawn } from "node:child_process";
-import { watch } from "node:fs";
-import { basename, dirname } from "node:path";
+import { existsSync, readFileSync, watch } from "node:fs";
+import { basename, dirname, join } from "node:path";
 import { cp, mkdir, rename, rm, writeFile } from "node:fs/promises";
+import { fileURLToPath } from "node:url";
+import { homedir } from "node:os";
 //#region src/index.ts
 const name = "dsh-plugin-workbench";
 const inject = [
@@ -154,10 +156,84 @@ function pathOf(payload) {
 	}
 }
 /**
+* The explorer-column patch markers that scripts/patch-layout.mjs injects into
+* the compiled dsh-client-ui-layout client bundle. A dsh upgrade (or a
+* `pnpm install` that refreshes the ui-layout package) silently reverts that
+* bundle, which makes the workbench column vanish even though this plugin is
+* fine — this is the exact failure this auto-heal guards against.
+*/
+const LAYOUT_PATCH_MARKERS = [
+	"\"explorerCol\": \"",
+	"setExplorer: (d, px) => {",
+	"renderSlot(\"explorer\"",
+	"conversationSeat"
+];
+/** Resolve the installed dsh-client-ui-layout client bundle (profile node_modules junction). */
+function layoutClientPath() {
+	const dshHome = process.env.DSH_HOME ?? join(homedir(), ".dsh");
+	return join(dshHome, "profiles", "node_modules", "@deepseek-ai", "dsh-client-ui-layout", "lib", "client.js");
+}
+/**
+* True when the ui-layout bundle already carries the explorer-column patch.
+* A missing bundle (non-standard install) is treated as "nothing to patch" so
+* the check never blocks a boot; an unreadable file likewise bails out to the
+* caller rather than throwing.
+*/
+function layoutIsPatched() {
+	try {
+		const target = layoutClientPath();
+		if (!existsSync(target)) return true;
+		const text = readFileSync(target, "utf8");
+		return LAYOUT_PATCH_MARKERS.every((marker) => text.includes(marker));
+	} catch {
+		return true;
+	}
+}
+/** Module-level guard so a HMR/re-apply burst never spawns the patch twice concurrently. */
+let layoutPatchScheduled = false;
+/**
+* Re-apply the ui-layout explorer-column patch when it is missing.
+*
+* The workbench column renders into a fourth `explorer` slot that is added to
+* the compiled dsh-client-ui-layout bundle by scripts/patch-layout.mjs. A dsh
+* upgrade silently reverts that bundle, so this re-runs the same
+* version-checked script: anchors that no longer match abort the script
+* WITHOUT writing, so an incompatible dsh version never corrupts the bundle —
+* it only logs a warning and the plugin still boots. Idempotent and
+* non-blocking (spawned fire-and-forget), so it never delays a boot.
+*/
+function ensureLayoutPatch() {
+	if (layoutPatchScheduled) return;
+	layoutPatchScheduled = true;
+	try {
+		if (layoutIsPatched()) return;
+		const script = join(dirname(dirname(fileURLToPath(import.meta.url))), "scripts", "patch-layout.mjs");
+		const child = spawn(process.execPath, [script], {
+			stdio: "inherit",
+			windowsHide: true
+		});
+		child.on("error", (err) => {
+			console.warn("[dsh-plugin-workbench] re-applying ui-layout explorer patch failed:", err.message);
+			layoutPatchScheduled = false;
+		});
+		child.on("close", (code) => {
+			if (code === 0) console.log("[dsh-plugin-workbench] re-applied the missing dsh-client-ui-layout explorer patch (likely reverted by a dsh upgrade).");
+			else {
+				console.warn(`[dsh-plugin-workbench] ui-layout patch exited ${code}; the dsh version may have changed — run scripts/patch-layout.mjs manually.`);
+				layoutPatchScheduled = false;
+			}
+		});
+	} catch (err) {
+		console.warn("[dsh-plugin-workbench] ui-layout patch check failed:", err);
+		layoutPatchScheduled = false;
+	}
+}
+/**
 * One filesystem-backed RPC endpoint pair. Reads never mutate; `signal`
 * cancels the underlying fs call (or aborts between steps).
 */
 function apply(ctx) {
+	ensureLayoutPatch();
 	const watchState = {
 		dirs: /* @__PURE__ */ new Map(),
 		files: /* @__PURE__ */ new Map(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-workbench",
   "description": "VS Code-style workspace file explorer + editable preview for the dsh web GUI",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "type": "module",
   "packageManager": "pnpm@11.21.0",
   "engines": {

package/src/index.ts

@@ -27,10 +27,12 @@
  */
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import { spawn } from 'node:child_process'
-import { watch as watchFs } from 'node:fs'
+import { existsSync, readFileSync, watch as watchFs } from 'node:fs'
 import type { FSWatcher } from 'node:fs'
-import { basename, dirname } from 'node:path'
+import { basename, dirname, join } from 'node:path'
 import { mkdir, rename as renameFs, rm, cp, writeFile as writeFileNode } from 'node:fs/promises'
+import { fileURLToPath } from 'node:url'
+import { homedir } from 'node:os'
 import type { Context } from '@deepseek-ai/cordis'
 
 export const name = 'dsh-plugin-workbench'
@@ -252,11 +254,89 @@ function pathOf(payload: unknown): string | undefined {
   return undefined
 }
 
+/**
+ * The explorer-column patch markers that scripts/patch-layout.mjs injects into
+ * the compiled dsh-client-ui-layout client bundle. A dsh upgrade (or a
+ * `pnpm install` that refreshes the ui-layout package) silently reverts that
+ * bundle, which makes the workbench column vanish even though this plugin is
+ * fine — this is the exact failure this auto-heal guards against.
+ */
+const LAYOUT_PATCH_MARKERS = [
+  '"explorerCol": "',
+  'setExplorer: (d, px) => {',
+  'renderSlot("explorer"',
+  'conversationSeat',
+] as const
+
+/** Resolve the installed dsh-client-ui-layout client bundle (profile node_modules junction). */
+function layoutClientPath(): string {
+  const dshHome = process.env.DSH_HOME ?? join(homedir(), '.dsh')
+  return join(dshHome, 'profiles', 'node_modules', '@deepseek-ai', 'dsh-client-ui-layout', 'lib', 'client.js')
+}
+
+/**
+ * True when the ui-layout bundle already carries the explorer-column patch.
+ * A missing bundle (non-standard install) is treated as "nothing to patch" so
+ * the check never blocks a boot; an unreadable file likewise bails out to the
+ * caller rather than throwing.
+ */
+function layoutIsPatched(): boolean {
+  try {
+    const target = layoutClientPath()
+    if (!existsSync(target)) return true
+    const text = readFileSync(target, 'utf8')
+    return LAYOUT_PATCH_MARKERS.every((marker) => text.includes(marker))
+  } catch {
+    return true
+  }
+}
+
+/** Module-level guard so a HMR/re-apply burst never spawns the patch twice concurrently. */
+let layoutPatchScheduled = false
+
+/**
+ * Re-apply the ui-layout explorer-column patch when it is missing.
+ *
+ * The workbench column renders into a fourth `explorer` slot that is added to
+ * the compiled dsh-client-ui-layout bundle by scripts/patch-layout.mjs. A dsh
+ * upgrade silently reverts that bundle, so this re-runs the same
+ * version-checked script: anchors that no longer match abort the script
+ * WITHOUT writing, so an incompatible dsh version never corrupts the bundle —
+ * it only logs a warning and the plugin still boots. Idempotent and
+ * non-blocking (spawned fire-and-forget), so it never delays a boot.
+ */
+function ensureLayoutPatch(): void {
+  if (layoutPatchScheduled) return
+  layoutPatchScheduled = true
+  try {
+    if (layoutIsPatched()) return
+    const script = join(dirname(dirname(fileURLToPath(import.meta.url))), 'scripts', 'patch-layout.mjs')
+    const child = spawn(process.execPath, [script], { stdio: 'inherit', windowsHide: true })
+    child.on('error', (err) => {
+      console.warn('[dsh-plugin-workbench] re-applying ui-layout explorer patch failed:', err.message)
+      layoutPatchScheduled = false
+    })
+    child.on('close', (code) => {
+      if (code === 0) {
+        console.log('[dsh-plugin-workbench] re-applied the missing dsh-client-ui-layout explorer patch (likely reverted by a dsh upgrade).')
+      } else {
+        console.warn(`[dsh-plugin-workbench] ui-layout patch exited ${code}; the dsh version may have changed — run scripts/patch-layout.mjs manually.`)
+        layoutPatchScheduled = false
+      }
+    })
+  } catch (err) {
+    console.warn('[dsh-plugin-workbench] ui-layout patch check failed:', err)
+    layoutPatchScheduled = false
+  }
+}
+
 /**
  * One filesystem-backed RPC endpoint pair. Reads never mutate; `signal`
  * cancels the underlying fs call (or aborts between steps).
  */
 export function apply(ctx: Context): void {
+  // Re-apply the ui-layout explorer-column patch when a dsh upgrade reverted it.
+  ensureLayoutPatch()
   // Per-apply watch state: created here (not module-level) so disable/reload
   // cycles never leak watchers or SSE clients across applies.
   const watchState: WatchState = {