@lobehub/lobehub 2.0.0-next.353 → 2.0.0-next.355

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

@@ -155,7 +155,7 @@ describe('ChatService', () => {
           ]),
           messages: expect.anything(),
         }),
-        undefined,
+        expect.anything(),
       );
     });
 
@@ -185,7 +185,7 @@ describe('ChatService', () => {
               type: 'enabled',
             },
           }),
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -214,7 +214,7 @@ describe('ChatService', () => {
               type: 'disabled',
             },
           }),
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -244,7 +244,7 @@ describe('ChatService', () => {
               type: 'enabled',
             },
           }),
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -270,7 +270,7 @@ describe('ChatService', () => {
           expect.objectContaining({
             reasoning_effort: 'high',
           }),
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -296,7 +296,7 @@ describe('ChatService', () => {
           expect.objectContaining({
             thinkingBudget: 5000,
           }),
-          undefined,
+          expect.anything(),
         );
       });
     });
@@ -370,7 +370,7 @@ describe('ChatService', () => {
             enabledSearch: undefined,
             tools: undefined,
           },
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -396,7 +396,7 @@ describe('ChatService', () => {
             stream: true,
             tools: undefined,
           },
-          undefined,
+          expect.anything(),
         );
       });
     });
@@ -494,7 +494,7 @@ describe('ChatService', () => {
             enabledSearch: undefined,
             tools: undefined,
           },
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -583,7 +583,7 @@ describe('ChatService', () => {
             enabledSearch: undefined,
             tools: undefined,
           },
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -781,7 +781,7 @@ describe('ChatService', () => {
               { content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n', role: 'user' },
             ],
           },
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -888,7 +888,7 @@ describe('ChatService', () => {
               { content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n', role: 'user' },
             ],
           },
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -926,7 +926,7 @@ describe('ChatService', () => {
               { content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n', role: 'user' },
             ],
           },
-          undefined,
+          expect.anything(),
         );
       });
     });
@@ -985,7 +985,7 @@ describe('ChatService', () => {
               }),
             ]),
           }),
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -1036,7 +1036,7 @@ describe('ChatService', () => {
           expect.objectContaining({
             enabledSearch: true,
           }),
-          undefined,
+          expect.anything(),
         );
       });
 
@@ -1087,7 +1087,7 @@ describe('ChatService', () => {
           expect.objectContaining({
             enabledSearch: undefined,
           }),
-          undefined,
+          expect.anything(),
         );
       });
     });
@@ -1385,7 +1385,7 @@ describe('ChatService private methods', () => {
         expect.objectContaining({
           enabledContextCaching: false,
         }),
-        undefined,
+        expect.anything(),
       );
     });
 
@@ -1438,7 +1438,7 @@ describe('ChatService private methods', () => {
         expect.objectContaining({
           reasoning_effort: 'high',
         }),
-        undefined,
+        expect.anything(),
       );
     });
 
@@ -1464,7 +1464,7 @@ describe('ChatService private methods', () => {
         expect.objectContaining({
           thinkingBudget: 5000,
         }),
-        undefined,
+        expect.anything(),
       );
     });
   });

package/src/services/chat/index.ts

@@ -284,7 +284,7 @@ class ChatService {
         stream: chatConfig.enableStreaming !== false,
         tools,
       },
-      options,
+      { ...options, agentId: targetAgentId, topicId },
     );
   };
 
@@ -314,7 +314,7 @@ class ChatService {
   };
 
   getChatCompletion = async (params: Partial<ChatStreamPayload>, options?: FetchOptions) => {
-    const { signal, responseAnimation } = options ?? {};
+    const { agentId, signal, responseAnimation, topicId } = options ?? {};
 
     const { provider = ModelProvider.OpenAI, ...res } = params;
 
@@ -401,7 +401,12 @@ class ChatService {
     const traceHeader = createTraceHeader({ ...options?.trace });
 
     const headers = await createHeaderWithAuth({
-      headers: { 'Content-Type': 'application/json', ...traceHeader },
+      headers: {
+        'Content-Type': 'application/json',
+        ...traceHeader,
+        ...(agentId && { 'x-agent-id': agentId }),
+        ...(topicId && { 'x-topic-id': topicId }),
+      },
       provider,
     });
 

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

@@ -48,6 +48,31 @@ describe('resolveAgentConfig', () => {
       expect(result.isBuiltinAgent).toBe(false);
     });
 
+    it('should treat agent with non-builtin slug as regular agent', () => {
+      // Agent has a random slug that is NOT a valid builtin agent slug
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
+        () => 'sister-religious-mostly-effort',
+      );
+
+      const result = resolveAgentConfig({ agentId: 'test-agent' });
+
+      expect(result.isBuiltinAgent).toBe(false);
+      expect(result.slug).toBeUndefined();
+      expect(result.plugins).toEqual(['plugin-a', 'plugin-b']);
+    });
+
+    it('should treat agent with random slug as regular agent', () => {
+      // Another example of random/custom slug
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
+        () => 'my-custom-agent-slug',
+      );
+
+      const result = resolveAgentConfig({ agentId: 'test-agent' });
+
+      expect(result.isBuiltinAgent).toBe(false);
+      expect(result.slug).toBeUndefined();
+    });
+
     it('should return empty array when agent config has no plugins', () => {
       vi.spyOn(agentSelectors.agentSelectors, 'getAgentConfigById').mockReturnValue(
         () =>
@@ -668,6 +693,29 @@ describe('resolveAgentConfig', () => {
       expect(result.agentConfig.systemRole.trim()).toBe('You are a helpful assistant');
       expect(result.chatConfig.enableHistoryCount).toBe(false);
     });
+
+    it('should not duplicate injection when page-agent itself is used in page scope', () => {
+      // page-agent is a builtin agent with slug 'page-agent'
+      vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
+        () => 'page-agent',
+      );
+
+      vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
+        plugins: [PageAgentIdentifier],
+        systemRole: 'Page agent system prompt',
+      });
+
+      const result = resolveAgentConfig({
+        agentId: 'page-agent-id',
+        scope: 'page',
+      });
+
+      // page-agent should NOT have its tools/systemRole injected again
+      expect(result.plugins.filter((p) => p === PageAgentIdentifier)).toHaveLength(1);
+      expect(result.agentConfig.systemRole).toBe('Page agent system prompt');
+      expect(result.isBuiltinAgent).toBe(true);
+      expect(result.slug).toBe('page-agent');
+    });
   });
 
   describe('supervisor agent (detected via groupId)', () => {
@@ -695,13 +743,11 @@ describe('resolveAgentConfig', () => {
     });
 
     describe('supervisor with own slug (priority check)', () => {
-      // This tests the fix for LOBE-4127: When supervisor agent has its own slug,
-      // it should still use 'group-supervisor' slug when in group scope
-
+      // When supervisor agent has its own slug, it should still use 'group-supervisor' slug when in group scope
       it('should use group-supervisor slug even when agent has its own slug in group scope', () => {
         // Supervisor agent has its own slug (e.g., from being a builtin agent)
         vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
-          () => 'some-agent-slug',
+          () => 'agent-builder',
         );
 
         // Mock: groupById returns the group
@@ -734,54 +780,6 @@ describe('resolveAgentConfig', () => {
         expect(result.slug).toBe('group-supervisor');
         expect(result.plugins).toContain(GroupManagementIdentifier);
       });
-
-      it('should use agent own slug when scope is not group', () => {
-        // Supervisor agent has its own slug
-        vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
-          () => 'some-agent-slug',
-        );
-
-        // Mock: groupById returns the group
-        vi.spyOn(agentGroupSelectors.agentGroupByIdSelectors, 'groupById').mockReturnValue(
-          () => mockGroupWithSupervisor as any,
-        );
-
-        vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
-          plugins: ['agent-specific-plugin'],
-          systemRole: 'Agent specific system role',
-        });
-
-        const result = resolveAgentConfig({
-          agentId: 'supervisor-agent-id',
-          groupId: 'group-123',
-          scope: 'main', // Not 'group' scope
-        });
-
-        // Should use agent's own slug since scope is not 'group'
-        expect(result.isBuiltinAgent).toBe(true);
-        expect(result.slug).toBe('some-agent-slug');
-      });
-
-      it('should use agent own slug when groupId is not provided', () => {
-        // Supervisor agent has its own slug
-        vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
-          () => 'some-agent-slug',
-        );
-
-        vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
-          plugins: ['agent-specific-plugin'],
-          systemRole: 'Agent specific system role',
-        });
-
-        const result = resolveAgentConfig({
-          agentId: 'supervisor-agent-id',
-          scope: 'group', // Even with group scope, no groupId
-        });
-
-        // Should use agent's own slug since no groupId
-        expect(result.isBuiltinAgent).toBe(true);
-        expect(result.slug).toBe('some-agent-slug');
-      });
     });
 
     it('should detect supervisor agent using groupId for direct lookup', () => {
@@ -872,6 +870,25 @@ describe('resolveAgentConfig', () => {
       expect(result.plugins).toEqual(['plugin-a', 'plugin-b']); // Falls back to agent config plugins
     });
 
+    it('should treat as regular agent when scope is not group even with groupId', () => {
+      // Mock: groupById returns the group (supervisor agent exists)
+      vi.spyOn(agentGroupSelectors.agentGroupByIdSelectors, 'groupById').mockReturnValue(
+        () => mockGroupWithSupervisor as any,
+      );
+
+      // groupId is provided but scope is 'main', not 'group'
+      const result = resolveAgentConfig({
+        agentId: 'supervisor-agent-id',
+        groupId: 'group-123',
+        scope: 'main', // Not 'group' scope
+      });
+
+      // Should NOT be identified as group-supervisor because scope !== 'group'
+      expect(result.isBuiltinAgent).toBe(false);
+      expect(result.slug).toBeUndefined();
+      expect(result.plugins).toEqual(['plugin-a', 'plugin-b']);
+    });
+
     it('should treat as regular agent when agentId does not match group supervisorAgentId', () => {
       // Mock: groupById returns the group
       vi.spyOn(agentGroupSelectors.agentGroupByIdSelectors, 'groupById').mockReturnValue(
@@ -1016,7 +1033,7 @@ describe('resolveAgentConfig', () => {
 
     it('should filter lobe-gtd for builtin agent when isSubTask is true', () => {
       vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
-        () => 'some-builtin-slug',
+        () => 'agent-builder',
       );
       vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
         plugins: ['lobe-gtd', 'runtime-plugin'],
@@ -1034,7 +1051,7 @@ describe('resolveAgentConfig', () => {
 
     it('should keep lobe-gtd for builtin agent when isSubTask is false', () => {
       vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
-        () => 'some-builtin-slug',
+        () => 'agent-builder',
       );
       vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
         plugins: ['lobe-gtd', 'runtime-plugin'],
@@ -1089,7 +1106,7 @@ describe('resolveAgentConfig', () => {
 
     it('should return empty plugins for builtin agent when disableTools is true', () => {
       vi.spyOn(agentSelectors.agentSelectors, 'getAgentSlugById').mockReturnValue(
-        () => 'some-builtin-slug',
+        () => 'agent-builder',
       );
       vi.spyOn(builtinAgents, 'getAgentRuntimeConfig').mockReturnValue({
         plugins: ['runtime-plugin-1', 'runtime-plugin-2'],

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

@@ -1,4 +1,8 @@
-import { BUILTIN_AGENT_SLUGS, getAgentRuntimeConfig } from '@lobechat/builtin-agents';
+import {
+  BUILTIN_AGENT_SLUGS,
+  type BuiltinAgentSlug,
+  getAgentRuntimeConfig,
+} from '@lobechat/builtin-agents';
 import { PageAgentIdentifier } from '@lobechat/builtin-tool-page-agent';
 import {
   type LobeAgentChatConfig,
@@ -15,6 +19,18 @@ import { agentGroupByIdSelectors, agentGroupSelectors } from '@/store/agentGroup
 
 const log = debug('mecha:agentConfigResolver');
 
+/**
+ * Set of valid builtin agent slugs for O(1) lookup
+ */
+const VALID_BUILTIN_SLUGS = new Set<string>(Object.values(BUILTIN_AGENT_SLUGS));
+
+/**
+ * Check if a slug is a valid builtin agent slug
+ */
+const isBuiltinAgentSlug = (slug: string): slug is BuiltinAgentSlug => {
+  return VALID_BUILTIN_SLUGS.has(slug);
+};
+
 /**
  * Applies params adjustments based on chatConfig settings.
  *
@@ -187,12 +203,20 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
 
   // If not identified as supervisor, check agent store for slug
   if (!slug) {
-    slug = agentSelectors.getAgentSlugById(agentId)(agentStoreState) ?? undefined;
-    log('slug from agentStore: %s (agentId: %s)', slug, agentId);
+    const storeSlug = agentSelectors.getAgentSlugById(agentId)(agentStoreState) ?? undefined;
+    log('slug from agentStore: %s (agentId: %s)', storeSlug, agentId);
+
+    // Only use the slug if it's a valid builtin agent slug
+    // Regular agents may have random slugs that should be ignored
+    if (storeSlug && isBuiltinAgentSlug(storeSlug)) {
+      slug = storeSlug;
+    } else if (storeSlug) {
+      log('slug %s is not a valid builtin agent slug, treating as regular agent', storeSlug);
+    }
   }
 
   if (!slug) {
-    log('agentId %s is not a builtin agent (no slug found)', agentId);
+    log('agentId %s is not a builtin agent (no valid builtin slug found)', agentId);
     // Regular agent - use provided plugins if available, fallback to agent's plugins
     const finalPlugins = plugins && plugins.length > 0 ? plugins : basePlugins;
 

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

@@ -583,7 +583,7 @@ describe('contextEngineering', () => {
   });
 
   describe('Message preprocessing processors', () => {
-    it('should truncate message history when enabled', async () => {
+    it('should keep all messages (no history truncation)', async () => {
       const messages: UIChatMessage[] = [
         {
           role: 'user',
@@ -626,13 +626,12 @@ describe('contextEngineering', () => {
         messages,
         model: 'gpt-4',
         provider: 'openai',
-        enableHistoryCount: true,
-        historyCount: 4, // Should keep last 2 messages
       });
 
-      // Should only keep the last 2 messages
-      expect(result).toHaveLength(4);
+      // Should keep all messages
+      expect(result).toHaveLength(5);
       expect(result).toEqual([
+        { content: 'Message 1', role: 'user' },
         { content: 'Response 1', role: 'assistant' },
         { content: 'Message 2', role: 'user' },
         { content: 'Response 2', role: 'assistant' },
@@ -704,7 +703,7 @@ describe('contextEngineering', () => {
       ]);
     });
 
-    it('should combine all preprocessing steps correctly', async () => {
+    it('should combine system role and input template correctly', async () => {
       const messages: UIChatMessage[] = [
         {
           role: 'user',
@@ -735,16 +734,18 @@ describe('contextEngineering', () => {
         provider: 'openai',
         systemRole: 'System instructions.',
         inputTemplate: 'Processed: {{text}}',
-        enableHistoryCount: true,
-        historyCount: 2, // Should keep last 1 message
       });
 
-      // System role should be first
+      // System role should be first, followed by all messages with input template applied to user messages
       expect(result).toEqual([
         {
           content: 'System instructions.',
           role: 'system',
         },
+        {
+          content: 'Processed: Old message 1',
+          role: 'user',
+        },
         {
           role: 'assistant',
           content: 'Old response',
@@ -782,7 +783,7 @@ describe('contextEngineering', () => {
       ]);
     });
 
-    it('should handle history truncation with system role injection correctly', async () => {
+    it('should handle system role injection with all messages (no history truncation)', async () => {
       const messages: UIChatMessage[] = [
         {
           role: 'user',
@@ -812,18 +813,24 @@ describe('contextEngineering', () => {
         model: 'gpt-4',
         provider: 'openai',
         systemRole: 'System role here.',
-        enableHistoryCount: true,
-        historyCount: 1, // Should keep only 1 message
       });
 
-      // Should have system role + 1 truncated message
+      // Should have system role + all messages
       expect(result).toEqual([
         {
           content: 'System role here.',
           role: 'system',
         },
         {
-          content: 'Message 3', // Only the last message should remain
+          content: 'Message 1',
+          role: 'user',
+        },
+        {
+          content: 'Message 2',
+          role: 'user',
+        },
+        {
+          content: 'Message 3',
           role: 'user',
         },
       ]);

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

@@ -394,6 +394,18 @@ export const contextEngineering = async ({
     ...(gtdConfig && { gtd: gtdConfig }),
   });
 
+  log('Input messages count: %d', messages.length);
+
   const result = await engine.process();
+
+  log('Output messages count: %d', result.messages.length);
+
+  if (messages.length > 0 && result.messages.length === 0) {
+    log(
+      'WARNING: Messages were reduced to 0! Input messages: %o',
+      messages.map((m) => ({ id: m.id, role: m.role })),
+    );
+  }
+
   return result.messages;
 };

package/src/services/chat/types.ts

@@ -1,12 +1,18 @@
 import { type FetchSSEOptions } from '@lobechat/fetch-sse';
-import { type RuntimeInitialContext, type RuntimeStepContext, type TracePayload } from '@lobechat/types';
+import {
+  type RuntimeInitialContext,
+  type RuntimeStepContext,
+  type TracePayload,
+} from '@lobechat/types';
 
 export interface FetchOptions extends FetchSSEOptions {
+  agentId?: string;
   historySummary?: string;
   /** Initial context for page editor (captured at operation start) */
   initialContext?: RuntimeInitialContext;
   signal?: AbortSignal | undefined;
   /** Step context for page editor (updated each step) */
   stepContext?: RuntimeStepContext;
+  topicId?: string;
   trace?: TracePayload;
 }

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

@@ -22,10 +22,9 @@ 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 type { ResolvedAgentConfig } from '@/services/chat/mecha';
 import { agentByIdSelectors } from '@/store/agent/selectors';
 import { getAgentStoreState } from '@/store/agent/store';
 import type { ChatStore } from '@/store/chat/store';
@@ -96,7 +95,12 @@ export const createAgentExecutors = (context: {
       const llmPayload = (instruction as AgentInstructionCallLlm)
         .payload as GeneralAgentCallLLMInstructionPayload;
 
-      log(`${stagePrefix} Starting session`);
+      log(
+        `${stagePrefix} Starting session. Input: state.messages=%d, llmPayload.messages=%d, messageKey=%s`,
+        state.messages.length,
+        llmPayload.messages.length,
+        context.messageKey,
+      );
 
       let assistantMessageId: string;
 
@@ -184,6 +188,12 @@ export const createAgentExecutors = (context: {
       // Get latest messages from store (already updated by internal_fetchAIChatMessage)
       const latestMessages = context.get().dbMessagesMap[context.messageKey] || [];
 
+      log(
+        `${stagePrefix} After fetch: dbMessagesMap[${context.messageKey}]=%d messages, available keys=%o`,
+        latestMessages.length,
+        Object.keys(context.get().dbMessagesMap),
+      );
+
       // Get updated assistant message to extract usage/cost information
       const assistantMessage = latestMessages.find((m) => m.id === assistantMessageId);
 
@@ -206,10 +216,11 @@ export const createAgentExecutors = (context: {
       }
 
       log(
-        '[%s:%d] call_llm completed, finishType: %s',
+        '[%s:%d] call_llm completed, finishType: %s, outputMessages: %d',
         state.operationId,
         state.stepCount,
         finishType,
+        latestMessages.length,
       );
 
       // Accumulate usage and cost to state

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

@@ -259,6 +259,7 @@ export const conversationLifecycle: StateCreator<
       if (data?.topics) {
         const pageSize = systemStatusSelectors.topicPageSize(useGlobalStore.getState());
         get().internal_updateTopics(operationContext.agentId, {
+          groupId: operationContext.groupId,
           items: data.topics.items,
           pageSize,
           total: data.topics.total,

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

@@ -757,20 +757,24 @@ export const streamingExecutor: StateCreator<
       nextContext = { ...nextContext, stepContext };
 
       log(
-        '[internal_execAgentRuntime][step-%d]: phase=%s, status=%s, stepContext=%O',
+        '[internal_execAgentRuntime][step-%d]: phase=%s, status=%s, state.messages=%d, dbMessagesMap[%s]=%d, stepContext=%O',
         stepCount,
         nextContext.phase,
         state.status,
+        state.messages.length,
+        messageKey,
+        currentDBMessages.length,
         stepContext,
       );
 
       const result = await runtime.step(state, nextContext);
 
       log(
-        '[internal_execAgentRuntime] Step %d completed, events: %d, newStatus=%s',
+        '[internal_execAgentRuntime] Step %d completed, events: %d, newStatus=%s, newState.messages=%d',
         stepCount,
         result.events.length,
         result.newState.status,
+        result.newState.messages.length,
       );
 
       // After parallel tool batch completes, refresh messages to ensure all tool results are synced