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

package/locale/en.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "Message Actions",
+    "description": "Rewind / retry / fork orchestration on the host side, plus the user-bubble renderer replacement in the browser."
+  }
+}

package/locale/zh.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "消息动作",
+    "description": "host 侧的 rewind / retry / fork 编排，以及浏览器侧 user 消息气泡的渲染替换。"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/ui-conversation-message-actions",
-  "version": "0.0.19-alpha.5",
+  "version": "0.0.19-alpha.7",
   "description": "Rewind / retry / fork orchestration (host) plus conversation.chat.node renderer replacement (browser) — message edit / retry actions on user bubbles.",
   "keywords": [
     "conversation-chat-node",
@@ -19,6 +19,7 @@
     "url": "https://github.com/morlay/dsh-plugin.git"
   },
   "files": [
+    "locale/*.json",
     "dist",
     "src",
     "cordis.patch.yml",
@@ -35,40 +36,41 @@
     "./client": {
       "types": "./dist/client.d.cts",
       "default": "./dist/client.cjs"
-    }
+    },
+    "./locale/*.json": "./locale/*.json"
   },
   "dependencies": {
-    "@morlay/session-branch": "0.0.10-alpha.5"
+    "@morlay/session-branch": "0.0.10-alpha.7"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-session-stats": "0.1.6-alpha.2",
-    "@morlay/dsh-client-ui-primitives": "0.0.2-alpha.5",
-    "@morlay/session-rdb": "0.0.21-alpha.5",
+    "@deepseek-ai/dsh-session-stats": "0.1.7-alpha.2",
+    "@morlay/dsh-client-ui-primitives": "0.0.2-alpha.7",
+    "@morlay/session-rdb": "0.0.21-alpha.7",
     "@types/react": "~18.3.1",
     "@types/react-dom": "~18.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-api-session-controller": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-attachment": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-connection": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-store": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-attachment": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-chat": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-workspace": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-invariants": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-llm": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-session": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-session-persistence": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-session-projection": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-token-meter": "0.1.6-alpha.2",
-    "@morlay/dsh-client-ui-conversation": "0.0.2-alpha.5",
-    "@morlay/dsh-client-ui-primitives": "0.0.2-alpha.5"
+    "@deepseek-ai/cordis": "4.0.4",
+    "@deepseek-ai/dsh-api-session-controller": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-attachment": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-client-store": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-client-ui-attachment": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-client-ui-chat": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-client-ui-workspace": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-invariants": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-persistence": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-projection": "0.1.7-alpha.2",
+    "@deepseek-ai/dsh-token-meter": "0.1.7-alpha.2",
+    "@morlay/dsh-client-ui-conversation": "0.0.2-alpha.7",
+    "@morlay/dsh-client-ui-primitives": "0.0.2-alpha.7"
   },
   "dsh": {
     "bundle": {

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

@@ -4,21 +4,16 @@
 import { styling } from "@morlay/dsh-client-ui-primitives/client";
 import { useCallback, useEffect, useId, useRef, useState, type ReactNode } from "react";
 import {
-  IconBranchOutline16,
-  IconCheckOutline16,
-  IconCopyOutline16,
-  IconEditOutline16,
-  IconRefreshOutline16,
+  IconBranchOutlineRegular,
+  IconCheckOutlineRegular,
+  IconCopyOutlineRegular,
+  IconEditOutlineRegular,
+  IconRefreshOutlineRegular,
   Tooltip,
   writeClipboard,
 } from "@deepseek-ai/dsh-client-ui-primitives";
 import type { ChatViewSlotProps } from "@deepseek-ai/dsh-client-ui-chat/client";
-import {
-  formatLatencySeconds,
-  formatMessageClock,
-  formatRunDuration,
-  formatTokensPerSecond,
-} from "./message-chrome.ts";
+import { formatMessageClock } from "./message-chrome.ts";
 import { useCalendarDay } from "./use-calendar-day.ts";
 import { styles } from "./MessageIconActions.styles.ts";
 
@@ -27,12 +22,6 @@ export interface MessageIconActionsProps {
 
   time?: number | undefined;
 
-  runMs?: number | undefined;
-
-  ttftMs?: number | undefined;
-
-  tokensPerSecond?: number | undefined;
-
   clock: "start" | "end";
 
   onBranch?: (() => void) | undefined;
@@ -53,9 +42,6 @@ export interface MessageIconActionsProps {
 export function MessageIconActions({
   text,
   time,
-  runMs,
-  ttftMs,
-  tokensPerSecond,
   clock,
   onBranch,
   branchUnavailable = false,
@@ -96,10 +82,8 @@ export function MessageIconActions({
       }, 1000);
     });
   }, [copied, text]);
-  // The dot is decorative and stays hidden, but its margins separate the
-  // readings only on screen: without the flanking spaces a reader hears one
-  // run-on string ("Ran for 13sTime to first token (TTFT) 0.2s12 tok/s")
-  // instead of three facts.
+  // 只剩时钟：耗时 / TTFT / tok-s 的读数在 0.1.7 已不属于消息 chrome（上游把它们收进
+  // 会话统计弹窗与轮次过程节点），上游那套聊天文案表也不再提供这三个 key。
   const clockEl =
     time === undefined ? null : (
       <span
@@ -107,34 +91,6 @@ export function MessageIconActions({
         {...styling.props(clock === "start" ? styles.timeStart : styles.timeEnd)}
       >
         {formatMessageClock(time, t, day)}
-        {runMs !== undefined && (
-          <>
-            {" "}
-            <span {...styling.props(styles.runTimeDot)} aria-hidden>
-              ·
-            </span>{" "}
-            {t("message.ranFor", { duration: formatRunDuration(runMs, t) })}
-          </>
-        )}
-        {ttftMs !== undefined && (
-          <>
-            {" "}
-            <span {...styling.props(styles.runTimeDot)} aria-hidden>
-              ·
-            </span>{" "}
-            {t("message.turnTime.ttft")}{" "}
-            {t("duration.seconds", { seconds: formatLatencySeconds(ttftMs) })}
-          </>
-        )}
-        {tokensPerSecond !== undefined && (
-          <>
-            {" "}
-            <span {...styling.props(styles.runTimeDot)} aria-hidden>
-              ·
-            </span>{" "}
-            {t("message.tokensPerSecond", { tps: formatTokensPerSecond(tokensPerSecond) })}
-          </>
-        )}
       </span>
     );
   // 外部 className 需要拼接：给 actions 一个真实类名（而不是 data-css 属性）。
@@ -152,7 +108,7 @@ export function MessageIconActions({
           aria-label={copied ? t("copied" as never) : t("copy" as never)}
           onClick={onCopy}
         >
-          {copied ? <IconCheckOutline16 /> : <IconCopyOutline16 />}
+          {copied ? <IconCheckOutlineRegular /> : <IconCopyOutlineRegular />}
         </button>
       </Tooltip>
       {extraActions}
@@ -164,7 +120,7 @@ export function MessageIconActions({
             aria-label="编辑"
             onClick={onEdit}
           >
-            <IconEditOutline16 />
+            <IconEditOutlineRegular />
           </button>
         </Tooltip>
       )}
@@ -176,7 +132,7 @@ export function MessageIconActions({
             aria-label="重试此回合"
             onClick={onRetry}
           >
-            <IconRefreshOutline16 />
+            <IconRefreshOutlineRegular />
           </button>
         </Tooltip>
       )}
@@ -195,7 +151,7 @@ export function MessageIconActions({
             data-unavailable={branchUnavailable || undefined}
             onClick={branchUnavailable ? undefined : onBranch}
           >
-            <IconBranchOutline16 />
+            <IconBranchOutlineRegular />
           </button>
         </Tooltip>
       )}

package/src/client/chat-node/message-chrome.ts

@@ -2,7 +2,6 @@ import type { Translate } from "@deepseek-ai/dsh-client-ui-slots";
 
 export type ClockTranslate = Translate<"clock.md" | "clock.ymd">;
 
-export type RunDurationTranslate = Translate<"duration.seconds" | "duration.minutes">;
 function pad2(n: number): string {
   return String(n).padStart(2, "0");
 }
@@ -19,20 +18,6 @@ export function msUntilNextLocalMidnight(ms: number): number {
   return Math.max(next.getTime() - ms, 1);
 }
 
-export function formatRunDuration(ms: number, t: RunDurationTranslate): string {
-  const total = Math.max(0, Math.floor(ms / 1000));
-  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 });
-}
-
-export function formatLatencySeconds(ms: number): string {
-  const s = Math.max(0, ms) / 1000;
-  return s < 10 ? String(Math.round(s * 10) / 10) : String(Math.round(s));
-}
-
 export function formatTokensPerSecond(tps: number): string {
   const clamped = Math.max(0, tps);
   return clamped >= 10 ? String(Math.round(clamped)) : String(Math.round(clamped * 10) / 10);

package/src/client/composer-stats/StatsPills.tsx

@@ -3,12 +3,13 @@
 // database pill (total tokens + cache hit) opening the token-usage dialog.
 // Settled-node identity prevents stream-delta updates from rerendering the row.
 // Carried from upstream ui-chat (composer.dock id 'stats', priority -1 shadows it)
-// so the fixed token-format (out-of-range cacheRead no longer hangs) stays wired;
-// data-composer-stats pairs with ui-conversation's InputBar `:has()` bottom clearance.
+// so the fixed token-format (out-of-range cacheRead no longer hangs) stays wired.
+// `data-composer-stats` stays as this row's stable anchor (style/test hooks) — the InputBar it once
+// paired with is upstream's again, so nothing tightens the composer clearance off it any more.
 
 import { memo, useMemo, useState } from "react";
 import { createPortal } from "react-dom";
-import { IconDatabaseOutline16, IconGaugeOutline16 } from "@deepseek-ai/dsh-client-ui-primitives";
+import { IconDatabaseOutlineRegular, IconGaugeOutlineRegular } from "@deepseek-ai/dsh-client-ui-primitives";
 import type { UseProjection } from "@deepseek-ai/dsh-api-session-controller/client";
 import type { SnapshotSelectorHook } from "@deepseek-ai/dsh-client-ui-slots";
 // Type-only: merges the sessionStats key into SessionProjectionMap for useProjection.
@@ -172,7 +173,7 @@ function TimePill({
     return (
       <span {...styling.props(styles.anchor)}>
         <span {...styling.props(styles.pill)}>
-          <IconGaugeOutline16 />
+          <IconGaugeOutlineRegular />
           {label}
         </span>
       </span>
@@ -190,7 +191,7 @@ function TimePill({
           setOpen(!open);
         }}
       >
-        <IconGaugeOutline16 />
+        <IconGaugeOutlineRegular />
         {label}
       </button>
       {open &&
@@ -204,7 +205,7 @@ function TimePill({
           >
             <div {...styling.props(dialogStyles.title)}>
               <span {...styling.props(dialogStyles.titleLabel)}>
-                <IconGaugeOutline16 />
+                <IconGaugeOutlineRegular />
                 {t("stats.dialog.title")}
               </span>
             </div>
@@ -273,7 +274,7 @@ function UsagePill({
           setOpen(!open);
         }}
       >
-        <IconDatabaseOutline16 />
+        <IconDatabaseOutlineRegular />
         <span {...styling.props(styles.label)}>
           {totalText}
           {cacheHitText !== null && (
@@ -297,7 +298,7 @@ function UsagePill({
           >
             <div {...styling.props(dialogStyles.title)}>
               <span {...styling.props(dialogStyles.titleLabel)}>
-                <IconDatabaseOutline16 />
+                <IconDatabaseOutlineRegular />
                 {t("stats.dialog.usageTitle")}
               </span>
               <span {...styling.props(dialogStyles.titleValue)}>{exactCount(total, t)}</span>
@@ -351,8 +352,7 @@ export const StatsPills = memo(function StatsPills({ useChat, useProjection, t }
   // billing (e.g. every request failed) shows its counts without a usage pill.
   const hasTokens = usage !== undefined && (billedInputTokens(usage) > 0 || usage.outputTokens > 0);
   if (stats.steps === 0 && !hasTokens) return null;
-  // data-composer-stats: InputBar's `.root:has([data-composer-stats])` rule
-  // tightens the composer's bottom clearance only while this row renders.
+  // data-composer-stats: 这一行的稳定锚点（样式 / 测试定位用）。
   return (
     <div {...styling.props(styles.root)} data-composer-stats>
       {stats.steps > 0 && (

package/src/client/controller.ts

@@ -41,14 +41,22 @@ export class SessionEditorController {
     this.face = {
       retry: (turn, cascade) =>
         this.mutate({ action: "retry", sessionId: this.sessionId, 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),
     };
   }
 
+  private async recallAndEdit(
+    message: EditableMessageBlock,
+    texts: readonly string[],
+  ): Promise<boolean> {
+    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;
+  }
+
   private async mutate(
     operation: SessionEditorOperation,
     onApplied?: () => void,
@@ -114,6 +122,24 @@ export class SessionEditorController {
     );
   }
 
+  /**
+   * 撤回后把会话视口送回底部：rewind 把窗口换短，而上游 ChatView 只在读者已经贴底时
+   * 才跟随（`tipMoved && atBottom`），停在中途的视口会悬在被截断的位置上；撤回的下一步
+   * 是改完再发，所以这里无条件送到底。容器用上游既有契约 `[data-conversation-scroll]`
+   * （ChatView / ConversationWidthControls / StatsPills 同用）。
+   *
+   * 窗口替换的渲染落在 resync 之后：写早了会被下一轮布局覆盖，因此等两帧再写。
+   */
+  private returnViewportToEnd(): void {
+    const scrollport = document.querySelector<HTMLElement>("[data-conversation-scroll]");
+    if (scrollport === null) return;
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => {
+        scrollport.scrollTop = scrollport.scrollHeight;
+      });
+    });
+  }
+
   private setComposerDraft(text: string): void {
     if (this.sessions.binding(this.sessionId) === undefined) return;
     const scoped = this.sessions.scope(this.sessionId);

package/src/index.ts

@@ -179,7 +179,7 @@ export class SessionEditor extends Service {
   constructor(ctx: Context) {
     super(ctx, "sessionEditor");
 
-    registerHttpRoutes(ctx);
+    registerHttpRoutes(ctx, this);
   }
 
   readBranchPrefix(
@@ -643,17 +643,22 @@ async function handleRoute(
   }
 }
 
-function registerHttpRoutes(ctx: Context): void {
-  ctx.effect(() => {
+function registerHttpRoutes(ctx: Context, editor: SessionEditor): void {
+  // webServer **必须等**：它可能比本行晚激活，而 `ctx.get` 取到 undefined 之后不会再试一次——路由没注册的
+  // 后果是请求落到 frontend-static 的 fallback，非 GET/HEAD 一律 405（编辑撤回 / 重试就是这个症状）。
+  ctx.inject(["webServer"], (scope) => {
     // webServer 的类型由上游 @deepseek-ai/dsh-host-webserver 声明（`Context.webServer: WebServer`）；
     // 这里只按用到的 register 面做结构转换，不再 declare module 覆盖，否则两处声明冲突（TS2717）。
-    const webServer = ctx.get("webServer") as unknown as HttpServerLike | undefined;
-    if (webServer === undefined) return () => {};
-    const editor = ctx.sessionEditor;
-    return webServer.register({
-      kind: "exact",
-      path: SESSION_EDITOR_PATH,
-      handler: (request, response) => handleRoute(editor, request, response),
-    });
-  }, "session-editor: HTTP route");
+    const webServer = scope.get("webServer") as unknown as HttpServerLike | undefined;
+    if (webServer === undefined) return;
+    scope.effect(
+      () =>
+        webServer.register({
+          kind: "exact",
+          path: SESSION_EDITOR_PATH,
+          handler: (request, response) => handleRoute(editor, request, response),
+        }),
+      "session-editor: HTTP route",
+    );
+  });
 }

package/src/plan.ts

@@ -52,7 +52,7 @@ function userText(message: UserMessage): string {
 
 function cloneUser(
   message: UserMessage,
-  content: ContentBlock[] = structuredClone(message.content),
+  content: readonly ContentBlock[] = structuredClone(message.content) as ContentBlock[],
 ): UserMessage {
   return Object.freeze({
     id: randomUUID(),

package/src/testing.ts

@@ -11,7 +11,7 @@ import {
 import SessionProjectionRegistry from "@deepseek-ai/dsh-session-projection";
 import SessionPersistenceSqlite from "@morlay/session-rdb";
 import { parseJsonlArtifact } from "@morlay/session-rdb/artifact";
-import { EmptySettings, meta, oneTurnLog } from "@morlay/session-rdb/testing";
+import { meta, oneTurnLog } from "@morlay/session-rdb/testing";
 import { SESSION_EDITOR_PATH } from "./shared.ts";
 import { SessionEditor } from "@morlay/ui-conversation-message-actions";
 
@@ -22,7 +22,6 @@ export {
   SessionSeq,
   SessionStore,
   TokenMeter,
-  EmptySettings,
   meta,
   oneTurnLog,
   parseJsonlArtifact,
@@ -37,7 +36,6 @@ export interface Harness {
 
 export async function harness(provide?: (ctx: Context) => void): Promise<Harness> {
   const ctx = new Context();
-  await ctx.plugin(EmptySettings);
   await ctx.plugin(SessionStore);
   new SessionProjectionRegistry(ctx);
   const fiber = await ctx.plugin(SessionPersistenceSqlite, { type: "sqlite", path: ":memory:" });
@@ -87,7 +85,7 @@ export function userMessage(seq: number, id: string, text: string, time = seq):
       source: { kind: "user" },
     },
     surfaceOp: "append",
-  } as SessionEvent;
+  } as unknown as SessionEvent;
 }
 
 export function assistantMessage(