@aravhawk/cc-switch 1.1.1 → 2.0.1

package/README.md

@@ -34,18 +34,20 @@ This will present a menu with options to:
 
 ### Command Line Mode
 
+Actions use flags. Use a positional profile name for quick switching.
+
 #### Switch Profile
 
 ```bash
-cc-switch switch <profile-name>
+cc-switch <profile-name>
 ```
 
-Example:
+Or explicit:
 ```bash
-cc-switch switch work
+cc-switch --switch <profile-name>
 ```
 
-Shorthand:
+Example:
 ```bash
 cc-switch work
 ```
@@ -55,12 +57,12 @@ cc-switch work
 Create a new profile from your current `~/.claude/settings.json`:
 
 ```bash
-cc-switch create <profile-name>
+cc-switch --create <profile-name>
 ```
 
 Example:
 ```bash
-cc-switch create personal
+cc-switch --create personal
 ```
 
 #### Delete Profile
@@ -68,12 +70,12 @@ cc-switch create personal
 Delete an existing profile (cannot delete the active profile):
 
 ```bash
-cc-switch delete <profile-name>
+cc-switch --delete <profile-name>
 ```
 
 Example:
 ```bash
-cc-switch delete old-config
+cc-switch --delete old-config
 ```
 
 #### Rename Profile
@@ -81,12 +83,17 @@ cc-switch delete old-config
 Rename an existing profile:
 
 ```bash
-cc-switch rename <old-name> <new-name>
+cc-switch --rename <old-name> <new-name>
+```
+
+Or:
+```bash
+cc-switch --rename <old-name> --to <new-name>
 ```
 
 Example:
 ```bash
-cc-switch rename work work-2024
+cc-switch --rename work work-2024
 ```
 
 #### List Profiles
@@ -94,7 +101,7 @@ cc-switch rename work work-2024
 List all available profiles:
 
 ```bash
-cc-switch list
+cc-switch --list
 ```
 
 #### Current Profile
@@ -102,9 +109,20 @@ cc-switch list
 Show the active profile:
 
 ```bash
-cc-switch current
+cc-switch --current
 ```
 
+#### Help and Version
+
+```bash
+cc-switch help
+cc-switch --help
+cc-switch version
+cc-switch --version
+```
+
+Reserved profile names: `help` and `version`.
+
 ## How It Works
 
 `cc-switch` manages multiple Claude Code profiles by storing copies of your `settings.json` file in separate profile directories.
@@ -166,6 +184,7 @@ Profile names must:
 - Not be empty
 - Only contain letters, numbers, hyphens, and underscores
 - Not contain path separators (`/`, `\`, `..`)
+- Not be reserved words (`help`, `version`)
 
 ## Error Handling
 

package/dist/index.js

@@ -3,6 +3,7 @@
 // src/index.ts
 import { Command } from "commander";
 import * as clack from "@clack/prompts";
+import { createRequire } from "module";
 
 // src/profiles.ts
 import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, rm, readdir, rename as fsRename, access } from "fs/promises";
@@ -59,14 +60,22 @@ async function updateState(updates) {
 }
 
 // src/validation.ts
+var RESERVED_PROFILE_NAMES = /* @__PURE__ */ new Set(["help", "version"]);
 function validateProfileName(name) {
-  if (!name || name.trim().length === 0) {
+  const trimmedName = name.trim();
+  if (!trimmedName) {
     return { valid: false, error: "Profile name cannot be empty" };
   }
-  if (name.includes("..") || name.includes("/") || name.includes("\\")) {
+  if (name !== trimmedName) {
+    return { valid: false, error: "Profile name cannot contain leading or trailing spaces" };
+  }
+  if (RESERVED_PROFILE_NAMES.has(trimmedName.toLowerCase())) {
+    return { valid: false, error: `Profile name "${trimmedName}" is reserved. Choose a different name.` };
+  }
+  if (trimmedName.includes("..") || trimmedName.includes("/") || trimmedName.includes("\\")) {
     return { valid: false, error: 'Profile name cannot contain "..", "/", or "\\"' };
   }
-  if (!/^[A-Za-z0-9-_]+$/.test(name)) {
+  if (!/^[A-Za-z0-9-_]+$/.test(trimmedName)) {
     return { valid: false, error: "Profile name can only contain letters, numbers, hyphens, and underscores" };
   }
   return { valid: true };
@@ -188,6 +197,9 @@ async function renameProfile(oldName, newName) {
   if (!await profileExists(oldName)) {
     throw new Error(`Profile "${oldName}" does not exist`);
   }
+  if (oldName === newName) {
+    return;
+  }
   if (await profileExists(newName)) {
     throw new Error(`Profile "${newName}" already exists`);
   }
@@ -199,89 +211,53 @@ async function renameProfile(oldName, newName) {
 }
 
 // src/index.ts
+var require2 = createRequire(import.meta.url);
+function getCliVersion() {
+  try {
+    const pkg = require2("../package.json");
+    if (pkg && typeof pkg.version === "string") {
+      return pkg.version;
+    }
+  } catch {
+    return "unknown";
+  }
+  return "unknown";
+}
+var cliVersion = getCliVersion();
 var program = new Command();
 function formatActiveProfileLine(status) {
   const missingSuffix = status.exists ? "" : " (missing)";
   return `Current profile: "${status.name}"${missingSuffix}`;
 }
-program.name("cc-switch").description("Profile manager for Claude Code settings").version("1.0.0");
-program.command("switch <name>").description("Switch to a different profile").action(async (name) => {
-  try {
-    await switchProfile(name);
-    console.log(`Switched to profile "${name}"`);
-    process.exit(0);
-  } catch (error) {
-    console.error(`Error: ${error.message}`);
-    process.exit(1);
-  }
-});
-program.command("create <name>").description("Create a new profile from current settings").action(async (name) => {
-  try {
-    await createProfile(name);
-    console.log(`Created profile "${name}"`);
-    process.exit(0);
-  } catch (error) {
-    console.error(`Error: ${error.message}`);
-    process.exit(1);
-  }
-});
-program.command("delete <name>").description("Delete a profile").action(async (name) => {
-  try {
-    await deleteProfile(name);
-    console.log(`Deleted profile "${name}"`);
-    process.exit(0);
-  } catch (error) {
-    console.error(`Error: ${error.message}`);
-    process.exit(1);
-  }
-});
-program.command("rename <oldName> <newName>").description("Rename a profile").action(async (oldName, newName) => {
-  try {
-    await renameProfile(oldName, newName);
-    console.log(`Renamed profile "${oldName}" to "${newName}"`);
-    process.exit(0);
-  } catch (error) {
-    console.error(`Error: ${error.message}`);
-    process.exit(1);
+function getProfileValidationMessage(value) {
+  const validation = validateProfileName(value ?? "");
+  if (!validation.valid) {
+    return validation.error ?? "Profile name is invalid";
   }
-});
-program.command("current").description("Show the current active profile").action(async () => {
-  try {
-    const activeStatus = await getActiveProfileStatus();
-    console.log(formatActiveProfileLine(activeStatus));
-    process.exit(0);
-  } catch (error) {
-    console.error(`Error: ${error.message}`);
-    process.exit(1);
+  return void 0;
+}
+async function showProfileList(profiles) {
+  const activeStatus = await getActiveProfileStatus();
+  const resolvedProfiles = profiles ?? await listProfiles();
+  console.log(formatActiveProfileLine(activeStatus));
+  if (resolvedProfiles.length === 0) {
+    console.log("No profiles found");
+    return;
   }
-});
-program.command("list").description("List all profiles").action(async () => {
-  try {
-    const profiles = await listProfiles();
-    const activeStatus = await getActiveProfileStatus();
-    console.log(formatActiveProfileLine(activeStatus));
-    if (profiles.length === 0) {
-      console.log("No profiles found");
-      process.exit(0);
-    }
-    console.log("\nProfiles:");
-    for (const profile of profiles) {
-      const marker = profile.isActive ? " (active)" : "";
-      console.log(`  ${profile.name}${marker}`);
-    }
-    console.log();
-    process.exit(0);
-  } catch (error) {
-    console.error(`Error: ${error.message}`);
-    process.exit(1);
+  console.log("\nProfiles:");
+  for (const profile of resolvedProfiles) {
+    const marker = profile.isActive ? " (active)" : "";
+    console.log(`  ${profile.name}${marker}`);
   }
-});
+  console.log();
+}
+program.name("cc-switch").description("Profile manager for Claude Code settings").version(cliVersion, "-V, --version", "output the version number").argument("[profile]", "Profile name to switch to").option("--switch <name>", "Switch to a different profile").option("--create <name>", "Create a new profile from current settings").option("--delete <name>", "Delete a profile").option("--rename <names...>", "Rename a profile").option("--to <name>", "New name for rename").option("--current", "Show the current active profile").option("--list", "List all profiles");
 async function interactiveMode() {
   clack.intro("cc-switch - Claude Code Profile Manager");
   try {
     const profiles = await listProfiles();
     if (profiles.length === 0) {
-      clack.outro("No profiles found. Create one with: cc-switch create <name>");
+      clack.outro("No profiles found. Create one with: cc-switch --create <name>");
       process.exit(0);
     }
     const action = await clack.select({
@@ -326,10 +302,7 @@ async function interactiveMode() {
         const profileName = await clack.text({
           message: "Enter new profile name:",
           validate: (value) => {
-            if (!value) return "Profile name is required";
-            if (!/^[A-Za-z0-9-_]+$/.test(value)) {
-              return "Profile name can only contain letters, numbers, hyphens, and underscores";
-            }
+            return getProfileValidationMessage(value);
           }
         });
         if (clack.isCancel(profileName)) {
@@ -389,29 +362,23 @@ async function interactiveMode() {
         const newName = await clack.text({
           message: "Enter new profile name:",
           validate: (value) => {
-            if (!value) return "Profile name is required";
-            if (!/^[A-Za-z0-9-_]+$/.test(value)) {
-              return "Profile name can only contain letters, numbers, hyphens, and underscores";
-            }
+            return getProfileValidationMessage(value);
           }
         });
         if (clack.isCancel(newName)) {
           clack.cancel("Operation cancelled");
           process.exit(0);
         }
+        if (oldName === newName) {
+          clack.outro("Profile name unchanged");
+          process.exit(0);
+        }
         await renameProfile(oldName, newName);
         clack.outro(`Renamed profile "${oldName}" to "${newName}"`);
         break;
       }
       case "list": {
-        const activeStatus = await getActiveProfileStatus();
-        console.log(formatActiveProfileLine(activeStatus));
-        console.log("\nProfiles:");
-        for (const profile of profiles) {
-          const marker = profile.isActive ? " (active)" : "";
-          console.log(`  ${profile.name}${marker}`);
-        }
-        console.log();
+        await showProfileList(profiles);
         clack.outro("Profile list complete");
         break;
       }
@@ -422,24 +389,133 @@ async function interactiveMode() {
     process.exit(1);
   }
 }
-var rawArgs = process.argv.slice(2);
-var knownCommands = /* @__PURE__ */ new Set(["switch", "create", "delete", "rename", "list", "current"]);
-var firstArg = rawArgs[0];
-var isFlag = firstArg?.startsWith("-");
-if (rawArgs.length === 1 && firstArg && !knownCommands.has(firstArg) && !isFlag) {
-  (async () => {
+async function runCli() {
+  const rawArgs = process.argv.slice(2);
+  if (!rawArgs.length) {
+    await interactiveMode();
+    return;
+  }
+  if (rawArgs.length === 1) {
+    const singleArg = rawArgs[0];
+    if (singleArg === "help") {
+      program.outputHelp();
+      return;
+    }
+    if (singleArg === "version") {
+      console.log(cliVersion);
+      return;
+    }
+  }
+  program.parse();
+  const opts = program.opts();
+  const profileArg = program.args[0];
+  const actionFlags = [];
+  if (opts.switch) actionFlags.push("switch");
+  if (opts.create) actionFlags.push("create");
+  if (opts.delete) actionFlags.push("delete");
+  if (opts.rename || opts.to) actionFlags.push("rename");
+  if (opts.current) actionFlags.push("current");
+  if (opts.list) actionFlags.push("list");
+  if (actionFlags.length > 1) {
+    console.error("Error: Please provide only one action flag at a time.");
+    process.exit(1);
+  }
+  if (profileArg && actionFlags.length > 0) {
+    console.error("Error: Do not combine a profile name with action flags.");
+    process.exit(1);
+  }
+  if (actionFlags.length === 0) {
+    if (!profileArg) {
+      program.outputHelp();
+      process.exit(0);
+      return;
+    }
     try {
-      await switchProfile(firstArg);
-      console.log(`Switched to profile "${firstArg}"`);
+      await switchProfile(profileArg);
+      console.log(`Switched to profile "${profileArg}"`);
       process.exit(0);
     } catch (error) {
       console.error(`Error: ${error.message}`);
       process.exit(1);
     }
-  })();
-} else {
-  program.parse();
-  if (!rawArgs.length) {
-    interactiveMode();
+    return;
+  }
+  const action = actionFlags[0];
+  try {
+    switch (action) {
+      case "switch": {
+        if (!opts.switch) {
+          throw new Error("Missing profile name for --switch");
+        }
+        await switchProfile(opts.switch);
+        console.log(`Switched to profile "${opts.switch}"`);
+        process.exit(0);
+        break;
+      }
+      case "create": {
+        if (!opts.create) {
+          throw new Error("Missing profile name for --create");
+        }
+        await createProfile(opts.create);
+        console.log(`Created profile "${opts.create}"`);
+        process.exit(0);
+        break;
+      }
+      case "delete": {
+        if (!opts.delete) {
+          throw new Error("Missing profile name for --delete");
+        }
+        await deleteProfile(opts.delete);
+        console.log(`Deleted profile "${opts.delete}"`);
+        process.exit(0);
+        break;
+      }
+      case "rename": {
+        const renameArgs = opts.rename ?? [];
+        const renameTarget = opts.to;
+        if (!renameArgs.length && renameTarget) {
+          throw new Error("Missing old profile name for --rename");
+        }
+        if (!renameArgs.length) {
+          throw new Error("Missing profile name for --rename");
+        }
+        if (renameArgs.length > 2) {
+          throw new Error("Provide only two names for --rename");
+        }
+        if (renameArgs.length === 2 && renameTarget) {
+          throw new Error('Use either "--rename <old> <new>" or "--rename <old> --to <new>"');
+        }
+        const oldName = renameArgs[0];
+        const newName = renameArgs.length === 2 ? renameArgs[1] : renameTarget;
+        if (!newName) {
+          throw new Error("Missing new profile name for --rename");
+        }
+        if (oldName === newName) {
+          await renameProfile(oldName, newName);
+          console.log("Profile name unchanged");
+          process.exit(0);
+          break;
+        }
+        await renameProfile(oldName, newName);
+        console.log(`Renamed profile "${oldName}" to "${newName}"`);
+        process.exit(0);
+        break;
+      }
+      case "current": {
+        const activeStatus = await getActiveProfileStatus();
+        console.log(formatActiveProfileLine(activeStatus));
+        process.exit(0);
+        break;
+      }
+      case "list": {
+        await showProfileList();
+        process.exit(0);
+        break;
+      }
+    }
+  } catch (error) {
+    console.error(`Error: ${error.message}`);
+    process.exit(1);
   }
 }
+void runCli();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aravhawk/cc-switch",
-  "version": "1.1.1",
+  "version": "2.0.1",
   "description": "Profile manager for Claude Code settings",
   "type": "module",
   "bin": {