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

# Conflicts:
#	frontend-web/src/components/workspace/settings/memory-settings-page.tsx
#	frontend-web/src/core/auth/sync.tsx

frontend-web/src/pages/IframeChatPage.tsx

@@ -33,6 +33,15 @@ import {
 } from "./iframe-chat-submit";
 
 type BrainyChatStatus = "started" | "finished";
+type BrainyChatInterruptMessage = {
+  source?: string;
+  type?: string;
+  payload?: {
+    reason?: string;
+    requestId?: string;
+  };
+  requestId?: string;
+};
 
 function postBrainyChatStatus(status: BrainyChatStatus, requestId: string) {
   window.parent?.postMessage(
@@ -206,10 +215,34 @@ export default function IframeChatPage() {
     [sendMessage, threadId],
   );
 
+  const handleInterrupt = useCallback(
+    async (message: BrainyChatInterruptMessage) => {
+      const targetRequestId = message.payload?.requestId?.trim();
+      if (targetRequestId) {
+        pendingRequestIdRef.current = targetRequestId;
+      }
+
+      console.log("收到插件中断消息", {
+        reason: message.payload?.reason,
+        requestId: message.requestId,
+        targetRequestId,
+      });
+
+      await thread.stop();
+    },
+    [thread],
+  );
+
   useEffect(() => {
-    const handleMessage = (event: MessageEvent<BrainyChatSubmitMessage>) => {
+    const handleMessage = (
+      event: MessageEvent<BrainyChatSubmitMessage | BrainyChatInterruptMessage>,
+    ) => {
       const data = event.data;
       if (data?.source !== "brainy-extension") return;
+      if (data?.type === "brainy:chat-interrupt") {
+        void handleInterrupt(data);
+        return;
+      }
       if (data?.type !== "brainy:chat-submit") return;
 
       const { submitText, files, iframeContext, additionalKwargs } =
@@ -220,8 +253,10 @@ export default function IframeChatPage() {
         prompt: data.payload?.prompt,
         pageContext: data.payload?.pageContext,
         screenshot: data.payload?.screenshot,
+        model: data.payload?.model,
         requestId: data.requestId,
         filesCount: files.length,
+        iframeContext,
       });
 
       if (!submitText && files.length === 0) return;
@@ -239,7 +274,7 @@ export default function IframeChatPage() {
     return () => {
       window.removeEventListener("message", handleMessage);
     };
-  }, [handleSubmit]);
+  }, [handleInterrupt, handleSubmit]);
 
   const messageListPaddingBottom = showFollowups
     ? MESSAGE_LIST_DEFAULT_PADDING_BOTTOM +

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

@@ -79,3 +79,24 @@ test("keeps screenshot-only iframe submissions in the conversation flow", () =>
   assert.equal(result.files[0]?.filename, "shot.jpg");
   assert.equal(result.files[0]?.mediaType, "image/jpeg");
 });
+
+test("maps iframe model selection into stream context model_name", () => {
+  const result = parseBrainyChatSubmitMessage({
+    source: "brainy-extension",
+    type: "brainy:chat-submit",
+    requestId: "iframe-456",
+    payload: {
+      text: "帮我总结这个页面",
+      model: {
+        label: "Qwen3-32B: 效果与速度均衡（推荐）",
+        value: "OpenAI3",
+      },
+    },
+  });
+
+  assert.equal(result.submitText, "帮我总结这个页面");
+  assert.deepEqual(result.iframeContext, {
+    brainy_request_id: "iframe-456",
+    model_name: "OpenAI3",
+  });
+});

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

@@ -21,6 +21,11 @@ type BrainyScreenshot = {
   images?: BrainyScreenshotImage[];
 };
 
+type BrainyModelSelection = {
+  label?: string;
+  value?: string;
+};
+
 export type BrainyChatSubmitMessage = {
   source?: string;
   type?: string;
@@ -29,6 +34,7 @@ export type BrainyChatSubmitMessage = {
     prompt?: string;
     pageContext?: BrainyPageContext;
     screenshot?: BrainyScreenshot;
+    model?: BrainyModelSelection;
   };
   requestId?: string;
 };
@@ -261,13 +267,20 @@ export function parseBrainyChatSubmitMessage(
     hasAttachedImage: files.length > 0,
   });
   const requestId = trimToUndefined(data.requestId);
+  const modelName = trimToUndefined(data.payload?.model?.value);
+
+  const iframeContext: Record<string, unknown> = {};
+  if (requestId) {
+    iframeContext.brainy_request_id = requestId;
+  }
+  if (modelName) {
+    iframeContext.model_name = modelName;
+  }
 
   return {
     submitText,
     files,
-    ...(requestId
-      ? { iframeContext: { brainy_request_id: requestId } }
-      : {}),
+    ...(Object.keys(iframeContext).length > 0 ? { iframeContext } : {}),
     ...(promptPrefix ? { additionalKwargs: { prompt_prefix: promptPrefix } } : {}),
   };
 }