feat(drive): add trashFile and renameFile tools (#254)

Author: Jefftree

workspace-server/src/__tests__/services/DriveService.test.ts

@@ -961,6 +961,123 @@ describe('DriveService', () => {
     });
   });
 
+  describe('trashFile', () => {
+    it('should trash a file by ID', async () => {
+      mockDriveAPI.files.update.mockResolvedValue({
+        data: { id: 'file-id-123', name: 'My File.pdf' },
+      });
+
+      const result = await driveService.trashFile({ fileId: 'file-id-123' });
+
+      expect(mockDriveAPI.files.update).toHaveBeenCalledWith({
+        fileId: 'file-id-123',
+        requestBody: { trashed: true },
+        fields: 'id, name',
+        supportsAllDrives: true,
+      });
+      expect(JSON.parse(result.content[0].text)).toEqual({
+        id: 'file-id-123',
+        name: 'My File.pdf',
+        trashed: true,
+      });
+    });
+
+    it('should extract ID from a Drive URL', async () => {
+      mockDriveAPI.files.update.mockResolvedValue({
+        data: { id: 'file-url-id', name: 'URL File.pdf' },
+      });
+
+      const result = await driveService.trashFile({
+        fileId: 'https://drive.google.com/file/d/file-url-id/view',
+      });
+
+      expect(mockDriveAPI.files.update).toHaveBeenCalledWith({
+        fileId: 'file-url-id',
+        requestBody: { trashed: true },
+        fields: 'id, name',
+        supportsAllDrives: true,
+      });
+      expect(JSON.parse(result.content[0].text)).toEqual({
+        id: 'file-url-id',
+        name: 'URL File.pdf',
+        trashed: true,
+      });
+    });
+
+    it('should handle API errors gracefully', async () => {
+      mockDriveAPI.files.update.mockRejectedValue(
+        new Error('Permission denied'),
+      );
+
+      const result = await driveService.trashFile({ fileId: 'file-id-123' });
+
+      expect(JSON.parse(result.content[0].text)).toEqual({
+        error: 'Permission denied',
+      });
+    });
+  });
+
+  describe('renameFile', () => {
+    it('should rename a file by ID', async () => {
+      mockDriveAPI.files.update.mockResolvedValue({
+        data: { id: 'file-id-123', name: 'New Name' },
+      });
+
+      const result = await driveService.renameFile({
+        fileId: 'file-id-123',
+        newName: 'New Name',
+      });
+
+      expect(mockDriveAPI.files.update).toHaveBeenCalledWith({
+        fileId: 'file-id-123',
+        requestBody: { name: 'New Name' },
+        fields: 'id, name',
+        supportsAllDrives: true,
+      });
+
+      expect(JSON.parse(result.content[0].text)).toEqual({
+        id: 'file-id-123',
+        name: 'New Name',
+      });
+    });
+
+    it('should extract ID from a Drive URL', async () => {
+      mockDriveAPI.files.update.mockResolvedValue({
+        data: { id: 'doc-url-id', name: 'Renamed Doc' },
+      });
+
+      const result = await driveService.renameFile({
+        fileId: 'https://docs.google.com/document/d/doc-url-id/edit',
+        newName: 'Renamed Doc',
+      });
+
+      expect(mockDriveAPI.files.update).toHaveBeenCalledWith({
+        fileId: 'doc-url-id',
+        requestBody: { name: 'Renamed Doc' },
+        fields: 'id, name',
+        supportsAllDrives: true,
+      });
+
+      expect(JSON.parse(result.content[0].text)).toEqual({
+        id: 'doc-url-id',
+        name: 'Renamed Doc',
+      });
+    });
+
+    it('should handle API errors gracefully', async () => {
+      mockDriveAPI.files.update.mockRejectedValue(new Error('File not found'));
+
+      const result = await driveService.renameFile({
+        fileId: 'file-id-123',
+        newName: 'New Name',
+      });
+
+      expect(JSON.parse(result.content[0].text)).toEqual({
+        error: 'File not found',
+      });
+    });
+  });
+
   describe('Shared Drive Support', () => {
     it('findFolder should include shared drive flags', async () => {
       mockDriveAPI.files.list.mockResolvedValue({ data: { files: [] } });

workspace-server/src/index.ts

@@ -579,6 +579,34 @@ async function main() {
     driveService.downloadFile,
   );
 
+  server.registerTool(
+    'drive.trashFile',
+    {
+      description:
+        'Moves a file or folder to the trash in Google Drive. This is a safe, reversible operation.',
+      inputSchema: {
+        fileId: z.string().describe('The ID or URL of the file to trash.'),
+      },
+    },
+    driveService.trashFile,
+  );
+
+  server.registerTool(
+    'drive.renameFile',
+    {
+      description: 'Renames a file or folder in Google Drive.',
+      inputSchema: {
+        fileId: z.string().describe('The ID or URL of the file to rename.'),
+        newName: z
+          .string()
+          .trim()
+          .min(1)
+          .describe('The new name for the file.'),
+      },
+    },
+    driveService.renameFile,
+  );
+
   server.registerTool(
     'calendar.list',
     {

workspace-server/src/services/DriveService.ts

@@ -35,6 +35,19 @@ export class DriveService {
     return google.drive({ version: 'v3', ...options });
   }
 
+  private handleError(context: string, error: unknown) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    logToFile(`Error during ${context}: ${errorMessage}`);
+    return {
+      content: [
+        {
+          type: 'text' as const,
+          text: JSON.stringify({ error: errorMessage }),
+        },
+      ],
+    };
+  }
+
   public findFolder = async ({ folderName }: { folderName: string }) => {
     logToFile(`Searching for folder with name: ${folderName}`);
     try {
@@ -62,17 +75,7 @@ export class DriveService {
         ],
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
-      logToFile(`Error during drive.findFolder: ${errorMessage}`);
-      return {
-        content: [
-          {
-            type: 'text' as const,
-            text: JSON.stringify({ error: errorMessage }),
-          },
-        ],
-      };
+      return this.handleError('drive.findFolder', error);
     }
   };
 
@@ -346,6 +349,73 @@ export class DriveService {
     }
   };
 
+  public trashFile = async ({ fileId }: { fileId: string }) => {
+    logToFile(`Trashing Drive file: ${fileId}`);
+    try {
+      const drive = await this.getDriveClient();
+      const id = extractDocumentId(fileId);
+
+      const file = await drive.files.update({
+        fileId: id,
+        requestBody: { trashed: true },
+        fields: 'id, name',
+        supportsAllDrives: true,
+      });
+
+      logToFile(`Successfully trashed file: ${id}`);
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: JSON.stringify({
+              id: file.data.id,
+              name: file.data.name,
+              trashed: true,
+            }),
+          },
+        ],
+      };
+    } catch (error) {
+      return this.handleError('drive.trashFile', error);
+    }
+  };
+
+  public renameFile = async ({
+    fileId,
+    newName,
+  }: {
+    fileId: string;
+    newName: string;
+  }) => {
+    logToFile(`Renaming Drive file: ${fileId} to "${newName}"`);
+    try {
+      const drive = await this.getDriveClient();
+      const id = extractDocumentId(fileId);
+
+      const file = await drive.files.update({
+        fileId: id,
+        requestBody: { name: newName },
+        fields: 'id, name',
+        supportsAllDrives: true,
+      });
+
+      logToFile(`Successfully renamed file: ${id} to "${file.data.name}"`);
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: JSON.stringify({
+              id: file.data.id,
+              name: file.data.name,
+            }),
+          },
+        ],
+      };
+    } catch (error) {
+      return this.handleError('drive.renameFile', error);
+    }
+  };
+
   public downloadFile = async ({
     fileId,
     localPath,