dsh-over-ssh 0.2.0 → 0.2.2

package/lib/client.js

@@ -29,6 +29,25 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_cordis = require("@deepseek-ai/cordis");
 
+// src/client/core/abort.ts
+function createAbortGate() {
+  let active;
+  return {
+    begin: () => {
+      active?.abort();
+      active = new AbortController();
+      return active.signal;
+    },
+    abort: () => {
+      active?.abort();
+      active = void 0;
+    },
+    get live() {
+      return active !== void 0 && !active.signal.aborted;
+    }
+  };
+}
+
 // src/client/core/locale.ts
 var OVER_SSH_NS = "over-ssh";
 var OVER_SSH_DICTS = {
@@ -235,7 +254,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\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\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",
+    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",
     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}",
@@ -258,6 +279,11 @@ var OVER_SSH_DICTS = {
     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",
+    sessionResultSweepPartial: "\u5DF2\u6E05\u7406 {count} \u4E2A\u6761\u76EE\uFF0C\u53E6\u6709 {failed} \u4E2A\u5931\u8D25\uFF08\u539F\u56E0\u89C1\u5BBF\u4E3B\u65E5\u5FD7\uFF09",
+    sessionResultDeletedPermanentPartial: "\u5DF2\u6C38\u4E45\u5220\u9664 {size}\uFF08\u4E0D\u53EF\u6062\u590D\uFF09\uFF0C\u53E6\u6709 {refused} \u4E2A\u88AB\u62D2\u7EDD",
+    sessionResultRecycledPartial: "\u5DF2\u79FB\u5165\u4F1A\u8BDD\u56DE\u6536\u7AD9 {size}\uFF08\u53EF\u6062\u590D\uFF09\uFF0C\u53E6\u6709 {refused} \u4E2A\u88AB\u62D2\u7EDD",
+    sessionResultSweepConfirmTitle: "\u786E\u8BA4\u6E05\u7406\u56DE\u6536\u7AD9",
+    sessionResultSweepConfirmBody: "\u5C06\u6309\u4FDD\u7559\u7B56\u7565\u6C38\u4E45\u6E05\u9664\u56DE\u6536\u7AD9\u4E2D\u7684\u6761\u76EE\uFF08\u4E0D\u53EF\u6062\u590D\uFF09\u3002\u786E\u5B9A\u7EE7\u7EED\uFF1F",
     sessionWorkspaceUnknown: "\uFF08\u65E0\u5DE5\u4F5C\u533A\uFF09",
     connectionTestNoAnswer: "\u5BBF\u4E3B\u6CA1\u6709\u56DE\u6D4B\u8BD5\u7ED3\u679C",
     connectionTestFailed: "\u8FDE\u63A5\u6D4B\u8BD5\u5931\u8D25",
@@ -470,7 +496,9 @@ var OVER_SSH_DICTS = {
     sessionRootsTitle: "Directories available to this session",
     sessionRootsEmpty: "No directory yet. Use \u300CBrowse\u2026\u300D to pick a local or remote one.",
     sessionRootsLoading: "Reading this session's directories\u2026",
-    sessionRootsHint: "Local directories are read and written directly; remote ones go through the SSH agent. Only directories you added can be removed. A root registered in the plugin settings is not listed here \u2014 add it from this session to use it.",
+    sessionRootsHint: "Local directories are read and written directly; remote ones go through the SSH agent. The first row is the current workspace (always available, cannot be removed); only directories you added can be removed. A root registered in the plugin settings is not listed here \u2014 add it from this session to use it.",
+    sessionRootsWorkspaceBadge: "Workspace",
+    sessionRootsWorkspaceNote: "The conversation's default boundary; writable under workspace-write like added directories, neither is writable under read-only",
     sessionRootsFailed: "Could not read the directory list: {reason}",
     sessionAddDone: "Added: {path} (no workspace was created)",
     sessionAddFailed: "Could not add it: {reason}",
@@ -493,6 +521,11 @@ var OVER_SSH_DICTS = {
     sessionResultPurged: "Permanently removed that entry",
     sessionResultSweepNone: "Nothing to sweep",
     sessionResultSweepDone: "Swept {count} entries",
+    sessionResultSweepPartial: "Swept {count} entries; {failed} failed (see host log)",
+    sessionResultDeletedPermanentPartial: "Permanently deleted {size} (unrecoverable); {refused} refused",
+    sessionResultRecycledPartial: "Moved {size} to the recycle bin (recoverable); {refused} refused",
+    sessionResultSweepConfirmTitle: "Confirm sweeping the bin",
+    sessionResultSweepConfirmBody: "This permanently purges bin entries beyond the retention policy (unrecoverable). Continue?",
     sessionWorkspaceUnknown: "(no workspace)",
     connectionTestNoAnswer: "The host returned no test result",
     connectionTestFailed: "The connection test failed",
@@ -1285,6 +1318,10 @@ var BUTTON_VARIANT_CLASS = {
 function isEscape(event) {
   return event.key === "Escape";
 }
+function fieldValue(event) {
+  const target = event.target;
+  return typeof target?.value === "string" ? target.value : "";
+}
 function Button(props) {
   const variantClass = BUTTON_VARIANT_CLASS[props.variant];
   return (0, import_react.createElement)(
@@ -1507,6 +1544,7 @@ function useCardTabTrap(open, container) {
 // src/shared/routes.ts
 var ROOTS_API_PATH = "/api/over-ssh/roots";
 var SESSION_API_PATH = "/api/over-ssh/sessions";
+var GIT_STATUS_API_PATH = "/api/over-ssh/git-status";
 
 // src/shared/root-keys.ts
 function isAbsoluteLocalPath(path) {
@@ -1660,8 +1698,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),
@@ -1685,7 +1723,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;
@@ -1874,13 +1919,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 {
@@ -1945,6 +2004,10 @@ function withoutError(state) {
   const { error: _error, ...rest } = state;
   return rest;
 }
+function withoutAdding(state) {
+  const { addingConnection: _adding, ...rest } = state;
+  return rest;
+}
 function withoutEditing(state) {
   const { editingId: _editing, ...rest } = state;
   return rest;
@@ -1983,7 +2046,7 @@ function rootsPanelReducer(state, action) {
     case "succeeded": {
       const saved = action.scope === void 0 ? void 0 : SAVED_MESSAGE[action.scope];
       return {
-        ...withoutError(withoutFormNotice(withoutEditing(withoutConfirming(state)))),
+        ...withoutError(withoutFormNotice(withoutAdding(withoutEditing(withoutConfirming(state))))),
         pending: false,
         loaded: true,
         // The edit dialog is closed by `withoutEditing` whether the request added or removed something, so its
@@ -2002,11 +2065,16 @@ function rootsPanelReducer(state, action) {
       if (!canEdit(state)) return state;
       return { ...withoutFormNotice(state), pending: true };
     }
+    case "add-connection-opened":
+      return { ...withoutEditing(withoutFormNotice(state)), addingConnection: true };
+    case "add-connection-closed":
+      if (state.addingConnection !== true) return state;
+      return withoutAdding(withoutFormNotice(state));
     case "edit-started": {
       const row = state.snapshot?.connections.find((candidate) => candidate.id === action.id);
       if (row === void 0) return state;
       return {
-        ...withoutFormNotice(state),
+        ...withoutFormNotice(withoutAdding(state)),
         editingId: row.id,
         editDrafts: {
           id: row.id,
@@ -2388,7 +2456,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) {
@@ -2429,6 +2506,7 @@ function createTransferProgress(options) {
     },
     clear: () => {
       if (disposed) return;
+      if (state.clearing) return;
       setState(transferPanelClearing(state));
       void options.io.clear().then((result) => {
         if (disposed) return;
@@ -2527,29 +2605,41 @@ 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) => {
     const next = rootsPanelReducer(state, action);
     if (next === state) return;
     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();
-    if (!latest(mine)) return;
+    const result = await options.api.load(signal);
+    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();
   };
@@ -2562,13 +2652,14 @@ 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);
   };
   const submitConnection = async () => {
     if (state.editingId !== void 0) return;
+    if (state.addingConnection !== true) return;
     if (!canEdit(state)) return;
     const { drafts } = state;
     const portText = drafts.newPort.trim();
@@ -2587,7 +2678,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);
@@ -2596,7 +2687,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);
@@ -2607,6 +2698,12 @@ function createRootsPanelController(options) {
   const cancelEdit = () => {
     dispatch({ type: "edit-ended" });
   };
+  const openAddConnection = () => {
+    dispatch({ type: "add-connection-opened" });
+  };
+  const closeAddConnection = () => {
+    dispatch({ type: "add-connection-closed" });
+  };
   const defer = options.defer ?? ((run) => {
     const handle = setTimeout(run, 0);
     return () => clearTimeout(handle);
@@ -2646,7 +2743,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);
@@ -2660,16 +2757,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;
@@ -2683,10 +2780,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;
@@ -2719,6 +2816,8 @@ function createRootsPanelController(options) {
     changeEditDraft: (patch) => dispatch({ type: "edit-draft-changed", patch }),
     submitRoot,
     submitConnection,
+    openAddConnection,
+    closeAddConnection,
     remove,
     startEdit,
     cancelEdit,
@@ -2737,6 +2836,7 @@ function createRootsPanelController(options) {
     submitImport,
     dispose: () => {
       disposed = true;
+      requests.abort();
       listeners.clear();
       surfaceAttached();
     }
@@ -2748,6 +2848,8 @@ function rootsPanelSectionActions(controller) {
     onEditDraftChange: controller.changeEditDraft,
     onSubmitRoot: (location) => void controller.submitRoot(location),
     onSubmitConnection: () => void controller.submitConnection(),
+    onOpenAddConnection: controller.openAddConnection,
+    onCloseAddConnection: controller.closeAddConnection,
     onRemove: (key) => void controller.remove(key),
     onSubmitEdit: () => void controller.submitEdit(),
     onCancelEdit: controller.cancelEdit,
@@ -2760,9 +2862,43 @@ function rootsPanelSectionActions(controller) {
     onImportSubmit: () => void controller.submitImport()
   };
 }
-function fieldValue(event) {
-  const target = event.target;
-  return typeof target?.value === "string" ? target.value : "";
+function selectRootsViewForRender(state) {
+  const cached = rootsViewCache;
+  if (cached !== void 0 && cached.snapshot === state.snapshot && cached.error === state.error && cached.pending === state.pending) {
+    return cached.view;
+  }
+  const view = selectRootsView(state);
+  rootsViewCache = { snapshot: state.snapshot, error: state.error, pending: state.pending, view };
+  return view;
+}
+var rootsViewCache;
+var rootsRowElementsCache = /* @__PURE__ */ new WeakMap();
+function rootsPanelRowElements(view, copy, editable, onRemove) {
+  const cached = rootsRowElementsCache.get(view);
+  if (cached !== void 0 && cached.copy === copy && cached.editable === editable && cached.onRemove === onRemove) {
+    return cached.elements;
+  }
+  const elements = view.rows.map((row) => renderRow(row, copy, editable, onRemove));
+  rootsRowElementsCache.set(view, { copy, editable, onRemove, elements });
+  return elements;
+}
+function openRootsDialog(portal, doc) {
+  const origin = captureFocusOrigin(doc);
+  portal.mount();
+  portal.focusCard();
+  return () => {
+    portal.unmount();
+    restoreFocusOrigin(origin);
+  };
+}
+function installRootsDialogEscape(doc, close) {
+  if (doc?.addEventListener === void 0) return () => void 0;
+  const onKeyDown = (event) => {
+    if (event.key !== "Escape") return;
+    close();
+  };
+  doc.addEventListener("keydown", onKeyDown);
+  return () => doc.removeEventListener?.("keydown", onKeyDown);
 }
 function renderFormNotice(copy, state, scope) {
   const notice = state.formNotice;
@@ -2791,9 +2927,15 @@ function renderRow(row, copy, editable, onRemove) {
     ) : null
   );
 }
-function SshConfigImportDialog({ copy, state, actions, idPrefix = DEFAULT_ROOTS_ID_PREFIX }) {
+function SshConfigImportDialog({
+  copy,
+  state,
+  actions,
+  idPrefix = DEFAULT_ROOTS_ID_PREFIX,
+  editable: editableOverride
+}) {
   if (state.importOpen !== true) return null;
-  const editable = canEdit(state);
+  const editable = editableOverride ?? canEdit(state);
   const listing = state.importListing;
   const selected = new Set(state.importSelected ?? []);
   const busy = state.importBusy === true;
@@ -2805,10 +2947,12 @@ function SshConfigImportDialog({ copy, state, actions, idPrefix = DEFAULT_ROOTS_
     "section",
     {
       className: CLASS.block,
-      role: "dialog",
-      // Named by its own heading. **Not** `aria-modal`: this dialog is rendered inside the settings page's own
-      // scroll flow (it is not portalled), the page behind it stays interactive, and there is no Tab trap — a
-      // modal claim the behaviour does not back is worse than no claim (audit 2026-11-01b ui P2-2).
+      // A named **region**, not a dialog. It is rendered inline inside the settings page's own scroll flow (it is
+      // not portalled), the page behind it stays interactive, and it has no Tab trap — a `role="dialog"` would
+      // promise modal behaviour the surface does not implement, which is worse than not claiming it. The other
+      // two forms really are portalled modals (`aria-modal`, focus trap), so the two roles stay honest
+      // (audit 2026-11-01b ui P2-2; 2026-11-05 P2-3).
+      role: "region",
       "aria-labelledby": `${idPrefix}-import-title`,
       // Esc closes it from anywhere inside, like the other five dialogs. It is inline, so this handler is the
       // only one that will see the key while the settings page scrolls the caret inside it.
@@ -2931,10 +3075,154 @@ function SshConfigImportDialog({ copy, state, actions, idPrefix = DEFAULT_ROOTS_
     )
   );
 }
-function ConnectionEditForm({ copy, state, actions, idPrefix = DEFAULT_ROOTS_ID_PREFIX }) {
+function ConnectionAddForm({
+  copy,
+  state,
+  actions,
+  idPrefix = DEFAULT_ROOTS_ID_PREFIX,
+  editable: editableOverride
+}) {
+  if (state.addingConnection !== true) return null;
+  const editable = editableOverride ?? canEdit(state);
+  const drafts = state.drafts;
+  return (0, import_react5.createElement)(
+    "form",
+    {
+      onSubmit: (event) => {
+        event.preventDefault();
+        actions.onSubmitConnection();
+      },
+      className: CLASS.dialog,
+      role: "dialog",
+      "aria-modal": "true",
+      "aria-label": copy.rootsAddConnection,
+      onKeyDown: (event) => {
+        if (!isEscape(event)) return;
+        event.stopPropagation?.();
+        actions.onCloseAddConnection();
+      }
+    },
+    (0, import_react5.createElement)(
+      "div",
+      { className: CLASS.dialogHeader },
+      (0, import_react5.createElement)("h3", { className: CLASS.sectionTitle }, copy.rootsAddConnection)
+    ),
+    (0, import_react5.createElement)(
+      "div",
+      { className: CLASS.dialogBody },
+      (0, import_react5.createElement)(
+        "div",
+        { className: CLASS.form },
+        Field({
+          htmlFor: `${idPrefix}-connection-id`,
+          label: copy.rootsIdLabel,
+          children: TextInput({
+            id: `${idPrefix}-connection-id`,
+            name: "roots-connection-id",
+            value: drafts.newId,
+            disabled: !editable,
+            onChange: (event) => actions.onDraftChange({ newId: fieldValue(event) })
+          })
+        }),
+        Field({
+          htmlFor: `${idPrefix}-connection-host`,
+          label: copy.rootsHostLabel,
+          children: TextInput({
+            id: `${idPrefix}-connection-host`,
+            name: "roots-connection-host",
+            value: drafts.newHost,
+            disabled: !editable,
+            onChange: (event) => actions.onDraftChange({ newHost: fieldValue(event) })
+          })
+        }),
+        Field({
+          htmlFor: `${idPrefix}-connection-user`,
+          label: copy.rootsUserLabel,
+          children: TextInput({
+            id: `${idPrefix}-connection-user`,
+            name: "roots-connection-user",
+            value: drafts.newUser,
+            disabled: !editable,
+            onChange: (event) => actions.onDraftChange({ newUser: fieldValue(event) })
+          })
+        }),
+        Field({
+          htmlFor: `${idPrefix}-connection-auth`,
+          label: copy.rootsAuthLabel,
+          children: Select({
+            id: `${idPrefix}-connection-auth`,
+            name: "roots-connection-auth",
+            value: drafts.newAuthKind,
+            disabled: !editable,
+            onChange: (value) => actions.onDraftChange({ newAuthKind: value === "password" ? "password" : "key" }),
+            options: [
+              { value: "key", label: copy.rootsAuthKey },
+              { value: "password", label: copy.rootsAuthPassword }
+            ]
+          })
+        }),
+        // Only meaningful for key authentication; shown on demand rather than as a dead field.
+        drafts.newAuthKind === "key" ? Field({
+          htmlFor: `${idPrefix}-connection-key-path`,
+          label: copy.rootsKeyPathLabel,
+          children: TextInput({
+            id: `${idPrefix}-connection-key-path`,
+            name: "roots-connection-key-path",
+            value: drafts.newKeyPath,
+            disabled: !editable,
+            onChange: (event) => actions.onDraftChange({ newKeyPath: fieldValue(event) })
+          })
+        }) : null,
+        // Only meaningful for password authentication. The value never comes back from the host, so this field is
+        // always empty on render: the panel can say a password is stored, never show one.
+        drafts.newAuthKind === "password" ? Field({
+          htmlFor: `${idPrefix}-connection-password`,
+          label: copy.rootsPasswordLabel,
+          children: TextInput({
+            id: `${idPrefix}-connection-password`,
+            name: "roots-connection-password",
+            type: "password",
+            autoComplete: "new-password",
+            value: drafts.newPassword,
+            disabled: !editable,
+            placeholder: copy.rootsPasswordLabel,
+            onChange: (event) => actions.onDraftChange({ newPassword: fieldValue(event) })
+          })
+        }) : null,
+        Field({
+          htmlFor: `${idPrefix}-connection-port`,
+          label: copy.rootsPortLabel,
+          children: TextInput({
+            id: `${idPrefix}-connection-port`,
+            name: "roots-connection-port",
+            value: drafts.newPort,
+            disabled: !editable,
+            inputMode: "numeric",
+            size: "compact",
+            onChange: (event) => actions.onDraftChange({ newPort: fieldValue(event) })
+          })
+        })
+      ),
+      renderFormNotice(copy, state, "connection")
+    ),
+    (0, import_react5.createElement)(
+      "div",
+      { className: CLASS.actions },
+      Button({ variant: "primary", type: "submit", disabled: !editable, children: copy.rootsSave }),
+      Button({ variant: "secondary", type: "button", disabled: !editable, onClick: actions.onCloseAddConnection, children: copy.rootsEditCancel })
+    )
+  );
+}
+function ConnectionEditForm({
+  copy,
+  state,
+  actions,
+  idPrefix = DEFAULT_ROOTS_ID_PREFIX,
+  editable: editableOverride
+}) {
   const editingId = state.editingId;
   if (editingId === void 0) return null;
-  const editable = canEdit(state);
+  const editable = editableOverride ?? canEdit(state);
   const drafts = state.editDrafts;
   const renamed = drafts.id.trim() !== editingId;
   return (0, import_react5.createElement)(
@@ -3098,12 +3386,16 @@ function RootsPanelSection({
   actions,
   transfers,
   portal,
-  idPrefix = DEFAULT_ROOTS_ID_PREFIX
+  idPrefix = DEFAULT_ROOTS_ID_PREFIX,
+  view: precomputedView,
+  rows: precomputedRows,
+  editable: editableOverride
 }) {
-  const view = selectRootsView(state);
-  const editForm = ConnectionEditForm({ copy, state, actions, idPrefix });
-  const editable = view.canEdit;
-  const { drafts } = state;
+  const view = precomputedView ?? selectRootsViewForRender(state);
+  const editable = editableOverride ?? view.canEdit;
+  const editForm = ConnectionEditForm({ copy, state, actions, idPrefix, editable });
+  const addForm = ConnectionAddForm({ copy, state, actions, idPrefix, editable });
+  const rowElements = precomputedRows ?? rootsPanelRowElements(view, copy, editable, actions.onRemove);
   const notice = resolveMessage2(copy, view.notice);
   return (0, import_react5.createElement)(
     "section",
@@ -3119,113 +3411,15 @@ function RootsPanelSection({
     // collapsed diagnostic block at the bottom of this section (see below): it is still the only place a
     // root can be removed from, so it is demoted, never dropped.
     // -- add a connection ----------------------------------------------------
+    // 2026-11-05（用户反馈）：原先是常驻的页内表单，六个字段把页面占满；现在是一个按钮，点开才出现对话框，
+    // 与「编辑」同一种卡片形态（同样的 `CLASS.dialog`、Esc 关闭、字段布局）。
     (0, import_react5.createElement)(
-      "form",
-      {
-        onSubmit: (event) => {
-          event.preventDefault();
-          actions.onSubmitConnection();
-        },
-        className: CLASS.block
-      },
-      (0, import_react5.createElement)("h4", { className: CLASS.blockTitle }, copy.rootsAddConnection),
-      (0, import_react5.createElement)(
-        "div",
-        { className: CLASS.form },
-        Field({
-          htmlFor: `${idPrefix}-connection-id`,
-          label: copy.rootsIdLabel,
-          children: TextInput({
-            id: `${idPrefix}-connection-id`,
-            name: "roots-connection-id",
-            value: drafts.newId,
-            disabled: !editable,
-            onChange: (event) => actions.onDraftChange({ newId: fieldValue(event) })
-          })
-        }),
-        Field({
-          htmlFor: `${idPrefix}-connection-host`,
-          label: copy.rootsHostLabel,
-          children: TextInput({
-            id: `${idPrefix}-connection-host`,
-            name: "roots-connection-host",
-            value: drafts.newHost,
-            disabled: !editable,
-            onChange: (event) => actions.onDraftChange({ newHost: fieldValue(event) })
-          })
-        }),
-        Field({
-          htmlFor: `${idPrefix}-connection-user`,
-          label: copy.rootsUserLabel,
-          children: TextInput({
-            id: `${idPrefix}-connection-user`,
-            name: "roots-connection-user",
-            value: drafts.newUser,
-            disabled: !editable,
-            onChange: (event) => actions.onDraftChange({ newUser: fieldValue(event) })
-          })
-        }),
-        Field({
-          htmlFor: `${idPrefix}-connection-auth`,
-          label: copy.rootsAuthLabel,
-          children: Select({
-            id: `${idPrefix}-connection-auth`,
-            name: "roots-connection-auth",
-            value: drafts.newAuthKind,
-            disabled: !editable,
-            onChange: (value) => actions.onDraftChange({ newAuthKind: value === "password" ? "password" : "key" }),
-            options: [
-              { value: "key", label: copy.rootsAuthKey },
-              { value: "password", label: copy.rootsAuthPassword }
-            ]
-          })
-        }),
-        // Only meaningful for key authentication; shown on demand rather than as a dead field.
-        drafts.newAuthKind === "key" ? Field({
-          htmlFor: `${idPrefix}-connection-key-path`,
-          label: copy.rootsKeyPathLabel,
-          children: TextInput({
-            id: `${idPrefix}-connection-key-path`,
-            name: "roots-connection-key-path",
-            value: drafts.newKeyPath,
-            disabled: !editable,
-            onChange: (event) => actions.onDraftChange({ newKeyPath: fieldValue(event) })
-          })
-        }) : null,
-        // Only meaningful for password authentication. The value never comes back from the host, so this
-        // field is always empty on render: the panel can say a password is stored, never show one.
-        drafts.newAuthKind === "password" ? Field({
-          htmlFor: `${idPrefix}-connection-password`,
-          label: copy.rootsPasswordLabel,
-          children: TextInput({
-            id: `${idPrefix}-connection-password`,
-            name: "roots-connection-password",
-            type: "password",
-            autoComplete: "new-password",
-            value: drafts.newPassword,
-            disabled: !editable,
-            placeholder: copy.rootsPasswordLabel,
-            onChange: (event) => actions.onDraftChange({ newPassword: fieldValue(event) })
-          })
-        }) : null,
-        Field({
-          htmlFor: `${idPrefix}-connection-port`,
-          label: copy.rootsPortLabel,
-          children: TextInput({
-            id: `${idPrefix}-connection-port`,
-            name: "roots-connection-port",
-            value: drafts.newPort,
-            disabled: !editable,
-            inputMode: "numeric",
-            size: "compact",
-            onChange: (event) => actions.onDraftChange({ newPort: fieldValue(event) })
-          })
-        }),
-        Button({ variant: "primary", type: "submit", disabled: !editable, children: copy.rootsSave })
-      )
+      "div",
+      { className: CLASS.block },
+      Button({ variant: "primary", disabled: !editable, onClick: () => actions.onOpenAddConnection(), children: copy.rootsAddConnection })
     ),
+    // 成功行留在页面上：保存成功后对话框会关闭，提示必须仍在用户眼前。
     renderFormSuccess(copy, state, "connection"),
-    renderFormNotice(copy, state, "connection"),
     // -- import from ~/.ssh/config (FR-2.1.4) --------------------------------
     // The button sits next to the add form because it is an alternative way to *create* a connection, and it
     // is disabled for the same reason every other control is (`canEdit`).
@@ -3234,7 +3428,7 @@ function RootsPanelSection({
       { className: CLASS.block },
       Button({ variant: "secondary", disabled: !editable, onClick: () => actions.onImportOpen(), children: copy.rootsImportOpen })
     ),
-    SshConfigImportDialog({ copy, state, actions, idPrefix }),
+    SshConfigImportDialog({ copy, state, actions, idPrefix, editable }),
     // -- no file tree, no entry point (audit 0085) ---------------------------
     // Settings used to carry a sentence pointing at the conversation. It was a signpost for a capability
     // that deliberately has no UI; the decision still stands (remote files are the agent's), but the
@@ -3243,6 +3437,7 @@ function RootsPanelSection({
     transfers ?? null,
     // -- edit one saved connection (a dialog, not a block in this page) -------
     editForm === null ? null : portal === void 0 ? editForm : portal.render(editForm, portal.container),
+    addForm === null ? null : portal === void 0 ? addForm : portal.render(addForm, portal.container),
     // -- the advanced root table (diagnostic) --------------------------------
     // This block used to be the section's headline content, which made it read as "the remote workspaces
     // list". It is not one: each row is a *root route*  -  a remote directory plus the local anchor the
@@ -3262,7 +3457,7 @@ function RootsPanelSection({
         void 0,
         (0, import_react5.createElement)("summary", { className: CLASS.blockTitle }, copy.rootsAdvancedSummary),
         (0, import_react5.createElement)("p", { className: CLASS.description }, copy.rootsAdvancedNote),
-        view.rows.length === 0 ? (0, import_react5.createElement)("p", { className: CLASS.empty }, copy.rootsEmpty) : (0, import_react5.createElement)("ul", { className: CLASS.list }, ...view.rows.map((row) => renderRow(row, copy, editable, actions.onRemove)))
+        view.rows.length === 0 ? (0, import_react5.createElement)("p", { className: CLASS.empty }, copy.rootsEmpty) : (0, import_react5.createElement)("ul", { className: CLASS.list }, ...rowElements)
       )
     )
   );
@@ -3271,6 +3466,16 @@ function RootsPanelContainer({ copy, controller }) {
   const state = (0, import_react5.useSyncExternalStore)(controller.subscribe, controller.getState);
   const uid = (0, import_react5.useId)();
   const idPrefix = `dsh-rw-${uid.replace(/[^A-Za-z0-9_-]/g, "")}`;
+  const view = (0, import_react5.useMemo)(
+    () => selectRootsViewForRender(state),
+    [state.snapshot, state.error, state.pending]
+  );
+  const editable = view.canEdit;
+  const sectionActions = (0, import_react5.useMemo)(() => rootsPanelSectionActions(controller), [controller]);
+  const rowElements = (0, import_react5.useMemo)(
+    () => rootsPanelRowElements(view, copy, editable, sectionActions.onRemove),
+    [view, copy, editable, sectionActions.onRemove]
+  );
   const [portal] = (0, import_react5.useState)(
     () => createCardPortal({
       document: browserPortalDocument(),
@@ -3287,23 +3492,27 @@ function RootsPanelContainer({ copy, controller }) {
     controller.surfaceAttached();
     return controller.surfaceDetached;
   }, [controller]);
-  useCardTabTrap(state.editingId !== void 0, portal.container);
+  const cardOpen = state.editingId !== void 0 || state.addingConnection === true;
+  useCardTabTrap(cardOpen, portal.container);
   (0, import_react5.useLayoutEffect)(() => {
-    if (state.editingId === void 0) return;
-    portal.mount();
-    portal.focusCard();
-    return () => {
-      portal.unmount();
-    };
-  }, [portal, state.editingId]);
-  const sectionActions = (0, import_react5.useMemo)(() => rootsPanelSectionActions(controller), [controller]);
+    if (!cardOpen) return;
+    return openRootsDialog(portal, browserPortalDocument());
+  }, [portal, cardOpen]);
+  const closeOpenDialog = state.editingId !== void 0 ? sectionActions.onCancelEdit : state.addingConnection === true ? sectionActions.onCloseAddConnection : void 0;
+  (0, import_react5.useEffect)(() => {
+    if (!cardOpen || closeOpenDialog === void 0) return;
+    return installRootsDialogEscape(browserPortalDocument(), closeOpenDialog);
+  }, [cardOpen, closeOpenDialog]);
   return RootsPanelSection({
     copy,
     state,
     idPrefix,
+    view,
+    rows: rowElements,
+    editable,
     // No `actions`: the transfer panel owns its own polling and its own buttons (the prop that used to be passed
     // here was typed `unknown` and never read — audit 2026-10-31 client.md §2.4).
-    transfers: (0, import_react5.createElement)(TransferProgressSection, { copy, state }),
+    transfers: (0, import_react5.createElement)(TransferProgressSection, { copy }),
     // The panel needs the connection list, which this section already read; it does not re-fetch it.
     actions: sectionActions,
     portal
@@ -3329,14 +3538,14 @@ function renderConnectionRow(row, actions) {
       "span",
       { className: CLASS.rowActions },
       row.test === void 0 || onTest === void 0 ? null : Button({
-        variant: "ghost",
+        variant: "secondary",
         size: "compact",
         // Disabled while its own probe runs: one honest click, and the label says what is happening.
         disabled: row.test.status === "running" || disabled === true,
         onClick: () => onTest(row.id),
         children: row.test.label
       }),
-      row.actions === void 0 || onEdit === void 0 ? null : Button({ variant: "ghost", size: "compact", disabled: disabled === true, onClick: () => onEdit(row.id), children: row.actions.editLabel }),
+      row.actions === void 0 || onEdit === void 0 ? null : Button({ variant: "secondary", size: "compact", disabled: disabled === true, onClick: () => onEdit(row.id), children: row.actions.editLabel }),
       row.actions === void 0 || onRemove === void 0 ? null : Button({ variant: "ghost", size: "compact", disabled: disabled === true, onClick: () => onRemove(row.id), children: row.actions.removeLabel })
     )
   );
@@ -3448,23 +3657,19 @@ function buildPanelModel(copy, options = {}) {
         acceptLabel: copy.rootsConfirmRemoveAccept,
         // The count is the reason this confirmation exists: deleting a connection silently takes its
         // remote roots with it (the host does that, and a row showing only `id · host` would not say so).
-        body: (row, remoteRoots) => resolveCopy(copy.rootsConfirmRemoveBody, { id: row.id, count: remoteRoots })
+        body: (row, remoteRoots) => resolveTemplate(copy.rootsConfirmRemoveBody, { id: row.id, count: remoteRoots })
       }
     }
   };
 }
-function resolveCopy(template, params) {
-  return template.replace(/\{(\w+)\}/g, (placeholder, name) => {
-    const value = params[name];
-    return value === void 0 ? placeholder : String(value);
-  });
-}
 
-// src/client/core/remote.ts
+// src/shared/remote-identity.ts
 var SSH_DEV_REMOTE_NAMESPACE = "sshdev";
-var SSH_DEV_REMOTE_METHOD = "connections";
 var SSH_DEV_REMOTE_SERVICE = "sshDevRemote";
+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,
@@ -3517,6 +3722,7 @@ function createConnectionTester(options) {
   const listeners = /* @__PURE__ */ new Set();
   let state = /* @__PURE__ */ new Map();
   let disposed = false;
+  const controllers = /* @__PURE__ */ new Map();
   const set = (id, next) => {
     if (disposed) return;
     const copy = new Map(state);
@@ -3548,15 +3754,21 @@ function createConnectionTester(options) {
   };
   const test = async (id) => {
     if (disposed) return;
+    controllers.get(id)?.abort();
+    const controller = new AbortController();
+    controllers.set(id, controller);
     set(id, { status: "running" });
-    const signal = typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function" ? AbortSignal.timeout(timeoutMs) : void 0;
+    const timeoutSignal = typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function" ? AbortSignal.timeout(timeoutMs) : void 0;
+    const signal = timeoutSignal === void 0 ? controller.signal : typeof AbortSignal.any === "function" ? AbortSignal.any([controller.signal, timeoutSignal]) : timeoutSignal;
+    const current = () => !disposed && controllers.get(id) === controller;
     try {
       const response = await options.fetchImpl(path, {
         method: "POST",
         headers: { "content-type": "application/json" },
         body: JSON.stringify({ action: "test-connection", id }),
-        ...signal === void 0 ? {} : { signal }
+        signal
       });
+      if (!current()) return;
       if (!response.ok) {
         set(id, {
           status: "failed",
@@ -3567,6 +3779,7 @@ function createConnectionTester(options) {
       }
       set(id, parse(await response.json()));
     } catch (error) {
+      if (!current()) return;
       if (isTimeout(error)) {
         set(id, {
           status: "failed",
@@ -3576,6 +3789,8 @@ function createConnectionTester(options) {
         return;
       }
       set(id, { status: "failed", code: "UNREACHABLE", message: error instanceof Error ? error.message : String(error) });
+    } finally {
+      if (controllers.get(id) === controller) controllers.delete(id);
     }
   };
   return {
@@ -3589,6 +3804,8 @@ function createConnectionTester(options) {
     },
     dispose: () => {
       disposed = true;
+      for (const controller of controllers.values()) controller.abort();
+      controllers.clear();
       listeners.clear();
     }
   };
@@ -3611,7 +3828,21 @@ function createLatestOnly() {
   };
 }
 
+// src/shared/path-fold.ts
+function foldPathKey(path) {
+  return path.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+}
+
 // src/client/session/session-panel.ts
+function unblockOrphanSubsessions(rows) {
+  const byId = new Map(rows.map((row) => [row.id, row]));
+  return rows.map((row) => {
+    if (row.classification !== "subsession" || row.blockedReason !== "subsession" || row.running) return row;
+    const parent = row.parentSessionId === void 0 ? void 0 : byId.get(row.parentSessionId);
+    if (parent !== void 0 && parent.classification !== "unreadable") return row;
+    return { ...row, deletable: true, blockedReason: void 0 };
+  });
+}
 function toSessionRowView(raw) {
   const id = raw["id"];
   if (typeof id !== "string" || id === "") return void 0;
@@ -3677,20 +3908,18 @@ function workspaceLabel(row) {
   return "";
 }
 function visibleSessions(rows) {
-  const present = new Set(rows.map((row) => row.id));
+  const byId = new Map(rows.map((row) => [row.id, row]));
   return rows.filter((row) => {
     if (row.classification !== "subsession") return true;
     if (row.parentSessionId === void 0) return true;
-    return !present.has(row.parentSessionId);
+    const parent = byId.get(row.parentSessionId);
+    return parent === void 0 || parent.classification === "unreadable";
   });
 }
-function hiddenSubsessionCount(rows) {
-  return rows.length - visibleSessions(rows).length;
-}
 function groupByWorkspace(rows) {
   const groups = /* @__PURE__ */ new Map();
   for (const row of rows) {
-    const key = row.cwd === void 0 || row.cwd === "" ? "" : row.cwd;
+    const key = row.cwd === void 0 || row.cwd === "" ? "" : foldPathKey(row.cwd);
     const existing = groups.get(key);
     if (existing === void 0) {
       groups.set(key, { label: workspaceLabel(row), cwd: row.cwd, sessions: [row] });
@@ -3728,26 +3957,31 @@ function parseSessionSnapshot(value) {
   if (body["ok"] !== true) return emptySnapshot();
   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) : []) : [];
   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,
+    sessions: unblocked,
     bin,
     policy: { maxEntries: numberOr("maxEntries"), maxBytes: numberOr("maxBytes"), maxAgeMs: numberOr("maxAgeMs") },
     totals: {
-      sessions: sessions.length,
-      bytes: sessions.reduce((sum, row) => sum + row.bytes, 0),
-      subsessions: sessions.filter((row) => row.classification === "subsession").length,
+      sessions: unblocked.length,
+      bytes: unblocked.reduce((sum, row) => sum + row.bytes, 0),
+      subsessions: unblocked.filter((row) => row.classification === "subsession").length,
       live: sessions.filter((row) => row.live).length,
       running: sessions.filter((row) => row.running).length
     }
   };
 }
-async function readSessionPanel(io) {
+async function readSessionPanel(io, signal) {
   try {
-    const response = await io.fetch(SESSION_API_PATH, { method: "GET", headers: { accept: "application/json" } });
+    const response = await io.fetch(SESSION_API_PATH, {
+      method: "GET",
+      headers: { accept: "application/json" },
+      ...signal === void 0 ? {} : { signal }
+    });
     if (!response.ok) return { ok: false, error: `http-${response.status}` };
     return { ok: true, snapshot: parseSessionSnapshot(await response.json()) };
   } catch (error) {
@@ -3779,10 +4013,16 @@ async function deleteSessions(io, ids, options = {}) {
   if (options.permanent === true) body["confirm"] = true;
   return postAction(io, body, (value) => {
     const recoverable = value["recoverable"] === true;
+    const refused = Array.isArray(value["refusals"]) ? value["refusals"].length : 0;
     const size = formatBytes(Number(value["bytes"] ?? 0));
-    if (options.permanent === true) return { key: "sessionResultDeletedPermanent", params: { size } };
+    if (refused > 0 && Number(value["bytes"] ?? 0) === 0) {
+      return { key: "sessionResultDeleteNone" };
+    }
+    if (options.permanent === true) {
+      return refused === 0 ? { key: "sessionResultDeletedPermanent", params: { size } } : { key: "sessionResultDeletedPermanentPartial", params: { size, refused } };
+    }
     if (!recoverable) return { key: "sessionResultDeleteNone" };
-    return { key: "sessionResultRecycled", params: { size } };
+    return refused === 0 ? { key: "sessionResultRecycled", params: { size } } : { key: "sessionResultRecycledPartial", params: { size, refused } };
   });
 }
 async function deleteWorkspaceSessions(io, cwd, options = {}) {
@@ -3794,10 +4034,12 @@ async function deleteWorkspaceSessions(io, cwd, options = {}) {
   };
   if (options.permanent === true) body["confirm"] = true;
   return postAction(io, body, (value) => {
-    const count = Number(value["matched"] ?? 0);
-    const size = formatBytes(Number(value["bytes"] ?? 0));
-    if (count === 0) return { key: "sessionResultWorkspaceEmpty" };
+    const matched = Number(value["matched"] ?? 0);
     const refused = Array.isArray(value["refusals"]) ? value["refusals"].length : 0;
+    const count = Math.max(0, matched - refused);
+    const size = formatBytes(Number(value["bytes"] ?? 0));
+    if (matched === 0) return { key: "sessionResultWorkspaceEmpty" };
+    if (count === 0) return { key: "sessionResultDeleteNone" };
     const params = refused === 0 ? { count, size } : { count, size, refused };
     if (options.permanent === true) {
       return { key: refused === 0 ? "sessionResultWorkspacePurged" : "sessionResultWorkspacePurgedRefused", params };
@@ -3813,10 +4055,14 @@ async function purgeSession(io, entryId) {
   if (entryId === "") return { kind: "error", message: { key: "sessionResultMissingEntryId" } };
   return postAction(io, { action: "purge", entryId, confirm: true }, () => ({ key: "sessionResultPurged" }));
 }
-async function sweepSessions(io) {
-  return postAction(io, { action: "sweep" }, (value) => {
+async function sweepSessions(io, options = {}) {
+  const body = { action: "sweep" };
+  if (options.confirm === true) body["confirm"] = true;
+  return postAction(io, body, (value) => {
     const purged = Array.isArray(value["purged"]) ? value["purged"].length : 0;
-    return purged === 0 ? { key: "sessionResultSweepNone" } : { key: "sessionResultSweepDone", params: { count: purged } };
+    const failed = Array.isArray(value["failed"]) ? value["failed"].length : 0;
+    if (purged === 0 && failed === 0) return { key: "sessionResultSweepNone" };
+    return failed === 0 ? { key: "sessionResultSweepDone", params: { count: purged } } : { key: "sessionResultSweepPartial", params: { count: purged, failed } };
   });
 }
 async function postAction(io, body, describe) {
@@ -3834,7 +4080,16 @@ async function postAction(io, body, describe) {
     };
   }
   if (!response.ok) return { kind: "error", message: await errorMessage(response), status: response.status };
-  const value = await response.json();
+  let value;
+  try {
+    const decoded = await response.json();
+    if (typeof decoded !== "object" || decoded === null || Array.isArray(decoded)) {
+      return { kind: "error", message: { key: "sessionResultActionFailed" }, status: response.status };
+    }
+    value = decoded;
+  } catch {
+    return { kind: "error", message: { key: "sessionResultActionFailed" }, status: response.status };
+  }
   if (value["ok"] !== true) {
     return {
       kind: "error",
@@ -3909,7 +4164,10 @@ function renderBinRow(props) {
     (0, import_react7.createElement)(
       "div",
       { className: CLASS.row },
-      (0, import_react7.createElement)("code", { className: CLASS.badge }, row.sessionId),
+      // 回收站条目以前只画完整 uuid，用户没法判断该还原/清除哪一条；宿主本来就带 title 与删除时间。
+      (0, import_react7.createElement)("code", { className: CLASS.badge }, shortId(row.sessionId)),
+      row.title === void 0 || row.title === "" ? null : (0, import_react7.createElement)("span", { className: CLASS.rowTitle, title: `movedBy: ${row.movedBy}` }, row.title),
+      (0, import_react7.createElement)("span", { className: CLASS.rowMeta }, formatStamp(row.deletedAtMs)),
       (0, import_react7.createElement)("span", { className: CLASS.rowMeta }, formatBytes(row.bytes)),
       (0, import_react7.createElement)(
         "span",
@@ -3993,54 +4251,84 @@ function SessionPanel({ copy, io, close }) {
   const [selected, setSelected] = (0, import_react7.useState)([]);
   const [outcome, setOutcome] = (0, import_react7.useState)(void 0);
   const [busy, setBusy] = (0, import_react7.useState)(false);
+  const busyRef = (0, import_react7.useRef)(false);
+  const markBusy = (0, import_react7.useCallback)((value) => {
+    busyRef.current = value;
+    setBusy(value);
+  }, []);
   const [pending, setPending] = (0, import_react7.useState)(void 0);
   const snapshot = phase.kind === "ready" ? phase.snapshot : EMPTY_SNAPSHOT;
   const [reads] = (0, import_react7.useState)(() => createLatestOnly());
+  const [actions] = (0, import_react7.useState)(() => createLatestOnly());
+  const [requests] = (0, import_react7.useState)(() => createAbortGate());
   const alive = (0, import_react7.useRef)(true);
   (0, import_react7.useEffect)(() => {
     alive.current = true;
     return () => {
       alive.current = false;
+      requests.abort();
     };
-  }, []);
+  }, [requests]);
   const refresh = (0, import_react7.useCallback)(async () => {
+    if (busyRef.current) return;
     const mine = reads.begin();
-    setBusy(true);
+    const signal = requests.begin();
+    markBusy(true);
     try {
-      const result = await readSessionPanel(io);
+      const result = await readSessionPanel(io, signal);
       if (!alive.current || !reads.isCurrent(mine)) return;
       setPhase(result.ok ? { kind: "ready", snapshot: result.snapshot } : { kind: "failed", error: result.error });
+      if (result.ok) {
+        const stillVisible = new Set(visibleSessions(result.snapshot.sessions).map((row) => row.id));
+        setSelected((previous) => previous.filter((id) => stillVisible.has(id)));
+      }
     } finally {
-      if (alive.current && reads.isCurrent(mine)) setBusy(false);
+      if (alive.current && reads.isCurrent(mine)) markBusy(false);
     }
-  }, [io, reads]);
+  }, [io, markBusy, reads, requests]);
+  const refreshRef = (0, import_react7.useRef)(refresh);
   (0, import_react7.useEffect)(() => {
-    void refresh();
+    refreshRef.current = refresh;
   }, [refresh]);
+  const mounted = (0, import_react7.useRef)(false);
+  (0, import_react7.useEffect)(() => {
+    if (mounted.current) return;
+    mounted.current = true;
+    void refreshRef.current();
+  }, []);
   const run = (0, import_react7.useCallback)(
     async (action) => {
+      if (busyRef.current) return;
       const mine = reads.begin();
-      setBusy(true);
+      const actionId = actions.begin();
+      const signal = requests.begin();
+      markBusy(true);
       try {
-        const result = await action();
-        if (!alive.current || !reads.isCurrent(mine)) return;
-        setOutcome(result);
+        let result;
+        try {
+          result = await action();
+        } catch {
+          result = { kind: "error", message: { key: "sessionResultActionFailed" } };
+        }
+        if (!alive.current) return;
+        if (actions.isCurrent(actionId)) setOutcome(result);
         setSelected([]);
         setPending(void 0);
-        const read = await readSessionPanel(io);
+        const read = await readSessionPanel(io, signal);
         if (!alive.current || !reads.isCurrent(mine)) return;
         setPhase(read.ok ? { kind: "ready", snapshot: read.snapshot } : { kind: "failed", error: read.error });
       } finally {
-        if (alive.current && reads.isCurrent(mine)) setBusy(false);
+        if (alive.current && actions.isCurrent(actionId)) markBusy(false);
       }
     },
-    [io, reads]
+    [actions, io, markBusy, reads, requests]
   );
   const visible = (0, import_react7.useMemo)(() => visibleSessions(snapshot.sessions), [snapshot.sessions]);
-  const hidden = hiddenSubsessionCount(snapshot.sessions);
+  const selectedSet = (0, import_react7.useMemo)(() => new Set(selected), [selected]);
+  const hidden = snapshot.sessions.length - visible.length;
   const deletable = (0, import_react7.useMemo)(
-    () => visible.filter((row) => row.deletable && selected.includes(row.id)),
-    [visible, selected]
+    () => visible.filter((row) => row.deletable && selectedSet.has(row.id)),
+    [visible, selectedSet]
   );
   const groups = (0, import_react7.useMemo)(() => groupByWorkspace(visible), [visible]);
   const toggle = (0, import_react7.useCallback)((id) => {
@@ -4051,6 +4339,7 @@ function SessionPanel({ copy, io, close }) {
     if (current === void 0) return;
     setPending(void 0);
     void run(() => {
+      if (current.kind === "sweep") return sweepSessions(io, { confirm: true });
       if (current.kind === "purge") return purgeSession(io, current.ids[0]);
       if (current.kind === "delete-workspace") return deleteWorkspaceSessions(io, current.cwd, { permanent: true });
       return deleteSessions(io, current.ids, { permanent: true });
@@ -4103,7 +4392,7 @@ function SessionPanel({ copy, io, close }) {
       (0, import_react7.createElement)(
         "div",
         { className: CLASS.headerActions },
-        Button({ variant: "secondary", size: "compact", onClick: () => void refresh(), children: copy.refresh }),
+        Button({ variant: "secondary", size: "compact", disabled: busy, onClick: () => void refresh(), children: copy.refresh }),
         Button({ variant: "secondary", size: "compact", onClick: close, children: copy.close })
       )
     ),
@@ -4194,7 +4483,7 @@ function SessionPanel({ copy, io, close }) {
         variant: "secondary",
         size: "compact",
         disabled: busy,
-        onClick: () => void run(() => sweepSessions(io)),
+        onClick: () => setPending({ kind: "sweep" }),
         children: copy.sweep
       })
     ),
@@ -4216,7 +4505,11 @@ function renderConfirmationDialog(pending, copy, handlers, titleId, loadedIdle =
         handlers.cancel();
       }
     },
-    (0, import_react7.createElement)("h3", { id: titleId, className: CLASS.dialogHeader }, copy.confirmTitle),
+    (0, import_react7.createElement)(
+      "h3",
+      { id: titleId, className: CLASS.dialogHeader },
+      pending.kind === "sweep" ? copy.sweepConfirmTitle : copy.confirmTitle
+    ),
     (0, import_react7.createElement)("p", { className: CLASS.dialogBody }, confirmationBody(pending, copy, loadedIdle)),
     (0, import_react7.createElement)(
       "div",
@@ -4231,6 +4524,7 @@ function workspaceDeleteAction(group) {
   return { kind: "delete-workspace", cwd: group.cwd };
 }
 function confirmationBody(pending, copy, loadedIdle = 0) {
+  if (pending.kind === "sweep") return copy.sweepConfirmBody;
   if (pending.kind === "delete-workspace") return copy.confirmWorkspaceBody(pending.cwd);
   const targets = pending.ids.join(", ");
   const sentence = pending.kind === "purge" ? copy.confirmPurgeBody(targets) : copy.confirmBody(targets);
@@ -4273,6 +4567,7 @@ function createSessionRowActionStore(deps) {
     };
   });
   let cancelAutoClose;
+  let postInFlight = false;
   const stopAutoClose = () => {
     cancelAutoClose?.();
     cancelAutoClose = void 0;
@@ -4297,14 +4592,22 @@ 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 });
-    const result = await deleteSessions(deps.io, [request.sessionId], request.kind === "delete" ? { permanent: true } : {});
+    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 });
     if (result.kind === "ok") {
@@ -4326,7 +4629,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,
@@ -4571,7 +4874,6 @@ var import_react11 = require("react");
 
 // src/client/flows/directory-browser.ts
 var import_react10 = require("react");
-var GIT_STATUS_API_PATH = "/api/over-ssh/git-status";
 var GIT_STATUS_BADGE = {
   modified: "M",
   added: "A",
@@ -4898,17 +5200,24 @@ function createDirectoryBrowser(deps) {
     dispatch({ type: "remote-loaded", path, listing: result.value });
     void loadGit(connectionId, result.value.path, signal);
   };
+  let connectionsInFlight;
   const ensureConnections = async () => {
     if (state.connections.length > 0) return true;
-    if (state.connectionsPending) return false;
+    if (connectionsInFlight !== void 0) return connectionsInFlight;
     dispatch({ type: "connections-loading" });
-    const result = await deps.io.loadConnections();
-    if (!result.ok) {
-      dispatch({ type: "connections-failed", error: result.error });
-      return false;
-    }
-    dispatch({ type: "connections-loaded", connections: result.value });
-    return true;
+    const attempt = (async () => {
+      const result = await deps.io.loadConnections();
+      connectionsInFlight = void 0;
+      if (disposed) return false;
+      if (!result.ok) {
+        dispatch({ type: "connections-failed", error: result.error });
+        return false;
+      }
+      dispatch({ type: "connections-loaded", connections: result.value });
+      return true;
+    })();
+    connectionsInFlight = attempt;
+    return attempt;
   };
   const refresh = async (path) => {
     if (disposed) return;
@@ -5017,7 +5326,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
@@ -5239,12 +5548,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,
@@ -5370,15 +5685,30 @@ function selectSessionDirectoryView(state, copy) {
     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 },
-    roots: state.roots.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.
-      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
-    })),
+    // 工作区永远排在第一行：它是默认边界，`workspace-write` 下与已添加目录一样可写（ADR-0016）。
+    roots: [
+      ...state.workspacePath === void 0 ? [] : [{
+        key: `workspace:${state.workspacePath}`,
+        title: state.workspacePath,
+        subtitle: copy["sessionRootsWorkspaceNote"],
+        badge: copy["sessionRootsWorkspaceBadge"],
+        removable: false,
+        workspace: true
+      }],
+      ...state.roots.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.
+        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"],
+        // 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,
     rootsReading: state.rootsReading,
     browsing: state.browsing
@@ -5431,11 +5761,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;
@@ -5544,6 +5877,9 @@ 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),
+      // **有行就画列表**：工作区那一行是合成行，它不属于"已添加目录"，但它是这张卡片最重要的一行。
+      // 旧条件按"有没有已添加目录"决定画不画整张列表，结果是新会话只看到「还没有添加目录」，连会话
+      // 自己在哪个工作区都不显示，必须先去添加一个目录才冒出来（审计 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).
@@ -5564,7 +5900,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
               })
@@ -5572,6 +5910,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 },
@@ -5611,20 +5951,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)();
@@ -5649,8 +5991,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());
@@ -6003,10 +6347,6 @@ function createWorkspaceDirectoryFlow(deps) {
     }
   };
 }
-function fieldValue2(event) {
-  const target = event.target;
-  return typeof target?.value === "string" ? target.value : "";
-}
 function WorkspaceDirectoryFlowSection({
   copy,
   state,
@@ -6149,7 +6489,7 @@ function WorkspaceDirectoryFlowSection({
                   value: state.drafts.path,
                   disabled: !canPickLocal2,
                   placeholder: copy.rootsRemotePathLabel,
-                  onChange: (event) => actions.onDraftChange({ path: fieldValue2(event) })
+                  onChange: (event) => actions.onDraftChange({ path: fieldValue(event) })
                 }),
                 Button({
                   variant: "secondary",
@@ -6308,6 +6648,8 @@ function apply(ctx) {
         subsessionBadge: dict.sessionPanelSubsession,
         unreadableBadge: dict.sessionPanelUnreadable,
         confirmTitle: dict.sessionPanelConfirmTitle,
+        sweepConfirmTitle: dict.sessionResultSweepConfirmTitle,
+        sweepConfirmBody: dict.sessionResultSweepConfirmBody,
         confirmBody: (targets) => resolveMessage2(dict, { key: "sessionPanelConfirmBody", params: { targets } }),
         confirmPurgeBody: (targets) => resolveMessage2(dict, { key: "sessionPanelConfirmPurgeBody", params: { targets } }),
         confirmCancel: dict.sessionPanelConfirmCancel,
@@ -6331,7 +6673,7 @@ function apply(ctx) {
       };
     };
     const io = { fetch: (input, init) => globalThis.fetch(input, init) };
-    return ctx.slots.inject(
+    const register = () => ctx.slots.inject(
       "settings.section",
       () => ctx.slots.register(
         {
@@ -6339,12 +6681,20 @@ function apply(ctx) {
           id: SESSION_SECTION_ID,
           order: SESSION_SECTION_ORDER,
           label: copy().title,
-          inject: () => ({ copy: copy(), io, close: () => {
-          } })
+          inject: () => ({ copy: copy(), io })
         },
         SessionPanel
       )
     );
+    let dispose = register();
+    const offLocaleChange = ctx.on("locale/change", () => {
+      dispose();
+      dispose = register();
+    });
+    return () => {
+      offLocaleChange();
+      dispose();
+    };
   });
   ctx.effect(() => {
     let rows;
@@ -6474,7 +6824,7 @@ function apply(ctx) {
     let lastOverlay = "";
     const overlayOf = () => {
       const state = rootsController.getState();
-      return `${state.editingId ?? ""}|${state.confirmingRemove ?? ""}|${state.pending ? "busy" : "idle"}`;
+      return `${state.editingId ?? ""}|${state.confirmingRemove ?? ""}`;
     };
     lastOverlay = overlayOf();
     const offSnapshot = rootsController.subscribe(() => {
@@ -6505,15 +6855,18 @@ function apply(ctx) {
     const api = createRootsApi((input, init) => globalThis.fetch(input, init));
     let ids = /* @__PURE__ */ new Set();
     let disposed = false;
+    const requests = createAbortGate();
     const dict = () => OVER_SSH_DICTS[ctx.locale.getLocale().active === "en" ? "en" : "zh"];
     const label = () => dict().rootsTitle;
     let loaded = false;
     let dispose = () => void 0;
     async function reload() {
+      const signal = requests.begin();
       try {
-        const [roots, sessions] = await Promise.all([api.load(), loadSessionPanel(io)]);
+        const [roots, sessions] = await Promise.all([api.load(signal), readSessionPanel(io, signal)]);
         if (disposed || !roots.ok) return;
-        const next = remoteSessionIds(sessions.sessions, roots.value.anchorRoot);
+        if (!sessions.ok || !sessions.snapshot.available) return;
+        const next = remoteSessionIds(sessions.snapshot.sessions, roots.value.anchorRoot);
         if (sameIds(next, ids)) return;
         ids = next;
         refresh();
@@ -6553,6 +6906,7 @@ function apply(ctx) {
     const offLocaleChange = ctx.on("locale/change", refresh);
     return () => {
       disposed = true;
+      requests.abort();
       doc?.removeEventListener("visibilitychange", onVisibility);
       offLocaleChange();
       dispose();
@@ -6604,6 +6958,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(
@@ -6611,7 +6966,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
       )
@@ -6624,6 +6979,7 @@ function apply(ctx) {
     return () => {
       offLocaleChange();
       disposeEntry();
+      controller.dispose();
     };
   });
   ctx.effect(() => {