dsh-sidenote 0.3.3 → 0.3.4

package/README.md

@@ -78,9 +78,12 @@ dsh plugin --profile web add dsh-sidenote
 |---|---|---|
 | 0.1.1-rc.x | ≥ 0.12.3 | ✅ CI 双档矩阵 |
 | 0.1.2-rc.x | ≥ 0.18.0 | ✅ CI 双档矩阵 |
+| 0.1.5-rc.x | ≥ 0.19.0 | ✅ 沙箱实测（见下） |
 
 每周 canary 跟进宿主新版本；宿主面缺席时插件按能力降级（不崩页面）。
 
+**native 右栏（better-sidebar ≥ 0.19）语义差异**：侧边聊天 tab 托管给 DSH 原生右侧边栏，受宿主「page kind 每 pane 单实例」规则约束——同一会话同时只开一个侧边聊天（再次打开/新建 = 聚焦既有 tab；关闭后可经 /side 重开恢复原会话）。多开诉求可用原生侧栏的分栏（每 pane 一个）。
+
 ## 设计要点
 
 - **真 fork，不压缩**：侧边会话是真实 DSH 会话（全量历史快照），与主会话能力对等；不是「摘要 + 一次性问答」。

package/lib/client.js

@@ -36,17 +36,25 @@ window.__ModuleLoader__.load({
 		/** Native tab id → live panel. Native layouts are memory-only, so is this. */
 		const liveSideChats = /* @__PURE__ */ new Map();
 		/**
+		* tabId → 首次注册序号（打开序的近似）。tab.id 跨重挂载稳定，重注册不改写
+		* ——遍历 Map 的插入序会随重挂漂移，「最近打开」只能锚在首次序号上。
+		*/
+		const birthOrder = /* @__PURE__ */ new Map();
+		let birthSeq = 0;
+		/**
 		* Publish a mounted panel so programmatic entry points can focus it and seed
 		* its draft. Returns the disposer for the panel's effect cleanup.
 		*/
-		function registerLiveSideChat(sessionId, tabId, seedDraft, readMeta) {
+		function registerLiveSideChat(sessionId, tabId, seedDraft, readMeta, readTitle) {
 			const entry = {
 				tabId,
 				sessionId,
 				seedDraft,
-				readMeta
+				readMeta,
+				readTitle
 			};
 			liveSideChats.set(tabId, entry);
+			if (!birthOrder.has(tabId)) birthOrder.set(tabId, ++birthSeq);
 			const opening = openings.get(sessionId);
 			if (opening !== void 0) {
 				openings.delete(sessionId);
@@ -76,14 +84,25 @@ window.__ModuleLoader__.load({
 			}
 			return mark;
 		}
+		/** 一个会话的全部存活面板（按打开序升序；native 下枚举 side tab 的唯一数据源）。 */
+		function liveSideChatsOf(sessionId) {
+			return [...liveSideChats.values()].filter((entry) => entry.sessionId === sessionId).sort((a, b) => (birthOrder.get(a.tabId) ?? 0) - (birthOrder.get(b.tabId) ?? 0));
+		}
 		/**
-		* Most recently registered live panel of a session — the open-or-focus target
+		* Most recently OPENED live panel of a session — the open-or-focus target
 		* when the legacy snapshot cannot see the tab (mirrors "last opened wins").
+		* 排序锚在首次注册序号上：面板重挂载不翻序（见 birthOrder）。
 		*/
 		function lastLiveSideChat(sessionId) {
-			let found;
-			for (const entry of liveSideChats.values()) if (entry.sessionId === sessionId) found = entry;
-			return found;
+			const all = liveSideChatsOf(sessionId);
+			return all[all.length - 1];
+		}
+		/** 插件卸载/重载时清场（apply 的 ctx.effect disposer 调用）。 */
+		function clearNativeRuntime() {
+			root = void 0;
+			liveSideChats.clear();
+			openings.clear();
+			birthOrder.clear();
 		}
 		/** Native tab shell for reads that go through the layout snapshot (`readTab`). */
 		function nativeTabShell(tabId, type) {
@@ -851,6 +870,8 @@ window.__ModuleLoader__.load({
 				if (snapshot.sessionId !== sessionId || snapshot.state === void 0) return void 0;
 				const existing = collectSideTabs(snapshot.state);
 				if (existing.length > 0) return existing[existing.length - 1].title;
+				const live = lastLiveSideChat(sessionId);
+				if (live !== void 0) return live.readTitle();
 				return sideTabTitle([]);
 			} catch {
 				return;
@@ -867,6 +888,7 @@ window.__ModuleLoader__.load({
 				const snapshot = ctx.betterSidebar.getSnapshot();
 				if (snapshot.sessionId !== sessionId || snapshot.state === void 0) return false;
 				if (!ctx.betterSidebar.isTabEnabled("dsh-sidenote:side")) return false;
+				if (nativeSidebarHost(ctx) && liveSideChatsOf(sessionId).length > 0) return false;
 				const before = new Set(collectTabs(snapshot.state).map((tab) => tab.id));
 				const meta = {
 					childId,
@@ -2159,92 +2181,92 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var sidechat_module_css_default = {
+			"pendingBar": "_5KEEsG_pendingBar",
+			"composerCard": "_5KEEsG_composerCard",
+			"attachRail": "_5KEEsG_attachRail",
 			"reasoningBody": "_5KEEsG_reasoningBody",
-			"pendingTitle": "_5KEEsG_pendingTitle",
-			"todoItem": "_5KEEsG_todoItem",
-			"todoDot": "_5KEEsG_todoDot",
-			"composer": "_5KEEsG_composer",
-			"sendButton": "_5KEEsG_sendButton",
-			"userBubble": "_5KEEsG_userBubble",
-			"toolLocations": "_5KEEsG_toolLocations",
-			"pendingCard": "_5KEEsG_pendingCard",
-			"pendingQuestion": "_5KEEsG_pendingQuestion",
-			"errorRow": "_5KEEsG_errorRow",
-			"composerFoot": "_5KEEsG_composerFoot",
-			"sentChip": "_5KEEsG_sentChip",
-			"noticeRow": "_5KEEsG_noticeRow",
-			"stopButton": "_5KEEsG_stopButton",
-			"stateDetail": "_5KEEsG_stateDetail",
-			"flowRowError": "_5KEEsG_flowRowError",
-			"emptyTitle": "_5KEEsG_emptyTitle",
-			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
-			"pendingCustom": "_5KEEsG_pendingCustom",
-			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
-			"attachButton": "_5KEEsG_attachButton",
-			"pendingOptionDesc": "_5KEEsG_pendingOptionDesc",
-			"writeNotice": "_5KEEsG_writeNotice",
-			"input": "_5KEEsG_input",
-			"userRow": "_5KEEsG_userRow",
-			"sidechat-pulse": "_5KEEsG_sidechat-pulse",
 			"empty": "_5KEEsG_empty",
-			"emptyIcon": "_5KEEsG_emptyIcon",
-			"toolCard": "_5KEEsG_toolCard",
-			"composerCard": "_5KEEsG_composerCard",
-			"toolError": "_5KEEsG_toolError",
+			"dotRunning": "_5KEEsG_dotRunning",
+			"toolBody": "_5KEEsG_toolBody",
 			"attachImg": "_5KEEsG_attachImg",
-			"pendingQHeader": "_5KEEsG_pendingQHeader",
-			"pendingActions": "_5KEEsG_pendingActions",
-			"toolHead": "_5KEEsG_toolHead",
+			"slashItem": "_5KEEsG_slashItem",
+			"stateDetail": "_5KEEsG_stateDetail",
 			"sentChipRow": "_5KEEsG_sentChipRow",
-			"pendingBtnPrimary": "_5KEEsG_pendingBtnPrimary",
-			"dotPending": "_5KEEsG_dotPending",
-			"rowActions": "_5KEEsG_rowActions",
-			"transcript": "_5KEEsG_transcript",
-			"modelLabel": "_5KEEsG_modelLabel",
-			"flowRow": "_5KEEsG_flowRow",
-			"toolBodyText": "_5KEEsG_toolBodyText",
+			"userBubble": "_5KEEsG_userBubble",
+			"rowPreview": "_5KEEsG_rowPreview",
+			"reflowButton": "_5KEEsG_reflowButton",
+			"toolLocations": "_5KEEsG_toolLocations",
 			"toolGenericBody": "_5KEEsG_toolGenericBody",
-			"composerChips": "_5KEEsG_composerChips",
-			"attachRail": "_5KEEsG_attachRail",
-			"pendingQText": "_5KEEsG_pendingQText",
+			"jumpBottom": "_5KEEsG_jumpBottom",
+			"streamingHint": "_5KEEsG_streamingHint",
+			"pendingTitle": "_5KEEsG_pendingTitle",
+			"inheritedBody": "_5KEEsG_inheritedBody",
+			"pendingQHeader": "_5KEEsG_pendingQHeader",
 			"pendingOption": "_5KEEsG_pendingOption",
-			"dotIdle": "_5KEEsG_dotIdle",
+			"pendingOptionActive": "_5KEEsG_pendingOptionActive",
+			"rowActions": "_5KEEsG_rowActions",
 			"stateScreen": "_5KEEsG_stateScreen",
-			"attachRemove": "_5KEEsG_attachRemove",
-			"dotRunning": "_5KEEsG_dotRunning",
+			"pendingActions": "_5KEEsG_pendingActions",
+			"pendingBtnGhost": "_5KEEsG_pendingBtnGhost",
 			"actionGroup": "_5KEEsG_actionGroup",
+			"toolHead": "_5KEEsG_toolHead",
+			"toolBodyText": "_5KEEsG_toolBodyText",
+			"sidechat-pulse": "_5KEEsG_sidechat-pulse",
 			"assistantBody": "_5KEEsG_assistantBody",
-			"todoText": "_5KEEsG_todoText",
-			"pendingReason": "_5KEEsG_pendingReason",
-			"root": "_5KEEsG_root",
-			"pendingOptionActive": "_5KEEsG_pendingOptionActive",
-			"parentStrip": "_5KEEsG_parentStrip",
-			"toolRunning": "_5KEEsG_toolRunning",
-			"modelSelect": "_5KEEsG_modelSelect",
-			"pendingDesc": "_5KEEsG_pendingDesc",
-			"body": "_5KEEsG_body",
-			"densityToggle": "_5KEEsG_densityToggle",
-			"headerSide": "_5KEEsG_headerSide",
-			"reflowButton": "_5KEEsG_reflowButton",
-			"emptyText": "_5KEEsG_emptyText",
-			"densityRow": "_5KEEsG_densityRow",
-			"jumpBottom": "_5KEEsG_jumpBottom",
-			"inheritedBody": "_5KEEsG_inheritedBody",
+			"todoDot": "_5KEEsG_todoDot",
+			"todoBody": "_5KEEsG_todoBody",
+			"toolError": "_5KEEsG_toolError",
 			"reasoning": "_5KEEsG_reasoning",
-			"pendingBar": "_5KEEsG_pendingBar",
-			"toolBody": "_5KEEsG_toolBody",
-			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
+			"attachThumb": "_5KEEsG_attachThumb",
+			"attachButton": "_5KEEsG_attachButton",
+			"densityToggle": "_5KEEsG_densityToggle",
+			"composerFoot": "_5KEEsG_composerFoot",
+			"stopButton": "_5KEEsG_stopButton",
 			"slashItemActive": "_5KEEsG_slashItemActive",
 			"slashMenu": "_5KEEsG_slashMenu",
-			"todoBody": "_5KEEsG_todoBody",
-			"streamingHint": "_5KEEsG_streamingHint",
-			"rowPreview": "_5KEEsG_rowPreview",
-			"slashItem": "_5KEEsG_slashItem",
+			"writeNotice": "_5KEEsG_writeNotice",
+			"input": "_5KEEsG_input",
+			"densityRow": "_5KEEsG_densityRow",
+			"composerChips": "_5KEEsG_composerChips",
+			"sentChip": "_5KEEsG_sentChip",
+			"pendingQuestion": "_5KEEsG_pendingQuestion",
+			"todoText": "_5KEEsG_todoText",
+			"pendingReason": "_5KEEsG_pendingReason",
+			"pendingBtnPrimary": "_5KEEsG_pendingBtnPrimary",
+			"dotIdle": "_5KEEsG_dotIdle",
+			"assistantRow": "_5KEEsG_assistantRow",
+			"flowRow": "_5KEEsG_flowRow",
+			"userRow": "_5KEEsG_userRow",
+			"toolCard": "_5KEEsG_toolCard",
+			"errorRow": "_5KEEsG_errorRow",
+			"noticeRow": "_5KEEsG_noticeRow",
 			"slashItemDetail": "_5KEEsG_slashItemDetail",
-			"attachThumb": "_5KEEsG_attachThumb",
+			"transcript": "_5KEEsG_transcript",
+			"toolRunning": "_5KEEsG_toolRunning",
+			"emptyIcon": "_5KEEsG_emptyIcon",
+			"pendingCustom": "_5KEEsG_pendingCustom",
+			"headerSide": "_5KEEsG_headerSide",
+			"parentStrip": "_5KEEsG_parentStrip",
+			"modelSelect": "_5KEEsG_modelSelect",
 			"pendingHead": "_5KEEsG_pendingHead",
+			"root": "_5KEEsG_root",
+			"flowRowError": "_5KEEsG_flowRowError",
+			"writeNoticeClose": "_5KEEsG_writeNoticeClose",
+			"slashGroupTitle": "_5KEEsG_slashGroupTitle",
+			"sendButton": "_5KEEsG_sendButton",
 			"slashItemName": "_5KEEsG_slashItemName",
-			"assistantRow": "_5KEEsG_assistantRow"
+			"body": "_5KEEsG_body",
+			"emptyText": "_5KEEsG_emptyText",
+			"composer": "_5KEEsG_composer",
+			"emptyTitle": "_5KEEsG_emptyTitle",
+			"attachRemove": "_5KEEsG_attachRemove",
+			"dotPending": "_5KEEsG_dotPending",
+			"todoItem": "_5KEEsG_todoItem",
+			"pendingQText": "_5KEEsG_pendingQText",
+			"pendingOptionDesc": "_5KEEsG_pendingOptionDesc",
+			"pendingDesc": "_5KEEsG_pendingDesc",
+			"modelLabel": "_5KEEsG_modelLabel",
+			"pendingCard": "_5KEEsG_pendingCard"
 		};
 		//#endregion
 		//#region src/client/chat/ToolCard.tsx
@@ -3730,7 +3752,7 @@ window.__ModuleLoader__.load({
 					requestAnimationFrame(() => {
 						rootRef.current?.querySelector("textarea")?.focus();
 					});
-				}, () => metaRef.current);
+				}, () => metaRef.current, () => titleRef.current);
 				return () => {
 					dispose();
 					if (nativeSidebarHost(ctx)) {
@@ -3973,18 +3995,28 @@ window.__ModuleLoader__.load({
 				ui: {
 					kind: "popupSelect",
 					options: (session) => {
-						const options = [{
+						const options = [];
+						const native = nativeSidebarHost(ctx);
+						const lives = native ? liveSideChatsOf(session.sessionId) : [];
+						if (!native || lives.length === 0) options.push({
 							id: "new",
 							label: t("cmdNew"),
 							detail: t("cmdNewDetail")
-						}];
-						const snapshot = ctx.betterSidebar.getSnapshot();
-						if (snapshot.sessionId === session.sessionId && snapshot.state !== void 0) for (const tab of collectSideTabs(snapshot.state)) options.push({
-							id: `focus:${tab.id}`,
-							label: t("cmdFocus", { title: tab.title }),
+						});
+						if (native) for (const live of lives) options.push({
+							id: `focus:${live.tabId}`,
+							label: t("cmdFocus", { title: live.readTitle() }),
 							detail: t("cmdFocusDetail")
 						});
-						for (const entry of listClosedSideChats(session.sessionId)) options.push({
+						else {
+							const snapshot = ctx.betterSidebar.getSnapshot();
+							if (snapshot.sessionId === session.sessionId && snapshot.state !== void 0) for (const tab of collectSideTabs(snapshot.state)) options.push({
+								id: `focus:${tab.id}`,
+								label: t("cmdFocus", { title: tab.title }),
+								detail: t("cmdFocusDetail")
+							});
+						}
+						if (!(native && lives.length > 0)) for (const entry of listClosedSideChats(session.sessionId)) options.push({
 							id: `reopen:${entry.childId}`,
 							label: t("cmdReopen", { title: entry.title }),
 							detail: t("cmdReopenDetail")
@@ -3997,7 +4029,8 @@ window.__ModuleLoader__.load({
 							return;
 						}
 						if (option.id.startsWith("focus:")) {
-							ctx.betterSidebar.activateTab(option.id.slice(6), { sessionId: session.sessionId });
+							const tabId = option.id.slice(6);
+							if (!focusNativeTab(ctx, tabId)) ctx.betterSidebar.activateTab(tabId, { sessionId: session.sessionId });
 							return;
 						}
 						if (option.id.startsWith("reopen:")) {
@@ -4183,11 +4216,18 @@ window.__ModuleLoader__.load({
 				icon: (size) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconNewChatOutline16, { size }),
 				order: 60,
 				available: (availableCtx, scope) => canForkFrom(availableCtx, scope.sessionId),
-				createTab: (state) => ({ tab: {
-					id: mintSideTabId(),
-					type: SIDE_TAB_TYPE,
-					title: sideTabTitle(collectSideTabs(state).map((tab) => tab.title))
-				} }),
+				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());
+					}
+					return { tab: {
+						id: mintSideTabId(),
+						type: SIDE_TAB_TYPE,
+						title: sideTabTitle(titles)
+					} };
+				},
 				onClose: (closedTab) => {
 					const meta = parseSideChatMeta(closedTab.meta);
 					if (meta.childId !== void 0 && meta.parentSessionId !== void 0) recordClosedSideChat(meta.parentSessionId, {
@@ -4669,43 +4709,43 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var annotate_module_css_default = {
-			"editorNew": "_SVViG_editorNew",
-			"chipText": "_SVViG_chipText",
-			"toolbarBelow": "_SVViG_toolbarBelow",
-			"sentCardTitle": "_SVViG_sentCardTitle",
+			"badgeSent": "_SVViG_badgeSent",
 			"chipClearAll": "_SVViG_chipClearAll",
-			"chip": "_SVViG_chip",
 			"highlight": "_SVViG_highlight",
-			"chipNote": "_SVViG_chipNote",
 			"chipRemove": "_SVViG_chipRemove",
-			"editorEdit": "_SVViG_editorEdit",
-			"sentCardNote": "_SVViG_sentCardNote",
-			"editorFooter": "_SVViG_editorFooter",
-			"toolbar": "_SVViG_toolbar",
 			"dshSidenoteHintIn": "_SVViG_dshSidenoteHintIn",
+			"editorNew": "_SVViG_editorNew",
+			"chipRow": "_SVViG_chipRow",
+			"editorTextarea": "_SVViG_editorTextarea",
+			"editorAsk": "_SVViG_editorAsk",
+			"chipNote": "_SVViG_chipNote",
+			"chip": "_SVViG_chip",
+			"chipText": "_SVViG_chipText",
+			"chipPanel": "_SVViG_chipPanel",
+			"editorError": "_SVViG_editorError",
+			"toolbarBelow": "_SVViG_toolbarBelow",
 			"sentCardQuote": "_SVViG_sentCardQuote",
-			"editorInput": "_SVViG_editorInput",
+			"hint": "_SVViG_hint",
+			"sentChipRow": "_SVViG_sentChipRow",
 			"deleteButton": "_SVViG_deleteButton",
-			"badge": "_SVViG_badge",
+			"sentCardNote": "_SVViG_sentCardNote",
 			"confirmButton": "_SVViG_confirmButton",
-			"saveButton": "_SVViG_saveButton",
-			"badgeSent": "_SVViG_badgeSent",
-			"sentChip": "_SVViG_sentChip",
-			"chipNumber": "_SVViG_chipNumber",
-			"hint": "_SVViG_hint",
-			"hintClose": "_SVViG_hintClose",
-			"editorTarget": "_SVViG_editorTarget",
-			"chipWrap": "_SVViG_chipWrap",
 			"cancelButton": "_SVViG_cancelButton",
-			"editorError": "_SVViG_editorError",
+			"editorFooter": "_SVViG_editorFooter",
+			"sentCardTitle": "_SVViG_sentCardTitle",
+			"badge": "_SVViG_badge",
+			"editorTarget": "_SVViG_editorTarget",
+			"chipNumber": "_SVViG_chipNumber",
 			"editorAskRow": "_SVViG_editorAskRow",
-			"sentChipRow": "_SVViG_sentChipRow",
-			"editorTextarea": "_SVViG_editorTextarea",
-			"editorAsk": "_SVViG_editorAsk",
-			"chipRow": "_SVViG_chipRow",
-			"chipPanel": "_SVViG_chipPanel",
+			"editorSpacer": "_SVViG_editorSpacer",
+			"hintClose": "_SVViG_hintClose",
+			"editorInput": "_SVViG_editorInput",
+			"saveButton": "_SVViG_saveButton",
 			"toolbarButton": "_SVViG_toolbarButton",
-			"editorSpacer": "_SVViG_editorSpacer"
+			"editorEdit": "_SVViG_editorEdit",
+			"chipWrap": "_SVViG_chipWrap",
+			"sentChip": "_SVViG_sentChip",
+			"toolbar": "_SVViG_toolbar"
 		};
 		//#endregion
 		//#region src/client/annotate/hint.tsx
@@ -5817,7 +5857,12 @@ window.__ModuleLoader__.load({
 			"locale"
 		];
 		function apply(ctx) {
-			setRootContext(ctx);
+			ctx.effect(() => {
+				setRootContext(ctx);
+				return () => {
+					clearNativeRuntime();
+				};
+			}, "dsh-sidenote: native bridge");
 			attachLocale(ctx.locale);
 			probeHost(ctx);
 			const reflow = createReflowStore();

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

@@ -38,12 +38,14 @@ interface LiveSideChat {
     seedDraft(text: string): void;
     /** Current tab meta, read at call time (the panel re-renders on meta change). */
     readMeta(): unknown;
+    /** Current tab title（聚焦列表/编号数据源的读取面）。 */
+    readTitle(): string;
 }
 /**
  * Publish a mounted panel so programmatic entry points can focus it and seed
  * its draft. Returns the disposer for the panel's effect cleanup.
  */
-export declare function registerLiveSideChat(sessionId: string, tabId: string, seedDraft: (text: string) => void, readMeta: () => unknown): () => void;
+export declare function registerLiveSideChat(sessionId: string, tabId: string, seedDraft: (text: string) => void, readMeta: () => unknown, readTitle: () => string): () => void;
 interface OpeningMark {
     readonly at: number;
     /** 窗口内到达的待投递草稿（面板注册时经 seedDraft 回放）。 */
@@ -55,11 +57,16 @@ export declare function markSideChatOpening(sessionId: string): void;
 export declare function sideChatOpening(sessionId: string): OpeningMark | undefined;
 /** Live panel for a native tab id (undefined for legacy layout tabs). */
 export declare function liveSideChat(tabId: string): LiveSideChat | undefined;
+/** 一个会话的全部存活面板（按打开序升序；native 下枚举 side tab 的唯一数据源）。 */
+export declare function liveSideChatsOf(sessionId: string): LiveSideChat[];
 /**
- * Most recently registered live panel of a session — the open-or-focus target
+ * Most recently OPENED live panel of a session — the open-or-focus target
  * when the legacy snapshot cannot see the tab (mirrors "last opened wins").
+ * 排序锚在首次注册序号上：面板重挂载不翻序（见 birthOrder）。
  */
 export declare function lastLiveSideChat(sessionId: string): LiveSideChat | undefined;
+/** 插件卸载/重载时清场（apply 的 ctx.effect disposer 调用）。 */
+export declare function clearNativeRuntime(): void;
 /** Native tab shell for reads that go through the layout snapshot (`readTab`). */
 export declare function nativeTabShell(tabId: string, type: string): {
     id: string;

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

@@ -2,7 +2,9 @@
  * /side 斜杠命令（spike 落点）：经 client 侧 `ctx.commandUi.register`
  * （dsh-client-ui-commands 的 CommandContribution，ui 形态 popupSelect）
  * 注册。popupSelect 是该注册面唯一的 UI 形态 —— 菜单行被选中后弹一个
- * 选项壳，选项 = 新建 + 当前会话已并存的侧边聊天（聚焦）。
+ * 选项壳，选项 = 新建 + 当前会话已并存的侧边聊天（聚焦）+ 最近关闭（重开）。
+ * native 宿主（better-sidebar >= 0.19）受 dsh sidebar-right 的 held 规则约束
+ * （page kind 每 pane 单实例）：有存活实例时不列「新建」与「重开」。
  *
  * 服务经 ctx.get 惰性解析（commandUi 不在 inject 清单里）：服务缺失、
  * 注册抛错（如与 host 命令撞名）都降级为「只有 Tab 入口」，绝不影响面板。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sidenote",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "DSH web plugin: Codex-style side chat (fork the current session into a persistent side panel) + selection annotations with numbered badges and a composer chip. A thin consumer of dsh-better-sidebar. / Codex 风格侧边聊天 + 划选注释的 DSH 插件。",
   "type": "module",
   "license": "MIT",

package/src/client/index.tsx

@@ -13,14 +13,18 @@ import { attachLocale, type LocaleServiceLike } from './locales.ts'
 import { createReflowStore } from './reflow.ts'
 import { registerSideChat } from './sidechat/index.tsx'
 import { registerAnnotations } from './annotate/index.tsx'
-import { setRootContext } from './sidechat/native.ts'
+import { clearNativeRuntime, setRootContext } from './sidechat/native.ts'
 
 export const inject = ['betterSidebar', 'sessions', 'workspaces', 'slots', 'connection', 'locale']
 
 export function apply(ctx: Context): void {
   // 侧栏 Tab 的原生面（better-sidebar >= 0.19）与宿主调用都要用插件根 ctx：
   // 面板拿到的是 slot 注入的收缩 ctx（inject 里没有 workspaces），见 native.ts。
-  setRootContext(ctx)
+  // fiber 撤销即清场（registry/openings/birthOrder 全模块级，重激活不得带病存活）。
+  ctx.effect(() => {
+    setRootContext(ctx)
+    return () => { clearNativeRuntime() }
+  }, 'dsh-sidenote: native bridge')
   // 跟随 DSH 通用设置里的语言（locale.preference，Host-backed，实时切换）。
   attachLocale(ctx.locale as LocaleServiceLike | undefined)
   // T2 off-face 全景探测：宿主升级后哪些能力降级了，开发者工具里一眼可见。

package/src/client/sidechat/SideChatPanel.tsx

@@ -222,6 +222,7 @@ export function SideChatPanel(props: TabComponentProps & { reflow: ReflowStore }
         requestAnimationFrame(() => { rootRef.current?.querySelector('textarea')?.focus() })
       },
       () => metaRef.current,
+      () => titleRef.current,
     )
     return () => {
       dispose()

package/src/client/sidechat/index.tsx

@@ -23,6 +23,7 @@ import { SideChatPanel } from './SideChatPanel.tsx'
 import { SIDE_TAB_TYPE, canForkFrom, collectSideTabs, mintSideTabId, sideTabTitle } from './model.ts'
 import { parseSideChatMeta } from './model.ts'
 import { recordClosedSideChat } from './recentClosed.ts'
+import { liveSideChatsOf, nativeSidebarHost } from './native.ts'
 import { openOrFocusSideChat, sideChatTargetTitle } from './open.ts'
 import { t } from '../locales.ts'
 import { registerHeaderEntry } from './header.tsx'
@@ -39,9 +40,18 @@ export function registerSideChat(ctx: Context, reflow: ReflowStore): void {
       icon: (size: number) => <IconNewChatOutline16 size={size} />,
       order: 60,
       available: (availableCtx, scope) => canForkFrom(availableCtx, scope.sessionId),
-      createTab: (state) => ({
-        tab: { id: mintSideTabId(), type: SIDE_TAB_TYPE, title: sideTabTitle(collectSideTabs(state).map(tab => tab.title)) },
-      }),
+      createTab: (state) => {
+        // 标题编号数据源：legacy 读布局快照；native 的 tab 不进快照，并入
+        // live registry（当前会话——openTab 的会话守卫保证 state 属在屏会话）。
+        const titles = collectSideTabs(state).map(tab => tab.title)
+        if (nativeSidebarHost(ctx)) {
+          const current = ctx.sessions.list.getSnapshot().current
+          if (current !== undefined) {
+            for (const live of liveSideChatsOf(current)) titles.push(live.readTitle())
+          }
+        }
+        return { tab: { id: mintSideTabId(), type: SIDE_TAB_TYPE, title: sideTabTitle(titles) } }
+      },
       // × 即焚观感 + 后悔药：关 Tab 时登记「最近关闭」（会话本体仍归档在盘）。
       onClose: (closedTab) => {
         const meta = parseSideChatMeta(closedTab.meta)

package/src/client/sidechat/native.ts

@@ -58,11 +58,20 @@ interface LiveSideChat {
   seedDraft(text: string): void
   /** Current tab meta, read at call time (the panel re-renders on meta change). */
   readMeta(): unknown
+  /** Current tab title（聚焦列表/编号数据源的读取面）。 */
+  readTitle(): string
 }
 
 /** Native tab id → live panel. Native layouts are memory-only, so is this. */
 const liveSideChats = new Map<string, LiveSideChat>()
 
+/**
+ * tabId → 首次注册序号（打开序的近似）。tab.id 跨重挂载稳定，重注册不改写
+ * ——遍历 Map 的插入序会随重挂漂移，「最近打开」只能锚在首次序号上。
+ */
+const birthOrder = new Map<string, number>()
+let birthSeq = 0
+
 /**
  * Publish a mounted panel so programmatic entry points can focus it and seed
  * its draft. Returns the disposer for the panel's effect cleanup.
@@ -72,9 +81,11 @@ export function registerLiveSideChat(
   tabId: string,
   seedDraft: (text: string) => void,
   readMeta: () => unknown,
+  readTitle: () => string,
 ): () => void {
-  const entry: LiveSideChat = { tabId, sessionId, seedDraft, readMeta }
+  const entry: LiveSideChat = { tabId, sessionId, seedDraft, readMeta, readTitle }
   liveSideChats.set(tabId, entry)
+  if (!birthOrder.has(tabId)) birthOrder.set(tabId, ++birthSeq)
   // 挂载即回放在 openTab→注册窗口内暂存的草稿（seedDraft 内有相位门）。
   const opening = openings.get(sessionId)
   if (opening !== undefined) {
@@ -123,16 +134,29 @@ export function liveSideChat(tabId: string): LiveSideChat | undefined {
   return liveSideChats.get(tabId)
 }
 
+/** 一个会话的全部存活面板（按打开序升序；native 下枚举 side tab 的唯一数据源）。 */
+export function liveSideChatsOf(sessionId: string): LiveSideChat[] {
+  return [...liveSideChats.values()]
+    .filter(entry => entry.sessionId === sessionId)
+    .sort((a, b) => (birthOrder.get(a.tabId) ?? 0) - (birthOrder.get(b.tabId) ?? 0))
+}
+
 /**
- * Most recently registered live panel of a session — the open-or-focus target
+ * Most recently OPENED live panel of a session — the open-or-focus target
  * when the legacy snapshot cannot see the tab (mirrors "last opened wins").
+ * 排序锚在首次注册序号上：面板重挂载不翻序（见 birthOrder）。
  */
 export function lastLiveSideChat(sessionId: string): LiveSideChat | undefined {
-  let found: LiveSideChat | undefined
-  for (const entry of liveSideChats.values()) {
-    if (entry.sessionId === sessionId) found = entry
-  }
-  return found
+  const all = liveSideChatsOf(sessionId)
+  return all[all.length - 1]
+}
+
+/** 插件卸载/重载时清场（apply 的 ctx.effect disposer 调用）。 */
+export function clearNativeRuntime(): void {
+  root = undefined
+  liveSideChats.clear()
+  openings.clear()
+  birthOrder.clear()
 }
 
 /** Native tab shell for reads that go through the layout snapshot (`readTab`). */

package/src/client/sidechat/open.ts

@@ -16,7 +16,7 @@ import {
   sideTabTitle,
 } from './model.ts'
 import { readInputDraft, resolveSessionInput } from './composer.ts'
-import { focusNativeTab, lastLiveSideChat, markSideChatOpening, nativeSidebarHost, nativeTabShell, sideChatOpening } from './native.ts'
+import { focusNativeTab, lastLiveSideChat, liveSideChatsOf, markSideChatOpening, nativeSidebarHost, nativeTabShell, sideChatOpening } from './native.ts'
 
 /**
  * 从最新快照读一个 Tab（meta 合并写入前的读取面；布局即注册表）。
@@ -133,6 +133,9 @@ export function sideChatTargetTitle(ctx: Context, sessionId: string): string | u
     if (snapshot.sessionId !== sessionId || snapshot.state === undefined) return undefined
     const existing = collectSideTabs(snapshot.state)
     if (existing.length > 0) return existing[existing.length - 1]!.title
+    // native：布局快照看不到 tab，改读 live registry（最近打开者）。
+    const live = lastLiveSideChat(sessionId)
+    if (live !== undefined) return live.readTitle()
     return sideTabTitle([])
   } catch {
     return undefined
@@ -150,6 +153,10 @@ export function reopenSideChat(ctx: Context, sessionId: string, childId: string,
     const snapshot = ctx.betterSidebar.getSnapshot()
     if (snapshot.sessionId !== sessionId || snapshot.state === undefined) return false
     if (!ctx.betterSidebar.isTabEnabled(SIDE_TAB_TYPE)) return false
+    // native 下同 kind 每 pane 单实例（dsh sidebar-right held 规则）：有存活
+    // 实例时 openTab 必折叠为聚焦既有 tab 且 seed.meta 被丢弃——拒绝（弹层
+    // 侧此时本就不列重开项，这里是双保险）。
+    if (nativeSidebarHost(ctx) && liveSideChatsOf(sessionId).length > 0) return false
     const before = new Set(collectTabs(snapshot.state).map(tab => tab.id))
     // native（>= 0.19）：seed.meta 携带恢复信息（native 面采纳 seed.meta；
     // 面板挂载即走绑定恢复路径）。legacy 的 createTab 铸造忽略 seed.meta，

package/src/client/sidechat/slash.ts

@@ -2,7 +2,9 @@
  * /side 斜杠命令（spike 落点）：经 client 侧 `ctx.commandUi.register`
  * （dsh-client-ui-commands 的 CommandContribution，ui 形态 popupSelect）
  * 注册。popupSelect 是该注册面唯一的 UI 形态 —— 菜单行被选中后弹一个
- * 选项壳，选项 = 新建 + 当前会话已并存的侧边聊天（聚焦）。
+ * 选项壳，选项 = 新建 + 当前会话已并存的侧边聊天（聚焦）+ 最近关闭（重开）。
+ * native 宿主（better-sidebar >= 0.19）受 dsh sidebar-right 的 held 规则约束
+ * （page kind 每 pane 单实例）：有存活实例时不列「新建」与「重开」。
  *
  * 服务经 ctx.get 惰性解析（commandUi 不在 inject 清单里）：服务缺失、
  * 注册抛错（如与 host 命令撞名）都降级为「只有 Tab 入口」，绝不影响面板。
@@ -12,6 +14,7 @@
  */
 import type { Context } from '../host/contracts.ts'
 import { canForkFrom, collectSideTabs } from './model.ts'
+import { focusNativeTab, liveSideChatsOf, nativeSidebarHost } from './native.ts'
 import { createSideChat, reopenSideChat } from './open.ts'
 import { dropClosedSideChat, listClosedSideChats } from './recentClosed.ts'
 import { t } from '../locales.ts'
@@ -61,19 +64,37 @@ function makeContribution(ctx: Context, name: string) {
     ui: {
       kind: 'popupSelect' as const,
       options: (session: CommandSession) => {
-        const options: SelectOption[] = [
-          { id: 'new', label: t('cmdNew'), detail: t('cmdNewDetail') },
-        ]
+        const options: SelectOption[] = []
+        const native = nativeSidebarHost(ctx)
+        const lives = native ? liveSideChatsOf(session.sessionId) : []
+        // native 下同 kind 每 pane 单实例（dsh-client-ui-sidebar-right 的 held
+        // 规则：page kind 的 contentId 恒为 sidebar://<kind>，openTab 必折叠为
+        // 聚焦既有 tab）——已有存活实例时「新建」名不副实，不列。
+        if (!native || lives.length === 0) {
+          options.push({ id: 'new', label: t('cmdNew'), detail: t('cmdNewDetail') })
+        }
         // 已并存的侧边聊天列为聚焦项（命令弹层即多实例管理入口）。
-        const snapshot = ctx.betterSidebar.getSnapshot()
-        if (snapshot.sessionId === session.sessionId && snapshot.state !== undefined) {
-          for (const tab of collectSideTabs(snapshot.state)) {
-            options.push({ id: `focus:${tab.id}`, label: t('cmdFocus', { title: tab.title }), detail: t('cmdFocusDetail') })
+        // native（>= 0.19）：tab 不进布局快照，枚举改读 live registry；
+        // legacy：读布局快照（现状）。
+        if (native) {
+          for (const live of lives) {
+            options.push({ id: `focus:${live.tabId}`, label: t('cmdFocus', { title: live.readTitle() }), detail: t('cmdFocusDetail') })
+          }
+        } else {
+          const snapshot = ctx.betterSidebar.getSnapshot()
+          if (snapshot.sessionId === session.sessionId && snapshot.state !== undefined) {
+            for (const tab of collectSideTabs(snapshot.state)) {
+              options.push({ id: `focus:${tab.id}`, label: t('cmdFocus', { title: tab.title }), detail: t('cmdFocusDetail') })
+            }
           }
         }
         // D3 后悔药：最近关闭的可重开（Cmd+Shift+T 心智）。
-        for (const entry of listClosedSideChats(session.sessionId)) {
-          options.push({ id: `reopen:${entry.childId}`, label: t('cmdReopen', { title: entry.title }), detail: t('cmdReopenDetail') })
+        // native 单实例约束下，有存活实例时 reopen 必被 held 折叠（seed.meta
+        // 丢弃且聚焦错对象）——此时不列重开项。
+        if (!(native && lives.length > 0)) {
+          for (const entry of listClosedSideChats(session.sessionId)) {
+            options.push({ id: `reopen:${entry.childId}`, label: t('cmdReopen', { title: entry.title }), detail: t('cmdReopenDetail') })
+          }
         }
         return Promise.resolve(options)
       },
@@ -85,7 +106,9 @@ function makeContribution(ctx: Context, name: string) {
           return
         }
         if (option.id.startsWith('focus:')) {
-          ctx.betterSidebar.activateTab(option.id.slice('focus:'.length), { sessionId: session.sessionId })
+          const tabId = option.id.slice('focus:'.length)
+          // native 宿主的 activateTab 是空操作——聚焦走 ISidebarRight.focus 探测。
+          if (!focusNativeTab(ctx, tabId)) ctx.betterSidebar.activateTab(tabId, { sessionId: session.sessionId })
           return
         }
         if (option.id.startsWith('reopen:')) {