Merge remote-tracking branch 'origin/master' into xuhd

frontend-web/src/pages/IframeChatPage.tsx

@@ -10,16 +10,13 @@ import {
   useSpecificChatMode,
   useThreadChat,
 } from "@/components/workspace/chats";
-import { ExportTrigger } from "@/components/workspace/export-trigger";
 import {
   MessageList,
   MESSAGE_LIST_DEFAULT_PADDING_BOTTOM,
   MESSAGE_LIST_FOLLOWUPS_EXTRA_PADDING_BOTTOM,
 } from "@/components/workspace/messages";
 import { ThreadContext } from "@/components/workspace/messages/context";
-import { ThreadTitle } from "@/components/workspace/thread-title";
 import { TodoList } from "@/components/workspace/todo-list";
-import { TokenUsageIndicator } from "@/components/workspace/token-usage-indicator";
 import { useI18n } from "@/core/i18n/hooks";
 import { useModels } from "@/core/models/hooks";
 import { useNotification } from "@/core/notification/hooks";
@@ -138,6 +135,7 @@ export default function IframeChatPage() {
     (
       message: PromptInputMessage,
       externalContext?: Record<string, unknown>,
+      options?: { additionalKwargs?: Record<string, unknown> },
     ) => {
       if (
         selectedAgentId &&
@@ -183,6 +181,7 @@ export default function IframeChatPage() {
         threadId,
         message,
         Object.keys(extraContext).length > 0 ? extraContext : undefined,
+        options,
       );
     },
     [
@@ -213,7 +212,7 @@ export default function IframeChatPage() {
       if (data?.source !== "brainy-extension") return;
       if (data?.type !== "brainy:chat-submit") return;
 
-      const { submitText, files, iframeContext } =
+      const { submitText, files, iframeContext, additionalKwargs } =
         parseBrainyChatSubmitMessage(data);
 
       console.log("收到插件消息", {
@@ -229,7 +228,11 @@ export default function IframeChatPage() {
 
       pendingRequestIdRef.current = data.requestId ?? null;
 
-      handleSubmit({ text: submitText, files }, iframeContext);
+      handleSubmit(
+        { text: submitText, files },
+        iframeContext,
+        additionalKwargs ? { additionalKwargs } : undefined,
+      );
     };
 
     window.addEventListener("message", handleMessage);
@@ -248,6 +251,7 @@ export default function IframeChatPage() {
     <ThreadContext.Provider value={{ thread, isMock }}>
       <ChatBox threadId={threadId} disableArtifacts>
         <div className="relative flex size-full min-h-0 justify-between overflow-hidden">
+          {/*
           <header
             className={cn(
               "absolute top-0 right-0 left-0 z-30 flex h-12 shrink-0 items-center border-b px-4",
@@ -267,11 +271,12 @@ export default function IframeChatPage() {
               <ExportTrigger threadId={threadId} />
             </div>
           </header>
+          */}
           <main className="flex min-h-0 max-w-full grow flex-col overflow-hidden">
             <div className="flex size-full min-w-0">
               {!isLandingState && (
                 <MessageList
-                  className={cn("size-full", "pt-10")}
+                  className="size-full"
                   contentClassName="mx-0 max-w-full px-3 sm:px-4"
                   threadId={threadId}
                   thread={thread}

frontend-web/src/pages/iframe-chat-submit.test.ts

@@ -32,11 +32,16 @@ test("parses iframe text, page context, and screenshot into a prompt message", (
 
   assert.equal(result.submitText, [
     "提取并翻译",
-    "<attached_image_priority>\nA screenshot image is attached for this message.\nUse the attached image as the primary source of truth.\nUse page context and text prompt only as supporting context.\nIf the image conflicts with page context or text, trust the image.\n</attached_image_priority>",
-    "<extension_prompt>\n提取图片中的文字并翻译成简体中文\n</extension_prompt>",
-    "<page_context>\n<title>\nUN News\n</title>\n\n<url>\nhttps://news.un.org/example\n</url>\n\n<content>\nBanning children from social media is not the answer.\n</content>\n</page_context>",
   ].join("\n\n"));
   assert.deepEqual(result.iframeContext, { brainy_request_id: "iframe-123" });
+  assert.equal(
+    result.additionalKwargs?.prompt_prefix,
+    [
+      "<attached_image_priority>\nA screenshot image is attached for this message.\nUse the attached image as the primary source of truth.\nUse page context and text prompt only as supporting context.\nIf the image conflicts with page context or text, trust the image.\n</attached_image_priority>",
+      "<extension_prompt>\n提取图片中的文字并翻译成简体中文\n</extension_prompt>",
+      "<page_context>\n<title>\nUN News\n</title>\n\n<url>\nhttps://news.un.org/example\n</url>\n\n<content>\nBanning children from social media is not the answer.\n</content>\n</page_context>",
+    ].join("\n\n"),
+  );
   assert.equal(result.files.length, 1);
   assert.equal(result.files[0]?.type, "file");
   assert.equal(result.files[0]?.filename, "capture.png");
@@ -65,8 +70,9 @@ test("keeps screenshot-only iframe submissions in the conversation flow", () =>
     },
   });
 
+  assert.equal(result.submitText, "");
   assert.equal(
-    result.submitText,
+    result.additionalKwargs?.prompt_prefix,
     "<attached_image_priority>\nA screenshot image is attached for this message.\nUse the attached image as the primary source of truth.\nUse page context and text prompt only as supporting context.\nIf the image conflicts with page context or text, trust the image.\n</attached_image_priority>",
   );
   assert.equal(result.files.length, 1);

frontend-web/src/pages/iframe-chat-submit.ts

@@ -45,6 +45,7 @@ export type ParsedBrainyChatSubmitMessage = {
   submitText: string;
   files: IframePromptInputFilePart[];
   iframeContext?: Record<string, unknown>;
+  additionalKwargs?: Record<string, unknown>;
 };
 
 const IMAGE_PRIORITY_INSTRUCTION = [
@@ -137,30 +138,23 @@ function normalizePageContext(
     : undefined;
 }
 
-export function buildIframeMessageText({
-  text,
+function buildIframePromptPrefix({
   prompt,
   pageContext,
   hasAttachedImage = false,
 }: {
-  text?: string;
   prompt?: string;
   pageContext?: BrainyPageContext;
   hasAttachedImage?: boolean;
 }) {
-  const primaryText = trimToUndefined(text) || trimToUndefined(prompt) || "";
   const sections: string[] = [];
 
-  if (primaryText) {
-    sections.push(primaryText);
-  }
-
   if (hasAttachedImage) {
     sections.push(IMAGE_PRIORITY_INSTRUCTION);
   }
 
   const normalizedPrompt = trimToUndefined(prompt);
-  if (normalizedPrompt && normalizedPrompt !== primaryText) {
+  if (normalizedPrompt) {
     sections.push(
       `<extension_prompt>\n${normalizedPrompt}\n</extension_prompt>`,
     );
@@ -190,6 +184,17 @@ export function buildIframeMessageText({
   return sections.join("\n\n");
 }
 
+export function buildIframeMessageText({
+  text,
+  prompt,
+}: {
+  text?: string;
+  prompt?: string;
+}) {
+  const primaryText = trimToUndefined(text) || trimToUndefined(prompt) || "";
+  return primaryText;
+}
+
 function buildScreenshotFileParts(
   screenshot: BrainyScreenshot | undefined,
 ): IframePromptInputFilePart[] {
@@ -249,8 +254,8 @@ export function parseBrainyChatSubmitMessage(
   const prompt = trimToUndefined(data.payload?.prompt);
   const pageContext = normalizePageContext(data.payload?.pageContext);
   const files = buildScreenshotFileParts(data.payload?.screenshot);
-  const submitText = buildIframeMessageText({
-    text,
+  const submitText = buildIframeMessageText({ text, prompt });
+  const promptPrefix = buildIframePromptPrefix({
     prompt,
     pageContext,
     hasAttachedImage: files.length > 0,
@@ -263,5 +268,6 @@ export function parseBrainyChatSubmitMessage(
     ...(requestId
       ? { iframeContext: { brainy_request_id: requestId } }
       : {}),
+    ...(promptPrefix ? { additionalKwargs: { prompt_prefix: promptPrefix } } : {}),
   };
 }