@morlay/ui-conversation-message-actions 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/ui-conversation-message-actions",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "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.4"
+    "@morlay/session-branch": "^0.0.6"
   },
   "devDependencies": {
-    "@morlay/session-rdb": "^0.0.16",
+    "@morlay/session-rdb": "^0.0.18",
     "@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.5-rc.1",
-    "@deepseek-ai/dsh-attachment": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-store": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-attachment": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-chat": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-invariants": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-session": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-session-projection": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-token-meter": "^0.1.5-rc.1"
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-attachment": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-connection": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-store": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-attachment": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-chat": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-session": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-projection": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-token-meter": "^0.1.5-rc.2"
   },
   "dsh": {
     "bundle": {
@@ -99,7 +99,8 @@
     "postgres-interval": "1.2.0",
     "split2": "4.2.0",
     "tinyrainbow": "3.1.1",
-    "xtend": "4.0.2"
+    "xtend": "4.0.2",
+    "zod": "4.6.1"
   },
   "scripts": {
     "build": "pnpm exec tsdown"

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

@@ -12,7 +12,6 @@ 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";
-import { MessageEditDialog } from "./MessageEditDialog.tsx";
 import css from "./MessageItem.module.css";
 import type { EditableMessageBlock } from "../../shared.ts";
 import type { SessionEditorFace } from "../controller.ts";
@@ -104,11 +103,11 @@ export const UserMessageNodeView = memo(function UserMessageNodeView({
   node,
   renderMessageImages,
   t,
-  edit,
+  recall,
   retry,
 }: ChatNodeViewProps<"user" | "steering"> & InjectFace<SessionEditorFace>) {
   const data = node.data;
-  const [editing, setEditing] = useState<EditableMessageBlock | null>(null);
+  const [confirmingRecall, setConfirmingRecall] = useState<EditableMessageBlock | null>(null);
   const [confirmingRetry, setConfirmingRetry] = useState(false);
   const turnLocation =
     node.location.kind === "turn" || node.location.kind === "step" ? node.location.turn : undefined;
@@ -125,7 +124,7 @@ export const UserMessageNodeView = memo(function UserMessageNodeView({
     textBlock === undefined || turn === undefined
       ? undefined
       : () => {
-          setEditing({
+          setConfirmingRecall({
             key: `${node.anchorSeq}:${String(textBlockIndex)}`,
             turn,
             eventSeq: node.anchorSeq,
@@ -144,11 +143,30 @@ export const UserMessageNodeView = memo(function UserMessageNodeView({
       : undefined;
   return (
     <>
-      {editing !== null && (
-        <MessageEditDialog
-          block={editing}
-          onSave={(text) => edit(editing, text, "truncate")}
-          onClose={() => setEditing(null)}
+      {confirmingRecall !== null && (
+        <Modal
+          open
+          onClose={() => setConfirmingRecall(null)}
+          title="编辑消息"
+          closeLabel="关闭"
+          description="将撤回该消息及其之后的对话内容到输入框，请修改后重新发送。"
+          footer={
+            <div className={css.confirmActions}>
+              <Button variant="outline" onClick={() => setConfirmingRecall(null)}>
+                取消
+              </Button>
+              <Button
+                variant="primary"
+                onClick={() => {
+                  const target = confirmingRecall;
+                  setConfirmingRecall(null);
+                  void recall(target);
+                }}
+              >
+                撤回并编辑
+              </Button>
+            </div>
+          }
         />
       )}
       {confirmingRetry && turn !== undefined && (

package/src/client/controller.ts

@@ -26,7 +26,7 @@ function editorApiPath(): string {
 export interface SessionEditorState {
   status: "idle" | "loading" | "ready" | "error";
   error: string | null;
-  pending: VersionOperation | "import" | null;
+  pending: VersionOperation | "recall" | "import" | null;
   timeline: SessionEditorTimeline | null;
 }
 
@@ -42,6 +42,7 @@ export interface SessionEditorFace {
   retry(turn: number, cascade: "truncate" | "preserve"): Promise<boolean>;
   reroll(): Promise<boolean>;
   rewind(toBoundary: number): Promise<boolean>;
+  recall(message: EditableMessageBlock): Promise<boolean>;
 
   importSession(file: File): Promise<boolean>;
   openVersion(sessionId: string): Promise<void>;
@@ -105,6 +106,11 @@ export class SessionEditorController {
       reroll: () => this.mutate({ action: "reroll", sessionId: this.sessionId }),
       rewind: (toBoundary) =>
         this.mutate({ action: "rewind", sessionId: this.sessionId, toBoundary }),
+      recall: (message) =>
+        this.mutate(
+          { action: "recall", sessionId: this.sessionId, eventSeq: message.eventSeq },
+          () => this.setComposerDraft(message.text),
+        ),
       importSession: (file) => this.importSession(file),
       openVersion: (sessionId) => this.openWhenListed(sessionId as SessionId),
     };
@@ -196,7 +202,10 @@ export class SessionEditorController {
     }
   }
 
-  private async mutate(operation: SessionEditorOperation): Promise<boolean> {
+  private async mutate(
+    operation: SessionEditorOperation,
+    onApplied?: () => void,
+  ): Promise<boolean> {
     // 只拦截并发操作；不要求 status === "ready"——编辑/重试的数据来自客户端
     // conversation 节点，与 timeline 加载无关，status 为 idle 时也可发起请求。
     const current = this.store.getSnapshot();
@@ -222,6 +231,9 @@ export class SessionEditorController {
       this.store.update((state) => {
         state.pending = null;
       });
+      // recall 的草稿回填必须在刷新（resync / 整页重载）之前：草稿经会话级
+      // 持久化 mirror 落 store，整页重载后仍能恢复。
+      onApplied?.();
       const result = value as SessionEditorOperationResult;
       // 仅 fork 产生新 id 时需要等列表发布并打开新版本；就地编辑不改 id。
       if (String(result.sessionId) !== String(this.sessionId)) {
@@ -266,6 +278,22 @@ export class SessionEditorController {
     }
   }
 
+  /**
+   * 把撤回的消息文本回填到该会话的 composer 草稿（`conversation.input` 的
+   * `setDraft`，即主输入框的整段替换语义）。会话 scope / binding / conversation
+   * 服务缺失时静默跳过——撤回本身已成功，草稿回填失败不应回滚会话状态。
+   */
+  private setComposerDraft(text: string): void {
+    // binding 缺失时 input.for 会抛（会话 scope 已拆除），先短路。
+    if (this.sessions.binding(this.sessionId) === undefined) return;
+    const scoped = this.sessions.scope(this.sessionId);
+    if (scoped === undefined) return;
+    const conversation = scoped.get("conversation") as
+      | { input?: { for(ctx: ClientContext): { setDraft(text: string): void } } }
+      | undefined;
+    conversation?.input?.for(scoped).setDraft(text);
+  }
+
   private async importSession(file: File): Promise<boolean> {
     const current = this.store.getSnapshot();
     if (current.pending !== null) return false;

package/src/index.ts

@@ -17,6 +17,7 @@ import {
 import type {
   EditOperation,
   EditableMessageBlock,
+  RecallOperation,
   RerollOperation,
   RetryOperation,
   RetryableTurn,
@@ -43,6 +44,7 @@ export type { CascadePolicy, EditableBlockKind } from "@morlay/session-branch";
 export type {
   EditableMessageBlock,
   EditOperation,
+  RecallOperation,
   RerollOperation,
   RetryOperation,
   RetryableTurn,
@@ -250,6 +252,10 @@ export class SessionEditor extends Service {
     return this.branchOperation(operation, signal);
   }
 
+  recall(operation: RecallOperation, signal?: AbortSignal): Promise<SessionEditorResult> {
+    return this.recallOperation(operation, signal);
+  }
+
   async editableMessages(
     sessionId: SessionId,
     signal?: AbortSignal,
@@ -386,6 +392,57 @@ export class SessionEditor extends Service {
     };
   }
 
+  /**
+   * 撤回（recall）：只 rewind 截断，不重写、不重放——被撤回的 user 消息文本
+   * 由客户端回填到输入框，交给用户修改后重新发送。
+   *
+   * 边界与 edit 的轮首 user 一致：轮首消息整轮截断到前一轮 `turn/end`
+   * （无前轮则 -1），轮内 followup 只截断到该消息本身（exclusive drop），
+   * 避免留下悬空 `turn/start` 让下一次发送开到错误轮号。
+   */
+  private async recallOperation(
+    operation: RecallOperation,
+    signal?: AbortSignal,
+  ): Promise<SessionEditorResult> {
+    signal?.throwIfAborted();
+    const events = await this.readEvents(operation.sessionId, signal);
+    const turns = closedTurns(events);
+    const turnIndex = turns.findIndex(
+      (turn) =>
+        operation.eventSeq > turn.startSeq &&
+        (turn.endSeq === undefined || operation.eventSeq < turn.endSeq),
+    );
+    const turn = turns[turnIndex];
+    if (turn === undefined) {
+      throw new SessionBranchError("所选消息不属于已落定回合。", "INVALID_BOUNDARY");
+    }
+    const userIndex = turn.users.findIndex((user) => user.seq === operation.eventSeq);
+    if (userIndex === -1) {
+      throw new SessionBranchError("所选消息不存在或不可撤回。", "INVALID_BOUNDARY");
+    }
+    const preceding = precedingContentIndex(turns, turnIndex);
+    const boundary =
+      userIndex === 0 ? (preceding < 0 ? -1 : turns[preceding]!.endSeq!) : operation.eventSeq;
+    // live agent 运行中时先等其停下：rewind 会截断其 session 内存 log。
+    await this.prepareIdle(operation.sessionId, signal);
+    await this.ctx.sessionBranch.rewind(operation.sessionId, boundary, signal);
+    return {
+      sessionId: operation.sessionId,
+      queuedTurns: 0,
+      live: this.ctx.sessions.get(operation.sessionId) !== undefined,
+    };
+  }
+
+  /** rewind 前等待驻留 agent 到达 quiescence（无 agent / 无 live owner 时空操作）。 */
+  private async prepareIdle(sessionId: SessionId, signal?: AbortSignal): Promise<void> {
+    signal?.throwIfAborted();
+    const agents = this.ctx.get("agents") as EditorAgentRegistry | undefined;
+    const existing = agents?.get(sessionId);
+    if (existing === undefined) return;
+    await existing.whenIdle();
+    signal?.throwIfAborted();
+  }
+
   private async readEvents(
     sessionId: SessionId,
     signal?: AbortSignal,
@@ -546,6 +603,12 @@ function decodeOperation(value: unknown): SessionEditorOperation {
         sessionId,
         toBoundary: integerOf(record["toBoundary"], "toBoundary"),
       };
+    case "recall":
+      return {
+        action: "recall",
+        sessionId,
+        eventSeq: integerOf(record["eventSeq"], "eventSeq"),
+      };
     case "fork":
       return {
         action: "fork",
@@ -556,7 +619,7 @@ function decodeOperation(value: unknown): SessionEditorOperation {
           : { childSessionId: sessionIdOf(record["childSessionId"]) }),
       };
     default:
-      throw new TypeError("action 必须是 edit、reroll、retry、rewind 或 fork。");
+      throw new TypeError("action 必须是 edit、reroll、retry、rewind、recall 或 fork。");
   }
 }
 
@@ -629,6 +692,14 @@ async function runOperation(
     case "rewind":
       await editor.rewind(operation.sessionId, operation.toBoundary);
       return { sessionId: operation.sessionId, queuedTurns: 0 };
+    case "recall": {
+      const result = await editor.recall(operation);
+      return {
+        sessionId: result.sessionId,
+        queuedTurns: result.queuedTurns,
+        ...(result.live === undefined ? {} : { live: result.live }),
+      };
+    }
     case "fork":
       return {
         sessionId: await editor.fork(

package/src/shared.ts

@@ -33,6 +33,12 @@ export interface RewindOperation {
   toBoundary: number;
 }
 
+export interface RecallOperation {
+  action: "recall";
+  sessionId: SessionId;
+  eventSeq: number;
+}
+
 export interface ForkOperation {
   action: "fork";
   sessionId: SessionId;
@@ -45,6 +51,7 @@ export type SessionEditorOperation =
   | RerollOperation
   | RetryOperation
   | RewindOperation
+  | RecallOperation
   | ForkOperation;
 
 export interface SessionEditorOperationResult {

package/src/types.ts

@@ -31,6 +31,13 @@ export interface RewindOperation {
   toBoundary: number;
 }
 
+export interface RecallOperation {
+  action: "recall";
+  sessionId: SessionId;
+
+  eventSeq: number;
+}
+
 export interface ForkOperation {
   action: "fork";
   sessionId: SessionId;
@@ -43,6 +50,7 @@ export type SessionEditorOperation =
   | RerollOperation
   | RetryOperation
   | RewindOperation
+  | RecallOperation
   | ForkOperation;
 
 export interface SessionEditorResult {

package/src/client/chat-node/MessageEditDialog.module.css

@@ -1,24 +0,0 @@
-.input {
-  /* composer-card 同款视觉（ui-conversation InputBar.module.css 的 .card）：
-     圆角胶囊 + 输入 surface token + 阴影，编辑弹窗与主输入框观感一致。 */
-  width: 100%;
-  min-height: 96px;
-  box-sizing: border-box;
-  font: inherit;
-  font-size: 16px;
-  line-height: 24px;
-  padding: 10px 16px;
-  border: 1px solid var(--dsw-alias-border-l2-darkmode-thin);
-  border-radius: 22px;
-  background: var(--dsw-specific-input-major);
-  box-shadow: var(--dsw-shadow-lv2);
-  color: var(--dsw-text, inherit);
-  resize: none;
-  overflow-y: auto;
-}
-
-.actions {
-  display: flex;
-  justify-content: flex-end;
-  gap: 8px;
-}

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

@@ -1,71 +0,0 @@
-import { useRef, useState } from "react";
-import { Button, Modal } from "@deepseek-ai/dsh-client-ui-primitives";
-import type { EditableMessageBlock } from "../../shared.ts";
-import css from "./MessageEditDialog.module.css";
-
-const BLOCK_TITLE: Record<EditableMessageBlock["kind"], string> = {
-  user: "编辑用户消息",
-  "assistant.reasoning": "编辑助手思考",
-  "assistant.response": "编辑助手回复",
-};
-
-export function MessageEditDialog({
-  block,
-  onSave,
-  onClose,
-}: {
-  block: EditableMessageBlock;
-  onSave: (text: string) => Promise<boolean>;
-  onClose: () => void;
-}) {
-  const [text, setText] = useState(block.text);
-  const [saving, setSaving] = useState(false);
-  const inputRef = useRef<HTMLTextAreaElement | null>(null);
-
-  const autosize = (): void => {
-    const el = inputRef.current;
-    if (el === null) return;
-    el.style.height = "auto";
-    el.style.height = `${el.scrollHeight}px`;
-  };
-
-  const save = (): void => {
-    if (saving) return;
-    setSaving(true);
-    void onSave(text).then((applied) => {
-      if (applied) onClose();
-      else setSaving(false);
-    });
-  };
-
-  return (
-    <Modal
-      open
-      onClose={onClose}
-      title={BLOCK_TITLE[block.kind]}
-      closeLabel="关闭"
-      footer={
-        <div className={css.actions}>
-          <Button variant="outline" onClick={onClose} disabled={saving}>
-            取消
-          </Button>
-          <Button variant="primary" onClick={save} disabled={saving}>
-            {saving ? "保存中…" : "保存"}
-          </Button>
-        </div>
-      }
-    >
-      <textarea
-        ref={inputRef}
-        className={css.input}
-        value={text}
-        onChange={(event) => {
-          setText(event.target.value);
-          autosize();
-        }}
-        autoFocus
-        rows={4}
-      />
-    </Modal>
-  );
-}