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

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 2.0.0-next.68](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.67...v2.0.0-next.68)
+
+<sup>Released on **2025-11-16**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: The tool to fail execution on ollama when a message contains b….
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: The tool to fail execution on ollama when a message contains b…, closes [#10259](https://github.com/lobehub/lobe-chat/issues/10259) ([1ad8080](https://github.com/lobehub/lobe-chat/commit/1ad8080))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 2.0.0-next.67](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.66...v2.0.0-next.67)
+
+<sup>Released on **2025-11-16**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor to virtua.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor to virtua, closes [#10151](https://github.com/lobehub/lobe-chat/issues/10151) ([9ffb689](https://github.com/lobehub/lobe-chat/commit/9ffb689))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.66](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.65...v2.0.0-next.66)
 
 <sup>Released on **2025-11-16**</sup>

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "The tool to fail execution on ollama when a message contains b…."
+      ]
+    },
+    "date": "2025-11-16",
+    "version": "2.0.0-next.68"
+  },
+  {
+    "children": {
+      "improvements": [
+        "Refactor to virtua."
+      ]
+    },
+    "date": "2025-11-16",
+    "version": "2.0.0-next.67"
+  },
   {
     "children": {
       "features": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.66",
+  "version": "2.0.0-next.68",
   "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",
@@ -122,9 +122,6 @@
       "eslint --fix"
     ]
   },
-  "overrides": {
-    "eta": "4.0.1"
-  },
   "dependencies": {
     "@ant-design/icons": "^5.6.1",
     "@ant-design/pro-components": "^2.8.10",
@@ -265,7 +262,7 @@
     "react-fast-marquee": "^1.6.5",
     "react-hotkeys-hook": "^5.2.1",
     "react-i18next": "^15.7.4",
-    "react-layout-kit": "^2.0.0",
+    "react-layout-kit": "^2.0.1",
     "react-lazy-load": "^4.0.1",
     "react-pdf": "^9.2.1",
     "react-responsive": "^10.0.1",
@@ -295,6 +292,7 @@
     "url-join": "^5.0.0",
     "use-merge-value": "^1.2.0",
     "uuid": "^11.1.0",
+    "virtua": "^0.47.0",
     "word-extractor": "^1.0.4",
     "ws": "^8.18.3",
     "yaml": "^2.8.1",
@@ -397,9 +395,6 @@
   "pnpm": {
     "onlyBuiltDependencies": [
       "@vercel/speed-insights"
-    ],
-    "overrides": {
-      "eta": "4.0.1"
-    }
+    ]
   }
 }

package/packages/model-runtime/src/core/streams/ollama.test.ts

@@ -235,6 +235,73 @@ describe('OllamaStream', () => {
       expect(onToolCall).toHaveBeenCalledTimes(1);
       expect(onCompletionMock).toHaveBeenCalledTimes(1);
     });
+
+    it('tools use with a done', async () => {
+      vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1').mockReturnValueOnce('abcd1234');
+
+      const mockOllamaStream = new ReadableStream<ChatResponse>({
+        start(controller) {
+          controller.enqueue({
+            model: 'qwen2.5',
+            created_at: new Date('2024-12-01T03:34:55.166692Z'),
+            message: {
+              role: 'assistant',
+              content: '',
+              tool_calls: [
+                {
+                  function: {
+                    name: 'realtime-weather____fetchCurrentWeather',
+                    arguments: { city: '杭州' },
+                  },
+                },
+              ],
+            },
+            done_reason: 'stop',
+            done: true,
+            total_duration: 1122415333,
+            load_duration: 26178333,
+            prompt_eval_count: 221,
+            prompt_eval_duration: 507000000,
+            eval_count: 26,
+            eval_duration: 583000000,
+          } as unknown as ChatResponse);
+
+          controller.close();
+        },
+      });
+      const onStartMock = vi.fn();
+      const onTextMock = vi.fn();
+      const onToolCall = vi.fn();
+      const onCompletionMock = vi.fn();
+
+      const protocolStream = OllamaStream(mockOllamaStream, {
+        onStart: onStartMock,
+        onText: onTextMock,
+        onCompletion: onCompletionMock,
+        onToolsCalling: onToolCall,
+      });
+
+      const decoder = new TextDecoder();
+      const chunks = [];
+
+      // @ts-ignore
+      for await (const chunk of protocolStream) {
+        chunks.push(decoder.decode(chunk, { stream: true }));
+      }
+
+      expect(chunks).toEqual(
+        [
+          'id: chat_1',
+          'event: tool_calls',
+          `data: [{"function":{"arguments":"{\\"city\\":\\"杭州\\"}","name":"realtime-weather____fetchCurrentWeather"},"id":"realtime-weather____fetchCurrentWeather_0_abcd1234","index":0,"type":"function"}]\n`,
+        ].map((i) => `${i}\n`),
+      );
+
+      expect(onTextMock).toHaveBeenCalledTimes(0);
+      expect(onStartMock).toHaveBeenCalledTimes(1);
+      expect(onToolCall).toHaveBeenCalledTimes(1);
+      expect(onCompletionMock).toHaveBeenCalledTimes(1);
+    });
   });
 
   it('should handle empty stream', async () => {

package/packages/model-runtime/src/core/streams/ollama.ts

@@ -11,11 +11,6 @@ import {
 } from './protocol';
 
 const transformOllamaStream = (chunk: ChatResponse, stack: StreamContext): StreamProtocolChunk => {
-  // maybe need another structure to add support for multiple choices
-  if (chunk.done && !chunk.message.content) {
-    return { data: 'finished', id: stack.id, type: 'stop' };
-  }
-
   if (chunk.message.thinking) {
     return { data: chunk.message.thinking, id: stack.id, type: 'reasoning' };
   }
@@ -36,6 +31,11 @@ const transformOllamaStream = (chunk: ChatResponse, stack: StreamContext): Strea
     };
   }
 
+  // maybe need another structure to add support for multiple choices
+  if (chunk.done && !chunk.message.content) {
+    return { data: 'finished', id: stack.id, type: 'stop' };
+  }
+
   // 判断是否有 <think> 或 </think> 标签，更新 thinkingInContent 状态
   if (chunk.message.content.includes('<think>')) {
     stack.thinkingInContent = true;

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/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';
@@ -90,7 +90,7 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
     s.toggleMessageCollapsed,
   ]);
   const { message } = App.useApp();
-  const virtuosoRef = use(VirtuosoContext);
+  const virtuaRef = use(VirtuaContext);
 
   const onActionClick = useCallback(
     async (action: ActionIconGroupEvent) => {
@@ -98,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;