google-tools-mcp 1.0.1 → 1.0.2

package/README.md

@@ -1,18 +1,16 @@
 # google-tools-mcp
 
-A unified MCP server for Google Workspace — Drive, Docs, Sheets, Gmail, and Calendar — with **lazy-loaded tool categories** to keep your context window lean.
+A unified MCP server for Google Workspace — Drive, Docs, Sheets, Gmail, and Calendar — with **146 tools** across 8 categories.
 
-Only 2 tools are exposed at startup. When the AI agent needs a Google service, it calls `load_google_tools` to load just the relevant category. No bloat, no wasted context.
+All tools are loaded at startup so they're immediately available to your AI agent. No discovery step needed.
 
 ## Why This Exists
 
-Most Google MCP servers dump 70+ tool definitions into your context on startup. If you need both Drive and Gmail, that's 140+ tools competing for attention before a single useful thing happens.
-
-This server starts with **2 tools** and loads categories on demand — so you only pay the context cost for what you actually use.
+Most Google MCP servers split functionality across separate packages. This server combines everything into one — single auth token, single process, single config.
 
 ## Features
 
-- **Lazy-loaded tools** — 146 tools across 8 categories, loaded only when needed
+- **146 tools** across 8 categories, all available immediately
 - **Single auth token** — one OAuth flow covers Drive, Docs, Sheets, Gmail, and Calendar
 - **Lazy-loading auth** — no browser popup until your first tool call
 - **Multi-profile support** — separate tokens per Google account
@@ -169,8 +167,6 @@ This stores tokens in `~/.config/google-tools-mcp/work/` instead of the default
 
 ## Tool Categories
 
-Call `load_google_tools` with one or more category names to load them. You can load multiple at once.
-
 ### `files` (16 tools)
 Google Drive file management and content reading.
 
@@ -230,7 +226,7 @@ This package replaces both [`gdrive-tools-mcp`](https://www.npmjs.com/package/gd
 
 1. Replace both MCP server entries with a single `google-tools-mcp` entry
 2. Re-authenticate (the combined server uses its own config dir at `~/.config/google-tools-mcp/`)
-3. All the same tools are available — the agent just needs to call `load_google_tools` first
+3. All tools are available immediately — no discovery step needed
 
 ## License
 

package/dist/index.js

@@ -1,14 +1,13 @@
 #!/usr/bin/env node
 // google-tools-mcp — Combined Google Workspace MCP server
 //
-// Provides lazy-loaded tool categories for Drive, Docs, Sheets, and Gmail.
-// Only a discovery tool is exposed at startup; individual tools are loaded on demand.
+// All tool categories (Drive, Docs, Sheets, Gmail, Calendar) are loaded at
+// startup so they're available in the initial tools/list response.
 //
 // Usage:
 //   google-tools-mcp          Start the MCP server (default)
 //   google-tools-mcp auth     Run the interactive OAuth flow
 import { FastMCP } from 'fastmcp';
-import { collectToolsWhileRegistering, installCachedToolsListHandler } from './cachedToolsList.js';
 import { registerAllTools } from './tools/index.js';
 import { logger } from './logger.js';
 
@@ -38,17 +37,13 @@ const server = new FastMCP({
     version: '1.0.0',
 });
 
-const registeredTools = [];
-collectToolsWhileRegistering(server, registeredTools);
-registerAllTools(server);
+await registerAllTools(server);
 
 try {
     logger.info('Starting google-tools-mcp server...');
     await server.start({ transportType: 'stdio' });
-    installCachedToolsListHandler(server, registeredTools);
     logger.info('MCP Server running using stdio. Awaiting client connection...');
     logger.info('Google auth will run automatically on first tool call.');
-    logger.info(`${registeredTools.length} tools registered at startup (discovery + logout). Call load_google_tools to load more.`);
 } catch (startError) {
     logger.error('FATAL: Server failed to start:', startError.message || startError);
     process.exit(1);

package/dist/tools/index.js

@@ -1,8 +1,6 @@
-// Tool discovery and lazy-loading registration.
-//
-// Only the `load_google_tools` discovery tool is registered at startup.
-// When a category is loaded, its tools are dynamically registered and the
-// client is notified via tools/list_changed so it picks them up.
+// Tool registration — all categories loaded eagerly at startup.
+// (Claude Code doesn't support notifications/tools/list_changed,
+//  so lazy-loading doesn't work.)
 import { z } from 'zod';
 import * as fs from 'fs/promises';
 import { getTokenPath } from '../auth.js';
@@ -10,11 +8,8 @@ import { resetClients } from '../clients.js';
 import { logger } from '../logger.js';
 
 // --- Category registry ---
-// Maps category names to { loader, description, toolCount }
 const CATEGORIES = {
     files: {
-        description: 'Google Drive file management — list, search, create, copy, move, rename, delete files/folders, read file contents (pdf, docx), search within files',
-        toolCount: 16,
         async loader(server) {
             const { registerDriveTools } = await import('./drive/index.js');
             const { registerExtrasTools } = await import('./extras/index.js');
@@ -23,8 +18,6 @@ const CATEGORIES = {
         },
     },
     documents: {
-        description: 'Google Docs — read, write, insert text/tables/images, formatting, comments, tabs, markdown conversion',
-        toolCount: 23,
         async loader(server) {
             const { registerDocsTools } = await import('./docs/index.js');
             const { registerUtilsTools } = await import('./utils/index.js');
@@ -33,16 +26,12 @@ const CATEGORIES = {
         },
     },
     spreadsheets: {
-        description: 'Google Sheets — read, write, format cells, charts, tables, conditional formatting, data validation',
-        toolCount: 30,
         async loader(server) {
             const { registerSheetsTools } = await import('./sheets/index.js');
             registerSheetsTools(server);
         },
     },
     email: {
-        description: 'Gmail — send, reply, forward, get, list, delete, trash messages, create/update/send drafts, attachments, batch operations',
-        toolCount: 19,
         async loader(server) {
             const { register: registerMessages } = await import('./gmail/messages.js');
             const { register: registerDrafts } = await import('./gmail/drafts.js');
@@ -51,32 +40,24 @@ const CATEGORIES = {
         },
     },
     email_threads: {
-        description: 'Gmail threads — get, list, batch get, modify, delete, trash/untrash conversation threads',
-        toolCount: 7,
         async loader(server) {
             const { register } = await import('./gmail/threads.js');
             register(server);
         },
     },
     email_labels: {
-        description: 'Gmail labels — create, delete, get, list, update labels for organizing email',
-        toolCount: 6,
         async loader(server) {
             const { register } = await import('./gmail/labels.js');
             register(server);
         },
     },
     email_settings: {
-        description: 'Gmail settings — auto-forwarding, IMAP, POP, vacation responder, delegates, filters, forwarding addresses, send-as aliases, S/MIME, profile, mailbox watch',
-        toolCount: 37,
         async loader(server) {
             const { register } = await import('./gmail/settings.js');
             register(server);
         },
     },
     calendar: {
-        description: 'Google Calendar — list calendars, get/create/update/delete events, check busy times, find free slots, move events, recurring event instances, manage calendars',
-        toolCount: 8,
         async loader(server) {
             const { registerCalendarTools } = await import('./calendar/index.js');
             registerCalendarTools(server);
@@ -84,69 +65,15 @@ const CATEGORIES = {
     },
 };
 
-// Track which categories have been loaded
-const loadedCategories = new Set();
-
 // ---------------------------------------------------------------------------
-// Notify the MCP client that the tool list has changed
+// Public: register all tools eagerly, plus the logout utility.
 // ---------------------------------------------------------------------------
-function notifyToolsChanged(server) {
-    try {
-        const session = server.sessions?.[0];
-        if (session?.server?.notification) {
-            session.server.notification({ method: 'notifications/tools/list_changed' });
-            logger.debug('Sent tools/list_changed notification.');
-        } else {
-            logger.debug('No session available for tools/list_changed notification.');
-        }
-    } catch (err) {
-        logger.warn('Failed to send tools/list_changed notification:', err.message);
+export async function registerAllTools(server) {
+    // Load every category
+    for (const [name, { loader }] of Object.entries(CATEGORIES)) {
+        await loader(server);
     }
-}
-
-// ---------------------------------------------------------------------------
-// Public: register the discovery tool (and logout)
-// ---------------------------------------------------------------------------
-export function registerAllTools(server) {
-    // --- Discovery tool ---
-    server.addTool({
-        name: 'load_google_tools',
-        description:
-            'Load Google Workspace tools by category. Call this first before using any Google service.\n\n' +
-            'Categories:\n' +
-            Object.entries(CATEGORIES)
-                .map(([name, { description, toolCount }]) => `  • ${name} (${toolCount} tools) — ${description}`)
-                .join('\n') +
-            '\n\nYou can load multiple categories at once by passing an array.',
-        parameters: z.object({
-            categories: z
-                .array(z.enum(Object.keys(CATEGORIES)))
-                .describe('One or more category names to load'),
-        }),
-        execute: async ({ categories }, { log }) => {
-            const results = [];
-            for (const cat of categories) {
-                if (loadedCategories.has(cat)) {
-                    results.push({ category: cat, status: 'already_loaded' });
-                    continue;
-                }
-                log.info(`Loading category: ${cat}`);
-                await CATEGORIES[cat].loader(server);
-                loadedCategories.add(cat);
-                results.push({
-                    category: cat,
-                    status: 'loaded',
-                    toolCount: CATEGORIES[cat].toolCount,
-                });
-            }
-            notifyToolsChanged(server);
-            return JSON.stringify({
-                loaded: results,
-                message: 'Tools are now available. You can call them directly.',
-                all_loaded_categories: [...loadedCategories],
-            });
-        },
-    });
+    logger.info(`Loaded all ${Object.keys(CATEGORIES).length} categories at startup.`);
 
     // --- Logout tool (always available) ---
     server.addTool({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-tools-mcp",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Combined Google Workspace MCP server (Drive, Docs, Sheets, Gmail) with lazy-loaded tool categories",
   "type": "module",
   "bin": {