dsh-over-ssh 0.2.3 → 0.2.5

package/README.md

@@ -41,6 +41,76 @@ shell:
 
 不配也能用，只是 Web 终端永远开在本地（远程文件、远端执行、`@` 补全不受影响）。
 
+## 0.2.5 更新
+
+> 相对 npm 上的 **0.2.4** 的补丁版本，只有一处修复。
+
+- **修复：释放一条连接/删除一个会话，不再取消无关连接正在进行的重连。** transport 的"已释放代际"
+  原来是**全局**计数器：`release(连接 A)` 或删除任意会话都会让它自增，于是连接 B 正在 `discard` 旧
+  传输、准备重建的 `acquire()` 会拿到一次 `CANCELLED`，调用方无法把它与真实故障区分。现在按连接计数，
+  只有真正被释放的那条连接会取消自己的重建。同时补齐"重建窗口内删除本会话仍然取消"的判断：
+  该窗口里 slot 与 entry 都已删除、pending 尚未登记，新增 `#rebuilding` 记录在飞的 lane key，
+  `releaseSession` 依据 slots/entries/pending/rebuilding 四张表判断归属。
+- **修复：代理侧的编辑/补丁/删除/改名把版本守卫与读-改-写放进同一段临界区。** 之前只有 `fs.write`
+  内部的"校验 + rename"持路径条带锁：并发的 `fs.edit`/`fs.patch` 都能读到同一份旧内容，在 mtime 粒度粗的
+  文件系统上（`size:mtime` 版本串两次写之间不变）两边都会通过守卫、后者静默覆盖前者；在 ns 粒度上则表现
+  为并发编辑偶发 `E_VERSION_CONFLICT`。现在 `Edit`/`Patch` 的整段读-改-写、`Remove` 的校验+删除、
+  `Rename` 的源/目标（按字典序取锁，避免 A→B 与 B→A 互等）都在同一把路径锁里。
+- **修复：`fs.copy` / `fs.copyTree` 的目标侧判定与落地现在真的原子。** 旧实现先 `os.Stat(to)` 判断目标是否存在、
+  再拷临时文件、再 rename，三段之间没有按目标路径串行化：两个并发 `fs.copy(overwrite=false)` 能同时
+  看到"目标不存在"，于是两边都报成功、后者覆盖前者（实测 2 并发 = 2 次成功）。现在目标侧的检查与落地
+  在同一把路径锁里，实测并发下恰好 1 次成功、另一次 `E_VERSION_CONFLICT`。`fs.copyTree` 同样：
+  目标"不存在/为空"的判定与整棵拷贝同持目标锁，避免两棵交错的树同时落盘（旧行为下失败方还会报
+  `E_IO: mkdir ... file exists` 而不是契约里的 `E_VERSION_CONFLICT`）。
+
+## 0.2.4 更新
+
+> 下面这些内容相对 npm 上的 **0.2.3** 一起生效。
+
+### 传输与内存
+
+- transport lanes（审计 0164）：interactive/bulk/compute 分 lane（`limits.transportLanes`，失败回退 interactive）；job/LSP 按会话、watch 按会话（agentless 时连接级）使用 stateful lane（`limits.statefulLanes` 默认 8）；transfer stat 走 bulk；Go 在飞窗口从 8 提到 16；proc/LSP/index 按会话公平配额（含后来者预留名额）。
+- P6 读/解析分离：读协程只读原始帧，zstd 解压、JSON 解析与 blob 解压移出读协程；原始帧队列有界，慢盘/大 blob 不再阻塞同连接其它会话。
+- 修复 P6 读错误被 `readBlob` 消费后主循环永久阻塞；大帧解析后把 parser 缓冲降回 64 KiB；`#pollListings` 快照表加 64 条上限；并发上传的 stdin drain 监听器合并。
+- 修复重连 discard 期间 `releaseSession` 被忽略导致已删除会话 lane 复活；selector 抛错泄漏 lane 槽；watch 按会话分 lane 后会话删除会回收 `watch:<session>`。
+- 修复浏览后端 dispose 拒绝产生未处理拒绝；`#sendCancel` 写失败遗留 pending 槽。
+
+### 会话作用域与「添加目录」
+
+- 会话根按 `sessions` + `workspaces` 双重作用域过滤；带 `scopedForSession` 时，客户端仍按当前 workspace 过滤未限定行，dev 热修。
+- 工作区路径比较容忍尾斜杠与 Windows 大小写差异；真正切换会话/工作区时清空旧 roots，并复位卡片的 `open`/`browsing`。
+- 会话作用域修复覆盖：切会话/工作区不再显示上一条会话的目录；同 workspace 的两个会话按 session 隔离；fork 继承仍可见。
+
+### Agent / 子进程
+
+- 修复取消排队请求不生效：`sessionTable.Cancel` 摘除等待队列与 blob 队列，`dispatchMu` 覆盖出队+launch 与取消。
+- 修复子进程启动失败泄漏 fd：interactive `proc.start` 的 stdin，`rg`/`git status`/`git ls-files` 的 stdout，LSP stdout。
+- 修复 JSON 编码尺寸估算漏算 HTML 转义（`<`/`>`/`&`/U+2028/U+2029），避免含 `<` 的大输出被误判装得下而超帧。
+
+### 数据正确性与工具
+
+- `remote_read_many`：一次往返读多个文件（1..16，默认每文件 256 KiB），非 UTF-8 给 `binary`/`dataBase64` 与渲染警告；修复批量读总量上限与二进制截断一致。
+- `remote_project_summary`：一次往返给 git 状态、顶层结构、包清单、README 头与 test/build/lint 建议。
+- `remote_apply_patch`：一次往返多文件补丁，先全量校验，默认失败回滚。
+- `remote_exec` / `remote_job`：非 UTF-8 输出附带 base64 精确字节与渲染警告；`remote_job` 不再丢 exactBytes。
+- 协议 v3 zstd 跨帧压缩；`remote_grep` 支持 `offset`/`total`/`nextOffset` 分页；Tier 2 批量读走代理 `fs.readMany`。
+- LSP：`server` 支持带空格路径的引号切分、`lsp.read` 每轮 256 KiB、跨块多字节字符按 `exactBytes` 解析；卡片的初始焦点与 Tab 集合跳过不可见控件。
+- 文件引用补全：单来源失败只降级该来源；Windows 反斜杠路径参与排序；符号链接按目录处理，根内展开、根外只列链接；同根并发走查共享。
+- 端口转发：`net.probe` 远端预检，关闭端口在 start 阶段稳定失败；IPv6 `[::1]` 归一；旧代理没有 `net.probe` 时跳过预检继续。
+- 回收站与锁：父子还原、锁心跳、缺 `entryId` 行可见不可操作、已删连接编辑不再提交。
+- 会话管理页：修正短 id、工作区目录内联、行内回收站按钮、已选计数。
+
+### 其它修复
+
+- `remote_read_many`、`remote_exec`、`remote_job` 的二进制/截断/渲染一致性问题（审计 0160–0162）。
+- `writeFile` 非 Uint8Array 参数本地立即拒绝；`repo.summary` 只读普通文件；`patchMany` 超大文件先判大小；`fs.readMany` 先校验再起协程。
+- 主菜单/渲染修复：项目概览补顶层/清单/README、分页提示按 Tier 分档、`remote_grep` 真正分页、zstd 小帧只压缩一次。
+
+### 其它
+
+- 组合层仍为 6 个条目；本地写入围栏由平台沙箱执行。
+- 其余行为不变。
+
 ## 0.2.3 更新
 
 > 下面这些内容相对 npm 上的 **0.2.2** 一起生效。
@@ -84,11 +154,11 @@ shell:
 
 | 平台 | 字节 | sha256 |
 |---|---|---|
-| linux-amd64 | 4,944,032 | `a1272e45a8213d4725a9eb91f9d08f1b5f460623e38730abef735c4569339d8d` |
-| linux-arm64 | 4,653,216 | `1a8c20619fc335f6135a87e4f854a30a93a5d227e867fbf0eee1820f36840cf4` |
+| linux-amd64 | 5,595,296 | `38a32c04c60005cbe3688b05f56b2eed348e2d6de1b4d8dca925f203dd978ac2` |
+| linux-arm64 | 5,243,040 | `eb48c16da284caebd1de3656b3f8be7c7e8741d48bc20e012d07ecd7824d9ba4` |
 
-- 代理版本：`0.2.3-e019f2d`
-- 源码提交：`e019f2d`（Go 仓 `dsh-over-ssh-agent` 的这个提交）
+- 代理版本：`0.2.5-59d9305`
+- 源码提交：`59d9305`（Go 仓 `dsh-over-ssh-agent` 的这个提交）
 - 清单原文：包内 `agents/agent-manifest.json`
 - 核对：`sha256sum agents/<平台>/dsh-over-ssh-agent` 与上表比对；按上面的提交检出 Go 仓后
   `scripts/check.sh` 可重建同样的产物。

package/agents/agent-manifest.json

@@ -1,20 +1,20 @@
 {
   "version": 1,
-  "generatedAt": "2026-11-07T05:49:15.687Z",
-  "agentVersion": "0.2.3-e019f2d",
-  "sourceCommit": "e019f2d",
+  "generatedAt": "2026-11-08T23:42:20.933Z",
+  "agentVersion": "0.2.5-59d9305",
+  "sourceCommit": "59d9305",
   "artifacts": [
     {
       "platform": "linux-amd64",
       "path": "linux-amd64/dsh-over-ssh-agent",
-      "sha256": "a1272e45a8213d4725a9eb91f9d08f1b5f460623e38730abef735c4569339d8d",
-      "bytes": 4944032
+      "sha256": "38a32c04c60005cbe3688b05f56b2eed348e2d6de1b4d8dca925f203dd978ac2",
+      "bytes": 5595296
     },
     {
       "platform": "linux-arm64",
       "path": "linux-arm64/dsh-over-ssh-agent",
-      "sha256": "1a8c20619fc335f6135a87e4f854a30a93a5d227e867fbf0eee1820f36840cf4",
-      "bytes": 4653216
+      "sha256": "eb48c16da284caebd1de3656b3f8be7c7e8741d48bc20e012d07ecd7824d9ba4",
+      "bytes": 5243040
     }
   ]
 }

package/lib/client.js

@@ -90,6 +90,8 @@ var OVER_SSH_DICTS = {
     sessionPanelDeletePermanent: "\u6C38\u4E45\u5220\u9664\u2026",
     sessionPanelRestore: "\u8FD8\u539F",
     sessionPanelPurge: "\u6C38\u4E45\u6E05\u9664\u2026",
+    sessionPanelRowRecycle: "\u56DE\u6536\u7AD9",
+    sessionPanelSelectedCount: "\u5DF2\u9009 {count} \u4E2A",
     sessionPanelSweep: "\u6309\u4FDD\u7559\u7B56\u7565\u6E05\u7406",
     sessionPanelRefresh: "\u5237\u65B0",
     sessionPanelClose: "\u5173\u95ED",
@@ -102,7 +104,7 @@ var OVER_SSH_DICTS = {
     sessionPanelConfirmPurgeBody: "\u5C06\u6C38\u4E45\u6E05\u9664\u56DE\u6536\u7AD9\u6761\u76EE {targets}\uFF0C\u4E0D\u53EF\u6062\u590D\u3002",
     sessionPanelConfirmCancel: "\u53D6\u6D88",
     sessionPanelConfirmAccept: "\u786E\u8BA4\u6C38\u4E45\u5220\u9664",
-    sessionPanelDeleteWorkspace: "\u5220\u9664\u6B64\u5DE5\u4F5C\u533A\u7684\u4F1A\u8BDD\u2026",
+    sessionPanelDeleteWorkspace: "\u5220\u9664\u672C\u5DE5\u4F5C\u533A\u2026",
     // 必须是**模板字符串**而不是函数：字典的契约是 Record<OverSshKey, string>，渲染统一走
     // resolveMessage 的 `template.replace(...)`。写成函数会让面板在渲染时抛
     // TypeError: template.replace is not a function，整块白屏。
@@ -248,8 +250,7 @@ var OVER_SSH_DICTS = {
     browseChoose: "\u7528\u8FD9\u4E2A\u76EE\u5F55",
     sessionAddOpen: "\u6DFB\u52A0\u76EE\u5F55",
     sessionAddTitle: "\u6DFB\u52A0\u76EE\u5F55\u5230\u5F53\u524D\u5DE5\u4F5C\u533A",
-    sessionAddHint: "\u9009\u4E2D\u7684\u76EE\u5F55\u4F1A\u52A0\u5165\u672C\u4F1A\u8BDD\uFF1A\u672C\u4F1A\u8BDD\u7684\u6587\u4EF6\u5DE5\u5177\u4E0E @ \u8865\u5168\u7ACB\u5373\u53EF\u7528\uFF0C\u4E0D\u4F1A\u65B0\u5EFA\u5DE5\u4F5C\u533A\u3002",
-    sessionAddWorkspace: "\u5F53\u524D\u5DE5\u4F5C\u533A\uFF1A{path}",
+    sessionAddHint: "\u52A0\u5165\u672C\u4F1A\u8BDD\uFF1A\u6587\u4EF6\u5DE5\u5177\u4E0E @ \u8865\u5168\u7ACB\u5373\u53EF\u7528\uFF0C\u4E0D\u4F1A\u65B0\u5EFA\u5DE5\u4F5C\u533A\u3002",
     sessionAddWorkspaceUnknown: "\u62FF\u4E0D\u5230\u5F53\u524D\u5DE5\u4F5C\u533A\u8DEF\u5F84\uFF0C\u65E0\u6CD5\u628A\u76EE\u5F55\u52A0\u5165\u672C\u4F1A\u8BDD\uFF08\u672C\u7EC4\u5408\u6CA1\u6709\u63D0\u4F9B\u4F1A\u8BDD\u6216\u5DE5\u4F5C\u533A\u670D\u52A1\u65F6\uFF0C\u8FD9\u4E2A\u5165\u53E3\u4E0D\u53EF\u7528\uFF09\u3002",
     sessionAddPick: "\u52A0\u5165\u8FD9\u4E2A\u76EE\u5F55",
     sessionBrowse: "\u6D4F\u89C8\u2026",
@@ -257,9 +258,9 @@ var OVER_SSH_DICTS = {
     sessionRootsTitle: "\u672C\u4F1A\u8BDD\u53EF\u7528\u7684\u76EE\u5F55",
     sessionRootsEmpty: "\u8FD8\u6CA1\u6709\u6DFB\u52A0\u76EE\u5F55\u3002\u70B9\u300C\u6D4F\u89C8\u2026\u300D\u9009\u4E00\u4E2A\u672C\u5730\u6216\u8FDC\u7AEF\u76EE\u5F55\u3002",
     sessionRootsLoading: "\u6B63\u5728\u8BFB\u53D6\u8FD9\u4E2A\u4F1A\u8BDD\u7684\u76EE\u5F55\u2026",
-    sessionRootsHint: "\u672C\u5730\u76EE\u5F55\u76F4\u63A5\u8BFB\u5199\uFF1B\u8FDC\u7AEF\u76EE\u5F55\u7ECF SSH \u4EE3\u7406\u8BBF\u95EE\u3002\u7B2C\u4E00\u884C\u662F\u5F53\u524D\u5DE5\u4F5C\u533A\uFF08\u59CB\u7EC8\u53EF\u7528\u3001\u4E0D\u53EF\u5220\u9664\uFF09\uFF1B\u53EA\u6709\u4F60\u81EA\u5DF1\u52A0\u7684\u76EE\u5F55\u80FD\u5220\u9664\u3002\u63D2\u4EF6\u8BBE\u7F6E\u91CC\u767B\u8BB0\u7684\u6839\u4E0D\u5728\u8FD9\u91CC\u2014\u2014\u8981\u7528\u5B83\uFF0C\u5148\u5728\u4F1A\u8BDD\u91CC\u6DFB\u52A0\u3002",
+    sessionRootsHint: "\u672C\u5730\u76F4\u63A5\u8BFB\u5199\uFF0C\u8FDC\u7AEF\u7ECF SSH \u4EE3\u7406\u3002\u53EA\u6709\u4F60\u6DFB\u52A0\u7684\u76EE\u5F55\u53EF\u5220\u9664\uFF1B\u63D2\u4EF6\u8BBE\u7F6E\u91CC\u767B\u8BB0\u7684\u6839\u8981\u5148\u5728\u8FD9\u91CC\u6DFB\u52A0\u3002",
     sessionRootsWorkspaceBadge: "\u5DE5\u4F5C\u533A",
-    sessionRootsWorkspaceNote: "\u4F1A\u8BDD\u7684\u9ED8\u8BA4\u8FB9\u754C\uFF1Bworkspace-write \u4E0B\u4E0E\u5DF2\u6DFB\u52A0\u76EE\u5F55\u4E00\u6837\u53EF\u5199\uFF0Cread-only \u4E0B\u90FD\u4E0D\u53EF\u5199",
+    sessionRootsWorkspaceNote: "\u9ED8\u8BA4\u8FB9\u754C\uFF0C\u4E0D\u53EF\u5220\u9664\uFF08workspace-write \u4E0B\u540C\u5DF2\u6DFB\u52A0\u76EE\u5F55\u4E00\u6837\u53EF\u5199\uFF09",
     sessionRootsFailed: "\u8BFB\u53D6\u76EE\u5F55\u5217\u8868\u5931\u8D25\uFF1A{reason}",
     sessionAddDone: "\u5DF2\u52A0\u5165\uFF1A{path}\uFF08\u672A\u65B0\u5EFA\u5DE5\u4F5C\u533A\uFF09",
     sessionAddFailed: "\u52A0\u5165\u5931\u8D25\uFF1A{reason}",
@@ -343,6 +344,8 @@ var OVER_SSH_DICTS = {
     sessionPanelDeletePermanent: "Delete permanently\u2026",
     sessionPanelRestore: "Restore",
     sessionPanelPurge: "Purge\u2026",
+    sessionPanelRowRecycle: "Bin",
+    sessionPanelSelectedCount: "{count} selected",
     sessionPanelSweep: "Apply retention policy",
     sessionPanelRefresh: "Refresh",
     sessionPanelClose: "Close",
@@ -496,8 +499,7 @@ var OVER_SSH_DICTS = {
     browseChoose: "Use this directory",
     sessionAddOpen: "Add a directory",
     sessionAddTitle: "Add a directory to the current workspace",
-    sessionAddHint: "The chosen directory is added to this session (no workspace is created): this session's file tools and @-completion can use it right away.",
-    sessionAddWorkspace: "Current workspace: {path}",
+    sessionAddHint: "Added to this session: its file tools and @-completion work immediately; no new workspace is created.",
     sessionAddWorkspaceUnknown: "The current workspace path is unavailable, so the directory cannot be added to this session (when the composition provides neither the session nor the workspace service, this entry cannot work at all).",
     sessionAddPick: "Add this directory",
     sessionBrowse: "Browse\u2026",
@@ -700,6 +702,8 @@ var CLASS = {
   group: "dsh-rw-group",
   /** A workspace section's heading line (label + count). */
   groupHead: "dsh-rw-group-head",
+  /** The workspace directory, inline in the group head: one line, ellipsized, full path in `title`. */
+  groupPath: "dsh-rw-group-path",
   /**
    * The inventory's action bar (select all / clear / delete). Sticky: the list is long, and a bar that
    * scrolls away forces the user to scroll back up for every action.
@@ -951,6 +955,7 @@ function controlStylesheet() {
     `.${CLASS.group} { display: flex; flex-direction: column; gap: ${SPACE.xs}; box-sizing: border-box; min-width: 0; max-width: 100%; padding: ${SPACE.sm}; background: ${TOKENS.bgLayer2}; border: 1px solid ${TOKENS.border}; border-radius: ${TOKENS.radiusMd}; }`,
     /* The heading is separated from the rows it labels, so a long list has a visible rhythm. */
     `.${CLASS.groupHead} { display: flex; flex-wrap: wrap; align-items: baseline; gap: ${SPACE.xs}; min-width: 0; padding-bottom: ${SPACE.hair}; border-bottom: 1px solid ${TOKENS.border}; }`,
+    `.${CLASS.groupPath} { flex: 1 1 12rem; min-width: 0; font-size: 0.75rem; line-height: 1.5; color: ${TOKENS.textTertiary}; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }`,
     /**
      * The session inventory's action bar, sticky against **whatever scrolls it**.
      *
@@ -3982,7 +3987,8 @@ function formatStamp(ms, now = Date.now()) {
   return `${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
 }
 function shortId(id) {
-  return id.length <= 8 ? id : id.slice(0, 8);
+  const body = id.startsWith("session-") ? id.slice("session-".length) : id;
+  return body.length <= 8 ? body : body.slice(0, 8);
 }
 function parseSessionSnapshot(value) {
   if (typeof value !== "object" || value === null) return emptySnapshot();
@@ -4163,7 +4169,7 @@ function badgeFor(row, copy) {
   return void 0;
 }
 function sessionRowTemplate(props) {
-  const { row, copy, checked, onToggle, pickIdPrefix } = props;
+  const { row, copy, checked, onToggle, pickIdPrefix, onRecycle } = props;
   const badge = badgeFor(row, copy);
   const stamp = formatStamp(row.updatedAtMs);
   return (0, import_react7.createElement)(
@@ -4205,7 +4211,15 @@ function sessionRowTemplate(props) {
           (0, import_react7.createElement)("span", void 0, formatBytes(row.bytes))
         )
       )
-    )
+    ),
+    // 便捷手段：勾选 + 顶部批量按钮对"只想删一条"的场景太重。回收站是**可恢复**的，所以这里不弹确认，
+    // 直接移入回收站（永久删除仍然只在批量流程里，且带确认）。
+    row.deletable && onRecycle !== void 0 ? Button({
+      variant: "ghost",
+      size: "compact",
+      onClick: () => onRecycle(row.id),
+      children: copy.rowRecycle
+    }) : null
   );
 }
 var SessionRow = (0, import_react7.memo)(function SessionRow2(props) {
@@ -4260,6 +4274,8 @@ function renderWorkspaceGroup(props) {
       { className: CLASS.groupHead },
       (0, import_react7.createElement)("span", { className: CLASS.rowTitle }, group.label === "" ? copy.workspaceUnknown : group.label),
       (0, import_react7.createElement)("span", { className: CLASS.badge }, String(group.sessions.length)),
+      // 目录内联在组头里（可省略号截断，完整路径留在 title），不再让组头下面多出整整一行只放路径。
+      group.cwd === void 0 ? null : (0, import_react7.createElement)("span", { className: CLASS.groupPath, title: group.cwd }, group.cwd),
       // A workspace with no directory (the platform's no-cwd bucket) has nothing to scope a delete to, so it
       // gets no button rather than a button that guesses.
       remove === void 0 ? null : Button({
@@ -4270,7 +4286,6 @@ function renderWorkspaceGroup(props) {
         children: copy.deleteWorkspace
       })
     ),
-    group.cwd === void 0 ? null : (0, import_react7.createElement)("p", { className: CLASS.hint, title: group.cwd }, group.cwd),
     (0, import_react7.createElement)(
       "ul",
       { className: CLASS.list },
@@ -4283,6 +4298,7 @@ function renderWorkspaceGroup(props) {
           copy,
           checked: selectedSet.has(row.id),
           onToggle: props.onToggle,
+          ...props.onRecycle === void 0 ? {} : { onRecycle: props.onRecycle },
           pickIdPrefix: props.pickIdPrefix
         })
       )
@@ -4486,6 +4502,7 @@ function SessionPanel({ copy, io, close }) {
           children: copy.selectAll
         }),
         Button({ variant: "ghost", size: "compact", onClick: () => setSelected([]), children: copy.clearSelection }),
+        deletable.length === 0 ? null : (0, import_react7.createElement)("span", { className: CLASS.rowMeta }, copy.selectedCount(deletable.length)),
         Button({
           variant: "primary",
           size: "compact",
@@ -4511,6 +4528,7 @@ function SessionPanel({ copy, io, close }) {
             selected,
             busy,
             onToggle: toggle,
+            onRecycle: (id) => void run(() => deleteSessions(io, [id])),
             onRemove: setPending,
             pickIdPrefix
           })
@@ -5617,7 +5635,15 @@ function createSessionDirectoryIo(options) {
     }
     const all = result.value.roots;
     if (sessionId !== void 0 && sessionId !== "" && result.value.scopedForSession === sessionId) {
-      return { ok: true, value: all };
+      if (workspacePath === void 0 || workspacePath === "") return { ok: true, value: all };
+      return {
+        ok: true,
+        value: all.filter((row) => {
+          const sessions = row.sessions ?? [];
+          if (sessions.length > 0) return true;
+          return (row.workspaces ?? []).some((candidate) => sameWorkspaceSpelling(candidate, workspacePath));
+        })
+      };
     }
     if (workspacePath === void 0 || workspacePath === "") return { ok: true, value: [] };
     return {
@@ -5625,7 +5651,7 @@ function createSessionDirectoryIo(options) {
       value: all.filter((row) => {
         const sessions = row.sessions ?? [];
         if (sessions.length > 0 && sessionId !== void 0 && sessionId !== "") return sessions.includes(sessionId);
-        return row.workspaces?.includes(workspacePath) === true;
+        return (row.workspaces ?? []).some((candidate) => sameWorkspaceSpelling(candidate, workspacePath));
       })
     };
   };
@@ -5682,16 +5708,26 @@ function sessionDirectoryReducer(state, action) {
       const next = action.path === void 0 || action.path === "" ? void 0 : action.path;
       if (state.workspacePath === next) return state;
       const base = withoutOptional2(state);
+      const switched = state.workspacePath !== void 0 && next !== void 0 && state.workspacePath !== next;
+      const cleared = {
+        ...base,
+        roots: [],
+        // The card/browser state is also entry-shared. A move between two real workspaces must not carry
+        // the previous card's open/browse state into the new one; a late initial seat (undefined -> value)
+        // must NOT close a card the user already opened.
+        ...switched ? { open: false, browsing: false } : {}
+      };
       if (next === void 0) {
-        const { workspacePath: _cleared, ...rest } = base;
+        const { workspacePath: _cleared, ...rest } = cleared;
         return rest;
       }
-      return { ...base, workspacePath: next };
+      return { ...cleared, workspacePath: next };
     }
     case "session-known": {
       const next = action.sessionId === void 0 || action.sessionId === "" ? void 0 : action.sessionId;
       if (state.sessionId === next) return state;
-      const base = withoutOptional2(state);
+      const switched = state.sessionId !== void 0 && next !== void 0 && state.sessionId !== next;
+      const base = { ...withoutOptional2(state), roots: [], ...switched ? { open: false, browsing: false } : {} };
       if (next === void 0) {
         const { sessionId: _cleared, ...rest } = base;
         return rest;
@@ -5736,15 +5772,23 @@ function sessionDirectoryReducer(state, action) {
       };
   }
 }
+function sameWorkspaceSpelling(left, right) {
+  const fold = (value) => value.replace(/\\/g, "/").replace(/\/+/g, "/").replace(/\/$/, "");
+  const a = fold(left);
+  const b = fold(right);
+  if (a === b) return true;
+  return /^[A-Za-z]:\//.test(a) && /^[A-Za-z]:\//.test(b) && a.toLowerCase() === b.toLowerCase();
+}
 function selectSessionDirectoryView(state, copy) {
   const view = {
     visible: state.open,
     pending: state.pending,
     notice: resolveMessage2(copy, state.notice),
-    workspaceLine: state.workspacePath === void 0 ? copy["sessionAddWorkspaceUnknown"] : resolveMessage2(copy, { key: "sessionAddWorkspace", params: { path: state.workspacePath } }),
     ...state.workspacePath === void 0 ? {} : { workspacePath: state.workspacePath },
     ...state.added === void 0 ? {} : { added: state.added },
     // 工作区永远排在第一行：它是默认边界，`workspace-write` 下与已添加目录一样可写（ADR-0016）。
+    // Filter again at render time: the controller is entry-scoped and shared by every session card, so a
+    // stale `roots` snapshot from the previous session must not paint a row scoped to another workspace.
     roots: [
       ...state.workspacePath === void 0 ? [] : [{
         key: `workspace:${state.workspacePath}`,
@@ -5754,7 +5798,9 @@ function selectSessionDirectoryView(state, copy) {
         removable: false,
         workspace: true
       }],
-      ...state.roots.map((row) => ({
+      ...state.roots.filter(
+        (row) => row.workspaces === void 0 || row.workspaces.length === 0 || state.workspacePath === void 0 || state.workspacePath === "" || row.workspaces.some((candidate) => sameWorkspaceSpelling(candidate, state.workspacePath))
+      ).map((row) => ({
         key: row.key,
         // A label is what the user called it; without one the path is the only honest title. A remote path alone
         // would hide which host it is on, so the connection name is part of the title there.
@@ -5916,22 +5962,13 @@ function SessionDirectorySection({
     },
     (0, import_react11.createElement)("h3", { id: titleId, className: CLASS.sectionTitle }, copy.sessionAddTitle),
     (0, import_react11.createElement)("p", { className: CLASS.hint }, copy.sessionAddHint),
-    // Which workspace this lands in, or - when the framework seats could not answer - the fallback the
-    // copy states explicitly. Both are one line, so a narrow panel never has to truncate it.
-    (0, import_react11.createElement)("p", { className: CLASS.browserPath }, view.workspaceLine),
+    // 工作区路径只出现一次：列表第一行就是它（带「工作区」徽标）。此前这里还有一行“当前工作区：…”，
+    // 与第一行完全重复；拿不到路径时仍然要明说，否则用户不知道为什么会话加不了目录。
+    view.workspacePath === void 0 ? (0, import_react11.createElement)("p", { className: CLASS.empty }, copy["sessionAddWorkspaceUnknown"]) : null,
     // The card no longer *is* a browser: it lists what this session has and offers one way in. The picker is a
     // step behind 「浏览…」, which also means the card no longer opens with a full directory listing (that was
     // the complaint: the panel showed the current directory's contents before the user asked for anything).
-    view.browsing ? (0, import_react11.createElement)(
-      "div",
-      { className: CLASS.block },
-      browser,
-      (0, import_react11.createElement)(
-        "div",
-        { className: CLASS.actions },
-        Button({ variant: "ghost", size: "compact", onClick: actions.onBrowse, children: copy.sessionBrowseBack })
-      )
-    ) : (0, import_react11.createElement)(
+    view.browsing ? (0, import_react11.createElement)("div", { className: CLASS.block }, browser) : (0, import_react11.createElement)(
       "div",
       { className: CLASS.block },
       (0, import_react11.createElement)("h4", { className: CLASS.blockTitle }, copy.sessionRootsTitle),
@@ -5970,17 +6007,18 @@ function SessionDirectorySection({
         )
       ),
       // 列表里只剩工作区行时，"还没有添加目录"仍然是有用的下一步提示；但它不再替换列表。
-      view.roots.length > 0 && view.roots.filter((row) => row.workspace !== true).length === 0 && !view.rootsReading && view.notice === "" ? (0, import_react11.createElement)("p", { className: CLASS.empty }, copy.sessionRootsEmpty) : null,
-      (0, import_react11.createElement)(
-        "div",
-        { className: CLASS.actions },
-        Button({ variant: "secondary", size: "compact", onClick: actions.onBrowse, children: copy.sessionBrowse })
-      )
+      view.roots.length > 0 && view.roots.filter((row) => row.workspace !== true).length === 0 && !view.rootsReading && view.notice === "" ? (0, import_react11.createElement)("p", { className: CLASS.empty }, copy.sessionRootsEmpty) : null
     ),
     view.added === void 0 ? null : Notice({ role: "status", tone: "info", children: resolveMessage2(copy, { key: "sessionAddDone", params: { path: view.added } }) }),
     view.pending ? Notice({ role: "status", tone: "info", children: copy.flowPending }) : null,
     view.notice === "" ? null : Notice({ role: "alert", tone: "error", children: view.notice }),
-    (0, import_react11.createElement)("div", { className: CLASS.actions }, Button({ variant: "secondary", size: "compact", onClick: actions.onClose, children: copy.close }))
+    // 主操作与关闭收在底部同一行：此前「浏览…」长在列表块里、关闭单独一行，两个按钮上下分离。
+    (0, import_react11.createElement)(
+      "div",
+      { className: CLASS.actions },
+      view.browsing ? Button({ variant: "secondary", size: "compact", onClick: actions.onBrowse, children: copy.sessionBrowseBack }) : Button({ variant: "secondary", size: "compact", onClick: actions.onBrowse, children: copy.sessionBrowse }),
+      Button({ variant: "secondary", size: "compact", onClick: actions.onClose, children: copy.close })
+    )
   );
   return (0, import_react11.createElement)(
     "div",
@@ -6701,6 +6739,8 @@ function apply(ctx) {
         deletePermanent: dict.sessionPanelDeletePermanent,
         restore: dict.sessionPanelRestore,
         purge: dict.sessionPanelPurge,
+        rowRecycle: dict.sessionPanelRowRecycle,
+        selectedCount: (count) => resolveMessage2(dict, { key: "sessionPanelSelectedCount", params: { count } }),
         sweep: dict.sessionPanelSweep,
         refresh: dict.sessionPanelRefresh,
         close: dict.sessionPanelClose,

package/lib/fs.js

@@ -787,7 +787,8 @@ function wireGitStatus(ctx) {
       if (connections === void 0 || transports === void 0) return void 0;
       const profile = connections.get(connectionId);
       if (profile === void 0) return void 0;
-      const acquired = await transports.acquire(profile);
+      const lanes = ctx.get("sshDevTransportLanes");
+      const acquired = lanes === void 0 ? await transports.acquire(profile) : await lanes.acquire(profile, "compute");
       return acquired.transport;
     },
     resolveRoot: (connectionId, path) => {