@botim/botim-cli 0.0.6 → 0.0.8

package/dist/cli.js

@@ -13,13 +13,46 @@ import { createReactApp, createVueApp, handleLogin, handleLogout, handleQRCode }
 import { showMenuOrRequireAuth } from "./commands/auth/index.js";
 import { displayExamples, displayQuickStart } from "./utils/help.js";
 import { logger, displayErrorSync } from "./utils/logger.js";
-import { isLoggedIn, getCurrentEnvironment, setCurrentEnvironment, getAllEnvironmentStatus } from "./utils/config.js";
+import { isLoggedIn, getCurrentEnvironment, setCurrentEnvironment, getAllEnvironmentStatus, getPartnerId, getPartnerName, getUserToken } from "./utils/config.js";
 import { setRuntimeEnvironment, parseEnvironment, getEnvironmentDisplayName } from "./utils/environment.js";
 import { executeWithAuthRetry } from "./utils/auth-handler.js";
+import { getConfigPath } from "./utils/config-sync.js";
+import { switchToPartner } from "./utils/partner-switch.js";
+import { fetchPartners } from "./utils/auth-api.js";
+import { select } from "@inquirer/prompts";
 import chalk from "chalk";
 import fs from "fs-extra";
-import path from "path";
-const version = "0.0.6";
+async function promptSelect(options) {
+  const ac = new AbortController();
+  const onKeypress = (_ch, key) => {
+    if (key?.name === "escape") {
+      ac.abort();
+    }
+  };
+  process.stdin.on("keypress", onKeypress);
+  try {
+    return await select({
+      ...options,
+      theme: {
+        helpMode: "always",
+        style: {
+          keysHelpTip: (keys) => {
+            keys.push(["esc", "back"]);
+            return keys.map(([key, desc]) => `\x1B[1m${key}\x1B[22m \x1B[2m${desc}\x1B[22m`).join("\x1B[2m \u2022 \x1B[22m");
+          }
+        }
+      }
+    }, { signal: ac.signal });
+  } catch (error) {
+    if (error.name === "AbortPromptError") {
+      return null;
+    }
+    throw error;
+  } finally {
+    process.stdin.removeListener("keypress", onKeypress);
+  }
+}
+const version = "0.0.8";
 const program = new Command();
 program.name("botim-cli").description("CLI tool to generate boilerplate code for React and Vue applications").version(version, "-v, --version", "Output the current version").option("--env <environment>", "Target environment: prod, uat, or beta (overrides default)", (value) => {
   const env = parseEnvironment(value);
@@ -103,7 +136,7 @@ program.command("status").description("Show login status for all environments").
   const prodActive = currentEnv === "production" ? chalk.cyan(" (active)") : "";
   console.log(`  ${prodIndicator} Production${prodActive}`);
   if (prodStatus.loggedIn && prodStatus.partnerName) {
-    console.log(chalk.gray(`    Partner: ${prodStatus.partnerName}`));
+    console.log(chalk.gray(`    Partner: ${prodStatus.partnerName}${prodStatus.partnerId ? ` (${prodStatus.partnerId})` : ""}`));
   } else if (!prodStatus.loggedIn) {
     console.log(chalk.gray("    Not logged in"));
   }
@@ -113,7 +146,7 @@ program.command("status").description("Show login status for all environments").
   const uatActive = currentEnv === "uat" ? chalk.cyan(" (active)") : "";
   console.log(`  ${uatIndicator} UAT${uatActive}`);
   if (uatStatus.loggedIn && uatStatus.partnerName) {
-    console.log(chalk.gray(`    Partner: ${uatStatus.partnerName}`));
+    console.log(chalk.gray(`    Partner: ${uatStatus.partnerName}${uatStatus.partnerId ? ` (${uatStatus.partnerId})` : ""}`));
   } else if (!uatStatus.loggedIn) {
     console.log(chalk.gray("    Not logged in"));
   }
@@ -123,20 +156,21 @@ program.command("status").description("Show login status for all environments").
   const betaActive = currentEnv === "beta" ? chalk.cyan(" (active)") : "";
   console.log(`  ${betaIndicator} Beta${betaActive}`);
   if (betaStatus.loggedIn && betaStatus.partnerName) {
-    console.log(chalk.gray(`    Partner: ${betaStatus.partnerName}`));
+    console.log(chalk.gray(`    Partner: ${betaStatus.partnerName}${betaStatus.partnerId ? ` (${betaStatus.partnerId})` : ""}`));
   } else if (!betaStatus.loggedIn) {
     console.log(chalk.gray("    Not logged in"));
   }
   console.log("");
   console.log(chalk.gray("Tips:"));
   console.log(chalk.gray("  Switch environment: botim-cli config set env uat"));
+  console.log(chalk.gray("  Switch partner:     botim-cli switch-partner"));
   console.log(chalk.gray("  One-time override:  botim-cli --env beta <command>"));
   console.log(chalk.gray("  Login to beta:      botim-cli --env beta login\n"));
 });
 program.command("auth").description("Access authenticated commands (requires login)").alias("authenticated").action(async () => {
   await showMenuOrRequireAuth();
 });
-program.command("create-mp-app").description("Create a new Mini-Program app non-interactively (requires authentication)").alias("cmp").requiredOption("--projectName <name>", "Project folder name").option("--framework <framework>", "Template framework: react or vue", "react").option("--title <title>", "App title (default: derived from projectName)").option("--domainPrefix <prefix>", "Domain prefix (default: auto-selected)").option("--reviewNote <note>", "Review note for submission (default: auto-generated)").option("--creatorType <type>", "Creator type: hybrid or h5bridge", "hybrid").option("--website <url>", "Website URL (required if creatorType=h5bridge)").option("--shareText <text>", "Share card description (default: same as title)").option("--screenOrientation <orientation>", "Screen mode: fullscreen, immersive, or standard", "fullscreen").option("--apiLevel <version>", "API level version (default: latest available)").option("--audience <audience>", "Audience: 1=Private or 2=Public", "2").addHelpText("after", `
+program.command("create-mp-app").description("Create a new Mini-Program app non-interactively (requires authentication)").alias("cmp").requiredOption("--projectName <name>", "Project folder name").option("--framework <framework>", "Template framework: react or vue", "react").option("--title <title>", "App title (default: derived from projectName)").option("--domainPrefix <prefix>", "Domain prefix (default: auto-selected)").option("--reviewNote <note>", "Review note for submission (default: auto-generated)").option("--creatorType <type>", "Creator type: hybrid or h5bridge", "hybrid").option("--website <url>", "Website URL (required if creatorType=h5bridge)").option("--shareText <text>", "Share card description (default: same as title)").option("--screenOrientation <orientation>", "Screen mode: fullscreen, immersive, or standard", "fullscreen").option("--apiLevel <version>", "API level version (default: latest available)").option("--audience <audience>", "Audience: 1=Public or 2=Private", "1").addHelpText("after", `
 
 Examples:
   Basic usage with minimal options:
@@ -183,8 +217,8 @@ Screen Orientations:
   standard   - Standard page with title bar
 
 Audience Options:
-  1 - Private (only accessible to specific users)
-  2 - Public (accessible to all users) (default)
+  1 - Public (accessible to all users) (default)
+  2 - Private (only accessible to specific users)
 `).action(async (options) => {
   try {
     const loggedIn = await isLoggedIn();
@@ -214,6 +248,71 @@ Audience Options:
     process.exit(1);
   }
 });
+program.command("register-mp-app").description("Register a new Mini-Program on platform only, no template (requires authentication)").alias("rmp").requiredOption("--title <title>", "App title").option("--domainPrefix <prefix>", "Domain prefix (default: auto-selected)").option("--appIdSuffix <suffix>", "App ID suffix (default: auto-generated)").option("--reviewNote <note>", "Review note for submission (default: auto-generated)").option("--creatorType <type>", "Creator type: hybrid or h5bridge", "hybrid").option("--website <url>", "Website URL (required if creatorType=h5bridge)").option("--shareText <text>", "Share card description (default: same as title)").option("--screenOrientation <orientation>", "Screen mode: fullscreen, immersive, or standard", "fullscreen").option("--apiLevel <version>", "API level version (default: latest available)").option("--audience <audience>", "Audience: 1=Public or 2=Private", "1").addHelpText("after", `
+
+Examples:
+  Register with minimal options:
+    $ botim-cli register-mp-app --title "My App"
+
+  Register with all options:
+    $ botim-cli register-mp-app \\
+      --title "My App" \\
+      --domainPrefix me.botim.mp.test \\
+      --shareText "Explore my amazing app" \\
+      --screenOrientation immersive \\
+      --audience 2
+
+  Register an H5BRIDGE app:
+    $ botim-cli register-mp-app \\
+      --title "My Website" \\
+      --creatorType h5bridge \\
+      --website https://example.com \\
+      --shareText "Visit my website"
+
+  Use UAT environment:
+    $ botim-cli --env uat register-mp-app --title "My UAT App"
+
+Creator Types:
+  hybrid     - Fastest, local resources with full platform capabilities (default)
+  h5bridge   - Standard, wraps a responsive HTML5 website (requires --website)
+
+Screen Orientations:
+  fullscreen - Full screen with status bar visible (default)
+  immersive  - Full screen with status bar hidden
+  standard   - Standard page with title bar
+
+Audience Options:
+  1 - Public (accessible to all users) (default)
+  2 - Private (only accessible to specific users)
+`).action(async (options) => {
+  try {
+    const loggedIn = await isLoggedIn();
+    if (!loggedIn) {
+      const currentEnv = await getCurrentEnvironment();
+      const envDisplay = getEnvironmentDisplayName(currentEnv);
+      console.log(chalk.red(`
+\u274C Authentication required for ${envDisplay}. Please login first using: botim-cli ${currentEnv === "uat" ? "--env uat " : ""}login
+`));
+      process.exit(1);
+    }
+    const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
+    const command = authenticatedCommandRegistry.get("register-mp-app");
+    if (command) {
+      const processedOptions = {
+        ...options,
+        audience: parseInt(options.audience, 10)
+      };
+      await executeWithAuthRetry(
+        () => command.execute(processedOptions),
+        { commandName: "register-mp-app", retryAfterLogin: true }
+      );
+    }
+  } catch (error) {
+    logger.error("register-mp-app command failed", error);
+    displayErrorSync(error, "Register MP App failed");
+    process.exit(1);
+  }
+});
 program.command("init-mp-app").description("Initialize MP app in current directory (requires authentication)").alias("init-mp").action(async () => {
   try {
     const loggedIn = await isLoggedIn();
@@ -264,7 +363,7 @@ program.command("deploy-mp-app").description("Deploy MP app to server (requires
     process.exit(1);
   }
 });
-program.command("debug-mp-app").description("Debug MP app (requires authentication and botim_config.json)").alias("debug").action(async () => {
+program.command("debug-mp-app").description("Debug MP app (requires authentication and config file)").alias("debug").action(async () => {
   try {
     const loggedIn = await isLoggedIn();
     if (!loggedIn) {
@@ -289,6 +388,89 @@ program.command("debug-mp-app").description("Debug MP app (requires authenticati
     process.exit(1);
   }
 });
+program.command("switch-partner [partner-id]").description("Switch to a different partner without re-login").alias("sp").action(async (partnerId) => {
+  try {
+    const currentEnv = await getCurrentEnvironment();
+    const envDisplay = getEnvironmentDisplayName(currentEnv);
+    const loggedIn = await isLoggedIn();
+    if (!loggedIn) {
+      console.log(chalk.red(`
+\u274C Authentication required for ${envDisplay}. Please login first using: botim-cli login
+`));
+      process.exit(1);
+    }
+    const userToken = await getUserToken(currentEnv);
+    if (!userToken) {
+      console.log(chalk.yellow("\n\u26A0\uFE0F  No user token available. Please login again to enable partner switching.\n"));
+      console.log(chalk.gray("Run: botim-cli login\n"));
+      process.exit(1);
+    }
+    let selectedPartnerId = partnerId;
+    if (!selectedPartnerId) {
+      const ora = (await import("ora")).default;
+      const spinner = ora("Fetching partner list...").start();
+      let partnerList;
+      try {
+        partnerList = await fetchPartners({ userToken, env: currentEnv });
+        spinner.succeed("Partner list fetched");
+      } catch (error) {
+        spinner.fail("Failed to fetch partner list");
+        console.log(chalk.yellow("\n\u26A0\uFE0F  Could not fetch partner list. Your session may have expired.\n"));
+        console.log(chalk.gray("Run: botim-cli login\n"));
+        process.exit(1);
+      }
+      if (!partnerList || partnerList.length === 0) {
+        console.log(chalk.yellow("\n\u26A0\uFE0F  No partners found for your account.\n"));
+        process.exit(1);
+      }
+      const currentPartnerId2 = await getPartnerId(currentEnv);
+      const selected = await promptSelect({
+        message: "Select a partner:",
+        choices: partnerList.map((p) => ({
+          name: `${p.partnerInfo?.company_name || p.partner_id} (${p.partner_id})${p.partner_id === currentPartnerId2 ? chalk.cyan(" \u2190 current") : ""}`,
+          value: p.partner_id
+        }))
+      });
+      if (selected === null) {
+        process.exit(0);
+      }
+      selectedPartnerId = selected;
+    }
+    if (!selectedPartnerId) {
+      process.exit(1);
+    }
+    const currentPartnerId = await getPartnerId(currentEnv);
+    if (selectedPartnerId === currentPartnerId) {
+      const currentPartnerName = await getPartnerName(currentEnv);
+      console.log(chalk.gray(`
+Already using partner: ${currentPartnerName || selectedPartnerId}
+`));
+      return;
+    }
+    const result = await switchToPartner(selectedPartnerId, currentEnv);
+    if (result.success) {
+      console.log(chalk.green(`
+\u2713 Switched to partner: ${result.partnerName}
+`));
+    } else if (result.error === "partner-not-found") {
+      console.log(chalk.red(`
+\u274C Partner ${selectedPartnerId} not found in your partner list.
+`));
+      process.exit(1);
+    } else if (result.error === "no-user-token" || result.error === "user-token-expired") {
+      console.log(chalk.yellow("\n\u26A0\uFE0F  Your session has expired. Please login again.\n"));
+      console.log(chalk.gray("Run: botim-cli login\n"));
+      process.exit(1);
+    } else {
+      console.log(chalk.red("\n\u274C Failed to switch partner. Please try logging in again.\n"));
+      process.exit(1);
+    }
+  } catch (error) {
+    logger.error("switch-partner command failed", error);
+    displayErrorSync(error, "Switch partner failed");
+    process.exit(1);
+  }
+});
 program.command("list-mp-permissions [app-id]").description("List permissions for a mini-program app (requires authentication)").alias("perms").action(async (appId) => {
   try {
     const loggedIn = await isLoggedIn();
@@ -530,19 +712,22 @@ async function showMainMenu() {
     const currentEnv = await getCurrentEnvironment();
     const envDisplay = getEnvironmentDisplayName(currentEnv);
     const envColor = currentEnv === "production" ? chalk.green : chalk.yellow;
+    const currentPartnerName = await getPartnerName(currentEnv);
     console.log(chalk.cyan.bold("\n\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557"));
     console.log(chalk.cyan.bold("\u2551           \u{1F680} Botim CLI Generator                  \u2551"));
     console.log(chalk.cyan.bold(`\u2551                  v${version.padEnd(32)}\u2551`));
-    console.log(chalk.cyan.bold(`\u2551           Environment: ${envColor(envDisplay.padEnd(26))}\u2551`));
+    console.log(chalk.cyan.bold(`\u2551           Environment: ${envColor(envDisplay.padEnd(27))}\u2551`));
+    if (currentPartnerName) {
+      console.log(chalk.cyan.bold(`\u2551           Partner: ${chalk.white(currentPartnerName.padEnd(31))}\u2551`));
+    }
     console.log(chalk.cyan.bold("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D\n"));
-    const inquirer = (await import("inquirer")).default;
     const loggedIn = await isLoggedIn();
     let authenticatedChoices = [];
     if (loggedIn) {
       const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
       const commands = authenticatedCommandRegistry.getAll();
       const currentDir = process.cwd();
-      const configFilePath = path.join(currentDir, "botim_config.json");
+      const configFilePath = getConfigPath(currentDir, currentEnv);
       const hasConfigFile = await fs.pathExists(configFilePath);
       const filteredCommands = commands.filter((cmd) => {
         if (cmd.hideFromMenu) {
@@ -551,7 +736,7 @@ async function showMainMenu() {
         if (cmd.name === "deploy-mp-app" || cmd.name === "debug-mp-app") {
           return hasConfigFile;
         }
-        if (cmd.name === "create-mp-app" || cmd.name === "init-mp-app") {
+        if (cmd.name === "create-mp-app" || cmd.name === "register-mp-app") {
           return !hasConfigFile;
         }
         return true;
@@ -574,20 +759,21 @@ async function showMainMenu() {
       ...authenticatedChoices,
       { name: "\u{1F4F1} Create a Mini-Program (Local)", value: "mini-program" },
       { name: "\u{1F504} Switch Environment", value: "switch-env" },
+      { name: "\u{1F500} Switch Partner", value: "switch-partner" },
       { name: "\u{1F4CA} View Status", value: "status" },
       { name: "\u{1F6AA} Logout", value: "logout" },
       { name: "\u{1F4DA} View examples", value: "examples" },
       { name: "\u2753 Show help", value: "help" },
       { name: "\u{1F6AA} Exit", value: "exit" }
     ];
-    const { action } = await inquirer.prompt([
-      {
-        type: "list",
-        name: "action",
-        message: loggedIn ? envColor(`\u2713 Authenticated [${envDisplay}]`) + " - What would you like to do?" : `[${envDisplay}] What would you like to do?`,
-        choices: loggedIn ? authenticatedChoices : unauthenticatedChoices
-      }
-    ]);
+    const action = await promptSelect({
+      message: loggedIn ? envColor(`\u2713 Authenticated [${envDisplay}]`) + " - What would you like to do?" : `[${envDisplay}] What would you like to do?`,
+      choices: loggedIn ? authenticatedChoices : unauthenticatedChoices
+    });
+    if (action === null) {
+      console.log(chalk.gray("\nGoodbye! \u{1F44B}\n"));
+      process.exit(0);
+    }
     if (action.startsWith("auth:")) {
       const commandName = action.replace("auth:", "");
       const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
@@ -605,20 +791,14 @@ async function showMainMenu() {
         }
       }
     } else if (action === "mini-program") {
-      const { framework } = await inquirer.prompt([
-        {
-          type: "list",
-          name: "framework",
-          message: "Select a framework template:",
-          choices: [
-            { name: "\u269B\uFE0F  React - Modern React 18 with Vite", value: "react" },
-            { name: "\u{1F596} Vue - Vue 3 with Composition API", value: "vue" },
-            new inquirer.Separator(),
-            { name: "\u2190 Back to main menu", value: "back" }
-          ]
-        }
-      ]);
-      if (framework === "back") {
+      const framework = await promptSelect({
+        message: "Select a framework template:",
+        choices: [
+          { name: "\u269B\uFE0F  React - Modern React 18 with Vite", value: "react" },
+          { name: "\u{1F596} Vue - Vue 3 with Composition API", value: "vue" }
+        ]
+      });
+      if (framework === null) {
         await showMainMenu();
       } else if (framework === "react") {
         console.log(chalk.cyan.bold(`
@@ -633,30 +813,24 @@ async function showMainMenu() {
       }
     } else if (action === "switch-env") {
       const allStatus = await getAllEnvironmentStatus();
-      const { newEnv } = await inquirer.prompt([
-        {
-          type: "list",
-          name: "newEnv",
-          message: "Select environment:",
-          choices: [
-            {
-              name: `Production ${allStatus.production.loggedIn ? chalk.green("\u2713 Logged in") : chalk.gray("(not logged in)")}${currentEnv === "production" ? chalk.cyan(" \u2190 current") : ""}`,
-              value: "production"
-            },
-            {
-              name: `UAT ${allStatus.uat.loggedIn ? chalk.green("\u2713 Logged in") : chalk.gray("(not logged in)")}${currentEnv === "uat" ? chalk.cyan(" \u2190 current") : ""}`,
-              value: "uat"
-            },
-            {
-              name: `Beta ${allStatus.beta.loggedIn ? chalk.green("\u2713 Logged in") : chalk.gray("(not logged in)")}${currentEnv === "beta" ? chalk.cyan(" \u2190 current") : ""}`,
-              value: "beta"
-            },
-            new inquirer.Separator(),
-            { name: "\u2190 Back to main menu", value: "back" }
-          ]
-        }
-      ]);
-      if (newEnv === "back") {
+      const newEnv = await promptSelect({
+        message: "Select environment:",
+        choices: [
+          {
+            name: `Production ${allStatus.production.loggedIn ? chalk.green("\u2713 Logged in") : chalk.gray("(not logged in)")}${currentEnv === "production" ? chalk.cyan(" \u2190 current") : ""}`,
+            value: "production"
+          },
+          {
+            name: `UAT ${allStatus.uat.loggedIn ? chalk.green("\u2713 Logged in") : chalk.gray("(not logged in)")}${currentEnv === "uat" ? chalk.cyan(" \u2190 current") : ""}`,
+            value: "uat"
+          },
+          {
+            name: `Beta ${allStatus.beta.loggedIn ? chalk.green("\u2713 Logged in") : chalk.gray("(not logged in)")}${currentEnv === "beta" ? chalk.cyan(" \u2190 current") : ""}`,
+            value: "beta"
+          }
+        ]
+      });
+      if (newEnv === null) {
         await showMainMenu();
       } else {
         await setCurrentEnvironment(newEnv);
@@ -671,6 +845,56 @@ async function showMainMenu() {
         }
         await showMainMenu();
       }
+    } else if (action === "switch-partner") {
+      const userToken = await getUserToken(currentEnv);
+      if (!userToken) {
+        console.log(chalk.yellow("\n\u26A0\uFE0F  No user token available. Please login again to enable partner switching.\n"));
+        await showMainMenu();
+        return;
+      }
+      const ora = (await import("ora")).default;
+      const spinner = ora("Fetching partner list...").start();
+      let partnerList;
+      try {
+        partnerList = await fetchPartners({ userToken, env: currentEnv });
+        spinner.succeed("Partner list fetched");
+      } catch {
+        spinner.fail("Failed to fetch partner list");
+        console.log(chalk.yellow("\n\u26A0\uFE0F  Could not fetch partner list. Your session may have expired.\n"));
+        await showMainMenu();
+        return;
+      }
+      if (!partnerList || partnerList.length === 0) {
+        console.log(chalk.yellow("\n\u26A0\uFE0F  No partners found for your account.\n"));
+        await showMainMenu();
+        return;
+      }
+      const currentPartnerId = await getPartnerId(currentEnv);
+      const selectedPartnerId = await promptSelect({
+        message: "Select a partner:",
+        choices: partnerList.map((p) => ({
+          name: `${p.partnerInfo?.company_name || p.partner_id} (${p.partner_id})${p.partner_id === currentPartnerId ? chalk.cyan(" \u2190 current") : ""}`,
+          value: p.partner_id
+        }))
+      });
+      if (selectedPartnerId === null) {
+        await showMainMenu();
+      } else if (selectedPartnerId === currentPartnerId) {
+        console.log(chalk.gray("\nAlready using this partner.\n"));
+        await showMainMenu();
+      } else {
+        const result = await switchToPartner(selectedPartnerId, currentEnv);
+        if (result.success) {
+          console.log(chalk.green(`
+\u2713 Switched to partner: ${result.partnerName}
+`));
+        } else if (result.error === "no-user-token" || result.error === "user-token-expired") {
+          console.log(chalk.yellow("\n\u26A0\uFE0F  Your session has expired. Please login again.\n"));
+        } else {
+          console.log(chalk.red("\n\u274C Failed to switch partner.\n"));
+        }
+        await showMainMenu();
+      }
     } else if (action === "status") {
       const allStatus = await getAllEnvironmentStatus();
       console.log(chalk.cyan.bold(`
@@ -683,21 +907,21 @@ async function showMainMenu() {
       const prodActive = currentEnv === "production" ? chalk.cyan(" (active)") : "";
       console.log(`  ${prodIndicator} Production${prodActive}`);
       if (prodStatus.loggedIn && prodStatus.partnerName) {
-        console.log(chalk.gray(`    Partner: ${prodStatus.partnerName}`));
+        console.log(chalk.gray(`    Partner: ${prodStatus.partnerName}${prodStatus.partnerId ? ` (${prodStatus.partnerId})` : ""}`));
       }
       const uatStatus = allStatus.uat;
       const uatIndicator = uatStatus.loggedIn ? chalk.green("\u2713") : chalk.red("\u2717");
       const uatActive = currentEnv === "uat" ? chalk.cyan(" (active)") : "";
       console.log(`  ${uatIndicator} UAT${uatActive}`);
       if (uatStatus.loggedIn && uatStatus.partnerName) {
-        console.log(chalk.gray(`    Partner: ${uatStatus.partnerName}`));
+        console.log(chalk.gray(`    Partner: ${uatStatus.partnerName}${uatStatus.partnerId ? ` (${uatStatus.partnerId})` : ""}`));
       }
       const betaStatus = allStatus.beta;
       const betaIndicator = betaStatus.loggedIn ? chalk.green("\u2713") : chalk.red("\u2717");
       const betaActive = currentEnv === "beta" ? chalk.cyan(" (active)") : "";
       console.log(`  ${betaIndicator} Beta${betaActive}`);
       if (betaStatus.loggedIn && betaStatus.partnerName) {
-        console.log(chalk.gray(`    Partner: ${betaStatus.partnerName}`));
+        console.log(chalk.gray(`    Partner: ${betaStatus.partnerName}${betaStatus.partnerId ? ` (${betaStatus.partnerId})` : ""}`));
       }
       console.log("");
       await showMainMenu();