@askfaro/cli 0.1.0 → 0.4.0

package/bin/askfaro.js

@@ -0,0 +1,125 @@
+#!/usr/bin/env node
+"use strict";
+
+const { execFileSync, spawnSync } = require("child_process");
+const { existsSync } = require("fs");
+const path = require("path");
+
+const PYPI_PACKAGE = "askfaro-cli";
+const MIN_VERSION = "0.4.0";
+const BIN_NAME = "askfaro";
+
+function parseVersion(s) {
+  const m = String(s).match(/(\d+)\.(\d+)\.(\d+)/);
+  return m ? [Number(m[1]), Number(m[2]), Number(m[3])] : null;
+}
+
+function versionAtLeast(a, b) {
+  const va = parseVersion(a);
+  const vb = parseVersion(b);
+  if (!va || !vb) return false;
+  for (let i = 0; i < 3; i++) {
+    if (va[i] !== vb[i]) return va[i] > vb[i];
+  }
+  return true;
+}
+
+function getVersion(bin) {
+  try {
+    const r = spawnSync(bin, ["--version"], { encoding: "utf8" });
+    if (r.status === 0) return (r.stdout || "").trim();
+  } catch {}
+  return null;
+}
+
+function findFaro() {
+  // Check if `askfaro` is already on PATH (e.g. installed via pip/pipx separately)
+  if (getVersion(BIN_NAME) !== null) return BIN_NAME;
+
+  // Check pipx-installed binary
+  const pipxBin = path.join(
+    process.env.HOME || "",
+    ".local",
+    "bin",
+    BIN_NAME
+  );
+  if (existsSync(pipxBin)) return pipxBin;
+
+  return null;
+}
+
+function hasPipx() {
+  try {
+    const r = spawnSync("pipx", ["--version"], { encoding: "utf8" });
+    return r.status === 0;
+  } catch {
+    return false;
+  }
+}
+
+function hasPython() {
+  for (const cmd of ["python3", "python"]) {
+    try {
+      const r = spawnSync(cmd, ["--version"], { encoding: "utf8" });
+      if (r.status === 0) return cmd;
+    } catch {}
+  }
+  return null;
+}
+
+function install({ upgrade = false } = {}) {
+  const verb = upgrade ? "Upgrading" : "Installing";
+  console.error(`${verb} ${PYPI_PACKAGE} via pipx or pip...`);
+
+  if (hasPipx()) {
+    const args = upgrade ? ["upgrade", PYPI_PACKAGE] : ["install", PYPI_PACKAGE];
+    const r = spawnSync("pipx", args, { stdio: "inherit" });
+    if (r.status === 0) return;
+    console.error(`pipx ${args[0]} failed, falling back to pip.`);
+  }
+
+  const python = hasPython();
+  if (!python) {
+    console.error(
+      "Error: Python 3 is required to use the Faro CLI.\n" +
+      "Install it from https://python.org or via your package manager, then re-run this command."
+    );
+    process.exit(1);
+  }
+
+  const pipArgs = ["-m", "pip", "install", "--user"];
+  if (upgrade) pipArgs.push("--upgrade");
+  pipArgs.push(PYPI_PACKAGE);
+  const r = spawnSync(python, pipArgs, { stdio: "inherit" });
+  if (r.status !== 0) {
+    console.error(`Failed to install ${PYPI_PACKAGE}. Try: pip install --upgrade ${PYPI_PACKAGE}`);
+    process.exit(1);
+  }
+}
+
+let faroBin = findFaro();
+if (!faroBin) {
+  install();
+  faroBin = findFaro();
+  if (!faroBin) {
+    console.error(
+      `Installed ${PYPI_PACKAGE} but could not find the '${BIN_NAME}' binary on PATH.\n` +
+      "You may need to add ~/.local/bin to your PATH:\n" +
+      '  export PATH="$HOME/.local/bin:$PATH"'
+    );
+    process.exit(1);
+  }
+} else {
+  // Existing install — check it meets MIN_VERSION and upgrade if not.
+  const current = getVersion(faroBin);
+  if (current && !versionAtLeast(current, MIN_VERSION)) {
+    console.error(
+      `${PYPI_PACKAGE} ${current} is below the minimum ${MIN_VERSION} required by this wrapper.`
+    );
+    install({ upgrade: true });
+  }
+}
+
+// Forward all arguments to the real askfaro binary
+const result = spawnSync(faroBin, process.argv.slice(2), { stdio: "inherit" });
+process.exit(result.status ?? 1);

package/package.json

@@ -1,14 +1,20 @@
 {
   "name": "@askfaro/cli",
-  "version": "0.1.0",
-  "description": "Faro AI tool marketplace CLI",
+  "version": "0.4.0",
+  "description": "Faro CLI: the tools your AI agent can't run on its own",
   "bin": {
-    "faro": "./bin/faro.js"
+    "askfaro": "./bin/askfaro.js"
   },
   "scripts": {
-    "test": "node bin/faro.js --version"
+    "test": "node bin/askfaro.js --version"
   },
-  "keywords": ["faro", "ai", "tools", "marketplace", "cli"],
+  "keywords": [
+    "faro",
+    "ai",
+    "tools",
+    "marketplace",
+    "cli"
+  ],
   "license": "MIT",
   "engines": {
     "node": ">=16"

package/bin/faro.js

@@ -1,92 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-const { execFileSync, spawnSync } = require("child_process");
-const { existsSync } = require("fs");
-const path = require("path");
-
-const PYPI_PACKAGE = "askfaro-cli";
-const MIN_VERSION = "0.1.0";
-
-function findFaro() {
-  // Check if `faro` is already on PATH (e.g. installed via pip/pipx separately)
-  try {
-    const result = spawnSync("faro", ["--version"], { encoding: "utf8" });
-    if (result.status === 0) return "faro";
-  } catch {}
-
-  // Check pipx-installed binary
-  const pipxBin = path.join(
-    process.env.HOME || "",
-    ".local",
-    "bin",
-    "faro"
-  );
-  if (existsSync(pipxBin)) return pipxBin;
-
-  return null;
-}
-
-function hasPipx() {
-  try {
-    const r = spawnSync("pipx", ["--version"], { encoding: "utf8" });
-    return r.status === 0;
-  } catch {
-    return false;
-  }
-}
-
-function hasPython() {
-  for (const cmd of ["python3", "python"]) {
-    try {
-      const r = spawnSync(cmd, ["--version"], { encoding: "utf8" });
-      if (r.status === 0) return cmd;
-    } catch {}
-  }
-  return null;
-}
-
-function install() {
-  console.error(`Installing ${PYPI_PACKAGE} via pipx or pip...`);
-
-  if (hasPipx()) {
-    const r = spawnSync("pipx", ["install", PYPI_PACKAGE], { stdio: "inherit" });
-    if (r.status === 0) return;
-    console.error("pipx install failed, falling back to pip.");
-  }
-
-  const python = hasPython();
-  if (!python) {
-    console.error(
-      "Error: Python 3 is required to use the Faro CLI.\n" +
-      "Install it from https://python.org or via your package manager, then re-run this command."
-    );
-    process.exit(1);
-  }
-
-  const r = spawnSync(python, ["-m", "pip", "install", "--user", PYPI_PACKAGE], {
-    stdio: "inherit",
-  });
-  if (r.status !== 0) {
-    console.error(`Failed to install ${PYPI_PACKAGE}. Try: pip install ${PYPI_PACKAGE}`);
-    process.exit(1);
-  }
-}
-
-let faroBin = findFaro();
-if (!faroBin) {
-  install();
-  faroBin = findFaro();
-  if (!faroBin) {
-    console.error(
-      `Installed ${PYPI_PACKAGE} but could not find the 'faro' binary on PATH.\n` +
-      "You may need to add ~/.local/bin to your PATH:\n" +
-      '  export PATH="$HOME/.local/bin:$PATH"'
-    );
-    process.exit(1);
-  }
-}
-
-// Forward all arguments to the real faro binary
-const result = spawnSync(faroBin, process.argv.slice(2), { stdio: "inherit" });
-process.exit(result.status ?? 1);