Merge 18bebf58e9 into 3809375694

app/components/mcp-market.tsx

@@ -23,10 +23,12 @@ import {
 } 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 +48,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<ListToolsResponse | null>(null);
   const [viewingServerId, setViewingServerId] = useState<string | undefined>();
   const [isLoading, setIsLoading] = useState(false);
   const [config, setConfig] = useState<McpConfigData>();
@@ -136,7 +138,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) {
@@ -732,16 +734,14 @@ export function McpMarketPage() {
                 {isLoading ? (
                   <div>Loading...</div>
                 ) : tools?.tools ? (
-                  tools.tools.map(
-                    (tool: ListToolsResponse["tools"], 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>
+                  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/mcp/actions.ts

@@ -1,4 +1,6 @@
-"use server";
+if (!EXPORT_MODE) {
+  ("use server");
+}
 import {
   createClient,
   executeRequest,
@@ -14,12 +16,17 @@ import {
   ServerConfig,
   ServerStatusResponse,
 } from "./types";
-import fs from "fs/promises";
-import path from "path";
-import { getServerSideConfig } from "../config/server";
 
 const logger = new MCPClientLogger("MCP Actions");
-const CONFIG_PATH = path.join(process.cwd(), "app/mcp/mcp_config.json");
+
+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");
+  }
+};
 
 const clientsMap = new Map<string, McpClientData>();
 
@@ -339,7 +346,14 @@ export async function executeMcpAction(
   request: McpRequestMessage,
 ) {
   try {
-    const client = clientsMap.get(clientId);
+    let client = clientsMap.get(clientId);
+    if (!client) {
+      client = [...clientsMap.values()].find(
+        (c) =>
+          c.tools?.tools &&
+          c.tools.tools.find((t) => t.name == request.params?.name),
+      );
+    }
     if (!client?.client) {
       throw new Error(`Client ${clientId} not found`);
     }
@@ -354,8 +368,28 @@ export async function executeMcpAction(
 // 获取 MCP 配置文件
 export async function getMcpConfigFromFile(): Promise<McpConfigData> {
   try {
-    const configStr = await fs.readFile(CONFIG_PATH, "utf-8");
-    return JSON.parse(configStr);
+    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);
+        const merged = { ...config.mcpServers };
+        if (storedConfig.mcpServers) {
+          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;
@@ -366,8 +400,25 @@ export async function getMcpConfigFromFile(): Promise<McpConfigData> {
 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));
+    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, 2),
+      );
+    }
   } catch (error) {
     throw error;
   }
@@ -376,8 +427,19 @@ async function updateMcpConfig(config: McpConfigData): Promise<void> {
 // 检查 MCP 是否启用
 export async function isMcpEnabled() {
   try {
-    const serverConfig = getServerSideConfig();
-    return serverConfig.enableMcp;
+    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/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,18 +16,34 @@ export async function createClient(
 ): Promise<Client> {
   logger.info(`Creating client for ${id}...`);
 
-  const transport = new StdioClientTransport({
-    command: config.command,
-    args: config.args,
-    env: {
-      ...Object.fromEntries(
-        Object.entries(process.env)
-          .filter(([_, v]) => v !== undefined)
-          .map(([k, v]) => [k, v as string]),
-      ),
-      ...(config.env || {}),
-    },
-  });
+  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");
+    } else {
+      const { StdioClientTransport } = await import(
+        "@modelcontextprotocol/sdk/client/stdio.js"
+      );
+      transport = new StdioClientTransport({
+        command: config.command,
+        args: config.args,
+        env: {
+          ...Object.fromEntries(
+            Object.entries(process.env)
+              .filter(([_, v]) => v !== undefined)
+              .map(([k, v]) => [k, v as string]),
+          ),
+          ...(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: {
-    name?: string;
-    description?: string;
-    inputSchema?: object;
-    [key: string]: any;
-  };
+  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;

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"],