@mcp-use/cli 3.0.0-canary.3 → 3.0.0-canary.5

package/dist/index.js

@@ -503,7 +503,7 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // src/index.ts
-import { Command as Command4 } from "commander";
+import { Command as Command5 } from "commander";
 import "dotenv/config";
 import { spawn } from "child_process";
 import { readFileSync as readFileSync2 } from "fs";
@@ -1147,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 {
@@ -1174,9 +1181,9 @@ 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;
@@ -1190,30 +1197,21 @@ async function getAuthBaseUrl() {
 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 = {
@@ -1223,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();
@@ -1251,16 +1249,13 @@ 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 a persistent API key using a Better Auth access token.
-   * Calls Better Auth's built-in POST /api/auth/api-key/create endpoint.
    */
   async createApiKeyWithAccessToken(accessToken, name = "CLI") {
     const authBase = await getAuthBaseUrl();
@@ -1279,255 +1274,171 @@ 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) {
-    return this.request("/deployments", {
+  // ── 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(request)
+      body: JSON.stringify(body)
     });
   }
-  /**
-   * 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;
+  async listServers(params) {
+    const search = new URLSearchParams();
+    if (params?.organizationId) {
+      search.set("organizationId", params.organizationId);
     }
-    const response = await fetch(url, { headers });
-    if (!response.ok) {
-      throw new Error(`Failed to stream logs: ${response.status}`);
+    if (params?.limit != null) {
+      search.set("limit", String(params.limit));
     }
-    if (!response.body) {
-      throw new Error("Response body is null");
+    if (params?.skip != null) {
+      search.set("skip", String(params.skip));
     }
-    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();
+    if (params?.sort) {
+      search.set("sort", params.sort);
     }
+    const q = search.toString();
+    return this.request(`/servers${q ? `?${q}` : ""}`);
   }
-  /**
-   * 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));
+  async getServer(idOrSlug) {
+    const path8 = encodeURIComponent(idOrSlug);
+    return this.request(`/servers/${path8}`);
+  }
+  async deleteServer(id) {
+    await this.request(
+      `/servers/${encodeURIComponent(id)}`,
+      {
+        method: "DELETE"
       }
-    }
-    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, {
+    );
+  }
+  // ── Deployments ─────────────────────────────────────────────────
+  async createDeployment(input) {
+    return this.request("/deployments", {
       method: "POST",
-      headers,
-      body: formData
+      body: JSON.stringify(input)
     });
-    if (!response.ok) {
-      const error = await response.text();
-      throw new Error(`Deployment failed: ${error}`);
-    }
-    return response.json();
   }
-  /**
-   * List all deployments
-   */
+  async getDeployment(deploymentId) {
+    return this.request(`/deployments/${deploymentId}`);
+  }
   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,
+        account_login: i.account?.login ?? "",
+        account_type: i.account?.type ?? "User"
+      }))
+    };
+  }
+  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 GitHub app name
-   */
   async getGitHubAppName() {
-    const response = await this.request("/github/appname");
-    return response.app_name;
+    if (process.env.MCP_GITHUB_APP_NAME) return process.env.MCP_GITHUB_APP_NAME;
+    if (this.baseUrl.includes("localhost")) return "mcp-use-local";
+    if (this.baseUrl.includes(".dev.")) return "mcp-use-dev";
+    return "mcp-use";
   }
   /**
-   * Get accessible GitHub repositories
+   * Returns the GitHub numeric installation ID (not the DB UUID) for the org.
+   * Used for building direct installation settings URLs.
    */
-  async getGitHubRepos(refresh = false) {
-    return this.request(
-      `/github/repos${refresh ? "?refresh=true" : ""}`
-    );
+  async getGitHubInstallationId() {
+    const status = await this.getGitHubConnectionStatus();
+    return status.installations?.[0]?.installation_id ?? null;
+  }
+  async createGitHubRepo(opts) {
+    return this.request(`/github/installations/${opts.installationId}/repos`, {
+      method: "POST",
+      body: JSON.stringify({
+        name: opts.name,
+        private: opts.private ?? true,
+        org: opts.org
+      })
+    });
   }
 };
 
@@ -1592,19 +1503,17 @@ async function pollForDeviceToken(authBaseUrl, deviceCode, intervalSeconds) {
   }
   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({
@@ -1612,7 +1521,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(`
@@ -1621,11 +1530,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]);
         }
       }
     );
@@ -1704,28 +1613,25 @@ async function loginCommand(options) {
         const masked = storedKey.substring(0, 8) + "...";
         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 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
           );
         }
       }
@@ -1795,22 +1701,22 @@ 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."
           )
         );
       }
@@ -2587,9 +2493,9 @@ async function listPromptsCommand(options) {
     }
     console.log(formatHeader(`Available Prompts (${prompts.length}):`));
     console.log("");
-    const tableData = prompts.map((prompt3) => ({
-      name: source_default.bold(prompt3.name),
-      description: prompt3.description || source_default.gray("No description")
+    const tableData = prompts.map((prompt4) => ({
+      name: source_default.bold(prompt4.name),
+      description: prompt4.description || source_default.gray("No description")
     }));
     console.log(
       formatTable(tableData, [
@@ -2617,20 +2523,20 @@ async function getPromptCommand(promptName, argsJson, options) {
       }
     }
     console.error(formatInfo(`Getting prompt '${promptName}'...`));
-    const prompt3 = await session.getPrompt(promptName, args);
+    const prompt4 = await session.getPrompt(promptName, args);
     if (options?.json) {
-      console.log(formatJson(prompt3));
+      console.log(formatJson(prompt4));
     } else {
       console.log(formatHeader(`Prompt: ${promptName}`));
       console.log("");
-      if (prompt3.description) {
-        console.log(prompt3.description);
+      if (prompt4.description) {
+        console.log(prompt4.description);
         console.log("");
       }
-      if (prompt3.messages) {
+      if (prompt4.messages) {
         console.log(formatHeader("Messages:"));
         console.log("");
-        console.log(formatPromptMessages(prompt3.messages));
+        console.log(formatPromptMessages(prompt4.messages));
       }
     }
   } catch (error) {
@@ -2770,8 +2676,8 @@ async function interactiveCommand(options) {
               async (argsInput) => {
                 try {
                   const args = argsInput.trim() ? JSON.parse(argsInput) : {};
-                  const prompt3 = await session.getPrompt(arg, args);
-                  console.log(formatPromptMessages(prompt3.messages));
+                  const prompt4 = await session.getPrompt(arg, args);
+                  console.log(formatPromptMessages(prompt4.messages));
                 } catch (error) {
                   console.error(formatError(error.message));
                 }
@@ -2937,6 +2843,20 @@ async function getGitInfo(cwd = process.cwd()) {
     hasUncommittedChanges: uncommittedChanges
   };
 }
+async function gitInit(cwd, message = "Initial commit") {
+  await gitCommand("git init", cwd);
+  await gitCommand("git add .", cwd);
+  await gitCommand(`git commit -m "${message}"`, cwd);
+}
+async function gitAddRemoteAndPush(cwd, cloneUrl, branch = "main") {
+  await gitCommand(`git remote add origin ${cloneUrl}`, cwd);
+  await gitCommand(`git push -u origin ${branch}`, cwd);
+}
+async function gitCommitAndPush(cwd, message, branch = "main") {
+  await gitCommand("git add .", cwd);
+  await gitCommand(`git commit -m "${message}"`, cwd);
+  await gitCommand(`git push origin ${branch}`, cwd);
+}
 function isGitHubUrl(url) {
   try {
     const parsedUrl = new URL(url);
@@ -2951,6 +2871,22 @@ function isGitHubUrl(url) {
   return false;
 }
 
+// src/utils/cloud-urls.ts
+var GATEWAY_DOMAIN = "run.mcp-use.com";
+function buildGatewayUrl(slugOrId) {
+  return `https://${slugOrId}.${GATEWAY_DOMAIN}/mcp`;
+}
+function getMcpServerUrl(deployment) {
+  if (deployment.mcpUrl) return deployment.mcpUrl;
+  if (deployment.serverId) return buildGatewayUrl(deployment.serverId);
+  return "";
+}
+function getMcpServerUrlForCloudServer(server) {
+  if (server.mcpUrl) return server.mcpUrl;
+  const hostKey = server.slug && server.slug.trim() || server.id;
+  return buildGatewayUrl(hostKey);
+}
+
 // src/utils/project-link.ts
 import { promises as fs8 } from "fs";
 import path4 from "path";
@@ -2997,10 +2933,6 @@ ${MCP_USE_DIR}
 }
 
 // src/commands/deploy.ts
-var GATEWAY_DOMAIN = "run.mcp-use.com";
-function buildGatewayUrl(slugOrId) {
-  return `https://${slugOrId}.${GATEWAY_DOMAIN}/mcp`;
-}
 async function parseEnvFile(filePath) {
   try {
     const content = await fs9.readFile(filePath, "utf-8");
@@ -3010,9 +2942,7 @@ async function parseEnvFile(filePath) {
     let currentValue = "";
     for (let line of lines) {
       line = line.trim();
-      if (!line || line.startsWith("#")) {
-        continue;
-      }
+      if (!line || line.startsWith("#")) continue;
       if (currentKey && !line.includes("=")) {
         currentValue += "\n" + line;
         continue;
@@ -3023,20 +2953,15 @@ async function parseEnvFile(filePath) {
         currentValue = "";
       }
       const equalIndex = line.indexOf("=");
-      if (equalIndex === -1) {
-        continue;
-      }
+      if (equalIndex === -1) continue;
       const key = line.substring(0, equalIndex).trim();
-      let value = line.substring(equalIndex + 1).trim();
+      const value = line.substring(equalIndex + 1).trim();
       if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
-        console.log(
-          source_default.yellow(`\u26A0\uFE0F  Skipping invalid environment variable key: ${key}`)
-        );
+        console.log(source_default.yellow(`\u26A0\uFE0F  Skipping invalid env key: ${key}`));
         continue;
       }
       if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
-        value = value.slice(1, -1);
-        envVars[key] = value;
+        envVars[key] = value.slice(1, -1);
       } else if (value.startsWith('"') || value.startsWith("'")) {
         currentKey = key;
         currentValue = value.slice(1);
@@ -3060,16 +2985,12 @@ async function parseEnvFile(filePath) {
 function parseEnvVar(envStr) {
   const equalIndex = envStr.indexOf("=");
   if (equalIndex === -1) {
-    throw new Error(
-      `Invalid environment variable format: "${envStr}". Expected KEY=VALUE`
-    );
+    throw new Error(`Invalid env format: "${envStr}". Expected KEY=VALUE`);
   }
   const key = envStr.substring(0, equalIndex).trim();
   const value = envStr.substring(equalIndex + 1);
   if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
-    throw new Error(
-      `Invalid environment variable key: "${key}". Keys must start with a letter or underscore and contain only letters, numbers, and underscores.`
-    );
+    throw new Error(`Invalid env key: "${key}".`);
   }
   return { key, value };
 }
@@ -3112,72 +3033,48 @@ async function buildEnvVars(options) {
 }
 async function isMcpProject(cwd = process.cwd()) {
   try {
-    const packageJsonPath = path5.join(cwd, "package.json");
-    const content = await fs9.readFile(packageJsonPath, "utf-8");
-    const packageJson2 = JSON.parse(content);
-    const hasMcpDeps = packageJson2.dependencies?.["mcp-use"] || packageJson2.dependencies?.["@modelcontextprotocol/sdk"] || packageJson2.devDependencies?.["mcp-use"] || packageJson2.devDependencies?.["@modelcontextprotocol/sdk"];
-    const hasMcpScripts = packageJson2.scripts?.mcp || packageJson2.scripts?.["mcp:dev"];
-    return !!(hasMcpDeps || hasMcpScripts);
+    const content = await fs9.readFile(path5.join(cwd, "package.json"), "utf-8");
+    const pkg = JSON.parse(content);
+    return !!(pkg.dependencies?.["mcp-use"] || pkg.dependencies?.["@modelcontextprotocol/sdk"] || pkg.devDependencies?.["mcp-use"] || pkg.devDependencies?.["@modelcontextprotocol/sdk"]);
   } catch {
     return false;
   }
 }
 async function getProjectName(cwd = process.cwd()) {
   try {
-    const packageJsonPath = path5.join(cwd, "package.json");
-    const content = await fs9.readFile(packageJsonPath, "utf-8");
-    const packageJson2 = JSON.parse(content);
-    if (packageJson2.name) {
-      return packageJson2.name;
-    }
+    const content = await fs9.readFile(path5.join(cwd, "package.json"), "utf-8");
+    const pkg = JSON.parse(content);
+    if (pkg.name) return pkg.name;
   } catch {
   }
   return path5.basename(cwd);
 }
-async function detectBuildCommand(cwd = process.cwd()) {
+async function detectBuildCommand(cwd) {
   try {
-    const packageJsonPath = path5.join(cwd, "package.json");
-    const content = await fs9.readFile(packageJsonPath, "utf-8");
-    const packageJson2 = JSON.parse(content);
-    if (packageJson2.scripts?.build) {
-      return "npm run build";
-    }
+    const content = await fs9.readFile(path5.join(cwd, "package.json"), "utf-8");
+    if (JSON.parse(content).scripts?.build) return "npm run build";
   } catch {
   }
   return void 0;
 }
-async function detectStartCommand(cwd = process.cwd()) {
+async function detectStartCommand(cwd) {
   try {
-    const packageJsonPath = path5.join(cwd, "package.json");
-    const content = await fs9.readFile(packageJsonPath, "utf-8");
-    const packageJson2 = JSON.parse(content);
-    if (packageJson2.scripts?.start) {
-      return "npm start";
-    }
-    if (packageJson2.main) {
-      return `node ${packageJson2.main}`;
-    }
+    const content = await fs9.readFile(path5.join(cwd, "package.json"), "utf-8");
+    const pkg = JSON.parse(content);
+    if (pkg.scripts?.start) return "npm start";
+    if (pkg.main) return `node ${pkg.main}`;
   } catch {
   }
   return void 0;
 }
-async function detectRuntime(cwd = process.cwd()) {
-  try {
-    const pythonFiles = ["requirements.txt", "pyproject.toml", "setup.py"];
-    for (const file of pythonFiles) {
-      try {
-        await fs9.access(path5.join(cwd, file));
-        return "python";
-      } catch {
-        continue;
-      }
-    }
+async function detectRuntime(cwd) {
+  for (const f of ["requirements.txt", "pyproject.toml", "setup.py"]) {
     try {
-      await fs9.access(path5.join(cwd, "package.json"));
-      return "node";
+      await fs9.access(path5.join(cwd, f));
+      return "python";
     } catch {
+      continue;
     }
-  } catch {
   }
   return "node";
 }
@@ -3187,50 +3084,64 @@ async function prompt(question, defaultValue = "n") {
     input: process.stdin,
     output: process.stdout
   });
-  const defaultIndicator = defaultValue === "y" ? "Y/n" : "y/N";
-  const questionWithDefault = question.replace(
-    /(\(y\/n\):)/,
-    `(${defaultIndicator}):`
-  );
+  const indicator = defaultValue === "y" ? "Y/n" : "y/N";
+  const q = question.replace(/(\(y\/n\):)/, `(${indicator}):`);
   return new Promise((resolve2) => {
-    rl.question(questionWithDefault, (answer) => {
+    rl.question(q, (answer) => {
       rl.close();
-      const trimmedAnswer = answer.trim().toLowerCase();
-      if (trimmedAnswer === "") {
-        resolve2(defaultValue === "y");
-      } else {
-        resolve2(trimmedAnswer === "y" || trimmedAnswer === "yes");
-      }
+      const a = answer.trim().toLowerCase();
+      if (a === "") resolve2(defaultValue === "y");
+      else resolve2(a === "y" || a === "yes");
     });
   });
 }
-function getMcpServerUrl(deployment) {
-  if (deployment.customDomain) {
-    return `https://${deployment.customDomain}/mcp`;
-  } else if (deployment.serverSlug) {
-    return buildGatewayUrl(deployment.serverSlug);
-  } else if (deployment.serverId) {
-    return buildGatewayUrl(deployment.serverId);
-  } else {
-    return `https://${deployment.domain}/mcp`;
+async function promptText(question, defaultValue) {
+  const readline = await import("readline");
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  const suffix = defaultValue ? source_default.gray(` [${defaultValue}]`) : "";
+  return new Promise((resolve2) => {
+    rl.question(question + suffix + " ", (answer) => {
+      rl.close();
+      resolve2(answer.trim() || defaultValue || "");
+    });
+  });
+}
+var REQUIRED_IGNORES = [
+  "node_modules",
+  "dist",
+  ".env",
+  ".env.local",
+  ".mcp-use"
+];
+async function ensureGitignore(cwd) {
+  const gitignorePath = path5.join(cwd, ".gitignore");
+  let content = "";
+  try {
+    content = await fs9.readFile(gitignorePath, "utf-8");
+  } catch {
+  }
+  const missing = REQUIRED_IGNORES.filter((entry) => !content.includes(entry));
+  if (missing.length > 0) {
+    const additions = missing.join("\n");
+    const newContent = content + (content.endsWith("\n") ? "" : "\n") + additions + "\n";
+    await fs9.writeFile(gitignorePath, newContent, "utf-8");
   }
 }
-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];
-      frameIndex = (frameIndex + 1) % frames.length;
       process.stdout.write(
-        "\r" + source_default.cyan(frame) + " " + source_default.gray(message)
+        "\r" + source_default.cyan(frames[frameIndex]) + " " + source_default.gray(message)
       );
+      frameIndex = (frameIndex + 1) % frames.length;
     }, 80);
   };
   const stopSpinner = () => {
@@ -3242,82 +3153,56 @@ 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;
   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
+    const waitMs = delay;
+    await new Promise((r) => setTimeout(r, waitMs));
+    checkCount++;
+    try {
+      const resp = 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 (resp.logs.length > 0) {
+        for (const line of resp.logs.split("\n").filter((l) => l.trim())) {
+          try {
+            const d = JSON.parse(line);
+            if (d.line) {
+              stopSpinner();
+              const color = d.level === "error" ? source_default.red : d.level === "warn" ? source_default.yellow : source_default.gray;
+              const prefix = d.step ? source_default.cyan(`[${d.step}]`) + " " : "";
+              console.log(prefix + color(d.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 = resp.offset;
       }
-      lastDisplayedLogLength = finalDeployment.buildLogs.length;
+    } catch {
     }
-    if (finalDeployment.status === "running") {
-      const mcpServerUrl = getMcpServerUrl(finalDeployment);
-      let dashboardUrl = null;
+    const dep = await api.getDeployment(deploymentId);
+    if (dep.status === "running") {
+      stopSpinner();
+      const mcpUrl = getMcpServerUrl(dep);
       const webUrl = (await getWebUrl()).replace(/\/$/, "");
       const config = await readConfig();
-      const orgSlug = config.profileSlug;
-      const serverRef = finalDeployment.serverSlug || finalDeployment.serverId;
-      if (serverRef) {
-        if (orgSlug) {
-          dashboardUrl = `${webUrl}/cloud/${orgSlug}/servers/${serverRef}`;
-        } else {
-          dashboardUrl = `${webUrl}/cloud/servers/${serverRef}`;
-        }
+      let dashboardUrl = null;
+      if (dep.serverId) {
+        dashboardUrl = config.orgSlug ? `${webUrl}/cloud/${config.orgSlug}/servers/${dep.serverId}` : `${webUrl}/cloud/servers/${dep.serverId}`;
       }
-      const inspectorUrl = `https://inspector.manufact.com/inspector?autoConnect=${encodeURIComponent(
-        mcpServerUrl
-      )}`;
+      const inspectorUrl = `https://inspector.manufact.com/inspector?autoConnect=${encodeURIComponent(mcpUrl)}`;
       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 (mcpUrl) {
+        console.log(source_default.white("\u{1F310} MCP Server URL:"));
+        console.log(source_default.cyan.bold(`   ${mcpUrl}
 `));
+      }
       if (dashboardUrl) {
         console.log(source_default.white("\u{1F4CA} Dashboard:"));
         console.log(source_default.cyan.bold(`   ${dashboardUrl}
@@ -3326,169 +3211,76 @@ 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(dep.id));
       return;
-    } else if (finalDeployment.status === "failed") {
+    } else if (dep.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")) {
-          console.log();
-          const retry = await promptGitHubInstallation(
-            api,
-            "not_connected",
-            void 0,
-            { 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
-            );
-            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 (dep.error) {
+        const internalPatterns = [
+          "GraphQL",
+          "authenticated",
+          "INTERNAL",
+          "Fly API",
+          "token validation",
+          "context deadline",
+          "Bad gateway",
+          "502",
+          "503"
+        ];
+        const isInternalError = internalPatterns.some(
+          (p) => dep.error.includes(p)
+        );
+        if (isInternalError) {
+          console.log(
+            source_default.red("Error: ") + "An internal infrastructure error occurred. Please try again."
           );
-          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
-            );
-            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));
+          console.log(source_default.gray("  Details: " + dep.error));
+        } else {
+          console.log(source_default.red("Error: ") + dep.error);
         }
       }
       process.exit(1);
-    } else if (finalDeployment.status === "building") {
+    } else if (dep.status === "building" || dep.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: ") + dep.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) {
   try {
-    const reposResponse = await api.getGitHubRepos(true);
-    const repoFullName = `${owner}/${repo}`;
-    return reposResponse.repos.some((r) => r.full_name === repoFullName);
-  } catch (error) {
-    console.log(source_default.gray("Could not verify repository access"));
+    const resp = await api.getGitHubRepos(true);
+    return resp.repos.some((r) => r.full_name === `${owner}/${repo}`);
+  } catch {
     return false;
   }
 }
-var GITHUB_SETUP_POLL_INTERVAL_MS = 2e3;
-var GITHUB_SETUP_POLL_MAX_MS = 12e4;
-async function waitForGitHubSetupAfterBrowser(api, repoName, yes) {
-  if (!yes) {
-    console.log(source_default.gray("Waiting for GitHub configuration..."));
-    await prompt(
-      source_default.white("Press Enter when you've completed the GitHub setup..."),
-      "y"
-    );
-    return;
-  }
-  console.log(
-    source_default.gray(
-      "Waiting for GitHub configuration (polling every 2s, up to 2 min)..."
-    )
-  );
-  const deadline = Date.now() + GITHUB_SETUP_POLL_MAX_MS;
-  while (Date.now() < deadline) {
-    try {
-      const status = await api.getGitHubConnectionStatus();
-      if (!status.is_connected) {
-        await new Promise((r) => setTimeout(r, GITHUB_SETUP_POLL_INTERVAL_MS));
-        continue;
-      }
-      if (repoName) {
-        const parts = repoName.split("/");
-        const owner = parts[0];
-        const repo = parts[1];
-        if (owner && repo && await checkRepoAccess(api, owner, repo)) {
-          return;
-        }
-      } else {
-        return;
-      }
-    } catch {
-    }
-    await new Promise((r) => setTimeout(r, GITHUB_SETUP_POLL_INTERVAL_MS));
-  }
-  console.log(
-    source_default.yellow(
-      "\u26A0\uFE0F  Timed out waiting for GitHub setup. Continuing with verification..."
-    )
-  );
-}
-async function promptGitHubInstallation(api, reason, repoName, opts) {
-  const yes = !!opts?.yes;
-  console.log();
-  if (reason === "not_connected") {
-    console.log(source_default.yellow("\u26A0\uFE0F  GitHub account not connected"));
-    console.log(
-      source_default.white("Deployments require a connected GitHub account.\n")
-    );
-  } else {
-    console.log(
-      source_default.yellow("\u26A0\uFE0F  GitHub App doesn't have access to this repository")
-    );
-    console.log(
-      source_default.white(
-        `The GitHub App needs permission to access ${source_default.cyan(repoName || "this repository")}.
-`
-      )
+async function promptGitHubInstallation(api, reason, repoName, opts) {
+  const yes = !!opts?.yes;
+  console.log();
+  if (reason === "not_connected") {
+    console.log(source_default.yellow("\u26A0\uFE0F  GitHub account not connected"));
+    console.log(
+      source_default.white("Deployments require a connected GitHub account.\n")
+    );
+  } else {
+    console.log(
+      source_default.yellow("\u26A0\uFE0F  GitHub App doesn't have access to this repository")
+    );
+    console.log(
+      source_default.white(
+        `The GitHub App needs permission to access ${source_default.cyan(repoName || "this repository")}.
+`
+      )
     );
   }
   const shouldInstall = yes ? true : await prompt(
@@ -3497,96 +3289,48 @@ async function promptGitHubInstallation(api, reason, repoName, opts) {
     ),
     "y"
   );
-  if (!shouldInstall) {
-    return false;
-  }
+  if (!shouldInstall) return false;
   try {
-    const appName = process.env.MCP_GITHUB_APP_NAME || "mcp-use";
-    const installUrl = reason === "not_connected" ? `https://github.com/apps/${appName}/installations/new` : `https://github.com/settings/installations`;
-    console.log(
-      source_default.cyan(
-        `
-Opening browser to ${reason === "not_connected" ? "install" : "configure"} GitHub App...`
-      )
-    );
+    const appName = await api.getGitHubAppName();
+    const installUrl = `https://github.com/apps/${appName}/installations/new`;
+    console.log(source_default.cyan(`
+Opening browser...`));
     console.log(source_default.gray(`URL: ${installUrl}
 `));
     if (reason === "no_access") {
-      console.log(source_default.white("Please:"));
       console.log(
-        source_default.cyan("  1. Find the 'mcp-use' (or similar) GitHub App")
+        source_default.white("Please add ") + source_default.cyan.bold(repoName || "your repository") + source_default.white(" to the app's repository access, then return here.\n")
       );
-      console.log(source_default.cyan("  2. Click 'Configure'"));
+    } else {
       console.log(
-        source_default.cyan(
-          `  3. Grant access to ${source_default.bold(repoName || "your repository")}`
-        )
+        source_default.white("Complete the GitHub App installation, then return here.\n")
       );
-      console.log(source_default.cyan("  4. Save your changes"));
-      console.log(source_default.cyan("  5. Return here when done\n"));
-    } else {
-      console.log(source_default.white("Please:"));
-      console.log(source_default.cyan("  1. Select the repositories to grant access"));
-      if (repoName) {
-        console.log(
-          source_default.cyan(`  2. Make sure to include ${source_default.bold(repoName)}`)
-        );
-        console.log(source_default.cyan("  3. Complete the installation"));
-      } else {
-        console.log(source_default.cyan("  2. Complete the installation"));
-      }
-      console.log();
     }
     await open_default(installUrl);
-    await waitForGitHubSetupAfterBrowser(api, repoName, yes);
-    console.log(source_default.gray("Verifying GitHub connection..."));
-    let verified = false;
-    try {
-      const status = await api.getGitHubConnectionStatus();
-      if (!status.is_connected) {
-        console.log(source_default.yellow("\u26A0\uFE0F  GitHub connection not detected."));
-      } else if (repoName) {
-        const [owner, repo] = repoName.split("/");
-        console.log(source_default.gray(`Checking access to ${repoName}...`));
-        const hasAccess = await checkRepoAccess(api, owner, repo);
-        if (!hasAccess) {
-          console.log(
-            source_default.yellow(
-              `\u26A0\uFE0F  The GitHub App may not have access to ${source_default.cyan(repoName)} yet`
-            )
-          );
-        } else {
-          console.log(source_default.green(`\u2713 Repository ${repoName} is accessible!
-`));
-          verified = true;
+    if (!yes) {
+      await prompt(source_default.white("Press Enter when done..."), "y");
+    } else {
+      console.log(source_default.gray("Waiting for GitHub configuration (polling)..."));
+      const deadline = Date.now() + 12e4;
+      while (Date.now() < deadline) {
+        await new Promise((r) => setTimeout(r, 2e3));
+        try {
+          const status = await api.getGitHubConnectionStatus();
+          if (status.is_connected) {
+            if (!repoName) return true;
+            const [o, r] = repoName.split("/");
+            if (o && r && await checkRepoAccess(api, o, r)) return true;
+          }
+        } catch {
         }
-      } else {
-        console.log(source_default.green("\u2713 GitHub connected successfully!\n"));
-        verified = true;
       }
-    } catch (error) {
-      console.log(
-        source_default.yellow("\u26A0\uFE0F  Could not verify GitHub connection (API issue)")
-      );
-    }
-    if (!verified) {
-      console.log(
-        source_default.gray(
-          "\nNote: If you completed the GitHub setup, the deployment may work now.\n"
-        )
-      );
     }
     return true;
-  } catch (error) {
-    console.log(
-      source_default.yellow("\n\u26A0\uFE0F  Unable to open GitHub installation automatically")
-    );
+  } catch {
+    console.log(source_default.yellow("\n\u26A0\uFE0F  Unable to open browser automatically"));
     console.log(
       source_default.white("Please visit: ") + source_default.cyan("https://manufact.com/cloud/settings")
     );
-    console.log(
-      source_default.gray("Then connect your GitHub account and try again.\n")
-    );
     return false;
   }
 }
@@ -3594,47 +3338,139 @@ async function deployCommand(options) {
   try {
     const cwd = process.cwd();
     if (!await isLoggedIn()) {
-      console.log(source_default.red("\u2717 You are not logged in."));
+      console.log(source_default.cyan.bold("Welcome to Manufact Cloud!\n"));
       if (options.yes) {
         console.log(
-          source_default.gray(
-            "Run " + source_default.white("npx mcp-use login") + " first. Non-interactive deploy requires an existing session."
+          source_default.red(
+            "\u2717 Not logged in. Run " + source_default.white("npx mcp-use login") + " first."
           )
         );
         process.exit(1);
       }
       const shouldLogin = await prompt(
-        source_default.white("Would you like to login now? (Y/n): "),
+        source_default.white("You need to log in to deploy. Log in now? (Y/n): "),
         "y"
       );
-      if (shouldLogin) {
-        try {
-          await loginCommand({ silent: false });
-          if (!await isLoggedIn()) {
-            console.log(
-              source_default.red("\u2717 Login verification failed. Please try again.")
-            );
-            process.exit(1);
-          }
-          console.log(source_default.gray("\nContinuing with deployment...\n"));
-        } catch (error) {
-          console.error(
-            source_default.red.bold("\u2717 Login failed:"),
-            source_default.red(error instanceof Error ? error.message : "Unknown error")
-          );
-          process.exit(1);
-        }
-      } else {
+      if (!shouldLogin) {
         console.log(
           source_default.gray(
             "Run " + source_default.white("npx mcp-use login") + " to get started."
           )
         );
+        process.exit(0);
+      }
+      try {
+        await loginCommand({ silent: false });
+        if (!await isLoggedIn()) {
+          console.log(source_default.red("\u2717 Login failed. Please try again."));
+          process.exit(1);
+        }
+        console.log(source_default.gray("\nContinuing with deployment...\n"));
+      } catch (error) {
+        console.error(
+          source_default.red.bold("\u2717 Login failed:"),
+          source_default.red(error instanceof Error ? error.message : "Unknown error")
+        );
+        process.exit(1);
+      }
+    }
+    const api = await McpUseAPI.create();
+    if (options.org) {
+      const authInfo = await api.testAuth();
+      const match = (authInfo.orgs ?? []).find(
+        (o) => o.slug === options.org || o.id === options.org || o.name.toLowerCase() === options.org.toLowerCase()
+      );
+      if (match) {
+        api.setOrgId(match.id);
+        const slug = match.slug ? source_default.gray(` (${match.slug})`) : "";
+        console.log(
+          source_default.gray("Organization: ") + source_default.cyan(match.name) + slug
+        );
+      } else {
+        console.error(
+          source_default.red(
+            `\u2717 Organization "${options.org}" not found. Run ${source_default.white("npx mcp-use org list")} to see available organizations.`
+          )
+        );
+        process.exit(1);
+      }
+    } else {
+      const config = await readConfig();
+      if (!config.orgId) {
+        const authInfo = await api.testAuth();
+        if (authInfo.orgs.length === 0) {
+          console.log(
+            source_default.red(
+              "\u2717 No organizations found. Please create one at manufact.com/cloud."
+            )
+          );
+          process.exit(1);
+        }
+        let selectedOrg;
+        if (authInfo.orgs.length === 1) {
+          selectedOrg = authInfo.orgs[0];
+        } else {
+          selectedOrg = await promptOrgSelection(
+            authInfo.orgs,
+            authInfo.default_org_id
+          );
+        }
+        if (!selectedOrg) {
+          console.log(source_default.red("\u2717 No organization selected."));
+          process.exit(1);
+        }
+        api.setOrgId(selectedOrg.id);
+        await writeConfig({
+          ...config,
+          orgId: selectedOrg.id,
+          orgName: selectedOrg.name,
+          orgSlug: selectedOrg.slug ?? void 0
+        });
+        console.log(
+          source_default.gray("Organization: ") + source_default.cyan(selectedOrg.name)
+        );
+      } else {
+        if (config.orgName) {
+          const slug = config.orgSlug ? source_default.gray(` (${config.orgSlug})`) : "";
+          console.log(
+            source_default.gray("Organization: ") + source_default.cyan(config.orgName) + slug
+          );
+        }
+      }
+    }
+    console.log(source_default.cyan.bold("\n\u{1F680} Deploying to Manufact cloud...\n"));
+    let connectionStatus = await api.getGitHubConnectionStatus().catch(() => null);
+    if (!connectionStatus?.is_connected) {
+      const installed = await promptGitHubInstallation(
+        api,
+        "not_connected",
+        void 0,
+        { yes: options.yes }
+      );
+      if (!installed) {
         console.log(source_default.gray("Deployment cancelled."));
         process.exit(0);
       }
+      connectionStatus = await api.getGitHubConnectionStatus().catch(() => null);
+      if (!connectionStatus?.is_connected) {
+        console.log(source_default.red("\n\u2717 GitHub connection could not be verified."));
+        console.log(
+          source_default.cyan(
+            "  Visit https://manufact.com/cloud/settings to connect GitHub.\n"
+          )
+        );
+        process.exit(1);
+      }
+    }
+    const installations = connectionStatus.installations ?? [];
+    if (installations.length === 0) {
+      console.log(source_default.red("\u2717 No GitHub installations found."));
+      process.exit(1);
     }
-    console.log(source_default.cyan.bold("\u{1F680} Deploying to Manufact cloud...\n"));
+    const defaultInstallation = installations.find((i) => i.account_type === "Organization") ?? installations[0];
+    const installationDbId = defaultInstallation.id;
+    const githubInstallationId = defaultInstallation.installation_id;
+    console.log(source_default.green("\u2713 GitHub connected\n"));
     const projectDir = options.rootDir ? path5.resolve(cwd, options.rootDir) : cwd;
     if (options.rootDir) {
       try {
@@ -3645,381 +3481,383 @@ async function deployCommand(options) {
         );
         process.exit(1);
       }
-      console.log(source_default.gray(`  Root dir:   `) + source_default.cyan(options.rootDir));
     }
     const isMcp = await isMcpProject(projectDir);
-    if (!isMcp) {
+    if (!isMcp && !options.yes) {
       console.log(
-        source_default.yellow(
-          "\u26A0\uFE0F  This doesn't appear to be an MCP server project (no mcp-use or @modelcontextprotocol/sdk dependency found)."
-        )
+        source_default.yellow("\u26A0\uFE0F  This doesn't look like an MCP server project.")
+      );
+      const shouldContinue = await prompt(
+        source_default.white("Continue anyway? (y/n): ")
       );
-      if (!options.yes) {
-        const shouldContinue = await prompt(
-          source_default.white("Continue anyway? (y/n): ")
+      if (!shouldContinue) {
+        process.exit(0);
+      }
+      console.log();
+    }
+    let gitInfo = await getGitInfo(cwd);
+    let repoFullName;
+    let branch = "main";
+    if (!gitInfo.isGitRepo || !gitInfo.remoteUrl) {
+      const projectName2 = options.name || await getProjectName(projectDir);
+      console.log(source_default.yellow("\u26A0\uFE0F  No GitHub remote found.\n"));
+      if (options.yes) {
+        console.log(source_default.gray("Creating GitHub repository automatically..."));
+      } else {
+        const shouldCreate = await prompt(
+          source_default.white("Create a GitHub repository and push your code? (Y/n): "),
+          "y"
         );
-        if (!shouldContinue) {
-          console.log(source_default.gray("Deployment cancelled."));
+        if (!shouldCreate) {
+          console.log(
+            source_default.gray(
+              "Deployment cancelled. Set up a GitHub remote and try again."
+            )
+          );
           process.exit(0);
         }
       }
-      console.log();
-    }
-    const gitInfo = await getGitInfo(cwd);
-    if (!gitInfo.isGitRepo) {
-      console.log(source_default.red("\u2717 Not a git repository\n"));
-      console.log(source_default.white("To deploy, initialize git and push to GitHub:"));
-      console.log(source_default.gray("  1. Initialize git:"));
-      console.log(source_default.cyan("     git init\n"));
-      console.log(source_default.gray("  2. Create a GitHub repository at:"));
-      console.log(source_default.cyan("     https://github.com/new\n"));
-      console.log(source_default.gray("  3. Add the remote and push:"));
-      console.log(source_default.cyan("     git remote add origin <your-github-url>"));
-      console.log(source_default.cyan("     git add ."));
-      console.log(source_default.cyan("     git commit -m 'Initial commit'"));
-      console.log(source_default.cyan("     git push -u origin main\n"));
-      process.exit(1);
-    }
-    if (!gitInfo.remoteUrl) {
-      console.log(source_default.red("\u2717 No git remote configured\n"));
-      console.log(source_default.white("Add a GitHub remote:"));
-      console.log(source_default.cyan("  git remote add origin <your-github-url>\n"));
-      process.exit(1);
-    }
-    if (!isGitHubUrl(gitInfo.remoteUrl)) {
+      const defaultIdx = installations.findIndex(
+        (i) => i.account_type === "Organization"
+      );
+      let selectedIdx = defaultIdx >= 0 ? defaultIdx : 0;
+      if (installations.length > 1 && !options.yes) {
+        console.log(
+          source_default.cyan.bold("\u{1F419} Select a GitHub account for the repository:\n")
+        );
+        for (let i = 0; i < installations.length; i++) {
+          const inst = installations[i];
+          const typeLabel = inst.account_type === "Organization" ? source_default.gray(" (org)") : source_default.gray(" (personal)");
+          const marker = i === selectedIdx ? source_default.green(" \u2190 default") : "";
+          console.log(
+            `  ${source_default.white(`${i + 1}.`)} ${inst.account_login}${typeLabel}${marker}`
+          );
+        }
+        console.log();
+        const readline = await import("readline");
+        const rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+        const answer = await new Promise((resolve2) => {
+          rl.question(
+            source_default.gray(`Enter number [${selectedIdx + 1}]: `),
+            (a) => {
+              rl.close();
+              resolve2(a.trim());
+            }
+          );
+        });
+        const parsed = answer === "" ? selectedIdx : parseInt(answer, 10) - 1;
+        if (parsed >= 0 && parsed < installations.length) {
+          selectedIdx = parsed;
+        }
+      }
+      const repoInstallation = installations[selectedIdx];
+      if (repoInstallation.account_type !== "Organization") {
+        console.log(
+          source_default.yellow(
+            "\n\u26A0\uFE0F  GitHub Apps cannot create repos on personal accounts.\n"
+          )
+        );
+        console.log(
+          source_default.white("To deploy from ") + source_default.cyan(repoInstallation.account_login) + source_default.white(", create a repository manually:\n")
+        );
+        console.log(
+          source_default.cyan("  1. ") + source_default.white("Go to ") + source_default.cyan("https://github.com/new")
+        );
+        console.log(
+          source_default.cyan("  2. ") + source_default.white("Create a repository (any name, can be private)")
+        );
+        console.log(source_default.cyan("  3. ") + source_default.white("Add it as a remote:"));
+        console.log(source_default.gray("     git init && git remote add origin <url>"));
+        console.log(source_default.cyan("  4. ") + source_default.white("Push your code:"));
+        console.log(
+          source_default.gray(
+            "     git add . && git commit -m 'Initial commit' && git push -u origin main"
+          )
+        );
+        console.log(
+          source_default.cyan("  5. ") + source_default.white("Grant the GitHub App access to the repo:")
+        );
+        const appName = await api.getGitHubAppName();
+        console.log(
+          source_default.gray(
+            `     https://github.com/apps/${appName}/installations/new`
+          )
+        );
+        console.log(
+          source_default.cyan("  6. ") + source_default.white("Run ") + source_default.cyan("mcp-use deploy") + source_default.white(" again\n")
+        );
+        process.exit(0);
+      }
+      const repoName = options.yes ? projectName2 : await promptText(source_default.gray("Repository name:"), projectName2);
+      await ensureGitignore(cwd);
+      console.log(
+        source_default.gray(
+          `Creating repository on ${repoInstallation.account_login}...`
+        )
+      );
+      const repoResult = await api.createGitHubRepo({
+        installationId: repoInstallation.installation_id,
+        name: repoName,
+        private: true,
+        org: repoInstallation.account_login
+      });
+      console.log(source_default.green(`\u2713 Created ${source_default.cyan(repoResult.fullName)}`));
+      if (!gitInfo.isGitRepo) {
+        console.log(source_default.gray("Initializing git..."));
+        await gitInit(cwd, "Initial commit");
+        console.log(source_default.gray("Pushing to GitHub..."));
+        await gitAddRemoteAndPush(cwd, repoResult.cloneUrl, "main");
+      } else {
+        console.log(source_default.gray("Adding remote and pushing..."));
+        await gitAddRemoteAndPush(
+          cwd,
+          repoResult.cloneUrl,
+          gitInfo.branch || "main"
+        );
+      }
+      console.log(source_default.green("\u2713 Code pushed to GitHub\n"));
+      gitInfo = await getGitInfo(cwd);
+      repoFullName = repoResult.fullName;
+      branch = gitInfo.branch || "main";
+    } else if (!isGitHubUrl(gitInfo.remoteUrl)) {
       console.log(source_default.red("\u2717 Remote is not a GitHub repository"));
       console.log(source_default.yellow(`   Current remote: ${gitInfo.remoteUrl}
 `));
-      console.log(source_default.white("Please add a GitHub remote to deploy."));
       process.exit(1);
-    }
-    if (!gitInfo.owner || !gitInfo.repo) {
+    } else if (!gitInfo.owner || !gitInfo.repo) {
       console.log(source_default.red("\u2717 Could not parse GitHub repository information"));
       process.exit(1);
-    }
-    if (gitInfo.hasUncommittedChanges) {
-      console.log(source_default.yellow("\u26A0\uFE0F  You have uncommitted changes\n"));
-      console.log(source_default.white("Deployments use the code pushed to GitHub."));
-      console.log(
-        source_default.white(
-          "Local changes will not be included until you commit and push.\n"
-        )
+    } else {
+      repoFullName = `${gitInfo.owner}/${gitInfo.repo}`;
+      branch = gitInfo.branch || "main";
+      if (gitInfo.hasUncommittedChanges) {
+        console.log(source_default.yellow("\u26A0\uFE0F  You have uncommitted changes.\n"));
+        if (!options.yes) {
+          const shouldCommit = await prompt(
+            source_default.white("Commit and push changes before deploying? (Y/n): "),
+            "y"
+          );
+          if (shouldCommit) {
+            await ensureGitignore(cwd);
+            console.log(source_default.gray("Committing and pushing..."));
+            await gitCommitAndPush(cwd, "Deploy changes", branch);
+            gitInfo = await getGitInfo(cwd);
+            console.log(source_default.green("\u2713 Changes pushed\n"));
+          } else {
+            console.log(source_default.gray("Deploying from last pushed commit.\n"));
+          }
+        }
+      }
+      console.log(source_default.gray("Checking repository access..."));
+      const hasAccess = await checkRepoAccess(
+        api,
+        gitInfo.owner,
+        gitInfo.repo
       );
-      if (!options.yes) {
-        const shouldContinue = await prompt(
-          source_default.white("Continue with deployment from GitHub? (y/n): ")
+      if (!hasAccess) {
+        console.log(
+          source_default.yellow(
+            `\u26A0\uFE0F  GitHub App doesn't have access to ${source_default.cyan(repoFullName)}`
+          )
+        );
+        const configured = await promptGitHubInstallation(
+          api,
+          "no_access",
+          repoFullName,
+          { yes: options.yes, installationId: githubInstallationId }
         );
-        if (!shouldContinue) {
-          console.log(source_default.gray("Deployment cancelled."));
+        if (!configured) {
           process.exit(0);
         }
+        const retry = await checkRepoAccess(api, gitInfo.owner, gitInfo.repo);
+        if (!retry) {
+          const appName = await api.getGitHubAppName();
+          console.log(
+            source_default.red(
+              `
+\u2717 Repository ${source_default.cyan(repoFullName)} is still not accessible.`
+            )
+          );
+          console.log(
+            source_default.cyan(
+              `  https://github.com/apps/${appName}/installations/new
+`
+            )
+          );
+          process.exit(1);
+        }
       }
-      console.log();
-    }
-    console.log(source_default.white("GitHub repository detected:"));
-    console.log(
-      source_default.gray(`  Repository: `) + source_default.cyan(`${gitInfo.owner}/${gitInfo.repo}`)
-    );
-    console.log(
-      source_default.gray(`  Branch:     `) + source_default.cyan(gitInfo.branch || "main")
-    );
-    if (gitInfo.commitSha) {
-      console.log(
-        source_default.gray(`  Commit:     `) + source_default.gray(gitInfo.commitSha.substring(0, 7))
-      );
-    }
-    if (gitInfo.commitMessage) {
-      console.log(
-        source_default.gray(`  Message:    `) + source_default.gray(gitInfo.commitMessage.split("\n")[0])
-      );
-    }
-    console.log();
-    if (!options.yes) {
-      const shouldDeploy = await prompt(
-        source_default.white(
-          `Deploy from GitHub repository ${gitInfo.owner}/${gitInfo.repo}? (Y/n): `
-        ),
-        "y"
-      );
-      if (!shouldDeploy) {
-        console.log(source_default.gray("Deployment cancelled."));
-        process.exit(0);
-      }
+      console.log(source_default.green("\u2713 Repository access confirmed"));
     }
     const projectName = options.name || await getProjectName(projectDir);
-    const runtime = options.runtime || await detectRuntime(projectDir);
     const port = options.port || 3e3;
     const buildCommand = await detectBuildCommand(projectDir);
     const startCommand = await detectStartCommand(projectDir);
+    const runtime = options.runtime || await detectRuntime(projectDir);
     const envVars = await buildEnvVars(options);
     console.log();
     console.log(source_default.white("Deployment configuration:"));
+    console.log(source_default.gray(`  Repository:    `) + source_default.cyan(repoFullName));
+    console.log(source_default.gray(`  Branch:        `) + source_default.cyan(branch));
     console.log(source_default.gray(`  Name:          `) + source_default.cyan(projectName));
     console.log(source_default.gray(`  Runtime:       `) + source_default.cyan(runtime));
     console.log(source_default.gray(`  Port:          `) + source_default.cyan(port));
-    if (options.rootDir) {
+    if (options.region)
+      console.log(source_default.gray(`  Region:        `) + source_default.cyan(options.region));
+    if (options.buildCommand)
       console.log(
-        source_default.gray(`  Root dir:      `) + source_default.cyan(options.rootDir)
+        source_default.gray(`  Build command: `) + source_default.cyan(options.buildCommand)
       );
-    }
-    if (buildCommand) {
-      console.log(source_default.gray(`  Build command: `) + source_default.cyan(buildCommand));
-    }
-    if (startCommand) {
-      console.log(source_default.gray(`  Start command: `) + source_default.cyan(startCommand));
-    }
-    if (envVars && Object.keys(envVars).length > 0) {
+    else if (buildCommand)
       console.log(
-        source_default.gray(`  Environment:   `) + source_default.cyan(`${Object.keys(envVars).length} variable(s)`)
+        source_default.gray(`  Build command: `) + source_default.gray(buildCommand + " (auto-detected)")
       );
+    if (options.startCommand)
       console.log(
-        source_default.gray(`                 `) + source_default.gray(Object.keys(envVars).join(", "))
+        source_default.gray(`  Start command: `) + source_default.cyan(options.startCommand)
       );
-    }
-    console.log();
-    const api = await McpUseAPI.create();
-    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()
-        );
-        if (match) {
-          api.setProfileId(match.id);
-          const slug = match.slug ? source_default.gray(` (${match.slug})`) : "";
-          console.log(
-            source_default.gray("Organization: ") + source_default.cyan(match.profile_name) + slug
-          );
-        } else {
-          console.error(
-            source_default.red(
-              `\u2717 Organization "${options.org}" not found. Run ${source_default.white("npx mcp-use org list")} to see available organizations.`
-            )
-          );
-          process.exit(1);
-        }
-      } catch (error) {
-        console.error(
-          source_default.red("\u2717 Failed to resolve organization:"),
-          source_default.red(error instanceof Error ? error.message : "Unknown error")
-        );
-        process.exit(1);
-      }
-    }
-    let githubVerified = false;
-    try {
-      console.log(source_default.gray(`[DEBUG] API URL: ${api.baseUrl}`));
-      const connectionStatus = await api.getGitHubConnectionStatus();
-      if (!connectionStatus.is_connected) {
-        const repoFullName = `${gitInfo.owner}/${gitInfo.repo}`;
-        const installed = await promptGitHubInstallation(
-          api,
-          "not_connected",
-          repoFullName,
-          { yes: options.yes }
-        );
-        if (!installed) {
-          console.log(source_default.gray("Deployment cancelled."));
-          process.exit(0);
-        }
-        const retryStatus = await api.getGitHubConnectionStatus();
-        if (!retryStatus.is_connected) {
-          console.log(
-            source_default.red("\n\u2717 GitHub connection could not be verified.")
-          );
-          console.log(
-            source_default.gray("Please try connecting GitHub from the web UI:")
-          );
-          console.log(source_default.cyan("  https://manufact.com/cloud/settings\n"));
-          process.exit(1);
-        }
-        githubVerified = true;
-      } else if (gitInfo.owner && gitInfo.repo) {
-        console.log(source_default.gray("Checking repository access..."));
-        const hasAccess = await checkRepoAccess(
-          api,
-          gitInfo.owner,
-          gitInfo.repo
-        );
-        if (!hasAccess) {
-          const repoFullName = `${gitInfo.owner}/${gitInfo.repo}`;
-          console.log(
-            source_default.yellow(
-              `\u26A0\uFE0F  GitHub App doesn't have access to ${source_default.cyan(repoFullName)}`
-            )
-          );
-          const configured = await promptGitHubInstallation(
-            api,
-            "no_access",
-            repoFullName,
-            { yes: options.yes }
-          );
-          if (!configured) {
-            console.log(source_default.gray("Deployment cancelled."));
-            process.exit(0);
-          }
-          const hasAccessRetry = await checkRepoAccess(
-            api,
-            gitInfo.owner,
-            gitInfo.repo
-          );
-          if (!hasAccessRetry) {
-            console.log(
-              source_default.red(
-                `
-\u2717 Repository ${source_default.cyan(repoFullName)} is still not accessible.`
-              )
-            );
-            console.log(
-              source_default.gray(
-                "Please make sure the GitHub App has access to this repository."
-              )
-            );
-            console.log(
-              source_default.cyan("  https://github.com/settings/installations\n")
-            );
-            process.exit(1);
-          }
-          githubVerified = true;
-        } else {
-          console.log(source_default.green("\u2713 Repository access confirmed"));
-          githubVerified = true;
-        }
-      }
-    } catch (error) {
-      console.log(source_default.red("\u2717 Could not verify GitHub connection"));
-      console.log(
-        source_default.gray(
-          "Error: " + (error instanceof Error ? error.message : "Unknown error")
-        )
-      );
-      console.log(source_default.gray("\nPlease ensure:"));
+    else if (startCommand)
       console.log(
-        source_default.cyan(
-          "  1. You have connected GitHub at https://manufact.com/cloud/settings"
-        )
+        source_default.gray(`  Start command: `) + source_default.gray(startCommand + " (auto-detected)")
       );
+    if (Object.keys(envVars).length > 0) {
       console.log(
-        source_default.cyan("  2. The GitHub App has access to your repository")
+        source_default.gray(`  Environment:   `) + source_default.cyan(`${Object.keys(envVars).length} variable(s)`)
       );
-      console.log(source_default.cyan("  3. Your internet connection is stable\n"));
-      process.exit(1);
     }
-    if (!githubVerified) {
-      console.log(
-        source_default.red("\n\u2717 GitHub verification required for this deployment")
-      );
-      process.exit(1);
+    console.log();
+    if (!options.yes) {
+      const shouldDeploy = await prompt(source_default.white(`Deploy? (Y/n): `), "y");
+      if (!shouldDeploy) {
+        console.log(source_default.gray("Deployment cancelled."));
+        process.exit(0);
+      }
     }
     const existingLink = !options.new ? await getProjectLink(cwd) : null;
-    const serverId = existingLink?.serverId;
-    if (existingLink) {
+    let serverId = existingLink?.serverId;
+    if (existingLink && serverId) {
       try {
-        const existingDeployment = await api.getDeployment(
-          existingLink.deploymentId
-        );
-        if (existingDeployment && existingDeployment.status !== "failed") {
-          console.log(source_default.green(`\u2713 Found linked deployment`));
+        const existingDep = await api.getDeployment(existingLink.deploymentId);
+        if (existingDep && existingDep.status !== "failed") {
+          console.log(source_default.green(`\u2713 Found linked server`));
           console.log(source_default.gray(`  Redeploying to maintain the same URL...`));
-          console.log(
-            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
-          );
+          console.log(source_default.cyan(`  URL: ${getMcpServerUrl(existingDep)}
+`));
+          const newDep = await api.createDeployment({
+            serverId,
+            branch,
+            trigger: "redeploy"
+          });
           await saveProjectLink(cwd, {
             ...existingLink,
-            linkedAt: (/* @__PURE__ */ new Date()).toISOString()
-          });
-          await displayDeploymentProgress(api, deployment2, {
-            yes: options.yes
+            linkedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            deploymentId: newDep.id
           });
-          if (options.open && deployment2.domain) {
-            console.log();
-            console.log(source_default.gray("Opening deployment in browser..."));
-            await open_default(`https://${deployment2.domain}`);
-          }
+          console.log(
+            source_default.green("\u2713 Deployment created: ") + source_default.gray(newDep.id)
+          );
+          await displayDeploymentProgress(api, newDep.id, { yes: options.yes });
           return;
-        } else {
+        }
+      } catch (err) {
+        const is404 = err?.status === 404 || (err?.message ?? "").includes("404");
+        if (is404) {
           console.log(
-            source_default.yellow(
-              `\u26A0\uFE0F  Linked deployment not found or failed, creating new one...`
-            )
+            source_default.yellow("\u26A0\uFE0F  Previously linked server no longer exists.\n")
           );
-          if (serverId) {
-            console.log(
-              source_default.gray(`  Will reuse existing server: ${serverId}`)
+          if (!options.yes) {
+            const shouldRecreate = await prompt(
+              source_default.white("Create a new server and deploy? (Y/n): "),
+              "y"
             );
+            if (!shouldRecreate) {
+              console.log(source_default.gray("Deployment cancelled."));
+              process.exit(0);
+            }
           }
+          serverId = void 0;
         }
-      } 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}`));
+      }
+    }
+    let deploymentId;
+    if (serverId) {
+      console.log(source_default.gray("Creating deployment..."));
+      try {
+        const result = await api.createDeployment({
+          serverId,
+          branch,
+          trigger: "manual"
+        });
+        deploymentId = result.id;
+      } catch (err) {
+        const is404 = err?.status === 404 || (err?.message ?? "").includes("404");
+        if (is404) {
+          console.log(
+            source_default.yellow(
+              "\u26A0\uFE0F  Linked server no longer exists. Creating a new one...\n"
+            )
+          );
+          serverId = void 0;
+        } else {
+          throw err;
         }
       }
     }
-    const deploymentRequest = {
-      name: projectName,
-      source: {
+    if (!serverId) {
+      const orgId = await api.resolveOrganizationId();
+      console.log(source_default.gray("Creating server and deployment..."));
+      const serverResult = await api.createServer({
         type: "github",
-        repo: `${gitInfo.owner}/${gitInfo.repo}`,
-        branch: gitInfo.branch || "main",
-        rootDir: options.rootDir || void 0,
-        runtime,
+        organizationId: orgId,
+        installationId: installationDbId,
+        name: projectName,
+        repoFullName,
+        branch,
+        rootDir: options.rootDir,
         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})`) : "";
-          console.log(
-            source_default.gray("Organization: ") + source_default.cyan(config.profileName) + slug
-          );
-        }
-      } catch {
+        env: Object.keys(envVars).length > 0 ? envVars : void 0,
+        region: options.region,
+        buildCommand: options.buildCommand,
+        startCommand: options.startCommand
+      });
+      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."));
+        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
+`));
+    }
+    if (!deploymentId) {
+      console.log(source_default.red("\u2717 No deployment was created."));
+      process.exit(1);
     }
-    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)`)
+      source_default.green("\u2713 Deployment created: ") + source_default.gray(deploymentId)
     );
-    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}`);
+    await displayDeploymentProgress(api, deploymentId, { yes: options.yes });
+    if (options.open) {
+      const dep = await api.getDeployment(deploymentId);
+      const url = getMcpServerUrl(dep);
+      if (url) {
+        console.log(source_default.gray("\nOpening in browser..."));
+        await open_default(url);
+      }
     }
   } catch (error) {
     console.error(
@@ -4095,19 +3933,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();
@@ -4139,31 +3977,28 @@ async function getDeploymentCommand(deploymentId) {
     console.log(
       source_default.white("Status:        ") + statusColor(deployment.status)
     );
-    if (deployment.domain) {
+    if (deployment.serverId) {
       console.log(
-        source_default.white("Domain:        ") + source_default.cyan(`https://${deployment.domain}`)
+        source_default.white("Server ID:     ") + source_default.gray(deployment.serverId)
       );
     }
-    if (deployment.customDomain) {
-      console.log(
-        source_default.white("Custom Domain: ") + source_default.cyan(`https://${deployment.customDomain}`)
-      );
+    const mcpUrl = getMcpServerUrl(deployment);
+    if (mcpUrl) {
+      console.log(source_default.white("MCP URL:       ") + source_default.cyan(mcpUrl));
     }
-    console.log(
-      source_default.white("Source:        ") + source_default.gray(deployment.source.type)
-    );
-    if (deployment.source.type === "github") {
+    if (deployment.gitBranch) {
       console.log(
-        source_default.white("Repository:    ") + source_default.gray(deployment.source.repo)
+        source_default.white("Branch:        ") + source_default.gray(deployment.gitBranch)
       );
+    }
+    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)
@@ -4175,13 +4010,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}`));
@@ -4208,43 +4036,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}`)
         )
       );
     }
@@ -4278,8 +4119,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): ")
       );
@@ -4315,30 +4158,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;
       }
@@ -4355,6 +4209,25 @@ async function logsCommand(deploymentId, options) {
           console.log(source_default.gray(line));
         }
       }
+    } 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));
+        }
+      }
     }
     console.log();
   } catch (error) {
@@ -4365,7 +4238,7 @@ async function logsCommand(deploymentId, options) {
     process.exit(1);
   }
 }
-async function listEnvCommand(deploymentId) {
+async function stopDeploymentCommand(deploymentId) {
   try {
     if (!await isLoggedIn()) {
       console.log(source_default.red("\u2717 You are not logged in."));
@@ -4377,33 +4250,19 @@ async function listEnvCommand(deploymentId) {
       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();
+    await api.stopDeployment(deploymentId);
+    console.log(source_default.green.bold(`
+\u2713 Deployment stopped
+`));
   } catch (error) {
     console.error(
-      source_default.red.bold("\n\u2717 Failed to list environment variables:"),
+      source_default.red.bold("\n\u2717 Failed to stop deployment:"),
       source_default.red(error instanceof Error ? error.message : "Unknown error")
     );
     process.exit(1);
   }
 }
-async function setEnvCommand(deploymentId, envPairs) {
+async function startDeploymentCommand(deploymentId) {
   try {
     if (!await isLoggedIn()) {
       console.log(source_default.red("\u2717 You are not logged in."));
@@ -4414,43 +4273,87 @@ async function setEnvCommand(deploymentId, envPairs) {
       );
       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);
-      }
-      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}
-`)
+      source_default.yellow(
+        "\u26A0\uFE0F  Start is not supported in this version. Use `mcp-use deployments restart` to redeploy."
+      )
     );
-    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.bold("\n\u2717 Failed to start deployment:"),
       source_default.red(error instanceof Error ? error.message : "Unknown error")
     );
     process.exit(1);
   }
 }
-async function unsetEnvCommand(deploymentId, keys) {
+function createDeploymentsCommand() {
+  const deploymentsCommand = new Command2("deployments").description(
+    "Manage cloud deployments"
+  );
+  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 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", "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;
+}
+
+// src/commands/servers.ts
+import { Command as Command3 } from "commander";
+async function prompt3(question) {
+  const readline = await import("readline");
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve2) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      const trimmedAnswer = answer.trim().toLowerCase();
+      resolve2(trimmedAnswer === "y" || trimmedAnswer === "yes");
+    });
+  });
+}
+function isRecord(v) {
+  return typeof v === "object" && v !== null;
+}
+function pickStr(obj, key) {
+  if (!isRecord(obj)) return "-";
+  const v = obj[key];
+  if (typeof v === "string") return v;
+  if (v != null && typeof v !== "object") return String(v);
+  return "-";
+}
+async function applyOrgOption(api, org) {
+  if (!org) return;
+  const authInfo = await api.testAuth();
+  const match = (authInfo.orgs ?? []).find(
+    (o) => o.slug === org || o.id === org || o.name.toLowerCase() === org.toLowerCase()
+  );
+  if (!match) {
+    console.error(
+      source_default.red(
+        `\u2717 Organization "${org}" not found. Run ${source_default.white("npx mcp-use org list")} to see available organizations.`
+      )
+    );
+    process.exit(1);
+  }
+  api.setOrgId(match.id);
+  const slug = match.slug ? source_default.gray(` (${match.slug})`) : "";
+  console.log(source_default.gray("Organization: ") + source_default.cyan(match.name) + slug);
+}
+function getStatusColor2(status) {
+  const s = status.toLowerCase();
+  if (s.includes("run") || s === "active") return source_default.green;
+  if (s.includes("fail") || s.includes("error")) return source_default.red;
+  if (s.includes("build") || s.includes("pend")) return source_default.yellow;
+  return source_default.gray;
+}
+async function listServersCommand(options) {
   try {
     if (!await isLoggedIn()) {
       console.log(source_default.red("\u2717 You are not logged in."));
@@ -4462,32 +4365,62 @@ async function unsetEnvCommand(deploymentId, keys) {
       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];
+    await applyOrgOption(api, options.org);
+    if (options.org) console.log();
+    const limit = options.limit ? parseInt(options.limit, 10) : void 0;
+    const skip = options.skip ? parseInt(options.skip, 10) : void 0;
+    if (limit !== void 0 && (Number.isNaN(limit) || limit < 1)) {
+      console.log(source_default.red("\u2717 Invalid --limit"));
+      process.exit(1);
     }
-    const updated = await api.updateDeployment(deploymentId, {
-      env: currentEnv
+    if (skip !== void 0 && (Number.isNaN(skip) || skip < 0)) {
+      console.log(source_default.red("\u2717 Invalid --skip"));
+      process.exit(1);
+    }
+    const servers = await api.listServers({
+      limit,
+      skip,
+      sort: options.sort
     });
+    if (servers.length === 0) {
+      console.log(source_default.yellow("No servers found."));
+      console.log(
+        source_default.gray(
+          "\nCreate one by deploying with " + source_default.white("mcp-use deploy")
+        )
+      );
+      return;
+    }
+    console.log(source_default.cyan.bold(`
+\u{1F5A5}  Servers (${servers.length})
+`));
     console.log(
-      source_default.green.bold(`
-\u2713 Environment variables removed: ${updated.name}
-`)
+      source_default.white.bold(
+        `${"ID".padEnd(38)} ${"NAME".padEnd(22)} ${"STATUS".padEnd(14)} ${"REPO".padEnd(32)} ${"MCP URL".padEnd(52)}`
+      )
     );
-    for (const key of keys) {
-      console.log(source_default.gray(`  ${key}`));
+    console.log(source_default.gray("\u2500".repeat(165)));
+    for (const s of servers) {
+      const id = s.id.substring(0, 37).padEnd(38);
+      const name = (s.name || s.slug || "-").substring(0, 21).padEnd(22);
+      const statusColor = getStatusColor2(s.status);
+      const status = statusColor(s.status.substring(0, 13).padEnd(14));
+      const repo = (s.connectedRepository?.repoFullName ?? "-").substring(0, 31).padEnd(32);
+      const mcp = getMcpServerUrlForCloudServer(s).substring(0, 51).padEnd(52);
+      console.log(
+        `${source_default.gray(id)} ${name} ${status} ${source_default.gray(repo)} ${source_default.cyan(mcp)}`
+      );
     }
     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 list servers:"),
       source_default.red(error instanceof Error ? error.message : "Unknown error")
     );
     process.exit(1);
   }
 }
-async function stopDeploymentCommand(deploymentId) {
+async function getServerCommand(idOrSlug, options) {
   try {
     if (!await isLoggedIn()) {
       console.log(source_default.red("\u2717 You are not logged in."));
@@ -4499,21 +4432,99 @@ async function stopDeploymentCommand(deploymentId) {
       process.exit(1);
     }
     const api = await McpUseAPI.create();
-    const updated = await api.updateDeployment(deploymentId, {
-      status: "stopped"
-    });
-    console.log(source_default.green.bold(`
-\u2713 Deployment stopped: ${updated.name}
-`));
+    await applyOrgOption(api, options.org);
+    if (options.org) console.log();
+    const server = await api.getServer(idOrSlug);
+    console.log(source_default.cyan.bold("\n\u{1F5A5}  Server Details\n"));
+    console.log(source_default.white("ID:            ") + source_default.gray(server.id));
+    if (server.slug) {
+      console.log(source_default.white("Slug:          ") + source_default.cyan(server.slug));
+    }
+    console.log(
+      source_default.white("Name:          ") + source_default.cyan(server.name ?? "-")
+    );
+    const statusColor = getStatusColor2(server.status);
+    console.log(source_default.white("Status:        ") + statusColor(server.status));
+    if (server.latestDeploymentStatus) {
+      console.log(
+        source_default.white("Last deploy:   ") + source_default.gray(server.latestDeploymentStatus)
+      );
+    }
+    console.log(source_default.white("Region:        ") + source_default.gray(server.region));
+    console.log(
+      source_default.white("MCP URL:       ") + source_default.cyan(getMcpServerUrlForCloudServer(server))
+    );
+    if (server.connectedRepository) {
+      const cr = server.connectedRepository;
+      console.log(source_default.white("\nRepository"));
+      console.log(source_default.white("  Full name:   ") + source_default.gray(cr.repoFullName));
+      console.log(
+        source_default.white("  Prod branch: ") + source_default.gray(cr.productionBranch)
+      );
+    }
+    if (server.activeDeploymentId) {
+      console.log(
+        source_default.white("\nActive deployment: ") + source_default.cyan(server.activeDeploymentId)
+      );
+    }
+    if (server.previousDeploymentId) {
+      console.log(
+        source_default.white("Previous deployment: ") + source_default.gray(server.previousDeploymentId)
+      );
+    }
+    const depCount = server._count?.deployments;
+    if (depCount != null) {
+      console.log(
+        source_default.white("Deployment count: ") + source_default.gray(String(depCount))
+      );
+    }
+    console.log(
+      source_default.white("Created:       ") + source_default.gray(formatRelativeTime(server.createdAt))
+    );
+    console.log(
+      source_default.white("Updated:       ") + source_default.gray(formatRelativeTime(server.updatedAt))
+    );
+    const config = await readConfig();
+    const base = (await getWebUrl()).replace(/\/$/, "");
+    if (config.orgSlug) {
+      console.log(
+        source_default.white("\nDashboard:     ") + source_default.cyan(`${base}/cloud/${config.orgSlug}/servers/${server.id}`)
+      );
+    } else {
+      console.log(
+        source_default.white("\nDashboard:     ") + source_default.cyan(`${base}/cloud/servers/${server.id}`)
+      );
+    }
+    if (Array.isArray(server.deployments) && server.deployments.length > 0) {
+      console.log(source_default.cyan.bold("\nRecent deployments\n"));
+      console.log(
+        source_default.white.bold(
+          `${"ID".padEnd(40)} ${"NAME".padEnd(24)} ${"STATUS".padEnd(12)} ${"UPDATED"}`
+        )
+      );
+      console.log(source_default.gray("\u2500".repeat(100)));
+      for (const d of server.deployments) {
+        const did = pickStr(d, "id").padEnd(40);
+        const dname = pickStr(d, "name").substring(0, 23).padEnd(24);
+        const dst = pickStr(d, "status").padEnd(12);
+        const du = pickStr(d, "updatedAt");
+        const updated = du !== "-" ? formatRelativeTime(du) : source_default.gray("-");
+        const sc = getStatusColor2(dst.trim());
+        console.log(
+          `${source_default.gray(did)} ${dname} ${sc(dst)} ${source_default.gray(updated)}`
+        );
+      }
+    }
+    console.log();
   } catch (error) {
     console.error(
-      source_default.red.bold("\n\u2717 Failed to stop deployment:"),
+      source_default.red.bold("\n\u2717 Failed to get server:"),
       source_default.red(error instanceof Error ? error.message : "Unknown error")
     );
     process.exit(1);
   }
 }
-async function startDeploymentCommand(deploymentId) {
+async function deleteServerCommand(serverId, options) {
   try {
     if (!await isLoggedIn()) {
       console.log(source_default.red("\u2717 You are not logged in."));
@@ -4525,36 +4536,59 @@ 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}
-`));
+    await applyOrgOption(api, options.org);
+    if (options.org) console.log();
+    const server = await api.getServer(serverId);
+    if (!options.yes) {
+      console.log(
+        source_default.yellow(
+          `
+\u26A0\uFE0F  You are about to delete server: ${source_default.white(server.name || server.slug || server.id)}`
+        )
+      );
+      console.log(source_default.gray(`   ID: ${server.id}`));
+      if (server.connectedRepository?.repoFullName) {
+        console.log(
+          source_default.gray(`   Repo: ${server.connectedRepository.repoFullName}
+`)
+        );
+      } else {
+        console.log();
+      }
+      const confirmed = await prompt3(
+        source_default.white(
+          "This deletes the server and all its deployments. Continue? (y/N): "
+        )
+      );
+      if (!confirmed) {
+        console.log(source_default.gray("Deletion cancelled."));
+        return;
+      }
+    }
+    await api.deleteServer(server.id);
+    console.log(
+      source_default.green.bold(
+        `
+\u2713 Server deleted: ${server.name || server.slug || server.id}
+`
+      )
+    );
   } catch (error) {
     console.error(
-      source_default.red.bold("\n\u2717 Failed to start deployment:"),
+      source_default.red.bold("\n\u2717 Failed to delete server:"),
       source_default.red(error instanceof Error ? error.message : "Unknown error")
     );
     process.exit(1);
   }
 }
-function createDeploymentsCommand() {
-  const deploymentsCommand = new Command2("deployments").description(
-    "Manage cloud deployments"
+function createServersCommand() {
+  const serversCommand = new Command3("servers").description(
+    "Manage cloud servers (Git-backed deploy targets)"
   );
-  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("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("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;
+  serversCommand.command("list").alias("ls").description("List servers for the current organization").option("--org <slug-or-id>", "Target organization (slug, id, or name)").option("--limit <n>", "Page size (1\u2013100, default 50)").option("--skip <n>", "Offset for pagination").option("--sort <field:asc|desc>", "Sort (e.g. updatedAt:desc)").action(listServersCommand);
+  serversCommand.command("get").argument("<id-or-slug>", "Server UUID or slug").option("--org <slug-or-id>", "Resolve org context before fetch").description("Show server details and recent deployments").action(getServerCommand);
+  serversCommand.command("delete").alias("rm").argument("<server-id>", "Server UUID (or slug if API accepts it)").option("-y, --yes", "Skip confirmation prompt").option("--org <slug-or-id>", "Target organization").description("Delete a server and all its deployments").action(deleteServerCommand);
+  return serversCommand;
 }
 
 // src/commands/org.ts
@@ -4574,22 +4608,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"))
       );
@@ -4608,40 +4642,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(
@@ -4655,7 +4689,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."
@@ -4663,9 +4697,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(
@@ -4677,7 +4711,7 @@ async function orgCurrentCommand() {
 }
 
 // src/commands/skills.ts
-import { Command as Command3 } from "commander";
+import { Command as Command4 } from "commander";
 import { cpSync, existsSync as existsSync2, mkdtempSync, readdirSync, rmSync } from "fs";
 import { tmpdir } from "os";
 import { join as join2, resolve } from "path";
@@ -4747,7 +4781,7 @@ async function addSkillsToProject(projectPath) {
   }
 }
 function createSkillsCommand() {
-  const skills = new Command3("skills").description(
+  const skills = new Command4("skills").description(
     "Manage mcp-use AI agent skills"
   );
   const installAction = async (options) => {
@@ -4923,7 +4957,7 @@ A new release of ${source_default.bold(PACKAGE_NAME)} is available: ${source_def
 }
 
 // src/index.ts
-var program = new Command4();
+var program = new Command5();
 var packageContent = readFileSync2(
   path7.join(__dirname, "../package.json"),
   "utf-8"
@@ -6751,7 +6785,13 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
 ).option(
   "--org <slug-or-id>",
   "Deploy to a specific organization (by slug or ID)"
-).option("-y, --yes", "Skip confirmation prompts").action(async (options) => {
+).option("-y, --yes", "Skip confirmation prompts").option("--region <region>", "Deploy region: US, EU, or APAC (default: US)").option(
+  "--build-command <cmd>",
+  "Custom build command (overrides auto-detection)"
+).option(
+  "--start-command <cmd>",
+  "Custom start command (overrides auto-detection)"
+).action(async (options) => {
   await deployCommand({
     open: options.open,
     name: options.name,
@@ -6762,11 +6802,15 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
     envFile: options.envFile,
     rootDir: options.rootDir,
     org: options.org,
-    yes: options.yes
+    yes: options.yes,
+    region: options.region,
+    buildCommand: options.buildCommand,
+    startCommand: options.startCommand
   });
 });
 program.addCommand(createClientCommand());
 program.addCommand(createDeploymentsCommand());
+program.addCommand(createServersCommand());
 program.addCommand(createSkillsCommand());
 program.command("generate-types").description(
   "Generate TypeScript type definitions for tools (writes .mcp-use/tool-registry.d.ts)"