@michengai/dsh-archive-manager 0.1.42 → 0.1.43

package/lib/client.js

@@ -11,11 +11,15 @@
     return error instanceof ArchiveNavigationError ? t(`archives.${error.code}`) : String(error?.message ?? error);
   }
   async function openArchivedConversation(actions, sessionId, restore, isActive = () => true) {
-    if (restore) await actions.restore(sessionId);
+    if (restore) {
+      if (typeof actions.prepare === "function") await actions.prepare(sessionId);
+      if (!isActive()) return;
+      await actions.restore(sessionId);
+    }
     if (isActive()) await actions.open(sessionId);
   }
   function allowArchivedNavigation(navigation, sessions, workspaces, { onOpened = () => {
-  }, warn = (...args) => console.warn(...args) } = {}) {
+  }, beginNavigation, warn = (...args) => console.warn(...args) } = {}) {
     let allowed;
     const original = navigation?.clearArchivedCurrent;
     const descriptor = navigation && Object.getOwnPropertyDescriptor(navigation, "clearArchivedCurrent");
@@ -42,6 +46,7 @@
             warn("archive-manager: \u5F52\u6863\u5BFC\u822A\u9002\u914D\u4E0D\u53EF\u7528\u6216\u5DF2\u88AB\u66FF\u6362\u3002");
             throw new ArchiveNavigationError("navigationUnavailable");
           }
+          beginNavigation?.();
           sessions.open(id);
           if (sessions.list.getSnapshot().current !== id) {
             warn("archive-manager: \u5BBF\u4E3B\u672A\u4FDD\u7559\u76EE\u6807\u4F1A\u8BDD\u3002", { cleanupAvailable: typeof original === "function" });
@@ -468,12 +473,6 @@
           return value;
         }
       };
-      const workspaceIdSchema = {
-        parse(value) {
-          if (typeof value !== "string" || value.length === 0) throw new TypeError(`workspaceId must be a non-empty string, got ${String(value)}`);
-          return value;
-        }
-      };
       const archivedSetSchema = {
         parse(value) {
           if (typeof value !== "object" || value === null || Array.isArray(value)) throw new TypeError("result must be an object");
@@ -497,28 +496,6 @@
           throw new TypeError("target.scope must be all, ungrouped, workspace with a non-empty workspaceId, or sessions with non-empty sessionIds");
         }
       };
-      const unarchivedBatchSchema = {
-        parse(value) {
-          if (typeof value !== "object" || value === null || Array.isArray(value)) throw new TypeError("result must be an object");
-          if (!Array.isArray(value.archivedSessionIds) || value.archivedSessionIds.some((id) => typeof id !== "string")) throw new TypeError("archivedSessionIds must be a string array");
-          if (!Array.isArray(value.unarchivedSessionIds) || value.unarchivedSessionIds.some((id) => typeof id !== "string")) throw new TypeError("unarchivedSessionIds must be a string array");
-          return value;
-        }
-      };
-      const archiveSessionIdsSchema = {
-        parse(value) {
-          if (!Array.isArray(value)) throw new TypeError("sessionIds must be an array");
-          return [...new Set(value.map((id) => sessionIdSchema.parse(id)))];
-        }
-      };
-      const archivedWorkspaceBatchSchema = {
-        parse(value) {
-          if (typeof value !== "object" || value === null || Array.isArray(value)) throw new TypeError("result must be an object");
-          if (!Array.isArray(value.archivedSessionIds) || value.archivedSessionIds.some((id) => typeof id !== "string")) throw new TypeError("archivedSessionIds must be a string array");
-          if (!Array.isArray(value.archivedSessionIdsAdded) || value.archivedSessionIdsAdded.some((id) => typeof id !== "string")) throw new TypeError("archivedSessionIdsAdded must be a string array");
-          return value;
-        }
-      };
       const deletedBatchSchema = {
         parse(value) {
           if (typeof value !== "object" || value === null || Array.isArray(value)) throw new TypeError("result must be an object");
@@ -578,63 +555,6 @@
             },
             sourceLocation: { file: "@michengai/dsh-archive-manager/lib/workspace.js", line: 1, column: 1 }
           },
-          {
-            id: "@michengai/dsh-archive-manager#workspaceRegistry/unarchiveSessions",
-            service: "workspaceRegistry",
-            namespace: "workspaceRegistry",
-            method: "unarchiveSessions",
-            invocation: { kind: "direct" },
-            parameters: [{
-              name: "target",
-              wire: "target",
-              source: "json",
-              codec: { mode: "strict", typeSymbol: "@michengai/dsh-archive-manager/types#ArchivedBatchTarget", schema: archivedBatchTargetSchema }
-            }],
-            result: {
-              mode: "strict",
-              typeSymbol: "@michengai/dsh-archive-manager/types#UnarchivedBatch",
-              schema: unarchivedBatchSchema
-            },
-            sourceLocation: { file: "@michengai/dsh-archive-manager/lib/workspace.js", line: 1, column: 1 }
-          },
-          {
-            id: "@michengai/dsh-archive-manager#workspaceRegistry/archiveSessions",
-            service: "workspaceRegistry",
-            namespace: "workspaceRegistry",
-            method: "archiveSessions",
-            invocation: { kind: "direct" },
-            parameters: [{
-              name: "sessionIds",
-              wire: "sessionIds",
-              source: "json",
-              codec: { mode: "strict", typeSymbol: "@michengai/dsh-archive-manager/types#ArchiveSessionIds", schema: archiveSessionIdsSchema }
-            }],
-            result: {
-              mode: "strict",
-              typeSymbol: "@michengai/dsh-archive-manager/types#ArchivedWorkspaceBatch",
-              schema: archivedWorkspaceBatchSchema
-            },
-            sourceLocation: { file: "@michengai/dsh-archive-manager/lib/workspace.js", line: 1, column: 1 }
-          },
-          {
-            id: "@michengai/dsh-archive-manager#workspaceRegistry/archiveWorkspaceSessions",
-            service: "workspaceRegistry",
-            namespace: "workspaceRegistry",
-            method: "archiveWorkspaceSessions",
-            invocation: { kind: "direct" },
-            parameters: [{
-              name: "workspaceId",
-              wire: "workspaceId",
-              source: "json",
-              codec: { mode: "strict", typeSymbol: "@deepseek-ai/dsh-workspace/types#WorkspaceId", schema: workspaceIdSchema }
-            }],
-            result: {
-              mode: "strict",
-              typeSymbol: "@michengai/dsh-archive-manager/types#ArchivedWorkspaceBatch",
-              schema: archivedWorkspaceBatchSchema
-            },
-            sourceLocation: { file: "@michengai/dsh-archive-manager/lib/workspace.js", line: 1, column: 1 }
-          },
           {
             id: "@michengai/dsh-archive-manager#workspaceRegistry/deleteArchivedSessions",
             service: "workspaceRegistry",
@@ -711,7 +631,23 @@
         return indexed;
       }
       const FLAT_SESSION_ORDER_KEY = "__flat_session_order__";
+      const WORKSPACE_VIEW_PERSIST_KEY = "dsh.archive-manager.workspace.view.v1";
+      const LEGACY_WORKSPACE_VIEW_PERSIST_KEY = "dsh.workspace.view.v5";
+      function migrateWorkspaceViewPersist(storage) {
+        const target = storage ?? globalThis.localStorage;
+        if (target == null || typeof target.getItem !== "function" || typeof target.setItem !== "function") return false;
+        try {
+          if (target.getItem(WORKSPACE_VIEW_PERSIST_KEY) != null) return false;
+          const legacy = target.getItem(LEGACY_WORKSPACE_VIEW_PERSIST_KEY);
+          if (legacy == null) return false;
+          target.setItem(WORKSPACE_VIEW_PERSIST_KEY, legacy);
+          return true;
+        } catch {
+          return false;
+        }
+      }
       function createWorkspaceViewStore() {
+        migrateWorkspaceViewPersist();
         return (0, _deepseek_ai_dsh_client_store.defineStore)({
           init: () => ({
             groupBy: "workspace",
@@ -721,7 +657,7 @@
             sessionOrderByAccount: {},
             sessionUpdatedAtByAccount: {}
           }),
-          persist: "dsh.workspace.view.v5",
+          persist: WORKSPACE_VIEW_PERSIST_KEY,
           actions: {
             setGroupBy: (d, mode) => {
               d.groupBy = mode;
@@ -754,7 +690,7 @@
       function GithubMark16() {
         return (0, react_jsx_runtime.jsx)("svg", { viewBox: "0 0 16 16", width: 16, height: 16, "aria-hidden": true, focusable: "false", children: (0, react_jsx_runtime.jsx)("path", { fill: "currentColor", d: "M8 0a8 8 0 0 0-2.53 15.59c.4.074.547-.173.547-.385 0-.19-.007-.693-.01-1.36-2.226.484-2.695-1.073-2.695-1.073-.364-.924-.89-1.17-.89-1.17-.726-.496.055-.486.055-.486.803.056 1.225.824 1.225.824.714 1.223 1.872.87 2.328.665.072-.517.28-.87.508-1.07-1.777-.202-3.645-.888-3.645-3.956 0-.874.31-1.588.823-2.148-.083-.202-.357-1.017.078-2.12 0 0 .672-.215 2.2.82A7.65 7.65 0 0 1 8 4.8c.68.003 1.365.092 2.004.27 1.527-1.035 2.197-.82 2.197-.82.437 1.103.162 1.918.08 2.12.513.56.822 1.274.822 2.148 0 3.076-1.872 3.752-3.654 3.95.288.248.544.735.544 1.482 0 1.07-.01 1.932-.01 2.195 0 .214.144.463.55.384A8.001 8.001 0 0 0 8 0Z" }) });
       }
-      function ArchivedSessionsSection({ archiveSessions, sessionStore, workspaceStore, unarchiveSession, deleteSession, unarchiveSessions, deleteArchivedSessions, archivedSessionMetadata, openConversation, viewState, close, t }) {
+      function ArchivedSessionsSection({ archiveSessions, sessionStore, workspaceStore, unarchiveSession, deleteSession, unarchiveSessions, deleteArchivedSessions, archivedSessionMetadata, openConversation, focusSessionWorkspace, viewState, close, t }) {
         const sessions = (0, react.useSyncExternalStore)(sessionStore.subscribe, sessionStore.getSnapshot);
         const workspaceState = (0, react.useSyncExternalStore)(workspaceStore.subscribe, workspaceStore.getSnapshot);
         const [archiveTab, setArchiveTab] = (0, react.useState)("archived");
@@ -799,13 +735,29 @@
           navigationPending.current = true;
           setBusy(true);
           setError(null);
+          let restored = false;
           try {
-            await openArchivedConversation({ restore: unarchiveSession, open: async (id) => {
-              await openConversation(id);
-              if (navigationActive.current) close?.();
-            } }, session.id, restore, () => navigationActive.current);
+            await openArchivedConversation({
+              prepare: restore ? async (id) => {
+                await focusSessionWorkspace?.(id);
+              } : void 0,
+              restore: async (id) => {
+                await unarchiveSession(id);
+                restored = true;
+              },
+              open: async (id) => {
+                await openConversation(id);
+                if (navigationActive.current) close?.();
+              }
+            }, session.id, restore, () => navigationActive.current);
           } catch (reason) {
-            if (navigationActive.current) setError(formatArchiveNavigationError(reason, t));
+            if (!navigationActive.current) return;
+            if (restored) {
+              setArchiveTab("unarchived");
+              const group = groups.find((item) => item.sessions.some((row) => row.id === session.id));
+              if (group !== void 0) setProject(group.key);
+            }
+            setError(formatArchiveNavigationError(reason, t));
           } finally {
             navigationPending.current = false;
             if (navigationActive.current) setBusy(false);
@@ -836,7 +788,10 @@
           setNotice(null);
           try {
             const result = await archiveSessions(archiveTarget);
-            setSelectedSessionIds((ids) => ids.filter((id) => !result.archivedSessionIds.includes(id)));
+            setSelectedSessionIds([]);
+            setArchiveTab("archived");
+            setProject("all");
+            setQuery("");
             setNotice(t("archives.archiveSuccess", { n: result.archivedSessionIdsAdded.length }));
             setArchiveTarget(null);
             setArchiveGroup(null);
@@ -1629,7 +1584,7 @@
           })]
         });
       }
-      function SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork, onArchive, onUnarchive, onDeleteSession, drag, flat = false, t }) {
+      function SessionNodeItem({ node, currentId, now, onOpen, onRename, onFork, onArchive, onUnarchive, onDeleteSession, onReveal, drag, flat = false, t }) {
         const row = node;
         const title = displayTitle(node, t);
         const selected = node.id === currentId;
@@ -1637,6 +1592,12 @@
         const statuses = sessionStatuses(node, t);
         const showStatus = statuses[0].state !== "done" || row.completed;
         const [menuOpen, setMenuOpen] = (0, react.useState)(false);
+        const rowRef = (0, react.useRef)(null);
+        (0, react.useEffect)(() => {
+          if (onReveal === void 0) return;
+          rowRef.current?.scrollIntoView({ block: "nearest" });
+          onReveal();
+        }, [onReveal]);
         const sessionMenuItems = archived ? [
           {
             id: "unarchive",
@@ -1674,6 +1635,7 @@
         ];
         return (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.HoverCard, {
           anchor: (0, react_jsx_runtime.jsxs)("div", {
+            ref: rowRef,
             className: clsx(Rows_module_css_default.sessionRow, selected && Rows_module_css_default.selected, menuOpen && Rows_module_css_default.menuOpen, flat && !showStatus && Rows_module_css_default.flatSessionRowWithoutStatus, archived && ARCHIVED_CLASSES.row, drag?.marker === "before" && Rows_module_css_default.dropBefore, drag?.marker === "after" && Rows_module_css_default.dropAfter),
             role: "treeitem",
             "aria-selected": selected,
@@ -2123,7 +2085,7 @@
         const rect = e.currentTarget.getBoundingClientRect();
         return e.clientY < rect.top + rect.height / 2 ? "before" : "after";
       }
-      function SessionTree({ useSessions, useSessionPendingInteraction, startSession, open, forkSession, workspaces, archivedSessionIds, showArchived, onRenameRequest, onArchiveRequest, onDeleteRequest, onSessionRename, onSessionArchive, onSessionUnarchive, onSessionDelete, insertWorkspaceBefore, insertSessionBefore, orderBy, groupExpansion, setGroupExpanded, sessionOrderByAccount, sessionUpdatedAtByAccount, syncSessionOrderAccount, setSessionOrder, t }) {
+      function SessionTree({ useSessions, useSessionPendingInteraction, startSession, open, forkSession, workspaces, archivedSessionIds, showArchived, onRenameRequest, onArchiveRequest, onDeleteRequest, onSessionRename, onSessionArchive, onSessionUnarchive, onSessionDelete, insertWorkspaceBefore, insertSessionBefore, orderBy, groupExpansion, setGroupExpanded, sessionOrderByAccount, sessionUpdatedAtByAccount, syncSessionOrderAccount, setSessionOrder, t, revealSessionId, onSessionRevealed }) {
         const list = useSessions((s) => s);
         const pendingInteractions = useSessionPendingInteraction((s) => s);
         const current = list.current;
@@ -2135,6 +2097,7 @@
         const previousOrderBy = (0, react.useRef)(orderBy);
         useNativeDragAcceptance(drag !== null || workspaceDrag !== null);
         const currentGroup = current === void 0 ? void 0 : workspaces.find((w) => w.sessionIds.includes(current))?.workspaceId ?? "";
+        const revealGroup = revealSessionId === void 0 ? void 0 : workspaces.find((w) => w.sessionIds.includes(revealSessionId))?.workspaceId ?? "";
         (0, react.useEffect)(() => {
           if (current === void 0 || currentGroup === void 0 || Object.hasOwn(groupExpansion, currentGroup)) return;
           setGroupExpanded(currentGroup, true);
@@ -2144,6 +2107,14 @@
           setGroupExpanded,
           groupExpansion
         ]);
+        (0, react.useEffect)(() => {
+          if (revealGroup === void 0 || groupExpansion[revealGroup] === true) return;
+          setGroupExpanded(revealGroup, true);
+        }, [
+          groupExpansion,
+          revealGroup,
+          setGroupExpanded
+        ]);
         const expandedGroups = (0, react.useMemo)(() => Object.entries(groupExpansion).filter(([, expanded]) => expanded).map(([key]) => key), [groupExpansion]);
         const ungroupedSessionIds = (0, react.useMemo)(() => {
           const accounted = new Set(workspaces.flatMap((workspace) => workspace.sessionIds));
@@ -2170,7 +2141,7 @@
               orderBy,
               sortByRecency: orderBy === "updated" && (previousOrder === void 0 || switchedToUpdated)
             });
-            if (next.changed) syncSessionOrderAccount(key, next.order.map((id) => id), next.updatedAt);
+            if (next.changed && typeof syncSessionOrderAccount === "function") syncSessionOrderAccount(key, next.order.map((id) => id), next.updatedAt);
           }
         }, [
           list,
@@ -2205,6 +2176,17 @@
           expandedGroups,
           sessionOrderByAccount
         ]);
+        (0, react.useEffect)(() => {
+          if (revealSessionId === void 0 || revealGroup === void 0) return;
+          const group = groups.find((candidate) => candidate.key === revealGroup);
+          if (group === void 0 || !group.expanded || !group.sessions.some((row) => row.id === revealSessionId)) return;
+          if (group.sessions.slice(0, COLLAPSED_SESSION_LIMIT).some((row) => row.id === revealSessionId)) return;
+          setExpandedSessionGroups((keys) => keys.includes(revealGroup) ? keys : [...keys, revealGroup]);
+        }, [
+          groups,
+          revealGroup,
+          revealSessionId
+        ]);
         const now = Date.now();
         const commitSessionDrag = (activeDrag, over) => {
           if (sessionDropCommitted.current) return;
@@ -2351,6 +2333,9 @@
                         onArchive: onSessionArchive,
                         onUnarchive: onSessionUnarchive,
                         onDeleteSession: onSessionDelete,
+                        onReveal: node.id === revealSessionId && group.key === revealGroup ? () => {
+                          onSessionRevealed?.(node.id);
+                        } : void 0,
                         drag: {
                           start: () => {
                             sessionDropCommitted.current = false;
@@ -2404,7 +2389,7 @@
           ]
         });
       }
-      function FlatList({ useSessions, useSessionPendingInteraction, open, forkSession, onSessionRename, onSessionArchive, onSessionUnarchive, onSessionDelete, archivedSessionIds, showArchived, orderBy, sessionOrderByAccount, sessionUpdatedAtByAccount, syncSessionOrderAccount, setSessionOrder, t }) {
+      function FlatList({ useSessions, useSessionPendingInteraction, open, forkSession, onSessionRename, onSessionArchive, onSessionUnarchive, onSessionDelete, archivedSessionIds, showArchived, orderBy, sessionOrderByAccount, sessionUpdatedAtByAccount, syncSessionOrderAccount, setSessionOrder, t, revealSessionId, onSessionRevealed }) {
         const list = useSessions((s) => s);
         const pendingInteractions = useSessionPendingInteraction((s) => s);
         const baseRows = (0, react.useMemo)(() => deriveFlat(list, archivedSessionIds, pendingInteractions, showArchived), [
@@ -2494,6 +2479,9 @@
                 onArchive: onSessionArchive,
                 onUnarchive: onSessionUnarchive,
                 onDeleteSession: onSessionDelete,
+                onReveal: node.id === revealSessionId ? () => {
+                  onSessionRevealed?.(node.id);
+                } : void 0,
                 flat: true,
                 drag: {
                   start: () => {
@@ -2594,6 +2582,18 @@
           }), (0, react_jsx_runtime.jsx)("span", { className: WorkspaceBrowser_module_css_default.fade })]
         });
       }
+      const sidebarReveal = {
+        listeners: /* @__PURE__ */ new Set(),
+        request(sessionId) {
+          for (const listener of this.listeners) listener(sessionId);
+        },
+        subscribe(listener) {
+          this.listeners.add(listener);
+          return () => {
+            this.listeners.delete(listener);
+          };
+        }
+      };
       function WorkspaceBrowser({ wide, expandSidebar, useSessions, useSessionPendingInteraction, useWorkspaces, useStore, actions, startSession, open, renameSession, forkSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, archiveSession, archiveWorkspaceSessions, unarchiveSession, deleteSession, insertSessionBefore, createWorkspace, searchSessions, searchResultLimit, useDirectoryFlow, renderSlot, t }) {
         const useEffectiveSessionPendingInteraction = useSessionPendingInteraction ?? useEmptySessionPendingInteraction;
         const workspaces = useWorkspaces((state) => state.items);
@@ -2608,6 +2608,11 @@
         const sessionOrderByAccount = useStore((s) => s.sessionOrderByAccount);
         const sessionUpdatedAtByAccount = useStore((s) => s.sessionUpdatedAtByAccount);
         const archivedSet = (0, react.useMemo)(() => new Set(archivedSessionIds), [archivedSessionIds]);
+        const [revealSessionId, setRevealSessionId] = (0, react.useState)(void 0);
+        (0, react.useEffect)(() => sidebarReveal.subscribe((sessionId) => setRevealSessionId(sessionId)), []);
+        const acknowledgeSessionReveal = (sessionId) => {
+          setRevealSessionId((current) => current === sessionId ? void 0 : current);
+        };
         const [archivedToast, setArchivedToast] = (0, react.useState)(null);
         const archivedToastSeq = (0, react.useRef)(0);
         const showArchivedToast2 = (text) => {
@@ -3015,7 +3020,12 @@
               children: wide && (normalizedQuery !== "" ? (0, react_jsx_runtime.jsx)(SearchResults, {
                 useSessions,
                 useSessionPendingInteraction: useEffectiveSessionPendingInteraction,
-                open: guardedOpen,
+                open: (sessionId) => {
+                  setRevealSessionId(sessionId);
+                  setQuery("");
+                  setSearchExpanded(false);
+                  guardedOpen(sessionId);
+                },
                 workspaces,
                 archivedSessionIds,
                 showArchived,
@@ -3027,6 +3037,8 @@
                 useSessions,
                 useSessionPendingInteraction: useEffectiveSessionPendingInteraction,
                 open: guardedOpen,
+                revealSessionId,
+                onSessionRevealed: acknowledgeSessionReveal,
                 forkSession,
                 onSessionRename,
                 onSessionArchive,
@@ -3046,6 +3058,8 @@
               }) : (0, react_jsx_runtime.jsx)(SessionTree, {
                 useSessions,
                 useSessionPendingInteraction: useEffectiveSessionPendingInteraction,
+                revealSessionId,
+                onSessionRevealed: acknowledgeSessionReveal,
                 onSessionRename,
                 onSessionArchive,
                 onSessionUnarchive,
@@ -3908,8 +3922,7 @@
         "workspaces",
         "locale",
         "remote",
-        "typert",
-        ...hasSplitClientStore ? ["uiWorkspace"] : []
+        "typert"
       ];
       function bindObservable(source) {
         return {
@@ -3917,18 +3930,58 @@
           subscribe: source.subscribe.bind(source)
         };
       }
-      async function archiveWorkspaceSessionsAndRefresh(registry, workspaceId, refresh) {
-        const result = await registry.archiveWorkspaceSessions(workspaceId);
-        if (!result.ok) throw new Error(result.error.message);
-        await refresh();
-        return result.value;
+      function createUnarchiveSession(workspaces, getRegistry) {
+        return async (sessionId) => {
+          if (typeof workspaces?.unarchiveSession === "function") {
+            await workspaces.unarchiveSession(sessionId);
+            return;
+          }
+          const registry = typeof getRegistry === "function" ? getRegistry() : getRegistry;
+          if (registry === void 0) throw new Error("archive-manager remote service is unavailable");
+          const result = await registry.unarchiveSession(sessionId);
+          if (!result.ok) throw new Error(result.error.message);
+          return result.value;
+        };
+      }
+      async function archiveSessionsViaOfficial(workspaces, sessionIds, refresh) {
+        const before = new Set(workspaces.list?.getSnapshot?.()?.archivedSessionIds ?? []);
+        const seen = /* @__PURE__ */ new Set();
+        for (const sessionId of sessionIds) {
+          if (typeof sessionId !== "string" || sessionId.length === 0 || seen.has(sessionId)) continue;
+          seen.add(sessionId);
+          await workspaces.archiveSession(sessionId);
+        }
+        if (typeof refresh === "function") await refresh();
+        const archivedSessionIds = [...workspaces.list?.getSnapshot?.()?.archivedSessionIds ?? []];
+        return {
+          archivedSessionIds,
+          archivedSessionIdsAdded: archivedSessionIds.filter((id) => !before.has(id))
+        };
+      }
+      async function unarchiveSessionsViaOfficial(workspaces, sessionIds, refresh, unarchive) {
+        const before = new Set(workspaces.list?.getSnapshot?.()?.archivedSessionIds ?? []);
+        const seen = /* @__PURE__ */ new Set();
+        const run = typeof unarchive === "function" ? unarchive : (id) => workspaces.unarchiveSession(id);
+        let archivedSessionIds;
+        for (const sessionId of sessionIds) {
+          if (typeof sessionId !== "string" || sessionId.length === 0 || seen.has(sessionId)) continue;
+          seen.add(sessionId);
+          const value = await run(sessionId);
+          if (Array.isArray(value?.archivedSessionIds)) archivedSessionIds = [...value.archivedSessionIds];
+        }
+        if (typeof refresh === "function") await refresh();
+        archivedSessionIds ??= [...workspaces.list?.getSnapshot?.()?.archivedSessionIds ?? []];
+        return {
+          archivedSessionIds,
+          unarchivedSessionIds: [...before].filter((id) => !archivedSessionIds.includes(id))
+        };
       }
       async function apply(ctx) {
+        applyWorkspaceBrowser(ctx);
         const remote = ctx.get("remote");
         let disposeRemote = () => {
         };
         if (remote !== void 0) disposeRemote = await remote.$mount(ARCHIVE_MANAGER_REMOTE);
-        applyWorkspaceBrowser(ctx);
         return async () => {
           await disposeRemote();
         };
@@ -3950,13 +4003,24 @@
         const uiWorkspaceAt = () => ctx.get("uiWorkspace");
         const archiveViewState = {};
         let archiveNavigation;
-        ctx.effect(() => {
-          archiveNavigation = allowArchivedNavigation(uiWorkspaceAt(), ctx.sessions, ctx.workspaces, {
-            onOpened: () => ctx.get("layout")?.selectPanel(null)
+        const attachArchiveNavigation = (navigation) => {
+          archiveNavigation = allowArchivedNavigation(navigation, ctx.sessions, ctx.workspaces, {
+            onOpened: () => ctx.get("layout")?.selectPanel(null),
+            beginNavigation: () => ctx.get("layout")?.beginNavigation?.()
           });
           return () => archiveNavigation.dispose();
-        }, "archive-manager: explicit archived navigation");
-        const openConversation = (sessionId) => archiveNavigation.open(sessionId);
+        };
+        if (typeof ctx.inject === "function") ctx.inject(["uiWorkspace"], (ready) => attachArchiveNavigation(ready.uiWorkspace ?? uiWorkspaceAt()));
+        else ctx.effect(() => attachArchiveNavigation(uiWorkspaceAt()), "archive-manager: explicit archived navigation");
+        const openConversation = (sessionId) => {
+          if (archiveNavigation === void 0) throw new ArchiveNavigationError("navigationUnavailable");
+          sidebarReveal.request(sessionId);
+          return archiveNavigation.open(sessionId);
+        };
+        const focusSessionWorkspace = async (sessionId) => {
+          ctx.get("layout")?.beginNavigation?.();
+          sidebarReveal.request(sessionId);
+        };
         const searchSessions = async (query, signal) => {
           const result = await ctx.sessions.search(query, signal);
           if (!result.ok) throw new Error(result.error.message);
@@ -3975,17 +4039,16 @@
             console.warn("archive-manager: restored archived sessions but session list refresh failed:", error);
           }
         };
+        const unarchiveOne = createUnarchiveSession(ctx.workspaces, () => ctx.get("remote.workspaceRegistry"));
         const unarchiveSession = async (sessionId) => {
-          const registry = ctx.get("remote.workspaceRegistry");
-          if (registry === void 0) throw new Error("archive-manager remote service is unavailable");
-          const result = await registry.unarchiveSession(sessionId);
-          if (!result.ok) throw new Error(result.error.message);
+          await unarchiveOne(sessionId);
           await refreshSessionList();
         };
         const archiveWorkspaceSessions = async (workspaceId) => {
-          const registry = ctx.get("remote.workspaceRegistry");
-          if (registry === void 0) throw new Error("archive-manager remote service is unavailable");
-          return archiveWorkspaceSessionsAndRefresh(registry, workspaceId, refreshSessionList);
+          const items = ctx.workspaces.list?.getSnapshot?.()?.items ?? [];
+          const workspace = items.find((item) => item.workspaceId === workspaceId);
+          if (workspace === void 0) throw new Error(`unknown workspace "${workspaceId}"`);
+          return archiveSessionsViaOfficial(ctx.workspaces, workspace.sessionIds, refreshSessionList);
         };
         const deleteSession = async (sessionId) => {
           const registry = ctx.get("remote.workspaceRegistry");
@@ -3994,21 +4057,11 @@
           if (!result.ok) throw new Error(result.error.message);
           await refreshSessionList();
         };
-        const archiveSessions = async (sessionIds) => {
-          const registry = ctx.get("remote.workspaceRegistry");
-          if (registry === void 0) throw new Error("archive-manager remote service is unavailable");
-          const result = await registry.archiveSessions(sessionIds);
-          if (!result.ok) throw new Error(result.error.message);
-          await refreshSessionList();
-          return result.value;
-        };
+        const archiveSessions = async (sessionIds) => archiveSessionsViaOfficial(ctx.workspaces, sessionIds, refreshSessionList);
         const unarchiveSessions = async (target) => {
-          const registry = ctx.get("remote.workspaceRegistry");
-          if (registry === void 0) throw new Error("archive-manager remote service is unavailable");
-          const result = await registry.unarchiveSessions(target);
-          if (!result.ok) throw new Error(result.error.message);
-          await refreshSessionList();
-          return result.value;
+          const snapshot = ctx.workspaces.list?.getSnapshot?.() ?? { archivedSessionIds: [], items: [] };
+          const sessionIds = deriveArchivedBatchIds(snapshot.archivedSessionIds, snapshot.items, target);
+          return unarchiveSessionsViaOfficial(ctx.workspaces, sessionIds, refreshSessionList, unarchiveOne);
         };
         const deleteArchivedSessions = async (target) => {
           const registry = ctx.get("remote.workspaceRegistry");
@@ -4079,18 +4132,28 @@
           createWorkspace: (input) => ctx.workspaces.create(input),
           hooks: { directoryFlow: browserFlowSource }
         });
-        ctx.slots.inject("sidebar.workspaces", () => ctx.slots.register({
-          name: "sidebar.workspaces",
-          // 显示顺序：Codex UI（-1）→ 归档（-0.5）→ 官方默认（0）。
-          priority: -0.5,
-          children: { [DIRECTORY_FLOW_SLOT]: {
-            kind: "single",
-            scope: "root"
-          } },
-          store: createWorkspaceViewStore(),
-          inject: browserInjected,
-          locale: NS
-        }, WorkspaceBrowser));
+        ctx.slots.inject("sidebar.workspaces", () => {
+          const common = {
+            name: "sidebar.workspaces",
+            // 低于官方 0，高于 Codex -1：必须盖住官方三项菜单才能露出删除。
+            priority: -0.5,
+            store: createWorkspaceViewStore(),
+            inject: browserInjected,
+            locale: NS
+          };
+          try {
+            return ctx.slots.register({
+              ...common,
+              children: { [DIRECTORY_FLOW_SLOT]: {
+                kind: "single",
+                scope: "root"
+              } }
+            }, WorkspaceBrowser);
+          } catch (error) {
+            console.warn("archive-manager: sidebar registration with directory child failed, retrying without children", error);
+            return ctx.slots.register(common, WorkspaceBrowser);
+          }
+        });
         mirrorDirectoryFlow(ctx, DIRECTORY_FLOW_SLOT);
         ctx.slots.inject("settings.section", () => ctx.slots.register({
           name: "settings.section",
@@ -4109,6 +4172,7 @@
             deleteArchivedSessions,
             archivedSessionMetadata,
             openConversation,
+            focusSessionWorkspace,
             viewState: archiveViewState,
             t: ctx.locale.bind(NS)
           })
@@ -4136,8 +4200,13 @@
         archiveableWorkspaceSessionCount,
         archiveWorkspaceDialogTarget,
         archiveWorkspaceDialogFailureState,
-        archiveWorkspaceSessionsAndRefresh,
+        archiveSessionsViaOfficial,
+        unarchiveSessionsViaOfficial,
+        createUnarchiveSession,
         createWorkspaceViewStore,
+        migrateWorkspaceViewPersist,
+        WORKSPACE_VIEW_PERSIST_KEY,
+        LEGACY_WORKSPACE_VIEW_PERSIST_KEY,
         bindObservable,
         hasSplitClientStore,
         groupByWorkspace,