watchmen-cli 1.0.10 → 1.0.12

package/bin/wm.js

@@ -0,0 +1,28 @@
+#!/usr/bin/env node
+"use strict";
+
+const { execFileSync } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+
+const binDir = __dirname;
+const ext = process.platform === "win32" ? ".exe" : "";
+const binPath = path.join(binDir, `wm${ext}`);
+
+if (!fs.existsSync(binPath)) {
+  console.error(
+    "wm binary not found. Run: npm rebuild watchmen-cli\n" +
+    `Expected at: ${binPath}`
+  );
+  process.exit(1);
+}
+
+try {
+  execFileSync(binPath, process.argv.slice(2), {
+    stdio: "inherit",
+    env: process.env,
+  });
+} catch (err) {
+  // execFileSync throws on non-zero exit — forward the exit code
+  process.exit(err.status || 1);
+}

package/install.js

@@ -5,17 +5,21 @@ const https = require("https");
 const http = require("http");
 const fs = require("fs");
 const path = require("path");
-const { createHash } = require("crypto");
 const { execSync } = require("child_process");
 
 const VERSION = require("./package.json").version;
 const DOWNLOAD_BASE = "https://releases.trywatchmen.cloud/download/community";
 
+// 60s connect timeout, 120s total — covers slow connections without hanging forever
+const CONNECT_TIMEOUT_MS = 60_000;
+const TOTAL_TIMEOUT_MS = 120_000;
+
 // Platform → download path mapping
 const PLATFORMS = {
   "darwin-arm64": "macos-arm64",
   "darwin-x64": "macos-arm64", // Rosetta 2 fallback
   "linux-x64": "linux-x86_64",
+  "linux-arm64": "linux-x86_64", // best-effort — no native arm64 yet
   "win32-x64": "windows-x86_64",
 };
 
@@ -28,69 +32,165 @@ function getPlatformSlug() {
   const slug = PLATFORMS[key];
   if (!slug) {
     console.error(
-      `Unsupported platform: ${key}\nSupported: ${Object.keys(PLATFORMS).join(", ")}`
+      `\n  Unsupported platform: ${key}\n` +
+      `  Supported: ${Object.keys(PLATFORMS).join(", ")}\n\n` +
+      `  You can download manually from: https://trywatchmen.cloud/docs/getting-started/installation\n`
     );
     process.exit(1);
   }
   return slug;
 }
 
-function download(url) {
+function formatBytes(bytes) {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(0)} KB`;
+  return `${(bytes / 1024 / 1024).toFixed(1)} MB`;
+}
+
+function download(url, maxRedirects = 5) {
   return new Promise((resolve, reject) => {
+    if (maxRedirects <= 0) {
+      return reject(new Error("Too many redirects"));
+    }
+
     const client = url.startsWith("https") ? https : http;
-    client
-      .get(url, { headers: { "User-Agent": "watchmen-cli-npm" } }, (res) => {
-        // Follow redirects (GitHub releases redirect to S3)
+    const req = client.get(
+      url,
+      {
+        headers: { "User-Agent": `watchmen-cli-npm/${VERSION}` },
+        timeout: CONNECT_TIMEOUT_MS,
+      },
+      (res) => {
+        // Follow redirects
         if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-          return download(res.headers.location).then(resolve).catch(reject);
+          res.resume(); // drain response
+          return download(res.headers.location, maxRedirects - 1).then(resolve).catch(reject);
         }
         if (res.statusCode !== 200) {
-          return reject(new Error(`HTTP ${res.statusCode} for ${url}`));
+          res.resume();
+          return reject(new Error(`HTTP ${res.statusCode} from ${url.split("?")[0]}`));
         }
+
+        const contentLength = parseInt(res.headers["content-length"], 10) || 0;
         const chunks = [];
-        res.on("data", (chunk) => chunks.push(chunk));
-        res.on("end", () => resolve(Buffer.concat(chunks)));
-        res.on("error", reject);
-      })
-      .on("error", reject);
+        let received = 0;
+        const startTime = Date.now();
+
+        // Progress reporting
+        const progressInterval = setInterval(() => {
+          const elapsed = ((Date.now() - startTime) / 1000).toFixed(0);
+          if (contentLength > 0) {
+            const pct = ((received / contentLength) * 100).toFixed(0);
+            process.stdout.write(`\r  Downloading... ${formatBytes(received)} / ${formatBytes(contentLength)} (${pct}%) [${elapsed}s]`);
+          } else {
+            process.stdout.write(`\r  Downloading... ${formatBytes(received)} [${elapsed}s]`);
+          }
+        }, 500);
+
+        res.on("data", (chunk) => {
+          chunks.push(chunk);
+          received += chunk.length;
+        });
+
+        res.on("end", () => {
+          clearInterval(progressInterval);
+          const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+          process.stdout.write(`\r  Downloaded ${formatBytes(received)} in ${elapsed}s${" ".repeat(20)}\n`);
+          resolve(Buffer.concat(chunks));
+        });
+
+        res.on("error", (err) => {
+          clearInterval(progressInterval);
+          reject(err);
+        });
+      }
+    );
+
+    req.on("timeout", () => {
+      req.destroy();
+      reject(new Error(`Connection timed out after ${CONNECT_TIMEOUT_MS / 1000}s`));
+    });
+
+    req.on("error", reject);
+
+    // Hard total timeout
+    setTimeout(() => {
+      req.destroy();
+      reject(new Error(`Download timed out after ${TOTAL_TIMEOUT_MS / 1000}s — try again or download manually from https://trywatchmen.cloud`));
+    }, TOTAL_TIMEOUT_MS);
   });
 }
 
 async function main() {
   const platformSlug = getPlatformSlug();
+  const platformKey = getPlatformKey();
+  const isWindows = process.platform === "win32";
   const binDir = path.join(__dirname, "bin");
-  const binName = process.platform === "win32" ? "wm.exe" : "wm";
+  const binName = isWindows ? "wm.exe" : "wm";
   const binPath = path.join(binDir, binName);
 
   // Skip if already installed at correct version
   if (fs.existsSync(binPath)) {
     try {
-      const installed = execSync(`"${binPath}" version`, { encoding: "utf8" });
+      const installed = execSync(`"${binPath}" version`, {
+        encoding: "utf8",
+        timeout: 10_000,
+      });
       if (installed.includes(VERSION)) {
-        console.log(`wm v${VERSION} already installed`);
+        console.log(`  wm v${VERSION} already installed at ${binPath}`);
         return;
       }
-    } catch {}
+      console.log(`  Upgrading wm to v${VERSION}...`);
+    } catch {
+      // Binary exists but broken/wrong version — redownload
+    }
   }
 
-  // Pre-signed URL API redirects to S3
   const url = `${DOWNLOAD_BASE}/${platformSlug}`;
 
-  console.log(`Downloading wm v${VERSION} for ${getPlatformKey()}...`);
-  console.log(`  ${url}`);
+  console.log(`\n  WatchmenCLI v${VERSION} — ${platformKey}`);
+  console.log(`  ${url}\n`);
 
-  // Download binary (URL redirects to pre-signed S3 URL)
   const binary = await download(url);
 
+  // Validate minimum binary size (real binaries are >5MB)
+  if (binary.length < 1024 * 1024) {
+    throw new Error(
+      `Downloaded file is only ${formatBytes(binary.length)} — expected >5MB.\n` +
+      `  This usually means the download URL returned an error page.\n` +
+      `  Try: npm cache clean --force && npm install -g watchmen-cli`
+    );
+  }
+
   // Write binary
   fs.mkdirSync(binDir, { recursive: true });
   fs.writeFileSync(binPath, binary);
-  fs.chmodSync(binPath, 0o755);
 
-  console.log(`  Installed: ${binPath}`);
+  // chmod on Unix (no-op concept on Windows, but doesn't hurt)
+  if (!isWindows) {
+    fs.chmodSync(binPath, 0o755);
+  }
+
+  // Verify the binary runs
+  try {
+    execSync(`"${binPath}" version`, { encoding: "utf8", timeout: 10_000 });
+    console.log(`  Installed successfully: ${binPath}\n`);
+  } catch (err) {
+    console.warn(
+      `  Warning: binary installed but verification failed.\n` +
+      `  Path: ${binPath}\n` +
+      `  You may need to run: wm doctor\n`
+    );
+  }
 }
 
 main().catch((err) => {
-  console.error(`Failed to install wm: ${err.message}`);
+  console.error(`\n  Failed to install wm: ${err.message}\n`);
+  console.error(
+    `  Troubleshooting:\n` +
+    `    1. Check your internet connection\n` +
+    `    2. Try: npm cache clean --force && npm install -g watchmen-cli\n` +
+    `    3. Download manually: https://trywatchmen.cloud/docs/getting-started/installation\n`
+  );
   process.exit(1);
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "watchmen-cli",
-  "version": "1.0.10",
-  "description": "Developer environment intelligence platform — 13 scanners, 24 MCP tools, zero dependencies",
+  "version": "1.0.12",
+  "description": "Capture, compare, and transfer your complete development environment",
   "main": "install.js",
   "keywords": [
     "cli",
@@ -23,7 +23,7 @@
   "license": "MIT",
   "author": "Cristiano Pereira da Silva Muniz, LLC",
   "bin": {
-    "wm": "bin/wm"
+    "wm": "bin/wm.js"
   },
   "scripts": {
     "postinstall": "node install.js"

package/bin/wm

@@ -1,5 +0,0 @@
-#!/bin/sh
-# Stub — replaced by install.js postinstall with the actual binary.
-# If you see this message, run: npm rebuild watchmen-cli
-echo "wm binary not installed. Run: npm rebuild watchmen-cli" >&2
-exit 1