@adeu/mcp-server 1.10.1 → 1.12.0

package/src/tools/email.ts

@@ -1,4 +1,3 @@
-// FILE: node/packages/mcp-server/src/tools/email.ts
 import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "node:fs";
@@ -310,68 +309,155 @@ export async function search_and_fetch_emails(args: any): Promise<ToolResult> {
     args.max_attachment_size_mb > 0
       ? args.max_attachment_size_mb
       : 10;
-  let realEmailId: string | undefined;
-  try {
-    realEmailId = args.email_id ? resolveEmailId(args.email_id) : undefined;
-  } catch (err) {
-    if (err instanceof StaleShortIdError) {
+
+  let data: any;
+
+  if (args.task_id) {
+    // ==========================================
+    // PHASE 2: POLL (Wait for completion)
+    // ==========================================
+    const pollUrl = `${BACKEND_URL}/api/v1/emails/tasks/${args.task_id}`;
+    let completedData: any = null;
+
+    for (let attempt = 0; attempt < 10; attempt++) {
+      let res: Response;
+      try {
+        res = await fetch(pollUrl, {
+          headers: {
+            Authorization: `Bearer ${apiKey}`,
+            Accept: "application/json",
+          },
+          signal: AbortSignal.timeout(15_000),
+        });
+      } catch (err) {
+        if (isTimeoutError(err)) {
+          throw new Error("Checking task status timed out.");
+        }
+        throw err;
+      }
+
+      if (res.status === 401) {
+        DesktopAuthManager.clearApiKey();
+        throw new Error(
+          "Authentication expired. Please call `login_to_adeu_cloud` to re-authenticate.",
+        );
+      }
+      if (!res.ok) {
+        throw new Error(formatBackendError(res.status, await res.text()));
+      }
+
+      const taskData: any = await res.json();
+      const status = taskData.status;
+
+      if (status === "COMPLETED") {
+        completedData = taskData;
+        break;
+      }
+
+      if (status === "FAILED") {
+        const errorMsg = taskData.error || "Unknown internal error";
+        throw new Error(`Validation task failed on the server: ${errorMsg}`);
+      }
+
+      // Wait 5 seconds before next poll
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+    }
+
+    if (!completedData) {
+      const msg = `Task ${args.task_id} is still processing. Please call \`search_and_fetch_emails\` again with task_id=${args.task_id}.`;
       return {
-        isError: true,
-        content: [{ type: "text", text: err.message }],
+        content: [{ type: "text", text: msg }],
+        structuredContent: {
+          status: "pending",
+          task_id: args.task_id,
+          message: msg,
+        },
       };
     }
-    throw err;
-  }
 
-  const payload = {
-    email_id: realEmailId,
-    sender: args.sender,
-    subject: args.subject,
-    has_attachments: args.has_attachments,
-    attachment_name: args.attachment_name,
-    is_unread: args.is_unread,
-    days_ago: args.days_ago,
-    folder: args.folder,
-    limit: args.limit ?? 10,
-    offset: args.offset ?? 0,
-    mailbox_address: args.mailbox_address,
-  };
+    data = completedData;
 
-  // Remove undefined fields
-  Object.keys(payload).forEach(
-    (k) => (payload as any)[k] === undefined && delete (payload as any)[k],
-  );
+  } else {
+    // ==========================================
+    // PHASE 1: INIT / SEARCH (Search/Fetch standard)
+    // ==========================================
+    let realEmailId: string | undefined;
+    try {
+      realEmailId = args.email_id ? resolveEmailId(args.email_id) : undefined;
+    } catch (err) {
+      if (err instanceof StaleShortIdError) {
+        return {
+          isError: true,
+          content: [{ type: "text", text: err.message }],
+        };
+      }
+      throw err;
+    }
 
-  let res: Response;
-  try {
-    res = await fetch(`${BACKEND_URL}/api/v1/emails/search`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(payload),
-      signal: AbortSignal.timeout(45_000),
-    });
-  } catch (err) {
-    if (isTimeoutError(err)) {
+    const payload = {
+      email_id: realEmailId,
+      sender: args.sender,
+      subject: args.subject,
+      has_attachments: args.has_attachments,
+      attachment_name: args.attachment_name,
+      is_unread: args.is_unread,
+      days_ago: args.days_ago,
+      folder: args.folder,
+      limit: args.limit ?? 10,
+      offset: args.offset ?? 0,
+      mailbox_address: args.mailbox_address,
+    };
+
+    // Remove undefined fields
+    Object.keys(payload).forEach(
+      (k) => (payload as any)[k] === undefined && delete (payload as any)[k],
+    );
+
+    let res: Response;
+    try {
+      res = await fetch(`${BACKEND_URL}/api/v1/emails/search`, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(payload),
+        signal: AbortSignal.timeout(45_000),
+      });
+    } catch (err) {
+      if (isTimeoutError(err)) {
+        throw new Error(
+          "Email search timed out after 45s. The mail provider (Outlook/Gmail) may be slow. Try narrowing the search with more filters (sender, subject, days_ago), or retry shortly.",
+        );
+      }
+      throw err;
+    }
+
+    if (res.status === 401) {
+      DesktopAuthManager.clearApiKey();
       throw new Error(
-        "Email search timed out after 45s. The mail provider (Outlook/Gmail) may be slow. Try narrowing the search with more filters (sender, subject, days_ago), or retry shortly.",
+        "Authentication expired. Please call `login_to_adeu_cloud` to re-authenticate.",
       );
     }
-    throw err;
-  }
+    if (!res.ok)
+      throw new Error(formatBackendError(res.status, await res.text()));
 
-  if (res.status === 401) {
-    DesktopAuthManager.clearApiKey();
-    throw new Error(
-      "Authentication expired. Please call `login_to_adeu_cloud` to re-authenticate.",
-    );
+    data = await res.json();
+
+    if (res.status === 202 || (data && (data.status === "pending" || data.task_id) && data.type === undefined)) {
+      const newTaskId = data.task_id;
+      const msg = `Email processing task started successfully. Task ID: ${newTaskId}. Please call \`search_and_fetch_emails\` again immediately with task_id=${newTaskId} to monitor the progress.`;
+      return {
+        content: [{ type: "text", text: msg }],
+        structuredContent: {
+          status: "pending",
+          task_id: String(newTaskId),
+          message: msg,
+        },
+      };
+    }
   }
-  if (!res.ok)
-    throw new Error(formatBackendError(res.status, await res.text()));
 
-  const data: any = await res.json();
   const cache = loadIdCache();
 
   if (data.type === "previews") {

package/tests/fixtures/generate_fixtures.py

@@ -0,0 +1,69 @@
+import os
+from docx import Document
+from docx.oxml.ns import qn
+from docx.oxml import OxmlElement
+
+os.makedirs('node/packages/mcp-server/tests/fixtures', exist_ok=True)
+
+doc = Document()
+doc.add_paragraph("Section One").style = doc.styles['Heading 1']
+p = doc.add_paragraph()
+
+def run(text):
+    r = OxmlElement('w:r')
+    t = OxmlElement('w:t')
+    t.text = text
+    t.set(qn('xml:space'), 'preserve')
+    r.append(t)
+    return r
+
+p._p.append(run("Foo bar "))
+
+d = OxmlElement('w:del')
+d.set(qn('w:id'), '10')
+d.set(qn('w:author'), 'Test Negotiator')
+d.set(qn('w:date'), '2026-01-22T12:06:55Z')
+
+rd = OxmlElement('w:r')
+dt = OxmlElement('w:delText')
+dt.text = "old phrase here."
+dt.set(qn('xml:space'), 'preserve')
+rd.append(dt)
+d.append(rd)
+p._p.append(d)
+
+ins = OxmlElement('w:ins')
+ins.set(qn('w:id'), '11')
+ins.set(qn('w:author'), 'Test Negotiator')
+ins.set(qn('w:date'), '2026-01-22T12:06:55Z')
+ins.append(run("new phrase here."))
+p._p.append(ins)
+
+doc.save('node/packages/mcp-server/tests/fixtures/gap2_minimal_repro.docx')
+print("Successfully generated node/packages/mcp-server/tests/fixtures/gap2_minimal_repro.docx")
+
+# Generate GAP 1 deleted row fixture
+doc1 = Document()
+doc1.add_paragraph("Active Heading").style = doc1.styles['Heading 1']
+
+# Add a table
+table = doc1.add_table(rows=1, cols=1)
+row = table.rows[0]
+cell = row.cells[0]
+
+# Add a paragraph inside the cell with Heading 1 style
+p_cell = cell.paragraphs[0]
+p_cell.style = doc1.styles['Heading 1']
+# Clear default text and append the text
+p_cell.text = "Deleted Heading"
+
+# Now let's mark the row as deleted (w:del inside w:trPr)
+trPr = row._tr.get_or_add_trPr()
+del_node = OxmlElement('w:del')
+del_node.set(qn('w:id'), '100')
+del_node.set(qn('w:author'), 'Test Negotiator')
+del_node.set(qn('w:date'), '2026-01-22T12:06:55Z')
+trPr.append(del_node)
+
+doc1.save('node/packages/mcp-server/tests/fixtures/gap1_deleted_row_repro.docx')
+print("Successfully generated node/packages/mcp-server/tests/fixtures/gap1_deleted_row_repro.docx")

package/tsup.config.ts

@@ -18,6 +18,20 @@ function copyAssets(outDir: string) {
   }
 }
 
+import { readFileSync } from "node:fs";
+const packageJson = JSON.parse(readFileSync("package.json", "utf-8"));
+const packageVersion = packageJson.version;
+
+import { execSync } from "node:child_process";
+
+let gitSha = "unknown";
+try {
+  gitSha = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
+} catch (e) {
+  // fallback if not in git repo or git not found
+}
+const buildTimestamp = new Date().toISOString();
+
 export default defineConfig([
   {
     entry: ["src/index.ts"],
@@ -29,6 +43,11 @@ export default defineConfig([
     banner: {
       js: "#!/usr/bin/env node",
     },
+    define: {
+      "process.env.GIT_SHA": JSON.stringify(gitSha),
+      "process.env.BUILD_TIMESTAMP": JSON.stringify(buildTimestamp),
+      "process.env.PACKAGE_VERSION": JSON.stringify(packageVersion),
+    },
     onSuccess: async () => {
       copyAssets("dist");
     },
@@ -43,6 +62,11 @@ export default defineConfig([
     dts: false,
     sourcemap: false,
     clean: false, // Don't clean the whole dir (preserves icon and manifest)
+    define: {
+      "process.env.GIT_SHA": JSON.stringify(gitSha),
+      "process.env.BUILD_TIMESTAMP": JSON.stringify(buildTimestamp),
+      "process.env.PACKAGE_VERSION": JSON.stringify(packageVersion),
+    },
     onSuccess: async () => {
       copyAssets("../../../desktop-extension");
     },