@mcp-z/mcp-drive 2.1.0 → 2.2.0

package/dist/cjs/mcp/tools/folder-create.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _oauthgoogle = require("@mcp-z/oauth-google");
+var _drive = require("@googleapis/drive");
 var _server = require("@mcp-z/server");
-var _googleapis = require("googleapis");
 var _zod = require("zod");
 var _googleauthts = require("../../lib/google-auth.js");
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -221,7 +221,7 @@ function handler(_0, _1) {
                         ,
                         9
                     ]);
-                    drive = _googleapis.google.drive({
+                    drive = (0, _drive.drive)({
                         version: 'v3',
                         auth: (0, _googleauthts.googleAuth)(extra.authContext.auth)
                     });

package/dist/cjs/mcp/tools/folder-create.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/folder-create.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 '@mcp-z/server';\nimport { ProtocolError, ProtocolErrorCode } from '@mcp-z/server';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport { googleAuth } from '../../lib/google-auth.ts';\n\nconst inputSchema = z.object({\n  name: z.string().trim().min(1).describe('Name for the new folder'),\n  parentId: z.string().optional().describe('Parent folder ID (omit to create in My Drive root)'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  operationSummary: z.string().describe('Summary of the folder creation operation'),\n  itemsProcessed: z.number().describe('Total items attempted (always 1 for single folder)'),\n  itemsChanged: z.number().describe('Successfully created folders (always 1 on success)'),\n  completedAt: z.string().describe('ISO datetime when operation completed'),\n  id: z.string().describe('ID of the created folder'),\n  name: z.string().describe('Name of the created folder'),\n  webViewLink: z.string().describe('URL to view the folder 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: 'Create Folder',\n  description: 'Create a new folder in Google Drive. Returns folder 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({ name: folderName, parentId }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.folder.create called', {\n    name: folderName,\n    parentId: parentId || 'root',\n  });\n\n  try {\n    const drive = google.drive({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    // Folder MIME type constant (consistent with folder-search.ts)\n    const folderMimeType = 'application/vnd.google-apps.folder';\n\n    // Create the folder\n    const response = await drive.files.create({\n      requestBody: {\n        name: folderName,\n        mimeType: folderMimeType,\n        parents: parentId ? [parentId] : null,\n      },\n      fields: 'id,name,webViewLink,parents',\n    });\n\n    const res = response.data;\n    const id = res.id ?? '';\n    const name = res.name ?? folderName;\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.folder.create success', {\n      id,\n      name,\n      parentId: actualParentId,\n    });\n\n    // Build result object with operation metadata\n    const result: Output = {\n      type: 'success' as const,\n      operationSummary: `Created folder \"${name}\"${locationSummary}`,\n      itemsProcessed: 1,\n      itemsChanged: 1,\n      completedAt: new Date().toISOString(),\n      id,\n      name,\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.folder.create error', { error: message });\n\n    // Throw ProtocolError for proper MCP error handling\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error creating folder: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'folder-create' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["createTool","AuthRequiredBranchSchema","schemas","inputSchema","z","object","name","string","trim","min","describe","parentId","optional","successBranchSchema","type","literal","operationSummary","itemsProcessed","number","itemsChanged","completedAt","id","webViewLink","parentName","outputSchema","discriminatedUnion","config","title","description","result","handler","extra","folderName","logger","res","drive","folderMimeType","response","parents","actualParentId","parentResponse","e","locationSummary","error","message","info","google","version","auth","googleAuth","authContext","files","create","requestBody","mimeType","fields","data","length","get","fileId","Date","toISOString","content","text","JSON","stringify","structuredContent","Error","String","ProtocolError","ProtocolErrorCode","InternalError","stack","undefined"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/folder-create.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 { googleAuth } from '../../lib/google-auth.ts';\n\nconst inputSchema = z.object({\n  name: z.string().trim().min(1).describe('Name for the new folder'),\n  parentId: z.string().optional().describe('Parent folder ID (omit to create in My Drive root)'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  operationSummary: z.string().describe('Summary of the folder creation operation'),\n  itemsProcessed: z.number().describe('Total items attempted (always 1 for single folder)'),\n  itemsChanged: z.number().describe('Successfully created folders (always 1 on success)'),\n  completedAt: z.string().describe('ISO datetime when operation completed'),\n  id: z.string().describe('ID of the created folder'),\n  name: z.string().describe('Name of the created folder'),\n  webViewLink: z.string().describe('URL to view the folder 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: 'Create Folder',\n  description: 'Create a new folder in Google Drive. Returns folder 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({ name: folderName, parentId }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.folder.create called', {\n    name: folderName,\n    parentId: parentId || 'root',\n  });\n\n  try {\n    const drive = driveApi({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    // Folder MIME type constant (consistent with folder-search.ts)\n    const folderMimeType = 'application/vnd.google-apps.folder';\n\n    // Create the folder\n    const response = await drive.files.create({\n      requestBody: {\n        name: folderName,\n        mimeType: folderMimeType,\n        parents: parentId ? [parentId] : null,\n      },\n      fields: 'id,name,webViewLink,parents',\n    });\n\n    const res = response.data;\n    const id = res.id ?? '';\n    const name = res.name ?? folderName;\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.folder.create success', {\n      id,\n      name,\n      parentId: actualParentId,\n    });\n\n    // Build result object with operation metadata\n    const result: Output = {\n      type: 'success' as const,\n      operationSummary: `Created folder \"${name}\"${locationSummary}`,\n      itemsProcessed: 1,\n      itemsChanged: 1,\n      completedAt: new Date().toISOString(),\n      id,\n      name,\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.folder.create error', { error: message });\n\n    // Throw ProtocolError for proper MCP error handling\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error creating folder: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'folder-create' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["createTool","AuthRequiredBranchSchema","schemas","inputSchema","z","object","name","string","trim","min","describe","parentId","optional","successBranchSchema","type","literal","operationSummary","itemsProcessed","number","itemsChanged","completedAt","id","webViewLink","parentName","outputSchema","discriminatedUnion","config","title","description","result","handler","extra","folderName","logger","res","drive","folderMimeType","response","parents","actualParentId","parentResponse","e","locationSummary","error","message","info","driveApi","version","auth","googleAuth","authContext","files","create","requestBody","mimeType","fields","data","length","get","fileId","Date","toISOString","content","text","JSON","stringify","structuredContent","Error","String","ProtocolError","ProtocolErrorCode","InternalError","stack","undefined"],"mappings":"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"}

package/dist/cjs/mcp/tools/folder-path.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _oauthgoogle = require("@mcp-z/oauth-google");
+var _drive = require("@googleapis/drive");
 var _server = require("@mcp-z/server");
-var _googleapis = require("googleapis");
 var _zod = require("zod");
 var _googleauthts = require("../../lib/google-auth.js");
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -303,7 +303,7 @@ function handler(_0, _1) {
                         ,
                         4
                     ]);
-                    drive = _googleapis.google.drive({
+                    drive = (0, _drive.drive)({
                         version: 'v3',
                         auth: (0, _googleauthts.googleAuth)(extra.authContext.auth)
                     });

package/dist/cjs/mcp/tools/folder-path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/folder-path.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, ProtocolError, ProtocolErrorCode } from '@mcp-z/server';\nimport type { drive_v3 } from 'googleapis';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport { googleAuth } from '../../lib/google-auth.ts';\nimport type { Logger } from '../../types.ts';\n\nconst inputSchema = z.object({\n  folderId: z.string().min(1).describe('Folder ID to get path for (or \"root\")'),\n});\n\n// Success branch schema - uses items: for consistency with standard vocabulary\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  path: z.string().describe('Full path from root (e.g., /Work/Projects/2024)'),\n  items: z\n    .array(\n      z.object({\n        id: z.string().describe('Folder ID'),\n        name: z.string().describe('Folder name'),\n      })\n    )\n    .describe('Path items from root to target folder'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Get Folder Path',\n  description: 'Get full path from folder to root. Returns human-readable path and items with IDs.',\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 * Resolves the full path for a folder by walking up the parent chain.\n * Returns both the path string and structured segments with IDs and names.\n */\nasync function resolveFolderPath(drive: drive_v3.Drive, folderId: string, logger: Logger): Promise<{ path: string; segments: Array<{ id: string; name: string }> }> {\n  // Handle root specially\n  if (folderId === 'root') {\n    return {\n      path: '/',\n      segments: [{ id: 'root', name: 'My Drive' }],\n    };\n  }\n\n  const segments: Array<{ id: string; name: string }> = [];\n  let currentId = folderId;\n  const visited = new Set<string>();\n\n  // Walk up the parent chain\n  while (currentId && currentId !== 'root') {\n    // Prevent infinite loops\n    if (visited.has(currentId)) {\n      logger.info('Circular folder reference detected', {\n        folderId: currentId,\n      });\n      break;\n    }\n    visited.add(currentId);\n\n    // Fetch folder metadata\n    try {\n      const response = await drive.files.get({\n        fileId: currentId,\n        fields: 'id,name,parents',\n      });\n\n      const id = response.data.id as string;\n      const name = (response.data.name as string) || id;\n      const parents = response.data.parents as string[] | undefined;\n\n      // Add to segments at beginning (we're walking from child to root)\n      segments.unshift({ id, name });\n\n      // Move to parent\n      currentId = (parents && parents.length > 0 ? parents[0] : '') || '';\n    } catch (e) {\n      logger.info('Failed to resolve folder path', {\n        folderId: currentId,\n        error: e,\n      });\n      break;\n    }\n  }\n\n  // Add root if we reached it\n  if (currentId === 'root') {\n    segments.unshift({ id: 'root', name: 'My Drive' });\n  }\n\n  // Build path string\n  const pathParts = segments.slice(1).map((seg) => seg.name); // Skip root\n  const path = pathParts.length > 0 ? `/${pathParts.join('/')}` : '/';\n\n  return { path, segments };\n}\n\nasync function handler({ folderId }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.folder.path called', { folderId });\n\n  try {\n    const drive = google.drive({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    const pathResult = await resolveFolderPath(drive, folderId, logger);\n\n    logger.info('drive.folder.path returning', {\n      path: pathResult.path,\n      segmentCount: pathResult.segments.length,\n    });\n\n    const result: Output = {\n      type: 'success' as const,\n      path: pathResult.path,\n      items: pathResult.segments,\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.folder.path error', { error: message });\n\n    // Throw ProtocolError\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error getting folder path: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'folder-path' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["createTool","AuthRequiredBranchSchema","schemas","inputSchema","z","object","folderId","string","min","describe","successBranchSchema","type","literal","path","items","array","id","name","outputSchema","discriminatedUnion","config","title","description","result","resolveFolderPath","drive","logger","segments","currentId","visited","response","parents","e","pathParts","Set","has","info","add","files","get","fileId","fields","data","unshift","length","error","slice","map","seg","join","handler","extra","pathResult","message","google","version","auth","googleAuth","authContext","segmentCount","content","text","JSON","stringify","structuredContent","Error","String","ProtocolError","ProtocolErrorCode","InternalError","stack","undefined"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/folder-path.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\nconst inputSchema = z.object({\n  folderId: z.string().min(1).describe('Folder ID to get path for (or \"root\")'),\n});\n\n// Success branch schema - uses items: for consistency with standard vocabulary\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  path: z.string().describe('Full path from root (e.g., /Work/Projects/2024)'),\n  items: z\n    .array(\n      z.object({\n        id: z.string().describe('Folder ID'),\n        name: z.string().describe('Folder name'),\n      })\n    )\n    .describe('Path items from root to target folder'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Get Folder Path',\n  description: 'Get full path from folder to root. Returns human-readable path and items with IDs.',\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 * Resolves the full path for a folder by walking up the parent chain.\n * Returns both the path string and structured segments with IDs and names.\n */\nasync function resolveFolderPath(drive: drive_v3.Drive, folderId: string, logger: Logger): Promise<{ path: string; segments: Array<{ id: string; name: string }> }> {\n  // Handle root specially\n  if (folderId === 'root') {\n    return {\n      path: '/',\n      segments: [{ id: 'root', name: 'My Drive' }],\n    };\n  }\n\n  const segments: Array<{ id: string; name: string }> = [];\n  let currentId = folderId;\n  const visited = new Set<string>();\n\n  // Walk up the parent chain\n  while (currentId && currentId !== 'root') {\n    // Prevent infinite loops\n    if (visited.has(currentId)) {\n      logger.info('Circular folder reference detected', {\n        folderId: currentId,\n      });\n      break;\n    }\n    visited.add(currentId);\n\n    // Fetch folder metadata\n    try {\n      const response = await drive.files.get({\n        fileId: currentId,\n        fields: 'id,name,parents',\n      });\n\n      const id = response.data.id as string;\n      const name = (response.data.name as string) || id;\n      const parents = response.data.parents as string[] | undefined;\n\n      // Add to segments at beginning (we're walking from child to root)\n      segments.unshift({ id, name });\n\n      // Move to parent\n      currentId = (parents && parents.length > 0 ? parents[0] : '') || '';\n    } catch (e) {\n      logger.info('Failed to resolve folder path', {\n        folderId: currentId,\n        error: e,\n      });\n      break;\n    }\n  }\n\n  // Add root if we reached it\n  if (currentId === 'root') {\n    segments.unshift({ id: 'root', name: 'My Drive' });\n  }\n\n  // Build path string\n  const pathParts = segments.slice(1).map((seg) => seg.name); // Skip root\n  const path = pathParts.length > 0 ? `/${pathParts.join('/')}` : '/';\n\n  return { path, segments };\n}\n\nasync function handler({ folderId }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.folder.path called', { folderId });\n\n  try {\n    const drive = driveApi({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    const pathResult = await resolveFolderPath(drive, folderId, logger);\n\n    logger.info('drive.folder.path returning', {\n      path: pathResult.path,\n      segmentCount: pathResult.segments.length,\n    });\n\n    const result: Output = {\n      type: 'success' as const,\n      path: pathResult.path,\n      items: pathResult.segments,\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.folder.path error', { error: message });\n\n    // Throw ProtocolError\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error getting folder path: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'folder-path' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["createTool","AuthRequiredBranchSchema","schemas","inputSchema","z","object","folderId","string","min","describe","successBranchSchema","type","literal","path","items","array","id","name","outputSchema","discriminatedUnion","config","title","description","result","resolveFolderPath","drive","logger","segments","currentId","visited","response","parents","e","pathParts","Set","has","info","add","files","get","fileId","fields","data","unshift","length","error","slice","map","seg","join","handler","extra","pathResult","message","driveApi","version","auth","googleAuth","authContext","segmentCount","content","text","JSON","stringify","structuredContent","Error","String","ProtocolError","ProtocolErrorCode","InternalError","stack","undefined"],"mappings":"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"}

package/dist/cjs/mcp/tools/folder-search.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _oauthgoogle = require("@mcp-z/oauth-google");
+var _drive = require("@googleapis/drive");
 var _server = require("@mcp-z/server");
-var _googleapis = require("googleapis");
 var _zod = require("zod");
 var _googleauthts = require("../../lib/google-auth.js");
 var _querybuilderts = require("../../lib/query-builder.js");
@@ -434,7 +434,7 @@ function handler(_0, _1) {
                         pageToken: pageToken ? '[provided]' : undefined,
                         fields: fields || 'all'
                     });
-                    drive = _googleapis.google.drive({
+                    drive = (0, _drive.drive)({
                         version: 'v3',
                         auth: (0, _googleauthts.googleAuth)(extra.authContext.auth)
                     });

package/dist/cjs/mcp/tools/folder-search.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/folder-search.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, createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, ProtocolError, ProtocolErrorCode, parseFields, toColumnarFormat } from '@mcp-z/server';\nimport type { drive_v3 } from 'googleapis';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport { googleAuth } from '../../lib/google-auth.ts';\nimport { toDriveQuery } from '../../lib/query-builder.ts';\nimport { DRIVE_FILE_COMMON_PATTERNS, DRIVE_FILE_FIELD_DESCRIPTIONS, DRIVE_FILE_FIELDS, type DriveFile, DriveFileSchema, DriveQueryParameterSchema, parseDriveQueryParameter } from '../../schemas/index.ts';\nimport type { Logger } from '../../types.ts';\n\nconst inputSchema = z.object({\n  query: DriveQueryParameterSchema.optional().describe('Structured Drive query object or JSON string. Use rawDriveQuery for raw Drive syntax.'),\n  fields: createFieldsSchema({\n    availableFields: [...DRIVE_FILE_FIELDS, 'path'] as const,\n    fieldDescriptions: {\n      ...DRIVE_FILE_FIELD_DESCRIPTIONS,\n      path: 'Full folder path like /Work/Projects (requires resolvePaths=true)',\n    },\n    commonPatterns: DRIVE_FILE_COMMON_PATTERNS,\n    resourceName: 'Drive folder',\n  }),\n  resolvePaths: z.boolean().optional().describe('Resolve full folder paths like /Work/Projects/2024 (requires additional API calls per result)'),\n  ...createPaginationSchema({\n    defaultPageSize: 50,\n    maxPageSize: 1000,\n    provider: 'drive',\n  }).shape,\n  shape: createShapeSchema(),\n});\n\n// Success branch schemas for different shapes\nconst successObjectsBranchSchema = z.object({\n  type: z.literal('success'),\n  shape: z.literal('objects'),\n  items: z.array(DriveFileSchema.extend({ path: z.string().optional().describe('Full folder path (if resolvePaths=true)') })).describe('Matching Drive folders'),\n  count: z.number().describe('Number of folders in this page'),\n  nextPageToken: z.string().optional().describe('Token for fetching next page of results'),\n});\n\nconst successArraysBranchSchema = z.object({\n  type: z.literal('success'),\n  shape: z.literal('arrays'),\n  columns: z.array(z.string()).describe('Column names in canonical order'),\n  rows: z.array(z.array(z.unknown())).describe('Row data matching column order'),\n  count: z.number().describe('Number of folders in this page'),\n  nextPageToken: z.string().optional().describe('Token for fetching next page of results'),\n});\n\n// Output schema with auth_required support\n// Using z.union instead of discriminatedUnion since we have two success branches with different shapes\nconst outputSchema = z.union([successObjectsBranchSchema, successArraysBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Search Folders',\n  description: 'Search Google Drive folders with flexible field selection and optional path resolution.',\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// Type for the raw Google Drive API response\ntype DriveFolder = {\n  id?: string;\n  name?: string;\n  mimeType?: string;\n  webViewLink?: string;\n  modifiedTime?: string;\n  parents?: string[];\n  shared?: boolean;\n  starred?: boolean;\n  owners?: Array<{\n    displayName?: string;\n    emailAddress?: string;\n    kind?: string;\n    me?: boolean;\n    permissionId?: string;\n    photoLink?: string;\n  }>;\n};\n\ntype DriveFolderResponse = {\n  files?: DriveFolder[];\n  nextPageToken?: string;\n};\n\n/**\n * Resolves the full path for a folder by walking up the parent chain\n * Caches folder names to reduce redundant API calls\n */\nasync function resolveFolderPath(drive: drive_v3.Drive, folderId: string, folderCache: Map<string, string>, logger: Logger): Promise<string> {\n  if (folderId === 'root') return '/';\n\n  const pathParts: string[] = [];\n  let currentId = folderId;\n  const visited = new Set<string>();\n\n  while (currentId && currentId !== 'root') {\n    // Prevent infinite loops\n    if (visited.has(currentId)) {\n      logger.info('Circular folder reference detected', {\n        folderId: currentId,\n      });\n      break;\n    }\n    visited.add(currentId);\n\n    // Check cache first\n    if (folderCache.has(currentId)) {\n      const cachedName = folderCache.get(currentId);\n      if (cachedName) {\n        pathParts.unshift(cachedName);\n      }\n\n      // Get parent of cached folder\n      try {\n        const response = await drive.files.get({\n          fileId: currentId,\n          fields: 'parents',\n        });\n        const parents = response.data.parents as string[] | undefined;\n        currentId = (parents && parents.length > 0 ? parents[0] : '') || '';\n      } catch (_e) {\n        logger.info('Failed to get parent for cached folder', {\n          folderId: currentId,\n        });\n        break;\n      }\n    } else {\n      // Fetch folder metadata\n      try {\n        const response = await drive.files.get({\n          fileId: currentId,\n          fields: 'name,parents',\n        });\n        const folderName = response.data.name as string | undefined;\n        const parents = response.data.parents as string[] | undefined;\n\n        if (folderName) {\n          folderCache.set(currentId, folderName);\n          pathParts.unshift(folderName);\n        }\n\n        currentId = (parents && parents.length > 0 ? parents[0] : '') || '';\n      } catch (e) {\n        logger.info('Failed to resolve folder path', {\n          folderId: currentId,\n          error: e,\n        });\n        break;\n      }\n    }\n  }\n\n  return `/${pathParts.join('/')}`;\n}\n\nasync function handler({ query, resolvePaths = false, pageSize = 50, pageToken, fields, shape = 'arrays' }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n\n  try {\n    const parsedQuery = parseDriveQueryParameter(query);\n    const requestedFields = parseFields(fields, [...DRIVE_FILE_FIELDS, 'path'] as const);\n\n    // Validate and clamp pageSize to Google Drive API limits (1-1000)\n    const validPageSize = Math.max(1, Math.min(1000, Math.floor(pageSize || 50)));\n\n    logger.info('drive.folder.search called', {\n      query: parsedQuery,\n      resolvePaths,\n      pageSize: validPageSize,\n      pageToken: pageToken ? '[provided]' : undefined,\n      fields: fields || 'all',\n    });\n\n    const drive = google.drive({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    const folderMimeType = 'application/vnd.google-apps.folder';\n    let qStr: string;\n\n    if (parsedQuery && 'rawDriveQuery' in parsedQuery && parsedQuery.rawDriveQuery) {\n      // Object with rawDriveQuery field - use it directly\n      qStr = parsedQuery.rawDriveQuery;\n    } else if (parsedQuery) {\n      // Structured query object - convert to Drive query string\n      const { q } = toDriveQuery(parsedQuery);\n      qStr = q || '';\n    } else {\n      qStr = '';\n    }\n\n    qStr = qStr ? `(${qStr}) and mimeType='${folderMimeType}'` : `mimeType='${folderMimeType}'`;\n\n    const listOptions: {\n      q: string;\n      pageSize: number;\n      fields: string;\n      orderBy: string;\n      pageToken?: string;\n    } = {\n      q: qStr,\n      pageSize: validPageSize,\n      fields: 'files(id,name,mimeType,webViewLink,modifiedTime,parents,shared,starred,owners),nextPageToken',\n      orderBy: 'modifiedTime desc',\n    };\n    if (pageToken && pageToken.trim().length > 0) {\n      listOptions.pageToken = pageToken;\n    }\n\n    const response = await drive.files.list(listOptions);\n\n    const res = response.data as DriveFolderResponse;\n    const folders = Array.isArray(res?.files) ? res.files : [];\n\n    const parentIds = new Set<string>();\n    for (const f of folders) {\n      if (f?.parents && f.parents.length > 0) {\n        for (const parentId of f.parents) {\n          if (parentId && parentId !== 'root') {\n            parentIds.add(parentId);\n          }\n        }\n      }\n    }\n\n    const parentNameMap = new Map<string, string>();\n    if (parentIds.size > 0) {\n      logger.info('Fetching parent names', { count: parentIds.size });\n      const parentFetches = Array.from(parentIds).map(async (parentId) => {\n        try {\n          const parentRes = await drive.files.get({\n            fileId: parentId,\n            fields: 'id,name',\n          });\n          const parentName = (parentRes.data.name as string | undefined) || parentId;\n          parentNameMap.set(parentId, parentName);\n        } catch (e) {\n          logger.info('Failed to fetch parent name', { parentId, error: e });\n          parentNameMap.set(parentId, parentId); // Fallback to ID\n        }\n      });\n      await Promise.all(parentFetches);\n    }\n\n    // Cache for folder names to reduce API calls during path resolution\n    const folderCache = new Map<string, string>();\n\n    const items: (DriveFile & { path?: string })[] = await Promise.all(\n      folders.map(async (f: DriveFolder) => {\n        const id = f?.id ? String(f.id) : 'unknown';\n        const name = f?.name || id;\n        const result: DriveFile & { path?: string } = { id, name };\n\n        // Only include properties that have actual values\n        if (f?.mimeType) result.mimeType = f.mimeType;\n        if (f?.webViewLink) result.webViewLink = f.webViewLink;\n        if (f?.modifiedTime) result.modifiedTime = f.modifiedTime;\n\n        // Build parent objects with names\n        if (f?.parents && f.parents.length > 0) {\n          result.parents = f.parents.map((parentId) => {\n            if (parentId === 'root') {\n              return { id: 'root', name: 'My Drive' };\n            }\n            const parentName = parentNameMap.get(parentId) || parentId;\n            return { id: parentId, name: parentName };\n          });\n        }\n\n        if (f?.shared !== undefined) result.shared = f.shared;\n        if (f?.starred !== undefined) result.starred = f.starred;\n\n        if (f?.owners && f.owners.length > 0) {\n          result.owners = f.owners.map((o) => {\n            const owner: NonNullable<DriveFile['owners']>[number] = {};\n            if (o?.displayName) owner.displayName = o.displayName;\n            if (o?.emailAddress) owner.emailAddress = o.emailAddress;\n            if (o?.kind) owner.kind = o.kind;\n            if (o?.me !== undefined) owner.me = o.me;\n            if (o?.permissionId) owner.permissionId = o.permissionId;\n            if (o?.photoLink) owner.photoLink = o.photoLink;\n            return owner;\n          });\n        }\n\n        // Resolve path if requested\n        if (resolvePaths && id !== 'unknown') {\n          result.path = await resolveFolderPath(drive, id, folderCache, logger);\n        }\n\n        return result;\n      })\n    );\n\n    const filteredItems = items.map((item) => filterFields(item, requestedFields));\n\n    logger.info('drive.folder.search returning', {\n      query: parsedQuery,\n      pageSize,\n      resultCount: filteredItems.length,\n      resolvePaths,\n      fields: fields || 'all',\n    });\n\n    const nextPageToken = res.nextPageToken && res.nextPageToken.trim().length > 0 ? res.nextPageToken : undefined;\n\n    // Build result based on shape\n    const result: Output =\n      shape === 'arrays'\n        ? {\n            type: 'success' as const,\n            shape: 'arrays' as const,\n            ...toColumnarFormat(filteredItems, requestedFields, [...DRIVE_FILE_FIELDS, 'path'] as const),\n            count: filteredItems.length,\n            ...(nextPageToken && { nextPageToken }),\n          }\n        : {\n            type: 'success' as const,\n            shape: 'objects' as const,\n            items: filteredItems,\n            count: filteredItems.length,\n            ...(nextPageToken && { nextPageToken }),\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.folder.search error', { error: message });\n\n    // Throw ProtocolError for all errors so callers can see Drive validation details\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error searching folders: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'folder-search' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["createTool","AuthRequiredBranchSchema","schemas","inputSchema","z","object","query","DriveQueryParameterSchema","optional","describe","fields","createFieldsSchema","availableFields","DRIVE_FILE_FIELDS","fieldDescriptions","DRIVE_FILE_FIELD_DESCRIPTIONS","path","commonPatterns","DRIVE_FILE_COMMON_PATTERNS","resourceName","resolvePaths","boolean","createPaginationSchema","defaultPageSize","maxPageSize","provider","shape","createShapeSchema","successObjectsBranchSchema","type","literal","items","array","DriveFileSchema","extend","string","count","number","nextPageToken","successArraysBranchSchema","columns","rows","unknown","outputSchema","union","config","title","description","result","resolveFolderPath","drive","folderId","folderCache","logger","pathParts","currentId","visited","cachedName","response","parents","_e","folderName","e","Set","has","info","add","get","unshift","files","fileId","data","length","name","set","error","join","handler","extra","pageSize","pageToken","parsedQuery","requestedFields","validPageSize","folderMimeType","qStr","q","listOptions","res","folders","parentIds","f","parentId","parentNameMap","parentFetches","filteredItems","message","parseDriveQueryParameter","parseFields","Math","max","min","floor","undefined","google","version","auth","googleAuth","authContext","rawDriveQuery","toDriveQuery","orderBy","trim","list","Array","isArray","Map","size","from","map","parentRes","parentName","Promise","all","id","String","mimeType","webViewLink","modifiedTime","shared","starred","owners","o","owner","displayName","emailAddress","kind","me","permissionId","photoLink","item","filterFields","resultCount","toColumnarFormat","content","text","JSON","stringify","structuredContent","Error","ProtocolError","ProtocolErrorCode","InternalError","stack"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/folder-search.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, createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, ProtocolError, ProtocolErrorCode, parseFields, toColumnarFormat } from '@mcp-z/server';\nimport { z } from 'zod';\nimport { googleAuth } from '../../lib/google-auth.ts';\nimport { toDriveQuery } from '../../lib/query-builder.ts';\nimport { DRIVE_FILE_COMMON_PATTERNS, DRIVE_FILE_FIELD_DESCRIPTIONS, DRIVE_FILE_FIELDS, type DriveFile, DriveFileSchema, DriveQueryParameterSchema, parseDriveQueryParameter } from '../../schemas/index.ts';\nimport type { Logger } from '../../types.ts';\n\nconst inputSchema = z.object({\n  query: DriveQueryParameterSchema.optional().describe('Structured Drive query object or JSON string. Use rawDriveQuery for raw Drive syntax.'),\n  fields: createFieldsSchema({\n    availableFields: [...DRIVE_FILE_FIELDS, 'path'] as const,\n    fieldDescriptions: {\n      ...DRIVE_FILE_FIELD_DESCRIPTIONS,\n      path: 'Full folder path like /Work/Projects (requires resolvePaths=true)',\n    },\n    commonPatterns: DRIVE_FILE_COMMON_PATTERNS,\n    resourceName: 'Drive folder',\n  }),\n  resolvePaths: z.boolean().optional().describe('Resolve full folder paths like /Work/Projects/2024 (requires additional API calls per result)'),\n  ...createPaginationSchema({\n    defaultPageSize: 50,\n    maxPageSize: 1000,\n    provider: 'drive',\n  }).shape,\n  shape: createShapeSchema(),\n});\n\n// Success branch schemas for different shapes\nconst successObjectsBranchSchema = z.object({\n  type: z.literal('success'),\n  shape: z.literal('objects'),\n  items: z.array(DriveFileSchema.extend({ path: z.string().optional().describe('Full folder path (if resolvePaths=true)') })).describe('Matching Drive folders'),\n  count: z.number().describe('Number of folders in this page'),\n  nextPageToken: z.string().optional().describe('Token for fetching next page of results'),\n});\n\nconst successArraysBranchSchema = z.object({\n  type: z.literal('success'),\n  shape: z.literal('arrays'),\n  columns: z.array(z.string()).describe('Column names in canonical order'),\n  rows: z.array(z.array(z.unknown())).describe('Row data matching column order'),\n  count: z.number().describe('Number of folders in this page'),\n  nextPageToken: z.string().optional().describe('Token for fetching next page of results'),\n});\n\n// Output schema with auth_required support\n// Using z.union instead of discriminatedUnion since we have two success branches with different shapes\nconst outputSchema = z.union([successObjectsBranchSchema, successArraysBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Search Folders',\n  description: 'Search Google Drive folders with flexible field selection and optional path resolution.',\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// Type for the raw Google Drive API response\ntype DriveFolder = {\n  id?: string;\n  name?: string;\n  mimeType?: string;\n  webViewLink?: string;\n  modifiedTime?: string;\n  parents?: string[];\n  shared?: boolean;\n  starred?: boolean;\n  owners?: Array<{\n    displayName?: string;\n    emailAddress?: string;\n    kind?: string;\n    me?: boolean;\n    permissionId?: string;\n    photoLink?: string;\n  }>;\n};\n\ntype DriveFolderResponse = {\n  files?: DriveFolder[];\n  nextPageToken?: string;\n};\n\n/**\n * Resolves the full path for a folder by walking up the parent chain\n * Caches folder names to reduce redundant API calls\n */\nasync function resolveFolderPath(drive: drive_v3.Drive, folderId: string, folderCache: Map<string, string>, logger: Logger): Promise<string> {\n  if (folderId === 'root') return '/';\n\n  const pathParts: string[] = [];\n  let currentId = folderId;\n  const visited = new Set<string>();\n\n  while (currentId && currentId !== 'root') {\n    // Prevent infinite loops\n    if (visited.has(currentId)) {\n      logger.info('Circular folder reference detected', {\n        folderId: currentId,\n      });\n      break;\n    }\n    visited.add(currentId);\n\n    // Check cache first\n    if (folderCache.has(currentId)) {\n      const cachedName = folderCache.get(currentId);\n      if (cachedName) {\n        pathParts.unshift(cachedName);\n      }\n\n      // Get parent of cached folder\n      try {\n        const response = await drive.files.get({\n          fileId: currentId,\n          fields: 'parents',\n        });\n        const parents = response.data.parents as string[] | undefined;\n        currentId = (parents && parents.length > 0 ? parents[0] : '') || '';\n      } catch (_e) {\n        logger.info('Failed to get parent for cached folder', {\n          folderId: currentId,\n        });\n        break;\n      }\n    } else {\n      // Fetch folder metadata\n      try {\n        const response = await drive.files.get({\n          fileId: currentId,\n          fields: 'name,parents',\n        });\n        const folderName = response.data.name as string | undefined;\n        const parents = response.data.parents as string[] | undefined;\n\n        if (folderName) {\n          folderCache.set(currentId, folderName);\n          pathParts.unshift(folderName);\n        }\n\n        currentId = (parents && parents.length > 0 ? parents[0] : '') || '';\n      } catch (e) {\n        logger.info('Failed to resolve folder path', {\n          folderId: currentId,\n          error: e,\n        });\n        break;\n      }\n    }\n  }\n\n  return `/${pathParts.join('/')}`;\n}\n\nasync function handler({ query, resolvePaths = false, pageSize = 50, pageToken, fields, shape = 'arrays' }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n\n  try {\n    const parsedQuery = parseDriveQueryParameter(query);\n    const requestedFields = parseFields(fields, [...DRIVE_FILE_FIELDS, 'path'] as const);\n\n    // Validate and clamp pageSize to Google Drive API limits (1-1000)\n    const validPageSize = Math.max(1, Math.min(1000, Math.floor(pageSize || 50)));\n\n    logger.info('drive.folder.search called', {\n      query: parsedQuery,\n      resolvePaths,\n      pageSize: validPageSize,\n      pageToken: pageToken ? '[provided]' : undefined,\n      fields: fields || 'all',\n    });\n\n    const drive = driveApi({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    const folderMimeType = 'application/vnd.google-apps.folder';\n    let qStr: string;\n\n    if (parsedQuery && 'rawDriveQuery' in parsedQuery && parsedQuery.rawDriveQuery) {\n      // Object with rawDriveQuery field - use it directly\n      qStr = parsedQuery.rawDriveQuery;\n    } else if (parsedQuery) {\n      // Structured query object - convert to Drive query string\n      const { q } = toDriveQuery(parsedQuery);\n      qStr = q || '';\n    } else {\n      qStr = '';\n    }\n\n    qStr = qStr ? `(${qStr}) and mimeType='${folderMimeType}'` : `mimeType='${folderMimeType}'`;\n\n    const listOptions: {\n      q: string;\n      pageSize: number;\n      fields: string;\n      orderBy: string;\n      pageToken?: string;\n    } = {\n      q: qStr,\n      pageSize: validPageSize,\n      fields: 'files(id,name,mimeType,webViewLink,modifiedTime,parents,shared,starred,owners),nextPageToken',\n      orderBy: 'modifiedTime desc',\n    };\n    if (pageToken && pageToken.trim().length > 0) {\n      listOptions.pageToken = pageToken;\n    }\n\n    const response = await drive.files.list(listOptions);\n\n    const res = response.data as DriveFolderResponse;\n    const folders = Array.isArray(res?.files) ? res.files : [];\n\n    const parentIds = new Set<string>();\n    for (const f of folders) {\n      if (f?.parents && f.parents.length > 0) {\n        for (const parentId of f.parents) {\n          if (parentId && parentId !== 'root') {\n            parentIds.add(parentId);\n          }\n        }\n      }\n    }\n\n    const parentNameMap = new Map<string, string>();\n    if (parentIds.size > 0) {\n      logger.info('Fetching parent names', { count: parentIds.size });\n      const parentFetches = Array.from(parentIds).map(async (parentId) => {\n        try {\n          const parentRes = await drive.files.get({\n            fileId: parentId,\n            fields: 'id,name',\n          });\n          const parentName = (parentRes.data.name as string | undefined) || parentId;\n          parentNameMap.set(parentId, parentName);\n        } catch (e) {\n          logger.info('Failed to fetch parent name', { parentId, error: e });\n          parentNameMap.set(parentId, parentId); // Fallback to ID\n        }\n      });\n      await Promise.all(parentFetches);\n    }\n\n    // Cache for folder names to reduce API calls during path resolution\n    const folderCache = new Map<string, string>();\n\n    const items: (DriveFile & { path?: string })[] = await Promise.all(\n      folders.map(async (f: DriveFolder) => {\n        const id = f?.id ? String(f.id) : 'unknown';\n        const name = f?.name || id;\n        const result: DriveFile & { path?: string } = { id, name };\n\n        // Only include properties that have actual values\n        if (f?.mimeType) result.mimeType = f.mimeType;\n        if (f?.webViewLink) result.webViewLink = f.webViewLink;\n        if (f?.modifiedTime) result.modifiedTime = f.modifiedTime;\n\n        // Build parent objects with names\n        if (f?.parents && f.parents.length > 0) {\n          result.parents = f.parents.map((parentId) => {\n            if (parentId === 'root') {\n              return { id: 'root', name: 'My Drive' };\n            }\n            const parentName = parentNameMap.get(parentId) || parentId;\n            return { id: parentId, name: parentName };\n          });\n        }\n\n        if (f?.shared !== undefined) result.shared = f.shared;\n        if (f?.starred !== undefined) result.starred = f.starred;\n\n        if (f?.owners && f.owners.length > 0) {\n          result.owners = f.owners.map((o) => {\n            const owner: NonNullable<DriveFile['owners']>[number] = {};\n            if (o?.displayName) owner.displayName = o.displayName;\n            if (o?.emailAddress) owner.emailAddress = o.emailAddress;\n            if (o?.kind) owner.kind = o.kind;\n            if (o?.me !== undefined) owner.me = o.me;\n            if (o?.permissionId) owner.permissionId = o.permissionId;\n            if (o?.photoLink) owner.photoLink = o.photoLink;\n            return owner;\n          });\n        }\n\n        // Resolve path if requested\n        if (resolvePaths && id !== 'unknown') {\n          result.path = await resolveFolderPath(drive, id, folderCache, logger);\n        }\n\n        return result;\n      })\n    );\n\n    const filteredItems = items.map((item) => filterFields(item, requestedFields));\n\n    logger.info('drive.folder.search returning', {\n      query: parsedQuery,\n      pageSize,\n      resultCount: filteredItems.length,\n      resolvePaths,\n      fields: fields || 'all',\n    });\n\n    const nextPageToken = res.nextPageToken && res.nextPageToken.trim().length > 0 ? res.nextPageToken : undefined;\n\n    // Build result based on shape\n    const result: Output =\n      shape === 'arrays'\n        ? {\n            type: 'success' as const,\n            shape: 'arrays' as const,\n            ...toColumnarFormat(filteredItems, requestedFields, [...DRIVE_FILE_FIELDS, 'path'] as const),\n            count: filteredItems.length,\n            ...(nextPageToken && { nextPageToken }),\n          }\n        : {\n            type: 'success' as const,\n            shape: 'objects' as const,\n            items: filteredItems,\n            count: filteredItems.length,\n            ...(nextPageToken && { nextPageToken }),\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.folder.search error', { error: message });\n\n    // Throw ProtocolError for all errors so callers can see Drive validation details\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error searching folders: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'folder-search' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["createTool","AuthRequiredBranchSchema","schemas","inputSchema","z","object","query","DriveQueryParameterSchema","optional","describe","fields","createFieldsSchema","availableFields","DRIVE_FILE_FIELDS","fieldDescriptions","DRIVE_FILE_FIELD_DESCRIPTIONS","path","commonPatterns","DRIVE_FILE_COMMON_PATTERNS","resourceName","resolvePaths","boolean","createPaginationSchema","defaultPageSize","maxPageSize","provider","shape","createShapeSchema","successObjectsBranchSchema","type","literal","items","array","DriveFileSchema","extend","string","count","number","nextPageToken","successArraysBranchSchema","columns","rows","unknown","outputSchema","union","config","title","description","result","resolveFolderPath","drive","folderId","folderCache","logger","pathParts","currentId","visited","cachedName","response","parents","_e","folderName","e","Set","has","info","add","get","unshift","files","fileId","data","length","name","set","error","join","handler","extra","pageSize","pageToken","parsedQuery","requestedFields","validPageSize","folderMimeType","qStr","q","listOptions","res","folders","parentIds","f","parentId","parentNameMap","parentFetches","filteredItems","message","parseDriveQueryParameter","parseFields","Math","max","min","floor","undefined","driveApi","version","auth","googleAuth","authContext","rawDriveQuery","toDriveQuery","orderBy","trim","list","Array","isArray","Map","size","from","map","parentRes","parentName","Promise","all","id","String","mimeType","webViewLink","modifiedTime","shared","starred","owners","o","owner","displayName","emailAddress","kind","me","permissionId","photoLink","item","filterFields","resultCount","toColumnarFormat","content","text","JSON","stringify","structuredContent","Error","ProtocolError","ProtocolErrorCode","InternalError","stack"],"mappings":"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"}

package/dist/cjs/setup/http.d.cts

@@ -1,8 +1,6 @@
-import { McpServer } from '@mcp-z/server';
 import type { RuntimeOverrides, ServerConfig } from '../types.js';
 export declare function createHTTPServer(config: ServerConfig, overrides?: RuntimeOverrides): Promise<{
     httpServer: import("node:http").Server<typeof import("node:http").IncomingMessage, typeof import("node:http").ServerResponse>;
-    mcpServer: McpServer;
     logger: import("@mcp-z/server").Logger;
     close: () => Promise<void>;
 }>;

package/dist/cjs/setup/http.d.ts

@@ -1,8 +1,6 @@
-import { McpServer } from '@mcp-z/server';
 import type { RuntimeOverrides, ServerConfig } from '../types.js';
 export declare function createHTTPServer(config: ServerConfig, overrides?: RuntimeOverrides): Promise<{
     httpServer: import("node:http").Server<typeof import("node:http").IncomingMessage, typeof import("node:http").ServerResponse>;
-    mcpServer: McpServer;
     logger: import("@mcp-z/server").Logger;
     close: () => Promise<void>;
 }>;

package/dist/cjs/setup/http.js

@@ -171,7 +171,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 }
 function createHTTPServer(config, overrides) {
     return _async_to_generator(function() {
-        var runtime, modules, layers, composed, logger, port, tools, prompts, mcpServer, app, publicUrl, _ref, close, httpServer;
+        var runtime, modules, layers, composed, logger, port, tools, prompts, buildServer, app, publicUrl, _ref, close, httpServer;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -191,13 +191,20 @@ function createHTTPServer(config, overrides) {
                     if (!port) throw new Error('Port is required for HTTP transport');
                     tools = _to_consumable_array(composed.tools).concat(_to_consumable_array(runtime.deps.oauthAdapters.accountTools));
                     prompts = _to_consumable_array(composed.prompts).concat(_to_consumable_array(runtime.deps.oauthAdapters.accountPrompts));
-                    mcpServer = new _server.McpServer({
-                        name: config.name,
-                        version: config.version
-                    });
-                    (0, _server.registerTools)(mcpServer, tools);
-                    (0, _server.registerResources)(mcpServer, composed.resources);
-                    (0, _server.registerPrompts)(mcpServer, prompts);
+                    // Built per request (HTTP) and per connection (stdio), not shared. The SDK caches the
+                    // negotiated protocol revision on the McpServer instance - its own docs say a negotiated
+                    // session never re-routes a method onto the other era - so one shared instance pins itself
+                    // to whichever revision reaches it first and answers the other with -32601.
+                    buildServer = function buildServer() {
+                        var mcpServer = new _server.McpServer({
+                            name: config.name,
+                            version: config.version
+                        });
+                        (0, _server.registerTools)(mcpServer, tools);
+                        (0, _server.registerResources)(mcpServer, composed.resources);
+                        (0, _server.registerPrompts)(mcpServer, prompts);
+                        return mcpServer;
+                    };
                     app = (0, _express.default)();
                     app.use(_express.default.json({
                         limit: '10mb'
@@ -208,7 +215,7 @@ function createHTTPServer(config, overrides) {
                     logger.info("Starting ".concat(config.name, " MCP server (http)"));
                     return [
                         4,
-                        (0, _server.connectHttp)(mcpServer, {
+                        (0, _server.connectHttp)(buildServer, {
                             logger: logger,
                             app: app,
                             port: port,
@@ -238,7 +245,6 @@ function createHTTPServer(config, overrides) {
                         2,
                         {
                             httpServer: httpServer,
-                            mcpServer: mcpServer,
                             logger: logger,
                             close: function close1() {
                                 return _async_to_generator(function() {

package/dist/cjs/setup/http.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/setup/http.ts"],"sourcesContent":["import { composeMiddleware, connectHttp, McpServer, registerPrompts, registerResources, registerTools } from '@mcp-z/server';\nimport cors from 'cors';\nimport express from 'express';\nimport type { RuntimeOverrides, ServerConfig } from '../types.ts';\nimport { createDefaultRuntime } from './runtime.ts';\n\nexport async function createHTTPServer(config: ServerConfig, overrides?: RuntimeOverrides) {\n  const runtime = await createDefaultRuntime(config, overrides);\n  const modules = runtime.createDomainModules();\n  const layers = runtime.middlewareFactories.map((factory) => factory(runtime.deps));\n  const composed = composeMiddleware(modules, layers);\n  const logger = runtime.deps.logger;\n  const port = config.transport.port;\n  if (!port) throw new Error('Port is required for HTTP transport');\n\n  const tools = [...composed.tools, ...runtime.deps.oauthAdapters.accountTools];\n  const prompts = [...composed.prompts, ...runtime.deps.oauthAdapters.accountPrompts];\n\n  const mcpServer = new McpServer({ name: config.name, version: config.version });\n  registerTools(mcpServer, tools);\n  registerResources(mcpServer, composed.resources);\n  registerPrompts(mcpServer, prompts);\n\n  const app = express();\n  app.use(express.json({ limit: '10mb' }));\n\n  // Must mount '/mcp' before any permissive app-level cors(), or that layer answers its\n  // preflight first; pass baseUrl's origin/host below or a public deployment 403s itself.\n  const publicUrl = config.baseUrl ? new URL(config.baseUrl) : undefined;\n  logger.info(`Starting ${config.name} MCP server (http)`);\n  const { close, httpServer } = await connectHttp(mcpServer, {\n    logger,\n    app,\n    port,\n    allowedOrigins: publicUrl ? [publicUrl.origin] : undefined,\n    allowedHosts: publicUrl ? [publicUrl.host] : undefined,\n  });\n\n  // The loopback OAuth callback and the DCR discovery/registration endpoints are\n  // meant to be reached from a browser on another origin. Keep cors() for them,\n  // scoped to their own routes - never in front of '/mcp'.\n  if (runtime.deps.oauthAdapters.loopbackRouter) {\n    app.use('/', cors(), runtime.deps.oauthAdapters.loopbackRouter);\n    logger.info('Mounted loopback OAuth callback router');\n  }\n\n  if (runtime.deps.oauthAdapters.dcrRouter) {\n    app.use('/', cors(), runtime.deps.oauthAdapters.dcrRouter);\n    logger.info('Mounted DCR router with OAuth endpoints');\n  }\n\n  logger.info('http transport ready');\n\n  return {\n    httpServer,\n    mcpServer,\n    logger,\n    close: async () => {\n      await close();\n      await runtime.close();\n    },\n  };\n}\n"],"names":["createHTTPServer","config","overrides","runtime","modules","layers","composed","logger","port","tools","prompts","mcpServer","app","publicUrl","close","httpServer","createDefaultRuntime","createDomainModules","middlewareFactories","map","factory","deps","composeMiddleware","transport","Error","oauthAdapters","accountTools","accountPrompts","McpServer","name","version","registerTools","registerResources","resources","registerPrompts","express","use","json","limit","baseUrl","URL","undefined","info","connectHttp","allowedOrigins","origin","allowedHosts","host","loopbackRouter","cors","dcrRouter"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/setup/http.ts"],"sourcesContent":["import { composeMiddleware, connectHttp, McpServer, registerPrompts, registerResources, registerTools } from '@mcp-z/server';\nimport cors from 'cors';\nimport express from 'express';\nimport type { RuntimeOverrides, ServerConfig } from '../types.ts';\nimport { createDefaultRuntime } from './runtime.ts';\n\nexport async function createHTTPServer(config: ServerConfig, overrides?: RuntimeOverrides) {\n  const runtime = await createDefaultRuntime(config, overrides);\n  const modules = runtime.createDomainModules();\n  const layers = runtime.middlewareFactories.map((factory) => factory(runtime.deps));\n  const composed = composeMiddleware(modules, layers);\n  const logger = runtime.deps.logger;\n  const port = config.transport.port;\n  if (!port) throw new Error('Port is required for HTTP transport');\n\n  const tools = [...composed.tools, ...runtime.deps.oauthAdapters.accountTools];\n  const prompts = [...composed.prompts, ...runtime.deps.oauthAdapters.accountPrompts];\n\n  // Built per request (HTTP) and per connection (stdio), not shared. The SDK caches the\n  // negotiated protocol revision on the McpServer instance - its own docs say a negotiated\n  // session never re-routes a method onto the other era - so one shared instance pins itself\n  // to whichever revision reaches it first and answers the other with -32601.\n  const buildServer = () => {\n    const mcpServer = new McpServer({ name: config.name, version: config.version });\n    registerTools(mcpServer, tools);\n    registerResources(mcpServer, composed.resources);\n    registerPrompts(mcpServer, prompts);\n    return mcpServer;\n  };\n\n  const app = express();\n  app.use(express.json({ limit: '10mb' }));\n\n  // Must mount '/mcp' before any permissive app-level cors(), or that layer answers its\n  // preflight first; pass baseUrl's origin/host below or a public deployment 403s itself.\n  const publicUrl = config.baseUrl ? new URL(config.baseUrl) : undefined;\n  logger.info(`Starting ${config.name} MCP server (http)`);\n  const { close, httpServer } = await connectHttp(buildServer, {\n    logger,\n    app,\n    port,\n    allowedOrigins: publicUrl ? [publicUrl.origin] : undefined,\n    allowedHosts: publicUrl ? [publicUrl.host] : undefined,\n  });\n\n  // The loopback OAuth callback and the DCR discovery/registration endpoints are\n  // meant to be reached from a browser on another origin. Keep cors() for them,\n  // scoped to their own routes - never in front of '/mcp'.\n  if (runtime.deps.oauthAdapters.loopbackRouter) {\n    app.use('/', cors(), runtime.deps.oauthAdapters.loopbackRouter);\n    logger.info('Mounted loopback OAuth callback router');\n  }\n\n  if (runtime.deps.oauthAdapters.dcrRouter) {\n    app.use('/', cors(), runtime.deps.oauthAdapters.dcrRouter);\n    logger.info('Mounted DCR router with OAuth endpoints');\n  }\n\n  logger.info('http transport ready');\n\n  return {\n    httpServer,\n    logger,\n    close: async () => {\n      await close();\n      await runtime.close();\n    },\n  };\n}\n"],"names":["createHTTPServer","config","overrides","runtime","modules","layers","composed","logger","port","tools","prompts","buildServer","app","publicUrl","close","httpServer","createDefaultRuntime","createDomainModules","middlewareFactories","map","factory","deps","composeMiddleware","transport","Error","oauthAdapters","accountTools","accountPrompts","mcpServer","McpServer","name","version","registerTools","registerResources","resources","registerPrompts","express","use","json","limit","baseUrl","URL","undefined","info","connectHttp","allowedOrigins","origin","allowedHosts","host","loopbackRouter","cors","dcrRouter"],"mappings":"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"}

package/dist/cjs/setup/stdio.d.cts

@@ -1,7 +1,5 @@
-import { McpServer } from '@mcp-z/server';
 import type { RuntimeOverrides, ServerConfig } from '../types.js';
 export declare function createStdioServer(config: ServerConfig, overrides?: RuntimeOverrides): Promise<{
-    mcpServer: McpServer;
     logger: import("@mcp-z/server").Logger;
     close: () => Promise<void>;
 }>;

package/dist/cjs/setup/stdio.d.ts

@@ -1,7 +1,5 @@
-import { McpServer } from '@mcp-z/server';
 import type { RuntimeOverrides, ServerConfig } from '../types.js';
 export declare function createStdioServer(config: ServerConfig, overrides?: RuntimeOverrides): Promise<{
-    mcpServer: McpServer;
     logger: import("@mcp-z/server").Logger;
     close: () => Promise<void>;
 }>;

package/dist/cjs/setup/stdio.js

@@ -164,7 +164,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 }
 function createStdioServer(config, overrides) {
     return _async_to_generator(function() {
-        var runtime, modules, layers, composed, logger, tools, prompts, mcpServer, close;
+        var runtime, modules, layers, composed, logger, tools, prompts, buildServer, close;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -182,17 +182,24 @@ function createStdioServer(config, overrides) {
                     logger = runtime.deps.logger;
                     tools = _to_consumable_array(composed.tools).concat(_to_consumable_array(runtime.deps.oauthAdapters.accountTools));
                     prompts = _to_consumable_array(composed.prompts).concat(_to_consumable_array(runtime.deps.oauthAdapters.accountPrompts));
-                    mcpServer = new _server.McpServer({
-                        name: config.name,
-                        version: config.version
-                    });
-                    (0, _server.registerTools)(mcpServer, tools);
-                    (0, _server.registerResources)(mcpServer, composed.resources);
-                    (0, _server.registerPrompts)(mcpServer, prompts);
+                    // Built per request (HTTP) and per connection (stdio), not shared. The SDK caches the
+                    // negotiated protocol revision on the McpServer instance - its own docs say a negotiated
+                    // session never re-routes a method onto the other era - so one shared instance pins itself
+                    // to whichever revision reaches it first and answers the other with -32601.
+                    buildServer = function buildServer() {
+                        var mcpServer = new _server.McpServer({
+                            name: config.name,
+                            version: config.version
+                        });
+                        (0, _server.registerTools)(mcpServer, tools);
+                        (0, _server.registerResources)(mcpServer, composed.resources);
+                        (0, _server.registerPrompts)(mcpServer, prompts);
+                        return mcpServer;
+                    };
                     logger.info("Starting ".concat(config.name, " MCP server (stdio)"));
                     return [
                         4,
-                        (0, _server.connectStdio)(mcpServer, {
+                        (0, _server.connectStdio)(buildServer, {
                             logger: logger
                         })
                     ];
@@ -202,7 +209,6 @@ function createStdioServer(config, overrides) {
                     return [
                         2,
                         {
-                            mcpServer: mcpServer,
                             logger: logger,
                             close: function close1() {
                                 return _async_to_generator(function() {

package/dist/cjs/setup/stdio.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/setup/stdio.ts"],"sourcesContent":["import { composeMiddleware, connectStdio, McpServer, registerPrompts, registerResources, registerTools } from '@mcp-z/server';\nimport type { RuntimeOverrides, ServerConfig } from '../types.ts';\nimport { createDefaultRuntime } from './runtime.ts';\n\nexport async function createStdioServer(config: ServerConfig, overrides?: RuntimeOverrides) {\n  const runtime = await createDefaultRuntime(config, overrides);\n  const modules = runtime.createDomainModules();\n  const layers = runtime.middlewareFactories.map((factory) => factory(runtime.deps));\n  const composed = composeMiddleware(modules, layers);\n  const logger = runtime.deps.logger;\n\n  const tools = [...composed.tools, ...runtime.deps.oauthAdapters.accountTools];\n  const prompts = [...composed.prompts, ...runtime.deps.oauthAdapters.accountPrompts];\n\n  const mcpServer = new McpServer({ name: config.name, version: config.version });\n  registerTools(mcpServer, tools);\n  registerResources(mcpServer, composed.resources);\n  registerPrompts(mcpServer, prompts);\n\n  logger.info(`Starting ${config.name} MCP server (stdio)`);\n  const { close } = await connectStdio(mcpServer, { logger });\n  logger.info('stdio transport ready');\n\n  return {\n    mcpServer,\n    logger,\n    close: async () => {\n      await close();\n      await runtime.close();\n    },\n  };\n}\n"],"names":["createStdioServer","config","overrides","runtime","modules","layers","composed","logger","tools","prompts","mcpServer","close","createDefaultRuntime","createDomainModules","middlewareFactories","map","factory","deps","composeMiddleware","oauthAdapters","accountTools","accountPrompts","McpServer","name","version","registerTools","registerResources","resources","registerPrompts","info","connectStdio"],"mappings":";;;;+BAIsBA;;;eAAAA;;;sBAJwF;yBAEzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE9B,SAAeA,kBAAkBC,MAAoB,EAAEC,SAA4B;;YAClFC,SACAC,SACAC,QACAC,UACAC,QAEAC,OACAC,SAEAC,WAMEC;;;;oBAfQ;;wBAAMC,IAAAA,+BAAoB,EAACX,QAAQC;;;oBAA7CC,UAAU;oBACVC,UAAUD,QAAQU,mBAAmB;oBACrCR,SAASF,QAAQW,mBAAmB,CAACC,GAAG,CAAC,SAACC;+BAAYA,QAAQb,QAAQc,IAAI;;oBAC1EX,WAAWY,IAAAA,yBAAiB,EAACd,SAASC;oBACtCE,SAASJ,QAAQc,IAAI,CAACV,MAAM;oBAE5BC,QAAQ,AAAC,qBAAGF,SAASE,KAAK,SAAE,qBAAGL,QAAQc,IAAI,CAACE,aAAa,CAACC,YAAY;oBACtEX,UAAU,AAAC,qBAAGH,SAASG,OAAO,SAAE,qBAAGN,QAAQc,IAAI,CAACE,aAAa,CAACE,cAAc;oBAE5EX,YAAY,IAAIY,iBAAS,CAAC;wBAAEC,MAAMtB,OAAOsB,IAAI;wBAAEC,SAASvB,OAAOuB,OAAO;oBAAC;oBAC7EC,IAAAA,qBAAa,EAACf,WAAWF;oBACzBkB,IAAAA,yBAAiB,EAAChB,WAAWJ,SAASqB,SAAS;oBAC/CC,IAAAA,uBAAe,EAAClB,WAAWD;oBAE3BF,OAAOsB,IAAI,CAAC,AAAC,YAAuB,OAAZ5B,OAAOsB,IAAI,EAAC;oBAClB;;wBAAMO,IAAAA,oBAAY,EAACpB,WAAW;4BAAEH,QAAAA;wBAAO;;;oBAAjDI,QAAU,cAAVA;oBACRJ,OAAOsB,IAAI,CAAC;oBAEZ;;wBAAO;4BACLnB,WAAAA;4BACAH,QAAAA;4BACAI,OAAO,SAAPA;;;;;gDACE;;oDAAMA;;;gDAAN;gDACA;;oDAAMR,QAAQQ,KAAK;;;gDAAnB;;;;;;gCACF;;wBACF;;;;IACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/setup/stdio.ts"],"sourcesContent":["import { composeMiddleware, connectStdio, McpServer, registerPrompts, registerResources, registerTools } from '@mcp-z/server';\nimport type { RuntimeOverrides, ServerConfig } from '../types.ts';\nimport { createDefaultRuntime } from './runtime.ts';\n\nexport async function createStdioServer(config: ServerConfig, overrides?: RuntimeOverrides) {\n  const runtime = await createDefaultRuntime(config, overrides);\n  const modules = runtime.createDomainModules();\n  const layers = runtime.middlewareFactories.map((factory) => factory(runtime.deps));\n  const composed = composeMiddleware(modules, layers);\n  const logger = runtime.deps.logger;\n\n  const tools = [...composed.tools, ...runtime.deps.oauthAdapters.accountTools];\n  const prompts = [...composed.prompts, ...runtime.deps.oauthAdapters.accountPrompts];\n\n  // Built per request (HTTP) and per connection (stdio), not shared. The SDK caches the\n  // negotiated protocol revision on the McpServer instance - its own docs say a negotiated\n  // session never re-routes a method onto the other era - so one shared instance pins itself\n  // to whichever revision reaches it first and answers the other with -32601.\n  const buildServer = () => {\n    const mcpServer = new McpServer({ name: config.name, version: config.version });\n    registerTools(mcpServer, tools);\n    registerResources(mcpServer, composed.resources);\n    registerPrompts(mcpServer, prompts);\n    return mcpServer;\n  };\n\n  logger.info(`Starting ${config.name} MCP server (stdio)`);\n  const { close } = await connectStdio(buildServer, { logger });\n  logger.info('stdio transport ready');\n\n  return {\n    logger,\n    close: async () => {\n      await close();\n      await runtime.close();\n    },\n  };\n}\n"],"names":["createStdioServer","config","overrides","runtime","modules","layers","composed","logger","tools","prompts","buildServer","close","createDefaultRuntime","createDomainModules","middlewareFactories","map","factory","deps","composeMiddleware","oauthAdapters","accountTools","accountPrompts","mcpServer","McpServer","name","version","registerTools","registerResources","resources","registerPrompts","info","connectStdio"],"mappings":";;;;+BAIsBA;;;eAAAA;;;sBAJwF;yBAEzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE9B,SAAeA,kBAAkBC,MAAoB,EAAEC,SAA4B;;YAClFC,SACAC,SACAC,QACAC,UACAC,QAEAC,OACAC,SAMAC,aASEC;;;;oBAtBQ;;wBAAMC,IAAAA,+BAAoB,EAACX,QAAQC;;;oBAA7CC,UAAU;oBACVC,UAAUD,QAAQU,mBAAmB;oBACrCR,SAASF,QAAQW,mBAAmB,CAACC,GAAG,CAAC,SAACC;+BAAYA,QAAQb,QAAQc,IAAI;;oBAC1EX,WAAWY,IAAAA,yBAAiB,EAACd,SAASC;oBACtCE,SAASJ,QAAQc,IAAI,CAACV,MAAM;oBAE5BC,QAAQ,AAAC,qBAAGF,SAASE,KAAK,SAAE,qBAAGL,QAAQc,IAAI,CAACE,aAAa,CAACC,YAAY;oBACtEX,UAAU,AAAC,qBAAGH,SAASG,OAAO,SAAE,qBAAGN,QAAQc,IAAI,CAACE,aAAa,CAACE,cAAc;oBAElF,sFAAsF;oBACtF,yFAAyF;oBACzF,2FAA2F;oBAC3F,4EAA4E;oBACtEX,cAAc;wBAClB,IAAMY,YAAY,IAAIC,iBAAS,CAAC;4BAAEC,MAAMvB,OAAOuB,IAAI;4BAAEC,SAASxB,OAAOwB,OAAO;wBAAC;wBAC7EC,IAAAA,qBAAa,EAACJ,WAAWd;wBACzBmB,IAAAA,yBAAiB,EAACL,WAAWhB,SAASsB,SAAS;wBAC/CC,IAAAA,uBAAe,EAACP,WAAWb;wBAC3B,OAAOa;oBACT;oBAEAf,OAAOuB,IAAI,CAAC,AAAC,YAAuB,OAAZ7B,OAAOuB,IAAI,EAAC;oBAClB;;wBAAMO,IAAAA,oBAAY,EAACrB,aAAa;4BAAEH,QAAAA;wBAAO;;;oBAAnDI,QAAU,cAAVA;oBACRJ,OAAOuB,IAAI,CAAC;oBAEZ;;wBAAO;4BACLvB,QAAAA;4BACAI,OAAO,SAAPA;;;;;gDACE;;oDAAMA;;;gDAAN;gDACA;;oDAAMR,QAAQQ,KAAK;;;gDAAnB;;;;;;gCACF;;wBACF;;;;IACF"}

package/dist/esm/lib/google-auth.d.ts

@@ -3,7 +3,7 @@ import { type GoogleAuthProvider } from '@mcp-z/oauth-google';
  * A Google API client bound to this request's token provider.
  *
  * `@mcp-z/oauth-google` mints tokens and depends on no Google SDK, so the client
- * is built here, from this package's own `googleapis`. That keeps one copy of
+ * is built here, from this package's own SDK. That keeps one copy of
  * `google-auth-library` in the tree by construction rather than by matching pins.
  */
 export declare function googleAuth(auth: GoogleAuthProvider): import("google-auth-library").OAuth2Client;

package/dist/esm/lib/google-auth.js

@@ -1,11 +1,11 @@
+import { auth as googleAuthPlus } from '@googleapis/drive';
 import { attachTokenProvider } from '@mcp-z/oauth-google';
-import { google } from 'googleapis';
 /**
  * A Google API client bound to this request's token provider.
  *
  * `@mcp-z/oauth-google` mints tokens and depends on no Google SDK, so the client
- * is built here, from this package's own `googleapis`. That keeps one copy of
+ * is built here, from this package's own SDK. That keeps one copy of
  * `google-auth-library` in the tree by construction rather than by matching pins.
  */ export function googleAuth(auth) {
-    return attachTokenProvider(new google.auth.OAuth2(), auth);
+    return attachTokenProvider(new googleAuthPlus.OAuth2(), auth);
 }

package/dist/esm/lib/google-auth.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/lib/google-auth.ts"],"sourcesContent":["import { attachTokenProvider, type GoogleAuthProvider } from '@mcp-z/oauth-google';\nimport { google } from 'googleapis';\n\n/**\n * A Google API client bound to this request's token provider.\n *\n * `@mcp-z/oauth-google` mints tokens and depends on no Google SDK, so the client\n * is built here, from this package's own `googleapis`. That keeps one copy of\n * `google-auth-library` in the tree by construction rather than by matching pins.\n */\nexport function googleAuth(auth: GoogleAuthProvider) {\n  return attachTokenProvider(new google.auth.OAuth2(), auth);\n}\n"],"names":["attachTokenProvider","google","googleAuth","auth","OAuth2"],"mappings":"AAAA,SAASA,mBAAmB,QAAiC,sBAAsB;AACnF,SAASC,MAAM,QAAQ,aAAa;AAEpC;;;;;;CAMC,GACD,OAAO,SAASC,WAAWC,IAAwB;IACjD,OAAOH,oBAAoB,IAAIC,OAAOE,IAAI,CAACC,MAAM,IAAID;AACvD"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/lib/google-auth.ts"],"sourcesContent":["import { auth as googleAuthPlus } from '@googleapis/drive';\nimport { attachTokenProvider, type GoogleAuthProvider } from '@mcp-z/oauth-google';\n\n/**\n * A Google API client bound to this request's token provider.\n *\n * `@mcp-z/oauth-google` mints tokens and depends on no Google SDK, so the client\n * is built here, from this package's own SDK. That keeps one copy of\n * `google-auth-library` in the tree by construction rather than by matching pins.\n */\nexport function googleAuth(auth: GoogleAuthProvider) {\n  return attachTokenProvider(new googleAuthPlus.OAuth2(), auth);\n}\n"],"names":["auth","googleAuthPlus","attachTokenProvider","googleAuth","OAuth2"],"mappings":"AAAA,SAASA,QAAQC,cAAc,QAAQ,oBAAoB;AAC3D,SAASC,mBAAmB,QAAiC,sBAAsB;AAEnF;;;;;;CAMC,GACD,OAAO,SAASC,WAAWH,IAAwB;IACjD,OAAOE,oBAAoB,IAAID,eAAeG,MAAM,IAAIJ;AAC1D"}

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

@@ -1,5 +1,5 @@
+import { drive as driveApi } from '@googleapis/drive';
 import { ResourceTemplate } from '@mcp-z/server';
-import { google } from 'googleapis';
 import { googleAuth } from '../../lib/google-auth.js';
 export default function createResource() {
     const template = new ResourceTemplate('drive://files/{fileId}', {
@@ -30,7 +30,7 @@ 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: googleAuth(authContext.auth)
             });

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 { ReadResourceResult, ResourceConfig, ResourceModule, ServerContext } from '@mcp-z/server';\nimport { ResourceTemplate } from '@mcp-z/server';\nimport { google } from 'googleapis';\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 = google.drive({ 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      });\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","googleAuth","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,gBAAgB;AACjD,SAASC,MAAM,QAAQ,aAAa;AACpC,SAASC,UAAU,QAAQ,2BAA2B;AAEtD,eAAe,SAASC;IACtB,MAAMC,WAAW,IAAIJ,iBAAiB,0BAA0B;QAC9DK,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,QAAQxB,OAAOwB,KAAK,CAAC;gBAAEC,SAAS;gBAAMC,MAAMzB,WAAWsB,YAAYG,IAAI;YAAE;YAC/E,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      });\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","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;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,MAAMd,QAAQC,SAAS;gBAAEyB,SAAS;gBAAMC,MAAMxB,WAAWsB,YAAYE,IAAI;YAAE;YAC3E,MAAMC,OAAO,MAAM5B,MAAM6B,KAAK,CAACC,GAAG,CAAC;gBACjCf;gBACAgB,QAAQ;YACV;YACA,MAAMC,OAAOJ,KAAKI,IAAI;aACtBd,gBAAAA,OAAOe,KAAK,cAAZf,oCAAAA,mBAAAA,QAAe;gBAAEH;gBAAQmB,QAAQ,EAAEF,iBAAAA,2BAAAA,KAAMG,IAAI;YAAC,GAAG;YACjD,OAAO;gBACLhB,UAAU;oBACR;wBACEP,KAAKA,IAAIQ,IAAI;wBACbV,UAAU;wBACVW,MAAMC,KAAKC,SAAS,CAACS,QAAQ,CAAC;oBAChC;iBACD;YACH;QACF,EAAE,OAAOR,OAAO;gBAEdN;YADA,MAAM,EAAEA,MAAM,EAAE,GAAGJ;aACnBI,iBAAAA,OAAOe,KAAK,cAAZf,qCAAAA,oBAAAA,QAAeM,OAAkC;YACjD,OAAO;gBACLL,UAAU;oBACR;wBACEP,KAAKA,IAAIQ,IAAI;wBACbV,UAAU;wBACVW,MAAMC,KAAKC,SAAS,CAAC;4BAAEC,OAAO,AAACA,MAAgBY,OAAO;wBAAC;oBACzD;iBACD;YACH;QACF;IACF;IAEA,OAAO;QACLD,MAAM;QACN9B;QACAG;QACAG;IACF;AACF"}

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

@@ -1,7 +1,7 @@
 import { schemas } from '@mcp-z/oauth-google';
 const { AuthRequiredBranchSchema } = schemas;
+import { drive as driveApi } from '@googleapis/drive';
 import { ProtocolError, ProtocolErrorCode } from '@mcp-z/server';
-import { google } from 'googleapis';
 import { z } from 'zod';
 import { googleAuth } from '../../lib/google-auth.js';
 const MAX_BATCH_SIZE = 1000;
@@ -41,7 +41,7 @@ async function handler({ ids }, extra) {
         count: ids.length
     });
     try {
-        const drive = google.drive({
+        const drive = driveApi({
             version: 'v3',
             auth: googleAuth(extra.authContext.auth)
         });