Merge pull request #609 from omdsh-dev/feat/dsh-0.1.5-alpha.2

feat(dsh): adapt to DSH 0.1.5-alpha.2

.editorconfig

@@ -0,0 +1,15 @@
+# EditorConfig — https://editorconfig.org
+# 仓库统一编辑器基线；缩进等风格细节以各文件的既有约定为准。
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+
+# Makefile 的 recipe 必须用真实 tab（GNU Make 硬性要求）。
+[Makefile]
+indent_style = tab

.github/workflows/ci.yml

@@ -22,9 +22,10 @@ jobs:
         with:
           # Tests run git log against this repository and need the full history.
           fetch-depth: 0
+      # pnpm version is pinned via packageManager in package.json; the action
+      # reads it from there (specifying both makes action-setup fail on
+      # purpose with ERR_PNPM_BAD_PM_VERSION).
       - uses: pnpm/action-setup@v6
-        with:
-          version: 11
       - uses: actions/setup-node@v7
         with:
           node-version: 22
@@ -40,6 +41,8 @@ jobs:
         run: pnpm install --frozen-lockfile
       - name: Typecheck
         run: pnpm typecheck
+      - name: Lint
+        run: pnpm lint
       - name: Test
         run: pnpm test
       - name: Build
@@ -50,6 +53,52 @@ jobs:
       - name: Check consumer type surface
         run: pnpm check:consumer-types
 
+  # Windows parity lane for the pure-logic suite. The codebase carries real
+  # win32 branches (shell parsing, WSL path projection, the PowerShell
+  # installer) that mock-injection tests alone cannot validate — this lane
+  # runs the same typecheck / test / build / consumer-type-surface steps on
+  # a real Windows runtime. The plugin-mount lane (real DSH + Playwright
+  # Chromium) stays ubuntu-only and is deliberately NOT mirrored here.
+  ci-windows:
+    runs-on: windows-latest
+    timeout-minutes: 30
+    defaults:
+      run:
+        # The runner ships Git Bash: multi-line steps and
+        # scripts/check-consumer-types.sh work verbatim.
+        shell: bash
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          # Tests run git log against this repository and need the full history.
+          fetch-depth: 0
+      # pnpm version is pinned via packageManager in package.json; the action
+      # reads it from there (specifying both makes action-setup fail on
+      # purpose with ERR_PNPM_BAD_PM_VERSION).
+      - uses: pnpm/action-setup@v6
+      - uses: actions/setup-node@v7
+        with:
+          node-version: 22
+          cache: pnpm
+      # Same rationale as the ci job: smoke tests spawn git without an
+      # identity and rely on ambient config, which the runner lacks.
+      - name: Configure git identity for tests
+        run: |
+          git config --global user.name "dsh-better-sidebar-ci"
+          git config --global user.email "ci@dsh.invalid"
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Typecheck
+        run: pnpm typecheck
+      - name: Lint
+        run: pnpm lint
+      - name: Test
+        run: pnpm test
+      - name: Build
+        run: pnpm build
+      - name: Check consumer type surface
+        run: pnpm check:consumer-types
+
   # Pack the plugin as an npm tarball, mount it into a REAL DSH instance
   # through the official `dsh plugin --profile web add` channel, and render
   # the DSH web UI headlessly (Playwright Chromium) to prove the plugin
@@ -66,9 +115,10 @@ jobs:
     steps:
       - uses: actions/checkout@v7
 
+      # pnpm version is pinned via packageManager in package.json; the action
+      # reads it from there (specifying both makes action-setup fail on
+      # purpose with ERR_PNPM_BAD_PM_VERSION).
       - uses: pnpm/action-setup@v6
-        with:
-          version: 11
 
       - uses: actions/setup-node@v7
         with:
@@ -81,11 +131,10 @@ jobs:
       # Pin the DSH CLI the lane mounts into; the profile's bundle stack
       # (dsh-base / dsh-web-app) resolves from this installation. Keep in
       # step with the plugin's @deepseek-ai/* peer range when bumping.
-      # DSH 0.1.2-alpha.x is published under the `alpha` dist-tag; the lanes
-      # speak BOTH RPC dialects (tests/e2e/host-protocol.ts, dot-first with
-      # slash fallback), so pre-alpha npm releases keep working too.
+      # DSH 0.1.5-alpha.2 is published under the `alpha` dist-tag; the lanes
+      # speak the slash-only RPC dialect (tests/e2e/host-protocol.ts).
       - name: Install dsh CLI (pinned)
-        run: npm install -g @deepseek-ai/dsh@0.1.2-alpha.2
+        run: npm install -g @deepseek-ai/dsh@0.1.5-alpha.2
 
       # lib/ is gitignored; the tarball is produced from this build.
       - name: Build and pack the npm tarball
@@ -104,7 +153,7 @@ jobs:
       - name: Aggregate double-mount regression
         env:
           DSH_CMD: dsh
-        run: bash scripts/e2e-aggregate-mount.sh
+        run: pnpm test:mount:aggregate
 
       - name: Upload Playwright report on failure
         if: failure()

.github/workflows/release.yml

@@ -51,9 +51,10 @@ jobs:
           # Tests run git log against this repository and need full history.
           fetch-depth: 0
 
+      # pnpm version is pinned via packageManager in package.json; the action
+      # reads it from there (specifying both makes action-setup fail on
+      # purpose with ERR_PNPM_BAD_PM_VERSION).
       - uses: pnpm/action-setup@v6
-        with:
-          version: 11
 
       - uses: actions/setup-node@v7
         with:
@@ -84,15 +85,25 @@ jobs:
             exit 1
           fi
 
-      - name: Build
-        run: pnpm build
-
       - name: Typecheck
         run: pnpm typecheck
 
+      - name: Lint
+        run: pnpm lint
+
       - name: Test
         run: pnpm test
 
+      - name: Build
+        run: pnpm build
+
+      # The consumer-facing declaration surface guard — mirrors the ci.yml
+      # verification order (typecheck → lint → test → build →
+      # check:consumer-types) so a release is gated on the same checks a PR
+      # runs.
+      - name: Check consumer type surface
+        run: pnpm check:consumer-types
+
       - name: Dry-run publish (validation only)
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.dry_run == 'true'
         run: pnpm publish --dry-run --no-git-checks

AGENTS.md

@@ -1,7 +1,7 @@
 # dsh-better-sidebar 仓库规则（AGENTS）
 
 > 本文只含**项目全局开发规则**（面向贡献者与 agent）。
-> 消费插件接入 API 全参考（`ctx.betterSidebar` 服务、TabDescriptor / FileViewerDescriptor 全字段、声明式设置、自由窗口、皮肤契约等）→ [docs/external-plugin-guide.md](docs/external-plugin-guide.md)；逐特性设计史（含实施偏差记录）→ [docs/plans/](docs/plans/)。
+> 消费插件接入 API 全参考（`ctx.betterSidebar` 服务、TabDescriptor / FileViewerDescriptor 全字段、声明式设置、原生右侧栏承载面、皮肤契约等）→ [docs/external-plugin-guide.md](docs/external-plugin-guide.md)；逐特性设计史（含实施偏差记录）→ [docs/plans/](docs/plans/)。
 
 ---
 
@@ -17,26 +17,29 @@
 
 ## 2. CI 挂载冒烟（`plugin-mount` job / `pnpm test:mount`）
 
-「npm 打包 → 真实挂载 → 无头渲染」门禁（证明打包产物在真实 DSH 挂载后不 crash）：`pnpm build && pnpm pack` 产 tarball → `scripts/e2e-mount.sh` 装进全新 scratch profile（`dsh plugin --profile web add file:<tarball>`）并启动真实 `dsh web`（keyless，`--port 0`）→ `tests/e2e/mount.e2e.ts`（Playwright）断言 `[data-dsh-better-sidebar]` 挂载、无错误条/pageerror/console 错误，经「+ 菜单」逐个打开内置 tab（含终端懒加载 chunk），再经文件树打开 seed 文件强制加载 editor chunk（`client-editor.js`）。
+「npm 打包 → 真实挂载 → 无头渲染」门禁（证明打包产物在真实 DSH 挂载后不 crash）：`pnpm build && pnpm pack` 产 tarball → `scripts/e2e-mount.sh` 装进全新 scratch profile（`dsh plugin --profile web add <tarball>`）并启动真实 `dsh web`（keyless，`--port 0`）→ `tests/e2e/mount.e2e.ts`（Playwright）断言 `[data-dsh-better-sidebar]` 挂载、无错误条/pageerror/console 错误，展开 DSH 原生右侧栏后经其 guide 页逐个打开插件 tab 类型（含终端懒加载 chunk），再经插件文件树（原生 `files` kind 接管）打开 seed 文件强制加载 editor chunk（`client-editor.js`），并跑 mermaid / README 预览与 sidechat 宿主路由烟测。
 
-本地：`pnpm build && pnpm pack && pnpm exec playwright install chromium && pnpm test:mount`。CI 钉 `@deepseek-ai/dsh@0.1.2-alpha.2`（`alpha` dist-tag；peer 下限 `^0.1.2-alpha.2`）。e2e spec 命名 `*.e2e.ts` + vitest `exclude` 双保险；**改 `exclude` 必须保留默认排除项**（exclude 整体替换默认值）。
+本地：`pnpm build && pnpm pack && pnpm exec playwright install chromium && pnpm test:mount`。CI 钉 `@deepseek-ai/dsh@0.1.5-alpha.2`（`alpha` dist-tag；peer 下限 `^0.1.5-alpha.2`）。e2e spec 命名 `*.e2e.ts` + vitest `exclude` 双保险；**改 `exclude` 必须保留默认排除项**（exclude 整体替换默认值）。
 
 ---
 
-## 3. DSH 0.1.2-alpha 适配要点（alpha 通道）
+## 3. DSH 0.1.5 适配要点（0.1.5-alpha.2+ 基线）
 
-**v0.18.0-alpha.0 起插件进入 alpha 通道，仅支持 DSH 0.1.2-alpha.x**（peer 下限 `^0.1.2-alpha.2`，CI 钉 `@deepseek-ai/dsh@0.1.2-alpha.2`，npm 走 `alpha` dist-tag）。对 0.1.0-rc.8 ~ 0.1.1-rc.2 的兼容层已删除——双方言 RPC（点分回退）、MarkdownText 双形状 labels、`dsh-client-runtime` externals/inject 残留行；stable DSH 用户请装 v0.17.1（npm `latest`）。发版：release.yml 按版本号是否含 `-` 自动选 `alpha`/`latest` dist-tag。
+**v0.19.0-alpha.1 起仅支持 DSH 0.1.5-alpha.2+**（peer 下限 `^0.1.5-alpha.2`，CI 钉 `@deepseek-ai/dsh@0.1.5-alpha.2`，DSH alpha 线发在 `alpha` dist-tag）。alpha.1 用户停留在 v0.19.0-alpha.0——alpha.2 删除了指南条目的 `description` 字段并改了文件地址语法，插件不再对 alpha.1 做运行时兼容。0.1.2-rc.1 稳定线用户继续用 v0.18.x（npm `latest`）——0.1.5 的会话事件模型与文件打开漏斗都变了，插件不再对 0.1.2 做运行时兼容。发版：release.yml 按版本号是否含 `-` 自动选 `alpha`/`latest` dist-tag。
 
 宿主契约（均经真机挂载冒烟 14/14 验证）：
 
 1. **一次性 token 鉴权**：就绪行 `dsh web: http://127.0.0.1:<port>/?token=<43字符>`（导航换签名 cookie，干净 URL 401）。`e2e-mount.sh` 的 URL grep 必须延伸到空白（`[^ ]*`，在 `/` 截断丢 token）；e2e 统一走 `tests/e2e/host.ts`（token 必选：`parseLaunchUrl` 对裸 origin 直接抛错），带 stamps 导航走 `gotoPage()`（先 addCookies 再直达——token 换 cookie 的 303 会丢弃同 URL 其它 query 参数）。插件 `/sidebar/*` 路由不受影响，同源 fetch 照旧。
 2. **Remote gateway 斜杠 RPC（唯一方言）**：`POST /api/workspace/create`，payload 恰为 `{args: {...}}`，**args 按控制器 TS 参数名包装**（`workspace/create`、`session/create` → `{args:{request:{...}}}`；`session/list` 参数名 `_request` **不可省略**——`{}` 也被拒 `args fields do not match the descriptor`）；envelope `method` 与路径一致，点分路径 404。请求由 `tests/e2e/host-protocol.ts` 的 `rpcAttempt` 构造、`tests/e2e-host-protocol.spec.ts` 锁定；要调新方法先在真机验参数名再进 `RPC_ARGS_KEY`。
 3. **`MarkdownText` labels 嵌套契约**：必填 `labels: { code: { copyLabel, copiedLabel }, footnotes }`（漏传回退硬编码中文）。四个渲染点（mermaid.tsx / MarkdownHtml.tsx / TextEditor.tsx / SideChatView.tsx）统一走 `src/client/markdown-labels.tsx` 的 `markdownTextProps()`。
-4. **侧边对话转录走自有路由，不碰客户端宿主 RPC**：`ctx.connection.api`（含 `sessions.history`）在 alpha.1 整体移除，继任 `session/follow|page` 又对 `origin:'subagent'` 会话强制 subagent 地址（普通 `{kind:'session'}` 被 `agent-busy` 拒）且分页 `throughSeq` 不得超当前游标。转录因此由 **`sidechat.events`** 插件路由供给（`src/sidechat-routes.ts`：live 读 `agent.session.events`、冷读 `sessionPersistence.inspect`，服务端 `session/end-seed` 切割 + `afterSeq` 增量）；`ctx.connection` 镜像与 inject 已删。设计见 [docs/plans/2026-08-20-sidechat-tab-design.md](docs/plans/2026-08-20-sidechat-tab-design.md) §10。
+4. **侧边对话转录走自有路由，不碰客户端宿主 RPC**：`ctx.connection.api`（含 `sessions.history`）在 alpha.1 整体移除，继任 `session/follow|page` 又对 `origin:'subagent'` 会话强制 subagent 地址（普通 `{kind:'session'}` 被 `agent-busy` 拒）且分页 `throughSeq` 不得超当前游标。转录因此由 **`sidechat.events`** 插件路由供给（`src/sidechat-routes.ts`：live 读 `agent.session.snapshotEvents()`、冷读 `sessionPersistence.inspect`，服务端 `session/end-seed` 切割 + `afterSeq` 增量）；`ctx.connection` 镜像与 inject 已删。**0.1.5 起实时增量不在日志里**：`assistant/chunk` 事件被删除，进行中的模型增量改由 `agent/assistant-stream` 瞬时帧发布（`start` / `chunk` / `end`，不入会话日志），结算时才落 `assistant/message`（内嵌 `stream`）或 `assistant/attempt`（失败尝试，内嵌 `stream`）。插件在宿主侧 `src/assistant-live.ts` 折叠这些帧成有界缓冲，`sidechat.events` 的 `live` 字段按「当前 attempt 全量、每次轮询替换」下发（不是增量），转录映射与继承快照都读它。设计见 [docs/plans/2026-08-20-sidechat-tab-design.md](docs/plans/2026-08-20-sidechat-tab-design.md) §10。
 5. **`dsh-settings` 无运行时 `settingsNamespace`**：命名空间合法性校验转为编译期模板字面量 `SettingsNamespaceInput`（小写字母开头 + `[a-z0-9-]` 尾部），`'dsh-better-sidebar'` 字面量直接过——宿主侧直接传常量（`src/index.ts` 的 settings inject）。
 6. **`dsh-subagent` 的 `SUBAGENT_DESCRIPTOR_VERSION` 2 → 3**：sidechat 种子的 `subagent/descriptor` 版本由宿主包盖章，插件不硬编码；测试断言跟随常量（`tests/sidechat-routes.spec.ts`），勿钉字面量。
 7. **`@deepseek-ai/dsh-client-runtime` 包已消亡**（继任 seed 是裸名 `dsh-client-store`，无 `/client` 子路径）：peerDependencies、devDependencies、`dsh.client.inject`、chunk externals 白名单（`src/client/chunk-loader.ts` / `tsdown.config.ts` / `tests/chunk-loader.spec.ts` / `tests/manifest-consistency.spec.ts` 四处同步）均已无该条目。
 8. **e2e scratch profile 的 `minimumReleaseAgeExclude` 含 `'@deepseek-ai/*'`**（`scripts/e2e-mount.sh` / `e2e-aggregate-mount.sh`，与仓库根 `pnpm-workspace.yaml` 同策）：alpha 版本常在发布后 24h 内跑 lane，pnpm 11 的 `minimumReleaseAge` 默认会拒装新鲜包。
+9. **插件开发树的 dsh-* 传递 peer 需提升为 devDependencies**（alpha.3 首见）：`dsh-subagent` 等 npm 包把 `dsh-attachment` 等 dsh-* 姊妹包全部声明为 peerDependencies（由宿主 bundle 树统一提供，宿主侧无此问题），插件仓库若只直接依赖其中一部分，其余 peer 在 pnpm 下会解析到树上残留的旧版——如 `dsh-attachment@0.1.1-rc.1` 缺 `admitPromptContent` 导出、`dsh-subagent` 产物 import 它时测试加载即崩。因此 devDependencies 需涵盖 dev 树实际触达的全部 peer（attachment / code-runtime / scope / session-projection / system-prompt / user-approval / util-time 七个即为此提升，与直接依赖同款精确钉版）；`@deepseek-ai/cordis` peer 自 alpha.3 起要求 `^4.0.2`（上游全线 peer 已升）。适配新 alpha 版本时先跑 `pnpm peers check`，把新失配的传递 peer 一并提升进 devDependencies。例外：**`dsh-client-locale` 的 peer/devDep 允许落后于基线**（alpha.5 时上游停在 0.1.2-alpha.3 未发新版）——peer 下限 `^0.1.2-alpha.3` 天然容纳同 tuple 的 alpha.5 运行时，此时保持旧钉版并在 `pnpm-workspace.yaml` 注明，待上游发版再追平；rc.1 起上游恢复发版，peer/devDep 已与基线一并钉 `0.1.2-rc.1`，该例外消除。**alpha.2 起还有一类：上游包自身的 `dependencies` 丢失**——`@deepseek-ai/dsh-client-ui-primitives@0.1.5-alpha.2` 的 manifest 不再声明任何 `dependencies`（alpha.1 声明了 19 个），但 `lib/*.js` 仍裸 import `anser` / `shiki` / `@shikijs/langs/*` / `mdast-util-*` / `micromark-*` / `katex`。宿主由预构建前端 bundle 满足，独立安装的 dev/test 树不会——vitest 一碰 primitives 就 `Cannot find package 'anser'`。此时把 alpha.1 声明的同一组版本提升进 devDependencies（`clsx` 已在 dependencies 无需重复）。
+10. **右侧栏是 DSH 原生栏，插件只提供 tab 类型**：聊天里一切文件打开（工具行 / 产物行 / 正文提及 / 行内代码路径）统一走 `ctx.sidebarRight.openResource(fileAddressFor(sessionId, cwd, path))`（`packages/client/ui-chat/src/client/apply.ts` 是唯一调用点），`remote.session.openWorkspacePath` 在 0.1.5 客户端已无调用者，插件的 openpath 拦截随之删除。插件的每个 `TabDescriptor` 注册成原生 tab 类型（`kind = descriptor.id`，`extension` 带）+ 原生 tab 体（`sidebar.right.pane.tab` keyed 槽，key = `dsh-better-sidebar:<id>`）；`editor` 类型同时认领 `dsh-resource://file/**`（压过内置 `text` 的 `fallback`），并接管内置 `files` 页面 kind（`openTab('files')` 打开插件文件树，注销即复位）。`ctx.sidebarRight.openTab/openResource/close` 只对**在屏会话**写入；跨会话用具体类上的 `openTabIn/openResourceIn/closeIn`（不在 `ISidebarRight` 接口里，需结构化探测），目标会话未挂载时排队到上屏重放（`src/client/native/surface.ts`）。原生 tab 的插件侧状态（合成 `SidebarTab`、树展开集合、实例编号）在 `src/client/native/tab-adapter.tsx`；原生布局只在内存，不做持久化。**注册必须等服务、不能等槽声明**：原生栏先声明 `sidebar.right.pane.tab` 再 `provide('sidebarRightTabs')`，真机 profile（web，0.1.5-alpha.1）上槽声明回调里 `ctx.get('sidebarRightTabs')` 仍是 undefined（实测 3 秒后才出现），按槽触发注册会静默什么都不注册且永不重试——用 `ctx.inject(['sidebarRightTabs'], cb)` 驱动类型注册（`tests/native-surface.spec.ts` 以「槽先触发、服务后到达」的顺序守护），槽声明只用来挂 tab 体。指南 §0 列了全部行为差异。**alpha.2 起（v0.19.0-alpha.1）**：指南条目删除 `description`（原生指南渲染成「图标+标题」胶囊），插件随之下线 `TabDescriptor.description` 与 6 个 `guideDesc*` 词条；新建标签页的默认页改为从注册表选（恰好 1 个指南条目 → 直接开它，0 或 ≥2 → 开指南），`revealIfOpened` 对「页面」在同一 pane 内强制去重。原生 tab 体宿主 `.paneBody` 是**有确定高度的块级滚动容器**（非 flex 容器），native 适配层因此给每个 tab 体包一层 `height:100%` 的列 flex 宿主（`sidebar.module.css` 的 `.nativeTabHost`），tab 组件根继续用 `flex:1`/`height:100%`——否则根盒塌成内容高度，sidechat 的输入框就贴不到面板底。全局面板（根级 `main` keyed 槽 + `sidebar.panellist` + `ctx.layout.selectPanel/beginNavigation`、`rightbar` 改根级并新增 `rightbar.session`）插件**不接入**，只做兼容。底部工作台的中心列锚点改认 `[data-slot="main.conversation"]`（并跳过 `display: contents` 祖先，同时保留 alpha.1 的 `[data-slot="conversation"]`）；文件地址语法跟随 alpha.2（`fileAddressFor` 一律 session 作用域、绝对路径保留前导 `/`、`parseFileAddress` 前缀解析并去 `?`/`#`）。
+11. **自定义种子必须带 fork 标记对（`meta.isSeeded: true` + `inheritedEventCount`）**：dsh-session 契约「只给 seed 不标 isSeeded，种子算重放历史而非继承前缀」——缺标记时 `Session.ownEvents()` 含整个种子，子会话的 inbox 折（`inboxProjectionDefinition`，0.1.5 起 `@deepseek-ai/dsh-agent` 只导出 `Inbox` 接口，实现是该投影）重放种子里的 `agent/inbox/spliced`，**继承父会话切割时刻未领取的 inbox 输入**（排队用户消息 next-turn、长回合中工具结果上下文/steering next-step——后者即「上下文很长时侧边对话先把之前的 User msg 发出去」的根因，幽灵消息排在 boundary 之前最先发给模型）。宿主 `session.fork`（api-session-controller）的调用即规范形态；回归由 `tests/sidechat-seed-validation.spec.ts`（真实 `Session.create` + 对 `ownEvents()` 跑 inbox 折）守护。0.1.5 复评：无更优雅的 sidechat 宿主 API（`ContinuableStartSpec` 仍无 seed 字段），`AgentRegistry.create` 接缝补齐标记即为规范用法；`Session.create` 的 header `version` 必须用 `SESSION_FORMAT_VERSION`（0.1.5 是 `3` 字面量类型），勿钉 `0`。
 
 ---
 
@@ -64,6 +67,6 @@
 
 ## 6. 文档与测试地图
 
-- **接入 API 全参考**：[docs/external-plugin-guide.md](docs/external-plugin-guide.md)（消费插件开发者向；§4 Tab API / §5 FileViewer API / §7 服务方法 / §10 平台陷阱 / §11 自由窗口 / §12 皮肤契约 / §15 真实案例）。
+- **接入 API 全参考**：[docs/external-plugin-guide.md](docs/external-plugin-guide.md)（消费插件开发者向；§0 原生栏承载面 / §4 Tab API / §5 FileViewer API / §7 服务方法 / §10 平台陷阱 / §11 已移除的自由窗口 / §12 皮肤契约 / §15 真实案例）。
 - **设计文档**：[docs/plans/](docs/plans/)（30+ 份逐特性设计，含实施偏差记录）。
-- **关键测试守护**：`tests/service.spec.ts` / `builtins.spec.ts`（注册表与内置清单：7 tab + 6 viewer）/ `market-manifest.spec.ts`（市场约束）/ `e2e-host-protocol.spec.ts`（RPC 双协议）/ `free-window.spec.tsx`（自由窗口）/ `theme.spec.ts`（皮肤契约）/ `plugin-list.spec.ts`（推荐插件目录）/ `fs-search.spec.ts`（host 文件名搜索）。
+- **关键测试守护**：`tests/service.spec.ts` / `builtins.spec.ts`（注册表与内置清单：7 tab + 6 viewer）/ `market-manifest.spec.ts`（市场约束）/ `e2e-host-protocol.spec.ts`（RPC 双协议）/ `native-surface.spec.ts`（原生右侧栏承载面）/ `theme.spec.ts`（皮肤契约）/ `plugin-list.spec.ts`（推荐插件目录）/ `fs-search.spec.ts`（host 文件名搜索）。

Makefile

@@ -0,0 +1,44 @@
+# dsh-better-sidebar 命令面薄封装：目标仅转发 package.json scripts（唯一事实源），
+# 新增/改名 script 不需要动这里；本文件只补目标发现（help）与 CI 门禁聚合
+# （check / mount / mount-aggregate / registry）。
+
+.DEFAULT_GOAL := help
+
+help: ## 列出所有可用目标
+	@awk -F':.*## ' '/^[a-zA-Z0-9_-]+:.*## / {printf "  \033[36m%-18s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+install: ## 安装依赖（pnpm install）
+	pnpm install
+
+build: ## 构建（清 lib/ → tsc → tsdown）
+	pnpm build
+
+typecheck: ## 类型检查（tsc --noEmit）
+	pnpm typecheck
+
+lint: ## 代码检查（eslint .，flat config 最小规则集）
+	pnpm lint
+
+test: ## 单元测试（vitest run）
+	pnpm test
+
+check: ## 聚合校验门禁：typecheck → lint → build → test → check:consumer-types（对齐 CI）
+	pnpm typecheck && pnpm lint && pnpm build && pnpm test && pnpm check:consumer-types
+
+clean: ## 清理构建产物与测试报告（lib/、*.tgz、playwright-report/、test-results/）
+	rm -rf lib playwright-report test-results
+	rm -f *.tgz
+
+pack: ## 打 npm tarball（pnpm pack）
+	pnpm pack
+
+mount: ## 真机挂载冒烟：build + pack → Playwright Chromium → pnpm test:mount
+	pnpm build && pnpm pack && pnpm exec playwright install chromium && pnpm test:mount
+
+mount-aggregate: ## 聚合双挂载回归：build + pack → pnpm test:mount:aggregate
+	pnpm build && pnpm pack && pnpm test:mount:aggregate
+
+registry: ## 组装 plugin-registry 暂存（registry/，不入库）：build → node scripts/package-registry.mjs
+	pnpm build && node scripts/package-registry.mjs
+
+.PHONY: help install build typecheck lint test check clean pack mount mount-aggregate registry

README.md

@@ -9,9 +9,9 @@
   <a href="https://github.com/omdsh-dev/DSH-better-sidebar/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/omdsh-dev/DSH-better-sidebar" /></a>
   <a href="https://opensource.org/licenses/MIT"><img alt="License: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg" /></a>
   <a href="https://dshfind.com/zh/plugins/omdsh-dev/DSH-better-sidebar?ref=badge"><img alt="dshfind" src="https://dshfind.com/api/badge/omdsh-dev/DSH-better-sidebar?lang=zh" /></a><br /><br />
-  <a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="支持的 DSH 版本（v0.18.0-alpha.0 alpha 通道）：0.1.2-alpha.2" src="https://img.shields.io/badge/DSH-0.1.2--alpha.2_(alpha%20%E9%80%9A%E9%81%93)-4d6bfe" /></a>
+  <a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="支持的 DSH 版本（v0.18.1 正式版）：0.1.2-rc.1+" src="https://img.shields.io/badge/DSH-0.1.2--rc.1%2B-4d6bfe" /></a>
   <a href="https://github.com/topics/dsh-better-sidebar"><img alt="插件生态：GitHub topic dsh-better-sidebar" src="https://img.shields.io/badge/%E6%8F%92%E4%BB%B6%E7%94%9F%E6%80%81-topic%20dsh--better--sidebar-4d6bfe" /></a><br /><br />
-  <img alt="文件管理" src="https://img.shields.io/badge/-文件管理-4d6bfe" /> <img alt="编辑预览" src="https://img.shields.io/badge/-编辑预览-4d6bfe" /> <img alt="内嵌浏览器" src="https://img.shields.io/badge/-内嵌浏览器-4d6bfe" /> <img alt="真实终端" src="https://img.shields.io/badge/-真实终端-4d6bfe" /> <img alt="Git 面板" src="https://img.shields.io/badge/-Git%20面板-4d6bfe" /> <img alt="后台任务" src="https://img.shields.io/badge/-后台任务-4d6bfe" /> <img alt="侧边对话" src="https://img.shields.io/badge/-侧边对话-4d6bfe" /> <img alt="插件接入" src="https://img.shields.io/badge/-插件接入-4d6bfe" /><br /><br />
+  <img alt="文件管理" src="https://img.shields.io/badge/-文件管理-4d6bfe" /> <img alt="编辑预览" src="https://img.shields.io/badge/-编辑预览-4d6bfe" /> <img alt="内嵌浏览器" src="https://img.shields.io/badge/-内嵌浏览器-4d6bfe" /> <img alt="真实终端" src="https://img.shields.io/badge/-真实终端-4d6bfe" /> <img alt="文件变动" src="https://img.shields.io/badge/-文件变动-4d6bfe" /> <img alt="后台任务" src="https://img.shields.io/badge/-后台任务-4d6bfe" /> <img alt="侧边对话" src="https://img.shields.io/badge/-侧边对话-4d6bfe" /> <img alt="插件接入" src="https://img.shields.io/badge/-插件接入-4d6bfe" /><br /><br />
   <b>右侧栏 + 底部面板双工作台</b>，并把 <code>ctx.betterSidebar</code> 服务开放给所有插件——<br />
   通过 <code>registerTab</code> / <code>registerFileViewer</code> 注册新的侧边栏页面与文件预览器。
 </div>
@@ -44,27 +44,26 @@
 - **🌐 内嵌浏览器**：多开网页 tab，后退 / 前进 / 刷新；内容运行在沙箱 iframe；外链默认按协议分流——HTTP 在侧边栏打开、HTTPS 走系统浏览器（设置页可分别调整）
 - **💻 真实终端**：xterm.js + node-pty 真实 shell，断线重连回放；可选为模型注入 `terminal_*` 工具
 - **📂 模型侧边栏打开（可选）**：全局设置开启后注入 `sidebar_open` 工具——模型可主动在侧边栏打开文件 / 文件夹（树以该目录为根）/ HTTP(S) 网页
-- **🌿 Git 面板**：真 diff + VSCode 式 diff tab、历史、右键暂存 / 提交 / 还原；工作区容器下自动发现子仓库并显示**仓库选择器**，支持 linked worktree 变更发现
+- **🌿 文件变动**：Git 视角（真 diff / 历史 / 暂存·提交·还原 / worktree·子仓库选择）与本轮文件视角（模型读 / 写 / 编辑实时追踪，按文件分组、按类型筛选）**双视角合一**；统一 diff 渲染（改蓝配对 + 行内字符级高亮 + 语法着色（含 mjs/cjs/mts/cts、CSS/SCSS/Less、HTML/XML/SVG/Vue、GraphQL、JSONC/JSON5）+ 上下文折叠），底部可拖拽预览面板，可一键展开为独立 diff tab（落进工作台的 diff 分栏）；`.md` 操作（读 / 写 / 编辑）预览头部可切换**阅读模式**——经共享 MarkdownText 渲染 GFM 表格 / 任务列表 / 删除线 / 脚注 / 数学公式，本地图片自动改写为 `/sidebar/file` 媒体路由；含 ```mermaid 围栏时走编辑器同款懒加载 mermaid 渲染器（图可点击缩放 / 平移）；**敏感内容脱敏**——凭据形态路径整文件遮罩、普通文件按内容形态遮值（api_key: / Bearer / sk- / AKIA / ghp_ / PEM 等，字段名保留），默认开启、预览面板一键开关（localStorage 记忆），仅影响显示、不改会话数据。已知边界：mermaid 无引号节点标签含被遮密钥时，图回退源码（规避：标签加引号）；`.html` 操作（读 / 写 / 编辑）预览头部可切换**渲染模式**——复用编辑器同款 `/sidebar/html` 路由 iframe，相对资源（./style.css、img/x.png）同路由解析，分段读取也渲染完整文档，恒定沙箱（opaque origin + CSP 头，无逃生门）；`.pdf` 操作（读 / 写 / 编辑）同样可切换**渲染模式**——复用编辑器同款 PDF 预览（媒体路由字节流 + 显式 Blob，浏览器原生查看器内嵌，附下载入口）
 - **🧩 后台任务页**：subagent 拓扑 + 后台任务（退出码 / 实时输出 / 强制终止）
 - **💬 侧边对话(beta)**：Codex 风格的侧边线程——继承主会话完整上下文（含进行中的回合与工具调用）独立运行，不进入主会话；线程内可持续追问，一键「保存为新会话」提升为顶层会话
-- **🪟 双工作台**：右侧栏 + 底部面板；拖 Tab 拆分 / 合并分栏（可跨面板），移动端自动合并全宽抽屉
-- **🪟 自由窗口**：把标签栏的任一 tab 拖到主会话区域——成为可移动 / 缩放 / 置顶的悬浮窗口（默认 390×780），拖回侧边栏 pane 即停靠，随会话持久化；`features` 含 `'floatWindows'`，插件 tab 无差别支持
+- **🖥️ 原生右侧栏 + 底部工作台**：右列交给 DSH 0.1.5 的原生右侧栏——插件把每个 tab 类型注册成原生 tab（文件打开走 `dsh-resource://file/**`，并接管内置「文件」页 / 文件树），插件自己只保留底部工作台（分栏 / 终端 / 随会话持久化），开合按钮挂在会话头右侧
 - **📌 固定终端**：右键终端 Tab 可「固定到工作区 / 固定到全局」——固定后切换会话不消失，在 TabBar 内联呈现（跨会话虚拟 Tab，点击就地激活，PTY 按 home 会话 id+tab 直连宿主 PTY，无需切回宿主会话）；Agent 终端被 reconcile 移除时豁免保留
 - **🔁 会话隔离**：布局 / Tab / 面板按会话持久化，陈旧状态自动净化
 - **⚙️ 声明式设置**：设置页「侧边卡片」逐项独立开关，二级设置经齿轮弹窗
 - **⚡ 按需加载**：启动只拉 ~325KB 核心，终端 / 编辑器 / Mermaid 图表等重依赖用到才按需拉取（[设计文档](docs/plans/2026-08-12-lazy-chunks-design.md)）
 - **🌏 多语言**：界面文案跟随 DSH 语言（zh / en）实时切换；安装 `@huanlin/dsh-plugin-better-locale` 后支持日语（ja）等第三语言覆盖（见下方「🌏 第三语言覆盖」）
 
-> 🔌 **核心理念**：服务优先——内置的 7 tab + 6 viewer 与第三方插件通过同一套 `ctx.betterSidebar` API 注册，能力完全对等；官方不再内置、可由生态提供的功能，交由生态插件实现（已有 **28+ 生态插件**，见下方「🌐 插件生态」）。接入文档见「🔌 服务化扩展」与 [外部插件接入指南](./docs/external-plugin-guide.md)。
+> 🔌 **核心理念**：服务优先——内置的 8 tab + 6 viewer 与第三方插件通过同一套 `ctx.betterSidebar` API 注册，能力完全对等；官方不再内置、可由生态提供的功能，交由生态插件实现（已有 **28+ 生态插件**，见下方「🌐 插件生态」）。接入文档见「🔌 服务化扩展」与 [外部插件接入指南](./docs/external-plugin-guide.md)。
 
 ## 🚀 安装
 
 **前置**：已装好 DSH（`dsh web` 能正常运行），Node.js ≥ 20、pnpm ≥ 10。
 
 **支持的 DSH 版本**：
-<a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="支持的 DSH 版本（v0.18.0-alpha.0 alpha 通道）：0.1.2-alpha.2" src="https://img.shields.io/badge/DSH-0.1.2--alpha.2_(alpha%20%E9%80%9A%E9%81%93)-4d6bfe" /></a>
+<a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="支持的 DSH 版本（v0.18.1 正式版）：0.1.2-rc.1+" src="https://img.shields.io/badge/DSH-0.1.2--rc.1%2B-4d6bfe" /></a>
 
-> 🧪 **alpha 通道**：`v0.18.0-alpha.0` 起适配 DSH **0.1.2-alpha.x**（npm dist-tag `alpha`），不再支持 0.1.0-rc.8 ~ 0.1.1-rc.2——DSH stable 用户请继续用 `@latest`（v0.17.1）；DSH 0.1.2-alpha.2 用户安装 `dsh-better-sidebar@alpha`。
+> 📌 **正式版**：`v0.18.0` 起适配 DSH **0.1.2-rc.1+**（npm dist-tag `latest`），不再支持 0.1.0-rc.8 ~ 0.1.1-rc.2——DSH stable（≤ 0.1.1-rc.2）用户请固定安装 `dsh-better-sidebar@0.17.1`（`@latest` 已由 v0.18.0 接管）；停留在 0.1.2-alpha.x 的宿主请先升级 DSH，或继续用 `dsh-better-sidebar@alpha`（v0.18.0-alpha.0）。
 
 ```sh
 dsh plugin --profile web add dsh-better-sidebar@latest   # 首次会因 pnpm 11 拦截 node-pty 构建脚本而失败（依赖已写入）
@@ -85,6 +84,8 @@ dsh plugin --profile web add dsh-better-sidebar@latest   # 重跑即成功
 遇到报错先查 https://github.com/omdsh-dev/DSH-better-sidebar README 的常见问题表。
 ```
 
+**方式三：一键脚本**——克隆本仓库后执行 `bash scripts/install.sh`（macOS / Linux / Windows Git Bash；Windows 原生环境用 `install.ps1`；`-h` 查看参数），自动完成 add → 放行构建脚本 → 重跑安装。
+
 <details>
 <summary><b>更新</b></summary>
 
@@ -162,14 +163,14 @@ dsh registry enable dsh-external/dsh-better-sidebar
 |---|---|
 | **🗂️ 文件工作台：资源管理器**<br/><sub>支持两种格式的资源管理器：内嵌在文件预览中 / 独立显示文件树。懒加载目录树、软链接按目标类型展示（目录软链接可展开、失效链接标红）、全局文件名搜索、上传文件/文件夹与拖放上传、右键菜单（在新 Tab 打开 / 在侧边打开 / 复制路径）、悬浮 `@文件` 一键引用进输入框。</sub><br/><div align="center"><img width="420" alt="文件资源管理器" src="https://github.com/user-attachments/assets/a410bfd2-a8ba-43e6-873e-22417756e94d" /></div> | **📝 Markdown · 图片 · PDF 内联预览**<br/><sub>Markdown 预览支持 **Mermaid 图表**（`securityLevel: 'strict'` 安全渲染 + 二次清洗；点击图表弹窗放大、滚轮缩放、拖拽平移）、**README 级内嵌 HTML**（徽章墙 `<div align=center>`、`<details>` 折叠块内嵌 markdown、表格单元格内联标签——DOMPurify 白名单消毒真实渲染，`<script>` 等活性内容剥除，本地图片经会话媒体路由重写）与**浮动目录大纲**（≥3 标题出现，点击平滑跳转、自动展开折叠块）；图片 / PDF 走媒体路由内联展示；Office 三件套由生态插件补齐。</sub><br/><div align="center"><img width="420" alt="Markdown + Mermaid 预览" src="https://github.com/user-attachments/assets/fe0e5182-55bb-45cc-b98b-a2877c2bdd38" /></div> |
 | **🖥️ CodeMirror 代码编辑器**<br/><div align="center"><img width="420" alt="CodeMirror 代码编辑器" src="https://github.com/user-attachments/assets/b44b488e-568c-4ee0-b96c-e9c906598a77" /></div> | **🖼️ 图片内联预览**<br/><div align="center"><img width="420" alt="图片内联预览" src="https://github.com/user-attachments/assets/f9a58c30-5b7a-48b5-9e22-37d7e071f593" /></div> |
-| **💻 真实终端**<br/><sub>xterm.js + node-pty 真实 shell（不是模拟器）：断线重连 transcript 回放、shell / shellArgs 可配置（设置页或 `cordis.patch.yml`）、可选为模型注入 `terminal_*` 工具（agent 可直接开终端跑命令）。</sub><br/><div align="center"><img width="420" alt="真实终端" src="https://github.com/user-attachments/assets/0dad6ad3-ff3f-4b5a-86d2-f832ce65323e" /></div> | **🌿 Git 面板**<br/><sub>暂存 / 取消暂存 / 提交（`Ctrl+Enter`）/ 还原，历史列表；点击改动文件打开 **VSCode 式 diff tab**（红绿行级对比）。</sub><br/><div align="center"><img width="420" alt="Git 面板" src="https://github.com/user-attachments/assets/e7fc1220-305f-4bca-8583-e77ab4f4fa78" /></div> |
-| **🌐 内嵌浏览器**<br/><sub>多开网页 tab：后退 / 前进 / 刷新 / 地址栏；内容运行在**不透明源沙箱 iframe**（界面实时显示沙箱状态，可按页面临时解锁）；聊天里的外链点击可被接管到侧边栏打开（按协议分流，可配）。</sub><br/><div align="center"><img width="420" alt="内嵌浏览器" src="https://github.com/user-attachments/assets/9bc6b65a-64fc-4942-a685-76e391e55606" /></div> | **🧩 任务页：子代理拓扑 + 后台任务**<br/><sub>子代理树实时拓扑（运行状态、批量实时预览）+ 后台任务清单（退出码 / 实时输出 / 强制终止）；新子代理 / 新任务可自动展开侧边栏（可关）。</sub><br/><div align="center"><img width="420" alt="任务页：子代理拓扑" src="https://github.com/user-attachments/assets/dcd8ed2f-59fa-405b-937b-2d250f5034dd" /></div> |
-| **💬 侧边对话(beta)**<br/><sub>Codex 风格侧边线程：**每个对话一个独立 Tab**；线程继承主会话完整上下文（含进行中回合，以 interrupted 诚实冻结）独立运行，不污染主会话；可持续追问、重启冷恢复；一键「保存为新会话」提升为顶层会话。</sub><br/><div align="center"><img width="420" alt="侧边对话(beta)" src="https://github.com/user-attachments/assets/3a338c36-f5de-4000-95f3-4b1cd04f60fc" /></div> | **🪟 双工作台：右侧栏 + 底部面板 + 分栏**<br/><sub>右侧栏与底部面板可同时展开；拖 Tab 到分栏边缘**拆分**、拖到中间**合并**（可跨面板）；面板宽高左缘/上缘拖拽调节；移动端自动合并为全宽抽屉；把 tab 拖到主会话区域可变为**自由窗口**（悬浮 / 缩放 / 置顶，拖回 pane 停靠）。</sub><br/><div align="center"><img width="420" alt="双工作台（右侧栏 + 底部面板）" src="https://github.com/user-attachments/assets/dfdb875e-a1a8-4d4b-8340-353736b1708f" /></div> |
+| **💻 真实终端**<br/><sub>xterm.js + node-pty 真实 shell（不是模拟器）：断线重连 transcript 回放、shell / shellArgs 可配置（设置页或 `cordis.patch.yml`）、可选为模型注入 `terminal_*` 工具（agent 可直接开终端跑命令）。</sub><br/><div align="center"><img width="420" alt="真实终端" src="https://github.com/user-attachments/assets/0dad6ad3-ff3f-4b5a-86d2-f832ce65323e" /></div> | **🌿 文件变动：Git 视角 + 本轮文件**<br/><sub>双视角合一：**Git 视角**保留完整源代码管理（暂存 / 取消暂存 / 提交（`Ctrl+Enter`）/ 还原、历史、worktree 与子仓库选择）；**本轮文件视角**实时折叠会话事件日志，记录模型读 / 写 / 编辑的每个文件（按文件分组、按类型筛选、操作数角标）。点击任意改动在底部**可拖拽预览面板**查看统一 diff——删红 / 增绿 / 改蓝配对 + 行内字符级高亮 + 语法着色 + 上下文折叠——也可一键展开为 VSCode 式独立 diff tab（同一渲染栈）。</sub><br/><div align="center"><img width="420" alt="文件变动" src="https://github.com/user-attachments/assets/e7fc1220-305f-4bca-8583-e77ab4f4fa78" /></div> |
+| **🌐 内嵌浏览器**<br/><sub>多开网页 tab：后退 / 前进 / 刷新 / 地址栏；内容运行在**不透明源沙箱 iframe**（界面实时显示沙箱状态，可按页面临时解锁）；聊天里的外链点击可被接管到侧边栏打开（按协议分流，可配）。</sub><br/><div align="center"><img width="420" alt="内嵌浏览器" src="https://github.com/user-attachments/assets/9bc6b65a-64fc-4942-a685-76e391e55606" /></div> | **🧩 任务页：子代理拓扑 + 后台任务**<br/><sub>子代理树实时拓扑（运行状态、批量实时预览）+ 后台任务清单（退出码 / 实时输出 / 强制终止）；新子代理 / 新任务可自动激活任务页，宽屏同时展开侧边栏，窄屏不强制展开全屏抽屉（可关）。</sub><br/><div align="center"><img width="420" alt="任务页：子代理拓扑" src="https://github.com/user-attachments/assets/dcd8ed2f-59fa-405b-937b-2d250f5034dd" /></div> |
+| **💬 侧边对话(beta)**<br/><sub>Codex 风格侧边线程：**每个对话一个独立 Tab**；线程继承主会话完整上下文（含进行中回合，以 interrupted 诚实冻结）独立运行，不污染主会话；可持续追问、重启冷恢复；一键「保存为新会话」提升为顶层会话。</sub><br/><div align="center"><img width="420" alt="侧边对话(beta)" src="https://github.com/user-attachments/assets/3a338c36-f5de-4000-95f3-4b1cd04f60fc" /></div> | **🖥️ DSH 原生右侧栏 + 插件底部工作台**<br/><sub>右列是 DSH 自己的右侧栏：插件把每个 tab 类型注册成原生 tab（含接管内置「文件」页与文件预览），聊天里的文件点击直接落到原生栏；插件自有底部面板可与其同时展开，拖 Tab 到分栏边缘**拆分**、拖到中间**合并**，高度拖上缘调节；开合按钮在会话头右侧。</sub><br/><div align="center"><img width="420" alt="双工作台（右侧栏 + 底部面板）" src="https://github.com/user-attachments/assets/dfdb875e-a1a8-4d4b-8340-353736b1708f" /></div> |
 | **⚙️ 声明式设置**<br/><sub>设置页「侧边卡片」分区：每个 tab / 预览器一张小卡片，独立开关（高亮启用态 + 品牌开关滑块）；二级设置经卡片底部「功能设置」条弹窗（开关 / 文本 / 数字 / 下拉）；插件自有设置持久化在 `pluginSettings`。</sub><br/><div align="center"><img width="420" alt="声明式设置：侧边卡片" src="https://github.com/user-attachments/assets/0800ca64-621e-48da-b7df-aecfddc3ec29" /></div> | **📱 移动端**<br/><sub>窄屏（<768px）自动切换为全宽抽屉：底栏 tab 一次性并入右侧栏，触屏拖拽可调。</sub><br/><div align="center"><img width="360" alt="移动端全宽抽屉" src="https://github.com/user-attachments/assets/a82ba78a-f4cf-4d85-80e8-050a05beb144" /></div> |
 
 ## 🌐 插件生态
 
-`ctx.betterSidebar` 服务向所有插件开放两个扩展点：**`registerTab`（注册侧边栏页面）** 与 **`registerFileViewer`（注册文件预览器）**。内置的 7 tab + 6 viewer 与第三方插件走同一套 API，能力完全对等。
+`ctx.betterSidebar` 服务向所有插件开放两个扩展点：**`registerTab`（注册侧边栏页面）** 与 **`registerFileViewer`（注册文件预览器）**。内置的 8 tab + 6 viewer 与第三方插件走同一套 API，能力完全对等。
 
 ```ts
 import type {} from 'dsh-better-sidebar'  // 触发 ctx.betterSidebar 类型合并
@@ -214,7 +215,7 @@ GitHub topic [`dsh-better-sidebar`](https://github.com/topics/dsh-better-sidebar
 | [v587d/dsh-anysearch-refs](https://github.com/v587d/dsh-anysearch-refs) | <img alt="stars" src="https://img.shields.io/github/stars/v587d/dsh-anysearch-refs?style=flat&color=4d6bfe" /> | AnySearch 搜索结果引用卡片：搜索词、来源摘要、关键词高亮 |
 | [mlosun/dsh-docs-panel](https://github.com/mlosun/dsh-docs-panel) | <img alt="stars" src="https://img.shields.io/github/stars/mlosun/dsh-docs-panel?style=flat&color=4d6bfe" /> | 全局文档面板：随身 Markdown 笔记，任何工作区随时可读 |
 | [lnyuqian/dsh-skill-sidebar](https://github.com/lnyuqian/dsh-skill-sidebar) | <img alt="stars" src="https://img.shields.io/github/stars/lnyuqian/dsh-skill-sidebar?style=flat&color=4d6bfe" /> | 技能面板：扫描本机技能目录，4-6 字功能短语 + 一键复制调用 + 置顶 |
-| [g-yixuan/dsh-sidechat](https://github.com/g-yixuan/dsh-sidechat) | <img alt="stars" src="https://img.shields.io/github/stars/g-yixuan/dsh-sidechat?style=flat&color=4d6bfe" /> | Codex 风格侧边对话 + 划选引用注释（轻量消费插件） |
+| [g-yixuan/dsh-sidenote](https://github.com/g-yixuan/dsh-sidenote) | <img alt="stars" src="https://img.shields.io/github/stars/g-yixuan/dsh-sidenote?style=flat&color=4d6bfe" /> | Codex 风格侧边对话 + 划选引用注释（轻量消费插件） |
 | [thirsty5034/dsh-ssh-tunnel](https://github.com/thirsty5034/dsh-ssh-tunnel) | <img alt="stars" src="https://img.shields.io/github/stars/thirsty5034/dsh-ssh-tunnel?style=flat&color=4d6bfe" /> | 多主机 SSH 隧道 + SSH 管理器页 |
 | [thirsty5034/dsh-git-forge](https://github.com/thirsty5034/dsh-git-forge) | <img alt="stars" src="https://img.shields.io/github/stars/thirsty5034/dsh-git-forge?style=flat&color=4d6bfe" /> | GitHub / Gitea 账号、项目授权与推送策略 |
 | [YesSanSan/dsh-conversation-outline](https://github.com/YesSanSan/dsh-conversation-outline) | <img alt="stars" src="https://img.shields.io/github/stars/YesSanSan/dsh-conversation-outline?style=flat&color=4d6bfe" /> | 对话大纲页：按轮次结构化展示、一键跳转、LLM 一句话标题 |
@@ -248,6 +249,7 @@ GitHub topic [`dsh-better-sidebar`](https://github.com/topics/dsh-better-sidebar
 
 | 插件 | ⭐ | 简介 |
 |---|---|---|
+| [eg-bole/dsh-better-sidebar-icons](https://github.com/eg-bole/dsh-better-sidebar-icons) | <img alt="stars" src="https://img.shields.io/github/stars/eg-bole/dsh-better-sidebar-icons?style=flat&color=4d6bfe" /> | VSCode 风格文件 / 文件夹图标主题：文件树与编辑器 Tab 换上熟悉的开发环境图标（vscode-icons 移植，纯 DOM 覆盖零侵入，安装 / 卸载零残留） |
 | [dong-victor/dsh-better-sidebar-terminal-plus](https://github.com/dong-victor/dsh-better-sidebar-terminal-plus) | <img alt="stars" src="https://img.shields.io/github/stars/dong-victor/dsh-better-sidebar-terminal-plus?style=flat&color=4d6bfe" /> | 终端增强：内嵌 Nerd Font 图标字体、修复 xterm 图标渲染、稳定终端 cwd |
 | [Max-Null/dsh-sidebar-preview-select](https://github.com/Max-Null/dsh-sidebar-preview-select) | <img alt="stars" src="https://img.shields.io/github/stars/Max-Null/dsh-sidebar-preview-select?style=flat&color=4d6bfe" /> | 预览划选增强：侧边栏预览里划选文本 → 浮动「发送到会话」 |
 | [Hoemr/dsh-quicklook](https://github.com/Hoemr/dsh-quicklook) | <img alt="stars" src="https://img.shields.io/github/stars/Hoemr/dsh-quicklook?style=flat&color=4d6bfe" /> | QuickLook 式空格预览：活动文件标签页按 Space 全尺寸查看图片 / PDF / 文本，Space 或 Esc 关闭 |
@@ -258,7 +260,108 @@ GitHub topic [`dsh-better-sidebar`](https://github.com/topics/dsh-better-sidebar
 
 ## 🆕 最近更新
 
-**支持的 DSH 版本**：<a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="支持的 DSH 版本（v0.18.0-alpha.0 alpha 通道）：0.1.2-alpha.2" src="https://img.shields.io/badge/DSH-0.1.2--alpha.2_(alpha%20%E9%80%9A%E9%81%93)-4d6bfe" /></a> · 完整发布历史见 [Releases](https://github.com/omdsh-dev/DSH-better-sidebar/releases)
+**支持的 DSH 版本**：<a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="支持的 DSH 版本（v0.18.1 正式版）：0.1.2-rc.1+" src="https://img.shields.io/badge/DSH-0.1.2--rc.1%2B-4d6bfe" /></a> · 完整发布历史见 [Releases](https://github.com/omdsh-dev/DSH-better-sidebar/releases)
+
+### v0.19.0-alpha.1
+
+> 🧪 **alpha 通道**（npm dist-tag `alpha`，安装 `dsh-better-sidebar@alpha`）：本版仅支持 **DSH 0.1.5-alpha.2+**（peer 下限 `^0.1.5-alpha.2`，CI 钉 `@deepseek-ai/dsh@0.1.5-alpha.2`）。0.1.5-alpha.1 请继续用 **v0.19.0-alpha.0**；0.1.2-rc.1 稳定线用 **v0.18.1**（npm `latest`）。
+
+**✨ 新功能**
+
+- 🪟 **每个 tab 体都填满面板**（#609）：原生右侧栏的 tab 体宿主是「有确定高度的块级滚动容器」而非 flex 容器，此前插件各 tab 的根只写 `flex: 1`，在块容器里塌成内容高度——侧边对话的输入框因此贴不到面板底（转录一长就被推出可视区）。现在 native 适配层统一给每个 tab 体包一层 `height: 100%` 的列 flex 宿主，插件全部 tab（含第三方 `registerTab` 注册的 descriptor）恢复与底部工作台一致的填满语义。
+
+**🐛 修复**
+
+- 🧭 **跟随 DSH 0.1.5-alpha.2 的文件地址语法**：`fileAddressFor` 一律产出 session 作用域地址、绝对路径保留前导 `/`；`parseFileAddress` 改为前缀解析并忽略 `?`/`#` 后缀。
+- 🪟 **底部工作台的中心列定位跟随 alpha.2 全局面板改动**：`conversation` 槽改为根级 `main` keyed 槽下的 `main.conversation`，定位器改认新 key 并跳过 `display: contents` 槽宿主（alpha.1 的旧 key 仍兼容）。
+
+**🧰 CI 与内部**
+
+- 基线推进到 DSH 0.1.5-alpha.2（#609）：peer 下限、22 个 devDependency 钉版、CI 挂载车道与 `dsh.plugin.json` engines 同步；`pnpm peers check` 干净（按 §3-9 补提 `dsh-session-persistence` 传递 peer）。
+- **移除 `TabDescriptor.description`**：alpha.2 的原生指南条目不再渲染第二行（改为「图标+标题」胶囊），该字段与 6 个 `guideDesc*` 词条（20 份词典）一并下线；新建标签页的默认页改由注册表选（恰好 1 个指南条目则直接打开它）。
+
+### v0.19.0-alpha.0
+
+> 🧪 **alpha 通道**（npm dist-tag `alpha`，安装 `dsh-better-sidebar@alpha`）：本版仅支持 **DSH 0.1.5-alpha.1+**（peer 下限 `^0.1.5-alpha.1`，CI 钉 `@deepseek-ai/dsh@0.1.5-alpha.1`）。0.1.2-rc.1 稳定线请继续用 **v0.18.1**（npm `latest`）。
+
+**✨ 新功能**
+
+- 🖥️ **接入 DSH 原生右侧栏**（#604）：右列改为 DSH 自己的右侧栏——插件的 7 个 tab 类型全部注册成原生 tab 类型 + 原生 tab 体；聊天里的文件打开统一走 `ctx.sidebarRight.openResource(dsh-resource://file/…)`；`editor` 类型以 `extension` 优先级认领文件资源（压过内置文本预览）并接管内置「文件」页 kind（注销即复位）；跨会话打开在目标会话未上屏时排队重放。
+- 🧩 **退役插件自绘右侧面板与自由窗口**（#605）：右列归 DSH 后，插件只保留底部工作台（单分栏树、随会话持久化），开合按钮注册进 DSH 会话头 utilities 槽；浮窗 API（`floats` / `floatTab` / `dockFloat` / `raiseFloat` / 右键「移动到自由窗口」）、`features` 里的 `'floatWindows'`，以及 `openByDefault` / `defaultWidthPercent` / `changesDiffFloat` 三个设置项一并删除（旧持久化文档里的 `floats` 字段被忽略，不影响加载）。
+- 🔗 **适配 DSH 0.1.5 宿主契约**（#603）：`assistant/chunk` 事件删除 → 实时增量改由 `agent/assistant-stream` 帧折叠（侧边对话转录的 `live` 字段）；`sessionPersistence.inspect` 删除 → 冷会话读取改走 `open(id,'read')`；会话头 `version` 用 `SESSION_FORMAT_VERSION`。
+
+**🐛 修复**
+
+- 侧边对话转录 / `jobs.output` 回放 / fork 继承等 8 处会话事件读取跟随 0.1.5 契约；自定义种子补齐 fork 标记对，避免继承父会话未领取的 inbox 输入。
+
+**🧰 CI 与内部**
+
+- 真机挂载冒烟门禁钉 0.1.5-alpha.1，e2e 增加「展开原生栏 → 经引导页逐个打开插件 tab 类型」的巡检；typecheck / lint / 单测 / 挂载车道全绿。
+
+### v0.18.1
+
+> 📌 **正式版**（npm `latest`）：DSH 基线不变（**0.1.2-rc.1+**，peer 下限 `^0.1.2-rc.1`）——本版是 v0.18.0 之后的增量发布：变更面板预览能力增强、文件树可写，以及五项修复。
+
+**✨ 新功能**
+
+- 📄 **变更面板操作预览增强**（#499）：`.md` 阅读模式（含 mermaid 渲染）、`.html` 与 `.pdf` 内嵌渲染预览；diff 语法高亮扩展到 mjs/cjs/mts/cts、CSS/SCSS/Less、HTML/XML/SVG/Vue、GraphQL、JSONC/JSON5；新增**密钥脱敏**层（预览默认开启，面板头部可切换）
+- 🗂️ **文件树重命名 / 删除**（#550）：行内重命名 + 确认式删除，右键菜单减重与子菜单视口钳制
+- 🧩 **插件目录名与 shell 预设文案词典化**（#535）：跟随宿主语言
+
+**🐛 修复**
+
+- 🔀 **git diff 折叠上下文真实展开**（#576，修复 #577）：折叠行此前显示「n 行…点击展开」却点不动（`-U3` 裁剪使 gap 段没有行文本）；现按需经 `git.show` 拉取两侧完整内容切片填充，带加载 / 失败降级三态与请求去重；顺带修复该路由的 `rev:path` 寻址（此前恒返空）
+- 💬 **侧边对话种子不再继承父会话未领取的 inbox 消息**（#562）：补 fork 标记对，消除「上下文很长时侧边对话先把之前的 User 消息发出去」的幽灵消息
+- 🖼️ **Markdown 分栏渲染器内的本地图片**（#569）：改写为可访问 URL，不再 404
+
+**🧰 CI 与内部**
+
+- ESLint flat config 接入 CI 与 Makefile（#536）、Makefile 命令面规范化（#526）、e2e 脚本加固（#527）、共享组件测试工具收敛样板（#524）
+- 重构：Sidebar.tsx 按关注点拆分（#542）、四处轮询习语收敛到 `use-polling`（#541）、删除 rc.7 宿主的 `__DSH_MODULES__` 回退路径（#540）、One Dark/Light 语法色板单源化（#534）、重复实现收敛与死代码清理（#525）
+
+### v0.18.0
+
+> 📌 **正式版**（npm `latest`）：本版仅支持 **DSH 0.1.2-rc.1+**（peer 下限 `^0.1.2-rc.1`）；不再支持 0.1.0-rc.8 ~ 0.1.1-rc.2——DSH stable 用户请固定安装 `dsh-better-sidebar@0.17.1`，停留在 0.1.2-alpha.x 的宿主继续用 `dsh-better-sidebar@alpha`（v0.18.0-alpha.0）。
+
+**✨ 新功能**
+
+- 🌿 **「文件变动」统一 tab**（#475）：Git 视角（真 diff / 历史 / 暂存·提交·还原 / worktree·子仓库选择）与本轮文件视角（模型读/写/编辑实时追踪）双视角合一；统一 diff 渲染（改蓝配对 + 行内字符级高亮 + 语法着色 + 上下文折叠）、底部可拖拽预览面板、一键展开独立 diff tab
+- 💬 **侧边对话渲染升级**（#486）：主对话级 Blocks 结构、turn 用量尾标、断线重连横幅
+- ⚙️ **工作区路径围栏开关**（#458）：新增 `workspaceFence` 声明式设置键，工作区外路径 403 时错误面一键关闭并指引
+
+**⚡ 性能**
+
+- 🚀 **核心包 -45%**（#489）：19 个非中英词典 chunk 懒加载、渲染稳定化（转录行复用 / tree Sets / 批量 drag）、启动与轮询开销削减（单次 settings fetch、每 tick 单 git 进程）；新增 perf 测量 lane；顺带修复底栏拖拽把面板宽度泄漏进宿主布局、原生左栏突跳的 bug
+- 📉 会话列重复 DOM 查询削减（#456）
+
+**🐛 修复（节选）**
+
+- ✏️ 编辑器 / Markdown：SSH 远程链接客户端打开（#522）、预览/编辑切换保持阅读位置（#467）、预览隐藏 YAML frontmatter（#394）、TOC 外点关闭与层级修复（#461）、@-引用保留 basename（#417）
+- 💻 终端 / 平台：Windows 自定义 shell 解析（#503）、resize 失败容错（#428）、字体解析兜底等宽（#366）、WSL 会话 Linux 绝对路径（#455）、Windows Explorer reveal 保留选中（#508）
+- 🗂️ 布局 / 状态 / 文件树 / 对话：桌面 shell 布局与侧卡片共存（#398）、窄屏自动激活不强制抽屉（#373）、自由窗口 id 恢复冲突（#385）、窗口聚焦自动刷新文件树（#469）、引用提示固定行尾（#509）、划选弹窗关闭与草稿插入锚定（#427）、折叠态开关组对齐（#361）、旧引擎滚动跳变兼容（#448）、旧版 Git worktree 列表（#454）
+
+**🧰 CI 与内部**
+
+- Windows CI 车道（#520）、Makefile 命令面规范化（#526）、e2e 脚本加固 + 聚合双挂载回归（#527）、共享组件测试工具收敛样板（#524）、重复实现收敛与死代码清理（#525）
+
+**🌐 生态收录**
+
+- 新收录 10+ 插件：dsh-better-sidebar-icons（#441）、dsh-sidenote（#451，原 dsh-sidechat #470）、dsh-github-workbench（#410）、dsh-bilingual-reader（#379）、dsh-server-deck（#413）、dsh-md-export（#405）、dsh-code-nav（#404）、dsh-suhuang-scroll（#392）、dsh-better-overleaf（#370）等（均含 18+ 语言 i18n 补齐）
+
+<details>
+<summary><b>历史版本（v0.12.0 – v0.15.2）</b></summary>
+
+### v0.19.0-alpha.0（0.1.2-alpha.5 适配，未发布，内容并入 v0.18.0）
+
+> 🧪 **alpha 通道**：本版仅支持 **DSH 0.1.2-alpha.x**（peer 下限 `^0.1.2-alpha.5`，npm dist-tag `alpha`）。该版本号当时未单独发布，内容已并入 **v0.18.0** 正式版；v0.19.0-alpha.0 这个号后来被 0.1.5 适配线复用（见上）。
+
+- 🔗 **适配 DSH 0.1.2-alpha.5（npm 已发布，`alpha` dist-tag）**：CI 挂载门禁钉版、`dsh.plugin.json` engines 下限与 `@deepseek-ai/*` peer / devDependencies 基线升至 0.1.2-alpha.5（真机挂载冒烟 14/14 验证）。`dsh-client-locale` 上游停在 0.1.2-alpha.3 未发新版，其 peer 下限 / devDep 保持并天然兼容 alpha.5 运行时（`pnpm peers check` 零失配，无需新增提升传递 peer）。代码适配了 alpha.4 的兼容性标记改动——`Session.events` 属性移除，迁移到按需读 API `snapshotEvents()`（sidechat 转录 live 读、fork 继承、`jobs.output` 回放、subagent 活跃度共 8 处），新建线程 meta 中宿主已删的 `seedLength` 一并移除；alpha.4 其余变化（双向 `send_message`、自定义模型发现复用 Profile 请求头、`SessionSeq`/`SessionLogOffset` 强类型）与 alpha.5（升级启动修复）经核实不触及本插件其余表面。
+
+### v0.18.1-alpha.0
+
+> 🧪 **alpha 通道**：本版仅支持 **DSH 0.1.2-alpha.x**（peer 下限 `^0.1.2-alpha.3`，npm dist-tag `alpha`，安装 `dsh-better-sidebar@alpha`）。该版本号未单独发布，内容已并入 **v0.18.0** 正式版。
+
+- 🔗 **适配 DSH 0.1.2-alpha.3（npm 已发布，`alpha` dist-tag）**：CI 挂载门禁钉版、`dsh.plugin.json` engines 下限与 `@deepseek-ai/*` peer / devDependencies 基线升至 0.1.2-alpha.3（真机挂载冒烟 14/14 验证）。逐点核查了 alpha.2 → alpha.3 全部 117 个 commit：插件依赖的宿主契约（token 鉴权、斜杠 RPC、`MarkdownText` labels、`sidechat.events` 所依赖的事件流与持久化 API、`SettingsNamespaceInput`、`SUBAGENT_DESCRIPTOR_VERSION`（仍为 3）、`dsh-client-store`、profile 加载器、node-pty 钉版）均无变化，无需代码适配；alpha.3 的破坏性改动（`BeginSubmissionInput.mode` 必填、subagent 错误码改名 `attachment-invalid`、SQLite 持久化后端移除、投影 change feed 收紧为 identity-gated）经核实均不触及本插件。
 
 ### v0.18.0-alpha.0
 
@@ -320,9 +423,6 @@ GitHub topic [`dsh-better-sidebar`](https://github.com/topics/dsh-better-sidebar
 - 🔧 **git 源安装修复 `unrun` devDependency**（[#336](https://github.com/omdsh-dev/DSH-better-sidebar/pull/336)）：tsdown 0.22 经 `unrun` 加载配置而 pnpm 11 不自动装 peer——git-hosted 安装的 `prepare` 不再报 `Failed to import module "unrun"`（npm tarball 不受影响）
 - 🍃 **`ctx.effect` 严格化顺手修了 4 处**：拦截注册失败时 effect 体返回 `undefined` 改为 no-op disposer（vendored cordis 的 effect 契约要求返回 disposer，返回 `undefined` 属非法形状）
 
-<details>
-<summary><b>历史版本（v0.12.0 – v0.15.2）</b></summary>
-
 ### v0.15.2
 
 自 v0.15.1 以来的全部更改：
@@ -354,7 +454,7 @@ GitHub topic [`dsh-better-sidebar`](https://github.com/topics/dsh-better-sidebar
 
 - 🖥️ **终端跨会话切换保活**（[#323](https://github.com/omdsh-dev/DSH-better-sidebar/pull/323)）：切到其他会话不再被当作瞬时掉线——客户端卸载时发送 `park` 控制帧，主机跳过 30s 重连宽限倒计时；切回会话（`open()` 取消 parked）或显式关闭恢复正常生命周期；agent 终端保持无限期存活
 - 📂 **文件树上传遮罩不再拦截 Tab 拖拽**（[#317](https://github.com/omdsh-dev/DSH-better-sidebar/pull/317)）：拖拽 Tab（重排 / 跨 pane split）经过资源管理器时不再弹上传遮罩、不吞事件——统一按 `dataTransfer.types` 含 `Files` 门控（与面板宿主 shield 一致），Tab 正常落下；OS 文件拖拽行为不变
-- 💬 **子代理自动展开去抖**（[#314](https://github.com/omdsh-dev/DSH-better-sidebar/pull/314)）：Side Chat 线程创建不再误弹任务页——0→N 触发 500ms 重臂并对实时快照按原基线重评估，标题过滤器识别线程后才放行；真实子代理依然自动展开
+- 💬 **子代理自动展开去抖**（[#314](https://github.com/omdsh-dev/DSH-better-sidebar/pull/314)）：Side Chat 线程创建不再误弹任务页——0→N 触发 500ms 重臂并对实时快照按原基线重评估，标题过滤器识别线程后才放行；真实子代理依然自动激活任务页（宽屏展开侧边栏，窄屏只准备 Tab、不强制展开抽屉）
 
 ### v0.15.0
 
@@ -441,7 +541,7 @@ GitHub topic [`dsh-better-sidebar`](https://github.com/topics/dsh-better-sidebar
 推荐添加QQ群(577011007)
 
 <div align="center">
-  <img width="220" alt="微信群二维码" src="https://github.com/user-attachments/assets/39caafc7-9629-4b13-bb2b-eac17eab5b6a" />
+  <img width="220" alt="微信群二维码" src="https://github.com/user-attachments/assets/cbf211c6-e5b8-49c3-a412-7210c0b33d73" />
   <img width="220" alt="QQ群二维码" src="https://github.com/user-attachments/assets/9be34629-26ef-4537-aad4-1393c147f81c" />
 </div>
 
@@ -459,9 +559,9 @@ GitHub topic [`dsh-better-sidebar`](https://github.com/topics/dsh-better-sidebar
 
 ## 🔌 服务化扩展
 
-从 v0.4.0 起暴露 `ctx.betterSidebar` 服务，其他插件可注册侧边栏页面与文件预览器（内置 7 tab + 6 viewer 亦通过同一服务注册）。v0.12.1 补齐基座能力（完整类型导出、能力探测、状态订阅、tab 角标、生命周期回调、定向打开、插件自有设置等）。
+从 v0.4.0 起暴露 `ctx.betterSidebar` 服务，其他插件可注册侧边栏页面与文件预览器（内置 8 tab + 6 viewer 亦通过同一服务注册）。v0.12.1 补齐基座能力（完整类型导出、能力探测、状态订阅、tab 角标、生命周期回调、定向打开、插件自有设置等）。
 
-完整接入文档（全字段、匹配算法、HMR 陷阱、声明式设置、版本探测、自由窗口与皮肤契约）：**[`docs/external-plugin-guide.md`](./docs/external-plugin-guide.md)**；仓库开发规则（硬约束 / CI / 发版）见 [`AGENTS.md`](./AGENTS.md)。
+完整接入文档（全字段、匹配算法、HMR 陷阱、声明式设置、版本探测、原生栏承载面与皮肤契约）：**[`docs/external-plugin-guide.md`](./docs/external-plugin-guide.md)**；仓库开发规则（硬约束 / CI / 发版）见 [`AGENTS.md`](./AGENTS.md)。
 
 ### ➕ 添加插件（推荐插件目录）
 
@@ -472,13 +572,24 @@ GitHub topic [`dsh-better-sidebar`](https://github.com/topics/dsh-better-sidebar
 ## 🛠️ 开发与构建
 
 ```sh
-pnpm install      # @deepseek-ai/* devDependencies 已发布（基线 0.1.2-alpha.2，alpha dist-tag），直接解析、无需令牌
+pnpm install      # @deepseek-ai/* devDependencies 已发布（基线 0.1.2-rc.1，next dist-tag），直接解析、无需令牌
 pnpm typecheck    # tsc --noEmit
+pnpm lint         # eslint .（flat config：js + typescript-eslint + react-hooks recommended）
 pnpm build        # → lib/index.js + lib/invariant.js + lib/client.js + lib/client-registry.js + lib/types
 pnpm test         # vitest（含 manifest 一致性守卫，需先 build）
 pnpm watch        # tsdown --watch
 ```
 
+**Make 薄封装**（`make help` 查看全部目标；package.json 仍是唯一事实源）：
+
+```sh
+make check          # 聚合校验门禁：typecheck → build → test → check:consumer-types（对齐 CI）
+make mount          # 真机挂载冒烟：build + pack → 安装 Chromium → pnpm test:mount
+make clean          # 清理 lib/、*.tgz、playwright-report/、test-results/
+```
+
+`pnpm check:consumer-types`：对外类型声明面守卫——以浏览器-only 消费者（无 `@types/node`、`skipLibCheck: false`）的视角对构建出的 `lib/types` 做类型检查，需先 `pnpm build`。
+
 **架构**：单 npm 包、host/client 双半结构——host（`src/index.ts`）：`/sidebar/api/*` JSON API、`/sidebar/file` 媒体路由、`/sidebar/html` 预览路由、`/sidebar/ws/terminal` WebSocket（fs / git / pty / 预览，全部会话级 + 信任围栏）；client（`src/client/index.tsx`）：portal 侧边栏 + 各视图 + 拦截；状态按会话持久化 localStorage。插件按 DSH 官方规范组织（无 default 导出、双 client bundle），运行期不依赖 npm / checkout（`@deepseek-ai/*` 由 web profile 提供）。
 
 ## 🔐 安全
@@ -504,7 +615,7 @@ Windows / Linux / macOS 三平台适配（macOS 日常验证；其余经单元
 
 - **代码改动走 PR**：`feat/*` / `fix/*` 分支开发 → `gh pr create`；纯文档改动可直接推 main
 - **收录生态插件**：给仓库打 `dsh-better-sidebar` topic + 向 [`src/client/plugins-tabs.ts`](./src/client/plugins-tabs.ts) / [`plugins-viewers.ts`](./src/client/plugins-viewers.ts) 提 PR
-- **提交前自检**：`pnpm typecheck && pnpm build && pnpm test`（CI 另有 npm 打包 → 真实挂载 → 无头渲染门禁 `pnpm test:mount`）
+- **提交前自检**：`pnpm typecheck && pnpm build && pnpm test`（或 `make check` 一键聚合；CI 另有 npm 打包 → 真实挂载 → 无头渲染门禁 `pnpm test:mount`，及聚合双挂载回归 `pnpm test:mount:aggregate`）
 - 仓库工作规范见 [`AGENTS.md`](./AGENTS.md)（含仓库硬约束与 CI 说明）
 
 ## ⭐ Star History

README_EN.md

@@ -9,9 +9,9 @@
   <a href="https://github.com/omdsh-dev/DSH-better-sidebar/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/omdsh-dev/DSH-better-sidebar" /></a>
   <a href="https://opensource.org/licenses/MIT"><img alt="License: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg" /></a>
   <a href="https://dshfind.com/en/plugins/omdsh-dev/DSH-better-sidebar?ref=badge"><img alt="dshfind" src="https://dshfind.com/api/badge/omdsh-dev/DSH-better-sidebar?lang=en" /></a><br /><br />
-  <a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="Supported DSH versions (v0.18.0-alpha.0 alpha track): 0.1.2-alpha.2" src="https://img.shields.io/badge/DSH-0.1.2--alpha.2_(alpha%20track)-4d6bfe" /></a>
+  <a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="Supported DSH versions (v0.18.1): 0.1.2-rc.1+" src="https://img.shields.io/badge/DSH-0.1.2--rc.1%2B-4d6bfe" /></a>
   <a href="https://github.com/topics/dsh-better-sidebar"><img alt="Plugin ecosystem: GitHub topic dsh-better-sidebar" src="https://img.shields.io/badge/plugin%20ecosystem-topic%20dsh--better--sidebar-4d6bfe" /></a><br /><br />
-  <img alt="File management" src="https://img.shields.io/badge/-File%20management-4d6bfe" /> <img alt="Edit &amp; preview" src="https://img.shields.io/badge/-Edit%20%26%20preview-4d6bfe" /> <img alt="Embedded browser" src="https://img.shields.io/badge/-Embedded%20browser-4d6bfe" /> <img alt="Real terminal" src="https://img.shields.io/badge/-Real%20terminal-4d6bfe" /> <img alt="Git panel" src="https://img.shields.io/badge/-Git%20panel-4d6bfe" /> <img alt="Background tasks" src="https://img.shields.io/badge/-Background%20tasks-4d6bfe" /> <img alt="Side Chat" src="https://img.shields.io/badge/-Side%20Chat-4d6bfe" /> <img alt="Plugin integration" src="https://img.shields.io/badge/-Plugin%20integration-4d6bfe" /><br /><br />
+  <img alt="File management" src="https://img.shields.io/badge/-File%20management-4d6bfe" /> <img alt="Edit &amp; preview" src="https://img.shields.io/badge/-Edit%20%26%20preview-4d6bfe" /> <img alt="Embedded browser" src="https://img.shields.io/badge/-Embedded%20browser-4d6bfe" /> <img alt="Real terminal" src="https://img.shields.io/badge/-Real%20terminal-4d6bfe" /> <img alt="Changes" src="https://img.shields.io/badge/-Changes-4d6bfe" /> <img alt="Background tasks" src="https://img.shields.io/badge/-Background%20tasks-4d6bfe" /> <img alt="Side Chat" src="https://img.shields.io/badge/-Side%20Chat-4d6bfe" /> <img alt="Plugin integration" src="https://img.shields.io/badge/-Plugin%20integration-4d6bfe" /><br /><br />
   <b>A dual workbench (right sidebar + bottom panel)</b> that opens its <code>ctx.betterSidebar</code> service to every plugin —<br />
   register new sidebar pages and file viewers via <code>registerTab</code> / <code>registerFileViewer</code>.
 </div>
@@ -44,27 +44,26 @@
 - **🌐 Embedded Browser**: multiple web tabs with back / forward / refresh; content runs in a sandboxed iframe; external links are routed by protocol by default — HTTP opens in the sidebar, HTTPS goes to the system browser (both adjustable in settings)
 - **💻 Real Terminal**: xterm.js + node-pty real shell, reconnect with transcript replay; optionally injects `terminal_*` tools for the model
 - **📂 Model-driven sidebar opens (opt-in)**: with the global setting on, the `sidebar_open` tool lets the model actively open files / folders (tree rooted there) / HTTP(S) pages in the sidebar
-- **🌿 Git Panel**: real diff + VSCode-style diff tabs, history, right-click to stage / commit / revert; under a workspace container it discovers child repositories and shows a **repository selector**, with linked-worktree change discovery
+- **🌿 Changes**: one tab, two lenses — **Git** (real diff / history / stage·commit·revert / worktree & child-repo selection) and **This Session** (live tracking of every file the model reads / writes / edits, grouped by file with kind filters); a unified diff renderer (mod pairing + intra-line character highlights + syntax coloring incl. mjs/cjs/mts/cts, CSS/SCSS/Less, HTML/XML/SVG/Vue, GraphQL, JSONC/JSON5 + context folding), a draggable bottom preview pane, and one-click expansion into a dedicated diff tab; `.md` ops (read / write / edit) offer a **reading-mode** toggle in the preview header — the shared MarkdownText renders GFM tables / task lists / strikethrough / footnotes / math, with local images rewritten through the /sidebar/file media route; documents with ```mermaid fences render through the editor's lazy mermaid renderer (click-to-zoom / pan diagrams); **secret redaction** — credential-shaped paths mask whole files and ordinary files mask secret-shaped values (api_key: / Bearer / sk- / AKIA / ghp_ / PEM …, field names kept), on by default with a one-click preview-pane toggle (persisted in localStorage), display-only — session data untouched. Known edge: an unquoted mermaid label containing a redacted secret breaks the diagram (falls back to source); workaround: quote the label. `.html` ops (read / write / edit) gain a **Render** toggle in the preview head — the editor's `/sidebar/html` route iframe, with relative assets resolving inside the route and segmented reads rendering the full document; always sandboxed (opaque origin + CSP header, no escape hatch). `.pdf` ops (read / write / edit) gain the same **Render** toggle — the editor's PDF preview reused verbatim (media-route bytes + explicit Blob, the browser's native viewer inline, with a download fallback)
 - **🧩 Background Tasks**: agent topology + background tasks (exit codes / live output / force-kill)
 - **💬 Side Chat (beta)**: Codex-style side threads — the child inherits the parent's FULL context (completed turns + the pending question + the in-progress turn's assistant output and tool activity, honestly frozen as "interrupted") and runs independently without entering the main conversation; threads support continuous follow-ups (auto-resumed after a DSH restart) and one-click "Save as new session" promotion to a top-level session
-- **🪟 Dual Workbench**: right sidebar + bottom panel; drag tabs to split / merge panes (cross-panel), mobile auto-merges into a full-width drawer
-- **🪟 Free Windows**: drag any tab onto the main conversation area to turn it into a movable / resizable / raiseable floating window (default 390×780); drag it back onto a pane to dock; persisted per session. `features` includes `'floatWindows'` and plugin tabs are supported identically
+- **🖥️ Native right sidebar + plugin bottom workbench**: the right column belongs to DSH 0.1.5's own sidebar — the plugin registers every tab type as a native tab (file opens go through `dsh-resource://file/**`, and the built-in Files page / file tree is taken over), keeping only its own bottom workbench (split panes / terminals / per-session persistence) whose toggle sits in the session header
 - **📌 Pinned Terminals**: right-click a terminal tab to "Pin to Workspace / Pin Globally" — pinned terminals survive session switches and surface inline in the TabBar as virtual tabs (click activates in-place, PTY connects directly to the home session's PTY via WS, no session jump needed); agent terminals exempted from reconcile removal
 - **🔁 Session Isolation**: layout / tabs / panels persisted per session, stale state auto-purged
 - **⚙️ Declarative Settings**: per-item toggles in the "Side Cards" settings section, secondary settings via the gear dialog
 - **⚡ On-demand Loading**: only ~325KB core at startup; heavy deps (terminal / editor / mermaid diagrams) load on demand ([design](docs/plans/2026-08-12-lazy-chunks-design.md))
 - **🌏 i18n**: UI text follows DSH's language (zh / en) with live switching; with the optional `@huanlin/dsh-plugin-better-locale` peer, 19 third-language overlays (ja / de / fr / …) are available
 
-> 🔌 **Core principle**: service-first — the 7 built-in tabs + 6 viewers register through the same `ctx.betterSidebar` API as third-party plugins, with fully equal capabilities; anything the ecosystem can provide better is delegated to ecosystem plugins (**28+ ecosystem plugins** already — see "🌐 Plugin Ecosystem" below). See "🔌 Service API" and the [external plugin guide](./docs/external-plugin-guide.md).
+> 🔌 **Core principle**: service-first — the 8 built-in tabs + 6 viewers register through the same `ctx.betterSidebar` API as third-party plugins, with fully equal capabilities; anything the ecosystem can provide better is delegated to ecosystem plugins (**28+ ecosystem plugins** already — see "🌐 Plugin Ecosystem" below). See "🔌 Service API" and the [external plugin guide](./docs/external-plugin-guide.md).
 
 ## 🚀 Installation
 
 **Prerequisites**: DSH installed (`dsh web` boots), Node.js ≥ 20, pnpm ≥ 10.
 
 **Supported DSH versions**:
-<a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="Supported DSH versions (v0.18.0-alpha.0 alpha track): 0.1.2-alpha.2" src="https://img.shields.io/badge/DSH-0.1.2--alpha.2_(alpha%20track)-4d6bfe" /></a>
+<a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="Supported DSH versions (v0.18.1): 0.1.2-rc.1+" src="https://img.shields.io/badge/DSH-0.1.2--rc.1%2B-4d6bfe" /></a>
 
-> 🧪 **Alpha track**: starting with `v0.18.0-alpha.0` the plugin targets DSH **0.1.2-alpha.x** (npm dist-tag `alpha`) and drops 0.1.0-rc.8 ~ 0.1.1-rc.2 — stable-DSH users should stay on `@latest` (v0.17.1); DSH 0.1.2-alpha.2 users install `dsh-better-sidebar@alpha`.
+> 📌 **Stable release**: starting with `v0.18.0` the plugin targets DSH **0.1.2-rc.1+** (npm dist-tag `latest`) and drops 0.1.0-rc.8 ~ 0.1.1-rc.2 — stable-DSH (≤ 0.1.1-rc.2) users should stay pinned to `dsh-better-sidebar@0.17.1` (`@latest` now points at v0.18.0); hosts still on 0.1.2-alpha.x should upgrade DSH first, or keep `dsh-better-sidebar@alpha` (v0.18.0-alpha.0).
 
 ```sh
 dsh plugin --profile web add dsh-better-sidebar@latest   # first run fails: pnpm 11 blocks node-pty build scripts (the dependency is still written)
@@ -85,6 +84,8 @@ Install the dsh-better-sidebar plugin (a sidebar workbench for DSH):
 If anything fails, check the troubleshooting table in the README at https://github.com/omdsh-dev/DSH-better-sidebar
 ```
 
+**Option 3: one-shot script** — from a clone of this repo, run `bash scripts/install.sh` (macOS / Linux / Windows Git Bash; native Windows uses `install.ps1`; `-h` for options) — it automates add → approve-builds → re-run.
+
 <details>
 <summary><b>Updating</b></summary>
 
@@ -162,14 +163,14 @@ Update: `git pull && pnpm install && pnpm build` → `node scripts/package-regis
 |---|---|
 | **🗂️ File Workbench: Explorer**<br/><sub>Two explorer modes: embedded in the file preview / standalone file tree. Lazy-loading directory tree, symlinks classified by target kind (directory links expand, dangling links flagged), global filename search, file/folder upload buttons plus drag-drop upload, context menu (open in new tab / open to the side / copy paths), and a hover `@file` button that references a file straight into the composer.</sub><br/><div align="center"><img width="420" alt="File explorer" src="https://github.com/user-attachments/assets/a410bfd2-a8ba-43e6-873e-22417756e94d" /></div> | **📝 Inline Preview: Markdown · Images · PDF**<br/><sub>The Markdown preview renders **Mermaid diagrams** (strict-mode safe rendering + a second sanitize pass; click a diagram for a zoom modal with wheel-zoom and drag-pan), **README-level inline HTML** (badge walls `<div align=center>`, `<details>` blocks nesting markdown, inline tags in table cells — DOMPurify-sanitized, `<script>` stripped, local media rewritten to the session media route) and a floating **table of contents** (appears with ≥3 headings, smooth-scroll jumping, auto-expanding folded blocks); images / PDFs display inline via the media route; the Office suite is covered by an ecosystem plugin.</sub><br/><div align="center"><img width="420" alt="Markdown + Mermaid preview" src="https://github.com/user-attachments/assets/fe0e5182-55bb-45cc-b98b-a2877c2bdd38" /></div> |
 | **🖥️ CodeMirror editor**<br/><div align="center"><img width="420" alt="CodeMirror editor" src="https://github.com/user-attachments/assets/b44b488e-568c-4ee0-b96c-e9c906598a77" /></div> | **🖼️ Inline image preview**<br/><div align="center"><img width="420" alt="Inline image preview" src="https://github.com/user-attachments/assets/f9a58c30-5b7a-48b5-9e22-37d7e071f593" /></div> |
-| **💻 Real Terminal**<br/><sub>xterm.js + node-pty real shell (not an emulator): transcript replay on reconnect, configurable shell / shellArgs (settings page or `cordis.patch.yml`), and optional `terminal_*` model tools so the agent can open terminals and run commands itself.</sub><br/><div align="center"><img width="420" alt="Real terminal" src="https://github.com/user-attachments/assets/0dad6ad3-ff3f-4b5a-86d2-f832ce65323e" /></div> | **🌿 Git Panel**<br/><sub>Stage / unstage / commit (`Ctrl+Enter`) / revert, plus a history list; clicking a changed file opens a **VSCode-style diff tab** (line-level red/green).</sub><br/><div align="center"><img width="420" alt="Git panel" src="https://github.com/user-attachments/assets/e7fc1220-305f-4bca-8583-e77ab4f4fa78" /></div> |
-| **🌐 Embedded Browser**<br/><sub>Multiple web tabs with back / forward / reload / address bar; content runs in an **opaque-origin sandboxed iframe** (live sandbox status in the UI, per-page temporary unlock available); external-link clicks in the chat can be taken over into the sidebar (protocol-based routing, configurable).</sub><br/><div align="center"><img width="420" alt="Embedded browser" src="https://github.com/user-attachments/assets/9bc6b65a-64fc-4942-a685-76e391e55606" /></div> | **🧩 Tasks: Agent Topology + Background Jobs**<br/><sub>Live subagent-tree topology (run states, batched live previews) plus the background-jobs list (exit codes / live output / force-kill); new subagents / jobs can auto-expand the sidebar (configurable).</sub><br/><div align="center"><img width="420" alt="Tasks: subagent topology" src="https://github.com/user-attachments/assets/dcd8ed2f-59fa-405b-937b-2d250f5034dd" /></div> |
-| **💬 Side Chat (beta)**<br/><sub>Codex-style side threads: **one independent tab per conversation**; the thread inherits the parent's full context (including the in-progress turn, honestly frozen as "interrupted") and runs independently without polluting the main session; follow-ups survive restarts; one click promotes the thread to a top-level session.</sub><br/><div align="center"><img width="420" alt="Side Chat (beta)" src="https://github.com/user-attachments/assets/3a338c36-f5de-4000-95f3-4b1cd04f60fc" /></div> | **🪟 Dual Workbench: Sidebar + Bottom Panel + Split Panes**<br/><sub>The right sidebar and the bottom panel can stay open together; drag a tab to a pane edge to **split**, to the middle to **merge** (works across panels); panel width/height drag from the left/top edge; on mobile everything merges into a full-width drawer; drag a tab onto the main conversation area to turn it into a **free window** (float / resize / raise, drag back onto a pane to dock).</sub><br/><div align="center"><img width="420" alt="Dual workbench (right sidebar + bottom panel)" src="https://github.com/user-attachments/assets/dfdb875e-a1a8-4d4b-8340-353736b1708f" /></div> |
+| **💻 Real Terminal**<br/><sub>xterm.js + node-pty real shell (not an emulator): transcript replay on reconnect, configurable shell / shellArgs (settings page or `cordis.patch.yml`), and optional `terminal_*` model tools so the agent can open terminals and run commands itself.</sub><br/><div align="center"><img width="420" alt="Real terminal" src="https://github.com/user-attachments/assets/0dad6ad3-ff3f-4b5a-86d2-f832ce65323e" /></div> | **🌿 Changes: Git lens + This-Session lens**<br/><sub>Two lenses on "what changed?": the **Git lens** keeps the full source-control surface (stage / unstage / commit (`Ctrl+Enter`) / revert, history, worktree and child-repo selectors); the **This Session** lens folds the session event log live, recording every file the model read / wrote / edited (grouped by file, kind-filtered, op-count badge). Clicking any change previews it in the **draggable bottom pane** with the unified diff — del red / add green / mod-blue pairing + intra-line character highlights + syntax coloring + context folding — or expands into a VSCode-style dedicated diff tab (same rendering stack).</sub><br/><div align="center"><img width="420" alt="Changes" src="https://github.com/user-attachments/assets/e7fc1220-305f-4bca-8583-e77ab4f4fa78" /></div> |
+| **🌐 Embedded Browser**<br/><sub>Multiple web tabs with back / forward / reload / address bar; content runs in an **opaque-origin sandboxed iframe** (live sandbox status in the UI, per-page temporary unlock available); external-link clicks in the chat can be taken over into the sidebar (protocol-based routing, configurable).</sub><br/><div align="center"><img width="420" alt="Embedded browser" src="https://github.com/user-attachments/assets/9bc6b65a-64fc-4942-a685-76e391e55606" /></div> | **🧩 Tasks: Agent Topology + Background Jobs**<br/><sub>Live subagent-tree topology (run states, batched live previews) plus the background-jobs list (exit codes / live output / force-kill); new subagents / jobs can auto-activate the Tasks page, expanding the sidebar on wide viewports without forcing narrow full-screen drawers open (configurable).</sub><br/><div align="center"><img width="420" alt="Tasks: subagent topology" src="https://github.com/user-attachments/assets/dcd8ed2f-59fa-405b-937b-2d250f5034dd" /></div> |
+| **💬 Side Chat (beta)**<br/><sub>Codex-style side threads: **one independent tab per conversation**; the thread inherits the parent's full context (including the in-progress turn, honestly frozen as "interrupted") and runs independently without polluting the main session; follow-ups survive restarts; one click promotes the thread to a top-level session.</sub><br/><div align="center"><img width="420" alt="Side Chat (beta)" src="https://github.com/user-attachments/assets/3a338c36-f5de-4000-95f3-4b1cd04f60fc" /></div> | **🖥️ DSH's native right sidebar + plugin bottom workbench**<br/><sub>The right column is DSH's own sidebar: the plugin registers every tab type as a native tab (including the built-in Files page and file previews), so clicking a file in the chat lands there directly; the plugin's own bottom panel can stay open alongside it — drag a tab to a pane edge to **split**, to the middle to **merge**, drag the top edge to resize; the toggle lives in the session header.</sub><br/><div align="center"><img width="420" alt="Dual workbench (right sidebar + bottom panel)" src="https://github.com/user-attachments/assets/dfdb875e-a1a8-4d4b-8340-353736b1708f" /></div> |
 | **⚙️ Declarative Settings**<br/><sub>The "Side card" section in DSH settings: one small card per tab / viewer with an independent toggle (highlighted enabled state + brand switch); secondary settings open from the "Feature settings" strip at the card bottom (switch / text / number / select rows); plugin-owned settings persist under `pluginSettings`.</sub><br/><div align="center"><img width="420" alt="Declarative settings: side cards" src="https://github.com/user-attachments/assets/0800ca64-621e-48da-b7df-aecfddc3ec29" /></div> | **📱 Mobile**<br/><sub>On narrow screens (<768px) the panels become a full-width drawer: bottom-panel tabs merge into the sidebar once, with touch-friendly dragging.</sub><br/><div align="center"><img width="360" alt="Mobile full-width drawer" src="https://github.com/user-attachments/assets/a82ba78a-f4cf-4d85-80e8-050a05beb144" /></div> |
 
 ## 🌐 Plugin Ecosystem
 
-The `ctx.betterSidebar` service opens two extension points to every plugin: **`registerTab` (sidebar pages)** and **`registerFileViewer` (file previewers)**. The 7 built-in tabs + 6 viewers register through the exact same API — fully equal capabilities.
+The `ctx.betterSidebar` service opens two extension points to every plugin: **`registerTab` (sidebar pages)** and **`registerFileViewer` (file previewers)**. The 8 built-in tabs + 6 viewers register through the exact same API — fully equal capabilities.
 
 ```ts
 import type {} from 'dsh-better-sidebar'  // triggers the ctx.betterSidebar type merge
@@ -263,7 +264,111 @@ The GitHub topic [`dsh-better-sidebar`](https://github.com/topics/dsh-better-sid
   <a href="https://github.com/user-attachments/assets/946f7028-4967-461e-a750-d1b5056b62d0"><img width="33%" alt="Service API base screenshot" src="https://github.com/user-attachments/assets/946f7028-4967-461e-a750-d1b5056b62d0" /></a>
 </div>
 
-**Supported DSH versions**: <a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="Supported DSH versions (v0.18.0-alpha.0 alpha track): 0.1.2-alpha.2" src="https://img.shields.io/badge/DSH-0.1.2--alpha.2_(alpha%20track)-4d6bfe" /></a> · full release history on the [Releases](https://github.com/omdsh-dev/DSH-better-sidebar/releases) page
+**Supported DSH versions**: <a href="https://www.npmjs.com/package/@deepseek-ai/dsh?activeTab=versions"><img alt="Supported DSH versions (v0.18.1): 0.1.2-rc.1+" src="https://img.shields.io/badge/DSH-0.1.2--rc.1%2B-4d6bfe" /></a> · full release history on the [Releases](https://github.com/omdsh-dev/DSH-better-sidebar/releases) page
+
+### v0.19.0-alpha.1
+
+> 🧪 **alpha channel** (npm dist-tag `alpha`, install `dsh-better-sidebar@alpha`): supports **DSH 0.1.5-alpha.2+** only (peer floor `^0.1.5-alpha.2`, CI pins `@deepseek-ai/dsh@0.1.5-alpha.2`). Stay on **v0.19.0-alpha.0** for 0.1.5-alpha.1; the 0.1.2-rc.1 stable line keeps using **v0.18.1** (npm `latest`).
+
+**✨ New**
+
+- 🪟 **Every tab body now fills its pane** (#609): the native sidebar's tab-body host is a block scroller with a definite height, not a flex container, and the plugin's tab roots declared only `flex: 1` — so they collapsed to content height and the side-chat composer sat right after the transcript instead of at the pane bottom (a long transcript pushed it out of view). The native adapter now wraps every tab body in a `height: 100%` column flex host, restoring the same fill semantics the bottom workbench has for all plugin tabs, third-party `registerTab` descriptors included.
+
+**🐛 Fixes**
+
+- 🧭 **File address grammar follows DSH 0.1.5-alpha.2**: `fileAddressFor` always produces a session-scoped address and absolute paths keep their leading `/`; `parseFileAddress` is prefix-based and ignores `?`/`#` suffixes.
+- 🪟 **Center-column anchor follows alpha.2's global panels**: the `conversation` slot became `main.conversation` under the root-scoped keyed `main` slot, so the locator now resolves the new key and skips `display: contents` slot hosts (alpha.1's old key still works).
+
+**🧰 CI & internals**
+
+- Baseline moved to DSH 0.1.5-alpha.2 (#609): peer floor, 22 devDependency pins, the CI mount lane, and `dsh.plugin.json` engines all follow; `pnpm peers check` is clean (hoisted the `dsh-session-persistence` transitive peer per §3-9).
+- **`TabDescriptor.description` removed**: alpha.2's native guide entries no longer render a second line (they are icon + title capsules), so the field and the six `guideDesc*` keys (20 dictionaries) are gone; a new pane's default page is now selected from the registry (exactly one guide entry opens that page directly).
+
+### v0.19.0-alpha.0
+
+> 🧪 **alpha channel** (npm dist-tag `alpha`, install `dsh-better-sidebar@alpha`): supports **DSH 0.1.5-alpha.1+** only (peer floor `^0.1.5-alpha.1`, CI pins `@deepseek-ai/dsh@0.1.5-alpha.1`). The 0.1.2-rc.1 stable line keeps using **v0.18.1** (npm `latest`).
+
+**✨ New**
+
+- 🖥️ **DSH's native right sidebar** (#604): the right column is now DSH's own sidebar — all seven plugin tab types register as native tab types with native tab bodies; every file open from the chat goes through `ctx.sidebarRight.openResource(dsh-resource://file/…)`; the `editor` type claims file resources at `extension` priority (outranking the built-in text preview) and takes over the built-in Files page kind (restored on unregister); cross-session opens queue until the target session is on screen.
+- 🧩 **Own right panel and free windows retired** (#605): with the right column handed back to DSH, the plugin keeps only its bottom workbench (single split tree, per-session persistence) and registers its toggle into DSH's session-header utilities slot; the float API (`floats` / `floatTab` / `dockFloat` / `raiseFloat` / the "Move to Free Window" menu entry), the `'floatWindows'` feature string, and the `openByDefault` / `defaultWidthPercent` / `changesDiffFloat` settings are gone (a persisted `floats` field is ignored, so old documents still load).
+- 🔗 **DSH 0.1.5 host contracts** (#603): the `assistant/chunk` event is gone — live deltas now fold from `agent/assistant-stream` frames (the side chat transcript's `live` field); `sessionPersistence.inspect` is gone — cold reads go through `open(id,'read')`; session headers use `SESSION_FORMAT_VERSION`.
+
+**🐛 Fixes**
+
+- Eight session-event read sites follow the 0.1.5 contracts (side-chat transcript, `jobs.output` replay, fork inheritance); custom seeds now carry the fork marker pair, so they no longer inherit the parent's unclaimed inbox input.
+
+**🧰 CI & internals**
+
+- The real-host mount smoke lane pins 0.1.5-alpha.1 and sweeps the native sidebar's guide page to open every plugin tab type; typecheck / lint / unit tests / mount lane all green.
+
+### v0.18.1
+
+> 📌 **Stable release** (npm `latest`): the DSH baseline is unchanged (**0.1.2-rc.1+**, peer floor `^0.1.2-rc.1`) — this is the incremental cut after v0.18.0: richer op previews in the changes panel, a writable file tree, and five fixes.
+
+**✨ Features**
+
+- 📄 **Op-preview upgrades in the changes panel** (#499): markdown reading mode with mermaid fences, plus inline `.html` and `.pdf` render previews; diff syntax highlighting extended to mjs/cjs/mts/cts, CSS/SCSS/Less, HTML/XML/SVG/Vue, GraphQL, JSONC/JSON5; new **secret redaction** layer (on by default for previews, toggleable in the pane header)
+- 🗂️ **File-tree rename / delete** (#550): inline rename plus confirmed delete, slimmer context menus and viewport-clamped submenus
+- 🧩 **Plugin catalog names and shell preset text localized** (#535): they now follow the host language
+
+**🐛 Fixes**
+
+- 🔀 **Git diff gap folds really expand** (#576, fixes #577): the fold row promised "n lines… click to expand" but did nothing (`-U3` leaves gap segments without row text); the hidden rows now load on demand through `git.show`, sliced from both sides' contents, with loading / failure states and request deduplication — plus a fix to that route's `rev:path` addressing (it always returned empty before)
+- 💬 **Side-chat seeds no longer inherit the parent's unclaimed inbox messages** (#562): the seed carries the fork markers, so the "side chat sends earlier User messages first on long contexts" ghost message is gone
+- 🖼️ **Local images in the split markdown renderer** (#569): rewritten to reachable URLs instead of 404ing
+
+**🧰 CI and internals**
+
+- ESLint flat config wired into CI and the Makefile (#536), Makefile command surface (#526), hardened e2e scripts (#527), shared component-test utilities (#524)
+- Refactors: Sidebar.tsx split by concern (#542), four polling idioms converged onto `use-polling` (#541), rc.7 `__DSH_MODULES__` fallback removed (#540), One Dark/Light syntax palettes single-sourced (#534), duplicated implementations converged and dead code removed (#525)
+
+### v0.18.0
+
+> 📌 **Stable release** (npm `latest`): this release targets **DSH 0.1.2-rc.1+ only** (peer floor `^0.1.2-rc.1`); 0.1.0-rc.8 ~ 0.1.1-rc.2 are not supported — stable-DSH users should stay pinned to `dsh-better-sidebar@0.17.1`, hosts on 0.1.2-alpha.x keep `dsh-better-sidebar@alpha` (v0.18.0-alpha.0).
+
+All changes since v0.17.1 (the two intermediate version numbers v0.18.1-alpha.0 / v0.19.0-alpha.0 were never published; their content is folded into this release):
+
+**🔗 Host track graduation**
+
+- **Onto the DSH 0.1.2 line and graduating to stable**: v0.18.0-alpha.0 dropped the 0.1.1-rc.x compatibility layer and fixed blank Side Chat transcripts on alpha.1+ (#472); the baseline then climbed through alpha.3 (#497) and alpha.5 (#516, `Session.events` → `snapshotEvents()`); the chat file-open funnel moved to `remote.session.openWorkspacePath` (#494) and the "Show in folder" reveal scroll was scoped to the tree body (#453). This release pins the baseline to **DSH 0.1.2-rc.1** (zero source delta vs alpha.5 — a pure version bump; `dsh-client-locale` resumed publishing, everything aligned to rc.1; real-host mount smoke 14/14 in CI)
+
+**✨ Features**
+
+- 🌿 **Unified "Changes" tab** (#475): one tab, two lenses — Git (real diff / history / stage·commit·revert / worktree & child-repo selection) and This Session (live tracking of every file the model reads / writes / edits); a unified diff renderer (mod pairing + intra-line character highlights + syntax coloring + context folding), a draggable bottom preview pane, and one-click expansion into a dedicated diff tab
+- 💬 **Side Chat rendering upgrade** (#486): main-conversation-grade Blocks structure, per-turn usage tails, reconnect banner
+- ⚙️ **Workspace path fence toggle** (#458): a new `workspaceFence` declarative settings key with a one-click off affordance and guidance on 403 error surfaces
+
+**⚡ Performance**
+
+- 🚀 **Core bundle -45%** (#489): 19 non-zh/en dictionary chunks lazy-loaded, render stabilization (transcript row reuse / tree Sets / batched drags), startup & polling cost cuts (single settings fetch, one git process per tick); a new perf measurement lane; also fixes the bottom-pane drag leaking panel width into the host layout and jumping the native left sidebar
+- 📉 Fewer repeated center-column DOM queries (#456)
+
+**🐛 Fixes (selection)**
+
+- ✏️ Editor / Markdown: SSH remote editor links open on the client (#522), reading position kept across preview/edit switches (#467), YAML frontmatter hidden in preview (#394), TOC dismiss-on-outside-click + popover z-index (#461), file basename kept in @-reference links (#417)
+- 💻 Terminal / platform: Windows custom shell executables resolve (#503), transient resize failures contained (#428), monospace fallback for unresolvable fonts (#366), Linux absolute paths in WSL workspaces (#455), Windows Explorer reveal selection preserved (#508)
+- 🗂️ Layout / state / file tree / chat: desktop shell layout coexists with the side card (#398), no forced mobile drawer on auto-activation (#373), restored free-window id conflicts (#385), tree auto-refresh on window focus (#469), reference affordance pinned to row tail (#509), selection-popup dismissal + caret-anchored draft insert (#427), collapsed toggle cluster aligned (#361), old-engine scroll-jump compat (#448), worktree listing on older Git (#454)
+
+**🧰 CI & internals**
+
+- Windows CI lane (#520), Makefile command surface (#526), e2e script hardening + aggregate double-mount regression (#527), shared component test utils deduplicating boilerplate (#524), duplicate-implementation convergence + dead code removal (#525)
+
+**🌐 Ecosystem**
+
+- 10+ new curated plugins: dsh-better-sidebar-icons (#441), dsh-sidenote (#451, formerly dsh-sidechat #470), dsh-github-workbench (#410), dsh-bilingual-reader (#379), dsh-server-deck (#413), dsh-md-export (#405), dsh-code-nav (#404), dsh-suhuang-scroll (#392), dsh-better-overleaf (#370), and more (each with 18+ language i18n coverage)
+
+### v0.19.0-alpha.0 (0.1.2-alpha.5 adaptation, unpublished, folded into v0.18.0)
+
+> 🧪 **Alpha track**: this release targeted **DSH 0.1.2-alpha.x only** (peer floor `^0.1.2-alpha.5`, npm dist-tag `alpha`). This number was never published separately — its content shipped in the **v0.18.0** stable release, and the same number was later reused for the 0.1.5 adaptation line (see above).
+
+- 🔗 **Adapted to DSH 0.1.2-alpha.5 (published to npm, `alpha` dist-tag)**: the CI mount gate's pin, the `dsh.plugin.json` engines floor, and the `@deepseek-ai/*` peer / devDependencies baseline moved up to 0.1.2-alpha.5 (verified by a real-host mount smoke 14/14). `dsh-client-locale` has no alpha.5 upstream (newest is 0.1.2-alpha.3), so its peer floor / devDep pin trail the baseline and already accept the alpha.5 runtime (`pnpm peers check` reports zero mismatches — no new transitive peers to hoist). The code adapts to alpha.4's compatibility-flagged change — the `Session.events` property was removed, migrated to the on-demand `snapshotEvents()` API (8 sites: sidechat transcript live reads, fork inheritance, `jobs.output` replay, subagent activity), and the `seedLength` meta field the host dropped was removed from thread creation; alpha.4's remaining changes (bidirectional `send_message`, custom-model discovery reusing Profile headers, `SessionSeq`/`SessionLogOffset` strong typing) and alpha.5's upgrade-startup fix were verified not to touch any other plugin surface.
+
+### v0.18.1-alpha.0
+
+> 🧪 **Alpha track**: this release targets **DSH 0.1.2-alpha.x only** (peer floor `^0.1.2-alpha.3`, npm dist-tag `alpha`, install `dsh-better-sidebar@alpha`). This version number was never published separately; its content is folded into the **v0.18.0** stable release.
+
+- 🔗 **Adapted to DSH 0.1.2-alpha.3 (published to npm, `alpha` dist-tag)**: the CI mount gate's pin, the `dsh.plugin.json` engines floor, and the `@deepseek-ai/*` peer / devDependencies baseline moved up to 0.1.2-alpha.3 (verified by a real-host mount smoke 14/14). All 117 commits between alpha.2 and alpha.3 were audited point by point: every host contract this plugin relies on (token auth, slash RPC, `MarkdownText` labels, the event-stream and persistence APIs behind `sidechat.events`, `SettingsNamespaceInput`, `SUBAGENT_DESCRIPTOR_VERSION` (still 3), `dsh-client-store`, the profile loader, the node-pty pin) is unchanged, so no code adaptation was needed; alpha.3's breaking changes (the required `BeginSubmissionInput.mode`, the renamed `attachment-invalid` subagent error, the removed SQLite persistence backend, the identity-gated projection change feed) were all verified not to touch this plugin.
 
 ### v0.18.0-alpha.0
 
@@ -359,7 +464,7 @@ All changes since v0.15.0:
 
 - 🖥️ **Terminal pty stays alive across conversation switches** ([#323](https://github.com/omdsh-dev/DSH-better-sidebar/pull/323)): switching sessions is no longer treated as a transient drop — the client sends a `park` control frame on unmount and the host skips the 30s reconnect-grace countdown; switching back (`open()` cancels parked) or explicitly closing the tab resumes the normal lifecycle; agent terminals keep their indefinite lifetime
 - 📂 **File-tree upload overlay no longer intercepts Tab drags** ([#317](https://github.com/omdsh-dev/DSH-better-sidebar/pull/317)): dragging tabs (reorder / cross-pane split) across the explorer no longer shows the upload overlay or swallows the event — gated on `dataTransfer.types` containing `Files` (consistent with the panel-host shield), so tabs land normally; OS file drags behave as before
-- 💬 **Subagent auto-open debounced** ([#314](https://github.com/omdsh-dev/DSH-better-sidebar/pull/314)): Side Chat thread creation no longer pops the task page — the 0→N trigger rearms for 500ms and re-evaluates the original baseline against the live snapshot, by which time the title filter recognizes the thread; genuine subagents still auto-open
+- 💬 **Subagent auto-open debounced** ([#314](https://github.com/omdsh-dev/DSH-better-sidebar/pull/314)): Side Chat thread creation no longer pops the task page — the 0→N trigger rearms for 500ms and re-evaluates the original baseline against the live snapshot, by which time the title filter recognizes the thread; genuine subagents still auto-activate the Tasks page (wide viewports expand the sidebar, while narrow viewports prepare the tab without forcing the drawer open)
 
 ### v0.15.0
 
@@ -455,9 +560,9 @@ All changes since v0.14.0:
 
 ## 🔌 Service API
 
-Since v0.4.0 the plugin exposes the `ctx.betterSidebar` service — other plugins can register sidebar pages and file viewers (the 7 built-in tabs + 6 viewers register through the same service). v0.12.1 completed the base capabilities (complete type exports, capability detection, state subscription, tab badges, lifecycle callbacks, targeted open, plugin-owned settings, etc.).
+Since v0.4.0 the plugin exposes the `ctx.betterSidebar` service — other plugins can register sidebar pages and file viewers (the 8 built-in tabs + 6 viewers register through the same service). v0.12.1 completed the base capabilities (complete type exports, capability detection, state subscription, tab badges, lifecycle callbacks, targeted open, plugin-owned settings, etc.).
 
-Full integration docs (complete fields, matching algorithm, HMR pitfalls, declarative settings, version detection, float windows and the skinning contract): **[`docs/external-plugin-guide.md`](./docs/external-plugin-guide.md)**; repository rules (hard constraints / CI / release) live in [`AGENTS.md`](./AGENTS.md).
+Full integration docs (complete fields, matching algorithm, HMR pitfalls, declarative settings, version detection, the native-sidebar surface and the skinning contract): **[`docs/external-plugin-guide.md`](./docs/external-plugin-guide.md)**; repository rules (hard constraints / CI / release) live in [`AGENTS.md`](./AGENTS.md).
 
 ### ➕ Add Plugins (recommended plugin catalog)
 
@@ -468,13 +573,24 @@ The dashed cards at the end of the "Sidebar content" / "File viewers" grids in t
 ## 🛠️ Development & Build
 
 ```sh
-pnpm install      # @deepseek-ai/* devDependencies resolve (baseline 0.1.2-alpha.2, alpha dist-tag) — no token needed
+pnpm install      # @deepseek-ai/* devDependencies resolve (baseline 0.1.2-rc.1, next dist-tag) — no token needed
 pnpm typecheck    # tsc --noEmit
+pnpm lint         # eslint . (flat config: js + typescript-eslint + react-hooks recommended)
 pnpm build        # → lib/index.js + lib/invariant.js + lib/client.js + lib/client-registry.js + lib/types
 pnpm test         # vitest (includes manifest consistency guard; build first)
 pnpm watch        # tsdown --watch
 ```
 
+**Make thin wrappers** (`make help` lists every target; package.json stays the single source of truth):
+
+```sh
+make check          # aggregate gate: typecheck → build → test → check:consumer-types (mirrors CI)
+make mount          # real-mount smoke: build + pack → install Chromium → pnpm test:mount
+make clean          # remove lib/, *.tgz, playwright-report/, test-results/
+```
+
+`pnpm check:consumer-types`: the consumer-facing declaration-surface guard — type-checks the built `lib/types` from a browser-only consumer's perspective (no `@types/node`, `skipLibCheck: false`); run `pnpm build` first.
+
 **Architecture**: a single npm package with host/client halves — host (`src/index.ts`): `/sidebar/api/*` JSON API, `/sidebar/file` media route, `/sidebar/html` preview route, `/sidebar/ws/terminal` WebSocket (fs / git / pty / preview, all session-scoped with a trust fence); client (`src/client/index.tsx`): portal sidebar + views + interception; state persisted per session in localStorage. Organized per DSH official conventions (no default export, dual client bundles); no dependency on npm / checkout at runtime (`@deepseek-ai/*` provided by the web profile).
 
 ## 🔐 Security
@@ -513,7 +629,7 @@ WeChat / QQ group QR codes will live here. After uploading the QR images (drag t
 
 - **Code changes go through PRs**: develop on a `feat/*` / `fix/*` branch, then `gh pr create`; docs-only changes may be pushed to main directly
 - **Curate an ecosystem plugin**: tag your repo with `dsh-better-sidebar` + PR a `PluginEntry` into [`src/client/plugins-tabs.ts`](./src/client/plugins-tabs.ts) / [`plugins-viewers.ts`](./src/client/plugins-viewers.ts)
-- **Before submitting**: `pnpm typecheck && pnpm build && pnpm test` (CI additionally gates on npm-pack → real-mount → headless-render via `pnpm test:mount`)
+- **Before submitting**: `pnpm typecheck && pnpm build && pnpm test` (or `make check` for the one-shot aggregate; CI additionally gates on npm-pack → real-mount → headless-render via `pnpm test:mount`, plus the aggregate double-mount regression `pnpm test:mount:aggregate`)
 - See [`AGENTS.md`](./AGENTS.md) for the repository rules (hard constraints, CI lanes, release flow)
 
 ## ⭐ Star History

docs/external-plugin-guide.md

@@ -2,12 +2,38 @@
 
 > 面向 **消费插件开发者**：如何让你的插件向 better-sidebar 注册新的侧边栏页面（tab）和文件类型预览器。
 >
-> 适用版本：**v0.4.0+**（`ctx.betterSidebar` 服务）；声明式设置 **v0.4.1+**；text/number 设置行 **v0.11.0+**；badge/生命周期/定向打开/插件设置/版本探测 **v0.12.0+**；select 设置行（`settingSelect`）与外链认领（`urlTarget`）**v0.13.0+**；统一 `@deepseek-ai/cordis` 类型基底 **v0.15.2+**；自由窗口（`floatWindows`）**v0.16.0+**；终端固定（pin）**v0.17.0+**。当前版本 **v0.18.0-alpha.0**（alpha 通道，仅支持 DSH 0.1.2-alpha.x；stable 线为 v0.17.1）。
-> 权威代码：`src/client/service.ts`（服务实现）、`src/client/builtins/`（内置 7 tab + 6 viewer 参考实现）、`lib/types/client/service.d.ts`（类型声明）。
+> 适用版本：**v0.4.0+**（`ctx.betterSidebar` 服务）；声明式设置 **v0.4.1+**；text/number 设置行 **v0.11.0+**；badge/生命周期/定向打开/插件设置/版本探测 **v0.12.0+**；select 设置行（`settingSelect`）与外链认领（`urlTarget`）**v0.13.0+**；统一 `@deepseek-ai/cordis` 类型基底 **v0.15.2+**；终端固定（pin）**v0.17.0+**。当前版本 **v0.19.0-alpha.1**（alpha 通道，仅支持 DSH **0.1.5-alpha.2+**；**0.1.5-alpha.1 不再支持**——alpha.1 用户请用 v0.19.0-alpha.0，那是它的最后一版；0.1.2-rc.1 稳定线请用 v0.18.x）。**v0.19.0 移除了自绘右侧面板与自由窗口**（见 §0、§11）。
+> 权威代码：`src/client/service.ts`（服务实现）、`src/client/builtins/`（内置 8 tab + 6 viewer 参考实现）、`lib/types/client/service.d.ts`（类型声明）。
 > 仓库开发规则（硬约束 / CI / 发版）见 [AGENTS.md](../AGENTS.md)。
 
 ---
 
+## 0. 承载面：DSH 原生右侧栏 + 插件底部工作台（v0.19.0-alpha.0 起）
+
+从 v0.19.0-alpha.0 起，**右列完全属于 DSH**：你的 tab 渲染在 **DSH 自己的右侧栏**里（`ctx.sidebarRight` / `ctx.sidebarRightTabs`），插件把每个 `TabDescriptor` 注册成原生 tab 类型（`kind = descriptor.id`）+ 一个原生 tab 体。插件自己只保留**底部工作台**（分栏树、终端、会话内持久化）。对你的接入代码**没有影响**——仍然只调用 `ctx.betterSidebar`：
+
+- `registerTab` / `registerFileViewer` 签名不变；
+- `openTab` / `openFile` 默认落到原生右侧栏；新增可选 `OpenTabSeed.target`（`'right'` 默认 / `'bottom'` 落插件的底部工作台）；
+- `updateTab` / `closeTab` / `activateTab` 认识原生 tab id（插件为每个原生 tab 维护一条合成 `SidebarTab` 记录，`tab.meta` / `tab.path` 的写入照旧生效）。
+
+行为差异（写在这里以免踩坑）：
+
+| 事项 | 说明 |
+|---|---|
+| 生命周期回调 | 原生面只有「一次打开」，不区分新建/聚焦，因此只触发 `onOpen`（`onActivate` 仅在插件自己的底部工作台里触发） |
+| 去重 | 原生按 `(kind, 地址)` 去重：有 `createTab` 的类型每次新开一个 tab（terminal / browser / sidechat / diff），其余聚焦已有 tab；`dedupeKey` 的自定义语义不参与原生面 |
+| 布局持久化 | 原生栏的布局**只在内存**（刷新后回到折叠默认），插件自己的底部工作台仍然持久化 |
+| 跨会话打开 | 目标会话的右侧栏 store 未挂载时，打开会排队到该会话上屏后重放 |
+| 内置类型接管 | 插件的 `editor` 类型以 `extension` 优先级认领 `dsh-resource://file/**`（压过内置 `ui-sidebar-documentpreview` 的 `text` 预览——即 `fallback` 带），并接管内置 `files` 页面 kind（`openTab('files')` 打开插件的文件树）；插件卸载/禁用时内置实现自动复位 |
+| 终端上限 | 终端 tab 的数量上限只统计插件自己底部工作台里的终端；原生栏里的终端不计入 |
+| 底部工作台的开合 | 落到底部工作台的打开一律展开它（新建与聚焦都算），因此 `openTab` 的落点永远可见；开合按钮注册在 DSH 会话头的 utilities 槽（`conversation.session.header.utilities`），不在插件自己的宿主里 |
+| 新建标签页列表 | 每个 tab 类型在原生 guide 里占一行：标题取 `title` + 图标取 `icon`（**无第二行说明**——alpha.2 起原生指南把条目渲染成「图标+标题」胶囊，`description` 已从宿主契约删除，插件随之移除 `TabDescriptor.description` 与 6 个 `guideDesc*` 词条）；`hidden: true` 的类型不占行。插件的 `editor` 类型不再单独占行（它认领的文件资源由 `files` 接管页承载同一视图） |
+| 新建面板的种子（alpha.2） | 在新会话打开原生新面板时，宿主从已注册的 guide 条目里播种：恰好 1 个条目 → 直接打开那一页；0 或 ≥2 个条目 → 打开指南。`revealIfOpened` 打开的「页面」在**同一 pane 内**强制去重（已在该 pane 就不再新建）；由已有 tab 地址驱动的打开不受该去重影响 |
+| alpha.2 全局面板（不接入） | 插件**不采用** alpha.2 引入的全局主面板模型——根级 keyed `main` 槽（预留 key `conversation`，由 ui-conversation 注册为 `main.conversation`）、根级 `sidebar.panellist` 列表槽（`SidebarPanelMetadata` / `SidebarPanelIconOwnerProps`）、`ctx.layout.selectPanel(MainPanelId|null)` / `beginNavigation()` / `dispose()`、全局标准 prop `usePanelInfo`，以及改根级并新增会话级 `rightbar.session` 子槽的 `rightbar`——这些只作兼容保留，不向其迁移 |
+| 已移除 | 插件自绘右侧面板（含宽度拖拽 / 新会话默认宽度）与**自由窗口**（`features` 里的 `'floatWindows'` 已删除，v0.18.x 及更早版本的消费者请勿再 gate 该能力）；`openByDefault` / `defaultWidthPercent` / `changesDiffFloat` 三个设置项同步删除（旧文档里的键会被忽略） |
+
+---
+
 ## 1. 总览：你能扩展什么
 
 better-sidebar 从 v0.4.0 起把自己改造成一个**注册表服务**：
@@ -15,7 +41,7 @@ better-sidebar 从 v0.4.0 起把自己改造成一个**注册表服务**：
 - **新页面（tab）**：注册一种新的侧边栏 tab 类型，出现在侧边栏 `+` 菜单里，用户点击后在自己的分栏里打开你的 React 页面；
 - **文件预览器（file viewer）**：注册一种文件类型预览器，让用户在侧边栏打开文件时走你的渲染组件（覆盖或补充内置的 image/pdf/code 等）。
 
-内置的 7 个 tab（editor / git / subagent / sidechat / terminal / browser / diff）和 6 个 viewer（image / pdf / markdown / html / code / binary-download）**自己也是通过同一套 API 注册的**（吃自己的狗粮），所以外部插件的能力与内置功能完全对等。
+内置的 7 个 tab（editor / git——「文件变动」统一 tab（Git 视角 + 本轮文件视角）/ subagent / sidechat / terminal / browser / diff）和 6 个 viewer（image / pdf / markdown / html / code / binary-download）**自己也是通过同一套 API 注册的**（吃自己的狗粮），所以外部插件的能力与内置功能完全对等。
 
 关键机制一句话：better-sidebar 的 client half 在 `apply()` 开头执行 `ctx.provide('betterSidebar', service)`（`src/client/index.tsx`），消费插件在 `inject` 里声明 `'betterSidebar'`，Cordis 保证服务就绪后才激活你的插件，然后你调用 `ctx.betterSidebar.registerTab(...)` / `registerFileViewer(...)` 完成注册，返回的 disposer 由 Cordis fiber 在卸载（HMR / 禁用）时自动调用。
 
@@ -256,7 +282,10 @@ interface TabComponentProps {
   // 以下由内置 tab 使用，外部 tab 可忽略：
   expanded?: string[]          // 文件树的展开目录集
   onToggleDir?: (path: string) => void
-  onReferenceFile?: (path: string) => void
+  // 在会话 composer 插入一条 @ 引用。isDir=true 为目录：纯文本 `@dir/`，
+  // 保留宿主文件夹装饰与补全；false 为文件：走宿主结构化引用 chip
+  // （显示 @basename、序列化为完整 @path），宿主拒绝时回退纯文本。
+  onReferenceFile?: (path: string, isDir: boolean) => void
   onOpenFile?: (path: string) => void
   onOpenDiff?: (tab: SidebarTab) => void
   onSubagentJump?: (childSessionId: string) => void
@@ -359,12 +388,12 @@ ctx.effect(() => {
 | id | order | single | hidden | 用途 |
 |---|---|---|---|---|
 | `editor` | 10 | 否（按 path 去重） | 否 | 唯一「文件窗口」（编辑/预览 + 资源管理）。chrome 恒合并形态：路径输入框 + 编辑器控件 + 可开关内嵌文件树（全局搜索 `fs.search`；状态存 `tab.meta.treeOpen/treeWidth`）。`editorExplorer`：关（默认）= 按 path 新开，无路径窗口 = 纯资源管理器；开 = 树点击/Enter 经 `updateTab` 原地切换（id/meta 不变），无路径窗口 = 带 chrome 空窗口。树右键「在新 Tab 中打开」「在侧边打开」（pane 右侧 split）。新会话 seed 空文件窗口（`title:'Files'`）；旧 `explorer` tab 经 `sanitizeState` 迁移 |
-| `git` | 20 | 是 | 否 | Git 面板 |
+| `git` | 20 | 是 | 是（本轮文件操作数） | 「文件变动」统一 tab（id 保留 `git` 以兼容持久化布局）：**Git 视角**（原 Git 面板：staged/unstaged / 提交 / 历史 / worktree·子仓库选择）+ **本轮文件视角**（原 file-trace：模型读/写/编辑实时折叠，按文件分组、类型筛选）；会话事件经插件自有宿主路由 `changes.ops` 供给（live 日志优先、冷会话回放持久化记录，`afterSeq` 增量），badge 读 tab 轮询写入的同步缓存。两视角共用底部可拖拽预览面板（`tab.meta.lens/previewH` 持久化），diff 渲染统一走 `src/client/diff/`（`DiffRows`/`DiffFiles`：mod 配对 + 行内高亮 + 语法着色 + 上下文折叠）；Git 目标可展开为独立 diff tab（落进工作台的 diff 分栏） |
 | `subagent` | 30 | 是 | 否 | 子代理拓扑 |
 | `sidechat` | 35 | 否（`sidechat:<uuid>`，按 `meta.threadId` 去重） | 否 | 侧边对话（每对话一 Tab）：打开即建空线程（首条消息赢得标签并同步标题）；线程 = 插件自建子会话（种子继承父会话上下文，进行中回合以 `interrupted` 闭合；种子带合法 `subagent/descriptor`，SubagentView 按 `Side: ` 前缀过滤），`origin:'subagent'` 隐藏于主列表；走 `/sidebar/api/sidechat.*` 路由；头部菜单切换/重开（`parkSidechatReopen` + 确定性 id），关 Tab 释放 live agent；重开经 `collectOwnEvents` 回源到种子边界；「保存为新会话」= `session.fork`（`this` 敏感）。[设计文档](plans/2026-08-20-sidechat-tab-design.md) |
 | `terminal` | 40 | 否（`terminal:<n>`） | 否 | 终端。v0.17.0+ 右键「固定到工作区/全局」：跨会话不消失，TabBar 内联虚拟 Tab（`pinned:<homeSessionId>:<tabId>`），就地按 home scope 连 PTY；global 全会话可见、workspace 仅同 cwd；`tab.pin = { scope, homeCwd? }` 随会话持久化，渲染期解析（`collectPinnedTabs` → `createPinnedVirtualTab` → `injectPinnedIntoTree`） |
 | `browser` | 50 | 否（`browser:<n>`） | 否 | 内嵌浏览器（沙箱 iframe，可设置关沙箱） |
-| `diff` | -1 | 否（按 id 去重） | 是 | 差异查看（GitView 触发） |
+| `diff` | -1 | 否（按 id 去重） | 是 | 差异查看（changes tab 的预览面板「展开为独立页签」触发，同一渲染栈） |
 
 你的 `id` 不可与上述重复，否则 `registerTab` 抛 `"tab type \"X\" already registered"`。
 
@@ -581,10 +610,10 @@ interface BetterSidebarService {
   // ── v0.12.0+ ──────────────────────────────────────────────────────────
   /** 插件版本（如 '0.17.1'；与 package.json 同步，测试守护） */
   readonly version: string
-  /** 单调能力清单（只增不删）：'badge' | 'tabLifecycle' | 'updateTab' |
-   *  'openFile' | 'targetedOpen' | 'stateSubscription' | 'tabMeta' |
-   *  'pluginSettings' | 'urlTarget' | 'settingSelect' | 'floatWindows'
-   *  ——用 `features.includes('xxx')` 按能力 gate。 */
+  /** 能力清单（只增不删，唯一例外：v0.19.0 删除了 'floatWindows'）：
+   *  'badge' | 'tabLifecycle' | 'updateTab' | 'openFile' | 'targetedOpen' |
+   *  'stateSubscription' | 'tabMeta' | 'pluginSettings' | 'urlTarget' |
+   *  'settingSelect' ——用 `features.includes('xxx')` 按能力 gate。 */
   readonly features: readonly string[]
   /** 当前快照：激活 sessionId + 其状态（面板几何/打开的 tabs/展开集）+ prefs。
    *  session 未激活时 state/sessionId 为 undefined。 */
@@ -691,7 +720,7 @@ ctx.effect(() =>
 )
 ```
 
-> ⚠️ **`toggles` 的 key 必须是宿主 PrefsSchema 的字段**（内置键：`autoOpenSubagent` / `agentTerminalTools` / `agentOpenTools` / `terminalFontFamily` / `terminalFontSize` / `editorExplorer` / `workspaceFence` / `htmlViewerNoSandbox` / `htmlViewerDefaultUnsafe` / `browserNoSandbox` / `browserInterceptLinks` / `browserInterceptHttp` / `browserInterceptHttps`）。**v0.12.0 起设置 seam 已开放**：你自己的设置走 `pluginToggles`（声明式行）或 `render`（自定义面板），值持久化在 `pluginSettings[id]`——不再需要宿主 schema 字段，也不再被 seam 丢弃。值须 JSON 可序列化（行控件只产出 string/number/boolean；自定义面板自行负责）。
+> ⚠️ **`toggles` 的 key 必须是宿主 PrefsSchema 的字段**（内置键：`autoOpenSubagent` / `agentTerminalTools` / `agentOpenTools` / `terminalFontFamily` / `terminalFontSize` / `editorExplorer` / `workspaceFence` / `htmlViewerNoSandbox` / `htmlViewerDefaultUnsafe` / `browserNoSandbox` / `browserInterceptLinks` / `browserInterceptHttp` / `browserInterceptHttps` / `changesDiffFloat`）。**v0.12.0 起设置 seam 已开放**：你自己的设置走 `pluginToggles`（声明式行）或 `render`（自定义面板），值持久化在 `pluginSettings[id]`——不再需要宿主 schema 字段，也不再被 seam 丢弃。值须 JSON 可序列化（行控件只产出 string/number/boolean；自定义面板自行负责）。
 
 ### 8.1 内置键 `workspaceFence`（工作区路径围栏）
 
@@ -727,19 +756,18 @@ ctx.effect(() =>
 | **i18n 跟随** | 文案跟随 DSH `ctx.locale`（词典在 `betterSidebar` 命名空间；Host-backed `locale.preference` 优先于浏览器语言并实时切换；缺失回退浏览器）。消费插件**不要**依赖内部 `t()`——标题传字符串或 `() => string` |
 | **第三语言覆盖（ja 等）** | 可选 peer `@huanlin/dsh-plugin-better-locale`（optional）提供 ja/ko 覆盖，**借用 DSH 英文槽位**（仅 DSH=en 时生效，zh 下惰性）。经 `ctx.get('betterLocale')` 注入 `t()`；未安装整段 no-op |
 | **懒加载 chunk** | 重依赖（xterm/CodeMirror）在独立 bundle（`lib/client-<name>.js`），经 `/sidebar/bundle` 按需下发；factory 赋到 `globalThis.__dshChunks__[<name>]`，由 `src/client/chunk-loader.ts` 物化，**不经** `__ModuleLoader__`。对消费插件透明 |
+| **聊天文件打开漏斗（0.1.5 宿主）** | 聊天里一切文件打开（工具行 / 产物行 / 正文提及 / 行内代码路径）统一走 DSH 原生右侧栏的 `ctx.sidebarRight.openResource(fileAddressFor(sessionId, cwd, path))`（`packages/client/ui-chat/src/client/apply.ts` 是唯一调用点）；`remote.session.openWorkspacePath` 在 0.1.5 客户端**已无调用者**，better-sidebar 的 openpath 拦截随之删除。你的插件若要观测/旁路聊天文件打开，注册原生 tab 类型认领 `dsh-resource://file/**`（见 [AGENTS.md §3](AGENTS.md) 第 10 条）；不要假设 `ctx.workspaces.openPath`（已删除）或旧 `remote.session` 漏斗存在 |
+| **原生 tab 体的高度契约** | 你的 tab 组件被挂在**全高列 flex 宿主**里：native 适配层给每个 tab 体（含 orphaned 回退）包一层 `height:100%` 的 `sidebar.module.css` `.nativeTabHost`（带 `data-dsh-native-tab-host`）——根用 `flex: 1` / `height: 100%` 并加 `min-height: 0` 填满面板。宿主的面板体 `.paneBody`（`dsh-client-ui-dockkit`）是**有确定高度的块级滚动容器，不是 flex 容器**，因此只靠外层 flex 容器支撑的根会塌成内容高度（sidechat 的输入框就贴不到面板底）；DSH 自己的 tab 体（`ui-sidebar-documentpreview` 的文档预览、`ui-sidebar-files` 的 FilesBody）正是因此在根上声明 `height: 100%` |
 
 ---
 
-## 11. 自由窗口（v0.16.0，`features` 含 `'floatWindows'`）
+## 11. 自由窗口（v0.16.0 – v0.18.x，**v0.19.0 已移除**）
 
-任意 tab（含你注册的）可拖出侧边栏成为悬浮**自由窗口**——对你的组件基本透明，只需知道以下语义：
+自由窗口（tab 拖出侧边栏成为可移动/缩放的悬浮窗，`SidebarState.floats`、`floatTab`/`dockFloat`/`raiseFloat`、`features` 里的 `'floatWindows'`、右键「移动到自由窗口」、`src/client/FreeWindow.tsx`）在 **v0.19.0-alpha.0 整体删除**：右列交给 DSH 原生右侧栏后，插件只剩底部工作台，浮窗既没有语义归属也没有可用手势（拖出目标区域现在是原生栏的属地）。
 
-- **拖出**：tab 拖到主会话区域（conversation 列）松开即浮动（`floatTab`：移入 `SidebarState.floats`，默认 390×780 按视口钳制居中，清空 pane 折叠）。检测在 `Sidebar.tsx`（`body[data-dsh-tab-dragging]` 门控）；窄视口禁用。右键「移动到自由窗口」始终可用。
-- **窗口操作**（`src/client/FreeWindow.tsx`，`[data-dsh-panel-host]` 内、z-42）：头部拖动移动；拖到 pane（`[data-dsh-pane]`）松开**停靠**（`dockFloat`）；右下角缩放（最小 320×200）；点击置顶（层叠 = `floats` 数组序）；X = `closeTab`（触发 `onClose`、释放终端）。
-- **持久化**：`floats` 随会话进 localStorage（`dsh-sidebar:v1:<sessionId>`）；`sanitizeState` 宽容校验（非法条目单独丢弃、几何钳入视口、diff/ephemeral 不持久化）。
-- **服务语义**：`openTab` 聚焦命中浮动 tab = 置顶窗口（不重复开）；`closeTab`/`activateTab` 关窗/置顶并触发回调；agent 终端 reconcile 移除已消失的浮动窗口。**浮窗内你的组件 `visible` 恒 true**。
-- **稳定寻址面**：`[data-dsh-float-window]` / `[data-dsh-float-id]` / `[data-dsh-pane]` / `[data-dsh-float-dock-over]` / `[class*='floatDropHint']`；全令牌驱动，头部 `-webkit-app-region: no-drag`。
-- **⚠️ portal 事件劫持陷阱**：拖拽表面子树含 portal 覆盖层时（如你的组件在 tab 头部区域渲染弹层），portal 后代合成事件**沿 React 树冒泡**回 `onPointerDown`，会被误判为拖拽开始（吞点击 + 抢 pointer，菜单/X 失灵；jsdom 不走此路径，只有 e2e 能抓）。拖拽起点必须带**同源守卫**：`event.currentTarget.contains(event.target)` 为假或目标在 `button` 内时直接返回（回归：`tests/free-window.spec.tsx` portaled-menu 用例）。
+- 升级到 v0.19.x 后请**不要**再 gate `features.includes('floatWindows')`，也不要引用 `floatTab` 等符号（类型声明里已不存在）；
+- 旧文档里持久化的 `floats` 字段会被 `sanitizeState` 直接忽略，会话不会因此加载失败；
+- 需要「同一个 tab 在别处看」的场景，改用原生栏打开（`openTab` 默认落点）或底部工作台分栏（`OpenTabSeed.target: 'bottom'`）。
 
 ---
 
@@ -751,8 +779,8 @@ ctx.effect(() =>
 
 - **面板表面**：右/底面板背景 = `var(--dsw-alias-bg-layer-1)`。**绝不消费 `--dsw-specific-sidebar-fill`**（宿主左导航专属，皮肤按左导航语义覆盖它，面板消费会失去填充）。换面板表面 = 覆写 `--dsw-alias-bg-layer-1`。
 - **终端/编辑器表面**：`effectiveTokenValue` 读 `--dsw-alias-bg-base`——`transparent` 与 alpha < 0.9 的半透明值回退不透明底色（文字不叠背景画，issue #90）；≥ 0.9 放行。
-- **根锚点**：宿主 div 带 `data-dsh-better-sidebar`（append 到 body）；其内**面板宿主层** `[data-dsh-panel-host]`（`fixed; inset:0; z-25; pointer-events:none`，v0.13.1+），面板/开关簇 absolute 定位，免疫中间层 transform 劫持；页面级 transform 触发 `data-dsh-panel-host-degraded` 降级。皮肤作用域覆盖限定在 `[data-dsh-better-sidebar]` 内。
-- **布局变量**（`<html>` 上，面板打开时有效）：`--dsh-sidebar-width` / `--dsh-sidebar-height`。宿主推挤 = `#root` margin/width calc + centerCol `margin-bottom`；锚点用**复合选择器双保险**（禁止 `nth-child`）：`#root [data-dsh-frame] > [data-pane="conversation"]` 与 `#root :has(> [data-slot="conversation"])`（两代命名同元素，`drag-layout.e2e.ts` 断言）。
+- **根锚点**：宿主 div 带 `data-dsh-better-sidebar`（append 到 body）；其内**面板宿主层** `[data-dsh-panel-host]`（`fixed; inset:0; z-25; pointer-events:none; overflow:hidden+clip`，v0.13.1+），面板/开关簇 absolute 定位，免疫中间层 transform 劫持；页面级 transform 触发 `data-dsh-panel-host-degraded` 降级。`overflow` 级联是**契约**（`hidden` 兜底 + `clip` 收尾，`tests/panel-host-css.spec.ts` 守护）：`hidden` 盒子仍是滚动容器，脚本滚动或浏览器 scroll-into-view 修正（焦点移入视口外区域、嵌套 iframe/工作台加载时抢焦点、面板滑出动画中 focus() 落点）会沿最近可滚祖先滚走整层——面板与开关簇集体偏离视口角（computed left/right 仍"正确"，偏移藏在盒子自身 scroll offset 里）；`clip` 裁剪语义相同但不产生滚动盒，任何路径都滚不动这层。皮肤作用域覆盖限定在 `[data-dsh-better-sidebar]` 内。
+- **布局变量**（`<html>` 上，面板打开时有效）：`--dsh-sidebar-width` / `--dsh-sidebar-height`。右面板宽度 = AppFrame 的 `padding-right` 预留（新版 `#root [data-dsh-frame]` / rc.8 `#root > [data-slot="root"] > div` 双锚点），AppFrame border box 保持完整桌面视口宽度（Harness 以此判定桌面/窄屏布局，避免插件面板展开误入窄屏）；AppFrame 的 details 拖拽手柄按同一变量向左平移贴合列边缘。底部面板仍走 centerCol `margin-bottom`；centerCol 锚点 = **JS 标注**（禁止 `nth-child`）：侧栏 shell 的定位器给测得的 centerCol 节点打 `[data-dsh-center-col]` 标签（`Sidebar.tsx` locate，节点更换/HMR 时随 ref 迁移），`layout.css` 用 `#root [data-dsh-center-col]` 选中（`drag-layout.e2e.ts` 断言恰一节点且为对话槽宿主的父级——alpha.2 起 shell 把 `#root [data-slot="main.conversation"]` 解析进列并跳过 `display: contents` 祖先（`center-column.ts` 的 `CENTER_COLUMN_SELECTOR` 同时认 `main.conversation` 与 alpha.1 的 `conversation`），定位器从槽宿主向上取第一个非 `contents` 的祖先；frame 宽度与桌面 Session Log 由 `desktop-layout.e2e.ts` 断言）。
 - **桌面信号与标题栏**（v0.14.1+ 四方案模型 `SidebarPrefs.titleBarScheme`，唯一决策点 `src/client/titlebar-strip.ts` 纯函数）：
   - 壳信号（只读，不自动触发修改）：URL `dsh-desktop-mode` / `dsh-desktop-platform` / 可选 `dsh-desktop-titlebar-inset`（0–120 clamp）。
   - **strip 取值链**：⓪ `web` 方案强制 0；① `navigator.windowControlsOverlay` 真实几何（`wco.ts` 订阅 `geometrychange`，**为 0 也权威**，`visible=false` 幽灵 API 视为缺失）；② URL inset；③ 壳预设 `stripFor`（仅 `preset`）；④ 手动 `titleBarStripPx`（仅 `custom`）；⑤ 0。驱动 `body[data-dsh-title-bar-compat]` + `--dsh-title-bar-strip`。
@@ -857,8 +885,9 @@ better-sidebar 的内置 tab 和 viewer 就是参考实现（"吃狗粮"），
 
 - **`src/client/builtins/`**：7 个内置 tab（tabs.tsx）+ 6 个内置 viewer（viewers.tsx）的注册代码 + 聚合与 disposer 生命周期（index.ts）；Office 预览见 plugins-viewers.ts
 - **`src/client/service.ts`**：`BetterSidebarService` 接口 + `createBetterSidebarService` 工厂实现（含匹配算法、dedupe、createTab、启用态 gating）
-- **`src/client/Sidebar.tsx`**：`TabContent` 分发（查 `getTab` → 调 descriptor.component；未注册 → `<OrphanedTab/>`）、`+` 菜单构建（order 排序 + available disabled + 禁用过滤）、自由窗口拖拽检测
-- **`src/client/FreeWindow.tsx`**：自由窗口（移动/停靠/缩放/置顶，§11）
+- **`src/client/Sidebar.tsx`**：底部工作台外壳 + `TabContent` 分发（查 `getTab` → 调 descriptor.component；未注册 → `<OrphanedTab/>`）、`+` 菜单构建（order 排序 + available disabled + 禁用过滤）
+- **`src/client/native/`**：原生右侧栏接入（tab 类型注册、合成 `SidebarTab` 适配、资源地址、跨会话打开排队）
+- **`src/client/sidebar/bottom-toggle.tsx`**：底部工作台开合按钮（注册进 DSH 会话头 utilities 槽）
 - **`src/client/SideCardSection.tsx`**：声明式设置页（注册表驱动清单 + 嵌套设置行 + 开关持久化）
 - **`src/client/api.ts`**：`/sidebar` API 的封装（复制其 fetch 模式到你的插件）
 - **`src/client/plugins-tabs.ts`** / **`plugins-viewers.ts`**：推荐插件目录（「添加插件」弹窗数据源；加一条数据即上架，`tests/plugin-list.spec.ts` 守护）

docs/plans/2026-08-12-mobile-layout-design.md

@@ -51,7 +51,7 @@
 
 ### 4.4 行为修正
 
-- `state.ts` `loadState`：窄屏新会话默认 `panelOpen=false`（首开才生效；用户手动展开后照常持久化）。
+- `state.ts` `loadState`：窄屏加载一律以 `panelOpen=false` 开始（包括持久化布局恢复）；仅覆盖抽屉可见性，右侧/底部 pane、tab 与自由窗口状态原样恢复。宽屏仍按持久化值或新会话偏好决定展开状态。
 - `service.ts` `openTab`：窄屏且 seed 带 `path`/`url` 且面板收起 → 自动展开抽屉（dedupe-focus 分支同样生效）；纯类型打开不展开；宽屏行为不变。
 
 ### 4.5 样式（`sidebar.module.css`）
@@ -61,7 +61,7 @@
 ### 4.6 测试
 
 - `tests/breakpoints.spec.ts`：断点边界（767 窄 / 768 宽；1024 明确为宽）。
-- `tests/unit.spec.ts`：`migrateBottomTabs` 4 例（并入第一 leaf 且底部清空/面板关/activePane 重指、右树为 split 时并入最左 leaf、幂等性、空底部树但 activePane 在底部树时重指）+ 窄屏新会话默认收起（stub `window.innerWidth=390`）。
+- `tests/unit.spec.ts`：`migrateBottomTabs` 4 例（并入第一 leaf 且底部清空/面板关/activePane 重指、右树为 split 时并入最左 leaf、幂等性、空底部树但 activePane 在底部树时重指）+ 窄屏新会话默认收起；`tests/state.spec.ts` 守护窄屏恢复强制收起且 pane / free-window 状态不丢，768px 宽屏仍恢复持久化展开值。
 - `tests/service.spec.ts`：窄屏 auto-expand 5 例（390 < 768 仍窄）。
 
 ## 5. 边界情况

docs/plans/2026-08-19-sidebar-injection-unified-host-design.md

@@ -259,3 +259,4 @@ document.body
   - 本地 Node 24 跑 `test:mount` 需 `node --expose-internals` 启动 dsh CLI（HMR 服务要求，CI Node 22 无此问题）——本地用 DSH_CMD 包装，不改仓库脚本。
   - **CR #232 修复（2026-08-19）**：① 降级同步改为按**未修正几何**判定（跟踪自身补偿量，祖先 transform 消失才退出循环）；② chunk 重验证成为 `loadChunk` 屏障（重验证挂起期间不提供缓存，杜绝 HMR 竞态陈旧 exports）；③ 键盘 inset 公式补 `visualViewport.offsetTop` 并监听 `scroll`。
   - **z-index 40→25（2026-08-22）**：设计初稿的"30–99 无任何 DSH 元素"（源自 #52 修复记录）低估了官方 ui-cordis 的动态插件面板（fixed z-index 30，挂 `sidebar.footer.action` 槽）——better-sidebar 底部面板曾盖住其清单/审批面。下调宿主层至 25（AppFrame overlayLayer 20 之上、ui-cordis 30 与 DSH 浮层栈 100+ 之下），折叠按钮簇 45 保留为 host 内部层叠；`AGENTS.md` §8 与 `2026-08-15-skin-compat-design.md` 已同步。
+  - **桌面布局判定修正（2026-08-26）**：`#root` 的 width/margin 推挤会缩小 AppFrame 的 border box，触发 Harness `<1024px` 窄屏判定，使桌面左侧栏自动折叠、Session Log 退化为 fixed icon，并挤乱后台任务操作区。右面板宽度改为 AppFrame 内部 `padding-right`（新版 `[data-dsh-frame]` 与 rc.8 root-slot direct child 双锚点），Frame 与 `#root` 保持视口宽度；details 拖拽手柄按同一变量平移。`desktop-layout.e2e.ts` 守护 frame 宽度、桌面 Session Log 文本按钮与面板不重叠，`drag-layout.e2e.ts` 继续守护拖拽 1:1。

docs/plans/2026-08-20-sidechat-tab-design.md

@@ -96,3 +96,5 @@
   3. 重开线程 Tab 丢工具行：根因**不在宿主**（`session.history` cold 路径原样返回 `tool/call`，见 `api-proxy.ts:749` 与 `chunk-rows.ts` 的无损 chunk 压缩）而在首挂回源窗口——旧实现 8 事件/页 × 32 页 = 256 事件上限，而 cold 读会把 chunk-rows 展开回每个流式 delta 一条事件，一轮回答动辄数百事件，较早的 `tool/call` 掉出窗口（settled 文本靠最终 `assistant/message` 幸存）。修复 = 抽出 `collectOwnEvents`（200 事件/页 × 40 页帽、日志穷尽/无标记时落定 `seedBoundary:0` 停止每轮重走），单测覆盖四分支。
   4. Subagent 页「目录损坏」行：见 §5 修正——种子追加 descriptor + SubagentView/subagent-detect 按前缀过滤（`isSideThreadSummary` 同时修好 autoOpenSubagent 误触发与计数膨胀）。旧版创建的线程仍是 corrupt 诊断行，由 SubagentView 的标题前缀过滤兜底隐藏。
 - **转录传输迁至自有路由（DSH 0.1.2-alpha.1 适配）**：§6 原设计的时间线轮询走通用 `connection.api.sessions.history` RPC——该客户端面（`ctx.connection.api`）在 0.1.2-alpha.1 的 Remote-gateway 迁移中被整体移除，且其继任者（`session/follow`/`session/page`）对 `origin:'subagent'` 会话强制 subagent 地址寻址（普通 `{kind:'session'}` 地址被 `agent-busy` 拒绝），纯分页也拿不到最新尾页（`throughSeq` 不得超当前游标）。修复 = 新增 **`sidechat.events`** 路由（`src/sidechat-routes.ts`）：host 侧读线程日志（live 走 `agent.session.events`，冷线程走 `ctx.get('sessionPersistence').inspect`——两版 DSH 同形，alpha.1 的 inspect 返回展开后的逻辑日志而非磁盘上的打包 chunk-row），服务端切 `session/end-seed`（`threadOwnLogEvents`，`collectOwnEvents` 的 walk 语义下沉），`afterSeq` 增量 + 8000 事件尾部帽（对齐旧 walk 上限 40×200）。客户端 `fetchThread` 单路径化，删除 `collectOwnEvents` 与 `ctx.connection` 镜像/inject。种子切割仍由 `transcriptRows` 客户端二次防御。挂载冒烟补 live+冷读两条断言。
+- **种子缺 fork 标记 → 子会话继承父会话未领取的 inbox 消息（2026-09-05，用户实测「上下文很长时侧边对话会把之前的 User msg 先发送出去」）**：`sidechat.start` 原只传 `seed` 不传 `meta.isSeeded: true` + `inheritedEventCount`。dsh-session 契约：**只给 seed 不标 isSeeded，种子算重放历史而非继承前缀** → `Session.ownEvents()` 含整个种子 → 子会话 `Inbox` 构造器（重放 `ownEvents()` 中的 `agent/inbox/spliced`）继承父会话切割时刻**任何未领取的 inbox 输入**。两个触发窗口（均以真实 0.1.2-rc.1 包 `Session.create` + `Inbox` 实验证实）：① next-turn——父会话排队中的用户消息（长回合运行中补发）；② **next-step（用户实测场景：父会话运行中、用户队列已清空）**——长回合里工具结果上下文/steering/运行时快照在步骤边界之间插入 next-step、尚未领取；上下文越长回合越久窗口越宽。后果：首条 `sidechat.prompt` 的 claim 顺序为 `[幽灵消息, boundary, question]`——幽灵消息排在 boundary 之前最先发给模型（工具上下文常为「工具完成，接下来做 X」，模型先继续父会话任务），并在子会话日志落成 `user/message`。修复 = create 补 `meta.isSeeded: true` + `inheritedEventCount: SessionLogOffset(seed.length)`（宿主自己的 `session.fork`——api-session-controller——的规范调用形态；`createAgent` 工厂逐字段透传 `sessions.prepare`）。`threadOwnLogEvents` 按 end-seed 标记切割，标记位置不变，转录行为不变；冷恢复按持久化 header 切割，一致。回归测试进 `tests/sidechat-seed-validation.spec.ts`（真实 Session + Inbox 双向锁定：旧形态继承幽灵 / 新形态两队列皆空）。用户拍板：不迁移既有线程、不加 inbox.clear() 兜底（修复后新线程为无操作；旧「从未发过消息」空线程首次使用可能仍先答一次旧消息，之后自愈）。
+- **「更优雅 API」复评（2026-09-05，0.1.2-rc.1 = npm latest）**：无 sidechat/sidechain 宿主 API；`ContinuableStartSpec`（`ctx.subagents.startContinuable`）仍无 seed 字段；`session/create` RPC 只建全新会话。§3 的自建结论继续成立，`AgentRegistry.create` 接缝即宿主 fork 自用的公开接缝——补齐 fork 标记即为规范用法。

docs/plans/2026-08-22-open-with-menu-design.md

@@ -87,19 +87,29 @@ Cursor             (SSH)
 - 校验：`reveal` 路径必须绝对（`requireAbsolute`）；`url` 必须是 `scheme://` 自定义协议（拒绝 http/https）。
 - **Windows 平台命令为约定实现，需在 Windows 实机验证**（本机为 macOS；CI 覆盖 linux）。
 
+**实施偏差（2026-09，#517 / PR #522）**：SSH 远程编辑器链接**不再经宿主路由执行**。DSH 部署在无头远端服务器时，宿主侧 `xdg-open` 无 DISPLAY/无编辑器，`vscode://` 静默失败。`api.openExternal`（`src/client/api.ts`）现把 `<scheme>://vscode-remote/ssh-remote+…` 形态的 URL 在浏览器客户端同步触发 `window.location.assign`（处于用户点击链内，外部协议交给本机编辑器经 Remote-SSH 打开远端文件）；reveal 与本地编辑器 URL 仍走本节宿主路由。普通浏览器可处理自定义协议；禁止/未处理 `vscode://` 的 WebView 壳客户端需各自适配（见 #517 补充信息）。
+
+**实施偏差（2026-09，右键菜单减重与子菜单视口钳制）**：本菜单（及 TabBar / GitLens / FreeWindow 右键菜单、「+」菜单）整体切到 primitives `Menu` 的 **`compact` 密度**（行高 26px / 12px 字 / 164px 卡片 / 7px 圆角），菜单图标随槽位 16→14、子菜单图钉 20→16。同时发现宿主子菜单**不受视口钳制**（`bottom:-4px` 从父行向上生长、`left:calc(100%+10px)` 向右展开，主列表的钳制与 `max-height` 收缩均不覆盖它）：树顶部右键时本子菜单伸出视口上沿，窄面板（280–400px）时伸出右沿。修复为插件侧方案 `src/client/menu-flip.ts`——菜单打开期间在 `<body>` 发布 `data-dsh-sidebar-submenu="down|left"` 方向 token（`y < vh/2` → down；`x + 400 > vw` → left，400 镜像宿主几何 218 卡片 + 10 间隙 + 165 子菜单 + 12 边距），`layout.css` 据此翻转子菜单生长方向与 `::before` 悬停桥；**属性的存续期即作用域**（仅我们的菜单打开时存在），宿主自有菜单不受影响。**不做** `max-height` + 滚动钳制：overflow 裁剪会切掉子菜单 `::before` 悬停桥（跨 10px 间隙会触发 mouseLeave 关卡）。残留见「已知限制」末两条。
+
 ## 已知限制
 
 - 路径含 `#`/`?` 的文件名经 URL 打开可能被浏览器当作 fragment/query（不处理，注释说明）。
-- 编辑器未安装/协议未注册：由 OS 弹提示或静默失败，不做安装检测。
+- 编辑器未安装/协议未注册：由 OS 弹提示或静默失败，不做安装检测。SSH 客户端分支同理——浏览器端 `location.assign` 无法探测协议 handler 是否存在，仍返回 `{started: true}`。
 - 自定义编辑器仅支持 URL 模板式，不支持 CLI 命令式；无 `{dir}` 占位符。
 - Linux reveal 退化为打开所在目录（精确 select 需要各文件管理器私有协议）。
 - SSH 模式为**全局**（非每会话）：DSH 无远程会话概念，文件树路径即宿主路径；该模型对应"DSH 跑在远端开发机上"的场景。
+- 子菜单钳制为方向翻转而非高度裁剪：约 >15 个打开方式目标 + 矮视口 + 不利光标位仍可能溢出（compact 密度已把常规 4–8 目标场景收进安全区）。
+- 翻转阈值镜像宿主 `Menu.module.css` 几何常量（218/10/165/12）：宿主未来改尺寸时阈值偏保守（多翻一次方向），不会产生新越界；菜单打开期间窗口 resize 不重算 token，该次打开最坏退化为原始行为。
 
 ## 测试
 
 - `tests/open-with.spec.ts`：解析容错、目标解析与 SSH 过滤、URL 构建（本地/SSH/custom/坏模板）、校验器。
 - `tests/open-external.spec.ts`：三平台命令表、URL 校验、spawn 前校验。
-- `tests/file-tree-open-with.spec.tsx`（jsdom）：右键 → 子菜单/图钉；pin 不选中不关闭；选子项回调关闭菜单；SSH 标签后缀；未接线隐藏。
+- `tests/open-external-client.spec.ts`（#522）：SSH remote URL 客户端分流（不触 fetch）、本地/reveal/http(s) 留宿主、导航抛错 reject。
+- `tests/file-tree-open-with.spec.tsx`（jsdom）：右键 → 子菜单/图钉；pin 不选中不关闭；选子项回调关闭菜单；SSH 标签后缀；未接线隐藏；翻转向量（down / down left / 卸载清理）。
+- `tests/menu-flip.spec.tsx`：方向 token 纯函数（四象限、边界、窄面板）+ hook 属性生命周期 + layout.css 选择器与属性名的跨文件一致性。
+- `tests/tab-bar-context-menu.spec.tsx`：追加翻转向量（顶部条 down、右缘 down left、下半空 token、卸载清理）。
+- `tests/e2e/mount.e2e.ts`：「+」菜单首行 computed 高度 ≤30px（compact 密度的布局级证据）。
 - `tests/open-with-settings.spec.tsx`：SSH 输入、添加/删除（删除剪枝 pinned）、无效提示、VSCode 系开关。
 - `tests/side-card-section.spec.tsx`：`SettingsBody` 行列表 + render 共存、仅 render 时不变。
 - `tests/builtins.spec.ts`：editor 描述符断言补 `settings.render`。

docs/plans/2026-08-24-markdown-html-toc-design.md

@@ -50,3 +50,9 @@ DSH 宿主的 `MarkdownText` 出于聊天安全把 raw HTML 按字面文本渲
 
 - GFM 脚注跨段不保（宿主本就把脚注渲染为纯文本）；`srcset` 不重写（实际只有远程 URL）；HTML 实体不解码；标题锚点 permalink、TOC 滚动联动高亮不做；Sidechat 不动；不换渲染器。
 - CommonMark HTML 块类型 1（script/pre/style/textarea 按闭标签终止）与类型 7（单行完整标签）不做专门处理——块级名单 + 空行终止已覆盖 README 级真实用法。
+
+## 5. 后续修正记录（bug 反馈）
+
+- **代码块表头在预览中悬浮过长**：DSH `CodeBlock` 的 `bannerWrap` 是 `position: sticky; top: 0; z-index: 6`——在聊天里每个消息块拥有自己的滚动容器，表头粘住是对的；但在文件预览中所有 fence 共享一个 `.editorMd` 滚动容器，表头会钉在视口顶部直到整个块滚过，读作悬浮在文档上。修正：预览容器内对非 mermaid 的 `.md-code-block` 首子元素（即 `bannerWrap`）恢复 `position: static; z-index: auto`（mermaid 块已被 `data-mermaid-processed` 排除，其自身 chrome 取代了表头）。见 `src/client/sidebar.module.css` `.editorMd :global(.md-code-block:not([data-mermaid-processed])) > :global(div):first-child`。
+- **TOC 面板被代码块表头压住**：`.tocBar` 原 `z-index: 3`，低于代码块表头的 `6`，弹出面板（位于 bar 的层叠上下文内）会被 sticky 表头盖住。修正：`.tocBar` 提升到 `7`（仍低于传送门选择弹窗的 `60` 与 mermaid 模态的 `1000`）。
+- **TOC 只能再点按钮收起**：新增文档级 `pointerdown` 监听，点击落在按钮与面板之外（预览空白处）即收起；按钮/面板豁免，保证按钮仍可翻转。见 `src/client/md-toc.tsx`（与 Esc 关闭共用同一 effect）。

docs/plans/2026-08-31-openpath-intercept-alpha-design.md

@@ -0,0 +1,72 @@
+# 聊天文件打开拦截的 0.1.2-alpha 适配（openPath 漏斗迁移）
+
+日期：2026-08-31　分支：`fix/openpath-intercept-alpha`
+
+## 问题
+
+0.1.2-alpha.x 宿主上，聊天里点击文件链接（工具行、产物行、正文行内代码路径）直接落到系统默认应用（Linux 即 `xdg-open`），「聊天区文件在侧边栏打开」（`interceptOpenPath`，默认开）形同虚设。
+
+**根因**：alpha 架构把聊天打开文件的漏斗从客户端服务换成了远程调用——`ui-chat/src/client/apply.ts` 注入 ChatView 的 `openFile` 直连 `ctx.remote.session.openWorkspacePath({ path })` → 宿主 `session-controller` → `openNativePath`。插件的 `wrapOpenPath` 包的是旧漏斗 `ctx.workspaces.openPath`，而 alpha 的 `IWorkspaces`（`api/workspace-controller/src/client/service.ts`）**已删除 `openPath` 方法**——wrap 只是给 service 实例挂了个永无调用方的新属性，死代码。这是 #435/#472 适配的漏网项（挂载冒烟不点聊天文件链接，抓不到）。
+
+**连带影响**：#158 的聊天路径/行号超链接（`owner.openFile` → openPath 假设）同样失效。（#171 的「以默认应用打开」旁路 `openPathWithSystem` 已随重构消失，现行走插件自有 `open.external` 路由，不受影响。）
+
+**版本前提**：插件已进 alpha 通道（#472，peer `^0.1.2-alpha.2`，pre-alpha 兼容层已删）——本修复只面向 alpha 宿主，**整体替换**旧漏斗，不做双版本兼容。
+
+## 新漏斗的事实（宿主源码核实）
+
+1. **唯一生产调用方**：`ui-chat` apply 的 `openFile` 注入（工具行 / 产物行 / 正文提及 / 行内代码路径全部经 ChatView 的 `requestOpenFile` 汇入）。调用前路径已被 `resolveWorkspacePath(cwd, path)` 解析成绝对路径——与旧漏斗收到的形态一致。`canOpenWorkspacePath` 仅被 ui-deliverables 用于按钮可见性，无打开语义，不拦。
+2. **`remote.session` 是 cordis 服务**（gateway client 的 `RemoteNamespaceService`，service key `remote.session`，经 `ctx.plugin` 注册）：
+   - 方法以 `Object.defineProperty(service, method, { configurable: true, enumerable: true, get })` 安装，getter 在**访问时**读 `methods` 表返回调用闭包（因此直接赋值包装无效——无 setter）；
+   - 命名空间整组方法与 service 构造在**同一同步窗口**安装——`ctx.inject(['remote.session'], cb)` 回调触发时方法必已就位；
+   - contribution 卸载/重挂载时服务 dispose/重建，inject 回调随之重跑——包装天然自愈。
+3. 宿主端成功返回 `{ opened: true }`；失败抛 TypertRemoteFailure（ChatView 弹错误框）。接管方必须返回同形成功值。
+
+## 方案：`wrapOpenWorkspacePath`（沿用「包单漏斗」模式，defineProperty 版）
+
+改写 `src/client/openpath-intercept.ts`：
+
+```ts
+// 伪代码
+const descriptor = Object.getOwnPropertyDescriptor(service, 'openWorkspacePath')
+const original = service.openWorkspacePath            // 访问 getter，捕获当前调用闭包
+Object.defineProperty(service, 'openWorkspacePath', {
+  configurable: true, enumerable: true, writable: true,
+  value: (request: { path: string }, signal?: AbortSignal) => {
+    if (takeover()) { /* 接管 */ return Promise.resolve({ opened: true }) }
+    return original.call(service, request, signal)    // 放行 = 宿主 native open
+  },
+})
+// dispose：descriptor 存在则原样 defineProperty 恢复，否则 delete —— HMR 安全
+```
+
+- **接管语义不变**（复用现有 deps）：`!suspended && interceptOpenPath !== false && tabsEnabled.editor !== false && 有 current session`；`isFolderRevealPath` → `revealInExplorer`；其余 → `openInSidebar`（`:line` 拆分在既有链路内，#158 功能随之恢复）。
+- **进入时机**：`registerOpenPathInterception` 改为 `ctx.inject(['remote.session'], ...)` 内包装；宿主裁掉该服务时回调永不触发 = 不拦截不报错。
+- **已知取舍**：包装期间若 contribution 重挂方法记录，捕获的 `original` 闭包指向旧记录（getter 访问期绑定语义决定）；session 命名空间实际常驻，可接受，代码注释记录。
+
+## 改动清单
+
+| 文件 | 变更 |
+|------|------|
+| `src/client/openpath-intercept.ts` | 重写为 `wrapOpenWorkspacePath`（defineProperty 包装/恢复）；`isFolderRevealPath` 保留 |
+| `src/client/intercept.tsx` | `registerOpenPathInterception` 改走 `ctx.inject(['remote.session'], …)`；deps 不变 |
+| `src/context-types.ts` | `SidebarWorkspacesService{openPath}` 替换为 `SidebarRemoteSessionService{openWorkspacePath(request): Promise<{opened: boolean}>}` |
+| `src/client/index.tsx` | inject 数组移除 `'workspaces'`（全仓唯一消费者是旧拦截，typecheck 验证后删） |
+| `tests/openpath-intercept.spec.ts` | 重写：getter 形态假服务、接管/放行/恢复、inject 晚到场景 |
+| `docs/external-plugin-guide.md` | §10 平台陷阱补「聊天文件打开拦截走 remote.session.openWorkspacePath」一条 |
+| AGENTS.md §3 | 新增一条 alpha 宿主契约记录（对齐 #463 的做法） |
+
+## 验证
+
+- 单测：接管 / 放行 / 文件夹揭示手势三态；dispose 恢复原 descriptor；inject 延迟出现。
+- 门禁：`pnpm typecheck` → `pnpm test` → `pnpm build` → `pnpm test:mount`（alpha.2 真机 14/14 不回归；mount lane 不驱动聊天点击，拦截正确性靠单测 + 手测）。
+- 真机手测：让模型在回复里输出一个工作区文件路径（行内代码）→ 点击落侧边栏编辑器；关闭「聊天区文件在侧边栏打开」后点击 → 系统默认应用；`path:line` 链接 → 侧边栏跳行（#158 回归）。
+
+## 实施偏差记录
+
+- **接管返回值必须是 typert `RemoteResult` 包络**（初版实现踩坑修正）：plan 中「接管返回 `{ opened: true }`」有误——gateway client 的每个 remote 方法都把业务值折叠成 `{ ok: true, value }` / `{ ok: false, error }`，ChatView 的 `openFile` 按 `result.ok` 分支、falsy 时读 `result.error.message`。初版返回裸业务值导致「文件已在侧边栏打开，但仍弹『无法打开文件: Cannot read properties of undefined (reading 'message')』」。修正为接管时返回 `{ ok: true, value: { opened: true } }`（`OpenWorkspacePathResult` 类型钉住，单测断言包络形状）。
+
+## 不做
+
+- pre-alpha 双版本兼容（alpha-only 通道，#472 已删兼容层）。
+- `canOpenWorkspacePath` 包装（仅按钮可见性）。
+- DSH 侧任何改动（仓库硬约束 §1）。

docs/plans/2026-08-31-perf-optimization.md

@@ -0,0 +1,87 @@
+# 侧边栏性能优化 + 底栏拖拽布局突变修复
+
+**日期**：2026-08-31（2026-09-01 rebase 到 main c199212 并在 alpha.3 上复测）
+**状态**：已实施（分支 `feat/sidebar-perf`，单 PR 多 commit）
+**目标宿主**：DSH v0.1.2-alpha.2 起开发，宿主参考 `/Users/menghuan/Code/deepseek-harness`（只读）；main 已切 alpha.3（v0.18.1-alpha.0），rebase 后在 alpha.3 真机全量复测（§3.1）
+**测量环境**：macOS arm64 本机，真实 `dsh web`（npx 钉版）+ scratch profile 挂载 tarball，Playwright Chromium 无头，每指标 3 次取中位数（`tests/e2e/perf.e2e.ts` 输出 `PERF_JSON`）。
+
+## 1. 修复的 bug：底栏拖拽引发原生左侧边栏突变
+
+**症状**：右侧面板关闭时拖动底栏 resizer，DSH 原生左侧边栏突然折叠/跳动；松手后弹回。插件自己的右侧边栏不受影响。
+
+**根因**（源码级定位，`Sidebar.tsx`）：底栏拖拽的 `applyDrag` 把「持久化的右栏宽度偏好」（如 400px）无条件写进 `--dsh-sidebar-width`，不看 `panelOpen`；而静止时的 push effect 走 `layoutPushSize` 门控（面板关闭 → 0）。于是拖拽首帧该变量 0 → ~400px：
+
+1. `layout.css` 的 `#root { margin-right; width: calc(100% - …) }` 瞬间挤掉宿主 400px（拖拽期间 transition 被 `body[data-dsh-sidebar-dragging]` 关闭——瞬跳而非动画）；
+2. 宿主 `AppFrame` 的 ResizeObserver → `setViewport` → viewport 跌破 1024px 断点 → `computeColumns` 把原生左栏折叠成 56px rail（0.3s grid 轨道动画）；
+3. 松手 `commitDrag` → store 提交 → push effect 又写回 0 → `#root` 弹回 → 左栏再展开。
+
+插件右栏在 `#root` 之外的 `document.body` fixed 层（`[data-dsh-panel-host]`），几何上碰不到——这正是「左栏突变、右栏无恙」的不对称来源。底栏是**唯一**在 `panelOpen === false` 时可达的拖拽（宽度/角点拖拽都要求面板开着），所以只有它触发。`abortDrag` 路径此前已修过（走 `layoutPushSize` 门控），move/up 路径漏网。
+
+**修复**：`applyDrag` 里 `writeGeometry` 的 width 实参加上与 push effect 一致的门控（`!narrow && panelOpen ? min(width, vw) : 0`）；面板 DOM 写入（`panelRef`/`bottomRef`/`lastDragSize`）保持原始 width（底栏 `right` 定位派生自它）。
+
+**验证**：e2e 回归（`drag-layout.e2e.ts`）——右面板关闭 + 底栏打开拖 strip，逐帧断言 pushed width 恒 0、宿主 grid 模板 / 左栏渲染宽度 / `#root` 右边缘全程不变。旧代码上实测泄漏 504px（红），修复后通过（绿）。
+
+## 2. 性能改动清单
+
+| # | 改动 | 类别 | commit |
+|---|---|---|---|
+| 1 | boot 路径 `loadPrefs` + `loadExternalDisable` 合并为一次 `settingsGet`（原来同文档串行拉两次，第二个无超时——settings RPC 挂起则侧边栏永不出现） | 启动 | perf: cut the boot and poll overhead |
+| 2 | GitLens 2s silent 轮询不再每 tick 重列 worktrees（每 tick 少 spawn 1 个 git 进程；每 15 tick ≈30s 才重列+自动选择一次） | 运行时开销 | 同上 |
+| 3 | ChangesTab 的 `extractFileOps` fold 从「每 poll 两遍（badge 一遍 + render 一遍）」改为每 poll 一遍、结果进 ref 共享（4000 条事件 × 每条 JSON.parse） | CPU | 同上 |
+| 4 | SideChat 转录行引用复用：`transcriptRows` 接受上次结果，位置对齐内容相同的行复用旧对象——2s 轮询只重渲染变化的尾部（原来全部行连同 markdown 重解析每轮重渲染） | 渲染 | perf: stabilize renders |
+| 5 | FileTree `expanded`/`revealed` 数组 → Set（原来每行 `includes()` 线性扫描，整树 O(rows×expanded)） | 渲染 | 同上 |
+| 6 | `buildNewTabOptions` 从两处 JSX 内联调用改为共享 memo（原来每次 render 两个新数组，击穿 LeafView 的 props 比较） | 渲染 | 同上 |
+| 7 | DiffPane 高度拖拽、TerminalView ResizeObserver 走每帧批处理（原来每 pointer/resize 事件一次 setState / 一次含字形度量的 fit()）；SessionLens 的 `new Blob().size`（整段编辑内容的 UTF-8 编码）从每行每 render 移到每变化一次的 memo | 渲染 | 同上 |
+| 8 | 19 个非 zh/en 字典移入 lazy `locale` chunk（`lib/client-locale.js`，仅安装 better-locale 时按需拉取；核心包只留 zh/en——`t()` 本来也只查 zh/en + override store） | 启动体积 | perf: move the 19 dictionaries |
+| 9 | 底栏推挤锚点从 `:has(> [data-slot=conversation])` 换成 shell 定位器打的 `[data-dsh-center-col]` 标注（`:has()` 匹配缓存随流式聊天的 #root 子树变动不断失效，每次布局推挤帧全文档重估） | 拖拽帧成本 | perf: tag the center column |
+| 10 | TextEditor 不再每键 `doc.toString()` 全文字符串化进 React state（O(docLength)/键）；listener 只翻 dirty，进预览/换文件时从 live view 快照一次；保存本就现读 | 编辑 | 同上 |
+
+## 3. Before / After 对比
+
+测量说明：`mount-sweep` = 冷导航 → 插件挂载 → 展开面板 → 依次打开全部 6 个内置 tab；`bottom-drag` = 面板关闭 + 底栏打开时拖 12 步的 rAF 帧间隔。同机同夜连续跑，数字用于相对比较而非绝对承诺。
+
+| 指标 | before（main d70db8f） | after（本分支） | 变化 |
+|---|---|---|---|
+| 挂载时延（navigationStart → host attach，中位） | 376.9 ms | 272.9 ms | **-28%** |
+| 挂载+扫 tab 期间 longtask 数 / 总时长 / 最长 | 2 / 161 ms / 96 ms | 2 / 146 ms / 84 ms | 总时长 -9%，最长 -13% |
+| 核心 client.js 体积（未压缩） | 1.46 MB | 0.80 MB | **-45%** |
+| 宿主聚合 client bundle 传输量（含全部插件，gzip） | 1,436,478 B | 1,233,778 B | **-203 KB / -14%** |
+| 宿主聚合 client bundle 解码体积 | 5,136,894 B | 4,497,363 B | -640 KB（即字典总量，吻合） |
+| 侧栏 shape 的资源请求数 / 其中 settings.get | 20 / ×4 | 18 / ×2 | boot 合并生效 |
+| 底栏拖拽帧间隔 p50 / p95 / max | 8 / 10 / 11 ms | 8 / 10 / 11 ms | 持平（本就不掉帧；修复的是布局突变） |
+| 底栏拖拽 pushed width 泄漏（右面板关闭时） | **504 px**（bug） | **0 px** | 修复 |
+
+### 结构性收益（不随单次测量波动）
+
+- **核心 bundle**：19 个字典（源码 ~640KB）出核心包，`client.js` 1.46MB → 822KB（构建产物实测）。绝大多数会话（未装 better-locale）永远不拉 `client-locale.js`（gzip 171KB）；装了的用户按需拉一次（HTTP 缓存 + ETag 复用）。
+- **boot RPC**：settings 文档从 2 次串行 → 1 次；`loadExternalDisable` 有了 2s 超时兜底。
+- **GitLens 轮询的 git 进程 spawn**：每分钟 60 个（2 个/tick × 30 tick）→ ~34 个（1 个/tick + 每 15 tick 多 1 个），-43%。
+- **ChangesTab fold**：每 2.5s poll 的 fold 次数 2 → 1（每次 fold 对至多 4000 条事件逐条处理、tool/call 还要 `JSON.parse`）。
+- **SideChat 转录**：内容未变的行不再重建对象 → 下游 React reconcile + markdown 解析 + DOMPurify 全部跳过（引用稳定性由 `sidechat-transcript.spec.ts` 契约钉住）。
+- **TextEditor**：每次按键的 O(文档长度) 字符串化 + shell 重渲染 → 0（仅 dirty 布尔）。
+
+### 3.1 alpha.3 复测（rebase 到 main c199212 之后）
+
+main 在本分支开发期间合入了 alpha.3 适配（peer `^0.1.2-alpha.3`，v0.18.1-alpha.0）与 sidechat 渲染升级（新增 `turnSummary` 行 kind 与 tool `card`——`rowsEqual` 已补齐两者，card 只在 tool/result 落地时变化、被 `executing`/`failed`/`resultText` 的比较覆盖，无需值比较）。rebase 后在 alpha.3 真机重测（同法 3 次中位，before 侧 = main c199212 代码 + 本分支的测量工具）：
+
+| 指标 | before（main c199212） | after（本分支） | 变化 |
+|---|---|---|---|
+| 挂载时延（中位） | 372.3 ms | 316.5 ms | **-15%** |
+| longtask 总时长 / 最长 | 170 / 100 ms | 165 / 96 ms | -3% / -4% |
+| 宿主聚合 bundle 传输 | 1,456,668 B | 1,246,595 B | **-210 KB / -14%** |
+| boot settings.get | ×4 | ×2 | 合并生效 |
+| 底栏拖拽 pushed width 泄漏 | **504 px**（复现） | **0 px** | 修复 |
+
+全部收益在新 main 基线上成立；完整 mount lane（17 测试）在 alpha.3 真机全绿。§3 主表为 alpha.2 上的原始测量记录（两端同宿主，对比自洽），保留作历史基线。
+
+## 4. 守护
+
+- e2e：`drag-layout.e2e.ts` 新增底栏回归（宿主布局全程静止）与 center-col 标注断言（恰一节点、为 conversation slot 的父级）；`perf.e2e.ts` 的 width-leak 断言在每次测量 lane 里复检。
+- 单测：`prefs.spec.ts`（boot 决策单次 fetch）、`sidechat-transcript.spec.ts`（行引用复用契约）、`locales.spec.ts`（chunk 内全部字典 key-set 与 zh 一致）、`layout-css.spec.ts`（锚点选择器契约，禁 `:has` 回潮）、`bundle-route.spec.ts`（chunk 清单含 locale）。
+- 完整 mount lane（17 测试）在本分支全绿（alpha.2 与 alpha.3 真机各跑一轮）。
+
+## 5. 明确不做（取舍）
+
+- `pinnedEntries` 的 store 版本号改造、连续 `store.reduce` 合并：侵入 store API，收益不明确，KISS 取舍。
+- FileTree / SideChat 列表虚拟化：Set 化 + 引用复用后若真实负载仍不达标再立项。
+- `e2e-mount.sh` 的 `command -v "$DSH_CMD"` 对带空格命令失效（回退未钉版本的 npx）是**宿主侧脚本的既有行为**，本地以 `DSH_CMD=/tmp/dsh-alpha2.sh` 包装脚本绕过，不改脚本（CI 全局安装钉版本，不受影响）。

docs/plans/2026-09-03-code-quality-audit.md

@@ -0,0 +1,76 @@
+# 2026-09-03 全方位代码防腐 / 质量优化审查报告
+
+> 三路探索子代理对 src / tests / scripts / CI / 文档做全方位摸底后，经用户批准按「P0 速修 + P1 行为不变去重 + P2 深度项全做」执行，共 10 个变更流、11 个 PR，全部走分支 + PR + 三 job CI 门禁合入。本文记录审查结论、落地清单、过程中的重要发现与遗留 backlog。
+
+## 1. 审查结论总览
+
+底子健康，无大面积腐化：
+
+- 类型纪律严格：全仓 0 `as any`、0 `@ts-ignore`、0 TODO/FIXME。
+- 模块边界零违规：懒加载 chunk 隔离、client externals 白名单、tsdown purity gate 全部干净。
+- 错误 envelope 一致：宿主侧 `wire.ts` / 客户端侧 `api.ts` 双层归一。
+- 测试规模：118 个 vitest spec（约 3300 断言）+ 6 条 Playwright e2e lane。
+
+压力点集中在：少数巨型组件、若干字面重复、脚本间复制粘贴、以及缺 lint / task-runner 基础设施。
+
+## 2. 已落地的变更流
+
+| PR | 主题 | 要点 |
+|---|---|---|
+| #524 | feat/test-utils | 共享 `tests/test-utils.ts`（`setupReactAct` + `renderRoot`），迁移 28 个 spec 的重复样板；`chunk-artifact` / `manifest-consistency` 加 lib 缺失 skipIf 守卫 |
+| #525 | feat/dedup-core | api envelope 解析、`extOf` 双实现、lineage-walk 四份、GitLens 错误归一化六处收敛；删零引用死代码 `sidechatSeed`；console 分级统一。测试零改动 |
+| #526 | feat/dev-commands | Makefile（11 目标薄封装，`check` 聚合对齐 CI）；package.json 补 `test:mount:aggregate` / `clean` / `packageManager: pnpm@11.8.0`；release.yml 补 consumer-types 并统一步骤序；.editorconfig；双语 README 补文档 |
+| #527 | fix/scripts-hardening | aggregate 脚本 tarball 改 mtime 选取（修真 bug）；DSH_CMD 默认值统一；package-registry.mjs 补 mermaid chunk；抽 `scripts/e2e-common.sh` 消除两 e2e 脚本约 40% 重复（函数级等价性探针 + 双 lane 真机验证） |
+| #534 | feat/palette-single-source | One Dark/Light 语法色板单源化（`one-dark-palette.ts`），迁移前后映射机器证明逐字节相等 |
+| #535 | feat/i18n-catalog-names | 目录项 name / shell 预设 desc 词典化（20 key × 21 词典文件，`string | (() => string)` 镜像 desc 模式）；兜底错误条改 `var(--dsw-alias-*, 原hex)` 皮肤令牌链 |
+| #536 | feat/eslint | ESLint 10 flat config（typescript-eslint recommended + 经典 react-hooks 规则），存量 141 错误/21 警告清零（含 24 处真实死代码删除、`_` 前缀 mock 约定入 config）；`pnpm lint` / `make lint` / CI 三 job 全部接入；`make check` 同步含 lint |
+| #540 | feat/drop-rc7-fallback | 删 rc.7 宿主 `window.__DSH_MODULES__` 回退（peer 基线 rc.1 下不可达）；测试 fixture 切换到与生产同路径；附带修复 main 上 #535/#536 语义合并冲突导致的 add-plugin-modal spec 断裂 |
+| #541 | feat/unify-polling | `use-polling.ts` 原语（83 行）统一四处轮询习语（SubagentView 自排程 3s / SideChatView fixed 2s / GitLens fixed 2s / ChangesTab fixed 2.5s），守护 spec 断言零改动 |
+| #542 | feat/split-sidebar | Sidebar.tsx 1831 → 1176 行，抽 `src/client/sidebar/` 五模块（TabContent 74 / use-center-column 171 / use-host-feeds 269 / use-pinned-tabs 153 / free-windows 167）；面板拖拽机约 330 行因 `sidebar-layout-push.spec` 的源码文本计数断言钉住而有意保留主文件 |
+
+过程中同步发生的外部事件：DSH 0.1.2-rc.1 适配（PR #537）合入后，Wave 2 三个 PR 全部 rebase 到新 main 并重跑门禁再合并。
+
+## 3. 过程中的重要发现（记录在案）
+
+### 3.1 Windows agent-pty PTY 超时 flaky（既有，非本轮引入）
+
+`tests/agent-pty.spec.ts` 的真实 PTY spawn 用例在 ci-windows 上间歇性 5s 超时。证据链：main@`ceed6b2`（Wave 1 首个合并的 push run）挂 agent-pty ×4 + git.spec ×1；#535、#536、#541 的 ci-windows 各挂过 1-2 个同类用例，**重跑均绿**；失败组合在多次运行间漂移。建议后续对该 describe 块在 win32 上提升 testTimeout 或加有界重试。
+
+### 3.2 desktop-layout.e2e.ts 间歇 flaky（上游时序敏感）
+
+该用例测「右面板保持桌面 session 头部位置」，区域与上游适配提交 `ab6f960`（toggle cluster 重定位动画）重叠。本机（钉版 rc.1 CLI）稳定因宿主 onboarding 浮层 / workspace 选择对话框不可达而失败，且 main 原样产物 A/B 对照同样失败；CI 上 aa01140 的 push run 也挂过一次（同内容分支 run 与后续 main 验证 run 均绿）。属宿主时序敏感的既有 flaky，建议上游动画稳定后加等待收敛。
+
+### 3.3 跨分支语义合并冲突的流程教训
+
+#535 新增了 `builtinTabPlugins` 的使用（依赖既有 import），#536 的 eslint 清理在其各自基线上把当时未使用的同名 import 删除——两个各自全绿的 PR 文本合并成功但语义断裂（typecheck TS2304 + spec 加载即挂），且被并发 run 取消掩盖后带病合入 main，由 Wave 3 两个子代理独立发现并热修（#540 `8820efd`）。教训：**并行分支触碰同一文件时，每合入一个后其余分支需重验（rebase + typecheck/test），不能只信各自 PR 的绿勾**；unused-import 类清理与功能分支并行时尤其如此。
+
+### 3.4 GitHub push run 丢触发一例
+
+#541 合并产生的 main push run（`68839aa`）从未被创建（workflows 均 active，按 SHA 查询 0 runs），经 `workflow_dispatch` 手动补跑三 job 全绿。原因不明，遇到「merge 后 main 无 push run」时可按此法补验。
+
+## 4. 基础设施变化速查
+
+- **Makefile**：`help`（默认目标）/ `install` / `build` / `typecheck` / `lint` / `test` / `check`（typecheck+build+test+consumer-types+lint 聚合）/ `clean` / `pack` / `mount` / `mount-aggregate` / `registry`。package.json scripts 仍是唯一事实源，Makefile 只做薄封装与依赖链。
+- **Lint**：`pnpm lint` = `eslint .`（flat config，`reportUnusedDisableDirectives: error`）；CI 三处（ci / ci-windows / release）在 Typecheck 后执行。
+- **本地工具钉版**：`packageManager: pnpm@11.8.0`（CI workflow 的显式 `version:` 输入已移除，统一由该字段供版）。
+- **e2e 本地跑法**：`make mount` / `make mount-aggregate`；本机无 rc.1 CLI 时 `npm install --prefix /tmp/dsh-rc1-bin @deepseek-ai/dsh@0.1.2-rc.1` 后置 PATH。
+
+## 5. Backlog（本次仅记录）
+
+1. mount.e2e 的固定 `waitForTimeout` 与英文文案选择器（`[title="Files"]` 等）——宿主文案/语言变更即碎。
+2. CI 无 Playwright 浏览器缓存（每 run 重装 Chromium）。
+3. `state.spec`（1498 行）/ `smoke.spec`（1208）/ `service.spec`（1124）三个千行 spec 拆分。
+4. FreeWindow / TreePanel / split-pane / DiffPane / DiffRows 等组件缺直接渲染 spec（现靠 state 纯函数 spec + e2e 间接守护）。
+5. coverage 工具引入评估（当前零覆盖率度量）。
+6. CHANGELOG / CONTRIBUTING 文件（README「🆕 最近更新」小节手工充当 changelog）。
+7. Sidebar.tsx 剩余拖拽机（~330 行）拆分——前置条件是先重构 `sidebar-layout-push.spec.tsx` 的源码文本计数断言为行为断言。
+8. `JobOutputPane` 的 2s 轮询未迁移 `use-polling`（独立形状，见 #541 PR body）。
+9. install.sh / install.ps1 / check-consumer-types.sh 内部的 say/warn/die 重复——install.sh 必须自包含随 npm 包分发，属有意设计，除非改分发方式否则不动。
+10. §3.1 / §3.2 两个 flaky 的根治。
+
+## 6. 验证基线（全部 PR 合并后于 main 复核）
+
+- `pnpm lint` / `pnpm typecheck` / `pnpm build` / `pnpm test`：119 files / 1243 passed / 9 skipped。
+- `pnpm check:consumer-types` 通过。
+- 真机挂载 lane：mount 5/5、drag-layout 7/7、float-window 2/2、toggle-layout 1/1、perf 2/2（desktop-layout 见 §3.2）。
+- aggregate 双挂载回归 lane 通过。

docs/plans/2026-09-04-file-tree-rename-delete-design.md

@@ -0,0 +1,62 @@
+# 文件树重命名 / 删除设计（2026-09-04）
+
+> 状态：已实现。本文档记录功能设计、关键取舍与已知限制。
+
+## 背景
+
+文件树右键菜单此前只有打开/复制/上传下载等只读+导出操作，缺少资源管理器最基本的两个变更操作。本次补全：
+
+- **重命名**：行内编辑（VS Code/Finder 惯例，用户已确认）——菜单点「重命名」后行内名字变输入框（预选中、Enter/失焦提交、Esc 取消）。
+- **删除**：弹窗确认（用户指定）——复用 git lens 的 Cancel/Confirm Modal 范式，文件/目录文案区分，确认后永久删除。
+
+同批修复二级菜单的视觉关系（见下节）。
+
+## 服务端
+
+- `src/fs-operations.ts` 新增 `renameWorkspaceEntry` / `removeWorkspaceEntry`（与 `writeWorkspaceUpload` 同层）：
+  - **链路感知（link-aware）**：存在性与围栏校验对**完全解析后的目标**进行（fence 开启时指向工作区外的 symlink 一律拒绝），但操作本身作用于**词法行路径**——重命名/删除一个 symlink 行只改/删**链接本身**，绝不动目标（lstat 判定，link-to-dir 不会递归进目标）。与 VS Code 语义一致：行显示什么就操作什么。
+  - `renameWorkspaceEntry`：`name` 必须单段（非空、非 `.`/`..`、无分隔符——重命名不是移动）；目标已存在直接 409 拒绝（POSIX rename 会静默覆盖）；工作区根本身不可重命名；同名 no-op 直接成功（不触发 409）。返回**规范路径**（realpath 解析后的祖先链）供 tab 改址。
+  - `removeWorkspaceEntry`：目录递归删除、文件/symlink 解链；根拒绝。无回收站（宿主无此 API；等同 git lens discard 的永久语义）。
+- `src/index.ts` 路由 `'fs.rename'`（`{path, name}`）/ `'fs.remove'`（`{path}`），走 `cwdOf` + `fenceEnabledOf(getSettings)`，与 `fs.write` 同一围栏开关。
+- `src/client/api.ts`：`fsRename` / `fsRemove`。
+
+## 客户端（FileTree）
+
+- 菜单尾部（复制项之后）：`separator + 重命名(IconEditOutline16) + 删除(IconTrashOutline16, danger)`；**根行**（`rowMenu.path === cwd`）不渲染这两项（服务端双保险）。
+- 行内编辑：命中的行换渲染为编辑行（同缩进/图标/行高），**无 role="button"**（编辑器不是点击目标，也避免 button 嵌套 interactive 的非法结构）。裸 `<input>`（primitives `Input` 不转发 ref，而 focus+select 正是要点）；ref 回调 `useCallback([])` 稳定身份——内联箭头每渲染重跑会把正在输入的缓冲区重新全选。Enter/失焦提交、Esc 取消；`isImeComposition` 守卫（IME 组合期的 Enter/Esc 属于输入法，不提交不取消——顺手把该守卫的入参 `isComposing` 放宽为可选，React 合成事件类型未声明该字段）。
+- 删除确认：primitives `Modal`（git lens 同款 outline Cancel + primary Confirm）。
+- 失败面：树顶一条可点消失的错误条（`role="alert"`），展示服务端原文（与 FenceErrorNotice 同策略）；客户端单段校验失败也走这里（`renameInvalid`）。
+- **落定收尾 `pruneTree(prefix)`**：清掉旧路径前缀的所有缓存层 → `onToggle` 收起 stale 的 expanded 项 → `retryDir(parent)` 单层重载（无需整树 refresh tick）。重命名已展开目录后新目录折叠展示（expanded 不迁移，VS Code 同样）。
+
+## tab 调解（tree-mutations.ts + EditorHost）
+
+- `retargetPathTabs(ctx, store, old, new)`：`tab.path === old` → `service.updateTab(id, {path: new, title: baseName(new)})`（编辑内容存活，后续保存落到新路径）。
+- `closePathTabs(ctx, store, target)`：`tab.path === target || isWithinWorkspace(target, tab.path)` → `service.closeTab(id)`（目录连整个子树的打开文件一起关）。
+- tab 枚举覆盖 `state.splits` / `state.bottomSplits` / `state.floats`（浮动窗口的 tab 同样算打开）。走 service 路径（而非直改 state）使注册的生命周期回调照常触发。
+- FileTree/TreePanel 透传 `onPathRenamed?` / `onPathDeleted?`（可选，测试可不接线）；EditorHost 两处 `<TreePanel>` 接线。
+
+## 二级菜单视觉关系（layout.css，同批）
+
+针对「二级菜单没有视觉关系」的反馈，两条纯 CSS 规则（仍以 `data-dsh-sidebar-submenu` body 属性限定作用域，宿主默认不受影响）：
+
+1. **父行持续高亮**：宿主 Menu 在子菜单打开期间给父行按钮标 `aria-expanded="true"`（宿主已渲染、稳定），用同一 hover token 重新着色——指针移入侧卡后父行不再熄灭。
+2. **卡片贴近**：子菜单与父卡间距 10px → 4px，`::before` 悬停走廊同步收窄；翻转规则（left/down）的间距一并 4px。规则排序：tether 基础规则在前、翻转覆盖在后（同特异性下源序决胜）。
+
+`tests/menu-flip.spec.tsx` 的 layout.css 契约断言扩展覆盖这三条规则。
+
+## i18n
+
+新增 7 key（rename / renameInvalid / delete / deleteTitle / deleteDescFile / deleteDescDir / dismiss），zh/en/ja 手写；其余 18 个已发第三语言按 `locales.spec.ts` 的 key-set-parity 门禁同步补齐。
+
+## 测试
+
+- `tests/fs-operations.spec.ts`：rename（文件/目录/no-op 同名/单段违规/目标已存在 409/根拒绝/缺源/symlink 行改链接不改目标）、remove（文件/目录递归/symlink 只解链目标存活/根拒绝与缺路径）。
+- `tests/file-tree-rename-delete.spec.tsx`（jsdom，mock api）：菜单项出现条件（文件/目录有、根无）；重命名流（预填→Enter 提交→`fsRename`+`onPathRenamed`、Esc 取消、非法名走错误条）；删除流（弹窗文案文件/目录区分、确认→`fsRemove`+`onPathDeleted`、取消、服务端失败进错误条）。
+- 真机挂载冒烟（`pnpm test:mount`）不触达这些交互，由 CI 门禁与手动验收覆盖。
+
+## 已知限制
+
+- 无回收站：删除即永久（fence 开关不改变这一点，只改变越界拒绝）。
+- 重命名不迁移 expanded/revealed 状态：改名已展开目录后新目录折叠、reveal 高亮不跟随（一次性视觉状态，成本/收益不划算）。
+- 并发窗口竞争：存在性检查与 rename/remove 之间有微小 TOCTOU 窗口（单用户侧边栏场景可忽略；服务端错误会进错误条）。
+- 「在其他编辑器里改名后本树 stale」既有行为不变（refresh tick / focus 刷新机制管）。

docs/plans/2026-09-06-changes-op-previews-design.md

@@ -0,0 +1,61 @@
+# 变更页操作预览增强设计（2026-09-06）
+
+> 状态：已实现（PR #499）。本文档记录六个特性的设计、关键取舍与已知限制，含 2026-09-06 规范化审查后的整改记录。特性移植自 dsh-file-trace v0.2.0/v0.2.1 会话（PDF 渲染为作者后续追加）。
+
+## 背景
+
+变更页（Changes tab）底部预览面板此前只渲染统一 diff / 逐行读取 / 错误文本。本批扩展为：markdown 文档可切「阅读模式」、mermaid 围栏随阅读模式渲染、预览载荷做「敏感内容脱敏」、`.html` / `.pdf` 操作可切「渲染模式」，并把 diff 引擎的语法着色表扩到此前无色/错配的一批语言。全部特性共用同一预览面板与头部 toggle 交互。
+
+## 1. Markdown 阅读模式
+
+- 适用：`.md / .markdown / .mdx` 的 read / write / edit 操作（非错误）→ 头部「阅读 / 原文」toggle。
+- 渲染走共享 `MarkdownText`（与编辑器预览、Side Chat 同一栈，labels 契约经 `markdownTextProps()`，见 AGENTS §3.3）；本地图片目的地经 `rewriteLocalImageUrls` 改写到会话域 `/sidebar/file` 媒体路由。
+- 内容来源：read → `parseReadContent()`（见下）；write → 写入内容；edit → 已知 prior 时 `prior.replace(oldString, newString)` 重建结果文档，否则仅展示 newString（设计上「prior 已知才重建」）。
+- `parseReadContent`（`src/client/changes/ops.ts`）：与 `parseReadLines` 共享 `contentLines()` envelope 核心（`<content>` 提取 + "(Showing lines …)" 过滤）；区别在前者剥 `<n>: ` 前缀后**保留空行**（markdown 块结构依赖空行）并修剪首尾空行（渲染不可见），后者解析行号、丢弃空行。
+
+## 2. Mermaid 围栏渲染
+
+- 阅读模式检测到 ```mermaid 围栏时，走编辑器同款懒加载渲染器（`LazyMermaidMarkdown`，mermaid chunk 经 `/sidebar/bundle` 按需下发）；无围栏文档保持单次 MarkdownText 直渲染（字节不变）。
+- `LazyMermaidMarkdown` 的定义从 `MarkdownHtml.tsx` 移到轻量模块 `src/client/mermaid-lazy.tsx`：变更页（核心 bundle）要引用这个 stub 而不把 `MarkdownHtml` 的 DOMPurify/HTML 分析机械拖进核心 bundle；`MarkdownHtml.tsx` 改为 re-export。
+- 已知边界：无引号节点标签内含被遮密钥（`[REDACTED]` 字面）时 mermaid 解析失败，回落到「错误条 + 已遮源码」——该回落是 `mermaid.tsx` 既有机制（catch → 错误 + 源码），本批未新增代码，亦未为该路径加测试（README 已注明规避方式：标签加引号）。
+
+## 3. 语法着色扩展（`src/client/diff/highlight.ts`）
+
+- `mjs/cjs → JS_WORDS`、`mts/cts → TS_WORDS`（此前无映射 → 纯文本）；`tsx/jsx` 同用共享词表（规范化整改：原先保留内容相同的内联副本）。
+- `css/scss/less → CSS_LANG`：slash-star 块注释跨行、连字符属性词（`background-color` 整词着色）、字符串、十六进制数；此前误用 `#` 行注释配置导致不着色。
+- `html/htm/xml/svg/vue → MARKUP_LANG`：`<!-- -->` 注释 + 常见标签/属性；`graphql/gql`、`jsonc/json5` 映射。
+- 着色是启发式（词表驱动单遍扫描）；CSS/MARKUP 词表混排选择器/属性/标签是刻意为之——`LangConfig` 只有一个 keywords 集，再分类属过度设计。
+
+## 4. 敏感内容脱敏（`src/client/redact.ts`）
+
+- 动机：追踪器把 read/write 工具结果重放进 DOM；模型读取凭据文件时明文不应上屏。**仅显示层**：会话日志与 fs 层字节不动；不是对同上下文恶意插件的安全边界。
+- 两层启发式：
+  1. **路径层**：文件名含凭据形态（`.env`、`secret(s)`、`credential(s)`、`token`、`api-key`、`password(s)`、私钥/证书扩展名…）→ 整文件逐行 `[REDACTED]`。匹配带**右边界**（模式后不得继 `[a-z0-9]`），且复数只收「密钥仓库」义（credentials/secrets/passwords），不收 `tokens`（api-tokens.md 通常是文档）——避免 `tokenizer.ts` / `dev.environment.ts` / `style.keys.ts` / `api-tokens.md` 被整文件误伤。
+  2. **内容层**：普通文件按行遮值——赋值形（`api_key:` / `TOKEN=` / `"password":`，**字段名保留**）、`Bearer` 头、`sk-`/`AKIA`/`ghp_`/`gho_`/`xox*`/`ya29.` 前缀 token、PEM 私钥块头。字段表**不含裸词 `key`/`auth`/`token`/`pass`**（规范化整改：这些词标注的普通内容远多于密钥——键盘键名、CSS 自定义属性、词法 token；Bearer 场景由 `BEARER_RE` 单独覆盖）。
+- 开关：默认开，头部一键切换，localStorage 记忆（key `dsh-sidebar:v1:redaction`，仓库既有前缀）。所有载荷消费方（diff 行、读取行、阅读模式源、错误文本、prior）统一从**遮蔽后**形状渲染；命中时头部显示「已脱敏」条。
+
+## 5. HTML 渲染模式
+
+- 适用：`.html / .htm` 操作（与编辑器 html viewer 的扩展集对齐；规范化整改：去掉越权的 `.xhtml`）→ 头部「渲染 / 原文」toggle。
+- 实现：`HtmlRenderPreview`（`DiffPane.tsx` 导出，供沙箱 spec 钉契约）以 route-src iframe 加载 `/sidebar/html`——相对资源（`./style.css`、`img/x.png`）在路由内解析；分段读取也能渲染完整文档。
+- **语义边界（刻意）**：路由服务的是**盘上已保存文件**而非操作快照——失败/未落盘的写入会渲染旧内容（README 已声明）。共享常量 `HTML_IFRAME_SANDBOX` 提到 `src/client/html-preview.ts`（编辑器与变更页共用）；此面**恒定沙箱**（opaque origin + CSP 头），编辑器 tab 才持有带警告的去沙箱逃生门。
+
+## 6. PDF 渲染模式（作者 2026-09-06 追加）
+
+- 适用：`.pdf` 操作（非错误）→ 头部「渲染 / 原文」toggle，复用编辑器 `PdfView`（媒体路由字节流 + 显式类型 Blob → 浏览器原生 PDF 查看器内嵌，附下载入口）。规范化整改：扩展名正则补 `\.` 转义（原 `/.pdf$/i` 会误命中任何以 pdf 结尾的路径）、toggle 并入 `PaneToggle`。无独立单测（PdfView 行为由编辑器侧既有测试覆盖）。
+
+## 规范化整改（2026-09-06 审查后）
+
+- **皮肤契约**：`.htmlFrame` 背景硬编码 `#fff` → `var(--dsw-alias-bg-base)`（对齐 `.editorHtml`）；`.redactBanner` 原用的 `--dsw-alias-state-warning-primary` 在 DSW 词表中**不存在**（实际为 `state-warn-*`），var() 恒回落到硬编码 `#b8860b` → 改用真实令牌 `var(--dsw-alias-state-warn-primary)`。
+- **约定对齐**：localStorage key 并入 `dsh-sidebar:v1:` 前缀；`tests/redact.spec.ts` 源码 import 由 `.js` 改 `.ts`（仓库惯例）；DiffPane 三份同形 toggle 按钮提取 `PaneToggle`，阅读视图提取 `MdReadingView`（吸收 mermaid 分支与 codeLabels 计算）；遮蔽 useMemo 单遍化（每字段一次 `redactText`，此前 hit 扫描 + mask 双遍）。
+- **去重**：`tsx/jsx` 共享 `TS_WORDS`/`JS_WORDS`；`parseReadContent`/`parseReadLines` 共享 `contentLines()`；CSS 词表去重（`hidden`/`inherit` 重复项）并去掉 CSS 没有的 `true false` 常量。
+
+## 已知限制
+
+- 脱敏是启发式：右边界规则放行 `mytoken.yaml`（命中遮蔽）而拒绝 `api-tokens.md`（文档）；字段级遮蔽不覆盖未知命名的密钥字段——按 token 形态（`sk-` 等前缀）兜底。一键关闭可在受信任环境看原文。
+- HTML 渲染读盘上文件（见 §5）；mermaid 无引号标签含遮蔽密钥时回落源码（见 §2）。
+- 阅读模式 edit 重建依赖窗口内已知 prior；窗口外旧内容不可知时仅展示新串（面板本就以「已知内容」为限）。
+
+## 测试
+
+`tests/redact.spec.ts`（两层遮蔽 + 边界/裸词误伤回归）、`tests/diff-highlight.spec.ts`（后缀映射、CSS 注释穿行/属性、markup 注释/标签、mjs 关键字）、`tests/changes-ops.spec.ts`（`parseReadContent` 空行保留）、`tests/changes-tab.spec.tsx`（阅读模式端到端：h1/GFM 表格/本地图片改写/切回原文）、`tests/sandbox-views.spec.tsx`（HTML 渲染 iframe 恒定沙箱 + toggle 出现条件）。

docs/plans/2026-09-07-git-fold-expand-design.md

@@ -0,0 +1,217 @@
+# Git 折叠行真实展开——修复「点击展开」无反应
+
+> 日期:2026-09-07 · 状态:计划已定,待实施 · 分支(拟):`fix/diff-fold-expand`
+> 关联:上游 issue(待提)、上游 PR(待提,Closes issue)· 上游仓库 `omdsh-dev/DSH-better-sidebar`,本地 fork `LaoYueHanNi/DSH-better-sidebar`(main `6fbfeed` 与上游零差异)
+
+## 1. 背景与 bug 确认(已核实)
+
+**现象**:changes 组件点击 git 提交(或工作区 diff)后,diff 视图中 hunk 之间的折叠行显示「n 行…点击展开」,点击无反应(无 pointer/hover)。session(会话文件操作)lens 的折叠行可正常展开——仅 git lens 永远不可展开。
+
+**证据链**:
+- `src/client/diff/rows.ts` L407-433(`unifiedSegments`):git `-U3` 不输出 hunk 之间的未改动行,gap fold 段**只有行号范围、没有 `rows` 字段**(注释明确 "rows are unknown (non-expandable)");
+- `src/client/diff/DiffRows.tsx` L193-228:`expandable = segment.rows !== undefined && segment.count >= MIN_FOLD`;`rows === undefined` 走静态分支(L197-202,**无 onClick、无 data-expandable**),但文案复用 `t('changesFold')` = zh「{count} 行…点击展开」/ en「{count} lines…click to expand」——承诺了不存在的交互;
+- `src/client/diff/diff.module.css` L50-51:仅 `[data-expandable='true']` 有 pointer/hover,静态分支视觉上也不可点,唯独文字撒谎;
+- session 路径(`diffLines` + `buildDiffSegments` → `foldOf`)的 fold 总有 `rows`,可正常 toggle 展开。
+
+**上游调研结论**(2026-09-07,9 组中英文关键词 + PR 列表 + `git fetch` 源码比对):无 issue 报告过此问题(最接近的 #346 是「文件级默认折叠要多点一下」,方向相反),无已合并/进行中的修复——**全新发现**。
+
+**已排除的轻量方案**:
+- 纯改文案(原方案 A):不解决「看不到被折叠内容」的本质,用户拍板不做;
+- 调大 `-U` 上下文:大 gap 依旧折叠且依旧不可展开,治标且 diff 变吵。
+
+## 2. 目标与成功标准
+
+点击 git 折叠行时**按需拉取两侧完整内容、按行号切片填充真实上下文行**,让「点击展开」名副其实。
+
+1. git 提交/工作区 diff 折叠行点击后展开未改动上下文行(带双侧行号),再点可折叠;
+2. session lens 行为完全不变;二进制/untracked 文件不受影响;
+3. 内容拉取失败降级为无点击暗示的中性文案;
+4. `pnpm typecheck` / `pnpm test` 全绿,CI 三 job(挂载冒烟/typecheck/test)绿;
+5. 上游 issue(问题+预计方案)与 PR(实际修复,`Closes #N`)按仓库规范挂接。
+
+## 3. 已确认的实现地基
+
+- **服务端 `git.show` 路由已存在**(`src/index.ts` L474-480):payload `{rev, path}`(rev 可为 `:0` / `HEAD` / `<hash>^` / `<hashFull>`),返回 `{content: string | null}`,失败(null)内建于 `git.ts show()` 的 try/catch → **服务端零改动**;
+- `src/git.ts` `diff()`(L382-388):unstaged = `git diff -- path`(**index vs worktree**),staged = `git diff --cached`(**HEAD vs index**)——决定展开时两侧 rev 取法;
+- 渲染链:`DiffPane`(底部预览)/ `DiffTab`(独立 tab)→ `DiffFiles`(per-file `unifiedSegments`)→ `DiffRows`;op 路径直接 `DiffRows`(`buildDiffSegments`)。客户端 `api.ts` 尚无 `git.show` 封装(需补一行 call);
+- `SidebarDiffRef`(`src/client/state.ts` L24-26):`worktree{path, staged, untracked?, worktree?, repoRoot?}` | `commit{hash, hashFull, subject, worktree?, repoRoot?}`;
+- spawn 数组参数不经 shell,`<hash>^` 的 `^` 无需转义;`git show :0:<path>` 取 index 版本合法。
+
+## 4. 实现设计(按子系统)
+
+### 4.1 `src/client/api.ts` — gitShow 客户端封装
+仿 `gitCommitDiff`(L317-318):
+```ts
+gitShow: (scope: SessionScope, rev: string, path: string, worktree?: string, signal?: AbortSignal) =>
+  call<{ content: string | null }>('git.show', gitPayload(scope, worktree, { rev, path }), signal)
+```
+走既有 RPC 通道,不触构建纯度门。
+
+### 4.2 `src/client/diff/rows.ts` — 切片纯函数
+```ts
+export function foldRowsFromContents(fold: FoldSegment, oldContent: string, newContent: string): readonly DiffRow[]
+```
+- 以 old 侧驱动 `[oldStart..oldEnd]` 逐行生成 `{kind:'context', oldLine, newLine?, text}`,`newLine = oldLine - oldStart + newStart`(仅当落在 `[newStart..newEnd]` 内才带);再以 new 侧驱动补纯新增段(old 映射不到的行,只带 `newLine`);
+- 内容 `split('\n')` 切;空内容 = 空数组;行尾 `\r` 保留(与 git diff ctx 行行为一致)。
+
+### 4.3 `src/client/diff/DiffRows.tsx` — 异步展开状态机
+- 新 prop:`resolveFold?: (segment: FoldSegment) => Promise<readonly DiffRow[]>`(不传 = 现状,op 路径不变);
+- 新 state:`foldData: Map<number, readonly DiffRow[]>`、`foldLoading: Set<number>`、`foldFailed: Set<number>`,随现有 useEffect(L119-123)在 segments 变化时整体重置;
+- expandable 判定放宽:`(segment.rows !== undefined || resolveFold !== undefined) && segment.count >= MIN_FOLD`;
+- 点击未填充的 git fold:置 loading → `resolveFold(segment)` → 成功存 `foldData`(渲染优先于 `segment.rows`)、失败标 `foldFailed`;
+- 渲染三态:加载中 `t('changesFoldLoading')`;失败 `t('changesFoldUnavailable')`(无 onClick/pointer);正常沿用 `changesFold`(此时承诺为真);已展开的 fold 渲染 rows,再点折叠回。
+
+### 4.4 `src/client/diff/DiffFiles.tsx` — loader 下传 + Promise 缓存
+- 新可选 prop `resolveFold?: (file: DiffFile, segment: FoldSegment) => Promise<readonly DiffRow[]>`,转发 `DiffRows`;
+- 实例级 `useRef<Map<string, Promise<readonly DiffRow[]>>>`,key = `displayPath(newPath)|oldStart|newStart`,同文件多 fold 共享一次内容拉取、并发点击天然去重;`parsed` 变化时重置。
+
+### 4.5 `src/client/changes/DiffPane.tsx` / `src/client/DiffTab.tsx` — lens loader
+按 `SidebarDiffRef` 构造传给 `DiffFiles`:
+- **commit lens**:旧侧 `gitShow(scope, '<hashFull>^', displayPath(file.oldPath))`(root commit → null → ''),新侧 `gitShow(scope, hashFull, displayPath(file.newPath))`;与 `commitDiff` 的 `-m --first-parent` 语义一致;rename 由 `oldPath/newPath` 天然覆盖;
+- **worktree lens**:`staged=true` → 旧 `HEAD` / 新 `:0`;`staged=false` → 旧 `:0` / 新侧 `api.fsRead` 工作区(`resolveSidebarPath(repoRoot ?? worktree ?? cwd, path)`,同现有 untracked fallback L196/L68 的写法);
+- **staged 侧漂移修正(关键边缘)**:DiffPane L182-188 / DiffTab L49-57 在请求侧 diff 为空时 fallback 渲染另一侧,但 `gitRef.staged` 不变——把实际生效侧记为 state(如 `effectiveStaged`),loader 依它取数,否则切片行号错位;
+- untracked 文件走 `untrackedFile` 全加渲染,无 fold,loader 不涉及。
+
+### 4.6 i18n — 两个新 key,18 个语言文件全补
+- `changesFoldLoading`:zh `展开中…` / en `Expanding…`
+- `changesFoldUnavailable`:zh `上下文未加载` / en `Context unavailable`
+- `locales.ts` 为基准;`locales-ja.ts` 同步是 AGENTS 硬性底线;其余 15 个 `locales-*.ts` 照 `changesFold` 现状全量补译;纯 `t()` 通道,不涉 `markdownTextProps()`。
+
+### 4.7 测试(vitest,沿用现有模式)
+- `tests/diff-rows.spec.ts` 增补 `foldRowsFromContents`:对称区间 / 纯删除 gap(old 有 new 无)/ 纯新增 gap / `\r\n` 行尾 / 空内容 / 行号越界截断;
+- 新组件测试(参照 `tests/diff-files-collapse.spec.tsx`):mock `api.gitShow` → 点击 git fold 断言展开行渲染、再点折叠、失败降级文案、session fold 路径不受影响;
+- 回归:`diff-rows` / `diff-files-collapse` / `diff-highlight` / `builtins` 全绿。
+
+## 5. 边缘 case 清单(实现时逐条对照)
+
+| 场景 | 处置 |
+|---|---|
+| root commit 无父 | `git.show` 返 null → 空串(旧侧视为空) |
+| rename | `parseUnifiedDiff` 保留 oldPath/newPath,两侧各取各的 |
+| 二进制文件 | 无 hunks,不渲染 DiffRows,不涉及 |
+| untracked | `untrackedFile` 全加渲染,无 fold |
+| 无换行文件 | `count` 与切片行数可差 1,展开后以实际行为准 |
+| `\r\n` 行尾 | blob 行与 diff ctx 行同样保留 `\r`,一致 |
+| staged fallback 侧漂移 | `effectiveStaged` state(§4.5) |
+| 并发/重复点击 | Promise 缓存去重 |
+| refresh / 切目标 | tick + segments 变化重置展开态 |
+| 大文件 | 按需拉取不预取,失败降级兜底 |
+
+## 6. 流程步骤(issue / PR 全文草稿)
+
+### 步骤 1:向上游提 issue
+
+```bash
+gh issue create --repo omdsh-dev/DSH-better-sidebar \
+  --title "[Bug] Git 提交/工作区 diff 折叠行显示「n 行…点击展开」,点击无反应" \
+  --body-file <下方正文>
+```
+
+模板字段:环境 = `DSH Web(浏览器访问)`;类别 = `🐛 Bug`;DSH 版本可留空;插件版本 = `main(6fbfeed)`。
+
+**描述字段正文**:
+
+> **现象**:在「变更」面板点击历史提交(或查看工作区 diff)后,diff 视图中 hunk 之间的折叠行显示「n 行…点击展开」,但点击无任何反应(无 pointer 光标、无 hover);而会话文件操作(文件追踪)lens 的折叠行可以正常展开——仅 git lens 永远不可展开。
+>
+> **期望行为**:要么点击真实展开被折叠的上下文行,要么不显示「点击展开」字样。
+>
+> **复现步骤(Bug 必填)**:打开侧边栏 → 变更 → 历史 → 点击任一含多个 hunk 的提交 → 观察文件 diff 中 hunk 之间的折叠行 → 点击。
+>
+> **根因(代码定位)**:git 的 unified diff(`-U3`)不输出 hunk 之间的未改动行,`unifiedSegments`(`src/client/diff/rows.ts`)为此产生的 fold 段只有行号范围、没有 `rows`;`DiffRows`(`src/client/diff/DiffRows.tsx`)对 `rows === undefined` 渲染静态分支(无 onClick),但复用了含「点击展开」的 `changesFold` 文案,形成「承诺了不存在的交互」。
+
+**补充信息字段正文**:
+
+> **预计修正方案**:不采用纯改文案或调大 `-U` 上下文(治标),按需真实展开——点击折叠行时经既有 `git.show` 服务路由拉取该文件两侧完整内容(commit:`<hash>^` 与 `<hash>`;worktree staged:`HEAD` 与 `:0`;unstaged:`:0` 与工作区文件),按 fold 已知行号范围切片为 context 行填充渲染;per 文件 Promise 缓存,失败降级为中性文案。将在 fork 修好后提 PR(Closes 本 issue)。
+>
+> 截图:<用户提供的截图,展示「11 行…点击展开」行>
+
+### 步骤 2:分支与实现
+
+```bash
+git checkout -b fix/diff-fold-expand   # 基于与上游一致的 main(6fbfeed)
+```
+
+按 §4 落地;同时新增本设计文档的正式版(本文件即底稿,文末补「实施偏差」节,惯例参照 `docs/plans/2026-09-06-changes-op-previews-design.md`)。
+
+**提交拆分**(oyw-commit-style:`type(scope): 中文概括` + 无序列表 body + 背景动机段 + 决策记录伴随行;禁 AI 署名、禁 `--no-verify`):
+1. `docs(diff): git 折叠上下文按需展开设计文档`
+2. `feat(api): 暴露 gitShow 单文件版本内容读取`
+3. `feat(diff): 折叠行异步展开状态机与内容切片`(rows.ts + DiffRows + DiffFiles + 测试)
+4. `fix(diff): git lens 折叠行接入按需展开,修复点击无反应`(DiffPane/DiffTab + i18n + 组件测试)
+
+每个 commit 保持 typecheck/test 可绿。
+
+### 步骤 3:验证
+
+```bash
+pnpm typecheck && pnpm test          # 全量门禁
+pnpm build && pnpm pack && pnpm test:mount   # 挂载冒烟(CI 同款)
+```
+
+真机点开含多 hunk 提交,验证展开/折叠/失败降级,截图用于 PR。
+
+### 步骤 4:发 PR
+
+```bash
+git push -u origin fix/diff-fold-expand
+gh pr create --repo omdsh-dev/DSH-better-sidebar --head LaoYueHanNi:fix/diff-fold-expand \
+  --title "fix(diff): git 折叠上下文按需展开,修复「点击展开」无反应" --body-file <下方正文>
+```
+
+**PR body**:
+
+> ## 问题
+> Closes #<N>。git 提交/工作区 diff 的折叠行显示「n 行…点击展开」但点击无反应:`-U3` 裁剪使 `unifiedSegments` 的 gap fold 无行文本,渲染分支复用了含点击承诺的文案。
+>
+> ## 方案
+> 点击时按需经 `git.show` 拉取两侧完整内容,按 fold 行号切片为 context 行填充;不预取(大 lockfile 场景零开销),per 文件 Promise 缓存去重并发,失败降级为「上下文未加载」中性文案。session lens 行为不变,服务端零改动(`git.show` 路由已存在)。
+>
+> ## 改动清单
+> - `src/client/api.ts`:gitShow 封装
+> - `src/client/diff/rows.ts`:`foldRowsFromContents` 纯函数
+> - `src/client/diff/DiffRows.tsx`:`resolveFold` prop + 展开/加载/失败状态机
+> - `src/client/diff/DiffFiles.tsx`:loader 下传 + Promise 缓存
+> - `src/client/changes/DiffPane.tsx` / `src/client/DiffTab.tsx`:两种 lens 的取数映射(含 staged fallback 侧修正)
+> - `src/client/locales*.ts` × 18:`changesFoldLoading` / `changesFoldUnavailable`
+> - `tests/diff-rows.spec.ts` + 新组件测试
+> - `docs/plans/…`:设计文档
+>
+> ## 测试
+> - 新增:切片纯函数单测(对称/纯删/纯增/\r\n/越界);组件测试(mock gitShow:展开、折叠、降级)
+> - 回归:`pnpm typecheck`、`pnpm test` 全绿;`pnpm test:mount` 冒烟通过
+> - 截图:<展开前后对比>
+
+### 步骤 5:review 跟进
+
+按上游惯例(#499 经验)预判 review 关注点:皮肤令牌(本改动无颜色,不涉)、约定对齐(prop 命名/状态机形状)、i18n 完整性;整改意见在同分支追加 commit,重跑门禁。
+
+## 7. 明确不做
+
+- 不做纯文案拆分的「方案 A」单独 PR(失败降级文案已含在 B 内);
+- 不调大 `-U` 上下文;
+- 不改服务端;
+- 不动 `changesFold` 现有文案(B 落地后「点击展开」对 git fold 也为真)。
+
+## 8. 仓库规范备忘(实施时遵守)
+
+- 代码改动必须走 PR(AGENTS §1);fork 侧开发,push 到 `LaoYueHanNi` 后向上游发 PR;
+- 风格对齐:prop 命名、状态机形状、组件拆分与 CSS 模块组织以 `src/client/diff/` 现有实现为准,不引入新依赖/新工具/新交互模式;有歧义时参照上游最近合入的同类改动;
+- i18n:zh 新 key 必须同步 ja(其余语言全补);
+- 皮肤契约:无硬编码颜色(本改动无颜色);
+- 提交信息遵循 oyw-commit-style,正文无序列表列改动点 + 背景动机段;
+- 仅在用户明确说「提交」时才 commit;PR 创建前等用户批准。
+
+---
+
+## 实施偏差记录
+
+> 实施过程中与本文设计的任何偏离,逐条记录在此(惯例:文档以本节为准)。
+
+1. **语言文件数量**:§4.6 / §6 的「18 个语言文件」计数有误——实际变更点为 **20 个文件 21 处**(`locales.ts` 内 zh/en 双块 + 19 个 `locales-*.ts`:ar/de/fr/hi/id/ko/it/ja/pl/nl/pt/ru/sv/th/tr/vi/zh-HK/zh-MO/zh-TW),已全量补齐,PR body 计数随之更正。
+2. **缓存拆为两层**:§4.4 把「同文件多 fold 共享一次内容拉取」归给 DiffFiles 的 fold 级 Promise 缓存,但 fold 级 key 含行号(`path|oldStart|newStart`),无法去重内容请求;实施时把内容拉取缓存上移到 lens 层(`DiffPane`/`DiffTab` 的 `foldContents`,key = `displayPath`),DiffFiles 的 fold 级缓存保留(价值:文件头折叠再展开导致 DiffRows 重挂载后秒开、并发点击去重,reject 时摘除)。两层各司其职。
+3. **loading 态交互与竞态防护**:§4.3 三态渲染之外,加载中的 fold 不响应点击且无 pointer(`data-expandable` 移除),防 loading 期间重复触发;另以 `foldEpoch` ref 使 segments 重置后 still-in-flight 的 resolve 回调失效,防「旧 fold 的迟到结果写进新 segments 同下标」竞态(§4.3 未展开)。
+4. **unstaged 新侧读取失败的宽容降级**:§4.5 未细化——工作区侧 `fsRead` 失败(如文件已删除)或返回二进制时降级为空串(catch → null → `''`)而非整体 failed,让旧侧(index)上下文依然可展开。
+5. **DiffPane 组件级 gitScope**:fold loader 需要 SessionScope,新增组件级 `gitScope`(useMemo);load effect 的局部 `paneScope` 保持原样不动,最小侵入。
+6. **本机测试基线**:Windows 本机全量跑 `tests/git.spec.ts` / `tests/git-worktree.spec.ts` 中 3 个真实 git 子进程集成用例会并发抖动失败(stash 后基线复现同样失败,与本次改动无关;CI Linux 绿)。diff 相关 18/18 全绿(新增 `foldRowsFromContents` 6 用例 + 组件测试 4 用例)。
+7. **本地挂载冒烟未执行**:Windows 本地 Git Bash 下 `e2e-mount.sh` 将 tarball 规范为 MSYS 风格 `/d/...`,`file:` scheme 前缀使 MSYS 自动参数转换失效,Windows node 解析为 `C:\d\...` 而 ENOENT(经 `DSH_CMD` 注入 cygpath wrapper 可绕过,再因依赖下载网络受限放弃);`pnpm build` 产物构建已绿,挂载冒烟由 CI `plugin-mount` job 同款覆盖。
+8. **服务端零改动前提被证伪(真机修正)**:§3/§5 的「git.show 路由已存在、服务端零改动」不成立——该路由此前无真实调用方,其 path 经 `resolveGitPath` 解析为绝对文件系统路径(工作区命令语义),而 `git show <rev>:<path>` 只接受仓库相对路径,恒 fatal 返 null,两侧空串切片 0 行,展开表现为「marker 消失、零行渲染」(link 真机首测发现)。修正:路由透传仓库相对路径(diff 输出剥前缀的形态,暴露面与 git.diff/git.log 一致,仅本仓库版本树),另在两 lens 加「两侧皆空 → 降级『上下文未加载』」防御,取数异常不再静默空白展开。

docs/plans/2026-09-08-terminal-shell-config-hardening-design.md

@@ -0,0 +1,79 @@
+# 终端 Shell 配置加固（引号解析 + 双平台预检 + 友好报错）设计
+
+日期：2026-09-08 ｜ 状态：已确认（用户选定方案二） ｜ 分支：`feat/terminal-shell-quoted-args-probe`
+
+## 背景与现状
+
+配置启动终端命令的功能已存在于 main（`fd9544f` #95 部署级 `config.shell`/`shellArgs` + pwsh 探测；`c973d6e` #125 设置页 `terminalShell`/`terminalShellArgs` 用户偏好，覆盖顺序：设置页 > yaml > 平台自动，UI 标签页与模型 `terminal_*` 工具两终端面共用）。本次不是新增功能，而是加固三处已知缺口：
+
+1. **参数解析硬切**：`shellOverridesOf`（`src/index.ts:257`）用 `args.split(/\s+/)`，引号内空格被切碎（`-File "C:\my script\init.ps1"` 得到 3 个参数）。
+2. **POSIX 无预检**：`resolveShellExecutable`（`src/pty-manager.ts:351`）仅 win32 做存在性探测（PATHEXT/PATH/System32/pwsh 目录，找不到抛 `SidebarError('pty-error', 'shell executable not found: …')` → WS catch `ws.close(1011, message)`）；POSIX 直接透传 node-pty，配错路径只得到 `[process exited with code N]`。
+3. **报错不可操作**：客户端 `TerminalView.tsx:247` 对任意 `1011 + reason` 显示原始英文 reason 横幅，没有本地化说明与"去设置改"指引；粘贴带引号路径（`"C:\Program Files\…\pwsh.exe"`）会因引号参与路径解析而失败；`shell.get` 返回启动时解析的 shell，设置页覆盖后新终端标签标题不跟随。
+
+## 方案取舍
+
+- **方案一（最小）**：只修引号参数解析。POSIX 配错仍不可诊断，引号路径仍炸——否。
+- **方案二（选定）**：解析 + 双平台预检 + 本地化友好报错 + 标题跟随。不碰声明式设置契约。
+- **方案三（全家桶）**：方案二 + 设置页实时 `shell.probe` inline 校验。校验型输入行需扩展 declarative settings 契约（`service.ts` + `docs/external-plugin-guide.md`），收益/成本比低（保存后开终端立即可见）——YAGNI，不做。
+
+## 设计
+
+### 1. 引号感知参数解析 `splitShellArgs`（`src/pty-manager.ts`）
+
+- 空白分词；`'…'` / `"…"` 分组，组内字符**全部字面**——`\` 不是转义符（Windows 路径场景直接可用）。代价：参数值本身含引号无法表达，注释注明该取舍。
+- 未闭合引号宽容处理：剩余输入并入当前 token（不抛错——设置页输入体验优先）。
+- 空引号对 `""` 丢弃，不产生空参数。
+- `shellOverridesOf` 中 `args.split(/\s+/).filter(Boolean)` 替换为 `splitShellArgs(args)`。
+
+### 2. 路径去引号 `unquotePath`（`src/pty-manager.ts`）
+
+- 长度 ≥2 且首尾为成对 `"` 或 `'` 时剥掉，否则原样返回。
+- 统一入口：`shellOverridesOf` 与 `resolveShellExecutable` 首行均走它（单一实现防两处漂移）。
+
+### 3. POSIX 预检（泛化 `resolveShellExecutable`）
+
+- POSIX 分支：配置值含 `/` → `existsSync` 直查；裸名 → 沿 `env.PATH`（`:` 分隔，缺省回退 `/usr/bin:/bin`）逐目录探测。
+- 找不到统一抛 `SidebarError('shell-not-found', 'shell executable not found: "…"')`（新错误码；消息保持英文技术文案——模型侧 `terminal_create` 工具报错复用同一消息，模型读英文更稳）。
+- `ShellExecutableResolutionOptions` 的 `platform/env/exists` 注入口径不变，win32 逻辑不动。
+
+### 4. 友好报错（host ↔ client 线协议）
+
+- `SidebarError` 增加可选 `meta` 载荷，`shell-not-found` 时携带配置的 shell 原文。
+- WS 升级 handler catch（`src/index.ts` 终端 upgrade）识别 `error.code === 'shell-not-found'` → close reason 发机器标记 `shell-not-found:<shellDisplayName(shell)>`（受 WS close reason 123 字节上限约束，超长截断显示名）。
+- `TerminalView.tsx` `onclose` 在通用 1011 分支**之前**识别 `reason.startsWith('shell-not-found:')` → 本地化 fatal 横幅：`terminalShellNotFound`（「未找到配置的 Shell：<名>」）+ `terminalShellNotFoundHint`（「请检查 设置 → 侧边卡片 → 终端 的 Shell 路径」）。
+- locale 新 key 落点：`locales.ts`（zh + en 两块）+ `locales-ja.ts`（仓库规则强制同步），其余语言文件走既有回退链。
+
+### 5. 标题跟随
+
+- `shell.get` 路由改为 `overrides.shell ?? 启动时解析值`，`shellDisplayName` 随之；仅影响新开标签的标题，不触碰已存在 pty。
+
+## 错误流总览
+
+```
+设置页 terminalShell/Args（或 yaml config.shell/Args）
+  → shellOverridesOf：unquotePath(shell) + splitShellArgs(args)
+  → ptyManager.open / registry.create
+  → resolveShellExecutable：win32 既有探测 ∥ POSIX 新探测
+  → 找不到：SidebarError('shell-not-found', msg, meta:{shell})
+      ├─ WS 路径：catch → close(1011, 'shell-not-found:<name>') → TerminalView 本地化横幅 + 设置指引
+      └─ 工具路径：terminal_create 抛英文消息 → 模型可见，自行纠正
+```
+
+## 测试计划
+
+- `tests/pty-helpers.spec.ts`：`splitShellArgs` 语义矩阵（普通分词 / 单双引号 / 含空格路径 / 反斜杠字面 / 未闭合宽容 / 空引号丢弃 / 连续空白）；`unquotePath`（成对剥、不成对留）；POSIX 探测（fake `options.env.PATH` + `options.exists`：命中解析、绝对路径缺失抛 `shell-not-found`）；win32 既有用例保持绿。
+- `shellOverridesOf` 引号行为与 `shell.get` 跟随：就近扩展现有 spec，无宿主则新建。
+- 客户端横幅为纯展示逻辑，已有 TerminalView spec 则扩展，否则不强行 e2e。
+- 门禁：`pnpm typecheck` + `pnpm test`；不改 chunk 边界与 exclude 配置，mount e2e 不受影响。
+
+## 实施偏差记录
+
+- **报错文案合并为单 key**：设计时的 `terminalShellNotFound` + `terminalShellNotFoundHint` 两 key 合并为单个 `terminalShellNotFound`（含 `{name}` 占位符，一句话内含指引），避免跨语言的句子拼接问题。
+- **POSIX 旧契约用例被有意改写**：`tests/pty-helpers.spec.ts` 原用例 `keeps POSIX bare shell resolution delegated to execvp` 锁定「POSIX 裸名直通 execvp」，与本设计冲突，已删除并由 `POSIX: resolves bare names along PATH…` 等新用例替代。
+- **locale 落点为全部 21 词典**：设计原计划只写 zh/en/ja，实施时受 `tests/locales.spec.ts` 的「第三方词典键集必须与 zh 相等」门禁约束，`terminalShellNotFound` 实际落入 `locales.ts`（zh+en 双块）+ 19 个 `locales-*.ts`（共 21 文件 22 处），`chunks/locale.tsx` 的 `Record<CopyKey, string>` 类型检查兜底。
+- **`resolveShellExecutable` 的 JSDoc 同步**：win32 错误码从 `pty-error` 变更为 `shell-not-found` 后，函数上方文档一并更新（commit `8704994`）。
+- **本机全量测试基线**：`pnpm test` 在本机（Windows）存在 29 个**预存**环境性失败（5 个 client spec 的 jsdom `reading 'clear'` ×24、smoke 的 git 身份 ×2、git.spec 截断用例、agent-pty 的 node-pty「Signals not supported on windows」unhandled error）。经与 `origin/main` 同法全量对比确认**零新增失败**（main 30 个，feat 29 个——main 上多出的 `git-worktree` 用例为 flaky）。CI 以 CI 环境为准。
+
+## 交付
+
+- AGENTS 硬约束：`feat/*` 分支开发，commit 后 `gh pr create`，review 合并进 main；不直推。

docs/plans/2026-09-08-terminal-shell-config-hardening-plan.md

@@ -0,0 +1,645 @@
+# 终端 Shell 配置加固 实施计划
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** 设置页/yaml 配置的终端 shell 支持引号参数与带引号路径，POSIX 与 Windows 一致地预检可执行文件，配置错误时终端标签显示本地化的可操作报错，且终端标题跟随设置覆盖。
+
+**Architecture:** 全部改动在插件仓库内：`pty-manager.ts` 新增两个纯函数（`unquotePath`/`splitShellArgs`）并把 `resolveShellExecutable` 的探测泛化到 POSIX（统一抛新错误码 `shell-not-found`，`SidebarError` 加可选 `meta`）；`index.ts` 的 `shellOverridesOf` 改用新解析器、`shell.get` 返回覆盖后的有效 shell、`attachTerminal` 的 catch 把错误映射为机器可读 WS close reason `shell-not-found:<名>`；`TerminalView.tsx` 识别该前缀渲染本地化横幅（全部 21 个语言词典同步新 key）。
+
+**Tech Stack:** TypeScript（tsdown 构建，vitest 测试，无新依赖）
+
+**Spec:** `docs/plans/2026-09-08-terminal-shell-config-hardening-design.md`（本计划与其同读；偏差回填其「实施偏差记录」节）
+
+## Global Constraints
+
+- 禁止修改 DSH 源码（`~/.dsh/source/current` 零写入）。
+- 代码改动走 `feat/*` 分支 + `gh pr create`，不直推 main。
+- 不新增任何依赖；不改 `dependencies`/`peerDependencies`/`scripts`。
+- **i18n 键集相等是硬门禁**：新 key 必须同时加进 `locales.ts`（zh + en 两块）与全部 19 个第三方词典（`locales-ja/-de/-fr/-pt/-ko/-ar/-hi/-id/-tr/-vi/-th/-ru/-it/-nl/-sv/-pl/-zh-HK/-zh-TW/-zh-MO.ts`）；`chunks/locale.tsx` 的 `Record<CopyKey, string>` 类型检查 + `tests/locales.spec.ts` 双重拦截。
+- 不改 vitest `exclude`；不改 chunk 边界（不新增 core bundle 的静态 import）。
+- 测试命令一律 `pnpm exec vitest run <file>`（仓库用 vitest + tsconfig `allowImportingTsExtensions`）。
+- 每个任务以 commit 结束，conventional commits（`feat(terminal): …` / `test(terminal): …`），正文可中文。
+
+---
+
+### Task 0: 建分支 + 提交设计与计划文档
+
+**Files:**
+- Create: 分支 `feat/terminal-shell-quoted-args-probe`
+- 已存在待提交: `docs/plans/2026-09-08-terminal-shell-config-hardening-design.md`、`docs/plans/2026-09-08-terminal-shell-config-hardening-plan.md`
+
+- [ ] **Step 1: 确认工作树干净并建分支**
+
+```bash
+git status --porcelain   # 期望为空（main 已与 origin/main 同步）
+git checkout -b feat/terminal-shell-quoted-args-probe
+```
+
+- [ ] **Step 2: Commit 设计与实施计划**（文档随 feat 分支走 PR，保持 PR 自洽）
+
+```bash
+git add docs/plans/2026-09-08-terminal-shell-config-hardening-design.md docs/plans/2026-09-08-terminal-shell-config-hardening-plan.md
+git commit -m "docs(plans): 终端 shell 配置加固设计与实施计划"
+```
+
+---
+
+### Task 1: `unquotePath` + `splitShellArgs` 纯函数（TDD）
+
+**Files:**
+- Modify: `src/pty-manager.ts`（文件末尾 `shellSpawnArgs` 之后追加）
+- Test: `tests/pty-helpers.spec.ts`
+
+**Interfaces:**
+- Produces: `unquotePath(value: string): string`、`splitShellArgs(input: string): string[]`（均导出，Task 3 的 `shellOverridesOf` 消费）
+
+- [ ] **Step 1: 写失败测试** — `tests/pty-helpers.spec.ts` 顶部 import 补两个名字（第 19-25 行的现有 import 块）：
+
+```ts
+import {
+  defaultShell,
+  ensureSpawnHelper,
+  resolveShellExecutable,
+  shellDisplayName,
+  shellSpawnArgs,
+  splitShellArgs,
+  unquotePath,
+} from '../src/pty-manager.ts'
+```
+
+在 `describe('pty helpers', () => {` 内、`'restores the spawn-helper executable bit idempotently'` 用例之后追加：
+
+```ts
+  it('unquotes a paired surrounding quote from a configured shell path', () => {
+    expect(unquotePath('"C:\\Program Files\\PowerShell\\7\\pwsh.exe"'))
+      .toBe('C:\\Program Files\\PowerShell\\7\\pwsh.exe')
+    expect(unquotePath("'/usr/bin/my shell'")).toBe('/usr/bin/my shell')
+    // Unpaired or single characters stay verbatim.
+    expect(unquotePath('"mismatched')).toBe('"mismatched')
+    expect(unquotePath('pwsh.exe')).toBe('pwsh.exe')
+    expect(unquotePath('"')).toBe('"')
+    expect(unquotePath('')).toBe('')
+  })
+
+  it('splits shell args with quote-aware grouping', () => {
+    expect(splitShellArgs('-NoLogo -File "C:\\my init\\init.ps1"'))
+      .toEqual(['-NoLogo', '-File', 'C:\\my init\\init.ps1'])
+    // Single quotes group too, and preserve inner double quotes verbatim.
+    expect(splitShellArgs("-c 'echo \"hi\"'")).toEqual(['-c', 'echo "hi"'])
+    expect(splitShellArgs('  -l   ')).toEqual(['-l'])
+    expect(splitShellArgs('')).toEqual([])
+    expect(splitShellArgs('   ')).toEqual([])
+  })
+
+  it('keeps backslashes literal inside quotes and tolerates an unclosed quote', () => {
+    // Backslash is NOT an escape (Windows paths): "C:\a\" ends with a slash.
+    expect(splitShellArgs('"C:\\a\\"')).toEqual(['C:\\a\\'])
+    // An unclosed quote folds the remainder into one token instead of erroring.
+    expect(splitShellArgs('"unclosed quote')).toEqual(['unclosed quote'])
+    // Empty quote pairs produce no empty-string argument.
+    expect(splitShellArgs('"" x')).toEqual(['x'])
+  })
+```
+
+- [ ] **Step 2: 跑测试确认失败**
+
+Run: `pnpm exec vitest run tests/pty-helpers.spec.ts`
+Expected: FAIL — `splitShellArgs`/`unquotePath` 不是导出成员（`SyntaxError` 或 `undefined is not a function`）。
+
+- [ ] **Step 3: 最小实现** — `src/pty-manager.ts` 末尾（`shellSpawnArgs` 函数之后）追加：
+
+```ts
+/**
+ * Strip ONE pair of surrounding quotes from a configured shell path. Users
+ * paste Windows paths with spaces pre-quoted (`"C:\Program Files\…"`); the
+ * quotes are shell-input syntax, not part of the path. Unpaired quotes and
+ * shorter values stay verbatim.
+ */
+export function unquotePath(value: string): string {
+  if (value.length >= 2) {
+    const first = value[0]
+    const last = value[value.length - 1]
+    if ((first === '"' && last === '"') || (first === "'" && last === "'")) return value.slice(1, -1)
+  }
+  return value
+}
+
+/**
+ * Split a settings-page shell-arguments string into argv with quote-aware
+ * grouping: `'…'` / `"…"` group whitespace, and characters inside quotes are
+ * LITERAL — a backslash is never an escape, so Windows paths survive intact
+ * (`-File "C:\my init\init.ps1"` → three tokens, the last containing spaces).
+ * The price is that an argument containing a literal quote character cannot
+ * be expressed; shell startup arguments never need one. An unclosed quote
+ * folds the remainder into the current token (settings input stays
+ * forgiving); an empty quote pair yields no argument.
+ */
+export function splitShellArgs(input: string): string[] {
+  const args: string[] = []
+  let current = ''
+  let quote: '"' | "'" | null = null
+  let started = false
+  for (const ch of input) {
+    if (quote !== null) {
+      if (ch === quote) quote = null
+      else current += ch
+      continue
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch
+      started = true
+      continue
+    }
+    if (/\s/.test(ch)) {
+      if (started) {
+        args.push(current)
+        current = ''
+        started = false
+      }
+      continue
+    }
+    current += ch
+    started = true
+  }
+  if (started) args.push(current)
+  return args.filter(arg => arg !== '')
+}
+```
+
+- [ ] **Step 4: 跑测试确认通过**
+
+Run: `pnpm exec vitest run tests/pty-helpers.spec.ts`
+Expected: PASS（全部用例）。
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add src/pty-manager.ts tests/pty-helpers.spec.ts
+git commit -m "feat(terminal): 引号感知的 shell 参数解析与路径去引号纯函数"
+```
+
+---
+
+### Task 2: POSIX 预检 + `shell-not-found` 错误码（TDD）
+
+**Files:**
+- Modify: `src/wire.ts:10-36`（错误码联合 + 构造器 meta）
+- Modify: `src/pty-manager.ts:351-400`（`resolveShellExecutable` POSIX 分支）
+- Test: `tests/pty-helpers.spec.ts`
+
+**Interfaces:**
+- Consumes: Task 1 的 `unquotePath`
+- Produces: `SidebarErrorCode` 新值 `'shell-not-found'`；`SidebarError` 构造器第 4 参 `meta?: Record<string, string>`；`resolveShellExecutable` 在 POSIX 找不到时抛 `SidebarError('shell-not-found', 'shell executable not found: "<configured>"', 400, { shell: configured })`（Task 3 的 WS catch 消费）
+
+- [ ] **Step 1: 写失败测试** — `tests/pty-helpers.spec.ts` 追加（import 区补 `SidebarError`：`import { SidebarError } from '../src/wire.ts'`）：
+
+```ts
+  it('POSIX: resolves bare names along PATH and names a missing configured shell', () => {
+    const options = {
+      platform: 'linux' as const,
+      env: { PATH: '/usr/local/bin:/usr/bin' },
+      exists: (path: string) => path === join('/usr/bin', 'zsh'),
+    }
+    expect(resolveShellExecutable('zsh', options)).toBe(join('/usr/bin', 'zsh'))
+    const thrown = (() => {
+      try {
+        resolveShellExecutable('nope', options)
+        return undefined
+      } catch (error) {
+        return error
+      }
+    })()
+    expect(thrown).toBeInstanceOf(SidebarError)
+    expect((thrown as SidebarError).code).toBe('shell-not-found')
+    expect((thrown as SidebarError).message).toBe('shell executable not found: "nope"')
+    expect((thrown as SidebarError).meta?.shell).toBe('nope')
+  })
+
+  it('POSIX: checks an absolute path exists and passes it through verbatim', () => {
+    expect(resolveShellExecutable('/explicit/zsh', { platform: 'linux', env: {}, exists: () => true }))
+      .toBe('/explicit/zsh')
+    expect(() => resolveShellExecutable('/missing/zsh', { platform: 'linux', env: {}, exists: () => false }))
+      .toThrow('shell executable not found: "/missing/zsh"')
+  })
+
+  it('unquotes the configured shell before resolving (Windows probe included)', () => {
+    const options = {
+      platform: 'win32' as const,
+      env: { PATH: 'C:\\Tools' },
+      exists: (path: string) => path.replaceAll('\\', '/') === 'C:/Tools/pwsh.exe',
+    }
+    expect(resolveShellExecutable('"pwsh.exe"', options).replaceAll('\\', '/')).toBe('C:/Tools/pwsh.exe')
+  })
+```
+
+**同时改写旧契约用例**（第 115-117 行 `'keeps POSIX bare shell resolution delegated to execvp'`）——该用例锁定的正是本任务**有意变更**的行为，整段替换为上面第一个新用例即可（删除旧用例）。
+
+- [ ] **Step 2: 跑测试确认失败**
+
+Run: `pnpm exec vitest run tests/pty-helpers.spec.ts`
+Expected: FAIL — `'nope'` 原样返回而非抛错（旧 POSIX 直通行为），且 `SidebarError` 无 `meta` 属性。
+
+- [ ] **Step 3: wire.ts 加错误码与 meta** — `src/wire.ts`：
+
+```ts
+/** Machine-readable error codes of the sidebar API. */
+export type SidebarErrorCode =
+  | 'bad-request'
+  | 'not-found'
+  | 'forbidden'
+  | 'method-error'
+  | 'too-large'
+  | 'fs-error'
+  | 'git-error'
+  | 'pty-error'
+  | 'pty-deps-missing'
+  | 'shell-not-found'
+  | 'job-error'
+  | 'sidechat-error'
+  | 'subagents-unavailable'
+  | 'settings-rejected'
+  | 'settings-conflict'
+  | 'internal'
+
+/** One API failure with its wire code and HTTP status. */
+export class SidebarError extends Error {
+  constructor(
+    readonly code: SidebarErrorCode,
+    message: string,
+    readonly status = 400,
+    /** Optional structured context (e.g. `{ shell }` for shell-not-found). */
+    readonly meta?: Record<string, string>,
+  ) {
+    super(message)
+  }
+}
+```
+
+- [ ] **Step 4: pty-manager.ts 泛化探测** — `resolveShellExecutable` 整体替换为：
+
+```ts
+export function resolveShellExecutable(
+  shell: string,
+  options: ShellExecutableResolutionOptions = {},
+): string {
+  const configured = unquotePath(shell.trim())
+  const platform = options.platform ?? process.platform
+  if (configured === '') return configured
+
+  const env = options.env ?? process.env
+  const exists = options.exists ?? existsSync
+  const notFound = (): SidebarError =>
+    new SidebarError('shell-not-found', `shell executable not found: "${configured}"`, 400, { shell: configured })
+
+  if (platform === 'win32') {
+    const rawPathext = windowsEnv(env, 'PATHEXT')
+    const executableExts = (rawPathext ?? '.COM;.EXE')
+      .split(';')
+      .map(extension => extension.trim())
+      // node-pty ultimately calls CreateProcess; batch files need an
+      // intermediate cmd.exe and therefore are not valid shell executables.
+      .filter(extension => /^\.(?:com|exe)$/i.test(extension))
+    if (executableExts.length === 0) executableExts.push('.EXE', '.COM')
+
+    const hasExtension = win32Path.extname(configured) !== ''
+    const names = hasExtension
+      ? [configured]
+      : executableExts.map(extension => configured + extension.toLowerCase())
+    const hasPath = win32Path.isAbsolute(configured) || /[\\/]/.test(configured)
+    const candidates: string[] = []
+    if (hasPath) {
+      candidates.push(...names)
+    } else {
+      const path = windowsEnv(env, 'PATH')
+      if (path !== undefined) {
+        for (const dir of path.split(';').map(entry => entry.trim()).filter(Boolean)) {
+          for (const name of names) candidates.push(win32Path.join(dir, name))
+        }
+      }
+      const systemRoot = windowsEnv(env, 'SystemRoot')
+      if (systemRoot !== undefined && systemRoot.trim() !== '') {
+        for (const name of names) candidates.push(win32Path.join(systemRoot, 'System32', name))
+      }
+      if (/^pwsh(?:\.exe)?$/i.test(configured)) {
+        for (const dir of windowsPwshCandidateDirs(env)) {
+          candidates.push(win32Path.join(dir, 'pwsh.exe'))
+        }
+      }
+    }
+
+    for (const candidate of [...new Set(candidates)]) {
+      if (exists(candidate)) return candidate
+    }
+    throw notFound()
+  }
+
+  // POSIX: the previous pass-through delegated a wrong name to execvp and the
+  // pty died with a bare "[process exited with code N]". Probe like Windows:
+  // a path with a separator must exist; a bare name is searched along PATH
+  // (the colon form is fixed by the platform). A miss is a clear, actionable
+  // error instead of a cryptic exit code.
+  if (configured.includes('/')) {
+    if (!exists(configured)) throw notFound()
+    return configured
+  }
+  const path = env.PATH ?? '/usr/bin:/bin'
+  for (const dir of path.split(':').map(entry => entry.trim()).filter(Boolean)) {
+    const candidate = join(dir, configured)
+    if (exists(candidate)) return candidate
+  }
+  throw notFound()
+}
+```
+
+确认 `src/pty-manager.ts` 已有 `join`（node:path）与 `SidebarError` import（`SidebarError` 来自 `./wire.ts`——若尚无此 import 则补 `import { SidebarError } from './wire.ts'`）。
+
+- [ ] **Step 5: 跑测试确认通过**
+
+Run: `pnpm exec vitest run tests/pty-helpers.spec.ts`
+Expected: PASS。随后跑全量确认无连带破坏：`pnpm exec vitest run tests/smoke.spec.ts tests/tools.spec.ts`（POSIX 预检改变了裸名缺失时的行为——若 smoke/tools 有依赖直通的用例，按新契约修正其期望值并在 commit 正文注明）。
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add src/wire.ts src/pty-manager.ts tests/pty-helpers.spec.ts
+git commit -m "feat(terminal): POSIX 也预检 shell 可执行文件，统一 shell-not-found 错误码"
+```
+
+---
+
+### Task 3: host 接线——覆盖解析、shell.get 跟随、WS close reason（TDD）
+
+**Files:**
+- Modify: `src/index.ts:248-259`（`shellOverridesOf`）、`:562-566`（`shell.get`）、`:1306-1308`（`attachTerminal` catch）、新增导出函数 `wsCloseReasonOf`
+- Test: `tests/smoke.spec.ts:823-881`（fake settings）+ 新用例
+
+**Interfaces:**
+- Consumes: Task 1 `unquotePath`/`splitShellArgs`；Task 2 `SidebarError.meta` + `'shell-not-found'`
+- Produces: `shellOverridesOf` 返回 `{ shell?: string; shellArgs?: string[] }`（引号已处理）；`wsCloseReasonOf(error: unknown): string`（导出，`shell-not-found` → `shell-not-found:<displayName≤100字符>`，其余 → message/String）；WS close reason 线协议前缀 `shell-not-found:`（Task 4 客户端镜像）
+
+- [ ] **Step 1: 写失败测试** — `tests/smoke.spec.ts`：
+
+(a) fake settings 的 `register` 保留预置值（第 837-840 行）——替换为：
+
+```ts
+      register(ns: string, schema: unknown) {
+        // Preserve a pre-seeded value: tests stage prefs through the `pre`
+        // map before the plugin mounts and registers the same namespace.
+        const existing = namespaces.get(ns)
+        namespaces.set(ns, { schema, value: existing?.value ?? undefined, revision: 0 })
+        return { get: () => ({}), watch: () => () => {}, update: async () => {}, replace: async () => {} }
+      },
+```
+
+(b) `'side card settings routes'` describe 内追加（`invoke`/`mountWithSettings` 复用）：
+
+```ts
+  it('shell.get reflects the settings-page override with the quotes stripped', async () => {
+    const route = mountWithSettings(createFakeSettings({
+      'dsh-better-sidebar': {
+        terminalShell: '"C:\\Program Files\\PowerShell\\7\\pwsh.exe"',
+        terminalShellArgs: '-NoLogo',
+      },
+    }))
+    const result = await invoke(route, 'shell.get', {})
+    expect(result.ok).toBe(true)
+    expect(result.value).toMatchObject({
+      shell: 'C:\\Program Files\\PowerShell\\7\\pwsh.exe',
+      name: 'pwsh',
+    })
+  })
+
+  it('maps a shell-not-found failure to the machine-readable close reason', async () => {
+    expect(wsCloseReasonOf(new SidebarError(
+      'shell-not-found',
+      'shell executable not found: "C:\\Program Files\\PowerShell\\7\\pwsh.exe"',
+      400,
+      { shell: 'C:\\Program Files\\PowerShell\\7\\pwsh.exe' },
+    ))).toBe('shell-not-found:pwsh')
+    expect(wsCloseReasonOf(new Error('boom'))).toBe('boom')
+    expect(wsCloseReasonOf('plain')).toBe('plain')
+  })
+```
+
+import 区补：`wsCloseReasonOf` 取自 `'../src/index.ts'`（该文件已 import `apply`——并入同一 import 语句），`SidebarError` 取自 `'../src/wire.ts'`。
+
+- [ ] **Step 2: 跑测试确认失败**
+
+Run: `pnpm exec vitest run tests/smoke.spec.ts`
+Expected: FAIL — `shell.get` 返回启动时 shell 而非覆盖值；`wsCloseReasonOf` 未导出。
+
+- [ ] **Step 3: 实现 index.ts 三处**
+
+(a) `shellOverridesOf`（第 248-259 行）——解析走新函数：
+
+```ts
+function shellOverridesOf(getSettings: () => SidebarSettingsFace | undefined): { shell?: string; shellArgs?: string[] } {
+  const settings = getSettings()
+  const value = settings?.get().value
+  if (value === null || typeof value !== 'object') return {}
+  const record = value as Record<string, unknown>
+  const shell = typeof record.terminalShell === 'string' ? unquotePath(record.terminalShell.trim()) : ''
+  const args = typeof record.terminalShellArgs === 'string' ? record.terminalShellArgs.trim() : ''
+  return {
+    shell: shell === '' ? undefined : shell,
+    shellArgs: args === '' ? undefined : splitShellArgs(args),
+  }
+}
+```
+
+（`unquotePath`/`splitShellArgs` 并入第 48 行现存的 `'./pty-manager.ts'` import。）
+
+(b) `shell.get`（第 562-566 行）——注释与返回值更新：
+
+```ts
+    // The effective terminal shell and its display name: the settings-page
+    // override when set (quotes stripped), else the boot-time resolution.
+    // The client titles terminal tabs with the name, so a changed setting is
+    // visible on the next opened tab without a plugin restart.
+    'shell.get': () => {
+      const effective = shellOverridesOf(getSettings).shell ?? terminalShell
+      return { shell: effective, name: shellDisplayName(effective) }
+    },
+```
+
+(c) `attachTerminal` 的 catch（第 1306-1308 行）改用映射函数，并在 `attachTerminal` 上方新增导出：
+
+```ts
+/**
+ * The WS close reason for a failed terminal attach. A missing configured
+ * shell gets a SHORT machine-readable marker (`shell-not-found:<name>`,
+ * capped — a WS close reason allows at most 123 bytes) that the client maps
+ * to a localized, actionable banner; every other failure keeps the raw
+ * message (the model-side tool errors read it verbatim).
+ */
+export function wsCloseReasonOf(error: unknown): string {
+  if (error instanceof SidebarError && error.code === 'shell-not-found') {
+    const name = shellDisplayName(String(error.meta?.shell ?? '')).slice(0, 100)
+    return `shell-not-found:${name}`
+  }
+  return error instanceof Error ? error.message : String(error)
+}
+```
+
+catch 体改为：
+
+```ts
+  } catch (error) {
+    ws.close(1011, wsCloseReasonOf(error))
+  }
+```
+
+- [ ] **Step 4: 跑测试确认通过**
+
+Run: `pnpm exec vitest run tests/smoke.spec.ts`
+Expected: PASS（含既有 `'serves the effective terminal shell and its display name'`——无设置时行为不变）。
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add src/index.ts tests/smoke.spec.ts
+git commit -m "feat(terminal): shell 覆盖去引号进解析、标题跟随覆盖、close reason 机器标记"
+```
+
+---
+
+### Task 4: 客户端本地化横幅 + 全语言词典（typecheck 守门）
+
+**Files:**
+- Modify: `src/client/TerminalView.tsx:62`（镜像常量）、`:224-250`（onclose 分支）
+- Modify: `src/client/locales.ts`（zh 块 `:120` 后、en 块 `:569` 后各 1 key）
+- Modify: 19 个第三方词典各 1 key：`locales-ja.ts:108`、`locales-de.ts`、`-fr`、`-pt`、`-ko`、`-ar`、`-hi`、`-id`、`-tr`、`-vi`、`-th`、`-ru`、`-it`、`-nl`、`-sv`、`-pl`、`-zh-HK`、`-zh-TW`、`-zh-MO`（均插在各自 `terminalDepsProfile` 行后）
+
+**Interfaces:**
+- Consumes: Task 3 的线协议前缀 `shell-not-found:`
+- Produces: locale key `terminalShellNotFound`（占位符 `{name}`）；`TerminalView` 的 fatal 横幅文本
+
+- [ ] **Step 1: TerminalView 识别前缀** — `src/client/TerminalView.tsx` 第 62 行 `PTY_DEPS_MISSING` 常量后追加：
+
+```ts
+/**
+ * The WS close-reason prefix the host sends when the CONFIGURED shell was
+ * not found (mirror of src/index.ts wsCloseReasonOf; wire contract, keep the
+ * literal in lockstep). The view renders a localized, actionable banner.
+ */
+const SHELL_NOT_FOUND_PREFIX = 'shell-not-found:'
+```
+
+`socket.onclose`（第 224 行起）在 `PTY_DEPS_MISSING` 分支之后、通用 1011 分支（第 247 行）之前插入：
+
+```ts
+        // The configured shell could not be found (settings page or yaml):
+        // a localized banner beats the raw English close reason.
+        if (event.code === 1011 && event.reason.startsWith(SHELL_NOT_FOUND_PREFIX)) {
+          setFatal(t('terminalShellNotFound', { name: event.reason.slice(SHELL_NOT_FOUND_PREFIX.length) || '?' }))
+          return
+        }
+```
+
+- [ ] **Step 2: 加全语言 key**（21 个词典文件，各在 `terminalDepsProfile` 行后插 1 行；键集由 `chunks/locale.tsx` 的 `Record<CopyKey, string>` 与 `tests/locales.spec.ts` 双重把关，漏一个文件 typecheck 即红）：
+
+```ts
+// locales.ts zh 块：
+  terminalShellNotFound: '未找到配置的 Shell：{name}，请到 设置 → 侧边卡片 → 终端 检查 Shell 路径',
+// locales.ts en 块：
+  terminalShellNotFound: 'Configured shell not found: {name} — check the shell path under Settings → Side card → Terminal',
+// locales-ja.ts:
+  terminalShellNotFound: '設定されたシェルが見つかりません：{name}（設定 → サイドカード → ターミナル のシェルパスを確認してください）',
+// locales-de.ts:
+  terminalShellNotFound: 'Konfigurierte Shell nicht gefunden: {name} — Shell-Pfad unter Einstellungen → Side card → Terminal prüfen',
+// locales-fr.ts:
+  terminalShellNotFound: 'Shell configuré introuvable : {name} — vérifiez le chemin du shell dans Réglages → Side card → Terminal',
+// locales-pt.ts:
+  terminalShellNotFound: 'Shell configurado não encontrado: {name} — verifique o caminho do shell em Configurações → Side card → Terminal',
+// locales-ko.ts:
+  terminalShellNotFound: '설정된 셸을 찾을 수 없습니다: {name} — 설정 → 사이드 카드 → 터미널에서 셸 경로를 확인하세요',
+// locales-ar.ts:
+  terminalShellNotFound: 'لم يتم العثور على الصدفة المُعدَّة: {name} — تحقق من مسار الصدفة في الإعدادات → Side card → Terminal',
+// locales-hi.ts:
+  terminalShellNotFound: 'कॉन्फ़िगर किया गया shell नहीं मिला: {name} — Settings → Side card → Terminal में shell पथ जाँचें',
+// locales-id.ts:
+  terminalShellNotFound: 'Shell yang dikonfigurasi tidak ditemukan: {name} — periksa path shell di Pengaturan → Side card → Terminal',
+// locales-tr.ts:
+  terminalShellNotFound: 'Yapılandırılan kabuk bulunamadı: {name} — Ayarlar → Side card → Terminal altındaki kabuk yolunu denetleyin',
+// locales-vi.ts:
+  terminalShellNotFound: 'Không tìm thấy shell đã cấu hình: {name} — kiểm tra đường dẫn shell trong Cài đặt → Side card → Terminal',
+// locales-th.ts:
+  terminalShellNotFound: 'ไม่พบ shell ที่กำหนดไว้: {name} — ตรวจสอบพาธ shell ใน การตั้งค่า → Side card → Terminal',
+// locales-ru.ts:
+  terminalShellNotFound: 'Настроенная оболочка не найдена: {name} — проверьте путь к оболочке в Настройки → Side card → Terminal',
+// locales-it.ts:
+  terminalShellNotFound: 'Shell configurata non trovata: {name} — verifica il percorso della shell in Impostazioni → Side card → Terminal',
+// locales-nl.ts:
+  terminalShellNotFound: 'Geconfigureerde shell niet gevonden: {name} — controleer het shell-pad onder Instellingen → Side card → Terminal',
+// locales-sv.ts:
+  terminalShellNotFound: 'Konfigurerat skal hittades inte: {name} — kontrollera skalsökvägen under Inställningar → Side card → Terminal',
+// locales-pl.ts:
+  terminalShellNotFound: 'Nie znaleziono skonfigurowanej powłoki: {name} — sprawdź ścieżkę powłoki w Ustawienia → Side card → Terminal',
+// locales-zh-HK.ts:
+  terminalShellNotFound: '未找到配置的 Shell：{name}，請到 設定 → 側邊卡片 → 終端 檢查 Shell 路徑',
+// locales-zh-TW.ts:
+  terminalShellNotFound: '未找到配置的 Shell：{name}，請到 設定 → 側邊卡片 → 終端 檢查 Shell 路徑',
+// locales-zh-MO.ts:
+  terminalShellNotFound: '未找到配置的 Shell：{name}，請到 設定 → 側邊卡片 → 終端 檢查 Shell 路徑',
+```
+
+- [ ] **Step 3: typecheck 守门**
+
+Run: `pnpm typecheck`
+Expected: PASS —— 若漏改任何一个第三方词典，`chunks/locale.tsx` 的 `checked(dict: Record<CopyKey, string>)` 直接编译失败。
+
+- [ ] **Step 4: 跑 locale 契约测试**
+
+Run: `pnpm exec vitest run tests/locales.spec.ts`
+Expected: PASS（含 `keeps every shipped third-language dictionary key-set-equal to zh`）。
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add src/client/TerminalView.tsx src/client/locales.ts src/client/locales-*.ts
+git commit -m "feat(terminal): 配置 shell 未找到时显示本地化可操作横幅（全语言）"
+```
+
+---
+
+### Task 5: 全量门禁 + 设计文档偏差回填 + PR
+
+**Files:**
+- Modify: `docs/plans/2026-09-08-terminal-shell-config-hardening-design.md`（「实施偏差记录」节回填）
+
+- [ ] **Step 1: 全量门禁**
+
+Run: `pnpm typecheck && pnpm test`
+Expected: PASS。若 `tests/tools.spec.ts` / e2e 有依赖旧 POSIX 直通行为的用例失败，按新契约修期望值并单独 commit（`test(terminal): 跟随 POSIX 预检新契约`）。
+
+- [ ] **Step 2: 文档核对与偏差回填**
+
+Run: `rg -n "terminalShell|shellArgs" docs/ README.md`
+Expected: 仅设计/计划文档命中（`docs/external-plugin-guide.md` 不记载设置页 shell 行，无需同步；若出现命中则按 AGENTS §5 同步该文档）。回填设计文档「实施偏差记录」：① `terminalShellNotFoundHint` 并入单 key `terminalShellNotFound`（含 `{name}` 占位）；② 旧用例 `keeps POSIX bare shell resolution delegated to execvp` 被有意改写；③ 新增 locale 键实际落点为全部 21 词典（不止 zh/en/ja）。Commit：
+
+```bash
+git add docs/plans/2026-09-08-terminal-shell-config-hardening-design.md
+git commit -m "docs(plans): 回填终端 shell 配置加固实施偏差"
+```
+
+- [ ] **Step 3: 推送并建 PR**
+
+```bash
+git push -u origin feat/terminal-shell-quoted-args-probe
+gh pr create --title "feat(terminal): 终端 shell 配置加固——引号解析、POSIX 预检、本地化报错" --body-file - <<'EOF'
+## 概要
+配置启动终端命令的功能已存在（#95/#125），本 PR 加固三处缺口：
+1. 设置页 shell 参数支持引号分组（`-File "C:\my init\init.ps1"` 正确成 3 个 argv）；shell 路径自动剥成对引号
+2. POSIX 预检可执行文件（对齐 Windows 既有探测），统一 `shell-not-found` 错误码
+3. 配置错误时终端标签渲染本地化可操作横幅（21 语言），终端标题跟随设置覆盖
+
+## 测试
+- `tests/pty-helpers.spec.ts`：splitShellArgs/unquotePath 语义矩阵 + POSIX 探测
+- `tests/smoke.spec.ts`：shell.get 覆盖跟随 + wsCloseReasonOf 映射
+- `pnpm typecheck` + `pnpm test` 全绿
+EOF
+```
+
+Expected: PR URL 返回。
+
+- [ ] **Step 4: 汇报** — 向用户回报 PR 链接、改动文件清单、行为对照（改前/改后）。

docs/plans/2026-09-09-dsh-0.1.5-alpha.2-adaptation.md

@@ -0,0 +1,80 @@
+# DSH 0.1.5-alpha.2 适配（v0.19.0-alpha.1 基线）
+
+日期：2026-09-09　分支：`feat/dsh-0.1.5-alpha.2`
+
+## 背景
+
+DSH `dsh-v0.1.5-alpha.1..dsh-v0.1.5-alpha.2` 的宿主契约里有一批会实际波及本插件的变更。本计划记录哪些值得处理、哪些只做兼容、以及每一处的子系统级落点。插件对外的全部行为差异以 [docs/external-plugin-guide.md](../external-plugin-guide.md) 为准；仓库级适配要点（基线、CI 钉版、宿主契约）同步到 [AGENTS.md](../AGENTS.md) §3。
+
+## 上游 delta（alpha.1 → alpha.2，影响本插件的六项）
+
+| # | 上游变更 | 对插件的影响 |
+|---|---|---|
+| 1 | `SidebarRightGuideEntry` 去掉 `description` 字段；指南条目变为「图标 + 标题」胶囊 | 删除 `TabDescriptor.description` 与 6 个 `guideDesc*` 词典键（连同 `nativeGuideDesc` 兜底句——不再有第二行说明） |
+| 2 | 新增**全局面板**：根级 keyed `main` 槽（预留 key `conversation`，由 ui-conversation 注册为 `main.conversation`）、根级 `sidebar.panellist` 列表槽（`SidebarPanelMetadata` / `SidebarPanelIconOwnerProps`）、`ctx.layout.selectPanel(MainPanelId|null)` / `beginNavigation()` / `dispose()`、全局标准 prop `usePanelInfo`；`rightbar` 改根级并新增会话级 `rightbar.session` 子槽 | 插件**不接入**（兼容 only） |
+| 3 | 原生 tab 体宿主 `.paneBody`（`dsh-client-ui-dockkit`）是**有确定高度的块级滚动容器**，不是 flex 容器；DSH 自己的 tab 体（`ui-sidebar-documentpreview` 的文档预览、`ui-sidebar-files` 的 FilesBody）在根上声明 `height: 100%` | 原生适配层给每个 tab 体包一层 `height: 100%` 的列 flex 宿主（`sidebar.module.css` `.nativeTabHost`，带 `data-dsh-native-tab-host`），修复 sidechat 输入框贴不到面板底的根塌陷 |
+| 4 | 文件地址语法：`fileAddressFor` 一律返回 session 作用域地址（绝对路径保留前导 `/`）；`parseFileAddress` 前缀解析并去 `?`/`#`；`absoluteFileAddress` 仍在 | 镜像 alpha.2 语法（插件自实现于 `src/client/resource-address.ts`——客户端 bundle 纯度门禁禁 value-import 未列名的 `@deepseek-ai/*`，不能直接引 DSH 工具包） |
+| 5 | `ui-sidebar-textpreview` 被 `ui-sidebar-documentpreview` 取代（同 `text` kind、`fallback` 带、`dsh-resource://file/**` 模式） | 插件 `editor` 仍以 `extension` 优先级认领 `dsh-resource://file/**`，压过其 `text` 的 `fallback` 带 |
+| 6 | 基线升到 0.1.5-alpha.2（peer 下限 / manifest / CI 钉版） | 插件基线 = alpha.2 only；alpha.1 用户留在 v0.19.0-alpha.0 |
+
+## 决策
+
+- **基线 = alpha.2 only**：peer 下限 `^0.1.5-alpha.2`、manifest `>=0.1.5-alpha.2`、CI 钉 `@deepseek-ai/dsh@0.1.5-alpha.2`；不再对 alpha.1 做运行时兼容。
+- **全局面板：兼容 only，不接入**——不迁移到 `main` 槽 / `sidebar.panellist` / `ctx.layout` / `usePanelInfo` / 根级 `rightbar`，仅保证在 alpha.2 宿主上不破坏。
+- **删除 `TabDescriptor.description`**：宿主不再渲染第二行，字段留着只会在类型上撒谎；同步删 6 个 `guideDesc*` 与 `nativeGuideDesc` 兜底句。
+- **修复 tab 体填充**：native 适配层为每个 tab 体（含 orphaned 回退）包 `height:100%` 列 flex 宿主 `.nativeTabHost`；tab 组件根遵循 `flex:1` / `height:100%` + `min-height:0` 契约。
+- **镜像 alpha.2 地址语法**：`fileAddressFor` 不再产生 `absolute` 作用域（但仍解析旧地址与第三方地址），`parseFileAddress` 前缀解析并去 `?`/`#`。
+- **中心列锚点跟随 alpha.2**：`center-column.ts` 的 `CENTER_COLUMN_SELECTOR` 改为 `#root [data-slot="main.conversation"], #root [data-slot="conversation"]`，`resolveCenterColumn` 从对话槽宿主向上跳过 `display: contents` 祖先取真实列；alpha.1 的 `[data-slot="conversation"]` 依旧认可。
+
+## 改动清单（子系统级）
+
+| 子系统 | 文件 | 变更 |
+|---|---|---|
+| 基线 | `package.json` | 版本 → `0.19.0-alpha.1`；dsh-* peer 全部 `^0.1.5-alpha.2`；devDeps 同步钉 `0.1.5-alpha.2` |
+| 基线 | `pnpm-lock.yaml` | 锁文件对齐 alpha.2 |
+| 基线 | `dsh.plugin.json` | `version` → `0.19.0-alpha.1`；`engines.dsh` → `>=0.1.5-alpha.2` |
+| 基线 | `.github/workflows/ci.yml` | mount lane 钉 `@deepseek-ai/dsh@0.1.5-alpha.2` |
+| 基线 | `package.json` | 按 §3-9 补提 `dsh-session-persistence`（`pnpm peers check` 唯一新失配项） |
+| 基线 | `package.json` | **上游打包缺陷**：`@deepseek-ai/dsh-client-ui-primitives@0.1.5-alpha.2` 的 manifest 不再声明任何 `dependencies`（alpha.1 声明了 19 个），但其 `lib/*.js` 仍裸 import `anser` / `shiki` / `@shikijs/langs/*` / `mdast-util-*` / `micromark-*` / `katex`。宿主自身由预构建前端 bundle 满足，独立安装的消费方（本仓库的 dev/test 树）必须自备，故把 alpha.1 声明的同一组版本提升进 devDependencies（`@shikijs/langs`、`@types/mdast`、`anser`、`katex`、`mdast-util-from-markdown/gfm/math`、`micromark-core-commonmark/extension-gfm/extension-math/factory-space/util-character/util-classify-character/util-sanitize-uri/util-symbol/util-types`、`shiki`；`clsx` 已在 dependencies） |
+| 基线/文档 | `AGENTS.md` | §2/§3 基线戳、§10 补 alpha.2 行为差异（本 workstream 回填） |
+| Tab 契约 | `src/client/service.ts` | `TabDescriptor` 删除 `description` 字段；`SIDEBAR_SERVICE_VERSION` → `0.19.0-alpha.1` |
+| Tab 契约 | `src/client/builtins/tabs.tsx` | 6 个内置 tab 删除 `description` 行 |
+| Tab 契约 | `src/client/native/index.ts` | native 注册的 guide 条目去掉 `description`（删 `descriptionOf` 与通用兜底）；`guide` 条目只剩 `order`/`title`/`icon` |
+| 词典 | `src/client/locales.ts` + 各 `locales-*.ts` | 删除 `nativeGuideDesc` + 6 个 `guideDesc*` 词条（zh/en + 全部第三方语言） |
+| Tab 高度 | `src/client/native/tab-adapter.tsx` | `NativeTabBody` 把 live 组件与 orphaned 回退都包进 `css.nativeTabHost`（带 `data-dsh-native-tab-host`） |
+| Tab 高度 | `src/client/sidebar.module.css` | 新增 `.nativeTabHost`（`display:flex; flex-direction:column; height:100%; min-height:0`） |
+| 地址语法 | `src/client/resource-address.ts` | 重写为镜像 alpha.2 文件地址语法（`fileAddressFor` 不再产 `absolute` 作用域、`parseFileAddress` 前缀去 `?`/`#`、保留 `absolute` 解析） |
+| 中心列锚点 | `src/client/center-column.ts` | `CENTER_COLUMN_SELECTOR` 加 `main.conversation`；新增 `columnOfSlotHost` 跳过 `display: contents` 祖先 |
+| 中心列锚点 | `src/client/sidebar/use-center-column.ts` | 宿主查找逻辑对齐 alpha.2 |
+| 中心列锚点 | `src/client/layout.css` | 选择器/注释同步 `main.conversation` 与 `display: contents` 跳过 |
+| 测试 | `tests/builtins.spec.ts` | 指南断言从 `description` 改成 `title`（图标+标题胶囊） |
+| 测试 | `tests/native-surface.spec.ts` | 注册/guide 断言去 `description`；断言 guide 条目不再携带 `description` |
+| 测试 | `tests/center-column-locator.spec.ts` | 覆盖 `main.conversation` 解析与 `display: contents` 跳过 |
+| 测试 | `tests/resource-address.spec.ts` | 覆盖 alpha.2 地址语法 |
+| 测试 | `tests/e2e/mount.e2e.ts` | guide 页断言跟随胶囊形态；新增 tab 体填充断言（可见 tab 的 `[data-dsh-native-tab-host]` 盒高 == 其带盒祖先高 ±2px，且 sidechat composer 底边距面板底 ≤12px） |
+| 文档 | `docs/external-plugin-guide.md` | §0 行为差异表、§4.1 删 `description`、§10 加 tab 体高度契约、§12 中心列锚点、`ui-sidebar-documentpreview` |
+| 文档 | `docs/plans/2026-09-09-dsh-0.1.5-alpha.2-adaptation.md` | 本计划 |
+
+## 已知差距
+
+- **side-chat 线程仍只携带 `subagent/descriptor`，不携带 alpha.2 的 `subagent/catalog`**：DSH 自己的直接子代理发现现在优先读 `catalog`，而我们沿用的 `subagents.listDescendants`（`src/subagent-live-route.ts`）与转录种子的 `type: 'subagent/descriptor'`（`src/sidechat-routes.ts`）路径不变。catalog 只作为新增读面出现，不构成对现有路径的破坏，本期不跟进。
+
+## 验证
+
+- **门禁**（本分支 HEAD）：`pnpm typecheck` / `pnpm lint` / `pnpm check:consumer-types` 全绿；`pnpm vitest run --exclude '**/*.e2e.ts'` = 124 files / 1295 passed / 9 skipped；`pnpm peers check` = No peer dependency issues found。
+- **真机挂载冒烟**（`DSH_CMD` 指向 npm 安装的 DSH 0.1.5-alpha.2，`scripts/e2e-mount.sh`）：7 passed。新增的 tab 体填充断言（可见 tab 的 `[data-dsh-native-tab-host]` 盒高 == 其带盒祖先 ±2px，sidechat composer 底边距面板底 ≤12px）是这次修复的回归守护——它在修复前失败（`gap -862px`，因为断言最初漏跳过 `display: contents` 槽宿主）。
+- **真机 3080（web profile 升到 alpha.2 + 插件 0.19.0-alpha.1）**：
+  - 原生 guide 六行均为 48px「图标+标题」胶囊，无第二行：文件 / 文件变动 / 任务管理 / 侧边对话(beta) / 终端 / 浏览器。
+  - 文件树点击 `AGENTS.md` → tab 标题 `AGENTS.md` + CodeMirror 挂载（`editor` 接管成立）。
+  - **sidechat 输入框贴底**：原生右侧栏 `hostHeight 962 == paneBodyHeight 962`（fillGap 0），composer 底边距面板底 8px（即它自己的 margin）；底部工作台同样 8px。
+  - 底部工作台中心列锚点：`[data-dsh-bottom-panel]` 与 `[data-dsh-center-col]` 左右边完全重合（gap 0）——证明 `main.conversation` + 跳过 `display: contents` 的解析在真机成立；真机 `[data-slot]` 清单同时确认 `main` / `main.conversation` / `rightbar.session` 已存在、旧 `conversation` 槽已消失。
+  - `pageerror` 0 条；控制台仅 `POST /api/dsh-worktree/attach` 500（第三方 dsh-tauri-worktree 插件，与本次改动无关）。
+  - 未覆盖：**聊天里的文件链接点击**——当前可见会话没有可解析的文件提及（内联 `code` 是纯文本，不是链接），该漏斗（`ctx.sidebarRight.openResource(fileAddressFor(...))`）由挂载车道与 `tests/resource-address.spec.ts` 覆盖，本实例未实测。
+- 仓库没有守护指南文档章节的测试；`tests/builtins.spec.ts` / `tests/native-surface.spec.ts` 守护的是 guide 行形态而非文档文本。
+- 早期本分支相关测试曾整体收集失败：`@deepseek-ai/dsh-client-ui-primitives@0.1.5-alpha.2` 在模块加载时裸 `import 'anser'`，而该包 manifest 已不再声明依赖。补齐 devDependencies 后恢复（见改动清单）。
+
+## 不做
+
+- 不接入 alpha.2 全局面板（`main` 槽 / `sidebar.panellist` / `ctx.layout` / `usePanelInfo` / 根级 `rightbar`）。
+- 不引入 `subagent/catalog` 读取面。
+- 不改 DSH 源码（仓库硬约束 §1）。

dsh.plugin.json

@@ -1,10 +1,10 @@
 {
   "id": "dsh-external/dsh-better-sidebar",
-  "version": "0.18.0-alpha.0",
+  "version": "0.19.0-alpha.1",
   "main": "./lib/index.js",
   "description": "VSCode 风格右侧侧边栏：文件资源管理器 / 编辑器 / 终端 / Git / 浏览器，按会话隔离。暴露服务供其他插件注册侧边栏页面和文件预览器",
   "engines": {
-    "dsh": ">=0.1.2-alpha.2"
+    "dsh": ">=0.1.5-alpha.2"
   },
   "contributes": {
     "tools": [],

eslint.config.js

@@ -0,0 +1,88 @@
+// ESLint flat config（最小规则集）：
+// - 基础：@eslint/js recommended + typescript-eslint recommended（非 type-checked 档，
+//   全量 type-checked 需要项目服务且更慢，当前收益不足以引入）；
+// - react-hooks recommended：client 侧是 React 重镇，依赖数组豁免注释
+//   （react-hooks/exhaustive-deps）由此规则消费；
+// - globals 按运行域分治：client bundle → browser，host/脚本 → node，tests → 混合。
+import js from '@eslint/js'
+import globals from 'globals'
+import reactHooks from 'eslint-plugin-react-hooks'
+import tseslint from 'typescript-eslint'
+
+export default tseslint.config(
+  // 构建产物 / 工具目录不参与 lint（node_modules 与点开头目录默认也不进）。
+  {
+    ignores: [
+      'lib/',
+      'dist/',
+      'coverage/',
+      'registry/',
+      'playwright-report/',
+      'test-results/',
+      'node_modules/',
+      '.worktrees/',
+    ],
+  },
+
+  js.configs.recommended,
+  tseslint.configs.recommended,
+  reactHooks.configs.flat.recommended,
+
+  // react-hooks v7 的 recommended 捆绑了 React Compiler 语义规则（purity /
+  // immutability / refs / set-state-in-effect 等）：本仓库对 CodeMirror / xterm
+  // 等命令式集成大量依赖 render 期读 ref、effect 内同步 setState 的既有模式，
+  // 57 处存量报错均为噪音级误报，先整体关闭该档，只保留经典双规则
+  // （rules-of-hooks / exhaustive-deps——后者消费代码里带理由的豁免注释）。
+  {
+    rules: Object.fromEntries(
+      [
+        'config',
+        'error-boundaries',
+        'gating',
+        'globals',
+        'immutability',
+        'incompatible-library',
+        'preserve-manual-memoization',
+        'purity',
+        'refs',
+        'set-state-in-effect',
+        'static-components',
+        'unsupported-syntax',
+        'use-memo',
+      ].map(rule => [`react-hooks/${rule}`, 'off']),
+    ),
+  },
+
+  // 孤儿 eslint-disable 注释（规则未实际触发）直接报错，防止豁免残留。
+  { linterOptions: { reportUnusedDisableDirectives: 'error' } },
+
+  // no-unused-vars 对齐仓库既有约定：下划线前缀 = 刻意不用的占位（mock 桩等）。
+  {
+    rules: {
+      '@typescript-eslint/no-unused-vars': ['error', {
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+        caughtErrorsIgnorePattern: '^_',
+      }],
+    },
+  },
+
+  // client bundle 运行在浏览器（portal 侧边栏 / 各视图 / 拦截层）。
+  {
+    files: ['src/client/**/*.{js,mjs,cjs,ts,tsx,jsx}'],
+    languageOptions: { globals: globals.browser },
+  },
+
+  // host 侧插件入口与构建/运维脚本跑在 Node。eslint.config.js 自身不 ignore：
+  // 它就是一个普通 ESM 脚本，走 js recommended + node globals 正常通过。
+  {
+    files: ['src/*.{js,mjs,cjs,ts}', 'scripts/**/*.{js,mjs,cjs,ts}', '*.config.ts', 'eslint.config.js'],
+    languageOptions: { globals: globals.node },
+  },
+
+  // tests：Node 里跑（vitest / fs fixtures），jsdom 组件测试又摸浏览器全局。
+  {
+    files: ['tests/**/*.{js,mjs,cjs,ts,tsx,jsx}'],
+    languageOptions: { globals: { ...globals.node, ...globals.browser } },
+  },
+)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-sidebar",
-  "version": "0.18.0-alpha.0",
+  "version": "0.19.0-alpha.1",
   "description": "DSH web plugin: a VSCode-like right sidebar (explorer / editor / terminal / git / browser), isolated per conversation session. Exposes a service for other plugins to register sidebar tabs and file viewers.",
   "type": "module",
   "repository": {
@@ -39,6 +39,7 @@
   "engines": {
     "node": ">=20"
   },
+  "packageManager": "pnpm@11.8.0",
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -48,6 +49,7 @@
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-sidebar-right",
         "@deepseek-ai/dsh-client-modules"
       ],
       "platform": "web"
@@ -79,24 +81,28 @@
     "prepare": "tsdown",
     "test": "vitest run",
     "test:mount": "bash scripts/e2e-mount.sh",
-    "check:consumer-types": "bash scripts/check-consumer-types.sh"
+    "test:mount:aggregate": "bash scripts/e2e-aggregate-mount.sh",
+    "clean": "node -e \"require('node:fs').rmSync('lib',{recursive:true,force:true})\"",
+    "check:consumer-types": "bash scripts/check-consumer-types.sh",
+    "lint": "eslint ."
   },
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-locale": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-llm": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-session": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-subagent": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-tools": "^0.1.2-alpha.2",
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-agent": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-sidebar-right": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-subagent": "^0.1.5-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.1.5-alpha.2",
     "@huanlin/dsh-plugin-better-locale": "^0.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
@@ -104,6 +110,9 @@
   "peerDependenciesMeta": {
     "@huanlin/dsh-plugin-better-locale": {
       "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-sidebar-right": {
+      "optional": true
     }
   },
   "dependencies": {
@@ -140,35 +149,67 @@
   },
   "devDependencies": {
     "@cordisjs/plugin-loader": "^1.0.0-rc.5",
-    "@deepseek-ai/dsh-agent": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-locale": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-host-webserver": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-invariants": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-llm": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-session": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-settings": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-subagent": "0.1.2-alpha.2",
-    "@deepseek-ai/dsh-tools": "0.1.2-alpha.2",
+    "@deepseek-ai/dsh-agent": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-agent-loop": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-attachment": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-sidebar-right": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-code-runtime": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-invariants": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-scope": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-session": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-session-persistence": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-session-projection": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-settings": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-subagent": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-tools": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-user-approval": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-util-time": "0.1.5-alpha.2",
     "@huanlin/dsh-plugin-better-locale": "^0.1.0",
     "@playwright/test": "^1.62.1",
+    "@shikijs/langs": "^4.3.1",
+    "@types/mdast": "^4.0.4",
     "@types/node": "^24.0.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "~18.3.1",
     "@types/ws": "^8.5.10",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/xterm": "^5.5.0",
+    "anser": "^2.3.5",
     "cordis": "^4.0.0-rc.8",
     "jsdom": "^29.1.1",
+    "katex": "^0.16.47",
     "lightningcss": "^1.32.0",
+    "mdast-util-from-markdown": "^2.0.3",
+    "mdast-util-gfm": "^3.1.0",
+    "mdast-util-math": "^3.0.0",
+    "micromark-core-commonmark": "^2.0.3",
+    "micromark-extension-gfm": "^3.0.0",
+    "micromark-extension-math": "^3.1.0",
+    "micromark-factory-space": "^2.0.1",
+    "micromark-util-character": "^2.1.1",
+    "micromark-util-classify-character": "^2.0.1",
+    "micromark-util-sanitize-uri": "^2.0.1",
+    "micromark-util-symbol": "^2.0.1",
+    "micromark-util-types": "^2.0.2",
+    "shiki": "^4.3.1",
     "react": "^18.2.0",
     "react-dom": "18.2.0",
     "tsdown": "^0.22.2",
     "typescript": "^5.6.0",
     "unrun": "^0.2.39",
-    "vitest": "^4.1.8"
+    "vitest": "^4.1.8",
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.9.1",
+    "eslint-plugin-react-hooks": "^7.1.1",
+    "globals": "^17.12.0",
+    "typescript-eslint": "^8.69.0"
   }
 }

pnpm-workspace.yaml

@@ -8,6 +8,15 @@ allowBuilds:
   node-pty: true
   protobufjs: true
 
+# The @deepseek-ai/* packages declare their dsh-* siblings as peerDependencies
+# (the DSH host bundle provides them all at mount time). This repo installs
+# every peer the dev tree needs as a direct devDependency pinned to the
+# baseline (see package.json), so pnpm resolves them instead of floating to
+# stale copies — e.g. dsh-attachment 0.1.1-rc.1 predates the
+# `admitPromptContent` export that dsh-subagent's artifacts import. When
+# bumping the DSH baseline, audit with `pnpm peers check` and hoist any
+# newly-unmet transitive peers into devDependencies too.
+
 minimumReleaseAgeExclude:
   - '@deepseek-ai/*'
   - '@deepseek-ai/cordis-plugin-include@1.0.5-rc.1 || 1.0.6'

scripts/check-consumer-types.sh

@@ -10,6 +10,13 @@
 set -euo pipefail
 cd "$(dirname "$0")/.."
 
+# Git Bash (MSYS) `ln -s` deep-copies directories by default — copying this
+# repo (node_modules + full .git history) would be catastrophic. Force real
+# native symlinks instead: the GitHub Windows runners (Developer Mode, admin
+# user) can create them, and nativestrict makes ln fail loudly rather than
+# silently falling back to a copy. Inert on Linux/macOS.
+export MSYS="winsymlinks:nativestrict"
+
 # The check reads the BUILT declaration surface (lib/types) — fail loudly
 # instead of silently passing when the build output is missing.
 if [ ! -f lib/types/client/service.d.ts ]; then
@@ -21,11 +28,27 @@ WORK="$(mktemp -d)"
 trap 'rm -rf "$WORK"' EXIT
 
 mkdir -p "$WORK/node_modules"
-ln -s "$(pwd)" "$WORK/node_modules/dsh-better-sidebar"
+# Resolve link targets to their PHYSICAL path first: under pnpm,
+# node_modules/@deepseek-ai/cordis is itself a symlink/junction into .pnpm,
+# and on Windows a native symlink pointing AT a junction does not traverse
+# for tsc (TS2307 on a link that visibly exists). Node's NATIVE realpath
+# (GetFinalPathNameByHandle on Windows) expands junctions, which bash-level
+# resolution may leave untouched; node is guaranteed here (tsc runs below).
+resolve_dir() { node -e 'process.stdout.write(require("node:fs").realpathSync.native(process.argv[1]))' "$1"; }
+ln -s "$(resolve_dir "$(pwd)")" "$WORK/node_modules/dsh-better-sidebar"
 # The vendored cordis base (and, through its realpath, cosmokit / standard-schema)
 # must resolve so the consumer can type `Context` against the DSH runtime scope.
 mkdir -p "$WORK/node_modules/@deepseek-ai"
-ln -s "$(pwd)/node_modules/@deepseek-ai/cordis" "$WORK/node_modules/@deepseek-ai/cordis"
+ln -s "$(resolve_dir "$(pwd)/node_modules/@deepseek-ai/cordis")" "$WORK/node_modules/@deepseek-ai/cordis"
+# Loud guard: both links must resolve to a package root, or tsc below would
+# report misleading module-resolution errors.
+for pkg_json in "$WORK/node_modules/dsh-better-sidebar/package.json" "$WORK/node_modules/@deepseek-ai/cordis/package.json"; do
+  if [ ! -f "$pkg_json" ]; then
+    echo "[check-consumer-types] FAIL: $pkg_json does not resolve (broken link). Link layer:" >&2
+    ls -la "$WORK/node_modules" "$WORK/node_modules/@deepseek-ai" >&2 || true
+    exit 1
+  fi
+done
 
 cat > "$WORK/check.ts" <<'EOF'
 import { SIDEBAR_FEATURES, SIDEBAR_SERVICE_VERSION } from 'dsh-better-sidebar/client/service'

scripts/e2e-aggregate-mount.sh

@@ -20,8 +20,8 @@
 #   bash scripts/e2e-aggregate-mount.sh
 #
 # 环境变量（均可省略）：
-#   DSH_CMD        dsh 命令；缺省 `npx -y --package @deepseek-ai/dsh dsh`
-#                  （与 pm2 启动器同源，避免依赖可能失效的 PATH dsh）
+#   DSH_CMD        dsh 命令；缺省 PATH 上的 `dsh`，回退 npx 拉官方包
+#                  （同 e2e-mount.sh）
 #   TARBALL        插件 tarball；缺省仓库根 dsh-better-sidebar-*.tgz（须已 pack）
 #   PORT           固定端口（默认 0 = OS 分配，从日志解析 URL）
 #   DSH_HOME_BASE  scratch 根目录（默认系统临时目录）。脚本始终在其下新建
@@ -30,6 +30,8 @@
 #   KEEP_HOME      非空时保留 scratch 目录（调试用）
 #
 # 退出码 = 0 通过；非 0 失败。服务器与 scratch 目录由 trap 兜底清理。
+# 日志/前置校验/DSH_CMD 与 tarball 解析/scratch profile 三件套/清理 trap/
+# dsh web 启动与就绪轮询的共享骨架见 scripts/e2e-common.sh。
 # =============================================================================
 set -euo pipefail
 
@@ -37,55 +39,33 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 FIXTURE_DIR="$ROOT/tests/fixtures/aggregate-better-sidebar"
 
-DSH_CMD="${DSH_CMD:-npx -y --package @deepseek-ai/dsh dsh}"
+E2E_TAG=e2e-aggregate-mount
+source "$SCRIPT_DIR/e2e-common.sh"
+
+DSH_CMD="${DSH_CMD:-dsh}"
 TARBALL="${TARBALL:-}"
 PORT="${PORT:-0}"
 KEEP_HOME="${KEEP_HOME:-}"
 
-say()  { printf '\033[32m[e2e-aggregate-mount]\033[0m %s\n' "$*"; }
-warn() { printf '\033[33m[e2e-aggregate-mount]\033[0m %s\n' "$*" >&2; }
-die()  { printf '\033[31m[e2e-aggregate-mount]\033[0m %s\n' "$*" >&2; exit 1; }
+e2e_require_cmd node "DSH 运行需要 Node.js >= 20"
+e2e_require_cmd pnpm "dsh plugin 转发给 pnpm"
+e2e_require_cmd npm "打包 fixture 需要"
+e2e_require_cmd curl
 
-command -v node >/dev/null 2>&1 || die "未找到 node（DSH 运行需要 Node.js >= 20）"
-command -v pnpm >/dev/null 2>&1 || die "未找到 pnpm（dsh plugin 转发给 pnpm）"
-command -v npm >/dev/null 2>&1 || die "未找到 npm（打包 fixture 需要）"
-command -v curl >/dev/null 2>&1 || die "未找到 curl"
+e2e_resolve_dsh_cmd
 
-if [ -z "$TARBALL" ]; then
-  TARBALL="$(ls "$ROOT"/dsh-better-sidebar-*.tgz 2>/dev/null | head -1 || true)"
-fi
-[ -n "$TARBALL" ] && [ -f "$TARBALL" ] || die "未找到插件 tarball：先在本仓库跑 pnpm build && npm pack，或用 TARBALL 指定"
+e2e_resolve_tarball || die "未找到插件 tarball：先在本仓库跑 pnpm build && npm pack，或用 TARBALL 指定"
 
 # ── scratch home ────────────────────────────────────────────────────────────
-# 始终在本调用拥有的全新目录里运行：调用方给了 DSH_HOME_BASE（可能是真实
-# ~/.dsh）时，只在其下新建子目录并只删除该子目录；缺省时直接用系统临时
-# 目录。调用方提供的目录本身绝不写入或删除。
-DSH_HOME_BASE="${DSH_HOME_BASE:-}"
-if [ -n "$DSH_HOME_BASE" ]; then
-  SCRATCH="$(mktemp -d "$DSH_HOME_BASE/dsh-e2e-agg.XXXXXX")"
-else
-  SCRATCH="$(mktemp -d /tmp/dsh-e2e-agg.XXXXXX)"
-fi
+# DSH_HOME 直接用 $SCRATCH（mount lane 用子路径 home/——两 lane 既有差异）；
+# DSH_HOME_BASE 语义与清理 trap 见 e2e-common.sh。
+e2e_make_scratch dsh-e2e-agg
 export DSH_HOME="$SCRATCH"
 LOG_DIR="$DSH_HOME/logs"; mkdir -p "$LOG_DIR"
 OUT_LOG="$LOG_DIR/dsh-web.out.log"; ERR_LOG="$LOG_DIR/dsh-web.err.log"
 SERVER_PID=""
 TMP_DIR=""
-cleanup() {
-  if [ -n "$SERVER_PID" ] && kill -0 "$SERVER_PID" 2>/dev/null; then
-    kill "$SERVER_PID" 2>/dev/null || true
-    wait "$SERVER_PID" 2>/dev/null || true
-  fi
-  if [ -n "$TMP_DIR" ] && [ -d "$TMP_DIR" ]; then
-    rm -rf "$TMP_DIR"
-  fi
-  if [ -z "$KEEP_HOME" ] && [ -d "$SCRATCH" ]; then
-    rm -rf "$SCRATCH"
-  else
-    warn "KEEP_HOME 已设置，保留 $SCRATCH"
-  fi
-}
-trap cleanup EXIT
+trap e2e_cleanup EXIT
 
 # ── 打包 fixture 聚合包 ─────────────────────────────────────────────────────
 TMP_DIR="$(mktemp -d)"
@@ -94,38 +74,10 @@ FIXTURE_TGZ="$(ls "$TMP_DIR"/*.tgz 2>/dev/null | head -1 || true)"
 [ -n "$FIXTURE_TGZ" ] || die "fixture 打包失败"
 
 # ── 引导 scratch profile（web 模板）────────────────────────────────────────
-# 先写 pnpm-workspace.yaml 的 allowBuilds / minimumReleaseAgeExclude，避免
-# pnpm 11 strict-dep-builds 拦截 node-pty/protobufjs——同 e2e-mount.sh。
+# 三件套 heredoc 及 pnpm-workspace 的 allowBuilds / minimumReleaseAgeExclude
+# 理由见 e2e-common.sh 的 e2e_write_profile。
 PROFILE_DIR="$DSH_HOME/profiles/web"
-mkdir -p "$PROFILE_DIR"
-cat > "$PROFILE_DIR/package.json" <<EOF
-{
-  "name": "dsh-profile-web",
-  "private": true,
-  "dependencies": {},
-  "dsh": {
-    "profile": {
-      "bundles": ["@deepseek-ai/dsh-base", "@deepseek-ai/dsh-web-app"]
-    }
-  }
-}
-EOF
-printf '[]\n' > "$PROFILE_DIR/cordis.patch.yml"
-cat > "$PROFILE_DIR/pnpm-workspace.yaml" <<'EOF'
-packages:
-  - .
-
-nodeLinker: hoisted
-autoInstallPeers: false
-
-allowBuilds:
-  node-pty: true
-  protobufjs: true
-
-minimumReleaseAgeExclude:
-  - dsh-better-sidebar
-  - '@deepseek-ai/*'
-EOF
+e2e_write_profile "$PROFILE_DIR"
 
 # ── 组装 profile：聚合先行，插件后到 ──────────────────────────────────────
 say "安装 fixture 聚合包（先行）…"
@@ -135,20 +87,15 @@ $DSH_CMD plugin --profile web add "file:$TARBALL"
 
 # ── 启动真实 dsh web ───────────────────────────────────────────────────────
 say "启动 dsh web（--port ${PORT}，日志 ${LOG_DIR}）…"
-$DSH_CMD web --port "$PORT" >"$OUT_LOG" 2>"$ERR_LOG" &
-SERVER_PID=$!
+e2e_start_dsh_web "$OUT_LOG" "$ERR_LOG"
 
 # 等待启动 URL 或进程退出（最多 120s）。这里有意只取 origin：0.1.2-alpha.1+
 # 的就绪行是 `…/?token=<43字符>` 鉴权 URL，但下方的探活全部打插件的
-# `/sidebar/api/*` 路由——webserver carrier 不做鉴权（只有 /api、index 与
+# /sidebar/api/* 路由——webserver carrier 不做鉴权（只有 /api、index 与
 # remote.mux 升级在 browser auth 之后），origin 拼路径即正确且两版通用。
-URL=""
-for _ in $(seq 1 120); do
-  if ! kill -0 "$SERVER_PID" 2>/dev/null; then break; fi
-  URL="$(grep -oE 'http://127\.0\.0\.1:[0-9]+' "$OUT_LOG" | tail -1 || true)"
-  [ -n "$URL" ] && break
-  sleep 1
-done
+E2E_READY_RE='http://127\.0\.0\.1:[0-9]+'
+E2E_READY_PICK=tail
+e2e_wait_dsh_web_ready "$OUT_LOG" || true
 if [ -z "$URL" ]; then
   warn "out log 尾部：$(tail -5 "$OUT_LOG" 2>/dev/null || true)"
   warn "err log 尾部：$(tail -5 "$ERR_LOG" 2>/dev/null || true)"

scripts/e2e-common.sh

@@ -0,0 +1,175 @@
+# =============================================================================
+# scripts/e2e-common.sh — e2e-mount.sh / e2e-aggregate-mount.sh 的共享骨架：
+# 日志三件套、前置校验、DSH_CMD / tarball 解析、scratch home 与清理 trap、
+# scratch profile 三件套、dsh web 后台启动与就绪轮询。
+#
+# 纯开发侧库文件，不进 npm 包（package.json files 白名单无它）；
+# install.sh / install.ps1 随 npm 包独立分发，必须自包含，绝不 source 本文件。
+#
+# 用法：调用方先设 E2E_TAG（say/warn/die 的日志前缀）再 source：
+#   E2E_TAG=e2e-mount
+#   source "$SCRIPT_DIR/e2e-common.sh"
+#
+# 依赖调用方已 `set -euo pipefail` 并定义 ROOT（仓库根绝对路径）。
+# 两侧脚本有意保留的差异（行为等价，靠参数 / 调用点区分）：
+#   - DSH_HOME 子路径：mount 用 $SCRATCH/home，aggregate 直接用 $SCRATCH；
+#   - 就绪行 grep 正则：mount 要带 token 的完整 URL，aggregate 只取 origin
+#     （两侧的理由见各自脚本的就绪行注释）；
+#   - 额外清理项：aggregate 的 fixture 打包 TMP_DIR（mount 不设即跳过）。
+# =============================================================================
+
+: "${E2E_TAG:?必须先设置 E2E_TAG（日志前缀）再 source e2e-common.sh}"
+
+# ── 日志三件套 ───────────────────────────────────────────────────────────────
+say()  { printf '\033[32m[%s]\033[0m %s\n' "$E2E_TAG" "$*"; }
+warn() { printf '\033[33m[%s]\033[0m %s\n' "$E2E_TAG" "$*" >&2; }
+die()  { printf '\033[31m[%s]\033[0m %s\n' "$E2E_TAG" "$*" >&2; exit 1; }
+
+# ── 前置校验 ─────────────────────────────────────────────────────────────────
+# e2e_require_cmd <cmd> [用途]：不在 PATH 上即 die（沿用两脚本原有报错文案）。
+e2e_require_cmd() {
+  if ! command -v "$1" >/dev/null 2>&1; then
+    if [ $# -ge 2 ]; then
+      die "未找到 $1（$2）"
+    else
+      die "未找到 $1"
+    fi
+  fi
+}
+
+# ── DSH_CMD 解析 ─────────────────────────────────────────────────────────────
+# PATH 上的 dsh 优先，否则 npx 拉官方包（同 scripts/install.sh）。DSH_CMD
+# 缺省值（`dsh`）由调用方从环境变量取好传入。
+e2e_resolve_dsh_cmd() {
+  if ! command -v "$DSH_CMD" >/dev/null 2>&1; then
+    if command -v npx >/dev/null 2>&1; then
+      say "PATH 上无 ${DSH_CMD}，回退 npx -y --package @deepseek-ai/dsh"
+      DSH_CMD="npx -y --package @deepseek-ai/dsh dsh"
+    else
+      die "未找到 $DSH_CMD 或 npx；请先安装 DSH CLI（npm i -g @deepseek-ai/dsh）或用 DSH_CMD 指定"
+    fi
+  fi
+}
+
+# ── tarball 解析 ─────────────────────────────────────────────────────────────
+# TARBALL 已显式给出时原样使用；否则从仓库根 glob 里选。多个候选时取 mtime
+# 最新——`ls | head -1` 的字典序会拿到旧版本号的历史 tarball，把冒烟挂到
+# 过期产物上。未找到候选时返回非零，由调用方按各自文案 die。
+e2e_resolve_tarball() {
+  if [ -z "${TARBALL:-}" ]; then
+    TARBALL="$(ls -t "$ROOT"/dsh-better-sidebar-*.tgz 2>/dev/null | head -1 || true)"
+    local count
+    count="$(ls "$ROOT"/dsh-better-sidebar-*.tgz 2>/dev/null | wc -l | tr -d ' ' || true)"
+    [ "$count" -le 1 ] || warn "发现 $count 个 tarball，按 mtime 选用最新：$(basename "$TARBALL")（建议清理其余）"
+  fi
+  [ -n "$TARBALL" ] && [ -f "$TARBALL" ]
+}
+
+# ── scratch home 与清理 ──────────────────────────────────────────────────────
+# 始终在本调用拥有的全新目录里运行：调用方给了 DSH_HOME_BASE（可能是真实
+# ~/.dsh）时，只在其下新建子目录并只删除该子目录；缺省时直接用系统临时
+# 目录。调用方提供的目录本身绝不写入或删除。
+# $1 = mktemp 模板短名（dsh-e2e-mount / dsh-e2e-agg，便于区分两 lane 的残留）。
+# DSH_HOME 用 $SCRATCH 还是其子路径由调用方自行 export（两 lane 的既有差异）。
+e2e_make_scratch() {
+  if [ -n "${DSH_HOME_BASE:-}" ]; then
+    SCRATCH="$(mktemp -d "$DSH_HOME_BASE/$1.XXXXXX")"
+  else
+    SCRATCH="$(mktemp -d /tmp/$1.XXXXXX)"
+  fi
+}
+
+# EXIT trap 兜底清理：杀 dsh web 后台进程；清 aggregate lane 的 fixture 打包
+# 目录（TMP_DIR——mount lane 不设该变量即整段跳过）；最后按 KEEP_HOME 决定
+# 是否删除 scratch。结尾显式 exit 回传 trap 触发时的退出码。
+e2e_cleanup() {
+  local code=$?
+  if [ -n "${SERVER_PID:-}" ] && kill -0 "$SERVER_PID" 2>/dev/null; then
+    kill "$SERVER_PID" 2>/dev/null || true
+    wait "$SERVER_PID" 2>/dev/null || true
+  fi
+  if [ -n "${TMP_DIR:-}" ] && [ -d "${TMP_DIR:-}" ]; then
+    rm -rf "$TMP_DIR"
+  fi
+  if [ -z "${KEEP_HOME:-}" ]; then
+    if [ -d "${SCRATCH:-}" ]; then
+      rm -rf "$SCRATCH"
+    fi
+  else
+    warn "KEEP_HOME 已设置，保留 $SCRATCH"
+  fi
+  exit "$code"
+}
+
+# ── scratch profile 三件套 ───────────────────────────────────────────────────
+# 引导 scratch profile（web 模板，镜像 dsh initProfile）；先写
+# pnpm-workspace.yaml 的 allowBuilds / minimumReleaseAgeExclude，避免 pnpm 11
+# strict-dep-builds 拦截 node-pty/protobufjs 或拒绝 <24h 新版本——同 install.sh。
+# @deepseek-ai/* 通配与仓库根 pnpm-workspace.yaml 同策：钉的 DSH alpha 常在
+# 发布后 24h 内跑 lane，没有豁免会被 minimumReleaseAge 直接拒装。
+e2e_write_profile() {
+  mkdir -p "$1"
+  cat > "$1/package.json" <<EOF
+{
+  "name": "dsh-profile-web",
+  "private": true,
+  "dependencies": {},
+  "dsh": {
+    "profile": {
+      "bundles": ["@deepseek-ai/dsh-base", "@deepseek-ai/dsh-web-app"]
+    }
+  }
+}
+EOF
+  printf '[]\n' > "$1/cordis.patch.yml"
+  cat > "$1/pnpm-workspace.yaml" <<'EOF'
+packages:
+  - .
+
+nodeLinker: hoisted
+autoInstallPeers: false
+
+allowBuilds:
+  node-pty: true
+  protobufjs: true
+
+minimumReleaseAgeExclude:
+  - dsh-better-sidebar
+  - '@deepseek-ai/*'
+EOF
+}
+
+# ── dsh web 启动 + 就绪轮询 ──────────────────────────────────────────────────
+# 后台启动 dsh web（--port 0 = OS 分配，避免端口冲突；keyless 可起）。
+# $1 = stdout 日志；$2 = stderr 日志（缺省合并进 $1：mount lane 单文件，
+# aggregate lane 分 out/err 两个文件）。写入全局 SERVER_PID。
+e2e_start_dsh_web() {
+  if [ $# -ge 2 ]; then
+    $DSH_CMD web --port "$PORT" >"$1" 2>"$2" &
+  else
+    $DSH_CMD web --port "$PORT" >"$1" 2>&1 &
+  fi
+  SERVER_PID=$!
+}
+
+# 轮询日志等待就绪行（最多 120s）。$1 = 参与轮询的日志文件；就绪行 ERE 与
+# 多条命中的取舍（head/tail）由 E2E_READY_RE / E2E_READY_PICK 传入——这是
+# 两条 lane 有意保留的差异（token URL vs 裸 origin，理由见各自脚本的就绪
+# 行注释）。URL 提取统一为「命中串按空白分段取末段」：mount 的模式带
+# `dsh web: ` 前缀（两段）故末段即完整 URL；aggregate 的模式不含空白故末段
+# 即 origin——与原先两侧的 awk '{print $3}' / 直接取整行等价。
+# 返回：0 = URL 已写入全局 URL；1 = 120s 超时；2 = 服务进程提前退出。
+e2e_wait_dsh_web_ready() {
+  URL=""
+  local _
+  for _ in $(seq 1 120); do
+    if ! kill -0 "$SERVER_PID" 2>/dev/null; then
+      return 2
+    fi
+    if URL="$(grep -oE "$E2E_READY_RE" "$1" | "${E2E_READY_PICK:-head}" -1 | awk '{print $NF}')" && [ -n "$URL" ]; then
+      return 0
+    fi
+    sleep 1
+  done
+  return 1
+}

scripts/e2e-mount.sh

@@ -22,54 +22,37 @@
 #   KEEP_HOME      非空时保留 scratch home（调试用）
 #
 # 退出码 = playwright 的退出码；服务器与 scratch 目录由 trap 兜底清理。
+# 日志/前置校验/DSH_CMD 与 tarball 解析/scratch profile 三件套/清理 trap/
+# dsh web 启动与就绪轮询的共享骨架见 scripts/e2e-common.sh。
 # =============================================================================
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 
+E2E_TAG=e2e-mount
+source "$SCRIPT_DIR/e2e-common.sh"
+
 DSH_CMD="${DSH_CMD:-dsh}"
 PORT="${PORT:-0}"
 TARBALL="${TARBALL:-}"
 GREP_FILTER=""
 if [ "${1:-}" = "--grep" ]; then GREP_FILTER="${2:?--grep 需要参数}"; fi
 
-say()  { printf '\033[32m[e2e-mount]\033[0m %s\n' "$*"; }
-warn() { printf '\033[33m[e2e-mount]\033[0m %s\n' "$*" >&2; }
-die()  { printf '\033[31m[e2e-mount]\033[0m %s\n' "$*" >&2; exit 1; }
+e2e_require_cmd node "DSH 运行需要 Node.js >= 20"
+e2e_require_cmd pnpm "dsh plugin 转发给 pnpm"
 
-command -v node >/dev/null 2>&1 || die "未找到 node（DSH 运行需要 Node.js >= 20）"
-command -v pnpm >/dev/null 2>&1 || die "未找到 pnpm（dsh plugin 转发给 pnpm）"
+e2e_resolve_dsh_cmd
 
-# dsh CLI 解析：PATH 上的 dsh 优先，否则 npx 拉官方包（同 scripts/install.sh）
-if ! command -v "$DSH_CMD" >/dev/null 2>&1; then
-  if command -v npx >/dev/null 2>&1; then
-    say "PATH 上无 ${DSH_CMD}，回退 npx -y --package @deepseek-ai/dsh"
-    DSH_CMD="npx -y --package @deepseek-ai/dsh dsh"
-  else
-    die "未找到 $DSH_CMD 或 npx；请先安装 DSH CLI（npm i -g @deepseek-ai/dsh）或用 DSH_CMD 指定"
-  fi
-fi
-
-# tarball 解析（多个候选时取 mtime 最新——`ls | head -1` 的字典序会拿到
-# 旧版本号的历史 tarball，把冒烟挂到过期产物上）
-if [ -z "$TARBALL" ]; then
-  TARBALL="$(ls -t "$ROOT"/dsh-better-sidebar-*.tgz 2>/dev/null | head -1 || true)"
-  COUNT="$(ls "$ROOT"/dsh-better-sidebar-*.tgz 2>/dev/null | wc -l | tr -d ' ')"
-  [ "$COUNT" -le 1 ] || warn "发现 $COUNT 个 tarball，按 mtime 选用最新：$(basename "$TARBALL")（建议清理其余）"
-fi
-[ -n "$TARBALL" ] && [ -f "$TARBALL" ] || die "找不到 tarball（TARBALL 或 \$ROOT/dsh-better-sidebar-*.tgz）——先运行 pnpm build && pnpm pack"
+e2e_resolve_tarball || die "找不到 tarball（TARBALL 或 \$ROOT/dsh-better-sidebar-*.tgz）——先运行 pnpm build && pnpm pack"
 TARBALL="$(cd "$(dirname "$TARBALL")" && pwd)/$(basename "$TARBALL")"
 say "tarball: $TARBALL"
 
-# scratch home（每次全新，绝不触碰真实 ~/.dsh）：调用方给了 DSH_HOME_BASE
-# 时，只在其下新建本调用拥有的子目录并只删除该子目录；缺省时直接用系统
-# 临时目录。
-if [ -n "${DSH_HOME_BASE:-}" ]; then
-  SCRATCH="$(mktemp -d "$DSH_HOME_BASE/dsh-e2e-mount.XXXXXX")"
-else
-  SCRATCH="$(mktemp -d /tmp/dsh-e2e-mount.XXXXXX)"
-fi
+# scratch home（每次全新，绝不触碰真实 ~/.dsh；DSH_HOME_BASE 语义见
+# e2e-common.sh）。DSH_HOME 用子路径 home/（aggregate lane 直接用 $SCRATCH，
+# 两 lane 既有差异）：playwright lane 还需要独立的 workspace 目录，与
+# DSH_HOME 的 profiles 布局分开。
+e2e_make_scratch dsh-e2e-mount
 export DSH_HOME="$SCRATCH/home"
 WORKSPACE_DIR="$SCRATCH/workspace"
 LOG_DIR="$SCRATCH"
@@ -78,55 +61,12 @@ mkdir -p "$DSH_HOME/profiles/web" "$WORKSPACE_DIR"
 say "scratch home: ${DSH_HOME}（DSH_HOME=${DSH_HOME}）"
 
 SERVER_PID=""
-cleanup() {
-  local code=$?
-  if [ -n "$SERVER_PID" ] && kill -0 "$SERVER_PID" 2>/dev/null; then
-    kill "$SERVER_PID" 2>/dev/null || true
-    wait "$SERVER_PID" 2>/dev/null || true
-  fi
-  if [ -z "${KEEP_HOME:-}" ]; then
-    rm -rf "$SCRATCH"
-  else
-    warn "KEEP_HOME 已设置，保留 $SCRATCH"
-  fi
-  exit "$code"
-}
-trap cleanup EXIT
+trap e2e_cleanup EXIT
 
-# 步骤 1：引导 scratch profile（web 模板，镜像 dsh initProfile；先写
-# pnpm-workspace.yaml 的 allowBuilds / minimumReleaseAgeExclude，避免 pnpm 11
-# strict-dep-builds 拦截 node-pty/protobufjs 或拒绝 <24h 新版本——同 install.sh。
-# @deepseek-ai/* 通配与仓库根 pnpm-workspace.yaml 同策：钉的 DSH alpha 常在
-# 发布后 24h 内跑 lane，没有豁免会被 minimumReleaseAge 直接拒装）
+# 步骤 1：引导 scratch profile（三件套 heredoc 及其理由见 e2e-common.sh
+# 的 e2e_write_profile）
 PROFILE_DIR="$DSH_HOME/profiles/web"
-cat > "$PROFILE_DIR/package.json" <<EOF
-{
-  "name": "dsh-profile-web",
-  "private": true,
-  "dependencies": {},
-  "dsh": {
-    "profile": {
-      "bundles": ["@deepseek-ai/dsh-base", "@deepseek-ai/dsh-web-app"]
-    }
-  }
-}
-EOF
-printf '[]\n' > "$PROFILE_DIR/cordis.patch.yml"
-cat > "$PROFILE_DIR/pnpm-workspace.yaml" <<'EOF'
-packages:
-  - .
-
-nodeLinker: hoisted
-autoInstallPeers: false
-
-allowBuilds:
-  node-pty: true
-  protobufjs: true
-
-minimumReleaseAgeExclude:
-  - dsh-better-sidebar
-  - '@deepseek-ai/*'
-EOF
+e2e_write_profile "$PROFILE_DIR"
 
 # 步骤 2：官方 CLI 安装 tarball + bundle 协调（真实挂载路径）
 say "执行 dsh plugin --profile web add file:$TARBALL ..."
@@ -147,8 +87,7 @@ say "挂载已注册：dsh.profile.bundles 包含 dsh-better-sidebar"
 
 # 步骤 4：启动 dsh web（--port 0 = OS 分配，避免端口冲突；keyless 可起）
 say "启动 dsh web（port=${PORT}）..."
-$DSH_CMD web --port "$PORT" > "$WEB_LOG" 2>&1 &
-SERVER_PID=$!
+e2e_start_dsh_web "$WEB_LOG"
 
 # 就绪行解析：DSH 0.1.2-alpha.1+ 打印的是带一次性 token 的鉴权 URL
 # （`dsh web: http://127.0.0.1:<port>/?token=<43字符>`，页面导航用它换取
@@ -156,19 +95,20 @@ SERVER_PID=$!
 # 匹配必须延伸到空白（`[^ ]*`）——在 `/` 处截断会丢掉 token，alpha.1+
 # 宿主上的整条 lane 都会挂在首屏 401。LAN 后缀 `(LAN: …)` 是下一个
 # 空格分段，不会被并进来。
-URL=""
-for _ in $(seq 1 120); do
-  if ! kill -0 "$SERVER_PID" 2>/dev/null; then
-    echo "=== dsh web 提前退出，日志尾部 ===" >&2
-    tail -30 "$WEB_LOG" >&2 || true
-    exit 1
-  fi
-  if URL="$(grep -oE 'dsh web: http://127\.0\.0\.1:[0-9]+[^ ]*' "$WEB_LOG" | head -1 | awk '{print $3}')" && [ -n "$URL" ]; then
-    break
-  fi
-  sleep 1
-done
-[ -n "$URL" ] || { echo "=== 120s 内未等到 dsh web 就绪，日志尾部 ===" >&2; tail -40 "$WEB_LOG" >&2 || true; exit 1; }
+E2E_READY_RE='dsh web: http://127\.0\.0\.1:[0-9]+[^ ]*'
+E2E_READY_PICK=head
+WAIT_RC=0
+e2e_wait_dsh_web_ready "$WEB_LOG" || WAIT_RC=$?
+if [ "$WAIT_RC" -eq 2 ]; then
+  echo "=== dsh web 提前退出，日志尾部 ===" >&2
+  tail -30 "$WEB_LOG" >&2 || true
+  exit 1
+fi
+if [ "$WAIT_RC" -ne 0 ]; then
+  echo "=== 120s 内未等到 dsh web 就绪，日志尾部 ===" >&2
+  tail -40 "$WEB_LOG" >&2 || true
+  exit 1
+fi
 say "dsh web 就绪：${URL}（pid ${SERVER_PID}）"
 
 # 步骤 5：运行无头渲染 lane

scripts/package-registry.mjs

@@ -35,6 +35,8 @@ const files = [
   'lib/client-terminal.js.map',
   'lib/client-editor.js',
   'lib/client-editor.js.map',
+  'lib/client-mermaid.js',
+  'lib/client-mermaid.js.map',
   'README.md',
   'LICENSE',
 ]

src/agent-opens.ts

@@ -158,9 +158,9 @@ async function classifyTarget(raw: string, cwd: string): Promise<{ kind: AgentOp
     info = await stat(target)
   } catch (error) {
     const code = (error as NodeJS.ErrnoException).code
-    if (code === 'ENOENT') throw new Error(`"${raw}" does not exist (resolved to "${target}")`)
-    if (code === 'EACCES' || code === 'EPERM') throw new Error(`"${target}" is not readable`)
-    throw new Error(`cannot open "${target}": ${error instanceof Error ? error.message : String(error)}`)
+    if (code === 'ENOENT') throw new Error(`"${raw}" does not exist (resolved to "${target}")`, { cause: error })
+    if (code === 'EACCES' || code === 'EPERM') throw new Error(`"${target}" is not readable`, { cause: error })
+    throw new Error(`cannot open "${target}": ${error instanceof Error ? error.message : String(error)}`, { cause: error })
   }
   const title = basenameOf(target)
   return { kind: info.isDirectory() ? 'folder' : 'file', target, title: title === '' ? raw : title }

src/agent-pty.ts

@@ -13,7 +13,7 @@
  */
 import { randomUUID } from 'node:crypto'
 import type { IPty } from 'node-pty'
-import { ensureSpawnHelper, shellSpawnArgs } from './pty-manager.ts'
+import { ensureSpawnHelper, resolveShellExecutable, shellSpawnArgs } from './pty-manager.ts'
 import { loadRequiredNodePty, type NodePtyModule } from './pty-deps.ts'
 import { SidebarError } from './wire.ts'
 
@@ -40,6 +40,79 @@ export function clampDims(cols: number, rows: number): { cols: number; rows: num
   return { cols: clamp(cols), rows: clamp(rows) }
 }
 
+/**
+ * Per-pty Windows resize-gate state (see {@link armPtyResizeGate}).
+ */
+interface ResizeGateState {
+  /** Whether the pty has produced any output yet (ConPTY flush completed). */
+  sawData: boolean
+  /** Latest dims requested before the first output; replayed once it arrives. */
+  pending?: { cols: number; rows: number }
+}
+
+/**
+ * node-pty's Windows terminal queues resize calls that arrive before the
+ * ConPTY control socket's first data flush (`_deferNoArgs` in
+ * windowsTerminal.js). If the pty exits before the queue flushes, the
+ * deferred resize throws inside the socket's 'data' handler — uncatchable
+ * by any caller and fatal to the host process. POSIX terminals have no such
+ * queue (resize is synchronous), so the gate is armed on Windows only:
+ * {@link tryResizePty} parks dims requested before the first output and
+ * replays them after the flush, when node-pty executes resizes
+ * synchronously (and the throw for an exited pty is catchable).
+ */
+const ptyResizeGates = new WeakMap<object, ResizeGateState>()
+
+/**
+ * Arm the Windows pre-ready resize gate for one freshly spawned pty.
+ * No-op on POSIX and for injected ptys without `onData`.
+ */
+export function armPtyResizeGate(pty: IPty): void {
+  if (process.platform !== 'win32') return
+  if (typeof pty.onData !== 'function' || ptyResizeGates.has(pty)) return
+  const state: ResizeGateState = { sawData: false }
+  ptyResizeGates.set(pty, state)
+  pty.onData(() => {
+    if (state.sawData) return
+    state.sawData = true
+    const dims = state.pending
+    state.pending = undefined
+    if (dims === undefined) return
+    // node-pty's deferred flush shares this very 'data' dispatch; hop past
+    // it so the replayed resize executes synchronously (catchable) instead
+    // of being queued into the same deferred list we are draining.
+    setImmediate(() => { tryResizePty(pty, dims.cols, dims.rows) })
+  })
+}
+
+/**
+ * Best-effort resize for WebSocket-driven terminal views. Layout animation
+ * can briefly produce unusable dimensions, and node-pty can reject a resize
+ * after the socket setup's outer try/catch has returned. Ignore that one
+ * frame so the host stays alive and a later valid measurement can retry.
+ * Returns whether node-pty accepted the resize (or parked it for replay on
+ * the first output — the Windows pre-ready window).
+ */
+export function tryResizePty(
+  pty: Pick<IPty, 'resize'>,
+  cols: number,
+  rows: number,
+): boolean {
+  if (!Number.isFinite(cols) || !Number.isFinite(rows)) return false
+  const dims = clampDims(cols, rows)
+  const gate = ptyResizeGates.get(pty)
+  if (gate !== undefined && !gate.sawData) {
+    gate.pending = dims
+    return true
+  }
+  try {
+    pty.resize(dims.cols, dims.rows)
+    return true
+  } catch {
+    return false
+  }
+}
+
 /**
  * Serializable snapshot of one agent terminal — the shape the model sees
  * through `terminal_list` and the sidebar sees through the push endpoint.
@@ -76,22 +149,56 @@ function signalNameOf(signal: number | null | undefined): string | null {
   return SIGNAL_NAMES[signal] ?? `signal ${signal}`
 }
 
-/** Locate the first occurrence of `needle` in `transcript`, returning its line/column. */
-function locateNeedle(transcript: string, needle: string): { line: number; column: number } | undefined {
+/**
+ * Compile a wait needle into a RegExp. The needle is treated as a JavaScript
+ * regular expression; a pattern that fails to compile ( e.g. an unbalanced
+ * group typed as a literal ) degrades to verbatim substring matching so
+ * legacy literal needles keep working.
+ */
+function compileNeedle(needle: string): RegExp | null {
+  try {
+    return new RegExp(needle)
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Locate the first occurrence of `needle` in `transcript`, returning its
+ * line/column plus the actual matched text — for alternation patterns
+ * ( e.g. `(BUILD_OK|BUILD_FAIL)` ) the match tells which alternative hit.
+ * `re` is the precompiled form of `needle` (from {@link compileNeedle});
+ * `null` means verbatim substring matching.
+ */
+function locateNeedle(
+  transcript: string,
+  needle: string,
+  re: RegExp | null,
+): { line: number; column: number; match: string } | undefined {
   if (needle === '') return undefined
-  const idx = transcript.indexOf(needle)
-  if (idx === -1) return undefined
+  // Regex hit → use the match index/text; literal fallback → indexOf with
+  // the needle itself as the matched text.
+  let hit: { index: number; text: string } | undefined
+  if (re !== null) {
+    re.lastIndex = 0
+    const m = re.exec(transcript)
+    hit = m === null ? undefined : { index: m.index, text: m[0] }
+  } else {
+    const idx = transcript.indexOf(needle)
+    hit = idx === -1 ? undefined : { index: idx, text: needle }
+  }
+  if (hit === undefined) return undefined
   // Walk the transcript up to the match index, counting newlines to derive
   // the 0-based line; the column is the offset within that line.
   let line = 0
   let lineStart = 0
-  for (let i = 0; i < idx; i += 1) {
+  for (let i = 0; i < hit.index; i += 1) {
     if (transcript.charCodeAt(i) === 0x0a /* \n */) {
       line += 1
       lineStart = i + 1
     }
   }
-  return { line, column: idx - lineStart }
+  return { line, column: hit.index - lineStart, match: hit.text }
 }
 
 /** One live agent terminal. */
@@ -135,12 +242,17 @@ export type AgentTerminalWaitResult =
   | {
     /** The needle was found in the transcript. */
     kind: 'found'
-    /** The matched substring. */
+    /** The pattern that was awaited. */
     needle: string
     /** 0-based line index (in the retained transcript) where the needle first appeared. */
     line: number
     /** 0-based column index within that line where the match starts. */
     column: number
+    /**
+     * The text that actually matched — for multi-outcome patterns
+     * ( e.g. `(BUILD_OK|BUILD_FAIL)` ) this tells which alternative matched.
+     */
+    match: string
     /** Elapsed wall-clock milliseconds from the wait start to the match. */
     elapsedMs: number
   }
@@ -219,13 +331,15 @@ export class AgentPtyRegistry {
   ): string {
     const uuid = randomUUID()
     const dims = clampDims(cols, rows)
-    const pty = this.nodePty.spawn(shell ?? this.shell, shellSpawnArgs(shellArgs ?? this.shellArgs), {
+    const executable = resolveShellExecutable(shell ?? this.shell)
+    const pty = this.nodePty.spawn(executable, shellSpawnArgs(shellArgs ?? this.shellArgs), {
       name: 'xterm-256color',
       cols: dims.cols,
       rows: dims.rows,
       cwd,
       env: { ...process.env },
     })
+    armPtyResizeGate(pty)
     const handle: AgentTerminalHandle = {
       uuid,
       sessionId,
@@ -353,7 +467,11 @@ export class AgentPtyRegistry {
   resize(uuid: string, cols: number, rows: number): { cols: number; rows: number } {
     const handle = this.expect(uuid)
     const dims = clampDims(cols, rows)
-    if (!handle.exited) handle.pty.resize(dims.cols, dims.rows)
+    // Through tryResizePty: node-pty throws on a just-exited pty (the exit
+    // event may not have flipped `handle.exited` yet), and on Windows a
+    // pre-ready resize must go through the gate instead of node-pty's own
+    // deferred queue (which flushes uncatchably inside its socket handler).
+    if (!handle.exited) tryResizePty(handle.pty, dims.cols, dims.rows)
     return dims
   }
 
@@ -377,7 +495,12 @@ export class AgentPtyRegistry {
    * make event-driven wakeups unreliable. A 50ms poll is fast enough for
    * interactive use and simple enough to be obviously correct.
    * @param uuid - terminal to watch.
-   * @param needle - substring to search for (case-sensitive, verbatim).
+   * @param needle - JavaScript regular expression to search for
+   *   (case-sensitive); a pattern that fails to compile falls back to
+   *   verbatim substring matching. May cover several outcomes at once
+   *   ( e.g. `(BUILD_OK|BUILD_FAIL)` for build success vs failure ) — the
+   *   returned `match` reports the text that actually matched, so callers
+   *   can tell which outcome hit.
    * @param timeoutMs - max wait; default 10000 (10s). Clamped to ≥100ms.
    * @param signal - caller-owned cancellation; aborts the wait re-throwing.
    * @returns one of `found` / `timeout` / `exited`.
@@ -395,15 +518,18 @@ export class AgentPtyRegistry {
     const timeout = Math.max(100, Math.floor(timeoutMs))
     const start = Date.now()
     const deadline = start + timeout
+    // Compile the needle once (regex semantics; invalid patterns degrade to
+    // verbatim matching) and reuse the compiled form across every poll.
+    const re = compileNeedle(needle)
     // Fast path: already exited, or the needle is already in the transcript
     // (a `terminal_send` may have produced the expected output before this
     // call even started).
     if (handle.exited) {
       return { kind: 'exited', needle, exitCode: handle.exitCode ?? null, exitSignal: signalNameOf(handle.exitSignal) }
     }
-    const firstHit = locateNeedle(handle.transcript, needle)
+    const firstHit = locateNeedle(handle.transcript, needle, re)
     if (firstHit !== undefined) {
-      return { kind: 'found', needle, line: firstHit.line, column: firstHit.column, elapsedMs: Date.now() - start }
+      return { kind: 'found', needle, line: firstHit.line, column: firstHit.column, match: firstHit.match, elapsedMs: Date.now() - start }
     }
     // Poll loop: check the transcript every 50ms, exit on match / exit /
     // abort / timeout. The handle is read live each iteration (its transcript
@@ -413,9 +539,9 @@ export class AgentPtyRegistry {
       if (handle.exited) {
         return { kind: 'exited', needle, exitCode: handle.exitCode ?? null, exitSignal: signalNameOf(handle.exitSignal) }
       }
-      const hit = locateNeedle(handle.transcript, needle)
+      const hit = locateNeedle(handle.transcript, needle, re)
       if (hit !== undefined) {
-        return { kind: 'found', needle, line: hit.line, column: hit.column, elapsedMs: Date.now() - start }
+        return { kind: 'found', needle, line: hit.line, column: hit.column, match: hit.match, elapsedMs: Date.now() - start }
       }
       if (Date.now() >= deadline) {
         return { kind: 'timeout', needle, timeoutMs: timeout, totalLines: handle.transcript.split('\n').length }

src/assistant-live.ts

@@ -0,0 +1,140 @@
+/**
+ * Process-local live assistant stream buffer (DSH 0.1.5+).
+ *
+ * 0.1.2 appended a durable `assistant/chunk` session event for every model
+ * delta, so the side-chat transcript and the inherited in-progress snapshot
+ * could read streaming text straight out of the session log. 0.1.5 removed
+ * that event: an in-flight attempt now publishes `agent/assistant-stream`
+ * frames (start / chunk / end) that are NOT part of the log, and the durable
+ * record lands only at settlement — `assistant/message` (with the exact
+ * `stream` embedded) or `assistant/attempt` (a failed attempt that committed
+ * no message, also with its `stream`).
+ *
+ * This module folds those frames into a bounded per-session buffer of
+ * normalized chunks — the same information the old `assistant/chunk` events
+ * carried — so the plugin keeps a live transcript and an honest in-progress
+ * snapshot. The buffer is cleared when an attempt ends, so a settled step
+ * never duplicates its durable message.
+ */
+import type { Context } from './context-types.ts'
+
+/** One normalized live delta, keyed by its attempt and dense position. */
+export interface AssistantLiveChunk {
+  /** The attempt these chunks belong to (DSH `LlmAttemptId`). */
+  readonly attemptId: string
+  /** The turn the attempt belongs to. */
+  readonly turn: number
+  /** The step the attempt belongs to. */
+  readonly step: number
+  /** Dense zero-based position within the attempt (DSH's own index). */
+  readonly index: number
+  /** Safe-integer timestamp of the frame (reused by the durable stream). */
+  readonly time: number
+  /** The raw model stream chunk (`text-delta` / `reasoning-delta` / …). */
+  readonly chunk: Record<string, unknown>
+}
+
+/** The plugin's read face over the live frames of every session. */
+export interface AssistantLiveBuffer {
+  /**
+   * The live chunks of one session's active attempt, in index order.
+   * @param sessionId - the session whose attempt is streaming.
+   * @returns the chunks; empty when nothing is streaming for that session.
+   */
+  chunksFor(sessionId: string): readonly AssistantLiveChunk[]
+  /** Stop observing the agent stream. */
+  dispose(): void
+}
+
+/** Per-attempt buffer ceiling; beyond it the oldest deltas are dropped. */
+export const LIVE_CHUNK_CAP = 4000
+
+/** How many sessions may hold a live buffer at once (the oldest is dropped). */
+export const LIVE_SESSION_CAP = 64
+
+/** One session's active attempt as it accumulates. */
+interface Attempt {
+  readonly attemptId: string
+  readonly turn: number
+  readonly step: number
+  readonly chunks: AssistantLiveChunk[]
+  /** The next dense frame index this attempt accepts (independent of the
+   *  window below, which drops the oldest chunks once the cap is reached). */
+  nextIndex: number
+}
+
+/** A frame's `chunk` payload must be a JSON record to be worth buffering. */
+function chunkOf(value: unknown): Record<string, unknown> | undefined {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+    ? value as Record<string, unknown>
+    : undefined
+}
+
+/** A finite non-negative integer, or undefined. */
+function countOf(value: unknown): number | undefined {
+  return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : undefined
+}
+
+/**
+ * Fold `agent/assistant-stream` frames into per-session live buffers.
+ *
+ * Frames arrive for every attached agent, so the buffer is keyed by the
+ * emitting session and ignores anything it cannot identify. An out-of-order
+ * or mismatched chunk drops the attempt rather than splicing a gap: a
+ * transcript with a hole is worse than one that settles at the next durable
+ * event.
+ * @param ctx - host plugin context (its `on` subscribes the session feed).
+ * @param cap - per-attempt chunk ceiling.
+ * @returns the read face and a disposer unbinding the listener.
+ */
+export function createAssistantLiveBuffer(ctx: Context, cap: number = LIVE_CHUNK_CAP): AssistantLiveBuffer {
+  const attempts = new Map<string, Attempt>()
+  const off = ctx.on('agent/assistant-stream', (payload) => {
+    const record = payload as { agent?: unknown; frame?: unknown } | null
+    const frame = record?.frame as Record<string, unknown> | undefined
+    if (frame === undefined) return
+    const session = (record?.agent as { session?: { id?: unknown } } | undefined)?.session
+    const sessionId = typeof session?.id === 'string' ? session.id : undefined
+    if (sessionId === undefined) return
+    const type = frame['type']
+    if (type === 'end') {
+      attempts.delete(sessionId)
+      return
+    }
+    const attemptId = typeof frame['attemptId'] === 'string' ? frame.attemptId : undefined
+    if (attemptId === undefined) return
+    if (type === 'start') {
+      const turn = countOf(frame['turn'])
+      const step = countOf(frame['step'])
+      if (turn === undefined || step === undefined) return
+      const known = attempts.has(sessionId)
+      attempts.delete(sessionId)
+      // Only a NEW session may evict the oldest tracked one.
+      if (!known && attempts.size >= LIVE_SESSION_CAP) {
+        const oldest = attempts.keys().next().value
+        if (oldest !== undefined) attempts.delete(oldest)
+      }
+      attempts.set(sessionId, { attemptId, turn, step, chunks: [], nextIndex: 0 })
+      return
+    }
+    if (type !== 'chunk') return
+    const attempt = attempts.get(sessionId)
+    if (attempt === undefined || attempt.attemptId !== attemptId) return
+    const index = countOf(frame['index'])
+    const chunk = chunkOf(frame['chunk'])
+    // Dense positions only: a gap means the buffer missed frames (a
+    // replacement attempt, a reconnect) and its text would be wrong.
+    if (index === undefined || chunk === undefined || index !== attempt.nextIndex) {
+      attempts.delete(sessionId)
+      return
+    }
+    attempt.nextIndex = index + 1
+    const time = countOf(frame['time']) ?? 0
+    attempt.chunks.push({ attemptId, turn: attempt.turn, step: attempt.step, index, time, chunk })
+    if (attempt.chunks.length > cap) attempt.chunks.splice(0, attempt.chunks.length - cap)
+  })
+  return {
+    chunksFor: sessionId => attempts.get(sessionId)?.chunks ?? [],
+    dispose: () => { off() },
+  }
+}

src/bundle-route.ts

@@ -19,7 +19,7 @@ import { fileURLToPath } from 'node:url'
 import type { Context, SidebarHttpRequest, SidebarHttpResponse } from './context-types.ts'
 
 /** The chunk names the client may request (mirror of src/client/chunk-loader.ts). */
-export const CHUNK_NAMES = ['terminal', 'editor', 'mermaid'] as const
+export const CHUNK_NAMES = ['terminal', 'editor', 'mermaid', 'locale'] as const
 export type ChunkName = (typeof CHUNK_NAMES)[number]
 
 /** Directory of this host-half module (lib/ — the chunk scripts live next to it). */

src/client/DiffTab.tsx

@@ -1,18 +1,20 @@
 /**
- * The diff tab: one change opened from the git panel, like VSCode's diff
+ * The diff tab: one change opened from the changes tab, like VSCode's diff
  * editor. A worktree ref loads the file's unified diff (`git diff`, staged or
  * not; untracked files — which git diff never covers — render as a full-file
  * addition from their content), a commit ref loads the commit's full patch
  * (`git.show`-style). The header carries a refresh button because the tab
- * stays mounted while the git panel's staging/discard operations change the
- * very content it shows.
+ * stays mounted while the changes tab's staging/discard operations change the
+ * very content it shows. Rendering goes through the shared {@link DiffFiles}
+ * renderer — the same one the changes tab's inline preview uses.
  */
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { IconRefreshOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { SessionScope } from './api.ts'
 import { api } from './api.ts'
 import type { SidebarDiffRef } from './state.ts'
-import { DiffView } from './DiffView.tsx'
+import { DiffFiles } from './diff/DiffFiles.tsx'
+import { displayPath, foldRowsFromContents, type DiffFile, type DiffRow, type FoldSegment } from './diff/rows.ts'
 import { t } from './locales.ts'
 import { resolveSidebarPath } from './produced-files.ts'
 import css from './sidebar.module.css'
@@ -29,6 +31,11 @@ export function DiffTab(props: { sessionId: string; cwd: string | undefined; dif
   const [error, setError] = useState<string | null>(null)
   const [data, setData] = useState<DiffData | null>(null)
   const [tick, setTick] = useState(0)
+  // The staged flag of the side ACTUALLY rendered: when the requested side's
+  // diff came back empty the load falls back to the other side, and the fold
+  // expansion must read that side's revisions (else the sliced line numbers
+  // land on the wrong contents).
+  const [effectiveStaged, setEffectiveStaged] = useState<boolean | null>(null)
 
   const refresh = useCallback((): void => { setTick(value => value + 1) }, [])
 
@@ -38,6 +45,7 @@ export function DiffTab(props: { sessionId: string; cwd: string | undefined; dif
     setLoading(true)
     setError(null)
     setData(null)
+    setEffectiveStaged(null)
     const load = async (): Promise<void> => {
       try {
         if (diff.kind === 'commit') {
@@ -52,7 +60,10 @@ export function DiffTab(props: { sessionId: string; cwd: string | undefined; dif
           // file staged after its tab opened). Both sides empty means the
           // file genuinely has no text changes.
           const other = await api.gitDiff(scope, diff.path, !diff.staged, diff.worktree)
-          if (other.diff !== '') result = other
+          if (other.diff !== '') {
+            result = other
+            if (!cancelled) setEffectiveStaged(!diff.staged)
+          }
         }
         if (result.diff !== '') {
           if (!cancelled) setData({ diff: result.diff })
@@ -81,6 +92,71 @@ export function DiffTab(props: { sessionId: string; cwd: string | undefined; dif
     return () => { cancelled = true }
   }, [sessionId, cwd, diff, tick])
 
+  // ── On-demand git fold expansion: a fold's hidden rows come from both
+  //    sides' full contents (git.show / fsRead), fetched ONCE per file so
+  //    sibling folds share the request, then sliced by each fold's line
+  //    ranges. The cache dies with the ref or a refresh tick. ──────────────
+  const foldContents = useRef(new Map<string, Promise<{ old: string; new: string }>>())
+  useEffect(() => { foldContents.current = new Map() }, [diff, tick])
+  const foldLoader = useMemo(() => {
+    const sidesOf = (file: DiffFile): Promise<{ old: string; new: string }> => {
+      // Both sides empty cannot cover a non-empty fold — treat it as a failed
+      // fetch so the fold degrades to the unavailable marker instead of
+      // silently expanding to nothing (the symptom of a bad rev or path
+      // reading null on both sides).
+      const ofSides = (oldContent: string | null, newContent: string | null): { old: string; new: string } => {
+        if ((oldContent ?? '') === '' && (newContent ?? '') === '') throw new Error('no content on either side')
+        return { old: oldContent ?? '', new: newContent ?? '' }
+      }
+      const fetchSides = async (): Promise<{ old: string; new: string }> => {
+        const scope: SessionScope = { sessionId, cwd, ...(diff.repoRoot !== undefined ? { repoRoot: diff.repoRoot } : {}) }
+        if (diff.kind === 'commit') {
+          // The patch's -m --first-parent shape: old side from the parent,
+          // new side from the commit (a root commit's parent read fails → '').
+          const [oldSide, newSide] = await Promise.all([
+            file.oldPath === '/dev/null'
+              ? Promise.resolve({ content: null })
+              : api.gitShow(scope, `${diff.hashFull}^`, displayPath(file.oldPath), diff.worktree),
+            file.newPath === '/dev/null'
+              ? Promise.resolve({ content: null })
+              : api.gitShow(scope, diff.hashFull, displayPath(file.newPath), diff.worktree),
+          ])
+          return ofSides(oldSide.content, newSide.content)
+        }
+        // Worktree change: staged is HEAD vs index, unstaged is index vs
+        // worktree (the worktree side reads the live file).
+        const staged = effectiveStaged ?? diff.staged
+        if (staged) {
+          const [oldSide, newSide] = await Promise.all([
+            file.oldPath === '/dev/null'
+              ? Promise.resolve({ content: null })
+              : api.gitShow(scope, 'HEAD', displayPath(file.oldPath), diff.worktree),
+            file.newPath === '/dev/null'
+              ? Promise.resolve({ content: null })
+              : api.gitShow(scope, ':0', displayPath(file.newPath), diff.worktree),
+          ])
+          return ofSides(oldSide.content, newSide.content)
+        }
+        const [oldSide, worktree] = await Promise.all([
+          file.oldPath === '/dev/null'
+            ? Promise.resolve({ content: null })
+            : api.gitShow(scope, ':0', displayPath(file.oldPath), diff.worktree),
+          api.fsRead(scope, resolveSidebarPath(diff.repoRoot ?? diff.worktree ?? cwd, displayPath(file.newPath))).catch(() => null),
+        ])
+        return ofSides(oldSide.content, worktree !== null && worktree.kind === 'text' ? worktree.content : null)
+      }
+      const path = displayPath(file.newPath === '/dev/null' ? file.oldPath : file.newPath)
+      let promise = foldContents.current.get(path)
+      if (promise === undefined) {
+        promise = fetchSides()
+        foldContents.current.set(path, promise)
+      }
+      return promise
+    }
+    return (file: DiffFile, segment: FoldSegment): Promise<readonly DiffRow[]> =>
+      sidesOf(file).then(sides => foldRowsFromContents(segment, sides.old, sides.new))
+  }, [sessionId, cwd, diff, effectiveStaged])
+
   return (
     <div className={css.gitDiffTab}>
       <div className={css.gitDiffTabHeader}>
@@ -102,8 +178,8 @@ export function DiffTab(props: { sessionId: string; cwd: string | undefined; dif
       {!loading && error === null && data !== null && (
         <>
           {data.untracked !== undefined
-            ? <DiffView diff="" untrackedPath={diff.kind === 'worktree' ? diff.path : ''} untrackedContent={data.untracked} />
-            : <DiffView diff={data.diff} />}
+            ? <DiffFiles diff="" untrackedPath={diff.kind === 'worktree' ? diff.path : ''} untrackedContent={data.untracked} />
+            : <DiffFiles diff={data.diff} resolveFold={foldLoader} />}
           {data.diff === '' && data.untracked === undefined && (
             <div className={css.gitEmpty}>{t('diffEmpty')}</div>
           )}

src/client/DiffView.tsx

@@ -1,305 +0,0 @@
-/**
- * The real diff surface for the git panel: parses the host's unified diff
- * text (`git diff` / `git show`) and renders it VSCode-style — per-file
- * sections with hunks (`@@ -a,b +c,d @@` headers), old/new line-number
- * gutters, and aligned context / deleted / added rows colored through the
- * DSH tokens. Untracked files produce no `git diff` output, so the caller
- * can pass the file content to render as a full-file addition instead.
- *
- * The parser is a pure function (`parseUnifiedDiff`) so the interesting
- * cases are unit-tested without a DOM.
- */
-import { useEffect, useMemo, useState, type ReactNode } from 'react'
-import clsx from 'clsx'
-import { t } from './locales.ts'
-import css from './sidebar.module.css'
-
-/** One rendered diff line. */
-export interface DiffLine {
-  kind: 'ctx' | 'del' | 'add' | 'meta'
-  /** The line content without its diff marker ('' for the no-newline marker). */
-  text: string
-  /** Old-side line number (null for pure additions / metadata). */
-  oldNum: number | null
-  /** New-side line number (null for pure deletions / metadata). */
-  newNum: number | null
-}
-
-/** One parsed hunk. */
-export interface DiffHunk {
-  /** The old-side start line (`-a[,b]`). */
-  oldStart: number
-  /** The new-side start line (`+c[,d]`). */
-  newStart: number
-  /** The section text after the trailing `@@` (may be empty). */
-  header: string
-  lines: DiffLine[]
-}
-
-/** One parsed file section of a unified diff. */
-export interface DiffFile {
-  /** The `---` path verbatim ('/dev/null' for a new file). */
-  oldPath: string
-  /** The `+++` path verbatim ('/dev/null' for a deleted file). */
-  newPath: string
-  /** The file changed with binary content: no hunks to draw. */
-  binary: boolean
-  hunks: DiffHunk[]
-}
-
-/** The parsed unified diff. */
-export interface ParsedDiff {
-  files: DiffFile[]
-}
-
-/** Parse the hunk header `@@ -a[,b] +c[,d] @@ section` (section may contain '@@'). */
-function parseHunkHeader(line: string): { oldStart: number; newStart: number; header: string } | null {
-  const match = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$/.exec(line)
-  if (match === null) return null
-  return { oldStart: Number(match[1]), newStart: Number(match[3]), header: match[5] ?? '' }
-}
-
-/**
- * Parse `git diff --no-color` output into file sections and hunks. Rows
- * outside a file section (leading noise) and metadata rows between the
- * `diff --git`/`---`/`+++` headers and the first hunk (index lines, mode
- * changes, rename/similarity lines) are skipped; a section that never
- * reaches a hunk (a mode/rename-only change) stays hunkless so the caller
- * can still draw its path.
- */
-export function parseUnifiedDiff(text: string): ParsedDiff {
-  const files: DiffFile[] = []
-  let current: DiffFile | null = null
-  let inHunk = false
-  let hunk: DiffHunk | null = null
-  let oldNum = 0
-  let newNum = 0
-  const flushHunk = (): void => {
-    if (current !== null && hunk !== null) current.hunks.push(hunk)
-    hunk = null
-    inHunk = false
-  }
-  for (const raw of text.split('\n')) {
-    if (raw.startsWith('diff --git ')) {
-      flushHunk()
-      current = { oldPath: '', newPath: '', binary: false, hunks: [] }
-      files.push(current)
-      continue
-    }
-    if (current === null) continue
-    if (raw.startsWith('Binary files ') || raw === 'GIT binary patch') {
-      flushHunk()
-      current.binary = true
-      continue
-    }
-    if (raw.startsWith('--- ')) {
-      flushHunk()
-      current.oldPath = raw.slice(4)
-      continue
-    }
-    if (raw.startsWith('+++ ')) {
-      current.newPath = raw.slice(4)
-      continue
-    }
-    const header = parseHunkHeader(raw)
-    if (header !== null) {
-      flushHunk()
-      hunk = { oldStart: header.oldStart, newStart: header.newStart, header: header.header, lines: [] }
-      oldNum = header.oldStart
-      newNum = header.newStart
-      inHunk = true
-      continue
-    }
-    if (!inHunk || hunk === null) continue
-    const marker = raw[0]
-    if (marker === '\\') {
-      // `\ No newline at end of file`: metadata attached to the previous row.
-      hunk.lines.push({ kind: 'meta', text: raw.slice(1), oldNum: null, newNum: null })
-      continue
-    }
-    if (marker === ' ') {
-      hunk.lines.push({ kind: 'ctx', text: raw.slice(1), oldNum, newNum })
-      oldNum += 1
-      newNum += 1
-    } else if (marker === '-') {
-      hunk.lines.push({ kind: 'del', text: raw.slice(1), oldNum, newNum: null })
-      oldNum += 1
-    } else if (marker === '+') {
-      hunk.lines.push({ kind: 'add', text: raw.slice(1), oldNum: null, newNum })
-      newNum += 1
-    } else {
-      // Not a diff line (a hunk can never contain one): stop the hunk.
-      flushHunk()
-    }
-  }
-  flushHunk()
-  return { files }
-}
-
-/** Build the untracked-file shape: one file, one hunk of pure additions. */
-function untrackedFile(path: string, content: string): DiffFile {
-  const lines: DiffLine[] = []
-  const body = content.endsWith('\n') ? content.slice(0, -1) : content
-  if (body !== '') {
-    let num = 1
-    for (const line of body.split('\n')) {
-      lines.push({ kind: 'add', text: line, oldNum: null, newNum: num })
-      num += 1
-    }
-  }
-  return { oldPath: '/dev/null', newPath: `b/${path}`, binary: false, hunks: [{ oldStart: 0, newStart: 1, header: '', lines }] }
-}
-
-/** Strip the `a/` / `b/` prefix git puts on diff paths (not on /dev/null). */
-function displayPath(path: string): string {
-  if (path === '/dev/null') return path
-  if (path.startsWith('a/') || path.startsWith('b/')) return path.slice(2)
-  return path
-}
-
-/** The file header badge: added / deleted / renamed / binary ('' for a plain edit). */
-function fileTag(file: DiffFile): string | null {
-  if (file.binary) return t('diffBinary')
-  if (file.oldPath === '/dev/null') return t('diffAdded')
-  if (file.newPath === '/dev/null') return t('diffDeleted')
-  const oldPath = displayPath(file.oldPath)
-  const newPath = displayPath(file.newPath)
-  if (oldPath !== newPath) return t('diffRenamed')
-  return null
-}
-
-/** Cap the flattened rows like DiffBlock: head + tail, expand button between. */
-const MAX_DIFF_ROWS = 500
-
-const TEST_PATH = /(^|\/)(?:__tests__|tests?|specs?|fixtures?|mocks?|snapshots?)(?:\/|$)|\.(?:test|spec)\.[^/]+$/i
-const DOC_PATH = /(^|\/)(?:docs?|documentation)(?:\/|$)|(^|\/)(?:readme|changelog|contributing|license|authors|notice)(?:\.[^/]*)?$/i
-const GENERATED_PATH = /(^|\/)(?:dist|build|coverage|generated|vendor|node_modules)(?:\/|$)|(^|\/)(?:package-lock\.json|pnpm-lock\.yaml|yarn\.lock|bun\.lockb?|composer\.lock|cargo\.lock|poetry\.lock)$/i
-const SOURCE_PATH = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts|py|pyw|rb|php|java|kt|kts|scala|go|rs|swift|c|h|cc|cpp|cxx|hpp|hh|hxx|cs|fs|fsx|vb|dart|lua|r|ex|exs|erl|hrl|clj|cljs|cljc|groovy|sh|bash|zsh|fish|ps1|sql|vue|svelte|astro|html|htm|css|scss|sass|less)$/i
-
-/** Source files open by default; tests, docs, generated files and unknown types stay folded. */
-function defaultExpandedFiles(files: DiffFile[]): Set<number> {
-  const expanded = new Set<number>()
-  files.forEach((file, index) => {
-    const path = displayPath(file.newPath === '/dev/null' ? file.oldPath : file.newPath)
-    if (!file.binary && file.hunks.length > 0
-      && !TEST_PATH.test(path) && !DOC_PATH.test(path) && !GENERATED_PATH.test(path)
-      && SOURCE_PATH.test(path)) {
-      expanded.add(index)
-    }
-  })
-  return expanded
-}
-
-export interface DiffViewProps {
-  /** Unified diff text (`git.diff` or `git.commit-diff` payloads). */
-  diff: string
-  /** Untracked-file content: when present, renders as a full-file addition instead of parsing. */
-  untrackedPath?: string
-  untrackedContent?: string
-}
-
-export function DiffView({ diff, untrackedPath, untrackedContent }: DiffViewProps) {
-  const parsed = useMemo<ParsedDiff>(() => {
-    if (untrackedPath !== undefined) {
-      return { files: [untrackedFile(untrackedPath, untrackedContent ?? '')] }
-    }
-    return parseUnifiedDiff(diff)
-  }, [diff, untrackedPath, untrackedContent])
-  const [expanded, setExpanded] = useState(false)
-  const [expandedFiles, setExpandedFiles] = useState<Set<number>>(() => defaultExpandedFiles(parsed.files))
-
-  useEffect(() => { setExpandedFiles(defaultExpandedFiles(parsed.files)) }, [parsed])
-
-  // Flatten into display rows so the cap can slice a single list.
-  const rows = useMemo(() => {
-    const out: Array<{ key: string; file: DiffFile; fileIndex: number; type: 'path' | 'hunk' | 'line'; hunk?: DiffHunk; line?: DiffLine }> = []
-    parsed.files.forEach((file, fileIndex) => {
-      out.push({ key: `f${fileIndex}`, file, fileIndex, type: 'path' })
-      if (file.binary || !expandedFiles.has(fileIndex)) return
-      file.hunks.forEach((hunk, hunkIndex) => {
-        out.push({ key: `f${fileIndex}h${hunkIndex}`, file, fileIndex, type: 'hunk', hunk })
-        hunk.lines.forEach((line, lineIndex) => {
-          out.push({ key: `f${fileIndex}h${hunkIndex}l${lineIndex}`, file, fileIndex, type: 'line', hunk, line })
-        })
-      })
-    })
-    return out
-  }, [parsed, expandedFiles])
-
-  const hidden = rows.length - MAX_DIFF_ROWS
-  const capped = hidden > 0 && !expanded
-  const headLines = Math.ceil(MAX_DIFF_ROWS / 2)
-  const tailLines = MAX_DIFF_ROWS - headLines
-  const head = capped ? rows.slice(0, headLines) : rows
-  const tail = capped ? rows.slice(rows.length - tailLines) : []
-
-  if (rows.length === 0) return null
-
-  const renderRow = (row: (typeof rows)[number]): ReactNode => {
-    if (row.type === 'path') {
-      const tag = fileTag(row.file)
-      const from = displayPath(row.file.oldPath)
-      const to = displayPath(row.file.newPath)
-      const expandable = !row.file.binary && row.file.hunks.length > 0
-      const fileExpanded = expandedFiles.has(row.fileIndex)
-      return (
-        <button
-          key={row.key}
-          type="button"
-          className={css.gitDiffFile}
-          disabled={!expandable}
-          aria-expanded={expandable ? fileExpanded : undefined}
-          onClick={() => {
-            setExpandedFiles(current => {
-              const next = new Set(current)
-              if (next.has(row.fileIndex)) next.delete(row.fileIndex)
-              else next.add(row.fileIndex)
-              return next
-            })
-          }}
-        >
-          {expandable && <span aria-hidden="true" className={clsx(css.gitDiffFileChevron, fileExpanded && css.gitDiffFileChevronExpanded)}>›</span>}
-          <span className={css.gitDiffFilePath}>{to}</span>
-          {from !== to && <span className={css.gitDiffFileOld}>← {from}</span>}
-          {tag !== null && <span className={css.gitDiffFileTag}>{tag}</span>}
-        </button>
-      )
-    }
-    if (row.type === 'hunk') {
-      const hunk = row.hunk!
-      return (
-        <div key={row.key} className={css.gitDiffHunk}>
-          <span className={css.gitDiffHunkHeader}>@@ -{hunk.oldStart},{hunk.lines.filter(l => l.oldNum !== null).length} +{hunk.newStart},{hunk.lines.filter(l => l.newNum !== null).length} @@</span>
-          {hunk.header !== '' && <span className={css.gitDiffHunkSection}>{hunk.header}</span>}
-        </div>
-      )
-    }
-    const line = row.line!
-    const lineClass = line.kind === 'del' ? css.gitDiffDel : line.kind === 'add' ? css.gitDiffAdd : line.kind === 'meta' ? css.gitDiffMeta : css.gitDiffCtx
-    return (
-      <div key={row.key} className={clsx(css.gitDiffLine, lineClass)}>
-        {line.kind === 'meta'
-          ? <span className={css.gitDiffMetaText}>{line.text}</span>
-          : (
-            <>
-              <span className={css.gitDiffNum}>{line.oldNum ?? ''}</span>
-              <span className={css.gitDiffNum}>{line.newNum ?? ''}</span>
-              <span className={css.gitDiffCode}>{line.text}</span>
-            </>
-          )}
-      </div>
-    )
-  }
-
-  return (
-    <div className={css.gitDiff}>
-      {head.map(renderRow)}
-      {hidden > 0 && (
-        <button type="button" className={css.gitDiffExpand} aria-expanded={expanded} onClick={() => { setExpanded(value => !value) }}>
-          {expanded ? t('diffCollapse') : t('diffExpand', { count: hidden })}
-        </button>
-      )}
-      {tail.map(renderRow)}
-    </div>
-  )
-}

src/client/EditorHost.tsx

@@ -40,8 +40,9 @@ import { TreePanel } from './TreePanel.tsx'
 import { t } from './locales.ts'
 import { relativeTo } from './paths.ts'
 import { resolveSidebarPath } from './produced-files.ts'
+import { closePathTabs, retargetPathTabs } from './tree-mutations.ts'
 import type { EditorToolbarControls, EditorToolbarState, FileViewerDescriptor } from './service.ts'
-import { firstLeaf, insertLeafAt, leafWithTab, mintTabId, treeOf, type SidebarStore, type SidebarTab } from './state.ts'
+import { firstLeaf, insertLeafAt, leafWithTab, mintTabId, type SidebarStore, type SidebarTab } from './state.ts'
 import css from './sidebar.module.css'
 
 type EditorLoad =
@@ -100,7 +101,7 @@ export function EditorHost(props: {
   expanded: string[]
   revealed: string[]
   onToggleDir: (path: string) => void
-  onReferenceFile: (path: string) => void
+  onReferenceFile: (path: string, isDir: boolean) => void
 }) {
   const { ctx, store, scope, tab, expanded, revealed, onToggleDir, onReferenceFile } = props
   const path = tab.path ?? ''
@@ -177,8 +178,7 @@ export function EditorHost(props: {
    */
   const openFileSide = (absolute: string): void => {
     store.reduce((state) => {
-      const key = treeOf(state, tab.id)
-      const pane = leafWithTab(state[key], tab.id) ?? firstLeaf(state[key])
+      const pane = leafWithTab(state.bottomSplits, tab.id) ?? firstLeaf(state.bottomSplits)
       const fresh: SidebarTab = {
         id: mintTabId(),
         type: 'editor',
@@ -186,16 +186,17 @@ export function EditorHost(props: {
         path: absolute,
         meta: { treeOpen: false },
       }
-      const { node, leafId } = insertLeafAt(state[key], pane.id, 'row', fresh, false)
-      return { ...state, [key]: node, activePane: leafId }
+      const { node, leafId } = insertLeafAt(state.bottomSplits, pane.id, 'row', fresh, false)
+      return { ...state, bottomSplits: node, activePane: leafId }
     })
   }
 
   /** The context menu's "open with" action: reveal the path in the OS file
-   *  manager, or hand the target's URL (a local `file` URL, or the SSH-remote
-   *  form for VSCode-family editors in remote mode) to the host's external
-   *  opener. Failures are logged only — a missing handler is the OS's
-   *  dialog, not a sidebar error. */
+   *  manager, or hand the target's URL to its opener — local `file` URLs go
+   *  to the host's external opener, while the SSH-remote form for
+   *  VSCode-family editors launches on the browser/client machine (see
+   *  api.openExternal). Failures are logged only — a missing handler is the
+   *  OS's/browser's dialog, not a sidebar error. */
   const openWith = (targetId: string, absolute: string): void => {
     const target = openWithTargets.find(item => item.id === targetId)
     if (target === undefined) return
@@ -224,6 +225,16 @@ export function EditorHost(props: {
     })
   }
 
+  // Tree mutations reconcile the OPEN tabs (both split trees, the bottom
+  // panel, free windows): a rename retargets its tab to the new path; a
+  // delete closes tabs at or under the removed path. See tree-mutations.ts.
+  const onPathRenamed = (oldPath: string, newPath: string): void => {
+    retargetPathTabs(ctx, store, oldPath, newPath)
+  }
+  const onPathDeleted = (path: string): void => {
+    closePathTabs(ctx, store, path)
+  }
+
   // The viewer's toolbar, hoisted into THIS header: the text editor reports
   // its state and registers its commands (both null/absent for viewers
   // without a toolbar — image, pdf, binary download).
@@ -337,6 +348,9 @@ export function EditorHost(props: {
     }
     apply(planFirstMatch(ctx.get('betterSidebar')?.matchFileViewer(path), mediaUrlOf))
     return () => { cancelled = true; controller.abort() }
+    // The deps are deliberately granular: the scope object's identity churns,
+    // only its sessionId / cwd fields gate the (re)fetch.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [scope.sessionId, scope.cwd, path, ctx, showEmpty, isDir, reloadSeq])
 
   // Save-then-refresh in preview mode (issue #167 part C): the edge into
@@ -385,6 +399,8 @@ export function EditorHost(props: {
           onOpenWith={openWith}
           onToggleOpenWithPin={toggleOpenWithPin}
           onReferenceFile={onReferenceFile}
+          onPathRenamed={onPathRenamed}
+          onPathDeleted={onPathDeleted}
         />
       </div>
     )
@@ -507,6 +523,8 @@ export function EditorHost(props: {
               onOpenWith={openWith}
               onToggleOpenWithPin={toggleOpenWithPin}
               onReferenceFile={onReferenceFile}
+              onPathRenamed={onPathRenamed}
+              onPathDeleted={onPathDeleted}
             />
           </div>
         )}

src/client/FenceErrorNotice.tsx

@@ -3,7 +3,7 @@
  * outside workspace`) is never shown as-is: the editor / file-tree error
  * slots render the localized reason plus a one-click global off — the click
  * flips the `workspaceFence` pref through the settings route, adopts the
- * returned document into the store (so every prefs reader — GitView's open
+ * returned document into the store (so every prefs reader — the changes tab's open
  * guard, the settings page — flips with it), and calls `onDisabled` so the
  * caller retries the failed operation immediately.
  */

src/client/FileTree.tsx

@@ -20,18 +20,20 @@
  * (VSCode semantics — a drop on a file row targets its parent directory),
  * and `busy` gates new drags while one upload is in flight.
  */
-import { useCallback, useEffect, useRef, useState, type DragEvent, type MouseEvent, type ReactNode } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState, type DragEvent, type MouseEvent, type ReactNode } from 'react'
 import { createPortal } from 'react-dom'
 import clsx from 'clsx'
 import {
-  IconChevronRightOutline14, IconCodeOutline16, IconCopyOutline16, IconDownloadOutline16,
-  IconLinkOutline16, Menu, type MenuEntry, type MenuItem, writeClipboard,
+  Button, IconChevronRightOutline14, IconCloseFill14, IconCodeOutline16, IconCopyOutline16, IconDownloadOutline16,
+  IconEditOutline16, IconLinkOutline16, IconTrashOutline16, Menu, Modal, type MenuEntry, type MenuItem, writeClipboard,
 } from '@deepseek-ai/dsh-client-ui-primitives'
 import { SiCursor, SiZedindustries } from 'react-icons/si'
 import { VscFile, VscFolder, VscFolderOpened, VscLinkExternal, VscPin, VscPinned } from 'react-icons/vsc'
 import { api, downloadUrl, isOutsideWorkspaceMessage, type FsEntry } from './api.ts'
 import { FenceErrorNotice } from './FenceErrorNotice.tsx'
 import { IconUploadOutline16, IconVscode16 } from './icons.tsx'
+import { isImeComposition } from './ime-guard.ts'
+import { useSubmenuFlip } from './menu-flip.ts'
 import type { OpenWithTarget } from './open-with.ts'
 import { relativeTo } from './paths.ts'
 import { t } from './locales.ts'
@@ -131,8 +133,12 @@ export function FileTree(props: {
   onOpenWith?: (targetId: string, path: string) => void
   /** Toggle one target's pinned state (the submenu row's pushpin). */
   onToggleOpenWithPin?: (targetId: string) => void
-  /** Insert `@<relative path>` into the composer draft. */
-  onReferenceFile: (path: string) => void
+  /** Insert `@<relative path>` into the composer draft (file vs directory). */
+  onReferenceFile: (path: string, isDir: boolean) => void
+  /** A rename landed (old row path → new path): the caller retargets open tabs. */
+  onPathRenamed?: (oldPath: string, newPath: string) => void
+  /** A delete landed: the caller closes tabs at or under the removed path. */
+  onPathDeleted?: (path: string, isDir: boolean) => void
   /** Bump to wipe the level cache and reload the visible set. */
   refreshTick: number
   /** Upload into `dir` (absolute, inside the workspace); runs in the caller. */
@@ -140,13 +146,22 @@ export function FileTree(props: {
   /** True while an upload is in flight (drops are ignored). */
   busy: boolean
 }) {
-  const { sessionId, cwd, store, expanded, revealed, onToggle, onOpenFile, onOpenFileNewTab, onOpenFileSide, openWithTargets, openWithPinned, openWithSsh, onOpenWith, onToggleOpenWithPin, onReferenceFile, refreshTick, onUploadRequest, busy } = props
+  const { sessionId, cwd, store, expanded, revealed, onToggle, onOpenFile, onOpenFileNewTab, onOpenFileSide, openWithTargets, openWithPinned, openWithSsh, onOpenWith, onToggleOpenWithPin, onReferenceFile, onPathRenamed, onPathDeleted, refreshTick, onUploadRequest, busy } = props
   const [data, setData] = useState<Record<string, LevelData>>({})
   const dataRef = useRef(data)
   /** The row whose path was just copied ("copied" label replaces its button). */
   const [copiedPath, setCopiedPath] = useState<string | null>(null)
   /** Open context menu: the row path (and whether it is a directory) plus the cursor position. */
   const [rowMenu, setRowMenu] = useState<{ path: string; isDir: boolean; x: number; y: number } | null>(null)
+  // The row menu's "open with" submenu is the one submenu that can tower past
+  // the viewport; publish its flip geometry for layout.css while it is open.
+  useSubmenuFlip(rowMenu)
+  /** The row being renamed inline: its path plus the edit buffer. */
+  const [renaming, setRenaming] = useState<{ path: string; value: string } | null>(null)
+  /** The delete awaiting the confirmation modal's yes. */
+  const [confirmDelete, setConfirmDelete] = useState<{ path: string; isDir: boolean; name: string } | null>(null)
+  /** The last mutation failure (dismissable strip above the tree). */
+  const [actionError, setActionError] = useState<string | null>(null)
   /** Whether a file drag hovers the tree (drives the portaled drop zone). */
   const [dropOver, setDropOver] = useState(false)
   /** The directory a drag is hovering right now (null = body, drop to root). */
@@ -268,6 +283,63 @@ export function FileTree(props: {
     loadDir(dir)
   }, [loadDir])
 
+  /**
+   * Settle the tree after one rename/delete landed at `prefix`: drop every
+   * cached level at or under the old path, collapse the now-stale expanded
+   * directories below it, and reload the immediate parent so the new shape
+   * shows without a full refresh tick.
+   */
+  const pruneTree = (prefix: string): void => {
+    const parent = parentOf(prefix)
+    const under = (key: string): boolean => key === prefix || key.startsWith(`${prefix}/`) || key.startsWith(`${prefix}\\`)
+    for (const key of Object.keys(dataRef.current)) {
+      if (under(key)) delete dataRef.current[key]
+    }
+    if (parent !== prefix) delete dataRef.current[parent]
+    setData({ ...dataRef.current })
+    for (const dir of expanded) {
+      if (under(dir)) onToggle(dir)
+    }
+    if (parent !== prefix) retryDir(parent)
+  }
+
+  /** Client-side twin of the server's name rule (the server re-validates). */
+  const validRename = (name: string): boolean =>
+    name !== '' && name !== '.' && name !== '..' && !name.includes('/') && !name.includes('\\')
+
+  /** Commit the inline rename: trim, no-op guard, then fs.rename + settle. */
+  const commitRename = (path: string, raw: string): void => {
+    setRenaming(null)
+    const name = raw.trim()
+    if (cwd === undefined || name === baseName(path) || !validRename(name)) {
+      if (name !== baseName(path) && !validRename(name)) setActionError(t('renameInvalid'))
+      return
+    }
+    api.fsRename({ sessionId, cwd }, path, name)
+      .then((result) => {
+        setActionError(null)
+        pruneTree(path)
+        onPathRenamed?.(path, result.path)
+      })
+      .catch((error: unknown) => {
+        setActionError(error instanceof Error ? error.message : String(error))
+      })
+  }
+
+  /** Run the confirmed delete: fs.remove + settle + close affected tabs. */
+  const performDelete = (target: { path: string; isDir: boolean }): void => {
+    if (cwd === undefined) return
+    api.fsRemove({ sessionId, cwd }, target.path)
+      .then(() => {
+        setActionError(null)
+        pruneTree(target.path)
+        onPathDeleted?.(target.path, target.isDir)
+      })
+      .catch((error: unknown) => {
+        setActionError(error instanceof Error ? error.message : String(error))
+      })
+  }
+
   // The caller's refresh tick wipes the cache (declared BEFORE the load
   // effect so the reload below sees the empty cache).
   const lastTick = useRef(refreshTick)
@@ -332,7 +404,7 @@ export function FileTree(props: {
         title={t('referenceFile')}
         onClick={(event) => {
           event.stopPropagation()
-          onReferenceFile(entry.path)
+          onReferenceFile(entry.path, entry.isDir)
         }}
       >
         {t('referenceFile')}
@@ -373,13 +445,14 @@ export function FileTree(props: {
     if (openWithTargets === undefined || onOpenWith === undefined || openWithTargets.length === 0) return []
     const pinnedIds = openWithPinned ?? []
     /** Brand marks for the built-ins (monochrome silhouettes, currentColor);
-     *  reveal gets the folder glyph, custom editors a generic code mark. */
+     *  reveal gets the folder glyph, custom editors a generic code mark.
+     *  The compact menu's icon slot is 14px, so every mark renders at 14. */
     const itemIcon = (target: OpenWithTarget): ReactNode => {
-      if (target.kind === 'reveal') return <VscFolderOpened size={16} />
-      if (target.id === 'vscode') return <IconVscode16 size={16} />
-      if (target.id === 'cursor') return <SiCursor size={16} />
-      if (target.id === 'zed') return <SiZedindustries size={16} />
-      return <IconCodeOutline16 size={16} />
+      if (target.kind === 'reveal') return <VscFolderOpened size={14} />
+      if (target.id === 'vscode') return <IconVscode16 size={14} />
+      if (target.id === 'cursor') return <SiCursor size={14} />
+      if (target.id === 'zed') return <SiZedindustries size={14} />
+      return <IconCodeOutline16 size={14} />
     }
     const pinned = openWithTargets
       .filter(target => pinnedIds.includes(target.id))
@@ -412,7 +485,7 @@ export function FileTree(props: {
                 onToggleOpenWithPin?.(target.id)
               }}
             >
-              {pinnedNow ? <VscPinned size={14} /> : <VscPin size={14} />}
+              {pinnedNow ? <VscPinned size={12} /> : <VscPin size={12} />}
             </span>
           </span>
         ),
@@ -433,7 +506,7 @@ export function FileTree(props: {
             <IconChevronRightOutline14 size={14} className={css.openWithChevron} aria-hidden />
           </span>
         ),
-        icon: <VscLinkExternal size={16} />,
+        icon: <VscLinkExternal size={14} />,
         submenu,
       },
     ]
@@ -441,6 +514,64 @@ export function FileTree(props: {
 
   const root = cwd
 
+  // Membership is tested per rendered row (deep trees run this thousands of
+  // times per render): includes() made every row O(expanded), the whole tree
+  // O(rows × expanded). One Set per render keeps it O(1) per row.
+  const expandedSet = useMemo(() => new Set(expanded), [expanded])
+  const revealedSet = useMemo(() => new Set(revealed), [revealed])
+
+  /**
+   * Focus + select the rename editor once, on mount. The callback identity
+   * must stay STABLE (useCallback []): an inline arrow re-runs on every
+   * render (detach null → attach el), and focus()/select() mid-keystroke
+   * would reselect the whole buffer while typing. A plain <input>, not the
+   * primitives Input — that one forwards no ref, and focus+select is the
+   * entire point here.
+   */
+  const renameInputRef = useCallback((el: HTMLInputElement | null): void => {
+    if (el !== null) {
+      el.focus()
+      el.select()
+    }
+  }, [])
+
+  /** The inline rename editor replacing one row (dirs and files alike):
+   *  same indent/icon/height for a seamless swap, Enter/blur commits,
+   *  Escape cancels, IME composition keys never reach the handlers (the
+   *  shared isImeComposition guard). */
+  const renderRenameRow = (entry: FsEntry, depth: number): ReactNode => (
+    <div
+      key={entry.path}
+      className={clsx(css.explorerRow, css.explorerRenaming)}
+      style={{ paddingLeft: depth * 22 + 6 }}
+    >
+      {entry.isDir
+        ? (expandedSet.has(entry.path) ? <VscFolderOpened size={14} /> : <VscFolder size={14} />)
+        : <VscFile size={14} />}
+      <input
+        ref={renameInputRef}
+        className={css.explorerRenameInput}
+        value={renaming?.value ?? ''}
+        aria-label={t('rename')}
+        spellCheck={false}
+        onChange={(event) => {
+          setRenaming(prev => prev === null ? prev : { ...prev, value: event.target.value })
+        }}
+        onKeyDown={(event) => {
+          if (isImeComposition(event)) return
+          if (event.key === 'Enter') {
+            event.preventDefault()
+            commitRename(entry.path, renaming?.value ?? '')
+          } else if (event.key === 'Escape') {
+            event.preventDefault()
+            setRenaming(null)
+          }
+        }}
+        onBlur={() => { commitRename(entry.path, renaming?.value ?? '') }}
+      />
+    </div>
+  )
+
   const renderLevel = (dir: string, depth: number): ReactNode => {
     const level = data[dir]
     if (level === undefined) {
@@ -465,8 +596,12 @@ export function FileTree(props: {
     }
     const entries = level.entries ?? []
     return entries.map(entry => {
+      // The row being renamed renders as its editor (no button semantics:
+      // an editor is not a click target — and a nested interactive inside
+      // role="button" would be invalid anyway).
+      if (renaming?.path === entry.path) return renderRenameRow(entry, depth)
       if (entry.isDir) {
-        const isOpen = expanded.includes(entry.path)
+        const isOpen = expandedSet.has(entry.path)
         return (
           <div key={entry.path}>
             <div
@@ -475,9 +610,9 @@ export function FileTree(props: {
               className={clsx(
                 css.explorerRow, css.explorerDir, entry.hidden && css.explorerHidden,
                 dropTarget === entry.path && css.explorerRowDropTarget,
-                revealed.includes(entry.path) && css.explorerRowRevealed,
+                revealedSet.has(entry.path) && css.explorerRowRevealed,
               )}
-              data-dsh-revealed={revealed.includes(entry.path) ? 'true' : undefined}
+              data-dsh-revealed={revealedSet.has(entry.path) ? 'true' : undefined}
               style={{ paddingLeft: depth * 22 + 6 }}
               onClick={() => { onToggle(entry.path) }}
               onKeyDown={(event) => {
@@ -507,9 +642,9 @@ export function FileTree(props: {
           className={clsx(
             css.explorerRow, entry.hidden && css.explorerHidden, entry.broken && css.explorerBroken,
             dropTarget === parentOf(entry.path) && css.explorerRowDropTarget,
-            revealed.includes(entry.path) && css.explorerRowRevealed,
+            revealedSet.has(entry.path) && css.explorerRowRevealed,
           )}
-          data-dsh-revealed={revealed.includes(entry.path) ? 'true' : undefined}
+          data-dsh-revealed={revealedSet.has(entry.path) ? 'true' : undefined}
           style={{ paddingLeft: depth * 22 + 6 }}
           title={entry.broken ? `${entry.path} — ${t('brokenSymlink')}` : entry.path}
           onClick={() => { onOpenFile(entry.path) }}
@@ -545,6 +680,22 @@ export function FileTree(props: {
         <div className={css.explorerEmpty}>{t('noSession')}</div>
       ) : (
         <>
+          {/* The last mutation failure (rename/delete): dismissable, raw
+              server text — the same show-the-truth policy the fence notice
+              uses. Any later action or a fresh attempt clears it. */}
+          {actionError !== null && (
+            <div className={css.explorerActionError} role="alert">
+              <span className={css.explorerActionErrorText}>{actionError}</span>
+              <button
+                type="button"
+                className={css.explorerActionErrorClose}
+                aria-label={t('dismiss')}
+                onClick={() => { setActionError(null) }}
+              >
+                <IconCloseFill14 />
+              </button>
+            </div>
+          )}
           <div
             className={clsx(css.explorerRow, dropTarget === root && css.explorerRowDropTarget)}
             style={{ paddingLeft: 6 }}
@@ -564,7 +715,7 @@ export function FileTree(props: {
                   title={t('referenceFile')}
                   onClick={(event) => {
                     event.stopPropagation()
-                    onReferenceFile(root)
+                    onReferenceFile(root, true)
                   }}
                 >
                   {t('referenceFile')}
@@ -644,22 +795,31 @@ export function FileTree(props: {
         items={[
           // The open escapes head the FILE menu (dirs only get copy).
           ...(rowMenu?.isDir === false && onOpenFileNewTab !== undefined
-            ? [{ id: 'open-new-tab', label: t('openFileNewTab'), icon: <IconCodeOutline16 size={16} /> }]
+            ? [{ id: 'open-new-tab', label: t('openFileNewTab'), icon: <IconCodeOutline16 size={14} /> }]
             : []),
           ...(rowMenu?.isDir === false && onOpenFileSide !== undefined
-            ? [{ id: 'open-side', label: t('openFileSide'), icon: <VscFolderOpened size={16} /> }]
+            ? [{ id: 'open-side', label: t('openFileSide'), icon: <VscFolderOpened size={14} /> }]
             : []),
           ...openWithEntries(),
           // Download applies to files only (the host route refuses directories).
           ...(rowMenu?.isDir === false
-            ? [{ id: 'download', label: t('download'), icon: <IconDownloadOutline16 size={16} /> }]
+            ? [{ id: 'download', label: t('download'), icon: <IconDownloadOutline16 size={14} /> }]
             : []),
           // Upload into a directory (incl. the workspace root row).
           ...(rowMenu?.isDir === true
-            ? [{ id: 'upload-here', label: t('uploadHere'), icon: <IconUploadOutline16 size={16} /> }]
+            ? [{ id: 'upload-here', label: t('uploadHere'), icon: <IconUploadOutline16 size={14} /> }]
+            : []),
+          { id: 'relative', label: t('copyRelative'), icon: <IconCopyOutline16 size={14} /> },
+          { id: 'absolute', label: t('copyAbsolute'), icon: <IconCopyOutline16 size={14} /> },
+          // Explorer mutations close the menu; the workspace ROOT row is the
+          // session itself — never renamable or deletable (server double-guards).
+          ...(rowMenu !== null && rowMenu.path !== cwd
+            ? [
+                { id: 'mutate-sep', type: 'separator' } as MenuEntry,
+                { id: 'rename', label: t('rename'), icon: <IconEditOutline16 size={14} /> },
+                { id: 'delete', label: t('delete'), icon: <IconTrashOutline16 size={14} />, danger: true },
+              ]
             : []),
-          { id: 'relative', label: t('copyRelative'), icon: <IconCopyOutline16 size={16} /> },
-          { id: 'absolute', label: t('copyAbsolute'), icon: <IconCopyOutline16 size={16} /> },
         ]}
         onSelect={(id) => {
           const target = rowMenu
@@ -686,16 +846,55 @@ export function FileTree(props: {
             fileInputRef.current?.click()
             return
           }
+          if (id === 'rename') {
+            setRenaming({ path: target.path, value: baseName(target.path) })
+            return
+          }
+          if (id === 'delete') {
+            setConfirmDelete({ path: target.path, isDir: target.isDir, name: baseName(target.path) })
+            return
+          }
           copyPath(
             id === 'relative' ? relativeTo(cwd ?? '', target.path) : target.path,
             target.path,
           )
         }}
         portal
+        compact
         align="start"
         getAnchorRect={() => (rowMenu === null ? null : new DOMRect(rowMenu.x, rowMenu.y, 0, 0))}
         anchor={<span />}
       />
+
+      {/* The delete confirmation: destructive and permanent (no host trash),
+          so it always lands here first — the same Cancel/Confirm shape the
+          git lens uses for discard/revert/cherry-pick. */}
+      <Modal
+        open={confirmDelete !== null}
+        onClose={() => { setConfirmDelete(null) }}
+        title={confirmDelete === null ? '' : t('deleteTitle', { name: confirmDelete.name })}
+        closeLabel={t('cancel')}
+        footer={(
+          <>
+            <Button variant="outline" onClick={() => { setConfirmDelete(null) }}>{t('cancel')}</Button>
+            <Button
+              variant="primary"
+              onClick={() => {
+                const pending = confirmDelete
+                if (pending === null) return
+                setConfirmDelete(null)
+                performDelete(pending)
+              }}
+            >
+              {t('delete')}
+            </Button>
+          </>
+        )}
+      >
+        <p className={css.explorerConfirmDesc}>
+          {confirmDelete === null ? '' : t(confirmDelete.isDir ? 'deleteDescDir' : 'deleteDescFile')}
+        </p>
+      </Modal>
     </div>
   )
 }

src/client/FreeWindow.tsx

@@ -1,337 +0,0 @@
-/**
- * One free window: a tab dragged out of the workbench floating over the
- * conversation area at viewport coordinates (rendered inside the panel host,
- * so desktop-shell transforms can never hijack its fixed containing block).
- *
- * The header drags the window with the panel-resize pattern — pointer
- * capture + per-frame direct DOM writes + a store commit on release — and
- * doubling as the DOCK-BACK gesture: while the pointer is over a workbench
- * pane ([data-dsh-pane], either panel), that pane highlights live and
- * releasing docks the tab into it (center merge); releasing anywhere else
- * just moves the window. The SE corner resizes, any press raises (the
- * floats array's order is the stacking order), the header right-click menu
- * and the X button dock / close. The tab content reuses the regular tab
- * renderer, so every tab type (terminal, editor, plugin tabs) floats
- * unchanged.
- */
-import { useEffect, useRef, useState, type ReactNode } from 'react'
-import clsx from 'clsx'
-import { IconCloseFill14, Menu } from '@deepseek-ai/dsh-client-ui-primitives'
-import type { FloatWindow, SidebarTab } from './state.ts'
-import { FLOAT_MIN_H, FLOAT_MIN_W } from './state.ts'
-import { t } from './locales.ts'
-import css from './sidebar.module.css'
-
-/** A drag's mutable bookkeeping (start geometry + the last applied values). */
-interface DragState {
-  /** Which handle owns the drag (the abort path reads it from this ref —
-   *  the React `dragging` state lags a render behind pointerdown). */
-  mode: 'move' | 'resize'
-  pointerX: number
-  pointerY: number
-  startX: number
-  startY: number
-  startW: number
-  startH: number
-  /** Last geometry actually written to the DOM (the cancel-path fallback). */
-  applied: { x: number; y: number; w: number; h: number }
-  /** Settled after the final pointer event (the up position wins over the
-   * rAF-pending value — a fast flick coalesces its tail into the up event). */
-  committed: boolean
-}
-
-/** The pane under a viewport point, if any (rect hit-test; the dragged
- *  window itself is not a pane, so it cannot shadow the targets). */
-function paneAt(x: number, y: number): HTMLElement | null {
-  for (const pane of document.querySelectorAll<HTMLElement>('[data-dsh-pane]')) {
-    const rect = pane.getBoundingClientRect()
-    if (rect.width === 0 || rect.height === 0) continue
-    if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) return pane
-  }
-  return null
-}
-
-/** Pointer-capture helpers tolerant of environments without the API (jsdom
- *  lacks setPointerCapture — component tests dispatch plain MouseEvents, so
- *  the optional calls keep them driving the drag; real browsers always have
- *  it and a missing pointerId can never occur there). */
-const capturePointer = (element: HTMLElement, pointerId: number): void => {
-  element.setPointerCapture?.(pointerId)
-}
-
-const releasePointer = (element: HTMLElement, pointerId: number): void => {
-  element.releasePointerCapture?.(pointerId)
-}
-
-/** Whether the element holds the pointer (assumed true without the API). */
-const holdsPointer = (element: HTMLElement, pointerId: number): boolean => {
-  return element.hasPointerCapture?.(pointerId) !== false
-}
-
-export function FreeWindow(props: {
-  float: FloatWindow
-  renderTab: (tab: SidebarTab, active: boolean, paneId: string) => ReactNode
-  getTabIcon?: (tab: SidebarTab) => ReactNode
-  onRaise: () => void
-  onMove: (x: number, y: number) => void
-  onResize: (w: number, h: number) => void
-  /** Dock the tab back; the pane id, or null for the active pane. */
-  onDock: (paneId: string | null) => void
-  onClose: () => void
-}) {
-  const { float, renderTab, getTabIcon, onRaise, onMove, onResize, onDock, onClose } = props
-  const rootRef = useRef<HTMLDivElement>(null)
-  const dragRef = useRef<DragState | null>(null)
-  // The pane currently highlighted as the dock target (a direct DOM write:
-  // per-frame React state would re-render every mounted tab at drag cadence).
-  const dockTargetRef = useRef<HTMLElement | null>(null)
-  // rAF coalescing: pointermove outruns the display, one write per frame.
-  const frameRef = useRef<number | null>(null)
-  const pendingRef = useRef<{ x: number; y: number; w: number; h: number } | null>(null)
-  const [dragging, setDragging] = useState<'move' | 'resize' | null>(null)
-  const [menu, setMenu] = useState<{ x: number; y: number } | null>(null)
-
-  useEffect(() => () => {
-    if (frameRef.current !== null) cancelAnimationFrame(frameRef.current)
-    dockTargetRef.current?.removeAttribute('data-dsh-float-dock-over')
-  }, [])
-
-  /** Apply the pending geometry to the DOM (one rAF per frame at most). */
-  const scheduleApply = (geo: { x: number; y: number; w: number; h: number }): void => {
-    pendingRef.current = geo
-    if (frameRef.current !== null) return
-    frameRef.current = requestAnimationFrame(() => {
-      frameRef.current = null
-      const pending = pendingRef.current
-      const drag = dragRef.current
-      const root = rootRef.current
-      if (pending === null || drag === null || root === null) return
-      drag.applied = pending
-      root.style.left = `${pending.x}px`
-      root.style.top = `${pending.y}px`
-      root.style.width = `${pending.w}px`
-      root.style.height = `${pending.h}px`
-    })
-  }
-
-  /** Flush the pending frame synchronously (the release path's last write). */
-  const flushNow = (): void => {
-    const pending = pendingRef.current
-    const drag = dragRef.current
-    const root = rootRef.current
-    if (pending === null || drag === null || root === null) return
-    if (frameRef.current !== null) {
-      cancelAnimationFrame(frameRef.current)
-      frameRef.current = null
-    }
-    pendingRef.current = null
-    drag.applied = pending
-    root.style.left = `${pending.x}px`
-    root.style.top = `${pending.y}px`
-    root.style.width = `${pending.w}px`
-    root.style.height = `${pending.h}px`
-  }
-
-  const clearDockHighlight = (): void => {
-    dockTargetRef.current?.removeAttribute('data-dsh-float-dock-over')
-    dockTargetRef.current = null
-  }
-
-  /** Release a drag: `pane` (when set) docks instead of moving. */
-  const finishDrag = (mode: 'move' | 'resize', geo: { x: number; y: number; w: number; h: number }, pane: HTMLElement | null): void => {
-    const drag = dragRef.current
-    if (drag === null || drag.committed) return
-    drag.committed = true
-    dragRef.current = null
-    setDragging(null)
-    const target = pane ?? dockTargetRef.current
-    clearDockHighlight()
-    if (mode === 'move' && target !== null) {
-      onDock(target.getAttribute('data-dsh-pane'))
-    } else if (mode === 'move') {
-      onMove(geo.x, geo.y)
-    } else {
-      onResize(geo.w, geo.h)
-    }
-  }
-
-  /** Cancel-path settle (pointercancel / lostpointercapture): the last
-   * APPLIED geometry is the user-visible truth — commit it, never roll back
-   * (the panel drags' issue-#247 semantics). The mode comes from the ref —
-   * the React `dragging` state can still be null when the cancel lands
-   * before the pointerdown re-render commits. */
-  const abortDrag = (): void => {
-    const drag = dragRef.current
-    if (drag === null || drag.committed) return
-    flushNow()
-    finishDrag(drag.mode, drag.applied, null)
-  }
-
-  const clampMove = (x: number, y: number): { x: number; y: number; w: number; h: number } => {
-    const vw = window.innerWidth
-    const vh = window.innerHeight
-    return {
-      x: Math.min(Math.max(x, 0), Math.max(0, vw - float.w)),
-      y: Math.min(Math.max(y, 0), Math.max(0, vh - float.h)),
-      w: float.w,
-      h: float.h,
-    }
-  }
-
-  const clampResize = (w: number, h: number): { x: number; y: number; w: number; h: number } => {
-    const vw = window.innerWidth
-    const vh = window.innerHeight
-    return {
-      x: float.x,
-      y: float.y,
-      w: Math.round(Math.min(Math.max(w, FLOAT_MIN_W), Math.max(FLOAT_MIN_W, vw - float.x))),
-      h: Math.round(Math.min(Math.max(h, FLOAT_MIN_H), Math.max(FLOAT_MIN_H, vh - float.y))),
-    }
-  }
-
-  return (
-    <div
-      ref={rootRef}
-      className={clsx(css.floatWindow, dragging !== null && css.floatWindowDragging)}
-      data-dsh-float-window
-      data-dsh-float-id={float.id}
-      style={{ left: float.x, top: float.y, width: float.w, height: float.h }}
-      onPointerDown={() => { onRaise() }}
-    >
-      <div
-        className={css.floatHeader}
-        onPointerDown={(event) => {
-          if (event.button !== 0) return
-          // Portaled overlays (the header Menu) live at document.body in the
-          // DOM, yet their events still bubble through the React tree into
-          // this handler — without the containment guard a menu-row click
-          // would start a drag, preventDefault (killing the row's compat
-          // mousedown) and capture the pointer (retargeting the release at
-          // the header, so the row's click never fires). Buttons inside the
-          // header (the close X) need the same exclusion: a capture here
-          // swallows their click.
-          if (!(event.target instanceof Node) || !event.currentTarget.contains(event.target)) return
-          if (event.target instanceof Element && event.target.closest('button') !== null) return
-          event.preventDefault()
-          capturePointer(event.currentTarget, event.pointerId)
-          dragRef.current = {
-            mode: 'move',
-            pointerX: event.clientX,
-            pointerY: event.clientY,
-            startX: float.x,
-            startY: float.y,
-            startW: float.w,
-            startH: float.h,
-            applied: { x: float.x, y: float.y, w: float.w, h: float.h },
-            committed: false,
-          }
-          setDragging('move')
-        }}
-        onPointerMove={(event) => {
-          const drag = dragRef.current
-          if (drag === null || !holdsPointer(event.currentTarget, event.pointerId)) return
-          const geo = clampMove(drag.startX + (event.clientX - drag.pointerX), drag.startY + (event.clientY - drag.pointerY))
-          scheduleApply(geo)
-          const target = paneAt(event.clientX, event.clientY)
-          if (target !== dockTargetRef.current) {
-            clearDockHighlight()
-            if (target !== null) target.setAttribute('data-dsh-float-dock-over', '')
-            dockTargetRef.current = target
-          }
-        }}
-        onPointerUp={(event) => {
-          if (dragRef.current === null || !holdsPointer(event.currentTarget, event.pointerId)) return
-          releasePointer(event.currentTarget, event.pointerId)
-          flushNow()
-          const geo = clampMove(
-            dragRef.current.startX + (event.clientX - dragRef.current.pointerX),
-            dragRef.current.startY + (event.clientY - dragRef.current.pointerY),
-          )
-          finishDrag('move', geo, paneAt(event.clientX, event.clientY))
-        }}
-        onPointerCancel={() => { abortDrag() }}
-        onLostPointerCapture={() => { abortDrag() }}
-        onContextMenu={(event) => {
-          event.preventDefault()
-          setMenu({ x: event.clientX, y: event.clientY })
-        }}
-      >
-        {getTabIcon?.(float.tab) ?? null}
-        <span className={css.floatTitle} title={float.tab.title}>{float.tab.title}</span>
-        <button
-          type="button"
-          className={css.floatClose}
-          aria-label={t('close')}
-          onClick={(event) => { event.stopPropagation(); onClose() }}
-        >
-          <IconCloseFill14 />
-        </button>
-        <Menu
-          open={menu !== null}
-          onClose={() => { setMenu(null) }}
-          items={[
-            { id: 'dock', label: t('dockToSidebar') },
-            { id: 'close', label: t('close') },
-          ]}
-          onSelect={(id) => {
-            setMenu(null)
-            if (id === 'dock') onDock(null)
-            else if (id === 'close') onClose()
-          }}
-          portal
-          align="start"
-          getAnchorRect={() => (menu === null ? null : new DOMRect(menu.x, menu.y, 0, 0))}
-          anchor={<span />}
-        />
-      </div>
-      {/* The tab cell reuses .paneTab (the pane's per-tab wrapper): the
-          column-flex chain (window → .floatContent → .paneTab) is what
-          gives the component a definite width via align-stretch — the exact
-          sizing contract a tab gets inside a pane. */}
-      <div className={css.floatContent}>
-        <div className={css.paneTab}>{renderTab(float.tab, true, float.id)}</div>
-      </div>
-      <div
-        className={css.floatResize}
-        onPointerDown={(event) => {
-          if (event.button !== 0) return
-          if (!(event.target instanceof Node) || !event.currentTarget.contains(event.target)) return
-          event.preventDefault()
-          capturePointer(event.currentTarget, event.pointerId)
-          dragRef.current = {
-            mode: 'resize',
-            pointerX: event.clientX,
-            pointerY: event.clientY,
-            startX: float.x,
-            startY: float.y,
-            startW: float.w,
-            startH: float.h,
-            applied: { x: float.x, y: float.y, w: float.w, h: float.h },
-            committed: false,
-          }
-          setDragging('resize')
-        }}
-        onPointerMove={(event) => {
-          const drag = dragRef.current
-          if (drag === null || !holdsPointer(event.currentTarget, event.pointerId)) return
-          scheduleApply(clampResize(
-            drag.startW + (event.clientX - drag.pointerX),
-            drag.startH + (event.clientY - drag.pointerY),
-          ))
-        }}
-        onPointerUp={(event) => {
-          if (dragRef.current === null || !holdsPointer(event.currentTarget, event.pointerId)) return
-          releasePointer(event.currentTarget, event.pointerId)
-          flushNow()
-          const geo = clampResize(
-            dragRef.current.startW + (event.clientX - dragRef.current.pointerX),
-            dragRef.current.startH + (event.clientY - dragRef.current.pointerY),
-          )
-          finishDrag('resize', geo, null)
-        }}
-        onPointerCancel={() => { abortDrag() }}
-        onLostPointerCapture={() => { abortDrag() }}
-      />
-    </div>
-  )
-}

src/client/MarkdownHtml.tsx

@@ -10,32 +10,31 @@
  * Security posture: every HTML string (block leaves, inline text, wrapper
  * open-tag attributes) goes through DOMPurify with an explicit denylist on
  * top of its defaults (no script/style/iframe/forms), anchors are forced to
- * open in a new tab with noopener, and local media `src` attributes are
- * rewritten through the session-scoped `/sidebar/file` media route — the same
- * trust fence the markdown image rewriter (`markdown-images.ts`) uses.
+ * open in a new tab with noopener, and local media goes through the
+ * session-scoped `/sidebar/file` media route — markdown-syntax image
+ * destinations are rewritten via `markdown-images.ts` and `src` attributes
+ * through `resolveLocalMediaDest` (the same trust fence).
  */
 import { useLayoutEffect, useMemo, useRef } from 'react'
 import { createElement, type ReactNode } from 'react'
 import DOMPurify from 'dompurify'
 import { MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives'
-import type { ComponentType } from 'react'
 import { markdownTextProps } from './markdown-labels.tsx'
-import { lazyChunkComponent } from './lazy-chunk.tsx'
-import { resolveLocalMediaDest } from './markdown-images.ts'
+import { resolveLocalMediaDest, rewriteLocalImageUrls } from './markdown-images.ts'
 import {
   analyzeHtmlSegment,
   type AnalyzedMarkdownHtml,
 } from './markdown-html.ts'
-import { splitMermaidBlocks, type MermaidMarkdownProps } from './mermaid-blocks.ts'
+import { splitMermaidBlocks } from './mermaid-blocks.ts'
 import type { SessionScope } from './api.ts'
 import css from './sidebar.module.css'
 
 /** The chunk-resident markdown renderer (mermaid lazy chunk), shared with the
- *  legacy no-HTML preview path in TextEditor. */
-export const LazyMermaidMarkdown = lazyChunkComponent<MermaidMarkdownProps>(
-  'mermaid',
-  (mod) => mod.MermaidMarkdown as ComponentType<MermaidMarkdownProps> | undefined,
-)
+ *  legacy no-HTML preview path in TextEditor. Defined in mermaid-lazy.tsx (a
+ *  light module) so core-bundle consumers can import the stub without
+ *  dragging DOMPurify along. */
+export { LazyMermaidMarkdown } from './mermaid-lazy.tsx'
+import { LazyMermaidMarkdown } from './mermaid-lazy.tsx'
 
 /** Everything the sanitizers need to resolve local media + scope the route. */
 export interface MarkdownHtmlMedia {
@@ -235,7 +234,12 @@ export function MarkdownDocument({ info, media, codeLabels }: MarkdownDocumentPr
   const prepared = useMemo<PreparedSegment[]>(() => info.segments.map((segment): PreparedSegment => {
     if (segment.kind === 'markdown') {
       const defs = info.referenceDefinitions
-      const text = defs === '' ? segment.text : `${segment.text}\n\n${defs}`
+      const raw = defs === '' ? segment.text : `${segment.text}\n\n${defs}`
+      // MarkdownText drops non-http(s) image destinations (chat-security
+      // stance), so rewrite local ones into /sidebar/file media URLs first —
+      // the same trust fence the sanitized HTML leaves below go through.
+      // Idempotent: already-absolute media URLs pass through untouched.
+      const text = rewriteLocalImageUrls(raw, media.scope, media.path, media.origin)
       return {
         kind: 'markdown',
         text,

src/client/PdfView.tsx

@@ -40,6 +40,9 @@ export function PdfView(props: { scope: SessionScope; path: string; title: strin
       controller.abort()
       if (objectUrl !== undefined) URL.revokeObjectURL(objectUrl)
     }
+    // Granular scope fields: the scope object's identity churns, only its
+    // sessionId / cwd fields gate the fetch.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [scope.sessionId, scope.cwd, path])
 
   useEffect(() => {

src/client/RenderBoundary.tsx

@@ -7,7 +7,7 @@
  *   errors in the sidebar shell itself (Workbench, drag layout, …) — a full
  *   swap keeps the page alive.
  * - PER-TAB (Sidebar.tsx TabContent, `css.tabBoundaryError`): a crashing
- *   viewer/editor shows a strip inside ITS OWN pane; the toggle cluster, the
+ *   viewer/editor shows a strip inside ITS OWN pane; the workbench shell, the
  *   other tabs, and the panel itself stay alive (issue #31 — a tab crash
  *   must never take down the whole sidebar).
  *

src/client/SideCardSection.tsx

@@ -54,13 +54,9 @@ import clsx from 'clsx'
 import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
 import type { PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
 import {
-  clampWidthPercent,
   TITLE_BAR_STRIP_MAX,
   TITLE_BAR_STRIP_MIN,
-  WIDTH_PERCENT_MAX,
-  WIDTH_PERCENT_MIN,
   type SidebarPrefs,
-  type TitleBarScheme,
 } from '../prefs-shared.ts'
 import { api } from './api.ts'
 import { parsePrefs } from './prefs.ts'
@@ -573,7 +569,6 @@ export function SettingsBody(props: {
  */
 export function SideCardSection({ store, service }: SideCardSectionProps) {
   const [prefs, setPrefs] = useState<SidebarPrefs>(() => store.getPrefs())
-  const [widthDraft, setWidthDraft] = useState<string>(String(store.getPrefs().defaultWidthPercent))
   const [error, setError] = useState<string | null>(null)
   // Which feature's secondary settings popup is open (null = closed).
   const [settingsFor, setSettingsFor] = useState<TabDescriptor | FileViewerDescriptor | null>(null)
@@ -625,9 +620,7 @@ export function SideCardSection({ store, service }: SideCardSectionProps) {
       if (cancelled) return
       revisionRef.current = view.revision
       if (dirtyRef.current) return
-      const next = parsePrefs(view.value)
-      setPrefs(next)
-      setWidthDraft(String(next.defaultWidthPercent))
+      setPrefs(parsePrefs(view.value))
     }).catch(() => { /* the store's defaults stay authoritative */ })
     return () => { cancelled = true }
   }, [])
@@ -658,9 +651,7 @@ export function SideCardSection({ store, service }: SideCardSectionProps) {
 
   /** Settle one commit: success adopts the server values, failure reverts. */
   const applyOutcome = (previous: SidebarPrefs, outcome: { ok: boolean; prefs: SidebarPrefs }): void => {
-    const settled = outcome.ok ? outcome.prefs : previous
-    setPrefs(settled)
-    setWidthDraft(String(settled.defaultWidthPercent))
+    setPrefs(outcome.ok ? outcome.prefs : previous)
   }
 
   /** Optimistically apply one pref patch, then commit (revert on failure). */
@@ -673,10 +664,6 @@ export function SideCardSection({ store, service }: SideCardSectionProps) {
     void commit(patch).then(outcome => applyOutcome(previous, outcome))
   }
 
-  const onToggle = (next: boolean): void => {
-    applyPref({ openByDefault: next })
-  }
-
   /** Flip one per-tab enable switch (merge into the tabsEnabled map). */
   const onToggleTab = (id: string, next: boolean): void => {
     applyPref({ tabsEnabled: { ...optimisticRef.current.tabsEnabled, [id]: next } })
@@ -779,20 +766,6 @@ export function SideCardSection({ store, service }: SideCardSectionProps) {
     return raw
   }
 
-  const commitWidth = (): void => {
-    const parsed = Number(widthDraft)
-    if (!Number.isFinite(parsed)) {
-      setWidthDraft(String(prefs.defaultWidthPercent))
-      return
-    }
-    const clamped = clampWidthPercent(parsed)
-    const previous = prefs
-    setPrefs({ ...previous, defaultWidthPercent: clamped })
-    setWidthDraft(String(clamped))
-    setError(null)
-    void commit({ defaultWidthPercent: clamped }).then(outcome => applyOutcome(previous, outcome))
-  }
-
   /**
    * One SMALL toggle card for the responsive inventory grid: the card's main
    * area is the switch (click to flips, visual state IS the state), the icon
@@ -868,51 +841,6 @@ export function SideCardSection({ store, service }: SideCardSectionProps) {
       {/* 常规: the DSH settings-row recipe — title/desc left, control right. */}
       <div className={css.group}>
         <div className={css.groupHeading}>{t('settingsGeneralTitle')}</div>
-        <div className={css.row}>
-          <span className={css.rowText}>
-            <span className={css.title}>{t('settingsOpenTitle')}</span>
-            <span className={css.desc}>{t('settingsOpenDesc')}</span>
-          </span>
-          <Switch
-            label={t('settingsOpenTitle')}
-            checked={prefs.openByDefault}
-            onChange={onToggle}
-          />
-        </div>
-        <div className={css.row}>
-          <span className={css.rowText}>
-            <span className={css.title}>{t('settingsWidthTitle')}</span>
-            <span className={css.desc}>{t('settingsWidthDesc')}</span>
-          </span>
-          <span className={css.control}>
-            <Input
-              type="number"
-              className={css.percentInput}
-              value={widthDraft}
-              min={WIDTH_PERCENT_MIN}
-              max={WIDTH_PERCENT_MAX}
-              step={1}
-              aria-label={t('settingsWidthTitle')}
-              onChange={event => { setWidthDraft(event.currentTarget.value) }}
-              onBlur={commitWidth}
-              onKeyDown={event => {
-                if (event.key === 'Enter') event.currentTarget.blur()
-              }}
-            />
-            <span className={css.suffix}>{t('settingsWidthSuffix')}</span>
-          </span>
-        </div>
-        <div className={css.row}>
-          <span className={css.rowText}>
-            <span className={css.title}>{t('settingsOpenPathTitle')}</span>
-            <span className={css.desc}>{t('settingsOpenPathDesc')}</span>
-          </span>
-          <Switch
-            label={t('settingsOpenPathTitle')}
-            checked={prefs.interceptOpenPath}
-            onChange={(next) => { applyPref({ interceptOpenPath: next }) }}
-          />
-        </div>
         <div className={css.row}>
           <span className={css.rowText}>
             <span className={css.title}>{t('settingsOpenToolsTitle')}</span>
@@ -947,9 +875,11 @@ export function SideCardSection({ store, service }: SideCardSectionProps) {
                 ...getShellPresets().map(preset => ({
                   value: `preset:${preset.id}`,
                   title: preset.title,
+                  // The preset desc is i18n-friendly (string or () => string)
+                  // — resolve it like every other settings text here.
                   desc: preset.detect?.(detectedEnv) === true
-                    ? `${preset.desc}（${t('settingsSchemeDetectedSuffix')}）`
-                    : preset.desc,
+                    ? `${textOf(preset.desc)}（${t('settingsSchemeDetectedSuffix')}）`
+                    : textOf(preset.desc),
                 })),
                 { value: 'custom', title: t('settingsSchemeCustomTitle'), desc: t('settingsSchemeCustomDesc') },
               ]}

src/client/SideChatView.module.css

@@ -221,6 +221,18 @@
   transform: rotate(90deg);
 }
 
+/* Tool-kind leading glyph (the main conversation's 16px slot; the icon
+ * itself renders at 14). Failed rows pass a StateDot instead. */
+.sidechatRowIcon {
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  height: 16px;
+  color: var(--dsw-alias-label-tertiary);
+}
+
 .sidechatRowLabel {
   flex: none;
   max-width: 60%;
@@ -280,6 +292,23 @@
   border-top: 1px solid var(--dsw-alias-hairline);
 }
 
+/* Host Block atoms (terminal/diff/read) inside a row body draw their own
+ * chrome; only a hair of breathing room is added on top. */
+.sidechatRowBody > * {
+  margin-top: 2px;
+}
+
+/* Turn-tail metrics line: quiet, right-aligned, ink-weight only. */
+.sidechatTurnSummary {
+  align-self: flex-end;
+  max-width: 88%;
+  padding: 0 2px;
+  font: var(--dsw-font-xxs-12);
+  font-variant-numeric: tabular-nums;
+  color: var(--dsw-alias-label-tertiary);
+  user-select: none;
+}
+
 /* Shimmer sweep text: generating (streaming row labels, creating hero). */
 .sidechatShimmerText {
   background-image: linear-gradient(

src/client/SideChatView.tsx

@@ -27,15 +27,27 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useSyncExternalStore } from 'react'
 import clsx from 'clsx'
 import {
+  ConnectionIndicator,
+  DiffBlock,
+  IconApiOutline14,
+  IconBrowseOutline16,
   IconChevronRightOutline14,
+  IconEditOutline16,
   IconNewChatOutline16,
   IconPlusOutline16,
+  IconSearchOutline16,
   IconSendOutline16,
+  IconSparkle16,
   IconStopFill16,
   MarkdownText,
   Menu,
+  ReadBlock,
   StateDot,
+  TerminalBlock,
+  type DiffBlockLabels,
   type MenuEntry,
+  type ReadBlockLabels,
+  type TerminalBlockLabels,
 } from '@deepseek-ai/dsh-client-ui-primitives'
 import { markdownTextProps } from './markdown-labels.tsx'
 import { IconHistoryOutline16, IconSaveOutline16 } from './icons.tsx'
@@ -46,10 +58,19 @@ import {
   sideThreadRows,
   threadHasCompletedTurn,
   threadTrailingPending,
+  type SidechatLiveEvent,
   type SidechatThreadInfo,
 } from '../sidechat-core.ts'
-import { toolArgsSummary, transcriptRows, type SidechatTranscriptRow } from './sidechat-transcript.ts'
+import {
+  formatDurationMs,
+  formatTokens,
+  toolArgsSummary,
+  transcriptRows,
+  type SidechatToolCard,
+  type SidechatTranscriptRow,
+} from './sidechat-transcript.ts'
 import { api } from './api.ts'
+import { usePolling } from './use-polling.ts'
 import { t } from './locales.ts'
 import type { SessionScope } from './api.ts'
 import type { SidebarTab } from './state.ts'
@@ -92,6 +113,8 @@ const inFlightStarts = new Set<string>()
  * the afterSeq delta and never re-download what they already hold). */
 interface ThreadCache {
   entries: SidebarHistoryEntry[]
+  /** The CURRENT attempt's live deltas (replaced every pull, never merged). */
+  live: SidechatLiveEvent[]
 }
 
 /** Row-render labels (locale-dependent, memoized once per mount). */
@@ -100,6 +123,9 @@ interface RowLabels {
   copiedLabel: string
   thinkLabel: string
   injectionLabel: string
+  terminal: TerminalBlockLabels
+  diff: DiffBlockLabels
+  read: ReadBlockLabels
 }
 
 /** Merge history entries by event seq (newest wins), log order preserved. */
@@ -132,8 +158,13 @@ function CollapsibleRow(props: {
   mono?: boolean
   streaming?: boolean
   failed?: boolean
+  /** 16px leading glyph (tool-kind icon, the main conversation's row head). */
+  icon?: React.ReactNode
   children?: React.ReactNode
 }): React.ReactNode {
+  const leading = props.icon === undefined ? null : (
+    <span className={css.sidechatRowIcon}>{props.icon}</span>
+  )
   const label = (
     <span
       className={clsx(
@@ -151,6 +182,7 @@ function CollapsibleRow(props: {
   if (props.children === undefined) {
     return (
       <div className={clsx(css.sidechatRowLine, css.sidechatRowStatic, props.failed === true && css.sidechatRowFailed)}>
+        {leading}
         {label}
         {meta}
       </div>
@@ -168,6 +200,7 @@ function CollapsibleRow(props: {
         <span className={css.sidechatRowChevron}>
           <IconChevronRightOutline14 size={12} />
         </span>
+        {leading}
         {label}
         {meta}
       </summary>
@@ -176,6 +209,52 @@ function CollapsibleRow(props: {
   )
 }
 
+/** The host Block body for a structured tool card (main-conversation atoms:
+ *  terminal surface, diff hunks, line-numbered read window). */
+function toolCardBody(card: SidechatToolCard, executing: boolean, labels: RowLabels): React.ReactNode {
+  if (card.type === 'terminal') {
+    return (
+      <TerminalBlock
+        command={card.command}
+        cwd={card.cwd}
+        output={card.output}
+        exitCode={card.exitCode}
+        signal={card.signal}
+        running={executing}
+        labels={labels.terminal}
+      />
+    )
+  }
+  if (card.type === 'diff') {
+    return <DiffBlock diffs={card.diffs} labels={labels.diff} />
+  }
+  return <ReadBlock label={card.label} lines={card.lines} totalLines={card.totalLines} lang={card.lang} labels={labels.read} />
+}
+
+/** The tool row's 16px leading slot, the way the main conversation draws it
+ *  (GenericToolCard's variant table): the tool-kind glyph at 14, replaced by
+ *  an error StateDot on failed rows. */
+function toolLeading(name: string, failed: boolean): React.ReactNode {
+  if (failed) return <StateDot state="error" />
+  switch (name) {
+    case 'bash':
+    case 'pwsh':
+      return <IconApiOutline14 size={14} />
+    case 'read':
+    case 'web_fetch':
+      return <IconBrowseOutline16 size={14} />
+    case 'edit':
+    case 'write':
+      return <IconEditOutline16 size={14} />
+    case 'grep':
+    case 'glob':
+    case 'web_search':
+      return <IconSearchOutline16 size={14} />
+    default:
+      return <IconSparkle16 size={14} />
+  }
+}
+
 /** One row renderer (React keys ride the source event seq). */
 function renderRow(row: SidechatTranscriptRow, labels: RowLabels): React.ReactNode {
   switch (row.kind) {
@@ -207,22 +286,40 @@ function renderRow(row: SidechatTranscriptRow, labels: RowLabels): React.ReactNo
           <div className={css.sidechatRowProse}>{row.text}</div>
         </CollapsibleRow>
       )
-    case 'tool': {
-      const body = (
-        <>
-          {row.args !== undefined && <pre className={css.sidechatRowCode}>{row.args}</pre>}
-          {row.resultText !== undefined && <pre className={css.sidechatRowCode}>{row.resultText}</pre>}
-        </>
+    case 'turnSummary': {
+      // Quiet turn-tail metrics: token usage + wall duration, main-pane
+      // StatsLine formatting. Parts appear only when computable.
+      const parts: string[] = []
+      if (row.inputTokens !== undefined && row.outputTokens !== undefined) {
+        parts.push(t('sideChatTurnUsage', { input: formatTokens(row.inputTokens), output: formatTokens(row.outputTokens) }))
+      }
+      if (row.durationMs !== undefined) parts.push(formatDurationMs(row.durationMs))
+      if (parts.length === 0) return null
+      return (
+        <div key={`${row.kind}:${row.seq}`} className={css.sidechatTurnSummary}>
+          {parts.join(' · ')}
+        </div>
       )
+    }
+    case 'tool': {
+      const body = row.card !== undefined
+        ? toolCardBody(row.card, row.executing === true, labels)
+        : (
+          <>
+            {row.args !== undefined && <pre className={css.sidechatRowCode}>{row.args}</pre>}
+            {row.resultText !== undefined && <pre className={css.sidechatRowCode}>{row.resultText}</pre>}
+          </>
+        )
       return (
         <CollapsibleRow
           key={`${row.kind}:${row.seq}`}
           label={row.name}
           meta={toolArgsSummary(row.args)}
+          icon={toolLeading(row.name, row.failed)}
           mono
           streaming={row.executing === true}
           failed={row.failed}
-          {...(row.args === undefined && row.resultText === undefined ? {} : { children: body })}
+          {...(row.args === undefined && row.resultText === undefined && row.card === undefined ? {} : { children: body })}
         />
       )
     }
@@ -237,15 +334,35 @@ export function SideChatView(props: {
   visible: boolean
 }): React.ReactNode {
   const { ctx, scope, tab, visible } = props
-  const rowLabels = useMemo<RowLabels>(
-    () => ({
+  const rowLabels = useMemo<RowLabels>(() => {
+    // Shared Block chrome: copy buttons reuse the sidebar's copy pair, the
+    // collapse/expand family is common to every Block kind.
+    const shared = {
+      copy: t('copy'),
+      copied: t('copied'),
+      collapse: t('sideChatBlockCollapse'),
+      collapseAria: t('sideChatBlockCollapseAria'),
+      expand: (hidden: number) => t('sideChatBlockExpand', { hidden }),
+      expandAria: (hidden: number) => t('sideChatBlockExpandAria', { hidden }),
+    }
+    return {
       copyLabel: t('copy'),
       copiedLabel: t('copied'),
       thinkLabel: t('sideChatThink'),
       injectionLabel: t('sideChatInjection'),
-    }),
-    [],
-  )
+      terminal: {
+        ...shared,
+        signal: (signal: string) => t('sideChatBlockSignal', { signal }),
+        exitCode: (exitCode: number) => t('sideChatBlockExitCode', { code: exitCode }),
+        running: t('sideChatBlockRunning'),
+        failed: t('sideChatBlockFailed'),
+        done: t('sideChatBlockDone'),
+        noOutput: t('sideChatBlockNoOutput'),
+      },
+      diff: { ...shared, files: (count: number) => t('sideChatBlockFiles', { count }) },
+      read: { ...shared, window: (shown: number, total: number) => t('sideChatBlockWindow', { shown, total }) },
+    }
+  }, [])
 
   // The session list feed: thread rows (the header menu) + running states.
   const list = useSyncExternalStore(
@@ -269,7 +386,9 @@ export function SideChatView(props: {
   const [info, setInfo] = useState<SidechatThreadInfo | null>(null)
   const [menuOpen, setMenuOpen] = useState(false)
 
-  const cacheRef = useRef<ThreadCache>({ entries: [] })
+  const cacheRef = useRef<ThreadCache>({ entries: [], live: [] })
+  // The previous poll's rows (see the mapping's reuse pass below).
+  const prevRowsRef = useRef<SidechatTranscriptRow[]>([])
   const controllerRef = useRef<AbortController | null>(null)
   const scrollRef = useRef<HTMLDivElement | null>(null)
   const composerRef = useRef<HTMLTextAreaElement | null>(null)
@@ -277,6 +396,15 @@ export function SideChatView(props: {
   const summary = threadId === undefined ? undefined : list.byId[threadId]
   const running = summary?.running === true
 
+  // Connection recovery state (DSH 0.1.2-alpha.2+): drives the disconnect
+  // banner and an immediate catch-up pull when the wire comes back. The poll
+  // loop itself stays silent on wire failures; absent service (older host)
+  // reads as `undefined` = never show the banner.
+  const connectionState = useSyncExternalStore(
+    useMemo(() => (callback: () => void) => ctx.connection?.state.subscribe(callback) ?? (() => {}), [ctx]),
+    useCallback(() => ctx.connection?.state.getSnapshot(), [ctx]),
+  )
+
   /** The agent-identity badge of the thread header (preset · model). */
   const agentBadge = useMemo(() => {
     if (info === null) return ''
@@ -332,14 +460,18 @@ export function SideChatView(props: {
     try {
       const cache = cacheRef.current
       const afterSeq = cache.entries.at(-1)?.event.seq
-      const { events } = await api.sidechatEvents(childId, afterSeq, controller.signal)
+      const { events, live } = await api.sidechatEvents(childId, afterSeq, controller.signal)
+      // The live set is the CURRENT attempt, so it replaces whatever the
+      // previous pull held; a settled step drops out of the host buffer and
+      // its durable assistant/message takes over in the mapping.
+      cache.live = live ?? []
       if (events.length > 0) {
         // Wire events arrive as parsed JSON; the mirror narrows data to the
         // record the mapping reads.
         const incoming = events.map(event => ({ event: event as SidebarSessionEvent }))
         cache.entries = mergeBySeq(cache.entries, incoming)
-        setRevision(value => value + 1)
       }
+      setRevision(value => value + 1)
     } catch {
       // Aborted by a newer pull or a wire failure: keep the last rows.
     }
@@ -357,7 +489,8 @@ export function SideChatView(props: {
   // Reset the transcript cache whenever the binding changes, then focus
   // the composer — it owns the first message of a fresh thread.
   useEffect(() => {
-    cacheRef.current = { entries: [] }
+    cacheRef.current = { entries: [], live: [] }
+    prevRowsRef.current = []
     controllerRef.current?.abort()
     setError(null)
     setSaved(false)
@@ -368,22 +501,65 @@ export function SideChatView(props: {
     }
   }, [threadId, fetchInfo])
 
-  // Poll while the tab is visible and the thread runs.
+  // One transcript pull on every input change (attach, visibility flip,
+  // run-state flip — the last one catches a thread's terminal state once it
+  // stops running).
   useEffect(() => {
     if (!visible || threadId === undefined) return
     void fetchThread(threadId)
-    if (!running) return
-    const timer = window.setInterval(() => {
-      void fetchThread(threadId)
-      void fetchInfo(threadId)
-    }, POLL_MS)
-    return () => { window.clearInterval(timer) }
-  }, [visible, threadId, running, fetchThread, fetchInfo])
+    // `running` is not read here, but re-triggering this pull on run-state
+    // flips is load-bearing (see above); the badge fetch rides the ticks.
+  }, [visible, threadId, running, fetchThread])
+
+  // Poll while the tab is visible and the thread runs: transcript deltas +
+  // badge refresh on a fixed cadence. Each pull self-guards (fetchThread
+  // aborts its predecessor; a late settle keeps the last rows).
+  const pollTick = useCallback(async (): Promise<void> => {
+    if (threadId === undefined) return
+    void fetchThread(threadId)
+    void fetchInfo(threadId)
+  }, [threadId, fetchThread, fetchInfo])
+  usePolling(visible && running && threadId !== undefined, pollTick, { intervalMs: POLL_MS })
 
   useEffect(() => () => { controllerRef.current?.abort() }, [])
 
-  const rows = useMemo(
-    () => (threadId === undefined ? [] : transcriptRows(cacheRef.current.entries)),
+  // When the wire recovers (disconnected → connected), pull immediately
+  // instead of waiting for the next poll tick — or, on an idle thread that
+  // stopped polling, forever.
+  const prevConnectionRef = useRef(connectionState)
+  useEffect(() => {
+    const previous = prevConnectionRef.current
+    prevConnectionRef.current = connectionState
+    if (previous === 'disconnected' && connectionState === 'connected' && threadId !== undefined) {
+      void fetchThread(threadId)
+      void fetchInfo(threadId)
+    }
+  }, [connectionState, threadId, fetchThread, fetchInfo])
+
+  // The previous poll's rows ride into the mapping so unchanged rows keep
+  // their object identity (see reuseRows): the 2s poll re-renders only the
+  // changed tail instead of re-parsing markdown for the whole transcript.
+  // The live deltas are appended AFTER the durable events (they are the
+  // in-flight tail), and a delta whose step already settled durably is
+  // dropped: the durable message is authoritative and would otherwise render
+  // twice.
+  const rows = useMemo(() => {
+    const cache = cacheRef.current
+    const settled = new Set(
+      cache.entries
+        .filter(entry => entry.event.type === 'assistant/message')
+        .map(entry => {
+          const data = entry.event.data as { turn?: unknown; step?: unknown }
+          return `${String(data.turn)}:${String(data.step)}`
+        }),
+    )
+    const live = cache.live
+      .filter(event => !settled.has(`${String(event.data.turn)}:${String(event.data.step)}`))
+      .map(event => ({ event: event as SidebarSessionEvent }))
+    const next = threadId === undefined ? [] : transcriptRows([...cache.entries, ...live], prevRowsRef.current)
+    prevRowsRef.current = next
+    return next
+  },
     // The cache is a ref; revision bumps on every successful pull.
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [threadId, revision],
@@ -430,7 +606,6 @@ export function SideChatView(props: {
       }
     }
     return items
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [threads])
 
   const growComposer = (): void => {
@@ -544,7 +719,7 @@ export function SideChatView(props: {
           )}
           items={menuItems}
           selectedId={threadId}
-          onSelect={(id) => { id === '$new' ? openNewThread() : openExistingThread(id) }}
+          onSelect={(id) => { if (id === '$new') openNewThread(); else openExistingThread(id) }}
           onClose={() => { setMenuOpen(false) }}
           align="end"
           portal
@@ -560,6 +735,18 @@ export function SideChatView(props: {
           <IconSaveOutline16 />
         </button>
       </div>
+      {connectionState !== undefined && connectionState !== 'connected' && (
+        <ConnectionIndicator
+          state={connectionState}
+          disconnectedLabel={t('sideChatConnDisconnected')}
+          reconnectLabel={t('sideChatConnReconnect')}
+          connectingLabel={t('sideChatConnConnecting')}
+          recoveredLabel={t('sideChatConnRecovered')}
+          reconnectActionLabel={t('sideChatConnReconnectAction')}
+          restartActionLabel={t('sideChatConnRestartAction')}
+          onReconnect={() => { ctx.connection?.reconnect() }}
+        />
+      )}
       {!canSave && !freshThread && <div className={css.sidechatHint}>{t('sideChatNoTurn')}</div>}
       {canSave && trailingPending
         && <div className={css.sidechatHint}>{t('sideChatPendingDrop')}</div>}

src/client/SubagentView.tsx

@@ -53,6 +53,7 @@ import {
   type TreeJob,
 } from './subagent-jobs.ts'
 import { api, type JobOutputResult } from './api.ts'
+import { usePolling } from './use-polling.ts'
 import { IconStopOutline16 } from './icons.tsx'
 import { t } from './locales.ts'
 import css from './SubagentView.module.css'
@@ -180,52 +181,30 @@ function SubagentLiveLines(props: { live: LastActivity | undefined }) {
 /**
  * One shared live-preview poller for the whole Subagent tree. Unlike the old
  * per-card `subagents.history` timers, this sends at most ONE `subagents.live`
- * request at a time: a recursive timeout starts only after the previous
- * request settles, so a slow host never sees abort/restart storms.
+ * request at a time (the shared poller's self-scheduling mode arms the next
+ * tick only after the previous request settles, so a slow host never sees
+ * abort/restart storms); a response settling after the poller stopped (page
+ * hidden, tree re-rooted) is dropped via the aborted signal.
  */
 function useSubagentLive(
   rootId: string | undefined,
   active: boolean,
 ): Readonly<Record<string, LastActivity>> {
   const [live, setLive] = useState<Record<string, LastActivity>>({})
-  const controllerRef = useRef<AbortController | undefined>(undefined)
 
   // A new tree must never inherit another root's live previews.
   useEffect(() => { setLive({}) }, [rootId])
 
-  useEffect(() => {
-    if (rootId === undefined || !active) return
-    const targetRootId = rootId
-    let disposed = false
-    let timer: number | undefined
-
-    const schedule = (): void => {
-      if (disposed) return
-      timer = window.setTimeout(() => { void load() }, POLL_MS)
-    }
-    async function load(): Promise<void> {
-      if (disposed) return
-      const controller = new AbortController()
-      controllerRef.current = controller
-      try {
-        const result = await api.subagentsLive(targetRootId, controller.signal)
-        if (!disposed) setLive(result.live)
-      } catch {
-        // Keep the last known live map; the next scheduled poll retries.
-      } finally {
-        if (controllerRef.current === controller) controllerRef.current = undefined
-        if (!disposed) schedule()
-      }
-    }
-
-    void load()
-    return () => {
-      disposed = true
-      if (timer !== undefined) window.clearTimeout(timer)
-      controllerRef.current?.abort()
-      controllerRef.current = undefined
-    }
-  }, [rootId, active])
+  const poll = useCallback(async (signal: AbortSignal): Promise<void> => {
+    if (rootId === undefined) return
+    const result = await api.subagentsLive(rootId, signal)
+    if (!signal.aborted) setLive(result.live)
+  }, [rootId])
+  usePolling(rootId !== undefined && active, poll, {
+    intervalMs: POLL_MS,
+    mode: 'self-scheduling',
+    immediate: true,
+  })
 
   return live
 }
@@ -415,6 +394,9 @@ function JobOutputPane(props: {
     if (!active || !isJobLive(job)) return
     const timer = window.setInterval(() => { void load() }, JOB_POLL_MS)
     return () => { window.clearInterval(timer) }
+    // isJobLive reads only job.status; whole-job identity churns on every
+    // catalog refresh and must not restart the poll interval.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [load, active, job.status])
 
   useEffect(() => () => { controllerRef.current?.abort() }, [])
@@ -425,6 +407,8 @@ function JobOutputPane(props: {
     if (!isJobLive(job) || typeof state !== 'object' || state.text.length === 0) return
     const pre = preRef.current
     if (pre !== null) pre.scrollTop = pre.scrollHeight
+    // Same as the poll effect above: only the status transition matters.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [state, job.status])
 
   return (
@@ -656,7 +640,9 @@ export function SubagentView(props: {
     useCallback(() => sessions.list.getSnapshot(), [sessions]),
   )
   const byId = list.byId
-  const catalogs = list.subagentsByParent ?? {}
+  // Memoized so the empty-catalog fallback keeps a stable identity — a fresh
+  // `{}` per render would invalidate every catalog-dependent memo/effect.
+  const catalogs = useMemo(() => list.subagentsByParent ?? {}, [list.subagentsByParent])
 
   // The topology root: the main agent of the current session's tree.
   const rootId = useMemo(() => rootAncestor(byId, sessionId), [byId, sessionId])
@@ -680,6 +666,9 @@ export function SubagentView(props: {
     if (rootId === undefined || !active) return
     observe(rootId, true)
     return () => {
+      // The cleanup must release everything observed AT cleanup time (the set
+      // mutates as branches open), so reading the ref here is the point.
+      // eslint-disable-next-line react-hooks/exhaustive-deps
       for (const parentSessionId of observedRef.current) {
         sessions.setSubagentCatalogOpen?.(parentSessionId, false)
       }
@@ -715,7 +704,7 @@ export function SubagentView(props: {
     try {
       sessions.openSubagent?.(address)
     } catch (error) {
-      console.warn('[dsh-better-sidebar] openSubagent failed:', error)
+      console.error('[dsh-better-sidebar] openSubagent failed:', error)
     }
   }, [sessions, onOpenChild])
 
@@ -725,7 +714,7 @@ export function SubagentView(props: {
     try {
       sessions.open?.(rootId)
     } catch (error) {
-      console.warn('[dsh-better-sidebar] open session failed:', error)
+      console.error('[dsh-better-sidebar] open session failed:', error)
     }
   }, [sessions, rootId])
 

src/client/TabBar.tsx

@@ -4,9 +4,8 @@
  * button cluster, and the + menu that opens new tabs (explorer / git /
  * terminal). Tabs are draggable; dropping onto another tab inserts before it,
  * dropping on the strip background appends to this pane. Right-clicking a
- * tab opens the tab context menu (float as a free window / close / close
- * others / close to the left / close to the right, the close ones scoped to
- * this pane).
+ * tab opens the tab context menu (close / close others / close to the left /
+ * close to the right, the close ones scoped to this pane).
  */
 import { useEffect, useRef, useState, type ReactNode } from 'react'
 import clsx from 'clsx'
@@ -16,6 +15,7 @@ import {
 import type { SidebarTab } from './state.ts'
 import { isAgentTabId } from './state.ts'
 import { isPinnedVirtualTab } from './pinned.ts'
+import { useSubmenuFlip } from './menu-flip.ts'
 import { IconPinOutline16 } from './icons.tsx'
 import { t } from './locales.ts'
 import css from './sidebar.module.css'
@@ -67,9 +67,6 @@ export function TabBar(props: {
   newTabOptions: NewTabOption[]
   /** Drop of a tab from any pane: (payload, insertBeforeTabId | null). */
   onDropTab: (payload: TabDragPayload, before: string | null) => void
-  /** Float a tab out as a free window (the tab context menu's entry; the
-   *  drag-to-conversation gesture is handled at the Sidebar shell level). */
-  onFloatTab: (tabId: string) => void
   /**
    * Pin/unpin a terminal tab (v0.17.0+). Called with `'workspace'` or
    * `'global'` to pin (the shell snapshots the home cwd), or `null` to
@@ -84,12 +81,15 @@ export function TabBar(props: {
   getTabBadge?: (tab: SidebarTab) => ReactNode
 }) {
   const {
-    paneId, tabs, active, onActivate, onClose, onNewTab, newTabOptions, onDropTab, onFloatTab, onPinTab, getTabIcon, getTabBadge,
+    paneId, tabs, active, onActivate, onClose, onNewTab, newTabOptions, onDropTab, onPinTab, getTabIcon, getTabBadge,
   } = props
   const [menuOpen, setMenuOpen] = useState(false)
   // The tab right-click context menu: the target tab plus the cursor
-  // position (the portaled Menu anchors there, following GitView/FileTree).
+  // position (the portaled Menu anchors there, following the git lens/FileTree).
   const [tabMenu, setTabMenu] = useState<{ tabId: string; x: number; y: number } | null>(null)
+  // The strip sits at the panel's top, so the pin submenu must grow downward;
+  // the flip hook derives that from the cursor y (upper half → "down").
+  useSubmenuFlip(tabMenu)
   const [dragOver, setDragOver] = useState(false)
   const listRef = useRef<HTMLDivElement>(null)
   // The context target's index in the render-time tab snapshot; -1 when the
@@ -265,6 +265,7 @@ export function TabBar(props: {
             setMenuOpen(false)
           }}
           portal
+          compact
           align="end"
           anchor={(
             <button
@@ -293,9 +294,8 @@ export function TabBar(props: {
             // The target tab drives the pin entry's shape: terminal tabs
             // get either a "Pin ▸" submenu (unpinned) or a single "Unpin"
             // row (pinned). Non-terminal tabs and missing onPinTab get no
-            // pin entry at all — the menu stays exactly the legacy 5-item
-            // shape. Pinned VIRTUAL tabs (injected from other sessions)
-            // get a stripped menu: only Unpin + Close (no float, no
+            // pin entry at all. Pinned VIRTUAL tabs (injected from other
+            // sessions) get a stripped menu: only Unpin + Close (no
             // close-others/left/right — those are pane-scoped operations
             // that don't apply to cross-session virtual tabs).
             const targetTab = tabMenuIndex >= 0 ? tabs[tabMenuIndex] : undefined
@@ -320,7 +320,6 @@ export function TabBar(props: {
               ]
             }
             return [
-              { id: 'float', label: t('moveToFreeWindow') },
               ...pinEntries,
               { id: 'close', label: t('close') },
               { id: 'closeOthers', label: t('closeOtherTabs'), ...(tabs.length <= 1 ? { disabled: true } : {}) },
@@ -334,9 +333,7 @@ export function TabBar(props: {
             setTabMenu(null)
             const index = tabs.findIndex(tab => tab.id === target.tabId)
             if (index < 0) return
-            if (id === 'float') {
-              onFloatTab(target.tabId)
-            } else if (id === 'pinWorkspace') {
+            if (id === 'pinWorkspace') {
               onPinTab?.(target.tabId, 'workspace')
             } else if (id === 'pinGlobal') {
               onPinTab?.(target.tabId, 'global')
@@ -355,6 +352,7 @@ export function TabBar(props: {
             }
           }}
           portal
+          compact
           align="start"
           getAnchorRect={() => (tabMenu === null ? null : new DOMRect(tabMenu.x, tabMenu.y, 0, 0))}
           anchor={<span />}

src/client/TerminalView.tsx

@@ -37,6 +37,7 @@ import { FitAddon } from '@xterm/addon-fit'
 import { writeClipboard } from '@deepseek-ai/dsh-client-ui-primitives'
 import '@xterm/xterm/css/xterm.css'
 import { t } from './locales.ts'
+import { ONE_DARK, ONE_LIGHT } from './one-dark-palette.ts'
 import { openWhenSized } from './open-when-sized.ts'
 import { api, type SessionScope, type TerminalDepsStatus } from './api.ts'
 import { agentUuidOf, isAgentTabId, type SidebarStore } from './state.ts'
@@ -60,6 +61,13 @@ const FAILURE_LIMIT = 3
  */
 const PTY_DEPS_MISSING = 'pty-deps-missing'
 
+/**
+ * The WS close-reason prefix the host sends when the CONFIGURED shell was
+ * not found (mirror of src/index.ts wsCloseReasonOf; wire contract, keep the
+ * literal in lockstep). The view renders a localized, actionable banner.
+ */
+const SHELL_NOT_FOUND_PREFIX = 'shell-not-found:'
+
 /** The degraded-mode payload rendered by {@link TerminalDepsBanner}. */
 type TerminalDepsInfo = Extract<TerminalDepsStatus, { ok: false }>
 
@@ -67,24 +75,24 @@ type TerminalDepsInfo = Extract<TerminalDepsStatus, { ok: false }>
  * Curated ANSI palettes for the terminal. The surface colors (background,
  * foreground, cursor, selection) ride the theme tokens so the terminal
  * blends with the panel in both schemes; the 16 ANSI colors are the same
- * designed palettes the app's code surfaces use (one-dark family for dark,
- * one-light family for light), read live so a scheme flip re-themes in
- * place.
+ * designed syntax families the app's code surfaces use — one-dark for
+ * dark, one-light for light (one-dark-palette.ts, shared with the
+ * CodeMirror themes) — read live so a scheme flip re-themes in place.
  */
 const ANSI_DARK: Record<string, string> = {
-  black: '#282c34', red: '#e06c75', green: '#98c379', yellow: '#e5c07b',
-  blue: '#61afef', magenta: '#c678dd', cyan: '#56b6c2', white: '#abb2bf',
-  brightBlack: '#5c6370', brightRed: '#e06c75', brightGreen: '#98c379',
-  brightYellow: '#e5c07b', brightBlue: '#61afef', brightMagenta: '#c678dd',
-  brightCyan: '#56b6c2', brightWhite: '#ffffff',
+  black: ONE_DARK.black, red: ONE_DARK.red, green: ONE_DARK.green, yellow: ONE_DARK.yellow,
+  blue: ONE_DARK.blue, magenta: ONE_DARK.magenta, cyan: ONE_DARK.cyan, white: ONE_DARK.gray,
+  brightBlack: ONE_DARK.faintGray, brightRed: ONE_DARK.red, brightGreen: ONE_DARK.green,
+  brightYellow: ONE_DARK.yellow, brightBlue: ONE_DARK.blue, brightMagenta: ONE_DARK.magenta,
+  brightCyan: ONE_DARK.cyan, brightWhite: ONE_DARK.white,
 }
 
 const ANSI_LIGHT: Record<string, string> = {
-  black: '#383a42', red: '#e45649', green: '#50a14f', yellow: '#c18401',
-  blue: '#0184bc', magenta: '#a626a4', cyan: '#0997b3', white: '#a0a1a7',
-  brightBlack: '#4f525e', brightRed: '#e45649', brightGreen: '#50a14f',
-  brightYellow: '#c18401', brightBlue: '#0184bc', brightMagenta: '#a626a4',
-  brightCyan: '#0997b3', brightWhite: '#fafafa',
+  black: ONE_LIGHT.black, red: ONE_LIGHT.red, green: ONE_LIGHT.green, yellow: ONE_LIGHT.yellow,
+  blue: ONE_LIGHT.blue, magenta: ONE_LIGHT.magenta, cyan: ONE_LIGHT.cyan, white: ONE_LIGHT.gray,
+  brightBlack: ONE_LIGHT.faintGray, brightRed: ONE_LIGHT.red, brightGreen: ONE_LIGHT.green,
+  brightYellow: ONE_LIGHT.yellow, brightBlue: ONE_LIGHT.blue, brightMagenta: ONE_LIGHT.magenta,
+  brightCyan: ONE_LIGHT.cyan, brightWhite: ONE_LIGHT.offWhite,
 }
 
 /** The xterm theme for the current scheme (surface from tokens, ANSI curated). */
@@ -241,6 +249,12 @@ export function TerminalView(props: { scope: SessionScope; tabId: string; store:
           })
           return
         }
+        // The configured shell could not be found (settings page or yaml):
+        // a localized banner beats the raw English close reason.
+        if (event.code === 1011 && event.reason.startsWith(SHELL_NOT_FOUND_PREFIX)) {
+          setFatal(t('terminalShellNotFound', { name: event.reason.slice(SHELL_NOT_FOUND_PREFIX.length) || '?' }))
+          return
+        }
         // A server-side refusal carries a close code + reason; retrying it
         // forever would only spin the banner, so surface it with a retry.
         if (event.code === 1011 && event.reason !== '') {
@@ -268,13 +282,23 @@ export function TerminalView(props: { scope: SessionScope; tabId: string; store:
     const inputSub = term.onData((data) => {
       if (socket !== null && socket.readyState === WebSocket.OPEN) socket.send(data)
     })
+    // Resize streams fire per layout frame during panel open/close
+    // animations; fit() measures glyphs, so coalesce to one fit per
+    // animation frame (same pattern as the core's frame-batcher, kept
+    // local — this view lives in the lazy terminal chunk and does not
+    // import core-bundle modules).
+    let resizeFrame: number | null = null
     const observer = new ResizeObserver(() => {
-      try {
-        fit.fit()
-        sendResize()
-      } catch {
-        // The terminal may be mid-dispose; ignore.
-      }
+      if (resizeFrame !== null) return
+      resizeFrame = requestAnimationFrame(() => {
+        resizeFrame = null
+        try {
+          fit.fit()
+          sendResize()
+        } catch {
+          // The terminal may be mid-dispose; ignore.
+        }
+      })
     })
     observer.observe(host)
 
@@ -323,6 +347,7 @@ export function TerminalView(props: { scope: SessionScope; tabId: string; store:
       cancelOpen()
       window.clearTimeout(retry)
       observer.disconnect()
+      if (resizeFrame !== null) cancelAnimationFrame(resizeFrame)
       fontSub()
       schemeSub()
       inputSub.dispose()

src/client/TextEditor.tsx

@@ -13,7 +13,7 @@
  * the FileViewerProps toolbar callbacks so the host's path-input header
  * renders the controls instead.
  */
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { createPortal } from 'react-dom'
 import clsx from 'clsx'
 import { EditorState } from '@codemirror/state'
@@ -22,40 +22,34 @@ import { defaultKeymap, history, historyKeymap } from '@codemirror/commands'
 import { IconCheckOutline16, MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives'
 import { markdownTextProps } from './markdown-labels.tsx'
 import { api, htmlUrl } from './api.ts'
+import { markdownPreviewSource } from './markdown-frontmatter.ts'
 import { rewriteLocalImageUrls } from './markdown-images.ts'
 import { languageForPath } from './lang.ts'
 import { cmSurfaceTheme, CmThemeCompartment } from './cm-themes.ts'
 import { isDarkScheme, subscribeColorScheme } from './theme.ts'
 import { SandboxStatusBar } from './SandboxStatusBar.tsx'
 import { appendToDraft } from './conversation-draft.ts'
+import { useSelectionPopup } from './selection-popup.ts'
 import { buildSelectionInsert, linesOfSelection } from './selection-payload.ts'
-import { lazyChunkComponent } from './lazy-chunk.tsx'
 import { analyzeMarkdownHtml } from './markdown-html.ts'
 import { LazyMermaidMarkdown, MarkdownDocument, type MarkdownHtmlMedia } from './MarkdownHtml.tsx'
 import { MdToc } from './md-toc.tsx'
 import { splitMermaidBlocks } from './mermaid-blocks.ts'
 import { t } from './locales.ts'
+import { HTML_IFRAME_SANDBOX } from './html-preview.ts'
 import type { EditorToolbarState, FileViewerProps } from './service.ts'
 import css from './sidebar.module.css'
 
 /** Previewable files (rendered output vs source editing). */
 type ViewMode = 'preview' | 'edit'
 
-/** The floating "add to conversation" action: payload + viewport anchor. */
-interface SelectionPopup {
-  insert: string
-  left: number
-  top: number
-}
-
-/**
- * The sandbox tokens of the HTML preview iframe. NO allow-same-origin (the
- * preview must stay in an opaque origin — with the route's own origin it
- * could read session data) and NO allow-top-navigation (a previewed page
- * must not hijack the GUI). The user can disable the sandbox per-feature
- * in the side card settings (warned); the toggle below reflects it.
- */
-export const HTML_IFRAME_SANDBOX = 'allow-scripts allow-popups allow-downloads allow-modals'
+/** Per-file preview scroll memory. Module-level so it survives viewer
+ *  remounts: the save-then-switch-to-preview reload (EditorHost #215 case B)
+ *  rebuilds the whole TextEditor instance, and without this the preview
+ *  would remount at the top. Keyed by session + path; a fresh entry reads 0
+ *  (new file opens at the top), re-opens/toggles restore the last position. */
+const previewScrollMemory = new Map<string, number>()
+const previewScrollKey = (scope: { sessionId: string }, path: string): string => `${scope.sessionId}::${path}`
 
 export function TextEditor(props: FileViewerProps) {
   const { ctx, scope, path, viewerId, content, truncated } = props
@@ -71,36 +65,39 @@ export function TextEditor(props: FileViewerProps) {
   const themeCompRef = useRef<CmThemeCompartment | null>(null)
   /** The app's resolved color scheme; the editor re-themes in place on flips. */
   const [dark, setDark] = useState(() => isDarkScheme())
-  /** The floating "add to conversation" popup (viewport-anchored; null = hidden). */
-  const [popup, setPopup] = useState<SelectionPopup | null>(null)
-  /** Live mirror of the popup state for click-time reads (no re-render race). */
-  const popupRef = useRef<SelectionPopup | null>(null)
   /** The markdown preview container (selection-containment + line lookup). */
   const mdRef = useRef<HTMLDivElement>(null)
+  const markdown = viewerId === 'markdown'
+  const html = viewerId === 'html'
+  /** Preview scroll position across the preview<->edit toggle. The preview
+   *  container re-mounts on every mode switch and its scrollTop lives on that
+   *  element, so capture it on scroll and restore after each remount. Seeded
+   *  from the module-level per-file memory so a full viewer rebuild
+   *  (save-then-switch-to-preview reload) also keeps the position. */
+  const previewScrollRef = useRef(previewScrollMemory.get(previewScrollKey(scope, path)) ?? 0)
+  /** True while a programmatic restore is in flight; raw scroll events caused
+   *  by the restore (or by the browser clamping a collapsed reload container
+   *  to 0) must not overwrite the remembered position. */
+  const restoringRef = useRef(false)
+  /** Preview-side handoff data for the preview -> edit switch: the text at the
+   *  top of the preview viewport (best-effort) plus the scroll ratio. Captured
+   *  throttled on preview scroll; consumed when entering edit mode so the
+   *  editor opens where the reader was instead of at the file top. */
+  const previewSyncRef = useRef<{ text: string | null; ratio: number }>({ text: null, ratio: 0 })
+  const anchorThrottleRef = useRef(false)
 
-  const hidePopup = (): void => {
-    popupRef.current = null
-    setPopup(null)
-  }
-
-  /** Anchor the popup above the selection center; clamp inside the viewport. */
-  const showPopup = (insert: string, left: number, top: number): void => {
-    const next: SelectionPopup = {
-      insert,
-      left: Math.min(Math.max(left, 80), window.innerWidth - 80),
-      top,
-    }
-    popupRef.current = next
-    setPopup(next)
-  }
-
-  /** The popup button's click: insert the stored payload into the draft. */
-  const commitPopup = (): void => {
-    const current = popupRef.current
-    if (current === null) return
-    appendToDraft(ctx, scope.sessionId, current.insert)
-    hidePopup()
-  }
+  /**
+   * The floating "add to conversation" popup (viewport-anchored; null =
+   * hidden). The hook owns show/hide/commit plus the global dismissal
+   * listeners (outside mousedown, Escape, hidden tab/window, surface
+   * leaving the viewport) — see selection-popup.ts.
+   */
+  const selectionPopup = useSelectionPopup({
+    onCommit: (insert) => { appendToDraft(ctx, scope.sessionId, insert) },
+    // The surface that must stay on screen: the markdown preview container
+    // in preview mode, the CodeMirror host otherwise.
+    getSurface: () => (markdown && mode === 'preview' ? mdRef.current : hostRef.current),
+  })
 
   useEffect(() => subscribeColorScheme(() => { setDark(isDarkScheme()) }), [])
 
@@ -110,15 +107,26 @@ export function TextEditor(props: FileViewerProps) {
     setDraft(null)
     setDirty(false)
     setSaveState('idle')
-    hidePopup()
+    selectionPopup.hide()
+    // hide() reads a live ref; the reset must fire only on a content (file)
+    // swap, and the hook object's identity churns on every render.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [content])
 
+  // A different file switches the remembered preview scroll position to that
+  // file's own entry (first open: none, so the preview starts at the top).
+  useEffect(() => {
+    previewScrollRef.current = previewScrollMemory.get(previewScrollKey(scope, path)) ?? 0
+  }, [scope, path])
+
   // Create the CodeMirror editor once the content is loaded. The view owns
-  // the document; React only tracks dirty/draft state through the update
-  // listener. For markdown the view stays mounted while previewing (hidden),
-  // so unsaved edits survive the preview/edit toggle. The theme + syntax
-  // colors live in a compartment so a scheme flip reconfigures only that
-  // part — the document, undo history and scroll position survive.
+  // the document; React only tracks dirty state through the update listener
+  // (the draft — the preview's text — is snapshotted from the live view on
+  // entering preview, not re-stringified per keystroke). For markdown the
+  // view stays mounted while previewing (hidden), so unsaved edits survive
+  // the preview/edit toggle. The theme + syntax colors live in a compartment
+  // so a scheme flip reconfigures only that part — the document, undo
+  // history and scroll position survive.
   useEffect(() => {
     if (content === undefined) return
     const host = hostRef.current
@@ -139,7 +147,6 @@ export function TextEditor(props: FileViewerProps) {
         ...(language !== null ? [language] : []),
         CodeMirrorView.updateListener.of((update) => {
           if (update.docChanged) {
-            setDraft(update.state.doc.toString())
             setDirty(true)
           }
         }),
@@ -159,33 +166,33 @@ export function TextEditor(props: FileViewerProps) {
         ...(viewerId === 'code' || viewerId === 'markdown' ? [
           CodeMirrorView.updateListener.of((update) => {
             if (update.geometryChanged || update.viewportChanged) {
-              hidePopup()
+              selectionPopup.hide()
               return
             }
             if (!update.view.hasFocus) {
-              hidePopup()
+              selectionPopup.hide()
               return
             }
             if (!(update.selectionSet || update.docChanged || update.focusChanged)) return
             const sel = update.state.selection.main
             if (sel.empty) {
-              hidePopup()
+              selectionPopup.hide()
               return
             }
             const text = update.state.sliceDoc(sel.from, sel.to)
             if (text.trim() === '') {
-              hidePopup()
+              selectionPopup.hide()
               return
             }
             // Page coordinates (the document root may scroll); the popup is
             // position:fixed, so convert to viewport coordinates.
             const rect = update.view.coordsAtPos(sel.head)
             if (rect === null) {
-              hidePopup()
+              selectionPopup.hide()
               return
             }
             const doc = update.state.doc
-            showPopup(
+            selectionPopup.show(
               buildSelectionInsert(path, scope.cwd, {
                 start: doc.lineAt(sel.from).number,
                 end: doc.lineAt(sel.to).number,
@@ -207,6 +214,7 @@ export function TextEditor(props: FileViewerProps) {
     // The keymap's save() reads live refs; scope/path are stable for a
     // tab's lifetime, and the dark flip is handled by the reconfigure
     // effect below (recreating the view here would drop the draft).
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [content, path])
 
   // Scheme flip: re-theme in place (the compartment holds only the
@@ -220,12 +228,65 @@ export function TextEditor(props: FileViewerProps) {
 
   // The editor may have been display:none while previewing; re-measure when
   // it becomes visible again (CodeMirror sizes itself on reveal). A mode
-  // flip also invalidates any anchored selection popup.
+  // flip also invalidates any anchored selection popup. When entering edit
+  // from a scrolled preview, the editor opens where the reader was: the line
+  // mapped from the text anchored at the preview viewport top (or, failing a
+  // unique text match, the proportional scroll position).
   useEffect(() => {
-    hidePopup()
-    if (mode === 'edit') viewRef.current?.requestMeasure()
+    selectionPopup.hide()
+    if (mode !== 'edit') return
+    const view = viewRef.current
+    if (view === null) return
+    const sync = previewSyncRef.current
+    if (!markdown) return
+    const doc = view.state.doc
+    let target: number | undefined
+    if (sync.text !== null) {
+      const lines = linesOfSelection(mdText, sync.text)
+      if (lines !== null) target = doc.line(Math.min(lines.start, doc.lines)).from
+    }
+    // ratio === 1 means the reader was at the very bottom (e.g. the last
+    // block's text is a repeated filler line that linesOfSelection rejects
+    // as ambiguous) — it must still land the editor at the bottom.
+    if (target === undefined && sync.ratio > 0 && sync.ratio <= 1) {
+      target = Math.max(1, Math.min(doc.length - 1, Math.round(doc.length * sync.ratio)))
+    }
+    if (target === undefined) return
+    // Position the editor by writing its OWN scroller directly (after a fresh
+    // measure) instead of CodeMirror's scrollIntoView: that path walks every
+    // scrollable ancestor — and even the window when the browser is zoomed
+    // (visualViewport < innerHeight) — to reveal the target, which dragged
+    // the whole sidebar up when the reader was at the very end of the
+    // document. A plain scrollTop write on the editor scroller can never
+    // touch anything outside the editor.
+    view.requestMeasure()
+    view.dispatch({ selection: { anchor: target } })
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => {
+        const block = view.lineBlockAt(target)
+        view.scrollDOM.scrollTop = Math.max(0, block.top - 8)
+        // Force CodeMirror to re-measure and re-render its virtualized
+        // viewport at the NEW scroll position (its scroll-observer is async
+        // and can lag a direct write).
+        view.requestMeasure()
+      })
+    })
+    // The reveal reads the live document/view refs; only the flip into
+    // preview triggers it.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mode])
 
+  // Snapshot the live document into the draft whenever the preview needs
+  // it: entering preview (the markdown preview renders `draft ?? content`)
+  // and a content swap (the view was just re-created above, so the read is
+  // the new document — matching the reset-to-null of a clean tab). The
+  // updateListener used to re-stringify the WHOLE document on every
+  // keystroke (O(docLength) per key) for a draft only preview reads.
+  useEffect(() => {
+    const view = viewRef.current
+    setDraft(view === null ? null : view.state.doc.toString())
+  }, [mode, content])
+
   const save = (): void => {
     const view = viewRef.current
     if (view === null || savingRef.current) return
@@ -242,29 +303,49 @@ export function TextEditor(props: FileViewerProps) {
     })
   }
 
-  const markdown = viewerId === 'markdown'
-  const html = viewerId === 'html'
   /** The markdown source the preview renders (draft wins over saved content). */
   const mdText = draft ?? content ?? ''
-  /** The preview source: `mdText` with local image destinations rewritten to
-   *  absolute media URLs (see {@link rewriteLocalImageUrls}); the raw
-   *  `mdText` stays untouched for selection/line lookup and for mermaid-block
-   *  detection, which are unaffected by image syntax. */
+  /** Preview-only source with a closed leading YAML frontmatter block hidden.
+   *  The raw `mdText` stays untouched for editing, saving, and selection line
+   *  lookup. All preview renderers share this source so plain Markdown,
+   *  Mermaid, and documents containing raw HTML behave consistently. */
+  const previewMdText = markdown ? markdownPreviewSource(mdText) : mdText
+
+  // Re-apply the remembered preview scroll position whenever the preview
+  // container mounts or its content changes (mode flip back to preview, or a
+  // same-file reload — e.g. the save-then-switch-to-preview reload — which
+  // temporarily collapses the container and clamps scrollTop to 0). Restored
+  // in a before-paint layout effect so the user never sees the top flash.
+  useLayoutEffect(() => {
+    if (mode !== 'preview') return
+    const el = mdRef.current
+    if (el === null || previewScrollRef.current <= 0) return
+    if (el.scrollHeight <= el.clientHeight) return
+    if (el.scrollTop === previewScrollRef.current) return
+    restoringRef.current = true
+    el.scrollTop = previewScrollRef.current
+    requestAnimationFrame(() => { restoringRef.current = false })
+  }, [mode, previewMdText])
+
+  /** The preview source with local image destinations rewritten to absolute
+   *  media URLs (see {@link rewriteLocalImageUrls}). */
   const previewText = markdown
-    ? rewriteLocalImageUrls(mdText, scope, path, window.location.origin)
-    : mdText
+    ? rewriteLocalImageUrls(previewMdText, scope, path, window.location.origin)
+    : previewMdText
   /** md/mermaid block split for the preview (mermaid fences lift out). Split
    *  only in preview mode: edit-mode keystrokes must not re-scan the source. */
   const mdBlocks = useMemo(
-    () => (markdown && mode === 'preview' ? splitMermaidBlocks(mdText) : []),
-    [markdown, mode, mdText],
+    () => (markdown && mode === 'preview' ? splitMermaidBlocks(previewMdText) : []),
+    [markdown, mode, previewMdText],
   )
-  /** Raw-HTML analysis (block runs lifted out + inline gate). Non-null only
-   *  for documents that actually contain HTML — plain markdown keeps the
-   *  legacy single-pass render path below, byte-for-byte. */
+  /** Raw-HTML analysis (block runs lifted out + inline gate). Non-null for
+   *  every markdown preview, so the render below always takes the split
+   *  renderer — its markdown runs rewrite local image destinations internally
+   *  (see MarkdownHtml.tsx). The legacy single-pass branches (fed the
+   *  pre-rewritten `previewText`) are dead in the current wiring. */
   const htmlInfo = useMemo(
-    () => (markdown && mode === 'preview' ? analyzeMarkdownHtml(mdText) : null),
-    [markdown, mode, mdText],
+    () => (markdown && mode === 'preview' ? analyzeMarkdownHtml(previewMdText) : null),
+    [markdown, mode, previewMdText],
   )
   const hasMermaid = useMemo(
     () => htmlInfo !== null
@@ -295,22 +376,22 @@ export function TextEditor(props: FileViewerProps) {
   const handlePreviewMouseUp = (): void => {
     const sel = window.getSelection()
     if (sel === null || sel.isCollapsed || sel.anchorNode === null || sel.focusNode === null) {
-      hidePopup()
+      selectionPopup.hide()
       return
     }
     const host = mdRef.current
     if (host === null || !host.contains(sel.anchorNode) || !host.contains(sel.focusNode)) {
-      hidePopup()
+      selectionPopup.hide()
       return
     }
     const text = sel.toString()
     if (text.trim() === '') {
-      hidePopup()
+      selectionPopup.hide()
       return
     }
     const rect = sel.getRangeAt(0).getBoundingClientRect()
     const lines = linesOfSelection(mdText, text)
-    showPopup(
+    selectionPopup.show(
       buildSelectionInsert(path, scope.cwd, lines ?? undefined, text),
       rect.left + rect.width / 2,
       rect.top,
@@ -401,7 +482,36 @@ export function TextEditor(props: FileViewerProps) {
           className={css.editorMd}
           ref={mdRef}
           onMouseUp={handlePreviewMouseUp}
-          onScroll={hidePopup}
+          onScroll={(event) => {
+            const el = event.currentTarget
+            if (!restoringRef.current && el.scrollHeight > el.clientHeight) {
+              previewScrollRef.current = el.scrollTop
+              previewScrollMemory.set(previewScrollKey(scope, path), el.scrollTop)
+            }
+            if (!anchorThrottleRef.current) {
+              anchorThrottleRef.current = true
+              setTimeout(() => { anchorThrottleRef.current = false }, 120)
+              const ratio = el.scrollHeight > el.clientHeight
+                ? el.scrollTop / (el.scrollHeight - el.clientHeight)
+                : 0
+              // The first block below the viewport's top edge, chosen with
+              // layout coordinates (caretRangeFromPoint needs an in-viewport
+              // point and returns null when the panel is partially off-screen).
+              // Its text is the anchor the editor syncs to on preview -> edit.
+              let text: string | null = null
+              const base = el.getBoundingClientRect()
+              const blocks = el.querySelectorAll('h1, h2, h3, h4, h5, h6, p, li')
+              for (const block of blocks) {
+                if (block.getBoundingClientRect().top - base.top + el.scrollTop >= el.scrollTop - 2) {
+                  const t = (block.textContent ?? '').replace(/[ \t\r\n]+/g, ' ').trim()
+                  if (t.length >= 8) text = t
+                  break
+                }
+              }
+              previewSyncRef.current = { text, ratio }
+            }
+            selectionPopup.hide()
+          }}
         >
           {/* The fence copy-button labels must come from this plugin's own
               dictionary: the DSH MarkdownText/CodeBlock are cordis-free and
@@ -449,15 +559,16 @@ export function TextEditor(props: FileViewerProps) {
           />
         </>
       )}
-      {popup !== null && createPortal(
+      {selectionPopup.popup !== null && createPortal(
         <button
           type="button"
+          ref={selectionPopup.buttonRef}
           className={css.selectionPopup}
-          style={{ left: popup.left, top: popup.top }}
+          style={{ left: selectionPopup.popup.left, top: selectionPopup.popup.top }}
           // Keep the selection (and CodeMirror focus) alive until the click
           // commits — without this the popup unmounts before click lands.
           onMouseDown={(event) => { event.preventDefault() }}
-          onClick={commitPopup}
+          onClick={selectionPopup.commit}
         >
           {t('addToConversation')}
         </button>,

src/client/TreePanel.tsx

@@ -62,16 +62,35 @@ export function TreePanel(props: {
   openWithSsh?: boolean
   onOpenWith?: (targetId: string, path: string) => void
   onToggleOpenWithPin?: (targetId: string) => void
-  onReferenceFile: (path: string) => void
+  onReferenceFile: (path: string, isDir: boolean) => void
+  /** A tree rename landed (passed through to FileTree for tab retargeting). */
+  onPathRenamed?: (oldPath: string, newPath: string) => void
+  /** A tree delete landed (passed through to FileTree for tab closing). */
+  onPathDeleted?: (path: string, isDir: boolean) => void
   /** Full-window presentation: the panel fills its host instead of docking
    *  at a fixed width. */
   full?: boolean
 }) {
-  const { sessionId, cwd, store, expanded, revealed, onToggle, onOpenFile, onOpenFileNewTab, onOpenFileSide, openWithTargets, openWithPinned, openWithSsh, onOpenWith, onToggleOpenWithPin, onReferenceFile, full } = props
+  const { sessionId, cwd, store, expanded, revealed, onToggle, onOpenFile, onOpenFileNewTab, onOpenFileSide, openWithTargets, openWithPinned, openWithSsh, onOpenWith, onToggleOpenWithPin, onReferenceFile, onPathRenamed, onPathDeleted, full } = props
   const [query, setQuery] = useState('')
   const [results, setResults] = useState<{ matches: string[]; truncated: boolean } | null>(null)
   const [error, setError] = useState<string | null>(null)
   const [refreshTick, setRefreshTick] = useState(0)
+
+  // The tree caches loaded directories per refresh tick, so content changed
+  // outside DSH (another editor, a sync tool) stays stale until the manual
+  // refresh click. Re-focusing the window bumps the tick automatically, and
+  // integrations can force a refresh by dispatching a bubbling
+  // `dsh-sidebar:refresh-files` event on `window`.
+  useEffect(() => {
+    const bump = (): void => { setRefreshTick(tick => tick + 1) }
+    window.addEventListener('focus', bump)
+    window.addEventListener('dsh-sidebar:refresh-files', bump)
+    return () => {
+      window.removeEventListener('focus', bump)
+      window.removeEventListener('dsh-sidebar:refresh-files', bump)
+    }
+  }, [])
   /** One-line upload status under the search row ('' hides the hint). */
   const [uploadStatus, setUploadStatus] = useState('')
   /** Whether the status line is a failure/cancel (error color, stays visible). */
@@ -237,6 +256,8 @@ export function TreePanel(props: {
           onOpenWith={onOpenWith}
           onToggleOpenWithPin={onToggleOpenWithPin}
           onReferenceFile={onReferenceFile}
+          onPathRenamed={onPathRenamed}
+          onPathDeleted={onPathDeleted}
           refreshTick={refreshTick}
           onUploadRequest={startUpload}
           busy={busy}

src/client/add-plugin-modal.tsx

@@ -43,7 +43,7 @@ const COPIED_FEEDBACK_MS = 1500
 /** The modal body: the GitHub topic button + the recommended plugin list
  *  with per-entry jump/copy buttons (extracted for direct testing). */
 export function PluginListBody(props: { service: BetterSidebarService; kind: PluginKind }) {
-  const { service, kind } = props
+  const { kind } = props
   // Which entry's copy button currently shows the "已复制" feedback.
   const [copiedId, setCopiedId] = useState<string | null>(null)
   // Live catalog filter (name / id / description). A free-text search keeps
@@ -56,8 +56,9 @@ export function PluginListBody(props: { service: BetterSidebarService; kind: Plu
   const needle = query.trim().toLowerCase()
   const matches = (entry: PluginEntry): boolean => {
     if (needle === '') return true
+    const name = typeof entry.name === 'function' ? entry.name() : entry.name
     const description = typeof entry.description === 'function' ? entry.description() : entry.description
-    return entry.name.toLowerCase().includes(needle)
+    return name.toLowerCase().includes(needle)
       || entry.id.toLowerCase().includes(needle)
       || description.toLowerCase().includes(needle)
   }
@@ -93,8 +94,12 @@ export function PluginListBody(props: { service: BetterSidebarService; kind: Plu
     window.open(entry.url, '_blank', 'noopener')
   }
 
-  /** One catalog row (extracted so the group render stays flat). */
-  const renderEntry = (entry: PluginEntry): ReactNode => (
+  /** One catalog row (extracted so the group render stays flat). The name
+   *  resolves like the description (string or () => string) so it follows
+   *  the active locale; a plain-string entry keeps its raw name. */
+  const renderEntry = (entry: PluginEntry): ReactNode => {
+    const name = typeof entry.name === 'function' ? entry.name() : entry.name
+    return (
     <div key={entry.id} className={css.pluginEntry}>
       <div className={css.pluginEntryHead}>
         {/* The name is a BUTTON on the same window.open path as the
@@ -104,16 +109,16 @@ export function PluginListBody(props: { service: BetterSidebarService; kind: Plu
         <button
           type="button"
           className={css.pluginName}
-          aria-label={`${t('openPlugin')}: ${entry.name}`}
+          aria-label={`${t('openPlugin')}: ${name}`}
           onClick={() => { jump(entry) }}
         >
-          {entry.name}
+          {name}
         </button>
         <span className={css.pluginEntryActions}>
           <button
             type="button"
             className={css.pluginJumpBtn}
-            aria-label={`${t('openPlugin')}: ${entry.name}`}
+            aria-label={`${t('openPlugin')}: ${name}`}
             onClick={() => { jump(entry) }}
           >
             {t('openPlugin')}
@@ -121,7 +126,7 @@ export function PluginListBody(props: { service: BetterSidebarService; kind: Plu
           <button
             type="button"
             className={css.pluginCopyBtn}
-            aria-label={`${t('copyInstall')}: ${entry.name}`}
+            aria-label={`${t('copyInstall')}: ${name}`}
             onClick={() => { copy(entry) }}
           >
             {copiedId === entry.id ? t('copied') : t('copy')}
@@ -133,7 +138,8 @@ export function PluginListBody(props: { service: BetterSidebarService; kind: Plu
       </div>
       <code className={css.pluginInstall}>{entry.install}</code>
     </div>
-  )
+    )
+  }
 
   return (
     <div className={css.pluginList}>

src/client/api.ts

@@ -8,7 +8,8 @@
  */
 import { encodeHtmlUrl } from '../html-route.ts'
 import type { LastActivity } from '../subagent-activity.ts'
-import type { SidechatLogEvent, SidechatThreadInfo } from '../sidechat-core.ts'
+import type { SidechatLiveEvent, SidechatLogEvent, SidechatThreadInfo } from '../sidechat-core.ts'
+import type { SidebarSessionEvent } from '../context-types.ts'
 import type { BrowserProbeResult } from './browser.ts'
 
 /** One wire failure. */
@@ -128,6 +129,25 @@ export type TerminalDepsStatus =
     note?: string
   }
 
+/**
+ * Parse one `/sidebar` JSON response envelope into its value. A non-ok
+ * status, an unparseable body, or any shape other than `{ok: true, value}`
+ * surfaces as {@link SidebarApiError} carrying the wire code (falling back
+ * to the HTTP status). Shared by the JSON api route and the raw upload
+ * route, whose envelopes are identical.
+ */
+async function readEnvelope<T>(response: Response): Promise<T> {
+  const parsed: { ok?: boolean; value?: unknown; error?: { code?: string; message?: string } } | null
+    = await response.json().catch(() => null)
+  if (!response.ok || parsed === null || parsed.ok !== true || parsed.value === undefined) {
+    throw new SidebarApiError(
+      parsed?.error?.code ?? 'http',
+      parsed?.error?.message ?? `HTTP ${response.status}`,
+    )
+  }
+  return parsed.value as T
+}
+
 async function call<T>(method: string, payload: Record<string, unknown>, signal?: AbortSignal): Promise<T> {
   let response: Response
   try {
@@ -140,15 +160,7 @@ async function call<T>(method: string, payload: Record<string, unknown>, signal?
   } catch (error) {
     throw new SidebarApiError('network', error instanceof Error ? error.message : String(error))
   }
-  const parsed: { ok?: boolean; value?: unknown; error?: { code?: string; message?: string } } | null
-    = await response.json().catch(() => null)
-  if (!response.ok || parsed === null || parsed.ok !== true || parsed.value === undefined) {
-    throw new SidebarApiError(
-      parsed?.error?.code ?? 'http',
-      parsed?.error?.message ?? `HTTP ${response.status}`,
-    )
-  }
-  return parsed.value as T
+  return readEnvelope<T>(response)
 }
 
 /**
@@ -179,15 +191,7 @@ async function fetchUpload<T>(
     if (error instanceof DOMException && error.name === 'AbortError') throw error
     throw new SidebarApiError('network', error instanceof Error ? error.message : String(error))
   }
-  const parsed: { ok?: boolean; value?: unknown; error?: { code?: string; message?: string } } | null
-    = await response.json().catch(() => null)
-  if (!response.ok || parsed === null || parsed.ok !== true || parsed.value === undefined) {
-    throw new SidebarApiError(
-      parsed?.error?.code ?? 'http',
-      parsed?.error?.message ?? `HTTP ${response.status}`,
-    )
-  }
-  return parsed.value as T
+  return readEnvelope<T>(response)
 }
 
 /** One request's session scope: the conversation id plus its cwd when known. */
@@ -215,6 +219,51 @@ function gitPayload(scope: SessionScope, worktree: string | undefined, extra: Re
   return scopePayload(scope, { ...(worktree !== undefined && worktree !== '' ? { worktree } : {}), ...extra })
 }
 
+/** One external-open request from the file tree. */
+type OpenExternalPayload =
+  | { action: 'reveal'; path: string }
+  | { action: 'url'; url: string }
+
+/** The host route's success shape. */
+type OpenExternalResult = { started: boolean }
+
+/**
+ * Remote VSCode-family URLs must be consumed on the browser/client machine:
+ * the DSH host can be a headless remote server with no editor or DISPLAY.
+ * Local editor URLs and reveal actions still belong to the host opener.
+ */
+function shouldOpenExternalOnClient(payload: OpenExternalPayload): payload is { action: 'url'; url: string } {
+  if (payload.action !== 'url') return false
+  let parsed: URL
+  try {
+    parsed = new URL(payload.url)
+  } catch {
+    return false
+  }
+  return parsed.protocol !== 'http:'
+    && parsed.protocol !== 'https:'
+    && parsed.hostname === 'vscode-remote'
+    && parsed.pathname.startsWith('/ssh-remote+')
+}
+
+/**
+ * Dispatch an external-open request to the correct machine. SSH remote-editor
+ * URLs stay in the synchronous user-click chain and navigate the client so
+ * its registered vscode:// / cursor:// handler can launch. Everything else
+ * keeps using the DSH host route.
+ */
+function openExternal(payload: OpenExternalPayload): Promise<OpenExternalResult> {
+  if (!shouldOpenExternalOnClient(payload)) {
+    return call<OpenExternalResult>('open.external', payload)
+  }
+  try {
+    window.location.assign(payload.url)
+    return Promise.resolve({ started: true })
+  } catch (error) {
+    return Promise.reject(error)
+  }
+}
+
 /** The sidebar API surface (session scope threaded through every call). */
 export const api = {
   sessionCwd: (scope: SessionScope, signal?: AbortSignal) =>
@@ -229,6 +278,15 @@ export const api = {
     call<FsTextResult | FsBinaryResult>('fs.read', scopePayload(scope, { path }), signal),
   fsWrite: (scope: SessionScope, path: string, content: string) =>
     call<{ ok: true }>('fs.write', scopePayload(scope, { path, content })),
+  /** Rename one tree row within its directory (single-segment name; the
+   *  server refuses existing destinations, the workspace root, and — while
+   *  the fence is armed — anything resolving outside the workspace). */
+  fsRename: (scope: SessionScope, path: string, name: string) =>
+    call<{ path: string }>('fs.rename', scopePayload(scope, { path, name })),
+  /** Permanently delete one tree row (recursive for directories; a symlink
+   *  row unlinks the link only). The UI confirms before calling this. */
+  fsRemove: (scope: SessionScope, path: string) =>
+    call<{ path: string }>('fs.remove', scopePayload(scope, { path })),
   /** Upload one file's raw bytes into `dir` (keeps the folder tree via
    *  `relativePath`); the host streams it under the session workspace. */
   uploadFile: (scope: SessionScope, dir: string, relativePath: string, body: Blob, signal?: AbortSignal) =>
@@ -258,6 +316,19 @@ export const api = {
   /** Full patch text of one commit (diff display for the history rows). */
   gitCommitDiff: (scope: SessionScope, hash: string, worktree?: string, signal?: AbortSignal) =>
     call<{ diff: string }>('git.commit-diff', gitPayload(scope, worktree, { hash }), signal),
+  /** One file's content at a revision (`git show <rev>:<path>`); null when the
+   *  revision has no such path. The diff views' on-demand hunk-fold expansion
+   *  reads both sides' full contents through this. */
+  gitShow: (scope: SessionScope, rev: string, path: string, worktree?: string, signal?: AbortSignal) =>
+    call<{ content: string | null }>('git.show', gitPayload(scope, worktree, { rev, path }), signal),
+  /** The session's file-tool events for the changes tab's session lens: the
+   *  `tool/call` + `tool/result` rows past `afterSeq` (0 = whole window),
+   *  capped to the recent window host-side. The client runtime exposes no
+   *  event-log face, so the lens polls this delta route. */
+  changesOps: (scope: SessionScope, afterSeq?: number, signal?: AbortSignal) =>
+    call<{ events: SidebarSessionEvent[]; lastSeq: number }>('changes.ops', scopePayload(scope, {
+      ...(afterSeq !== undefined && afterSeq > 0 ? { afterSeq } : {}),
+    }), signal),
   /** Discard the worktree changes of one file (the index is untouched). */
   gitDiscard: (scope: SessionScope, path: string, worktree?: string) =>
     call<{ ok: true }>('git.discard', gitPayload(scope, worktree, { path })),
@@ -319,9 +390,12 @@ export const api = {
     call<SidechatThreadInfo>('sidechat.info', { childId }),
   /** One transcript pull of a Side Chat thread: the thread's OWN events
    *  (the inherited seed is cut host-side and never crosses the wire).
-   *  `afterSeq` narrows the response to the delta beyond it (poll tail). */
+   *  `afterSeq` narrows the response to the delta beyond it (poll tail).
+   *  `live` is the thread's in-flight model deltas (DSH 0.1.5 publishes them
+   *  outside the session log) — the CURRENT attempt on every pull, never a
+   *  delta, so the caller replaces its live set instead of appending. */
   sidechatEvents: (childId: string, afterSeq?: number, signal?: AbortSignal) =>
-    call<{ events: SidechatLogEvent[] }>('sidechat.events', {
+    call<{ events: SidechatLogEvent[]; live: SidechatLiveEvent[] }>('sidechat.events', {
       childId,
       ...(afterSeq !== undefined ? { afterSeq } : {}),
     }, signal),
@@ -341,12 +415,10 @@ export const api = {
    *  check; see the host's browser.probe route). */
   browserProbe: (url: string, signal?: AbortSignal) =>
     call<BrowserProbeResult>('browser.probe', { url }, signal),
-  /** External open for the file tree's "open with" menu: reveal a path in
-   *  the OS file manager, or hand a custom-scheme URL (vscode://, cursor://,
-   *  zed://, custom editors) to its registered handler. The host launches
-   *  the platform opener (argv, no shell). */
-  openExternal: (payload: { action: 'reveal'; path: string } | { action: 'url'; url: string }) =>
-    call<{ started: boolean }>('open.external', payload),
+  /** External open for the file tree's "open with" menu. Remote SSH editor
+   *  URLs are launched on the browser/client machine; reveal and local URLs
+   *  keep using the host's platform opener. */
+  openExternal,
 }
 
 /** Absolute URL of the media route for one path (images only). */

src/client/builtins/tabs.tsx

@@ -1,13 +1,14 @@
 /**
  * The 7 built-in tab descriptors: the plugin registers its own pages
- * (editor / git / subagent / sidechat / terminal / browser / diff) through
+ * (editor / git — the unified changes tab / subagent / sidechat / terminal /
+ * browser / diff) through
  * the same {@link BetterSidebarService} external plugins use — eating its
  * own dogfood. The terminal descriptor owns its quota (`TERMINAL_LIMIT`)
  * and mints `terminal:<uuid>` ids through `createTab`; the browser mints
  * `browser:<n>` the same way (no quota). The editor IS the files window
  * (the old standalone explorer merged into it).
  */
-import { IconBranchOutline16, IconCodeOutline16, IconFolderOpen16, IconNewChatOutline16, IconPanelLeftOutline16, IconThinkOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconCodeOutline16, IconFolderOpen16, IconNewChatOutline16, IconPanelLeftOutline16, IconThinkOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { Context } from '../../context-types.ts'
 import { allLeaves, isAgentTabId, type SidebarState } from '../state.ts'
 import { t } from '../locales.ts'
@@ -15,7 +16,7 @@ import { openSidebarFile } from '../intercept.tsx'
 import { EditorHost } from '../EditorHost.tsx'
 import { OpenWithSettings } from '../open-with-settings.tsx'
 import { lazyChunkComponent } from '../lazy-chunk.tsx'
-import { GitView } from '../GitView.tsx'
+import { ChangesTab, opCountOf } from '../changes/ChangesTab.tsx'
 import { DiffTab } from '../DiffTab.tsx'
 import { SubagentView } from '../SubagentView.tsx'
 import { consumeSidechatSeed, SideChatView, sidechatThreadIdOf } from '../SideChatView.tsx'
@@ -71,7 +72,7 @@ function terminalUuid(): string {
 
 /** Count UI-owned terminals (agent:` tabs excluded — they are the model's). */
 function uiTerminalCount(state: SidebarState): number {
-  return allLeaves(state.splits)
+  return allLeaves(state.bottomSplits)
     .flatMap(leaf => leaf.tabs)
     .filter(tab => tab.type === 'terminal' && !isAgentTabId(tab.id)).length
 }
@@ -139,18 +140,30 @@ export function builtinTabs(ctx: Context, options: BuiltinTabOptions = {}): read
       ),
     },
     {
+      // The unified changes tab (id kept as 'git' so persisted layouts keep
+      // resolving): the Git lens is the former source-control panel; the
+      // session lens is the former file-trace tab (PR #471). Both preview
+      // through one shared diff stack. The badge reads the op-count cache
+      // the tab's event poll publishes (the client ctx exposes no event
+      // log, and the git status needs a fetch — both stay out of the badge).
       id: 'git',
-      title: () => t('git'),
-      icon: (size: number) => <IconBranchOutline16 size={size} />,
+      title: () => t('changes'),
+      icon: (size: number) => <IconDiffOutline16 size={size} />,
       order: 20,
       single: true,
-      component: ({ ctx, store, scope, visible, onOpenDiff }) => (
-        <GitView
-          scope={scope}
+      badge: (_ctx, scope) => {
+        const count = opCountOf(scope.sessionId)
+        return count === undefined || count === 0 ? null : count
+      },
+      component: ({ ctx, store, scope, tab, visible, onOpenDiff }) => (
+        <ChangesTab
+          ctx={ctx}
           store={store}
+          scope={scope}
+          tab={tab}
           visible={visible}
           onOpenFile={(path) => { openSidebarFile(ctx, store, scope.sessionId, path) }}
-          onOpenDiff={onOpenDiff ?? (() => { /* no-op */ })}
+          onOpenDiff={onOpenDiff}
         />
       ),
     },
@@ -161,7 +174,7 @@ export function builtinTabs(ctx: Context, options: BuiltinTabOptions = {}): read
       order: 30,
       single: true,
       // Declarative settings: the auto-open switches render under this row in
-      // the Side card settings page (the Jobs page's own related settings).
+      // the Side card settings page (the Tasks page's related settings).
       settings: {
         toggles: [{
           key: 'autoOpenSubagent',
@@ -337,7 +350,7 @@ export function builtinTabs(ctx: Context, options: BuiltinTabOptions = {}): read
     },
     {
       id: 'diff',
-      title: () => t('git'),
+      title: () => t('changes'),
       icon: (size: number) => <IconDiffOutline16 size={size} />,
       order: -1,
       hidden: true,

src/client/center-column.ts

@@ -0,0 +1,109 @@
+/**
+ * Anchor selectors for the DSH AppFrame conversation slot host, newest first:
+ *
+ * - DSH 0.1.5-alpha.2 replaced the root `conversation` slot with a root-scoped
+ *   keyed `main` slot, so the conversation renders under `main.conversation`
+ *   (ConversationPanel -> `renderSlot('main.conversation')`);
+ * - alpha.1 and earlier spell the same host `conversation`.
+ *
+ * Both keys are accepted deliberately so one build spans the alpha.1 → alpha.2
+ * boundary; only one exists in any given host.
+ */
+const CENTER_COLUMN_SELECTOR = '#root [data-slot="main.conversation"], #root [data-slot="conversation"]'
+
+/** Match Sidebar's existing last-resort retry cadence (issue #248). */
+export const CENTER_COLUMN_REVALIDATE_MS = 1500
+
+interface CenterColumnResolveOptions {
+  /** Explicit document for tests / callers that do not yet have a cached node. */
+  document?: Document
+  /** Injectable DOM lookup for tests. */
+  query?: () => Element | null
+  /** Injectable clock for deterministic retry-boundary tests. */
+  now?: () => number
+  /** Injectable <html style> fingerprint for deterministic HMR tests. */
+  htmlStyle?: () => string | null
+  /** Override only for tests; production follows the 1.5s safety-net cadence. */
+  revalidateMs?: number
+}
+
+/** Last full DOM validation for each center-column node. Weak keys avoid leaks. */
+const validatedAt = new WeakMap<HTMLElement, number>()
+
+/**
+ * The html-style watcher is an HMR/layout resync signal. Remember the last
+ * fingerprint per document so a style change can bypass the connected-node
+ * fast path immediately, without requiring Sidebar to run a second locator.
+ */
+const documentStyleState = new WeakMap<Document, string | null>()
+
+/**
+ * From the matched conversation slot host, walk up through transparent slot
+ * hosts to the real column: DSH slot hosts render with `display: contents`,
+ * so on alpha.2 the `main.conversation` host (and any further keyed slot
+ * wrappers above it) contributes no box, and the center column is the first
+ * ancestor whose computed display is NOT `contents`.
+ */
+function columnOfSlotHost(host: Element): HTMLElement | null {
+  const view = host.ownerDocument.defaultView
+  let node = host.parentElement
+  while (node !== null && (view?.getComputedStyle(node).display ?? '') === 'contents') {
+    node = node.parentElement
+  }
+  return node
+}
+
+/**
+ * Resolve the AppFrame center column while keeping streaming mutations cheap.
+ *
+ * Sidebar intentionally keeps both recovery mechanisms that predate #403:
+ * the `#root` subtree MutationObserver catches boot/HMR DOM swaps, and the
+ * 1.5s interval is a last-resort safety net for interleavings no observer is
+ * guaranteed to see (#248). The expensive part was letting every scheduled
+ * locate scan `#root` with querySelector at streaming-token cadence.
+ *
+ * Once a connected column is cached, normal calls therefore reuse it without
+ * a document query. A full query is still forced when either:
+ * - the cached node disconnects;
+ * - `<html style>` changes (the existing HMR/layout resync signal); or
+ * - 1.5s has elapsed since the last full validation (the safety-net cadence).
+ *
+ * This preserves recovery semantics while bounding whole-tree selector work
+ * to low-frequency validation instead of chat mutation frequency.
+ */
+export function resolveCenterColumn(
+  current: HTMLElement | null,
+  options: CenterColumnResolveOptions = {},
+): HTMLElement | undefined {
+  const doc = options.document ?? current?.ownerDocument ?? document
+  const now = (options.now ?? Date.now)()
+  const revalidateMs = options.revalidateMs ?? CENTER_COLUMN_REVALIDATE_MS
+  const htmlStyle = (options.htmlStyle ?? (() => doc.documentElement.getAttribute('style')))()
+
+  const previousStyle = documentStyleState.get(doc)
+  const styleChanged = previousStyle !== undefined && previousStyle !== htmlStyle
+  documentStyleState.set(doc, htmlStyle)
+
+  if (current !== null && current.isConnected) {
+    const lastValidation = validatedAt.get(current)
+
+    // A connected node passed in for the first time is already a trustworthy
+    // cache hit. Start its safety-net window without paying an eager query.
+    if (lastValidation === undefined && !styleChanged) {
+      validatedAt.set(current, now)
+      return current
+    }
+
+    if (!styleChanged && lastValidation !== undefined && now - lastValidation < revalidateMs) {
+      return current
+    }
+  }
+
+  const query = options.query ?? (() => doc.querySelector(CENTER_COLUMN_SELECTOR))
+  const host = query()
+  const col = host === null || host === undefined ? null : columnOfSlotHost(host)
+  if (col === null || col === undefined || !col.isConnected) return undefined
+
+  validatedAt.set(col, now)
+  return col
+}

src/client/changes/ChangesTab.tsx

@@ -0,0 +1,209 @@
+/**
+ * The unified changes tab: one tab, two lenses on "what changed?" — Git
+ * (repository truth: staged/unstaged files, commit box, history) and the
+ * session round (agent truth: every file the model read, wrote, or edited).
+ * Both lenses preview their selections in a shared resizable bottom pane
+ * ({@link DiffPane}); git targets expand into the dedicated diff tab docked
+ * in the workbench's diff pane. The active lens and the pane height persist
+ * in the tab's meta, so the tab
+ * reopens exactly where it was left.
+ *
+ * The session events ride the host's `changes.ops` route (the client
+ * runtime exposes no event-log face): the tab pulls the delta past its
+ * cursor while visible, folds it into ops, and publishes the op count to a
+ * module-level cache the tab-strip badge reads.
+ */
+import { useCallback, useEffect, useRef, useState } from 'react'
+import type { SidebarSessionEvent } from '../../context-types.ts'
+import type { TabComponentProps } from '../service.ts'
+import { t } from '../locales.ts'
+import { api } from '../api.ts'
+import { usePolling } from '../use-polling.ts'
+import type { SidebarDiffRef } from '../state.ts'
+import { GitLens } from './GitLens.tsx'
+import { SessionLens } from './SessionLens.tsx'
+import { DiffPane, diffTabOf, type ChangesPreview } from './DiffPane.tsx'
+import { extractFileOps, knownContentBefore, type FileOp } from './ops.ts'
+import css from './changes.module.css'
+
+/** The default preview pane height (px) before the first drag. */
+const PANE_HEIGHT_DEFAULT = 300
+
+/** Cap on accumulated events: the lens shows the recent window, not eternity
+ *  (the host enforces the same bound per response). */
+const EVENTS_CAP = 4000
+
+/** Live op count per session: the tab's poller writes, the badge reads (a
+ *  badge cannot fetch — it must resolve synchronously during render). */
+const opCounts = new Map<string, number>()
+
+/** The session's traced-op count as of the last poll (undefined before the
+ *  tab has ever pulled; 0 hides the badge pill). */
+export function opCountOf(sessionId: string): number | undefined {
+  return opCounts.get(sessionId)
+}
+
+type Lens = 'git' | 'session'
+
+/** The persisted tab meta (JSON-serializable; rides the layout). */
+interface ChangesMeta {
+  lens?: Lens
+  previewH?: number
+}
+
+export function ChangesTab({ ctx, store, scope, tab, visible, onOpenFile, onOpenDiff }: TabComponentProps) {
+  const meta = (tab.meta ?? {}) as ChangesMeta
+  const [lens, setLens] = useState<Lens>(meta.lens === 'session' ? 'session' : 'git')
+  const [preview, setPreview] = useState<ChangesPreview | null>(null)
+  const [paneHeight, setPaneHeight] = useState<number>(
+    typeof meta.previewH === 'number' && meta.previewH >= 140 ? meta.previewH : PANE_HEIGHT_DEFAULT,
+  )
+
+  // ── Session-event accumulation: one pull on mount, then a 2.5s delta
+  //    poll while visible (paused otherwise; the next visible tick catches
+  //    up). The cursor is the last delivered seq, so each poll ships only
+  //    what the accumulator lacks. ────────────────────────────────────────
+  const eventsRef = useRef<readonly SidebarSessionEvent[]>([])
+  // The fold of eventsRef as of the last poll. extractFileOps parses every
+  // accumulated tool/call (up to EVENTS_CAP events); running it once per
+  // poll and REUSING the result across renders (the render used to re-fold
+  // the whole window, twice per tick, and the fresh array defeated the
+  // downstream memo on every poll) keeps the 2.5s tick at one fold.
+  const opsRef = useRef<readonly FileOp[]>([])
+  const seqRef = useRef(0)
+  const pollGen = useRef(0)
+  const [opsError, setOpsError] = useState(false)
+  const [tick, setTick] = useState(0)
+  const pull = useCallback(async (): Promise<void> => {
+    const generation = pollGen.current
+    try {
+      const { events, lastSeq } = await api.changesOps(scope, seqRef.current)
+      if (generation !== pollGen.current) return
+      if (events.length > 0) {
+        const merged = [...eventsRef.current, ...events]
+        eventsRef.current = merged.length > EVENTS_CAP ? merged.slice(merged.length - EVENTS_CAP) : merged
+      }
+      if (lastSeq > seqRef.current) seqRef.current = lastSeq
+      const folded = extractFileOps(eventsRef.current)
+      opsRef.current = folded
+      opCounts.set(scope.sessionId, folded.length)
+      setOpsError(false)
+      setTick(value => value + 1)
+    } catch {
+      // Offline / route unavailable: keep the last fold; surface it inline
+      // only while nothing has ever loaded.
+      if (generation === pollGen.current) setOpsError(true)
+    }
+    // Granular scope fields: the scope object's identity churns, only its
+    // sessionId / cwd fields gate the poll target.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [scope.sessionId, scope.cwd])
+  useEffect(() => {
+    pollGen.current += 1
+    eventsRef.current = []
+    opsRef.current = []
+    seqRef.current = 0
+    setOpsError(false)
+  }, [scope.sessionId])
+  // One pull on every input change — mount, scope change, and visibility
+  // flip all re-pull (a hidden tab still catches up on the flip); only the
+  // poll CADENCE below is gated by visibility.
+  useEffect(() => { void pull() }, [visible, pull])
+  usePolling(visible, pull, { intervalMs: 2_500 })
+  // tick only forces the re-render; the fold reads the ref directly.
+  void tick
+  const ops = opsRef.current
+
+  /** Persist a meta patch onto the tab (lens choice, pane height). */
+  const patchMeta = (patch: ChangesMeta): void => {
+    ctx.get('betterSidebar')?.updateTab(tab.id, {
+      meta: { ...(tab.meta as ChangesMeta | undefined ?? {}), ...patch },
+    })
+  }
+
+  const chooseLens = (next: Lens): void => {
+    if (next === lens) return
+    setLens(next)
+    patchMeta({ lens: next })
+  }
+
+  /** Preview one git change (worktree file or commit) from the Git lens. */
+  const previewGit = (ref: SidebarDiffRef): void => {
+    setPreview({ kind: 'git', ref })
+  }
+
+  /** Preview one session op (with its best-effort prior content snapshot). */
+  const previewOp = (path: string, op: FileOp): void => {
+    setPreview({ kind: 'op', path, op, prior: knownContentBefore(ops, path, op) })
+  }
+
+  /** Expand the current git preview into the dedicated diff tab, docked
+   *  into the workbench's diff pane. */
+  const expandPreview = (): void => {
+    if (preview?.kind !== 'git') return
+    onOpenDiff?.(diffTabOf(preview.ref))
+  }
+
+  const previewKey = (target: ChangesPreview): string => target.kind === 'git'
+    ? (target.ref.kind === 'worktree'
+        ? `git:w:${target.ref.path}:${target.ref.staged ? 's' : 'u'}`
+        : `git:c:${target.ref.hashFull}`)
+    : `op:${target.op.callId}`
+
+  return (
+    <div className={css.root}>
+      <div className={css.lensBar}>
+        <div className={css.lensSwitch} role="group" aria-label={t('changes')}>
+          <button
+            type="button"
+            className={css.lensButton}
+            data-active={lens === 'git' ? 'true' : undefined}
+            aria-pressed={lens === 'git'}
+            onClick={() => { chooseLens('git') }}
+          >
+            {t('changesGitLens')}
+          </button>
+          <button
+            type="button"
+            className={css.lensButton}
+            data-active={lens === 'session' ? 'true' : undefined}
+            aria-pressed={lens === 'session'}
+            onClick={() => { chooseLens('session') }}
+          >
+            {t('changesSessionLens')}
+          </button>
+        </div>
+      </div>
+      {lens === 'git'
+        ? (
+          <GitLens
+            scope={scope}
+            store={store}
+            visible={visible}
+            onOpenFile={onOpenFile ?? (() => { /* no-op */ })}
+            onPreview={previewGit}
+            selectedRef={preview !== null && preview.kind === 'git' ? preview.ref : null}
+          />
+        )
+        : (
+          <SessionLens
+            ops={ops}
+            loadError={opsError && ops.length === 0}
+            onPreview={previewOp}
+            selectedCallId={preview !== null && preview.kind === 'op' ? preview.op.callId : null}
+          />
+        )}
+      {preview !== null && (
+        <DiffPane
+          key={previewKey(preview)}
+          target={preview}
+          scope={scope}
+          height={paneHeight}
+          onHeightCommit={(height) => { setPaneHeight(height); patchMeta({ previewH: height }) }}
+          onClose={() => { setPreview(null) }}
+          onExpand={expandPreview}
+        />
+      )}
+    </div>
+  )
+}

src/client/changes/DiffPane.tsx

@@ -0,0 +1,604 @@
+/**
+ * The changes tab's shared bottom preview pane: one selected target — a git
+ * worktree change, a commit patch, or a session file op — rendered through
+ * the unified diff stack (the same one the diff tab uses). Git targets load
+ * on demand (refreshable, with the untracked full-addition fallback); op
+ * targets are pure snapshots (diff / read view / error text). The pane is
+ * resizable by drag (clamped; the height commits to the tab's persisted
+ * meta on release) and by keyboard; git targets can expand into a dedicated
+ * diff tab via the shell.
+ */
+import { useEffect, useMemo, useRef, useState, type PointerEvent as ReactPointerEvent } from 'react'
+import { IconCloseOutline16, IconRefreshOutline16, IconRightUpOutline16, MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives'
+import type { SessionScope } from '../api.ts'
+import { api, htmlUrl } from '../api.ts'
+import { t } from '../locales.ts'
+import { baseName } from '../paths.ts'
+import { resolveSidebarPath } from '../produced-files.ts'
+import { HTML_IFRAME_SANDBOX } from '../html-preview.ts'
+import type { SidebarDiffRef, SidebarTab } from '../state.ts'
+import { DiffRows, ReadRows } from '../diff/DiffRows.tsx'
+import { PdfView } from '../PdfView.tsx'
+import { DiffFiles } from '../diff/DiffFiles.tsx'
+import { langOfPath } from '../diff/highlight.ts'
+import { buildDiffSegments, diffLines, diffStats, displayPath, foldRowsFromContents, parseUnifiedDiff, unifiedSegments, type DiffFile, type DiffRow, type FoldSegment } from '../diff/rows.ts'
+import { parseReadContent, parseReadLines, type FileOp } from './ops.ts'
+import { redactText } from '../redact.ts'
+import { rewriteLocalImageUrls } from '../markdown-images.ts'
+import { markdownTextProps } from '../markdown-labels.tsx'
+import { splitMermaidBlocks } from '../mermaid-blocks.ts'
+import { LazyMermaidMarkdown } from '../mermaid-lazy.tsx'
+import { createFrameBatcher } from '../frame-batcher.ts'
+import css from './changes.module.css'
+import diffCss from '../diff/diff.module.css'
+
+/** Drag handle height clamp (px) and keyboard-resize step. */
+const HEIGHT_MIN = 140
+const HEIGHT_STEP = 24
+
+/** The redaction preference, persisted under the repo's sidebar storage
+ *  prefix (see state.ts's `dsh-sidebar:v1`). */
+const REDACTION_KEY = 'dsh-sidebar:v1:redaction'
+
+/** What the pane is showing right now. */
+export type ChangesPreview =
+  | { kind: 'git'; ref: SidebarDiffRef }
+  | { kind: 'op'; path: string; op: FileOp; prior?: string }
+
+/** Diff material for one op snapshot: an edit reconstructs the full file
+ *  from the window's known prior content when possible (hunk-style context);
+ *  a write with unknown prior content renders all-added. */
+function diffOf(op: FileOp, prior: string | undefined): readonly DiffRow[] {
+  if (op.kind === 'read') return []
+  if (op.kind === 'edit' && op.edit !== undefined) {
+    const { oldString, newString } = op.edit
+    if (prior !== undefined && prior.includes(oldString)) {
+      const newFile = prior.replace(oldString, newString)
+      return diffLines(prior, newFile)
+    }
+    return diffLines(oldString, newString)
+  }
+  if (op.kind === 'write') {
+    const content = op.content ?? ''
+    const old = prior !== undefined && prior !== content ? prior : undefined
+    return diffLines(old ?? '', content)
+  }
+  return []
+}
+
+/** The render view of one html op target: the route-src iframe. Extracted
+ *  (and exported) so the always-sandboxed contract is pinned directly by the
+ *  sandbox spec — this surface has NO no-sandbox escape hatch. */
+export function HtmlRenderPreview(props: { src: string; title: string }) {
+  return (
+    <div className={css.htmlPane}>
+      <iframe
+        className={css.htmlFrame}
+        title={props.title}
+        src={props.src}
+        sandbox={HTML_IFRAME_SANDBOX}
+        referrerPolicy="no-referrer"
+        allow=""
+      />
+    </div>
+  )
+}
+
+/** One header pill toggle — the redaction / reading / render toggles share
+ *  the shape (on-state styling + aria-pressed). */
+function PaneToggle(props: { on: boolean; label: string; title?: string; onClick: () => void }) {
+  return (
+    <button
+      type="button"
+      className={css.mdToggle}
+      data-on={props.on ? 'true' : undefined}
+      aria-pressed={props.on}
+      title={props.title}
+      onClick={props.onClick}
+    >
+      {props.label}
+    </button>
+  )
+}
+
+/** The reading-mode body of one markdown op target: the shared MarkdownText
+ *  pass (local image destinations already rewritten to the media route by
+ *  the caller). Mermaid fences render through the same chunk-resident
+ *  renderer the editor preview uses (one MarkdownText pass with the fences
+ *  lifted out); the plain path stays byte-for-byte for documents without
+ *  any. */
+function MdReadingView(props: { text: string }) {
+  const codeLabels = { copyLabel: t('copy'), copiedLabel: t('copied') }
+  const hasMermaid = splitMermaidBlocks(props.text).some((block) => block.kind === 'mermaid')
+  return (
+    <div className={css.paneBody}>
+      <div className={css.mdBody}>
+        {hasMermaid
+          ? <LazyMermaidMarkdown text={props.text} codeLabels={codeLabels} />
+          : <MarkdownText {...markdownTextProps(props.text, codeLabels)} />}
+      </div>
+    </div>
+  )
+}
+
+/** The diff tab a git preview expands into (the shell owns placement). */
+export function diffTabOf(ref: SidebarDiffRef): SidebarTab {
+  if (ref.kind === 'worktree') {
+    return {
+      id: `diff:w:${encodeURIComponent(ref.worktree ?? '')}:${ref.staged ? 's' : 'u'}:${ref.path}`,
+      type: 'diff',
+      title: baseName(ref.path),
+      diff: ref,
+    }
+  }
+  return {
+    id: `diff:c:${encodeURIComponent(ref.worktree ?? '')}:${ref.hashFull}`,
+    type: 'diff',
+    title: `${ref.hash} ${ref.subject}`,
+    diff: ref,
+  }
+}
+
+export interface DiffPaneProps {
+  target: ChangesPreview
+  scope: SessionScope
+  /** The persisted pane height (px); drag commits a new one upwards. */
+  height: number
+  onHeightCommit: (height: number) => void
+  onClose: () => void
+  /** Expand the current git target into a dedicated diff tab. */
+  onExpand: () => void
+}
+
+export function DiffPane({ target, scope, height, onHeightCommit, onClose, onExpand }: DiffPaneProps) {
+  // ── Git target loading (mirrors the diff tab: staged-side fallback, the
+  //    untracked full-addition fallback, refresh by tick). ─────────────────
+  const [tick, setTick] = useState(0)
+  const [loading, setLoading] = useState(target.kind === 'git')
+  const [error, setError] = useState<string | null>(null)
+  const [diffText, setDiffText] = useState<string | null>(null)
+  const [untracked, setUntracked] = useState<string | undefined>(undefined)
+  // The staged flag of the side ACTUALLY rendered: when the requested side's
+  // diff came back empty the load falls back to the other side, and the fold
+  // expansion must read that side's revisions (else the sliced line numbers
+  // land on the wrong contents).
+  const [effectiveStaged, setEffectiveStaged] = useState<boolean | null>(null)
+  const gitRef = target.kind === 'git' ? target.ref : null
+  // The scope every git call of this target shares (repoRoot folded in when
+  // the ref carries one, exactly like the load effect's paneScope).
+  const gitScope = useMemo<SessionScope>(() => ({
+    sessionId: scope.sessionId,
+    cwd: scope.cwd,
+    ...(gitRef?.repoRoot !== undefined ? { repoRoot: gitRef.repoRoot } : {}),
+  }), [scope.sessionId, scope.cwd, gitRef?.repoRoot])
+
+  useEffect(() => {
+    if (gitRef === null) return
+    let cancelled = false
+    const paneScope: SessionScope = {
+      sessionId: scope.sessionId,
+      cwd: scope.cwd,
+      ...(gitRef.repoRoot !== undefined ? { repoRoot: gitRef.repoRoot } : {}),
+    }
+    setLoading(true)
+    setError(null)
+    setDiffText(null)
+    setUntracked(undefined)
+    setEffectiveStaged(null)
+    const load = async (): Promise<void> => {
+      try {
+        if (gitRef.kind === 'commit') {
+          const result = await api.gitCommitDiff(paneScope, gitRef.hashFull, gitRef.worktree)
+          if (!cancelled) setDiffText(result.diff)
+          return
+        }
+        let result = await api.gitDiff(paneScope, gitRef.path, gitRef.staged, gitRef.worktree)
+        if (result.diff === '') {
+          // The requested side is empty — try the OTHER side once (the change
+          // may have moved sides after the preview target was minted).
+          const other = await api.gitDiff(paneScope, gitRef.path, !gitRef.staged, gitRef.worktree)
+          if (other.diff !== '') {
+            result = other
+            if (!cancelled) setEffectiveStaged(!gitRef.staged)
+          }
+        }
+        if (result.diff !== '') {
+          if (!cancelled) setDiffText(result.diff)
+          return
+        }
+        // Empty diff: an untracked file (git diff never lists it) falls back
+        // to a full-file addition from its content.
+        if (gitRef.untracked === true && !gitRef.staged) {
+          const text = await api.fsRead(paneScope, resolveSidebarPath(gitRef.repoRoot ?? gitRef.worktree ?? scope.cwd, gitRef.path))
+          if (!cancelled && text.kind === 'text') {
+            setDiffText('')
+            setUntracked(text.content)
+          }
+          return
+        }
+        if (!cancelled) setDiffText('')
+      } catch (reason) {
+        if (!cancelled) setError(reason instanceof Error ? reason.message : String(reason))
+      } finally {
+        if (!cancelled) setLoading(false)
+      }
+    }
+    void load()
+    return () => { cancelled = true }
+  }, [gitRef, scope.sessionId, scope.cwd, tick])
+
+  // ── On-demand git fold expansion: a fold's hidden rows come from both
+  //    sides' full contents (git.show / fsRead), fetched ONCE per file so
+  //    sibling folds share the request, then sliced by each fold's line
+  //    ranges. The cache dies with the target or a refresh tick. ───────────
+  const foldContents = useRef(new Map<string, Promise<{ old: string; new: string }>>())
+  useEffect(() => { foldContents.current = new Map() }, [gitRef, tick])
+  const foldLoader = useMemo(() => {
+    if (gitRef === null) return undefined
+    const sidesOf = (file: DiffFile): Promise<{ old: string; new: string }> => {
+      // Both sides empty cannot cover a non-empty fold — treat it as a failed
+      // fetch so the fold degrades to the unavailable marker instead of
+      // silently expanding to nothing (the symptom of a bad rev or path
+      // reading null on both sides).
+      const ofSides = (oldContent: string | null, newContent: string | null): { old: string; new: string } => {
+        if ((oldContent ?? '') === '' && (newContent ?? '') === '') throw new Error('no content on either side')
+        return { old: oldContent ?? '', new: newContent ?? '' }
+      }
+      const fetchSides = async (): Promise<{ old: string; new: string }> => {
+        if (gitRef.kind === 'commit') {
+          // The patch's -m --first-parent shape: old side from the parent,
+          // new side from the commit (a root commit's parent read fails → '').
+          const [oldSide, newSide] = await Promise.all([
+            file.oldPath === '/dev/null'
+              ? Promise.resolve({ content: null })
+              : api.gitShow(gitScope, `${gitRef.hashFull}^`, displayPath(file.oldPath), gitRef.worktree),
+            file.newPath === '/dev/null'
+              ? Promise.resolve({ content: null })
+              : api.gitShow(gitScope, gitRef.hashFull, displayPath(file.newPath), gitRef.worktree),
+          ])
+          return ofSides(oldSide.content, newSide.content)
+        }
+        // Worktree change: staged is HEAD vs index, unstaged is index vs
+        // worktree (the worktree side reads the live file).
+        const staged = effectiveStaged ?? gitRef.staged
+        if (staged) {
+          const [oldSide, newSide] = await Promise.all([
+            file.oldPath === '/dev/null'
+              ? Promise.resolve({ content: null })
+              : api.gitShow(gitScope, 'HEAD', displayPath(file.oldPath), gitRef.worktree),
+            file.newPath === '/dev/null'
+              ? Promise.resolve({ content: null })
+              : api.gitShow(gitScope, ':0', displayPath(file.newPath), gitRef.worktree),
+          ])
+          return ofSides(oldSide.content, newSide.content)
+        }
+        const [oldSide, worktree] = await Promise.all([
+          file.oldPath === '/dev/null'
+            ? Promise.resolve({ content: null })
+            : api.gitShow(gitScope, ':0', displayPath(file.oldPath), gitRef.worktree),
+          api.fsRead(gitScope, resolveSidebarPath(gitRef.repoRoot ?? gitRef.worktree ?? scope.cwd, displayPath(file.newPath))).catch(() => null),
+        ])
+        return ofSides(oldSide.content, worktree !== null && worktree.kind === 'text' ? worktree.content : null)
+      }
+      const path = displayPath(file.newPath === '/dev/null' ? file.oldPath : file.newPath)
+      let promise = foldContents.current.get(path)
+      if (promise === undefined) {
+        promise = fetchSides()
+        foldContents.current.set(path, promise)
+      }
+      return promise
+    }
+    return (file: DiffFile, segment: FoldSegment): Promise<readonly DiffRow[]> =>
+      sidesOf(file).then(sides => foldRowsFromContents(segment, sides.old, sides.new))
+  }, [gitRef, gitScope, effectiveStaged, scope])
+
+  // ── Op target material (pure snapshots; the prior content came with the
+  //    target so a running op shows what is already known). ────────────────
+  const opRaw = target.kind === 'op' ? target.op : null
+  const priorRaw = target.kind === 'op' ? target.prior : undefined
+  // Secret redaction: on by default, toggle persists per browser (localStorage).
+  // Every op payload consumer below (diff rows, read rows, markdown source,
+  // error text) renders from the REDACTED shape, so masked payloads are the
+  // only thing that can reach the DOM while the toggle is on. Display-only:
+  // session events and the fs layer keep their original bytes.
+  const [redactionOn, setRedactionOn] = useState((): boolean => {
+    try { return localStorage.getItem(REDACTION_KEY) !== '0' } catch { return true }
+  })
+  const toggleRedaction = (): void => {
+    setRedactionOn((prev) => {
+      const next = !prev
+      try { localStorage.setItem(REDACTION_KEY, next ? '1' : '0') } catch { /* storage unavailable */ }
+      return next
+    })
+  }
+  const { op, prior, redactionHit } = useMemo(() => {
+    if (opRaw === null || !redactionOn) return { op: opRaw, prior: priorRaw, redactionHit: false }
+    const path = target.kind === 'op' ? target.path : ''
+    // One redactText pass per field: the outcome carries both the masked
+    // text and whether anything was hit.
+    const mask = (text: string | undefined): { masked: string | undefined; hit: boolean } => {
+      if (text === undefined) return { masked: undefined, hit: false }
+      const outcome = redactText(path, text)
+      return { masked: outcome.text, hit: outcome.hit }
+    }
+    const read = mask(opRaw.read)
+    const content = mask(opRaw.content)
+    const editOld = mask(opRaw.edit?.oldString)
+    const editNew = mask(opRaw.edit?.newString)
+    const errorText = mask(opRaw.errorText)
+    const priorMasked = mask(priorRaw)
+    const hit = read.hit || content.hit || editOld.hit || editNew.hit || errorText.hit || priorMasked.hit
+    if (!hit) return { op: opRaw, prior: priorRaw, redactionHit: false }
+    const redacted: FileOp = {
+      ...opRaw,
+      ...(read.masked !== undefined ? { read: read.masked } : {}),
+      ...(content.masked !== undefined ? { content: content.masked } : {}),
+      ...(opRaw.edit !== undefined
+        ? { edit: { oldString: editOld.masked ?? opRaw.edit.oldString, newString: editNew.masked ?? opRaw.edit.newString } }
+        : {}),
+      ...(errorText.masked !== undefined ? { errorText: errorText.masked } : {}),
+    }
+    return { op: redacted, prior: priorMasked.masked, redactionHit: true }
+  }, [opRaw, priorRaw, target, redactionOn])
+  const opLang = useMemo(() => (target.kind === 'op' ? langOfPath(target.path) : undefined), [target])
+  const opRows = useMemo(() => (op === null ? [] : diffOf(op, prior)), [op, prior])
+  const opSegments = useMemo(() => buildDiffSegments(opRows), [opRows])
+  const opStats = useMemo(() => diffStats(opSegments), [opSegments])
+  const opReadLines = useMemo(
+    () => (op?.kind === 'read' && op.read !== undefined ? parseReadLines(op.read) : []),
+    [op],
+  )
+
+  // ── Markdown reading mode: .md op targets (read/write/edit, non-error)
+  //    toggle between the raw/diff view and the rendered document — the same
+  //    shared MarkdownText pass the editor preview uses, with local image
+  //    destinations rewritten through the /sidebar/file media route. ──────
+  const mdOp = target.kind === 'op' && !target.op.isError && /\.(md|markdown|mdx)$/i.test(target.path)
+  const [reading, setReading] = useState(false)
+  const readingSrc = useMemo(() => {
+    if (!mdOp || op === null) return ''
+    if (op.kind === 'read') return parseReadContent(op.read ?? '')
+    if (op.kind === 'write') return op.content ?? ''
+    if (op.kind === 'edit' && op.edit !== undefined) {
+      if (prior !== undefined && prior.includes(op.edit.oldString)) {
+        return prior.replace(op.edit.oldString, op.edit.newString)
+      }
+      return op.edit.newString
+    }
+    return ''
+  }, [mdOp, op, prior])
+  const readingText = useMemo(
+    () => (mdOp && reading && readingSrc !== '' && target.kind === 'op'
+      ? rewriteLocalImageUrls(readingSrc, scope, target.path, window.location.origin)
+      : ''),
+    [mdOp, reading, readingSrc, scope, target],
+  )
+
+  // ── HTML render mode: .html/.htm op targets (the editor html viewer's
+  //    ext set) load the SAVED file through the same /sidebar/html route the
+  //    editor's html viewer uses — relative assets (./style.css, img/x.png)
+  //    resolve inside the route, and a segmented read still renders the
+  //    whole document (the route serves the file, not the op snapshot). The
+  //    frame is always sandboxed (the attribute plus the route's CSP sandbox
+  //    header); the editor tab owns the warned no-sandbox escape hatch. ──
+  const htmlOp = target.kind === 'op' && !target.op.isError && /\.(html?)$/i.test(target.path)
+  const [rendering, setRendering] = useState(false)
+  const htmlRenderSrc = useMemo(() => {
+    if (!htmlOp || target.kind !== 'op') return ''
+    return htmlUrl(scope, resolveSidebarPath(scope.cwd, target.path))
+  }, [htmlOp, scope, target])
+
+  // ── PDF render mode: .pdf op targets (read / write / edit, non-error) reuse
+  //    the editor's PdfView verbatim — media-route bytes wrapped into an
+  //    explicitly-typed Blob so the browser's native PDF viewer opens (a
+  //    direct iframe src can fall back to a download). ──────────────────────
+  const pdfOp = target.kind === 'op' && !target.op.isError && /\.pdf$/i.test(target.path)
+  const [renderingPdf, setRenderingPdf] = useState(false)
+  const pdfRenderPath = useMemo(() => {
+    if (!pdfOp || target.kind !== 'op') return ''
+    return resolveSidebarPath(scope.cwd, target.path)
+  }, [pdfOp, scope, target])
+
+  // Header stats for git targets come off the parsed patch text.
+  const gitStats = useMemo(() => {
+    if (target.kind !== 'git' || diffText === null || diffText === '') return null
+    let added = 0
+    let deleted = 0
+    for (const file of parseUnifiedDiff(diffText).files) {
+      const stats = diffStats(unifiedSegments(file))
+      added += stats.added
+      deleted += stats.deleted
+    }
+    return { added, deleted }
+  }, [target, diffText])
+
+  // ── Resize: drag the top handle; commit on release (persisted by the
+  //    shell). Arrow keys resize by a step for keyboard users. ────────────
+  const [dragHeight, setDragHeight] = useState<number | null>(null)
+  const paneHeight = dragHeight ?? height
+  const clamp = (value: number): number => Math.min(Math.max(value, HEIGHT_MIN), Math.round(window.innerHeight * 0.7))
+  const dragOrigin = useRef<{ y: number; h: number } | null>(null)
+  // Pointer streams fire several times per frame; one setState per event
+  // re-rendered the whole pane at event cadence (see frame-batcher).
+  const dragBatcher = useRef(createFrameBatcher()).current
+  useEffect(() => () => dragBatcher.dispose(), [dragBatcher])
+  const onHandleDown = (event: ReactPointerEvent<HTMLDivElement>): void => {
+    event.preventDefault()
+    dragOrigin.current = { y: event.clientY, h: paneHeight }
+    const onMove = (ev: PointerEvent): void => {
+      if (dragOrigin.current === null) return
+      const next = clamp(dragOrigin.current.h + (dragOrigin.current.y - ev.clientY))
+      dragBatcher.schedule(() => { setDragHeight(next) })
+    }
+    const onUp = (): void => {
+      window.removeEventListener('pointermove', onMove)
+      window.removeEventListener('pointerup', onUp)
+      dragOrigin.current = null
+      dragBatcher.flushNow()
+      setDragHeight(current => {
+        if (current !== null) onHeightCommit(current)
+        return null
+      })
+    }
+    window.addEventListener('pointermove', onMove)
+    window.addEventListener('pointerup', onUp)
+  }
+
+  const title = target.kind === 'op'
+    ? target.path
+    : target.ref.kind === 'worktree' ? target.ref.path : `${target.ref.hash} ${target.ref.subject}`
+  const stats = gitStats ?? (target.kind === 'op' && op !== null && op.kind !== 'read' && !op.isError ? opStats : null)
+
+  return (
+    <div className={css.diffPane} style={{ height: paneHeight }}>
+      <div
+        className={css.dragHandle}
+        role="separator"
+        aria-orientation="horizontal"
+        aria-label={t('changesResizePreview')}
+        tabIndex={0}
+        onPointerDown={onHandleDown}
+        onKeyDown={(event) => {
+          if (event.key === 'ArrowUp') { event.preventDefault(); onHeightCommit(clamp(paneHeight + HEIGHT_STEP)) }
+          if (event.key === 'ArrowDown') { event.preventDefault(); onHeightCommit(clamp(paneHeight - HEIGHT_STEP)) }
+        }}
+      />
+      <div className={css.diffHead}>
+        {target.kind === 'op' && (
+          <span className={css.diffKind} data-kind={target.op.kind}>
+            {t(target.op.kind === 'read' ? 'changesRead' : target.op.kind === 'write' ? 'changesWrite' : 'changesEdit')}
+          </span>
+        )}
+        {target.kind === 'git' && target.ref.kind === 'worktree' && (
+          <span className={css.diffKind} data-kind="git">{target.ref.staged ? t('staged') : t('unstaged')}</span>
+        )}
+        {target.kind === 'git' && target.ref.kind === 'commit' && (
+          <span className={css.diffKind} data-kind="git">{target.ref.hash}</span>
+        )}
+        <span className={css.diffPath} title={title}>{title}</span>
+        {stats !== null && (stats.added > 0 || stats.deleted > 0) && (
+          <span className={css.diffStats}>
+            {stats.added > 0 && <span className={diffCss.statAdd}>+{String(stats.added)}</span>}
+            {stats.deleted > 0 && <span className={diffCss.statDel}>−{String(stats.deleted)}</span>}
+          </span>
+        )}
+        {target.kind === 'git' && (
+          <>
+            <button
+              type="button"
+              className={css.iconButton}
+              aria-label={t('refresh')}
+              title={t('refresh')}
+              disabled={loading}
+              onClick={() => { setTick(value => value + 1) }}
+            >
+              <IconRefreshOutline16 size={14} />
+            </button>
+            <button
+              type="button"
+              className={css.iconButton}
+              aria-label={t('changesOpenDiffTab')}
+              title={t('changesOpenDiffTab')}
+              onClick={onExpand}
+            >
+              <IconRightUpOutline16 size={14} />
+            </button>
+          </>
+        )}
+        {redactionHit && (
+          <span className={css.redactBanner} role="status">{t('changesRedactBanner')}</span>
+        )}
+        {target.kind === 'op' && (
+          <PaneToggle
+            on={redactionOn}
+            label={redactionOn ? t('changesRedactOnLabel') : t('changesRedactOffLabel')}
+            title={redactionOn ? t('changesRedactOff') : t('changesRedactOn')}
+            onClick={toggleRedaction}
+          />
+        )}
+        {mdOp && (
+          <PaneToggle
+            on={reading}
+            label={t(reading ? 'changesMdRaw' : 'changesMdReading')}
+            onClick={() => { setReading(value => !value) }}
+          />
+        )}
+        {htmlOp && (
+          <PaneToggle
+            on={rendering}
+            label={t(rendering ? 'changesHtmlRaw' : 'changesHtmlRender')}
+            onClick={() => { setRendering(value => !value) }}
+          />
+        )}
+        {pdfOp && (
+          <PaneToggle
+            on={renderingPdf}
+            label={t(renderingPdf ? 'changesPdfRaw' : 'changesPdfRender')}
+            onClick={() => { setRenderingPdf(value => !value) }}
+          />
+        )}
+        <button
+          type="button"
+          className={css.iconButton}
+          aria-label={t('changesClosePreview')}
+          title={t('changesClosePreview')}
+          onClick={onClose}
+        >
+          <IconCloseOutline16 size={14} />
+        </button>
+      </div>
+      {target.kind === 'op' && htmlOp && rendering && htmlRenderSrc !== ''
+        ? <HtmlRenderPreview src={htmlRenderSrc} title={target.path} />
+        : target.kind === 'op' && pdfOp && renderingPdf && pdfRenderPath !== ''
+        ? (
+          <div className={css.htmlPane}>
+            <PdfView scope={scope} path={pdfRenderPath} title={target.path} />
+          </div>
+        )
+        : target.kind === 'op' && mdOp && reading && readingText !== ''
+        ? <MdReadingView text={readingText} />
+        : target.kind === 'op' && op !== null && op.isError
+        ? (
+          <div className={css.paneBody}>
+            <div className={css.readError} role="alert">
+              {op.errorText ?? t('changesError')}
+            </div>
+          </div>
+        )
+        : target.kind === 'op' && op !== null && op.kind === 'read'
+          ? (
+            <div className={css.paneBody}>
+              <ReadRows lines={opReadLines} lang={opLang} />
+            </div>
+          )
+          : target.kind === 'op'
+            ? (
+              <div className={css.paneBody}>
+                {op !== null && op.kind === 'write'
+                  && prior === undefined
+                  && <div className={css.priorUnknown}>{t('changesPriorUnknown')}</div>}
+                <DiffRows key={target.op.callId} segments={opSegments} lang={opLang} />
+              </div>
+            )
+            : loading
+              ? <div className={css.paneBody}><div className={css.gitPlaceholder}>{t('loading')}</div></div>
+              : error !== null
+                ? <div className={css.paneBody}><div className={css.gitError}>{t('diffLoadError')}: {error}</div></div>
+                : (
+                  <div className={css.paneBody}>
+                    {diffText !== null && diffText !== '' && (
+                      <DiffFiles
+                        diff={diffText}
+                        resolveFold={foldLoader}
+                        untrackedPath={untracked !== undefined && target.ref.kind === 'worktree' ? target.ref.path : undefined}
+                        untrackedContent={untracked}
+                      />
+                    )}
+                    {diffText === '' && untracked === undefined && (
+                      <div className={css.gitEmpty}>{t('diffEmpty')}</div>
+                    )}
+                  </div>
+                )}
+    </div>
+  )
+}

src/client/changes/GitLens.tsx

@@ -1,32 +1,34 @@
 /**
- * The source-control panel: status list (staged vs unstaged), stage/unstage,
- * commit with a message box, branch switch, and a VSCode-like history — rows
- * carry branch decorations, author and relative time. Clicking a changed
- * file or a history row opens a dedicated diff TAB (see {@link DiffTab}),
- * placed below the git pane on first use. File rows and history rows open a
- * right-click context menu with advanced operations (open in editor, discard,
- * revert, cherry-pick, copy paths/hashes). Refresh is manual + on mount/
- * focus. While visible it polls lightweight porcelain state so model-authored
- * file changes appear without a manual refresh.
+ * The Git lens of the changes tab: repository truth — status list (staged vs
+ * unstaged), stage/unstage, commit with a message box, branch switch, and a
+ * VSCode-like history with branch decorations, author and relative time.
+ * Clicking a changed file or a history row previews it in the tab's shared
+ * bottom pane (see {@link DiffPane}); rows carry right-click context menus
+ * with advanced operations (open in editor, discard, revert, cherry-pick,
+ * copy paths/hashes). Refresh is manual + on mount/focus. While visible it
+ * polls lightweight porcelain state so model-authored file changes appear
+ * without a manual refresh. Everything here is the former standalone git
+ * panel, re-homed as a lens.
  */
 import { useCallback, useEffect, useRef, useState, type MouseEvent, type ReactNode } from 'react'
 import {
-  Button, IconBranchOutline16, IconCodeOutline16, IconCopyOutline16, IconRefreshOutline16,
-  IconTrashOutline16, Input, Menu, Modal, writeClipboard,
+  Button, IconCodeOutline16, IconCopyOutline16, IconPlusOutline16,
+  IconRefreshOutline16, IconTrashOutline16, Input, Menu, Modal, writeClipboard,
 } from '@deepseek-ai/dsh-client-ui-primitives'
-import type { GitLogEntry, GitStatusEntry, GitStatusResult, GitWorktree, SessionScope } from './api.ts'
-import { api } from './api.ts'
-import { isWithinWorkspace, relativeTo } from './paths.ts'
-import { resolveSidebarPath } from './produced-files.ts'
-import { relativeTime, t } from './locales.ts'
-import type { SidebarStore, SidebarTab } from './state.ts'
-import css from './sidebar.module.css'
+import type { GitLogEntry, GitStatusEntry, GitStatusResult, GitWorktree, SessionScope } from '../api.ts'
+import { api } from '../api.ts'
+import { usePolling } from '../use-polling.ts'
+import { baseName, isWithinWorkspace, relativeTo } from '../paths.ts'
+import { resolveSidebarPath } from '../produced-files.ts'
+import { relativeTime, t } from '../locales.ts'
+import type { SidebarDiffRef, SidebarStore } from '../state.ts'
+import css from './changes.module.css'
 
 /** The XY status letters a row badge shows (X = index, Y = worktree). */
 function badgeOf(entry: GitStatusEntry): string {
   const index = entry.xy[0]
-  const worktree = entry.xy[1]
   if (index !== undefined && index !== ' ' && index !== '?') return index
+  const worktree = entry.xy[1]
   if (worktree !== undefined && worktree !== ' ' && worktree !== '?') return worktree
   return '?'
 }
@@ -51,12 +53,6 @@ function isUntracked(entry: GitStatusEntry): boolean {
   return badgeOf(entry) === '?'
 }
 
-/** The last path segment (tab title for a file's diff). */
-function baseName(path: string): string {
-  const at = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\'))
-  return at === -1 ? path : path.slice(at + 1)
-}
-
 /** The ref names of one log row's decorations (`HEAD -> main` → `main`), deduped. */
 function refNames(refs: string): string[] {
   return [...new Set(
@@ -69,6 +65,12 @@ function refNames(refs: string): string[] {
   )]
 }
 
+/** One thrown value as display text (every error banner/row here normalizes
+ *  through this so non-Error rejections never render as '[object Object]'). */
+function errorMessage(reason: unknown): string {
+  return reason instanceof Error ? reason.message : String(reason)
+}
+
 /** The pending destructive action (discard / revert / cherry-pick), gated by a confirm modal. */
 interface ConfirmState {
   title: string
@@ -81,17 +83,28 @@ interface ConfirmState {
  *  floods the panel at once (the end of the log is reached by paging). */
 const LOG_BATCH = 20
 
-export function GitView(props: {
+/** Every Nth silent poll re-lists worktrees (and re-runs auto-selection): the
+ *  2s tick only needs the selected checkout's STATUS, and re-listing spawned
+ *  a second git process per tick for a list that almost never changes — a
+ *  linked checkout the agent creates mid-session is picked up within ~30s
+ *  instead of 2s. */
+const WORKTREE_RECHECK_TICKS = 15
+
+export interface GitLensProps {
   scope: SessionScope
   /** The sidebar store: reads the `workspaceFence` pref (see the open guard below). */
   store: SidebarStore
   onOpenFile: (path: string) => void
-  /** Open a diff tab (the shell places it below the git pane on first use). */
-  onOpenDiff: (tab: SidebarTab) => void
+  /** Preview one change in the shared bottom pane (worktree or commit ref). */
+  onPreview: (ref: SidebarDiffRef) => void
+  /** The ref currently previewed (row highlight); null when the pane is closed. */
+  selectedRef: SidebarDiffRef | null
   /** Poll only while the tab is actually visible. */
   visible: boolean
-}) {
-  const { scope, store, onOpenFile, onOpenDiff, visible } = props
+}
+
+export function GitLens(props: GitLensProps) {
+  const { scope, store, onOpenFile, onPreview, selectedRef, visible } = props
   const [status, setStatus] = useState<GitStatusResult | null>(null)
   const [worktrees, setWorktrees] = useState<GitWorktree[]>([])
   const [selectedWorktree, setSelectedWorktree] = useState<string | undefined>()
@@ -122,8 +135,10 @@ export function GitView(props: {
    *  avoids a spurious full refresh on every auto-select (the very state
    *  change refresh writes back via setSelectedWorktree would recreate the
    *  callback and re-trigger the mount effect — an N→N+1 fetch loop). */
-  const selectedRef = useRef<string | undefined>(undefined)
-  useEffect(() => { selectedRef.current = selectedWorktree }, [selectedWorktree])
+  const chosenPathRef = useRef<string | undefined>(undefined)
+  useEffect(() => { chosenPathRef.current = selectedWorktree }, [selectedWorktree])
+  /** Silent polls since the last worktree re-list (see WORKTREE_RECHECK_TICKS). */
+  const silentTickCount = useRef(0)
 
   const gitScope: SessionScope = repoRoot === undefined ? scope : { ...scope, repoRoot }
 
@@ -149,11 +164,14 @@ export function GitView(props: {
       setLogEnded(logResult.length < LOG_BATCH)
     } catch (reason) {
       if (options.generation === refreshGeneration.current) {
-        setError(reason instanceof Error ? reason.message : String(reason))
+        setError(errorMessage(reason))
       }
     } finally {
       if (options.loading && options.generation === refreshGeneration.current) setLoading(false)
     }
+    // Granular scope fields: the scope object's identity churns, only its
+    // sessionId / cwd fields gate the git target.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [scope.sessionId, scope.cwd, repoRoot])
 
   const refresh = useCallback(async (silent = false): Promise<void> => {
@@ -161,11 +179,20 @@ export function GitView(props: {
     refreshInFlight.current = true
     let generation = refreshGeneration.current
     try {
+      // Fast path for the ordinary silent tick: the selected checkout's
+      // STATUS is all that changes between worktree re-lists (see
+      // WORKTREE_RECHECK_TICKS) — one git process instead of two.
+      if (silent && chosenPathRef.current !== undefined && (silentTickCount.current += 1) % WORKTREE_RECHECK_TICKS !== 0) {
+        const statusResult = await api.gitStatus(gitScope, chosenPathRef.current)
+        if (generation === refreshGeneration.current) setStatus(statusResult)
+        return
+      }
+      silentTickCount.current = 0
       const listed = await api.gitWorktrees(scope)
       if (generation !== refreshGeneration.current) return
       setWorktrees(listed)
-      const selectedStillExists = listed.some(entry => entry.path === selectedRef.current)
-      let target = selectedStillExists ? selectedRef.current : listed.find(entry => entry.current)?.path
+      const selectedStillExists = listed.some(entry => entry.path === chosenPathRef.current)
+      let target = selectedStillExists ? chosenPathRef.current : listed.find(entry => entry.current)?.path
       // DSH and other coding agents commonly create one linked checkout while
       // the session remains rooted at the clean primary checkout. Select that
       // checkout automatically only when the choice is unambiguous.
@@ -176,12 +203,12 @@ export function GitView(props: {
           ? dirtyLinked[0]!.path
           : current?.path
       }
-      const targetChanged = target !== selectedRef.current
+      const targetChanged = target !== chosenPathRef.current
       if (targetChanged) {
         // Changing the automatically selected checkout invalidates any direct
         // target refresh that may still be resolving for the previous one.
         generation = refreshGeneration.current += 1
-        selectedRef.current = target
+        chosenPathRef.current = target
         setSelectedWorktree(target)
         // Remove rows owned by the previous checkout immediately: keeping them
         // interactive while the target changes could apply a destructive action
@@ -202,19 +229,23 @@ export function GitView(props: {
       await refreshTarget(target, { loading: !silent, generation })
     } catch (reason) {
       if (generation === refreshGeneration.current) {
-        setError(reason instanceof Error ? reason.message : String(reason))
+        setError(errorMessage(reason))
         if (!silent) setLoading(false)
       }
     } finally {
       refreshInFlight.current = false
     }
+    // Granular scope fields: the scope object's identity churns, only its
+    // sessionId / cwd fields gate the refresh target.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [scope.sessionId, scope.cwd, refreshTarget])
 
   useEffect(() => {
     refreshGeneration.current += 1
     refreshInFlight.current = false
     worktreeChosenByUser.current = false
-    selectedRef.current = undefined
+    chosenPathRef.current = undefined
+    silentTickCount.current = 0
     setSelectedWorktree(undefined)
   }, [scope.sessionId, scope.cwd])
   useEffect(() => { void refresh() }, [refresh])
@@ -223,7 +254,7 @@ export function GitView(props: {
    *  checkout-derived surface before destructive history actions can run. */
   const chooseWorktree = (target: string): void => {
     worktreeChosenByUser.current = true
-    selectedRef.current = target
+    chosenPathRef.current = target
     setSelectedWorktree(target)
     setStatus(null)
     setBranchNames([])
@@ -248,54 +279,61 @@ export function GitView(props: {
     // own worktree list is empty); keep the current linked-checkout choice
     // unless it does not belong to the new repository.
     const generation = refreshGeneration.current += 1
-    void refreshTarget(selectedRef.current ?? '', { loading: true, generation })
+    void refreshTarget(chosenPathRef.current ?? '', { loading: true, generation })
   }
-  useEffect(() => {
-    if (!visible) return
-    const timer = window.setInterval(() => { void refresh(true) }, 2_000)
-    return () => { window.clearInterval(timer) }
-  }, [visible, refresh])
+  /** The silent poll tick (the status-only fast path between worktree
+   *  re-lists, see refresh) — fixed 2s cadence while visible, no initial
+   *  burst (mount and scope changes already refresh above). */
+  const pollTick = useCallback((): Promise<void> => refresh(true), [refresh])
+  usePolling(visible, pollTick, { intervalMs: 2_000 })
 
   /** Append the next history page (lazy: only when the user asks for more). */
   const loadMoreLog = async (): Promise<void> => {
     if (logLoadingMore || logEnded) return
     const generation = refreshGeneration.current
-    const target = selectedRef.current
+    const target = chosenPathRef.current
     setLogLoadingMore(true)
     try {
       const next = await api.gitLog(gitScope, LOG_BATCH, logEntries.length, target)
       // A worktree switch clears the old history and increments generation.
       // Never append a late page from that checkout into the new one.
-      if (generation !== refreshGeneration.current || target !== selectedRef.current) return
+      if (generation !== refreshGeneration.current || target !== chosenPathRef.current) return
       setLogEntries(entries => [...entries, ...next])
       if (next.length < LOG_BATCH) setLogEnded(true)
     } catch (reason) {
-      if (generation === refreshGeneration.current && target === selectedRef.current) {
-        setCommitError(`${t('historyLoadError')}: ${reason instanceof Error ? reason.message : String(reason)}`)
+      if (generation === refreshGeneration.current && target === chosenPathRef.current) {
+        setCommitError(`${t('historyLoadError')}: ${errorMessage(reason)}`)
       }
     } finally {
-      if (generation === refreshGeneration.current && target === selectedRef.current) setLogLoadingMore(false)
+      if (generation === refreshGeneration.current && target === chosenPathRef.current) setLogLoadingMore(false)
     }
   }
 
-  /** The diff tab for one changed file (one tab per path+side; same id = focused). */
-  const openWorktreeDiff = (entry: GitStatusEntry, staged: boolean): void => {
-    onOpenDiff({
-      id: `diff:w:${encodeURIComponent(selectedWorktree ?? '')}:${staged ? 's' : 'u'}:${entry.path}`,
-      type: 'diff',
-      title: baseName(entry.path),
-      diff: { kind: 'worktree', path: entry.path, staged, untracked: isUntracked(entry), worktree: selectedWorktree, repoRoot },
-    })
-  }
+  /** The preview ref for one changed file (one ref per path+side). */
+  const worktreeRefOf = (entry: GitStatusEntry, staged: boolean): SidebarDiffRef => ({
+    kind: 'worktree',
+    path: entry.path,
+    staged,
+    untracked: isUntracked(entry),
+    worktree: selectedWorktree,
+    repoRoot,
+  })
 
-  /** The diff tab for one commit (one tab per commit). */
-  const openCommitDiff = (entry: GitLogEntry): void => {
-    onOpenDiff({
-      id: `diff:c:${encodeURIComponent(selectedWorktree ?? '')}:${entry.hashFull}`,
-      type: 'diff',
-      title: `${entry.hash} ${entry.subject}`,
-      diff: { kind: 'commit', hash: entry.hash, hashFull: entry.hashFull, subject: entry.subject, worktree: selectedWorktree, repoRoot },
-    })
+  /** The preview ref for one commit. */
+  const commitRefOf = (entry: GitLogEntry): SidebarDiffRef => ({
+    kind: 'commit',
+    hash: entry.hash,
+    hashFull: entry.hashFull,
+    subject: entry.subject,
+    worktree: selectedWorktree,
+    repoRoot,
+  })
+
+  /** Whether a worktree row is the one currently previewed. */
+  const isPreviewedWorktree = (entry: GitStatusEntry, staged: boolean): boolean => {
+    if (selectedRef === null || selectedRef.kind !== 'worktree') return false
+    return selectedRef.path === entry.path && selectedRef.staged === staged
+      && (selectedRef.worktree ?? '') === (selectedWorktree ?? '')
   }
 
   const stageEntry = async (entry: GitStatusEntry, staged: boolean): Promise<void> => {
@@ -330,7 +368,7 @@ export function GitView(props: {
       setCommitMsg('')
       await refresh()
     } catch (reason) {
-      setCommitError(reason instanceof Error ? reason.message : String(reason))
+      setCommitError(errorMessage(reason))
     } finally {
       setBusy(false)
     }
@@ -344,7 +382,7 @@ export function GitView(props: {
       await api.gitCheckout(gitScope, branch, selectedWorktree)
       await refresh()
     } catch (reason) {
-      setCommitError(`${t('checkoutError')}: ${reason instanceof Error ? reason.message : String(reason)}`)
+      setCommitError(`${t('checkoutError')}: ${errorMessage(reason)}`)
     } finally {
       setBusy(false)
     }
@@ -359,7 +397,7 @@ export function GitView(props: {
         await confirmState.onConfirm()
         await refresh()
       } catch (reason) {
-        setCommitError(reason instanceof Error ? reason.message : String(reason))
+        setCommitError(errorMessage(reason))
       } finally {
         setBusy(false)
       }
@@ -387,16 +425,21 @@ export function GitView(props: {
   const unstagedEntries = (status?.entries ?? []).filter(isUnstagedEntry)
 
   const renderEntry = (entry: GitStatusEntry, staged: boolean): ReactNode => {
+    const selected = isPreviewedWorktree(entry, staged)
     return (
-      <div key={`${staged ? 's' : 'u'}:${entry.path}`} className={css.gitRow}>
+      <div
+        key={`${staged ? 's' : 'u'}:${entry.path}`}
+        className={css.gitRow}
+        data-selected={selected ? 'true' : undefined}
+      >
         <button
           type="button"
           className={css.gitRowMain}
           title={entry.path}
-          onClick={() => { openWorktreeDiff(entry, staged) }}
+          onClick={() => { onPreview(worktreeRefOf(entry, staged)) }}
           onContextMenu={(event) => { openFileMenu(event, entry, staged) }}
         >
-          <span className={css.gitBadge}>{badgeOf(entry)}</span>
+          <span className={css.gitBadge} data-letter={badgeOf(entry)}>{badgeOf(entry)}</span>
           <span className={css.gitName}>{entry.path}</span>
         </button>
         <button
@@ -407,7 +450,7 @@ export function GitView(props: {
           disabled={busy}
           onClick={() => { void stageEntry(entry, staged) }}
         >
-          {staged ? <IconTrashOutline16 /> : <IconBranchOutline16 />}
+          {staged ? <IconTrashOutline16 /> : <IconPlusOutline16 />}
         </button>
       </div>
     )
@@ -531,12 +574,13 @@ export function GitView(props: {
                 role="button"
                 tabIndex={0}
                 className={css.gitLogRow}
+                data-selected={selectedRef?.kind === 'commit' && selectedRef.hashFull === entry.hashFull ? 'true' : undefined}
                 title={`${entry.author} · ${entry.date}\n${entry.hashFull}`}
-                onClick={() => { openCommitDiff(entry) }}
+                onClick={() => { onPreview(commitRefOf(entry)) }}
                 onKeyDown={(event) => {
                   if (event.key === 'Enter' || event.key === ' ') {
                     event.preventDefault()
-                    openCommitDiff(entry)
+                    onPreview(commitRefOf(entry))
                   }
                 }}
                 onContextMenu={(event) => { openHistoryMenu(event, entry) }}
@@ -584,7 +628,7 @@ export function GitView(props: {
                 : []),
               fileMenu?.staged === true
                 ? { id: 'stage', label: t('unstage'), icon: <IconTrashOutline16 size={14} /> }
-                : { id: 'stage', label: t('stage'), icon: <IconBranchOutline16 size={14} /> },
+                : { id: 'stage', label: t('stage'), icon: <IconPlusOutline16 size={14} /> },
               ...(fileMenu !== null && !isUntracked(fileMenu.entry)
                 ? [{ id: 'discard', label: t('discard'), icon: <IconTrashOutline16 size={14} />, danger: true }]
                 : []),
@@ -627,6 +671,7 @@ export function GitView(props: {
               if (id === 'absolute') copy(resolveSidebarPath(repoRoot ?? selectedWorktree ?? scope.cwd, target.entry.path))
             }}
             portal
+            compact
             align="start"
             getAnchorRect={() => (fileMenu === null ? null : new DOMRect(fileMenu.x, fileMenu.y, 0, 0))}
             anchor={<span />}
@@ -650,7 +695,7 @@ export function GitView(props: {
               if (target === null) return
               setHistoryMenu(null)
               if (id === 'view') {
-                openCommitDiff(target.entry)
+                onPreview(commitRefOf(target.entry))
                 return
               }
               if (id === 'copyShort') {
@@ -684,6 +729,7 @@ export function GitView(props: {
               }
             }}
             portal
+            compact
             align="start"
             getAnchorRect={() => (historyMenu === null ? null : new DOMRect(historyMenu.x, historyMenu.y, 0, 0))}
             anchor={<span />}

src/client/changes/SessionLens.tsx

@@ -0,0 +1,116 @@
+/**
+ * The session lens of the changes tab: agent truth — every file the model
+ * read, wrote, or edited in this session, grouped by file, newest first,
+ * with kind filters. Clicking an op previews it in the tab's shared bottom
+ * pane (see {@link DiffPane}): writes and edits as line diffs, reads as a
+ * line-numbered content view, failures as their real error text. The ops
+ * arrive pre-folded from the tab (which owns the event poll); this
+ * component is purely presentational.
+ */
+import { useMemo, useState, type ReactNode } from 'react'
+import { relativeTime, t } from '../locales.ts'
+import { groupByFile, type FileOp, type FileOpKind } from './ops.ts'
+import { formatBytes } from '../diff/rows.ts'
+import css from './changes.module.css'
+
+/** The op-kind filter chips: 'all' or one concrete kind. */
+type OpFilter = 'all' | FileOpKind
+
+export interface SessionLensProps {
+  /** The folded file operations, newest first (the tab's poll owns them). */
+  ops: readonly FileOp[]
+  /** Every poll failed and nothing loaded: an inline notice, not an empty
+   *  state that would read as "no operations". */
+  loadError: boolean
+  /** Preview one op in the shared bottom pane. */
+  onPreview: (path: string, op: FileOp) => void
+  /** The op currently previewed (row highlight); null when the pane is closed. */
+  selectedCallId: string | null
+}
+
+export function SessionLens({ ops, loadError, onPreview, selectedCallId }: SessionLensProps) {
+  const [filter, setFilter] = useState<OpFilter>('all')
+  const filteredOps = useMemo(
+    () => (filter === 'all' ? ops : ops.filter(op => op.kind === filter)),
+    [ops, filter],
+  )
+  const groups = useMemo(() => groupByFile(filteredOps), [filteredOps])
+  const counts = useMemo(() => {
+    const map = new Map<FileOpKind, number>([['read', 0], ['write', 0], ['edit', 0]])
+    for (const op of ops) map.set(op.kind, (map.get(op.kind) ?? 0) + 1)
+    return map
+  }, [ops])
+
+  const chip = (value: OpFilter, label: string, count: number): ReactNode => (
+    <button
+      type="button"
+      key={value}
+      className={css.filterChip}
+      data-active={filter === value ? 'true' : undefined}
+      onClick={() => { setFilter(value) }}
+      aria-pressed={filter === value}
+    >
+      {label}{value !== 'all' ? ` ${String(count)}` : ''}
+    </button>
+  )
+
+  // Sizing a row's content constructs a Blob (a UTF-8 encode of the whole
+  // edit) — that was per row PER RENDER, re-encoding every field on every
+  // poll tick. ops keeps its identity between unchanged polls (see the
+  // tab's opsRef), so one pass per changed fold covers every render.
+  const opSizes = useMemo(() => {
+    const sizes = new Map<string, string>()
+    for (const op of ops) {
+      if (op.kind !== 'read' && !op.isError) {
+        sizes.set(op.callId, formatBytes(new Blob([op.edit?.newString ?? op.content ?? '']).size))
+      }
+    }
+    return sizes
+  }, [ops])
+
+  return (
+    <div className={css.session}>
+      <div className={css.filterRow} role="group" aria-label={t('changesSessionLens')}>
+        {chip('all', t('changesFilterAll'), ops.length)}
+        {chip('write', t('changesWrite'), counts.get('write') ?? 0)}
+        {chip('edit', t('changesEdit'), counts.get('edit') ?? 0)}
+        {chip('read', t('changesRead'), counts.get('read') ?? 0)}
+      </div>
+      <div className={css.sessionList}>
+        {loadError && <div className={css.loadError}>{t('changesLoadError')}</div>}
+        {ops.length === 0 && !loadError && <div className={css.empty}>{t('changesSessionEmpty')}</div>}
+        {ops.length > 0 && filteredOps.length === 0 && <div className={css.empty}>{t('changesFilterEmpty')}</div>}
+        {[...groups.entries()].map(([path, fileOps]) => (
+          <div key={path} className={css.fileGroup}>
+            <div className={css.filePath} title={path}>{path}</div>
+            {fileOps.map(op => (
+              <button
+                type="button"
+                key={op.callId}
+                className={css.opRow}
+                data-op-kind={op.kind}
+                data-op-error={op.isError ? 'true' : undefined}
+                data-selected={selectedCallId === op.callId ? 'true' : undefined}
+                onClick={() => { onPreview(path, op) }}
+              >
+                <span className={css.opKind} data-kind={op.kind}>
+                  {t(op.kind === 'read' ? 'changesRead' : op.kind === 'write' ? 'changesWrite' : 'changesEdit')}
+                </span>
+                {op.running && <span className={css.opFlag}>{t('changesRunning')}</span>}
+                {op.isError && <span className={css.opFlagError}>{t('changesError')}</span>}
+                <span className={css.opMeta}>
+                  {opSizes.get(op.callId) !== undefined && (
+                    <span className={css.opSize}>
+                      {opSizes.get(op.callId)}
+                    </span>
+                  )}
+                  <span className={css.opTime}>{relativeTime(new Date(op.time).toISOString())}</span>
+                </span>
+              </button>
+            ))}
+          </div>
+        ))}
+      </div>
+    </div>
+  )
+}

src/client/changes/changes.module.css

@@ -0,0 +1,407 @@
+/* The unified changes tab: lens switcher + Git lens + session lens + the
+   shared preview pane. Semantic --dsw-alias tokens only (skin contract).
+   The git lens styles moved here from sidebar.module.css when the git panel
+   became a lens of this tab; the generic placeholder/empty/error trio stays
+   duplicated in both modules (the diff tab still owns its copy). */
+
+.root { display: flex; flex-direction: column; min-height: 0; height: 100%; background: var(--dsw-alias-bg-base); color: var(--dsw-alias-label-primary); font-size: 12px; }
+
+/* ── Lens switcher ─────────────────────────────────────────────────────── */
+
+.lensBar { flex: none; display: flex; align-items: center; padding: 8px 8px 4px 12px; }
+.lensSwitch { display: inline-flex; gap: 2px; padding: 2px; border: 1px solid var(--dsw-alias-border-l2); border-radius: 8px; }
+.lensButton { border: 0; border-radius: 6px; padding: 2px 10px; background: transparent; color: var(--dsw-alias-label-secondary); font: var(--dsw-font-xxxs-strong-11); cursor: pointer; }
+.lensButton:hover { color: var(--dsw-alias-label-primary); }
+.lensButton[data-active='true'] { background: var(--dsw-alias-interactive-bg-active); color: var(--dsw-alias-label-primary); }
+
+/* ── Git lens (the former git panel) ───────────────────────────────────── */
+
+.git {
+  flex: 1;
+  min-height: 0;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+  /* Tab pages never scroll horizontally: content wraps or truncates to the
+     panel width instead of panning sideways. */
+  overflow-x: hidden;
+}
+
+.gitHeader {
+  flex: none;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  height: 36px;
+  padding: 0 8px 0 12px;
+}
+
+.gitWorktreeRow {
+  flex: none;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 6px 8px 0 12px;
+}
+
+.gitWorktreeLabel {
+  flex: none;
+  color: var(--dsw-alias-label-tertiary);
+  font: var(--dsw-font-xxxs-11);
+}
+
+.gitBranchSelect {
+  flex: 1;
+  min-width: 0;
+  height: 26px;
+  padding: 0 6px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 6px;
+  background: var(--dsw-alias-bg-base);
+  color: var(--dsw-alias-label-primary);
+  font: var(--dsw-font-xxs-12);
+}
+
+.gitSection {
+  border-top: 1px solid var(--dsw-alias-border-l1);
+}
+
+.gitSectionHeader {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 12px 4px;
+  font: var(--dsw-font-xxxs-strong-11);
+  color: var(--dsw-alias-label-tertiary);
+  text-transform: uppercase;
+}
+
+.gitLink {
+  border: none;
+  background: transparent;
+  font: var(--dsw-font-xxxs-11);
+  color: var(--dsw-alias-brand-primary);
+  cursor: pointer;
+  padding: 0;
+}
+
+.gitLink:hover:not(:disabled) {
+  text-decoration: underline;
+}
+
+.gitLink:disabled {
+  opacity: 0.4;
+  cursor: default;
+}
+
+.gitRow {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-height: 34px;
+  margin: 0 6px;
+  padding: 0 8px;
+  border-radius: 8px;
+  animation: dsh-row-in 150ms var(--ds-ease-in-out);
+}
+
+.gitRow:hover {
+  background: var(--dsw-alias-interactive-bg-hover);
+}
+
+.gitRow[data-selected='true'] {
+  background: var(--dsw-alias-interactive-bg-active);
+}
+
+.gitRowMain {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  border: none;
+  background: transparent;
+  padding: 3px 0;
+  cursor: pointer;
+  text-align: left;
+}
+
+.gitBadge {
+  flex: none;
+  width: 20px;
+  height: 16px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px;
+  font: var(--dsw-font-xxxs-strong-11);
+  background: var(--dsw-alias-interactive-bg-hover);
+  color: var(--dsw-alias-label-secondary);
+}
+
+/* Status-letter tint: A added / D deleted / M·R modified / C·U conflicts;
+   untracked '?' reads as a not-yet-added file, so it shares the added tint. */
+.gitBadge[data-letter='A'], .gitBadge[data-letter='?'] { color: var(--dsw-alias-state-success-primary); }
+.gitBadge[data-letter='D'] { color: var(--dsw-alias-state-error-primary); }
+.gitBadge[data-letter='M'], .gitBadge[data-letter='R'] { color: var(--dsw-alias-state-business-primary); }
+.gitBadge[data-letter='C'], .gitBadge[data-letter='U'] { color: var(--dsw-alias-state-warn-primary); }
+
+.gitName {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font: var(--dsw-font-s-14);
+  color: var(--dsw-alias-label-primary);
+}
+
+.gitEmpty {
+  padding: 4px 12px 8px;
+  font: var(--dsw-font-xxs-12);
+  color: var(--dsw-alias-label-tertiary);
+}
+
+.gitPlaceholder {
+  padding: 16px;
+  font: var(--dsw-font-xxs-12);
+  color: var(--dsw-alias-label-tertiary);
+  text-align: center;
+}
+
+.gitError {
+  padding: 8px 12px;
+  font: var(--dsw-font-xxs-12);
+  color: var(--dsw-alias-state-error-primary);
+  white-space: pre-wrap;
+}
+
+.gitConfirmDesc {
+  margin: 0;
+  font: var(--dsw-font-s-14);
+  color: var(--dsw-alias-label-primary);
+  white-space: pre-wrap;
+}
+
+.gitCommit {
+  display: flex;
+  gap: 6px;
+  padding: 8px 12px;
+  border-top: 1px solid var(--dsw-alias-border-l1);
+  align-items: center;
+}
+
+.gitCommitInput {
+  flex: 1;
+  min-width: 0;
+}
+
+.gitCommitButton {
+  flex: none;
+  height: 26px;
+  padding: 0 12px;
+  border: none;
+  border-radius: 6px;
+  background: var(--dsw-alias-button-primary-fill);
+  color: var(--dsw-alias-label-primary-inverted);
+  font: var(--dsw-font-xxs-strong-12);
+  cursor: pointer;
+}
+
+.gitCommitButton:hover:not(:disabled) {
+  background: var(--dsw-alias-button-primary-hover);
+}
+
+.gitCommitButton:disabled {
+  opacity: 0.45;
+  cursor: default;
+}
+
+/* A history row: line 1 = hash + subject, line 2 = ref badges + author/date
+   (badges live on the second line so they never crowd the subject). */
+.gitLogRow {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  padding: 5px 12px;
+  cursor: pointer;
+  border-radius: 8px;
+}
+
+.gitLogRow:hover {
+  background: var(--dsw-alias-interactive-bg-hover);
+}
+
+.gitLogRow[data-selected='true'] {
+  background: var(--dsw-alias-interactive-bg-active);
+}
+
+.gitLogLine1 {
+  display: flex;
+  align-items: baseline;
+  gap: 8px;
+  min-width: 0;
+}
+
+.gitLogHash {
+  flex: none;
+  font: var(--dsw-font-markdown-code-block-small);
+  color: var(--dsw-alias-label-tertiary);
+}
+
+.gitLogLine2 {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  flex-wrap: wrap;
+}
+
+.gitLogRef {
+  flex: none;
+  padding: 0 5px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 999px;
+  font: var(--dsw-font-xxxs-strong-11);
+  color: var(--dsw-alias-brand-primary);
+  white-space: nowrap;
+}
+
+.gitLogSubject {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font: var(--dsw-font-s-14);
+  color: var(--dsw-alias-label-primary);
+}
+
+.gitLogMeta {
+  font: var(--dsw-font-xxxs-11);
+  color: var(--dsw-alias-label-tertiary);
+}
+
+.gitLogMore {
+  display: block;
+  width: calc(100% - 24px);
+  margin: 4px 12px 8px;
+  padding: 6px 0;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 6px;
+  background: transparent;
+  font: var(--dsw-font-xxs-12);
+  color: var(--dsw-alias-label-secondary);
+  cursor: pointer;
+}
+
+.gitLogMore:hover:not(:disabled) {
+  background: var(--dsw-alias-interactive-bg-hover);
+  color: var(--dsw-alias-label-primary);
+}
+
+.gitLogMore:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+/* ── Session lens (this round's files) ─────────────────────────────────── */
+
+.session { flex: 1; min-height: 0; display: flex; flex-direction: column; }
+
+.filterRow { flex: none; display: flex; gap: 4px; padding: 2px 8px 6px 12px; flex-wrap: wrap; }
+.filterChip { border: 1px solid var(--dsw-alias-border-l2); border-radius: 999px; padding: 1px 8px; background: transparent; color: var(--dsw-alias-label-secondary); font: var(--dsw-font-xxxs-11); cursor: pointer; }
+.filterChip:hover { color: var(--dsw-alias-label-primary); background: var(--dsw-alias-interactive-bg-hover); }
+.filterChip[data-active='true'] { background: var(--dsw-alias-interactive-bg-active); color: var(--dsw-alias-label-primary); border-color: transparent; }
+
+.sessionList { flex: 1; min-height: 0; overflow-y: auto; padding: 0 6px 10px; }
+.empty { color: var(--dsw-alias-label-tertiary); padding: 24px 8px; text-align: center; }
+.loadError { margin: 4px 8px; padding: 6px 10px; border-left: 3px solid var(--dsw-alias-state-warn-primary); border-radius: 0 6px 6px 0; color: var(--dsw-alias-label-secondary); font-size: 11px; }
+
+.fileGroup { margin-bottom: 6px; }
+/* The group label sits between op blocks: extra head padding separates it from
+   the previous file's rows, the first group starts flush. */
+.filePath { display: block; color: var(--dsw-alias-label-tertiary); font-family: var(--ds-font-family-code, monospace); font-size: 11px; padding: 6px 4px 2px; word-break: break-all; }
+.fileGroup:first-child .filePath { padding-top: 2px; }
+.opRow { display: flex; align-items: center; gap: 6px; width: 100%; border: 0; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-primary); font: inherit; font-size: 11px; padding: 3px 5px; cursor: pointer; text-align: left; }
+.opRow:hover { background: var(--dsw-alias-interactive-bg-hover); }
+.opRow[data-selected='true'] { background: var(--dsw-alias-interactive-bg-active); }
+/* A failed op carries a quiet error inset bar (the flag chip names it). */
+.opRow[data-op-error='true'] { box-shadow: inset 2px 0 0 var(--dsw-alias-state-error-primary); }
+.opKind { border-radius: 4px; font-size: 10px; line-height: 16px; padding: 0 5px; background: var(--dsw-alias-interactive-bg-hover); color: var(--dsw-alias-label-secondary); flex: none; }
+.opKind[data-kind='write'] { color: var(--dsw-alias-state-success-primary); }
+.opKind[data-kind='edit'] { color: var(--dsw-alias-state-business-primary); }
+/* Size + relative time ride as one right-aligned cluster so the kind chips
+   form a scannable left rail and the meta column stays flush right. */
+.opMeta { margin-left: auto; display: inline-flex; align-items: baseline; gap: 8px; flex: none; min-width: 0; }
+.opTime { color: var(--dsw-alias-label-tertiary); font-size: 10px; flex: none; }
+.opFlag { color: var(--dsw-alias-state-business-primary); font-size: 10px; flex: none; }
+.opFlagError { color: var(--dsw-alias-state-error-primary); font-size: 10px; flex: none; }
+.opSize { color: var(--dsw-alias-label-tertiary); font-size: 10px; flex: none; font-family: var(--ds-font-family-code, monospace); }
+
+/* ── Shared preview pane ───────────────────────────────────────────────── */
+
+.redactBanner { flex: none; font: var(--dsw-font-xxxs-strong-11); padding: 2px 8px; border-radius: 7px; color: var(--dsw-alias-state-warn-primary); background: var(--dsw-alias-interactive-bg-hover); white-space: nowrap; }
+.mdToggle { flex: none; border: 1px solid var(--dsw-alias-border-l1); border-radius: 7px; background: transparent; color: var(--dsw-alias-label-secondary); font: var(--dsw-font-xxxs-strong-11); padding: 2px 8px; cursor: pointer; }
+.mdToggle:hover { background: var(--dsw-alias-interactive-bg-hover); color: var(--dsw-alias-label-primary); }
+.mdToggle[data-on='true'] { border-color: var(--dsw-alias-state-business-primary); color: var(--dsw-alias-state-business-primary); }
+.mdBody { padding: 12px 16px 20px; font: var(--dsw-font-xs-regular-13); line-height: 1.6; min-height: 0; overflow-y: auto; }
+.htmlPane { flex: 1; min-height: 0; display: flex; }
+.htmlFrame { flex: 1; width: 100%; border: none; background: var(--dsw-alias-bg-base); }
+
+.diffPane { border-top: 1px solid var(--dsw-alias-border-l1); display: flex; flex-direction: column; flex: none; min-height: 0; }
+.dragHandle { flex: none; height: 8px; cursor: ns-resize; position: relative; background: var(--dsw-alias-bg-base); }
+.dragHandle::after { content: ''; position: absolute; left: calc(50% - 18px); top: 3px; width: 36px; height: 2px; border-radius: 1px; background: var(--dsw-alias-border-l2); }
+.dragHandle:hover::after, .dragHandle:focus-visible::after { background: var(--dsw-alias-state-business-primary); }
+.diffHead { display: flex; align-items: center; gap: 6px; padding: 3px 8px 3px 10px; border-bottom: 1px solid var(--dsw-alias-border-l1); }
+.diffKind { flex: none; border-radius: 4px; font-size: 10px; line-height: 16px; padding: 0 5px; background: var(--dsw-alias-interactive-bg-hover); color: var(--dsw-alias-label-secondary); }
+.diffKind[data-kind='git'] { color: var(--dsw-alias-brand-primary); }
+.diffKind[data-kind='write'] { color: var(--dsw-alias-state-success-primary); }
+.diffKind[data-kind='edit'] { color: var(--dsw-alias-state-business-primary); }
+/* The path keeps its tail (the file name is the identity; directories are
+   context): an RTL paragraph renders an ASCII path in reading order while
+   clipping its HEAD under the ellipsis. */
+.diffPath { flex: 1; direction: rtl; font-family: var(--ds-font-family-code, monospace); font-size: 11px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: var(--dsw-alias-label-primary); min-width: 0; }
+.diffStats { flex: none; display: inline-flex; gap: 5px; font-size: 10px; font-family: var(--ds-font-family-code, monospace); }
+
+.iconButton {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+  padding: 0;
+  border: none;
+  border-radius: 6px;
+  background: transparent;
+  color: var(--dsw-alias-label-secondary);
+  cursor: pointer;
+  flex: none;
+}
+.iconButton:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover); color: var(--dsw-alias-label-primary); }
+.iconButton:disabled { opacity: 0.4; cursor: default; }
+
+.paneBody { flex: 1; min-height: 0; overflow-y: auto; }
+.readError { color: var(--dsw-alias-state-error-primary); border-left: 3px solid var(--dsw-alias-state-error-primary); border-radius: 0 6px 6px 0; margin: 6px 8px; padding: 6px 10px; white-space: pre-wrap; word-break: break-word; }
+.priorUnknown { color: var(--dsw-alias-label-tertiary); font-size: 10px; padding: 3px 10px; }
+
+/* ── Shared bits ───────────────────────────────────────────────────────── */
+
+/* Mount fade for rows (the app's session-row reveal). */
+@keyframes dsh-row-in {
+  from { opacity: 0; }
+}
+
+/* Keyboard focus rings match the shared sidebar convention. */
+.gitLink:focus-visible, .gitRowMain:focus-visible, .gitLogRow:focus-visible,
+.gitCommitButton:focus-visible, .gitLogMore:focus-visible, .gitBranchSelect:focus-visible,
+.lensButton:focus-visible, .filterChip:focus-visible, .iconButton:focus-visible,
+.dragHandle:focus-visible {
+  outline: 2px solid var(--dsw-alias-interactive-bg-hover-accent);
+  outline-offset: -1px;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .gitRow { animation: none; }
+}

src/client/changes/ops.ts

@@ -0,0 +1,254 @@
+/**
+ * File-operation extraction for the changes tab's session lens: folds the
+ * session's append-only event log (`tool/call` + `tool/result` pairs) into
+ * one op per file-touching call — the same semantics as the standalone
+ * dsh-file-trace plugin's Chat-view extraction, reading the authoritative
+ * event log instead (the repo's stated preference for cross-feature session
+ * data). Pure — no React, no DOM.
+ */
+import type { SidebarSessionEvent } from '../../context-types.ts'
+
+/** The file-touching operation kinds the tracer distinguishes. */
+export type FileOpKind = 'read' | 'write' | 'edit'
+
+/** One extracted file operation. */
+export interface FileOp {
+  /** Stable identity: the originating tool-call id. */
+  readonly callId: string
+  readonly kind: FileOpKind
+  /** Workspace-relative or absolute path exactly as the model spelled it. */
+  readonly path: string
+  /** Unix epoch ms of the call; the result time when only that is known. */
+  readonly time: number
+  /** True while the call has no result yet. */
+  readonly running: boolean
+  /** True when the result reported an error. */
+  readonly isError: boolean
+  /** The result's error text when isError; presented instead of the payload. */
+  readonly errorText?: string
+  /** For 'edit': the model's exact replacement payload. */
+  readonly edit?: { oldString: string; newString: string }
+  /** For 'write': the full new content. */
+  readonly content?: string
+  /** For 'read': the file content returned by the tool result. */
+  readonly read?: string
+}
+
+/** Tool names mapped to each op kind; unknown names are ignored. */
+const READ_TOOLS = new Set(['read', 'view', 'see'])
+const WRITE_TOOLS = new Set(['write', 'create'])
+const EDIT_TOOLS = new Set(['edit', 'str_replace', 'str-replace-editor', 'multi-edit'])
+
+/** Classify one tool name; undefined when the tool touches no file. */
+function kindOf(name: string): FileOpKind | undefined {
+  if (READ_TOOLS.has(name)) return 'read'
+  if (WRITE_TOOLS.has(name)) return 'write'
+  if (EDIT_TOOLS.has(name)) return 'edit'
+  return undefined
+}
+
+/**
+ * Parse one tool-call arguments JSON body defensively: the payload is
+ * model-emitted wire data, so every field is checked before use.
+ */
+function parseArgs(argsRaw: string): Record<string, unknown> {
+  try {
+    const parsed: unknown = JSON.parse(argsRaw)
+    if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) return {}
+    return parsed as Record<string, unknown>
+  } catch {
+    return {}
+  }
+}
+
+/** Extract the path field common to every file tool's arguments. */
+function pathOf(args: Record<string, unknown>): string | undefined {
+  for (const key of ['file_path', 'path', 'filePath']) {
+    const value = args[key]
+    if (typeof value === 'string' && value.length > 0) return value
+  }
+  return undefined
+}
+
+/** The 'tool/result' message envelope inside a session event's data. */
+interface ToolResultMessageLike {
+  source?: { kind?: unknown; callId?: unknown }
+  content?: unknown
+}
+
+/** One 'tool-result' content block (inner blocks carry the text). */
+interface ToolResultBlockLike {
+  type?: unknown
+  content?: unknown
+  isError?: unknown
+}
+
+/** The finalized plain text of one tool result (inner text blocks joined). */
+function resultText(message: ToolResultMessageLike): string | undefined {
+  if (!Array.isArray(message.content)) return undefined
+  const parts: string[] = []
+  for (const block of message.content) {
+    if (block === null || typeof block !== 'object') continue
+    const candidate = block as ToolResultBlockLike
+    if (candidate.type !== 'tool-result') continue
+    const inner = candidate.content
+    if (!Array.isArray(inner)) continue
+    for (const item of inner) {
+      if (item === null || typeof item !== 'object') continue
+      const textItem = item as { type?: unknown; text?: unknown }
+      if (textItem.type === 'text' && typeof textItem.text === 'string') parts.push(textItem.text)
+    }
+  }
+  return parts.length > 0 ? parts.join('\n') : undefined
+}
+
+/** Whether a tool result reported an error (the inner block's isError flag). */
+function resultIsError(message: ToolResultMessageLike): boolean {
+  if (!Array.isArray(message.content)) return false
+  return message.content.some((block) => {
+    if (block === null || typeof block !== 'object') return false
+    return (block as ToolResultBlockLike).type === 'tool-result'
+      && (block as ToolResultBlockLike).isError === true
+  })
+}
+
+/**
+ * Fold a session event log into the file operations it contains, newest
+ * first. A `tool/call` seeds a running op (payload from the model's
+ * arguments); its `tool/result` settles it (read content, error text).
+ * Calls dispatched through a host tool such as run_code appear as their own
+ * `tool/call` rows in the log, so nested file calls fold in naturally.
+ * @param events - the session's append-only event log (oldest → newest).
+ * @returns the ordered operation list.
+ */
+export function extractFileOps(events: readonly SidebarSessionEvent[]): FileOp[] {
+  const byCall = new Map<string, FileOp>()
+  for (const event of events) {
+    if (event.type === 'tool/call') {
+      const data = event.data as { name?: unknown; callId?: unknown; arguments?: unknown }
+      if (typeof data.name !== 'string' || typeof data.callId !== 'string') continue
+      const kind = kindOf(data.name)
+      if (kind === undefined) continue
+      const args = parseArgs(typeof data.arguments === 'string' ? data.arguments : '')
+      const path = pathOf(args)
+      if (path === undefined) continue
+      const base: FileOp = { callId: data.callId, kind, path, time: event.time, running: true, isError: false }
+      if (kind === 'edit') {
+        const oldString = args.old_string
+        const newString = args.new_string
+        byCall.set(data.callId, typeof oldString === 'string' && typeof newString === 'string'
+          ? { ...base, edit: { oldString, newString } }
+          : base)
+        continue
+      }
+      if (kind === 'write') {
+        const content = args.content
+        byCall.set(data.callId, typeof content === 'string' && content.length > 0 ? { ...base, content } : base)
+        continue
+      }
+      byCall.set(data.callId, base)
+    } else if (event.type === 'tool/result') {
+      const message = (event.data as { message?: unknown }).message as ToolResultMessageLike | undefined
+      if (message === undefined) continue
+      const callId = message.source?.callId
+      if (typeof callId !== 'string') continue
+      const op = byCall.get(callId)
+      if (op === undefined) continue
+      const text = resultText(message)
+      const isError = resultIsError(message)
+      const patch: { running: boolean; isError: boolean; errorText?: string; read?: string; content?: string } = { running: false, isError }
+      if (text !== undefined && text.length > 0) {
+        if (isError) patch.errorText = text
+        else if (op.kind === 'read') patch.read = text
+        else if (op.kind === 'write' && op.content === undefined) patch.content = text
+      }
+      byCall.set(callId, { ...op, ...patch })
+    }
+  }
+  return [...byCall.values()].sort((a, b) => b.time - a.time)
+}
+
+/**
+ * Group operations by path, newest op first per file, files ordered by their
+ * most recent operation.
+ */
+export function groupByFile(ops: readonly FileOp[]): Map<string, FileOp[]> {
+  const groups = new Map<string, FileOp[]>()
+  for (const op of ops) {
+    const list = groups.get(op.path) ?? []
+    list.push(op)
+    groups.set(op.path, list)
+  }
+  const ordered = [...groups.entries()].sort((a, b) => b[1][0]!.time - a[1][0]!.time)
+  return new Map(ordered)
+}
+
+/**
+ * The last content known for a path before the given operation, synthesized
+ * from earlier ops: a write's payload is authoritative, an edit implies its
+ * old side. Best effort — a write with no known prior content diffs against
+ * nothing (all-added).
+ */
+export function knownContentBefore(ops: readonly FileOp[], path: string, before: FileOp): string | undefined {
+  const ofFile = ops.filter(op => op.path === path && op.time <= before.time && op !== before)
+  for (let i = ofFile.length - 1; i >= 0; i -= 1) {
+    const op = ofFile[i]!
+    if (op.kind === 'write' && op.content !== undefined) return op.content
+    if (op.kind === 'edit' && op.edit !== undefined && i === ofFile.length - 1) {
+      return op.edit.oldString
+    }
+  }
+  return undefined
+}
+
+/**
+ * The read-tool response's `<content>` body split into lines with the
+ * "(Showing lines …)" note dropped — the shared envelope core both read
+ * parsers consume: {@link parseReadLines} recovers line numbers from the
+ * "<n>: " prefixes, {@link parseReadContent} keeps the raw text.
+ */
+function contentLines(raw: string): string[] {
+  const contentMatch = raw.match(/<content>([\s\S]*?)<\/content>/)
+  const body = contentMatch ? contentMatch[1]! : raw
+  return body.split('\n').filter((line) => !/^\s*\(Showing lines .*\)\s*$/.test(line))
+}
+
+/**
+ * Strip the DSH read-tool response envelope down to the file's raw content,
+ * PRESERVING blank lines (unlike {@link parseReadLines}, which drops them):
+ * drops the <content> wrapper, the "(Showing lines ...)" note, and the
+ * per-line "<n>: " prefixes. The markdown reading mode needs the blank lines
+ * because markdown block structure depends on them.
+ */
+export function parseReadContent(raw: string): string {
+  return contentLines(raw)
+    .map((line) => line.replace(/^\s*\d+:\s/, ''))
+    .join('\n')
+    .replace(/^[\n]+/, '')
+    .replace(/\n+$/, '')
+}
+
+/** One parsed read line: the file's own line number and its content text. */
+export interface ReadLine { readonly line: number; readonly text: string }
+
+/**
+ * Parse a DSH read result into file lines with their real line numbers:
+ * drops the <content> envelope and "(Showing lines ...)" note; recovers the
+ * "<n>: " prefix as the line number, falling back to sequential counting.
+ */
+export function parseReadLines(raw: string): ReadLine[] {
+  const result: ReadLine[] = []
+  let fallback = 1
+  for (const line of contentLines(raw)) {
+    if (line.length === 0) continue
+    const match = line.match(/^\s*(\d+):\s?(.*)$/)
+    if (match !== null) {
+      result.push({ line: Number(match[1]), text: match[2] ?? '' })
+      fallback = Number(match[1]) + 1
+    } else {
+      result.push({ line: fallback, text: line })
+      fallback += 1
+    }
+  }
+  return result
+}

src/client/chunk-loader.ts

@@ -23,8 +23,9 @@
  *    arbitrary file names, so the plugin's own host route serves the chunks),
  * 2. read the factory from the global registry,
  * 3. call it with a require that resolves the platform externals through
- *    `__DSH_MODULES__.import(spec)` — the seed-word branch, the one part of
- *    the module system that is stable across versions.
+ *    the injected module system's `import(spec)` (the `ctx.modules` service)
+ *    — the seed-word branch, the one part of the module system that is
+ *    stable across versions.
  *
  * Caching contract (three layers, each with a failure path):
  * - In-memory: one in-flight promise per chunk, memoized until
@@ -49,7 +50,7 @@
  * client.js); an edit that does land while a core HMR happens is caught by
  * the ETag comparison on the next activation.
  */
-export type ChunkName = 'terminal' | 'editor' | 'mermaid'
+export type ChunkName = 'terminal' | 'editor' | 'mermaid' | 'locale'
 
 /** The module exports a chunk factory provides (namespace-ish record). */
 export type ChunkExports = Record<string, unknown>
@@ -90,8 +91,7 @@ const CHUNK_REVALIDATE_TIMEOUT_MS = 5_000
  * The client module system surface this loader needs to resolve externals.
  * DSH 0.1.0-rc.8 provides it as the `ctx.modules` service (no page global
  * anymore); the plugin injects it at activation via
- * {@link setChunkModuleSystem}. The rc.7-era `window.__DSH_MODULES__` global
- * remains as a fallback so older hosts and the test harness keep working.
+ * {@link setChunkModuleSystem}.
  */
 export interface ChunkModuleSystem {
   import(specifier: string): Promise<unknown>
@@ -123,12 +123,11 @@ export function setChunkModuleSystem(system: ChunkModuleSystem | undefined): voi
 }
 
 /** Resolve the shell-installed module system (injected, then the plugin
- *  global shared with chunk-bundle copies, then the rc.7 page global). */
+ *  global shared with chunk-bundle copies). */
 function moduleSystem(): ChunkModuleSystem | undefined {
   const g = globalThis as Record<string, unknown>
   return injectedModuleSystem
     ?? g[MODULE_SYSTEM_GLOBAL] as ChunkModuleSystem | undefined
-    ?? (g as { __DSH_MODULES__?: ChunkModuleSystem }).__DSH_MODULES__
 }
 
 /** The plugin-owned chunk factory registry the chunk scripts populate. */
@@ -244,8 +243,7 @@ export async function loadChunk(name: ChunkName): Promise<ChunkExports> {
   if (revalidation !== null) await revalidation
   const cached = cache.get(name)
   if (cached !== undefined) return cached
-  let task: Promise<ChunkExports>
-  task = (async (): Promise<ChunkExports> => {
+  const task: Promise<ChunkExports> = (async (): Promise<ChunkExports> => {
     const test = testLoaders.get(name)
     if (test !== undefined) return test()
     const modules = moduleSystem()

src/client/chunks/locale.tsx

@@ -0,0 +1,60 @@
+/**
+ * Lazy chunk entry: the 19 non-zh/en dictionaries (ja/de/fr/…/zh-HK/MO/TW —
+ * ~640KB of source). The sidebar's own `t()` only ever consults zh/en plus
+ * the better-locale override store, so these dicts are needed ONLY when
+ * @huanlin/dsh-plugin-better-locale is installed: they register into its
+ * override store from there (see the client apply's better-locale
+ * integration). Built as `lib/client-locale.js` and fetched from the
+ * plugin's /sidebar/bundle route on first need — never import this module
+ * from the core bundle: it would drag every language back into the startup
+ * path (see docs/plans/2026-08-31-perf-optimization.md).
+ */
+import { ja } from '../locales-ja.ts'
+import { de } from '../locales-de.ts'
+import { fr } from '../locales-fr.ts'
+import { pt } from '../locales-pt.ts'
+import { ko } from '../locales-ko.ts'
+import { ar } from '../locales-ar.ts'
+import { hi } from '../locales-hi.ts'
+import { id } from '../locales-id.ts'
+import { tr } from '../locales-tr.ts'
+import { vi } from '../locales-vi.ts'
+import { th } from '../locales-th.ts'
+import { ru } from '../locales-ru.ts'
+import { it } from '../locales-it.ts'
+import { nl } from '../locales-nl.ts'
+import { sv } from '../locales-sv.ts'
+import { pl } from '../locales-pl.ts'
+import { zhHK } from '../locales-zh-HK.ts'
+import { zhTW } from '../locales-zh-TW.ts'
+import { zhMO } from '../locales-zh-MO.ts'
+import type { CopyKey } from '../locales.ts'
+
+/** Key-set check against zh (type-only import — erased before bundling, so
+ *  this adds no runtime tie to the core bundle): a dictionary missing or
+ *  adding a key fails the build instead of silently falling back to en. */
+const checked = (dict: Record<CopyKey, string>): Record<string, string> => dict
+
+/** Every non-zh/en dictionary keyed by its override id, ready for the
+ *  better-locale store's `register(ns, dicts)`. */
+export const localeDicts: Record<string, Record<string, string>> = {
+  ja: checked(ja),
+  de: checked(de),
+  fr: checked(fr),
+  pt: checked(pt),
+  ko: checked(ko),
+  ar: checked(ar),
+  hi: checked(hi),
+  id: checked(id),
+  tr: checked(tr),
+  vi: checked(vi),
+  th: checked(th),
+  ru: checked(ru),
+  it: checked(it),
+  nl: checked(nl),
+  sv: checked(sv),
+  pl: checked(pl),
+  'zh-HK': checked(zhHK),
+  'zh-TW': checked(zhTW),
+  'zh-MO': checked(zhMO),
+}

src/client/cm-themes.ts

@@ -2,15 +2,17 @@
  * CodeMirror 6 theme pieces for the sidebar editor. The editor surface
  * (background, caret, gutter) rides the DSH theme tokens so it blends with
  * the panel in both schemes; only the syntax token colors need concrete
- * values, and those come from the same designed palettes the app's code
- * surfaces use — the one-dark family for dark, the one-light family for
- * light. The scheme flip reconfigures these via a compartment (see
- * TextEditor), so the document, undo history and scroll survive re-theming.
+ * values, and those come from the same designed syntax families the app's
+ * code surfaces use — one-dark for dark, one-light for light
+ * (one-dark-palette.ts, shared with the terminal's ANSI palette). The
+ * scheme flip reconfigures these via a compartment (see TextEditor), so
+ * the document, undo history and scroll survive re-theming.
  */
 import { Compartment } from '@codemirror/state'
 import { HighlightStyle, syntaxHighlighting } from '@codemirror/language'
 import { tags, type Tag } from '@lezer/highlight'
 import { EditorView } from '@codemirror/view'
+import { ONE_DARK, ONE_LIGHT } from './one-dark-palette.ts'
 
 /** Token-driven surface shared by both schemes (pure CSS values). */
 export const cmSurfaceTheme = EditorView.theme({
@@ -53,52 +55,52 @@ interface HighlightRule {
   fontStyle?: string
 }
 
-/** one-dark syntax palette (mirrors @codemirror/theme-one-dark). */
+/** one-dark syntax rules (mirrors @codemirror/theme-one-dark; hues from one-dark-palette.ts). */
 const HIGHLIGHTS_DARK: HighlightRule[] = [
-  { tag: tags.comment, color: '#5c6370', fontStyle: 'italic' },
-  { tag: tags.keyword, color: '#c678dd' },
-  { tag: tags.string, color: '#98c379' },
-  { tag: tags.number, color: '#d19a66' },
-  { tag: tags.bool, color: '#d19a66' },
-  { tag: tags.atom, color: '#d19a66' },
-  { tag: tags.typeName, color: '#e5c07b' },
-  { tag: tags.className, color: '#e5c07b' },
-  { tag: tags.propertyName, color: '#e06c75' },
-  { tag: tags.function(tags.variableName), color: '#61afef' },
-  { tag: tags.variableName, color: '#e06c75' },
-  { tag: tags.operator, color: '#56b6c2' },
-  { tag: tags.tagName, color: '#e06c75' },
-  { tag: tags.attributeName, color: '#d19a66' },
-  { tag: tags.heading, color: '#e06c75', fontStyle: 'bold' },
+  { tag: tags.comment, color: ONE_DARK.faintGray, fontStyle: 'italic' },
+  { tag: tags.keyword, color: ONE_DARK.magenta },
+  { tag: tags.string, color: ONE_DARK.green },
+  { tag: tags.number, color: ONE_DARK.orange },
+  { tag: tags.bool, color: ONE_DARK.orange },
+  { tag: tags.atom, color: ONE_DARK.orange },
+  { tag: tags.typeName, color: ONE_DARK.yellow },
+  { tag: tags.className, color: ONE_DARK.yellow },
+  { tag: tags.propertyName, color: ONE_DARK.red },
+  { tag: tags.function(tags.variableName), color: ONE_DARK.blue },
+  { tag: tags.variableName, color: ONE_DARK.red },
+  { tag: tags.operator, color: ONE_DARK.cyan },
+  { tag: tags.tagName, color: ONE_DARK.red },
+  { tag: tags.attributeName, color: ONE_DARK.orange },
+  { tag: tags.heading, color: ONE_DARK.red, fontStyle: 'bold' },
   { tag: tags.emphasis, fontStyle: 'italic' },
   { tag: tags.strong, fontStyle: 'bold' },
-  { tag: tags.link, color: '#61afef', fontStyle: 'underline' },
-  { tag: tags.meta, color: '#e5c07b' },
-  { tag: tags.invalid, color: '#ffffff', fontStyle: 'bold' },
+  { tag: tags.link, color: ONE_DARK.blue, fontStyle: 'underline' },
+  { tag: tags.meta, color: ONE_DARK.yellow },
+  { tag: tags.invalid, color: ONE_DARK.white, fontStyle: 'bold' },
 ]
 
-/** one-light syntax palette (the light counterpart of one-dark). */
+/** one-light syntax rules (the light counterpart; hues from one-dark-palette.ts). */
 const HIGHLIGHTS_LIGHT: HighlightRule[] = [
-  { tag: tags.comment, color: '#a0a1a7', fontStyle: 'italic' },
-  { tag: tags.keyword, color: '#a626a4' },
-  { tag: tags.string, color: '#50a14f' },
-  { tag: tags.number, color: '#986801' },
-  { tag: tags.bool, color: '#0184bc' },
-  { tag: tags.atom, color: '#0184bc' },
-  { tag: tags.typeName, color: '#c18401' },
-  { tag: tags.className, color: '#c18401' },
-  { tag: tags.propertyName, color: '#e45649' },
-  { tag: tags.function(tags.variableName), color: '#c18401' },
-  { tag: tags.variableName, color: '#e45649' },
-  { tag: tags.operator, color: '#383a42' },
-  { tag: tags.tagName, color: '#e45649' },
-  { tag: tags.attributeName, color: '#986801' },
-  { tag: tags.heading, color: '#e45649', fontStyle: 'bold' },
+  { tag: tags.comment, color: ONE_LIGHT.gray, fontStyle: 'italic' },
+  { tag: tags.keyword, color: ONE_LIGHT.magenta },
+  { tag: tags.string, color: ONE_LIGHT.green },
+  { tag: tags.number, color: ONE_LIGHT.orange },
+  { tag: tags.bool, color: ONE_LIGHT.blue },
+  { tag: tags.atom, color: ONE_LIGHT.blue },
+  { tag: tags.typeName, color: ONE_LIGHT.yellow },
+  { tag: tags.className, color: ONE_LIGHT.yellow },
+  { tag: tags.propertyName, color: ONE_LIGHT.red },
+  { tag: tags.function(tags.variableName), color: ONE_LIGHT.yellow },
+  { tag: tags.variableName, color: ONE_LIGHT.red },
+  { tag: tags.operator, color: ONE_LIGHT.black },
+  { tag: tags.tagName, color: ONE_LIGHT.red },
+  { tag: tags.attributeName, color: ONE_LIGHT.orange },
+  { tag: tags.heading, color: ONE_LIGHT.red, fontStyle: 'bold' },
   { tag: tags.emphasis, fontStyle: 'italic' },
   { tag: tags.strong, fontStyle: 'bold' },
-  { tag: tags.link, color: '#4078f2', fontStyle: 'underline' },
-  { tag: tags.meta, color: '#c18401' },
-  { tag: tags.invalid, color: '#ffffff', fontStyle: 'bold' },
+  { tag: tags.link, color: ONE_LIGHT.link, fontStyle: 'underline' },
+  { tag: tags.meta, color: ONE_LIGHT.yellow },
+  { tag: tags.invalid, color: ONE_LIGHT.white, fontStyle: 'bold' },
 ]
 
 /** The scheme-dependent extension pair (surface tint + syntax highlight). */

src/client/conversation-draft.ts

@@ -1,29 +1,256 @@
 /**
- * Append text to the current session's composer draft through the
+ * Insert text into the current session's composer draft through the
  * conversation service — the shared path behind the explorer's @-reference
  * button and the viewer selection popup. The service is resolved lazily
  * through `ctx.get` (the inject-free read the app's own plugins use); a
  * missing service or scope degrades to a logged no-op, never a crash.
+ *
+ * File references additionally use DSH's own structured insert event
+ * (`slash/input-insert-reference`, see `insertFileReference`) instead of
+ * plain draft text: the native `@file` picker emits this event, and the
+ * conversation input machine mints one occurrence whose chip covers the
+ * whole reference. Plain text `@folder/file.ts` only ever gets DSH's
+ * folder-ref decoration (`@folder/`) — the file name stays undecorated — so
+ * plain append is the fallback, not the primary path, for files.
+ *
+ * Insert position (fixes upstream issue #425): the draft store only exposes
+ * the whole string (`getSnapshot().draft` + `setDraft(text)`) — there is no
+ * caret API on the conversation service. The composer's `<textarea>` keeps
+ * its last selection even while unfocused, so the live caret is probed from
+ * the DOM (guarded by a value-sync check), and the text is spliced at that
+ * position, replacing any live selection — with whitespace-aware joins, an
+ * insert into the middle of a sentence keeps single-space separation like
+ * the append path. An unknown/stale caret falls back to appending at the
+ * end (the pre-fix behavior).
+ *
+ * The caret is also *restored* after the insert: committing a programmatic
+ * draft change resets the controlled textarea's caret (observed landing at
+ * the start of the value), which would make every later insert probe the
+ * reset position and drift the stack (A|B + C + D ended up as |DACB). The
+ * placement (`placeComposerCaretAfterInsert`) puts the caret right after the
+ * inserted text once the value commit lands — the index accounts for the
+ * separating space on the left, so stacked inserts stay at their running
+ * position (A|B + C + D → ACD|B).
  */
 import type { Context, SidebarConversation } from '../context-types.ts'
 
+/** A resolved composer caret/selection in draft coordinates. */
+export interface DraftCaret {
+  start: number
+  end: number
+}
+
 /**
- * Append `text` to the session's composer draft (space-separated, like the
- * @-mentions). Returns false — and logs — when the conversation service or
- * the session scope is unavailable.
+ * The spliced draft plus the caret index (in that draft) right after the
+ * inserted text — the left-side separating space shifts the caret by one,
+ * which naive `start + text.length` misses (it would land before the tail).
+ */
+interface SpliceResult {
+  draft: string
+  caretAfter: number
+}
+
+/**
+ * Splice `text` into `draft` at `caret` (replacing any live selection) with
+ * whitespace-aware joins and report the caret position right after the
+ * inserted text. `caret === null` (position unknown) appends at the end,
+ * exactly like the original behavior.
+ */
+function spliceInsert(draft: string, text: string, caret: DraftCaret | null): SpliceResult {
+  if (caret === null || draft === '') {
+    const next = draft.trim() === '' ? text : `${draft} ${text}`
+    return { draft: next, caretAfter: next.length }
+  }
+  const prefix = draft.slice(0, caret.start)
+  const suffix = draft.slice(caret.end)
+  if (prefix === '' && suffix === '') return { draft: text, caretAfter: text.length }
+  // One separating space, but never doubled against adjacent whitespace
+  // (or the string edges) — mirrors how typing in the middle of a sentence
+  // behaves.
+  const left = prefix === '' || /\s$/.test(prefix) ? '' : ' '
+  const right = suffix === '' || /^\s/.test(suffix) ? '' : ' '
+  return {
+    draft: `${prefix}${left}${text}${right}${suffix}`,
+    caretAfter: prefix.length + left.length + text.length,
+  }
+}
+
+/**
+ * The spliced draft string (see {@link spliceInsert}); pure string math —
+ * unit-tested directly.
+ */
+export function insertAtCaret(draft: string, text: string, caret: DraftCaret | null): string {
+  return spliceInsert(draft, text, caret).draft
+}
+
+/**
+ * Locate the composer `<textarea>` in the conversation column: prefer the
+ * `data-phase`-tagged textarea (the composer's marker), falling back to any
+ * textarea in the column, then to a bare data-phase textarea (older host
+ * layouts without the column attribute). Null in jsdom-less hosts.
+ */
+function findComposerTextarea(): HTMLTextAreaElement | null {
+  if (typeof document === 'undefined') return null
+  const column = document.querySelector('#root [data-slot="conversation"]')
+  const find = (scope: ParentNode): HTMLTextAreaElement | null =>
+    scope.querySelector('textarea[data-phase]') ?? scope.querySelector('textarea')
+  return column !== null
+    ? find(column)
+    : document.querySelector<HTMLTextAreaElement>('textarea[data-phase]')
+}
+
+/**
+ * Resolve the composer's live caret from its DOM `<textarea>`. The draft
+ * store has no caret API, so the sidebar reads the composed input's selection
+ * directly; the value-sync check (`el.value === draft`) discards stale or
+ * wrong-composer reads — a caret must never be applied against a draft it
+ * was not measured on.
+ *
+ * Returns null when the composer is missing, disabled/read-only, out of
+ * sync with the store draft, or has no measurable selection (jsdom/odd
+ * hosts report null selectionStart/End).
+ */
+export function probeComposerCaret(draft: string): DraftCaret | null {
+  const el = findComposerTextarea()
+  if (el === null || el.disabled || el.readOnly) return null
+  if (el.value !== draft) return null
+  let start = el.selectionStart
+  let end = el.selectionEnd
+  if (typeof start !== 'number' || typeof end !== 'number') return null
+  if (!Number.isFinite(start) || !Number.isFinite(end)) return null
+  start = Math.max(0, Math.min(start, draft.length))
+  end = Math.max(start, Math.min(end, draft.length))
+  return { start, end }
+}
+
+/**
+ * Restore the composer caret to `caretIndex` after a programmatic
+ * `setDraft` commit. A controlled textarea update resets the caret (React
+ * commits the value asynchronously and the browser moves the caret to the
+ * start/end), so the placement is scheduled and retried across at most two
+ * animation frames (setTimeout fallback for jsdom), and only applied when
+ * the textarea still matches `expectedDraft` — a newer edit or a different
+ * composer wins the race untouched. The caret is clamped into the value
+ * bounds, mirroring how browsers clamp type-in positions.
+ */
+export function placeComposerCaretAfterInsert(expectedDraft: string, caretIndex: number): void {
+  let remaining = 2
+  let scheduled = false
+  const schedule = (fn: () => void): void => {
+    if (scheduled) return
+    scheduled = true
+    if (typeof requestAnimationFrame === 'function') requestAnimationFrame(fn)
+    else setTimeout(fn, 0)
+  }
+  const place = (): void => {
+    scheduled = false
+    if (remaining <= 0) return
+    remaining -= 1
+    const el = findComposerTextarea()
+    if (el === null || el.disabled || el.readOnly) return
+    if (el.value !== expectedDraft) {
+      // The commit has not landed yet (or a competing edit won) — one more
+      // frame before giving up.
+      schedule(place)
+      return
+    }
+    const clamped = Math.max(0, Math.min(caretIndex, el.value.length))
+    el.setSelectionRange(clamped, clamped)
+  }
+  schedule(place)
+}
+
+/**
+ * Insert `text` into the session's composer draft at the composer's live
+ * caret (see {@link probeComposerCaret}), falling back to appending at the
+ * end when the caret cannot be resolved. Returns false — and logs — when the
+ * conversation service or the session scope is unavailable.
  */
 export function appendToDraft(ctx: Context, sessionId: string, text: string): boolean {
   try {
     const actx = ctx.sessions.scope(sessionId)
-    if (actx === undefined) return false
+    if (actx === undefined) {
+      console.warn('[dsh-better-sidebar] draft insert skipped: no session scope', sessionId)
+      return false
+    }
     const conversation = ctx.get('conversation') as SidebarConversation | undefined
-    if (conversation === undefined) return false
+    if (conversation === undefined) {
+      console.warn('[dsh-better-sidebar] draft insert skipped: conversation service unavailable')
+      return false
+    }
     const input = conversation.input.for(actx)
     const draft = input.state.getSnapshot().draft
-    input.setDraft(draft.trim() === '' ? text : `${draft} ${text}`)
+    const caret = probeComposerCaret(draft)
+    const { draft: next, caretAfter } = spliceInsert(draft, text, caret)
+    input.setDraft(next)
+    // Put the caret right after the inserted text once the value commit
+    // lands — see the module doc for why this keeps stacked inserts at the
+    // running position.
+    placeComposerCaretAfterInsert(next, caretAfter)
     return true
   } catch (error) {
     console.warn('[dsh-better-sidebar] draft insert failed:', error)
     return false
   }
 }
+
+/**
+ * The DSH `@file` spelling for one relative path, mirroring the host grammar
+ * (`formatFileMention` in `@deepseek-ai/dsh-file-reference`): plain when
+ * there is no whitespace, quoted when there is, and `undefined` when the
+ * path contains a control character or an embedded quote the editor grammar
+ * cannot represent.
+ */
+export function fileMention(relativePath: string): { mention: string; label: string } | undefined {
+  const path = relativePath.replace(/[\\/]+$/, '')
+  // eslint-disable-next-line no-control-regex -- rejecting control characters is the point of this guard
+  if (/[\u0000-\u001f\u007f-\u009f"]/u.test(path)) return undefined
+  const mention = /\s/u.test(path) ? `@"${path}"` : `@${path}`
+  const at = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\'))
+  const label = at === -1 ? path : path.slice(at + 1)
+  return { mention, label }
+}
+
+/**
+ * Insert one FILE reference as a structured chip (like DSH's own `@` picker).
+ * The chip displays `@<basename>` but serializes to `@<relative path>` on
+ * send, so the reference stays a single link from trigger to basename.
+ *
+ * Directories are NOT handled here: DSH's folder grammar wants the trailing
+ * slash as plain text (`@dir/`) so completion can descend, which
+ * `appendToDraft` already covers.
+ */
+export function insertFileReference(ctx: Context, sessionId: string, relativePath: string): boolean {
+  const reference = fileMention(relativePath)
+  if (reference === undefined) return false
+  try {
+    const actx = ctx.sessions.scope(sessionId)
+    if (actx === undefined) return false
+    const conversation = ctx.get('conversation') as SidebarConversation | undefined
+    if (conversation === undefined) return false
+    const input = conversation.input.for(actx)
+    const before = input.state.getSnapshot()
+    if (before.draftRev === undefined) return false
+    // The session-scope Context's typed `emit` is keyed to DSH's closed event
+    // map; this internal composer event is deliberately string-loose at runtime.
+    ;(actx as unknown as { emit(name: string, payload: unknown): void }).emit('slash/input-insert-reference', {
+      reference: {
+        source: 'reference',
+        ref: reference.mention,
+        label: reference.label,
+        appearance: 'file',
+        clipboardText: reference.mention,
+      },
+      span: {
+        draftRev: before.draftRev,
+        start: before.draft.length,
+        end: before.draft.length,
+      },
+    })
+    const after = input.state.getSnapshot()
+    return after.draftRev !== before.draftRev
+  } catch (error) {
+    console.warn('[dsh-better-sidebar] file-reference insert failed:', error)
+    return false
+  }
+}

src/client/diff/DiffFiles.tsx

@@ -0,0 +1,147 @@
+/**
+ * A full unified-diff document (one changed file, or every file of a commit
+ * patch): collapsible per-file headers — source files open by default, tests
+ * / docs / generated files stay folded — each expanded file rendering through
+ * the shared {@link DiffRows} (so git diffs get the same rewrite tinting,
+ * intra-line highlights, syntax colors and hunk folds as session-op diffs).
+ * Untracked files produce no `git diff` output; the caller passes their
+ * content to render as a full-file addition instead.
+ */
+import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react'
+import clsx from 'clsx'
+import { t } from '../locales.ts'
+import { diffStats, displayPath, parseUnifiedDiff, unifiedSegments, untrackedFile, type DiffFile, type DiffRow, type FoldSegment } from './rows.ts'
+import { langOfPath } from './highlight.ts'
+import { DiffRows } from './DiffRows.tsx'
+import css from './diff.module.css'
+
+const TEST_PATH = /(^|\/)(?:__tests__|tests?|specs?|fixtures?|mocks?|snapshots?)(?:\/|$)|\.(?:test|spec)\.[^/]+$/i
+const DOC_PATH = /(^|\/)(?:docs?|documentation)(?:\/|$)|(^|\/)(?:readme|changelog|contributing|license|authors|notice)(\.[^/]*)?$/i
+const GENERATED_PATH = /(^|\/)(?:dist|build|coverage|generated|vendor|node_modules)(?:\/|$)|(^|\/)(?:package-lock\.json|pnpm-lock\.yaml|yarn\.lock|bun\.lockb?|composer\.lock|cargo\.lock|poetry\.lock)$/i
+const SOURCE_PATH = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts|py|pyw|rb|php|java|kt|kts|scala|go|rs|swift|c|h|cc|cpp|cxx|hpp|hh|hxx|cs|fs|fsx|vb|dart|lua|r|ex|exs|erl|hrl|clj|cljs|cljc|groovy|sh|bash|zsh|fish|ps1|sql|vue|svelte|astro|html|htm|css|scss|sass|less)$/i
+
+/** Source files open by default; tests, docs, generated files and unknown types stay folded. */
+function defaultExpandedFiles(files: readonly DiffFile[]): Set<number> {
+  const expanded = new Set<number>()
+  files.forEach((file, index) => {
+    const path = displayPath(file.newPath === '/dev/null' ? file.oldPath : file.newPath)
+    if (!file.binary && file.hunks.length > 0
+      && !TEST_PATH.test(path) && !DOC_PATH.test(path) && !GENERATED_PATH.test(path)
+      && SOURCE_PATH.test(path)) {
+      expanded.add(index)
+    }
+  })
+  return expanded
+}
+
+/** The file header badge: added / deleted / renamed / binary ('' for a plain edit). */
+function fileTag(file: DiffFile): string | null {
+  if (file.binary) return t('diffBinary')
+  if (file.oldPath === '/dev/null') return t('diffAdded')
+  if (file.newPath === '/dev/null') return t('diffDeleted')
+  const oldPath = displayPath(file.oldPath)
+  const newPath = displayPath(file.newPath)
+  if (oldPath !== newPath) return t('diffRenamed')
+  return null
+}
+
+export interface DiffFilesProps {
+  /** Unified diff text (`git.diff` or `git.commit-diff` payloads). */
+  diff: string
+  /** Untracked-file content: when present, renders as a full-file addition instead of parsing. */
+  untrackedPath?: string
+  untrackedContent?: string
+  /** Fetch a git gap fold's hidden rows on demand (both sides' contents by
+   *  the fold's line ranges); forwarded to every file's DiffRows. Absent
+   *  folds without `rows` stay non-expandable (session-op diffs and
+   *  untracked additions always carry theirs). */
+  resolveFold?: (file: DiffFile, segment: FoldSegment) => Promise<readonly DiffRow[]>
+}
+
+export function DiffFiles({ diff, untrackedPath, untrackedContent, resolveFold }: DiffFilesProps) {
+  const parsed = useMemo(() => {
+    if (untrackedPath !== undefined) {
+      return { files: [untrackedFile(untrackedPath, untrackedContent ?? '')] }
+    }
+    return parseUnifiedDiff(diff)
+  }, [diff, untrackedPath, untrackedContent])
+  const [expandedFiles, setExpandedFiles] = useState<Set<number>>(() => defaultExpandedFiles(parsed.files))
+  useEffect(() => { setExpandedFiles(defaultExpandedFiles(parsed.files)) }, [parsed])
+
+  // One in-flight/resolved promise per file+fold key, so a fold re-clicked
+  // after a remount (file header collapsed and re-expanded) resolves without
+  // a second fetch and concurrent clicks join the same request. The cache
+  // dies with `parsed` (a new diff text); rejected promises are dropped so a
+  // later retry can go through.
+  const foldCache = useRef(new Map<string, Promise<readonly DiffRow[]>>())
+  useEffect(() => { foldCache.current = new Map() }, [parsed])
+  const loadFold = (file: DiffFile, segment: FoldSegment): Promise<readonly DiffRow[]> => {
+    if (resolveFold === undefined) return Promise.resolve([])
+    const path = displayPath(file.newPath === '/dev/null' ? file.oldPath : file.newPath)
+    const key = `${path}|${String(segment.oldStart)}|${String(segment.newStart)}`
+    let promise = foldCache.current.get(key)
+    if (promise === undefined) {
+      promise = resolveFold(file, segment)
+      foldCache.current.set(key, promise)
+      promise.catch(() => { foldCache.current.delete(key) })
+    }
+    return promise
+  }
+
+  // Segments and header stats computed once per file.
+  const files = useMemo(
+    () => parsed.files.map((file) => {
+      const segments = unifiedSegments(file)
+      return { file, segments, stats: diffStats(segments) }
+    }),
+    [parsed],
+  )
+
+  const renderFile = (entry: (typeof files)[number], fileIndex: number): ReactNode => {
+    const { file, segments, stats } = entry
+    const tag = fileTag(file)
+    const from = displayPath(file.oldPath)
+    const to = displayPath(file.newPath)
+    const expandable = !file.binary && file.hunks.length > 0
+    const fileExpanded = expandedFiles.has(fileIndex)
+    return (
+      <div key={`file-${String(fileIndex)}`} className={css.fileBlock}>
+        <button
+          type="button"
+          className={css.file}
+          disabled={!expandable}
+          aria-expanded={expandable ? fileExpanded : undefined}
+          onClick={() => {
+            setExpandedFiles(current => {
+              const next = new Set(current)
+              if (next.has(fileIndex)) next.delete(fileIndex)
+              else next.add(fileIndex)
+              return next
+            })
+          }}
+        >
+          {expandable && <span aria-hidden="true" className={clsx(css.fileChevron, fileExpanded && css.fileChevronExpanded)}>›</span>}
+          <span className={css.filePath}>{to}</span>
+          {from !== to && <span className={css.fileOld}>← {from}</span>}
+          {tag !== null && <span className={css.fileTag}>{tag}</span>}
+          {expandable && (stats.added > 0 || stats.deleted > 0) && (
+            <span className={css.fileStats}>
+              {stats.added > 0 && <span className={css.statAdd}>+{String(stats.added)}</span>}
+              {stats.deleted > 0 && <span className={css.statDel}>−{String(stats.deleted)}</span>}
+            </span>
+          )}
+        </button>
+        {expandable && fileExpanded && (
+          <DiffRows segments={segments} lang={langOfPath(to)} resolveFold={resolveFold !== undefined ? (segment) => loadFold(file, segment) : undefined} />
+        )}
+      </div>
+    )
+  }
+
+  if (parsed.files.length === 0) return null
+  return (
+    <div className={css.files}>
+      {files.map(renderFile)}
+    </div>
+  )
+}

src/client/diff/DiffRows.tsx

@@ -0,0 +1,323 @@
+/**
+ * The one diff renderer every file-change surface shares (the changes tab's
+ * inline preview pane and the diff tab): fold-capable hunk rows with old/new
+ * line gutters, rewrite (mod) tinting with intra-line character highlights,
+ * lightweight syntax coloring, and long-line folding. Presentational — the
+ * segments arrive precomputed (session ops via buildDiffSegments, git diffs
+ * via unifiedSegments) so both producers render identically; the one
+ * exception is git gap folds, whose rows git never emitted and a caller
+ * supplies on demand through resolveFold (first click fetches, then they
+ * toggle like any fold).
+ */
+import { useEffect, useMemo, useRef, useState, type ReactElement, type ReactNode } from 'react'
+import { t } from '../locales.ts'
+import { coalesceInline, diffInline, MIN_FOLD, type DiffRow, type DiffSegment, type FoldSegment, type InlineDiff } from './rows.ts'
+import { hasBlockComment, isColored, scanLine, type CodeToken, type TokenType } from './highlight.ts'
+import css from './diff.module.css'
+
+/** Long diff lines fold to one ellipsized row; the threshold is the char count. */
+const FOLD_THRESHOLD = 120
+
+/** Rendered hunk rows per file capped at this count; expand reveals the rest. */
+const MAX_ROWS = 600
+
+/** Token class -> CSS color class ('' inherits the row's diff color). */
+const TOKEN_CLASS: Readonly<Record<TokenType, string>> = {
+  plain: '',
+  comment: css.tokComment ?? '',
+  string: css.tokString ?? '',
+  keyword: css.tokKeyword ?? '',
+  number: css.tokNumber ?? '',
+  type: css.tokType ?? '',
+  function: css.tokFunction ?? '',
+  macro: css.tokMacro ?? '',
+}
+
+/** One token span's class list: its color class, plus the change tint. */
+function tokenSpanClass(type: TokenType, changed: boolean): string {
+  const color = TOKEN_CLASS[type]
+  return changed ? `${color} ${css.inlineChange}` : color
+}
+
+/** Render scanned tokens as colored nodes; uncolored runs stay text. */
+function tokensToNodes(tokens: readonly CodeToken[], changed = false): ReactNode[] {
+  const nodes: ReactNode[] = []
+  for (const token of tokens) {
+    if (!changed && !isColored(token)) nodes.push(token.text)
+    else nodes.push(<span key={String(nodes.length)} className={tokenSpanClass(token.type, changed)}>{token.text}</span>)
+  }
+  return nodes
+}
+
+/**
+ * Intra-line diffs for mod-row pairs, keyed by row identity: each mod-run's
+ * first half (old side) pairs with its second half (new side), each pair
+ * diffed by common prefix/suffix so both sides highlight the exact changed
+ * substring.
+ */
+function buildInlineMap(segments: readonly DiffSegment[]): Map<DiffRow, InlineDiff> {
+  const map = new Map<DiffRow, InlineDiff>()
+  for (const segment of segments) {
+    if (segment.kind !== 'hunk') continue
+    const rows = segment.rows
+    let i = 0
+    while (i < rows.length) {
+      if (rows[i]!.kind !== 'mod') { i += 1; continue }
+      let j = i
+      while (j < rows.length && rows[j]!.kind === 'mod') j += 1
+      const block = rows.slice(i, j)
+      const half = Math.floor(block.length / 2)
+      for (let p = 0; p < half; p += 1) {
+        const delRow = block[p]!
+        const addRow = block[p + half]!
+        const inline = diffInline(delRow.text, addRow.text)
+        map.set(delRow, inline)
+        map.set(addRow, inline)
+      }
+      i = j
+    }
+  }
+  return map
+}
+
+/**
+ * Per-row block-comment entry state for a diff: the old side threads along
+ * old-line order and the new side along new-line order (the row order
+ * preserves both), so multi-line comments color correctly on each side.
+ */
+function diffBlockEntries(segments: readonly DiffSegment[], lang: string | undefined): Map<DiffRow, boolean> {
+  const entries = new Map<DiffRow, boolean>()
+  if (!hasBlockComment(lang)) return entries
+  let oldIn = false
+  let newIn = false
+  for (const segment of segments) {
+    if (segment.kind !== 'hunk') continue
+    for (const row of segment.rows) {
+      const isOld = row.oldLine !== undefined
+      const isNew = row.newLine !== undefined
+      entries.set(row, isOld ? oldIn : newIn)
+      if (isOld) oldIn = scanLine(row.text, lang, oldIn).inBlock
+      if (isNew) newIn = scanLine(row.text, lang, newIn).inBlock
+    }
+  }
+  return entries
+}
+
+export interface DiffRowsProps {
+  /** Precomputed segments (hunks and folds) for one file's diff. */
+  segments: readonly DiffSegment[]
+  /** Syntax language id (langOfPath); undefined renders plain text. */
+  lang?: string
+  /** Fetch a git gap fold's hidden rows on demand (both sides' contents
+   *  sliced by the fold's line ranges). Absent folds without `rows` — git's
+   *  unemitted gaps without a resolver — stay non-expandable markers. */
+  resolveFold?: (segment: FoldSegment) => Promise<readonly DiffRow[]>
+}
+
+/** One file's diff rows: fold chips between hunks, highlighted code rows. */
+export function DiffRows({ segments, lang, resolveFold }: DiffRowsProps) {
+  // Long diff lines fold to one ellipsized row; the set holds expanded row keys.
+  const [expandedLines, setExpandedLines] = useState<ReadonlySet<string>>(new Set())
+  // Hunk-fold segments expanded by index; default collapsed.
+  const [expandedFolds, setExpandedFolds] = useState<ReadonlySet<number>>(new Set())
+  // Row-count cap expanded: a huge file renders head rows plus this button.
+  const [expandedAll, setExpandedAll] = useState(false)
+  // On-demand fold expansion (git gaps): resolved rows per segment index,
+  // the loading/failed markers, and an epoch that invalidates in-flight
+  // resolves when the segments identity changes.
+  const [foldData, setFoldData] = useState<ReadonlyMap<number, readonly DiffRow[]>>(new Map())
+  const [foldLoading, setFoldLoading] = useState<ReadonlySet<number>>(new Set())
+  const [foldFailed, setFoldFailed] = useState<ReadonlySet<number>>(new Set())
+  const foldEpoch = useRef(0)
+  // Reset all folding when the segments identity changes (new target).
+  useEffect(() => {
+    setExpandedLines(new Set())
+    setExpandedFolds(new Set())
+    setExpandedAll(false)
+    setFoldData(new Map())
+    setFoldLoading(new Set())
+    setFoldFailed(new Set())
+    foldEpoch.current += 1
+  }, [segments])
+
+  const inlineMap = useMemo(() => buildInlineMap(segments), [segments])
+  const blockEntries = useMemo(() => diffBlockEntries(segments, lang), [segments, lang])
+
+  /** One diff row: colored sign + syntax-colored text, long-line fold toggle. */
+  const renderDiffRow = (row: DiffRow, rowKey: string): ReactElement => {
+    if (row.kind === 'meta') {
+      return (
+        <div key={rowKey} className={css.row} data-kind="meta">
+          <span className={css.metaText}>{row.text}</span>
+        </div>
+      )
+    }
+    const isLong = row.text.length > FOLD_THRESHOLD
+    const isFolded = isLong && !expandedLines.has(rowKey)
+    const blockEntry = blockEntries.get(row) ?? false
+    return (
+      <div
+        key={rowKey}
+        className={css.row}
+        data-kind={row.kind}
+        data-folded={isFolded ? 'true' : undefined}
+        onClick={isLong ? () => {
+          setExpandedLines(prev => {
+            const next = new Set(prev)
+            if (next.has(rowKey)) next.delete(rowKey)
+            else next.add(rowKey)
+            return next
+          })
+        } : undefined}
+        title={isFolded ? row.text : undefined}
+      >
+        <span className={css.lineNo}>{row.oldLine !== undefined ? String(row.oldLine) : ''}</span>
+        <span className={css.lineNo}>{row.newLine !== undefined ? String(row.newLine) : ''}</span>
+        <span className={css.sign}>{row.kind === 'del' ? '-' : row.kind === 'add' ? '+' : row.kind === 'mod' ? '~' : ' '}</span>
+        <span className={css.text} data-folded={isFolded ? 'true' : undefined}>
+          {row.kind === 'mod' && (() => {
+            const inline = inlineMap.get(row)
+            if (inline === undefined) return tokensToNodes(scanLine(row.text, lang, blockEntry).tokens)
+            // Coalesced change runs, each split into syntax tokens with
+            // block-comment state threaded across the runs of this line.
+            const side = coalesceInline(row.oldLine !== undefined ? inline.old : inline.next)
+            const nodes: ReactNode[] = []
+            let state = blockEntry
+            for (const seg of side) {
+              const scan = scanLine(seg.text, lang, state)
+              state = scan.inBlock
+              nodes.push(...tokensToNodes(scan.tokens, seg.changed))
+            }
+            return nodes
+          })()}
+          {row.kind !== 'mod' && tokensToNodes(scanLine(row.text, lang, blockEntry).tokens)}
+        </span>
+      </div>
+    )
+  }
+
+  let renderedRows = 0
+  const renderSegment = (segment: DiffSegment, segIndex: number): ReactNode => {
+    if (segment.kind === 'hunk') {
+      const capped = !expandedAll && renderedRows + segment.rows.length > MAX_ROWS
+      const rows = capped ? segment.rows.slice(0, Math.max(MAX_ROWS - renderedRows, 0)) : segment.rows
+      renderedRows += rows.length
+      return (
+        <div key={`hunk-${String(segIndex)}`}>
+          {rows.map((row, index) => renderDiffRow(row, `${segIndex}-${String(index)}`))}
+        </div>
+      )
+    }
+    if (foldFailed.has(segIndex)) {
+      // The on-demand fetch failed: a quiet, non-clickable marker — the
+      // expansion promise is gone, so no interaction is promised either.
+      return (
+        <div key={`fold-${String(segIndex)}`} className={css.foldRow}>
+          <span className={css.foldMarker} title={t('changesContext')}>
+            {t('changesFoldUnavailable')}
+          </span>
+        </div>
+      )
+    }
+    const resolvedRows = foldData.get(segIndex)
+    const expandable = (segment.rows !== undefined || resolvedRows !== undefined || resolveFold !== undefined) && segment.count >= MIN_FOLD
+    if (!expandable) {
+      // A tiny fold (or a git gap with no rows to reveal): a quiet marker.
+      return (
+        <div key={`fold-${String(segIndex)}`} className={css.foldRow}>
+          <span className={css.foldMarker} title={t('changesContext')}>
+            {t('changesFold', { count: segment.count })}
+          </span>
+        </div>
+      )
+    }
+    const loading = foldLoading.has(segIndex)
+    const isExpanded = expandedFolds.has(segIndex)
+    const revealed = segment.rows ?? resolvedRows
+    return (
+      <div
+        key={`fold-${String(segIndex)}`}
+        className={css.foldRow}
+        data-expandable={loading ? undefined : 'true'}
+        data-expanded={isExpanded ? 'true' : undefined}
+        onClick={loading ? undefined : () => {
+          if (revealed !== undefined) {
+            setExpandedFolds(prev => {
+              const next = new Set(prev)
+              if (next.has(segIndex)) next.delete(segIndex)
+              else next.add(segIndex)
+              return next
+            })
+            return
+          }
+          // A git gap fold's first click: fetch its rows, then expand.
+          if (resolveFold === undefined) return
+          const epoch = foldEpoch.current
+          setFoldLoading(prev => new Set(prev).add(segIndex))
+          resolveFold(segment).then(
+            (rows) => {
+              if (foldEpoch.current !== epoch) return
+              setFoldData(prev => new Map(prev).set(segIndex, rows))
+              setFoldLoading(prev => { const next = new Set(prev); next.delete(segIndex); return next })
+              setExpandedFolds(prev => new Set(prev).add(segIndex))
+            },
+            () => {
+              if (foldEpoch.current !== epoch) return
+              setFoldLoading(prev => { const next = new Set(prev); next.delete(segIndex); return next })
+              setFoldFailed(prev => new Set(prev).add(segIndex))
+            },
+          )
+        }}
+      >
+        {isExpanded && revealed !== undefined
+          ? revealed.map((row, index) => renderDiffRow(row, `${segIndex}-${String(index)}`))
+          : (
+            <span className={css.foldMarker} title={t('changesContext')}>
+              {loading ? t('changesFoldLoading') : t('changesFold', { count: segment.count })}
+            </span>
+          )}
+      </div>
+    )
+  }
+
+  const parts = segments.map(renderSegment)
+  return (
+    <div className={css.rows}>
+      {parts}
+      {renderedRows >= MAX_ROWS && !expandedAll && (
+        <button type="button" className={css.expand} onClick={() => { setExpandedAll(true) }}>
+          {t('diffExpand', { count: segments.reduce((sum, s) => sum + (s.kind === 'hunk' ? s.rows.length : 0), 0) - renderedRows })}
+        </button>
+      )}
+    </div>
+  )
+}
+
+export interface ReadRowsProps {
+  /** The file lines with their real line numbers (parseReadLines output). */
+  lines: ReadonlyArray<{ line: number; text: string }>
+  /** Syntax language id (langOfPath); undefined renders plain text. */
+  lang?: string
+}
+
+/** The read view: a line-numbered, syntax-colored slice of a read file. */
+export function ReadRows({ lines, lang }: ReadRowsProps) {
+  const rows = useMemo(() => {
+    let state = false
+    return lines.map((line) => {
+      const scan = scanLine(line.text, lang, state)
+      state = scan.inBlock
+      return { line: line.line, nodes: tokensToNodes(scan.tokens) }
+    })
+  }, [lines, lang])
+  return (
+    <div className={css.rows}>
+      {rows.map((row) => (
+        <div key={String(row.line)} className={css.row} data-kind="read">
+          <span className={css.lineNo}>{String(row.line)}</span>
+          <span className={css.text}>{row.nodes}</span>
+        </div>
+      ))}
+    </div>
+  )
+}

src/client/diff/diff.module.css

@@ -0,0 +1,86 @@
+/* The shared diff renderer (DiffRows / DiffFiles): one visual language for
+   every file-change surface — the changes tab's preview pane, the diff tab,
+   session-op diffs and git diffs alike. Semantic --dsw-alias tokens only
+   (skin contract); the syntax-token hues derive from the alias state tokens
+   via color-mix so they sit BETWEEN the diff colors (violet keywords, teal
+   strings, brand-tinted types, warn-family numbers/functions, magenta
+   macros) instead of colliding with red del / green add / blue mod. */
+
+.rows { padding: 4px 0 8px; font-family: var(--ds-font-family-code, monospace); font-size: 11px; }
+.row { display: flex; align-items: flex-start; gap: 5px; padding: 0 10px; line-height: 18px; cursor: default; }
+.row[data-folded='true'] { cursor: pointer; }
+.lineNo { flex: none; width: 2.5em; color: var(--dsw-alias-label-tertiary); text-align: right; user-select: none; font-size: 10px; }
+.sign { flex: none; width: 1em; text-align: center; user-select: none; font-weight: 700; }
+
+.row[data-kind='del'] .sign, .row[data-kind='del'] .text { color: var(--dsw-alias-state-error-primary); }
+.row[data-kind='add'] .sign, .row[data-kind='add'] .text { color: var(--dsw-alias-state-success-primary); }
+.row[data-kind='mod'] .sign, .row[data-kind='mod'] .text { color: var(--dsw-alias-state-business-primary); }
+.row[data-kind='context'] .sign, .row[data-kind='context'] .text { color: var(--dsw-alias-label-secondary); }
+.row[data-kind='read'] .text { color: var(--dsw-alias-label-primary); }
+
+/* Faint row tints under changed lines (GitHub-style, lighter than the text
+   hue so the syntax colors stay readable on top). */
+.row[data-kind='del'] { background: color-mix(in srgb, var(--dsw-alias-state-error-primary) 8%, transparent); }
+.row[data-kind='add'] { background: color-mix(in srgb, var(--dsw-alias-state-success-primary) 8%, transparent); }
+.row[data-kind='mod'] { background: color-mix(in srgb, var(--dsw-alias-state-business-primary) 8%, transparent); }
+
+.row .text { flex: 1; min-width: 0; white-space: pre-wrap; word-break: break-word; }
+.row[data-folded='true'] .text { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+
+/* The `\ No newline at end of file` marker row attached to a hunk's tail. */
+.row[data-kind='meta'] .metaText { color: var(--dsw-alias-label-tertiary); font-style: italic; }
+
+/* Intra-line changed substring inside a rewritten (mod) line. */
+.inlineChange { background: color-mix(in srgb, var(--dsw-alias-state-business-primary) 26%, transparent); border-radius: 3px; padding: 0 1px; }
+
+/* Syntax-token colors: alias-token mixes between the diff hues. */
+.tokComment { color: var(--dsw-alias-label-tertiary); font-style: italic; }
+.tokKeyword { color: color-mix(in oklab, var(--dsw-alias-state-business-primary) 55%, var(--dsw-alias-state-error-primary)); }
+.tokString { color: color-mix(in oklab, var(--dsw-alias-state-success-primary) 45%, var(--dsw-alias-state-business-primary)); }
+.tokType { color: color-mix(in oklab, var(--dsw-alias-brand-primary) 60%, var(--dsw-alias-state-success-primary)); }
+.tokNumber { color: var(--dsw-alias-state-warn-primary); }
+.tokFunction { color: color-mix(in oklab, var(--dsw-alias-state-warn-primary) 55%, var(--dsw-alias-state-error-primary)); }
+.tokMacro { color: color-mix(in oklab, var(--dsw-alias-state-error-primary) 45%, var(--dsw-alias-state-business-primary)); }
+
+/* Hunk-fold row: collapsed marker chip; expanded padding drops to 0 so the
+   revealed rows keep the x-alignment of hunk rows (they carry their own).
+   Only an expandable fold (enough hidden rows to be worth a click) reads as
+   interactive — the › chevron matches the multi-file document's disclosure. */
+.foldRow { padding: 0 10px; }
+.foldRow[data-expandable='true'] { cursor: pointer; }
+.foldRow[data-expandable='true']:hover { background: var(--dsw-alias-interactive-bg-hover); }
+.foldRow[data-expanded='true'] { padding: 0; }
+.foldRow[data-expanded='true'] { cursor: default; }
+.foldRow[data-expanded='true'] .foldMarker { display: none; }
+.foldMarker { display: inline-flex; align-items: center; gap: 5px; padding: 2px 7px; border-radius: 4px; margin: 2px 0; color: var(--dsw-alias-label-tertiary); background: var(--dsw-alias-interactive-bg-hover); }
+.foldRow[data-expandable='true'] .foldMarker { color: var(--dsw-alias-label-secondary); }
+.foldRow[data-expandable='true'] .foldMarker::before { content: '›'; color: var(--dsw-alias-label-tertiary); transition: transform var(--ds-transition-duration-slow) var(--ds-ease-in-out); }
+
+/* The huge-file overflow reveal under a capped hunk. */
+.expand { display: block; width: calc(100% - 20px); margin: 4px 10px; padding: 4px; border: 1px solid var(--dsw-alias-border-l1); border-radius: 6px; background: transparent; color: var(--dsw-alias-label-secondary); font: inherit; font-size: 11px; cursor: pointer; }
+.expand:hover { background: var(--dsw-alias-interactive-bg-hover); color: var(--dsw-alias-label-primary); }
+
+/* Multi-file documents (commit patches): collapsible file headers. */
+.files { display: flex; flex-direction: column; }
+.fileBlock { display: flex; flex-direction: column; }
+.file { display: flex; align-items: center; gap: 6px; width: 100%; padding: 6px 10px; border: 0; background: transparent; font: inherit; font-size: 11px; text-align: left; cursor: pointer; }
+.file:disabled { cursor: default; }
+.file:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover); }
+.fileChevron { flex: none; width: 12px; color: var(--dsw-alias-label-tertiary); transition: transform var(--ds-transition-duration-slow) var(--ds-ease-in-out); }
+.fileChevronExpanded { transform: rotate(90deg); }
+.filePath { font-family: var(--ds-font-family-code, monospace); color: var(--dsw-alias-label-primary); word-break: break-all; min-width: 0; }
+.fileOld { flex: none; max-width: 40%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--dsw-alias-label-tertiary); font-family: var(--ds-font-family-code, monospace); }
+.fileTag { flex: none; border-radius: 4px; font-size: 10px; line-height: 16px; padding: 0 5px; background: var(--dsw-alias-interactive-bg-hover); color: var(--dsw-alias-label-secondary); }
+.fileStats { margin-left: auto; flex: none; display: inline-flex; gap: 5px; font-size: 10px; font-family: var(--ds-font-family-code, monospace); }
+.statAdd { color: var(--dsw-alias-state-success-primary); }
+.statDel { color: var(--dsw-alias-state-error-primary); }
+
+/* Keyboard focus rings match the shared sidebar convention. */
+.row:focus-visible, .foldRow:focus-visible, .file:focus-visible, .expand:focus-visible {
+  outline: 2px solid var(--dsw-alias-interactive-bg-hover-accent);
+  outline-offset: -1px;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .fileChevron { transition: none; }
+}

src/client/diff/highlight.ts

@@ -0,0 +1,443 @@
+/**
+ * Lightweight syntax highlighting for the shared diff renderer: extension-
+ * based language detection plus a single-pass line tokenizer that colors
+ * comments, strings, numbers, keywords, types, functions, and preprocessor
+ * directives for common languages (C/C++, Java, C#, JS/TS, Python, Go, Rust,
+ * shell, batch, PowerShell, and config formats). Pure functions only — no
+ * React, no DOM. Multi-line block-comment state threads across lines via
+ * scanLine's inBlock parameter, so interior lines of a block comment color
+ * correctly.
+ */
+
+/** Token classes mapped 1:1 to panel CSS color classes. */
+export type TokenType =
+  | 'plain'
+  | 'comment'
+  | 'string'
+  | 'keyword'
+  | 'number'
+  | 'type'
+  | 'function'
+  | 'macro'
+
+/** One token span: a run of one line sharing one token class. */
+export interface CodeToken {
+  readonly text: string
+  readonly type: TokenType
+}
+
+/** Token classes that imply their own color; `plain` inherits the row color. */
+const COLORED: ReadonlySet<TokenType> = new Set(['comment', 'string', 'keyword', 'number', 'type', 'function', 'macro'])
+
+/** Per-language scanner configuration. */
+interface LangConfig {
+  /** Start-of-line (after blanks) or after-token comment prefixes. */
+  readonly lineComments: readonly string[]
+  /** Multi-line comment delimiters; the opener may appear anywhere. */
+  readonly blockComment?: readonly [open: string, close: string]
+  /** String delimiter characters; the escape character precedes any literal. */
+  readonly strings?: readonly string[]
+  /** Reserved words colored as keywords. */
+  readonly keywords: ReadonlySet<string>
+  /** Constant literals colored as keywords (true/false/null). */
+  readonly constants: ReadonlySet<string>
+  /** '#' starts a preprocessor directive / directive-like annotation. */
+  readonly macro: boolean
+  /** Identifier chars (word body). */
+  readonly wordStart: RegExp
+  readonly wordBody: RegExp
+}
+
+const LETTER = /[A-Za-z_$]/u
+const WORD = /[A-Za-z0-9_$]/u
+const ANYWORD = { wordStart: LETTER, wordBody: WORD }
+
+const kw = (words: string): ReadonlySet<string> => new Set(words.split(/\s+/))
+
+const C_FAMILY = (words: string): LangConfig => ({
+  lineComments: ['//'],
+  blockComment: ['/*', '*/'],
+  strings: ['"', "'", '`'],
+  keywords: kw(words),
+  constants: kw('true false null NULL nullptr TRUE FALSE'),
+  macro: true,
+  ...ANYWORD,
+})
+
+const HASH_FAMILY = (words: string, constants = ''): LangConfig => ({
+  lineComments: ['#'],
+  strings: ['"', "'"],
+  keywords: kw(words),
+  constants: kw(constants.length > 0 ? constants : 'True False None true false null'),
+  macro: false,
+  ...ANYWORD,
+})
+
+const CONFIG_LANG: LangConfig = {
+  lineComments: ['#'],
+  strings: ['"', "'"],
+  keywords: new Set(),
+  constants: new Set(),
+  macro: false,
+  wordStart: LETTER,
+  wordBody: WORD,
+}
+
+/** SQL: '--' line comments plus '#', quoting with single quotes. */
+const SQL_LANG: LangConfig = {
+  lineComments: ['--', '#'],
+  strings: ["'"],
+  keywords: kw(`select from where insert into values update set delete create table drop alter add column
+    primary key foreign references index view join inner left right outer on as order by group having
+    limit offset distinct union all and or not in exists between like is null asc desc count sum avg
+    min max case when then else end begin commit rollback transaction default constraint unique`),
+  constants: kw('true false null'),
+  macro: false,
+  ...ANYWORD,
+}
+
+/** Windows batch: 'REM'/'::' comments, '%' variable quoting. */
+const CMD_LANG: LangConfig = {
+  lineComments: ['::'],
+  strings: ['"'],
+  keywords: kw(`rem if else for in do goto call exit echo set setlocal endlocal shift
+    exist defined errorlevel not equ neq lss leq gtr geq nul con defined enabledelayedexpansion`),
+  constants: new Set(),
+  macro: false,
+  wordStart: LETTER,
+  wordBody: WORD,
+}
+
+/** PowerShell: '#' comments, quoted strings including here-string quotes. */
+const PS_LANG: LangConfig = {
+  lineComments: ['#'],
+  blockComment: ['<#', '#>'],
+  strings: ['"', "'"],
+  keywords: kw(`function param begin process end if elseif else foreach for while do until switch
+    try catch finally throw return break continue filter in workflow class enum interface
+    dynamicparam data checkpoint systemlanguage default expand`),
+  constants: kw('true false null'),
+  macro: false,
+  ...ANYWORD,
+}
+
+/** Markdown: no tokenizer; the whole line stays plain. */
+const MD_LANG: LangConfig = {
+  lineComments: [],
+  strings: [],
+  keywords: new Set(),
+  constants: new Set(),
+  macro: false,
+  wordStart: LETTER,
+  wordBody: WORD,
+}
+
+/** JS keyword list, shared by js/jsx/mjs/cjs. */
+const JS_WORDS = `async await break case catch class const continue debugger default delete do else
+  export extends false finally for from function get if implements import in instanceof interface
+  let new null of return set static super switch this throw true try typeof undefined var void
+  while with yield`
+
+/** TS keyword list, shared by ts/tsx/mts/cts. */
+const TS_WORDS = `abstract any as asserts async await boolean break case catch class const constructor
+  continue debugger declare default delete do else enum export extends false finally for from
+  function get if implements import in infer instanceof interface is keyof let module namespace
+  never new null number object of override private protected public readonly return satisfies set
+  static string super switch symbol this throw true try type typeof undefined union unknown var
+  void while with yield`
+
+/** CSS family: block comments delimited by slash-star, hyphenated property words. */
+const CSS_LANG: LangConfig = {
+  lineComments: [],
+  blockComment: ['/*', '*/'],
+  strings: ['"', "'"],
+  keywords: kw(`media import charset keyframes font-face supports page namespace layer scope container
+    property value at-rule when and not only from to important
+    background background-color background-image background-position background-size
+    border border-radius border-color border-width border-style bottom box-shadow box-sizing
+    color content cursor clip clip-path clear display direction
+    flex flex-direction flex-wrap flex-flow flex-grow flex-shrink flex-basis
+    font font-family font-size font-style font-weight float fill
+    grid grid-area grid-template grid-template-columns grid-template-rows grid-gap gap
+    height left letter-spacing line-height list-style margin margin-top margin-right
+    margin-bottom margin-left max-height max-width min-height min-width opacity order
+    outline overflow padding padding-top padding-right padding-bottom padding-left
+    position pointer-events right rotate scale translate transform transform-origin
+    text-align text-decoration text-transform top transition transition-property
+    user-select vertical-align visibility white-space width word-break word-spacing z-index
+    align-items align-content align-self justify-content justify-items justify-self
+    aspect-ratio inset object-fit object-position resize scroll-behavior filter backdrop-filter
+    animation animation-name animation-duration animation-timing-function animation-delay
+    will-change
+    html body p a div span li ul ol table tr td th form input button label select textarea img
+    section header footer main nav article aside h1 h2 h3 h4 h5 h6 i b em strong small pre code
+    inherit initial unset auto none fixed absolute relative sticky static flex block inline
+    inline-block inline-flex grid hidden visible bold normal root var calc env`),
+  constants: new Set(),
+  macro: false,
+  wordStart: /[A-Za-z-]/u,
+  wordBody: /[A-Za-z0-9-]/u,
+}
+
+/** Markup family (HTML/XML/SVG/Vue): markup comments plus common tags. */
+const MARKUP_LANG: LangConfig = {
+  lineComments: [],
+  blockComment: ['<!--', '-->'],
+  strings: ['"', "'"],
+  keywords: kw(`html head body title meta link script style template slot
+    div span p a img ul ol li table thead tbody tr th td form input button label select
+    option textarea header footer main nav section article aside figure figcaption
+    h1 h2 h3 h4 h5 h6 strong em b i u s small br hr pre code blockquote
+    svg path circle rect line polyline polygon g defs use text symbol
+    xml doctype class id href src type value name content charset async defer
+    vue component props setup script-style export import v-if v-for v-bind v-on`),
+  constants: new Set(),
+  macro: false,
+  wordStart: LETTER,
+  wordBody: WORD,
+}
+
+/** Extension → language id, mirroring the read tool's hint table. */
+const LANGS: Readonly<Record<string, LangConfig>> = {
+  ts: C_FAMILY(TS_WORDS),
+  tsx: C_FAMILY(TS_WORDS),
+  js: C_FAMILY(JS_WORDS),
+  jsx: C_FAMILY(JS_WORDS),
+  json: CONFIG_LANG,
+  py: HASH_FAMILY(`and as assert async await break class continue def del elif else except finally
+    for from global if import in is lambda nonlocal not or pass raise return try while with yield
+    match case`, 'True False None self cls NotImplemented __name__ __main__'),
+  go: C_FAMILY(`break case chan const continue default defer else fallthrough for func go goto if
+    import interface map package range return select struct switch type var nil iota make new len
+    cap append copy close delete panic print println recover`),
+  rs: C_FAMILY(`as async await break const continue crate dyn else enum extern false fn for if impl
+    in let loop match mod move mut pub ref return self Self static struct super trait true type
+    unsafe use where while`),
+  java: C_FAMILY(`abstract assert boolean break byte case catch char class const continue default do
+    double else enum extends final finally float for goto if implements import instanceof int
+    interface long native new package private protected public return short static strictfp super
+    switch synchronized this throw throws transient try void volatile while var record sealed
+    permits yield`),
+  c: C_FAMILY(`auto break case char const continue default do double else enum extern float for
+    goto if inline int long register restrict return short signed sizeof static struct switch
+    typedef union unsigned void volatile while _Bool _Complex _Atomic`),
+  cpp: C_FAMILY(`alignas alignof and auto break case catch char class co_await co_return co_yield
+    concept const consteval constexpr constinit const_cast continue decltype default delete
+    do double dynamic_cast else enum explicit export extern false final float for friend goto if
+    inline int long mutable namespace new noexcept not nullptr operator or override private
+    protected public register reinterpret_cast requires return short signed sizeof static
+    static_assert static_cast struct switch template this thread_local throw true try typedef
+    typeid typename union unsigned using virtual void volatile wchar_t while`),
+  cs: C_FAMILY(`abstract as async await base bool break byte case catch char checked class const
+    continue decimal default delegate do double dynamic else enum event explicit extern false
+    finally fixed float for foreach get goto if implicit in init int interface internal is lock
+    long namespace new null not null forgiving object operator out override params partial
+    private protected public readonly record ref return sbyte sealed set short sizeof stackalloc
+    static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort
+    using var virtual void volatile when where while with yield`),
+  kt: C_FAMILY(`as break by catch class companion const constructor continue crossinline data do
+    dynamic else enum external false final finally for fun get if import in infix init inline
+    interface internal is lateinit lazy null object open operator out override package private
+    protected public reified return sealed set super suspend tailrec this throw true try typealias
+    val var vararg when where while`),
+  swift: C_FAMILY(`actor as associatedtype async await break case catch class continue
+    convenience default defer deinit didSet do dynamic else enum extension fallthrough false
+    final for func get guard if import in indirect infix init inout internal is lazy let nil
+    nonmutating open operator optional override postfix precedencegroup prefix private protocol
+    public repeat required rethrows return self set some static struct subscript super switch
+    throw throws true try typealias unowned var weak where while willSet`),
+  php: C_FAMILY(`abstract and array as break callable case catch class clone const continue declare
+    default do echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile enum
+    extends final finally fn for foreach function global goto if implements include
+    include_once instanceof insteadof interface isset list match namespace new or print private
+    protected public readonly require require_once return static switch throw trait try unset use
+    var while xor yield true false null int string bool float void mixed never self parent`),
+  sh: HASH_FAMILY(`if then else elif fi for while until do done case esac function in select time
+    coproc return break continue local export readonly declare typeset unset shift eval exec trap
+    exit source alias set`, 'true false'),
+  bash: HASH_FAMILY(`if then else elif fi for while until do done case esac function in select time
+    coproc return break continue local export readonly declare typeset unset shift eval exec trap
+    exit source alias set`, 'true false'),
+  zsh: HASH_FAMILY(`if then else elif fi for while until do done case esac function in select time
+    coproc return break continue local export readonly declare typeset unset shift eval exec trap
+    exit source alias set`, 'true false'),
+  yaml: CONFIG_LANG,
+  yml: CONFIG_LANG,
+  toml: CONFIG_LANG,
+  ini: CONFIG_LANG,
+  sql: SQL_LANG,
+  cmd: CMD_LANG,
+  bat: CMD_LANG,
+  ps1: PS_LANG,
+  psm1: PS_LANG,
+  psd1: PS_LANG,
+  md: MD_LANG,
+  markdown: MD_LANG,
+  mdx: MD_LANG,
+  mjs: C_FAMILY(JS_WORDS),
+  cjs: C_FAMILY(JS_WORDS),
+  mts: C_FAMILY(TS_WORDS),
+  cts: C_FAMILY(TS_WORDS),
+  jsonc: CONFIG_LANG,
+  json5: CONFIG_LANG,
+  html: MARKUP_LANG,
+  htm: MARKUP_LANG,
+  xml: MARKUP_LANG,
+  svg: MARKUP_LANG,
+  vue: MARKUP_LANG,
+  css: CSS_LANG,
+  scss: CSS_LANG,
+  less: CSS_LANG,
+  graphql: HASH_FAMILY('query mutation fragment on directive enum input interface scalar schema type implements'),
+  gql: HASH_FAMILY('query mutation fragment on directive enum input interface scalar schema type implements'),
+  lua: HASH_FAMILY(`and break do else elseif end false for function goto if in local nil not or
+    repeat return then true until while`),
+}
+
+/**
+ * Language id for a file path's extension (the read tool's mapping): the
+ * lowercase extension without its dot; dotfiles and unknown extensions map to
+ * undefined (plain text).
+ * @param path - the op's file path exactly as recorded.
+ * @returns the language id, or undefined for plain text.
+ */
+export function langOfPath(path: string): string | undefined {
+  const base = path.slice(Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\')) + 1)
+  const dot = base.lastIndexOf('.')
+  if (dot <= 0) return undefined
+  const ext = base.slice(dot + 1).toLowerCase()
+  return Object.hasOwn(LANGS, ext) ? ext : undefined
+}
+
+/** One line's scan output: its tokens plus whether a block comment stays open. */
+export interface ScanResult {
+  readonly tokens: CodeToken[]
+  readonly inBlock: boolean
+}
+
+/** Scan one line, entering from (and reporting) block-comment state. */
+export function scanLine(line: string, lang: string | undefined, inBlock = false): ScanResult {
+  if (line.length === 0) return { tokens: [], inBlock }
+  const cfg = lang !== undefined ? LANGS[lang] : undefined
+  if (cfg === undefined || (cfg.lineComments.length === 0 && cfg.keywords.size === 0)) {
+    return { tokens: [{ text: line, type: 'plain' }], inBlock: false }
+  }
+  // A language without block delimiters never carries block state forward.
+  let inComment = inBlock && cfg.blockComment !== undefined
+  const tokens: CodeToken[] = []
+  const push = (text: string, type: TokenType): void => {
+    if (text.length === 0) return
+    const last = tokens[tokens.length - 1]
+    if (last !== undefined && last.type === type) tokens[tokens.length - 1] = { text: last.text + text, type }
+    else tokens.push({ text, type })
+  }
+  let i = 0
+  const atLineComment = (): string | undefined => {
+    for (const lead of cfg.lineComments) {
+      if (line.startsWith(lead, i)) return lead
+    }
+    return undefined
+  }
+  const atBlockOpen = (): string | undefined => cfg.blockComment !== undefined && line.startsWith(cfg.blockComment[0], i) ? cfg.blockComment[0] : undefined
+  const readString = (): void => {
+    const quote = line[i]!
+    i += 1
+    while (i < line.length && line[i] !== quote) {
+      if (line[i] === '\\') i += 1
+      i += 1
+    }
+    i = Math.min(i + 1, line.length)
+  }
+  while (i < line.length) {
+    if (inComment) {
+      const closeIdx = cfg.blockComment !== undefined ? line.indexOf(cfg.blockComment[1], i) : -1
+      if (closeIdx === -1) {
+        push(line.slice(i), 'comment')
+        return { tokens, inBlock: true }
+      }
+      const end = closeIdx + (cfg.blockComment?.[1].length ?? 0)
+      push(line.slice(i, end), 'comment')
+      i = end
+      inComment = false
+      continue
+    }
+    const ch = line[i]!
+    const wsMatch = /\s/u.exec(line.slice(i))
+    if (wsMatch !== null && wsMatch.index === 0) {
+      push(ch, 'plain')
+      i += 1
+      continue
+    }
+    const commentLead = atLineComment()
+    if (commentLead !== undefined) {
+      push(line.slice(i), 'comment')
+      break
+    }
+    const blockOpen = atBlockOpen()
+    if (blockOpen !== undefined && cfg.blockComment !== undefined) {
+      const close = line.indexOf(cfg.blockComment[1], i + blockOpen.length)
+      const end = close === -1 ? line.length : close + cfg.blockComment[1].length
+      push(line.slice(i, end), 'comment')
+      i = end
+      inComment = close === -1
+      continue
+    }
+    if (cfg.strings !== undefined && cfg.strings.includes(ch)) {
+      const start = i
+      readString()
+      push(line.slice(start, i), 'string')
+      continue
+    }
+    if (/[0-9]/u.test(ch)) {
+      const m = /^(?:0[xXbo][0-9a-fA-F_]+|[0-9][0-9_]*(?:\.[0-9_]+)?(?:[eE][+-]?[0-9_]+)?)/u.exec(line.slice(i))
+      const len = m !== null ? m[0].length : 1
+      push(line.slice(i, i + len), 'number')
+      i += len
+      continue
+    }
+    if (cfg.wordStart.test(ch)) {
+      let j = i + 1
+      while (j < line.length && cfg.wordBody.test(line[j]!)) j += 1
+      const word = line.slice(i, j)
+      // Batch 'REM whatever' runs to end of line as a comment.
+      if ((lang === 'cmd' || lang === 'bat') && word.toLowerCase() === 'rem') {
+        push(line.slice(i), 'comment')
+        break
+      }
+      let k = j
+      while (k < line.length && (line[k] === ' ' || line[k] === '\t')) k += 1
+      if (cfg.constants.has(word)) push(word, 'keyword')
+      else if (cfg.keywords.has(word)) push(word, 'keyword')
+      else if (line[k] === '(') push(word, 'function')
+      else if (/^[A-Z]/u.test(word) && word.length > 1) push(word, 'type')
+      else push(word, 'plain')
+      i = j
+      continue
+    }
+    if (cfg.macro && ch === '#' && (i === 0 || /\s/u.test(line[i - 1]!))) {
+      let j = i + 1
+      while (j < line.length && cfg.wordBody.test(line[j]!)) j += 1
+      push(line.slice(i, j), 'macro')
+      i = j
+      continue
+    }
+    push(ch, 'plain')
+    i += 1
+  }
+  return { tokens, inBlock: inComment }
+}
+
+/** Tokenize one line with no incoming block state (standalone lines). */
+export function tokenizeLine(line: string, lang: string | undefined): CodeToken[] {
+  return scanLine(line, lang).tokens
+}
+
+/** True when the language has multi-line block-comment delimiters. */
+export function hasBlockComment(lang: string | undefined): boolean {
+  return lang !== undefined && LANGS[lang]?.blockComment !== undefined
+}
+
+/** Token classes worth wrapping in a span; plain runs join the parent text node. */
+export function isColored(token: CodeToken): boolean {
+  return COLORED.has(token.type)
+}

src/client/diff/rows.ts

@@ -0,0 +1,508 @@
+/**
+ * The one diff engine every file-change surface shares (the changes tab's
+ * git and session lenses, the diff tab): a unified DiffRow model fed by two
+ * producers — a line LCS over known contents (session file ops) and git's
+ * own unified-diff text (worktree/commit diffs, via `parseUnifiedDiff` +
+ * `unifiedSegments`) — collapsed into hunk/fold segments for the shared
+ * renderer. Pure functions only — no React, no DOM.
+ */
+
+/** One rendered diff row. */
+export interface DiffRow {
+  /** Change class: 'context' shared, 'del' removed, 'add' added, 'mod'
+   *  rewritten (paired del+add), 'meta' an attached marker row. */
+  readonly kind: 'context' | 'del' | 'add' | 'mod' | 'meta'
+  /** Old-side 1-based line number; absent on pure additions. */
+  readonly oldLine?: number
+  /** New-side 1-based line number; absent on pure deletions. */
+  readonly newLine?: number
+  /** The line's text without its terminator. */
+  readonly text: string
+}
+
+/**
+ * Longest-common-subsequence table over line equality.
+ * @param oldLines - old side lines.
+ * @param newLines - new side lines.
+ * @returns the LCS length matrix (rows index oldLines, columns newLines).
+ */
+function lcsTable(oldLines: readonly string[], newLines: readonly string[]): number[][] {
+  const table: number[][] = Array.from({ length: oldLines.length + 1 }, () => new Array<number>(newLines.length + 1).fill(0))
+  for (let i = oldLines.length - 1; i >= 0; i -= 1) {
+    for (let j = newLines.length - 1; j >= 0; j -= 1) {
+      table[i]![j] = oldLines[i] === newLines[j]
+        ? table[i + 1]![j + 1]! + 1
+        : Math.max(table[i + 1]![j]!, table[i]![j + 1]!)
+    }
+  }
+  return table
+}
+
+/**
+ * Pair each del-run with the add-run that follows it: the overlapping
+ * `min(len)` rows on both sides become 'mod' so rewrites tint distinctly and
+ * receive intra-line highlighting. Pure — returns a new array when anything
+ * changed. Shared by the LCS walk and the unified-diff converter so git
+ * hunks rewrite-pair exactly like session ops do.
+ */
+export function pairMods(rows: readonly DiffRow[]): DiffRow[] {
+  const out = rows.slice()
+  let k = 0
+  while (k < out.length) {
+    if (out[k]!.kind !== 'del') { k += 1; continue }
+    const delStart = k
+    while (k < out.length && out[k]!.kind === 'del') k += 1
+    const addStart = k
+    while (k < out.length && out[k]!.kind === 'add') k += 1
+    const pairs = Math.min(addStart - delStart, k - addStart)
+    for (let p = 0; p < pairs; p += 1) {
+      out[delStart + p] = { ...out[delStart + p]!, kind: 'mod' }
+      out[addStart + p] = { ...out[addStart + p]!, kind: 'mod' }
+    }
+  }
+  return out
+}
+
+/**
+ * Line diff by LCS walk with rewrite pairing: the raw walk emits context/del/
+ * add rows; `pairMods` marks rewritten pairs as 'mod'.
+ * @param oldText - the previous content; empty string diffs against nothing.
+ * @param newText - the next content.
+ * @returns ordered diff rows, old-side deletions before new-side additions.
+ */
+export function diffLines(oldText: string, newText: string): DiffRow[] {
+  const oldLines = oldText.length === 0 ? [] : oldText.split('\n')
+  const newLines = newText.length === 0 ? [] : newText.split('\n')
+  const table = lcsTable(oldLines, newLines)
+  const raw: DiffRow[] = []
+  let i = 0
+  let j = 0
+  while (i < oldLines.length && j < newLines.length) {
+    if (oldLines[i] === newLines[j]) {
+      raw.push({ kind: 'context', oldLine: i + 1, newLine: j + 1, text: oldLines[i]! })
+      i += 1
+      j += 1
+    } else if (table[i + 1]![j]! >= table[i]![j + 1]!) {
+      raw.push({ kind: 'del', oldLine: i + 1, text: oldLines[i]! })
+      i += 1
+    } else {
+      raw.push({ kind: 'add', newLine: j + 1, text: newLines[j]! })
+      j += 1
+    }
+  }
+  while (i < oldLines.length) {
+    raw.push({ kind: 'del', oldLine: i + 1, text: oldLines[i]! })
+    i += 1
+  }
+  while (j < newLines.length) {
+    raw.push({ kind: 'add', newLine: j + 1, text: newLines[j]! })
+    j += 1
+  }
+  return pairMods(raw)
+}
+
+/** One rendered hunk: change rows plus the surrounding context window. */
+export interface HunkSegment { readonly kind: 'hunk'; readonly rows: readonly DiffRow[] }
+
+/** One collapsed run of unchanged rows (the "… n 行" fold). */
+export interface FoldSegment {
+  readonly kind: 'fold'
+  /** The rows this fold hides, when the producer knows them (session diffs
+   *  re-derive them from full contents; git gaps never emitted the text, so
+   *  those folds carry only their line ranges and cannot expand). */
+  readonly rows?: readonly DiffRow[]
+  /** How many rows the fold hides. */
+  readonly count: number
+  readonly oldStart: number
+  readonly oldEnd: number
+  readonly newStart: number
+  readonly newEnd: number
+}
+
+export type DiffSegment = HunkSegment | FoldSegment
+
+/** Context window (rows around a change) kept visible in a hunk. */
+export const HUNK_CONTEXT = 3
+
+/** Folded context runs shorter than this are shown directly, not collapsed. */
+export const MIN_FOLD = 3
+
+/**
+ * Group a line diff into hunks and folded context runs. Consecutive changes
+ * whose gap fits within the context window merge into one hunk; unchanged
+ * regions between hunks (and any surrounding the whole diff) become fold
+ * segments that default collapsed. This yields the file-hunk presentation
+ * familiar from terminal diffs (Claude Code / git hunk headers).
+ * @param rows - the flat diff rows.
+ * @param context - how many unchanged rows around a change stay visible.
+ * @returns ordered segments (hunks and folds).
+ */
+export function buildDiffSegments(rows: readonly DiffRow[], context = HUNK_CONTEXT): DiffSegment[] {
+  if (rows.length === 0) return []
+  const changeIndexes = rows.flatMap((row, index) => (row.kind === 'context' || row.kind === 'meta' ? [] : [index]))
+  if (changeIndexes.length === 0) {
+    // Whole diff is unchanged (or a pure no-op): hide it all behind one fold.
+    return [{
+      kind: 'fold', rows: [...rows], count: rows.length,
+      oldStart: 1, oldEnd: rows.length, newStart: 1, newEnd: rows.length,
+    }]
+  }
+  // Cluster changes into runs whose gaps fit within 2*context+1 rows.
+  const hunks: { start: number; end: number }[] = []
+  for (const ci of changeIndexes) {
+    const start = Math.max(0, ci - context)
+    const end = Math.min(rows.length - 1, ci + context)
+    const last = hunks[hunks.length - 1]
+    if (last !== undefined && start <= last.end + 1) {
+      last.end = Math.max(last.end, end)
+    } else {
+      hunks.push({ start, end })
+    }
+  }
+  const segments: DiffSegment[] = []
+  let cursor = 0
+  for (const hunk of hunks) {
+    if (hunk.start > cursor) segments.push(foldOf(rows.slice(cursor, hunk.start)))
+    segments.push({ kind: 'hunk', rows: rows.slice(hunk.start, hunk.end + 1) })
+    cursor = hunk.end + 1
+  }
+  if (cursor < rows.length) segments.push(foldOf(rows.slice(cursor)))
+  return segments
+}
+
+function foldOf(rows: readonly DiffRow[]): FoldSegment {
+  return {
+    kind: 'fold',
+    rows,
+    count: rows.length,
+    oldStart: firstOldLine(rows) ?? 1,
+    oldEnd: lastOldLine(rows) ?? 0,
+    newStart: firstNewLine(rows) ?? 1,
+    newEnd: lastNewLine(rows) ?? 0,
+  }
+}
+
+function firstOldLine(rows: readonly DiffRow[]): number | undefined {
+  for (const row of rows) if (row.oldLine !== undefined) return row.oldLine
+  return undefined
+}
+function lastOldLine(rows: readonly DiffRow[]): number | undefined {
+  for (let i = rows.length - 1; i >= 0; i -= 1) if (rows[i]!.oldLine !== undefined) return rows[i]!.oldLine
+  return undefined
+}
+function firstNewLine(rows: readonly DiffRow[]): number | undefined {
+  for (const row of rows) if (row.newLine !== undefined) return row.newLine
+  return undefined
+}
+function lastNewLine(rows: readonly DiffRow[]): number | undefined {
+  for (let i = rows.length - 1; i >= 0; i -= 1) if (rows[i]!.newLine !== undefined) return rows[i]!.newLine
+  return undefined
+}
+
+/** One intra-line segment: a run of chars with a changed flag. */
+export interface InlineSegment { readonly text: string; readonly changed: boolean }
+/** Each side's intra-line segments. */
+export interface InlineDiff { readonly old: readonly InlineSegment[]; readonly next: readonly InlineSegment[] }
+
+/**
+ * Intra-line diff by common prefix/suffix: the shared leading and trailing
+ * characters stay unchanged, and only the differing middle is marked changed
+ * on both sides. This never highlights identical characters and keeps a small
+ * edit inside a long line immediately visible. Pure, no React/DOM.
+ * @param oldText - the old line.
+ * @param newText - the new line.
+ * @returns per-side segments marking changed runs.
+ */
+export function diffInline(oldText: string, newText: string): InlineDiff {
+  const minLen = Math.min(oldText.length, newText.length)
+  let prefix = 0
+  while (prefix < minLen && oldText[prefix] === newText[prefix]) prefix += 1
+  let suffix = 0
+  while (suffix < minLen - prefix && oldText[oldText.length - 1 - suffix] === newText[newText.length - 1 - suffix]) suffix += 1
+  const oldMidStart = prefix
+  const oldMidEnd = oldText.length - suffix
+  const newMidStart = prefix
+  const newMidEnd = newText.length - suffix
+  const segments = (text: string, midStart: number, midEnd: number): InlineSegment[] => {
+    const out: InlineSegment[] = []
+    if (midStart > 0) out.push({ text: text.slice(0, midStart), changed: false })
+    const mid = text.slice(midStart, midEnd)
+    if (mid.length > 0) out.push({ text: mid, changed: true })
+    if (midEnd < text.length) out.push({ text: text.slice(midEnd), changed: false })
+    return out
+  }
+  return { old: segments(oldText, oldMidStart, oldMidEnd), next: segments(newText, newMidStart, newMidEnd) }
+}
+
+/**
+ * Merge adjacent inline segments sharing the same changed flag, so rendering
+ * wraps each run — not each character — in one span.
+ * @param segments - the raw per-character-heavy inline segments.
+ * @returns coalesced segments; identical text joined into runs.
+ */
+export function coalesceInline(segments: readonly InlineSegment[]): InlineSegment[] {
+  const out: InlineSegment[] = []
+  for (const seg of segments) {
+    const last = out[out.length - 1]
+    if (last !== undefined && last.changed === seg.changed) out[out.length - 1] = { text: last.text + seg.text, changed: seg.changed }
+    else out.push(seg)
+  }
+  return out
+}
+
+/** Human byte count for the panel meta row. */
+export function formatBytes(bytes: number): string {
+  if (bytes < 1024) return `${String(bytes)} B`
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Unified-diff text (git) → DiffRow segments
+// ─────────────────────────────────────────────────────────────────────────────
+
+/** One parsed diff line of a unified diff (git's own hunk structure). */
+export interface DiffLine {
+  kind: 'ctx' | 'del' | 'add' | 'meta'
+  /** The line content without its diff marker ('' for the no-newline marker). */
+  text: string
+  /** Old-side line number (null for pure additions / metadata). */
+  oldNum: number | null
+  /** New-side line number (null for pure deletions / metadata). */
+  newNum: number | null
+}
+
+/** One parsed hunk. */
+export interface DiffHunk {
+  /** The old-side start line (`-a[,b]`). */
+  oldStart: number
+  /** The new-side start line (`+c[,d]`). */
+  newStart: number
+  /** The section text after the trailing `@@` (may be empty). */
+  header: string
+  lines: DiffLine[]
+}
+
+/** One parsed file section of a unified diff. */
+export interface DiffFile {
+  /** The `---` path verbatim ('/dev/null' for a new file). */
+  oldPath: string
+  /** The `+++` path verbatim ('/dev/null' for a deleted file). */
+  newPath: string
+  /** The file changed with binary content: no hunks to draw. */
+  binary: boolean
+  hunks: DiffHunk[]
+}
+
+/** The parsed unified diff. */
+export interface ParsedDiff {
+  files: DiffFile[]
+}
+
+/** Parse the hunk header `@@ -a[,b] +c[,d] @@ section` (section may contain '@@'). */
+function parseHunkHeader(line: string): { oldStart: number; newStart: number; header: string } | null {
+  const match = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$/.exec(line)
+  if (match === null) return null
+  return { oldStart: Number(match[1]), newStart: Number(match[3]), header: match[5] ?? '' }
+}
+
+/**
+ * Parse `git diff --no-color` output into file sections and hunks. Rows
+ * outside a file section (leading noise) and metadata rows between the
+ * `diff --git`/`---`/`+++` headers and the first hunk (index lines, mode
+ * changes, rename/similarity lines) are skipped; a section that never
+ * reaches a hunk (a mode/rename-only change) stays hunkless so the caller
+ * can still draw its path.
+ */
+export function parseUnifiedDiff(text: string): ParsedDiff {
+  const files: DiffFile[] = []
+  let current: DiffFile | null = null
+  let inHunk = false
+  let hunk: DiffHunk | null = null
+  let oldNum = 0
+  let newNum = 0
+  const flushHunk = (): void => {
+    if (current !== null && hunk !== null) current.hunks.push(hunk)
+    hunk = null
+    inHunk = false
+  }
+  for (const raw of text.split('\n')) {
+    if (raw.startsWith('diff --git ')) {
+      flushHunk()
+      current = { oldPath: '', newPath: '', binary: false, hunks: [] }
+      files.push(current)
+      continue
+    }
+    if (current === null) continue
+    if (raw.startsWith('Binary files ') || raw === 'GIT binary patch') {
+      flushHunk()
+      current.binary = true
+      continue
+    }
+    if (raw.startsWith('--- ')) {
+      flushHunk()
+      current.oldPath = raw.slice(4)
+      continue
+    }
+    if (raw.startsWith('+++ ')) {
+      current.newPath = raw.slice(4)
+      continue
+    }
+    const header = parseHunkHeader(raw)
+    if (header !== null) {
+      flushHunk()
+      hunk = { oldStart: header.oldStart, newStart: header.newStart, header: header.header, lines: [] }
+      oldNum = header.oldStart
+      newNum = header.newStart
+      inHunk = true
+      continue
+    }
+    if (!inHunk || hunk === null) continue
+    const marker = raw[0]
+    if (marker === '\\') {
+      // `\ No newline at end of file`: metadata attached to the previous row.
+      hunk.lines.push({ kind: 'meta', text: raw.slice(1), oldNum: null, newNum: null })
+      continue
+    }
+    if (marker === ' ') {
+      hunk.lines.push({ kind: 'ctx', text: raw.slice(1), oldNum, newNum })
+      oldNum += 1
+      newNum += 1
+    } else if (marker === '-') {
+      hunk.lines.push({ kind: 'del', text: raw.slice(1), oldNum, newNum: null })
+      oldNum += 1
+    } else if (marker === '+') {
+      hunk.lines.push({ kind: 'add', text: raw.slice(1), oldNum: null, newNum })
+      newNum += 1
+    } else {
+      // Not a diff line (a hunk can never contain one): stop the hunk.
+      flushHunk()
+    }
+  }
+  flushHunk()
+  return { files }
+}
+
+/** One DiffLine row mapped onto the shared DiffRow model. */
+function rowOfLine(line: DiffLine): DiffRow {
+  if (line.kind === 'meta') return { kind: 'meta', text: line.text }
+  const kind: DiffRow['kind'] = line.kind === 'ctx' ? 'context' : line.kind
+  if (line.kind === 'del') return { kind, oldLine: line.oldNum ?? undefined, text: line.text }
+  if (line.kind === 'add') return { kind, newLine: line.newNum ?? undefined, text: line.text }
+  return { kind, oldLine: line.oldNum ?? undefined, newLine: line.newNum ?? undefined, text: line.text }
+}
+
+/**
+ * Convert one parsed unified-diff file into renderer segments: each hunk's
+ * lines become a paired-mod hunk segment, and the unemitted context gaps
+ * between hunks (git already trimmed them) become non-expandable folds that
+ * still carry their old/new line ranges. The rewrite pairing applies within
+ * each hunk, exactly like session-op diffs.
+ */
+export function unifiedSegments(file: DiffFile): DiffSegment[] {
+  const segments: DiffSegment[] = []
+  file.hunks.forEach((hunk, index) => {
+    const rows = pairMods(hunk.lines.map(rowOfLine))
+    const prev = file.hunks[index - 1]
+    if (prev !== undefined) {
+      // The gap git never emitted: rows are unknown (non-expandable), but
+      // the ranges are derivable from the surrounding hunk headers/counts.
+      const prevOldEnd = prev.oldStart + prev.lines.filter(line => line.oldNum !== null).length - 1
+      const prevNewEnd = prev.newStart + prev.lines.filter(line => line.newNum !== null).length - 1
+      const oldGap = hunk.oldStart - prevOldEnd - 1
+      const newGap = hunk.newStart - prevNewEnd - 1
+      if (oldGap > 0 || newGap > 0) {
+        segments.push({
+          kind: 'fold',
+          count: Math.max(oldGap, newGap, 0),
+          oldStart: prevOldEnd + 1,
+          oldEnd: Math.max(hunk.oldStart - 1, prevOldEnd),
+          newStart: prevNewEnd + 1,
+          newEnd: Math.max(hunk.newStart - 1, prevNewEnd),
+        })
+      }
+    } else if (hunk.oldStart > 1 || hunk.newStart > 1) {
+      // Leading context git trimmed (e.g. -U0 diffs).
+      segments.push({
+        kind: 'fold',
+        count: Math.max(hunk.oldStart - 1, hunk.newStart - 1, 0),
+        oldStart: 1,
+        oldEnd: hunk.oldStart - 1,
+        newStart: 1,
+        newEnd: hunk.newStart - 1,
+      })
+    }
+    segments.push({ kind: 'hunk', rows })
+  })
+  return segments
+}
+
+/** Build the untracked-file shape: one file, one hunk of pure additions. */
+export function untrackedFile(path: string, content: string): DiffFile {
+  const lines: DiffLine[] = []
+  const body = content.endsWith('\n') ? content.slice(0, -1) : content
+  if (body !== '') {
+    let num = 1
+    for (const line of body.split('\n')) {
+      lines.push({ kind: 'add', text: line, oldNum: null, newNum: num })
+      num += 1
+    }
+  }
+  return { oldPath: '/dev/null', newPath: `b/${path}`, binary: false, hunks: [{ oldStart: 0, newStart: 1, header: '', lines }] }
+}
+
+/**
+ * Materialize a git gap fold's hidden rows from the two sides' full file
+ * contents, by the fold's known line ranges: the old side drives context
+ * rows (each mapped onto the new side through the fold's offset — a gap is
+ * an unchanged run, so the sides align), and new-side lines the old range
+ * never reaches become pure additions. Line numbers clip to the actual
+ * content (a no-newline file's ranges can overrun by one); `\r` endings
+ * survive verbatim, like git's own context lines.
+ */
+export function foldRowsFromContents(fold: FoldSegment, oldContent: string, newContent: string): DiffRow[] {
+  const oldLines = oldContent.length === 0 ? [] : oldContent.split('\n')
+  const newLines = newContent.length === 0 ? [] : newContent.split('\n')
+  const offset = fold.newStart - fold.oldStart
+  const rows: DiffRow[] = []
+  const oldFrom = Math.max(fold.oldStart, 1)
+  const oldTo = Math.min(fold.oldEnd, oldLines.length)
+  for (let oldLine = oldFrom; oldLine <= oldTo; oldLine += 1) {
+    const text = oldLines[oldLine - 1]!
+    const newLine = oldLine + offset
+    rows.push(
+      newLine >= fold.newStart && newLine <= fold.newEnd && newLine <= newLines.length
+        ? { kind: 'context', oldLine, newLine, text }
+        : { kind: 'context', oldLine, text },
+    )
+  }
+  // New-side lines beyond what the old range reached (a pure-addition gap):
+  // rows carrying only the new-side number, exactly like added lines.
+  const newFrom = Math.max(fold.newStart, 1)
+  const newTo = Math.min(fold.newEnd, newLines.length)
+  for (let newLine = Math.max(newFrom, oldTo + offset + 1); newLine <= newTo; newLine += 1) {
+    rows.push({ kind: 'add', newLine, text: newLines[newLine - 1]! })
+  }
+  return rows
+}
+
+/** Strip the `a/` / `b/` prefix git puts on diff paths (not on /dev/null). */
+export function displayPath(path: string): string {
+  if (path === '/dev/null') return path
+  if (path.startsWith('a/') || path.startsWith('b/')) return path.slice(2)
+  return path
+}
+
+/** The diff's add/del/mod row counts (the "+n −m" header chips). */
+export function diffStats(segments: readonly DiffSegment[]): { added: number; deleted: number } {
+  let added = 0
+  let deleted = 0
+  for (const segment of segments) {
+    if (segment.kind !== 'hunk') continue
+    for (const row of segment.rows) {
+      if (row.kind === 'add' || row.kind === 'mod') added += 1
+      if (row.kind === 'del' || row.kind === 'mod') deleted += 1
+    }
+  }
+  return { added, deleted }
+}

src/client/html-preview.ts

@@ -0,0 +1,15 @@
+/**
+ * Shared vocabulary of the sidebar's HTML preview surfaces (the editor's
+ * html viewer and the changes tab's op render preview): the sandbox tokens
+ * both preview iframes load with.
+ */
+
+/**
+ * The sandbox tokens of an HTML preview iframe. NO allow-same-origin (the
+ * preview must stay in an opaque origin — with the route's own origin it
+ * could read session data) and NO allow-top-navigation (a previewed page
+ * must not hijack the GUI). The editor viewer can disable the sandbox
+ * per-feature in the side card settings (warned); the changes tab's op
+ * render preview always stays sandboxed.
+ */
+export const HTML_IFRAME_SANDBOX = 'allow-scripts allow-popups allow-downloads allow-modals'

src/client/icons.tsx

@@ -1,24 +1,12 @@
 /**
  * Icons the sidebar needs beyond the primitives set: a terminal glyph (the
- * icon library has none), a diff glyph, and the two panel-toggle glyphs for
- * the top-right cluster. Per-tab icons live on the tab descriptors
+ * icon library has none), a diff glyph, and the bottom-workbench toggle.
+ * Per-tab icons live on the tab descriptors
  * (`descriptor.icon`), not in a type-keyed switch — the icon mapping was
  * registry-ized with the tab types.
  */
 import type { IconProps } from '@deepseek-ai/dsh-client-ui-primitives'
 
-/**
- * Right-panel toggle glyph (the "侧拉" button): a frame with a filled strip
- * along its RIGHT edge, in the app's outline style (1.5px stroke,
- * currentColor).
- */
-export const IconPanelRightOutline16 = ({ size = 16, className }: IconProps) => (
-  <svg width={size} height={size} className={className} viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect x="1.5" y="2" width="13" height="12" rx="2.5" stroke="currentColor" strokeWidth="1.5" />
-    <rect x="10.5" y="3.25" width="2.75" height="9.5" rx="1" fill="currentColor" stroke="none" />
-  </svg>
-)
-
 /**
  * Bottom-panel toggle glyph (the "底栏" button): a frame with a filled strip
  * along its BOTTOM edge, in the app's outline style.

src/client/ime-guard.ts

@@ -25,9 +25,12 @@
  * legacy signal engines emit without isComposing.
  */
 
-/** The pure decision: is this keyboard event part of an IME composition? */
-export function isImeComposition(event: { isComposing: boolean; keyCode: number }): boolean {
-  return event.isComposing || event.keyCode === 229
+/** The pure decision: is this keyboard event part of an IME composition?
+ *  `isComposing` is optional on the input: React's synthetic KeyboardEvent
+ *  type does not declare it (the DOM event always carries it), and the
+ *  keyCode 229 fallback covers exactly those callers. */
+export function isImeComposition(event: { isComposing?: boolean; keyCode: number }): boolean {
+  return event.isComposing === true || event.keyCode === 229
 }
 
 /**

src/client/index.tsx

@@ -17,25 +17,31 @@ import { revalidateChunksOnReactivate, setChunkModuleSystem } from './chunk-load
 import { registerBuiltins } from './builtins/index.ts'
 import { Sidebar } from './Sidebar.tsx'
 import { RenderBoundary } from './RenderBoundary.tsx'
-import { registerOpenPathInterception, registerTurnTailInterception } from './intercept.tsx'
+import { registerTurnTailInterception } from './intercept.tsx'
+import { createNativeTabRecords } from './native/tab-adapter.tsx'
+import { registerNativeSurface } from './native/index.ts'
+import { registerBottomToggle } from './sidebar/bottom-toggle.tsx'
+import { createNativeSurface } from './native/surface.ts'
 import { registerLinkInterception } from './link-intercept.ts'
 import { registerImeGuard } from './ime-guard.ts'
 import { registerSettingsNavIcon } from './settings-nav-icon.ts'
-import { loadExternalDisable, loadPrefs } from './prefs.ts'
+import { loadBootDecision } from './prefs.ts'
 import { SideCardSection } from './SideCardSection.tsx'
 import { api } from './api.ts'
-import { LOCALE_NS, attachLocale, attachBetterLocale, t, zh, en,
-  ja, de, fr, pt, ko, ar, hi, id, tr, vi, th, ru, it, nl, sv, pl,
-  zhHK, zhTW, zhMO,
-} from './locales.ts'
+import { LOCALE_NS, attachLocale, attachBetterLocale, t, zh, en } from './locales.ts'
+import { loadChunk } from './chunk-loader.ts'
 import css from './sidebar.module.css'
 import './layout.css'
 
 /** Services required before mounting (provided by the client runtime; the
  *  locale service backs the sidebar's copy — see locales.ts). `modules`
  *  (rc.8+) is the client module system the chunk loader resolves its
- *  externals through — Cordis guards service access without inject. */
-export const inject = ['slots', 'sessions', 'workspaces', 'locale', 'modules']
+ *  externals through; `connection` (0.1.2-alpha.2+) is the Remote transport's
+ *  recovery lifecycle the side chat's disconnect banner reads — Cordis guards
+ *  service access without inject. The `remote.session` namespace is NOT here:
+ *  it mounts asynchronously, so the open-path interception reaches it through
+ *  `ctx.inject` (see intercept.tsx). */
+export const inject = ['slots', 'sessions', 'locale', 'modules', 'connection']
 
 /**
  * Error boundary over the sidebar tree (root scope): a render error in the
@@ -80,7 +86,12 @@ export function apply(ctx: Context): void {
   // the ja dict once the store becomes available.
   ctx.effect(() => {
     let dispose: (() => void) | undefined
+    // Guards the async chunk registration below: a sync() re-run (or fiber
+    // disposal) that lands while the chunk is still in flight must render
+    // that registration moot.
+    let generation = 0
     const sync = (): void => {
+      generation += 1
       dispose?.()
       dispose = undefined
       const store = ctx.get('betterLocale') as
@@ -94,10 +105,17 @@ export function apply(ctx: Context): void {
         | undefined
       attachBetterLocale(store)
       if (store !== undefined) {
-        dispose = store.register(LOCALE_NS, {
-          ja, de, fr, pt, ko, ar, hi, id, tr, vi, th, ru, it, nl, sv, pl,
-          'zh-HK': zhHK, 'zh-TW': zhTW, 'zh-MO': zhMO,
-        })
+        // The 19 override dictionaries ride the lazy `locale` chunk: until
+        // it lands, the store has no betterSidebar entries and t() keeps
+        // the zh/en chain; the store's own revision bump on register
+        // re-renders the chrome once the dicts arrive.
+        const myGeneration = generation
+        void loadChunk('locale')
+          .then(mod => {
+            if (myGeneration !== generation) return
+            dispose = store.register(LOCALE_NS, mod.localeDicts as Record<string, Record<string, string>>)
+          })
+          .catch(() => { /* the dicts stay unregistered; the zh/en chain runs */ })
       }
     }
     // Initial check (picks up the store if better-locale activated first).
@@ -106,6 +124,7 @@ export function apply(ctx: Context): void {
     // activates with a persisted override, and when the user switches).
     const unsubscribe = ctx.locale.subscribe(sync)
     return () => {
+      generation += 1
       unsubscribe()
       dispose?.()
       attachBetterLocale(undefined)
@@ -122,6 +141,27 @@ export function apply(ctx: Context): void {
   // are ready by the time the sidebar renders.
   const service = createBetterSidebarService(sidebarStore)
   ctx.provide('betterSidebar', service)
+  // The native right-Sidebar surface: the plugin's content is registered as
+  // DSH tab types (one per descriptor) and every open routes there, so the
+  // right column belongs to the host and only the bottom workbench stays
+  // plugin-owned. Both halves live for this fiber's lifetime.
+  const nativeRecords = createNativeTabRecords()
+  const nativeSurface = createNativeSurface(ctx, nativeRecords)
+  service.setSurface(nativeSurface)
+  ctx.effect(
+    () => registerNativeSurface({ ctx, store: sidebarStore, service, records: nativeRecords }),
+    'dsh-better-sidebar: native right-Sidebar registrations',
+  )
+  // The bottom workbench's expand/collapse button in DSH's session header
+  // (the header's corner seat belongs to the native sidebar's own control).
+  ctx.effect(
+    () => registerBottomToggle(ctx, sidebarStore),
+    'dsh-better-sidebar: bottom-workbench toggle',
+  )
+  ctx.effect(
+    () => () => { nativeSurface.dispose(); service.setSurface(undefined) },
+    'dsh-better-sidebar: native right-Sidebar surface',
+  )
   // Terminal tab titles use the host's effective shell name (e.g. bash/zsh)
   // instead of "Terminal 1". Start with a safe fallback and replace it as
   // soon as the host shell info resolves. Tabs created before the response
@@ -133,8 +173,7 @@ export function apply(ctx: Context): void {
     terminalTitle = name
     const snapshot = service.getSnapshot()
     if (snapshot.state === undefined) return
-    const tabs = allLeaves(snapshot.state.splits)
-      .concat(allLeaves(snapshot.state.bottomSplits))
+    const tabs = allLeaves(snapshot.state.bottomSplits)
       .flatMap(leaf => leaf.tabs)
     for (const tab of tabs) {
       if (tab.type === 'terminal' && !isAgentTabId(tab.id) && tab.title === fallbackTitle) {
@@ -151,14 +190,21 @@ export function apply(ctx: Context): void {
   )
   // A failure anywhere in the client lifecycle must never take the app down
   // silently: log with the plugin prefix and pin a visible diagnostic strip
-  // to the page so a blank panel is never the only symptom.
+  // to the page so a blank panel is never the only symptom. This strip is
+  // the last-resort reporter (no CSS module is reachable from here), so its
+  // colors go through skin token chains with the previous hexes as the
+  // chain tails — worst case (no skin tokens on the page) it renders
+  // byte-identical to the old hardcoded bar, and any `--dsw-alias-*` skin
+  // re-themes it (guide §12: no hardcoded colors).
   const fail = (phase: string, error: unknown): void => {
     console.error(`[dsh-better-sidebar] ${phase} error:`, error)
     try {
       const bar = document.createElement('div')
       bar.style.cssText = 'position:fixed;left:8px;bottom:8px;z-index:2147483000;max-width:70vw;padding:8px 12px;'
-        + 'font:12px/1.5 ui-monospace,SFMono-Regular,Menlo,monospace;color:#f2a1a1;background:#1b1b22;'
-        + 'border:1px solid #f2a1a1;border-radius:8px;white-space:pre-wrap'
+        + 'font:12px/1.5 ui-monospace,SFMono-Regular,Menlo,monospace;'
+        + 'color:var(--dsw-alias-state-error-primary,#f2a1a1);'
+        + 'background:var(--dsw-alias-bg-layer-3,var(--dsw-alias-bg-base,#1b1b22));'
+        + 'border:1px solid var(--dsw-alias-state-error-primary,#f2a1a1);border-radius:8px;white-space:pre-wrap'
       bar.textContent = `[dsh-better-sidebar] ${phase} error: ${error instanceof Error ? error.message : String(error)}`
       document.body.appendChild(bar)
     } catch {
@@ -166,10 +212,9 @@ export function apply(ctx: Context): void {
     }
   }
   try {
-    // rc.8+ exposes the client module system as the `ctx.modules` service
-    // (no window.__DSH_MODULES__ page global anymore); the chunk loader needs
-    // it to resolve its externals, so inject it before anything can load a
-    // lazy chunk. The loader falls back to the rc.7 global when absent.
+    // rc.8+ exposes the client module system as the `ctx.modules` service;
+    // the chunk loader needs it to resolve its externals, so inject it
+    // before anything can load a lazy chunk.
     setChunkModuleSystem(ctx.modules)
     // Fresh chunk state for this activation: drop per-test fixtures and
     // revalidate loaded chunk scripts against the bundle route's ETags —
@@ -273,24 +318,26 @@ export function apply(ctx: Context): void {
       }
       const sync = async (): Promise<void> => {
         if (disposed) return
-        // Resolve the user's side card prefs BEFORE the first session seeds,
-        // so a brand-new conversation opens (or stays closed) at the chosen
-        // width from first paint. A settings route failure falls back to the
-        // schema defaults; the sidebar still mounts (a stalled wire gives up
-        // after the timeout and mounts on the defaults).
-        const prefs = await Promise.race([
-          loadPrefs(api),
-          new Promise<null>(resolve => { const timer = window.setTimeout(() => resolve(null), 2000) }),
+        // Resolve the user's side card prefs and the external-disable flag
+        // from ONE settings fetch BEFORE the first session seeds, so a
+        // brand-new conversation opens (or stays closed) at the chosen width
+        // from first paint. A settings route failure falls back to the schema
+        // defaults; the sidebar still mounts (a stalled wire gives up after
+        // the timeout and mounts on the defaults — the external-disable check
+        // rides the same fetch, so one round trip covers both decisions).
+        const decision = await Promise.race([
+          loadBootDecision(api),
+          new Promise<null>(resolve => { window.setTimeout(() => resolve(null), 2000) }),
         ])
-        if (prefs !== null) sidebarStore.setPrefs(prefs)
         if (disposed) return
-        // Mutual exclusion with the dsh-web-ui family right panel: while the
-        // aionui-panel provider is selected, the sidebar must not mount at
-        // all. Re-evaluated on every settings-document update (live switch).
-        const suspended = await loadExternalDisable(api)
-        if (disposed) return
-        sidebarStore.setSuspended(suspended)
-        if (suspended) unmount()
+        if (decision !== null) {
+          sidebarStore.setPrefs(decision.prefs)
+          // Mutual exclusion with the dsh-web-ui family right panel: while the
+          // aionui-panel provider is selected, the sidebar must not mount at
+          // all. Re-evaluated on every settings-document update (live switch).
+          sidebarStore.setSuspended(decision.suspended)
+        }
+        if (decision?.suspended) unmount()
         else mount()
       }
       void sync()
@@ -319,18 +366,6 @@ export function apply(ctx: Context): void {
       'dsh-better-sidebar: turn-tail interception',
     )
 
-    ctx.effect(
-      () => {
-        try {
-          return registerOpenPathInterception(ctx, sidebarStore)
-        } catch (error) {
-          fail('interception', error)
-          return () => {}
-        }
-      },
-      'dsh-better-sidebar: open-path interception',
-    )
-
     ctx.effect(
       () => {
         try {

src/client/intercept.tsx

@@ -8,10 +8,9 @@
  */
 import { IconCodeOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { Context } from '../context-types.ts'
-import { firstLeaf, revealPaths, togglePanel, type SidebarStore } from './state.ts'
+import { revealPaths, type SidebarStore } from './state.ts'
 import { t } from './locales.ts'
 import { resolveSidebarPath, selectProducedFiles } from './produced-files.ts'
-import { wrapOpenPath } from './openpath-intercept.ts'
 import css from './sidebar.module.css'
 
 /** Open a file in the sidebar's editor (used by the intercepted row and the explorer). */
@@ -25,18 +24,10 @@ export function openSidebarFile(ctx: Context, store: SidebarStore, sessionId: st
   ctx.get('betterSidebar')?.openTab({ type: 'editor', title, path: absolute, id: `editor:${absolute}` })
 }
 
-/**
- * The produced files the turn-tail selector last matched for the visible
- * session. The "Show in folder" gesture carries no file path of its own
- * (`'.'`), so the reveal highlights exactly these rows when available.
- */
-let lastProduced: readonly string[] = []
-
 /**
  * Reveal the produced files in the sidebar explorer: expand their parent
- * directories, highlight the rows, and focus the explorer tab (expanding the
- * hosting panel when it is collapsed). Unknown files fall back to revealing
- * the workspace root itself.
+ * directories, highlight the rows, and focus the explorer tab. Unknown
+ * files fall back to revealing the workspace root itself.
  */
 export function revealInExplorer(
   ctx: Context,
@@ -53,15 +44,6 @@ export function revealInExplorer(
     ? files.map(path => resolveSidebarPath(cwd, path))
     : cwd === undefined ? [] : [cwd]
   store.reduce(state => revealPaths(state, cwd, targets))
-  // A type-only open never auto-expands the panel (only content opens do,
-  // see service.openTab) — so a reveal opens the panel itself when it is
-  // collapsed, exactly like the subagent auto-open flows, or the highlight
-  // would be set on an invisible panel.
-  store.reduce(s => (s.panelOpen ? s : togglePanel(s)))
-  // Pin the landing to the right panel: the files window must appear where
-  // the panel just expanded, not in a bottom-panel pane the user last
-  // touched.
-  store.reduce(s => ({ ...s, activePane: firstLeaf(s.splits).id }))
   // Focus the single-instance editor home tab (the files window) where the
   // reveal highlight renders. Read via ctx.get like every other internal
   // consumer (#357): the provider is not on this fiber chain, so a direct
@@ -137,9 +119,7 @@ export function registerTurnTailInterception(ctx: Context, store: SidebarStore):
     select: (owner) => {
       if (store.getSuspended()) return null
       if (store.getPrefs().tabsEnabled['editor'] === false) return null
-      const matched = selectProducedFiles(owner)
-      if (matched !== null) lastProduced = matched
-      return matched
+      return selectProducedFiles(owner)
     },
     priority: -1,
     registrant: 'dsh-better-sidebar',
@@ -149,24 +129,3 @@ export function registerTurnTailInterception(ctx: Context, store: SidebarStore):
     }),
   }, SidebarProducedFiles))
 }
-
-/**
- * Register the chat file-open interception: wraps `ctx.workspaces.openPath`
- * — the single funnel every chat-side file open goes through (tool-row path
- * links, the produced-files row, prose mentions) — so opens land in the
- * sidebar editor instead of the Host OS. The folder-reveal gesture ("Show in
- * folder" passes `'.'`) is the one exception: it is routed to the explorer.
- * Gated by BOTH the `interceptOpenPath` pref and the editor tab's enable
- * switch; declined opens fall through to the original method. Returns the
- * disposer restoring the original (HMR-safe).
- */
-export function registerOpenPathInterception(ctx: Context, store: SidebarStore): () => void {
-  return wrapOpenPath(ctx.workspaces, {
-    takeoverEnabled: () => !store.getSuspended()
-      && store.getPrefs().interceptOpenPath !== false
-      && store.getPrefs().tabsEnabled['editor'] !== false,
-    currentSessionId: () => ctx.sessions.list.getSnapshot().current,
-    openInSidebar: (path, sessionId) => { openSidebarFile(ctx, store, sessionId, path) },
-    revealInExplorer: (_path, sessionId) => { revealInExplorer(ctx, store, sessionId, lastProduced) },
-  })
-}

src/client/lang.ts

@@ -48,14 +48,12 @@ import { pascal } from '@codemirror/legacy-modes/mode/pascal'
 import { vb } from '@codemirror/legacy-modes/mode/vb'
 import { vhdl } from '@codemirror/legacy-modes/mode/vhdl'
 import { stex } from '@codemirror/legacy-modes/mode/stex'
+import { extOf } from './paths.ts'
 
-/** The lowercased file extension of a path ('' when none). */
-export function extOf(path: string): string {
-  const at = path.lastIndexOf('.')
-  if (at === -1) return ''
-  const base = path.slice(at + 1).toLowerCase()
-  return base.includes('/') || base.includes('\\') ? '' : base
-}
+// Re-exported for the established import surface (tests import extOf from
+// this module); the implementation lives in the dependency-free paths.ts so
+// core-bundle modules can share it without pulling the CodeMirror packages.
+export { extOf }
 
 /** Language key for an extension, or null for plain text. Pure (tested). */
 export function languageKeyForExt(ext: string): string | null {

src/client/layout-push.ts

@@ -1,37 +1,28 @@
 /**
- * Size written to `--dsh-sidebar-width` / `--dsh-sidebar-height`.
- * The conversation column (output + composer) must keep at least
- * {@link PANEL_MIN} of the viewport after the bottom panel claims height.
+ * Size written to `--dsh-sidebar-height`. The conversation column (output +
+ * composer) must keep at least {@link CONVERSATION_MIN} of the viewport after
+ * the bottom workbench claims height; a closed workbench pushes 0. The right
+ * column belongs to DSH's native Sidebar, so this shell pushes no width.
  */
-import { PANEL_MIN } from './state.ts'
+import { CONVERSATION_MIN } from './state.ts'
 
-export interface LayoutPushInput {
-  narrow: boolean
-  panelOpen: boolean
-  bottomOpen: boolean
-  width: number
-  bottomHeight: number
-  viewportWidth: number
-  viewportHeight: number
-}
-
-export interface LayoutPushSize {
-  width: number
+export interface BottomPushInput {
+  /** Whether the bottom workbench is expanded. */
+  open: boolean
+  /** Committed (or mid-drag) bottom height in px. */
   height: number
+  /** Viewport height the cap is measured against (visual viewport when known). */
+  viewportHeight: number
 }
 
 function finiteNonNegative(value: number): number {
   return Number.isFinite(value) ? Math.max(0, value) : 0
 }
 
-/** Compute the live layout-push size. Narrow drawers float and push 0. */
-export function layoutPushSize(input: LayoutPushInput): LayoutPushSize {
-  if (input.narrow) return { width: 0, height: 0 }
-  const viewportWidth = finiteNonNegative(input.viewportWidth)
+/** Compute the live layout-push height for the bottom workbench. */
+export function bottomPushHeight(input: BottomPushInput): number {
+  if (!input.open) return 0
   const viewportHeight = finiteNonNegative(input.viewportHeight)
-  const maxHeight = Math.max(0, viewportHeight - Math.min(PANEL_MIN, viewportHeight))
-  return {
-    width: input.panelOpen ? Math.min(finiteNonNegative(input.width), viewportWidth) : 0,
-    height: input.bottomOpen ? Math.min(finiteNonNegative(input.bottomHeight), maxHeight) : 0,
-  }
+  const maxHeight = Math.max(0, viewportHeight - Math.min(CONVERSATION_MIN, viewportHeight))
+  return Math.min(finiteNonNegative(input.height), maxHeight)
 }

src/client/layout.css

@@ -1,48 +1,32 @@
 /**
- * Layout push: when a panel is open it OCCUPIES the layout instead of
- * floating over it — the app shell (#root, the AppFrame three-column grid)
- * gives up space. Only the center column is flexible (1fr), so the right
- * panel's width squeeze (margin-right on #root) lands exactly on the
- * conversation output and the input bar, like a VSCode sidebar.
+ * Layout push: the bottom workbench occupies layout instead of floating over
+ * the conversation. The right column belongs to DSH's native Sidebar, so this
+ * stylesheet pushes no width — only the workbench's height.
  *
- * The width rides `calc(100% - var(...))` instead of a bare margin on a
- * full-width box: some desktop shells (DSH Desktop, #208) set #root to
- * width:100%, where a margin would overflow the viewport additively —
- * the calc keeps the box at exactly 100% minus the push in every shell.
- * Width and margin transition in lockstep (same variable, same duration
- * and easing), so expand/collapse animates the content width exactly as
- * the bare-margin version did.
+ * The workbench squeezes only the conversation column. The anchor is the
+ * [data-dsh-center-col] tag the Sidebar shell's locator writes on the
+ * frame's measured center grid item (Sidebar.tsx locate — not a positional
+ * path: the frame also contains an overlay layer and drag handles). A
+ * stretched grid item shrinks by its bottom margin, so the conversation
+ * output and composer lift without touching either sidebar.
  *
- * The bottom panel squeezes ONLY the center column — it must not cover the
- * app's own left sidebar or the right panel. The anchor is the frame's
- * center grid item via its stable data attribute ([data-pane="conversation"]
- * on the centerCol inside [data-dsh-frame]), not a positional path: the
- * frame's child order also contains an overlay layer and drag handles
- * (verified against a live DSH 0.1.x page), so nth-child is brittle. A
- * stretched grid item shrinks by its margins, so the conversation content
- * (output + input bar) lifts without touching the sidebars.
- *
- * The sizes ride CSS variables updated by the Sidebar shell (0 while
- * collapsed); expand/collapse animates both the margins and the panel
- * slides on the same theme duration. Drags disable the transition so the
- * layout tracks the pointer.
+ * The size rides a CSS variable updated by the Sidebar shell (0 while
+ * collapsed). Expand/collapse uses the host theme duration; drags disable
+ * transitions so the reserved edge tracks the pointer.
  */
-#root {
-  margin-right: var(--dsh-sidebar-width, 0px);
-  width: calc(100% - var(--dsh-sidebar-width, 0px));
-  transition:
-    margin-right var(--ds-transition-duration-slow) var(--ds-ease-in-out),
-    width var(--ds-transition-duration-slow) var(--ds-ease-in-out);
-}
-
-/* The AppFrame's center column, anchored by data attributes (see above).
-   Composite selector: DSH 0.1.x versions name the center grid item
-   `[data-pane="conversation"]`, while rc.8-era shells put a
-   `[data-slot="conversation"]` child inside it — both selectors resolve to
-   the SAME element on live pages (verified), and keeping both future-proofs
-   the rule against a host rename without touching shell-specific markup. */
-#root [data-dsh-frame] > [data-pane="conversation"],
-#root :has(> [data-slot="conversation"]) {
+/* The AppFrame's center column. The Sidebar shell's locator (Sidebar.tsx
+   locate/measureCenter, resolving via center-column.ts) tags the measured
+   column node with [data-dsh-center-col] — one attribute write per node
+   lifetime. The locator anchors on the conversation slot host
+   (`main.conversation` on DSH 0.1.5-alpha.2+, `conversation` on alpha.1)
+   and skips the transparent display:contents slot hosts above it. The rule
+   used to anchor on a structural has()-selector over the conversation slot
+   wrapper, whose match cache invalidates on every #root subtree mutation
+   (the streaming chat mutates it constantly), re-evaluating the selector
+   against the whole document; the tag is evaluated once per node instead.
+   A stretched grid item shrinks by its margins, so the conversation
+   content (output + input bar) lifts without touching the sidebars. */
+#root [data-dsh-center-col] {
   margin-bottom: var(--dsh-sidebar-height, 0px);
   /* Grid/flex items default to min-height:auto. A long unbreakable token
      (OAuth URL) then grows this column past the viewport and clips the
@@ -67,9 +51,7 @@ body[data-dsh-sidebar-collapsed] [data-slot="conversation.session.header"] > hea
   padding-right: 78px;
 }
 
-body[data-dsh-sidebar-dragging] #root,
-body[data-dsh-sidebar-dragging] #root [data-dsh-frame] > [data-pane="conversation"],
-body[data-dsh-sidebar-dragging] #root :has(> [data-slot="conversation"]) {
+body[data-dsh-sidebar-dragging] #root [data-dsh-center-col] {
   transition: none;
 }
 
@@ -93,9 +75,67 @@ body[data-dsh-sidebar-dragging] #root :has(> [data-slot="conversation"]) {
 }
 
 @media (prefers-reduced-motion: reduce) {
-  #root,
-  #root [data-dsh-frame] > [data-pane="conversation"],
-  #root :has(> [data-slot="conversation"]) {
+  #root [data-dsh-center-col] {
     transition: none;
   }
 }
+
+/* Context-menu submenu flip (viewport clamping for the portaled menus).
+ *
+ * The ui-primitives Menu clamps its main portal list into the viewport but
+ * positions nested submenus with static CSS only — anchored at the parent
+ * row's bottom, growing UP and to the RIGHT — with no clamp whatsoever.
+ * Both defaults are the worst case for our menus: a tall "open with" submenu
+ * escapes past the viewport top when the row menu opens near the top, and
+ * past the right edge in a narrow workbench pane (a pane can be far narrower
+ * than the card 218 + gap + submenu 165 a submenu needs).
+ *
+ * menu-flip.ts publishes `data-dsh-sidebar-submenu` on <body> — with the
+ * words "down" and/or "left" — for exactly the lifetime of one of OUR
+ * submenu-bearing menus (FileTree row menu, TabBar tab menu). The tokens
+ * flip the growth direction; the attribute's absence restores the
+ * primitive's own geometry untouched, and host-owned menus are never
+ * affected because they never open while the attribute exists (each side
+ * closes on the other's outside pointerdown).
+ *
+ * No max-height/overflow scroll cap here on purpose: overflow clipping
+ * would cut the submenu's ::before hover bridge (the corridor that keeps
+ * itemWrap's mouseleave from closing the card mid-crossing). */
+
+/* Visual tether, part 1 — the parent row stays lit while its submenu is
+ * open. The primitive only styles :hover, so once the pointer crossed into
+ * the side card the parent row's fill cleared and the floating card read as
+ * unrelated. The Menu marks the open parent row with aria-expanded="true"
+ * (host-rendered, stable), so the same hover token re-applies for the
+ * submenu's whole lifetime. */
+body[data-dsh-sidebar-submenu] div[role="menu"] button[aria-expanded="true"] {
+  background: var(--dsw-alias-interactive-bg-hover);
+}
+
+/* Visual tether, part 2 — the side card hugs its parent (10px → 4px gap),
+ * with the ::before hover corridor narrowed to match. Ordered BEFORE the
+ * flip overrides below so their left/right flips still win. */
+body[data-dsh-sidebar-submenu] div[role="menu"] div[role="menu"] {
+  left: calc(100% + 4px);
+}
+
+body[data-dsh-sidebar-submenu] div[role="menu"] div[role="menu"]::before {
+  left: -4px;
+  width: 4px;
+}
+
+body[data-dsh-sidebar-submenu~="down"] div[role="menu"] div[role="menu"] {
+  top: -4px;
+  bottom: auto;
+}
+
+body[data-dsh-sidebar-submenu~="left"] div[role="menu"] div[role="menu"] {
+  left: auto;
+  right: calc(100% + 4px);
+}
+
+/* The hover bridge follows the card to the left side of the parent row. */
+body[data-dsh-sidebar-submenu~="left"] div[role="menu"] div[role="menu"]::before {
+  left: auto;
+  right: -4px;
+}

src/client/lazy-chunk.tsx

@@ -22,12 +22,12 @@ interface LazyChunkViewProps<P> {
   props: P
 }
 
-function LazyChunkView<P>({ chunk, pick, props }: LazyChunkViewProps<P>): ReactNode {
+function LazyChunkView<P extends object>({ chunk, pick, props }: LazyChunkViewProps<P>): ReactNode {
   const [attempt, setAttempt] = useState(0)
   const [state, setState] = useState<
     | { status: 'loading' }
     | { status: 'error'; message: string }
-    | { status: 'ready'; Comp: ComponentType<any> }
+    | { status: 'ready'; Comp: ComponentType<P> }
   >({ status: 'loading' })
 
   useEffect(() => {

src/client/locales-ar.ts

@@ -18,8 +18,24 @@
 /** The ar dictionary (key-set-equal to zh, enforced by the type annotation in locales.ts). */
 export const ar: Record<string, string> = {
   files: 'الملفات',
+  changesSessionEmpty: 'لا توجد عمليات ملفات في هذه الجلسة بعد',
+  changesRead: 'قراءة',
+  changesMdReading: 'قراءة',
+  changesHtmlRender: "عرض",
+  changesHtmlRaw: "المصدر",
+  changesPdfRender: "عرض",
+  changesPdfRaw: "المصدر",
+  changesMdRaw: 'الخام',
+  changesWrite: 'كتابة',
+  changesEdit: 'تحرير',
+  changesRunning: 'قيد التنفيذ',
+  changesError: 'خطأ',
+  changesFold: '{count} أسطر… انقر للتوسيع',
+  changesFoldLoading: 'جارٍ التوسيع…',
+  changesFoldUnavailable: 'السياق غير متوفر',
+  changesContext: 'سياق',
+  changesPriorUnknown: 'المحتوى السابق خارج النافذة؛ يُعرض كما لو أُضيف بالكامل',
   explorer: 'المستكشف',
-  git: 'إدارة المصدر',
   terminal: 'الطرفية',
   editor: 'المحرّر',
   editorExplorer: 'سلوك فتح الملفات',
@@ -66,7 +82,6 @@ export const ar: Record<string, string> = {
   closeOtherTabs: 'إغلاق التبويبات الأخرى',
   closeLeftTabs: 'إغلاق التبويبات على اليسار',
   closeRightTabs: 'إغلاق التبويبات على اليمين',
-  moveToFreeWindow: 'النقل إلى نافذة حرة',
   floatDropHint: 'حرّك للفتح في نافذة حرة',
   dockToSidebar: 'العودة إلى الشريط الجانبي',
   pinTerminal: 'تثبيت الطرفية',
@@ -81,8 +96,6 @@ export const ar: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'مثبتة عام',
   pinnedRailLabel: 'الطرفيات المثبتة',
   closePinnedTerminal: 'إغلاق الطرفية',
-  collapse: 'طي الشريط الجانبي',
-  expand: 'توسيع الشريط الجانبي',
   collapseBottomPanel: 'طي اللوحة السفلية',
   expandBottomPanel: 'توسيع اللوحة السفلية',
   terminalError: 'فشل اتصال الطرفية',
@@ -91,6 +104,7 @@ export const ar: Record<string, string> = {
   terminalDepsFailed: 'فشل تحميل تبعية الطرفية node-pty',
   terminalDepsHint: 'شغّل الأمر التالي في طرفية أو cmd على جهاز DSH للإصلاح، ثم أعد المحاولة (يبقى node-pty متزامناً مع إصدار نواة DSH):',
   terminalDepsProfile: ' (الملف الشخصي المكتشف: {profile})',
+  terminalShellNotFound: 'لم يتم العثور على الصدفة المُعدَّة: {name} — تحقق من مسار الصدفة في الإعدادات → Side card → Terminal',
   preview: 'معاينة',
   toc: 'الفهرس',
   edit: 'تحرير',
@@ -129,7 +143,15 @@ export const ar: Record<string, string> = {
   worktree: 'شجرة العمل',
   checkoutError: 'فشل تبديل الفرع',
   history: 'السجل',
-  changes: 'التغييرات',
+  changes: 'تغييرات الملفات',
+  changesGitLens: 'Git',
+  changesSessionLens: 'الجلسة',
+  changesFilterAll: 'الكل',
+  changesFilterEmpty: 'لا توجد عمليات من هذا النوع',
+  changesOpenDiffTab: 'فتح في تبويب diff منفصل',
+  changesClosePreview: 'إغلاق المعاينة',
+  changesResizePreview: 'تغيير حجم المعاينة',
+  changesLoadError: 'سجلات ملفات الجلسة غير متاحة الآن',
   staged: 'مُدرج',
   unstaged: 'غير مُدرج',
   cancel: 'إلغاء',
@@ -177,6 +199,13 @@ export const ar: Record<string, string> = {
   addToConversation: 'إضافة إلى المحادثة',
   copyRelative: 'نسخ المسار النسبي',
   copyAbsolute: 'نسخ المسار المطلق',
+  rename: 'إعادة تسمية',
+  renameInvalid: 'لا يمكن أن يكون الاسم فارغًا أو يحتوي على فواصل مسار.',
+  delete: 'حذف',
+  deleteTitle: 'حذف «{name}»؟',
+  deleteDescFile: 'سيتم حذف هذا الملف نهائيًا. لا يمكن التراجع عن هذا الإجراء.',
+  deleteDescDir: 'سيتم حذف هذا الدليل وكل محتوياته نهائيًا. لا يمكن التراجع عن هذا الإجراء.',
+  dismiss: 'إغلاق',
   download: 'تنزيل',
   uploadFiles: 'رفع ملفات',
   uploadFolder: 'رفع مجلد',
@@ -195,13 +224,6 @@ export const ar: Record<string, string> = {
   settingsIntro: 'إدارة ما تعرضه البطاقة الجانبية وكيف تتصرف',
   settingsPopupDesc: 'تكوين خيارات ذات صلة بـ {feature}',
   settingsDone: 'تم',
-  settingsOpenTitle: 'فتح افتراضياً للمحادثات الجديدة',
-  settingsOpenDesc: 'توسيع البطاقة الجانبية تلقائياً للمحادثات الجديدة تماماً؛ المحادثات الموجودة تحتفظ بتخطيطاتها',
-  settingsWidthTitle: 'الحصة الافتراضية للعرض',
-  settingsWidthDesc: 'الحصة الافتراضية للبطاقة الجانبية من عرض النافذة للمحادثات الجديدة (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'فتح ملفات المحادثة في الشريط الجانبي',
-  settingsOpenPathDesc: 'فتح روابط الملفات في المحادثة (صفوف الأدوات، الملفات الناتجة، الإشارات) في محرّر الشريط الجانبي بدلاً من التطبيق الافتراضي للنظام',
   settingsOpenToolsTitle: 'حقن أداة فتح الشريط الجانبي للنموذج',
   settingsOpenToolsDesc: 'عند التفعيل، يمكن للنموذج فتح الملفات والمجلدات وصفحات HTTP(S) في الشريط الجانبي عبر أداة sidebar_open (معطّل افتراضياً)',
   settingsTitleBarTitle: 'وضع توافق الموضع',
@@ -222,10 +244,10 @@ export const ar: Record<string, string> = {
   settingsConflict: 'تغيّر الإعداد في نافذة أخرى — يُرجى إعادة المحاولة',
   binaryNoPreview: 'لا يمكن معاينة هذا النوع من الملفات',
   downloadToView: 'تنزيل للعرض',
-  settingsSubagentTitle: 'فتح صفحة المهام تلقائياً عند ظهور وكيل فرعي',
-  settingsSubagentDesc: 'توسيع البطاقة الجانبية وفتح صفحة المهام عند توليد المحادثة الحالية لوكيل فرعي جديد؛ أوقفها للفتح يدوياً',
-  settingsJobsTitle: 'فتح صفحة المهام الخلفية تلقائياً عند مهمة خلفية جديدة',
-  settingsJobsDesc: 'توسيع البطاقة الجانبية وفتح صفحة المهام الخلفية عند ظهور مهمة خلفية جديدة للمحادثة الحالية (كل مهمة جديدة تُطلق ذلك)؛ أوقفها للفتح يدوياً',
+  settingsSubagentTitle: 'تفعيل صفحة المهام تلقائياً عند ظهور وكيل فرعي',
+  settingsSubagentDesc: 'تُفعَّل صفحة المهام عندما تُنشئ المحادثة الحالية وكيلاً فرعياً جديداً؛ في الشاشات العريضة تُوسَّع البطاقة الجانبية أيضاً، أما في الشاشات الضيقة فلا يُفرض فتح الدرج بملء الشاشة؛ عند إيقاف الخيار يصبح الفتح يدوياً',
+  settingsJobsTitle: 'تفعيل صفحة المهام تلقائياً عند ظهور مهمة خلفية جديدة',
+  settingsJobsDesc: 'تُفعَّل صفحة المهام كلما ظهرت مهمة خلفية جديدة للمحادثة الحالية (كل مهمة جديدة تُطلق التفعيل)؛ في الشاشات العريضة تُوسَّع البطاقة الجانبية أيضاً، أما في الشاشات الضيقة فلا يُفرض فتح الدرج بملء الشاشة؛ عند إيقاف الخيار يصبح الفتح يدوياً',
   settingsToolsTitle: 'حقن أدوات الطرفية للنموذج',
   settingsToolsDesc: 'عند التفعيل، يمكن للنموذج إنشاء وتشغيل طرفيات الشريط الجانبي عبر أدوات terminal_* الثمانية (معطّل افتراضياً)',
   settingsFenceTitle: 'فحص مسارات مساحة العمل',
@@ -329,6 +351,25 @@ export const ar: Record<string, string> = {
   sideChatClose: 'إغلاق الخيط',
   sideChatCloseTitle: 'تحرير وكيل الخيط (يُحتفظ بالسجل)',
   sideChatError: 'خطأ في المحادثة الجانبية: {message}',
+  sideChatTurnUsage: 'إدخال {input} توكن · إخراج {output} توكن',
+  sideChatBlockCollapse: 'طي',
+  sideChatBlockCollapseAria: 'طي',
+  sideChatBlockExpand: 'توسيع {hidden} أسطر',
+  sideChatBlockExpandAria: 'توسيع {hidden} أسطر إضافية',
+  sideChatBlockSignal: 'أُنهي بالإشارة: {signal}',
+  sideChatBlockExitCode: 'رمز الخروج {code}',
+  sideChatBlockRunning: 'قيد التشغيل',
+  sideChatBlockFailed: 'فشل',
+  sideChatBlockDone: 'اكتمل',
+  sideChatBlockNoOutput: '(لا يوجد إخراج)',
+  sideChatBlockFiles: '{count} ملفات',
+  sideChatBlockWindow: '{shown} من {total} سطرًا',
+  sideChatConnDisconnected: 'انقطع الاتصال',
+  sideChatConnReconnect: 'إعادة الاتصال',
+  sideChatConnConnecting: 'جارٍ إعادة الاتصال…',
+  sideChatConnRecovered: 'تم استعادة الاتصال',
+  sideChatConnReconnectAction: 'إعادة الاتصال الآن',
+  sideChatConnRestartAction: 'بدء الاتصال من جديد',
   jobs: 'المهام الخلفية',
   jobsCount: '{count} مهمة خلفية',
   jobsCountRunning: '{count} مهمة خلفية · {running} قيد التشغيل',
@@ -381,4 +422,29 @@ export const ar: Record<string, string> = {
   pluginDocsPanelDesc: '«وثائق عامة» في شريط DSH الجانبي: ملاحظات Markdown عامة، قابلة للقراءة من أي مساحة عمل — قائمة ملفات، مخطط تفصيلي، فتح في Chrome / VS Code، وأزرار نسخ؛ دليل الوثائق قابل للتكوين (الافتراضي ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'متصفح الوكيل لـ DeepSeek Harness: 32 أداة ego_* تقود متصفح Chromium حقيقي، مع تبويب «متصفح ego» أصلي في الشريط الجانبي يعرض مباشرة كل صفحة يزورها الوكيل — يمكنك النقر والسحب والكتابة لتولي التحكم. يسجّل التبويب تلقائيًا عند وجود better-sidebar، وإلا يظهر كفقاعة عائمة',
   pluginBilingualReaderDesc: 'اقرأ ملفات PDF في الشريط الجانبي لـ DSH: عرض PDF أصلي، حدد نصًا لترجمته بواسطة النموذج اللغوي مع السياق، معزولًا تمامًا عن المحادثة الرئيسية',
+  changesRedactOn: "تنقيع مُفعّل: تظهر الأسرار كـ [REDACTED]؛ انقر للتعطيل (على مسؤوليتك)",
+  changesRedactOff: "تنقيع مُعطّل: سيُعرض المحتوى كما هو؛ انقر للتفعيل",
+  changesRedactOnLabel: "تنقيع",
+  changesRedactOffLabel: "بدون تنقيع",
+  changesRedactBanner: "مُنقّى",
+  pluginSentinelName: 'dsh-sentinel نظام الاستيقاظ',
+  pluginEgoBrowserName: 'ego-browser متصفح الوكيل',
+  pluginBetterOverleafName: 'dsh-better-overleaf تبويب Overleaf',
+  pluginDocsPanelName: 'dsh-docs-panel مستندات عامة',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge بيانات اعتماد Git',
+  pluginGitRemotesName: 'dsh-git-remotes أجهزة Git البعيدة',
+  pluginGithubWorkbenchName: 'dsh-github-workbench منصة GitHub',
+  pluginSidebarQaName: 'dsh-sidebar-qa تحديد وسؤال',
+  pluginSidenoteName: 'dsh-sidenote محادثة جانبية',
+  pluginServerDeckName: 'dsh-server-deck لوحة الخوادم',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel نفق SSH',
+  pluginTurnReviewName: 'dsh-turn-review مراجعة الجولة',
+  pluginBilingualReaderName: 'dsh-bilingual-reader قارئ ثنائي اللغة',
+  pluginOfficeName: 'معاينة Office',
+  pluginMdExportName: 'تصدير Markdown',
+  pluginCodeNavName: 'مستكشف معاينة الكود',
+  pluginVideoPreviewName: 'معاينة الفيديو',
+  presetDshDesktopDesc: 'وضع Electron المتقدم (بلا إطار): يحجز macOS شريطًا علويًا بمقدار 20px، ويحجز Windows بمقدار 32px لشريط العنوان عند غياب WCO',
 }

src/client/locales-de.ts

@@ -3,8 +3,24 @@
  */
 export const de: Record<string, string> = {
   files: 'Dateien',
+  changesSessionEmpty: 'Noch keine Dateioperationen in dieser Sitzung',
+  changesRead: 'Lesen',
+  changesMdReading: 'Lesen',
+  changesHtmlRender: "Rendern",
+  changesHtmlRaw: "Quelltext",
+  changesPdfRender: "Rendern",
+  changesPdfRaw: "Quelltext",
+  changesMdRaw: 'Rohfassung',
+  changesWrite: 'Schreiben',
+  changesEdit: 'Bearbeiten',
+  changesRunning: 'läuft',
+  changesError: 'Fehler',
+  changesFold: '{count} Zeilen… zum Aufklappen klicken',
+  changesFoldLoading: 'Wird aufgeklappt…',
+  changesFoldUnavailable: 'Kontext nicht verfügbar',
+  changesContext: 'Kontext',
+  changesPriorUnknown: 'Inhalt vor der Änderung liegt außerhalb des Fensters; als vollständig neu angezeigt',
   explorer: 'Explorer',
-  git: 'Quellcodeverwaltung',
   terminal: 'Terminal',
   editor: 'Editor',
   editorExplorer: 'Dateiöffnungsverhalten',
@@ -51,7 +67,6 @@ export const de: Record<string, string> = {
   closeOtherTabs: 'Andere Tabs schließen',
   closeLeftTabs: 'Tabs links schließen',
   closeRightTabs: 'Tabs rechts schließen',
-  moveToFreeWindow: 'In freies Fenster verschieben',
   floatDropHint: 'Loslassen, um in einem freien Fenster zu öffnen',
   dockToSidebar: 'Zurück zur Seitenleiste',
   pinTerminal: 'Terminal anheften',
@@ -66,8 +81,6 @@ export const de: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Global angeheftet',
   pinnedRailLabel: 'Angeheftete Terminals',
   closePinnedTerminal: 'Terminal schließen',
-  collapse: 'Seitenleiste einklappen',
-  expand: 'Seitenleiste ausklappen',
   collapseBottomPanel: 'Unteres Panel einklappen',
   expandBottomPanel: 'Unteres Panel ausklappen',
   terminalError: 'Terminalverbindung fehlgeschlagen',
@@ -76,6 +89,7 @@ export const de: Record<string, string> = {
   terminalDepsFailed: 'Die Terminal-Abhängigkeit node-pty konnte nicht geladen werden',
   terminalDepsHint: 'Führen Sie den folgenden Befehl in einem Terminal oder in cmd auf dem DSH-System aus, um dies zu beheben, und klicken Sie dann auf „Erneut versuchen“ (node-pty bleibt mit der DSH-Core-Version synchron):',
   terminalDepsProfile: ' (erkanntes Profil: {profile})',
+  terminalShellNotFound: 'Konfigurierte Shell nicht gefunden: {name} — Shell-Pfad unter Einstellungen → Side card → Terminal prüfen',
   preview: 'Vorschau',
   toc: 'Inhaltsverzeichnis',
   edit: 'Bearbeiten',
@@ -114,7 +128,15 @@ export const de: Record<string, string> = {
   worktree: 'Worktree',
   checkoutError: 'Branchenwechsel fehlgeschlagen',
   history: 'Verlauf',
-  changes: 'Änderungen',
+  changes: 'Dateiänderungen',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Sitzung',
+  changesFilterAll: 'Alle',
+  changesFilterEmpty: 'Keine Vorgänge dieser Art',
+  changesOpenDiffTab: 'In eigenem Tab öffnen',
+  changesClosePreview: 'Vorschau schließen',
+  changesResizePreview: 'Vorschauhöhe anpassen',
+  changesLoadError: 'Sitzungsdatei-Aufzeichnungen sind derzeit nicht verfügbar',
   staged: 'Gestaged',
   unstaged: 'Nicht gestaged',
   cancel: 'Abbrechen',
@@ -162,6 +184,13 @@ export const de: Record<string, string> = {
   addToConversation: 'Zur Unterhaltung hinzufügen',
   copyRelative: 'Relativen Pfad kopieren',
   copyAbsolute: 'Absoluten Pfad kopieren',
+  rename: 'Umbenennen',
+  renameInvalid: 'Der Name darf nicht leer sein und keine Pfadtrenner enthalten.',
+  delete: 'Löschen',
+  deleteTitle: '„{name}“ löschen?',
+  deleteDescFile: 'Dadurch wird die Datei dauerhaft gelöscht. Dies kann nicht rückgängig gemacht werden.',
+  deleteDescDir: 'Dadurch werden das Verzeichnis und dessen gesamter Inhalt dauerhaft gelöscht. Dies kann nicht rückgängig gemacht werden.',
+  dismiss: 'Schließen',
   download: 'Herunterladen',
   uploadFiles: 'Dateien hochladen',
   uploadFolder: 'Ordner hochladen',
@@ -180,13 +209,6 @@ export const de: Record<string, string> = {
   settingsIntro: 'Verwalten Sie, was die Seitenkarte anzeigt und wie sie sich verhält',
   settingsPopupDesc: 'Optionen für „{feature}“ konfigurieren',
   settingsDone: 'Fertig',
-  settingsOpenTitle: 'Für neue Unterhaltungen standardmäßig geöffnet',
-  settingsOpenDesc: 'Die Seitenkarte wird für brandneue Unterhaltungen automatisch ausgeklappt; bestehende Unterhaltungen behalten ihr eigenes Layout',
-  settingsWidthTitle: 'Standardbreite',
-  settingsWidthDesc: 'Standardanteil der Seitenkarte an der Fensterbreite für neue Unterhaltungen (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Chat-Dateien in der Seitenleiste öffnen',
-  settingsOpenPathDesc: 'Dateilinks im Chat (Werkzeugzeilen, erstellte Dateien, Erwähnungen) werden im Seitenleisten-Editor geöffnet statt in der System-Standardanwendung',
   settingsOpenToolsTitle: 'Seitenleisten-Öffnungswerkzeug für das Modell bereitstellen',
   settingsOpenToolsDesc: 'Wenn aktiviert, kann das Modell über das sidebar_open-Werkzeug Dateien, Ordner und HTTP(S)-Seiten in der Seitenleiste öffnen (standardmäßig deaktiviert)',
   settingsTitleBarTitle: 'Kompatibilitätsmodus der Position',
@@ -207,10 +229,10 @@ export const de: Record<string, string> = {
   settingsConflict: 'Die Einstellung wurde in einem anderen Fenster geändert – bitte erneut versuchen',
   binaryNoPreview: 'Dieser Dateityp kann nicht in der Vorschau angezeigt werden',
   downloadToView: 'Zum Ansehen herunterladen',
-  settingsSubagentTitle: 'Aufgaben-Seite bei einem Subagenten automatisch öffnen',
-  settingsSubagentDesc: 'Die Seitenkarte wird ausgeklappt und die Aufgaben-Seite geöffnet, wenn die aktuelle Unterhaltung einen neuen Subagenten erzeugt; ausschalten, um sie manuell zu öffnen',
-  settingsJobsTitle: 'Aufgaben-Seite bei einer neuen Hintergrundaufgabe automatisch öffnen',
-  settingsJobsDesc: 'Die Seitenkarte wird ausgeklappt und die Aufgaben-Seite geöffnet, sobald für die aktuelle Unterhaltung eine neue Hintergrundaufgabe erscheint (jede neue Aufgabe löst dies aus); ausschalten, um sie manuell zu öffnen',
+  settingsSubagentTitle: 'Aufgaben-Seite bei einem neuen Subagenten automatisch aktivieren',
+  settingsSubagentDesc: 'Die Aufgaben-Seite aktivieren, wenn die aktuelle Unterhaltung einen neuen Subagenten erzeugt; auf breiten Ansichten wird zusätzlich die Seitenkarte ausgeklappt, auf schmalen Ansichten wird das Öffnen der Vollbild-Schublade nicht erzwungen; ausschalten, um sie manuell zu öffnen',
+  settingsJobsTitle: 'Aufgaben-Seite bei einer neuen Hintergrundaufgabe automatisch aktivieren',
+  settingsJobsDesc: 'Die Aufgaben-Seite aktivieren, sobald für die aktuelle Unterhaltung eine neue Hintergrundaufgabe erscheint (jede neue Aufgabe löst dies aus); auf breiten Ansichten wird zusätzlich die Seitenkarte ausgeklappt, auf schmalen Ansichten wird das Öffnen der Vollbild-Schublade nicht erzwungen; ausschalten, um sie manuell zu öffnen',
   settingsToolsTitle: 'Terminal-Werkzeuge für das Modell bereitstellen',
   settingsToolsDesc: 'Wenn aktiviert, kann das Modell über die 8 terminal_*-Werkzeuge Terminale in der Seitenleiste erstellen und steuern (standardmäßig deaktiviert)',
   settingsFenceTitle: 'Workspace-Pfadkontrolle',
@@ -314,6 +336,25 @@ export const de: Record<string, string> = {
   sideChatClose: 'Thread schließen',
   sideChatCloseTitle: 'Den Agenten des Threads freigeben (Verlauf bleibt erhalten)',
   sideChatError: 'Seitenchat-Fehler: {message}',
+  sideChatTurnUsage: 'Eingabe {input} tok · Ausgabe {output} tok',
+  sideChatBlockCollapse: 'Einklappen',
+  sideChatBlockCollapseAria: 'Einklappen',
+  sideChatBlockExpand: '{hidden} Zeilen ausklappen',
+  sideChatBlockExpandAria: '{hidden} weitere Zeilen ausklappen',
+  sideChatBlockSignal: 'Durch Signal beendet: {signal}',
+  sideChatBlockExitCode: 'Exit-Code {code}',
+  sideChatBlockRunning: 'Läuft',
+  sideChatBlockFailed: 'Fehlgeschlagen',
+  sideChatBlockDone: 'Fertig',
+  sideChatBlockNoOutput: '(keine Ausgabe)',
+  sideChatBlockFiles: '{count} Dateien',
+  sideChatBlockWindow: '{shown} von {total} Zeilen',
+  sideChatConnDisconnected: 'Verbindung verloren',
+  sideChatConnReconnect: 'Neu verbinden',
+  sideChatConnConnecting: 'Verbinde neu…',
+  sideChatConnRecovered: 'Verbindung wiederhergestellt',
+  sideChatConnReconnectAction: 'Jetzt neu verbinden',
+  sideChatConnRestartAction: 'Verbindung neu aufbauen',
   jobs: 'Hintergrundaufgaben',
   jobsCount: '{count} Hintergrundaufgaben',
   jobsCountRunning: '{count} Hintergrundaufgaben · {running} läuft',
@@ -366,4 +407,29 @@ export const de: Record<string, string> = {
   pluginDocsPanelDesc: '„Globale Dokumente“ in der DSH-Seitenleiste: eigene Markdown-Notizen aus jedem Arbeitsbereich lesen – Dateiliste, Gliederung, Öffnen in Chrome / VS Code und Kopieren-Buttons; das Dokumentenverzeichnis ist konfigurierbar (Standard ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'Der Agent-Browser für DeepSeek Harness: 32 ego_*-Tools steuern ein echtes Chromium; ein nativer „ego-Browser“-Tab in der Seitenleiste zeigt live jede Seite, die der Agent besucht – Klicken, Ziehen und Tippen zum Übernehmen. Registriert den Tab automatisch, wenn better-sidebar vorhanden ist, sonst eine schwebende Blase',
   pluginBilingualReaderDesc: 'PDFs im DSH-Seitenbereich lesen: native PDF-Anzeige, Text auswählen und mit dem LLM übersetzen — mit Kontext, vollständig vom Hauptgespräch isoliert',
+  changesRedactOn: "Schwärzung aktiv: Geheimnisse als [REDACTED]; Klicken zum Deaktivieren (auf eigenes Risiko)",
+  changesRedactOff: "Schwärzung aus: Inhalte werden unverändert angezeigt; Klicken zum Aktivieren",
+  changesRedactOnLabel: "Schwärzung",
+  changesRedactOffLabel: "Ohne Schwärzung",
+  changesRedactBanner: "Geschwärzt",
+  pluginSentinelName: 'dsh-sentinel Wecksystem',
+  pluginEgoBrowserName: 'ego-browser Agent-Browser',
+  pluginBetterOverleafName: 'dsh-better-overleaf Overleaf-Tab',
+  pluginDocsPanelName: 'dsh-docs-panel Globale Dokumente',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Git-Zugangsdaten',
+  pluginGitRemotesName: 'dsh-git-remotes Git-Remotes',
+  pluginGithubWorkbenchName: 'dsh-github-workbench GitHub-Workbench',
+  pluginSidebarQaName: 'dsh-sidebar-qa Auswählen & Fragen',
+  pluginSidenoteName: 'dsh-sidenote Seiten-Chat',
+  pluginServerDeckName: 'dsh-server-deck Server-Deck',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH-Tunnel',
+  pluginTurnReviewName: 'dsh-turn-review Runden-Review',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Zweisprachiger Reader',
+  pluginOfficeName: 'Office-Vorschau',
+  pluginMdExportName: 'Markdown-Export',
+  pluginCodeNavName: 'Code-Vorschau-Navigation',
+  pluginVideoPreviewName: 'Video-Vorschau',
+  presetDshDesktopDesc: 'Elektronischer Erweiterte-Modus (rahmenlos): macOS reserviert oben 20px; Windows reserviert ohne WCO 32px für die Titelleiste',
 }

src/client/locales-fr.ts

@@ -10,8 +10,24 @@
 /** fr dictionary for the `betterSidebar` namespace. */
 export const fr: Record<string, string> = {
   files: 'Fichiers',
+  changesSessionEmpty: 'Aucune opération de fichier dans cette session',
+  changesRead: 'Lecture',
+  changesMdReading: 'Lecture',
+  changesHtmlRender: "Rendu",
+  changesHtmlRaw: "Source",
+  changesPdfRender: "Rendu",
+  changesPdfRaw: "Source",
+  changesMdRaw: 'Brut',
+  changesWrite: 'Écriture',
+  changesEdit: 'Modification',
+  changesRunning: 'en cours',
+  changesError: 'erreur',
+  changesFold: '{count} lignes… cliquer pour déplier',
+  changesFoldLoading: 'Dépliage…',
+  changesFoldUnavailable: 'Contexte indisponible',
+  changesContext: 'contexte',
+  changesPriorUnknown: 'Le contenu antérieur est hors de la fenêtre ; affiché comme entièrement ajouté',
   explorer: 'Explorateur',
-  git: 'Gestion de code source',
   terminal: 'Terminal',
   editor: 'Éditeur',
   editorExplorer: 'Comportement d’ouverture des fichiers',
@@ -58,7 +74,6 @@ export const fr: Record<string, string> = {
   closeOtherTabs: 'Fermer les autres onglets',
   closeLeftTabs: 'Fermer les onglets à gauche',
   closeRightTabs: 'Fermer les onglets à droite',
-  moveToFreeWindow: 'Déplacer vers la fenêtre flottante',
   floatDropHint: 'Relâchez pour ouvrir dans une fenêtre flottante',
   dockToSidebar: 'Revenir à la barre latérale',
   pinTerminal: 'Épingler le terminal',
@@ -73,8 +88,6 @@ export const fr: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Épinglé globalement',
   pinnedRailLabel: 'Terminaux épinglés',
   closePinnedTerminal: 'Fermer le terminal',
-  collapse: 'Réduire la barre latérale',
-  expand: 'Déployer la barre latérale',
   collapseBottomPanel: 'Réduire le panneau inférieur',
   expandBottomPanel: 'Déployer le panneau inférieur',
   terminalError: 'Échec de la connexion au terminal',
@@ -83,6 +96,7 @@ export const fr: Record<string, string> = {
   terminalDepsFailed: 'Échec du chargement de la dépendance terminal node-pty',
   terminalDepsHint: 'Exécutez la commande suivante dans un terminal ou cmd de l’environnement DSH pour réparer, puis cliquez sur Réessayer (node-pty reste à la même version que le cœur DSH) :',
   terminalDepsProfile: ' (profil détecté : {profile})',
+  terminalShellNotFound: 'Shell configuré introuvable : {name} — vérifiez le chemin du shell dans Réglages → Side card → Terminal',
   preview: 'Aperçu',
   toc: 'Sommaire',
   edit: 'Modifier',
@@ -122,6 +136,14 @@ export const fr: Record<string, string> = {
   checkoutError: 'Échec du changement de branche',
   history: 'Historique',
   changes: 'Modifications',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Session',
+  changesFilterAll: 'Tout',
+  changesFilterEmpty: 'Aucune opération de ce type',
+  changesOpenDiffTab: 'Ouvrir dans un onglet diff',
+  changesClosePreview: 'Fermer l\'aperçu',
+  changesResizePreview: 'Redimensionner l\'aperçu',
+  changesLoadError: 'Les enregistrements de fichiers de la session sont indisponibles',
   staged: 'En scène',
   unstaged: 'Hors scène',
   cancel: 'Annuler',
@@ -169,6 +191,13 @@ export const fr: Record<string, string> = {
   addToConversation: 'Ajouter à la discussion',
   copyRelative: 'Copier le chemin relatif',
   copyAbsolute: 'Copier le chemin absolu',
+  rename: 'Renommer',
+  renameInvalid: 'Le nom ne peut pas être vide ni contenir de séparateurs de chemin.',
+  delete: 'Supprimer',
+  deleteTitle: 'Supprimer « {name} » ?',
+  deleteDescFile: 'Ce fichier sera définitivement supprimé. Cette action est irréversible.',
+  deleteDescDir: 'Ce répertoire et tout son contenu seront définitivement supprimés. Cette action est irréversible.',
+  dismiss: 'Fermer',
   download: 'Télécharger',
   uploadFiles: 'Importer des fichiers',
   uploadFolder: 'Importer un dossier',
@@ -187,13 +216,6 @@ export const fr: Record<string, string> = {
   settingsIntro: 'Gérer le contenu affiché par la carte latérale et son comportement par défaut',
   settingsPopupDesc: 'Configurer les options liées à « {feature} »',
   settingsDone: 'Terminé',
-  settingsOpenTitle: 'Ouvert par défaut pour les nouvelles sessions',
-  settingsOpenDesc: 'Déployer automatiquement la carte latérale lors de la création d’une session ; les sessions existantes conservent chacune leur disposition',
-  settingsWidthTitle: 'Part de largeur par défaut',
-  settingsWidthDesc: 'Pourcentage de la largeur de la fenêtre occupé par la carte latérale pour les nouvelles sessions (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Ouvrir les fichiers de discussion dans la barre latérale',
-  settingsOpenPathDesc: 'À la place de l’application par défaut du système, ouvrir dans l’éditeur de la barre latérale les liens vers les fichiers du chat (lignes d’outils, listes de produits, mentions de fichiers)',
   settingsOpenToolsTitle: 'Injecter l\'outil d\'ouverture latérale pour le modèle',
   settingsOpenToolsDesc: 'Une fois activé, le modèle peut ouvrir des fichiers, dossiers et pages HTTP(S) dans la barre latérale via l\'outil sidebar_open (désactivé par défaut)',
   settingsTitleBarTitle: 'Mode de compatibilité de position',
@@ -214,10 +236,10 @@ export const fr: Record<string, string> = {
   settingsConflict: 'Les réglages ont été modifiés par une autre fenêtre, veuillez réessayer',
   binaryNoPreview: 'Ce type de fichier ne prend pas en charge l’aperçu',
   downloadToView: 'Télécharger pour consulter',
-  settingsSubagentTitle: 'Déployer automatiquement la page de gestion des tâches à la détection d’un sous-agent',
-  settingsSubagentDesc: 'Lorsque la session actuelle produit un nouveau sous-agent, déployer automatiquement la barre latérale et ouvrir la page de gestion des tâches ; une fois désactivé, l’ouverture est manuelle',
-  settingsJobsTitle: 'Déployer automatiquement la page des tâches d’arrière-plan sur nouvelle tâche',
-  settingsJobsDesc: 'Lorsque la session actuelle produit une nouvelle tâche d’arrière-plan, déployer automatiquement la barre latérale et ouvrir la page des tâches (déclenché à chaque nouvelle tâche) ; une fois désactivé, l’ouverture est manuelle',
+  settingsSubagentTitle: 'Activer automatiquement la page Gestion des tâches lorsqu’un sous-agent apparaît',
+  settingsSubagentDesc: 'Lorsqu’un nouveau sous-agent est créé dans la session actuelle, activer la page Gestion des tâches ; sur les écrans larges, déployer également la carte latérale ; sur les écrans étroits, ne pas forcer l’ouverture du tiroir plein écran ; une fois l’option désactivée, l’ouverture est manuelle',
+  settingsJobsTitle: 'Activer automatiquement la page Gestion des tâches à l’arrivée d’une tâche d’arrière-plan',
+  settingsJobsDesc: 'À chaque nouvelle tâche d’arrière-plan dans la session actuelle, activer la page Gestion des tâches (chaque nouvelle tâche déclenche l’activation) ; sur les écrans larges, déployer également la carte latérale ; sur les écrans étroits, ne pas forcer l’ouverture du tiroir plein écran ; une fois l’option désactivée, l’ouverture est manuelle',
   settingsToolsTitle: 'Injecter des outils de terminal au modèle',
   settingsToolsDesc: 'Une fois activé, le modèle peut créer et piloter des terminaux de la barre latérale via les 8 outils terminal_* (désactivé par défaut)',
   settingsFenceTitle: 'Contrôle des chemins de l\'espace de travail',
@@ -321,6 +343,25 @@ export const fr: Record<string, string> = {
   sideChatClose: 'Fermer le fil',
   sideChatCloseTitle: 'Libérer l’agent du fil (l’historique est conservé)',
   sideChatError: 'Erreur de la discussion latérale : {message}',
+  sideChatTurnUsage: 'Entrée {input} tok · Sortie {output} tok',
+  sideChatBlockCollapse: 'Réduire',
+  sideChatBlockCollapseAria: 'Réduire',
+  sideChatBlockExpand: 'Déplier {hidden} lignes',
+  sideChatBlockExpandAria: 'Déplier {hidden} lignes de plus',
+  sideChatBlockSignal: 'Terminé par le signal : {signal}',
+  sideChatBlockExitCode: 'Code de sortie {code}',
+  sideChatBlockRunning: 'En cours',
+  sideChatBlockFailed: 'Échec',
+  sideChatBlockDone: 'Terminé',
+  sideChatBlockNoOutput: '(aucune sortie)',
+  sideChatBlockFiles: '{count} fichiers',
+  sideChatBlockWindow: '{shown} sur {total} lignes',
+  sideChatConnDisconnected: 'Connexion perdue',
+  sideChatConnReconnect: 'Reconnecter',
+  sideChatConnConnecting: 'Reconnexion…',
+  sideChatConnRecovered: 'Connexion rétablie',
+  sideChatConnReconnectAction: 'Reconnecter maintenant',
+  sideChatConnRestartAction: 'Relancer la connexion',
   jobs: 'Tâches d’arrière-plan',
   jobsCount: '{count} tâche(s) d’arrière-plan',
   jobsCountRunning: '{count} tâche(s) d’arrière-plan · {running} en cours',
@@ -373,4 +414,29 @@ export const fr: Record<string, string> = {
   pluginDocsPanelDesc: '« Documentation globale » dans la barre latérale DSH : notes Markdown globales, lisibles depuis n’importe quel espace de travail — sélection dans la liste, saut via le plan flottant, ouverture externe Chrome / VS Code, copie de code, répertoire configurable (défaut ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'Le navigateur d’agent pour DeepSeek Harness : 32 outils ego_* pilotent un vrai Chromium ; un onglet natif « ego browser » dans la barre latérale montre en direct chaque page visitée par l’agent — cliquez, glissez et tapez pour reprendre la main. Enregistre l’onglet automatiquement si better-sidebar est présent, sinon une bulle flottante',
   pluginBilingualReaderDesc: 'Lire des PDF dans la barre latérale DSH : affichage PDF natif, sélectionnez du texte pour le traduire avec le LLM, avec contexte et totalement isolé de la conversation principale',
+  changesRedactOn: "Masquage actif : les secrets s'affichent en [REDACTED] ; cliquez pour désactiver (à vos risques)",
+  changesRedactOff: "Masquage désactivé : le contenu s'affiche tel quel ; cliquez pour activer",
+  changesRedactOnLabel: "Masquage",
+  changesRedactOffLabel: "Sans masquage",
+  changesRedactBanner: "Masqué",
+  pluginSentinelName: 'dsh-sentinel Système de réveil',
+  pluginEgoBrowserName: 'ego-browser Navigateur d’agents',
+  pluginBetterOverleafName: 'dsh-better-overleaf Onglet Overleaf',
+  pluginDocsPanelName: 'dsh-docs-panel Docs globales',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Identifiants Git',
+  pluginGitRemotesName: 'dsh-git-remotes Dépôts distants Git',
+  pluginGithubWorkbenchName: 'dsh-github-workbench Atelier GitHub',
+  pluginSidebarQaName: 'dsh-sidebar-qa Sélectionner & demander',
+  pluginSidenoteName: 'dsh-sidenote Chat latéral',
+  pluginServerDeckName: 'dsh-server-deck Tableau de bord serveurs',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel Tunnel SSH',
+  pluginTurnReviewName: 'dsh-turn-review Revue du tour',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Lecteur bilingue',
+  pluginOfficeName: 'Aperçu Office',
+  pluginMdExportName: 'Exportation Markdown',
+  pluginCodeNavName: 'Navigateur d’aperçu de code',
+  pluginVideoPreviewName: 'Aperçu vidéo',
+  presetDshDesktopDesc: 'Mode avancé Electron (sans bordure) : macOS réserve 20px en haut ; Windows réserve 32px pour la barre de titre sans WCO',
 }

src/client/locales-hi.ts

@@ -17,8 +17,24 @@
 /** The hi dictionary (key-set-equal to zh, enforced by the type annotation in locales.ts). */
 export const hi: Record<string, string> = {
   files: 'फ़ाइलें',
+  changesSessionEmpty: 'इस सत्र में अभी कोई फ़ाइल ऑपरेशन नहीं',
+  changesRead: 'पढ़ना',
+  changesMdReading: 'पठन',
+  changesHtmlRender: "रेंडर",
+  changesHtmlRaw: "मूल",
+  changesPdfRender: "रेंडर",
+  changesPdfRaw: "मूल",
+  changesMdRaw: 'मूल पाठ',
+  changesWrite: 'लिखना',
+  changesEdit: 'संपादन',
+  changesRunning: 'चल रहा है',
+  changesError: 'त्रुटि',
+  changesFold: '{count} पंक्तियाँ… विस्तार के लिए क्लिक करें',
+  changesFoldLoading: 'विस्तार हो रहा है…',
+  changesFoldUnavailable: 'संदर्भ अनुपलब्ध',
+  changesContext: 'संदर्भ',
+  changesPriorUnknown: 'बदलाव से पहले की सामग्री विंडो में नहीं है; पूरी नई जोड़ी गई दिखाई जाती है',
   explorer: 'एक्सप्लोरर',
-  git: 'सोर्स कंट्रोल',
   terminal: 'टर्मिनल',
   editor: 'एडिटर',
   editorExplorer: 'फ़ाइल खोलने का तरीका',
@@ -65,7 +81,6 @@ export const hi: Record<string, string> = {
   closeOtherTabs: 'अन्य टैब बंद करें',
   closeLeftTabs: 'बाएँ टैब बंद करें',
   closeRightTabs: 'दाएँ टैब बंद करें',
-  moveToFreeWindow: 'फ़्री विंडो में ले जाएँ',
   floatDropHint: 'फ़्री विंडो में खोलने के लिए छोड़ें',
   dockToSidebar: 'साइडबार पर वापस जाएँ',
   pinTerminal: 'टर्मिनल पिन करें',
@@ -80,8 +95,6 @@ export const hi: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'वैश्विक रूप से पिन किया गया',
   pinnedRailLabel: 'पिन किए गए टर्मिनल',
   closePinnedTerminal: 'टर्मिनल बंद करें',
-  collapse: 'साइडबार संक्षिप्त करें',
-  expand: 'साइडबार विस्तृत करें',
   collapseBottomPanel: 'निचला पैनल संक्षिप्त करें',
   expandBottomPanel: 'निचला पैनल विस्तृत करें',
   terminalError: 'टर्मिनल कनेक्शन विफल',
@@ -90,6 +103,7 @@ export const hi: Record<string, string> = {
   terminalDepsFailed: 'टर्मिनल निर्भरता node-pty लोड विफल',
   terminalDepsHint: 'DSH मशीन पर एक टर्मिनल या cmd में नीचे दिया गया कमांड चलाएँ, फिर पुनः प्रयास करें (node-pty DSH कोर संस्करण के साथ सिंक रहता है):',
   terminalDepsProfile: ' (पहचाना गया प्रोफ़ाइल: {profile})',
+  terminalShellNotFound: 'कॉन्फ़िगर किया गया shell नहीं मिला: {name} — Settings → Side card → Terminal में shell पथ जाँचें',
   preview: 'पूर्वावलोकन',
   toc: 'विषय-सूची',
   edit: 'संपादित करें',
@@ -128,7 +142,15 @@ export const hi: Record<string, string> = {
   worktree: 'वर्कट्री',
   checkoutError: 'ब्रांच स्विच विफल',
   history: 'इतिहास',
-  changes: 'बदलाव',
+  changes: 'फ़ाइल परिवर्तन',
+  changesGitLens: 'Git',
+  changesSessionLens: 'सेशन',
+  changesFilterAll: 'सभी',
+  changesFilterEmpty: 'इस प्रकार का कोई ऑपरेशन नहीं',
+  changesOpenDiffTab: 'अलग diff टैब में खोलें',
+  changesClosePreview: 'पूर्वावलोकन बंद करें',
+  changesResizePreview: 'पूर्वावलोकन का आकार बदलें',
+  changesLoadError: 'सेशन फ़ाइल रिकॉर्ड अभी अनुपलब्ध हैं',
   staged: 'स्टेज किया',
   unstaged: 'अनस्टेज',
   cancel: 'रद्द करें',
@@ -176,6 +198,13 @@ export const hi: Record<string, string> = {
   addToConversation: 'वार्तालाप में जोड़ें',
   copyRelative: 'सापेक्ष पथ कॉपी',
   copyAbsolute: 'निरपेक्ष पथ कॉपी',
+  rename: 'नाम बदलें',
+  renameInvalid: 'नाम खाली नहीं हो सकता और उसमें पथ विभाजक नहीं हो सकते।',
+  delete: 'हटाएँ',
+  deleteTitle: '“{name}” हटाएँ?',
+  deleteDescFile: 'यह फ़ाइल स्थायी रूप से हटा दी जाएगी। इसे पूर्ववत नहीं किया जा सकता।',
+  deleteDescDir: 'यह निर्देशिका और उसकी सारी सामग्री स्थायी रूप से हटा दी जाएगी। इसे पूर्ववत नहीं किया जा सकता।',
+  dismiss: 'बंद करें',
   download: 'डाउनलोड',
   uploadFiles: 'फ़ाइलें अपलोड करें',
   uploadFolder: 'फ़ोल्डर अपलोड करें',
@@ -194,13 +223,6 @@ export const hi: Record<string, string> = {
   settingsIntro: 'साइड कार्ड क्या दिखाता है और कैसे व्यवहार करता है प्रबंधित करें',
   settingsPopupDesc: '{feature} के लिए संबंधित विकल्प कॉन्फ़िगर करें',
   settingsDone: 'पूर्ण',
-  settingsOpenTitle: 'नए वार्तालाप के लिए डिफ़ॉल्ट रूप से खोलें',
-  settingsOpenDesc: 'बिल्कुल नए वार्तालाप के लिए साइड कार्ड स्वतः विस्तृत करें; मौजूदा वार्तालाप अपना लेआउट रखते हैं',
-  settingsWidthTitle: 'डिफ़ॉल्ट चौड़ाई हिस्सा',
-  settingsWidthDesc: 'नए वार्तालाप के लिए साइड कार्ड की विंडो चौड़ाई का डिफ़ॉल्ट हिस्सा (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'चैट फ़ाइलें साइडबार में खोलें',
-  settingsOpenPathDesc: 'चैट में फ़ाइल लिंक (टूल पंक्ति, उत्पादित फ़ाइलें, उल्लेख) क्लिक करने पर सिस्टम डिफ़ॉल्ट ऐप के बजाय साइडबार एडिटर में खोलें',
   settingsOpenToolsTitle: 'मॉडल के लिए साइडबार ओपन टूल इंजेक्ट करें',
   settingsOpenToolsDesc: 'चालू होने पर, मॉडल sidebar_open टूल से साइडबार में फ़ाइलें, फ़ोल्डर और HTTP(S) पेज खोल सकता है (डिफ़ॉल्ट रूप से बंद)',
   settingsTitleBarTitle: 'स्थिति संगतता मोड',
@@ -221,10 +243,10 @@ export const hi: Record<string, string> = {
   settingsConflict: 'सेटिंग दूसरी विंडो में बदली — कृपया पुनः प्रयास करें',
   binaryNoPreview: 'इस फ़ाइल प्रकार का पूर्वावलोकन नहीं हो सकता',
   downloadToView: 'देखने के लिए डाउनलोड करें',
-  settingsSubagentTitle: 'सबएजेंट दिखने पर स्वतः कार्य पृष्ठ खोलें',
-  settingsSubagentDesc: 'वर्तमान वार्तालाप में नया सबएजेंट बनने पर साइडबार विस्तृत करें और कार्य पृष्ठ खोलें; बंद करने पर मैन्युअल रूप से खोलें',
-  settingsJobsTitle: 'नया बैकग्राउंड कार्य आने पर स्वतः कार्य पृष्ठ खोलें',
-  settingsJobsDesc: 'वर्तमान वार्तालाप में नया बैकग्राउंड कार्य दिखने पर साइडबार विस्तृत करें और कार्य पृष्ठ खोलें (हर नया कार्य ट्रिगर करता है); बंद करने पर मैन्युअल रूप से खोलें',
+  settingsSubagentTitle: 'सबएजेंट दिखने पर कार्य पृष्ठ स्वतः सक्रिय करें',
+  settingsSubagentDesc: 'वर्तमान वार्तालाप में नया सबएजेंट बनने पर कार्य पृष्ठ सक्रिय करें; चौड़ी स्क्रीन पर साइड कार्ड भी विस्तृत होता है, जबकि संकीर्ण स्क्रीन पर पूर्ण-स्क्रीन दराज को जबरन नहीं खोला जाता; विकल्प बंद होने पर इसे मैन्युअल रूप से खोलना होगा',
+  settingsJobsTitle: 'नया बैकग्राउंड कार्य आने पर कार्य पृष्ठ स्वतः सक्रिय करें',
+  settingsJobsDesc: 'वर्तमान वार्तालाप में हर नया बैकग्राउंड कार्य आने पर कार्य पृष्ठ सक्रिय करें (हर नया कार्य ट्रिगर करता है); चौड़ी स्क्रीन पर साइड कार्ड भी विस्तृत होता है, जबकि संकीर्ण स्क्रीन पर पूर्ण-स्क्रीन दराज को जबरन नहीं खोला जाता; विकल्प बंद होने पर इसे मैन्युअल रूप से खोलना होगा',
   settingsToolsTitle: 'मॉडल के लिए टर्मिनल टूल इंजेक्ट करें',
   settingsToolsDesc: 'सक्षम होने पर, मॉडल 8 terminal_* टूल्स से साइडबार टर्मिनल बना और चला सकता है (डिफ़ॉल्ट रूप से बंद)',
   settingsFenceTitle: 'वर्कस्पेस पाथ जाँच',
@@ -328,6 +350,25 @@ export const hi: Record<string, string> = {
   sideChatClose: 'थ्रेड बंद करें',
   sideChatCloseTitle: 'थ्रेड का एजेंट रिलीज़ करें (इतिहास रखा जाता है)',
   sideChatError: 'साइड चैट त्रुटि: {message}',
+  sideChatTurnUsage: 'इनपुट {input} टोकन · आउटपुट {output} टोकन',
+  sideChatBlockCollapse: 'सिकोड़ें',
+  sideChatBlockCollapseAria: 'सिकोड़ें',
+  sideChatBlockExpand: '{hidden} पंक्तियाँ विस्तृत करें',
+  sideChatBlockExpandAria: 'आगे की {hidden} पंक्तियाँ विस्तृत करें',
+  sideChatBlockSignal: 'सिग्नल से समाप्त: {signal}',
+  sideChatBlockExitCode: 'एग्जिट कोड {code}',
+  sideChatBlockRunning: 'चल रहा है',
+  sideChatBlockFailed: 'विफल',
+  sideChatBlockDone: 'पूर्ण',
+  sideChatBlockNoOutput: '(कोई आउटपुट नहीं)',
+  sideChatBlockFiles: '{count} फ़ाइलें',
+  sideChatBlockWindow: 'कुल {total} में से {shown} पंक्तियाँ',
+  sideChatConnDisconnected: 'कनेक्शन टूट गया',
+  sideChatConnReconnect: 'फिर से कनेक्ट करें',
+  sideChatConnConnecting: 'फिर से कनेक्ट हो रहा है…',
+  sideChatConnRecovered: 'कनेक्शन बहाल हुआ',
+  sideChatConnReconnectAction: 'अभी फिर से कनेक्ट करें',
+  sideChatConnRestartAction: 'कनेक्शन फिर से शुरू करें',
   jobs: 'बैकग्राउंड कार्य',
   jobsCount: '{count} बैकग्राउंड कार्य',
   jobsCountRunning: '{count} बैकग्राउंड कार्य · {running} चल रहे',
@@ -380,4 +421,29 @@ export const hi: Record<string, string> = {
   pluginDocsPanelDesc: 'DSH साइडबार में ग्लोबल डॉक्स: किसी भी वर्कस्पेस से अपने Markdown नोट्स पढ़ें — फ़ाइल सूची, रूपरेखा, Chrome / VS Code में खोलें, और कॉपी बटन; docs डायरेक्टरी कॉन्फ़िगर करने योग्य (डिफ़ॉल्ट ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'DeepSeek Harness के लिए एजेंट ब्राउज़र: 32 ego_* टूल असली Chromium चलाते हैं; साइडबार में नेटिव «ego browser» टैब एजेंट के हर विज़िट किए गए पेज को लाइव दिखाता है — आप क्लिक, ड्रैग और टाइप करके नियंत्रण ले सकते हैं। better-sidebar मौजूद होने पर टैब स्वतः रजिस्टर होता है, अन्यथा फ्लोटिंग बबल के रूप में दिखता है',
   pluginBilingualReaderDesc: 'DSH साइडबार में PDF पढ़ें: मूल PDF प्रदर्शन, टेक्स्ट चुनकर LLM से अनुवाद करें, संदर्भ के साथ और मुख्य संवाद से पूरी तरह अलग',
+  changesRedactOn: "रिडैक्शन चालू: संवेदनशील मान [REDACTED] दिखेंगे; बंद करने के लिए क्लिक करें (अपने जोखिम पर)",
+  changesRedactOff: "रिडैक्शन बंद: सामग्री जैसी है वैसी दिखेगी; चालू करने के लिए क्लिक करें",
+  changesRedactOnLabel: "रिडैक्शन",
+  changesRedactOffLabel: "बिना रिडैक्शन",
+  changesRedactBanner: "रिडैक्टेड",
+  pluginSentinelName: 'dsh-sentinel वेक-अप सिस्टम',
+  pluginEgoBrowserName: 'ego-browser एजेंट ब्राउज़र',
+  pluginBetterOverleafName: 'dsh-better-overleaf Overleaf टैब',
+  pluginDocsPanelName: 'dsh-docs-panel ग्लोबल डॉक्स',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Git क्रेडेंशियल',
+  pluginGitRemotesName: 'dsh-git-remotes Git रिमोट',
+  pluginGithubWorkbenchName: 'dsh-github-workbench GitHub वर्कबेंच',
+  pluginSidebarQaName: 'dsh-sidebar-qa चुनें और पूछें',
+  pluginSidenoteName: 'dsh-sidenote साइड चैट',
+  pluginServerDeckName: 'dsh-server-deck सर्वर डेक',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH टनल',
+  pluginTurnReviewName: 'dsh-turn-review टर्न समीक्षा',
+  pluginBilingualReaderName: 'dsh-bilingual-reader द्विभाषी रीडर',
+  pluginOfficeName: 'Office प्रीव्यू',
+  pluginMdExportName: 'Markdown एक्सपोर्ट',
+  pluginCodeNavName: 'कोड प्रीव्यू नेविगेटर',
+  pluginVideoPreviewName: 'वीडियो प्रीव्यू',
+  presetDshDesktopDesc: 'Electron एडवांस्ड (फ्रेमलेस) मोड: macOS ऊपर 20px सुरक्षित रखता है; Windows WCO अनुपलब्ध होने पर टाइटल बार के लिए 32px रखता है',
 }

src/client/locales-id.ts

@@ -15,8 +15,24 @@
 
 export const id: Record<string, string> = {
   files: 'Berkas',
+  changesSessionEmpty: 'Belum ada operasi file di sesi ini',
+  changesRead: 'Baca',
+  changesMdReading: 'Baca',
+  changesHtmlRender: "Render",
+  changesHtmlRaw: "Sumber",
+  changesPdfRender: "Render",
+  changesPdfRaw: "Sumber",
+  changesMdRaw: 'Mentah',
+  changesWrite: 'Tulis',
+  changesEdit: 'Edit',
+  changesRunning: 'berjalan',
+  changesError: 'error',
+  changesFold: '{count} baris… klik untuk meluaskan',
+  changesFoldLoading: 'Meluaskan…',
+  changesFoldUnavailable: 'Konteks tidak tersedia',
+  changesContext: 'konteks',
+  changesPriorUnknown: 'Konten sebelum perubahan berada di luar jendela; ditampilkan sebagai sepenuhnya baru',
   explorer: 'Explorer',
-  git: 'Source Control',
   terminal: 'Terminal',
   editor: 'Editor',
   editorExplorer: 'Perilaku buka berkas',
@@ -63,7 +79,6 @@ export const id: Record<string, string> = {
   closeOtherTabs: 'Tutup Tab Lain',
   closeLeftTabs: 'Tutup Tab di Kiri',
   closeRightTabs: 'Tutup Tab di Kanan',
-  moveToFreeWindow: 'Pindahkan ke jendela bebas',
   floatDropHint: 'Lepaskan untuk membuka di jendela bebas',
   dockToSidebar: 'Kembali ke bilah samping',
   pinTerminal: 'Sematkan Terminal',
@@ -78,8 +93,6 @@ export const id: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Disematkan global',
   pinnedRailLabel: 'Terminal Tersemat',
   closePinnedTerminal: 'Tutup Terminal',
-  collapse: 'Lipat sidebar',
-  expand: 'Bentangkan sidebar',
   collapseBottomPanel: 'Lipat panel bawah',
   expandBottomPanel: 'Bentangkan panel bawah',
   terminalError: 'Koneksi terminal gagal',
@@ -88,6 +101,7 @@ export const id: Record<string, string> = {
   terminalDepsFailed: 'Dependensi terminal node-pty gagal dimuat',
   terminalDepsHint: 'Jalankan perintah di bawah ini di terminal atau cmd pada mesin DSH untuk memperbaikinya, lalu coba lagi (node-pty tetap sinkron dengan versi inti DSH):',
   terminalDepsProfile: ' (profil terdeteksi: {profile})',
+  terminalShellNotFound: 'Shell yang dikonfigurasi tidak ditemukan: {name} — periksa path shell di Pengaturan → Side card → Terminal',
   preview: 'Pratinjau',
   toc: 'Daftar Isi',
   edit: 'Edit',
@@ -126,7 +140,15 @@ export const id: Record<string, string> = {
   worktree: 'Worktree',
   checkoutError: 'Beralih branch gagal',
   history: 'Riwayat',
-  changes: 'Perubahan',
+  changes: 'Perubahan berkas',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Sesi',
+  changesFilterAll: 'Semua',
+  changesFilterEmpty: 'Tidak ada operasi jenis ini',
+  changesOpenDiffTab: 'Buka di tab diff terpisah',
+  changesClosePreview: 'Tutup pratinjau',
+  changesResizePreview: 'Ubah ukuran pratinjau',
+  changesLoadError: 'Catatan berkas sesi sedang tidak tersedia',
   staged: 'Staged',
   unstaged: 'Unstaged',
   cancel: 'Batal',
@@ -174,6 +196,13 @@ export const id: Record<string, string> = {
   addToConversation: 'Tambahkan ke obrolan',
   copyRelative: 'Salin path relatif',
   copyAbsolute: 'Salin path absolut',
+  rename: 'Ganti nama',
+  renameInvalid: 'Nama tidak boleh kosong atau mengandung pemisah jalur.',
+  delete: 'Hapus',
+  deleteTitle: 'Hapus "{name}"?',
+  deleteDescFile: 'Ini menghapus file secara permanen. Tidak dapat dibatalkan.',
+  deleteDescDir: 'Ini menghapus direktori dan seluruh isinya secara permanen. Tidak dapat dibatalkan.',
+  dismiss: 'Tutup',
   download: 'Unduh',
   uploadFiles: 'Unggah berkas',
   uploadFolder: 'Unggah folder',
@@ -192,13 +221,6 @@ export const id: Record<string, string> = {
   settingsIntro: 'Kelola apa yang ditampilkan kartu samping dan perilakunya',
   settingsPopupDesc: 'Konfigurasikan opsi terkait untuk {feature}',
   settingsDone: 'Selesai',
-  settingsOpenTitle: 'Buka secara default untuk obrolan baru',
-  settingsOpenDesc: 'Bentangkan kartu samping secara otomatis untuk obrolan baru; obrolan yang sudah ada mempertahankan tata letaknya',
-  settingsWidthTitle: 'Porsi lebar default',
-  settingsWidthDesc: 'Porsi lebar jendela default kartu samping untuk obrolan baru (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Buka berkas obrolan di sidebar',
-  settingsOpenPathDesc: 'Buka tautan berkas di obrolan (baris alat, berkas yang dihasilkan, mention) di editor sidebar alih-alih aplikasi default sistem',
   settingsOpenToolsTitle: 'Suntik alat buka sidebar untuk model',
   settingsOpenToolsDesc: 'Saat diaktifkan, model dapat membuka file, folder, dan halaman HTTP(S) di sidebar melalui alat sidebar_open (nonaktif secara default)',
   settingsTitleBarTitle: 'Mode kompatibilitas posisi',
@@ -219,10 +241,10 @@ export const id: Record<string, string> = {
   settingsConflict: 'Pengaturan diubah di jendela lain — silakan coba lagi',
   binaryNoPreview: 'Tipe berkas ini tidak dapat dipratinjau',
   downloadToView: 'Unduh untuk melihat',
-  settingsSubagentTitle: 'Buka otomatis halaman Tasks saat subagen muncul',
-  settingsSubagentDesc: 'Bentangkan kartu samping dan buka halaman Tasks saat obrolan saat ini menelurkan subagen baru; matikan untuk membukanya secara manual',
-  settingsJobsTitle: 'Buka otomatis halaman Jobs saat ada tugas latar baru',
-  settingsJobsDesc: 'Bentangkan kartu samping dan buka halaman Jobs setiap kali tugas latar baru muncul untuk obrolan saat ini (setiap tugas baru memicu); matikan untuk membukanya secara manual',
+  settingsSubagentTitle: 'Aktifkan otomatis halaman Tasks saat subagen muncul',
+  settingsSubagentDesc: 'Aktifkan halaman Tasks saat obrolan saat ini membuat subagen baru; pada layar lebar, kartu samping juga dibentangkan; pada layar sempit, laci layar penuh tidak dipaksa terbuka; matikan untuk membukanya secara manual',
+  settingsJobsTitle: 'Aktifkan otomatis halaman Tasks saat ada tugas latar baru',
+  settingsJobsDesc: 'Aktifkan halaman Tasks setiap kali tugas latar baru muncul untuk obrolan saat ini (setiap tugas baru memicu aktivasi); pada layar lebar, kartu samping juga dibentangkan; pada layar sempit, laci layar penuh tidak dipaksa terbuka; matikan untuk membukanya secara manual',
   settingsToolsTitle: 'Suntik alat terminal untuk model',
   settingsToolsDesc: 'Saat diaktifkan, model dapat membuat dan mengendalikan terminal sidebar melalui 8 alat terminal_* (nonaktif secara default)',
   settingsFenceTitle: 'Pemeriksaan path workspace',
@@ -326,6 +348,25 @@ export const id: Record<string, string> = {
   sideChatClose: 'Tutup thread',
   sideChatCloseTitle: 'Lepaskan agen thread (riwayat dipertahankan)',
   sideChatError: 'Kesalahan Side Chat: {message}',
+  sideChatTurnUsage: 'Input {input} tok · Output {output} tok',
+  sideChatBlockCollapse: 'Lipat',
+  sideChatBlockCollapseAria: 'Lipat',
+  sideChatBlockExpand: 'Perlihatkan {hidden} baris',
+  sideChatBlockExpandAria: 'Perlihatkan {hidden} baris lagi',
+  sideChatBlockSignal: 'Diakhiri sinyal: {signal}',
+  sideChatBlockExitCode: 'Kode keluar {code}',
+  sideChatBlockRunning: 'Berjalan',
+  sideChatBlockFailed: 'Gagal',
+  sideChatBlockDone: 'Selesai',
+  sideChatBlockNoOutput: '(tanpa output)',
+  sideChatBlockFiles: '{count} file',
+  sideChatBlockWindow: '{shown} dari {total} baris',
+  sideChatConnDisconnected: 'Koneksi terputus',
+  sideChatConnReconnect: 'Sambungkan ulang',
+  sideChatConnConnecting: 'Menyambung ulang…',
+  sideChatConnRecovered: 'Koneksi dipulihkan',
+  sideChatConnReconnectAction: 'Sambungkan ulang sekarang',
+  sideChatConnRestartAction: 'Mulai ulang koneksi',
   jobs: 'Tugas latar',
   jobsCount: '{count} tugas latar',
   jobsCountRunning: '{count} tugas latar · {running} berjalan',
@@ -378,4 +419,29 @@ export const id: Record<string, string> = {
   pluginDocsPanelDesc: 'Dokumen global di sidebar DSH: baca catatan Markdown Anda sendiri dari ruang kerja apa pun — daftar berkas, kerangka, buka di Chrome / VS Code, dan tombol salin; direktori docs dapat dikonfigurasi (default ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'Browser agen untuk DeepSeek Harness: 32 alat ego_* menggerakkan Chromium sungguhan; tab «ego browser» native di bilah samping menampilkan langsung setiap halaman yang dikunjungi agen — Anda bisa mengklik, menyeret, dan mengetik untuk mengambil alih. Tab terdaftar otomatis jika better-sidebar terpasang; jika tidak, jatuh ke gelembung mengambang',
   pluginBilingualReaderDesc: 'Baca PDF di sidebar DSH: tampilan PDF asli, pilih teks untuk diterjemahkan dengan LLM, dengan konteks dan sepenuhnya terisolasi dari percakapan utama',
+  changesRedactOn: "Redaksi aktif: rahasia tampil sebagai [REDACTED]; klik untuk mematikan (risiko Anda sendiri)",
+  changesRedactOff: "Redaksi mati: konten tampil apa adanya; klik untuk mengaktifkan",
+  changesRedactOnLabel: "Redaksi",
+  changesRedactOffLabel: "Tanpa redaksi",
+  changesRedactBanner: "Teredaksi",
+  pluginSentinelName: 'dsh-sentinel Sistem bangun',
+  pluginEgoBrowserName: 'ego-browser Peramban agen',
+  pluginBetterOverleafName: 'dsh-better-overleaf Tab Overleaf',
+  pluginDocsPanelName: 'dsh-docs-panel Dokumen global',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Kredensial Git',
+  pluginGitRemotesName: 'dsh-git-remotes Remote Git',
+  pluginGithubWorkbenchName: 'dsh-github-workbench Meja kerja GitHub',
+  pluginSidebarQaName: 'dsh-sidebar-qa Pilih & tanya',
+  pluginSidenoteName: 'dsh-sidenote Obrolan samping',
+  pluginServerDeckName: 'dsh-server-deck Dek server',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel Terowongan SSH',
+  pluginTurnReviewName: 'dsh-turn-review Tinjauan giliran',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Pembaca dwibahasa',
+  pluginOfficeName: 'Pratinjau Office',
+  pluginMdExportName: 'Ekspor Markdown',
+  pluginCodeNavName: 'Navigator pratinjau kode',
+  pluginVideoPreviewName: 'Pratinjau video',
+  presetDshDesktopDesc: 'Mode Electron lanjutan (tanpa bingkai): macOS mencadangkan 20px di atas; Windows mencadangkan 32px untuk bilah judul saat WCO tidak tersedia',
 }

src/client/locales-it.ts

@@ -8,8 +8,24 @@
 
 export const it: Record<string, string> = {
   files: 'File',
+  changesSessionEmpty: 'Ancora nessuna operazione sui file in questa sessione',
+  changesRead: 'Lettura',
+  changesMdReading: 'Lettura',
+  changesHtmlRender: "Render",
+  changesHtmlRaw: "Sorgente",
+  changesPdfRender: "Render",
+  changesPdfRaw: "Sorgente",
+  changesMdRaw: 'Grezzo',
+  changesWrite: 'Scrittura',
+  changesEdit: 'Modifica',
+  changesRunning: 'in esecuzione',
+  changesError: 'errore',
+  changesFold: '{count} righe… clicca per espandere',
+  changesFoldLoading: 'Espansione…',
+  changesFoldUnavailable: 'Contesto non disponibile',
+  changesContext: 'contesto',
+  changesPriorUnknown: 'Il contenuto precedente è fuori dalla finestra; mostrato come interamente aggiunto',
   explorer: 'Esplora risorse',
-  git: 'Controllo del codice sorgente',
   terminal: 'Terminale',
   editor: 'Editor',
   editorExplorer: 'Modalità di apertura dei file',
@@ -56,7 +72,6 @@ export const it: Record<string, string> = {
   closeOtherTabs: 'Chiudi le altre schede',
   closeLeftTabs: 'Chiudi le schede a sinistra',
   closeRightTabs: 'Chiudi le schede a destra',
-  moveToFreeWindow: 'Sposta in finestra libera',
   floatDropHint: 'Rilascia per aprire in una finestra libera',
   dockToSidebar: 'Torna alla barra laterale',
   pinTerminal: 'Blocca Terminale',
@@ -71,8 +86,6 @@ export const it: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Bloccato globalmente',
   pinnedRailLabel: 'Terminali Bloccati',
   closePinnedTerminal: 'Chiudi Terminale',
-  collapse: 'Comprimi barra laterale',
-  expand: 'Espandi barra laterale',
   collapseBottomPanel: 'Comprimi pannello inferiore',
   expandBottomPanel: 'Espandi pannello inferiore',
   terminalError: 'Connessione del terminale non riuscita',
@@ -81,6 +94,7 @@ export const it: Record<string, string> = {
   terminalDepsFailed: 'Caricamento della dipendenza del terminale node-pty non riuscito',
   terminalDepsHint: 'Esegua il comando seguente in un terminale o cmd sul computer DSH per ripristinarlo, poi riprovi (node-pty resta sincronizzato con la versione del core DSH):',
   terminalDepsProfile: ' (rilevato profilo: {profile})',
+  terminalShellNotFound: 'Shell configurata non trovata: {name} — verifica il percorso della shell in Impostazioni → Side card → Terminal',
   preview: 'Anteprima',
   toc: 'Indice',
   edit: 'Modifica',
@@ -120,6 +134,14 @@ export const it: Record<string, string> = {
   checkoutError: 'Cambio di ramo non riuscito',
   history: 'Cronologia',
   changes: 'Modifiche',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Sessione',
+  changesFilterAll: 'Tutti',
+  changesFilterEmpty: 'Nessuna operazione di questo tipo',
+  changesOpenDiffTab: 'Apri in una scheda diff',
+  changesClosePreview: 'Ridimensiona l\'anteprima',
+  changesResizePreview: 'Ridimensiona anteprima',
+  changesLoadError: 'I record dei file della sessione non sono disponibili',
   staged: 'In stage',
   unstaged: 'Non in stage',
   cancel: 'Annulla',
@@ -167,6 +189,13 @@ export const it: Record<string, string> = {
   addToConversation: 'Aggiungi alla conversazione',
   copyRelative: 'Copia percorso relativo',
   copyAbsolute: 'Copia percorso assoluto',
+  rename: 'Rinomina',
+  renameInvalid: 'Il nome non può essere vuoto o contenere separatori di percorso.',
+  delete: 'Elimina',
+  deleteTitle: 'Eliminare "{name}"?',
+  deleteDescFile: 'Il file verrà eliminato definitivamente. Questa azione non può essere annullata.',
+  deleteDescDir: 'La directory e tutto il suo contenuto verranno eliminati definitivamente. Questa azione non può essere annullata.',
+  dismiss: 'Chiudi',
   download: 'Scarica',
   uploadFiles: 'Carica file',
   uploadFolder: 'Carica cartella',
@@ -185,13 +214,6 @@ export const it: Record<string, string> = {
   settingsIntro: 'Gestisca cosa mostra la scheda laterale e come si comporta',
   settingsPopupDesc: 'Configuri le opzioni relative a {feature}',
   settingsDone: 'Fatto',
-  settingsOpenTitle: 'Apri per impostazione predefinita per le nuove conversazioni',
-  settingsOpenDesc: 'Espande automaticamente la scheda laterale per le conversazioni nuove; le conversazioni esistenti mantengono il proprio layout',
-  settingsWidthTitle: 'Quota di larghezza predefinita',
-  settingsWidthDesc: 'La quota predefinita della scheda laterale sulla larghezza della finestra per le nuove conversazioni (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Apri i file della chat nella barra laterale',
-  settingsOpenPathDesc: 'Apre i collegamenti ai file nella chat (righe di strumenti, file prodotti, menzioni) nell’editor della barra laterale invece dell’app predefinita di sistema',
   settingsOpenToolsTitle: 'Iniettare lo strumento di apertura della barra laterale per il modello',
   settingsOpenToolsDesc: 'Se attivato, il modello può aprire file, cartelle e pagine HTTP(S) nella barra laterale tramite lo strumento sidebar_open (disattivato per impostazione predefinita)',
   settingsTitleBarTitle: 'Modalità di compatibilità della posizione',
@@ -212,10 +234,10 @@ export const it: Record<string, string> = {
   settingsConflict: 'L’impostazione è stata modificata in un’altra finestra — riprovi',
   binaryNoPreview: 'Questo tipo di file non può essere visualizzato in anteprima',
   downloadToView: 'Scarica per visualizzare',
-  settingsSubagentTitle: 'Apri automaticamente la pagina Attività quando compare un sottoagente',
-  settingsSubagentDesc: 'Espande la barra laterale e apre la pagina Attività quando la conversazione attuale genera un nuovo sottoagente; disattivato va aperta manualmente',
-  settingsJobsTitle: 'Apri automaticamente la pagina Attività in background in caso di nuova attività',
-  settingsJobsDesc: 'Espande la barra laterale e apre la pagina Attività in background ogni volta che compare una nuova attività in background per la conversazione attuale (ogni nuova attività la attiva); disattivato va aperta manualmente',
+  settingsSubagentTitle: 'Attiva automaticamente la pagina Attività quando compare un sottoagente',
+  settingsSubagentDesc: 'Quando nella conversazione attuale compare un nuovo sottoagente, attiva automaticamente la pagina Attività; sugli schermi ampi espande anche la barra laterale, mentre sugli schermi stretti non forza l’apertura del pannello a schermo intero; disattiva per selezionare la pagina manualmente',
+  settingsJobsTitle: 'Attiva automaticamente la pagina Attività quando compare una nuova attività in background',
+  settingsJobsDesc: 'Quando nella conversazione attuale compare una nuova attività in background, attiva automaticamente la pagina Attività (l’attivazione avviene per ogni nuova attività); sugli schermi ampi espande anche la barra laterale, mentre sugli schermi stretti non forza l’apertura del pannello a schermo intero; disattiva per selezionare la pagina manualmente',
   settingsToolsTitle: 'Inietta strumenti del terminale per il modello',
   settingsToolsDesc: 'Se attivato, il modello può creare e gestire terminali della barra laterale attraverso gli 8 strumenti terminal_* (disattivato per impostazione predefinita)',
   settingsFenceTitle: 'Controllo dei percorsi del workspace',
@@ -319,6 +341,25 @@ export const it: Record<string, string> = {
   sideChatClose: 'Chiudi conversazione',
   sideChatCloseTitle: 'Rilascia l’agente della conversazione (la cronologia è conservata)',
   sideChatError: 'Errore della chat laterale: {message}',
+  sideChatTurnUsage: 'Input {input} tok · Output {output} tok',
+  sideChatBlockCollapse: 'Comprimi',
+  sideChatBlockCollapseAria: 'Comprimi',
+  sideChatBlockExpand: 'Espandi {hidden} righe',
+  sideChatBlockExpandAria: 'Espandi altre {hidden} righe',
+  sideChatBlockSignal: 'Terminato dal segnale: {signal}',
+  sideChatBlockExitCode: 'Codice di uscita {code}',
+  sideChatBlockRunning: 'In esecuzione',
+  sideChatBlockFailed: 'Non riuscito',
+  sideChatBlockDone: 'Completato',
+  sideChatBlockNoOutput: '(nessun output)',
+  sideChatBlockFiles: '{count} file',
+  sideChatBlockWindow: '{shown} di {total} righe',
+  sideChatConnDisconnected: 'Connessione persa',
+  sideChatConnReconnect: 'Riconnetti',
+  sideChatConnConnecting: 'Riconnessione…',
+  sideChatConnRecovered: 'Connessione ripristinata',
+  sideChatConnReconnectAction: 'Riconnetti ora',
+  sideChatConnRestartAction: 'Riavvia la connessione',
   jobs: 'Attività in background',
   jobsCount: '{count} attività in background',
   jobsCountRunning: '{count} attività in background · {running} in esecuzione',
@@ -371,4 +412,29 @@ export const it: Record<string, string> = {
   pluginDocsPanelDesc: 'Documenti globali nella barra laterale di DSH: legga le sue note Markdown da qualsiasi spazio di lavoro — una lista di file, una struttura, apertura in Chrome / VS Code e pulsanti di copia; la directory dei documenti è configurabile (predefinita ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'Il browser agente per DeepSeek Harness: 32 strumenti ego_* pilotano un vero Chromium; una scheda nativa «ego browser» nella barra laterale mostra in tempo reale ogni pagina visitata dall’agente — puoi cliccare, trascinare e digitare per prendere il controllo. Registra la scheda automaticamente se better-sidebar è presente, altrimenti una bolla flottante',
   pluginBilingualReaderDesc: 'Leggi PDF nella barra laterale DSH: visualizzazione PDF nativa, seleziona il testo per tradurlo con l’LLM, con contesto e completamente isolato dalla conversazione principale',
+  changesRedactOn: "Mascheramento attivo: i segreti appaiono come [REDACTED]; clicca per disattivare (a tuo rischio)",
+  changesRedactOff: "Mascheramento disattivo: il contenuto appare invariato; clicca per attivare",
+  changesRedactOnLabel: "Mascheramento",
+  changesRedactOffLabel: "Senza mascheramento",
+  changesRedactBanner: "Mascherato",
+  pluginSentinelName: 'dsh-sentinel Sistema di riattivazione',
+  pluginEgoBrowserName: 'ego-browser Browser dell’agente',
+  pluginBetterOverleafName: 'dsh-better-overleaf Scheda Overleaf',
+  pluginDocsPanelName: 'dsh-docs-panel Documenti globali',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Credenziali Git',
+  pluginGitRemotesName: 'dsh-git-remotes Remote Git',
+  pluginGithubWorkbenchName: 'dsh-github-workbench Banco di lavoro GitHub',
+  pluginSidebarQaName: 'dsh-sidebar-qa Seleziona e chiedi',
+  pluginSidenoteName: 'dsh-sidenote Chat laterale',
+  pluginServerDeckName: 'dsh-server-deck Ponte server',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel Tunnel SSH',
+  pluginTurnReviewName: 'dsh-turn-review Revisione del turno',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Lettore bilingue',
+  pluginOfficeName: 'Anteprima Office',
+  pluginMdExportName: 'Esportazione Markdown',
+  pluginCodeNavName: 'Navigatore anteprima codice',
+  pluginVideoPreviewName: 'Anteprima video',
+  presetDshDesktopDesc: 'Modalità avanzata Electron (senza bordi): macOS riserva 20px in alto; Windows riserva 32px per la barra del titolo quando WCO non è disponibile',
 }

src/client/locales-ja.ts

@@ -17,8 +17,24 @@
 /** The ja dictionary (key-set-equal to zh, enforced by the type annotation in locales.ts). */
 export const ja: Record<string, string> = {
   files: 'ファイル',
+  changesSessionEmpty: 'このセッションにはファイル操作がまだありません',
+  changesRead: '読み取り',
+  changesMdReading: '閲覧',
+  changesHtmlRender: "レンダリング",
+  changesHtmlRaw: "原文",
+  changesPdfRender: "レンダリング",
+  changesPdfRaw: "原文",
+  changesMdRaw: '原文',
+  changesWrite: '書き込み',
+  changesEdit: '編集',
+  changesRunning: '実行中',
+  changesError: 'エラー',
+  changesFold: '{count} 行…クリックで展開',
+  changesFoldLoading: '展開中…',
+  changesFoldUnavailable: 'コンテキスト未読み込み',
+  changesContext: 'コンテキスト',
+  changesPriorUnknown: '変更前の内容がウィンドウ内になく、すべて新規追加として表示されます',
   explorer: 'エクスプローラー',
-  git: 'ソース管理',
   terminal: 'ターミナル',
   editor: 'エディター',
   editorExplorer: 'ファイルの開き方',
@@ -65,7 +81,6 @@ export const ja: Record<string, string> = {
   closeOtherTabs: '他のタブを閉じる',
   closeLeftTabs: '左のタブを閉じる',
   closeRightTabs: '右のタブを閉じる',
-  moveToFreeWindow: 'フリーウィンドウへ移動',
   floatDropHint: '離すとフリーウィンドウで開きます',
   dockToSidebar: 'サイドバーへ戻す',
   pinTerminal: 'ターミナルを固定',
@@ -80,8 +95,6 @@ export const ja: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'グローバルに固定',
   pinnedRailLabel: '固定されたターミナル',
   closePinnedTerminal: 'ターミナルを閉じる',
-  collapse: 'サイドバーを折りたたむ',
-  expand: 'サイドバーを展開',
   collapseBottomPanel: '下パネルを折りたたむ',
   expandBottomPanel: '下パネルを展開',
   terminalError: 'ターミナル接続に失敗',
@@ -90,6 +103,7 @@ export const ja: Record<string, string> = {
   terminalDepsFailed: 'ターミナル依存関係 node-pty の読み込みに失敗',
   terminalDepsHint: 'DSH 環境のターミナルまたは cmd で以下のコマンドを実行して修復し、再試行してください（node-pty は DSH コアと同じバージョンを維持）：',
   terminalDepsProfile: '（検出された profile：{profile}）',
+  terminalShellNotFound: '設定されたシェルが見つかりません：{name}（設定 → サイドカード → ターミナル のシェルパスを確認してください）',
   preview: 'プレビュー',
   toc: '目次',
   edit: '編集',
@@ -128,7 +142,15 @@ export const ja: Record<string, string> = {
   worktree: 'ワークツリー',
   checkoutError: 'ブランチ切り替えに失敗',
   history: '履歴',
-  changes: '変更',
+  changes: 'ファイル変更',
+  changesGitLens: 'Git',
+  changesSessionLens: 'セッション',
+  changesFilterAll: 'すべて',
+  changesFilterEmpty: 'この種類の操作はありません',
+  changesOpenDiffTab: '独立タブで開く',
+  changesClosePreview: 'プレビューを閉じる',
+  changesResizePreview: 'プレビューの高さを変更',
+  changesLoadError: 'セッションのファイル記録は現在利用できません',
   staged: 'ステージ済み',
   unstaged: '未ステージ',
   cancel: 'キャンセル',
@@ -176,6 +198,13 @@ export const ja: Record<string, string> = {
   addToConversation: '会話に追加',
   copyRelative: '相対パスをコピー',
   copyAbsolute: '絶対パスをコピー',
+  rename: '名前の変更',
+  renameInvalid: '名前は空にできず、パス区切り文字を含められません。',
+  delete: '削除',
+  deleteTitle: '「{name}」を削除しますか？',
+  deleteDescFile: 'このファイルを完全に削除します。元に戻せません。',
+  deleteDescDir: 'このディレクトリと内容物をすべて完全に削除します。元に戻せません。',
+  dismiss: '閉じる',
   download: 'ダウンロード',
   uploadFiles: 'ファイルをアップロード',
   uploadFolder: 'フォルダーをアップロード',
@@ -194,13 +223,6 @@ export const ja: Record<string, string> = {
   settingsIntro: 'サイドカードの表示内容とデフォルト挙動を管理',
   settingsPopupDesc: '「{feature}」の関連オプションを設定',
   settingsDone: '完了',
-  settingsOpenTitle: '新規会話でデフォルト展開',
-  settingsOpenDesc: '新規会話時にサイドカードを自動展開。既存の会話はそれぞれのレイアウトを維持',
-  settingsWidthTitle: 'デフォルト幅の比率',
-  settingsWidthDesc: '新規会話時のサイドカードがウィンドウ幅に占める割合 (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'チャット内ファイルをサイドバーで開く',
-  settingsOpenPathDesc: 'チャット内のファイルリンク（ツール行、産物リスト、ファイル言及）クリック時に、システム既定アプリではなくサイドバーエディターで開く',
   settingsOpenToolsTitle: 'モデルにサイドバー開くツールを注入',
   settingsOpenToolsDesc: 'オンにすると、モデルは sidebar_open ツールでサイドバーにファイル・フォルダー・HTTP(S) ページを開ける（デフォルトオフ）',
   settingsTitleBarTitle: '位置互換モード',
@@ -221,10 +243,10 @@ export const ja: Record<string, string> = {
   settingsConflict: '設定が別のウィンドウで変更されました、再試行してください',
   binaryNoPreview: 'このファイル形式はプレビューできません',
   downloadToView: 'ダウンロードして表示',
-  settingsSubagentTitle: 'サブエージェント検出時に自動展開',
-  settingsSubagentDesc: '現在の会話で新しいサブエージェントが発生した際、サイドバーを自動展開してタスク管理ページを開く。オフ時は手動で開く必要あり',
-  settingsJobsTitle: '新規バックグラウンドタスク時に自動展開',
-  settingsJobsDesc: '現在の会話で新しいバックグラウンドタスクが発生するたびにサイドバーを展開してタスクページを開く（新規タスクごとに発火）。オフ時は手動で開く必要あり',
+  settingsSubagentTitle: 'サブエージェント検出時にタスク管理ページを自動的にアクティブ化',
+  settingsSubagentDesc: '現在の会話で新しいサブエージェントが発生した際にタスク管理ページをアクティブ化する。広い画面ではサイドカードも展開するが、狭い画面では全画面ドロワーを強制的に開かない。オフにすると手動で開く必要がある',
+  settingsJobsTitle: '新規バックグラウンドタスク時にタスク管理ページを自動的にアクティブ化',
+  settingsJobsDesc: '現在の会話で新しいバックグラウンドタスクが発生するたびにタスク管理ページをアクティブ化する（新規タスクごとに発火）。広い画面ではサイドカードも展開するが、狭い画面では全画面ドロワーを強制的に開かない。オフにすると手動で開く必要がある',
   settingsToolsTitle: 'モデルにターミナルツールを注入',
   settingsToolsDesc: 'オンにすると、モデルが terminal_create 等 8 個のツールでサイドバーターミナルを作成・操作可能（デフォルトオフ）',
   settingsFenceTitle: 'ワークスペースパスガード',
@@ -328,6 +350,25 @@ export const ja: Record<string, string> = {
   sideChatClose: 'スレッドを閉じる',
   sideChatCloseTitle: 'スレッドの agent を解放（履歴は保持）',
   sideChatError: 'サイド会話エラー：{message}',
+  sideChatTurnUsage: '入力 {input} tok · 出力 {output} tok',
+  sideChatBlockCollapse: '折りたたむ',
+  sideChatBlockCollapseAria: '折りたたむ',
+  sideChatBlockExpand: '{hidden} 行を展開',
+  sideChatBlockExpandAria: '残り {hidden} 行を展開',
+  sideChatBlockSignal: 'シグナルで終了：{signal}',
+  sideChatBlockExitCode: '終了コード {code}',
+  sideChatBlockRunning: '実行中',
+  sideChatBlockFailed: '失敗',
+  sideChatBlockDone: '完了',
+  sideChatBlockNoOutput: '（出力なし）',
+  sideChatBlockFiles: '{count} 個のファイル',
+  sideChatBlockWindow: '全 {total} 行中 {shown} 行を表示',
+  sideChatConnDisconnected: '接続が切断されました',
+  sideChatConnReconnect: '再接続',
+  sideChatConnConnecting: '再接続中…',
+  sideChatConnRecovered: '接続が復旧しました',
+  sideChatConnReconnectAction: '今すぐ再接続',
+  sideChatConnRestartAction: '接続をやり直す',
   jobs: 'バックグラウンドタスク',
   jobsCount: '{count} 個のバックグラウンドタスク',
   jobsCountRunning: '{count} 個のバックグラウンドタスク ・ {running} 個実行中',
@@ -380,4 +421,29 @@ export const ja: Record<string, string> = {
   pluginDocsPanelDesc: 'DSH サイドバー内の「グローバルドキュメント」：任意のワークスペースから読めるグローバル Markdown ノート。リストで選んで閲覧、ホバーでアウトラインジャンプ、Chrome / VS Code で外部オープン、コードコピー。ディレクトリは設定可（デフォルト ~/.dsh/docs）',
   pluginEgoBrowserDesc: 'DeepSeek Harness 用エージェントブラウザ：32 個の ego_* ツールが本物の Chromium を操作し、サイドバーのネイティブ「ego ブラウザ」Tab がエージェントの訪れる全ページをライブ表示。クリック・ドラッグ・入力で操作を引き継げます。better-sidebar があれば Tab を自動登録、なければフローティングバブルにフォールバック',
   pluginBilingualReaderDesc: 'DSH サイドバーで論文 PDF を読む：ネイティブ PDF 表示、テキストを選択して LLM で翻訳。コンテキストを使い、メイン会話から完全に分離',
+  changesRedactOn: "マスキング有効：機密値は [REDACTED] で表示。クリックで無効化（自己責任）",
+  changesRedactOff: "マスキング無効：内容がそのまま表示されます。クリックで有効化",
+  changesRedactOnLabel: "マスキング中",
+  changesRedactOffLabel: "マスキング解除",
+  changesRedactBanner: "マスク済み",
+  pluginSentinelName: 'dsh-sentinel ウェイクアップシステム',
+  pluginEgoBrowserName: 'ego-browser エージェントブラウザー',
+  pluginBetterOverleafName: 'dsh-better-overleaf Overleaf タブ',
+  pluginDocsPanelName: 'dsh-docs-panel グローバルドキュメント',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Git 認証情報',
+  pluginGitRemotesName: 'dsh-git-remotes Git リモート',
+  pluginGithubWorkbenchName: 'dsh-github-workbench GitHub ワークベンチ',
+  pluginSidebarQaName: 'dsh-sidebar-qa 選択して質問',
+  pluginSidenoteName: 'dsh-sidenote サイドチャット',
+  pluginServerDeckName: 'dsh-server-deck サーバーデッキ',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH トンネル',
+  pluginTurnReviewName: 'dsh-turn-review ターンレビュー',
+  pluginBilingualReaderName: 'dsh-bilingual-reader バイリンガルリーダー',
+  pluginOfficeName: 'Office プレビュー',
+  pluginMdExportName: 'Markdown エクスポート',
+  pluginCodeNavName: 'コードプレビューナビゲーター',
+  pluginVideoPreviewName: '動画プレビュー',
+  presetDshDesktopDesc: 'Electron 高度モード（枠なし）：macOS は上部 20px、Windows は WCO 未提供時に 32px のタイトルバー分を確保',
 }

src/client/locales-ko.ts

@@ -9,8 +9,24 @@
 
 export const ko: Record<string, string> = {
   files: '파일',
+  changesSessionEmpty: '이 세션에 아직 파일 작업이 없습니다',
+  changesRead: '읽기',
+  changesMdReading: '읽기',
+  changesHtmlRender: "렌더링",
+  changesHtmlRaw: "원문",
+  changesPdfRender: "렌더링",
+  changesPdfRaw: "원문",
+  changesMdRaw: '원문',
+  changesWrite: '쓰기',
+  changesEdit: '편집',
+  changesRunning: '실행 중',
+  changesError: '오류',
+  changesFold: '{count}줄… 클릭하여 펼치기',
+  changesFoldLoading: '펼치는 중…',
+  changesFoldUnavailable: '컨텍스트를 불러올 수 없음',
+  changesContext: '컨텍스트',
+  changesPriorUnknown: '변경 전 내용이 창에 없어 모두 새로 추가된 것으로 표시됩니다',
   explorer: '탐색기',
-  git: '소스 제어',
   terminal: '터미널',
   editor: '편집기',
   editorExplorer: '파일 열기 방식',
@@ -57,7 +73,6 @@ export const ko: Record<string, string> = {
   closeOtherTabs: '다른 탭 닫기',
   closeLeftTabs: '왼쪽 탭 닫기',
   closeRightTabs: '오른쪽 탭 닫기',
-  moveToFreeWindow: '자유 창으로 이동',
   floatDropHint: '놓으면 자유 창에서 열립니다',
   dockToSidebar: '사이드바로 돌아가기',
   pinTerminal: '터미널 고정',
@@ -72,8 +87,6 @@ export const ko: Record<string, string> = {
   pinnedTerminalScopeGlobal: '전역에 고정됨',
   pinnedRailLabel: '고정된 터미널',
   closePinnedTerminal: '터미널 닫기',
-  collapse: '사이드바 접기',
-  expand: '사이드바 펼치기',
   collapseBottomPanel: '하단 패널 접기',
   expandBottomPanel: '하단 패널 펼치기',
   terminalError: '터미널 연결 실패',
@@ -82,6 +95,7 @@ export const ko: Record<string, string> = {
   terminalDepsFailed: '터미널 의존성 node-pty 로드 실패',
   terminalDepsHint: 'DSH가 설치된 환경의 터미널 또는 cmd에서 아래 명령을 실행하여 복구한 후 다시 시도를 클릭하세요(node-pty는 DSH 코어와 동일한 버전을 유지합니다):',
   terminalDepsProfile: ' (profile 감지됨: {profile})',
+  terminalShellNotFound: '설정된 셸을 찾을 수 없습니다: {name} — 설정 → 사이드 카드 → 터미널에서 셸 경로를 확인하세요',
   preview: '미리보기',
   toc: '목차',
   edit: '편집',
@@ -120,7 +134,15 @@ export const ko: Record<string, string> = {
   worktree: '워크트리',
   checkoutError: '브랜치 전환 실패',
   history: '기록',
-  changes: '변경 사항',
+  changes: '파일 변경',
+  changesGitLens: 'Git',
+  changesSessionLens: '세션',
+  changesFilterAll: '모두',
+  changesFilterEmpty: '이 종류의 작업이 없습니다',
+  changesOpenDiffTab: '별도 탭에서 열기',
+  changesClosePreview: '미리보기 닫기',
+  changesResizePreview: '미리보기 높이 조정',
+  changesLoadError: '세션 파일 기록을 지금 사용할 수 없습니다',
   staged: '스테이징됨',
   unstaged: '스테이징 안 됨',
   cancel: '취소',
@@ -168,6 +190,13 @@ export const ko: Record<string, string> = {
   addToConversation: '대화에 추가',
   copyRelative: '상대 경로 복사',
   copyAbsolute: '절대 경로 복사',
+  rename: '이름 바꾸기',
+  renameInvalid: '이름은 비워 둘 수 없으며 경로 구분 기호를 포함할 수 없습니다.',
+  delete: '삭제',
+  deleteTitle: '"{name}"을(를) 삭제할까요?',
+  deleteDescFile: '이 파일이 영구적으로 삭제됩니다. 되돌릴 수 없습니다.',
+  deleteDescDir: '이 디렉터리와 모든 내용이 영구적으로 삭제됩니다. 되돌릴 수 없습니다.',
+  dismiss: '닫기',
   download: '다운로드',
   uploadFiles: '파일 업로드',
   uploadFolder: '폴더 업로드',
@@ -186,13 +215,6 @@ export const ko: Record<string, string> = {
   settingsIntro: '사이드 카드의 표시 내용과 기본 동작을 관리합니다',
   settingsPopupDesc: '"{feature}" 관련 옵션을 구성합니다',
   settingsDone: '완료',
-  settingsOpenTitle: '새 대화 기본 열림',
-  settingsOpenDesc: '새 대화를 만들 때 사이드 카드를 자동으로 펼칩니다. 기존 대화는 각자의 레이아웃을 유지합니다',
-  settingsWidthTitle: '기본 너비 비율',
-  settingsWidthDesc: '새 대화에서 사이드 카드가 창 너비에서 차지하는 비율(%) (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: '채팅 영역 파일을 사이드바에서 열기',
-  settingsOpenPathDesc: '채팅에서 파일 링크(도구 행, 산출물 목록, 파일 언급)를 클릭하면 사이드바 편집기에서 열고, 시스템 기본 앱은 호출하지 않습니다',
   settingsOpenToolsTitle: '모델에 사이드바 열기 도구 주입',
   settingsOpenToolsDesc: '켜면 모델이 sidebar_open 도구로 사이드바에서 파일·폴더·HTTP(S) 페이지를 열 수 있습니다(기본 꺼짐)',
   settingsTitleBarTitle: '위치 호환 모드',
@@ -213,10 +235,10 @@ export const ko: Record<string, string> = {
   settingsConflict: '설정이 다른 창에서 수정되었습니다. 다시 시도하세요',
   binaryNoPreview: '이 파일 형식은 미리보기를 지원하지 않습니다',
   downloadToView: '다운로드하여 보기',
-  settingsSubagentTitle: '서브 에이전트를 감지하면 작업 관리 페이지를 자동으로 펼치기',
-  settingsSubagentDesc: '현재 대화에 새 서브 에이전트가 생기면 사이드바를 자동으로 펼치고 작업 관리 페이지를 엽니다. 끄면 수동으로 열어야 합니다',
-  settingsJobsTitle: '새 백그라운드 작업이 있으면 백그라운드 작업 페이지를 자동으로 펼치기',
-  settingsJobsDesc: '현재 대화에 새 백그라운드 작업이 생기면 사이드바를 자동으로 펼치고 백그라운드 작업 페이지를 엽니다(새 작업마다 트리거됨). 끄면 수동으로 열어야 합니다',
+  settingsSubagentTitle: '서브 에이전트를 감지하면 작업 관리 페이지 자동 활성화',
+  settingsSubagentDesc: '현재 대화에 새 서브 에이전트가 생기면 작업 관리 페이지를 활성화합니다. 넓은 화면에서는 사이드 카드도 펼치지만, 좁은 화면에서는 전체 화면 드로어를 강제로 열지 않습니다. 끄면 수동으로 열어야 합니다',
+  settingsJobsTitle: '새 백그라운드 작업이 생기면 작업 관리 페이지 자동 활성화',
+  settingsJobsDesc: '현재 대화에 새 백그라운드 작업이 생길 때마다 작업 관리 페이지를 활성화합니다(새 작업마다 트리거됨). 넓은 화면에서는 사이드 카드도 펼치지만, 좁은 화면에서는 전체 화면 드로어를 강제로 열지 않습니다. 끄면 수동으로 열어야 합니다',
   settingsToolsTitle: '모델에 터미널 도구 주입',
   settingsToolsDesc: '켜면 모델이 terminal_create 등 8개 도구로 사이드바 터미널을 만들고 조작할 수 있습니다(기본 꺼짐)',
   settingsFenceTitle: '워크스페이스 경로 검사',
@@ -320,6 +342,25 @@ export const ko: Record<string, string> = {
   sideChatClose: '스레드 닫기',
   sideChatCloseTitle: '스레드의 agent를 해제합니다(기록은 유지)',
   sideChatError: '사이드 대화 오류: {message}',
+  sideChatTurnUsage: '입력 {input} tok · 출력 {output} tok',
+  sideChatBlockCollapse: '접기',
+  sideChatBlockCollapseAria: '접기',
+  sideChatBlockExpand: '{hidden}줄 펼치기',
+  sideChatBlockExpandAria: '나머지 {hidden}줄 펼치기',
+  sideChatBlockSignal: '시그널로 종료됨: {signal}',
+  sideChatBlockExitCode: '종료 코드 {code}',
+  sideChatBlockRunning: '실행 중',
+  sideChatBlockFailed: '실패',
+  sideChatBlockDone: '완료',
+  sideChatBlockNoOutput: '(출력 없음)',
+  sideChatBlockFiles: '파일 {count}개',
+  sideChatBlockWindow: '전체 {total}줄 중 {shown}줄 표시',
+  sideChatConnDisconnected: '연결이 끊겼습니다',
+  sideChatConnReconnect: '다시 연결',
+  sideChatConnConnecting: '다시 연결 중…',
+  sideChatConnRecovered: '연결이 복원되었습니다',
+  sideChatConnReconnectAction: '지금 다시 연결',
+  sideChatConnRestartAction: '연결 다시 시작',
   jobs: '백그라운드 작업',
   jobsCount: '백그라운드 작업 {count}개',
   jobsCountRunning: '백그라운드 작업 {count}개 · {running} 실행 중',
@@ -372,4 +413,29 @@ export const ko: Record<string, string> = {
   pluginDocsPanelDesc: 'DSH 사이드바의 "전역 문서": 전역 Markdown 메모로, 어떤 작업 공간에서든 언제든 읽을 수 있습니다. 목록을 클릭해 읽기, 마우스를 올리면 개요로 이동, Chrome / VS Code에서 외부 열기, 코드 복사. 디렉터리를 설정할 수 있습니다(기본 ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'DeepSeek Harness용 에이전트 브라우저: 32개의 ego_* 도구가 실제 Chromium을 구동하며, 사이드바의 네이티브 «ego 브라우저» 탭에서 에이전트가 방문하는 모든 페이지를 실시간으로 볼 수 있습니다 — 클릭, 드래그, 타이핑으로 직접 조작할 수 있습니다. better-sidebar가 있으면 탭을 자동 등록하고, 없으면 플로팅 버블로 대체합니다',
   pluginBilingualReaderDesc: 'DSH 사이드바에서 PDF 읽기: 네이티브 PDF 표시, 텍스트를 선택해 LLM으로 번역, 컨텍스트 사용 및 메인 대화와 완전 격리',
+  changesRedactOn: "마스킹 켜짐: 민감 값이 [REDACTED]로 표시됩니다. 클릭하면 꺼집니다(책임 본인)",
+  changesRedactOff: "마스킹 꺼짐: 내용이 그대로 표시됩니다. 클릭하면 켜집니다",
+  changesRedactOnLabel: "마스킹 중",
+  changesRedactOffLabel: "마스킹 해제",
+  changesRedactBanner: "마스킹됨",
+  pluginSentinelName: 'dsh-sentinel 웨이크업 시스템',
+  pluginEgoBrowserName: 'ego-browser 에이전트 브라우저',
+  pluginBetterOverleafName: 'dsh-better-overleaf Overleaf 탭',
+  pluginDocsPanelName: 'dsh-docs-panel 전역 문서',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Git 자격 증명',
+  pluginGitRemotesName: 'dsh-git-remotes Git 리모트',
+  pluginGithubWorkbenchName: 'dsh-github-workbench GitHub 워크벤치',
+  pluginSidebarQaName: 'dsh-sidebar-qa 선택 후 질문',
+  pluginSidenoteName: 'dsh-sidenote 사이드 채팅',
+  pluginServerDeckName: 'dsh-server-deck 서버 데크',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH 터널',
+  pluginTurnReviewName: 'dsh-turn-review 턴 리뷰',
+  pluginBilingualReaderName: 'dsh-bilingual-reader 이중언어 리더',
+  pluginOfficeName: 'Office 미리보기',
+  pluginMdExportName: 'Markdown 내보내기',
+  pluginCodeNavName: '코드 미리보기 내비게이터',
+  pluginVideoPreviewName: '동영상 미리보기',
+  presetDshDesktopDesc: 'Electron 고급 모드(테두리 없음): macOS는 상단에 20px, Windows는 WCO가 없을 때 타이틀 바에 32px를 확보',
 }

src/client/locales-nl.ts

@@ -15,8 +15,24 @@
  */
 export const nl: Record<string, string> = {
   files: 'Bestanden',
+  changesSessionEmpty: 'Nog geen bestandsbewerkingen in deze sessie',
+  changesRead: 'Lezen',
+  changesMdReading: 'Lezen',
+  changesHtmlRender: "Renderen",
+  changesHtmlRaw: "Bron",
+  changesPdfRender: "Renderen",
+  changesPdfRaw: "Bron",
+  changesMdRaw: 'Brontekst',
+  changesWrite: 'Schrijven',
+  changesEdit: 'Bewerken',
+  changesRunning: 'actief',
+  changesError: 'fout',
+  changesFold: '{count} regels… klik om uit te klappen',
+  changesFoldLoading: 'Uitklappen…',
+  changesFoldUnavailable: 'Context niet beschikbaar',
+  changesContext: 'context',
+  changesPriorUnknown: 'Eerdere inhoud valt buiten het venster; getoond als volledig nieuw',
   explorer: 'Verkenner',
-  git: 'Bronbeheer',
   terminal: 'Terminal',
   editor: 'Editor',
   editorExplorer: 'Bestand openingsgedrag',
@@ -63,7 +79,6 @@ export const nl: Record<string, string> = {
   closeOtherTabs: 'Andere tabbladen sluiten',
   closeLeftTabs: 'Tabbladen links sluiten',
   closeRightTabs: 'Tabbladen rechts sluiten',
-  moveToFreeWindow: 'Naar vrij venster verplaatsen',
   floatDropHint: 'Loslaten om in een vrij venster te openen',
   dockToSidebar: 'Terug naar de zijbalk',
   pinTerminal: 'Terminal vastmaken',
@@ -78,8 +93,6 @@ export const nl: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Wereldwijd vastgemaakt',
   pinnedRailLabel: 'Vastgemaakte terminals',
   closePinnedTerminal: 'Terminal sluiten',
-  collapse: 'Zijbalk inklappen',
-  expand: 'Zijbalk uitklappen',
   collapseBottomPanel: 'Onderpaneel inklappen',
   expandBottomPanel: 'Onderpaneel uitklappen',
   terminalError: 'Terminalverbinding mislukt',
@@ -88,6 +101,7 @@ export const nl: Record<string, string> = {
   terminalDepsFailed: 'Terminalafhankelijkheid node-pty kon niet worden geladen',
   terminalDepsHint: 'Voer het onderstaande commando uit in een terminal of cmd op de DSH-machine om het te herstellen en probeer het opnieuw (node-pty blijft in sync met de DSH-coreversie):',
   terminalDepsProfile: ' (gedetecteerde profile: {profile})',
+  terminalShellNotFound: 'Geconfigureerde shell niet gevonden: {name} — controleer het shell-pad onder Instellingen → Side card → Terminal',
   preview: 'Voorbeeld',
   toc: 'Inhoudsopgave',
   edit: 'Bewerken',
@@ -126,7 +140,15 @@ export const nl: Record<string, string> = {
   worktree: 'Worktree',
   checkoutError: 'Wisselen van branch mislukt',
   history: 'Geschiedenis',
-  changes: 'Wijzigingen',
+  changes: 'Bestandswijzigingen',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Sessie',
+  changesFilterAll: 'Alles',
+  changesFilterEmpty: 'Geen bewerkingen van dit soort',
+  changesOpenDiffTab: 'In eigen diff-tabblad openen',
+  changesClosePreview: 'Voorbeeld sluiten',
+  changesResizePreview: 'Voorbeeld vergroten/verkleinen',
+  changesLoadError: 'Sessiebestandsregistraties zijn nu niet beschikbaar',
   staged: 'Gestaged',
   unstaged: 'Niet gestaged',
   cancel: 'Annuleren',
@@ -174,6 +196,13 @@ export const nl: Record<string, string> = {
   addToConversation: 'Aan conversatie toevoegen',
   copyRelative: 'Relatief pad kopiëren',
   copyAbsolute: 'Absoluut pad kopiëren',
+  rename: 'Naam wijzigen',
+  renameInvalid: 'De naam mag niet leeg zijn of padscheidingstekens bevatten.',
+  delete: 'Verwijderen',
+  deleteTitle: '"{name}" verwijderen?',
+  deleteDescFile: 'Dit verwijdert het bestand permanent. Dit kan niet ongedaan worden gemaakt.',
+  deleteDescDir: 'Dit verwijdert de map en alles erin permanent. Dit kan niet ongedaan worden gemaakt.',
+  dismiss: 'Sluiten',
   download: 'Downloaden',
   uploadFiles: 'Bestanden uploaden',
   uploadFolder: 'Map uploaden',
@@ -192,13 +221,6 @@ export const nl: Record<string, string> = {
   settingsIntro: 'Beheer wat de zijkaart toont en hoe deze zich gedraagt',
   settingsPopupDesc: 'Gerelateerde opties voor {feature} configureren',
   settingsDone: 'Klaar',
-  settingsOpenTitle: 'Standaard openen voor nieuwe conversaties',
-  settingsOpenDesc: 'De zijkaart automatisch uitklappen voor gloednieuwe conversaties; bestaande conversaties behouden hun eigen layout',
-  settingsWidthTitle: 'Standaard breedte-aandeel',
-  settingsWidthDesc: 'Het standaard breedte-aandeel van de zijkaart voor nieuwe conversaties (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Chatbestanden in de zijbalk openen',
-  settingsOpenPathDesc: 'Bestandslinks in de chat (toolrijen, geproduceerde bestanden, vermeldingen) openen in de zijbalk-editor in plaats van de standaard systeemapp',
   settingsOpenToolsTitle: 'Zijbalk-openen-tool voor het model injecteren',
   settingsOpenToolsDesc: 'Indien ingeschakeld kan het model bestanden, mappen en HTTP(S)-pagina\'s in de zijbalk openen via de sidebar_open-tool (standaard uit)',
   settingsTitleBarTitle: 'Positiecompatibiliteitsmodus',
@@ -219,10 +241,10 @@ export const nl: Record<string, string> = {
   settingsConflict: 'De instelling is in een ander venster gewijzigd — probeer het opnieuw',
   binaryNoPreview: 'Dit bestandstype kan niet worden gepreviewed',
   downloadToView: 'Downloaden om te bekijken',
-  settingsSubagentTitle: 'Taken-pagina automatisch openen wanneer een subagent verschijnt',
-  settingsSubagentDesc: 'De zijkaart uitklappen en de Taken-pagina openen wanneer de huidige conversatie een nieuwe subagent voortbrengt; schakel uit om het handmatig te openen',
-  settingsJobsTitle: 'Jobs-pagina automatisch openen bij een nieuwe achtergrondtaak',
-  settingsJobsDesc: 'De zijkaart uitklappen en de Jobs-pagina openen telkens een nieuwe achtergrondtaak verschijnt voor de huidige conversatie (elke nieuwe taak triggert); schakel uit om het handmatig te openen',
+  settingsSubagentTitle: 'Activeer de Taken-pagina automatisch wanneer een subagent verschijnt',
+  settingsSubagentDesc: 'Wanneer de huidige conversatie een nieuwe subagent start, wordt de Taken-pagina automatisch geactiveerd; op brede schermen wordt ook de zijkaart uitgeklapt, terwijl op smalle schermen het schuifpaneel op volledig scherm niet geforceerd wordt geopend; schakel uit om de pagina handmatig te selecteren',
+  settingsJobsTitle: 'Activeer de Taken-pagina automatisch bij een nieuwe achtergrondtaak',
+  settingsJobsDesc: 'Wanneer er voor de huidige conversatie een nieuwe achtergrondtaak verschijnt, wordt de Taken-pagina automatisch geactiveerd (dit gebeurt bij elke nieuwe taak); op brede schermen wordt ook de zijkaart uitgeklapt, terwijl op smalle schermen het schuifpaneel op volledig scherm niet geforceerd wordt geopend; schakel uit om de pagina handmatig te selecteren',
   settingsToolsTitle: 'Terminaltools voor het model injecteren',
   settingsToolsDesc: 'Indien ingeschakeld kan het model zijbalk-terminals aanmaken en besturen via de 8 terminal_*-tools (standaard uit)',
   settingsFenceTitle: 'Workspace-padcontrole',
@@ -326,6 +348,25 @@ export const nl: Record<string, string> = {
   sideChatClose: 'Thread sluiten',
   sideChatCloseTitle: 'De agent van de thread vrijgeven (geschiedenis blijft behouden)',
   sideChatError: 'Side Chat-fout: {message}',
+  sideChatTurnUsage: 'Invoer {input} tok · Uitvoer {output} tok',
+  sideChatBlockCollapse: 'Invouwen',
+  sideChatBlockCollapseAria: 'Invouwen',
+  sideChatBlockExpand: '{hidden} regels uitvouwen',
+  sideChatBlockExpandAria: '{hidden} regels meer uitvouwen',
+  sideChatBlockSignal: 'Beëindigd door signaal: {signal}',
+  sideChatBlockExitCode: 'Exitcode {code}',
+  sideChatBlockRunning: 'Wordt uitgevoerd',
+  sideChatBlockFailed: 'Mislukt',
+  sideChatBlockDone: 'Voltooid',
+  sideChatBlockNoOutput: '(geen uitvoer)',
+  sideChatBlockFiles: '{count} bestanden',
+  sideChatBlockWindow: '{shown} van {total} regels',
+  sideChatConnDisconnected: 'Verbinding verbroken',
+  sideChatConnReconnect: 'Opnieuw verbinden',
+  sideChatConnConnecting: 'Opnieuw verbinden…',
+  sideChatConnRecovered: 'Verbinding hersteld',
+  sideChatConnReconnectAction: 'Nu opnieuw verbinden',
+  sideChatConnRestartAction: 'Verbinding herstarten',
   jobs: 'Achtergrondtaken',
   jobsCount: '{count} achtergrondtaken',
   jobsCountRunning: '{count} achtergrondtaken · {running} actief',
@@ -378,4 +419,29 @@ export const nl: Record<string, string> = {
   pluginDocsPanelDesc: 'Globale docs in de DSH-zijbalk: lees uw eigen Markdown-notities vanuit elke werkruimte — een bestandslijst, een outline, openen in Chrome / VS Code, en kopieerknoppen; de docs-map is configureerbaar (standaard ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'De agentbrowser voor DeepSeek Harness: 32 ego_*-tools besturen een echt Chromium; een native «ego-browser»-tab in de zijbalk toont live elke pagina die de agent bezoekt — u kunt klikken, slepen en typen om over te nemen. Registreert de tab automatisch als better-sidebar aanwezig is, anders een zwevende bel',
   pluginBilingualReaderDesc: 'Lees PDF’s in de DSH-zijbalk: native PDF-weergave, selecteer tekst om te vertalen met de LLM, met context en volledig geïsoleerd van het hoofdgesprek',
+  changesRedactOn: "Redactie aan: geheimen worden als [REDACTED] getoond; klik om uit te schakelen (op eigen risico)",
+  changesRedactOff: "Redactie uit: inhoud wordt ongewijzigd getoond; klik om in te schakelen",
+  changesRedactOnLabel: "Redactie",
+  changesRedactOffLabel: "Zonder redactie",
+  changesRedactBanner: "Geredigeerd",
+  pluginSentinelName: 'dsh-sentinel Weksysteem',
+  pluginEgoBrowserName: 'ego-browser Agentbrowser',
+  pluginBetterOverleafName: 'dsh-better-overleaf Overleaf-tab',
+  pluginDocsPanelName: 'dsh-docs-panel Globale documenten',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Git-inloggegevens',
+  pluginGitRemotesName: 'dsh-git-remotes Git-remotes',
+  pluginGithubWorkbenchName: 'dsh-github-workbench GitHub-workbench',
+  pluginSidebarQaName: 'dsh-sidebar-qa Selecteren & vragen',
+  pluginSidenoteName: 'dsh-sidenote Zijchat',
+  pluginServerDeckName: 'dsh-server-deck Serverdeck',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH-tunnel',
+  pluginTurnReviewName: 'dsh-turn-review Beurtreview',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Tweetalige lezer',
+  pluginOfficeName: 'Office-voorvertoning',
+  pluginMdExportName: 'Markdown-export',
+  pluginCodeNavName: 'Codevoorvertoning-navigator',
+  pluginVideoPreviewName: 'Videovoorvertoning',
+  presetDshDesktopDesc: 'Geavanceerde Electronmodus (zonder rand): macOS reserveert 20px bovenaan; Windows reserveert 32px voor de titelbalk wanneer WCO niet beschikbaar is',
 }

src/client/locales-pl.ts

@@ -19,8 +19,24 @@
 /** The pl dictionary (key-set-equal to zh, enforced by the type annotation in locales.ts). */
 export const pl: Record<string, string> = {
   files: 'Pliki',
+  changesSessionEmpty: 'Brak operacji na plikach w tej sesji',
+  changesRead: 'Odczyt',
+  changesMdReading: 'Czytanie',
+  changesHtmlRender: "Renderuj",
+  changesHtmlRaw: "Źródło",
+  changesPdfRender: "Renderuj",
+  changesPdfRaw: "Źródło",
+  changesMdRaw: 'Źródło',
+  changesWrite: 'Zapis',
+  changesEdit: 'Edycja',
+  changesRunning: 'w toku',
+  changesError: 'błąd',
+  changesFold: '{count} wierszy… kliknij, aby rozwinąć',
+  changesFoldLoading: 'Rozwijanie…',
+  changesFoldUnavailable: 'Kontekst niedostępny',
+  changesContext: 'kontekst',
+  changesPriorUnknown: 'Zawartość sprzed zmiany jest poza oknem; pokazana jako w całości nowa',
   explorer: 'Eksplorator',
-  git: 'Kontrola źródła',
   terminal: 'Terminal',
   editor: 'Edytor',
   editorExplorer: 'Sposób otwierania plików',
@@ -67,7 +83,6 @@ export const pl: Record<string, string> = {
   closeOtherTabs: 'Zamknij inne karty',
   closeLeftTabs: 'Zamknij karty po lewej',
   closeRightTabs: 'Zamknij karty po prawej',
-  moveToFreeWindow: 'Przenieś do wolnego okna',
   floatDropHint: 'Puść, aby otworzyć w wolnym oknie',
   dockToSidebar: 'Wróć do panelu bocznego',
   pinTerminal: 'Przypnij Terminal',
@@ -82,8 +97,6 @@ export const pl: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Przypięty globalnie',
   pinnedRailLabel: 'Przypięte terminale',
   closePinnedTerminal: 'Zamknij terminal',
-  collapse: 'Zwiń panel boczny',
-  expand: 'Rozwiń panel boczny',
   collapseBottomPanel: 'Zwiń panel dolny',
   expandBottomPanel: 'Rozwiń panel dolny',
   terminalError: 'Połączenie z terminalem nie powiodło się',
@@ -92,6 +105,7 @@ export const pl: Record<string, string> = {
   terminalDepsFailed: 'Zależność terminala node-pty nie mogła się załadować',
   terminalDepsHint: 'Uruchom poniższe polecenie w terminalu lub cmd na maszynie DSH, aby to naprawić, a następnie ponów (node-pty pozostaje w synchronizacji z wersją rdzenia DSH):',
   terminalDepsProfile: ' (wykryty profil: {profile})',
+  terminalShellNotFound: 'Nie znaleziono skonfigurowanej powłoki: {name} — sprawdź ścieżkę powłoki w Ustawienia → Side card → Terminal',
   preview: 'Podgląd',
   toc: 'Spis treści',
   edit: 'Edytuj',
@@ -130,7 +144,15 @@ export const pl: Record<string, string> = {
   worktree: 'Drzewo robocze',
   checkoutError: 'Przełączenie gałęzi nie powiodło się',
   history: 'Historia',
-  changes: 'Zmiany',
+  changes: 'Zmiany plików',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Sesja',
+  changesFilterAll: 'Wszystko',
+  changesFilterEmpty: 'Brak operacji tego rodzaju',
+  changesOpenDiffTab: 'Otwórz w osobnej karcie',
+  changesClosePreview: 'Zamknij podgląd',
+  changesResizePreview: 'Zmień wysokość podglądu',
+  changesLoadError: 'Zapisy plików sesji są teraz niedostępne',
   staged: 'W indeksie',
   unstaged: 'Poza indeksem',
   cancel: 'Anuluj',
@@ -178,6 +200,13 @@ export const pl: Record<string, string> = {
   addToConversation: 'Dodaj do rozmowy',
   copyRelative: 'Kopiuj ścieżkę względną',
   copyAbsolute: 'Kopiuj ścieżkę bezwzględną',
+  rename: 'Zmień nazwę',
+  renameInvalid: 'Nazwa nie może być pusta ani zawierać separatorów ścieżki.',
+  delete: 'Usuń',
+  deleteTitle: 'Usunąć „{name}”?',
+  deleteDescFile: 'Spowoduje to trwałe usunięcie pliku. Tej operacji nie można cofnąć.',
+  deleteDescDir: 'Spowoduje to trwałe usunięcie katalogu i całej jego zawartości. Tej operacji nie można cofnąć.',
+  dismiss: 'Zamknij',
   download: 'Pobierz',
   uploadFiles: 'Wgraj pliki',
   uploadFolder: 'Wgraj folder',
@@ -196,13 +225,6 @@ export const pl: Record<string, string> = {
   settingsIntro: 'Zarządzaj tym, co pokazuje karta boczna i jak się zachowuje',
   settingsPopupDesc: 'Skonfiguruj opcje powiązane z: {feature}',
   settingsDone: 'Gotowe',
-  settingsOpenTitle: 'Otwórz domyślnie dla nowych rozmów',
-  settingsOpenDesc: 'Rozwiń kartę boczną automatycznie dla zupełnie nowych rozmów; istniejące rozmowy zachowują własne układy',
-  settingsWidthTitle: 'Domyślny udział szerokości',
-  settingsWidthDesc: 'Domyślny udział szerokości okna dla karty bocznej w nowych rozmowach (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Otwieraj pliki czatu w panelu bocznym',
-  settingsOpenPathDesc: 'Otwieraj linki plików na czacie (wiersze narzędzi, wyprodukowane pliki, wzmianki) w edytorze panelu bocznego zamiast w domyślnej aplikacji systemu',
   settingsOpenToolsTitle: 'Wstrzyknij narzędzie otwierania panelu bocznego dla modelu',
   settingsOpenToolsDesc: 'Po włączeniu model może otwierać pliki, foldery i strony HTTP(S) w panelu bocznym za pomocą narzędzia sidebar_open (domyślnie wyłączone)',
   settingsTitleBarTitle: 'Tryb zgodności pozycji',
@@ -223,10 +245,10 @@ export const pl: Record<string, string> = {
   settingsConflict: 'Ustawienie zmienione w innym oknie — spróbuj ponownie',
   binaryNoPreview: 'Tego typu pliku nie można wyświetlić w podglądzie',
   downloadToView: 'Pobierz, aby zobaczyć',
-  settingsSubagentTitle: 'Automatycznie otwieraj stronę Zadań przy pojawieniu się podagenta',
-  settingsSubagentDesc: 'Gdy bieżąca rozmowa powoła nowego podagenta, rozwiń panel boczny i otwórz stronę Zadań; wyłącz, aby otwierać ręcznie',
-  settingsJobsTitle: 'Automatycznie otwieraj stronę zadań w tle przy nowym zadaniu',
-  settingsJobsDesc: 'Gdy w bieżącej rozmowie pojawi się nowe zadanie w tle, rozwiń panel boczny i otwórz stronę zadań w tle (każde nowe zadanie wyzwala); wyłącz, aby otwierać ręcznie',
+  settingsSubagentTitle: 'Automatycznie aktywuj stronę „Zadania” po pojawieniu się podagenta',
+  settingsSubagentDesc: 'Gdy w bieżącej rozmowie pojawi się nowy podagent, automatycznie aktywuj stronę „Zadania”; na szerokich ekranach rozwiń także panel boczny, a na wąskich nie wymuszaj otwarcia pełnoekranowego panelu; wyłącz, aby wybierać stronę ręcznie',
+  settingsJobsTitle: 'Automatycznie aktywuj stronę „Zadania” po pojawieniu się nowego zadania w tle',
+  settingsJobsDesc: 'Gdy w bieżącej rozmowie pojawi się nowe zadanie w tle, automatycznie aktywuj stronę „Zadania” (akcja jest wyzwalana przez każde nowe zadanie); na szerokich ekranach rozwiń także panel boczny, a na wąskich nie wymuszaj otwarcia pełnoekranowego panelu; wyłącz, aby wybierać stronę ręcznie',
   settingsToolsTitle: 'Wstrzyknij narzędzia terminala dla modelu',
   settingsToolsDesc: 'Po włączeniu model może tworzyć i sterować terminalami panelu bocznego przez 8 narzędzi terminal_* (domyślnie wyłączone)',
   settingsFenceTitle: 'Kontrola ścieżek obszaru roboczego',
@@ -330,6 +352,25 @@ export const pl: Record<string, string> = {
   sideChatClose: 'Zamknij wątek',
   sideChatCloseTitle: 'Zwolnij agenta wątku (historia jest zachowana)',
   sideChatError: 'Błąd czatu bocznego: {message}',
+  sideChatTurnUsage: 'Wejście {input} tok · Wyjście {output} tok',
+  sideChatBlockCollapse: 'Zwiń',
+  sideChatBlockCollapseAria: 'Zwiń',
+  sideChatBlockExpand: 'Rozwiń {hidden} wierszy',
+  sideChatBlockExpandAria: 'Rozwiń kolejne {hidden} wierszy',
+  sideChatBlockSignal: 'Zakończono sygnałem: {signal}',
+  sideChatBlockExitCode: 'Kod zakończenia {code}',
+  sideChatBlockRunning: 'Uruchomione',
+  sideChatBlockFailed: 'Niepowodzenie',
+  sideChatBlockDone: 'Zakończono',
+  sideChatBlockNoOutput: '(brak wyniku)',
+  sideChatBlockFiles: 'Pliki: {count}',
+  sideChatBlockWindow: '{shown} z {total} wierszy',
+  sideChatConnDisconnected: 'Połączenie utracone',
+  sideChatConnReconnect: 'Połącz ponownie',
+  sideChatConnConnecting: 'Łączenie ponownie…',
+  sideChatConnRecovered: 'Połączenie przywrócone',
+  sideChatConnReconnectAction: 'Połącz ponownie teraz',
+  sideChatConnRestartAction: 'Uruchom połączenie ponownie',
   jobs: 'Zadania w tle',
   jobsCount: '{count} zadań w tle',
   jobsCountRunning: '{count} zadań w tle · {running} działa',
@@ -382,4 +423,29 @@ export const pl: Record<string, string> = {
   pluginDocsPanelDesc: 'Globalne dokumenty w panelu bocznym DSH: globalne notatki Markdown, czytelne z dowolnego obszaru roboczego — lista z kliknięciem, kontur z przejściami, otwieranie w Chrome / VS Code i przyciski kopiowania kodu; katalog konfigurowalny (domyślnie ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'Przeglądarka agenta dla DeepSeek Harness: 32 narzędzia ego_* sterują prawdziwym Chromium; natywna karta «ego browser» na pasku bocznym pokazuje na żywo każdą stronę odwiedzaną przez agenta — możesz klikać, przeciągać i pisać, aby przejąć kontrolę. Karta rejestruje się automatycznie, gdy better-sidebar jest zainstalowany; w przeciwnym razie pływający dymek',
   pluginBilingualReaderDesc: 'Czytaj PDF-y w panelu bocznym DSH: natywny podgląd PDF, zaznacz tekst, aby przetłumaczyć go LLM-em, z kontekstem i całkowicie izolowany od głównej rozmowy',
+  changesRedactOn: "Redakcja włączona: tajne dane pokazywane jako [REDACTED]; kliknij, aby wyłączyć (na własne ryzyko)",
+  changesRedactOff: "Redakcja wyłączona: treść pokazywana bez zmian; kliknij, aby włączyć",
+  changesRedactOnLabel: "Redakcja",
+  changesRedactOffLabel: "Bez redakcji",
+  changesRedactBanner: "Zredagowano",
+  pluginSentinelName: 'dsh-sentinel System wybudzania',
+  pluginEgoBrowserName: 'ego-browser Przeglądarka agenta',
+  pluginBetterOverleafName: 'dsh-better-overleaf Karta Overleaf',
+  pluginDocsPanelName: 'dsh-docs-panel Dokumenty globalne',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Dane uwierzytelniające Git',
+  pluginGitRemotesName: 'dsh-git-remotes Zdalne repozytoria Git',
+  pluginGithubWorkbenchName: 'dsh-github-workbench Warsztat GitHub',
+  pluginSidebarQaName: 'dsh-sidebar-qa Zaznacz i zapytaj',
+  pluginSidenoteName: 'dsh-sidenote Czat boczny',
+  pluginServerDeckName: 'dsh-server-deck Panel serwerów',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel Tunel SSH',
+  pluginTurnReviewName: 'dsh-turn-review Rewizja tury',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Czytnik dwujęzyczny',
+  pluginOfficeName: 'Podgląd Office',
+  pluginMdExportName: 'Eksport Markdown',
+  pluginCodeNavName: 'Nawigator podglądu kodu',
+  pluginVideoPreviewName: 'Podgląd wideo',
+  presetDshDesktopDesc: 'Tryb zaawansowany Electron (bez ramki): macOS rezerwuje 20px u góry; Windows bez WCO rezerwuje 32px na pasek tytułu',
 }

src/client/locales-pt.ts

@@ -1,7 +1,23 @@
 export const pt: Record<string, string> = {
   files: 'Arquivos',
+  changesSessionEmpty: 'Ainda sem operações de arquivo nesta sessão',
+  changesRead: 'Leitura',
+  changesMdReading: 'Leitura',
+  changesHtmlRender: "Renderizar",
+  changesHtmlRaw: "Fonte",
+  changesPdfRender: "Renderizar",
+  changesPdfRaw: "Fonte",
+  changesMdRaw: 'Bruto',
+  changesWrite: 'Escrita',
+  changesEdit: 'Edição',
+  changesRunning: 'em execução',
+  changesError: 'erro',
+  changesFold: '{count} linhas… clique para expandir',
+  changesFoldLoading: 'Expandindo…',
+  changesFoldUnavailable: 'Contexto indisponível',
+  changesContext: 'contexto',
+  changesPriorUnknown: 'O conteúdo anterior está fora da janela; mostrado como totalmente adicionado',
   explorer: 'Explorador',
-  git: 'Controle de código-fonte',
   terminal: 'Terminal',
   editor: 'Editor',
   editorExplorer: 'Comportamento de abertura de arquivos',
@@ -48,7 +64,6 @@ export const pt: Record<string, string> = {
   closeOtherTabs: 'Fechar outras abas',
   closeLeftTabs: 'Fechar abas à esquerda',
   closeRightTabs: 'Fechar abas à direita',
-  moveToFreeWindow: 'Mover para janela flutuante',
   floatDropHint: 'Solte para abrir em uma janela flutuante',
   dockToSidebar: 'Voltar para a barra lateral',
   pinTerminal: 'Fixar Terminal',
@@ -63,8 +78,6 @@ export const pt: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Fixado globalmente',
   pinnedRailLabel: 'Terminais Fixados',
   closePinnedTerminal: 'Fechar Terminal',
-  collapse: 'Recolher barra lateral',
-  expand: 'Expandir barra lateral',
   collapseBottomPanel: 'Recolher painel inferior',
   expandBottomPanel: 'Expandir painel inferior',
   terminalError: 'Falha na conexão do terminal',
@@ -73,6 +86,7 @@ export const pt: Record<string, string> = {
   terminalDepsFailed: 'A dependência do terminal node-pty falhou ao carregar',
   terminalDepsHint: 'Execute o comando abaixo em um terminal ou cmd na máquina do DSH para reparar e tente novamente (node-pty permanece em sincronia com a versão do núcleo do DSH):',
   terminalDepsProfile: ' (perfil detectado: {profile})',
+  terminalShellNotFound: 'Shell configurado não encontrado: {name} — verifique o caminho do shell em Configurações → Side card → Terminal',
   preview: 'Pré-visualizar',
   toc: 'Sumário',
   edit: 'Editar',
@@ -112,6 +126,14 @@ export const pt: Record<string, string> = {
   checkoutError: 'Falha ao alternar de branch',
   history: 'Histórico',
   changes: 'Alterações',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Sessão',
+  changesFilterAll: 'Tudo',
+  changesFilterEmpty: 'Nenhuma operação deste tipo',
+  changesOpenDiffTab: 'Abrir em uma aba de diff',
+  changesClosePreview: 'Fechar prévia',
+  changesResizePreview: 'Ajustar altura da prévia',
+  changesLoadError: 'Os registros de arquivos da sessão estão indisponíveis no momento',
   staged: 'Preparadas',
   unstaged: 'Não preparadas',
   cancel: 'Cancelar',
@@ -159,6 +181,13 @@ export const pt: Record<string, string> = {
   addToConversation: 'Adicionar à conversa',
   copyRelative: 'Copiar caminho relativo',
   copyAbsolute: 'Copiar caminho absoluto',
+  rename: 'Renomear',
+  renameInvalid: 'O nome não pode ser vazio nem conter separadores de caminho.',
+  delete: 'Excluir',
+  deleteTitle: 'Excluir "{name}"?',
+  deleteDescFile: 'Isso exclui o arquivo permanentemente. Esta ação não pode ser desfeita.',
+  deleteDescDir: 'Isso exclui o diretório e todo o seu conteúdo permanentemente. Esta ação não pode ser desfeita.',
+  dismiss: 'Fechar',
   download: 'Baixar',
   uploadFiles: 'Enviar arquivos',
   uploadFolder: 'Enviar pasta',
@@ -177,13 +206,6 @@ export const pt: Record<string, string> = {
   settingsIntro: 'Gerencie o que o cartão lateral mostra e como ele se comporta',
   settingsPopupDesc: 'Configurar opções relacionadas para {feature}',
   settingsDone: 'Concluído',
-  settingsOpenTitle: 'Abrir por padrão em novas conversas',
-  settingsOpenDesc: 'Expandir o cartão lateral automaticamente em conversas totalmente novas; conversas existentes mantêm seus próprios layouts',
-  settingsWidthTitle: 'Participação padrão na largura',
-  settingsWidthDesc: 'Participação padrão do cartão lateral na largura da janela em novas conversas (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Abrir arquivos do chat na barra lateral',
-  settingsOpenPathDesc: 'Abrir links de arquivos no chat (linhas de ferramentas, arquivos produzidos, menções) no editor da barra lateral em vez do aplicativo padrão do sistema',
   settingsOpenToolsTitle: 'Injetar a ferramenta de abertura na barra lateral para o modelo',
   settingsOpenToolsDesc: 'Quando ativado, o modelo pode abrir arquivos, pastas e páginas HTTP(S) na barra lateral pela ferramenta sidebar_open (desativado por padrão)',
   settingsTitleBarTitle: 'Modo de compatibilidade de posição',
@@ -204,10 +226,10 @@ export const pt: Record<string, string> = {
   settingsConflict: 'A configuração foi alterada em outra janela — tente novamente',
   binaryNoPreview: 'Este tipo de arquivo não pode ser pré-visualizado',
   downloadToView: 'Baixar para ver',
-  settingsSubagentTitle: 'Abrir automaticamente a página de Tarefas quando um subagente aparecer',
-  settingsSubagentDesc: 'Expandir o cartão lateral e abrir a página de Tarefas quando a conversa atual gerar um novo subagente; desative para abrir manualmente',
-  settingsJobsTitle: 'Abrir automaticamente a página de Tarefas em segundo plano quando houver uma nova tarefa',
-  settingsJobsDesc: 'Expandir o cartão lateral e abrir a página de Tarefas sempre que uma nova tarefa em segundo plano aparecer para a conversa atual (cada nova tarefa dispara); desative para abrir manualmente',
+  settingsSubagentTitle: 'Ativar automaticamente a página de Tarefas quando um subagente aparecer',
+  settingsSubagentDesc: 'Ativar a página de Tarefas quando a conversa atual gerar um novo subagente; em telas largas, expandir também o cartão lateral; em telas estreitas, não forçar a abertura da gaveta em tela cheia; desative para abri-la manualmente',
+  settingsJobsTitle: 'Ativar automaticamente a página de Tarefas quando houver uma nova tarefa em segundo plano',
+  settingsJobsDesc: 'Ativar a página de Tarefas sempre que uma nova tarefa em segundo plano aparecer na conversa atual (cada nova tarefa aciona a ativação); em telas largas, expandir também o cartão lateral; em telas estreitas, não forçar a abertura da gaveta em tela cheia; desative para abri-la manualmente',
   settingsToolsTitle: 'Injetar ferramentas de terminal para o modelo',
   settingsToolsDesc: 'Quando ativado, o modelo pode criar e operar terminais da barra lateral por meio das 8 ferramentas terminal_* (desativado por padrão)',
   settingsFenceTitle: 'Controle de caminhos do workspace',
@@ -311,6 +333,25 @@ export const pt: Record<string, string> = {
   sideChatClose: 'Fechar tópico',
   sideChatCloseTitle: 'Liberar o agente do tópico (o histórico é mantido)',
   sideChatError: 'Erro no chat lateral: {message}',
+  sideChatTurnUsage: 'Entrada {input} tok · Saída {output} tok',
+  sideChatBlockCollapse: 'Recolher',
+  sideChatBlockCollapseAria: 'Recolher',
+  sideChatBlockExpand: 'Expandir {hidden} linhas',
+  sideChatBlockExpandAria: 'Expandir mais {hidden} linhas',
+  sideChatBlockSignal: 'Encerrado por sinal: {signal}',
+  sideChatBlockExitCode: 'Código de saída {code}',
+  sideChatBlockRunning: 'Em execução',
+  sideChatBlockFailed: 'Falhou',
+  sideChatBlockDone: 'Concluído',
+  sideChatBlockNoOutput: '(sem saída)',
+  sideChatBlockFiles: '{count} arquivos',
+  sideChatBlockWindow: '{shown} de {total} linhas',
+  sideChatConnDisconnected: 'Conexão perdida',
+  sideChatConnReconnect: 'Reconectar',
+  sideChatConnConnecting: 'Reconectando…',
+  sideChatConnRecovered: 'Conexão restabelecida',
+  sideChatConnReconnectAction: 'Reconectar agora',
+  sideChatConnRestartAction: 'Reiniciar conexão',
   jobs: 'Tarefas em segundo plano',
   jobsCount: '{count} tarefas em segundo plano',
   jobsCountRunning: '{count} tarefas em segundo plano · {running} executando',
@@ -363,4 +404,29 @@ export const pt: Record<string, string> = {
   pluginDocsPanelDesc: 'Documentos globais na barra lateral do DSH: leia suas próprias notas Markdown de qualquer workspace — uma lista de arquivos, um sumário, abrir no Chrome / VS Code e botões de copiar; o diretório de documentos é configurável (padrão ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'O navegador de agente para o DeepSeek Harness: 32 ferramentas ego_* controlam um Chromium real; uma aba nativa «ego browser» na barra lateral mostra ao vivo cada página visitada pelo agente — você pode clicar, arrastar e digitar para assumir. Registra a aba automaticamente quando o better-sidebar está presente; caso contrário, uma bolha flutuante',
   pluginBilingualReaderDesc: 'Leia PDFs na barra lateral do DSH: visualização nativa de PDF, selecione o texto para traduzir com o LLM, com contexto e totalmente isolado da conversa principal',
+  changesRedactOn: "Máscara ativa: segredos exibidos como [REDACTED]; clique para desativar (por sua conta)",
+  changesRedactOff: "Máscara desativada: conteúdo exibido como está; clique para ativar",
+  changesRedactOnLabel: "Máscara",
+  changesRedactOffLabel: "Sem máscara",
+  changesRedactBanner: "Mascarado",
+  pluginSentinelName: 'dsh-sentinel Sistema de despertar',
+  pluginEgoBrowserName: 'ego-browser Navegador de agentes',
+  pluginBetterOverleafName: 'dsh-better-overleaf Aba Overleaf',
+  pluginDocsPanelName: 'dsh-docs-panel Documentos globais',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Credenciais Git',
+  pluginGitRemotesName: 'dsh-git-remotes Remotos Git',
+  pluginGithubWorkbenchName: 'dsh-github-workbench Bancada GitHub',
+  pluginSidebarQaName: 'dsh-sidebar-qa Selecionar e perguntar',
+  pluginSidenoteName: 'dsh-sidenote Chat lateral',
+  pluginServerDeckName: 'dsh-server-deck Deck de servidores',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel Túnel SSH',
+  pluginTurnReviewName: 'dsh-turn-review Revisão do turno',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Leitor bilíngue',
+  pluginOfficeName: 'Pré-visualização Office',
+  pluginMdExportName: 'Exportação Markdown',
+  pluginCodeNavName: 'Navegador de pré-visualização de código',
+  pluginVideoPreviewName: 'Pré-visualização de vídeo',
+  presetDshDesktopDesc: 'Modo avançado Electron (sem moldura): o macOS reserva 20px no topo; o Windows reserva 32px para a barra de título sem WCO',
 }

src/client/locales-ru.ts

@@ -13,8 +13,24 @@
 
 export const ru: Record<string, string> = {
   files: 'Файлы',
+  changesSessionEmpty: 'В этой сессии пока нет файловых операций',
+  changesRead: 'Чтение',
+  changesMdReading: 'Чтение',
+  changesHtmlRender: "Рендер",
+  changesHtmlRaw: "Исходник",
+  changesPdfRender: "Рендер",
+  changesPdfRaw: "Исходник",
+  changesMdRaw: 'Исходный текст',
+  changesWrite: 'Запись',
+  changesEdit: 'Изменение',
+  changesRunning: 'выполняется',
+  changesError: 'ошибка',
+  changesFold: '{count} строк… нажмите, чтобы развернуть',
+  changesFoldLoading: 'Разворачивание…',
+  changesFoldUnavailable: 'Контекст недоступен',
+  changesContext: 'контекст',
+  changesPriorUnknown: 'Содержимое до изменения вне окна; показано как полностью добавленное',
   explorer: 'Проводник',
-  git: 'Контроль версий',
   terminal: 'Терминал',
   editor: 'Редактор',
   editorExplorer: 'Способ открытия файлов',
@@ -61,7 +77,6 @@ export const ru: Record<string, string> = {
   closeOtherTabs: 'Закрыть остальные вкладки',
   closeLeftTabs: 'Закрыть вкладки слева',
   closeRightTabs: 'Закрыть вкладки справа',
-  moveToFreeWindow: 'Переместить в свободное окно',
   floatDropHint: 'Отпустите, чтобы открыть в свободном окне',
   dockToSidebar: 'Вернуть на боковую панель',
   pinTerminal: 'Закрепить терминал',
@@ -76,8 +91,6 @@ export const ru: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Закреплён глобально',
   pinnedRailLabel: 'Закреплённые терминалы',
   closePinnedTerminal: 'Закрыть терминал',
-  collapse: 'Свернуть боковую панель',
-  expand: 'Развернуть боковую панель',
   collapseBottomPanel: 'Свернуть нижнюю панель',
   expandBottomPanel: 'Развернуть нижнюю панель',
   terminalError: 'Сбой подключения терминала',
@@ -86,6 +99,7 @@ export const ru: Record<string, string> = {
   terminalDepsFailed: 'Не удалось загрузить зависимость терминала node-pty',
   terminalDepsHint: 'Выполните приведённую ниже команду в терминале или cmd на машине DSH, затем нажмите «Повторить» (node-pty остаётся синхронизированным с версией ядра DSH):',
   terminalDepsProfile: ' (обнаружен profile: {profile})',
+  terminalShellNotFound: 'Настроенная оболочка не найдена: {name} — проверьте путь к оболочке в Настройки → Side card → Terminal',
   preview: 'Предпросмотр',
   toc: 'Оглавление',
   edit: 'Изменить',
@@ -124,7 +138,15 @@ export const ru: Record<string, string> = {
   worktree: 'Рабочее дерево',
   checkoutError: 'Сбой переключения ветки',
   history: 'История',
-  changes: 'Изменения',
+  changes: 'Изменения файлов',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Сессия',
+  changesFilterAll: 'Все',
+  changesFilterEmpty: 'Нет операций этого типа',
+  changesOpenDiffTab: 'Открыть в отдельной вкладке',
+  changesClosePreview: 'Закрыть просмотр',
+  changesResizePreview: 'Изменить высоту просмотра',
+  changesLoadError: 'Записи файлов сессии сейчас недоступны',
   staged: 'В индексе',
   unstaged: 'Не в индексе',
   cancel: 'Отмена',
@@ -172,6 +194,13 @@ export const ru: Record<string, string> = {
   addToConversation: 'Добавить в диалог',
   copyRelative: 'Копировать относительный путь',
   copyAbsolute: 'Копировать абсолютный путь',
+  rename: 'Переименовать',
+  renameInvalid: 'Имя не может быть пустым или содержать разделители пути.',
+  delete: 'Удалить',
+  deleteTitle: 'Удалить «{name}»?',
+  deleteDescFile: 'Файл будет удалён безвозвратно. Это действие нельзя отменить.',
+  deleteDescDir: 'Каталог и всё его содержимое будут удалены безвозвратно. Это действие нельзя отменить.',
+  dismiss: 'Закрыть',
   download: 'Скачать',
   uploadFiles: 'Загрузить файлы',
   uploadFolder: 'Загрузить папку',
@@ -191,13 +220,6 @@ export const ru: Record<string, string> = {
   settingsIntro: 'Управление содержимым и поведением боковой карточки по умолчанию',
   settingsPopupDesc: 'Настройка параметров «{feature}»',
   settingsDone: 'Готово',
-  settingsOpenTitle: 'Открывать по умолчанию для новых сессий',
-  settingsOpenDesc: 'Автоматически разворачивать боковую карточку для новых сессий; у существующих сессий сохраняется их собственная раскладка',
-  settingsWidthTitle: 'Доля ширины по умолчанию',
-  settingsWidthDesc: 'Доля боковой карточки в ширине окна для новых сессий, в процентах (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Открывать файлы чата в боковой панели',
-  settingsOpenPathDesc: 'При щелчке по ссылке на файл в чате (строки инструментов, списки результатов, упоминания) файл открывается в редакторе боковой панели, а не в системном приложении по умолчанию',
   settingsOpenToolsTitle: 'Внедрить инструмент открытия в боковой панели для модели',
   settingsOpenToolsDesc: 'Если включено, модель может открывать файлы, папки и HTTP(S)-страницы в боковой панели с помощью инструмента sidebar_open (по умолчанию выключено)',
   settingsTitleBarTitle: 'Режим совместимости заголовка',
@@ -218,10 +240,10 @@ export const ru: Record<string, string> = {
   settingsConflict: 'Настройки были изменены в другом окне — повторите',
   binaryNoPreview: 'Этот тип файла не поддерживает предпросмотр',
   downloadToView: 'Скачать для просмотра',
-  settingsSubagentTitle: 'Автоматически разворачивать страницу «Задачи» при появлении субагента',
-  settingsSubagentDesc: 'При появлении нового субагента в текущей сессии боковая панель автоматически разворачивается и открывается страница «Задачи»; при отключении нужно открывать вручную',
-  settingsJobsTitle: 'Автоматически разворачивать страницу «Фоновые задачи» при новой задаче',
-  settingsJobsDesc: 'При появлении новой фоновой задачи в текущей сессии боковая панель автоматически разворачивается и открывается страница «Фоновые задачи» (срабатывает на каждую новую задачу); при отключении нужно открывать вручную',
+  settingsSubagentTitle: 'Автоматически активировать страницу «Задачи» при появлении субагента',
+  settingsSubagentDesc: 'При появлении нового субагента в текущей сессии автоматически активируется страница «Задачи»; на широких экранах также разворачивается боковая панель, а на узких экранах полноэкранная выдвижная панель не открывается принудительно; отключите, чтобы выбирать страницу вручную',
+  settingsJobsTitle: 'Автоматически активировать страницу «Задачи» при появлении новой фоновой задачи',
+  settingsJobsDesc: 'При появлении новой фоновой задачи в текущей сессии автоматически активируется страница «Задачи» (срабатывает для каждой новой задачи); на широких экранах также разворачивается боковая панель, а на узких экранах полноэкранная выдвижная панель не открывается принудительно; отключите, чтобы выбирать страницу вручную',
   settingsToolsTitle: 'Внедрить терминальные инструменты для модели',
   settingsToolsDesc: 'Если включено, модель может через 8 инструментов (terminal_create и др.) создавать терминалы боковой панели и управлять ими (по умолчанию выключено)',
   settingsFenceTitle: 'Контроль путей рабочей области',
@@ -326,6 +348,25 @@ export const ru: Record<string, string> = {
   sideChatClose: 'Закрыть поток',
   sideChatCloseTitle: 'Освободить агента потока (история сохраняется)',
   sideChatError: 'Ошибка бокового чата: {message}',
+  sideChatTurnUsage: 'Вход {input} tok · Выход {output} tok',
+  sideChatBlockCollapse: 'Свернуть',
+  sideChatBlockCollapseAria: 'Свернуть',
+  sideChatBlockExpand: 'Развернуть {hidden} строк',
+  sideChatBlockExpandAria: 'Развернуть ещё {hidden} строк',
+  sideChatBlockSignal: 'Завершён сигналом: {signal}',
+  sideChatBlockExitCode: 'Код выхода {code}',
+  sideChatBlockRunning: 'Выполняется',
+  sideChatBlockFailed: 'Ошибка',
+  sideChatBlockDone: 'Готово',
+  sideChatBlockNoOutput: '(нет вывода)',
+  sideChatBlockFiles: 'Файлов: {count}',
+  sideChatBlockWindow: '{shown} из {total} строк',
+  sideChatConnDisconnected: 'Соединение потеряно',
+  sideChatConnReconnect: 'Переподключиться',
+  sideChatConnConnecting: 'Переподключение…',
+  sideChatConnRecovered: 'Соединение восстановлено',
+  sideChatConnReconnectAction: 'Переподключиться сейчас',
+  sideChatConnRestartAction: 'Перезапустить соединение',
   jobs: 'Фоновые задачи',
   jobsCount: '{count} фоновых задач',
   jobsCountRunning: '{count} фоновых задач · {running} выполняется',
@@ -378,4 +419,29 @@ export const ru: Record<string, string> = {
   pluginDocsPanelDesc: '«Глобальные документы» в боковой панели DSH: глобальные Markdown-заметки, доступные из любой рабочей области — список для чтения, навигация по плавающему оглавлению, открытие в Chrome / VS Code, копирование кода; каталог настраивается (по умолчанию ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'Браузер агента для DeepSeek Harness: 32 инструмента ego_* управляют настоящим Chromium; встроенная вкладка «ego browser» в боковой панели показывает в реальном времени каждую страницу, которую посещает агент — кликайте, перетаскивайте и вводите текст, чтобы перехватить управление. Вкладка регистрируется автоматически при наличии better-sidebar, иначе используется плавающий пузырёк',
   pluginBilingualReaderDesc: 'Читайте PDF в боковой панели DSH: нативный просмотр PDF, выделите текст для перевода с помощью LLM, используя контекст и полностью изолированно от основного разговора',
+  changesRedactOn: "Маскировка включена: секреты показываются как [REDACTED]; нажмите, чтобы отключить (на свой риск)",
+  changesRedactOff: "Маскировка выключена: содержимое показывается как есть; нажмите, чтобы включить",
+  changesRedactOnLabel: "Маскировка",
+  changesRedactOffLabel: "Без маскировки",
+  changesRedactBanner: "Замаскировано",
+  pluginSentinelName: 'dsh-sentinel Система пробуждения',
+  pluginEgoBrowserName: 'ego-browser Браузер агента',
+  pluginBetterOverleafName: 'dsh-better-overleaf Вкладка Overleaf',
+  pluginDocsPanelName: 'dsh-docs-panel Глобальные документы',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Учётные данные Git',
+  pluginGitRemotesName: 'dsh-git-remotes Удалённые репозитории Git',
+  pluginGithubWorkbenchName: 'dsh-github-workbench Рабочая среда GitHub',
+  pluginSidebarQaName: 'dsh-sidebar-qa Выделить и спросить',
+  pluginSidenoteName: 'dsh-sidenote Боковой чат',
+  pluginServerDeckName: 'dsh-server-deck Панель серверов',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH-туннель',
+  pluginTurnReviewName: 'dsh-turn-review Ревью раунда',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Двуязычный ридер',
+  pluginOfficeName: 'Предпросмотр Office',
+  pluginMdExportName: 'Экспорт Markdown',
+  pluginCodeNavName: 'Навигатор предпросмотра кода',
+  pluginVideoPreviewName: 'Предпросмотр видео',
+  presetDshDesktopDesc: 'Расширенный режим Electron (без рамки): macOS резервирует 20px сверху; Windows без WCO резервирует 32px под строку заголовка',
 }

src/client/locales-sv.ts

@@ -1,7 +1,23 @@
 export const sv: Record<string, string> = {
   files: 'Filer',
+  changesSessionEmpty: 'Inga filoperationer i den här sessionen ännu',
+  changesRead: 'Läs',
+  changesMdReading: 'Läsning',
+  changesHtmlRender: "Rendera",
+  changesHtmlRaw: "Källa",
+  changesPdfRender: "Rendera",
+  changesPdfRaw: "Källa",
+  changesMdRaw: 'Råtext',
+  changesWrite: 'Skriv',
+  changesEdit: 'Redigera',
+  changesRunning: 'körs',
+  changesError: 'fel',
+  changesFold: '{count} rader… klicka för att expandera',
+  changesFoldLoading: 'Expanderar…',
+  changesFoldUnavailable: 'Kontext ej tillgänglig',
+  changesContext: 'kontext',
+  changesPriorUnknown: 'Innehållet före ändringen ligger utanför fönstret; visas som helt nytt',
   explorer: 'Utforskare',
-  git: 'Källkodshantering',
   terminal: 'Terminal',
   editor: 'Editor',
   editorExplorer: 'Filers öppningsbeteende',
@@ -48,7 +64,6 @@ export const sv: Record<string, string> = {
   closeOtherTabs: 'Stäng andra flikar',
   closeLeftTabs: 'Stäng flikar till vänster',
   closeRightTabs: 'Stäng flikar till höger',
-  moveToFreeWindow: 'Flytta till fritt fönster',
   floatDropHint: 'Släpp för att öppna i ett fritt fönster',
   dockToSidebar: 'Tillbaka till sidopanelen',
   pinTerminal: 'Fäst Terminal',
@@ -63,8 +78,6 @@ export const sv: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Fäst globalt',
   pinnedRailLabel: 'Fästa terminaler',
   closePinnedTerminal: 'Stäng terminal',
-  collapse: 'Komprimera sidopanel',
-  expand: 'Expandera sidopanel',
   collapseBottomPanel: 'Komprimera bottenpanel',
   expandBottomPanel: 'Expandera bottenpanel',
   terminalError: 'Terminalanslutning misslyckades',
@@ -73,6 +86,7 @@ export const sv: Record<string, string> = {
   terminalDepsFailed: 'Terminalberoendet node-pty kunde inte laddas',
   terminalDepsHint: 'Kör kommandot nedan i en terminal eller cmd på DSH-maskinen för att reparera det, försök sedan igen (node-pty hålls synkad med DSH-kärnversionen):',
   terminalDepsProfile: ' (upptäckt profil: {profile})',
+  terminalShellNotFound: 'Konfigurerat skal hittades inte: {name} — kontrollera skalsökvägen under Inställningar → Side card → Terminal',
   preview: 'Förhandsgranska',
   toc: 'Innehållsförteckning',
   edit: 'Redigera',
@@ -111,7 +125,15 @@ export const sv: Record<string, string> = {
   worktree: 'Arbetsträd',
   checkoutError: 'Grenbyte misslyckades',
   history: 'Historik',
-  changes: 'Ändringar',
+  changes: 'Filändringar',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Session',
+  changesFilterAll: 'Alla',
+  changesFilterEmpty: 'Inga åtgärder av denna typ',
+  changesOpenDiffTab: 'Öppna i egen diff-flik',
+  changesClosePreview: 'Stäng förhandsvisning',
+  changesResizePreview: 'Ändra storlek på förhandsvisningen',
+  changesLoadError: 'Sessionens filposter är inte tillgängliga just nu',
   staged: 'Köade',
   unstaged: 'Avköade',
   cancel: 'Avbryt',
@@ -159,6 +181,13 @@ export const sv: Record<string, string> = {
   addToConversation: 'Lägg till i konversation',
   copyRelative: 'Kopiera relativ sökväg',
   copyAbsolute: 'Kopiera absolut sökväg',
+  rename: 'Byt namn',
+  renameInvalid: 'Namnet får inte vara tomt eller innehålla sökvägsavgränsare.',
+  delete: 'Ta bort',
+  deleteTitle: 'Ta bort "{name}"?',
+  deleteDescFile: 'Detta tar bort filen permanent. Det går inte att ångra.',
+  deleteDescDir: 'Detta tar bort katalogen och allt i den permanent. Det går inte att ångra.',
+  dismiss: 'Stäng',
   download: 'Ladda ner',
   uploadFiles: 'Ladda upp filer',
   uploadFolder: 'Ladda upp mapp',
@@ -177,13 +206,6 @@ export const sv: Record<string, string> = {
   settingsIntro: 'Hantera vad sidokortet visar och hur det beter sig',
   settingsPopupDesc: 'Konfigurera relaterade alternativ för {feature}',
   settingsDone: 'Klar',
-  settingsOpenTitle: 'Öppna som standard för nya konversationer',
-  settingsOpenDesc: 'Expandera sidokortet automatiskt för helt nya konversationer; befintliga konversationer behåller sina egna layouter',
-  settingsWidthTitle: 'Standardbreddandel',
-  settingsWidthDesc: 'Sidokortets standardandel av fönsterbredden för nya konversationer (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Öppna chattfiler i sidopanelen',
-  settingsOpenPathDesc: 'Öppna fillänkar i chatten (verktygsrader, producerade filer, omnämnanden) i sidopanelens editor i stället för systemets standardapp',
   settingsOpenToolsTitle: 'Injicera sidopanel-öppningsverktyg för modellen',
   settingsOpenToolsDesc: 'När aktiverat kan modellen öppna filer, mappar och HTTP(S)-sidor i sidopanelen via sidebar_open-verktyget (av som standard)',
   settingsTitleBarTitle: 'Positions kompatibilitetsläge',
@@ -204,10 +226,10 @@ export const sv: Record<string, string> = {
   settingsConflict: 'Inställningen ändrades i ett annat fönster — vänligen försök igen',
   binaryNoPreview: 'Denna filtyp kan inte förhandsgranskas',
   downloadToView: 'Ladda ner för att visa',
-  settingsSubagentTitle: 'Öppna automatiskt Uppgiftssidan när en subagent dyker upp',
-  settingsSubagentDesc: 'Expandera sidokortet och öppna Uppgiftssidan när aktuell konversation skapar en ny subagent; stäng av för att öppna manuellt',
-  settingsJobsTitle: 'Öppna automatiskt Jobbsidan vid nytt bakgrundsjobb',
-  settingsJobsDesc: 'Expandera sidokortet och öppna Jobbsidan när ett nytt bakgrundsjobb dyker upp för aktuell konversation (varje nytt jobb utlöser); stäng av för att öppna manuellt',
+  settingsSubagentTitle: 'Aktivera sidan Uppgifter automatiskt när en subagent dyker upp',
+  settingsSubagentDesc: 'När den aktuella konversationen skapar en ny subagent aktiveras sidan Uppgifter automatiskt; på breda skärmar expanderas även sidokortet, medan helskärmspanelen inte tvingas öppnas på smala skärmar; stäng av för att välja sidan manuellt',
+  settingsJobsTitle: 'Aktivera sidan Uppgifter automatiskt vid ett nytt bakgrundsjobb',
+  settingsJobsDesc: 'När ett nytt bakgrundsjobb dyker upp för den aktuella konversationen aktiveras sidan Uppgifter automatiskt (detta sker för varje nytt jobb); på breda skärmar expanderas även sidokortet, medan helskärmspanelen inte tvingas öppnas på smala skärmar; stäng av för att välja sidan manuellt',
   settingsToolsTitle: 'Injicera terminalverktyg för modellen',
   settingsToolsDesc: 'När aktiverat kan modellen skapa och styra sidopanelsterminaler via de 8 terminal_*-verktygen (av som standard)',
   settingsFenceTitle: 'Kontroll av workspace-sökvägar',
@@ -311,6 +333,25 @@ export const sv: Record<string, string> = {
   sideChatClose: 'Stäng tråd',
   sideChatCloseTitle: 'Frigör trådens agent (historik behålls)',
   sideChatError: 'Sidochattsfel: {message}',
+  sideChatTurnUsage: 'In {input} tok · Ut {output} tok',
+  sideChatBlockCollapse: 'Fäll ihop',
+  sideChatBlockCollapseAria: 'Fäll ihop',
+  sideChatBlockExpand: 'Visa {hidden} rader',
+  sideChatBlockExpandAria: 'Visa {hidden} rader till',
+  sideChatBlockSignal: 'Avslutad av signal: {signal}',
+  sideChatBlockExitCode: 'Slutkod {code}',
+  sideChatBlockRunning: 'Körs',
+  sideChatBlockFailed: 'Misslyckades',
+  sideChatBlockDone: 'Klar',
+  sideChatBlockNoOutput: '(ingen utdata)',
+  sideChatBlockFiles: '{count} filer',
+  sideChatBlockWindow: '{shown} av {total} rader',
+  sideChatConnDisconnected: 'Anslutningen bröts',
+  sideChatConnReconnect: 'Anslut igen',
+  sideChatConnConnecting: 'Ansluter igen…',
+  sideChatConnRecovered: 'Anslutningen återställd',
+  sideChatConnReconnectAction: 'Anslut igen nu',
+  sideChatConnRestartAction: 'Starta om anslutningen',
   jobs: 'Bakgrundsjobb',
   jobsCount: '{count} bakgrundsjobb',
   jobsCountRunning: '{count} bakgrundsjobb · {running} kör',
@@ -363,4 +404,29 @@ export const sv: Record<string, string> = {
   pluginDocsPanelDesc: 'Globala dokument i DSH-sidopanelen: läs era egna Markdown-anteckningar från valfri arbetsyta — en fillista, en översikt, öppna i Chrome / VS Code och kopieringsknappar; dokumentkatalogen är konfigurerbar (standard ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'Agentwebbläsaren för DeepSeek Harness: 32 ego_*-verktyg styr en riktig Chromium; en inbyggd «ego browser»-flik i sidopanelen visar varje sida agenten besöker i realtid — du kan klicka, dra och skriva för att ta över. Registrerar fliken automatiskt när better-sidebar finns, annars en flytande bubbla',
   pluginBilingualReaderDesc: 'Läs PDF-filer i DSH-sidopanelen: inbyggd PDF-visning, markera text för att översätta med LLM, med kontext och helt isolerad från huvudkonversationen',
+  changesRedactOn: "Maskning på: hemligheter visas som [REDACTED]; klicka för att stänga av (på egen risk)",
+  changesRedactOff: "Maskning av: innehåll visas som det är; klicka för att aktivera",
+  changesRedactOnLabel: "Maskning",
+  changesRedactOffLabel: "Utan maskning",
+  changesRedactBanner: "Maskerat",
+  pluginSentinelName: 'dsh-sentinel Väcksystem',
+  pluginEgoBrowserName: 'ego-browser Agentwebbläsare',
+  pluginBetterOverleafName: 'dsh-better-overleaf Overleaf-flik',
+  pluginDocsPanelName: 'dsh-docs-panel Globala dokument',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Git-autentiseringsuppgifter',
+  pluginGitRemotesName: 'dsh-git-remotes Git-fjärrarkiv',
+  pluginGithubWorkbenchName: 'dsh-github-workbench GitHub-arbetsbänk',
+  pluginSidebarQaName: 'dsh-sidebar-qa Markera och fråga',
+  pluginSidenoteName: 'dsh-sidenote Sidchatt',
+  pluginServerDeckName: 'dsh-server-deck Serverdäck',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH-tunnel',
+  pluginTurnReviewName: 'dsh-turn-review Varvgranskning',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Tvåspråkig läsare',
+  pluginOfficeName: 'Office-förhandsvisning',
+  pluginMdExportName: 'Markdown-export',
+  pluginCodeNavName: 'Kodförhandsvisningsnavigatör',
+  pluginVideoPreviewName: 'Videoförhandsvisning',
+  presetDshDesktopDesc: 'Electrons avancerade läge (ramlöst): macOS reserverar 20px högst upp; Windows reserverar 32px för namnlisten när WCO inte är tillgängligt',
 }

src/client/locales-th.ts

@@ -17,8 +17,24 @@
 /** The th dictionary (key-set-equal to zh, enforced by the type annotation in locales.ts). */
 export const th: Record<string, string> = {
   files: 'ไฟล์',
+  changesSessionEmpty: 'ยังไม่มีการดำเนินการไฟล์ในเซสชันนี้',
+  changesRead: 'อ่าน',
+  changesMdReading: 'อ่าน',
+  changesHtmlRender: "เรนเดอร์",
+  changesHtmlRaw: "ต้นฉบับ",
+  changesPdfRender: "เรนเดอร์",
+  changesPdfRaw: "ต้นฉบับ",
+  changesMdRaw: 'ดิบ',
+  changesWrite: 'เขียน',
+  changesEdit: 'แก้ไข',
+  changesRunning: 'กำลังทำงาน',
+  changesError: 'ข้อผิดพลาด',
+  changesFold: '{count} บรรทัด… คลิกเพื่อขยาย',
+  changesFoldLoading: 'กำลังขยาย…',
+  changesFoldUnavailable: 'ไม่สามารถโหลดบริบทได้',
+  changesContext: 'บริบท',
+  changesPriorUnknown: 'เนื้อหาก่อนแก้ไขอยู่นอกหน้าต่าง แสดงเป็นเพิ่มใหม่ทั้งหมด',
   explorer: 'ตัวสำรวจ',
-  git: 'การควบคุมซอร์ส',
   terminal: 'เทอร์มินัล',
   editor: 'ตัวแก้ไข',
   editorExplorer: 'พฤติกรรมการเปิดไฟล์',
@@ -65,7 +81,6 @@ export const th: Record<string, string> = {
   closeOtherTabs: 'ปิด Tab อื่น',
   closeLeftTabs: 'ปิด Tab ด้านซ้าย',
   closeRightTabs: 'ปิด Tab ด้านขวา',
-  moveToFreeWindow: 'ย้ายไปยังหน้าต่างอิสระ',
   floatDropHint: 'ปล่อยเพื่อเปิดในหน้าต่างอิสระ',
   dockToSidebar: 'กลับไปที่แถบข้าง',
   pinTerminal: 'ปักหมุดเทอร์มินัล',
@@ -80,8 +95,6 @@ export const th: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'ปักหมุดแบบ Global',
   pinnedRailLabel: 'เทอร์มินัลที่ปักหมุด',
   closePinnedTerminal: 'ปิดเทอร์มินัล',
-  collapse: 'ย่อแถบด้านข้าง',
-  expand: 'ขยายแถบด้านข้าง',
   collapseBottomPanel: 'ย่อพาเนลด้านล่าง',
   expandBottomPanel: 'ขยายพาเนลด้านล่าง',
   terminalError: 'การเชื่อมต่อเทอร์มินัลล้มเหลว',
@@ -90,6 +103,7 @@ export const th: Record<string, string> = {
   terminalDepsFailed: 'การอ้างอิงเทอร์มินัล node-pty โหลดล้มเหลว',
   terminalDepsHint: 'เรียกใช้คำสั่งด้านล่างในเทอร์มินัลหรือ cmd บนเครื่อง DSH เพื่อซ่อมแซม แล้วกดลองอีกครั้ง (node-pty ต้องซิงค์กับเวอร์ชันหลักของ DSH):',
   terminalDepsProfile: ' (ตรวจพบ profile: {profile})',
+  terminalShellNotFound: 'ไม่พบ shell ที่กำหนดไว้: {name} — ตรวจสอบพาธ shell ใน การตั้งค่า → Side card → Terminal',
   preview: 'พรีวิว',
   toc: 'สารบัญ',
   edit: 'แก้ไข',
@@ -128,7 +142,15 @@ export const th: Record<string, string> = {
   worktree: 'เวิร์กทรี',
   checkoutError: 'สลับ branch ล้มเหลว',
   history: 'ประวัติ',
-  changes: 'การเปลี่ยนแปลง',
+  changes: 'การเปลี่ยนแปลงไฟล์',
+  changesGitLens: 'Git',
+  changesSessionLens: 'เซสชัน',
+  changesFilterAll: 'ทั้งหมด',
+  changesFilterEmpty: 'ไม่มีการดำเนินการประเภทนี้',
+  changesOpenDiffTab: 'เปิดในแท็บ diff แยก',
+  changesClosePreview: 'ปิดตัวอย่าง',
+  changesResizePreview: 'ปรับขนาดตัวอย่าง',
+  changesLoadError: 'บันทึกไฟล์ของเซสชันยังใช้ไม่ได้ตอนนี้',
   staged: 'Staged',
   unstaged: 'Unstaged',
   cancel: 'ยกเลิก',
@@ -176,6 +198,13 @@ export const th: Record<string, string> = {
   addToConversation: 'เพิ่มไปยังแชท',
   copyRelative: 'คัดลอกพาธสัมพัทธ์',
   copyAbsolute: 'คัดลอกพาธ absolute',
+  rename: 'เปลี่ยนชื่อ',
+  renameInvalid: 'ชื่อต้องไม่ว่างเปล่าและต้องไม่มีตัวคั่นเส้นทาง',
+  delete: 'ลบ',
+  deleteTitle: 'ลบ "{name}" หรือไม่',
+  deleteDescFile: 'การดำเนินการนี้จะลบไฟล์อย่างถาวร และไม่สามารถย้อนกลับได้',
+  deleteDescDir: 'การดำเนินการนี้จะลบไดเรกทอรีและเนื้อหาทั้งหมดอย่างถาวร และไม่สามารถย้อนกลับได้',
+  dismiss: 'ปิด',
   download: 'ดาวน์โหลด',
   uploadFiles: 'อัปโหลดไฟล์',
   uploadFolder: 'อัปโหลดโฟลเดอร์',
@@ -194,13 +223,6 @@ export const th: Record<string, string> = {
   settingsIntro: 'จัดการสิ่งที่การ์ดด้านข้างแสดงและพฤติกรรมของมัน',
   settingsPopupDesc: 'กำหนดค่าตัวเลือกที่เกี่ยวข้องสำหรับ {feature}',
   settingsDone: 'เสร็จสิ้น',
-  settingsOpenTitle: 'เปิดโดยค่าเริ่มต้นสำหรับแชทใหม่',
-  settingsOpenDesc: 'ขยายการ์ดด้านข้างโดยอัตโนมัติสำหรับแชทใหม่; แชทที่มีอยู่แล้วยังคงเค้าโครงของตัวเอง',
-  settingsWidthTitle: 'สัดส่วนความกว้างเริ่มต้น',
-  settingsWidthDesc: 'สัดส่วนความกว้างเริ่มต้นของการ์ดด้านข้างจากความกว้างหน้าต่างสำหรับแชทใหม่ (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'เปิดไฟล์แชทในแถบด้านข้าง',
-  settingsOpenPathDesc: 'เปิดลิงก์ไฟล์ในแชท (แถวเครื่องมือ, ไฟล์ที่สร้าง, การกล่าวถึง) ในตัวแก้ไขแถบด้านข้างแทนแอปเริ่มต้นของระบบ',
   settingsOpenToolsTitle: 'ฉีดเครื่องมือเปิดแถบด้านข้างสำหรับโมเดล',
   settingsOpenToolsDesc: 'เมื่อเปิดใช้ โมเดลสามารถเปิดไฟล์ โฟลเดอร์ และหน้า HTTP(S) ในแถบด้านข้างผ่านเครื่องมือ sidebar_open (ปิดเป็นค่าเริ่มต้น)',
   settingsTitleBarTitle: 'โหมดความเข้ากันได้ของตำแหน่ง',
@@ -221,10 +243,10 @@ export const th: Record<string, string> = {
   settingsConflict: 'การตั้งค่าถูกเปลี่ยนในหน้าต่างอื่น — โปรดลองอีกครั้ง',
   binaryNoPreview: 'ไม่สามารถพรีวิวประเภทไฟล์นี้ได้',
   downloadToView: 'ดาวน์โหลดเพื่อดู',
-  settingsSubagentTitle: 'เปิดหน้า Tasks อัตโนมัติเมื่อมีตัวแทนย่อยปรากฏ',
-  settingsSubagentDesc: 'ขยายการ์ดด้านข้างและเปิดหน้า Tasks เมื่อแชทปัจจุบันสร้างตัวแทนย่อยใหม่; ปิดเพื่อเปิดเอง',
-  settingsJobsTitle: 'เปิดหน้า Jobs อัตโนมัติเมื่อมีงานเบื้องหลังใหม่',
-  settingsJobsDesc: 'ขยายการ์ดด้านข้างและเปิดหน้า Jobs เมื่อใดก็ตามที่มีงานเบื้องหลังใหม่ปรากฏสำหรับแชทปัจจุบัน (ทุกงานใหม่จะทริกเกอร์); ปิดเพื่อเปิดเอง',
+  settingsSubagentTitle: 'เลือกหน้า Tasks โดยอัตโนมัติเมื่อมีตัวแทนย่อยปรากฏ',
+  settingsSubagentDesc: 'เมื่อแชทปัจจุบันสร้างตัวแทนย่อยใหม่ ระบบจะเลือกหน้า Tasks โดยอัตโนมัติ; ในมุมมองแบบกว้าง ระบบจะขยายการ์ดด้านข้างด้วย ส่วนในมุมมองแบบแคบ ระบบจะไม่บังคับเปิดลิ้นชักเต็มหน้าจอ; ปิดเพื่อเลือกหน้าด้วยตนเอง',
+  settingsJobsTitle: 'เลือกหน้า Tasks โดยอัตโนมัติเมื่อมีงานเบื้องหลังใหม่',
+  settingsJobsDesc: 'เมื่อมีงานเบื้องหลังใหม่ปรากฏในแชทปัจจุบัน ระบบจะเลือกหน้า Tasks โดยอัตโนมัติ (ทุกงานใหม่จะทริกเกอร์); ในมุมมองแบบกว้าง ระบบจะขยายการ์ดด้านข้างด้วย ส่วนในมุมมองแบบแคบ ระบบจะไม่บังคับเปิดลิ้นชักเต็มหน้าจอ; ปิดเพื่อเลือกหน้าด้วยตนเอง',
   settingsToolsTitle: 'ฉีดเครื่องมือเทอร์มินัลสำหรับโมเดล',
   settingsToolsDesc: 'เมื่อเปิดใช้ โมเดลสามารถสร้างและควบคุมเทอร์มินัลแถบด้านข้างผ่านเครื่องมือ terminal_* 8 ตัว (ปิดเป็นค่าเริ่มต้น)',
   settingsFenceTitle: 'การตรวจสอบเส้นทางเวิร์กสเปซ',
@@ -328,6 +350,25 @@ export const th: Record<string, string> = {
   sideChatClose: 'ปิดเธรด',
   sideChatCloseTitle: 'ปล่อยตัวแทนของเธรด (ประวัติยังคงอยู่)',
   sideChatError: 'ข้อผิดพลาดแชทด้านข้าง: {message}',
+  sideChatTurnUsage: 'อินพุต {input} tok · เอาต์พุต {output} tok',
+  sideChatBlockCollapse: 'ย่อ',
+  sideChatBlockCollapseAria: 'ย่อ',
+  sideChatBlockExpand: 'ขยาย {hidden} บรรทัด',
+  sideChatBlockExpandAria: 'ขยายอีก {hidden} บรรทัด',
+  sideChatBlockSignal: 'ถูกยุตด้วยสัญญาณ: {signal}',
+  sideChatBlockExitCode: 'รหัสออก {code}',
+  sideChatBlockRunning: 'กำลังทำงาน',
+  sideChatBlockFailed: 'ล้มเหลว',
+  sideChatBlockDone: 'เสร็จสิ้น',
+  sideChatBlockNoOutput: '(ไม่มีเอาต์พุต)',
+  sideChatBlockFiles: '{count} ไฟล์',
+  sideChatBlockWindow: '{shown} จาก {total} บรรทัด',
+  sideChatConnDisconnected: 'การเชื่อมต่อขาดหาย',
+  sideChatConnReconnect: 'เชื่อมต่อใหม่',
+  sideChatConnConnecting: 'กำลังเชื่อมต่อใหม่…',
+  sideChatConnRecovered: 'กู้คืนการเชื่อมต่อแล้ว',
+  sideChatConnReconnectAction: 'เชื่อมต่อใหม่ตอนนี้',
+  sideChatConnRestartAction: 'เริ่มการเชื่อมต่อใหม่',
   jobs: 'งานเบื้องหลัง',
   jobsCount: '{count} งานเบื้องหลัง',
   jobsCountRunning: '{count} งานเบื้องหลัง · {running} กำลังทำงาน',
@@ -380,4 +421,29 @@ export const th: Record<string, string> = {
   pluginDocsPanelDesc: 'เอกสารส่วนกลางในแถบด้านข้าง DSH: อ่านบันทึก Markdown ของคุณเองจากพื้นที่ทำงานใดๆ — รายการไฟล์, เค้าโครง, เปิดใน Chrome / VS Code และปุ่มคัดลอก; ไดเรกทอรีเอกสารสามารถกำหนดค่าได้ (ค่าเริ่มต้น ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'เบราว์เซอร์เอเจนต์สำหรับ DeepSeek Harness: เครื่องมือ ego_* 32 ตัวขับเคลื่อน Chromium จริง แท็บ «ego browser» เนทีฟในแถบด้านข้างแสดงทุกหน้าที่เอเจนต์เยี่ยมชมแบบสด — คลิก ลาก และพิมพ์เพื่อเข้าไปควบคุมแทนได้ ลงทะเบียนแท็บอัตโนมัติเมื่อมี better-sidebar มิฉะนั้นจะใช้บับเบิลลอย',
   pluginBilingualReaderDesc: 'อ่าน PDF ในแถบด้านข้าง DSH: แสดง PDF ต้นฉบับ เลือกข้อความเพื่อแปลด้วย LLM พร้อมบริบทและแยกจากการสนทนาหลักโดยสิ้นเชิง',
+  changesRedactOn: "ซ่อนข้อมูลอยู่: ค่าลับแสดงเป็น [REDACTED]; คลิกเพื่อปิด (ยอมรับความเสี่ยงเอง)",
+  changesRedactOff: "ปิดการซ่อนข้อมูล: เนื้อหาจะแสดงตามจริง; คลิกเพื่อเปิด",
+  changesRedactOnLabel: "กำลังซ่อน",
+  changesRedactOffLabel: "ไม่ซ่อน",
+  changesRedactBanner: "ถูกซ่อนแล้ว",
+  pluginSentinelName: 'dsh-sentinel ระบบปลุกเตือน',
+  pluginEgoBrowserName: 'ego-browser เบราว์เซอร์เอเจนต์',
+  pluginBetterOverleafName: 'dsh-better-overleaf แท็บ Overleaf',
+  pluginDocsPanelName: 'dsh-docs-panel เอกสารส่วนกลาง',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge ข้อมูลรับรอง Git',
+  pluginGitRemotesName: 'dsh-git-remotes Remote ของ Git',
+  pluginGithubWorkbenchName: 'dsh-github-workbench เวิร์กเบนช์ GitHub',
+  pluginSidebarQaName: 'dsh-sidebar-qa เลือกแล้วถาม',
+  pluginSidenoteName: 'dsh-sidenote แชทข้างเคียง',
+  pluginServerDeckName: 'dsh-server-deck เด็คเซิร์ฟเวอร์',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel อุโมงค์ SSH',
+  pluginTurnReviewName: 'dsh-turn-review รีวิวรอบ',
+  pluginBilingualReaderName: 'dsh-bilingual-reader ตัวอ่านสองภาษา',
+  pluginOfficeName: 'พรีวิว Office',
+  pluginMdExportName: 'ส่งออก Markdown',
+  pluginCodeNavName: 'ตัวนำทางพรีวิวโค้ด',
+  pluginVideoPreviewName: 'พรีวิววิดีโอ',
+  presetDshDesktopDesc: 'โหมดขั้นสูงของ Electron (ไร้กรอบ): macOS จองแถบด้านบน 20px; Windows จอง 32px ให้แถบหัวเรื่องเมื่อไม่มี WCO',
 }

src/client/locales-tr.ts

@@ -17,8 +17,24 @@
 /** The tr dictionary (key-set-equal to zh, enforced by the type annotation in locales.ts). */
 export const tr: Record<string, string> = {
   files: 'Dosyalar',
+  changesSessionEmpty: 'Bu oturumda henüz dosya işlemi yok',
+  changesRead: 'Okuma',
+  changesMdReading: 'Okuma',
+  changesHtmlRender: "Render",
+  changesHtmlRaw: "Kaynak",
+  changesPdfRender: "Render",
+  changesPdfRaw: "Kaynak",
+  changesMdRaw: 'Ham',
+  changesWrite: 'Yazma',
+  changesEdit: 'Düzenleme',
+  changesRunning: 'çalışıyor',
+  changesError: 'hata',
+  changesFold: '{count} satır… genişletmek için tıklayın',
+  changesFoldLoading: 'Genişletiliyor…',
+  changesFoldUnavailable: 'Bağlam yüklenemedi',
+  changesContext: 'bağlam',
+  changesPriorUnknown: 'Değişiklik öncesi içerik pencere dışında; tamamen yeni eklenmiş olarak gösteriliyor',
   explorer: 'Gezgin',
-  git: 'Kaynak denetimi',
   terminal: 'Terminal',
   editor: 'Düzenleyici',
   editorExplorer: 'Dosya açma davranışı',
@@ -65,7 +81,6 @@ export const tr: Record<string, string> = {
   closeOtherTabs: 'Diğer sekmeleri kapat',
   closeLeftTabs: 'Soldaki sekmeleri kapat',
   closeRightTabs: 'Sağdaki sekmeleri kapat',
-  moveToFreeWindow: 'Serbest pencereye taşı',
   floatDropHint: 'Serbest pencerede açmak için bırakın',
   dockToSidebar: 'Kenar çubuğuna geri dön',
   pinTerminal: 'Terminali Sabitle',
@@ -80,8 +95,6 @@ export const tr: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Genel olarak sabitlendi',
   pinnedRailLabel: 'Sabitlenmiş Terminaller',
   closePinnedTerminal: 'Terminali Kapat',
-  collapse: 'Kenar çubuğunu daralt',
-  expand: 'Kenar çubuğunu genişlet',
   collapseBottomPanel: 'Alt paneli daralt',
   expandBottomPanel: 'Alt paneli genişlet',
   terminalError: 'Terminal bağlantısı başarısız',
@@ -90,6 +103,7 @@ export const tr: Record<string, string> = {
   terminalDepsFailed: 'Terminal bağımlılığı node-pty yüklenemedi',
   terminalDepsHint: 'Onarmak için DSH makinesindeki bir terminalde veya cmd’de aşağıdaki komutu çalıştırın, sonra yeniden deneyin (node-pty, DSH çekirdek sürümüyle senkron kalır):',
   terminalDepsProfile: ' (algılanan profil: {profile})',
+  terminalShellNotFound: 'Yapılandırılan kabuk bulunamadı: {name} — Ayarlar → Side card → Terminal altındaki kabuk yolunu denetleyin',
   preview: 'Önizleme',
   toc: 'İçindekiler',
   edit: 'Düzenle',
@@ -128,7 +142,15 @@ export const tr: Record<string, string> = {
   worktree: 'Çalışma ağacı',
   checkoutError: 'Dal değiştirme başarısız',
   history: 'Geçmiş',
-  changes: 'Değişiklikler',
+  changes: 'Dosya değişiklikleri',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Oturum',
+  changesFilterAll: 'Tümü',
+  changesFilterEmpty: 'Bu türde işlem yok',
+  changesOpenDiffTab: 'Ayrı bir diff sekmesinde aç',
+  changesClosePreview: 'Önizlemeyi kapat',
+  changesResizePreview: 'Önizlemeyi boyutlandır',
+  changesLoadError: 'Oturum dosya kayıtları şu anda kullanılamıyor',
   staged: 'Sahnelendi',
   unstaged: 'Sahnelenmedi',
   cancel: 'İptal',
@@ -176,6 +198,13 @@ export const tr: Record<string, string> = {
   addToConversation: 'Sohbete ekle',
   copyRelative: 'Göreli yolu kopyala',
   copyAbsolute: 'Mutlak yolu kopyala',
+  rename: 'Yeniden adlandır',
+  renameInvalid: 'Ad boş olamaz veya yol ayırıcıları içeremez.',
+  delete: 'Sil',
+  deleteTitle: '"{name}" silinsin mi?',
+  deleteDescFile: 'Bu, dosyayı kalıcı olarak siler. Bu işlem geri alınamaz.',
+  deleteDescDir: 'Bu, dizini ve tüm içeriğini kalıcı olarak siler. Bu işlem geri alınamaz.',
+  dismiss: 'Kapat',
   download: 'İndir',
   uploadFiles: 'Dosyaları yükle',
   uploadFolder: 'Klasör yükle',
@@ -194,13 +223,6 @@ export const tr: Record<string, string> = {
   settingsIntro: 'Yan kartın ne gösterdiğini ve nasıl davrandığını yönetin',
   settingsPopupDesc: '«{feature}» için ilgili seçenekleri yapılandırın',
   settingsDone: 'Bitti',
-  settingsOpenTitle: 'Yeni sohbetlerde varsayılan olarak aç',
-  settingsOpenDesc: 'Yepyeni sohbetler için yan kartı otomatik genişlet; var olan sohbetler kendi düzenlerini korur',
-  settingsWidthTitle: 'Varsayılan genişlik payı',
-  settingsWidthDesc: 'Yeni sohbetler için yan kartın pencere genişliğindeki varsayılan payı (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Sohbet dosyalarını kenar çubuğunda aç',
-  settingsOpenPathDesc: 'Sohbetteki dosya bağlantılarını (araç satırları, üretilen dosyalar, anılmalar) sistem varsayılan uygulaması yerine kenar çubuğu düzenleyicisinde aç',
   settingsOpenToolsTitle: 'Model için kenar çubuğu açma aracı enjekte et',
   settingsOpenToolsDesc: 'Etkinleştirildiğinde model, sidebar_open aracıyla kenar çubuğunda dosyaları, klasörleri ve HTTP(S) sayfalarını açabilir (varsayılan kapalı)',
   settingsTitleBarTitle: 'Konum uyumluluk modu',
@@ -221,10 +243,10 @@ export const tr: Record<string, string> = {
   settingsConflict: 'Ayar başka bir pencerede değiştirildi — lütfen yeniden deneyin',
   binaryNoPreview: 'Bu dosya türü önizlenemiyor',
   downloadToView: 'Görüntülemek için indir',
-  settingsSubagentTitle: 'Bir alt aracı belirdiğinde Görevler sayfasını otomatik aç',
-  settingsSubagentDesc: 'Geçerli sohbet yeni bir alt aracı doğurduğunda yan kartı genişlet ve Görevler sayfasını aç; elle açmak için kapatın',
-  settingsJobsTitle: 'Yeni arka plan işinde İşler sayfasını otomatik aç',
-  settingsJobsDesc: 'Geçerli sohbet için yeni bir arka plan işi belirdiğinde yan kartı genişlet ve İşler sayfasını aç (her yeni iş tetikler); elle açmak için kapatın',
+  settingsSubagentTitle: 'Bir alt aracı belirdiğinde Görevler sayfasını otomatik etkinleştir',
+  settingsSubagentDesc: 'Geçerli sohbet yeni bir alt aracı oluşturduğunda Görevler sayfasını etkinleştir; geniş ekranlarda yan kart da genişletilir, dar ekranlarda tam ekran çekmecesi zorla açılmaz; kapalıyken elle açılması gerekir',
+  settingsJobsTitle: 'Yeni bir arka plan işi belirdiğinde Görevler sayfasını otomatik etkinleştir',
+  settingsJobsDesc: 'Geçerli sohbette her yeni arka plan işi belirdiğinde Görevler sayfasını etkinleştir (her yeni iş tetikler); geniş ekranlarda yan kart da genişletilir, dar ekranlarda tam ekran çekmecesi zorla açılmaz; kapalıyken elle açılması gerekir',
   settingsToolsTitle: 'Model için terminal araçları enjekte et',
   settingsToolsDesc: 'Etkinleştirildiğinde model, 8 terminal_* aracı üzerinden kenar çubuğu terminalleri oluşturup kullanabilir (varsayılan kapalı)',
   settingsFenceTitle: 'Çalışma alanı yol denetimi',
@@ -328,6 +350,25 @@ export const tr: Record<string, string> = {
   sideChatClose: 'İş parçacığını kapat',
   sideChatCloseTitle: 'İş parçacığının aracısını serbest bırak (geçmiş korunur)',
   sideChatError: 'Yan sohbet hatası: {message}',
+  sideChatTurnUsage: 'Giriş {input} tok · Çıkış {output} tok',
+  sideChatBlockCollapse: 'Daralt',
+  sideChatBlockCollapseAria: 'Daralt',
+  sideChatBlockExpand: '{hidden} satırı genişlet',
+  sideChatBlockExpandAria: '{hidden} satır daha genişlet',
+  sideChatBlockSignal: 'Sinyalle sonlandırıldı: {signal}',
+  sideChatBlockExitCode: 'Çıkış kodu {code}',
+  sideChatBlockRunning: 'Çalışıyor',
+  sideChatBlockFailed: 'Başarısız',
+  sideChatBlockDone: 'Tamamlandı',
+  sideChatBlockNoOutput: '(çıktı yok)',
+  sideChatBlockFiles: '{count} dosya',
+  sideChatBlockWindow: '{total} satırdan {shown} satır',
+  sideChatConnDisconnected: 'Bağlantı koptu',
+  sideChatConnReconnect: 'Yeniden bağlan',
+  sideChatConnConnecting: 'Yeniden bağlanıyor…',
+  sideChatConnRecovered: 'Bağlantı geri yüklendi',
+  sideChatConnReconnectAction: 'Şimdi yeniden bağlan',
+  sideChatConnRestartAction: 'Bağlantıyı yeniden başlat',
   jobs: 'Arka plan işleri',
   jobsCount: '{count} arka plan işi',
   jobsCountRunning: '{count} arka plan işi · {running} çalışıyor',
@@ -380,4 +421,29 @@ export const tr: Record<string, string> = {
   pluginDocsPanelDesc: 'DSH kenar çubuğunda «Genel belgeler»: herhangi bir çalışma alanından kendi Markdown notlarınızı okuyun — dosya listesi, ana hat, Chrome / VS Code’da açma ve kopyalama düğmeleri; belgeler dizini yapılandırılabilir (varsayılan ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'DeepSeek Harness için aracı tarayıcı: 32 ego_* aracı gerçek bir Chromium’u yönetir; kenar çubuğundaki yerel «ego tarayıcı» sekmesi aracının ziyaret ettiği her sayfayı canlı gösterir — tıklayarak, sürükleyerek ve yazarak kontrolü devralabilirsiniz. better-sidebar varsa sekme otomatik kaydedilir, yoksa yüzen baloncuğa düşer',
   pluginBilingualReaderDesc: 'DSH kenar çubuğunda PDF okuyun: yerel PDF görüntüleme, LLM ile çevirmek için metin seçin, bağlamı kullanarak ve ana sohbetten tamamen izole',
+  changesRedactOn: "Maskeleme açık: gizli değerler [REDACTED] olarak görünür; kapatmak için tıklayın (kendiniz sorumlusunuz)",
+  changesRedactOff: "Maskeleme kapalı: içerik olduğu gibi görünür; açmak için tıklayın",
+  changesRedactOnLabel: "Maskeleme",
+  changesRedactOffLabel: "Maskeleme yok",
+  changesRedactBanner: "Maskelendi",
+  pluginSentinelName: 'dsh-sentinel Uyandırma sistemi',
+  pluginEgoBrowserName: 'ego-browser Ajan tarayıcısı',
+  pluginBetterOverleafName: 'dsh-better-overleaf Overleaf sekmesi',
+  pluginDocsPanelName: 'dsh-docs-panel Genel belgeler',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Git kimlik bilgileri',
+  pluginGitRemotesName: 'dsh-git-remotes Git uzak depoları',
+  pluginGithubWorkbenchName: 'dsh-github-workbench GitHub çalışma tezgâhı',
+  pluginSidebarQaName: 'dsh-sidebar-qa Seç ve sor',
+  pluginSidenoteName: 'dsh-sidenote Yan sohbet',
+  pluginServerDeckName: 'dsh-server-deck Sunucu paneli',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH tüneli',
+  pluginTurnReviewName: 'dsh-turn-review Tur incelemesi',
+  pluginBilingualReaderName: 'dsh-bilingual-reader İki dilli okuyucu',
+  pluginOfficeName: 'Office önizlemesi',
+  pluginMdExportName: 'Markdown dışa aktarma',
+  pluginCodeNavName: 'Kod önizleme gezgini',
+  pluginVideoPreviewName: 'Video önizlemesi',
+  presetDshDesktopDesc: 'Electron gelişmiş (çerçevesiz) mod: macOS üstte 20px ayırır; Windows, WCO yokken başlık çubuğu için 32px ayırır',
 }

src/client/locales-vi.ts

@@ -17,8 +17,24 @@
 /** The vi dictionary (key-set-equal to zh, enforced by the type annotation in locales.ts). */
 export const vi: Record<string, string> = {
   files: 'Tệp',
+  changesSessionEmpty: 'Chưa có thao tác tệp nào trong phiên này',
+  changesRead: 'Đọc',
+  changesMdReading: 'Đọc',
+  changesHtmlRender: "Kết xuất",
+  changesHtmlRaw: "Nguyên văn",
+  changesPdfRender: "Kết xuất",
+  changesPdfRaw: "Nguyên văn",
+  changesMdRaw: 'Gốc',
+  changesWrite: 'Ghi',
+  changesEdit: 'Chỉnh sửa',
+  changesRunning: 'đang chạy',
+  changesError: 'lỗi',
+  changesFold: '{count} dòng… bấm để mở rộng',
+  changesFoldLoading: 'Đang mở rộng…',
+  changesFoldUnavailable: 'Không tải được ngữ cảnh',
+  changesContext: 'ngữ cảnh',
+  changesPriorUnknown: 'Nội dung trước thay đổi nằm ngoài cửa sổ; hiển thị như toàn bộ mới thêm',
   explorer: 'Trình khám phá',
-  git: 'Quản lý mã nguồn',
   terminal: 'Terminal',
   editor: 'Trình soạn thảo',
   editorExplorer: 'Cách mở tệp',
@@ -65,7 +81,6 @@ export const vi: Record<string, string> = {
   closeOtherTabs: 'Đóng các tab khác',
   closeLeftTabs: 'Đóng tab bên trái',
   closeRightTabs: 'Đóng tab bên phải',
-  moveToFreeWindow: 'Chuyển sang cửa sổ tự do',
   floatDropHint: 'Thả để mở trong cửa sổ tự do',
   dockToSidebar: 'Quay lại thanh bên',
   pinTerminal: 'Ghim Terminal',
@@ -80,8 +95,6 @@ export const vi: Record<string, string> = {
   pinnedTerminalScopeGlobal: 'Đã ghim toàn cục',
   pinnedRailLabel: 'Terminal đã ghim',
   closePinnedTerminal: 'Đóng Terminal',
-  collapse: 'Thu gọn thanh bên',
-  expand: 'Mở rộng thanh bên',
   collapseBottomPanel: 'Thu gọn panel dưới',
   expandBottomPanel: 'Mở rộng panel dưới',
   terminalError: 'Kết nối terminal thất bại',
@@ -90,6 +103,7 @@ export const vi: Record<string, string> = {
   terminalDepsFailed: 'Dependency terminal node-pty tải thất bại',
   terminalDepsHint: 'Chạy lệnh sau trong terminal hoặc cmd trên máy DSH để sửa, rồi nhấn thử lại (node-pty đồng bộ phiên bản với lõi DSH):',
   terminalDepsProfile: ' (phát hiện profile: {profile})',
+  terminalShellNotFound: 'Không tìm thấy shell đã cấu hình: {name} — kiểm tra đường dẫn shell trong Cài đặt → Side card → Terminal',
   preview: 'Xem trước',
   toc: 'Mục lục',
   edit: 'Chỉnh sửa',
@@ -128,7 +142,15 @@ export const vi: Record<string, string> = {
   worktree: 'Worktree',
   checkoutError: 'Chuyển branch thất bại',
   history: 'Lịch sử',
-  changes: 'Thay đổi',
+  changes: 'Thay đổi tệp',
+  changesGitLens: 'Git',
+  changesSessionLens: 'Phiên',
+  changesFilterAll: 'Tất cả',
+  changesFilterEmpty: 'Không có thao tác thuộc loại này',
+  changesOpenDiffTab: 'Mở trong tab diff riêng',
+  changesClosePreview: 'Đóng xem trước',
+  changesResizePreview: 'Điều chỉnh kích thước xem trước',
+  changesLoadError: 'Bản ghi tệp phiên hiện không khả dụng',
   staged: 'Đã stage',
   unstaged: 'Chưa stage',
   cancel: 'Hủy',
@@ -176,6 +198,13 @@ export const vi: Record<string, string> = {
   addToConversation: 'Thêm vào cuộc trò chuyện',
   copyRelative: 'Sao chép đường dẫn tương đối',
   copyAbsolute: 'Sao chép đường dẫn tuyệt đối',
+  rename: 'Đổi tên',
+  renameInvalid: 'Tên không được để trống hoặc chứa dấu phân tách đường dẫn.',
+  delete: 'Xóa',
+  deleteTitle: 'Xóa "{name}"?',
+  deleteDescFile: 'Thao tác này sẽ xóa vĩnh viễn tệp. Không thể hoàn tác.',
+  deleteDescDir: 'Thao tác này sẽ xóa vĩnh viễn thư mục và toàn bộ nội dung của nó. Không thể hoàn tác.',
+  dismiss: 'Đóng',
   download: 'Tải xuống',
   uploadFiles: 'Tải tệp lên',
   uploadFolder: 'Tải thư mục lên',
@@ -194,13 +223,6 @@ export const vi: Record<string, string> = {
   settingsIntro: 'Quản lý nội dung hiển thị và hành vi mặc định của thẻ bên',
   settingsPopupDesc: 'Cấu hình tùy chọn cho «{feature}»',
   settingsDone: 'Xong',
-  settingsOpenTitle: 'Mở mặc định cho phiên mới',
-  settingsOpenDesc: 'Tự động mở rộng thẻ bên cho phiên mới; phiên đã có giữ nguyên bố cục',
-  settingsWidthTitle: 'Tỷ lệ chiều rộng mặc định',
-  settingsWidthDesc: 'Tỷ lệ phần trăm chiều rộng cửa sổ mà thẻ bên chiếm cho phiên mới (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: 'Mở tệp chat trong thanh bên',
-  settingsOpenPathDesc: 'Khi nhấp link tệp trong chat (dòng công cụ, danh sách sản phẩm, nhắc tệp), mở trong trình soạn thảo thanh bên thay vì ứng dụng mặc định hệ thống',
   settingsOpenToolsTitle: 'Tiêm công cụ mở thanh bên cho mô hình',
   settingsOpenToolsDesc: 'Khi bật, mô hình có thể mở tệp, thư mục và trang HTTP(S) trong thanh bên qua công cụ sidebar_open (mặc định tắt)',
   settingsTitleBarTitle: 'Chế độ tương thích thanh tiêu đề',
@@ -221,10 +243,10 @@ export const vi: Record<string, string> = {
   settingsConflict: 'Cài đặt đã bị sửa bởi cửa sổ khác, vui lòng thử lại',
   binaryNoPreview: 'Loại tệp này không hỗ trợ xem trước',
   downloadToView: 'Tải xuống để xem',
-  settingsSubagentTitle: 'Tự động mở trang Quản lý tác vụ khi phát hiện tác nhân con',
-  settingsSubagentDesc: 'Khi phiên hiện tại tạo tác nhân con mới, tự động mở rộng thanh bên và mở trang Quản lý tác vụ; tắt thì phải mở thủ công',
-  settingsJobsTitle: 'Tự động mở trang Tác vụ nền khi có tác vụ nền mới',
-  settingsJobsDesc: 'Khi phiên hiện tại có tác vụ nền mới, tự động mở rộng thanh bên và mở trang Tác vụ nền (mỗi tác vụ mới đều kích hoạt); tắt thì phải mở thủ công',
+  settingsSubagentTitle: 'Tự động kích hoạt trang Quản lý tác vụ khi phát hiện tác nhân con',
+  settingsSubagentDesc: 'Khi phiên hiện tại tạo tác nhân con mới, kích hoạt trang Quản lý tác vụ; trên màn hình rộng, thẻ bên cũng được mở rộng; trên màn hình hẹp, ngăn kéo toàn màn hình không bị ép mở; tắt để mở thủ công',
+  settingsJobsTitle: 'Tự động kích hoạt trang Quản lý tác vụ khi có tác vụ nền mới',
+  settingsJobsDesc: 'Mỗi khi phiên hiện tại có tác vụ nền mới, kích hoạt trang Quản lý tác vụ (mỗi tác vụ mới đều kích hoạt); trên màn hình rộng, thẻ bên cũng được mở rộng; trên màn hình hẹp, ngăn kéo toàn màn hình không bị ép mở; tắt để mở thủ công',
   settingsToolsTitle: 'Tiêm công cụ terminal cho mô hình',
   settingsToolsDesc: 'Khi bật, mô hình có thể tạo và điều khiển terminal thanh bên qua 8 công cụ terminal_* (mặc định tắt)',
   settingsFenceTitle: 'Kiểm tra đường dẫn workspace',
@@ -328,6 +350,25 @@ export const vi: Record<string, string> = {
   sideChatClose: 'Đóng luồng',
   sideChatCloseTitle: 'Giải phóng agent của luồng (lịch sử được giữ)',
   sideChatError: 'Lỗi chat bên: {message}',
+  sideChatTurnUsage: 'Vào {input} tok · Ra {output} tok',
+  sideChatBlockCollapse: 'Thu gọn',
+  sideChatBlockCollapseAria: 'Thu gọn',
+  sideChatBlockExpand: 'Mở rộng {hidden} dòng',
+  sideChatBlockExpandAria: 'Mở rộng thêm {hidden} dòng',
+  sideChatBlockSignal: 'Kết thúc bởi tín hiệu: {signal}',
+  sideChatBlockExitCode: 'Mã thoát {code}',
+  sideChatBlockRunning: 'Đang chạy',
+  sideChatBlockFailed: 'Thất bại',
+  sideChatBlockDone: 'Hoàn tất',
+  sideChatBlockNoOutput: '(không có đầu ra)',
+  sideChatBlockFiles: '{count} tệp',
+  sideChatBlockWindow: '{shown} trong {total} dòng',
+  sideChatConnDisconnected: 'Mất kết nối',
+  sideChatConnReconnect: 'Kết nối lại',
+  sideChatConnConnecting: 'Đang kết nối lại…',
+  sideChatConnRecovered: 'Đã khôi phục kết nối',
+  sideChatConnReconnectAction: 'Kết nối lại ngay',
+  sideChatConnRestartAction: 'Khởi động lại kết nối',
   jobs: 'Tác vụ nền',
   jobsCount: '{count} tác vụ nền',
   jobsCountRunning: '{count} tác vụ nền · {running} đang chạy',
@@ -380,4 +421,29 @@ export const vi: Record<string, string> = {
   pluginDocsPanelDesc: '«Tài liệu toàn cục» trong thanh bên DSH: ghi chú Markdown toàn cục, đọc từ bất kỳ workspace nào — danh sách chọn để đọc, outline hover để nhảy, mở ngoài trong Chrome / VS Code, sao chép code, thư mục cấu hình được (mặc định ~/.dsh/docs)',
   pluginEgoBrowserDesc: 'Trình duyệt agent cho DeepSeek Harness: 32 công cụ ego_* điều khiển Chromium thật; tab «ego browser» gốc trong thanh bên hiển thị trực tiếp mọi trang agent truy cập — bạn có thể bấm, kéo và gõ để tiếp quản. Tự động đăng ký tab khi có better-sidebar, nếu không thì rơi về bong bóng nổi',
   pluginBilingualReaderDesc: 'Đọc PDF trong thanh bên DSH: hiển thị PDF gốc, chọn văn bản để dịch bằng LLM, dùng ngữ cảnh và hoàn toàn tách biệt khỏi cuộc trò chuyện chính',
+  changesRedactOn: "Đang làm mờ: giá trị nhạy cảm hiển thị [REDACTED]; nhấp để tắt (tự chịu rủi ro)",
+  changesRedactOff: "Đã tắt làm mờ: nội dung hiển thị nguyên bản; nhấp để bật",
+  changesRedactOnLabel: "Đang làm mờ",
+  changesRedactOffLabel: "Không làm mờ",
+  changesRedactBanner: "Đã làm mờ",
+  pluginSentinelName: 'dsh-sentinel Hệ thống đánh thức',
+  pluginEgoBrowserName: 'ego-browser Trình duyệt agent',
+  pluginBetterOverleafName: 'dsh-better-overleaf Tab Overleaf',
+  pluginDocsPanelName: 'dsh-docs-panel Tài liệu toàn cục',
+  pluginFlowglassName: 'dsh-flowglass Flowglass',
+  pluginGitForgeName: 'dsh-git-forge Thông tin đăng nhập Git',
+  pluginGitRemotesName: 'dsh-git-remotes Remote Git',
+  pluginGithubWorkbenchName: 'dsh-github-workbench Bàn làm việc GitHub',
+  pluginSidebarQaName: 'dsh-sidebar-qa Chọn & hỏi',
+  pluginSidenoteName: 'dsh-sidenote Trò chuyện bên',
+  pluginServerDeckName: 'dsh-server-deck Bảng máy chủ',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll Suhuang Scroll',
+  pluginSshTunnelName: 'dsh-ssh-tunnel Đường hầm SSH',
+  pluginTurnReviewName: 'dsh-turn-review Duyệt vòng',
+  pluginBilingualReaderName: 'dsh-bilingual-reader Trình đọc song ngữ',
+  pluginOfficeName: 'Xem trước Office',
+  pluginMdExportName: 'Xuất Markdown',
+  pluginCodeNavName: 'Trình điều hướng xem trước mã',
+  pluginVideoPreviewName: 'Xem trước video',
+  presetDshDesktopDesc: 'Chế độ Electron nâng cao (không viền): macOS dành 20px ở trên cùng; Windows dành 32px cho thanh tiêu đề khi không có WCO',
 }

src/client/locales-zh-HK.ts

@@ -32,8 +32,24 @@
 /** The zh-HK dictionary (key-set-equal to zh, enforced by the type annotation in locales.ts). */
 export const zhHK: Record<string, string> = {
   files: '檔案',
+  changesSessionEmpty: '本工作階段還沒有檔案操作',
+  changesRead: '讀取',
+  changesMdReading: '閱讀',
+  changesHtmlRender: "渲染",
+  changesHtmlRaw: "原文",
+  changesPdfRender: "渲染",
+  changesPdfRaw: "原文",
+  changesMdRaw: '原文',
+  changesWrite: '寫入',
+  changesEdit: '編輯',
+  changesRunning: '執行中',
+  changesError: '出錯',
+  changesFold: '{count} 行…點擊展開',
+  changesFoldLoading: '展開中…',
+  changesFoldUnavailable: '上下文未載入',
+  changesContext: '上下文',
+  changesPriorUnknown: '變更前的內容不在視窗內，顯示為全部新增',
   explorer: '檔案總管',
-  git: '原始碼管理',
   terminal: '終端',
   editor: '編輯器',
   editorExplorer: '檔案開啟方式',
@@ -80,7 +96,6 @@ export const zhHK: Record<string, string> = {
   closeOtherTabs: '關閉其他標籤',
   closeLeftTabs: '關閉左側標籤',
   closeRightTabs: '關閉右側標籤',
-  moveToFreeWindow: '移動到自由視窗',
   floatDropHint: '放開以在自由視窗中開啟',
   dockToSidebar: '返回側邊欄',
   pinTerminal: '固定終端',
@@ -95,8 +110,6 @@ export const zhHK: Record<string, string> = {
   pinnedTerminalScopeGlobal: '固定到全域',
   pinnedRailLabel: '固定終端',
   closePinnedTerminal: '關閉終端',
-  collapse: '收起側邊欄',
-  expand: '展開側邊欄',
   collapseBottomPanel: '收起底部面板',
   expandBottomPanel: '展開底部面板',
   terminalError: '終端連線失敗',
@@ -105,6 +118,7 @@ export const zhHK: Record<string, string> = {
   terminalDepsFailed: '終端依賴 node-pty 載入失敗',
   terminalDepsHint: '在 DSH 所在環境的終端或 cmd 中執行以下命令修復，然後點重試（node-pty 與 DSH 核心保持同一版本）：',
   terminalDepsProfile: '（偵測到 profile：{profile}）',
+  terminalShellNotFound: '未找到配置的 Shell：{name}，請到 設定 → 側邊卡片 → 終端 檢查 Shell 路徑',
   preview: '預覽',
   toc: '目錄',
   edit: '編輯',
@@ -143,7 +157,15 @@ export const zhHK: Record<string, string> = {
   worktree: '工作樹',
   checkoutError: '切換分支失敗',
   history: '歷史',
-  changes: '變更',
+  changes: '檔案變動',
+  changesGitLens: 'Git',
+  changesSessionLens: '本輪檔案',
+  changesFilterAll: '全部',
+  changesFilterEmpty: '沒有此類操作',
+  changesOpenDiffTab: '在獨立分頁中開啟',
+  changesClosePreview: '關閉預覽',
+  changesResizePreview: '調整預覽高度',
+  changesLoadError: '工作階段檔案記錄暫不可用',
   staged: '已暫存',
   unstaged: '未暫存',
   cancel: '取消',
@@ -191,6 +213,13 @@ export const zhHK: Record<string, string> = {
   addToConversation: '新增到對話',
   copyRelative: '複製相對位址',
   copyAbsolute: '複製絕對位址',
+  rename: '重新命名',
+  renameInvalid: '名稱不可為空，且不可包含路徑分隔符。',
+  delete: '刪除',
+  deleteTitle: '刪除「{name}」？',
+  deleteDescFile: '將永久刪除該檔案，此操作無法復原。',
+  deleteDescDir: '將永久刪除該目錄及其全部內容，此操作無法復原。',
+  dismiss: '關閉',
   download: '下載',
   uploadFiles: '上傳檔案',
   uploadFolder: '上傳資料夾',
@@ -209,13 +238,6 @@ export const zhHK: Record<string, string> = {
   settingsIntro: '管理側邊卡片的顯示內容與預設行為',
   settingsPopupDesc: '為「{feature}」設定相關選項',
   settingsDone: '完成',
-  settingsOpenTitle: '新工作階段預設開啟',
-  settingsOpenDesc: '新增工作階段時自動展開側邊卡片；已存在的工作階段保持各自佈局',
-  settingsWidthTitle: '預設寬度佔比',
-  settingsWidthDesc: '新增工作階段時側邊卡片佔視窗寬度的百分比 (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: '聊天區檔案在側邊欄開啟',
-  settingsOpenPathDesc: '在聊天裡點擊檔案連結（工具行、產物列表、檔案提及）時，在側邊欄編輯器中開啟，不再呼叫系統預設應用程式',
   settingsOpenToolsTitle: '為模型注入側邊欄開啟工具',
   settingsOpenToolsDesc: '開啟後，模型可透過 sidebar_open 工具在側邊欄主動開啟檔案、資料夾和 HTTP(S) 網頁（預設關閉）',
   settingsTitleBarTitle: '位置相容模式',
@@ -236,10 +258,10 @@ export const zhHK: Record<string, string> = {
   settingsConflict: '設定已被其他視窗修改，請重試',
   binaryNoPreview: '此檔案類型不支援預覽',
   downloadToView: '下載檢視',
-  settingsSubagentTitle: '偵測到子代理時自動展開任務管理頁',
-  settingsSubagentDesc: '目前工作階段產生新的子代理時，自動展開側邊欄並開啟任務管理頁；關閉後需手動開啟',
-  settingsJobsTitle: '有新背景任務時自動展開背景任務頁',
-  settingsJobsDesc: '目前工作階段出現新的背景任務時，自動展開側邊欄並開啟背景任務頁（每個新任務都會觸發）；關閉後需手動開啟',
+  settingsSubagentTitle: '偵測到子代理時自動選取任務管理頁',
+  settingsSubagentDesc: '目前工作階段產生新的子代理時，自動選取任務管理頁；寬螢幕時亦會展開側邊欄，窄螢幕時不會強制開啟全螢幕抽屜；關閉後需手動選取',
+  settingsJobsTitle: '有新背景任務時自動選取任務管理頁',
+  settingsJobsDesc: '目前工作階段出現新的背景任務時，自動選取任務管理頁（每個新任務都會觸發）；寬螢幕時亦會展開側邊欄，窄螢幕時不會強制開啟全螢幕抽屜；關閉後需手動選取',
   settingsToolsTitle: '為模型注入終端工具',
   settingsToolsDesc: '開啟後，模型可透過 terminal_create 等 8 個工具建立並操作側邊欄終端（預設關閉）',
   settingsFenceTitle: '工作區路徑檢測',
@@ -343,6 +365,25 @@ export const zhHK: Record<string, string> = {
   sideChatClose: '關閉執行緒',
   sideChatCloseTitle: '釋放執行緒的 agent（歷史保留）',
   sideChatError: '側邊對話出錯：{message}',
+  sideChatTurnUsage: '輸入 {input} tok · 輸出 {output} tok',
+  sideChatBlockCollapse: '收起',
+  sideChatBlockCollapseAria: '收起',
+  sideChatBlockExpand: '展開 {hidden} 行',
+  sideChatBlockExpandAria: '展開其餘 {hidden} 行',
+  sideChatBlockSignal: '訊號終止：{signal}',
+  sideChatBlockExitCode: '結束碼 {code}',
+  sideChatBlockRunning: '執行中',
+  sideChatBlockFailed: '失敗',
+  sideChatBlockDone: '完成',
+  sideChatBlockNoOutput: '（無輸出）',
+  sideChatBlockFiles: '{count} 個檔案',
+  sideChatBlockWindow: '共 {total} 行 · 顯示 {shown} 行',
+  sideChatConnDisconnected: '連線已中斷',
+  sideChatConnReconnect: '重新連線',
+  sideChatConnConnecting: '正在重新連線…',
+  sideChatConnRecovered: '連線已恢復',
+  sideChatConnReconnectAction: '立即重新連線',
+  sideChatConnRestartAction: '重新發起連線',
   jobs: '背景任務',
   jobsCount: '{count} 個背景任務',
   jobsCountRunning: '{count} 個背景任務 · {running} 執行中',
@@ -395,4 +436,29 @@ export const zhHK: Record<string, string> = {
   pluginDocsPanelDesc: 'DSH 側邊欄裡的「全域文件」：全域 Markdown 筆記，任何工作區隨時可讀——列表點選閱讀、懸浮大綱跳轉、Chrome / VS Code 外部開啟、程式碼複製，目錄可設定（預設 ~/.dsh/docs）',
   pluginEgoBrowserDesc: '將 CitroLabs/ego-lite 接進 DeepSeek Harness 的 agent 瀏覽器：32 個 ego_* 工具驅動真實 Chromium，側邊欄原生「ego 瀏覽器」Tab 實時觀察 agent 逛的每個頁面，可直接點擊/拖拽/輸入接管；裝 better-sidebar 時自動註冊 Tab，沒裝則退回浮動浮窗',
   pluginBilingualReaderDesc: '喺 DSH 側邊欄讀論文 PDF：原生 PDF 顯示，揀一段文字就用大模型劃詞翻譯，結合上下文、完全隔離主對話，只做閱讀輔助',
+  changesRedactOn: "已開啟脫敏：敏感內容以 [REDACTED] 顯示；點擊關閉（自擔風險）",
+  changesRedactOff: "脫敏已關閉：將原樣顯示文件內容；點擊開啟",
+  changesRedactOnLabel: "脫敏中",
+  changesRedactOffLabel: "脫敏關",
+  changesRedactBanner: "已脫敏",
+  pluginSentinelName: 'dsh-sentinel 喚醒系統',
+  pluginEgoBrowserName: 'ego-browser Agent 瀏覽器',
+  pluginBetterOverleafName: 'dsh-better-overleaf Overleaf 標籤',
+  pluginDocsPanelName: 'dsh-docs-panel 全域文件',
+  pluginFlowglassName: 'dsh-flowglass 流鏡',
+  pluginGitForgeName: 'dsh-git-forge Git 憑證',
+  pluginGitRemotesName: 'dsh-git-remotes Git 遠端',
+  pluginGithubWorkbenchName: 'dsh-github-workbench GitHub 工作台',
+  pluginSidebarQaName: 'dsh-sidebar-qa 劃選追問',
+  pluginSidenoteName: 'dsh-sidenote 側邊對話',
+  pluginServerDeckName: 'dsh-server-deck 伺服器甲板',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll 蘇黃共閱',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH 隧道',
+  pluginTurnReviewName: 'dsh-turn-review 本輪審查',
+  pluginBilingualReaderName: 'dsh-bilingual-reader 雙語閱讀',
+  pluginOfficeName: 'Office 預覽插件',
+  pluginMdExportName: 'Markdown 匯出插件',
+  pluginCodeNavName: '程式碼預覽導航',
+  pluginVideoPreviewName: '影片預覽插件',
+  presetDshDesktopDesc: 'Electron 進階模式（無邊框）：macOS 頂欄 20px、Windows 無 WCO 時 32px 標題欄讓位',
 }

src/client/locales-zh-MO.ts

@@ -32,8 +32,24 @@
 /** The zh-HK dictionary (key-set-equal to zh, enforced by the type annotation in locales.ts). */
 export const zhMO: Record<string, string> = {
   files: '檔案',
+  changesSessionEmpty: '本工作階段還沒有檔案操作',
+  changesRead: '讀取',
+  changesMdReading: '閱讀',
+  changesHtmlRender: "渲染",
+  changesHtmlRaw: "原文",
+  changesPdfRender: "渲染",
+  changesPdfRaw: "原文",
+  changesMdRaw: '原文',
+  changesWrite: '寫入',
+  changesEdit: '編輯',
+  changesRunning: '執行中',
+  changesError: '出錯',
+  changesFold: '{count} 行…點擊展開',
+  changesFoldLoading: '展開中…',
+  changesFoldUnavailable: '上下文未載入',
+  changesContext: '上下文',
+  changesPriorUnknown: '變更前的內容不在視窗內，顯示為全部新增',
   explorer: '檔案總管',
-  git: '原始碼管理',
   terminal: '終端',
   editor: '編輯器',
   editorExplorer: '檔案開啟方式',
@@ -80,7 +96,6 @@ export const zhMO: Record<string, string> = {
   closeOtherTabs: '關閉其他標籤',
   closeLeftTabs: '關閉左側標籤',
   closeRightTabs: '關閉右側標籤',
-  moveToFreeWindow: '移動到自由視窗',
   floatDropHint: '放開以在自由視窗中開啟',
   dockToSidebar: '返回側邊欄',
   pinTerminal: '固定終端',
@@ -95,8 +110,6 @@ export const zhMO: Record<string, string> = {
   pinnedTerminalScopeGlobal: '固定到全域',
   pinnedRailLabel: '固定終端',
   closePinnedTerminal: '關閉終端',
-  collapse: '收起側邊欄',
-  expand: '展開側邊欄',
   collapseBottomPanel: '收起底部面板',
   expandBottomPanel: '展開底部面板',
   terminalError: '終端連線失敗',
@@ -105,6 +118,7 @@ export const zhMO: Record<string, string> = {
   terminalDepsFailed: '終端依賴 node-pty 載入失敗',
   terminalDepsHint: '在 DSH 所在環境的終端或 cmd 中執行以下命令修復，然後點重試（node-pty 與 DSH 核心保持同一版本）：',
   terminalDepsProfile: '（偵測到 profile：{profile}）',
+  terminalShellNotFound: '未找到配置的 Shell：{name}，請到 設定 → 側邊卡片 → 終端 檢查 Shell 路徑',
   preview: '預覽',
   toc: '目錄',
   edit: '編輯',
@@ -143,7 +157,15 @@ export const zhMO: Record<string, string> = {
   worktree: '工作樹',
   checkoutError: '切換分支失敗',
   history: '歷史',
-  changes: '變更',
+  changes: '檔案變動',
+  changesGitLens: 'Git',
+  changesSessionLens: '本輪檔案',
+  changesFilterAll: '全部',
+  changesFilterEmpty: '沒有此類操作',
+  changesOpenDiffTab: '在獨立分頁中開啟',
+  changesClosePreview: '關閉預覽',
+  changesResizePreview: '調整預覽高度',
+  changesLoadError: '工作階段檔案記錄暫不可用',
   staged: '已暫存',
   unstaged: '未暫存',
   cancel: '取消',
@@ -191,6 +213,13 @@ export const zhMO: Record<string, string> = {
   addToConversation: '新增到對話',
   copyRelative: '複製相對位址',
   copyAbsolute: '複製絕對位址',
+  rename: '重新命名',
+  renameInvalid: '名稱不可為空，且不可包含路徑分隔符。',
+  delete: '刪除',
+  deleteTitle: '刪除「{name}」？',
+  deleteDescFile: '將永久刪除該檔案，此操作無法復原。',
+  deleteDescDir: '將永久刪除該目錄及其全部內容，此操作無法復原。',
+  dismiss: '關閉',
   download: '下載',
   uploadFiles: '上傳檔案',
   uploadFolder: '上傳資料夾',
@@ -209,13 +238,6 @@ export const zhMO: Record<string, string> = {
   settingsIntro: '管理側邊卡片的顯示內容與預設行為',
   settingsPopupDesc: '為「{feature}」設定相關選項',
   settingsDone: '完成',
-  settingsOpenTitle: '新工作階段預設開啟',
-  settingsOpenDesc: '新增工作階段時自動展開側邊卡片；已存在的工作階段保持各自佈局',
-  settingsWidthTitle: '預設寬度佔比',
-  settingsWidthDesc: '新增工作階段時側邊卡片佔視窗寬度的百分比 (20–60)',
-  settingsWidthSuffix: '%',
-  settingsOpenPathTitle: '聊天區檔案在側邊欄開啟',
-  settingsOpenPathDesc: '在聊天裡點擊檔案連結（工具行、產物列表、檔案提及）時，在側邊欄編輯器中開啟，不再呼叫系統預設應用程式',
   settingsOpenToolsTitle: '為模型注入側邊欄開啟工具',
   settingsOpenToolsDesc: '開啟後，模型可透過 sidebar_open 工具在側邊欄主動開啟檔案、資料夾和 HTTP(S) 網頁（預設關閉）',
   settingsTitleBarTitle: '位置相容模式',
@@ -236,10 +258,10 @@ export const zhMO: Record<string, string> = {
   settingsConflict: '設定已被其他視窗修改，請重試',
   binaryNoPreview: '此檔案類型不支援預覽',
   downloadToView: '下載檢視',
-  settingsSubagentTitle: '偵測到子代理時自動展開任務管理頁',
-  settingsSubagentDesc: '目前工作階段產生新的子代理時，自動展開側邊欄並開啟任務管理頁；關閉後需手動開啟',
-  settingsJobsTitle: '有新背景任務時自動展開背景任務頁',
-  settingsJobsDesc: '目前工作階段出現新的背景任務時，自動展開側邊欄並開啟背景任務頁（每個新任務都會觸發）；關閉後需手動開啟',
+  settingsSubagentTitle: '偵測到子代理時自動選取任務管理頁',
+  settingsSubagentDesc: '目前工作階段產生新的子代理時，自動選取任務管理頁；寬螢幕時亦會展開側邊欄，窄螢幕時不會強制開啟全螢幕抽屜；關閉後需手動選取',
+  settingsJobsTitle: '有新背景任務時自動選取任務管理頁',
+  settingsJobsDesc: '目前工作階段出現新的背景任務時，自動選取任務管理頁（每個新任務都會觸發）；寬螢幕時亦會展開側邊欄，窄螢幕時不會強制開啟全螢幕抽屜；關閉後需手動選取',
   settingsToolsTitle: '為模型注入終端工具',
   settingsToolsDesc: '開啟後，模型可透過 terminal_create 等 8 個工具建立並操作側邊欄終端（預設關閉）',
   settingsFenceTitle: '工作區路徑檢測',
@@ -343,6 +365,25 @@ export const zhMO: Record<string, string> = {
   sideChatClose: '關閉執行緒',
   sideChatCloseTitle: '釋放執行緒的 agent（歷史保留）',
   sideChatError: '側邊對話出錯：{message}',
+  sideChatTurnUsage: '輸入 {input} tok · 輸出 {output} tok',
+  sideChatBlockCollapse: '收起',
+  sideChatBlockCollapseAria: '收起',
+  sideChatBlockExpand: '展開 {hidden} 行',
+  sideChatBlockExpandAria: '展開其餘 {hidden} 行',
+  sideChatBlockSignal: '訊號終止：{signal}',
+  sideChatBlockExitCode: '結束碼 {code}',
+  sideChatBlockRunning: '執行中',
+  sideChatBlockFailed: '失敗',
+  sideChatBlockDone: '完成',
+  sideChatBlockNoOutput: '（無輸出）',
+  sideChatBlockFiles: '{count} 個檔案',
+  sideChatBlockWindow: '共 {total} 行 · 顯示 {shown} 行',
+  sideChatConnDisconnected: '連線已中斷',
+  sideChatConnReconnect: '重新連線',
+  sideChatConnConnecting: '正在重新連線…',
+  sideChatConnRecovered: '連線已恢復',
+  sideChatConnReconnectAction: '立即重新連線',
+  sideChatConnRestartAction: '重新發起連線',
   jobs: '背景任務',
   jobsCount: '{count} 個背景任務',
   jobsCountRunning: '{count} 個背景任務 · {running} 執行中',
@@ -395,4 +436,29 @@ export const zhMO: Record<string, string> = {
   pluginDocsPanelDesc: 'DSH 側邊欄裡的「全域文件」：全域 Markdown 筆記，任何工作區隨時可讀——列表點選閱讀、懸浮大綱跳轉、Chrome / VS Code 外部開啟、程式碼複製，目錄可設定（預設 ~/.dsh/docs）',
   pluginEgoBrowserDesc: '將 CitroLabs/ego-lite 接進 DeepSeek Harness 的 agent 瀏覽器：32 個 ego_* 工具驅動真實 Chromium，側邊欄原生「ego 瀏覽器」Tab 實時觀察 agent 逛的每個頁面，可直接點擊/拖拽/輸入接管；裝 better-sidebar 時自動註冊 Tab，沒裝則退回浮動浮窗',
   pluginBilingualReaderDesc: '喺 DSH 側邊欄讀論文 PDF：原生 PDF 顯示，揀一段文字就用大模型劃詞翻譯，結合上下文、完全隔離主對話，只做閱讀輔助',
+  changesRedactOn: "已開啟脫敏：敏感內容以 [REDACTED] 顯示；點擊關閉（自擔風險）",
+  changesRedactOff: "脫敏已關閉：將原樣顯示文件內容；點擊開啟",
+  changesRedactOnLabel: "脫敏中",
+  changesRedactOffLabel: "脫敏關",
+  changesRedactBanner: "已脫敏",
+  pluginSentinelName: 'dsh-sentinel 喚醒系統',
+  pluginEgoBrowserName: 'ego-browser Agent 瀏覽器',
+  pluginBetterOverleafName: 'dsh-better-overleaf Overleaf 標籤',
+  pluginDocsPanelName: 'dsh-docs-panel 全域文件',
+  pluginFlowglassName: 'dsh-flowglass 流鏡',
+  pluginGitForgeName: 'dsh-git-forge Git 憑證',
+  pluginGitRemotesName: 'dsh-git-remotes Git 遠端',
+  pluginGithubWorkbenchName: 'dsh-github-workbench GitHub 工作台',
+  pluginSidebarQaName: 'dsh-sidebar-qa 劃選追問',
+  pluginSidenoteName: 'dsh-sidenote 側邊對話',
+  pluginServerDeckName: 'dsh-server-deck 伺服器甲板',
+  pluginSuhuangScrollName: 'dsh-suhuang-scroll 蘇黃共閱',
+  pluginSshTunnelName: 'dsh-ssh-tunnel SSH 隧道',
+  pluginTurnReviewName: 'dsh-turn-review 本輪審查',
+  pluginBilingualReaderName: 'dsh-bilingual-reader 雙語閱讀',
+  pluginOfficeName: 'Office 預覽插件',
+  pluginMdExportName: 'Markdown 匯出插件',
+  pluginCodeNavName: '代碼預覽導航',
+  pluginVideoPreviewName: '影片預覽插件',
+  presetDshDesktopDesc: 'Electron 進階模式（無邊框）：macOS 頂欄 20px、Windows 無 WCO 時 32px 標題欄讓位',
 }