mcphosting-cli 0.1.2 → 0.3.1

package/dist/index.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command7 } from "commander";
+import { Command as Command17 } from "commander";
+import chalk16 from "chalk";
 
-// src/commands/auth.ts
+// src/commands/login.ts
 import { Command } from "commander";
 import { createServer } from "http";
 import open from "open";
@@ -24,8 +25,11 @@ var Config = class {
       defaults: { connections: [] }
     });
   }
+  /**
+   * Token resolution: env var MCPHOSTING_TOKEN takes priority over config file.
+   */
   get token() {
-    return this.conf.get("token");
+    return process.env.MCPHOSTING_TOKEN || this.conf.get("token");
   }
   set token(value) {
     if (value) {
@@ -34,6 +38,16 @@ var Config = class {
       this.conf.delete("token");
     }
   }
+  get refreshToken() {
+    return this.conf.get("refresh_token");
+  }
+  set refreshToken(value) {
+    if (value) {
+      this.conf.set("refresh_token", value);
+    } else {
+      this.conf.delete("refresh_token");
+    }
+  }
   get user() {
     return this.conf.get("user");
   }
@@ -44,6 +58,12 @@ var Config = class {
       this.conf.delete("user");
     }
   }
+  /**
+   * Check if token came from environment variable.
+   */
+  get isEnvToken() {
+    return !!process.env.MCPHOSTING_TOKEN;
+  }
   get connections() {
     return this.connectionsConf.get("connections", []);
   }
@@ -84,20 +104,220 @@ var Config = class {
 };
 
 // src/lib/api.ts
+import axios, { AxiosError } from "axios";
+var API_BASE = process.env.MCPHOSTING_API_URL || "https://mcphosting.com";
 var MCPHostingAPI = class {
-  baseUrl = "https://mcphosting.com/api";
-  token;
+  token = null;
   constructor(token) {
+    this.token = token || null;
+  }
+  setToken(token) {
     this.token = token;
   }
-  async request(endpoint, options = {}) {
-    throw new Error(`API not available - using static fallback`);
+  get headers() {
+    const h = {
+      "Content-Type": "application/json",
+      "User-Agent": "mcphosting-cli/1.0.0"
+    };
+    if (this.token) {
+      h["Authorization"] = `Bearer ${this.token}`;
+    }
+    return h;
   }
-  async searchMCPs(query) {
+  handleError(error) {
+    if (error instanceof AxiosError) {
+      const status = error.response?.status;
+      const message = error.response?.data?.error || error.response?.data?.message || error.message;
+      if (status === 401) {
+        throw new Error("Authentication required. Run `mcphosting login` first.");
+      }
+      if (status === 403) {
+        throw new Error("Access denied. Check your permissions.");
+      }
+      if (status === 404) {
+        throw new Error("Not found. Check the server slug or ID.");
+      }
+      if (status === 429) {
+        throw new Error("Rate limited. Please wait a moment and try again.");
+      }
+      throw new Error(`API error (${status}): ${message}`);
+    }
+    throw error;
+  }
+  // --- Auth ---
+  async login(email, password) {
+    try {
+      const { data } = await axios.post(`${API_BASE}/api/auth/cli-login`, { email, password });
+      return data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async refreshToken(refreshToken) {
+    try {
+      const { data } = await axios.post(`${API_BASE}/api/auth/cli-login/refresh`, { refresh_token: refreshToken });
+      return data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async githubDeviceStart() {
+    try {
+      const { data } = await axios.get(`${API_BASE}/api/auth/github/device`);
+      return data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async githubDevicePoll(deviceCode) {
+    try {
+      const { data } = await axios.post(
+        `${API_BASE}/api/auth/github/device`,
+        { device_code: deviceCode },
+        { validateStatus: (status) => status < 500 }
+        // Don't throw on 202/400
+      );
+      return data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async whoami() {
+    if (!this.token) return null;
+    try {
+      const { data } = await axios.get(`${API_BASE}/api/auth/whoami`, { headers: this.headers });
+      return data.user || null;
+    } catch {
+      return null;
+    }
+  }
+  // --- Deploy ---
+  async deploy(params) {
+    try {
+      if (params.githubUrl) {
+        const { data: data2 } = await axios.post(`${API_BASE}/api/cli/github/deploy`, {
+          repo_url: params.githubUrl,
+          auto_detect: true
+        }, { headers: this.headers });
+        return data2;
+      }
+      const { data } = await axios.post(`${API_BASE}/api/cli/deploy`, params, { headers: this.headers });
+      return data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  // --- Server Management ---
+  async listServers() {
+    try {
+      const { data } = await axios.get(`${API_BASE}/api/mcp/projects`, { headers: this.headers });
+      return data.projects || [];
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async getServer(idOrSlug) {
+    try {
+      const { data } = await axios.get(`${API_BASE}/api/mcp/projects/${idOrSlug}`, { headers: this.headers });
+      return data.project || data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async getServerLogs(idOrSlug, lines = 50) {
+    try {
+      const { data } = await axios.get(`${API_BASE}/api/mcp/projects/${idOrSlug}/logs?lines=${lines}`, { headers: this.headers });
+      return data.logs || [];
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  // --- Connection Info ---
+  async connect(slug) {
+    try {
+      const { data } = await axios.post(`${API_BASE}/api/mcp/connect`, { slug }, { headers: this.headers });
+      return data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async getConnectionInfo(slug) {
+    try {
+      const { data } = await axios.get(`${API_BASE}/api/cli/info/${slug}`, { headers: this.headers });
+      return data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  // --- Env Vars ---
+  async listEnvVars(projectId) {
+    try {
+      const { data } = await axios.get(`${API_BASE}/api/mcp/projects/${projectId}/env-vars`, { headers: this.headers });
+      return data.envVars || [];
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async addEnvVar(projectId, key, value) {
+    try {
+      await axios.post(
+        `${API_BASE}/api/mcp/projects/${projectId}/env-vars`,
+        { key, value },
+        { headers: this.headers }
+      );
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async removeEnvVar(projectId, key) {
+    try {
+      await axios.delete(
+        `${API_BASE}/api/mcp/projects/${projectId}/env-vars/${key}`,
+        { headers: this.headers }
+      );
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  // --- One-Click Deploy ---
+  async oneClickDeploy(params) {
     try {
-      const results = await this.request(`/marketplace/search?q=${encodeURIComponent(query)}`);
-      return results.mcps || [];
+      const { data } = await axios.post(`${API_BASE}/api/cli/deploy/one-click`, params, { headers: this.headers });
+      return data;
     } catch (error) {
+      this.handleError(error);
+    }
+  }
+  // --- API Keys ---
+  async getAPIKeys() {
+    try {
+      const { data } = await axios.get(`${API_BASE}/api/keys`, { headers: this.headers });
+      return data.keys || [];
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async createAPIKey(name) {
+    try {
+      const { data } = await axios.post(`${API_BASE}/api/keys`, { name }, { headers: this.headers });
+      return data;
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  async deleteAPIKey(id) {
+    try {
+      await axios.delete(`${API_BASE}/api/keys/${id}`, { headers: this.headers });
+    } catch (error) {
+      this.handleError(error);
+    }
+  }
+  // --- Marketplace (static fallback for MVP) ---
+  async searchMCPs(query) {
+    try {
+      const { data } = await axios.get(`${API_BASE}/api/marketplace/search?q=${encodeURIComponent(query)}`, { headers: this.headers });
+      return data.mcps || [];
+    } catch {
       const staticMCPs = this.getStaticMCPs();
       return staticMCPs.filter(
         (mcp) => mcp.name.toLowerCase().includes(query.toLowerCase()) || mcp.description.toLowerCase().includes(query.toLowerCase()) || mcp.tools.some((tool) => tool.toLowerCase().includes(query.toLowerCase()))
@@ -106,22 +326,13 @@ var MCPHostingAPI = class {
   }
   async getMCPInfo(slug) {
     try {
-      const result = await this.request(`/marketplace/mcp/${slug}`);
-      return result.mcp || null;
+      const { data } = await axios.get(`${API_BASE}/api/marketplace/mcp/${slug}`, { headers: this.headers });
+      return data.mcp || null;
     } catch {
       const staticMCPs = this.getStaticMCPs();
       return staticMCPs.find((mcp) => mcp.slug === slug) || null;
     }
   }
-  async whoami() {
-    if (!this.token) return null;
-    try {
-      const result = await this.request("/auth/whoami");
-      return result.user;
-    } catch {
-      return null;
-    }
-  }
   getStaticMCPs() {
     return [
       {
@@ -185,26 +396,66 @@ var MCPHostingAPI = class {
 // src/lib/logger.ts
 import chalk from "chalk";
 import ora from "ora";
+var _silent = false;
+var _jsonMode = false;
 var Logger = class _Logger {
+  static get isSilent() {
+    return _silent;
+  }
+  static set silent(value) {
+    _silent = value;
+  }
+  static get isJsonMode() {
+    return _jsonMode;
+  }
+  static set jsonMode(value) {
+    _jsonMode = value;
+  }
   static info(message) {
+    if (_silent || _jsonMode) return;
     console.log(chalk.blue("\u2139"), message);
   }
   static success(message) {
+    if (_silent || _jsonMode) return;
     console.log(chalk.green("\u2713"), message);
   }
   static warning(message) {
+    if (_silent || _jsonMode) return;
     console.log(chalk.yellow("\u26A0"), message);
   }
   static error(message) {
+    if (_jsonMode) {
+      console.error(JSON.stringify({ success: false, error: message }));
+      return;
+    }
+    if (_silent) return;
     console.error(chalk.red("\u2717"), message);
   }
   static dim(message) {
+    if (_silent || _jsonMode) return;
     console.log(chalk.dim(message));
   }
   static bold(message) {
+    if (_silent || _jsonMode) return;
     console.log(chalk.bold(message));
   }
   static spinner(text) {
+    if (_silent || _jsonMode || !process.stderr.isTTY) {
+      return {
+        start: () => ora(text),
+        stop: () => {
+        },
+        succeed: () => {
+        },
+        fail: () => {
+        },
+        warn: () => {
+        },
+        info: () => {
+        },
+        text: ""
+      };
+    }
     return ora(text).start();
   }
   static table(data, headers) {
@@ -233,26 +484,196 @@ var Logger = class _Logger {
   }
 };
 
-// src/commands/auth.ts
-function createAuthCommands() {
-  const auth = new Command("auth");
-  auth.command("login").description("Authenticate with MCPHosting").option("--token <token>", "Provide API token directly").action(async (options) => {
+// src/commands/login.ts
+import chalk2 from "chalk";
+import * as readline from "readline";
+function prompt(question, hidden = false) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    if (hidden) {
+      const originalWrite = process.stdout.write.bind(process.stdout);
+      process.stdout.write = ((str) => {
+        if (typeof str === "string" && str !== question && str !== "\n" && str !== "\r\n") {
+          return originalWrite("*");
+        }
+        return originalWrite(str);
+      });
+      rl.question(question, (answer) => {
+        process.stdout.write = originalWrite;
+        console.log();
+        rl.close();
+        resolve(answer);
+      });
+    } else {
+      rl.question(question, (answer) => {
+        rl.close();
+        resolve(answer);
+      });
+    }
+  });
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function loginWithGitHub(config) {
+  const api = new MCPHostingAPI();
+  const spinner = Logger.spinner("Starting GitHub login...");
+  try {
+    const deviceFlow = await api.githubDeviceStart();
+    spinner.stop();
+    console.log("");
+    console.log(chalk2.bold("  \u{1F510} GitHub Login"));
+    console.log("");
+    console.log(`  ${chalk2.dim("1.")} Open ${chalk2.cyan.underline(deviceFlow.verification_uri)}`);
+    console.log(`  ${chalk2.dim("2.")} Enter code: ${chalk2.bold.yellow(deviceFlow.user_code)}`);
+    console.log("");
+    try {
+      await open(deviceFlow.verification_uri);
+      Logger.dim("  Browser opened automatically.");
+    } catch {
+      Logger.dim("  Open the URL above in your browser.");
+    }
+    console.log("");
+    const pollSpinner = Logger.spinner("Waiting for GitHub authorization...");
+    const pollInterval = (deviceFlow.interval || 5) * 1e3;
+    const maxAttempts = Math.ceil((deviceFlow.expires_in || 900) / (deviceFlow.interval || 5));
+    let currentInterval = pollInterval;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+      await sleep(currentInterval);
+      const result = await api.githubDevicePoll(deviceFlow.device_code);
+      if (result.token && result.user) {
+        config.token = result.token;
+        config.refreshToken = result.refresh_token;
+        config.user = { email: result.user.email, org: result.user.github_username };
+        pollSpinner.succeed(
+          result.is_new_user ? `Account created and logged in as ${chalk2.bold(result.user.github_username || result.user.email)}` : `Logged in as ${chalk2.bold(result.user.github_username || result.user.email)}`
+        );
+        console.log("");
+        Logger.info(`Token stored in ${chalk2.dim("~/.config/mcphosting/")}`);
+        Logger.info(`Run ${chalk2.cyan("mcphosting deploy")} to deploy your first MCP server!`);
+        return;
+      }
+      if (result.error === "authorization_pending") {
+        continue;
+      }
+      if (result.error === "slow_down") {
+        currentInterval = (result.interval || 10) * 1e3;
+        continue;
+      }
+      pollSpinner.fail("GitHub login failed");
+      Logger.error(result.error || "Unknown error during GitHub authorization");
+      process.exit(1);
+    }
+    pollSpinner.fail("GitHub login timed out");
+    Logger.error("Authorization expired. Please try again.");
+    process.exit(1);
+  } catch (error) {
+    spinner.fail("GitHub login failed");
+    Logger.error(error.message || "Failed to start GitHub device flow");
+    process.exit(1);
+  }
+}
+function createLoginCommand() {
+  return new Command("login").description("Authenticate with MCPHosting").option("--email <email>", "Email address").option("--token <token>", "Provide API token directly").option("--github", "Login with GitHub (recommended)").option("--browser", "Use browser-based login").option("--json", "Output as JSON").action(async (options) => {
     const config = new Config();
+    const isJson = options.json || Logger.isJsonMode;
+    if (process.env.MCPHOSTING_TOKEN && !options.token && !options.github && !options.email) {
+      const api = new MCPHostingAPI(process.env.MCPHOSTING_TOKEN);
+      const user = await api.whoami();
+      if (isJson) {
+        console.log(JSON.stringify({
+          success: true,
+          email: user?.email || "unknown",
+          token_source: "environment"
+        }));
+      } else {
+        Logger.success(`Authenticated via MCPHOSTING_TOKEN env var`);
+        if (user) Logger.info(`  User: ${chalk2.bold(user.email)}`);
+      }
+      return;
+    }
+    if (options.github) {
+      await loginWithGitHub(config);
+      return;
+    }
     if (options.token) {
       config.token = options.token;
       const api = new MCPHostingAPI(options.token);
       const user = await api.whoami();
       if (user) {
         config.user = user;
-        Logger.success(`Logged in as ${user.email}${user.org ? ` (${user.org})` : ""}`);
+        if (isJson) {
+          console.log(JSON.stringify({ success: true, email: user.email }));
+        } else {
+          Logger.success(`Logged in as ${chalk2.bold(user.email)}`);
+        }
       } else {
-        Logger.warning("Token saved, but could not verify user info");
+        if (isJson) {
+          console.log(JSON.stringify({ success: true, warning: "Token saved but could not verify identity" }));
+        } else {
+          Logger.warning("Token saved, but could not verify identity.");
+        }
+      }
+      return;
+    }
+    if (!process.stdin.isTTY && !options.email) {
+      if (isJson) {
+        console.log(JSON.stringify({
+          success: false,
+          error: "Interactive login requires a TTY. Use --token or MCPHOSTING_TOKEN env var for scripted usage."
+        }));
+      } else {
+        Logger.error("Interactive login requires a TTY.");
+        Logger.info("Use one of:");
+        Logger.dim(`  ${chalk2.cyan("mcphosting login --token <token>")}`);
+        Logger.dim(`  ${chalk2.cyan("export MCPHOSTING_TOKEN=<token>")}`);
+      }
+      process.exit(1);
+    }
+    if (options.email || !process.stdout.isTTY) {
+      const email = options.email || await prompt(chalk2.cyan("Email: "));
+      const password = await prompt(chalk2.cyan("Password: "), true);
+      if (!email || !password) {
+        Logger.error("Email and password are required.");
+        process.exit(1);
+      }
+      const spinner2 = Logger.spinner("Logging in...");
+      try {
+        const api = new MCPHostingAPI();
+        const result = await api.login(email, password);
+        config.token = result.token;
+        config.refreshToken = result.refresh_token;
+        config.user = result.user;
+        spinner2.succeed(`Logged in as ${chalk2.bold(result.user.email)}`);
+        console.log("");
+        Logger.info(`Token stored in ${chalk2.dim("~/.config/mcphosting/")}`);
+        Logger.info(`Run ${chalk2.cyan("mcphosting deploy")} to deploy your first MCP server!`);
+      } catch (error) {
+        spinner2.fail("Login failed");
+        Logger.error(error.message || "Invalid email or password.");
+        process.exit(1);
       }
       return;
     }
-    const spinner = Logger.spinner("Starting login flow...");
+    if (process.stdout.isTTY) {
+      console.log("");
+      console.log(chalk2.bold("  \u{1F680} MCPHosting Login"));
+      console.log("");
+      console.log(`  ${chalk2.cyan("mcphosting login --github")}     ${chalk2.dim("Login with GitHub (recommended)")}`);
+      console.log(`  ${chalk2.cyan("mcphosting login --email")}      ${chalk2.dim("Login with email/password")}`);
+      console.log(`  ${chalk2.cyan("mcphosting login --browser")}    ${chalk2.dim("Login via browser")}`);
+      console.log(`  ${chalk2.cyan("mcphosting login --token")}      ${chalk2.dim("Use existing API token")}`);
+      console.log("");
+      Logger.info("Starting GitHub login (use --email for email/password)...");
+      console.log("");
+      await loginWithGitHub(config);
+      return;
+    }
+    const spinner = Logger.spinner("Opening browser for login...");
     let server;
-    let resolved = false;
     try {
       const authPromise = new Promise((resolve, reject) => {
         server = createServer((req, res) => {
@@ -263,9 +684,9 @@ function createAuthCommands() {
               res.writeHead(200, { "Content-Type": "text/html" });
               res.end(`
                   <html>
-                    <body style="font-family: system-ui; text-align: center; padding: 50px;">
+                    <body style="font-family: system-ui; text-align: center; padding: 50px; background: #0a0a0a; color: #fff;">
                       <h2>\u2705 Login Successful!</h2>
-                      <p>You can now close this window and return to your terminal.</p>
+                      <p style="color: #888;">You can close this window and return to your terminal.</p>
                     </body>
                   </html>
                 `);
@@ -274,9 +695,9 @@ function createAuthCommands() {
               res.writeHead(400, { "Content-Type": "text/html" });
               res.end(`
                   <html>
-                    <body style="font-family: system-ui; text-align: center; padding: 50px;">
+                    <body style="font-family: system-ui; text-align: center; padding: 50px; background: #0a0a0a; color: #fff;">
                       <h2>\u274C Login Failed</h2>
-                      <p>No token received. Please try again.</p>
+                      <p style="color: #888;">No token received. Please try again.</p>
                     </body>
                   </html>
                 `);
@@ -291,29 +712,32 @@ function createAuthCommands() {
           const port = server.address().port;
           const callbackUrl = `http://localhost:${port}/callback`;
           const authUrl = `https://mcphosting.com/cli/auth?callback=${encodeURIComponent(callbackUrl)}`;
+          spinner.text = "Waiting for browser login...";
           setTimeout(() => {
-            if (!resolved) {
-              reject(new Error("Login timeout - please try again"));
-            }
+            reject(new Error("Login timed out after 2 minutes. Try again."));
           }, 12e4);
           open(authUrl).catch(() => {
-            Logger.warning(`Could not open browser automatically. Please visit: ${authUrl}`);
+            spinner.info("Could not open browser automatically.");
+            Logger.info(`Open this URL manually: ${chalk2.blue(authUrl)}`);
           });
         });
       });
       const token = await authPromise;
-      resolved = true;
       spinner.succeed("Login successful!");
       config.token = token;
       const api = new MCPHostingAPI(token);
       const user = await api.whoami();
       if (user) {
         config.user = user;
-        Logger.success(`Logged in as ${user.email}${user.org ? ` (${user.org})` : ""}`);
+        Logger.success(`Logged in as ${chalk2.bold(user.email)}`);
       }
+      console.log("");
+      Logger.info(`Run ${chalk2.cyan("mcphosting deploy")} to deploy your first MCP server!`);
     } catch (error) {
       spinner.fail("Login failed");
-      Logger.error(`Login error: ${error}`);
+      Logger.error(error.message);
+      console.log("");
+      Logger.info(`Alternative: ${chalk2.cyan("mcphosting login --github")}`);
       process.exit(1);
     } finally {
       if (server) {
@@ -321,58 +745,173 @@ function createAuthCommands() {
       }
     }
   });
-  auth.command("logout").description("Remove stored authentication").action(() => {
-    const config = new Config();
-    config.token = void 0;
-    config.user = void 0;
-    Logger.success("Logged out successfully");
-  });
-  auth.command("whoami").description("Show current user information").action(async () => {
+}
+
+// src/commands/logout.ts
+import { Command as Command2 } from "commander";
+function createLogoutCommand() {
+  return new Command2("logout").description("Log out and remove stored credentials").option("--json", "Output as JSON").action((options) => {
     const config = new Config();
-    const token = config.token;
-    if (!token) {
-      Logger.warning("Not logged in. Use `mcphost auth login` to authenticate.");
+    const isJson = options.json || Logger.isJsonMode;
+    if (!config.token) {
+      if (isJson) {
+        console.log(JSON.stringify({ success: true, message: "Already logged out" }));
+      } else {
+        Logger.info("Already logged out.");
+      }
       return;
     }
-    const user = config.user;
-    if (user) {
-      Logger.info(`Logged in as: ${user.email}${user.org ? ` (${user.org})` : ""}`);
+    const email = config.user?.email;
+    config.token = void 0;
+    config.user = void 0;
+    if (isJson) {
+      console.log(JSON.stringify({ success: true, email: email || void 0 }));
+    } else if (email) {
+      Logger.success(`Logged out from ${email}`);
     } else {
-      Logger.warning("User info not available. Try logging in again.");
+      Logger.success("Logged out successfully.");
     }
   });
-  return auth;
 }
-function createLegacyAuthCommands() {
+
+// src/commands/deploy.ts
+import { Command as Command3 } from "commander";
+import { readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
+import { join as join3 } from "path";
+
+// src/lib/auth.ts
+function decodeJwtPayload(token) {
+  try {
+    const parts = token.split(".");
+    if (parts.length !== 3) return null;
+    const base64 = parts[1].replace(/-/g, "+").replace(/_/g, "/");
+    const json = Buffer.from(base64, "base64").toString("utf-8");
+    return JSON.parse(json);
+  } catch {
+    return null;
+  }
+}
+function isTokenExpiringSoon(token, thresholdSeconds = 300) {
+  const payload = decodeJwtPayload(token);
+  if (!payload || !payload.exp) return false;
+  const nowSeconds = Math.floor(Date.now() / 1e3);
+  return payload.exp - nowSeconds < thresholdSeconds;
+}
+function getAuthenticatedAPI() {
   const config = new Config();
-  const login2 = new Command("login").description("Authenticate with MCPHosting").option("--token <token>", "Provide API token directly").action(async (options) => {
-    const authCmd = createAuthCommands();
-    const loginCmd = authCmd.commands.find((cmd) => cmd.name() === "login");
-    if (loginCmd) {
-      await loginCmd.action(options);
-    }
-  });
-  const logout2 = new Command("logout").description("Remove stored authentication").action(() => {
-    config.token = void 0;
-    config.user = void 0;
-    Logger.success("Logged out successfully");
-  });
-  const whoami2 = new Command("whoami").description("Show current user information").action(async () => {
-    const authCmd = createAuthCommands();
-    const whoamiCmd = authCmd.commands.find((cmd) => cmd.name() === "whoami");
-    if (whoamiCmd) {
-      await whoamiCmd.action();
+  let token = config.token;
+  if (!token) {
+    Logger.error("Not logged in.");
+    Logger.info("Run `mcphosting login` to authenticate.");
+    process.exit(1);
+  }
+  if (isTokenExpiringSoon(token) && !config.isEnvToken) {
+    if (config.refreshToken) {
+      Logger.warning("Token expiring soon. Use async auth for auto-refresh, or run `mcphosting login`.");
+    } else {
+      Logger.warning("Token is expiring soon. Run `mcphosting login` to re-authenticate.");
     }
-  });
-  return [login2, logout2, whoami2];
+  }
+  const api = new MCPHostingAPI(token);
+  return { api, config };
+}
+function isAuthenticated() {
+  const config = new Config();
+  return !!config.token;
 }
 
-// src/commands/connect.ts
-import { Command as Command2 } from "commander";
+// src/lib/detector.ts
+import { readFile, readdir } from "fs/promises";
+import { join, basename } from "path";
+async function detectMCP(dir) {
+  try {
+    const files = await readdir(dir);
+    const configFiles = files.filter(
+      (f) => ["mcp.json", "mcp.config.json", "mcp.yaml", ".mcprc", "mcp.config.ts", "mcp.config.js"].includes(f)
+    );
+    let packageJson = null;
+    let hasMcpSdk = false;
+    let runtime = "unknown";
+    let entryPoint;
+    if (files.includes("package.json")) {
+      try {
+        const content = await readFile(join(dir, "package.json"), "utf-8");
+        packageJson = JSON.parse(content);
+        hasMcpSdk = !!(packageJson?.dependencies?.["@modelcontextprotocol/sdk"] || packageJson?.devDependencies?.["@modelcontextprotocol/sdk"]);
+        if (hasMcpSdk || packageJson?.dependencies?.["@modelcontextprotocol/sdk"]) {
+          runtime = "node";
+        }
+        if (packageJson?.main) {
+          entryPoint = packageJson.main;
+        } else if (packageJson?.bin) {
+          const bins = typeof packageJson.bin === "string" ? packageJson.bin : Object.values(packageJson.bin)[0];
+          entryPoint = bins;
+        }
+      } catch {
+      }
+    }
+    if (files.includes("pyproject.toml") || files.includes("requirements.txt") || files.includes("setup.py")) {
+      try {
+        let pythonDeps = "";
+        if (files.includes("requirements.txt")) {
+          pythonDeps = await readFile(join(dir, "requirements.txt"), "utf-8");
+        } else if (files.includes("pyproject.toml")) {
+          pythonDeps = await readFile(join(dir, "pyproject.toml"), "utf-8");
+        }
+        if (pythonDeps.includes("mcp") || pythonDeps.includes("modelcontextprotocol")) {
+          hasMcpSdk = true;
+          runtime = "python";
+        }
+      } catch {
+      }
+      if (files.includes("server.py")) entryPoint = "server.py";
+      else if (files.includes("main.py")) entryPoint = "main.py";
+      else if (files.includes("app.py")) entryPoint = "app.py";
+    }
+    if (!hasMcpSdk && configFiles.length === 0) {
+      const sourceFiles = files.filter((f) => f.endsWith(".ts") || f.endsWith(".js"));
+      for (const sf of sourceFiles.slice(0, 5)) {
+        try {
+          const content = await readFile(join(dir, sf), "utf-8");
+          if (content.includes("@modelcontextprotocol/sdk") || content.includes("McpServer") || content.includes("mcp.server")) {
+            hasMcpSdk = true;
+            runtime = sf.endsWith(".py") ? "python" : "node";
+            if (!entryPoint) entryPoint = sf;
+            break;
+          }
+        } catch {
+        }
+      }
+    }
+    if (!hasMcpSdk && configFiles.length === 0) {
+      return null;
+    }
+    let mcpConfig = null;
+    if (configFiles.length > 0) {
+      try {
+        const configContent = await readFile(join(dir, configFiles[0]), "utf-8");
+        mcpConfig = JSON.parse(configContent);
+      } catch {
+      }
+    }
+    const name = packageJson?.name || basename(dir);
+    return {
+      name,
+      hasMcpSdk,
+      configFiles,
+      packageJson,
+      mcpConfig,
+      runtime,
+      entryPoint
+    };
+  } catch {
+    return null;
+  }
+}
 
 // src/lib/clients.ts
-import { readFile, writeFile, access } from "fs/promises";
-import { join, dirname } from "path";
+import { readFile as readFile2, writeFile, access } from "fs/promises";
+import { join as join2, dirname } from "path";
 import { homedir } from "os";
 import { mkdir } from "fs/promises";
 var ClientManager = class {
@@ -380,10 +919,10 @@ var ClientManager = class {
     const home = homedir();
     const platform = process.platform;
     const paths = {
-      claude: platform === "win32" ? join(process.env.APPDATA || "", "Claude", "claude_desktop_config.json") : join(home, "Library", "Application Support", "Claude", "claude_desktop_config.json"),
-      cursor: join(home, ".cursor", "mcp.json"),
-      vscode: join(process.cwd(), ".vscode", "mcp.json"),
-      openclaw: join(home, ".openclaw", "mcp.json"),
+      claude: platform === "win32" ? join2(process.env.APPDATA || "", "Claude", "claude_desktop_config.json") : join2(home, "Library", "Application Support", "Claude", "claude_desktop_config.json"),
+      cursor: join2(home, ".cursor", "mcp.json"),
+      vscode: join2(process.cwd(), ".vscode", "mcp.json"),
+      openclaw: join2(home, ".openclaw", "mcp.json"),
       chatgpt: ""
       // Web-based, no local config
     };
@@ -428,7 +967,7 @@ var ClientManager = class {
       await mkdir(dirname(configPath), { recursive: true });
       let config = { mcpServers: {} };
       try {
-        const configContent = await readFile(configPath, "utf-8");
+        const configContent = await readFile2(configPath, "utf-8");
         config = JSON.parse(configContent);
         if (!config.mcpServers) {
           config.mcpServers = {};
@@ -459,7 +998,7 @@ var ClientManager = class {
       throw new Error(`Unsupported client: ${client}`);
     }
     try {
-      const configContent = await readFile(configPath, "utf-8");
+      const configContent = await readFile2(configPath, "utf-8");
       const config = JSON.parse(configContent);
       if (config.mcpServers && config.mcpServers[slug]) {
         delete config.mcpServers[slug];
@@ -510,29 +1049,368 @@ var ClientManager = class {
   }
 };
 
-// src/commands/connect.ts
-import chalk2 from "chalk";
-function createConnectCommands() {
-  const connect = new Command2("connect").description("Connect an MCP server to AI clients").argument("<url-or-slug>", "MCP server URL or slug").option("--client <client>", "Target specific client (claude, cursor, vscode, openclaw, chatgpt)").option("--name <name>", "Custom name for the connection").action(async (urlOrSlug, options) => {
-    const config = new Config();
-    const spinner = Logger.spinner("Setting up MCP connection...");
-    try {
-      const url = ClientManager.resolveUrl(urlOrSlug);
-      const slug = ClientManager.extractSlug(url);
-      const name = options.name || slug;
-      const existing = config.findConnection(slug);
-      if (existing) {
-        spinner.warn(`Already connected to ${slug}`);
-        Logger.info(`Use \`mcphost disconnect ${slug}\` to remove first`);
-        return;
+// src/commands/deploy.ts
+import chalk3 from "chalk";
+var TEMPLATES = ["weather", "crypto", "notion", "postgres", "blank"];
+function createDeployCommand() {
+  return new Command3("deploy").description("Deploy an MCP server to MCPHosting (one command)").option("--github <url>", "Deploy from a GitHub repository URL").option("--name <name>", "Server name (auto-detected if not provided)").option("--template <name>", "Deploy from a template (weather, crypto, notion, postgres, blank)").option("--api-url <url>", "Your MCP server's API URL (for external servers)").option("--auth <type>", "Auth type: none, api_key, or oauth", "none").option("--auto-key", "Automatically create an API key", true).option("--no-auto-key", "Skip automatic API key creation").option("--configure", "Automatically configure detected AI clients", false).option("--json", "Output result as JSON").option("--silent", "Suppress interactive output").action(async (options) => {
+    const isJson = options.json || Logger.isJsonMode;
+    const isSilent = options.silent || Logger.isSilent;
+    const { api, config } = getAuthenticatedAPI();
+    if (!isJson && !isSilent) {
+      console.log("");
+      console.log(chalk3.bold("\u{1F680} MCPHosting Deploy"));
+      console.log(chalk3.dim("   One command. Your MCP server goes live."));
+      console.log("");
+    }
+    if (options.template) {
+      const template = options.template.toLowerCase();
+      if (!TEMPLATES.includes(template)) {
+        Logger.error(`Unknown template: ${template}`);
+        console.log("");
+        Logger.info("Available templates:");
+        for (const t of TEMPLATES) {
+          console.log(`  ${chalk3.cyan(t)}`);
+        }
+        process.exit(1);
       }
-      const clients = [];
-      if (options.client) {
+      const name2 = options.name || `mcp-${template}`;
+      const spinner2 = Logger.spinner(`Deploying template ${chalk3.cyan(template)}...`);
+      try {
+        const result = await api.oneClickDeploy({
+          name: name2,
+          template,
+          authType: options.auth,
+          autoKey: options.autoKey
+        });
+        spinner2.succeed(`Template ${chalk3.cyan(template)} deployed!`);
+        if (isJson) {
+          Logger.json(result);
+        } else {
+          printOneClickResult(result, options.configure);
+        }
+        if (options.configure && result.connectionUrl) {
+          await autoConfigureClients(result.slug, result.connectionUrl);
+        }
+      } catch (error) {
+        spinner2.fail("Deploy failed");
+        Logger.error(error.message);
+        process.exit(1);
+      }
+      return;
+    }
+    if (options.github) {
+      const githubUrl2 = options.github;
+      const name2 = options.name || extractRepoName(githubUrl2);
+      const spinner2 = Logger.spinner(`Deploying from ${chalk3.cyan(githubUrl2)}...`);
+      try {
+        const result = await api.oneClickDeploy({
+          name: name2,
+          githubUrl: githubUrl2,
+          authType: options.auth,
+          autoKey: options.autoKey
+        });
+        spinner2.succeed("Deployed from GitHub!");
+        if (isJson) {
+          Logger.json(result);
+        } else {
+          printOneClickResult(result, options.configure);
+        }
+        if (options.configure && result.connectionUrl) {
+          await autoConfigureClients(result.slug, result.connectionUrl);
+        }
+      } catch (error) {
+        spinner2.fail("Deploy failed");
+        Logger.error(error.message);
+        process.exit(1);
+      }
+      return;
+    }
+    if (options.apiUrl) {
+      const name2 = options.name || new URL(options.apiUrl).hostname;
+      const spinner2 = Logger.spinner(`Registering ${chalk3.cyan(name2)}...`);
+      try {
+        const result = await api.oneClickDeploy({
+          name: name2,
+          baseApiUrl: options.apiUrl,
+          authType: options.auth,
+          autoKey: options.autoKey
+        });
+        spinner2.succeed("Registered successfully!");
+        if (isJson) {
+          Logger.json(result);
+        } else {
+          printOneClickResult(result, options.configure);
+        }
+        if (options.configure && result.connectionUrl) {
+          await autoConfigureClients(result.slug, result.connectionUrl);
+        }
+      } catch (error) {
+        spinner2.fail("Registration failed");
+        Logger.error(error.message);
+        process.exit(1);
+      }
+      return;
+    }
+    const dir = process.cwd();
+    let mcphostingConfig = null;
+    try {
+      const configContent = await readFile3(join3(dir, "mcphosting.json"), "utf-8");
+      mcphostingConfig = JSON.parse(configContent);
+    } catch {
+    }
+    const spinner = Logger.spinner("Detecting MCP server...");
+    const detected = await detectMCP(dir);
+    if (!detected && !mcphostingConfig) {
+      spinner.fail("No MCP server detected");
+      console.log("");
+      Logger.info("This directory doesn't look like an MCP server project.");
+      console.log("");
+      Logger.info(chalk3.bold("Quick options:"));
+      console.log(`  ${chalk3.cyan("mcphosting deploy --template weather")}   Deploy a template`);
+      console.log(`  ${chalk3.cyan("mcphosting deploy --github <url>")}       Deploy from GitHub`);
+      console.log(`  ${chalk3.cyan("mcphosting deploy --api-url <url>")}      Register external server`);
+      console.log(`  ${chalk3.cyan("mcphosting init")}                        Create mcphosting.json`);
+      console.log("");
+      process.exit(1);
+    }
+    const name = options.name || mcphostingConfig?.name || detected?.name || "my-mcp-server";
+    spinner.succeed(`Detected: ${chalk3.bold(name)}`);
+    if (detected) {
+      Logger.info(`  SDK: ${detected.hasMcpSdk ? chalk3.green("\u2713") : chalk3.yellow("\u25CB")} @modelcontextprotocol/sdk`);
+      if (detected.runtime !== "unknown") {
+        Logger.info(`  Runtime: ${detected.runtime}`);
+      }
+    }
+    let githubUrl = mcphostingConfig?.github || null;
+    if (!githubUrl) {
+      try {
+        const { execSync } = await import("child_process");
+        const remoteUrl = execSync("git remote get-url origin", { cwd: dir, encoding: "utf-8" }).trim();
+        if (remoteUrl.includes("github.com")) {
+          githubUrl = remoteUrl.replace(/^git@github\.com:/, "https://github.com/").replace(/\.git$/, "");
+        }
+      } catch {
+      }
+    }
+    if (githubUrl) {
+      Logger.info(`  GitHub: ${chalk3.dim(githubUrl)}`);
+    }
+    console.log("");
+    const deploySpinner = Logger.spinner(`Deploying ${chalk3.bold(name)}...`);
+    try {
+      const result = await api.oneClickDeploy({
+        name,
+        slug: mcphostingConfig?.slug,
+        githubUrl: githubUrl || void 0,
+        authType: options.auth,
+        autoKey: options.autoKey,
+        vercelProjectUrl: mcphostingConfig?.vercelUrl
+      });
+      deploySpinner.succeed("Deployed successfully!");
+      if (mcphostingConfig) {
+        try {
+          mcphostingConfig.connectionUrl = result.connectionUrl;
+          mcphostingConfig.projectId = result.projectId;
+          mcphostingConfig.slug = result.slug;
+          await writeFile2(join3(dir, "mcphosting.json"), JSON.stringify(mcphostingConfig, null, 2) + "\n");
+        } catch {
+        }
+      }
+      if (isJson) {
+        Logger.json(result);
+      } else {
+        printOneClickResult(result, options.configure);
+      }
+      if (options.configure && result.connectionUrl) {
+        await autoConfigureClients(result.slug, result.connectionUrl);
+      }
+    } catch (error) {
+      deploySpinner.fail("Deploy failed");
+      Logger.error(error.message);
+      if (error.message.includes("Authentication") || error.message.includes("Unauthorized")) {
+        Logger.info(`Run ${chalk3.cyan("mcphosting login")} first.`);
+      }
+      process.exit(1);
+    }
+  });
+}
+function extractRepoName(url) {
+  const parts = url.replace(/\.git$/, "").split("/");
+  return parts[parts.length - 1] || "mcp-server";
+}
+function printOneClickResult(result, showConfigureHint = false) {
+  console.log("");
+  console.log(chalk3.green.bold("  \u2705 Your MCP server is live!"));
+  console.log("");
+  Logger.info(`  ${chalk3.dim("Endpoint:")}  ${chalk3.blue(result.connectionUrl)}`);
+  if (result.slug) {
+    Logger.info(`  ${chalk3.dim("Slug:")}      ${chalk3.cyan(result.slug)}`);
+  }
+  if (result.status) {
+    const statusColor = result.status === "deployed" ? chalk3.green : chalk3.yellow;
+    Logger.info(`  ${chalk3.dim("Status:")}    ${statusColor(result.status)}`);
+  }
+  if (result.apiKey?.key) {
+    console.log("");
+    console.log(chalk3.bold("  \u{1F511} API Key (save this \u2014 shown only once):"));
+    console.log(`     ${chalk3.green(result.apiKey.key)}`);
+  }
+  if (result.vercelDeployUrl) {
+    console.log("");
+    console.log(chalk3.bold("  \u{1F310} Hosted on mcphosting.com infrastructure"));
+    console.log(chalk3.dim("     Your server is live and managed by MCPHosting."));
+  }
+  if (result.clientConfig) {
+    console.log("");
+    console.log(chalk3.bold("  \u{1F4CB} Add to your AI client:"));
+    console.log("");
+    console.log(chalk3.dim("  Claude Desktop (claude_desktop_config.json):"));
+    console.log(chalk3.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    console.log(chalk3.white(`  ${JSON.stringify(result.clientConfig.claude, null, 2).split("\n").join("\n  ")}`));
+    console.log("");
+    console.log(chalk3.dim("  Cursor / VS Code (.cursor/mcp.json):"));
+    console.log(chalk3.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    console.log(chalk3.white(`  ${JSON.stringify(result.clientConfig.cursor, null, 2).split("\n").join("\n  ")}`));
+  }
+  console.log("");
+  console.log(chalk3.dim("  Quick connect:"));
+  console.log(chalk3.cyan(`  mcphosting connect ${result.slug}`));
+  if (showConfigureHint) {
+    console.log("");
+    console.log(chalk3.dim("  Auto-configure AI clients:"));
+    console.log(chalk3.cyan(`  mcphosting deploy --configure`));
+  }
+  console.log("");
+  Logger.info(`Manage at ${chalk3.blue(`https://mcphosting.com/dashboard/servers/${result.projectId || result.slug}`)}`);
+  console.log("");
+}
+async function autoConfigureClients(slug, url) {
+  const clients = await ClientManager.detectInstalledClients();
+  const installed = clients.filter((c) => c.exists);
+  if (installed.length === 0) {
+    Logger.info("No AI clients detected. Add the config manually (shown above).");
+    return;
+  }
+  for (const client of installed) {
+    try {
+      const success = await ClientManager.addToClient(client.name, slug, url);
+      if (success) {
+        Logger.success(`Configured ${chalk3.bold(client.name)}`);
+      }
+    } catch (error) {
+      Logger.warning(`Failed to configure ${client.name}: ${error.message}`);
+    }
+  }
+}
+
+// src/commands/init.ts
+import { Command as Command4 } from "commander";
+import { writeFile as writeFile3, access as access3 } from "fs/promises";
+import { join as join4, basename as basename2 } from "path";
+import chalk4 from "chalk";
+var TEMPLATES2 = [
+  { name: "weather", description: "Weather data MCP server", repo: "gorlomi-enzo/mcp-template-weather" },
+  { name: "crypto", description: "Crypto prices & portfolio MCP", repo: "gorlomi-enzo/mcp-template-crypto" },
+  { name: "notion", description: "Notion integration MCP", repo: "gorlomi-enzo/mcp-template-notion" },
+  { name: "postgres", description: "PostgreSQL query MCP", repo: "gorlomi-enzo/mcp-template-postgres" },
+  { name: "blank", description: "Minimal MCP server scaffold", repo: "gorlomi-enzo/mcp-template-blank" }
+];
+function createInitCommand() {
+  return new Command4("init").description("Initialize mcphosting.json in the current directory").option("--name <name>", "Project name").option("--template <template>", "Initialize from a template").option("--list-templates", "List available templates").action(async (options) => {
+    console.log("");
+    console.log(chalk4.bold("\u{1F4E6} MCPHosting Init"));
+    console.log("");
+    if (options.listTemplates) {
+      console.log(chalk4.bold("Available templates:"));
+      console.log("");
+      for (const t of TEMPLATES2) {
+        console.log(`  ${chalk4.cyan(t.name.padEnd(12))} ${chalk4.dim(t.description)}`);
+        console.log(`  ${chalk4.dim(`             github.com/${t.repo}`)}`);
+        console.log("");
+      }
+      console.log(chalk4.dim(`Usage: mcphosting init --template <name>`));
+      return;
+    }
+    const dir = process.cwd();
+    const configPath = join4(dir, "mcphosting.json");
+    try {
+      await access3(configPath);
+      Logger.warning("mcphosting.json already exists in this directory.");
+      Logger.info(`Edit it manually or delete it and run ${chalk4.cyan("mcphosting init")} again.`);
+      return;
+    } catch {
+    }
+    const detected = await detectMCP(dir);
+    const projectName = options.name || detected?.name || basename2(dir);
+    const slug = projectName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60);
+    let githubUrl = null;
+    try {
+      const { execSync } = await import("child_process");
+      const remoteUrl = execSync("git remote get-url origin", { cwd: dir, encoding: "utf-8" }).trim();
+      if (remoteUrl.includes("github.com")) {
+        githubUrl = remoteUrl.replace(/^git@github\.com:/, "https://github.com/").replace(/\.git$/, "");
+      }
+    } catch {
+    }
+    const config = {
+      $schema: "https://mcphosting.com/schema/mcphosting.json",
+      name: projectName,
+      slug,
+      version: "1.0.0",
+      server: {
+        transport: "streamable-http",
+        port: 3e3,
+        path: "/mcp"
+      }
+    };
+    if (githubUrl) {
+      config.github = githubUrl;
+    }
+    if (options.template) {
+      config.template = options.template;
+    }
+    await writeFile3(configPath, JSON.stringify(config, null, 2) + "\n");
+    Logger.success(`Created ${chalk4.bold("mcphosting.json")}`);
+    console.log("");
+    console.log(chalk4.dim(JSON.stringify(config, null, 2)));
+    console.log("");
+    if (detected?.hasMcpSdk) {
+      Logger.info(`Detected MCP SDK (${detected.runtime})`);
+    }
+    if (githubUrl) {
+      Logger.info(`GitHub: ${chalk4.blue(githubUrl)}`);
+    }
+    console.log("");
+    Logger.info(`Next: ${chalk4.cyan("mcphosting deploy")} to deploy your MCP server`);
+    console.log("");
+  });
+}
+
+// src/commands/connect.ts
+import { Command as Command5 } from "commander";
+import chalk5 from "chalk";
+function createConnectCommand() {
+  return new Command5("connect").description("Connect an MCP server to your AI clients").argument("<url-or-slug>", "MCP server URL or slug (e.g. github, notion, https://my-mcp.com)").option("--client <client>", "Target specific client: claude, cursor, vscode, openclaw, chatgpt").option("--name <name>", "Custom name for the connection").action(async (urlOrSlug, options) => {
+    const config = new Config();
+    const spinner = Logger.spinner("Setting up MCP connection...");
+    try {
+      const url = ClientManager.resolveUrl(urlOrSlug);
+      const slug = ClientManager.extractSlug(url);
+      const name = options.name || slug;
+      const existing = config.findConnection(slug);
+      if (existing) {
+        spinner.warn(`Already connected to ${chalk5.cyan(slug)}`);
+        Logger.info(`Use ${chalk5.cyan(`mcphosting disconnect ${slug}`)} to remove first`);
+        return;
+      }
+      const clients = [];
+      if (options.client) {
         const clientName = options.client;
         const success = await ClientManager.addToClient(clientName, slug, url);
         if (success) {
           clients.push(clientName);
-          spinner.succeed(`Connected to ${clientName}`);
+          spinner.succeed(`Connected ${chalk5.bold(name)} to ${chalk5.green(clientName)}`);
         } else {
           spinner.fail(`Failed to connect to ${clientName}`);
           process.exit(1);
@@ -541,9 +1419,9 @@ function createConnectCommands() {
         const detectedClients = await ClientManager.detectInstalledClients();
         const availableClients = detectedClients.filter((c) => c.exists);
         if (availableClients.length === 0) {
-          spinner.warn("No supported clients found");
-          Logger.info("Supported clients: Claude Desktop, Cursor, VS Code, OpenClaw");
-          Logger.info("Install a client and try again, or use --client chatgpt for web setup");
+          spinner.warn("No supported AI clients detected");
+          Logger.info("Supported: Claude Desktop, Cursor, VS Code, OpenClaw");
+          Logger.info(`Use ${chalk5.cyan("--client chatgpt")} for web-based setup`);
           return;
         }
         spinner.text = `Configuring ${availableClients.length} client${availableClients.length > 1 ? "s" : ""}...`;
@@ -561,86 +1439,470 @@ function createConnectCommands() {
             Logger.warning(`Failed to configure ${client.name}: ${error}`);
           }
         }
-        spinner.succeed(`Connected to ${clients.length} client${clients.length > 1 ? "s" : ""}`);
+        spinner.succeed(`Connected ${chalk5.bold(name)} to ${clients.length} client${clients.length > 1 ? "s" : ""}`);
       }
-      config.addConnection({
-        slug,
-        url,
-        clients
-      });
-      Logger.success(`\u{1F517} ${name} connected successfully!`);
-      Logger.dim(`   URL: ${url}`);
-      Logger.dim(`   Clients: ${clients.join(", ")}`);
-      console.log("\n" + chalk2.green("\u{1F389} Connected! Share with your team:"));
-      console.log(chalk2.cyan(`npx mcphosting-cli connect ${urlOrSlug}`));
-      console.log("\n" + chalk2.yellow("\u2B50 Star us: ") + chalk2.blue("https://github.com/gorlomi-enzo/mcphosting-cli"));
+      config.addConnection({ slug, url, clients });
+      console.log("");
+      Logger.info(`  URL: ${chalk5.dim(url)}`);
+      Logger.info(`  Clients: ${chalk5.dim(clients.join(", "))}`);
+      console.log("");
+      console.log(chalk5.green("\u{1F389} Share with your team:"));
+      console.log(chalk5.cyan(`   npx mcphosting-cli connect ${urlOrSlug}`));
       console.log("");
     } catch (error) {
       spinner.fail("Connection failed");
-      Logger.error(`Error: ${error}`);
+      Logger.error(error.message);
       process.exit(1);
     }
   });
-  return connect;
 }
 function createDisconnectCommand() {
-  return new Command2("disconnect").description("Disconnect an MCP server").argument("<slug-or-id>", "MCP server slug or connection ID").action(async (slugOrId) => {
+  return new Command5("disconnect").description("Disconnect an MCP server").argument("<slug-or-id>", "MCP server slug or connection ID").action(async (slugOrId) => {
     const config = new Config();
     const connection = config.findConnection(slugOrId);
     if (!connection) {
       Logger.error(`Connection not found: ${slugOrId}`);
-      Logger.info("Use `mcphost list` to see active connections");
+      Logger.info(`Use ${chalk5.cyan("mcphosting list")} to see active connections`);
       return;
     }
     const spinner = Logger.spinner(`Disconnecting ${connection.slug}...`);
     try {
       const removedFrom = await ClientManager.removeFromAllClients(connection.slug);
       config.removeConnection(connection.id);
-      spinner.succeed(`Disconnected ${connection.slug}`);
+      spinner.succeed(`Disconnected ${chalk5.bold(connection.slug)}`);
       if (removedFrom.length > 0) {
         Logger.info(`Removed from: ${removedFrom.join(", ")}`);
       }
     } catch (error) {
       spinner.fail("Disconnect failed");
-      Logger.error(`Error: ${error}`);
+      Logger.error(error.message);
     }
   });
 }
+
+// src/commands/list.ts
+import { Command as Command6 } from "commander";
+import chalk6 from "chalk";
 function createListCommand() {
-  return new Command2("list").description("List connected MCP servers").option("--json", "Output as JSON").action(async (options) => {
+  return new Command6("list").description("List your MCP servers").option("--local", "Show locally connected servers only").option("--remote", "Show deployed servers only (requires login)").option("--json", "Output as JSON").action(async (options) => {
+    const isJson = options.json || Logger.isJsonMode;
+    const showLocal = options.local || !options.local && !options.remote;
+    const showRemote = options.remote || !options.local && !options.remote;
+    if (showLocal) {
+      const config = new Config();
+      const connections = config.connections;
+      if (connections.length > 0) {
+        if (isJson && !showRemote) {
+          Logger.json(connections);
+          return;
+        }
+        console.log("");
+        Logger.bold(`\u{1F4CB} Connected MCP Servers (${connections.length})`);
+        console.log("");
+        const tableData = connections.map((conn) => ({
+          Slug: conn.slug,
+          URL: conn.url.length > 50 ? conn.url.slice(0, 47) + "..." : conn.url,
+          Clients: conn.clients.join(", "),
+          Added: new Date(conn.addedAt).toLocaleDateString()
+        }));
+        Logger.table(tableData);
+        console.log("");
+      } else if (!showRemote) {
+        Logger.info("No local MCP connections.");
+        Logger.dim(`Use ${chalk6.cyan("mcphosting connect <slug>")} to connect one.`);
+        return;
+      }
+    }
+    if (showRemote && isAuthenticated()) {
+      const { api } = getAuthenticatedAPI();
+      const spinner = Logger.spinner("Fetching deployed servers...");
+      try {
+        const servers = await api.listServers();
+        spinner.stop();
+        if (servers.length === 0) {
+          if (!showLocal) {
+            Logger.info("No deployed servers yet.");
+            Logger.dim(`Use ${chalk6.cyan("mcphosting deploy")} to deploy your first MCP server.`);
+          }
+          return;
+        }
+        if (isJson) {
+          Logger.json(servers);
+          return;
+        }
+        Logger.bold(`\u{1F5A5}\uFE0F  Deployed Servers (${servers.length})`);
+        console.log("");
+        const tableData = servers.map((s) => ({
+          Name: s.name || s.slug,
+          Status: s.status === "active" ? chalk6.green("\u25CF active") : s.status === "deploying" ? chalk6.yellow("\u25D0 deploying") : s.status === "stopped" ? chalk6.dim("\u25CB stopped") : chalk6.red("\u2717 " + s.status),
+          Slug: s.slug,
+          URL: (s.url || "").length > 45 ? (s.url || "").slice(0, 42) + "..." : s.url || ""
+        }));
+        Logger.table(tableData);
+        console.log("");
+      } catch (error) {
+        spinner.fail("Failed to fetch servers");
+        Logger.error(error.message);
+      }
+    } else if (showRemote && !isAuthenticated()) {
+      Logger.dim(`Log in to see deployed servers: ${chalk6.cyan("mcphosting login")}`);
+      console.log("");
+    }
+  });
+}
+
+// src/commands/status.ts
+import { Command as Command7 } from "commander";
+import chalk7 from "chalk";
+function createStatusCommand() {
+  return new Command7("status").description("Check the status of a deployed MCP server").argument("<slug-or-id>", "Server slug or ID").option("--json", "Output as JSON").action(async (slugOrId, options) => {
+    const isJson = options.json || Logger.isJsonMode;
+    const { api } = getAuthenticatedAPI();
+    const spinner = Logger.spinner(`Checking status of ${chalk7.cyan(slugOrId)}...`);
+    try {
+      const server = await api.getServer(slugOrId);
+      spinner.stop();
+      if (isJson) {
+        Logger.json(server);
+        return;
+      }
+      console.log("");
+      console.log(chalk7.bold(`\u{1F4E1} ${server.name || server.slug}`));
+      console.log("");
+      const statusIcon = server.status === "active" ? chalk7.green("\u25CF Active") : server.status === "deploying" ? chalk7.yellow("\u25D0 Deploying") : server.status === "stopped" ? chalk7.dim("\u25CB Stopped") : chalk7.red("\u2717 " + server.status);
+      const info = [
+        { Property: "Status", Value: statusIcon },
+        { Property: "Slug", Value: server.slug },
+        { Property: "URL", Value: server.url || "\u2014" }
+      ];
+      if (server.sseUrl) {
+        info.push({ Property: "SSE URL", Value: server.sseUrl });
+      }
+      if (server.streamableUrl) {
+        info.push({ Property: "Streamable", Value: server.streamableUrl });
+      }
+      if (server.githubUrl) {
+        info.push({ Property: "GitHub", Value: server.githubUrl });
+      }
+      info.push(
+        { Property: "Created", Value: server.createdAt ? new Date(server.createdAt).toLocaleString() : "\u2014" },
+        { Property: "Updated", Value: server.updatedAt ? new Date(server.updatedAt).toLocaleString() : "\u2014" }
+      );
+      Logger.table(info);
+      if (server.tools && server.tools.length > 0) {
+        console.log("");
+        console.log(chalk7.yellow("\u{1F527} Tools:"));
+        server.tools.forEach((tool) => {
+          console.log(`  \u2022 ${tool}`);
+        });
+      }
+      if (server.envVars && server.envVars.length > 0) {
+        console.log("");
+        console.log(chalk7.yellow("\u{1F511} Environment Variables:"));
+        server.envVars.forEach((env) => {
+          console.log(`  ${env.key} = ${env.masked ? "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022" : "(set)"}`);
+        });
+      }
+      console.log("");
+    } catch (error) {
+      spinner.fail("Failed to get status");
+      Logger.error(error.message);
+      process.exit(1);
+    }
+  });
+}
+
+// src/commands/logs.ts
+import { Command as Command8 } from "commander";
+import chalk8 from "chalk";
+function createLogsCommand() {
+  return new Command8("logs").description("View logs for a deployed MCP server").argument("<slug-or-id>", "Server slug or ID").option("-n, --lines <number>", "Number of log lines to show", "50").option("--json", "Output as JSON").action(async (slugOrId, options) => {
+    const isJson = options.json || Logger.isJsonMode;
+    const { api } = getAuthenticatedAPI();
+    const lines = parseInt(options.lines);
+    const spinner = Logger.spinner(`Fetching logs for ${chalk8.cyan(slugOrId)}...`);
+    try {
+      const logs = await api.getServerLogs(slugOrId, lines);
+      spinner.stop();
+      if (logs.length === 0) {
+        if (isJson) {
+          console.log(JSON.stringify({ success: true, logs: [] }));
+        } else {
+          Logger.info("No logs available yet.");
+        }
+        return;
+      }
+      if (isJson) {
+        Logger.json(logs);
+        return;
+      }
+      console.log("");
+      console.log(chalk8.bold(`\u{1F4DC} Logs: ${slugOrId}`));
+      console.log(chalk8.dim("\u2500".repeat(60)));
+      console.log("");
+      for (const entry of logs) {
+        const time = chalk8.dim(new Date(entry.timestamp).toLocaleTimeString());
+        const level = entry.level === "error" ? chalk8.red("ERR") : entry.level === "warn" ? chalk8.yellow("WRN") : entry.level === "debug" ? chalk8.dim("DBG") : chalk8.blue("INF");
+        console.log(`${time} ${level} ${entry.message}`);
+      }
+      console.log("");
+      console.log(chalk8.dim(`Showing last ${logs.length} entries`));
+      console.log("");
+    } catch (error) {
+      spinner.fail("Failed to fetch logs");
+      Logger.error(error.message);
+      process.exit(1);
+    }
+  });
+}
+
+// src/commands/env.ts
+import { Command as Command9 } from "commander";
+import chalk9 from "chalk";
+function createEnvCommand() {
+  const env = new Command9("env").description("Manage environment variables for a deployed MCP server");
+  env.command("list").description("List environment variables").argument("<slug-or-id>", "Server slug or ID").option("--json", "Output as JSON").action(async (slugOrId, options) => {
+    const { api } = getAuthenticatedAPI();
+    const spinner = Logger.spinner("Fetching environment variables...");
+    try {
+      const envVars = await api.listEnvVars(slugOrId);
+      spinner.stop();
+      if (envVars.length === 0) {
+        Logger.info("No environment variables set.");
+        Logger.dim(`Add one: ${chalk9.cyan(`mcphosting env set ${slugOrId} KEY=value`)}`);
+        return;
+      }
+      if (options.json) {
+        Logger.json(envVars);
+        return;
+      }
+      console.log("");
+      Logger.bold(`\u{1F511} Environment Variables: ${slugOrId}`);
+      console.log("");
+      envVars.forEach((env2) => {
+        console.log(`  ${chalk9.cyan(env2.key)} = ${env2.masked ? chalk9.dim("\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022") : chalk9.dim("(set)")}`);
+      });
+      console.log("");
+    } catch (error) {
+      spinner.fail("Failed to fetch environment variables");
+      Logger.error(error.message);
+      process.exit(1);
+    }
+  });
+  env.command("set").description("Set an environment variable (KEY=value)").argument("<slug-or-id>", "Server slug or ID").argument("<key-value>", "Environment variable in KEY=value format").action(async (slugOrId, keyValue) => {
+    const eqIndex = keyValue.indexOf("=");
+    if (eqIndex === -1) {
+      Logger.error("Invalid format. Use KEY=value");
+      Logger.dim(`Example: ${chalk9.cyan(`mcphosting env set ${slugOrId} API_KEY=sk-abc123`)}`);
+      process.exit(1);
+    }
+    const key = keyValue.substring(0, eqIndex);
+    const value = keyValue.substring(eqIndex + 1);
+    if (!key) {
+      Logger.error("Key cannot be empty.");
+      process.exit(1);
+    }
+    const { api } = getAuthenticatedAPI();
+    const spinner = Logger.spinner(`Setting ${chalk9.cyan(key)}...`);
+    try {
+      await api.addEnvVar(slugOrId, key, value);
+      spinner.succeed(`Set ${chalk9.bold(key)} on ${chalk9.cyan(slugOrId)}`);
+    } catch (error) {
+      spinner.fail(`Failed to set ${key}`);
+      Logger.error(error.message);
+      process.exit(1);
+    }
+  });
+  env.command("remove").description("Remove an environment variable").argument("<slug-or-id>", "Server slug or ID").argument("<key>", "Environment variable key to remove").action(async (slugOrId, key) => {
+    const { api } = getAuthenticatedAPI();
+    const spinner = Logger.spinner(`Removing ${chalk9.cyan(key)}...`);
+    try {
+      await api.removeEnvVar(slugOrId, key);
+      spinner.succeed(`Removed ${chalk9.bold(key)} from ${chalk9.cyan(slugOrId)}`);
+    } catch (error) {
+      spinner.fail(`Failed to remove ${key}`);
+      Logger.error(error.message);
+      process.exit(1);
+    }
+  });
+  return env;
+}
+
+// src/commands/keys.ts
+import { Command as Command10 } from "commander";
+import chalk10 from "chalk";
+function createKeysCommand() {
+  const keys = new Command10("keys").description("Manage API keys");
+  keys.command("list").description("List your API keys").option("--json", "Output as JSON").action(async (options) => {
+    const { api } = getAuthenticatedAPI();
+    const spinner = Logger.spinner("Fetching API keys...");
+    try {
+      const apiKeys = await api.getAPIKeys();
+      spinner.stop();
+      if (apiKeys.length === 0) {
+        Logger.info("No API keys found.");
+        Logger.dim(`Create one: ${chalk10.cyan('mcphosting keys create "My Key"')}`);
+        return;
+      }
+      if (options.json) {
+        Logger.json(apiKeys);
+        return;
+      }
+      console.log("");
+      Logger.bold(`\u{1F511} API Keys (${apiKeys.length})`);
+      console.log("");
+      const tableData = apiKeys.map((key) => ({
+        Name: key.name,
+        Prefix: key.prefix + "...",
+        Created: new Date(key.createdAt).toLocaleDateString(),
+        "Last Used": key.lastUsedAt ? new Date(key.lastUsedAt).toLocaleDateString() : "Never"
+      }));
+      Logger.table(tableData);
+      console.log("");
+    } catch (error) {
+      spinner.fail("Failed to fetch API keys");
+      Logger.error(error.message);
+      process.exit(1);
+    }
+  });
+  keys.command("create").description("Create a new API key").argument("<name>", "Name for the API key").action(async (name) => {
+    const { api } = getAuthenticatedAPI();
+    const spinner = Logger.spinner("Creating API key...");
+    try {
+      const key = await api.createAPIKey(name);
+      spinner.succeed("API key created!");
+      console.log("");
+      Logger.bold("\u{1F511} New API Key");
+      console.log("");
+      Logger.info(`  Name:   ${chalk10.bold(key.name)}`);
+      Logger.info(`  Key:    ${chalk10.green(key.key || key.prefix + "...")}`);
+      Logger.info(`  ID:     ${chalk10.dim(key.id)}`);
+      console.log("");
+      Logger.warning("Save this key now \u2014 it won't be shown again!");
+      console.log("");
+    } catch (error) {
+      spinner.fail("Failed to create API key");
+      Logger.error(error.message);
+      process.exit(1);
+    }
+  });
+  keys.command("delete").description("Delete an API key").argument("<id>", "API key ID").action(async (id) => {
+    const { api } = getAuthenticatedAPI();
+    const spinner = Logger.spinner("Deleting API key...");
+    try {
+      await api.deleteAPIKey(id);
+      spinner.succeed(`API key ${chalk10.dim(id)} deleted.`);
+    } catch (error) {
+      spinner.fail("Failed to delete API key");
+      Logger.error(error.message);
+      process.exit(1);
+    }
+  });
+  return keys;
+}
+
+// src/commands/search.ts
+import { Command as Command11 } from "commander";
+import chalk11 from "chalk";
+function createSearchCommand() {
+  return new Command11("search").description("Search MCP servers in the marketplace").argument("<query>", "Search query").option("--limit <number>", "Maximum number of results", "10").option("--json", "Output as JSON").action(async (query, options) => {
     const config = new Config();
-    const connections = config.connections;
-    if (connections.length === 0) {
-      Logger.info("No MCP connections found");
-      Logger.dim("Use `mcphost connect <url>` to add one");
-      return;
+    const api = new MCPHostingAPI(config.token);
+    const spinner = Logger.spinner(`Searching for "${query}"...`);
+    try {
+      const results = await api.searchMCPs(query);
+      spinner.succeed(`Found ${results.length} MCP server(s)`);
+      if (results.length === 0) {
+        Logger.info("No MCP servers found.");
+        Logger.dim("Try: github, slack, notion, stripe, postgres, filesystem");
+        return;
+      }
+      const limit = parseInt(options.limit);
+      const limitedResults = results.slice(0, limit);
+      if (options.json) {
+        Logger.json(limitedResults);
+        return;
+      }
+      console.log("");
+      Logger.bold("\u{1F50D} Marketplace Results");
+      console.log("");
+      limitedResults.forEach((server, index) => {
+        console.log(chalk11.cyan(`${index + 1}. ${server.name}`));
+        console.log(`   ${chalk11.dim(server.description)}`);
+        console.log(`   ${chalk11.yellow("Slug:")} ${server.slug} | ${chalk11.yellow("Installs:")} ${server.installs.toLocaleString()} | ${chalk11.yellow("By:")} ${server.author}`);
+        console.log(`   ${chalk11.green("Tools:")} ${server.tools.join(", ")}`);
+        console.log(`   ${chalk11.blue("Connect:")} ${chalk11.dim(`mcphosting connect ${server.slug}`)}`);
+        console.log("");
+      });
+      if (results.length > limit) {
+        Logger.dim(`Showing ${limit} of ${results.length}. Use --limit for more.`);
+      }
+    } catch (error) {
+      spinner.fail("Search failed");
+      Logger.error(error.message);
+      process.exit(1);
     }
-    if (options.json) {
-      Logger.json(connections);
-      return;
+  });
+}
+function createInfoCommand() {
+  return new Command11("info").description("Show detailed information about an MCP server").argument("<slug>", "MCP server slug").option("--json", "Output as JSON").action(async (slug, options) => {
+    const config = new Config();
+    const api = new MCPHostingAPI(config.token);
+    const spinner = Logger.spinner(`Getting info for ${slug}...`);
+    try {
+      const server = await api.getMCPInfo(slug);
+      if (!server) {
+        spinner.fail(`Not found: ${slug}`);
+        Logger.info(`Use ${chalk11.cyan("mcphosting search <query>")} to find servers`);
+        return;
+      }
+      spinner.stop();
+      if (options.json) {
+        Logger.json(server);
+        return;
+      }
+      console.log("");
+      console.log(chalk11.bold.cyan(`\u{1F4E6} ${server.name}`));
+      console.log(chalk11.dim(server.description));
+      console.log("");
+      const info = [
+        { Property: "Slug", Value: server.slug },
+        { Property: "Author", Value: server.author },
+        { Property: "Installs", Value: server.installs.toLocaleString() },
+        { Property: "Tools", Value: server.tools.length.toString() }
+      ];
+      if (server.url) {
+        info.push({ Property: "URL", Value: server.url });
+      }
+      Logger.table(info);
+      console.log("");
+      console.log(chalk11.yellow("\u{1F527} Available Tools:"));
+      server.tools.forEach((tool) => console.log(`  \u2022 ${tool}`));
+      console.log("");
+      console.log(chalk11.green("\u{1F4A1} Quick Start:"));
+      console.log(chalk11.dim(`  mcphosting connect ${server.slug}`));
+      const connection = config.findConnection(slug);
+      if (connection) {
+        console.log("");
+        console.log(chalk11.blue("\u2139\uFE0F  Already connected to:"), connection.clients.join(", "));
+      }
+      console.log("");
+    } catch (error) {
+      spinner.fail("Failed to get info");
+      Logger.error(error.message);
+      process.exit(1);
     }
-    Logger.bold(`\u{1F4CB} Connected MCP Servers (${connections.length})`);
-    console.log("");
-    const tableData = connections.map((conn) => ({
-      Slug: conn.slug,
-      URL: conn.url.length > 50 ? conn.url.slice(0, 47) + "..." : conn.url,
-      Clients: conn.clients.join(", "),
-      Added: new Date(conn.addedAt).toLocaleDateString()
-    }));
-    Logger.table(tableData);
-    console.log("");
-    Logger.dim("Use `mcphost disconnect <slug>` to remove a connection");
   });
 }
 
 // src/commands/import.ts
-import { Command as Command3 } from "commander";
-import { readFile as readFile2, access as access2 } from "fs/promises";
-import { join as join2 } from "path";
+import { Command as Command12 } from "commander";
+import { readFile as readFile5, access as access4 } from "fs/promises";
+import { join as join5 } from "path";
 import { homedir as homedir2 } from "os";
-import chalk3 from "chalk";
+import chalk12 from "chalk";
 function createImportCommand() {
-  return new Command3("import").description("Import MCP connections from other tools").option("--from <tool>", "Import from: smithery", "smithery").option("--dry-run", "Show what would be imported without actually importing").option("--config-path <path>", "Custom config file path").action(async (options) => {
+  return new Command12("import").description("Import MCP connections from other tools").option("--from <tool>", "Import from: smithery", "smithery").option("--dry-run", "Show what would be imported without actually importing").option("--config-path <path>", "Custom config file path").action(async (options) => {
     if (options.from !== "smithery") {
       Logger.error("Only Smithery import is currently supported");
       Logger.info("Usage: mcphost import --from smithery");
@@ -655,16 +1917,16 @@ async function importFromSmitery(options) {
   try {
     const smitheryPaths = [
       options.configPath,
-      join2(homedir2(), ".smithery", "config.json"),
-      join2(homedir2(), ".config", "smithery", "config.json"),
-      join2(homedir2(), "Library", "Application Support", "smithery", "config.json"),
-      join2(process.cwd(), "smithery.json"),
-      join2(process.cwd(), ".smithery.json")
+      join5(homedir2(), ".smithery", "config.json"),
+      join5(homedir2(), ".config", "smithery", "config.json"),
+      join5(homedir2(), "Library", "Application Support", "smithery", "config.json"),
+      join5(process.cwd(), "smithery.json"),
+      join5(process.cwd(), ".smithery.json")
     ].filter(Boolean);
     let smitheryConfigPath = null;
     for (const path of smitheryPaths) {
       try {
-        await access2(path);
+        await access4(path);
         smitheryConfigPath = path;
         break;
       } catch {
@@ -680,7 +1942,7 @@ async function importFromSmitery(options) {
     }
     spinner.succeed(`Found Smithery config: ${smitheryConfigPath}`);
     const loadSpinner = Logger.spinner("Reading Smithery config...");
-    const configContent = await readFile2(smitheryConfigPath, "utf-8");
+    const configContent = await readFile5(smitheryConfigPath, "utf-8");
     const smitheryConfig = JSON.parse(configContent);
     const servers = {
       ...smitheryConfig.servers,
@@ -693,14 +1955,14 @@ async function importFromSmitery(options) {
     const serverEntries = Object.entries(servers);
     loadSpinner.succeed(`Found ${serverEntries.length} MCP server(s) in Smithery config`);
     if (options.dryRun) {
-      console.log("\n" + chalk3.bold("\u{1F50D} Preview: Would import the following MCP servers:"));
+      console.log("\n" + chalk12.bold("\u{1F50D} Preview: Would import the following MCP servers:"));
       console.log("");
       serverEntries.forEach(([slug, serverConfig]) => {
         const url = serverConfig.url || `https://${slug}.mcphost.dev`;
-        console.log(`\u2022 ${chalk3.cyan(slug)}`);
-        console.log(`  URL: ${chalk3.dim(url)}`);
+        console.log(`\u2022 ${chalk12.cyan(slug)}`);
+        console.log(`  URL: ${chalk12.dim(url)}`);
         if (serverConfig.command) {
-          console.log(`  Command: ${chalk3.dim(serverConfig.command + " " + (serverConfig.args?.join(" ") || ""))}`);
+          console.log(`  Command: ${chalk12.dim(serverConfig.command + " " + (serverConfig.args?.join(" ") || ""))}`);
         }
         console.log("");
       });
@@ -765,9 +2027,9 @@ async function importFromSmitery(options) {
     }
     console.log("");
     Logger.info("Use `mcphost list` to see your imported connections");
-    console.log("\n" + chalk3.green("\u{1F389} Welcome to MCPHosting! Share with your team:"));
-    console.log(chalk3.cyan("npx mcphosting-cli import --from smithery"));
-    console.log("\n" + chalk3.yellow("\u2B50 Star us: ") + chalk3.blue("https://github.com/gorlomi-enzo/mcphosting-cli"));
+    console.log("\n" + chalk12.green("\u{1F389} Welcome to MCPHosting! Share with your team:"));
+    console.log(chalk12.cyan("npx mcphosting-cli import --from smithery"));
+    console.log("\n" + chalk12.yellow("\u2B50 Star us: ") + chalk12.blue("https://github.com/gorlomi-enzo/mcphosting-cli"));
     console.log("");
   } catch (error) {
     spinner.fail("Import failed");
@@ -780,9 +2042,9 @@ async function importFromSmitery(options) {
 }
 
 // src/commands/proxy.ts
-import { Command as Command4 } from "commander";
+import { Command as Command13 } from "commander";
 function createProxyCommand() {
-  return new Command4("proxy").description("Start a local STDIO MCP proxy to a remote server").argument("<url>", "Remote MCP server URL").option("--quiet", "Suppress startup messages").action(async (url, options) => {
+  return new Command13("proxy").description("Start a local STDIO MCP proxy to a remote server").argument("<url>", "Remote MCP server URL").option("--quiet", "Suppress startup messages").action(async (url, options) => {
     if (!options.quiet) {
       console.error("\u{1F517} Proxying via mcphosting.com");
       console.error(`\u{1F4E1} Remote server: ${url}`);
@@ -879,279 +2141,478 @@ async function forwardMessage(url, message, quiet) {
   }
 }
 
-// src/commands/search.ts
-import { Command as Command5 } from "commander";
-import chalk4 from "chalk";
-function createSearchCommand() {
-  return new Command5("search").description("Search MCP servers in the marketplace").argument("<query>", "Search query").option("--limit <number>", "Maximum number of results", "10").option("--json", "Output as JSON").action(async (query, options) => {
+// src/commands/whoami.ts
+import { Command as Command14 } from "commander";
+import chalk13 from "chalk";
+function createWhoamiCommand() {
+  return new Command14("whoami").description("Show current logged-in user").option("--json", "Output as JSON").action(async (options) => {
     const config = new Config();
-    const api = new MCPHostingAPI(config.token);
-    const spinner = Logger.spinner(`Searching for "${query}"...`);
-    try {
-      const results = await api.searchMCPs(query);
-      spinner.succeed(`Found ${results.length} MCP server(s)`);
-      if (results.length === 0) {
-        Logger.info("No MCP servers found matching your query");
-        Logger.dim("Try searching for: github, slack, notion, stripe, postgres, filesystem");
-        return;
+    const token = config.token;
+    if (!token) {
+      if (options.json || Logger.isJsonMode) {
+        console.log(JSON.stringify({ success: false, logged_in: false, error: "Not logged in" }));
+      } else {
+        Logger.info("Not logged in.");
+        Logger.dim(`Run ${chalk13.cyan("mcphosting login")} to authenticate.`);
       }
-      const limit = parseInt(options.limit);
-      const limitedResults = results.slice(0, limit);
-      if (options.json) {
-        Logger.json(limitedResults);
-        return;
+      return;
+    }
+    const api = new MCPHostingAPI(token);
+    const user = await api.whoami();
+    if (!user && token) {
+      if (options.json || Logger.isJsonMode) {
+        console.log(JSON.stringify({
+          success: false,
+          logged_in: false,
+          error: "Token expired",
+          cached_email: config.user?.email
+        }));
+      } else {
+        Logger.warning("Token expired. Run `mcphosting login` to re-authenticate.");
+        if (config.user?.email) {
+          Logger.dim(`  Cached email: ${config.user.email}`);
+        }
       }
+      return;
+    }
+    const result = {
+      success: true,
+      logged_in: true,
+      email: user?.email || config.user?.email || "unknown",
+      org: user?.org || config.user?.org || void 0,
+      token_source: config.isEnvToken ? "environment" : "config"
+    };
+    if (options.json || Logger.isJsonMode) {
+      console.log(JSON.stringify(result));
+    } else {
       console.log("");
-      Logger.bold(`\u{1F50D} MCP Marketplace Search Results`);
-      console.log("");
-      limitedResults.forEach((server, index) => {
-        console.log(chalk4.cyan(`${index + 1}. ${server.name}`));
-        console.log(`   ${chalk4.dim(server.description)}`);
-        console.log(`   ${chalk4.yellow("Slug:")} ${server.slug} | ${chalk4.yellow("Installs:")} ${server.installs.toLocaleString()} | ${chalk4.yellow("Author:")} ${server.author}`);
-        console.log(`   ${chalk4.green("Tools:")} ${server.tools.join(", ")}`);
-        if (server.url) {
-          console.log(`   ${chalk4.blue("Connect:")} ${chalk4.dim(`mcphost connect ${server.slug}`)}`);
-        }
-        console.log("");
-      });
-      if (results.length > limit) {
-        Logger.dim(`Showing ${limit} of ${results.length} results. Use --limit to see more.`);
+      Logger.success(`Logged in as ${chalk13.bold(result.email)}${result.org ? ` (${result.org})` : ""}`);
+      if (config.isEnvToken) {
+        Logger.dim("  Token source: MCPHOSTING_TOKEN environment variable");
       }
-      Logger.info("Use `mcphost info <slug>` for detailed information");
-      Logger.info("Use `mcphost connect <slug>` to install");
-    } catch (error) {
-      spinner.fail("Search failed");
-      Logger.error(`Error: ${error}`);
-      process.exit(1);
+      console.log("");
     }
   });
 }
-function createInfoCommand() {
-  return new Command5("info").description("Show detailed information about an MCP server").argument("<slug>", "MCP server slug").option("--json", "Output as JSON").action(async (slug, options) => {
+
+// src/commands/account-status.ts
+import { Command as Command15 } from "commander";
+import chalk14 from "chalk";
+function createAccountCommand() {
+  return new Command15("account").description("Show MCPHosting account status, plan, and servers").option("--json", "Output as JSON").action(async (options) => {
     const config = new Config();
-    const api = new MCPHostingAPI(config.token);
-    const spinner = Logger.spinner(`Getting info for ${slug}...`);
-    try {
-      const server = await api.getMCPInfo(slug);
-      if (!server) {
-        spinner.fail(`MCP server not found: ${slug}`);
-        Logger.info("Use `mcphost search <query>` to find servers");
-        return;
+    if (!isAuthenticated()) {
+      if (options.json || Logger.isJsonMode) {
+        console.log(JSON.stringify({
+          success: false,
+          logged_in: false,
+          error: "Not logged in"
+        }));
+      } else {
+        Logger.error("Not logged in.");
+        Logger.info(`Run ${chalk14.cyan("mcphosting login")} to authenticate.`);
       }
-      spinner.succeed("Found server info");
-      if (options.json) {
-        Logger.json(server);
+      return;
+    }
+    const { api } = getAuthenticatedAPI();
+    try {
+      const [user, servers] = await Promise.all([
+        api.whoami(),
+        api.listServers().catch(() => [])
+      ]);
+      const result = {
+        success: true,
+        logged_in: true,
+        email: user?.email || config.user?.email || "unknown",
+        org: user?.org || config.user?.org || void 0,
+        plan: user?.plan || "free",
+        token_source: config.isEnvToken ? "environment" : "config",
+        servers: servers.map((s) => ({
+          name: s.name || s.slug,
+          slug: s.slug,
+          url: s.url || "",
+          status: s.status || "unknown"
+        }))
+      };
+      if (options.json || Logger.isJsonMode) {
+        console.log(JSON.stringify(result));
         return;
       }
       console.log("");
-      console.log(chalk4.bold.cyan(`\u{1F4E6} ${server.name}`));
-      console.log(chalk4.dim(server.description));
+      Logger.bold("\u{1F4CA} MCPHosting Account");
       console.log("");
-      const infoTable = [
-        { Property: "Slug", Value: server.slug },
-        { Property: "Author", Value: server.author },
-        { Property: "Installs", Value: server.installs.toLocaleString() },
-        { Property: "Tools", Value: server.tools.length.toString() }
-      ];
-      if (server.url) {
-        infoTable.push({ Property: "URL", Value: server.url });
+      Logger.info(`  ${chalk14.dim("Email:")}   ${chalk14.bold(result.email)}`);
+      if (result.org) {
+        Logger.info(`  ${chalk14.dim("Org:")}     ${result.org}`);
       }
-      Logger.table(infoTable);
-      console.log("");
-      console.log(chalk4.yellow("\u{1F527} Available Tools:"));
-      server.tools.forEach((tool) => {
-        console.log(`  \u2022 ${tool}`);
-      });
+      Logger.info(`  ${chalk14.dim("Plan:")}    ${chalk14.cyan(result.plan)}`);
+      Logger.info(`  ${chalk14.dim("Servers:")} ${result.servers.length}`);
       console.log("");
-      console.log(chalk4.green("\u{1F4A1} Quick Start:"));
-      console.log(chalk4.dim(`  mcphost connect ${server.slug}`));
-      const connection = config.findConnection(slug);
-      if (connection) {
+      if (result.servers.length > 0) {
+        Logger.bold("\u{1F5A5}\uFE0F  Your MCP Servers");
         console.log("");
-        console.log(chalk4.blue("\u2139\uFE0F  Already connected to:"), connection.clients.join(", "));
+        const tableData = result.servers.map((s) => ({
+          Name: s.name,
+          Status: s.status === "active" ? chalk14.green("\u25CF active") : s.status === "deploying" ? chalk14.yellow("\u25D0 deploying") : s.status === "stopped" ? chalk14.dim("\u25CB stopped") : chalk14.red("\u2717 " + s.status),
+          URL: s.url.length > 40 ? s.url.slice(0, 37) + "..." : s.url
+        }));
+        Logger.table(tableData);
+      } else {
+        Logger.dim("  No servers deployed yet.");
+        Logger.dim(`  Run ${chalk14.cyan("mcphosting deploy --template weather")} to get started.`);
       }
+      console.log("");
     } catch (error) {
-      spinner.fail("Failed to get server info");
-      Logger.error(`Error: ${error}`);
-      process.exit(1);
+      if (options.json || Logger.isJsonMode) {
+        console.log(JSON.stringify({ success: false, error: error.message }));
+      } else {
+        Logger.error(error.message);
+      }
     }
   });
 }
 
-// src/commands/servers.ts
-import { Command as Command6 } from "commander";
-function createServersCommand() {
-  const servers = new Command6("servers");
-  servers.description("Manage your hosted MCP servers");
-  servers.command("list").description("List your MCP servers").action(async () => {
-    const config = new Config();
-    if (!config.token) {
-      Logger.warning("Authentication required");
-      Logger.info("Use `mcphost login` to authenticate with MCPHosting");
-      return;
-    }
-    Logger.info("\u{1F6A7} Server management coming soon!");
-    console.log("");
-    console.log("This feature will let you:");
-    console.log("\u2022 List your hosted MCP servers");
-    console.log("\u2022 View usage analytics");
-    console.log("\u2022 Manage API keys");
-    console.log("\u2022 Publish to marketplace");
-    console.log("");
-    Logger.info("Visit https://mcphosting.com to manage servers in the web dashboard");
-  });
-  return servers;
+// src/commands/completions.ts
+import { Command as Command16 } from "commander";
+import chalk15 from "chalk";
+var BASH_COMPLETIONS = `
+# mcphosting bash completions
+_mcphosting_completions() {
+  local cur="\${COMP_WORDS[COMP_CWORD]}"
+  local prev="\${COMP_WORDS[COMP_CWORD-1]}"
+  local commands="login logout deploy init connect disconnect list status logs env keys search info import proxy whoami account completions"
+  local templates="weather crypto notion postgres blank runescape reminder search"
+  local global_opts="--help --version --json --silent"
+
+  case "\${prev}" in
+    mcphosting|mcphost)
+      COMPREPLY=( $(compgen -W "\${commands} \${global_opts}" -- "\${cur}") )
+      return 0
+      ;;
+    deploy)
+      COMPREPLY=( $(compgen -W "--template --github --api-url --name --auth --json --silent --configure --no-auto-key" -- "\${cur}") )
+      return 0
+      ;;
+    --template)
+      COMPREPLY=( $(compgen -W "\${templates}" -- "\${cur}") )
+      return 0
+      ;;
+    --auth)
+      COMPREPLY=( $(compgen -W "none api_key oauth" -- "\${cur}") )
+      return 0
+      ;;
+    --shell)
+      COMPREPLY=( $(compgen -W "bash zsh fish" -- "\${cur}") )
+      return 0
+      ;;
+    env)
+      COMPREPLY=( $(compgen -W "list set remove" -- "\${cur}") )
+      return 0
+      ;;
+    keys)
+      COMPREPLY=( $(compgen -W "list create delete" -- "\${cur}") )
+      return 0
+      ;;
+    login)
+      COMPREPLY=( $(compgen -W "--github --email --token --browser --json" -- "\${cur}") )
+      return 0
+      ;;
+    list)
+      COMPREPLY=( $(compgen -W "--local --remote --json" -- "\${cur}") )
+      return 0
+      ;;
+    status|logs)
+      COMPREPLY=( $(compgen -W "--json" -- "\${cur}") )
+      return 0
+      ;;
+    *)
+      COMPREPLY=( $(compgen -W "\${global_opts}" -- "\${cur}") )
+      return 0
+      ;;
+  esac
 }
-function createKeysCommand() {
-  const keys = new Command6("keys");
-  keys.description("Manage API keys for your MCP servers");
-  keys.command("list").argument("[server-id]", "Server ID").description("List API keys").action(async (serverId) => {
-    const config = new Config();
-    if (!config.token) {
-      Logger.warning("Authentication required");
-      Logger.info("Use `mcphost login` to authenticate");
-      return;
-    }
-    Logger.info("\u{1F6A7} API key management coming soon!");
-    Logger.info("Visit https://mcphosting.com to manage keys in the web dashboard");
-  });
-  keys.command("create").argument("<server-id>", "Server ID").option("--name <name>", "Key name", "CLI Key").description("Create a new API key").action(async (serverId, options) => {
-    const config = new Config();
-    if (!config.token) {
-      Logger.warning("Authentication required");
-      Logger.info("Use `mcphost login` to authenticate");
-      return;
-    }
-    Logger.info("\u{1F6A7} API key creation coming soon!");
-    Logger.info("Visit https://mcphosting.com to create keys in the web dashboard");
-  });
-  keys.command("revoke").argument("<key-id>", "API key ID").description("Revoke an API key").action(async (keyId) => {
-    const config = new Config();
-    if (!config.token) {
-      Logger.warning("Authentication required");
-      Logger.info("Use `mcphost login` to authenticate");
-      return;
-    }
-    Logger.info("\u{1F6A7} API key revocation coming soon!");
-    Logger.info("Visit https://mcphosting.com to revoke keys in the web dashboard");
-  });
-  return keys;
+complete -F _mcphosting_completions mcphosting
+complete -F _mcphosting_completions mcphost
+`.trim();
+var ZSH_COMPLETIONS = `
+#compdef mcphosting mcphost
+
+_mcphosting() {
+  local -a commands templates global_opts
+
+  commands=(
+    'login:Authenticate with MCPHosting'
+    'logout:Log out and remove stored credentials'
+    'deploy:Deploy an MCP server to MCPHosting'
+    'init:Initialize mcphosting.json in the current directory'
+    'connect:Connect an MCP server to your AI clients'
+    'disconnect:Disconnect an MCP server'
+    'list:List your MCP servers'
+    'status:Check the status of a deployed MCP server'
+    'logs:View logs for a deployed MCP server'
+    'env:Manage environment variables'
+    'keys:Manage API keys'
+    'search:Search MCP servers in the marketplace'
+    'info:Show detailed information about an MCP server'
+    'import:Import MCP connections from other tools'
+    'proxy:Start a local STDIO MCP proxy'
+    'whoami:Show current logged-in user'
+    'account:Show MCPHosting account status'
+    'completions:Generate shell completions'
+  )
+
+  templates=(weather crypto notion postgres blank runescape reminder search)
+  global_opts=(--help --version --json --silent)
+
+  _arguments -C \\
+    '1:command:->cmd' \\
+    '*::arg:->args'
+
+  case "$state" in
+    cmd)
+      _describe -t commands 'mcphosting commands' commands
+      _values 'global options' $global_opts
+      ;;
+    args)
+      case "$words[1]" in
+        deploy)
+          _arguments \\
+            '--template[Deploy from template]:template:(weather crypto notion postgres blank runescape reminder search)' \\
+            '--github[Deploy from GitHub URL]:url:' \\
+            '--api-url[External server URL]:url:' \\
+            '--name[Server name]:name:' \\
+            '--auth[Auth type]:auth:(none api_key oauth)' \\
+            '--json[Output as JSON]' \\
+            '--silent[Suppress interactive output]' \\
+            '--configure[Auto-configure AI clients]' \\
+            '--no-auto-key[Skip API key creation]'
+          ;;
+        completions)
+          _arguments '--shell[Shell type]:shell:(bash zsh fish)'
+          ;;
+        login)
+          _arguments '--github' '--email:email:' '--token:token:' '--browser' '--json'
+          ;;
+        *)
+          _arguments '--json[Output as JSON]'
+          ;;
+      esac
+      ;;
+  esac
 }
-function createPublishCommand() {
-  return new Command6("publish").description("Publish MCP server to marketplace").argument("[server-id]", "Server ID to publish").option("--private", "Keep server private").option("--description <desc>", "Server description").option("--tags <tags>", "Comma-separated tags").action(async (serverId, options = {}) => {
-    const config = new Config();
-    if (!config.token) {
-      Logger.warning("Authentication required");
-      Logger.info("Use `mcphost login` to authenticate");
-      return;
-    }
-    Logger.info("\u{1F6A7} Marketplace publishing coming soon!");
-    console.log("");
-    console.log("This feature will let you:");
-    console.log("\u2022 Publish your MCP servers to the marketplace");
-    console.log("\u2022 Set descriptions and tags");
-    console.log("\u2022 Configure public/private visibility");
-    console.log("\u2022 Track usage analytics");
-    console.log("");
-    Logger.info("Visit https://mcphosting.com to publish servers via the web dashboard");
-    if (serverId) {
-      Logger.dim(`Would publish server: ${serverId}`);
-    }
-    if (options.description) {
-      Logger.dim(`Description: ${options.description}`);
-    }
-    if (options.tags) {
-      Logger.dim(`Tags: ${options.tags}`);
+
+_mcphosting "$@"
+`.trim();
+var FISH_COMPLETIONS = `
+# mcphosting fish completions
+set -l commands login logout deploy init connect disconnect list status logs env keys search info import proxy whoami account completions
+set -l templates weather crypto notion postgres blank runescape reminder search
+
+complete -c mcphosting -f
+complete -c mcphost -f
+
+# Commands
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a login -d "Authenticate with MCPHosting"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a logout -d "Log out"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a deploy -d "Deploy an MCP server"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a init -d "Initialize mcphosting.json"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a connect -d "Connect MCP to AI clients"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a disconnect -d "Disconnect MCP server"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a list -d "List servers"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a status -d "Check server status"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a logs -d "View logs"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a env -d "Manage env vars"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a keys -d "Manage API keys"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a search -d "Search marketplace"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a info -d "MCP server info"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a import -d "Import connections"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a proxy -d "STDIO proxy"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a whoami -d "Show current user"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a account -d "Account status"
+complete -c mcphosting -n "not __fish_seen_subcommand_from $commands" -a completions -d "Generate completions"
+
+# Global
+complete -c mcphosting -l json -d "Output as JSON"
+complete -c mcphosting -l silent -d "Suppress interactive output"
+complete -c mcphosting -l help -d "Show help"
+complete -c mcphosting -l version -d "Show version"
+
+# Deploy options
+complete -c mcphosting -n "__fish_seen_subcommand_from deploy" -l template -xa "$templates" -d "Template name"
+complete -c mcphosting -n "__fish_seen_subcommand_from deploy" -l github -d "GitHub URL"
+complete -c mcphosting -n "__fish_seen_subcommand_from deploy" -l api-url -d "API URL"
+complete -c mcphosting -n "__fish_seen_subcommand_from deploy" -l name -d "Server name"
+complete -c mcphosting -n "__fish_seen_subcommand_from deploy" -l auth -xa "none api_key oauth" -d "Auth type"
+complete -c mcphosting -n "__fish_seen_subcommand_from deploy" -l configure -d "Auto-configure clients"
+
+# Completions options
+complete -c mcphosting -n "__fish_seen_subcommand_from completions" -l shell -xa "bash zsh fish" -d "Shell type"
+`.trim();
+function createCompletionsCommand() {
+  return new Command16("completions").description("Generate shell completions (bash, zsh, fish)").option("--shell <shell>", "Shell type: bash, zsh, or fish").action((options) => {
+    const shell = options.shell?.toLowerCase() || detectShell();
+    switch (shell) {
+      case "bash":
+        console.log(BASH_COMPLETIONS);
+        if (!options.shell) {
+          console.error("");
+          console.error(chalk15.dim("# Add to ~/.bashrc:"));
+          console.error(chalk15.cyan("#   mcphosting completions --shell=bash >> ~/.bashrc"));
+        }
+        break;
+      case "zsh":
+        console.log(ZSH_COMPLETIONS);
+        if (!options.shell) {
+          console.error("");
+          console.error(chalk15.dim("# Save to a file in your fpath:"));
+          console.error(chalk15.cyan("#   mcphosting completions --shell=zsh > ~/.zfunc/_mcphosting"));
+        }
+        break;
+      case "fish":
+        console.log(FISH_COMPLETIONS);
+        if (!options.shell) {
+          console.error("");
+          console.error(chalk15.dim("# Save to completions dir:"));
+          console.error(chalk15.cyan("#   mcphosting completions --shell=fish > ~/.config/fish/completions/mcphosting.fish"));
+        }
+        break;
+      default:
+        Logger.error(`Unknown shell: ${shell}`);
+        Logger.info("Supported shells: bash, zsh, fish");
+        Logger.info("Usage: mcphosting completions --shell=bash");
+        process.exit(1);
     }
   });
 }
+function detectShell() {
+  const shell = process.env.SHELL || "";
+  if (shell.includes("zsh")) return "zsh";
+  if (shell.includes("fish")) return "fish";
+  return "bash";
+}
 
 // src/index.ts
-import chalk5 from "chalk";
-var program = new Command7();
-program.name("mcphost").description("Connect AI agents to MCP servers. Browse, install, and manage Model Context Protocol servers.").version("0.1.0").configureOutput({
+var program = new Command17();
+program.name("mcphosting").description("Deploy and manage MCP servers from the terminal").version("1.0.0").option("--json", "Output all results as JSON (agent-friendly)").option("--silent", "Suppress interactive output and prompts").configureOutput({
   outputError: (str, write) => {
-    write(chalk5.red(str));
+    if (Logger.isJsonMode) {
+      write(JSON.stringify({ success: false, error: str.trim() }));
+    } else {
+      write(chalk16.red(str));
+    }
+  }
+}).hook("preAction", (thisCommand) => {
+  const rootOpts = program.opts();
+  if (rootOpts.json) {
+    Logger.jsonMode = true;
+  }
+  if (rootOpts.silent) {
+    Logger.silent = true;
   }
 });
-program.addCommand(createConnectCommands());
+program.addCommand(createLoginCommand());
+program.addCommand(createLogoutCommand());
+program.addCommand(createDeployCommand());
+program.addCommand(createInitCommand());
+program.addCommand(createConnectCommand());
 program.addCommand(createDisconnectCommand());
 program.addCommand(createListCommand());
-program.addCommand(createImportCommand());
-program.addCommand(createProxyCommand());
+program.addCommand(createStatusCommand());
+program.addCommand(createLogsCommand());
+program.addCommand(createEnvCommand());
+program.addCommand(createKeysCommand());
 program.addCommand(createSearchCommand());
 program.addCommand(createInfoCommand());
-program.addCommand(createServersCommand());
-program.addCommand(createKeysCommand());
-program.addCommand(createPublishCommand());
-program.addCommand(createAuthCommands());
-var [login, logout, whoami] = createLegacyAuthCommands();
-program.addCommand(login);
-program.addCommand(logout);
-program.addCommand(whoami);
+program.addCommand(createWhoamiCommand());
+program.addCommand(createAccountCommand());
+program.addCommand(createImportCommand());
+program.addCommand(createProxyCommand());
+program.addCommand(createCompletionsCommand());
 program.configureHelp({
-  subcommandTerm: (cmd) => chalk5.cyan(cmd.name()),
-  commandUsage: (cmd) => {
-    const usage = cmd.usage();
-    return chalk5.yellow(usage);
-  },
-  commandDescription: (cmd) => {
-    return chalk5.dim(cmd.description());
-  }
+  subcommandTerm: (cmd) => chalk16.cyan(cmd.name()),
+  commandUsage: (cmd) => chalk16.yellow(cmd.usage()),
+  commandDescription: (cmd) => chalk16.dim(cmd.description())
 });
 program.addHelpText("after", `
-${chalk5.bold("Examples:")}
-  ${chalk5.cyan("mcphost connect github")}                    ${chalk5.dim("Connect to GitHub MCP server")}
-  ${chalk5.cyan("mcphost connect https://my-mcp.example.com")}  ${chalk5.dim("Connect to custom MCP server")}
-  ${chalk5.cyan("mcphost connect slack --client claude")}      ${chalk5.dim("Connect Slack MCP only to Claude")}
-  ${chalk5.cyan("mcphost list")}                             ${chalk5.dim("List all connected MCP servers")}
-  ${chalk5.cyan("mcphost search github")}                    ${chalk5.dim("Search marketplace for MCP servers")}
-  ${chalk5.cyan("mcphost info notion")}                      ${chalk5.dim("Get details about Notion MCP")}
-  ${chalk5.cyan("mcphost import --from smithery")}           ${chalk5.dim("Import connections from Smithery")}
-  ${chalk5.cyan("mcphost disconnect github")}               ${chalk5.dim("Remove GitHub MCP connection")}
+${chalk16.bold("Quick Start (one command!):")}
+  ${chalk16.dim("1.")} ${chalk16.cyan("mcphosting login")}                              ${chalk16.dim("Authenticate")}
+  ${chalk16.dim("2.")} ${chalk16.cyan("mcphosting deploy --template weather")}          ${chalk16.dim("Deploy a template")}
+  ${chalk16.dim("   ")} ${chalk16.dim("Done! URL returned. API key created. Config ready.")}
 
-${chalk5.bold("Supported AI Clients:")}
-  \u2022 ${chalk5.green("Claude Desktop")} - Auto-configured via claude_desktop_config.json
-  \u2022 ${chalk5.green("Cursor")} - Auto-configured via .cursor/mcp.json  
-  \u2022 ${chalk5.green("VS Code")} - Configured via .vscode/mcp.json
-  \u2022 ${chalk5.green("OpenClaw")} - Auto-configured via ~/.openclaw/mcp.json
-  \u2022 ${chalk5.green("ChatGPT")} - Manual setup with web instructions
+${chalk16.bold("Global Flags:")}
+  ${chalk16.cyan("--json")}                                         ${chalk16.dim("Output as JSON (agent-friendly)")}
+  ${chalk16.cyan("--silent")}                                       ${chalk16.dim("Suppress interactive output")}
 
-${chalk5.bold("Get Started:")}
-  ${chalk5.dim("1.")} ${chalk5.cyan("mcphost search <topic>")}     ${chalk5.dim("Find MCP servers")}
-  ${chalk5.dim("2.")} ${chalk5.cyan("mcphost connect <slug>")}     ${chalk5.dim("Connect to your AI clients")}
-  ${chalk5.dim("3.")} ${chalk5.cyan("mcphost list")}              ${chalk5.dim("View your connections")}
+${chalk16.bold("Environment Variables:")}
+  ${chalk16.cyan("MCPHOSTING_TOKEN")}                               ${chalk16.dim("Auth token (overrides config)")}
+  ${chalk16.cyan("MCPHOSTING_API_URL")}                             ${chalk16.dim("API base URL (default: mcphosting.com)")}
 
-${chalk5.yellow("\u2B50 Star us:")} ${chalk5.blue("https://github.com/gorlomi-enzo/mcphosting-cli")}
-${chalk5.yellow("\u{1F4DA} Docs:")} ${chalk5.blue("https://mcphosting.com/docs")}
+${chalk16.bold("Deploy Options:")}
+  ${chalk16.cyan("mcphosting deploy")}                              ${chalk16.dim("Deploy from current directory")}
+  ${chalk16.cyan("mcphosting deploy --template crypto")}            ${chalk16.dim("Deploy from template")}
+  ${chalk16.cyan("mcphosting deploy --github <url>")}               ${chalk16.dim("Deploy from GitHub repo")}
+  ${chalk16.cyan("mcphosting deploy --api-url <url>")}              ${chalk16.dim("Register external server")}
+  ${chalk16.cyan("mcphosting deploy --configure")}                  ${chalk16.dim("Auto-configure AI clients")}
+
+${chalk16.bold("Templates:")}
+  ${chalk16.cyan("weather")}  ${chalk16.cyan("crypto")}  ${chalk16.cyan("notion")}  ${chalk16.cyan("postgres")}  ${chalk16.cyan("blank")}
+
+${chalk16.bold("Agent Usage:")}
+  ${chalk16.cyan("mcphosting deploy --template crypto --json")}     ${chalk16.dim("Deploy + JSON output")}
+  ${chalk16.cyan("mcphosting whoami --json")}                       ${chalk16.dim("Check auth status")}
+  ${chalk16.cyan("mcphosting account --json")}                      ${chalk16.dim("Account + servers")}
+  ${chalk16.cyan("mcphosting list --json")}                         ${chalk16.dim("List all servers")}
+
+${chalk16.bold("More Commands:")}
+  ${chalk16.cyan("mcphosting init")}                                ${chalk16.dim("Create mcphosting.json")}
+  ${chalk16.cyan("mcphosting connect <slug>")}                      ${chalk16.dim("Connect MCP to AI clients")}
+  ${chalk16.cyan("mcphosting list")}                                ${chalk16.dim("List all servers")}
+  ${chalk16.cyan("mcphosting status <server>")}                     ${chalk16.dim("Check server status")}
+  ${chalk16.cyan('mcphosting keys create "Key Name"')}              ${chalk16.dim("Create API key")}
+  ${chalk16.cyan("mcphosting search <query>")}                      ${chalk16.dim("Search marketplace")}
+  ${chalk16.cyan("mcphosting completions --shell=zsh")}             ${chalk16.dim("Shell completions")}
+
+${chalk16.bold("Supported AI Clients:")}
+  \u2022 ${chalk16.green("Claude Desktop")}  \u2022 ${chalk16.green("Cursor")}  \u2022 ${chalk16.green("VS Code")}  \u2022 ${chalk16.green("OpenClaw")}  \u2022 ${chalk16.green("ChatGPT")}
+
+${chalk16.yellow("\u{1F4DA} Docs:")} ${chalk16.blue("https://mcphosting.com/docs")}
+${chalk16.yellow("\u2B50 GitHub:")} ${chalk16.blue("https://github.com/gorlomi-enzo/mcphosting-cli")}
 `);
 process.on("uncaughtException", (error) => {
-  Logger.error(`Uncaught error: ${error.message}`);
-  if (process.env.DEBUG) {
-    console.error(error.stack);
+  if (Logger.isJsonMode) {
+    console.error(JSON.stringify({ success: false, error: error.message }));
+  } else {
+    Logger.error(`Unexpected error: ${error.message}`);
   }
+  if (process.env.DEBUG) console.error(error.stack);
   process.exit(1);
 });
 process.on("unhandledRejection", (reason) => {
-  Logger.error(`Unhandled rejection: ${reason}`);
-  if (process.env.DEBUG) {
-    console.error(reason);
+  if (Logger.isJsonMode) {
+    console.error(JSON.stringify({ success: false, error: String(reason) }));
+  } else {
+    Logger.error(`Unhandled rejection: ${reason}`);
   }
+  if (process.env.DEBUG) console.error(reason);
   process.exit(1);
 });
 process.on("SIGINT", () => {
-  console.log("\n");
-  Logger.info("Goodbye! \u{1F44B}");
+  if (!Logger.isSilent && !Logger.isJsonMode) {
+    console.log("\n");
+    Logger.info("Goodbye! \u{1F44B}");
+  }
   process.exit(0);
 });
 async function main() {
   try {
     await program.parseAsync();
   } catch (error) {
-    Logger.error(`Command failed: ${error}`);
-    if (process.env.DEBUG) {
-      console.error(error);
+    if (Logger.isJsonMode) {
+      console.error(JSON.stringify({ success: false, error: error.message }));
+    } else {
+      Logger.error(`Command failed: ${error.message}`);
     }
+    if (process.env.DEBUG) console.error(error);
     process.exit(1);
   }
 }