fix max_completions_tokens

2026-03-04 03:04:27 +08:00 · 2024-10-16 16:24:02 +08:00
38 changed files with 102 additions and 927 deletions
--- a/.github/workflows/deploy_preview.yml
+++ b/.github/workflows/deploy_preview.yml
@@ -3,7 +3,9 @@ name: VercelPreviewDeployment
 on:
  pull_request_target:
    types:
-      - review_requested
+      - opened
+      - synchronize
+      - reopened

 env:
  VERCEL_TEAM: ${{ secrets.VERCEL_TEAM }}
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -19,26 +19,26 @@ jobs:
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      -
+      
+      - 
        name: Extract metadata (tags, labels) for Docker
        id: meta
        uses: docker/metadata-action@v4
        with:
-          images: ${{ secrets.DOCKER_USERNAME }}/chatgpt-next-web
+          images: yidadaa/chatgpt-next-web
          tags: |
            type=raw,value=latest
            type=ref,event=tag
-
-      -
+      
+      - 
        name: Set up QEMU
        uses: docker/setup-qemu-action@v2

-      -
+      - 
        name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
-
-      -
+      
+      - 
        name: Build and push Docker image
        uses: docker/build-push-action@v4
        with:
@@ -49,4 +49,4 @@ jobs:
          labels: ${{ steps.meta.outputs.labels }}
          cache-from: type=gha
          cache-to: type=gha,mode=max
-
+            
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,39 +0,0 @@
-name: Run Tests
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - "!*"
-  pull_request:
-    types:
-      - review_requested
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "yarn"
-
-      - name: Cache node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Run Jest tests
-        run: yarn test:ci
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ One-Click to get a well-designed cross-platform ChatGPT web UI, with GPT3, GPT4
 [MacOS-image]: https://img.shields.io/badge/-MacOS-black?logo=apple
 [Linux-image]: https://img.shields.io/badge/-Linux-333?logo=ubuntu

-[<img src="https://vercel.com/button" alt="Deploy on Zeabur" height="30">](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FChatGPTNextWeb%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=nextchat&repository-name=NextChat) [<img src="https://zeabur.com/button.svg" alt="Deploy on Zeabur" height="30">](https://zeabur.com/templates/ZBUEFA)  [<img src="https://gitpod.io/button/open-in-gitpod.svg" alt="Open in Gitpod" height="30">](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web) [<img src="https://img.shields.io/badge/BT_Deploy-Install-20a53a" alt="Open in Gitpod" height="30">](https://www.bt.cn/new/download.html)
+[<img src="https://vercel.com/button" alt="Deploy on Zeabur" height="30">](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FChatGPTNextWeb%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=nextchat&repository-name=NextChat) [<img src="https://zeabur.com/button.svg" alt="Deploy on Zeabur" height="30">](https://zeabur.com/templates/ZBUEFA)  [<img src="https://gitpod.io/button/open-in-gitpod.svg" alt="Open in Gitpod" height="30">](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web)

 [<img src="https://github.com/user-attachments/assets/903482d4-3e87-4134-9af1-f2588fa90659" height="60" width="288" >](https://monica.im/?utm=nxcrp)

--- a/app/api/[provider]/[...path]/route.ts
+++ b/app/api/[provider]/[...path]/route.ts
@@ -10,7 +10,6 @@ import { handle as alibabaHandler } from "../../alibaba";
 import { handle as moonshotHandler } from "../../moonshot";
 import { handle as stabilityHandler } from "../../stability";
 import { handle as iflytekHandler } from "../../iflytek";
-import { handle as xaiHandler } from "../../xai";
 import { handle as proxyHandler } from "../../proxy";

 async function handle(
@@ -39,8 +38,6 @@ async function handle(
      return stabilityHandler(req, { params });
    case ApiPath.Iflytek:
      return iflytekHandler(req, { params });
-    case ApiPath.XAI:
-      return xaiHandler(req, { params });
    case ApiPath.OpenAI:
      return openaiHandler(req, { params });
    default:
--- a/app/api/auth.ts
+++ b/app/api/auth.ts
@@ -92,9 +92,6 @@ export function auth(req: NextRequest, modelProvider: ModelProvider) {
        systemApiKey =
          serverConfig.iflytekApiKey + ":" + serverConfig.iflytekApiSecret;
        break;
-      case ModelProvider.XAI:
-        systemApiKey = serverConfig.xaiApiKey;
-        break;
      case ModelProvider.GPT:
      default:
        if (req.nextUrl.pathname.includes("azure/deployments")) {
--- a/app/api/xai.ts
+++ b/app/api/xai.ts
@@ -1,128 +0,0 @@
-import { getServerSideConfig } from "@/app/config/server";
-import {
-  XAI_BASE_URL,
-  ApiPath,
-  ModelProvider,
-  ServiceProvider,
-} from "@/app/constant";
-import { prettyObject } from "@/app/utils/format";
-import { NextRequest, NextResponse } from "next/server";
-import { auth } from "@/app/api/auth";
-import { isModelAvailableInServer } from "@/app/utils/model";
-
-const serverConfig = getServerSideConfig();
-
-export async function handle(
-  req: NextRequest,
-  { params }: { params: { path: string[] } },
-) {
-  console.log("[XAI Route] params ", params);
-
-  if (req.method === "OPTIONS") {
-    return NextResponse.json({ body: "OK" }, { status: 200 });
-  }
-
-  const authResult = auth(req, ModelProvider.XAI);
-  if (authResult.error) {
-    return NextResponse.json(authResult, {
-      status: 401,
-    });
-  }
-
-  try {
-    const response = await request(req);
-    return response;
-  } catch (e) {
-    console.error("[XAI] ", e);
-    return NextResponse.json(prettyObject(e));
-  }
-}
-
-async function request(req: NextRequest) {
-  const controller = new AbortController();
-
-  // alibaba use base url or just remove the path
-  let path = `${req.nextUrl.pathname}`.replaceAll(ApiPath.XAI, "");
-
-  let baseUrl = serverConfig.xaiUrl || XAI_BASE_URL;
-
-  if (!baseUrl.startsWith("http")) {
-    baseUrl = `https://${baseUrl}`;
-  }
-
-  if (baseUrl.endsWith("/")) {
-    baseUrl = baseUrl.slice(0, -1);
-  }
-
-  console.log("[Proxy] ", path);
-  console.log("[Base Url]", baseUrl);
-
-  const timeoutId = setTimeout(
-    () => {
-      controller.abort();
-    },
-    10 * 60 * 1000,
-  );
-
-  const fetchUrl = `${baseUrl}${path}`;
-  const fetchOptions: RequestInit = {
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: req.headers.get("Authorization") ?? "",
-    },
-    method: req.method,
-    body: req.body,
-    redirect: "manual",
-    // @ts-ignore
-    duplex: "half",
-    signal: controller.signal,
-  };
-
-  // #1815 try to refuse some request to some models
-  if (serverConfig.customModels && req.body) {
-    try {
-      const clonedBody = await req.text();
-      fetchOptions.body = clonedBody;
-
-      const jsonBody = JSON.parse(clonedBody) as { model?: string };
-
-      // not undefined and is false
-      if (
-        isModelAvailableInServer(
-          serverConfig.customModels,
-          jsonBody?.model as string,
-          ServiceProvider.XAI as string,
-        )
-      ) {
-        return NextResponse.json(
-          {
-            error: true,
-            message: `you are not allowed to use ${jsonBody?.model} model`,
-          },
-          {
-            status: 403,
-          },
-        );
-      }
-    } catch (e) {
-      console.error(`[XAI] filter`, e);
-    }
-  }
-  try {
-    const res = await fetch(fetchUrl, fetchOptions);
-
-    // to prevent browser prompt for credentials
-    const newHeaders = new Headers(res.headers);
-    newHeaders.delete("www-authenticate");
-    // to disable nginx buffering
-    newHeaders.set("X-Accel-Buffering", "no");
-
-    return new Response(res.body, {
-      status: res.status,
-      statusText: res.statusText,
-      headers: newHeaders,
-    });
-  } finally {
-    clearTimeout(timeoutId);
-  }
-}
--- a/app/client/api.ts
+++ b/app/client/api.ts
@@ -20,7 +20,6 @@ import { QwenApi } from "./platforms/alibaba";
 import { HunyuanApi } from "./platforms/tencent";
 import { MoonshotApi } from "./platforms/moonshot";
 import { SparkApi } from "./platforms/iflytek";
-import { XAIApi } from "./platforms/xai";

 export const ROLES = ["system", "user", "assistant"] as const;
 export type MessageRole = (typeof ROLES)[number];
@@ -153,9 +152,6 @@ export class ClientApi {
      case ModelProvider.Iflytek:
        this.llm = new SparkApi();
        break;
-      case ModelProvider.XAI:
-        this.llm = new XAIApi();
-        break;
      default:
        this.llm = new ChatGPTApi();
    }
@@ -243,7 +239,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
    const isAlibaba = modelConfig.providerName === ServiceProvider.Alibaba;
    const isMoonshot = modelConfig.providerName === ServiceProvider.Moonshot;
    const isIflytek = modelConfig.providerName === ServiceProvider.Iflytek;
-    const isXAI = modelConfig.providerName === ServiceProvider.XAI;
    const isEnabledAccessControl = accessStore.enabledAccessControl();
    const apiKey = isGoogle
      ? accessStore.googleApiKey
@@ -257,8 +252,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
      ? accessStore.alibabaApiKey
      : isMoonshot
      ? accessStore.moonshotApiKey
-      : isXAI
-      ? accessStore.xaiApiKey
      : isIflytek
      ? accessStore.iflytekApiKey && accessStore.iflytekApiSecret
        ? accessStore.iflytekApiKey + ":" + accessStore.iflytekApiSecret
@@ -273,7 +266,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
      isAlibaba,
      isMoonshot,
      isIflytek,
-      isXAI,
      apiKey,
      isEnabledAccessControl,
    };
@@ -336,8 +328,6 @@ export function getClientApi(provider: ServiceProvider): ClientApi {
      return new ClientApi(ModelProvider.Moonshot);
    case ServiceProvider.Iflytek:
      return new ClientApi(ModelProvider.Iflytek);
-    case ServiceProvider.XAI:
-      return new ClientApi(ModelProvider.XAI);
    default:
      return new ClientApi(ModelProvider.GPT);
  }
--- a/app/client/platforms/anthropic.ts
+++ b/app/client/platforms/anthropic.ts
@@ -13,7 +13,6 @@ import { getMessageTextContent, isVisionModel } from "@/app/utils";
 import { preProcessImageContent, stream } from "@/app/utils/chat";
 import { cloudflareAIGatewayUrl } from "@/app/utils/cloudflare";
 import { RequestPayload } from "./openai";
-import { fetch } from "@/app/utils/stream";

 export type MultiBlockContent = {
  type: "image" | "text";
--- a/app/client/platforms/google.ts
+++ b/app/client/platforms/google.ts
@@ -192,10 +192,7 @@ export class GeminiProApi implements LLMApi {
          requestPayload,
          getHeaders(),
          // @ts-ignore
-          tools.length > 0
-            ? // @ts-ignore
-              [{ functionDeclarations: tools.map((tool) => tool.function) }]
-            : [],
+          [{ functionDeclarations: tools.map((tool) => tool.function) }],
          funcs,
          controller,
          // parseSSE
--- a/app/client/platforms/moonshot.ts
+++ b/app/client/platforms/moonshot.ts
@@ -24,7 +24,6 @@ import {
 import { getClientConfig } from "@/app/config/client";
 import { getMessageTextContent } from "@/app/utils";
 import { RequestPayload } from "./openai";
-import { fetch } from "@/app/utils/stream";

 export class MoonshotApi implements LLMApi {
  private disableListModels = true;
--- a/app/client/platforms/openai.ts
+++ b/app/client/platforms/openai.ts
@@ -42,7 +42,6 @@ import {
  isVisionModel,
  isDalle3 as _isDalle3,
 } from "@/app/utils";
-import { fetch } from "@/app/utils/stream";

 export interface OpenAIListModelResponse {
  object: string;
@@ -64,7 +63,7 @@ export interface RequestPayload {
  presence_penalty: number;
  frequency_penalty: number;
  top_p: number;
-  max_tokens?: number;
+  max_completions_tokens?: number;
 }

 export interface DalleRequestPayload {
@@ -229,13 +228,16 @@ export class ChatGPTApi implements LLMApi {
        presence_penalty: !isO1 ? modelConfig.presence_penalty : 0,
        frequency_penalty: !isO1 ? modelConfig.frequency_penalty : 0,
        top_p: !isO1 ? modelConfig.top_p : 1,
-        // max_tokens: Math.max(modelConfig.max_tokens, 1024),
-        // Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore.
+        // max_completions_tokens: Math.max(modelConfig.max_completions_tokens, 1024),
+        // Please do not ask me why not send max_completions_tokens, no reason, this param is just shit, I dont want to explain anymore.
      };

-      // add max_tokens to vision model
+      // add max_completions_tokens to vision model
      if (visionModel) {
-        requestPayload["max_tokens"] = Math.max(modelConfig.max_tokens, 4000);
+        requestPayload["max_completions_tokens"] = Math.max(
+          modelConfig.max_completions_tokens,
+          4000,
+        );
      }
    }

@@ -353,7 +355,7 @@ export class ChatGPTApi implements LLMApi {
        // make a fetch request
        const requestTimeoutId = setTimeout(
          () => controller.abort(),
-          isDalle3 || isO1 ? REQUEST_TIMEOUT_MS * 4 : REQUEST_TIMEOUT_MS, // dalle3 using b64_json is slow.
+          isDalle3 || isO1 ? REQUEST_TIMEOUT_MS * 2 : REQUEST_TIMEOUT_MS, // dalle3 using b64_json is slow.
        );

        const res = await fetch(chatPath, chatPayload);
--- a/app/client/platforms/xai.ts
+++ b/app/client/platforms/xai.ts
@@ -1,193 +0,0 @@
-"use client";
-// azure and openai, using same models. so using same LLMApi.
-import { ApiPath, XAI_BASE_URL, XAI, REQUEST_TIMEOUT_MS } from "@/app/constant";
-import {
-  useAccessStore,
-  useAppConfig,
-  useChatStore,
-  ChatMessageTool,
-  usePluginStore,
-} from "@/app/store";
-import { stream } from "@/app/utils/chat";
-import {
-  ChatOptions,
-  getHeaders,
-  LLMApi,
-  LLMModel,
-  SpeechOptions,
-} from "../api";
-import { getClientConfig } from "@/app/config/client";
-import { getMessageTextContent } from "@/app/utils";
-import { RequestPayload } from "./openai";
-import { fetch } from "@/app/utils/stream";
-
-export class XAIApi implements LLMApi {
-  private disableListModels = true;
-
-  path(path: string): string {
-    const accessStore = useAccessStore.getState();
-
-    let baseUrl = "";
-
-    if (accessStore.useCustomConfig) {
-      baseUrl = accessStore.xaiUrl;
-    }
-
-    if (baseUrl.length === 0) {
-      const isApp = !!getClientConfig()?.isApp;
-      const apiPath = ApiPath.XAI;
-      baseUrl = isApp ? XAI_BASE_URL : apiPath;
-    }
-
-    if (baseUrl.endsWith("/")) {
-      baseUrl = baseUrl.slice(0, baseUrl.length - 1);
-    }
-    if (!baseUrl.startsWith("http") && !baseUrl.startsWith(ApiPath.XAI)) {
-      baseUrl = "https://" + baseUrl;
-    }
-
-    console.log("[Proxy Endpoint] ", baseUrl, path);
-
-    return [baseUrl, path].join("/");
-  }
-
-  extractMessage(res: any) {
-    return res.choices?.at(0)?.message?.content ?? "";
-  }
-
-  speech(options: SpeechOptions): Promise<ArrayBuffer> {
-    throw new Error("Method not implemented.");
-  }
-
-  async chat(options: ChatOptions) {
-    const messages: ChatOptions["messages"] = [];
-    for (const v of options.messages) {
-      const content = getMessageTextContent(v);
-      messages.push({ role: v.role, content });
-    }
-
-    const modelConfig = {
-      ...useAppConfig.getState().modelConfig,
-      ...useChatStore.getState().currentSession().mask.modelConfig,
-      ...{
-        model: options.config.model,
-        providerName: options.config.providerName,
-      },
-    };
-
-    const requestPayload: RequestPayload = {
-      messages,
-      stream: options.config.stream,
-      model: modelConfig.model,
-      temperature: modelConfig.temperature,
-      presence_penalty: modelConfig.presence_penalty,
-      frequency_penalty: modelConfig.frequency_penalty,
-      top_p: modelConfig.top_p,
-    };
-
-    console.log("[Request] xai payload: ", requestPayload);
-
-    const shouldStream = !!options.config.stream;
-    const controller = new AbortController();
-    options.onController?.(controller);
-
-    try {
-      const chatPath = this.path(XAI.ChatPath);
-      const chatPayload = {
-        method: "POST",
-        body: JSON.stringify(requestPayload),
-        signal: controller.signal,
-        headers: getHeaders(),
-      };
-
-      // make a fetch request
-      const requestTimeoutId = setTimeout(
-        () => controller.abort(),
-        REQUEST_TIMEOUT_MS,
-      );
-
-      if (shouldStream) {
-        const [tools, funcs] = usePluginStore
-          .getState()
-          .getAsTools(
-            useChatStore.getState().currentSession().mask?.plugin || [],
-          );
-        return stream(
-          chatPath,
-          requestPayload,
-          getHeaders(),
-          tools as any,
-          funcs,
-          controller,
-          // parseSSE
-          (text: string, runTools: ChatMessageTool[]) => {
-            // console.log("parseSSE", text, runTools);
-            const json = JSON.parse(text);
-            const choices = json.choices as Array<{
-              delta: {
-                content: string;
-                tool_calls: ChatMessageTool[];
-              };
-            }>;
-            const tool_calls = choices[0]?.delta?.tool_calls;
-            if (tool_calls?.length > 0) {
-              const index = tool_calls[0]?.index;
-              const id = tool_calls[0]?.id;
-              const args = tool_calls[0]?.function?.arguments;
-              if (id) {
-                runTools.push({
-                  id,
-                  type: tool_calls[0]?.type,
-                  function: {
-                    name: tool_calls[0]?.function?.name as string,
-                    arguments: args,
-                  },
-                });
-              } else {
-                // @ts-ignore
-                runTools[index]["function"]["arguments"] += args;
-              }
-            }
-            return choices[0]?.delta?.content;
-          },
-          // processToolMessage, include tool_calls message and tool call results
-          (
-            requestPayload: RequestPayload,
-            toolCallMessage: any,
-            toolCallResult: any[],
-          ) => {
-            // @ts-ignore
-            requestPayload?.messages?.splice(
-              // @ts-ignore
-              requestPayload?.messages?.length,
-              0,
-              toolCallMessage,
-              ...toolCallResult,
-            );
-          },
-          options,
-        );
-      } else {
-        const res = await fetch(chatPath, chatPayload);
-        clearTimeout(requestTimeoutId);
-
-        const resJson = await res.json();
-        const message = this.extractMessage(resJson);
-        options.onFinish(message);
-      }
-    } catch (e) {
-      console.log("[Request] failed to make a chat request", e);
-      options.onError?.(e as Error);
-    }
-  }
-  async usage() {
-    return {
-      used: 0,
-      total: 0,
-    };
-  }
-
-  async models(): Promise<LLMModel[]> {
-    return [];
-  }
-}
--- a/app/command.ts
+++ b/app/command.ts
@@ -35,7 +35,6 @@ export function useCommand(commands: Commands = {}) {
 interface ChatCommands {
  new?: Command;
  newm?: Command;
-  copy?: Command;
  next?: Command;
  prev?: Command;
  clear?: Command;
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -70,7 +70,6 @@ import {
  getMessageImages,
  isVisionModel,
  isDalle3,
-  removeOutdatedEntries,
  showPlugins,
  safeLocalStorage,
 } from "../utils";
@@ -116,14 +115,11 @@ import { getClientConfig } from "../config/client";
 import { useAllModels } from "../utils/hooks";
 import { MultimodalContent } from "../client/api";

+const localStorage = safeLocalStorage();
 import { ClientApi } from "../client/api";
 import { createTTSPlayer } from "../utils/audio";
 import { MsEdgeTTS, OUTPUT_FORMAT } from "../utils/ms_edge_tts";

-import { isEmpty } from "lodash-es";
-
-const localStorage = safeLocalStorage();
-
 const ttsPlayer = createTTSPlayer();

 const Markdown = dynamic(async () => (await import("./markdown")).Markdown, {
@@ -988,7 +984,6 @@ function _Chat() {
  const chatCommands = useChatCommand({
    new: () => chatStore.newSession(),
    newm: () => navigate(Path.NewChat),
-    copy: () => chatStore.copySession(),
    prev: () => chatStore.nextSession(-1),
    next: () => chatStore.nextSession(1),
    clear: () =>
@@ -1020,7 +1015,7 @@ function _Chat() {
  };

  const doSubmit = (userInput: string) => {
-    if (userInput.trim() === "" && isEmpty(attachImages)) return;
+    if (userInput.trim() === "") return;
    const matchCommand = chatCommands.match(userInput);
    if (matchCommand.matched) {
      setUserInput("");
@@ -1120,20 +1115,10 @@ function _Chat() {
  };

  const deleteMessage = (msgId?: string) => {
-    chatStore.updateCurrentSession((session) => {
-      session.deletedMessageIds &&
-        removeOutdatedEntries(session.deletedMessageIds);
-      session.messages = session.messages.filter((m) => {
-        if (m.id !== msgId) {
-          return true;
-        }
-        if (!session.deletedMessageIds) {
-          session.deletedMessageIds = {} as Record<string, number>;
-        }
-        session.deletedMessageIds[m.id] = Date.now();
-        return false;
-      });
-    });
+    chatStore.updateCurrentSession(
+      (session) =>
+        (session.messages = session.messages.filter((m) => m.id !== msgId)),
+    );
  };

  const onDelete = (msgId: string) => {
--- a/app/components/home.module.scss
+++ b/app/components/home.module.scss
@@ -140,9 +140,6 @@
  display: flex;
  justify-content: space-between;
  align-items: center;
-  &-narrow {
-    justify-content: center;
-  }
 }

 .sidebar-logo {
--- a/app/components/markdown.tsx
+++ b/app/components/markdown.tsx
@@ -169,12 +169,6 @@ export function PreCode(props: { children: any }) {
 }

 function CustomCode(props: { children: any; className?: string }) {
-  const chatStore = useChatStore();
-  const session = chatStore.currentSession();
-  const config = useAppConfig();
-  const enableCodeFold =
-    session.mask?.enableCodeFold !== false && config.enableCodeFold;
-
  const ref = useRef<HTMLPreElement>(null);
  const [collapsed, setCollapsed] = useState(true);
  const [showToggle, setShowToggle] = useState(false);
@@ -190,30 +184,25 @@ function CustomCode(props: { children: any; className?: string }) {
  const toggleCollapsed = () => {
    setCollapsed((collapsed) => !collapsed);
  };
-  const renderShowMoreButton = () => {
-    if (showToggle && enableCodeFold && collapsed) {
-      return (
-        <div className={`show-hide-button ${collapsed ? "collapsed" : "expanded"}`}>
-          <button onClick={toggleCollapsed}>{Locale.NewChat.More}</button>
-        </div>
-      );
-    }
-    return null;
-  };
  return (
    <>
      <code
        className={props?.className}
        ref={ref}
        style={{
-          maxHeight: enableCodeFold && collapsed ? "400px" : "none",
+          maxHeight: collapsed ? "400px" : "none",
          overflowY: "hidden",
        }}
      >
        {props.children}
      </code>
-
-      {renderShowMoreButton()}
+      {showToggle && collapsed && (
+        <div
+          className={`show-hide-button ${collapsed ? "collapsed" : "expanded"}`}
+        >
+          <button onClick={toggleCollapsed}>{Locale.NewChat.More}</button>
+        </div>
+      )}
    </>
  );
 }
--- a/app/components/mask.tsx
+++ b/app/components/mask.tsx
@@ -183,23 +183,6 @@ export function MaskConfig(props: {
            ></input>
          </ListItem>
        )}
-        {globalConfig.enableCodeFold && (
-          <ListItem
-            title={Locale.Mask.Config.CodeFold.Title}
-            subTitle={Locale.Mask.Config.CodeFold.SubTitle}
-          >
-            <input
-              aria-label={Locale.Mask.Config.CodeFold.Title}
-              type="checkbox"
-              checked={props.mask.enableCodeFold !== false}
-              onChange={(e) => {
-                props.updateMask((mask) => {
-                  mask.enableCodeFold = e.currentTarget.checked;
-                });
-              }}
-            ></input>
-          </ListItem>
-        )}

        {!props.shouldSyncFromGlobal ? (
          <ListItem
--- a/app/components/settings.tsx
+++ b/app/components/settings.tsx
@@ -49,7 +49,7 @@ import Locale, {
  changeLang,
  getLang,
 } from "../locales";
-import { copyToClipboard, clientUpdate, semverCompare } from "../utils";
+import { copyToClipboard } from "../utils";
 import Link from "next/link";
 import {
  Anthropic,
@@ -59,7 +59,6 @@ import {
  ByteDance,
  Alibaba,
  Moonshot,
-  XAI,
  Google,
  GoogleSafetySettingsThreshold,
  OPENAI_BASE_URL,
@@ -361,21 +360,6 @@ function SyncConfigModal(props: { onClose?: () => void }) {
            </select>
          </ListItem>

-          <ListItem
-            title={Locale.Settings.Sync.Config.EnableAutoSync.Title}
-            subTitle={Locale.Settings.Sync.Config.EnableAutoSync.SubTitle}
-          >
-            <input
-              type="checkbox"
-              checked={syncStore.enableAutoSync}
-              onChange={(e) => {
-                syncStore.update(
-                  (config) => (config.enableAutoSync = e.currentTarget.checked),
-                );
-              }}
-            ></input>
-          </ListItem>
-
          <ListItem
            title={Locale.Settings.Sync.Config.Proxy.Title}
            subTitle={Locale.Settings.Sync.Config.Proxy.SubTitle}
@@ -601,7 +585,7 @@ export function Settings() {
  const [checkingUpdate, setCheckingUpdate] = useState(false);
  const currentVersion = updateStore.formatVersion(updateStore.version);
  const remoteId = updateStore.formatVersion(updateStore.remoteVersion);
-  const hasNewVersion = semverCompare(currentVersion, remoteId) === -1;
+  const hasNewVersion = currentVersion !== remoteId;
  const updateUrl = getClientConfig()?.isApp ? RELEASE_URL : UPDATE_URL;

  function checkUpdate(force = false) {
@@ -1210,45 +1194,6 @@ export function Settings() {
    </>
  );

-  const XAIConfigComponent = accessStore.provider === ServiceProvider.XAI && (
-    <>
-      <ListItem
-        title={Locale.Settings.Access.XAI.Endpoint.Title}
-        subTitle={
-          Locale.Settings.Access.XAI.Endpoint.SubTitle + XAI.ExampleEndpoint
-        }
-      >
-        <input
-          aria-label={Locale.Settings.Access.XAI.Endpoint.Title}
-          type="text"
-          value={accessStore.xaiUrl}
-          placeholder={XAI.ExampleEndpoint}
-          onChange={(e) =>
-            accessStore.update(
-              (access) => (access.xaiUrl = e.currentTarget.value),
-            )
-          }
-        ></input>
-      </ListItem>
-      <ListItem
-        title={Locale.Settings.Access.XAI.ApiKey.Title}
-        subTitle={Locale.Settings.Access.XAI.ApiKey.SubTitle}
-      >
-        <PasswordInput
-          aria-label={Locale.Settings.Access.XAI.ApiKey.Title}
-          value={accessStore.xaiApiKey}
-          type="text"
-          placeholder={Locale.Settings.Access.XAI.ApiKey.Placeholder}
-          onChange={(e) => {
-            accessStore.update(
-              (access) => (access.xaiApiKey = e.currentTarget.value),
-            );
-          }}
-        />
-      </ListItem>
-    </>
-  );
-
  const stabilityConfigComponent = accessStore.provider ===
    ServiceProvider.Stability && (
    <>
@@ -1412,17 +1357,9 @@ export function Settings() {
            {checkingUpdate ? (
              <LoadingIcon />
            ) : hasNewVersion ? (
-              clientConfig?.isApp ? (
-                <IconButton
-                  icon={<ResetIcon></ResetIcon>}
-                  text={Locale.Settings.Update.GoToUpdate}
-                  onClick={() => clientUpdate()}
-                />
-              ) : (
-                <Link href={updateUrl} target="_blank" className="link">
-                  {Locale.Settings.Update.GoToUpdate}
-                </Link>
-              )
+              <Link href={updateUrl} target="_blank" className="link">
+                {Locale.Settings.Update.GoToUpdate}
+              </Link>
            ) : (
              <IconButton
                icon={<ResetIcon></ResetIcon>}
@@ -1572,22 +1509,6 @@ export function Settings() {
              }
            ></input>
          </ListItem>
-          <ListItem
-            title={Locale.Mask.Config.CodeFold.Title}
-            subTitle={Locale.Mask.Config.CodeFold.SubTitle}
-          >
-            <input
-              aria-label={Locale.Mask.Config.CodeFold.Title}
-              type="checkbox"
-              checked={config.enableCodeFold}
-              data-testid="enable-code-fold-checkbox"
-              onChange={(e) =>
-                updateConfig(
-                  (config) => (config.enableCodeFold = e.currentTarget.checked),
-                )
-              }
-            ></input>
-          </ListItem>
        </List>

        <SyncItems />
@@ -1707,7 +1628,6 @@ export function Settings() {
                  {moonshotConfigComponent}
                  {stabilityConfigComponent}
                  {lflytekConfigComponent}
-                  {XAIConfigComponent}
                </>
              )}
            </>
--- a/app/components/sidebar.tsx
+++ b/app/components/sidebar.tsx
@@ -165,17 +165,11 @@ export function SideBarHeader(props: {
  subTitle?: string | React.ReactNode;
  logo?: React.ReactNode;
  children?: React.ReactNode;
-  shouldNarrow?: boolean;
 }) {
-  const { title, subTitle, logo, children, shouldNarrow } = props;
+  const { title, subTitle, logo, children } = props;
  return (
    <Fragment>
-      <div
-        className={`${styles["sidebar-header"]} ${
-          shouldNarrow ? styles["sidebar-header-narrow"] : ""
-        }`}
-        data-tauri-drag-region
-      >
+      <div className={styles["sidebar-header"]} data-tauri-drag-region>
        <div className={styles["sidebar-title-container"]}>
          <div className={styles["sidebar-title"]} data-tauri-drag-region>
            {title}
@@ -233,7 +227,6 @@ export function SideBar(props: { className?: string }) {
        title="NextChat"
        subTitle="Build your own AI assistant."
        logo={<ChatGptIcon />}
-        shouldNarrow={shouldNarrow}
      >
        <div className={styles["sidebar-header-bar"]}>
          <IconButton
--- a/app/config/server.ts
+++ b/app/config/server.ts
@@ -71,10 +71,6 @@ declare global {
      IFLYTEK_API_KEY?: string;
      IFLYTEK_API_SECRET?: string;

-      // xai only
-      XAI_URL?: string;
-      XAI_API_KEY?: string;
-
      // custom template for preprocessing user input
      DEFAULT_INPUT_TEMPLATE?: string;
    }
@@ -150,7 +146,6 @@ export const getServerSideConfig = () => {
  const isAlibaba = !!process.env.ALIBABA_API_KEY;
  const isMoonshot = !!process.env.MOONSHOT_API_KEY;
  const isIflytek = !!process.env.IFLYTEK_API_KEY;
-  const isXAI = !!process.env.XAI_API_KEY;
  // const apiKeyEnvVar = process.env.OPENAI_API_KEY ?? "";
  // const apiKeys = apiKeyEnvVar.split(",").map((v) => v.trim());
  // const randomIndex = Math.floor(Math.random() * apiKeys.length);
@@ -213,10 +208,6 @@ export const getServerSideConfig = () => {
    iflytekApiKey: process.env.IFLYTEK_API_KEY,
    iflytekApiSecret: process.env.IFLYTEK_API_SECRET,

-    isXAI,
-    xaiUrl: process.env.XAI_URL,
-    xaiApiKey: getApiKey(process.env.XAI_API_KEY),
-
    cloudflareAccountId: process.env.CLOUDFLARE_ACCOUNT_ID,
    cloudflareKVNamespaceId: process.env.CLOUDFLARE_KV_NAMESPACE_ID,
    cloudflareKVApiKey: getApiKey(process.env.CLOUDFLARE_KV_API_KEY),
--- a/app/constant.ts
+++ b/app/constant.ts
@@ -28,8 +28,6 @@ export const TENCENT_BASE_URL = "https://hunyuan.tencentcloudapi.com";
 export const MOONSHOT_BASE_URL = "https://api.moonshot.cn";
 export const IFLYTEK_BASE_URL = "https://spark-api-open.xf-yun.com";

-export const XAI_BASE_URL = "https://api.x.ai";
-
 export const CACHE_URL_PREFIX = "/api/cache";
 export const UPLOAD_URL = `${CACHE_URL_PREFIX}/upload`;

@@ -61,7 +59,6 @@ export enum ApiPath {
  Iflytek = "/api/iflytek",
  Stability = "/api/stability",
  Artifacts = "/api/artifacts",
-  XAI = "/api/xai",
 }

 export enum SlotID {
@@ -114,7 +111,6 @@ export enum ServiceProvider {
  Moonshot = "Moonshot",
  Stability = "Stability",
  Iflytek = "Iflytek",
-  XAI = "XAI",
 }

 // Google API safety settings, see https://ai.google.dev/gemini-api/docs/safety-settings
@@ -137,7 +133,6 @@ export enum ModelProvider {
  Hunyuan = "Hunyuan",
  Moonshot = "Moonshot",
  Iflytek = "Iflytek",
-  XAI = "XAI",
 }

 export const Stability = {
@@ -220,11 +215,6 @@ export const Iflytek = {
  ChatPath: "v1/chat/completions",
 };

-export const XAI = {
-  ExampleEndpoint: XAI_BASE_URL,
-  ChatPath: "v1/chat/completions",
-};
-
 export const DEFAULT_INPUT_TEMPLATE = `{{input}}`; // input / time / model / lang
 // export const DEFAULT_SYSTEM_TEMPLATE = `
 // You are ChatGPT, a large language model trained by {{ServiceProvider}}.
@@ -374,8 +364,6 @@ const iflytekModels = [
  "4.0Ultra",
 ];

-const xAIModes = ["grok-beta"];
-
 let seq = 1000; // 内置的模型序号生成器从1000开始
 export const DEFAULT_MODELS = [
  ...openaiModels.map((name) => ({
@@ -488,17 +476,6 @@ export const DEFAULT_MODELS = [
      sorted: 10,
    },
  })),
-  ...xAIModes.map((name) => ({
-    name,
-    available: true,
-    sorted: seq++,
-    provider: {
-      id: "xai",
-      providerName: "XAI",
-      providerType: "xai",
-      sorted: 11,
-    },
-  })),
 ] as const;

 export const CHAT_PAGE_SIZE = 15;
--- a/app/global.d.ts
+++ b/app/global.d.ts
@@ -26,13 +26,6 @@ declare interface Window {
      isPermissionGranted(): Promise<boolean>;
      sendNotification(options: string | Options): void;
    };
-    updater: {
-      checkUpdate(): Promise<UpdateResult>;
-      installUpdate(): Promise<void>;
-      onUpdaterEvent(
-        handler: (status: UpdateStatusResult) => void,
-      ): Promise<UnlistenFn>;
-    };
    http: {
      fetch<T>(
        url: string,
--- a/app/locales/cn.ts
+++ b/app/locales/cn.ts
@@ -62,7 +62,6 @@ const cn = {
    Commands: {
      new: "新建聊天",
      newm: "从面具新建聊天",
-      copy: "复制当前聊天",
      next: "下一个聊天",
      prev: "上一个聊天",
      clear: "清除上下文",
@@ -206,8 +205,6 @@ const cn = {
      IsChecking: "正在检查更新...",
      FoundUpdate: (x: string) => `发现新版本：${x}`,
      GoToUpdate: "前往更新",
-      Success: "更新成功！",
-      Failed: "更新失败",
    },
    SendKey: "发送键",
    Theme: "主题",
@@ -235,10 +232,6 @@ const cn = {
          Title: "同步类型",
          SubTitle: "选择喜爱的同步服务器",
        },
-        EnableAutoSync: {
-          Title: "自动同步设置",
-          SubTitle: "在回复完成或删除消息后自动同步数据",
-        },
        Proxy: {
          Title: "启用代理",
          SubTitle: "在浏览器中同步时，必须启用代理以避免跨域限制",
@@ -467,17 +460,6 @@ const cn = {
          SubTitle: "样例：",
        },
      },
-      XAI: {
-        ApiKey: {
-          Title: "接口密钥",
-          SubTitle: "使用自定义XAI API Key",
-          Placeholder: "XAI API Key",
-        },
-        Endpoint: {
-          Title: "接口地址",
-          SubTitle: "样例：",
-        },
-      },
      Stability: {
        ApiKey: {
          Title: "接口密钥",
@@ -513,8 +495,8 @@ const cn = {

    Model: "模型 (model)",
    CompressModel: {
-      Title: "对话摘要模型",
-      SubTitle: "用于压缩历史记录、生成对话标题的模型",
+      Title: "压缩模型",
+      SubTitle: "用于压缩历史记录的模型",
    },
    Temperature: {
      Title: "随机性 (temperature)",
@@ -683,10 +665,6 @@ const cn = {
        Title: "启用Artifacts",
        SubTitle: "启用之后可以直接渲染HTML页面",
      },
-      CodeFold: {
-        Title: "启用代码折叠",
-        SubTitle: "启用之后可以自动折叠/展开过长的代码块",
-      },
      Share: {
        Title: "分享此面具",
        SubTitle: "生成此面具的直达链接",
--- a/app/locales/en.ts
+++ b/app/locales/en.ts
@@ -63,7 +63,6 @@ const en: LocaleType = {
    Commands: {
      new: "Start a new chat",
      newm: "Start a new chat with mask",
-      copy: "Copy the current Chat",
      next: "Next Chat",
      prev: "Previous Chat",
      clear: "Clear Context",
@@ -208,8 +207,6 @@ const en: LocaleType = {
      IsChecking: "Checking update...",
      FoundUpdate: (x: string) => `Found new version: ${x}`,
      GoToUpdate: "Update",
-      Success: "Update Successful.",
-      Failed: "Update Failed.",
    },
    SendKey: "Send Key",
    Theme: "Theme",
@@ -237,11 +234,6 @@ const en: LocaleType = {
          Title: "Sync Type",
          SubTitle: "Choose your favorite sync service",
        },
-        EnableAutoSync: {
-          Title: "Auto Sync Settings",
-          SubTitle:
-            "Automatically synchronize data after replying or deleting messages",
-        },
        Proxy: {
          Title: "Enable CORS Proxy",
          SubTitle: "Enable a proxy to avoid cross-origin restrictions",
@@ -452,17 +444,6 @@ const en: LocaleType = {
          SubTitle: "Example: ",
        },
      },
-      XAI: {
-        ApiKey: {
-          Title: "XAI API Key",
-          SubTitle: "Use a custom XAI API Key",
-          Placeholder: "XAI API Key",
-        },
-        Endpoint: {
-          Title: "Endpoint Address",
-          SubTitle: "Example: ",
-        },
-      },
      Stability: {
        ApiKey: {
          Title: "Stability API Key",
@@ -519,8 +500,8 @@ const en: LocaleType = {

    Model: "Model",
    CompressModel: {
-      Title: "Summary Model",
-      SubTitle: "Model used to compress history and generate title",
+      Title: "Compression Model",
+      SubTitle: "Model used to compress history",
    },
    Temperature: {
      Title: "Temperature",
@@ -694,11 +675,6 @@ const en: LocaleType = {
        Title: "Enable Artifacts",
        SubTitle: "Can render HTML page when enable artifacts.",
      },
-      CodeFold: {
-        Title: "Enable CodeFold",
-        SubTitle:
-          "Automatically collapse/expand overly long code blocks when CodeFold is enabled",
-      },
      Share: {
        Title: "Share This Mask",
        SubTitle: "Generate a link to this mask",
--- a/app/store/access.ts
+++ b/app/store/access.ts
@@ -13,7 +13,6 @@ import {
  MOONSHOT_BASE_URL,
  STABILITY_BASE_URL,
  IFLYTEK_BASE_URL,
-  XAI_BASE_URL,
 } from "../constant";
 import { getHeaders } from "../client/api";
 import { getClientConfig } from "../config/client";
@@ -45,8 +44,6 @@ const DEFAULT_STABILITY_URL = isApp ? STABILITY_BASE_URL : ApiPath.Stability;

 const DEFAULT_IFLYTEK_URL = isApp ? IFLYTEK_BASE_URL : ApiPath.Iflytek;

-const DEFAULT_XAI_URL = isApp ? XAI_BASE_URL : ApiPath.XAI;
-
 const DEFAULT_ACCESS_STATE = {
  accessCode: "",
  useCustomConfig: false,
@@ -104,10 +101,6 @@ const DEFAULT_ACCESS_STATE = {
  iflytekApiKey: "",
  iflytekApiSecret: "",

-  // xai
-  xaiUrl: DEFAULT_XAI_URL,
-  xaiApiKey: "",
-
  // server config
  needCode: true,
  hideUserApiKey: false,
@@ -176,10 +169,6 @@ export const useAccessStore = createPersistStore(
      return ensure(get(), ["iflytekApiKey"]);
    },

-    isValidXAI() {
-      return ensure(get(), ["xaiApiKey"]);
-    },
-
    isAuthorized() {
      this.fetch();

@@ -195,7 +184,6 @@ export const useAccessStore = createPersistStore(
        this.isValidTencent() ||
        this.isValidMoonshot() ||
        this.isValidIflytek() ||
-        this.isValidXAI() ||
        !this.enabledAccessControl() ||
        (this.enabledAccessControl() && ensure(get(), ["accessCode"]))
      );
@@ -223,7 +211,7 @@ export const useAccessStore = createPersistStore(
        })
        .then((res: DangerConfig) => {
          console.log("[Config] got config from server", res);
-          set(() => ({ lastUpdateTime: Date.now(), ...res }));
+          set(() => ({ ...res }));
        })
        .catch(() => {
          console.error("[Config] failed to fetch config");
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@@ -1,8 +1,4 @@
-import {
-  getMessageTextContent,
-  trimTopic,
-  removeOutdatedEntries,
-} from "../utils";
+import { getMessageTextContent, trimTopic } from "../utils";

 import { indexedDBStorage } from "@/app/utils/indexedDB-storage";
 import { nanoid } from "nanoid";
@@ -33,7 +29,6 @@ import { ModelConfig, ModelType, useAppConfig } from "./config";
 import { useAccessStore } from "./access";
 import { collectModelsWithDefaultModel } from "../utils/model";
 import { createEmptyMask, Mask } from "./mask";
-import { useSyncStore } from "./sync";

 const localStorage = safeLocalStorage();

@@ -85,7 +80,6 @@ export interface ChatSession {
  lastUpdate: number;
  lastSummarizeIndex: number;
  clearContextIndex?: number;
-  deletedMessageIds?: Record<string, number>;

  mask: Mask;
 }
@@ -109,7 +103,6 @@ function createEmptySession(): ChatSession {
    },
    lastUpdate: Date.now(),
    lastSummarizeIndex: 0,
-    deletedMessageIds: {},

    mask: createEmptyMask(),
  };
@@ -195,19 +188,9 @@ function fillTemplateWith(input: string, modelConfig: ModelConfig) {
  return output;
 }

-let cloudSyncTimer: any = null;
-function noticeCloudSync(): void {
-  const syncStore = useSyncStore.getState();
-  cloudSyncTimer && clearTimeout(cloudSyncTimer);
-  cloudSyncTimer = setTimeout(() => {
-    syncStore.autoSync();
-  }, 500);
-}
-
 const DEFAULT_CHAT_STATE = {
  sessions: [createEmptySession()],
  currentSessionIndex: 0,
-  deletedSessionIds: {} as Record<string, number>,
  lastInput: "",
 };

@@ -257,28 +240,6 @@ export const useChatStore = createPersistStore(
        });
      },

-      copySession() {
-        set((state) => {
-          const { sessions, currentSessionIndex } = state;
-          const emptySession = createEmptySession();
-
-          // copy the session
-          const curSession = JSON.parse(
-            JSON.stringify(sessions[currentSessionIndex]),
-          );
-          curSession.id = emptySession.id;
-          curSession.lastUpdate = emptySession.lastUpdate;
-
-          const newSessions = [...sessions];
-          newSessions.splice(0, 0, curSession);
-
-          return {
-            currentSessionIndex: 0,
-            sessions: newSessions,
-          };
-        });
-      },
-
      moveSession(from: number, to: number) {
        set((state) => {
          const { sessions, currentSessionIndex: oldIndex } = state;
@@ -341,18 +302,7 @@ export const useChatStore = createPersistStore(
        if (!deletedSession) return;

        const sessions = get().sessions.slice();
-        const deletedSessionIds = { ...get().deletedSessionIds };
-
-        removeOutdatedEntries(deletedSessionIds);
-
-        const hasDelSessions = sessions.splice(index, 1);
-        if (hasDelSessions?.length) {
-          hasDelSessions.forEach((session) => {
-            if (session.messages.length > 0) {
-              deletedSessionIds[session.id] = Date.now();
-            }
-          });
-        }
+        sessions.splice(index, 1);

        const currentIndex = get().currentSessionIndex;
        let nextIndex = Math.min(
@@ -369,24 +319,19 @@ export const useChatStore = createPersistStore(
        const restoreState = {
          currentSessionIndex: get().currentSessionIndex,
          sessions: get().sessions.slice(),
-          deletedSessionIds: get().deletedSessionIds,
        };

        set(() => ({
          currentSessionIndex: nextIndex,
          sessions,
-          deletedSessionIds,
        }));

-        noticeCloudSync();
-
        showToast(
          Locale.Home.DeleteToast,
          {
            text: Locale.Home.Revert,
            onClick() {
              set(() => restoreState);
-              noticeCloudSync();
            },
          },
          5000,
@@ -407,24 +352,6 @@ export const useChatStore = createPersistStore(
        return session;
      },

-      sortSessions() {
-        const currentSession = get().currentSession();
-        const sessions = get().sessions.slice();
-
-        sessions.sort(
-          (a, b) =>
-            new Date(b.lastUpdate).getTime() - new Date(a.lastUpdate).getTime(),
-        );
-        const currentSessionIndex = sessions.findIndex((session) => {
-          return session && currentSession && session.id === currentSession.id;
-        });
-
-        set((state) => ({
-          currentSessionIndex,
-          sessions,
-        }));
-      },
-
      onNewMessage(message: ChatMessage) {
        get().updateCurrentSession((session) => {
          session.messages = session.messages.concat();
@@ -432,8 +359,6 @@ export const useChatStore = createPersistStore(
        });
        get().updateStat(message);
        get().summarizeSession();
-        get().sortSessions();
-        noticeCloudSync();
      },

      async onUserInput(content: string, attachImages?: string[]) {
@@ -447,16 +372,22 @@ export const useChatStore = createPersistStore(

        if (attachImages && attachImages.length > 0) {
          mContent = [
-            ...(userContent
-              ? [{ type: "text" as const, text: userContent }]
-              : []),
-            ...attachImages.map((url) => ({
-              type: "image_url" as const,
-              image_url: { url },
-            })),
+            {
+              type: "text",
+              text: userContent,
+            },
          ];
+          mContent = mContent.concat(
+            attachImages.map((url) => {
+              return {
+                type: "image_url",
+                image_url: {
+                  url: url,
+                },
+              };
+            }),
+          );
        }
-
        let userMessage: ChatMessage = createMessage({
          role: "user",
          content: mContent,
--- a/app/store/config.ts
+++ b/app/store/config.ts
@@ -52,8 +52,6 @@ export const DEFAULT_CONFIG = {

  enableArtifacts: true, // show artifacts config

-  enableCodeFold: true, // code fold config
-
  disablePromptHint: false,

  dontShowMaskSplashScreen: false, // dont show splash screen when create chat
@@ -67,7 +65,7 @@ export const DEFAULT_CONFIG = {
    providerName: "OpenAI" as ServiceProvider,
    temperature: 0.5,
    top_p: 1,
-    max_tokens: 4000,
+    max_completions_tokens: 4000,
    presence_penalty: 0,
    frequency_penalty: 0,
    sendMemory: true,
@@ -129,7 +127,7 @@ export const ModalConfigValidator = {
  model(x: string) {
    return x as ModelType;
  },
-  max_tokens(x: number) {
+  max_completions_tokens(x: number) {
    return limitNumber(x, 0, 512000, 1024);
  },
  presence_penalty(x: number) {
--- a/app/store/mask.ts
+++ b/app/store/mask.ts
@@ -19,7 +19,6 @@ export type Mask = {
  builtin: boolean;
  plugin?: string[];
  enableArtifacts?: boolean;
-  enableCodeFold?: boolean;
 };

 export const DEFAULT_MASK_STATE = {
--- a/app/store/sync.ts
+++ b/app/store/sync.ts
@@ -24,7 +24,6 @@ export type SyncStore = GetStoreState<typeof useSyncStore>;

 const DEFAULT_SYNC_STATE = {
  provider: ProviderType.WebDAV,
-  enableAutoSync: true,
  useProxy: true,
  proxyUrl: ApiPath.Cors as string,

@@ -44,8 +43,6 @@ const DEFAULT_SYNC_STATE = {
  lastProvider: "",
 };

-let lastSyncTime = 0;
-
 export const useSyncStore = createPersistStore(
  DEFAULT_SYNC_STATE,
  (set, get) => ({
@@ -92,16 +89,6 @@ export const useSyncStore = createPersistStore(
    },

    async sync() {
-      if (lastSyncTime && lastSyncTime >= Date.now() - 800) {
-        return;
-      }
-      lastSyncTime = Date.now();
-
-      const enableAutoSync = get().enableAutoSync;
-      if (!enableAutoSync) {
-        return;
-      }
-
      const localState = getLocalAppState();
      const provider = get().provider;
      const config = get()[provider];
@@ -116,7 +103,9 @@ export const useSyncStore = createPersistStore(
          );
          return;
        } else {
-          const parsedRemoteState = JSON.parse(remoteState) as AppState;
+          const parsedRemoteState = JSON.parse(
+            await client.get(config.username),
+          ) as AppState;
          mergeAppState(localState, parsedRemoteState);
          setLocalAppState(localState);
        }
@@ -134,14 +123,6 @@ export const useSyncStore = createPersistStore(
      const client = this.getClient();
      return await client.check();
    },
-
-    async autoSync() {
-      const { lastSyncTime, provider } = get();
-      const syncStore = useSyncStore.getState();
-      if (lastSyncTime && syncStore.cloudSync()) {
-        syncStore.sync();
-      }
-    },
  }),
  {
    name: StoreKey.Sync,
--- a/app/store/update.ts
+++ b/app/store/update.ts
@@ -6,7 +6,6 @@ import {
 } from "../constant";
 import { getClientConfig } from "../config/client";
 import { createPersistStore } from "../utils/store";
-import { clientUpdate } from "../utils";
 import ChatGptIcon from "../icons/chatgpt.png";
 import Locale from "../locales";
 import { ClientApi } from "../client/api";
@@ -120,7 +119,6 @@ export const useUpdateStore = createPersistStore(
                          icon: `${ChatGptIcon.src}`,
                          sound: "Default",
                        });
-                        clientUpdate();
                      }
                    }
                  });
--- a/app/utils.ts
+++ b/app/utils.ts
@@ -274,19 +274,6 @@ export function isDalle3(model: string) {
  return "dall-e-3" === model;
 }

-export function removeOutdatedEntries(
-  timeMap: Record<string, number>,
-): Record<string, number> {
-  const oneMonthAgo = Date.now() - 30 * 24 * 60 * 60 * 1000;
-  // Delete data from a month ago
-  Object.keys(timeMap).forEach((id) => {
-    if (timeMap[id] < oneMonthAgo) {
-      delete timeMap[id];
-    }
-  });
-  return timeMap;
-}
-
 export function showPlugins(provider: ServiceProvider, model: string) {
  if (
    provider == ServiceProvider.OpenAI ||
@@ -399,37 +386,3 @@ export function getOperationId(operation: {
    `${operation.method.toUpperCase()}${operation.path.replaceAll("/", "_")}`
  );
 }
-
-export function clientUpdate() {
-  // this a wild for updating client app
-  return window.__TAURI__?.updater
-    .checkUpdate()
-    .then((updateResult) => {
-      if (updateResult.shouldUpdate) {
-        window.__TAURI__?.updater
-          .installUpdate()
-          .then((result) => {
-            showToast(Locale.Settings.Update.Success);
-          })
-          .catch((e) => {
-            console.error("[Install Update Error]", e);
-            showToast(Locale.Settings.Update.Failed);
-          });
-      }
-    })
-    .catch((e) => {
-      console.error("[Check Update Error]", e);
-      showToast(Locale.Settings.Update.Failed);
-    });
-}
-
-// https://gist.github.com/iwill/a83038623ba4fef6abb9efca87ae9ccb
-export function semverCompare(a: string, b: string) {
-  if (a.startsWith(b + "-")) return -1;
-  if (b.startsWith(a + "-")) return 1;
-  return a.localeCompare(b, undefined, {
-    numeric: true,
-    sensitivity: "case",
-    caseFirst: "upper",
-  });
-}
--- a/app/utils/stream.ts
+++ b/app/utils/stream.ts
@@ -100,8 +100,7 @@ export function fetch(url: string, options?: RequestInit): Promise<any> {
      })
      .catch((e) => {
        console.error("stream error", e);
-        // throw e;
-        return new Response("", { status: 599 });
+        throw e;
      });
  }
  return window.fetch(url, options);
--- a/app/utils/sync.ts
+++ b/app/utils/sync.ts
@@ -8,7 +8,6 @@ import { useMaskStore } from "../store/mask";
 import { usePromptStore } from "../store/prompt";
 import { StoreKey } from "../constant";
 import { merge } from "./merge";
-import { removeOutdatedEntries } from "@/app/utils";

 type NonFunctionKeys<T> = {
  [K in keyof T]: T[K] extends (...args: any[]) => any ? never : K;
@@ -66,10 +65,7 @@ type StateMerger = {
 const MergeStates: StateMerger = {
  [StoreKey.Chat]: (localState, remoteState) => {
    // merge sessions
-    const currentSession = useChatStore.getState().currentSession();
-
    const localSessions: Record<string, ChatSession> = {};
-    const localDeletedSessionIds = localState.deletedSessionIds || {};
    localState.sessions.forEach((s) => (localSessions[s.id] = s));

    remoteState.sessions.forEach((remoteSession) => {
@@ -79,98 +75,29 @@ const MergeStates: StateMerger = {
      const localSession = localSessions[remoteSession.id];
      if (!localSession) {
        // if remote session is new, just merge it
-        if (
-          (localDeletedSessionIds[remoteSession.id] || -1) <
-          remoteSession.lastUpdate
-        ) {
-          localState.sessions.push(remoteSession);
-        }
+        localState.sessions.push(remoteSession);
      } else {
        // if both have the same session id, merge the messages
        const localMessageIds = new Set(localSession.messages.map((v) => v.id));
-        const localDeletedMessageIds = localSession.deletedMessageIds || {};
        remoteSession.messages.forEach((m) => {
          if (!localMessageIds.has(m.id)) {
-            if (
-              !localDeletedMessageIds[m.id] ||
-              new Date(localDeletedMessageIds[m.id]).toLocaleString() < m.date
-            ) {
-              localSession.messages.push(m);
-            }
+            localSession.messages.push(m);
          }
        });

-        const remoteDeletedMessageIds = remoteSession.deletedMessageIds || {};
-        localSession.messages = localSession.messages.filter((localMessage) => {
-          return (
-            !remoteDeletedMessageIds[localMessage.id] ||
-            new Date(localDeletedMessageIds[localMessage.id]).toLocaleString() <
-              localMessage.date
-          );
-        });
-
        // sort local messages with date field in asc order
        localSession.messages.sort(
          (a, b) => new Date(a.date).getTime() - new Date(b.date).getTime(),
        );
-        localSession.lastUpdate = Math.max(
-          remoteSession.lastUpdate,
-          localSession.lastUpdate,
-        );
-
-        const deletedMessageIds = {
-          ...remoteDeletedMessageIds,
-          ...localDeletedMessageIds,
-        };
-        removeOutdatedEntries(deletedMessageIds);
-        localSession.deletedMessageIds = deletedMessageIds;
      }
    });

-    const remoteDeletedSessionIds = remoteState.deletedSessionIds || {};
-
-    const finalIds: Record<string, any> = {};
-    localState.sessions = localState.sessions.filter((localSession) => {
-      // 去除掉重复的会话
-      if (finalIds[localSession.id]) {
-        return false;
-      }
-      finalIds[localSession.id] = true;
-
-      // 去除掉非首个空会话，避免多个空会话在中间，不方便管理
-      if (
-        localSession.messages.length === 0 &&
-        localSession != localState.sessions[0]
-      ) {
-        return false;
-      }
-
-      // 去除云端删除并且删除时间小于本地修改时间的会话
-      return (
-        (remoteDeletedSessionIds[localSession.id] || -1) <=
-        localSession.lastUpdate
-      );
-    });
-
    // sort local sessions with date field in desc order
    localState.sessions.sort(
      (a, b) =>
        new Date(b.lastUpdate).getTime() - new Date(a.lastUpdate).getTime(),
    );

-    const deletedSessionIds = {
-      ...remoteDeletedSessionIds,
-      ...localDeletedSessionIds,
-    };
-    removeOutdatedEntries(deletedSessionIds);
-    localState.deletedSessionIds = deletedSessionIds;
-
-    localState.currentSessionIndex = localState.sessions.findIndex(
-      (session) => {
-        return session && currentSession && session.id === currentSession.id;
-      },
-    );
-
    return localState;
  },
  [StoreKey.Prompt]: (localState, remoteState) => {
@@ -226,9 +153,9 @@ export function mergeWithUpdate<T extends { lastUpdateTime?: number }>(
  remoteState: T,
 ) {
  const localUpdateTime = localState.lastUpdateTime ?? 0;
-  const remoteUpdateTime = remoteState.lastUpdateTime ?? 1;
+  const remoteUpdateTime = localState.lastUpdateTime ?? 1;

-  if (localUpdateTime >= remoteUpdateTime) {
+  if (localUpdateTime < remoteUpdateTime) {
    merge(remoteState, localState);
    return { ...remoteState };
  } else {
--- a/package.json
+++ b/package.json
@@ -6,13 +6,13 @@
    "mask": "npx tsx app/masks/build.ts",
    "mask:watch": "npx watch \"yarn mask\" app/masks",
    "dev": "concurrently -r \"yarn run mask:watch\" \"next dev\"",
-    "build": "yarn mask && cross-env BUILD_MODE=standalone next build",
+    "build": "yarn test:ci && yarn mask && cross-env BUILD_MODE=standalone next build",
    "start": "next start",
    "lint": "next lint",
-    "export": "yarn mask && cross-env BUILD_MODE=export BUILD_APP=1 next build",
+    "export": "yarn test:ci && yarn mask && cross-env BUILD_MODE=export BUILD_APP=1 next build",
    "export:dev": "concurrently -r \"yarn mask:watch\"  \"cross-env BUILD_MODE=export BUILD_APP=1 next dev\"",
    "app:dev": "concurrently -r \"yarn mask:watch\" \"yarn tauri dev\"",
-    "app:build": "yarn mask && yarn tauri build",
+    "app:build": "yarn test:ci && yarn mask && yarn tauri build",
    "prompts": "node ./scripts/fetch-prompts.mjs",
    "prepare": "husky install",
    "proxy-dev": "sh ./scripts/init-proxy.sh && proxychains -f ./scripts/proxychains.conf yarn dev",
@@ -56,9 +56,9 @@
  "devDependencies": {
    "@tauri-apps/api": "^1.6.0",
    "@tauri-apps/cli": "1.5.11",
-    "@testing-library/jest-dom": "^6.6.2",
+    "@testing-library/jest-dom": "^6.4.8",
    "@testing-library/react": "^16.0.0",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^29.5.12",
    "@types/js-yaml": "4.0.9",
    "@types/lodash-es": "^4.17.12",
    "@types/node": "^20.11.30",
@@ -88,4 +88,4 @@
    "lint-staged/yaml": "^2.2.2"
  },
  "packageManager": "yarn@1.22.19"
-}
+}
--- a/src-tauri/src/stream.rs
+++ b/src-tauri/src/stream.rs
@@ -119,22 +119,11 @@ pub async fn stream_fetch(
      }
    }
    Err(err) => {
-      let error: String = err.source()
-        .map(|e| e.to_string())
-        .unwrap_or_else(|| "Unknown error occurred".to_string());
-      println!("Error response: {:?}", error);
-      tauri::async_runtime::spawn( async move {
-        if let Err(e) = window.emit(event_name, ChunkPayload{ request_id, chunk: error.into() }) {
-          println!("Failed to emit chunk payload: {:?}", e);
-        }
-        if let Err(e) = window.emit(event_name, EndPayload{ request_id, status: 0 }) {
-          println!("Failed to emit end payload: {:?}", e);
-        }
-      });
+      println!("Error response: {:?}", err.source().expect("REASON").to_string());
      StreamResponse {
        request_id,
        status: 599,
-        status_text: "Error".to_string(),
+        status_text: err.source().expect("REASON").to_string(),
        headers: HashMap::new(),
      }
    }
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
  },
  "package": {
    "productName": "NextChat",
-    "version": "2.15.6"
+    "version": "2.15.4"
  },
  "tauri": {
    "allowlist": {
@@ -99,7 +99,7 @@
      "endpoints": [
        "https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web/releases/latest/download/latest.json"
      ],
-      "dialog": true,
+      "dialog": false,
      "windows": {
        "installMode": "passive"
      },
--- a/yarn.lock
+++ b/yarn.lock
@@ -2093,12 +2093,13 @@
    "@tauri-apps/cli-win32-ia32-msvc" "1.5.11"
    "@tauri-apps/cli-win32-x64-msvc" "1.5.11"

-"@testing-library/jest-dom@^6.6.2":
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.6.2.tgz#8186aa9a07263adef9cc5a59a4772db8c31f4a5b"
-  integrity sha512-P6GJD4yqc9jZLbe98j/EkyQDTPgqftohZF5FBkHY5BUERZmcf4HeO2k0XaefEg329ux2p21i1A1DmyQ1kKw2Jw==
+"@testing-library/jest-dom@^6.4.8":
+  version "6.4.8"
+  resolved "https://registry.npmmirror.com/@testing-library/jest-dom/-/jest-dom-6.4.8.tgz#9c435742b20c6183d4e7034f2b329d562c079daa"
+  integrity sha512-JD0G+Zc38f5MBHA4NgxQMR5XtO5Jx9g86jqturNTt2WUfRmLDIY7iKkWHDCCTiDuFMre6nxAD5wHw9W5kI4rGw==
  dependencies:
    "@adobe/css-tools" "^4.4.0"
+    "@babel/runtime" "^7.9.2"
    aria-query "^5.0.0"
    chalk "^3.0.0"
    css.escape "^1.5.1"
@@ -2262,10 +2263,10 @@
  dependencies:
    "@types/istanbul-lib-report" "*"

-"@types/jest@^29.5.14":
-  version "29.5.14"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.14.tgz#2b910912fa1d6856cadcd0c1f95af7df1d6049e5"
-  integrity sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==
+"@types/jest@^29.5.12":
+  version "29.5.12"
+  resolved "https://registry.npmmirror.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
+  integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
  dependencies:
    expect "^29.0.0"
    pretty-format "^29.0.0"
@@ -2737,13 +2738,20 @@ argparse@^2.0.1:
  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==

-aria-query@^5.0.0, aria-query@^5.1.3:
+aria-query@^5.0.0:
  version "5.3.0"
  resolved "https://registry.npmmirror.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
  dependencies:
    dequal "^2.0.3"

+aria-query@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
+  integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
+  dependencies:
+    deep-equal "^2.0.5"
+
 array-buffer-byte-length@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"