@backtomyfuture/exchange-cli 0.1.4 → 0.1.6

package/bin/exchange-cli.js

@@ -3,6 +3,7 @@
 const { execFileSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
+const { ensureDarwinArm64RuntimeLayout } = require('./runtime-layout');
 
 const PLATFORM_PACKAGES = {
   'darwin-arm64': '@backtomyfuture/exchange-cli-darwin-arm64',
@@ -40,7 +41,9 @@ function getBinaryPath() {
 }
 
 try {
-  execFileSync(getBinaryPath(), process.argv.slice(2), {
+  const binaryPath = getBinaryPath();
+  ensureDarwinArm64RuntimeLayout(binaryPath);
+  execFileSync(binaryPath, process.argv.slice(2), {
     stdio: 'inherit',
     env: { ...process.env },
   });

package/bin/runtime-layout.js

@@ -0,0 +1,114 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+function copyFileWithMode(src, dst) {
+  fs.mkdirSync(path.dirname(dst), { recursive: true });
+  fs.copyFileSync(src, dst);
+  try {
+    const stat = fs.statSync(src);
+    fs.chmodSync(dst, stat.mode & 0o777);
+  } catch {
+    // Best effort only.
+  }
+}
+
+function copyDirRecursive(srcDir, dstDir) {
+  fs.mkdirSync(dstDir, { recursive: true });
+  const entries = fs.readdirSync(srcDir, { withFileTypes: true });
+  for (const entry of entries) {
+    const src = path.join(srcDir, entry.name);
+    const dst = path.join(dstDir, entry.name);
+    if (entry.isDirectory()) {
+      copyDirRecursive(src, dst);
+      continue;
+    }
+    copyFileWithMode(src, dst);
+  }
+}
+
+function copyIfMissing(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)}`);
+  }
+  return true;
+}
+
+function resolveFrameworkVersionDir(internalDir) {
+  const versionsDir = path.join(internalDir, 'Python.framework', 'Versions');
+  if (!fs.existsSync(versionsDir)) {
+    return null;
+  }
+  const currentDir = path.join(versionsDir, 'Current');
+  if (fs.existsSync(path.join(currentDir, 'Python'))) {
+    return currentDir;
+  }
+
+  const candidates = fs
+    .readdirSync(versionsDir, { withFileTypes: true })
+    .filter((entry) => entry.isDirectory() && entry.name !== 'Current')
+    .map((entry) => path.join(versionsDir, entry.name))
+    .filter((dirPath) => fs.existsSync(path.join(dirPath, 'Python')))
+    .sort();
+
+  if (candidates.length === 0) {
+    return null;
+  }
+  return candidates[candidates.length - 1];
+}
+
+function ensureDarwinArm64RuntimeLayout(binaryPath, logger = null) {
+  if (!(process.platform === 'darwin' && process.arch === 'arm64')) {
+    return { changed: false };
+  }
+  const binDir = path.dirname(binaryPath);
+  const internalDir = path.join(binDir, '_internal');
+  if (!fs.existsSync(internalDir)) {
+    return { changed: false };
+  }
+
+  const frameworkVersionDir = resolveFrameworkVersionDir(internalDir);
+  if (!frameworkVersionDir) {
+    return { changed: false };
+  }
+  const sourcePython = path.join(frameworkVersionDir, 'Python');
+  const sourceResources = path.join(frameworkVersionDir, 'Resources');
+
+  const targets = [
+    { src: sourcePython, dst: path.join(internalDir, 'Python') },
+    { src: sourcePython, dst: path.join(internalDir, 'Python.framework', 'Python') },
+    { src: sourceResources, dst: path.join(internalDir, 'Python.framework', 'Resources') },
+    {
+      src: frameworkVersionDir,
+      dst: path.join(internalDir, 'Python.framework', 'Versions', 'Current'),
+    },
+  ];
+
+  let changed = false;
+  for (const target of targets) {
+    changed = copyIfMissing(target.src, target.dst, logger) || changed;
+  }
+
+  try {
+    fs.chmodSync(binaryPath, 0o755);
+  } catch {
+    // Best effort only.
+  }
+  return { changed };
+}
+
+module.exports = {
+  ensureDarwinArm64RuntimeLayout,
+};

package/install.js

@@ -2,6 +2,7 @@
 'use strict';
 
 const fs = require('fs');
+const { ensureDarwinArm64RuntimeLayout } = require('./bin/runtime-layout');
 
 const PLATFORM_PACKAGES = {
   'darwin-arm64': '@backtomyfuture/exchange-cli-darwin-arm64',
@@ -19,6 +20,7 @@ const ext = process.platform === 'win32' ? '.exe' : '';
 
 try {
   const binaryPath = require.resolve(`${pkg}/bin/exchange-cli${ext}`);
+  ensureDarwinArm64RuntimeLayout(binaryPath, (message) => console.log(message));
   if (process.platform !== 'win32') {
     fs.chmodSync(binaryPath, 0o755);
     console.log(`exchange-cli: set executable permission for ${platformKey}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backtomyfuture/exchange-cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Exchange Web Services CLI - email, calendar, tasks, contacts. Designed for AI agents.",
   "bin": {
     "exchange-cli": "bin/exchange-cli.js"
@@ -13,7 +13,7 @@
     "install.js"
   ],
   "optionalDependencies": {
-    "@backtomyfuture/exchange-cli-darwin-arm64": "0.1.4"
+    "@backtomyfuture/exchange-cli-darwin-arm64": "0.1.6"
   },
   "engines": {
     "node": ">=14"