dsh-sidenote 0.4.4 → 0.4.6

package/lib/client.js

@@ -4,8 +4,31 @@ window.__ModuleLoader__.load({
 		var module = { exports: {} };
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+		//#region \0rolldown/runtime.js
+		var __create = Object.create;
+		var __defProp = Object.defineProperty;
+		var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+		var __getOwnPropNames = Object.getOwnPropertyNames;
+		var __getProtoOf = Object.getPrototypeOf;
+		var __hasOwnProp = Object.prototype.hasOwnProperty;
+		var __copyProps = (to, from, except, desc) => {
+			if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+				key = keys[i];
+				if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+					get: ((k) => from[k]).bind(null, key),
+					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+				});
+			}
+			return to;
+		};
+		var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
+			value: mod,
+			enumerable: true
+		}) : target, mod));
+		//#endregion
 		let react = require("react");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
+		_deepseek_ai_dsh_client_ui_primitives = __toESM(_deepseek_ai_dsh_client_ui_primitives, 1);
 		let react_jsx_runtime = require("react/jsx-runtime");
 		let react_dom_client = require("react-dom/client");
 		//#region src/client/sidechat/native.ts
@@ -863,6 +886,22 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/client/host/currentSession.ts
+		/**
+		* 当前（在屏）会话 id 的双版本探测：0.1.5 的 SessionListState 带 `current`
+		* 字段；0.1.7 移除了它（列表只剩 ids/byId/phase），改为会话视图 DOM 的
+		* `[data-conversation-session]` 属性携带。两源皆空 → ''（调用方按既有
+		* 降级语义处理：守卫拒绝、工具条不弹、按钮不渲染）。
+		*/
+		function currentSessionIdOf(ctx) {
+			try {
+				const current = ctx.sessions.list.getSnapshot().current;
+				if (typeof current === "string" && current !== "") return current;
+			} catch {}
+			if (typeof document === "undefined") return "";
+			return document.querySelector("[data-conversation-session]")?.dataset.conversationSession ?? "";
+		}
+		//#endregion
 		//#region src/client/sidechat/metaStore.ts
 		const KEY_PREFIX$1 = "dsh-sidenote:side-meta:v1:";
 		/**
@@ -1130,7 +1169,7 @@ window.__ModuleLoader__.load({
 		/** 直连腿：聚焦既有（三级数据源）或铸造新开。 */
 		function openOrFocusDirect(ctx, sessionId, draftText) {
 			try {
-				if (ctx.sessions.list.getSnapshot().current !== sessionId) return false;
+				if (currentSessionIdOf(ctx) !== sessionId) return false;
 				const hasDraft = draftText !== void 0 && draftText !== "";
 				const live = lastLiveSideChat(sessionId);
 				if (live !== void 0) {
@@ -1240,7 +1279,7 @@ window.__ModuleLoader__.load({
 		function sideChatTargetTitle(ctx, sessionId) {
 			try {
 				if (directLeg(ctx)) {
-					if (ctx.sessions.list.getSnapshot().current !== sessionId) return void 0;
+					if (currentSessionIdOf(ctx) !== sessionId) return void 0;
 					const live = lastLiveSideChat(sessionId);
 					if (live !== void 0) return live.readTitle();
 					const metas = sideChatMetasOf(sessionId);
@@ -1269,7 +1308,7 @@ window.__ModuleLoader__.load({
 		*/
 		function reopenSideChat(ctx, sessionId, childId, opts) {
 			if (directLeg(ctx)) try {
-				if (ctx.sessions.list.getSnapshot().current !== sessionId) return false;
+				if (currentSessionIdOf(ctx) !== sessionId) return false;
 				if (sideChatMetasOf(sessionId).length > 0) return false;
 				sidebarRightOf(ctx).openTab(SIDE_TAB_TYPE, { params: {
 					parentSessionId: sessionId,
@@ -2171,6 +2210,15 @@ ${entries.map((entry) => {
 		}
 		//#endregion
 		//#region src/client/sidechat/lifecycle.ts
+		/** 0.1.7+ 显式持有 Session generation；旧宿主无 retain 时保持原行为。 */
+		function retainSession(ctx, sessionId, signal) {
+			const retain = ctx.sessions.retain;
+			if (typeof retain !== "function") return void 0;
+			return retain.call(ctx.sessions, sessionId, {
+				source: "dsh-sidenote",
+				...signal === void 0 ? {} : { signal }
+			});
+		}
 		/**
 		* 主线忙碌判定（busy-fork 路由）。2026-09-22 实证的宿主 fork 语义缺口：fork
 		* 一个 turn 在飞的会话，会把在飞消息以「未认领的 inbox splice」形态遗传
@@ -2205,9 +2253,9 @@ ${entries.map((entry) => {
 			return purgingChildren.has(childId);
 		}
 		/** 读父会话当前最大节点 seq（折叠边界；读不到不阻断）。 */
-		function readMaxNodeSeq(ctx, sessionId) {
+		function readMaxNodeSeq(ctx, sessionId, binding) {
 			try {
-				const snap = chatSourceOf(ctx, ctx.sessions.binding(sessionId))?.getLegacy();
+				const snap = chatSourceOf(ctx, binding ?? ctx.sessions.binding(sessionId))?.getLegacy();
 				let max = -1;
 				for (const node of snap?.nodes ?? []) {
 					const seq = node.seq;
@@ -2314,19 +2362,28 @@ ${entries.map((entry) => {
 			if (purgingChildren.has(childId)) return;
 			purgingChildren.add(childId);
 			let settled = false;
+			let retained;
 			const offs = [];
+			const releaseRetained = () => {
+				retained?.release();
+				retained = void 0;
+			};
 			const markPurged = () => {
 				updateTabMeta(ctx, parentSessionId, tabId, (cur) => ({
 					...cur,
 					inheritedPurged: true
 				}));
 			};
-			const disarm = () => {
-				if (settled) return;
+			const stop = () => {
+				if (settled) return false;
 				settled = true;
 				for (const off of offs) off();
 				purgingChildren.delete(childId);
-				markPurged();
+				releaseRetained();
+				return true;
+			};
+			const disarm = () => {
+				if (stop()) markPurged();
 			};
 			/**
 			* 子会话投影里「fork 后新增」的用户消息文本（无 = ''）：seq ≤ fork 边界的
@@ -2334,7 +2391,7 @@ ${entries.map((entry) => {
 			*/
 			const freshUserText = () => {
 				try {
-					const nodes = chatSourceOf(ctx, ctx.sessions.binding(childId))?.getLegacy()?.nodes ?? [];
+					const nodes = chatSourceOf(ctx, retained?.binding ?? ctx.sessions.binding(childId))?.getLegacy()?.nodes ?? [];
 					for (let i = nodes.length - 1; i >= 0; i -= 1) {
 						const n = nodes[i];
 						if (n?.kind !== "user" && n?.kind !== "steering") continue;
@@ -2345,13 +2402,18 @@ ${entries.map((entry) => {
 				return "";
 			};
 			try {
-				const binding = ctx.sessions.binding(childId);
+				retained = retainSession(ctx, childId);
+				if (retained !== void 0) retained.ready.catch((error) => {
+					if (!stop()) return;
+					console.warn("[dsh-sidenote] 遗传 turn 监护打开子会话失败:", childId, error);
+				});
+				const binding = retained?.binding ?? ctx.sessions.binding(childId);
 				const session = binding?.session;
 				const cancelFace = session;
 				const chat = binding === void 0 ? void 0 : chatSourceOf(ctx, binding);
 				if (session === void 0 || typeof cancelFace?.cancel !== "function" || chat === void 0) {
 					console.warn("[dsh-sidenote] 子会话 cancel/chat 面缺席，遗传 turn 监护未启用:", childId, "session:", session !== void 0, "chat:", chat !== void 0);
-					purgingChildren.delete(childId);
+					stop();
 					return;
 				}
 				const cancelChild = cancelFace.cancel;
@@ -2369,15 +2431,23 @@ ${entries.map((entry) => {
 					}
 					settled = true;
 					for (const off of offs) off();
-					cancelChild.call(session).catch((error) => console.warn("[dsh-sidenote] 遗传 turn 取消失败:", error)).finally(() => {
+					let cancellation;
+					try {
+						cancellation = cancelChild.call(session);
+					} catch (error) {
+						cancellation = Promise.reject(error);
+					}
+					cancellation.catch((error) => console.warn("[dsh-sidenote] 遗传 turn 取消失败:", error)).finally(() => {
 						purgingChildren.delete(childId);
 						markPurged();
 						advanceBoundaryPastTail(ctx, parentSessionId, tabId, childId);
 						reconcileChildQueueAfterCancel(ctx, childId, expectedPrefix);
+						releaseRetained();
 					});
 				}));
-			} catch {
-				purgingChildren.delete(childId);
+			} catch (error) {
+				stop();
+				console.warn("[dsh-sidenote] 遗传 turn 监护初始化失败:", error);
 			}
 		}
 		/**
@@ -2390,19 +2460,35 @@ ${entries.map((entry) => {
 		* 两者皆无（主线积压、用户的快手第二条）→ 留在队列里不动（保守不删用户文字）。
 		*/
 		function reconcileChildQueueAfterCancel(ctx, childId, expectedPrefix) {
+			let retained;
+			try {
+				retained = retainSession(ctx, childId);
+			} catch {}
 			let attempts = 0;
+			let finished = false;
+			const finish = () => {
+				if (finished) return;
+				finished = true;
+				retained?.release();
+				retained = void 0;
+			};
 			const tick = () => {
 				attempts += 1;
 				try {
-					const session = ctx.sessions.binding(childId)?.session;
+					const session = (retained?.binding ?? ctx.sessions.binding(childId))?.session;
 					const snap = session?.getSnapshot?.();
-					if (session === void 0 || snap === void 0 || snap === null || typeof session.updateQueue !== "function" || typeof session.prompt !== "function") return;
+					if (session === void 0 || snap === void 0 || snap === null || typeof session.updateQueue !== "function" || typeof session.prompt !== "function") {
+						finish();
+						return;
+					}
 					if (snap.running === true) {
 						if (attempts < 8) setTimeout(tick, 400);
+						else finish();
 						return;
 					}
 					const updateQueue = session.updateQueue.bind(session);
 					const prompt = session.prompt.bind(session);
+					const tasks = [];
 					for (const item of snap.queue ?? []) {
 						if (typeof item?.id !== "string") continue;
 						const text = typeof item.text === "string" ? item.text : contentTextOf(item.content);
@@ -2411,12 +2497,16 @@ ${entries.map((entry) => {
 						if (!isLeak && !isUserReal) continue;
 						const itemId = item.id;
 						const content = item.content;
-						updateQueue(itemId, { kind: "remove" }).then(() => {
+						tasks.push(updateQueue(itemId, { kind: "remove" }).then(() => {
 							if (!isUserReal) return void 0;
 							return prompt(content, "queue");
-						}).catch((error) => console.warn("[dsh-sidenote] 取消后队列和解失败:", error));
+						}).catch((error) => console.warn("[dsh-sidenote] 取消后队列和解失败:", error)));
 					}
-				} catch {}
+					if (tasks.length === 0) finish();
+					else Promise.allSettled(tasks).then(finish);
+				} catch {
+					finish();
+				}
 			};
 			setTimeout(tick, 300);
 		}
@@ -2427,20 +2517,34 @@ ${entries.map((entry) => {
 		* turn 会短暂可见，属可接受降级）。
 		*/
 		function advanceBoundaryPastTail(ctx, parentSessionId, tabId, childId) {
+			let retained;
+			try {
+				retained = retainSession(ctx, childId);
+			} catch {}
 			let attempts = 0;
+			let finished = false;
+			const finish = () => {
+				if (finished) return;
+				finished = true;
+				retained?.release();
+				retained = void 0;
+			};
 			const tick = () => {
 				attempts += 1;
 				try {
-					const max = (ctx.sessions.binding(childId)?.session.getSnapshot())?.running === true ? void 0 : readMaxNodeSeq(ctx, childId);
+					const binding = retained?.binding ?? ctx.sessions.binding(childId);
+					const max = (binding?.session.getSnapshot())?.running === true ? void 0 : readMaxNodeSeq(ctx, childId, binding);
 					if (max !== void 0) {
 						updateTabMeta(ctx, parentSessionId, tabId, (cur) => ({
 							...cur,
 							boundarySeq: Math.max(cur.boundarySeq ?? -1, max)
 						}));
+						finish();
 						return;
 					}
 				} catch {}
 				if (attempts < 8) setTimeout(tick, 400);
+				else finish();
 			};
 			setTimeout(tick, 300);
 		}
@@ -2482,7 +2586,7 @@ ${entries.map((entry) => {
 				...snapshotOnly ? { snapshotOnly: true } : {},
 				...leakedPromptPrefix !== void 0 ? { leakedPromptPrefix } : {}
 			}));
-			try {
+			if (typeof owner.workspaces.unarchiveSession !== "function") try {
 				await owner.workspaces.archiveSession(forked);
 			} catch (error) {
 				console.warn("[dsh-sidenote] 归档侧边会话失败（会话列表可能短暂可见）:", error);
@@ -2579,6 +2683,17 @@ ${entries.map((entry) => {
 			} catch {}
 		}
 		/**
+		* 0.1.7 自愈：旧版本插件把侧边子会话归档隐藏，ArchivedSessionGate 会拒跑它
+		* 的模型步（turn/end blocked）。面板挂载时对 childId 幂等 unarchive；
+		* 旧宿主无此 API 时 no-op。
+		*/
+		function unarchiveSideSession(ctx, sessionId) {
+			if (sessionId === void 0) return;
+			const unarchive = ctx.workspaces.unarchiveSession;
+			if (typeof unarchive !== "function") return;
+			unarchive.call(ctx.workspaces, sessionId).catch(() => {});
+		}
+		/**
 		* 打开非 staged 会话的事件窗口（off-face：open() 在 concrete Session 上是
 		* public 且幂等，但不在 SessionFace 契约上——契约面只有 staged 会话会被
 		* 运行时自动 open）。feature-check + 吞错，运行时若移除则降级为只发不收。
@@ -2974,6 +3089,38 @@ ${entries.map((entry) => {
 			};
 		}
 		//#endregion
+		//#region src/client/host/icons.ts
+		const EmptyIcon = () => null;
+		const iconExports = _deepseek_ai_dsh_client_ui_primitives;
+		/** Prefer the weight-named 0.1.7 export, then fall back to the legacy size-named export. */
+		function resolveIcon(exports, modernName, legacyName) {
+			return exports[modernName] ?? exports[legacyName] ?? EmptyIcon;
+		}
+		const icon = (modernName, legacyName) => resolveIcon(iconExports, modernName, legacyName);
+		const IconNewChatOutline16 = icon("IconNewChatOutlineRegular", "IconNewChatOutline16");
+		const IconCheckOutline16 = icon("IconCheckOutlineRegular", "IconCheckOutline16");
+		const IconListPenOutline16 = icon("IconListPenOutlineRegular", "IconListPenOutline16");
+		const IconEditOutline16 = icon("IconEditOutlineRegular", "IconEditOutline16");
+		const IconTrashOutline16 = icon("IconTrashOutlineRegular", "IconTrashOutline16");
+		const IconPlayOutline16 = icon("IconPlayOutlineRegular", "IconPlayOutline16");
+		const IconCordisPluginOutline14 = icon("IconCordisPluginOutlineRegular", "IconCordisPluginOutline14");
+		const IconBranchOutline16 = icon("IconBranchOutlineRegular", "IconBranchOutline16");
+		const IconShareOutline16 = icon("IconShareOutlineRegular", "IconShareOutline16");
+		const IconChevronDownOutline14 = icon("IconChevronDownOutlineRegular", "IconChevronDownOutline14");
+		const IconCloseOutline16 = icon("IconCloseOutlineRegular", "IconCloseOutline16");
+		const IconRightUpOutline16 = icon("IconRightUpOutlineRegular", "IconRightUpOutline16");
+		const IconSearchOutline16 = icon("IconSearchOutlineRegular", "IconSearchOutline16");
+		const IconGlobeOutline14 = icon("IconGlobeOutlineRegular", "IconGlobeOutline14");
+		const IconCodeOutline16 = icon("IconCodeOutlineRegular", "IconCodeOutline16");
+		const IconChecklistOutline14 = icon("IconChecklistOutlineRegular", "IconChecklistOutline14");
+		const IconThinkOutline16 = icon("IconThinkOutlineRegular", "IconThinkOutline16");
+		const IconInspectOutline12 = icon("IconInspectOutlineRegular", "IconInspectOutline12");
+		const IconPaperclipOutline16 = icon("IconPaperclipOutlineRegular", "IconPaperclipOutline16");
+		const IconStopFill16 = icon("IconStopFillRegular", "IconStopFill16");
+		const IconSendOutline16 = icon("IconSendOutlineRegular", "IconSendOutline16");
+		const IconWarningOutline16 = icon("IconWarningOutlineRegular", "IconWarningOutline16");
+		const IconQuestionOutline14 = icon("IconQuestionOutlineRegular", "IconQuestionOutline14");
+		//#endregion
 		//#region src/client/bridge.ts
 		const sideChatBridge = { current: null };
 		//#endregion
@@ -3122,95 +3269,95 @@ ${entries.map((entry) => {
 			document.head.appendChild(tag);
 		}
 		var sidechat_module_css_default = {
-			"input": "_5KEEsG_input",
-			"sendButton": "_5KEEsG_sendButton",
-			"body": "_5KEEsG_body",
-			"empty": "_5KEEsG_empty",
-			"flowRowError": "_5KEEsG_flowRowError",
-			"sentChipRow": "_5KEEsG_sentChipRow",
-			"todoText": "_5KEEsG_todoText",
-			"slashItem": "_5KEEsG_slashItem",
-			"slashItemDetail": "_5KEEsG_slashItemDetail",
-			"noticeRow": "_5KEEsG_noticeRow",
+			"sentChip": "_5KEEsG_sentChip",
+			"pendingQuestion": "_5KEEsG_pendingQuestion",
+			"assistantBody": "_5KEEsG_assistantBody",
 			"pendingTitle": "_5KEEsG_pendingTitle",
-			"userBubble": "_5KEEsG_userBubble",
-			"toolCard": "_5KEEsG_toolCard",
-			"slashMenu": "_5KEEsG_slashMenu",
-			"stateDetail": "_5KEEsG_stateDetail",
 			"pendingQHeader": "_5KEEsG_pendingQHeader",
-			"densityToggle": "_5KEEsG_densityToggle",
-			"pendingActions": "_5KEEsG_pendingActions",
+			"pendingBtnPrimary": "_5KEEsG_pendingBtnPrimary",
+			"assistantRow": "_5KEEsG_assistantRow",
 			"reflowButton": "_5KEEsG_reflowButton",
-			"todoDot": "_5KEEsG_todoDot",
-			"assistantBody": "_5KEEsG_assistantBody",
-			"reasoning": "_5KEEsG_reasoning",
-			"composerCard": "_5KEEsG_composerCard",
+			"composerFoot": "_5KEEsG_composerFoot",
+			"slashItemDetail": "_5KEEsG_slashItemDetail",
+			"inheritedBody": "_5KEEsG_inheritedBody",
+			"reasoningBody": "_5KEEsG_reasoningBody",
 			"pendingQText": "_5KEEsG_pendingQText",
-			"userRow": "_5KEEsG_userRow",
-			"pendingCard": "_5KEEsG_pendingCard",
-			"pendingBar": "_5KEEsG_pendingBar",
-			"parentStrip": "_5KEEsG_parentStrip",
-			"assistantRow": "_5KEEsG_assistantRow",
-			"todoItem": "_5KEEsG_todoItem",
-			"stopButton": "_5KEEsG_stopButton",
+			"flowRowError": "_5KEEsG_flowRowError",
+			"toolRunning": "_5KEEsG_toolRunning",
+			"attachButton": "_5KEEsG_attachButton",
+			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
+			"pendingOptionActive": "_5KEEsG_pendingOptionActive",
+			"toolBody": "_5KEEsG_toolBody",
+			"pendingDesc": "_5KEEsG_pendingDesc",
+			"transcript": "_5KEEsG_transcript",
+			"headerSide": "_5KEEsG_headerSide",
+			"reasoning": "_5KEEsG_reasoning",
+			"composerChips": "_5KEEsG_composerChips",
 			"pendingOption": "_5KEEsG_pendingOption",
-			"todoBody": "_5KEEsG_todoBody",
-			"errorRow": "_5KEEsG_errorRow",
-			"root": "_5KEEsG_root",
-			"stateScreen": "_5KEEsG_stateScreen",
-			"snapshotBody": "_5KEEsG_snapshotBody",
-			"toolBodyText": "_5KEEsG_toolBodyText",
-			"dotRunning": "_5KEEsG_dotRunning",
-			"modelLabel": "_5KEEsG_modelLabel",
-			"attachThumb": "_5KEEsG_attachThumb",
-			"toolGenericBody": "_5KEEsG_toolGenericBody",
-			"emptyIcon": "_5KEEsG_emptyIcon",
 			"rowActions": "_5KEEsG_rowActions",
-			"emptyText": "_5KEEsG_emptyText",
-			"emptyTitle": "_5KEEsG_emptyTitle",
-			"streamingHint": "_5KEEsG_streamingHint",
-			"toolError": "_5KEEsG_toolError",
-			"dotIdle": "_5KEEsG_dotIdle",
-			"inheritedBody": "_5KEEsG_inheritedBody",
-			"rowPreview": "_5KEEsG_rowPreview",
-			"headerSide": "_5KEEsG_headerSide",
-			"actionGroup": "_5KEEsG_actionGroup",
-			"pendingBtnPrimary": "_5KEEsG_pendingBtnPrimary",
-			"pendingOptionActive": "_5KEEsG_pendingOptionActive",
 			"snapshotText": "_5KEEsG_snapshotText",
-			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
-			"composerChips": "_5KEEsG_composerChips",
-			"composer": "_5KEEsG_composer",
-			"nativeHost": "_5KEEsG_nativeHost",
-			"transcript": "_5KEEsG_transcript",
-			"toolHead": "_5KEEsG_toolHead",
-			"attachButton": "_5KEEsG_attachButton",
-			"pendingQuestion": "_5KEEsG_pendingQuestion",
-			"pendingCustom": "_5KEEsG_pendingCustom",
-			"pendingDesc": "_5KEEsG_pendingDesc",
-			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
+			"pendingActions": "_5KEEsG_pendingActions",
+			"parentStrip": "_5KEEsG_parentStrip",
+			"root": "_5KEEsG_root",
+			"actionGroup": "_5KEEsG_actionGroup",
+			"emptyTitle": "_5KEEsG_emptyTitle",
 			"flowRow": "_5KEEsG_flowRow",
+			"jumpBottom": "_5KEEsG_jumpBottom",
+			"emptyText": "_5KEEsG_emptyText",
+			"slashItemName": "_5KEEsG_slashItemName",
+			"attachImg": "_5KEEsG_attachImg",
+			"attachRemove": "_5KEEsG_attachRemove",
+			"pendingReason": "_5KEEsG_pendingReason",
+			"modelSelect": "_5KEEsG_modelSelect",
+			"pendingBar": "_5KEEsG_pendingBar",
+			"todoBody": "_5KEEsG_todoBody",
+			"input": "_5KEEsG_input",
+			"toolHead": "_5KEEsG_toolHead",
+			"userBubble": "_5KEEsG_userBubble",
+			"toolGenericBody": "_5KEEsG_toolGenericBody",
+			"toolLocations": "_5KEEsG_toolLocations",
+			"snapshotBody": "_5KEEsG_snapshotBody",
+			"slashItemActive": "_5KEEsG_slashItemActive",
 			"pendingOptionDesc": "_5KEEsG_pendingOptionDesc",
+			"stopButton": "_5KEEsG_stopButton",
+			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
+			"toolCard": "_5KEEsG_toolCard",
+			"rowPreview": "_5KEEsG_rowPreview",
+			"densityToggle": "_5KEEsG_densityToggle",
+			"pendingHead": "_5KEEsG_pendingHead",
+			"dotRunning": "_5KEEsG_dotRunning",
+			"stateDetail": "_5KEEsG_stateDetail",
 			"dotPending": "_5KEEsG_dotPending",
+			"toolBodyText": "_5KEEsG_toolBodyText",
+			"dotIdle": "_5KEEsG_dotIdle",
+			"userRow": "_5KEEsG_userRow",
 			"sidechat-pulse": "_5KEEsG_sidechat-pulse",
-			"attachImg": "_5KEEsG_attachImg",
-			"sentChip": "_5KEEsG_sentChip",
-			"slashItemActive": "_5KEEsG_slashItemActive",
-			"toolRunning": "_5KEEsG_toolRunning",
-			"toolLocations": "_5KEEsG_toolLocations",
-			"reasoningBody": "_5KEEsG_reasoningBody",
-			"slashItemName": "_5KEEsG_slashItemName",
-			"composerFoot": "_5KEEsG_composerFoot",
+			"modelLabel": "_5KEEsG_modelLabel",
+			"todoDot": "_5KEEsG_todoDot",
+			"empty": "_5KEEsG_empty",
+			"pendingCard": "_5KEEsG_pendingCard",
+			"writeNotice": "_5KEEsG_writeNotice",
+			"todoItem": "_5KEEsG_todoItem",
+			"pendingCustom": "_5KEEsG_pendingCustom",
+			"body": "_5KEEsG_body",
+			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
 			"attachRail": "_5KEEsG_attachRail",
-			"pendingHead": "_5KEEsG_pendingHead",
-			"toolBody": "_5KEEsG_toolBody",
-			"jumpBottom": "_5KEEsG_jumpBottom",
-			"modelSelect": "_5KEEsG_modelSelect",
-			"attachRemove": "_5KEEsG_attachRemove",
+			"slashMenu": "_5KEEsG_slashMenu",
+			"slashItem": "_5KEEsG_slashItem",
+			"sendButton": "_5KEEsG_sendButton",
+			"noticeRow": "_5KEEsG_noticeRow",
+			"toolError": "_5KEEsG_toolError",
+			"composer": "_5KEEsG_composer",
+			"streamingHint": "_5KEEsG_streamingHint",
+			"todoText": "_5KEEsG_todoText",
 			"densityRow": "_5KEEsG_densityRow",
-			"pendingReason": "_5KEEsG_pendingReason",
-			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
-			"writeNotice": "_5KEEsG_writeNotice"
+			"nativeHost": "_5KEEsG_nativeHost",
+			"sentChipRow": "_5KEEsG_sentChipRow",
+			"emptyIcon": "_5KEEsG_emptyIcon",
+			"errorRow": "_5KEEsG_errorRow",
+			"attachThumb": "_5KEEsG_attachThumb",
+			"stateScreen": "_5KEEsG_stateScreen",
+			"composerCard": "_5KEEsG_composerCard"
 		};
 		//#endregion
 		//#region src/client/chat/ToolCard.tsx
@@ -3225,14 +3372,14 @@ ${entries.map((entry) => {
 		/** ToolCallKind → 图标（宿主 ui-tool 同族映射；primitives 图标全集见 icons/index.d.ts）。 */
 		function kindIcon(kind) {
 			switch (kind) {
-				case "read": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconListPenOutline16, { size: 14 });
-				case "edit": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, { size: 14 });
-				case "delete": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, { size: 14 });
-				case "move": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconRightUpOutline16, { size: 14 });
-				case "search": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSearchOutline16, { size: 14 });
-				case "execute": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlayOutline16, { size: 14 });
-				case "fetch": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconGlobeOutline14, { size: 14 });
-				default: return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCordisPluginOutline14, { size: 14 });
+				case "read": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconListPenOutline16, { size: 14 });
+				case "edit": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconEditOutline16, { size: 14 });
+				case "delete": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconTrashOutline16, { size: 14 });
+				case "move": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconRightUpOutline16, { size: 14 });
+				case "search": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconSearchOutline16, { size: 14 });
+				case "execute": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconPlayOutline16, { size: 14 });
+				case "fetch": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconGlobeOutline14, { size: 14 });
+				default: return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCordisPluginOutline14, { size: 14 });
 			}
 		}
 		/** 折叠态读取 hook（viewState store 的 React 绑定，L2 侧）。 */
@@ -3242,7 +3389,7 @@ ${entries.map((entry) => {
 		function ToolCard(props) {
 			const { model, rowKey, fold } = props;
 			const open = useFoldOpen(fold, rowKey);
-			const icon = model.kind === "terminal" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlayOutline16, { size: 14 }) : model.kind === "diff" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, { size: 14 }) : model.kind === "read" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCodeOutline16, { size: 14 }) : model.kind === "todo" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChecklistOutline14, { size: 14 }) : model.kind === "generic" ? kindIcon(model.icon) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCordisPluginOutline14, { size: 14 });
+			const icon = model.kind === "terminal" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconPlayOutline16, { size: 14 }) : model.kind === "diff" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconEditOutline16, { size: 14 }) : model.kind === "read" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCodeOutline16, { size: 14 }) : model.kind === "todo" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChecklistOutline14, { size: 14 }) : model.kind === "generic" ? kindIcon(model.icon) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCordisPluginOutline14, { size: 14 });
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: sidechat_module_css_default.flowRow,
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.DisclosureRow, {
@@ -3389,7 +3536,7 @@ ${entries.map((entry) => {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: sidechat_module_css_default.flowRow,
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.DisclosureRow, {
-					icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconThinkOutline16, { size: 14 }),
+					icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconThinkOutline16, { size: 14 }),
 					title: t("thinking"),
 					open,
 					expandable: true,
@@ -3425,7 +3572,7 @@ ${entries.map((entry) => {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: sidechat_module_css_default.flowRow,
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.DisclosureRow, {
-					icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutline16, { size: 14 }),
+					icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconBranchOutline16, { size: 14 }),
 					title: t("inheritedLabel", { n: props.count }),
 					open,
 					expandable: true,
@@ -3467,7 +3614,7 @@ ${entries.map((entry) => {
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: sidechat_module_css_default.emptyIcon,
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconNewChatOutline16, { size: 32 })
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconNewChatOutline16, { size: 32 })
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: sidechat_module_css_default.emptyTitle,
@@ -3488,7 +3635,7 @@ ${entries.map((entry) => {
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: sidechat_module_css_default.emptyIcon,
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconNewChatOutline16, { size: 32 })
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconNewChatOutline16, { size: 32 })
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: sidechat_module_css_default.emptyTitle,
@@ -3529,7 +3676,7 @@ ${entries.map((entry) => {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: sidechat_module_css_default.flowRow,
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.DisclosureRow, {
-					icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutline16, { size: 14 }),
+					icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconBranchOutline16, { size: 14 }),
 					title: takenAt !== null ? t("snapshotLabelAt", { at: takenAt }) : t("snapshotLabel"),
 					open,
 					expandable: true,
@@ -3662,7 +3809,7 @@ ${entries.map((entry) => {
 						setDone(false);
 					}, 1600);
 				},
-				children: done ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutline16, { size: 12 }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconShareOutline16, { size: 12 })
+				children: done ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCheckOutline16, { size: 12 }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconShareOutline16, { size: 12 })
 			});
 		}
 		const MessageRow = (0, react.memo)(function MessageRow({ message, question, fold, reflow, parentSessionId, sideTitle }) {
@@ -3846,7 +3993,7 @@ ${entries.map((entry) => {
 					items.push({
 						id: `${group.id}/${m.id}`,
 						label: m.name,
-						...selected ? { icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutline16, { size: 12 }) } : {}
+						...selected ? { icon: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCheckOutline16, { size: 12 }) } : {}
 					});
 				}
 			}
@@ -3862,7 +4009,7 @@ ${entries.map((entry) => {
 					onClick: () => {
 						open ? setOpen(false) : openMenu();
 					},
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("modelLabel", { name: props.modelName ?? t("modelFollowsMain") }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { size: 12 })]
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("modelLabel", { name: props.modelName ?? t("modelFollowsMain") }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronDownOutline14, { size: 12 })]
 				}),
 				items,
 				onClose: () => {
@@ -3927,9 +4074,9 @@ ${entries.map((entry) => {
 						setOpen(!open);
 					},
 					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconInspectOutline12, { size: 12 }),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconInspectOutline12, { size: 12 }),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: presetLabel(effective) }),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { size: 12 })
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconChevronDownOutline14, { size: 12 })
 					]
 				}),
 				items,
@@ -4129,7 +4276,7 @@ ${entries.map((entry) => {
 										onClick: () => {
 											fileInputRef.current?.click();
 										},
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPaperclipOutline16, { size: 14 })
+										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconPaperclipOutline16, { size: 14 })
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 										ref: fileInputRef,
@@ -4163,7 +4310,7 @@ ${entries.map((entry) => {
 										onClick: () => {
 											session?.cancel().catch(() => {});
 										},
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconStopFill16, { size: 12 })
+										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconStopFill16, { size: 12 })
 									}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										type: "button",
 										className: sidechat_module_css_default.sendButton,
@@ -4173,7 +4320,7 @@ ${entries.map((entry) => {
 										onClick: () => {
 											composer.submit();
 										},
-										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconSendOutline16, { size: 14 })
+										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconSendOutline16, { size: 14 })
 									})
 								]
 							})
@@ -4478,7 +4625,7 @@ ${entries.map((entry) => {
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: sidechat_module_css_default.pendingHead,
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconWarningOutline16, { size: 14 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconWarningOutline16, { size: 14 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: sidechat_module_css_default.pendingTitle,
 							children: t("pendingApprovalTitle")
 						})]
@@ -4556,7 +4703,7 @@ ${entries.map((entry) => {
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: sidechat_module_css_default.pendingHead,
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconQuestionOutline14, { size: 14 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconQuestionOutline14, { size: 14 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: sidechat_module_css_default.pendingTitle,
 							children: item.planReview ? t("pendingPlanReview") : t("pendingQuestionTitle")
 						})]
@@ -4657,6 +4804,7 @@ ${entries.map((entry) => {
 			const meta = parseSideChatMeta(tab.meta);
 			const childId = meta.childId;
 			const [forkError, setForkError] = (0, react.useState)(null);
+			const [, refreshBinding] = (0, react.useState)(0);
 			const forkStarted = (0, react.useRef)(false);
 			const prevChildId = (0, react.useRef)(childId);
 			(0, react.useEffect)(() => {
@@ -4685,12 +4833,31 @@ ${entries.map((entry) => {
 				tab.id,
 				childId
 			]);
+			(0, react.useEffect)(() => {
+				if (childId === void 0) return;
+				let acquired;
+				try {
+					acquired = retainSession(ctx, childId);
+				} catch (error) {
+					console.warn("[dsh-sidenote] 侧边会话 retain 失败:", childId, error);
+					return;
+				}
+				if (acquired === void 0) return;
+				const reference = acquired;
+				let released = false;
+				unarchiveSideSession(ctx, childId);
+				refreshBinding((value) => value + 1);
+				reference.ready.catch((error) => {
+					if (!released) console.warn("[dsh-sidenote] 侧边会话打开失败:", childId, error);
+				});
+				return () => {
+					released = true;
+					reference.release();
+				};
+			}, [ctx, childId]);
 			const listSnap = (0, react.useSyncExternalStore)((0, react.useCallback)((notify) => ctx.sessions.list.subscribe(notify), [ctx]), () => ctx.sessions.list.getSnapshot());
 			const listed = childId !== void 0 && listSnap.byId?.[childId] !== void 0;
 			const session = (childId === void 0 ? void 0 : ctx.sessions.binding(childId))?.session;
-			(0, react.useEffect)(() => {
-				openSessionWindow(session);
-			}, [session]);
 			(0, react.useEffect)(() => {
 				if (meta.forkedMidTurn !== true || meta.inheritedPurged === true) return;
 				if (childId === void 0 || session === void 0) return;
@@ -4706,6 +4873,9 @@ ${entries.map((entry) => {
 				scope.sessionId,
 				tab.id
 			]);
+			(0, react.useEffect)(() => {
+				openSessionWindow(session);
+			}, [session]);
 			const phase = phaseOf({
 				childId,
 				forkError,
@@ -5178,7 +5348,7 @@ ${entries.map((entry) => {
 					guide: [{
 						order: 60,
 						title: () => t("menuTitle"),
-						icon: (props) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconNewChatOutline16, { size: props.size ?? 16 })
+						icon: (props) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconNewChatOutline16, { size: props.size ?? 16 })
 					}]
 				});
 				const disposeBody = ctx.slots.inject("sidebar.right.pane.tab", () => ctx.slots.register({
@@ -5219,8 +5389,9 @@ ${entries.map((entry) => {
 		*/
 		function HeaderSideButton({ ctx }) {
 			useLocaleTick();
-			const sessionId = (0, react.useSyncExternalStore)((notify) => ctx.sessions.list.subscribe(notify), () => ctx.sessions.list.getSnapshot()).current;
-			if (sessionId === void 0 || !canForkFrom(ctx, sessionId)) return null;
+			(0, react.useSyncExternalStore)((notify) => ctx.sessions.list.subscribe(notify), () => ctx.sessions.list.getSnapshot());
+			const sessionId = currentSessionIdOf(ctx);
+			if (sessionId === "" || !canForkFrom(ctx, sessionId)) return null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 				type: "button",
 				className: sidechat_module_css_default.headerSide,
@@ -5229,7 +5400,7 @@ ${entries.map((entry) => {
 				onClick: () => {
 					openOrFocusSideChat(ctx, sessionId);
 				},
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconNewChatOutline16, { size: 13 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("headerSide") })]
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconNewChatOutline16, { size: 13 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("headerSide") })]
 			});
 		}
 		function registerHeaderEntry(ctx) {
@@ -5568,14 +5739,14 @@ ${entries.map((entry) => {
 				ctx.effect(() => bs.registerTab({
 					id: SIDE_TAB_TYPE,
 					title: () => t("menuTitle"),
-					icon: (size) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconNewChatOutline16, { size }),
+					icon: (size) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconNewChatOutline16, { size }),
 					order: 60,
 					available: (availableCtx, scope) => canForkFrom(availableCtx, scope.sessionId),
 					createTab: (state) => {
 						const titles = collectSideTabs(state).map((tab) => tab.title);
 						if (nativeSidebarHost(ctx)) {
-							const current = ctx.sessions.list.getSnapshot().current;
-							if (current !== void 0) for (const live of liveSideChatsOf(current)) titles.push(live.readTitle());
+							const current = currentSessionIdOf(ctx);
+							if (current !== "") for (const live of liveSideChatsOf(current)) titles.push(live.readTitle());
 						}
 						return { tab: {
 							id: mintSideTabId(),
@@ -6066,43 +6237,43 @@ ${entries.map((entry) => {
 			document.head.appendChild(tag);
 		}
 		var annotate_module_css_default = {
-			"chipRow": "_SVViG_chipRow",
-			"chipNumber": "_SVViG_chipNumber",
-			"hintClose": "_SVViG_hintClose",
-			"cancelButton": "_SVViG_cancelButton",
-			"toolbarButton": "_SVViG_toolbarButton",
-			"badgeSent": "_SVViG_badgeSent",
-			"chipWrap": "_SVViG_chipWrap",
-			"sentCardTitle": "_SVViG_sentCardTitle",
+			"confirmButton": "_SVViG_confirmButton",
 			"editorTarget": "_SVViG_editorTarget",
-			"toolbar": "_SVViG_toolbar",
-			"chip": "_SVViG_chip",
-			"chipRemove": "_SVViG_chipRemove",
-			"editorInput": "_SVViG_editorInput",
 			"highlight": "_SVViG_highlight",
-			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
-			"chipText": "_SVViG_chipText",
+			"toolbarBelow": "_SVViG_toolbarBelow",
+			"editorFooter": "_SVViG_editorFooter",
+			"badgeSent": "_SVViG_badgeSent",
+			"badge": "_SVViG_badge",
+			"chipNote": "_SVViG_chipNote",
+			"editorAskRow": "_SVViG_editorAskRow",
+			"editorError": "_SVViG_editorError",
+			"toolbar": "_SVViG_toolbar",
+			"editorNew": "_SVViG_editorNew",
 			"editorEdit": "_SVViG_editorEdit",
+			"sentCardTitle": "_SVViG_sentCardTitle",
+			"sentChip": "_SVViG_sentChip",
 			"chipClearAll": "_SVViG_chipClearAll",
-			"editorError": "_SVViG_editorError",
-			"sentCardQuote": "_SVViG_sentCardQuote",
+			"chipText": "_SVViG_chipText",
+			"editorInput": "_SVViG_editorInput",
+			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
+			"sentChipRow": "_SVViG_sentChipRow",
 			"editorSpacer": "_SVViG_editorSpacer",
-			"editorFooter": "_SVViG_editorFooter",
-			"badge": "_SVViG_badge",
+			"deleteButton": "_SVViG_deleteButton",
+			"cancelButton": "_SVViG_cancelButton",
+			"chipWrap": "_SVViG_chipWrap",
+			"toolbarButton": "_SVViG_toolbarButton",
 			"editorTextarea": "_SVViG_editorTextarea",
 			"saveButton": "_SVViG_saveButton",
+			"editorAsk": "_SVViG_editorAsk",
+			"chip": "_SVViG_chip",
 			"chipPanel": "_SVViG_chipPanel",
-			"confirmButton": "_SVViG_confirmButton",
-			"editorAskRow": "_SVViG_editorAskRow",
+			"chipRemove": "_SVViG_chipRemove",
 			"sentCardNote": "_SVViG_sentCardNote",
-			"chipNote": "_SVViG_chipNote",
-			"editorAsk": "_SVViG_editorAsk",
-			"toolbarBelow": "_SVViG_toolbarBelow",
-			"sentChip": "_SVViG_sentChip",
-			"deleteButton": "_SVViG_deleteButton",
-			"editorNew": "_SVViG_editorNew",
 			"hint": "_SVViG_hint",
-			"sentChipRow": "_SVViG_sentChipRow"
+			"chipRow": "_SVViG_chipRow",
+			"chipNumber": "_SVViG_chipNumber",
+			"sentCardQuote": "_SVViG_sentCardQuote",
+			"hintClose": "_SVViG_hintClose"
 		};
 		//#endregion
 		//#region src/client/annotate/hint.tsx
@@ -6218,7 +6389,8 @@ ${entries.map((entry) => {
 			useLocaleTick();
 			const selectionState = (0, react.useSyncExternalStore)((0, react.useCallback)((cb) => controller.subscribe(cb), [controller]), () => controller.getSnapshot());
 			(0, react.useSyncExternalStore)((0, react.useCallback)((cb) => store.subscribe(cb), [store]), () => store.getSnapshot());
-			const currentSessionId = (0, react.useSyncExternalStore)((0, react.useCallback)((cb) => ctx.sessions.list.subscribe(cb), [ctx]), () => ctx.sessions.list.getSnapshot()).current ?? "";
+			(0, react.useSyncExternalStore)((0, react.useCallback)((cb) => ctx.sessions.list.subscribe(cb), [ctx]), () => ctx.sessions.list.getSnapshot());
+			const currentSessionId = currentSessionIdOf(ctx);
 			const [editor, setEditor] = (0, react.useState)(null);
 			const [sideDraft, setSideDraft] = (0, react.useState)(null);
 			const [, setGeometryTick] = (0, react.useState)(0);
@@ -6358,7 +6530,7 @@ ${entries.map((entry) => {
 						}
 						closeEditor();
 					}
-				}),
+				}, `${editor.annotationId}:${editor.mode}`),
 				sideDraft !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SideChatNoteEditor, {
 					x: sideDraft.x,
 					y: sideDraft.y,
@@ -6514,7 +6686,7 @@ ${entries.map((entry) => {
 							title: t("confirmTitle"),
 							"aria-label": t("confirmAskAria"),
 							onClick: save,
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutline16, { size: 14 })
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCheckOutline16, { size: 14 })
 						})]
 					}),
 					failed && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -6623,12 +6795,17 @@ ${entries.map((entry) => {
 		}
 		/**
 		* The annotation editor popover. 新建态: input + ✓ 确认 (允许空注解直接保存;
-		* 点击外部/Esc 取消且无显式取消按钮). 重开态: 已有注解 + 🗑 删除 + 取消/保存.
+		* 点击外部 = 确认、Esc = 取消，无显式取消按钮). 重开态: 已有注解 + 🗑 删除 +
+		* 取消/保存.
+		*
+		* 导出供单测直接挂载（tests/annotate-editor.spec.tsx）。
 		*/
 		function AnnotationEditor(props) {
 			useLocaleTick();
 			const [note, setNote] = (0, react.useState)(props.annotation.note);
 			const rootRef = (0, react.useRef)(null);
+			const noteRef = (0, react.useRef)(note);
+			noteRef.current = note;
 			(0, react.useEffect)(() => {
 				const onKeyDown = (event) => {
 					if (event.key === "Escape") {
@@ -6641,7 +6818,8 @@ ${entries.map((entry) => {
 					if (root === null || !(event.target instanceof Node)) return;
 					if (root.contains(event.target)) return;
 					if (event.target instanceof Element && event.target.closest("[data-dsh-sidenote]") !== null) return;
-					props.onCancel();
+					if (props.mode === "new") props.onSave(noteRef.current);
+					else props.onCancel();
 				};
 				document.addEventListener("keydown", onKeyDown, true);
 				document.addEventListener("mousedown", onMouseDown, true);
@@ -6684,7 +6862,7 @@ ${entries.map((entry) => {
 					title: t("confirmTitle"),
 					"aria-label": t("saveNoteAria"),
 					onClick: save,
-					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutline16, { size: 14 })
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCheckOutline16, { size: 14 })
 				})]
 			});
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -6719,7 +6897,7 @@ ${entries.map((entry) => {
 							title: t("deleteNote"),
 							"aria-label": t("deleteNote"),
 							onClick: props.onDelete,
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconTrashOutline16, { size: 14 })
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconTrashOutline16, { size: 14 })
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: annotate_module_css_default.editorSpacer }),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
@@ -6793,7 +6971,7 @@ ${entries.map((entry) => {
 						onClick: () => {
 							setExpanded((open) => !open);
 						},
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconListPenOutline16, { size: 12 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t(active.length === 1 ? "chipOne" : "chipMany", { n: active.length }) })]
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconListPenOutline16, { size: 12 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t(active.length === 1 ? "chipOne" : "chipMany", { n: active.length }) })]
 					}), expanded && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("ul", {
 						className: annotate_module_css_default.chipPanel,
 						children: [active.map((annotation) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
@@ -6819,7 +6997,7 @@ ${entries.map((entry) => {
 									onClick: () => {
 										store.remove(annotation.id);
 									},
-									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseOutline16, { size: 12 })
+									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCloseOutline16, { size: 12 })
 								})
 							]
 						}, annotation.id)), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", {
@@ -6883,7 +7061,7 @@ ${entries.map((entry) => {
 						onClick: () => {
 							setExpanded((open) => !open);
 						},
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconShareOutline16, { size: 12 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t(items.length === 1 ? "reflowChipOne" : "reflowChipMany", { n: items.length }) })]
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconShareOutline16, { size: 12 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t(items.length === 1 ? "reflowChipOne" : "reflowChipMany", { n: items.length }) })]
 					}), expanded && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
 						className: annotate_module_css_default.chipPanel,
 						children: items.map((item) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
@@ -6904,7 +7082,7 @@ ${entries.map((entry) => {
 								onClick: () => {
 									reflow.remove(item.id);
 								},
-								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseOutline16, { size: 12 })
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconCloseOutline16, { size: 12 })
 							})]
 						}, item.id))
 					})]
@@ -6959,13 +7137,7 @@ ${entries.map((entry) => {
 				window.clearTimeout(swallowTimer);
 				swallowTimer = window.setTimeout(clearSwallow, 2e3);
 			};
-			const currentSessionId = () => {
-				try {
-					return ctx.sessions.list.getSnapshot().current ?? "";
-				} catch {
-					return "";
-				}
-			};
+			const currentSessionId = () => currentSessionIdOf(ctx);
 			/**
 			* 异步提交（Workitem_06）：inject 尝试（有界等待，见 tryInjectReflows）
 			* 在拼稿前——成功项以 plugin-source 事件进父会话日志（不进消息前缀），
@@ -7227,7 +7399,7 @@ ${entries.map((entry) => {
 			ctx.effect(() => {
 				try {
 					const store = createAnnotationStore();
-					const controller = createSelectionController(() => ctx.sessions.list.getSnapshot().current ?? "");
+					const controller = createSelectionController(() => currentSessionIdOf(ctx));
 					const host = document.createElement("div");
 					host.dataset.dshSidenote = "";
 					document.body.appendChild(host);