@dguido/google-workspace-mcp 1.1.0 → 1.2.0

package/dist/index.js

@@ -925,12 +925,6 @@ import * as fs from "fs/promises";
 // src/auth/utils.ts
 import * as path from "path";
 import * as os from "os";
-import { fileURLToPath } from "url";
-function getProjectRoot() {
-  const __dirname2 = path.dirname(fileURLToPath(import.meta.url));
-  const projectRoot = path.join(__dirname2, "..", "..");
-  return path.resolve(projectRoot);
-}
 function getSecureTokenPath() {
   const customTokenPath = process.env.GOOGLE_WORKSPACE_MCP_TOKEN_PATH;
   if (customTokenPath) {
@@ -944,25 +938,12 @@ function getSecureTokenPath() {
   const tokenDir = path.join(configHome, "google-workspace-mcp");
   return path.join(tokenDir, "tokens.json");
 }
-function getLegacyTokenPath() {
-  const projectRoot = getProjectRoot();
-  return path.join(projectRoot, ".gcp-saved-tokens.json");
-}
-function getAdditionalLegacyPaths() {
-  return [
-    process.env.GOOGLE_TOKEN_PATH,
-    path.join(process.cwd(), "google-tokens.json"),
-    path.join(process.cwd(), ".gcp-saved-tokens.json")
-  ].filter(Boolean);
-}
 function getKeysFilePath() {
   const envCredentialsPath = process.env.GOOGLE_DRIVE_OAUTH_CREDENTIALS;
   if (envCredentialsPath) {
     return path.resolve(envCredentialsPath);
   }
-  const projectRoot = getProjectRoot();
-  const keysPath = path.join(projectRoot, "gcp-oauth.keys.json");
-  return keysPath;
+  return path.join(process.cwd(), "gcp-oauth.keys.json");
 }
 function generateCredentialsErrorMessage() {
   return `
@@ -1127,46 +1108,13 @@ var TokenManager = class {
       }
     });
   }
-  async migrateLegacyTokens() {
-    const legacyPaths = [getLegacyTokenPath(), ...getAdditionalLegacyPaths()];
-    for (const legacyPath of legacyPaths) {
-      try {
-        if (!await fs2.access(legacyPath).then(() => true).catch(() => false)) {
-          continue;
-        }
-        const legacyTokens = JSON.parse(await fs2.readFile(legacyPath, "utf-8"));
-        if (!legacyTokens || typeof legacyTokens !== "object") {
-          log(`Invalid legacy token format at ${legacyPath}, skipping`);
-          continue;
-        }
-        await this.ensureTokenDirectoryExists();
-        await fs2.writeFile(this.tokenPath, JSON.stringify(legacyTokens, null, 2), {
-          mode: 384
-        });
-        log(`Migrated tokens from legacy location: ${legacyPath} to: ${this.tokenPath}`);
-        try {
-          await fs2.unlink(legacyPath);
-          log("Removed legacy token file");
-        } catch (unlinkErr) {
-          log("Warning: Could not remove legacy token file:", unlinkErr);
-        }
-        return true;
-      } catch (error) {
-        log(`Error migrating legacy tokens from ${legacyPath}`, error);
-      }
-    }
-    return false;
-  }
   async loadSavedTokens() {
     try {
       await this.ensureTokenDirectoryExists();
       const tokenExists = await fs2.access(this.tokenPath).then(() => true).catch(() => false);
       if (!tokenExists) {
-        const migrated = await this.migrateLegacyTokens();
-        if (!migrated) {
-          log("No token file found at:", this.tokenPath);
-          return false;
-        }
+        log("No token file found at:", this.tokenPath);
+        return false;
       }
       const tokens = JSON.parse(await fs2.readFile(this.tokenPath, "utf-8"));
       if (!tokens || typeof tokens !== "object") {
@@ -1529,9 +1477,9 @@ async function authenticate() {
 
 // src/index.ts
 init_utils();
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { fileURLToPath } from "url";
 import { readFileSync } from "fs";
-import { join as join3, dirname as dirname3 } from "path";
+import { join as join3, dirname as dirname2 } from "path";
 
 // src/config/index.ts
 init_services();
@@ -4500,13 +4448,13 @@ var gmailTools = [
   },
   {
     name: "modify_email",
-    description: "Add/remove labels (max 1000 IDs per request)",
+    description: "Add/remove labels on threads (max 1000 IDs per request)",
     inputSchema: {
       type: "object",
       properties: {
-        messageId: {
+        threadId: {
           oneOf: [{ type: "string" }, { type: "array", items: { type: "string" }, maxItems: 1e3 }],
-          description: "Message ID or array of IDs (max 1000)"
+          description: "Thread ID or array of IDs (max 1000)"
         },
         addLabelIds: {
           type: "array",
@@ -4519,14 +4467,14 @@ var gmailTools = [
           description: "(optional) Label IDs to remove"
         }
       },
-      required: ["messageId"]
+      required: ["threadId"]
     },
     outputSchema: {
       type: "object",
       properties: {
-        modified: { type: "number", description: "Number of messages modified" },
-        addedLabels: { type: "array", items: { type: "string" }, description: "Labels added" },
-        removedLabels: { type: "array", items: { type: "string" }, description: "Labels removed" }
+        id: { type: "string", description: "Thread ID" },
+        messageCount: { type: "number", description: "Number of messages in thread" },
+        labelIds: { type: "array", items: { type: "string" }, description: "Current labels" }
       }
     }
   },
@@ -5875,7 +5823,7 @@ var DeleteEmailSchema = z7.object({
   messageId: z7.union([z7.string().min(1), z7.array(z7.string().min(1)).min(1).max(1e3)]).describe("Message ID or array of IDs (max 1000 for batch)")
 });
 var ModifyEmailSchema = z7.object({
-  messageId: z7.union([z7.string().min(1), z7.array(z7.string().min(1)).min(1).max(1e3)]).describe("Message ID or array of IDs (max 1000 for batch)"),
+  threadId: z7.union([z7.string().min(1), z7.array(z7.string().min(1)).min(1).max(1e3)]).describe("Thread ID or array of IDs (max 1000 for batch)"),
   addLabelIds: z7.array(z7.string()).optional().describe("Label IDs to add"),
   removeLabelIds: z7.array(z7.string()).optional().describe("Label IDs to remove")
 });
@@ -10230,6 +10178,25 @@ var SYSTEM_LABELS = /* @__PURE__ */ new Set([
   "CATEGORY_UPDATES",
   "CATEGORY_FORUMS"
 ]);
+var THREAD_ID_PATTERN = /^[0-9a-f]{16}$/i;
+var CATEGORY_SUGGESTIONS = {
+  INVALID_FORMAT: "Use search_emails to get valid thread IDs",
+  NOT_FOUND: "Thread may have been deleted. Use search_emails to refresh",
+  PERMISSION_DENIED: "You don't have access to this thread",
+  RATE_LIMITED: "Too many requests. Wait and retry with smaller batches",
+  UNKNOWN: "Check the thread ID and try again"
+};
+function isValidThreadIdFormat(id) {
+  return THREAD_ID_PATTERN.test(id);
+}
+function categorizeError(errorMessage) {
+  const msg = errorMessage.toLowerCase();
+  if (msg.includes("invalid id") || msg.includes("invalid value")) return "INVALID_FORMAT";
+  if (msg.includes("not found")) return "NOT_FOUND";
+  if (msg.includes("permission") || msg.includes("forbidden")) return "PERMISSION_DENIED";
+  if (msg.includes("rate") || msg.includes("quota")) return "RATE_LIMITED";
+  return "UNKNOWN";
+}
 function extractEmailBody(payload) {
   if (!payload) return { text: "", html: "" };
   const result = { text: "", html: "" };
@@ -10498,36 +10465,92 @@ async function handleDeleteEmail(gmail, args) {
 async function handleModifyEmail(gmail, args) {
   const validation = validateArgs(ModifyEmailSchema, args);
   if (!validation.success) return validation.response;
-  const { messageId, addLabelIds, removeLabelIds } = validation.data;
-  const messageIds = Array.isArray(messageId) ? messageId : [messageId];
-  if (messageIds.length === 1) {
-    const response = await gmail.users.messages.modify({
+  const { threadId, addLabelIds, removeLabelIds } = validation.data;
+  const ids = Array.isArray(threadId) ? threadId : [threadId];
+  if (ids.length === 1) {
+    const response = await gmail.users.threads.modify({
       userId: "me",
-      id: messageIds[0],
+      id: ids[0],
       requestBody: { addLabelIds, removeLabelIds }
     });
-    log("Modified email labels", { messageId: messageIds[0], addLabelIds, removeLabelIds });
+    log("Modified thread labels", { threadId: ids[0], addLabelIds, removeLabelIds });
+    const messageCount = response.data.messages?.length || 0;
     return structuredResponse(
-      `Email ${messageIds[0]} labels updated.
-Current labels: ${response.data.labelIds?.join(", ") || "None"}`,
+      `Thread ${ids[0]} labels updated (${messageCount} message(s) affected).
+Current labels: ${response.data.messages?.[0]?.labelIds?.join(", ") || "None"}`,
       {
         id: response.data.id,
-        threadId: response.data.threadId,
-        labelIds: response.data.labelIds
+        historyId: response.data.historyId,
+        messageCount,
+        labelIds: response.data.messages?.[0]?.labelIds
       }
     );
   }
-  await gmail.users.messages.batchModify({
-    userId: "me",
-    requestBody: {
-      ids: messageIds,
-      addLabelIds,
-      removeLabelIds
-    }
+  const validIds = ids.filter(isValidThreadIdFormat);
+  const invalidIds = ids.filter((id) => !isValidThreadIdFormat(id));
+  const formatFailures = invalidIds.map((id) => ({
+    threadId: id,
+    category: "INVALID_FORMAT",
+    error: "Invalid thread ID format"
+  }));
+  const results = await Promise.allSettled(
+    validIds.map(
+      (id) => gmail.users.threads.modify({
+        userId: "me",
+        id,
+        requestBody: { addLabelIds, removeLabelIds }
+      })
+    )
+  );
+  const apiSucceeded = results.filter((r) => r.status === "fulfilled").length;
+  const apiFailures = results.map((r, i) => ({ id: validIds[i], result: r })).filter(
+    (item) => item.result.status === "rejected"
+  ).map((item) => {
+    const errorMsg = item.result.reason?.message || String(item.result.reason) || "Unknown error";
+    return {
+      threadId: item.id,
+      category: categorizeError(errorMsg),
+      error: errorMsg
+    };
   });
-  log("Batch modified emails", { count: messageIds.length, addLabelIds, removeLabelIds });
+  const allFailures = [...formatFailures, ...apiFailures];
+  const succeeded = apiSucceeded;
+  log("Batch modified threads", {
+    count: ids.length,
+    succeeded,
+    failed: allFailures.length,
+    preFiltered: invalidIds.length,
+    addLabelIds,
+    removeLabelIds
+  });
+  if (allFailures.length > 0) {
+    const failuresByCategory = allFailures.reduce(
+      (acc, f) => {
+        if (!acc[f.category]) acc[f.category] = [];
+        acc[f.category].push(f.threadId);
+        return acc;
+      },
+      {}
+    );
+    const categoryLines = Object.entries(failuresByCategory).map(([category, threadIds]) => {
+      const suggestion = CATEGORY_SUGGESTIONS[category];
+      const idList = threadIds.slice(0, 5).join(", ");
+      const moreText = threadIds.length > 5 ? ` (+${threadIds.length - 5} more)` : "";
+      return `- ${category} (${threadIds.length}): ${suggestion}
+  ${idList}${moreText}`;
+    }).join("\n");
+    return structuredResponse(
+      `Partially completed: ${succeeded} thread(s) modified, ${allFailures.length} failed.` + (addLabelIds ? `
+Added labels: ${addLabelIds.join(", ")}` : "") + (removeLabelIds ? `
+Removed labels: ${removeLabelIds.join(", ")}` : "") + `
+
+Failures:
+${categoryLines}`,
+      { succeeded, failed: allFailures.length, total: ids.length, failuresByCategory }
+    );
+  }
   return successResponse(
-    `Successfully modified labels for ${messageIds.length} email(s).` + (addLabelIds ? `
+    `Successfully modified labels for ${ids.length} thread(s).` + (addLabelIds ? `
 Added labels: ${addLabelIds.join(", ")}` : "") + (removeLabelIds ? `
 Removed labels: ${removeLabelIds.join(", ")}` : "")
   );
@@ -10939,8 +10962,8 @@ async function handleListTools(args) {
 var drive = null;
 var authClient = null;
 var authenticationPromise = null;
-var __filename = fileURLToPath2(import.meta.url);
-var __dirname = dirname3(__filename);
+var __filename = fileURLToPath(import.meta.url);
+var __dirname = dirname2(__filename);
 var packageJsonPath = join3(__dirname, "..", "package.json");
 var packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
 var VERSION = packageJson.version;