@mcp-z/mcp-drive 1.0.7 → 1.0.8

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

@@ -5,9 +5,9 @@ import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
 import { google } from 'googleapis';
 import { z } from 'zod';
 import { toDriveQuery } from '../../lib/query-builder.js';
-import { DRIVE_FILE_COMMON_PATTERNS, DRIVE_FILE_FIELD_DESCRIPTIONS, DRIVE_FILE_FIELDS, DriveFileSchema, DriveQuerySchema } from '../../schemas/index.js';
+import { DRIVE_FILE_COMMON_PATTERNS, DRIVE_FILE_FIELD_DESCRIPTIONS, DRIVE_FILE_FIELDS, DriveFileSchema, DriveQueryParameterSchema, parseDriveQueryParameter } from '../../schemas/index.js';
 const inputSchema = z.object({
-    query: DriveQuerySchema.describe('Drive query object with structured search fields. See DriveQuerySchema for detailed query syntax and examples.'),
+    query: DriveQueryParameterSchema.describe('Structured Drive query object or JSON string. Use rawDriveQuery for raw Drive syntax.'),
     fields: createFieldsSchema({
         availableFields: DRIVE_FILE_FIELDS,
         fieldDescriptions: DRIVE_FILE_FIELD_DESCRIPTIONS,
@@ -54,39 +54,41 @@ const config = {
 };
 async function handler({ query, pageSize = 50, pageToken, fields, shape = 'arrays' }, extra) {
     const logger = extra.logger;
-    const requestedFields = parseFields(fields, DRIVE_FILE_FIELDS);
-    // Validate and clamp pageSize to Google Drive API limits (1-1000)
-    const validPageSize = Math.max(1, Math.min(1000, Math.floor(pageSize || 50)));
-    logger.info('drive.files-search called', {
-        query,
-        pageSize: validPageSize,
-        pageToken: pageToken ? '[provided]' : undefined,
-        fields: fields || 'all'
-    });
     try {
+        const parsedQuery = parseDriveQueryParameter(query);
+        const requestedFields = parseFields(fields, DRIVE_FILE_FIELDS);
+        // Validate and clamp pageSize to Google Drive API limits (1-1000)
+        const validPageSize = Math.max(1, Math.min(1000, Math.floor(pageSize || 50)));
+        logger.info('drive.files-search called', {
+            query: parsedQuery,
+            pageSize: validPageSize,
+            pageToken: pageToken ? '[provided]' : undefined,
+            fields: fields || 'all'
+        });
         const drive = google.drive({
             version: 'v3',
             auth: extra.authContext.auth
         });
         // Handle query parameter
         let qStr;
-        if (typeof query === 'string') {
-            // String query - treat as raw Drive query
-            qStr = `(${query}) and trashed = false`;
-        } else if (query && typeof query === 'object' && 'rawDriveQuery' in query && query.rawDriveQuery) {
+        if (parsedQuery && 'rawDriveQuery' in parsedQuery && parsedQuery.rawDriveQuery) {
             // Object with rawDriveQuery field - use it directly
-            qStr = `(${query.rawDriveQuery}) and trashed = false`;
-        } else {
+            qStr = parsedQuery.rawDriveQuery;
+        } else if (parsedQuery) {
             // Structured query object - convert to Drive query string
-            const { q } = toDriveQuery(query);
-            qStr = q ? `(${q}) and trashed = false` : 'trashed = false';
+            const { q } = toDriveQuery(parsedQuery);
+            qStr = q || '';
+        } else {
+            qStr = '';
         }
         const listOptions = {
-            q: qStr,
             pageSize: validPageSize,
             fields: 'files(id,name,mimeType,webViewLink,modifiedTime,parents,shared,starred,owners),nextPageToken',
             orderBy: 'modifiedTime desc'
         };
+        if (qStr.trim().length > 0) {
+            listOptions.q = qStr;
+        }
         if (pageToken && pageToken.trim().length > 0) {
             listOptions.pageToken = pageToken;
         }
@@ -170,7 +172,7 @@ async function handler({ query, pageSize = 50, pageToken, fields, shape = 'array
         });
         const filteredItems = items.map((item)=>filterFields(item, requestedFields));
         logger.info('drive.files-search returning', {
-            query,
+            query: parsedQuery,
             pageSize,
             resultCount: filteredItems.length,
             fields: fields || 'all'
@@ -210,36 +212,7 @@ async function handler({ query, pageSize = 50, pageToken, fields, shape = 'array
         logger.error('drive.files-search error', {
             error: message
         });
-        // Check if this is a Drive API validation error (invalid query, invalid pageToken, etc.)
-        // These should return empty results rather than throw
-        const isDriveValidationError = message.includes('Invalid Value') || message.includes('Invalid value') || message.includes('File not found') || message.includes('Bad Request');
-        if (isDriveValidationError) {
-            // Return empty result set for validation errors
-            const result = shape === 'arrays' ? {
-                type: 'success',
-                shape: 'arrays',
-                columns: [],
-                rows: [],
-                count: 0
-            } : {
-                type: 'success',
-                shape: 'objects',
-                items: [],
-                count: 0
-            };
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify(result)
-                    }
-                ],
-                structuredContent: {
-                    result
-                }
-            };
-        }
-        // Throw McpError for other errors
+        // Throw McpError for all errors so callers can see Drive validation details
         throw new McpError(ErrorCode.InternalError, `Error searching files: ${message}`, {
             stack: error instanceof Error ? error.stack : undefined
         });

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

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/Projects/mcp-z/mcp-drive/src/mcp/tools/files-search.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, parseFields, toColumnarFormat } from '@mcp-z/server';\nimport { type CallToolResult, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport { type drive_v3, google } from 'googleapis';\nimport { z } from 'zod';\nimport { toDriveQuery } from '../../lib/query-builder.ts';\nimport { DRIVE_FILE_COMMON_PATTERNS, DRIVE_FILE_FIELD_DESCRIPTIONS, DRIVE_FILE_FIELDS, type DriveFile, DriveFileSchema, DriveQuerySchema } from '../../schemas/index.ts';\n\nconst inputSchema = z.object({\n  query: DriveQuerySchema.describe('Drive query object with structured search fields. See DriveQuerySchema for detailed query syntax and examples.'),\n  fields: createFieldsSchema({\n    availableFields: DRIVE_FILE_FIELDS,\n    fieldDescriptions: DRIVE_FILE_FIELD_DESCRIPTIONS,\n    commonPatterns: DRIVE_FILE_COMMON_PATTERNS,\n    resourceName: 'Drive file',\n  }),\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).describe('Matching Drive files'),\n  count: z.number().describe('Number of files 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 files 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 Drive Files',\n  description: 'Search Google Drive files with flexible field selection for optimal performance.',\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 driveFile = drive_v3.Schema$File;\n\ntype driveResponse = drive_v3.Schema$FileList;\n\nasync function handler({ query, pageSize = 50, pageToken, fields, shape = 'arrays' }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n\n  const requestedFields = parseFields(fields, DRIVE_FILE_FIELDS);\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.files-search called', {\n    query,\n    pageSize: validPageSize,\n    pageToken: pageToken ? '[provided]' : undefined,\n    fields: fields || 'all',\n  });\n\n  try {\n    const drive = google.drive({ version: 'v3', auth: extra.authContext.auth });\n\n    // Handle query parameter\n    let qStr: string;\n    if (typeof query === 'string') {\n      // String query - treat as raw Drive query\n      qStr = `(${query}) and trashed = false`;\n    } else if (query && typeof query === 'object' && 'rawDriveQuery' in query && query.rawDriveQuery) {\n      // Object with rawDriveQuery field - use it directly\n      qStr = `(${query.rawDriveQuery}) and trashed = false`;\n    } else {\n      // Structured query object - convert to Drive query string\n      const { q } = toDriveQuery(query);\n      qStr = q ? `(${q}) and trashed = false` : 'trashed = false';\n    }\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    const res = response.data as driveResponse;\n    const files = Array.isArray(res?.files) ? res.files : [];\n\n    const parentIds = new Set<string>();\n    for (const f of files) {\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    const items: DriveFile[] = files.map((f: driveFile) => {\n      const id = f?.id ? String(f.id) : 'unknown';\n      const name = f?.name || id;\n      const result: DriveFile = { 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      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 != null) result.shared = f.shared;\n      if (f?.starred != null) 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 != null) 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      return result;\n    });\n\n    const filteredItems = items.map((item) => filterFields(item, requestedFields));\n\n    logger.info('drive.files-search returning', {\n      query,\n      pageSize,\n      resultCount: filteredItems.length,\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),\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.files-search error', { error: message });\n\n    // Check if this is a Drive API validation error (invalid query, invalid pageToken, etc.)\n    // These should return empty results rather than throw\n    const isDriveValidationError = message.includes('Invalid Value') || message.includes('Invalid value') || message.includes('File not found') || message.includes('Bad Request');\n\n    if (isDriveValidationError) {\n      // Return empty result set for validation errors\n      const result: Output =\n        shape === 'arrays'\n          ? {\n              type: 'success' as const,\n              shape: 'arrays' as const,\n              columns: [],\n              rows: [],\n              count: 0,\n            }\n          : {\n              type: 'success' as const,\n              shape: 'objects' as const,\n              items: [],\n              count: 0,\n            };\n\n      return {\n        content: [\n          {\n            type: 'text' as const,\n            text: JSON.stringify(result),\n          },\n        ],\n        structuredContent: { result },\n      };\n    }\n\n    // Throw McpError for other errors\n    throw new McpError(ErrorCode.InternalError, `Error searching files: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'files-search' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","createFieldsSchema","createPaginationSchema","createShapeSchema","filterFields","parseFields","toColumnarFormat","ErrorCode","McpError","google","z","toDriveQuery","DRIVE_FILE_COMMON_PATTERNS","DRIVE_FILE_FIELD_DESCRIPTIONS","DRIVE_FILE_FIELDS","DriveFileSchema","DriveQuerySchema","inputSchema","object","query","describe","fields","availableFields","fieldDescriptions","commonPatterns","resourceName","defaultPageSize","maxPageSize","provider","shape","successObjectsBranchSchema","type","literal","items","array","count","number","nextPageToken","string","optional","successArraysBranchSchema","columns","rows","unknown","outputSchema","union","config","title","description","result","handler","pageSize","pageToken","extra","logger","requestedFields","validPageSize","Math","max","min","floor","info","undefined","drive","version","auth","authContext","qStr","rawDriveQuery","q","listOptions","orderBy","trim","length","response","files","list","res","data","Array","isArray","parentIds","Set","f","parents","parentId","add","parentNameMap","Map","size","parentFetches","from","map","parentRes","get","fileId","parentName","name","set","e","error","Promise","all","id","String","mimeType","webViewLink","modifiedTime","shared","starred","owners","o","owner","displayName","emailAddress","kind","me","permissionId","photoLink","filteredItems","item","resultCount","content","text","JSON","stringify","structuredContent","message","Error","isDriveValidationError","includes","InternalError","stack","createTool"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/Projects/mcp-z/mcp-drive/src/mcp/tools/files-search.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, parseFields, toColumnarFormat } from '@mcp-z/server';\nimport { type CallToolResult, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport { type drive_v3, google } from 'googleapis';\nimport { z } from 'zod';\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';\n\nconst inputSchema = z.object({\n  query: DriveQueryParameterSchema.describe('Structured Drive query object or JSON string. Use rawDriveQuery for raw Drive syntax.'),\n  fields: createFieldsSchema({\n    availableFields: DRIVE_FILE_FIELDS,\n    fieldDescriptions: DRIVE_FILE_FIELD_DESCRIPTIONS,\n    commonPatterns: DRIVE_FILE_COMMON_PATTERNS,\n    resourceName: 'Drive file',\n  }),\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).describe('Matching Drive files'),\n  count: z.number().describe('Number of files 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 files 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 Drive Files',\n  description: 'Search Google Drive files with flexible field selection for optimal performance.',\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 driveFile = drive_v3.Schema$File;\n\ntype driveResponse = drive_v3.Schema$FileList;\n\nasync function handler({ query, 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);\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.files-search called', {\n      query: parsedQuery,\n      pageSize: validPageSize,\n      pageToken: pageToken ? '[provided]' : undefined,\n      fields: fields || 'all',\n    });\n\n    const drive = google.drive({ version: 'v3', auth: extra.authContext.auth });\n\n    // Handle query parameter\n    let qStr: string;\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    const listOptions: {\n      q?: string;\n      pageSize: number;\n      fields: string;\n      orderBy: string;\n      pageToken?: string;\n    } = {\n      pageSize: validPageSize,\n      fields: 'files(id,name,mimeType,webViewLink,modifiedTime,parents,shared,starred,owners),nextPageToken',\n      orderBy: 'modifiedTime desc',\n    };\n    if (qStr.trim().length > 0) {\n      listOptions.q = qStr;\n    }\n    if (pageToken && pageToken.trim().length > 0) {\n      listOptions.pageToken = pageToken;\n    }\n\n    const response = await drive.files.list(listOptions);\n    const res = response.data as driveResponse;\n    const files = Array.isArray(res?.files) ? res.files : [];\n\n    const parentIds = new Set<string>();\n    for (const f of files) {\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    const items: DriveFile[] = files.map((f: driveFile) => {\n      const id = f?.id ? String(f.id) : 'unknown';\n      const name = f?.name || id;\n      const result: DriveFile = { 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      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 != null) result.shared = f.shared;\n      if (f?.starred != null) 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 != null) 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      return result;\n    });\n\n    const filteredItems = items.map((item) => filterFields(item, requestedFields));\n\n    logger.info('drive.files-search returning', {\n      query: parsedQuery,\n      pageSize,\n      resultCount: filteredItems.length,\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),\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.files-search error', { error: message });\n\n    // Throw McpError for all errors so callers can see Drive validation details\n    throw new McpError(ErrorCode.InternalError, `Error searching files: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'files-search' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","createFieldsSchema","createPaginationSchema","createShapeSchema","filterFields","parseFields","toColumnarFormat","ErrorCode","McpError","google","z","toDriveQuery","DRIVE_FILE_COMMON_PATTERNS","DRIVE_FILE_FIELD_DESCRIPTIONS","DRIVE_FILE_FIELDS","DriveFileSchema","DriveQueryParameterSchema","parseDriveQueryParameter","inputSchema","object","query","describe","fields","availableFields","fieldDescriptions","commonPatterns","resourceName","defaultPageSize","maxPageSize","provider","shape","successObjectsBranchSchema","type","literal","items","array","count","number","nextPageToken","string","optional","successArraysBranchSchema","columns","rows","unknown","outputSchema","union","config","title","description","result","handler","pageSize","pageToken","extra","logger","parsedQuery","requestedFields","validPageSize","Math","max","min","floor","info","undefined","drive","version","auth","authContext","qStr","rawDriveQuery","q","listOptions","orderBy","trim","length","response","files","list","res","data","Array","isArray","parentIds","Set","f","parents","parentId","add","parentNameMap","Map","size","parentFetches","from","map","parentRes","get","fileId","parentName","name","set","e","error","Promise","all","id","String","mimeType","webViewLink","modifiedTime","shared","starred","owners","o","owner","displayName","emailAddress","kind","me","permissionId","photoLink","filteredItems","item","resultCount","content","text","JSON","stringify","structuredContent","message","Error","InternalError","stack","createTool"],"mappings":"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"}

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

@@ -8,7 +8,7 @@ declare const inputSchema: z.ZodObject<{
     }>>>;
     pageSize: z.ZodDefault<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
     pageToken: z.ZodOptional<z.ZodString>;
-    query: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodType<import("../../types.js").DriveQueryObject, unknown, z.core.$ZodTypeInternals<import("../../types.js").DriveQueryObject, unknown>>]>>;
+    query: z.ZodOptional<z.ZodType<string | import("../../types.js").DriveQueryObject, unknown, z.core.$ZodTypeInternals<string | import("../../types.js").DriveQueryObject, unknown>>>;
     fields: z.ZodOptional<z.ZodString>;
     resolvePaths: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
@@ -77,7 +77,7 @@ export default function createTool(): {
             }>>>;
             pageSize: z.ZodDefault<z.ZodOptional<z.ZodCoercedNumber<unknown>>>;
             pageToken: z.ZodOptional<z.ZodString>;
-            query: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodType<import("../../types.js").DriveQueryObject, unknown, z.core.$ZodTypeInternals<import("../../types.js").DriveQueryObject, unknown>>]>>;
+            query: z.ZodOptional<z.ZodType<string | import("../../types.js").DriveQueryObject, unknown, z.core.$ZodTypeInternals<string | import("../../types.js").DriveQueryObject, unknown>>>;
             fields: z.ZodOptional<z.ZodString>;
             resolvePaths: z.ZodOptional<z.ZodBoolean>;
         }, z.core.$strip>;

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

@@ -5,9 +5,9 @@ import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
 import { google } from 'googleapis';
 import { z } from 'zod';
 import { toDriveQuery } from '../../lib/query-builder.js';
-import { DRIVE_FILE_COMMON_PATTERNS, DRIVE_FILE_FIELD_DESCRIPTIONS, DRIVE_FILE_FIELDS, DriveFileSchema, DriveQuerySchema } from '../../schemas/index.js';
+import { DRIVE_FILE_COMMON_PATTERNS, DRIVE_FILE_FIELD_DESCRIPTIONS, DRIVE_FILE_FIELDS, DriveFileSchema, DriveQueryParameterSchema, parseDriveQueryParameter } from '../../schemas/index.js';
 const inputSchema = z.object({
-    query: DriveQuerySchema.optional().describe('Drive query object with structured search fields. See DriveQuerySchema for detailed query syntax and examples.'),
+    query: DriveQueryParameterSchema.optional().describe('Structured Drive query object or JSON string. Use rawDriveQuery for raw Drive syntax.'),
     fields: createFieldsSchema({
         availableFields: [
             ...DRIVE_FILE_FIELDS,
@@ -125,40 +125,38 @@ const config = {
 }
 async function handler({ query, resolvePaths = false, pageSize = 50, pageToken, fields, shape = 'arrays' }, extra) {
     const logger = extra.logger;
-    const requestedFields = parseFields(fields, [
-        ...DRIVE_FILE_FIELDS,
-        'path'
-    ]);
-    // Validate and clamp pageSize to Google Drive API limits (1-1000)
-    const validPageSize = Math.max(1, Math.min(1000, Math.floor(pageSize || 50)));
-    logger.info('drive.folder.search called', {
-        query,
-        resolvePaths,
-        pageSize: validPageSize,
-        pageToken: pageToken ? '[provided]' : undefined,
-        fields: fields || 'all'
-    });
     try {
+        const parsedQuery = parseDriveQueryParameter(query);
+        const requestedFields = parseFields(fields, [
+            ...DRIVE_FILE_FIELDS,
+            'path'
+        ]);
+        // Validate and clamp pageSize to Google Drive API limits (1-1000)
+        const validPageSize = Math.max(1, Math.min(1000, Math.floor(pageSize || 50)));
+        logger.info('drive.folder.search called', {
+            query: parsedQuery,
+            resolvePaths,
+            pageSize: validPageSize,
+            pageToken: pageToken ? '[provided]' : undefined,
+            fields: fields || 'all'
+        });
         const drive = google.drive({
             version: 'v3',
             auth: extra.authContext.auth
         });
         const folderMimeType = 'application/vnd.google-apps.folder';
         let qStr;
-        if (typeof query === 'string') {
-            // String query - treat as raw Drive query
-            qStr = `(${query}) and mimeType='${folderMimeType}' and trashed = false`;
-        } else if (query && typeof query === 'object' && 'rawDriveQuery' in query && query.rawDriveQuery) {
+        if (parsedQuery && 'rawDriveQuery' in parsedQuery && parsedQuery.rawDriveQuery) {
             // Object with rawDriveQuery field - use it directly
-            qStr = `(${query.rawDriveQuery}) and mimeType='${folderMimeType}' and trashed = false`;
-        } else if (query) {
+            qStr = parsedQuery.rawDriveQuery;
+        } else if (parsedQuery) {
             // Structured query object - convert to Drive query string
-            const { q } = toDriveQuery(query);
-            qStr = q ? `(${q}) and mimeType='${folderMimeType}' and trashed = false` : `mimeType='${folderMimeType}' and trashed = false`;
+            const { q } = toDriveQuery(parsedQuery);
+            qStr = q || '';
         } else {
-            // No query - return all folders
-            qStr = `mimeType='${folderMimeType}' and trashed = false`;
+            qStr = '';
         }
+        qStr = qStr ? `(${qStr}) and mimeType='${folderMimeType}'` : `mimeType='${folderMimeType}'`;
         const listOptions = {
             q: qStr,
             pageSize: validPageSize,
@@ -255,7 +253,7 @@ async function handler({ query, resolvePaths = false, pageSize = 50, pageToken,
         }));
         const filteredItems = items.map((item)=>filterFields(item, requestedFields));
         logger.info('drive.folder.search returning', {
-            query,
+            query: parsedQuery,
             pageSize,
             resultCount: filteredItems.length,
             resolvePaths,
@@ -299,36 +297,7 @@ async function handler({ query, resolvePaths = false, pageSize = 50, pageToken,
         logger.error('drive.folder.search error', {
             error: message
         });
-        // Check if this is a Drive API validation error (invalid query, invalid pageToken, etc.)
-        // These should return empty results rather than throw
-        const isDriveValidationError = message.includes('Invalid Value') || message.includes('Invalid value') || message.includes('File not found') || message.includes('Bad Request');
-        if (isDriveValidationError) {
-            // Return empty result set for validation errors
-            const result = shape === 'arrays' ? {
-                type: 'success',
-                shape: 'arrays',
-                columns: [],
-                rows: [],
-                count: 0
-            } : {
-                type: 'success',
-                shape: 'objects',
-                items: [],
-                count: 0
-            };
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify(result)
-                    }
-                ],
-                structuredContent: {
-                    result
-                }
-            };
-        }
-        // Throw McpError for other errors
+        // Throw McpError for all errors so callers can see Drive validation details
         throw new McpError(ErrorCode.InternalError, `Error searching folders: ${message}`, {
             stack: error instanceof Error ? error.stack : undefined
         });

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

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/Projects/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 { createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, parseFields, toColumnarFormat } from '@mcp-z/server';\nimport { type CallToolResult, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport type { drive_v3 } from 'googleapis';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport { toDriveQuery } from '../../lib/query-builder.ts';\nimport { DRIVE_FILE_COMMON_PATTERNS, DRIVE_FILE_FIELD_DESCRIPTIONS, DRIVE_FILE_FIELDS, type DriveFile, DriveFileSchema, DriveQuerySchema } from '../../schemas/index.ts';\nimport type { Logger } from '../../types.ts';\n\nconst inputSchema = z.object({\n  query: DriveQuerySchema.optional().describe('Drive query object with structured search fields. See DriveQuerySchema for detailed query syntax and examples.'),\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  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,\n    resolvePaths,\n    pageSize: validPageSize,\n    pageToken: pageToken ? '[provided]' : undefined,\n    fields: fields || 'all',\n  });\n\n  try {\n    const drive = google.drive({ version: 'v3', auth: extra.authContext.auth });\n\n    const folderMimeType = 'application/vnd.google-apps.folder';\n    let qStr: string;\n\n    if (typeof query === 'string') {\n      // String query - treat as raw Drive query\n      qStr = `(${query}) and mimeType='${folderMimeType}' and trashed = false`;\n    } else if (query && typeof query === 'object' && 'rawDriveQuery' in query && query.rawDriveQuery) {\n      // Object with rawDriveQuery field - use it directly\n      qStr = `(${query.rawDriveQuery}) and mimeType='${folderMimeType}' and trashed = false`;\n    } else if (query) {\n      // Structured query object - convert to Drive query string\n      const { q } = toDriveQuery(query);\n      qStr = q ? `(${q}) and mimeType='${folderMimeType}' and trashed = false` : `mimeType='${folderMimeType}' and trashed = false`;\n    } else {\n      // No query - return all folders\n      qStr = `mimeType='${folderMimeType}' and trashed = false`;\n    }\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,\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    // Check if this is a Drive API validation error (invalid query, invalid pageToken, etc.)\n    // These should return empty results rather than throw\n    const isDriveValidationError = message.includes('Invalid Value') || message.includes('Invalid value') || message.includes('File not found') || message.includes('Bad Request');\n\n    if (isDriveValidationError) {\n      // Return empty result set for validation errors\n      const result: Output =\n        shape === 'arrays'\n          ? {\n              type: 'success' as const,\n              shape: 'arrays' as const,\n              columns: [],\n              rows: [],\n              count: 0,\n            }\n          : {\n              type: 'success' as const,\n              shape: 'objects' as const,\n              items: [],\n              count: 0,\n            };\n\n      return {\n        content: [\n          {\n            type: 'text' as const,\n            text: JSON.stringify(result),\n          },\n        ],\n        structuredContent: { result },\n      };\n    }\n\n    // Throw McpError for other errors\n    throw new McpError(ErrorCode.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":["schemas","AuthRequiredBranchSchema","createFieldsSchema","createPaginationSchema","createShapeSchema","filterFields","parseFields","toColumnarFormat","ErrorCode","McpError","google","z","toDriveQuery","DRIVE_FILE_COMMON_PATTERNS","DRIVE_FILE_FIELD_DESCRIPTIONS","DRIVE_FILE_FIELDS","DriveFileSchema","DriveQuerySchema","inputSchema","object","query","optional","describe","fields","availableFields","fieldDescriptions","path","commonPatterns","resourceName","resolvePaths","boolean","defaultPageSize","maxPageSize","provider","shape","successObjectsBranchSchema","type","literal","items","array","extend","string","count","number","nextPageToken","successArraysBranchSchema","columns","rows","unknown","outputSchema","union","config","title","description","result","resolveFolderPath","drive","folderId","folderCache","logger","pathParts","currentId","visited","Set","has","info","add","cachedName","get","unshift","response","files","fileId","parents","data","length","_e","folderName","name","set","e","error","join","handler","pageSize","pageToken","extra","requestedFields","validPageSize","Math","max","min","floor","undefined","version","auth","authContext","folderMimeType","qStr","rawDriveQuery","q","listOptions","orderBy","trim","list","res","folders","Array","isArray","parentIds","f","parentId","parentNameMap","Map","size","parentFetches","from","map","parentRes","parentName","Promise","all","id","String","mimeType","webViewLink","modifiedTime","shared","starred","owners","o","owner","displayName","emailAddress","kind","me","permissionId","photoLink","filteredItems","item","resultCount","content","text","JSON","stringify","structuredContent","message","Error","isDriveValidationError","includes","InternalError","stack","createTool"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/Projects/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 { createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, parseFields, toColumnarFormat } from '@mcp-z/server';\nimport { type CallToolResult, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport type { drive_v3 } from 'googleapis';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport { 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: 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 McpError for all errors so callers can see Drive validation details\n    throw new McpError(ErrorCode.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":["schemas","AuthRequiredBranchSchema","createFieldsSchema","createPaginationSchema","createShapeSchema","filterFields","parseFields","toColumnarFormat","ErrorCode","McpError","google","z","toDriveQuery","DRIVE_FILE_COMMON_PATTERNS","DRIVE_FILE_FIELD_DESCRIPTIONS","DRIVE_FILE_FIELDS","DriveFileSchema","DriveQueryParameterSchema","parseDriveQueryParameter","inputSchema","object","query","optional","describe","fields","availableFields","fieldDescriptions","path","commonPatterns","resourceName","resolvePaths","boolean","defaultPageSize","maxPageSize","provider","shape","successObjectsBranchSchema","type","literal","items","array","extend","string","count","number","nextPageToken","successArraysBranchSchema","columns","rows","unknown","outputSchema","union","config","title","description","result","resolveFolderPath","drive","folderId","folderCache","logger","pathParts","currentId","visited","Set","has","info","add","cachedName","get","unshift","response","files","fileId","parents","data","length","_e","folderName","name","set","e","error","join","handler","pageSize","pageToken","extra","parsedQuery","requestedFields","validPageSize","Math","max","min","floor","undefined","version","auth","authContext","folderMimeType","qStr","rawDriveQuery","q","listOptions","orderBy","trim","list","res","folders","Array","isArray","parentIds","f","parentId","parentNameMap","Map","size","parentFetches","from","map","parentRes","parentName","Promise","all","id","String","mimeType","webViewLink","modifiedTime","shared","starred","owners","o","owner","displayName","emailAddress","kind","me","permissionId","photoLink","filteredItems","item","resultCount","content","text","JSON","stringify","structuredContent","message","Error","InternalError","stack","createTool"],"mappings":"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"}

package/dist/esm/schemas/drive-query-schema.d.ts

@@ -9,6 +9,30 @@ export declare const FieldOperatorSchema: z.ZodObject<{
     $none: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strict>;
 export type FieldOperator = z.infer<typeof FieldOperatorSchema>;
+/**
+ * Drive query object schema with recursive operators and Drive features.
+ *
+ * Includes Drive-specific features:
+ * - name: Search by file/folder name (supports string or field operators)
+ * - mimeType: Filter by MIME type (e.g., "application/pdf", "application/vnd.google-apps.folder")
+ * - fullText: Search file content and metadata
+ * - parentId: Search within specific folder (supports string or field operators)
+ * - starred: Filter by starred status
+ * - shared: Filter by shared status
+ * - modifiedTime: Date range filtering with $gte and $lt
+ * - owner: Filter by owner email (supports string or field operators)
+ * - rawDriveQuery: Escape hatch for advanced Drive query syntax
+ *
+ * Logical operators:
+ * - $and: Array of conditions that must ALL match (recursive)
+ * - $or: Array of conditions where ANY must match (recursive)
+ * - $not: Nested condition that must NOT match (recursive)
+ *
+ * Note: Cast through unknown to work around Zod's lazy schema type inference issue
+ * with exactOptionalPropertyTypes. The runtime schema is correct; this cast ensures
+ * TypeScript sees the strict DriveQueryObject type everywhere the schema is used.
+ */
+export declare const DriveQuerySchema: z.ZodType<DriveQueryObject>;
 export type DriveQueryObject = {
     $and?: DriveQueryObject[];
     $or?: DriveQueryObject[];
@@ -27,13 +51,15 @@ export type DriveQueryObject = {
     owner?: string | FieldOperator;
     rawDriveQuery?: string;
 };
+export type DriveQuery = DriveQueryObject;
 /**
- * Drive query schema that accepts either:
- * - A structured DriveQueryObject with typed fields
- * - A raw Drive query string for advanced use cases
+ * Drive query parameter schema that accepts either:
+ * - A structured DriveQuery object with typed fields
+ * - A JSON string representing that object
  *
  * This provides type safety for common queries while allowing
- * direct Google Drive query syntax when needed.
+ * JSON string input from MCP clients when needed.
  */
-export declare const DriveQuerySchema: z.ZodUnion<readonly [z.ZodString, z.ZodType<DriveQueryObject, unknown, z.core.$ZodTypeInternals<DriveQueryObject, unknown>>]>;
-export type DriveQuery = string | DriveQueryObject;
+export declare const DriveQueryParameterSchema: z.ZodType<DriveQuery | string>;
+export type DriveQueryParameter = z.infer<typeof DriveQueryParameterSchema>;
+export declare function parseDriveQueryParameter(input: DriveQuery | string | undefined): DriveQuery | undefined;

package/dist/esm/schemas/drive-query-schema.js

@@ -29,11 +29,11 @@ import { z } from 'zod';
  * Note: Cast through unknown to work around Zod's lazy schema type inference issue
  * with exactOptionalPropertyTypes. The runtime schema is correct; this cast ensures
  * TypeScript sees the strict DriveQueryObject type everywhere the schema is used.
- */ const DriveQueryObjectSchema = z.lazy(()=>z.object({
+ */ export const DriveQuerySchema = z.lazy(()=>z.object({
         // Logical operators for combining conditions (recursive)
-        $and: z.array(DriveQueryObjectSchema).optional().describe('Array of conditions that must ALL match'),
-        $or: z.array(DriveQueryObjectSchema).optional().describe('Array of conditions where ANY must match'),
-        $not: DriveQueryObjectSchema.optional().describe('Nested condition that must NOT match'),
+        $and: z.array(DriveQuerySchema).optional().describe('Array of conditions that must ALL match'),
+        $or: z.array(DriveQuerySchema).optional().describe('Array of conditions where ANY must match'),
+        $not: DriveQuerySchema.optional().describe('Nested condition that must NOT match'),
         // File/folder name search
         name: z.union([
             z.string().min(1),
@@ -57,7 +57,7 @@ import { z } from 'zod';
         // Boolean flags
         starred: z.boolean().optional().describe('Filter by starred status (true = starred, false = not starred)'),
         sharedWithMe: z.boolean().optional().describe('Filter by "shared with me" collection (true = in shared collection, false = not shared)'),
-        trashed: z.boolean().optional().describe('Filter by trash status (true = in trash, false = not in trash). Note: Drive tools automatically filter out trashed files unless explicitly requested.'),
+        trashed: z.boolean().optional().describe('Filter by trash status (true = in trash, false = not in trash).'),
         // Date range filtering
         modifiedTime: z.object({
             $gte: z.string().regex(/^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}(\.\d{3})?Z)?$/).optional().describe('Files modified on or after this date (ISO 8601: YYYY-MM-DD or YYYY-MM-DDTHH:mm:ss.sssZ)'),
@@ -72,13 +72,30 @@ import { z } from 'zod';
         rawDriveQuery: z.string().min(1).optional().describe("Raw Google Drive query syntax for advanced use cases. Bypasses schema validation - use sparingly. Example: \"name contains 'budget' and mimeType = 'application/pdf'\"")
     }).strict());
 /**
- * Drive query schema that accepts either:
- * - A structured DriveQueryObject with typed fields
- * - A raw Drive query string for advanced use cases
+ * Drive query parameter schema that accepts either:
+ * - A structured DriveQuery object with typed fields
+ * - A JSON string representing that object
  *
  * This provides type safety for common queries while allowing
- * direct Google Drive query syntax when needed.
- */ export const DriveQuerySchema = z.union([
-    z.string().min(1),
-    DriveQueryObjectSchema
+ * JSON string input from MCP clients when needed.
+ */ export const DriveQueryParameterSchema = z.union([
+    DriveQuerySchema,
+    z.string().min(1)
 ]);
+export function parseDriveQueryParameter(input) {
+    if (input === undefined) return undefined;
+    const raw = typeof input === 'string' ? safeJsonParse(input, 'rawDriveQuery') : input;
+    const validated = DriveQuerySchema.safeParse(raw);
+    if (!validated.success) {
+        throw new Error(`Invalid query JSON: ${validated.error.message}. Use {"rawDriveQuery":"<query>"} for Drive syntax.`);
+    }
+    return validated.data;
+}
+function safeJsonParse(value, rawField) {
+    try {
+        return JSON.parse(value);
+    } catch (error) {
+        const message = error instanceof Error ? error.message : 'Invalid JSON';
+        throw new Error(`Query must be valid JSON. ${message}. Wrap Drive syntax in {"${rawField}":"<query>"} if needed.`);
+    }
+}