@lobehub/lobehub 2.0.0-next.343 → 2.0.0-next.345

package/packages/builtin-tool-cloud-sandbox/src/ExecutionRuntime/index.ts

@@ -65,6 +65,14 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('listLocalFiles', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: { files: [] },
+          success: true,
+        };
+      }
+
       const files = result.result?.files || [];
       const state: ListLocalFilesState = { files };
 
@@ -90,6 +98,19 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('readLocalFile', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            content: '',
+            endLine: args.endLine,
+            path: args.path,
+            startLine: args.startLine,
+          },
+          success: true,
+        };
+      }
+
       const state: ReadLocalFileState = {
         content: result.result?.content || '',
         endLine: args.endLine,
@@ -123,6 +144,17 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('writeLocalFile', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            path: args.path,
+            success: false,
+          },
+          success: true,
+        };
+      }
+
       const state: WriteLocalFileState = {
         bytesWritten: result.result?.bytesWritten,
         path: args.path,
@@ -148,6 +180,17 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('editLocalFile', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            path: args.path,
+            replacements: 0,
+          },
+          success: true,
+        };
+      }
+
       const state: EditLocalFileState = {
         diffText: result.result?.diffText,
         linesAdded: result.result?.linesAdded,
@@ -177,6 +220,17 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('searchLocalFiles', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            results: [],
+            totalCount: 0,
+          },
+          success: true,
+        };
+      }
+
       const results = result.result?.results || [];
       const state: SearchLocalFilesState = {
         results,
@@ -201,6 +255,18 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('moveLocalFiles', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            results: [],
+            successCount: 0,
+            totalCount: args.operations.length,
+          },
+          success: true,
+        };
+      }
+
       const results = result.result?.results || [];
       const state: MoveLocalFilesState = {
         results,
@@ -224,6 +290,19 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('renameLocalFile', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            error: result.error?.message,
+            newPath: '',
+            oldPath: args.oldPath,
+            success: false,
+          },
+          success: true,
+        };
+      }
+
       const state: RenameLocalFileState = {
         error: result.result?.error,
         newPath: result.result?.newPath || '',
@@ -241,7 +320,7 @@ export class CloudSandboxExecutionRuntime {
       return {
         content,
         state,
-        success: result.success,
+        success: true,
       };
     } catch (error) {
       return this.handleError(error);
@@ -264,15 +343,24 @@ export class CloudSandboxExecutionRuntime {
         language,
         output: result.result?.output,
         stderr: result.result?.stderr,
-        success: result.success,
+        success: result.success || false,
       };
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state,
+          success: true,
+        };
+      }
+
       return {
         content: JSON.stringify(result.result),
         state,
-        success: result.success,
+        success: true,
       };
     } catch (error) {
+      console.log('executeCode error', error);
       return this.handleError(error);
     }
   }
@@ -283,6 +371,18 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('runCommand', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            error: result.error?.message,
+            isBackground: args.background || false,
+            success: false,
+          },
+          success: true,
+        };
+      }
+
       const state: RunCommandState = {
         commandId: result.result?.commandId,
         error: result.result?.error,
@@ -296,7 +396,7 @@ export class CloudSandboxExecutionRuntime {
       return {
         content: JSON.stringify(result.result),
         state,
-        success: result.success,
+        success: true,
       };
     } catch (error) {
       return this.handleError(error);
@@ -307,6 +407,18 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('getCommandOutput', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            error: result.error?.message,
+            running: false,
+            success: false,
+          },
+          success: true,
+        };
+      }
+
       const state: GetCommandOutputState = {
         error: result.result?.error,
         newOutput: result.result?.newOutput,
@@ -317,7 +429,7 @@ export class CloudSandboxExecutionRuntime {
       return {
         content: JSON.stringify(result.result),
         state,
-        success: result.success,
+        success: true,
       };
     } catch (error) {
       return this.handleError(error);
@@ -328,6 +440,18 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('killCommand', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            commandId: args.commandId,
+            error: result.error?.message,
+            success: false,
+          },
+          success: true,
+        };
+      }
+
       const state: KillCommandState = {
         commandId: args.commandId,
         error: result.result?.error,
@@ -340,7 +464,7 @@ export class CloudSandboxExecutionRuntime {
           success: true,
         }),
         state,
-        success: result.success,
+        success: true,
       };
     } catch (error) {
       return this.handleError(error);
@@ -353,6 +477,18 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('grepContent', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            matches: [],
+            pattern: args.pattern,
+            totalMatches: 0,
+          },
+          success: true,
+        };
+      }
+
       const state: GrepContentState = {
         matches: result.result?.matches || [],
         pattern: args.pattern,
@@ -373,6 +509,18 @@ export class CloudSandboxExecutionRuntime {
     try {
       const result = await this.callTool('globLocalFiles', args);
 
+      if (!result.success) {
+        return {
+          content: result.error?.message || JSON.stringify(result.error),
+          state: {
+            files: [],
+            pattern: args.pattern,
+            totalCount: 0,
+          },
+          success: true,
+        };
+      }
+
       const files = result.result?.files || [];
       const totalCount = result.result?.totalCount || 0;
 
@@ -433,7 +581,7 @@ export class CloudSandboxExecutionRuntime {
             success: false,
           }),
           state,
-          success: false,
+          success: true,
         };
       }
 
@@ -455,13 +603,14 @@ export class CloudSandboxExecutionRuntime {
   private async callTool(
     toolName: string,
     params: Record<string, any>,
-  ): Promise<{ result: any; sessionExpiredAndRecreated?: boolean; success: boolean }> {
+  ): Promise<{
+    error?: { message: string; name?: string };
+    result: any;
+    sessionExpiredAndRecreated?: boolean;
+    success: boolean;
+  }> {
     const result = await this.sandboxService.callTool(toolName, params);
 
-    if (!result.success) {
-      throw new Error(result.error?.message || `Cloud Sandbox tool ${toolName} failed`);
-    }
-
     return result;
   }
 

package/packages/context-engine/src/engine/messages/MessagesEngine.ts

@@ -162,6 +162,15 @@ export class MessagesEngine {
       // 2. System role injection (agent's system role)
       new SystemRoleInjector({ systemRole }),
 
+      // =============================================
+      // Phase 2.5: First User Message Context Injection
+      // These providers inject content before the first user message
+      // Order matters: first executed = first in content
+      // =============================================
+
+      // 4. User memory injection (conditionally added, injected first)
+      ...(isUserMemoryEnabled ? [new UserMemoryInjector(userMemory)] : []),
+
       // 3. Group context injection (agent identity and group info for multi-agent chat)
       new GroupContextInjector({
         currentAgentId: agentGroup?.currentAgentId,
@@ -173,15 +182,6 @@ export class MessagesEngine {
         systemPrompt: agentGroup?.systemPrompt,
       }),
 
-      // =============================================
-      // Phase 2.5: First User Message Context Injection
-      // These providers inject content before the first user message
-      // Order matters: first executed = first in content
-      // =============================================
-
-      // 4. User memory injection (conditionally added, injected first)
-      ...(isUserMemoryEnabled ? [new UserMemoryInjector(userMemory)] : []),
-
       // 4.5. GTD Plan injection (conditionally added, after user memory, before knowledge)
       ...(isGTDPlanEnabled ? [new GTDPlanInjector({ enabled: true, plan: gtd.plan })] : []),
 

package/packages/context-engine/src/providers/GroupContextInjector.ts

@@ -5,7 +5,7 @@ import {
 } from '@lobechat/prompts';
 import debug from 'debug';
 
-import { BaseProvider } from '../base/BaseProvider';
+import { BaseFirstUserContentProvider } from '../base/BaseFirstUserContentProvider';
 import type { PipelineContext, ProcessorOptions } from '../types';
 
 const log = debug('context-engine:provider:GroupContextInjector');
@@ -59,13 +59,13 @@ export interface GroupContextInjectorConfig {
 /**
  * Group Context Injector
  *
- * Responsible for injecting group context information into the system role
+ * Responsible for injecting group context information before the first user message
  * for multi-agent group chat scenarios. This helps the model understand:
  * - Its own identity within the group
  * - The group composition and other members
  * - Rules for handling system metadata
  *
- * The injector appends a GROUP CONTEXT block at the end of the system message,
+ * The injector creates a system injection message before the first user message,
  * containing:
  * - Agent's identity (name, role, ID)
  * - Group info (name, member list)
@@ -87,7 +87,7 @@ export interface GroupContextInjectorConfig {
  * });
  * ```
  */
-export class GroupContextInjector extends BaseProvider {
+export class GroupContextInjector extends BaseFirstUserContentProvider {
   readonly name = 'GroupContextInjector';
 
   constructor(
@@ -97,44 +97,32 @@ export class GroupContextInjector extends BaseProvider {
     super(options);
   }
 
-  protected async doProcess(context: PipelineContext): Promise<PipelineContext> {
-    const clonedContext = this.cloneContext(context);
-
-    // Skip if not enabled or missing required config
+  protected buildContent(): string | null {
+    // Skip if not enabled
     if (!this.config.enabled) {
       log('Group context injection disabled, skipping');
-      return this.markAsExecuted(clonedContext);
-    }
-
-    // Find the system message to append to
-    const systemMessageIndex = clonedContext.messages.findIndex((msg) => msg.role === 'system');
-
-    if (systemMessageIndex === -1) {
-      log('No system message found, skipping group context injection');
-      return this.markAsExecuted(clonedContext);
+      return null;
     }
 
-    const systemMessage = clonedContext.messages[systemMessageIndex];
-    const groupContext = this.buildGroupContextBlock();
+    const content = this.buildGroupContextBlock();
+    log('Group context prepared for injection');
 
-    // Append group context to system message content
-    if (typeof systemMessage.content === 'string') {
-      clonedContext.messages[systemMessageIndex] = {
-        ...systemMessage,
-        content: systemMessage.content + groupContext,
-      };
+    return content;
+  }
 
-      log('Group context injected into system message');
-    }
+  protected async doProcess(context: PipelineContext): Promise<PipelineContext> {
+    const result = await super.doProcess(context);
 
     // Update metadata
-    clonedContext.metadata.groupContextInjected = true;
+    if (this.config.enabled) {
+      result.metadata.groupContextInjected = true;
+    }
 
-    return this.markAsExecuted(clonedContext);
+    return result;
   }
 
   /**
-   * Build the group context block to append to system message
+   * Build the group context block
    * Uses template from @lobechat/prompts with direct variable replacement
    */
   private buildGroupContextBlock(): string {
@@ -159,9 +147,7 @@ export class GroupContextInjector extends BaseProvider {
       .replace('{{SYSTEM_PROMPT}}', systemPrompt || '')
       .replace('{{GROUP_MEMBERS}}', membersText);
 
-    return `
-
-<group_context>
+    return `<group_context>
 ${groupContextContent}
 </group_context>`;
   }

package/packages/context-engine/src/providers/__tests__/GroupContextInjector.test.ts

@@ -12,7 +12,7 @@ describe('GroupContextInjector', () => {
   });
 
   describe('Basic Scenarios', () => {
-    it('should inject group context into system message', async () => {
+    it('should inject group context before first user message', async () => {
       const injector = new GroupContextInjector({
         currentAgentId: 'agt_editor',
         currentAgentName: 'Editor',
@@ -35,31 +35,39 @@ describe('GroupContextInjector', () => {
       const context = createContext(input);
       const result = await injector.process(context);
 
-      const systemContent = result.messages[0].content;
+      // System message should be unchanged
+      expect(result.messages[0].content).toBe('You are a helpful editor.');
+
+      // Should have 3 messages now (system, injected, user)
+      expect(result.messages).toHaveLength(3);
 
-      // Original content should be preserved
-      expect(systemContent).toContain('You are a helpful editor.');
+      // Check injected message (second message)
+      const injectedContent = result.messages[1].content;
+      expect(result.messages[1].role).toBe('user');
 
       // Agent identity (plain text, no wrapper)
-      expect(systemContent).toContain('You are "Editor"');
-      expect(systemContent).toContain('acting as a participant');
-      expect(systemContent).toContain('"Writing Team"');
-      expect(systemContent).toContain('agt_editor');
-      expect(systemContent).not.toContain('<agent_identity>');
+      expect(injectedContent).toContain('You are "Editor"');
+      expect(injectedContent).toContain('acting as a participant');
+      expect(injectedContent).toContain('"Writing Team"');
+      expect(injectedContent).toContain('agt_editor');
+      expect(injectedContent).not.toContain('<agent_identity>');
 
       // Group context section with system prompt
-      expect(systemContent).toContain('<group_context>');
-      expect(systemContent).toContain('A team for collaborative writing');
+      expect(injectedContent).toContain('<group_context>');
+      expect(injectedContent).toContain('A team for collaborative writing');
 
       // Participants section with XML format
-      expect(systemContent).toContain('<group_participants>');
-      expect(systemContent).toContain('<member name="Supervisor" id="agt_supervisor" />');
-      expect(systemContent).toContain('<member name="Writer" id="agt_writer" />');
-      expect(systemContent).toContain('<member name="Editor" id="agt_editor" you="true" />');
+      expect(injectedContent).toContain('<group_participants>');
+      expect(injectedContent).toContain('<member name="Supervisor" id="agt_supervisor" />');
+      expect(injectedContent).toContain('<member name="Writer" id="agt_writer" />');
+      expect(injectedContent).toContain('<member name="Editor" id="agt_editor" you="true" />');
 
       // Identity rules
-      expect(systemContent).toContain('<identity_rules>');
-      expect(systemContent).toContain('NEVER expose or display agent IDs');
+      expect(injectedContent).toContain('<identity_rules>');
+      expect(injectedContent).toContain('NEVER expose or display agent IDs');
+
+      // Original user message should be third
+      expect(result.messages[2].content).toBe('Please review this.');
 
       // Metadata should be updated
       expect(result.metadata.groupContextInjected).toBe(true);
@@ -72,35 +80,37 @@ describe('GroupContextInjector', () => {
         enabled: false, // Disabled
       });
 
-      const input: any[] = [{ role: 'system', content: 'You are a helpful editor.' }];
+      const input: any[] = [
+        { role: 'system', content: 'You are a helpful editor.' },
+        { role: 'user', content: 'Hello' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      // Should be unchanged
+      // Should be unchanged - no injection
+      expect(result.messages).toHaveLength(2);
       expect(result.messages[0].content).toBe('You are a helpful editor.');
+      expect(result.messages[1].content).toBe('Hello');
       expect(result.metadata.groupContextInjected).toBeUndefined();
     });
 
-    it('should skip injection when no system message exists', async () => {
+    it('should skip injection when no user message exists', async () => {
       const injector = new GroupContextInjector({
         currentAgentId: 'agt_editor',
         currentAgentName: 'Editor',
         enabled: true,
       });
 
-      const input: any[] = [
-        { role: 'user', content: 'Hello' },
-        { role: 'assistant', content: 'Hi there!' },
-      ];
+      const input: any[] = [{ role: 'system', content: 'You are a helpful editor.' }];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      // Messages should be unchanged
-      expect(result.messages[0].content).toBe('Hello');
-      expect(result.messages[1].content).toBe('Hi there!');
-      expect(result.metadata.groupContextInjected).toBeUndefined();
+      // Messages should be unchanged - no user message to inject before
+      expect(result.messages).toHaveLength(1);
+      expect(result.messages[0].content).toBe('You are a helpful editor.');
+      expect(result.metadata.groupContextInjected).toBe(true);
     });
   });
 
@@ -113,12 +123,16 @@ describe('GroupContextInjector', () => {
         enabled: true,
       });
 
-      const input: any[] = [{ content: 'You are an editor.', role: 'system' }];
+      const input: any[] = [
+        { content: 'You are an editor.', role: 'system' },
+        { content: 'Hello', role: 'user' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      expect(result.messages[0].content).toMatchSnapshot();
+      // Check injected message content
+      expect(result.messages[1].content).toMatchSnapshot();
     });
 
     it('should handle config with only group info', async () => {
@@ -129,12 +143,16 @@ describe('GroupContextInjector', () => {
         systemPrompt: 'Test group description',
       });
 
-      const input: any[] = [{ content: 'System prompt.', role: 'system' }];
+      const input: any[] = [
+        { content: 'System prompt.', role: 'system' },
+        { content: 'Hello', role: 'user' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      expect(result.messages[0].content).toMatchSnapshot();
+      // Check injected message content
+      expect(result.messages[1].content).toMatchSnapshot();
     });
 
     it('should handle empty config', async () => {
@@ -142,12 +160,16 @@ describe('GroupContextInjector', () => {
         enabled: true,
       });
 
-      const input: any[] = [{ content: 'Base prompt.', role: 'system' }];
+      const input: any[] = [
+        { content: 'Base prompt.', role: 'system' },
+        { content: 'Hello', role: 'user' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      expect(result.messages[0].content).toMatchSnapshot();
+      // Check injected message content
+      expect(result.messages[1].content).toMatchSnapshot();
     });
   });
 
@@ -158,15 +180,19 @@ describe('GroupContextInjector', () => {
         // Minimal config
       });
 
-      const input: any[] = [{ role: 'system', content: 'Base prompt.' }];
+      const input: any[] = [
+        { role: 'system', content: 'Base prompt.' },
+        { role: 'user', content: 'Hello' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      const systemContent = result.messages[0].content;
+      // Check injected message content
+      const injectedContent = result.messages[1].content;
 
       // Even with minimal config, identity rules should be present
-      expect(systemContent).toMatchSnapshot();
+      expect(injectedContent).toMatchSnapshot();
     });
   });
 
@@ -179,12 +205,16 @@ describe('GroupContextInjector', () => {
         systemPrompt: 'Empty group description',
       });
 
-      const input: any[] = [{ content: 'Prompt.', role: 'system' }];
+      const input: any[] = [
+        { content: 'Prompt.', role: 'system' },
+        { content: 'Hello', role: 'user' },
+      ];
 
       const context = createContext(input);
       const result = await injector.process(context);
 
-      expect(result.messages[0].content).toMatchSnapshot();
+      // Check injected message content
+      expect(result.messages[1].content).toMatchSnapshot();
     });
 
     it('should preserve other messages unchanged', async () => {
@@ -204,10 +234,16 @@ describe('GroupContextInjector', () => {
       const context = createContext(input);
       const result = await injector.process(context);
 
-      // Only system message should be modified
-      expect(result.messages[0].content).toContain('<group_context>');
-      expect(result.messages[1].content).toBe('User message.');
-      expect(result.messages[2].content).toBe('Assistant response.');
+      // System message should be unchanged
+      expect(result.messages[0].content).toBe('System prompt.');
+
+      // Injected message should be second
+      expect(result.messages[1].role).toBe('user');
+      expect(result.messages[1].content).toContain('<group_context>');
+
+      // Original messages should be preserved
+      expect(result.messages[2].content).toBe('User message.');
+      expect(result.messages[3].content).toBe('Assistant response.');
     });
   });
 });