@mcp-use/cli 2.21.5-canary.2 → 3.0.0-canary.4

package/dist/index.js

@@ -1130,12 +1130,6 @@ var open_default = open;
 import { viteSingleFile } from "vite-plugin-singlefile";
 import { toJSONSchema } from "zod";
 
-// src/commands/auth.ts
-import crypto from "crypto";
-import {
-  createServer
-} from "http";
-
 // src/utils/config.ts
 import { promises as fs7 } from "fs";
 import os3 from "os";
@@ -1153,14 +1147,21 @@ async function ensureConfigDir() {
 async function readConfig() {
   try {
     const content = await fs7.readFile(CONFIG_FILE, "utf-8");
-    return JSON.parse(content);
+    const raw = JSON.parse(content);
+    return {
+      ...raw,
+      orgId: raw.orgId ?? raw.profileId,
+      orgName: raw.orgName ?? raw.profileName,
+      orgSlug: raw.orgSlug ?? raw.profileSlug
+    };
   } catch (error) {
     return {};
   }
 }
 async function writeConfig(config) {
   await ensureConfigDir();
-  await fs7.writeFile(CONFIG_FILE, JSON.stringify(config, null, 2), "utf-8");
+  const { profileId: _a, profileName: _b, profileSlug: _c, ...clean } = config;
+  await fs7.writeFile(CONFIG_FILE, JSON.stringify(clean, null, 2), "utf-8");
 }
 async function deleteConfig() {
   try {
@@ -1180,42 +1181,37 @@ async function isLoggedIn() {
   const apiKey = await getApiKey();
   return !!apiKey;
 }
-async function getProfileId() {
+async function getOrgId() {
   const config = await readConfig();
-  return config.profileId || null;
+  return config.orgId || null;
 }
 async function getWebUrl() {
   return DEFAULT_WEB_URL;
 }
+async function getAuthBaseUrl() {
+  const apiUrl = await getApiUrl();
+  return apiUrl.replace(/\/api\/v1$/, "");
+}
 
 // src/utils/api.ts
 var McpUseAPI = class _McpUseAPI {
   baseUrl;
   apiKey;
-  profileId;
-  constructor(baseUrl, apiKey, profileId) {
+  orgId;
+  constructor(baseUrl, apiKey, orgId) {
     this.baseUrl = baseUrl || "";
     this.apiKey = apiKey;
-    this.profileId = profileId;
+    this.orgId = orgId;
   }
-  /**
-   * Initialize API client with config
-   */
   static async create() {
     const baseUrl = await getApiUrl();
     const apiKey = await getApiKey();
-    const profileId = await getProfileId();
-    return new _McpUseAPI(baseUrl, apiKey ?? void 0, profileId ?? void 0);
+    const orgId = await getOrgId();
+    return new _McpUseAPI(baseUrl, apiKey ?? void 0, orgId ?? void 0);
   }
-  /**
-   * Override the profile ID for this API client instance (e.g. from --org flag)
-   */
-  setProfileId(profileId) {
-    this.profileId = profileId;
+  setOrgId(orgId) {
+    this.orgId = orgId;
   }
-  /**
-   * Make authenticated request
-   */
   async request(endpoint, options = {}) {
     const url = `${this.baseUrl}${endpoint}`;
     const headers = {
@@ -1225,8 +1221,8 @@ var McpUseAPI = class _McpUseAPI {
     if (this.apiKey) {
       headers["x-api-key"] = this.apiKey;
     }
-    if (this.profileId) {
-      headers["x-profile-id"] = this.profileId;
+    if (this.orgId) {
+      headers["x-profile-id"] = this.orgId;
     }
     const timeout = options.timeout || 3e4;
     const controller = new AbortController();
@@ -1238,6 +1234,13 @@ var McpUseAPI = class _McpUseAPI {
         signal: controller.signal
       });
       clearTimeout(timeoutId);
+      if (response.status === 401) {
+        const err = new Error(
+          "Your session has expired or your API key is invalid."
+        );
+        err.status = 401;
+        throw err;
+      }
       if (!response.ok) {
         const error = await response.text();
         throw new Error(`API request failed: ${response.status} ${error}`);
@@ -1246,25 +1249,24 @@ var McpUseAPI = class _McpUseAPI {
     } catch (error) {
       clearTimeout(timeoutId);
       if (error.name === "AbortError") {
-        throw new Error(
-          `Request timeout after ${timeout / 1e3}s. Try using --follow flag to stream logs instead.`
-        );
+        throw new Error(`Request timeout after ${timeout / 1e3}s.`);
       }
       throw error;
     }
   }
   /**
-   * Create API key using JWT token
+   * Create a persistent API key using a Better Auth access token.
    */
-  async createApiKey(jwtToken, name = "CLI") {
-    const url = `${this.baseUrl}/api-key`;
+  async createApiKeyWithAccessToken(accessToken, name = "CLI") {
+    const authBase = await getAuthBaseUrl();
+    const url = `${authBase}/api/auth/api-key/create`;
     const response = await fetch(url, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        Authorization: `Bearer ${jwtToken}`
+        Authorization: `Bearer ${accessToken}`
       },
-      body: JSON.stringify({ name })
+      body: JSON.stringify({ name, prefix: "mcp_" })
     });
     if (!response.ok) {
       const error = await response.text();
@@ -1272,540 +1274,195 @@ var McpUseAPI = class _McpUseAPI {
     }
     return response.json();
   }
-  /**
-   * Test authentication
-   */
+  // ── Auth ────────────────────────────────────────────────────────
   async testAuth() {
-    return this.request("/test-auth");
+    const wire = await this.request("/test-auth");
+    return {
+      message: wire.message,
+      user_id: wire.user_id,
+      email: wire.email,
+      default_org_id: wire.default_profile_id,
+      orgs: (wire.profiles ?? []).map((p) => ({
+        id: p.id,
+        name: p.profile_name,
+        slug: p.slug,
+        role: p.role
+      }))
+    };
   }
-  /**
-   * Set the user's default profile (organization) on the server
-   */
-  async setDefaultProfile(profileId) {
-    await this.request(`/profiles/${profileId}/set-default`, {
+  async setDefaultOrg(orgId) {
+    await this.request(`/organizations/${orgId}/set-default`, {
       method: "POST"
     });
   }
-  /**
-   * Create deployment
-   */
-  async createDeployment(request) {
+  // ── Organization ID resolution ──────────────────────────────────
+  async resolveOrganizationId() {
+    if (this.orgId) return this.orgId;
+    const auth = await this.testAuth();
+    const id = auth.default_org_id;
+    if (!id) {
+      throw new Error(
+        "No organization set. Run `mcp-use org switch` or use --org to specify one."
+      );
+    }
+    return id;
+  }
+  // ── Servers ─────────────────────────────────────────────────────
+  async createServer(body) {
+    return this.request("/servers", {
+      method: "POST",
+      body: JSON.stringify(body)
+    });
+  }
+  // ── Deployments ─────────────────────────────────────────────────
+  async createDeployment(input) {
     return this.request("/deployments", {
       method: "POST",
-      body: JSON.stringify(request)
+      body: JSON.stringify(input)
     });
   }
-  /**
-   * Get deployment by ID
-   */
   async getDeployment(deploymentId) {
     return this.request(`/deployments/${deploymentId}`);
   }
-  /**
-   * Stream deployment logs
-   */
-  async *streamDeploymentLogs(deploymentId) {
-    const url = `${this.baseUrl}/deployments/${deploymentId}/logs/stream`;
-    const headers = {};
-    if (this.apiKey) {
-      headers["x-api-key"] = this.apiKey;
-    }
-    if (this.profileId) {
-      headers["x-profile-id"] = this.profileId;
-    }
-    const response = await fetch(url, { headers });
-    if (!response.ok) {
-      throw new Error(`Failed to stream logs: ${response.status}`);
-    }
-    if (!response.body) {
-      throw new Error("Response body is null");
-    }
-    const reader = response.body.getReader();
-    const decoder = new TextDecoder();
-    let buffer = "";
-    try {
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) break;
-        buffer += decoder.decode(value, { stream: true });
-        const lines = buffer.split("\n");
-        buffer = lines.pop() || "";
-        for (const line of lines) {
-          if (line.startsWith("data: ")) {
-            const data = line.slice(6);
-            try {
-              const parsed = JSON.parse(data);
-              if (parsed.log) {
-                yield parsed.log;
-              } else if (parsed.error) {
-                throw new Error(parsed.error);
-              }
-            } catch (e) {
-            }
-          }
-        }
-      }
-    } finally {
-      reader.releaseLock();
-    }
-  }
-  /**
-   * Create deployment with source code upload
-   */
-  async createDeploymentWithUpload(request, filePath) {
-    const { readFile: readFile4 } = await import("fs/promises");
-    const { basename } = await import("path");
-    const { stat } = await import("fs/promises");
-    const stats = await stat(filePath);
-    const maxSize = 2 * 1024 * 1024;
-    if (stats.size > maxSize) {
-      throw new Error(
-        `File size (${(stats.size / 1024 / 1024).toFixed(2)}MB) exceeds maximum of 2MB`
-      );
-    }
-    const fileBuffer = await readFile4(filePath);
-    const filename = basename(filePath);
-    const formData = new FormData();
-    const blob = new Blob([fileBuffer], { type: "application/gzip" });
-    formData.append("source_file", blob, filename);
-    formData.append("name", request.name);
-    formData.append("source_type", "upload");
-    if (request.source.type === "upload") {
-      formData.append("runtime", request.source.runtime || "node");
-      formData.append("port", String(request.source.port || 3e3));
-      if (request.source.startCommand) {
-        formData.append("startCommand", request.source.startCommand);
-      }
-      if (request.source.buildCommand) {
-        formData.append("buildCommand", request.source.buildCommand);
-      }
-      if (request.source.env && Object.keys(request.source.env).length > 0) {
-        formData.append("env", JSON.stringify(request.source.env));
-      }
-    }
-    if (request.customDomain) {
-      formData.append("customDomain", request.customDomain);
-    }
-    if (request.healthCheckPath) {
-      formData.append("healthCheckPath", request.healthCheckPath);
-    }
-    const url = `${this.baseUrl}/deployments`;
-    const headers = {};
-    if (this.apiKey) {
-      headers["x-api-key"] = this.apiKey;
-    }
-    if (this.profileId) {
-      headers["x-profile-id"] = this.profileId;
-    }
-    const response = await fetch(url, {
-      method: "POST",
-      headers,
-      body: formData
-    });
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(`Deployment failed: ${error}`);
-    }
-    return response.json();
-  }
-  /**
-   * List all deployments
-   */
   async listDeployments() {
-    const response = await this.request("/deployments");
-    return response.deployments;
+    return this.request("/deployments");
   }
-  /**
-   * Delete deployment
-   */
   async deleteDeployment(deploymentId) {
     await this.request(`/deployments/${deploymentId}`, {
       method: "DELETE"
     });
   }
-  /**
-   * Update deployment
-   */
-  async updateDeployment(deploymentId, updates) {
-    return this.request(`/deployments/${deploymentId}`, {
-      method: "PATCH",
-      body: JSON.stringify(updates)
-    });
-  }
-  /**
-   * Redeploy deployment
-   *
-   * @param deploymentId - The deployment ID to redeploy
-   * @param configOrFilePath - Either a RedeploymentConfig object with updated settings,
-   *                           or a file path string for source code upload
-   */
-  async redeployDeployment(deploymentId, configOrFilePath) {
-    if (typeof configOrFilePath === "string") {
-      const filePath = configOrFilePath;
-      const { readFile: readFile4 } = await import("fs/promises");
-      const { basename } = await import("path");
-      const { stat } = await import("fs/promises");
-      const stats = await stat(filePath);
-      const maxSize = 2 * 1024 * 1024;
-      if (stats.size > maxSize) {
-        throw new Error(
-          `File size (${(stats.size / 1024 / 1024).toFixed(2)}MB) exceeds maximum of 2MB`
-        );
-      }
-      const fileBuffer = await readFile4(filePath);
-      const formData = new FormData();
-      const blob = new Blob([fileBuffer], { type: "application/gzip" });
-      formData.append("source_file", blob, basename(filePath));
-      const headers = {};
-      if (this.apiKey) headers["x-api-key"] = this.apiKey;
-      if (this.profileId) headers["x-profile-id"] = this.profileId;
-      const response = await fetch(
-        `${this.baseUrl}/deployments/${deploymentId}/redeploy`,
-        {
-          method: "POST",
-          headers,
-          body: formData
-        }
-      );
-      if (!response.ok) {
-        const error = await response.text();
-        throw new Error(`Redeploy failed: ${error}`);
-      }
-      return response.json();
-    }
-    const config = configOrFilePath;
-    return this.request(`/deployments/${deploymentId}/redeploy`, {
-      method: "POST",
-      body: config ? JSON.stringify(config) : void 0
+  async stopDeployment(deploymentId) {
+    await this.request(`/deployments/${deploymentId}/stop`, {
+      method: "POST"
     });
   }
-  /**
-   * Get deployment logs
-   */
-  async getDeploymentLogs(deploymentId) {
-    const response = await this.request(
-      `/deployments/${deploymentId}/logs`,
+  async getDeploymentLogs(deploymentId, lines = 500) {
+    const resp = await this.request(
+      `/deployments/${deploymentId}/logs?lines=${lines}`,
       { timeout: 6e4 }
-      // 60 second timeout for logs
     );
-    return response.data.logs;
+    return resp.logs;
   }
-  /**
-   * Get deployment build logs
-   */
-  async getDeploymentBuildLogs(deploymentId) {
-    const response = await this.request(
-      `/deployments/${deploymentId}/logs/build`,
+  async getDeploymentBuildLogs(deploymentId, offset = 0) {
+    return this.request(
+      `/deployments/${deploymentId}/build-logs?offset=${offset}`,
       { timeout: 6e4 }
-      // 60 second timeout for logs
     );
-    return response.data.logs;
   }
-  /**
-   * Get GitHub connection status
-   */
+  // ── GitHub ──────────────────────────────────────────────────────
   async getGitHubConnectionStatus() {
-    return this.request("/github/connection");
+    const orgId = await this.resolveOrganizationId();
+    const resp = await this.request(`/github/installations?organizationId=${orgId}`);
+    return {
+      is_connected: resp.installations.length > 0,
+      installations: resp.installations.map((i) => ({
+        id: i.id,
+        installation_id: i.installationId
+      }))
+    };
   }
-  /**
-   * Get GitHub app name
-   */
-  async getGitHubAppName() {
-    const response = await this.request("/github/appname");
-    return response.app_name;
+  async getGitHubRepos(_refresh) {
+    const orgId = await this.resolveOrganizationId();
+    const installResp = await this.request(`/github/installations?organizationId=${orgId}`);
+    if (installResp.installations.length === 0) {
+      return { user: { login: "", id: 0, avatar_url: "" }, repos: [] };
+    }
+    const inst = installResp.installations[0];
+    const reposResp = await this.request(`/github/installations/${inst.installationId}/repos`);
+    return {
+      user: {
+        login: inst.account?.login ?? "",
+        id: 0,
+        avatar_url: inst.account?.avatar_url ?? ""
+      },
+      repos: reposResp.repos.map((r) => ({
+        id: r.id,
+        name: r.name,
+        full_name: r.fullName,
+        private: r.private,
+        owner: { login: r.fullName.split("/")[0] ?? "" }
+      }))
+    };
   }
-  /**
-   * Get accessible GitHub repositories
-   */
-  async getGitHubRepos(refresh = false) {
-    return this.request(
-      `/github/repos${refresh ? "?refresh=true" : ""}`
-    );
+  async getGitHubAppName() {
+    if (process.env.MCP_GITHUB_APP_NAME) return process.env.MCP_GITHUB_APP_NAME;
+    return this.baseUrl.includes(".dev.") ? "mcp-use-dev" : "mcp-use";
   }
 };
 
 // src/commands/auth.ts
-var LOGIN_TIMEOUT = 3e5;
-async function findAvailablePort(startPort = 8765) {
-  for (let port = startPort; port < startPort + 100; port++) {
-    try {
-      await new Promise((resolve2, reject) => {
-        const server = createServer();
-        server.once("error", reject);
-        server.once("listening", () => {
-          server.close();
-          resolve2();
-        });
-        server.listen(port);
-      });
-      return port;
-    } catch {
-      continue;
-    }
+var DEVICE_CLIENT_ID = "mcp-use-cli";
+var DEVICE_POLL_TIMEOUT = 18e5;
+async function requestDeviceCode(authBaseUrl) {
+  const url = `${authBaseUrl}/api/auth/device/code`;
+  const response = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      client_id: DEVICE_CLIENT_ID,
+      scope: "openid profile email"
+    })
+  });
+  if (!response.ok) {
+    const error = await response.text();
+    throw new Error(
+      `Failed to request device code: ${response.status} ${error}`
+    );
   }
-  throw new Error("No available ports found");
+  return response.json();
 }
-async function startCallbackServer(port, expectedState) {
-  return new Promise((resolve2, reject) => {
-    let tokenResolver = null;
-    const tokenPromise = new Promise((res) => {
-      tokenResolver = res;
+async function pollForDeviceToken(authBaseUrl, deviceCode, intervalSeconds) {
+  let pollingInterval = intervalSeconds;
+  const deadline = Date.now() + DEVICE_POLL_TIMEOUT;
+  while (Date.now() < deadline) {
+    const delayMs = pollingInterval * 1e3;
+    await new Promise((r) => setTimeout(r, delayMs));
+    const url = `${authBaseUrl}/api/auth/device/token`;
+    const response = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+        device_code: deviceCode,
+        client_id: DEVICE_CLIENT_ID
+      })
     });
-    const server = createServer(
-      {
-        maxHeaderSize: 65536
-        // 64KB - handle very long JWT tokens in URL (increased from default 8192)
-      },
-      (req, res) => {
-        if (req.url?.startsWith("/callback")) {
-          const url = new URL(req.url, `http://localhost:${port}`);
-          const token = url.searchParams.get("token");
-          const state = url.searchParams.get("state");
-          if (state !== expectedState) {
-            res.writeHead(400, { "Content-Type": "text/html" });
-            res.end(`
-              <!DOCTYPE html>
-              <html>
-                <head>
-                  <title>Security Error</title>
-                  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-                  <style>
-                    body {
-                      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-                      display: flex;
-                      justify-content: center;
-                      align-items: center;
-                      min-height: 100vh;
-                      background: #000;
-                      padding: 1rem;
-                      margin: 0;
-                    }
-                    .container {
-                      max-width: 28rem;
-                      padding: 3rem;
-                      text-align: center;
-                      background: rgba(255, 255, 255, 0.1);
-                      backdrop-filter: blur(40px);
-                      border: 1px solid rgba(255, 255, 255, 0.2);
-                      border-radius: 1.5rem;
-                    }
-                    h1 { color: #fff; font-size: 2rem; margin-bottom: 1rem; }
-                    p { color: rgba(255, 255, 255, 0.8); font-size: 1rem; }
-                  </style>
-                </head>
-                <body>
-                  <div class="container">
-                    <h1>Security Error</h1>
-                    <p>Invalid state parameter. Please try logging in again.</p>
-                  </div>
-                </body>
-              </html>
-            `);
-            return;
-          }
-          if (token && tokenResolver) {
-            res.writeHead(200, { "Content-Type": "text/html" });
-            res.end(`
-              <!DOCTYPE html>
-              <html>
-                <head>
-                  <title>Login Successful</title>
-                  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-                  <style>
-                    * {
-                      margin: 0;
-                      padding: 0;
-                      box-sizing: border-box;
-                    }
-                    body {
-                      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
-                      display: flex;
-                      justify-content: center;
-                      align-items: center;
-                      min-height: 100vh;
-                      background: #000;
-                      padding: 1rem;
-                    }
-                    .container {
-                      width: 100%;
-                      max-width: 28rem;
-                      padding: 3rem;
-                      text-align: center;
-                      -webkit-backdrop-filter: blur(40px);
-                      border: 1px solid rgba(255, 255, 255, 0.2);
-                      border-radius: 1.5rem;
-                      box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
-                    }
-                    .icon-container {
-                      display: inline-flex;
-                      align-items: center;
-                      justify-content: center;
-                      width: 6rem;
-                      height: 6rem;
-                      margin-bottom: 2rem;
-                      background: rgba(255, 255, 255, 0.1);
-                      backdrop-filter: blur(10px);
-                      -webkit-backdrop-filter: blur(10px);
-                      border-radius: 50%;
-                    }
-                    .checkmark {
-                      font-size: 4rem;
-                      color: #fff;
-                      line-height: 1;
-                      animation: scaleIn 0.5s ease-out;
-                    }
-                    @keyframes scaleIn {
-                      from {
-                        transform: scale(0);
-                        opacity: 0;
-                      }
-                      to {
-                        transform: scale(1);
-                        opacity: 1;
-                      }
-                    }
-                    h1 {
-                      color: #fff;
-                      margin: 0 0 1rem 0;
-                      font-size: 2.5rem;
-                      font-weight: 700;
-                      letter-spacing: -0.025em;
-                    }
-                    p {
-                      color: rgba(255, 255, 255, 0.8);
-                      margin: 0 0 2rem 0;
-                      font-size: 1.125rem;
-                      line-height: 1.5;
-                    }
-                    .spinner {
-                      display: inline-block;
-                      width: 2rem;
-                      height: 2rem;
-                      border: 3px solid rgba(255, 255, 255, 0.3);
-                      border-top-color: #fff;
-                      border-radius: 50%;
-                      animation: spin 0.8s linear infinite;
-                    }
-                    @keyframes spin {
-                      to { transform: rotate(360deg); }
-                    }
-                    .footer {
-                      margin-top: 2rem;
-                      color: rgba(255, 255, 255, 0.6);
-                      font-size: 0.875rem;
-                    }
-                  </style>
-                </head>
-                <body>
-                  <div class="container">
-                    <h1>Authentication Successful!</h1>
-                    <p>You can now close this window and return to the CLI.</p>
-                  </div>
-                </body>
-              </html>
-            `);
-            tokenResolver(token);
-          } else {
-            res.writeHead(400, { "Content-Type": "text/html" });
-            res.end(`
-              <!DOCTYPE html>
-              <html>
-                <head>
-                  <title>Login Failed</title>
-                  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-                  <style>
-                    * {
-                      margin: 0;
-                      padding: 0;
-                      box-sizing: border-box;
-                    }
-                    body {
-                      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
-                      display: flex;
-                      justify-content: center;
-                      align-items: center;
-                      min-height: 100vh;
-                      background: #000;
-                      padding: 1rem;
-                    }
-                    .container {
-                      width: 100%;
-                      max-width: 28rem;
-                      padding: 3rem;
-                      text-align: center;
-                      background: rgba(255, 255, 255, 0.1);
-                      backdrop-filter: blur(40px);
-                      -webkit-backdrop-filter: blur(40px);
-                      border: 1px solid rgba(255, 255, 255, 0.2);
-                      border-radius: 1.5rem;
-                      box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
-                    }
-                    .icon-container {
-                      display: inline-flex;
-                      align-items: center;
-                      justify-content: center;
-                      width: 6rem;
-                      height: 6rem;
-                      margin-bottom: 2rem;
-                      background: rgba(255, 255, 255, 0.1);
-                      backdrop-filter: blur(10px);
-                      -webkit-backdrop-filter: blur(10px);
-                      border-radius: 50%;
-                    }
-                    .cross {
-                      font-size: 4rem;
-                      color: #fff;
-                      line-height: 1;
-                    }
-                    h1 {
-                      color: #fff;
-                      margin: 0 0 1rem 0;
-                      font-size: 2.5rem;
-                      font-weight: 700;
-                      letter-spacing: -0.025em;
-                    }
-                    p {
-                      color: rgba(255, 255, 255, 0.8);
-                      margin: 0;
-                      font-size: 1.125rem;
-                      line-height: 1.5;
-                    }
-                  </style>
-                </head>
-                <body>
-                  <div class="container">
-                    <div class="icon-container">
-                      <div class="cross">\u2717</div>
-                    </div>
-                    <h1>Login Failed</h1>
-                    <p>No token received. Please try again.</p>
-                  </div>
-                </body>
-              </html>
-            `);
-          }
-        }
+    const data = await response.json();
+    if (data.access_token) {
+      return data.access_token;
+    }
+    if (data.error) {
+      switch (data.error) {
+        case "authorization_pending":
+          break;
+        case "slow_down":
+          pollingInterval += 5;
+          break;
+        case "access_denied":
+          throw new Error("Authorization was denied by the user.");
+        case "expired_token":
+          throw new Error("The device code has expired. Please try again.");
+        default:
+          throw new Error(
+            data.error_description || `Device auth error: ${data.error}`
+          );
       }
-    );
-    server.listen(port, () => {
-      resolve2({ server, token: tokenPromise });
-    });
-    server.on("error", reject);
-  });
+    }
+  }
+  throw new Error("Login timed out. Please try again.");
 }
-async function promptOrgSelection(profiles, defaultProfileId) {
-  if (profiles.length === 0) return null;
-  if (profiles.length === 1) {
-    return profiles[0];
+async function promptOrgSelection(orgs, defaultOrgId) {
+  if (orgs.length === 0) return null;
+  if (orgs.length === 1) {
+    return orgs[0];
   }
   console.log(source_default.cyan.bold("\n\u{1F3E2} Select an organization:\n"));
-  for (let i = 0; i < profiles.length; i++) {
-    const p = profiles[i];
-    const marker = p.id === defaultProfileId ? source_default.green(" (current)") : "";
-    const slug = p.slug ? source_default.gray(` (${p.slug})`) : "";
-    console.log(
-      `  ${source_default.white(`${i + 1}.`)} ${p.profile_name}${slug}${marker}`
-    );
+  for (let i = 0; i < orgs.length; i++) {
+    const o = orgs[i];
+    const marker = o.id === defaultOrgId ? source_default.green(" (current)") : "";
+    const slug = o.slug ? source_default.gray(` (${o.slug})`) : "";
+    console.log(`  ${source_default.white(`${i + 1}.`)} ${o.name}${slug}${marker}`);
   }
   const readline = await import("readline");
   const rl = readline.createInterface({
@@ -1813,7 +1470,7 @@ async function promptOrgSelection(profiles, defaultProfileId) {
     output: process.stdout
   });
   return new Promise((resolve2) => {
-    const defaultIdx = defaultProfileId ? profiles.findIndex((p) => p.id === defaultProfileId) : 0;
+    const defaultIdx = defaultOrgId ? orgs.findIndex((o) => o.id === defaultOrgId) : 0;
     const defaultDisplay = defaultIdx >= 0 ? defaultIdx + 1 : 1;
     rl.question(
       source_default.gray(`
@@ -1822,11 +1479,11 @@ Enter number [${defaultDisplay}]: `),
         rl.close();
         const trimmed = answer.trim();
         const idx = trimmed === "" ? defaultIdx : parseInt(trimmed, 10) - 1;
-        if (idx >= 0 && idx < profiles.length) {
-          resolve2(profiles[idx]);
+        if (idx >= 0 && idx < orgs.length) {
+          resolve2(orgs[idx]);
         } else {
           console.log(source_default.yellow("Invalid selection, using default."));
-          resolve2(profiles[defaultIdx >= 0 ? defaultIdx : 0]);
+          resolve2(orgs[defaultIdx >= 0 ? defaultIdx : 0]);
         }
       }
     );
@@ -1834,105 +1491,114 @@ Enter number [${defaultDisplay}]: `),
 }
 async function loginCommand(options) {
   try {
+    const directKey = options?.apiKey || process.env.MCP_USE_API_KEY;
+    if (directKey) {
+      await writeConfig({ apiKey: directKey });
+      if (!options?.silent) {
+        console.log(source_default.green.bold("\u2713 API key saved."));
+        try {
+          const api2 = await McpUseAPI.create();
+          const authInfo = await api2.testAuth();
+          console.log(source_default.gray(`  Authenticated as ${authInfo.email}`));
+        } catch {
+          console.log(
+            source_default.gray(
+              "  (could not verify key \u2014 will be checked on next command)"
+            )
+          );
+        }
+      }
+      return;
+    }
     if (await isLoggedIn()) {
       if (!options?.silent) {
         console.log(
           source_default.yellow(
-            "\u26A0\uFE0F  You are already logged in. Run 'npx mcp-use logout' first if you want to login with a different account."
+            "You are already logged in. Run 'npx mcp-use logout' first if you want to login with a different account."
           )
         );
       }
       return;
     }
-    console.log(source_default.cyan.bold("\u{1F510} Logging in to Manufact cloud...\n"));
-    const state = crypto.randomBytes(32).toString("hex");
-    const port = await findAvailablePort();
-    const redirectUri = `http://localhost:${port}/callback`;
-    console.log(source_default.gray(`Starting local server on port ${port}...`));
-    const { server, token } = await startCallbackServer(port, state);
-    const webUrl = await getWebUrl();
-    const loginUrl = `${webUrl}/auth/cli?redirect_uri=${encodeURIComponent(redirectUri)}&state=${state}`;
-    console.log(source_default.gray(`Opening browser to ${webUrl}/auth/cli...
-`));
-    console.log(
-      source_default.white(
-        "If the browser doesn't open automatically, please visit:\n" + source_default.cyan(loginUrl)
-      )
-    );
-    await open_default(loginUrl);
-    console.log(
-      source_default.gray("\nWaiting for authentication... (this may take a moment)")
-    );
-    const jwtToken = await Promise.race([
-      token,
-      new Promise(
-        (_, reject) => setTimeout(
-          () => reject(new Error("Login timeout - please try again")),
-          LOGIN_TIMEOUT
-        )
-      )
-    ]);
-    server.close();
-    console.log(
-      source_default.gray("Received authentication token, creating API key...")
+    console.log(source_default.cyan.bold("Logging in to mcp-use cloud...\n"));
+    const authBaseUrl = await getAuthBaseUrl();
+    const deviceResp = await requestDeviceCode(authBaseUrl);
+    const {
+      device_code,
+      user_code,
+      verification_uri,
+      verification_uri_complete,
+      interval
+    } = deviceResp;
+    const displayCode = user_code.length === 8 ? `${user_code.slice(0, 4)}-${user_code.slice(4)}` : user_code;
+    console.log(source_default.white("  Visit: ") + source_default.cyan(verification_uri));
+    console.log(source_default.white("  Code:  ") + source_default.bold.white(displayCode));
+    console.log();
+    const urlToOpen = verification_uri_complete || verification_uri;
+    try {
+      await open_default(urlToOpen);
+      console.log(source_default.gray("  Browser opened. Waiting for approval..."));
+    } catch {
+      console.log(source_default.gray("  Open the URL above in your browser."));
+    }
+    const accessToken = await pollForDeviceToken(
+      authBaseUrl,
+      device_code,
+      interval || 5
     );
+    console.log(source_default.gray("\n  Creating persistent API key..."));
     const api = await McpUseAPI.create();
-    const apiKeyResponse = await api.createApiKey(jwtToken, "CLI");
-    await writeConfig({
-      apiKey: apiKeyResponse.api_key
-    });
+    const keyResp = await api.createApiKeyWithAccessToken(accessToken, "CLI");
+    await writeConfig({ apiKey: keyResp.key });
     console.log(source_default.green.bold("\n\u2713 Successfully logged in!"));
     try {
-      const api2 = await McpUseAPI.create();
-      const authInfo = await api2.testAuth();
-      console.log(source_default.cyan.bold("\n\u{1F464} Current user:\n"));
-      console.log(source_default.white("Email:   ") + source_default.cyan(authInfo.email));
-      console.log(source_default.white("User ID: ") + source_default.gray(authInfo.user_id));
-      const apiKey = await getApiKey();
-      if (apiKey) {
-        const masked = apiKey.substring(0, 6) + "...";
-        console.log(source_default.white("API Key: ") + source_default.gray(masked));
-      }
-      const profiles = authInfo.profiles ?? [];
-      if (profiles.length > 0) {
-        let selectedProfile = null;
-        if (profiles.length === 1) {
-          selectedProfile = profiles[0];
+      const freshApi = await McpUseAPI.create();
+      const authInfo = await freshApi.testAuth();
+      console.log(source_default.cyan.bold("\nCurrent user:\n"));
+      console.log(source_default.white("  Email:   ") + source_default.cyan(authInfo.email));
+      console.log(source_default.white("  User ID: ") + source_default.gray(authInfo.user_id));
+      const storedKey = await getApiKey();
+      if (storedKey) {
+        const masked = storedKey.substring(0, 8) + "...";
+        console.log(source_default.white("  API Key: ") + source_default.gray(masked));
+      }
+      const orgs = authInfo.orgs ?? [];
+      if (orgs.length > 0) {
+        let selectedOrg = null;
+        if (orgs.length === 1) {
+          selectedOrg = orgs[0];
         } else {
-          selectedProfile = await promptOrgSelection(
-            profiles,
-            authInfo.default_profile_id
-          );
+          selectedOrg = await promptOrgSelection(orgs, authInfo.default_org_id);
         }
-        if (selectedProfile) {
+        if (selectedOrg) {
           const config = await readConfig();
           await writeConfig({
             ...config,
-            profileId: selectedProfile.id,
-            profileName: selectedProfile.profile_name,
-            profileSlug: selectedProfile.slug ?? void 0
+            orgId: selectedOrg.id,
+            orgName: selectedOrg.name,
+            orgSlug: selectedOrg.slug ?? void 0
           });
-          const slug = selectedProfile.slug ? source_default.gray(` (${selectedProfile.slug})`) : "";
+          const slug = selectedOrg.slug ? source_default.gray(` (${selectedOrg.slug})`) : "";
           console.log(
-            source_default.white("Org:     ") + source_default.cyan(selectedProfile.profile_name) + slug
+            source_default.white("  Org:     ") + source_default.cyan(selectedOrg.name) + slug
           );
         }
       }
-    } catch (error) {
+    } catch {
       console.log(
         source_default.gray(
           `
-Your API key has been saved to ${source_default.white("~/.mcp-use/config.json")}`
+  Your API key has been saved to ${source_default.white("~/.mcp-use/config.json")}`
         )
       );
     }
     console.log(
       source_default.gray(
-        "\nYou can now deploy your MCP servers with " + source_default.white("npx mcp-use deploy")
+        "\n  Deploy your MCP servers with " + source_default.white("npx mcp-use deploy")
       )
     );
     console.log(
-      source_default.gray("To logout later, run " + source_default.white("npx mcp-use logout"))
+      source_default.gray("  To logout, run " + source_default.white("npx mcp-use logout"))
     );
   } catch (error) {
     throw new Error(
@@ -1984,31 +1650,41 @@ async function whoamiCommand() {
       console.log(source_default.white("API Key: ") + source_default.gray(masked));
     }
     const config = await readConfig();
-    const profiles = authInfo.profiles ?? [];
-    if (profiles.length > 0) {
-      const activeProfile = profiles.find(
-        (p) => p.id === (config.profileId || authInfo.default_profile_id)
+    const orgs = authInfo.orgs ?? [];
+    if (orgs.length > 0) {
+      const activeOrg = orgs.find(
+        (o) => o.id === (config.orgId || authInfo.default_org_id)
       );
-      if (activeProfile) {
-        const slug = activeProfile.slug ? source_default.gray(` (${activeProfile.slug})`) : "";
+      if (activeOrg) {
+        const slug = activeOrg.slug ? source_default.gray(` (${activeOrg.slug})`) : "";
         console.log(
-          source_default.white("Org:     ") + source_default.cyan(activeProfile.profile_name) + slug
+          source_default.white("Org:     ") + source_default.cyan(activeOrg.name) + slug
         );
       }
-      if (profiles.length > 1) {
+      if (orgs.length > 1) {
         console.log(
           source_default.gray(
             `
-  ${profiles.length} organizations available. Use ` + source_default.white("npx mcp-use org list") + " to see all."
+  ${orgs.length} organizations available. Use ` + source_default.white("npx mcp-use org list") + " to see all."
           )
         );
       }
     }
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to get user info:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
+    if (error?.status === 401) {
+      console.error(
+        source_default.red("\nYour session has expired or your API key is invalid.")
+      );
+      console.log(
+        source_default.gray(`Run ${source_default.white("mcp-use login")} to re-authenticate.
+`)
+      );
+    } else {
+      console.error(
+        source_default.red.bold("\n\u2717 Failed to get user info:"),
+        source_default.red(error instanceof Error ? error.message : "Unknown error")
+      );
+    }
     process.exit(1);
   }
 }
@@ -3384,25 +3060,20 @@ async function prompt(question, defaultValue = "n") {
   });
 }
 function getMcpServerUrl(deployment) {
-  if (deployment.customDomain) {
-    return `https://${deployment.customDomain}/mcp`;
-  } else if (deployment.serverSlug) {
-    return buildGatewayUrl(deployment.serverSlug);
-  } else if (deployment.serverId) {
+  if (deployment.mcpUrl) {
+    return deployment.mcpUrl;
+  }
+  if (deployment.serverId) {
     return buildGatewayUrl(deployment.serverId);
-  } else {
-    return `https://${deployment.domain}/mcp`;
   }
+  return "";
 }
-async function displayDeploymentProgress(api, deployment, progressOptions) {
+async function displayDeploymentProgress(api, deploymentId, progressOptions) {
   const frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   let frameIndex = 0;
   let spinnerInterval = null;
-  let lastStep = "";
   const startSpinner = (message) => {
-    if (spinnerInterval) {
-      clearInterval(spinnerInterval);
-    }
+    if (spinnerInterval) clearInterval(spinnerInterval);
     process.stdout.write("\r\x1B[K");
     spinnerInterval = setInterval(() => {
       const frame = frames[frameIndex];
@@ -3421,82 +3092,64 @@ async function displayDeploymentProgress(api, deployment, progressOptions) {
   };
   console.log();
   startSpinner("Deploying...");
-  try {
-    for await (const log of api.streamDeploymentLogs(deployment.id)) {
-      try {
-        const logData = JSON.parse(log);
-        if (logData.step && logData.step !== lastStep) {
-          lastStep = logData.step;
-          const stepMessages = {
-            clone: "Preparing source code...",
-            analyze: "Analyzing project...",
-            build: "Building container image...",
-            deploy: "Deploying to cloud..."
-          };
-          const message = stepMessages[logData.step] || "Deploying...";
-          startSpinner(message);
-        }
-        if (logData.line) {
-          stopSpinner();
-          const levelColor = logData.level === "error" ? source_default.red : logData.level === "warn" ? source_default.yellow : source_default.gray;
-          const stepPrefix = logData.step ? source_default.cyan(`[${logData.step}]`) + " " : "";
-          console.log(stepPrefix + levelColor(logData.line));
-        }
-      } catch {
-      }
-    }
-  } catch (error) {
-    stopSpinner();
-  }
   let checkCount = 0;
-  const maxChecks = 60;
-  let delay = 3e3;
+  const maxChecks = 120;
+  let delay = 2e3;
   const maxDelay = 1e4;
-  let lastDisplayedLogLength = 0;
+  let buildLogOffset = 0;
+  const sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
   while (checkCount < maxChecks) {
-    const currentDelay = delay;
-    await new Promise((resolve2) => setTimeout(resolve2, currentDelay));
-    const finalDeployment = await api.getDeployment(deployment.id);
-    if (finalDeployment.buildLogs && finalDeployment.buildLogs.length > lastDisplayedLogLength) {
-      const newLogs = finalDeployment.buildLogs.substring(
-        lastDisplayedLogLength
+    await sleep(delay);
+    checkCount++;
+    try {
+      const buildLogsResp = await api.getDeploymentBuildLogs(
+        deploymentId,
+        buildLogOffset
       );
-      const logLines = newLogs.split("\n").filter((l) => l.trim());
-      for (const line of logLines) {
-        try {
-          const logData = JSON.parse(line);
-          if (logData.line) {
+      if (buildLogsResp.logs.length > 0) {
+        const logLines = buildLogsResp.logs.split("\n").filter((l) => l.trim());
+        for (const line of logLines) {
+          try {
+            const logData = JSON.parse(line);
+            if (logData.line) {
+              stopSpinner();
+              const levelColor = logData.level === "error" ? source_default.red : logData.level === "warn" ? source_default.yellow : source_default.gray;
+              const stepPrefix = logData.step ? source_default.cyan(`[${logData.step}]`) + " " : "";
+              console.log(stepPrefix + levelColor(logData.line));
+            }
+          } catch {
             stopSpinner();
-            const levelColor = logData.level === "error" ? source_default.red : logData.level === "warn" ? source_default.yellow : source_default.gray;
-            const stepPrefix = logData.step ? source_default.cyan(`[${logData.step}]`) + " " : "";
-            console.log(stepPrefix + levelColor(logData.line));
+            console.log(source_default.gray(line));
           }
-        } catch {
         }
+        buildLogOffset = buildLogsResp.offset;
       }
-      lastDisplayedLogLength = finalDeployment.buildLogs.length;
+    } catch {
     }
-    if (finalDeployment.status === "running") {
-      const mcpServerUrl = getMcpServerUrl(finalDeployment);
+    const deployment = await api.getDeployment(deploymentId);
+    if (deployment.status === "running") {
+      stopSpinner();
+      const mcpServerUrl = getMcpServerUrl(deployment);
       let dashboardUrl = null;
       const webUrl = (await getWebUrl()).replace(/\/$/, "");
       const config = await readConfig();
-      const orgSlug = config.profileSlug;
-      const serverRef = finalDeployment.serverSlug || finalDeployment.serverId;
-      if (serverRef) {
+      const orgSlug = config.orgSlug;
+      if (deployment.serverId) {
         if (orgSlug) {
-          dashboardUrl = `${webUrl}/cloud/${orgSlug}/servers/${serverRef}`;
+          dashboardUrl = `${webUrl}/cloud/${orgSlug}/servers/${deployment.serverId}`;
         } else {
-          dashboardUrl = `${webUrl}/cloud/servers/${serverRef}`;
+          dashboardUrl = `${webUrl}/cloud/servers/${deployment.serverId}`;
         }
       }
       const inspectorUrl = `https://inspector.manufact.com/inspector?autoConnect=${encodeURIComponent(
         mcpServerUrl
       )}`;
       console.log(source_default.green.bold("\u2713 Deployment successful!\n"));
-      console.log(source_default.white("\u{1F310} MCP Server URL:"));
-      console.log(source_default.cyan.bold(`   ${mcpServerUrl}
+      if (mcpServerUrl) {
+        console.log(source_default.white("\u{1F310} MCP Server URL:"));
+        console.log(source_default.cyan.bold(`   ${mcpServerUrl}
 `));
+      }
       if (dashboardUrl) {
         console.log(source_default.white("\u{1F4CA} Dashboard:"));
         console.log(source_default.cyan.bold(`   ${dashboardUrl}
@@ -3505,16 +3158,14 @@ async function displayDeploymentProgress(api, deployment, progressOptions) {
       console.log(source_default.white("\u{1F50D} Inspector URL:"));
       console.log(source_default.cyan.bold(`   ${inspectorUrl}
 `));
-      console.log(
-        source_default.gray("Deployment ID: ") + source_default.white(finalDeployment.id)
-      );
+      console.log(source_default.gray("Deployment ID: ") + source_default.white(deployment.id));
       return;
-    } else if (finalDeployment.status === "failed") {
+    } else if (deployment.status === "failed") {
       stopSpinner();
       console.log(source_default.red.bold("\u2717 Deployment failed\n"));
-      if (finalDeployment.error) {
-        console.log(source_default.red("Error: ") + finalDeployment.error);
-        if (finalDeployment.error.includes("No GitHub installations found")) {
+      if (deployment.error) {
+        console.log(source_default.red("Error: ") + deployment.error);
+        if (deployment.error.includes("No GitHub installations found")) {
           console.log();
           const retry = await promptGitHubInstallation(
             api,
@@ -3522,79 +3173,31 @@ async function displayDeploymentProgress(api, deployment, progressOptions) {
             void 0,
             { yes: progressOptions?.yes }
           );
-          if (retry) {
+          if (retry && deployment.serverId) {
             console.log(source_default.cyan("\n\u{1F504} Retrying deployment...\n"));
-            const newDeployment = await api.redeployDeployment(deployment.id);
-            await displayDeploymentProgress(
-              api,
-              newDeployment,
-              progressOptions
-            );
-            return;
-          }
-        } else if (finalDeployment.error.includes("Authenticated git clone failed")) {
-          let repoName;
-          const repoMatch = finalDeployment.error.match(
-            /github\.com\/([^/]+\/[^/\s]+)/
-          );
-          if (repoMatch) {
-            repoName = repoMatch[1].replace(/\.git$/, "");
-          } else if (finalDeployment.source.type === "github") {
-            repoName = finalDeployment.source.repo;
-          }
-          console.log();
-          const retry = await promptGitHubInstallation(
-            api,
-            "no_access",
-            repoName,
-            { yes: progressOptions?.yes }
-          );
-          if (retry) {
-            console.log(source_default.cyan("\n\u{1F504} Retrying deployment...\n"));
-            const newDeployment = await api.redeployDeployment(deployment.id);
-            await displayDeploymentProgress(
-              api,
-              newDeployment,
-              progressOptions
-            );
+            const newDep = await api.createDeployment({
+              serverId: deployment.serverId,
+              trigger: "redeploy"
+            });
+            await displayDeploymentProgress(api, newDep.id, progressOptions);
             return;
           }
         }
       }
-      if (finalDeployment.buildLogs) {
-        console.log(source_default.gray("\nBuild logs:"));
-        try {
-          const logs = finalDeployment.buildLogs.split("\n").filter((l) => l.trim());
-          for (const log of logs) {
-            try {
-              const logData = JSON.parse(log);
-              if (logData.line) {
-                console.log(source_default.gray(`  ${logData.line}`));
-              }
-            } catch {
-              console.log(source_default.gray(`  ${log}`));
-            }
-          }
-        } catch {
-          console.log(source_default.gray(finalDeployment.buildLogs));
-        }
-      }
       process.exit(1);
-    } else if (finalDeployment.status === "building") {
+    } else if (deployment.status === "building" || deployment.status === "pending") {
       startSpinner("Building and deploying...");
-      checkCount++;
       delay = Math.min(delay * 1.2, maxDelay);
     } else {
-      console.log(
-        source_default.yellow("\u26A0\uFE0F  Deployment status: ") + finalDeployment.status
-      );
+      stopSpinner();
+      console.log(source_default.yellow("\u26A0\uFE0F  Deployment status: ") + deployment.status);
       return;
     }
   }
   stopSpinner();
   console.log(source_default.yellow("\u26A0\uFE0F  Deployment is taking longer than expected."));
   console.log(
-    source_default.gray("Check status with: ") + source_default.white(`mcp-use status ${deployment.id}`)
+    source_default.gray("Check status with: ") + source_default.white(`mcp-use deployments get ${deploymentId}`)
   );
 }
 async function checkRepoAccess(api, owner, repo) {
@@ -3680,7 +3283,7 @@ async function promptGitHubInstallation(api, reason, repoName, opts) {
     return false;
   }
   try {
-    const appName = process.env.MCP_GITHUB_APP_NAME || "mcp-use";
+    const appName = await api.getGitHubAppName();
     const installUrl = reason === "not_connected" ? `https://github.com/apps/${appName}/installations/new` : `https://github.com/settings/installations`;
     console.log(
       source_default.cyan(
@@ -3960,14 +3563,14 @@ async function deployCommand(options) {
     if (options.org) {
       try {
         const authInfo = await api.testAuth();
-        const match = (authInfo.profiles ?? []).find(
-          (p) => p.slug === options.org || p.id === options.org || p.profile_name.toLowerCase() === options.org.toLowerCase()
+        const match = (authInfo.orgs ?? []).find(
+          (o) => o.slug === options.org || o.id === options.org || o.name.toLowerCase() === options.org.toLowerCase()
         );
         if (match) {
-          api.setProfileId(match.id);
+          api.setOrgId(match.id);
           const slug = match.slug ? source_default.gray(` (${match.slug})`) : "";
           console.log(
-            source_default.gray("Organization: ") + source_default.cyan(match.profile_name) + slug
+            source_default.gray("Organization: ") + source_default.cyan(match.name) + slug
           );
         } else {
           console.error(
@@ -3986,6 +3589,7 @@ async function deployCommand(options) {
       }
     }
     let githubVerified = false;
+    let installationDbId;
     try {
       console.log(source_default.gray(`[DEBUG] API URL: ${api.baseUrl}`));
       const connectionStatus = await api.getGitHubConnectionStatus();
@@ -4012,8 +3616,10 @@ async function deployCommand(options) {
           console.log(source_default.cyan("  https://manufact.com/cloud/settings\n"));
           process.exit(1);
         }
+        installationDbId = retryStatus.installations?.[0]?.id;
         githubVerified = true;
       } else if (gitInfo.owner && gitInfo.repo) {
+        installationDbId = connectionStatus.installations?.[0]?.id;
         console.log(source_default.gray("Checking repository access..."));
         const hasAccess = await checkRepoAccess(
           api,
@@ -4092,7 +3698,7 @@ async function deployCommand(options) {
     }
     const existingLink = !options.new ? await getProjectLink(cwd) : null;
     const serverId = existingLink?.serverId;
-    if (existingLink) {
+    if (existingLink && serverId) {
       try {
         const existingDeployment = await api.getDeployment(
           existingLink.deploymentId
@@ -4104,29 +3710,19 @@ async function deployCommand(options) {
             source_default.cyan(`  URL: ${getMcpServerUrl(existingDeployment)}
 `)
           );
-          const redeploymentConfig = {
-            buildCommand,
-            startCommand,
-            ...options.port !== void 0 ? { port: options.port } : {},
-            env: Object.keys(envVars).length > 0 ? envVars : void 0,
-            rootDir: options.rootDir || void 0
-          };
-          const deployment2 = await api.redeployDeployment(
-            existingLink.deploymentId,
-            redeploymentConfig
-          );
+          const newDep = await api.createDeployment({
+            serverId,
+            branch: gitInfo.branch || "main",
+            trigger: "redeploy"
+          });
           await saveProjectLink(cwd, {
             ...existingLink,
-            linkedAt: (/* @__PURE__ */ new Date()).toISOString()
+            linkedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            deploymentId: newDep.id
           });
-          await displayDeploymentProgress(api, deployment2, {
+          await displayDeploymentProgress(api, newDep.id, {
             yes: options.yes
           });
-          if (options.open && deployment2.domain) {
-            console.log();
-            console.log(source_default.gray("Opening deployment in browser..."));
-            await open_default(`https://${deployment2.domain}`);
-          }
           return;
         } else {
           console.log(
@@ -4134,72 +3730,97 @@ async function deployCommand(options) {
               `\u26A0\uFE0F  Linked deployment not found or failed, creating new one...`
             )
           );
-          if (serverId) {
-            console.log(
-              source_default.gray(`  Will reuse existing server: ${serverId}`)
-            );
-          }
+          console.log(source_default.gray(`  Will reuse existing server: ${serverId}`));
         }
       } catch (error) {
         console.log(
           source_default.yellow(`\u26A0\uFE0F  Linked deployment not found, creating new one...`)
         );
-        if (serverId) {
-          console.log(source_default.gray(`  Will reuse existing server: ${serverId}`));
-        }
+        console.log(source_default.gray(`  Will reuse existing server: ${serverId}`));
       }
     }
-    const deploymentRequest = {
-      name: projectName,
-      source: {
-        type: "github",
-        repo: `${gitInfo.owner}/${gitInfo.repo}`,
-        branch: gitInfo.branch || "main",
-        rootDir: options.rootDir || void 0,
-        runtime,
-        port,
-        buildCommand,
-        startCommand,
-        env: Object.keys(envVars).length > 0 ? envVars : void 0
-      },
-      healthCheckPath: "/healthz",
-      serverId
-    };
     if (!options.org) {
       try {
         const config = await readConfig();
-        if (config.profileName) {
-          const slug = config.profileSlug ? source_default.gray(` (${config.profileSlug})`) : "";
+        if (config.orgName) {
+          const slug = config.orgSlug ? source_default.gray(` (${config.orgSlug})`) : "";
           console.log(
-            source_default.gray("Organization: ") + source_default.cyan(config.profileName) + slug
+            source_default.gray("Organization: ") + source_default.cyan(config.orgName) + slug
           );
         }
       } catch {
       }
     }
-    console.log(source_default.gray("Creating deployment..."));
-    const deployment = await api.createDeployment(deploymentRequest);
-    console.log(
-      source_default.green("\u2713 Deployment created: ") + source_default.gray(deployment.id)
-    );
-    await saveProjectLink(cwd, {
-      deploymentId: deployment.id,
-      deploymentName: projectName,
-      deploymentUrl: deployment.domain,
-      linkedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      serverId: deployment.serverId
-    });
-    console.log(
-      source_default.gray(`  Linked to this project (stored in .mcp-use/project.json)`)
-    );
-    console.log(source_default.gray(`  Future deploys will reuse the same URL
+    let deploymentId;
+    if (serverId) {
+      console.log(source_default.gray("Creating deployment..."));
+      const result = await api.createDeployment({
+        serverId,
+        branch: gitInfo.branch || "main",
+        trigger: "manual"
+      });
+      deploymentId = result.id;
+    } else {
+      if (!installationDbId) {
+        console.log(source_default.red("\u2717 Could not determine GitHub installation ID."));
+        console.log(
+          source_default.gray(
+            "Please ensure your GitHub App is installed and try again."
+          )
+        );
+        process.exit(1);
+      }
+      const config = await readConfig();
+      const authInfo = await api.testAuth();
+      const orgId = config.orgId || authInfo.default_org_id;
+      if (!orgId) {
+        console.log(
+          source_default.red("\u2717 No organization set. Run `mcp-use org switch` first.")
+        );
+        process.exit(1);
+      }
+      console.log(source_default.gray("Creating server and deployment..."));
+      const serverResult = await api.createServer({
+        type: "github",
+        organizationId: orgId,
+        installationId: installationDbId,
+        name: projectName,
+        repoFullName: `${gitInfo.owner}/${gitInfo.repo}`,
+        branch: gitInfo.branch || "main",
+        rootDir: options.rootDir,
+        port,
+        buildCommand,
+        startCommand,
+        env: Object.keys(envVars).length > 0 ? envVars : void 0
+      });
+      deploymentId = serverResult.deploymentId ?? "";
+      if (!deploymentId) {
+        console.log(
+          source_default.green("\u2713 Server created: ") + source_default.gray(serverResult.server.id)
+        );
+        console.log(
+          source_default.yellow(
+            "\u26A0\uFE0F  No deployment was triggered. You may need to trigger one manually."
+          )
+        );
+        return;
+      }
+      await saveProjectLink(cwd, {
+        deploymentId,
+        deploymentName: projectName,
+        linkedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        serverId: serverResult.server.id
+      });
+      console.log(
+        source_default.gray(`  Linked to this project (stored in .mcp-use/project.json)`)
+      );
+      console.log(source_default.gray(`  Future deploys will reuse the same URL
 `));
-    await displayDeploymentProgress(api, deployment, { yes: options.yes });
-    if (options.open && deployment.domain) {
-      console.log();
-      console.log(source_default.gray("Opening deployment in browser..."));
-      await open_default(`https://${deployment.domain}`);
     }
+    console.log(
+      source_default.green("\u2713 Deployment created: ") + source_default.gray(deploymentId)
+    );
+    await displayDeploymentProgress(api, deploymentId, { yes: options.yes });
   } catch (error) {
     console.error(
       source_default.red.bold("\n\u2717 Deployment failed:"),
@@ -4274,19 +3895,19 @@ async function listDeploymentsCommand() {
     );
     console.log(
       source_default.white.bold(
-        `${"ID".padEnd(40)} ${"NAME".padEnd(25)} ${"STATUS".padEnd(12)} ${"DOMAIN".padEnd(35)} ${"CREATED"}`
+        `${"ID".padEnd(40)} ${"NAME".padEnd(25)} ${"STATUS".padEnd(12)} ${"MCP URL".padEnd(45)} ${"CREATED"}`
       )
     );
-    console.log(source_default.gray("\u2500".repeat(130)));
+    console.log(source_default.gray("\u2500".repeat(140)));
     for (const deployment of sortedDeployments) {
       const id = formatId(deployment.id).padEnd(40);
       const name = deployment.name.substring(0, 24).padEnd(25);
       const statusColor = getStatusColor(deployment.status);
       const status = statusColor(deployment.status.padEnd(12));
-      const domain = (deployment.domain || "-").substring(0, 34).padEnd(35);
+      const mcpUrl = (deployment.mcpUrl || "-").substring(0, 44).padEnd(45);
       const created = formatRelativeTime(deployment.createdAt);
       console.log(
-        `${source_default.gray(id)} ${name} ${status} ${source_default.cyan(domain)} ${source_default.gray(created)}`
+        `${source_default.gray(id)} ${name} ${status} ${source_default.cyan(mcpUrl)} ${source_default.gray(created)}`
       );
     }
     console.log();
@@ -4318,31 +3939,24 @@ async function getDeploymentCommand(deploymentId) {
     console.log(
       source_default.white("Status:        ") + statusColor(deployment.status)
     );
-    if (deployment.domain) {
+    if (deployment.mcpUrl) {
       console.log(
-        source_default.white("Domain:        ") + source_default.cyan(`https://${deployment.domain}`)
+        source_default.white("MCP URL:       ") + source_default.cyan(deployment.mcpUrl)
       );
     }
-    if (deployment.customDomain) {
+    if (deployment.gitBranch) {
       console.log(
-        source_default.white("Custom Domain: ") + source_default.cyan(`https://${deployment.customDomain}`)
+        source_default.white("Branch:        ") + source_default.gray(deployment.gitBranch)
       );
     }
-    console.log(
-      source_default.white("Source:        ") + source_default.gray(deployment.source.type)
-    );
-    if (deployment.source.type === "github") {
-      console.log(
-        source_default.white("Repository:    ") + source_default.gray(deployment.source.repo)
-      );
+    if (deployment.gitCommitSha) {
       console.log(
-        source_default.white("Branch:        ") + source_default.gray(deployment.source.branch || "main")
+        source_default.white("Commit:        ") + source_default.gray(deployment.gitCommitSha.substring(0, 7))
       );
     }
-    console.log(source_default.white("Port:          ") + source_default.gray(deployment.port));
-    console.log(
-      source_default.white("Runtime:       ") + source_default.gray(deployment.source.runtime || "node")
-    );
+    if (deployment.port) {
+      console.log(source_default.white("Port:          ") + source_default.gray(deployment.port));
+    }
     if (deployment.provider) {
       console.log(
         source_default.white("Provider:      ") + source_default.gray(deployment.provider)
@@ -4354,13 +3968,6 @@ async function getDeploymentCommand(deploymentId) {
     console.log(
       source_default.white("Updated:       ") + source_default.gray(formatRelativeTime(deployment.updatedAt))
     );
-    if (deployment.source.env && Object.keys(deployment.source.env).length > 0) {
-      console.log(source_default.white("\nEnvironment Variables:"));
-      for (const [key, value] of Object.entries(deployment.source.env)) {
-        const displayValue = key.toLowerCase().includes("key") || key.toLowerCase().includes("secret") || key.toLowerCase().includes("password") || key.toLowerCase().includes("token") ? "***" : value;
-        console.log(source_default.gray(`  ${key}=`) + source_default.white(displayValue));
-      }
-    }
     if (deployment.status === "failed" && deployment.error) {
       console.log(source_default.red("\nError:"));
       console.log(source_default.red(`  ${deployment.error}`));
@@ -4387,43 +3994,56 @@ async function restartDeploymentCommand(deploymentId, options) {
     }
     const api = await McpUseAPI.create();
     const deployment = await api.getDeployment(deploymentId);
+    if (!deployment.serverId) {
+      console.log(
+        source_default.red("\u2717 Cannot restart: deployment has no linked server.")
+      );
+      process.exit(1);
+    }
     console.log(
       source_default.cyan.bold(`
 \u{1F504} Restarting deployment: ${deployment.name}
 `)
     );
-    const redeployedDeployment = await api.redeployDeployment(deploymentId);
-    console.log(
-      source_default.green("\u2713 Restart initiated: ") + source_default.gray(redeployedDeployment.id)
-    );
+    const newDep = await api.createDeployment({
+      serverId: deployment.serverId,
+      trigger: "redeploy"
+    });
+    console.log(source_default.green("\u2713 Restart initiated: ") + source_default.gray(newDep.id));
     if (options.follow) {
-      console.log(source_default.gray("\nFollowing deployment logs...\n"));
-      try {
-        for await (const log of api.streamDeploymentLogs(
-          redeployedDeployment.id
-        )) {
-          try {
-            const logData = JSON.parse(log);
-            if (logData.line) {
-              const levelColor = logData.level === "error" ? source_default.red : logData.level === "warn" ? source_default.yellow : source_default.gray;
-              const stepPrefix = logData.step ? source_default.cyan(`[${logData.step}]`) + " " : "";
-              console.log(stepPrefix + levelColor(logData.line));
+      console.log(source_default.gray("\nFollowing build logs...\n"));
+      let offset = 0;
+      let terminal = false;
+      while (!terminal) {
+        await new Promise((r) => setTimeout(r, 2e3));
+        try {
+          const resp = await api.getDeploymentBuildLogs(newDep.id, offset);
+          if (resp.logs.length > 0) {
+            const lines = resp.logs.split("\n").filter((l) => l.trim());
+            for (const line of lines) {
+              try {
+                const logData = JSON.parse(line);
+                if (logData.line) {
+                  const levelColor = logData.level === "error" ? source_default.red : logData.level === "warn" ? source_default.yellow : source_default.gray;
+                  const stepPrefix = logData.step ? source_default.cyan(`[${logData.step}]`) + " " : "";
+                  console.log(stepPrefix + levelColor(logData.line));
+                }
+              } catch {
+                console.log(source_default.gray(line));
+              }
             }
-          } catch {
-            console.log(source_default.gray(log));
+            offset = resp.offset;
           }
+          if (resp.status === "running" || resp.status === "failed" || resp.status === "stopped") {
+            terminal = true;
+          }
+        } catch {
         }
-      } catch (error) {
-        console.log(
-          source_default.gray(
-            "\nLog stream ended. Use " + source_default.white(`mcp-use deployments get ${deploymentId}`) + " to check status."
-          )
-        );
       }
     } else {
       console.log(
         source_default.gray(
-          "\nCheck status with: " + source_default.white(`mcp-use deployments get ${deploymentId}`)
+          "\nCheck status with: " + source_default.white(`mcp-use deployments get ${newDep.id}`)
         )
       );
     }
@@ -4457,8 +4077,10 @@ async function deleteDeploymentCommand(deploymentId, options) {
         )
       );
       console.log(source_default.gray(`   ID: ${deployment.id}`));
-      console.log(source_default.gray(`   Domain: ${deployment.domain || "none"}
+      if (deployment.mcpUrl) {
+        console.log(source_default.gray(`   URL: ${deployment.mcpUrl}
 `));
+      }
       const confirmed = await prompt2(
         source_default.white("Are you sure you want to delete this deployment? (y/N): ")
       );
@@ -4494,30 +4116,41 @@ async function logsCommand(deploymentId, options) {
     }
     const api = await McpUseAPI.create();
     if (options.follow) {
-      console.log(source_default.gray("Streaming logs...\n"));
-      try {
-        for await (const log of api.streamDeploymentLogs(deploymentId)) {
-          try {
-            const logData = JSON.parse(log);
-            if (logData.line) {
-              const levelColor = logData.level === "error" ? source_default.red : logData.level === "warn" ? source_default.yellow : source_default.gray;
-              const stepPrefix = logData.step ? source_default.cyan(`[${logData.step}]`) + " " : "";
-              console.log(stepPrefix + levelColor(logData.line));
+      console.log(source_default.gray("Following build logs...\n"));
+      let offset = 0;
+      let terminal = false;
+      while (!terminal) {
+        await new Promise((r) => setTimeout(r, 2e3));
+        try {
+          const resp = await api.getDeploymentBuildLogs(deploymentId, offset);
+          if (resp.logs.length > 0) {
+            const lines = resp.logs.split("\n").filter((l) => l.trim());
+            for (const line of lines) {
+              try {
+                const logData = JSON.parse(line);
+                if (logData.line) {
+                  const levelColor = logData.level === "error" ? source_default.red : logData.level === "warn" ? source_default.yellow : source_default.gray;
+                  const stepPrefix = logData.step ? source_default.cyan(`[${logData.step}]`) + " " : "";
+                  console.log(stepPrefix + levelColor(logData.line));
+                }
+              } catch {
+                console.log(source_default.gray(line));
+              }
             }
-          } catch {
-            console.log(source_default.gray(log));
+            offset = resp.offset;
+          }
+          if (resp.status === "running" || resp.status === "failed" || resp.status === "stopped") {
+            terminal = true;
           }
+        } catch {
         }
-      } catch (error) {
-        console.log(source_default.gray("\nLog stream ended."));
       }
-    } else {
-      const logs = options.build ? await api.getDeploymentBuildLogs(deploymentId) : await api.getDeploymentLogs(deploymentId);
+    } else if (options.build) {
+      const resp = await api.getDeploymentBuildLogs(deploymentId);
+      const logs = resp.logs;
       if (!logs || logs.trim() === "") {
         console.log(
-          source_default.yellow(
-            `No ${options.build ? "build " : ""}logs available for this deployment.`
-          )
+          source_default.yellow("No build logs available for this deployment.")
         );
         return;
       }
@@ -4534,133 +4167,30 @@ async function logsCommand(deploymentId, options) {
           console.log(source_default.gray(line));
         }
       }
-    }
-    console.log();
-  } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to get logs:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
-  }
-}
-async function listEnvCommand(deploymentId) {
-  try {
-    if (!await isLoggedIn()) {
-      console.log(source_default.red("\u2717 You are not logged in."));
-      console.log(
-        source_default.gray(
-          "Run " + source_default.white("npx mcp-use login") + " to get started."
-        )
-      );
-      process.exit(1);
-    }
-    const api = await McpUseAPI.create();
-    const deployment = await api.getDeployment(deploymentId);
-    console.log(
-      source_default.cyan.bold(`
-\u{1F510} Environment Variables: ${deployment.name}
-`)
-    );
-    if (!deployment.source.env || Object.keys(deployment.source.env).length === 0) {
-      console.log(source_default.yellow("No environment variables set."));
-      console.log();
-      return;
-    }
-    for (const [key, value] of Object.entries(deployment.source.env)) {
-      const displayValue = key.toLowerCase().includes("key") || key.toLowerCase().includes("secret") || key.toLowerCase().includes("password") || key.toLowerCase().includes("token") ? "***" : value;
-      console.log(
-        source_default.white(key) + source_default.gray("=") + source_default.cyan(displayValue)
-      );
-    }
-    console.log();
-  } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to list environment variables:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
-  }
-}
-async function setEnvCommand(deploymentId, envPairs) {
-  try {
-    if (!await isLoggedIn()) {
-      console.log(source_default.red("\u2717 You are not logged in."));
-      console.log(
-        source_default.gray(
-          "Run " + source_default.white("npx mcp-use login") + " to get started."
-        )
-      );
-      process.exit(1);
-    }
-    const env2 = {};
-    for (const pair of envPairs) {
-      const [key, ...valueParts] = pair.split("=");
-      if (!key || valueParts.length === 0) {
-        console.log(source_default.red(`\u2717 Invalid format: ${pair}. Expected KEY=VALUE`));
-        process.exit(1);
+    } else {
+      const logs = await api.getDeploymentLogs(deploymentId);
+      if (!logs || logs.trim() === "") {
+        console.log(source_default.yellow("No logs available for this deployment."));
+        return;
+      }
+      const logLines = logs.split("\n").filter((l) => l.trim());
+      for (const line of logLines) {
+        try {
+          const logData = JSON.parse(line);
+          if (logData.line) {
+            const levelColor = logData.level === "error" ? source_default.red : logData.level === "warn" ? source_default.yellow : source_default.gray;
+            const stepPrefix = logData.step ? source_default.cyan(`[${logData.step}]`) + " " : "";
+            console.log(stepPrefix + levelColor(logData.line));
+          }
+        } catch {
+          console.log(source_default.gray(line));
+        }
       }
-      env2[key.trim()] = valueParts.join("=").trim();
-    }
-    const api = await McpUseAPI.create();
-    const deployment = await api.getDeployment(deploymentId);
-    const currentEnv = deployment.source.env || {};
-    const mergedEnv = { ...currentEnv, ...env2 };
-    const updated = await api.updateDeployment(deploymentId, {
-      env: mergedEnv
-    });
-    console.log(
-      source_default.green.bold(`
-\u2713 Environment variables updated: ${updated.name}
-`)
-    );
-    for (const key of Object.keys(env2)) {
-      const displayValue = key.toLowerCase().includes("key") || key.toLowerCase().includes("secret") || key.toLowerCase().includes("password") || key.toLowerCase().includes("token") ? "***" : env2[key];
-      console.log(
-        source_default.white(key) + source_default.gray("=") + source_default.cyan(displayValue)
-      );
-    }
-    console.log();
-  } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to set environment variables:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
-  }
-}
-async function unsetEnvCommand(deploymentId, keys) {
-  try {
-    if (!await isLoggedIn()) {
-      console.log(source_default.red("\u2717 You are not logged in."));
-      console.log(
-        source_default.gray(
-          "Run " + source_default.white("npx mcp-use login") + " to get started."
-        )
-      );
-      process.exit(1);
-    }
-    const api = await McpUseAPI.create();
-    const deployment = await api.getDeployment(deploymentId);
-    const currentEnv = { ...deployment.source.env || {} };
-    for (const key of keys) {
-      delete currentEnv[key];
-    }
-    const updated = await api.updateDeployment(deploymentId, {
-      env: currentEnv
-    });
-    console.log(
-      source_default.green.bold(`
-\u2713 Environment variables removed: ${updated.name}
-`)
-    );
-    for (const key of keys) {
-      console.log(source_default.gray(`  ${key}`));
     }
     console.log();
   } catch (error) {
     console.error(
-      source_default.red.bold("\n\u2717 Failed to unset environment variables:"),
+      source_default.red.bold("\n\u2717 Failed to get logs:"),
       source_default.red(error instanceof Error ? error.message : "Unknown error")
     );
     process.exit(1);
@@ -4678,11 +4208,9 @@ async function stopDeploymentCommand(deploymentId) {
       process.exit(1);
     }
     const api = await McpUseAPI.create();
-    const updated = await api.updateDeployment(deploymentId, {
-      status: "stopped"
-    });
+    await api.stopDeployment(deploymentId);
     console.log(source_default.green.bold(`
-\u2713 Deployment stopped: ${updated.name}
+\u2713 Deployment stopped
 `));
   } catch (error) {
     console.error(
@@ -4703,13 +4231,11 @@ async function startDeploymentCommand(deploymentId) {
       );
       process.exit(1);
     }
-    const api = await McpUseAPI.create();
-    const updated = await api.updateDeployment(deploymentId, {
-      status: "running"
-    });
-    console.log(source_default.green.bold(`
-\u2713 Deployment started: ${updated.name}
-`));
+    console.log(
+      source_default.yellow(
+        "\u26A0\uFE0F  Start is not supported in this version. Use `mcp-use deployments restart` to redeploy."
+      )
+    );
   } catch (error) {
     console.error(
       source_default.red.bold("\n\u2717 Failed to start deployment:"),
@@ -4724,13 +4250,11 @@ function createDeploymentsCommand() {
   );
   deploymentsCommand.command("list").alias("ls").description("List all deployments").action(listDeploymentsCommand);
   deploymentsCommand.command("get").argument("<deployment-id>", "Deployment ID").description("Get deployment details").action(getDeploymentCommand);
-  deploymentsCommand.command("restart").argument("<deployment-id>", "Deployment ID").option("-f, --follow", "Follow deployment logs").description("Restart a deployment").action(restartDeploymentCommand);
+  deploymentsCommand.command("restart").argument("<deployment-id>", "Deployment ID").option("-f, --follow", "Follow build logs").description(
+    "Restart a deployment (triggers a new deployment on the same server)"
+  ).action(restartDeploymentCommand);
   deploymentsCommand.command("delete").alias("rm").argument("<deployment-id>", "Deployment ID").option("-y, --yes", "Skip confirmation prompt").description("Delete a deployment").action(deleteDeploymentCommand);
-  deploymentsCommand.command("logs").argument("<deployment-id>", "Deployment ID").option("-b, --build", "Show build logs instead of runtime logs").option("-f, --follow", "Stream logs in real-time").description("View deployment logs").action(logsCommand);
-  const envCommand = deploymentsCommand.command("env").description("Manage environment variables");
-  envCommand.command("list").argument("<deployment-id>", "Deployment ID").description("List environment variables").action(listEnvCommand);
-  envCommand.command("set").argument("<deployment-id>", "Deployment ID").argument("<pairs...>", "Environment variables in KEY=VALUE format").description("Set environment variables").action(setEnvCommand);
-  envCommand.command("unset").argument("<deployment-id>", "Deployment ID").argument("<keys...>", "Environment variable keys to remove").description("Unset environment variables").action(unsetEnvCommand);
+  deploymentsCommand.command("logs").argument("<deployment-id>", "Deployment ID").option("-b, --build", "Show build logs instead of runtime logs").option("-f, --follow", "Follow build logs in real-time").description("View deployment logs").action(logsCommand);
   deploymentsCommand.command("stop").argument("<deployment-id>", "Deployment ID").description("Stop a deployment").action(stopDeploymentCommand);
   deploymentsCommand.command("start").argument("<deployment-id>", "Deployment ID").description("Start a stopped deployment").action(startDeploymentCommand);
   return deploymentsCommand;
@@ -4753,22 +4277,22 @@ async function orgListCommand() {
     const api = await McpUseAPI.create();
     const authInfo = await api.testAuth();
     const config = await readConfig();
-    const profiles = authInfo.profiles ?? [];
-    const activeId = config.profileId || authInfo.default_profile_id;
-    if (profiles.length === 0) {
+    const orgs = authInfo.orgs ?? [];
+    const activeId = config.orgId || authInfo.default_org_id;
+    if (orgs.length === 0) {
       console.log(source_default.yellow("No organizations found."));
       return;
     }
     console.log(source_default.cyan.bold("\u{1F3E2} Your organizations:\n"));
-    for (const p of profiles) {
-      const isActive = p.id === activeId;
+    for (const o of orgs) {
+      const isActive = o.id === activeId;
       const marker = isActive ? source_default.green(" \u2190 active") : "";
-      const slug = p.slug ? source_default.gray(` (${p.slug})`) : "";
-      const role = source_default.gray(` [${p.role}]`);
-      const name = isActive ? source_default.cyan.bold(p.profile_name) : source_default.white(p.profile_name);
+      const slug = o.slug ? source_default.gray(` (${o.slug})`) : "";
+      const role = source_default.gray(` [${o.role}]`);
+      const name = isActive ? source_default.cyan.bold(o.name) : source_default.white(o.name);
       console.log(`  ${name}${slug}${role}${marker}`);
     }
-    if (profiles.length > 1) {
+    if (orgs.length > 1) {
       console.log(
         source_default.gray("\nSwitch with " + source_default.white("npx mcp-use org switch"))
       );
@@ -4787,40 +4311,40 @@ async function orgSwitchCommand() {
     const api = await McpUseAPI.create();
     const authInfo = await api.testAuth();
     const config = await readConfig();
-    const profiles = authInfo.profiles ?? [];
-    if (profiles.length === 0) {
+    const orgs = authInfo.orgs ?? [];
+    if (orgs.length === 0) {
       console.log(source_default.yellow("No organizations found."));
       return;
     }
-    if (profiles.length === 1) {
-      const p = profiles[0];
-      const slug2 = p.slug ? source_default.gray(` (${p.slug})`) : "";
+    if (orgs.length === 1) {
+      const o = orgs[0];
+      const slug2 = o.slug ? source_default.gray(` (${o.slug})`) : "";
       console.log(
         source_default.yellow(
-          `You only have one organization: ${source_default.cyan(p.profile_name)}${slug2}`
+          `You only have one organization: ${source_default.cyan(o.name)}${slug2}`
         )
       );
       return;
     }
-    const activeId = config.profileId || authInfo.default_profile_id;
-    const selected = await promptOrgSelection(profiles, activeId);
+    const activeId = config.orgId || authInfo.default_org_id;
+    const selected = await promptOrgSelection(orgs, activeId);
     if (!selected) {
       console.log(source_default.yellow("No organization selected."));
       return;
     }
     await writeConfig({
       ...config,
-      profileId: selected.id,
-      profileName: selected.profile_name,
-      profileSlug: selected.slug ?? void 0
+      orgId: selected.id,
+      orgName: selected.name,
+      orgSlug: selected.slug ?? void 0
     });
     try {
-      await api.setDefaultProfile(selected.id);
+      await api.setDefaultOrg(selected.id);
     } catch {
     }
     const slug = selected.slug ? source_default.gray(` (${selected.slug})`) : "";
     console.log(
-      source_default.green.bold("\n\u2713 Switched to ") + source_default.cyan.bold(selected.profile_name) + slug
+      source_default.green.bold("\n\u2713 Switched to ") + source_default.cyan.bold(selected.name) + slug
     );
   } catch (error) {
     console.error(
@@ -4834,7 +4358,7 @@ async function orgCurrentCommand() {
   try {
     if (!await ensureLoggedIn()) return;
     const config = await readConfig();
-    if (!config.profileId) {
+    if (!config.orgId) {
       console.log(
         source_default.yellow(
           "No organization selected. Run " + source_default.white("npx mcp-use org switch") + " to pick one."
@@ -4842,9 +4366,9 @@ async function orgCurrentCommand() {
       );
       return;
     }
-    const slug = config.profileSlug ? source_default.gray(` (${config.profileSlug})`) : "";
+    const slug = config.orgSlug ? source_default.gray(` (${config.orgSlug})`) : "";
     console.log(
-      source_default.cyan.bold("\u{1F3E2} Active organization: ") + source_default.white(config.profileName || config.profileId) + slug
+      source_default.cyan.bold("\u{1F3E2} Active organization: ") + source_default.white(config.orgName || config.orgId) + slug
     );
   } catch (error) {
     console.error(
@@ -5169,7 +4693,7 @@ async function isPortAvailable(port, host = "localhost") {
     return true;
   }
 }
-async function findAvailablePort2(startPort, host = "localhost") {
+async function findAvailablePort(startPort, host = "localhost") {
   for (let port = startPort; port < startPort + 100; port++) {
     if (await isPortAvailable(port, host)) {
       return port;
@@ -5460,7 +4984,7 @@ if (container && Component) {
         `${widgetName}-metadata`
       );
       await fs10.mkdir(metadataTempDir, { recursive: true });
-      const { createServer: createServer2 } = await import("vite");
+      const { createServer } = await import("vite");
       const nodeStubsPlugin = {
         name: "node-stubs",
         enforce: "pre",
@@ -5487,7 +5011,7 @@ export default PostHog;
           return null;
         }
       };
-      const metadataServer = await createServer2({
+      const metadataServer = await createServer({
         root: metadataTempDir,
         cacheDir: path7.join(metadataTempDir, ".vite-cache"),
         plugins: [nodeStubsPlugin, tailwindcss(), react()],
@@ -6052,7 +5576,7 @@ program.command("dev").description("Run development server with auto-reload and
     displayPackageVersions(projectPath);
     if (!await isPortAvailable(port, host)) {
       console.log(source_default.yellow.bold(`\u26A0\uFE0F  Port ${port} is already in use`));
-      const availablePort = await findAvailablePort2(port, host);
+      const availablePort = await findAvailablePort(port, host);
       console.log(source_default.green.bold(`\u2713 Using port ${availablePort} instead`));
       port = availablePort;
     }
@@ -6887,9 +6411,12 @@ Looked for:
     process.exit(1);
   }
 });
-program.command("login").description("Login to Manufact cloud").action(async () => {
+program.command("login").description("Login to mcp-use cloud").option(
+  "--api-key <key>",
+  "Login with an API key directly (non-interactive, for CI/CD)"
+).action(async (opts) => {
   try {
-    await loginCommand();
+    await loginCommand({ apiKey: opts.apiKey });
     process.exit(0);
   } catch (error) {
     console.error(