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

package/lib/index.js

@@ -1,3 +1,4 @@
+import { SessionSeq } from "@deepseek-ai/dsh-session";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import { isAppendSurfaceEvent, isReplacementSurfaceEvent } from "@deepseek-ai/dsh-session/surface";
@@ -225,20 +226,20 @@ function joinAssistantMessageText(blocks) {
 * (the message left the surface through another producer, e.g. compaction).
 *
 * `sourceEventSeqs` is authoritative for the shadowed *surface* nodes, but an
-* interrupted assistant step may exist only as `assistant/chunk` events (no
-* `assistant/message` ever landed). Those chunks are not surface nodes, so
-* they are absent from `sourceEventSeqs`. The replacement's own `start` and
-* `seq` delimit the whole withdrawn log interval — `[start, seq)` — and are
+* interrupted assistant step may exist only as `assistant/attempt` events (no
+* `assistant/message` ever landed). Attempts are not surface nodes, so
+* they are absent from `sourceEventSeqs`. The replacement's own `startSeq` and
+* `seq` delimit the whole withdrawn log interval — `[startSeq, seq)` — and are
 * still read from the replacement itself, never guessed from another producer.
 */
 function findWithdrawnSpan(events, targetSeq) {
 	for (let index = events.length - 1; index > targetSeq; index--) {
 		const event = events[index];
-		if (event !== void 0 && isMessageToolsReplacement(event) && event.sourceEventSeqs?.includes(targetSeq)) {
-			const span = [];
-			for (let seq = event.surfaceOp.start; seq < event.seq; seq++) span.push(seq);
-			return span;
-		}
+		if (event === void 0 || !isMessageToolsReplacement(event)) continue;
+		if (event.sourceEventSeqs?.includes(targetSeq) !== true) continue;
+		const span = [];
+		for (let seq = event.surfaceOp.startSeq; seq < event.seq; seq++) span.push(seq);
+		return span;
 	}
 }
 /**
@@ -248,50 +249,23 @@ function findWithdrawnSpan(events, targetSeq) {
 * restore-assistant replays already carry the frame). Skipped: withdrawal
 * placeholders, edit triggers, other plugin context, and tool calls/results.
 *
-* Assistant text normally comes from `assistant/message` surface events. A
-* turn that was interrupted before finalization may never emit
-* `assistant/message`; its visible content survives only as `assistant/chunk`
-* rows. Those chunks are folded into one assistant replay per step when no
-* final `assistant/message` exists for that step, so withdrawing/restoring an
-* interrupted reply does not lose the partial assistant content.
+* Assistant text normally comes from `assistant/message` surface events (a
+* cancelled turn finalizes its delivered prefix there with `interrupted:
+* true`). An attempt that committed no surface message — failed, retried, or
+* stream-error — settles as an `assistant/attempt` log event carrying its
+* exact compact stream. Each such attempt folds into one assistant replay
+* when no final `assistant/message` exists for that step, so
+* withdrawing/restoring an interrupted reply does not lose the partial
+* assistant content. A retried step's earlier attempts are superseded by the
+* step's final message and do not replay.
 */
 function replayEntries(events, spanSeqs) {
 	const entries = [];
-	let pending;
 	const finalizedSteps = /* @__PURE__ */ new Set();
-	const flushPending = () => {
-		if (pending === void 0) return;
-		if (!pending.finalized) {
-			const text = [...pending.text.values()].join("");
-			const reasoning = [...pending.reasoning.values()].join("");
-			const replay = text !== "" ? text : reasoning;
-			if (replay !== "") entries.push({
-				role: "assistant",
-				text: `${RESTORED_ASSISTANT_NOTICE}\n${replay}`,
-				sourceSeq: pending.sourceSeq
-			});
-		}
-		pending = void 0;
-	};
-	const pushChunk = (event) => {
-		if (finalizedSteps.has(`${event.data.turn}:${event.data.step}`)) return;
-		if (pending === void 0 || pending.turn !== event.data.turn || pending.step !== event.data.step) {
-			flushPending();
-			pending = {
-				turn: event.data.turn,
-				step: event.data.step,
-				sourceSeq: event.seq,
-				text: /* @__PURE__ */ new Map(),
-				reasoning: /* @__PURE__ */ new Map(),
-				finalized: false
-			};
-		}
-		const chunk = event.data.chunk;
-		if (chunk.type === "text-delta") pending.text.set(chunk.index, (pending.text.get(chunk.index) ?? "") + chunk.text);
-		else if (chunk.type === "block-end" && chunk.block.type === "text") pending.text.set(chunk.index, chunk.block.text);
-		else if (chunk.type === "reasoning-delta") pending.reasoning.set(chunk.index, (pending.reasoning.get(chunk.index) ?? "") + chunk.text);
-		else if (chunk.type === "block-end" && chunk.block.type === "reasoning") pending.reasoning.set(chunk.index, chunk.block.text);
-	};
+	for (const seq of spanSeqs) {
+		const event = events[seq];
+		if (event?.type === "assistant/message") finalizedSteps.add(`${event.data.turn}:${event.data.step}`);
+	}
 	const pushAssistantText = (text, sourceSeq) => {
 		if (text !== "") entries.push({
 			role: "assistant",
@@ -303,7 +277,6 @@ function replayEntries(events, spanSeqs) {
 		const event = events[seq];
 		if (event === void 0) continue;
 		if (isMessageToolsEdit(event)) {
-			flushPending();
 			entries.push({
 				role: "user",
 				content: event.data.content,
@@ -311,12 +284,12 @@ function replayEntries(events, spanSeqs) {
 			});
 			continue;
 		}
-		if (event.type === "assistant/chunk") {
-			pushChunk(event);
+		if (event.type === "assistant/attempt") {
+			if (finalizedSteps.has(`${event.data.turn}:${event.data.step}`)) continue;
+			pushAssistantText(joinAttemptStreamText(event.data.stream), seq);
 			continue;
 		}
 		if (event.type === "user/message") {
-			flushPending();
 			if (event.surfaceOp !== "append") continue;
 			if (event.data.source.kind === "user" || isMessageToolsRestore(event)) entries.push({
 				role: "user",
@@ -331,17 +304,40 @@ function replayEntries(events, spanSeqs) {
 			continue;
 		}
 		if (event.type === "assistant/message") {
-			finalizedSteps.add(`${event.data.turn}:${event.data.step}`);
-			if (pending !== void 0 && pending.turn === event.data.turn && pending.step === event.data.step) pending.finalized = true;
-			flushPending();
 			pushAssistantText(joinAssistantMessageText(event.data.message.content), seq);
 			continue;
 		}
 	}
-	flushPending();
 	return entries;
 }
 /**
+* Join one attempt's compact stream into its visible text. Text deltas win;
+* reasoning is the fallback so an attempt that streamed only reasoning does
+* not lose the only assistant content the user saw (the same preference
+* {@link joinAssistantMessageText} applies to finalized messages). Packed
+* delta runs append per block index; a raw `block-end` record carries the
+* assembled block and replaces its index's accumulated deltas. Tool-call
+* runs never replay (their side effects are not replayable).
+*/
+function joinAttemptStreamText(stream) {
+	const text = /* @__PURE__ */ new Map();
+	const reasoning = /* @__PURE__ */ new Map();
+	const append = (map, index, fragment) => {
+		map.set(index, (map.get(index) ?? "") + fragment);
+	};
+	for (const record of stream) if (record.type === "text-chunks") append(text, record.index, record.texts.join(""));
+	else if (record.type === "reasoning-chunks") append(reasoning, record.index, record.texts.join(""));
+	else if (record.type === "chunk") {
+		const chunk = record.chunk;
+		if (chunk.type === "text-delta") append(text, chunk.index, chunk.text);
+		else if (chunk.type === "reasoning-delta") append(reasoning, chunk.index, chunk.text);
+		else if (chunk.type === "block-end" && chunk.block.type === "text") text.set(chunk.index, chunk.block.text);
+		else if (chunk.type === "block-end" && chunk.block.type === "reasoning") reasoning.set(chunk.index, chunk.block.text);
+	}
+	const joined = [...text.values()].join("");
+	return joined !== "" ? joined : [...reasoning.values()].join("");
+}
+/**
 * Plan a restore: the target must be an editable user message (the same
 * vocabulary as withdrawal — original, restore replay, or edit replacement)
 * that is no longer on the live surface (i.e. withdrawn). Restoring an edit
@@ -502,7 +498,7 @@ let MessageToolsService = (() => {
 				ok: false,
 				error: { code: "session-not-found" }
 			};
-			const planned = planWithdrawal(session.events, session.surface.nodes, request.targetSeq);
+			const planned = planWithdrawal(session.snapshotEvents(), session.surface.nodes, request.targetSeq);
 			if (!planned.ok) return {
 				ok: false,
 				error: { code: planned.code }
@@ -519,10 +515,10 @@ let MessageToolsService = (() => {
 			}), {
 				surfaceOp: {
 					op: "replace",
-					start: planned.plan.start,
-					end: planned.plan.end
+					startSeq: SessionSeq(planned.plan.start),
+					endSeq: SessionSeq(planned.plan.end)
 				},
-				sourceEventSeqs: [...planned.plan.sourceEventSeqs]
+				sourceEventSeqs: planned.plan.sourceEventSeqs.map((seq) => SessionSeq(seq))
 			});
 			await this.ctx.sessions.flush(session);
 			return {
@@ -553,7 +549,7 @@ let MessageToolsService = (() => {
 				ok: false,
 				error: { code: "session-not-found" }
 			};
-			const planned = planRestore(session.events, session.surface.nodes, request.targetSeq);
+			const planned = planRestore(session.snapshotEvents(), session.surface.nodes, request.targetSeq);
 			if (!planned.ok) return {
 				ok: false,
 				error: { code: planned.code }
@@ -575,7 +571,7 @@ let MessageToolsService = (() => {
 				});
 				appendedSeqs.push(session.append("user/message", message, {
 					surfaceOp: "append",
-					sourceEventSeqs: [entry.sourceSeq]
+					sourceEventSeqs: [SessionSeq(entry.sourceSeq)]
 				}).seq);
 			}
 			await this.ctx.sessions.flush(session);
@@ -602,7 +598,7 @@ let MessageToolsService = (() => {
 				ok: false,
 				error: { code: "session-not-found" }
 			};
-			const planned = planEdit(session.events, session.surface.nodes, request.targetSeq, request.text);
+			const planned = planEdit(session.snapshotEvents(), session.surface.nodes, request.targetSeq, request.text);
 			if (!planned.ok) return {
 				ok: false,
 				error: { code: planned.code }
@@ -616,10 +612,10 @@ let MessageToolsService = (() => {
 			}), {
 				surfaceOp: {
 					op: "replace",
-					start: planned.plan.start,
-					end: planned.plan.end
+					startSeq: SessionSeq(planned.plan.start),
+					endSeq: SessionSeq(planned.plan.end)
 				},
-				sourceEventSeqs: [...planned.plan.sourceEventSeqs]
+				sourceEventSeqs: planned.plan.sourceEventSeqs.map((seq) => SessionSeq(seq))
 			});
 			await this.ctx.sessions.flush(session);
 			const agent = this.ctx.agents.get(request.sessionId);

package/lib/typert.host.js

@@ -99,7 +99,7 @@ export const TYPERT = {
         typeSymbol: '@khorsheed/dsh-client-message-tools/types#MessageToolsEditResult',
         schema: _khorsheed_dsh_client_message_tools_messageTools_edit_result$schema,
       },
-      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":133,"column":9},
+      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":135,"column":9},
     },
     {
       id: '@khorsheed/dsh-client-message-tools#messageTools/restore',
@@ -124,7 +124,7 @@ export const TYPERT = {
         typeSymbol: '@khorsheed/dsh-client-message-tools/types#MessageToolsRestoreResult',
         schema: _khorsheed_dsh_client_message_tools_messageTools_restore_result$schema,
       },
-      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":95,"column":9},
+      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":97,"column":9},
     },
     {
       id: '@khorsheed/dsh-client-message-tools#messageTools/withdraw',
@@ -149,7 +149,7 @@ export const TYPERT = {
         typeSymbol: '@khorsheed/dsh-client-message-tools/types#MessageToolsWithdrawResult',
         schema: _khorsheed_dsh_client_message_tools_messageTools_withdraw_result$schema,
       },
-      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":61,"column":9},
+      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":63,"column":9},
     },
   ],
   model: {

package/lib/typert.remote-client.js

@@ -96,7 +96,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: '@khorsheed/dsh-client-message-tools/types#MessageToolsEditResult',
         schema: _khorsheed_dsh_client_message_tools_messageTools_edit_result$schema,
       },
-      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":133,"column":9},
+      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":135,"column":9},
     },
     {
       id: '@khorsheed/dsh-client-message-tools#messageTools/restore',
@@ -121,7 +121,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: '@khorsheed/dsh-client-message-tools/types#MessageToolsRestoreResult',
         schema: _khorsheed_dsh_client_message_tools_messageTools_restore_result$schema,
       },
-      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":95,"column":9},
+      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":97,"column":9},
     },
     {
       id: '@khorsheed/dsh-client-message-tools#messageTools/withdraw',
@@ -146,7 +146,7 @@ export const TYPERT_REMOTE = {
         typeSymbol: '@khorsheed/dsh-client-message-tools/types#MessageToolsWithdrawResult',
         schema: _khorsheed_dsh_client_message_tools_messageTools_withdraw_result$schema,
       },
-      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":61,"column":9},
+      sourceLocation: {"file":"packages/message-tools/src/index.ts","line":63,"column":9},
     },
   ],
 }

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

@@ -8,7 +8,7 @@
  * marker. The model-facing frame text is not displayed (stripped in the
  * Definition). No action row: the group's user bubbles already carry copy.
  */
-import type { ReactNode } from 'react';
+import { type ReactNode } from 'react';
 import type { PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
 /** Full props of the restored-assistant renderer. */
 export type RestoredMessageViewProps = PropsRuntime<'conversation.chat.node', 'message-tools-restored-assistant'> & PropsLocale<'message-tools'>;

package/lib/types/client/RestoredMessageView.js

@@ -1,9 +1,28 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * 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.
+ */
+import { useMemo } from 'react';
 import { MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives';
 import { IconUndoOutline16 } from './icons.js';
 import css from './RestoredMessageView.module.css';
+/** 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. */
 export function RestoredMessageView({ node, t }) {
     const data = node.data;
-    return (_jsxs("div", { className: css.restoredAssistantRow, children: [_jsxs("div", { className: css.restoredLabel, children: [_jsx(IconUndoOutline16, {}), _jsx("span", { children: t('restored.assistant') })] }), _jsx(MarkdownText, { text: data.text })] }));
+    const labels = useMemo(() => markdownLabels(t), [t]);
+    return (_jsxs("div", { className: css.restoredAssistantRow, children: [_jsxs("div", { className: css.restoredLabel, children: [_jsx(IconUndoOutline16, {}), _jsx("span", { children: t('restored.assistant') })] }), _jsx(MarkdownText, { text: data.text, labels: labels })] }));
 }

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

@@ -12,5 +12,5 @@
 import { type ReactNode } from 'react';
 import type { UserMessageViewProps } from './slots.ts';
 /** The shadowed user-message view: bubble plus copy/edit/withdraw actions. */
-export declare const UserMessageView: import("react").MemoExoticComponent<({ node, renderMessageImages, t, useSession, editMessage, withdrawMessage, backfillDraft, useModelDirectory, modelsAvailable, loadModels, selectModel, }: UserMessageViewProps) => ReactNode>;
+export declare const UserMessageView: import("react").MemoExoticComponent<({ node, renderMessageImages, t, editMessage, withdrawMessage, backfillDraft, useModelDirectory, modelsAvailable, loadModels, selectModel, ...standard }: UserMessageViewProps) => ReactNode>;
 //# sourceMappingURL=UserMessageView.d.ts.map

package/lib/types/client/UserMessageView.js

@@ -11,16 +11,17 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
  * marks the spot.
  */
 import { memo, useEffect, useRef, useState } from 'react';
-import { shallowEqual } from '@deepseek-ai/dsh-client-runtime/client';
-import { Button, IconCheckOutline16, IconCopyOutline16, IconEditOutline16, JsonBlock, MessageText, RiskConfirmation, Tooltip, writeClipboard, } from '@deepseek-ai/dsh-client-ui-primitives';
+import { shallowEqual } from '@deepseek-ai/dsh-client-store';
+import { Button, IconCheckOutline16, IconCopyOutline16, IconEditOutline16, JsonBlock, RiskConfirmation, Tooltip, writeClipboard, } from '@deepseek-ai/dsh-client-ui-primitives';
 import { IconUndoOutline16 } from './icons.js';
 import { foldHiddenRanges, isSeqHidden } from './withdrawn-node.js';
+import { chatHookOf } from './chat-hook.js';
 import { withdrawAndBackfill } from './withdraw-backfill.js';
 import { ModelChip } from './ModelChip.js';
 import css from './UserMessageView.module.css';
 /** 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) {
@@ -50,15 +51,18 @@ function projectUserText(text) {
         const tokenStart = m.index + (m[1]?.length ?? 0);
         /* v8 ignore next -- the token group always participates in a match, so m[2] is never undefined. */
         const label = m[2] ?? '';
+        // Plain runs render through the local text-run block (the official
+        // `MessageText` primitive was retired in host 0.1.5; `.textRun` keeps its
+        // exact metrics).
         if (tokenStart > cursor)
-            parts.push(_jsx(MessageText, { text: text.slice(cursor, tokenStart) }, cursor));
+            parts.push(_jsx("div", { className: css.textRun, children: text.slice(cursor, tokenStart) }, cursor));
         parts.push(_jsx("span", { className: css.refChip, "data-ref-chip": label.startsWith('@') ? 'subagent' : 'skill', children: label }, tokenStart));
         cursor = tokenStart + label.length;
     }
     if (parts.length === 0)
-        return _jsx(MessageText, { text: text });
+        return _jsx("div", { className: css.textRun, children: text });
     if (cursor < text.length)
-        parts.push(_jsx(MessageText, { text: text.slice(cursor) }, cursor));
+        parts.push(_jsx("div", { className: css.textRun, children: text.slice(cursor) }, cursor));
     return _jsx(_Fragment, { children: parts });
 }
 /** Copy action: the copy icon swaps to a short-lived check after a successful write. */
@@ -129,8 +133,10 @@ function InlineEditor({ initial, busy, t, onSave, onCancel, models }) {
                 } }), _jsxs("div", { className: css.editorActions, children: [_jsx("div", { className: css.editorTrailing, children: models !== undefined && _jsx(ModelChip, { ...models }) }), _jsx(Button, { variant: "outline", disabled: busy, onClick: onCancel, children: t('cancel') }), _jsx(Button, { variant: "primary", disabled: busy || draft.trim() === '', onClick: save, children: t('editor.save') })] })] }));
 }
 /** The shadowed user-message view: bubble plus copy/edit/withdraw actions. */
-export const UserMessageView = memo(function UserMessageView({ node, renderMessageImages, t, useSession, editMessage, withdrawMessage, backfillDraft, useModelDirectory, modelsAvailable, loadModels, selectModel, }) {
-    const ranges = useSession(selectHiddenRanges, shallowEqual);
+export const UserMessageView = memo(function UserMessageView({ node, renderMessageImages, t, editMessage, withdrawMessage, backfillDraft, useModelDirectory, modelsAvailable, loadModels, selectModel, ...standard }) {
+    // Chat data lives in the `useChat` session standard prop on host 0.1.2
+    // (the helper degrades to the frozen empty snapshot without it).
+    const ranges = chatHookOf(standard)(selectHiddenRanges, shallowEqual);
     const [editing, setEditing] = useState(false);
     const [confirming, setConfirming] = useState(false);
     const [acknowledged, setAcknowledged] = useState(false);
@@ -168,5 +174,5 @@ export const UserMessageView = memo(function UserMessageView({ node, renderMessa
                             ? { useModelDirectory, loadModels, selectModel, t }
                             : undefined }), failed === 'edit' && _jsx("div", { className: css.actionError, role: "status", children: t('error.edit') })] }) }));
     }
-    return (_jsxs("div", { className: css.userRow, "data-time-hover-root": true, children: [_jsxs("div", { className: css.userStack, children: [node.kind === 'message-tools-edited' && (_jsx("div", { className: css.editedLabel, children: t('edited.badge') })), node.kind === 'message-tools-restored' && (_jsx("div", { className: css.editedLabel, children: t('withdrawn.restored') })), images.length > 0 ? renderMessageImages({ images, align: 'end' }) : null, showBubble && (_jsxs("div", { className: css.bubble, children: [projectUserText(text), rest.map((block, index) => (_jsx(JsonBlock, { label: t('message.extraBlock'), payload: block, truncatedLabel: truncated }, index)))] }))] }), _jsxs("div", { className: css.actions, children: [_jsx(CopyButton, { text: text, t: t }), _jsx(Tooltip, { label: t('edit'), side: "bottom", children: _jsx("button", { type: "button", className: css.action, "aria-label": t('edit'), onClick: () => { setFailed(null); setEditing(true); }, children: _jsx(IconEditOutline16, {}) }) }), _jsx(Tooltip, { label: t('action.withdraw'), side: "bottom", children: _jsx("button", { type: "button", className: css.action, "aria-label": t('action.withdraw'), onClick: () => { setFailed(null); setAcknowledged(false); setConfirming(true); }, children: _jsx(IconUndoOutline16, {}) }) })] }), failed === 'withdraw' && _jsx("div", { className: css.actionError, role: "status", children: t('error.withdraw') }), confirming && (_jsx(RiskConfirmation, { open: true, title: t('withdraw.title'), description: t('withdraw.description'), acknowledgeLabel: t('withdraw.acknowledge'), cancelLabel: t('cancel'), confirmLabel: t('withdraw.confirm'), acknowledged: acknowledged, disabled: busy, onAcknowledgedChange: setAcknowledged, onCancel: () => { setConfirming(false); setAcknowledged(false); }, onConfirm: confirmWithdraw }))] }));
+    return (_jsxs("div", { className: css.userRow, "data-time-hover-root": true, children: [_jsxs("div", { className: css.userStack, children: [node.kind === 'message-tools-edited' && (_jsx("div", { className: css.editedLabel, children: t('edited.badge') })), node.kind === 'message-tools-restored' && (_jsx("div", { className: css.editedLabel, children: t('withdrawn.restored') })), images.length > 0 ? renderMessageImages({ images, align: 'end' }) : null, showBubble && (_jsxs("div", { className: css.bubble, children: [projectUserText(text), rest.map((block, index) => (_jsx(JsonBlock, { label: t('message.extraBlock'), payload: block, truncatedLabel: truncated }, index)))] }))] }), _jsxs("div", { className: css.actions, children: [_jsx(CopyButton, { text: text, t: t }), _jsx(Tooltip, { label: t('edit'), side: "bottom", children: _jsx("button", { type: "button", className: css.action, "aria-label": t('edit'), onClick: () => { setFailed(null); setEditing(true); }, children: _jsx(IconEditOutline16, {}) }) }), _jsx(Tooltip, { label: t('action.withdraw'), side: "bottom", children: _jsx("button", { type: "button", className: css.action, "aria-label": t('action.withdraw'), onClick: () => { setFailed(null); setAcknowledged(false); setConfirming(true); }, children: _jsx(IconUndoOutline16, {}) }) })] }), failed === 'withdraw' && _jsx("div", { className: css.actionError, role: "status", children: t('error.withdraw') }), confirming && (_jsx(RiskConfirmation, { open: true, title: t('withdraw.title'), description: t('withdraw.description'), acknowledgeLabel: t('withdraw.acknowledge'), cancelLabel: t('cancel'), closeLabel: t('close'), confirmLabel: t('withdraw.confirm'), acknowledged: acknowledged, disabled: busy, onAcknowledgedChange: setAcknowledged, onCancel: () => { setConfirming(false); setAcknowledged(false); }, onConfirm: confirmWithdraw }))] }));
 });

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

@@ -13,5 +13,5 @@
 import { type ReactNode } from 'react';
 import type { WithdrawnDividerViewProps } from './slots.ts';
 /** The withdrawal divider: collapsed marker row plus the expandable replay. */
-export declare function WithdrawnDividerView({ node, t, useSession, restoreMessage, }: WithdrawnDividerViewProps): ReactNode;
+export declare function WithdrawnDividerView({ node, t, restoreMessage, ...standard }: WithdrawnDividerViewProps): ReactNode;
 //# sourceMappingURL=WithdrawnDividerView.d.ts.map

package/lib/types/client/WithdrawnDividerView.js

@@ -12,32 +12,36 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * once withdrawals backfill the draft automatically.
  */
 import { useState } from 'react';
-import { Button, IconChevronDownOutline14, IconChevronRightOutline14, MessageText } from '@deepseek-ai/dsh-client-ui-primitives';
+import { Button, IconChevronDownOutline14, IconChevronRightOutline14 } from '@deepseek-ai/dsh-client-ui-primitives';
 import { IconUndoOutline16 } from './icons.js';
 import { collectWithdrawnEntries, countHiddenInSpan, foldHiddenRanges, hasRestoreForSpan, isRestoreSuperseded, } from './withdrawn-node.js';
+import { chatHookOf } from './chat-hook.js';
 import css from './WithdrawnDividerView.module.css';
 /** The withdrawal divider: collapsed marker row plus the expandable replay. */
-export function WithdrawnDividerView({ node, t, useSession, restoreMessage, }) {
+export function WithdrawnDividerView({ node, t, restoreMessage, ...standard }) {
     const data = node.data;
     const [expanded, setExpanded] = useState(false);
     const [entries, setEntries] = useState(null);
     const [busy, setBusy] = useState(false);
     const [failed, setFailed] = useState(false);
+    // Chat data lives in the `useChat` session standard prop on host 0.1.2
+    // (the helper degrades to the frozen empty snapshot without it).
+    const useChatSlice = chatHookOf(standard);
     // The node store is a stable live reader: the count/badge selectors read
     // through it, and the expand click folds the replay from the live snapshot
     // (event handlers may read live snapshots; render code subscribes).
-    const nodesStore = useSession(snapshot => snapshot.chat.nodes);
-    const count = useSession(snapshot => countHiddenInSpan(snapshot.chat.nodes.values(), data.hiddenStartSeq, data.seq));
+    const nodesStore = useChatSlice(chat => chat.nodes);
+    const count = useChatSlice(chat => countHiddenInSpan(chat.nodes.values(), data.hiddenStartSeq, data.seq));
     // The badge tracks a LIVE restore row: withdrawing the restored rows again
     // clears it. A superseded divider still shows its historical marker, but its
     // restore action is disabled because the later re-withdrawal divider is now
     // the active restore point for the same logical content.
-    const restored = useSession((snapshot) => {
-        const nodes = snapshot.chat.nodes.values();
+    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 = () => {
@@ -55,5 +59,5 @@ export function WithdrawnDividerView({ node, t, useSession, restoreMessage, }) {
             .catch(() => { setFailed(true); })
             .finally(() => { setBusy(false); });
     };
-    return (_jsxs("div", { className: css.row, children: [_jsxs("button", { type: "button", className: css.marker, "aria-expanded": expanded, "aria-label": t('withdrawn.expand'), onClick: toggle, children: [_jsx("span", { className: css.leading, "aria-hidden": true, children: expanded ? _jsx(IconChevronDownOutline14, {}) : _jsx(IconChevronRightOutline14, {}) }), _jsx("span", { className: css.title, children: t('withdrawn.divider', { count }) }), restored && (_jsxs("span", { className: css.badge, children: [_jsx(IconUndoOutline16, {}), t('withdrawn.restored')] }))] }), expanded && (_jsxs("div", { className: css.body, children: [entries === null || entries.length === 0 ? (_jsx("div", { className: css.empty, children: t('withdrawn.empty') })) : (entries.map((entry, index) => (_jsxs("div", { className: entry.kind === 'user' ? css.entryUser : css.entryAssistant, children: [_jsx("div", { className: css.entryKind, children: entry.kind === 'user' ? t('withdrawn.entryUser') : t('withdrawn.entryAssistant') }), _jsx(MessageText, { text: entry.text })] }, index)))), _jsxs("div", { className: css.restoreRow, children: [_jsx(Button, { variant: "outline", disabled: busy || restored || superseded, onClick: restore, children: t('withdrawn.restore') }), failed && _jsx("span", { className: css.restoreFailed, role: "status", children: t('withdrawn.restoreFailed') })] })] }))] }));
+    return (_jsxs("div", { className: css.row, children: [_jsxs("button", { type: "button", className: css.marker, "aria-expanded": expanded, "aria-label": t('withdrawn.expand'), onClick: toggle, children: [_jsx("span", { className: css.leading, "aria-hidden": true, children: expanded ? _jsx(IconChevronDownOutline14, {}) : _jsx(IconChevronRightOutline14, {}) }), _jsx("span", { className: css.title, children: t('withdrawn.divider', { count }) }), restored && (_jsxs("span", { className: css.badge, children: [_jsx(IconUndoOutline16, {}), t('withdrawn.restored')] }))] }), expanded && (_jsxs("div", { className: css.body, children: [entries === null || entries.length === 0 ? (_jsx("div", { className: css.empty, children: t('withdrawn.empty') })) : (entries.map((entry, index) => (_jsxs("div", { className: entry.kind === 'user' ? css.entryUser : css.entryAssistant, children: [_jsx("div", { className: css.entryKind, children: entry.kind === 'user' ? t('withdrawn.entryUser') : t('withdrawn.entryAssistant') }), _jsx("div", { className: css.textRun, children: entry.text })] }, index)))), _jsxs("div", { className: css.restoreRow, children: [_jsx(Button, { variant: "outline", disabled: busy || restored || superseded, onClick: restore, children: t('withdrawn.restore') }), failed && _jsx("span", { className: css.restoreFailed, role: "status", children: t('withdrawn.restoreFailed') })] })] }))] }));
 }

package/lib/types/client/chat-hook.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Chat snapshot access on host 0.1.2: the chat snapshot lives OUTSIDE the
+ * Session snapshot — components read it through the `useChat` session
+ * standard prop (ui-chat), the apply world through the conversation binding's
+ * chat target (`ctx.uiConversation.binding(sessionId).target('chat')`). The
+ * target snapshot is `undefined` until the first subscriber activates the
+ * chat view; callers treat that as "no chat yet", never as an error.
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type { SessionId } from '@deepseek-ai/dsh-session/types';
+import type { ChatSnapshot, UseChat } from '@deepseek-ai/dsh-client-ui-chat/client';
+import type { HostObservable, SnapshotSelectorHook } from '@deepseek-ai/dsh-client-ui-slots';
+/** The chat slice the plugin's selectors read. */
+export type ChatSlice = ChatSnapshot;
+/** Selector hook over the chat slice. */
+export type ChatSliceHook = SnapshotSelectorHook<ChatSlice>;
+/**
+ * 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.
+ */
+export declare function chatHookOf(props: {
+    useChat?: UseChat;
+}): ChatSliceHook;
+/**
+ * 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.
+ */
+export declare function chatSourceOf(ctx: Context, sessionId: SessionId): HostObservable<ChatSlice | undefined> | undefined;
+//# sourceMappingURL=chat-hook.d.ts.map

package/lib/types/client/chat-hook.js

@@ -0,0 +1,51 @@
+/**
+ * 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: () => undefined,
+        source: () => ({ getSnapshot: () => undefined, subscribe: () => () => { } }),
+        processSource: () => ({ getSnapshot: () => undefined, subscribe: () => () => { } }),
+        values: () => [],
+    },
+    locations: { getTurn: () => [], getStep: () => [] },
+    navigation: { items: () => [] },
+    timeline: { turnOrder: [], turns: new Map() },
+    legacy: { nodes: [], turnTimings: new Map(), turnEnds: 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.
+ */
+export function chatHookOf(props) {
+    const direct = props.useChat;
+    if (direct !== undefined)
+        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.
+ */
+export function chatSourceOf(ctx, sessionId) {
+    const uiConversation = ctx.get('uiConversation');
+    if (uiConversation === undefined)
+        return undefined;
+    try {
+        return uiConversation.binding(sessionId).target('chat');
+    }
+    catch {
+        return undefined; // unknown session — the caller's undefined branch
+    }
+}

package/lib/types/client/dom-hider.d.ts

@@ -18,7 +18,8 @@
  * session only: flow keys are session-scoped (seq-like ids collide across
  * sessions), and only one chat view is mounted at a time.
  */
-import type { ChatConversationViewNode, ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
+import type { Context } from '@deepseek-ai/cordis';
+import type { ChatConversationViewNode } from '@deepseek-ai/dsh-client-ui-chat/client';
 /**
  * Flow keys of every chat node inside a hidden span. The withdrawal divider
  * itself (`message-tools-withdrawn`, anchored at the span's exclusive end) is
@@ -57,5 +58,5 @@ export interface DomHiderOptions {
  * @param options - probe retry tuning.
  * @returns disposer removing the stylesheet and every subscription.
  */
-export declare function installDomHider(ctx: ClientContext, options?: DomHiderOptions): () => void;
+export declare function installDomHider(ctx: Context, options?: DomHiderOptions): () => void;
 //# sourceMappingURL=dom-hider.d.ts.map