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

package/README.md

@@ -1,9 +1,9 @@
 # @morlay/ui-conversation-message-actions
 
-`rewind / retry / fork` 的**编排层**：在 `@morlay/session-branch` 的 provider
+`rewind / retry / recall / fork` 的**编排层**：在 `@morlay/session-branch` 的 provider
 抽象之上组装完整功能（产品语义对齐 [dsh-message-edit](https://github.com/Moeblack/dsh-message-edit)），
-并提供**浏览器半**（client bundle）：替换 `conversation.chat.node` 渲染，
-在 user 消息行内直接挂编辑 / 重试入口。
+并提供**浏览器半**（client bundle）：替换 `conversation.chat.node` 的
+`user` / `steering` 渲染，在 user 消息行内直接挂编辑 / 重试入口。
 
 ## 服务面（`ctx.sessionEditor`）
 
@@ -13,6 +13,7 @@
 | `reroll`   | 重生成最后一条已落定助手回复（使用原用户输入）                                    |
 | `retry`    | 重试任意历史回合（`truncate` 只重放目标输入 / `preserve` 重放后续全部）           |
 | `rewind`   | 截断式回退：原会话回退到闭合 `turn/end` 边界                                      |
+| `recall`   | 撤回 user 消息到输入框：只 `rewind` 截断，不重写、不重放（交给用户改后重发）       |
 | `fork`     | 从任意闭合边界派生**新会话**（唯一产生新 id 的操作）                              |
 | `timeline` | 版本树投影（HTTP：`GET /session-editor?sessionId=…`）                             |
 
@@ -28,8 +29,11 @@
   点不开的空项与轮号空洞；manualTurn 的轮号同样按保留前缀收敛（正常会话
   等于目标轮号）。版本效果仍记录**原**目标轮号（操作历史）；
 - **只有 `fork` 创建新 id**（`ForkOperation` / `forkFrom`，纯 append 派生）；
-- 版本效果事件（`session-branch/version`）携带 `ignorable: true`：live log 可见、
-  **不落 canonical log**（rdb 持久化时过滤并稠密化剩余事件）；
+- **`recall` 只截断不重写**：边界与 `edit` 的轮首 user 一致（轮首整轮截断到前一轮
+  `turn/end`，轮内 followup exclusive drop），但只 `rewind` 即返回——不写版本效果、
+  不重放；被撤回的 user 文本由浏览器半回填到 composer，用户修改后自行发送；
+- 版本效果事件（`session-branch/version`）携带 `ignorable: true`：**原样落库**
+  （rdb 不按信封过滤，与 JSONL 一致），非 branch 读者凭信封跳过；
 - 重放输入经 agent 驱动（见下）排队到原会话，agent 基于截断后历史回复。
 
 ## agent 驱动（重放排队输入）
@@ -39,7 +43,7 @@
 
 - **live agent**（会话驻留 / 已恢复）：直接 `followup` 排队，不重建、不换 id；
   编辑前只等 agent 停下（`whenIdle`），残留排队输入由 rewind 在截断后强制
-  durable 取消（session-rdb 的 `LiveSessionHooks.inbox.clear`）；
+  durable 取消（session-rdb 的 live 会话钩子 `inbox.clear`）；
 - **cold 会话**：`resume` 已持久化会话（`create` 对已持久化日志必失败），
   resume 后 agent 驻留（不 dispose，避免 session 被移出 store 破坏客户端窗口）；
 - 模型 provider/model 在 **rewind 之前**从 `request/header` 解析（就地编辑
@@ -47,15 +51,15 @@
 
 ## 浏览器半（client bundle）
 
-`lib/client.js` 经 `__ModuleLoader__.load` 手递，替换整个 `conversation.chat.node`：
+`dist/client.js` 经 `__ModuleLoader__.load` 手递，替换 `conversation.chat.node`
+的 `user` / `steering` 渲染：
 
-- **shadow 注册**：12 个 key（user / steering / context / assistant-step /
-  command / manual-compaction / compaction / model-retry / turn-error /
-  turn-max-tokens / turn-tail / unknown）全部以 `priority: -1` 重新注册，
-  最低优先级渲染，shadow 上游渲染器；
-- **编辑 / 重试按钮只挂在 user 消息**（`UserMessageNodeView`）：编辑弹窗复用
-  dsh settings 同款 `Modal` + `Button`，输入框复用 composer-card 视觉与自动
-  增长；重试先弹确认；未闭合轮次不显示重试；
+- **shadow 注册**：`user` / `steering` 两个 key 以 `priority: -1` 重新注册
+  （最低优先级渲染，shadow 上游默认注册）；其余 key 沿用上游渲染器；
+- **编辑 / 重试按钮只挂在 user 消息**（`UserMessageNodeView`）：编辑不再打开编辑
+  弹窗，而是确认（`Modal` + `Button`）后调用 `recall`——服务端只 `rewind` 截断，
+  客户端把消息文本 `setDraft` 回填到主输入框（`conversation.input`），交给用户
+  修改后自行发送；重试仍先弹确认；未闭合轮次不显示重试；
 - **操作后刷新**：就地编辑后优先调用客户端会话级 `resync()`（重置窗口并重新
   拉取历史，不整页重载——rewind 的删除无法经 append-only 事件流表达，seq
   回退只做增量会残留旧节点），随后丢弃该会话的全部投影行
@@ -63,30 +67,30 @@
   前的高 seq 旧值，截断后的正确值 seq 更小，永远覆盖不上（轮次导航残留已
   删除的轮次）；不可用时回退 `location.reload()`；
 - **构建约束**：client bundle 必须是**单文件**（client-modules 只服务/加载
-  `client.js`）——`noExternal` 全内联第三方 + `inlineDynamicImports` 合并
-  动态 import，`@deepseek-ai/*` 一律 external（平台 seed 词或独立插件，
-  内联会把别的插件的 `__ModuleLoader__.load` 嵌进来导致 duplicate factory）；
-  CSS Modules 经 lightningcss 内联 + `<style data-plugin>` 注入。
+  `client.js`）——`deps.neverBundle` 保持 react 与 `@deepseek-ai/*` external
+  （平台 seed 词或独立插件，内联会把别的插件的 `__ModuleLoader__.load` 嵌进来
+  导致 duplicate factory），其余依赖全部内联，`inlineDynamicImports` 合并动态
+  import；CSS Modules 经 lightningcss 内联 + `<style data-plugin>` 注入。
 
 ## 分层边界
 
-- 数据层（`forkFrom` / `rewind` / `readBranchPrefix` / `syncLiveCursor`）来自
+- 数据层（`forkFrom` / `rewind` / `readBranchPrefix`）来自
   `ctx.sessionBranch`（provider 实现，如 `@morlay/session-rdb`）；
 - 本服务只做**编排**：闭合轮次扫描、版本效果事件构造、派生 seed 组装、
   rewind 命令透传、agent 驱动、HTTP 面（`POST /session-editor` 执行
-  edit / reroll / retry / rewind / fork）。
+  edit / reroll / retry / rewind / recall / fork）。
 
 ## 装配
 
 ```yaml
 # cordis.patch.yml
 - insert:
-    - id: session-editor
+    - id: ui-conversation-message-actions
       name: "@morlay/ui-conversation-message-actions"
 ```
 
-依赖 `ctx.sessionBranch`（需先装配 `@morlay/session-rdb` 等
-provider 实现）与 `ctx.sessions`（dsh-session）；`agents` 可选。
+依赖 `ctx.sessionBranch` / `ctx.sessionPersistence`（需先装配
+`@morlay/session-rdb` 等 provider 实现）与 `ctx.sessions`；`agents` 可选。
 
 端到端装配真实 rdb 后端，验证 retry / rewind / fork / timeline 闭环，
-以及 live 会话的 rewind（内存 log / coordinator cursor 同步）与 agent 重放。
+以及 live 会话的 rewind（内存 log 截断 / handle cursor 对齐）与 agent 重放。

package/dist/client.js

@@ -82,6 +82,11 @@ window.__ModuleLoader__.load({
 						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)
 				};
@@ -158,7 +163,7 @@ window.__ModuleLoader__.load({
 					});
 				}
 			}
-			async mutate(operation) {
+			async mutate(operation, onApplied) {
 				if (this.store.getSnapshot().pending !== null) return false;
 				this.store.update((state) => {
 					state.pending = operation.action;
@@ -182,6 +187,7 @@ window.__ModuleLoader__.load({
 					this.store.update((state) => {
 						state.pending = null;
 					});
+					onApplied?.();
 					const result = value;
 					if (String(result.sessionId) !== String(this.sessionId)) {
 						await this.openWhenListed(result.sessionId);
@@ -211,6 +217,17 @@ window.__ModuleLoader__.load({
 					return false;
 				}
 			}
+			/**
+			* 把撤回的消息文本回填到该会话的 composer 草稿（`conversation.input` 的
+			* `setDraft`，即主输入框的整段替换语义）。会话 scope / binding / conversation
+			* 服务缺失时静默跳过——撤回本身已成功，草稿回填失败不应回滚会话状态。
+			*/
+			setComposerDraft(text) {
+				if (this.sessions.binding(this.sessionId) === void 0) return;
+				const scoped = this.sessions.scope(this.sessionId);
+				if (scoped === void 0) return;
+				scoped.get("conversation")?.input?.for(scoped).setDraft(text);
+			}
 			async importSession(file) {
 				if (this.store.getSnapshot().pending !== null) return false;
 				this.store.update((state) => {
@@ -351,22 +368,22 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region \0dsh-css:/Users/morlay/src/github.com/morlay/better-session/packages/ui-conversation-message-actions/src/client/chat-node/MessageIconActions.module.css.mjs
-		const css$2 = ".lKOSUG_actions{align-items:center;gap:10px;height:28px;display:flex}.lKOSUG_timeStart{color:var(--dsw-alias-label-tertiary);white-space:nowrap;padding-right:12px;font-size:14px;line-height:24px}.lKOSUG_timeEnd{color:var(--dsw-alias-label-tertiary);white-space:nowrap;padding-left:12px;font-size:14px;line-height:24px}.lKOSUG_runTimeDot{margin:0 10px}@media (hover:hover){[data-time-hover-root] :is(.lKOSUG_timeStart,.lKOSUG_timeEnd){opacity:0;transition:opacity 80ms}[data-time-hover-root]:hover :is(.lKOSUG_timeStart,.lKOSUG_timeEnd),[data-time-hover-root]:focus-within :is(.lKOSUG_timeStart,.lKOSUG_timeEnd){opacity:1}}.lKOSUG_action{width:28px;height:28px;color:var(--dsw-alias-label-tertiary);cursor:pointer;background:0 0;border:none;border-radius:28px;justify-content:center;align-items:center;padding:6px;display:inline-flex}.lKOSUG_action:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary)}.lKOSUG_action[data-unavailable]{cursor:default;opacity:.4}.lKOSUG_action[data-unavailable]:hover{color:var(--dsw-alias-label-tertiary);background:0 0}.lKOSUG_visuallyHidden{clip:rect(0 0 0 0);white-space:nowrap;width:1px;height:1px;position:absolute;overflow:hidden}";
-		const tagId$2 = "@morlay/ui-conversation-message-actions/MessageIconActions.module.css";
-		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$2) + "]") === null) {
+		const css$1 = ".lKOSUG_actions{align-items:center;gap:10px;height:28px;display:flex}.lKOSUG_timeStart{color:var(--dsw-alias-label-tertiary);white-space:nowrap;padding-right:12px;font-size:14px;line-height:24px}.lKOSUG_timeEnd{color:var(--dsw-alias-label-tertiary);white-space:nowrap;padding-left:12px;font-size:14px;line-height:24px}.lKOSUG_runTimeDot{margin:0 10px}@media (hover:hover){[data-time-hover-root] :is(.lKOSUG_timeStart,.lKOSUG_timeEnd){opacity:0;transition:opacity 80ms}[data-time-hover-root]:hover :is(.lKOSUG_timeStart,.lKOSUG_timeEnd),[data-time-hover-root]:focus-within :is(.lKOSUG_timeStart,.lKOSUG_timeEnd){opacity:1}}.lKOSUG_action{width:28px;height:28px;color:var(--dsw-alias-label-tertiary);cursor:pointer;background:0 0;border:none;border-radius:28px;justify-content:center;align-items:center;padding:6px;display:inline-flex}.lKOSUG_action:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary)}.lKOSUG_action[data-unavailable]{cursor:default;opacity:.4}.lKOSUG_action[data-unavailable]:hover{color:var(--dsw-alias-label-tertiary);background:0 0}.lKOSUG_visuallyHidden{clip:rect(0 0 0 0);white-space:nowrap;width:1px;height:1px;position:absolute;overflow:hidden}";
+		const tagId$1 = "@morlay/ui-conversation-message-actions/MessageIconActions.module.css";
+		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) {
 			const tag = document.createElement("style");
 			tag.dataset.plugin = "@morlay/ui-conversation-message-actions";
-			tag.dataset.pluginCss = tagId$2;
-			tag.textContent = css$2;
+			tag.dataset.pluginCss = tagId$1;
+			tag.textContent = css$1;
 			document.head.appendChild(tag);
 		}
 		var MessageIconActions_module_css_default = {
-			"runTimeDot": "lKOSUG_runTimeDot",
-			"action": "lKOSUG_action",
+			"visuallyHidden": "lKOSUG_visuallyHidden",
 			"actions": "lKOSUG_actions",
-			"timeStart": "lKOSUG_timeStart",
 			"timeEnd": "lKOSUG_timeEnd",
-			"visuallyHidden": "lKOSUG_visuallyHidden"
+			"timeStart": "lKOSUG_timeStart",
+			"action": "lKOSUG_action",
+			"runTimeDot": "lKOSUG_runTimeDot"
 		};
 		//#endregion
 		//#region src/client/chat-node/MessageIconActions.tsx
@@ -497,78 +514,6 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
-		//#region \0dsh-css:/Users/morlay/src/github.com/morlay/better-session/packages/ui-conversation-message-actions/src/client/chat-node/MessageEditDialog.module.css.mjs
-		const css$1 = "._7VqDXa_input{box-sizing:border-box;width:100%;min-height:96px;font:inherit;border:1px solid var(--dsw-alias-border-l2-darkmode-thin);background:var(--dsw-specific-input-major);box-shadow:var(--dsw-shadow-lv2);color:var(--dsw-text,inherit);resize:none;border-radius:22px;padding:10px 16px;font-size:16px;line-height:24px;overflow-y:auto}._7VqDXa_actions{justify-content:flex-end;gap:8px;display:flex}";
-		const tagId$1 = "@morlay/ui-conversation-message-actions/MessageEditDialog.module.css";
-		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) {
-			const tag = document.createElement("style");
-			tag.dataset.plugin = "@morlay/ui-conversation-message-actions";
-			tag.dataset.pluginCss = tagId$1;
-			tag.textContent = css$1;
-			document.head.appendChild(tag);
-		}
-		var MessageEditDialog_module_css_default = {
-			"input": "_7VqDXa_input",
-			"actions": "_7VqDXa_actions"
-		};
-		//#endregion
-		//#region src/client/chat-node/MessageEditDialog.tsx
-		const BLOCK_TITLE = {
-			user: "编辑用户消息",
-			"assistant.reasoning": "编辑助手思考",
-			"assistant.response": "编辑助手回复"
-		};
-		function MessageEditDialog({ block, onSave, onClose }) {
-			const [text, setText] = (0, react.useState)(block.text);
-			const [saving, setSaving] = (0, react.useState)(false);
-			const inputRef = (0, react.useRef)(null);
-			const autosize = () => {
-				const el = inputRef.current;
-				if (el === null) return;
-				el.style.height = "auto";
-				el.style.height = `${el.scrollHeight}px`;
-			};
-			const save = () => {
-				if (saving) return;
-				setSaving(true);
-				onSave(text).then((applied) => {
-					if (applied) onClose();
-					else setSaving(false);
-				});
-			};
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
-				open: true,
-				onClose,
-				title: BLOCK_TITLE[block.kind],
-				closeLabel: "关闭",
-				footer: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: MessageEditDialog_module_css_default.actions,
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-						variant: "outline",
-						onClick: onClose,
-						disabled: saving,
-						children: "取消"
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-						variant: "primary",
-						onClick: save,
-						disabled: saving,
-						children: saving ? "保存中…" : "保存"
-					})]
-				}),
-				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("textarea", {
-					ref: inputRef,
-					className: MessageEditDialog_module_css_default.input,
-					value: text,
-					onChange: (event) => {
-						setText(event.target.value);
-						autosize();
-					},
-					autoFocus: true,
-					rows: 4
-				})
-			});
-		}
-		//#endregion
 		//#region \0dsh-css:/Users/morlay/src/github.com/morlay/better-session/packages/ui-conversation-message-actions/src/client/chat-node/MessageItem.module.css.mjs
 		const css = ".okW0Ua_userRow{flex-direction:column;align-items:flex-end;gap:6px;display:flex}.okW0Ua_userStack{flex-direction:column;align-items:flex-end;gap:8px;min-width:0;max-width:min(525px,82%);display:flex}.okW0Ua_bubble{background:var(--dsw-specific-bubble);max-width:100%;color:var(--dsw-alias-label-primary);border-radius:22px;padding:10px 16px;font-size:16px;line-height:24px}.okW0Ua_contextRow,.okW0Ua_compactionRow{padding:2px 0}.okW0Ua_compactionButton{width:100%;min-width:0;height:24px;color:inherit;font:inherit;text-align:left;background:0 0;border:none;border-radius:6px;align-items:center;padding:0;display:flex}.okW0Ua_compactionButton:not(:disabled){cursor:pointer}.okW0Ua_compactionButton:not(:disabled):hover{background:var(--dsw-alias-interactive-bg-hover)}.okW0Ua_compactionLeading{width:16px;height:16px;color:var(--dsw-alias-label-secondary);flex:none;place-items:center;margin-right:6px;display:inline-grid}.okW0Ua_compactionContextIcon,.okW0Ua_compactionDisclosureIcon{grid-area:1/1;justify-content:center;align-items:center;display:inline-flex}.okW0Ua_compactionDisclosureIcon,.okW0Ua_compactionButton:not(:disabled):hover .okW0Ua_compactionContextIcon,.okW0Ua_compactionButton:not(:disabled):focus-visible .okW0Ua_compactionContextIcon{opacity:0}.okW0Ua_compactionButton:not(:disabled):hover .okW0Ua_compactionDisclosureIcon,.okW0Ua_compactionButton:not(:disabled):focus-visible .okW0Ua_compactionDisclosureIcon{opacity:1}.okW0Ua_compactionTitle{color:var(--dsw-alias-label-primary-dimmed);flex:none;font-size:14px;line-height:24px}.okW0Ua_compactionSep{background:var(--dsw-alias-label-caption);border-radius:1px;flex:none;width:2px;height:2px;margin:0 8px}.okW0Ua_compactionSummary{min-width:0;color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;flex:auto;font-size:14px;line-height:24px;overflow:hidden}.okW0Ua_compactionBody{color:var(--dsw-alias-label-tertiary);padding:4px 0 4px 22px;font-size:14px;line-height:24px}.okW0Ua_retryRow{color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:20px}.okW0Ua_retrySummary{width:fit-content;color:inherit;cursor:pointer;user-select:none;border-radius:3px;align-items:center;gap:7px;padding:2px 0;list-style:none;display:inline-flex}.okW0Ua_retrySummary::-webkit-details-marker{display:none}.okW0Ua_retrySummary:after{content:\"\";opacity:.8;border-bottom:1.5px solid;border-right:1.5px solid;width:6px;height:6px;transition:transform .12s;transform:rotate(-45deg)}.okW0Ua_retrySummary:hover{color:var(--dsw-alias-label-secondary)}.okW0Ua_retrySummary:focus-visible{outline:1.5px solid var(--dsw-alias-button-info-fill);outline-offset:2px}.okW0Ua_retryText{color:inherit}.okW0Ua_retryRow[data-active] .okW0Ua_retryText{background:linear-gradient(90deg, var(--dsw-alias-label-tertiary) 0%, var(--dsw-alias-label-tertiary) 40%, var(--dsw-alias-label-secondary) 50%, var(--dsw-alias-label-tertiary) 60%, var(--dsw-alias-label-tertiary) 100%);color:#0000;background-position:100%;background-size:200% 100%;background-clip:text;animation:1.6s ease-in-out infinite okW0Ua_retry-shimmer}.okW0Ua_retryRow[open] .okW0Ua_retrySummary:after{transform:rotate(45deg)}.okW0Ua_retryDetails{overflow-wrap:anywhere;gap:2px;margin-top:3px;padding-left:14px;font-size:12px;line-height:18px;display:grid}.okW0Ua_retryDetailLabel{color:var(--dsw-alias-label-secondary)}.okW0Ua_turnErrorRow{grid-template-columns:10px minmax(0,1fr) auto;align-items:start;gap:8px;padding:2px 0;font-size:13px;line-height:20px;display:grid}.okW0Ua_turnErrorDot{margin-top:5px}.okW0Ua_turnErrorCopy{overflow-wrap:anywhere;min-width:0}.okW0Ua_turnErrorTitle{color:var(--dsw-alias-state-error-primary);margin-right:6px;font-weight:600}.okW0Ua_turnErrorMessage{color:var(--dsw-alias-label-secondary)}.okW0Ua_turnErrorCode{color:var(--dsw-alias-label-tertiary);font:var(--dsw-font-markdown-code-block-small)}.okW0Ua_maxTokensTitle{color:var(--dsw-alias-state-warn-primary);margin-right:6px;font-weight:600}@keyframes okW0Ua_retry-shimmer{0%{background-position:100%}to{background-position:0}}@media (prefers-reduced-motion:reduce){.okW0Ua_retryRow[data-active] .okW0Ua_retryText{color:inherit;background:0 0;animation:none}}.okW0Ua_refChip{color:var(--dsw-alias-label-primary);white-space:nowrap;vertical-align:baseline;background:#6187d838;border-radius:6px;margin:0 2px;padding:0 8px;font-size:.85em;line-height:1.6;display:inline-block}.okW0Ua_confirmActions{justify-content:flex-end;gap:8px;display:flex}";
 		const tagId = "@morlay/ui-conversation-message-actions/MessageItem.module.css";
@@ -580,34 +525,34 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var MessageItem_module_css_default = {
-			"compactionContextIcon": "okW0Ua_compactionContextIcon",
+			"retrySummary": "okW0Ua_retrySummary",
+			"compactionButton": "okW0Ua_compactionButton",
+			"contextRow": "okW0Ua_contextRow",
+			"retryDetailLabel": "okW0Ua_retryDetailLabel",
+			"compactionTitle": "okW0Ua_compactionTitle",
+			"compactionRow": "okW0Ua_compactionRow",
+			"turnErrorCopy": "okW0Ua_turnErrorCopy",
+			"retryDetails": "okW0Ua_retryDetails",
 			"compactionDisclosureIcon": "okW0Ua_compactionDisclosureIcon",
 			"compactionBody": "okW0Ua_compactionBody",
-			"retryDetails": "okW0Ua_retryDetails",
-			"turnErrorMessage": "okW0Ua_turnErrorMessage",
-			"retryRow": "okW0Ua_retryRow",
+			"retry-shimmer": "okW0Ua_retry-shimmer",
 			"bubble": "okW0Ua_bubble",
-			"retryText": "okW0Ua_retryText",
-			"turnErrorCode": "okW0Ua_turnErrorCode",
-			"turnErrorRow": "okW0Ua_turnErrorRow",
-			"maxTokensTitle": "okW0Ua_maxTokensTitle",
-			"turnErrorCopy": "okW0Ua_turnErrorCopy",
-			"compactionSummary": "okW0Ua_compactionSummary",
 			"userRow": "okW0Ua_userRow",
 			"compactionSep": "okW0Ua_compactionSep",
-			"compactionButton": "okW0Ua_compactionButton",
-			"contextRow": "okW0Ua_contextRow",
-			"refChip": "okW0Ua_refChip",
-			"userStack": "okW0Ua_userStack",
-			"retry-shimmer": "okW0Ua_retry-shimmer",
+			"retryRow": "okW0Ua_retryRow",
+			"compactionSummary": "okW0Ua_compactionSummary",
+			"turnErrorTitle": "okW0Ua_turnErrorTitle",
+			"turnErrorCode": "okW0Ua_turnErrorCode",
 			"compactionLeading": "okW0Ua_compactionLeading",
-			"compactionRow": "okW0Ua_compactionRow",
-			"retrySummary": "okW0Ua_retrySummary",
+			"turnErrorRow": "okW0Ua_turnErrorRow",
+			"maxTokensTitle": "okW0Ua_maxTokensTitle",
+			"turnErrorMessage": "okW0Ua_turnErrorMessage",
+			"compactionContextIcon": "okW0Ua_compactionContextIcon",
 			"confirmActions": "okW0Ua_confirmActions",
-			"retryDetailLabel": "okW0Ua_retryDetailLabel",
 			"turnErrorDot": "okW0Ua_turnErrorDot",
-			"turnErrorTitle": "okW0Ua_turnErrorTitle",
-			"compactionTitle": "okW0Ua_compactionTitle"
+			"refChip": "okW0Ua_refChip",
+			"retryText": "okW0Ua_retryText",
+			"userStack": "okW0Ua_userStack"
 		};
 		//#endregion
 		//#region src/client/chat-node/MessageItem.tsx
@@ -670,9 +615,9 @@ window.__ModuleLoader__.load({
 				}), actions?.(text)]
 			});
 		}
-		const UserMessageNodeView = (0, react.memo)(function UserMessageNodeView({ node, renderMessageImages, t, edit, retry }) {
+		const UserMessageNodeView = (0, react.memo)(function UserMessageNodeView({ node, renderMessageImages, t, recall, retry }) {
 			const data = node.data;
-			const [editing, setEditing] = (0, react.useState)(null);
+			const [confirmingRecall, setConfirmingRecall] = (0, react.useState)(null);
 			const [confirmingRetry, setConfirmingRetry] = (0, react.useState)(false);
 			const turnLocation = node.location.kind === "turn" || node.location.kind === "step" ? node.location.turn : void 0;
 			const turn = turnLocation?.turn;
@@ -680,7 +625,7 @@ window.__ModuleLoader__.load({
 			const textBlockIndex = data.content.findIndex((block) => block.type === "text");
 			const textBlock = textBlockIndex === -1 ? void 0 : data.content[textBlockIndex];
 			const onEdit = textBlock === void 0 || turn === void 0 ? void 0 : () => {
-				setEditing({
+				setConfirmingRecall({
 					key: `${node.anchorSeq}:${String(textBlockIndex)}`,
 					turn,
 					eventSeq: node.anchorSeq,
@@ -694,10 +639,28 @@ window.__ModuleLoader__.load({
 				setConfirmingRetry(true);
 			} : void 0;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-				editing !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MessageEditDialog, {
-					block: editing,
-					onSave: (text) => edit(editing, text, "truncate"),
-					onClose: () => setEditing(null)
+				confirmingRecall !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
+					open: true,
+					onClose: () => setConfirmingRecall(null),
+					title: "编辑消息",
+					closeLabel: "关闭",
+					description: "将撤回该消息及其之后的对话内容到输入框，请修改后重新发送。",
+					footer: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: MessageItem_module_css_default.confirmActions,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							variant: "outline",
+							onClick: () => setConfirmingRecall(null),
+							children: "取消"
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							variant: "primary",
+							onClick: () => {
+								const target = confirmingRecall;
+								setConfirmingRecall(null);
+								recall(target);
+							},
+							children: "撤回并编辑"
+						})]
+					})
 				}),
 				confirmingRetry && turn !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
 					open: true,

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { _ as SessionEditorOperation, d as EditOperation, f as EditableMessageBlock, g as RewindOperation, h as RetryableTurn, m as RetryOperation, o as editableMessages, p as RerollOperation, r as closedTurns, u as retryableTurns, v as SessionEditorResult } from "./plan-BdU_mnTv.mjs";
+import { _ as RewindOperation, d as EditOperation, f as EditableMessageBlock, g as RetryableTurn, h as RetryOperation, m as RerollOperation, o as editableMessages, p as RecallOperation, r as closedTurns, u as retryableTurns, v as SessionEditorOperation, y as SessionEditorResult } from "./plan-Cn3TPTa0.mjs";
 import { Context, Service } from "@deepseek-ai/cordis";
 import { Session, SessionEvent, SessionId } from "@deepseek-ai/dsh-session";
 import { BranchBoundary, BranchTimeline, BranchTimeline as BranchTimeline$1, CascadePolicy, EditableBlockKind, SESSION_BRANCH_VERSION_SCHEMA, SessionBranchVersionEvent } from "@morlay/session-branch";
@@ -58,9 +58,21 @@ declare class SessionEditor extends Service {
   edit(operation: EditOperation, signal?: AbortSignal): Promise<SessionEditorResult>;
   reroll(operation: RerollOperation, signal?: AbortSignal): Promise<SessionEditorResult>;
   retry(operation: RetryOperation, signal?: AbortSignal): Promise<SessionEditorResult>;
+  recall(operation: RecallOperation, signal?: AbortSignal): Promise<SessionEditorResult>;
   editableMessages(sessionId: SessionId, signal?: AbortSignal): Promise<EditableMessageBlock[]>;
   retryableTurns(sessionId: SessionId, signal?: AbortSignal): Promise<RetryableTurn[]>;
   private branchOperation;
+  /**
+   * 撤回（recall）：只 rewind 截断，不重写、不重放——被撤回的 user 消息文本
+   * 由客户端回填到输入框，交给用户修改后重新发送。
+   *
+   * 边界与 edit 的轮首 user 一致：轮首消息整轮截断到前一轮 `turn/end`
+   * （无前轮则 -1），轮内 followup 只截断到该消息本身（exclusive drop），
+   * 避免留下悬空 `turn/start` 让下一次发送开到错误轮号。
+   */
+  private recallOperation;
+  /** rewind 前等待驻留 agent 到达 quiescence（无 agent / 无 live owner 时空操作）。 */
+  private prepareIdle;
   private readEvents;
   /**
    * rewind 前确保 agent 可驱动重放：live agent 先等待其停下（rewind 会截断其
@@ -94,4 +106,4 @@ declare module "@deepseek-ai/cordis" {
   }
 }
 //#endregion
-export { type BranchTimeline, type CascadePolicy, type EditOperation, type EditableBlockKind, type EditableMessageBlock, EditorAgent, EditorAgentHandle, EditorAgentRegistry, type RerollOperation, type RetryOperation, type RetryableTurn, type RewindOperation, SESSION_BRANCH_VERSION_SCHEMA, type SessionBranchVersionEvent, SessionEditor, SessionEditor as default, type SessionEditorOperation, type SessionEditorResult, closedTurns, editableMessages, retryableTurns };
+export { type BranchTimeline, type CascadePolicy, type EditOperation, type EditableBlockKind, type EditableMessageBlock, EditorAgent, EditorAgentHandle, EditorAgentRegistry, type RecallOperation, type RerollOperation, type RetryOperation, type RetryableTurn, type RewindOperation, SESSION_BRANCH_VERSION_SCHEMA, type SessionBranchVersionEvent, SessionEditor, SessionEditor as default, type SessionEditorOperation, type SessionEditorResult, closedTurns, editableMessages, retryableTurns };

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { n as SessionEditor, t as SESSION_BRANCH_VERSION_SCHEMA } from "./src-ks167MhO.mjs";
+import { n as SessionEditor, t as SESSION_BRANCH_VERSION_SCHEMA } from "./src-Dq1X3rOO.mjs";
 import { closedTurns, editableMessages, retryableTurns } from "./plan.mjs";
 export { SESSION_BRANCH_VERSION_SCHEMA, SessionEditor, SessionEditor as default, closedTurns, editableMessages, retryableTurns };

package/dist/{plan-BdU_mnTv.d.mts → plan-Cn3TPTa0.d.mts}

@@ -25,13 +25,18 @@ interface RewindOperation {
   sessionId: SessionId;
   toBoundary: number;
 }
+interface RecallOperation {
+  action: "recall";
+  sessionId: SessionId;
+  eventSeq: number;
+}
 interface ForkOperation {
   action: "fork";
   sessionId: SessionId;
   atSeq?: number;
   childSessionId?: SessionId;
 }
-type SessionEditorOperation = EditOperation | RerollOperation | RetryOperation | RewindOperation | ForkOperation;
+type SessionEditorOperation = EditOperation | RerollOperation | RetryOperation | RewindOperation | RecallOperation | ForkOperation;
 interface SessionEditorResult {
   sessionId: SessionId;
   queuedTurns: number;
@@ -90,4 +95,4 @@ declare function editPlan(operation: EditOperation, turns: readonly ClosedTurn[]
 declare function retryPlan(operation: RetryOperation, turns: readonly ClosedTurn[]): OperationPlan;
 declare function rerollPlan(operation: RerollOperation, turns: readonly ClosedTurn[]): OperationPlan;
 //#endregion
-export { SessionEditorOperation as _, editPlan as a, rerollPlan as c, EditOperation as d, EditableMessageBlock as f, RewindOperation as g, RetryableTurn as h, downstreamUsers as i, retryPlan as l, RetryOperation as m, OperationPlan as n, editableMessages as o, RerollOperation as p, closedTurns as r, precedingContentIndex as s, ClosedTurn as t, retryableTurns as u, SessionEditorResult as v };
+export { RewindOperation as _, editPlan as a, rerollPlan as c, EditOperation as d, EditableMessageBlock as f, RetryableTurn as g, RetryOperation as h, downstreamUsers as i, retryPlan as l, RerollOperation as m, OperationPlan as n, editableMessages as o, RecallOperation as p, closedTurns as r, precedingContentIndex as s, ClosedTurn as t, retryableTurns as u, SessionEditorOperation as v, SessionEditorResult as y };

package/dist/plan.d.mts

@@ -1,2 +1,2 @@
-import { a as editPlan, c as rerollPlan, i as downstreamUsers, l as retryPlan, n as OperationPlan, o as editableMessages, r as closedTurns, s as precedingContentIndex, t as ClosedTurn, u as retryableTurns } from "./plan-BdU_mnTv.mjs";
+import { a as editPlan, c as rerollPlan, i as downstreamUsers, l as retryPlan, n as OperationPlan, o as editableMessages, r as closedTurns, s as precedingContentIndex, t as ClosedTurn, u as retryableTurns } from "./plan-Cn3TPTa0.mjs";
 export { ClosedTurn, OperationPlan, closedTurns, downstreamUsers, editPlan, editableMessages, precedingContentIndex, rerollPlan, retryPlan, retryableTurns };

package/dist/{src-ks167MhO.mjs → src-Dq1X3rOO.mjs}

@@ -159,6 +159,9 @@ var SessionEditor = class extends Service {
 	retry(operation, signal) {
 		return this.branchOperation(operation, signal);
 	}
+	recall(operation, signal) {
+		return this.recallOperation(operation, signal);
+	}
 	async editableMessages(sessionId, signal) {
 		const events = await this.readEvents(sessionId, signal);
 		return editableMessages(closedTurns(events));
@@ -225,6 +228,41 @@ var SessionEditor = class extends Service {
 			live: this.ctx.sessions.get(operation.sessionId) !== void 0
 		};
 	}
+	/**
+	* 撤回（recall）：只 rewind 截断，不重写、不重放——被撤回的 user 消息文本
+	* 由客户端回填到输入框，交给用户修改后重新发送。
+	*
+	* 边界与 edit 的轮首 user 一致：轮首消息整轮截断到前一轮 `turn/end`
+	* （无前轮则 -1），轮内 followup 只截断到该消息本身（exclusive drop），
+	* 避免留下悬空 `turn/start` 让下一次发送开到错误轮号。
+	*/
+	async recallOperation(operation, signal) {
+		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 === void 0 || operation.eventSeq < turn.endSeq));
+		const turn = turns[turnIndex];
+		if (turn === void 0) 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;
+		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) !== void 0
+		};
+	}
+	/** rewind 前等待驻留 agent 到达 quiescence（无 agent / 无 live owner 时空操作）。 */
+	async prepareIdle(sessionId, signal) {
+		signal?.throwIfAborted();
+		const existing = this.ctx.get("agents")?.get(sessionId);
+		if (existing === void 0) return;
+		await existing.whenIdle();
+		signal?.throwIfAborted();
+	}
 	async readEvents(sessionId, signal) {
 		const live = this.ctx.sessions.get(sessionId);
 		if (live !== void 0) return live.snapshotEvents();
@@ -320,13 +358,18 @@ function decodeOperation(value) {
 			sessionId,
 			toBoundary: integerOf(record["toBoundary"], "toBoundary")
 		};
+		case "recall": return {
+			action: "recall",
+			sessionId,
+			eventSeq: integerOf(record["eventSeq"], "eventSeq")
+		};
 		case "fork": return {
 			action: "fork",
 			sessionId,
 			...record["atSeq"] === void 0 ? {} : { atSeq: integerOf(record["atSeq"], "atSeq") },
 			...record["childSessionId"] === void 0 ? {} : { childSessionId: sessionIdOf(record["childSessionId"]) }
 		};
-		default: throw new TypeError("action 必须是 edit、reroll、retry、rewind 或 fork。");
+		default: throw new TypeError("action 必须是 edit、reroll、retry、rewind、recall 或 fork。");
 	}
 }
 function requestJson(request) {
@@ -389,6 +432,14 @@ async function runOperation(editor, operation) {
 				sessionId: operation.sessionId,
 				queuedTurns: 0
 			};
+		case "recall": {
+			const result = await editor.recall(operation);
+			return {
+				sessionId: result.sessionId,
+				queuedTurns: result.queuedTurns,
+				...result.live === void 0 ? {} : { live: result.live }
+			};
+		}
 		case "fork": return {
 			sessionId: await editor.fork(operation.sessionId, operation.atSeq, operation.childSessionId),
 			queuedTurns: 0