dsh-multi-chat 0.6.4 → 0.6.5

package/README.md

@@ -56,7 +56,7 @@ npx dsh-multi-chat start --ports 3080,3081,3082
 - **No official logic is touched**: the plugin only registers two **additive list slots** (`conversation.view` ring entry, `sidebar.footer.action` sidebar shortcut) and five read-only JSON routes (`/multi/api/ports`, `/multi/api/status`, `/multi/api/stop`, `/multi/api/create`, `/multi/api/link`). No existing slot is replaced, no line is rewritten, and no core session/agent/tool logic is touched.
 - **The UI is the official UI**: the wall is a view in the official view ring rendered inside the chat panel (not a popup). Theme, type scale, icons, and controls all use the official `--dsw-*` tokens and official primitives (Button/Input/Menu/StateDot).
 - **Recursion guard**: the wall never embeds its own port; embedded pages carry a `?multi-wall=embed` flag and register no wall UI, preventing infinite "wall-in-wall" recursion.
-- **Minimal footprint**: one client plugin package + one patch line.
+- **Minimal footprint**: one declarative client plugin package — it ships its own `dsh.bundle.patch` + `cordis.patch.yml`, so DSH mounts it as a bundle layer automatically.
 
 ## Directory layout
 
@@ -64,9 +64,9 @@ npx dsh-multi-chat start --ports 3080,3081,3082
 plugin/dsh-client-ui-multi-wall/   # spec-compliant client plugin package (node half + browser half)
   lib/                             # built artifacts (lib/index.js + lib/client.js + types)
   src/                             # source (mirrors the official monorepo packages/client/ui-multi-wall)
-patches/multi-wall.yml             # cordis.patch.yml insert line that enables the plugin
+patches/multi-wall.yml             # optional `--patch` overlay (usually not needed; the plugin auto-mounts via dsh.bundle)
 scripts/
-  install-plugin.ps1               # pack + install into profile + append patch + prompt restart
+  install-plugin.ps1               # pack + install into profile (DSH auto-mounts the bundle) + prompt restart
   start-multi.ps1 / stop-multi.ps1 # start/stop multiple dsh web instances (-Remote can carry an authenticated gateway)
   gateway.mjs                      # token-authenticated / optional-TLS reverse-proxy gateway (phone/remote access)
   gateway-hidden.vbs               # no-window launcher: starts gateway.mjs hidden (no console flash)
@@ -78,7 +78,8 @@ harness-src/                       # official deepseek-harness source (dev/build
 ## Install & enable (Windows)
 
 ```powershell
-# 1) Pack and install into the web profile, appends the patch line automatically
+# 1) Pack and install into the web profile. The plugin declares dsh.bundle.patch,
+#    so DSH auto-mounts its bundle layer — no manual patch edit.
 .\scripts\install-plugin.ps1
 
 # 2) Restart dsh web and open any instance
@@ -90,8 +91,13 @@ Or manual:
 
 ```bash
 cd plugin/dsh-client-ui-multi-wall && npm pack          # produce a tarball
-dsh plugin --profile web add <tarball>                  # install into the profile
-# Append the insert line from patches/multi-wall.yml to ~/.dsh/profiles/web/cordis.patch.yml
+dsh plugin --profile web add <tarball>                  # DSH adds the package to the bundle layer stack automatically
+```
+
+Uninstall (one command, nothing manual to clean up):
+
+```bash
+dsh plugin --profile web remove @deepseek-ai/dsh-client-ui-multi-wall
 ```
 
 ## Usage

package/README.zh.md

@@ -56,7 +56,7 @@ npx dsh-multi-chat start --ports 3080,3081,3082
 - **不改动任何官方逻辑**：插件只注册两个**增量列表槽位**（`conversation.view` 视图环条目、`sidebar.footer.action` 侧边栏快捷入口）和五个只读 JSON 路由（`/multi/api/ports`、`/multi/api/status`、`/multi/api/stop`、`/multi/api/create`、`/multi/api/link`）。不替换任何既有槽位、不改写任何行、不触碰会话/代理/工具等核心逻辑。
 - **界面就是官方界面**：墙是官方视图环的一个视图，渲染在对话主面板内（不是弹层），主题、字号、图标、控件全部走官方 `--dsw-*` token 与官方 primitives（Button/Input/Menu/StateDot）。
 - **递归防护**：墙永远不嵌入自身端口；被嵌入页面带 `?multi-wall=embed` 标记，不注册任何墙界面，杜绝「墙中墙」无限递归。
-- **最小改动**：新增一个 client 插件包 + 一个 patch 行。
+- **最小改动**：一个声明式 client 插件包 —— 包内自带 `dsh.bundle.patch` + `cordis.patch.yml`，DSH 启动时自动作为 bundle 层挂载，无需手改任何文件。
 
 ## 目录结构
 
@@ -64,9 +64,9 @@ npx dsh-multi-chat start --ports 3080,3081,3082
 plugin/dsh-client-ui-multi-wall/   # 官方规范 client 插件包（node half + browser half）
   lib/                             # 已构建产物（lib/index.js + lib/client.js + 类型）
   src/                             # 源码（与官方 monorepo packages/client/ui-multi-wall 一致）
-patches/multi-wall.yml             # 启用插件的 cordis.patch.yml insert 行
+patches/multi-wall.yml             # 可选 `--patch` overlay（通常不需要；插件经 dsh.bundle 自动挂载）
 scripts/
-  install-plugin.ps1               # 打包 + 装进 profile + 追加 patch + 提示重启
+  install-plugin.ps1               # 打包 + 装进 profile（DSH 自动挂载 bundle 层）+ 提示重启
   start-multi.ps1 / stop-multi.ps1 # 启停多个 dsh web 实例（-Remote 可带认证网关）
   gateway.mjs                      # 带令牌认证 / 可选 TLS 的反向代理网关（手机/远程访问）
   gateway-hidden.vbs               # 无窗口启动器：用隐藏窗口方式启动 gateway.mjs（不弹控制台）
@@ -78,7 +78,8 @@ harness-src/                       # 官方 deepseek-harness 源码（开发/构
 ## 安装与启用（Windows）
 
 ```powershell
-# 1) 打包并装进 web profile，自动追加 patch 行
+# 1) 打包并装进 web profile。插件声明了 dsh.bundle.patch，
+#    DSH 会自动挂载其 bundle 层 —— 无需手改 patch。
 .\scripts\install-plugin.ps1
 
 # 2) 重启 dsh web，打开任意实例
@@ -90,8 +91,13 @@ dsh web --port 3084
 
 ```bash
 cd plugin/dsh-client-ui-multi-wall && npm pack          # 得到 tarball
-dsh plugin --profile web add <tarball>                  # 装进 profile
-# 把 patches/multi-wall.yml 的 insert 行加进 ~/.dsh/profiles/web/cordis.patch.yml
+dsh plugin --profile web add <tarball>                  # DSH 自动把包加入 bundle 层栈
+```
+
+卸载（一条命令，无需手动清理任何文件）：
+
+```bash
+dsh plugin --profile web remove @deepseek-ai/dsh-client-ui-multi-wall
 ```
 
 ## 使用

package/bin/dsh-multi-chat.mjs

@@ -123,10 +123,11 @@ const INSTALL_HELP = `dsh-multi-chat install — install the multi-window wall p
 Usage:
   dsh-multi-chat install [--profile web]
 
-Packs plugin/dsh-client-ui-multi-wall, installs the tarball into the profile
-with \`dsh plugin --profile <p> add\`, and appends the enable patch row to
-$DSH_HOME/profiles/<p>/cordis.patch.yml. Idempotent: the patch row is only
-added once. Restart dsh web afterwards.
+Packs plugin/dsh-client-ui-multi-wall and installs the tarball into the profile
+with \`dsh plugin --profile <p> add\`. The plugin declares \`dsh.bundle.patch\`
+(pointing at its own cordis.patch.yml), so DSH mounts it automatically as a
+bundle layer — no manual profile patch is needed. Restart dsh web afterwards.
+Uninstall with: dsh plugin --profile <p> remove @deepseek-ai/dsh-client-ui-multi-wall
 `
 
 async function cmdInstall(args) {
@@ -151,30 +152,13 @@ async function cmdInstall(args) {
   const tarball = join(stableDir, tarballName)
   if (!existsSync(tarball)) throw new Error('npm pack produced no tarball')
 
-  // 2) install into the profile.
+  // 2) install into the profile. DSH reconciles `dsh.profile.bundles` from the
+  // installed dependency set: because this package declares `dsh.bundle.patch`,
+  // `dsh plugin add` leaves it in the bundle layer stack and its own
+  // cordis.patch.yml is mounted automatically — no manual profile patch edits.
   process.stdout.write(`installing ${tarballName} into profile '${profile}'…\n`)
   run('dsh', ['plugin', '--profile', profile, 'add', tarball])
 
-  // 3) append the enable patch row (idempotent).
-  const patchPath = join(dshHome(), 'profiles', profile, 'cordis.patch.yml')
-  const insert = [
-    '',
-    '# Multi-window wall (dsh-multi-chat): enable the official client',
-    '# plugin that renders the wall inside the DSH web GUI.',
-    '- insert:',
-    '    - id: ui-multi-wall',
-    "      name: '@deepseek-ai/dsh-client-ui-multi-wall'",
-    '',
-  ].join('\n')
-  let content = ''
-  if (existsSync(patchPath)) content = readFileSync(patchPath, 'utf8')
-  if (!content.includes('ui-multi-wall')) {
-    writeFileSync(patchPath, content.trimEnd() + '\n' + insert, 'utf8')
-    process.stdout.write(`patched ${patchPath}\n`)
-  } else {
-    process.stdout.write(`profile patch already enables ui-multi-wall (${patchPath})\n`)
-  }
-
   process.stdout.write('\nDone. Restart dsh web to load the wall:\n')
   process.stdout.write('  dsh web --port <n>\n')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-multi-chat",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "DSH 多对话：在官方 DeepSeek Harness Web 界面里以多窗口网格并排运行、监控多个对话实例，一屏盯住所有 Agent 的实时进度；内置带口令认证的局域网网关，手机/平板也能看。npx dsh-multi-chat install|start|stop|gateway",
   "license": "MIT",
   "type": "module",
@@ -70,6 +70,8 @@
     "README.zh.md",
     "plugin/dsh-client-ui-multi-wall/package.json",
     "plugin/dsh-client-ui-multi-wall/README.md",
+    "plugin/dsh-client-ui-multi-wall/README.zh.md",
+    "plugin/dsh-client-ui-multi-wall/cordis.patch.yml",
     "plugin/dsh-client-ui-multi-wall/lib/index.js",
     "plugin/dsh-client-ui-multi-wall/lib/invariant.js",
     "plugin/dsh-client-ui-multi-wall/lib/client.js",

package/plugin/dsh-client-ui-multi-wall/cordis.patch.yml

@@ -0,0 +1,7 @@
+# dsh-client-ui-multi-wall bundle patch — append the multi-window wall loader
+# entry to the profile's root entry list. As a `dsh.bundle` layer this patch is
+# applied automatically by DSH when the package is installed into a profile
+# (`dsh plugin --profile web add <pkg>`); no manual profile patch is required.
+- insert:
+    - id: ui-multi-wall
+      name: '@deepseek-ai/dsh-client-ui-multi-wall'

package/plugin/dsh-client-ui-multi-wall/package.json

@@ -30,6 +30,9 @@
     "./package.json": "./package.json"
   },
   "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
     "client": {
       "inject": [
         "@deepseek-ai/dsh-client-runtime",
@@ -79,6 +82,7 @@
     "lib/index.js",
     "lib/invariant.js",
     "lib/client.js",
-    "lib/types/**/*.d.ts"
+    "lib/types/**/*.d.ts",
+    "cordis.patch.yml"
   ]
 }

package/scripts/install-plugin.ps1

@@ -1,16 +1,20 @@
-#requires -Version 5.1
+#requires -Version 5.1
 <#
 .SYNOPSIS
-  把多窗口墙插件装进 DSH web profile 并启用。
+  把多窗口墙插件装进 DSH web profile 并启用（官方声明式 bundle 形态）。
 
 .DESCRIPTION
   1) 将 plugin/dsh-client-ui-multi-wall 打包为 tarball；
   2) 用 `dsh plugin --profile web add` 装进 profile；
-  3) 把 patches/multi-wall.yml 的 insert 行追加到
-     $DSH_HOME/profiles/web/cordis.patch.yml；
+  3) DSH 自动调和 dsh.profile.bundles：插件包声明了 dsh.bundle.patch
+     （指向包内自带 cordis.patch.yml），DSH 启动时自动挂载该 bundle 层，
+     无需手动编辑 profile 的 cordis.patch.yml；
   4) 提示重启 `dsh web` 生效（打开 http://127.0.0.1:<port> 后，
      侧边栏底部会出现「多窗口墙」按钮）。
 
+  卸载（一条命令，无需手动删 patch 或文件）：
+    dsh plugin --profile <Profile> remove @deepseek-ai/dsh-client-ui-multi-wall
+
 .PARAMETER Profile
   profile 名，默认 web。
 
@@ -24,10 +28,8 @@ param(
 $ErrorActionPreference = "Stop"
 $root = Split-Path -Parent $PSScriptRoot
 $pluginDir = Join-Path $root "plugin\dsh-client-ui-multi-wall"
-$patchFile = Join-Path $root "patches\multi-wall.yml"
 
 if (-not (Test-Path $pluginDir)) { throw "未找到插件目录：$pluginDir" }
-if (-not (Test-Path $patchFile)) { throw "未找到 patch 文件：$patchFile" }
 
 # 1) pack tarball
 $tarball = Join-Path $root "dsh-client-ui-multi-wall.tgz"
@@ -37,29 +39,14 @@ Pop-Location
 if (-not (Test-Path $tarball)) { throw "npm pack 失败，未生成 $tarball" }
 Write-Host "已打包：$tarball"
 
-# 2) install into profile
+# 2) install into profile — DSH 依据插件的 dsh.bundle 声明自动把包加入
+#    dsh.profile.bundles 层栈并挂载其自带 cordis.patch.yml，无需手改 patch。
 Write-Host "安装到 profile '$Profile'（等价于 pnpm add <tarball>）…"
 dsh plugin --profile $Profile add $tarball
 if ($LASTEXITCODE -ne 0) { throw "dsh plugin add 失败（exit $LASTEXITCODE）" }
 
-# 3) append the insert row to the profile patch (idempotent)
-$home = $env:DSH_HOME
-if ([string]::IsNullOrEmpty($home)) { $home = Join-Path $env:USERPROFILE ".dsh" }
-$profilePatch = Join-Path $home "profiles\$Profile\cordis.patch.yml"
-if (-not (Test-Path $profilePatch)) { throw "未找到 profile patch：$profilePatch" }
-$content = Get-Content $profilePatch -Raw
-if ($content -notmatch "ui-multi-wall") {
-    $insert = Get-Content $patchFile -Raw
-    # 把 patch 文件的 insert 块合并进 profile patch（去掉头部注释，保留 YAML 列表语义）
-    $insertBlock = ($insert -split "`n" | Where-Object { $_ -notmatch "^\s*#" -and $_.Trim() -ne "" }) -join "`n"
-    $newContent = $content.TrimEnd() + "`n" + $insertBlock + "`n"
-    Set-Content -Path $profilePatch -Value $newContent -Encoding UTF8
-    Write-Host "已追加到 $profilePatch"
-} else {
-    Write-Host "profile patch 已包含 ui-multi-wall，跳过追加。"
-}
-
 Write-Host ""
 Write-Host "完成。重启 dsh web 生效："
 Write-Host "  dsh web --port <n>"
 Write-Host "打开后侧边栏底部应出现「多窗口墙」按钮。"
+Write-Host "卸载：dsh plugin --profile $Profile remove @deepseek-ai/dsh-client-ui-multi-wall"

package/scripts/start-multi.ps1

@@ -1,4 +1,4 @@
-#requires -Version 5.1
+#requires -Version 5.1
 <#
 .SYNOPSIS
   启动多个 DSH web 实例（多窗口墙直接内嵌在官方界面里，无需独立服务器）。
@@ -19,8 +19,9 @@
   默认 "3080,3081,3082,3083"。
 
 .PARAMETER Patch
-  启用多窗口墙的 patch 文件（默认 patches/multi-wall.yml）；若已把 insert
-  写进 profile 的 cordis.patch.yml，可传 $null 跳过。
+  备用启用方式：传给 `dsh web --patch` 的 patch 文件。插件现已声明
+  dsh.bundle.patch（bundle 层自动挂载），通常无需传此参数；仅当你希望
+  以 overlay 方式临时启用时才使用。
 
 .PARAMETER Remote
   为每个实例启动一个带令牌认证的网关（0.0.0.0），用于手机/远程访问。