@mandors/cli 0.0.17 → 0.0.19

package/npm/lib/install.js

@@ -1,17 +1,17 @@
 /**
  * @fileoverview Post-install hook for Mandor CLI
- * @description Downloads binary from GitHub releases during npm install
- * @version 0.0.3
+ * @description Downloads and extracts binary from GitHub releases
+ * @version 0.0.5
  */
 
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { execSync } = require('child_process');
+const https = require('https');
 
 const REPO = 'sanxzy/mandor';
-const GITHUB_API = 'https://api.github.com';
-const CACHE_DIR = path.join(os.homedir(), '.mandor', 'bin');
+const INSTALL_DIR = path.join(os.homedir(), '.local', 'bin');
 
 function getPlatform() {
   const platform = os.platform();
@@ -26,16 +26,42 @@ function getPlatform() {
 
 async function getLatestVersion(prerelease = false) {
   const url = prerelease
-    ? `${GITHUB_API}/repos/${REPO}/releases`
-    : `${GITHUB_API}/repos/${REPO}/releases/latest`;
+    ? `https://api.github.com/repos/${REPO}/releases`
+    : `https://api.github.com/repos/${REPO}/releases/latest`;
+
+  return new Promise((resolve, reject) => {
+    https.get(url, { headers: { 'User-Agent': 'Mandor-CLI' } }, (res) => {
+      let data = '';
+      res.on('data', chunk => data += chunk);
+      res.on('end', () => {
+        try {
+          const parsed = JSON.parse(data);
+          const tagName = Array.isArray(parsed) ? parsed[0].tag_name : parsed.tag_name;
+          resolve(tagName.replace(/^v/, ''));
+        } catch (e) {
+          reject(e);
+        }
+      });
+    }).on('error', reject);
+  });
+}
 
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error(`Failed to fetch releases: ${response.statusText}`);
-  }
-  const data = await response.json();
-  const tagName = Array.isArray(data) ? data[0].tag_name : data.tag_name;
-  return tagName.replace(/^v/, '');
+function downloadFile(url, dest) {
+  return new Promise((resolve, reject) => {
+    const file = fs.createWriteStream(dest);
+    https.get(url, (res) => {
+      if (res.statusCode === 302 || res.statusCode === 301) {
+        return downloadFile(res.headers.location, dest).then(resolve).catch(reject);
+      }
+      res.pipe(file);
+      file.on('finish', () => {
+        file.close(resolve);
+      });
+    }).on('error', (err) => {
+      fs.unlink(dest, () => {});
+      reject(err);
+    });
+  });
 }
 
 async function install(options = {}) {
@@ -43,7 +69,7 @@ async function install(options = {}) {
   const version = options.version || 'latest';
   const prerelease = options.prerelease || false;
   const osArch = `${platform}-${arch}`;
-  const assetName = `${osArch}.tar.gz`;
+  const binaryName = platform === 'win32' ? 'mandor.exe' : 'mandor';
 
   console.log('Mandor Installer');
   console.log('================');
@@ -58,48 +84,38 @@ async function install(options = {}) {
   console.log(`Version: ${installVersion}`);
   console.log('');
 
-  const cachePath = path.join(CACHE_DIR, installVersion, osArch);
-  const binaryPath = path.join(cachePath, platform === 'win32' ? 'mandor.exe' : 'mandor');
+  const binaryPath = path.join(INSTALL_DIR, binaryName);
 
   if (fs.existsSync(binaryPath)) {
-    console.log(`Using cached binary: ${binaryPath}`);
+    console.log(`Already installed: ${binaryPath}`);
     return binaryPath;
   }
 
   console.log('Downloading from GitHub releases...');
-  const downloadUrl = `https://github.com/${REPO}/releases/download/v${installVersion}/${assetName}`;
-  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mandor-install-'));
-  const tarball = path.join(tempDir, assetName);
-
-  const response = await fetch(downloadUrl);
-  if (!response.ok) {
-    fs.rmSync(tempDir, { recursive: true });
-    throw new Error(`Download failed: ${response.statusText} (${downloadUrl})`);
-  }
+  const downloadUrl = `https://github.com/${REPO}/releases/download/v${installVersion}/${osArch}.tar.gz`;
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mandor-'));
+  const tarball = path.join(tempDir, `${osArch}.tar.gz`);
 
-  const file = fs.createWriteStream(tarball);
-  await new Promise((resolve, reject) => {
-    response.body.pipe(file);
-    file.on('finish', resolve);
-    file.on('error', reject);
-  });
+  await downloadFile(downloadUrl, tarball);
 
-  if (!fs.existsSync(cachePath)) {
-    fs.mkdirSync(cachePath, { recursive: true });
-  }
+  fs.mkdirSync(INSTALL_DIR, { recursive: true });
+  execSync(`tar -xzf "${tarball}" -C "${tempDir}"`, { stdio: 'inherit' });
 
-  execSync(`tar -xzf "${tarball}" -C "${cachePath}"`, { stdio: 'inherit' });
+  const extractedBinary = path.join(tempDir, binaryName);
+  fs.copyFileSync(extractedBinary, binaryPath);
   fs.chmodSync(binaryPath, '755');
 
   fs.rmSync(tempDir, { recursive: true });
 
   console.log(`Installed: ${binaryPath}`);
+  console.log('');
+  console.log('Add to PATH:');
+  console.log(`  export PATH="${INSTALL_DIR}:$PATH"`);
   return binaryPath;
 }
 
 if (require.main === module || process.env.npm_lifecycle_event === 'postinstall') {
-  const prerelease = process.argv.includes('--prerelease') || process.argv.includes('-p');
-  install({ prerelease }).catch(error => {
+  install().catch(error => {
     console.error('Failed to install Mandor:', error.message);
     process.exit(1);
   });

package/npm/lib/resolve.js

@@ -1,159 +1,60 @@
 /**
  * @fileoverview Version resolution module for Mandor CLI
- * @description Resolves the correct binary path based on version and platform
- * @version 0.0.2
+ * @description Resolves the binary path for the CLI
+ * @version 0.0.3
  */
 
 const path = require('path');
-const fs = require('fs');
 const os = require('os');
-const { downloadBinary, getCurrentPlatform } = require('./download');
+const https = require('https');
 
 const REPO = 'sanxzy/mandor';
-const GITHUB_API = 'https://api.github.com';
 const DEFAULT_VERSION = 'latest';
-
-function getCachedBinary(version, platform, arch) {
-  const osArch = `${platform}-${arch}`;
-  const binaryName = platform === 'win32' ? 'mandor.exe' : 'mandor';
-  const binaryPath = path.join(os.homedir(), '.mandor', 'bin', version, osArch, binaryName);
-
-  if (fs.existsSync(binaryPath)) {
-    return binaryPath;
-  }
-  return null;
+const INSTALL_DIR = path.join(os.homedir(), '.local', 'bin');
+
+function getPlatform() {
+  const platform = os.platform();
+  const arch = os.arch();
+  const platformMap = { darwin: 'darwin', linux: 'linux', win32: 'win32' };
+  const archMap = { x64: 'x64', arm64: 'arm64', amd64: 'x64', aarch64: 'arm64' };
+  return {
+    platform: platformMap[platform] || platform,
+    arch: archMap[arch] || arch
+  };
 }
 
 async function getLatestVersion(prerelease = false) {
   const url = prerelease
-    ? `${GITHUB_API}/repos/${REPO}/releases`
-    : `${GITHUB_API}/repos/${REPO}/releases/latest`;
-
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error(`Failed to fetch releases: ${response.statusText}`);
-  }
-  const data = await response.json();
-  const tagName = Array.isArray(data) ? data[0].tag_name : data.tag_name;
-  return tagName.replace(/^v/, '');
-}
-
-function cacheBinary(binaryPath, version, platform, arch) {
-  const osArch = `${platform}-${arch}`;
-  const cacheDir = path.join(os.homedir(), '.mandor', 'bin', version, osArch);
-  fs.mkdirSync(cacheDir, { recursive: true });
-
-  const binaryName = platform === 'win32' ? 'mandor.exe' : 'mandor';
-  const destPath = path.join(cacheDir, binaryName);
-
-  fs.copyFileSync(binaryPath, destPath);
-  fs.chmodSync(destPath, '755');
-}
-
-async function resolve(options = {}) {
-  const version = options.version || DEFAULT_VERSION;
-  const { platform, arch } = getCurrentPlatform();
-  const prerelease = options.prerelease || false;
-
-  let resolveVersion = version;
-  if (version === 'latest') {
-    resolveVersion = await getLatestVersion(prerelease);
-  }
-
-  const cachedPath = getCachedBinary(resolveVersion, platform, arch);
-  if (cachedPath && !options.forceDownload) {
-    return cachedPath;
-  }
-
-  const osArch = `${platform}-${arch}`;
-  const downloadUrl = `https://github.com/${REPO}/releases/download/v${resolveVersion}/${osArch}.tar.gz`;
-  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mandor-download-'));
-  const tarball = path.join(tempDir, `${osArch}.tar.gz`);
-
-  console.log(`Downloading Mandor ${resolveVersion}...`);
-
-  const response = await fetch(downloadUrl);
-  if (!response.ok) {
-    fs.rmSync(tempDir, { recursive: true });
-    throw new Error(`Download failed: ${response.statusText}`);
-  }
-
-  const file = fs.createWriteStream(tarball);
-  await new Promise((resolve, reject) => {
-    response.body.pipe(file);
-    file.on('finish', resolve);
-    file.on('error', reject);
-  });
-
-  const binaryName = platform === 'win32' ? 'mandor.exe' : 'mandor';
-  const cacheDir = path.join(os.homedir(), '.mandor', 'bin', resolveVersion, osArch);
-  fs.mkdirSync(cacheDir, { recursive: true });
-
-  const { execSync } = require('child_process');
-  execSync(`tar -xzf "${tarball}" -C "${cacheDir}"`, { stdio: 'pipe' });
-  fs.chmodSync(path.join(cacheDir, binaryName), '755');
-
-  fs.rmSync(tempDir, { recursive: true });
-
-  return path.join(cacheDir, binaryName);
-}
-
-function listCachedBinaries() {
-  const cacheDir = path.join(os.homedir(), '.mandor', 'bin');
-
-  if (!fs.existsSync(cacheDir)) {
-    return [];
-  }
-
-  const versions = [];
-  const entries = fs.readdirSync(cacheDir);
-
-  for (const entry of entries) {
-    const versionPath = path.join(cacheDir, entry);
-    if (fs.statSync(versionPath).isDirectory()) {
-      const subEntries = fs.readdirSync(versionPath);
-      for (const subEntry of subEntries) {
-        const subPath = path.join(versionPath, subEntry);
-        if (fs.statSync(subPath).isDirectory()) {
-          const parts = subEntry.split('-');
-          const arch = parts.pop();
-          const platform = parts.join('-');
-          versions.push({ version: entry, platform, arch, path: subPath });
+    ? `https://api.github.com/repos/${REPO}/releases`
+    : `https://api.github.com/repos/${REPO}/releases/latest`;
+
+  return new Promise((resolve, reject) => {
+    https.get(url, { headers: { 'User-Agent': 'Mandor-CLI' } }, (res) => {
+      let data = '';
+      res.on('data', chunk => data += chunk);
+      res.on('end', () => {
+        try {
+          const parsed = JSON.parse(data);
+          const tagName = Array.isArray(parsed) ? parsed[0].tag_name : parsed.tag_name;
+          resolve(tagName.replace(/^v/, ''));
+        } catch (e) {
+          reject(e);
         }
-      }
-    }
-  }
-
-  return versions;
+      });
+    }).on('error', reject);
+  });
 }
 
-function clearCache() {
-  const cacheDir = path.join(os.homedir(), '.mandor', 'bin');
-
-  if (!fs.existsSync(cacheDir)) {
-    return 0;
-  }
-
-  const entries = fs.readdirSync(cacheDir);
-  let removed = 0;
-
-  for (const entry of entries) {
-    const entryPath = path.join(cacheDir, entry);
-    if (fs.statSync(entryPath).isDirectory()) {
-      fs.rmSync(entryPath, { recursive: true, force: true });
-      removed++;
-    }
-  }
-
-  return removed;
+function getBinaryPath(version = DEFAULT_VERSION) {
+  const { platform, arch } = getPlatform();
+  const binaryName = platform === 'win32' ? 'mandor.exe' : 'mandor';
+  return path.join(INSTALL_DIR, binaryName);
 }
 
 module.exports = {
-  resolve,
-  getCachedBinary,
-  cacheBinary,
-  listCachedBinaries,
-  clearCache,
+  getPlatform,
+  getLatestVersion,
+  getBinaryPath,
   DEFAULT_VERSION,
-  getLatestVersion
+  INSTALL_DIR
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mandors/cli",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "Event-based task manager CLI for AI agent workflows",
   "main": "npm/lib/index.js",
   "bin": {