Bump prettier from 3.0.2 to 3.6.2

---
updated-dependencies:
- dependency-name: prettier
  dependency-version: 3.6.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

README.md

@@ -22,12 +22,12 @@ English / [简体中文](./README_CN.md)
 [![MacOS][MacOS-image]][download-url]
 [![Linux][Linux-image]][download-url]
 
-[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) 
+[NextChatAI](https://nextchat.club?utm_source=readme) / [iOS APP](https://apps.apple.com/us/app/nextchat-ai/id6743085599) / [Web App Demo](https://app.nextchat.club) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Enterprise Edition](#enterprise-edition) 
 
 
 [saas-url]: https://nextchat.club?utm_source=readme
 [saas-image]: https://img.shields.io/badge/NextChat-Saas-green?logo=microsoftedge
-[web-url]: https://app.nextchat.dev/
+[web-url]: https://app.nextchat.club/
 [download-url]: https://github.com/Yidadaa/ChatGPT-Next-Web/releases
 [Web-image]: https://img.shields.io/badge/Web-PWA-orange?logo=microsoftedge
 [Windows-image]: https://img.shields.io/badge/-Windows-blue?logo=windows

app/client/platforms/openai.ts

@@ -56,7 +56,7 @@ export interface OpenAIListModelResponse {
 
 export interface RequestPayload {
   messages: {
-    role: "system" | "user" | "assistant";
+    role: "developer" | "system" | "user" | "assistant";
     content: string | MultimodalContent[];
   }[];
   stream?: boolean;
@@ -238,8 +238,16 @@ export class ChatGPTApi implements LLMApi {
         // Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore.
       };
 
-      // O1 使用 max_completion_tokens 控制token数 (https://platform.openai.com/docs/guides/reasoning#controlling-costs)
       if (isO1OrO3) {
+        // by default the o1/o3 models will not attempt to produce output that includes markdown formatting
+        // manually add "Formatting re-enabled" developer message to encourage markdown inclusion in model responses
+        // (https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/reasoning?tabs=python-secure#markdown-output)
+        requestPayload["messages"].unshift({
+          role: "developer",
+          content: "Formatting re-enabled",
+        });
+
+        // o1/o3 uses max_completion_tokens to control the number of tokens (https://platform.openai.com/docs/guides/reasoning#controlling-costs)
         requestPayload["max_completion_tokens"] = modelConfig.max_tokens;
       }
 

app/components/mcp-market.tsx

@@ -23,12 +23,10 @@ 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";
@@ -48,7 +46,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 | null>(null);
+  const [tools, setTools] = useState<ListToolsResponse["tools"] | null>(null);
   const [viewingServerId, setViewingServerId] = useState<string | undefined>();
   const [isLoading, setIsLoading] = useState(false);
   const [config, setConfig] = useState<McpConfigData>();
@@ -138,7 +136,7 @@ export function McpMarketPage() {
   useEffect(() => {
     if (!editingServerId || !config) return;
     const currentConfig = config.mcpServers[editingServerId];
-    if (isServerStdioConfig(currentConfig)) {
+    if (currentConfig) {
       // 从当前配置中提取用户配置
       const preset = presetServers.find((s) => s.id === editingServerId);
       if (preset?.configSchema) {
@@ -734,14 +732,16 @@ export function McpMarketPage() {
                 {isLoading ? (
                   <div>Loading...</div>
                 ) : tools?.tools ? (
-                  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}
+                  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>
                       </div>
-                    </div>
-                  ))
+                    ),
+                  )
                 ) : (
                   <div>No tools available</div>
                 )}

app/config/build.ts

@@ -40,17 +40,6 @@ 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

@@ -523,20 +523,15 @@ const openaiModels = [
 ];
 
 const googleModels = [
-  "gemini-1.0-pro", // Deprecated on 2/15/2025
   "gemini-1.5-pro-latest",
   "gemini-1.5-pro",
   "gemini-1.5-pro-002",
-  "gemini-1.5-pro-exp-0827",
   "gemini-1.5-flash-latest",
   "gemini-1.5-flash-8b-latest",
   "gemini-1.5-flash",
   "gemini-1.5-flash-8b",
   "gemini-1.5-flash-002",
-  "gemini-1.5-flash-exp-0827",
   "learnlm-1.5-pro-experimental",
-  "gemini-exp-1114",
-  "gemini-exp-1121",
   "gemini-exp-1206",
   "gemini-2.0-flash",
   "gemini-2.0-flash-exp",
@@ -546,6 +541,7 @@ const googleModels = [
   "gemini-2.0-flash-thinking-exp-01-21",
   "gemini-2.0-pro-exp",
   "gemini-2.0-pro-exp-02-05",
+  "gemini-2.5-pro-preview-06-05",
 ];
 
 const anthropicModels = [
@@ -632,6 +628,18 @@ const xAIModes = [
   "grok-2-vision-1212",
   "grok-2-vision",
   "grok-2-vision-latest",
+  "grok-3-mini-fast-beta",
+  "grok-3-mini-fast",
+  "grok-3-mini-fast-latest",
+  "grok-3-mini-beta",
+  "grok-3-mini",
+  "grok-3-mini-latest",
+  "grok-3-fast-beta",
+  "grok-3-fast",
+  "grok-3-fast-latest",
+  "grok-3-beta",
+  "grok-3",
+  "grok-3-latest",
 ];
 
 const chatglmModels = [

app/mcp/actions.ts

@@ -1,6 +1,4 @@
-if (!EXPORT_MODE) {
-  ("use server");
-}
+"use server";
 import {
   createClient,
   executeRequest,
@@ -16,17 +14,12 @@ 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 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 CONFIG_PATH = path.join(process.cwd(), "app/mcp/mcp_config.json");
 
 const clientsMap = new Map<string, McpClientData>();
 
@@ -346,14 +339,7 @@ export async function executeMcpAction(
   request: McpRequestMessage,
 ) {
   try {
-    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),
-      );
-    }
+    const client = clientsMap.get(clientId);
     if (!client?.client) {
       throw new Error(`Client ${clientId} not found`);
     }
@@ -368,28 +354,8 @@ export async function executeMcpAction(
 // 获取 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);
-        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);
-    }
+    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;
@@ -400,25 +366,8 @@ export async function getMcpConfigFromFile(): Promise<McpConfigData> {
 async function updateMcpConfig(config: McpConfigData): Promise<void> {
   try {
     // 确保目录存在
-    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),
-      );
-    }
+    await fs.mkdir(path.dirname(CONFIG_PATH), { recursive: true });
+    await fs.writeFile(CONFIG_PATH, JSON.stringify(config, null, 2));
   } catch (error) {
     throw error;
   }
@@ -427,19 +376,8 @@ async function updateMcpConfig(config: McpConfigData): Promise<void> {
 // 检查 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;
-    }
+    const serverConfig = getServerSideConfig();
+    return serverConfig.enableMcp;
   } catch (error) {
     logger.error(`Failed to check MCP status: ${error}`);
     return false;

app/mcp/client.ts

@@ -1,11 +1,7 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { MCPClientLogger } from "./logger";
-import {
-  ListToolsResponse,
-  McpRequestMessage,
-  ServerConfig,
-  isServerSseConfig,
-} from "./types";
+import { ListToolsResponse, McpRequestMessage, ServerConfig } from "./types";
 import { z } from "zod";
 
 const logger = new MCPClientLogger();
@@ -16,34 +12,18 @@ export async function createClient(
 ): Promise<Client> {
   logger.info(`Creating client for ${id}...`);
 
-  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 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,7 +8,6 @@ export interface McpRequestMessage {
   id?: string | number;
   method: "tools/call" | string;
   params?: {
-    name?: string;
     [key: string]: unknown;
   };
 }
@@ -66,14 +65,12 @@ export const McpNotificationsSchema: z.ZodType<McpNotifications> = z.object({
 // Next Chat
 ////////////
 export interface ListToolsResponse {
-  tools: ToolSchema[];
-}
-
-export interface ToolSchema {
-  name?: string;
-  description?: string;
-  inputSchema?: object;
-  [key: string]: any;
+  tools: {
+    name?: string;
+    description?: string;
+    inputSchema?: object;
+    [key: string]: any;
+  };
 }
 
 export type McpClientData =
@@ -113,31 +110,14 @@ export interface ServerStatusResponse {
 }
 
 // MCP 服务器配置相关类型
-
-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";
+export interface ServerConfig {
   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,12 +243,7 @@ export const useAccessStore = createPersistStore(
       );
     },
     fetch() {
-      const clientConfig = getClientConfig();
-      if (!(fetchState > 0) && clientConfig?.buildMode === "export") {
-        set(clientConfig);
-        fetchState = 2;
-      }
-      if (fetchState > 0 || clientConfig?.buildMode === "export") return;
+      if (fetchState > 0 || getClientConfig()?.buildMode === "export") return;
       fetchState = 1;
       fetch("/api/config", {
         method: "post",

app/typing.ts

@@ -1,7 +1,3 @@
-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,15 +6,9 @@ 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

@@ -83,7 +83,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^13.2.2",
-    "prettier": "^3.0.2",
+    "prettier": "^3.6.2",
     "ts-node": "^10.9.2",
     "tsx": "^4.16.0",
     "typescript": "5.2.2",

yarn.lock

@@ -7076,10 +7076,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.2.tgz#78fcecd6d870551aa5547437cdae39d4701dca5b"
-  integrity sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==
+prettier@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
+  integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
 
 pretty-format@^27.0.2:
   version "27.5.1"