dsh-over-ssh 0.2.2 → 0.2.4

package/lib/client.js

@@ -82,12 +82,16 @@ var OVER_SSH_DICTS = {
     sessionPanelSessions: "\u4F1A\u8BDD",
     sessionPanelBin: "\u56DE\u6536\u7AD9",
     sessionPanelBinEmpty: "\u56DE\u6536\u7AD9\u4E3A\u7A7A\u3002",
+    sessionPanelBinUnreadable: "\u53E6\u6709 {count} \u6761\u56DE\u6536\u7AD9\u6761\u76EE\u65E0\u6CD5\u663E\u793A\uFF08\u7F3A\u5C11\u4F1A\u8BDD\u6807\u8BC6\uFF09\uFF1B\u53EF\u91CD\u542F\u5BBF\u4E3B\u6216\u68C0\u67E5\u56DE\u6536\u7AD9\u7D22\u5F15\u3002",
+    sessionPanelBinRowUnaddressable: "\u8BE5\u6761\u76EE\u7F3A\u5C11\u6807\u8BC6\uFF0C\u65E0\u6CD5\u8FD8\u539F\u6216\u6E05\u9664",
     sessionPanelSelectAll: "\u5168\u9009\u53EF\u5220\u7684",
     sessionPanelClear: "\u6E05\u7A7A\u9009\u62E9",
     sessionPanelDeleteRecycle: "\u5220\u9664\u5230\u56DE\u6536\u7AD9",
     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",
@@ -100,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，整块白屏。
@@ -159,6 +163,7 @@ var OVER_SSH_DICTS = {
     rootsErrorIdRequired: "\u8BF7\u586B\u5199\u8FDE\u63A5 id\u3002",
     rootsErrorIdInvalid: "\u8FDE\u63A5 id \u53EA\u80FD\u5305\u542B\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u70B9\u3001\u4E0B\u5212\u7EBF\u548C\u77ED\u6A2A\u7EBF\uFF0C\u4E14\u5FC5\u987B\u4EE5\u5B57\u6BCD\u6216\u6570\u5B57\u5F00\u5934\u3002",
     rootsErrorIdDuplicate: "\u8FD9\u4E2A\u8FDE\u63A5 id \u5DF2\u7ECF\u5B58\u5728\u3002",
+    rootsErrorConnectionMissing: "\u8BE5\u8FDE\u63A5\u5DF2\u88AB\u5220\u9664\uFF0C\u65E0\u6CD5\u4FDD\u5B58\uFF1B\u8BF7\u5173\u95ED\u7F16\u8F91\u5E76\u5237\u65B0\u5217\u8868\u3002",
     rootsErrorHostRequired: "\u8BF7\u586B\u5199\u4E3B\u673A\u540D\u3002",
     rootsErrorUserRequired: "\u8BF7\u586B\u5199\u7528\u6237\u540D\u3002",
     rootsErrorPort: "\u7AEF\u53E3\u5FC5\u987B\u662F 1 \u5230 65535 \u4E4B\u95F4\u7684\u6574\u6570\u3002",
@@ -245,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",
@@ -254,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}",
@@ -276,6 +280,9 @@ var OVER_SSH_DICTS = {
     sessionResultWorkspaceRecycled: "\u5DF2\u628A\u8BE5\u5DE5\u4F5C\u533A {count} \u4E2A\u4F1A\u8BDD\u79FB\u5165\u56DE\u6536\u7AD9\uFF0C{size}\uFF08\u53EF\u6062\u590D\uFF09",
     sessionResultWorkspaceRecycledRefused: "\u5DF2\u628A\u8BE5\u5DE5\u4F5C\u533A {count} \u4E2A\u4F1A\u8BDD\u79FB\u5165\u56DE\u6536\u7AD9\uFF0C{size}\uFF08\u53EF\u6062\u590D\uFF1B{refused} \u4E2A\u88AB\u62D2\u7EDD\uFF09",
     sessionResultRestored: "\u5DF2\u8FD8\u539F\u8BE5\u4F1A\u8BDD",
+    sessionResultRestoredWithSubsessions: "\u5DF2\u8FD8\u539F\u8BE5\u4F1A\u8BDD\uFF0C\u5E76\u8FDE\u5E26\u8FD8\u539F {count} \u4E2A\u5B50\u4F1A\u8BDD",
+    sessionResultRestoredPartial: "\u5DF2\u8FD8\u539F\u8BE5\u4F1A\u8BDD\uFF0C\u53E6\u6709 {failed} \u4E2A\u5B50\u4F1A\u8BDD\u4ECD\u7559\u5728\u56DE\u6536\u7AD9",
+    sessionResultRestoredParentBinned: "\u5DF2\u8FD8\u539F\u8BE5\u4F1A\u8BDD\uFF08\u5176\u7236\u4F1A\u8BDD\u4ECD\u5728\u56DE\u6536\u7AD9\uFF09",
     sessionResultPurged: "\u5DF2\u6C38\u4E45\u6E05\u9664\u8BE5\u6761\u76EE",
     sessionResultSweepNone: "\u6CA1\u6709\u9700\u8981\u6E05\u7406\u7684\u6761\u76EE",
     sessionResultSweepDone: "\u5DF2\u6E05\u7406 {count} \u4E2A\u6761\u76EE",
@@ -329,12 +336,16 @@ var OVER_SSH_DICTS = {
     sessionPanelSessions: "Sessions",
     sessionPanelBin: "Recycle bin",
     sessionPanelBinEmpty: "The recycle bin is empty.",
+    sessionPanelBinUnreadable: "{count} more bin entr(y/ies) cannot be shown (no session id); restart the host or check the bin index.",
+    sessionPanelBinRowUnaddressable: "This entry has no id, so it cannot be restored or purged",
     sessionPanelSelectAll: "Select deletable",
     sessionPanelClear: "Clear selection",
     sessionPanelDeleteRecycle: "Delete to bin",
     sessionPanelDeletePermanent: "Delete permanently\u2026",
     sessionPanelRestore: "Restore",
     sessionPanelPurge: "Purge\u2026",
+    sessionPanelRowRecycle: "Bin",
+    sessionPanelSelectedCount: "{count} selected",
     sessionPanelSweep: "Apply retention policy",
     sessionPanelRefresh: "Refresh",
     sessionPanelClose: "Close",
@@ -401,6 +412,7 @@ var OVER_SSH_DICTS = {
     rootsErrorIdRequired: "Enter a connection id.",
     rootsErrorIdInvalid: "A connection id may contain letters, digits, dots, underscores and dashes, and must start with a letter or a digit.",
     rootsErrorIdDuplicate: "That connection id already exists.",
+    rootsErrorConnectionMissing: "That connection has been deleted; close the editor and refresh.",
     rootsErrorHostRequired: "Enter a host name.",
     rootsErrorUserRequired: "Enter a user name.",
     rootsErrorPort: "The port must be an integer between 1 and 65535.",
@@ -487,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",
@@ -518,6 +529,9 @@ var OVER_SSH_DICTS = {
     sessionResultWorkspaceRecycled: "Moved {count} sessions of that workspace to the recycle bin, {size} (recoverable)",
     sessionResultWorkspaceRecycledRefused: "Moved {count} sessions of that workspace to the recycle bin, {size} (recoverable; {refused} refused)",
     sessionResultRestored: "Restored that session",
+    sessionResultRestoredWithSubsessions: "Restored that session and {count} sub-session(s)",
+    sessionResultRestoredPartial: "Restored that session; {failed} sub-session(s) stayed in the bin",
+    sessionResultRestoredParentBinned: "Restored that session (its parent is still in the bin)",
     sessionResultPurged: "Permanently removed that entry",
     sessionResultSweepNone: "Nothing to sweep",
     sessionResultSweepDone: "Swept {count} entries",
@@ -688,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.
@@ -939,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**.
      *
@@ -1438,15 +1455,29 @@ function createCardPortal(options) {
   };
 }
 function focusFirstControl(container) {
+  const all = container?.querySelectorAll?.(CARD_FOCUS_SELECTOR);
+  if (all !== void 0 && all !== null) {
+    for (const candidate of Array.from(all)) {
+      if (!isVisibleControl(candidate)) continue;
+      candidate.focus?.();
+      return true;
+    }
+    return false;
+  }
   const target = container?.querySelector?.(CARD_FOCUS_SELECTOR) ?? void 0;
   if (target === void 0 || typeof target.focus !== "function") return false;
   target.focus();
   return true;
 }
+function isVisibleControl(element) {
+  const measurable = element.getClientRects;
+  if (typeof measurable === "function") return measurable.call(element).length > 0;
+  return element.hidden !== true;
+}
 function focusableWithin(container) {
   const found = container?.querySelectorAll?.(CARD_FOCUS_SELECTOR);
   if (found === null || found === void 0) return [];
-  return Array.from(found);
+  return Array.from(found).filter(isVisibleControl);
 }
 function trapTab(event, container, active) {
   const focusables = focusableWithin(container);
@@ -2726,6 +2757,11 @@ function createRootsPanelController(options) {
     const editingId = state.editingId;
     if (editingId === void 0) return;
     if (!canEdit(state)) return;
+    if (!(state.snapshot?.connections ?? []).some((row) => row.id === editingId)) {
+      dispatch({ type: "edit-ended" });
+      dispatch({ type: "refused", scope: "edit", message: { key: "rootsErrorConnectionMissing" } });
+      return;
+    }
     const editDrafts = state.editDrafts;
     const portText = editDrafts.port.trim();
     const port = portText === "" ? void 0 : Number(portText);
@@ -3869,10 +3905,10 @@ function toSessionRowView(raw) {
   };
 }
 function toBinRowView(raw) {
-  const entryId = raw["entryId"];
+  const rawEntryId = raw["entryId"];
   const sessionId = raw["sessionId"];
-  if (typeof entryId !== "string" || entryId === "") return void 0;
   if (typeof sessionId !== "string" || sessionId === "") return void 0;
+  const entryId = typeof rawEntryId === "string" ? rawEntryId : "";
   return {
     entryId,
     sessionId,
@@ -3887,6 +3923,8 @@ function emptySnapshot() {
     available: false,
     sessions: [],
     bin: [],
+    binUnaddressable: 0,
+    binUnreadable: 0,
     policy: { maxEntries: 0, maxBytes: 0, maxAgeMs: 0 },
     totals: { sessions: 0, bytes: 0, subsessions: 0, live: 0, running: 0 }
   };
@@ -3949,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();
@@ -3958,13 +3997,28 @@ function parseSessionSnapshot(value) {
   const available = body["available"] === true;
   const sessions = Array.isArray(body["sessions"]) ? body["sessions"].flatMap((raw) => typeof raw === "object" && raw !== null ? [toSessionRowView(raw)].filter((row) => row !== void 0) : []) : [];
   const unblocked = unblockOrphanSubsessions(sessions);
-  const bin = Array.isArray(body["bin"]) ? body["bin"].flatMap((raw) => typeof raw === "object" && raw !== null ? [toBinRowView(raw)].filter((row) => row !== void 0) : []) : [];
+  let binUnreadable = 0;
+  const bin = Array.isArray(body["bin"]) ? body["bin"].flatMap((raw) => {
+    if (typeof raw !== "object" || raw === null) {
+      binUnreadable += 1;
+      return [];
+    }
+    const row = toBinRowView(raw);
+    if (row === void 0) {
+      binUnreadable += 1;
+      return [];
+    }
+    return [row];
+  }) : [];
+  const binUnaddressable = bin.filter((row) => row.entryId === "").length;
   const rawPolicy = typeof body["policy"] === "object" && body["policy"] !== null ? body["policy"] : {};
   const numberOr = (key) => typeof rawPolicy[key] === "number" && Number.isFinite(rawPolicy[key]) ? rawPolicy[key] : 0;
   return {
     available,
     sessions: unblocked,
     bin,
+    binUnaddressable,
+    binUnreadable,
     policy: { maxEntries: numberOr("maxEntries"), maxBytes: numberOr("maxBytes"), maxAgeMs: numberOr("maxAgeMs") },
     totals: {
       sessions: unblocked.length,
@@ -4049,7 +4103,14 @@ async function deleteWorkspaceSessions(io, cwd, options = {}) {
 }
 async function restoreSession(io, entryId) {
   if (entryId === "") return { kind: "error", message: { key: "sessionResultMissingEntryId" } };
-  return postAction(io, { action: "restore", entryId }, () => ({ key: "sessionResultRestored" }));
+  return postAction(io, { action: "restore", entryId }, (value) => {
+    const failed = typeof value["failedSubsessions"] === "number" ? value["failedSubsessions"] : 0;
+    const restored = typeof value["restoredSubsessions"] === "number" ? value["restoredSubsessions"] : 0;
+    if (failed > 0) return { key: "sessionResultRestoredPartial", params: { failed } };
+    if (restored > 0) return { key: "sessionResultRestoredWithSubsessions", params: { count: restored } };
+    if (value["parentStillBinned"] === true) return { key: "sessionResultRestoredParentBinned" };
+    return { key: "sessionResultRestored" };
+  });
 }
 async function purgeSession(io, entryId) {
   if (entryId === "") return { kind: "error", message: { key: "sessionResultMissingEntryId" } };
@@ -4108,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)(
@@ -4150,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) {
@@ -4158,9 +4227,10 @@ var SessionRow = (0, import_react7.memo)(function SessionRow2(props) {
 });
 function renderBinRow(props) {
   const { row, copy, busy } = props;
+  const unaddressable = row.entryId === "";
   return (0, import_react7.createElement)(
     "li",
-    { key: row.entryId },
+    { key: unaddressable ? `unaddressable:${row.sessionId}` : row.entryId },
     (0, import_react7.createElement)(
       "div",
       { className: CLASS.row },
@@ -4172,20 +4242,22 @@ function renderBinRow(props) {
       (0, import_react7.createElement)(
         "span",
         { className: CLASS.rowActions },
-        Button({
-          variant: "secondary",
-          size: "compact",
-          disabled: busy,
-          onClick: () => props.onRestore(row.entryId),
-          children: copy.restore
-        }),
-        Button({
-          variant: "ghost",
-          size: "compact",
-          disabled: busy,
-          onClick: () => props.onPurge(row.entryId),
-          children: copy.purge
-        })
+        ...unaddressable ? [(0, import_react7.createElement)("span", { className: CLASS.rowMeta, title: copy.binRowUnaddressable }, copy.binRowUnaddressable)] : [
+          Button({
+            variant: "secondary",
+            size: "compact",
+            disabled: busy,
+            onClick: () => props.onRestore(row.entryId),
+            children: copy.restore
+          }),
+          Button({
+            variant: "ghost",
+            size: "compact",
+            disabled: busy,
+            onClick: () => props.onPurge(row.entryId),
+            children: copy.purge
+          })
+        ]
       )
     )
   );
@@ -4202,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({
@@ -4212,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 },
@@ -4225,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
         })
       )
@@ -4428,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",
@@ -4453,6 +4528,7 @@ function SessionPanel({ copy, io, close }) {
             selected,
             busy,
             onToggle: toggle,
+            onRecycle: (id) => void run(() => deleteSessions(io, [id])),
             onRemove: setPending,
             pickIdPrefix
           })
@@ -4463,10 +4539,10 @@ function SessionPanel({ copy, io, close }) {
     (0, import_react7.createElement)("h3", { className: CLASS.blockTitle }, copy.binHeading),
     // Same rule as the inventory: 「回收站为空」 is a claim about an **answer**. While nothing has been read (or the
     // read failed) the status line above says what is happening (audit 2026-11-01b ui P1-3).
-    phase.kind !== "ready" ? null : snapshot.bin.length === 0 ? (0, import_react7.createElement)("p", { className: CLASS.empty }, copy.binEmpty) : (0, import_react7.createElement)(
+    phase.kind !== "ready" ? null : snapshot.bin.length === 0 && snapshot.binUnreadable === 0 ? (0, import_react7.createElement)("p", { className: CLASS.empty }, copy.binEmpty) : (0, import_react7.createElement)(
       "div",
       { className: CLASS.block },
-      (0, import_react7.createElement)(
+      snapshot.bin.length === 0 ? null : (0, import_react7.createElement)(
         "ul",
         { className: CLASS.list },
         ...snapshot.bin.map(
@@ -4479,6 +4555,7 @@ function SessionPanel({ copy, io, close }) {
           })
         )
       ),
+      snapshot.binUnreadable > 0 ? (0, import_react7.createElement)("p", { className: CLASS.empty }, copy.binUnreadable(snapshot.binUnreadable)) : null,
       Button({
         variant: "secondary",
         size: "compact",
@@ -5558,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 {
@@ -5566,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));
       })
     };
   };
@@ -5623,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;
@@ -5677,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}`,
@@ -5695,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.
@@ -5857,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),
@@ -5911,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",
@@ -6634,12 +6731,16 @@ function apply(ctx) {
         sessionsHeading: dict.sessionPanelSessions,
         binHeading: dict.sessionPanelBin,
         binEmpty: dict.sessionPanelBinEmpty,
+        binUnreadable: (count) => resolveMessage2(dict, { key: "sessionPanelBinUnreadable", params: { count } }),
+        binRowUnaddressable: dict.sessionPanelBinRowUnaddressable,
         selectAll: dict.sessionPanelSelectAll,
         clearSelection: dict.sessionPanelClear,
         deleteRecycle: dict.sessionPanelDeleteRecycle,
         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,