@shivaduke28/gmail-mcp 1.1.0 → 1.2.0

package/dist/index.js

@@ -3,31 +3,34 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 import { encode } from "@toon-format/toon";
-import { authorize, resolvePath } from "@shivaduke28/google-mcp-auth";
+import { authorize, exchangeCode, AuthError, resolvePath } from "@shivaduke28/google-mcp-auth";
 import { gmail as googleGmail } from "@googleapis/gmail";
 import { extractHeaders, extractBody, buildRawMessage } from "./gmail.js";
-import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 const SCOPES = [
     "https://www.googleapis.com/auth/gmail.modify",
 ];
 const rawCredentialsPath = process.env.GOOGLE_OAUTH_CREDENTIALS;
-if (!rawCredentialsPath) {
-    console.error("GOOGLE_OAUTH_CREDENTIALS 環境変数を設定してください");
-    process.exit(1);
-}
-const credentialsPath = resolvePath(rawCredentialsPath);
-if (!existsSync(credentialsPath)) {
-    console.error(`credentials.json が見つかりません: ${credentialsPath}`);
-    process.exit(1);
-}
-const resolvedCredentialsPath = credentialsPath;
+const resolvedCredentialsPath = rawCredentialsPath ? resolvePath(rawCredentialsPath) : null;
 const resolvedTokensPath = process.env.GOOGLE_OAUTH_TOKENS ? resolvePath(process.env.GOOGLE_OAUTH_TOKENS) : join(homedir(), ".config", "gmail-mcp", "tokens.json");
 // lazy auth: ツール呼び出し時に初めて認証する
 let gmailClient = null;
+let pendingAuth = null;
+function authErrorResponse(err) {
+    if (err.pendingAuth) {
+        pendingAuth = err.pendingAuth;
+    }
+    return {
+        content: [{ type: "text", text: `認証エラー: ${err.message}\n\n${err.details}` }],
+        isError: true,
+    };
+}
 async function getGmail() {
     if (!gmailClient) {
+        if (!resolvedCredentialsPath) {
+            throw new AuthError("GOOGLE_OAUTH_CREDENTIALS 環境変数が未設定です", "MCPサーバーの設定で GOOGLE_OAUTH_CREDENTIALS 環境変数を設定してください。");
+        }
         const auth = await authorize(resolvedCredentialsPath, resolvedTokensPath, SCOPES);
         gmailClient = googleGmail({ version: "v1", auth });
     }
@@ -45,7 +48,15 @@ server.registerTool("search-messages", {
         maxResults: z.number().optional().default(20).describe("最大取得件数"),
     },
 }, async ({ query, maxResults }) => {
-    const gmail = await getGmail();
+    let gmail;
+    try {
+        gmail = await getGmail();
+    }
+    catch (err) {
+        if (err instanceof AuthError)
+            return authErrorResponse(err);
+        throw err;
+    }
     const res = await gmail.users.messages.list({
         userId: "me",
         q: query,
@@ -93,7 +104,15 @@ server.registerTool("get-messages", {
         messageIds: z.array(z.string()).describe("メッセージIDの配列"),
     },
 }, async ({ messageIds }) => {
-    const gmail = await getGmail();
+    let gmail;
+    try {
+        gmail = await getGmail();
+    }
+    catch (err) {
+        if (err instanceof AuthError)
+            return authErrorResponse(err);
+        throw err;
+    }
     const details = await Promise.all(messageIds.map((id) => gmail.users.messages.get({
         userId: "me",
         id,
@@ -128,7 +147,15 @@ server.registerTool("get-threads", {
         threadIds: z.array(z.string()).describe("スレッドIDの配列"),
     },
 }, async ({ threadIds }) => {
-    const gmail = await getGmail();
+    let gmail;
+    try {
+        gmail = await getGmail();
+    }
+    catch (err) {
+        if (err instanceof AuthError)
+            return authErrorResponse(err);
+        throw err;
+    }
     const threads = await Promise.all(threadIds.map((id) => gmail.users.threads.get({
         userId: "me",
         id,
@@ -173,7 +200,15 @@ server.registerTool("create-draft", {
         inReplyToMessageId: z.string().optional().describe("返信先メッセージID（返信時に指定。Referencesヘッダー構築用）"),
     },
 }, async ({ to, cc, subject, body, threadId, inReplyToMessageId }) => {
-    const gmail = await getGmail();
+    let gmail;
+    try {
+        gmail = await getGmail();
+    }
+    catch (err) {
+        if (err instanceof AuthError)
+            return authErrorResponse(err);
+        throw err;
+    }
     // 返信時のヘッダー構築
     let inReplyTo;
     let references;
@@ -223,7 +258,15 @@ server.registerTool("modify-labels", {
         removeLabelIds: z.array(z.string()).optional().default([]).describe("削除するラベルIDの配列"),
     },
 }, async ({ messageIds, addLabelIds, removeLabelIds }) => {
-    const gmail = await getGmail();
+    let gmail;
+    try {
+        gmail = await getGmail();
+    }
+    catch (err) {
+        if (err instanceof AuthError)
+            return authErrorResponse(err);
+        throw err;
+    }
     await gmail.users.messages.batchModify({
         userId: "me",
         requestBody: {
@@ -244,7 +287,15 @@ server.registerTool("list-labels", {
     description: "利用可能なラベル一覧を取得する。レスポンスはTOON形式で返す。",
     inputSchema: {},
 }, async () => {
-    const gmail = await getGmail();
+    let gmail;
+    try {
+        gmail = await getGmail();
+    }
+    catch (err) {
+        if (err instanceof AuthError)
+            return authErrorResponse(err);
+        throw err;
+    }
     const res = await gmail.users.labels.list({ userId: "me" });
     const labels = (res.data.labels ?? []).map((label) => ({
         id: label.id ?? "",
@@ -258,5 +309,39 @@ server.registerTool("list-labels", {
             }],
     };
 });
+// 7. submit-auth-code
+server.registerTool("submit-auth-code", {
+    description: "OAuth認証コードを送信してGoogle認証を完了する。認証エラーで表示されたURLをブラウザで開き、認証後のリダイレクトURLに含まれる code パラメータの値を入力する。",
+    inputSchema: {
+        code: z.string().describe("認証後のリダイレクトURLに含まれる code パラメータの値"),
+    },
+}, async ({ code }) => {
+    if (!pendingAuth) {
+        return {
+            content: [{ type: "text", text: "認証待ち状態ではありません。先にGmail関連のツールを呼び出して認証URLを取得してください。" }],
+            isError: true,
+        };
+    }
+    if (!resolvedCredentialsPath) {
+        return {
+            content: [{ type: "text", text: "GOOGLE_OAUTH_CREDENTIALS 環境変数が未設定です。" }],
+            isError: true,
+        };
+    }
+    try {
+        await exchangeCode(resolvedCredentialsPath, resolvedTokensPath, code, pendingAuth.codeVerifier);
+        pendingAuth = null;
+        gmailClient = null;
+        return {
+            content: [{ type: "text", text: "認証が完了しました！Gmailのツールが使えるようになりました。" }],
+        };
+    }
+    catch (err) {
+        return {
+            content: [{ type: "text", text: `認証コードの交換に失敗しました。\n${err instanceof Error ? err.message : String(err)}` }],
+            isError: true,
+        };
+    }
+});
 const transport = new StdioServerTransport();
 await server.connect(transport);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaduke28/gmail-mcp",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -17,6 +17,13 @@
     "url": "https://github.com/shivaduke28/google-mcp.git",
     "directory": "packages/gmail"
   },
+  "scripts": {
+    "build": "tsc",
+    "start": "node dist/index.js",
+    "dev": "tsx src/index.ts",
+    "test": "tsx --test test/*.test.ts",
+    "typecheck": "tsc --noEmit"
+  },
   "keywords": [
     "mcp",
     "gmail",
@@ -28,20 +35,13 @@
   "dependencies": {
     "@googleapis/gmail": "^16.1.1",
     "@modelcontextprotocol/sdk": "^1.26.0",
+    "@shivaduke28/google-mcp-auth": "workspace:*",
     "@toon-format/toon": "^2.1.0",
-    "zod": "^4.3.6",
-    "@shivaduke28/google-mcp-auth": "1.1.0"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/node": "^25.2.3",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
-  },
-  "scripts": {
-    "build": "tsc",
-    "start": "node dist/index.js",
-    "dev": "tsx src/index.ts",
-    "test": "tsx --test test/*.test.ts",
-    "typecheck": "tsc --noEmit"
   }
-}
+}