@lobehub/lobehub 2.0.0-next.286 → 2.0.0-next.288

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/desktop-bridge/src/index.ts

@@ -7,3 +7,6 @@ export {
   locales,
   RouteVariants,
 } from './routeVariants';
+
+// Desktop window constants
+export const TITLE_BAR_HEIGHT = 38;

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/app/[variants]/(main)/settings/hooks/useCategory.tsx

@@ -26,6 +26,8 @@ import {
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useElectronStore } from '@/store/electron';
+import { electronSyncSelectors } from '@/store/electron/selectors';
 import { SettingsTabs } from '@/store/global/initialState';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { useUserStore } from '@/store/user';
@@ -63,13 +65,24 @@ export const useCategory = () => {
     userProfileSelectors.userAvatar(s),
     userProfileSelectors.nickName(s),
   ]);
+  const remoteServerUrl = useElectronStore(electronSyncSelectors.remoteServerUrl);
+
+  // Process avatar URL for desktop environment
+  const avatarUrl = useMemo(() => {
+    if (!avatar) return undefined;
+    if (isDesktop && avatar.startsWith('/') && remoteServerUrl) {
+      return remoteServerUrl + avatar;
+    }
+    return avatar;
+  }, [avatar, remoteServerUrl]);
+
   const categoryGroups: CategoryGroup[] = useMemo(() => {
     const groups: CategoryGroup[] = [];
 
     // 个人资料组 - Profile 相关设置
     const profileItems: CategoryItem[] = [
       {
-        icon: avatar ? <Avatar avatar={avatar} shape={'square'} size={26} /> : UserCircle,
+        icon: avatarUrl ? <Avatar avatar={avatarUrl} shape={'square'} size={26} /> : UserCircle,
         key: SettingsTabs.Profile,
         label: username ? username : tAuth('tab.profile'),
       },
@@ -227,7 +240,7 @@ export const useCategory = () => {
     showAiImage,
     showApiKeyManage,
     isLoginWithClerk,
-    avatar,
+    avatarUrl,
     username,
   ]);
 

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/features/ElectronTitlebar/Connection/ConnectionMode.tsx

@@ -82,12 +82,12 @@ const ConnectionMode = memo<ConnectionModeProps>(({ setWaiting }) => {
 
   const connect = useElectronStore((s) => s.connectRemoteServer);
   const storageMode = useElectronStore(electronSyncSelectors.storageMode);
-  const remoteServerUrl = useElectronStore(electronSyncSelectors.remoteServerUrl);
+  const rawRemoteServerUrl = useElectronStore(electronSyncSelectors.rawRemoteServerUrl);
 
   const [selectedOption, setSelectedOption] = useState<RemoteStorageMode>(
     storageMode === StorageModeEnum.SelfHost ? StorageModeEnum.SelfHost : StorageModeEnum.Cloud,
   );
-  const [selfHostedUrl, setSelfHostedUrl] = useState(remoteServerUrl);
+  const [selfHostedUrl, setSelfHostedUrl] = useState(rawRemoteServerUrl);
 
   const validateUrl = useCallback((url: string) => {
     if (!url) {

package/src/features/ElectronTitlebar/SimpleTitleBar.tsx

@@ -1,13 +1,12 @@
 'use client';
 
+import { TITLE_BAR_HEIGHT } from '@lobechat/desktop-bridge';
 import { Flexbox } from '@lobehub/ui';
 import { type FC } from 'react';
 
 import { ProductLogo } from '@/components/Branding/ProductLogo';
 import { electronStylish } from '@/styles/electron';
 
-import { TITLE_BAR_HEIGHT } from './const';
-
 /**
  * A simple, minimal TitleBar for Electron windows.
  * Provides draggable area without business logic (navigation, updates, etc.)

package/src/features/ElectronTitlebar/index.tsx

@@ -1,3 +1,4 @@
+import { TITLE_BAR_HEIGHT } from '@lobechat/desktop-bridge';
 import { Flexbox } from '@lobehub/ui';
 import { Divider } from 'antd';
 import { memo, useMemo } from 'react';
@@ -11,7 +12,6 @@ import NavigationBar from './NavigationBar';
 import { UpdateModal } from './UpdateModal';
 import { UpdateNotification } from './UpdateNotification';
 import WinControl from './WinControl';
-import { TITLE_BAR_HEIGHT } from './const';
 import { useWatchThemeUpdate } from './hooks/useWatchThemeUpdate';
 
 const isMac = isMacOS();
@@ -66,5 +66,5 @@ const TitleBar = memo(() => {
 
 export default TitleBar;
 
-export { TITLE_BAR_HEIGHT } from './const';
 export { default as SimpleTitleBar } from './SimpleTitleBar';
+export { TITLE_BAR_HEIGHT } from '@lobechat/desktop-bridge';

package/src/hooks/useUserAvatar.test.ts

@@ -19,6 +19,7 @@ vi.mock('@lobechat/const', async (importOriginal) => {
       return mockIsDesktop;
     },
     DEFAULT_USER_AVATAR: 'default-avatar.png',
+    OFFICIAL_URL: 'https://app.lobehub.com',
   };
 });
 
@@ -77,7 +78,7 @@ describe('useUserAvatar', () => {
     expect(result.current).toBe(mockAvatar);
   });
 
-  it('should prepend remote server URL when avatar starts with / in desktop environment', () => {
+  it('should prepend remote server URL when avatar starts with / in desktop environment (selfHost mode)', () => {
     mockIsDesktop = true;
     const mockAvatar = '/api/avatar.png';
     const mockServerUrl = 'https://server.com';
@@ -85,7 +86,7 @@ describe('useUserAvatar', () => {
     act(() => {
       useUserStore.setState({ user: { avatar: mockAvatar } as any });
       useElectronStore.setState({
-        dataSyncConfig: { remoteServerUrl: mockServerUrl, storageMode: 'cloud' },
+        dataSyncConfig: { remoteServerUrl: mockServerUrl, storageMode: 'selfHost' },
       });
     });
 
@@ -102,7 +103,7 @@ describe('useUserAvatar', () => {
     act(() => {
       useUserStore.setState({ user: { avatar: mockAvatar } as any });
       useElectronStore.setState({
-        dataSyncConfig: { remoteServerUrl: mockServerUrl, storageMode: 'cloud' },
+        dataSyncConfig: { remoteServerUrl: mockServerUrl, storageMode: 'selfHost' },
       });
     });
 
@@ -111,7 +112,7 @@ describe('useUserAvatar', () => {
     expect(result.current).toBe(mockAvatar);
   });
 
-  it('should handle empty remote server URL in desktop environment', () => {
+  it('should use OFFICIAL_URL when storageMode is cloud in desktop environment', () => {
     mockIsDesktop = true;
     const mockAvatar = '/api/avatar.png';
 
@@ -124,6 +125,24 @@ describe('useUserAvatar', () => {
 
     const { result } = renderHook(() => useUserAvatar());
 
+    // In cloud mode, selector returns OFFICIAL_URL regardless of remoteServerUrl config
+    expect(result.current).toBe('https://app.lobehub.com/api/avatar.png');
+  });
+
+  it('should return original avatar when storageMode is selfHost but no URL configured', () => {
+    mockIsDesktop = true;
+    const mockAvatar = '/api/avatar.png';
+
+    act(() => {
+      useUserStore.setState({ user: { avatar: mockAvatar } as any });
+      useElectronStore.setState({
+        dataSyncConfig: { remoteServerUrl: '', storageMode: 'selfHost' },
+      });
+    });
+
+    const { result } = renderHook(() => useUserAvatar());
+
+    // In selfHost mode with empty URL, avatar is not prepended
     expect(result.current).toBe(mockAvatar);
   });
 });

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);
     }