@deepseek-ai/dsh-client-ui-workspace 0.1.5-rc.2 → 0.1.6-alpha.2

package/lib/client.js

@@ -28,6 +28,8 @@ window.__ModuleLoader__.load({
 			sessions;
 			connecting = /* @__PURE__ */ new Map();
 			lifetime = new AbortController();
+			selection = (0, _deepseek_ai_dsh_client_store.createSnapshotStore)({}, { persist: { name: "dsh.sessions.current" } });
+			mainReference;
 			/**
 			* @param ctx - Client root Context.
 			* @param directoryPicker - the directory-picking Remote namespace.
@@ -39,7 +41,16 @@ window.__ModuleLoader__.load({
 				this.directoryPicker = directoryPicker;
 				this.workspaces = workspaces;
 				this.sessions = sessions;
-				ctx.effect(() => this.watchNavigation(), "ui-workspace: Workspace navigation policy");
+				ctx.effect(() => {
+					const stop = this.watchNavigation();
+					return () => {
+						stop();
+						this.lifetime.abort();
+						const reference = this.mainReference;
+						this.mainReference = void 0;
+						reference?.release();
+					};
+				}, "ui-workspace: Workspace navigation policy");
 			}
 			async connectWorkspace(workspaceId) {
 				const workspace = this.workspaces.list.getSnapshot().items.find((item) => item.workspaceId === workspaceId);
@@ -58,17 +69,14 @@ window.__ModuleLoader__.load({
 				this.connecting.set(workspaceId, attempt);
 				return attempt;
 			}
-			openSession(sessionId) {
-				this.sessions.open(sessionId);
-				this.ctx.layout.selectPanel(null);
+			openSession(target) {
+				this.replaceMain(target, this.lifetime.signal);
 			}
 			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);
+				if (navigation.aborted) return;
+				this.replaceMain(sessionId, navigation, beforeOpen);
 			}
 			async forkSession(sessionId) {
 				const navigation = AbortSignal.any([this.ctx.layout.beginNavigation(), this.lifetime.signal]);
@@ -76,18 +84,17 @@ window.__ModuleLoader__.load({
 					sessionId,
 					increaseTitle: true
 				});
-				if (!navigation.aborted) this.openSession(childId);
+				if (!navigation.aborted) this.replaceMain(childId, navigation);
 			}
 			startSession(workspaceId) {
 				const workspace = 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 : workspace.items.find((item) => item.sessionIds.includes(current))?.workspaceId;
 				const recent = workspace.phase === "ready" && sessions.phase === "ready" ? recentWorkspace(workspace.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).catch((reason) => {
@@ -96,6 +103,10 @@ window.__ModuleLoader__.load({
 			}
 			async archiveSession(sessionId) {
 				await this.workspaces.archiveSession(sessionId);
+				if (this.mainReference?.sessionId === sessionId) this.clearMain();
+			}
+			async unarchiveSession(sessionId) {
+				await this.workspaces.unarchiveSession(sessionId);
 			}
 			async pickDirectory() {
 				const result = await this.directoryPicker.pick();
@@ -121,10 +132,24 @@ window.__ModuleLoader__.load({
 					const workspace = this.workspaces.list.getSnapshot();
 					const sessions = this.sessions.list.getSnapshot();
 					if (workspace.phase !== "ready" || sessions.phase !== "ready") return;
-					if (sessions.current !== void 0) {
+					if (this.mainReference !== void 0) {
 						initial = "done";
 						return;
 					}
+					const saved = this.selection.getSnapshot();
+					const savedTarget = saved.subagentAddress ?? (saved.sessionId !== void 0 && sessions.byId[saved.sessionId] !== void 0 ? saved.sessionId : void 0);
+					if (savedTarget !== void 0) {
+						initial = "connecting";
+						try {
+							if (saved.subagentAddress !== void 0) this.sessions.refreshSubagents(saved.subagentAddress.parentSessionId);
+							this.openSession(savedTarget);
+							initial = "done";
+						} catch (reason) {
+							initial = "waiting";
+							console.warn("initial Session restoration failed:", reason);
+						}
+						return;
+					}
 					const target = recentWorkspace(workspace.items, sessions.byId);
 					if (target === void 0) {
 						initial = "done";
@@ -132,8 +157,8 @@ window.__ModuleLoader__.load({
 					}
 					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);
+						if (this.mainReference === void 0) this.openSession(sessionId);
+					}).then(() => {
 						initial = "done";
 					}, (reason) => {
 						if (this.lifetime.signal.aborted) return;
@@ -152,11 +177,43 @@ window.__ModuleLoader__.load({
 			}
 			/** @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, 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();
+				this.sessions.refreshSubagents(reference.sessionId);
+				this.ctx.layout.selectPanel(null);
+			}
 		};
 		/** Stable tie-breaking follows Host Workspace order. */
 		function recentWorkspace(workspaces, sessions) {
@@ -187,6 +244,10 @@ window.__ModuleLoader__.load({
 		*/
 		/** Browser-local order account for the hierarchy-free flat Session list. */
 		const FLAT_SESSION_ORDER_KEY = "__flat_session_order__";
+		/** Copy read-only projections into the persisted mutable store representation. */
+		function copySessionOrders(orders) {
+			return Object.fromEntries(Object.entries(orders).map(([key, order]) => [key, [...order]]));
+		}
 		/**
 		* Create the workspace browser viewing store handle.
 		* @returns the store handle (spec + type + identity + factory in one).
@@ -197,15 +258,16 @@ window.__ModuleLoader__.load({
 					groupBy: "workspace",
 					orderBy: "updated",
 					groupExpansion: {},
-					sessionOrderByAccount: {},
-					sessionUpdatedAtByAccount: {}
+					sessionOrderByAccount: {}
 				}),
 				persist: "dsh.workspace.view.v5",
 				actions: {
 					setGroupBy: (d, mode) => {
 						d.groupBy = mode;
 					},
-					setOrderBy: (d, mode) => {
+					setOrderBy: (d, mode, initialOrders) => {
+						if (mode === d.orderBy) return;
+						d.sessionOrderByAccount = mode === "manual" ? copySessionOrders(initialOrders) : {};
 						d.orderBy = mode;
 					},
 					setGroupExpanded: (d, key, expanded) => {
@@ -215,14 +277,16 @@ window.__ModuleLoader__.load({
 						const retained = new Set(workspaceKeys);
 						d.groupExpansion = Object.fromEntries(Object.entries(d.groupExpansion).filter(([key]) => retained.has(key)));
 						d.sessionOrderByAccount = Object.fromEntries(Object.entries(d.sessionOrderByAccount).filter(([key]) => retained.has(key)));
-						d.sessionUpdatedAtByAccount = Object.fromEntries(Object.entries(d.sessionUpdatedAtByAccount).filter(([key]) => retained.has(key)));
+						delete d.sessionUpdatedAtByAccount;
 					},
-					syncSessionOrderAccount: (d, accountKey, order, updatedAt) => {
-						d.sessionOrderByAccount[accountKey] = order;
-						d.sessionUpdatedAtByAccount[accountKey] = updatedAt;
+					syncSessionOrders: (d, orders) => {
+						if (d.orderBy !== "manual") return;
+						Object.assign(d.sessionOrderByAccount, copySessionOrders(orders));
 					},
-					setSessionOrder: (d, accountKey, order) => {
-						d.sessionOrderByAccount[accountKey] = order;
+					setSessionOrder: (d, accountKey, order, initialOrders) => {
+						if (d.orderBy === "updated") d.sessionOrderByAccount = copySessionOrders(initialOrders);
+						d.orderBy = "manual";
+						d.sessionOrderByAccount[accountKey] = [...order];
 					}
 				}
 			});
@@ -313,6 +377,9 @@ window.__ModuleLoader__.load({
 		function owningGroupKey(workspaces, sessionId) {
 			return workspaces.find((workspace) => workspace.sessionIds.includes(sessionId))?.workspaceId ?? "";
 		}
+		function mainSessionId(list) {
+			return Object.values(list.byId).find((session) => (session.retainedBy.mainView ?? 0) > 0)?.id;
+		}
 		/**
 		* Directory display label: basename of the path (both separators accepted).
 		* Ungrouped-bucket fallback for surfaces without a workspace title.
@@ -324,10 +391,57 @@ window.__ModuleLoader__.load({
 			const base = workspaceTitleOf(cwd);
 			return base !== "" ? base : cwd;
 		}
-		/** Recency comparator: newest first, id as the deterministic tiebreak (ids are unique per group). */
-		function byRecency(a, b) {
-			if (b.updatedAt !== a.updatedAt) return b.updatedAt - a.updatedAt;
-			return a.id < b.id ? -1 : 1;
+		/**
+		* Project known account members by current Session recency.
+		* @param sessionIds - authoritative account membership.
+		* @param summaries - current Session summaries; members without a summary are omitted until it arrives.
+		* @returns known members newest first, with Session identity as the deterministic tie-break.
+		*/
+		function orderByRecency(sessionIds, summaries) {
+			return sessionIds.flatMap((id) => {
+				const summary = summaries[id];
+				return summary === void 0 ? [] : [{
+					id,
+					updatedAt: summary.updatedAt
+				}];
+			}).sort((a, b) => {
+				if (a.updatedAt !== b.updatedAt) return b.updatedAt - a.updatedAt;
+				return a.id < b.id ? -1 : 1;
+			}).map((member) => member.id);
+		}
+		/**
+		* Reconcile a browser-local manual order with current account membership.
+		* @param memberIds - authoritative account membership.
+		* @param savedOrder - previously saved browser-local order.
+		* @param summaries - current Session summaries used to append newly known members by recency.
+		* @returns retained saved slots followed by newly known members; departed members and unknown new members are omitted.
+		*/
+		function reconcileManualOrder(memberIds, savedOrder, summaries) {
+			const members = new Map(memberIds.map((id) => [id, id]));
+			const included = /* @__PURE__ */ new Set();
+			const ordered = [];
+			for (const key of savedOrder ?? []) {
+				const id = members.get(key);
+				if (id === void 0 || included.has(key)) continue;
+				ordered.push(id);
+				included.add(key);
+			}
+			for (const id of orderByRecency(memberIds, summaries)) {
+				if (included.has(id)) continue;
+				ordered.push(id);
+				included.add(id);
+			}
+			return ordered;
+		}
+		/**
+		* Keep the selected provisional New Session ahead of either base order.
+		* @param order - recency or reconciled manual order.
+		* @param currentBlank - selected blank Session in this account, when present.
+		* @returns a copy with the selected blank first and no duplicate slot.
+		*/
+		function pinCurrentBlank(order, currentBlank) {
+			if (currentBlank === void 0) return [...order];
+			return [currentBlank, ...order.filter((id) => id !== currentBlank)];
 		}
 		/**
 		* Ordinary sessions are visible; among blank sessions, only the current one
@@ -351,42 +465,33 @@ window.__ModuleLoader__.load({
 			return (session.projectionValues?.schedule?.length ?? 0) > 0;
 		}
 		/** Build one group without projecting session lineage into presentation. */
-		function buildGroup(key, workspaceId, cwd, createdAt, label, members, order) {
-			const sessions = [...members];
-			if (order === "recency") sessions.sort(byRecency);
+		function buildGroup(key, workspaceId, cwd, createdAt, label, members) {
 			return {
 				key,
 				workspaceId,
 				cwd,
 				createdAt,
 				label,
-				sessions
+				sessions: [...members]
 			};
 		}
 		/** Apply a stored Ungrouped order and append newly loose Sessions by recency. */
-		function orderedUngrouped(members, stored) {
+		function orderedUngrouped(members, stored, summaries) {
 			const byId = new Map(members.map((session) => [session.id, session]));
-			const included = /* @__PURE__ */ new Set();
-			const ordered = [];
-			for (const key of stored) {
-				const session = byId.get(key);
-				if (session === void 0 || included.has(key)) continue;
-				ordered.push(session);
-				included.add(key);
-			}
-			for (const session of [...members].sort(byRecency)) {
-				if (included.has(session.id)) continue;
-				ordered.push(session);
-			}
-			return ordered;
+			return (stored === void 0 ? orderByRecency(members.map((session) => session.id), summaries) : reconcileManualOrder(members.map((session) => session.id), stored, summaries)).flatMap((id) => {
+				const session = byId.get(id);
+				/* v8 ignore next -- ids are projected exclusively from the members used to build byId. */
+				return session === void 0 ? [] : [session];
+			});
 		}
 		/**
-		* Group Sessions by Host Workspace: one group per entity in stable Host
-		* order, with members resolved from sessionIds in their stored order. Sessions
-		* outside every Workspace trail in the browser-local Ungrouped order, which
-		* falls back to recency before that order is initialized.
+		* Group Sessions by Workspace: one group per caller-ordered entity, with
+		* members resolved from caller-ordered sessionIds. Sessions outside every
+		* Workspace trail in the browser-local Ungrouped order, which falls back to
+		* recency before that order is initialized.
 		*/
 		function groupByWorkspace(list, workspaces, archived, ungroupedOrder) {
+			const current = mainSessionId(list);
 			const groups = [];
 			const accounted = /* @__PURE__ */ new Set();
 			for (const workspace of workspaces) {
@@ -395,13 +500,13 @@ window.__ModuleLoader__.load({
 					const summary = list.byId[id];
 					if (summary === void 0) continue;
 					accounted.add(id);
-					if (!sessionVisible(summary, list.current, archived)) continue;
+					if (!sessionVisible(summary, current, archived)) continue;
 					members.push(summary);
 				}
-				groups.push(buildGroup(workspace.workspaceId, workspace.workspaceId, workspace.path, Date.parse(workspace.createdAt), workspace.title, members, "account"));
+				groups.push(buildGroup(workspace.workspaceId, workspace.workspaceId, workspace.path, Date.parse(workspace.createdAt), workspace.title, members));
 			}
-			const stray = list.ids.map((id) => list.byId[id]).filter((s) => s !== void 0 && !accounted.has(s.id) && sessionVisible(s, list.current, archived));
-			if (stray.length > 0) groups.push(buildGroup("", void 0, void 0, void 0, "", ungroupedOrder === void 0 ? stray : orderedUngrouped(stray, ungroupedOrder), ungroupedOrder === void 0 ? "recency" : "account"));
+			const stray = list.ids.map((id) => list.byId[id]).filter((s) => s !== void 0 && !accounted.has(s.id) && sessionVisible(s, current, archived));
+			if (stray.length > 0) groups.push(buildGroup("", void 0, void 0, void 0, "", orderedUngrouped(stray, ungroupedOrder, list.byId)));
 			return groups;
 		}
 		/** Keep navigation presentation independent from domain-owned interaction objects. */
@@ -413,15 +518,16 @@ window.__ModuleLoader__.load({
 				default: return;
 			}
 		}
-		function sessionNode(s, descendants, pendingInteractions) {
-			const pendingInteraction = visiblePendingKind(pendingInteractions.get(s.id)?.kind);
+		function sessionNode(s, descendants, statuses) {
+			const status = statuses.get(s.id);
+			const pendingInteraction = visiblePendingKind(status?.pendingInteraction?.kind);
 			return {
 				id: s.id,
 				title: sessionTitle(s),
 				blank: s.blank,
-				running: s.running,
+				running: status?.running ?? s.running,
 				runningSubagentCount: descendants.get(s.id)?.runningCount ?? 0,
-				completed: s.completed === true,
+				completed: status?.completionUnread === true,
 				hasActiveSchedule: hasActiveSchedule(s),
 				updatedAt: s.updatedAt,
 				...pendingInteraction === void 0 ? {} : { pendingInteraction }
@@ -435,18 +541,19 @@ window.__ModuleLoader__.load({
 		* provisional New Session row; archived sessions are excluded everywhere.
 		* Content search lives outside this derivation
 		* (see {@link deriveSearchResults}).
-		* @param list - sessions list snapshot (`current` feeds containsCurrent).
-		* @param workspaces - real workspaces in stable Host order.
+		* @param list - sessions list snapshot (`mainView` retention feeds containsCurrent).
+		* @param workspaces - real Workspaces in Host group order with caller-projected Session order.
 		* @param archivedSessionIds - registry-global archive set.
-		* @param pendingInteractions - pending UI interactions by Session.
+		* @param statuses - unified UI status by Session.
 		* @param view - local expansion arrays.
 		* @returns group sections in render order.
 		*/
-		function deriveGroups(list, workspaces, archivedSessionIds, pendingInteractions, view) {
+		function deriveGroups(list, workspaces, archivedSessionIds, statuses, view) {
 			const archived = new Set(archivedSessionIds);
 			const expandedGroups = new Set(view.expandedGroups);
 			const descendants = indexSubagentDescendants(list.byId);
-			const currentGroup = list.current === void 0 ? void 0 : owningGroupKey(workspaces, list.current);
+			const current = mainSessionId(list);
+			const currentGroup = current === void 0 ? void 0 : owningGroupKey(workspaces, current);
 			const groups = [];
 			for (const g of groupByWorkspace(list, workspaces, archived, view.ungroupedOrder)) {
 				const expanded = expandedGroups.has(g.key);
@@ -459,32 +566,35 @@ window.__ModuleLoader__.load({
 					sessionCount: g.sessions.length,
 					expanded,
 					containsCurrent: g.key === currentGroup,
-					sessions: expanded ? g.sessions.map((session) => sessionNode(session, descendants, pendingInteractions)) : []
+					sessions: expanded ? g.sessions.map((session) => sessionNode(session, descendants, statuses)) : []
 				});
 			}
 			return groups;
 		}
 		/**
-		* Derive the flat session list ("In one list" mode): every session — fork
-		* children included — as a top-level row, strictly newest-first. No grouping,
-		* no parent/child adjacency. Content search lives outside this derivation
-		* (see {@link deriveSearchResults}).
+		* Select flat-list members without deriving row presentation or ordering.
 		* @param list - sessions list snapshot.
 		* @param archivedSessionIds - registry-global archive set.
-		* @param pendingInteractions - pending UI interactions by Session.
-		* @returns flat rows in render order.
+		* @returns known visible Session ids in list order, including ordinary forks and only the current blank.
 		*/
-		function deriveFlat(list, archivedSessionIds, pendingInteractions) {
+		function visibleSessionIds(list, archivedSessionIds) {
 			const archived = new Set(archivedSessionIds);
-			const descendants = indexSubagentDescendants(list.byId);
-			const rows = [];
-			for (const id of list.ids) {
+			const current = mainSessionId(list);
+			return list.ids.filter((id) => {
 				const s = list.byId[id];
-				if (s === void 0 || !sessionVisible(s, list.current, archived)) continue;
-				rows.push(s);
-			}
-			rows.sort(byRecency);
-			return rows.map((session) => sessionNode(session, descendants, pendingInteractions));
+				return s !== void 0 && sessionVisible(s, current, archived);
+			});
+		}
+		/**
+		* Derive flat rows from the browser's ordered visible Session ids.
+		* @param list - sessions list snapshot used to select the ids.
+		* @param sessionIds - known visible members in render order, including any pinned blank.
+		* @param statuses - unified UI status by Session.
+		* @returns flat rows in the supplied order with current status indicators.
+		*/
+		function deriveFlat(list, sessionIds, statuses) {
+			const descendants = indexSubagentDescendants(list.byId);
+			return sessionIds.map((id) => sessionNode(list.byId[id], descendants, statuses));
 		}
 		/**
 		* Merge immediate title/Workspace substring matches with ranked Host content
@@ -494,12 +604,12 @@ window.__ModuleLoader__.load({
 		* @param workspaces - Workspace membership and display labels.
 		* @param query - caller text; surrounding whitespace is ignored.
 		* @param archivedSessionIds - registry-global archive set (members never match).
-		* @param pendingInteractions - pending UI interactions by Session.
+		* @param statuses - unified UI status by Session.
 		* @param content - ranked Host content-search page.
 		* @param limit - protocol-owned maximum merged row count.
 		* @returns bounded deduplicated flat rows and a refine-query hint bit.
 		*/
-		function deriveSearchResults(list, workspaces, query, archivedSessionIds, pendingInteractions, content, limit) {
+		function deriveSearchResults(list, workspaces, query, archivedSessionIds, statuses, content, limit) {
 			const q = query.trim().toLowerCase();
 			if (q === "") return {
 				items: [],
@@ -507,6 +617,7 @@ window.__ModuleLoader__.load({
 			};
 			const archived = new Set(archivedSessionIds);
 			const descendants = indexSubagentDescendants(list.byId);
+			const current = mainSessionId(list);
 			const workspaceBySession = /* @__PURE__ */ new Map();
 			for (const workspace of workspaces) for (const sessionId of workspace.sessionIds) if (!workspaceBySession.has(sessionId)) workspaceBySession.set(sessionId, workspace.title);
 			const labelOf = (summary) => workspaceBySession.get(summary.id) ?? workspaceLabel(summary.cwd);
@@ -515,10 +626,11 @@ window.__ModuleLoader__.load({
 			const local = [];
 			for (const id of list.ids) {
 				const summary = list.byId[id];
-				if (summary === void 0 || summary.blank || !sessionVisible(summary, list.current, archived)) continue;
+				if (summary === void 0 || summary.blank || !sessionVisible(summary, current, archived)) continue;
 				if (sessionTitle(summary).toLowerCase().includes(q) || labelOf(summary).toLowerCase().includes(q)) local.push(summary);
 			}
-			local.sort(byRecency);
+			const localById = new Map(local.map((summary) => [summary.id, summary]));
+			const orderedLocal = orderByRecency(local.map((summary) => summary.id), list.byId).map((id) => localById.get(id));
 			const ordered = [];
 			const included = /* @__PURE__ */ new Set();
 			const include = (summary) => {
@@ -526,23 +638,24 @@ window.__ModuleLoader__.load({
 				included.add(summary.id);
 				ordered.push(summary);
 			};
-			for (const summary of local) include(summary);
+			for (const summary of orderedLocal) include(summary);
 			for (const item of content.items) {
 				const summary = list.byId[item.sessionId];
-				if (summary !== void 0 && !summary.blank && sessionVisible(summary, list.current, archived)) include(summary);
+				if (summary !== void 0 && !summary.blank && sessionVisible(summary, current, archived)) include(summary);
 			}
 			return {
 				items: ordered.slice(0, limit).map((summary) => {
 					const match = contentBySession.get(summary.id);
-					const pendingInteraction = visiblePendingKind(pendingInteractions.get(summary.id)?.kind);
+					const status = statuses.get(summary.id);
+					const pendingInteraction = visiblePendingKind(status?.pendingInteraction?.kind);
 					return {
 						id: summary.id,
 						title: sessionTitle(summary),
 						workspace: labelOf(summary),
-						running: summary.running,
+						running: status?.running ?? summary.running,
 						runningSubagentCount: descendants.get(summary.id)?.runningCount ?? 0,
 						...pendingInteraction === void 0 ? {} : { pendingInteraction },
-						completed: summary.completed === true,
+						completed: status?.completionUnread === true,
 						hasActiveSchedule: hasActiveSchedule(summary),
 						...match === void 0 ? {} : { snippet: match.snippet }
 					};
@@ -550,9 +663,33 @@ window.__ModuleLoader__.load({
 				hasMore: content.hasMore || ordered.length > limit
 			};
 		}
+		/** Normalize separators for comparison without interpreting POSIX backslashes as separators. */
+		function folderPath(path) {
+			return (/^[A-Za-z]:[/\\]/.test(path) || path.startsWith("\\\\") ? path.replaceAll("\\", "/") : path).replace(/\/+$/, "");
+		}
+		/**
+		* Find the nearest registered ancestor, excluding the Workspace directory itself.
+		* Paths use Host spelling; matching is case-sensitive, like Workspace identity.
+		* @param path - Workspace directory.
+		* @param parents - registered Workspace directory paths.
+		* @returns the owning parent path, or undefined when no parent contains the Workspace.
+		*/
+		function owningParentFolder(path, parents) {
+			const child = folderPath(path);
+			let owner;
+			let length = -1;
+			for (const parent of parents) {
+				const root = folderPath(parent);
+				if (root.length > length && child !== root && child.startsWith(`${root}/`)) {
+					owner = parent;
+					length = root.length;
+				}
+			}
+			return owner;
+		}
 		//#endregion
 		//#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-workspace/src/client/rows/Rows.module.css.mjs
-		const css$2 = ".YDXeBa_projectRow,.YDXeBa_sessionRow{cursor:pointer;user-select:none;color:var(--dsw-alias-label-primary);border-radius:8px;align-items:center;gap:6px;padding:0 8px;display:flex}.YDXeBa_projectRow:hover,.YDXeBa_sessionRow:hover,.YDXeBa_sessionRow.YDXeBa_selected{background:var(--dsw-alias-interactive-bg-hover)}.YDXeBa_searchResultRow{box-sizing:border-box;cursor:pointer;text-align:left;width:100%;min-height:48px;color:var(--dsw-alias-label-primary);background:0 0;border:none;border-radius:8px;flex-direction:column;align-items:stretch;padding:4px 8px;display:flex}.YDXeBa_searchResultRow:hover,.YDXeBa_searchResultRow.YDXeBa_selected{background:var(--dsw-alias-interactive-bg-hover)}.YDXeBa_searchResultHeading{align-items:center;min-width:0;display:flex}.YDXeBa_searchResultTitle{text-overflow:ellipsis;white-space:nowrap;flex:0 auto;min-width:0;margin-left:4px;font-size:14px;line-height:20px;overflow:hidden}.YDXeBa_searchResultMeta{align-items:center;gap:6px;min-width:0;margin-left:20px;display:flex}.YDXeBa_searchResultWorkspace,.YDXeBa_searchResultSnippet{text-overflow:ellipsis;white-space:nowrap;font-size:12px;line-height:17px;overflow:hidden}.YDXeBa_searchResultWorkspace{max-width:40%;color:var(--dsw-alias-label-tertiary);flex:none}.YDXeBa_searchResultSnippet{min-width:0;color:var(--dsw-alias-label-secondary);flex:1}.YDXeBa_projectRow{box-sizing:border-box;align-items:center;height:34px}.YDXeBa_projectRow .YDXeBa_rowActions{height:20px}.YDXeBa_sessionRow{height:32px;animation:YDXeBa_row-in .15s var(--ds-ease-in-out);gap:0}.YDXeBa_sessionRow .YDXeBa_title{margin:0 6px 0 4px}.YDXeBa_flatSessionRowWithoutStatus .YDXeBa_title{margin-left:0}@keyframes YDXeBa_row-in{0%{opacity:0}}.YDXeBa_slot{width:16px;height:20px;color:var(--dsw-alias-label-tertiary);flex:none;justify-content:center;align-items:center;display:inline-flex}.YDXeBa_visuallyHidden{clip:rect(0 0 0 0);white-space:nowrap;width:1px;height:1px;position:absolute;overflow:hidden}.YDXeBa_folderActive{color:var(--dsw-alias-state-business-primary)}.YDXeBa_projectRow .YDXeBa_chevron{display:none}.YDXeBa_projectRow:hover .YDXeBa_chevron{display:inline-flex}.YDXeBa_projectRow:hover .YDXeBa_folder{display:none}.YDXeBa_arrow{transition:transform .15s var(--ds-ease-in-out)}.YDXeBa_arrowOpen{transform:rotate(90deg)}.YDXeBa_projectText{flex-direction:column;flex:1;gap:2px;min-width:0;display:flex}.YDXeBa_title{text-overflow:ellipsis;white-space:nowrap;min-width:0;font-size:14px;line-height:20px;overflow:hidden}.YDXeBa_renameInput{border:.5px solid var(--dsw-alias-border-l4);background:var(--dsw-alias-button-elevated-fill);min-width:0;color:inherit;border-radius:4px;outline:none;padding:0 2px;font-size:14px;line-height:20px}.YDXeBa_sessionRow .YDXeBa_title{flex:1}.YDXeBa_meta{text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:20px;overflow:hidden}.YDXeBa_time{color:var(--dsw-alias-label-tertiary);flex:none;font-size:12px;line-height:20px}.YDXeBa_scheduleIndicator{width:16px;height:20px;color:var(--dsw-alias-label-tertiary);flex:none;justify-content:center;align-items:center;margin-right:6px;display:inline-flex}.YDXeBa_searchScheduleIndicator{margin-left:4px;margin-right:0}.YDXeBa_dot{flex:none}.YDXeBa_rowActions{flex:none;align-items:center;gap:12px;display:none}.YDXeBa_projectRow:hover .YDXeBa_rowActions,.YDXeBa_sessionRow:hover .YDXeBa_rowActions,.YDXeBa_projectRow.YDXeBa_menuOpen .YDXeBa_rowActions,.YDXeBa_sessionRow.YDXeBa_menuOpen .YDXeBa_rowActions{display:inline-flex}.YDXeBa_sessionRow:hover .YDXeBa_time,.YDXeBa_sessionRow.YDXeBa_menuOpen .YDXeBa_time{display:none}.YDXeBa_projectRow.YDXeBa_menuOpen,.YDXeBa_sessionRow.YDXeBa_menuOpen{background:var(--dsw-alias-interactive-bg-hover)}.YDXeBa_sessionRow.YDXeBa_dropBefore,.YDXeBa_sessionRow.YDXeBa_dropAfter{position:relative}.YDXeBa_sessionRow.YDXeBa_dropBefore:before,.YDXeBa_sessionRow.YDXeBa_dropAfter:after{content:\"\";z-index:1;background:linear-gradient(55deg, transparent calc(50% - 1px), var(--dsw-alias-state-business-primary) calc(50% - 1px) calc(50% + 1px), transparent calc(50% + 1px)) 0 0 / 5px 7px no-repeat, linear-gradient(125deg, transparent calc(50% - 1px), var(--dsw-alias-state-business-primary) calc(50% - 1px) calc(50% + 1px), transparent calc(50% + 1px)) 0 5px / 5px 7px no-repeat, linear-gradient(var(--dsw-alias-state-business-primary) 0 0) 4px 5px / calc(100% - 4px) 2px no-repeat;pointer-events:none;height:12px;position:absolute;left:0;right:4px}.YDXeBa_sessionRow.YDXeBa_dropBefore:before{top:-7px}.YDXeBa_sessionRow.YDXeBa_dropAfter:after{bottom:-7px}.YDXeBa_hoverContent{flex-direction:column;gap:8px;display:flex}.YDXeBa_hoverTitle{color:#fff;overflow-wrap:break-word;font-size:14px;line-height:20px}.YDXeBa_hoverPath{color:#cfd3d6;word-break:break-all;font-size:12px;line-height:16px}.YDXeBa_hoverTime{color:#cfd3d6;font-size:12px;line-height:16px}.YDXeBa_hoverStatus{color:#adb2b8;align-items:center;gap:8px;font-size:12px;line-height:20px;display:flex}.YDXeBa_iconButton{cursor:pointer;width:16px;height:16px;color:var(--dsw-alias-label-tertiary);background:0 0;border:none;border-radius:4px;flex:none;justify-content:center;align-items:center;padding:0;display:inline-flex}.YDXeBa_iconButton:hover{color:var(--dsw-alias-label-primary)}.YDXeBa_chevron{color:var(--dsw-alias-label-caption)}@media (prefers-reduced-motion:reduce){.YDXeBa_sessionRow,.YDXeBa_arrow{transition:none;animation:none}}";
+		const css$2 = ".YDXeBa_projectRow,.YDXeBa_sessionRow{padding:0 8px;cursor:pointer;user-select:none;color:var(--dsw-alias-label-primary);border-radius:8px;align-items:center;gap:6px;padding-inline-start:calc(8px + var(--dsh-workspace-indent,0px));display:flex}.YDXeBa_projectRow:hover,.YDXeBa_sessionRow:hover,.YDXeBa_sessionRow.YDXeBa_selected{background:var(--dsw-alias-interactive-bg-hover)}.YDXeBa_searchResultRow{box-sizing:border-box;cursor:pointer;text-align:left;width:100%;min-height:48px;color:var(--dsw-alias-label-primary);background:0 0;border:none;border-radius:8px;flex-direction:column;align-items:stretch;padding:4px 8px;display:flex}.YDXeBa_searchResultRow:hover,.YDXeBa_searchResultRow.YDXeBa_selected{background:var(--dsw-alias-interactive-bg-hover)}.YDXeBa_searchResultHeading{align-items:center;min-width:0;display:flex}.YDXeBa_searchResultTitle{text-overflow:ellipsis;white-space:nowrap;flex:0 auto;min-width:0;margin-left:4px;font-size:14px;line-height:20px;overflow:hidden}.YDXeBa_searchResultMeta{align-items:center;gap:6px;min-width:0;margin-left:20px;display:flex}.YDXeBa_searchResultWorkspace,.YDXeBa_searchResultSnippet{text-overflow:ellipsis;white-space:nowrap;font-size:12px;line-height:17px;overflow:hidden}.YDXeBa_searchResultWorkspace{max-width:40%;color:var(--dsw-alias-label-tertiary);flex:none}.YDXeBa_searchResultSnippet{min-width:0;color:var(--dsw-alias-label-secondary);flex:1}.YDXeBa_projectRow{box-sizing:border-box;align-items:center;height:34px}.YDXeBa_projectRow .YDXeBa_rowActions{height:20px}.YDXeBa_sessionRow{height:32px;animation:YDXeBa_row-in .15s var(--ds-ease-in-out);gap:0}.YDXeBa_sessionRow .YDXeBa_title{margin:0 6px 0 4px}.YDXeBa_flatSessionRowWithoutStatus .YDXeBa_title{margin-left:0}@keyframes YDXeBa_row-in{0%{opacity:0}}.YDXeBa_slot{width:16px;height:20px;color:var(--dsw-alias-label-tertiary);flex:none;justify-content:center;align-items:center;display:inline-flex}.YDXeBa_visuallyHidden{clip:rect(0 0 0 0);white-space:nowrap;width:1px;height:1px;position:absolute;overflow:hidden}.YDXeBa_folderActive{color:var(--dsw-alias-state-business-primary)}.YDXeBa_projectRow .YDXeBa_chevron{display:none}.YDXeBa_projectRow:hover .YDXeBa_chevron{display:inline-flex}.YDXeBa_projectRow:hover .YDXeBa_folder{display:none}.YDXeBa_arrow{transition:transform .15s var(--ds-ease-in-out)}.YDXeBa_arrowOpen{transform:rotate(90deg)}.YDXeBa_projectText{flex-direction:column;flex:1;gap:2px;min-width:0;display:flex}.YDXeBa_title{text-overflow:ellipsis;white-space:nowrap;min-width:0;font-size:14px;line-height:20px;overflow:hidden}.YDXeBa_renameInput{border:.5px solid var(--dsw-alias-border-l4);background:var(--dsw-alias-button-elevated-fill);min-width:0;color:inherit;border-radius:4px;outline:none;padding:0 2px;font-size:14px;line-height:20px}.YDXeBa_sessionRow .YDXeBa_title{scroll-behavior:smooth;flex:1}@media (hover:hover){.YDXeBa_sessionRow:hover .YDXeBa_title{text-overflow:clip}}.YDXeBa_meta{text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:20px;overflow:hidden}.YDXeBa_time{color:var(--dsw-alias-label-tertiary);flex:none;font-size:12px;line-height:20px}.YDXeBa_scheduleIndicator{width:16px;height:20px;color:var(--dsw-alias-label-tertiary);flex:none;justify-content:center;align-items:center;margin-right:6px;display:inline-flex}.YDXeBa_searchScheduleIndicator{margin-left:4px;margin-right:0}.YDXeBa_dot{flex:none}.YDXeBa_rowActions{flex:none;align-items:center;gap:12px;display:none}.YDXeBa_projectRow:hover .YDXeBa_rowActions,.YDXeBa_sessionRow:hover .YDXeBa_rowActions,.YDXeBa_projectRow.YDXeBa_menuOpen .YDXeBa_rowActions,.YDXeBa_sessionRow.YDXeBa_menuOpen .YDXeBa_rowActions{display:inline-flex}.YDXeBa_sessionRow:hover .YDXeBa_time,.YDXeBa_sessionRow.YDXeBa_menuOpen .YDXeBa_time{display:none}.YDXeBa_projectRow.YDXeBa_menuOpen,.YDXeBa_sessionRow.YDXeBa_menuOpen{background:var(--dsw-alias-interactive-bg-hover)}.YDXeBa_sessionRow.YDXeBa_dropBefore,.YDXeBa_sessionRow.YDXeBa_dropAfter{position:relative}.YDXeBa_sessionRow.YDXeBa_dropBefore:before,.YDXeBa_sessionRow.YDXeBa_dropAfter:after{content:\"\";z-index:1;background:linear-gradient(55deg, transparent calc(50% - 1px), var(--dsw-alias-state-business-primary) calc(50% - 1px) calc(50% + 1px), transparent calc(50% + 1px)) 0 0 / 5px 7px no-repeat, linear-gradient(125deg, transparent calc(50% - 1px), var(--dsw-alias-state-business-primary) calc(50% - 1px) calc(50% + 1px), transparent calc(50% + 1px)) 0 5px / 5px 7px no-repeat, linear-gradient(var(--dsw-alias-state-business-primary) 0 0) 4px 5px / calc(100% - 4px) 2px no-repeat;pointer-events:none;height:12px;position:absolute;left:0;right:4px}.YDXeBa_sessionRow.YDXeBa_dropBefore:before{top:-7px}.YDXeBa_sessionRow.YDXeBa_dropAfter:after{bottom:-7px}.YDXeBa_hoverContent{flex-direction:column;gap:8px;display:flex}.YDXeBa_hoverTitle{color:#fff;overflow-wrap:break-word;font-size:14px;line-height:20px}.YDXeBa_hoverPath{color:#cfd3d6;word-break:break-all;font-size:12px;line-height:16px}.YDXeBa_hoverTime{color:#cfd3d6;font-size:12px;line-height:16px}.YDXeBa_hoverStatus{color:#adb2b8;align-items:center;gap:8px;font-size:12px;line-height:20px;display:flex}.YDXeBa_iconButton{cursor:pointer;width:16px;height:16px;color:var(--dsw-alias-label-tertiary);background:0 0;border:none;border-radius:4px;flex:none;justify-content:center;align-items:center;padding:0;display:inline-flex}.YDXeBa_iconButton:hover{color:var(--dsw-alias-label-primary)}.YDXeBa_chevron{color:var(--dsw-alias-label-caption)}@media (prefers-reduced-motion:reduce){.YDXeBa_sessionRow,.YDXeBa_arrow{transition:none;animation:none}.YDXeBa_sessionRow .YDXeBa_title{scroll-behavior:auto}}";
 		const tagId$2 = "@deepseek-ai/dsh-client-ui-workspace/Rows.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$2) + "]") === null) {
 			const tag = document.createElement("style");
@@ -604,14 +741,39 @@ window.__ModuleLoader__.load({
 		/**
 		* Workspace browser tree row components (figma Cell set 14:3080): pure presentational —
 		* all data and callbacks arrive via props. Hover swaps (folder->chevron,
-		* time->ellipsis, action buttons) are CSS-only. Row ... menus are visual-only
-		* except workspace Rename/Delete and session Rename/Fork/Archive; the session
-		* and workspace hover cards are suppressed while a menu is open.
+		* time->ellipsis, action buttons) are CSS-only, and a session row's clipped
+		* title is scrolled programmatically while the row is hovered. Row ... menus are
+		* visual-only except workspace Rename/Delete and session Rename/Fork/Archive; the
+		* session and workspace hover cards are suppressed while a menu is open.
 		*/
 		/** Row display title: blank rows show the localized New Session label. */
 		function displayTitle(node, t) {
 			return node.blank ? t("session.new") : node.title;
 		}
+		/**
+		* Reveal a title wider than its one-line cell while its row is hovered: the
+		* title clips its own text, so the far edge (a fork's incremented title, for
+		* example) is reachable by scrolling the element to its end. Leaving returns it
+		* to the start in one step, because the resting ellipsis and the narrowed cell
+		* would otherwise meet the text while it travelled back. A title that fits has
+		* no scroll range to move, and the stylesheet decides whether either move
+		* glides or jumps.
+		* @param title - the row's clipping title element.
+		* @param revealed - whether the pointer is on the row.
+		*/
+		function revealClippedTitle(title, revealed) {
+			/* v8 ignore next -- defensive: the title span renders unconditionally. */
+			if (title === null) return;
+			if (revealed) {
+				title.scrollLeft = title.scrollWidth - title.clientWidth;
+				return;
+			}
+			if (typeof title.scrollTo === "function") title.scrollTo({
+				left: 0,
+				behavior: "instant"
+			});
+			else title.scrollLeft = 0;
+		}
 		/** Localized compact relative time ("刚刚"/"5分钟" in zh, "now"/"5min" in en). */
 		function timeLabel(updatedAt, now, t) {
 			const { unit, n } = (0, _deepseek_ai_dsh_client_ui_primitives.relativeTime)(updatedAt, now);
@@ -667,6 +829,7 @@ window.__ModuleLoader__.load({
 		* Workspace shows its hover card (the ungrouped bucket has none).
 		* `containsCurrent` arrives on the node (derivation fact, no renderer scan).
 		* @param props.group - derived group node.
+		* @param props.containsCurrentDescendant - highlight an ancestor even when its subtree is collapsed.
 		* @param props.onToggle - expand/collapse the group.
 		* @param props.onCreate - start a frontend Session inside this Workspace.
 		* @param props.drag - optional workspace-row drag wiring.
@@ -674,10 +837,10 @@ window.__ModuleLoader__.load({
 		* @param props.t - the browser root's locale seat.
 		* @returns the row element.
 		*/
-		function ProjectRowItem({ group, onToggle, onCreate, actions, drag, home, t }) {
+		function ProjectRowItem({ group, containsCurrentDescendant = false, onToggle, onCreate, actions, drag, home, t }) {
 			const row = group;
 			const label = row.workspaceId === void 0 ? t("group.ungrouped") : row.label;
-			const active = group.expanded && group.containsCurrent;
+			const active = containsCurrentDescendant || group.expanded && group.containsCurrent;
 			const [menuOpen, setMenuOpen] = (0, react.useState)(false);
 			const workspaceMenuItems = [{
 				id: "rename",
@@ -927,7 +1090,7 @@ window.__ModuleLoader__.load({
 		* @param props.onFork - fork a session at its last completed turn.
 		* @param props.onArchive - archive a session by id.
 		* @param props.onReveal - scroll this row into view after search navigation, then acknowledge it.
-		* @param props.drag - optional draggable-row wiring.
+		* @param props.drag - optional row-drag target wiring; blank rows cannot start a drag.
 		* @param props.flat - omit the empty status slot in the hierarchy-free flat list.
 		* @param props.t - the browser root's locale seat.
 		* @returns the session row.
@@ -938,8 +1101,10 @@ window.__ModuleLoader__.load({
 			const selected = node.id === currentId;
 			const statuses = sessionStatuses(node, t);
 			const showStatus = statuses[0].state !== "done" || row.completed;
+			const draggable = drag !== void 0 && !row.blank;
 			const [menuOpen, setMenuOpen] = (0, react.useState)(false);
 			const rowRef = (0, react.useRef)(null);
+			const titleRef = (0, react.useRef)(null);
 			(0, react.useEffect)(() => {
 				if (onReveal === void 0) return;
 				rowRef.current?.scrollIntoView({ block: "nearest" });
@@ -971,13 +1136,19 @@ window.__ModuleLoader__.load({
 					onClick: () => {
 						onOpen(node.id);
 					},
-					draggable: drag !== void 0,
-					onDragStart: drag === void 0 ? void 0 : (e) => {
+					onPointerEnter: () => {
+						revealClippedTitle(titleRef.current, true);
+					},
+					onPointerLeave: () => {
+						revealClippedTitle(titleRef.current, false);
+					},
+					draggable,
+					onDragStart: drag === void 0 || row.blank ? void 0 : (e) => {
 						e.dataTransfer.effectAllowed = "move";
 						e.dataTransfer.setData("text/plain", node.id);
 						drag.start();
 					},
-					onDragEnd: drag?.end,
+					onDragEnd: drag === void 0 || row.blank ? void 0 : drag.end,
 					onDragOver: drag === void 0 ? void 0 : (e) => {
 						if (!drag.active) return;
 						e.preventDefault();
@@ -995,6 +1166,7 @@ window.__ModuleLoader__.load({
 							children: showStatus && (0, react_jsx_runtime.jsx)(SessionStatusDots, { statuses })
 						}),
 						(0, react_jsx_runtime.jsx)("span", {
+							ref: titleRef,
 							className: Rows_module_css_default.title,
 							children: title
 						}),
@@ -1216,7 +1388,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-workspace/src/client/rows/WorkspaceBrowser.module.css.mjs
-		const css = ".bhn1Oq_root{--dsh-session-list-edge-inset:var(--dsh-sidebar-inline-padding);--dsh-session-list-scrollbar-width:8px;--dsh-session-list-scrollbar-offset:2px;box-sizing:border-box;min-height:0;padding-right:var(--dsh-session-list-edge-inset);flex-direction:column;flex:1;display:flex}.bhn1Oq_root.bhn1Oq_rail{padding-right:0}.bhn1Oq_iconButton{corner-shape:round;cursor:pointer;width:28px;height:28px;color:var(--dsw-alias-label-secondary);background:0 0;border:none;border-radius:50%;flex:none;justify-content:center;align-items:center;padding:0;display:inline-flex}.bhn1Oq_iconButton:hover{background:var(--dsw-alias-interactive-bg-hover)}.bhn1Oq_sectionHeader{box-sizing:border-box;height:36px;color:var(--dsw-alias-label-tertiary);border-radius:12px;flex:none;justify-content:flex-end;align-items:center;gap:4px;margin-bottom:4px;padding-left:4px;display:flex;overflow:hidden}.bhn1Oq_root:not(.bhn1Oq_rail) .bhn1Oq_sectionHeader{margin-top:2px;margin-right:-4px}.bhn1Oq_sectionLabel{white-space:nowrap;opacity:1;visibility:visible;min-width:0;max-width:45%;transition:max-width .18s var(--ds-ease-in-out), margin-right .18s var(--ds-ease-in-out), opacity .12s var(--ds-ease-in-out), transform .18s var(--ds-ease-in-out), visibility 0s linear;flex:none;line-height:20px;overflow:hidden}.bhn1Oq_sectionLabelHidden{opacity:0;visibility:hidden;max-width:0;margin-right:-4px;transition-delay:0s,0s,0s,0s,.18s;transform:translate(-4px)}.bhn1Oq_searchSlot{box-sizing:border-box;min-width:0;max-width:28px;transition:max-width .18s var(--ds-ease-in-out), padding-left .18s var(--ds-ease-in-out);flex:1;align-items:center;margin-left:auto;padding-left:0;display:flex}.bhn1Oq_searchSlotExpanded{max-width:100%;padding-left:0}.bhn1Oq_headerActions{opacity:1;visibility:visible;max-width:60px;transition:max-width .18s var(--ds-ease-in-out), opacity .12s var(--ds-ease-in-out), transform .18s var(--ds-ease-in-out), visibility 0s linear;flex:none;align-items:center;gap:4px;display:flex;overflow:hidden}.bhn1Oq_headerActionsHidden{opacity:0;visibility:hidden;pointer-events:none;max-width:0;transition-delay:0s,0s,0s,.18s;transform:translate(4px)}.bhn1Oq_search{box-sizing:border-box;corner-shape:round;cursor:text;width:100%;height:28px;color:var(--dsw-alias-label-secondary);transition:width .18s var(--ds-ease-in-out), padding .18s var(--ds-ease-in-out), border-color .18s var(--ds-ease-in-out), background-color .18s var(--ds-ease-in-out);background:0 0;border:none;border-radius:50%;flex:none;align-items:center;gap:0;margin:0;padding:0;display:flex;overflow:hidden}.bhn1Oq_searchExpanded{border:.5px solid var(--dsw-alias-border-l4);width:calc(100% + 4px);height:30px;color:var(--dsw-alias-label-caption);background:0 0;border-radius:10px;margin-inline:-2px;padding:0 4px 0 0}.bhn1Oq_searchButton{corner-shape:round;cursor:pointer;width:28px;height:28px;color:inherit;background:0 0;border:none;border-radius:50%;flex:none;justify-content:center;align-items:center;padding:0;display:inline-flex}.bhn1Oq_searchExpanded .bhn1Oq_searchButton{width:28px;height:30px}.bhn1Oq_searchButton:hover{background:var(--dsw-alias-interactive-bg-hover)}.bhn1Oq_searchExpanded .bhn1Oq_searchButton:hover{background:0 0}.bhn1Oq_searchInput{opacity:0;pointer-events:none;width:0;min-width:0;color:var(--dsw-alias-label-primary);transition:opacity .12s var(--ds-ease-in-out);background:0 0;border:none;outline:none;flex:1;font-size:13px;line-height:18px}.bhn1Oq_searchExpanded .bhn1Oq_searchInput{opacity:1;pointer-events:auto;margin-left:-2px}.bhn1Oq_searchInput::placeholder{color:var(--dsw-alias-label-tertiary)}.bhn1Oq_clearButton{corner-shape:round;cursor:pointer;width:24px;height:24px;color:var(--dsw-alias-label-secondary);background:0 0;border:none;border-radius:50%;flex:none;justify-content:center;align-items:center;padding:0;display:inline-flex}.bhn1Oq_clearButton:hover{background:var(--dsw-alias-interactive-bg-hover)}.bhn1Oq_rail .bhn1Oq_sectionHeader{justify-content:flex-start;gap:0;margin-bottom:12px;padding-left:0}.bhn1Oq_rail .bhn1Oq_headerActions{max-width:none}.bhn1Oq_rail .bhn1Oq_iconButton{width:36px;height:36px;color:var(--dsw-alias-label-primary)}.bhn1Oq_rail .bhn1Oq_search{background:0 0;border-color:#0000;gap:0;width:36px;height:36px;margin:0 0 12px;padding:0}.bhn1Oq_rail .bhn1Oq_searchButton{width:36px;height:36px;color:var(--dsw-alias-label-primary)}.bhn1Oq_rail .bhn1Oq_searchButton:hover{background:var(--dsw-alias-interactive-bg-hover)}.bhn1Oq_listArea{min-height:0;margin-left:-4px;margin-right:calc(-1 * var(--dsh-session-list-edge-inset));flex-direction:column;flex:1;padding-left:4px;display:flex;overflow:visible}.bhn1Oq_rail .bhn1Oq_listArea{margin-left:0;margin-right:0;padding-left:0}.bhn1Oq_treeBody{flex-direction:column;flex:1;min-height:0;display:flex;position:relative}.bhn1Oq_fade{left:0;right:var(--dsh-session-list-edge-inset);background:linear-gradient(to bottom, transparent, var(--dsw-specific-sidebar-fill));pointer-events:none;height:24px;position:absolute;bottom:0}.bhn1Oq_wide{animation:bhn1Oq_wide-in .2s var(--ds-ease-in-out)}@keyframes bhn1Oq_wide-in{0%{opacity:0}}.bhn1Oq_list{min-height:0;margin-left:-4px;margin-right:var(--dsh-session-list-scrollbar-offset);padding-left:4px;padding-right:calc(var(--dsh-session-list-edge-inset) - var(--dsh-session-list-scrollbar-width) - var(--dsh-session-list-scrollbar-offset));scrollbar-gutter:stable;flex:1;padding-bottom:16px;overflow-y:auto}.bhn1Oq_flatList>*+*,.bhn1Oq_searchTree>[role=treeitem]+[role=treeitem],.bhn1Oq_groupSection>*+*{margin-top:2px}.bhn1Oq_searchStatus,.bhn1Oq_searchWarning{color:var(--dsw-alias-label-tertiary);padding:10px 12px;font-size:12px;line-height:18px}.bhn1Oq_searchWarning{color:var(--dsw-alias-label-secondary)}.bhn1Oq_groupSection{position:relative}.bhn1Oq_groupSection+.bhn1Oq_groupSection{margin-top:4px}.bhn1Oq_listTopDropIndicator,.bhn1Oq_workspaceDropBefore:before,.bhn1Oq_workspaceDropAfter:after{content:\"\";z-index:1;background:linear-gradient(55deg, transparent calc(50% - 1px), var(--dsw-alias-state-business-primary) calc(50% - 1px) calc(50% + 1px), transparent calc(50% + 1px)) 0 0 / 5px 7px no-repeat, linear-gradient(125deg, transparent calc(50% - 1px), var(--dsw-alias-state-business-primary) calc(50% - 1px) calc(50% + 1px), transparent calc(50% + 1px)) 0 5px / 5px 7px no-repeat, linear-gradient(var(--dsw-alias-state-business-primary) 0 0) 4px 5px / calc(100% - 4px) 2px no-repeat;pointer-events:none;height:12px;position:absolute;left:0;right:0}.bhn1Oq_listTopDropIndicator{top:-8px;left:0;right:var(--dsh-session-list-edge-inset)}.bhn1Oq_listTopDropActive>.bhn1Oq_workspaceDropBefore:first-child:before{display:none}.bhn1Oq_workspaceDropBefore:before{top:-8px}.bhn1Oq_workspaceDropAfter:after{bottom:-8px}.bhn1Oq_sessionOverflowButton{cursor:pointer;text-align:left;width:100%;height:28px;color:var(--dsw-alias-label-tertiary);background:0 0;border:none;border-radius:8px;padding:0 12px 0 28px;font-size:12px}.bhn1Oq_groupSection>.bhn1Oq_sessionOverflowButton{margin-top:0}.bhn1Oq_sessionOverflowButton:hover{color:var(--dsw-alias-label-secondary);background:0 0}.bhn1Oq_empty{color:var(--dsw-alias-label-tertiary);padding:16px 12px;font-size:13px}.bhn1Oq_renameInput{box-sizing:border-box;border:.5px solid var(--dsw-alias-border-l4);width:100%;height:44px;color:var(--dsw-alias-label-primary);background:0 0;border-radius:22px;outline:none;padding:7px 14px;font-size:14px;font-weight:400;line-height:22px}.bhn1Oq_renameInput:disabled{color:var(--dsw-alias-label-dimmed)}.bhn1Oq_renameError{color:var(--dsw-alias-state-error-primary);margin-top:8px;font-size:12px;line-height:18px}.bhn1Oq_deleteAction:not(:disabled){color:var(--dsw-alias-state-error-primary)}.bhn1Oq_deleteStatus{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px}@media (prefers-reduced-motion:reduce){.bhn1Oq_wide{animation:none}.bhn1Oq_search,.bhn1Oq_sectionLabel,.bhn1Oq_searchSlot,.bhn1Oq_searchInput,.bhn1Oq_headerActions{transition:none}}";
+		const css = ".bhn1Oq_root{--dsh-session-list-edge-inset:var(--dsh-sidebar-inline-padding);--dsh-session-list-scrollbar-width:8px;--dsh-session-list-scrollbar-offset:2px;box-sizing:border-box;min-height:0;padding-right:var(--dsh-session-list-edge-inset);flex-direction:column;flex:1;display:flex}.bhn1Oq_root.bhn1Oq_rail{padding-right:0}.bhn1Oq_iconButton{corner-shape:round;cursor:pointer;width:28px;height:28px;color:var(--dsw-alias-label-secondary);background:0 0;border:none;border-radius:50%;flex:none;justify-content:center;align-items:center;padding:0;display:inline-flex}.bhn1Oq_iconButton:hover{background:var(--dsw-alias-interactive-bg-hover)}.bhn1Oq_sectionHeader{box-sizing:border-box;height:36px;color:var(--dsw-alias-label-tertiary);border-radius:12px;flex:none;justify-content:flex-end;align-items:center;gap:4px;margin-bottom:4px;padding-left:4px;display:flex;overflow:hidden}.bhn1Oq_root:not(.bhn1Oq_rail) .bhn1Oq_sectionHeader{margin-top:2px;margin-right:-4px}.bhn1Oq_sectionLabel{white-space:nowrap;opacity:1;visibility:visible;min-width:0;max-width:45%;transition:max-width .18s var(--ds-ease-in-out), margin-right .18s var(--ds-ease-in-out), opacity .12s var(--ds-ease-in-out), transform .18s var(--ds-ease-in-out), visibility 0s linear;flex:none;line-height:20px;overflow:hidden}.bhn1Oq_sectionLabelHidden{opacity:0;visibility:hidden;max-width:0;margin-right:-4px;transition-delay:0s,0s,0s,0s,.18s;transform:translate(-4px)}.bhn1Oq_searchSlot{box-sizing:border-box;min-width:0;max-width:28px;transition:max-width .18s var(--ds-ease-in-out), padding-left .18s var(--ds-ease-in-out);flex:1;align-items:center;margin-left:auto;padding-left:0;display:flex}.bhn1Oq_searchSlotExpanded{max-width:100%;padding-left:0}.bhn1Oq_headerActions{opacity:1;visibility:visible;max-width:60px;transition:max-width .18s var(--ds-ease-in-out), opacity .12s var(--ds-ease-in-out), transform .18s var(--ds-ease-in-out), visibility 0s linear;flex:none;align-items:center;gap:4px;display:flex;overflow:hidden}.bhn1Oq_headerActionsHidden{opacity:0;visibility:hidden;pointer-events:none;max-width:0;transition-delay:0s,0s,0s,.18s;transform:translate(4px)}.bhn1Oq_search{box-sizing:border-box;corner-shape:round;cursor:text;width:100%;height:28px;color:var(--dsw-alias-label-secondary);transition:width .18s var(--ds-ease-in-out), padding .18s var(--ds-ease-in-out), border-color .18s var(--ds-ease-in-out), background-color .18s var(--ds-ease-in-out);background:0 0;border:none;border-radius:50%;flex:none;align-items:center;gap:0;margin:0;padding:0;display:flex;overflow:hidden}.bhn1Oq_searchExpanded{border:.5px solid var(--dsw-alias-border-l4);width:calc(100% + 4px);height:30px;color:var(--dsw-alias-label-caption);background:0 0;border-radius:10px;margin-inline:-2px;padding:0 4px 0 0}.bhn1Oq_searchButton{corner-shape:round;cursor:pointer;width:28px;height:28px;color:inherit;background:0 0;border:none;border-radius:50%;flex:none;justify-content:center;align-items:center;padding:0;display:inline-flex}.bhn1Oq_searchExpanded .bhn1Oq_searchButton{width:28px;height:30px}.bhn1Oq_searchButton:hover{background:var(--dsw-alias-interactive-bg-hover)}.bhn1Oq_searchExpanded .bhn1Oq_searchButton:hover{background:0 0}.bhn1Oq_searchInput{opacity:0;pointer-events:none;width:0;min-width:0;color:var(--dsw-alias-label-primary);transition:opacity .12s var(--ds-ease-in-out);background:0 0;border:none;outline:none;flex:1;font-size:13px;line-height:18px}.bhn1Oq_searchExpanded .bhn1Oq_searchInput{opacity:1;pointer-events:auto;margin-left:-2px}.bhn1Oq_searchInput::placeholder{color:var(--dsw-alias-label-tertiary)}.bhn1Oq_clearButton{corner-shape:round;cursor:pointer;width:24px;height:24px;color:var(--dsw-alias-label-secondary);background:0 0;border:none;border-radius:50%;flex:none;justify-content:center;align-items:center;padding:0;display:inline-flex}.bhn1Oq_clearButton:hover{background:var(--dsw-alias-interactive-bg-hover)}.bhn1Oq_rail .bhn1Oq_sectionHeader{justify-content:flex-start;gap:0;margin-bottom:12px;padding-left:0}.bhn1Oq_rail .bhn1Oq_headerActions{max-width:none}.bhn1Oq_rail .bhn1Oq_iconButton{width:36px;height:36px;color:var(--dsw-alias-label-primary);border-radius:12px}.bhn1Oq_rail .bhn1Oq_search{background:0 0;border-color:#0000;border-radius:12px;gap:0;width:36px;height:36px;margin:0 0 12px;padding:0}.bhn1Oq_rail .bhn1Oq_searchButton{width:36px;height:36px;color:var(--dsw-alias-label-primary);border-radius:12px}.bhn1Oq_rail .bhn1Oq_searchButton:hover{background:var(--dsw-alias-interactive-bg-hover)}.bhn1Oq_listArea{min-height:0;margin-left:-4px;margin-right:calc(-1 * var(--dsh-session-list-edge-inset));flex-direction:column;flex:1;padding-left:4px;display:flex;overflow:visible}.bhn1Oq_rail .bhn1Oq_listArea{margin-left:0;margin-right:0;padding-left:0}.bhn1Oq_treeBody{flex-direction:column;flex:1;min-height:0;display:flex;position:relative}.bhn1Oq_fade{left:0;right:var(--dsh-session-list-edge-inset);background:linear-gradient(to bottom, transparent, var(--dsw-specific-sidebar-fill));pointer-events:none;height:24px;position:absolute;bottom:0}[data-platform=darwin] .bhn1Oq_fade{display:none}.bhn1Oq_wide{animation:bhn1Oq_wide-in .2s var(--ds-ease-in-out)}@keyframes bhn1Oq_wide-in{0%{opacity:0}}.bhn1Oq_list{min-height:0;margin-left:-4px;margin-right:var(--dsh-session-list-scrollbar-offset);padding-left:4px;padding-right:calc(var(--dsh-session-list-edge-inset) - var(--dsh-session-list-scrollbar-width) - var(--dsh-session-list-scrollbar-offset));scrollbar-gutter:stable;flex:1;padding-bottom:16px;overflow-y:auto}.bhn1Oq_flatList>*+*,.bhn1Oq_searchTree>[role=treeitem]+[role=treeitem],.bhn1Oq_groupSection>*+*{margin-top:2px}.bhn1Oq_searchStatus,.bhn1Oq_searchWarning{color:var(--dsw-alias-label-tertiary);padding:10px 12px;font-size:12px;line-height:18px}.bhn1Oq_searchWarning{color:var(--dsw-alias-label-secondary)}.bhn1Oq_groupSection{position:relative}.bhn1Oq_groupSection+.bhn1Oq_groupSection{margin-top:4px}.bhn1Oq_listTopDropIndicator,.bhn1Oq_workspaceDropBefore:before,.bhn1Oq_workspaceDropAfter:after{content:\"\";z-index:1;background:linear-gradient(55deg, transparent calc(50% - 1px), var(--dsw-alias-state-business-primary) calc(50% - 1px) calc(50% + 1px), transparent calc(50% + 1px)) 0 0 / 5px 7px no-repeat, linear-gradient(125deg, transparent calc(50% - 1px), var(--dsw-alias-state-business-primary) calc(50% - 1px) calc(50% + 1px), transparent calc(50% + 1px)) 0 5px / 5px 7px no-repeat, linear-gradient(var(--dsw-alias-state-business-primary) 0 0) 4px 5px / calc(100% - 4px) 2px no-repeat;pointer-events:none;height:12px;position:absolute;left:0;right:0}.bhn1Oq_listTopDropIndicator{top:-8px;left:0;right:var(--dsh-session-list-edge-inset)}.bhn1Oq_listTopDropActive>.bhn1Oq_workspaceDropBefore:first-child:before{display:none}.bhn1Oq_workspaceDropBefore:before{top:-8px}.bhn1Oq_workspaceDropAfter:after{bottom:-8px}.bhn1Oq_sessionOverflowButton{width:100%;height:28px;padding:0 12px 0 calc(28px + var(--dsh-workspace-indent,0px));cursor:pointer;text-align:left;color:var(--dsw-alias-label-tertiary);background:0 0;border:none;border-radius:8px;font-size:12px}.bhn1Oq_groupSection>.bhn1Oq_sessionOverflowButton{margin-top:0}.bhn1Oq_sessionOverflowButton:hover{color:var(--dsw-alias-label-secondary);background:0 0}.bhn1Oq_empty{color:var(--dsw-alias-label-tertiary);padding:16px 12px;font-size:13px}.bhn1Oq_renameInput{box-sizing:border-box;border:.5px solid var(--dsw-alias-border-l4);width:100%;height:44px;color:var(--dsw-alias-label-primary);background:0 0;border-radius:22px;outline:none;padding:7px 14px;font-size:14px;font-weight:400;line-height:22px}.bhn1Oq_renameInput:disabled{color:var(--dsw-alias-label-dimmed)}.bhn1Oq_renameError{color:var(--dsw-alias-state-error-primary);margin-top:8px;font-size:12px;line-height:18px}.bhn1Oq_deleteAction:not(:disabled){color:var(--dsw-alias-state-error-primary)}.bhn1Oq_deleteStatus{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px}@media (prefers-reduced-motion:reduce){.bhn1Oq_wide{animation:none}.bhn1Oq_search,.bhn1Oq_sectionLabel,.bhn1Oq_searchSlot,.bhn1Oq_searchInput,.bhn1Oq_headerActions{transition:none}}";
 		const tagId = "@deepseek-ai/dsh-client-ui-workspace/WorkspaceBrowser.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
 			const tag = document.createElement("style");
@@ -1338,58 +1510,6 @@ window.__ModuleLoader__.load({
 				};
 			}, [active]);
 		}
-		/** Reconcile a stored view order with the Workspace's current session account. */
-		function reconciledSessionOrder(sessionIds, stored) {
-			if (stored === void 0) return [...sessionIds];
-			const byId = new Map(sessionIds.map((id) => [id, id]));
-			const ordered = [];
-			const included = /* @__PURE__ */ new Set();
-			for (const key of stored) {
-				const id = byId.get(key);
-				if (id === void 0 || included.has(key)) continue;
-				ordered.push(id);
-				included.add(key);
-			}
-			for (const id of sessionIds) {
-				if (included.has(id)) continue;
-				ordered.push(id);
-			}
-			return ordered;
-		}
-		/** Newest update first with stable Session identity as the tie-break. */
-		function compareSessionRecency(a, b, byId) {
-			const aUpdatedAt = byId[a]?.updatedAt ?? Number.NEGATIVE_INFINITY;
-			const bUpdatedAt = byId[b]?.updatedAt ?? Number.NEGATIVE_INFINITY;
-			if (aUpdatedAt !== bUpdatedAt) return bUpdatedAt - aUpdatedAt;
-			return a < b ? -1 : 1;
-		}
-		/** Reconcile one editable order account and apply its activity-promotion policy. */
-		function nextSessionOrderAccount({ sessionIds, previousOrder, previousUpdatedAt, list, orderBy, sortByRecency }) {
-			let order = reconciledSessionOrder(sessionIds, previousOrder);
-			if (sortByRecency) order.sort((a, b) => compareSessionRecency(a, b, list.byId));
-			else if (orderBy === "updated") {
-				const promoted = sessionIds.filter((id) => {
-					const session = list.byId[id];
-					return session !== void 0 && (previousUpdatedAt[id] === void 0 || session.updatedAt > previousUpdatedAt[id]);
-				}).sort((a, b) => compareSessionRecency(a, b, list.byId));
-				if (promoted.length > 0) {
-					const promotedIds = new Set(promoted);
-					order = [...promoted, ...order.filter((id) => !promotedIds.has(id))];
-				}
-			}
-			const updatedAt = {};
-			for (const id of sessionIds) {
-				const session = list.byId[id];
-				if (session !== void 0) updatedAt[id] = session.updatedAt;
-			}
-			const orderChanged = previousOrder === void 0 || order.length !== previousOrder.length || order.some((id, index) => id !== previousOrder[index]);
-			const timestampsChanged = Object.keys(updatedAt).length !== Object.keys(previousUpdatedAt).length || Object.entries(updatedAt).some(([id, timestamp]) => previousUpdatedAt[id] !== timestamp);
-			return {
-				order,
-				updatedAt,
-				changed: orderChanged || timestampsChanged
-			};
-		}
 		/** Grouping and ordering menu; own open state so it resets with the wide chrome. */
 		function ViewOptionsMenu({ groupBy, orderBy, onGroupPick, onOrderPick, t }) {
 			const [open, setOpen] = (0, react.useState)(false);
@@ -1408,6 +1528,10 @@ window.__ModuleLoader__.load({
 						id: "workspace",
 						label: t("groupBy.workspace")
 					},
+					{
+						id: "workspace-tree",
+						label: t("groupBy.workspaceTree")
+					},
 					{
 						id: "flat",
 						label: t("groupBy.flat")
@@ -1432,7 +1556,7 @@ window.__ModuleLoader__.load({
 				],
 				selectedIds: [groupBy, orderBy],
 				onSelect: (id) => {
-					if (id === "workspace" || id === "flat") onGroupPick(id);
+					if (id === "workspace" || id === "workspace-tree" || id === "flat") onGroupPick(id);
 					else if (id === "manual" || id === "updated") onOrderPick(id);
 					setOpen(false);
 				},
@@ -1455,24 +1579,22 @@ window.__ModuleLoader__.load({
 				})
 			});
 		}
-		/** Resolve an insertion side from the full rendered workspace group. */
+		/** Resolve an insertion side across the Workspace header, descendants, and Sessions. */
 		function workspaceGroupHalf(e) {
 			const rect = e.currentTarget.getBoundingClientRect();
 			return e.clientY < rect.top + rect.height / 2 ? "before" : "after";
 		}
 		/** The scrolling session tree; unmounting drops the sessions subscription and expand-all state. */
-		function SessionTree({ useSessions, useSessionPendingInteraction, startSession, open, forkSession, workspaces, archivedSessionIds, workspaceReady, usePanelInfo, onRenameRequest, onDeleteRequest, onSessionRename, onSessionArchive, insertWorkspaceBefore, insertSessionBefore, orderBy, groupExpansion, setGroupExpanded, sessionOrderByAccount, sessionUpdatedAtByAccount, syncSessionOrderAccount, setSessionOrder, home, t, revealSessionId, onSessionRevealed }) {
+		function SessionTree({ list, useSessionStatus, startSession, open, forkSession, workspaces, ungroupedSessionIds, archivedSessionIds, workspaceReady, usePanelInfo, onRenameRequest, onDeleteRequest, onSessionRename, onSessionArchive, insertWorkspaceBefore, nestWorkspaces, groupExpansion, setGroupExpanded, setSessionOrder, home, t, revealSessionId, onSessionRevealed }) {
 			const panelActive = usePanelInfo((info) => info.activePanelId !== null);
-			const list = useSessions((s) => s);
-			const pendingInteractions = useSessionPendingInteraction((s) => s);
-			const current = panelActive ? void 0 : list.current;
+			const statuses = useSessionStatus((s) => s);
+			const current = panelActive ? void 0 : Object.values(list.byId).find((session) => (session.retainedBy.mainView ?? 0) > 0)?.id;
 			const revealGroup = revealSessionId === void 0 || !workspaceReady ? void 0 : owningGroupKey(workspaces, revealSessionId);
 			const [expandedSessionGroups, setExpandedSessionGroups] = (0, react.useState)([]);
 			const [drag, setDrag] = (0, react.useState)(null);
 			const sessionDropCommitted = (0, react.useRef)(false);
 			const [workspaceDrag, setWorkspaceDrag] = (0, react.useState)(null);
 			const workspaceDropCommitted = (0, react.useRef)(false);
-			const previousOrderBy = (0, react.useRef)(orderBy);
 			useNativeDragAcceptance(drag !== null || workspaceDrag !== null);
 			const currentGroup = current === void 0 || !workspaceReady ? void 0 : owningGroupKey(workspaces, current);
 			(0, react.useEffect)(() => {
@@ -1484,70 +1606,44 @@ window.__ModuleLoader__.load({
 				setGroupExpanded,
 				groupExpansion
 			]);
-			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));
-				return list.ids.filter((id) => list.byId[id] !== void 0 && !accounted.has(id));
-			}, [list, workspaces]);
-			(0, react.useEffect)(() => {
-				if (list.phase !== "ready") return;
-				const switchedToUpdated = previousOrderBy.current !== "updated" && orderBy === "updated";
-				previousOrderBy.current = orderBy;
-				const accounts = [...workspaces.map((workspace) => ({
-					key: workspace.workspaceId,
-					sessionIds: workspace.sessionIds.filter((id) => list.byId[id] !== void 0)
-				})), {
-					key: "",
-					sessionIds: ungroupedSessionIds
-				}];
-				for (const { key, sessionIds } of accounts) {
-					const previousOrder = sessionOrderByAccount[key];
-					const next = nextSessionOrderAccount({
-						sessionIds,
-						previousOrder,
-						previousUpdatedAt: sessionUpdatedAtByAccount[key] ?? {},
-						list,
-						orderBy,
-						sortByRecency: orderBy === "updated" && (previousOrder === void 0 || switchedToUpdated)
-					});
-					if (next.changed) syncSessionOrderAccount(key, next.order.map((id) => id), next.updatedAt);
-				}
+			const parents = (0, react.useMemo)(() => {
+				if (!nestWorkspaces) return /* @__PURE__ */ new Map();
+				const keysByPath = new Map(workspaces.map((workspace) => [workspace.path, workspace.workspaceId]));
+				const paths = [...keysByPath.keys()];
+				return new Map(workspaces.map((workspace) => {
+					const path = owningParentFolder(workspace.path, paths);
+					return [workspace.workspaceId, path === void 0 ? void 0 : keysByPath.get(path)];
+				}));
+			}, [nestWorkspaces, workspaces]);
+			const currentAncestors = (0, react.useMemo)(() => {
+				const keys = /* @__PURE__ */ new Set();
+				for (let key = currentGroup === void 0 ? void 0 : parents.get(currentGroup); key !== void 0; key = parents.get(key)) keys.add(key);
+				return keys;
+			}, [currentGroup, parents]);
+			const expandedGroups = (0, react.useMemo)(() => {
+				const ancestorKeys = new Set(parents.values());
+				return [...workspaces.map((workspace) => workspace.workspaceId), ""].filter((key) => groupExpansion[key] ?? ancestorKeys.has(key));
 			}, [
-				list,
-				orderBy,
-				sessionOrderByAccount,
-				sessionUpdatedAtByAccount,
-				syncSessionOrderAccount,
-				ungroupedSessionIds,
+				groupExpansion,
+				parents,
 				workspaces
 			]);
-			const orderedWorkspaces = (0, react.useMemo)(() => {
-				return workspaces.map((workspace) => {
-					const stored = sessionOrderByAccount[workspace.workspaceId];
-					const sessionIds = reconciledSessionOrder(workspace.sessionIds, stored);
-					return {
-						...workspace,
-						sessionIds
-					};
-				});
-			}, [sessionOrderByAccount, workspaces]);
-			const orderedUngroupedSessionIds = (0, react.useMemo)(() => reconciledSessionOrder(ungroupedSessionIds, sessionOrderByAccount[""]), [sessionOrderByAccount, ungroupedSessionIds]);
-			const groups = (0, react.useMemo)(() => deriveGroups(list, orderedWorkspaces, archivedSessionIds, pendingInteractions, {
+			const groups = (0, react.useMemo)(() => deriveGroups(list, workspaces, archivedSessionIds, statuses, {
 				expandedGroups,
-				...sessionOrderByAccount[""] === void 0 ? {} : { ungroupedOrder: sessionOrderByAccount[""] }
+				ungroupedOrder: ungroupedSessionIds
 			}), [
 				list,
-				orderedWorkspaces,
+				workspaces,
 				archivedSessionIds,
-				pendingInteractions,
+				statuses,
 				expandedGroups,
-				sessionOrderByAccount
+				ungroupedSessionIds
 			]);
 			(0, react.useEffect)(() => {
-				if (revealGroup === void 0 || groupExpansion[revealGroup] === true) return;
-				setGroupExpanded(revealGroup, true);
+				for (let key = revealGroup; key !== void 0; key = parents.get(key)) if (groupExpansion[key] === false || key === revealGroup && groupExpansion[key] !== true) setGroupExpanded(key, true);
 			}, [
 				groupExpansion,
+				parents,
 				revealGroup,
 				setGroupExpanded
 			]);
@@ -1580,8 +1676,8 @@ window.__ModuleLoader__.load({
 				if (targetWithoutSourceIndex === -1) return;
 				const visibleInsertAt = over.half === "before" ? targetWithoutSourceIndex : targetWithoutSourceIndex + 1;
 				if (sourceIndex !== -1 && visibleInsertAt === sourceIndex) return;
-				const accountSessionIds = activeDrag.accountKey === "" ? orderedUngroupedSessionIds : orderedWorkspaces.find((workspace) => workspace.workspaceId === activeDrag.accountKey)?.sessionIds;
-				if (accountSessionIds === void 0) return;
+				const accountSessionIds = activeDrag.accountKey === "" ? ungroupedSessionIds : workspaces.find((workspace) => workspace.workspaceId === activeDrag.accountKey)?.sessionIds;
+				if (accountSessionIds === void 0 || !accountSessionIds.includes(activeDrag.sessionId)) return;
 				const nextOrder = accountSessionIds.filter((id) => id !== activeDrag.sessionId);
 				let anchor;
 				if (sessionsExpanded) anchor = over.half === "before" ? over.id : renderedSessions[targetIndex + 1]?.id;
@@ -1603,28 +1699,198 @@ window.__ModuleLoader__.load({
 						return node === void 0 ? [] : [node];
 					})).rows.some((node) => node.id === activeDrag.sessionId)) return;
 				}
-				setSessionOrder(activeDrag.accountKey, nextOrder.map((id) => id));
-				if (orderBy === "updated" || activeDrag.accountKey === "") return;
-				insertSessionBefore(activeDrag.accountKey, activeDrag.sessionId, anchor).catch((reason) => {
-					console.warn("session reorder rejected:", reason);
-				});
+				const currentBlank = group.sessions.find((node) => node.blank)?.id;
+				setSessionOrder(activeDrag.accountKey, pinCurrentBlank(nextOrder, currentBlank));
 			};
 			const commitWorkspaceDrag = (activeDrag, over) => {
 				if (workspaceDropCommitted.current) return;
 				workspaceDropCommitted.current = true;
 				setWorkspaceDrag(null);
-				const rowIndex = workspaces.findIndex((workspace) => workspace.workspaceId === over.id);
+				const owner = parents.get(activeDrag.workspaceId);
+				const siblings = workspaces.filter((workspace) => parents.get(workspace.workspaceId) === owner);
+				const rowIndex = siblings.findIndex((workspace) => workspace.workspaceId === over.id);
 				if (rowIndex === -1) return;
-				const anchor = over.half === "before" ? over.id : workspaces[rowIndex + 1]?.workspaceId;
+				const anchor = over.half === "before" ? over.id : siblings[rowIndex + 1]?.workspaceId;
 				if (anchor === activeDrag.workspaceId) return;
-				const sourceIndex = workspaces.findIndex((workspace) => workspace.workspaceId === activeDrag.workspaceId);
-				const anchorIndex = anchor === void 0 ? workspaces.length : workspaces.findIndex((workspace) => workspace.workspaceId === anchor);
+				const sourceIndex = siblings.findIndex((workspace) => workspace.workspaceId === activeDrag.workspaceId);
+				const anchorIndex = anchor === void 0 ? siblings.length : siblings.findIndex((workspace) => workspace.workspaceId === anchor);
 				if (sourceIndex !== -1 && (anchorIndex === sourceIndex || anchorIndex === sourceIndex + 1)) return;
 				insertWorkspaceBefore(activeDrag.workspaceId, anchor).catch((reason) => {
 					console.warn("workspace reorder rejected:", reason);
 				});
 			};
-			const workspaceDropAtListStart = groups[0]?.workspaceId !== void 0 && workspaceDrag?.over?.id === groups[0].workspaceId && workspaceDrag.over.half === "before";
+			const childrenByParent = (0, react.useMemo)(() => {
+				const children = /* @__PURE__ */ new Map();
+				for (const group of groups) {
+					const parent = parents.get(group.key);
+					const siblings = children.get(parent);
+					if (siblings === void 0) children.set(parent, [group]);
+					else siblings.push(group);
+				}
+				return children;
+			}, [groups, parents]);
+			const rootGroups = childrenByParent.get(void 0) ?? [];
+			const workspaceDropAtListStart = rootGroups[0]?.workspaceId !== void 0 && workspaceDrag?.over?.id === rootGroups[0].workspaceId && workspaceDrag.over.half === "before";
+			const renderGroup = (group, depth) => {
+				const workspaceId = group.workspaceId;
+				const children = childrenByParent.get(group.key) ?? [];
+				const compatibleDrag = workspaceDrag !== null && parents.get(workspaceDrag.workspaceId) === parents.get(group.key);
+				const collapsed = collapsedSessionRows(group.sessions);
+				const sessionsExpanded = expandedSessionGroups.includes(group.key);
+				const workspaceMarker = workspaceId !== void 0 && workspaceDrag?.over?.id === workspaceId ? workspaceDrag.over.half : null;
+				const workspaceDragProps = workspaceId === void 0 ? void 0 : {
+					start: () => {
+						workspaceDropCommitted.current = false;
+						setWorkspaceDrag({
+							workspaceId,
+							over: null
+						});
+					},
+					end: () => {
+						if (workspaceDrag?.over !== null && workspaceDrag?.over !== void 0) commitWorkspaceDrag(workspaceDrag, workspaceDrag.over);
+						else setWorkspaceDrag(null);
+						workspaceDropCommitted.current = false;
+					}
+				};
+				const hoverWorkspace = workspaceId === void 0 || !compatibleDrag ? void 0 : (half) => {
+					setWorkspaceDrag((active) => active === null ? active : {
+						...active,
+						over: {
+							id: workspaceId,
+							half
+						}
+					});
+				};
+				const dropWorkspace = workspaceId === void 0 || !compatibleDrag ? void 0 : (half) => {
+					commitWorkspaceDrag(workspaceDrag, {
+						id: workspaceId,
+						half
+					});
+				};
+				return (0, react_jsx_runtime.jsxs)("div", {
+					style: { "--dsh-workspace-indent": `${depth * 12}px` },
+					className: clsx(WorkspaceBrowser_module_css_default.groupSection, workspaceMarker === "before" && WorkspaceBrowser_module_css_default.workspaceDropBefore, workspaceMarker === "after" && WorkspaceBrowser_module_css_default.workspaceDropAfter),
+					onDragOver: workspaceDrag === null ? void 0 : (e) => {
+						e.preventDefault();
+						if (hoverWorkspace === void 0 && parents.get(group.key) !== void 0) return;
+						e.stopPropagation();
+						if (hoverWorkspace === void 0) {
+							e.dataTransfer.dropEffect = "none";
+							if (workspaceDrag.over !== null) setWorkspaceDrag({
+								...workspaceDrag,
+								over: null
+							});
+						} else {
+							e.dataTransfer.dropEffect = "move";
+							hoverWorkspace(workspaceGroupHalf(e));
+						}
+					},
+					onDrop: workspaceDrag === null ? void 0 : (e) => {
+						e.preventDefault();
+						if (dropWorkspace === void 0 && parents.get(group.key) !== void 0) return;
+						e.stopPropagation();
+						if (dropWorkspace === void 0) {
+							workspaceDropCommitted.current = true;
+							setWorkspaceDrag(null);
+						} else dropWorkspace(workspaceGroupHalf(e));
+					},
+					children: [
+						(0, react_jsx_runtime.jsx)(ProjectRowItem, {
+							group,
+							containsCurrentDescendant: currentAncestors.has(group.key),
+							home,
+							t,
+							onToggle: () => {
+								if (group.expanded) setExpandedSessionGroups((keys) => keys.filter((key) => key !== group.key));
+								setGroupExpanded(group.key, !group.expanded);
+							},
+							onCreate: () => {
+								if (group.workspaceId !== void 0) {
+									setGroupExpanded(group.key, true);
+									startSession(group.workspaceId);
+								}
+							},
+							drag: workspaceDragProps,
+							actions: group.workspaceId === void 0 ? void 0 : {
+								rename: () => {
+									/* v8 ignore next -- narrowing guard: the actions object exists only for real-workspace groups. */
+									if (group.workspaceId !== void 0) onRenameRequest(group.workspaceId, group.label);
+								},
+								delete: () => {
+									/* v8 ignore next -- narrowing guard: the actions object exists only for real-workspace groups. */
+									if (group.workspaceId !== void 0) onDeleteRequest(group.workspaceId, group.label);
+								}
+							}
+						}),
+						group.expanded && children.length > 0 && (0, react_jsx_runtime.jsx)("div", {
+							role: "group",
+							children: children.map((child) => renderGroup(child, depth + 1))
+						}),
+						(sessionsExpanded ? group.sessions : collapsed.rows).map((node) => {
+							const sameGroupDrag = drag !== null && drag.accountKey === group.key;
+							const normalizeHalf = (half) => node.blank ? "after" : half;
+							const dragProps = {
+								start: () => {
+									sessionDropCommitted.current = false;
+									setDrag({
+										accountKey: group.key,
+										sessionId: node.id,
+										over: null
+									});
+								},
+								active: sameGroupDrag,
+								marker: sameGroupDrag && drag.over?.id === node.id ? drag.over.half : null,
+								hover: (half) => {
+									/* v8 ignore next -- narrowing guard: Rows gates hover on `active`, which is false while the drag state is null. */
+									setDrag((d) => d === null ? d : {
+										...d,
+										over: {
+											id: node.id,
+											half: normalizeHalf(half)
+										}
+									});
+								},
+								drop: (half) => {
+									/* v8 ignore next -- narrowing guard: Rows gates drop on `active`, which is false while the drag state is null. */
+									if (drag === null) return;
+									commitSessionDrag(drag, {
+										id: node.id,
+										half: normalizeHalf(half)
+									});
+								},
+								end: () => {
+									if (drag?.over !== null && drag?.over !== void 0) commitSessionDrag(drag, drag.over);
+									else setDrag(null);
+									sessionDropCommitted.current = false;
+								}
+							};
+							return (0, react_jsx_runtime.jsx)(SessionNodeItem, {
+								node,
+								currentId: current,
+								now,
+								onOpen: open,
+								onRename: onSessionRename,
+								onFork: forkSession,
+								onArchive: onSessionArchive,
+								onReveal: node.id === revealSessionId && group.key === revealGroup ? () => {
+									onSessionRevealed(node.id);
+								} : void 0,
+								drag: dragProps,
+								t
+							}, node.id);
+						}),
+						collapsed.hiddenCount > 0 && (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							className: WorkspaceBrowser_module_css_default.sessionOverflowButton,
+							"aria-expanded": sessionsExpanded,
+							onClick: () => {
+								setExpandedSessionGroups((keys) => toggled(keys, group.key));
+							},
+							children: sessionsExpanded ? t("sessions.collapse") : t("sessions.expand", { n: collapsed.hiddenCount })
+						})
+					]
+				}, group.key);
+			};
 			return (0, react_jsx_runtime.jsxs)("div", {
 				className: clsx(WorkspaceBrowser_module_css_default.treeBody, WorkspaceBrowser_module_css_default.wide),
 				children: [
@@ -1639,197 +1905,25 @@ window.__ModuleLoader__.load({
 						children: [groups.length === 0 && (0, react_jsx_runtime.jsx)("div", {
 							className: WorkspaceBrowser_module_css_default.empty,
 							children: t("empty.none")
-						}), groups.map((group) => {
-							const workspaceId = group.workspaceId;
-							const collapsed = collapsedSessionRows(group.sessions);
-							const sessionsExpanded = expandedSessionGroups.includes(group.key);
-							const workspaceMarker = workspaceId !== void 0 && workspaceDrag?.over?.id === workspaceId ? workspaceDrag.over.half : null;
-							const workspaceDragProps = workspaceId === void 0 ? void 0 : {
-								start: () => {
-									workspaceDropCommitted.current = false;
-									setWorkspaceDrag({
-										workspaceId,
-										over: null
-									});
-								},
-								end: () => {
-									if (workspaceDrag?.over !== null && workspaceDrag?.over !== void 0) commitWorkspaceDrag(workspaceDrag, workspaceDrag.over);
-									else setWorkspaceDrag(null);
-									workspaceDropCommitted.current = false;
-								}
-							};
-							const hoverWorkspace = workspaceId === void 0 ? void 0 : (half) => {
-								setWorkspaceDrag((active) => active === null ? active : {
-									...active,
-									over: {
-										id: workspaceId,
-										half
-									}
-								});
-							};
-							const dropWorkspace = workspaceId === void 0 ? void 0 : (half) => {
-								if (workspaceDrag === null) return;
-								commitWorkspaceDrag(workspaceDrag, {
-									id: workspaceId,
-									half
-								});
-							};
-							return (0, react_jsx_runtime.jsxs)("div", {
-								className: clsx(WorkspaceBrowser_module_css_default.groupSection, workspaceMarker === "before" && WorkspaceBrowser_module_css_default.workspaceDropBefore, workspaceMarker === "after" && WorkspaceBrowser_module_css_default.workspaceDropAfter),
-								onDragOver: workspaceDrag === null || hoverWorkspace === void 0 ? void 0 : (e) => {
-									e.preventDefault();
-									e.dataTransfer.dropEffect = "move";
-									hoverWorkspace(workspaceGroupHalf(e));
-								},
-								onDrop: workspaceDrag === null || dropWorkspace === void 0 ? void 0 : (e) => {
-									e.preventDefault();
-									dropWorkspace(workspaceGroupHalf(e));
-								},
-								children: [
-									(0, react_jsx_runtime.jsx)(ProjectRowItem, {
-										group,
-										home,
-										t,
-										onToggle: () => {
-											if (group.expanded) setExpandedSessionGroups((keys) => keys.filter((key) => key !== group.key));
-											setGroupExpanded(group.key, !group.expanded);
-										},
-										onCreate: () => {
-											if (group.workspaceId !== void 0) {
-												setGroupExpanded(group.key, true);
-												startSession(group.workspaceId);
-											}
-										},
-										drag: workspaceDragProps,
-										actions: group.workspaceId === void 0 ? void 0 : {
-											rename: () => {
-												/* v8 ignore next -- narrowing guard: the actions object exists only for real-workspace groups. */
-												if (group.workspaceId !== void 0) onRenameRequest(group.workspaceId, group.label);
-											},
-											delete: () => {
-												/* v8 ignore next -- narrowing guard: the actions object exists only for real-workspace groups. */
-												if (group.workspaceId !== void 0) onDeleteRequest(group.workspaceId, group.label);
-											}
-										}
-									}),
-									(sessionsExpanded ? group.sessions : collapsed.rows).map((node) => {
-										const sameGroupDrag = drag !== null && drag.accountKey === group.key;
-										const dragProps = {
-											start: () => {
-												sessionDropCommitted.current = false;
-												setDrag({
-													accountKey: group.key,
-													sessionId: node.id,
-													over: null
-												});
-											},
-											active: sameGroupDrag,
-											marker: sameGroupDrag && drag.over?.id === node.id ? drag.over.half : null,
-											hover: (half) => {
-												/* v8 ignore next -- narrowing guard: Rows gates hover on `active`, which is false while the drag state is null. */
-												setDrag((d) => d === null ? d : {
-													...d,
-													over: {
-														id: node.id,
-														half
-													}
-												});
-											},
-											drop: (half) => {
-												/* v8 ignore next -- narrowing guard: Rows gates drop on `active`, which is false while the drag state is null. */
-												if (drag === null) return;
-												commitSessionDrag(drag, {
-													id: node.id,
-													half
-												});
-											},
-											end: () => {
-												if (drag?.over !== null && drag?.over !== void 0) commitSessionDrag(drag, drag.over);
-												else setDrag(null);
-												sessionDropCommitted.current = false;
-											}
-										};
-										return (0, react_jsx_runtime.jsx)(SessionNodeItem, {
-											node,
-											currentId: current,
-											now,
-											onOpen: open,
-											onRename: onSessionRename,
-											onFork: forkSession,
-											onArchive: onSessionArchive,
-											onReveal: node.id === revealSessionId && group.key === revealGroup ? () => {
-												onSessionRevealed(node.id);
-											} : void 0,
-											drag: dragProps,
-											t
-										}, node.id);
-									}),
-									collapsed.hiddenCount > 0 && (0, react_jsx_runtime.jsx)("button", {
-										type: "button",
-										className: WorkspaceBrowser_module_css_default.sessionOverflowButton,
-										"aria-expanded": sessionsExpanded,
-										onClick: () => {
-											setExpandedSessionGroups((keys) => toggled(keys, group.key));
-										},
-										children: sessionsExpanded ? t("sessions.collapse") : t("sessions.expand", { n: collapsed.hiddenCount })
-									})
-								]
-							}, group.key);
-						})]
+						}), rootGroups.map((group) => renderGroup(group, 0))]
 					}),
 					(0, react_jsx_runtime.jsx)("span", { className: WorkspaceBrowser_module_css_default.fade })
 				]
 			});
 		}
 		/** The flat "In one list" body: every session is one draggable top-level row. */
-		function FlatList({ useSessions, useSessionPendingInteraction, open, forkSession, onSessionRename, onSessionArchive, archivedSessionIds, usePanelInfo, orderBy, sessionOrderByAccount, sessionUpdatedAtByAccount, syncSessionOrderAccount, setSessionOrder, revealSessionId, onSessionRevealed, t }) {
+		function FlatList({ list, sessionIds, useSessionStatus, open, forkSession, onSessionRename, onSessionArchive, usePanelInfo, setSessionOrder, revealSessionId, onSessionRevealed, t }) {
 			const panelActive = usePanelInfo((info) => info.activePanelId !== null);
-			const list = useSessions((s) => s);
-			const pendingInteractions = useSessionPendingInteraction((s) => s);
-			const baseRows = (0, react.useMemo)(() => deriveFlat(list, archivedSessionIds, pendingInteractions), [
-				list,
-				archivedSessionIds,
-				pendingInteractions
-			]);
-			const sessionIds = (0, react.useMemo)(() => baseRows.map((row) => row.id), [baseRows]);
-			const previousOrderBy = (0, react.useRef)(orderBy);
-			(0, react.useEffect)(() => {
-				if (list.phase !== "ready") return;
-				const previousOrder = sessionOrderByAccount[FLAT_SESSION_ORDER_KEY];
-				const previousUpdatedAt = sessionUpdatedAtByAccount["__flat_session_order__"] ?? {};
-				const switchedToUpdated = previousOrderBy.current !== "updated" && orderBy === "updated";
-				previousOrderBy.current = orderBy;
-				const next = nextSessionOrderAccount({
-					sessionIds,
-					previousOrder,
-					previousUpdatedAt,
-					list,
-					orderBy,
-					sortByRecency: orderBy === "updated" && (previousOrder === void 0 || switchedToUpdated)
-				});
-				if (next.changed) syncSessionOrderAccount(FLAT_SESSION_ORDER_KEY, next.order.map((id) => id), next.updatedAt);
-			}, [
+			const statuses = useSessionStatus((s) => s);
+			const rows = (0, react.useMemo)(() => deriveFlat(list, sessionIds, statuses), [
 				list,
-				orderBy,
-				sessionOrderByAccount,
-				sessionUpdatedAtByAccount,
 				sessionIds,
-				syncSessionOrderAccount
-			]);
-			const rows = (0, react.useMemo)(() => {
-				const byId = new Map(baseRows.map((row) => [row.id, row]));
-				return reconciledSessionOrder(sessionIds, sessionOrderByAccount[FLAT_SESSION_ORDER_KEY]).flatMap((id) => {
-					const row = byId.get(id);
-					return row === void 0 ? [] : [row];
-				});
-			}, [
-				baseRows,
-				sessionOrderByAccount,
-				sessionIds
+				statuses
 			]);
 			const [drag, setDrag] = (0, react.useState)(null);
 			const dropCommitted = (0, react.useRef)(false);
 			useNativeDragAcceptance(drag !== null);
+			const currentId = panelActive ? void 0 : Object.values(list.byId).find((session) => (session.retainedBy.mainView ?? 0) > 0)?.id;
 			const commitDrag = (activeDrag, over) => {
 				if (dropCommitted.current) return;
 				dropCommitted.current = true;
@@ -1844,7 +1938,8 @@ window.__ModuleLoader__.load({
 				const nextOrder = rows.map((row) => row.id).filter((id) => id !== activeDrag.sessionId);
 				const insertAt = anchor === void 0 ? nextOrder.length : nextOrder.indexOf(anchor);
 				nextOrder.splice(insertAt === -1 ? nextOrder.length : insertAt, 0, activeDrag.sessionId);
-				setSessionOrder(FLAT_SESSION_ORDER_KEY, nextOrder.map((id) => id));
+				const currentBlank = rows.find((node) => node.blank)?.id;
+				setSessionOrder(FLAT_SESSION_ORDER_KEY, pinCurrentBlank(nextOrder, currentBlank));
 			};
 			const now = Date.now();
 			return (0, react_jsx_runtime.jsxs)("div", {
@@ -1858,9 +1953,10 @@ window.__ModuleLoader__.load({
 						children: t("empty.none")
 					}), rows.map((node) => {
 						const active = drag !== null;
+						const normalizeHalf = (half) => node.blank ? "after" : half;
 						return (0, react_jsx_runtime.jsx)(SessionNodeItem, {
 							node,
-							currentId: panelActive ? void 0 : list.current,
+							currentId,
 							now,
 							onOpen: open,
 							onRename: onSessionRename,
@@ -1886,14 +1982,14 @@ window.__ModuleLoader__.load({
 										...current,
 										over: {
 											id: node.id,
-											half
+											half: normalizeHalf(half)
 										}
 									});
 								},
 								drop: (half) => {
 									if (drag !== null) commitDrag(drag, {
 										id: node.id,
-										half
+										half: normalizeHalf(half)
 									});
 								},
 								end: () => {
@@ -1909,27 +2005,28 @@ window.__ModuleLoader__.load({
 			});
 		}
 		/** Flat search body: local metadata matches plus the current Host result page. */
-		function SearchResults({ useSessions, useSessionPendingInteraction, open, workspaces, archivedSessionIds, query, remote, resultLimit, usePanelInfo, t }) {
+		function SearchResults({ useSessions, useSessionStatus, open, workspaces, archivedSessionIds, query, remote, resultLimit, usePanelInfo, t }) {
 			const panelActive = usePanelInfo((info) => info.activePanelId !== null);
 			const list = useSessions((s) => s);
-			const pendingInteractions = useSessionPendingInteraction((s) => s);
+			const statuses = useSessionStatus((s) => s);
 			const currentRemote = remote.query === query ? remote : {
 				query,
 				status: "loading",
 				items: [],
 				hasMore: false
 			};
-			const results = (0, react.useMemo)(() => deriveSearchResults(list, workspaces, query, archivedSessionIds, pendingInteractions, currentRemote, resultLimit), [
+			const results = (0, react.useMemo)(() => deriveSearchResults(list, workspaces, query, archivedSessionIds, statuses, currentRemote, resultLimit), [
 				list,
 				workspaces,
 				query,
 				archivedSessionIds,
-				pendingInteractions,
+				statuses,
 				currentRemote,
 				resultLimit
 			]);
 			const pending = currentRemote.status === "loading";
 			const failed = currentRemote.status === "error";
+			const currentId = panelActive ? void 0 : Object.values(list.byId).find((session) => (session.retainedBy.mainView ?? 0) > 0)?.id;
 			return (0, react_jsx_runtime.jsxs)("div", {
 				className: clsx(WorkspaceBrowser_module_css_default.treeBody, WorkspaceBrowser_module_css_default.wide),
 				children: [(0, react_jsx_runtime.jsxs)("div", {
@@ -1941,7 +2038,7 @@ window.__ModuleLoader__.load({
 							"aria-label": t("search.results.aria"),
 							children: results.items.map((result) => (0, react_jsx_runtime.jsx)(SearchResultItem, {
 								result,
-								currentId: panelActive ? void 0 : list.current,
+								currentId,
 								onOpen: open,
 								t
 							}, result.id))
@@ -1973,8 +2070,9 @@ window.__ModuleLoader__.load({
 		* @param props - composed slot props (shell owner share + store + injected actions).
 		* @returns the region element tree.
 		*/
-		function WorkspaceBrowser({ wide, usePanelInfo, expandSidebar, useSessions, useSessionPendingInteraction, useWorkspaces, useStore, actions, startSession, open, renameSession, forkSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, archiveSession, insertSessionBefore, createWorkspace, searchSessions, searchResultLimit, useDirectoryFlow, useHostInfo, renderSlot, t }) {
+		function WorkspaceBrowser({ wide, usePanelInfo, expandSidebar, useSessions, useSessionStatus, useWorkspaces, useStore, actions, startSession, open, renameSession, forkSession, renameWorkspace, deleteWorkspace, insertWorkspaceBefore, archiveSession, createWorkspace, searchSessions, searchResultLimit, useDirectoryFlow, useHostInfo, renderSlot, t }) {
 			const home = useHostInfo((info) => info.home);
+			const list = useSessions((state) => state);
 			const workspaces = useWorkspaces((state) => state.items);
 			const workspacePhase = useWorkspaces((state) => state.phase);
 			const workspaceStreamState = useWorkspaces((state) => state.state);
@@ -1984,34 +2082,55 @@ window.__ModuleLoader__.load({
 			const orderBy = useStore((s) => s.orderBy);
 			const groupExpansion = useStore((s) => s.groupExpansion);
 			const sessionOrderByAccount = useStore((s) => s.sessionOrderByAccount);
-			const sessionUpdatedAtByAccount = useStore((s) => s.sessionUpdatedAtByAccount);
-			const currentBlankSessionId = useSessions((state) => {
-				const current = state.current;
-				return current !== void 0 && state.byId[current]?.blank === true ? current : void 0;
-			});
-			const currentBlankAccount = currentBlankSessionId === void 0 || workspacePhase !== "ready" ? void 0 : owningGroupKey(workspaces, currentBlankSessionId);
-			const promotedBlank = (0, react.useRef)(void 0);
-			(0, react.useEffect)(() => {
-				if (currentBlankSessionId === void 0 || currentBlankAccount === void 0) {
-					promotedBlank.current = void 0;
-					return;
-				}
-				const promoted = promotedBlank.current;
-				if (promoted !== void 0 && promoted.sessionId === currentBlankSessionId && promoted.accountKey === currentBlankAccount) return;
-				promotedBlank.current = {
-					sessionId: currentBlankSessionId,
-					accountKey: currentBlankAccount
+			const workspaceReady = workspacePhase === "ready" && workspaceStreamState !== "loading";
+			const mainSessionId = Object.values(list.byId).find((session) => (session.retainedBy.mainView ?? 0) > 0)?.id;
+			const currentBlank = mainSessionId !== void 0 && list.byId[mainSessionId]?.blank === true ? mainSessionId : void 0;
+			const ungroupedMemberIds = (0, react.useMemo)(() => {
+				const accounted = new Set(workspaces.flatMap((workspace) => workspace.sessionIds));
+				return list.ids.filter((id) => list.byId[id] !== void 0 && !accounted.has(id));
+			}, [list, workspaces]);
+			const flatMemberIds = (0, react.useMemo)(() => visibleSessionIds(list, archivedSessionIds), [archivedSessionIds, list]);
+			const orderedWorkspaces = (0, react.useMemo)(() => workspaces.map((workspace) => {
+				const memberIds = workspace.sessionIds;
+				const baseOrder = orderBy === "updated" ? orderByRecency(memberIds, list.byId) : reconcileManualOrder(memberIds, sessionOrderByAccount[workspace.workspaceId], list.byId);
+				return {
+					...workspace,
+					sessionIds: pinCurrentBlank(baseOrder, currentBlank !== void 0 && memberIds.includes(currentBlank) ? currentBlank : void 0)
 				};
-				for (const accountKey of new Set([currentBlankAccount, FLAT_SESSION_ORDER_KEY])) {
-					const previous = sessionOrderByAccount[accountKey] ?? [];
-					actions.setSessionOrder(accountKey, [currentBlankSessionId, ...previous.filter((id) => id !== currentBlankSessionId)]);
-				}
+			}), [
+				currentBlank,
+				list.byId,
+				orderBy,
+				sessionOrderByAccount,
+				workspaces
+			]);
+			const orderedUngroupedSessionIds = (0, react.useMemo)(() => {
+				return pinCurrentBlank(orderBy === "updated" ? orderByRecency(ungroupedMemberIds, list.byId) : reconcileManualOrder(ungroupedMemberIds, sessionOrderByAccount[""], list.byId), currentBlank !== void 0 && ungroupedMemberIds.includes(currentBlank) ? currentBlank : void 0);
 			}, [
-				actions.setSessionOrder,
-				currentBlankAccount,
-				currentBlankSessionId,
+				currentBlank,
+				list.byId,
+				orderBy,
+				sessionOrderByAccount,
+				ungroupedMemberIds
+			]);
+			const orderedFlatSessionIds = (0, react.useMemo)(() => {
+				return pinCurrentBlank(orderBy === "updated" ? orderByRecency(flatMemberIds, list.byId) : reconcileManualOrder(flatMemberIds, sessionOrderByAccount[FLAT_SESSION_ORDER_KEY], list.byId), currentBlank !== void 0 && flatMemberIds.includes(currentBlank) ? currentBlank : void 0);
+			}, [
+				currentBlank,
+				flatMemberIds,
+				list.byId,
+				orderBy,
 				sessionOrderByAccount
 			]);
+			const activeSessionOrders = (0, react.useMemo)(() => Object.fromEntries([
+				...orderedWorkspaces.map((workspace) => [workspace.workspaceId, workspace.sessionIds]),
+				["", orderedUngroupedSessionIds],
+				[FLAT_SESSION_ORDER_KEY, orderedFlatSessionIds]
+			]), [
+				orderedFlatSessionIds,
+				orderedUngroupedSessionIds,
+				orderedWorkspaces
+			]);
 			(0, react.useEffect)(() => {
 				if (workspacePhase !== "ready") return;
 				actions.retainAccountKeys([
@@ -2024,6 +2143,44 @@ window.__ModuleLoader__.load({
 				workspacePhase,
 				workspaces
 			]);
+			(0, react.useEffect)(() => {
+				if (list.phase !== "ready" || workspaceReady || orderBy !== "manual" || currentBlank === void 0) return;
+				const changed = {};
+				for (const [key, ids] of Object.entries(activeSessionOrders)) {
+					if (key !== "__flat_session_order__" && workspacePhase !== "ready") continue;
+					const saved = sessionOrderByAccount[key] ?? [];
+					if (ids[0] !== currentBlank || saved[0] === currentBlank) continue;
+					changed[key] = [currentBlank, ...saved.filter((id) => id !== currentBlank)];
+				}
+				if (Object.keys(changed).length > 0) actions.syncSessionOrders(changed);
+			}, [
+				actions.syncSessionOrders,
+				activeSessionOrders,
+				currentBlank,
+				list.phase,
+				orderBy,
+				sessionOrderByAccount,
+				workspacePhase,
+				workspaceReady
+			]);
+			(0, react.useEffect)(() => {
+				if (list.phase !== "ready" || !workspaceReady || orderBy !== "manual") return;
+				const changed = Object.fromEntries(Object.entries(activeSessionOrders).filter(([key, ids]) => {
+					const saved = sessionOrderByAccount[key];
+					return saved === void 0 || saved.length !== ids.length || ids.some((id, index) => id !== saved[index]);
+				}));
+				if (Object.keys(changed).length > 0) actions.syncSessionOrders(changed);
+			}, [
+				actions.syncSessionOrders,
+				activeSessionOrders,
+				list.phase,
+				orderBy,
+				sessionOrderByAccount,
+				workspaceReady
+			]);
+			const saveSessionOrder = (accountKey, order) => {
+				actions.setSessionOrder(accountKey, order, activeSessionOrders);
+			};
 			const [query, setQuery] = (0, react.useState)("");
 			const [searchExpanded, setSearchExpanded] = (0, react.useState)(false);
 			const [revealSessionId, setRevealSessionId] = (0, react.useState)(void 0);
@@ -2296,7 +2453,7 @@ window.__ModuleLoader__.load({
 										actions.setGroupBy(mode);
 									},
 									onOrderPick: (mode) => {
-										actions.setOrderBy(mode);
+										actions.setOrderBy(mode, activeSessionOrders);
 									},
 									t
 								}), directoryFlowAvailable && (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
@@ -2357,7 +2514,7 @@ window.__ModuleLoader__.load({
 						children: wide && (normalizedQuery !== "" ? (0, react_jsx_runtime.jsx)(SearchResults, {
 							usePanelInfo,
 							useSessions,
-							useSessionPendingInteraction,
+							useSessionStatus,
 							open: openSearchResult,
 							workspaces,
 							archivedSessionIds,
@@ -2367,42 +2524,35 @@ window.__ModuleLoader__.load({
 							t
 						}) : groupBy === "flat" ? (0, react_jsx_runtime.jsx)(FlatList, {
 							usePanelInfo,
-							useSessions,
-							useSessionPendingInteraction,
+							list,
+							sessionIds: orderedFlatSessionIds,
+							useSessionStatus,
 							open,
 							forkSession,
 							onSessionRename,
 							onSessionArchive,
-							archivedSessionIds,
-							orderBy,
-							sessionOrderByAccount,
-							sessionUpdatedAtByAccount,
-							syncSessionOrderAccount: actions.syncSessionOrderAccount,
-							setSessionOrder: actions.setSessionOrder,
+							setSessionOrder: saveSessionOrder,
 							revealSessionId,
 							onSessionRevealed: acknowledgeSessionReveal,
 							t
 						}) : (0, react_jsx_runtime.jsx)(SessionTree, {
 							usePanelInfo,
-							useSessions,
-							useSessionPendingInteraction,
+							list,
+							useSessionStatus,
 							onSessionRename,
 							onSessionArchive,
 							forkSession,
-							workspaces,
-							workspaceReady: workspacePhase === "ready" && workspaceStreamState !== "loading",
+							workspaces: orderedWorkspaces,
+							ungroupedSessionIds: orderedUngroupedSessionIds,
+							workspaceReady,
+							nestWorkspaces: groupBy === "workspace-tree",
 							groupExpansion,
 							setGroupExpanded: actions.setGroupExpanded,
-							sessionOrderByAccount,
-							sessionUpdatedAtByAccount,
-							syncSessionOrderAccount: actions.syncSessionOrderAccount,
-							setSessionOrder: actions.setSessionOrder,
+							setSessionOrder: saveSessionOrder,
 							archivedSessionIds,
 							startSession,
 							open,
 							insertWorkspaceBefore,
-							insertSessionBefore,
-							orderBy,
 							revealSessionId,
 							onSessionRevealed: acknowledgeSessionReveal,
 							home,
@@ -2573,6 +2723,7 @@ window.__ModuleLoader__.load({
 			"viewOptions.label": "视图选项",
 			"groupBy.label": "分组方式",
 			"groupBy.workspace": "按工作区",
+			"groupBy.workspaceTree": "按工作区树",
 			"groupBy.flat": "单列表",
 			"orderBy.label": "排序方式",
 			"orderBy.manual": "手动排序",
@@ -2639,6 +2790,7 @@ window.__ModuleLoader__.load({
 			"viewOptions.label": "View options",
 			"groupBy.label": "Group by",
 			"groupBy.workspace": "WorkSpace",
+			"groupBy.workspaceTree": "Workspace Tree",
 			"groupBy.flat": "In one list",
 			"orderBy.label": "Order by",
 			"orderBy.manual": "Manual",
@@ -2758,9 +2910,7 @@ window.__ModuleLoader__.load({
 				searchSessions,
 				searchResultLimit: sessions.searchResultLimit,
 				renameSession: async (sessionId, title) => {
-					const session = sessions.binding(sessionId)?.session;
-					if (session === void 0) throw new Error(`unknown session "${sessionId}"`);
-					const result = await session.rename(title);
+					const result = await sessions.using(sessionId, { source: "workspaceOperation" }, (reference) => reference.binding.session.rename(title));
 					if (!result.ok) throw new Error(result.error.message);
 				},
 				forkSession: (sessionId) => {
@@ -2778,9 +2928,6 @@ window.__ModuleLoader__.load({
 				archiveSession: async (sessionId) => {
 					await uiWorkspace.archiveSession(sessionId);
 				},
-				insertSessionBefore: async (workspaceId, sessionId, beforeSessionId) => {
-					await workspaces.insertSessionBefore(workspaceId, sessionId, beforeSessionId);
-				},
 				createWorkspace: (input) => workspaces.create(input),
 				hooks: {
 					directoryFlow: browserFlowSource,