@lobehub/lobehub 2.0.0-next.64 → 2.0.0-next.66

package/locales/zh-CN/plugin.json

@@ -253,6 +253,7 @@
   },
   "localSystem": {
     "apiName": {
+      "editLocalFile": "编辑文件",
       "getCommandOutput": "获取代码输出",
       "globLocalFiles": "匹配搜索文件",
       "grepContent": "搜索内容",
@@ -263,8 +264,7 @@
       "renameLocalFile": "重命名",
       "runCommand": "执行代码",
       "searchLocalFiles": "搜索文件",
-      "writeLocalFile": "写入文件",
-      "editLocalFile": "编辑文件"
+      "writeLocalFile": "写入文件"
     },
     "title": "本地系统"
   },

package/locales/zh-TW/chat.json

@@ -17,6 +17,7 @@
   "availableAgents": "可用助理",
   "backToBottom": "返回底部",
   "chatList": {
+    "expandMessage": "展開訊息",
     "longMessageDetail": "查看詳情"
   },
   "clearCurrentMessages": "清空當前對話",
@@ -173,9 +174,11 @@
     "title": "提及成員"
   },
   "messageAction": {
+    "collapse": "收起訊息",
     "continueGeneration": "繼續生成",
     "delAndRegenerate": "刪除並重新生成",
     "deleteDisabledByThreads": "存在子話題，無法刪除",
+    "expand": "展開訊息",
     "regenerate": "重新生成"
   },
   "messages": {

package/locales/zh-TW/plugin.json

@@ -253,6 +253,11 @@
   },
   "localSystem": {
     "apiName": {
+      "editLocalFile": "編輯檔案",
+      "getCommandOutput": "取得程式輸出",
+      "globLocalFiles": "匹配搜尋檔案",
+      "grepContent": "搜尋內容",
+      "killCommand": "終止程式執行",
       "listLocalFiles": "查看檔案列表",
       "moveLocalFiles": "移動檔案",
       "readLocalFile": "讀取檔案內容",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.64",
+  "version": "2.0.0-next.66",
   "description": "LobeHub - an open-source,comprehensive AI Agent 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",
@@ -130,8 +130,8 @@
     "@ant-design/pro-components": "^2.8.10",
     "@anthropic-ai/sdk": "^0.67.1",
     "@auth/core": "^0.40.0",
-    "@aws-sdk/client-s3": "~3.893.0",
-    "@aws-sdk/s3-request-presigner": "~3.893.0",
+    "@aws-sdk/client-s3": "~3.932.0",
+    "@aws-sdk/s3-request-presigner": "~3.932.0",
     "@azure-rest/ai-inference": "1.0.0-beta.5",
     "@azure/core-auth": "^1.10.1",
     "@cfworker/json-schema": "^4.1.1",
@@ -225,7 +225,7 @@
     "langfuse": "^3.38.6",
     "langfuse-core": "^3.38.6",
     "lodash-es": "^4.17.21",
-    "lucide-react": "^0.548.0",
+    "lucide-react": "^0.553.0",
     "mammoth": "^1.11.0",
     "markdown-to-txt": "^2.0.1",
     "marked": "^16.4.2",
@@ -242,7 +242,7 @@
     "nuqs": "^2.7.3",
     "officeparser": "5.1.1",
     "oidc-provider": "^9.5.2",
-    "ollama": "^0.6.2",
+    "ollama": "^0.6.3",
     "openai": "^4.104.0",
     "openapi-fetch": "^0.14.1",
     "partial-json": "^0.1.7",

package/packages/conversation-flow/src/__tests__/fixtures/index.ts

@@ -1,17 +1,15 @@
 import type { Message, ParseResult } from '../../types';
 // Input fixtures
 import assistantChainWithFollowupInput from './inputs/assistant-chain-with-followup.json';
-import assistantWithToolsInput from './inputs/assistant-with-tools.json';
+import { assistantGroup as assistantGroupInputs } from './inputs/assistantGroup';
 import { branch as branchInputs } from './inputs/branch';
 import { compare as compareInputs } from './inputs/compare';
-import complexScenarioInput from './inputs/complex-scenario.json';
 import linearConversationInput from './inputs/linear-conversation.json';
 // Output fixtures
 import assistantChainWithFollowupOutput from './outputs/assistant-chain-with-followup.json';
-import assistantWithToolsOutput from './outputs/assistant-with-tools.json';
+import { assistantGroup as assistantGroupOutputs } from './outputs/assistantGroup';
 import { branch as branchOutputs } from './outputs/branch';
 import { compare as compareOutputs } from './outputs/compare';
-import complexScenarioOutput from './outputs/complex-scenario.json';
 import linearConversationOutput from './outputs/linear-conversation.json';
 
 /**
@@ -28,10 +26,9 @@ export interface SerializedParseResult {
  */
 export const inputs = {
   assistantChainWithFollowup: assistantChainWithFollowupInput as Message[],
-  assistantWithTools: assistantWithToolsInput as Message[],
+  assistantGroup: assistantGroupInputs,
   branch: branchInputs,
   compare: compareInputs,
-  complexScenario: complexScenarioInput as Message[],
   linearConversation: linearConversationInput as Message[],
 };
 
@@ -40,9 +37,8 @@ export const inputs = {
  */
 export const outputs = {
   assistantChainWithFollowup: assistantChainWithFollowupOutput as unknown as SerializedParseResult,
-  assistantWithTools: assistantWithToolsOutput as unknown as SerializedParseResult,
+  assistantGroup: assistantGroupOutputs,
   branch: branchOutputs,
   compare: compareOutputs,
-  complexScenario: complexScenarioOutput as unknown as SerializedParseResult,
   linearConversation: linearConversationOutput as unknown as SerializedParseResult,
 };

package/packages/conversation-flow/src/__tests__/fixtures/inputs/{assistant-with-tools.json → assistantGroup/assistant-with-tools.json}

@@ -97,7 +97,8 @@
       "tps": 48,
       "ttft": 178,
       "duration": 875,
-      "latency": 1053
+      "latency": 1053,
+      "collapsed": true
     }
   },
   {

package/packages/conversation-flow/src/__tests__/fixtures/inputs/assistantGroup/index.ts

@@ -0,0 +1,8 @@
+import type { Message } from '../../../../types';
+import assistantWithTools from './assistant-with-tools.json';
+import toolsWithBranches from './tools-with-branches.json';
+
+export const assistantGroup = {
+  assistantWithTools: assistantWithTools as Message[],
+  toolsWithBranches: toolsWithBranches as Message[],
+};

package/packages/conversation-flow/src/__tests__/fixtures/inputs/index.ts

@@ -1,14 +1,12 @@
 import type { Message } from '../../../types';
-import assistantWithTools from './assistant-with-tools.json';
+import { assistantGroup } from './assistantGroup';
 import { branch } from './branch';
 import { compare } from './compare';
-import complexScenario from './complex-scenario.json';
 import linearConversation from './linear-conversation.json';
 
 export const inputs = {
-  assistantWithTools: assistantWithTools as Message[],
+  assistantGroup,
   branch,
   compare,
-  complexScenario: complexScenario as Message[],
   linearConversation: linearConversation as Message[],
 };

package/packages/conversation-flow/src/__tests__/fixtures/outputs/{assistant-with-tools.json → assistantGroup/assistant-with-tools.json}

@@ -9,18 +9,12 @@
         {
           "id": "msg-102",
           "type": "message",
-          "tools": [
-            "msg-103",
-            "msg-104"
-          ]
+          "tools": ["msg-103", "msg-104"]
         },
         {
           "id": "msg-105",
           "type": "message",
-          "tools": [
-            "msg-106",
-            "msg-107"
-          ]
+          "tools": ["msg-106", "msg-107"]
         },
         {
           "id": "msg-108",
@@ -98,6 +92,9 @@
             "totalInputTokens": 28,
             "totalOutputTokens": 45,
             "totalTokens": 73
+          },
+          "metadata": {
+            "collapsed": true
           }
         },
         {
@@ -178,6 +175,9 @@
         "totalOutputTokens": 199,
         "totalTokens": 628,
         "cost": 0.0018839999999999998
+      },
+      "metadata": {
+        "collapsed": true
       }
     }
   ],

package/packages/conversation-flow/src/__tests__/fixtures/outputs/assistantGroup/index.ts

@@ -0,0 +1,8 @@
+import type { SerializedParseResult } from '../..';
+import assistantWithTools from './assistant-with-tools.json';
+import toolsWithBranches from './tools-with-branches.json';
+
+export const assistantGroup = {
+  assistantWithTools: assistantWithTools as unknown as SerializedParseResult,
+  toolsWithBranches: toolsWithBranches as unknown as SerializedParseResult,
+};

package/packages/conversation-flow/src/__tests__/parse.test.ts

@@ -22,9 +22,9 @@ describe('parse', () => {
 
   describe('Tool Usage', () => {
     it('should parse assistant with tools correctly', () => {
-      const result = parse(inputs.assistantWithTools);
+      const result = parse(inputs.assistantGroup.assistantWithTools);
 
-      expect(serializeParseResult(result)).toEqual(outputs.assistantWithTools);
+      expect(serializeParseResult(result)).toEqual(outputs.assistantGroup.assistantWithTools);
     });
 
     it('should include follow-up messages after assistant chain', () => {
@@ -99,11 +99,11 @@ describe('parse', () => {
     });
   });
 
-  describe('Complex Scenarios', () => {
-    it('should handle complex mixed scenarios correctly', () => {
-      const result = parse(inputs.complexScenario);
+  describe('Assistant Group Scenarios', () => {
+    it('should handle tools with assistant branches correctly', () => {
+      const result = parse(inputs.assistantGroup.toolsWithBranches);
 
-      expect(serializeParseResult(result)).toEqual(outputs.complexScenario);
+      expect(serializeParseResult(result)).toEqual(outputs.assistantGroup.toolsWithBranches);
     });
   });
 

package/packages/conversation-flow/src/parse.ts

@@ -40,9 +40,53 @@ export function parse(messages: Message[], messageGroups?: MessageGroupMetadata[
   const flatList = transformer.flatten(messages);
 
   // Convert messageMap from Map to plain object for serialization
+  // Clean up metadata for assistant messages with tools
   const messageMapObj: Record<string, Message> = {};
+  const usagePerformanceFields = new Set([
+    'acceptedPredictionTokens',
+    'cost',
+    'duration',
+    'inputAudioTokens',
+    'inputCacheMissTokens',
+    'inputCachedTokens',
+    'inputCitationTokens',
+    'inputImageTokens',
+    'inputTextTokens',
+    'inputWriteCacheTokens',
+    'latency',
+    'outputAudioTokens',
+    'outputImageTokens',
+    'outputReasoningTokens',
+    'outputTextTokens',
+    'rejectedPredictionTokens',
+    'totalInputTokens',
+    'totalOutputTokens',
+    'totalTokens',
+    'tps',
+    'ttft',
+  ]);
+
   helperMaps.messageMap.forEach((message, id) => {
-    messageMapObj[id] = message;
+    // For assistant messages with tools, clean metadata to keep only usage/performance fields
+    if (
+      message.role === 'assistant' &&
+      message.tools &&
+      message.tools.length > 0 &&
+      message.metadata
+    ) {
+      const cleanedMetadata: Record<string, any> = {};
+      Object.entries(message.metadata).forEach(([key, value]) => {
+        if (usagePerformanceFields.has(key)) {
+          cleanedMetadata[key] = value;
+        }
+      });
+      messageMapObj[id] = {
+        ...message,
+        metadata: Object.keys(cleanedMetadata).length > 0 ? cleanedMetadata : undefined,
+      };
+    } else {
+      messageMapObj[id] = message;
+    }
   });
 
   return {

package/packages/conversation-flow/src/transformation/FlatListBuilder.ts

@@ -445,6 +445,40 @@ export class FlatListBuilder {
       const msgUsage = assistant.usage || metaUsage;
       const msgPerformance = assistant.performance || metaPerformance;
 
+      // Extract non-usage/performance metadata fields
+      const otherMetadata: Record<string, any> = {};
+      if (assistant.metadata) {
+        const usagePerformanceFields = new Set([
+          'acceptedPredictionTokens',
+          'cost',
+          'duration',
+          'inputAudioTokens',
+          'inputCacheMissTokens',
+          'inputCachedTokens',
+          'inputCitationTokens',
+          'inputImageTokens',
+          'inputTextTokens',
+          'inputWriteCacheTokens',
+          'latency',
+          'outputAudioTokens',
+          'outputImageTokens',
+          'outputReasoningTokens',
+          'outputTextTokens',
+          'rejectedPredictionTokens',
+          'totalInputTokens',
+          'totalOutputTokens',
+          'totalTokens',
+          'tps',
+          'ttft',
+        ]);
+
+        Object.entries(assistant.metadata).forEach(([key, value]) => {
+          if (!usagePerformanceFields.has(key)) {
+            otherMetadata[key] = value;
+          }
+        });
+      }
+
       const childBlock: AssistantContentBlock = {
         content: assistant.content || '',
         id: assistant.id,
@@ -457,12 +491,37 @@ export class FlatListBuilder {
       if (assistant.reasoning) childBlock.reasoning = assistant.reasoning;
       if (toolsWithResults.length > 0) childBlock.tools = toolsWithResults;
       if (msgUsage) childBlock.usage = msgUsage;
+      if (Object.keys(otherMetadata).length > 0) {
+        childBlock.metadata = otherMetadata;
+      }
 
       children.push(childBlock);
     }
 
     const aggregated = this.messageTransformer.aggregateMetadata(children);
 
+    // Collect all non-usage/performance metadata from all children
+    const groupMetadata: Record<string, any> = {};
+    children.forEach((child) => {
+      if ((child as any).metadata) {
+        Object.assign(groupMetadata, (child as any).metadata);
+      }
+    });
+
+    // If there's group-level metadata, apply it to first child and remove from others
+    if (Object.keys(groupMetadata).length > 0 && children.length > 0) {
+      // Ensure first child has the group metadata
+      if (!(children[0] as any).metadata) {
+        (children[0] as any).metadata = {};
+      }
+      Object.assign((children[0] as any).metadata, groupMetadata);
+
+      // Remove metadata from subsequent children (keep only in first child)
+      for (let i = 1; i < children.length; i++) {
+        delete (children[i] as any).metadata;
+      }
+    }
+
     const result: Message = {
       ...firstAssistant,
       children,
@@ -480,6 +539,11 @@ export class FlatListBuilder {
     if (aggregated.performance) result.performance = aggregated.performance;
     if (aggregated.usage) result.usage = aggregated.usage;
 
+    // Add group-level metadata if it exists
+    if (Object.keys(groupMetadata).length > 0) {
+      result.metadata = groupMetadata;
+    }
+
     return result;
   }
 

package/packages/database/package.json

@@ -23,9 +23,9 @@
   },
   "peerDependencies": {
     "@electric-sql/pglite": "^0.2.17",
-    "dayjs": ">=1.11.18",
+    "dayjs": ">=1.11.19",
     "drizzle-orm": ">=0.44.7",
-    "nanoid": ">=5.1.5",
+    "nanoid": ">=5.1.6",
     "pg": ">=8.16.3"
   }
 }

package/packages/obervability-otel/package.json

@@ -20,6 +20,6 @@
     "@opentelemetry/sdk-node": "^0.207.0",
     "@opentelemetry/sdk-trace-node": "^2.0.1",
     "@opentelemetry/semantic-conventions": "^1.36.0",
-    "@vercel/otel": "^1.13.0"
+    "@vercel/otel": "^2.1.0"
   }
 }

package/packages/types/src/message/common/metadata.ts

@@ -75,7 +75,9 @@ export const ModelPerformanceSchema = z.object({
   latency: z.number().optional(),
 });
 
-export const MessageMetadataSchema = ModelUsageSchema.merge(ModelPerformanceSchema);
+export const MessageMetadataSchema = ModelUsageSchema.merge(ModelPerformanceSchema).extend({
+  collapsed: z.boolean().optional(),
+});
 
 export interface ModelUsage extends ModelTokensUsage {
   /**
@@ -106,5 +108,10 @@ export interface ModelPerformance {
 export interface MessageMetadata extends ModelUsage, ModelPerformance {
   activeBranchIndex?: number;
   activeColumn?: boolean;
+  /**
+   * 消息折叠状态
+   * true: 折叠, false/undefined: 展开
+   */
+  collapsed?: boolean;
   compare?: boolean;
 }

package/packages/types/src/message/ui/chat.ts

@@ -40,6 +40,7 @@ export interface AssistantContentBlock {
   error?: ChatMessageError | null;
   id: string;
   imageList?: ChatImageItem[];
+  metadata?: Record<string, any>;
   performance?: ModelPerformance;
   reasoning?: ModelReasoning;
   tools?: ChatToolPayloadWithResult[];

package/src/app/(backend)/market/agent/[[...segments]]/route.ts

@@ -7,7 +7,7 @@ type RouteContext = {
   }>;
 };
 
-const MARKET_BASE_URL = process.env.NEXT_PUBLIC_MARKET_BASE_URL || 'http://127.0.0.1:8787';
+const MARKET_BASE_URL = process.env.NEXT_PUBLIC_MARKET_BASE_URL || 'https://market.lobehub.com';
 
 const extractAccessToken = (req: NextRequest) => {
   const authorization = req.headers.get('authorization');

package/src/app/(backend)/market/oidc/[[...segments]]/route.ts

@@ -7,7 +7,7 @@ type RouteContext = {
   }>;
 };
 
-const MARKET_BASE_URL = process.env.NEXT_PUBLIC_MARKET_BASE_URL || 'http://127.0.0.1:8787';
+const MARKET_BASE_URL = process.env.NEXT_PUBLIC_MARKET_BASE_URL || 'https://market.lobehub.com';
 const ALLOWED_ENDPOINTS = new Set(['handoff', 'token', 'userinfo']);
 
 const ensureEndpoint = (segments?: string[]) => {

package/src/app/market-auth-callback/layout.tsx

@@ -1,13 +1,37 @@
+import { cookies, headers } from 'next/headers';
 import { ReactNode } from 'react';
+import { isRtlLang } from 'rtl-detect';
+import { NuqsAdapter } from 'nuqs/adapters/next/app';
+
+
+import { DEFAULT_LANG, LOBE_LOCALE_COOKIE } from '@/const/locale';
+import GlobalLayout from '@/layout/GlobalProvider';
+import { Locales } from '@/locales/resources';
+import { parseBrowserLanguage } from '@/utils/locale';
 
 interface RootLayoutProps {
   children: ReactNode;
 }
 
-const RootLayout = ({ children }: RootLayoutProps) => {
+const RootLayout = async ({ children }: RootLayoutProps) => {
+  // 获取 locale：优先级为 cookie > 浏览器语言 > 默认语言
+  const cookieStore = await cookies();
+  const headersList = await headers();
+  const cookieLocale = cookieStore.get(LOBE_LOCALE_COOKIE)?.value as Locales | undefined;
+  const browserLanguage = parseBrowserLanguage(headersList, DEFAULT_LANG);
+  const locale = (cookieLocale || browserLanguage || DEFAULT_LANG) as Locales;
+
+  const direction = isRtlLang(locale) ? 'rtl' : 'ltr';
+
   return (
-    <html lang="en" suppressHydrationWarning>
-      <body>{children}</body>
+    <html dir={direction} lang={locale} suppressHydrationWarning>
+      <body>
+        <NuqsAdapter>
+          <GlobalLayout appearance="auto" isMobile={false} locale={locale}>
+            {children}
+          </GlobalLayout>
+        </NuqsAdapter>
+      </body>
     </html>
   );
 };

package/src/features/ChatInput/ActionBar/Token/TokenTag.tsx

@@ -13,7 +13,7 @@ import { useTokenCount } from '@/hooks/useTokenCount';
 import { useAgentStore } from '@/store/agent';
 import { agentChatConfigSelectors, agentSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors, topicSelectors } from '@/store/chat/selectors';
+import { dbMessageSelectors, topicSelectors } from '@/store/chat/selectors';
 import { useToolStore } from '@/store/tool';
 import { toolSelectors } from '@/store/tool/selectors';
 
@@ -77,7 +77,7 @@ const Token = memo<TokenTagProps>(({ total: messageString }) => {
   const inputTokenCount = useTokenCount(input);
 
   const chatsString = useMemo(() => {
-    const chats = chatSelectors.mainAIChatsWithHistoryConfig(useChatStore.getState());
+    const chats = dbMessageSelectors.activeDbMessages(useChatStore.getState());
     return chats.map((chat) => chat.content).join('');
   }, [messageString, historyCount, enableHistoryCount]);
 

package/src/features/Conversation/Messages/Assistant/Actions/index.tsx

@@ -23,10 +23,11 @@ interface AssistantActionsProps {
 }
 export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, index }) => {
   const { error, tools } = data;
-  const [isThreadMode, hasThread, isRegenerating] = useChatStore((s) => [
+  const [isThreadMode, hasThread, isRegenerating, isCollapsed] = useChatStore((s) => [
     !!s.activeThreadId,
     threadSelectors.hasThreadBySourceMsgId(id)(s),
     messageStateSelectors.isMessageRegenerating(id)(s),
+    messageStateSelectors.isMessageCollapsed(id)(s),
   ]);
   const isGroupSession = useSessionStore(sessionSelectors.isCurrentSessionGroupSession);
   const [showShareModal, setShareModal] = useState(false);
@@ -43,6 +44,8 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
     share,
     tts,
     translate,
+    collapse,
+    expand,
   } = useChatListActionsBar({ hasThread, isRegenerating });
 
   const hasTools = !!tools;
@@ -72,6 +75,7 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
     resendThreadMessage,
     delAndResendThreadMessage,
     toggleMessageEditing,
+    toggleMessageCollapsed,
   ] = useChatStore((s) => [
     s.deleteMessage,
     s.regenerateAssistantMessage,
@@ -83,6 +87,7 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
     s.resendThreadMessage,
     s.delAndResendThreadMessage,
     s.toggleMessageEditing,
+    s.toggleMessageCollapsed,
   ]);
   const { message } = App.useApp();
   const virtuosoRef = use(VirtuosoContext);
@@ -142,6 +147,12 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
           break;
         }
 
+        case 'collapse':
+        case 'expand': {
+          toggleMessageCollapsed(id);
+          break;
+        }
+
         // case 'export': {
         //   setModal(true);
         //   break;
@@ -166,6 +177,8 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
 
   if (error) return <ErrorActionsBar onActionClick={onActionClick} />;
 
+  const collapseAction = isCollapsed ? expand : collapse;
+
   return (
     <>
       <ActionIconGroup
@@ -174,6 +187,7 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
           items: [
             edit,
             copy,
+            collapseAction,
             divider,
             tts,
             translate,

package/src/features/Conversation/Messages/Assistant/CollapsedMessage.tsx

@@ -0,0 +1,37 @@
+import { Button, Markdown, MaskShadow } from '@lobehub/ui';
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Flexbox } from 'react-layout-kit';
+
+import { useChatStore } from '@/store/chat';
+
+interface CollapsedMessageProps {
+  content: string;
+  id: string;
+}
+
+export const CollapsedMessage = memo<CollapsedMessageProps>(({ id, content }) => {
+  const { t } = useTranslation('chat');
+  const toggleMessageCollapsed = useChatStore((s) => s.toggleMessageCollapsed);
+
+  return (
+    <Flexbox>
+      <MaskShadow>
+        <Markdown variant={'chat'}>{content?.slice(0, 100)}</Markdown>
+      </MaskShadow>
+      <Flexbox padding={4}>
+        <Button
+          block
+          color={'default'}
+          onClick={() => {
+            toggleMessageCollapsed(id, false);
+          }}
+          size={'small'}
+          variant={'filled'}
+        >
+          {t('chatList.expandMessage')}
+        </Button>
+      </Flexbox>
+    </Flexbox>
+  );
+});