@khorsheed/dsh-client-message-tools 0.1.0 → 0.2.0

package/lib/client.js

@@ -5,7 +5,6 @@ window.__ModuleLoader__.load({
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 		let react = require("react");
-		let _deepseek_ai_dsh_client_runtime_client = require("@deepseek-ai/dsh-client-runtime/client");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 		let react_jsx_runtime = require("react/jsx-runtime");
 		//#region ../../node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/core/core.js
@@ -4142,7 +4141,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/message-tools/src/index.ts",
-						"line": 133,
+						"line": 135,
 						"column": 9
 					}
 				},
@@ -4169,7 +4168,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/message-tools/src/index.ts",
-						"line": 95,
+						"line": 97,
 						"column": 9
 					}
 				},
@@ -4196,23 +4195,82 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					},
 					sourceLocation: {
 						"file": "packages/message-tools/src/index.ts",
-						"line": 61,
+						"line": 63,
 						"column": 9
 					}
 				}
 			]
 		};
 		//#endregion
-		//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-session@0.1.1-rc.2_a4e4bb24a1f3580ac25e11cfa3c6b8cc/node_modules/@deepseek-ai/dsh-session/lib/types/surface.js
+		//#region src/client/chat-hook.ts
 		/**
-		* Surface layer on top of the session event log: an ordered view of events
-		* that produce LLM messages. The append-only log remains the source of truth.
-		*
-		* Browser-safe: web clients consume this subpath export, so it must stay free
-		* of `node:` imports (they break the vite bundle).
-		*
-		* @module @deepseek-ai/dsh-session/surface
+		* Frozen empty chat snapshot for the degraded render path: a composition
+		* without ui-chat never mounts the `conversation.chat.node` slot at all, so
+		* this only guards a stray render — hook call order stays stable and every
+		* selector reads the empty state.
 		*/
+		const EMPTY_CHAT = {
+			order: [],
+			nodes: {
+				get: () => void 0,
+				source: () => ({
+					getSnapshot: () => void 0,
+					subscribe: () => () => {}
+				}),
+				processSource: () => ({
+					getSnapshot: () => void 0,
+					subscribe: () => () => {}
+				}),
+				values: () => []
+			},
+			locations: {
+				getTurn: () => [],
+				getStep: () => []
+			},
+			navigation: { items: () => [] },
+			timeline: {
+				turnOrder: [],
+				turns: /* @__PURE__ */ new Map()
+			},
+			legacy: {
+				nodes: [],
+				turnTimings: /* @__PURE__ */ new Map(),
+				turnEnds: /* @__PURE__ */ new Map(),
+				partial: null,
+				runningCalls: []
+			}
+		};
+		/**
+		* Pick the live chat hook from the entry's composed props (`useChat` is a
+		* session standard prop on 0.1.2), degrading to the frozen empty snapshot
+		* when the framework composed none.
+		* @param props - the entry's composed props.
+		* @returns the chat selector hook.
+		*/
+		function chatHookOf(props) {
+			const direct = props.useChat;
+			if (direct !== void 0) return direct;
+			return (selector) => selector(EMPTY_CHAT);
+		}
+		/**
+		* Resolve the apply-world chat source for one session.
+		* @param ctx - client root context.
+		* @param sessionId - owning session.
+		* @returns the conversation binding's chat target (its snapshot is undefined
+		*   until the first subscription activates the view), or undefined when the
+		*   uiConversation service or the session binding is absent.
+		*/
+		function chatSourceOf(ctx, sessionId) {
+			const uiConversation = ctx.get("uiConversation");
+			if (uiConversation === void 0) return void 0;
+			try {
+				return uiConversation.binding(sessionId).target("chat");
+			} catch {
+				return;
+			}
+		}
+		//#endregion
+		//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-session@0.1.2-rc.1_@deepseek-ai+cordis@4.0.1_@deepseek-ai+dsh-scope@0._5663fee33a080ce0d83159e01d0d0704/node_modules/@deepseek-ai/dsh-session/lib/types/surface.js
 		/** Runtime counterpart of the message-producing event union. */
 		const SURFACE_EVENT_TYPES = /* @__PURE__ */ new Set([
 			"user/message",
@@ -4302,6 +4360,24 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		//#endregion
 		//#region src/client/withdrawn-node.ts
 		/**
+		* Materialize one final chat-target node. The Definition contract's
+		* buildViewNode returns the ConversationViewNode base (key/kind/id/target/
+		* data), so the chat extras (anchorSeq/location/visibility) go through this
+		* explicitly typed builder instead of an excess-checked literal.
+		*/
+		function chatViewNode(context, kind, anchorSeq, data) {
+			return {
+				key: context.key,
+				kind,
+				id: context.id,
+				target: "chat",
+				anchorSeq,
+				location: context.start?.location ?? { kind: "unresolved" },
+				visibility: "visible",
+				data
+			};
+		}
+		/**
 		* The withdrawal divider Definition: one single-event Context per
 		* message-tools replacement event, anchored at the replacement's seq so the
 		* divider sits exactly where the span was hidden.
@@ -4309,10 +4385,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		const withdrawnDividerDefinition = {
 			kind: "message-tools-withdrawn",
 			target: "chat",
-			match: (event) => isMessageToolsReplacement(event) ? {
-				id: String(event.seq),
-				role: "start"
-			} : null,
+			match: (event) => {
+				if (event.type !== "user/message") return null;
+				return isMessageToolsReplacement(event) ? {
+					id: String(event.seq),
+					role: "start"
+				} : null;
+			},
 			start: (_context, match) => {
 				const event = match.event;
 				if (!isMessageToolsReplacement(event)) throw new Error("message-tools-withdrawn start requires a message-tools replacement event");
@@ -4322,16 +4401,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				};
 			},
 			update: (context) => context.state,
-			buildViewNode: (context) => context.state === void 0 ? null : {
-				key: context.key,
-				kind: "message-tools-withdrawn",
-				id: context.id,
-				target: "chat",
-				anchorSeq: context.state.seq,
-				location: context.start?.location ?? { kind: "unresolved" },
-				visibility: "visible",
-				data: context.state
-			}
+			buildViewNode: (context) => context.state === void 0 ? null : chatViewNode(context, "message-tools-withdrawn", context.state.seq, context.state)
 		};
 		/**
 		* The edited-bubble Definition: one single-event Context per message-tools
@@ -4342,10 +4412,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		const editedMessageDefinition = {
 			kind: "message-tools-edited",
 			target: "chat",
-			match: (event) => isMessageToolsEdit(event) ? {
-				id: String(event.seq),
-				role: "start"
-			} : null,
+			match: (event) => {
+				if (event.type !== "user/message") return null;
+				return isMessageToolsEdit(event) ? {
+					id: String(event.seq),
+					role: "start"
+				} : null;
+			},
 			start: (_context, match) => {
 				const event = match.event;
 				if (!isMessageToolsEdit(event)) throw new Error("message-tools-edited start requires a message-tools edit replacement event");
@@ -4357,16 +4430,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				};
 			},
 			update: (context) => context.state,
-			buildViewNode: (context) => context.state === void 0 ? null : {
-				key: context.key,
-				kind: "message-tools-edited",
-				id: context.id,
-				target: "chat",
-				anchorSeq: context.state.seq,
-				location: context.start?.location ?? { kind: "unresolved" },
-				visibility: "visible",
-				data: context.state
-			}
+			buildViewNode: (context) => context.state === void 0 ? null : chatViewNode(context, "message-tools-edited", context.state.seq, context.state)
 		};
 		/**
 		* Fold the hidden seq spans out of the live chat nodes, flattened to
@@ -4405,10 +4469,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		const restoredMessageDefinition = {
 			kind: "message-tools-restored",
 			target: "chat",
-			match: (event) => isMessageToolsRestore(event) ? {
-				id: String(event.seq),
-				role: "start"
-			} : null,
+			match: (event) => {
+				if (event.type !== "user/message") return null;
+				return isMessageToolsRestore(event) ? {
+					id: String(event.seq),
+					role: "start"
+				} : null;
+			},
 			start: (_context, match) => {
 				const event = match.event;
 				if (!isMessageToolsRestore(event)) throw new Error("message-tools-restored start requires a message-tools restore event");
@@ -4421,16 +4488,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				};
 			},
 			update: (context) => context.state,
-			buildViewNode: (context) => context.state === void 0 ? null : {
-				key: context.key,
-				kind: "message-tools-restored",
-				id: context.id,
-				target: "chat",
-				anchorSeq: context.state.seq,
-				location: context.start?.location ?? { kind: "unresolved" },
-				visibility: "visible",
-				data: context.state
-			}
+			buildViewNode: (context) => context.state === void 0 ? null : chatViewNode(context, "message-tools-restored", context.state.seq, context.state)
 		};
 		/**
 		* The restore-assistant-line Definition: one single-event Context per
@@ -4442,10 +4500,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		const restoredAssistantMessageDefinition = {
 			kind: "message-tools-restored-assistant",
 			target: "chat",
-			match: (event) => isMessageToolsRestoreAssistant(event) ? {
-				id: String(event.seq),
-				role: "start"
-			} : null,
+			match: (event) => {
+				if (event.type !== "user/message") return null;
+				return isMessageToolsRestoreAssistant(event) ? {
+					id: String(event.seq),
+					role: "start"
+				} : null;
+			},
 			start: (_context, match) => {
 				const event = match.event;
 				if (!isMessageToolsRestoreAssistant(event)) throw new Error("message-tools-restored-assistant start requires a restore-assistant replay event");
@@ -4457,16 +4518,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				};
 			},
 			update: (context) => context.state,
-			buildViewNode: (context) => context.state === void 0 ? null : {
-				key: context.key,
-				kind: "message-tools-restored-assistant",
-				id: context.id,
-				target: "chat",
-				anchorSeq: context.state.seq,
-				location: context.start?.location ?? { kind: "unresolved" },
-				visibility: "visible",
-				data: context.state
-			}
+			buildViewNode: (context) => context.state === void 0 ? null : chatViewNode(context, "message-tools-restored-assistant", context.state.seq, context.state)
 		};
 		/**
 		* Count the user-visible messages hidden by one withdrawn span. This mirrors
@@ -4638,9 +4690,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			let retryObserver;
 			let retryTimer;
 			let latest;
-			const applyRules = (snapshot) => {
-				latest = snapshot;
-				const nodes = snapshot.chat.nodes.values();
+			const applyRules = (chat) => {
+				latest = chat;
+				const nodes = chat.nodes.values();
 				const ranges = foldHiddenRanges(nodes);
 				const nextSignature = `${ranges.join(",")}:${nodes.length}`;
 				if (nextSignature === signature) return;
@@ -4699,14 +4751,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					else failProbe();
 				}, probeRetryWindowMs);
 			};
-			const onSnapshot = (snapshot) => {
-				latest = snapshot;
+			const onSnapshot = (chat) => {
+				latest = chat;
 				if (disabled) return;
 				if (probed) {
-					applyRules(snapshot);
+					applyRules(chat);
 					return;
 				}
-				if (hiddenFlowKeys(snapshot.chat.nodes.values()).length === 0) return;
+				if (hiddenFlowKeys(chat.nodes.values()).length === 0) return;
 				if (probeScheduled || retrying) return;
 				probeScheduled = true;
 				nextFrame(() => {
@@ -4727,19 +4779,19 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				signature = "";
 				style.textContent = "";
 				if (current === void 0) return;
-				const binding = ctx.sessions.binding(current);
-				if (binding === void 0) return;
-				onSnapshot(binding.session.getSnapshot());
-				stopSession = binding.session.subscribe(() => {
-					onSnapshot(binding.session.getSnapshot());
-				});
+				const source = chatSourceOf(ctx, current);
+				if (source === void 0) return;
+				const publish = () => {
+					const chat = source.getSnapshot();
+					if (chat !== void 0) onSnapshot(chat);
+				};
+				publish();
+				stopSession = source.subscribe(publish);
 			};
 			const stopList = ctx.sessions.list.subscribe(bindCurrent);
-			const stopProvide = ctx.sessions.currentProvideInfo.subscribe(bindCurrent);
 			bindCurrent();
 			return () => {
 				stopList();
-				stopProvide();
 				stopSession?.();
 				stopRetry();
 				style.remove();
@@ -4888,6 +4940,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"model.empty": "暂无可用模型",
 			"model.selectFailed": "模型切换失败",
 			"message.extraBlock": "附加内容块",
+			"close": "关闭",
+			"markdown.copy": "复制",
+			"markdown.copied": "已复制",
+			"markdown.footnotes": "脚注",
 			"json.truncated": "… 已截断，共 {total} 字符"
 		};
 		/** English dictionary, checked complete against the zh key set. */
@@ -4920,9 +4976,45 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"model.empty": "No models available",
 			"model.selectFailed": "Could not switch model",
 			"message.extraBlock": "Extra content block",
+			"close": "Close",
+			"markdown.copy": "Copy",
+			"markdown.copied": "Copied",
+			"markdown.footnotes": "Footnotes",
 			"json.truncated": "… truncated, {total} characters total"
 		};
 		//#endregion
+		//#region ../../node_modules/.pnpm/zustand@4.4.7_@types+react@18.3.31_immer@10.2.0_react@18.3.1/node_modules/zustand/esm/shallow.mjs
+		function shallow$1(objA, objB) {
+			if (Object.is(objA, objB)) return true;
+			if (typeof objA !== "object" || objA === null || typeof objB !== "object" || objB === null) return false;
+			if (objA instanceof Map && objB instanceof Map) {
+				if (objA.size !== objB.size) return false;
+				for (const [key, value] of objA) if (!Object.is(value, objB.get(key))) return false;
+				return true;
+			}
+			if (objA instanceof Set && objB instanceof Set) {
+				if (objA.size !== objB.size) return false;
+				for (const value of objA) if (!objB.has(value)) return false;
+				return true;
+			}
+			const keysA = Object.keys(objA);
+			if (keysA.length !== Object.keys(objB).length) return false;
+			for (let i = 0; i < keysA.length; i++) if (!Object.prototype.hasOwnProperty.call(objB, keysA[i]) || !Object.is(objA[keysA[i]], objB[keysA[i]])) return false;
+			return true;
+		}
+		//#endregion
+		//#region ../../node_modules/.pnpm/@deepseek-ai+dsh-client-store@0.1.2-rc.1_@deepseek-ai+cordis@4.0.1_@types+react@18.3.31_react@18.3.1/node_modules/@deepseek-ai/dsh-client-store/lib/index.js
+		/**
+		* Shallow equality for selector slices (zustand/shallow semantics; travels
+		* with the engine so hook consumers need no zustand dependency).
+		* @param a - left value.
+		* @param b - right value.
+		* @returns whether the values are shallowly equal.
+		*/
+		function shallowEqual(a, b) {
+			return shallow$1(a, b);
+		}
+		//#endregion
 		//#region src/client/icons.tsx
 		/**
 		* Undo arrow (withdraw/restore), rotate-ccw style: a near-full circle arc
@@ -4964,7 +5056,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			if (text !== "") steps.backfill(text);
 		}
 		//#endregion
-		//#region \0dsh-css:/Users/zhuyudan/code/dsh-plugins/packages/message-tools/src/client/ModelChip.module.css.mjs
+		//#region \0dsh-css:src/client/ModelChip.module.css.mjs
 		const css$3 = ".he-h5G_chip{align-items:center;gap:6px;display:flex;position:relative}.he-h5G_trigger{height:28px;color:var(--dsw-alias-label-secondary,var(--dsw-alias-label-primary));cursor:pointer;background:0 0;border:none;border-radius:24px;align-items:center;gap:4px;padding:0 8px;font-size:13px;font-weight:500;display:inline-flex}.he-h5G_trigger:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover,var(--dsw-alias-bg-layer-1))}.he-h5G_trigger:disabled{cursor:default;opacity:.6}.he-h5G_triggerEffort{color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-primary-dimmed))}.he-h5G_menu{z-index:20;border:1px solid var(--dsw-alias-border-l1,var(--dsw-alias-border-l2,var(--dsw-alias-label-primary-dimmed)));background:var(--dsw-alias-bg-base,var(--dsw-alias-bg-layer-1));min-width:220px;max-height:320px;box-shadow:0 4px 16px var(--dsw-alias-shadow,var(--dsw-alias-border-l2,#0000001f));border-radius:8px;padding:4px;position:absolute;bottom:calc(100% + 4px);left:0;overflow-y:auto}.he-h5G_group+.he-h5G_group{margin-top:4px}.he-h5G_groupTitle{color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-primary-dimmed));padding:4px 8px;font-size:12px;line-height:18px}.he-h5G_option{width:100%;color:var(--dsw-alias-label-primary,var(--dsw-alias-label-secondary));text-align:left;cursor:pointer;background:0 0;border:none;border-radius:6px;justify-content:space-between;align-items:center;gap:8px;padding:6px 8px;font-size:13px;line-height:20px;display:flex}.he-h5G_option:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover,var(--dsw-alias-bg-layer-1))}.he-h5G_option:disabled{cursor:default;opacity:.6}.he-h5G_check{width:16px;color:var(--dsw-alias-label-primary,var(--dsw-alias-label-secondary));flex:none;display:inline-flex}.he-h5G_empty{color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-primary-dimmed));padding:8px;font-size:13px}.he-h5G_selectFailed{color:var(--dsw-alias-state-error-primary,var(--dsw-alias-label-secondary));white-space:nowrap;font-size:12px}";
 		const tagId$3 = "@khorsheed/dsh-client-message-tools/ModelChip.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$3) + "]") === null) {
@@ -4975,16 +5067,16 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			document.head.appendChild(tag);
 		}
 		var ModelChip_module_css_default = {
-			"triggerEffort": "he-h5G_triggerEffort",
-			"groupTitle": "he-h5G_groupTitle",
 			"chip": "he-h5G_chip",
-			"check": "he-h5G_check",
-			"trigger": "he-h5G_trigger",
-			"option": "he-h5G_option",
+			"groupTitle": "he-h5G_groupTitle",
 			"empty": "he-h5G_empty",
 			"selectFailed": "he-h5G_selectFailed",
-			"group": "he-h5G_group",
-			"menu": "he-h5G_menu"
+			"triggerEffort": "he-h5G_triggerEffort",
+			"menu": "he-h5G_menu",
+			"trigger": "he-h5G_trigger",
+			"check": "he-h5G_check",
+			"option": "he-h5G_option",
+			"group": "he-h5G_group"
 		};
 		//#endregion
 		//#region src/client/ModelChip.tsx
@@ -5156,7 +5248,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			});
 		}
 		//#endregion
-		//#region \0dsh-css:/Users/zhuyudan/code/dsh-plugins/packages/message-tools/src/client/UserMessageView.module.css.mjs
+		//#region \0dsh-css:src/client/UserMessageView.module.css.mjs
 		const css$2 = ".kCWYAa_userRow{flex-direction:column;align-items:flex-end;gap:6px;display:flex}.kCWYAa_userStack{flex-direction:column;align-items:flex-end;gap:8px;min-width:0;max-width:min(525px,82%);display:flex}.kCWYAa_bubble{background:var(--dsw-specific-bubble,var(--dsw-alias-bg-layer-1));max-width:100%;color:var(--dsw-alias-label-primary,var(--dsw-alias-label-secondary));border-radius:22px;padding:10px 16px;font-size:16px;line-height:24px}.kCWYAa_refChip{color:var(--dsw-alias-label-primary,var(--dsw-alias-label-secondary));white-space:nowrap;vertical-align:baseline;background:#6187d838;border-radius:6px;margin:0 2px;padding:0 8px;font-size:.85em;line-height:1.6;display:inline-block}.kCWYAa_actions{align-items:center;gap:10px;height:28px;display:flex}.kCWYAa_action{width:28px;height:28px;color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-primary-dimmed));cursor:pointer;background:0 0;border:none;border-radius:28px;justify-content:center;align-items:center;padding:6px;display:inline-flex}.kCWYAa_action:hover{background:var(--dsw-alias-interactive-bg-hover,var(--dsw-alias-bg-layer-1));color:var(--dsw-alias-label-secondary,var(--dsw-alias-label-primary))}.kCWYAa_editor{border:1px solid var(--dsw-alias-border-l1,var(--dsw-alias-border-l2,var(--dsw-alias-label-primary-dimmed)));background:var(--dsw-alias-bg-base,var(--dsw-alias-bg-layer-1));border-radius:8px;flex-direction:column;gap:8px;width:100%;padding:12px;display:flex}.kCWYAa_editorInput{border:1px solid var(--dsw-alias-border-l2,var(--dsw-alias-border-l1,var(--dsw-alias-label-primary-dimmed)));resize:none;width:100%;max-height:240px;color:var(--dsw-alias-label-primary,var(--dsw-alias-label-secondary));font:inherit;background:0 0;border-radius:6px;outline:none;padding:8px;overflow-y:auto}.kCWYAa_editorActions{justify-content:flex-end;align-items:center;gap:8px;display:flex}.kCWYAa_editorTrailing{align-items:center;margin-right:auto;display:flex}.kCWYAa_actionError{color:var(--dsw-alias-state-error-primary,var(--dsw-alias-label-secondary));align-self:flex-end;padding:2px 4px;font-size:13px;line-height:20px}.kCWYAa_editedLabel{color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-primary-dimmed));align-self:flex-end;font-size:12px;line-height:18px}";
 		const tagId$2 = "@khorsheed/dsh-client-message-tools/UserMessageView.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$2) + "]") === null) {
@@ -5167,18 +5259,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			document.head.appendChild(tag);
 		}
 		var UserMessageView_module_css_default = {
-			"actions": "kCWYAa_actions",
+			"userRow": "kCWYAa_userRow",
 			"bubble": "kCWYAa_bubble",
+			"action": "kCWYAa_action",
+			"editedLabel": "kCWYAa_editedLabel",
 			"refChip": "kCWYAa_refChip",
 			"editorActions": "kCWYAa_editorActions",
-			"editorTrailing": "kCWYAa_editorTrailing",
-			"editedLabel": "kCWYAa_editedLabel",
-			"userStack": "kCWYAa_userStack",
-			"userRow": "kCWYAa_userRow",
-			"action": "kCWYAa_action",
 			"editorInput": "kCWYAa_editorInput",
-			"actionError": "kCWYAa_actionError",
-			"editor": "kCWYAa_editor"
+			"editor": "kCWYAa_editor",
+			"userStack": "kCWYAa_userStack",
+			"actions": "kCWYAa_actions",
+			"editorTrailing": "kCWYAa_editorTrailing",
+			"actionError": "kCWYAa_actionError"
 		};
 		//#endregion
 		//#region src/client/UserMessageView.tsx
@@ -5194,8 +5286,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* marks the spot.
 		*/
 		/** Selector identity kept module-level so uSES memoization holds. */
-		function selectHiddenRanges(snapshot) {
-			return foldHiddenRanges(snapshot.chat.nodes.values());
+		function selectHiddenRanges(chat) {
+			return foldHiddenRanges(chat.nodes.values());
 		}
 		/** Split user content into joined text, images, and leftover blocks. */
 		function contentParts(content) {
@@ -5340,8 +5432,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			});
 		}
 		/** The shadowed user-message view: bubble plus copy/edit/withdraw actions. */
-		const UserMessageView = (0, react.memo)(function UserMessageView({ node, renderMessageImages, t, useSession, editMessage, withdrawMessage, backfillDraft, useModelDirectory, modelsAvailable, loadModels, selectModel }) {
-			const ranges = useSession(selectHiddenRanges, _deepseek_ai_dsh_client_runtime_client.shallowEqual);
+		const UserMessageView = (0, react.memo)(function UserMessageView({ node, renderMessageImages, t, editMessage, withdrawMessage, backfillDraft, useModelDirectory, modelsAvailable, loadModels, selectModel, ...standard }) {
+			const ranges = chatHookOf(standard)(selectHiddenRanges, shallowEqual);
 			const [editing, setEditing] = (0, react.useState)(false);
 			const [confirming, setConfirming] = (0, react.useState)(false);
 			const [acknowledged, setAcknowledged] = (0, react.useState)(false);
@@ -5480,6 +5572,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						description: t("withdraw.description"),
 						acknowledgeLabel: t("withdraw.acknowledge"),
 						cancelLabel: t("cancel"),
+						closeLabel: t("close"),
 						confirmLabel: t("withdraw.confirm"),
 						acknowledged,
 						disabled: busy,
@@ -5494,7 +5587,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			});
 		});
 		//#endregion
-		//#region \0dsh-css:/Users/zhuyudan/code/dsh-plugins/packages/message-tools/src/client/RestoredMessageView.module.css.mjs
+		//#region \0dsh-css:src/client/RestoredMessageView.module.css.mjs
 		const css$1 = ".hDMXAG_restoredLabel{color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-primary-dimmed));align-items:center;gap:4px;font-size:12px;line-height:18px;display:inline-flex}.hDMXAG_restoredAssistantRow{color:var(--dsw-alias-label-primary,var(--dsw-alias-label-secondary));flex-direction:column;align-items:flex-start;gap:4px;display:flex}";
 		const tagId$1 = "@khorsheed/dsh-client-message-tools/RestoredMessageView.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) {
@@ -5505,24 +5598,48 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			document.head.appendChild(tag);
 		}
 		var RestoredMessageView_module_css_default = {
-			"restoredAssistantRow": "hDMXAG_restoredAssistantRow",
-			"restoredLabel": "hDMXAG_restoredLabel"
+			"restoredLabel": "hDMXAG_restoredLabel",
+			"restoredAssistantRow": "hDMXAG_restoredAssistantRow"
 		};
 		//#endregion
 		//#region src/client/RestoredMessageView.tsx
+		/**
+		* Restored-assistant line ('message-tools-restored-assistant' keyed
+		* renderer): one withdrawn assistant reply's text replayed at the
+		* conversation tail by a restore. The body renders through the official
+		* `MarkdownText` (the same public renderer behind ui-conversation's
+		* AssistantMarkdown), so typography, code blocks, and lists match a native
+		* assistant reply; the「已恢复 · 助手回复」caption stays as a small tertiary
+		* marker. The model-facing frame text is not displayed (stripped in the
+		* Definition). No action row: the group's user bubbles already carry copy.
+		*/
+		/** Localized Markdown chrome (code-fence copy buttons, footnotes) over the message-tools namespace. */
+		function markdownLabels(t) {
+			return {
+				code: {
+					copyLabel: t("markdown.copy"),
+					copiedLabel: t("markdown.copied")
+				},
+				footnotes: t("markdown.footnotes")
+			};
+		}
 		/** The restored assistant line: caption plus the reply body in official markdown chrome. */
 		function RestoredMessageView({ node, t }) {
 			const data = node.data;
+			const labels = (0, react.useMemo)(() => markdownLabels(t), [t]);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: RestoredMessageView_module_css_default.restoredAssistantRow,
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: RestoredMessageView_module_css_default.restoredLabel,
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconUndoOutline16, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("restored.assistant") })]
-				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.MarkdownText, { text: data.text })]
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.MarkdownText, {
+					text: data.text,
+					labels
+				})]
 			});
 		}
 		//#endregion
-		//#region \0dsh-css:/Users/zhuyudan/code/dsh-plugins/packages/message-tools/src/client/WithdrawnDividerView.module.css.mjs
+		//#region \0dsh-css:src/client/WithdrawnDividerView.module.css.mjs
 		const css = ".JtQ9hG_row{padding:2px 0}.JtQ9hG_marker{width:100%;min-width:0;height:24px;color:inherit;font:inherit;text-align:left;cursor:pointer;background:0 0;border:none;border-radius:6px;align-items:center;padding:0;display:flex}.JtQ9hG_marker:hover{background:var(--dsw-alias-interactive-bg-hover,var(--dsw-alias-bg-layer-1))}.JtQ9hG_leading{width:16px;height:16px;color:var(--dsw-alias-label-secondary,var(--dsw-alias-label-primary));flex:none;justify-content:center;align-items:center;margin-right:6px;display:inline-flex}.JtQ9hG_title{color:var(--dsw-alias-label-primary-dimmed,var(--dsw-alias-label-tertiary));flex:none;font-size:14px;line-height:24px}.JtQ9hG_badge{color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-primary-dimmed));flex:none;align-items:center;gap:4px;margin-left:10px;font-size:12px;line-height:18px;display:inline-flex}.JtQ9hG_body{padding:4px 0 4px 22px}.JtQ9hG_empty{color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-primary-dimmed));font-size:13px;line-height:20px}.JtQ9hG_entryUser,.JtQ9hG_entryAssistant{color:var(--dsw-alias-label-secondary,var(--dsw-alias-label-primary));padding:4px 0;font-size:14px;line-height:22px}.JtQ9hG_entryKind{color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-primary-dimmed));margin-bottom:2px;font-size:12px;line-height:18px}.JtQ9hG_entryUser{border-left:2px solid var(--dsw-alias-border-l2,var(--dsw-alias-label-primary-dimmed));padding-left:8px}.JtQ9hG_entryAssistant{border-left:2px solid var(--dsw-alias-border-l1,var(--dsw-alias-border-l2,var(--dsw-alias-label-primary-dimmed)));padding-left:8px}.JtQ9hG_restoreRow{align-items:center;gap:8px;padding-top:8px;display:flex}.JtQ9hG_restoreFailed{color:var(--dsw-alias-state-error-primary,var(--dsw-alias-label-secondary));font-size:12px}";
 		const tagId = "@khorsheed/dsh-client-message-tools/WithdrawnDividerView.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
@@ -5533,18 +5650,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			document.head.appendChild(tag);
 		}
 		var WithdrawnDividerView_module_css_default = {
-			"entryKind": "JtQ9hG_entryKind",
+			"row": "JtQ9hG_row",
+			"marker": "JtQ9hG_marker",
+			"restoreRow": "JtQ9hG_restoreRow",
+			"badge": "JtQ9hG_badge",
+			"restoreFailed": "JtQ9hG_restoreFailed",
 			"leading": "JtQ9hG_leading",
 			"title": "JtQ9hG_title",
-			"entryUser": "JtQ9hG_entryUser",
 			"body": "JtQ9hG_body",
 			"entryAssistant": "JtQ9hG_entryAssistant",
-			"badge": "JtQ9hG_badge",
-			"marker": "JtQ9hG_marker",
-			"restoreRow": "JtQ9hG_restoreRow",
-			"restoreFailed": "JtQ9hG_restoreFailed",
 			"empty": "JtQ9hG_empty",
-			"row": "JtQ9hG_row"
+			"entryUser": "JtQ9hG_entryUser",
+			"entryKind": "JtQ9hG_entryKind"
 		};
 		//#endregion
 		//#region src/client/WithdrawnDividerView.tsx
@@ -5561,20 +5678,21 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		* once withdrawals backfill the draft automatically.
 		*/
 		/** The withdrawal divider: collapsed marker row plus the expandable replay. */
-		function WithdrawnDividerView({ node, t, useSession, restoreMessage }) {
+		function WithdrawnDividerView({ node, t, restoreMessage, ...standard }) {
 			const data = node.data;
 			const [expanded, setExpanded] = (0, react.useState)(false);
 			const [entries, setEntries] = (0, react.useState)(null);
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [failed, setFailed] = (0, react.useState)(false);
-			const nodesStore = useSession((snapshot) => snapshot.chat.nodes);
-			const count = useSession((snapshot) => countHiddenInSpan(snapshot.chat.nodes.values(), data.hiddenStartSeq, data.seq));
-			const restored = useSession((snapshot) => {
-				const nodes = snapshot.chat.nodes.values();
+			const useChatSlice = chatHookOf(standard);
+			const nodesStore = useChatSlice((chat) => chat.nodes);
+			const count = useChatSlice((chat) => countHiddenInSpan(chat.nodes.values(), data.hiddenStartSeq, data.seq));
+			const restored = useChatSlice((chat) => {
+				const nodes = chat.nodes.values();
 				return hasRestoreForSpan(nodes, data.hiddenStartSeq, foldHiddenRanges(nodes));
 			});
-			const superseded = useSession((snapshot) => {
-				const nodes = snapshot.chat.nodes.values();
+			const superseded = useChatSlice((chat) => {
+				const nodes = chat.nodes.values();
 				return isRestoreSuperseded(nodes, data.hiddenStartSeq, foldHiddenRanges(nodes));
 			});
 			const toggle = () => {
@@ -5663,23 +5781,42 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		});
 		/**
 		* Required services: slots, sessions, the remote channel, the scope-addressed
-		* conversation service, conversation node registration, and the copy.
+		* conversation service, and the copy.
 		* `remote.messageTools` is deliberately NOT an inject: this plugin both
 		* mounts the namespace (through `$mount` below) and consumes it, and the
 		* Cordis property proxy only resolves services declared in `inject` or
 		* provided by an ancestor fiber. Declaring it would deadlock the loader; the
 		* namespace is read back from the global store with `ctx.get` after the
-		* awaited mount.
+		* awaited mount. The event-Definition registry (`uiConversation.events`) is
+		* likewise NOT a static inject: the deferred ctx.inject arm keeps the
+		* registration independent of ui-conversation's own mount order.
 		*/
 		const inject = [
 			"slots",
 			"sessions",
 			"remote",
 			"conversation",
-			"conversationEvents",
 			"locale"
 		];
 		/**
+		* Register the four message-tools event Definitions against ui-conversation's
+		* event registry (host 0.1.2 folded the standalone registry service into
+		* `uiConversation.events`, upstream commit be531688f3). The registry is live
+		* (a registration re-assembles mounted views), so the deferred arm needs no
+		* ordering against ui-conversation's own apply; a composition without the
+		* service never fires it and simply has no chat projection at all.
+		* @param ctx - client root context.
+		*/
+		function registerEventDefinitions(ctx) {
+			ctx.inject(["uiConversation"], (lctx) => {
+				const registry = lctx.uiConversation.events;
+				registry.register(withdrawnDividerDefinition);
+				registry.register(restoredMessageDefinition);
+				registry.register(restoredAssistantMessageDefinition);
+				registry.register(editedMessageDefinition);
+			});
+		}
+		/**
 		* Client plugin body: mount the Remote, register the dictionaries, the
 		* withdrawal divider Definition, and the two `conversation.chat.node` entries
 		* (the divider row and the shadowed user renderer).
@@ -5721,10 +5858,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				en
 			}), "message-tools: dictionaries");
 			const t = ctx.locale.bind(NS);
-			ctx.conversationEvents.register(withdrawnDividerDefinition);
-			ctx.conversationEvents.register(restoredMessageDefinition);
-			ctx.conversationEvents.register(restoredAssistantMessageDefinition);
-			ctx.conversationEvents.register(editedMessageDefinition);
+			registerEventDefinitions(ctx);
 			ctx.effect(() => installDomHider(ctx), "message-tools: dom hider");
 			ctx.slots.inject("conversation.chat.node", () => ctx.slots.register({
 				name: "conversation.chat.node",
@@ -5761,7 +5895,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					if (!carried.ok) throw new Error(`messageTools.edit transport: ${carried.error.code}`);
 					if (!carried.value.ok) throw new Error(`messageTools.edit rejected: ${carried.value.error.code}`);
 				};
-				const waitIdle = () => waitForTurnSettled(() => ctx.sessions.binding(sessionId)?.session.getSnapshot());
+				const settleSnapshot = () => {
+					const session = ctx.sessions.binding(sessionId)?.session.getSnapshot();
+					if (session === void 0) return void 0;
+					const chat = chatSourceOf(ctx, sessionId)?.getSnapshot();
+					if (chat === void 0) return void 0;
+					return {
+						running: session.running,
+						runningCalls: chat.legacy.runningCalls,
+						chat
+					};
+				};
+				const waitIdle = () => waitForTurnSettled(settleSnapshot);
 				return {
 					editMessage: (targetSeq, text) => editInPlace({
 						cancel: () => conversation.cancel(),