@morlay/ui-conversation-message-actions 0.1.3 → 0.1.5

package/dist/{rolldown-runtime-BMI-E3GI.mjs → rolldown-runtime-Dr7-SnC6.mjs}

@@ -34,6 +34,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
@@ -41,4 +42,4 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __hasOwnProp.call(mod, "module.exports") ? mod["module.exports"] : __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
-export { __toCommonJS as a, __require as i, __esmMin as n, __toESM as o, __exportAll as r, __commonJSMin as t };
+export { __require as a, __reExport as i, __esmMin as n, __toCommonJS as o, __exportAll as r, __toESM as s, __commonJSMin as t };

package/dist/testing.mjs

@@ -1,4 +1,4 @@
-import { a as __toCommonJS, i as __require, n as __esmMin, o as __toESM, r as __exportAll, t as __commonJSMin } from "./rolldown-runtime-BMI-E3GI.mjs";
+import { a as __require, n as __esmMin, o as __toCommonJS, r as __exportAll, s as __toESM, t as __commonJSMin } from "./rolldown-runtime-Dr7-SnC6.mjs";
 import { t as SESSION_EDITOR_PATHS } from "./shared-DG86bLrc.mjs";
 import { SessionEditor } from "./index.mjs";
 import { Context, Service } from "@deepseek-ai/cordis";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/ui-conversation-message-actions",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Rewind / retry / recall / fork orchestration (host) plus the browser half — replaces the conversation.chat.node user / steering rendering and overrides the conversation.composer.dock stats row.",
   "keywords": [
     "conversation-chat-node",
@@ -38,12 +38,13 @@
     "./locale/*.json": "./locale/*.json"
   },
   "dependencies": {
-    "@morlay/session-branch": "0.1.3"
+    "@morlay/session-branch": "0.1.5"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-session-stats": "0.2.0-rc.1",
-    "@morlay/dsh-client-ui-primitives": "0.0.6",
-    "@morlay/session-rdb": "0.1.3",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-session-stats": "0.2.0-rc.2",
+    "@morlay/dsh-client-ui-primitives": "0.0.8",
+    "@morlay/session-rdb": "0.1.5",
     "@types/react": "~18.3.1",
     "@types/react-dom": "~18.3.0",
     "react": "^18.2.0",
@@ -51,24 +52,23 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-api-session-controller": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-attachment": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-connection": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-store": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-attachment": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-chat": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-workspace": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-invariants": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-session": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-session-persistence": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-session-projection": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-token-meter": "^0.2.0-rc.1",
-    "@morlay/dsh-client-ui-conversation": "0.1.3",
-    "@morlay/dsh-client-ui-primitives": "0.0.6"
+    "@deepseek-ai/dsh-api-session-controller": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-attachment": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-connection": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-store": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-attachment": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-chat": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-workspace": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-invariants": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-session": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-session-persistence": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-session-projection": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-token-meter": "^0.2.0-rc.2"
   },
   "dsh": {
     "client": {
@@ -77,7 +77,7 @@
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-store",
         "@deepseek-ai/dsh-client-ui-workspace",
-        "@morlay/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-conversation",
         "@deepseek-ai/dsh-client-ui-chat"
       ]
     }

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

@@ -2,21 +2,28 @@
 // 在消息动作行上提供 edit / retry；其余 key 由官方内置渲染器处理。
 
 import {
+  Bubble,
+  Button,
+  IconButton,
+  IconEditOutlineRegular,
+  IconRefreshOutlineRegular,
+  JsonBlock,
   markdownLabels,
+  Modal,
   ReferenceMarkdown,
-  styling,
+  Row,
+  Stack,
   type ReferenceActions,
 } from "@morlay/dsh-client-ui-primitives/client";
 import { memo, useMemo, useState } from "react";
 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 } from "@deepseek-ai/dsh-client-ui-primitives";
 import type { ChatNodeViewProps, ChatViewSlotProps } from "@deepseek-ai/dsh-client-ui-chat/client";
-import type { RenderMessageImages } from "@morlay/dsh-client-ui-conversation/client";
-import { MessageIconActions } from "./MessageIconActions.tsx";
-import { styles } from "./MessageItem.styles.ts";
+import type { RenderMessageImages } from "@deepseek-ai/dsh-client-ui-conversation/client";
+// 动作行整条用上游那份：复制 / 分支 / 时间标签的悬停显形都归它，我们只经它的 `extraActions` 注入自己的两个入口。
+// 走 vendor 源码的相对路径（与 `dsh-subagent` 接上游源码同一种写法），不经包出口。
+import { MessageIconActions } from "../../../../../../vendor/deepseek-harness/packages/client/ui-chat/src/client/chat/MessageIconActions.tsx";
 import type { EditableMessageBlock } from "../../shared.ts";
 import type { SessionEditorFace } from "../controller.ts";
 
@@ -63,11 +70,11 @@ function UserStyleBubble({
   const labels = useMemo(() => markdownLabels(t), [t]);
   const showBubble = text !== "" || rest.length > 0;
   return (
-    <div {...styling.props(styles.userRow)} data-time-hover-root>
-      <div {...styling.props(styles.userStack)}>
+    <Stack align="end" gap={6} data-time-hover-root>
+      <Stack align="end" gap={8} narrow>
         {renderMessageImages({ images, align: "end" })}
         {showBubble && (
-          <div {...styling.props(styles.bubble)}>
+          <Bubble>
             <ReferenceMarkdown text={text} labels={labels} actions={references} />
             {rest.map((block, i) => (
               <JsonBlock
@@ -77,11 +84,11 @@ function UserStyleBubble({
                 truncatedLabel={truncated}
               />
             ))}
-          </div>
+          </Bubble>
         )}
-      </div>
+      </Stack>
       {actions?.(text)}
-    </div>
+    </Stack>
   );
 }
 
@@ -147,7 +154,7 @@ export const UserMessageNodeView = memo(function UserMessageNodeView({
           closeLabel="关闭"
           description="将撤回该消息及其之后的对话内容到输入框，请修改后重新发送。"
           footer={
-            <div {...styling.props(styles.confirmActions)}>
+            <Row gap={8} justify="end">
               <Button variant="outline" onClick={() => setConfirmingRecall(null)}>
                 取消
               </Button>
@@ -161,7 +168,7 @@ export const UserMessageNodeView = memo(function UserMessageNodeView({
               >
                 撤回并编辑
               </Button>
-            </div>
+            </Row>
           }
         />
       )}
@@ -173,7 +180,7 @@ export const UserMessageNodeView = memo(function UserMessageNodeView({
           closeLabel="关闭"
           description={`将重新生成第 ${turn} 轮的回复，并抛弃该回合之后的内容。`}
           footer={
-            <div {...styling.props(styles.confirmActions)}>
+            <Row gap={8} justify="end">
               <Button variant="outline" onClick={() => setConfirmingRetry(false)}>
                 取消
               </Button>
@@ -186,7 +193,7 @@ export const UserMessageNodeView = memo(function UserMessageNodeView({
               >
                 确认重试
               </Button>
-            </div>
+            </Row>
           }
         />
       )}
@@ -201,8 +208,20 @@ export const UserMessageNodeView = memo(function UserMessageNodeView({
             time={data.time}
             clock="start"
             t={t}
-            onEdit={onEdit}
-            onRetry={onRetry}
+            extraActions={
+              <>
+                {onEdit === undefined ? null : (
+                  <IconButton shape="circle" label="编辑" onClick={onEdit}>
+                    <IconEditOutlineRegular />
+                  </IconButton>
+                )}
+                {onRetry === undefined ? null : (
+                  <IconButton shape="circle" label="重试此回合" onClick={onRetry}>
+                    <IconRefreshOutlineRegular />
+                  </IconButton>
+                )}
+              </>
+            }
           />
         )}
       />

package/src/client/chat-node/register.ts

@@ -1,6 +1,6 @@
 import type { Context } from "@deepseek-ai/cordis";
 import type { SessionId } from "@deepseek-ai/dsh-session";
-import "@morlay/dsh-client-ui-conversation/client";
+import type {} from "@deepseek-ai/dsh-client-ui-conversation/client";
 import type {} from "@deepseek-ai/dsh-client-ui-chat/client";
 import type {} from "@deepseek-ai/dsh-client-ui-renderer/client";
 import { UserMessageNodeView } from "./MessageItem.tsx";

package/src/client/controller.ts

@@ -123,6 +123,7 @@ export class SessionEditorController {
     });
   }
 
+  // 撤回回填：写官方输入契约的草稿（`setDraft`）。拿不到输入面（会话没打开 / 面未就绪）就只撤回、不回填。
   private setComposerDraft(text: string): void {
     if (this.sessions.binding(this.sessionId) === undefined) return;
     const scoped = this.sessions.scope(this.sessionId);
@@ -130,10 +131,10 @@ export class SessionEditorController {
     const conversation = scoped.get("conversation") as
       | {
           input?: {
-            for(ctx: ClientContext): { restoreDraft(draft: string): void };
+            for(ctx: ClientContext): { setDraft(draft: string): void };
           };
         }
       | undefined;
-    conversation?.input?.for(scoped).restoreDraft(text);
+    conversation?.input?.for(scoped).setDraft(text);
   }
 }

package/src/client/index.ts

@@ -1,18 +1,17 @@
 import type { Context } from "@deepseek-ai/cordis";
-import type {} from "@morlay/dsh-client-ui-conversation/client";
+import type {} from "@deepseek-ai/dsh-client-ui-conversation/client";
 import type {} from "@deepseek-ai/dsh-client-ui-chat/client";
 import type {} from "@deepseek-ai/dsh-client-ui-renderer/client";
 import type { SessionId } from "@deepseek-ai/dsh-session";
 import { SessionEditorController } from "./controller.ts";
 import { registerChatNodeRenderers } from "./chat-node/register.ts";
-import { registerComposerStats } from "./composer-stats/register.ts";
-import { styling } from "@morlay/dsh-client-ui-primitives/client";
-import { globals as messageIconGlobals } from "./chat-node/MessageIconActions.styles.ts";
+import { apply as installUiPrimitives } from "@morlay/dsh-client-ui-primitives/client";
 
 export const inject = ["slots", "conversation", "connection", "sessions", "uiWorkspace"];
 
 export function apply(ctx: Context): void {
-  styling.injectGlobals(messageIconGlobals);
+  // 基础面随本包 inline（不再是装配行）：装上它提供的字典、字段槽与按行配置页；多份副本只装一次。
+  installUiPrimitives(ctx);
 
   const controllers = new Map<SessionId, SessionEditorController>();
   const controllerFor = (sessionId: SessionId): SessionEditorController => {
@@ -25,6 +24,4 @@ export function apply(ctx: Context): void {
   };
 
   registerChatNodeRenderers(ctx, controllerFor);
-
-  ctx.slots.inject("conversation.composer.dock", () => registerComposerStats(ctx.slots));
 }

package/src/client/chat-node/MessageIconActions.styles.ts

@@ -1,76 +0,0 @@
-import type { CSSProps } from "@morlay/dsh-client-ui-primitives/client";
-
-export const styles = {
-  actions: {
-    display: "flex",
-    alignItems: "center",
-    gap: "10px",
-    height: "28px",
-  },
-  timeStart: {
-    paddingRight: "12px",
-    fontSize: "14px",
-    lineHeight: "24px",
-    color: "var(--dsw-alias-label-tertiary)",
-    whiteSpace: "nowrap",
-  },
-  timeEnd: {
-    paddingLeft: "12px",
-    fontSize: "14px",
-    lineHeight: "24px",
-    color: "var(--dsw-alias-label-tertiary)",
-    whiteSpace: "nowrap",
-    "&)": {
-      "@media (hover: hover)": {
-        opacity: "1",
-      },
-    },
-  },
-  runTimeDot: {
-    margin: "0 10px",
-  },
-  action: {
-    display: "inline-flex",
-    alignItems: "center",
-    justifyContent: "center",
-    width: "28px",
-    height: "28px",
-    padding: "6px",
-    border: "none",
-    borderRadius: "28px",
-    background: "transparent",
-    color: "var(--dsw-alias-label-tertiary)",
-    cursor: "pointer",
-    "&:hover": {
-      background: "var(--dsw-alias-interactive-bg-hover)",
-      color: "var(--dsw-alias-label-secondary)",
-    },
-    "&[data-unavailable]": {
-      cursor: "default",
-      opacity: "0.4",
-    },
-    "&[data-unavailable]:hover": {
-      background: "transparent",
-      color: "var(--dsw-alias-label-tertiary)",
-    },
-  },
-  visuallyHidden: {
-    position: "absolute",
-    width: "1px",
-    height: "1px",
-    overflow: "hidden",
-    clip: "rect(0 0 0 0)",
-    whiteSpace: "nowrap",
-  },
-} satisfies Record<string, CSSProps>;
-
-export const globals = {
-  "[data-time-hover-root] [data-time-label]": {
-    opacity: "0",
-    transition: "opacity 80ms ease",
-  },
-  "[data-time-hover-root]:hover :is(.timeStart, .timeEnd),\n  [data-time-hover-root]:focus-within :is(.timeStart, .timeEnd)":
-    {
-      opacity: "1",
-    },
-} satisfies Record<string, CSSProps>;

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

@@ -1,166 +0,0 @@
-// Shared IconActions chrome for user and assistant messages: copy
-// live, optional branch wiring, and an optional date-aware clock.
-
-import { styling } from "@morlay/dsh-client-ui-primitives/client";
-import { useCallback, useEffect, useId, useRef, useState, type ReactNode } from "react";
-import {
-  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 { formatMessageClock } from "./message-chrome.ts";
-import { useCalendarDay } from "./use-calendar-day.ts";
-import { styles } from "./MessageIconActions.styles.ts";
-
-export interface MessageIconActionsProps {
-  text: string;
-
-  time?: number | undefined;
-
-  clock: "start" | "end";
-
-  onBranch?: (() => void) | undefined;
-
-  branchUnavailable?: boolean | undefined;
-
-  className?: string | undefined;
-
-  extraActions?: ReactNode;
-
-  onEdit?: (() => void) | undefined;
-
-  onRetry?: (() => void) | undefined;
-
-  t: ChatViewSlotProps["t"];
-}
-
-export function MessageIconActions({
-  text,
-  time,
-  clock,
-  onBranch,
-  branchUnavailable = false,
-  className,
-  extraActions,
-  onEdit,
-  onRetry,
-  t,
-}: MessageIconActionsProps) {
-  const day = useCalendarDay();
-  const reasonId = useId();
-  // Same success chrome as CodeBlock: a short check swap after the write,
-  // gated so re-clicks during the window neither re-copy nor stack timers.
-  const [copied, setCopied] = useState(false);
-  const copyPending = useRef(false);
-  const copyTimer = useRef<number | null>(null);
-  const copyEpoch = useRef(0);
-  useEffect(
-    () => () => {
-      copyEpoch.current += 1;
-      copyPending.current = false;
-      if (copyTimer.current !== null) clearTimeout(copyTimer.current);
-    },
-    [],
-  );
-  const onCopy = useCallback(() => {
-    if (copied || copyPending.current) return;
-    const epoch = copyEpoch.current;
-    copyPending.current = true;
-    void writeClipboard(text).then((ok) => {
-      if (epoch !== copyEpoch.current) return;
-      copyPending.current = false;
-      if (!ok) return;
-      setCopied(true);
-      copyTimer.current = window.setTimeout(() => {
-        copyTimer.current = null;
-        setCopied(false);
-      }, 1000);
-    });
-  }, [copied, text]);
-  // 只剩时钟：耗时 / TTFT / tok-s 的读数在 0.1.7 已不属于消息 chrome（上游把它们收进
-  // 会话统计弹窗与轮次过程节点），上游那套聊天文案表也不再提供这三个 key。
-  const clockEl =
-    time === undefined ? null : (
-      <span
-        data-time-label=""
-        {...styling.props(clock === "start" ? styles.timeStart : styles.timeEnd)}
-      >
-        {formatMessageClock(time, t, day)}
-      </span>
-    );
-  // 外部 className 需要拼接：给 actions 一个真实类名（而不是 data-css 属性）。
-  const actionsClass = styling.className(styles.actions);
-  return (
-    <div
-      data-time-hover-root=""
-      className={className === undefined ? actionsClass : `${actionsClass} ${className}`}
-    >
-      {clock === "start" ? clockEl : null}
-      <Tooltip label={copied ? t("copied" as never) : t("copy" as never)} side="bottom">
-        <button
-          type="button"
-          {...styling.props(styles.action)}
-          aria-label={copied ? t("copied" as never) : t("copy" as never)}
-          onClick={onCopy}
-        >
-          {copied ? <IconCheckOutlineRegular /> : <IconCopyOutlineRegular />}
-        </button>
-      </Tooltip>
-      {extraActions}
-      {onEdit !== undefined && (
-        <Tooltip label="编辑" side="bottom">
-          <button
-            type="button"
-            {...styling.props(styles.action)}
-            aria-label="编辑"
-            onClick={onEdit}
-          >
-            <IconEditOutlineRegular />
-          </button>
-        </Tooltip>
-      )}
-      {onRetry !== undefined && (
-        <Tooltip label="重试此回合" side="bottom">
-          <button
-            type="button"
-            {...styling.props(styles.action)}
-            aria-label="重试此回合"
-            onClick={onRetry}
-          >
-            <IconRefreshOutlineRegular />
-          </button>
-        </Tooltip>
-      )}
-      {onBranch !== undefined && (
-        <Tooltip
-          label={branchUnavailable ? t("message.branchUnavailable") : t("message.branch")}
-          side="bottom"
-        >
-          {/* Native disabled buttons do not deliver the hover/focus events Tooltip needs. */}
-          <button
-            type="button"
-            {...styling.props(styles.action)}
-            aria-label={t("message.branch")}
-            aria-disabled={branchUnavailable || undefined}
-            aria-describedby={branchUnavailable ? reasonId : undefined}
-            data-unavailable={branchUnavailable || undefined}
-            onClick={branchUnavailable ? undefined : onBranch}
-          >
-            <IconBranchOutlineRegular />
-          </button>
-        </Tooltip>
-      )}
-      {onBranch !== undefined && branchUnavailable && (
-        <span id={reasonId} {...styling.props(styles.visuallyHidden)}>
-          {t("message.branchUnavailable")}
-        </span>
-      )}
-      {clock === "end" ? clockEl : null}
-    </div>
-  );
-}