@mcp-z/mcp-drive 1.1.4 → 1.2.0

package/dist/esm/mcp/resources/file.d.ts

@@ -1,9 +1,2 @@
-import { ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
-import type { ReadResourceResult, ServerNotification, ServerRequest } from '@modelcontextprotocol/sdk/types.js';
-export default function createResource(): {
-    name: string;
-    template: ResourceTemplate;
-    config: import("@modelcontextprotocol/sdk/server/mcp.js").ResourceMetadata;
-    handler: (uri: URL, variables: Record<string, string | string[]>, extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => Promise<ReadResourceResult>;
-};
+import type { ResourceModule } from '@mcp-z/server';
+export default function createResource(): ResourceModule;

package/dist/esm/mcp/resources/file.js

@@ -1,5 +1,6 @@
-import { ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { google } from 'googleapis';
+import { drive as driveApi } from '@googleapis/drive';
+import { ResourceTemplate } from '@mcp-z/server';
+import { googleAuth } from '../../lib/google-auth.js';
 export default function createResource() {
     const template = new ResourceTemplate('drive://files/{fileId}', {
         list: undefined
@@ -29,13 +30,14 @@ export default function createResource() {
             }
             // Safe type guard to access middleware-enriched extra
             const { logger, authContext } = extra;
-            const drive = google.drive({
+            const drive = driveApi({
                 version: 'v3',
-                auth: authContext.auth
+                auth: googleAuth(authContext.auth)
             });
             const resp = await drive.files.get({
                 fileId,
-                fields: 'id,name,mimeType,size,modifiedTime,owners,webViewLink'
+                fields: 'id,name,mimeType,size,modifiedTime,owners,webViewLink',
+                supportsAllDrives: true
             });
             const data = resp.data;
             (_logger_debug = logger.debug) === null || _logger_debug === void 0 ? void 0 : _logger_debug.call(logger, {

package/dist/esm/mcp/resources/file.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/resources/file.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport type { ResourceConfig, ResourceModule } from '@mcp-z/server';\nimport { ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';\nimport type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';\nimport type { ReadResourceResult, ServerNotification, ServerRequest } from '@modelcontextprotocol/sdk/types.js';\nimport { google } from 'googleapis';\n\nexport default function createResource() {\n  const template = new ResourceTemplate('drive://files/{fileId}', {\n    list: undefined,\n  });\n  const config: ResourceConfig = {\n    description: 'Drive file resource',\n    mimeType: 'application/json',\n  };\n\n  const handler = async (uri: URL, variables: Record<string, string | string[]>, extra: RequestHandlerExtra<ServerRequest, ServerNotification>): Promise<ReadResourceResult> => {\n    // Extract fileId and handle both string and string[] cases\n    const fileId = Array.isArray(variables.fileId) ? variables.fileId[0] : variables.fileId;\n\n    try {\n      // Validate fileId exists and is a string\n      if (!fileId || typeof fileId !== 'string') {\n        return {\n          contents: [\n            {\n              uri: uri.href,\n              mimeType: 'application/json',\n              text: JSON.stringify({\n                error: 'Missing or invalid fileId in resource URI',\n              }),\n            },\n          ],\n        };\n      }\n\n      // Safe type guard to access middleware-enriched extra\n      const { logger, authContext } = extra as unknown as EnrichedExtra;\n      const drive = google.drive({ version: 'v3', auth: authContext.auth });\n      const resp = await drive.files.get({\n        fileId,\n        fields: 'id,name,mimeType,size,modifiedTime,owners,webViewLink',\n      });\n      const data = resp.data;\n      logger.debug?.({ fileId, fileName: data?.name }, 'drive-file resource fetch success');\n      return {\n        contents: [\n          {\n            uri: uri.href,\n            mimeType: 'application/json',\n            text: JSON.stringify(data || {}),\n          },\n        ],\n      };\n    } catch (error) {\n      const { logger } = extra as unknown as EnrichedExtra;\n      logger.debug?.(error as Record<string, unknown>, 'drive resource fetch failed');\n      return {\n        contents: [\n          {\n            uri: uri.href,\n            mimeType: 'application/json',\n            text: JSON.stringify({ error: (error as Error).message }),\n          },\n        ],\n      };\n    }\n  };\n\n  return {\n    name: 'file',\n    template,\n    config,\n    handler,\n  } satisfies ResourceModule;\n}\n"],"names":["ResourceTemplate","google","createResource","template","list","undefined","config","description","mimeType","handler","uri","variables","extra","fileId","Array","isArray","logger","contents","href","text","JSON","stringify","error","authContext","drive","version","auth","resp","files","get","fields","data","debug","fileName","name","message"],"mappings":"AAEA,SAASA,gBAAgB,QAAQ,0CAA0C;AAG3E,SAASC,MAAM,QAAQ,aAAa;AAEpC,eAAe,SAASC;IACtB,MAAMC,WAAW,IAAIH,iBAAiB,0BAA0B;QAC9DI,MAAMC;IACR;IACA,MAAMC,SAAyB;QAC7BC,aAAa;QACbC,UAAU;IACZ;IAEA,MAAMC,UAAU,OAAOC,KAAUC,WAA8CC;QAC7E,2DAA2D;QAC3D,MAAMC,SAASC,MAAMC,OAAO,CAACJ,UAAUE,MAAM,IAAIF,UAAUE,MAAM,CAAC,EAAE,GAAGF,UAAUE,MAAM;QAEvF,IAAI;gBAwBFG;YAvBA,yCAAyC;YACzC,IAAI,CAACH,UAAU,OAAOA,WAAW,UAAU;gBACzC,OAAO;oBACLI,UAAU;wBACR;4BACEP,KAAKA,IAAIQ,IAAI;4BACbV,UAAU;4BACVW,MAAMC,KAAKC,SAAS,CAAC;gCACnBC,OAAO;4BACT;wBACF;qBACD;gBACH;YACF;YAEA,sDAAsD;YACtD,MAAM,EAAEN,MAAM,EAAEO,WAAW,EAAE,GAAGX;YAChC,MAAMY,QAAQvB,OAAOuB,KAAK,CAAC;gBAAEC,SAAS;gBAAMC,MAAMH,YAAYG,IAAI;YAAC;YACnE,MAAMC,OAAO,MAAMH,MAAMI,KAAK,CAACC,GAAG,CAAC;gBACjChB;gBACAiB,QAAQ;YACV;YACA,MAAMC,OAAOJ,KAAKI,IAAI;aACtBf,gBAAAA,OAAOgB,KAAK,cAAZhB,oCAAAA,mBAAAA,QAAe;gBAAEH;gBAAQoB,QAAQ,EAAEF,iBAAAA,2BAAAA,KAAMG,IAAI;YAAC,GAAG;YACjD,OAAO;gBACLjB,UAAU;oBACR;wBACEP,KAAKA,IAAIQ,IAAI;wBACbV,UAAU;wBACVW,MAAMC,KAAKC,SAAS,CAACU,QAAQ,CAAC;oBAChC;iBACD;YACH;QACF,EAAE,OAAOT,OAAO;gBAEdN;YADA,MAAM,EAAEA,MAAM,EAAE,GAAGJ;aACnBI,iBAAAA,OAAOgB,KAAK,cAAZhB,qCAAAA,oBAAAA,QAAeM,OAAkC;YACjD,OAAO;gBACLL,UAAU;oBACR;wBACEP,KAAKA,IAAIQ,IAAI;wBACbV,UAAU;wBACVW,MAAMC,KAAKC,SAAS,CAAC;4BAAEC,OAAO,AAACA,MAAgBa,OAAO;wBAAC;oBACzD;iBACD;YACH;QACF;IACF;IAEA,OAAO;QACLD,MAAM;QACN/B;QACAG;QACAG;IACF;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/resources/file.ts"],"sourcesContent":["import { drive as driveApi } from '@googleapis/drive';\nimport type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport type { ReadResourceResult, ResourceConfig, ResourceModule, ServerContext } from '@mcp-z/server';\nimport { ResourceTemplate } from '@mcp-z/server';\nimport { googleAuth } from '../../lib/google-auth.ts';\n\nexport default function createResource(): ResourceModule {\n  const template = new ResourceTemplate('drive://files/{fileId}', {\n    list: undefined,\n  });\n  const config: ResourceConfig = {\n    description: 'Drive file resource',\n    mimeType: 'application/json',\n  };\n\n  const handler = async (uri: URL, variables: Record<string, string | string[]>, extra: ServerContext): Promise<ReadResourceResult> => {\n    // Extract fileId and handle both string and string[] cases\n    const fileId = Array.isArray(variables.fileId) ? variables.fileId[0] : variables.fileId;\n\n    try {\n      // Validate fileId exists and is a string\n      if (!fileId || typeof fileId !== 'string') {\n        return {\n          contents: [\n            {\n              uri: uri.href,\n              mimeType: 'application/json',\n              text: JSON.stringify({\n                error: 'Missing or invalid fileId in resource URI',\n              }),\n            },\n          ],\n        };\n      }\n\n      // Safe type guard to access middleware-enriched extra\n      const { logger, authContext } = extra as unknown as EnrichedExtra;\n      const drive = driveApi({ version: 'v3', auth: googleAuth(authContext.auth) });\n      const resp = await drive.files.get({\n        fileId,\n        fields: 'id,name,mimeType,size,modifiedTime,owners,webViewLink',\n        supportsAllDrives: true,\n      });\n      const data = resp.data;\n      logger.debug?.({ fileId, fileName: data?.name }, 'drive-file resource fetch success');\n      return {\n        contents: [\n          {\n            uri: uri.href,\n            mimeType: 'application/json',\n            text: JSON.stringify(data || {}),\n          },\n        ],\n      };\n    } catch (error) {\n      const { logger } = extra as unknown as EnrichedExtra;\n      logger.debug?.(error as Record<string, unknown>, 'drive resource fetch failed');\n      return {\n        contents: [\n          {\n            uri: uri.href,\n            mimeType: 'application/json',\n            text: JSON.stringify({ error: (error as Error).message }),\n          },\n        ],\n      };\n    }\n  };\n\n  return {\n    name: 'file',\n    template,\n    config,\n    handler,\n  } satisfies ResourceModule;\n}\n"],"names":["drive","driveApi","ResourceTemplate","googleAuth","createResource","template","list","undefined","config","description","mimeType","handler","uri","variables","extra","fileId","Array","isArray","logger","contents","href","text","JSON","stringify","error","authContext","version","auth","resp","files","get","fields","supportsAllDrives","data","debug","fileName","name","message"],"mappings":"AAAA,SAASA,SAASC,QAAQ,QAAQ,oBAAoB;AAGtD,SAASC,gBAAgB,QAAQ,gBAAgB;AACjD,SAASC,UAAU,QAAQ,2BAA2B;AAEtD,eAAe,SAASC;IACtB,MAAMC,WAAW,IAAIH,iBAAiB,0BAA0B;QAC9DI,MAAMC;IACR;IACA,MAAMC,SAAyB;QAC7BC,aAAa;QACbC,UAAU;IACZ;IAEA,MAAMC,UAAU,OAAOC,KAAUC,WAA8CC;QAC7E,2DAA2D;QAC3D,MAAMC,SAASC,MAAMC,OAAO,CAACJ,UAAUE,MAAM,IAAIF,UAAUE,MAAM,CAAC,EAAE,GAAGF,UAAUE,MAAM;QAEvF,IAAI;gBAyBFG;YAxBA,yCAAyC;YACzC,IAAI,CAACH,UAAU,OAAOA,WAAW,UAAU;gBACzC,OAAO;oBACLI,UAAU;wBACR;4BACEP,KAAKA,IAAIQ,IAAI;4BACbV,UAAU;4BACVW,MAAMC,KAAKC,SAAS,CAAC;gCACnBC,OAAO;4BACT;wBACF;qBACD;gBACH;YACF;YAEA,sDAAsD;YACtD,MAAM,EAAEN,MAAM,EAAEO,WAAW,EAAE,GAAGX;YAChC,MAAMd,QAAQC,SAAS;gBAAEyB,SAAS;gBAAMC,MAAMxB,WAAWsB,YAAYE,IAAI;YAAE;YAC3E,MAAMC,OAAO,MAAM5B,MAAM6B,KAAK,CAACC,GAAG,CAAC;gBACjCf;gBACAgB,QAAQ;gBACRC,mBAAmB;YACrB;YACA,MAAMC,OAAOL,KAAKK,IAAI;aACtBf,gBAAAA,OAAOgB,KAAK,cAAZhB,oCAAAA,mBAAAA,QAAe;gBAAEH;gBAAQoB,QAAQ,EAAEF,iBAAAA,2BAAAA,KAAMG,IAAI;YAAC,GAAG;YACjD,OAAO;gBACLjB,UAAU;oBACR;wBACEP,KAAKA,IAAIQ,IAAI;wBACbV,UAAU;wBACVW,MAAMC,KAAKC,SAAS,CAACU,QAAQ,CAAC;oBAChC;iBACD;YACH;QACF,EAAE,OAAOT,OAAO;gBAEdN;YADA,MAAM,EAAEA,MAAM,EAAE,GAAGJ;aACnBI,iBAAAA,OAAOgB,KAAK,cAAZhB,qCAAAA,oBAAAA,QAAeM,OAAkC;YACjD,OAAO;gBACLL,UAAU;oBACR;wBACEP,KAAKA,IAAIQ,IAAI;wBACbV,UAAU;wBACVW,MAAMC,KAAKC,SAAS,CAAC;4BAAEC,OAAO,AAACA,MAAgBa,OAAO;wBAAC;oBACzD;iBACD;YACH;QACF;IACF;IAEA,OAAO;QACLD,MAAM;QACN/B;QACAG;QACAG;IACF;AACF"}

package/dist/esm/mcp/tools/file-move-to-trash.d.ts

@@ -1,5 +1,5 @@
 import type { EnrichedExtra } from '@mcp-z/oauth-google';
-import { type CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import { type CallToolResult } from '@mcp-z/server';
 import { z } from 'zod';
 declare const inputSchema: z.ZodObject<{
     ids: z.ZodArray<z.ZodString>;

package/dist/esm/mcp/tools/file-move-to-trash.js

@@ -1,8 +1,9 @@
 import { schemas } from '@mcp-z/oauth-google';
 const { AuthRequiredBranchSchema } = schemas;
-import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
-import { google } from 'googleapis';
+import { drive as driveApi } from '@googleapis/drive';
+import { ProtocolError, ProtocolErrorCode } from '@mcp-z/server';
 import { z } from 'zod';
+import { googleAuth } from '../../lib/google-auth.js';
 const MAX_BATCH_SIZE = 1000;
 const inputSchema = z.object({
     ids: z.array(z.string().min(1)).min(1).max(MAX_BATCH_SIZE).describe('File IDs to soft delete (move to trash)')
@@ -40,16 +41,17 @@ async function handler({ ids }, extra) {
         count: ids.length
     });
     try {
-        const drive = google.drive({
+        const drive = driveApi({
             version: 'v3',
-            auth: extra.authContext.auth
+            auth: googleAuth(extra.authContext.auth)
         });
         const results = await Promise.allSettled(ids.map(async (id)=>{
             await drive.files.update({
                 fileId: id,
                 requestBody: {
                     trashed: true
-                }
+                },
+                supportsAllDrives: true
             });
             return id;
         }));
@@ -103,8 +105,8 @@ async function handler({ ids }, extra) {
         logger.error('drive.file.moveToTrash error', {
             error: message
         });
-        // Throw McpError
-        throw new McpError(ErrorCode.InternalError, `Error moving files to trash: ${message}`, {
+        // Throw ProtocolError
+        throw new ProtocolError(ProtocolErrorCode.InternalError, `Error moving files to trash: ${message}`, {
             stack: error instanceof Error ? error.stack : undefined
         });
     }

package/dist/esm/mcp/tools/file-move-to-trash.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/file-move-to-trash.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { type CallToolResult, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\n\nconst MAX_BATCH_SIZE = 1000;\n\nconst inputSchema = z.object({\n  ids: z.array(z.string().min(1)).min(1).max(MAX_BATCH_SIZE).describe('File IDs to soft delete (move to trash)'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  operationSummary: z.string().describe('Human-readable summary of the operation'),\n  totalCount: z.number().describe('Total number of files requested to trash'),\n  successCount: z.number().describe('Number of files successfully moved to trash'),\n  failureCount: z.number().describe('Number of files that failed to move'),\n  recoverable: z.boolean().describe('Whether trashed files can be restored'),\n  recoverableDays: z.number().describe('Days until permanent deletion'),\n  failures: z\n    .array(\n      z.object({\n        id: z.string().describe('ID of the file that failed'),\n        error: z.string().describe('Error message explaining the failure'),\n      })\n    )\n    .optional()\n    .describe('Details of any files that failed to trash'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Move Files to Trash',\n  description: 'Move files to trash (recoverable for 30 days).',\n  inputSchema: inputSchema,\n  outputSchema: z.object({\n    result: outputSchema,\n  }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ ids }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.file.moveToTrash called', { count: ids.length });\n\n  try {\n    const drive = google.drive({ version: 'v3', auth: extra.authContext.auth });\n\n    const results = await Promise.allSettled(\n      ids.map(async (id) => {\n        await drive.files.update({\n          fileId: id,\n          requestBody: { trashed: true },\n        });\n        return id;\n      })\n    );\n\n    // Separate successes and failures\n    const failures: Array<{ id: string; error: string }> = [];\n\n    results.forEach((result, index) => {\n      const id = ids[index];\n      if (!id) return;\n\n      if (result.status === 'rejected') {\n        const errorMessage = result.reason instanceof Error ? result.reason.message : String(result.reason);\n        failures.push({ id, error: errorMessage });\n      }\n    });\n\n    const successCount = ids.length - failures.length;\n    const failureCount = failures.length;\n    const totalCount = ids.length;\n\n    logger.info('drive.file.moveToTrash completed', {\n      totalCount,\n      successCount,\n      failureCount,\n    });\n\n    const operationSummary = failureCount === 0 ? `Moved ${successCount} file${successCount === 1 ? '' : 's'} to trash (recoverable for 30 days)` : `Moved ${successCount} of ${totalCount} file${totalCount === 1 ? '' : 's'} to trash (${failureCount} failed, recoverable for 30 days)`;\n\n    const result: Output = {\n      type: 'success' as const,\n      operationSummary,\n      totalCount,\n      successCount,\n      failureCount,\n      recoverable: true,\n      recoverableDays: 30,\n      ...(failures.length > 0 && { failures }),\n    };\n\n    return {\n      content: [\n        {\n          type: 'text' as const,\n          text: JSON.stringify(result),\n        },\n      ],\n      structuredContent: { result },\n    };\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    logger.error('drive.file.moveToTrash error', { error: message });\n\n    // Throw McpError\n    throw new McpError(ErrorCode.InternalError, `Error moving files to trash: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'file-move-to-trash' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","ErrorCode","McpError","google","z","MAX_BATCH_SIZE","inputSchema","object","ids","array","string","min","max","describe","successBranchSchema","type","literal","operationSummary","totalCount","number","successCount","failureCount","recoverable","boolean","recoverableDays","failures","id","error","optional","outputSchema","discriminatedUnion","config","title","description","result","handler","extra","logger","info","count","length","drive","version","auth","authContext","results","Promise","allSettled","map","files","update","fileId","requestBody","trashed","forEach","index","status","errorMessage","reason","Error","message","String","push","content","text","JSON","stringify","structuredContent","InternalError","stack","undefined","createTool","name"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/file-move-to-trash.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { drive as driveApi } from '@googleapis/drive';\nimport { type CallToolResult, ProtocolError, ProtocolErrorCode } from '@mcp-z/server';\nimport { z } from 'zod';\nimport { googleAuth } from '../../lib/google-auth.ts';\n\nconst MAX_BATCH_SIZE = 1000;\n\nconst inputSchema = z.object({\n  ids: z.array(z.string().min(1)).min(1).max(MAX_BATCH_SIZE).describe('File IDs to soft delete (move to trash)'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  operationSummary: z.string().describe('Human-readable summary of the operation'),\n  totalCount: z.number().describe('Total number of files requested to trash'),\n  successCount: z.number().describe('Number of files successfully moved to trash'),\n  failureCount: z.number().describe('Number of files that failed to move'),\n  recoverable: z.boolean().describe('Whether trashed files can be restored'),\n  recoverableDays: z.number().describe('Days until permanent deletion'),\n  failures: z\n    .array(\n      z.object({\n        id: z.string().describe('ID of the file that failed'),\n        error: z.string().describe('Error message explaining the failure'),\n      })\n    )\n    .optional()\n    .describe('Details of any files that failed to trash'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Move Files to Trash',\n  description: 'Move files to trash (recoverable for 30 days).',\n  inputSchema: inputSchema,\n  outputSchema: z.object({\n    result: outputSchema,\n  }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ ids }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.file.moveToTrash called', { count: ids.length });\n\n  try {\n    const drive = driveApi({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    const results = await Promise.allSettled(\n      ids.map(async (id) => {\n        await drive.files.update({\n          fileId: id,\n          requestBody: { trashed: true },\n          supportsAllDrives: true,\n        });\n        return id;\n      })\n    );\n\n    // Separate successes and failures\n    const failures: Array<{ id: string; error: string }> = [];\n\n    results.forEach((result, index) => {\n      const id = ids[index];\n      if (!id) return;\n\n      if (result.status === 'rejected') {\n        const errorMessage = result.reason instanceof Error ? result.reason.message : String(result.reason);\n        failures.push({ id, error: errorMessage });\n      }\n    });\n\n    const successCount = ids.length - failures.length;\n    const failureCount = failures.length;\n    const totalCount = ids.length;\n\n    logger.info('drive.file.moveToTrash completed', {\n      totalCount,\n      successCount,\n      failureCount,\n    });\n\n    const operationSummary = failureCount === 0 ? `Moved ${successCount} file${successCount === 1 ? '' : 's'} to trash (recoverable for 30 days)` : `Moved ${successCount} of ${totalCount} file${totalCount === 1 ? '' : 's'} to trash (${failureCount} failed, recoverable for 30 days)`;\n\n    const result: Output = {\n      type: 'success' as const,\n      operationSummary,\n      totalCount,\n      successCount,\n      failureCount,\n      recoverable: true,\n      recoverableDays: 30,\n      ...(failures.length > 0 && { failures }),\n    };\n\n    return {\n      content: [\n        {\n          type: 'text' as const,\n          text: JSON.stringify(result),\n        },\n      ],\n      structuredContent: { result },\n    };\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    logger.error('drive.file.moveToTrash error', { error: message });\n\n    // Throw ProtocolError\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error moving files to trash: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'file-move-to-trash' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","drive","driveApi","ProtocolError","ProtocolErrorCode","z","googleAuth","MAX_BATCH_SIZE","inputSchema","object","ids","array","string","min","max","describe","successBranchSchema","type","literal","operationSummary","totalCount","number","successCount","failureCount","recoverable","boolean","recoverableDays","failures","id","error","optional","outputSchema","discriminatedUnion","config","title","description","result","handler","extra","logger","info","count","length","version","auth","authContext","results","Promise","allSettled","map","files","update","fileId","requestBody","trashed","supportsAllDrives","forEach","index","status","errorMessage","reason","Error","message","String","push","content","text","JSON","stringify","structuredContent","InternalError","stack","undefined","createTool","name"],"mappings":"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"}

package/dist/esm/mcp/tools/file-move.d.ts

@@ -1,5 +1,5 @@
 import type { EnrichedExtra } from '@mcp-z/oauth-google';
-import { type CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import { type CallToolResult } from '@mcp-z/server';
 import { z } from 'zod';
 declare const inputSchema: z.ZodObject<{
     fileIds: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>;

package/dist/esm/mcp/tools/file-move.js

@@ -1,8 +1,9 @@
 import { schemas } from '@mcp-z/oauth-google';
 const { AuthRequiredBranchSchema } = schemas;
-import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
-import { google } from 'googleapis';
+import { drive as driveApi } from '@googleapis/drive';
+import { ProtocolError, ProtocolErrorCode } from '@mcp-z/server';
 import { z } from 'zod';
+import { googleAuth } from '../../lib/google-auth.js';
 function isDriveApiError(error) {
     return typeof error === 'object' && error !== null && ('message' in error || 'code' in error);
 }
@@ -53,7 +54,8 @@ const config = {
         // Get current file metadata to get old parents
         const fileMetadata = await drive.files.get({
             fileId: fileId,
-            fields: 'id,name,parents,webViewLink'
+            fields: 'id,name,parents,webViewLink',
+            supportsAllDrives: true
         });
         const oldParents = fileMetadata.data.parents || [];
         const fileName = fileMetadata.data.name || fileId;
@@ -63,7 +65,8 @@ const config = {
             fileId: fileId,
             addParents: destinationFolderId,
             removeParents: oldParents.join(','),
-            fields: 'id,name,parents,webViewLink'
+            fields: 'id,name,parents,webViewLink',
+            supportsAllDrives: true
         });
         const result = {
             fileId: fileId,
@@ -107,7 +110,8 @@ const config = {
         try {
             const response = await drive.files.get({
                 fileId: fileId,
-                fields: 'id,name,parents,webViewLink'
+                fields: 'id,name,parents,webViewLink',
+                supportsAllDrives: true
             });
             const webViewLink = response.data.webViewLink;
             return {
@@ -151,7 +155,8 @@ const config = {
                 fileId: file.fileId,
                 addParents: destinationFolderId,
                 removeParents: file.parents.join(','),
-                fields: 'id'
+                fields: 'id',
+                supportsAllDrives: true
             });
             return {
                 fileId: file.fileId,
@@ -205,9 +210,9 @@ async function handler({ fileIds, destinationFolderId, returnOldParents = true }
         returnOldParents
     });
     try {
-        const drive = google.drive({
+        const drive = driveApi({
             version: 'v3',
-            auth: extra.authContext.auth
+            auth: googleAuth(extra.authContext.auth)
         });
         let moved = [];
         let failed = [];
@@ -259,8 +264,8 @@ async function handler({ fileIds, destinationFolderId, returnOldParents = true }
         logger.error('drive.file.move error', {
             error: message
         });
-        // Throw McpError
-        throw new McpError(ErrorCode.InternalError, `Error moving files: ${message}`, {
+        // Throw ProtocolError
+        throw new ProtocolError(ProtocolErrorCode.InternalError, `Error moving files: ${message}`, {
             stack: error instanceof Error ? error.stack : undefined
         });
     }

package/dist/esm/mcp/tools/file-move.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/file-move.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { type CallToolResult, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport type { drive_v3 } from 'googleapis';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport type { Logger } from '../../types.ts';\n\n// Type guard for Google Drive API errors\ninterface DriveApiError {\n  message?: string;\n  code?: number | string;\n}\n\nfunction isDriveApiError(error: unknown): error is DriveApiError {\n  return typeof error === 'object' && error !== null && ('message' in error || 'code' in error);\n}\n\n// Types for results\ninterface MoveResult {\n  fileId: string;\n  fileName: string;\n  oldParents: string[];\n  newParent: string;\n  webViewLink?: string;\n}\n\ninterface FailedMove {\n  fileId: string;\n  error: string;\n  code?: string;\n}\n\nconst inputSchema = z.object({\n  fileIds: z.union([z.string().min(1), z.array(z.string().min(1)).min(1).max(100)]).describe('File or folder ID(s) to move. Single ID or array (max 100 for batch)'),\n  destinationFolderId: z.string().min(1).describe('Destination folder ID (use \"root\" for My Drive root)'),\n  returnOldParents: z.boolean().optional().describe('Include old parent IDs in response for manual undo (recommended: true)'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  moved: z\n    .array(\n      z.object({\n        fileId: z.string().describe('ID of the moved file'),\n        fileName: z.string().describe('Name of the moved file'),\n        oldParents: z.array(z.string()).describe('Previous parent folder IDs (for undo)'),\n        newParent: z.string().describe('New parent folder ID'),\n        webViewLink: z.string().optional().describe('URL to view the file'),\n      })\n    )\n    .describe('Successfully moved files'),\n  failed: z\n    .array(\n      z.object({\n        fileId: z.string().describe('ID of the file that failed to move'),\n        error: z.string().describe('Error message explaining the failure'),\n        code: z.string().optional().describe('API error code if available'),\n      })\n    )\n    .optional()\n    .describe('Files that failed to move'),\n  totalRequested: z.number().describe('Total number of files requested to move'),\n  totalMoved: z.number().describe('Number of files successfully moved'),\n  totalFailed: z.number().describe('Number of files that failed to move'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Move Files',\n  description: 'Move files/folders to destination folder. Returns oldParents for undo. Use \"root\" for My Drive root.',\n  inputSchema: inputSchema,\n  outputSchema: z.object({\n    result: outputSchema,\n  }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\n/**\n * Move a single file to a new parent folder\n */\nasync function moveSingleFile(\n  drive: drive_v3.Drive,\n  fileId: string,\n  destinationFolderId: string,\n  returnOldParents: boolean,\n  logger: Logger\n): Promise<{\n  success: boolean;\n  result?: MoveResult;\n  error?: FailedMove;\n}> {\n  try {\n    // Get current file metadata to get old parents\n    const fileMetadata = await drive.files.get({\n      fileId: fileId,\n      fields: 'id,name,parents,webViewLink',\n    });\n\n    const oldParents = (fileMetadata.data.parents as string[] | undefined) || [];\n    const fileName = (fileMetadata.data.name as string | undefined) || fileId;\n    const webViewLink = fileMetadata.data.webViewLink as string | undefined;\n\n    // Move file using addParents and removeParents\n    await drive.files.update({\n      fileId: fileId,\n      addParents: destinationFolderId,\n      removeParents: oldParents.join(','),\n      fields: 'id,name,parents,webViewLink',\n    });\n\n    const result: MoveResult = {\n      fileId: fileId,\n      fileName: fileName,\n      oldParents: returnOldParents ? oldParents : [],\n      newParent: destinationFolderId,\n      ...(webViewLink && { webViewLink }),\n    };\n\n    return { success: true, result };\n  } catch (e: unknown) {\n    const errorMessage = isDriveApiError(e) && e.message ? e.message : 'Unknown error';\n    const errorCode = isDriveApiError(e) && e.code ? String(e.code) : undefined;\n    logger.info('Failed to move file', { fileId, error: errorMessage });\n    return {\n      success: false,\n      error: {\n        fileId: fileId,\n        error: errorMessage,\n        ...(errorCode && { code: errorCode }),\n      },\n    };\n  }\n}\n\n/**\n * Move multiple files using batch requests\n */\nasync function moveBatchFiles(\n  drive: drive_v3.Drive,\n  fileIds: string[],\n  destinationFolderId: string,\n  returnOldParents: boolean,\n  _logger: Logger\n): Promise<{\n  moved: MoveResult[];\n  failed: FailedMove[];\n}> {\n  const moved: MoveResult[] = [];\n  const failed: FailedMove[] = [];\n\n  // First, fetch metadata for all files in batch\n  const metadataResults = await Promise.allSettled(\n    fileIds.map(async (fileId) => {\n      try {\n        const response = await drive.files.get({\n          fileId: fileId,\n          fields: 'id,name,parents,webViewLink',\n        });\n        const webViewLink = response.data.webViewLink as string | undefined;\n        return {\n          fileId: fileId,\n          name: (response.data.name as string | undefined) || fileId,\n          parents: (response.data.parents as string[] | undefined) || [],\n          ...(webViewLink && { webViewLink }),\n        };\n      } catch (e: unknown) {\n        const message = isDriveApiError(e) && e.message ? e.message : String(e);\n        throw new Error(`Failed to fetch metadata: ${message}`);\n      }\n    })\n  );\n\n  // Process metadata results\n  const filesToMove: Array<{\n    fileId: string;\n    name: string;\n    parents: string[];\n    webViewLink?: string;\n  }> = [];\n  for (let i = 0; i < metadataResults.length; i++) {\n    const result = metadataResults[i];\n    if (result && result.status === 'fulfilled') {\n      filesToMove.push(result.value);\n    } else if (result && result.status === 'rejected') {\n      const fileId = fileIds[i];\n      if (fileId) {\n        const errorCode = result.reason?.code ? String(result.reason.code) : undefined;\n        failed.push({\n          fileId: fileId,\n          error: result.reason?.message || 'Failed to fetch file metadata',\n          ...(errorCode && { code: errorCode }),\n        });\n      }\n    }\n  }\n\n  // Now move files in batch\n  const moveResults = await Promise.allSettled(\n    filesToMove.map(async (file) => {\n      try {\n        await drive.files.update({\n          fileId: file.fileId,\n          addParents: destinationFolderId,\n          removeParents: file.parents.join(','),\n          fields: 'id',\n        });\n        return {\n          fileId: file.fileId,\n          fileName: file.name,\n          oldParents: returnOldParents ? file.parents : [],\n          newParent: destinationFolderId,\n          ...(file.webViewLink && { webViewLink: file.webViewLink }),\n        };\n      } catch (e: unknown) {\n        const message = isDriveApiError(e) && e.message ? e.message : String(e);\n        throw new Error(`Failed to move: ${message}`);\n      }\n    })\n  );\n\n  // Process move results\n  for (let i = 0; i < moveResults.length; i++) {\n    const result = moveResults[i];\n    if (result && result.status === 'fulfilled') {\n      moved.push(result.value);\n    } else if (result && result.status === 'rejected') {\n      const file = filesToMove[i];\n      if (file) {\n        const errorCode = result.reason?.code ? String(result.reason.code) : undefined;\n        failed.push({\n          fileId: file.fileId,\n          error: result.reason?.message || 'Failed to move file',\n          ...(errorCode && { code: errorCode }),\n        });\n      }\n    }\n  }\n\n  return { moved, failed };\n}\n\nasync function handler({ fileIds, destinationFolderId, returnOldParents = true }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  const isBatch = Array.isArray(fileIds);\n  const fileIdArray = Array.isArray(fileIds) ? fileIds : [fileIds];\n\n  logger.info('drive.file.move called', {\n    fileCount: fileIdArray.length,\n    isBatch,\n    destinationFolderId,\n    returnOldParents,\n  });\n\n  try {\n    const drive = google.drive({ version: 'v3', auth: extra.authContext.auth });\n\n    let moved: MoveResult[] = [];\n    let failed: FailedMove[] = [];\n\n    if (isBatch && fileIdArray.length > 1) {\n      // Use batch API for multiple files\n      const batchResult = await moveBatchFiles(drive, fileIdArray, destinationFolderId, returnOldParents, logger);\n      moved = batchResult.moved;\n      failed = batchResult.failed;\n    } else {\n      // Single file operation\n      const fileId = fileIdArray[0];\n      if (fileId) {\n        const singleResult = await moveSingleFile(drive, fileId, destinationFolderId, returnOldParents, logger);\n        if (singleResult.success && singleResult.result) {\n          moved.push(singleResult.result);\n        } else if (singleResult.error) {\n          failed.push(singleResult.error);\n        }\n      }\n    }\n\n    logger.info('drive.file.move returning', {\n      totalRequested: fileIdArray.length,\n      totalMoved: moved.length,\n      totalFailed: failed.length,\n    });\n\n    const result: Output = {\n      type: 'success' as const,\n      moved,\n      ...(failed.length > 0 && { failed }),\n      totalRequested: fileIdArray.length,\n      totalMoved: moved.length,\n      totalFailed: failed.length,\n    };\n\n    return {\n      content: [\n        {\n          type: 'text' as const,\n          text: JSON.stringify(result),\n        },\n      ],\n      structuredContent: { result },\n    };\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    logger.error('drive.file.move error', { error: message });\n\n    // Throw McpError\n    throw new McpError(ErrorCode.InternalError, `Error moving files: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'file-move' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","ErrorCode","McpError","google","z","isDriveApiError","error","inputSchema","object","fileIds","union","string","min","array","max","describe","destinationFolderId","returnOldParents","boolean","optional","successBranchSchema","type","literal","moved","fileId","fileName","oldParents","newParent","webViewLink","failed","code","totalRequested","number","totalMoved","totalFailed","outputSchema","discriminatedUnion","config","title","description","result","moveSingleFile","drive","logger","fileMetadata","files","get","fields","data","parents","name","update","addParents","removeParents","join","success","e","errorMessage","message","errorCode","String","undefined","info","moveBatchFiles","_logger","metadataResults","Promise","allSettled","map","response","Error","filesToMove","i","length","status","push","value","reason","moveResults","file","handler","extra","isBatch","Array","isArray","fileIdArray","fileCount","version","auth","authContext","batchResult","singleResult","content","text","JSON","stringify","structuredContent","InternalError","stack","createTool"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/file-move.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport type { drive_v3 } from '@googleapis/drive';\nimport { drive as driveApi } from '@googleapis/drive';\nimport { type CallToolResult, ProtocolError, ProtocolErrorCode } from '@mcp-z/server';\nimport { z } from 'zod';\nimport { googleAuth } from '../../lib/google-auth.ts';\nimport type { Logger } from '../../types.ts';\n\n// Type guard for Google Drive API errors\ninterface DriveApiError {\n  message?: string;\n  code?: number | string;\n}\n\nfunction isDriveApiError(error: unknown): error is DriveApiError {\n  return typeof error === 'object' && error !== null && ('message' in error || 'code' in error);\n}\n\n// Types for results\ninterface MoveResult {\n  fileId: string;\n  fileName: string;\n  oldParents: string[];\n  newParent: string;\n  webViewLink?: string;\n}\n\ninterface FailedMove {\n  fileId: string;\n  error: string;\n  code?: string;\n}\n\nconst inputSchema = z.object({\n  fileIds: z.union([z.string().min(1), z.array(z.string().min(1)).min(1).max(100)]).describe('File or folder ID(s) to move. Single ID or array (max 100 for batch)'),\n  destinationFolderId: z.string().min(1).describe('Destination folder ID (use \"root\" for My Drive root)'),\n  returnOldParents: z.boolean().optional().describe('Include old parent IDs in response for manual undo (recommended: true)'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  moved: z\n    .array(\n      z.object({\n        fileId: z.string().describe('ID of the moved file'),\n        fileName: z.string().describe('Name of the moved file'),\n        oldParents: z.array(z.string()).describe('Previous parent folder IDs (for undo)'),\n        newParent: z.string().describe('New parent folder ID'),\n        webViewLink: z.string().optional().describe('URL to view the file'),\n      })\n    )\n    .describe('Successfully moved files'),\n  failed: z\n    .array(\n      z.object({\n        fileId: z.string().describe('ID of the file that failed to move'),\n        error: z.string().describe('Error message explaining the failure'),\n        code: z.string().optional().describe('API error code if available'),\n      })\n    )\n    .optional()\n    .describe('Files that failed to move'),\n  totalRequested: z.number().describe('Total number of files requested to move'),\n  totalMoved: z.number().describe('Number of files successfully moved'),\n  totalFailed: z.number().describe('Number of files that failed to move'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Move Files',\n  description: 'Move files/folders to destination folder. Returns oldParents for undo. Use \"root\" for My Drive root.',\n  inputSchema: inputSchema,\n  outputSchema: z.object({\n    result: outputSchema,\n  }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\n/**\n * Move a single file to a new parent folder\n */\nasync function moveSingleFile(\n  drive: drive_v3.Drive,\n  fileId: string,\n  destinationFolderId: string,\n  returnOldParents: boolean,\n  logger: Logger\n): Promise<{\n  success: boolean;\n  result?: MoveResult;\n  error?: FailedMove;\n}> {\n  try {\n    // Get current file metadata to get old parents\n    const fileMetadata = await drive.files.get({\n      fileId: fileId,\n      fields: 'id,name,parents,webViewLink',\n      supportsAllDrives: true,\n    });\n\n    const oldParents = (fileMetadata.data.parents as string[] | undefined) || [];\n    const fileName = (fileMetadata.data.name as string | undefined) || fileId;\n    const webViewLink = fileMetadata.data.webViewLink as string | undefined;\n\n    // Move file using addParents and removeParents\n    await drive.files.update({\n      fileId: fileId,\n      addParents: destinationFolderId,\n      removeParents: oldParents.join(','),\n      fields: 'id,name,parents,webViewLink',\n      supportsAllDrives: true,\n    });\n\n    const result: MoveResult = {\n      fileId: fileId,\n      fileName: fileName,\n      oldParents: returnOldParents ? oldParents : [],\n      newParent: destinationFolderId,\n      ...(webViewLink && { webViewLink }),\n    };\n\n    return { success: true, result };\n  } catch (e: unknown) {\n    const errorMessage = isDriveApiError(e) && e.message ? e.message : 'Unknown error';\n    const errorCode = isDriveApiError(e) && e.code ? String(e.code) : undefined;\n    logger.info('Failed to move file', { fileId, error: errorMessage });\n    return {\n      success: false,\n      error: {\n        fileId: fileId,\n        error: errorMessage,\n        ...(errorCode && { code: errorCode }),\n      },\n    };\n  }\n}\n\n/**\n * Move multiple files using batch requests\n */\nasync function moveBatchFiles(\n  drive: drive_v3.Drive,\n  fileIds: string[],\n  destinationFolderId: string,\n  returnOldParents: boolean,\n  _logger: Logger\n): Promise<{\n  moved: MoveResult[];\n  failed: FailedMove[];\n}> {\n  const moved: MoveResult[] = [];\n  const failed: FailedMove[] = [];\n\n  // First, fetch metadata for all files in batch\n  const metadataResults = await Promise.allSettled(\n    fileIds.map(async (fileId) => {\n      try {\n        const response = await drive.files.get({\n          fileId: fileId,\n          fields: 'id,name,parents,webViewLink',\n          supportsAllDrives: true,\n        });\n        const webViewLink = response.data.webViewLink as string | undefined;\n        return {\n          fileId: fileId,\n          name: (response.data.name as string | undefined) || fileId,\n          parents: (response.data.parents as string[] | undefined) || [],\n          ...(webViewLink && { webViewLink }),\n        };\n      } catch (e: unknown) {\n        const message = isDriveApiError(e) && e.message ? e.message : String(e);\n        throw new Error(`Failed to fetch metadata: ${message}`);\n      }\n    })\n  );\n\n  // Process metadata results\n  const filesToMove: Array<{\n    fileId: string;\n    name: string;\n    parents: string[];\n    webViewLink?: string;\n  }> = [];\n  for (let i = 0; i < metadataResults.length; i++) {\n    const result = metadataResults[i];\n    if (result && result.status === 'fulfilled') {\n      filesToMove.push(result.value);\n    } else if (result && result.status === 'rejected') {\n      const fileId = fileIds[i];\n      if (fileId) {\n        const errorCode = result.reason?.code ? String(result.reason.code) : undefined;\n        failed.push({\n          fileId: fileId,\n          error: result.reason?.message || 'Failed to fetch file metadata',\n          ...(errorCode && { code: errorCode }),\n        });\n      }\n    }\n  }\n\n  // Now move files in batch\n  const moveResults = await Promise.allSettled(\n    filesToMove.map(async (file) => {\n      try {\n        await drive.files.update({\n          fileId: file.fileId,\n          addParents: destinationFolderId,\n          removeParents: file.parents.join(','),\n          fields: 'id',\n          supportsAllDrives: true,\n        });\n        return {\n          fileId: file.fileId,\n          fileName: file.name,\n          oldParents: returnOldParents ? file.parents : [],\n          newParent: destinationFolderId,\n          ...(file.webViewLink && { webViewLink: file.webViewLink }),\n        };\n      } catch (e: unknown) {\n        const message = isDriveApiError(e) && e.message ? e.message : String(e);\n        throw new Error(`Failed to move: ${message}`);\n      }\n    })\n  );\n\n  // Process move results\n  for (let i = 0; i < moveResults.length; i++) {\n    const result = moveResults[i];\n    if (result && result.status === 'fulfilled') {\n      moved.push(result.value);\n    } else if (result && result.status === 'rejected') {\n      const file = filesToMove[i];\n      if (file) {\n        const errorCode = result.reason?.code ? String(result.reason.code) : undefined;\n        failed.push({\n          fileId: file.fileId,\n          error: result.reason?.message || 'Failed to move file',\n          ...(errorCode && { code: errorCode }),\n        });\n      }\n    }\n  }\n\n  return { moved, failed };\n}\n\nasync function handler({ fileIds, destinationFolderId, returnOldParents = true }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  const isBatch = Array.isArray(fileIds);\n  const fileIdArray = Array.isArray(fileIds) ? fileIds : [fileIds];\n\n  logger.info('drive.file.move called', {\n    fileCount: fileIdArray.length,\n    isBatch,\n    destinationFolderId,\n    returnOldParents,\n  });\n\n  try {\n    const drive = driveApi({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    let moved: MoveResult[] = [];\n    let failed: FailedMove[] = [];\n\n    if (isBatch && fileIdArray.length > 1) {\n      // Use batch API for multiple files\n      const batchResult = await moveBatchFiles(drive, fileIdArray, destinationFolderId, returnOldParents, logger);\n      moved = batchResult.moved;\n      failed = batchResult.failed;\n    } else {\n      // Single file operation\n      const fileId = fileIdArray[0];\n      if (fileId) {\n        const singleResult = await moveSingleFile(drive, fileId, destinationFolderId, returnOldParents, logger);\n        if (singleResult.success && singleResult.result) {\n          moved.push(singleResult.result);\n        } else if (singleResult.error) {\n          failed.push(singleResult.error);\n        }\n      }\n    }\n\n    logger.info('drive.file.move returning', {\n      totalRequested: fileIdArray.length,\n      totalMoved: moved.length,\n      totalFailed: failed.length,\n    });\n\n    const result: Output = {\n      type: 'success' as const,\n      moved,\n      ...(failed.length > 0 && { failed }),\n      totalRequested: fileIdArray.length,\n      totalMoved: moved.length,\n      totalFailed: failed.length,\n    };\n\n    return {\n      content: [\n        {\n          type: 'text' as const,\n          text: JSON.stringify(result),\n        },\n      ],\n      structuredContent: { result },\n    };\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    logger.error('drive.file.move error', { error: message });\n\n    // Throw ProtocolError\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error moving files: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'file-move' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","drive","driveApi","ProtocolError","ProtocolErrorCode","z","googleAuth","isDriveApiError","error","inputSchema","object","fileIds","union","string","min","array","max","describe","destinationFolderId","returnOldParents","boolean","optional","successBranchSchema","type","literal","moved","fileId","fileName","oldParents","newParent","webViewLink","failed","code","totalRequested","number","totalMoved","totalFailed","outputSchema","discriminatedUnion","config","title","description","result","moveSingleFile","logger","fileMetadata","files","get","fields","supportsAllDrives","data","parents","name","update","addParents","removeParents","join","success","e","errorMessage","message","errorCode","String","undefined","info","moveBatchFiles","_logger","metadataResults","Promise","allSettled","map","response","Error","filesToMove","i","length","status","push","value","reason","moveResults","file","handler","extra","isBatch","Array","isArray","fileIdArray","fileCount","version","auth","authContext","batchResult","singleResult","content","text","JSON","stringify","structuredContent","InternalError","stack","createTool"],"mappings":"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"}

package/dist/esm/mcp/tools/file-upload.d.ts

@@ -1,5 +1,5 @@
 import type { EnrichedExtra } from '@mcp-z/oauth-google';
-import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import type { CallToolResult } from '@mcp-z/server';
 import { z } from 'zod';
 declare const inputSchema: z.ZodObject<{
     sourceUri: z.ZodString;

package/dist/esm/mcp/tools/file-upload.js

@@ -1,9 +1,10 @@
 import { schemas } from '@mcp-z/oauth-google';
 const { AuthRequiredBranchSchema } = schemas;
-import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
-import { google } from 'googleapis';
+import { drive as driveApi } from '@googleapis/drive';
+import { ProtocolError, ProtocolErrorCode } from '@mcp-z/server';
 import { z } from 'zod';
 import { getFileReadStream, guessMimeType } from '../../lib/file-streaming.js';
+import { googleAuth } from '../../lib/google-auth.js';
 const inputSchema = z.object({
     sourceUri: z.string().trim().min(1).describe('File URI to upload (file://, http://, https://)'),
     name: z.string().trim().min(1).optional().describe('File name in Drive, including extension (defaults to the source file name)'),
@@ -48,9 +49,9 @@ async function handler({ sourceUri, name, mimeType, parentId, description }, ext
     });
     try {
         var _res_id, _res_name, _res_mimeType, _res_size, _source_size, _res_webViewLink;
-        const drive = google.drive({
+        const drive = driveApi({
             version: 'v3',
-            auth: extra.authContext.auth
+            auth: googleAuth(extra.authContext.auth)
         });
         // Stream source content directly from URI (no temp files)
         const source = await getFileReadStream(sourceUri);
@@ -94,7 +95,8 @@ async function handler({ sourceUri, name, mimeType, parentId, description }, ext
                 try {
                     const parentResponse = await drive.files.get({
                         fileId: actualParentId,
-                        fields: 'name'
+                        fields: 'name',
+                        supportsAllDrives: true
                     });
                     parentName = parentResponse.data.name || actualParentId;
                 } catch (e) {
@@ -148,8 +150,8 @@ async function handler({ sourceUri, name, mimeType, parentId, description }, ext
         logger.error('drive.file.upload error', {
             error: message
         });
-        // Throw McpError for proper MCP error handling
-        throw new McpError(ErrorCode.InternalError, `Error uploading file: ${message}`, {
+        // Throw ProtocolError for proper MCP error handling
+        throw new ProtocolError(ProtocolErrorCode.InternalError, `Error uploading file: ${message}`, {
             stack: error instanceof Error ? error.stack : undefined
         });
     }

package/dist/esm/mcp/tools/file-upload.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/file-upload.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';\nimport { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport { getFileReadStream, guessMimeType } from '../../lib/file-streaming.ts';\n\nconst inputSchema = z.object({\n  sourceUri: z.string().trim().min(1).describe('File URI to upload (file://, http://, https://)'),\n  name: z.string().trim().min(1).optional().describe('File name in Drive, including extension (defaults to the source file name)'),\n  mimeType: z.string().trim().min(1).optional().describe('MIME type, e.g. application/pdf (defaults to the Content-Type header or detection from the file extension)'),\n  parentId: z.string().optional().describe('Parent folder ID (omit to upload to My Drive root)'),\n  description: z.string().optional().describe('Description to store in the file metadata'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  operationSummary: z.string().describe('Summary of the file upload operation'),\n  itemsProcessed: z.number().describe('Total items attempted (always 1 for single file)'),\n  itemsChanged: z.number().describe('Successfully uploaded files (always 1 on success)'),\n  completedAt: z.string().describe('ISO datetime when operation completed'),\n  id: z.string().describe('ID of the uploaded file'),\n  name: z.string().describe('Name of the uploaded file'),\n  mimeType: z.string().describe('MIME type of the uploaded file'),\n  size: z.string().describe('Size of the uploaded file in bytes'),\n  webViewLink: z.string().describe('URL to view the file in Drive'),\n  parentId: z.string().optional().describe('ID of the parent folder'),\n  parentName: z.string().optional().describe('Name of the parent folder'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Upload File',\n  description: 'Upload a file to Google Drive from a file:// or http(s):// URI. Content is streamed from the source (no temp files) in a single multipart request. Returns file ID for use in other operations.',\n  inputSchema,\n  outputSchema: z.object({\n    result: outputSchema,\n  }),\n} as const;\n\n// Export types for strong typing in tests\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ sourceUri, name, mimeType, parentId, description }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.file.upload called', {\n    sourceUri,\n    name: name || 'auto',\n    parentId: parentId || 'root',\n  });\n\n  try {\n    const drive = google.drive({ version: 'v3', auth: extra.authContext.auth });\n\n    // Stream source content directly from URI (no temp files)\n    const source = await getFileReadStream(sourceUri);\n    const finalName = name || source.fileName;\n    const finalMimeType = mimeType || source.contentType || guessMimeType(finalName);\n\n    // Create the file with streamed content (multipart upload; the client pipes the\n    // stream body through without buffering it into memory)\n    const response = await drive.files.create({\n      requestBody: {\n        name: finalName,\n        mimeType: finalMimeType,\n        parents: parentId ? [parentId] : null,\n        ...(description && { description }),\n      },\n      media: { mimeType: finalMimeType, body: source.stream },\n      supportsAllDrives: true,\n      fields: 'id,name,mimeType,size,webViewLink,parents',\n    });\n\n    const res = response.data;\n    const id = res.id ?? '';\n    const resultName = res.name ?? finalName;\n    const resultMimeType = res.mimeType ?? finalMimeType;\n    const size = res.size ?? String(source.size ?? 0);\n    const webViewLink = res.webViewLink ?? '';\n    const parents = (res.parents as string[] | undefined) || [];\n\n    // Fetch parent name if parentId was provided\n    let parentName: string | undefined;\n    let actualParentId: string | undefined;\n\n    if (parents.length > 0) {\n      actualParentId = parents[0];\n\n      if (actualParentId === 'root') {\n        parentName = 'My Drive';\n      } else if (actualParentId) {\n        try {\n          const parentResponse = await drive.files.get({\n            fileId: actualParentId,\n            fields: 'name',\n          });\n          parentName = (parentResponse.data.name as string | undefined) || actualParentId;\n        } catch (e) {\n          logger.info('Failed to fetch parent name', {\n            parentId: actualParentId,\n            error: e,\n          });\n          parentName = actualParentId; // Fallback to ID\n        }\n      }\n    }\n\n    const locationSummary = parentName ? ` in \"${parentName}\"` : ' in My Drive';\n\n    logger.info('drive.file.upload success', {\n      id,\n      name: resultName,\n      size,\n      parentId: actualParentId,\n    });\n\n    // Build result object with operation metadata\n    const result: Output = {\n      type: 'success' as const,\n      operationSummary: `Uploaded \"${resultName}\"${locationSummary}`,\n      itemsProcessed: 1,\n      itemsChanged: 1,\n      completedAt: new Date().toISOString(),\n      id,\n      name: resultName,\n      mimeType: resultMimeType,\n      size,\n      webViewLink,\n      ...(actualParentId && { parentId: actualParentId }),\n      ...(parentName && { parentName }),\n    };\n\n    return {\n      content: [\n        {\n          type: 'text' as const,\n          text: JSON.stringify(result),\n        },\n      ],\n      structuredContent: { result },\n    };\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    logger.error('drive.file.upload error', { error: message });\n\n    // Throw McpError for proper MCP error handling\n    throw new McpError(ErrorCode.InternalError, `Error uploading file: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'file-upload' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","ErrorCode","McpError","google","z","getFileReadStream","guessMimeType","inputSchema","object","sourceUri","string","trim","min","describe","name","optional","mimeType","parentId","description","successBranchSchema","type","literal","operationSummary","itemsProcessed","number","itemsChanged","completedAt","id","size","webViewLink","parentName","outputSchema","discriminatedUnion","config","title","result","handler","extra","logger","info","res","source","drive","version","auth","authContext","finalName","fileName","finalMimeType","contentType","response","files","create","requestBody","parents","media","body","stream","supportsAllDrives","fields","data","resultName","resultMimeType","String","actualParentId","length","parentResponse","get","fileId","e","error","locationSummary","Date","toISOString","content","text","JSON","stringify","structuredContent","message","Error","InternalError","stack","undefined","createTool"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/file-upload.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { drive as driveApi } from '@googleapis/drive';\nimport type { CallToolResult } from '@mcp-z/server';\nimport { ProtocolError, ProtocolErrorCode } from '@mcp-z/server';\nimport { z } from 'zod';\nimport { getFileReadStream, guessMimeType } from '../../lib/file-streaming.ts';\nimport { googleAuth } from '../../lib/google-auth.ts';\n\nconst inputSchema = z.object({\n  sourceUri: z.string().trim().min(1).describe('File URI to upload (file://, http://, https://)'),\n  name: z.string().trim().min(1).optional().describe('File name in Drive, including extension (defaults to the source file name)'),\n  mimeType: z.string().trim().min(1).optional().describe('MIME type, e.g. application/pdf (defaults to the Content-Type header or detection from the file extension)'),\n  parentId: z.string().optional().describe('Parent folder ID (omit to upload to My Drive root)'),\n  description: z.string().optional().describe('Description to store in the file metadata'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  operationSummary: z.string().describe('Summary of the file upload operation'),\n  itemsProcessed: z.number().describe('Total items attempted (always 1 for single file)'),\n  itemsChanged: z.number().describe('Successfully uploaded files (always 1 on success)'),\n  completedAt: z.string().describe('ISO datetime when operation completed'),\n  id: z.string().describe('ID of the uploaded file'),\n  name: z.string().describe('Name of the uploaded file'),\n  mimeType: z.string().describe('MIME type of the uploaded file'),\n  size: z.string().describe('Size of the uploaded file in bytes'),\n  webViewLink: z.string().describe('URL to view the file in Drive'),\n  parentId: z.string().optional().describe('ID of the parent folder'),\n  parentName: z.string().optional().describe('Name of the parent folder'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Upload File',\n  description: 'Upload a file to Google Drive from a file:// or http(s):// URI. Content is streamed from the source (no temp files) in a single multipart request. Returns file ID for use in other operations.',\n  inputSchema,\n  outputSchema: z.object({\n    result: outputSchema,\n  }),\n} as const;\n\n// Export types for strong typing in tests\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ sourceUri, name, mimeType, parentId, description }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.file.upload called', {\n    sourceUri,\n    name: name || 'auto',\n    parentId: parentId || 'root',\n  });\n\n  try {\n    const drive = driveApi({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    // Stream source content directly from URI (no temp files)\n    const source = await getFileReadStream(sourceUri);\n    const finalName = name || source.fileName;\n    const finalMimeType = mimeType || source.contentType || guessMimeType(finalName);\n\n    // Create the file with streamed content (multipart upload; the client pipes the\n    // stream body through without buffering it into memory)\n    const response = await drive.files.create({\n      requestBody: {\n        name: finalName,\n        mimeType: finalMimeType,\n        parents: parentId ? [parentId] : null,\n        ...(description && { description }),\n      },\n      media: { mimeType: finalMimeType, body: source.stream },\n      supportsAllDrives: true,\n      fields: 'id,name,mimeType,size,webViewLink,parents',\n    });\n\n    const res = response.data;\n    const id = res.id ?? '';\n    const resultName = res.name ?? finalName;\n    const resultMimeType = res.mimeType ?? finalMimeType;\n    const size = res.size ?? String(source.size ?? 0);\n    const webViewLink = res.webViewLink ?? '';\n    const parents = (res.parents as string[] | undefined) || [];\n\n    // Fetch parent name if parentId was provided\n    let parentName: string | undefined;\n    let actualParentId: string | undefined;\n\n    if (parents.length > 0) {\n      actualParentId = parents[0];\n\n      if (actualParentId === 'root') {\n        parentName = 'My Drive';\n      } else if (actualParentId) {\n        try {\n          const parentResponse = await drive.files.get({\n            fileId: actualParentId,\n            fields: 'name',\n            supportsAllDrives: true,\n          });\n          parentName = (parentResponse.data.name as string | undefined) || actualParentId;\n        } catch (e) {\n          logger.info('Failed to fetch parent name', {\n            parentId: actualParentId,\n            error: e,\n          });\n          parentName = actualParentId; // Fallback to ID\n        }\n      }\n    }\n\n    const locationSummary = parentName ? ` in \"${parentName}\"` : ' in My Drive';\n\n    logger.info('drive.file.upload success', {\n      id,\n      name: resultName,\n      size,\n      parentId: actualParentId,\n    });\n\n    // Build result object with operation metadata\n    const result: Output = {\n      type: 'success' as const,\n      operationSummary: `Uploaded \"${resultName}\"${locationSummary}`,\n      itemsProcessed: 1,\n      itemsChanged: 1,\n      completedAt: new Date().toISOString(),\n      id,\n      name: resultName,\n      mimeType: resultMimeType,\n      size,\n      webViewLink,\n      ...(actualParentId && { parentId: actualParentId }),\n      ...(parentName && { parentName }),\n    };\n\n    return {\n      content: [\n        {\n          type: 'text' as const,\n          text: JSON.stringify(result),\n        },\n      ],\n      structuredContent: { result },\n    };\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    logger.error('drive.file.upload error', { error: message });\n\n    // Throw ProtocolError for proper MCP error handling\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error uploading file: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'file-upload' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","drive","driveApi","ProtocolError","ProtocolErrorCode","z","getFileReadStream","guessMimeType","googleAuth","inputSchema","object","sourceUri","string","trim","min","describe","name","optional","mimeType","parentId","description","successBranchSchema","type","literal","operationSummary","itemsProcessed","number","itemsChanged","completedAt","id","size","webViewLink","parentName","outputSchema","discriminatedUnion","config","title","result","handler","extra","logger","info","res","source","version","auth","authContext","finalName","fileName","finalMimeType","contentType","response","files","create","requestBody","parents","media","body","stream","supportsAllDrives","fields","data","resultName","resultMimeType","String","actualParentId","length","parentResponse","get","fileId","e","error","locationSummary","Date","toISOString","content","text","JSON","stringify","structuredContent","message","Error","InternalError","stack","undefined","createTool"],"mappings":"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"}

package/dist/esm/mcp/tools/files-search.d.ts

@@ -1,5 +1,5 @@
 import type { EnrichedExtra } from '@mcp-z/oauth-google';
-import { type CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import { type CallToolResult } from '@mcp-z/server';
 import { z } from 'zod';
 declare const inputSchema: z.ZodObject<{
     shape: z.ZodDefault<z.ZodOptional<z.ZodEnum<{

package/dist/esm/mcp/tools/files-search.js

@@ -1,9 +1,9 @@
 import { schemas } from '@mcp-z/oauth-google';
 const { AuthRequiredBranchSchema } = schemas;
-import { createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, parseFields, toColumnarFormat } from '@mcp-z/server';
-import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
-import { google } from 'googleapis';
+import { drive as driveApi } from '@googleapis/drive';
+import { createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, ProtocolError, ProtocolErrorCode, parseFields, toColumnarFormat } from '@mcp-z/server';
 import { z } from 'zod';
+import { googleAuth } from '../../lib/google-auth.js';
 import { toDriveQuery } from '../../lib/query-builder.js';
 import { DRIVE_FILE_COMMON_PATTERNS, DRIVE_FILE_FIELD_DESCRIPTIONS, DRIVE_FILE_FIELDS, DriveFileSchema, DriveQueryParameterSchema, parseDriveQueryParameter } from '../../schemas/index.js';
 const inputSchema = z.object({
@@ -65,9 +65,9 @@ async function handler({ query, pageSize = 50, pageToken, fields, shape = 'array
             pageToken: pageToken ? '[provided]' : undefined,
             fields: fields || 'all'
         });
-        const drive = google.drive({
+        const drive = driveApi({
             version: 'v3',
-            auth: extra.authContext.auth
+            auth: googleAuth(extra.authContext.auth)
         });
         // Handle query parameter
         let qStr;
@@ -84,7 +84,12 @@ async function handler({ query, pageSize = 50, pageToken, fields, shape = 'array
         const listOptions = {
             pageSize: validPageSize,
             fields: 'files(id,name,mimeType,webViewLink,modifiedTime,parents,shared,starred,owners),nextPageToken',
-            orderBy: 'modifiedTime desc'
+            orderBy: 'modifiedTime desc',
+            // All three are load-bearing for shared drives: the default `user` corpus omits
+            // them, and Drive rejects an `allDrives` corpus unless both flags are set too.
+            corpora: 'allDrives',
+            supportsAllDrives: true,
+            includeItemsFromAllDrives: true
         };
         if (qStr.trim().length > 0) {
             listOptions.q = qStr;
@@ -114,7 +119,8 @@ async function handler({ query, pageSize = 50, pageToken, fields, shape = 'array
                 try {
                     const parentRes = await drive.files.get({
                         fileId: parentId,
-                        fields: 'id,name'
+                        fields: 'id,name',
+                        supportsAllDrives: true
                     });
                     const parentName = parentRes.data.name || parentId;
                     parentNameMap.set(parentId, parentName);
@@ -212,8 +218,8 @@ async function handler({ query, pageSize = 50, pageToken, fields, shape = 'array
         logger.error('drive.files-search error', {
             error: message
         });
-        // Throw McpError for all errors so callers can see Drive validation details
-        throw new McpError(ErrorCode.InternalError, `Error searching files: ${message}`, {
+        // Throw ProtocolError for all errors so callers can see Drive validation details
+        throw new ProtocolError(ProtocolErrorCode.InternalError, `Error searching files: ${message}`, {
             stack: error instanceof Error ? error.stack : undefined
         });
     }