@shin1ohno/sage 0.7.9 → 0.8.6

package/dist/cli/mcp-handler.js

@@ -6,8 +6,6 @@
  */
 import { VERSION, SERVER_NAME } from '../version.js';
 import { ConfigLoader } from '../config/loader.js';
-import { SetupWizard } from '../setup/wizard.js';
-import { TaskAnalyzer } from '../tools/analyze-tasks.js';
 import { ReminderManager } from '../integrations/reminder-manager.js';
 import { CalendarService } from '../integrations/calendar-service.js';
 import { NotionMCPService } from '../integrations/notion-mcp.js';
@@ -17,6 +15,11 @@ import { CalendarEventResponseService } from '../integrations/calendar-event-res
 import { CalendarEventCreatorService } from '../integrations/calendar-event-creator.js';
 import { CalendarEventDeleterService } from '../integrations/calendar-event-deleter.js';
 import { WorkingCadenceService } from '../services/working-cadence.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 { handleSyncToNotion, handleUpdateConfig, } from '../tools/integrations/index.js';
 // Protocol version
 const PROTOCOL_VERSION = '2024-11-05';
 /**
@@ -76,6 +79,57 @@ class MCPHandlerImpl {
         this.calendarEventDeleterService = new CalendarEventDeleterService();
         this.workingCadenceService = new WorkingCadenceService();
     }
+    /**
+     * Create SetupContext for setup tool handlers
+     */
+    createSetupContext() {
+        return {
+            getConfig: () => this.config,
+            setConfig: (config) => {
+                this.config = config;
+            },
+            getWizardSession: () => this.wizardSession,
+            setWizardSession: (session) => {
+                this.wizardSession = session;
+            },
+            initializeServices: (config) => this.initializeServices(config),
+        };
+    }
+    /**
+     * Create TaskToolsContext for task tool handlers
+     */
+    createTaskToolsContext() {
+        return {
+            getConfig: () => this.config,
+            getTodoListManager: () => this.todoListManager,
+            getTaskSynchronizer: () => this.taskSynchronizer,
+            initializeServices: (config) => this.initializeServices(config),
+        };
+    }
+    /**
+     * Create ReminderTodoContext for reminder/todo tool handlers
+     */
+    createReminderTodoContext() {
+        return {
+            getConfig: () => this.config,
+            getReminderManager: () => this.reminderManager,
+            getTodoListManager: () => this.todoListManager,
+            initializeServices: (config) => this.initializeServices(config),
+        };
+    }
+    /**
+     * Create IntegrationToolsContext for integration tool handlers
+     */
+    createIntegrationToolsContext() {
+        return {
+            getConfig: () => this.config,
+            setConfig: (config) => {
+                this.config = config;
+            },
+            getNotionService: () => this.notionService,
+            initializeServices: (config) => this.initializeServices(config),
+        };
+    }
     /**
      * Handle an MCP request
      */
@@ -209,7 +263,7 @@ class MCPHandlerImpl {
      * Register all tools
      */
     registerTools() {
-        // check_setup_status
+        // check_setup_status - uses extracted handler
         this.registerTool({
             name: 'check_setup_status',
             description: 'Check if sage has been configured. Returns setup status and guidance.',
@@ -217,61 +271,8 @@ class MCPHandlerImpl {
                 type: 'object',
                 properties: {},
             },
-        }, async () => {
-            const exists = await ConfigLoader.exists();
-            const isValid = this.config !== null;
-            if (!exists) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                setupComplete: false,
-                                configExists: false,
-                                message: 'sageの初期設定が必要です。start_setup_wizardを実行してセットアップを開始してください。',
-                                nextAction: 'start_setup_wizard',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (!isValid) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                setupComplete: false,
-                                configExists: true,
-                                message: '設定ファイルが見つかりましたが、読み込みに失敗しました。設定を再作成してください。',
-                                nextAction: 'start_setup_wizard',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            setupComplete: true,
-                            configExists: true,
-                            userName: this.config?.user.name,
-                            message: 'sageは設定済みです。タスク分析やリマインド設定を開始できます。',
-                            availableTools: [
-                                'analyze_tasks',
-                                'set_reminder',
-                                'find_available_slots',
-                                'sync_to_notion',
-                                'update_config',
-                            ],
-                        }, null, 2),
-                    },
-                ],
-            };
-        });
-        // start_setup_wizard
+        }, async () => handleCheckSetupStatus(this.createSetupContext()));
+        // start_setup_wizard - uses extracted handler
         this.registerTool({
             name: 'start_setup_wizard',
             description: 'Start the interactive setup wizard for sage. Returns the first question.',
@@ -285,34 +286,10 @@ class MCPHandlerImpl {
                     },
                 },
             },
-        }, async (args) => {
-            const mode = args.mode || 'full';
-            this.wizardSession = SetupWizard.createSession(mode);
-            const question = SetupWizard.getCurrentQuestion(this.wizardSession);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            sessionId: this.wizardSession.sessionId,
-                            currentStep: this.wizardSession.currentStep,
-                            totalSteps: this.wizardSession.totalSteps,
-                            progress: Math.round((this.wizardSession.currentStep / this.wizardSession.totalSteps) * 100),
-                            question: {
-                                id: question.id,
-                                text: question.text,
-                                type: question.type,
-                                options: question.options,
-                                defaultValue: question.defaultValue,
-                                helpText: question.helpText,
-                            },
-                            message: 'セットアップを開始します。以下の質問に回答してください。',
-                        }, null, 2),
-                    },
-                ],
-            };
-        });
-        // answer_wizard_question
+        }, async (args) => handleStartSetupWizard(this.createSetupContext(), {
+            mode: args.mode,
+        }));
+        // answer_wizard_question - uses extracted handler
         this.registerTool({
             name: 'answer_wizard_question',
             description: 'Answer a question in the setup wizard and get the next question.',
@@ -330,77 +307,11 @@ class MCPHandlerImpl {
                 },
                 required: ['questionId', 'answer'],
             },
-        }, async (args) => {
-            const questionId = args.questionId;
-            const answer = args.answer;
-            if (!this.wizardSession) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'セットアップセッションが見つかりません。start_setup_wizardを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            const result = SetupWizard.answerQuestion(this.wizardSession, questionId, answer);
-            if (!result.success) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: result.error,
-                                currentQuestion: result.currentQuestion,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (result.isComplete) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                isComplete: true,
-                                sessionId: this.wizardSession.sessionId,
-                                answers: this.wizardSession.answers,
-                                message: 'すべての質問に回答しました。save_configを実行して設定を保存してください。',
-                                nextAction: 'save_config',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            const nextQuestion = SetupWizard.getCurrentQuestion(this.wizardSession);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            success: true,
-                            currentStep: this.wizardSession.currentStep,
-                            totalSteps: this.wizardSession.totalSteps,
-                            progress: Math.round((this.wizardSession.currentStep / this.wizardSession.totalSteps) * 100),
-                            question: {
-                                id: nextQuestion.id,
-                                text: nextQuestion.text,
-                                type: nextQuestion.type,
-                                options: nextQuestion.options,
-                                defaultValue: nextQuestion.defaultValue,
-                                helpText: nextQuestion.helpText,
-                            },
-                        }, null, 2),
-                    },
-                ],
-            };
-        });
-        // save_config
+        }, async (args) => handleAnswerWizardQuestion(this.createSetupContext(), {
+            questionId: args.questionId,
+            answer: args.answer,
+        }));
+        // save_config - uses extracted handler
         this.registerTool({
             name: 'save_config',
             description: 'Save the configuration after completing the setup wizard.',
@@ -414,74 +325,10 @@ class MCPHandlerImpl {
                 },
                 required: ['confirm'],
             },
-        }, async (args) => {
-            const confirm = args.confirm;
-            if (!confirm) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                saved: false,
-                                message: '設定の保存がキャンセルされました。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (!this.wizardSession) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'セットアップセッションが見つかりません。start_setup_wizardを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            try {
-                const newConfig = SetupWizard.buildConfig(this.wizardSession);
-                await ConfigLoader.save(newConfig);
-                this.config = newConfig;
-                this.wizardSession = null;
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                saved: true,
-                                configPath: ConfigLoader.getConfigPath(),
-                                userName: newConfig.user.name,
-                                message: `設定を保存しました。${newConfig.user.name}さん、sageをご利用いただきありがとうございます！`,
-                                availableTools: [
-                                    'analyze_tasks',
-                                    'set_reminder',
-                                    'find_available_slots',
-                                    'sync_to_notion',
-                                ],
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: `設定の保存に失敗しました: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-        });
-        // analyze_tasks
+        }, async (args) => handleSaveConfig(this.createSetupContext(), {
+            confirm: args.confirm,
+        }));
+        // analyze_tasks - uses extracted handler
         this.registerTool({
             name: 'analyze_tasks',
             description: 'Analyze tasks to determine priority, estimate time, and identify stakeholders.',
@@ -507,61 +354,10 @@ class MCPHandlerImpl {
                 },
                 required: ['tasks'],
             },
-        }, async (args) => {
-            if (!this.config) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'sageが設定されていません。check_setup_statusを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            try {
-                const tasks = args.tasks;
-                const result = await TaskAnalyzer.analyzeTasks(tasks, this.config);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                summary: result.summary,
-                                tasks: result.analyzedTasks.map((t) => ({
-                                    title: t.original.title,
-                                    description: t.original.description,
-                                    deadline: t.original.deadline,
-                                    priority: t.priority,
-                                    estimatedMinutes: t.estimatedMinutes,
-                                    stakeholders: t.stakeholders,
-                                    tags: t.tags,
-                                    reasoning: t.reasoning,
-                                    suggestedReminders: t.suggestedReminders,
-                                })),
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: `タスク分析に失敗しました: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-        });
-        // set_reminder
+        }, async (args) => handleAnalyzeTasks(this.createTaskToolsContext(), {
+            tasks: args.tasks,
+        }));
+        // set_reminder - uses extracted handler
         this.registerTool({
             name: 'set_reminder',
             description: 'Set a reminder for a task in Apple Reminders or Notion.',
@@ -600,99 +396,14 @@ class MCPHandlerImpl {
                 },
                 required: ['taskTitle'],
             },
-        }, async (args) => {
-            if (!this.config) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'sageが設定されていません。check_setup_statusを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (!this.reminderManager) {
-                this.initializeServices(this.config);
-            }
-            try {
-                const result = await this.reminderManager.setReminder({
-                    taskTitle: args.taskTitle,
-                    targetDate: args.dueDate,
-                    reminderType: args.reminderType,
-                    list: args.list ?? this.config.integrations.appleReminders.defaultList,
-                    priority: args.priority,
-                    notes: args.notes,
-                });
-                if (result.success) {
-                    if (result.delegateToNotion && result.notionRequest) {
-                        return {
-                            content: [
-                                {
-                                    type: 'text',
-                                    text: JSON.stringify({
-                                        success: true,
-                                        destination: 'notion_mcp',
-                                        method: 'delegate',
-                                        delegateToNotion: true,
-                                        notionRequest: result.notionRequest,
-                                        message: `Notionへの追加はClaude Codeが直接notion-create-pagesツールを使用してください。`,
-                                    }, null, 2),
-                                },
-                            ],
-                        };
-                    }
-                    return {
-                        content: [
-                            {
-                                type: 'text',
-                                text: JSON.stringify({
-                                    success: true,
-                                    destination: result.destination,
-                                    method: result.method,
-                                    reminderId: result.reminderId,
-                                    reminderUrl: result.reminderUrl ?? result.pageUrl,
-                                    message: result.destination === 'apple_reminders'
-                                        ? `Apple Remindersにリマインダーを作成しました: ${args.taskTitle}`
-                                        : `Notionにタスクを作成しました: ${args.taskTitle}`,
-                                }, null, 2),
-                            },
-                        ],
-                    };
-                }
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: false,
-                                destination: result.destination,
-                                error: result.error,
-                                fallbackText: result.fallbackText,
-                                message: result.fallbackText
-                                    ? '自動作成に失敗しました。以下のテキストを手動でコピーしてください。'
-                                    : `リマインダー作成に失敗しました: ${result.error}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: `リマインダー設定に失敗しました: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-        });
+        }, async (args) => handleSetReminder(this.createReminderTodoContext(), {
+            taskTitle: args.taskTitle,
+            dueDate: args.dueDate,
+            reminderType: args.reminderType,
+            list: args.list,
+            priority: args.priority,
+            notes: args.notes,
+        }));
         // find_available_slots
         this.registerTool({
             name: 'find_available_slots',
@@ -928,7 +639,7 @@ class MCPHandlerImpl {
                 };
             }
         });
-        // sync_to_notion
+        // sync_to_notion - uses extracted handler
         this.registerTool({
             name: 'sync_to_notion',
             description: 'Sync a task to Notion database for long-term tracking.',
@@ -955,233 +666,45 @@ class MCPHandlerImpl {
                 },
                 required: ['taskTitle'],
             },
-        }, async (args) => {
-            if (!this.config) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'sageが設定されていません。check_setup_statusを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (!this.config.integrations.notion.enabled) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'Notion統合が有効になっていません。update_configでNotion設定を更新してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (!this.notionService) {
-                this.initializeServices(this.config);
-            }
-            try {
-                const taskTitle = args.taskTitle;
-                const description = args.description;
-                const priority = args.priority;
-                const dueDate = args.dueDate;
-                const stakeholders = args.stakeholders;
-                const estimatedMinutes = args.estimatedMinutes;
-                const isAvailable = await this.notionService.isAvailable();
-                const properties = this.notionService.buildNotionProperties({
-                    title: taskTitle,
-                    priority,
-                    deadline: dueDate,
-                    stakeholders,
-                    estimatedMinutes,
-                    description,
-                });
-                if (!isAvailable) {
-                    const fallbackText = this.notionService.generateFallbackTemplate({
-                        title: taskTitle,
-                        priority,
-                        deadline: dueDate,
-                        stakeholders,
-                        estimatedMinutes,
-                        description,
-                    });
-                    return {
-                        content: [
-                            {
-                                type: 'text',
-                                text: JSON.stringify({
-                                    success: false,
-                                    method: 'fallback',
-                                    message: 'Notion MCP統合が利用できません。以下のテンプレートを手動でNotionにコピーしてください。',
-                                    fallbackText,
-                                    task: {
-                                        taskTitle,
-                                        priority: priority ?? 'P3',
-                                        dueDate,
-                                        stakeholders: stakeholders ?? [],
-                                        estimatedMinutes,
-                                    },
-                                }, null, 2),
-                            },
-                        ],
-                    };
-                }
-                const result = await this.notionService.createPage({
-                    databaseId: this.config.integrations.notion.databaseId,
-                    title: taskTitle,
-                    properties,
-                });
-                if (result.success) {
-                    return {
-                        content: [
-                            {
-                                type: 'text',
-                                text: JSON.stringify({
-                                    success: true,
-                                    method: 'mcp',
-                                    pageId: result.pageId,
-                                    pageUrl: result.pageUrl,
-                                    message: `Notionにタスクを同期しました: ${taskTitle}`,
-                                }, null, 2),
-                            },
-                        ],
-                    };
-                }
-                const fallbackText = this.notionService.generateFallbackTemplate({
-                    title: taskTitle,
-                    priority,
-                    deadline: dueDate,
-                    stakeholders,
-                    estimatedMinutes,
-                    description,
-                });
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: false,
-                                method: 'fallback',
-                                error: result.error,
-                                message: 'Notion MCP呼び出しに失敗しました。以下のテンプレートを手動でコピーしてください。',
-                                fallbackText,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: `Notion同期に失敗しました: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-        });
-        // update_config
+        }, async (args) => handleSyncToNotion(this.createIntegrationToolsContext(), {
+            taskTitle: args.taskTitle,
+            description: args.description,
+            priority: args.priority,
+            dueDate: args.dueDate,
+            stakeholders: args.stakeholders,
+            estimatedMinutes: args.estimatedMinutes,
+        }));
+        // update_config - uses extracted handler
         this.registerTool({
             name: 'update_config',
-            description: 'Update sage configuration settings.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    section: {
-                        type: 'string',
-                        enum: [
-                            'user',
-                            'calendar',
-                            'priorityRules',
-                            'integrations',
-                            'team',
-                            'preferences',
-                        ],
-                        description: 'Configuration section to update',
-                    },
-                    updates: {
-                        type: 'object',
-                        description: 'Key-value pairs to update',
-                    },
-                },
-                required: ['section', 'updates'],
-            },
-        }, async (args) => {
-            if (!this.config) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'sageが設定されていません。check_setup_statusを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            try {
-                const section = args.section;
-                const updates = args.updates;
-                const validationResult = this.validateConfigUpdate(section, updates);
-                if (!validationResult.valid) {
-                    return {
-                        content: [
-                            {
-                                type: 'text',
-                                text: JSON.stringify({
-                                    error: true,
-                                    message: `設定の検証に失敗しました: ${validationResult.error}`,
-                                    invalidFields: validationResult.invalidFields,
-                                }, null, 2),
-                            },
+            description: 'Update sage configuration settings.',
+            inputSchema: {
+                type: 'object',
+                properties: {
+                    section: {
+                        type: 'string',
+                        enum: [
+                            'user',
+                            'calendar',
+                            'priorityRules',
+                            'integrations',
+                            'team',
+                            'preferences',
                         ],
-                    };
-                }
-                const updatedConfig = this.applyConfigUpdates(this.config, section, updates);
-                await ConfigLoader.save(updatedConfig);
-                this.config = updatedConfig;
-                if (section === 'integrations') {
-                    this.initializeServices(this.config);
-                }
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                section,
-                                updatedFields: Object.keys(updates),
-                                message: `設定を更新しました: ${section}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: `設定の更新に失敗しました: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-        });
-        // list_todos
+                        description: 'Configuration section to update',
+                    },
+                    updates: {
+                        type: 'object',
+                        description: 'Key-value pairs to update',
+                    },
+                },
+                required: ['section', 'updates'],
+            },
+        }, async (args) => handleUpdateConfig(this.createIntegrationToolsContext(), {
+            section: args.section,
+            updates: args.updates,
+        }));
+        // list_todos - uses extracted handler
         this.registerTool({
             name: 'list_todos',
             description: 'List TODO items from Apple Reminders and Notion with optional filtering.',
@@ -1214,90 +737,14 @@ class MCPHandlerImpl {
                     },
                 },
             },
-        }, async (args) => {
-            if (!this.config) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'sageが設定されていません。check_setup_statusを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (!this.todoListManager) {
-                this.initializeServices(this.config);
-            }
-            try {
-                const priority = args.priority;
-                const status = args.status;
-                const source = args.source;
-                const todayOnly = args.todayOnly;
-                const tags = args.tags;
-                let todos;
-                if (todayOnly) {
-                    todos = await this.todoListManager.getTodaysTasks();
-                }
-                else {
-                    todos = await this.todoListManager.listTodos({
-                        priority,
-                        status,
-                        source,
-                        tags,
-                    });
-                }
-                const formattedTodos = todos.map((todo) => ({
-                    id: todo.id,
-                    title: todo.title,
-                    priority: todo.priority,
-                    status: todo.status,
-                    dueDate: todo.dueDate,
-                    source: todo.source,
-                    tags: todo.tags,
-                    estimatedMinutes: todo.estimatedMinutes,
-                    stakeholders: todo.stakeholders,
-                }));
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                totalCount: todos.length,
-                                todos: formattedTodos,
-                                message: todos.length > 0
-                                    ? `${todos.length}件のタスクが見つかりました。`
-                                    : 'タスクが見つかりませんでした。',
-                                filters: {
-                                    priority,
-                                    status,
-                                    source,
-                                    todayOnly,
-                                    tags,
-                                },
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: `TODOリストの取得に失敗しました: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-        });
-        // update_task_status
+        }, async (args) => handleListTodos(this.createReminderTodoContext(), {
+            priority: args.priority,
+            status: args.status,
+            source: args.source,
+            todayOnly: args.todayOnly,
+            tags: args.tags,
+        }));
+        // update_task_status - uses extracted handler
         this.registerTool({
             name: 'update_task_status',
             description: 'Update the status of a task in Apple Reminders or Notion.',
@@ -1322,80 +769,13 @@ class MCPHandlerImpl {
                 },
                 required: ['taskId', 'status', 'source'],
             },
-        }, async (args) => {
-            if (!this.config) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'sageが設定されていません。check_setup_statusを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (!this.todoListManager) {
-                this.initializeServices(this.config);
-            }
-            try {
-                const taskId = args.taskId;
-                const status = args.status;
-                const source = args.source;
-                const syncAcrossSources = args.syncAcrossSources;
-                const result = await this.todoListManager.updateTaskStatus(taskId, status, source);
-                if (!result.success) {
-                    return {
-                        content: [
-                            {
-                                type: 'text',
-                                text: JSON.stringify({
-                                    success: false,
-                                    taskId,
-                                    error: result.error,
-                                    message: `タスクステータスの更新に失敗しました: ${result.error}`,
-                                }, null, 2),
-                            },
-                        ],
-                    };
-                }
-                let syncResult;
-                if (syncAcrossSources) {
-                    syncResult = await this.todoListManager.syncTaskAcrossSources(taskId);
-                }
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                taskId,
-                                newStatus: status,
-                                updatedFields: result.updatedFields,
-                                syncedSources: result.syncedSources,
-                                syncResult: syncAcrossSources ? syncResult : undefined,
-                                message: `タスクのステータスを「${status}」に更新しました。`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: `タスクステータスの更新に失敗しました: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-        });
-        // sync_tasks
+        }, async (args) => handleUpdateTaskStatus(this.createTaskToolsContext(), {
+            taskId: args.taskId,
+            status: args.status,
+            source: args.source,
+            syncAcrossSources: args.syncAcrossSources,
+        }));
+        // sync_tasks - uses extracted handler
         this.registerTool({
             name: 'sync_tasks',
             description: 'Synchronize tasks between Apple Reminders and Notion, detecting and resolving conflicts.',
@@ -1403,59 +783,8 @@ class MCPHandlerImpl {
                 type: 'object',
                 properties: {},
             },
-        }, async () => {
-            if (!this.config) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'sageが設定されていません。check_setup_statusを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (!this.taskSynchronizer) {
-                this.initializeServices(this.config);
-            }
-            try {
-                const result = await this.taskSynchronizer.syncAllTasks();
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                totalTasks: result.totalTasks,
-                                syncedTasks: result.syncedTasks,
-                                conflicts: result.conflicts,
-                                errors: result.errors,
-                                durationMs: result.duration,
-                                message: result.conflicts.length > 0
-                                    ? `${result.syncedTasks}件のタスクを同期しました。${result.conflicts.length}件の競合が検出されました。`
-                                    : `${result.syncedTasks}件のタスクを同期しました。`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: `タスク同期に失敗しました: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-        });
-        // detect_duplicates
+        }, async () => handleSyncTasks(this.createTaskToolsContext()));
+        // detect_duplicates - uses extracted handler
         this.registerTool({
             name: 'detect_duplicates',
             description: 'Detect duplicate tasks between Apple Reminders and Notion.',
@@ -1468,82 +797,9 @@ class MCPHandlerImpl {
                     },
                 },
             },
-        }, async (args) => {
-            if (!this.config) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: 'sageが設定されていません。check_setup_statusを実行してください。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            if (!this.taskSynchronizer) {
-                this.initializeServices(this.config);
-            }
-            try {
-                const autoMerge = args.autoMerge;
-                const duplicates = await this.taskSynchronizer.detectDuplicates();
-                const formattedDuplicates = duplicates.map((d) => ({
-                    tasks: d.tasks.map((t) => ({
-                        id: t.id,
-                        title: t.title,
-                        source: t.source,
-                        status: t.status,
-                        priority: t.priority,
-                    })),
-                    similarity: Math.round(d.similarity * 100),
-                    confidence: d.confidence,
-                    suggestedMerge: {
-                        title: d.suggestedMerge.title,
-                        priority: d.suggestedMerge.priority,
-                        status: d.suggestedMerge.status,
-                        tags: d.suggestedMerge.tags,
-                    },
-                }));
-                let mergeResults;
-                if (autoMerge) {
-                    const highConfidenceDuplicates = duplicates.filter((d) => d.confidence === 'high');
-                    if (highConfidenceDuplicates.length > 0) {
-                        mergeResults =
-                            await this.taskSynchronizer.mergeDuplicates(highConfidenceDuplicates);
-                    }
-                }
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                success: true,
-                                duplicatesFound: duplicates.length,
-                                duplicates: formattedDuplicates,
-                                mergeResults: autoMerge ? mergeResults : undefined,
-                                message: duplicates.length > 0
-                                    ? `${duplicates.length}件の重複タスクが検出されました。`
-                                    : '重複タスクは見つかりませんでした。',
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: JSON.stringify({
-                                error: true,
-                                message: `重複検出に失敗しました: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                            }, null, 2),
-                        },
-                    ],
-                };
-            }
-        });
+        }, async (args) => handleDetectDuplicates(this.createTaskToolsContext(), {
+            autoMerge: args.autoMerge,
+        }));
         // get_working_cadence
         this.registerTool({
             name: 'get_working_cadence',
@@ -2154,108 +1410,6 @@ class MCPHandlerImpl {
     registerTool(definition, handler) {
         this.tools.set(definition.name, { definition, handler });
     }
-    /**
-     * Validate config updates
-     */
-    validateConfigUpdate(section, updates) {
-        const invalidFields = [];
-        switch (section) {
-            case 'user':
-                if (updates.name !== undefined && typeof updates.name !== 'string') {
-                    invalidFields.push('name');
-                }
-                if (updates.timezone !== undefined && typeof updates.timezone !== 'string') {
-                    invalidFields.push('timezone');
-                }
-                break;
-            case 'calendar':
-                if (updates.workingHours !== undefined) {
-                    const wh = updates.workingHours;
-                    if (!wh.start || !wh.end) {
-                        invalidFields.push('workingHours');
-                    }
-                }
-                if (updates.deepWorkDays !== undefined && !Array.isArray(updates.deepWorkDays)) {
-                    invalidFields.push('deepWorkDays');
-                }
-                if (updates.meetingHeavyDays !== undefined &&
-                    !Array.isArray(updates.meetingHeavyDays)) {
-                    invalidFields.push('meetingHeavyDays');
-                }
-                break;
-            case 'integrations':
-                if (updates.notion !== undefined) {
-                    const notion = updates.notion;
-                    if (notion.enabled === true && !notion.databaseId) {
-                        invalidFields.push('notion.databaseId');
-                    }
-                }
-                break;
-            case 'team':
-                if (updates.members !== undefined && !Array.isArray(updates.members)) {
-                    invalidFields.push('members');
-                }
-                if (updates.managers !== undefined && !Array.isArray(updates.managers)) {
-                    invalidFields.push('managers');
-                }
-                break;
-        }
-        if (invalidFields.length > 0) {
-            return {
-                valid: false,
-                error: `無効なフィールド: ${invalidFields.join(', ')}`,
-                invalidFields,
-            };
-        }
-        return { valid: true };
-    }
-    /**
-     * Apply config updates
-     */
-    applyConfigUpdates(currentConfig, section, updates) {
-        const newConfig = { ...currentConfig };
-        switch (section) {
-            case 'user':
-                newConfig.user = { ...newConfig.user, ...updates };
-                break;
-            case 'calendar':
-                newConfig.calendar = {
-                    ...newConfig.calendar,
-                    ...updates,
-                };
-                break;
-            case 'priorityRules':
-                newConfig.priorityRules = {
-                    ...newConfig.priorityRules,
-                    ...updates,
-                };
-                break;
-            case 'integrations':
-                if (updates.appleReminders) {
-                    newConfig.integrations.appleReminders = {
-                        ...newConfig.integrations.appleReminders,
-                        ...updates.appleReminders,
-                    };
-                }
-                if (updates.notion) {
-                    newConfig.integrations.notion = {
-                        ...newConfig.integrations.notion,
-                        ...updates.notion,
-                    };
-                }
-                break;
-            case 'team':
-                newConfig.team = { ...newConfig.team, ...updates };
-                break;
-            case 'preferences':
-                newConfig.preferences = {
-                    ...newConfig.preferences,
-                    ...updates,
-                };
-                break;
-        }
-        return newConfig;
-    }
 }
 /**
  * Create an MCP handler