@themoltnet/cli 1.28.0 → 1.30.0

package/install.js

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 'use strict';
 
-const https = require('https');
 const fs = require('fs');
 const path = require('path');
 const zlib = require('zlib');
 const { execFileSync } = require('child_process');
 
 const VERSION = require('./package.json').version;
+const WORKSPACE_PLATFORM_ROOT = path.resolve(__dirname, 'npm');
+const FETCH_TIMEOUT_MS = 15_000;
 
 function getBinaryName() {
   return process.platform === 'win32' ? 'moltnet.exe' : 'moltnet';
@@ -17,20 +18,47 @@ function getPlatformPackageName() {
   return `@themoltnet/cli-${process.platform}-${process.arch}`;
 }
 
-// Case 1 (happy path): the platform package was installed via
-// optionalDependencies. bin/moltnet.js resolves the binary in place at
-// runtime, so install.js has nothing to do.
-function tryPlatformPackage() {
+function resolvePlatformPackage() {
   const pkgName = getPlatformPackageName();
   try {
     const pkgDir = path.dirname(require.resolve(`${pkgName}/package.json`));
-    const binaryPath = path.join(pkgDir, 'bin', getBinaryName());
-    if (fs.existsSync(binaryPath)) {
-      return binaryPath;
-    }
+    return {
+      binaryPath: path.join(pkgDir, 'bin', getBinaryName()),
+      isWorkspacePackage:
+        pkgDir === WORKSPACE_PLATFORM_ROOT ||
+        pkgDir.startsWith(`${WORKSPACE_PLATFORM_ROOT}${path.sep}`),
+      pkgDir,
+    };
   } catch {
+    return null;
+  }
+}
+
+// Case 1 (happy path): the platform package was installed via
+// optionalDependencies. bin/moltnet.js resolves the binary in place at
+// runtime, so install.js has nothing to do.
+function tryPlatformPackage() {
+  const resolvedPackage = resolvePlatformPackage();
+  if (!resolvedPackage) {
     // Platform package not installed (e.g. --no-optional, yarn v1 optional bug)
+    return null;
+  }
+
+  if (fs.existsSync(resolvedPackage.binaryPath)) {
+    return resolvedPackage.binaryPath;
+  }
+
+  // In this monorepo, workspace platform packages resolve during `pnpm install`
+  // before their release artifacts exist in the checkout. That should not
+  // trigger a registry fetch; the fallback is only for published installs.
+  if (resolvedPackage.isWorkspacePackage) {
+    console.log(
+      `Skipping moltnet binary download for workspace package ${getPlatformPackageName()} ` +
+        `(${resolvedPackage.pkgDir})`
+    );
+    return resolvedPackage.binaryPath;
   }
+
   return null;
 }
 
@@ -39,24 +67,30 @@ function fetch(url, maxRedirects = 5) {
     if (maxRedirects <= 0) {
       return reject(new Error('Too many redirects'));
     }
-    https
-      .get(url, { headers: { 'User-Agent': 'themoltnet-cli' } }, (res) => {
-        if (
-          res.statusCode >= 300 &&
-          res.statusCode < 400 &&
-          res.headers.location
-        ) {
-          return resolve(fetch(res.headers.location, maxRedirects - 1));
-        }
-        if (res.statusCode !== 200) {
-          return reject(new Error(`HTTP ${res.statusCode} fetching ${url}`));
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+    globalThis
+      .fetch(url, {
+        headers: { 'User-Agent': 'themoltnet-cli' },
+        redirect: 'follow',
+        signal: controller.signal,
+      })
+      .then(async (response) => {
+        clearTimeout(timeout);
+        if (!response.ok) {
+          throw new Error(`HTTP ${response.status} fetching ${url}`);
         }
-        const chunks = [];
-        res.on('data', (chunk) => chunks.push(chunk));
-        res.on('end', () => resolve(Buffer.concat(chunks)));
-        res.on('error', reject);
+        return Buffer.from(await response.arrayBuffer());
       })
-      .on('error', reject);
+      .then(resolve)
+      .catch((err) => {
+        clearTimeout(timeout);
+        if (err.name === 'AbortError') {
+          reject(new Error(`Request timed out after ${FETCH_TIMEOUT_MS}ms`));
+          return;
+        }
+        reject(err);
+      });
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/cli",
-  "version": "1.28.0",
+  "version": "1.30.0",
   "description": "CLI for MoltNet — AI agent identity and autonomy network",
   "license": "MIT",
   "repository": {
@@ -20,12 +20,12 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "@themoltnet/cli-darwin-arm64": "1.28.0",
-    "@themoltnet/cli-linux-arm64": "1.28.0",
-    "@themoltnet/cli-darwin-x64": "1.28.0",
-    "@themoltnet/cli-win32-arm64": "1.28.0",
-    "@themoltnet/cli-linux-x64": "1.28.0",
-    "@themoltnet/cli-win32-x64": "1.28.0"
+    "@themoltnet/cli-darwin-x64": "1.30.0",
+    "@themoltnet/cli-win32-arm64": "1.30.0",
+    "@themoltnet/cli-darwin-arm64": "1.30.0",
+    "@themoltnet/cli-win32-x64": "1.30.0",
+    "@themoltnet/cli-linux-arm64": "1.30.0",
+    "@themoltnet/cli-linux-x64": "1.30.0"
   },
   "scripts": {
     "postinstall": "node install.js"