airmail-mcp 1.0.20 → 1.0.22

package/dist/index.js

@@ -57,39 +57,85 @@ const AUTO_LAUNCH_AIRMAIL = envFlag("AIRMAIL_MCP_AUTO_LAUNCH");
 let parentCodeSignTeamID = null;
 let parentPhysicalIdentity = null;
 let parentBundleIdentifier = null;
-function resolveParentCodeSign() {
+function processInfo(pid) {
     try {
-        const ppid = process.ppid;
-        // Get parent executable path — ppid is always numeric, safe for arg
-        const parentPath = execFileSync("ps", ["-p", String(ppid), "-o", "comm="], { encoding: "utf-8" }).trim();
-        if (!parentPath)
+        const ppidText = execFileSync("ps", ["-p", String(pid), "-o", "ppid="], { encoding: "utf-8" }).trim();
+        const command = execFileSync("ps", ["-p", String(pid), "-o", "comm="], { encoding: "utf-8" }).trim();
+        const ppid = parseInt(ppidText, 10);
+        if (!command || isNaN(ppid))
+            return null;
+        return { pid, ppid, command };
+    }
+    catch {
+        return null;
+    }
+}
+function appBundlePath(executablePath) {
+    const appIdx = executablePath.indexOf(".app/");
+    return appIdx === -1 ? executablePath : executablePath.slice(0, appIdx + 4);
+}
+function physicalIdentityForPath(path) {
+    return path.endsWith(".app") ? `app:${path}` : `path:${path}`;
+}
+function codesignInfo(path) {
+    const result = spawnSync("codesign", ["-dv", "--verbose=2", path], {
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"],
+    });
+    const output = (result.stdout || "") + (result.stderr || "");
+    const identifier = output.match(/Identifier=(\S+)/)?.[1] ?? null;
+    const rawTeam = output.match(/TeamIdentifier=(.+)/)?.[1]?.trim() ?? null;
+    const teamID = rawTeam && rawTeam !== "not set" && rawTeam !== "not" ? rawTeam : null;
+    return { identifier, teamID };
+}
+function assignParentIdentity(path, sign) {
+    parentPhysicalIdentity = physicalIdentityForPath(path);
+    parentBundleIdentifier = sign.identifier;
+    parentCodeSignTeamID = sign.teamID;
+    if (parentBundleIdentifier) {
+        log(`Parent identity: ${parentBundleIdentifier} (${parentPhysicalIdentity})`);
+    }
+    if (parentCodeSignTeamID) {
+        log(`Parent code sign: Team ID ${parentCodeSignTeamID}`);
+    }
+    else {
+        log(`Parent code sign: unsigned (${parentPhysicalIdentity})`);
+    }
+}
+function resolveParentCodeSign() {
+    let fallback = null;
+    let unsignedApp = null;
+    for (let pid = process.ppid, depth = 0; pid > 1 && depth < 16; depth++) {
+        const info = processInfo(pid);
+        if (!info)
+            break;
+        const path = appBundlePath(info.command);
+        const sign = codesignInfo(path);
+        if (!fallback) {
+            fallback = { path, sign };
+        }
+        // Prefer a signed app bundle. With npx, the immediate parent is usually
+        // node/npm, so the real client identity is one or more ancestors above it.
+        if (path.endsWith(".app") && sign.teamID) {
+            assignParentIdentity(path, sign);
             return;
-        // Walk up to find .app bundle (if any)
-        let appPath = parentPath;
-        const appIdx = parentPath.indexOf(".app/");
-        if (appIdx !== -1) {
-            appPath = parentPath.slice(0, appIdx + 4);
         }
-        parentPhysicalIdentity = appIdx !== -1 ? `app:${appPath}` : `path:${parentPath}`;
-        // codesign writes everything to stderr — use spawnSync to capture it
-        const result = spawnSync("codesign", ["-dv", "--verbose=2", appPath], {
-            encoding: "utf-8",
-            stdio: ["pipe", "pipe", "pipe"],
-        });
-        const output = (result.stdout || "") + (result.stderr || "");
-        const identifierMatch = output.match(/Identifier=(\S+)/);
-        if (identifierMatch) {
-            parentBundleIdentifier = identifierMatch[1];
-            log(`Parent identity: ${parentBundleIdentifier} (${parentPhysicalIdentity})`);
+        // If no signed bundle exists, an app bundle is still more stable than
+        // transient npm/node helper paths.
+        if (path.endsWith(".app") && !unsignedApp) {
+            unsignedApp = { path, sign };
         }
-        const match = output.match(/TeamIdentifier=(\S+)/);
-        if (match && match[1] !== "not" && match[1] !== "not set") {
-            parentCodeSignTeamID = match[1];
-            log(`Parent code sign: Team ID ${parentCodeSignTeamID}`);
+        // Signed command-line tools are useful, but less specific than app bundles.
+        if (!path.endsWith(".app") && sign.teamID) {
+            fallback = { path, sign };
         }
+        pid = info.ppid;
     }
-    catch {
-        // Not code-signed or codesign not available — leave as null
+    if (unsignedApp) {
+        assignParentIdentity(unsignedApp.path, unsignedApp.sign);
+    }
+    else if (fallback) {
+        assignParentIdentity(fallback.path, fallback.sign);
     }
 }
 // ---------------------------------------------------------------------------

package/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": "0.3",
   "name": "airmail-mcp",
   "display_name": "Airmail",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "Manage emails, calendars, contacts, and more from Claude using Airmail's MCP server.",
   "long_description": "Airmail MCP connects Claude to the Airmail email client for macOS. Read, search, compose, and organize emails. Manage calendars and reminders. Search contacts. The bridge connects locally to Airmail on your Mac. Data retrieved by AI tools is processed by your chosen AI provider.",
   "author": {
@@ -309,19 +309,19 @@
     },
     {
       "name": "list_starred",
-      "description": "List starred/flagged messages."
+      "description": "List starred/flagged messages (date desc)."
     },
     {
       "name": "list_sent",
-      "description": "List sent messages."
+      "description": "List sent messages (date desc)."
     },
     {
       "name": "list_trash",
-      "description": "List trash messages."
+      "description": "List trash messages (date desc)."
     },
     {
       "name": "list_spam",
-      "description": "List spam/junk messages."
+      "description": "List spam/junk messages (date desc)."
     },
     {
       "name": "search_messages",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airmail-mcp",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "mcpName": "io.github.airmail/airmail-mcp",
   "description": "Manage emails, calendars, contacts, and more from Claude using Airmail's MCP server.",
   "main": "dist/index.js",