dsh-code-server-app 0.2.11 → 0.2.13

package/README.en.md

@@ -182,7 +182,7 @@ state preserved (no full reload). Full evidence and probe scripts: `docs/analysi
 
 ## code-server workspace and process lifecycle
 
-- code-server's workspace **follows the active DSH session/workspace**: switching sessions/workspaces while the IDE is open restarts code-server to the new directory
+- code-server's workspace **follows the active DSH session/workspace**: switching sessions/workspaces while the IDE is open moves code-server to the new directory
   (resolution order: current session cwd → session's workspace.path → recentWorkspace.path → first workspace.path);
   the opened directory is shown inside code-server (`?folder=<cwd>`, the page reloads when following a switch);
   implementation note: the iframe `src` must carry `?folder=<cwd>` — code-server's front-end remembers the "last workspace" and restores it by itself;
@@ -190,15 +190,31 @@ state preserved (no full reload). Full evidence and probe scripts: `docs/analysi
   **Windows path format (verified)**: the `folder` parameter must start with `/` and use forward slashes only, e.g. `/C:/Users/User/Desktop/biss`;
   a bare Windows path (`C:\...`) is parsed as a URI scheme and the drive letter is stripped (page shows `\Users\User\...` with an empty file tree),
   while `file:///C:/...` reports "Workspace does not exist".
+- **The switch is lightweight (since 0.2.12)**: a running instance is **not restarted** when the workspace changes — the host
+  only updates `state.cwd` and the workbench re-navigates with the new `?folder=` (the workspace directory was always the
+  client URL's business; the process cwd only affects the server's own relative-path resolution at spawn time). The switch is
+  much faster and no longer throws away the extension host, background tasks or server-side state.
+  - In `status`, `cwd` is the current workbench directory; `launchCwd` is the directory the **process was started with**
+    (diagnostics only; it does not change on a switch).
+  - The trade-off, stated plainly: background processes/terminals started by the IDE in the **old** directory are no longer
+    killed automatically (a full restart used to take them with it) — clean them up yourself if needed. That is the same coin
+    as "nothing is lost".
+  - The trigger does not depend on the tab being visible: **the tab body is not unmounted while the sidebar is collapsed**,
+    so it also follows in the background (behaviour deliberately kept in 0.2.12).
+  - Regression: `scripts/test-workspace-switch.mjs` (5 assertions: adopting an instance, cwd change keeps pid/status, the
+    process stays alive, same-directory idempotence, no-cwd does not switch; it fails again if the old behaviour returns).
 - Process lifecycle is managed by the host plugin: startup writes `$DSH_HOME/code-server/pid.json`, stop kills the tree (`taskkill /T` or process-group SIGKILL),
   crash/exit updates status live; after a DSH host restart the plugin **adopts** a still-running instance (verifies pid + `/healthz`), without duplicate start or killing unrelated processes;
 - `node_modules` and the pack-time artifact `vendor/` are git-ignored; after cloning, follow
   "Install the plugin (script-free install; code-server bundled)" below — `pnpm install` → `pnpm run build:client` →
   `pnpm run vendor:vscode` → `pnpm pack` + `dsh plugin --profile web add`.
 
-> Verified locally (BM: Windows 11 ARM64): `code-server@4.136.2` (with Code 1.136.1) bundled in the plugin,
-> placed offline at activation → VS Code internal deps installed → started → healthz 200 →
-> cwd switch restart while running → stopped → fully recycled.
+> Verified locally (BM: Windows 11 ARM64): the whole tree/dependency chain is supplied by per-platform
+> sub-packages — the tree package `@jinsiyu/dshcs-vscode-server` (currently 4.137.0, a 50.8 MB tarball),
+> the pure-JS inner dependencies directly in the plugin's `dependencies`, and 16 prebuilt native modules
+> re-exported under their original names by the aggregator `@jinsiyu/dsh-code-server-runtime-win32-<arch>`
+> (picked by os/cpu) → healthz 200 → stopped → fully recycled.
+> (The 0.1.37-era "one big platform package" layout is gone — see "Upgrading the VS Code tree" below.)
 
 ## Packaging (how to build the tarball)
 
@@ -236,7 +252,7 @@ pnpm run promote -- <version>
 | Goal | Command |
 |---|---|
 | **Build from the latest upstream release** | `pnpm run vendor:latest` (= `--force`): pulls `code-server@latest`'s tree into `vendor/vscode`; afterwards you **must** re-run `repack:build` and republish every sub-package |
-| **Pin a version** | `pnpm run vendor:vscode -- --version 4.136.2` |
+| **Pin a version** | `pnpm run vendor:vscode -- --version 4.137.0` |
 | **Snapshot from an existing tree** | `pnpm run vendor:vscode -- --from <code-server dir>` (seconds) |
 | **Rebuild every sub-package** | `pnpm run repack:build -- --target win32-arm64,win32-x64 --pack` (without `--from` it npm-installs and compiles the source tree itself — slow) |
 | **Rebuild only the tree/aggregator packages** | `node scripts/vendor-repacks.mjs --reuse --target win32-arm64,win32-x64 --pack` (reuses the natives already in `repack/build`) |
@@ -368,8 +384,17 @@ dsh plugin --profile web add C:\Users\User\Desktop\dsh-code-server-app
 ### Upgrading the VS Code tree (upstream = a code-server release)
 
 - **The version is decided at pack time**: `pnpm run vendor:latest` (= `--force`) pulls the tree of the npm **latest**
-  release; or use `pnpm run vendor:vscode -- --version 4.136.2` / `DSHCS_CODE_SERVER_VERSION`.
+  release; or use `pnpm run vendor:vscode -- --version 4.137.0` / `DSHCS_CODE_SERVER_VERSION`.
   With an existing `vendor/vscode`, a plain `pnpm pack` never upgrades (it is a no-op).
+  **Source-tree precedence (fixed in 0.2.13)**: an explicit `--from` uses that tree, while an explicit
+  `--force`/`--version` now **always goes to the registry** — before the fix a local source tree won
+  (`defaultSourceTree()` hit `vendor/code-server` or an installed profile tree first), so the documented
+  "`vendor:latest` takes latest from the registry" silently kept the old version (hit while upgrading to 0.2.13:
+  the bundled tree stayed at 4.136.2). A run with neither flag still reuses a local tree to save the download.
+- **Sync the inner dependency pins when the tree changes**: in `--reuse` mode the pure-JS install set is read from
+  the **plugin's package.json**, so update those pins from the new tree's `lib/vscode/package.json` first
+  (this time: 10 `@xterm/*` beta bumps). The rule is "only move a pin that no longer satisfies the new range",
+  which keeps already-newer pins such as `cookie`/`ws`/`tar`/`node-addon-api` from being downgraded.
 - **Check first**: `pnpm run vendor:check` prints the bundled version / upstream latest.
 - **A version bump means rebuilding and republishing the sub-packages** (all with the same script):
   1. `pnpm run repack:build -- --target win32-arm64,win32-x64 --pack` → the new tree package
@@ -380,7 +405,7 @@ dsh plugin --profile web add C:\Users\User\Desktop\dsh-code-server-app
 - `productPath` (`<quality>-<commit>`, part of the client WebSocket path) is **computed from `lib/vscode/product.json`**,
   so upgrading the tree needs no code change — but the routes are registered at activation, so restart `dsh web` afterwards.
 - **No runtime auto-upgrade anymore**: nothing fetches latest at startup; the version is fully determined by the bundled artifact.
-- Bundled locally right now: the tree of `code-server@4.136.2` (VS Code 1.136.1, `productPath=stable-8d5f383f…`).
+- Bundled locally right now: the tree of `code-server@4.137.0` (VS Code 1.137.0, `productPath=stable-b11dabda…`).
 
 ### Compatibility with the old install locations
 
@@ -447,7 +472,7 @@ Host/Origin fence and browser auth); in the desktop profile `apps/desktop-host`
 | Method | Path | Description |
 |---|---|---|
 | GET | `/api/code-server/status` | `{ ok, running, status, host, port, pid, cwd, url, version, error, logTail, adopted }` (also `env` environment check and the `setup` compatibility field) |
-| POST | `/api/code-server/start` | body `{ cwd? }` (omit cwd to keep the current workspace); idempotent |
+| POST | `/api/code-server/start` | body `{ cwd? }` (omit cwd to keep the current workspace); idempotent; changing cwd while running only **switches the directory, without restarting the process** (0.2.12) |
 | POST | `/api/code-server/stop` | Stop and recycle the process tree |
 | POST | `/api/code-server/setup` | **Compatibility no-op**: since 0.1.36 dependencies are installed by the package manager, so this only re-runs the env self-check and returns |
 | POST | `/api/code-server/open-file` | body `{ file }` — writes the signal consumed by the built-in `dshcs-open-file` extension to open the file in code-server |
@@ -533,8 +558,7 @@ What remains on the plugin side:
   works). Use `serve: loopback` when you need it.
 - **`serve: dsh` shares DSH's origin**, so the iframe is not sandboxed there (same-origin plus `allow-same-origin` is
   escapable by the frame itself); in `loopback` mode the iframe is cross-origin and `sandbox` stays as real protection.
-- **Single instance across sessions**: one shared IDE per host; switching cwd requires a restart (the sidebar tab
-  handles it and hints).
+- **Single instance across sessions**: one shared IDE per host; switching cwd only re-navigates the workbench (since 0.2.12 no process restart, so the old directory's background terminals are not collected).
 - **Older DSH versions are unsupported (since 0.2.3)**: on a DSH without `sidebarRightTabs` / `sidebarRight` the plugin
   offers nothing but an upgrade notice on the settings page; older-DSH users should stay on `0.2.2`
   (`dsh plugin --profile web add dsh-code-server-app@0.2.2`).

package/README.md

@@ -182,7 +182,7 @@ DSH 用**资源地址**命名文件,`openFile` 只负责把地址交给右侧栏
 
 ## code-server 服务目录与进程生命周期
 
-- code-server 服务目录**跟随活动工作区/会话**:打开期间切换 DSH 会话/工作区,code-server 自动重启到新目录
+- code-server 服务目录**跟随活动工作区/会话**:打开期间切换 DSH 会话/工作区,code-server 自动切到新目录
   (解析优先级:当前会话 cwd → 会话所属 workspace.path → recentWorkspace.path → 首个 workspace.path);
   打开目录显示在 code-server 页面内(`?folder=<cwd>`,跟随切换时页面自动重新加载);
   实现要点:iframe src 必须带 `?folder=<cwd>`——code-server 前端会记住“最近工作区”并自行恢复,
@@ -190,16 +190,26 @@ DSH 用**资源地址**命名文件,`openFile` 只负责把地址交给右侧栏
   **Windows 路径格式(实测)**:folder 参数必须以 `/` 开头且全部正斜杠,形如 `/C:/Users/User/Desktop/biss`;
   裸 Windows 路径(`C:\...`)会被前端当 URI scheme 而剥掉盘符(页面显示 `\Users\User\...` 且文件树为空),
   `file:///C:/...` 形式则报 “Workspace does not exist”。
+- **切换是"轻量"的(0.2.12 起)**:运行中切工作区**不重启 IDE 进程**,host 只把 `state.cwd` 改成新目录,
+  由 workbench 拿新的 `?folder=` 重新导航(工作区目录本来就由客户端 URL 决定,进程 cwd 只影响它自己
+  spawn 时的相对路径解析)。因此切换**不再丢**扩展宿主/后台任务/服务端状态,也快得多。
+  - `status` 里 `cwd` = 当前 workbench 目录;`launchCwd` = **进程启动时**的目录(诊断用,不随切换变化)。
+  - 代价(要说清楚):旧目录里**由 IDE 拉起的后台进程/终端不再被自动杀掉**(以前靠"整进程重启"顺带收走)——
+    需要时手动收;这也是"不丢状态"的同一枚硬币。
+  - 触发时机与本标签是否可见无关:**侧栏收起时标签 body 并不卸载**,所以后台也会跟随(0.2.12 明确保留此行为)。
+  - 回归:`scripts/test-workspace-switch.mjs`(5 项:接管实例、切目录不改 pid/不换状态、进程存活、
+    同目录幂等、无 cwd 不切换;改回旧行为必挂)。
 - process 生命周期由 host 插件管理:启动写 `$DSH_HOME/code-server/pid.json`,停止树级终止(taskkill /T 或进程组 SIGKILL),
   崩溃/退出实时更新状态;DSH host 重启后自动 adopt 仍在运行的实例(校验 pid + /healthz),不重复启动、不误杀别的进程;
 - `node_modules`、`vendor/` 与 `repack/` 已被 `.gitignore` 排除,推送/克隆仓库后按下方
   "打包(如何出包)"执行 `pnpm install` → `pnpm run build:client` → `pnpm run vendor:vscode` →
   (发布预编译原生包)→ `pnpm pack` + `dsh plugin --profile web add` 即可。
 
-> 本机(BM: Windows 11 ARM64)实测:`code-server@4.136.2`(with Code 1.136.1)由平台子包
-> `@jinsiyu/dshcs-code-server-win32-arm64` 提供(主包 0.1.37 仅 105KB),
-> 35 个纯 JS 内部依赖 + 16 个预编译原生包(经平台聚合包装回原名)由 pnpm 一条命令装好 →
-> healthz 200 → 运行中切换 cwd 重启 → 停止 → 回收全链路验证。
+> 本机(BM: Windows 11 ARM64)实测:树/依赖全链路是"平台子包 + 聚合包"供给 ——
+> 树包 `@jinsiyu/dshcs-vscode-server`(当前 4.137.0,50.8 MB tgz)、纯 JS 内部依赖直接进插件
+> `dependencies`、16 个预编译原生包经平台聚合包 `@jinsiyu/dsh-code-server-runtime-win32-<arch>`
+> (按 os/cpu 自动选)装回原名 → healthz 200 → 停止 → 回收全链路验证。
+> (0.1.37 时代的主包形态已废弃,见下方"升级 VS Code 树"。)
 
 ## 打包(如何出包)
 
@@ -237,7 +247,7 @@ pnpm run promote -- <version>
 | 目标 | 命令 |
 |---|---|
 | **打最新版(上游 code-server 发行版)** | `pnpm run vendor:latest`(= `--force`):从 registry 取 `code-server@latest` 的树到 `vendor/vscode`;之后**必须**重跑 `repack:build` 并重发全部子包 |
-| **指定版本** | `pnpm run vendor:vscode -- --version 4.136.2` |
+| **指定版本** | `pnpm run vendor:vscode -- --version 4.137.0` |
 | **从已装好的树快照** | `pnpm run vendor:vscode -- --from <code-server 目录>`(秒级) |
 | **开发期让树可直接跑** | `pnpm run vendor:vscode -- --dev-links`(额外把 `lib/vscode/node_modules` 用 junction 补上) |
 | **完整重打子包** | `pnpm run repack:build -- --target win32-arm64,win32-x64 --pack`(不给 `--from` 会自动 npm install 解包 + 编译,耗时) |
@@ -375,8 +385,15 @@ dsh plugin --profile web add C:\Users\User\Desktop\dsh-code-server-app
 ### 升级 VS Code 树(上游 = code-server 发行版)
 
 - **打包期决定版本**:`pnpm run vendor:latest`(= `--force`)取 npm **最新版 code-server** 的树并重建 `vendor/vscode`;
-  也可 `pnpm run vendor:vscode -- --version 4.136.2` 或设 `DSHCS_CODE_SERVER_VERSION`。
+  也可 `pnpm run vendor:vscode -- --version 4.137.0` 或设 `DSHCS_CODE_SERVER_VERSION`。
   已有 `vendor/vscode` 时,不带 `--force`/`--version` 不会升级(日常 `pnpm pack` 是 no-op)。
+  **源树优先级(0.2.13 修正)**:显式 `--from` 用给定树;显式 `--force`/`--version` **一定走 registry**
+  —— 修正前它们会被"本机已有源树"抢走(`defaultSourceTree()` 先命中 `vendor/code-server` 或 profile 里的旧树),
+  于是 README 写的"`vendor:latest` 从 registry 取 latest"实际拿不到新版本(0.2.13 升级时踩到:内置树一直停在 4.136.2);
+  只有既没 `--force` 也没 `--version` 时才复用本机源树省一次下载。
+- **换版本时同步树内依赖 pin**:`--reuse` 模式下纯 JS 直装集是从**插件 package.json 现读**的,
+  所以要先按新树的 `lib/vscode/package.json` 更新 pin(本次 10 个 `@xterm/*` 的 beta 跳号;
+  判定规则是"现有 pin 不满足新范围才动",避免把 `cookie`/`ws`/`tar`/`node-addon-api` 这类已有更高版本降级)。
 - **先查再升**:`pnpm run vendor:check` 打印「内置版本 / 上游 latest」。
 - **换版本后重新出子包并发布**(全部由同一个脚本):
   1. `pnpm run repack:build -- --target win32-arm64,win32-x64 --pack` → 新的树包
@@ -386,7 +403,7 @@ dsh plugin --profile web add C:\Users\User\Desktop\dsh-code-server-app
 - `productPath`(`<quality>-<commit>`,客户端 WS 路径的组成)**从 `lib/vscode/product.json` 现算**,
   升级树后无需改代码 —— 但也意味着切版本后必须重启 dsh web(路由在激活期注册)。
 - **不再有运行期自动升级**:不会在启动时联网取 latest;版本完全由内置产物决定。
-- 本机当前内置:`code-server@4.136.2` 的树(VS Code 1.136.1,`productPath=stable-8d5f383f…`)。
+- 本机当前内置:`code-server@4.137.0` 的树(VS Code 1.137.0,`productPath=stable-b11dabda…`)。
 
 ### 兼容旧安装位
 
@@ -449,8 +466,8 @@ desktop profile 由 `apps/desktop-host` 把 `/api/*` 交给同一个 `createShar
 
 | 方法 | 路径 | 说明 |
 |---|---|---|
-| GET | `/api/code-server/status` | `{ ok, running, status, host, port, pid, cwd, url, version, error, logTail, adopted }`(另含 `env` 环境检测与 `setup` 兼容字段) |
-| POST | `/api/code-server/start` | body `{ cwd? }`(省略 cwd 不切换工作目录);幂等 |
+| GET | `/api/code-server/status` | `{ ok, running, status, host, port, pid, cwd, launchCwd, url, version, error, logTail, adopted }`(另含 `env` 环境检测与 `setup` 兼容字段;`cwd` = 当前 workbench 目录,`launchCwd` = 进程启动目录) |
+| POST | `/api/code-server/start` | body `{ cwd? }`(省略 cwd 不切换工作目录);幂等;运行中切 cwd = **只换目录不重启进程**(0.2.12) |
 | POST | `/api/code-server/stop` | 停止并回收进程树 |
 | POST | `/api/code-server/setup` | **兼容空操作**:0.1.36 起依赖由包管理器安装,调用只重新自检 `env` 并返回 |
 | POST | `/api/code-server/open-file` | body `{ file }` — 写信号文件,由内置扩展 `dshcs-open-file` 在 code-server 中打开 |
@@ -514,7 +531,7 @@ desktop profile 由 `apps/desktop-host` 把 `/api/*` 交给同一个 `createShar
   → 该模式下 Ports 面板的 **WebSocket** 转发不可用(HTTP 转发正常);需要时用 `serve: loopback`。
 - **`serve: dsh` 的 iframe 与 DSH 同源** → 该模式不挂 `sandbox`(同源 + `allow-same-origin` 可被 frame 自行摘除);
   `loopback` 模式跨源,`sandbox` 作为真防护保留。
-- **跨会话单实例**:host 级共享一份 IDE;切换 cwd 需重启实例(右侧栏标签自动处理并提示)。
+- **跨会话单实例**:host 级共享一份 IDE;切换 cwd 只换 workbench 目录(0.2.12 起不重启进程,旧目录的后台终端不会被收走)。
 - **旧版 DSH 不受支持(0.2.3 起)**:没有 `sidebarRightTabs`/`sidebarRight` 的 DSH 上,除设置页一条升级提示外无任何入口;
   旧版用户请留在 `0.2.2`(`dsh plugin --profile web add dsh-code-server-app@0.2.2`)。
 - **侧栏标签切换**(0.2.2 起不再重载):DSH 右侧栏只渲染当前激活标签的 body,React 卸载会移走 iframe;

package/lib/index.js

@@ -449,6 +449,8 @@ export async function apply(ctx, config) {
     pid: null,
     port: cfg.port,
     cwd: null,
+    /** 进程**启动时**的工作目录(诊断用):运行时切工作区只改 cwd,进程 cwd 保持这里不变。 */
+    launchCwd: null,
     version: null,
     error: null,
     logTail: '',
@@ -507,6 +509,7 @@ export async function apply(ctx, config) {
       host: dshMode ? null : cfg.host,
       pid: state.pid,
       cwd: state.cwd,
+      launchCwd: state.launchCwd,
       // dsh 模式:同源相对地址(由 DSH webServer 的 prefix 路由提供服务)
       url: running ? (dshMode ? '/code-server/' : `http://${cfg.host}:${state.port}/`) : null,
       productPath: state.env?.productPath ?? null,
@@ -617,6 +620,7 @@ export async function apply(ctx, config) {
     state.status = 'stopped';
     state.pid = null;
     state.cwd = null;
+    state.launchCwd = null;
     state.startedAt = null;
     state.adopted = false;
     if (reason) state.error = null;
@@ -663,13 +667,29 @@ export async function apply(ctx, config) {
     return run;
   }
 
+  /** 已运行实例切换工作区:**只改"当前 workbench 目录",不重启进程**。
+   *
+   *  为什么够用:工作区目录由客户端 URL 的 `&folder=<绝对路径>` 决定(见 src/factory.js 的
+   *  buildPageUrl),服务进程自己的 cwd 只影响它 spawn 时对相对路径的解析;真正"换目录"是
+   *  workbench 拿新 folder 重新导航(客户端导航 iframe)。
+   *  旧行为(0.2.11 及以前)在这里 stop('restart') + 重新 launch:切一次工作区就整进程重启,
+   *  编辑缓冲、终端、扩展宿主状态全丢,而且侧栏收起时是在后台悄悄发生。
+   *  进程 cwd 保持在 launchCwd 里,诊断时能看出"这个实例是哪个目录拉起来的"。 */
+  function adoptWorkspace(cwd) {
+    const previous = state.cwd;
+    state.cwd = cwd;
+    console.log(`[code-server] workspace switch: ${previous ?? '(none)'} -> ${cwd}`
+      + `(不重启进程,进程 cwd 仍是 ${state.launchCwd ?? '(none)'};workbench 用新的 folder 重新导航)`);
+    return snapshot();
+  }
+
   async function startInner(cwdArg) {
     const cwd = typeof cwdArg === 'string' && cwdArg.trim() !== '' ? cwdArg : undefined;
     if (state.status === 'running' && state.pid !== null) {
       if (cwd === undefined || cwd === state.cwd) return snapshot();
-      await stop('restart');
+      return adoptWorkspace(cwd);
     }
-    // 上一次启动仍在进行:等待它结算后再按本次 cwd 启动,避免 cwd 切换被吞
+    // 上一次启动仍在进行:等待它结算后再决定(运行中则同上面一样只换目录,不重启)
     if (state.status === 'starting') {
       const deadline = Date.now() + 10000;
       while (state.status === 'starting' && Date.now() < deadline) {
@@ -683,7 +703,7 @@ export async function apply(ctx, config) {
       }
       if (state.status === 'running') {
         if (cwd === undefined || cwd === state.cwd) return snapshot();
-        await stop('restart');
+        return adoptWorkspace(cwd);
       }
     }
 
@@ -710,6 +730,7 @@ export async function apply(ctx, config) {
           state.status = 'running';
           state.pid = record.pid;
           state.cwd = cwd ?? record.cwd ?? null;
+          state.launchCwd = record.launchCwd ?? record.cwd ?? null;
           state.startedAt = record.startedAt ?? null;
           state.adopted = true;
           return snapshot();
@@ -763,6 +784,7 @@ export async function apply(ctx, config) {
     state.logTail = '';
     state.status = 'starting';
     state.cwd = cwd ?? null;
+    state.launchCwd = cwd ?? null;
     state.startedAt = Date.now();
     state.adopted = false;
 
@@ -809,6 +831,7 @@ export async function apply(ctx, config) {
       pid: proc.pid,
       startedAt: state.startedAt,
       cwd: cwd ?? null,
+      launchCwd: cwd ?? null,
       host: serve === 'dsh' ? null : cfg.host,
       port: serve === 'dsh' ? null : cfg.port,
       serve,
@@ -1080,6 +1103,7 @@ export async function apply(ctx, config) {
       state.status = 'running';
       state.pid = record.pid;
       state.cwd = record.cwd ?? null;
+      state.launchCwd = record.launchCwd ?? record.cwd ?? null;
       state.startedAt = record.startedAt ?? null;
       state.adopted = true;
       console.log(`[code-server] adopted running instance pid=${record.pid} port=${cfg.port}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.2.11",
-  "description": "VS Code (from a code-server release) inside DSH: a right-sidebar tab driven by the plugin's own launcher over the in-process VS Code server (lib/launcher.mjs). The tab claims DSH file addresses (dsh-resource://file/**), so the product's own produced-file chips, delivered-file previews and inline prose mentions open in the workbench. The IDE is a resident surface moved with Element.moveBefore instead of being remounted, so switching sidebar tabs no longer reloads it. Opening the tab switches the right sidebar to fullscreen by default (setting fullscreenOnOpen). Requires a DSH with the right-sidebar services (sidebarRightTabs/sidebarRight, >= 0.1.5-alpha.1); older DSH versions get a single upgrade notice on the settings page and no other UI. Two serving modes: loopback port (default) or same-origin mount on DSH's own webServer (/code-server, protected by ctx.connection.requestRejection). No code-server Node layer, no argon2, no C++ toolchain.",
+  "version": "0.2.13",
+  "description": "VS Code (from a code-server release) inside DSH: a right-sidebar tab driven by the plugin's own launcher over the in-process VS Code server (lib/launcher.mjs). The tab claims DSH file addresses (dsh-resource://file/**) by file type (setting claimExtensions), so the product's own produced-file chips, delivered-file previews and inline prose mentions open in the workbench. The IDE is a resident surface moved with Element.moveBefore instead of being remounted, so switching sidebar tabs no longer reloads it. Opening the tab switches the right sidebar to fullscreen by default (setting fullscreenOnOpen). Following a workspace switch is lightweight: the workbench re-navigates with the new ?folder= and the IDE process is not restarted (since 0.2.12). Requires a DSH with the right-sidebar services (sidebarRightTabs/sidebarRight, >= 0.1.5-alpha.1); older DSH versions get a single upgrade notice on the settings page and no other UI. Two serving modes: loopback port (default) or same-origin mount on DSH's own webServer (/code-server, protected by ctx.connection.requestRejection). No code-server Node layer, no argon2, no C++ toolchain.",
   "homepage": "https://github.com/jinsiyu/dsh-code-server-app",
   "repository": {
     "type": "git",
@@ -62,7 +62,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@jinsiyu/dshcs-vscode-server": "4.136.2",
+    "@jinsiyu/dshcs-vscode-server": "4.137.0",
     "@microsoft/1ds-core-js": "3.2.13",
     "@microsoft/1ds-post-js": "3.2.13",
     "@vscode/iconv-lite-umd": "0.7.1",
@@ -70,16 +70,16 @@
     "@vscode/sandbox-runtime": "0.0.1",
     "@vscode/tree-sitter-wasm": "0.3.1",
     "@vscode/vscode-languagedetection": "1.0.23",
-    "@xterm/addon-clipboard": "0.3.0-beta.301",
-    "@xterm/addon-image": "0.10.0-beta.299",
-    "@xterm/addon-ligatures": "0.11.0-beta.299",
-    "@xterm/addon-progress": "0.3.0-beta.299",
-    "@xterm/addon-search": "0.17.0-beta.299",
-    "@xterm/addon-serialize": "0.15.0-beta.299",
-    "@xterm/addon-unicode11": "0.10.0-beta.299",
-    "@xterm/addon-webgl": "0.20.0-beta.298",
-    "@xterm/headless": "6.1.0-beta.301",
-    "@xterm/xterm": "6.1.0-beta.302",
+    "@xterm/addon-clipboard": "0.3.0-beta.302",
+    "@xterm/addon-image": "0.10.0-beta.300",
+    "@xterm/addon-ligatures": "0.11.0-beta.300",
+    "@xterm/addon-progress": "0.3.0-beta.300",
+    "@xterm/addon-search": "0.17.0-beta.300",
+    "@xterm/addon-serialize": "0.15.0-beta.300",
+    "@xterm/addon-unicode11": "0.10.0-beta.300",
+    "@xterm/addon-webgl": "0.20.0-beta.299",
+    "@xterm/headless": "6.1.0-beta.302",
+    "@xterm/xterm": "6.1.0-beta.303",
     "cookie": "0.7.2",
     "detect-libc": "2.1.2",
     "http-proxy-agent": "7.0.0",
@@ -100,8 +100,8 @@
     "zod": "4.4.3"
   },
   "optionalDependencies": {
-    "@jinsiyu/dsh-code-server-runtime-win32-arm64": "^0.2.0",
-    "@jinsiyu/dsh-code-server-runtime-win32-x64": "^0.2.0"
+    "@jinsiyu/dsh-code-server-runtime-win32-arm64": "^0.2.13",
+    "@jinsiyu/dsh-code-server-runtime-win32-x64": "^0.2.13"
   },
   "scripts": {
     "vendor:vscode": "node scripts/vendor-vscode-server.mjs",
@@ -116,6 +116,7 @@
     "test:apply": "node scripts/test-plugin-apply.mjs",
     "test:launcher-routes": "node scripts/test-launcher-routes.mjs",
     "test:fullscreen": "node scripts/test-sidebar-fullscreen.mjs",
-    "test:claim-types": "node scripts/test-claim-types.mjs"
+    "test:claim-types": "node scripts/test-claim-types.mjs",
+    "test:workspace-switch": "node scripts/test-workspace-switch.mjs"
   }
 }

package/scripts/vendor-vscode-server.mjs

@@ -200,14 +200,19 @@ async function main() {
   }
 
   const skip = existing !== null && !FORCE && FROM === null && PINNED === null;
+  // 源树优先级(0.2.13 修正):显式 `--from` 用给定树;显式 `--force`/`--version` 表示"就是要换版本"
+  // → 只认 registry;其余情况才复用本机已有源树(省一次 53MB 下载)。
+  // 修正前:`--force`/`--version` 也会被本机源树抢先,导致 README 写的
+  // 「vendor:latest(= --force)从 registry 取 latest」实际拿不到新版本(本次升级踩到)。
+  const localSource = FROM === null && !FORCE && PINNED === null ? defaultSourceTree() : null;
   let codeServerVersion = existing;
   let sourceKind = 'registry';
   let sourceTree = null;
 
   if (skip) {
     console.log(`[vendor] vendor/vscode 已存在(code-server@${existing});跳过(用 --force 重建)`);
-  } else if (FROM !== null || (sourceTree = defaultSourceTree()) !== null) {
-    const src = FROM ?? sourceTree;
+  } else if (FROM !== null || localSource !== null) {
+    const src = FROM ?? localSource;
     codeServerVersion = readJson(join(src, 'package.json'))?.version ?? null;
     if (codeServerVersion === null) throw new Error(`--from ${src} 不是一棵 code-server 树`);
     console.log(`[vendor] 源树 ${src}(code-server@${codeServerVersion})→ vendor/vscode/`);

package/vendor/VENDOR.json

@@ -1,12 +1,12 @@
 {
-  "codeServerVersion": "4.136.2",
-  "vscodeVersion": "1.136.1",
-  "productPath": "stable-8d5f383f301ca20681f5b6606b8207d9dc87bdd8",
+  "codeServerVersion": "4.137.0",
+  "vscodeVersion": "1.137.0",
+  "productPath": "stable-b11dabdaca0d3369986975be285db92c8795cea5",
   "layout": "vscode-only",
-  "preparedAt": "2026-09-11T13:32:44.480Z",
+  "preparedAt": "2026-09-11T14:13:32.827Z",
   "source": "registry",
   "node": "v24.13.1",
   "platform": "win32",
   "arch": "arm64",
-  "sizeMB": 197.2
+  "sizeMB": 197.9
 }