@mcp-z/mcp-drive 1.1.3 → 2.1.0

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 { 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":["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","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","McpError","ErrorCode","InternalError","stack"],"mappings":";;;;+BA+VA;;;eAAwBA;;;2BA9VA;sBAImG;qBAClE;0BAElC;mBACL;8BACW;uBACsJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AARnL,IAAM,AAAEC,2BAA6BC,oBAAO,CAApCD;AAWR,IAAME,cAAcC,MAAC,CAACC,MAAM,CAAC;IAC3BC,OAAOC,kCAAyB,CAACC,QAAQ,GAAGC,QAAQ,CAAC;IACrDC,QAAQC,IAAAA,0BAAkB,EAAC;QACzBC,iBAAiB,AAAC,qBAAGC,0BAAiB,SAArB;YAAuB;SAAO;QAC/CC,mBAAmB,wCACdC,sCAA6B;YAChCC,MAAM;;QAERC,gBAAgBC,mCAA0B;QAC1CC,cAAc;IAChB;IACAC,cAAchB,MAAC,CAACiB,OAAO,GAAGb,QAAQ,GAAGC,QAAQ,CAAC;GAC3Ca,IAAAA,8BAAsB,EAAC;IACxBC,iBAAiB;IACjBC,aAAa;IACbC,UAAU;AACZ,GAAGC,KAAK;IACRA,OAAOC,IAAAA,yBAAiB;;AAG1B,8CAA8C;AAC9C,IAAMC,6BAA6BxB,MAAC,CAACC,MAAM,CAAC;IAC1CwB,MAAMzB,MAAC,CAAC0B,OAAO,CAAC;IAChBJ,OAAOtB,MAAC,CAAC0B,OAAO,CAAC;IACjBC,OAAO3B,MAAC,CAAC4B,KAAK,CAACC,wBAAe,CAACC,MAAM,CAAC;QAAElB,MAAMZ,MAAC,CAAC+B,MAAM,GAAG3B,QAAQ,GAAGC,QAAQ,CAAC;IAA2C,IAAIA,QAAQ,CAAC;IACrI2B,OAAOhC,MAAC,CAACiC,MAAM,GAAG5B,QAAQ,CAAC;IAC3B6B,eAAelC,MAAC,CAAC+B,MAAM,GAAG3B,QAAQ,GAAGC,QAAQ,CAAC;AAChD;AAEA,IAAM8B,4BAA4BnC,MAAC,CAACC,MAAM,CAAC;IACzCwB,MAAMzB,MAAC,CAAC0B,OAAO,CAAC;IAChBJ,OAAOtB,MAAC,CAAC0B,OAAO,CAAC;IACjBU,SAASpC,MAAC,CAAC4B,KAAK,CAAC5B,MAAC,CAAC+B,MAAM,IAAI1B,QAAQ,CAAC;IACtCgC,MAAMrC,MAAC,CAAC4B,KAAK,CAAC5B,MAAC,CAAC4B,KAAK,CAAC5B,MAAC,CAACsC,OAAO,KAAKjC,QAAQ,CAAC;IAC7C2B,OAAOhC,MAAC,CAACiC,MAAM,GAAG5B,QAAQ,CAAC;IAC3B6B,eAAelC,MAAC,CAAC+B,MAAM,GAAG3B,QAAQ,GAAGC,QAAQ,CAAC;AAChD;AAEA,2CAA2C;AAC3C,uGAAuG;AACvG,IAAMkC,eAAevC,MAAC,CAACwC,KAAK,CAAC;IAAChB;IAA4BW;IAA2BtC;CAAyB;AAE9G,IAAM4C,SAAS;IACbC,OAAO;IACPC,aAAa;IACb5C,aAAaA;IACbwC,cAAcvC,MAAC,CAACC,MAAM,CAAC;QACrB2C,QAAQL;IACV;AACF;AA8BA;;;CAGC,GACD,SAAeM,kBAAkBC,KAAqB,EAAEC,QAAgB,EAAEC,WAAgC,EAAEC,MAAc;;YAGlHC,WACFC,WACEC,SAcIC,YAOEC,UAIAC,SAECC,IASDF,WAIAG,YACAF,UAQCG;;;;oBArDb,IAAIX,aAAa,QAAQ;;wBAAO;;oBAE1BG;oBACFC,YAAYJ;oBACVK,UAAU,IAAIO;;;yBAEbR,CAAAA,aAAaA,cAAc,MAAK;;;;oBACrC,yBAAyB;oBACzB,IAAIC,QAAQQ,GAAG,CAACT,YAAY;wBAC1BF,OAAOY,IAAI,CAAC,sCAAsC;4BAChDd,UAAUI;wBACZ;wBACA;;;;oBACF;oBACAC,QAAQU,GAAG,CAACX;yBAGRH,YAAYY,GAAG,CAACT,YAAhBH;;;;oBACIK,aAAaL,YAAYe,GAAG,CAACZ;oBACnC,IAAIE,YAAY;wBACdH,UAAUc,OAAO,CAACX;oBACpB;;;;;;;;;oBAImB;;wBAAMP,MAAMmB,KAAK,CAACF,GAAG,CAAC;4BACrCG,QAAQf;4BACR7C,QAAQ;wBACV;;;oBAHMgD,WAAW;oBAIXC,UAAUD,SAASa,IAAI,CAACZ,OAAO;oBACrCJ,YAAY,AAACI,CAAAA,WAAWA,QAAQa,MAAM,GAAG,IAAIb,OAAO,CAAC,EAAE,GAAG,EAAC,KAAM;;;;;;oBAC1DC;oBACPP,OAAOY,IAAI,CAAC,0CAA0C;wBACpDd,UAAUI;oBACZ;oBACA;;;;;;;;;;;;;;;;oBAKiB;;wBAAML,MAAMmB,KAAK,CAACF,GAAG,CAAC;4BACrCG,QAAQf;4BACR7C,QAAQ;wBACV;;;oBAHMgD,YAAW;oBAIXG,aAAaH,UAASa,IAAI,CAACE,IAAI;oBAC/Bd,WAAUD,UAASa,IAAI,CAACZ,OAAO;oBAErC,IAAIE,YAAY;wBACdT,YAAYsB,GAAG,CAACnB,WAAWM;wBAC3BP,UAAUc,OAAO,CAACP;oBACpB;oBAEAN,YAAY,AAACI,CAAAA,YAAWA,SAAQa,MAAM,GAAG,IAAIb,QAAO,CAAC,EAAE,GAAG,EAAC,KAAM;;;;;;oBAC1DG;oBACPT,OAAOY,IAAI,CAAC,iCAAiC;wBAC3Cd,UAAUI;wBACVoB,OAAOb;oBACT;oBACA;;;;;;;;;;oBAKN;;wBAAQ,IAAuB,OAApBR,UAAUsB,IAAI,CAAC;;;;IAC5B;;AAEA,SAAeC;wCAAQ,KAA0F,EAAEC,KAAoB;YAA9GxE,4BAAOc,+BAAsB2D,UAAeC,WAAWtE,sBAAQgB,OAChF2B,QAGE4B,aACAC,iBAGAC,eAUAjC,OAEAkC,gBACFC,MAOMC,GAQJC,aAgBA7B,UAEA8B,KACAC,SAEAC,WACD,2BAAA,mBAAA,gBAAA,WAAA,OAAMC,GAEF,4BAAA,oBAAA,iBAAA,YAAA,QAAMC,UAQTC,eAGEC,eAiBF1C,aAEArB,OA+CAgE,eAUAzD,eAGAU,QA0BC2B,OACDqB;;;;oBAjLe1F,QAAF,MAAEA,6BAAF,MAASc,cAAAA,gDAAe,+CAAxB,MAA+B2D,UAAAA,wCAAW,sBAAIC,YAA9C,MAA8CA,WAAWtE,SAAzD,MAAyDA,uBAAzD,MAAiEgB,OAAAA,kCAAQ;oBACxF2B,SAASyB,MAAMzB,MAAM;;;;;;;;;oBAGnB4B,cAAcgB,IAAAA,iCAAwB,EAAC3F;oBACvC4E,kBAAkBgB,IAAAA,mBAAW,EAACxF,QAAQ,AAAC,qBAAGG,0BAAiB;wBAAE;;oBAEnE,kEAAkE;oBAC5DsE,gBAAgBgB,KAAKC,GAAG,CAAC,GAAGD,KAAKE,GAAG,CAAC,MAAMF,KAAKG,KAAK,CAACvB,YAAY;oBAExE1B,OAAOY,IAAI,CAAC,8BAA8B;wBACxC3D,OAAO2E;wBACP7D,cAAAA;wBACA2D,UAAUI;wBACVH,WAAWA,YAAY,eAAeuB;wBACtC7F,QAAQA,UAAU;oBACpB;oBAEMwC,QAAQsD,kBAAM,CAACtD,KAAK,CAAC;wBAAEuD,SAAS;wBAAMC,MAAM5B,MAAM6B,WAAW,CAACD,IAAI;oBAAC;oBAEnEtB,iBAAiB;oBAGvB,IAAIH,eAAe,mBAAmBA,eAAeA,YAAY2B,aAAa,EAAE;wBAC9E,oDAAoD;wBACpDvB,OAAOJ,YAAY2B,aAAa;oBAClC,OAAO,IAAI3B,aAAa;wBACtB,0DAA0D;wBAClDK,IAAMuB,IAAAA,4BAAY,EAAC5B,aAAnBK;wBACRD,OAAOC,KAAK;oBACd,OAAO;wBACLD,OAAO;oBACT;oBAEAA,OAAOA,OAAO,AAAC,IAA0BD,OAAvBC,MAAK,oBAAiC,OAAfD,gBAAe,OAAK,AAAC,aAA2B,OAAfA,gBAAe;oBAEnFG,cAMF;wBACFD,GAAGD;wBACHN,UAAUI;wBACVzE,QAAQ;wBACRoG,SAAS;oBACX;oBACA,IAAI9B,aAAaA,UAAU+B,IAAI,GAAGvC,MAAM,GAAG,GAAG;wBAC5Ce,YAAYP,SAAS,GAAGA;oBAC1B;oBAEiB;;wBAAM9B,MAAMmB,KAAK,CAAC2C,IAAI,CAACzB;;;oBAAlC7B,WAAW;oBAEX8B,MAAM9B,SAASa,IAAI;oBACnBkB,UAAUwB,MAAMC,OAAO,CAAC1B,gBAAAA,0BAAAA,IAAKnB,KAAK,IAAImB,IAAInB,KAAK;oBAE/CqB,YAAY,IAAI3B;oBACjB,kCAAA,2BAAA;;wBAAL,IAAK,YAAW0B,8BAAX,6BAAA,QAAA,yBAAA,iCAAoB;4BAAdE,IAAN;4BACH,IAAIA,CAAAA,cAAAA,wBAAAA,EAAGhC,OAAO,KAAIgC,EAAEhC,OAAO,CAACa,MAAM,GAAG,GAAG;gCACjC,mCAAA,4BAAA;;oCAAL,IAAK,aAAkBmB,EAAEhC,OAAO,uBAA3B,8BAAA,SAAA,0BAAA,kCAA6B;wCAAvBiC,WAAN;wCACH,IAAIA,YAAYA,aAAa,QAAQ;4CACnCF,UAAUxB,GAAG,CAAC0B;wCAChB;oCACF;;oCAJK;oCAAA;;;6CAAA,8BAAA;4CAAA;;;4CAAA;kDAAA;;;;4BAKP;wBACF;;wBARK;wBAAA;;;iCAAA,6BAAA;gCAAA;;;gCAAA;sCAAA;;;;oBAUCC,gBAAgB,IAAIsB;yBACtBzB,CAAAA,UAAU0B,IAAI,GAAG,CAAA,GAAjB1B;;;;oBACFrC,OAAOY,IAAI,CAAC,yBAAyB;wBAAE7B,OAAOsD,UAAU0B,IAAI;oBAAC;oBACvDtB,gBAAgBmB,MAAMI,IAAI,CAAC3B,WAAW4B,GAAG,CAAC,SAAO1B;;gCAE7C2B,WAIAC,YAEC1D;;;;;;;;;;wCANW;;4CAAMZ,MAAMmB,KAAK,CAACF,GAAG,CAAC;gDACtCG,QAAQsB;gDACRlF,QAAQ;4CACV;;;wCAHM6G,YAAY;wCAIZC,aAAa,AAACD,UAAUhD,IAAI,CAACE,IAAI,IAA2BmB;wCAClEC,cAAcnB,GAAG,CAACkB,UAAU4B;;;;;;wCACrB1D;wCACPT,OAAOY,IAAI,CAAC,+BAA+B;4CAAE2B,UAAAA;4CAAUjB,OAAOb;wCAAE;wCAChE+B,cAAcnB,GAAG,CAACkB,UAAUA,WAAW,iBAAiB;;;;;;;;;;;wBAE5D;;oBACA;;wBAAM6B,QAAQC,GAAG,CAAC5B;;;oBAAlB;;;oBAGF,oEAAoE;oBAC9D1C,cAAc,IAAI+D;oBAEyB;;wBAAMM,QAAQC,GAAG,CAChEjC,QAAQ6B,GAAG,CAAC,SAAO3B;;oCACXgC,IACAlD,MACAzB;;;;4CAFA2E,KAAKhC,CAAAA,cAAAA,wBAAAA,EAAGgC,EAAE,IAAGC,OAAOjC,EAAEgC,EAAE,IAAI;4CAC5BlD,OAAOkB,CAAAA,cAAAA,wBAAAA,EAAGlB,IAAI,KAAIkD;4CAClB3E,SAAwC;gDAAE2E,IAAAA;gDAAIlD,MAAAA;4CAAK;4CAEzD,kDAAkD;4CAClD,IAAIkB,cAAAA,wBAAAA,EAAGkC,QAAQ,EAAE7E,OAAO6E,QAAQ,GAAGlC,EAAEkC,QAAQ;4CAC7C,IAAIlC,cAAAA,wBAAAA,EAAGmC,WAAW,EAAE9E,OAAO8E,WAAW,GAAGnC,EAAEmC,WAAW;4CACtD,IAAInC,cAAAA,wBAAAA,EAAGoC,YAAY,EAAE/E,OAAO+E,YAAY,GAAGpC,EAAEoC,YAAY;4CAEzD,kCAAkC;4CAClC,IAAIpC,CAAAA,cAAAA,wBAAAA,EAAGhC,OAAO,KAAIgC,EAAEhC,OAAO,CAACa,MAAM,GAAG,GAAG;gDACtCxB,OAAOW,OAAO,GAAGgC,EAAEhC,OAAO,CAAC2D,GAAG,CAAC,SAAC1B;oDAC9B,IAAIA,aAAa,QAAQ;wDACvB,OAAO;4DAAE+B,IAAI;4DAAQlD,MAAM;wDAAW;oDACxC;oDACA,IAAM+C,aAAa3B,cAAc1B,GAAG,CAACyB,aAAaA;oDAClD,OAAO;wDAAE+B,IAAI/B;wDAAUnB,MAAM+C;oDAAW;gDAC1C;4CACF;4CAEA,IAAI7B,CAAAA,cAAAA,wBAAAA,EAAGqC,MAAM,MAAKzB,WAAWvD,OAAOgF,MAAM,GAAGrC,EAAEqC,MAAM;4CACrD,IAAIrC,CAAAA,cAAAA,wBAAAA,EAAGsC,OAAO,MAAK1B,WAAWvD,OAAOiF,OAAO,GAAGtC,EAAEsC,OAAO;4CAExD,IAAItC,CAAAA,cAAAA,wBAAAA,EAAGuC,MAAM,KAAIvC,EAAEuC,MAAM,CAAC1D,MAAM,GAAG,GAAG;gDACpCxB,OAAOkF,MAAM,GAAGvC,EAAEuC,MAAM,CAACZ,GAAG,CAAC,SAACa;oDAC5B,IAAMC,QAAkD,CAAC;oDACzD,IAAID,cAAAA,wBAAAA,EAAGE,WAAW,EAAED,MAAMC,WAAW,GAAGF,EAAEE,WAAW;oDACrD,IAAIF,cAAAA,wBAAAA,EAAGG,YAAY,EAAEF,MAAME,YAAY,GAAGH,EAAEG,YAAY;oDACxD,IAAIH,cAAAA,wBAAAA,EAAGI,IAAI,EAAEH,MAAMG,IAAI,GAAGJ,EAAEI,IAAI;oDAChC,IAAIJ,CAAAA,cAAAA,wBAAAA,EAAGK,EAAE,MAAKjC,WAAW6B,MAAMI,EAAE,GAAGL,EAAEK,EAAE;oDACxC,IAAIL,cAAAA,wBAAAA,EAAGM,YAAY,EAAEL,MAAMK,YAAY,GAAGN,EAAEM,YAAY;oDACxD,IAAIN,cAAAA,wBAAAA,EAAGO,SAAS,EAAEN,MAAMM,SAAS,GAAGP,EAAEO,SAAS;oDAC/C,OAAON;gDACT;4CACF;iDAGIhH,CAAAA,gBAAgBuG,OAAO,SAAQ,GAA/BvG;;;;4CACY;;gDAAM6B,kBAAkBC,OAAOyE,IAAIvE,aAAaC;;;4CAA9DL,OAAOhC,IAAI,GAAG;;;4CAGhB;;gDAAOgC;;;;4BACT;;;;oBA5CIjB,QAA2C;oBA+C3CgE,gBAAgBhE,MAAMuF,GAAG,CAAC,SAACqB;+BAASC,IAAAA,oBAAY,EAACD,MAAMzD;;oBAE7D7B,OAAOY,IAAI,CAAC,iCAAiC;wBAC3C3D,OAAO2E;wBACPF,UAAAA;wBACA8D,aAAa9C,cAAcvB,MAAM;wBACjCpD,cAAAA;wBACAV,QAAQA,UAAU;oBACpB;oBAEM4B,gBAAgBkD,IAAIlD,aAAa,IAAIkD,IAAIlD,aAAa,CAACyE,IAAI,GAAGvC,MAAM,GAAG,IAAIgB,IAAIlD,aAAa,GAAGiE;oBAErG,8BAA8B;oBACxBvD,SACJtB,UAAU,WACN;wBACEG,MAAM;wBACNH,OAAO;uBACJoH,IAAAA,wBAAgB,EAAC/C,eAAeb,iBAAiB,AAAC,qBAAGrE,0BAAiB;wBAAE;;wBAC3EuB,OAAO2D,cAAcvB,MAAM;wBACvBlC,iBAAiB;wBAAEA,eAAAA;oBAAc,KAEvC;wBACET,MAAM;wBACNH,OAAO;wBACPK,OAAOgE;wBACP3D,OAAO2D,cAAcvB,MAAM;uBACvBlC,iBAAiB;wBAAEA,eAAAA;oBAAc;oBAG7C;;wBAAO;4BACLyG,OAAO;gCACL;oCACElH,MAAM;oCACNmH,MAAMC,KAAKC,SAAS,CAAClG;gCACvB;;4BAEFmG,mBAAmB;gCAAEnG,QAAAA;4BAAO;wBAC9B;;;oBACO2B;oBACDqB,UAAUrB,AAAK,YAALA,OAAiByE,SAAQzE,MAAMqB,OAAO,GAAG4B,OAAOjD;oBAChEtB,OAAOsB,KAAK,CAAC,6BAA6B;wBAAEA,OAAOqB;oBAAQ;oBAE3D,4EAA4E;oBAC5E,MAAM,IAAIqD,eAAQ,CAACC,gBAAS,CAACC,aAAa,EAAE,AAAC,4BAAmC,OAARvD,UAAW;wBACjFwD,OAAO7E,AAAK,YAALA,OAAiByE,SAAQzE,MAAM6E,KAAK,GAAGjD;oBAChD;;;;;;;IAEJ;;AAEe,SAASvG;IACtB,OAAO;QACLyE,MAAM;QACN5B,QAAAA;QACAgC,SAAAA;IACF;AACF"}
+{"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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"}

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

@@ -1,4 +1,4 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+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>;

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

@@ -1,4 +1,4 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+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>;

package/dist/cjs/setup/http.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "createHTTPServer", {
     }
 });
 var _server = require("@mcp-z/server");
-var _mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var _cors = /*#__PURE__*/ _interop_require_default(require("cors"));
 var _express = /*#__PURE__*/ _interop_require_default(require("express"));
 var _runtimets = require("./runtime.js");
@@ -192,7 +191,7 @@ 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 _mcp.McpServer({
+                    mcpServer = new _server.McpServer({
                         name: config.name,
                         version: config.version
                     });

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, registerPrompts, registerResources, registerTools } from '@mcp-z/server';\nimport { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\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  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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"}

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

@@ -1,4 +1,4 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer } from '@mcp-z/server';
 import type { RuntimeOverrides, ServerConfig } from '../types.js';
 export declare function createStdioServer(config: ServerConfig, overrides?: RuntimeOverrides): Promise<{
     mcpServer: McpServer;

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

@@ -1,4 +1,4 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer } from '@mcp-z/server';
 import type { RuntimeOverrides, ServerConfig } from '../types.js';
 export declare function createStdioServer(config: ServerConfig, overrides?: RuntimeOverrides): Promise<{
     mcpServer: McpServer;

package/dist/cjs/setup/stdio.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "createStdioServer", {
     }
 });
 var _server = require("@mcp-z/server");
-var _mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var _runtimets = require("./runtime.js");
 function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
@@ -183,7 +182,7 @@ 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 _mcp.McpServer({
+                    mcpServer = new _server.McpServer({
                         name: config.name,
                         version: config.version
                     });

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, registerPrompts, registerResources, registerTools } from '@mcp-z/server';\nimport { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';\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":";;;;+BAKsBA;;;eAAAA;;;sBAL6E;mBACzE;yBAEW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,cAAS,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  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"}

package/dist/esm/index.js

@@ -8,7 +8,7 @@ import * as _setup from './setup/index.js';
 export { _setup as setup };
 export * from './types.js';
 export async function startServer(config) {
-    // createHTTPServer/createStdioServer pull in @modelcontextprotocol/sdk and every mcp/tools/*.ts
+    // createHTTPServer/createStdioServer pull in @mcp-z/server and every mcp/tools/*.ts
     // (googleapis included); deferred so a --version/--help run never reaches them.
     const { createHTTPServer } = await import('./setup/http.js');
     const { createStdioServer } = await import('./setup/stdio.js');

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/index.ts"],"sourcesContent":["import { handleVersionHelp } from './setup/version-help.ts';\nimport type { ServerConfig } from './types.ts';\n\nexport { GOOGLE_SCOPE } from './constants.ts';\nexport * as mcp from './mcp/index.ts';\nexport * as schemas from './schemas/index.ts';\nexport * as setup from './setup/index.ts';\nexport * from './types.ts';\n\nexport async function startServer(config: ServerConfig): Promise<void> {\n  // createHTTPServer/createStdioServer pull in @modelcontextprotocol/sdk and every mcp/tools/*.ts\n  // (googleapis included); deferred so a --version/--help run never reaches them.\n  const { createHTTPServer } = await import('./setup/http.ts');\n  const { createStdioServer } = await import('./setup/stdio.ts');\n  const { logger, close } = config.transport.type === 'stdio' ? await createStdioServer(config) : await createHTTPServer(config);\n\n  process.on('SIGINT', async () => {\n    await close();\n    process.exit(0);\n  });\n\n  logger.info(`Server started with ${config.transport.type} transport`);\n  await new Promise(() => {});\n}\n\nexport default async function main(): Promise<void> {\n  // Check for help/version flags FIRST, before config parsing\n  const versionHelpResult = handleVersionHelp(process.argv);\n  if (versionHelpResult.handled) {\n    console.log(versionHelpResult.output);\n    process.exit(0);\n  }\n\n  // Only parse config if no help/version flags. config.ts's own heavy imports (@mcp-z/oauth-google,\n  // @mcp-z/server) are deferred internally, so this static-looking call stays cheap until here.\n  const { createConfig } = await import('./setup/config.ts');\n  const config = createConfig();\n  await startServer(config);\n}\n\nif (process.argv[1] === new URL(import.meta.url).pathname) {\n  main();\n}\n"],"names":["handleVersionHelp","GOOGLE_SCOPE","mcp","schemas","setup","startServer","config","createHTTPServer","createStdioServer","logger","close","transport","type","process","on","exit","info","Promise","main","versionHelpResult","argv","handled","console","log","output","createConfig","URL","url","pathname"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,0BAA0B;AAG5D,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,sBAAqB,iBAAiB;AAAtC,SAAO,QAAKC,GAAG,GAAuB;AACtC,0BAAyB,qBAAqB;AAA9C,SAAO,YAAKC,OAAO,GAA2B;AAC9C,wBAAuB,mBAAmB;AAA1C,SAAO,UAAKC,KAAK,GAAyB;AAC1C,cAAc,aAAa;AAE3B,OAAO,eAAeC,YAAYC,MAAoB;IACpD,gGAAgG;IAChG,gFAAgF;IAChF,MAAM,EAAEC,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC;IAC1C,MAAM,EAAEC,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC;IAC3C,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAGJ,OAAOK,SAAS,CAACC,IAAI,KAAK,UAAU,MAAMJ,kBAAkBF,UAAU,MAAMC,iBAAiBD;IAEvHO,QAAQC,EAAE,CAAC,UAAU;QACnB,MAAMJ;QACNG,QAAQE,IAAI,CAAC;IACf;IAEAN,OAAOO,IAAI,CAAC,CAAC,oBAAoB,EAAEV,OAAOK,SAAS,CAACC,IAAI,CAAC,UAAU,CAAC;IACpE,MAAM,IAAIK,QAAQ,KAAO;AAC3B;AAEA,eAAe,eAAeC;IAC5B,4DAA4D;IAC5D,MAAMC,oBAAoBnB,kBAAkBa,QAAQO,IAAI;IACxD,IAAID,kBAAkBE,OAAO,EAAE;QAC7BC,QAAQC,GAAG,CAACJ,kBAAkBK,MAAM;QACpCX,QAAQE,IAAI,CAAC;IACf;IAEA,kGAAkG;IAClG,8FAA8F;IAC9F,MAAM,EAAEU,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC;IACtC,MAAMnB,SAASmB;IACf,MAAMpB,YAAYC;AACpB;AAEA,IAAIO,QAAQO,IAAI,CAAC,EAAE,KAAK,IAAIM,IAAI,YAAYC,GAAG,EAAEC,QAAQ,EAAE;IACzDV;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/index.ts"],"sourcesContent":["import { handleVersionHelp } from './setup/version-help.ts';\nimport type { ServerConfig } from './types.ts';\n\nexport { GOOGLE_SCOPE } from './constants.ts';\nexport * as mcp from './mcp/index.ts';\nexport * as schemas from './schemas/index.ts';\nexport * as setup from './setup/index.ts';\nexport * from './types.ts';\n\nexport async function startServer(config: ServerConfig): Promise<void> {\n  // createHTTPServer/createStdioServer pull in @mcp-z/server and every mcp/tools/*.ts\n  // (googleapis included); deferred so a --version/--help run never reaches them.\n  const { createHTTPServer } = await import('./setup/http.ts');\n  const { createStdioServer } = await import('./setup/stdio.ts');\n  const { logger, close } = config.transport.type === 'stdio' ? await createStdioServer(config) : await createHTTPServer(config);\n\n  process.on('SIGINT', async () => {\n    await close();\n    process.exit(0);\n  });\n\n  logger.info(`Server started with ${config.transport.type} transport`);\n  await new Promise(() => {});\n}\n\nexport default async function main(): Promise<void> {\n  // Check for help/version flags FIRST, before config parsing\n  const versionHelpResult = handleVersionHelp(process.argv);\n  if (versionHelpResult.handled) {\n    console.log(versionHelpResult.output);\n    process.exit(0);\n  }\n\n  // Only parse config if no help/version flags. config.ts's own heavy imports (@mcp-z/oauth-google,\n  // @mcp-z/server) are deferred internally, so this static-looking call stays cheap until here.\n  const { createConfig } = await import('./setup/config.ts');\n  const config = createConfig();\n  await startServer(config);\n}\n\nif (process.argv[1] === new URL(import.meta.url).pathname) {\n  main();\n}\n"],"names":["handleVersionHelp","GOOGLE_SCOPE","mcp","schemas","setup","startServer","config","createHTTPServer","createStdioServer","logger","close","transport","type","process","on","exit","info","Promise","main","versionHelpResult","argv","handled","console","log","output","createConfig","URL","url","pathname"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,0BAA0B;AAG5D,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,sBAAqB,iBAAiB;AAAtC,SAAO,QAAKC,GAAG,GAAuB;AACtC,0BAAyB,qBAAqB;AAA9C,SAAO,YAAKC,OAAO,GAA2B;AAC9C,wBAAuB,mBAAmB;AAA1C,SAAO,UAAKC,KAAK,GAAyB;AAC1C,cAAc,aAAa;AAE3B,OAAO,eAAeC,YAAYC,MAAoB;IACpD,oFAAoF;IACpF,gFAAgF;IAChF,MAAM,EAAEC,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC;IAC1C,MAAM,EAAEC,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC;IAC3C,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAGJ,OAAOK,SAAS,CAACC,IAAI,KAAK,UAAU,MAAMJ,kBAAkBF,UAAU,MAAMC,iBAAiBD;IAEvHO,QAAQC,EAAE,CAAC,UAAU;QACnB,MAAMJ;QACNG,QAAQE,IAAI,CAAC;IACf;IAEAN,OAAOO,IAAI,CAAC,CAAC,oBAAoB,EAAEV,OAAOK,SAAS,CAACC,IAAI,CAAC,UAAU,CAAC;IACpE,MAAM,IAAIK,QAAQ,KAAO;AAC3B;AAEA,eAAe,eAAeC;IAC5B,4DAA4D;IAC5D,MAAMC,oBAAoBnB,kBAAkBa,QAAQO,IAAI;IACxD,IAAID,kBAAkBE,OAAO,EAAE;QAC7BC,QAAQC,GAAG,CAACJ,kBAAkBK,MAAM;QACpCX,QAAQE,IAAI,CAAC;IACf;IAEA,kGAAkG;IAClG,8FAA8F;IAC9F,MAAM,EAAEU,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC;IACtC,MAAMnB,SAASmB;IACf,MAAMpB,YAAYC;AACpB;AAEA,IAAIO,QAAQO,IAAI,CAAC,EAAE,KAAK,IAAIM,IAAI,YAAYC,GAAG,EAAEC,QAAQ,EAAE;IACzDV;AACF"}

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

@@ -0,0 +1,9 @@
+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
+ * `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

@@ -0,0 +1,11 @@
+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
+ * `google-auth-library` in the tree by construction rather than by matching pins.
+ */ export function googleAuth(auth) {
+    return attachTokenProvider(new google.auth.OAuth2(), auth);
+}

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

@@ -0,0 +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"}

package/dist/esm/mcp/prompts/query-syntax.d.ts

@@ -1,5 +1,4 @@
-import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
-import type { ServerNotification, ServerRequest } from '@modelcontextprotocol/sdk/types.js';
+import type { ServerContext } from '@mcp-z/server';
 export default function createPrompt(): {
     name: string;
     config: {
@@ -7,7 +6,7 @@ export default function createPrompt(): {
     };
     handler: (_args: {
         [x: string]: unknown;
-    }, _extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => Promise<{
+    }, _extra: ServerContext) => Promise<{
         messages: {
             role: "user";
             content: {

package/dist/esm/mcp/prompts/query-syntax.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/prompts/query-syntax.ts"],"sourcesContent":["import type { PromptModule } from '@mcp-z/server';\nimport type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';\nimport type { ServerNotification, ServerRequest } from '@modelcontextprotocol/sdk/types.js';\n\nexport default function createPrompt() {\n  const config = {\n    description: 'Reference guide for Google Drive query syntax',\n  };\n\n  const handler = async (_args: { [x: string]: unknown }, _extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => {\n    return {\n      messages: [\n        {\n          role: 'user' as const,\n          content: {\n            type: 'text' as const,\n            text: `# Google Drive Query Syntax Reference\n\n## Logical Operators\n- \\`$and\\`: Array of conditions that ALL must match\n- \\`$or\\`: Array of conditions where ANY must match\n- \\`$not\\`: Condition that must NOT match\n\n## File/Folder Fields\n- \\`name\\`: Search by name (partial match, case-insensitive)\n- \\`mimeType\\`: Filter by MIME type\n- \\`fullText\\`: Search file content and metadata\n- \\`parentId\\`: Search within folder (use \"root\" for My Drive)\n- \\`owner\\`: Filter by owner email\n\n## Boolean Flags\n- \\`starred\\`: true/false\n- \\`sharedWithMe\\`: true/false\n- \\`trashed\\`: true/false\n\n## Date Range\n\\`\\`\\`json\n{ \"modifiedTime\": { \"$gte\": \"2024-01-01\", \"$lt\": \"2024-12-31\" } }\n\\`\\`\\`\n\n## Common MIME Types\n- \\`application/vnd.google-apps.folder\\`: Folders\n- \\`application/vnd.google-apps.document\\`: Google Docs\n- \\`application/vnd.google-apps.spreadsheet\\`: Google Sheets\n- \\`application/vnd.google-apps.presentation\\`: Google Slides\n- \\`application/pdf\\`: PDF files\n- \\`image/jpeg\\`, \\`image/png\\`: Images\n\n## Field Operators (for multi-value fields)\n- \\`$any\\`: OR - matches if ANY value matches\n- \\`$all\\`: AND - matches if ALL values match\n- \\`$none\\`: NOT - matches if NONE match\n\n## Escape Hatch\n- \\`rawDriveQuery\\`: Raw Google Drive query syntax\n\n## Example Queries\n\\`\\`\\`json\n// PDFs modified this year\n{ \"mimeType\": \"application/pdf\", \"modifiedTime\": { \"$gte\": \"2024-01-01\" } }\n\n// Starred spreadsheets\n{ \"mimeType\": \"application/vnd.google-apps.spreadsheet\", \"starred\": true }\n\n// Files in specific folder\n{ \"parentId\": \"1abc123xyz\" }\n\n// Search by name\n{ \"name\": \"budget\" }\n\n// Complex: shared PDFs or Docs\n{ \"$or\": [\n  { \"mimeType\": \"application/pdf\", \"sharedWithMe\": true },\n  { \"mimeType\": \"application/vnd.google-apps.document\", \"sharedWithMe\": true }\n]}\n\\`\\`\\``,\n          },\n        },\n      ],\n    };\n  };\n\n  return {\n    name: 'query-syntax',\n    config,\n    handler,\n  } satisfies PromptModule;\n}\n"],"names":["createPrompt","config","description","handler","_args","_extra","messages","role","content","type","text","name"],"mappings":"AAIA,eAAe,SAASA;IACtB,MAAMC,SAAS;QACbC,aAAa;IACf;IAEA,MAAMC,UAAU,OAAOC,OAAiCC;QACtD,OAAO;YACLC,UAAU;gBACR;oBACEC,MAAM;oBACNC,SAAS;wBACPC,MAAM;wBACNC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA2Db,CAAC;oBACG;gBACF;aACD;QACH;IACF;IAEA,OAAO;QACLC,MAAM;QACNV;QACAE;IACF;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/prompts/query-syntax.ts"],"sourcesContent":["import type { PromptModule, ServerContext } from '@mcp-z/server';\n\nexport default function createPrompt() {\n  const config = {\n    description: 'Reference guide for Google Drive query syntax',\n  };\n\n  const handler = async (_args: { [x: string]: unknown }, _extra: ServerContext) => {\n    return {\n      messages: [\n        {\n          role: 'user' as const,\n          content: {\n            type: 'text' as const,\n            text: `# Google Drive Query Syntax Reference\n\n## Logical Operators\n- \\`$and\\`: Array of conditions that ALL must match\n- \\`$or\\`: Array of conditions where ANY must match\n- \\`$not\\`: Condition that must NOT match\n\n## File/Folder Fields\n- \\`name\\`: Search by name (partial match, case-insensitive)\n- \\`mimeType\\`: Filter by MIME type\n- \\`fullText\\`: Search file content and metadata\n- \\`parentId\\`: Search within folder (use \"root\" for My Drive)\n- \\`owner\\`: Filter by owner email\n\n## Boolean Flags\n- \\`starred\\`: true/false\n- \\`sharedWithMe\\`: true/false\n- \\`trashed\\`: true/false\n\n## Date Range\n\\`\\`\\`json\n{ \"modifiedTime\": { \"$gte\": \"2024-01-01\", \"$lt\": \"2024-12-31\" } }\n\\`\\`\\`\n\n## Common MIME Types\n- \\`application/vnd.google-apps.folder\\`: Folders\n- \\`application/vnd.google-apps.document\\`: Google Docs\n- \\`application/vnd.google-apps.spreadsheet\\`: Google Sheets\n- \\`application/vnd.google-apps.presentation\\`: Google Slides\n- \\`application/pdf\\`: PDF files\n- \\`image/jpeg\\`, \\`image/png\\`: Images\n\n## Field Operators (for multi-value fields)\n- \\`$any\\`: OR - matches if ANY value matches\n- \\`$all\\`: AND - matches if ALL values match\n- \\`$none\\`: NOT - matches if NONE match\n\n## Escape Hatch\n- \\`rawDriveQuery\\`: Raw Google Drive query syntax\n\n## Example Queries\n\\`\\`\\`json\n// PDFs modified this year\n{ \"mimeType\": \"application/pdf\", \"modifiedTime\": { \"$gte\": \"2024-01-01\" } }\n\n// Starred spreadsheets\n{ \"mimeType\": \"application/vnd.google-apps.spreadsheet\", \"starred\": true }\n\n// Files in specific folder\n{ \"parentId\": \"1abc123xyz\" }\n\n// Search by name\n{ \"name\": \"budget\" }\n\n// Complex: shared PDFs or Docs\n{ \"$or\": [\n  { \"mimeType\": \"application/pdf\", \"sharedWithMe\": true },\n  { \"mimeType\": \"application/vnd.google-apps.document\", \"sharedWithMe\": true }\n]}\n\\`\\`\\``,\n          },\n        },\n      ],\n    };\n  };\n\n  return {\n    name: 'query-syntax',\n    config,\n    handler,\n  } satisfies PromptModule;\n}\n"],"names":["createPrompt","config","description","handler","_args","_extra","messages","role","content","type","text","name"],"mappings":"AAEA,eAAe,SAASA;IACtB,MAAMC,SAAS;QACbC,aAAa;IACf;IAEA,MAAMC,UAAU,OAAOC,OAAiCC;QACtD,OAAO;YACLC,UAAU;gBACR;oBACEC,MAAM;oBACNC,SAAS;wBACPC,MAAM;wBACNC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA2Db,CAAC;oBACG;gBACF;aACD;QACH;IACF;IAEA,OAAO;QACLC,MAAM;QACNV;QACAE;IACF;AACF"}

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

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

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

@@ -1,5 +1,6 @@
-import { ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { 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}', {
         list: undefined
@@ -31,7 +32,7 @@ export default function createResource() {
             const { logger, authContext } = extra;
             const drive = google.drive({
                 version: 'v3',
-                auth: authContext.auth
+                auth: googleAuth(authContext.auth)
             });
             const resp = await drive.files.get({
                 fileId,

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

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

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

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

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

@@ -1,8 +1,9 @@
 import { schemas } from '@mcp-z/oauth-google';
 const { AuthRequiredBranchSchema } = schemas;
-import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
+import { 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;
 const inputSchema = z.object({
     ids: z.array(z.string().min(1)).min(1).max(MAX_BATCH_SIZE).describe('File IDs to soft delete (move to trash)')
@@ -42,7 +43,7 @@ async function handler({ ids }, extra) {
     try {
         const drive = google.drive({
             version: 'v3',
-            auth: extra.authContext.auth
+            auth: googleAuth(extra.authContext.auth)
         });
         const results = await Promise.allSettled(ids.map(async (id)=>{
             await drive.files.update({
@@ -103,8 +104,8 @@ async function handler({ ids }, extra) {
         logger.error('drive.file.moveToTrash error', {
             error: message
         });
-        // Throw McpError
-        throw new McpError(ErrorCode.InternalError, `Error moving files to trash: ${message}`, {
+        // Throw ProtocolError
+        throw new ProtocolError(ProtocolErrorCode.InternalError, `Error moving files to trash: ${message}`, {
             stack: error instanceof Error ? error.stack : undefined
         });
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/file-move-to-trash.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { type CallToolResult, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\n\nconst MAX_BATCH_SIZE = 1000;\n\nconst inputSchema = z.object({\n  ids: z.array(z.string().min(1)).min(1).max(MAX_BATCH_SIZE).describe('File IDs to soft delete (move to trash)'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  operationSummary: z.string().describe('Human-readable summary of the operation'),\n  totalCount: z.number().describe('Total number of files requested to trash'),\n  successCount: z.number().describe('Number of files successfully moved to trash'),\n  failureCount: z.number().describe('Number of files that failed to move'),\n  recoverable: z.boolean().describe('Whether trashed files can be restored'),\n  recoverableDays: z.number().describe('Days until permanent deletion'),\n  failures: z\n    .array(\n      z.object({\n        id: z.string().describe('ID of the file that failed'),\n        error: z.string().describe('Error message explaining the failure'),\n      })\n    )\n    .optional()\n    .describe('Details of any files that failed to trash'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Move Files to Trash',\n  description: 'Move files to trash (recoverable for 30 days).',\n  inputSchema: inputSchema,\n  outputSchema: z.object({\n    result: outputSchema,\n  }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ ids }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.file.moveToTrash called', { count: ids.length });\n\n  try {\n    const drive = google.drive({ version: 'v3', auth: extra.authContext.auth });\n\n    const results = await Promise.allSettled(\n      ids.map(async (id) => {\n        await drive.files.update({\n          fileId: id,\n          requestBody: { trashed: true },\n        });\n        return id;\n      })\n    );\n\n    // Separate successes and failures\n    const failures: Array<{ id: string; error: string }> = [];\n\n    results.forEach((result, index) => {\n      const id = ids[index];\n      if (!id) return;\n\n      if (result.status === 'rejected') {\n        const errorMessage = result.reason instanceof Error ? result.reason.message : String(result.reason);\n        failures.push({ id, error: errorMessage });\n      }\n    });\n\n    const successCount = ids.length - failures.length;\n    const failureCount = failures.length;\n    const totalCount = ids.length;\n\n    logger.info('drive.file.moveToTrash completed', {\n      totalCount,\n      successCount,\n      failureCount,\n    });\n\n    const operationSummary = failureCount === 0 ? `Moved ${successCount} file${successCount === 1 ? '' : 's'} to trash (recoverable for 30 days)` : `Moved ${successCount} of ${totalCount} file${totalCount === 1 ? '' : 's'} to trash (${failureCount} failed, recoverable for 30 days)`;\n\n    const result: Output = {\n      type: 'success' as const,\n      operationSummary,\n      totalCount,\n      successCount,\n      failureCount,\n      recoverable: true,\n      recoverableDays: 30,\n      ...(failures.length > 0 && { failures }),\n    };\n\n    return {\n      content: [\n        {\n          type: 'text' as const,\n          text: JSON.stringify(result),\n        },\n      ],\n      structuredContent: { result },\n    };\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    logger.error('drive.file.moveToTrash error', { error: message });\n\n    // Throw McpError\n    throw new McpError(ErrorCode.InternalError, `Error moving files to trash: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'file-move-to-trash' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","ErrorCode","McpError","google","z","MAX_BATCH_SIZE","inputSchema","object","ids","array","string","min","max","describe","successBranchSchema","type","literal","operationSummary","totalCount","number","successCount","failureCount","recoverable","boolean","recoverableDays","failures","id","error","optional","outputSchema","discriminatedUnion","config","title","description","result","handler","extra","logger","info","count","length","drive","version","auth","authContext","results","Promise","allSettled","map","files","update","fileId","requestBody","trashed","forEach","index","status","errorMessage","reason","Error","message","String","push","content","text","JSON","stringify","structuredContent","InternalError","stack","undefined","createTool","name"],"mappings":"AACA,SAASA,OAAO,QAAQ,sBAAsB;AAE9C,MAAM,EAAEC,wBAAwB,EAAE,GAAGD;AAErC,SAA8BE,SAAS,EAAEC,QAAQ,QAAQ,qCAAqC;AAC9F,SAASC,MAAM,QAAQ,aAAa;AACpC,SAASC,CAAC,QAAQ,MAAM;AAExB,MAAMC,iBAAiB;AAEvB,MAAMC,cAAcF,EAAEG,MAAM,CAAC;IAC3BC,KAAKJ,EAAEK,KAAK,CAACL,EAAEM,MAAM,GAAGC,GAAG,CAAC,IAAIA,GAAG,CAAC,GAAGC,GAAG,CAACP,gBAAgBQ,QAAQ,CAAC;AACtE;AAEA,wBAAwB;AACxB,MAAMC,sBAAsBV,EAAEG,MAAM,CAAC;IACnCQ,MAAMX,EAAEY,OAAO,CAAC;IAChBC,kBAAkBb,EAAEM,MAAM,GAAGG,QAAQ,CAAC;IACtCK,YAAYd,EAAEe,MAAM,GAAGN,QAAQ,CAAC;IAChCO,cAAchB,EAAEe,MAAM,GAAGN,QAAQ,CAAC;IAClCQ,cAAcjB,EAAEe,MAAM,GAAGN,QAAQ,CAAC;IAClCS,aAAalB,EAAEmB,OAAO,GAAGV,QAAQ,CAAC;IAClCW,iBAAiBpB,EAAEe,MAAM,GAAGN,QAAQ,CAAC;IACrCY,UAAUrB,EACPK,KAAK,CACJL,EAAEG,MAAM,CAAC;QACPmB,IAAItB,EAAEM,MAAM,GAAGG,QAAQ,CAAC;QACxBc,OAAOvB,EAAEM,MAAM,GAAGG,QAAQ,CAAC;IAC7B,IAEDe,QAAQ,GACRf,QAAQ,CAAC;AACd;AAEA,2CAA2C;AAC3C,MAAMgB,eAAezB,EAAE0B,kBAAkB,CAAC,QAAQ;IAAChB;IAAqBd;CAAyB;AAEjG,MAAM+B,SAAS;IACbC,OAAO;IACPC,aAAa;IACb3B,aAAaA;IACbuB,cAAczB,EAAEG,MAAM,CAAC;QACrB2B,QAAQL;IACV;AACF;AAKA,eAAeM,QAAQ,EAAE3B,GAAG,EAAS,EAAE4B,KAAoB;IACzD,MAAMC,SAASD,MAAMC,MAAM;IAC3BA,OAAOC,IAAI,CAAC,iCAAiC;QAAEC,OAAO/B,IAAIgC,MAAM;IAAC;IAEjE,IAAI;QACF,MAAMC,QAAQtC,OAAOsC,KAAK,CAAC;YAAEC,SAAS;YAAMC,MAAMP,MAAMQ,WAAW,CAACD,IAAI;QAAC;QAEzE,MAAME,UAAU,MAAMC,QAAQC,UAAU,CACtCvC,IAAIwC,GAAG,CAAC,OAAOtB;YACb,MAAMe,MAAMQ,KAAK,CAACC,MAAM,CAAC;gBACvBC,QAAQzB;gBACR0B,aAAa;oBAAEC,SAAS;gBAAK;YAC/B;YACA,OAAO3B;QACT;QAGF,kCAAkC;QAClC,MAAMD,WAAiD,EAAE;QAEzDoB,QAAQS,OAAO,CAAC,CAACpB,QAAQqB;YACvB,MAAM7B,KAAKlB,GAAG,CAAC+C,MAAM;YACrB,IAAI,CAAC7B,IAAI;YAET,IAAIQ,OAAOsB,MAAM,KAAK,YAAY;gBAChC,MAAMC,eAAevB,OAAOwB,MAAM,YAAYC,QAAQzB,OAAOwB,MAAM,CAACE,OAAO,GAAGC,OAAO3B,OAAOwB,MAAM;gBAClGjC,SAASqC,IAAI,CAAC;oBAAEpC;oBAAIC,OAAO8B;gBAAa;YAC1C;QACF;QAEA,MAAMrC,eAAeZ,IAAIgC,MAAM,GAAGf,SAASe,MAAM;QACjD,MAAMnB,eAAeI,SAASe,MAAM;QACpC,MAAMtB,aAAaV,IAAIgC,MAAM;QAE7BH,OAAOC,IAAI,CAAC,oCAAoC;YAC9CpB;YACAE;YACAC;QACF;QAEA,MAAMJ,mBAAmBI,iBAAiB,IAAI,CAAC,MAAM,EAAED,aAAa,KAAK,EAAEA,iBAAiB,IAAI,KAAK,IAAI,mCAAmC,CAAC,GAAG,CAAC,MAAM,EAAEA,aAAa,IAAI,EAAEF,WAAW,KAAK,EAAEA,eAAe,IAAI,KAAK,IAAI,WAAW,EAAEG,aAAa,iCAAiC,CAAC;QAEtR,MAAMa,SAAiB;YACrBnB,MAAM;YACNE;YACAC;YACAE;YACAC;YACAC,aAAa;YACbE,iBAAiB;YACjB,GAAIC,SAASe,MAAM,GAAG,KAAK;gBAAEf;YAAS,CAAC;QACzC;QAEA,OAAO;YACLsC,SAAS;gBACP;oBACEhD,MAAM;oBACNiD,MAAMC,KAAKC,SAAS,CAAChC;gBACvB;aACD;YACDiC,mBAAmB;gBAAEjC;YAAO;QAC9B;IACF,EAAE,OAAOP,OAAO;QACd,MAAMiC,UAAUjC,iBAAiBgC,QAAQhC,MAAMiC,OAAO,GAAGC,OAAOlC;QAChEU,OAAOV,KAAK,CAAC,gCAAgC;YAAEA,OAAOiC;QAAQ;QAE9D,iBAAiB;QACjB,MAAM,IAAI1D,SAASD,UAAUmE,aAAa,EAAE,CAAC,6BAA6B,EAAER,SAAS,EAAE;YACrFS,OAAO1C,iBAAiBgC,QAAQhC,MAAM0C,KAAK,GAAGC;QAChD;IACF;AACF;AAEA,eAAe,SAASC;IACtB,OAAO;QACLC,MAAM;QACNzC;QACAI;IACF;AACF"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/ai/mcp-z/mcp-drive/src/mcp/tools/file-move-to-trash.ts"],"sourcesContent":["import type { EnrichedExtra } from '@mcp-z/oauth-google';\nimport { schemas } from '@mcp-z/oauth-google';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { type CallToolResult, ProtocolError, ProtocolErrorCode } from '@mcp-z/server';\nimport { google } from 'googleapis';\nimport { z } from 'zod';\nimport { googleAuth } from '../../lib/google-auth.ts';\n\nconst MAX_BATCH_SIZE = 1000;\n\nconst inputSchema = z.object({\n  ids: z.array(z.string().min(1)).min(1).max(MAX_BATCH_SIZE).describe('File IDs to soft delete (move to trash)'),\n});\n\n// Success branch schema\nconst successBranchSchema = z.object({\n  type: z.literal('success'),\n  operationSummary: z.string().describe('Human-readable summary of the operation'),\n  totalCount: z.number().describe('Total number of files requested to trash'),\n  successCount: z.number().describe('Number of files successfully moved to trash'),\n  failureCount: z.number().describe('Number of files that failed to move'),\n  recoverable: z.boolean().describe('Whether trashed files can be restored'),\n  recoverableDays: z.number().describe('Days until permanent deletion'),\n  failures: z\n    .array(\n      z.object({\n        id: z.string().describe('ID of the file that failed'),\n        error: z.string().describe('Error message explaining the failure'),\n      })\n    )\n    .optional()\n    .describe('Details of any files that failed to trash'),\n});\n\n// Output schema with auth_required support\nconst outputSchema = z.discriminatedUnion('type', [successBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n  title: 'Move Files to Trash',\n  description: 'Move files to trash (recoverable for 30 days).',\n  inputSchema: inputSchema,\n  outputSchema: z.object({\n    result: outputSchema,\n  }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ ids }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n  const logger = extra.logger;\n  logger.info('drive.file.moveToTrash called', { count: ids.length });\n\n  try {\n    const drive = google.drive({ version: 'v3', auth: googleAuth(extra.authContext.auth) });\n\n    const results = await Promise.allSettled(\n      ids.map(async (id) => {\n        await drive.files.update({\n          fileId: id,\n          requestBody: { trashed: true },\n        });\n        return id;\n      })\n    );\n\n    // Separate successes and failures\n    const failures: Array<{ id: string; error: string }> = [];\n\n    results.forEach((result, index) => {\n      const id = ids[index];\n      if (!id) return;\n\n      if (result.status === 'rejected') {\n        const errorMessage = result.reason instanceof Error ? result.reason.message : String(result.reason);\n        failures.push({ id, error: errorMessage });\n      }\n    });\n\n    const successCount = ids.length - failures.length;\n    const failureCount = failures.length;\n    const totalCount = ids.length;\n\n    logger.info('drive.file.moveToTrash completed', {\n      totalCount,\n      successCount,\n      failureCount,\n    });\n\n    const operationSummary = failureCount === 0 ? `Moved ${successCount} file${successCount === 1 ? '' : 's'} to trash (recoverable for 30 days)` : `Moved ${successCount} of ${totalCount} file${totalCount === 1 ? '' : 's'} to trash (${failureCount} failed, recoverable for 30 days)`;\n\n    const result: Output = {\n      type: 'success' as const,\n      operationSummary,\n      totalCount,\n      successCount,\n      failureCount,\n      recoverable: true,\n      recoverableDays: 30,\n      ...(failures.length > 0 && { failures }),\n    };\n\n    return {\n      content: [\n        {\n          type: 'text' as const,\n          text: JSON.stringify(result),\n        },\n      ],\n      structuredContent: { result },\n    };\n  } catch (error) {\n    const message = error instanceof Error ? error.message : String(error);\n    logger.error('drive.file.moveToTrash error', { error: message });\n\n    // Throw ProtocolError\n    throw new ProtocolError(ProtocolErrorCode.InternalError, `Error moving files to trash: ${message}`, {\n      stack: error instanceof Error ? error.stack : undefined,\n    });\n  }\n}\n\nexport default function createTool() {\n  return {\n    name: 'file-move-to-trash' as const,\n    config,\n    handler,\n  };\n}\n"],"names":["schemas","AuthRequiredBranchSchema","ProtocolError","ProtocolErrorCode","google","z","googleAuth","MAX_BATCH_SIZE","inputSchema","object","ids","array","string","min","max","describe","successBranchSchema","type","literal","operationSummary","totalCount","number","successCount","failureCount","recoverable","boolean","recoverableDays","failures","id","error","optional","outputSchema","discriminatedUnion","config","title","description","result","handler","extra","logger","info","count","length","drive","version","auth","authContext","results","Promise","allSettled","map","files","update","fileId","requestBody","trashed","forEach","index","status","errorMessage","reason","Error","message","String","push","content","text","JSON","stringify","structuredContent","InternalError","stack","undefined","createTool","name"],"mappings":"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"}

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

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

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

@@ -1,8 +1,9 @@
 import { schemas } from '@mcp-z/oauth-google';
 const { AuthRequiredBranchSchema } = schemas;
-import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
+import { ProtocolError, ProtocolErrorCode } from '@mcp-z/server';
 import { google } from 'googleapis';
 import { z } from 'zod';
+import { googleAuth } from '../../lib/google-auth.js';
 function isDriveApiError(error) {
     return typeof error === 'object' && error !== null && ('message' in error || 'code' in error);
 }
@@ -207,7 +208,7 @@ async function handler({ fileIds, destinationFolderId, returnOldParents = true }
     try {
         const drive = google.drive({
             version: 'v3',
-            auth: extra.authContext.auth
+            auth: googleAuth(extra.authContext.auth)
         });
         let moved = [];
         let failed = [];
@@ -259,8 +260,8 @@ async function handler({ fileIds, destinationFolderId, returnOldParents = true }
         logger.error('drive.file.move error', {
             error: message
         });
-        // Throw McpError
-        throw new McpError(ErrorCode.InternalError, `Error moving files: ${message}`, {
+        // Throw ProtocolError
+        throw new ProtocolError(ProtocolErrorCode.InternalError, `Error moving files: ${message}`, {
             stack: error instanceof Error ? error.stack : undefined
         });
     }