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

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

@@ -15,6 +15,35 @@ import { aiModelSelectors } from '@/store/aiInfra';
 import { useToolStore } from '@/store/tool';
 
 import { chatService } from './index';
+import type { ResolvedAgentConfig } from './mecha';
+
+/**
+ * Default mock resolvedAgentConfig for tests
+ */
+const createMockResolvedConfig = (overrides?: {
+  agentConfig?: Partial<ResolvedAgentConfig['agentConfig']>;
+  chatConfig?: Partial<ResolvedAgentConfig['chatConfig']>;
+  plugins?: string[];
+  isBuiltinAgent?: boolean;
+}): ResolvedAgentConfig =>
+  ({
+    agentConfig: {
+      model: DEFAULT_AGENT_CONFIG.model,
+      provider: 'openai',
+      systemRole: '',
+      chatConfig: {},
+      params: {},
+      tts: {},
+      ...overrides?.agentConfig,
+    },
+    chatConfig: {
+      searchMode: 'off',
+      autoCreateTopicThreshold: 2,
+      ...overrides?.chatConfig,
+    },
+    isBuiltinAgent: overrides?.isBuiltinAgent ?? false,
+    plugins: overrides?.plugins ?? [],
+  }) as ResolvedAgentConfig;
 
 // Mocking external dependencies
 vi.mock('i18next', () => ({
@@ -109,7 +138,10 @@ describe('ChatService', () => {
           ],
         });
       });
-      await chatService.createAssistantMessage({ messages, plugins: enabledPlugins });
+      await chatService.createAssistantMessage({
+        messages,
+        resolvedAgentConfig: createMockResolvedConfig({ plugins: enabledPlugins }),
+      });
 
       expect(getChatCompletionSpy).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -136,21 +168,14 @@ describe('ChatService', () => {
         vi.spyOn(aiModelSelectors, 'isModelHasExtendParams').mockReturnValue(() => true);
         vi.spyOn(aiModelSelectors, 'modelExtendParams').mockReturnValue(() => ['enableReasoning']);
 
-        // Mock agent chat config with reasoning enabled
-        vi.spyOn(chatConfigByIdSelectors, 'getChatConfigById').mockReturnValue(
-          () =>
-            ({
-              enableReasoning: true,
-              reasoningBudgetToken: 2048,
-              searchMode: 'off',
-            }) as any,
-        );
-
         await chatService.createAssistantMessage({
           messages,
           model: 'deepseek-reasoner',
           provider: 'deepseek',
-          plugins: [],
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'deepseek-reasoner', provider: 'deepseek' },
+            chatConfig: { enableReasoning: true, reasoningBudgetToken: 2048 },
+          }),
         });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -172,20 +197,14 @@ describe('ChatService', () => {
         vi.spyOn(aiModelSelectors, 'isModelHasExtendParams').mockReturnValue(() => true);
         vi.spyOn(aiModelSelectors, 'modelExtendParams').mockReturnValue(() => ['enableReasoning']);
 
-        // Mock agent chat config with reasoning disabled
-        vi.spyOn(chatConfigByIdSelectors, 'getChatConfigById').mockReturnValue(
-          () =>
-            ({
-              enableReasoning: false,
-              searchMode: 'off',
-            }) as any,
-        );
-
         await chatService.createAssistantMessage({
           messages,
           model: 'deepseek-reasoner',
           provider: 'deepseek',
-          plugins: [],
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'deepseek-reasoner', provider: 'deepseek' },
+            chatConfig: { enableReasoning: false },
+          }),
         });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -207,21 +226,15 @@ describe('ChatService', () => {
         vi.spyOn(aiModelSelectors, 'isModelHasExtendParams').mockReturnValue(() => true);
         vi.spyOn(aiModelSelectors, 'modelExtendParams').mockReturnValue(() => ['enableReasoning']);
 
-        // Mock agent chat config with reasoning enabled but no custom budget
-        vi.spyOn(chatConfigByIdSelectors, 'getChatConfigById').mockReturnValue(
-          () =>
-            ({
-              enableReasoning: true,
-              // reasoningBudgetToken is undefined
-              searchMode: 'off',
-            }) as any,
-        );
-
         await chatService.createAssistantMessage({
           messages,
           model: 'deepseek-reasoner',
           provider: 'deepseek',
-          plugins: [],
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'deepseek-reasoner', provider: 'deepseek' },
+            // enableReasoning is true, but reasoningBudgetToken is undefined
+            chatConfig: { enableReasoning: true },
+          }),
         });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -243,20 +256,14 @@ describe('ChatService', () => {
         vi.spyOn(aiModelSelectors, 'isModelHasExtendParams').mockReturnValue(() => true);
         vi.spyOn(aiModelSelectors, 'modelExtendParams').mockReturnValue(() => ['reasoningEffort']);
 
-        // Mock agent chat config with reasoning effort set
-        vi.spyOn(chatConfigByIdSelectors, 'getChatConfigById').mockReturnValue(
-          () =>
-            ({
-              reasoningEffort: 'high',
-              searchMode: 'off',
-            }) as any,
-        );
-
         await chatService.createAssistantMessage({
           messages,
           model: 'test-model',
           provider: 'test-provider',
-          plugins: [],
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'test-model', provider: 'test-provider' },
+            chatConfig: { reasoningEffort: 'high' },
+          }),
         });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -275,20 +282,14 @@ describe('ChatService', () => {
         vi.spyOn(aiModelSelectors, 'isModelHasExtendParams').mockReturnValue(() => true);
         vi.spyOn(aiModelSelectors, 'modelExtendParams').mockReturnValue(() => ['thinkingBudget']);
 
-        // Mock agent chat config with thinking budget set
-        vi.spyOn(chatConfigByIdSelectors, 'getChatConfigById').mockReturnValue(
-          () =>
-            ({
-              thinkingBudget: 5000,
-              searchMode: 'off',
-            }) as any,
-        );
-
         await chatService.createAssistantMessage({
           messages,
           model: 'test-model',
           provider: 'test-provider',
-          plugins: [],
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'test-model', provider: 'test-provider' },
+            chatConfig: { thinkingBudget: 5000 },
+          }),
         });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -329,9 +330,11 @@ describe('ChatService', () => {
         const getChatCompletionSpy = vi.spyOn(chatService, 'getChatCompletion');
         await chatService.createAssistantMessage({
           messages,
-          plugins: [],
           model: 'gpt-4-vision-preview',
           provider: 'openai',
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'gpt-4-vision-preview', provider: 'openai' },
+          }),
         });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -378,7 +381,10 @@ describe('ChatService', () => {
         ] as UIChatMessage[];
 
         const getChatCompletionSpy = vi.spyOn(chatService, 'getChatCompletion');
-        await chatService.createAssistantMessage({ messages, plugins: [] });
+        await chatService.createAssistantMessage({
+          messages,
+          resolvedAgentConfig: createMockResolvedConfig(),
+        });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
           {
@@ -435,8 +441,10 @@ describe('ChatService', () => {
 
         await chatService.createAssistantMessage({
           messages,
-          plugins: [],
           model: 'gpt-4-vision-preview',
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'gpt-4-vision-preview' },
+          }),
         });
 
         // Verify the utility functions were called
@@ -525,8 +533,10 @@ describe('ChatService', () => {
 
         await chatService.createAssistantMessage({
           messages,
-          plugins: [],
           model: 'gpt-4-vision-preview',
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'gpt-4-vision-preview' },
+          }),
         });
 
         // Verify the utility functions were called
@@ -630,8 +640,10 @@ describe('ChatService', () => {
 
         await chatService.createAssistantMessage({
           messages,
-          plugins: [],
           model: 'gpt-4-vision-preview',
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'gpt-4-vision-preview' },
+          }),
         });
 
         // Verify isDesktopLocalStaticServerUrl was called for each image
@@ -730,7 +742,10 @@ describe('ChatService', () => {
           messages,
           model: 'gpt-3.5-turbo-1106',
           top_p: 1,
-          plugins: ['seo'],
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'gpt-3.5-turbo-1106' },
+            plugins: ['seo'],
+          }),
         });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -832,7 +847,10 @@ describe('ChatService', () => {
           messages,
           model: 'gpt-3.5-turbo-1106',
           top_p: 1,
-          plugins: ['seo'],
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'gpt-3.5-turbo-1106' },
+            plugins: ['seo'],
+          }),
         });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -888,7 +906,9 @@ describe('ChatService', () => {
           messages,
           model: 'gpt-3.5-turbo-1106',
           top_p: 1,
-          plugins: ['ttt'],
+          resolvedAgentConfig: createMockResolvedConfig({
+            agentConfig: { model: 'gpt-3.5-turbo-1106' },
+          }),
         });
 
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -949,7 +969,10 @@ describe('ChatService', () => {
           mockToolsEngine as any,
         );
 
-        await chatService.createAssistantMessage({ messages, plugins: [] });
+        await chatService.createAssistantMessage({
+          messages,
+          resolvedAgentConfig: createMockResolvedConfig(),
+        });
 
         // Verify tools were passed to getChatCompletion
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -1003,7 +1026,10 @@ describe('ChatService', () => {
           mockToolsEngine as any,
         );
 
-        await chatService.createAssistantMessage({ messages, plugins: [] });
+        await chatService.createAssistantMessage({
+          messages,
+          resolvedAgentConfig: createMockResolvedConfig(),
+        });
 
         // Verify enabledSearch was set to true
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -1051,7 +1077,10 @@ describe('ChatService', () => {
           mockToolsEngine as any,
         );
 
-        await chatService.createAssistantMessage({ messages, plugins: [] });
+        await chatService.createAssistantMessage({
+          messages,
+          resolvedAgentConfig: createMockResolvedConfig(),
+        });
 
         // Verify enabledSearch was not set
         expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -1342,20 +1371,14 @@ describe('ChatService private methods', () => {
         'disableContextCaching',
       ]);
 
-      // Mock agent chat config with context caching disabled
-      vi.spyOn(chatConfigByIdSelectors, 'getChatConfigById').mockReturnValue(
-        () =>
-          ({
-            disableContextCaching: true,
-            searchMode: 'off',
-          }) as any,
-      );
-
       await chatService.createAssistantMessage({
         messages,
         model: 'test-model',
         provider: 'test-provider',
-        plugins: [],
+        resolvedAgentConfig: createMockResolvedConfig({
+          agentConfig: { model: 'test-model', provider: 'test-provider' },
+          chatConfig: { disableContextCaching: true },
+        }),
       });
 
       expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -1378,20 +1401,14 @@ describe('ChatService private methods', () => {
         'disableContextCaching',
       ]);
 
-      // Mock agent chat config with context caching enabled (default)
-      vi.spyOn(chatConfigByIdSelectors, 'getChatConfigById').mockReturnValue(
-        () =>
-          ({
-            disableContextCaching: false,
-            searchMode: 'off',
-          }) as any,
-      );
-
       await chatService.createAssistantMessage({
         messages,
         model: 'test-model',
         provider: 'test-provider',
-        plugins: [],
+        resolvedAgentConfig: createMockResolvedConfig({
+          agentConfig: { model: 'test-model', provider: 'test-provider' },
+          chatConfig: { disableContextCaching: false },
+        }),
       });
 
       // enabledContextCaching should not be present in the call
@@ -1407,20 +1424,14 @@ describe('ChatService private methods', () => {
       vi.spyOn(aiModelSelectors, 'isModelHasExtendParams').mockReturnValue(() => true);
       vi.spyOn(aiModelSelectors, 'modelExtendParams').mockReturnValue(() => ['reasoningEffort']);
 
-      // Mock agent chat config with reasoning effort set
-      vi.spyOn(chatConfigByIdSelectors, 'getChatConfigById').mockReturnValue(
-        () =>
-          ({
-            reasoningEffort: 'high',
-            searchMode: 'off',
-          }) as any,
-      );
-
       await chatService.createAssistantMessage({
         messages,
         model: 'test-model',
         provider: 'test-provider',
-        plugins: [],
+        resolvedAgentConfig: createMockResolvedConfig({
+          agentConfig: { model: 'test-model', provider: 'test-provider' },
+          chatConfig: { reasoningEffort: 'high' },
+        }),
       });
 
       expect(getChatCompletionSpy).toHaveBeenCalledWith(
@@ -1439,20 +1450,14 @@ describe('ChatService private methods', () => {
       vi.spyOn(aiModelSelectors, 'isModelHasExtendParams').mockReturnValue(() => true);
       vi.spyOn(aiModelSelectors, 'modelExtendParams').mockReturnValue(() => ['thinkingBudget']);
 
-      // Mock agent chat config with thinking budget set
-      vi.spyOn(chatConfigByIdSelectors, 'getChatConfigById').mockReturnValue(
-        () =>
-          ({
-            thinkingBudget: 5000,
-            searchMode: 'off',
-          }) as any,
-      );
-
       await chatService.createAssistantMessage({
         messages,
         model: 'test-model',
         provider: 'test-provider',
-        plugins: [],
+        resolvedAgentConfig: createMockResolvedConfig({
+          agentConfig: { model: 'test-model', provider: 'test-provider' },
+          chatConfig: { thinkingBudget: 5000 },
+        }),
       });
 
       expect(getChatCompletionSpy).toHaveBeenCalledWith(

package/src/services/chat/index.ts

@@ -27,7 +27,7 @@ import { ModelProvider } from 'model-bank';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { enableAuth } from '@/envs/auth';
 import { getSearchConfig } from '@/helpers/getSearchConfig';
-import { createAgentToolsEngine, createToolsEngine } from '@/helpers/toolEngineering';
+import { createAgentToolsEngine } from '@/helpers/toolEngineering';
 import { getAgentStoreState } from '@/store/agent';
 import {
   agentByIdSelectors,
@@ -58,10 +58,10 @@ import { createHeaderWithAuth } from '../_auth';
 import { API_ENDPOINTS } from '../_url';
 import { findDeploymentName, isEnableFetchOnClient, resolveRuntimeProvider } from './helper';
 import {
+  type ResolvedAgentConfig,
   contextEngineering,
   getTargetAgentId,
   initializeWithClientStore,
-  resolveAgentConfig,
   resolveModelExtendParams,
 } from './mecha';
 import { type FetchOptions } from './types';
@@ -70,6 +70,11 @@ interface GetChatCompletionPayload extends Partial<Omit<ChatStreamPayload, 'mess
   agentId?: string;
   groupId?: string;
   messages: UIChatMessage[];
+  /**
+   * Pre-resolved agent config from AgentRuntime layer.
+   * Required to ensure config consistency and proper isSubTask filtering.
+   */
+  resolvedAgentConfig: ResolvedAgentConfig;
   scope?: MessageMapScope;
   topicId?: string;
 }
@@ -107,12 +112,11 @@ interface CreateAssistantMessageStream extends FetchSSEOptions {
 class ChatService {
   createAssistantMessage = async (
     {
-      plugins: enabledPlugins,
       messages,
       agentId,
       groupId,
-      scope,
       topicId,
+      resolvedAgentConfig,
       ...params
     }: GetChatCompletionPayload,
     options?: FetchOptions,
@@ -126,24 +130,13 @@ class ChatService {
       params,
     );
 
-    // =================== 1. resolve agent config =================== //
+    // =================== 1. use pre-resolved agent config =================== //
+    // Config is resolved in AgentRuntime layer (internal_createAgentState)
+    // which handles isSubTask filtering and other runtime modifications
 
     const targetAgentId = getTargetAgentId(agentId);
 
-    // Resolve agent config with builtin agent runtime config merged
-    // plugins is already merged (runtime plugins > agent config plugins)
-    const {
-      agentConfig,
-      chatConfig,
-      plugins: pluginIds,
-    } = resolveAgentConfig({
-      agentId: targetAgentId,
-      groupId, // Pass groupId for supervisor detection
-      model: payload.model,
-      plugins: enabledPlugins,
-      provider: payload.provider,
-      scope, // Pass scope to preserve page-agent injection
-    });
+    const { agentConfig, chatConfig, plugins: pluginIds } = resolvedAgentConfig;
 
     // Get search config with agentId for agent-specific settings
     const searchConfig = getSearchConfig(payload.model, payload.provider!, targetAgentId);
@@ -495,26 +488,14 @@ class ChatService {
     onLoadingChange?.(true);
 
     try {
-      // Use simple tools engine without complex search logic
-      const toolsEngine = createToolsEngine();
-      const { tools, enabledManifests } = toolsEngine.generateToolsDetailed({
-        model: params.model!,
-        provider: params.provider!,
-        toolIds: params.plugins,
-      });
-
       const llmMessages = await contextEngineering({
-        manifests: enabledManifests,
         messages: params.messages as any,
         model: params.model!,
         provider: params.provider!,
-        tools: params.plugins,
       });
 
-      // remove plugins
-      delete params.plugins;
       await this.getChatCompletion(
-        { ...params, messages: llmMessages, tools },
+        { ...params, messages: llmMessages },
         {
           onErrorHandle: (error) => {
             errorHandle(new Error(error.message), error);

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

@@ -800,4 +800,117 @@ describe('resolveAgentConfig', () => {
       expect(result.agentConfig.systemRole).toBe('Supervisor system role');
     });
   });
+
+  describe('sub-task filtering (isSubTask)', () => {
+    beforeEach(() => {
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(() => undefined);
+    });
+
+    it('should filter out lobe-gtd when isSubTask is true for regular agent', () => {
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentConfigById').mockReturnValue(
+        () =>
+          ({
+            ...mockAgentConfig,
+            plugins: ['lobe-gtd', 'plugin-a', 'plugin-b'],
+          }) as any,
+      );
+
+      const result = resolveAgentConfig({
+        agentId: 'test-agent',
+        isSubTask: true,
+      });
+
+      expect(result.plugins).not.toContain('lobe-gtd');
+      expect(result.plugins).toEqual(['plugin-a', 'plugin-b']);
+    });
+
+    it('should keep lobe-gtd when isSubTask is false', () => {
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentConfigById').mockReturnValue(
+        () =>
+          ({
+            ...mockAgentConfig,
+            plugins: ['lobe-gtd', 'plugin-a', 'plugin-b'],
+          }) as any,
+      );
+
+      const result = resolveAgentConfig({
+        agentId: 'test-agent',
+        isSubTask: false,
+      });
+
+      expect(result.plugins).toContain('lobe-gtd');
+      expect(result.plugins).toEqual(['lobe-gtd', 'plugin-a', 'plugin-b']);
+    });
+
+    it('should keep lobe-gtd when isSubTask is undefined', () => {
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentConfigById').mockReturnValue(
+        () =>
+          ({
+            ...mockAgentConfig,
+            plugins: ['lobe-gtd', 'plugin-a'],
+          }) as any,
+      );
+
+      const result = resolveAgentConfig({ agentId: 'test-agent' });
+
+      expect(result.plugins).toContain('lobe-gtd');
+    });
+
+    it('should filter lobe-gtd in page scope when isSubTask is true', () => {
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentConfigById').mockReturnValue(
+        () =>
+          ({
+            ...mockAgentConfig,
+            plugins: ['lobe-gtd', 'plugin-a'],
+          }) as any,
+      );
+      vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
+        systemRole: 'Page agent system role',
+      });
+
+      const result = resolveAgentConfig({
+        agentId: 'test-agent',
+        scope: 'page',
+        isSubTask: true,
+      });
+
+      expect(result.plugins).not.toContain('lobe-gtd');
+      expect(result.plugins).toContain(PageAgentIdentifier);
+    });
+
+    it('should filter lobe-gtd for builtin agent when isSubTask is true', () => {
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
+        () => 'some-builtin-slug',
+      );
+      vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
+        plugins: ['lobe-gtd', 'runtime-plugin'],
+        systemRole: 'Runtime system role',
+      });
+
+      const result = resolveAgentConfig({
+        agentId: 'builtin-agent',
+        isSubTask: true,
+      });
+
+      expect(result.plugins).not.toContain('lobe-gtd');
+      expect(result.plugins).toContain('runtime-plugin');
+    });
+
+    it('should keep lobe-gtd for builtin agent when isSubTask is false', () => {
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
+        () => 'some-builtin-slug',
+      );
+      vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
+        plugins: ['lobe-gtd', 'runtime-plugin'],
+        systemRole: 'Runtime system role',
+      });
+
+      const result = resolveAgentConfig({
+        agentId: 'builtin-agent',
+        isSubTask: false,
+      });
+
+      expect(result.plugins).toContain('lobe-gtd');
+    });
+  });
 });

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