Add camel log upload and organize files by source type (#1548)

Co-authored-by: 4pmtong <web_chentong@163.com>

Author: fengju0213

electron/main/index.ts

@@ -1830,7 +1830,6 @@ function registerIpcHandlers() {
 
       // Read file content
       const fileContent = await fsp.readFile(filePath);
-      // log.info('File read successfully:', filePath);
 
       return {
         success: true,

src/store/chatStore.ts

@@ -96,6 +96,7 @@ interface GeneratedUploadFile {
   path?: string;
   name?: string;
   isFolder?: boolean;
+  relativePath?: string;
   source?: Exclude<UploadFileSource, 'user_attachment'>;
 }
 
@@ -120,17 +121,21 @@ function buildUploadName(
   fileName: string,
   source: UploadFileSource,
   taskId: string,
-  attachmentIndex: number
+  attachmentIndex: number,
+  relativePath?: string
 ): string {
   if (source === 'camel_log') {
-    return `camel_log_${taskId}__${fileName}`;
+    if (relativePath) {
+      return `camel_log/${relativePath}/${fileName}`;
+    }
+    return `camel_log/${fileName}`;
   }
 
   if (source === 'user_attachment') {
-    return `user_attachment_${attachmentIndex}__${fileName}`;
+    return `user_attachment/${fileName}`;
   }
 
-  return fileName;
+  return `project_output/${fileName}`;
 }
 
 export function collectTaskUploadFiles(
@@ -139,13 +144,16 @@ export function collectTaskUploadFiles(
   pendingAttaches: File[] = [],
   taskId = 'unknown_task'
 ): UploadCandidate[] {
-  const uploadCandidates: Array<Omit<UploadCandidate, 'uploadName'>> = [];
+  const uploadCandidates: Array<
+    Omit<UploadCandidate, 'uploadName'> & { relativePath?: string }
+  > = [];
 
   for (const file of generatedFiles) {
     if (!file?.path || !file?.name || file.isFolder) continue;
     uploadCandidates.push({
       path: file.path,
       name: file.name,
+      relativePath: file.relativePath,
       source: file.source === 'camel_log' ? 'camel_log' : 'project_output',
     });
   }
@@ -169,13 +177,15 @@ export function collectTaskUploadFiles(
   let attachmentIndex = 1;
   for (const file of uploadCandidates) {
     if (!uniqueCandidates.has(file.path)) {
+      const { relativePath, ...rest } = file;
       uniqueCandidates.set(file.path, {
-        ...file,
+        ...rest,
         uploadName: buildUploadName(
           file.name,
           file.source,
           taskId,
-          file.source === 'user_attachment' ? attachmentIndex++ : 0
+          file.source === 'user_attachment' ? attachmentIndex++ : 0,
+          relativePath
         ),
       });
     }

test/unit/store/chatStore.test.ts

@@ -127,8 +127,9 @@ describe('ChatStore - Core Functionality', () => {
             source: 'project_output',
           },
           {
-            path: '/tmp/logs/agent.log',
+            path: '/tmp/logs/ba4462e1/agent.log',
             name: 'agent.log',
+            relativePath: 'ba4462e1',
             source: 'camel_log',
           },
           {
@@ -168,25 +169,25 @@ describe('ChatStore - Core Functionality', () => {
         {
           path: '/tmp/project/report.md',
           name: 'report.md',
-          uploadName: 'report.md',
+          uploadName: 'project_output/report.md',
           source: 'project_output',
         },
         {
-          path: '/tmp/logs/agent.log',
+          path: '/tmp/logs/ba4462e1/agent.log',
           name: 'agent.log',
-          uploadName: 'camel_log_task-123__agent.log',
+          uploadName: 'camel_log/ba4462e1/agent.log',
           source: 'camel_log',
         },
         {
           path: '/Users/test/Documents/brief.pdf',
           name: 'brief.pdf',
-          uploadName: 'user_attachment_1__brief.pdf',
+          uploadName: 'user_attachment/brief.pdf',
           source: 'user_attachment',
         },
         {
           path: '/Users/test/Documents/followup.csv',
           name: 'followup.csv',
-          uploadName: 'user_attachment_2__followup.csv',
+          uploadName: 'user_attachment/followup.csv',
           source: 'user_attachment',
         },
       ]);
@@ -220,7 +221,7 @@ describe('ChatStore - Core Functionality', () => {
         {
           path: 'C:\\Users\\test\\Desktop\\notes.txt',
           name: 'notes.txt',
-          uploadName: 'user_attachment_1__notes.txt',
+          uploadName: 'user_attachment/notes.txt',
           source: 'user_attachment',
         },
       ]);