dsh-over-ssh 0.2.1 → 0.2.3

package/lib/client.js

@@ -82,6 +82,8 @@ 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",
@@ -159,6 +161,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",
@@ -276,6 +279,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,6 +335,8 @@ 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",
@@ -401,6 +409,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.",
@@ -518,6 +527,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",
@@ -1438,15 +1450,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);
@@ -1698,8 +1724,8 @@ function parseRootsSnapshot(value) {
     const row = toRootRow(entry, "config", false);
     const identity = row === void 0 ? void 0 : rootKeyIdentity(row.key);
     if (row !== void 0 && identity !== void 0 && !seen.has(identity)) {
-      const scoped = userWorkspaces.get(identity);
-      const scopedSessions = userSessions.get(identity);
+      const scoped = row.workspaces ?? userWorkspaces.get(identity);
+      const scopedSessions = row.sessions ?? userSessions.get(identity);
       roots.push({
         ...row,
         inUserFile: userKeys.has(identity),
@@ -1723,7 +1749,14 @@ function parseRootsSnapshot(value) {
   }
   const warnings = (Array.isArray(payload.warnings) ? payload.warnings : []).filter((item) => typeof item === "string");
   const anchorRoot = readString(payload, "anchorRoot");
-  return { roots, connections, warnings, ...anchorRoot === void 0 ? {} : { anchorRoot } };
+  const scopedForSession = readString(payload, "scopedForSession");
+  return {
+    roots,
+    connections,
+    warnings,
+    ...anchorRoot === void 0 ? {} : { anchorRoot },
+    ...scopedForSession === void 0 ? {} : { scopedForSession }
+  };
 }
 function isAbsoluteRemotePath(path) {
   if (!path.startsWith("/")) return false;
@@ -1912,13 +1945,27 @@ async function requestSnapshot(fetchImpl, path, init) {
       const reason = typeof body?.error === "string" ? body.error : transportFailureReason(response.status, path);
       return { ok: false, error: reason };
     }
+    if (typeof body === "object" && body !== null && body["ok"] === false && typeof body["error"] === "string") {
+      return { ok: false, error: body["error"] };
+    }
     return { ok: true, value: parseRootsSnapshot(body) };
   } catch (error) {
     return { ok: false, error: error instanceof Error ? error.name : "network" };
   }
 }
 function createRootsApi(fetchImpl, path = ROOTS_API_PATH) {
-  const load = async (signal) => requestSnapshot(fetchImpl, path, { method: "GET", headers: { accept: "application/json" }, ...signal === void 0 ? {} : { signal } });
+  const load = async (options = {}) => {
+    const normalized = options instanceof AbortSignal ? { signal: options } : options;
+    const query = new URLSearchParams();
+    if (normalized.session !== void 0 && normalized.session !== "") query.set("session", normalized.session);
+    if (normalized.workspace !== void 0 && normalized.workspace !== "") query.set("workspace", normalized.workspace);
+    const suffix = query.size === 0 ? "" : `?${query.toString()}`;
+    return requestSnapshot(fetchImpl, `${path}${suffix}`, {
+      method: "GET",
+      headers: { accept: "application/json" },
+      ...normalized.signal === void 0 ? {} : { signal: normalized.signal }
+    });
+  };
   const send = async (payload) => requestSnapshot(fetchImpl, path, { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(payload) });
   const sendRaw = async (payload) => {
     try {
@@ -2435,7 +2482,16 @@ function createTransferProgress(options) {
       setState(transferPanelPollStarted(state, showLoading));
       const options_ = mode === "park" ? { waitMs, signal: controller.signal } : { signal: controller.signal };
       issued += 1;
-      const result = await options.io.list(options_);
+      let result;
+      try {
+        result = await options.io.list(options_);
+      } catch (error) {
+        if (controller.signal.aborted || disposed) {
+          if (inFlight === controller) inFlight = void 0;
+          continue;
+        }
+        result = { ok: false, error: error instanceof Error ? error.message : "list-failed" };
+      }
       if (inFlight === controller) inFlight = void 0;
       if (disposed) return;
       if (mine !== generation) {
@@ -2476,6 +2532,7 @@ function createTransferProgress(options) {
     },
     clear: () => {
       if (disposed) return;
+      if (state.clearing) return;
       setState(transferPanelClearing(state));
       void options.io.clear().then((result) => {
         if (disposed) return;
@@ -2574,7 +2631,9 @@ var ROOTS_EDIT_BACKDROP_CLASS = classes(CLASS.backdrop, CLASS.backdropSettings);
 function createRootsPanelController(options) {
   let state = initialRootsPanelState();
   const listeners = /* @__PURE__ */ new Set();
-  let token = 0;
+  let readToken = 0;
+  let writeToken = 0;
+  let epoch = 0;
   let disposed = false;
   const requests = createAbortGate();
   const dispatch = (action) => {
@@ -2583,22 +2642,30 @@ function createRootsPanelController(options) {
     state = next;
     for (const listener of [...listeners]) listener();
   };
-  const latest = (mine) => !disposed && mine === token;
+  const latestRead = (mine, issuedEpoch) => !disposed && mine === readToken && issuedEpoch === epoch;
+  const latestWrite = (mine) => !disposed && mine === writeToken;
   const reload = async () => {
-    const mine = ++token;
+    const mine = ++readToken;
+    const issuedEpoch = epoch;
     const signal = requests.begin();
     dispatch({ type: "load" });
     const result = await options.api.load(signal);
-    if (!latest(mine)) return;
+    if (!latestRead(mine, issuedEpoch)) return;
+    if (result.ok && result.value.warnings.includes("roots-invalid-answer")) {
+      dispatch({ type: "failed", error: "roots-invalid-answer" });
+      return;
+    }
     if (result.ok) dispatch({ type: "loaded", snapshot: result.value });
     else dispatch({ type: "failed", error: result.error });
   };
   const settle = async (mine, scope, result, resetDrafts) => {
-    if (!latest(mine)) return;
+    if (!latestWrite(mine)) return;
     if (!result.ok) {
       dispatch({ type: "failed", error: result.error, scope });
       return;
     }
+    epoch += 1;
+    void result.value;
     dispatch({ type: "succeeded", scope, ...resetDrafts ? { resetDrafts: true } : {} });
     await reload();
   };
@@ -2611,7 +2678,7 @@ function createRootsPanelController(options) {
       dispatch({ type: "refused", scope: "roots", message: validated.message });
       return;
     }
-    const mine = ++token;
+    const mine = ++writeToken;
     dispatch({ type: "submitted" });
     const result = await options.api.send({ action: "add-root", ...validated.value });
     await settle(mine, "roots", result, true);
@@ -2637,7 +2704,7 @@ function createRootsPanelController(options) {
       dispatch({ type: "refused", scope: "connection", message: validated.message });
       return;
     }
-    const mine = ++token;
+    const mine = ++writeToken;
     dispatch({ type: "submitted" });
     const result = await options.api.send({ action: "add-connection", ...validated.value });
     await settle(mine, "connection", result, true);
@@ -2646,7 +2713,7 @@ function createRootsPanelController(options) {
     const row = selectRootsView(state).rows.find((candidate) => candidate.key === key);
     if (row === void 0 || !row.removable) return;
     if (!canEdit(state)) return;
-    const mine = ++token;
+    const mine = ++writeToken;
     dispatch({ type: "remove", key });
     const result = await options.api.send({ action: "remove-root", key });
     await settle(mine, "roots", result, false);
@@ -2685,6 +2752,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);
@@ -2702,7 +2774,7 @@ function createRootsPanelController(options) {
       dispatch({ type: "refused", scope: "edit", message: validated.message });
       return;
     }
-    const mine = ++token;
+    const mine = ++writeToken;
     dispatch({ type: "submitted" });
     const result = await options.api.send({ action: "update-connection", id: editingId, ...validated.value });
     await settle(mine, "edit", result, true);
@@ -2716,16 +2788,16 @@ function createRootsPanelController(options) {
   const confirmRemoveConnection = async (id) => {
     if (state.confirmingRemove !== id) return;
     if (!canEdit(state)) return;
-    const mine = ++token;
+    const mine = ++writeToken;
     dispatch({ type: "submitted" });
     const result = await options.api.send({ action: "remove-connection", id });
     await settle(mine, "edit", result, true);
   };
   const loadImport = async () => {
-    const mine = ++token;
+    const mine = ++readToken;
     dispatch({ type: "import-busy" });
     const result = await options.api.sendRaw({ action: "list-ssh-config" });
-    if (!latest(mine)) return;
+    if (disposed || mine !== readToken) return;
     if (!result.ok) {
       dispatch({ type: "import-failed", error: result.error });
       return;
@@ -2739,10 +2811,10 @@ function createRootsPanelController(options) {
   const submitImport = async () => {
     const selected = state.importSelected ?? [];
     if (selected.length === 0) return;
-    const mine = ++token;
+    const mine = ++writeToken;
     dispatch({ type: "import-busy" });
     const result = await options.api.sendRaw({ action: "import-ssh-config", aliases: selected });
-    if (!latest(mine)) return;
+    if (!latestWrite(mine)) return;
     if (!result.ok) {
       dispatch({ type: "import-failed", error: result.error });
       return;
@@ -3625,10 +3697,10 @@ function buildPanelModel(copy, options = {}) {
 // src/shared/remote-identity.ts
 var SSH_DEV_REMOTE_NAMESPACE = "sshdev";
 var SSH_DEV_REMOTE_SERVICE = "sshDevRemote";
-
-// src/client/core/remote.ts
 var SSH_DEV_REMOTE_METHOD = "connections";
 var SSH_DEV_REMOTE_PACKAGE = "dsh-over-ssh";
+
+// src/client/core/remote.ts
 var SSH_DEV_CONNECTIONS_DESCRIPTOR = {
   id: `${SSH_DEV_REMOTE_PACKAGE}#${SSH_DEV_REMOTE_NAMESPACE}/${SSH_DEV_REMOTE_METHOD}`,
   service: SSH_DEV_REMOTE_SERVICE,
@@ -3828,10 +3900,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,
@@ -3846,6 +3918,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 }
   };
@@ -3917,13 +3991,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,
@@ -4008,7 +4097,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" } };
@@ -4117,9 +4213,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 },
@@ -4131,20 +4228,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
+          })
+        ]
       )
     )
   );
@@ -4422,10 +4521,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(
@@ -4438,6 +4537,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",
@@ -4526,6 +4626,7 @@ function createSessionRowActionStore(deps) {
     };
   });
   let cancelAutoClose;
+  let postInFlight = false;
   const stopAutoClose = () => {
     cancelAutoClose?.();
     cancelAutoClose = void 0;
@@ -4550,18 +4651,21 @@ function createSessionRowActionStore(deps) {
   const confirm = async () => {
     const request = state.request;
     const row = state.row;
-    if (disposed || request === void 0 || state.busy) return;
+    if (disposed || request === void 0 || state.busy || postInFlight) return;
     if (state.phase !== "ready" || row === void 0 || !row.deletable) return;
     const stillPending = () => {
       const current = state.request;
       return current !== void 0 && current.kind === request.kind && current.sessionId === request.sessionId;
     };
+    postInFlight = true;
     dispatch({ ...state, busy: true, outcome: void 0 });
     let result;
     try {
       result = await deleteSessions(deps.io, [request.sessionId], request.kind === "delete" ? { permanent: true } : {});
     } catch {
       result = { kind: "error", message: { key: "sessionResultActionFailed" } };
+    } finally {
+      postInFlight = false;
     }
     if (disposed || !stillPending()) return;
     dispatch({ ...state, busy: false, outcome: result });
@@ -4584,7 +4688,7 @@ function createSessionRowActionStore(deps) {
     request: (request) => {
       if (disposed) return;
       stopAutoClose();
-      dispatch({ request, phase: "loading", row: void 0, busy: false, outcome: void 0 });
+      dispatch({ request, phase: "loading", row: void 0, busy: postInFlight, outcome: void 0 });
     },
     load,
     confirm,
@@ -5281,7 +5385,7 @@ function DirectoryBrowserSection({
   listRef
 }) {
   const view = selectDirectoryBrowserView(state);
-  const gate = disabled;
+  const gate = disabled || state.pending;
   const connectionFieldId = `${idPrefix}-connection`;
   const modeButton = (mode, label) => Button({
     // The active world is the brand-filled one: the switch reads without an extra attribute, and both
@@ -5503,12 +5607,18 @@ function createSessionDirectoryIo(options) {
   });
   const rootsApi = createRootsApi(options.fetchImpl, path);
   const loadRoots = async (workspacePath, sessionId) => {
-    const result = await rootsApi.load();
+    const result = await rootsApi.load({
+      ...sessionId === void 0 || sessionId === "" ? {} : { session: sessionId },
+      ...workspacePath === void 0 || workspacePath === "" ? {} : { workspace: workspacePath }
+    });
     if (!result.ok) return result;
     if (result.value.warnings.includes("roots-invalid-answer")) {
       return { ok: false, error: "roots-invalid-answer" };
     }
     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: [] };
     return {
       ok: true,
@@ -5651,7 +5761,11 @@ function selectSessionDirectoryView(state, copy) {
         title: row.label ?? (row.location === "remote" ? `${row.connectionId ?? ""}:${row.path}` : row.path),
         subtitle: row.label === void 0 ? "" : row.path,
         badge: row.location === "remote" ? copy["rootsBadgeRemote"] : copy["rootsBadgeLocal"],
-        removable: row.inUserFile
+        // fork 继承来的行没有删除按钮：它在父亲那里才是"本会话添加的"，在这里点删除会把父会话的
+        // 目录拿走（宿主也会拒绝）。没有 sessions 字段的历史条目按文件权限判定，保持旧行为。
+        removable: row.inUserFile && // 会话型条目只有**本会话**能删；`state.sessionId` 还没到也不能放行（那会把父会话的目录
+        // 交给 fork 去删，宿主会拒，用户看到的是一次"按了没反应"）。历史条目（无 sessions）按文件权限。
+        (row.sessions === void 0 || state.sessionId !== void 0 && row.sessions.includes(state.sessionId))
       }))
     ],
     rootsPending: state.rootsPending,
@@ -5706,11 +5820,14 @@ function createSessionDirectory(deps) {
   const commit = async (path, connectionId) => {
     if (disposed || state.pending) return;
     const location = connectionId === void 0 ? "local" : "remote";
-    const validated = validateRootDraft({
-      location,
-      path,
-      ...connectionId === void 0 ? {} : { connectionId }
-    });
+    const validated = validateRootDraft(
+      {
+        location,
+        path,
+        ...connectionId === void 0 ? {} : { connectionId }
+      },
+      state.roots
+    );
     if (!validated.ok) {
       dispatch({ type: "refused", message: validated.message });
       return;
@@ -5819,7 +5936,10 @@ function SessionDirectorySection({
       { className: CLASS.block },
       (0, import_react11.createElement)("h4", { className: CLASS.blockTitle }, copy.sessionRootsTitle),
       (0, import_react11.createElement)("p", { className: CLASS.hint }, copy.sessionRootsHint),
-      view.roots.filter((row) => row.workspace !== true).length === 0 ? view.rootsReading ? Notice({ role: "status", tone: "info", children: copy.sessionRootsLoading }) : (
+      // **有行就画列表**：工作区那一行是合成行，它不属于"已添加目录"，但它是这张卡片最重要的一行。
+      // 旧条件按"有没有已添加目录"决定画不画整张列表，结果是新会话只看到「还没有添加目录」，连会话
+      // 自己在哪个工作区都不显示，必须先去添加一个目录才冒出来（审计 2026-11-06，用户截图）。
+      view.roots.length === 0 ? view.rootsReading ? Notice({ role: "status", tone: "info", children: copy.sessionRootsLoading }) : (
         // A failed read is not an empty list: the error notice below is the whole truth there, and
         // 「还没有添加目录」 next to it would contradict it (same rule as the import dialog, ui P2-2/P2-3).
         view.notice === "" ? (0, import_react11.createElement)("p", { className: CLASS.empty }, copy.sessionRootsEmpty) : null
@@ -5839,7 +5959,9 @@ function SessionDirectorySection({
               Button({
                 variant: "ghost",
                 size: "compact",
-                disabled: view.rootsPending,
+                // 刷新在飞时也禁用：否则一次点击会叠加"删除 + 一次刷新"两次远端写
+                // （审计 2026-11-06 客户端 P2）。
+                disabled: view.rootsPending || view.rootsReading,
                 onClick: () => actions.onRemoveRoot(row.key),
                 children: copy.rootsRemove
               })
@@ -5847,6 +5969,8 @@ 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 },
@@ -5886,20 +6010,22 @@ function readWorkspacePath(props) {
   const fromWorkspace = workspaces === void 0 ? void 0 : workspaces(
     (snapshot) => sessionId === void 0 || sessionId === "" ? void 0 : snapshot?.items?.find((item) => item.sessionIds?.includes(sessionId) === true)?.path
   );
-  if (typeof fromSession === "string" && fromSession !== "") return fromSession;
   if (typeof fromWorkspace === "string" && fromWorkspace !== "") return fromWorkspace;
+  if (typeof fromSession === "string" && fromSession !== "") return fromSession;
   return void 0;
 }
 function rootsQueryKey(state) {
   if (!state.open) return "closed";
-  if (state.workspacePath === void 0 || state.workspacePath === "") return "open:";
-  return `open:${state.workspacePath}\0${state.sessionId ?? ""}`;
+  const workspace = state.workspacePath === void 0 || state.workspacePath === "" ? "unknown" : state.workspacePath;
+  const session = state.sessionId === void 0 || state.sessionId === "" ? "unknown" : state.sessionId;
+  return `open:${workspace}\0${session}`;
 }
 function SessionDirectoryContainer(props) {
   const { copy, io } = props;
   const copyRef = (0, import_react11.useRef)(copy);
   copyRef.current = copy;
-  const [controller] = (0, import_react11.useState)(() => createSessionDirectory({ io, copy: () => copyRef.current }));
+  const injected = props.controller;
+  const [controller] = (0, import_react11.useState)(() => injected ?? createSessionDirectory({ io, copy: () => copyRef.current }));
   const state = (0, import_react11.useSyncExternalStore)(controller.subscribe, controller.getState);
   const workspacePath = readWorkspacePath(props);
   const titleId = (0, import_react11.useId)();
@@ -5924,8 +6050,10 @@ function SessionDirectoryContainer(props) {
   useCardTabTrap(state.open, portal.container);
   (0, import_react11.useEffect)(() => {
     controller.activate();
-    return () => controller.dispose();
-  }, [controller]);
+    return () => {
+      if (injected === void 0) controller.dispose();
+    };
+  }, [controller, injected]);
   (0, import_react11.useLayoutEffect)(() => {
     if (!state.open) return;
     focusOrigin.current = captureFocusOrigin(browserPortalDocument());
@@ -6565,6 +6693,8 @@ 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,
@@ -6889,6 +7019,7 @@ function apply(ctx) {
         return await chooser.pickDirectory();
       }
     });
+    const controller = createSessionDirectory({ io, copy: () => copy() });
     const registerSessionEntry = () => ctx.slots.inject(
       SESSION_DIRECTORY_SLOT,
       () => ctx.slots.register(
@@ -6896,7 +7027,7 @@ function apply(ctx) {
           name: SESSION_DIRECTORY_SLOT,
           id: SESSION_DIRECTORY_ID,
           order: SESSION_DIRECTORY_ORDER,
-          inject: () => ({ copy: copy(), io })
+          inject: () => ({ copy: copy(), io, controller })
         },
         SessionDirectoryContainer
       )
@@ -6909,6 +7040,7 @@ function apply(ctx) {
     return () => {
       offLocaleChange();
       disposeEntry();
+      controller.dispose();
     };
   });
   ctx.effect(() => {