@michengai/dsh-archive-manager 0.1.9 → 0.1.11

package/README.md

@@ -36,6 +36,8 @@ Safe archived session control
 
 > DSH Archive Manager is a community-maintained DeepSeek Harness (DSH) plugin, not an official DeepSeek AI product.
 
+> Handover docs (Chinese): [docs/00-交接入口](docs/00-交接入口/项目概览.md)
+
 ## Features
 
 - Archive a session from the sidebar session menu.

package/README.zh-CN.md

@@ -36,6 +36,8 @@ Safe archived session control
 
 > DSH Archive Manager 是社区维护的 DeepSeek Harness（DSH）插件，并非 DeepSeek AI 官方产品。
 
+> 交接入口：[docs/00-交接入口](docs/00-交接入口/项目概览.md)
+
 ## 功能概览
 
 - 在侧栏会话菜单中选择「归档会话」。

package/lib/client.js

@@ -199,66 +199,6 @@ window.__ModuleLoader__.load({
 		function sessionVisible(session, current, archived, showArchived) {
 			return session.origin !== "subagent" && (!archived.has(session.id) || showArchived === true) && (!session.blank || session.id === current);
 		}
-		/**
-		* 单个删除按钮的目标：先子代理（含多层），再本会话。fork 分支不是 subagent，不会被收进来。
-		*/
-		function collectSessionAndDescendantIds(sessionId, byId) {
-			if (typeof sessionId !== "string" || sessionId.length === 0) return [];
-			const catalog = byId ?? {};
-			const childrenByParent = /* @__PURE__ */ new Map();
-			for (const session of Object.values(catalog)) {
-				if (session === void 0 || session.origin !== "subagent" || typeof session.id !== "string" || session.id.length === 0) continue;
-				const parentId = session.parentId;
-				if (typeof parentId !== "string") continue;
-				const list = childrenByParent.get(parentId) ?? [];
-				list.push(session.id);
-				childrenByParent.set(parentId, list);
-			}
-			const ordered = [];
-			const seen = /* @__PURE__ */ new Set();
-			const visit = (id) => {
-				for (const childId of childrenByParent.get(id) ?? []) {
-					if (seen.has(childId)) continue;
-					seen.add(childId);
-					visit(childId);
-					ordered.push(childId);
-				}
-			};
-			visit(sessionId);
-			if (!seen.has(sessionId)) ordered.push(sessionId);
-			return ordered;
-		}
-		/**
-		* 仅供 __test 使用：展开已归档 id 及其仍在目录中的 subagent 子会话，先子后父。运行时删除只提交根会话或归档集合。
-		*/
-		function collectArchivedDeleteAllIds(archivedSessionIds, byId) {
-			const catalog = byId ?? {};
-			const ids = [];
-			const seenArchived = /* @__PURE__ */ new Set();
-			for (const id of archivedSessionIds ?? []) {
-				if (typeof id !== "string" || id.length === 0 || seenArchived.has(id)) continue;
-				seenArchived.add(id);
-				ids.push(id);
-			}
-			const result = [];
-			const seen = /* @__PURE__ */ new Set();
-			const addTree = (id) => {
-				for (const item of collectSessionAndDescendantIds(id, catalog)) {
-					if (seen.has(item)) continue;
-					seen.add(item);
-					result.push(item);
-				}
-			};
-			for (const id of ids) {
-				if (catalog[id]?.origin === "subagent") continue;
-				addTree(id);
-			}
-			for (const id of ids) {
-				if (seen.has(id)) continue;
-				addTree(id);
-			}
-			return result;
-		}
 		/** 识别删除路径上“会话已不存在”的稳定标记；保留旧文案作兜底。 */
 		function isUnknownSessionError(reason) {
 			const message = reason instanceof Error ? reason.message : String(reason);
@@ -1741,7 +1681,7 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => {
 				if (list.phase !== "ready") return;
 				const previousOrder = sessionOrderByAccount[FLAT_SESSION_ORDER_KEY];
-				const previousUpdatedAt = sessionUpdatedAtByAccount["__flat_session_order__"] ?? {};
+				const previousUpdatedAt = sessionUpdatedAtByAccount[FLAT_SESSION_ORDER_KEY] ?? {};
 				const switchedToUpdated = previousOrderBy.current !== "updated" && orderBy === "updated";
 				previousOrderBy.current = orderBy;
 				const next = nextSessionOrderAccount({
@@ -2564,133 +2504,187 @@ window.__ModuleLoader__.load({
 			tag.textContent = ARCHIVE_SETTINGS_LAYOUT_OVERRIDE;
 			document.head.appendChild(tag);
 		}
-		/** 设置页项目筛选：自定义菜单，避免原生 select 弹出系统浅色下拉。 */
-		function ArchiveProjectSelect({ id, value, options, onChange, "aria-label": ariaLabel }) {
-			const [open, setOpen] = (0, react.useState)(false);
-			const selectedIndex = Math.max(0, options.findIndex((option) => option.value === value));
-			const [active, setActive] = (0, react.useState)(selectedIndex);
-			const rootRef = (0, react.useRef)(null);
-			const triggerRef = (0, react.useRef)(null);
-			const listRef = (0, react.useRef)(null);
-			const wasOpen = (0, react.useRef)(false);
-			const selected = options[selectedIndex];
-			(0, react.useEffect)(() => {
-				if (!open) return;
-				setActive(selectedIndex);
-				const onPointerDown = (event) => {
-					const target = event.target;
-					if (target instanceof Node && rootRef.current?.contains(target) === true) return;
-					setOpen(false);
-				};
-				document.addEventListener("pointerdown", onPointerDown);
-				return () => document.removeEventListener("pointerdown", onPointerDown);
-			}, [open, selectedIndex]);
-			(0, react.useEffect)(() => {
-				if (open) {
-					listRef.current?.focus();
-					wasOpen.current = true;
-					return;
-				}
-				if (wasOpen.current) {
-					triggerRef.current?.focus();
-					wasOpen.current = false;
-				}
-			}, [open]);
-			(0, react.useEffect)(() => {
-				if (!open) return;
-				document.getElementById(id + "-opt-" + String(active))?.scrollIntoView({ block: "nearest" });
-			}, [active, open, id]);
-			const choose = (next) => {
-				onChange(next);
-				setOpen(false);
-			};
-			const move = (next) => {
-				if (options.length === 0) return;
-				setActive(Math.min(options.length - 1, Math.max(0, next)));
-			};
-			return (0, react_jsx_runtime.jsxs)("div", {
-				className: "dsham_settingsFilter",
-				ref: rootRef,
-				children: [(0, react_jsx_runtime.jsxs)("button", {
-					id,
-					ref: triggerRef,
-					type: "button",
-					className: "dsham_selectTrigger",
-					"aria-label": ariaLabel,
-					"aria-haspopup": "listbox",
-					"aria-expanded": open,
-					"aria-controls": id + "-list",
-					onClick: () => setOpen((current) => !current),
-					onKeyDown: (event) => {
-						if (event.key === "ArrowDown" || event.key === "ArrowUp" || event.key === "Enter" || event.key === " ") {
-							event.preventDefault();
-							setOpen(true);
-						}
-					},
-					children: [(0, react_jsx_runtime.jsx)("span", { className: "dsham_selectValue", children: selected === void 0 ? "" : selected.label }), (0, react_jsx_runtime.jsx)("svg", {
-						className: "dsham_selectCaret",
-						viewBox: "0 0 12 12",
-						"aria-hidden": true,
-						focusable: false,
-						children: (0, react_jsx_runtime.jsx)("path", {
-							d: "M2.5 4.5L6 8l3.5-3.5",
-							fill: "none",
-							stroke: "currentColor",
-							strokeWidth: "1.5",
-							strokeLinecap: "round",
-							strokeLinejoin: "round"
-						})
-					})]
-				}), open ? (0, react_jsx_runtime.jsx)("div", {
-					id: id + "-list",
-					ref: listRef,
-					className: "dsham_selectMenu",
-					role: "listbox",
-					tabIndex: 0,
-					"aria-activedescendant": id + "-opt-" + String(active),
-					onKeyDown: (event) => {
-						if (event.key === "ArrowDown") {
-							event.preventDefault();
-							move(active + 1);
-							return;
-						}
-						if (event.key === "ArrowUp") {
-							event.preventDefault();
-							move(active - 1);
-							return;
-						}
-						if (event.key === "Home") {
-							event.preventDefault();
-							move(0);
-							return;
-						}
-						if (event.key === "End") {
-							event.preventDefault();
-							move(options.length - 1);
-							return;
-						}
-						if (event.key === "Enter" || event.key === " ") {
-							event.preventDefault();
-							const option = options[active];
-							if (option !== void 0) choose(option.value);
-							return;
-						}
-						if (event.key === "Escape" || event.key === "Tab") setOpen(false);
-					},
-					children: options.map((option, index) => (0, react_jsx_runtime.jsx)("button", {
-						id: id + "-opt-" + String(index),
-						type: "button",
-						role: "option",
-						className: "dsham_selectOption",
-						"aria-selected": option.value === value,
-						"data-active": index === active,
-						onMouseEnter: () => setActive(index),
-						onClick: () => choose(option.value),
-						children: option.label
-					}, option.value === "all" ? "all" : option.value))
-				}) : null]
-			});
-		}
+		/** 设置页项目筛选：自定义菜单，避免原生 select 弹出系统浅色下拉。 */
+		function ArchiveProjectSelect({ id, value, options, onChange, "aria-label": ariaLabel }) {
+			const [open, setOpen] = (0, react.useState)(false);
+			const selectedIndex = Math.max(0, options.findIndex((option) => option.value === value));
+			const [active, setActive] = (0, react.useState)(selectedIndex);
+			const rootRef = (0, react.useRef)(null);
+			const triggerRef = (0, react.useRef)(null);
+			const listRef = (0, react.useRef)(null);
+			const wasOpen = (0, react.useRef)(false);
+			const selected = options[selectedIndex];
+			(0, react.useEffect)(() => {
+				if (!open) return;
+				setActive(selectedIndex);
+				const onPointerDown = (event) => {
+					const target = event.target;
+					if (target instanceof Node && rootRef.current?.contains(target) === true) return;
+					setOpen(false);
+				};
+				document.addEventListener("pointerdown", onPointerDown);
+				return () => document.removeEventListener("pointerdown", onPointerDown);
+			}, [open, selectedIndex]);
+			(0, react.useEffect)(() => {
+				if (open) {
+					listRef.current?.focus();
+					wasOpen.current = true;
+					return;
+				}
+				if (wasOpen.current) {
+					triggerRef.current?.focus();
+					wasOpen.current = false;
+				}
+			}, [open]);
+			(0, react.useEffect)(() => {
+				if (!open) return;
+				document.getElementById(id + "-opt-" + String(active))?.scrollIntoView({ block: "nearest" });
+			}, [active, open, id]);
+			const choose = (next) => {
+				onChange(next);
+				setOpen(false);
+			};
+			const move = (next) => {
+				if (options.length === 0) return;
+				setActive(Math.min(options.length - 1, Math.max(0, next)));
+			};
+			return (0, react_jsx_runtime.jsxs)("div", {
+				className: "dsham_settingsFilter",
+				ref: rootRef,
+				children: [(0, react_jsx_runtime.jsxs)("button", {
+					id,
+					ref: triggerRef,
+					type: "button",
+					className: "dsham_selectTrigger",
+					"aria-label": ariaLabel,
+					"aria-haspopup": "listbox",
+					"aria-expanded": open,
+					"aria-controls": id + "-list",
+					onClick: () => setOpen((current) => !current),
+					onKeyDown: (event) => {
+						if (event.key === "ArrowDown" || event.key === "ArrowUp" || event.key === "Enter" || event.key === " ") {
+							event.preventDefault();
+							setOpen(true);
+						}
+					},
+					children: [(0, react_jsx_runtime.jsx)("span", { className: "dsham_selectValue", children: selected === void 0 ? "" : selected.label }), (0, react_jsx_runtime.jsx)("svg", {
+						className: "dsham_selectCaret",
+						viewBox: "0 0 12 12",
+						"aria-hidden": true,
+						focusable: false,
+						children: (0, react_jsx_runtime.jsx)("path", {
+							d: "M2.5 4.5L6 8l3.5-3.5",
+							fill: "none",
+							stroke: "currentColor",
+							strokeWidth: "1.5",
+							strokeLinecap: "round",
+							strokeLinejoin: "round"
+						})
+					})]
+				}), open ? (0, react_jsx_runtime.jsx)("div", {
+					id: id + "-list",
+					ref: listRef,
+					className: "dsham_selectMenu",
+					role: "listbox",
+					tabIndex: 0,
+					"aria-activedescendant": id + "-opt-" + String(active),
+					onKeyDown: (event) => {
+						if (event.key === "ArrowDown") {
+							event.preventDefault();
+							move(active + 1);
+							return;
+						}
+						if (event.key === "ArrowUp") {
+							event.preventDefault();
+							move(active - 1);
+							return;
+						}
+						if (event.key === "Home") {
+							event.preventDefault();
+							move(0);
+							return;
+						}
+						if (event.key === "End") {
+							event.preventDefault();
+							move(options.length - 1);
+							return;
+						}
+						if (event.key === "Enter" || event.key === " ") {
+							event.preventDefault();
+							const option = options[active];
+							if (option !== void 0) choose(option.value);
+							return;
+						}
+						if (event.key === "Escape" || event.key === "Tab") {
+							event.preventDefault();
+							event.stopPropagation();
+							if (typeof event.stopImmediatePropagation === "function") event.stopImmediatePropagation();
+							setOpen(false);
+						}
+					},
+					children: options.map((option, index) => (0, react_jsx_runtime.jsx)("button", {
+						id: id + "-opt-" + String(index),
+						type: "button",
+						role: "option",
+						className: "dsham_selectOption",
+						"aria-selected": option.value === value,
+						"data-active": index === active,
+						onMouseEnter: () => setActive(index),
+						onClick: () => choose(option.value),
+						children: option.label
+					}, option.value === "all" ? "all" : option.value))
+				}) : null]
+			});
+		}
+		/** 设置页“未分组”桶的稳定 key（workspaceId 均为非空 uuid，不会冲突）。 */
+		const ARCHIVE_UNGROUPED_KEY = "__ungrouped__";
+		/**
+		* 设置页归档分组派生：按工作区分组，组 key 用 workspaceId（上游允许
+		* 不同路径的工作区同名，title 不能作 React key / 筛选 value），未归入
+		* 任何工作区的归档会话进“未分组”桶；隐藏 subagent（其删除由服务端级联）。
+		* @param byId - 会话摘要表（缺失摘要的归档会话不进列表）。
+		* @param items - 工作区列表（Host 顺序，含唯一 workspaceId）。
+		* @param archivedSessionIds - 注册表全局归档集合。
+		* @param ungroupedLabel - “未分组”显示文案。
+		* @returns 分组数组（仅含有会话的组），每项含 key / title / sessions。
+		*/
+		function deriveArchivedGroups(byId, items, archivedSessionIds, ungroupedLabel) {
+			const byWorkspace = items.map((workspace) => ({
+				key: workspace.workspaceId,
+				title: workspace.title,
+				ids: new Set(workspace.sessionIds),
+				sessions: []
+			}));
+			const ungrouped = [];
+			for (const id of archivedSessionIds) {
+				const session = byId[id];
+				if (session === void 0 || session.origin === "subagent") continue;
+				const group = byWorkspace.find((workspace) => workspace.ids.has(id));
+				(group === void 0 ? ungrouped : group.sessions).push(session);
+			}
+			const result = byWorkspace.filter((group) => group.sessions.length > 0);
+			if (ungrouped.length > 0) result.push({ key: ARCHIVE_UNGROUPED_KEY, title: ungroupedLabel, sessions: ungrouped });
+			return result;
+		}
+		/**
+		* “全部删除”的提交集合：直接取归档全集，仅排除摘要已知为 subagent 的
+		* id（其删除由服务端级联）。不依赖摘要是否已加载，投影未就绪的会话
+		* 不会被静默漏删。
+		* @param archivedSessionIds - 注册表全局归档集合。
+		* @param byId - 会话摘要表（可能不完整）。
+		* @returns 去重后的待删除 id 列表。
+		*/
+		function deriveArchivedDeleteAllIds(archivedSessionIds, byId) {
+			const seen = /* @__PURE__ */ new Set();
+			const ids = [];
+			for (const id of archivedSessionIds ?? []) {
+				if (typeof id !== "string" || id.length === 0 || seen.has(id)) continue;
+				seen.add(id);
+				if (byId?.[id]?.origin === "subagent") continue;
+				ids.push(id);
+			}
+			return ids;
+		}
 		/** 管理设置页中的归档会话，数据直接订阅 DSH 的会话与工作区投影。 */
 		function ArchivedSessionsSection({ sessionStore, workspaceStore, unarchiveSession, deleteSession, t }) {
 			const sessions = (0, react.useSyncExternalStore)(sessionStore.subscribe, sessionStore.getSnapshot);
@@ -2700,42 +2694,22 @@ window.__ModuleLoader__.load({
 			const [error, setError] = (0, react.useState)(null);
 			const [query, setQuery] = (0, react.useState)("");
 			const [project, setProject] = (0, react.useState)("all");
-			const groups = (0, react.useMemo)(() => {
-				// 列表仍隐藏 subagent；删除全部只提交已归档 id，子代理由服务端级联。
-				const archived = new Set(workspaceState.archivedSessionIds);
-				const byWorkspace = workspaceState.items.map((workspace) => ({
-					title: workspace.title,
-					ids: new Set(workspace.sessionIds),
-					sessions: []
-				}));
-				const ungrouped = [];
-				for (const id of workspaceState.archivedSessionIds) {
-					const session = sessions.byId[id];
-					if (session === void 0 || session.origin === "subagent" || !archived.has(id)) continue;
-					const group = byWorkspace.find((workspace) => workspace.ids.has(id));
-					(group === void 0 ? ungrouped : group.sessions).push(session);
-				}
-				const result = byWorkspace.filter((group) => group.sessions.length > 0);
-				if (ungrouped.length > 0) result.push({ title: t("group.ungrouped"), sessions: ungrouped });
-				return result;
-			}, [sessions, workspaceState, t]);
+			const groups = (0, react.useMemo)(() => deriveArchivedGroups(sessions.byId, workspaceState.items, workspaceState.archivedSessionIds, t("group.ungrouped")), [sessions.byId, workspaceState, t]);
+			(0, react.useEffect)(() => {
+				// 选中的分组消失（如最后一个归档会话被取消归档）时回退到
+				// “所有项目”，避免筛选值停留在失效 key 上把列表过滤为空。
+				if (project === "all") return;
+				if (groups.some((group) => group.key === project)) return;
+				setProject("all");
+			}, [groups, project]);
 			const filteredGroups = (0, react.useMemo)(() => {
 				const normalizedQuery = query.trim().toLocaleLowerCase();
-				return groups.filter((group) => project === "all" || project === group.title).map((group) => ({
+				return groups.filter((group) => project === "all" || project === group.key).map((group) => ({
 					...group,
 					sessions: group.sessions.filter((session) => normalizedQuery === "" || displayTitle(session, t).toLocaleLowerCase().includes(normalizedQuery))
 				})).filter((group) => group.sessions.length > 0);
 			}, [groups, project, query, t]);
-			const deleteAllSessionIds = (0, react.useMemo)(() => {
-				const ids = [];
-				const seen = /* @__PURE__ */ new Set();
-				for (const id of workspaceState.archivedSessionIds ?? []) {
-					if (typeof id !== "string" || id.length === 0 || seen.has(id)) continue;
-					seen.add(id);
-					ids.push(id);
-				}
-				return ids;
-			}, [workspaceState.archivedSessionIds]);
+			const deleteAllSessionIds = (0, react.useMemo)(() => deriveArchivedDeleteAllIds(workspaceState.archivedSessionIds, sessions.byId), [workspaceState.archivedSessionIds, sessions.byId]);
 			const onUnarchive = (sessionId) => {
 				setError(null);
 				unarchiveSession(sessionId).catch((reason) => {
@@ -2745,6 +2719,18 @@ window.__ModuleLoader__.load({
 			const closeDelete = () => {
 				if (!busy) setDeleteTarget(null);
 			};
+			(0, react.useEffect)(() => {
+				if (deleteTarget === null) return;
+				const onKeyDown = (event) => {
+					if (event.key !== "Escape") return;
+					event.preventDefault();
+					event.stopPropagation();
+					if (typeof event.stopImmediatePropagation === "function") event.stopImmediatePropagation();
+					if (!busy) setDeleteTarget(null);
+				};
+				window.addEventListener("keydown", onKeyDown, true);
+				return () => window.removeEventListener("keydown", onKeyDown, true);
+			}, [deleteTarget, busy]);
 			const confirmDelete = async () => {
 				if (busy || deleteTarget === null) return;
 				setBusy(true);
@@ -2768,7 +2754,7 @@ window.__ModuleLoader__.load({
 			return (0, react_jsx_runtime.jsxs)("section", {
 				className: "dsham_settings",
 				"aria-label": t("archives.title"),
-				children: [(0, react_jsx_runtime.jsx)("style", { children: ARCHIVE_SETTINGS_CSS }), (0, react_jsx_runtime.jsxs)("header", { className: "dsham_settingsHeader", children: [(0, react_jsx_runtime.jsxs)("div", { children: [(0, react_jsx_runtime.jsx)("h2", { children: t("archives.title") }), (0, react_jsx_runtime.jsx)("p", { className: "dsham_settingsIntro", children: t("archives.description") })] }), (0, react_jsx_runtime.jsxs)("button", { type: "button", className: "dsham_settingsDanger", disabled: busy || deleteAllSessionIds.length === 0, onClick: () => setDeleteTarget({ all: true }), children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, {}), t("archives.deleteAll")] })] }), (0, react_jsx_runtime.jsxs)("div", { className: "dsham_settingsToolbar", children: [(0, react_jsx_runtime.jsxs)("label", { className: "dsham_settingsSearch", children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutline16, {}), (0, react_jsx_runtime.jsx)("input", { type: "search", value: query, onChange: (event) => setQuery(event.target.value), placeholder: t("archives.searchPlaceholder"), "aria-label": t("archives.searchPlaceholder") })] }), (0, react_jsx_runtime.jsx)(ArchiveProjectSelect, { id: "dsham-project-filter", value: project, options: [{ value: "all", label: t("archives.allProjects") }, ...groups.map((group) => ({ value: group.title, label: group.title }))], onChange: setProject, "aria-label": t("archives.projectFilter") })] }), groups.length === 0 ? (0, react_jsx_runtime.jsx)("div", { className: "dsham_settingsEmpty", children: t("archives.empty") }) : filteredGroups.length === 0 ? (0, react_jsx_runtime.jsx)("div", { className: "dsham_settingsEmpty", children: t("archives.emptyFiltered") }) : filteredGroups.map((group) => (0, react_jsx_runtime.jsxs)("section", {
+				children: [(0, react_jsx_runtime.jsx)("style", { children: ARCHIVE_SETTINGS_CSS }), (0, react_jsx_runtime.jsxs)("header", { className: "dsham_settingsHeader", children: [(0, react_jsx_runtime.jsxs)("div", { children: [(0, react_jsx_runtime.jsx)("h2", { children: t("archives.title") }), (0, react_jsx_runtime.jsx)("p", { className: "dsham_settingsIntro", children: t("archives.description") })] }), (0, react_jsx_runtime.jsxs)("button", { type: "button", className: "dsham_settingsDanger", disabled: busy || deleteAllSessionIds.length === 0, onClick: () => setDeleteTarget({ all: true }), children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, {}), t("archives.deleteAll")] })] }), (0, react_jsx_runtime.jsxs)("div", { className: "dsham_settingsToolbar", children: [(0, react_jsx_runtime.jsxs)("label", { className: "dsham_settingsSearch", children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutline16, {}), (0, react_jsx_runtime.jsx)("input", { type: "search", value: query, onChange: (event) => setQuery(event.target.value), placeholder: t("archives.searchPlaceholder"), "aria-label": t("archives.searchPlaceholder") })] }), (0, react_jsx_runtime.jsx)(ArchiveProjectSelect, { id: "dsham-project-filter", value: project, options: [{ value: "all", label: t("archives.allProjects") }, ...groups.map((group) => ({ value: group.key, label: group.title }))], onChange: setProject, "aria-label": t("archives.projectFilter") })] }), groups.length === 0 ? (0, react_jsx_runtime.jsx)("div", { className: "dsham_settingsEmpty", children: t("archives.empty") }) : filteredGroups.length === 0 ? (0, react_jsx_runtime.jsx)("div", { className: "dsham_settingsEmpty", children: t("archives.emptyFiltered") }) : filteredGroups.map((group) => (0, react_jsx_runtime.jsxs)("section", {
 					className: "dsham_settingsGroup",
 					children: [(0, react_jsx_runtime.jsxs)("div", { className: "dsham_settingsGroupHeading", children: [(0, react_jsx_runtime.jsxs)("h3", { className: "dsham_settingsGroupTitle", children: [(0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconFolderOpenOutline16, {}), group.title] }), (0, react_jsx_runtime.jsx)("span", { className: "dsham_settingsCount", children: t("archives.sessionCount", { n: group.sessions.length }) })] }), (0, react_jsx_runtime.jsx)("div", {
 						className: "dsham_settingsList",
@@ -2780,7 +2766,7 @@ window.__ModuleLoader__.load({
 							})]
 						}, session.id))
 					})]
-				}, group.title)), error !== null && (0, react_jsx_runtime.jsx)("div", { className: "dsham_settingsError", role: "alert", children: error }), (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+				}, group.key)), error !== null && (0, react_jsx_runtime.jsx)("div", { className: "dsham_settingsError", role: "alert", children: error }), (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
 					open: deleteTarget !== null,
 					onClose: closeDelete,
 					closeLabel: t("close"),
@@ -2841,16 +2827,16 @@ window.__ModuleLoader__.load({
 			"archives.deleteAll": "全部删除",
 			"archives.deleteAllTitle": "删除全部已归档聊天",
 			"archives.deleteAllDesc": "将永久删除全部 {n} 个已归档聊天及其子代理（含正在运行的）和记录，此操作不可恢复。",
-			"archives.deleteAllPending": "正在删除已归档聊天…",
-			"archives.unarchiveUnknown": "会话已不存在，无法取消归档。",
-			"archives.unarchiveFailed": "取消归档失败：{detail}",
+			"archives.deleteAllPending": "正在删除已归档聊天…",
+			"archives.unarchiveUnknown": "会话已不存在，无法取消归档。",
+			"archives.unarchiveFailed": "取消归档失败：{detail}",
 			"archives.archiveUnknown": "会话已不存在，无法归档。",
 			"archives.archiveFailed": "归档失败：{detail}",
 			"archives.forkFailed": "分叉会话失败：{detail}",
 			"deleteSession.title": "删除会话",
 			"deleteSession.desc": "将永久删除会话“{name}”及其子代理（含正在运行的）和全部记录（对话内容、统计、缓存），此操作不可恢复。",
-			"deleteSession.pending": "正在删除会话…",
-			"deleteSession.unknown": "会话已不存在或已被删除。",
+			"deleteSession.pending": "正在删除会话…",
+			"deleteSession.unknown": "会话已不存在或已被删除。",
 			"deleteSession.failed": "删除会话失败：{detail}",
 			"picker.loading": "正在加载工作区…",
 			"conflict.named": "已存在名为“{name}”的工作区。",
@@ -2898,7 +2884,7 @@ window.__ModuleLoader__.load({
 			"section.sessions": "Sessions",
 			"viewOptions.label": "View options",
 			"groupBy.label": "Group by",
-			"groupBy.workspace": "WorkSpace",
+			"groupBy.workspace": "Workspace",
 			"groupBy.flat": "In one list",
 			"orderBy.label": "Order by",
 			"orderBy.manual": "Manual",
@@ -2933,16 +2919,16 @@ window.__ModuleLoader__.load({
 			"archives.deleteAll": "Delete all",
 			"archives.deleteAllTitle": "Delete all archived chats",
 			"archives.deleteAllDesc": "This permanently deletes all {n} archived chats, their child agents (including any that are still running), and their records. This cannot be undone.",
-			"archives.deleteAllPending": "Deleting archived chats…",
-			"archives.unarchiveUnknown": "This session no longer exists, so it cannot be unarchived.",
-			"archives.unarchiveFailed": "Could not unarchive the session: {detail}",
+			"archives.deleteAllPending": "Deleting archived chats…",
+			"archives.unarchiveUnknown": "This session no longer exists, so it cannot be unarchived.",
+			"archives.unarchiveFailed": "Could not unarchive the session: {detail}",
 			"archives.archiveUnknown": "This session no longer exists, so it cannot be archived.",
 			"archives.archiveFailed": "Could not archive the session: {detail}",
 			"archives.forkFailed": "Could not fork the session: {detail}",
 			"deleteSession.title": "Delete session",
 			"deleteSession.desc": "This permanently deletes session “{name}”, its child agents (including any that are still running), and all of its records (conversation, stats, cache). This cannot be undone.",
-			"deleteSession.pending": "Deleting session…",
-			"deleteSession.unknown": "This session no longer exists or was already deleted.",
+			"deleteSession.pending": "Deleting session…",
+			"deleteSession.unknown": "This session no longer exists or was already deleted.",
 			"deleteSession.failed": "Could not delete the session: {detail}",
 			"picker.loading": "Loading workspaces…",
 			"conflict.named": "A workspace named “{name}” already exists.",
@@ -3139,12 +3125,12 @@ window.__ModuleLoader__.load({
 		exports.__test = {
 			displayTitle,
 			sessionVisible,
-			collectArchivedDeleteAllIds,
-			collectSessionAndDescendantIds,
 			isUnknownSessionError,
 			deriveGroups,
 			deriveFlat,
 			deriveSearchResults,
+			deriveArchivedGroups,
+			deriveArchivedDeleteAllIds,
 			createWorkspaceViewStore,
 			groupByWorkspace,
 			byRecency,

package/lib/projcache.js

@@ -1,74 +1,92 @@
-import { SessionProjectionCache } from "@deepseek-ai/dsh-session-projection-cache";
-//#region lib/types/index.js
-/**
- * dsh-archive-manager projcache half.
- *
- * `ArchiveProjectionCache` extends the shipped `SessionProjectionCache`
- * (service name `sessionProjectionCache`, same domain, same fail-soft write
- * path) and adds two public methods used by the archive manager's
- * `deleteSession`:
- *
- * - `delete(id)` — permanently remove one session's cached projection row
- *   (`table.delete` on the `session_projcache` domain).
- * - `whenIdle()` — resolve once every in-flight public `write()` has settled.
- * - `delete(id)` installs a tombstone before removing the row, so an earlier
- *   write that settles late removes its own stale row instead of resurrecting
- *   the deleted cache entry.
- *
- * The default export is a Service subclass (same shape as the shipped
- * `@deepseek-ai/dsh-session-projection-cache` package), so the profile patch
- * can substitute this package for the `session-projection-cache` row with no
- * other wiring change.
- */
+import { SessionProjectionCache } from "@deepseek-ai/dsh-session-projection-cache";
+import { trackTombstone } from "./tombstone.js";
+//#region lib/types/index.js
+/**
+ * dsh-archive-manager projcache 半边。
+ *
+ * `ArchiveProjectionCache` 继承上游 `SessionProjectionCache`
+ * （服务名 `sessionProjectionCache`，同域、同 fail-soft 写路径），
+ * 为归档管理的 `deleteSession` 增加三处守护：
+ *
+ * - `delete(id)` - 永久移除一个会话的缓存投影行
+ *   （`session_projcache` 域上的 `table.delete`），写入前先登记墓碑。
+ * - `whenIdle()` - 全部在途公开写入落定后 resolve。
+ * - 墓碑挡住已删除会话的写入：迟到的写入要么被直接拦截，要么在
+ *   落定后补删自己的残留行，不会复活已删除的缓存条目。守护覆盖
+ *   `write()`（dispose 写后路径）与 `putSoft()`（`coldSnapshot` 的
+ *   冷读写回路径），两条落盘路径都纳入 `whenIdle` 跟踪。
+ *
+ * 默认导出是 Service 子类（与上游 `@deepseek-ai/dsh-session-projection-cache`
+ * 包同形），profile 补丁可直接替换 `session-projection-cache` 服务行，
+ * 无需其他接线改动。
+ */
 var ArchiveProjectionCache = class extends SessionProjectionCache {
-	/** 已永久删除的会话不会再允许投影缓存写入。 */
+	/** 已永久删除的会话：其投影缓存行不再允许写入。 */
 	deletedSessionIds = /* @__PURE__ */ new Set();
+	/** 墓碑插入顺序，用于在上限处淘汰最旧项。 */
 	deletedSessionOrder = [];
 	deletedSessionTombstoneLimit = 4096;
-	/** Tail of in-flight checkpoint writes (settled promises only). */
+	/** 在途写入的队尾（只含已落定的 promise）。 */
 	writeTail = Promise.resolve();
-	constructor(ctx, config) {
-		super(ctx, config);
-	}
+	constructor(ctx, config) {
+		super(ctx, config);
+	}
 	/** 跟踪公开写入路径，避免依赖上游私有 `flushSoft` 的实现细节。 */
 	write(session) {
 		const task = this.writeCore(session);
 		this.writeTail = Promise.allSettled([this.writeTail, task]).then(() => void 0);
 		return task;
 	}
-	/**
-	* 墓碑正确性依赖：super.write(session) 一次整体写入，返回后不再有后续异步落盘。
-	* 若上游改成多阶段异步，(C) 补删会漏掉后续写入，deletedSessionIds 挡不住复活。
-	*/
-	async writeCore(session) {
+	/**
+	 * 墓碑正确性依赖：super.write(session) 一次整体写入，返回后不再有后续异步落盘。
+	 * 若上游改成多阶段异步，(C) 补删会漏掉后续写入，deletedSessionIds 挡不住复活。
+	 */
+	async writeCore(session) {
 		if (this.deletedSessionIds.has(session.id)) return;
 		await super.write(session);
 		if (this.deletedSessionIds.has(session.id)) await this.requireTable().delete(session.id);
 	}
-	/**
-	* Resolve once every tracked in-flight write has settled (failures
-	* included). Fresh calls during an idle cache resolve immediately.
-	* @returns resolution after the tracked writes settle.
-	*/
-	whenIdle() {
-		return this.writeTail;
-	}
-	/**
-	* Permanently remove one session's cached projection row.
-	* @param id - the session whose cache row to delete.
-	* @returns resolution after the row is gone.
-	*/
-	async delete(id) {
-		if (!this.deletedSessionIds.has(id)) {
-			this.deletedSessionIds.add(id);
-			this.deletedSessionOrder.push(id);
-		}
-		while (this.deletedSessionOrder.length > this.deletedSessionTombstoneLimit) {
-			const oldest = this.deletedSessionOrder.shift();
-			if (oldest !== void 0 && oldest !== id) this.deletedSessionIds.delete(oldest);
+	/**
+	 * 冷读写回路径（上游 `coldSnapshot` 经 `putSoft` 落盘）与 `write` 同守：
+	 * 已删除直接放弃；删除落在写回进行中则在其落定后补删残留行。
+	 * 同样纳入 `whenIdle` 跟踪。
+	 */
+	async putSoft(id, identity, rows, what) {
+		if (this.deletedSessionIds.has(id)) return;
+		const task = this.putSoftCore(id, identity, rows, what);
+		this.writeTail = Promise.allSettled([this.writeTail, task]).then(() => void 0);
+		return task;
+	}
+	async putSoftCore(id, identity, rows, what) {
+		await super.putSoft(id, identity, rows, what);
+		try {
+			if (this.deletedSessionIds.has(id)) await this.requireTable().delete(id);
+		} catch (error) {
+			this.ctx.logger.warn(`archive-manager projcache: cold-read write-back cleanup for "${id}" failed: ${String(error)}`);
 		}
+	}
+	/**
+	 * 全部被跟踪的在途写入落定后 resolve（含失败）。空闲缓存上调用立即返回。
+	 * @returns 跟踪写入落定后的 resolution。
+	 */
+	whenIdle() {
+		return this.writeTail;
+	}
+	/**
+	 * 永久移除一个会话的缓存投影行。
+	 * @param id - 要删除缓存行的会话。
+	 * @returns 行删除完成后的 resolution。
+	 */
+	async delete(id) {
+		trackTombstone(this.deletedSessionIds, this.deletedSessionOrder, id, this.deletedSessionTombstoneLimit);
 		await this.requireTable().delete(id);
 	}
-};
-//#endregion
-export { ArchiveProjectionCache, ArchiveProjectionCache as default };
+	/** 撤销墓碑（供测试与同 id 新生命周期复用路径使用）。 */
+	clearTombstone(id) {
+		this.deletedSessionIds.delete(id);
+		const idx = this.deletedSessionOrder.indexOf(id);
+		if (idx !== -1) this.deletedSessionOrder.splice(idx, 1);
+	}
+};
+//#endregion
+export { ArchiveProjectionCache, ArchiveProjectionCache as default };

package/lib/tombstone.js

@@ -0,0 +1,32 @@
+//#region lib/types/tombstone.js
+/**
+ * 通用墓碑簿记：登记一个已删除 id，并按 FIFO 在上限处淘汰最旧项。
+ * 工作区注册表（lib/workspace.js）与投影缓存（lib/projcache.js）共用
+ * 同一份语义，避免两处拷贝的淘汰策略分叉。
+ */
+/**
+ * 登记已删除 id 并执行上限淘汰。
+ * @param {Set<string>} ids - 墓碑集合。
+ * @param {string[]} order - 插入顺序队列（FIFO 淘汰依据）。
+ * @param {string} id - 本次登记的 id。
+ * @param {number} limit - 墓碑上限。
+ * @returns {string[]} 被淘汰出集合的旧 id 列表，调用方据此清理附属簿记。
+ */
+function trackTombstone(ids, order, id, limit) {
+	if (!ids.has(id)) {
+		ids.add(id);
+		order.push(id);
+	}
+	const evicted = [];
+	while (order.length > limit) {
+		const oldest = order.shift();
+		// id 自身被挤出队列时保留在集合中：宁多挡不错放。
+		if (oldest !== void 0 && oldest !== id) {
+			ids.delete(oldest);
+			evicted.push(oldest);
+		}
+	}
+	return evicted;
+}
+//#endregion
+export { trackTombstone };

package/lib/workspace.js

@@ -5,27 +5,30 @@ import {
 } from "@deepseek-ai/dsh-workspace";
 import { bindTypertRemote, Remote } from "@deepseek-ai/dsh-typert-protocol";
 import { sessionDir } from "@deepseek-ai/dsh-spill-local";
+import { trackTombstone } from "./tombstone.js";
 //#region lib/types/index.js
-/**
-* dsh-archive-manager 宿主侧归档会话管理。
-*
-* `deleteSession(sessionId)` 的顺序即语义：校验已知会话；实时会话先
-* flush 再 detach；等待投影缓存写入完成；移除归档标记和工作区记账；
-* 删除投影缓存，级联删除 SUBAGENT 子会话并清理 spill；最后才删除转录
-* 目录。fork 分支虽有 `parentSession`，但属于独立用户会话，不参与级联。
-*
-* 所有可失败的持久化清理都先于不可逆的物理删除。此前任一步失败时，
-* 转录仍保留，可重试删除；物理删除失败时记录残留路径供人工排查。
-* 物理删除成功后必须遗忘父类内存索引（headers / sessionPaths /
-* invalidSessionPaths）并打上删除墓碑：父类 sessionKnown 以 headers.has
-* 短路，indexHeaders 只增不减，stale list() 否则会把已删 id 救活，
-* 进而被 archiveSession 重新写回 archivedSessionIds。
-* `unarchiveSession` 与 `deleteSession` 通过 Typert Remote 暴露给浏览器，并注册到 typert.local，避免生产环境只靠 SRC 扫描时 404。
-*/
+/**
+* dsh-archive-manager 宿主侧归档会话管理。
+*
+* `deleteSession(sessionId)` 的顺序即语义：校验已知会话；实时会话先
+* flush 再 detach；等待投影缓存写入完成；移除归档标记和工作区记账；
+* 删除投影缓存，级联删除 SUBAGENT 子会话并清理 spill；最后才删除转录
+* 目录。fork 分支虽有 `parentSession`，但属于独立用户会话，不参与级联。
+*
+* 所有可失败的持久化清理都先于不可逆的物理删除。此前任一步失败时，
+* 转录仍保留，可重试删除；物理删除失败时记录残留路径供人工排查。
+* 物理删除成功后必须遗忘父类内存索引（headers / sessionPaths /
+* invalidSessionPaths）并打上删除墓碑：父类 sessionKnown 以 headers.has
+* 短路，indexHeaders 只增不减，stale list() 否则会把已删 id 救活，
+* 进而被 archiveSession 重新写回 archivedSessionIds。
+* 墓碑同时记录被删生命周期的日志身份（createdAt/cwd）：其他进程以同 id
+* 重建并落盘新会话时（冷复用），sessionKnown 的探针以身份差异区分新旧
+* 生命周期并撤掉墓碑，避免已重建的会话在本进程永久 UNKNOWN_SESSION。
+* `unarchiveSession` 与 `deleteSession` 通过 Typert Remote 暴露给浏览器，并注册到 typert.local，避免生产环境只靠 SRC 扫描时 404。
+*/
 function markRemoteMethod(instance, method) {
-	// Simulate the TS decorator pipeline `@Remote(method)` for one method:
-	// `Remote` returns a standard method decorator; we hand it a decorator
-	// context whose addInitializer runs immediately with `this` = instance.
+	// 模拟 TS 装饰器管线 `@Remote(method)`：`Remote` 返回标准方法装饰器，
+	// 这里构造一个 addInitializer 立即以 `this` = instance 执行的装饰器上下文。
 	const context = {
 		private: false,
 		static: false,
@@ -36,17 +39,24 @@ function markRemoteMethod(instance, method) {
 	};
 	Remote(method)(void 0, context);
 }
-function unknownSessionMessage(sessionId) {
-	return `unknown session "${sessionId}" (UNKNOWN_SESSION)`;
-}
-var ArchiveUnknownSessionError = class extends Error {
-	sessionId;
-	constructor(sessionId) {
-		super(unknownSessionMessage(sessionId));
-		this.sessionId = sessionId;
-		this.name = "ArchiveUnknownSessionError";
-	}
-};
+function unknownSessionMessage(sessionId) {
+	return `unknown session "${sessionId}" (UNKNOWN_SESSION)`;
+}
+var ArchiveUnknownSessionError = class extends Error {
+	sessionId;
+	constructor(sessionId) {
+		super(unknownSessionMessage(sessionId));
+		this.sessionId = sessionId;
+		this.name = "ArchiveUnknownSessionError";
+	}
+}
+/** 头部投影到“日志身份”字段（与投影缓存的 identity 语义一致）。cwd 缺失统一归一为 null，避免一侧带键一侧不带键时的比较歧义。 */
+function headerIdentity(header) {
+	return {
+		createdAt: header.createdAt,
+		cwd: header.cwd ?? null
+	};
+}
 const sessionIdSchema = {
 	parse(value) {
 		if (typeof value !== "string" || value.length === 0) throw new TypeError(`sessionId must be a non-empty string, got ${String(value)}`);
@@ -141,6 +151,8 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
 	deletedSessionOrder = [];
 	/** 墓碑上限：足够挡住 stale list()，又避免长驻进程无限增长。 */
 	deletedSessionTombstoneLimit = 4096;
+	/** 被删生命周期的日志身份（createdAt/cwd）：冷复用探针区分“同 id 新会话”与 stale list() 的依据。 */
+	deletedIdentities = /* @__PURE__ */ new Map();
 	constructor(ctx) {
 		super(ctx);
 		this.typertRemote = bindTypertRemote(this, this.name);
@@ -149,13 +161,11 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
 		registerHostRemote(this.ctx);
 	}
 	/**
-	* Move one session out of the registry-global archive set, restoring its
-	* normal visibility (its accounting seat was never moved, so the session
-	* reappears at its original workspace position). Idempotent: an
-	* already-unarchived session resolves without writing; an unknown session
-	* rejects like `archiveSession` does.
-	* @param sessionId - the session to unarchive.
-	* @returns the full updated archive set.
+	* 把一个会话移出注册表全局归档集合，恢复其正常可见性（其记账位从未
+	* 移动，会话在原工作区位置重新出现）。幂等：未归档的已知会话直接返回
+	* 当前集合不写入；未知会话与 `archiveSession` 一样抛错。
+	* @param sessionId - 要取消归档的会话。
+	* @returns 更新后的完整归档集合。
 	*/
 	async unarchiveSession(sessionId) {
 		return this.enqueueOperation(async () => {
@@ -171,51 +181,52 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
 		});
 	}
 	/**
-	* Permanently delete one session and every trace of it (transcript
-	* directory, workspace accounting, archive marker, projection cache row).
-	* @param sessionId - the session to delete.
-	* @returns `{ deleted: true }` after durability.
-	* @throws {@link ArchiveUnknownSessionError} when the session is unknown.
+	* 永久删除一个会话及其全部痕迹（转录目录、工作区记账、归档标记、
+	* 投影缓存行）。
+	* @param sessionId - 要删除的会话。
+	* @returns 持久化完成后的 `{ deleted: true }`。
+	* @throws {@link ArchiveUnknownSessionError} 会话未知时抛出。
 	*/
 	async deleteSession(sessionId) {
 		return this.enqueueOperation(() => this.deleteSessionCore(sessionId));
 	}
-	/** The serialized core deletion body (also used by the cascade path, which
-	* already holds the operation chain — it must never re-enqueue). */
+	/** 串行化后的删除主体（级联路径复用：它已持有操作链，绝不能再入队）。 */
 	async deleteSessionCore(sessionId) {
 		if (!await this.sessionKnown(sessionId)) throw new ArchiveUnknownSessionError(sessionId);
 		const sessions = this.ctx.get("sessions");
 		const live = sessions?.get(sessionId);
-		if (live !== void 0) {
-			// Durability barrier first: no pending transcript writes may race
-			// the directory removal (the persistence backend closes handles per
-			// batch, so a flushed session leaves no open file).
+		// 先记录被删生命周期的日志身份：目录删除后头部不可再读，
+		// 冷复用探针（sessionKnown 墓碑分支）靠它区分同 id 的新生命周期。
+		const deletedHeader = this.headers.get(sessionId) ?? live?.header;
+		if (live !== void 0) {
+			// 持久化屏障先行：不能有未落盘的转录写入与目录删除竞争
+			//（持久化后端按批关闭句柄，flush 过的会话不再持有打开的文件）。
 			await sessions.flush(live);
-			// Detach from the store; `session/disposed` fires synchronously,
-			// which drives the browser `host/session-removed` frame and starts
-			// the projection cache's final write-behind.
-			const entry = sessions.liveEntryFor(live);
-			sessions.detachEntered(entry);
-		} else if (sessions !== void 0) await this.publishColdSessionRemoval(sessionId, sessions);
+			// 从存储分离；`session/disposed` 同步触发，驱动浏览器端的
+			// `host/session-removed` 帧并启动投影缓存的最终写后落盘。
+			const entry = sessions.liveEntryFor(live);
+			sessions.detachEntered(entry);
+		} else if (sessions !== void 0) await this.publishColdSessionRemoval(sessionId, sessions);
 		const projCache = this.ctx.get("sessionProjectionCache");
-		// The dispose write-behind must land BEFORE the cache row is deleted,
-		// otherwise the row is written back after deletion (resurrected).
-		await projCache?.whenIdle?.();
-		// 物理删除不可逆：先完成所有可失败的持久化清理，失败时仍可重试。
-		const state = this.requireState();
+		// dispose 的写后落盘必须先于缓存行删除完成，
+		// 否则该行会在删除之后被写回（复活）。
+		await projCache?.whenIdle?.();
+		// 物理删除不可逆：先完成所有可失败的持久化清理，失败时仍可重试。
+		const state = this.requireState();
 		if (state.archivedSessionIds.includes(sessionId)) {
 			await this.setState({
 				...state,
 				archivedSessionIds: state.archivedSessionIds.filter((id) => id !== sessionId)
 			});
-		}
-		await this.removeFromWorkspaceAccounts(sessionId);
-		if (projCache !== void 0) await projCache.delete(sessionId);
-		await this.deleteDescendants(sessionId);
+		}
+		await this.removeFromWorkspaceAccounts(sessionId);
+		if (projCache !== void 0) await projCache.delete(sessionId);
+		await this.deleteDescendants(sessionId);
 		await this.cleanSpill(sessionId);
 		await this.removeTranscriptDirectory(sessionId);
 		// 物理删除已成功：此时再清父类索引。失败时保留索引，便于重试。
 		this.forgetIndexedSession(sessionId);
+		if (deletedHeader !== void 0) this.deletedIdentities.set(sessionId, headerIdentity(deletedHeader));
 		return { deleted: true };
 	}
 	/**
@@ -224,18 +235,12 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
 	*/
 	clearTombstone(sessionId) {
 		this.deletedSessionIds.delete(sessionId);
+		this.deletedIdentities.delete(sessionId);
 		const idx = this.deletedSessionOrder.indexOf(sessionId);
 		if (idx !== -1) this.deletedSessionOrder.splice(idx, 1);
 	}
 	forgetIndexedSession(sessionId) {
-		if (!this.deletedSessionIds.has(sessionId)) {
-			this.deletedSessionIds.add(sessionId);
-			this.deletedSessionOrder.push(sessionId);
-		}
-		while (this.deletedSessionOrder.length > this.deletedSessionTombstoneLimit) {
-			const oldest = this.deletedSessionOrder.shift();
-			if (oldest !== void 0 && oldest !== sessionId) this.deletedSessionIds.delete(oldest);
-		}
+		for (const evicted of trackTombstone(this.deletedSessionIds, this.deletedSessionOrder, sessionId, this.deletedSessionTombstoneLimit)) this.deletedIdentities.delete(evicted);
 		this.headers.delete(sessionId);
 		this.sessionPaths.delete(sessionId);
 		this.invalidSessionPaths.delete(sessionId);
@@ -249,56 +254,80 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
 			this.clearTombstone(id);
 			return true;
 		}
-		if (this.deletedSessionIds.has(id)) return false;
+		if (this.deletedSessionIds.has(id)) return this.coldReuseKnown(id);
 		return super.sessionKnown(id);
 	}
 	/**
+	* 墓碑分支的冷复用探针：其他进程以同 id 重建并落盘的新会话（日志身份
+	* 不同）撤墓碑放行并重新编入索引；stale list() 里同生命周期的旧头部
+	* 仍视为未知。身份不可考（删除时未取到头部）时保守维持未知。
+	*/
+	async coldReuseKnown(id) {
+		const deletedIdentity = this.deletedIdentities.get(id);
+		if (deletedIdentity === void 0) return false;
+		const persistence = this.ctx.get("sessionPersistence");
+		if (persistence === void 0 || typeof persistence.list !== "function") return false;
+		let header;
+		try {
+			header = (await persistence.list()).find((item) => item.id === id);
+		} catch (error) {
+			this.ctx.logger.warn(`archive-manager: cold-reuse probe for "${id}" failed: ${String(error)}`);
+			return false;
+		}
+		if (header === void 0) return false;
+		const listed = headerIdentity(header);
+		if (listed.createdAt === deletedIdentity.createdAt && listed.cwd === deletedIdentity.cwd) return false;
+		this.clearTombstone(id);
+		await this.indexHeader(header);
+		return true;
+	}
+	/**
 	* 父类 indexHeaders 只增不减；跳过墓碑 id，避免 stale persistence.list()
 	* 把已删除会话重新编入 headers。
 	*/
 	async indexHeader(header) {
 		if (this.deletedSessionIds.has(header.id)) return;
 		return super.indexHeader(header);
-	}
-	/** 为未处于实时状态的持久化会话发布相同的移除事件。 */
-	async publishColdSessionRemoval(sessionId, sessions) {
-		const persistence = this.ctx.get("sessionPersistence");
-		if (persistence === void 0 || typeof persistence.prepare !== "function") return;
-		try {
-			const preparation = await persistence.prepare(sessionId);
-			const detach = sessions.enter(preparation.session);
-			try {
-				sessions.announce(preparation.session);
-			} finally {
-				detach();
-				preparation[Symbol.dispose]();
-			}
-		} catch (error) {
-			this.ctx.logger.warn(`archive-manager: could not publish removal for stored session "${sessionId}": ${String(error)}`);
-		}
-	}
-	/** 删除会话的转录目录；仅在所有记账清理完成后调用。 */
-	async removeTranscriptDirectory(sessionId) {
+	}
+	/** 为未处于实时状态的持久化会话发布相同的移除事件。 */
+	async publishColdSessionRemoval(sessionId, sessions) {
+		const persistence = this.ctx.get("sessionPersistence");
+		if (persistence === void 0 || typeof persistence.prepare !== "function") return;
+		try {
+			const preparation = await persistence.prepare(sessionId);
+			const detach = sessions.enter(preparation.session);
+			try {
+				sessions.announce(preparation.session);
+			} finally {
+				detach();
+				preparation[Symbol.dispose]();
+			}
+		} catch (error) {
+			this.ctx.logger.warn(`archive-manager: could not publish removal for stored session "${sessionId}": ${String(error)}`);
+		}
+	}
+	/** 删除会话的转录目录；仅在所有记账清理完成后调用。 */
+	async removeTranscriptDirectory(sessionId) {
 		const persistence = this.ctx.get("sessionPersistence");
 		if (persistence === void 0 || typeof persistence.locate !== "function") {
 			throw new Error(`cannot delete session "${sessionId}": the session persistence backend does not expose locate() to resolve its transcript directory`);
 		}
-		const header = await this.readSessionHeader(sessionId);
-		const location = persistence.locate(header);
-		if (location === void 0 || typeof location.path !== "string") {
-			throw new Error(`cannot delete session "${sessionId}": the session persistence backend could not resolve its transcript directory`);
-		}
-		const transcriptDir = dirname(location.path);
-		try {
-			await rm(transcriptDir, { recursive: true, force: true });
-		} catch (error) {
-			const message = `cannot delete session "${sessionId}": transcript directory "${transcriptDir}" remains after bookkeeping cleanup`;
-			const detail = `${message}: ${String(error)}`;
-			this.ctx.logger.warn(`archive-manager: ${detail}`);
-			throw new Error(detail, { cause: error });
-		}
-	}
-	/** Drop the id from every workspace record and refresh entity snapshots. */
+		const header = await this.readSessionHeader(sessionId);
+		const location = persistence.locate(header);
+		if (location === void 0 || typeof location.path !== "string") {
+			throw new Error(`cannot delete session "${sessionId}": the session persistence backend could not resolve its transcript directory`);
+		}
+		const transcriptDir = dirname(location.path);
+		try {
+			await rm(transcriptDir, { recursive: true, force: true });
+		} catch (error) {
+			const message = `cannot delete session "${sessionId}": transcript directory "${transcriptDir}" remains after bookkeeping cleanup`;
+			const detail = `${message}: ${String(error)}`;
+			this.ctx.logger.warn(`archive-manager: ${detail}`);
+			throw new Error(detail, { cause: error });
+		}
+	}
+	/** 把 id 从每个工作区记录中移除，并刷新实体快照。 */
 	async removeFromWorkspaceAccounts(sessionId) {
 		const table = this.requireTable();
 		const state = this.requireState();
@@ -314,10 +343,9 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
 			if (entity !== void 0) entity.record = next;
 		}
 	}
-	/** Best-effort cascade: delete SUBAGENT child sessions of `sessionId`.
-	* Only sessions whose header marks `origin: "subagent"` qualify: `parentSession`
-	* alone is ambiguous (fork branches also carry it), and a fork branch is an
-	* independent user session that must never be cascade-deleted. */
+	/** 尽力而为的级联删除：删除 `sessionId` 的 SUBAGENT 子会话。
+	* 仅头部标记 `origin: "subagent"` 的会话参与：单凭 `parentSession` 有歧义
+	*（fork 分支也携带它），而 fork 分支是独立的用户会话，绝不能被级联删除。 */
 	async deleteDescendants(sessionId) {
 		try {
 			const descendants = [];
@@ -341,7 +369,7 @@ var ArchiveWorkspaceRegistry = class extends WorkspaceRegistry {
 			this.ctx.logger.warn(`archive-manager: descendant enumeration for deleted session "${sessionId}" failed: ${String(error)}`);
 		}
 	}
-	/** Best-effort spill cleanup: remove the session-scoped spill directory. */
+	/** 尽力而为的 spill 清理：移除该会话作用域的 spill 目录。 */
 	async cleanSpill(sessionId) {
 		try {
 			const spill = this.ctx.get("spillStore");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-archive-manager",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "NPM-installable DSH Web plugin for managing archived sessions.",
   "type": "module",
   "packageManager": "pnpm@11.21.0",