@morlay/ui-conversation-message-actions 0.0.13 → 0.0.14-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/ui-conversation-message-actions",
-  "version": "0.0.13",
+  "version": "0.0.14-alpha.0",
   "description": "Rewind / retry / fork orchestration (host) plus conversation.chat.node renderer replacement (browser) — message edit / retry actions on user bubbles.",
   "keywords": [
     "conversation-chat-node",
@@ -35,10 +35,10 @@
     "./client": "./dist/client.js"
   },
   "dependencies": {
-    "@morlay/session-branch": "^0.0.3"
+    "@morlay/session-branch": "^0.0.4-alpha.0"
   },
   "devDependencies": {
-    "@morlay/session-rdb": "^0.0.13",
+    "@morlay/session-rdb": "^0.0.16-alpha.0",
     "@types/react": "^19.2.18",
     "@types/react-dom": "^19.2.5",
     "lightningcss": "^1.32.0",
@@ -47,22 +47,22 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-api-session-controller": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-attachment": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-store": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-attachment": "^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-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-session-persistence": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-projection": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-token-meter": "^0.1.2-rc.1"
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-attachment": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-client-connection": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-client-store": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-client-ui-attachment": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-client-ui-chat": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-session-projection": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-token-meter": "^0.1.3-alpha.2"
   },
   "dsh": {
     "bundle": {

package/src/client/chat-node/MessageItem.tsx

@@ -8,7 +8,7 @@ import type { ReactNode } from "react";
 import type { InjectFace } from "@deepseek-ai/dsh-client-ui-slots";
 import { Button, Modal } from "@deepseek-ai/dsh-client-ui-primitives";
 import type { UserMessageNode } from "@deepseek-ai/dsh-client-ui-chat/client";
-import { JsonBlock, MessageText } from "@deepseek-ai/dsh-client-ui-primitives";
+import { JsonBlock } from "@deepseek-ai/dsh-client-ui-primitives";
 import type { ChatNodeViewProps, ChatViewSlotProps } from "@deepseek-ai/dsh-client-ui-chat/client";
 import type { RenderMessageImages } from "@deepseek-ai/dsh-client-ui-conversation/client";
 import { MessageIconActions } from "./MessageIconActions.tsx";
@@ -45,8 +45,7 @@ function projectUserText(text: string): ReactNode {
   while ((m = re.exec(text)) !== null) {
     const tokenStart = m.index + (m[1]?.length ?? 0);
     const label = m[2] ?? "";
-    if (tokenStart > cursor)
-      parts.push(<MessageText key={cursor} text={text.slice(cursor, tokenStart)} />);
+    if (tokenStart > cursor) parts.push(<span key={cursor}>{text.slice(cursor, tokenStart)}</span>);
     parts.push(
       <span
         key={tokenStart}
@@ -58,8 +57,8 @@ function projectUserText(text: string): ReactNode {
     );
     cursor = tokenStart + label.length;
   }
-  if (parts.length === 0) return <MessageText text={text} />;
-  if (cursor < text.length) parts.push(<MessageText key={cursor} text={text.slice(cursor)} />);
+  if (parts.length === 0) return <span>{text}</span>;
+  if (cursor < text.length) parts.push(<span key={cursor}>{text.slice(cursor)}</span>);
   return <>{parts}</>;
 }
 

package/src/index.ts

@@ -142,10 +142,9 @@ function appendManualTurn(
   appendSurfaceSeedEvent(
     events,
     "assistant/message",
-    { turn, step: 1, message: assistant },
+    { turn, step: 1, message: assistant, stream: [] },
     {
       surfaceOp: "append",
-      sourceEventSeqs: [],
     },
   );
   appendLogSeedEvent(events, "step/end", { turn, step: 1 });
@@ -155,7 +154,11 @@ function appendManualTurn(
   });
 }
 
-function appendSeedSuffixLive(session: Session, seedSuffix: readonly SessionEvent[]): void {
+async function appendSeedSuffixLive(
+  session: Session,
+  seedSuffix: readonly SessionEvent[],
+  appendDirect: (events: readonly SessionEvent[]) => Promise<void>,
+): Promise<void> {
   for (const event of seedSuffix) {
     // 版本效果事件携带 ignorable 标记（上游类型无此字段，duck-type 读取）。
     const ignorable = (event as { ignorable?: boolean }).ignorable === true;
@@ -164,10 +167,13 @@ function appendSeedSuffixLive(session: Session, seedSuffix: readonly SessionEven
         log: SessionEvent[];
         eventsSnapshot?: unknown;
       };
-      // ignorable 语义：live log 保留、不落 canonical log。session.append 不
-      // 保留 ignorable 标记，因此直接 push 内存 log（不发布）；seq 按 log
-      // 续接重编号（seedSuffix 内部编号从 0 起）。
-      s.log.push({ ...event, seq: s.log.length } as SessionEvent);
+      // 原样存储语义：版本效果事件经 RDB write handle 直接落库（带
+      // ignorable 信封，与 JSONL 一致）。session.append 不保留 ignorable
+      // 标记且类型系统禁止 append 未知类型，因此不发布、直接 push 内存
+      // log（seq 按 log 续接重编号，与 handle cursor 同空间）。
+      const seq = s.log.length;
+      await appendDirect([{ ...event, seq } as SessionEvent]);
+      s.log.push({ ...event, seq } as SessionEvent);
       s.eventsSnapshot = undefined;
       continue;
     }
@@ -308,10 +314,25 @@ export class SessionEditor extends Service {
     await this.ctx.sessionBranch.rewind(operation.sessionId, boundary, signal);
     if (seedSuffix.length > 0) {
       if (live !== undefined) {
-        // live：版本效果 push 内存 log（ignorable 保留）、manualTurn 走 append，
-        // 同步 cursor 后显式 flush（push 不发布、不进缓冲，cursor 会落后）。
-        appendSeedSuffixLive(live, seedSuffix);
-        this.ctx.sessionBranch.syncLiveCursor(operation.sessionId);
+        // live：版本效果经 RDB write handle 直接落库（带 ignorable 信封，
+        // 与 JSONL 一致）、manualTurn 走 append；同步 cursor 后显式 flush
+        // （直接落库不发布、不进缓冲，cursor 会落后）。
+        const persistence = this.ctx.sessionPersistence as unknown as {
+          tracker: {
+            writerOf(id: SessionId):
+              | {
+                  append(events: readonly SessionEvent[]): Promise<void>;
+                }
+              | undefined;
+          };
+        };
+        const handle = persistence.tracker.writerOf(operation.sessionId);
+        if (handle === undefined) {
+          throw new Error(
+            `session "${operation.sessionId}" has no live write handle for the version effect`,
+          );
+        }
+        await appendSeedSuffixLive(live, seedSuffix, (events) => handle.append(events));
         await this.ctx.sessions.flush(live);
       } else {
         // cold：续写 seq 从平衡后的保留前缀接续（exclusive 截断可能残留
@@ -325,7 +346,12 @@ export class SessionEditor extends Service {
               seq: keepLength + index,
             }) as SessionEvent,
         );
-        await this.ctx.sessionPersistence.append(operation.sessionId, renumbered);
+        const handle = await this.ctx.sessionPersistence.open(operation.sessionId, "write");
+        try {
+          await handle.append(renumbered);
+        } finally {
+          await handle.close();
+        }
       }
     }
 
@@ -401,10 +427,7 @@ export class SessionEditor extends Service {
       const fallbackProvider = config?.provider ?? "";
       const fallbackModel = config?.model ?? "";
       if (fallbackProvider.length === 0 || fallbackModel.length === 0) {
-        throw new SessionBranchError(
-          "无法重放：会话没有可解析的模型配置。",
-          "INVALID_BOUNDARY",
-        );
+        throw new SessionBranchError("无法重放：会话没有可解析的模型配置。", "INVALID_BOUNDARY");
       }
       const handle = await agents.resume({
         resumeSessionId: sessionId,

package/src/plan.ts

@@ -298,7 +298,10 @@ export function retryPlan(operation: RetryOperation, turns: readonly ClosedTurn[
   };
 }
 
-export function rerollPlan(operation: RerollOperation, turns: readonly ClosedTurn[]): OperationPlan {
+export function rerollPlan(
+  operation: RerollOperation,
+  turns: readonly ClosedTurn[],
+): OperationPlan {
   for (let index = turns.length - 1; index >= 0; index -= 1) {
     const turn = turns[index];
     // 未闭合轮次无已落定的助手回复可重生成。

package/src/testing.ts

@@ -65,17 +65,16 @@ export async function createPersisted(
   events: readonly SessionEvent[],
   header: SessionHeader = meta(id),
 ): Promise<void> {
-  await ctx.sessionPersistence.create(header);
-  await ctx.sessionPersistence.append(SessionIdBrand(id), [...events]);
+  const handle = await ctx.sessionPersistence.create(header);
+  try {
+    await handle.append([...events]);
+  } finally {
+    await handle.close();
+  }
 }
 
 /** 构造一条 user/message 事件。 */
-export function userMessage(
-  seq: number,
-  id: string,
-  text: string,
-  time = seq,
-): SessionEvent {
+export function userMessage(seq: number, id: string, text: string, time = seq): SessionEvent {
   return {
     type: "user/message",
     seq: SessionSeq(seq),
@@ -112,9 +111,10 @@ export function assistantMessage(
         content: [{ type: "text", text }],
         source: { kind: "model", provider: "mock", model: "mock" },
       },
+      stream: [] as const,
     },
     surfaceOp: "append",
-  } as SessionEvent;
+  } as unknown as SessionEvent;
 }
 
 /** 真实 agent-loop 形状的一轮：轮首输入 + 可选 followup，可闭合。 */