caflip 0.3.0 → 0.3.3

package/README.md

@@ -63,10 +63,15 @@ bun run dev -- help
 ## Quick Start
 
 ```bash
-# Show current account / managed accounts across both providers
+# Show current active account / all managed accounts across both providers
 caflip status
 caflip list
 
+# Pick provider interactively, then add/remove/login
+caflip add
+caflip remove
+caflip login
+
 # Add your first Claude account (must already be logged in)
 caflip claude add --alias personal
 
@@ -105,7 +110,10 @@ After switching, restart the target CLI (Claude Code or Codex) to pick up new au
 |---|---|
 | `caflip` | Interactive provider picker (Claude/Codex) |
 | `caflip list` | List managed accounts for Claude and Codex |
-| `caflip status` | Show current account for Claude and Codex |
+| `caflip status` | Show current active account for Claude and Codex |
+| `caflip add [--alias name]` | Pick provider, then add current account |
+| `caflip login [-- <args...>]` | Pick provider, then run provider login and register the resulting session |
+| `caflip remove [email]` | Pick provider, then remove an account |
 | `caflip claude [command]` | Run command for Claude provider |
 | `caflip codex [command]` | Run command for Codex provider |
 | `caflip [provider]` | Interactive account picker for that provider |
@@ -115,7 +123,7 @@ After switching, restart the target CLI (Claude Code or Codex) to pick up new au
 | `caflip [provider] login [-- <args...>]` | Run provider login and register the resulting session |
 | `caflip [provider] remove [email]` | Remove an account |
 | `caflip [provider] next` | Rotate to next account |
-| `caflip [provider] status` | Show current account |
+| `caflip [provider] status` | Show current active account |
 | `caflip [provider] alias <name> [email]` | Set alias for current or target account |
 | `caflip help` | Show help |
 
@@ -132,16 +140,23 @@ caflip claude alias work hi.lucienlee@gmail.com
 caflip codex alias work me@company.com
 ```
 
-`remove` target accepts email only. Omit it to choose from the interactive picker.
+`add`, `remove`, and `login` can be used without a provider prefix. In that case, caflip asks you to choose Claude or Codex first, then continues the normal command flow.
+
+`remove` target accepts email only. Omit it to choose from the interactive picker after selecting a provider.
 
 `login` can be used without arguments for the default login flow. Pass provider-specific flags after `--`:
 
 ```bash
+caflip login
 caflip claude login
 caflip claude login -- --email lucien@aibor.io --sso
 caflip codex login -- --device-auth
 ```
 
+`status` shows the currently active account for the selected provider. It does not list every saved account.
+
+Use `list` when you want to inspect all managed accounts for a provider.
+
 ## Shell Prompt Integration
 
 Show the current account in your prompt:

package/dist/cli.js

@@ -617,7 +617,7 @@ function validateAlias(alias) {
 // package.json
 var package_default = {
   name: "caflip",
-  version: "0.3.0",
+  version: "0.3.3",
   type: "module",
   bin: {
     caflip: "bin/caflip"
@@ -3166,6 +3166,7 @@ async function writeLastProvider(provider) {
 
 // src/index.ts
 var ADD_CURRENT_ACCOUNT_CHOICE = "__add_current_account__";
+var INTERACTIVE_PROVIDER_COMMANDS = ["add", "remove", "login"];
 var activeBackupDir = BACKUP_DIR;
 var activeSequenceFile = SEQUENCE_FILE;
 var activeLockDir = LOCK_DIR;
@@ -3196,6 +3197,76 @@ function showProviderRequiredError(command) {
   console.error(`Try: caflip claude ${command} or caflip codex ${command}`);
   process.exit(2);
 }
+function supportsInteractiveProviderSelection(command) {
+  return INTERACTIVE_PROVIDER_COMMANDS.includes(command ?? "");
+}
+async function resolveProviderForCommand(provider, command, deps = {
+  readCliMeta,
+  pickProvider,
+  writeLastProvider
+}) {
+  if (provider || !supportsInteractiveProviderSelection(command)) {
+    return provider;
+  }
+  const defaultProvider = deps.readCliMeta().lastProvider;
+  const selectedProvider = await deps.pickProvider(defaultProvider);
+  await deps.writeLastProvider(selectedProvider);
+  return selectedProvider;
+}
+async function resolveCliContext(parsed, deps = { resolveProviderForCommand }) {
+  let provider = parsed.provider;
+  const args = parsed.commandArgs;
+  const command = args[0];
+  const isHelpCommand = command === "help" || command === "--help" || command === "-h";
+  const isProviderOptionalReadOnlyCommand = command === "list" || command === "status";
+  const supportsInteractiveProvider = supportsInteractiveProviderSelection(command);
+  if (!parsed.isProviderQualified && command && !isHelpCommand && !isProviderOptionalReadOnlyCommand) {
+    const isReservedCommand = RESERVED_COMMANDS.includes(command);
+    if (!isReservedCommand) {
+      console.error("Error: Alias requires provider prefix.");
+      console.error("Try: caflip claude <alias> or caflip codex <alias>");
+      process.exit(2);
+    }
+    if (!supportsInteractiveProvider) {
+      showProviderRequiredError(command);
+    }
+  }
+  if (!command) {
+    return {
+      mode: "interactive-switch",
+      provider,
+      args,
+      command: undefined
+    };
+  }
+  if (isHelpCommand) {
+    showHelp();
+    process.exit(0);
+  }
+  if (!provider) {
+    if (command === "list" || command === "status") {
+      return {
+        mode: "all-providers",
+        provider: null,
+        args,
+        command
+      };
+    }
+    provider = await deps.resolveProviderForCommand(provider, command);
+    if (!provider) {
+      showProviderRequiredError(command);
+    }
+  }
+  if (!provider) {
+    throw new Error("Provider resolution failed");
+  }
+  return {
+    mode: "provider-command",
+    provider,
+    args,
+    command
+  };
+}
 async function syncSequenceActiveAccount(seq) {
   const currentEmail = getCurrentAccount();
   const resolvedActive = resolveManagedAccountNumberForEmail(seq, currentEmail);
@@ -3502,20 +3573,21 @@ async function cmdStatus(options) {
   }
   if (summary.email === "none") {
     console.log("none");
+  } else if (summary.alias) {
+    console.log(`${summary.email} [${summary.alias}]`);
   } else {
-    if (summary.alias) {
-      console.log(`${summary.email} [${summary.alias}]`);
-      return;
-    }
     console.log(summary.email);
   }
+  console.log(`managed accounts: ${summary.managedCount}`);
 }
 async function getStatusSummaryForActiveProvider() {
   const email = getCurrentAccount();
   let alias = null;
   let managed = false;
+  let managedCount = 0;
   if (email !== "none" && existsSync9(activeSequenceFile)) {
     const seq = await loadSequence(activeSequenceFile);
+    managedCount = Object.keys(seq.accounts).length;
     for (const account of Object.values(seq.accounts)) {
       if (account.email === email) {
         managed = true;
@@ -3523,8 +3595,11 @@ async function getStatusSummaryForActiveProvider() {
         break;
       }
     }
+  } else if (existsSync9(activeSequenceFile)) {
+    const seq = await loadSequence(activeSequenceFile);
+    managedCount = Object.keys(seq.accounts).length;
   }
-  return { email, alias, managed };
+  return { email, alias, managed, managedCount };
 }
 async function withActiveProvider(provider, fn) {
   const previousProvider = activeProvider.name;
@@ -3574,13 +3649,12 @@ async function cmdStatusAllProviders() {
     console.log(summary.heading);
     if (summary.email === "none") {
       console.log("  none");
-      continue;
-    }
-    if (summary.alias) {
+    } else if (summary.alias) {
       console.log(`  ${summary.email} [${summary.alias}]`);
-      continue;
+    } else {
+      console.log(`  ${summary.email}`);
     }
-    console.log(`  ${summary.email}`);
+    console.log(`  managed accounts: ${summary.managedCount}`);
   }
 }
 async function cmdAlias(alias, identifier) {
@@ -3652,7 +3726,10 @@ Usage:
 Commands:
   (no args)                            Interactive provider picker
   list                                 List managed accounts for all providers
-  status                               Show current account for all providers
+  status                               Show current active account for all providers
+  add [--alias <name>]                 Pick provider, then add current account
+  login [-- <args...>]                 Pick provider, then run provider login
+  remove [<email>]                     Pick provider, then remove an account
   <provider>                           Interactive account picker for provider
   <provider> <alias>                   Switch by alias for provider
   <provider> list                      List all managed accounts
@@ -3660,18 +3737,21 @@ Commands:
   <provider> login [-- <args...>]      Run provider login and register session
   <provider> remove [<email>]          Remove an account
   <provider> next                      Rotate to next account
-  <provider> status [--json]           Show current account
+  <provider> status [--json]           Show current active account
   <provider> alias <name> [<email>]    Set alias for current or target account
   help                                 Show this help
 
 Examples:
   caflip                               Pick provider interactively
   caflip list                          List managed accounts for Claude and Codex
-  caflip status                        Show current account for Claude and Codex
+  caflip status                        Show current active account for Claude and Codex
+  caflip add                           Pick provider, then add current account
+  caflip login                         Pick provider, then run provider login
+  caflip remove                        Pick provider, then remove an account interactively
   caflip claude                        Pick Claude account interactively
   caflip claude work                   Switch Claude account by alias
   caflip claude add --alias personal   Add current Claude account with alias
-  caflip claude login                   Run Claude login and register session
+  caflip claude login                  Run Claude login and register session
   caflip claude login -- --email me@example.com --sso
                                        Pass provider-specific flags after --
   caflip claude status --json          Show Claude status as JSON
@@ -3681,76 +3761,7 @@ Examples:
   caflip codex alias work user@company.com
                                        Set Codex alias for target email`);
 }
-async function main() {
-  const parsed = parseProviderArgs(process.argv.slice(2));
-  const provider = parsed.provider;
-  const args = parsed.commandArgs;
-  const command = args[0];
-  let lockHeld = false;
-  const runWithLock = async (fn) => {
-    setupDirectories();
-    acquireLock(activeLockDir);
-    lockHeld = true;
-    try {
-      return await fn();
-    } finally {
-      if (lockHeld) {
-        releaseLock(activeLockDir);
-        lockHeld = false;
-      }
-    }
-  };
-  const runWithProviderLock = async (targetProvider, fn) => {
-    setActiveProvider(targetProvider);
-    return await runWithLock(fn);
-  };
-  const isHelpCommand = command === "help" || command === "--help" || command === "-h";
-  const isProviderOptionalReadOnlyCommand = command === "list" || command === "status";
-  if (!parsed.isProviderQualified && command && !isHelpCommand && !isProviderOptionalReadOnlyCommand) {
-    if (RESERVED_COMMANDS.includes(command)) {
-      showProviderRequiredError(command);
-    } else {
-      console.error("Error: Alias requires provider prefix.");
-      console.error("Try: caflip claude <alias> or caflip codex <alias>");
-      process.exit(2);
-    }
-  }
-  if (!command) {
-    if (!provider) {
-      const defaultProvider = readCliMeta().lastProvider;
-      const selectedProvider = await pickProvider(defaultProvider);
-      await writeLastProvider(selectedProvider);
-      await runWithProviderLock(selectedProvider, async () => {
-        await cmdInteractiveSwitch();
-      });
-      return;
-    }
-    await runWithProviderLock(provider, async () => {
-      await cmdInteractiveSwitch();
-    });
-    return;
-  }
-  if (isHelpCommand) {
-    showHelp();
-    return;
-  }
-  if (!provider) {
-    if (command === "list") {
-      await cmdListAllProviders();
-      return;
-    }
-    if (command === "status") {
-      if (args.includes("--json")) {
-        console.error("Error: Provider is required for status --json.");
-        console.error("Try: caflip claude status --json");
-        process.exit(2);
-      }
-      await cmdStatusAllProviders();
-      return;
-    }
-    showProviderRequiredError(command);
-  }
-  setActiveProvider(provider);
+async function executeProviderCommand(command, args, provider, runWithLock) {
   switch (command) {
     case "list":
       await cmdList();
@@ -3815,6 +3826,62 @@ async function main() {
     }
   }
 }
+async function main() {
+  const context = await resolveCliContext(parseProviderArgs(process.argv.slice(2)));
+  let lockHeld = false;
+  const runWithLock = async (fn) => {
+    setupDirectories();
+    acquireLock(activeLockDir);
+    lockHeld = true;
+    try {
+      return await fn();
+    } finally {
+      if (lockHeld) {
+        releaseLock(activeLockDir);
+        lockHeld = false;
+      }
+    }
+  };
+  const runWithProviderLock = async (targetProvider, fn) => {
+    setActiveProvider(targetProvider);
+    return await runWithLock(fn);
+  };
+  if (context.mode === "interactive-switch") {
+    if (!context.provider) {
+      const defaultProvider = readCliMeta().lastProvider;
+      const selectedProvider = await pickProvider(defaultProvider);
+      await writeLastProvider(selectedProvider);
+      await runWithProviderLock(selectedProvider, async () => {
+        await cmdInteractiveSwitch();
+      });
+      return;
+    }
+    await runWithProviderLock(context.provider, async () => {
+      await cmdInteractiveSwitch();
+    });
+    return;
+  }
+  if (context.mode === "all-providers") {
+    if (context.command === "list") {
+      await cmdListAllProviders();
+      return;
+    }
+    if (context.command === "status") {
+      if (context.args.includes("--json")) {
+        console.error("Error: Provider is required for status --json.");
+        console.error("Try: caflip claude status --json");
+        process.exit(2);
+      }
+      await cmdStatusAllProviders();
+      return;
+    }
+  }
+  const provider = context.provider;
+  const args = context.args;
+  const command = context.command;
+  setActiveProvider(provider);
+  await executeProviderCommand(command, args, provider, runWithLock);
+}
 if (__require.main == __require.module) {
   main().catch((err) => {
     if (err instanceof PromptCancelledError) {
@@ -3826,5 +3893,8 @@ if (__require.main == __require.module) {
   });
 }
 export {
+  supportsInteractiveProviderSelection,
+  resolveProviderForCommand,
+  resolveCliContext,
   performSwitch
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caflip",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "type": "module",
   "bin": {
     "caflip": "bin/caflip"