代码提交

frontend-web/src/components/workspace/messages/message-list-item.tsx

@@ -135,11 +135,12 @@ export function MessageListItem({
   threadId,
   tokenUsageEnabled = false,
   displaySources = [],
-  extraRehypePlugins,
-  onEditResubmit,
-  onMessageDeleted,
-  turnTime,
-}: {
+  extraRehypePlugins,
+  onEditResubmit,
+  onEditSave,
+  onMessageDeleted,
+  turnTime,
+}: {
   className?: string;
   fitRowToContent?: boolean;
   /**
@@ -151,10 +152,11 @@ export function MessageListItem({
   isLoading?: boolean;
   threadId: string;
   tokenUsageEnabled?: boolean;
-  displaySources?: RuntimeDisplaySource[];
-  extraRehypePlugins?: ReturnType<typeof useRehypeSplitWordsIntoSpans>;
-  onEditResubmit?: (text: string) => void;
-  onMessageDeleted?: (deletedIds: string[]) => void;
+  displaySources?: RuntimeDisplaySource[];
+  extraRehypePlugins?: ReturnType<typeof useRehypeSplitWordsIntoSpans>;
+  onEditResubmit?: (text: string) => void;
+  onEditSave?: (messageId: string, text: string) => void | Promise<void>;
+  onMessageDeleted?: (deletedIds: string[]) => void;
   /**
    * Durable ask time of the turn this message belongs to (the preceding
    * question's `client_ts`). Used to time-stamp the AI answer, which carries no
@@ -162,14 +164,102 @@ export function MessageListItem({
    * wall clock at render time and appear to "drift" to now on every reload.
    */
   turnTime?: string;
-}) {
-  const isHuman = message.type === 'human';
-  const messageMarkdown =
-    extractContentFromMessage(message) ??
-    extractReasoningContentFromMessage(message) ??
-    '';
-  return (
-    <AIElementMessage
+}) {
+  const { t } = useI18n();
+  const isHuman = message.type === 'human';
+  const messageMarkdown =
+    extractContentFromMessage(message) ??
+    extractReasoningContentFromMessage(message) ??
+    '';
+  const [assistantEditing, setAssistantEditing] = useState(false);
+  const [assistantDraft, setAssistantDraft] = useState(messageMarkdown);
+  const [assistantSaving, setAssistantSaving] = useState(false);
+
+  useEffect(() => {
+    if (!assistantEditing) {
+      setAssistantDraft(messageMarkdown);
+    }
+  }, [assistantEditing, messageMarkdown]);
+
+  const canSaveAssistantEdit =
+    !isLoading &&
+    !isHuman &&
+    !!onEditSave &&
+    !!message.id &&
+    !message.id.startsWith('opt-') &&
+    !!messageMarkdown;
+  const confirmAssistantEdit = useCallback(async () => {
+    const value = assistantDraft.trim();
+    if (!value || !message.id || !onEditSave || assistantSaving) {
+      return;
+    }
+    setAssistantSaving(true);
+    try {
+      await onEditSave(message.id, value);
+      setAssistantEditing(false);
+    } catch {
+      // The page-level save callback owns user-facing error toasts. Keep the
+      // editor open so the user can adjust and retry.
+    } finally {
+      setAssistantSaving(false);
+    }
+  }, [assistantDraft, assistantSaving, message.id, onEditSave]);
+
+  if (!isHuman && assistantEditing) {
+    return (
+      <AIElementMessage
+        id={anchorId}
+        className={cn(
+          'group/conversation-message relative',
+          fitRowToContent ? 'max-w-full w-fit' : 'w-full',
+          anchorId && 'scroll-mt-20',
+          className,
+        )}
+        from="assistant"
+      >
+        <AIElementMessageContent className="w-full">
+          <div className="flex w-full flex-col gap-2 rounded-2xl border border-primary/20 bg-primary/5 p-3">
+            <Textarea
+              value={assistantDraft}
+              autoFocus
+              onChange={(event) => setAssistantDraft(event.currentTarget.value)}
+              onKeyDown={(event) => {
+                if (event.key === "Enter" && (event.metaKey || event.ctrlKey)) {
+                  event.preventDefault();
+                  void confirmAssistantEdit();
+                }
+                if (event.key === "Escape") {
+                  event.preventDefault();
+                  setAssistantEditing(false);
+                }
+              }}
+              className="min-h-32 resize-y text-[15px] leading-7"
+            />
+            <div className="flex items-center justify-end gap-2">
+              <Button
+                size="sm"
+                variant="ghost"
+                disabled={assistantSaving}
+                onClick={() => setAssistantEditing(false)}
+              >
+                {t.common.cancel}
+              </Button>
+              <Button
+                size="sm"
+                disabled={!assistantDraft.trim() || assistantSaving}
+                onClick={() => void confirmAssistantEdit()}
+              >
+                {assistantSaving ? "保存中..." : t.common.save}
+              </Button>
+            </div>
+          </div>
+        </AIElementMessageContent>
+      </AIElementMessage>
+    );
+  }
+
+  return (
+    <AIElementMessage
       id={anchorId}
       className={cn(
         'group/conversation-message relative',
@@ -187,11 +277,12 @@ export function MessageListItem({
         threadId={threadId}
         tokenUsageEnabled={tokenUsageEnabled}
         displaySources={displaySources}
-        extraRehypePlugins={extraRehypePlugins}
-        onEditResubmit={onEditResubmit}
-        onMessageDeleted={onMessageDeleted}
-        turnTime={turnTime}
-      />
+        extraRehypePlugins={extraRehypePlugins}
+        onEditResubmit={onEditResubmit}
+        onEditSave={isLoading ? undefined : onEditSave}
+        onMessageDeleted={onMessageDeleted}
+        turnTime={turnTime}
+      />
       {/*
         Human messages carry their own inline copy/edit toolbar inside
         MessageContent (above the timestamp). Only assistant answers use the
@@ -206,15 +297,28 @@ export function MessageListItem({
         >
           <div className="flex gap-1">
             <CopyButton clipboardData={messageMarkdown} />
-            {messageMarkdown && (
-              <DownloadWordButton
-                markdown={messageMarkdown}
-                fileName="message"
-              />
-            )}
-          </div>
-        </MessageToolbar>
-      )}
+            {messageMarkdown && (
+              <DownloadWordButton
+                markdown={messageMarkdown}
+                fileName="message"
+              />
+            )}
+            {canSaveAssistantEdit && (
+              <Tooltip content="编辑消息">
+                <Button
+                  size="icon-sm"
+                  type="button"
+                  variant="ghost"
+                  className="size-6"
+                  onClick={() => setAssistantEditing(true)}
+                >
+                  <PencilIcon size={11} />
+                </Button>
+              </Tooltip>
+            )}
+          </div>
+        </MessageToolbar>
+      )}
     </AIElementMessage>
   );
 }
@@ -228,26 +332,31 @@ export function MessageListItem({
  * the question; confirming sends the edited text as a brand-new turn (the
  * original question stays in the thread).
  */
-function HumanMessageBlock({
-  text,
-  pageContext,
-  filesList,
-  messageTime,
-  components,
-  onEditResubmit,
-  deleteButton,
-}: {
-  text: string;
-  pageContext?: EmbeddedPageContext | null;
-  filesList: React.ReactNode;
-  messageTime: { label: string; full: string } | null;
-  components: MarkdownContentProps["components"];
-  onEditResubmit?: (text: string) => void;
-  deleteButton?: React.ReactNode;
-}) {
-  const { t } = useI18n();
-  const [editing, setEditing] = useState(false);
-  const [draft, setDraft] = useState(text);
+function HumanMessageBlock({
+  messageId,
+  text,
+  pageContext,
+  filesList,
+  messageTime,
+  components,
+  onEditResubmit,
+  onEditSave,
+  deleteButton,
+}: {
+  messageId?: string;
+  text: string;
+  pageContext?: EmbeddedPageContext | null;
+  filesList: React.ReactNode;
+  messageTime: { label: string; full: string } | null;
+  components: MarkdownContentProps["components"];
+  onEditResubmit?: (text: string) => void;
+  onEditSave?: (messageId: string, text: string) => void | Promise<void>;
+  deleteButton?: React.ReactNode;
+}) {
+  const { t } = useI18n();
+  const [editing, setEditing] = useState(false);
+  const [draft, setDraft] = useState(text);
+  const [saving, setSaving] = useState(false);
 
   useEffect(() => {
     if (!editing) {
@@ -255,14 +364,27 @@ function HumanMessageBlock({
     }
   }, [text, editing]);
 
-  const confirmEdit = useCallback(() => {
-    const value = draft.trim();
-    if (!value) {
-      return;
-    }
-    onEditResubmit?.(value);
-    setEditing(false);
-  }, [draft, onEditResubmit]);
+  const confirmEdit = useCallback(async () => {
+    const value = draft.trim();
+    if (!value || saving) {
+      return;
+    }
+    if (onEditSave && messageId && !messageId.startsWith("opt-")) {
+      setSaving(true);
+      try {
+        await onEditSave(messageId, value);
+        setEditing(false);
+      } catch {
+        // The page-level save callback owns user-facing error toasts. Keep the
+        // editor open so the user can adjust and retry.
+      } finally {
+        setSaving(false);
+      }
+      return;
+    }
+    onEditResubmit?.(value);
+    setEditing(false);
+  }, [draft, messageId, onEditResubmit, onEditSave, saving]);
 
   if (editing) {
     return (
@@ -275,10 +397,10 @@ function HumanMessageBlock({
           onKeyDown={(event) => {
             if (event.key === "Enter" && (event.metaKey || event.ctrlKey)) {
               event.preventDefault();
-              confirmEdit();
-            }
-            if (event.key === "Escape") {
-              event.preventDefault();
+              void confirmEdit();
+            }
+            if (event.key === "Escape") {
+              event.preventDefault();
               setEditing(false);
             }
           }}
@@ -286,17 +408,22 @@ function HumanMessageBlock({
         />
         <div className="flex items-center justify-end gap-2">
           <Button
-            size="sm"
-            variant="ghost"
-            onClick={() => setEditing(false)}
-          >
-            {t.common.cancel}
-          </Button>
-          <Button size="sm" onClick={confirmEdit} disabled={!draft.trim()}>
-            {t.common.confirm}
-          </Button>
-        </div>
-      </div>
+            size="sm"
+            variant="ghost"
+            disabled={saving}
+            onClick={() => setEditing(false)}
+          >
+            {t.common.cancel}
+          </Button>
+          <Button
+            size="sm"
+            onClick={() => void confirmEdit()}
+            disabled={!draft.trim() || saving}
+          >
+            {saving ? "保存中..." : onEditSave ? t.common.save : t.common.confirm}
+          </Button>
+        </div>
+      </div>
     );
   }
 
@@ -324,11 +451,11 @@ function HumanMessageBlock({
       {(text || deleteButton) && (
         <div className="flex items-center gap-0.5 opacity-0 transition-opacity duration-200 group-hover/conversation-message:opacity-100">
           {text && <CopyButton clipboardData={text} className="size-6" />}
-          {text && onEditResubmit && (
-            <Tooltip content={t.inputBox.editQuestion}>
-              <Button
-                size="icon-sm"
-                type="button"
+          {text && (onEditResubmit || onEditSave) && (
+            <Tooltip content={onEditSave ? "编辑消息" : t.inputBox.editQuestion}>
+              <Button
+                size="icon-sm"
+                type="button"
                 variant="ghost"
                 className="size-6"
                 onClick={() => setEditing(true)}
@@ -396,22 +523,24 @@ function MessageContent_({
   threadId,
   tokenUsageEnabled = false,
   displaySources = [],
-  extraRehypePlugins,
-  onEditResubmit,
-  onMessageDeleted,
-  turnTime,
-}: {
+  extraRehypePlugins,
+  onEditResubmit,
+  onEditSave,
+  onMessageDeleted,
+  turnTime,
+}: {
   className?: string;
   message: Message;
   isLoading?: boolean;
   threadId: string;
   tokenUsageEnabled?: boolean;
-  displaySources?: RuntimeDisplaySource[];
-  extraRehypePlugins?: ReturnType<typeof useRehypeSplitWordsIntoSpans>;
-  onEditResubmit?: (text: string) => void;
-  onMessageDeleted?: (deletedIds: string[]) => void;
-  turnTime?: string;
-}) {
+  displaySources?: RuntimeDisplaySource[];
+  extraRehypePlugins?: ReturnType<typeof useRehypeSplitWordsIntoSpans>;
+  onEditResubmit?: (text: string) => void;
+  onEditSave?: (messageId: string, text: string) => void | Promise<void>;
+  onMessageDeleted?: (deletedIds: string[]) => void;
+  turnTime?: string;
+}) {
   const baseRehypePlugins = useRehypeSplitWordsIntoSpans(isLoading);
 
   // Streamdown splits content into per-block processors; calling the factory
@@ -555,14 +684,16 @@ function MessageContent_({
     const canDelete =
       !!onMessageDeleted && !!message.id && !message.id.startsWith('opt-');
     return (
-      <HumanMessageBlock
-        text={parsedHumanContent.content}
-        pageContext={parsedHumanContent.pageContext}
-        filesList={filesList}
-        messageTime={messageTime}
-        components={components}
-        onEditResubmit={onEditResubmit}
-        deleteButton={
+      <HumanMessageBlock
+        messageId={message.id}
+        text={parsedHumanContent.content}
+        pageContext={parsedHumanContent.pageContext}
+        filesList={filesList}
+        messageTime={messageTime}
+        components={components}
+        onEditResubmit={onEditResubmit}
+        onEditSave={onEditSave}
+        deleteButton={
           canDelete ? (
             <DeleteMessageButton
               threadId={threadId}

frontend-web/src/components/workspace/messages/message-list.tsx

@@ -97,10 +97,13 @@ export function MessageList({
   tokenUsageEnabled = false,
   extraRehypePlugins,
   scrollButtonClassName,
-  onClarificationSubmit,
-  onEditResubmit,
-  onSetupAgentApprove,
-  onSetupAgentReject,
+  onClarificationSubmit,
+  onEditResubmit,
+  onEditSave,
+  messageContentOverrides,
+  externallyHiddenMessageIds,
+  onSetupAgentApprove,
+  onSetupAgentReject,
   onSetupWritingApprove,
   onSetupWritingReject,
   onSetupWritingStart,
@@ -116,9 +119,12 @@ export function MessageList({
   /** 额外定位「回到最新」悬浮按钮——不同页面输入框高度不同，需上移让位。 */
   scrollButtonClassName?: string;
   extraRehypePlugins?: ReturnType<typeof useRehypeSplitWordsIntoSpans>;
-  onClarificationSubmit?: (answer: string) => void | Promise<void>;
-  onEditResubmit?: (text: string) => void;
-  onSetupAgentApprove?: (payload: SetupAgentApprovalPayload) => void | Promise<void>;
+  onClarificationSubmit?: (answer: string) => void | Promise<void>;
+  onEditResubmit?: (text: string) => void;
+  onEditSave?: (messageId: string, text: string) => void | Promise<void>;
+  messageContentOverrides?: Record<string, string>;
+  externallyHiddenMessageIds?: Set<string>;
+  onSetupAgentApprove?: (payload: SetupAgentApprovalPayload) => void | Promise<void>;
   onSetupAgentReject?: (payload: SetupAgentApprovalPayload) => void | Promise<void>;
   onSetupWritingApprove?: (payload: SetupWritingApprovalPayload) => void | Promise<void>;
   onSetupWritingReject?: (payload: SetupWritingApprovalPayload) => void | Promise<void>;
@@ -157,17 +163,33 @@ export function MessageList({
     });
   }, []);
 
-  const allMessages = useMemo(
-    () => thread.messages.filter((m) => !isHiddenFromUIMessage(m)),
-    [thread.messages],
-  );
-  const messages = useMemo(
-    () =>
-      hiddenMessageIds.size === 0
-        ? allMessages
-        : allMessages.filter((m) => !m.id || !hiddenMessageIds.has(m.id)),
-    [allMessages, hiddenMessageIds],
-  );
+  const allMessages = useMemo(() => {
+    const hasOverrides = messageContentOverrides && Object.keys(messageContentOverrides).length > 0;
+    return thread.messages
+      .filter((m) => !isHiddenFromUIMessage(m))
+      .map((message) => {
+        const override =
+          hasOverrides && message.id
+            ? messageContentOverrides?.[message.id]
+            : undefined;
+        return override === undefined
+          ? message
+          : ({ ...message, content: override } as Message);
+      });
+  }, [messageContentOverrides, thread.messages]);
+  const messages = useMemo(
+    () => {
+      const externalHidden = externallyHiddenMessageIds ?? new Set<string>();
+      return hiddenMessageIds.size === 0 && externalHidden.size === 0
+        ? allMessages
+        : allMessages.filter(
+            (m) =>
+              !m.id ||
+              (!hiddenMessageIds.has(m.id) && !externalHidden.has(m.id)),
+          );
+    },
+    [allMessages, externallyHiddenMessageIds, hiddenMessageIds],
+  );
 
   const askTimes = useChatAskTimes();
 
@@ -382,10 +404,11 @@ export function MessageList({
                   threadId={threadId}
                   tokenUsageEnabled={tokenUsageEnabled}
                   displaySources={displaySources}
-                  extraRehypePlugins={extraRehypePlugins}
-                  onEditResubmit={onEditResubmit}
-                  onMessageDeleted={
-                    allowDelete ? handleMessageDeleted : undefined
+                  extraRehypePlugins={extraRehypePlugins}
+                  onEditResubmit={onEditResubmit}
+                  onEditSave={onEditSave}
+                  onMessageDeleted={
+                    allowDelete ? handleMessageDeleted : undefined
                   }
                   turnTime={msg.id ? turnTimes.get(msg.id) : undefined}
                 />