local-mcp 3.0.235 → 3.0.237

package/index.js

@@ -161,7 +161,26 @@ async function main() {
     ])
   }
 
+  // ADR-0004 phase 1: the notarized server embedded in LocalMCPTray.app, if present.
+  // Preferring it over the downloaded standalone binary (which gets re-signed
+  // ad-hoc on install) keeps Automation TCC cert-based — so Mail/Notes/Messages/
+  // Safari permissions survive client updates instead of resetting every time.
+  function findEmbeddedServer() {
+    if (process.platform !== 'darwin') return null
+    const candidates = [
+      path.join(os.homedir(), 'Applications', 'LocalMCPTray.app', 'Contents', 'MacOS', 'local-mcp-server'),
+      path.join('/Applications', 'LocalMCPTray.app', 'Contents', 'MacOS', 'local-mcp-server'),
+    ]
+    for (const p of candidates) {
+      try { if (fs.existsSync(p) && fs.statSync(p).isFile()) return p } catch {}
+    }
+    return null
+  }
+
   function launchMcpStdio(binaryPath, version) {
+    // Prefer the embedded, notarized server when the .app provides it (ADR-0004).
+    const embedded = findEmbeddedServer()
+    if (embedded) binaryPath = embedded
     if (!isMcpClientSpawn) {
       printInstallComplete(version)
       if (process.platform === 'darwin') {
@@ -209,6 +228,28 @@ async function main() {
     }
   }
 
+  // ADR-0004 phase 3 (darwin): prefer the notarized server embedded in
+  // LocalMCPTray.app. Ensure the .app is installed, then launch its embedded
+  // server directly — skipping the standalone download + ad-hoc re-sign that
+  // resets Automation TCC (Mail/Notes/Messages/Safari) on every update. Only
+  // if the .app can't be provided do we fall through to the legacy standalone
+  // binary (which still ad-hoc signs as a last resort so the user isn't stranded).
+  if (process.platform === 'darwin') {
+    await ensureDarwinComponents()
+    const embedded = findEmbeddedServer()
+    if (embedded) {
+      let v = pkg.version
+      try {
+        v = fs.readFileSync(
+          path.join(os.homedir(), '.local', 'share', 'local-mcp', 'tray', '.version'),
+          'utf8'
+        ).trim() || pkg.version
+      } catch {}
+      launchMcpStdio(embedded, v)
+      return
+    }
+  }
+
   // Fast path: if stable binary exists AND its version is >= our npm package version, exec directly.
   // Using >= (not ===) prevents Claude Desktop from downgrading a binary that the tray's
   // UpdateManager has already upgraded. LMC-375: machine 5F8445AE downgraded 3.0.72→3.0.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "local-mcp",
-  "version": "3.0.235",
+  "version": "3.0.237",
   "description": "LMCP — connect Claude Desktop, Cursor, Windsurf to Mail, Calendar, Contacts, Teams, OneDrive on macOS. Privacy-first: all data stays on your Mac.",
   "main": "index.js",
   "bin": {

package/setup.js

@@ -369,41 +369,64 @@ async function runSetup(opts = {}) {
   let stableCommand = NPX_COMMAND         // fallback; replaced below once CACHE_DIR is known
   let stableArgs    = NPX_ARGS
   let binaryVersion = ''
+  // ADR-0004 phase 3 (darwin): if the notarized server is already embedded in
+  // LocalMCPTray.app, skip pre-downloading + ad-hoc re-signing the standalone
+  // binary — the launcher (→ npx → index.js) prefers the embedded one anyway,
+  // and the ad-hoc copy is what resets Automation TCC. The tray is ensured later
+  // in setup; on a fresh install where the .app isn't present yet this is null
+  // and we keep the legacy pre-download as a fallback.
+  const _embeddedServer = process.platform === 'darwin'
+    ? [
+        path.join(os.homedir(), 'Applications', 'LocalMCPTray.app', 'Contents', 'MacOS', 'local-mcp-server'),
+        path.join('/Applications', 'LocalMCPTray.app', 'Contents', 'MacOS', 'local-mcp-server'),
+      ].find(p => { try { return fs.statSync(p).isFile() } catch { return false } })
+    : null
   try {
     const { ensureBinary, CACHE_DIR } = require('./download')
-    process.stderr.write('Downloading LMCP runtime...\n')
-    const { binPath, version: bv } = await ensureBinary()
-    binaryVersion = bv || ''
-    // Copy binary to stable path (npx fast-path will exec it directly)
-    const stablePath = path.join(CACHE_DIR, 'local-mcp-server')
-    try {
-      const tmpPath = stablePath + '.tmp'
-      fs.copyFileSync(binPath, tmpPath)
-      fs.chmodSync(tmpPath, 0o755)
-      try { execFileSync('codesign', ['--force', '--sign', '-', '--identifier', 'com.local-mcp.server', tmpPath], { stdio: 'pipe' }) } catch {}
-      // curl route-3 installs the binary one level deeper:
-      //   ~/.local/share/local-mcp/bin/local-mcp-server/local-mcp-server
-      // leaving stablePath itself as a DIRECTORY. fs.renameSync throws EISDIR
-      // silently, so the npm stable binary is never written and the old curl
-      // server stays running forever (LMC-158).
+    if (_embeddedServer) {
+      // Embedded server present — no standalone download needed. Still write the
+      // launcher and record the embedded version for the npx fast-path skip.
       try {
-        const st = fs.statSync(stablePath)
-        if (st.isDirectory()) {
-          process.stderr.write('  Migrating from curl install: removing old versioned directory at stable path\n')
-          fs.rmSync(stablePath, { recursive: true, force: true })
-        }
-      } catch { /* stablePath doesn't exist — nothing to do */ }
-      fs.renameSync(tmpPath, stablePath)
-      // Write the actual binary version (from /runtime/latest), not the npm package
-      // version. npm and Swift binary versions can diverge (npm-only fixes bump npm
-      // without a Swift rebuild). Writing pkg.version here caused the tray to think
-      // a newer binary was on disk and restart-loop (LMC-TODO).
-      fs.writeFileSync(path.join(CACHE_DIR, '.server-version'), binaryVersion || '')
-      const settingsSrc = path.join(path.dirname(binPath), 'settings.html')
-      const settingsDst = path.join(CACHE_DIR, 'settings.html')
-      if (fs.existsSync(settingsSrc)) fs.copyFileSync(settingsSrc, settingsDst)
-    } catch {}
-    process.stderr.write('✓ Runtime ready\n\n')
+        binaryVersion = fs.readFileSync(
+          path.join(os.homedir(), '.local', 'share', 'local-mcp', 'tray', '.version'), 'utf8'
+        ).trim()
+      } catch {}
+      process.stderr.write('✓ Using server embedded in LocalMCPTray.app\n\n')
+    } else {
+      process.stderr.write('Downloading LMCP runtime...\n')
+      const { binPath, version: bv } = await ensureBinary()
+      binaryVersion = bv || ''
+      // Copy binary to stable path (npx fast-path will exec it directly)
+      const stablePath = path.join(CACHE_DIR, 'local-mcp-server')
+      try {
+        const tmpPath = stablePath + '.tmp'
+        fs.copyFileSync(binPath, tmpPath)
+        fs.chmodSync(tmpPath, 0o755)
+        try { execFileSync('codesign', ['--force', '--sign', '-', '--identifier', 'com.local-mcp.server', tmpPath], { stdio: 'pipe' }) } catch {}
+        // curl route-3 installs the binary one level deeper:
+        //   ~/.local/share/local-mcp/bin/local-mcp-server/local-mcp-server
+        // leaving stablePath itself as a DIRECTORY. fs.renameSync throws EISDIR
+        // silently, so the npm stable binary is never written and the old curl
+        // server stays running forever (LMC-158).
+        try {
+          const st = fs.statSync(stablePath)
+          if (st.isDirectory()) {
+            process.stderr.write('  Migrating from curl install: removing old versioned directory at stable path\n')
+            fs.rmSync(stablePath, { recursive: true, force: true })
+          }
+        } catch { /* stablePath doesn't exist — nothing to do */ }
+        fs.renameSync(tmpPath, stablePath)
+        // Write the actual binary version (from /runtime/latest), not the npm package
+        // version. npm and Swift binary versions can diverge (npm-only fixes bump npm
+        // without a Swift rebuild). Writing pkg.version here caused the tray to think
+        // a newer binary was on disk and restart-loop (LMC-TODO).
+        fs.writeFileSync(path.join(CACHE_DIR, '.server-version'), binaryVersion || '')
+        const settingsSrc = path.join(path.dirname(binPath), 'settings.html')
+        const settingsDst = path.join(CACHE_DIR, 'settings.html')
+        if (fs.existsSync(settingsSrc)) fs.copyFileSync(settingsSrc, settingsDst)
+      } catch {}
+      process.stderr.write('✓ Runtime ready\n\n')
+    }
     // Write the launcher script now that we have CACHE_DIR.
     // The launcher uses curl (no Node dependency) to send telemetry if Node is
     // too old, then exec's npx. Claude Desktop runs this script instead of npx