@lobehub/lobehub 2.0.0-next.347 → 2.0.0-next.349

package/CHANGELOG.md

@@ -2,6 +2,59 @@
 
 # Changelog
 
+## [Version 2.0.0-next.349](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.348...v2.0.0-next.349)
+
+<sup>Released on **2026-01-23**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: When use market group, the group sys role was not used.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: When use market group, the group sys role was not used, closes [#11739](https://github.com/lobehub/lobe-chat/issues/11739) ([afc76f9](https://github.com/lobehub/lobe-chat/commit/afc76f9))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 2.0.0-next.348](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.347...v2.0.0-next.348)
+
+<sup>Released on **2026-01-23**</sup>
+
+#### 🐛 Bug Fixes
+
+- **copilot**: History popover not refreshing when agentId changes.
+- **misc**: Fixed the agent group builder tools excaution edge case crash, fixed the group topic copy not right.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **copilot**: History popover not refreshing when agentId changes, closes [#11731](https://github.com/lobehub/lobe-chat/issues/11731) ([64f39e7](https://github.com/lobehub/lobe-chat/commit/64f39e7))
+- **misc**: Fixed the agent group builder tools excaution edge case crash, closes [#11735](https://github.com/lobehub/lobe-chat/issues/11735) ([5de4742](https://github.com/lobehub/lobe-chat/commit/5de4742))
+- **misc**: Fixed the group topic copy not right, closes [#11730](https://github.com/lobehub/lobe-chat/issues/11730) ([282c1fb](https://github.com/lobehub/lobe-chat/commit/282c1fb))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.347](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.346...v2.0.0-next.347)
 
 <sup>Released on **2026-01-23**</sup>

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "When use market group, the group sys role was not used."
+      ]
+    },
+    "date": "2026-01-23",
+    "version": "2.0.0-next.349"
+  },
+  {
+    "children": {
+      "fixes": [
+        "Fixed the agent group builder tools excaution edge case crash, fixed the group topic copy not right."
+      ]
+    },
+    "date": "2026-01-23",
+    "version": "2.0.0-next.348"
+  },
   {
     "children": {
       "fixes": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.347",
+  "version": "2.0.0-next.349",
   "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/builtin-tool-group-agent-builder/src/client/Inspector/BatchCreateAgents/index.tsx

@@ -81,7 +81,7 @@ export const BatchCreateAgentsInspector = memo<
       {displayInfo && (
         <>
           <div className={styles.avatarGroup}>
-            {displayInfo.displayAgents.map((agent, index) => (
+            {displayInfo.displayAgents?.map((agent, index) => (
               <Avatar
                 avatar={agent.avatar}
                 key={index}

package/packages/database/src/models/__tests__/topics/topic.create.test.ts

@@ -2,7 +2,7 @@ import { eq, inArray } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDB } from '../../../core/getTestDB';
-import { agents, messages, sessions, topics, users } from '../../../schemas';
+import { agents, messagePlugins, messages, sessions, topics, users } from '../../../schemas';
 import { LobeChatDatabase } from '../../../type';
 import { CreateTopicParams, TopicModel } from '../../topic';
 
@@ -279,6 +279,129 @@ describe('TopicModel - Create', () => {
       expect(duplicatedMessages[1].content).toBe('Assistant message');
     });
 
+    it('should correctly map parentId references when duplicating messages', async () => {
+      const topicId = 'topic-with-parent-refs';
+
+      await serverDB.transaction(async (tx) => {
+        await tx.insert(topics).values({ id: topicId, sessionId, userId, title: 'Original Topic' });
+        await tx.insert(messages).values([
+          { id: 'msg1', role: 'user', topicId, userId, content: 'First message', parentId: null },
+          {
+            id: 'msg2',
+            role: 'assistant',
+            topicId,
+            userId,
+            content: 'Reply to first',
+            parentId: 'msg1',
+          },
+          {
+            id: 'msg3',
+            role: 'tool',
+            topicId,
+            userId,
+            content: 'Tool response',
+            parentId: 'msg2',
+          },
+          {
+            id: 'msg4',
+            role: 'assistant',
+            topicId,
+            userId,
+            content: 'Final message',
+            parentId: 'msg3',
+          },
+        ]);
+      });
+
+      const { topic: duplicatedTopic, messages: duplicatedMessages } = await topicModel.duplicate(
+        topicId,
+        'Duplicated Topic',
+      );
+
+      expect(duplicatedMessages).toHaveLength(4);
+
+      const msgMap = new Map(duplicatedMessages.map((m) => [m.content, m]));
+      const newMsg1 = msgMap.get('First message')!;
+      const newMsg2 = msgMap.get('Reply to first')!;
+      const newMsg3 = msgMap.get('Tool response')!;
+      const newMsg4 = msgMap.get('Final message')!;
+
+      expect(newMsg1.parentId).toBeNull();
+      expect(newMsg2.parentId).toBe(newMsg1.id);
+      expect(newMsg3.parentId).toBe(newMsg2.id);
+      expect(newMsg4.parentId).toBe(newMsg3.id);
+
+      expect(newMsg1.id).not.toBe('msg1');
+      expect(newMsg2.id).not.toBe('msg2');
+      expect(newMsg3.id).not.toBe('msg3');
+      expect(newMsg4.id).not.toBe('msg4');
+    });
+
+    it('should correctly map tool_call_id when duplicating messages with tools', async () => {
+      const topicId = 'topic-with-tools';
+      const originalToolId = 'toolu_original_123';
+
+      await serverDB.transaction(async (tx) => {
+        await tx.insert(topics).values({ id: topicId, sessionId, userId, title: 'Original Topic' });
+
+        // Insert assistant message with tools
+        await tx.insert(messages).values({
+          id: 'msg1',
+          role: 'assistant',
+          topicId,
+          userId,
+          content: 'Using tool',
+          parentId: null,
+          tools: [{ id: originalToolId, type: 'builtin', apiName: 'broadcast' }],
+        });
+
+        // Insert tool message
+        await tx.insert(messages).values({
+          id: 'msg2',
+          role: 'tool',
+          topicId,
+          userId,
+          content: 'Tool response',
+          parentId: 'msg1',
+        });
+
+        // Insert messagePlugins entry
+        await tx.insert(messagePlugins).values({
+          id: 'msg2',
+          userId,
+          toolCallId: originalToolId,
+          apiName: 'broadcast',
+        });
+      });
+
+      const { topic: duplicatedTopic, messages: duplicatedMessages } = await topicModel.duplicate(
+        topicId,
+        'Duplicated Topic',
+      );
+
+      expect(duplicatedMessages).toHaveLength(2);
+
+      const msgMap = new Map(duplicatedMessages.map((m) => [m.role, m]));
+      const newAssistant = msgMap.get('assistant')!;
+      const newTool = msgMap.get('tool')!;
+
+      // Check that tools array has new IDs
+      expect(newAssistant.tools).toBeDefined();
+      const newTools = newAssistant.tools as any[];
+      expect(newTools).toHaveLength(1);
+      expect(newTools[0].id).not.toBe(originalToolId);
+      expect(newTools[0].id).toMatch(/^toolu_/);
+
+      // Check that messagePlugins was copied with new toolCallId
+      const newPlugin = await serverDB.query.messagePlugins.findFirst({
+        where: eq(messagePlugins.id, newTool.id),
+      });
+
+      expect(newPlugin).toBeDefined();
+      expect(newPlugin!.toolCallId).toBe(newTools[0].id);
+      expect(newPlugin!.toolCallId).not.toBe(originalToolId);
+    });
+
     it('should throw an error if the topic to duplicate does not exist', async () => {
       const topicId = 'nonexistent-topic';
 

package/packages/database/src/models/topic.ts

@@ -17,7 +17,14 @@ import {
   sql,
 } from 'drizzle-orm';
 
-import { TopicItem, agents, agentsToSessions, messages, topics } from '../schemas';
+import {
+  TopicItem,
+  agents,
+  agentsToSessions,
+  messagePlugins,
+  messages,
+  topics,
+} from '../schemas';
 import { LobeChatDatabase } from '../type';
 import { genEndDateWhere, genRangeWhere, genStartDateWhere, genWhere } from '../utils/genWhere';
 import { idGenerator } from '../utils/idGenerator';
@@ -498,28 +505,83 @@ export class TopicModel {
         })
         .returning();
 
-      // Find messages associated with the original topic
+      // Find messages associated with the original topic, ordered by createdAt
       const originalMessages = await tx
         .select()
         .from(messages)
-        .where(and(eq(messages.topicId, topicId), eq(messages.userId, this.userId)));
-
-      // copy messages
-      const duplicatedMessages = await Promise.all(
-        originalMessages.map(async (message) => {
-          const result = (await tx
-            .insert(messages)
-            .values({
-              ...message,
-              clientId: null,
-              id: idGenerator('messages'),
-              topicId: duplicatedTopic.id,
-            })
-            .returning()) as DBMessageItem[];
-
-          return result[0];
-        }),
-      );
+        .where(and(eq(messages.topicId, topicId), eq(messages.userId, this.userId)))
+        .orderBy(messages.createdAt);
+
+      // Find all messagePlugins for this topic
+      const messageIds = originalMessages.map((m) => m.id);
+      const originalPlugins =
+        messageIds.length > 0
+          ? await tx
+              .select()
+              .from(messagePlugins)
+              .where(inArray(messagePlugins.id, messageIds))
+          : [];
+
+      // Build oldId -> newId mapping for messages
+      const idMap = new Map<string, string>();
+      originalMessages.forEach((message) => {
+        idMap.set(message.id, idGenerator('messages'));
+      });
+
+      // Build oldToolId -> newToolId mapping for tools
+      const toolIdMap = new Map<string, string>();
+      originalMessages.forEach((message) => {
+        if (message.tools && Array.isArray(message.tools)) {
+          (message.tools as any[]).forEach((tool: any) => {
+            if (tool.id) {
+              toolIdMap.set(tool.id, `toolu_${idGenerator('messages')}`);
+            }
+          });
+        }
+      });
+
+      // copy messages sequentially to respect foreign key constraints
+      const duplicatedMessages: DBMessageItem[] = [];
+      for (const message of originalMessages) {
+        const newId = idMap.get(message.id)!;
+        const newParentId = message.parentId ? idMap.get(message.parentId) || null : null;
+
+        // Update tool IDs in tools array
+        let newTools = message.tools;
+        if (newTools && Array.isArray(newTools)) {
+          newTools = (newTools as any[]).map((tool: any) => ({
+            ...tool,
+            id: tool.id ? toolIdMap.get(tool.id) || tool.id : tool.id,
+          }));
+        }
+
+        const result = (await tx
+          .insert(messages)
+          .values({
+            ...message,
+            clientId: null,
+            id: newId,
+            parentId: newParentId,
+            topicId: duplicatedTopic.id,
+            tools: newTools,
+          })
+          .returning()) as DBMessageItem[];
+
+        duplicatedMessages.push(result[0]);
+
+        // Copy messagePlugins if exists for this message
+        const plugin = originalPlugins.find((p) => p.id === message.id);
+        if (plugin) {
+          const newToolCallId = plugin.toolCallId ? toolIdMap.get(plugin.toolCallId) || null : null;
+
+          await tx.insert(messagePlugins).values({
+            ...plugin,
+            id: newId,
+            clientId: null,
+            toolCallId: newToolCallId,
+          });
+        }
+      }
 
       return {
         messages: duplicatedMessages,

package/src/app/[variants]/(main)/community/(detail)/group_agent/features/Sidebar/ActionButton/ForkGroupAndChat.tsx

@@ -130,7 +130,7 @@ const ForkGroupAndChat = memo<{ mobile?: boolean }>(() => {
           forkedFromIdentifier: identifier, // Store the source group identifier
         },
         // Group content is the supervisor's systemRole (for backward compatibility)
-        content: supervisorConfig?.systemRole || config.systemRole,
+        content: config.systemRole || supervisorConfig?.systemRole,
         ...meta,
       };
 

package/src/features/Conversation/Messages/AgentCouncil/components/CouncilList.tsx

@@ -62,7 +62,7 @@ const CouncilList = memo<CouncilListProps>(({ members, displayMode, activeTab })
               minWidth: MIN_WIDTH * members.length + 32 + 32 * (members.length - 1),
             }}
           >
-            {members.map((member, idx) => {
+            {members?.map((member, idx) => {
               if (!member) return null;
               return (
                 <Fragment key={member.id}>
@@ -77,7 +77,7 @@ const CouncilList = memo<CouncilListProps>(({ members, displayMode, activeTab })
                   >
                     <CouncilMember index={idx} item={member} />
                   </Flexbox>
-                  {idx < members.length - 1 && (
+                  {idx < members?.length - 1 && (
                     <Divider
                       dashed
                       orientation={'vertical'}

package/src/features/PageEditor/Copilot/Toolbar.tsx

@@ -1,7 +1,7 @@
 import { ActionIcon, Block, Flexbox, Popover } from '@lobehub/ui';
 import { createStaticStyles, cx } from 'antd-style';
 import { ChevronsUpDownIcon, Clock3Icon, PanelRightCloseIcon, PlusIcon } from 'lucide-react';
-import { Suspense, memo, useMemo, useState } from 'react';
+import { Suspense, memo, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import AgentAvatar from '@/app/[variants]/(main)/home/_layout/Body/Agent/List/AgentItem/Avatar';
@@ -164,6 +164,15 @@ const CopilotToolbar = memo<CopilotToolbarProps>(({ agentId, isHovered }) => {
   const setActiveAgentId = useAgentStore((s) => s.setActiveAgentId);
   const [topicPopoverOpen, setTopicPopoverOpen] = useState(false);
 
+  const handleAgentChange = useCallback(
+    (id: string) => {
+      setActiveAgentId(id);
+      // Sync chatStore's activeAgentId to ensure topic selectors work correctly
+      useChatStore.setState({ activeAgentId: id });
+    },
+    [setActiveAgentId],
+  );
+
   // Fetch topics for the agent builder
   useChatStore((s) => s.useFetchTopics)(true, { agentId });
 
@@ -175,13 +184,15 @@ const CopilotToolbar = memo<CopilotToolbarProps>(({ agentId, isHovered }) => {
 
   const [toggleRightPanel] = useGlobalStore((s) => [s.toggleRightPanel]);
 
-  const hideHistory = !topics || topics.length === 0;
+  // topics === undefined means still loading, topics.length === 0 means confirmed empty
+  const isLoadingTopics = topics === undefined;
+  const hideHistory = !isLoadingTopics && topics.length === 0;
 
   return (
     <NavHeader
       left={
         <Flexbox align="center" gap={8} horizontal>
-          <AgentSelector agentId={agentId} onAgentChange={setActiveAgentId} />
+          <AgentSelector agentId={agentId} onAgentChange={handleAgentChange} />
         </Flexbox>
       }
       right={
@@ -218,7 +229,7 @@ const CopilotToolbar = memo<CopilotToolbarProps>(({ agentId, isHovered }) => {
                   </Flexbox>
                 }
                 onOpenChange={setTopicPopoverOpen}
-                open={topicPopoverOpen}
+                open={isLoadingTopics ? false : topicPopoverOpen}
                 placement="bottomRight"
                 styles={{
                   content: {
@@ -228,7 +239,12 @@ const CopilotToolbar = memo<CopilotToolbarProps>(({ agentId, isHovered }) => {
                 }}
                 trigger="click"
               >
-                <ActionIcon icon={Clock3Icon} size={DESKTOP_HEADER_ICON_SIZE} />
+                <ActionIcon
+                  disabled={isLoadingTopics}
+                  icon={Clock3Icon}
+                  loading={isLoadingTopics}
+                  size={DESKTOP_HEADER_ICON_SIZE}
+                />
               </Popover>
             )}
           </div>

package/src/features/ProfileEditor/AgentTool.tsx

@@ -35,7 +35,6 @@ import { type LobeToolMetaWithAvailability } from '@/store/tool/slices/builtin/s
 
 import PluginTag from './PluginTag';
 
-
 const WEB_BROWSING_IDENTIFIER = 'lobe-web-browsing';
 
 type TabType = 'all' | 'installed';
@@ -334,7 +333,9 @@ const AgentTool = memo<AgentToolProps>(
       () => [
         // 原有的 builtin 工具
         ...filteredBuiltinList.map((item) => ({
-          icon: <Avatar avatar={item.meta.avatar} size={20} style={{ flex: 'none', marginRight: 0 }} />,
+          icon: (
+            <Avatar avatar={item.meta.avatar} size={20} style={{ flex: 'none', marginRight: 0 }} />
+          ),
           key: item.identifier,
           label: (
             <ToolItem