@lobehub/lobehub 2.0.0-next.65 → 2.0.0-next.67

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/[variants]/(main)/chat/components/conversation/features/ChatList/ChatItem/index.tsx

@@ -75,6 +75,7 @@ const MainChatItem = memo<ThreadChatItemProps>(({ id, index }) => {
         endRender={showThread && <Thread id={id} placement={placement} />}
         id={id}
         index={index}
+        isLatestItem={isLatestItem}
       />
       {isLatestItem && <SupervisorThinkingTag />}
     </>

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatMinimap/index.tsx

@@ -4,6 +4,7 @@ import { Icon } from '@lobehub/ui';
 import { Popover, Tooltip } from 'antd';
 import { createStyles, useTheme } from 'antd-style';
 import debug from 'debug';
+import isEqual from 'fast-deep-equal';
 import { ChevronDown, ChevronUp } from 'lucide-react';
 import { markdownToTxt } from 'markdown-to-txt';
 import { memo, useCallback, useMemo, useState, useSyncExternalStore } from 'react';
@@ -11,13 +12,13 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import {
-  getVirtuosoActiveIndex,
-  getVirtuosoGlobalRef,
-  subscribeVirtuosoActiveIndex,
-  subscribeVirtuosoGlobalRef,
+  getVirtuaActiveIndex,
+  getVirtuaGlobalRef,
+  subscribeVirtuaActiveIndex,
+  subscribeVirtuaGlobalRef,
 } from '@/features/Conversation/components/VirtualizedList/VirtuosoContext';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { displayMessageSelectors } from '@/store/chat/selectors';
 
 const log = debug('lobe-react:chat-minimap');
 
@@ -194,21 +195,17 @@ interface MinimapIndicator {
   width: number;
 }
 
-const ChatMinimap = () => {
+const ChatMinimap = memo(() => {
   const { t } = useTranslation('chat');
   const { styles, cx } = useStyles();
   const [isHovered, setIsHovered] = useState(false);
-  const virtuosoRef = useSyncExternalStore(
-    subscribeVirtuosoGlobalRef,
-    getVirtuosoGlobalRef,
-    () => null,
-  );
+  const virtuaRef = useSyncExternalStore(subscribeVirtuaGlobalRef, getVirtuaGlobalRef, () => null);
   const activeIndex = useSyncExternalStore(
-    subscribeVirtuosoActiveIndex,
-    getVirtuosoActiveIndex,
+    subscribeVirtuaActiveIndex,
+    getVirtuaActiveIndex,
     () => null,
   );
-  const messages = useChatStore(chatSelectors.mainDisplayChats);
+  const messages = useChatStore(displayMessageSelectors.mainAIChats, isEqual);
 
   const theme = useTheme();
 
@@ -247,20 +244,19 @@ const ChatMinimap = () => {
 
   const handleJump = useCallback(
     (virtIndex: number) => {
-      virtuosoRef?.current?.scrollToIndex({
+      virtuaRef?.current?.scrollToIndex(virtIndex, {
         align: 'start',
-        behavior: 'smooth',
-        index: virtIndex,
         // The current index detection will be off by 1, so we need to add 1 here
         offset: 6,
+        smooth: true,
       });
     },
-    [virtuosoRef],
+    [virtuaRef],
   );
 
   const handleStep = useCallback(
     (direction: 'prev' | 'next') => {
-      const ref = virtuosoRef?.current;
+      const ref = virtuaRef?.current;
       if (!ref || indicators.length === 0) return;
 
       let targetPosition: number;
@@ -303,14 +299,13 @@ const ChatMinimap = () => {
 
       if (!targetIndicator) return;
 
-      ref.scrollToIndex({
+      ref.scrollToIndex(targetIndicator.virtuosoIndex, {
         align: 'start',
-        behavior: 'smooth',
-        index: targetIndicator.virtuosoIndex,
         offset: 6,
+        smooth: true,
       });
     },
-    [activeIndex, activeIndicatorPosition, indicators, virtuosoRef],
+    [activeIndex, activeIndicatorPosition, indicators, virtuaRef],
   );
 
   if (indicators.length <= MIN_MESSAGES) return null;
@@ -353,9 +348,7 @@ const ChatMinimap = () => {
                   aria-label={t('minimap.jumpToMessage', { index: position + 1 })}
                   className={styles.indicator}
                   onClick={() => handleJump(virtuosoIndex)}
-                  style={{
-                    width,
-                  }}
+                  style={{ width }}
                   type={'button'}
                 >
                   <div
@@ -382,6 +375,6 @@ const ChatMinimap = () => {
       </Flexbox>
     </Flexbox>
   );
-};
+});
 
-export default memo(ChatMinimap);
+export default ChatMinimap;

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/ChatItem/style.ts

@@ -86,6 +86,10 @@ export const useStyles = createStyles(
           padding-block: 24px 12px;
           padding-inline: 12px;
 
+          @supports (content-visibility: auto) {
+            contain-intrinsic-size: auto 100lvh;
+          }
+
           time {
             display: inline-block;
             white-space: nowrap;

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

@@ -6,7 +6,7 @@ import { memo, use, useCallback, useContext, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import ShareMessageModal from '@/features/Conversation/components/ShareMessageModal';
-import { VirtuosoContext } from '@/features/Conversation/components/VirtualizedList/VirtuosoContext';
+import { VirtuaContext } from '@/features/Conversation/components/VirtualizedList/VirtuosoContext';
 import { useChatStore } from '@/store/chat';
 import { messageStateSelectors, threadSelectors } from '@/store/chat/selectors';
 import { useSessionStore } from '@/store/session';
@@ -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,9 +87,10 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
     s.resendThreadMessage,
     s.delAndResendThreadMessage,
     s.toggleMessageEditing,
+    s.toggleMessageCollapsed,
   ]);
   const { message } = App.useApp();
-  const virtuosoRef = use(VirtuosoContext);
+  const virtuaRef = use(VirtuaContext);
 
   const onActionClick = useCallback(
     async (action: ActionIconGroupEvent) => {
@@ -93,7 +98,7 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
         case 'edit': {
           toggleMessageEditing(id, true);
 
-          virtuosoRef?.current?.scrollIntoView({ align: 'start', behavior: 'auto', index });
+          virtuaRef?.current?.scrollToIndex(index, { align: 'start' });
         }
       }
       if (!data) return;
@@ -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>
+  );
+});

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

@@ -3,6 +3,7 @@ import { UIChatMessage } from '@lobechat/types';
 import { ReactNode, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
+import { CollapsedMessage } from '@/features/Conversation/Messages/Assistant/CollapsedMessage';
 import { useChatStore } from '@/store/chat';
 import { aiChatSelectors, messageStateSelectors } from '@/store/chat/selectors';
 
@@ -18,9 +19,10 @@ export const AssistantMessageContent = memo<
     editableContent: ReactNode;
   }
 >(({ id, tools, content, chunksList, search, imageList, ...props }) => {
-  const [editing, generating] = useChatStore((s) => [
+  const [editing, generating, isCollapsed] = useChatStore((s) => [
     messageStateSelectors.isMessageEditing(id)(s),
     messageStateSelectors.isMessageGenerating(id)(s),
+    messageStateSelectors.isMessageCollapsed(id)(s),
   ]);
 
   const isToolCallGenerating = generating && (content === LOADING_FLAT || !content) && !!tools;
@@ -40,14 +42,19 @@ export const AssistantMessageContent = memo<
 
   const showFileChunks = !!chunksList && chunksList.length > 0;
 
-  return editing ? (
-    <DefaultMessage
-      content={content}
-      id={id}
-      isToolCallGenerating={isToolCallGenerating}
-      {...props}
-    />
-  ) : (
+  if (editing)
+    return (
+      <DefaultMessage
+        content={content}
+        id={id}
+        isToolCallGenerating={isToolCallGenerating}
+        {...props}
+      />
+    );
+
+  if (isCollapsed) return <CollapsedMessage content={content} id={id} />;
+
+  return (
     <Flexbox gap={8} id={id}>
       {showSearch && (
         <SearchGrounding citations={search?.citations} searchQueries={search?.searchQueries} />