@lobehub/chat 1.2.11 → 1.2.13

package/CHANGELOG.md

@@ -2,6 +2,57 @@
 
 # Changelog
 
+### [Version 1.2.13](https://github.com/lobehub/lobe-chat/compare/v1.2.12...v1.2.13)
+
+<sup>Released on **2024-07-07**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix tool message order.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix tool message order, closes [#3155](https://github.com/lobehub/lobe-chat/issues/3155) ([6171b2a](https://github.com/lobehub/lobe-chat/commit/6171b2a))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.2.12](https://github.com/lobehub/lobe-chat/compare/v1.2.11...v1.2.12)
+
+<sup>Released on **2024-07-07**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fixed mobile web page navigation issue with inbox assistant, support to disable clerk signup with feature flag.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fixed mobile web page navigation issue with inbox assistant, closes [#2693](https://github.com/lobehub/lobe-chat/issues/2693) ([4476a5e](https://github.com/lobehub/lobe-chat/commit/4476a5e))
+- **misc**: Support to disable clerk signup with feature flag, closes [#3126](https://github.com/lobehub/lobe-chat/issues/3126) ([4ead315](https://github.com/lobehub/lobe-chat/commit/4ead315))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.2.11](https://github.com/lobehub/lobe-chat/compare/v1.2.10...v1.2.11)
 
 <sup>Released on **2024-07-07**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",
@@ -97,29 +97,29 @@
   },
   "dependencies": {
     "@ant-design/icons": "^5.3.7",
-    "@anthropic-ai/sdk": "^0.24.0",
+    "@anthropic-ai/sdk": "^0.24.3",
     "@auth/core": "0.28.0",
-    "@aws-sdk/client-bedrock-runtime": "^3.600.0",
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@aws-sdk/s3-request-presigner": "^3.600.0",
+    "@aws-sdk/client-bedrock-runtime": "^3.609.0",
+    "@aws-sdk/client-s3": "^3.609.0",
+    "@aws-sdk/s3-request-presigner": "^3.609.0",
     "@azure/core-rest-pipeline": "1.16.0",
     "@azure/openai": "1.0.0-beta.12",
     "@cfworker/json-schema": "^1.12.8",
     "@clerk/localizations": "2.0.0",
     "@clerk/nextjs": "^5.2.2",
     "@clerk/themes": "^2.1.10",
-    "@google/generative-ai": "^0.13.0",
-    "@icons-pack/react-simple-icons": "^9.5.0",
+    "@google/generative-ai": "^0.14.1",
+    "@icons-pack/react-simple-icons": "^9.6.0",
     "@khmyznikov/pwa-install": "^0.3.9",
-    "@lobehub/chat-plugin-sdk": "^1.32.3",
+    "@lobehub/chat-plugin-sdk": "^1.32.4",
     "@lobehub/chat-plugins-gateway": "^1.9.0",
-    "@lobehub/icons": "^1.25.1",
-    "@lobehub/tts": "^1.24.2",
-    "@lobehub/ui": "^1.146.2",
+    "@lobehub/icons": "^1.25.2",
+    "@lobehub/tts": "^1.24.3",
+    "@lobehub/ui": "^1.146.4",
     "@microsoft/fetch-event-source": "^2.0.1",
-    "@neondatabase/serverless": "^0.9.3",
+    "@neondatabase/serverless": "^0.9.4",
     "@next/third-parties": "^14.2.4",
-    "@sentry/nextjs": "^7.117.0",
+    "@sentry/nextjs": "^7.118.0",
     "@t3-oss/env-nextjs": "^0.10.1",
     "@trpc/client": "next",
     "@trpc/next": "next",
@@ -127,8 +127,8 @@
     "@vercel/analytics": "^1.3.1",
     "@vercel/speed-insights": "^1.0.12",
     "ahooks": "^3.8.0",
-    "ai": "^3.2.6",
-    "antd": "^5.18.3",
+    "ai": "^3.2.16",
+    "antd": "^5.19.1",
     "antd-style": "^3.6.2",
     "brotli-wasm": "^3.0.1",
     "chroma-js": "^2.4.2",
@@ -146,9 +146,9 @@
     "idb-keyval": "^6.2.1",
     "immer": "^10.1.1",
     "ip": "^2.0.1",
-    "jose": "^5.4.1",
-    "langfuse": "^3.12.2",
-    "langfuse-core": "^3.12.2",
+    "jose": "^5.6.3",
+    "langfuse": "^3.14.0",
+    "langfuse-core": "^3.14.0",
     "lodash-es": "^4.17.21",
     "lucide-react": "latest",
     "modern-screenshot": "^4.4.39",
@@ -159,12 +159,12 @@
     "numeral": "^2.0.6",
     "nuqs": "^1.17.4",
     "ollama": "^0.5.2",
-    "openai": "^4.52.0",
+    "openai": "^4.52.3",
     "partial-json": "^0.1.7",
     "pg": "^8.12.0",
     "pino": "^9.2.0",
     "polished": "^4.3.1",
-    "posthog-js": "^1.139.6",
+    "posthog-js": "^1.144.2",
     "pwa-install-handler": "^2.6.0",
     "query-string": "^9.0.0",
     "random-words": "^2.0.1",
@@ -193,13 +193,13 @@
     "use-merge-value": "^1.2.0",
     "utility-types": "^3.11.0",
     "uuid": "^10.0.0",
-    "ws": "^8.17.1",
+    "ws": "^8.18.0",
     "y-protocols": "^1.0.6",
     "y-webrtc": "^10.3.0",
     "yaml": "^2.4.5",
     "yjs": "^13.6.18",
     "zod": "^3.23.8",
-    "zustand": "^4.5.2",
+    "zustand": "^4.5.4",
     "zustand-utils": "^1.3.2"
   },
   "devDependencies": {
@@ -219,9 +219,9 @@
     "@types/diff": "^5.2.1",
     "@types/ip": "^1.1.3",
     "@types/json-schema": "^7.0.15",
-    "@types/lodash": "^4.17.5",
+    "@types/lodash": "^4.17.6",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.14.6",
+    "@types/node": "^20.14.10",
     "@types/numeral": "^2.0.5",
     "@types/pg": "^8.11.6",
     "@types/react": "^18.3.3",
@@ -238,13 +238,13 @@
     "consola": "^3.2.3",
     "dotenv": "^16.4.5",
     "dpdm": "^3.14.0",
-    "drizzle-kit": "^0.22.7",
+    "drizzle-kit": "^0.22.8",
     "eslint": "^8.57.0",
     "eslint-plugin-mdx": "^2.3.4",
     "fake-indexeddb": "^6.0.0",
-    "glob": "^10.4.2",
+    "glob": "^10.4.3",
     "gray-matter": "^4.0.3",
-    "happy-dom": "^14.12.0",
+    "happy-dom": "^14.12.3",
     "husky": "^9.0.11",
     "just-diff": "^6.0.2",
     "lint-staged": "^15.2.7",
@@ -258,11 +258,11 @@
     "remark-parse": "^10.0.2",
     "semantic-release": "^21.1.2",
     "stylelint": "^15.11.0",
-    "tsx": "^4.15.6",
-    "typescript": "^5.5.2",
+    "tsx": "^4.16.2",
+    "typescript": "^5.5.3",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
-    "vite": "^5.3.1",
+    "vite": "^5.3.3",
     "vitest": "~1.2.2",
     "vitest-canvas-mock": "^0.3.3"
   },

package/src/app/(auth)/signup/[[...signup]]/page.tsx

@@ -1,5 +1,7 @@
 import { SignUp } from '@clerk/nextjs';
+import { redirect } from 'next/navigation';
 
+import { serverFeatureFlags } from '@/config/featureFlags';
 import { metadataModule } from '@/server/metadata';
 import { translation } from '@/server/translation';
 
@@ -13,6 +15,12 @@ export const generateMetadata = async () => {
 };
 
 const Page = () => {
+  const enableClerkSignUp = serverFeatureFlags().enableClerkSignUp;
+
+  if (!enableClerkSignUp) {
+    redirect('/login');
+  }
+
   return <SignUp path="/signup" />;
 };
 

package/src/app/(main)/settings/_layout/Mobile/Header.tsx

@@ -2,7 +2,7 @@
 
 import { MobileNavBar, MobileNavBarTitle } from '@lobehub/ui';
 import { Tag } from 'antd';
-import { useRouter } from 'next/navigation';
+import { useRouter, useSearchParams } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
@@ -16,7 +16,17 @@ const Header = memo(() => {
   const { t } = useTranslation('setting');
 
   const router = useRouter();
+  const searchParams = useSearchParams();
   const activeSettingsKey = useActiveSettingsKey();
+
+  const handleBackClick = () => {
+    if (searchParams.has('session') && searchParams.has('showMobileWorkspace')) {
+      router.push(`/chat?${searchParams.toString()}`);
+    } else {
+      router.push(enableAuth ? '/me/settings' : '/me');
+    }
+  };
+
   return (
     <MobileNavBar
       center={
@@ -33,7 +43,7 @@ const Header = memo(() => {
           }
         />
       }
-      onBackClick={() => router.push(enableAuth ? '/me/settings' : '/me')}
+      onBackClick={handleBackClick}
       showBackButton
       style={mobileHeaderSticky}
     />

package/src/config/featureFlags/schema.ts

@@ -16,6 +16,8 @@ export const FeatureFlagsSchema = z.object({
 
   check_updates: z.boolean().optional(),
   welcome_suggest: z.boolean().optional(),
+
+  clerk_sign_up: z.boolean().optional(),
 });
 
 // TypeScript 类型，从 Zod schema 生成
@@ -36,6 +38,8 @@ export const DEFAULT_FEATURE_FLAGS: IFeatureFlags = {
 
   check_updates: true,
   welcome_suggest: true,
+
+  clerk_sign_up: true,
 };
 
 export const mapFeatureFlagsEnvToState = (config: IFeatureFlags) => {
@@ -53,5 +57,7 @@ export const mapFeatureFlagsEnvToState = (config: IFeatureFlags) => {
 
     enableCheckUpdates: config.check_updates,
     showWelcomeSuggest: config.welcome_suggest,
+
+    enableClerkSignUp: config.clerk_sign_up,
   };
 };

package/src/layout/AuthProvider/Clerk/index.tsx

@@ -4,10 +4,13 @@ import { ClerkProvider } from '@clerk/nextjs';
 import { PropsWithChildren, memo, useEffect, useMemo, useState, useTransition } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
+
 import UserUpdater from './UserUpdater';
 import { useAppearance } from './useAppearance';
 
 const Clerk = memo(({ children }: PropsWithChildren) => {
+  const { enableClerkSignUp } = useServerConfigStore(featureFlagsSelectors);
   const appearance = useAppearance();
   const {
     i18n: { language, getResourceBundle },
@@ -27,8 +30,23 @@ const Clerk = memo(({ children }: PropsWithChildren) => {
     });
   }, [count, setCount, isPending, startTransition]);
 
+  const updatedAppearance = useMemo(
+    () => ({
+      ...appearance,
+      elements: {
+        ...appearance.elements,
+        ...(!enableClerkSignUp ? { footerAction: { display: 'none' } } : {}),
+      },
+    }),
+    [appearance, enableClerkSignUp],
+  );
+
   return (
-    <ClerkProvider appearance={appearance} localization={localization}>
+    <ClerkProvider
+      appearance={updatedAppearance}
+      localization={localization}
+      signUpUrl={!enableClerkSignUp ? '/login' : '/signup'} // Redirect sign-up to sign-in if disabled
+    >
       {children}
       <UserUpdater />
     </ClerkProvider>

package/src/libs/agent-runtime/google/index.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment edge-runtime
-import { FunctionDeclarationSchemaType } from '@google/generative-ai';
+import { FunctionDeclarationSchemaType, FunctionDeclarationsTool } from '@google/generative-ai';
 import { JSONSchema7 } from 'json-schema';
 import OpenAI from 'openai';
 import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -456,7 +456,7 @@ describe('LobeGoogleAI', () => {
         const googleTools = instance['buildGoogleTools'](tools);
 
         expect(googleTools).toHaveLength(1);
-        expect(googleTools![0].functionDeclarations![0]).toEqual({
+        expect((googleTools![0] as FunctionDeclarationsTool).functionDeclarations![0]).toEqual({
           name: 'testTool',
           description: 'A test tool',
           parameters: {

package/src/services/__tests__/chat.test.ts

@@ -32,7 +32,7 @@ import { UserStore } from '@/store/user';
 import { UserSettingsState, initialSettingsState } from '@/store/user/slices/settings/initialState';
 import { DalleManifest } from '@/tools/dalle';
 import { ChatMessage } from '@/types/message';
-import { ChatStreamPayload } from '@/types/openai/chat';
+import { ChatStreamPayload, type OpenAIChatMessage } from '@/types/openai/chat';
 import { LobeTool } from '@/types/tool';
 
 import { chatService, initializeWithClientStore } from '../chat';
@@ -666,6 +666,141 @@ Get data from users`,
       expect(onLoadingChange).toHaveBeenCalledWith(false); // 确认加载状态已经被设置为 false
     });
   });
+
+  describe('processMessage', () => {
+    it('should reorderToolMessages', () => {
+      const input: OpenAIChatMessage[] = [
+        {
+          content: '## Tools\n\nYou can use these tools',
+          role: 'system',
+        },
+        {
+          content: '',
+          role: 'assistant',
+          tool_calls: [
+            {
+              function: {
+                arguments:
+                  '{"query":"LobeChat","searchEngines":["brave","google","duckduckgo","qwant"]}',
+                name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+              },
+              id: 'call_6xCmrOtFOyBAcqpqO1TGfw2B',
+              type: 'function',
+            },
+            {
+              function: {
+                arguments:
+                  '{"query":"LobeChat","searchEngines":["brave","google","duckduckgo","qwant"]}',
+                name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+              },
+              id: 'tool_call_nXxXHW8Z',
+              type: 'function',
+            },
+            {
+              function: {
+                arguments: '{"query":"LobeHub","searchEngines":["bilibili"]}',
+                name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+              },
+              id: 'tool_call_2f3CEKz9',
+              type: 'function',
+            },
+          ],
+        },
+        {
+          content: '[]',
+          name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+          role: 'tool',
+          tool_call_id: 'call_6xCmrOtFOyBAcqpqO1TGfw2B',
+        },
+        {
+          content: 'LobeHub 是一个专注于设计和开发现代人工智能生成内容（AIGC）工具和组件的团队。',
+          role: 'assistant',
+        },
+        {
+          content: '[]',
+          name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+          role: 'tool',
+          tool_call_id: 'tool_call_nXxXHW8Z',
+        },
+        {
+          content: '[]',
+          name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+          role: 'tool',
+          tool_call_id: 'tool_call_2f3CEKz9',
+        },
+        {
+          content: '### LobeHub 智能AI聚合神器\n\nLobeHub 是一个强大的AI聚合平台',
+          role: 'assistant',
+        },
+      ];
+      const output = chatService['reorderToolMessages'](input);
+
+      expect(output).toEqual([
+        {
+          content: '## Tools\n\nYou can use these tools',
+          role: 'system',
+        },
+        {
+          content: '',
+          role: 'assistant',
+          tool_calls: [
+            {
+              function: {
+                arguments:
+                  '{"query":"LobeChat","searchEngines":["brave","google","duckduckgo","qwant"]}',
+                name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+              },
+              id: 'call_6xCmrOtFOyBAcqpqO1TGfw2B',
+              type: 'function',
+            },
+            {
+              function: {
+                arguments:
+                  '{"query":"LobeChat","searchEngines":["brave","google","duckduckgo","qwant"]}',
+                name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+              },
+              id: 'tool_call_nXxXHW8Z',
+              type: 'function',
+            },
+            {
+              function: {
+                arguments: '{"query":"LobeHub","searchEngines":["bilibili"]}',
+                name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+              },
+              id: 'tool_call_2f3CEKz9',
+              type: 'function',
+            },
+          ],
+        },
+        {
+          content: '[]',
+          name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+          role: 'tool',
+          tool_call_id: 'call_6xCmrOtFOyBAcqpqO1TGfw2B',
+        },
+        {
+          content: '[]',
+          name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+          role: 'tool',
+          tool_call_id: 'tool_call_nXxXHW8Z',
+        },
+        {
+          content: '[]',
+          name: 'lobe-web-browsing____searchWithSearXNG____builtin',
+          role: 'tool',
+          tool_call_id: 'tool_call_2f3CEKz9',
+        },
+        {
+          content: 'LobeHub 是一个专注于设计和开发现代人工智能生成内容（AIGC）工具和组件的团队。',
+          role: 'assistant',
+        },
+        {
+          content: '### LobeHub 智能AI聚合神器\n\nLobeHub 是一个强大的AI聚合平台',
+          role: 'assistant',
+        },
+      ]);
+    });
+  });
 });
 
 /**

package/src/services/chat.ts

@@ -420,7 +420,7 @@ class ChatService {
       ] as UserMessageContentPart[];
     };
 
-    const postMessages = messages.map((m): OpenAIChatMessage => {
+    let postMessages = messages.map((m): OpenAIChatMessage => {
       switch (m.role) {
         case 'user': {
           return { content: getContent(m), role: m.role };
@@ -458,7 +458,7 @@ class ChatService {
       }
     });
 
-    return produce(postMessages, (draft) => {
+    postMessages = produce(postMessages, (draft) => {
       // if it's a welcome question, inject InboxGuide SystemRole
       const inboxGuideSystemRole =
         options?.isWelcomeQuestion &&
@@ -492,6 +492,8 @@ class ChatService {
         });
       }
     });
+
+    return this.reorderToolMessages(postMessages);
   };
 
   private mapTrace(trace?: TracePayload, tag?: TraceTagMap): TracePayload {
@@ -523,6 +525,46 @@ class ChatService {
 
     return agentRuntime.chat(data, { signal: params.signal });
   };
+
+  /**
+   * Reorder tool messages to ensure that tool messages are displayed in the correct order.
+   * see https://github.com/lobehub/lobe-chat/pull/3155
+   */
+  private reorderToolMessages = (messages: OpenAIChatMessage[]): OpenAIChatMessage[] => {
+    const reorderedMessages: OpenAIChatMessage[] = [];
+    const toolMessages: Record<string, OpenAIChatMessage> = {};
+
+    // 1. collect all tool messages
+    messages.forEach((message) => {
+      if (message.role === 'tool' && message.tool_call_id) {
+        toolMessages[message.tool_call_id] = message;
+      }
+    });
+
+    // 2. reorder messages
+    messages.forEach((message) => {
+      const hasPushed = reorderedMessages.some(
+        (m) => !!message.tool_call_id && m.tool_call_id === message.tool_call_id,
+      );
+
+      if (hasPushed) return;
+
+      reorderedMessages.push(message);
+
+      if (message.role === 'assistant' && message.tool_calls) {
+        message.tool_calls.forEach((toolCall) => {
+          const correspondingToolMessage = toolMessages[toolCall.id];
+          if (correspondingToolMessage) {
+            reorderedMessages.push(correspondingToolMessage);
+            // 从 toolMessages 中删除已处理的消息，避免重复
+            delete toolMessages[toolCall.id];
+          }
+        });
+      }
+    });
+
+    return reorderedMessages;
+  };
 }
 
 export const chatService = new ChatService();

package/src/store/serverConfig/selectors.test.ts

@@ -26,6 +26,7 @@ describe('featureFlagsSelectors', () => {
       showOpenAIProxyUrl: true,
       enableCheckUpdates: true,
       showWelcomeSuggest: true,
+      enableClerkSignUp: true,
     });
   });
 });