@crmy/cli 0.5.7 → 0.5.9

package/dist/index.js

@@ -9,8 +9,8 @@ import path5 from "path";
 // src/commands/init.ts
 import { Command } from "commander";
 import crypto from "crypto";
-import fs from "fs";
-import path from "path";
+import fs2 from "fs";
+import path2 from "path";
 
 // src/spinner.ts
 var FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
@@ -69,6 +69,67 @@ function createSpinner(initialMessage) {
   };
 }
 
+// src/config.ts
+import fs from "fs";
+import path from "path";
+import os from "os";
+var CRMY_DIR = path.join(os.homedir(), ".crmy");
+var GLOBAL_CONFIG = path.join(CRMY_DIR, "config.json");
+var AUTH_FILE = path.join(CRMY_DIR, "auth.json");
+function loadConfigFile(explicitPath) {
+  if (explicitPath) {
+    try {
+      return JSON.parse(fs.readFileSync(explicitPath, "utf-8"));
+    } catch {
+      return {};
+    }
+  }
+  const localPath = path.join(process.cwd(), ".crmy.json");
+  if (fs.existsSync(localPath)) {
+    try {
+      return JSON.parse(fs.readFileSync(localPath, "utf-8"));
+    } catch {
+    }
+  }
+  try {
+    return JSON.parse(fs.readFileSync(GLOBAL_CONFIG, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+function saveConfigFile(config) {
+  const json = JSON.stringify(config, null, 2) + "\n";
+  fs.mkdirSync(CRMY_DIR, { recursive: true });
+  fs.writeFileSync(GLOBAL_CONFIG, json, { mode: 384 });
+  const localPath = path.join(process.cwd(), ".crmy.json");
+  fs.writeFileSync(localPath, json);
+}
+function loadAuthState() {
+  try {
+    const raw = fs.readFileSync(AUTH_FILE, "utf-8");
+    const state = JSON.parse(raw);
+    if (state.expiresAt && new Date(state.expiresAt) < /* @__PURE__ */ new Date()) {
+      return null;
+    }
+    return state;
+  } catch {
+    return null;
+  }
+}
+function saveAuthState(state) {
+  fs.mkdirSync(CRMY_DIR, { recursive: true });
+  fs.writeFileSync(AUTH_FILE, JSON.stringify(state, null, 2) + "\n", { mode: 384 });
+}
+function clearAuthState() {
+  try {
+    fs.unlinkSync(AUTH_FILE);
+  } catch {
+  }
+}
+function resolveServerUrl() {
+  return process.env.CRMY_SERVER_URL ?? loadAuthState()?.serverUrl ?? loadConfigFile().serverUrl;
+}
+
 // src/commands/init.ts
 function validateEmail(input) {
   return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(input.trim()) ? true : "Please enter a valid email address (e.g. you@example.com)";
@@ -86,8 +147,8 @@ function initCommand() {
     console.log("    Step 1 \u2014 Connect to your PostgreSQL database");
     console.log("    Step 2 \u2014 Create all CRMy tables (migrations)");
     console.log("    Step 3 \u2014 Create your admin account\n");
-    const configPath = path.join(process.cwd(), ".crmy.json");
-    if (fs.existsSync(configPath)) {
+    const localConfigPath = path2.join(process.cwd(), ".crmy.json");
+    if (fs2.existsSync(localConfigPath)) {
       console.log("  \x1B[33m\u26A0\x1B[0m  A .crmy.json already exists in this directory.\n");
       const { overwrite } = await inquirer.prompt([
         {
@@ -243,11 +304,11 @@ function initCommand() {
           autoApproveSeconds: 0
         }
       };
-      fs.writeFileSync(configPath, JSON.stringify(crmmyConfig, null, 2) + "\n");
-      const gitignorePath = path.join(process.cwd(), ".gitignore");
-      const gitignoreContent = fs.existsSync(gitignorePath) ? fs.readFileSync(gitignorePath, "utf-8") : "";
+      saveConfigFile(crmmyConfig);
+      const gitignorePath = path2.join(process.cwd(), ".gitignore");
+      const gitignoreContent = fs2.existsSync(gitignorePath) ? fs2.readFileSync(gitignorePath, "utf-8") : "";
       if (!gitignoreContent.includes(".crmy.json")) {
-        fs.appendFileSync(gitignorePath, "\n.crmy.json\n");
+        fs2.appendFileSync(gitignorePath, "\n.crmy.json\n");
       }
     } catch (err) {
       spinner.fail("Failed to create admin account");
@@ -277,47 +338,6 @@ import { createRequire } from "module";
 import { fileURLToPath } from "url";
 import path4 from "path";
 
-// src/config.ts
-import fs2 from "fs";
-import path2 from "path";
-import os from "os";
-var AUTH_DIR = path2.join(os.homedir(), ".crmy");
-var AUTH_FILE = path2.join(AUTH_DIR, "auth.json");
-function loadConfigFile() {
-  const configPath = path2.join(process.cwd(), ".crmy.json");
-  try {
-    const raw = fs2.readFileSync(configPath, "utf-8");
-    return JSON.parse(raw);
-  } catch {
-    return {};
-  }
-}
-function loadAuthState() {
-  try {
-    const raw = fs2.readFileSync(AUTH_FILE, "utf-8");
-    const state = JSON.parse(raw);
-    if (state.expiresAt && new Date(state.expiresAt) < /* @__PURE__ */ new Date()) {
-      return null;
-    }
-    return state;
-  } catch {
-    return null;
-  }
-}
-function saveAuthState(state) {
-  fs2.mkdirSync(AUTH_DIR, { recursive: true });
-  fs2.writeFileSync(AUTH_FILE, JSON.stringify(state, null, 2) + "\n", { mode: 384 });
-}
-function clearAuthState() {
-  try {
-    fs2.unlinkSync(AUTH_FILE);
-  } catch {
-  }
-}
-function resolveServerUrl() {
-  return process.env.CRMY_SERVER_URL ?? loadAuthState()?.serverUrl ?? loadConfigFile().serverUrl;
-}
-
 // src/banner.ts
 var ASCII_ART = `
 
@@ -537,19 +557,35 @@ function serverCommand() {
 import { Command as Command3 } from "commander";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 function mcpCommand() {
-  return new Command3("mcp").description("Start stdio MCP server (for Claude Code)").action(async () => {
-    const config = loadConfigFile();
+  return new Command3("mcp").description("Start stdio MCP server (for Claude Code)").option("--config <path>", "Explicit path to a .crmy.json config file").action(async (opts) => {
+    const config = loadConfigFile(opts.config);
     const databaseUrl = process.env.DATABASE_URL ?? config.database?.url;
     const apiKey = process.env.CRMY_API_KEY ?? config.apiKey;
     if (!databaseUrl) {
-      console.error("No database URL. Run `crmy init` first or set DATABASE_URL.");
+      process.stderr.write(
+        "[crmy mcp] No database URL found.\n  Run `npx @crmy/cli init` first, or pass --config <path>.\n  Config lookup order:\n    1. process.cwd()/.crmy.json\n    2. ~/.crmy/config.json  (written by init)\n"
+      );
       process.exit(1);
     }
     process.env.CRMY_IMPORTED = "1";
-    const { initPool, createMcpServer } = await import("@crmy/server");
-    const { runMigrations } = await import("@crmy/server");
-    const db = await initPool(databaseUrl);
-    await runMigrations(db);
+    const { initPool, createMcpServer, runMigrations } = await import("@crmy/server");
+    let db;
+    try {
+      db = await initPool(databaseUrl);
+    } catch (err) {
+      process.stderr.write(
+        `[crmy mcp] Failed to connect to database: ${err.message}
+`
+      );
+      process.exit(1);
+    }
+    try {
+      await runMigrations(db);
+    } catch (err) {
+      process.stderr.write(`[crmy mcp] Migration error: ${err.message}
+`);
+      process.exit(1);
+    }
     let actor = {
       tenant_id: "",
       actor_id: "cli-agent",
@@ -576,11 +612,19 @@ function mcpCommand() {
       }
     }
     if (!actor.tenant_id) {
-      const tenantResult = await db.query("SELECT id FROM tenants WHERE slug = 'default' LIMIT 1");
+      const tenantResult = await db.query(
+        "SELECT id FROM tenants WHERE slug = 'default' LIMIT 1"
+      );
       if (tenantResult.rows.length > 0) {
         actor.tenant_id = tenantResult.rows[0].id;
       }
     }
+    if (!actor.tenant_id) {
+      process.stderr.write(
+        "[crmy mcp] No tenant found in database.\n  Run `npx @crmy/cli init` to set up the database.\n"
+      );
+      process.exit(1);
+    }
     const server = createMcpServer(db, () => actor);
     const transport = new StdioServerTransport();
     await server.connect(transport);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crmy/cli",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "CRMy CLI — Local CLI + stdio MCP server",
   "type": "module",
   "files": [