@lobehub/lobehub 2.0.0-next.357 → 2.0.0-next.359

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 2.0.0-next.359](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.358...v2.0.0-next.359)
+
+<sup>Released on **2026-01-24**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Surface streaming errors during mid-stream pulls.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Surface streaming errors during mid-stream pulls, closes [#11762](https://github.com/lobehub/lobe-chat/issues/11762) ([74a88d3](https://github.com/lobehub/lobe-chat/commit/74a88d3))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 2.0.0-next.358](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.357...v2.0.0-next.358)
+
+<sup>Released on **2026-01-23**</sup>
+
+#### 🐛 Bug Fixes
+
+- **store**: Delete message before regeneration.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **store**: Delete message before regeneration, closes [#11760](https://github.com/lobehub/lobe-chat/issues/11760) ([a8a6300](https://github.com/lobehub/lobe-chat/commit/a8a6300))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.357](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.356...v2.0.0-next.357)
 
 <sup>Released on **2026-01-23**</sup>

package/changelog/v1.json

@@ -1,4 +1,18 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Surface streaming errors during mid-stream pulls."
+      ]
+    },
+    "date": "2026-01-24",
+    "version": "2.0.0-next.359"
+  },
+  {
+    "children": {},
+    "date": "2026-01-23",
+    "version": "2.0.0-next.358"
+  },
   {
     "children": {
       "fixes": [

package/e2e/src/steps/home/sidebarAgent.steps.ts

@@ -361,8 +361,10 @@ Then('Agent 应该从列表中移除', async function (this: CustomWorld) {
 
   await this.page.waitForTimeout(500);
 
-  if (this.testContext.targetItemId) {
-    const deletedItem = this.page.locator(`a[aria-label="${this.testContext.targetItemId}"]`);
+  // Use unique selector based on agent ID (href) to avoid false positives
+  // when multiple agents have the same name
+  if (this.testContext.targetItemSelector) {
+    const deletedItem = this.page.locator(this.testContext.targetItemSelector);
     await expect(deletedItem).not.toBeVisible({ timeout: 5000 });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.357",
+  "version": "2.0.0-next.359",
   "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",

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

@@ -1,7 +1,10 @@
 import { describe, expect, it, vi } from 'vitest';
 
 import {
+  FIRST_CHUNK_ERROR_KEY,
+  convertIterableToStream,
   createCallbacksTransformer,
+  createFirstErrorHandleTransformer,
   createSSEDataExtractor,
   createSSEProtocolTransformer,
   createTokenSpeedCalculator,
@@ -239,6 +242,32 @@ describe('createTokenSpeedCalculator', async () => {
   });
 });
 
+describe('convertIterableToStream', () => {
+  it('should surface errors from subsequent pulls as error chunks', async () => {
+    async function* erroringStream() {
+      yield 'first';
+      throw new Error('rate limit');
+    }
+
+    const readable = convertIterableToStream(erroringStream()).pipeThrough(
+      createFirstErrorHandleTransformer(),
+    );
+
+    const reader = readable.getReader();
+    const chunks: any[] = [];
+
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      chunks.push(value);
+    }
+
+    expect(chunks[0]).toBe('first');
+    expect(chunks[1][FIRST_CHUNK_ERROR_KEY]).toBe(true);
+    expect(chunks[1].message).toBe('rate limit');
+  });
+});
+
 describe('createSSEProtocolTransformer', () => {
   const processChunk = async (transformer: TransformStream, chunk: any) => {
     const results: any[] = [];

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

@@ -151,9 +151,19 @@ export function readableFromAsyncIterable<T>(iterable: AsyncIterable<T>) {
     },
 
     async pull(controller) {
-      const { done, value } = await it.next();
-      if (done) controller.close();
-      else controller.enqueue(value);
+      try {
+        const { done, value } = await it.next();
+        if (done) controller.close();
+        else controller.enqueue(value);
+      } catch (e) {
+        const error = e as Error;
+
+        controller.enqueue(
+          (ERROR_CHUNK_PREFIX +
+            JSON.stringify({ message: error.message, name: error.name, stack: error.stack })) as T,
+        );
+        controller.close();
+      }
     },
   });
 }
@@ -171,9 +181,19 @@ export const convertIterableToStream = <T>(stream: AsyncIterable<T>) => {
       await it.return?.(reason);
     },
     async pull(controller) {
-      const { done, value } = await it.next();
-      if (done) controller.close();
-      else controller.enqueue(value);
+      try {
+        const { done, value } = await it.next();
+        if (done) controller.close();
+        else controller.enqueue(value);
+      } catch (e) {
+        const error = e as Error;
+
+        controller.enqueue(
+          (ERROR_CHUNK_PREFIX +
+            JSON.stringify({ message: error.message, name: error.name, stack: error.stack })) as T,
+        );
+        controller.close();
+      }
     },
 
     async start(controller) {

package/src/app/[variants]/(main)/agent/cron/[cronId]/features/CronJobContentEditor.tsx

@@ -11,7 +11,7 @@ import { Editor, useEditor } from '@lobehub/editor/react';
 import { Flexbox, Icon, Text } from '@lobehub/ui';
 import { Card } from 'antd';
 import { Clock } from 'lucide-react';
-import { type RefObject, memo, useCallback, useEffect, useRef } from 'react';
+import { memo, useCallback, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
 interface CronJobContentEditorProps {
@@ -20,12 +20,8 @@ interface CronJobContentEditorProps {
   onChange: (value: string) => void;
 }
 
-interface CronJobContentEditorInnerProps extends CronJobContentEditorProps {
-  contentRef: RefObject<string>;
-}
-
-const CronJobContentEditorInner = memo<CronJobContentEditorInnerProps>(
-  ({ enableRichRender, initialValue, onChange, contentRef }) => {
+const CronJobContentEditor = memo<CronJobContentEditorProps>(
+  ({ enableRichRender, initialValue, onChange }) => {
     const { t } = useTranslation('setting');
     const editor = useEditor();
     const currentValueRef = useRef(initialValue);
@@ -35,6 +31,23 @@ const CronJobContentEditorInner = memo<CronJobContentEditorInnerProps>(
       currentValueRef.current = initialValue;
     }, [initialValue]);
 
+    // Initialize editor content when editor is ready
+    useEffect(() => {
+      if (!editor) return;
+      try {
+        setTimeout(() => {
+          if (initialValue) {
+            editor.setDocument(enableRichRender ? 'markdown' : 'text', initialValue);
+          }
+        }, 100);
+      } catch (error) {
+        console.error('[CronJobContentEditor] Failed to initialize editor content:', error);
+        setTimeout(() => {
+          editor.setDocument(enableRichRender ? 'markdown' : 'text', initialValue);
+        }, 100);
+      }
+    }, [editor, enableRichRender, initialValue]);
+
     // Handle content changes
     const handleContentChange = useCallback(
       (e: any) => {
@@ -44,18 +57,13 @@ const CronJobContentEditorInner = memo<CronJobContentEditorInnerProps>(
 
         const finalContent = nextContent || '';
 
-        // Save to parent ref for restoration
-        if (contentRef) {
-          (contentRef as { current: string }).current = finalContent;
-        }
-
         // Only call onChange if content actually changed
         if (finalContent !== currentValueRef.current) {
           currentValueRef.current = finalContent;
           onChange(finalContent);
         }
       },
-      [enableRichRender, onChange, contentRef],
+      [enableRichRender, onChange],
     );
 
     return (
@@ -74,14 +82,6 @@ const CronJobContentEditorInner = memo<CronJobContentEditorInnerProps>(
               content={''}
               editor={editor}
               lineEmptyPlaceholder={t('agentCronJobs.form.content.placeholder')}
-              onInit={(editor) => {
-                // Restore content from parent ref when editor re-initializes
-                if (contentRef?.current) {
-                  editor.setDocument(enableRichRender ? 'markdown' : 'text', contentRef.current);
-                } else if (initialValue) {
-                  editor.setDocument(enableRichRender ? 'markdown' : 'text', initialValue);
-                }
-              }}
               onTextChange={handleContentChange}
               placeholder={t('agentCronJobs.form.content.placeholder')}
               plugins={
@@ -108,17 +108,4 @@ const CronJobContentEditorInner = memo<CronJobContentEditorInnerProps>(
   },
 );
 
-const CronJobContentEditor = (props: CronJobContentEditorProps) => {
-  // Ref to persist content across re-mounts when enableRichRender changes
-  const contentRef = useRef<string>(props.initialValue);
-
-  return (
-    <CronJobContentEditorInner
-      contentRef={contentRef}
-      key={`editor-${props.enableRichRender}`}
-      {...props}
-    />
-  );
-};
-
 export default CronJobContentEditor;

package/src/features/ChatInput/ChatInputProvider.tsx

@@ -1,8 +1,5 @@
 import { useEditor } from '@lobehub/editor/react';
-import { type MutableRefObject, type ReactNode, memo, useRef } from 'react';
-
-import { useUserStore } from '@/store/user';
-import { labPreferSelectors } from '@/store/user/selectors';
+import { type ReactNode, memo, useRef } from 'react';
 
 import StoreUpdater, { type StoreUpdaterProps } from './StoreUpdater';
 import { Provider, createStore } from './store';
@@ -11,16 +8,10 @@ interface ChatInputProviderProps extends StoreUpdaterProps {
   children: ReactNode;
 }
 
-interface ChatInputProviderInnerProps extends StoreUpdaterProps {
-  children: ReactNode;
-  contentRef: MutableRefObject<string>;
-}
-
-const ChatInputProviderInner = memo<ChatInputProviderInnerProps>(
+export const ChatInputProvider = memo<ChatInputProviderProps>(
   ({
     agentId,
     children,
-    contentRef,
     leftActions,
     rightActions,
     mobile,
@@ -40,7 +31,6 @@ const ChatInputProviderInner = memo<ChatInputProviderInnerProps>(
         createStore={() =>
           createStore({
             allowExpand,
-            contentRef,
             editor,
             leftActions,
             mentionItems,
@@ -70,13 +60,3 @@ const ChatInputProviderInner = memo<ChatInputProviderInnerProps>(
     );
   },
 );
-
-export const ChatInputProvider = (props: ChatInputProviderProps) => {
-  const enableRichRender = useUserStore(labPreferSelectors.enableInputMarkdown);
-  // Ref to persist content across re-mounts when enableRichRender changes
-  const contentRef = useRef<string>('');
-
-  return (
-    <ChatInputProviderInner contentRef={contentRef} key={`editor-${enableRichRender}`} {...props} />
-  );
-};

package/src/features/ChatInput/InputEditor/index.tsx

@@ -37,7 +37,7 @@ const className = cx(css`
 `);
 
 const InputEditor = memo<{ defaultRows?: number }>(({ defaultRows = 2 }) => {
-  const [editor, slashMenuRef, send, updateMarkdownContent, expand, mentionItems, contentRef] =
+  const [editor, slashMenuRef, send, updateMarkdownContent, expand, mentionItems] =
     useChatInputStore((s) => [
       s.editor,
       s.slashMenuRef,
@@ -45,7 +45,6 @@ const InputEditor = memo<{ defaultRows?: number }>(({ defaultRows = 2 }) => {
       s.updateMarkdownContent,
       s.expand,
       s.mentionItems,
-      s.contentRef,
     ]);
 
   const storeApi = useStoreApi();
@@ -152,11 +151,7 @@ const InputEditor = memo<{ defaultRows?: number }>(({ defaultRows = 2 }) => {
       onBlur={() => {
         disableScope(HotkeyEnum.AddUserMessage);
       }}
-      onChange={(e) => {
-        // Save content to parent ref for restoration when enableRichRender changes
-        if (contentRef) {
-          contentRef.current = e.getDocument('markdown') as unknown as string;
-        }
+      onChange={() => {
         updateMarkdownContent();
       }}
       onCompositionEnd={() => {
@@ -182,13 +177,7 @@ const InputEditor = memo<{ defaultRows?: number }>(({ defaultRows = 2 }) => {
       onFocus={() => {
         enableScope(HotkeyEnum.AddUserMessage);
       }}
-      onInit={(editor) => {
-        storeApi.setState({ editor });
-        // Restore content from parent ref when editor re-initializes
-        if (contentRef?.current) {
-          editor.setDocument('markdown', contentRef.current);
-        }
-      }}
+      onInit={(editor) => storeApi.setState({ editor })}
       onPressEnter={({ event: e }) => {
         if (e.shiftKey || isChineseInput.current) return;
         // when user like alt + enter to add ai message

package/src/features/ChatInput/store/initialState.ts

@@ -1,7 +1,6 @@
 import { type IEditor, type SlashOptions } from '@lobehub/editor';
 import type { ChatInputProps } from '@lobehub/editor/react';
 import type { MenuProps } from '@lobehub/ui';
-import type { MutableRefObject } from 'react';
 
 import { type ActionKeys } from '@/features/ChatInput';
 
@@ -40,7 +39,6 @@ export interface PublicState {
 }
 
 export interface State extends PublicState {
-  contentRef?: MutableRefObject<string>;
   editor?: IEditor;
   isContentEmpty: boolean;
   markdownContent: string;

package/src/features/Conversation/store/slices/generation/action.test.ts

@@ -462,6 +462,122 @@ describe('Generation Actions', () => {
       // Should complete operation
       expect(mockCompleteOperation).toHaveBeenCalledWith('test-op-id');
     });
+
+    it('should delete message BEFORE regeneration to prevent message not found issue (LOBE-2533)', async () => {
+      // This test verifies the fix for LOBE-2533:
+      // When "delete and regenerate" is called, if regeneration happens first,
+      // it switches to a new branch, causing the original message to no longer
+      // appear in displayMessages. Then deleteMessage cannot find the message
+      // and fails silently.
+      //
+      // The fix: delete first, then regenerate.
+
+      const callOrder: string[] = [];
+
+      // Re-setup mock to track call order
+      const { useChatStore } = await import('@/store/chat');
+      vi.mocked(useChatStore.getState).mockReturnValue({
+        messagesMap: {},
+        operations: {},
+        messageLoadingIds: [],
+        cancelOperations: mockCancelOperations,
+        cancelOperation: mockCancelOperation,
+        deleteMessage: vi.fn().mockImplementation(() => {
+          callOrder.push('deleteMessage');
+          return Promise.resolve();
+        }),
+        switchMessageBranch: vi.fn().mockImplementation(() => {
+          callOrder.push('switchMessageBranch');
+          return Promise.resolve();
+        }),
+        startOperation: mockStartOperation,
+        completeOperation: mockCompleteOperation,
+        failOperation: mockFailOperation,
+        internal_execAgentRuntime: vi.fn().mockImplementation(() => {
+          callOrder.push('internal_execAgentRuntime');
+          return Promise.resolve();
+        }),
+      } as any);
+
+      const context: ConversationContext = {
+        agentId: 'session-1',
+        topicId: 'topic-1',
+        threadId: null,
+        groupId: 'group-1',
+      };
+
+      const store = createStore({ context });
+
+      // Set displayMessages and dbMessages
+      act(() => {
+        store.setState({
+          displayMessages: [
+            { id: 'msg-1', role: 'user', content: 'Hello' },
+            { id: 'msg-2', role: 'assistant', content: 'Hi there', parentId: 'msg-1' },
+          ],
+          dbMessages: [
+            { id: 'msg-1', role: 'user', content: 'Hello' },
+            { id: 'msg-2', role: 'assistant', content: 'Hi there', parentId: 'msg-1' },
+          ],
+        } as any);
+      });
+
+      await act(async () => {
+        await store.getState().delAndRegenerateMessage('msg-2');
+      });
+
+      // CRITICAL: deleteMessage must be called BEFORE switchMessageBranch and internal_execAgentRuntime
+      // If regeneration (which calls switchMessageBranch) happens first, the message
+      // won't be found in displayMessages and deletion will fail silently.
+      expect(callOrder[0]).toBe('deleteMessage');
+      expect(callOrder).toContain('switchMessageBranch');
+      expect(callOrder).toContain('internal_execAgentRuntime');
+
+      // Verify deleteMessage is called before any regeneration-related calls
+      const deleteIndex = callOrder.indexOf('deleteMessage');
+      const switchIndex = callOrder.indexOf('switchMessageBranch');
+      const execIndex = callOrder.indexOf('internal_execAgentRuntime');
+
+      expect(deleteIndex).toBeLessThan(switchIndex);
+      expect(deleteIndex).toBeLessThan(execIndex);
+    });
+
+    it('should not proceed if assistant message has no parentId', async () => {
+      const { useChatStore } = await import('@/store/chat');
+      vi.mocked(useChatStore.getState).mockReturnValue({
+        messagesMap: {},
+        operations: {},
+        messageLoadingIds: [],
+        startOperation: mockStartOperation,
+        completeOperation: mockCompleteOperation,
+        deleteMessage: mockDeleteMessage,
+      } as any);
+
+      const context: ConversationContext = {
+        agentId: 'session-1',
+        topicId: null,
+        threadId: null,
+      };
+
+      const store = createStore({ context });
+
+      // Set displayMessages with assistant message that has no parentId
+      act(() => {
+        store.setState({
+          displayMessages: [
+            { id: 'msg-1', role: 'assistant', content: 'Hi there' }, // no parentId
+          ],
+        } as any);
+      });
+
+      await act(async () => {
+        await store.getState().delAndRegenerateMessage('msg-1');
+      });
+
+      // Should not proceed - no operation created, no delete called
+      expect(mockStartOperation).not.toHaveBeenCalled();
+      expect(mockDeleteMessage).not.toHaveBeenCalled();
+    });
   });
 
   describe('delAndResendThreadMessage', () => {

package/src/features/Conversation/store/slices/generation/action.ts

@@ -206,18 +206,29 @@ export const generationSlice: StateCreator<
   },
 
   delAndRegenerateMessage: async (messageId: string) => {
-    const { context } = get();
+    const { context, displayMessages } = get();
     const chatStore = useChatStore.getState();
 
+    // Find the assistant message and get parent user message ID before deletion
+    // This is needed because after deletion, we can't find the parent anymore
+    const currentMessage = displayMessages.find((c) => c.id === messageId);
+    if (!currentMessage) return;
+
+    const userId = currentMessage.parentId;
+    if (!userId) return;
+
     // Create operation to track context (use 'regenerate' type since this is a regenerate action)
     const { operationId } = chatStore.startOperation({
       context: { ...context, messageId },
       type: 'regenerate',
     });
 
-    // Regenerate first, then delete
-    await get().regenerateAssistantMessage(messageId);
+    // IMPORTANT: Delete first, then regenerate (LOBE-2533)
+    // If we regenerate first, it switches to a new branch, causing the original
+    // message to no longer appear in displayMessages. Then deleteMessage cannot
+    // find the message and fails silently.
     await chatStore.deleteMessage(messageId, { operationId });
+    await get().regenerateUserMessage(userId);
     chatStore.completeOperation(operationId);
   },