@apexmcp/cli 0.1.1

package/dist/cli.js

@@ -0,0 +1,2600 @@
+#!/usr/bin/env node
+import {
+  loadEnvFile
+} from "./chunk-BWPU5TUK.js";
+
+// src/cli.ts
+import { Command } from "commander";
+
+// src/commands/deploy.ts
+import { existsSync as existsSync3 } from "fs";
+import { resolve } from "path";
+
+// src/utils/logger.ts
+import { Logger } from "@apexmcp/logger";
+var logger = new Logger();
+
+// src/utils/cli-io.ts
+function isJsonMode(options) {
+  return !!options?.json || process.env.CI === "true" || process.env.GITHUB_ACTIONS === "true";
+}
+function createLogger(options) {
+  if (isJsonMode(options)) {
+    return {
+      debug: () => {
+      },
+      info: () => {
+      },
+      warn: (message, ...args) => {
+        console.error(message, ...args);
+      },
+      error: (message, ...args) => {
+        console.error(message, ...args);
+      }
+    };
+  }
+  return logger;
+}
+function withStdoutSuppressed(enabled, fn) {
+  if (!enabled) return fn();
+  const originalLog = console.log;
+  const originalInfo = console.info;
+  const originalDebug = console.debug;
+  try {
+    console.log = () => {
+    };
+    console.info = () => {
+    };
+    console.debug = () => {
+    };
+    return fn();
+  } finally {
+    console.log = originalLog;
+    console.info = originalInfo;
+    console.debug = originalDebug;
+  }
+}
+
+// src/utils/validate-mcp-project.ts
+import { existsSync, readdirSync, readFileSync, statSync } from "fs";
+import { join } from "path";
+import { execSync } from "child_process";
+async function createDeploymentBundleSmart(projectPath, entryPoint) {
+  console.log("\u{1F680} Starting smart deployment bundling...");
+  const buildResult = await tryBuildProject(projectPath);
+  if (buildResult.success && buildResult.outputPath) {
+    console.log("\u{1F4E6} Using built artifact for bundling");
+    const bundleResult = await bundleBuiltArtifactSmart(buildResult.outputPath, projectPath);
+    if (bundleResult.success) {
+      return bundleResult;
+    }
+    console.log("\u26A0\uFE0F Built artifact bundling failed, trying source bundling");
+  }
+  console.log("\u{1F4E6} Attempting source bundling with Deno configuration");
+  const sourceBundleResult = await bundleSourceWithDenoConfig(projectPath, entryPoint);
+  if (sourceBundleResult.success) {
+    return sourceBundleResult;
+  }
+  console.log("\u26A0\uFE0F Source bundling failed, falling back to direct source copy");
+  return await copySourceDirectlySmart(projectPath, entryPoint);
+}
+async function tryBuildProject(projectPath) {
+  const packageJsonPath = join(projectPath, "package.json");
+  if (existsSync(packageJsonPath)) {
+    try {
+      const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+      if (packageJson.scripts?.build) {
+        console.log(`\u{1F528} Running npm build script: ${packageJson.scripts.build}`);
+        execSync("npm run build", {
+          cwd: projectPath,
+          stdio: "inherit",
+          env: { ...process.env, NODE_ENV: "production" }
+        });
+        const possibleOutputs = ["dist/main.ts", "dist/index.ts", "build/main.ts", "build/index.ts"];
+        for (const output of possibleOutputs) {
+          const outputPath = join(projectPath, output);
+          if (existsSync(outputPath)) {
+            return { success: true, outputPath, errors: [] };
+          }
+        }
+      }
+    } catch (error) {
+      console.log(`\u26A0\uFE0F Build script failed: ${error.message}`);
+    }
+  }
+  const denoJsonPath = join(projectPath, "deno.json");
+  const denoJsoncPath = join(projectPath, "deno.jsonc");
+  const denoConfigPath = existsSync(denoJsonPath) ? denoJsonPath : existsSync(denoJsoncPath) ? denoJsoncPath : null;
+  if (denoConfigPath) {
+    try {
+      const denoConfig = JSON.parse(readFileSync(denoConfigPath, "utf-8"));
+      if (denoConfig.tasks?.build) {
+        console.log(`\u{1F528} Running deno task build: ${denoConfig.tasks.build}`);
+        execSync("deno task build", {
+          cwd: projectPath,
+          stdio: "inherit",
+          env: { ...process.env, NODE_ENV: "production" }
+        });
+        const possibleOutputs = ["dist/main.ts", "dist/index.ts"];
+        for (const output of possibleOutputs) {
+          const outputPath = join(projectPath, output);
+          if (existsSync(outputPath)) {
+            return { success: true, outputPath, errors: [] };
+          }
+        }
+      }
+    } catch (error) {
+      console.log(`\u26A0\uFE0F Deno build task failed: ${error.message}`);
+    }
+  }
+  return { success: false, errors: ["No build script found or build failed"] };
+}
+async function bundleBuiltArtifactSmart(artifactPath, projectPath) {
+  try {
+    const denoConfig = loadDenoConfigForBundling(projectPath);
+    const permissions = inferDenoPermissions(projectPath);
+    const bundleArgs = [
+      "deno bundle",
+      "--quiet",
+      "--allow-import",
+      ...denoConfig.configArgs,
+      artifactPath
+    ];
+    console.log(`\u{1F4E6} Bundling built artifact: ${artifactPath}`);
+    const bundleCmd = bundleArgs.join(" ");
+    const bundledCode = execSync(bundleCmd, {
+      cwd: projectPath,
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    console.log(`\u2705 Successfully bundled ${bundledCode.length} characters from built artifact`);
+    return {
+      success: true,
+      code: bundledCode,
+      files: {
+        "main.ts": {
+          content: bundledCode,
+          encoding: "utf-8"
+        }
+      },
+      errors: [],
+      method: "built-artifact"
+    };
+  } catch (error) {
+    console.log(`\u26A0\uFE0F Built artifact bundling failed: ${error.message}`);
+    return {
+      success: false,
+      files: {},
+      errors: [error.message],
+      method: "built-artifact"
+    };
+  }
+}
+async function bundleSourceWithDenoConfig(projectPath, entryPoint) {
+  try {
+    const denoConfig = loadDenoConfigForBundling(projectPath);
+    const permissions = inferDenoPermissions(projectPath);
+    const bundleArgs = [
+      "deno bundle",
+      "--quiet",
+      "--allow-import",
+      ...denoConfig.configArgs,
+      entryPoint
+    ];
+    console.log(`\u{1F4E6} Bundling source with Deno config: ${entryPoint}`);
+    const bundleCmd = bundleArgs.join(" ");
+    const bundledCode = execSync(bundleCmd, {
+      cwd: projectPath,
+      encoding: "utf-8",
+      stdio: "pipe"
+    });
+    console.log(`\u2705 Successfully bundled ${bundledCode.length} characters from source`);
+    return {
+      success: true,
+      code: bundledCode,
+      files: {
+        "main.ts": {
+          content: bundledCode,
+          encoding: "utf-8"
+        }
+      },
+      errors: [],
+      method: "source-bundle"
+    };
+  } catch (error) {
+    console.log(`\u26A0\uFE0F Source bundling failed: ${error.message}`);
+    return {
+      success: false,
+      files: {},
+      errors: [error.message],
+      method: "source-bundle"
+    };
+  }
+}
+async function copySourceDirectlySmart(projectPath, entryPoint) {
+  try {
+    console.log(`\u{1F4C4} Using source file directly: ${entryPoint}`);
+    const sourcePath = join(projectPath, entryPoint);
+    const sourceContent = readFileSync(sourcePath, "utf-8");
+    const fileName = entryPoint.split("/").pop() || "main.ts";
+    const files = {
+      [fileName]: {
+        content: sourceContent,
+        encoding: "utf-8"
+      }
+    };
+    if (entryPoint.startsWith("dist/") && sourceContent.includes("../src/")) {
+      console.log("\u{1F4E6} Including src/ directory files for deployment");
+      await includeSourceDirectorySmart(projectPath, files);
+    }
+    return {
+      success: true,
+      code: sourceContent,
+      files,
+      errors: [],
+      method: "direct-copy"
+    };
+  } catch (error) {
+    console.log(`\u274C Failed to copy source file: ${error.message}`);
+    return {
+      success: false,
+      files: {},
+      errors: [error.message],
+      method: "direct-copy"
+    };
+  }
+}
+function inferDenoPermissions(projectPath) {
+  const permissions = ["read"];
+  try {
+    const packageJsonPath = join(projectPath, "package.json");
+    if (existsSync(packageJsonPath)) {
+      const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+      const deps = { ...packageJson.dependencies, ...packageJson.devDependencies };
+      if (deps.dotenv || deps["dotenv-cli"] || packageJson.scripts?.build?.includes("NODE_ENV")) {
+        permissions.push("env");
+      }
+      if (deps["fs-extra"] || deps.mkdirp) {
+        permissions.push("write");
+      }
+      if (deps.axios || deps.node || deps["node-fetch"] || deps.hono) {
+        permissions.push("net");
+      }
+    }
+    const denoJsonPath = join(projectPath, "deno.json");
+    const denoJsoncPath = join(projectPath, "deno.jsonc");
+    const denoConfigPath = existsSync(denoJsonPath) ? denoJsonPath : existsSync(denoJsoncPath) ? denoJsoncPath : null;
+    if (denoConfigPath) {
+      try {
+        const config = JSON.parse(readFileSync(denoConfigPath, "utf-8"));
+        if (config.deploy) {
+          permissions.push("net");
+        }
+      } catch (error) {
+      }
+    }
+  } catch (error) {
+    console.log(`\u26A0\uFE0F Error inferring permissions: ${error.message}`);
+  }
+  return [...new Set(permissions)];
+}
+async function includeSourceDirectorySmart(projectPath, files) {
+  const srcPath = join(projectPath, "src");
+  function addDirectory(dirPath, relativePath = "") {
+    const items = readdirSync(dirPath);
+    for (const item of items) {
+      const itemPath = join(dirPath, item);
+      const itemRelativePath = relativePath ? `${relativePath}/${item}` : item;
+      const stat = statSync(itemPath);
+      if (stat.isDirectory()) {
+        if (item !== "dev") {
+          addDirectory(itemPath, itemRelativePath);
+        }
+      } else if (stat.isFile() && (item.endsWith(".ts") || item.endsWith(".js"))) {
+        const content = readFileSync(itemPath, "utf-8");
+        files[`src/${itemRelativePath}`] = {
+          content,
+          encoding: "utf-8"
+        };
+      }
+    }
+  }
+  if (existsSync(srcPath)) {
+    addDirectory(srcPath);
+  }
+}
+async function deployDenoSourceFiles(projectPath, entryPoint) {
+  const files = {};
+  const denoJsonPath = join(projectPath, "deno.json");
+  if (existsSync(denoJsonPath)) {
+    files["deno.json"] = {
+      content: readFileSync(denoJsonPath, "utf-8"),
+      encoding: "utf-8"
+    };
+  }
+  function addDirectory(dirPath, relativePath = "") {
+    const items = readdirSync(dirPath);
+    for (const item of items) {
+      const itemPath = join(dirPath, item);
+      const itemRelativePath = relativePath ? `${relativePath}/${item}` : item;
+      const stat = statSync(itemPath);
+      if (stat.isDirectory()) {
+        if (!["node_modules", ".git", "dist", "coverage", ".swc", "dev"].includes(item)) {
+          addDirectory(itemPath, itemRelativePath);
+        }
+      } else if (stat.isFile()) {
+        const ext = item.split(".").pop()?.toLowerCase();
+        if (["ts", "js", "json", "txt", "md"].includes(ext || "")) {
+          files[itemRelativePath] = {
+            content: readFileSync(itemPath, "utf-8"),
+            encoding: "utf-8"
+          };
+        } else {
+          const buffer = readFileSync(itemPath);
+          files[itemRelativePath] = {
+            content: buffer.toString("base64"),
+            encoding: "base64"
+          };
+        }
+      }
+    }
+  }
+  if (existsSync(join(projectPath, "src"))) {
+    addDirectory(join(projectPath, "src"), "src");
+  }
+  const rootFiles = ["package.json", "import_map.json", "README.md"];
+  for (const file of rootFiles) {
+    const filePath = join(projectPath, file);
+    if (existsSync(filePath)) {
+      files[file] = {
+        content: readFileSync(filePath, "utf-8"),
+        encoding: "utf-8"
+      };
+    }
+  }
+  console.log(`\u{1F50D} Deno Deploy Source: entrypoint="${entryPoint}", files=${Object.keys(files).length}`);
+  console.log(`\u{1F4C1} Included files: ${Object.keys(files).sort().join(", ")}`);
+  return { entryPoint, files };
+}
+function loadDenoConfigForBundling(projectPath) {
+  const denoJsonPath = join(projectPath, "deno.json");
+  const denoJsoncPath = join(projectPath, "deno.jsonc");
+  const configPath = existsSync(denoJsonPath) ? denoJsonPath : existsSync(denoJsoncPath) ? denoJsoncPath : null;
+  if (!configPath) {
+    return { configArgs: [] };
+  }
+  try {
+    const config = JSON.parse(readFileSync(configPath, "utf-8"));
+    const configArgs = [`--config`, configPath];
+    if (config.importMap) {
+      const importMapPath = join(projectPath, config.importMap);
+      if (existsSync(importMapPath)) {
+        configArgs.push("--import-map", importMapPath);
+      }
+    }
+    return { configArgs, importMap: config.importMap };
+  } catch (error) {
+    console.log(`\u26A0\uFE0F Failed to load Deno config: ${error.message}`);
+    return { configArgs: [] };
+  }
+}
+async function validateMCPProject(projectPath) {
+  const denoJsonPath = join(projectPath, "deno.json");
+  const denoJsoncPath = join(projectPath, "deno.jsonc");
+  const packageJsonPath = join(projectPath, "package.json");
+  let configPath = null;
+  let configType = null;
+  let config = null;
+  if (existsSync(denoJsonPath)) {
+    configPath = denoJsonPath;
+    configType = "deno";
+    config = JSON.parse(readFileSync(configPath, "utf-8"));
+  } else if (existsSync(denoJsoncPath)) {
+    configPath = denoJsoncPath;
+    configType = "deno";
+    config = JSON.parse(readFileSync(configPath, "utf-8"));
+  } else if (existsSync(packageJsonPath)) {
+    configPath = packageJsonPath;
+    configType = "package";
+    config = JSON.parse(readFileSync(configPath, "utf-8"));
+  }
+  let entryPoint = null;
+  if (config) {
+    if (configType === "deno") {
+      entryPoint = config.main || config.entryPoint;
+      if (!entryPoint && config.deploy?.entrypoint) {
+        entryPoint = config.deploy.entrypoint;
+      }
+    } else if (configType === "package") {
+      entryPoint = config.main || config.module;
+      if (!entryPoint && config.exports) {
+        if (typeof config.exports === "string") {
+          entryPoint = config.exports;
+        } else if (config.exports["."]) {
+          const dotExport = config.exports["."];
+          if (typeof dotExport === "string") {
+            entryPoint = dotExport;
+          } else if (dotExport.import) {
+            entryPoint = dotExport.import;
+          } else if (dotExport.default) {
+            entryPoint = dotExport.default;
+          }
+        }
+      }
+    }
+  }
+  if (!entryPoint) {
+    const commonEntryPoints = [
+      "main.ts",
+      "main.js",
+      "index.ts",
+      "index.js",
+      "server.ts",
+      "server.js",
+      "app.ts",
+      "app.js"
+    ];
+    for (const candidate of commonEntryPoints) {
+      const candidatePath = join(projectPath, candidate);
+      if (existsSync(candidatePath)) {
+        entryPoint = candidate;
+        break;
+      }
+    }
+  }
+  if (!entryPoint) {
+    throw new Error(
+      "No entry point found. Please specify one in deno.json/package.json or use a common filename like main.ts, index.ts, server.ts, or app.ts"
+    );
+  }
+  const hasDenoDeployConfig = configType === "deno" && config?.deploy?.entrypoint;
+  const resolvedEntryPointPath = join(projectPath, entryPoint);
+  if (hasDenoDeployConfig && existsSync(resolvedEntryPointPath)) {
+    console.log(`\u{1F680} Deno Deploy project detected, deploying source files with entrypoint: ${entryPoint}`);
+    return await deployDenoSourceFiles(projectPath, entryPoint);
+  }
+  console.log(`\u{1F4E6} No Deno Deploy configuration found, using legacy bundling approach`);
+  const distDir = join(projectPath, "dist");
+  const entryPointFilename = entryPoint.split("/").pop() || "main.ts";
+  const distEntryPointPath = join(distDir, entryPointFilename);
+  let finalEntryPoint = entryPoint;
+  let entryPointPath = join(projectPath, entryPoint);
+  if (existsSync(distDir) && existsSync(distEntryPointPath)) {
+    finalEntryPoint = `dist/${entryPointFilename}`;
+    entryPointPath = distEntryPointPath;
+    console.log(`\u{1F4E6} Using built dist entrypoint: ${finalEntryPoint}`);
+  } else {
+    if (!existsSync(entryPointPath)) {
+      throw new Error(`Entry point file not found: ${entryPoint}`);
+    }
+    console.log(`\u{1F4E6} Using source entrypoint: ${entryPoint}`);
+  }
+  const bundleResult = await createDeploymentBundleSmart(projectPath, finalEntryPoint);
+  if (!bundleResult.success) {
+    throw new Error(`Failed to create deployment bundle: ${bundleResult.errors.join(", ")}`);
+  }
+  const files = {};
+  Object.assign(files, bundleResult.files);
+  finalEntryPoint = "main.ts";
+  const denoJsonFilePath = join(projectPath, "deno.json");
+  if (existsSync(denoJsonFilePath)) {
+    const denoJsonContent = readFileSync(denoJsonFilePath, "utf-8");
+    const denoJson = JSON.parse(denoJsonContent);
+    if (denoJson.deploy?.entrypoint) {
+      denoJson.deploy.entrypoint = finalEntryPoint;
+    }
+    if (denoJson.main) {
+      denoJson.main = finalEntryPoint;
+    }
+    files["deno.json"] = {
+      content: JSON.stringify(denoJson, null, 2),
+      encoding: "utf-8"
+    };
+  }
+  console.log(`\u{1F50D} CLI Result: entrypoint="${finalEntryPoint}", files=${Object.keys(files).length}`);
+  console.log(`\u{1F4C1} Included files: ${Object.keys(files).sort().join(", ")}`);
+  return { entryPoint: finalEntryPoint, files };
+}
+
+// src/utils/config.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync, mkdirSync } from "fs";
+import { join as join2 } from "path";
+import { homedir } from "os";
+var CONFIG_DIR = join2(homedir(), ".apexmcp");
+var CONFIG_FILE = join2(CONFIG_DIR, "config.json");
+var DEFAULT_CONFIG = {
+  version: "0.1.0",
+  endpoints: {
+    core: "https://core.apexmcp.dev",
+    deploy: "https://deploy.apexmcp.dev"
+  },
+  auth: {},
+  preferences: {
+    json: false,
+    verbose: false
+  }
+};
+var ConfigManager = class {
+  config;
+  constructor() {
+    this.config = this.loadConfig();
+  }
+  loadConfig() {
+    try {
+      if (existsSync2(CONFIG_FILE)) {
+        const data = readFileSync2(CONFIG_FILE, "utf-8");
+        const parsed = JSON.parse(data);
+        return { ...DEFAULT_CONFIG, ...parsed };
+      }
+    } catch (error) {
+      console.warn("Failed to load config file, using defaults:", error);
+    }
+    return { ...DEFAULT_CONFIG };
+  }
+  saveConfig() {
+    try {
+      mkdirSync(CONFIG_DIR, { recursive: true });
+      writeFileSync(CONFIG_FILE, JSON.stringify(this.config, null, 2));
+    } catch (error) {
+      console.error("Failed to save config:", error);
+      throw new Error("Could not save configuration");
+    }
+  }
+  getConfig() {
+    return { ...this.config };
+  }
+  updateConfig(updates) {
+    this.config = { ...this.config, ...updates };
+    this.saveConfig();
+  }
+  setEndpoint(service, url) {
+    this.config.endpoints[service] = url;
+    this.saveConfig();
+  }
+  setAuth(token, refreshToken, expiresAt) {
+    this.config.auth = { token, refreshToken, expiresAt };
+    this.saveConfig();
+  }
+  getToken() {
+    return this.config.auth.token;
+  }
+  clearAuth() {
+    this.config.auth = {};
+    this.saveConfig();
+  }
+  setPreference(key, value) {
+    this.config.preferences[key] = value;
+    this.saveConfig();
+  }
+  getPreference(key) {
+    return this.config.preferences[key];
+  }
+  isAuthenticated() {
+    const token = this.getToken();
+    if (!token) return false;
+    if (this.config.auth.expiresAt) {
+      const expiresAt = new Date(this.config.auth.expiresAt);
+      if (expiresAt < /* @__PURE__ */ new Date()) {
+        this.clearAuth();
+        return false;
+      }
+    }
+    return true;
+  }
+};
+var configManager = new ConfigManager();
+
+// src/commands/deploy.ts
+var DeployService = class {
+  constructor(fs = { existsSync: existsSync3 }, path = { resolve }, envLoader = { loadEnvFile }, validator = { validateMCPProject }, fetchClient = { fetch: global.fetch }, log = logger) {
+    this.fs = fs;
+    this.path = path;
+    this.envLoader = envLoader;
+    this.validator = validator;
+    this.fetchClient = fetchClient;
+    this.log = log;
+  }
+  validateProjectPath(projectPath) {
+    const resolvedPath = this.path.resolve(projectPath);
+    if (!this.fs.existsSync(resolvedPath)) {
+      throw new Error(`Project path does not exist: ${resolvedPath}`);
+    }
+    return resolvedPath;
+  }
+  async validateProjectStructure(projectPath) {
+    return await this.validator.validateMCPProject(projectPath);
+  }
+  async loadEnvironmentVariables(envFile) {
+    if (!envFile) {
+      return {};
+    }
+    return await this.envLoader.loadEnvFile(envFile);
+  }
+  prepareDeploymentData(resolvedPath, projectData, envVars, options) {
+    const formData = new FormData();
+    const projectIdentifier = options.projectPath || resolvedPath.split("/").pop() || "unnamed-project";
+    formData.append("projectPath", projectIdentifier);
+    const effectiveEntryPoint = options.entryPoint || projectData.entryPoint;
+    formData.append("entryPoint", effectiveEntryPoint);
+    if (options.domain) {
+      formData.append("domain", options.domain);
+    }
+    if (options.urlStrategy) {
+      formData.append("urlStrategy", options.urlStrategy);
+    }
+    if (options.projectName) {
+      formData.append("projectName", options.projectName);
+    }
+    if (Object.keys(envVars).length > 0) {
+      const envContent = Object.entries(envVars).map(([key, value]) => `${key}=${value}`).join("\n");
+      formData.append(
+        "envFile",
+        new Blob([envContent], { type: "text/plain" }),
+        "env"
+      );
+    }
+    for (const [filename, fileData] of Object.entries(projectData.files)) {
+      const mimeType = fileData.encoding === "base64" ? "application/octet-stream" : "text/plain";
+      formData.append(
+        "files",
+        new Blob([fileData.content], { type: mimeType }),
+        filename
+      );
+    }
+    return {
+      projectIdentifier,
+      entryPoint: effectiveEntryPoint,
+      envVars,
+      formData
+    };
+  }
+  async executeDeployment(endpoint, formData, token) {
+    const headers = {};
+    if (token) {
+      headers["Authorization"] = `Bearer ${token}`;
+    }
+    this.log.info("\u{1F4E6} Initiating deployment...");
+    const response = await this.fetchClient.fetch(`${endpoint}/api/deploy`, {
+      method: "POST",
+      body: formData,
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Deployment failed: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (result.denoDeploymentId && result.deployment?.status !== "success") {
+      this.log.info("\u{1F50D} Monitoring deployment progress...");
+      const monitorResult = await this.monitorDeployment(endpoint, result.denoDeploymentId, token);
+      if (monitorResult.status === "failed") {
+        this.log.error("\u274C Build failed - check the logs above for error details");
+      }
+    }
+    return result;
+  }
+  /**
+   * Monitor deployment progress with real-time logs and status updates
+   */
+  async monitorDeployment(endpoint, deploymentId, token) {
+    const headers = {};
+    if (token) {
+      headers["Authorization"] = `Bearer ${token}`;
+    }
+    let lastStatus = "pending";
+    const collectedLogs = [];
+    let buildLogsReceived = 0;
+    const maxWaitTime = 5 * 60 * 1e3;
+    const pollInterval = 2e3;
+    const startTime = Date.now();
+    while (Date.now() - startTime < maxWaitTime) {
+      try {
+        const statusResponse = await this.fetchClient.fetch(
+          `${endpoint}/api/deployments/${deploymentId}/status`,
+          { headers }
+        );
+        if (statusResponse.ok) {
+          const statusData = await statusResponse.json();
+          const currentStatus = statusData?.status?.status;
+          if (currentStatus !== lastStatus) {
+            this.log.info(`\u{1F4CA} Deployment status: ${currentStatus}`);
+            lastStatus = currentStatus;
+          }
+          if (currentStatus === "success") {
+            this.log.info("\u2705 Deployment completed successfully!");
+            return { status: currentStatus, logs: collectedLogs };
+          } else if (currentStatus === "failed") {
+            this.log.error("\u274C Deployment failed!");
+            if (collectedLogs.length === 0) {
+              try {
+                const logsResponse2 = await this.fetchClient.fetch(
+                  `${endpoint}/api/deployments/${deploymentId}/logs/build`,
+                  { headers }
+                );
+                if (logsResponse2.ok) {
+                  const logsData = await logsResponse2.json();
+                  if (logsData?.logs && Array.isArray(logsData.logs)) {
+                    logsData.logs.forEach((log) => {
+                      const logMessage = `${log.level.toUpperCase()}: ${log.message}`;
+                      collectedLogs.push(logMessage);
+                      this.log.error(`\u{1F534} ${log.message}`);
+                    });
+                  }
+                }
+              } catch (error) {
+                this.log.debug("Could not fetch build logs for failed deployment", error);
+              }
+            }
+            if (collectedLogs.length > 0) {
+              this.log.info("\u{1F4CB} Build logs:");
+              collectedLogs.forEach((log) => this.log.info(`   ${log}`));
+            } else {
+              this.log.info("\u{1F4CB} No build logs available");
+            }
+            return { status: currentStatus, logs: collectedLogs };
+          }
+        }
+        const logsResponse = await this.fetchClient.fetch(
+          `${endpoint}/api/deployments/${deploymentId}/logs/build?since=${new Date(Date.now() - 3e4).toISOString()}`,
+          { headers }
+        );
+        if (logsResponse.ok) {
+          const logsData = await logsResponse.json();
+          if (logsData?.logs && Array.isArray(logsData.logs)) {
+            for (const log of logsData.logs) {
+              const logMessage = `${log.level.toUpperCase()}: ${log.message}`;
+              collectedLogs.push(logMessage);
+              if (log.level === "error") {
+                this.log.error(`\u{1F534} ${log.message}`);
+              } else if (log.level === "warn") {
+                this.log.warn(`\u{1F7E1} ${log.message}`);
+              } else {
+                this.log.info(`\u2139\uFE0F  ${log.message}`);
+              }
+            }
+          }
+        }
+      } catch (error) {
+        this.log.debug("Monitoring error (continuing):", error);
+      }
+      await new Promise((resolve3) => setTimeout(resolve3, pollInterval));
+    }
+    if (Date.now() - startTime >= maxWaitTime) {
+      this.log.warn("\u23F0 Deployment monitoring timed out, but deployment may still be in progress");
+      return { status: "timeout", logs: collectedLogs };
+    }
+    return { status: lastStatus, logs: collectedLogs };
+  }
+  async handleResponse(result, options) {
+    const outputJson = isJsonMode(options);
+    if (outputJson) {
+      console.log(JSON.stringify(result));
+    } else {
+      if (result.success && result.urls && result.deployment) {
+        this.log.info("\u{1F389} Deployment successful!");
+        this.log.info(`\u{1F310} URL: ${result.urls.primary}`);
+        this.log.info(`\u{1F4CB} Deployment ID: ${result.deployment.id}`);
+        this.log.info(`\u{1F4CA} Status: ${result.deployment.status}`);
+        if (result.project) {
+          this.log.info(`\u{1F3D7}\uFE0F  Project: ${result.project.name}`);
+        }
+        if (result.domainAttachment) {
+          this.log.info(`\u{1F310} Domain attachment: ${result.domainAttachment.note}`);
+        }
+        this.log.info("\n\u{1F4DA} Next steps:");
+        this.log.info("1. Test your MCP server at the URLs above");
+        this.log.info("2. Configure your MCP client to connect to this endpoint");
+        this.log.info("3. Monitor deployment status if needed");
+      } else if (result.error) {
+        this.log.error("\u274C Deployment failed:", result.error);
+      } else {
+        this.log.error("\u274C Deployment failed: Unknown error");
+      }
+    }
+  }
+  async deploy(projectPath, options) {
+    try {
+      this.log.info("\u{1F680} Starting MCP server deployment...");
+      this.log.info(`\u{1F4C1} Project directory: ${projectPath}`);
+      const config = configManager.getConfig();
+      const effectiveOptions = {
+        ...options,
+        endpoint: options.endpoint || config.endpoints.deploy,
+        token: options.token || config.auth.token
+      };
+      if (!effectiveOptions.token) {
+        throw new Error(
+          'Authentication required. Please login first with "apexmcp login" or provide --token'
+        );
+      }
+      const resolvedPath = this.validateProjectPath(projectPath);
+      const projectData = await withStdoutSuppressed(
+        isJsonMode(options),
+        () => this.validateProjectStructure(resolvedPath)
+      );
+      if (options.entryPoint) {
+        const override = options.entryPoint.trim();
+        if (!override) {
+          throw new Error("--entry-point cannot be empty");
+        }
+        if (!projectData.files[override]) {
+          const overridePath = `${resolvedPath}/${override}`;
+          if (!this.fs.existsSync(overridePath)) {
+            throw new Error(
+              `Entry point override not found in packaged files and does not exist on disk: ${override}`
+            );
+          }
+          throw new Error(
+            `Entry point override exists on disk but was not included in packaged files: ${override}. Ensure it is reachable by your project config (deno.json/package.json) or use the auto-detected entry point.`
+          );
+        }
+        projectData.entryPoint = override;
+      }
+      this.log.info(`\u2705 Entry point: ${projectData.entryPoint}`);
+      const envVars = await this.loadEnvironmentVariables(options.envFile);
+      if (options.envFile) {
+        this.log.info(
+          `\u{1F4C4} Loading environment variables from: ${options.envFile}`
+        );
+        this.log.info(
+          `\u2705 Loaded ${Object.keys(envVars).length} environment variables`
+        );
+      }
+      const deploymentData = this.prepareDeploymentData(
+        resolvedPath,
+        projectData,
+        envVars,
+        effectiveOptions
+      );
+      this.log.info("\u{1F680} Deploying to ApexMCP...");
+      const result = await this.executeDeployment(
+        effectiveOptions.endpoint,
+        deploymentData.formData,
+        effectiveOptions.token
+      );
+      await this.handleResponse(result, effectiveOptions);
+    } catch (error) {
+      this.log.error(
+        "\u274C Deployment failed:",
+        error instanceof Error ? error.message : String(error)
+      );
+      throw error;
+    }
+  }
+};
+async function deployCommand(projectPath, options) {
+  const service = new DeployService(
+    void 0,
+    void 0,
+    void 0,
+    void 0,
+    void 0,
+    createLogger(options)
+  );
+  try {
+    await service.deploy(projectPath, options);
+  } catch (error) {
+    const log = createLogger(options);
+    log.error(
+      "Deployment failed:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+
+// src/commands/deployments.ts
+import { createInterface } from "readline";
+async function getUserConfirmation(message) {
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve3) => {
+    rl.question(`${message} (y/N): `, (answer) => {
+      rl.close();
+      const normalizedAnswer = answer.toLowerCase().trim();
+      resolve3(normalizedAnswer === "y" || normalizedAnswer === "yes");
+    });
+  });
+}
+async function listDeploymentsCommand(options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info("\u{1F4CB} Fetching deployments...");
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.deploy,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {};
+    if (effectiveOptions.token) {
+      headers["Authorization"] = `Bearer ${effectiveOptions.token}`;
+    }
+    const response = await fetch(`${effectiveOptions.endpoint}/api/deployments`, {
+      method: "GET",
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to list deployments: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.deployments.length === 0) {
+        log.info("\u{1F4ED} No deployments found.");
+        return;
+      }
+      log.info(`\u{1F4CB} Found ${result.deployments.length} deployment(s):
+`);
+      log.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
+      log.info("\u2502 Deployment Name                      \u2502 Domain             \u2502 Status  \u2502 Tier    \u2502");
+      log.info("\u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524");
+      for (const deployment of result.deployments) {
+        if (!deployment.name || !deployment.status || !deployment.tier) {
+          throw new Error(`Invalid deployment data, ${JSON.stringify(deployment)}`);
+        }
+        const name = String(deployment.name).padEnd(36);
+        const domain = String(deployment.domain || "N/A").substring(0, 18).padEnd(18);
+        const status = String(deployment.status).substring(0, 7).padEnd(7);
+        const tier = String(deployment.tier).substring(0, 7).padEnd(7);
+        log.info(`\u2502 ${name} \u2502 ${domain} \u2502 ${status} \u2502 ${tier} \u2502`);
+      }
+      log.info("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\n");
+      for (const deployment of result.deployments) {
+        log.info(`\u{1F4CB} ${deployment.name}:`);
+        log.info(`   \u{1F310} URL: ${deployment.url}`);
+        log.info(`   \u{1F3F7}\uFE0F  Domain: ${deployment.domain}`);
+        log.info(`   \u{1F4C5} Created: ${new Date(deployment.createdAt).toLocaleString()}`);
+        if (deployment.status !== "active") {
+          log.info(`   \u26A0\uFE0F  Status: ${deployment.status}`);
+        }
+        log.info("");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to list deployments:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function getDeploymentCommand(deploymentId, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F4CB} Fetching deployment details for: ${deploymentId}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.deploy,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {};
+    if (effectiveOptions.token) {
+      headers["Authorization"] = `Bearer ${effectiveOptions.token}`;
+    }
+    const response = await fetch(`${effectiveOptions.endpoint}/api/deployments/${deploymentId}`, {
+      method: "GET",
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to get deployment: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      const deployment = result.deployment;
+      log.info("\u{1F4CB} Deployment Details:");
+      log.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
+      log.info("\u2502 Property                             \u2502 Value                                \u2502");
+      log.info("\u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524");
+      const formatRow = (label, value) => {
+        const displayValue = value || "N/A";
+        const truncatedValue = displayValue.length > 36 ? displayValue.substring(0, 33) + "..." : displayValue;
+        log.info(`\u2502 ${label.padEnd(36)} \u2502 ${truncatedValue.padEnd(36)} \u2502`);
+      };
+      formatRow("ID", deployment.id ? String(deployment.id) : void 0);
+      formatRow("Name", deployment.name ? String(deployment.name) : void 0);
+      formatRow("Domain", deployment.domain ? String(deployment.domain) : void 0);
+      formatRow("Status", deployment.status ? String(deployment.status) : void 0);
+      formatRow("Tier", deployment.tier ? String(deployment.tier) : void 0);
+      formatRow("URL", deployment.url ? String(deployment.url) : void 0);
+      formatRow("Subdomain", deployment.subdomain ? String(deployment.subdomain) : void 0);
+      formatRow("Deployment URL", deployment.deploymentUrl ? String(deployment.deploymentUrl) : void 0);
+      formatRow("Entry Point", deployment.entryPoint ? String(deployment.entryPoint) : void 0);
+      formatRow("Project Path", deployment.projectPath ? String(deployment.projectPath) : void 0);
+      formatRow("Build Status", deployment.buildStatus ? String(deployment.buildStatus) : void 0);
+      formatRow("Runtime Status", deployment.runtimeStatus ? String(deployment.runtimeStatus) : void 0);
+      formatRow("Created", deployment.createdAt ? new Date(deployment.createdAt).toLocaleString() : void 0);
+      formatRow("Updated", deployment.updatedAt ? new Date(deployment.updatedAt).toLocaleString() : void 0);
+      log.info("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518");
+      if (deployment.envVars && Object.keys(deployment.envVars).length > 0) {
+        log.info("\n\u{1F527} Environment Variables:");
+        for (const [key, value] of Object.entries(deployment.envVars)) {
+          const stringValue = String(value);
+          const maskedValue = stringValue.length > 20 ? `${stringValue.substring(0, 10)}...` : stringValue;
+          log.info(`   ${key}=${maskedValue}`);
+        }
+      }
+      if (deployment.errorMessage) {
+        log.info("\n\u274C Error:");
+        log.info(`   ${deployment.errorMessage}`);
+      }
+      if (deployment.logs && deployment.logs.length > 0) {
+        log.info("\n\u{1F4DD} Recent Logs:");
+        const recentLogs = deployment.logs.slice(-5);
+        for (const logEntry of recentLogs) {
+          log.info(`   ${logEntry}`);
+        }
+        if (deployment.logs.length > 5) {
+          log.info(`   ... and ${deployment.logs.length - 5} more entries`);
+        }
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to get deployment details:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function deleteDeploymentCommand(deploymentId, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F5D1}\uFE0F  Deleting deployment: ${deploymentId}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.deploy,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    if (!options.force && !outputJson) {
+      log.info("\u26A0\uFE0F  This action cannot be undone. All deployment data will be permanently deleted.");
+      const confirmed = await getUserConfirmation(`Are you sure you want to delete deployment "${deploymentId}"?`);
+      if (!confirmed) {
+        log.info("\u274C Deletion cancelled.");
+        return;
+      }
+    }
+    const headers = {};
+    if (effectiveOptions.token) {
+      headers["Authorization"] = `Bearer ${effectiveOptions.token}`;
+    }
+    const response = await fetch(`${effectiveOptions.endpoint}/api/deployments/${deploymentId}`, {
+      method: "DELETE",
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to delete deployment: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.success) {
+        log.info("\u2705 Deployment deleted successfully!");
+      } else {
+        log.error("\u274C Failed to delete deployment");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to delete deployment:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function updateDeploymentCommand(deploymentId, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F4DD} Updating deployment: ${deploymentId}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.deploy,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    if (!options.name && !options.domain && !options.envFile) {
+      throw new Error(
+        "At least one update option must be provided (--name, --domain, or --env-file)"
+      );
+    }
+    const headers = {
+      "Content-Type": "application/json"
+    };
+    if (effectiveOptions.token) {
+      headers["Authorization"] = `Bearer ${effectiveOptions.token}`;
+    }
+    const updatePayload = {};
+    if (options.name) {
+      updatePayload.name = options.name;
+    }
+    if (options.domain) {
+      updatePayload.domain = options.domain;
+    }
+    if (options.envFile) {
+      const { loadEnvFile: loadEnvFile2 } = await import("./load-env-file-EUKRAC2D.js");
+      try {
+        const envVars = await loadEnvFile2(options.envFile);
+        updatePayload.envVars = envVars;
+        log.info(`\u{1F4C4} Loaded ${Object.keys(envVars).length} environment variables from: ${options.envFile}`);
+      } catch (error) {
+        throw new Error(`Failed to load environment file: ${error instanceof Error ? error.message : String(error)}`);
+      }
+    }
+    const response = await fetch(`${effectiveOptions.endpoint}/api/deployments/${deploymentId}`, {
+      method: "PATCH",
+      headers,
+      body: JSON.stringify(updatePayload)
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to update deployment: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      log.info("\u2705 Deployment updated successfully!");
+      if (options.name) {
+        log.info(`\u{1F4DD} Name updated to: ${options.name}`);
+      }
+      if (options.domain) {
+        log.info(`\u{1F310} Domain updated to: ${options.domain}`);
+      }
+      if (options.envFile) {
+        log.info(`\u{1F527} Environment variables updated`);
+      }
+      if (result.deployment) {
+        log.info("\n\u{1F4CB} Updated deployment details:");
+        log.info(`   ID: ${result.deployment.id}`);
+        log.info(`   Name: ${result.deployment.name || "N/A"}`);
+        log.info(`   URL: ${result.deployment.url || "N/A"}`);
+        log.info(`   Status: ${result.deployment.status || "unknown"}`);
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to update deployment:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+
+// src/commands/validate.ts
+import { existsSync as existsSync4 } from "fs";
+import { resolve as resolve2 } from "path";
+async function validateCommand(projectPath, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info("\u{1F50D} Validating MCP project...");
+    log.info(`\u{1F4C1} Project path: ${projectPath}`);
+    const resolvedPath = resolve2(projectPath);
+    if (!existsSync4(resolvedPath)) {
+      throw new Error(`Project path does not exist: ${resolvedPath}`);
+    }
+    log.info("\u{1F50D} Performing local validation...");
+    const projectData = await withStdoutSuppressed(
+      outputJson,
+      () => validateMCPProject(resolvedPath)
+    );
+    log.info(`\u2705 Entry point: ${projectData.entryPoint}`);
+    log.info(`\u{1F4C4} Found ${Object.keys(projectData.files).length} file(s)`);
+    const localValidation = {
+      isValid: true,
+      errors: [],
+      warnings: []
+    };
+    const denoJsonContent = projectData.files["deno.json"]?.content || projectData.files["deno.jsonc"]?.content;
+    if (!denoJsonContent) {
+      localValidation.errors.push("deno.json or deno.jsonc file not found");
+      localValidation.isValid = false;
+    } else {
+      try {
+        const denoJson = JSON.parse(denoJsonContent);
+        const hasEntryPoint = denoJson.main || denoJson.entryPoint || denoJson.deploy && denoJson.deploy.entrypoint;
+        if (!hasEntryPoint) {
+          localValidation.errors.push('deno.json must have a "main", "entryPoint", or "deploy.entrypoint" field');
+          localValidation.isValid = false;
+        }
+      } catch (error) {
+        localValidation.errors.push("deno.json is not valid JSON");
+        localValidation.isValid = false;
+      }
+    }
+    let apiValidation = null;
+    const config = configManager.getConfig();
+    const effectiveEndpoint = options.endpoint || config.endpoints.deploy;
+    if (effectiveEndpoint) {
+      log.info("\u{1F50D} Performing API validation...");
+      const effectiveToken = options.token || config.auth.token;
+      const formData = new FormData();
+      for (const [filename, fileData] of Object.entries(projectData.files)) {
+        const mimeType = fileData.encoding === "base64" ? "application/octet-stream" : "text/plain";
+        formData.append(
+          "files",
+          new Blob([fileData.content], { type: mimeType }),
+          filename
+        );
+      }
+      const headers = {};
+      if (effectiveToken) {
+        headers["Authorization"] = `Bearer ${effectiveToken}`;
+      }
+      try {
+        const response = await fetch(`${effectiveEndpoint}/api/validate`, {
+          method: "POST",
+          body: formData,
+          headers
+        });
+        if (response.ok) {
+          const result = await response.json();
+          apiValidation = result.validation;
+          log.info("\u2705 API validation completed");
+        } else {
+          log.warn("\u26A0\uFE0F  API validation failed, but local validation succeeded");
+        }
+      } catch (error) {
+        log.warn("\u26A0\uFE0F  API validation unavailable, but local validation succeeded");
+      }
+    }
+    const combinedValidation = {
+      isValid: localValidation.isValid && (apiValidation?.isValid ?? true),
+      errors: [...localValidation.errors, ...apiValidation?.errors || []],
+      warnings: [...localValidation.warnings, ...apiValidation?.warnings || []]
+    };
+    if (outputJson) {
+      console.log(JSON.stringify({
+        local: localValidation,
+        api: apiValidation,
+        combined: combinedValidation
+      }, null, 2));
+    } else {
+      if (combinedValidation.isValid) {
+        log.info("\u2705 Project validation successful!");
+        if (combinedValidation.warnings.length > 0) {
+          log.warn("\u26A0\uFE0F  Warnings:");
+          combinedValidation.warnings.forEach((warning) => {
+            log.warn(`   - ${warning}`);
+          });
+        }
+      } else {
+        log.error("\u274C Project validation failed:");
+        combinedValidation.errors.forEach((error) => {
+          log.error(`   - ${error}`);
+        });
+        if (combinedValidation.warnings.length > 0) {
+          log.warn("\u26A0\uFE0F  Warnings:");
+          combinedValidation.warnings.forEach((warning) => {
+            log.warn(`   - ${warning}`);
+          });
+        }
+        process.exit(1);
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Validation failed:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+
+// src/commands/auth.ts
+async function loginCommand(options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    if (options.token) {
+      configManager.setAuth(options.token);
+      if (outputJson) {
+        console.log(JSON.stringify({ success: true, authenticated: true }));
+      } else {
+        log.info("\u{1F510} Authenticating with provided token...");
+        log.info("\u2705 Authentication successful!");
+      }
+      if (!outputJson) {
+        await testAuth(options.endpoint || configManager.getConfig().endpoints.core);
+      }
+      return;
+    }
+    if (options.email && options.password) {
+      log.info("\u{1F510} Authenticating with email and password...");
+      const endpoint = options.endpoint || configManager.getConfig().endpoints.core;
+      const response = await fetch(`${endpoint}/auth/login`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          email: options.email,
+          password: options.password
+        })
+      });
+      if (!response.ok) {
+        const errorData = await response.json();
+        throw new Error(errorData.error || "Authentication failed");
+      }
+      const result = await response.json();
+      if (result.access_token) {
+        configManager.setAuth(
+          result.access_token,
+          result.refresh_token,
+          result.expires_at
+        );
+        if (outputJson) {
+          console.log(JSON.stringify({ success: true, authenticated: true }));
+        } else {
+          log.info("\u2705 Authentication successful!");
+        }
+      } else {
+        throw new Error("Invalid authentication response");
+      }
+      return;
+    }
+    log.info("\u{1F510} Please provide authentication credentials:");
+    log.info("   Use --token for direct token authentication");
+    log.info("   Use --email and --password for email/password authentication");
+    log.info("");
+    log.info("Example:");
+    log.info("   apexmcp login --token your-jwt-token");
+    log.info("   apexmcp login --email user@example.com --password yourpassword");
+    process.exit(1);
+  } catch (error) {
+    log.error(
+      "\u274C Authentication failed:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function logoutCommand(options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    configManager.clearAuth();
+    if (outputJson) {
+      console.log(JSON.stringify({ success: true, message: "Logged out successfully" }));
+      return;
+    }
+    log.info("\u{1F6AA} Logging out...");
+    log.info("\u2705 Successfully logged out!");
+  } catch (error) {
+    log.error(
+      "\u274C Logout failed:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function whoamiCommand(options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    const config = configManager.getConfig();
+    const isAuthenticated = configManager.isAuthenticated();
+    const result = {
+      authenticated: isAuthenticated,
+      endpoints: config.endpoints,
+      preferences: config.preferences
+    };
+    if (isAuthenticated) {
+      try {
+        const endpoint = options.endpoint || config.endpoints.core;
+        const token = config.auth.token;
+        const response = await fetch(`${endpoint}/auth/org-status`, {
+          headers: {
+            Authorization: `Bearer ${token}`
+          }
+        });
+        if (response.ok) {
+          const orgStatus = await response.json();
+          result.orgStatus = orgStatus;
+        }
+      } catch (error) {
+      }
+    }
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      log.info("\u{1F464} Authentication Status:");
+      log.info(`   Authenticated: ${isAuthenticated ? "\u2705 Yes" : "\u274C No"}`);
+      if (isAuthenticated) {
+        log.info("   Token: [REDACTED]");
+        if (config.auth.expiresAt) {
+          const expiresAt = new Date(config.auth.expiresAt);
+          log.info(`   Expires: ${expiresAt.toLocaleString()}`);
+        }
+      }
+      log.info("");
+      log.info("\u{1F517} Endpoints:");
+      log.info(`   Core API: ${config.endpoints.core}`);
+      log.info(`   Deploy API: ${config.endpoints.deploy}`);
+      log.info("");
+      log.info("\u2699\uFE0F  Preferences:");
+      log.info(`   JSON Output: ${config.preferences.json}`);
+      log.info(`   Verbose: ${config.preferences.verbose}`);
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to get authentication status:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function configCommand(action, key, value, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    const config = configManager.getConfig();
+    if (action === "get") {
+      if (outputJson) {
+        console.log(JSON.stringify(config, null, 2));
+      } else {
+        log.info("\u{1F527} Current Configuration:");
+        console.log(JSON.stringify(config, null, 2));
+      }
+      return;
+    }
+    if (action === "set") {
+      if (!key || value === void 0) {
+        throw new Error("Key and value are required for set action");
+      }
+      const keys = key.split(".");
+      let current = config;
+      for (let i = 0; i < keys.length - 1; i++) {
+        const currentKey = keys[i];
+        if (!currentKey) {
+          throw new Error("Invalid key format");
+        }
+        if (!current[currentKey]) {
+          current[currentKey] = {};
+        }
+        current = current[currentKey];
+      }
+      const finalKey = keys[keys.length - 1];
+      if (!finalKey) {
+        throw new Error("Invalid key format");
+      }
+      let parsedValue = value;
+      if (value === "true") parsedValue = true;
+      else if (value === "false") parsedValue = false;
+      else if (!isNaN(Number(value))) parsedValue = Number(value);
+      current[finalKey] = parsedValue;
+      configManager.updateConfig(config);
+      if (outputJson) {
+        console.log(JSON.stringify({ success: true, key, value: parsedValue }, null, 2));
+      } else {
+        log.info(`\u2705 Set ${key} = ${parsedValue}`);
+      }
+      return;
+    }
+    if (action === "reset") {
+      configManager.updateConfig({
+        version: "0.1.0",
+        endpoints: {
+          core: "https://core.apexmcp.dev",
+          deploy: "https://deploy.apexmcp.dev"
+        },
+        auth: {},
+        preferences: {
+          json: false,
+          verbose: false
+        }
+      });
+      if (outputJson) {
+        console.log(JSON.stringify({ success: true, message: "Configuration reset to defaults" }, null, 2));
+      } else {
+        log.info("\u2705 Configuration reset to defaults");
+      }
+      return;
+    }
+    throw new Error("Invalid action. Use: get, set <key> <value>, or reset");
+  } catch (error) {
+    log.error(
+      "\u274C Configuration command failed:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function testAuth(endpoint) {
+  const log = createLogger({ json: false });
+  try {
+    const token = configManager.getToken();
+    if (!token) {
+      throw new Error("No authentication token available");
+    }
+    const response = await fetch(`${endpoint}/health`, {
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    });
+    if (!response.ok) {
+      throw new Error(`Authentication test failed: ${response.status}`);
+    }
+    log.info("\u2705 Token validation successful");
+  } catch (error) {
+    log.warn("\u26A0\uFE0F  Token validation failed, but token was saved");
+    log.warn("   You may need to re-authenticate");
+  }
+}
+
+// src/commands/mcp-servers.ts
+async function listAvailableMcpServersCommand(options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info("\u{1F4CB} Fetching available MCP servers...");
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    const headers = {};
+    if (effectiveOptions.token) {
+      headers["Authorization"] = `Bearer ${effectiveOptions.token}`;
+    }
+    const response = await fetch(`${effectiveOptions.endpoint}/plugins/available`, {
+      method: "GET",
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to list MCP servers: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.plugins.length === 0) {
+        log.info("\u{1F4ED} No MCP servers available.");
+        return;
+      }
+      log.info(`\u{1F4CB} Found ${result.plugins.length} MCP server(s) in catalog:
+`);
+      log.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
+      log.info("\u2502 MCP Server ID                        \u2502 Name               \u2502 Status  \u2502 Enabled \u2502");
+      log.info("\u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524");
+      for (const server of result.plugins) {
+        const id = server.catalog_id.substring(0, 36).padEnd(36);
+        const name = (server.name || "N/A").substring(0, 18).padEnd(18);
+        const status = server.status.substring(0, 7).padEnd(7);
+        const enabled = server.enabled ? "\u2705 Yes" : "\u274C No";
+        const enabledPadded = enabled.substring(0, 7).padEnd(7);
+        log.info(`\u2502 ${id} \u2502 ${name} \u2502 ${status} \u2502 ${enabledPadded} \u2502`);
+      }
+      log.info("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\n");
+      for (const server of result.plugins) {
+        log.info(`\u{1F527} ${server.name} (${server.catalog_id}):`);
+        log.info(`   \u{1F4DD} Description: ${server.description || "No description"}`);
+        log.info(`   \u{1F310} Endpoint: ${server.http_endpoint}`);
+        log.info(`   \u{1F4CA} Status: ${server.status}`);
+        log.info(`   \u2705 Enabled: ${server.enabled ? "Yes" : "No"}`);
+        if (server.secrets_requirements && server.secrets_requirements.length > 0) {
+          log.info(`   \u{1F510} Requires ${server.secrets_requirements.length} secret(s)`);
+        }
+        log.info("");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to list MCP servers:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function listEnabledMcpServersCommand(options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info("\u{1F4CB} Fetching enabled MCP servers...");
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/plugins/enabled`, {
+      method: "GET",
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to list enabled MCP servers: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.plugins.length === 0) {
+        log.info("\u{1F4ED} No MCP servers enabled for your organization.");
+        return;
+      }
+      log.info(`\u{1F4CB} Found ${result.plugins.length} enabled MCP server(s):
+`);
+      log.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
+      log.info("\u2502 MCP Server ID                        \u2502 Name               \u2502 Status  \u2502 Config  \u2502");
+      log.info("\u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524");
+      for (const server of result.plugins) {
+        const id = server.catalog_id.substring(0, 36).padEnd(36);
+        const name = (server.name || "N/A").substring(0, 18).padEnd(18);
+        const status = "Enabled";
+        const configStr = server.config.rate_limit ? `${server.config.rate_limit}/min` : "Default";
+        const configPadded = configStr.substring(0, 7).padEnd(7);
+        log.info(`\u2502 ${id} \u2502 ${name} \u2502 ${status} \u2502 ${configPadded} \u2502`);
+      }
+      log.info("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\n");
+      for (const server of result.plugins) {
+        log.info(`\u{1F527} ${server.name} (${server.catalog_id}):`);
+        log.info(`   \u{1F4DD} Description: ${server.description || "No description"}`);
+        log.info(`   \u{1F310} Endpoint: ${server.http_endpoint || "N/A"}`);
+        log.info(`   \u2699\uFE0F  Config: Rate limit ${server.config.rate_limit || "unlimited"}/min, Timeout ${server.config.timeout_ms || 3e4}ms`);
+        if (server.secrets_requirements && server.secrets_requirements.length > 0) {
+          log.info(`   \u{1F510} Secrets configured: ${server.secrets_requirements.length} required`);
+        }
+        log.info("");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to list enabled MCP servers:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function enableMcpServerCommand(catalogId, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F527} Enabling MCP server: ${catalogId}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`,
+      "Content-Type": "application/json"
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/plugins/toggle`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        catalog_id: catalogId,
+        enabled: true
+      })
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to enable MCP server: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.success) {
+        log.info("\u2705 MCP server enabled successfully!");
+        log.info("\u2139\uFE0F  You may need to configure secrets for this server to work properly.");
+        log.info(`   Use: apexmcp plugins secrets set ${catalogId} <secret-key> <secret-value>`);
+      } else {
+        log.error("\u274C Failed to enable MCP server");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to enable MCP server:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function disableMcpServerCommand(catalogId, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F527} Disabling MCP server: ${catalogId}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`,
+      "Content-Type": "application/json"
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/plugins/toggle`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        catalog_id: catalogId,
+        enabled: false
+      })
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to disable MCP server: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.success) {
+        log.info("\u2705 MCP server disabled successfully!");
+      } else {
+        log.error("\u274C Failed to disable MCP server");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to disable MCP server:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function getMcpServerCommand(catalogId, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F4CB} Fetching MCP server details: ${catalogId}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    const headers = {};
+    if (effectiveOptions.token) {
+      headers["Authorization"] = `Bearer ${effectiveOptions.token}`;
+    }
+    const response = await fetch(`${effectiveOptions.endpoint}/plugins/available`, {
+      method: "GET",
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to get MCP server: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    const server = result.plugins.find((p) => p.catalog_id === catalogId);
+    if (!server) {
+      throw new Error(`MCP server '${catalogId}' not found in catalog`);
+    }
+    if (outputJson) {
+      console.log(JSON.stringify({ server }, null, 2));
+    } else {
+      log.info(`\u{1F527} MCP Server: ${server.name}`);
+      log.info(`   \u{1F4DD} Description: ${server.description || "No description"}`);
+      log.info(`   \u{1F194} Catalog ID: ${server.catalog_id}`);
+      log.info(`   \u{1F310} Endpoint: ${server.http_endpoint}`);
+      log.info(`   \u{1F4CA} Status: ${server.status}`);
+      log.info(`   \u2705 Enabled: ${server.enabled ? "Yes" : "No"}`);
+      if (server.secrets_requirements && server.secrets_requirements.length > 0) {
+        log.info(`   \u{1F510} Secrets Requirements:`);
+        for (const secret of server.secrets_requirements) {
+          const required = secret.required ? "(required)" : "(optional)";
+          log.info(`      \u2022 ${secret.name} (${secret.key}) ${required}: ${secret.description}`);
+          if (secret.placeholder) {
+            log.info(`        Placeholder: ${secret.placeholder}`);
+          }
+        }
+      } else {
+        log.info(`   \u{1F510} Secrets Requirements: None`);
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to get MCP server details:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+
+// src/commands/plugins.ts
+async function listPluginSecretsCommand(catalogId, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F510} Fetching secrets for MCP server: ${catalogId}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/plugins/${catalogId}/secrets`, {
+      method: "GET",
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to list plugin secrets: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.secrets.length === 0) {
+        log.info("\u{1F510} No secrets configured for this MCP server.");
+        return;
+      }
+      log.info(`\u{1F510} Found ${result.secrets.length} secret(s) configured:
+`);
+      log.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
+      log.info("\u2502 Secret Key         \u2502");
+      log.info("\u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524");
+      for (const secret of result.secrets) {
+        const key = secret.secret_key.substring(0, 18).padEnd(18);
+        log.info(`\u2502 ${key} \u2502`);
+      }
+      log.info("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\n");
+      log.info("\u{1F4A1} Note: Secret values are not displayed for security reasons.");
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to list plugin secrets:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function setPluginSecretCommand(catalogId, secretKey, secretValue, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F510} Setting secret '${secretKey}' for MCP server: ${catalogId}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`,
+      "Content-Type": "application/json"
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/plugins/${catalogId}/secrets`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        secret_key: secretKey,
+        secret_value: secretValue
+      })
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to set plugin secret: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.success) {
+        log.info("\u2705 Plugin secret set successfully!");
+      } else {
+        log.error("\u274C Failed to set plugin secret");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to set plugin secret:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function deletePluginSecretCommand(catalogId, secretKey, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F5D1}\uFE0F  Deleting secret '${secretKey}' for MCP server: ${catalogId}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/plugins/${catalogId}/secrets/${secretKey}`, {
+      method: "DELETE",
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to delete plugin secret: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.success) {
+        log.info("\u2705 Plugin secret deleted successfully!");
+      } else {
+        log.error("\u274C Failed to delete plugin secret");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to delete plugin secret:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function deletePluginCommand(catalogId, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F5D1}\uFE0F  Deleting plugin configuration: ${catalogId}`);
+    log.info("\u26A0\uFE0F  This will disable the plugin and remove all associated secrets.");
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/plugins/${catalogId}`, {
+      method: "DELETE",
+      headers
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to delete plugin: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.success) {
+        log.info("\u2705 Plugin deleted successfully!");
+      } else {
+        log.error("\u274C Failed to delete plugin");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to delete plugin:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+
+// src/commands/mcp.ts
+async function listToolsCommand(options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info("\u{1F527} Fetching available tools...");
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`,
+      "Content-Type": "application/json"
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/tools/list`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: Date.now(),
+        method: "tools/list",
+        params: {}
+      })
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to list tools: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (!result.result || !result.result.tools || result.result.tools.length === 0) {
+        log.info("\u{1F527} No tools available.");
+        return;
+      }
+      const tools = result.result.tools;
+      log.info(`\u{1F527} Found ${tools.length} tool(s):
+`);
+      log.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
+      log.info("\u2502 Tool Name                            \u2502 Description                          \u2502");
+      log.info("\u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524");
+      for (const tool of tools) {
+        const name = tool.name.substring(0, 36).padEnd(36);
+        const description = (tool.description || "No description").substring(0, 36).padEnd(36);
+        log.info(`\u2502 ${name} \u2502 ${description} \u2502`);
+      }
+      log.info("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\n");
+      for (const tool of tools) {
+        log.info(`\u{1F527} ${tool.name}:`);
+        log.info(`   \u{1F4DD} Description: ${tool.description || "No description"}`);
+        if (tool.inputSchema && tool.inputSchema.properties) {
+          log.info(`   \u{1F4E5} Parameters:`);
+          const properties = tool.inputSchema.properties;
+          for (const [paramName, paramSchema] of Object.entries(properties)) {
+            const param = paramSchema;
+            const required = tool.inputSchema.required?.includes(paramName) ? "(required)" : "(optional)";
+            log.info(`      \u2022 ${paramName} ${required}: ${param.description || "No description"}`);
+          }
+        }
+        log.info("");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to list tools:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function callToolCommand(toolName, paramsJson, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F527} Calling tool: ${toolName}`);
+    let params;
+    try {
+      params = JSON.parse(paramsJson);
+    } catch (error) {
+      throw new Error(`Invalid JSON parameters: ${paramsJson}`);
+    }
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`,
+      "Content-Type": "application/json"
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/tools/call`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: Date.now(),
+        method: "tools/call",
+        params: {
+          name: toolName,
+          arguments: params
+        }
+      })
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to call tool: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.error) {
+        log.error("\u274C Tool call failed:", result.error.message);
+        if (result.error.data) {
+          log.error("   Details:", JSON.stringify(result.error.data, null, 2));
+        }
+      } else if (result.result) {
+        log.info("\u2705 Tool call successful!");
+        if (result.result.content && Array.isArray(result.result.content)) {
+          for (const content of result.result.content) {
+            if (content.type === "text") {
+              log.info("\u{1F4C4} Result:", content.text);
+            } else {
+              log.info(`\u{1F4C4} Result (${content.type}):`, JSON.stringify(content, null, 2));
+            }
+          }
+        } else {
+          log.info("\u{1F4C4} Result:", JSON.stringify(result.result, null, 2));
+        }
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to call tool:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function listResourcesCommand(options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info("\u{1F4C4} Fetching available resources...");
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`,
+      "Content-Type": "application/json"
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/resources/list`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: Date.now(),
+        method: "resources/list",
+        params: {}
+      })
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to list resources: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (!result.result || !result.result.resources || result.result.resources.length === 0) {
+        log.info("\u{1F4C4} No resources available.");
+        return;
+      }
+      const resources = result.result.resources;
+      log.info(`\u{1F4C4} Found ${resources.length} resource(s):
+`);
+      log.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
+      log.info("\u2502 Resource URI                         \u2502 Name                                 \u2502 MIME Type  \u2502");
+      log.info("\u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524");
+      for (const resource of resources) {
+        const uri = resource.uri.substring(0, 36).padEnd(36);
+        const name = (resource.name || "Unnamed").substring(0, 36).padEnd(36);
+        const mimeType = (resource.mimeType || "unknown").substring(0, 10).padEnd(10);
+        log.info(`\u2502 ${uri} \u2502 ${name} \u2502 ${mimeType} \u2502`);
+      }
+      log.info("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\n");
+      for (const resource of resources) {
+        log.info(`\u{1F4C4} ${resource.name || "Unnamed"}:`);
+        log.info(`   \u{1F310} URI: ${resource.uri}`);
+        log.info(`   \u{1F4DD} Description: ${resource.description || "No description"}`);
+        log.info(`   \u{1F4CB} MIME Type: ${resource.mimeType || "unknown"}`);
+        log.info("");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to list resources:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function readResourceCommand(resourceUri, options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info(`\u{1F4D6} Reading resource: ${resourceUri}`);
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`,
+      "Content-Type": "application/json"
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/resources/read`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: Date.now(),
+        method: "resources/read",
+        params: {
+          uri: resourceUri
+        }
+      })
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to read resource: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (result.error) {
+        log.error("\u274C Resource read failed:", result.error.message);
+        if (result.error.data) {
+          log.error("   Details:", JSON.stringify(result.error.data, null, 2));
+        }
+      } else if (result.result && result.result.contents) {
+        log.info("\u2705 Resource read successful!");
+        for (const content of result.result.contents) {
+          if (content.type === "text") {
+            log.info("\u{1F4C4} Content:", content.text);
+          } else {
+            log.info(`\u{1F4C4} Content (${content.type}):`, JSON.stringify(content, null, 2));
+          }
+        }
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to read resource:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+async function listResourceTemplatesCommand(options) {
+  const outputJson = isJsonMode(options);
+  const log = createLogger(options);
+  try {
+    log.info("\u{1F4CB} Fetching resource templates...");
+    const config = configManager.getConfig();
+    const effectiveOptions = {
+      ...options,
+      endpoint: options.endpoint || config.endpoints.core,
+      token: options.token || config.auth.token
+    };
+    if (!effectiveOptions.token) {
+      throw new Error(
+        'Authentication required. Please login first with "apexmcp login" or provide --token'
+      );
+    }
+    const headers = {
+      "Authorization": `Bearer ${effectiveOptions.token}`,
+      "Content-Type": "application/json"
+    };
+    const response = await fetch(`${effectiveOptions.endpoint}/resources/templates/list`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: Date.now(),
+        method: "resources/templates/list",
+        params: {}
+      })
+    });
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(
+        `Failed to list resource templates: ${response.status} ${response.statusText}
+${errorText}`
+      );
+    }
+    const result = await response.json();
+    if (outputJson) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      if (!result.result || !result.result.resourceTemplates || result.result.resourceTemplates.length === 0) {
+        log.info("\u{1F4CB} No resource templates available.");
+        return;
+      }
+      const templates = result.result.resourceTemplates;
+      log.info(`\u{1F4CB} Found ${templates.length} resource template(s):
+`);
+      log.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
+      log.info("\u2502 Template URI                         \u2502 Name                                 \u2502 MIME Type  \u2502");
+      log.info("\u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u253C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524");
+      for (const template of templates) {
+        const uri = template.uriTemplate.substring(0, 36).padEnd(36);
+        const name = (template.name || "Unnamed").substring(0, 36).padEnd(36);
+        const mimeType = (template.mimeType || "unknown").substring(0, 10).padEnd(10);
+        log.info(`\u2502 ${uri} \u2502 ${name} \u2502 ${mimeType} \u2502`);
+      }
+      log.info("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2534\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\n");
+      for (const template of templates) {
+        log.info(`\u{1F4CB} ${template.name || "Unnamed"}:`);
+        log.info(`   \u{1F310} URI Template: ${template.uriTemplate}`);
+        log.info(`   \u{1F4DD} Description: ${template.description || "No description"}`);
+        log.info(`   \u{1F4CB} MIME Type: ${template.mimeType || "unknown"}`);
+        log.info("");
+      }
+    }
+  } catch (error) {
+    log.error(
+      "\u274C Failed to list resource templates:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+
+// src/cli.ts
+import { createRequire } from "module";
+var program = new Command();
+var require2 = createRequire(import.meta.url);
+var { version } = require2("../package.json");
+program.name("apexmcp").description("CLI tool for deploying MCP servers to ApexMCP").version(version);
+program.command("deploy").description("Deploy an MCP server").argument("<project-dir>", "Path to the MCP server project directory").option("--env-file <file>", "Environment variables file").option("--domain <domain>", "Custom domain for deployment").option(
+  "--url-strategy <strategy>",
+  "URL generation strategy (readable, obscure, timestamp-only, random)",
+  "readable"
+).option(
+  "--project-path <path>",
+  "Project identifier path (stable slug used by the deploy service)"
+).option("--project-name <name>", "Project name for deployment").option("--entry-point <file>", "Explicit entry point file (overrides auto-detection)").option(
+  "--endpoint <url>",
+  "Deploy service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(deployCommand);
+program.command("list").description("List all deployments").option(
+  "--endpoint <url>",
+  "Deploy service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(listDeploymentsCommand);
+program.command("status").description("Get deployment status").argument("<deployment-name>", "Deployment name").option(
+  "--endpoint <url>",
+  "Deploy service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(getDeploymentCommand);
+program.command("update").description("Update deployment properties").argument("<deployment-name>", "Deployment name").option("--name <name>", "Update deployment name").option("--domain <domain>", "Update deployment domain").option("--env-file <file>", "Update environment variables from file").option(
+  "--endpoint <url>",
+  "Deploy service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(updateDeploymentCommand);
+program.command("delete").description("Delete a deployment").argument("<deployment-name>", "Deployment name").option("--force", "Skip confirmation prompt").option(
+  "--endpoint <url>",
+  "Deploy service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(deleteDeploymentCommand);
+program.command("validate").description("Validate an MCP project").argument("<project-path>", "Path to the MCP server project").option(
+  "--endpoint <url>",
+  "Deploy service endpoint for API validation (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(validateCommand);
+program.command("login").description("Authenticate with ApexMCP").option("--token <token>", "Direct JWT token authentication").option("--email <email>", "Email for authentication").option("--password <password>", "Password for authentication").option(
+  "--endpoint <url>",
+  "Core service endpoint",
+  "https://core.apexmcp.dev"
+).option("--json", "Output JSON for CI/CD consumption").action(loginCommand);
+program.command("logout").description("Clear authentication credentials").option("--json", "Output JSON for CI/CD consumption").action(logoutCommand);
+program.command("whoami").description("Show current authentication status and configuration").option(
+  "--endpoint <url>",
+  "Core service endpoint",
+  "https://core.apexmcp.dev"
+).option("--json", "Output JSON for CI/CD consumption").action(whoamiCommand);
+program.command("servers").description("List available MCP servers").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(listAvailableMcpServersCommand);
+program.command("servers:enabled").description("List enabled MCP servers for your organization").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(listEnabledMcpServersCommand);
+program.command("servers:enable").description("Enable an MCP server for your organization").argument("<catalog-id>", "MCP server catalog ID").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(enableMcpServerCommand);
+program.command("servers:disable").description("Disable an MCP server for your organization").argument("<catalog-id>", "MCP server catalog ID").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(disableMcpServerCommand);
+program.command("servers:info").description("Get detailed information about an MCP server").argument("<catalog-id>", "MCP server catalog ID").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(getMcpServerCommand);
+program.command("secrets").description("List secrets for an MCP server").argument("<catalog-id>", "MCP server catalog ID").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(listPluginSecretsCommand);
+program.command("secrets:set").description("Set a secret for an MCP server").argument("<catalog-id>", "MCP server catalog ID").argument("<secret-key>", "Secret key").argument("<secret-value>", "Secret value").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(setPluginSecretCommand);
+program.command("secrets:delete").description("Delete a secret for an MCP server").argument("<catalog-id>", "MCP server catalog ID").argument("<secret-key>", "Secret key").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(deletePluginSecretCommand);
+program.command("plugins:delete").description("Delete an entire plugin configuration").argument("<catalog-id>", "MCP server catalog ID").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(deletePluginCommand);
+program.command("tools").description("List available tools from enabled MCP servers").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(listToolsCommand);
+program.command("tools:call").description("Call a tool with specified parameters").argument("<tool-name>", "Name of the tool to call").argument("<params-json>", "Tool parameters as JSON string").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(callToolCommand);
+program.command("resources").description("List available resources from enabled MCP servers").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(listResourcesCommand);
+program.command("resources:read").description("Read a specific resource").argument("<resource-uri>", "URI of the resource to read").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(readResourceCommand);
+program.command("resources:templates").description("List available resource templates").option(
+  "--endpoint <url>",
+  "Core service endpoint (default: configured endpoint)"
+).option("--token <token>", "Authentication token (default: configured token)").option("--json", "Output JSON for CI/CD consumption").action(listResourceTemplatesCommand);
+program.command("config").description("Manage CLI configuration").argument("<action>", "Action: get, set <key> <value>, reset").argument("[key]", "Configuration key (for set action)").argument("[value]", "Configuration value (for set action)").option("--json", "Output JSON for CI/CD consumption").action((action, key, value, options) => {
+  configCommand(action, key, value, options);
+});
+function setupProgram() {
+  if (!process.env.NODE_ENV?.includes("test")) {
+    program.exitOverride();
+  }
+}
+function runMain() {
+  try {
+    program.parse();
+  } catch (error) {
+    logger.error(
+      "CLI Error:",
+      error instanceof Error ? error.message : String(error)
+    );
+    process.exit(1);
+  }
+}
+setupProgram();
+runMain();
+export {
+  program,
+  runMain,
+  setupProgram
+};
+//# sourceMappingURL=cli.js.map