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

package/lib/types/client/dom-hider.js

@@ -1,3 +1,4 @@
+import { chatSourceOf } from './chat-hook.js';
 import { MESSAGE_TOOLS_PLUGIN, messageToolsOp } from '../marker.js';
 import { foldHiddenRanges, isSeqHidden } from './withdrawn-node.js';
 /**
@@ -77,9 +78,9 @@ export function installDomHider(ctx, options = {}) {
     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)
@@ -141,17 +142,17 @@ export function installDomHider(ctx, options = {}) {
         else
             failProbe(); }, probeRetryWindowMs);
     };
-    const onSnapshot = (snapshot) => {
-        latest = snapshot;
+    const onSnapshot = (chat) => {
+        latest = chat;
         if (disabled)
             return;
         if (probed) {
-            applyRules(snapshot);
+            applyRules(chat);
             return;
         }
         // Probe on the first non-empty rule set, one frame out so React has
         // committed the rows the rules target.
-        if (hiddenFlowKeys(snapshot.chat.nodes.values()).length === 0)
+        if (hiddenFlowKeys(chat.nodes.values()).length === 0)
             return;
         if (probeScheduled || retrying)
             return;
@@ -176,18 +177,24 @@ export function installDomHider(ctx, options = {}) {
         style.textContent = '';
         if (current === undefined)
             return;
-        const binding = ctx.sessions.binding(current);
-        if (binding === undefined)
+        // Chat data lives in the uiConversation binding's chat target (host
+        // 0.1.2's split — see chat-hook.ts); its snapshot is undefined until the
+        // first subscription activates the view.
+        const source = chatSourceOf(ctx, current);
+        if (source === undefined)
             return;
-        onSnapshot(binding.session.getSnapshot());
-        stopSession = binding.session.subscribe(() => { onSnapshot(binding.session.getSnapshot()); });
+        const publish = () => {
+            const chat = source.getSnapshot();
+            if (chat !== undefined)
+                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();

package/lib/types/client/edit-in-place.d.ts

@@ -51,7 +51,8 @@ export interface WithdrawInPlaceSteps {
 export declare function withdrawInPlace(steps: WithdrawInPlaceSteps, running: boolean): Promise<void>;
 /**
  * The minimal slice of the client conversation snapshot the settle probe
- * reads (structurally satisfied by `ConversationSnapshot`, so the unit tests
+ * reads (structurally satisfied by the ui-chat snapshot's timeline slice, so
+ * the unit tests stub only these fields).
  * stub only these fields).
  */
 export interface TurnSettleSnapshot {

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

@@ -13,19 +13,21 @@
  * adds.
  * @module @khorsheed/dsh-client-message-tools/client
  */
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
+import type { Context } from '@deepseek-ai/cordis';
 import type { TypertRemoteNamespaceMap } from '@deepseek-ai/dsh-typert-protocol';
 /** The messageTools Remote namespace, as mounted by this plugin. */
 export type MessageToolsRemote = TypertRemoteNamespaceMap['messageTools'];
 /**
  * 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.
  */
 export declare const inject: string[];
 /**
@@ -35,5 +37,5 @@ export declare const inject: string[];
  * @param ctx - client root context.
  * @returns disposer unwinding the mounted Remote namespace.
  */
-export declare function apply(ctx: ClientContext): Promise<() => Promise<void>>;
+export declare function apply(ctx: Context): Promise<() => Promise<void>>;
 //# sourceMappingURL=index.d.ts.map

package/lib/types/client/index.js

@@ -1,6 +1,7 @@
 import messageToolsRemote from '@khorsheed/dsh-client-message-tools/remote';
 import { installDomHider } from './dom-hider.js';
 import { mergedDraft } from './backfill.js';
+import { chatSourceOf } from './chat-hook.js';
 import { editInPlace, waitForTurnSettled, withdrawInPlace } from './edit-in-place.js';
 import { en, zh } from './locales.js';
 import { editedMessageDefinition, restoredAssistantMessageDefinition, restoredMessageDefinition, withdrawnDividerDefinition, } from './withdrawn-node.js';
@@ -19,15 +20,35 @@ const EMPTY_MODEL_DIRECTORY_STATE = Object.freeze({
 });
 /**
  * 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.
  */
-export const inject = ['slots', 'sessions', 'remote', 'conversation', 'conversationEvents', 'locale'];
+export const inject = ['slots', 'sessions', 'remote', 'conversation', '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
@@ -72,10 +93,7 @@ export async function apply(ctx) {
     };
     ctx.effect(() => ctx.locale.register(NS, { zh, 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',
@@ -125,7 +143,23 @@ export async function apply(ctx) {
         // turn/end last); a replacement's span must cover all of it, so wait
         // for the turn to actually close. Bounded: a turn that never settles
         // rejects instead of letting the edit/withdraw race the stragglers.
-        const waitIdle = () => waitForTurnSettled(() => ctx.sessions.binding(sessionId)?.session.getSnapshot());
+        // `running` rides the Session snapshot; the chat slice (timeline, and
+        // runningCalls under `legacy`) rides the conversation binding's chat
+        // target (host 0.1.2's split, see chat-hook.ts).
+        const settleSnapshot = () => {
+            const session = ctx.sessions.binding(sessionId)?.session.getSnapshot();
+            if (session === undefined)
+                return undefined;
+            const chat = chatSourceOf(ctx, sessionId)?.getSnapshot();
+            if (chat === undefined)
+                return undefined;
+            return {
+                running: session.running,
+                runningCalls: chat.legacy.runningCalls,
+                chat,
+            };
+        };
+        const waitIdle = () => waitForTurnSettled(settleSnapshot);
         return {
             editMessage: (targetSeq, text) => editInPlace({
                 cancel: () => conversation.cancel(),

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

@@ -29,6 +29,10 @@ export declare const zh: {
     'model.empty': string;
     'model.selectFailed': string;
     'message.extraBlock': string;
+    close: string;
+    'markdown.copy': string;
+    'markdown.copied': string;
+    'markdown.footnotes': string;
     'json.truncated': string;
 };
 /** The message-tools namespace key union. */
@@ -69,6 +73,10 @@ export declare const en: {
     'model.empty': string;
     'model.selectFailed': string;
     'message.extraBlock': string;
+    close: string;
+    'markdown.copy': string;
+    'markdown.copied': string;
+    'markdown.footnotes': string;
     'json.truncated': string;
 };
 //# sourceMappingURL=locales.d.ts.map

package/lib/types/client/locales.js

@@ -29,6 +29,10 @@ export const zh = {
     '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. */
@@ -61,5 +65,9 @@ export const en = {
     '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',
 };

package/lib/types/client/withdrawn-node.d.ts

@@ -8,7 +8,8 @@
  * Definition per event and offers no suppression seam; hiding happens in the
  * renderers and the DOM hider.
  */
-import type { ChatConversationViewNode, ConversationNodeDefinition } from '@deepseek-ai/dsh-client-runtime/client';
+import type { ChatConversationViewNode } from '@deepseek-ai/dsh-client-ui-chat/client';
+import type { ConversationNodeDefinition } from '@deepseek-ai/dsh-client-ui-conversation/client';
 /** Chat node data of one withdrawal divider row. */
 export interface WithdrawnDividerData {
     /** Seq of the replacement event; the divider anchors here and the hidden span ends (exclusive). */
@@ -51,7 +52,7 @@ export interface RestoredAssistantMessageData {
     /** The assistant reply text (model-facing frame stripped for display). */
     readonly text: string;
 }
-declare module '@deepseek-ai/dsh-client-ui-conversation/client' {
+declare module '@deepseek-ai/dsh-client-ui-chat/client' {
     interface ChatNodeDataMap {
         /** message-tools withdrawal divider marking where a span was hidden. */
         'message-tools-withdrawn': WithdrawnDividerData;

package/lib/types/client/withdrawn-node.js

@@ -1,4 +1,22 @@
 import { isMessageToolsEdit, isMessageToolsReplacement, isMessageToolsRestore, isMessageToolsRestoreAssistant, stripRestoreAssistantFrame, } from '../marker.js';
+/**
+ * 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
@@ -7,29 +25,23 @@ import { isMessageToolsEdit, isMessageToolsReplacement, isMessageToolsRestore, i
 export const withdrawnDividerDefinition = {
     kind: 'message-tools-withdrawn',
     target: 'chat',
-    match: event => isMessageToolsReplacement(event)
-        ? { id: String(event.seq), role: 'start' }
-        : null,
+    match: (event) => {
+        // Attempt and boundary rows share the bus; the guards speak SessionEvent only.
+        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');
         }
-        return { seq: event.seq, hiddenStartSeq: event.surfaceOp.start };
+        return { seq: event.seq, hiddenStartSeq: event.surfaceOp.startSeq };
     },
     update: context => context.state,
     buildViewNode: context => context.state === undefined
         ? 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,
-        },
+        : chatViewNode(context, 'message-tools-withdrawn', context.state.seq, context.state),
 };
 /**
  * The edited-bubble Definition: one single-event Context per message-tools
@@ -40,9 +52,11 @@ export const withdrawnDividerDefinition = {
 export 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)) {
@@ -52,22 +66,13 @@ export const editedMessageDefinition = {
             seq: event.seq,
             time: event.time,
             content: event.data.content,
-            hiddenStartSeq: event.surfaceOp.start,
+            hiddenStartSeq: event.surfaceOp.startSeq,
         };
     },
     update: context => context.state,
     buildViewNode: context => context.state === undefined
         ? 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,
-        },
+        : chatViewNode(context, 'message-tools-edited', context.state.seq, context.state),
 };
 /**
  * Fold the hidden seq spans out of the live chat nodes, flattened to
@@ -122,9 +127,11 @@ function joinAssistantText(blocks) {
 export 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)) {
@@ -141,16 +148,7 @@ export const restoredMessageDefinition = {
     update: context => context.state,
     buildViewNode: context => context.state === undefined
         ? 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,
-        },
+        : chatViewNode(context, 'message-tools-restored', context.state.seq, context.state),
 };
 /**
  * The restore-assistant-line Definition: one single-event Context per
@@ -162,9 +160,11 @@ export const restoredMessageDefinition = {
 export 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)) {
@@ -180,16 +180,7 @@ export const restoredAssistantMessageDefinition = {
     update: context => context.state,
     buildViewNode: context => context.state === undefined
         ? 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,
-        },
+        : chatViewNode(context, 'message-tools-restored-assistant', context.state.seq, context.state),
 };
 /**
  * Count the user-visible messages hidden by one withdrawn span. This mirrors

package/lib/types/index.js

@@ -32,6 +32,8 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
+// Value: the branded seq constructor the surface markers require.
+import { SessionSeq } from '@deepseek-ai/dsh-session';
 import { createUserMessage } from '@deepseek-ai/dsh-llm';
 import { Remote, TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol';
 import { EDIT_TRIGGER_NOTICE, MESSAGE_TOOLS_PLUGIN, WITHDRAWN_NOTICE, editReplacementSource, editTriggerSource, restoreAssistantSource, } from './marker.js';
@@ -77,15 +79,15 @@ let MessageToolsService = (() => {
             const session = this.ctx.sessions.get(request.sessionId);
             if (session === undefined)
                 return { 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 } };
             const replacement = session.append('user/message', createUserMessage({
                 content: [{ type: 'text', text: WITHDRAWN_NOTICE }],
                 source: { kind: 'plugin', plugin: MESSAGE_TOOLS_PLUGIN },
             }), {
-                surfaceOp: { op: 'replace', start: planned.plan.start, end: planned.plan.end },
-                sourceEventSeqs: [...planned.plan.sourceEventSeqs],
+                surfaceOp: { op: 'replace', startSeq: SessionSeq(planned.plan.start), endSeq: SessionSeq(planned.plan.end) },
+                sourceEventSeqs: planned.plan.sourceEventSeqs.map(seq => SessionSeq(seq)),
             });
             await this.ctx.sessions.flush(session);
             return {
@@ -111,7 +113,7 @@ let MessageToolsService = (() => {
             const session = this.ctx.sessions.get(request.sessionId);
             if (session === undefined)
                 return { 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 } };
             const appendedSeqs = [];
@@ -127,7 +129,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);
@@ -149,15 +151,15 @@ let MessageToolsService = (() => {
             const session = this.ctx.sessions.get(request.sessionId);
             if (session === undefined)
                 return { 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 } };
             const replacement = session.append('user/message', createUserMessage({
                 content: [{ type: 'text', text: request.text }],
                 source: editReplacementSource(),
             }), {
-                surfaceOp: { op: 'replace', start: planned.plan.start, end: planned.plan.end },
-                sourceEventSeqs: [...planned.plan.sourceEventSeqs],
+                surfaceOp: { op: 'replace', startSeq: SessionSeq(planned.plan.start), endSeq: SessionSeq(planned.plan.end) },
+                sourceEventSeqs: planned.plan.sourceEventSeqs.map(seq => SessionSeq(seq)),
             });
             await this.ctx.sessions.flush(session);
             const agent = this.ctx.agents.get(request.sessionId);

package/lib/types/marker.d.ts

@@ -44,8 +44,8 @@ export declare function stripRestoreAssistantFrame(text: string): string;
 export type MessageToolsReplacementEvent = SessionEvent<'user/message'> & {
     readonly surfaceOp: {
         readonly op: 'replace';
-        readonly start: number;
-        readonly end: number;
+        readonly startSeq: number;
+        readonly endSeq: number;
     };
 };
 /** One message-tools edit replacement event, narrowed (same shape, `op: 'edit'` source). */