@lobehub/lobehub 2.0.0-next.335 → 2.0.0-next.337

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

@@ -61,6 +61,12 @@ export interface AgentConfigResolverContext {
    */
   groupId?: string;
 
+  /**
+   * Whether this is a sub-task execution.
+   * When true, filters out lobe-gtd tools to prevent nested sub-task creation.
+   */
+  isSubTask?: boolean;
+
   /** Current model being used (for template variables) */
   model?: string;
   /** Plugins enabled for the agent */
@@ -106,9 +112,13 @@ export interface ResolvedAgentConfig {
  * For regular agents, this simply returns the config from the store.
  */
 export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAgentConfig => {
-  const { agentId, model, documentContent, plugins, targetAgentConfig } = ctx;
+  const { agentId, model, documentContent, plugins, targetAgentConfig, isSubTask } = ctx;
+
+  log('resolveAgentConfig called with agentId: %s, scope: %s, isSubTask: %s', agentId, ctx.scope, isSubTask);
 
-  log('resolveAgentConfig called with agentId: %s, scope: %s', agentId, ctx.scope);
+  // Helper to filter out lobe-gtd in sub-task context to prevent nested sub-task creation
+  const applySubTaskFilter = (pluginIds: string[]) =>
+    isSubTask ? pluginIds.filter((id) => id !== 'lobe-gtd') : pluginIds;
 
   const agentStoreState = getAgentStoreState();
 
@@ -199,7 +209,7 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
         agentConfig: finalAgentConfig,
         chatConfig: finalChatConfig,
         isBuiltinAgent: false,
-        plugins: pageAgentPlugins,
+        plugins: applySubTaskFilter(pageAgentPlugins),
       };
     }
 
@@ -208,7 +218,7 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
       agentConfig: finalAgentConfig,
       chatConfig: finalChatConfig,
       isBuiltinAgent: false,
-      plugins: finalPlugins,
+      plugins: applySubTaskFilter(finalPlugins),
     };
   }
 
@@ -329,7 +339,7 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
     agentConfig: finalAgentConfig,
     chatConfig: resolvedChatConfig,
     isBuiltinAgent: true,
-    plugins: finalPlugins,
+    plugins: applySubTaskFilter(finalPlugins),
     slug,
   };
 };

package/src/services/marketApi.ts

@@ -146,6 +146,20 @@ export class MarketApiService {
     return lambdaClient.market.agent.getAgentForkSource.query({ identifier });
   }
 
+  // ==================== Agent Group Status Management ====================
+
+  async publishAgentGroup(identifier: string): Promise<void> {
+    await lambdaClient.market.agentGroup.publishAgentGroup.mutate({ identifier });
+  }
+
+  async unpublishAgentGroup(identifier: string): Promise<void> {
+    await lambdaClient.market.agentGroup.unpublishAgentGroup.mutate({ identifier });
+  }
+
+  async deprecateAgentGroup(identifier: string): Promise<void> {
+    await lambdaClient.market.agentGroup.deprecateAgentGroup.mutate({ identifier });
+  }
+
   // ==================== Fork Agent Group API ====================
 
   /**

package/src/store/chat/agents/__tests__/createAgentExecutors/helpers/testExecutor.ts

@@ -1,9 +1,21 @@
 import type { AgentInstruction, AgentState } from '@lobechat/agent-runtime';
 
+import { DEFAULT_AGENT_CHAT_CONFIG, DEFAULT_AGENT_CONFIG } from '@/const/settings';
+import type { ResolvedAgentConfig } from '@/services/chat/mecha';
 import { createAgentExecutors } from '@/store/chat/agents/createAgentExecutors';
 import type { OperationType } from '@/store/chat/slices/operation/types';
 import type { ChatStore } from '@/store/chat/store';
 
+/**
+ * Create a mock ResolvedAgentConfig for testing
+ */
+const createMockResolvedAgentConfig = (): ResolvedAgentConfig => ({
+  agentConfig: { ...DEFAULT_AGENT_CONFIG },
+  chatConfig: { ...DEFAULT_AGENT_CHAT_CONFIG },
+  isBuiltinAgent: false,
+  plugins: [],
+});
+
 /**
  * Execute an executor with mock context
  *
@@ -60,6 +72,7 @@ export const executeWithMockContext = async ({
 
   // Create executors with mock context
   const executors = createAgentExecutors({
+    agentConfig: createMockResolvedAgentConfig(),
     get: () => mockStore,
     messageKey: context.messageKey,
     operationId: context.operationId,

package/src/store/chat/agents/createAgentExecutors.ts

@@ -22,6 +22,8 @@ import type { ChatToolPayload, ConversationContext, CreateMessageParams } from '
 import debug from 'debug';
 import pMap from 'p-map';
 
+import type { ResolvedAgentConfig } from '@/services/chat/mecha';
+
 import { LOADING_FLAT } from '@/const/message';
 import { aiAgentService } from '@/services/aiAgent';
 import { agentByIdSelectors } from '@/store/agent/selectors';
@@ -49,6 +51,8 @@ const TOOL_PRICING: Record<string, number> = {
  * @param context.skipCreateFirstMessage - Skip first message creation
  */
 export const createAgentExecutors = (context: {
+  /** Pre-resolved agent config with isSubTask filtering applied */
+  agentConfig: ResolvedAgentConfig;
   get: () => ChatStore;
   messageKey: string;
   operationId: string;
@@ -169,6 +173,7 @@ export const createAgentExecutors = (context: {
         model: llmPayload.model,
         provider: llmPayload.provider,
         operationId: context.operationId,
+        agentConfig: context.agentConfig, // Pass pre-resolved config
         // Pass runtime context for page editor injection
         initialContext: runtimeContext?.initialContext,
         stepContext: runtimeContext?.stepContext,
@@ -1735,7 +1740,12 @@ export const createAgentExecutors = (context: {
         const { threadId, userMessageId, threadMessages, messages } = threadResult;
 
         // 3. Build sub-task ConversationContext (uses threadId for isolation)
-        const subContext: ConversationContext = { agentId, topicId, threadId, scope: 'thread' };
+        const subContext: ConversationContext = {
+          agentId,
+          topicId,
+          threadId,
+          scope: 'thread',
+        };
 
         // 4. Create a child operation for task execution (now with threadId)
         const { operationId: taskOperationId } = context.get().startOperation({
@@ -1784,6 +1794,7 @@ export const createAgentExecutors = (context: {
           parentMessageType: 'user',
           operationId: taskOperationId,
           parentOperationId: state.operationId,
+          isSubTask: true, // Disable lobe-gtd tools to prevent nested sub-tasks
         });
 
         log('[%s][exec_client_task] Client-side AgentRuntime execution completed', taskLogId);
@@ -2107,6 +2118,7 @@ export const createAgentExecutors = (context: {
               parentMessageType: 'user',
               operationId: taskOperationId,
               parentOperationId: state.operationId,
+              isSubTask: true, // Disable lobe-gtd tools to prevent nested sub-tasks
             });
 
             log('[%s] Client-side AgentRuntime execution completed', taskLogId);

package/src/store/chat/slices/aiChat/actions/__tests__/conversationControl.test.ts

@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { useChatStore } from '../../../../store';
 import { messageMapKey } from '../../../../utils/messageMapKey';
-import { TEST_IDS, createMockMessage } from './fixtures';
+import { TEST_IDS, createMockMessage, createMockResolvedAgentConfig } from './fixtures';
 import { resetTestEnvironment } from './helpers';
 
 // Keep zustand mock as it's needed globally
@@ -425,6 +425,7 @@ describe('ConversationControl actions', () => {
         .mockReturnValue({
           state: {} as any,
           context: { phase: 'init' } as any,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       const internal_execAgentRuntimeSpy = vi
         .spyOn(result.current, 'internal_execAgentRuntime')
@@ -497,6 +498,7 @@ describe('ConversationControl actions', () => {
         .mockReturnValue({
           state: {} as any,
           context: { phase: 'init' } as any,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       const internal_execAgentRuntimeSpy = vi
         .spyOn(result.current, 'internal_execAgentRuntime')
@@ -596,6 +598,7 @@ describe('ConversationControl actions', () => {
         .mockReturnValue({
           state: {} as any,
           context: { phase: 'init' } as any,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       const internal_execAgentRuntimeSpy = vi
         .spyOn(result.current, 'internal_execAgentRuntime')
@@ -669,6 +672,7 @@ describe('ConversationControl actions', () => {
         .mockReturnValue({
           state: {} as any,
           context: { phase: 'init' } as any,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       const internal_execAgentRuntimeSpy = vi
         .spyOn(result.current, 'internal_execAgentRuntime')

package/src/store/chat/slices/aiChat/actions/__tests__/fixtures.ts

@@ -1,6 +1,7 @@
 import { type UIChatMessage } from '@lobechat/types';
 
 import { DEFAULT_AGENT_CHAT_CONFIG, DEFAULT_AGENT_CONFIG } from '@/const/settings';
+import type { ResolvedAgentConfig } from '@/services/chat/mecha';
 
 // Test Constants
 export const TEST_IDS = {
@@ -63,3 +64,16 @@ export const createMockStoreState = (overrides = {}) => ({
   toolCallingStreamIds: {},
   ...overrides,
 });
+
+/**
+ * Create a mock ResolvedAgentConfig for testing
+ */
+export const createMockResolvedAgentConfig = (
+  overrides: Partial<ResolvedAgentConfig> = {},
+): ResolvedAgentConfig => ({
+  agentConfig: createMockAgentConfig(),
+  chatConfig: createMockChatConfig(),
+  isBuiltinAgent: false,
+  plugins: [],
+  ...overrides,
+});

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

@@ -13,6 +13,7 @@ import {
   createMockAgentConfig,
   createMockChatConfig,
   createMockMessage,
+  createMockResolvedAgentConfig,
 } from './fixtures';
 import { resetTestEnvironment, setupMockSelectors, spyOnMessageService } from './helpers';
 
@@ -57,6 +58,7 @@ describe('StreamingExecutor actions', () => {
           messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
           model: 'gpt-4o-mini',
           provider: 'openai',
+          agentConfig: createMockResolvedAgentConfig(),
         });
         expect(response.isFunctionCall).toEqual(false);
         expect(response.content).toEqual(TEST_CONTENT.AI_RESPONSE);
@@ -83,6 +85,7 @@ describe('StreamingExecutor actions', () => {
           provider: 'openai',
           messages,
           messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       });
 
@@ -127,6 +130,7 @@ describe('StreamingExecutor actions', () => {
           messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
           model: 'gpt-4o-mini',
           provider: 'openai',
+          agentConfig: createMockResolvedAgentConfig(),
         });
         expect(response.isFunctionCall).toEqual(true);
       });
@@ -165,6 +169,7 @@ describe('StreamingExecutor actions', () => {
           model: 'gpt-4o-mini',
           provider: 'openai',
           operationId,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       });
 
@@ -213,6 +218,7 @@ describe('StreamingExecutor actions', () => {
           model: 'gpt-4o-mini',
           provider: 'openai',
           operationId,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       });
 
@@ -251,6 +257,7 @@ describe('StreamingExecutor actions', () => {
           messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
           model: 'gpt-4o-mini',
           provider: 'openai',
+          agentConfig: createMockResolvedAgentConfig(),
         });
       });
 
@@ -300,6 +307,7 @@ describe('StreamingExecutor actions', () => {
           model: 'gpt-4o-mini',
           provider: 'openai',
           operationId,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       });
 
@@ -355,6 +363,7 @@ describe('StreamingExecutor actions', () => {
           model: 'gpt-4o-mini',
           provider: 'openai',
           operationId,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       });
 
@@ -394,6 +403,7 @@ describe('StreamingExecutor actions', () => {
           messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
           model: 'gpt-4o-mini',
           provider: 'openai',
+          agentConfig: createMockResolvedAgentConfig(),
         });
         expect(response.isFunctionCall).toEqual(true);
       });
@@ -419,6 +429,7 @@ describe('StreamingExecutor actions', () => {
           messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
           model: 'gpt-4o-mini',
           provider: 'openai',
+          agentConfig: createMockResolvedAgentConfig(),
         });
       });
 
@@ -435,7 +446,7 @@ describe('StreamingExecutor actions', () => {
     });
 
     describe('effectiveAgentId for group orchestration', () => {
-      it('should pass effectiveAgentId (subAgentId) to chatService when subAgentId is set in operation context', async () => {
+      it('should pass pre-resolved config for sub-agent when subAgentId is set in operation context', async () => {
         const { result } = renderHook(() => useChatStore());
         const messages = [createMockMessage({ role: 'user' })];
         const supervisorAgentId = 'supervisor-agent-id';
@@ -453,6 +464,9 @@ describe('StreamingExecutor actions', () => {
           label: 'Test Group Orchestration',
         });
 
+        // Pre-resolved config for the sub-agent (in real usage, resolved by internal_createAgentState)
+        const subAgentConfig = createMockResolvedAgentConfig();
+
         const streamSpy = vi
           .spyOn(chatService, 'createAssistantMessageStream')
           .mockImplementation(async ({ onFinish }) => {
@@ -466,14 +480,18 @@ describe('StreamingExecutor actions', () => {
             model: 'gpt-4o-mini',
             provider: 'openai',
             operationId,
+            agentConfig: subAgentConfig,
           });
         });
 
-        // Verify chatService was called with subAgentId (effectiveAgentId), not supervisorAgentId
+        // With the new architecture:
+        // - agentId param is for context/tracing (supervisor ID)
+        // - resolvedAgentConfig contains the sub-agent's config (passed in by caller)
         expect(streamSpy).toHaveBeenCalledWith(
           expect.objectContaining({
             params: expect.objectContaining({
-              agentId: subAgentId, // Should be subAgentId, not supervisorAgentId
+              agentId: supervisorAgentId, // For context/tracing purposes
+              resolvedAgentConfig: subAgentConfig, // Pre-resolved sub-agent config
             }),
           }),
         );
@@ -511,6 +529,7 @@ describe('StreamingExecutor actions', () => {
             model: 'gpt-4o-mini',
             provider: 'openai',
             operationId,
+            agentConfig: createMockResolvedAgentConfig(),
           });
         });
 
@@ -526,7 +545,7 @@ describe('StreamingExecutor actions', () => {
         streamSpy.mockRestore();
       });
 
-      it('should use subAgentId for agent config resolution when present', async () => {
+      it('should pass resolvedAgentConfig through chatService when subAgentId is present', async () => {
         const { result } = renderHook(() => useChatStore());
         const messages = [createMockMessage({ role: 'user' })];
         const supervisorAgentId = 'supervisor-agent-id';
@@ -547,6 +566,9 @@ describe('StreamingExecutor actions', () => {
           label: 'Test Speak Executor',
         });
 
+        // Create a mock resolved config that represents the speaking agent's config
+        const speakingAgentConfig = createMockResolvedAgentConfig();
+
         const streamSpy = vi
           .spyOn(chatService, 'createAssistantMessageStream')
           .mockImplementation(async ({ onFinish }) => {
@@ -560,15 +582,23 @@ describe('StreamingExecutor actions', () => {
             model: 'gpt-4o-mini',
             provider: 'openai',
             operationId,
+            // Pass pre-resolved config for the speaking agent
+            // In real usage, this is resolved in internal_createAgentState using subAgentId
+            agentConfig: speakingAgentConfig,
           });
         });
 
-        // The key assertion: chatService should receive subAgentId for agent config resolution
-        // This ensures the speaking agent's system role and tools are used, not the supervisor's
+        // With the new architecture, config is pre-resolved and passed via resolvedAgentConfig.
+        // The agentId param is for context/tracing only.
+        // The speaking agent's config is ensured by the caller (internal_createAgentState)
+        // resolving config with subAgentId and passing it as agentConfig param.
         expect(streamSpy).toHaveBeenCalledWith(
           expect.objectContaining({
             params: expect.objectContaining({
-              agentId: subAgentId,
+              // agentId is supervisor for context purposes
+              agentId: supervisorAgentId,
+              // resolvedAgentConfig contains the speaking agent's config
+              resolvedAgentConfig: speakingAgentConfig,
             }),
           }),
         );
@@ -902,6 +932,7 @@ describe('StreamingExecutor actions', () => {
           model: 'gpt-4o-mini',
           provider: 'openai',
           operationId,
+          agentConfig: createMockResolvedAgentConfig(),
         });
       });
 
@@ -943,6 +974,7 @@ describe('StreamingExecutor actions', () => {
           messageId: TEST_IDS.ASSISTANT_MESSAGE_ID,
           model: 'gpt-4o-mini',
           provider: 'openai',
+          agentConfig: createMockResolvedAgentConfig(),
         });
       });
 
@@ -1040,6 +1072,7 @@ describe('StreamingExecutor actions', () => {
             stepCount: 0,
           },
         },
+        agentConfig: createMockResolvedAgentConfig(),
       });
 
       // Execute internal_execAgentRuntime with the pre-created operationId
@@ -1135,6 +1168,7 @@ describe('StreamingExecutor actions', () => {
             stepCount: 0,
           },
         },
+        agentConfig: createMockResolvedAgentConfig(),
       });
 
       // Suppress console.error for this test
@@ -1235,6 +1269,7 @@ describe('StreamingExecutor actions', () => {
             stepCount: 0,
           },
         },
+        agentConfig: createMockResolvedAgentConfig(),
       });
 
       // Should not throw
@@ -1489,6 +1524,7 @@ describe('StreamingExecutor actions', () => {
             stepCount: 1,
           },
         },
+        agentConfig: createMockResolvedAgentConfig(),
       });
 
       await act(async () => {
@@ -1583,6 +1619,7 @@ describe('StreamingExecutor actions', () => {
             stepCount: 1,
           },
         },
+        agentConfig: createMockResolvedAgentConfig(),
       });
 
       await act(async () => {
@@ -1602,4 +1639,91 @@ describe('StreamingExecutor actions', () => {
       expect(result.current.operations[operationId!].status).toBe('failed');
     });
   });
+
+  describe('isSubTask filtering', () => {
+    it('should filter out lobe-gtd tools when isSubTask is true', async () => {
+      const { result } = renderHook(() => useChatStore());
+      const messages = [createMockMessage({ role: 'user' })];
+
+      // Mock resolveAgentConfig to return plugins including lobe-gtd
+      const resolveAgentConfigSpy = vi
+        .spyOn(agentConfigResolver, 'resolveAgentConfig')
+        .mockReturnValue({
+          agentConfig: createMockAgentConfig(),
+          chatConfig: createMockChatConfig(),
+          isBuiltinAgent: false,
+          plugins: ['lobe-gtd', 'lobe-local-system', 'other-plugin'],
+        });
+
+      // Create operation
+      let operationId: string;
+      act(() => {
+        const res = result.current.startOperation({
+          type: 'execClientTask',
+          context: {
+            agentId: TEST_IDS.SESSION_ID,
+            topicId: TEST_IDS.TOPIC_ID,
+          },
+        });
+        operationId = res.operationId;
+      });
+
+      // Call internal_createAgentState with isSubTask: true
+      act(() => {
+        result.current.internal_createAgentState({
+          messages,
+          parentMessageId: TEST_IDS.USER_MESSAGE_ID,
+          operationId,
+          isSubTask: true,
+        });
+      });
+
+      // Verify that resolveAgentConfig was called
+      expect(resolveAgentConfigSpy).toHaveBeenCalled();
+
+      resolveAgentConfigSpy.mockRestore();
+    });
+
+    it('should NOT filter out lobe-gtd tools when isSubTask is false or undefined', async () => {
+      const { result } = renderHook(() => useChatStore());
+      const messages = [createMockMessage({ role: 'user' })];
+
+      // Mock resolveAgentConfig to return plugins including lobe-gtd
+      const resolveAgentConfigSpy = vi
+        .spyOn(agentConfigResolver, 'resolveAgentConfig')
+        .mockReturnValue({
+          agentConfig: createMockAgentConfig(),
+          chatConfig: createMockChatConfig(),
+          isBuiltinAgent: false,
+          plugins: ['lobe-gtd', 'lobe-local-system', 'other-plugin'],
+        });
+
+      // Create operation without isSubTask (normal conversation)
+      let operationId: string;
+      act(() => {
+        const res = result.current.startOperation({
+          type: 'execAgentRuntime',
+          context: {
+            agentId: TEST_IDS.SESSION_ID,
+            topicId: TEST_IDS.TOPIC_ID,
+          },
+        });
+        operationId = res.operationId;
+      });
+
+      // Call internal_createAgentState without isSubTask
+      act(() => {
+        result.current.internal_createAgentState({
+          messages,
+          parentMessageId: TEST_IDS.USER_MESSAGE_ID,
+          operationId,
+        });
+      });
+
+      // Verify that resolveAgentConfig was called
+      expect(resolveAgentConfigSpy).toHaveBeenCalled();
+
+      resolveAgentConfigSpy.mockRestore();
+    });
+  });
 });