improve switch command

Author: nicktrn

packages/cli-v3/src/commands/switch.ts

@@ -1,4 +1,4 @@
-import { intro, isCancel, outro, select } from "@clack/prompts";
+import { intro, isCancel, log, outro, select } from "@clack/prompts";
 import { Command } from "commander";
 import { z } from "zod";
 import {
@@ -10,8 +10,8 @@ import {
 import { chalkGrey } from "../utilities/cliOutput.js";
 import { readAuthConfigFile, writeAuthConfigCurrentProfileName } from "../utilities/configFiles.js";
 import { printInitialBanner } from "../utilities/initialBanner.js";
-import { logger } from "../utilities/logger.js";
 import { CLOUD_API_URL } from "../consts.js";
+import { hasTTY, isCI } from "std-env";
 
 const SwitchProfilesOptions = CommonCommandOptions.pick({
   logLevel: true,
@@ -24,34 +24,35 @@ export function configureSwitchProfilesCommand(program: Command) {
   return program
     .command("switch")
     .description("Set your default CLI profile")
+    .argument("[profile]", "The profile to switch to. Use interactive mode if not provided.")
     .option(
       "-l, --log-level <level>",
       "The CLI log level to use (debug, info, log, warn, error, none). This does not effect the log level of your trigger.dev tasks.",
       "log"
     )
     .option("--skip-telemetry", "Opt-out of sending telemetry")
-    .action(async (options) => {
+    .action(async (profile, options) => {
       await handleTelemetry(async () => {
-        await switchProfilesCommand(options);
+        await switchProfilesCommand(profile, options);
       });
     });
 }
 
-export async function switchProfilesCommand(options: unknown) {
+export async function switchProfilesCommand(profile: string | undefined, options: unknown) {
   return await wrapCommandAction("switch", SwitchProfilesOptions, options, async (opts) => {
     await printInitialBanner(false);
-    return await switchProfiles(opts);
+    return await switchProfiles(profile, opts);
   });
 }
 
-export async function switchProfiles(options: SwitchProfilesOptions) {
+export async function switchProfiles(profile: string | undefined, options: SwitchProfilesOptions) {
   intro("Switch profiles");
 
   const authConfig = readAuthConfigFile();
 
   if (!authConfig) {
-    logger.info("No profiles found");
-    return;
+    outro("Failed to switch profiles");
+    throw new Error("No profiles found. Run `login` to create a profile.");
   }
 
   const profileNames = Object.keys(authConfig.profiles).sort((a, b) => {
@@ -62,6 +63,26 @@ export async function switchProfiles(options: SwitchProfilesOptions) {
     return a.localeCompare(b);
   });
 
+  if (profile) {
+    if (!authConfig.profiles[profile]) {
+      if (isCI || !hasTTY) {
+        outro("Failed to switch profiles");
+        throw new Error(`Profile "${profile}" not found. Run \`login\` to create a profile.`);
+      } else {
+        log.message(`Profile "${profile}" not found, showing available profiles`);
+      }
+    } else {
+      if (authConfig.currentProfile === profile) {
+        outro(`Already using ${profile}`);
+        return;
+      }
+
+      writeAuthConfigCurrentProfileName(profile);
+      outro(`Switched to ${profile}`);
+      return;
+    }
+  }
+
   const profileSelection = await select({
     message: "Please select a new profile",
     initialValue: authConfig.currentProfile,
@@ -79,6 +100,11 @@ export async function switchProfiles(options: SwitchProfilesOptions) {
     throw new OutroCommandError();
   }
 
+  if (authConfig.currentProfile === profileSelection) {
+    outro(`Already using ${profileSelection}`);
+    return;
+  }
+
   writeAuthConfigCurrentProfileName(profileSelection);
 
   if (profileSelection === authConfig.currentProfile) {