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

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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdrawn-node.d.ts","sourceRoot":"","sources":["../../../src/client/withdrawn-node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"withdrawn-node.d.ts","sourceRoot":"","sources":["../../../src/client/withdrawn-node.ts"],"names":[],"mappings":"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"}

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,9 +25,12 @@ 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) => {
+        // Packed chunk 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)) {
@@ -20,16 +41,7 @@ export const withdrawnDividerDefinition = {
     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)) {
@@ -58,16 +72,7 @@ export const editedMessageDefinition = {
     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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAMlD,OAAO,EAAU,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAM9E,OAAO,KAAK,EACV,uBAAuB,EAAE,sBAAsB,EAC/C,0BAA0B,EAAE,yBAAyB,EACrD,2BAA2B,EAAE,0BAA0B,EACxD,MAAM,YAAY,CAAA;AAEnB,mBAAmB,YAAY,CAAA;AAE/B,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,2DAA2D;QAC3D,YAAY,EAAE,mBAAmB,CAAA;KAClC;CACF;AAED;;;;;GAKG;AACH,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,MAAM,CAAC,MAAM,WAAyB;IAEtC;;OAEG;IACH,YAAY,GAAG,EAAE,OAAO,EAEvB;IAED;;;;;OAKG;IAEG,QAAQ,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAiBxF;IAED;;;;;;;;;;;;;OAaG;IAEG,OAAO,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAwBrF;IAED;;;;;;;;;;OAUG;IAEG,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAqB5E;CACF;eAEc,mBAAmB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAQlD,OAAO,EAAU,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAM9E,OAAO,KAAK,EACV,uBAAuB,EAAE,sBAAsB,EAC/C,0BAA0B,EAAE,yBAAyB,EACrD,2BAA2B,EAAE,0BAA0B,EACxD,MAAM,YAAY,CAAA;AAEnB,mBAAmB,YAAY,CAAA;AAE/B,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,2DAA2D;QAC3D,YAAY,EAAE,mBAAmB,CAAA;KAClC;CACF;AAED;;;;;GAKG;AACH,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,MAAM,CAAC,MAAM,WAAyB;IAEtC;;OAEG;IACH,YAAY,GAAG,EAAE,OAAO,EAEvB;IAED;;;;;OAKG;IAEG,QAAQ,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAiBxF;IAED;;;;;;;;;;;;;OAaG;IAEG,OAAO,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAwBrF;IAED;;;;;;;;;;OAUG;IAEG,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAqB5E;CACF;eAEc,mBAAmB"}

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', start: SessionSeq(planned.plan.start), end: 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', start: SessionSeq(planned.plan.start), end: 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/withdraw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../../src/withdraw.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAoClE,0CAA0C;AAC1C,MAAM,MAAM,qBAAqB,GAC7B,kBAAkB,GAClB,oBAAoB,GACpB,mBAAmB,CAAA;AACvB,2DAA2D;AAC3D,MAAM,WAAW,cAAc;IAC7B,kEAAkE;IAClE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,4EAA4E;IAC5E,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,oGAAoG;IACpG,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAA;CAC5C;AAED,gEAAgE;AAChE,MAAM,MAAM,oBAAoB,GAC5B;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;CAAE,GACpD;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAA;CAAE,CAAA;AAEhE;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,YAAY,EAAE,SAAS,MAAM,EAAE,EAC/B,SAAS,EAAE,MAAM,GAChB,oBAAoB,CAStB;AAED,qCAAqC;AACrC,MAAM,MAAM,eAAe,GACvB,kBAAkB,GAClB,oBAAoB,GACpB,mBAAmB,GACnB,YAAY,CAAA;AAEhB,gEAAgE;AAChE,MAAM,MAAM,cAAc,GACtB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;CAAE,GACpD;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAA;CAAE,CAAA;AAE1D;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CACtB,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,YAAY,EAAE,SAAS,MAAM,EAAE,EAC/B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,cAAc,CAUhB;AAED,uCAAuC;AACvC,MAAM,MAAM,kBAAkB,GAC1B,kBAAkB,GAClB,oBAAoB,GACpB,eAAe,CAAA;AAEnB;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IACA,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,qDAAqD;IACrD,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAA;IACjE,oDAAoD;IACpD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC3B,GACC;IACA,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,oDAAoD;IACpD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC3B,CAAA;AAEH,8DAA8D;AAC9D,MAAM,WAAW,WAAW;IAC1B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,CAAA;CAChD;AAED,oEAAoE;AACpE,MAAM,MAAM,iBAAiB,GACzB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;CAAE,GACjD;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAAA;AAsL7D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CACzB,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,YAAY,EAAE,SAAS,MAAM,EAAE,EAC/B,SAAS,EAAE,MAAM,GAChB,iBAAiB,CAUnB"}
+{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../../src/withdraw.ts"],"names":[],"mappings":"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"}

package/lib/types/withdraw.js

@@ -120,12 +120,16 @@ function joinAssistantMessageText(blocks) {
 function findWithdrawnSpan(events, targetSeq) {
     for (let index = events.length - 1; index > targetSeq; index--) {
         const event = events[index];
-        if (event !== undefined && 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 === undefined || !isMessageToolsReplacement(event))
+            continue;
+        // The brands are compile-time only; the fold addresses the log by plain number.
+        const sources = event.sourceEventSeqs;
+        if (sources?.includes(targetSeq) !== true)
+            continue;
+        const span = [];
+        for (let seq = event.surfaceOp.start; seq < event.seq; seq++)
+            span.push(seq);
+        return span;
     }
     return undefined;
 }

package/package.json

@@ -7,7 +7,7 @@
     "cordis",
     "messages"
   ],
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -45,7 +45,6 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-api-remotes",
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-conversation",
@@ -54,8 +53,8 @@
       "platform": "web"
     },
     "compat": {
-      "minHost": "0.1.0-rc.8",
-      "verifiedHost": "0.1.1-rc.2"
+      "minHost": "0.1.2-rc.1",
+      "verifiedHost": "0.1.2-rc.1"
     }
   },
   "license": "MIT",
@@ -63,7 +62,6 @@
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-api-remotes": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-model-selection": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
@@ -76,19 +74,22 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-client-test-runtime": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-client-ui-model-selection": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-invariants": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-session": "^0.1.1-rc.1",
-    "@deepseek-ai/dsh-typert-protocol": "^0.1.1-rc.1",
+    "@deepseek-ai/dsh-agent": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-remotes": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-locale": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-store": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-test-runtime": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-chat": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-model-selection": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-invariants": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-typert-protocol": "^0.1.2-rc.1",
     "@testing-library/react": "^16.1.0",
     "@types/node": "^26.2.0",
     "@types/react": "~18.3.1",