@lobehub/lobehub 2.0.0-next.305 → 2.0.0-next.307

package/packages/builtin-tool-local-system/src/ExecutionRuntime/index.ts

@@ -71,8 +71,14 @@ export class LocalSystemExecutionRuntime {
 
       const state: LocalFileListState = { listResults: result };
 
+      const fileList = result.map((f) => `  ${f.isDirectory ? '[D]' : '[F]'} ${f.name}`).join('\n');
+      const content =
+        result.length > 0
+          ? `Found ${result.length} item(s) in ${args.path}:\n${fileList}`
+          : `Directory ${args.path} is empty`;
+
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: true,
       };
@@ -91,8 +97,11 @@ export class LocalSystemExecutionRuntime {
 
       const state: LocalReadFileState = { fileContent: result };
 
+      const lineInfo = args.loc ? ` (lines ${args.loc[0]}-${args.loc[1]})` : '';
+      const content = `File: ${args.path}${lineInfo}\n\n${result.content}`;
+
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: true,
       };
@@ -111,8 +120,11 @@ export class LocalSystemExecutionRuntime {
 
       const state: LocalReadFilesState = { filesContent: results };
 
+      const fileContents = results.map((r) => `=== ${r.filename} ===\n${r.content}`).join('\n\n');
+      const content = `Read ${results.length} file(s):\n\n${fileContents}`;
+
       return {
-        content: JSON.stringify(results),
+        content,
         state,
         success: true,
       };
@@ -131,8 +143,12 @@ export class LocalSystemExecutionRuntime {
 
       const state: LocalFileSearchState = { searchResults: result };
 
+      const fileList = result.map((f) => `  ${f.path}`).join('\n');
+      const content =
+        result.length > 0 ? `Found ${result.length} file(s):\n${fileList}` : 'No files found';
+
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: true,
       };
@@ -154,14 +170,14 @@ export class LocalSystemExecutionRuntime {
       const successCount = results.filter((r) => r.success).length;
       const failedCount = results.length - successCount;
 
-      let message = '';
+      let content = '';
 
       if (allSucceeded) {
-        message = `Successfully moved ${results.length} item(s).`;
+        content = `Successfully moved ${results.length} item(s).`;
       } else if (someFailed) {
-        message = `Moved ${successCount} item(s) successfully. Failed to move ${failedCount} item(s).`;
+        content = `Moved ${successCount} item(s) successfully. Failed to move ${failedCount} item(s).`;
       } else {
-        message = `Failed to move all ${results.length} item(s).`;
+        content = `Failed to move all ${results.length} item(s).`;
       }
 
       const state: LocalMoveFilesState = {
@@ -171,7 +187,7 @@ export class LocalSystemExecutionRuntime {
       };
 
       return {
-        content: JSON.stringify({ message, results }),
+        content,
         state,
         success: true,
       };
@@ -197,7 +213,7 @@ export class LocalSystemExecutionRuntime {
         };
 
         return {
-          content: JSON.stringify({ message: result.error, success: false }),
+          content: `Failed to rename file: ${result.error}`,
           state,
           success: false,
         };
@@ -210,10 +226,7 @@ export class LocalSystemExecutionRuntime {
       };
 
       return {
-        content: JSON.stringify({
-          message: `Successfully renamed file ${args.path} to ${args.newName}.`,
-          success: true,
-        }),
+        content: `Successfully renamed file ${args.path} to ${args.newName}`,
         state,
         success: true,
       };
@@ -232,20 +245,14 @@ export class LocalSystemExecutionRuntime {
 
       if (!result.success) {
         return {
-          content: JSON.stringify({
-            message: result.error || '写入文件失败',
-            success: false,
-          }),
+          content: `Failed to write file: ${result.error || 'Unknown error'}`,
           error: result.error,
           success: false,
         };
       }
 
       return {
-        content: JSON.stringify({
-          message: `成功写入文件 ${args.path}`,
-          success: true,
-        }),
+        content: `Successfully wrote to ${args.path}`,
         success: true,
       };
     } catch (error) {
@@ -301,22 +308,28 @@ export class LocalSystemExecutionRuntime {
     try {
       const result: RunCommandResult = await this.localFileService.runCommand(args);
 
-      let message: string;
+      const parts: string[] = [];
 
       if (result.success) {
         if (result.shell_id) {
-          message = `Command started in background with shell_id: ${result.shell_id}`;
+          parts.push(`Command started in background with shell_id: ${result.shell_id}`);
         } else {
-          message = `Command completed successfully.`;
+          parts.push('Command completed successfully.');
         }
       } else {
-        message = `Command failed: ${result.error}`;
+        parts.push(`Command failed: ${result.error}`);
       }
 
+      if (result.stdout) parts.push(`Output:\n${result.stdout}`);
+      if (result.stderr) parts.push(`Stderr:\n${result.stderr}`);
+      if (result.exit_code !== undefined) parts.push(`Exit code: ${result.exit_code}`);
+
+      const message = parts[0];
+      const content = parts.join('\n\n');
       const state: RunCommandState = { message, result };
 
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: result.success,
       };
@@ -337,10 +350,14 @@ export class LocalSystemExecutionRuntime {
         ? `Output retrieved. Running: ${result.running}`
         : `Failed: ${result.error}`;
 
+      const parts: string[] = [message];
+      if (result.output) parts.push(`Output:\n${result.output}`);
+      if (result.error) parts.push(`Error: ${result.error}`);
+
       const state: GetCommandOutputState = { message, result };
 
       return {
-        content: JSON.stringify(result),
+        content: parts.join('\n\n'),
         state,
         success: result.success,
       };
@@ -364,7 +381,7 @@ export class LocalSystemExecutionRuntime {
       const state: KillCommandState = { message, result };
 
       return {
-        content: JSON.stringify(result),
+        content: message,
         state,
         success: result.success,
       };
@@ -389,8 +406,19 @@ export class LocalSystemExecutionRuntime {
 
       const state: GrepContentState = { message, result };
 
+      let content = message;
+      if (result.success && result.matches.length > 0) {
+        const matchList = result.matches
+          .slice(0, 20)
+          .map((m) => `  ${m}`)
+          .join('\n');
+        const moreInfo =
+          result.matches.length > 20 ? `\n  ... and ${result.matches.length - 20} more` : '';
+        content = `${message}:\n${matchList}${moreInfo}`;
+      }
+
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: result.success,
       };
@@ -411,8 +439,19 @@ export class LocalSystemExecutionRuntime {
 
       const state: GlobFilesState = { message, result };
 
+      let content = message;
+      if (result.success && result.files.length > 0) {
+        const fileList = result.files
+          .slice(0, 50)
+          .map((f) => `  ${f}`)
+          .join('\n');
+        const moreInfo =
+          result.files.length > 50 ? `\n  ... and ${result.files.length - 50} more` : '';
+        content = `${message}:\n${fileList}${moreInfo}`;
+      }
+
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: result.success,
       };

package/packages/builtin-tool-local-system/src/executor/index.ts

@@ -23,6 +23,21 @@ import type {
   RunCommandResult,
   WriteLocalFileParams,
 } from '@lobechat/electron-client-ipc';
+import {
+  formatCommandOutput,
+  formatCommandResult,
+  formatEditResult,
+  formatFileContent,
+  formatFileList,
+  formatFileSearchResults,
+  formatGlobResults,
+  formatGrepResults,
+  formatKillResult,
+  formatMoveResults,
+  formatMultipleFiles,
+  formatRenameResult,
+  formatWriteResult,
+} from '@lobechat/prompts';
 import { BaseExecutor, type BuiltinToolResult } from '@lobechat/types';
 
 import { localFileService } from '@/services/electron/localFileService';
@@ -76,8 +91,10 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
 
       const state: LocalFileListState = { listResults: result };
 
+      const content = formatFileList(result, params.path);
+
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: true,
       };
@@ -96,8 +113,14 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
 
       const state: LocalReadFileState = { fileContent: result };
 
+      const content = formatFileContent({
+        content: result.content,
+        lineRange: params.loc,
+        path: params.path,
+      });
+
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: true,
       };
@@ -116,8 +139,10 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
 
       const state: LocalReadFilesState = { filesContent: results };
 
+      const content = formatMultipleFiles(results);
+
       return {
-        content: JSON.stringify(results),
+        content,
         state,
         success: true,
       };
@@ -136,8 +161,10 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
 
       const state: LocalFileSearchState = { searchResults: result };
 
+      const content = formatFileSearchResults(result);
+
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: true,
       };
@@ -154,20 +181,9 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
     try {
       const results: LocalMoveFilesResultItem[] = await localFileService.moveLocalFiles(params);
 
-      const allSucceeded = results.every((r) => r.success);
-      const someFailed = results.some((r) => !r.success);
       const successCount = results.filter((r) => r.success).length;
-      const failedCount = results.length - successCount;
 
-      let message = '';
-
-      if (allSucceeded) {
-        message = `Successfully moved ${results.length} item(s).`;
-      } else if (someFailed) {
-        message = `Moved ${successCount} item(s) successfully. Failed to move ${failedCount} item(s).`;
-      } else {
-        message = `Failed to move all ${results.length} item(s).`;
-      }
+      const content = formatMoveResults(results);
 
       const state: LocalMoveFilesState = {
         results,
@@ -176,7 +192,7 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
       };
 
       return {
-        content: JSON.stringify({ message, results }),
+        content,
         state,
         success: true,
       };
@@ -202,7 +218,12 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
         };
 
         return {
-          content: JSON.stringify({ message: result.error, success: false }),
+          content: formatRenameResult({
+            error: result.error,
+            newName: params.newName,
+            oldPath: params.path,
+            success: false,
+          }),
           state,
           success: false,
         };
@@ -215,8 +236,9 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
       };
 
       return {
-        content: JSON.stringify({
-          message: `Successfully renamed file ${params.path} to ${params.newName}.`,
+        content: formatRenameResult({
+          newName: params.newName,
+          oldPath: params.path,
           success: true,
         }),
         state,
@@ -237,8 +259,9 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
 
       if (!result.success) {
         return {
-          content: JSON.stringify({
-            message: result.error || 'Failed to write file',
+          content: formatWriteResult({
+            error: result.error,
+            path: params.path,
             success: false,
           }),
           error: { message: result.error || 'Failed to write file', type: 'PluginServerError' },
@@ -247,8 +270,8 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
       }
 
       return {
-        content: JSON.stringify({
-          message: `Successfully wrote file ${params.path}`,
+        content: formatWriteResult({
+          path: params.path,
           success: true,
         }),
         success: true,
@@ -273,11 +296,12 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
         };
       }
 
-      const statsText =
-        result.linesAdded || result.linesDeleted
-          ? ` (+${result.linesAdded || 0} -${result.linesDeleted || 0})`
-          : '';
-      const message = `Successfully replaced ${result.replacements} occurrence(s) in ${params.file_path}${statsText}`;
+      const content = formatEditResult({
+        filePath: params.file_path,
+        linesAdded: result.linesAdded,
+        linesDeleted: result.linesDeleted,
+        replacements: result.replacements,
+      });
 
       const state: EditLocalFileState = {
         diffText: result.diffText,
@@ -287,7 +311,7 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
       };
 
       return {
-        content: message,
+        content,
         state,
         success: true,
       };
@@ -306,22 +330,19 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
     try {
       const result: RunCommandResult = await localFileService.runCommand(params);
 
-      let message: string;
-
-      if (result.success) {
-        if (result.shell_id) {
-          message = `Command started in background with shell_id: ${result.shell_id}`;
-        } else {
-          message = `Command completed successfully.`;
-        }
-      } else {
-        message = `Command failed: ${result.error}`;
-      }
+      const content = formatCommandResult({
+        error: result.error,
+        exitCode: result.exit_code,
+        shellId: result.shell_id,
+        stderr: result.stderr,
+        stdout: result.stdout,
+        success: result.success,
+      });
 
-      const state: RunCommandState = { message, result };
+      const state: RunCommandState = { message: content.split('\n\n')[0], result };
 
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: result.success,
       };
@@ -338,14 +359,17 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
     try {
       const result: GetCommandOutputResult = await localFileService.getCommandOutput(params);
 
-      const message = result.success
-        ? `Output retrieved. Running: ${result.running}`
-        : `Failed: ${result.error}`;
+      const content = formatCommandOutput({
+        error: result.error,
+        output: result.output,
+        running: result.running,
+        success: result.success,
+      });
 
-      const state: GetCommandOutputState = { message, result };
+      const state: GetCommandOutputState = { message: content.split('\n\n')[0], result };
 
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: result.success,
       };
@@ -362,14 +386,16 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
     try {
       const result: KillCommandResult = await localFileService.killCommand(params);
 
-      const message = result.success
-        ? `Successfully killed shell: ${params.shell_id}`
-        : `Failed to kill shell: ${result.error}`;
+      const content = formatKillResult({
+        error: result.error,
+        shellId: params.shell_id,
+        success: result.success,
+      });
 
-      const state: KillCommandState = { message, result };
+      const state: KillCommandState = { message: content, result };
 
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: result.success,
       };
@@ -388,14 +414,17 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
     try {
       const result: GrepContentResult = await localFileService.grepContent(params);
 
-      const message = result.success
-        ? `Found ${result.total_matches} matches in ${result.matches.length} locations`
+      const content = result.success
+        ? formatGrepResults({
+            matches: result.matches,
+            totalMatches: result.total_matches,
+          })
         : 'Search failed';
 
-      const state: GrepContentState = { message, result };
+      const state: GrepContentState = { message: content.split('\n')[0], result };
 
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: result.success,
       };
@@ -412,12 +441,17 @@ class LocalSystemExecutor extends BaseExecutor<typeof LocalSystemApiEnum> {
     try {
       const result: GlobFilesResult = await localFileService.globFiles(params);
 
-      const message = result.success ? `Found ${result.total_files} files` : 'Glob search failed';
+      const content = result.success
+        ? formatGlobResults({
+            files: result.files,
+            totalFiles: result.total_files,
+          })
+        : 'Glob search failed';
 
-      const state: GlobFilesState = { message, result };
+      const state: GlobFilesState = { message: content.split('\n')[0], result };
 
       return {
-        content: JSON.stringify(result),
+        content,
         state,
         success: result.success,
       };

package/packages/context-engine/src/processors/GroupMessageFlatten.ts

@@ -7,9 +7,9 @@ const log = debug('context-engine:processor:GroupMessageFlattenProcessor');
 
 /**
  * Group Message Flatten Processor
- * Responsible for flattening role=assistantGroup messages into standard assistant + tool message sequences
+ * Responsible for flattening role=assistantGroup and role=supervisor messages into standard assistant + tool message sequences
  *
- * AssistantGroup messages are created when assistant messages with tools are merged with their tool results.
+ * AssistantGroup/Supervisor messages are created when assistant messages with tools are merged with their tool results.
  * This processor converts them back to a flat structure that AI models can understand.
  */
 export class GroupMessageFlattenProcessor extends BaseProcessor {
@@ -31,8 +31,11 @@ export class GroupMessageFlattenProcessor extends BaseProcessor {
 
     // Process each message
     for (const message of clonedContext.messages) {
-      // Check if this is an assistantGroup message with children field
-      if (message.role === 'assistantGroup' && message.children) {
+      // Check if this is an assistantGroup or supervisor message with children field
+      if (
+        (message.role === 'assistantGroup' || message.role === 'supervisor') &&
+        message.children
+      ) {
         // If children array is empty, skip this message entirely (no content to flatten)
         if (message.children.length === 0) {
           continue;
@@ -42,7 +45,7 @@ export class GroupMessageFlattenProcessor extends BaseProcessor {
         groupMessagesFlattened++;
 
         log(
-          `Flattening assistantGroup message ${message.id} with ${message.children.length} children`,
+          `Flattening ${message.role} message ${message.id} with ${message.children.length} children`,
         );
 
         // Flatten each child
@@ -148,7 +151,7 @@ export class GroupMessageFlattenProcessor extends BaseProcessor {
     clonedContext.metadata.toolMessagesCreated = toolMessagesCreated;
 
     log(
-      `AssistantGroup message flatten processing completed: ${groupMessagesFlattened} groups flattened, ${assistantMessagesCreated} assistant messages created, ${toolMessagesCreated} tool messages created`,
+      `AssistantGroup/Supervisor message flatten processing completed: ${groupMessagesFlattened} groups flattened, ${assistantMessagesCreated} assistant messages created, ${toolMessagesCreated} tool messages created`,
     );
 
     return this.markAsExecuted(clonedContext);

package/packages/context-engine/src/processors/__tests__/GroupMessageFlatten.test.ts

@@ -489,6 +489,109 @@ describe('GroupMessageFlattenProcessor', () => {
     });
   });
 
+  describe('Supervisor Messages', () => {
+    it('should flatten supervisor message with children', async () => {
+      const processor = new GroupMessageFlattenProcessor();
+
+      const input: any[] = [
+        {
+          id: 'msg-supervisor-1',
+          role: 'supervisor',
+          content: '',
+          createdAt: '2025-10-27T10:00:00.000Z',
+          updatedAt: '2025-10-27T10:00:10.000Z',
+          meta: { title: 'Supervisor Agent' },
+          children: [
+            {
+              id: 'msg-1',
+              content: 'Let me coordinate the agents',
+              tools: [
+                {
+                  id: 'tool-1',
+                  type: 'builtin',
+                  apiName: 'broadcast',
+                  arguments: '{"message":"Hello agents"}',
+                  identifier: 'lobe-group-management',
+                  result: {
+                    id: 'msg-tool-1',
+                    content: 'Broadcast sent',
+                    error: null,
+                    state: {},
+                  },
+                },
+              ],
+              usage: { totalTokens: 100 },
+            },
+          ],
+        },
+      ];
+
+      const context = createContext(input);
+      const result = await processor.process(context);
+
+      // Should create 2 messages: 1 assistant + 1 tool
+      expect(result.messages).toHaveLength(2);
+
+      // Check assistant message (supervisor gets flattened to assistant)
+      const assistantMsg = result.messages[0];
+      expect(assistantMsg.role).toBe('assistant');
+      expect(assistantMsg.id).toBe('msg-1');
+      expect(assistantMsg.content).toBe('Let me coordinate the agents');
+      expect(assistantMsg.tools).toHaveLength(1);
+
+      // Check tool message
+      const toolMsg = result.messages[1];
+      expect(toolMsg.role).toBe('tool');
+      expect(toolMsg.id).toBe('msg-tool-1');
+      expect(toolMsg.content).toBe('Broadcast sent');
+    });
+
+    it('should flatten supervisor message with content only (no tools)', async () => {
+      const processor = new GroupMessageFlattenProcessor();
+
+      const input: any[] = [
+        {
+          id: 'msg-supervisor-1',
+          role: 'supervisor',
+          content: '',
+          children: [
+            {
+              id: 'msg-1',
+              content: 'Anthropic cowork',
+            },
+          ],
+        },
+      ];
+
+      const context = createContext(input);
+      const result = await processor.process(context);
+
+      // Should create 1 assistant message
+      expect(result.messages).toHaveLength(1);
+      expect(result.messages[0].role).toBe('assistant');
+      expect(result.messages[0].content).toBe('Anthropic cowork');
+    });
+
+    it('should handle supervisor message with empty children', async () => {
+      const processor = new GroupMessageFlattenProcessor();
+
+      const input: any[] = [
+        {
+          id: 'msg-supervisor-1',
+          role: 'supervisor',
+          content: '',
+          children: [],
+        },
+      ];
+
+      const context = createContext(input);
+      const result = await processor.process(context);
+
+      // Empty children means no messages created
+      expect(result.messages).toHaveLength(0);
+    });
+  });
+
   describe('Real-world Test Case', () => {
     it('should flatten the provided real-world group message', async () => {
       const processor = new GroupMessageFlattenProcessor();