@lobehub/lobehub 2.0.10 → 2.0.12

package/src/server/modules/AgentRuntime/__tests__/RuntimeExecutors.test.ts

@@ -655,8 +655,10 @@ describe('RuntimeExecutors', () => {
 
       const result = await executors.call_tools_batch!(instruction, state);
 
-      // Should query messages from database
+      // Should query messages from database with agentId, threadId, and topicId
       expect(mockMessageModel.query).toHaveBeenCalledWith({
+        agentId: 'agent-123',
+        threadId: 'thread-123',
         topicId: 'topic-123',
       });
 
@@ -952,6 +954,109 @@ describe('RuntimeExecutors', () => {
         }),
       );
     });
+
+    it('should query messages with correct metadata fields when state.metadata is defined', async () => {
+      const executors = createRuntimeExecutors(ctx);
+      const state = createMockState({
+        metadata: {
+          agentId: 'agent-abc',
+          threadId: 'thread-xyz',
+          topicId: 'topic-abc-123',
+        },
+      });
+
+      const instruction = {
+        payload: {
+          parentMessageId: 'assistant-msg-123',
+          toolsCalling: [
+            {
+              apiName: 'search',
+              arguments: '{}',
+              id: 'tool-call-1',
+              identifier: 'web-search',
+              type: 'default' as const,
+            },
+          ],
+        },
+        type: 'call_tools_batch' as const,
+      };
+
+      await executors.call_tools_batch!(instruction, state);
+
+      // Should query messages with agentId, threadId, and topicId from state.metadata
+      expect(mockMessageModel.query).toHaveBeenCalledWith({
+        agentId: 'agent-abc',
+        threadId: 'thread-xyz',
+        topicId: 'topic-abc-123',
+      });
+    });
+
+    it('should preserve messages in newState even when state.metadata.topicId is undefined', async () => {
+      // Regression test: When state.metadata.topicId is undefined, previously the query
+      // only passed topicId, which caused isNull(topicId) condition and returned 0 messages.
+      // This led to "messages: at least one message is required" error in the next call_llm step.
+      //
+      // Fix: Now we also pass agentId and threadId, so even when topicId is undefined,
+      // the query can still find messages by agentId scope.
+
+      // Mock: query returns messages when agentId is provided (regardless of topicId)
+      mockMessageModel.query = vi
+        .fn()
+        .mockImplementation((params: { agentId?: string; topicId?: string }) => {
+          // With the fix, agentId is always passed, so we can find messages
+          if (params.agentId) {
+            return Promise.resolve([
+              { id: 'msg-1', content: 'Hello', role: 'user' },
+              { id: 'msg-2', content: 'Response', role: 'assistant', tool_calls: [] },
+            ]);
+          }
+          // Without agentId (old buggy behavior), return empty
+          return Promise.resolve([]);
+        });
+
+      const executors = createRuntimeExecutors(ctx);
+      // State with undefined topicId but has agentId
+      const state = createMockState({
+        messages: [
+          { content: 'Hello', role: 'user' },
+          { content: 'Response', role: 'assistant', tool_calls: [] },
+        ],
+        metadata: {
+          agentId: 'agent-123',
+          threadId: 'thread-123',
+          topicId: undefined, // topicId is undefined
+        },
+      });
+
+      const instruction = {
+        payload: {
+          parentMessageId: 'assistant-msg-123',
+          toolsCalling: [
+            {
+              apiName: 'search',
+              arguments: '{}',
+              id: 'tool-call-1',
+              identifier: 'web-search',
+              type: 'default' as const,
+            },
+          ],
+        },
+        type: 'call_tools_batch' as const,
+      };
+
+      const result = await executors.call_tools_batch!(instruction, state);
+
+      // Verify agentId is passed in the query
+      expect(mockMessageModel.query).toHaveBeenCalledWith({
+        agentId: 'agent-123',
+        threadId: 'thread-123',
+        topicId: undefined,
+      });
+
+      // Expected: newState.messages should NOT be empty
+      // The next call_llm step needs messages to work properly
+      expect(result.newState.messages.length).toBeGreaterThan(0);
+    });
   });
 
   describe('resolve_aborted_tools executor', () => {

package/src/server/routers/lambda/agentGroup.ts

@@ -133,9 +133,11 @@ export const agentGroupRouter = router({
           .object({
             avatar: z.string().nullish(),
             backgroundColor: z.string().nullish(),
+            chatConfig: z.any().nullish(),
             description: z.string().nullish(),
             model: z.string().nullish(),
             params: z.any().nullish(),
+            plugins: z.array(z.string()).nullish(),
             provider: z.string().nullish(),
             systemRole: z.string().nullish(),
             tags: z.array(z.string()).nullish(),

package/src/server/routers/lambda/market/agent.ts

@@ -177,8 +177,8 @@ const publishOrCreateSchema = z.object({
   editorData: z.record(z.any()).optional(),
 
   // Agent basic info
-  identifier: z.string().optional(),
-  // Optional - if not provided or not owned, will create new
+  identifier: z.string().nullish(),
+  // Optional - if not provided or not owned, will create new (allow null or undefined)
   name: z.string(),
   tags: z.array(z.string()).optional(),
   tokenUsage: z.number().optional(),
@@ -312,12 +312,11 @@ export const agentRouter = router({
       }
     }),
 
-  
   /**
    * Fork an agent
    * POST /market/agent/:identifier/fork
    */
-forkAgent: agentProcedure
+  forkAgent: agentProcedure
     .input(
       z.object({
         identifier: z.string(),
@@ -385,13 +384,11 @@ forkAgent: agentProcedure
       }
     }),
 
-  
-  
-/**
+  /**
    * Get agent detail by identifier
    * GET /market/agent/:identifier
    */
-getAgentDetail: agentProcedure
+  getAgentDetail: agentProcedure
     .input(z.object({ identifier: z.string() }))
     .query(async ({ input, ctx }) => {
       log('getAgentDetail input: %O', input);
@@ -409,14 +406,11 @@ getAgentDetail: agentProcedure
       }
     }),
 
-  
-  
-
-/**
+  /**
    * Get the fork source of an agent
    * GET /market/agent/:identifier/fork-source
    */
-getAgentForkSource: agentProcedure
+  getAgentForkSource: agentProcedure
     .input(z.object({ identifier: z.string() }))
     .query(async ({ input, ctx }) => {
       log('getAgentForkSource input: %O', input);
@@ -470,16 +464,11 @@ getAgentForkSource: agentProcedure
       }
     }),
 
-  
-  
-
-
-
-/**
+  /**
    * Get all forks of an agent
    * GET /market/agent/:identifier/forks
    */
-getAgentForks: agentProcedure
+  getAgentForks: agentProcedure
     .input(z.object({ identifier: z.string() }))
     .query(async ({ input, ctx }) => {
       log('getAgentForks input: %O', input);
@@ -533,17 +522,11 @@ getAgentForks: agentProcedure
       }
     }),
 
-  
-  
-
-
-
-
-/**
+  /**
    * Get own agents (requires authentication)
    * GET /market/agent/own
    */
-getOwnAgents: agentProcedure.input(paginationSchema.optional()).query(async ({ input, ctx }) => {
+  getOwnAgents: agentProcedure.input(paginationSchema.optional()).query(async ({ input, ctx }) => {
     log('getOwnAgents input: %O', input);
 
     try {
@@ -562,16 +545,11 @@ getOwnAgents: agentProcedure.input(paginationSchema.optional()).query(async ({ i
     }
   }),
 
-  
-  
-
-
-
-/**
+  /**
    * Publish an agent (make it visible in marketplace)
    * POST /market/agent/:identifier/publish
    */
-publishAgent: agentProcedure
+  publishAgent: agentProcedure
     .input(z.object({ identifier: z.string() }))
     .mutation(async ({ input, ctx }) => {
       log('publishAgent input: %O', input);
@@ -589,11 +567,7 @@ publishAgent: agentProcedure
       }
     }),
 
-  
-  
-
-
-/**
+  /**
    * Unified publish or create agent flow
    * This procedure handles the complete publish logic:
    * 1. Check if identifier exists and if current user is owner
@@ -602,7 +576,7 @@ publishAgent: agentProcedure
    *
    * Returns: { identifier, isNewAgent, success }
    */
-publishOrCreate: agentProcedure.input(publishOrCreateSchema).mutation(async ({ input, ctx }) => {
+  publishOrCreate: agentProcedure.input(publishOrCreateSchema).mutation(async ({ input, ctx }) => {
     log('publishOrCreate input: %O', input);
 
     const { identifier: inputIdentifier, name, ...versionData } = input;
@@ -684,13 +658,11 @@ publishOrCreate: agentProcedure.input(publishOrCreateSchema).mutation(async ({ i
     }
   }),
 
-  
-  
-/**
+  /**
    * Unpublish an agent (hide from marketplace, can be republished)
    * POST /market/agent/:identifier/unpublish
    */
-unpublishAgent: agentProcedure
+  unpublishAgent: agentProcedure
     .input(z.object({ identifier: z.string() }))
     .mutation(async ({ input, ctx }) => {
       log('unpublishAgent input: %O', input);

package/src/server/routers/lambda/market/agentGroup.ts

@@ -134,7 +134,7 @@ const publishOrCreateGroupSchema = z.object({
     })
     .optional(),
   description: z.string(),
-  identifier: z.string().optional(),
+  identifier: z.string().nullish(), // Allow null or undefined
   memberAgents: z.array(memberAgentSchema),
   name: z.string(),
   visibility: z.enum(['public', 'private', 'internal']).optional(),
@@ -200,12 +200,11 @@ export const agentGroupRouter = router({
       }
     }),
 
-  
   /**
    * Deprecate agent group
    * POST /market/agent-group/:identifier/deprecate
    */
-deprecateAgentGroup: agentGroupProcedure
+  deprecateAgentGroup: agentGroupProcedure
     .input(z.object({ identifier: z.string() }))
     .mutation(async ({ input, ctx }) => {
       log('deprecateAgentGroup input: %O', input);
@@ -259,13 +258,11 @@ deprecateAgentGroup: agentGroupProcedure
       }
     }),
 
-  
-  
-/**
+  /**
    * Fork an agent group
    * POST /market/agent-group/:identifier/fork
    */
-forkAgentGroup: agentGroupProcedure
+  forkAgentGroup: agentGroupProcedure
     .input(
       z.object({
         identifier: z.string(),
@@ -338,13 +335,11 @@ forkAgentGroup: agentGroupProcedure
       }
     }),
 
-  
-  
-/**
+  /**
    * Get the fork source of an agent group
    * GET /market/agent-group/:identifier/fork-source
    */
-getAgentGroupForkSource: agentGroupProcedure
+  getAgentGroupForkSource: agentGroupProcedure
     .input(z.object({ identifier: z.string() }))
     .query(async ({ input, ctx }) => {
       log('getAgentGroupForkSource input: %O', input);
@@ -398,13 +393,11 @@ getAgentGroupForkSource: agentGroupProcedure
       }
     }),
 
-  
-  
-/**
+  /**
    * Get all forks of an agent group
    * GET /market/agent-group/:identifier/forks
    */
-getAgentGroupForks: agentGroupProcedure
+  getAgentGroupForks: agentGroupProcedure
     .input(z.object({ identifier: z.string() }))
     .query(async ({ input, ctx }) => {
       log('getAgentGroupForks input: %O', input);
@@ -458,13 +451,11 @@ getAgentGroupForks: agentGroupProcedure
       }
     }),
 
-  
-  
-/**
+  /**
    * Publish agent group
    * POST /market/agent-group/:identifier/publish
    */
-publishAgentGroup: agentGroupProcedure
+  publishAgentGroup: agentGroupProcedure
     .input(z.object({ identifier: z.string() }))
     .mutation(async ({ input, ctx }) => {
       log('publishAgentGroup input: %O', input);
@@ -518,15 +509,13 @@ publishAgentGroup: agentGroupProcedure
       }
     }),
 
-  
-  
-/**
+  /**
    * Unified publish or create agent group flow
    * 1. Check if identifier exists and if current user is owner
    * 2. If not owner or no identifier, create new group
    * 3. Create new version for the group if updating
    */
-publishOrCreate: agentGroupProcedure
+  publishOrCreate: agentGroupProcedure
     .input(publishOrCreateGroupSchema)
     .mutation(async ({ input, ctx }) => {
       log('publishOrCreate input: %O', input);
@@ -614,12 +603,11 @@ publishOrCreate: agentGroupProcedure
       }
     }),
 
-  
   /**
    * Unpublish agent group
    * POST /market/agent-group/:identifier/unpublish
    */
-unpublishAgentGroup: agentGroupProcedure
+  unpublishAgentGroup: agentGroupProcedure
     .input(z.object({ identifier: z.string() }))
     .mutation(async ({ input, ctx }) => {
       log('unpublishAgentGroup input: %O', input);

package/src/server/services/aiAgent/__tests__/execAgent.threadId.test.ts

@@ -205,7 +205,7 @@ describe('AiAgentService.execAgent - threadId handling', () => {
 
       expect(assistantMessageCall).toBeDefined();
       expect(assistantMessageCall![0].threadId).toBeUndefined();
-    });
+    }, 10_000);
   });
 
   describe('when appContext is undefined', () => {
@@ -247,6 +247,6 @@ describe('AiAgentService.execAgent - threadId handling', () => {
 
       // Verify groupId is passed to AgentRuntimeService (checked in appContext)
       // This is handled by the createOperation call
-    });
+    }, 10_000);
   });
 });

package/src/server/utils/truncateToolResult.ts

@@ -6,9 +6,8 @@
 /**
  * Default maximum length for tool execution result content (in characters)
  * This prevents context overflow when sending results back to LLM
- * @default 6000 characters (~1,500 tokens for English, ~3,000 tokens for Chinese)
  */
-export const DEFAULT_TOOL_RESULT_MAX_LENGTH = 6000;
+export const DEFAULT_TOOL_RESULT_MAX_LENGTH = 25_000;
 
 /**
  * Truncate tool result content if it exceeds the maximum length
@@ -21,8 +20,6 @@ export const DEFAULT_TOOL_RESULT_MAX_LENGTH = 6000;
 export function truncateToolResult(content: string, maxLength?: number): string {
   const limit = maxLength ?? DEFAULT_TOOL_RESULT_MAX_LENGTH;
 
-  console.log('content-limit', content, limit);
-
   if (!content || content.length <= limit) {
     return content;
   }

package/src/store/chat/agents/GroupOrchestration/__tests__/batch-exec-async-tasks.test.ts

@@ -139,8 +139,8 @@ describe('createGroupOrchestrationExecutors', () => {
         {
           payload: {
             tasks: [
-              { agentId: TEST_IDS.AGENT_1_ID, task: 'Task 1', title: 'Task 1 Title' },
-              { agentId: TEST_IDS.AGENT_2_ID, task: 'Task 2', title: 'Task 2 Title' },
+              { agentId: TEST_IDS.AGENT_1_ID, instruction: 'Task 1', title: 'Task 1 Title' },
+              { agentId: TEST_IDS.AGENT_2_ID, instruction: 'Task 2', title: 'Task 2 Title' },
             ],
             toolMessageId: TEST_IDS.TOOL_MESSAGE_ID,
           },
@@ -187,8 +187,8 @@ describe('createGroupOrchestrationExecutors', () => {
         {
           payload: {
             tasks: [
-              { agentId: TEST_IDS.AGENT_1_ID, task: 'Task 1', title: 'Task 1 Title' },
-              { agentId: TEST_IDS.AGENT_2_ID, task: 'Task 2', title: 'Task 2 Title' },
+              { agentId: TEST_IDS.AGENT_1_ID, instruction: 'Task 1', title: 'Task 1 Title' },
+              { agentId: TEST_IDS.AGENT_2_ID, instruction: 'Task 2', title: 'Task 2 Title' },
             ],
             toolMessageId: TEST_IDS.TOOL_MESSAGE_ID,
           },
@@ -263,8 +263,8 @@ describe('createGroupOrchestrationExecutors', () => {
         {
           payload: {
             tasks: [
-              { agentId: TEST_IDS.AGENT_1_ID, task: 'Task 1', title: 'Task 1 Title' },
-              { agentId: TEST_IDS.AGENT_2_ID, task: 'Task 2', title: 'Task 2 Title' },
+              { agentId: TEST_IDS.AGENT_1_ID, instruction: 'Task 1', title: 'Task 1 Title' },
+              { agentId: TEST_IDS.AGENT_2_ID, instruction: 'Task 2', title: 'Task 2 Title' },
             ],
             toolMessageId: TEST_IDS.TOOL_MESSAGE_ID,
           },
@@ -327,8 +327,8 @@ describe('createGroupOrchestrationExecutors', () => {
         {
           payload: {
             tasks: [
-              { agentId: TEST_IDS.AGENT_1_ID, task: 'Task 1', title: 'Task 1 Title' },
-              { agentId: TEST_IDS.AGENT_2_ID, task: 'Task 2', title: 'Task 2 Title' },
+              { agentId: TEST_IDS.AGENT_1_ID, instruction: 'Task 1', title: 'Task 1 Title' },
+              { agentId: TEST_IDS.AGENT_2_ID, instruction: 'Task 2', title: 'Task 2 Title' },
             ],
             toolMessageId: TEST_IDS.TOOL_MESSAGE_ID,
           },
@@ -386,8 +386,8 @@ describe('createGroupOrchestrationExecutors', () => {
         {
           payload: {
             tasks: [
-              { agentId: TEST_IDS.AGENT_1_ID, task: 'Task 1', title: 'Task 1 Title' },
-              { agentId: TEST_IDS.AGENT_2_ID, task: 'Task 2', title: 'Task 2 Title' },
+              { agentId: TEST_IDS.AGENT_1_ID, instruction: 'Task 1', title: 'Task 1 Title' },
+              { agentId: TEST_IDS.AGENT_2_ID, instruction: 'Task 2', title: 'Task 2 Title' },
             ],
             toolMessageId: TEST_IDS.TOOL_MESSAGE_ID,
           },
@@ -445,8 +445,8 @@ describe('createGroupOrchestrationExecutors', () => {
         {
           payload: {
             tasks: [
-              { agentId: TEST_IDS.AGENT_1_ID, task: 'Task 1', title: 'Task 1 Title' },
-              { agentId: TEST_IDS.AGENT_2_ID, task: 'Task 2', title: 'Task 2 Title' },
+              { agentId: TEST_IDS.AGENT_1_ID, instruction: 'Task 1', title: 'Task 1 Title' },
+              { agentId: TEST_IDS.AGENT_2_ID, instruction: 'Task 2', title: 'Task 2 Title' },
             ],
             toolMessageId: TEST_IDS.TOOL_MESSAGE_ID,
           },
@@ -498,7 +498,7 @@ describe('createGroupOrchestrationExecutors', () => {
       const result = await batchExecTasksExecutor(
         {
           payload: {
-            tasks: [{ agentId: TEST_IDS.AGENT_1_ID, task: 'Task 1', title: 'Task 1 Title' }],
+            tasks: [{ agentId: TEST_IDS.AGENT_1_ID, instruction: 'Task 1', title: 'Task 1 Title' }],
             toolMessageId: TEST_IDS.TOOL_MESSAGE_ID,
           },
           type: 'batch_exec_async_tasks',
@@ -546,7 +546,7 @@ describe('createGroupOrchestrationExecutors', () => {
       const result = await batchExecTasksExecutor(
         {
           payload: {
-            tasks: [{ agentId: TEST_IDS.AGENT_1_ID, task: 'Task 1', title: 'Task 1 Title' }],
+            tasks: [{ agentId: TEST_IDS.AGENT_1_ID, instruction: 'Task 1', title: 'Task 1 Title' }],
             toolMessageId: TEST_IDS.TOOL_MESSAGE_ID,
           },
           type: 'batch_exec_async_tasks',
@@ -604,7 +604,7 @@ describe('createGroupOrchestrationExecutors', () => {
       await batchExecTasksExecutor(
         {
           payload: {
-            tasks: [{ agentId: TEST_IDS.AGENT_1_ID, task: 'Task 1', title: 'Task 1 Title' }],
+            tasks: [{ agentId: TEST_IDS.AGENT_1_ID, instruction: 'Task 1', title: 'Task 1 Title' }],
             toolMessageId: TEST_IDS.TOOL_MESSAGE_ID,
           },
           type: 'batch_exec_async_tasks',

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

@@ -369,14 +369,17 @@ export const createGroupOrchestrationExecutors = (
      *
      * Returns: task_completed result
      */
-    exec_async_task: async (instruction, state): Promise<GroupOrchestrationExecutorOutput> => {
-      const { agentId, task, timeout, title, toolMessageId } = (
-        instruction as SupervisorInstructionExecAsyncTask
+    exec_async_task: async (
+      supervisorInstruction,
+      state,
+    ): Promise<GroupOrchestrationExecutorOutput> => {
+      const { agentId, instruction, timeout, title, toolMessageId } = (
+        supervisorInstruction as SupervisorInstructionExecAsyncTask
       ).payload;
 
       const sessionLogId = `${state.operationId}:exec_async_task`;
       log(
-        `[${sessionLogId}] Executing async task for agent: ${agentId}, task: ${task}, timeout: ${timeout}`,
+        `[${sessionLogId}] Executing async task for agent: ${agentId}, instruction: ${instruction}, timeout: ${timeout}`,
       );
 
       const { groupId, topicId } = messageContext;
@@ -400,7 +403,7 @@ export const createGroupOrchestrationExecutors = (
             agentId,
             content: '',
             groupId,
-            metadata: { instruction: task, taskTitle: title },
+            metadata: { instruction, taskTitle: title },
             parentId: toolMessageId,
             role: 'task',
             topicId,
@@ -427,7 +430,7 @@ export const createGroupOrchestrationExecutors = (
         const createResult = await aiAgentService.execSubAgentTask({
           agentId,
           groupId,
-          instruction: task,
+          instruction,
           parentMessageId: taskMessageId,
           title,
           topicId,
@@ -600,9 +603,12 @@ export const createGroupOrchestrationExecutors = (
      *
      * Returns: task_completed result
      */
-    exec_client_async_task: async (instruction, state): Promise<GroupOrchestrationExecutorOutput> => {
-      const { agentId, task, title, toolMessageId } = (
-        instruction as SupervisorInstructionExecClientAsyncTask
+    exec_client_async_task: async (
+      supervisorInstruction,
+      state,
+    ): Promise<GroupOrchestrationExecutorOutput> => {
+      const { agentId, instruction, title, toolMessageId } = (
+        supervisorInstruction as SupervisorInstructionExecClientAsyncTask
       ).payload;
 
       const sessionLogId = `${state.operationId}:exec_client_async_task`;
@@ -629,7 +635,7 @@ export const createGroupOrchestrationExecutors = (
             agentId,
             content: '',
             groupId,
-            metadata: { instruction: task, taskTitle: title },
+            metadata: { instruction, taskTitle: title },
             parentId: toolMessageId,
             role: 'task',
             topicId,
@@ -656,7 +662,7 @@ export const createGroupOrchestrationExecutors = (
         // Use Group-specific API that handles different agentIds in thread context
         const threadResult = await aiAgentService.createClientGroupAgentTaskThread({
           groupId: groupId!,
-          instruction: task,
+          instruction,
           parentMessageId: taskMessageId,
           subAgentId: agentId,
           title,
@@ -861,9 +867,9 @@ export const createGroupOrchestrationExecutors = (
       interface TaskTracker {
         agentId: string;
         error?: string;
+        instruction: string;
         result?: string;
         status: 'pending' | 'running' | 'completed' | 'failed';
-        task: string;
         taskMessageId?: string;
         threadId?: string;
         timeout: number;
@@ -873,7 +879,7 @@ export const createGroupOrchestrationExecutors = (
       const taskTrackers: TaskTracker[] = tasks.map((t) => ({
         agentId: t.agentId,
         status: 'pending',
-        task: t.task,
+        instruction: t.instruction,
         timeout: t.timeout || 1_800_000, // Default 30 minutes
         title: t.title,
       }));
@@ -887,8 +893,9 @@ export const createGroupOrchestrationExecutors = (
               {
                 agentId: tracker.agentId,
                 content: '',
+                createdAt: Date.now() + index,
                 groupId,
-                metadata: { instruction: tracker.task, taskTitle: tracker.title },
+                metadata: { instruction: tracker.instruction, taskTitle: tracker.title },
                 parentId: toolMessageId,
                 role: 'task',
                 topicId,
@@ -922,7 +929,7 @@ export const createGroupOrchestrationExecutors = (
             const createResult = await aiAgentService.execSubAgentTask({
               agentId: tracker.agentId,
               groupId,
-              instruction: tracker.task,
+              instruction: tracker.instruction,
               parentMessageId: tracker.taskMessageId,
               title: tracker.title,
               topicId,