@lobehub/lobehub 2.0.0-next.287 → 2.0.0-next.289

package/packages/context-engine/src/providers/__tests__/__snapshots__/GroupContextInjector.test.ts.snap

@@ -7,13 +7,6 @@ exports[`GroupContextInjector > Edge Cases > should handle empty members array 1
 You are "", acting as a  in the multi-agent group "Empty Group".
 Your internal agent ID is  (for system use only, never expose to users).
 
-<critical_output_rules>
-IMPORTANT: Your responses must contain ONLY your actual reply content.
-- Messages in conversation history start with '<speaker name="..." />' - this identifies who sent each message
-- NEVER start your response with '<speaker' tag - the system adds this automatically
-- Just output your actual response content directly
-</critical_output_rules>
-
 <group_description>The following describes the purpose and goals of this agent group:
 
 Empty group description
@@ -22,6 +15,29 @@ Empty group description
 <group_participants>The following agents are available in this group:
 
 
+</group_participants>
+
+<identity_rules>
+- NEVER expose or display agent IDs to users - always refer to agents by their names
+</identity_rules>
+</group_context>"
+`;
+
+exports[`GroupContextInjector > Identity Rules Section > should always include identity rules 1`] = `
+"Base prompt.
+
+<group_context>
+You are "", acting as a  in the multi-agent group "".
+Your internal agent ID is  (for system use only, never expose to users).
+
+<group_description>The following describes the purpose and goals of this agent group:
+
+
+</group_description>
+
+<group_participants>The following agents are available in this group:
+
+
 </group_participants>
 
 <identity_rules>
@@ -37,13 +53,6 @@ exports[`GroupContextInjector > Variable Replacement > should handle config with
 You are "", acting as a  in the multi-agent group "Test Group".
 Your internal agent ID is  (for system use only, never expose to users).
 
-<critical_output_rules>
-IMPORTANT: Your responses must contain ONLY your actual reply content.
-- Messages in conversation history start with '<speaker name="..." />' - this identifies who sent each message
-- NEVER start your response with '<speaker' tag - the system adds this automatically
-- Just output your actual response content directly
-</critical_output_rules>
-
 <group_description>The following describes the purpose and goals of this agent group:
 
 Test group description
@@ -67,13 +76,6 @@ exports[`GroupContextInjector > Variable Replacement > should handle config with
 You are "Editor", acting as a participant in the multi-agent group "".
 Your internal agent ID is agt_editor (for system use only, never expose to users).
 
-<critical_output_rules>
-IMPORTANT: Your responses must contain ONLY your actual reply content.
-- Messages in conversation history start with '<speaker name="..." />' - this identifies who sent each message
-- NEVER start your response with '<speaker' tag - the system adds this automatically
-- Just output your actual response content directly
-</critical_output_rules>
-
 <group_description>The following describes the purpose and goals of this agent group:
 
 
@@ -97,13 +99,6 @@ exports[`GroupContextInjector > Variable Replacement > should handle empty confi
 You are "", acting as a  in the multi-agent group "".
 Your internal agent ID is  (for system use only, never expose to users).
 
-<critical_output_rules>
-IMPORTANT: Your responses must contain ONLY your actual reply content.
-- Messages in conversation history start with '<speaker name="..." />' - this identifies who sent each message
-- NEVER start your response with '<speaker' tag - the system adds this automatically
-- Just output your actual response content directly
-</critical_output_rules>
-
 <group_description>The following describes the purpose and goals of this agent group:
 
 

package/packages/prompts/src/prompts/agentGroup/__snapshots__/index.test.ts.snap

@@ -65,13 +65,6 @@ exports[`groupContextTemplate > should match snapshot 1`] = `
 "You are "{{AGENT_NAME}}", acting as a {{AGENT_ROLE}} in the multi-agent group "{{GROUP_TITLE}}".
 Your internal agent ID is {{AGENT_ID}} (for system use only, never expose to users).
 
-<critical_output_rules>
-IMPORTANT: Your responses must contain ONLY your actual reply content.
-- Messages in conversation history start with '<speaker name="..." />' - this identifies who sent each message
-- NEVER start your response with '<speaker' tag - the system adds this automatically
-- Just output your actual response content directly
-</critical_output_rules>
-
 <group_description>The following describes the purpose and goals of this agent group:
 
 {{SYSTEM_PROMPT}}

package/packages/prompts/src/prompts/agentGroup/groupContext.ts

@@ -19,13 +19,6 @@ export interface GroupContextMemberInfo {
 export const groupContextTemplate = `You are "{{AGENT_NAME}}", acting as a {{AGENT_ROLE}} in the multi-agent group "{{GROUP_TITLE}}".
 Your internal agent ID is {{AGENT_ID}} (for system use only, never expose to users).
 
-<critical_output_rules>
-IMPORTANT: Your responses must contain ONLY your actual reply content.
-- Messages in conversation history start with '<speaker name="..." />' - this identifies who sent each message
-- NEVER start your response with '<speaker' tag - the system adds this automatically
-- Just output your actual response content directly
-</critical_output_rules>
-
 <group_description>The following describes the purpose and goals of this agent group:
 
 {{SYSTEM_PROMPT}}

package/src/app/[variants]/(main)/group/features/Conversation/AgentWelcome/OpeningQuestions.tsx

@@ -1,13 +1,11 @@
 'use client';
 
 import { Block, Flexbox } from '@lobehub/ui';
-import { createStaticStyles , responsive } from 'antd-style';
+import { createStaticStyles, responsive } from 'antd-style';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useChatStore } from '@/store/chat';
-
-// import { useSend } from '../../features/ChatInput/useSend';
+import { useConversationStore } from '@/features/Conversation';
 
 const styles = createStaticStyles(({ css, cssVar }) => ({
   card: css`
@@ -38,8 +36,7 @@ interface OpeningQuestionsProps {
 
 const OpeningQuestions = memo<OpeningQuestionsProps>(({ mobile, questions }) => {
   const { t } = useTranslation('welcome');
-  const [updateMessageInput] = useChatStore((s) => [s.updateMessageInput]);
-  // const { send: sendMessage } = useSend();
+  const [sendMessage] = useConversationStore((s) => [s.sendMessage]);
 
   return (
     <div className={styles.container}>
@@ -52,8 +49,7 @@ const OpeningQuestions = memo<OpeningQuestionsProps>(({ mobile, questions }) =>
               clickable
               key={question}
               onClick={() => {
-                updateMessageInput(question);
-                // sendMessage({ isWelcomeQuestion: true });
+                sendMessage({ message: question });
               }}
               paddingBlock={8}
               paddingInline={12}

package/src/app/[variants]/(main)/group/features/Conversation/MainChatInput/GroupChat.tsx

@@ -92,9 +92,6 @@ const Desktop = memo((props: { targetMemberId?: string }) => {
       onMarkdownContentChange={(content) => {
         useChatStore.setState({ inputMessage: content });
       }}
-      onSend={() => {
-        // send({ targetMemberId: props.targetMemberId });
-      }}
       rightActions={isDMPortal ? [] : rightActions}
       // sendButtonProps={{ disabled, generating, onStop: stop }}
       sendMenu={{

package/src/app/[variants]/(main)/group/features/Conversation/useGroupContext.ts

@@ -23,9 +23,12 @@ export function useGroupContext(): ConversationContext {
   const supervisorAgentId = currentGroup?.supervisorAgentId;
 
   // Group context uses supervisorAgentId as agentId for message storage
+  // When in group mode (not group_agent thread mode), the supervisor is responding
+  // so we mark isSupervisor: true for proper UI rendering
   return {
     agentId: supervisorAgentId || '',
     groupId: groupId ?? undefined,
+    isSupervisor: !threadId, // Supervisor responds in main group chat, not in agent threads
     scope: threadId ? 'group_agent' : 'group',
     threadId,
     topicId,

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

@@ -95,9 +95,7 @@ const DesktopChatInput = memo<DesktopChatInputProps>(
             <ChatInputActionBar
               left={<ActionBar dropdownPlacement={dropdownPlacement} />}
               right={<SendArea />}
-              style={{
-                paddingRight: 8,
-              }}
+              style={{ paddingRight: 8 }}
             />
           }
           fullscreen={expand}

package/src/features/Conversation/store/slices/message/action/crud.ts

@@ -298,8 +298,8 @@ export const messageCRUDSlice: StateCreator<
 
     let ids = [message.id];
 
-    // Handle assistantGroup messages: delete all child blocks and tool results
-    if (message.role === 'assistantGroup' && message.children) {
+    // Handle assistantGroup and supervisor messages: delete all child blocks and tool results
+    if ((message.role === 'assistantGroup' || message.role === 'supervisor') && message.children) {
       const childIds = message.children.map((child: AssistantContentBlock) => child.id);
       ids = ids.concat(childIds);
 

package/src/locales/default/plugin.ts

@@ -61,18 +61,16 @@ export default {
   'builtins.lobe-group-agent-builder.inspector.title': 'Title',
   'builtins.lobe-group-agent-builder.title': 'Group Builder Expert',
   'builtins.lobe-group-management.apiName.broadcast': 'All speak',
-  'builtins.lobe-group-management.apiName.createAgent': 'Add group member',
   'builtins.lobe-group-management.apiName.createWorkflow': 'Plan workflow',
-  'builtins.lobe-group-management.apiName.executeTask': 'Execute task',
+  'builtins.lobe-group-management.apiName.executeAgentTask': 'Execute agent task',
+  'builtins.lobe-group-management.apiName.executeAgentTasks': 'Execute parallel agent tasks',
   'builtins.lobe-group-management.apiName.getAgentInfo': 'Get member info',
   'builtins.lobe-group-management.apiName.interrupt': 'Interrupt task',
-  'builtins.lobe-group-management.apiName.inviteAgent': 'Invite member',
-  'builtins.lobe-group-management.apiName.removeAgent': 'Remove member',
-  'builtins.lobe-group-management.apiName.searchAgent': 'Find relevant experts',
   'builtins.lobe-group-management.apiName.speak': 'Designated member speaks',
   'builtins.lobe-group-management.apiName.summarize': 'Summarize conversation',
   'builtins.lobe-group-management.apiName.vote': 'Start vote',
   'builtins.lobe-group-management.inspector.broadcast.title': 'Following Agents speak:',
+  'builtins.lobe-group-management.inspector.executeAgentTasks.title': 'Assigning tasks to:',
   'builtins.lobe-group-management.inspector.speak.title': 'Designated Agent speaks:',
   'builtins.lobe-group-management.title': 'Group Coordinator',
   'builtins.lobe-gtd.apiName.clearTodos': 'Clear todos',

package/src/locales/default/tool.ts

@@ -16,6 +16,9 @@ export default {
   'agentGroupManagement.executeTask.thread': 'Thread ID',
   'agentGroupManagement.executeTask.timeout': 'Execution Timed Out',
   'agentGroupManagement.executeTask.tokens': 'Token Usage',
+  'agentGroupManagement.executeTasks.intervention.instructionPlaceholder':
+    'Detailed instruction for the agent to perform this task...',
+  'agentGroupManagement.executeTasks.intervention.titlePlaceholder': 'Task title...',
   'codeInterpreter-legacy.error': 'Execution Error',
   'codeInterpreter-legacy.executing': 'Executing...',
   'codeInterpreter-legacy.files': 'Files:',

package/src/services/chat/mecha/agentConfigResolver.test.ts

@@ -1,4 +1,5 @@
 import * as builtinAgents from '@lobechat/builtin-agents';
+import { GroupManagementIdentifier } from '@lobechat/builtin-tool-group-management';
 import { GTDIdentifier } from '@lobechat/builtin-tool-gtd';
 import { NotebookIdentifier } from '@lobechat/builtin-tool-notebook';
 import { PageAgentIdentifier } from '@lobechat/builtin-tool-page-agent';
@@ -6,6 +7,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import * as agentStore from '@/store/agent';
 import * as agentSelectors from '@/store/agent/selectors';
+import * as agentGroupStore from '@/store/agentGroup';
+import * as agentGroupSelectors from '@/store/agentGroup/selectors';
 
 import { resolveAgentConfig } from './agentConfigResolver';
 
@@ -623,4 +626,161 @@ describe('resolveAgentConfig', () => {
       expect(result.chatConfig.enableHistoryCount).toBe(false);
     });
   });
+
+  describe('supervisor agent (slug from agentGroup store)', () => {
+    const mockGroupStoreState = { groupMap: {} };
+    const mockGroupWithSupervisor = {
+      agents: [
+        { id: 'supervisor-agent-id', isSupervisor: true, title: 'Supervisor' },
+        { id: 'member-agent-1', isSupervisor: false, title: 'Agent 1' },
+        { id: 'member-agent-2', isSupervisor: false, title: 'Agent 2' },
+      ],
+      config: { systemPrompt: 'Custom group system prompt' },
+      id: 'group-123',
+      supervisorAgentId: 'supervisor-agent-id',
+      title: 'Test Group',
+    };
+
+    beforeEach(() => {
+      // No slug in agent store - simulates supervisor agent not being in agentMap with slug
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(() => undefined);
+
+      // Mock agentGroup store
+      vi.spyOn(agentGroupStore, 'getChatGroupStoreState').mockReturnValue(
+        mockGroupStoreState as any,
+      );
+    });
+
+    it('should detect supervisor agent from agentGroup store when not found in agent store', () => {
+      // Mock: supervisor agent is found in agentGroup store
+      vi.spyOn(
+        agentGroupSelectors.agentGroupByIdSelectors,
+        'groupBySupervisorAgentId',
+      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+
+      // Mock: getGroupBySupervisorAgentId for building groupSupervisorContext
+      vi.spyOn(
+        agentGroupSelectors.agentGroupSelectors,
+        'getGroupBySupervisorAgentId',
+      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+
+      // Mock: getGroupMembers returns non-supervisor agents
+      vi.spyOn(agentGroupSelectors.agentGroupSelectors, 'getGroupMembers').mockReturnValue(
+        () =>
+          [
+            { id: 'member-agent-1', title: 'Agent 1' },
+            { id: 'member-agent-2', title: 'Agent 2' },
+          ] as any,
+      );
+
+      // Mock: getAgentRuntimeConfig for supervisor agent
+      vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
+        chatConfig: { enableHistoryCount: false },
+        plugins: [GroupManagementIdentifier, GTDIdentifier],
+        systemRole: 'You are a group supervisor...',
+      });
+
+      const result = resolveAgentConfig({ agentId: 'supervisor-agent-id' });
+
+      expect(result.isBuiltinAgent).toBe(true);
+      expect(result.slug).toBe('group-supervisor');
+      expect(result.plugins).toContain(GroupManagementIdentifier);
+      expect(result.plugins).toContain(GTDIdentifier);
+    });
+
+    it('should pass groupSupervisorContext to getAgentRuntimeConfig', () => {
+      // Mock: supervisor agent is found in agentGroup store
+      vi.spyOn(
+        agentGroupSelectors.agentGroupByIdSelectors,
+        'groupBySupervisorAgentId',
+      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+
+      // Mock: getGroupBySupervisorAgentId for building groupSupervisorContext
+      vi.spyOn(
+        agentGroupSelectors.agentGroupSelectors,
+        'getGroupBySupervisorAgentId',
+      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+
+      // Mock: getGroupMembers returns non-supervisor agents
+      vi.spyOn(agentGroupSelectors.agentGroupSelectors, 'getGroupMembers').mockReturnValue(
+        () =>
+          [
+            { id: 'member-agent-1', title: 'Agent 1' },
+            { id: 'member-agent-2', title: 'Agent 2' },
+          ] as any,
+      );
+
+      const getAgentRuntimeConfigSpy = vi
+        .spyOn(builtinAgents, 'getAgentRuntimeConfig')
+        .mockReturnValue({
+          chatConfig: { enableHistoryCount: false },
+          plugins: [GroupManagementIdentifier],
+          systemRole: 'You are a group supervisor...',
+        });
+
+      resolveAgentConfig({ agentId: 'supervisor-agent-id' });
+
+      expect(getAgentRuntimeConfigSpy).toHaveBeenCalledWith(
+        'group-supervisor',
+        expect.objectContaining({
+          groupSupervisorContext: {
+            availableAgents: [
+              { id: 'member-agent-1', title: 'Agent 1' },
+              { id: 'member-agent-2', title: 'Agent 2' },
+            ],
+            groupId: 'group-123',
+            groupTitle: 'Test Group',
+            systemPrompt: 'Custom group system prompt',
+          },
+        }),
+      );
+    });
+
+    it('should treat as regular agent when supervisor is not found in agentGroup store', () => {
+      // Mock: supervisor agent is NOT found in agentGroup store
+      vi.spyOn(
+        agentGroupSelectors.agentGroupByIdSelectors,
+        'groupBySupervisorAgentId',
+      ).mockReturnValue(() => undefined);
+
+      const result = resolveAgentConfig({ agentId: 'some-other-agent' });
+
+      expect(result.isBuiltinAgent).toBe(false);
+      expect(result.slug).toBeUndefined();
+      expect(result.plugins).toEqual(['plugin-a', 'plugin-b']); // Falls back to agent config plugins
+    });
+
+    it('should work correctly when regenerating supervisor message', () => {
+      // This simulates the regenerate flow where agentId is the supervisor agent ID
+      vi.spyOn(
+        agentGroupSelectors.agentGroupByIdSelectors,
+        'groupBySupervisorAgentId',
+      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+
+      vi.spyOn(
+        agentGroupSelectors.agentGroupSelectors,
+        'getGroupBySupervisorAgentId',
+      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+
+      vi.spyOn(agentGroupSelectors.agentGroupSelectors, 'getGroupMembers').mockReturnValue(
+        () => [{ id: 'member-agent-1', title: 'Agent 1' }] as any,
+      );
+
+      vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
+        chatConfig: { enableHistoryCount: false },
+        plugins: [GroupManagementIdentifier, GTDIdentifier],
+        systemRole: 'Supervisor system role',
+      });
+
+      const result = resolveAgentConfig({ agentId: 'supervisor-agent-id' });
+
+      // Should correctly identify as builtin supervisor agent
+      expect(result.isBuiltinAgent).toBe(true);
+      expect(result.slug).toBe('group-supervisor');
+      // Should have group management tool injected
+      expect(result.plugins).toContain(GroupManagementIdentifier);
+      // Should have proper system role
+      expect(result.agentConfig.systemRole).toBe('Supervisor system role');
+    });
+  });
 });

package/src/services/chat/mecha/agentConfigResolver.ts

@@ -10,7 +10,7 @@ import { produce } from 'immer';
 import { getAgentStoreState } from '@/store/agent';
 import { agentSelectors, chatConfigByIdSelectors } from '@/store/agent/selectors';
 import { getChatGroupStoreState } from '@/store/agentGroup';
-import { agentGroupSelectors } from '@/store/agentGroup/selectors';
+import { agentGroupByIdSelectors, agentGroupSelectors } from '@/store/agentGroup/selectors';
 
 /**
  * Applies params adjustments based on chatConfig settings.
@@ -49,7 +49,7 @@ export interface AgentConfigResolverContext {
   agentId: string;
 
   // Builtin agent specific context
-/** Document content for page-agent */
+  /** Document content for page-agent */
   documentContent?: string;
 
   /** Current model being used (for template variables) */
@@ -109,7 +109,19 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
   const basePlugins = agentConfig.plugins ?? [];
 
   // Check if this is a builtin agent
-  const slug = agentSelectors.getAgentSlugById(agentId)(agentStoreState);
+  // First check agent store, then check if this is a supervisor agent in agentGroup store
+  let slug = agentSelectors.getAgentSlugById(agentId)(agentStoreState);
+
+  // If not found in agent store, check if this is a supervisor agent in any group
+  // Supervisor agents have their slug stored in agentGroup store, not agent store
+  if (!slug) {
+    const groupStoreState = getChatGroupStoreState();
+    const group = agentGroupByIdSelectors.groupBySupervisorAgentId(agentId)(groupStoreState);
+    if (group) {
+      // This is a supervisor agent - use the builtin slug
+      slug = BUILTIN_AGENT_SLUGS.groupSupervisor;
+    }
+  }
 
   if (!slug) {
     // Regular agent - use provided plugins if available, fallback to agent's plugins

package/src/services/chat/mecha/contextEngineering.ts

@@ -143,7 +143,8 @@ export const contextEngineering = async ({
         currentAgentRole,
         groupTitle: groupDetail.title || undefined,
         members,
-        systemPrompt: groupDetail.config?.systemPrompt || undefined,
+        // Use group.content as the group description (shared prompt/content)
+        systemPrompt: groupDetail.content || undefined,
       };
       log('agentGroup built: %o', agentGroup);
     }

package/src/store/chat/agents/GroupOrchestration/createGroupOrchestrationExecutors.ts

@@ -190,12 +190,13 @@ export const createGroupOrchestrationExecutors = (
 
       // If instruction is provided, inject it as a virtual User Message
       // This virtual message is not persisted to database, only used for model context
+      // Mark with <speaker> tag so the agent knows this instruction is from the Supervisor
       const now = Date.now();
       const messagesWithInstruction: UIChatMessage[] = agentInstruction
         ? [
             ...messages,
             {
-              content: agentInstruction,
+              content: `<speaker name="Supervisor" />\n${agentInstruction}`,
               createdAt: now,
               id: `virtual_speak_instruction_${now}`,
               role: 'user',
@@ -266,12 +267,13 @@ export const createGroupOrchestrationExecutors = (
 
       // If instruction is provided, inject it as a virtual User Message
       // This virtual message is not persisted to database, only used for model context
+      // Mark with <speaker> tag so the agent knows this instruction is from the Supervisor
       const now = Date.now();
       const messagesWithInstruction: UIChatMessage[] = agentInstruction
         ? [
             ...messages,
             {
-              content: agentInstruction,
+              content: `<speaker name="Supervisor" />\n${agentInstruction}`,
               createdAt: now,
               id: `virtual_broadcast_instruction_${now}`,
               role: 'user',

package/src/store/chat/slices/aiChat/actions/conversationLifecycle.ts

@@ -197,6 +197,8 @@ export const conversationLifecycle: StateCreator<
         // if there is topicId，then add topicId to message
         topicId: operationContext.topicId ?? undefined,
         threadId: operationContext.threadId ?? undefined,
+        // Pass isSupervisor metadata for group orchestration (consistent with server)
+        metadata: operationContext.isSupervisor ? { isSupervisor: true } : undefined,
       },
       { operationId, tempMessageId: tempAssistantId },
     );

package/src/store/chat/slices/aiChat/actions/streamingExecutor.ts

@@ -592,7 +592,7 @@ export const streamingExecutor: StateCreator<
     // resolveAgentConfig handles:
     // - Builtin agent runtime config merging
     // - max_tokens/reasoning_effort based on chatConfig settings
-    const { agentConfig: agentConfigData, chatConfig } = resolveAgentConfig({
+    const { agentConfig: agentConfigData } = resolveAgentConfig({
       agentId: effectiveAgentId || '',
       scope: context.scope, // Pass scope from context parameter (available at line 883)
     });
@@ -863,22 +863,5 @@ export const streamingExecutor: StateCreator<
         console.error('Desktop notification error:', error);
       }
     }
-
-    // Summary history if context messages is larger than historyCount
-    const historyCount = chatConfig.historyCount ?? 0;
-
-    if (
-      chatConfig.enableHistoryCount &&
-      chatConfig.enableCompressHistory &&
-      messages.length > historyCount
-    ) {
-      // after generation: [u1,a1,u2,a2,u3,a3]
-      // but the `messages` is still: [u1,a1,u2,a2,u3]
-      // So if historyCount=2, we need to summary [u1,a1,u2,a2]
-      // because user find UI is [u1,a1,u2,a2 | u3,a3]
-      const historyMessages = messages.slice(0, -historyCount + 1);
-
-      await get().internal_summaryHistory(historyMessages);
-    }
   },
 });

package/src/store/chat/slices/message/selectors/displayMessage.test.ts

@@ -323,6 +323,30 @@ describe('displayMessageSelectors', () => {
       const result = displayMessageSelectors.currentDisplayChatKey(state as ChatStore);
       expect(result).toBe(messageMapKey({ agentId: '', topicId: undefined }));
     });
+
+    it('should generate correct key with activeGroupId for group conversations', () => {
+      const state: Partial<ChatStore> = {
+        activeAgentId: 'testId',
+        activeGroupId: 'groupId',
+        activeTopicId: undefined,
+      };
+      const result = displayMessageSelectors.currentDisplayChatKey(state as ChatStore);
+      expect(result).toBe(
+        messageMapKey({ agentId: 'testId', groupId: 'groupId', topicId: undefined }),
+      );
+    });
+
+    it('should generate correct key with activeGroupId and activeTopicId', () => {
+      const state: Partial<ChatStore> = {
+        activeAgentId: 'testId',
+        activeGroupId: 'groupId',
+        activeTopicId: 'topicId',
+      };
+      const result = displayMessageSelectors.currentDisplayChatKey(state as ChatStore);
+      expect(result).toBe(
+        messageMapKey({ agentId: 'testId', groupId: 'groupId', topicId: 'topicId' }),
+      );
+    });
   });
 
   describe('activeDisplayMessages with group chat messages', () => {

package/src/store/chat/slices/message/selectors/displayMessage.ts

@@ -24,9 +24,14 @@ import { messageMapKey } from '../../../utils/messageMapKey';
 
 /**
  * Get the current chat key for accessing messagesMap
+ * For group conversations, uses groupId to generate the correct key
  */
 export const currentDisplayChatKey = (s: ChatStoreState) =>
-  messageMapKey({ agentId: s.activeAgentId, topicId: s.activeTopicId });
+  messageMapKey({
+    agentId: s.activeAgentId,
+    groupId: s.activeGroupId,
+    topicId: s.activeTopicId,
+  });
 
 /**
  * Get display messages by key

package/src/store/chat/slices/topic/action.test.ts

@@ -462,7 +462,7 @@ describe('topic action', () => {
       });
     });
 
-    it('should NOT clear new key data when switching with undefined (backward compatibility)', async () => {
+    it('should clear new key data when switching with undefined (same as null)', async () => {
       const { result } = renderHook(() => useChatStore());
       const activeAgentId = 'test-agent-id';
 
@@ -475,13 +475,19 @@ describe('topic action', () => {
 
       const replaceMessagesSpy = vi.spyOn(result.current, 'replaceMessages');
 
-      // Switch with undefined (should NOT clear because id !== null)
+      // Switch with undefined (should clear because id == null matches both null and undefined)
       await act(async () => {
         await result.current.switchTopic(undefined, { skipRefreshMessage: true });
       });
 
-      // replaceMessages should NOT be called when switching with undefined
-      expect(replaceMessagesSpy).not.toHaveBeenCalled();
+      // replaceMessages SHOULD be called when switching with undefined
+      expect(replaceMessagesSpy).toHaveBeenCalledWith([], {
+        context: expect.objectContaining({
+          agentId: activeAgentId,
+          topicId: null,
+        }),
+        action: expect.any(String),
+      });
     });
 
     it('should not clear new key data when switching to an existing topic', async () => {

package/src/store/chat/slices/topic/action.ts

@@ -532,10 +532,11 @@ export const chatTopic: StateCreator<
     const { activeAgentId, activeGroupId } = get();
 
     // Clear the _new key data in the following cases:
-    // 1. When id is explicitly null (switching to empty topic state)
+    // 1. When id is null or undefined (switching to empty topic state)
     // 2. When clearNewKey option is explicitly true
     // This prevents stale data from previous conversations showing up
-    const shouldClearNewKey = id === null || opts.clearNewKey;
+    // Note: Use == null to match both null and undefined
+    const shouldClearNewKey = !id || opts.clearNewKey;
 
     if (shouldClearNewKey && activeAgentId) {
       // Determine scope: use explicit scope from options, or infer from activeGroupId

package/src/store/document/slices/document/action.ts

@@ -191,6 +191,14 @@ export const createDocumentSlice: StateCreator<
             // Both documentId and editor are guaranteed to be defined when this callback is called
             if (!document || !documentId || !editor) return;
 
+            // Check if this response is still for the current active document
+            // This prevents race conditions when quickly switching between documents
+            const currentActiveId = get().activeDocumentId;
+            if (currentActiveId && currentActiveId !== documentId) {
+              // User has already switched to another document, discard this stale response
+              return;
+            }
+
             // Initialize document with editor
             get().initDocumentWithEditor({
               autoSave,