@morlay/ui-conversation-message-actions 0.0.19-alpha.5 → 0.0.19-alpha.6

package/dist/client.cjs

@@ -29,13 +29,18 @@ window.__ModuleLoader__.load({
 						turn,
 						cascade
 					}),
-					recall: (message, texts) => this.mutate({
-						action: "recall",
-						sessionId: this.sessionId,
-						eventSeq: message.eventSeq
-					}, () => this.setComposerDraft(texts.join("\n\n")))
+					recall: (message, texts) => this.recallAndEdit(message, texts)
 				};
 			}
+			async recallAndEdit(message, texts) {
+				const applied = await this.mutate({
+					action: "recall",
+					sessionId: this.sessionId,
+					eventSeq: message.eventSeq
+				}, () => this.setComposerDraft(texts.join("\n\n")));
+				if (applied) this.returnViewportToEnd();
+				return applied;
+			}
 			async mutate(operation, onApplied) {
 				if (this.pending !== null) return false;
 				this.pending = operation.action;
@@ -86,6 +91,23 @@ window.__ModuleLoader__.load({
 				}
 				console.warn("[session-editor] 未找到会话窗口重建入口（binding.resync / refresh 都不可用），窗口可能停留在 rewind 之前的状态");
 			}
+			/**
+			* 撤回后把会话视口送回底部：rewind 把窗口换短，而上游 ChatView 只在读者已经贴底时
+			* 才跟随（`tipMoved && atBottom`），停在中途的视口会悬在被截断的位置上；撤回的下一步
+			* 是改完再发，所以这里无条件送到底。容器用上游既有契约 `[data-conversation-scroll]`
+			* （ChatView / ConversationWidthControls / StatsPills 同用）。
+			*
+			* 窗口替换的渲染落在 resync 之后：写早了会被下一轮布局覆盖，因此等两帧再写。
+			*/
+			returnViewportToEnd() {
+				const scrollport = document.querySelector("[data-conversation-scroll]");
+				if (scrollport === null) return;
+				requestAnimationFrame(() => {
+					requestAnimationFrame(() => {
+						scrollport.scrollTop = scrollport.scrollHeight;
+					});
+				});
+			}
 			setComposerDraft(text) {
 				if (this.sessions.binding(this.sessionId) === void 0) return;
 				const scoped = this.sessions.scope(this.sessionId);
@@ -108,19 +130,6 @@ window.__ModuleLoader__.load({
 			next.setHours(24, 0, 0, 0);
 			return Math.max(next.getTime() - ms, 1);
 		}
-		function formatRunDuration(ms, t) {
-			const total = Math.max(0, Math.floor(ms / 1e3));
-			const minutes = Math.floor(total / 60);
-			const seconds = total % 60;
-			return minutes > 0 ? t("duration.minutes", {
-				minutes,
-				seconds: String(seconds).padStart(2, "0")
-			}) : t("duration.seconds", { seconds });
-		}
-		function formatLatencySeconds(ms) {
-			const s = Math.max(0, ms) / 1e3;
-			return s < 10 ? String(Math.round(s * 10) / 10) : String(Math.round(s));
-		}
 		function formatTokensPerSecond(tps) {
 			const clamped = Math.max(0, tps);
 			return clamped >= 10 ? String(Math.round(clamped)) : String(Math.round(clamped * 10) / 10);
@@ -223,7 +232,7 @@ window.__ModuleLoader__.load({
 		};
 		//#endregion
 		//#region src/client/chat-node/MessageIconActions.tsx
-		function MessageIconActions({ text, time, runMs, ttftMs, tokensPerSecond, clock, onBranch, branchUnavailable = false, className, extraActions, onEdit, onRetry, t }) {
+		function MessageIconActions({ text, time, clock, onBranch, branchUnavailable = false, className, extraActions, onEdit, onRetry, t }) {
 			const day = useCalendarDay();
 			const reasonId = (0, react.useId)();
 			const [copied, setCopied] = (0, react.useState)(false);
@@ -250,44 +259,10 @@ window.__ModuleLoader__.load({
 					}, 1e3);
 				});
 			}, [copied, text]);
-			const clockEl = time === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+			const clockEl = time === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 				"data-time-label": "",
 				..._morlay_dsh_client_ui_primitives_client.styling.props(clock === "start" ? styles$3.timeStart : styles$3.timeEnd),
-				children: [
-					formatMessageClock(time, t, day),
-					runMs !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-						" ",
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							..._morlay_dsh_client_ui_primitives_client.styling.props(styles$3.runTimeDot),
-							"aria-hidden": true,
-							children: "·"
-						}),
-						" ",
-						t("message.ranFor", { duration: formatRunDuration(runMs, t) })
-					] }),
-					ttftMs !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-						" ",
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							..._morlay_dsh_client_ui_primitives_client.styling.props(styles$3.runTimeDot),
-							"aria-hidden": true,
-							children: "·"
-						}),
-						" ",
-						t("message.turnTime.ttft"),
-						" ",
-						t("duration.seconds", { seconds: formatLatencySeconds(ttftMs) })
-					] }),
-					tokensPerSecond !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-						" ",
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							..._morlay_dsh_client_ui_primitives_client.styling.props(styles$3.runTimeDot),
-							"aria-hidden": true,
-							children: "·"
-						}),
-						" ",
-						t("message.tokensPerSecond", { tps: formatTokensPerSecond(tokensPerSecond) })
-					] })
-				]
+				children: formatMessageClock(time, t, day)
 			});
 			const actionsClass = _morlay_dsh_client_ui_primitives_client.styling.className(styles$3.actions);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -303,7 +278,7 @@ window.__ModuleLoader__.load({
 							..._morlay_dsh_client_ui_primitives_client.styling.props(styles$3.action),
 							"aria-label": copied ? t("copied") : t("copy"),
 							onClick: onCopy,
-							children: copied ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutline16, {}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutline16, {})
+							children: copied ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutlineRegular, {}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCopyOutlineRegular, {})
 						})
 					}),
 					extraActions,
@@ -315,7 +290,7 @@ window.__ModuleLoader__.load({
 							..._morlay_dsh_client_ui_primitives_client.styling.props(styles$3.action),
 							"aria-label": "编辑",
 							onClick: onEdit,
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutline16, {})
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconEditOutlineRegular, {})
 						})
 					}),
 					onRetry !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
@@ -326,7 +301,7 @@ window.__ModuleLoader__.load({
 							..._morlay_dsh_client_ui_primitives_client.styling.props(styles$3.action),
 							"aria-label": "重试此回合",
 							onClick: onRetry,
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconRefreshOutline16, {})
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconRefreshOutlineRegular, {})
 						})
 					}),
 					onBranch !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
@@ -340,7 +315,7 @@ window.__ModuleLoader__.load({
 							"aria-describedby": branchUnavailable ? reasonId : void 0,
 							"data-unavailable": branchUnavailable || void 0,
 							onClick: branchUnavailable ? void 0 : onBranch,
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutline16, {})
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconBranchOutlineRegular, {})
 						})
 					}),
 					onBranch !== void 0 && branchUnavailable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -1052,7 +1027,7 @@ window.__ModuleLoader__.load({
 				..._morlay_dsh_client_ui_primitives_client.styling.props(styles$1.anchor),
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 					..._morlay_dsh_client_ui_primitives_client.styling.props(styles$1.pill),
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconGaugeOutline16, {}), label]
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconGaugeOutlineRegular, {}), label]
 				})
 			});
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
@@ -1067,7 +1042,7 @@ window.__ModuleLoader__.load({
 					onClick: () => {
 						setOpen(!open);
 					},
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconGaugeOutline16, {}), label]
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconGaugeOutlineRegular, {}), label]
 				}), open && (0, react_dom.createPortal)(/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					ref: panelRef,
 					..._morlay_dsh_client_ui_primitives_client.styling.props(styles.panel),
@@ -1079,7 +1054,7 @@ window.__ModuleLoader__.load({
 							..._morlay_dsh_client_ui_primitives_client.styling.props(styles.title),
 							children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 								..._morlay_dsh_client_ui_primitives_client.styling.props(styles.titleLabel),
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconGaugeOutline16, {}), t("stats.dialog.title")]
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconGaugeOutlineRegular, {}), t("stats.dialog.title")]
 							})
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -1118,7 +1093,7 @@ window.__ModuleLoader__.load({
 					onClick: () => {
 						setOpen(!open);
 					},
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconDatabaseOutline16, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconDatabaseOutlineRegular, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 						..._morlay_dsh_client_ui_primitives_client.styling.props(styles$1.label),
 						children: [totalText, cacheHitText !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							..._morlay_dsh_client_ui_primitives_client.styling.props(styles$1.sep),
@@ -1137,7 +1112,7 @@ window.__ModuleLoader__.load({
 							..._morlay_dsh_client_ui_primitives_client.styling.props(styles.title),
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 								..._morlay_dsh_client_ui_primitives_client.styling.props(styles.titleLabel),
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconDatabaseOutline16, {}), t("stats.dialog.usageTitle")]
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconDatabaseOutlineRegular, {}), t("stats.dialog.usageTitle")]
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								..._morlay_dsh_client_ui_primitives_client.styling.props(styles.titleValue),
 								children: exactCount(total, t)

package/dist/index.mjs

@@ -68,7 +68,7 @@ var SessionEditor = class extends Service {
 	];
 	constructor(ctx) {
 		super(ctx, "sessionEditor");
-		registerHttpRoutes(ctx);
+		registerHttpRoutes(ctx, this);
 	}
 	readBranchPrefix(id, atSeq, mode, signal) {
 		return this.ctx.sessionBranch.readBranchPrefix(id, atSeq, mode, signal);
@@ -367,17 +367,16 @@ async function handleRoute(editor, request, response) {
 		respondJson(response, error instanceof TypeError ? 400 : 409, { error: message });
 	}
 }
-function registerHttpRoutes(ctx) {
-	ctx.effect(() => {
-		const webServer = ctx.get("webServer");
-		if (webServer === void 0) return () => {};
-		const editor = ctx.sessionEditor;
-		return webServer.register({
+function registerHttpRoutes(ctx, editor) {
+	ctx.inject(["webServer"], (scope) => {
+		const webServer = scope.get("webServer");
+		if (webServer === void 0) return;
+		scope.effect(() => webServer.register({
 			kind: "exact",
 			path: SESSION_EDITOR_PATH,
 			handler: (request, response) => handleRoute(editor, request, response)
-		});
-	}, "session-editor: HTTP route");
+		}), "session-editor: HTTP route");
+	});
 }
 //#endregion
 export { SessionEditor, SessionEditor as default, closedTurns, editableMessages, retryableTurns };