@hasna/accounts 0.1.13 → 0.1.15

package/README.md

@@ -42,23 +42,23 @@ accounts login work        # run /login inside Claude, then /exit; accounts auto
 accounts login personal    # same: login, exit; it becomes the live/default account
 
 # 4. Switch
-accounts apply work --tool claude   # Cursor / VS Code — live ~/.claude auth
+accounts apply work                 # Cursor / VS Code — live ~/.claude auth
 accounts apply personal
 
 # Or terminal-only (parallel sessions OK):
-accounts launch work --tool claude
-eval "$(accounts env personal --tool claude)"   # other terminal
+accounts launch work
+eval "$(accounts env personal)"      # other terminal
 
 # Or supervised: lets MCP switch/restart this Claude process automatically
-accounts use work --tool claude
+accounts use work
 accounts run claude --resume
-accounts switch personal --tool claude --supervisor   # from another terminal
+accounts switch personal --supervisor   # from another terminal
 ```
 
-After `accounts login <name> --tool claude`, `accounts` snapshots the auth Claude
-wrote, updates the detected email, and applies that profile to live `~/.claude`
-paths automatically. `accounts apply` still refuses profiles without auth so live
-OAuth is not wiped.
+After `accounts login <name>`, `accounts` snapshots the auth Claude wrote,
+updates the detected email, and applies that profile to live `~/.claude` paths
+automatically. `accounts apply` still refuses profiles without auth so live OAuth
+is not wiped.
 
 ## Three pointers (active, applied, isolated)
 
@@ -94,24 +94,24 @@ Implementation details: [docs/IMPLEMENT.md](docs/IMPLEMENT.md).
 |---------|-------------|
 | `accounts add <name>` | Create a profile. `--tool`, `--email`, `--dir`, `--description`. |
 | `accounts import [name]` | Import existing config dir (default `~/.claude`). `--copy` for managed copy. |
-| `accounts login <name> --tool <tool>` | Launch the tool's login flow in an isolated profile dir. |
-| `accounts apply <name> --tool claude` | Apply profile auth to live Claude paths (requires snapshot; Claude-only). |
+| `accounts login <name>` | Launch the profile's tool login flow in an isolated profile dir. Use `--tool` only for new or ambiguous profiles. |
+| `accounts apply <name>` | Apply profile auth to live Claude paths (requires snapshot; Claude-only). |
 | `accounts pick` | Interactive picker; default applies. `--env`, `--no-act`. |
-| `accounts switch <name> --tool <tool>` | Switch profile and print a restart/resume command. Add `--resume`, `--launch`, or `--permissions <preset>`. |
-| `accounts switch <name> --tool <tool> --supervisor` | Ask a running `accounts run <tool>` supervisor to restart under that profile. Supports `--permissions <preset>`. |
-| `accounts use <name> --tool <tool>` | Mark profile active; prints apply/env hints. |
+| `accounts switch <name>` | Switch profile and print a restart/resume command. Add `--resume`, `--launch`, or `--permissions <preset>`. Use `--tool` only when ambiguous. |
+| `accounts switch <name> --supervisor` | Ask a running `accounts run <tool>` supervisor to restart under that profile. Supports `--permissions <preset>`. |
+| `accounts use <name>` | Mark profile active; prints apply/env hints. |
 | `accounts list` (`ls`) | List profiles (`●` active, `◉` applied, `●◉` both). |
 | `accounts show <name> --tool <tool>` | Profile details including active/applied flags. |
 | `accounts current` | Active profile per tool (with applied hint). |
 | `accounts active [tool]` | Print active profile name (scripting). |
 | `accounts applied [tool]` | Print applied profile name (scripting). |
-| `accounts env [name] --tool <tool>` | Print one or more `export ...` lines for the profile. |
-| `accounts launch <name> --tool <tool>` | Launch tool once with profile env. Supports `--permissions <preset>`. |
+| `accounts env [name]` | Print one or more `export ...` lines for the profile. Use `--tool` only when ambiguous or when no name is passed. |
+| `accounts launch <name>` | Launch tool once with profile env. Supports `--permissions <preset>`. |
 | `accounts run <tool> [args...]` | Run a tool under the supervisor so MCP/CLI can switch and restart it. Supports `--permissions <preset>`. |
 | `accounts supervisor status [tool]` | Show running supervisors. |
-| `accounts supervisor switch <name> --tool <tool>` | Switch a running supervisor to another profile. |
+| `accounts supervisor switch <name>` | Switch a running supervisor to another profile. Use `--tool` only when ambiguous. |
 | `accounts supervisor stop <tool>` | Stop a running supervisor and its child process. |
-| `accounts shell <name> --tool <tool>` | Subshell with profile env. |
+| `accounts shell <name>` | Subshell with profile env. |
 | `accounts hook install` | Install `claude()` wrapper — see [docs/hook.md](docs/hook.md). |
 | `accounts hook uninstall` | Remove hook script. |
 | `accounts hook path` | Print hook script path. |
@@ -140,7 +140,7 @@ Add it to Claude/Codex/opencode/Cursor MCP config as a command server named
 For automatic agent restarts, start the agent through `accounts run`:
 
 ```bash
-accounts use account001 --tool claude
+accounts use account001
 accounts run claude --resume
 ```
 
@@ -157,10 +157,10 @@ handoff behavior and returns a command such as:
 Human equivalent:
 
 ```bash
-accounts switch account001 --tool claude --resume
-accounts switch account001 --tool claude --resume --launch
-accounts switch account001 --tool claude --resume --permissions dangerous
-accounts switch account001 --tool claude --supervisor
+accounts switch account001 --resume
+accounts switch account001 --resume --launch
+accounts switch account001 --resume --permissions dangerous
+accounts switch account001 --supervisor
 accounts switch codex-work --tool codex --resume
 accounts switch ops --tool opencode --resume
 ```

package/dist/cli.js

@@ -42835,6 +42835,22 @@ function readKeychainAccount() {
     return;
   }
 }
+function bufferText(value) {
+  if (typeof value === "string")
+    return value;
+  if (value instanceof Uint8Array)
+    return new TextDecoder().decode(value);
+  return;
+}
+function keychainWriteFailureMessage(err) {
+  const record = err && typeof err === "object" ? err : {};
+  const stderr = bufferText(record.stderr);
+  const stdout = bufferText(record.stdout);
+  const detail = (stderr || stdout || "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean).at(-1);
+  if (detail)
+    return detail;
+  return typeof record.status === "number" ? `security exited with status ${record.status}` : "security command failed";
+}
 function writeClaudeKeychain(cred) {
   if (!keychainSupported()) {
     throw new AccountsError("macOS keychain is only available on darwin");
@@ -42848,7 +42864,7 @@ function writeClaudeKeychain(cred) {
       stdio: ["ignore", "pipe", "pipe"]
     });
   } catch (err) {
-    throw new AccountsError(`keychain write failed: ${err.message}`);
+    throw new AccountsError(`keychain write failed: ${keychainWriteFailureMessage(err)}`);
   }
 }
 
@@ -43351,11 +43367,11 @@ function importProfile(opts) {
     ensureProfileAuthSnapshot(profile.dir, tool);
   return profile;
 }
-function ensureProfileForLogin(name, toolId = DEFAULT_TOOL) {
+function ensureProfileForLogin(name, toolId) {
   const existing = findProfileByName(name, toolId);
   if (existing)
     return existing;
-  return addProfile({ name, tool: toolId, description: "created for login" });
+  return addProfile({ name, tool: toolId ?? DEFAULT_TOOL, description: "created for login" });
 }
 function findProfileByName(name, toolId) {
   try {
@@ -43986,7 +44002,7 @@ program2.command("add").argument("<name>", "profile name (lowercase, hyphenated)
   console.log(`  config dir: ${p.dir}`);
   console.log(`  email:      ${p.email ?? source_default.dim("(none — set with `accounts set " + p.name + " --email ...`)")}`);
   const tool = getTool(p.tool);
-  console.log(source_default.dim(`  launch it:  accounts launch ${p.name} --tool ${p.tool}    (sets ${tool.envVar} and runs ${tool.bin})`));
+  console.log(source_default.dim(`  launch it:  accounts launch ${p.name}    (sets ${tool.envVar} and runs ${tool.bin})`));
 }));
 program2.command("list").alias("ls").description("list all profiles").option("-t, --tool <tool>", "filter by tool").option("--json", "output JSON").action(action((opts) => {
   const profiles = listProfiles(opts.tool);
@@ -44051,9 +44067,9 @@ program2.command("import").argument("[name]", "profile name (default: main)").de
   console.log(source_default.green(`✓ imported profile ${source_default.bold(p.name)}`));
   console.log(`  config dir: ${p.dir}`);
   console.log(`  email:      ${p.email ?? source_default.dim("(none)")}`);
-  console.log(source_default.dim(`  next: accounts login ${p.name} --tool ${p.tool}  OR  accounts apply ${p.name} --tool ${p.tool}`));
+  console.log(source_default.dim(`  next: accounts login ${p.name}  OR  accounts apply ${p.name}`));
 }));
-program2.command("login").argument("<name>", "profile name").description("launch the tool's login flow inside an isolated profile dir").option("-t, --tool <tool>", "tool", DEFAULT_TOOL).action(action((name, opts) => {
+program2.command("login").argument("<name>", "profile name").description("launch the tool's login flow inside an isolated profile dir").option("-t, --tool <tool>", "tool when creating a missing profile or when the profile name is ambiguous").action(action((name, opts) => {
   const profile = ensureProfileForLogin(name, opts.tool);
   const tool = getTool(profile.tool);
   const env2 = profileEnv(profile, tool);

package/dist/index.js

@@ -4481,6 +4481,22 @@ function readKeychainAccount() {
     return;
   }
 }
+function bufferText(value) {
+  if (typeof value === "string")
+    return value;
+  if (value instanceof Uint8Array)
+    return new TextDecoder().decode(value);
+  return;
+}
+function keychainWriteFailureMessage(err) {
+  const record = err && typeof err === "object" ? err : {};
+  const stderr = bufferText(record.stderr);
+  const stdout = bufferText(record.stdout);
+  const detail = (stderr || stdout || "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean).at(-1);
+  if (detail)
+    return detail;
+  return typeof record.status === "number" ? `security exited with status ${record.status}` : "security command failed";
+}
 function writeClaudeKeychain(cred) {
   if (!keychainSupported()) {
     throw new AccountsError("macOS keychain is only available on darwin");
@@ -4494,7 +4510,7 @@ function writeClaudeKeychain(cred) {
       stdio: ["ignore", "pipe", "pipe"]
     });
   } catch (err) {
-    throw new AccountsError(`keychain write failed: ${err.message}`);
+    throw new AccountsError(`keychain write failed: ${keychainWriteFailureMessage(err)}`);
   }
 }
 
@@ -5069,11 +5085,11 @@ function importProfile(opts) {
     ensureProfileAuthSnapshot(profile.dir, tool);
   return profile;
 }
-function ensureProfileForLogin(name, toolId = DEFAULT_TOOL) {
+function ensureProfileForLogin(name, toolId) {
   const existing = findProfileByName(name, toolId);
   if (existing)
     return existing;
-  return addProfile({ name, tool: toolId, description: "created for login" });
+  return addProfile({ name, tool: toolId ?? DEFAULT_TOOL, description: "created for login" });
 }
 function findProfileByName(name, toolId) {
   try {

package/dist/lib/import-profile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-profile.d.ts","sourceRoot":"","sources":["../../src/lib/import-profile.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa;;;;;;;;EAqChD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAe;;;;;;;;EAIxE"}
+{"version":3,"file":"import-profile.d.ts","sourceRoot":"","sources":["../../src/lib/import-profile.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa;;;;;;;;EAqChD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;;;;EAIlE"}

package/dist/lib/keychain.d.ts

@@ -8,6 +8,7 @@ export interface KeychainCredential {
 export declare function assertAllowedKeychainCredential(cred: KeychainCredential): void;
 /** Read Claude Code OAuth payload from macOS login keychain. */
 export declare function readClaudeKeychain(): KeychainCredential | undefined;
+export declare function keychainWriteFailureMessage(err: unknown): string;
 /** Write Claude Code credentials into the login keychain (replaces existing entry). */
 export declare function writeClaudeKeychain(cred: KeychainCredential): void;
 //# sourceMappingURL=keychain.d.ts.map

package/dist/lib/keychain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../src/lib/keychain.ts"],"names":[],"mappings":"AAKA,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAID,yFAAyF;AACzF,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAU9E;AAED,gEAAgE;AAChE,wBAAgB,kBAAkB,IAAI,kBAAkB,GAAG,SAAS,CAgBnE;AAgBD,uFAAuF;AACvF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAqBlE"}
+{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../src/lib/keychain.ts"],"names":[],"mappings":"AAKA,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAID,yFAAyF;AACzF,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAU9E;AAED,gEAAgE;AAChE,wBAAgB,kBAAkB,IAAI,kBAAkB,GAAG,SAAS,CAgBnE;AAsBD,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAWhE;AAED,uFAAuF;AACvF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAqBlE"}

package/dist/mcp.js

@@ -17129,6 +17129,22 @@ function readKeychainAccount() {
     return;
   }
 }
+function bufferText(value) {
+  if (typeof value === "string")
+    return value;
+  if (value instanceof Uint8Array)
+    return new TextDecoder().decode(value);
+  return;
+}
+function keychainWriteFailureMessage(err) {
+  const record3 = err && typeof err === "object" ? err : {};
+  const stderr = bufferText(record3.stderr);
+  const stdout = bufferText(record3.stdout);
+  const detail = (stderr || stdout || "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean).at(-1);
+  if (detail)
+    return detail;
+  return typeof record3.status === "number" ? `security exited with status ${record3.status}` : "security command failed";
+}
 function writeClaudeKeychain(cred) {
   if (!keychainSupported()) {
     throw new AccountsError("macOS keychain is only available on darwin");
@@ -17142,7 +17158,7 @@ function writeClaudeKeychain(cred) {
       stdio: ["ignore", "pipe", "pipe"]
     });
   } catch (err) {
-    throw new AccountsError(`keychain write failed: ${err.message}`);
+    throw new AccountsError(`keychain write failed: ${keychainWriteFailureMessage(err)}`);
   }
 }
 
@@ -17603,7 +17619,7 @@ function ok(data) {
 function fail(message) {
   return { content: [{ type: "text", text: JSON.stringify({ error: message }) }], isError: true };
 }
-var server = new Server({ name: "accounts", version: "0.1.13" }, { capabilities: { tools: {} } });
+var server = new Server({ name: "accounts", version: "0.1.15" }, { capabilities: { tools: {} } });
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
   tools: [
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/accounts",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "Manage and switch between multiple Claude Code (and other AI coding tool) profiles/accounts locally — isolated config dirs, per-account email, one-command switching.",
   "type": "module",
   "main": "dist/index.js",