Merge 62d32f317d into 3809375694

Support OpenAI o3 and o4-mini

README.md

@@ -7,7 +7,7 @@
 
 
 
-<h1 align="center">NextChat (ChatGPT Next Web)</h1>
+<h1 align="center">NextChat</h1>
 
 English / [简体中文](./README_CN.md)
 
@@ -22,8 +22,7 @@ English / [简体中文](./README_CN.md)
 [![MacOS][MacOS-image]][download-url]
 [![Linux][Linux-image]][download-url]
 
-[NextChatAI](https://nextchat.dev/chat?utm_source=readme) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) 
-[NextChatAI](https://nextchat.club?utm_source=readme) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Discord](https://discord.gg/YCkeafCafC) / [Enterprise Edition](#enterprise-edition) / [Twitter](https://twitter.com/NextChatDev)
+[NextChatAI](https://nextchat.club?utm_source=readme) / [iOS APP](https://apps.apple.com/us/app/nextchat-ai/id6743085599) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Enterprise Edition](#enterprise-edition) 
 
 
 [saas-url]: https://nextchat.club?utm_source=readme
@@ -41,29 +40,12 @@ English / [简体中文](./README_CN.md)
 
 </div>
 
-## 👋 Hey, NextChat is going to develop a native app!
+## 🥳 Cheer for NextChat iOS Version Online!
+> [👉 Click Here to Install Now](https://apps.apple.com/us/app/nextchat-ai/id6743085599)
 
-> This week we are going to start working on iOS and Android APP, and we want to find some reliable friends to do it together!
-
-
-✨ Several key points:
-
-- Starting from 0, you are a veteran
-- Completely open source, not hidden
-- Native development, pursuing the ultimate experience
-
-Will you come and do something together? 😎
-
-https://github.com/ChatGPTNextWeb/NextChat/issues/6269
-
-#Seeking for talents is thirsty #lack of people
-
-
-## 🥳 Cheer for DeepSeek, China's AI star!
- > Purpose-Built UI for DeepSeek Reasoner Model
- 
-<img src="https://github.com/user-attachments/assets/f3952210-3af1-4dc0-9b81-40eaa4847d9a"/>
+> [❤️ Source Code Coming Soon](https://github.com/ChatGPTNextWeb/NextChat-iOS)
 
+![Github iOS Image](https://github.com/user-attachments/assets/e0aa334f-4c13-4dc9-8310-e3b09fa4b9f3)
 
  
 ## 🫣 NextChat Support MCP  ! 

app/client/api.ts

@@ -40,6 +40,11 @@ export interface MultimodalContent {
   };
 }
 
+export interface MultimodalContentForAlibaba {
+  text?: string;
+  image?: string;
+}
+
 export interface RequestMessage {
   role: MessageRole;
   content: string | MultimodalContent[];

app/client/platforms/alibaba.ts

@@ -7,7 +7,10 @@ import {
   ChatMessageTool,
   usePluginStore,
 } from "@/app/store";
-import { streamWithThink } from "@/app/utils/chat";
+import {
+  preProcessImageContentForAlibabaDashScope,
+  streamWithThink,
+} from "@/app/utils/chat";
 import {
   ChatOptions,
   getHeaders,
@@ -15,12 +18,14 @@ import {
   LLMModel,
   SpeechOptions,
   MultimodalContent,
+  MultimodalContentForAlibaba,
 } from "../api";
 import { getClientConfig } from "@/app/config/client";
 import {
   getMessageTextContent,
   getMessageTextContentWithoutThinking,
   getTimeoutMSByModel,
+  isVisionModel,
 } from "@/app/utils";
 import { fetch } from "@/app/utils/stream";
 
@@ -89,14 +94,6 @@ export class QwenApi implements LLMApi {
   }
 
   async chat(options: ChatOptions) {
-    const messages = options.messages.map((v) => ({
-      role: v.role,
-      content:
-        v.role === "assistant"
-          ? getMessageTextContentWithoutThinking(v)
-          : getMessageTextContent(v),
-    }));
-
     const modelConfig = {
       ...useAppConfig.getState().modelConfig,
       ...useChatStore.getState().currentSession().mask.modelConfig,
@@ -105,6 +102,21 @@ export class QwenApi implements LLMApi {
       },
     };
 
+    const visionModel = isVisionModel(options.config.model);
+
+    const messages: ChatOptions["messages"] = [];
+    for (const v of options.messages) {
+      const content = (
+        visionModel
+          ? await preProcessImageContentForAlibabaDashScope(v.content)
+          : v.role === "assistant"
+          ? getMessageTextContentWithoutThinking(v)
+          : getMessageTextContent(v)
+      ) as any;
+
+      messages.push({ role: v.role, content });
+    }
+
     const shouldStream = !!options.config.stream;
     const requestPayload: RequestPayload = {
       model: modelConfig.model,
@@ -129,7 +141,7 @@ export class QwenApi implements LLMApi {
         "X-DashScope-SSE": shouldStream ? "enable" : "disable",
       };
 
-      const chatPath = this.path(Alibaba.ChatPath);
+      const chatPath = this.path(Alibaba.ChatPath(modelConfig.model));
       const chatPayload = {
         method: "POST",
         body: JSON.stringify(requestPayload),
@@ -162,7 +174,7 @@ export class QwenApi implements LLMApi {
             const json = JSON.parse(text);
             const choices = json.output.choices as Array<{
               message: {
-                content: string | null;
+                content: string | null | MultimodalContentForAlibaba[];
                 tool_calls: ChatMessageTool[];
                 reasoning_content: string | null;
               };
@@ -212,7 +224,9 @@ export class QwenApi implements LLMApi {
             } else if (content && content.length > 0) {
               return {
                 isThinking: false,
-                content: content,
+                content: Array.isArray(content)
+                  ? content.map((item) => item.text).join(",")
+                  : content,
               };
             }
 

app/client/platforms/openai.ts

@@ -198,7 +198,8 @@ export class ChatGPTApi implements LLMApi {
     const isDalle3 = _isDalle3(options.config.model);
     const isO1OrO3 =
       options.config.model.startsWith("o1") ||
-      options.config.model.startsWith("o3");
+      options.config.model.startsWith("o3") ||
+      options.config.model.startsWith("o4-mini");
     if (isDalle3) {
       const prompt = getMessageTextContent(
         options.messages.slice(-1)?.pop() as any,
@@ -243,7 +244,7 @@ export class ChatGPTApi implements LLMApi {
       }
 
       // add max_tokens to vision model
-      if (visionModel) {
+      if (visionModel && !isO1OrO3) {
         requestPayload["max_tokens"] = Math.max(modelConfig.max_tokens, 4000);
       }
     }

app/components/mcp-market.tsx

@@ -22,11 +22,12 @@ import {
   resumeMcpServer,
 } from "../mcp/actions";
 import {
-  ListToolsResponse,
+  ToolSchema,
   McpConfigData,
   PresetServer,
   ServerConfig,
   ServerStatusResponse,
+  isServerStdioConfig,
 } from "../mcp/types";
 import clsx from "clsx";
 import PlayIcon from "../icons/play.svg";
@@ -46,7 +47,7 @@ export function McpMarketPage() {
   const [searchText, setSearchText] = useState("");
   const [userConfig, setUserConfig] = useState<Record<string, any>>({});
   const [editingServerId, setEditingServerId] = useState<string | undefined>();
-  const [tools, setTools] = useState<ListToolsResponse["tools"] | null>(null);
+  const [tools, setTools] = useState<ToolSchema[] | null>(null);
   const [viewingServerId, setViewingServerId] = useState<string | undefined>();
   const [isLoading, setIsLoading] = useState(false);
   const [config, setConfig] = useState<McpConfigData>();
@@ -136,7 +137,7 @@ export function McpMarketPage() {
   useEffect(() => {
     if (!editingServerId || !config) return;
     const currentConfig = config.mcpServers[editingServerId];
-    if (currentConfig) {
+    if (isServerStdioConfig(currentConfig)) {
       // 从当前配置中提取用户配置
       const preset = presetServers.find((s) => s.id === editingServerId);
       if (preset?.configSchema) {
@@ -230,7 +231,7 @@ export function McpMarketPage() {
     try {
       const result = await getClientTools(id);
       if (result) {
-        setTools(result);
+        setTools(result?.tools);
       } else {
         throw new Error("Failed to load tools");
       }
@@ -731,17 +732,15 @@ export function McpMarketPage() {
               <div className={styles["tools-list"]}>
                 {isLoading ? (
                   <div>Loading...</div>
-                ) : tools?.tools ? (
-                  tools.tools.map(
-                    (tool: ListToolsResponse["tools"], index: number) => (
+                ) : tools ? (
+                  tools.map((tool: ToolSchema, index: number) => (
                     <div key={index} className={styles["tool-item"]}>
                       <div className={styles["tool-name"]}>{tool.name}</div>
                       <div className={styles["tool-description"]}>
                         {tool.description}
                       </div>
                     </div>
-                    ),
-                  )
+                  ))
                 ) : (
                   <div>No tools available</div>
                 )}

app/config/build.ts

@@ -40,6 +40,17 @@ export const getBuildConfig = () => {
     buildMode,
     isApp,
     template: process.env.DEFAULT_INPUT_TEMPLATE ?? DEFAULT_INPUT_TEMPLATE,
+
+    needCode: !!process.env.CODE,
+    hideUserApiKey: !!process.env.HIDE_USER_API_KEY,
+    baseUrl: process.env.BASE_URL,
+    openaiUrl: process.env.OPENAI_BASE_URL ?? process.env.BASE_URL,
+    disableGPT4: !!process.env.DISABLE_GPT4,
+    useCustomConfig: !!process.env.USE_CUSTOM_CONFIG,
+    hideBalanceQuery: !process.env.ENABLE_BALANCE_QUERY,
+    disableFastLink: !!process.env.DISABLE_FAST_LINK,
+    defaultModel: process.env.DEFAULT_MODEL ?? "",
+    enableMcp: process.env.ENABLE_MCP === "true",
   };
 };
 

app/constant.ts

@@ -221,7 +221,12 @@ export const ByteDance = {
 
 export const Alibaba = {
   ExampleEndpoint: ALIBABA_BASE_URL,
-  ChatPath: "v1/services/aigc/text-generation/generation",
+  ChatPath: (modelName: string) => {
+    if (modelName.includes("vl") || modelName.includes("omni")) {
+      return "v1/services/aigc/multimodal-generation/generation";
+    }
+    return `v1/services/aigc/text-generation/generation`;
+  },
 };
 
 export const Tencent = {
@@ -412,6 +417,14 @@ export const KnowledgeCutOffDate: Record<string, string> = {
   "gpt-4-turbo": "2023-12",
   "gpt-4-turbo-2024-04-09": "2023-12",
   "gpt-4-turbo-preview": "2023-12",
+  "gpt-4.1": "2024-06",
+  "gpt-4.1-2025-04-14": "2024-06",
+  "gpt-4.1-mini": "2024-06",
+  "gpt-4.1-mini-2025-04-14": "2024-06",
+  "gpt-4.1-nano": "2024-06",
+  "gpt-4.1-nano-2025-04-14": "2024-06",
+  "gpt-4.5-preview": "2023-10",
+  "gpt-4.5-preview-2025-02-27": "2023-10",
   "gpt-4o": "2023-10",
   "gpt-4o-2024-05-13": "2023-10",
   "gpt-4o-2024-08-06": "2023-10",
@@ -453,6 +466,7 @@ export const DEFAULT_TTS_VOICES = [
 export const VISION_MODEL_REGEXES = [
   /vision/,
   /gpt-4o/,
+  /gpt-4\.1/,
   /claude-3/,
   /gemini-1\.5/,
   /gemini-exp/,
@@ -464,6 +478,8 @@ export const VISION_MODEL_REGEXES = [
   /^dall-e-3$/, // Matches exactly "dall-e-3"
   /glm-4v/,
   /vl/i,
+  /o3/,
+  /o4-mini/,
 ];
 
 export const EXCLUDE_VISION_MODEL_REGEXES = [/claude-3-5-haiku-20241022/];
@@ -480,6 +496,14 @@ const openaiModels = [
   "gpt-4-32k-0613",
   "gpt-4-turbo",
   "gpt-4-turbo-preview",
+  "gpt-4.1",
+  "gpt-4.1-2025-04-14",
+  "gpt-4.1-mini",
+  "gpt-4.1-mini-2025-04-14",
+  "gpt-4.1-nano",
+  "gpt-4.1-nano-2025-04-14",
+  "gpt-4.5-preview",
+  "gpt-4.5-preview-2025-02-27",
   "gpt-4o",
   "gpt-4o-2024-05-13",
   "gpt-4o-2024-08-06",
@@ -494,6 +518,8 @@ const openaiModels = [
   "o1-mini",
   "o1-preview",
   "o3-mini",
+  "o3",
+  "o4-mini",
 ];
 
 const googleModels = [
@@ -570,6 +596,9 @@ const alibabaModes = [
   "qwen-max-0403",
   "qwen-max-0107",
   "qwen-max-longcontext",
+  "qwen-omni-turbo",
+  "qwen-vl-plus",
+  "qwen-vl-max",
 ];
 
 const tencentModels = [

app/mcp/actions.base.ts

@@ -0,0 +1,491 @@
+import {
+  createClient,
+  executeRequest,
+  listTools,
+  removeClient,
+} from "./client";
+import { MCPClientLogger } from "./logger";
+import {
+  DEFAULT_MCP_CONFIG,
+  McpClientData,
+  McpConfigData,
+  McpRequestMessage,
+  ServerConfig,
+  ServerStatusResponse,
+} from "./types";
+
+const JSON_INDENT = 2;
+
+const logger = new MCPClientLogger("MCP Actions");
+
+const getConfigPath = async () => {
+  if (EXPORT_MODE) {
+    return "/mcp/config.json";
+  } else {
+    const path = await import("path");
+    return path.join(process.cwd(), "app/mcp/mcp_config.json");
+  }
+};
+
+class ClientsMap extends Map<string, McpClientData> {
+  toolToClientMap: Map<string, string>;
+  constructor() {
+    super();
+    this.toolToClientMap = new Map<string, string>();
+  }
+
+  set(clientId: string, data: McpClientData): this {
+    super.set(clientId, data);
+
+    if (data?.tools?.tools) {
+      for (const tool of data.tools.tools) {
+        if (tool.name) {
+          this.toolToClientMap.set(tool.name, clientId);
+        }
+      }
+    } else {
+      this.purgeToolMappings(clientId);
+    }
+    return this;
+  }
+
+  delete(clientId: string): boolean {
+    const ret = clientsMap.delete(clientId);
+    this.purgeToolMappings(clientId);
+    return ret;
+  }
+
+  clear(): void {
+    super.clear();
+    this.toolToClientMap.clear();
+  }
+
+  getByToolName(toolName: string) {
+    const toolClientId = clientsMap.toolToClientMap.get(toolName);
+    if (toolClientId) {
+      return clientsMap.get(toolClientId);
+    }
+  }
+
+  private purgeToolMappings(clientId: string) {
+    for (const [tool, mappedId] of this.toolToClientMap.entries()) {
+      if (mappedId === clientId) {
+        this.toolToClientMap.delete(tool);
+      }
+    }
+  }
+}
+
+const clientsMap = new ClientsMap();
+
+// 获取客户端状态
+export async function getClientsStatus(): Promise<
+  Record<string, ServerStatusResponse>
+> {
+  const config = await getMcpConfigFromFile();
+  const result: Record<string, ServerStatusResponse> = {};
+
+  for (const clientId of Object.keys(config.mcpServers)) {
+    const status = clientsMap.get(clientId);
+    const serverConfig = config.mcpServers[clientId];
+
+    if (!serverConfig) {
+      result[clientId] = { status: "undefined", errorMsg: null };
+      continue;
+    }
+
+    if (serverConfig.status === "paused") {
+      result[clientId] = { status: "paused", errorMsg: null };
+      continue;
+    }
+
+    if (!status) {
+      result[clientId] = { status: "undefined", errorMsg: null };
+      continue;
+    }
+
+    if (
+      status.client === null &&
+      status.tools === null &&
+      status.errorMsg === null
+    ) {
+      result[clientId] = { status: "initializing", errorMsg: null };
+      continue;
+    }
+
+    if (status.errorMsg) {
+      result[clientId] = { status: "error", errorMsg: status.errorMsg };
+      continue;
+    }
+
+    if (status.client) {
+      result[clientId] = { status: "active", errorMsg: null };
+      continue;
+    }
+
+    result[clientId] = { status: "error", errorMsg: "Client not found" };
+  }
+
+  return result;
+}
+
+// 获取客户端工具
+export async function getClientTools(clientId: string) {
+  return clientsMap.get(clientId)?.tools ?? null;
+}
+
+// 获取可用客户端数量
+export async function getAvailableClientsCount() {
+  let count = 0;
+  clientsMap.forEach((map) => !map.errorMsg && count++);
+  return count;
+}
+
+// 获取所有客户端工具
+export async function getAllTools() {
+  const result = [];
+  for (const [clientId, status] of clientsMap.entries()) {
+    result.push({
+      clientId,
+      tools: status.tools,
+    });
+  }
+  return result;
+}
+
+// 初始化单个客户端
+async function initializeSingleClient(
+  clientId: string,
+  serverConfig: ServerConfig,
+) {
+  // 如果服务器状态是暂停，则不初始化
+  if (serverConfig.status === "paused") {
+    logger.info(`Skipping initialization for paused client [${clientId}]`);
+    return;
+  }
+
+  logger.info(`Initializing client [${clientId}]...`);
+
+  // 先设置初始化状态
+  clientsMap.set(clientId, {
+    client: null,
+    tools: null,
+    errorMsg: null, // null 表示正在初始化
+  });
+
+  // 异步初始化
+  createClient(clientId, serverConfig)
+    .then(async (client) => {
+      const tools = await listTools(client);
+      logger.info(
+        `Supported tools for [${clientId}]: ${JSON.stringify(tools, null, 2)}`,
+      );
+      clientsMap.set(clientId, { client, tools, errorMsg: null });
+      logger.success(`Client [${clientId}] initialized successfully`);
+    })
+    .catch((error) => {
+      clientsMap.set(clientId, {
+        client: null,
+        tools: null,
+        errorMsg: error instanceof Error ? error.message : String(error),
+      });
+      logger.error(`Failed to initialize client [${clientId}]: ${error}`);
+    });
+}
+
+// 初始化系统
+export async function initializeMcpSystem() {
+  logger.info("MCP Actions starting...");
+  try {
+    // 检查是否已有活跃的客户端
+    if (clientsMap.size > 0) {
+      logger.info("MCP system already initialized, skipping...");
+      return;
+    }
+
+    const config = await getMcpConfigFromFile();
+    // 初始化所有客户端
+    for (const [clientId, serverConfig] of Object.entries(config.mcpServers)) {
+      await initializeSingleClient(clientId, serverConfig);
+    }
+    return config;
+  } catch (error) {
+    logger.error(`Failed to initialize MCP system: ${error}`);
+    throw error;
+  }
+}
+
+// 添加服务器
+export async function addMcpServer(clientId: string, config: ServerConfig) {
+  try {
+    const currentConfig = await getMcpConfigFromFile();
+    const isNewServer = !(clientId in currentConfig.mcpServers);
+
+    // 如果是新服务器，设置默认状态为 active
+    if (isNewServer && !config.status) {
+      config.status = "active";
+    }
+
+    const newConfig = {
+      ...currentConfig,
+      mcpServers: {
+        ...currentConfig.mcpServers,
+        [clientId]: config,
+      },
+    };
+    await updateMcpConfig(newConfig);
+
+    // 只有新服务器或状态为 active 的服务器才初始化
+    if (isNewServer || config.status === "active") {
+      await initializeSingleClient(clientId, config);
+    }
+
+    return newConfig;
+  } catch (error) {
+    logger.error(`Failed to add server [${clientId}]: ${error}`);
+    throw error;
+  }
+}
+
+// 暂停服务器
+export async function pauseMcpServer(clientId: string) {
+  try {
+    const currentConfig = await getMcpConfigFromFile();
+    const serverConfig = currentConfig.mcpServers[clientId];
+    if (!serverConfig) {
+      throw new Error(`Server ${clientId} not found`);
+    }
+
+    // 先更新配置
+    const newConfig: McpConfigData = {
+      ...currentConfig,
+      mcpServers: {
+        ...currentConfig.mcpServers,
+        [clientId]: {
+          ...serverConfig,
+          status: "paused",
+        },
+      },
+    };
+    await updateMcpConfig(newConfig);
+
+    // 然后关闭客户端
+    const client = clientsMap.get(clientId);
+    if (client?.client) {
+      await removeClient(client.client);
+    }
+    clientsMap.delete(clientId);
+
+    return newConfig;
+  } catch (error) {
+    logger.error(`Failed to pause server [${clientId}]: ${error}`);
+    throw error;
+  }
+}
+
+// 恢复服务器
+export async function resumeMcpServer(clientId: string): Promise<void> {
+  try {
+    const currentConfig = await getMcpConfigFromFile();
+    const serverConfig = currentConfig.mcpServers[clientId];
+    if (!serverConfig) {
+      throw new Error(`Server ${clientId} not found`);
+    }
+
+    // 先尝试初始化客户端
+    logger.info(`Trying to initialize client [${clientId}]...`);
+    try {
+      const client = await createClient(clientId, serverConfig);
+      const tools = await listTools(client);
+      clientsMap.set(clientId, { client, tools, errorMsg: null });
+      logger.success(`Client [${clientId}] initialized successfully`);
+
+      // 初始化成功后更新配置
+      const newConfig: McpConfigData = {
+        ...currentConfig,
+        mcpServers: {
+          ...currentConfig.mcpServers,
+          [clientId]: {
+            ...serverConfig,
+            status: "active" as const,
+          },
+        },
+      };
+      await updateMcpConfig(newConfig);
+    } catch (error) {
+      const currentConfig = await getMcpConfigFromFile();
+      const serverConfig = currentConfig.mcpServers[clientId];
+
+      // 如果配置中存在该服务器，则更新其状态为 error
+      if (serverConfig) {
+        serverConfig.status = "error";
+        await updateMcpConfig(currentConfig);
+      }
+
+      // 初始化失败
+      clientsMap.set(clientId, {
+        client: null,
+        tools: null,
+        errorMsg: error instanceof Error ? error.message : String(error),
+      });
+      logger.error(`Failed to initialize client [${clientId}]: ${error}`);
+      throw error;
+    }
+  } catch (error) {
+    logger.error(`Failed to resume server [${clientId}]: ${error}`);
+    throw error;
+  }
+}
+
+// 移除服务器
+export async function removeMcpServer(clientId: string) {
+  try {
+    const currentConfig = await getMcpConfigFromFile();
+    const { [clientId]: _, ...rest } = currentConfig.mcpServers;
+    const newConfig = {
+      ...currentConfig,
+      mcpServers: rest,
+    };
+    await updateMcpConfig(newConfig);
+
+    // 关闭并移除客户端
+    const client = clientsMap.get(clientId);
+    if (client?.client) {
+      await removeClient(client.client);
+    }
+    clientsMap.delete(clientId);
+
+    return newConfig;
+  } catch (error) {
+    logger.error(`Failed to remove server [${clientId}]: ${error}`);
+    throw error;
+  }
+}
+
+// 重启所有客户端
+export async function restartAllClients() {
+  logger.info("Restarting all clients...");
+  try {
+    // 关闭所有客户端
+    for (const client of clientsMap.values()) {
+      if (client.client) {
+        await removeClient(client.client);
+      }
+    }
+
+    // 清空状态
+    clientsMap.clear();
+
+    // 重新初始化
+    const config = await getMcpConfigFromFile();
+    for (const [clientId, serverConfig] of Object.entries(config.mcpServers)) {
+      await initializeSingleClient(clientId, serverConfig);
+    }
+    return config;
+  } catch (error) {
+    logger.error(`Failed to restart clients: ${error}`);
+    throw error;
+  }
+}
+
+// 执行 MCP 请求
+export async function executeMcpAction(
+  clientId: string,
+  request: McpRequestMessage,
+) {
+  try {
+    let client = clientsMap.get(clientId);
+    if (
+      !client &&
+      request.params?.name &&
+      typeof request.params.name === "string"
+    ) {
+      client = clientsMap.getByToolName(request.params.name);
+    }
+    if (!client?.client) {
+      throw new Error(`Client ${clientId} not found`);
+    }
+    logger.info(`Executing request for [${clientId}]`);
+    return await executeRequest(client.client, request);
+  } catch (error) {
+    logger.error(`Failed to execute request for [${clientId}]: ${error}`);
+    throw error;
+  }
+}
+
+// 获取 MCP 配置文件
+export async function getMcpConfigFromFile(): Promise<McpConfigData> {
+  try {
+    if (EXPORT_MODE) {
+      const res = await fetch(await getConfigPath());
+      const config: McpConfigData = await res.json();
+      const storage = localStorage;
+      const storedConfig_str = storage.getItem("McpConfig");
+      if (storedConfig_str) {
+        const storedConfig: McpConfigData = JSON.parse(storedConfig_str);
+        // Create a merged configuration that combines both sources
+        const merged = { ...config.mcpServers };
+        if (storedConfig.mcpServers) {
+          // Ensure we process all servers from stored config
+          for (const id in storedConfig.mcpServers) {
+            merged[id] = { ...merged[id], ...storedConfig.mcpServers[id] };
+          }
+        }
+
+        config.mcpServers = merged;
+      }
+      return config;
+    } else {
+      const fs = await import("fs/promises");
+      const configStr = await fs.readFile(await getConfigPath(), "utf-8");
+      return JSON.parse(configStr);
+    }
+  } catch (error) {
+    logger.error(`Failed to load MCP config, using default config: ${error}`);
+    return DEFAULT_MCP_CONFIG;
+  }
+}
+
+// 更新 MCP 配置文件
+async function updateMcpConfig(config: McpConfigData): Promise<void> {
+  if (EXPORT_MODE) {
+    try {
+      const storage = localStorage;
+      storage.setItem("McpConfig", JSON.stringify(config));
+    } catch (storageError) {
+      logger.warn(`Failed to save MCP config to localStorage: ${storageError}`);
+      // Continue execution without storage
+    }
+  } else {
+    const fs = await import("fs/promises");
+    const path = await import("path");
+    // 确保目录存在
+    await fs.mkdir(path.dirname(await getConfigPath()), { recursive: true });
+    await fs.writeFile(
+      await getConfigPath(),
+      JSON.stringify(config, null, JSON_INDENT),
+    );
+  }
+}
+
+// 检查 MCP 是否启用
+export async function isMcpEnabled() {
+  try {
+    const config = await getMcpConfigFromFile();
+    if (typeof config.enableMcp === "boolean") {
+      return config.enableMcp;
+    }
+    if (EXPORT_MODE) {
+      const { getClientConfig } = await import("../config/client");
+      const clientConfig = getClientConfig();
+      return clientConfig?.enableMcp === true;
+    } else {
+      const { getServerSideConfig } = await import("../config/server");
+      const serverConfig = getServerSideConfig();
+      return serverConfig.enableMcp;
+    }
+  } catch (error) {
+    logger.error(`Failed to check MCP status: ${error}`);
+    return false;
+  }
+}

app/mcp/actions.client.ts

@@ -0,0 +1 @@
+export * from "./actions.base";

app/mcp/actions.server.ts

@@ -0,0 +1,2 @@
+"use server";
+export * from "./actions.base";

app/mcp/actions.ts

@@ -1,385 +1,56 @@
-"use server";
-import {
-  createClient,
-  executeRequest,
-  listTools,
-  removeClient,
-} from "./client";
-import { MCPClientLogger } from "./logger";
-import {
-  DEFAULT_MCP_CONFIG,
-  McpClientData,
-  McpConfigData,
-  McpRequestMessage,
-  ServerConfig,
-  ServerStatusResponse,
-} from "./types";
-import fs from "fs/promises";
-import path from "path";
-import { getServerSideConfig } from "../config/server";
+import { McpRequestMessage, ServerConfig } from "./types";
 
-const logger = new MCPClientLogger("MCP Actions");
-const CONFIG_PATH = path.join(process.cwd(), "app/mcp/mcp_config.json");
+let actionsHost: typeof import("./actions.base") | undefined;
 
-const clientsMap = new Map<string, McpClientData>();
-
-// 获取客户端状态
-export async function getClientsStatus(): Promise<
-  Record<string, ServerStatusResponse>
-> {
-  const config = await getMcpConfigFromFile();
-  const result: Record<string, ServerStatusResponse> = {};
-
-  for (const clientId of Object.keys(config.mcpServers)) {
-    const status = clientsMap.get(clientId);
-    const serverConfig = config.mcpServers[clientId];
-
-    if (!serverConfig) {
-      result[clientId] = { status: "undefined", errorMsg: null };
-      continue;
-    }
-
-    if (serverConfig.status === "paused") {
-      result[clientId] = { status: "paused", errorMsg: null };
-      continue;
-    }
-
-    if (!status) {
-      result[clientId] = { status: "undefined", errorMsg: null };
-      continue;
-    }
-
-    if (
-      status.client === null &&
-      status.tools === null &&
-      status.errorMsg === null
-    ) {
-      result[clientId] = { status: "initializing", errorMsg: null };
-      continue;
-    }
-
-    if (status.errorMsg) {
-      result[clientId] = { status: "error", errorMsg: status.errorMsg };
-      continue;
-    }
-
-    if (status.client) {
-      result[clientId] = { status: "active", errorMsg: null };
-      continue;
-    }
-
-    result[clientId] = { status: "error", errorMsg: "Client not found" };
-  }
-
-  return result;
-}
-
-// 获取客户端工具
-export async function getClientTools(clientId: string) {
-  return clientsMap.get(clientId)?.tools ?? null;
-}
-
-// 获取可用客户端数量
-export async function getAvailableClientsCount() {
-  let count = 0;
-  clientsMap.forEach((map) => !map.errorMsg && count++);
-  return count;
-}
-
-// 获取所有客户端工具
-export async function getAllTools() {
-  const result = [];
-  for (const [clientId, status] of clientsMap.entries()) {
-    result.push({
-      clientId,
-      tools: status.tools,
-    });
-  }
-  return result;
-}
-
-// 初始化单个客户端
-async function initializeSingleClient(
-  clientId: string,
-  serverConfig: ServerConfig,
-) {
-  // 如果服务器状态是暂停，则不初始化
-  if (serverConfig.status === "paused") {
-    logger.info(`Skipping initialization for paused client [${clientId}]`);
-    return;
-  }
-
-  logger.info(`Initializing client [${clientId}]...`);
-
-  // 先设置初始化状态
-  clientsMap.set(clientId, {
-    client: null,
-    tools: null,
-    errorMsg: null, // null 表示正在初始化
-  });
-
-  // 异步初始化
-  createClient(clientId, serverConfig)
-    .then(async (client) => {
-      const tools = await listTools(client);
-      logger.info(
-        `Supported tools for [${clientId}]: ${JSON.stringify(tools, null, 2)}`,
-      );
-      clientsMap.set(clientId, { client, tools, errorMsg: null });
-      logger.success(`Client [${clientId}] initialized successfully`);
-    })
-    .catch((error) => {
-      clientsMap.set(clientId, {
-        client: null,
-        tools: null,
-        errorMsg: error instanceof Error ? error.message : String(error),
-      });
-      logger.error(`Failed to initialize client [${clientId}]: ${error}`);
-    });
-}
-
-// 初始化系统
-export async function initializeMcpSystem() {
-  logger.info("MCP Actions starting...");
-  try {
-    // 检查是否已有活跃的客户端
-    if (clientsMap.size > 0) {
-      logger.info("MCP system already initialized, skipping...");
-      return;
-    }
-
-    const config = await getMcpConfigFromFile();
-    // 初始化所有客户端
-    for (const [clientId, serverConfig] of Object.entries(config.mcpServers)) {
-      await initializeSingleClient(clientId, serverConfig);
-    }
-    return config;
-  } catch (error) {
-    logger.error(`Failed to initialize MCP system: ${error}`);
-    throw error;
-  }
-}
-
-// 添加服务器
-export async function addMcpServer(clientId: string, config: ServerConfig) {
-  try {
-    const currentConfig = await getMcpConfigFromFile();
-    const isNewServer = !(clientId in currentConfig.mcpServers);
-
-    // 如果是新服务器，设置默认状态为 active
-    if (isNewServer && !config.status) {
-      config.status = "active";
-    }
-
-    const newConfig = {
-      ...currentConfig,
-      mcpServers: {
-        ...currentConfig.mcpServers,
-        [clientId]: config,
-      },
-    };
-    await updateMcpConfig(newConfig);
-
-    // 只有新服务器或状态为 active 的服务器才初始化
-    if (isNewServer || config.status === "active") {
-      await initializeSingleClient(clientId, config);
-    }
-
-    return newConfig;
-  } catch (error) {
-    logger.error(`Failed to add server [${clientId}]: ${error}`);
-    throw error;
-  }
-}
-
-// 暂停服务器
-export async function pauseMcpServer(clientId: string) {
-  try {
-    const currentConfig = await getMcpConfigFromFile();
-    const serverConfig = currentConfig.mcpServers[clientId];
-    if (!serverConfig) {
-      throw new Error(`Server ${clientId} not found`);
-    }
-
-    // 先更新配置
-    const newConfig: McpConfigData = {
-      ...currentConfig,
-      mcpServers: {
-        ...currentConfig.mcpServers,
-        [clientId]: {
-          ...serverConfig,
-          status: "paused",
-        },
-      },
-    };
-    await updateMcpConfig(newConfig);
-
-    // 然后关闭客户端
-    const client = clientsMap.get(clientId);
-    if (client?.client) {
-      await removeClient(client.client);
-    }
-    clientsMap.delete(clientId);
-
-    return newConfig;
-  } catch (error) {
-    logger.error(`Failed to pause server [${clientId}]: ${error}`);
-    throw error;
-  }
-}
-
-// 恢复服务器
-export async function resumeMcpServer(clientId: string): Promise<void> {
-  try {
-    const currentConfig = await getMcpConfigFromFile();
-    const serverConfig = currentConfig.mcpServers[clientId];
-    if (!serverConfig) {
-      throw new Error(`Server ${clientId} not found`);
-    }
-
-    // 先尝试初始化客户端
-    logger.info(`Trying to initialize client [${clientId}]...`);
-    try {
-      const client = await createClient(clientId, serverConfig);
-      const tools = await listTools(client);
-      clientsMap.set(clientId, { client, tools, errorMsg: null });
-      logger.success(`Client [${clientId}] initialized successfully`);
-
-      // 初始化成功后更新配置
-      const newConfig: McpConfigData = {
-        ...currentConfig,
-        mcpServers: {
-          ...currentConfig.mcpServers,
-          [clientId]: {
-            ...serverConfig,
-            status: "active" as const,
-          },
-        },
-      };
-      await updateMcpConfig(newConfig);
-    } catch (error) {
-      const currentConfig = await getMcpConfigFromFile();
-      const serverConfig = currentConfig.mcpServers[clientId];
-
-      // 如果配置中存在该服务器，则更新其状态为 error
-      if (serverConfig) {
-        serverConfig.status = "error";
-        await updateMcpConfig(currentConfig);
-      }
-
-      // 初始化失败
-      clientsMap.set(clientId, {
-        client: null,
-        tools: null,
-        errorMsg: error instanceof Error ? error.message : String(error),
-      });
-      logger.error(`Failed to initialize client [${clientId}]: ${error}`);
-      throw error;
-    }
-  } catch (error) {
-    logger.error(`Failed to resume server [${clientId}]: ${error}`);
-    throw error;
-  }
-}
-
-// 移除服务器
-export async function removeMcpServer(clientId: string) {
-  try {
-    const currentConfig = await getMcpConfigFromFile();
-    const { [clientId]: _, ...rest } = currentConfig.mcpServers;
-    const newConfig = {
-      ...currentConfig,
-      mcpServers: rest,
-    };
-    await updateMcpConfig(newConfig);
-
-    // 关闭并移除客户端
-    const client = clientsMap.get(clientId);
-    if (client?.client) {
-      await removeClient(client.client);
-    }
-    clientsMap.delete(clientId);
-
-    return newConfig;
-  } catch (error) {
-    logger.error(`Failed to remove server [${clientId}]: ${error}`);
-    throw error;
-  }
-}
-
-// 重启所有客户端
-export async function restartAllClients() {
-  logger.info("Restarting all clients...");
-  try {
-    // 关闭所有客户端
-    for (const client of clientsMap.values()) {
-      if (client.client) {
-        await removeClient(client.client);
+const actions = async () => {
+  if (!actionsHost) {
+    if (EXPORT_MODE) {
+      actionsHost = await import("./actions.client");
+    } else {
+      actionsHost = await import("./actions.server");
     }
   }
 
-    // 清空状态
-    clientsMap.clear();
+  return actionsHost;
+};
 
-    // 重新初始化
-    const config = await getMcpConfigFromFile();
-    for (const [clientId, serverConfig] of Object.entries(config.mcpServers)) {
-      await initializeSingleClient(clientId, serverConfig);
-    }
-    return config;
-  } catch (error) {
-    logger.error(`Failed to restart clients: ${error}`);
-    throw error;
-  }
-}
+export const getAvailableClientsCount = async () => {
+  return (await actions()).getAvailableClientsCount();
+};
+export const isMcpEnabled = async () => {
+  return (await actions()).isMcpEnabled();
+};
+export const initializeMcpSystem = async () => {
+  return (await actions()).initializeMcpSystem();
+};
+export const addMcpServer = async (clientId: string, config: ServerConfig) => {
+  return (await actions()).addMcpServer(clientId, config);
+};
 
-// 执行 MCP 请求
-export async function executeMcpAction(
+export const getClientsStatus = async () => {
+  return (await actions()).getClientsStatus();
+};
+export const getClientTools = async (clientId: string) => {
+  return (await actions()).getClientTools(clientId);
+};
+export const getMcpConfigFromFile = async () => {
+  return (await actions()).getMcpConfigFromFile();
+};
+export const pauseMcpServer = async (clientId: string) => {
+  return (await actions()).pauseMcpServer(clientId);
+};
+export const restartAllClients = async () => {
+  return (await actions()).restartAllClients();
+};
+export const resumeMcpServer = async (clientId: string) => {
+  return (await actions()).resumeMcpServer(clientId);
+};
+export const executeMcpAction = async (
   clientId: string,
   request: McpRequestMessage,
-) {
-  try {
-    const client = clientsMap.get(clientId);
-    if (!client?.client) {
-      throw new Error(`Client ${clientId} not found`);
-    }
-    logger.info(`Executing request for [${clientId}]`);
-    return await executeRequest(client.client, request);
-  } catch (error) {
-    logger.error(`Failed to execute request for [${clientId}]: ${error}`);
-    throw error;
-  }
-}
-
-// 获取 MCP 配置文件
-export async function getMcpConfigFromFile(): Promise<McpConfigData> {
-  try {
-    const configStr = await fs.readFile(CONFIG_PATH, "utf-8");
-    return JSON.parse(configStr);
-  } catch (error) {
-    logger.error(`Failed to load MCP config, using default config: ${error}`);
-    return DEFAULT_MCP_CONFIG;
-  }
-}
-
-// 更新 MCP 配置文件
-async function updateMcpConfig(config: McpConfigData): Promise<void> {
-  try {
-    // 确保目录存在
-    await fs.mkdir(path.dirname(CONFIG_PATH), { recursive: true });
-    await fs.writeFile(CONFIG_PATH, JSON.stringify(config, null, 2));
-  } catch (error) {
-    throw error;
-  }
-}
-
-// 检查 MCP 是否启用
-export async function isMcpEnabled() {
-  try {
-    const serverConfig = getServerSideConfig();
-    return serverConfig.enableMcp;
-  } catch (error) {
-    logger.error(`Failed to check MCP status: ${error}`);
-    return false;
-  }
-}
+) => {
+  return (await actions()).executeMcpAction(clientId, request);
+};
+export const getAllTools = async () => {
+  return (await actions()).getAllTools();
+};

app/mcp/client.ts

@@ -1,7 +1,11 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { MCPClientLogger } from "./logger";
-import { ListToolsResponse, McpRequestMessage, ServerConfig } from "./types";
+import {
+  ListToolsResponse,
+  McpRequestMessage,
+  ServerConfig,
+  isServerSseConfig,
+} from "./types";
 import { z } from "zod";
 
 const logger = new MCPClientLogger();
@@ -12,7 +16,23 @@ export async function createClient(
 ): Promise<Client> {
   logger.info(`Creating client for ${id}...`);
 
-  const transport = new StdioClientTransport({
+  let transport;
+
+  if (isServerSseConfig(config)) {
+    const { SSEClientTransport } = await import(
+      "@modelcontextprotocol/sdk/client/sse.js"
+    );
+    transport = new SSEClientTransport(new URL(config.url));
+  } else {
+    if (EXPORT_MODE) {
+      throw new Error(
+        "Cannot use stdio transport in export mode. Please use SSE transport configuration instead.",
+      );
+    } else {
+      const { StdioClientTransport } = await import(
+        "@modelcontextprotocol/sdk/client/stdio.js"
+      );
+      transport = new StdioClientTransport({
         command: config.command,
         args: config.args,
         env: {
@@ -24,6 +44,8 @@ export async function createClient(
           ...(config.env || {}),
         },
       });
+    }
+  }
 
   const client = new Client(
     {

app/mcp/types.ts

@@ -8,6 +8,7 @@ export interface McpRequestMessage {
   id?: string | number;
   method: "tools/call" | string;
   params?: {
+    name?: string;
     [key: string]: unknown;
   };
 }
@@ -65,12 +66,14 @@ export const McpNotificationsSchema: z.ZodType<McpNotifications> = z.object({
 // Next Chat
 ////////////
 export interface ListToolsResponse {
-  tools: {
+  tools: ToolSchema[];
+}
+
+export interface ToolSchema {
   name?: string;
   description?: string;
   inputSchema?: object;
   [key: string]: any;
-  };
 }
 
 export type McpClientData =
@@ -110,14 +113,31 @@ export interface ServerStatusResponse {
 }
 
 // MCP 服务器配置相关类型
-export interface ServerConfig {
+
+export const isServerSseConfig = (c?: ServerConfig): c is ServerSseConfig =>
+  c !== null && typeof c === "object" && c.type === "sse";
+export const isServerStdioConfig = (c?: ServerConfig): c is ServerStdioConfig =>
+  c !== null && typeof c === "object" && (!c.type || c.type === "stdio");
+
+export type ServerConfig = ServerStdioConfig | ServerSseConfig;
+
+export interface ServerStdioConfig {
+  type?: "stdio";
   command: string;
   args: string[];
   env?: Record<string, string>;
   status?: "active" | "paused" | "error";
 }
 
+export interface ServerSseConfig {
+  type: "sse";
+  url: string;
+  headers?: Record<string, string>;
+  status?: "active" | "paused" | "error";
+}
+
 export interface McpConfigData {
+  enableMcp?: boolean;
   // MCP Server 的配置
   mcpServers: Record<string, ServerConfig>;
 }

app/store/access.ts

@@ -243,7 +243,12 @@ export const useAccessStore = createPersistStore(
       );
     },
     fetch() {
-      if (fetchState > 0 || getClientConfig()?.buildMode === "export") return;
+      const clientConfig = getClientConfig();
+      if (!(fetchState > 0) && clientConfig?.buildMode === "export") {
+        set(clientConfig);
+        fetchState = 2;
+      }
+      if (fetchState > 0 || clientConfig?.buildMode === "export") return;
       fetchState = 1;
       fetch("/api/config", {
         method: "post",

app/typing.ts

@@ -1,3 +1,7 @@
+declare global {
+  const EXPORT_MODE: boolean;
+}
+
 export type Updater<T> = (updater: (value: T) => void) => void;
 
 export const ROLES = ["system", "user", "assistant"] as const;

app/utils/chat.ts

@@ -3,7 +3,7 @@ import {
   UPLOAD_URL,
   REQUEST_TIMEOUT_MS,
 } from "@/app/constant";
-import { RequestMessage } from "@/app/client/api";
+import { MultimodalContent, RequestMessage } from "@/app/client/api";
 import Locale from "@/app/locales";
 import {
   EventStreamContentType,
@@ -70,8 +70,9 @@ export function compressImage(file: Blob, maxSize: number): Promise<string> {
   });
 }
 
-export async function preProcessImageContent(
+export async function preProcessImageContentBase(
   content: RequestMessage["content"],
+  transformImageUrl: (url: string) => Promise<{ [key: string]: any }>,
 ) {
   if (typeof content === "string") {
     return content;
@@ -81,7 +82,7 @@ export async function preProcessImageContent(
     if (part?.type == "image_url" && part?.image_url?.url) {
       try {
         const url = await cacheImageToBase64Image(part?.image_url?.url);
-        result.push({ type: part.type, image_url: { url } });
+        result.push(await transformImageUrl(url));
       } catch (error) {
         console.error("Error processing image URL:", error);
       }
@@ -92,6 +93,23 @@ export async function preProcessImageContent(
   return result;
 }
 
+export async function preProcessImageContent(
+  content: RequestMessage["content"],
+) {
+  return preProcessImageContentBase(content, async (url) => ({
+    type: "image_url",
+    image_url: { url },
+  })) as Promise<MultimodalContent[] | string>;
+}
+
+export async function preProcessImageContentForAlibabaDashScope(
+  content: RequestMessage["content"],
+) {
+  return preProcessImageContentBase(content, async (url) => ({
+    image: url,
+  }));
+}
+
 const imageCaches: Record<string, string> = {};
 export function cacheImageToBase64Image(imageUrl: string) {
   if (imageUrl.includes(CACHE_URL_PREFIX)) {

jest.config.ts

@@ -15,6 +15,8 @@ const config: Config = {
   moduleNameMapper: {
     "^@/(.*)$": "<rootDir>/$1",
   },
+  extensionsToTreatAsEsm: [".ts", ".tsx"],
+  injectGlobals: true,
 };
 
 // createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async

jest.setup.ts

@@ -1,24 +1,22 @@
 // Learn more: https://github.com/testing-library/jest-dom
 import "@testing-library/jest-dom";
+import { jest } from "@jest/globals";
 
 global.fetch = jest.fn(() =>
   Promise.resolve({
     ok: true,
     status: 200,
-    json: () => Promise.resolve({}),
+    json: () => Promise.resolve([]),
     headers: new Headers(),
     redirected: false,
     statusText: "OK",
     type: "basic",
     url: "",
-    clone: function () {
-      return this;
-    },
     body: null,
     bodyUsed: false,
     arrayBuffer: () => Promise.resolve(new ArrayBuffer(0)),
     blob: () => Promise.resolve(new Blob()),
     formData: () => Promise.resolve(new FormData()),
     text: () => Promise.resolve(""),
-  }),
+  } as Response),
 );

next.config.mjs

@@ -6,9 +6,15 @@ console.log("[Next] build mode", mode);
 const disableChunk = !!process.env.DISABLE_CHUNK || mode === "export";
 console.log("[Next] build with chunk: ", !disableChunk);
 
+const EXPORT_MODE = mode === "export";
+
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   webpack(config) {
+    config.plugins.push(new webpack.DefinePlugin({
+      EXPORT_MODE: EXPORT_MODE
+    }));
     config.module.rules.push({
       test: /\.svg$/,
       use: ["@svgr/webpack"],

package.json

@@ -17,8 +17,8 @@
     "prompts": "node ./scripts/fetch-prompts.mjs",
     "prepare": "husky install",
     "proxy-dev": "sh ./scripts/init-proxy.sh && proxychains -f ./scripts/proxychains.conf yarn dev",
-    "test": "jest --watch",
-    "test:ci": "jest --ci"
+    "test": "node --no-warnings --experimental-vm-modules $(yarn bin jest) --watch",
+    "test:ci": "node --no-warnings --experimental-vm-modules $(yarn bin jest) --ci"
   },
   "dependencies": {
     "@fortaine/fetch-event-source": "^3.0.6",

test/vision-model-checker.test.ts

@@ -1,3 +1,4 @@
+import { jest } from "@jest/globals";
 import { isVisionModel } from "../app/utils";
 
 describe("isVisionModel", () => {