@backtomyfuture/exchange-cli 0.2.5 → 0.2.7

package/bin/exchange-cli.js

@@ -1,9 +1,30 @@
 #!/usr/bin/env node
 
 const { spawn } = require('child_process');
+const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 
+const startTime = process.hrtime.bigint ? process.hrtime.bigint() : Date.now();
+
+function getRequestId() {
+  for (let i = 2; i < process.argv.length; i++) {
+    const arg = process.argv[i];
+    if (arg.startsWith('--request-id=')) {
+      const val = arg.slice('--request-id='.length).trim();
+      if (val) return val;
+    }
+    if (arg === '--request-id' && i + 1 < process.argv.length) {
+      const val = process.argv[i + 1].trim();
+      if (val) return val;
+    }
+  }
+  if (typeof crypto.randomUUID === 'function') {
+    return crypto.randomUUID();
+  }
+  return '00000000-0000-0000-0000-000000000000';
+}
+
 const PLATFORM_PACKAGES = {
   'darwin-arm64': '@backtomyfuture/exchange-cli-darwin-arm64',
   'darwin-x64': '@backtomyfuture/exchange-cli-darwin-x64',
@@ -24,12 +45,21 @@ function renderError(message, code = 'BINARY_NOT_FOUND', exitCode = 1) {
   if (isText) {
     console.error(`Error [${code}]: ${message}`);
   } else {
+    const requestId = getRequestId();
+    const elapsedMs = process.hrtime.bigint
+      ? Number(process.hrtime.bigint() - startTime) / 1e6
+      : Date.now() - startTime;
     console.log(
       JSON.stringify({
         ok: false,
         error: message,
         code: code,
         retryable: false,
+        request_id: requestId,
+        meta: {
+          request_id: requestId,
+          elapsed_ms: Math.round(elapsedMs * 100) / 100,
+        },
       })
     );
   }
@@ -46,6 +76,15 @@ function getBinaryPath() {
         1
       );
     }
+    try {
+      fs.accessSync(customBin, fs.constants.X_OK);
+    } catch {
+      renderError(
+        `exchange-cli: binary at EXCHANGE_CLI_BINARY is not executable: ${customBin}`,
+        'BINARY_SPAWN_FAILED',
+        1
+      );
+    }
     return customBin;
   }
 
@@ -92,7 +131,7 @@ try {
   child.on('error', (err) => {
     renderError(
       `exchange-cli: failed to spawn binary: ${err.message}`,
-      'BINARY_NOT_FOUND',
+      'BINARY_SPAWN_FAILED',
       1
     );
   });

package/bin/runtime-layout.js

@@ -2,9 +2,35 @@
 
 'use strict';
 
+const crypto = require('crypto');
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 
+function getUserCacheMarkerPath(internalDir) {
+  const homeDir = os.homedir();
+  let cacheBase;
+  if (process.platform === 'darwin') {
+    cacheBase = path.join(homeDir, 'Library', 'Caches', 'exchange-cli');
+  } else if (process.platform === 'win32') {
+    cacheBase = path.join(
+      process.env.LOCALAPPDATA || path.join(homeDir, 'AppData', 'Local'),
+      'exchange-cli'
+    );
+  } else {
+    cacheBase = path.join(
+      process.env.XDG_CACHE_HOME || path.join(homeDir, '.cache'),
+      'exchange-cli'
+    );
+  }
+  const hash = crypto
+    .createHash('sha256')
+    .update(path.resolve(internalDir))
+    .digest('hex')
+    .slice(0, 16);
+  return path.join(cacheBase, `runtime_layout_${hash}.ok`);
+}
+
 function copyFileWithMode(src, dst) {
   fs.mkdirSync(path.dirname(dst), { recursive: true });
   fs.copyFileSync(src, dst);
@@ -30,20 +56,74 @@ function copyDirRecursive(srcDir, dstDir) {
   }
 }
 
-function copyIfMissing(src, dst, logger) {
+let inMemoryLayoutChecked = false;
+
+function linkOrCopyFile(src, dst) {
+  try {
+    fs.mkdirSync(path.dirname(dst), { recursive: true });
+    // Try hardlink first (fast, zero extra disk space, works on same filesystem)
+    try {
+      fs.linkSync(src, dst);
+      return;
+    } catch {
+      // Fall back to relative symlink
+      try {
+        const rel = path.relative(path.dirname(dst), src);
+        fs.symlinkSync(rel, dst);
+        return;
+      } catch {
+        // Fall back to file copy
+        fs.copyFileSync(src, dst);
+      }
+    }
+    try {
+      const stat = fs.statSync(src);
+      fs.chmodSync(dst, stat.mode & 0o777);
+    } catch {
+      // Best effort only.
+    }
+  } catch {
+    // Best effort only: dst dir may be read-only.
+  }
+}
+
+function linkOrCopyDir(srcDir, dstDir) {
+  try {
+    fs.mkdirSync(path.dirname(dstDir), { recursive: true });
+    // Try symlink first for directories (like Versions/Current -> 3.12)
+    try {
+      const rel = path.relative(path.dirname(dstDir), srcDir);
+      fs.symlinkSync(rel, dstDir, 'junction');
+      return;
+    } catch {
+      copyDirRecursive(srcDir, dstDir);
+    }
+  } catch {
+    // Best effort only: dst dir may be read-only.
+  }
+}
+
+function linkOrCopyIfMissing(src, dst, logger) {
   if (fs.existsSync(dst) || !fs.existsSync(src)) {
     return false;
   }
-  const stat = fs.statSync(src);
-  if (stat.isDirectory()) {
-    copyDirRecursive(src, dst);
-  } else {
-    copyFileWithMode(src, dst);
-  }
-  if (logger) {
-    logger(`exchange-cli: repaired missing runtime path ${path.basename(dst)}`);
+  try {
+    const stat = fs.statSync(src);
+    if (stat.isDirectory()) {
+      linkOrCopyDir(src, dst);
+    } else {
+      linkOrCopyFile(src, dst);
+    }
+    if (fs.existsSync(dst)) {
+      if (logger) {
+        logger(`exchange-cli: repaired missing runtime path ${path.basename(dst)}`);
+      }
+      return true;
+    }
+    return false;
+  } catch {
+    return false;
   }
-  return true;
 }
 
 function resolveFrameworkVersionDir(internalDir) {
@@ -70,22 +150,30 @@ function resolveFrameworkVersionDir(internalDir) {
 }
 
 function ensureDarwinArm64RuntimeLayout(binaryPath, logger = null) {
+  if (inMemoryLayoutChecked) {
+    return { changed: false };
+  }
   if (!(process.platform === 'darwin' && process.arch === 'arm64')) {
+    inMemoryLayoutChecked = true;
     return { changed: false };
   }
   const binDir = path.dirname(binaryPath);
   const internalDir = path.join(binDir, '_internal');
   if (!fs.existsSync(internalDir)) {
+    inMemoryLayoutChecked = true;
     return { changed: false };
   }
 
   const markerPath = path.join(internalDir, '.runtime_layout_ok');
-  if (fs.existsSync(markerPath)) {
+  const userCacheMarkerPath = getUserCacheMarkerPath(internalDir);
+  if (fs.existsSync(markerPath) || fs.existsSync(userCacheMarkerPath)) {
+    inMemoryLayoutChecked = true;
     return { changed: false };
   }
 
   const frameworkVersionDir = resolveFrameworkVersionDir(internalDir);
   if (!frameworkVersionDir) {
+    inMemoryLayoutChecked = true;
     return { changed: false };
   }
   const sourcePython = path.join(frameworkVersionDir, 'Python');
@@ -103,7 +191,7 @@ function ensureDarwinArm64RuntimeLayout(binaryPath, logger = null) {
 
   let changed = false;
   for (const target of targets) {
-    changed = copyIfMissing(target.src, target.dst, logger) || changed;
+    changed = linkOrCopyIfMissing(target.src, target.dst, logger) || changed;
   }
 
   try {
@@ -112,15 +200,28 @@ function ensureDarwinArm64RuntimeLayout(binaryPath, logger = null) {
     // Best effort only.
   }
 
+  let markerWritten = false;
   try {
     fs.writeFileSync(markerPath, '');
+    markerWritten = true;
   } catch {
-    // Best effort only.
+    // Best effort only: internalDir may be read-only in system installations.
+  }
+
+  if (!markerWritten) {
+    try {
+      fs.mkdirSync(path.dirname(userCacheMarkerPath), { recursive: true });
+      fs.writeFileSync(userCacheMarkerPath, '');
+    } catch {
+      // Best effort only.
+    }
   }
 
+  inMemoryLayoutChecked = true;
   return { changed };
 }
 
 module.exports = {
   ensureDarwinArm64RuntimeLayout,
+  getUserCacheMarkerPath,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backtomyfuture/exchange-cli",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Cross-platform CLI for on-premises Microsoft Exchange Server",
   "bin": {
     "exchange-cli": "./bin/exchange-cli.js"
@@ -13,17 +13,24 @@
     "install.js"
   ],
   "optionalDependencies": {
-    "@backtomyfuture/exchange-cli-darwin-arm64": "0.2.5",
-    "@backtomyfuture/exchange-cli-darwin-x64": "0.2.5",
-    "@backtomyfuture/exchange-cli-linux-x64": "0.2.5",
-    "@backtomyfuture/exchange-cli-linux-arm64": "0.2.5",
-    "@backtomyfuture/exchange-cli-win32-x64": "0.2.5",
-    "@backtomyfuture/exchange-cli-win32-ia32": "0.2.5"
+    "@backtomyfuture/exchange-cli-darwin-arm64": "0.2.7",
+    "@backtomyfuture/exchange-cli-darwin-x64": "0.2.7",
+    "@backtomyfuture/exchange-cli-linux-x64": "0.2.7",
+    "@backtomyfuture/exchange-cli-linux-arm64": "0.2.7",
+    "@backtomyfuture/exchange-cli-win32-x64": "0.2.7",
+    "@backtomyfuture/exchange-cli-win32-ia32": "0.2.7"
   },
   "engines": {
     "node": ">=14"
   },
-  "keywords": ["exchange", "exchange-server", "ews", "cli", "email", "ai-agent"],
+  "keywords": [
+    "exchange",
+    "exchange-server",
+    "ews",
+    "cli",
+    "email",
+    "ai-agent"
+  ],
   "license": "Apache-2.0",
   "homepage": "https://github.com/backtomyfuture/exchange-cli#readme",
   "repository": {