@elnora-ai/cli 1.5.0 → 1.5.4

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 ? "1.5.0" : process.env.npm_package_version ?? "0.0.0-dev";
+    VERSION = true ? "1.5.4" : 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";
@@ -134,7 +134,10 @@ function scrub(text) {
     }
   }
   result = result.replace(SCRUB_KEY_VALUE_RE, "[REDACTED]");
-  result = result.replace(SCRUB_LONG_TOKEN_RE, "[REDACTED]");
+  result = result.replace(SCRUB_LONG_TOKEN_RE, (match) => {
+    if (match.startsWith("elnora_live_")) return "[REDACTED]";
+    return /\d/.test(match) ? "[REDACTED]" : match;
+  });
   return result;
 }
 function scrubData(obj) {
@@ -1293,14 +1296,15 @@ var VSCODE_DIR = join2(HOME, ".vscode");
 var CODEX_DIR = join2(HOME, ".codex");
 var MARKETPLACE_NAME = "elnora-plugins";
 var MARKETPLACE_REPO = "Elnora-AI/elnora-plugins";
+var MARKETPLACE_GITHUB_URL = `https://github.com/${MARKETPLACE_REPO}`;
 var PLUGIN_ID = `elnora@${MARKETPLACE_NAME}`;
-var LEGACY_PLUGIN_IDS = ["elnora@elnora-local", "elnora@elnora-ai"];
-var LEGACY_MARKETPLACE_NAMES = ["elnora-local", "elnora-ai"];
 function readJsonFile(path) {
+  if (!existsSync2(path)) return {};
   try {
     return JSON.parse(readFileSync2(path, "utf-8"));
-  } catch {
-    return {};
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err);
+    throw new Error(`Cannot parse JSON config at ${path}: ${reason}`);
   }
 }
 function writeJsonFile(path, data) {
@@ -1756,8 +1760,27 @@ function addOpenCommand(program2) {
 init_profiles();
 
 // src/lib/setup/claude.ts
+import { spawn } from "node:child_process";
 import { existsSync as existsSync5 } from "node:fs";
-function setupClaude() {
+function runClaudeCli(args) {
+  return new Promise((resolve, reject) => {
+    const child = spawn("claude", args, {
+      stdio: "inherit",
+      shell: process.platform === "win32"
+    });
+    child.on("error", (err) => reject(err));
+    child.on("close", (code) => {
+      if (code === 0) {
+        resolve();
+        return;
+      }
+      const err = new Error(`claude ${args.join(" ")} exited with code ${code}`);
+      err.code = code ?? -1;
+      reject(err);
+    });
+  });
+}
+async function setupClaude() {
   if (!existsSync5(CLAUDE_DIR)) {
     console.error(fail("Claude Code not found (~/.claude/ does not exist)"));
     console.error("");
@@ -1765,34 +1788,40 @@ function setupClaude() {
     return false;
   }
   console.error(ok("Claude Code found"));
-  const marketplaces = readJsonFile(CLAUDE_MARKETPLACES_FILE);
-  for (const old of LEGACY_MARKETPLACE_NAMES) {
-    delete marketplaces[old];
-  }
-  marketplaces[MARKETPLACE_NAME] = {
-    source: {
-      source: "github",
-      repo: MARKETPLACE_REPO
-    }
-  };
-  writeJsonFile(CLAUDE_MARKETPLACES_FILE, marketplaces);
-  console.error(ok(`Marketplace registered (GitHub: ${MARKETPLACE_REPO})`));
-  const settings = readJsonFile(CLAUDE_SETTINGS_FILE);
-  if (!settings.enabledPlugins || typeof settings.enabledPlugins !== "object") {
-    settings.enabledPlugins = {};
-  }
-  const plugins = settings.enabledPlugins;
-  for (const old of LEGACY_PLUGIN_IDS) {
-    delete plugins[old];
-  }
-  plugins[PLUGIN_ID] = true;
-  writeJsonFile(CLAUDE_SETTINGS_FILE, settings);
-  console.error(ok(`Plugin enabled (${PLUGIN_ID})`));
+  try {
+    await runClaudeCli(["plugin", "marketplace", "add", MARKETPLACE_GITHUB_URL]);
+  } catch (err) {
+    return reportClaudeCliError(err, "marketplace add");
+  }
+  try {
+    await runClaudeCli(["plugin", "install", PLUGIN_ID]);
+  } catch (err) {
+    return reportClaudeCliError(err, "plugin install");
+  }
   console.error("");
   console.error("  Elnora skills are now available in Claude Code.");
   console.error("  Restart Claude Code if it's currently running.");
   return true;
 }
+function reportClaudeCliError(err, step) {
+  const e = err;
+  if (e?.code === "ENOENT") {
+    console.error("");
+    console.error(fail("`claude` not found on PATH"));
+    console.error("");
+    console.error("  Install Claude Code first: https://claude.ai/code");
+    console.error("  Then from a fresh terminal, run:");
+    console.error(`    claude plugin marketplace add ${MARKETPLACE_GITHUB_URL}`);
+    console.error(`    claude plugin install ${PLUGIN_ID}`);
+    return false;
+  }
+  console.error("");
+  console.error(fail(`Setup step "${step}" failed`));
+  console.error("  To retry manually:");
+  console.error(`    claude plugin marketplace add ${MARKETPLACE_GITHUB_URL}`);
+  console.error(`    claude plugin install ${PLUGIN_ID}`);
+  return false;
+}
 
 // src/lib/setup/codex.ts
 import { existsSync as existsSync6 } from "node:fs";
@@ -1806,7 +1835,14 @@ function setupCodex(apiKey) {
     return false;
   }
   console.error(ok("Codex CLI found"));
-  const config = readJsonFile(CODEX_MCP_FILE);
+  let config;
+  try {
+    config = readJsonFile(CODEX_MCP_FILE);
+  } catch (err) {
+    console.error(fail(err instanceof Error ? err.message : String(err)));
+    console.error("  Repair or delete the file and retry.");
+    return false;
+  }
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
   }
@@ -1833,7 +1869,14 @@ function setupCursor(apiKey) {
     return false;
   }
   console.error(ok("Cursor found"));
-  const config = readJsonFile(CURSOR_MCP_GLOBAL);
+  let config;
+  try {
+    config = readJsonFile(CURSOR_MCP_GLOBAL);
+  } catch (err) {
+    console.error(fail(err instanceof Error ? err.message : String(err)));
+    console.error("  Repair or delete the file and retry.");
+    return false;
+  }
   if (!config.mcpServers || typeof config.mcpServers !== "object") {
     config.mcpServers = {};
   }
@@ -1863,7 +1906,14 @@ function setupVscode(apiKey) {
     return false;
   }
   console.error(ok("VS Code found"));
-  const config = readJsonFile(VSCODE_MCP_GLOBAL);
+  let config;
+  try {
+    config = readJsonFile(VSCODE_MCP_GLOBAL);
+  } catch (err) {
+    console.error(fail(err instanceof Error ? err.message : String(err)));
+    console.error("  Repair or delete the file and retry.");
+    return false;
+  }
   if (!config.servers || typeof config.servers !== "object") {
     config.servers = {};
   }
@@ -1885,11 +1935,11 @@ function setupVscode(apiKey) {
 // src/commands/setup.ts
 var PLATFORM_SETUP = {
   claude: () => setupClaude(),
-  cursor: (key) => setupCursor(key),
-  vscode: (key) => setupVscode(key),
-  codex: (key) => setupCodex(key)
+  cursor: async (key) => setupCursor(key),
+  vscode: async (key) => setupVscode(key),
+  codex: async (key) => setupCodex(key)
 };
-function runSetup(platforms, profileName) {
+async function runSetup(platforms, profileName) {
   let apiKey;
   const needsKey = platforms.some((p) => p !== "claude");
   if (needsKey) {
@@ -1906,7 +1956,7 @@ function runSetup(platforms, profileName) {
   let anyFailed = false;
   for (const platform of platforms) {
     const setupFn = PLATFORM_SETUP[platform];
-    const success = setupFn(apiKey ?? "");
+    const success = await setupFn(apiKey ?? "");
     if (!success) anyFailed = true;
     console.error("");
   }
@@ -1916,27 +1966,27 @@ function runSetup(platforms, profileName) {
 }
 function addSetupCommand(program2) {
   const setup = program2.command("setup").description("Configure AI coding tools to use Elnora").option("--profile <name>", "API key profile to use", "default");
-  setup.command("claude").description("Set up Claude Code (skills + MCP server)").action(() => {
+  setup.command("claude").description("Set up Claude Code (skills + MCP server)").action(async () => {
     const opts = setup.opts();
     console.error("");
-    runSetup(["claude"], opts.profile);
+    await runSetup(["claude"], opts.profile);
   });
-  setup.command("cursor").description("Set up Cursor (MCP server)").action(() => {
+  setup.command("cursor").description("Set up Cursor (MCP server)").action(async () => {
     const opts = setup.opts();
     console.error("");
-    runSetup(["cursor"], opts.profile);
+    await runSetup(["cursor"], opts.profile);
   });
-  setup.command("vscode").description("Set up VS Code Copilot (MCP server)").action(() => {
+  setup.command("vscode").description("Set up VS Code Copilot (MCP server)").action(async () => {
     const opts = setup.opts();
     console.error("");
-    runSetup(["vscode"], opts.profile);
+    await runSetup(["vscode"], opts.profile);
   });
-  setup.command("codex").description("Set up OpenAI Codex (MCP server)").action(() => {
+  setup.command("codex").description("Set up OpenAI Codex (MCP server)").action(async () => {
     const opts = setup.opts();
     console.error("");
-    runSetup(["codex"], opts.profile);
+    await runSetup(["codex"], opts.profile);
   });
-  setup.action(() => {
+  setup.action(async () => {
     const opts = setup.opts();
     console.error("");
     const detected = detectPlatforms();
@@ -1955,11 +2005,11 @@ function addSetupCommand(program2) {
     }
     console.error("");
     const platforms = installed.map((p) => p.name);
-    runSetup(platforms, opts.profile);
+    await runSetup(platforms, opts.profile);
   });
-  program2.command("setup-claude").description("Set up Claude Code (alias for 'setup claude')").option("--profile <name>", "API key profile to use", "default").action((opts) => {
+  program2.command("setup-claude").description("Set up Claude Code (alias for 'setup claude')").option("--profile <name>", "API key profile to use", "default").action(async (opts) => {
     console.error("");
-    runSetup(["claude"], opts.profile);
+    await runSetup(["claude"], opts.profile);
   });
 }
 

package/package.json

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