@huanlin/dsh-plugin-ya-workspace-sidebar 0.8.0 → 0.9.0

package/lib/client.js

@@ -1203,7 +1203,45 @@ window.__ModuleLoader__.load({
 		* pre-split client runtime: reuse-or-create Workspace connection, the
 		* explicit/current/recent New Session fallback, archived-current clearing,
 		* boot auto-selection, and the directory-picking wire calls.
+		*
+		* dsh 0.1.7-rc.1 moved the Session selection out of the Session Controller
+		* (`SessionListState.current` / `ISessions.open` / `ISessions.clear` are gone)
+		* into this service: a retained `mainReference` plus a persisted selection
+		* store (`dsh.sessions.current`). This port mirrors the shipped
+		* `UiWorkspaceService` selection mechanics.
 		*/
+		/** Persisted selection store (the official `dsh.sessions.current` key). */
+		var SelectionStore = class {
+			key;
+			listeners = /* @__PURE__ */ new Set();
+			value;
+			constructor(key = "dsh.sessions.current") {
+				this.key = key;
+				this.value = this.read();
+			}
+			getSnapshot = () => this.value;
+			subscribe = (listener) => {
+				this.listeners.add(listener);
+				return () => {
+					this.listeners.delete(listener);
+				};
+			};
+			set = (value) => {
+				this.value = value;
+				try {
+					globalThis.localStorage?.setItem(this.key, JSON.stringify(value));
+				} catch {}
+				for (const listener of [...this.listeners]) listener();
+			};
+			read() {
+				try {
+					const raw = globalThis.localStorage?.getItem(this.key);
+					return raw === null || raw === void 0 ? {} : JSON.parse(raw);
+				} catch {
+					return {};
+				}
+			}
+		};
 		/** Implements Workspace navigation and directory UI operations. */
 		var YaWorkspaceNavigation = class extends _deepseek_ai_cordis.Service {
 			directoryPicker;
@@ -1211,6 +1249,8 @@ window.__ModuleLoader__.load({
 			sessions;
 			connecting = /* @__PURE__ */ new Map();
 			lifetime = new AbortController();
+			selection = new SelectionStore();
+			mainReference;
 			/**
 			* @param ctx - Client root Context.
 			* @param directoryPicker - the directory-picking Remote namespace.
@@ -1224,61 +1264,95 @@ window.__ModuleLoader__.load({
 				this.sessions = sessions;
 				ctx.effect(() => this.watchNavigation(), "ya-workspace-sidebar: Workspace navigation policy");
 			}
+			/** The Session currently shown in the main view, or undefined. */
+			get currentSessionId() {
+				return this.mainReference?.sessionId;
+			}
+			/** Observe the current selection (the sidebar's blank-row filter and highlight). */
+			subscribeSelection(listener) {
+				return this.selection.subscribe(listener);
+			}
 			async connectWorkspace(workspaceId) {
 				const workspace = this.workspaces.list.getSnapshot().items.find((item) => item.workspaceId === workspaceId);
 				if (workspace === void 0) throw new Error(`ya-workspace-sidebar: unknown workspace "${workspaceId}"`);
 				const inflight = this.connecting.get(workspaceId);
 				if (inflight !== void 0) return inflight;
+				const attempt = this.reuseOrCreateBlank(workspace).finally(() => {
+					this.connecting.delete(workspaceId);
+				});
+				this.connecting.set(workspaceId, attempt);
+				return attempt;
+			}
+			reuseOrCreateBlank(workspace) {
 				const archived = this.workspaces.list.getSnapshot().archivedSessionIds;
 				const sessions = this.sessions.list.getSnapshot();
 				for (const id of sessions.ids) {
 					const summary = sessions.byId[id];
-					if (summary !== void 0 && summary.blank && summary.cwd === workspace.path && workspace.sessionIds.includes(summary.id) && !archived.includes(summary.id)) return summary.id;
+					if (summary === void 0 || !summary.blank || summary.cwd !== workspace.path || !workspace.sessionIds.includes(id) || archived.includes(id)) continue;
+					return this.reuseBlank(workspace.workspaceId, id);
 				}
-				const attempt = this.sessions.create({ workspaceId }).finally(() => {
-					this.connecting.delete(workspaceId);
-				});
-				this.connecting.set(workspaceId, attempt);
-				return attempt;
+				return this.sessions.create({ workspaceId: workspace.workspaceId });
 			}
-			openSession(sessionId) {
-				this.sessions.open(sessionId);
-				this.ctx.layout.selectPanel(null);
+			async reuseBlank(workspaceId, sessionId) {
+				try {
+					return await this.sessions.create({
+						workspaceId,
+						sessionId
+					});
+				} catch (error) {
+					if (!(error instanceof Error) || error.name !== "SessionCreateError") throw error;
+					if (error.rpcError?.code !== "session/writer-held") throw error;
+					return this.sessions.create({ workspaceId });
+				}
+			}
+			openSession(target) {
+				this.replaceMain(target, this.lifetime.signal, "reveal");
 			}
 			async openWorkspace(workspaceId, beforeOpen) {
 				const navigation = AbortSignal.any([this.ctx.layout.beginNavigation(), this.lifetime.signal]);
-				const isCurrent = () => !navigation.aborted;
-				const sessionId = await this.connectWorkspace(workspaceId);
-				if (!isCurrent()) return;
-				beforeOpen?.(sessionId);
-				if (isCurrent()) this.openSession(sessionId);
+				let sessionId;
+				try {
+					sessionId = await this.connectWorkspace(workspaceId);
+				} catch (error) {
+					if (!navigation.aborted) console.warn("ya-workspace-sidebar: workspace open failed:", error);
+					throw error;
+				}
+				if (navigation.aborted) return;
+				this.replaceMain(sessionId, navigation, "reveal", beforeOpen);
 			}
 			async forkSession(sessionId) {
-				const navigation = AbortSignal.any([this.ctx.layout.beginNavigation(), this.lifetime.signal]);
-				const childId = await this.sessions.fork({
+				await this.sessions.fork({
 					sessionId,
 					increaseTitle: true
 				});
-				if (!navigation.aborted) this.openSession(childId);
 			}
 			startSession(workspaceId) {
 				const workspaces = this.workspaces.list.getSnapshot();
 				const sessions = this.sessions.list.getSnapshot();
-				const current = sessions.current;
+				const current = this.mainReference?.sessionId;
 				const currentWorkspaceId = current === void 0 ? void 0 : workspaces.items.find((item) => item.sessionIds.includes(current))?.workspaceId;
 				const recent = workspaces.phase === "ready" && sessions.phase === "ready" ? recentWorkspace(workspaces.items, sessions.byId) : void 0;
 				const target = workspaceId ?? currentWorkspaceId ?? recent;
 				if (target === void 0) {
-					this.sessions.clear();
-					this.ctx.layout.selectPanel(null);
+					this.clearMain();
 					return;
 				}
 				this.openWorkspace(target).then(() => {}, (reason) => {
 					console.warn("ya-workspace-sidebar: new session failed:", reason);
 				});
 			}
-			async archiveSession(sessionId) {
-				await this.workspaces.archiveSession(sessionId);
+			async archiveSession(sessionId, options = {}) {
+				await this.workspaces.archiveSession(sessionId, options);
+				if (this.mainReference?.sessionId === sessionId) this.clearMain();
+			}
+			async unarchiveSession(sessionId) {
+				await this.workspaces.unarchiveSession(sessionId);
+			}
+			async pinSession(sessionId) {
+				await this.workspaces.pinSession(sessionId);
+			}
+			async unpinSession(sessionId) {
+				await this.workspaces.unpinSession(sessionId);
 			}
 			async pickDirectory() {
 				const result = await this.directoryPicker.pick();
@@ -1304,24 +1378,17 @@ window.__ModuleLoader__.load({
 					const workspaces = this.workspaces.list.getSnapshot();
 					const sessions = this.sessions.list.getSnapshot();
 					if (workspaces.phase !== "ready" || sessions.phase !== "ready") return;
-					if (sessions.current !== void 0) {
-						initial = "done";
-						return;
-					}
-					const target = recentWorkspace(workspaces.items, sessions.byId);
-					if (target === void 0) {
+					if (this.mainReference !== void 0) {
 						initial = "done";
 						return;
 					}
 					initial = "connecting";
-					this.connectWorkspace(target).then((sessionId) => {
-						if (this.lifetime.signal.aborted) return;
-						if (this.sessions.list.getSnapshot().current === void 0) this.sessions.open(sessionId);
+					this.restoreSelection(workspaces, sessions).then(() => {
 						initial = "done";
 					}, (reason) => {
 						if (this.lifetime.signal.aborted) return;
 						initial = "waiting";
-						console.warn("ya-workspace-sidebar: initial workspace selection failed:", reason);
+						console.warn("ya-workspace-sidebar: initial Session restoration failed:", reason);
 					});
 				};
 				const disposeWorkspaces = this.workspaces.list.subscribe(reconcile);
@@ -1333,13 +1400,63 @@ window.__ModuleLoader__.load({
 					disposeWorkspaces();
 				};
 			}
+			async restoreSelection(workspaces, sessions) {
+				const saved = this.selection.getSnapshot();
+				if (saved.subagentAddress !== void 0) {
+					this.replaceMain(saved.subagentAddress, this.lifetime.signal, "preserve");
+					return;
+				}
+				const summary = saved.sessionId === void 0 ? void 0 : sessions.byId[saved.sessionId];
+				const workspace = summary === void 0 ? void 0 : workspaces.items.find((item) => item.sessionIds.includes(summary.id));
+				if (summary !== void 0 && (!summary.blank || workspace === void 0)) {
+					this.replaceMain(summary.id, this.lifetime.signal, "preserve");
+					return;
+				}
+				const navigation = AbortSignal.any([this.ctx.layout.beginNavigation(), this.lifetime.signal]);
+				let sessionId;
+				if (summary !== void 0 && workspace !== void 0 && summary.cwd === workspace.path && !workspaces.archivedSessionIds.includes(summary.id)) sessionId = await this.reuseBlank(workspace.workspaceId, summary.id);
+				const target = workspace?.workspaceId ?? recentWorkspace(workspaces.items, sessions.byId);
+				if (sessionId === void 0 && target !== void 0) sessionId = await this.connectWorkspace(target);
+				if (sessionId !== void 0 && !navigation.aborted) this.replaceMain(sessionId, navigation, "preserve");
+			}
 			/** @returns true when an archived current selection was cleared. */
 			clearArchivedCurrent() {
-				const current = this.sessions.list.getSnapshot().current;
+				const current = this.mainReference?.sessionId;
 				if (current === void 0 || !this.workspaces.list.getSnapshot().archivedSessionIds.includes(current)) return false;
-				this.sessions.clear();
+				this.clearMain();
 				return true;
 			}
+			clearMain() {
+				const previous = this.mainReference;
+				this.mainReference = void 0;
+				this.selection.set({});
+				previous?.release();
+				this.ctx.layout.selectPanel(null);
+			}
+			replaceMain(target, signal, panel, beforeOpen) {
+				signal.throwIfAborted();
+				const reference = this.sessions.retain(target, { source: "mainView" });
+				try {
+					signal.throwIfAborted();
+					beforeOpen?.(reference.sessionId);
+					if (signal.aborted) {
+						reference.release();
+						return;
+					}
+					const subagentAddress = typeof target === "string" ? this.sessions.subagentAddress(reference.sessionId) : target;
+					this.selection.set({
+						sessionId: reference.sessionId,
+						...subagentAddress === void 0 ? {} : { subagentAddress }
+					});
+				} catch (error) {
+					reference.release();
+					throw error;
+				}
+				const previous = this.mainReference;
+				this.mainReference = reference;
+				previous?.release();
+				if (panel === "reveal") this.ctx.layout.selectPanel(null);
+			}
 		};
 		/** Stable tie-breaking follows Host Workspace order. */
 		function recentWorkspace(workspaces, sessions) {
@@ -1464,14 +1581,14 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 			const addEntries = flowAvailable ? [{
 				id: ADD,
 				label: t("addWorkspaceMenu"),
-				icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, { size: 16 }),
+				icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutlineRegular, { size: 16 }),
 				disabled: flowOpen || busy
 			}] : [];
 			const pinnedAdd = !addOnly && snapshot.items.length > 0;
 			const items = pinnedAdd ? snapshot.items.map((workspace) => ({
 				id: workspace.workspaceId,
 				label: workspace.title,
-				icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderClose16, { size: 16 }),
+				icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderCloseRegular, { size: 16 }),
 				disabled: flowOpen || busy
 			})) : addEntries;
 			const settled = addOnly || snapshot.phase === "ready";
@@ -1575,7 +1692,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 		//#region src/client/model.ts
 		/** Resolve the visible status-dot kind for one session, if any. */
 		function pendingKindOf(pending, id) {
-			const kind = pending.get(id)?.kind;
+			const kind = pending.get(id)?.pendingInteraction?.kind;
 			return kind === "approval" || kind === "plan-review" || kind === "question" ? kind : void 0;
 		}
 		/** Navigation key for sessions not accounted to a real workspace. */
@@ -1591,7 +1708,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 				blank: summary.blank,
 				running: summary.running,
 				...pendingInteraction === void 0 ? {} : { pendingInteraction },
-				completed: summary.completed === true,
+				completed: pending.get(summary.id)?.completionUnread === true,
 				updatedAt: summary.updatedAt,
 				workspaceKey,
 				workspaceTitle,
@@ -2122,7 +2239,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 			const title = row.blank ? t("newSession") : row.title;
 			const isDelete = actionMode === "delete";
 			const actionLabel = isDelete ? t("deleteSession") : t("archive");
-			const actionIcon = isDelete ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, {}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconArchiveOutline20, { size: 16 });
+			const actionIcon = isDelete ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutlineRegular, {}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconArchiveOutlineRegular, { size: 16 });
 			const hasCwd = row.cwd !== void 0;
 			const pathsKnown = paths !== void 0;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -2183,17 +2300,17 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 								{
 									id: "rename",
 									label: t("rename"),
-									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, {})
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutlineRegular, {})
 								},
 								{
 									id: "fork",
 									label: t("fork"),
-									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutline16, {})
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutlineRegular, {})
 								},
 								{
 									id: "unread",
 									label: unread ? t("markRead") : t("markUnread"),
-									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconClockOutline16, {})
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconClockOutlineRegular, {})
 								},
 								{
 									type: "separator",
@@ -2202,31 +2319,31 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 								{
 									id: "reveal",
 									label: t("revealInExplorer"),
-									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutline16, {}),
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutlineRegular, {}),
 									disabled: !hasCwd
 								},
 								{
 									id: "copy-path",
 									label: t("copyPath"),
-									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutline16, {}),
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutlineRegular, {}),
 									disabled: !hasCwd
 								},
 								{
 									id: "copy-dir",
 									label: t("copySessionDir"),
-									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutline16, {}),
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutlineRegular, {}),
 									disabled: !pathsKnown || paths?.dir == null
 								},
 								{
 									id: "copy-log",
 									label: t("copyLogPath"),
-									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutline16, {}),
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutlineRegular, {}),
 									disabled: !pathsKnown || paths?.log == null
 								},
 								{
 									id: "copy-id",
 									label: t("copySessionId"),
-									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconLinkOutline16, {})
+									icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconLinkOutlineRegular, {})
 								},
 								{
 									type: "separator",
@@ -2292,7 +2409,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 									onOpenMenu(row);
 									setMenuOpenButton((value) => !value);
 								},
-								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEllipsisOutline16, {})
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEllipsisOutlineRegular, {})
 							})
 						})
 					})
@@ -2318,7 +2435,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						className: "ya-status-slot",
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderClose16, {})
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderCloseRegular, {})
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 						className: "ya-row-main",
@@ -2336,7 +2453,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 							children: row.path
 						})]
 					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutline14, {}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutlineMedium, {}),
 					row.real && menuAt !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Menu, {
 						open: true,
 						onClose: () => {
@@ -2346,7 +2463,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 							{
 								id: "create",
 								label: t("newSession"),
-								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, {})
+								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutlineRegular, {})
 							},
 							{
 								type: "separator",
@@ -2355,13 +2472,13 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 							{
 								id: "reveal",
 								label: t("revealInExplorer"),
-								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutline16, {}),
+								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutlineRegular, {}),
 								disabled: !hasPath
 							},
 							{
 								id: "copy-path",
 								label: t("copyPath"),
-								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutline16, {}),
+								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutlineRegular, {}),
 								disabled: !hasPath
 							},
 							{
@@ -2371,12 +2488,12 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 							{
 								id: "rename",
 								label: t("rename"),
-								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, {})
+								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutlineRegular, {})
 							},
 							{
 								id: "delete",
 								label: t("deleteWorkspace"),
-								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, {}),
+								icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutlineRegular, {}),
 								danger: true
 							}
 						],
@@ -2403,12 +2520,17 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 		}
 		/** Fill `sidebar.workspaces` with the replacement browser. */
 		function WorkspaceSidebar(props) {
-			const { wide, expandSidebar, useSessions, useSessionPendingInteraction, useWorkspaces, startSession, open, searchSessions, searchResultLimit, renameSession, forkSession, renameWorkspace, deleteWorkspace, archiveSession, createWorkspace, useDirectoryFlow, renderSlot, t, resolveSessionPaths, revealInExplorer } = props;
+			const { wide, expandSidebar, useSessions, useSessionStatus, useCurrentSession, useWorkspaces, startSession, open, searchSessions, searchResultLimit, renameSession, forkSession, renameWorkspace, deleteWorkspace, archiveSession, createWorkspace, useDirectoryFlow, renderSlot, t, resolveSessionPaths, revealInExplorer } = props;
 			const sessions = useSessions((state) => state);
+			const current = useCurrentSession((value) => value);
+			const sessionsView = (0, react.useMemo)(() => ({
+				...sessions,
+				current
+			}), [sessions, current]);
 			const workspaceState = useWorkspaces((state) => state);
 			const workspaces = workspaceState.items;
 			const archived = workspaceState.archivedSessionIds;
-			const pendingInteractions = useSessionPendingInteraction((state) => state);
+			const pendingInteractions = useSessionStatus((state) => state);
 			const directoryFlowAvailable = useDirectoryFlow((value) => value);
 			const [pinnedOrder, setPinnedOrder] = (0, react.useState)(() => getPinnedOrder());
 			const [unreadSet, setUnreadSet] = (0, react.useState)(() => getUnread());
@@ -2434,16 +2556,16 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 					setPathsTick((tick) => tick + 1);
 				}).catch(() => {});
 			};
-			const allRows = (0, react.useMemo)(() => deriveRecent(sessions, workspaces, archived, pendingInteractions, Number.MAX_SAFE_INTEGER), [
+			const allRows = (0, react.useMemo)(() => deriveRecent(sessionsView, workspaces, archived, pendingInteractions, Number.MAX_SAFE_INTEGER), [
 				archived,
 				pendingInteractions,
-				sessions,
+				sessionsView,
 				workspaces
 			]);
 			const recent = (0, react.useMemo)(() => applyPinned(allRows, pinnedOrder), [allRows, pinnedOrder]);
-			const workspaceRows = (0, react.useMemo)(() => deriveWorkspaces(sessions, workspaces, archived), [
+			const workspaceRows = (0, react.useMemo)(() => deriveWorkspaces(sessionsView, workspaces, archived), [
 				archived,
-				sessions,
+				sessionsView,
 				workspaces
 			]);
 			const now = Date.now();
@@ -2457,31 +2579,31 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 			const observedCurrent = (0, react.useRef)(void 0);
 			const initialized = (0, react.useRef)(false);
 			(0, react.useEffect)(() => {
-				if (initialized.current && observedCurrent.current === sessions.current) return;
+				if (initialized.current && observedCurrent.current === current) return;
 				initialized.current = true;
-				observedCurrent.current = sessions.current;
-				if (sessions.current !== void 0) {
+				observedCurrent.current = current;
+				if (current !== void 0) {
 					setDirection("forward");
-					setSelectedKey(workspaceKeyForSession(sessions.current, workspaces));
+					setSelectedKey(workspaceKeyForSession(current, workspaces));
 				}
-			}, [sessions.current, workspaces]);
+			}, [current, workspaces]);
 			(0, react.useEffect)(() => {
 				if (selectedKey !== null && selectedKey !== "__ya_ungrouped__" && !workspaces.some((workspace) => workspace.workspaceId === selectedKey)) setSelectedKey(UNGROUPED);
 			}, [selectedKey, workspaces]);
 			const selectedWorkspace = selectedKey === null || selectedKey === "__ya_ungrouped__" ? void 0 : workspaces.find((workspace) => workspace.workspaceId === selectedKey);
-			const levelGroups = (0, react.useMemo)(() => selectedKey !== null && selectedKey !== "__ya_ungrouped__" ? deriveWorkspaceSessionGroups(selectedKey, sessions, workspaces, archived, pendingInteractions, now) : [], [
+			const levelGroups = (0, react.useMemo)(() => selectedKey !== null && selectedKey !== "__ya_ungrouped__" ? deriveWorkspaceSessionGroups(selectedKey, sessionsView, workspaces, archived, pendingInteractions, now) : [], [
 				archived,
 				pendingInteractions,
-				sessions,
+				sessionsView,
 				workspaces,
 				selectedKey,
 				now
 			]);
 			const levelPinned = (0, react.useMemo)(() => extractPinnedGroups(levelGroups, pinnedOrder), [levelGroups, pinnedOrder]);
-			const levelRows = (0, react.useMemo)(() => applyPinned(selectedKey === "__ya_ungrouped__" ? deriveWorkspaceSessions(UNGROUPED, sessions, workspaces, archived, pendingInteractions) : [], pinnedOrder), [
+			const levelRows = (0, react.useMemo)(() => applyPinned(selectedKey === "__ya_ungrouped__" ? deriveWorkspaceSessions(UNGROUPED, sessionsView, workspaces, archived, pendingInteractions) : [], pinnedOrder), [
 				archived,
 				pendingInteractions,
-				sessions,
+				sessionsView,
 				workspaces,
 				selectedKey,
 				pinnedOrder
@@ -2736,7 +2858,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 			};
 			const sessionItem = (row, context = false) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SessionItem, {
 				row,
-				current: sessions.current,
+				current,
 				now,
 				open: openRow,
 				rename: beginSessionRename,
@@ -2773,7 +2895,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 									event.stopPropagation();
 									toggleActionMode();
 								},
-								children: actionMode === "delete" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, { size: wide ? 16 : 18 }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconArchiveOutline20, { size: wide ? 16 : 18 })
+								children: actionMode === "delete" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutlineRegular, { size: wide ? 16 : 18 }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconArchiveOutlineRegular, { size: wide ? 16 : 18 })
 							}),
 							directoryFlowAvailable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 								ref: pickerAnchor,
@@ -2783,7 +2905,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 								onClick: () => {
 									setPickerOpen((value) => !value);
 								},
-								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconProjectAddOutline16, { size: wide ? 16 : 18 })
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconProjectAddOutlineRegular, { size: wide ? 16 : 18 })
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(WorkspacePickFlow, {
 								t,
@@ -2815,7 +2937,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 								type: "button",
 								className: "ya-search-icon",
 								"aria-label": t("search"),
-								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutline16, { size: wide ? 14 : 18 })
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutlineRegular, { size: wide ? 14 : 18 })
 							}),
 							wide && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 								className: "ya-search-input",
@@ -2833,7 +2955,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 								onClick: () => {
 									setQuery("");
 								},
-								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseFill14, {})
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseFillMedium, {})
 							})
 						]
 					}),
@@ -2874,7 +2996,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 											event.stopPropagation();
 											setRecentCollapsed((value) => !value);
 										},
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutline14, {})
+										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutlineMedium, {})
 									})]
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 									className: "ya-recent-list-wrap",
@@ -2923,7 +3045,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 										},
 										children: t("workspaces")
 									}),
-									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutline14, {}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronRightOutlineMedium, {}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 										className: "ya-crumb",
 										children: selectedKey === "__ya_ungrouped__" ? t("ungrouped") : selectedWorkspace?.title
@@ -2935,7 +3057,7 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 										onClick: () => {
 											startSession(selectedKey);
 										},
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, {})
+										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutlineRegular, {})
 									})
 								] })
 							}),
@@ -3131,6 +3253,10 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 			const createWorkspace = (input) => ctx.workspaces.create(input);
 			const navigation = new YaWorkspaceNavigation(ctx, ctx.remote.directoryPicker, ctx.workspaces, ctx.sessions);
 			ctx.slots.provideRoot({ hooks: { workspaces: ctx.workspaces.list } });
+			const currentSession = {
+				getSnapshot: () => navigation.currentSessionId,
+				subscribe: (listener) => navigation.subscribeSelection(listener)
+			};
 			const searchSessions = async (query, signal) => {
 				const result = await ctx.sessions.search(query, signal);
 				if (!result.ok) throw new Error(result.error.message);
@@ -3197,7 +3323,10 @@ button.ya-crumb:hover { background:var(--dsw-alias-interactive-bg-hover); color:
 						console.warn("reveal request rejected:", reason);
 					}
 				},
-				hooks: { directoryFlow: sidebarFlow }
+				hooks: {
+					directoryFlow: sidebarFlow,
+					currentSession
+				}
 			});
 			const pickerInjected = () => ({
 				createWorkspace,