@shin1ohno/sage 1.0.2 → 1.0.4

package/README.md

@@ -142,6 +142,116 @@ From Claude, run the `authenticate_google` tool:
 | Session expired | Complete authentication within 10 minutes |
 | 503 from callback | Verify `GOOGLE_CLIENT_ID` and `GOOGLE_CLIENT_SECRET` are set |
 
+### Platform-Adaptive Integration
+
+sage automatically detects your platform and uses the best available integration method for calendar and reminder access. This ensures you get the most seamless experience regardless of where you're using Claude.
+
+**How it Works**
+
+1. **Platform Detection**: When sage starts, it detects your platform from the MCP client information (iOS, iPadOS, macOS, desktop, or web)
+2. **Strategy Selection**: Based on the detected platform, sage selects the optimal integration strategy for calendar and reminder operations
+3. **MCP Sampling Protocol**: On iOS/iPadOS, sage uses the MCP Sampling protocol to instruct Claude to use native Calendar and Reminders APIs
+4. **Native APIs**: On macOS, sage uses EventKit (calendar) and AppleScript (reminders) for direct system integration
+5. **Fallback**: On web/Linux/Windows, sage uses Google Calendar API for calendar features
+
+**Platform Capabilities**
+
+| Platform | Calendar | Reminders | Integration Method |
+|----------|----------|-----------|-------------------|
+| iOS/iPadOS | Native Calendar + Google Calendar | Native Reminders | MCP Sampling |
+| macOS | EventKit + Google Calendar | AppleScript | Native APIs |
+| Web/Linux/Windows | Google Calendar only | Not available | Google API |
+
+**Key Benefits**
+
+- **True multi-platform support**: No need to run a Mac server for iOS/iPadOS access
+- **Multi-source calendar integration**: Access both Google Calendar and Apple Calendar simultaneously on iOS/iPadOS
+- **Transparent UX**: sage automatically selects the best method - you don't need to configure anything
+- **Graceful degradation**: If native access is unavailable, sage falls back to API-based methods
+
+**Using `get_platform_info`**
+
+Query your current platform and available capabilities:
+
+```
+User: get_platform_info
+
+sage:
+{
+  "platform": "ipados",
+  "clientName": "Claude iOS",
+  "clientVersion": "1.0.0",
+  "supportsSampling": true,
+  "availableIntegrations": {
+    "calendar": {
+      "google": true,
+      "eventkit": false,
+      "native": true
+    },
+    "reminders": {
+      "applescript": false,
+      "native": true
+    }
+  }
+}
+```
+
+**Example: Listing Calendar Events on iOS**
+
+When you call `list_calendar_events` on iOS/iPadOS, sage uses Sampling to instruct Claude to:
+1. Fetch Google Calendar events via the MCP tool
+2. Access native iOS Calendar events via the native Calendar API
+3. Merge both sets of events, removing duplicates by iCalUID
+4. Return the combined results
+
+This happens automatically - you just call the tool normally:
+
+```
+User: list_calendar_events with startDate: "2026-01-09", endDate: "2026-01-16"
+
+sage: (automatically uses Sampling to access both calendars)
+  [Shows merged events from both Google Calendar and Apple Calendar]
+```
+
+**Example: Creating Reminders on iOS**
+
+When you create a reminder on iOS/iPadOS, sage uses Sampling to access the native Reminders app:
+
+```
+User: set_reminder with title: "Review pull requests", dueDate: "2026-01-10T15:00:00"
+
+sage: (uses Sampling to create reminder in native iOS Reminders app)
+  ✓ Reminder created successfully
+  ID: reminder-123
+```
+
+**Troubleshooting**
+
+**Issue**: "Sampling approval required" message appears
+
+**Solution**:
+- This is expected behavior on iOS/iPadOS when sage needs to access native Calendar or Reminders
+- Claude will show a prompt asking for your approval to access these native features
+- Approve the Sampling request to allow sage to access your calendar/reminders
+- Once approved, the operation will complete automatically
+
+**Issue**: Platform-adaptive integration not working
+
+**Checklist**:
+1. Verify your platform supports Sampling (run `get_platform_info`)
+2. Check that you're using a recent version of Claude iOS/iPadOS app
+3. Ensure you've granted Calendar/Reminders permissions in iOS Settings > Privacy
+4. For Google Calendar: Make sure you've authenticated with `authenticate_google`
+
+**Issue**: Calendar events not showing up
+
+**Possible causes**:
+1. Google Calendar not authenticated: Run `authenticate_google` tool
+2. iOS Calendar permissions denied: Check Settings > Privacy > Calendars
+3. Network connectivity issues: Verify you have internet access
+
+**Note**: Platform-adaptive integration requires Claude clients that support MCP Sampling. This includes Claude iOS, Claude iPadOS, and recent versions of Claude Desktop. If your client doesn't support Sampling, sage will automatically fall back to API-based methods.
+
 ### Smart Reminder Routing
 
 Tasks are automatically routed to the appropriate system:

package/dist/cli/mcp-handler.d.ts

@@ -48,6 +48,11 @@ export interface ToolDefinition {
 export interface MCPHandler {
     handleRequest(request: MCPRequest): Promise<MCPResponse>;
     listTools(): ToolDefinition[];
+    /**
+     * Shutdown the handler and release all resources
+     * Should be called when the handler is no longer needed (e.g., in tests)
+     */
+    shutdown(): Promise<void>;
 }
 /**
  * Create an MCP handler

package/dist/cli/mcp-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-handler.d.ts","sourceRoot":"","sources":["../../src/cli/mcp-handler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAoFH;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,QAAQ,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AASD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACzD,SAAS,IAAI,cAAc,EAAE,CAAC;CAC/B;AAqyCD;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC,CAI5D"}
+{"version":3,"file":"mcp-handler.d.ts","sourceRoot":"","sources":["../../src/cli/mcp-handler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA+GH;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,QAAQ,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AASD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACzD,SAAS,IAAI,cAAc,EAAE,CAAC;IAC9B;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAwgDD;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC,CAI5D"}

package/dist/cli/mcp-handler.js

@@ -15,6 +15,7 @@ import { CalendarEventResponseService } from '../integrations/calendar-event-res
 import { WorkingCadenceService } from '../services/working-cadence.js';
 import { CalendarSourceManager } from '../integrations/calendar-source-manager.js';
 import { GoogleCalendarService } from '../integrations/google-calendar-service.js';
+import { GooglePeopleService } from '../integrations/google-people-service.js';
 import { GoogleOAuthHandler } from '../oauth/google-oauth-handler.js';
 // Hot-reload imports
 import { ServiceRegistry } from '../services/service-registry.js';
@@ -25,9 +26,12 @@ import { getHotReloadConfig } from '../config/hot-reload-config.js';
 // Extracted tool handlers
 import { handleCheckSetupStatus, handleStartSetupWizard, handleAnswerWizardQuestion, handleSaveConfig, } from '../tools/setup/index.js';
 import { handleAnalyzeTasks, handleUpdateTaskStatus, handleSyncTasks, handleDetectDuplicates, } from '../tools/tasks/index.js';
-import { handleSetReminder, handleListTodos, } from '../tools/reminders/index.js';
+import { handleSetReminder, handleListTodos, handleSetReminderWithSampling, } from '../tools/reminders/index.js';
 import { handleSyncToNotion, handleUpdateConfig, } from '../tools/integrations/index.js';
-import { handleListCalendarSources, handleListCalendarEvents, handleFindAvailableSlots, handleCreateCalendarEvent, handleRespondToCalendarEvent, handleRespondToCalendarEventsBatch, handleDeleteCalendarEvent, handleDeleteCalendarEventsBatch, } from '../tools/calendar/handlers.js';
+import { handleListCalendarSources, handleListCalendarResources, handleListCalendarEvents, handleFindAvailableSlots, handleCreateCalendarEvent, handleRespondToCalendarEvent, handleRespondToCalendarEventsBatch, handleDeleteCalendarEvent, handleDeleteCalendarEventsBatch, handleUpdateCalendarEvent, handleSearchRoomAvailability, handleCheckRoomAvailability, handleCheckPeopleAvailability, handleFindCommonAvailability, handleListCalendarEventsWithSampling, } from '../tools/calendar/handlers.js';
+// Shared tool definitions
+import { searchRoomAvailabilityTool, checkRoomAvailabilityTool, updateCalendarEventTool, deleteCalendarEventTool, searchDirectoryPeopleTool, checkPeopleAvailabilityTool, findCommonAvailabilityTool, toJsonSchema, } from '../tools/shared/index.js';
+import { handleSearchDirectoryPeople, } from '../tools/directory/index.js';
 import { handleAuthenticateGoogle, } from '../tools/oauth/index.js';
 // Protocol version
 const PROTOCOL_VERSION = '2024-11-05';
@@ -37,6 +41,7 @@ const PROTOCOL_VERSION = '2024-11-05';
 class MCPHandlerImpl {
     config = null;
     wizardSession = null;
+    supportsSampling = false;
     reminderManager = null;
     calendarService = null;
     notionService = null;
@@ -46,6 +51,7 @@ class MCPHandlerImpl {
     workingCadenceService = null;
     calendarSourceManager = null;
     googleCalendarService = null;
+    googlePeopleService = null;
     initialized = false;
     // Hot-reload infrastructure
     serviceRegistry = null;
@@ -194,6 +200,8 @@ class MCPHandlerImpl {
         };
         const oauthHandler = new GoogleOAuthHandler(oauthConfig);
         this.googleCalendarService = new GoogleCalendarService(oauthHandler);
+        // Initialize Google People service with the same OAuth handler
+        this.googlePeopleService = new GooglePeopleService(oauthHandler);
         this.calendarSourceManager = new CalendarSourceManager({
             calendarService: this.calendarService,
             googleCalendarService: this.googleCalendarService,
@@ -295,6 +303,7 @@ class MCPHandlerImpl {
             },
             getCalendarEventResponseService: () => this.calendarEventResponseService,
             getGoogleCalendarService: () => this.googleCalendarService,
+            getGooglePeopleService: () => this.googlePeopleService,
             getWorkingCadenceService: () => {
                 // Prefer reloadable adapter instance if available
                 if (this.workingCadenceAdapter) {
@@ -335,6 +344,25 @@ class MCPHandlerImpl {
             createGoogleOAuthHandler: createHandler,
         };
     }
+    /**
+     * Create DirectoryToolsContext for directory tool handlers
+     */
+    createDirectoryToolsContext() {
+        return {
+            getConfig: () => this.config,
+            getGooglePeopleService: () => this.googlePeopleService,
+        };
+    }
+    /**
+     * Create SamplingContext for Sampling-based tool handlers
+     */
+    createSamplingContext() {
+        return {
+            // TODO: Implement MCP Server instance passing for Sampling requests
+            // Currently returns null - Sampling handlers will fall back to non-Sampling behavior
+            getMcpServer: () => null,
+        };
+    }
     /**
      * Handle an MCP request
      */
@@ -374,8 +402,24 @@ class MCPHandlerImpl {
     }
     /**
      * Handle initialize request
+     * Requirements: 1.1, 1.6 (platform-adaptive-integration)
+     *
+     * Extracts clientInfo and capabilities from the initialize request to detect
+     * the platform type and available features.
      */
-    handleInitialize(id, _params) {
+    handleInitialize(id, params) {
+        // Extract clientInfo and capabilities from params
+        const clientInfo = params?.clientInfo;
+        const capabilities = params?.capabilities;
+        // Capability-based: check for Sampling support
+        if (clientInfo && capabilities) {
+            this.supportsSampling = capabilities.sampling !== undefined;
+            console.log(`[sage] MCP client initialized: ${clientInfo.name} v${clientInfo.version}, ` +
+                `sampling: ${this.supportsSampling}`);
+        }
+        else {
+            console.warn('[sage] No clientInfo available in initialize request');
+        }
         return {
             jsonrpc: '2.0',
             id,
@@ -464,6 +508,17 @@ class MCPHandlerImpl {
     listTools() {
         return Array.from(this.tools.values()).map((t) => t.definition);
     }
+    /**
+     * Shutdown the handler and release all resources
+     * Stops the ConfigReloadService and ConfigWatcher to prevent resource leaks
+     */
+    async shutdown() {
+        if (this.configReloadService) {
+            this.configReloadService.stop();
+            this.configReloadService = null;
+        }
+        this.initialized = false;
+    }
     /**
      * Register all tools
      */
@@ -562,10 +617,10 @@ class MCPHandlerImpl {
         }, async (args) => handleAnalyzeTasks(this.createTaskToolsContext(), {
             tasks: args.tasks,
         }));
-        // set_reminder - uses extracted handler
+        // set_reminder - with platform-based runtime dispatch
         this.registerTool({
             name: 'set_reminder',
-            description: 'Set a reminder for a task in Apple Reminders or Notion.',
+            description: 'Set a reminder for a task. Uses native iOS Reminders on iOS/iPad, or AppleScript/Notion on other platforms.',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -601,14 +656,23 @@ class MCPHandlerImpl {
                 },
                 required: ['taskTitle'],
             },
-        }, async (args) => handleSetReminder(this.createReminderTodoContext(), {
-            taskTitle: args.taskTitle,
-            dueDate: args.dueDate,
-            reminderType: args.reminderType,
-            list: args.list,
-            priority: args.priority,
-            notes: args.notes,
-        }));
+        }, async (args) => {
+            const input = {
+                taskTitle: args.taskTitle,
+                dueDate: args.dueDate,
+                reminderType: args.reminderType,
+                list: args.list,
+                priority: args.priority,
+                notes: args.notes,
+            };
+            // Capability-based routing: Use Sampling when available
+            if (this.supportsSampling) {
+                return handleSetReminderWithSampling(input, this.createReminderTodoContext(), this.createSamplingContext());
+            }
+            else {
+                return handleSetReminder(this.createReminderTodoContext(), input);
+            }
+        });
         // find_available_slots - uses extracted handler
         this.registerTool({
             name: 'find_available_slots',
@@ -641,10 +705,10 @@ class MCPHandlerImpl {
             endDate: args.endDate,
             preferDeepWork: args.preferDeepWork,
         }));
-        // list_calendar_events - uses extracted handler
+        // list_calendar_events - with platform-based runtime dispatch
         this.registerTool({
             name: 'list_calendar_events',
-            description: 'List calendar events for a specified period. Returns events with details including calendar name and location.',
+            description: 'List calendar events for a specified period. Uses native iOS Calendar on iOS/iPad, or EventKit/Google Calendar on other platforms. Returns events with details including calendar name and location.',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -663,11 +727,20 @@ class MCPHandlerImpl {
                 },
                 required: ['startDate', 'endDate'],
             },
-        }, async (args) => handleListCalendarEvents(this.createCalendarToolsContext(), {
-            startDate: args.startDate,
-            endDate: args.endDate,
-            calendarId: args.calendarId,
-        }));
+        }, async (args) => {
+            const input = {
+                startDate: args.startDate,
+                endDate: args.endDate,
+                calendarId: args.calendarId,
+            };
+            // Capability-based routing: Use Sampling when available
+            if (this.supportsSampling) {
+                return handleListCalendarEventsWithSampling(input, this.createCalendarToolsContext(), this.createSamplingContext());
+            }
+            else {
+                return handleListCalendarEvents(this.createCalendarToolsContext(), input);
+            }
+        });
         // sync_to_notion - uses extracted handler
         this.registerTool({
             name: 'sync_to_notion',
@@ -965,7 +1038,7 @@ class MCPHandlerImpl {
         // create_calendar_event
         this.registerTool({
             name: 'create_calendar_event',
-            description: 'Create a new calendar event with support for Google Calendar event types (OOO, Focus Time, Working Location, etc.).',
+            description: 'Create a new calendar event with support for Google Calendar event types (OOO, Focus Time, Working Location, etc.) and recurring events.',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -989,6 +1062,11 @@ class MCPHandlerImpl {
                         items: { type: 'string' },
                         description: "Optional: Override default alarms with custom settings (e.g., ['-15m', '-1h']). If omitted, calendar's default alarm settings apply.",
                     },
+                    recurrence: {
+                        type: 'array',
+                        items: { type: 'string' },
+                        description: 'Optional: Array of RRULE strings for recurring events (e.g., ["FREQ=WEEKLY;BYDAY=MO,WE,FR"]). Google Calendar only. Supports DAILY, WEEKLY, MONTHLY, YEARLY frequencies with optional INTERVAL, COUNT, UNTIL, and BYDAY parameters.',
+                    },
                     eventType: {
                         type: 'string',
                         enum: ['default', 'outOfOffice', 'focusTime', 'workingLocation', 'birthday'],
@@ -1022,6 +1100,10 @@ class MCPHandlerImpl {
                         enum: ['birthday', 'anniversary', 'other'],
                         description: 'For birthday: type of birthday event',
                     },
+                    roomId: {
+                        type: 'string',
+                        description: 'Room calendar ID to book for this event. Use search_room_availability to find available rooms. Requires Google Calendar.',
+                    },
                 },
                 required: ['title', 'startDate', 'endDate'],
             },
@@ -1032,6 +1114,7 @@ class MCPHandlerImpl {
             location: args.location,
             notes: args.notes,
             calendarName: args.calendarName,
+            recurrence: args.recurrence,
             eventType: args.eventType,
             autoDeclineMode: args.autoDeclineMode,
             declineMessage: args.declineMessage,
@@ -1039,27 +1122,19 @@ class MCPHandlerImpl {
             workingLocationType: args.workingLocationType,
             workingLocationLabel: args.workingLocationLabel,
             birthdayType: args.birthdayType,
+            roomId: args.roomId,
         }));
-        // delete_calendar_event
+        // delete_calendar_event - Delete a calendar event
+        // Requirement: recurring-calendar-events 5.1
+        // Uses shared definition from tools/shared/calendar-tools.ts
         this.registerTool({
-            name: 'delete_calendar_event',
-            description: 'Delete a calendar event by its ID.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    eventId: {
-                        type: 'string',
-                        description: 'Event ID (UUID or full ID from list_calendar_events)',
-                    },
-                    calendarName: {
-                        type: 'string',
-                        description: 'Calendar name (searches all calendars if not specified)',
-                    },
-                },
-                required: ['eventId'],
-            },
+            name: deleteCalendarEventTool.name,
+            description: deleteCalendarEventTool.description,
+            inputSchema: toJsonSchema(deleteCalendarEventTool.schema),
         }, async (args) => handleDeleteCalendarEvent(this.createCalendarToolsContext(), {
             eventId: args.eventId,
+            deleteScope: args.deleteScope,
+            calendarName: args.calendarName,
         }));
         // delete_calendar_events_batch
         this.registerTool({
@@ -1083,6 +1158,29 @@ class MCPHandlerImpl {
         }, async (args) => handleDeleteCalendarEventsBatch(this.createCalendarToolsContext(), {
             eventIds: args.eventIds,
         }));
+        // update_calendar_event - Update an existing calendar event
+        // Requirement: update-calendar-event 1-8
+        // Uses shared definition from tools/shared/calendar-tools.ts
+        this.registerTool({
+            name: updateCalendarEventTool.name,
+            description: updateCalendarEventTool.description,
+            inputSchema: toJsonSchema(updateCalendarEventTool.schema),
+        }, async (args) => handleUpdateCalendarEvent(this.createCalendarToolsContext(), {
+            eventId: args.eventId,
+            title: args.title,
+            startDate: args.startDate,
+            endDate: args.endDate,
+            location: args.location,
+            notes: args.notes,
+            attendees: args.attendees,
+            alarms: args.alarms,
+            roomId: args.roomId,
+            removeRoom: args.removeRoom,
+            autoDeclineMode: args.autoDeclineMode,
+            declineMessage: args.declineMessage,
+            chatStatus: args.chatStatus,
+            calendarName: args.calendarName,
+        }));
         // list_calendar_sources - uses extracted handler
         this.registerTool({
             name: 'list_calendar_sources',
@@ -1092,6 +1190,89 @@ class MCPHandlerImpl {
                 properties: {},
             },
         }, async () => handleListCalendarSources(this.createCalendarToolsContext()));
+        // list_calendar_resources - list individual calendars from all sources
+        // Requirement: multi-calendar-resources 1.1
+        this.registerTool({
+            name: 'list_calendar_resources',
+            description: 'List all available calendar resources (individual calendars) from enabled sources. Returns calendar names, IDs, colors, and write permissions.',
+            inputSchema: {
+                type: 'object',
+                properties: {
+                    source: {
+                        type: 'string',
+                        enum: ['eventkit', 'google', 'all'],
+                        description: "Filter by source type: 'eventkit', 'google', or 'all' (default: 'all')",
+                    },
+                },
+            },
+        }, async (args) => handleListCalendarResources(this.createCalendarToolsContext(), {
+            source: args.source,
+        }));
+        // search_room_availability - Search for available meeting rooms
+        // Requirement: room-availability-search 1
+        // Uses shared definition from tools/shared/room-tools.ts
+        this.registerTool({
+            name: searchRoomAvailabilityTool.name,
+            description: searchRoomAvailabilityTool.description,
+            inputSchema: toJsonSchema(searchRoomAvailabilityTool.schema),
+        }, async (args) => handleSearchRoomAvailability(this.createCalendarToolsContext(), {
+            startTime: args.startTime,
+            endTime: args.endTime,
+            durationMinutes: args.durationMinutes,
+            minCapacity: args.minCapacity,
+            building: args.building,
+            floor: args.floor,
+            features: args.features,
+        }));
+        // check_room_availability - Check availability of a specific room
+        // Requirement: room-availability-search 2
+        // Uses shared definition from tools/shared/room-tools.ts
+        this.registerTool({
+            name: checkRoomAvailabilityTool.name,
+            description: checkRoomAvailabilityTool.description,
+            inputSchema: toJsonSchema(checkRoomAvailabilityTool.schema),
+        }, async (args) => handleCheckRoomAvailability(this.createCalendarToolsContext(), {
+            roomId: args.roomId,
+            startTime: args.startTime,
+            endTime: args.endTime,
+        }));
+        // search_directory_people - Search organization directory for people
+        // Requirement: directory-people-search 1
+        // Uses shared definition from tools/shared/directory-tools.ts
+        this.registerTool({
+            name: searchDirectoryPeopleTool.name,
+            description: searchDirectoryPeopleTool.description,
+            inputSchema: toJsonSchema(searchDirectoryPeopleTool.schema),
+        }, async (args) => handleSearchDirectoryPeople(this.createDirectoryToolsContext(), {
+            query: args.query,
+            pageSize: args.pageSize,
+        }));
+        // check_people_availability - Check availability of people by email
+        // Requirement: check-others-availability 1
+        // Uses shared definition from tools/shared/availability-tools.ts
+        this.registerTool({
+            name: checkPeopleAvailabilityTool.name,
+            description: checkPeopleAvailabilityTool.description,
+            inputSchema: toJsonSchema(checkPeopleAvailabilityTool.schema),
+        }, async (args) => handleCheckPeopleAvailability(this.createCalendarToolsContext(), {
+            emails: args.emails,
+            startTime: args.startTime,
+            endTime: args.endTime,
+        }));
+        // find_common_availability - Find common free time among people
+        // Requirement: check-others-availability 2, 4
+        // Uses shared definition from tools/shared/availability-tools.ts
+        this.registerTool({
+            name: findCommonAvailabilityTool.name,
+            description: findCommonAvailabilityTool.description,
+            inputSchema: toJsonSchema(findCommonAvailabilityTool.schema),
+        }, async (args) => handleFindCommonAvailability(this.createCalendarToolsContext(), {
+            participants: args.participants,
+            startTime: args.startTime,
+            endTime: args.endTime,
+            minDurationMinutes: args.minDurationMinutes,
+            includeMyCalendar: args.includeMyCalendar,
+        }));
         // authenticate_google - Complete Google OAuth flow automatically
         this.registerTool({
             name: 'authenticate_google',