dsh-sidenote 0.8.0 → 0.8.1

package/README.md

@@ -47,6 +47,8 @@ dsh plugin --profile web add dsh-sidenote
 
 侧聊有独立的多轮对话、工具卡、模型和权限切换，也支持图片、`@` 引用以及面板内审批。主线和支线各自推进。
 
+刷新或重启 DSH 后，侧聊自身的问答仍留在侧聊区，继承的主线上下文保持折叠分区。保存为正式会话保留这个分区；从保存的会话再次开侧聊时，才建立新的继承范围。来源尚未确认时可以阅读消息，确认后再使用回流。
+
 ### 有想法，直接落在原文上
 
 划选主对话或侧聊中的一段回复，写下问题或修改意见。**原文和注释一起保留**，可累积多条，发送前预览、移除，正文草稿照常编辑。

package/lib/client.js

@@ -199,16 +199,18 @@ window.__ModuleLoader__.load({
 			if (last?.type !== "compaction/start" || last.data.turn !== null) return void 0;
 			return ((last.data.sourceCommandId === void 0 ? void 0 : entries.findLast(({ event }) => event.type === "command/run" && event.data.commandId === last.data.sourceCommandId)?.event)?.seq ?? last.seq) - 1;
 		}
-		/** Published event window, shared by all supported hosts. Its last seed marker
-		* is the child’s own fork cut (earlier markers can belong to ancestor forks). */
+		/** Restore also appends end-seed, but only inherited=true records a fork cut.
+		* A saved copy resolves the cut before its original first-send snapshot. */
+		function inheritedBoundaryOf(entries, beforeSeq = Infinity) {
+			const seed = entries.findLast(({ event }) => event.type === "session/end-seed" && event.data?.inherited === true && event.seq < beforeSeq);
+			return seed === void 0 ? void 0 : seed.event.seq - 1;
+		}
+		/** The loaded window can lack the inherited marker; undefined means pending. */
 		function inheritedBoundarySource(session) {
 			const source = contextEventSource(session);
 			return source && {
 				subscribe: (notify) => source.subscribe(notify),
-				getSnapshot: () => {
-					const seed = source.getSnapshot().entries.findLast((entry) => entry.event.type === "session/end-seed");
-					return seed === void 0 ? void 0 : seed.event.seq - 1;
-				}
+				getSnapshot: () => inheritedBoundaryOf(source.getSnapshot().entries)
 			};
 		}
 		/** Wait for the host's single-page pull before requesting a jump. loadThrough
@@ -740,7 +742,7 @@ window.__ModuleLoader__.load({
 			let dockRegistered = false;
 			let report = {
 				versions: {
-					sidenote: "0.8.0",
+					sidenote: "0.8.1",
 					dsh: "unknown",
 					betterSidebar: null
 				},
@@ -1080,6 +1082,8 @@ window.__ModuleLoader__.load({
 			expandAll: "Expand all",
 			jumpToLatest: "↓ Jump to latest",
 			reflowAll: "Reflow all",
+			reflowPending: "Confirming this side chat’s origin before bringing replies back",
+			sideRestoreMissing: "The original side chat could not be restored. Reopen it from the recently closed list in /side.",
 			reflowAllTitle: "Bring all Q&A pairs back to the main session",
 			reflowAllDone: "Reflowed ✓",
 			promote: "Save as session",
@@ -1303,6 +1307,8 @@ window.__ModuleLoader__.load({
 			expandAll: "全部展开",
 			jumpToLatest: "↓ 跳到最新",
 			reflowAll: "整段回流",
+			reflowPending: "正在确认侧聊来源，确认后可回流",
+			sideRestoreMissing: "未能恢复原侧聊。请从 /side 的最近关闭列表重新打开。",
 			reflowAllTitle: "把该侧聊全部问答对带回主会话（chip 可预览/逐条撤）",
 			reflowAllDone: "已回流 ✓",
 			promote: "保存为正式会话",
@@ -1409,15 +1415,15 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var diagnostics_module_css_default = {
-			"panel": "tGe0LW_panel",
-			"header": "tGe0LW_header",
 			"list": "tGe0LW_list",
-			"description": "tGe0LW_description",
+			"header": "tGe0LW_header",
+			"actions": "tGe0LW_actions",
+			"versions": "tGe0LW_versions",
 			"trigger": "tGe0LW_trigger",
 			"setting": "tGe0LW_setting",
-			"actions": "tGe0LW_actions",
-			"settingTitle": "tGe0LW_settingTitle",
-			"versions": "tGe0LW_versions"
+			"panel": "tGe0LW_panel",
+			"description": "tGe0LW_description",
+			"settingTitle": "tGe0LW_settingTitle"
 		};
 		//#endregion
 		//#region src/client/diagnostics/index.tsx
@@ -2363,33 +2369,33 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var annotations_module_css_default = {
-			"chip": "SVnebq_chip",
-			"chipDismissShade": "SVnebq_chipDismissShade",
-			"chipClearAll": "SVnebq_chipClearAll",
-			"sentChipGroup": "SVnebq_sentChipGroup",
-			"contextAction": "SVnebq_contextAction",
-			"sentChip": "SVnebq_sentChip",
-			"sentChevron": "SVnebq_sentChevron",
-			"contextEditor": "SVnebq_contextEditor",
-			"contextLabel": "SVnebq_contextLabel",
 			"contextFooter": "SVnebq_contextFooter",
-			"chipWrap": "SVnebq_chipWrap",
-			"userContextHost": "SVnebq_userContextHost",
-			"sentPreview": "SVnebq_sentPreview",
-			"contextContent": "SVnebq_contextContent",
 			"contextText": "SVnebq_contextText",
-			"contextNumber": "SVnebq_contextNumber",
-			"contextActions": "SVnebq_contextActions",
-			"storageNotice": "SVnebq_storageNotice",
-			"contextItem": "SVnebq_contextItem",
-			"contextList": "SVnebq_contextList",
 			"sentChips": "SVnebq_sentChips",
+			"contextNumber": "SVnebq_contextNumber",
+			"contextContent": "SVnebq_contextContent",
 			"chipMain": "SVnebq_chipMain",
-			"sentChevronOpen": "SVnebq_sentChevronOpen",
-			"contextPanel": "SVnebq_contextPanel",
+			"sentChip": "SVnebq_sentChip",
+			"contextAction": "SVnebq_contextAction",
+			"sentPreview": "SVnebq_sentPreview",
+			"chipWrap": "SVnebq_chipWrap",
+			"sentChipGroup": "SVnebq_sentChipGroup",
 			"contextSource": "SVnebq_contextSource",
+			"userContextHost": "SVnebq_userContextHost",
+			"contextEditor": "SVnebq_contextEditor",
+			"sentChevronOpen": "SVnebq_sentChevronOpen",
+			"chipDismissShade": "SVnebq_chipDismissShade",
+			"contextItem": "SVnebq_contextItem",
+			"contextActions": "SVnebq_contextActions",
+			"contextLabel": "SVnebq_contextLabel",
+			"chipClearAll": "SVnebq_chipClearAll",
+			"sentChevron": "SVnebq_sentChevron",
+			"chip": "SVnebq_chip",
 			"contextAppear": "SVnebq_contextAppear",
-			"chipDismiss": "SVnebq_chipDismiss"
+			"contextPanel": "SVnebq_contextPanel",
+			"storageNotice": "SVnebq_storageNotice",
+			"chipDismiss": "SVnebq_chipDismiss",
+			"contextList": "SVnebq_contextList"
 		};
 		//#endregion
 		//#region src/client/annotations/NativeUserContext.tsx
@@ -2863,39 +2869,39 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var sidechat_module_css_default = {
-			"contextChevronOpen": "_5KEEsG_contextChevronOpen",
 			"emptyIcon": "_5KEEsG_emptyIcon",
-			"progressEntry": "_5KEEsG_progressEntry",
-			"visibilitySetting": "_5KEEsG_visibilitySetting",
-			"progressProcess": "_5KEEsG_progressProcess",
-			"progressPreview": "_5KEEsG_progressPreview",
-			"historyToggle": "_5KEEsG_historyToggle",
-			"progressContent": "_5KEEsG_progressContent",
-			"nativeConversation": "_5KEEsG_nativeConversation",
+			"progressDetail": "_5KEEsG_progressDetail",
+			"mainContext": "_5KEEsG_mainContext",
+			"contextImage": "_5KEEsG_contextImage",
+			"headerSide": "_5KEEsG_headerSide",
 			"contextBubble": "_5KEEsG_contextBubble",
-			"nativeToolbar": "_5KEEsG_nativeToolbar",
-			"emptyTitle": "_5KEEsG_emptyTitle",
+			"progressEntries": "_5KEEsG_progressEntries",
+			"progressLatest": "_5KEEsG_progressLatest",
+			"stateScreen": "_5KEEsG_stateScreen",
+			"historyToggle": "_5KEEsG_historyToggle",
+			"progress": "_5KEEsG_progress",
+			"progressProcess": "_5KEEsG_progressProcess",
+			"reflowAction": "_5KEEsG_reflowAction",
 			"nativeHost": "_5KEEsG_nativeHost",
-			"stateDetail": "_5KEEsG_stateDetail",
-			"headerSide": "_5KEEsG_headerSide",
+			"contextColumn": "_5KEEsG_contextColumn",
+			"emptyText": "_5KEEsG_emptyText",
+			"nativeToolbar": "_5KEEsG_nativeToolbar",
+			"visibilitySetting": "_5KEEsG_visibilitySetting",
+			"root": "_5KEEsG_root",
+			"chatView": "_5KEEsG_chatView",
 			"contextChevron": "_5KEEsG_contextChevron",
 			"contextHint": "_5KEEsG_contextHint",
-			"contextUserRow": "_5KEEsG_contextUserRow",
-			"progress": "_5KEEsG_progress",
+			"progressContent": "_5KEEsG_progressContent",
 			"errorRow": "_5KEEsG_errorRow",
-			"nativeToolbarActions": "_5KEEsG_nativeToolbarActions",
-			"reflowAction": "_5KEEsG_reflowAction",
+			"contextUserRow": "_5KEEsG_contextUserRow",
+			"progressEntry": "_5KEEsG_progressEntry",
+			"progressPreview": "_5KEEsG_progressPreview",
+			"emptyTitle": "_5KEEsG_emptyTitle",
+			"nativeConversation": "_5KEEsG_nativeConversation",
+			"contextChevronOpen": "_5KEEsG_contextChevronOpen",
 			"nativeAction": "_5KEEsG_nativeAction",
-			"root": "_5KEEsG_root",
-			"progressLatest": "_5KEEsG_progressLatest",
-			"emptyText": "_5KEEsG_emptyText",
-			"progressEntries": "_5KEEsG_progressEntries",
-			"progressDetail": "_5KEEsG_progressDetail",
-			"mainContext": "_5KEEsG_mainContext",
-			"chatView": "_5KEEsG_chatView",
-			"contextColumn": "_5KEEsG_contextColumn",
-			"contextImage": "_5KEEsG_contextImage",
-			"stateScreen": "_5KEEsG_stateScreen"
+			"nativeToolbarActions": "_5KEEsG_nativeToolbarActions",
+			"stateDetail": "_5KEEsG_stateDetail"
 		};
 		//#endregion
 		//#region src/client/sidechat/ContextProgress.tsx
@@ -3185,38 +3191,53 @@ window.__ModuleLoader__.load({
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: sidechat_module_css_default.contextColumn,
 					"data-sidenote-main-context": true,
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-						type: "button",
-						className: sidechat_module_css_default.historyToggle,
-						"aria-expanded": expanded,
-						"aria-controls": contextId,
-						onClick: () => {
-							fold.toggle("inherited");
-						},
-						children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronDownOutline14, {
-								size: 12,
-								className: expanded ? sidechat_module_css_default.contextChevronOpen : sidechat_module_css_default.contextChevron
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("mainContext") }),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: sidechat_module_css_default.contextHint,
-								children: context.contextPending ? t("contextAtSend") : context.progress?.takenAt ? t("contextAsOf", { time: context.progress.takenAt }) : t("contextInherited")
-							})
-						]
-					}), expanded && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ContextProgress, {
-						id: contextId,
-						history: context.history,
-						entries: context.progress?.entries ?? [],
-						live: context.contextPending === true,
-						loading,
-						error,
-						onRetry: () => {
-							setAttempt((value) => value + 1);
-						},
-						loadImage: context.loadImage,
-						loadProgressImage: context.loadProgressImage
-					})]
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							type: "button",
+							className: sidechat_module_css_default.historyToggle,
+							"aria-expanded": expanded,
+							"aria-controls": contextId,
+							onClick: () => {
+								fold.toggle("inherited");
+							},
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronDownOutline14, {
+									size: 12,
+									className: expanded ? sidechat_module_css_default.contextChevronOpen : sidechat_module_css_default.contextChevron
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("mainContext") }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: sidechat_module_css_default.contextHint,
+									children: context.contextPending ? t("contextAtSend") : context.progress?.takenAt ? t("contextAsOf", { time: context.progress.takenAt }) : t("contextInherited")
+								})
+							]
+						}),
+						!expanded && context.loadError && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: sidechat_module_css_default.errorRow,
+							role: "alert",
+							children: [context.loadError, /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: sidechat_module_css_default.nativeAction,
+								onClick: () => {
+									fold.toggle("inherited");
+								},
+								children: t("contextRetry")
+							})]
+						}),
+						expanded && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ContextProgress, {
+							id: contextId,
+							history: context.history,
+							entries: context.progress?.entries ?? [],
+							live: context.contextPending === true,
+							loading,
+							error: error ?? (loading ? void 0 : context.loadError),
+							onRetry: () => {
+								setAttempt((value) => value + 1);
+							},
+							loadImage: context.loadImage,
+							loadProgressImage: context.loadProgressImage
+						})
+					]
 				})
 			});
 		}
@@ -3544,16 +3565,19 @@ ${body}
 		function contextHistory(history, progress) {
 			return progress.some((entry) => entry.kind === "checkpoint") ? [] : history;
 		}
-		/** Saving adds a new end-seed; the first-send cut must NOT move to that seed.
-		* Older snapshots lack an explicit cut, so use the seed preceding their input. */
-		function savedContextOf(nodes, events, hasMore = false) {
-			for (const value of [...nodes].reverse()) {
+		/** Saving preserves the latest side chat's reading cut. An active side chat
+		* freezes its first own snapshot after afterSeq. Restore markers never establish ownership. */
+		function savedContextOf(nodes, events, hasMore = false, afterSeq) {
+			for (const value of afterSeq === void 0 ? [...nodes].reverse() : nodes) {
 				const node = value;
-				if (node.kind !== "user" && node.kind !== "steering") continue;
+				if (node.seq <= (afterSeq ?? -1) || node.kind !== "user" && node.kind !== "steering") continue;
 				const saved = splitSnapshotPrefix(node.content?.find((block) => block.type === "text")?.text ?? "");
 				if (!saved) continue;
-				if (saved.boundarySeq === void 0 && hasMore && !events.some(({ event }) => event.type === "session/end-seed" && event.seq < node.seq)) continue;
-				const boundarySeq = saved.boundarySeq ?? (events.findLast(({ event }) => event.type === "session/end-seed" && event.seq < node.seq)?.event.seq ?? 0) - 1;
+				let boundarySeq = saved.boundarySeq ?? inheritedBoundaryOf(events, node.seq);
+				if (boundarySeq === void 0) {
+					if (hasMore || events.some(({ event }) => event.type === "session/end-seed" && event.seq < node.seq)) continue;
+					boundarySeq = -1;
+				}
 				if (!Number.isSafeInteger(boundarySeq) || boundarySeq < -1 || boundarySeq >= node.seq) continue;
 				return {
 					...saved,
@@ -3640,7 +3664,12 @@ ${body}
 			(0, react.useEffect)(() => {
 				if (typeof markerSeq !== "number" || saved) return;
 				let active = true;
-				loadInheritedContext(session, markerSeq).catch((reason) => {
+				loadInheritedContext(session, markerSeq).then(async () => {
+					const window = source?.getSnapshot();
+					const nodes = chat?.getLegacy()?.nodes ?? [];
+					const prefix = splitSnapshotPrefix(nodes.find((value) => value.seq === markerSeq)?.content?.find((block) => block.type === "text")?.text ?? "");
+					if (prefix && prefix.boundarySeq === void 0 && !savedContextOf(nodes, window?.entries ?? [], window?.hasMore) && window?.hasMore) await loadInheritedContext(session, 0);
+				}).catch((reason) => {
 					if (active) setError(String(reason instanceof Error ? reason.message : reason));
 				});
 				return () => {
@@ -3649,7 +3678,9 @@ ${body}
 			}, [
 				markerSeq,
 				!!saved,
-				session
+				session,
+				source,
+				chat
 			]);
 			const progress = (0, react.useMemo)(() => saved ? {
 				entries: snapshotEntriesFromText(saved.snapshot, saved.content),
@@ -3837,7 +3868,8 @@ ${body}
 			}, { slots: { views: ChatView } });
 		}
 		/** Only completed, fork-local final answers are eligible for reflow. */
-		function finalReplies(messages, boundarySeq = -1, completed) {
+		function finalReplies(messages, boundarySeq, completed) {
+			if (boundarySeq === void 0) return [];
 			const replies = [];
 			let final;
 			const finish = () => {
@@ -3859,6 +3891,7 @@ ${body}
 			return side.reflow.list(side.parentSessionId).some((item) => item.sourceKey === key || item.sourceKey === void 0 && item.sideTitle === side.title && item.text === message.text && item.question === question);
 		}
 		function addReply(side, message, question) {
+			if (side.boundarySeq === void 0 || message.seq === void 0 || message.seq <= side.boundarySeq) return;
 			if (!isReplyAdded(side, message, question)) side.reflow.add(side.parentSessionId, side.title, message.text, question, `${side.sessionId}:${message.seq ?? message.key}`);
 		}
 		function ReflowAction(props) {
@@ -4042,15 +4075,11 @@ ${body}
 			const accept = (0, react.useCallback)(() => {
 				if (sending.current) setAccepted(sending.current);
 			}, []);
-			const saved = (0, react.useMemo)(() => boundarySeq === void 0 ? void 0 : (legacy?.nodes ?? []).flatMap((value) => {
-				const node = value;
-				if (!["user", "steering"].includes(node.kind) || node.seq <= boundarySeq) return [];
-				const prefix = splitSnapshotPrefix(node.content?.find((block) => block.type === "text")?.text ?? "");
-				return prefix ? [{
-					...prefix,
-					content: node.content
-				}] : [];
-			})[0], [legacy, boundarySeq]) ?? accepted;
+			const saved = (0, react.useMemo)(() => boundarySeq === void 0 ? void 0 : savedContextOf(legacy?.nodes ?? [], childWindow?.entries ?? [], childWindow?.hasMore, boundarySeq), [
+				legacy,
+				childWindow,
+				boundarySeq
+			]) ?? accepted;
 			const preview = forkedMidTurn && !saved;
 			const parent = preview ? ctx.sessions.binding(parentSessionId)?.session : void 0;
 			const parentChat = (0, react.useMemo)(() => preview ? chatSourceOf(ctx, ctx.sessions.binding(parentSessionId)) : void 0, [
@@ -4318,6 +4347,16 @@ ${body}
 		function storage() {
 			return typeof localStorage === "undefined" ? null : localStorage;
 		}
+		function windowStorage() {
+			return typeof sessionStorage === "undefined" ? null : sessionStorage;
+		}
+		function readRecord(store, key) {
+			try {
+				return revive(JSON.parse(store?.getItem(key) ?? "null")) ?? void 0;
+			} catch {
+				return;
+			}
+		}
 		let version = 0;
 		const listeners$1 = /* @__PURE__ */ new Set();
 		function notify() {
@@ -4339,32 +4378,31 @@ ${body}
 			notify();
 		}
 		function readSideChatMeta(sessionId, tabId) {
-			const store = storage();
-			if (store === null) return void 0;
-			try {
-				const raw = store.getItem(keyOf(sessionId, tabId));
-				if (raw === null) return void 0;
-				return revive(JSON.parse(raw)) ?? void 0;
-			} catch {
-				return;
-			}
+			const key = keyOf(sessionId, tabId);
+			const record = readRecord(windowStorage(), key) ?? readRecord(storage(), key);
+			return record?.runId === SIDENOTE_RUN_ID ? record : void 0;
 		}
 		/** 写/合并一个 tab 的 meta（整体替换语义由调用方组合：先读再写）。 */
 		function writeSideChatMeta(record, options) {
-			const store = storage();
-			if (store === null) return;
-			try {
-				store.setItem(keyOf(record.sessionId, record.tabId), JSON.stringify(record));
-				if (options?.silent !== true) notify();
+			const value = JSON.stringify({
+				...record,
+				runId: record.runId ?? SIDENOTE_RUN_ID
+			});
+			for (const store of [windowStorage(), storage()]) try {
+				store?.setItem(keyOf(record.sessionId, record.tabId), value);
 			} catch {}
+			if (options?.silent !== true) notify();
 		}
 		function dropSideChatMeta(sessionId, tabId) {
-			const store = storage();
-			if (store === null) return;
+			const key = keyOf(sessionId, tabId);
 			try {
-				store.removeItem(keyOf(sessionId, tabId));
-				notify();
+				windowStorage()?.removeItem(key);
+			} catch {}
+			try {
+				const store = storage();
+				if (readRecord(store, key)?.runId === SIDENOTE_RUN_ID) store?.removeItem(key);
 			} catch {}
+			notify();
 		}
 		/** 枚举一个主会话的全部 meta 记录（按创建序升序）。 */
 		function sideChatMetasOf(sessionId) {
@@ -4372,20 +4410,20 @@ ${body}
 		}
 		/** 枚举全部存活记录（跨会话；完成通知等全局监听用）。 */
 		function sideChatMetasAll() {
-			const store = storage();
-			if (store === null) return [];
-			try {
-				const out = [];
-				for (let i = 0; i < store.length; i += 1) {
+			return storedSideChatMetas().filter((record) => record.runId === SIDENOTE_RUN_ID);
+		}
+		/** Durable recovery records; a window's own copy wins over another window. */
+		function storedSideChatMetas() {
+			const records = /* @__PURE__ */ new Map();
+			for (const store of [storage(), windowStorage()]) try {
+				for (let i = 0; store && i < store.length; i++) {
 					const key = store.key(i);
-					if (typeof key !== "string" || !key.startsWith(KEY_PREFIX$1)) continue;
-					const record = revive(JSON.parse(store.getItem(key) ?? "null"));
-					if (record !== null) out.push(record);
+					if (!key?.startsWith(KEY_PREFIX$1)) continue;
+					const record = readRecord(store, key);
+					if (record) records.set(key, record);
 				}
-				return out;
-			} catch {
-				return [];
-			}
+			} catch {}
+			return [...records.values()];
 		}
 		/**
 		* 下一个实例编号：当前会话存活记录的最大编号 + 1。
@@ -4397,30 +4435,12 @@ ${body}
 			return existing.length === 0 ? 1 : Math.max(...existing.map((r) => r.number)) + 1;
 		}
 		/**
-		* 孤键清扫：删掉 runId 与本页面生命周期不匹配的记录（上一页面周期的
-		* 残留）。插件 apply 时调用一次；撤掉活身份，等待实际恢复记录认领。
-		* 返回清扫数。
+		* 启动时收集恢复候选；持久记录不作为存活证明，也不跨窗口删除。
 		*/
 		function sweepOrphanedSideChatMeta() {
-			const store = storage();
-			if (store === null) return 0;
-			try {
-				const staleKeys = [];
-				for (let i = 0; i < store.length; i += 1) {
-					const key = store.key(i);
-					if (typeof key !== "string" || !key.startsWith(KEY_PREFIX$1)) continue;
-					const record = revive(JSON.parse(store.getItem(key) ?? "null"));
-					if (record === null || record.runId !== SIDENOTE_RUN_ID) {
-						if (record !== null) restorationCandidates.set(key, record);
-						staleKeys.push(key);
-					}
-				}
-				for (const key of staleKeys) store.removeItem(key);
-				if (staleKeys.length > 0) notify();
-				return staleKeys.length;
-			} catch {
-				return 0;
-			}
+			restorationCandidates.clear();
+			for (const record of storedSideChatMetas()) if (record.runId !== SIDENOTE_RUN_ID) restorationCandidates.set(keyOf(record.sessionId, record.tabId), record);
+			return restorationCandidates.size;
 		}
 		//#endregion
 		//#region src/client/sidechat/identity.ts
@@ -5279,10 +5299,19 @@ ${body}
 			}, [session]);
 			const context = useMainContext(ctx, meta.parentSessionId ?? scope.sessionId, childId, session, meta.snapshotOnly === true, meta.forkedMidTurn === true);
 			const { boundarySeq, messages, history, progress, loadContext, loadImage, childChat: chat } = context;
+			const [boundaryError, setBoundaryError] = (0, react.useState)();
 			(0, react.useEffect)(() => {
-				if (session && !meta.snapshotOnly && boundarySeq === void 0) loadForkBoundary(session).catch((error) => {
-					console.warn("[dsh-sidenote] 恢复继承边界失败:", error);
+				if (!session || meta.snapshotOnly || boundarySeq !== void 0) {
+					setBoundaryError(void 0);
+					return;
+				}
+				let active = true;
+				loadForkBoundary(session).catch((error) => {
+					if (active) setBoundaryError(String(error instanceof Error ? error.message : error));
 				});
+				return () => {
+					active = false;
+				};
 			}, [
 				session,
 				meta.snapshotOnly,
@@ -5327,7 +5356,7 @@ ${body}
 			const composer = useComposer(ctx, session, childId);
 			(0, react.useEffect)(() => childId === void 0 ? void 0 : registerSubmissionExtras(childId, extras), [childId, extras]);
 			(0, react.useEffect)(() => {
-				if (meta.topic !== void 0) return;
+				if (meta.topic !== void 0 || boundarySeq === void 0) return;
 				const first = messages.find((message) => message.role === "user" && (message.seq ?? -1) > (boundarySeq ?? -1));
 				if (first) extras.onSubmitText(first.text);
 			}, [
@@ -5480,6 +5509,7 @@ ${body}
 				loadImage,
 				progress,
 				loadContext,
+				loadError: boundaryError,
 				loadProgressImage: context.loadProgressImage,
 				contextPending: context.contextPending
 			};
@@ -5510,6 +5540,7 @@ ${body}
 								type: "button",
 								className: sidechat_module_css_default.nativeAction,
 								disabled: running || replies.length === 0 || allAdded,
+								title: t(boundarySeq === void 0 ? "reflowPending" : "reflowAllTitle"),
 								"aria-pressed": allAdded,
 								onClick: () => {
 									for (const reply of replies) addReply(side, reply, questions.get(reply.key));
@@ -5684,6 +5715,11 @@ ${body}
 				title: titleOf(sessionId, nativeTab.id),
 				...meta === void 0 ? {} : { meta }
 			};
+			if (isRestoredNativeTab(nativeTab) && !meta.childId) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				role: "alert",
+				className: sidechat_module_css_default.errorRow,
+				children: t("sideRestoreMissing")
+			});
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: sidechat_module_css_default.nativeHost,
 				"data-dsh-sidenote-native-host": "",
@@ -6612,34 +6648,34 @@ ${body}
 			document.head.appendChild(tag);
 		}
 		var annotate_module_css_default = {
-			"toolbarButton": "_SVViG_toolbarButton",
-			"badge": "_SVViG_badge",
-			"editorAskRow": "_SVViG_editorAskRow",
-			"editorNew": "_SVViG_editorNew",
-			"toolbar": "_SVViG_toolbar",
-			"editorTarget": "_SVViG_editorTarget",
-			"hint": "_SVViG_hint",
-			"sentCardQuote": "_SVViG_sentCardQuote",
-			"confirmButton": "_SVViG_confirmButton",
-			"saveButton": "_SVViG_saveButton",
+			"toolbarBelow": "_SVViG_toolbarBelow",
+			"editorSpacer": "_SVViG_editorSpacer",
+			"badgeSent": "_SVViG_badgeSent",
 			"sentChip": "_SVViG_sentChip",
+			"sentCardTitle": "_SVViG_sentCardTitle",
+			"sentCardQuote": "_SVViG_sentCardQuote",
+			"hint": "_SVViG_hint",
 			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
+			"editorAskRow": "_SVViG_editorAskRow",
 			"hintClose": "_SVViG_hintClose",
+			"toolbar": "_SVViG_toolbar",
+			"badge": "_SVViG_badge",
+			"deleteButton": "_SVViG_deleteButton",
+			"sentChipRow": "_SVViG_sentChipRow",
+			"saveButton": "_SVViG_saveButton",
+			"sentCardNote": "_SVViG_sentCardNote",
+			"toolbarButton": "_SVViG_toolbarButton",
+			"editorNew": "_SVViG_editorNew",
 			"editorEdit": "_SVViG_editorEdit",
+			"editorTextarea": "_SVViG_editorTextarea",
 			"editorFooter": "_SVViG_editorFooter",
-			"toolbarBelow": "_SVViG_toolbarBelow",
 			"highlight": "_SVViG_highlight",
-			"editorTextarea": "_SVViG_editorTextarea",
-			"sentChipRow": "_SVViG_sentChipRow",
-			"cancelButton": "_SVViG_cancelButton",
 			"editorAsk": "_SVViG_editorAsk",
-			"deleteButton": "_SVViG_deleteButton",
 			"editorInput": "_SVViG_editorInput",
-			"editorError": "_SVViG_editorError",
-			"badgeSent": "_SVViG_badgeSent",
-			"editorSpacer": "_SVViG_editorSpacer",
-			"sentCardTitle": "_SVViG_sentCardTitle",
-			"sentCardNote": "_SVViG_sentCardNote"
+			"confirmButton": "_SVViG_confirmButton",
+			"editorTarget": "_SVViG_editorTarget",
+			"cancelButton": "_SVViG_cancelButton",
+			"editorError": "_SVViG_editorError"
 		};
 		//#endregion
 		//#region src/client/annotate/hint.tsx
@@ -8182,7 +8218,7 @@ ${body}
 		/** Run before orphan-meta cleanup so previous live/closed children can migrate. */
 		function registerSideSessionVisibility(ctx) {
 			const visibility = sessionVisibilityOf(ctx);
-			const ids = [...sideChatMetasAll(), ...allClosedSideChats()].flatMap((record) => record.childId ? [record.childId] : []);
+			const ids = [...storedSideChatMetas(), ...allClosedSideChats()].flatMap((record) => record.childId ? [record.childId] : []);
 			visibility.hide(...ids);
 			ctx.effect(() => visibility.watch(), "dsh-sidenote: side session visibility");
 			registerSessionListFilter(ctx, visibility);

package/lib/types/client/host/chat.d.ts

@@ -3,6 +3,7 @@ export interface ContextEvent {
     type: string;
     seq: number;
     data: {
+        inherited?: boolean;
         turn?: number | null;
         commandId?: string;
         sourceCommandId?: string;
@@ -42,8 +43,18 @@ export declare function contextEventSource(session: SessionFace | undefined): Ob
  * its opening lock while it is unfinished; the first-send delta can then carry
  * a checkpoint that commits later. Automatic compaction stays in the busy turn. */
 export declare function unfinishedCompactionCut(session: SessionFace | undefined): number | undefined;
-/** Published event window, shared by all supported hosts. Its last seed marker
- * is the child’s own fork cut (earlier markers can belong to ancestor forks). */
+/** Restore also appends end-seed, but only inherited=true records a fork cut.
+ * A saved copy resolves the cut before its original first-send snapshot. */
+export declare function inheritedBoundaryOf(entries: readonly {
+    event: {
+        type: string;
+        seq: number;
+        data?: {
+            inherited?: boolean;
+        };
+    };
+}[], beforeSeq?: number): number | undefined;
+/** The loaded window can lack the inherited marker; undefined means pending. */
 export declare function inheritedBoundarySource(session: SessionFace | undefined): ObservableSnapshot<number | undefined> | undefined;
 /** Reuse the native contiguous window, but verify coverage: the host swallows
  * page failures and a resolved loadThrough alone does not establish success. */

package/lib/types/client/locales.d.ts

@@ -209,6 +209,8 @@ export declare const en: {
     expandAll: string;
     jumpToLatest: string;
     reflowAll: string;
+    reflowPending: string;
+    sideRestoreMissing: string;
     reflowAllTitle: string;
     reflowAllDone: string;
     promote: string;

package/lib/types/client/sidechat/InheritedContext.d.ts

@@ -12,6 +12,7 @@ export interface InheritedContextData {
         takenAt?: string | null;
     };
     loadContext?: () => Promise<void>;
+    loadError?: string;
 }
 /** Side and saved sessions share the same reader and its local scroll owner. */
 export declare function InheritedContext({ context }: {

package/lib/types/client/sidechat/NativeConversation.d.ts

@@ -18,7 +18,7 @@ export interface ConversationRendererProps {
 export type RenderConversation = (reference: SessionReference, side: SideConversation) => ReactNode;
 export declare function renderSideConversation(props: ConversationRendererProps, reference: SessionReference, side: SideConversation): ReactNode;
 /** Only completed, fork-local final answers are eligible for reflow. */
-export declare function finalReplies(messages: readonly ChatMessage[], boundarySeq?: number, completed?: ReadonlySet<number>): ChatMessage[];
+export declare function finalReplies(messages: readonly ChatMessage[], boundarySeq: number | undefined, completed?: ReadonlySet<number>): ChatMessage[];
 export declare function isReplyAdded(side: SideConversation, message: ChatMessage, question?: string): boolean;
 export declare function addReply(side: SideConversation, message: ChatMessage, question?: string): void;
 export declare function registerNativeConversation(ctx: Context): void;

package/lib/types/client/sidechat/context.d.ts

@@ -1,4 +1,5 @@
 import { type SnapshotEntry } from './snapshot.ts';
+import { inheritedBoundaryOf } from '../host/chat.ts';
 /** Read-only rows have event identities, independent of the native side flow. */
 export interface ContextEntry extends SnapshotEntry {
     key: string;
@@ -8,14 +9,9 @@ export interface ContextEntry extends SnapshotEntry {
 export declare function contextEntriesOf(nodes: readonly unknown[]): ContextEntry[];
 /** A committed checkpoint replaces the inherited prefix, not its surviving tail. */
 export declare function contextHistory(history: readonly ContextEntry[], progress: readonly SnapshotEntry[]): readonly ContextEntry[];
-/** Saving adds a new end-seed; the first-send cut must NOT move to that seed.
- * Older snapshots lack an explicit cut, so use the seed preceding their input. */
-export declare function savedContextOf(nodes: readonly unknown[], events: readonly {
-    event: {
-        type: string;
-        seq: number;
-    };
-}[], hasMore?: boolean): {
+/** Saving preserves the latest side chat's reading cut. An active side chat
+ * freezes its first own snapshot after afterSeq. Restore markers never establish ownership. */
+export declare function savedContextOf(nodes: readonly unknown[], events: Parameters<typeof inheritedBoundaryOf>[0], hasMore?: boolean, afterSeq?: number): {
     boundarySeq: number;
     content: readonly {
         type?: string;

package/lib/types/client/sidechat/metaStore.d.ts

@@ -14,11 +14,9 @@
  * 孤键清扫：不能用旧页面键判断 tab 仍存活，而
  * 「有记录 ⇒ tab 存活」是编排层的判定——残留记录会把入口折叠成聚焦一个
  * 不存在的 tab（死锁，对抗性审查 B2）。每条记录带本页面生命周期的
- * runId，插件 apply 时撤掉 runId 不匹配的活记录。仅真正挂载的 restored
- * tab（navigation revision 0）可重新绑定恢复候选；普通新开不能认领它。
- * 已知限制：同一 origin 开两个窗口时，后启动窗口的清扫会清掉先开窗口的
- * 活记录（其面板 reconcile 幂等重建，childId 丢失退回首开 fork）——
- * 多窗口为边角场景，记录在案。
+ * runId，只有本页面认领的记录才算存活。sessionStorage 保留本窗口身份，
+ * localStorage 提供跨窗口关闭后的恢复副本；启动时只收集恢复候选，
+ * 不删除其他窗口的记录。仅 restored tab（revision 0）可认领旧身份。
  */
 export interface SideChatMetaRecord {
     readonly tabId: string;
@@ -68,6 +66,8 @@ export declare function dropSideChatMeta(sessionId: string, tabId: string): void
 export declare function sideChatMetasOf(sessionId: string): SideChatMetaRecord[];
 /** 枚举全部存活记录（跨会话；完成通知等全局监听用）。 */
 export declare function sideChatMetasAll(): SideChatMetaRecord[];
+/** Durable recovery records; a window's own copy wins over another window. */
+export declare function storedSideChatMetas(): SideChatMetaRecord[];
 /**
  * 下一个实例编号：当前会话存活记录的最大编号 + 1。
  * 单实例期调用方保证同会话同时至多一条存活记录（held 规则），
@@ -75,8 +75,6 @@ export declare function sideChatMetasAll(): SideChatMetaRecord[];
  */
 export declare function nextSideChatNumber(sessionId: string): number;
 /**
- * 孤键清扫：删掉 runId 与本页面生命周期不匹配的记录（上一页面周期的
- * 残留）。插件 apply 时调用一次；撤掉活身份，等待实际恢复记录认领。
- * 返回清扫数。
+ * 启动时收集恢复候选；持久记录不作为存活证明，也不跨窗口删除。
  */
 export declare function sweepOrphanedSideChatMeta(): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sidenote",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Follow the tangent. Keep the thread. Annotate, explore on the side, and bring answers back to DeepSeek Harness. / 思路可以分岔，主线始终向前。划选注释、侧边追问，再把结论带回正在推进的任务。",
   "icon": "docs/assets/logo.svg",
   "type": "module",

package/src/client/host/chat.ts

@@ -3,7 +3,7 @@ import type { Context, ConversationSnapshot, ObservableSnapshot, SessionBinding,
 export interface ContextEvent {
   type: string
   seq: number
-  data: { turn?: number | null; commandId?: string; sourceCommandId?: string; source?: { kind?: string }; content?: readonly { type: string; text?: string }[]; message?: { content: readonly { type: string; text?: string }[] }; summary?: readonly { type: string; text?: string }[]; shadowedSeqs?: readonly number[] }
+  data: { inherited?: boolean; turn?: number | null; commandId?: string; sourceCommandId?: string; source?: { kind?: string }; content?: readonly { type: string; text?: string }[]; message?: { content: readonly { type: string; text?: string }[] }; summary?: readonly { type: string; text?: string }[]; shadowedSeqs?: readonly number[] }
   surfaceOp?: 'append' | { op: 'replace'; startSeq: number; endSeq: number }
 }
 export interface ContextEventWindow { entries: readonly { event: ContextEvent }[]; hasMore?: boolean }
@@ -24,16 +24,19 @@ export function unfinishedCompactionCut(session: SessionFace | undefined): numbe
   return (command?.seq ?? last.seq) - 1
 }
 
-/** Published event window, shared by all supported hosts. Its last seed marker
- * is the child’s own fork cut (earlier markers can belong to ancestor forks). */
+/** Restore also appends end-seed, but only inherited=true records a fork cut.
+ * A saved copy resolves the cut before its original first-send snapshot. */
+export function inheritedBoundaryOf(entries: readonly { event: { type: string; seq: number; data?: { inherited?: boolean } } }[], beforeSeq = Infinity): number | undefined {
+  const seed = entries.findLast(({ event }) => event.type === 'session/end-seed' && event.data?.inherited === true && event.seq < beforeSeq)
+  return seed === undefined ? undefined : seed.event.seq - 1
+}
+
+/** The loaded window can lack the inherited marker; undefined means pending. */
 export function inheritedBoundarySource(session: SessionFace | undefined): ObservableSnapshot<number | undefined> | undefined {
   const source = contextEventSource(session)
   return source && {
     subscribe: notify => source.subscribe(notify),
-    getSnapshot: () => {
-      const seed = source.getSnapshot().entries.findLast(entry => entry.event.type === 'session/end-seed')
-      return seed === undefined ? undefined : seed.event.seq - 1
-    },
+    getSnapshot: () => inheritedBoundaryOf(source.getSnapshot().entries),
   }
 }
 

package/src/client/locales.ts

@@ -229,6 +229,8 @@ export const en = {
   expandAll: 'Expand all',
   jumpToLatest: '↓ Jump to latest',
   reflowAll: 'Reflow all',
+  reflowPending: 'Confirming this side chat’s origin before bringing replies back',
+  sideRestoreMissing: 'The original side chat could not be restored. Reopen it from the recently closed list in /side.',
   reflowAllTitle: 'Bring all Q&A pairs back to the main session',
   reflowAllDone: 'Reflowed ✓',
   promote: 'Save as session',
@@ -464,6 +466,8 @@ export const zh: Record<CopyKey, string> = {
   expandAll: '全部展开',
   jumpToLatest: '↓ 跳到最新',
   reflowAll: '整段回流',
+  reflowPending: '正在确认侧聊来源，确认后可回流',
+  sideRestoreMissing: '未能恢复原侧聊。请从 /side 的最近关闭列表重新打开。',
   reflowAllTitle: '把该侧聊全部问答对带回主会话（chip 可预览/逐条撤）',
   reflowAllDone: '已回流 ✓',
   promote: '保存为正式会话',

package/src/client/sidechat/InheritedContext.tsx

@@ -16,6 +16,7 @@ export interface InheritedContextData {
   loadProgressImage?: (attachment: unknown) => Promise<string>
   progress?: { entries: SnapshotEntry[]; takenAt?: string | null }
   loadContext?: () => Promise<void>
+  loadError?: string
 }
 
 /** Side and saved sessions share the same reader and its local scroll owner. */
@@ -42,7 +43,8 @@ export function InheritedContext({ context }: { context: InheritedContextData })
         <IconChevronDownOutline14 size={12} className={expanded ? css.contextChevronOpen : css.contextChevron} />
         <span>{t('mainContext')}</span><span className={css.contextHint}>{context.contextPending ? t('contextAtSend') : context.progress?.takenAt ? t('contextAsOf', { time: context.progress.takenAt }) : t('contextInherited')}</span>
       </button>
-      {expanded && <ContextProgress id={contextId} history={context.history} entries={context.progress?.entries ?? []} live={context.contextPending === true} loading={loading} error={error} onRetry={() => { setAttempt(value => value + 1) }} loadImage={context.loadImage} loadProgressImage={context.loadProgressImage} />}
+      {!expanded && context.loadError && <div className={css.errorRow} role="alert">{context.loadError}<button type="button" className={css.nativeAction} onClick={() => { fold.toggle('inherited') }}>{t('contextRetry')}</button></div>}
+      {expanded && <ContextProgress id={contextId} history={context.history} entries={context.progress?.entries ?? []} live={context.contextPending === true} loading={loading} error={error ?? (loading ? undefined : context.loadError)} onRetry={() => { setAttempt(value => value + 1) }} loadImage={context.loadImage} loadProgressImage={context.loadProgressImage} />}
     </div>
   </div>
 }

package/src/client/sidechat/NativeConversation.tsx

@@ -41,7 +41,8 @@ function Content(props: ContentProps) {
 }
 
 /** Only completed, fork-local final answers are eligible for reflow. */
-export function finalReplies(messages: readonly ChatMessage[], boundarySeq = -1, completed?: ReadonlySet<number>): ChatMessage[] {
+export function finalReplies(messages: readonly ChatMessage[], boundarySeq: number | undefined, completed?: ReadonlySet<number>): ChatMessage[] {
+  if (boundarySeq === undefined) return []
   const replies: ChatMessage[] = []
   let final: ChatMessage | undefined
   const finish = (): void => { if (final && !final.streaming && !final.interrupted && final.text.trim() !== '' && (completed === undefined || (final.seq !== undefined && completed.has(final.seq)))) replies.push(final) }
@@ -59,6 +60,7 @@ export function isReplyAdded(side: SideConversation, message: ChatMessage, quest
   return side.reflow.list(side.parentSessionId).some(item => item.sourceKey === key || (item.sourceKey === undefined && item.sideTitle === side.title && item.text === message.text && item.question === question))
 }
 export function addReply(side: SideConversation, message: ChatMessage, question?: string): void {
+  if (side.boundarySeq === undefined || message.seq === undefined || message.seq <= side.boundarySeq) return
   if (!isReplyAdded(side, message, question)) {
     side.reflow.add(side.parentSessionId, side.title, message.text, question, `${side.sessionId}:${message.seq ?? message.key}`)
   }

package/src/client/sidechat/SavedConversation.tsx

@@ -77,9 +77,17 @@ export function SavedConversation({ ctx, Original, props }: { ctx: Context; Orig
   useEffect(() => {
     if (typeof markerSeq !== 'number' || saved) return
     let active = true
-    void loadInheritedContext(session, markerSeq).catch(reason => { if (active) setError(String(reason instanceof Error ? reason.message : reason)) })
+    void loadInheritedContext(session, markerSeq).then(async () => {
+      // Legacy snapshots omit the cut. Their inherited marker can be on an
+      // earlier page than the indexed input; resolve it before classifying rows.
+      const window = source?.getSnapshot()
+      const nodes = chat?.getLegacy()?.nodes ?? []
+      const marker = nodes.find(value => (value as { seq: number }).seq === markerSeq) as { content?: readonly { type: string; text?: string }[] } | undefined
+      const prefix = splitSnapshotPrefix(marker?.content?.find(block => block.type === 'text')?.text ?? '')
+      if (prefix && prefix.boundarySeq === undefined && !savedContextOf(nodes, window?.entries ?? [], window?.hasMore) && window?.hasMore) await loadInheritedContext(session, 0)
+    }).catch(reason => { if (active) setError(String(reason instanceof Error ? reason.message : reason)) })
     return () => { active = false }
-  }, [markerSeq, !!saved, session])
+  }, [markerSeq, !!saved, session, source, chat])
   const progress = useMemo(() => saved ? { entries: snapshotEntriesFromText(saved.snapshot, saved.content), takenAt: saved.takenAt } : undefined, [saved])
   const history = useMemo(() => contextHistory(contextEntriesOf(effectiveContextNodes(legacy?.nodes ?? [], window, saved?.boundarySeq ?? -1).nodes), progress?.entries ?? []), [legacy, window, saved, progress])
   const loadImage = useMemo(() => contextImageLoader(ctx, props.sessionId), [ctx, props.sessionId])

package/src/client/sidechat/SideChatPanel.tsx

@@ -57,8 +57,12 @@ export function SideChatPanel(props: TabComponentProps & { reflow: ReflowStore;
   useEffect(() => { openSessionWindow(session) }, [session])
   const context = useMainContext(ctx, meta.parentSessionId ?? scope.sessionId, childId, session, meta.snapshotOnly === true, meta.forkedMidTurn === true)
   const { boundarySeq, messages, history, progress, loadContext, loadImage, childChat: chat } = context
+  const [boundaryError, setBoundaryError] = useState<string>()
   useEffect(() => {
-    if (session && !meta.snapshotOnly && boundarySeq === undefined) void loadForkBoundary(session).catch(error => { console.warn('[dsh-sidenote] 恢复继承边界失败:', error) })
+    if (!session || meta.snapshotOnly || boundarySeq !== undefined) { setBoundaryError(undefined); return }
+    let active = true
+    void loadForkBoundary(session).catch(error => { if (active) setBoundaryError(String(error instanceof Error ? error.message : error)) })
+    return () => { active = false }
   }, [session, meta.snapshotOnly, boundarySeq])
   // Repair pre-fix tab metadata from the durable fork marker, without touching history.
   useEffect(() => {
@@ -84,7 +88,7 @@ export function SideChatPanel(props: TabComponentProps & { reflow: ReflowStore;
   const composer = useComposer(ctx, session, childId)
   useEffect(() => childId === undefined ? undefined : registerSubmissionExtras(childId, extras), [childId, extras])
   useEffect(() => {
-    if (meta.topic !== undefined) return
+    if (meta.topic !== undefined || boundarySeq === undefined) return
     const first = messages.find(message => message.role === 'user' && (message.seq ?? -1) > (boundarySeq ?? -1))
     if (first) extras.onSubmitText(first.text)
   }, [messages, meta.topic, boundarySeq, extras])
@@ -145,7 +149,7 @@ export function SideChatPanel(props: TabComponentProps & { reflow: ReflowStore;
   if (phase === 'fork-error') return <StateScreen title={t('forkErrorTitle')} detail={forkError ?? undefined} hint={t('forkErrorHint')} />
   if (phase === 'missing') return <StateScreen title={t('missingTitle')} detail={t('missingDetail')} hint={t('missingHint')} />
   if (phase !== 'chat' || !reference || !childId) return <StateScreen title={t('preparing')} />
-  const side: SideConversation = { sessionId: childId, parentSessionId: meta.parentSessionId ?? scope.sessionId, title: tab.title, boundarySeq, reflow: props.reflow, history, loadImage, progress, loadContext, loadProgressImage: context.loadProgressImage, contextPending: context.contextPending }
+  const side: SideConversation = { sessionId: childId, parentSessionId: meta.parentSessionId ?? scope.sessionId, title: tab.title, boundarySeq, reflow: props.reflow, history, loadImage, progress, loadContext, loadError: boundaryError, loadProgressImage: context.loadProgressImage, contextPending: context.contextPending }
   const replies = finalReplies(messages, boundarySeq, new Set(chat?.getCompletedReplySeqs?.() ?? []))
   const questions = pairQuestions(messages)
   const allAdded = replies.length > 0 && replies.every(reply => isReplyAdded(side, reply, questions.get(reply.key)))
@@ -155,7 +159,7 @@ export function SideChatPanel(props: TabComponentProps & { reflow: ReflowStore;
     <div className={css.nativeToolbar}>
       <button type="button" className={css.nativeAction} onClick={() => { openSession(ctx, side.parentSessionId) }}>{t(parentPending ? 'parentPending' : parentSnapshot?.running ? 'parentRunning' : 'parentIdle')}</button>
       <span className={css.nativeToolbarActions}>
-        <button type="button" className={css.nativeAction} disabled={running || replies.length === 0 || allAdded} aria-pressed={allAdded} onClick={() => { for (const reply of replies) addReply(side, reply, questions.get(reply.key)) }}>{t(allAdded ? 'reflowAllDone' : 'reflowAll')}</button>
+        <button type="button" className={css.nativeAction} disabled={running || replies.length === 0 || allAdded} title={t(boundarySeq === undefined ? 'reflowPending' : 'reflowAllTitle')} aria-pressed={allAdded} onClick={() => { for (const reply of replies) addReply(side, reply, questions.get(reply.key)) }}>{t(allAdded ? 'reflowAllDone' : 'reflowAll')}</button>
         <button type="button" className={css.nativeAction} disabled={running || composer.pending || hasDraft || saving} title={t(running || composer.pending ? 'promoteBusy' : hasDraft ? 'promoteDraftBusy' : 'promoteTitle')} onClick={() => { void promote() }}>{t('promote')}</button>
       </span>
     </div>

package/src/client/sidechat/context.ts

@@ -1,4 +1,5 @@
 import { snapshotEntriesOf, splitSnapshotPrefix, type SnapshotEntry } from './snapshot.ts'
+import { inheritedBoundaryOf } from '../host/chat.ts'
 
 /** Read-only rows have event identities, independent of the native side flow. */
 export interface ContextEntry extends SnapshotEntry {
@@ -38,16 +39,19 @@ export function contextHistory(history: readonly ContextEntry[], progress: reado
   return progress.some(entry => entry.kind === 'checkpoint') ? [] : history
 }
 
-/** Saving adds a new end-seed; the first-send cut must NOT move to that seed.
- * Older snapshots lack an explicit cut, so use the seed preceding their input. */
-export function savedContextOf(nodes: readonly unknown[], events: readonly { event: { type: string; seq: number } }[], hasMore = false) {
-  for (const value of [...nodes].reverse()) {
+/** Saving preserves the latest side chat's reading cut. An active side chat
+ * freezes its first own snapshot after afterSeq. Restore markers never establish ownership. */
+export function savedContextOf(nodes: readonly unknown[], events: Parameters<typeof inheritedBoundaryOf>[0], hasMore = false, afterSeq?: number) {
+  for (const value of afterSeq === undefined ? [...nodes].reverse() : nodes) {
     const node = value as { kind: string; seq: number; content?: readonly { type?: string; text?: string; attachment?: unknown }[] }
-    if (node.kind !== 'user' && node.kind !== 'steering') continue
+    if (node.seq <= (afterSeq ?? -1) || node.kind !== 'user' && node.kind !== 'steering') continue
     const saved = splitSnapshotPrefix(node.content?.find(block => block.type === 'text')?.text ?? '')
     if (!saved) continue
-    if (saved.boundarySeq === undefined && hasMore && !events.some(({ event }) => event.type === 'session/end-seed' && event.seq < node.seq)) continue
-    const boundarySeq = saved.boundarySeq ?? ((events.findLast(({ event }) => event.type === 'session/end-seed' && event.seq < node.seq)?.event.seq ?? 0) - 1)
+    let boundarySeq = saved.boundarySeq ?? inheritedBoundaryOf(events, node.seq)
+    if (boundarySeq === undefined) {
+      if (hasMore || events.some(({ event }) => event.type === 'session/end-seed' && event.seq < node.seq)) continue
+      boundarySeq = -1
+    }
     if (!Number.isSafeInteger(boundarySeq) || boundarySeq < -1 || boundarySeq >= node.seq) continue
     return { ...saved, boundarySeq, content: node.content }
   }

package/src/client/sidechat/metaStore.ts

@@ -14,11 +14,9 @@
  * 孤键清扫：不能用旧页面键判断 tab 仍存活，而
  * 「有记录 ⇒ tab 存活」是编排层的判定——残留记录会把入口折叠成聚焦一个
  * 不存在的 tab（死锁，对抗性审查 B2）。每条记录带本页面生命周期的
- * runId，插件 apply 时撤掉 runId 不匹配的活记录。仅真正挂载的 restored
- * tab（navigation revision 0）可重新绑定恢复候选；普通新开不能认领它。
- * 已知限制：同一 origin 开两个窗口时，后启动窗口的清扫会清掉先开窗口的
- * 活记录（其面板 reconcile 幂等重建，childId 丢失退回首开 fork）——
- * 多窗口为边角场景，记录在案。
+ * runId，只有本页面认领的记录才算存活。sessionStorage 保留本窗口身份，
+ * localStorage 提供跨窗口关闭后的恢复副本；启动时只收集恢复候选，
+ * 不删除其他窗口的记录。仅 restored tab（revision 0）可认领旧身份。
  */
 export interface SideChatMetaRecord {
   readonly tabId: string
@@ -105,6 +103,15 @@ function storage(): Storage | null {
   return typeof localStorage === 'undefined' ? null : localStorage
 }
 
+function windowStorage(): Storage | null {
+  return typeof sessionStorage === 'undefined' ? null : sessionStorage
+}
+
+function readRecord(store: Storage | null, key: string): SideChatMetaRecord | undefined {
+  try { return revive(JSON.parse(store?.getItem(key) ?? 'null')) ?? undefined }
+  catch { return undefined }
+}
+
 // ── 变更订阅（标题槽活渲染用；版本号单调递增即可，不区分键） ──────────────────
 
 let version = 0
@@ -130,34 +137,29 @@ export function notifySideChatMetaListeners(): void {
 }
 
 export function readSideChatMeta(sessionId: string, tabId: string): SideChatMetaRecord | undefined {
-  const store = storage()
-  if (store === null) return undefined
-  try {
-    const raw = store.getItem(keyOf(sessionId, tabId))
-    if (raw === null) return undefined
-    return revive(JSON.parse(raw)) ?? undefined
-  } catch {
-    return undefined
-  }
+  const key = keyOf(sessionId, tabId)
+  const record = readRecord(windowStorage(), key) ?? readRecord(storage(), key)
+  return record?.runId === SIDENOTE_RUN_ID ? record : undefined
 }
 
 /** 写/合并一个 tab 的 meta（整体替换语义由调用方组合：先读再写）。 */
 export function writeSideChatMeta(record: SideChatMetaRecord, options?: { silent?: boolean }): void {
-  const store = storage()
-  if (store === null) return
-  try {
-    store.setItem(keyOf(record.sessionId, record.tabId), JSON.stringify(record))
-    if (options?.silent !== true) notify()
-  } catch { /* 隐私模式/写失败：meta 缺席降级为无绑定首开 */ }
+  const value = JSON.stringify({ ...record, runId: record.runId ?? SIDENOTE_RUN_ID })
+  for (const store of [windowStorage(), storage()]) {
+    try { store?.setItem(keyOf(record.sessionId, record.tabId), value) }
+    catch { /* The other store can still preserve this identity. */ }
+  }
+  if (options?.silent !== true) notify()
 }
 
 export function dropSideChatMeta(sessionId: string, tabId: string): void {
-  const store = storage()
-  if (store === null) return
+  const key = keyOf(sessionId, tabId)
+  try { windowStorage()?.removeItem(key) } catch { /* ignore */ }
   try {
-    store.removeItem(keyOf(sessionId, tabId))
-    notify()
+    const store = storage()
+    if (readRecord(store, key)?.runId === SIDENOTE_RUN_ID) store?.removeItem(key)
   } catch { /* ignore */ }
+  notify()
 }
 
 /** 枚举一个主会话的全部 meta 记录（按创建序升序）。 */
@@ -167,20 +169,23 @@ export function sideChatMetasOf(sessionId: string): SideChatMetaRecord[] {
 
 /** 枚举全部存活记录（跨会话；完成通知等全局监听用）。 */
 export function sideChatMetasAll(): SideChatMetaRecord[] {
-  const store = storage()
-  if (store === null) return []
-  try {
-    const out: SideChatMetaRecord[] = []
-    for (let i = 0; i < store.length; i += 1) {
-      const key = store.key(i)
-      if (typeof key !== 'string' || !key.startsWith(KEY_PREFIX)) continue
-      const record = revive(JSON.parse(store.getItem(key) ?? 'null'))
-      if (record !== null) out.push(record)
-    }
-    return out
-  } catch {
-    return []
+  return storedSideChatMetas().filter(record => record.runId === SIDENOTE_RUN_ID)
+}
+
+/** Durable recovery records; a window's own copy wins over another window. */
+export function storedSideChatMetas(): SideChatMetaRecord[] {
+  const records = new Map<string, SideChatMetaRecord>()
+  for (const store of [storage(), windowStorage()]) {
+    try {
+      for (let i = 0; store && i < store.length; i++) {
+        const key = store.key(i)
+        if (!key?.startsWith(KEY_PREFIX)) continue
+        const record = readRecord(store, key)
+        if (record) records.set(key, record)
+      }
+    } catch { /* Read the other store when one is unavailable. */ }
   }
+  return [...records.values()]
 }
 
 /**
@@ -194,28 +199,12 @@ export function nextSideChatNumber(sessionId: string): number {
 }
 
 /**
- * 孤键清扫：删掉 runId 与本页面生命周期不匹配的记录（上一页面周期的
- * 残留）。插件 apply 时调用一次；撤掉活身份，等待实际恢复记录认领。
- * 返回清扫数。
+ * 启动时收集恢复候选；持久记录不作为存活证明，也不跨窗口删除。
  */
 export function sweepOrphanedSideChatMeta(): number {
-  const store = storage()
-  if (store === null) return 0
-  try {
-    const staleKeys: string[] = []
-    for (let i = 0; i < store.length; i += 1) {
-      const key = store.key(i)
-      if (typeof key !== 'string' || !key.startsWith(KEY_PREFIX)) continue
-      const record = revive(JSON.parse(store.getItem(key) ?? 'null'))
-      if (record === null || record.runId !== SIDENOTE_RUN_ID) {
-        if (record !== null) restorationCandidates.set(key, record)
-        staleKeys.push(key)
-      }
-    }
-    for (const key of staleKeys) store.removeItem(key)
-    if (staleKeys.length > 0) notify()
-    return staleKeys.length
-  } catch {
-    return 0
+  restorationCandidates.clear()
+  for (const record of storedSideChatMetas()) {
+    if (record.runId !== SIDENOTE_RUN_ID) restorationCandidates.set(keyOf(record.sessionId, record.tabId), record)
   }
+  return restorationCandidates.size
 }

package/src/client/sidechat/native-tab.tsx

@@ -199,6 +199,8 @@ function NativeSideChatBodyInner(props: NativeBodyInjected & NativeTabFrameworkP
     ...(meta === undefined ? {} : { meta }),
   }
 
+  if (isRestoredNativeTab(nativeTab) && !meta.childId) return <div role="alert" className={css.errorRow}>{t('sideRestoreMissing')}</div>
+
   return (
     <div className={css.nativeHost} data-dsh-sidenote-native-host="">
       <SideChatPanel ctx={ctx} store={undefined} scope={scope} tab={tab} visible={nativeTab.visible} reflow={reflow} annotations={annotations} renderConversation={(reference, side) => renderSideConversation(props, reference, side)} quoteRequestId={parseOpenParams(nativeTab.navigation.params)?.quoteRequestId} />

package/src/client/sidechat/useMainContext.ts

@@ -3,7 +3,7 @@ import type { Context, SessionFace } from '../host/contracts.ts'
 import { chatSourceOf, contextEventSource, inheritedBoundarySource, loadForkBoundary, loadInheritedContext } from '../host/chat.ts'
 import { contextImageLoader } from '../host/attachments.ts'
 import { transcriptOf } from '../chat/transcript.ts'
-import { contextEntriesOf, contextHistory } from './context.ts'
+import { contextEntriesOf, contextHistory, savedContextOf } from './context.ts'
 import { snapshotImages, type ImageBlock } from '../../snapshotProtocol.ts'
 import { effectiveContextNodes, loadMainlineSnapshot, snapshotEntriesFromText, snapshotEntriesOf, splitSnapshotPrefix } from './snapshot.ts'
 
@@ -34,12 +34,7 @@ export function useMainContext(ctx: Context, parentSessionId: string, childId: s
     return { text, ...(attachments.length ? { images: { sessionId: parentSessionId, attachments } } : {}) }
   }, [ctx, parentSessionId, childId, session, snapshotOnly])
   const accept = useCallback(() => { if (sending.current) setAccepted(sending.current) }, [])
-  const saved = useMemo(() => boundarySeq === undefined ? undefined : (legacy?.nodes ?? []).flatMap(value => {
-    const node = value as { kind: string; seq: number; content?: readonly { type: string; text?: string; attachment?: unknown }[] }
-    if (!['user', 'steering'].includes(node.kind) || node.seq <= boundarySeq) return []
-    const prefix = splitSnapshotPrefix(node.content?.find(block => block.type === 'text')?.text ?? '')
-    return prefix ? [{ ...prefix, content: node.content }] : []
-  })[0], [legacy, boundarySeq]) ?? accepted
+  const saved = useMemo(() => boundarySeq === undefined ? undefined : savedContextOf(legacy?.nodes ?? [], childWindow?.entries ?? [], childWindow?.hasMore, boundarySeq), [legacy, childWindow, boundarySeq]) ?? accepted
   const preview = forkedMidTurn && !saved
   const parent = preview ? ctx.sessions.binding(parentSessionId)?.session : undefined
   const parentChat = useMemo(() => preview ? chatSourceOf(ctx, ctx.sessions.binding(parentSessionId)) : undefined, [ctx, parentSessionId, parent, preview])

package/src/client/sidechat/visibility.tsx

@@ -2,7 +2,7 @@ import { useId, useSyncExternalStore } from 'react'
 import type { Context } from '../host/contracts.ts'
 import { registerSessionListFilter } from '../host/sessionList.tsx'
 import { sessionVisibilityOf, type SessionVisibility } from '../host/sessionVisibility.ts'
-import { sideChatMetasAll } from './metaStore.ts'
+import { storedSideChatMetas } from './metaStore.ts'
 import { allClosedSideChats } from './recentClosed.ts'
 import { t } from '../locales.ts'
 import { useLocaleTick } from '../locale-tick.ts'
@@ -23,7 +23,7 @@ function VisibilitySetting({ visibility }: { visibility: SessionVisibility }) {
 /** Run before orphan-meta cleanup so previous live/closed children can migrate. */
 export function registerSideSessionVisibility(ctx: Context): void {
   const visibility = sessionVisibilityOf(ctx)
-  const ids = [...sideChatMetasAll(), ...allClosedSideChats()].flatMap(record => record.childId ? [record.childId] : [])
+  const ids = [...storedSideChatMetas(), ...allClosedSideChats()].flatMap(record => record.childId ? [record.childId] : [])
   visibility.hide(...ids)
   ctx.effect(() => visibility.watch(), 'dsh-sidenote: side session visibility')
   registerSessionListFilter(ctx, visibility)