@elnora-ai/cli 2.0.4 → 2.0.5

package/dist/cli.js

@@ -25,7 +25,7 @@ var VERSION, PRODUCTION_BASE_URL, BASE_URL, AI_SERVER_URL, ENDPOINTS, DEFAULT_HE
 var init_config = __esm({
   "src/lib/config.ts"() {
     "use strict";
-    VERSION = true ? "2.0.4" : process.env.npm_package_version ?? "0.0.0-dev";
+    VERSION = true ? "2.0.5" : process.env.npm_package_version ?? "0.0.0-dev";
     PRODUCTION_BASE_URL = "https://platform.elnora.ai/api/v1";
     BASE_URL = process.env.ELNORA_API_URL ?? PRODUCTION_BASE_URL;
     AI_SERVER_URL = process.env.ELNORA_AI_SERVER_URL ?? "https://platform.elnora.ai/ai-server";
@@ -185,7 +185,7 @@ function formatErrorForHuman(err) {
   }
   return lines.join("\n");
 }
-var ElnoraError, AuthError, NotFoundError, RateLimitError, ValidationError, ServerError, EXIT_CODES, SCRUB_KEY_VALUE_RE, SCRUB_LONG_TOKEN_RE;
+var ElnoraError, AuthError, NotFoundError, RateLimitError, ValidationError, ServerError, NetworkError, EXIT_CODES, SCRUB_KEY_VALUE_RE, SCRUB_LONG_TOKEN_RE;
 var init_errors = __esm({
   "src/lib/errors.ts"() {
     "use strict";
@@ -241,6 +241,19 @@ var init_errors = __esm({
         this.name = "ServerError";
       }
     };
+    NetworkError = class extends ElnoraError {
+      host;
+      constructor(host, cause) {
+        const target = host ? ` reaching ${host}` : "";
+        const reason = cause ? ` (${cause})` : "";
+        super(`Network error${target}${reason}`, {
+          code: "NETWORK_ERROR",
+          suggestion: host ? `Run 'elnora doctor' to diagnose connectivity, then confirm ${host} is reachable from this machine.` : "Run 'elnora doctor' to diagnose connectivity."
+        });
+        this.name = "NetworkError";
+        this.host = host;
+      }
+    };
     EXIT_CODES = /* @__PURE__ */ new Map([
       [ValidationError, 2],
       [AuthError, 3],
@@ -624,16 +637,17 @@ var init_client = __esm({
             });
           } catch (err) {
             if (err instanceof ElnoraError) throw err;
+            let host;
+            try {
+              host = new URL(url).hostname;
+            } catch {
+              host = void 0;
+            }
             if (err instanceof DOMException && err.name === "TimeoutError") {
-              throw new ElnoraError("Request timed out", {
-                code: "TIMEOUT",
-                suggestion: "Check your internet connection and try again."
-              });
+              throw new NetworkError(host, `timed out after ${this.timeout}ms`);
             }
-            throw new ElnoraError(`Network error: ${scrub(String(err))}`, {
-              code: "NETWORK_ERROR",
-              suggestion: "Check your internet connection and try again."
-            });
+            const causeCode = err instanceof Error && err.cause && typeof err.cause === "object" && "code" in err.cause ? String(err.cause.code) : err instanceof Error ? err.message : String(err);
+            throw new NetworkError(host, scrub(causeCode));
           }
         }
         throw new RateLimitError("Rate limit exceeded after retries");
@@ -1337,6 +1351,30 @@ import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as rea
 import { homedir as homedir3 } from "node:os";
 import { join as join3 } from "node:path";
 import pc2 from "picocolors";
+
+// src/lib/install-method.ts
+function detectInstallMethod() {
+  const execPath = process.argv[1] ?? "";
+  if (execPath.includes("node_modules")) {
+    return "npm";
+  }
+  if (execPath.includes("/Cellar/") || execPath.includes("/homebrew/")) {
+    return "homebrew";
+  }
+  return "binary";
+}
+function getUpdateInstruction(method) {
+  switch (method) {
+    case "npm":
+      return "npm install -g @elnora-ai/cli@latest";
+    case "homebrew":
+      return "brew upgrade elnora";
+    case "binary":
+      return "elnora update --install";
+  }
+}
+
+// src/lib/update-check.ts
 var NPM_REGISTRY_URL = "https://registry.npmjs.org/@elnora-ai/cli/latest";
 var CACHE_DIR = join3(homedir3(), ".elnora");
 var CACHE_FILE = join3(CACHE_DIR, ".update-check");
@@ -1366,13 +1404,15 @@ function writeCache(entry) {
 }
 function showUpdateNotice(latest) {
   if (!process.stderr.isTTY) return;
+  const command = getUpdateInstruction(detectInstallMethod());
   const color2 = isColorEnabled();
+  const head = `Update available: v${VERSION} \u2192 v${latest}`;
   const msg = color2 ? `
-${pc2.yellow(`Update available: v${VERSION} \u2192 v${latest}`)}
-Run: elnora update
+${pc2.yellow(head)}
+Run: ${command}
 ` : `
-Update available: v${VERSION} \u2192 v${latest}
-Run: elnora update
+${head}
+Run: ${command}
 `;
   process.stderr.write(msg);
 }
@@ -1508,33 +1548,44 @@ function checkPathConfigured() {
     msg: "PATH configured       standard install dirs not in PATH (OK if installed via npm/brew)"
   };
 }
+function readEnabledPlugins(file) {
+  if (!existsSync4(file)) return null;
+  try {
+    const settings = JSON.parse(readFileSync4(file, "utf-8"));
+    const raw = settings.enabledPlugins;
+    const enabledPlugins = typeof raw === "object" && raw !== null && !Array.isArray(raw) ? raw : {};
+    return { enabledPlugins };
+  } catch (e) {
+    return { enabledPlugins: {}, unreadable: e instanceof Error ? e.message : "parse error" };
+  }
+}
 function checkClaudePlugin() {
   if (!existsSync4(CLAUDE_DIR)) {
     return { status: "skip", msg: "Plugin enabled         (Claude Code not installed)" };
   }
-  if (!existsSync4(CLAUDE_SETTINGS_FILE)) {
+  const projectSettingsFile = join4(process.cwd(), ".claude", "settings.json");
+  const user = readEnabledPlugins(CLAUDE_SETTINGS_FILE);
+  const project = readEnabledPlugins(projectSettingsFile);
+  if (!user && !project) {
     return { status: "fail", msg: "Plugin enabled         settings.json not found \u2014 run 'elnora setup claude'" };
   }
-  let settings;
-  try {
-    settings = JSON.parse(readFileSync4(CLAUDE_SETTINGS_FILE, "utf-8"));
-  } catch (e) {
-    return {
-      status: "fail",
-      msg: `Plugin enabled         settings.json unreadable (${e instanceof Error ? e.message : "parse error"})`
-    };
+  if (user?.unreadable && !project?.enabledPlugins[PLUGIN_ID]) {
+    return { status: "fail", msg: `Plugin enabled         settings.json unreadable (${user.unreadable})` };
   }
-  const raw = settings.enabledPlugins;
-  const enabledPlugins = typeof raw === "object" && raw !== null && !Array.isArray(raw) ? raw : {};
-  const isEnabled = enabledPlugins[PLUGIN_ID] === true;
-  const legacyKeys = Object.keys(enabledPlugins).filter((k) => k.startsWith("elnora@") && k !== PLUGIN_ID);
+  const userEnabled = user?.enabledPlugins[PLUGIN_ID] === true;
+  const projectEnabled = project?.enabledPlugins[PLUGIN_ID] === true;
+  const isEnabled = userEnabled || projectEnabled;
+  const scope = projectEnabled ? userEnabled ? "user + project" : "project" : "user";
+  const legacyKeys = [
+    .../* @__PURE__ */ new Set([...Object.keys(user?.enabledPlugins ?? {}), ...Object.keys(project?.enabledPlugins ?? {})])
+  ].filter((k) => k.startsWith("elnora@") && k !== PLUGIN_ID);
   if (isEnabled && legacyKeys.length === 0) {
-    return { status: "pass", msg: `Plugin enabled         ${PLUGIN_ID}` };
+    return { status: "pass", msg: `Plugin enabled         ${PLUGIN_ID} (${scope} scope)` };
   }
   if (isEnabled && legacyKeys.length > 0) {
     return {
       status: "warn",
-      msg: `Plugin enabled         ${PLUGIN_ID} \u2014 but stale legacy entries also present: ${legacyKeys.join(", ")}`
+      msg: `Plugin enabled         ${PLUGIN_ID} (${scope} scope) \u2014 but stale legacy entries also present: ${legacyKeys.join(", ")}`
     };
   }
   if (legacyKeys.length > 0) {
@@ -1545,15 +1596,46 @@ function checkClaudePlugin() {
   }
   return { status: "fail", msg: "Plugin enabled         not found \u2014 run 'elnora setup claude'" };
 }
+function isMarketplaceRegistered() {
+  for (const file of [CLAUDE_SETTINGS_FILE, join4(process.cwd(), ".claude", "settings.json")]) {
+    if (!existsSync4(file)) continue;
+    try {
+      const settings = JSON.parse(readFileSync4(file, "utf-8"));
+      const enabled = settings.enabledPlugins;
+      if (typeof enabled === "object" && enabled !== null && enabled[PLUGIN_ID] === true) {
+        return true;
+      }
+      const extra = settings.extraKnownMarketplaces;
+      if (extra != null && JSON.stringify(extra).includes(MARKETPLACE_NAME)) return true;
+    } catch {
+    }
+  }
+  const knownMarketplaces = join4(CLAUDE_DIR, "plugins", "known_marketplaces.json");
+  if (existsSync4(knownMarketplaces)) {
+    try {
+      if (JSON.stringify(JSON.parse(readFileSync4(knownMarketplaces, "utf-8"))).includes(MARKETPLACE_NAME)) {
+        return true;
+      }
+    } catch {
+    }
+  }
+  return false;
+}
 function checkSkillsInstalled() {
   if (!existsSync4(CLAUDE_DIR)) {
     return { status: "skip", msg: "Skills installed       (Claude Code not installed)" };
   }
   const skillsDir = join4(CLAUDE_DIR, "plugins", "marketplaces", MARKETPLACE_NAME, "elnora", "skills");
   if (!existsSync4(skillsDir)) {
+    if (isMarketplaceRegistered()) {
+      return {
+        status: "warn",
+        msg: "Skills installed       registered but not cloned yet \u2014 open this folder in Claude Code once to clone"
+      };
+    }
     return {
       status: "warn",
-      msg: "Skills installed       marketplace not cloned yet \u2014 restart Claude Code to trigger clone"
+      msg: "Skills installed       marketplace not registered \u2014 run 'elnora setup claude'"
     };
   }
   const found = EXPECTED_SKILLS.filter((s) => existsSync4(join4(skillsDir, s, "SKILL.md")));
@@ -1642,16 +1724,25 @@ function addDoctorCommand(program2) {
 Elnora CLI v${VERSION}
 `);
     let passed = 0;
+    let skipped = 0;
     let failed = 0;
     let warnings = 0;
-    let total = 0;
     const tally = (r) => {
-      total++;
-      if (r.status === "pass" || r.status === "skip") passed++;
-      else if (r.status === "warn") {
-        passed++;
-        warnings++;
-      } else failed++;
+      switch (r.status) {
+        case "pass":
+          passed++;
+          break;
+        case "warn":
+          passed++;
+          warnings++;
+          break;
+        case "skip":
+          skipped++;
+          break;
+        case "fail":
+          failed++;
+          break;
+      }
     };
     console.error(section("CLI"));
     const cliChecks = [
@@ -1685,14 +1776,15 @@ Elnora CLI v${VERSION}
       tally(r);
     }
     console.error("");
-    if (failed === 0 && warnings === 0) {
+    if (failed === 0 && warnings === 0 && skipped === 0) {
       console.error("All checks passed.");
-    } else if (failed === 0) {
-      console.error(`${passed}/${total} checks passed (${warnings} warning${warnings === 1 ? "" : "s"}).`);
     } else {
-      const warnSuffix = warnings > 0 ? ` (${warnings} warning${warnings === 1 ? "" : "s"})` : "";
-      console.error(`${passed}/${total} checks passed \u2014 ${failed} failed${warnSuffix}.`);
-      if (!existsSync4(PROFILES_FILE)) console.error("\nRun: elnora auth login");
+      const parts = [`${passed} passed`];
+      if (skipped > 0) parts.push(`${skipped} skipped`);
+      if (warnings > 0) parts.push(`${warnings} warning${warnings === 1 ? "" : "s"}`);
+      if (failed > 0) parts.push(`${failed} failed`);
+      console.error(`${parts.join(", ")}.`);
+      if (failed > 0 && !existsSync4(PROFILES_FILE)) console.error("\nRun: elnora auth login");
     }
   });
 }
@@ -2017,36 +2109,21 @@ function addSetupCommand(program2) {
 init_config();
 import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
-import { chmodSync as chmodSync2, copyFileSync, createWriteStream, mkdirSync as mkdirSync4, readFileSync as readFileSync5, rmSync } from "node:fs";
+import {
+  chmodSync as chmodSync2,
+  copyFileSync,
+  createWriteStream,
+  mkdirSync as mkdirSync4,
+  readdirSync,
+  readFileSync as readFileSync5,
+  renameSync,
+  rmSync
+} from "node:fs";
 import { tmpdir } from "node:os";
 import { join as join7 } from "node:path";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import pc4 from "picocolors";
-
-// src/lib/install-method.ts
-function detectInstallMethod() {
-  const execPath = process.argv[1] ?? "";
-  if (execPath.includes("node_modules")) {
-    return "npm";
-  }
-  if (execPath.includes("/Cellar/") || execPath.includes("/homebrew/")) {
-    return "homebrew";
-  }
-  return "binary";
-}
-function getUpdateInstruction(method) {
-  switch (method) {
-    case "npm":
-      return "npm install -g @elnora-ai/cli@latest";
-    case "homebrew":
-      return "brew upgrade elnora";
-    case "binary":
-      return "elnora update --install";
-  }
-}
-
-// src/commands/update.ts
 var NPM_REGISTRY_URL2 = "https://registry.npmjs.org/@elnora-ai/cli/latest";
 var GITHUB_REPO = "Elnora-AI/elnora-cli";
 function getPlatformTarget() {
@@ -2074,6 +2151,25 @@ async function downloadToFile(url, dest) {
   const nodeStream = Readable.fromWeb(res.body);
   await pipeline(nodeStream, createWriteStream(dest));
 }
+function installWindowsBinary(srcPath, installDir) {
+  mkdirSync4(installDir, { recursive: true });
+  const dest = join7(installDir, "elnora.exe");
+  try {
+    renameSync(dest, `${dest}.old-${Date.now()}`);
+  } catch (e) {
+    if (e.code !== "ENOENT") throw e;
+  }
+  copyFileSync(srcPath, dest);
+  for (const name of readdirSync(installDir)) {
+    if (name.startsWith("elnora.exe.old-")) {
+      try {
+        rmSync(join7(installDir, name), { force: true });
+      } catch {
+      }
+    }
+  }
+  return dest;
+}
 async function installBinaryUpdate(latest) {
   const color2 = isColorEnabled();
   const platformInfo = getPlatformTarget();
@@ -2121,8 +2217,7 @@ async function installBinaryUpdate(latest) {
         `Expand-Archive -Path '${archivePath}' -DestinationPath '${extractDir}' -Force`
       ]);
       const installDir = join7(process.env.USERPROFILE ?? process.env.HOME ?? "", ".elnora", "bin");
-      mkdirSync4(installDir, { recursive: true });
-      copyFileSync(join7(extractDir, target), join7(installDir, "elnora.exe"));
+      installWindowsBinary(join7(extractDir, target), installDir);
     } else {
       execFileSync("tar", ["-xzf", archivePath, "-C", tmp]);
       const installDir = process.env.ELNORA_INSTALL_DIR ?? join7(process.env.HOME ?? "", ".local", "bin");
@@ -2183,8 +2278,10 @@ function addUpdateCommand(program2) {
     }
     try {
       await installBinaryUpdate(latest);
-    } catch {
-      console.error("Update failed. Try manually:");
+    } catch (err) {
+      const reason = err instanceof Error ? err.message : String(err);
+      console.error(`Update failed: ${reason}`);
+      console.error("Try manually:");
       console.error(
         process.platform === "win32" ? "  irm https://cli.elnora.ai/install.ps1 | iex" : "  curl -fsSL https://cli.elnora.ai/install.sh | bash"
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elnora-ai/cli",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Elnora AI Platform CLI",
   "type": "module",
   "bin": {