@vantaloom/runtime-darwin-arm64 0.3.3 → 0.3.6

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vantaloom/cli",
-  "version": "0.3.3",
+  "version": "0.3.6",
   "private": false,
   "type": "module",
   "description": "Vantaloom local runtime manager.",

package/cli/src/cli.mjs

@@ -1,5 +1,6 @@
 import { execFileSync, spawnSync } from "node:child_process"
 import {
+  appendFileSync,
   chmodSync,
   existsSync,
   mkdirSync,
@@ -44,6 +45,8 @@ if (shouldDisableTLS()) {
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0"
 }
 
+const cliVersion = readJSONIfExists(path.join(cliRoot, "package.json")).version ?? "unknown"
+
 export async function main(argv) {
   const command = argv[0] ?? "help"
   const options = parseOptions(argv.slice(1))
@@ -53,6 +56,10 @@ export async function main(argv) {
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0"
   }
 
+  if (command === "install" || command === "update") {
+    console.log(`vantaloom-cli v${cliVersion} (${platformId()})`)
+  }
+
   switch (command) {
     case "install":
       if (options.package) {
@@ -119,6 +126,7 @@ async function installFromSource(options) {
 
   console.log(`${options.update ? "updated" : "installed"} Vantaloom: ${prefix}`)
   console.log(`version: ${version}`)
+  ensureInPath(prefix)
   console.log(`run: ${displayCommand(prefix)} status`)
 }
 
@@ -132,6 +140,7 @@ async function installFromPackage(options) {
 
   console.log(`${options.update ? "updated" : "installed"} Vantaloom: ${prefix}`)
   console.log(`version: ${version}`)
+  ensureInPath(prefix)
   console.log(`run: ${displayCommand(prefix)} status`)
 }
 
@@ -218,9 +227,16 @@ async function applyPackage(packageRoot, prefix, options) {
   // don't write tray.pid, so vantaloomctl stop won't find them).
   killTrayProcess(prefix)
 
+  // Copy package contents to install prefix
   for (const name of ["bin", "web", "cli"]) {
-    removeKnownPath(path.join(prefix, name), prefix)
-    await cp(path.join(packageRoot, name), path.join(prefix, name), {
+    const src = path.join(packageRoot, name)
+    const dst = path.join(prefix, name)
+    if (!existsSync(src)) {
+      console.error(`  warning: package missing ${name}/ directory`)
+      continue
+    }
+    removeKnownPath(dst, prefix)
+    await cp(src, dst, {
       recursive: true,
       force: true,
       dereference: false,
@@ -228,14 +244,28 @@ async function applyPackage(packageRoot, prefix, options) {
   }
 
   // Ensure binaries are executable on Unix (cross-compiled from Windows they lose +x)
-  if (process.platform !== "win32") {
-    const binDir = path.join(prefix, "bin")
+  const binDir = path.join(prefix, "bin")
+  if (process.platform !== "win32" && existsSync(binDir)) {
     for (const entry of readdirSync(binDir)) {
       const binPath = path.join(binDir, entry)
       try { chmodSync(binPath, 0o755) } catch {}
     }
   }
 
+  // Verify vantaloomctl binary exists before trying to run it
+  const ctlBin = path.join(prefix, "bin", binaryName("vantaloomctl"))
+  if (!existsSync(ctlBin)) {
+    const binContents = existsSync(binDir) ? readdirSync(binDir) : []
+    const srcBinContents = existsSync(path.join(packageRoot, "bin")) ? readdirSync(path.join(packageRoot, "bin")) : []
+    throw new Error(
+      `vantaloomctl binary not found at ${ctlBin}\n` +
+      `  installed bin/: [${binContents.join(", ")}]\n` +
+      `  package bin/:   [${srcBinContents.join(", ")}]\n` +
+      `  platform: ${platformId()}\n` +
+      `  This may indicate a corrupt download. Try again or install from source.`
+    )
+  }
+
   await writeLauncher(prefix)
   await writeText(path.join(prefix, "cli", "config.json"), `${JSON.stringify(mergedConfig, null, 2)}\n`)
   await writeText(path.join(prefix, "VERSION"), `${version}\n`)
@@ -243,7 +273,7 @@ async function applyPackage(packageRoot, prefix, options) {
     force: true,
   })
 
-  run(path.join(prefix, "bin", binaryName("vantaloomctl")), [
+  run(ctlBin, [
     "install",
     "--prefix",
     prefix,
@@ -252,7 +282,7 @@ async function applyPackage(packageRoot, prefix, options) {
   ])
 
   if (!options.noStart) {
-    run(path.join(prefix, "bin", binaryName("vantaloomctl")), [
+    run(ctlBin, [
       "start",
       "--prefix",
       prefix,
@@ -265,7 +295,10 @@ async function applyPackage(packageRoot, prefix, options) {
 async function syncFromNpmRegistry(options, action) {
   const prefix = safeDirectory(options.prefix ?? defaultPrefix())
   const installedConfig = readInstalledConfig(prefix)
-  const runtimePackage = options.runtimePackage || installedConfig.runtimePackage || runtimePackageName(platformId())
+  // Always derive runtimePackage from current platform — never trust stale config
+  // from a different platform (e.g. win32 config baked into a darwin package).
+  // Only explicit --runtime-package flag can override.
+  const runtimePackage = options.runtimePackage || runtimePackageName(platformId())
   const runtimeVersion = options.runtimeVersion || installedConfig.runtimeVersion || "latest"
   const explicitRegistry = options.npmRegistry || installedConfig.npmRegistry
   const registry = normalizeRegistry(explicitRegistry || detectNpmRegistry() || defaultNpmRegistry)
@@ -302,6 +335,7 @@ async function syncFromNpmRegistry(options, action) {
     console.log(`version: ${version}`)
     console.log(`source: ${runtimePackage}@${resolved.version}`)
     console.log(`registry: ${resolved.registry}`)
+    ensureInPath(prefix)
     console.log(`run: ${displayCommand(prefix)} status`)
   } finally {
     removeKnownPath(tempRoot, os.tmpdir())
@@ -343,6 +377,7 @@ async function syncFromRelease(options, action) {
     console.log(`${action === "update" ? "updated" : "installed"} Vantaloom: ${prefix}`)
     console.log(`version: ${version}`)
     console.log(`source: ${repo}@${releaseTag}`)
+    ensureInPath(prefix)
     console.log(`run: ${displayCommand(prefix)} status`)
   } finally {
     removeKnownPath(tempRoot, os.tmpdir())
@@ -520,11 +555,22 @@ async function resolveNpmPackage({ registry, name, version }) {
 }
 
 async function downloadNpmTarball({ tarballUrl, target, packageName, version }) {
-  const response = await fetch(tarballUrl, {
-    headers: {
-      "User-Agent": "vantaloom-cli",
-    },
-  })
+  console.log(`  downloading ${packageName}@${version}...`)
+  let response
+  try {
+    response = await fetch(tarballUrl, {
+      headers: {
+        "User-Agent": "vantaloom-cli",
+      },
+      signal: AbortSignal.timeout(120000),
+    })
+  } catch (error) {
+    const causeCode = error?.cause?.code || ""
+    const causeMsg = causeCode || error?.cause?.message || error.message || ""
+    const isSsl = causeCode.includes("CERT") || causeCode === "UNABLE_TO_GET_ISSUER_CERT_LOCALLY"
+    const hint = isSsl ? `\n  Fix: run with --no-strict-ssl` : ""
+    throw new Error(`failed to download ${packageName}@${version} from ${tarballUrl}: ${causeMsg}${hint}`)
+  }
   if (!response.ok) {
     const detail = await response.text().catch(() => "")
     throw new Error(`failed to download ${packageName}@${version}: HTTP ${response.status}${detail ? ` ${detail.slice(0, 200)}` : ""}`)
@@ -532,6 +578,7 @@ async function downloadNpmTarball({ tarballUrl, target, packageName, version })
 
   const buffer = Buffer.from(await response.arrayBuffer())
   await writeFile(target, buffer)
+  console.log(`  downloaded ${(buffer.length / 1024 / 1024).toFixed(1)} MB`)
 }
 
 function shouldUseSourceInstall(options) {
@@ -595,9 +642,9 @@ function mergeRuntimeConfig(packageConfig, existingConfig, overrides) {
   if (!merged.releaseTag) {
     merged.releaseTag = defaultReleaseTag
   }
-  if (!merged.runtimePackage) {
-    merged.runtimePackage = runtimePackageName(platformId())
-  }
+  // Always force runtimePackage to match the running platform — a cross-compiled
+  // package may carry a config for a different platform (e.g. win32 inside darwin).
+  merged.runtimePackage = runtimePackageName(platformId())
   if (!merged.runtimeVersion) {
     merged.runtimeVersion = "latest"
   }
@@ -1047,6 +1094,60 @@ async function writeText(filePath, content) {
   await writeFile(filePath, content)
 }
 
+// ensureInPath adds the Vantaloom install directory to the user's shell PATH
+// on macOS and Linux, so `vantaloom` can be run directly after install.
+// On Windows this is not needed (vantaloom.cmd is run by full path or added via installer).
+function ensureInPath(prefix) {
+  if (process.platform === "win32") return
+
+  // Check if already in PATH
+  const pathDirs = (process.env.PATH || "").split(":")
+  if (pathDirs.includes(prefix)) return
+
+  // Determine shell profile file
+  const home = os.homedir()
+  const shell = process.env.SHELL || ""
+  let profilePath
+  if (shell.endsWith("/zsh") || existsSync(path.join(home, ".zshrc"))) {
+    profilePath = path.join(home, ".zshrc")
+  } else if (shell.endsWith("/bash")) {
+    // On macOS, bash uses .bash_profile; on Linux, .bashrc
+    profilePath = process.platform === "darwin"
+      ? path.join(home, ".bash_profile")
+      : path.join(home, ".bashrc")
+  } else if (existsSync(path.join(home, ".profile"))) {
+    profilePath = path.join(home, ".profile")
+  } else {
+    profilePath = path.join(home, ".profile")
+  }
+
+  // Use $HOME-relative path for portability
+  const homeRelative = prefix.startsWith(home)
+    ? `$HOME${prefix.slice(home.length)}`
+    : prefix
+  const exportLine = `export PATH="${homeRelative}:$PATH"`
+  const marker = "# vantaloom"
+
+  // Check if already added to profile
+  try {
+    if (existsSync(profilePath)) {
+      const content = readFileSync(profilePath, "utf8")
+      if (content.includes("vantaloom") && content.includes("PATH")) return
+    }
+  } catch {}
+
+  // Append to profile
+  try {
+    const entry = `\n${marker}\n${exportLine}\n`
+    appendFileSync(profilePath, entry)
+    console.log(`PATH: added ${prefix} to ${profilePath}`)
+    console.log(`  run: source ${profilePath}  (or open a new terminal)`)
+  } catch (error) {
+    console.log(`PATH: could not update ${profilePath}: ${error.message}`)
+    console.log(`  add manually: ${exportLine}`)
+  }
+}
+
 function killTrayProcess(prefix) {
   if (process.platform === "win32") {
     // Try PID file first (new tray versions write runtime/tray.pid).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vantaloom/runtime-darwin-arm64",
-  "version": "0.3.3",
+  "version": "0.3.6",
   "private": false,
   "description": "Vantaloom local runtime for darwin-arm64.",
   "type": "module",