@hasna/accounts 0.1.15 → 0.1.17

package/README.md

@@ -1,8 +1,8 @@
 # @hasna/accounts
 
 > Manage and switch between multiple AI coding tool profiles/accounts on one
-> machine — Claude Code, Takumi, Codex CLI, Gemini CLI, opencode, Cursor
-> Agent, Pi Coding Agent, Hermes, Kimi Code, Grok Build, and custom tools.
+> machine — Claude Code, Takumi, Codex CLI, Codex App, Gemini CLI, opencode,
+> Cursor Agent, Pi Coding Agent, Hermes, Kimi Code, Grok Build, and custom tools.
 
 `accounts` is a local-first CLI. Each **profile** is an isolated config directory.
 Switch **in the terminal** with `CLAUDE_CONFIG_DIR`, or **in Cursor / VS Code** with
@@ -11,9 +11,9 @@ Switch **in the terminal** with `CLAUDE_CONFIG_DIR`, or **in Cursor / VS Code**
 - **Isolated profiles** — separate config dirs (skills, settings, sessions). Nothing leaks.
 - **Apply mode** — sync OAuth / credentials to live paths for IDEs (Claude-only today).
 - **Remembers the email** — auto-detected from `.claude.json` when possible.
-- **Multi-tool** — first-class built-ins for Claude, Takumi, Codex, Gemini,
-  opencode, Cursor Agent, Pi, Hermes, Kimi Code, and Grok Build; custom tools
-  via `accounts tools add`.
+- **Multi-tool** — first-class built-ins for Claude, Takumi, Codex CLI, Codex
+  App, Gemini, opencode, Cursor Agent, Pi, Hermes, Kimi Code, and Grok Build;
+  custom tools via `accounts tools add`.
 - **Per-tool names** — `work` can exist for Claude, Codex, Cursor, etc.; pass
   `--tool` when a bare profile name is ambiguous.
 - **Local-first** — registry at `~/.hasna/accounts/`. No network, no telemetry.
@@ -60,6 +60,30 @@ 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.
 
+## Codex App profiles on macOS
+
+Codex CLI profiles use `--tool codex`. The macOS desktop app needs its own tool
+because it also needs an isolated Electron user data directory:
+
+```bash
+# Create/sign into a desktop app profile. Quit Codex.app after login finishes.
+accounts login personal --tool codex-app
+accounts login work --tool codex-app
+
+# Switch by launching the desired app profile.
+accounts launch personal --tool codex-app
+accounts launch work --tool codex-app
+
+# Or print/launch the exact handoff command.
+accounts switch work --tool codex-app
+accounts switch work --tool codex-app --launch
+```
+
+Each `codex-app` profile gets its own `CODEX_HOME` and
+`--user-data-dir=<profile>/electron-user-data`. New profiles also get
+`cli_auth_credentials_store = "file"` in `config.toml` so ChatGPT auth stays in
+that profile directory instead of sharing one macOS Keychain credential.
+
 ## Three pointers (active, applied, isolated)
 
 | Pointer / mode | Set by | Meaning |
@@ -224,9 +248,10 @@ JSON by default; auth snapshots stay local.
 
 | Tool | id | Env var | Default dir |
 |------|----|---------|-------------|
-| Claude Code | `claude` | `CLAUDE_CONFIG_DIR` | `~/.claude` |
+| Claude Code | `claude` | `CLAUDE_CONFIG_DIR`, `TELEGRAM_STATE_DIR` | `~/.claude` |
 | Takumi | `takumi` | `TAKUMI_CONFIG_DIR` | `~/.takumi` |
 | Codex CLI | `codex` | `CODEX_HOME` | `~/.codex` |
+| Codex App | `codex-app` | `CODEX_HOME` + `--user-data-dir` | `~/.codex` |
 | Gemini CLI | `gemini` | `GEMINI_CONFIG_DIR` | `~/.gemini` |
 | opencode | `opencode` | `OPENCODE_CONFIG_DIR`, `XDG_CONFIG_HOME`, `XDG_DATA_HOME` | `~/.config/opencode` |
 | Cursor Agent | `cursor` | `CURSOR_CONFIG_DIR` | `~/.cursor` |
@@ -241,6 +266,9 @@ globally is intentionally not recommended.
 
 Custom tools can join supervised resume switching with `accounts tools add ... --resume-arg <arg>`.
 They can also define permission presets with `--permission-arg preset=--flag`.
+Use `--launch-arg` for app-level arguments that should be prepended to every
+login/launch/run command; templates support `{profileDir}`, `{profileName}`, and
+`{toolId}`.
 
 ## Library
 

package/dist/cli.js

@@ -992,7 +992,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._exitCallback = (err) => {
           if (err.code !== "commander.executeSubCommandAsync") {
             throw err;
-          } else {}
+          }
         };
       }
       return this;
@@ -12259,7 +12259,7 @@ var require_es5 = __commonJS((exports, module) => {
 
 // node_modules/@aws-sdk/core/dist-cjs/submodules/client/index.js
 var require_client2 = __commonJS((exports) => {
-  var __dirname = "/home/hasna/workspace/hasna/opensource/open-accounts/node_modules/@aws-sdk/core/dist-cjs/submodules/client";
+  var __dirname = "/home/hasna/Workspace/hasna/opensource/open-accounts/node_modules/@aws-sdk/core/dist-cjs/submodules/client";
   var retry = require_retry();
   var protocols = require_protocols();
   var lambdaInvokeStore = require_invoke_store();
@@ -36797,9 +36797,9 @@ var require_dist_cjs22 = __commonJS((exports) => {
 
 // src/cli.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync12, readFileSync as readFileSync7 } from "node:fs";
+import { existsSync as existsSync13, readFileSync as readFileSync8 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { dirname as dirname5, join as join12 } from "node:path";
+import { dirname as dirname5, join as join13 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // node_modules/commander/esm.mjs
@@ -37381,15 +37381,9 @@ function print(value, json, text) {
   else
     console.log(text);
 }
-function hasJsonOption(options) {
-  return Boolean(options?.json || options?.opts?.().json || options?.optsWithGlobals?.().json || options?.parent?.opts?.().json || options?.parent?.optsWithGlobals?.().json);
-}
-function wantsJson(actionOptions, command) {
-  return hasJsonOption(actionOptions) || hasJsonOption(command);
-}
 function registerWebhookCommands(program2, options) {
   const webhooks = program2.command(options.webhooksCommandName ?? "webhooks").description("Manage Hasna event webhook subscriptions");
-  webhooks.command("add").description("Add or replace a webhook or command subscription").argument("<target>", "Webhook URL or command binary").requiredOption("--id <id>", "Subscription/channel identifier").option("--transport <kind>", "Transport kind: webhook or command", "webhook").option("--name <name>", "Display name").option("--type <pattern>", "Event type filter, e.g. todos.task.*").option("--source <pattern>", "Event source filter").option("--subject <pattern>", "Event subject filter").option("--severity <pattern>", "Event severity filter").option("--secret <secret>", "Webhook HMAC secret").option("--header <name=value...>", "Webhook header", collectValues, []).option("--arg <arg...>", "Command argument", collectValues, []).option("--timeout-ms <ms>", "Transport timeout in milliseconds", parseNumber).option("--retry-attempts <n>", "Maximum delivery attempts", parseNumber).option("--retry-backoff-ms <ms>", "Initial retry backoff in milliseconds", parseNumber).option("--redact <path...>", "Event field path to redact before delivery", collectValues, []).option("--disabled", "Create channel disabled", false).option("-j, --json", "Print JSON output", false).action(async (target, actionOptions, command) => {
+  webhooks.command("add").description("Add or replace a webhook or command subscription").argument("<target>", "Webhook URL or command binary").requiredOption("--id <id>", "Subscription/channel identifier").option("--transport <kind>", "Transport kind: webhook or command", "webhook").option("--name <name>", "Display name").option("--type <pattern>", "Event type filter, e.g. todos.task.*").option("--source <pattern>", "Event source filter").option("--subject <pattern>", "Event subject filter").option("--severity <pattern>", "Event severity filter").option("--secret <secret>", "Webhook HMAC secret").option("--header <name=value...>", "Webhook header", collectValues, []).option("--arg <arg...>", "Command argument", collectValues, []).option("--timeout-ms <ms>", "Transport timeout in milliseconds", parseNumber).option("--retry-attempts <n>", "Maximum delivery attempts", parseNumber).option("--retry-backoff-ms <ms>", "Initial retry backoff in milliseconds", parseNumber).option("--redact <path...>", "Event field path to redact before delivery", collectValues, []).option("--disabled", "Create channel disabled", false).option("-j, --json", "Print JSON output", false).action(async (target, actionOptions) => {
     const timestamp = new Date().toISOString();
     const channel = {
       id: actionOptions.id,
@@ -37410,11 +37404,11 @@ function registerWebhookCommands(program2, options) {
       throw new Error(`Transport ${actionOptions.transport} is reserved for future use and cannot be added yet`);
     }
     const saved = await createClient(options).addChannel(channel);
-    print(sanitizeChannelForOutput(saved), wantsJson(actionOptions, command), `Added ${saved.transport} channel ${saved.id}`);
+    print(sanitizeChannelForOutput(saved), Boolean(actionOptions.json), `Added ${saved.transport} channel ${saved.id}`);
   });
-  webhooks.command("list").description("List configured subscriptions").option("-j, --json", "Print JSON output", false).action(async (actionOptions, command) => {
+  webhooks.command("list").description("List configured subscriptions").option("-j, --json", "Print JSON output", false).action(async (actionOptions) => {
     const channels = await createClient(options).listChannels();
-    if (wantsJson(actionOptions, command)) {
+    if (actionOptions.json) {
       console.log(JSON.stringify(sanitizeChannelsForOutput(channels), null, 2));
       return;
     }
@@ -37426,11 +37420,11 @@ function registerWebhookCommands(program2, options) {
       console.log(`${channel.id}	${channel.enabled ? "enabled" : "disabled"}	${channel.transport}	${channel.webhook?.url ?? channel.command?.command ?? channel.transport}`);
     }
   });
-  webhooks.command("remove").description("Remove a subscription").argument("<id>", "Subscription/channel identifier").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions, command) => {
+  webhooks.command("remove").description("Remove a subscription").argument("<id>", "Subscription/channel identifier").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions) => {
     const removed = await createClient(options).removeChannel(id);
-    print({ removed }, wantsJson(actionOptions, command), removed ? `Removed ${id}` : `Channel not found: ${id}`);
+    print({ removed }, Boolean(actionOptions.json), removed ? `Removed ${id}` : `Channel not found: ${id}`);
   });
-  webhooks.command("test").description("Send a test event to one subscription").argument("<id>", "Subscription/channel identifier").option("--type <type>", "Event type", "events.test").option("--subject <subject>", "Event subject").option("--message <message>", "Event message", "Hasna events test delivery").option("--data <json>", "Event data JSON object").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions, command) => {
+  webhooks.command("test").description("Send a test event to one subscription").argument("<id>", "Subscription/channel identifier").option("--type <type>", "Event type", "events.test").option("--subject <subject>", "Event subject").option("--message <message>", "Event message", "Hasna events test delivery").option("--data <json>", "Event data JSON object").option("-j, --json", "Print JSON output", false).action(async (id, actionOptions) => {
     const result = await createClient(options).testChannel(id, {
       source: options.source,
       type: actionOptions.type,
@@ -37438,13 +37432,13 @@ function registerWebhookCommands(program2, options) {
       message: actionOptions.message,
       data: parseJsonObject(actionOptions.data, { test: true })
     });
-    print(result, wantsJson(actionOptions, command), `${result.status}: ${result.channelId}`);
+    print(result, Boolean(actionOptions.json), `${result.status}: ${result.channelId}`);
   });
   return webhooks;
 }
 function registerEventCommands(program2, options) {
   const events = program2.command(options.eventsCommandName ?? "events").description("Emit, list, and replay Hasna events");
-  events.command("emit").description("Emit an event from this app").argument("<type>", "Event type").option("--source <source>", "Event source override").option("--subject <subject>", "Event subject").option("--severity <severity>", "Event severity", "info").option("--message <message>", "Event message").option("--dedupe-key <key>", "Dedupe key").option("--data <json>", "Event data JSON object").option("--metadata <json>", "Event metadata JSON object").option("--no-deliver", "Record without delivering").option("--no-dedupe", "Allow duplicate id/dedupeKey events").option("-j, --json", "Print JSON output", false).action(async (type, actionOptions, command) => {
+  events.command("emit").description("Emit an event from this app").argument("<type>", "Event type").option("--source <source>", "Event source override").option("--subject <subject>", "Event subject").option("--severity <severity>", "Event severity", "info").option("--message <message>", "Event message").option("--dedupe-key <key>", "Dedupe key").option("--data <json>", "Event data JSON object").option("--metadata <json>", "Event metadata JSON object").option("--no-deliver", "Record without delivering").option("--no-dedupe", "Allow duplicate id/dedupeKey events").option("-j, --json", "Print JSON output", false).action(async (type, actionOptions) => {
     const result = await createClient(options).emit({
       source: actionOptions.source ?? options.source,
       type,
@@ -37455,9 +37449,9 @@ function registerEventCommands(program2, options) {
       data: parseJsonObject(actionOptions.data, {}),
       metadata: parseJsonObject(actionOptions.metadata, {})
     }, { deliver: actionOptions.deliver, dedupe: actionOptions.dedupe });
-    print(result, wantsJson(actionOptions, command), `${result.deduped ? "Deduped" : "Emitted"} ${result.event.id} to ${result.deliveries.length} channel(s)`);
+    print(result, Boolean(actionOptions.json), `${result.deduped ? "Deduped" : "Emitted"} ${result.event.id} to ${result.deliveries.length} channel(s)`);
   });
-  events.command("list").description("List recorded events").option("--source <source>", "Filter by source").option("--type <type>", "Filter by type").option("--limit <n>", "Limit results", parseNumber).option("-j, --json", "Print JSON output", false).action(async (actionOptions, command) => {
+  events.command("list").description("List recorded events").option("--source <source>", "Filter by source").option("--type <type>", "Filter by type").option("--limit <n>", "Limit results", parseNumber).option("-j, --json", "Print JSON output", false).action(async (actionOptions) => {
     let rows = await createClient(options).listEvents();
     if (actionOptions.source)
       rows = rows.filter((event) => event.source === actionOptions.source);
@@ -37465,7 +37459,7 @@ function registerEventCommands(program2, options) {
       rows = rows.filter((event) => event.type === actionOptions.type);
     if (actionOptions.limit)
       rows = rows.slice(-actionOptions.limit);
-    if (wantsJson(actionOptions, command)) {
+    if (actionOptions.json) {
       console.log(JSON.stringify(rows, null, 2));
       return;
     }
@@ -37476,14 +37470,14 @@ function registerEventCommands(program2, options) {
     for (const event of rows)
       console.log(`${event.time}	${event.id}	${event.source}	${event.type}	${event.severity}`);
   });
-  events.command("replay").description("Replay recorded events").option("--id <id>", "Replay one event id").option("--source <source>", "Filter by source").option("--type <type>", "Filter by type").option("--dry-run", "Preview without delivery", false).option("-j, --json", "Print JSON output", false).action(async (actionOptions, command) => {
+  events.command("replay").description("Replay recorded events").option("--id <id>", "Replay one event id").option("--source <source>", "Filter by source").option("--type <type>", "Filter by type").option("--dry-run", "Preview without delivery", false).option("-j, --json", "Print JSON output", false).action(async (actionOptions) => {
     const result = await createClient(options).replay({
       eventId: actionOptions.id,
       source: actionOptions.source,
       type: actionOptions.type,
       dryRun: actionOptions.dryRun
     });
-    print(result, wantsJson(actionOptions, command), `Replayed ${result.events.length} event(s), ${result.deliveries.length} delivery result(s)`);
+    print(result, Boolean(actionOptions.json), `Replayed ${result.events.length} event(s), ${result.deliveries.length} delivery result(s)`);
   });
   return events;
 }
@@ -41978,6 +41972,7 @@ var toolDefSchema = exports_external.object({
   loginHint: exports_external.string().optional(),
   resumeArgs: exports_external.array(exports_external.string()).optional(),
   permissionArgs: exports_external.record(exports_external.array(exports_external.string())).optional(),
+  launchArgs: exports_external.array(exports_external.string()).optional(),
   accountFile: exports_external.string().optional(),
   emailPath: exports_external.array(exports_external.string()).optional()
 });
@@ -42301,6 +42296,9 @@ var BUILTIN_TOOLS = [
     id: "claude",
     label: "Claude Code",
     envVar: "CLAUDE_CONFIG_DIR",
+    extraEnv: {
+      TELEGRAM_STATE_DIR: "{profileDir}/channels/telegram"
+    },
     defaultDir: join3(homedir3(), ".claude"),
     bin: "claude",
     loginHint: "run /login inside Claude, then /exit when done",
@@ -42317,6 +42315,16 @@ var BUILTIN_TOOLS = [
     accountFile: ".claude.json",
     emailPath: ["oauthAccount", "emailAddress"]
   },
+  {
+    id: "codex-app",
+    label: "Codex App",
+    envVar: "CODEX_HOME",
+    defaultDir: join3(homedir3(), ".codex"),
+    bin: "/Applications/Codex.app/Contents/MacOS/Codex",
+    loginHint: "sign in inside Codex.app, then quit the app when the profile is ready",
+    launchArgs: ["--user-data-dir={profileDir}/electron-user-data"],
+    accountFile: "auth.json"
+  },
   {
     id: "codex",
     label: "Codex CLI",
@@ -42466,9 +42474,17 @@ function permissionArgsFor(tool, permissions) {
   }
   return args;
 }
+function renderToolArg(value, profile) {
+  return value.replaceAll("{profileDir}", profile.dir).replaceAll("{profileName}", profile.name).replaceAll("{toolId}", profile.tool);
+}
+function launchArgsFor(tool, profile) {
+  const args = tool.launchArgs ?? [];
+  return profile ? args.map((arg) => renderToolArg(arg, profile)) : args;
+}
 function mergeToolArgs(tool, args, opts = {}) {
+  const launchArgs = launchArgsFor(tool, opts.profile).filter((arg) => !args.includes(arg));
   const permissionArgs = permissionArgsFor(tool, opts.permissions).filter((arg) => !args.includes(arg));
-  return [...permissionArgs, ...args];
+  return [...permissionArgs, ...launchArgs, ...args];
 }
 var BUILTIN_IDS = new Set(BUILTIN_TOOLS.map((t) => t.id));
 function isBuiltinTool(id) {
@@ -42743,7 +42759,7 @@ function currentProfile(toolId) {
   const name = store.current[toolId];
   if (!name)
     return;
-  return store.profiles.find((p) => p.name === name);
+  return store.profiles.find((p) => p.name === name && p.tool === toolId);
 }
 
 // src/lib/claude-auth.ts
@@ -43482,6 +43498,42 @@ function shellSnippet() {
   return `source ${shellQuotePath(hookPath())}`;
 }
 
+// src/lib/codex-app.ts
+import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "node:fs";
+import { join as join11 } from "node:path";
+var FILE_CREDENTIALS_LINE = 'cli_auth_credentials_store = "file"';
+function insertRootConfigLine(config, line) {
+  if (config.trim() === "")
+    return `${line}
+`;
+  const lines = config.split(/\r?\n/);
+  const tableIndex = lines.findIndex((entry) => /^\s*\[[^\]]+\]\s*(?:#.*)?$/.test(entry));
+  if (tableIndex === -1)
+    return `${config.trimEnd()}
+
+${line}
+`;
+  const before = lines.slice(0, tableIndex).join(`
+`).trimEnd();
+  const after = lines.slice(tableIndex).join(`
+`).trimStart();
+  return `${before}${before ? `
+
+` : ""}${line}
+
+${after}${after.endsWith(`
+`) ? "" : `
+`}`;
+}
+function ensureCodexAppProfileConfig(profileDir) {
+  mkdirSync7(profileDir, { recursive: true });
+  const configPath = join11(profileDir, "config.toml");
+  const current = existsSync11(configPath) ? readFileSync6(configPath, "utf8") : "";
+  if (/^\s*cli_auth_credentials_store\s*=/.test(current))
+    return;
+  writeFileSync5(configPath, insertRootConfigLine(current, FILE_CREDENTIALS_LINE), { mode: 384 });
+}
+
 // src/lib/env.ts
 function renderTemplate(value, profile) {
   return value.replaceAll("{profileDir}", profile.dir).replaceAll("{profileName}", profile.name).replaceAll("{toolId}", profile.tool);
@@ -43498,6 +43550,8 @@ function profileEnv(profile, tool) {
     for (const key of CLAUDE_API_AUTH_ENV_KEYS)
       env2[key] = "";
   }
+  if (tool.id === "codex-app")
+    ensureCodexAppProfileConfig(profile.dir);
   return env2;
 }
 function formatEnvAssignments(env2) {
@@ -43531,9 +43585,9 @@ function shellQuote(value) {
 function commandLine(env2, command) {
   return `${formatEnvAssignments(env2)} ${command.map(shellQuote).join(" ")}`.trim();
 }
-function commandFor(tool, opts) {
+function commandFor(profile, tool, opts) {
   const args = [...opts.resume ? tool.resumeArgs ?? [] : [], ...opts.args ?? []];
-  return [tool.bin, ...mergeToolArgs(tool, args, { permissions: opts.permissions })];
+  return [tool.bin, ...mergeToolArgs(tool, args, { permissions: opts.permissions, profile })];
 }
 function switchProfile(name, opts = {}) {
   const profile = getProfile(name, opts.tool);
@@ -43550,7 +43604,7 @@ function switchProfile(name, opts = {}) {
   } else {
     useProfile(name, tool.id);
   }
-  const command = commandFor(tool, opts);
+  const command = commandFor(profile, tool, opts);
   const restartRequired = opts.resume === true || applied || mode === "env";
   const message = applied ? `${profile.name} is now the live/default ${tool.label} profile` : `${profile.name} is now the active ${tool.label} profile`;
   return {
@@ -43571,22 +43625,22 @@ function switchProfile(name, opts = {}) {
 // src/lib/supervisor.ts
 import { spawn as spawn2 } from "node:child_process";
 import { createHash } from "node:crypto";
-import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync6, readdirSync, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync8, readFileSync as readFileSync7, readdirSync, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "node:fs";
 import { createConnection, createServer } from "node:net";
-import { basename, join as join11 } from "node:path";
+import { basename, join as join12 } from "node:path";
 var STATE_SUFFIX = ".json";
 function supervisorDir() {
-  return join11(accountsHome(), "supervisors");
+  return join12(accountsHome(), "supervisors");
 }
 function supervisorStatePath(toolId) {
-  return join11(supervisorDir(), `${toolId}${STATE_SUFFIX}`);
+  return join12(supervisorDir(), `${toolId}${STATE_SUFFIX}`);
 }
 function supervisorSocketPath(toolId) {
   if (process.platform === "win32") {
     const hash = createHash("sha1").update(accountsHome()).digest("hex").slice(0, 12);
     return `\\\\.\\pipe\\hasna-accounts-${hash}-${toolId}`;
   }
-  return join11(supervisorDir(), `${toolId}.sock`);
+  return join12(supervisorDir(), `${toolId}.sock`);
 }
 function nowIso2() {
   return new Date().toISOString();
@@ -43600,23 +43654,23 @@ function parseState(raw) {
 }
 function readSupervisorState(toolId) {
   const path = supervisorStatePath(toolId);
-  if (!existsSync11(path))
+  if (!existsSync12(path))
     return;
   try {
-    return parseState(readFileSync6(path, "utf8"));
+    return parseState(readFileSync7(path, "utf8"));
   } catch {
     return;
   }
 }
 function listSupervisorStates() {
   const dir = supervisorDir();
-  if (!existsSync11(dir))
+  if (!existsSync12(dir))
     return [];
   return readdirSync(dir).filter((name) => name.endsWith(STATE_SUFFIX)).map((name) => basename(name, STATE_SUFFIX)).map((toolId) => readSupervisorState(toolId)).filter((state) => state !== undefined);
 }
 function writeSupervisorState(state) {
-  mkdirSync7(supervisorDir(), { recursive: true });
-  writeFileSync5(supervisorStatePath(state.tool), JSON.stringify(state, null, 2) + `
+  mkdirSync8(supervisorDir(), { recursive: true });
+  writeFileSync6(supervisorStatePath(state.tool), JSON.stringify(state, null, 2) + `
 `, { mode: 384 });
 }
 function removeSupervisorFiles(toolId) {
@@ -43757,7 +43811,7 @@ async function runSupervisedTool(initialProfile, tool, initialArgs = [], opts =
     throw new AccountsError(`an accounts supervisor for ${tool.label} is already running (pid ${existing.pid})`);
   }
   removeSupervisorFiles(tool.id);
-  mkdirSync7(supervisorDir(), { recursive: true });
+  mkdirSync8(supervisorDir(), { recursive: true });
   const startedAt = nowIso2();
   const restartDelayMs = opts.restartDelayMs ?? 350;
   const log = opts.log ?? (() => {
@@ -44032,7 +44086,7 @@ program2.command("show").argument("<name>", "profile name").description("show fu
   console.log(`  tool:       ${p.tool} (${getTool(p.tool).label})`);
   console.log(`  active:     ${active ? source_default.green("yes") : source_default.dim("no")}`);
   console.log(`  applied:    ${isApplied ? source_default.magenta("yes") : source_default.dim("no")}`);
-  console.log(`  config dir: ${p.dir}${existsSync12(p.dir) ? "" : source_default.red("  [missing]")}`);
+  console.log(`  config dir: ${p.dir}${existsSync13(p.dir) ? "" : source_default.red("  [missing]")}`);
   console.log(`  email:      ${p.email ?? source_default.dim("(none)")}`);
   console.log(`  created:    ${p.createdAt}`);
   if (p.lastUsedAt)
@@ -44082,7 +44136,7 @@ program2.command("login").argument("<name>", "profile name").description("launch
   if (tool.id === "claude") {
     console.log(source_default.dim("  After Claude exits, accounts will make this the live/default Claude account."));
   }
-  const res = spawnSync2(tool.bin, loginArgs, {
+  const res = spawnSync2(tool.bin, mergeToolArgs(tool, loginArgs, { profile }), {
     stdio: "inherit",
     env: { ...process.env, ...env2 }
   });
@@ -44184,7 +44238,7 @@ program2.command("switch").argument("<name>", "profile name").argument("[args...
   }
 }));
 var hook = program2.command("hook").description("install a shell wrapper for claude");
-hook.command("install").description(`write ${join12(accountsHome(), "claude-hook.sh")}`).action(action(() => {
+hook.command("install").description(`write ${join13(accountsHome(), "claude-hook.sh")}`).action(action(() => {
   const { path, created } = installHook();
   console.log(source_default.green(created ? `✓ installed hook at ${path}` : `✓ updated hook at ${path}`));
   console.log(source_default.dim(`  add to ~/.zshrc:  ${shellSnippet()}`));
@@ -44210,7 +44264,7 @@ program2.command("launch").argument("<name>", "profile name").argument("[args...
   const profile = getProfile(name, opts.tool);
   const tool = getTool(profile.tool);
   const env2 = profileEnv(profile, tool);
-  const launchArgs = mergeToolArgs(tool, args, { permissions: opts.permissions });
+  const launchArgs = mergeToolArgs(tool, args, { permissions: opts.permissions, profile });
   useProfile(name, tool.id);
   console.log(source_default.dim(`→ ${formatEnvAssignments(env2)} ${tool.bin} ${launchArgs.join(" ")}`));
   const res = spawnSync2(tool.bin, launchArgs, {
@@ -44224,7 +44278,8 @@ program2.command("launch").argument("<name>", "profile name").argument("[args...
 program2.command("run").argument("<target>", "tool id to supervise (claude, codex, opencode...) or a profile name").argument("[args...]", "extra args passed to the tool binary").description("run a tool under the accounts supervisor so MCP can switch/restart it").option("-p, --profile <name>", "profile to run when target is a tool id").option("-t, --tool <tool>", "tool when target is a profile name").option("--resume", "start with the tool's resume/continue args").option("--permissions <preset>", "tool-specific permission preset, e.g. dangerous").action(action(async (target, args, opts) => {
   const plan = resolveSupervisorLaunch(target, { profile: opts.profile, tool: opts.tool });
   const runArgs = mergeToolArgs(plan.tool, [...opts.resume ? plan.tool.resumeArgs ?? [] : [], ...args], {
-    permissions: opts.permissions
+    permissions: opts.permissions,
+    profile: plan.profile
   });
   console.error(source_default.green(`✓ accounts supervisor running ${plan.tool.label} as ${source_default.bold(plan.profile.name)}`));
   console.error(source_default.dim(`  control: accounts supervisor status ${plan.tool.id}`));
@@ -44409,7 +44464,7 @@ tools.command("list", { isDefault: true }).description("list supported tools (bu
     console.log(`${source_default.cyan(t.id.padEnd(10))} ${t.label.padEnd(16)} ${source_default.dim(envNames)} → ${source_default.dim(t.defaultDir)}  ${tag}${permissionsHint}`);
   }
 }));
-tools.command("add").argument("<id>", "tool id, e.g. cursor").description("register a custom tool/app so profiles can target it").requiredOption("--label <label>", 'display name, e.g. "Cursor"').requiredOption("--env-var <VAR>", "env var that points the tool at its config dir").requiredOption("--bin <bin>", "binary to launch").option("--default-dir <path>", "default config dir (default: ~/.<id>)").option("--extra-env <VAR=VALUE...>", "additional env var templates; supports {profileDir}, {profileName}, {toolId}").option("--login-arg <arg...>", "arguments for `accounts login <profile> --tool <id>`").option("--resume-arg <arg...>", "arguments for supervised resume/restart, e.g. --continue").option("--permission-arg <preset=arg...>", "tool permission preset args, e.g. dangerous=--yolo").option("--account-file <file>", "file inside the config dir holding the email").option("--email-path <path>", "dot-path to the email inside that file (e.g. account.email)").action(action((id, opts) => {
+tools.command("add").argument("<id>", "tool id, e.g. cursor").description("register a custom tool/app so profiles can target it").requiredOption("--label <label>", 'display name, e.g. "Cursor"').requiredOption("--env-var <VAR>", "env var that points the tool at its config dir").requiredOption("--bin <bin>", "binary to launch").option("--default-dir <path>", "default config dir (default: ~/.<id>)").option("--extra-env <VAR=VALUE...>", "additional env var templates; supports {profileDir}, {profileName}, {toolId}").option("--login-arg <arg...>", "arguments for `accounts login <profile> --tool <id>`").option("--launch-arg <arg...>", "arguments prepended when launching; supports {profileDir}, {profileName}, {toolId}").option("--resume-arg <arg...>", "arguments for supervised resume/restart, e.g. --continue").option("--permission-arg <preset=arg...>", "tool permission preset args, e.g. dangerous=--yolo").option("--account-file <file>", "file inside the config dir holding the email").option("--email-path <path>", "dot-path to the email inside that file (e.g. account.email)").action(action((id, opts) => {
   const extraEnv = {};
   for (const entry of opts.extraEnv ?? []) {
     const idx = entry.indexOf("=");
@@ -44423,9 +44478,10 @@ tools.command("add").argument("<id>", "tool id, e.g. cursor").description("regis
     label: opts.label,
     envVar: opts.envVar,
     bin: opts.bin,
-    defaultDir: opts.defaultDir ? expandPath(opts.defaultDir) : join12(homedir6(), `.${id}`),
+    defaultDir: opts.defaultDir ? expandPath(opts.defaultDir) : join13(homedir6(), `.${id}`),
     ...Object.keys(extraEnv).length > 0 ? { extraEnv } : {},
     ...opts.loginArg ? { loginArgs: opts.loginArg } : {},
+    ...opts.launchArg ? { launchArgs: opts.launchArg } : {},
     ...opts.resumeArg ? { resumeArgs: opts.resumeArg } : {},
     ...Object.keys(permissionArgs).length > 0 ? { permissionArgs } : {},
     ...opts.accountFile ? { accountFile: opts.accountFile } : {},
@@ -44445,7 +44501,7 @@ program2.command("doctor").description("check the store and profile dirs for pro
   const profiles = listProfiles();
   let problems = 0;
   for (const p of profiles) {
-    const missing = !existsSync12(p.dir);
+    const missing = !existsSync13(p.dir);
     const noEmail = !p.email;
     if (missing) {
       console.log(source_default.red(`  ✗ ${p.name}: config dir missing (${p.dir})`));
@@ -44494,9 +44550,9 @@ program2.parseAsync(process.argv);
 function getVersion() {
   try {
     const here = dirname5(fileURLToPath(import.meta.url));
-    for (const candidate of [join12(here, "..", "package.json"), join12(here, "package.json")]) {
-      if (existsSync12(candidate)) {
-        const pkg = JSON.parse(readFileSync7(candidate, "utf8"));
+    for (const candidate of [join13(here, "..", "package.json"), join13(here, "package.json")]) {
+      if (existsSync13(candidate)) {
+        const pkg = JSON.parse(readFileSync8(candidate, "utf8"));
         if (pkg.version)
           return pkg.version;
       }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export * from "./types.js";
 export { loadStore, saveStore, storePath, accountsHome, profilesDir } from "./storage.js";
-export { BUILTIN_TOOLS, DEFAULT_TOOL, getTool, listTools, isBuiltinTool, addCustomTool, removeCustomTool, mergeToolArgs, normalizePermissionPreset, permissionArgsFor, } from "./lib/tools.js";
+export { BUILTIN_TOOLS, DEFAULT_TOOL, getTool, listTools, isBuiltinTool, addCustomTool, removeCustomTool, mergeToolArgs, launchArgsFor, normalizePermissionPreset, permissionArgsFor, } from "./lib/tools.js";
 export { profileEnv, formatEnvAssignments, formatExportLines } from "./lib/env.js";
 export { detectEmail } from "./lib/detect.js";
 export { expandPath, listProfiles, findProfile, getProfile, addProfile, removeProfile, renameProfile, updateProfile, redetectEmail, useProfile, currentProfile, } from "./lib/profiles.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,EACL,aAAa,EACb,YAAY,EACZ,OAAO,EACP,SAAS,EACT,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,UAAU,EACV,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,UAAU,EACV,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,aAAa,EACb,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACV,oBAAoB,EACpB,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,GAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC/F,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EACzB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,cAAc,EACd,gCAAgC,EAChC,kCAAkC,EAClC,+BAA+B,EAC/B,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,EACL,aAAa,EACb,YAAY,EACZ,OAAO,EACP,SAAS,EACT,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,UAAU,EACV,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,UAAU,EACV,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,aAAa,EACb,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACV,oBAAoB,EACpB,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,GAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC/F,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EACzB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,cAAc,EACd,gCAAgC,EAChC,kCAAkC,EAClC,+BAA+B,EAC/B,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/index.js

@@ -4000,6 +4000,7 @@ var toolDefSchema = exports_external.object({
   loginHint: exports_external.string().optional(),
   resumeArgs: exports_external.array(exports_external.string()).optional(),
   permissionArgs: exports_external.record(exports_external.array(exports_external.string())).optional(),
+  launchArgs: exports_external.array(exports_external.string()).optional(),
   accountFile: exports_external.string().optional(),
   emailPath: exports_external.array(exports_external.string()).optional()
 });
@@ -4171,6 +4172,9 @@ var BUILTIN_TOOLS = [
     id: "claude",
     label: "Claude Code",
     envVar: "CLAUDE_CONFIG_DIR",
+    extraEnv: {
+      TELEGRAM_STATE_DIR: "{profileDir}/channels/telegram"
+    },
     defaultDir: join2(homedir2(), ".claude"),
     bin: "claude",
     loginHint: "run /login inside Claude, then /exit when done",
@@ -4187,6 +4191,16 @@ var BUILTIN_TOOLS = [
     accountFile: ".claude.json",
     emailPath: ["oauthAccount", "emailAddress"]
   },
+  {
+    id: "codex-app",
+    label: "Codex App",
+    envVar: "CODEX_HOME",
+    defaultDir: join2(homedir2(), ".codex"),
+    bin: "/Applications/Codex.app/Contents/MacOS/Codex",
+    loginHint: "sign in inside Codex.app, then quit the app when the profile is ready",
+    launchArgs: ["--user-data-dir={profileDir}/electron-user-data"],
+    accountFile: "auth.json"
+  },
   {
     id: "codex",
     label: "Codex CLI",
@@ -4336,9 +4350,17 @@ function permissionArgsFor(tool, permissions) {
   }
   return args;
 }
+function renderToolArg(value, profile) {
+  return value.replaceAll("{profileDir}", profile.dir).replaceAll("{profileName}", profile.name).replaceAll("{toolId}", profile.tool);
+}
+function launchArgsFor(tool, profile) {
+  const args = tool.launchArgs ?? [];
+  return profile ? args.map((arg) => renderToolArg(arg, profile)) : args;
+}
 function mergeToolArgs(tool, args, opts = {}) {
+  const launchArgs = launchArgsFor(tool, opts.profile).filter((arg) => !args.includes(arg));
   const permissionArgs = permissionArgsFor(tool, opts.permissions).filter((arg) => !args.includes(arg));
-  return [...permissionArgs, ...args];
+  return [...permissionArgs, ...launchArgs, ...args];
 }
 var BUILTIN_IDS = new Set(BUILTIN_TOOLS.map((t) => t.id));
 function isBuiltinTool(id) {
@@ -4725,6 +4747,42 @@ function hasAuthSnapshot(profileDir) {
   return existsSync3(profileOAuthSnapshot(profileDir)) || existsSync3(profileCredentialsSnapshot(profileDir)) || existsSync3(profileKeychainSnapshot(profileDir));
 }
 
+// src/lib/codex-app.ts
+import { existsSync as existsSync4, mkdirSync as mkdirSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { join as join5 } from "node:path";
+var FILE_CREDENTIALS_LINE = 'cli_auth_credentials_store = "file"';
+function insertRootConfigLine(config, line) {
+  if (config.trim() === "")
+    return `${line}
+`;
+  const lines = config.split(/\r?\n/);
+  const tableIndex = lines.findIndex((entry) => /^\s*\[[^\]]+\]\s*(?:#.*)?$/.test(entry));
+  if (tableIndex === -1)
+    return `${config.trimEnd()}
+
+${line}
+`;
+  const before = lines.slice(0, tableIndex).join(`
+`).trimEnd();
+  const after = lines.slice(tableIndex).join(`
+`).trimStart();
+  return `${before}${before ? `
+
+` : ""}${line}
+
+${after}${after.endsWith(`
+`) ? "" : `
+`}`;
+}
+function ensureCodexAppProfileConfig(profileDir) {
+  mkdirSync4(profileDir, { recursive: true });
+  const configPath = join5(profileDir, "config.toml");
+  const current = existsSync4(configPath) ? readFileSync3(configPath, "utf8") : "";
+  if (/^\s*cli_auth_credentials_store\s*=/.test(current))
+    return;
+  writeFileSync3(configPath, insertRootConfigLine(current, FILE_CREDENTIALS_LINE), { mode: 384 });
+}
+
 // src/lib/env.ts
 function renderTemplate(value, profile) {
   return value.replaceAll("{profileDir}", profile.dir).replaceAll("{profileName}", profile.name).replaceAll("{toolId}", profile.tool);
@@ -4741,6 +4799,8 @@ function profileEnv(profile, tool) {
     for (const key of CLAUDE_API_AUTH_ENV_KEYS)
       env[key] = "";
   }
+  if (tool.id === "codex-app")
+    ensureCodexAppProfileConfig(profile.dir);
   return env;
 }
 function formatEnvAssignments(env) {
@@ -4751,14 +4811,14 @@ function formatExportLines(env) {
 `);
 }
 // src/lib/detect.ts
-import { existsSync as existsSync4, readFileSync as readFileSync3 } from "node:fs";
-import { dirname as dirname4, join as join5 } from "node:path";
+import { existsSync as existsSync5, readFileSync as readFileSync4 } from "node:fs";
+import { dirname as dirname4, join as join6 } from "node:path";
 function detectEmail(dir, tool) {
   if (!tool.accountFile || !tool.emailPath)
     return;
-  const candidates = [join5(dir, tool.accountFile)];
+  const candidates = [join6(dir, tool.accountFile)];
   if (dir === tool.defaultDir)
-    candidates.push(join5(dirname4(dir), tool.accountFile));
+    candidates.push(join6(dirname4(dir), tool.accountFile));
   for (const file of candidates) {
     const email = readEmail(file, tool.emailPath);
     if (email)
@@ -4767,11 +4827,11 @@ function detectEmail(dir, tool) {
   return;
 }
 function readEmail(file, path) {
-  if (!existsSync4(file))
+  if (!existsSync5(file))
     return;
   let cursor;
   try {
-    cursor = JSON.parse(readFileSync3(file, "utf8"));
+    cursor = JSON.parse(readFileSync4(file, "utf8"));
   } catch {
     return;
   }
@@ -4786,8 +4846,8 @@ function readEmail(file, path) {
 }
 // src/lib/profiles.ts
 import { homedir as homedir4 } from "node:os";
-import { isAbsolute, join as join6, resolve as resolve2 } from "node:path";
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, rmSync } from "node:fs";
+import { isAbsolute, join as join7, resolve as resolve2 } from "node:path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync5, rmSync } from "node:fs";
 function nowIso() {
   return new Date().toISOString();
 }
@@ -4796,7 +4856,7 @@ function expandPath(p) {
   if (out === "~")
     out = homedir4();
   else if (out.startsWith("~/"))
-    out = join6(homedir4(), out.slice(2));
+    out = join7(homedir4(), out.slice(2));
   return isAbsolute(out) ? out : resolve2(process.cwd(), out);
 }
 function listProfiles(toolId) {
@@ -4834,11 +4894,11 @@ function addProfile(opts) {
   if (store.profiles.some((p) => p.name === name && p.tool === toolId)) {
     throw new AccountsError(`a ${toolId} profile named "${name}" already exists`);
   }
-  const dir = opts.dir ? expandPath(opts.dir) : join6(profilesDir(), toolId, name);
+  const dir = opts.dir ? expandPath(opts.dir) : join7(profilesDir(), toolId, name);
   if (store.profiles.some((p) => p.dir === dir)) {
     throw new AccountsError(`a profile already uses config dir ${dir}`);
   }
-  mkdirSync4(dir, { recursive: true });
+  mkdirSync5(dir, { recursive: true });
   const email = opts.email ?? detectEmail(dir, tool);
   const profile = {
     name,
@@ -4876,7 +4936,7 @@ function removeProfile(name, opts = {}) {
   if (options.purge) {
     const managed = profile.dir.startsWith(profilesDir());
     const isDefault = profile.dir === getTool(profile.tool).defaultDir;
-    if (managed && !isDefault && existsSync5(profile.dir)) {
+    if (managed && !isDefault && existsSync6(profile.dir)) {
       rmSync(profile.dir, { recursive: true, force: true });
       purged = true;
     } else {
@@ -4927,7 +4987,7 @@ function updateProfile(name, opts) {
     profile.description = opts.description;
   if (opts.dir !== undefined) {
     const dir = expandPath(opts.dir);
-    mkdirSync4(dir, { recursive: true });
+    mkdirSync5(dir, { recursive: true });
     profile.dir = dir;
   }
   saveStore(store);
@@ -4971,22 +5031,22 @@ function currentProfile(toolId) {
   const name = store.current[toolId];
   if (!name)
     return;
-  return store.profiles.find((p) => p.name === name);
+  return store.profiles.find((p) => p.name === name && p.tool === toolId);
 }
 // src/lib/apply-lock.ts
-import { closeSync, existsSync as existsSync6, mkdirSync as mkdirSync5, openSync, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
-import { join as join7 } from "node:path";
+import { closeSync, existsSync as existsSync7, mkdirSync as mkdirSync6, openSync, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "node:fs";
+import { join as join8 } from "node:path";
 function lockPath() {
-  return join7(accountsHome(), ".apply.lock");
+  return join8(accountsHome(), ".apply.lock");
 }
 function withApplyLock(fn) {
   const home = accountsHome();
-  mkdirSync5(home, { recursive: true });
+  mkdirSync6(home, { recursive: true });
   const path = lockPath();
   let fd;
   try {
     fd = openSync(path, "wx", 384);
-    writeFileSync3(fd, `${process.pid}
+    writeFileSync4(fd, `${process.pid}
 `, { encoding: "utf8", mode: 384 });
     return fn();
   } catch (err) {
@@ -5002,7 +5062,7 @@ function withApplyLock(fn) {
     if (fd !== undefined) {
       closeSync(fd);
       try {
-        if (existsSync6(path))
+        if (existsSync7(path))
           unlinkSync2(path);
       } catch {}
     }
@@ -5046,19 +5106,19 @@ function applyProfileUnlocked(name, toolId) {
   return { profile, ...previous && previous !== name ? { previous } : {} };
 }
 // src/lib/import-profile.ts
-import { cpSync, existsSync as existsSync7 } from "node:fs";
-import { join as join8 } from "node:path";
+import { cpSync, existsSync as existsSync8 } from "node:fs";
+import { join as join9 } from "node:path";
 function importProfile(opts) {
   const toolId = opts.tool ?? DEFAULT_TOOL;
   const tool = getTool(toolId);
   const name = opts.name ?? "main";
   const sourceDir = opts.dir ? expandPath(opts.dir) : tool.defaultDir;
-  if (!existsSync7(sourceDir)) {
+  if (!existsSync8(sourceDir)) {
     throw new AccountsError(`config dir does not exist: ${sourceDir}`);
   }
   if (opts.copy) {
-    const targetDir = join8(profilesDir(), toolId, name);
-    if (existsSync7(targetDir)) {
+    const targetDir = join9(profilesDir(), toolId, name);
+    if (existsSync8(targetDir)) {
       throw new AccountsError(`managed copy target already exists: ${targetDir}`);
     }
     cpSync(sourceDir, targetDir, { recursive: true });
@@ -5122,9 +5182,9 @@ function shellQuote(value) {
 function commandLine(env, command) {
   return `${formatEnvAssignments(env)} ${command.map(shellQuote).join(" ")}`.trim();
 }
-function commandFor(tool, opts) {
+function commandFor(profile, tool, opts) {
   const args = [...opts.resume ? tool.resumeArgs ?? [] : [], ...opts.args ?? []];
-  return [tool.bin, ...mergeToolArgs(tool, args, { permissions: opts.permissions })];
+  return [tool.bin, ...mergeToolArgs(tool, args, { permissions: opts.permissions, profile })];
 }
 function switchProfile(name, opts = {}) {
   const profile = getProfile(name, opts.tool);
@@ -5141,7 +5201,7 @@ function switchProfile(name, opts = {}) {
   } else {
     useProfile(name, tool.id);
   }
-  const command = commandFor(tool, opts);
+  const command = commandFor(profile, tool, opts);
   const restartRequired = opts.resume === true || applied || mode === "env";
   const message = applied ? `${profile.name} is now the live/default ${tool.label} profile` : `${profile.name} is now the active ${tool.label} profile`;
   return {
@@ -5161,22 +5221,22 @@ function switchProfile(name, opts = {}) {
 // src/lib/supervisor.ts
 import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
-import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync4, readdirSync, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync7, readFileSync as readFileSync5, readdirSync, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "node:fs";
 import { createConnection, createServer } from "node:net";
-import { basename, join as join9 } from "node:path";
+import { basename, join as join10 } from "node:path";
 var STATE_SUFFIX = ".json";
 function supervisorDir() {
-  return join9(accountsHome(), "supervisors");
+  return join10(accountsHome(), "supervisors");
 }
 function supervisorStatePath(toolId) {
-  return join9(supervisorDir(), `${toolId}${STATE_SUFFIX}`);
+  return join10(supervisorDir(), `${toolId}${STATE_SUFFIX}`);
 }
 function supervisorSocketPath(toolId) {
   if (process.platform === "win32") {
     const hash = createHash("sha1").update(accountsHome()).digest("hex").slice(0, 12);
     return `\\\\.\\pipe\\hasna-accounts-${hash}-${toolId}`;
   }
-  return join9(supervisorDir(), `${toolId}.sock`);
+  return join10(supervisorDir(), `${toolId}.sock`);
 }
 function nowIso2() {
   return new Date().toISOString();
@@ -5190,23 +5250,23 @@ function parseState(raw) {
 }
 function readSupervisorState(toolId) {
   const path = supervisorStatePath(toolId);
-  if (!existsSync8(path))
+  if (!existsSync9(path))
     return;
   try {
-    return parseState(readFileSync4(path, "utf8"));
+    return parseState(readFileSync5(path, "utf8"));
   } catch {
     return;
   }
 }
 function listSupervisorStates() {
   const dir = supervisorDir();
-  if (!existsSync8(dir))
+  if (!existsSync9(dir))
     return [];
   return readdirSync(dir).filter((name) => name.endsWith(STATE_SUFFIX)).map((name) => basename(name, STATE_SUFFIX)).map((toolId) => readSupervisorState(toolId)).filter((state) => state !== undefined);
 }
 function writeSupervisorState(state) {
-  mkdirSync6(supervisorDir(), { recursive: true });
-  writeFileSync4(supervisorStatePath(state.tool), JSON.stringify(state, null, 2) + `
+  mkdirSync7(supervisorDir(), { recursive: true });
+  writeFileSync5(supervisorStatePath(state.tool), JSON.stringify(state, null, 2) + `
 `, { mode: 384 });
 }
 function removeSupervisorFiles(toolId) {
@@ -5347,7 +5407,7 @@ async function runSupervisedTool(initialProfile, tool, initialArgs = [], opts =
     throw new AccountsError(`an accounts supervisor for ${tool.label} is already running (pid ${existing.pid})`);
   }
   removeSupervisorFiles(tool.id);
-  mkdirSync6(supervisorDir(), { recursive: true });
+  mkdirSync7(supervisorDir(), { recursive: true });
   const startedAt = nowIso2();
   const restartDelayMs = opts.restartDelayMs ?? 350;
   const log = opts.log ?? (() => {
@@ -5552,8 +5612,8 @@ async function pickProfile(opts = {}) {
   return { profile, mode };
 }
 // src/lib/hook.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync7, readFileSync as readFileSync5, unlinkSync as unlinkSync3, writeFileSync as writeFileSync5 } from "node:fs";
-import { join as join10 } from "node:path";
+import { existsSync as existsSync10, mkdirSync as mkdirSync8, readFileSync as readFileSync6, unlinkSync as unlinkSync3, writeFileSync as writeFileSync6 } from "node:fs";
+import { join as join11 } from "node:path";
 var HOOK_FILE = "claude-hook.sh";
 var MARKER = "# accounts-claude-hook";
 var NAME_PATTERN = "^[a-z0-9][a-z0-9-]*$";
@@ -5561,7 +5621,7 @@ function shellQuotePath(path) {
   return `'${path.replace(/'/g, `'\\''`)}'`;
 }
 function hookPath() {
-  return join10(accountsHome(), HOOK_FILE);
+  return join11(accountsHome(), HOOK_FILE);
 }
 function hookScript() {
   const quotedHook = shellQuotePath(hookPath());
@@ -5591,16 +5651,16 @@ claude() {
 }
 function installHook() {
   const path = hookPath();
-  mkdirSync7(accountsHome(), { recursive: true });
-  const created = !existsSync9(path);
-  writeFileSync5(path, hookScript(), { mode: 493 });
+  mkdirSync8(accountsHome(), { recursive: true });
+  const created = !existsSync10(path);
+  writeFileSync6(path, hookScript(), { mode: 493 });
   return { path, created };
 }
 function uninstallHook() {
   const path = hookPath();
-  if (!existsSync9(path))
+  if (!existsSync10(path))
     return false;
-  const content = readFileSync5(path, "utf8");
+  const content = readFileSync6(path, "utf8");
   if (!content.includes(MARKER))
     return false;
   unlinkSync3(path);
@@ -5654,6 +5714,7 @@ export {
   listTools,
   listSupervisorStates,
   listProfiles,
+  launchArgsFor,
   keychainSupported,
   isSafeProfileName,
   isBuiltinTool,

package/dist/lib/codex-app.d.ts

@@ -0,0 +1,2 @@
+export declare function ensureCodexAppProfileConfig(profileDir: string): void;
+//# sourceMappingURL=codex-app.d.ts.map

package/dist/lib/codex-app.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-app.d.ts","sourceRoot":"","sources":["../../src/lib/codex-app.ts"],"names":[],"mappings":"AAgBA,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAMpE"}

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

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAOpD,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAYlF;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAIxE;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAIrE"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAQpD,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAalF;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAIxE;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAIrE"}

package/dist/lib/tools.d.ts

@@ -1,4 +1,4 @@
-import { type ToolDef } from "../types.js";
+import { type Profile, type ToolDef } from "../types.js";
 /**
  * Built-in tools. Users can register more at runtime with `accounts tools add`,
  * which persists them in the store — so the CLI scales to any app that reads a
@@ -8,9 +8,11 @@ export declare const BUILTIN_TOOLS: ToolDef[];
 export declare const DEFAULT_TOOL = "claude";
 export interface ToolArgOptions {
     permissions?: string;
+    profile?: Profile;
 }
 export declare function normalizePermissionPreset(value: string): string;
 export declare function permissionArgsFor(tool: ToolDef, permissions?: string): string[];
+export declare function launchArgsFor(tool: ToolDef, profile?: Profile): string[];
 export declare function mergeToolArgs(tool: ToolDef, args: string[], opts?: ToolArgOptions): string[];
 export declare function isBuiltinTool(id: string): boolean;
 /** All tools: built-ins plus any user-registered ones (custom wins on id clash). */

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

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/lib/tools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAgC,MAAM,aAAa,CAAC;AAGzE;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,OAAO,EAuIlC,CAAC;AAEF,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAkBD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAG/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAW/E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,cAAmB,GAAG,MAAM,EAAE,CAGhG;AAID,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,oFAAoF;AACpF,wBAAgB,SAAS,IAAI,OAAO,EAAE,CAMrC;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAS3C;AAED,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAanD;AAED,kEAAkE;AAClE,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAWjD"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/lib/tools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,OAAO,EAAgC,MAAM,aAAa,CAAC;AAGvF;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,OAAO,EAoJlC,CAAC;AAEF,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAkBD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAG/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAW/E;AASD,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,CAGxE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,cAAmB,GAAG,MAAM,EAAE,CAIhG;AAID,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,oFAAoF;AACpF,wBAAgB,SAAS,IAAI,OAAO,EAAE,CAMrC;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAS3C;AAED,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAanD;AAED,kEAAkE;AAClE,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAWjD"}

package/dist/mcp.js

@@ -16635,6 +16635,7 @@ var toolDefSchema = exports_external.object({
   loginHint: exports_external.string().optional(),
   resumeArgs: exports_external.array(exports_external.string()).optional(),
   permissionArgs: exports_external.record(exports_external.array(exports_external.string())).optional(),
+  launchArgs: exports_external.array(exports_external.string()).optional(),
   accountFile: exports_external.string().optional(),
   emailPath: exports_external.array(exports_external.string()).optional()
 });
@@ -16805,6 +16806,9 @@ var BUILTIN_TOOLS = [
     id: "claude",
     label: "Claude Code",
     envVar: "CLAUDE_CONFIG_DIR",
+    extraEnv: {
+      TELEGRAM_STATE_DIR: "{profileDir}/channels/telegram"
+    },
     defaultDir: join2(homedir2(), ".claude"),
     bin: "claude",
     loginHint: "run /login inside Claude, then /exit when done",
@@ -16821,6 +16825,16 @@ var BUILTIN_TOOLS = [
     accountFile: ".claude.json",
     emailPath: ["oauthAccount", "emailAddress"]
   },
+  {
+    id: "codex-app",
+    label: "Codex App",
+    envVar: "CODEX_HOME",
+    defaultDir: join2(homedir2(), ".codex"),
+    bin: "/Applications/Codex.app/Contents/MacOS/Codex",
+    loginHint: "sign in inside Codex.app, then quit the app when the profile is ready",
+    launchArgs: ["--user-data-dir={profileDir}/electron-user-data"],
+    accountFile: "auth.json"
+  },
   {
     id: "codex",
     label: "Codex CLI",
@@ -16969,9 +16983,17 @@ function permissionArgsFor(tool, permissions) {
   }
   return args;
 }
+function renderToolArg(value, profile) {
+  return value.replaceAll("{profileDir}", profile.dir).replaceAll("{profileName}", profile.name).replaceAll("{toolId}", profile.tool);
+}
+function launchArgsFor(tool, profile) {
+  const args = tool.launchArgs ?? [];
+  return profile ? args.map((arg) => renderToolArg(arg, profile)) : args;
+}
 function mergeToolArgs(tool, args, opts = {}) {
+  const launchArgs = launchArgsFor(tool, opts.profile).filter((arg) => !args.includes(arg));
   const permissionArgs = permissionArgsFor(tool, opts.permissions).filter((arg) => !args.includes(arg));
-  return [...permissionArgs, ...args];
+  return [...permissionArgs, ...launchArgs, ...args];
 }
 var BUILTIN_IDS = new Set(BUILTIN_TOOLS.map((t) => t.id));
 function listTools() {
@@ -17037,7 +17059,7 @@ function currentProfile(toolId) {
   const name = store.current[toolId];
   if (!name)
     return;
-  return store.profiles.find((p) => p.name === name);
+  return store.profiles.find((p) => p.name === name && p.tool === toolId);
 }
 
 // src/lib/claude-auth.ts
@@ -17443,6 +17465,42 @@ function applyProfileUnlocked(name, toolId) {
   return { profile, ...previous && previous !== name ? { previous } : {} };
 }
 
+// src/lib/codex-app.ts
+import { existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "node:fs";
+import { join as join6 } from "node:path";
+var FILE_CREDENTIALS_LINE = 'cli_auth_credentials_store = "file"';
+function insertRootConfigLine(config2, line) {
+  if (config2.trim() === "")
+    return `${line}
+`;
+  const lines = config2.split(/\r?\n/);
+  const tableIndex = lines.findIndex((entry) => /^\s*\[[^\]]+\]\s*(?:#.*)?$/.test(entry));
+  if (tableIndex === -1)
+    return `${config2.trimEnd()}
+
+${line}
+`;
+  const before = lines.slice(0, tableIndex).join(`
+`).trimEnd();
+  const after = lines.slice(tableIndex).join(`
+`).trimStart();
+  return `${before}${before ? `
+
+` : ""}${line}
+
+${after}${after.endsWith(`
+`) ? "" : `
+`}`;
+}
+function ensureCodexAppProfileConfig(profileDir) {
+  mkdirSync5(profileDir, { recursive: true });
+  const configPath = join6(profileDir, "config.toml");
+  const current = existsSync5(configPath) ? readFileSync3(configPath, "utf8") : "";
+  if (/^\s*cli_auth_credentials_store\s*=/.test(current))
+    return;
+  writeFileSync4(configPath, insertRootConfigLine(current, FILE_CREDENTIALS_LINE), { mode: 384 });
+}
+
 // src/lib/env.ts
 function renderTemplate(value, profile) {
   return value.replaceAll("{profileDir}", profile.dir).replaceAll("{profileName}", profile.name).replaceAll("{toolId}", profile.tool);
@@ -17459,6 +17517,8 @@ function profileEnv(profile, tool) {
     for (const key of CLAUDE_API_AUTH_ENV_KEYS)
       env[key] = "";
   }
+  if (tool.id === "codex-app")
+    ensureCodexAppProfileConfig(profile.dir);
   return env;
 }
 function formatEnvAssignments(env) {
@@ -17478,9 +17538,9 @@ function shellQuote(value) {
 function commandLine(env, command) {
   return `${formatEnvAssignments(env)} ${command.map(shellQuote).join(" ")}`.trim();
 }
-function commandFor(tool, opts) {
+function commandFor(profile, tool, opts) {
   const args = [...opts.resume ? tool.resumeArgs ?? [] : [], ...opts.args ?? []];
-  return [tool.bin, ...mergeToolArgs(tool, args, { permissions: opts.permissions })];
+  return [tool.bin, ...mergeToolArgs(tool, args, { permissions: opts.permissions, profile })];
 }
 function switchProfile(name, opts = {}) {
   const profile = getProfile(name, opts.tool);
@@ -17497,7 +17557,7 @@ function switchProfile(name, opts = {}) {
   } else {
     useProfile(name, tool.id);
   }
-  const command = commandFor(tool, opts);
+  const command = commandFor(profile, tool, opts);
   const restartRequired = opts.resume === true || applied || mode === "env";
   const message = applied ? `${profile.name} is now the live/default ${tool.label} profile` : `${profile.name} is now the active ${tool.label} profile`;
   return {
@@ -17517,22 +17577,22 @@ function switchProfile(name, opts = {}) {
 
 // src/lib/supervisor.ts
 import { createHash } from "node:crypto";
-import { existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync3, readdirSync, rmSync, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync4, readdirSync, rmSync, writeFileSync as writeFileSync5 } from "node:fs";
 import { createConnection, createServer } from "node:net";
-import { basename, join as join6 } from "node:path";
+import { basename, join as join7 } from "node:path";
 var STATE_SUFFIX = ".json";
 function supervisorDir() {
-  return join6(accountsHome(), "supervisors");
+  return join7(accountsHome(), "supervisors");
 }
 function supervisorStatePath(toolId) {
-  return join6(supervisorDir(), `${toolId}${STATE_SUFFIX}`);
+  return join7(supervisorDir(), `${toolId}${STATE_SUFFIX}`);
 }
 function supervisorSocketPath(toolId) {
   if (process.platform === "win32") {
     const hash = createHash("sha1").update(accountsHome()).digest("hex").slice(0, 12);
     return `\\\\.\\pipe\\hasna-accounts-${hash}-${toolId}`;
   }
-  return join6(supervisorDir(), `${toolId}.sock`);
+  return join7(supervisorDir(), `${toolId}.sock`);
 }
 function parseState(raw) {
   const data = JSON.parse(raw);
@@ -17543,17 +17603,17 @@ function parseState(raw) {
 }
 function readSupervisorState(toolId) {
   const path = supervisorStatePath(toolId);
-  if (!existsSync5(path))
+  if (!existsSync6(path))
     return;
   try {
-    return parseState(readFileSync3(path, "utf8"));
+    return parseState(readFileSync4(path, "utf8"));
   } catch {
     return;
   }
 }
 function listSupervisorStates() {
   const dir = supervisorDir();
-  if (!existsSync5(dir))
+  if (!existsSync6(dir))
     return [];
   return readdirSync(dir).filter((name) => name.endsWith(STATE_SUFFIX)).map((name) => basename(name, STATE_SUFFIX)).map((toolId) => readSupervisorState(toolId)).filter((state) => state !== undefined);
 }
@@ -17619,7 +17679,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.15" }, { capabilities: { tools: {} } });
+var server = new Server({ name: "accounts", version: "0.1.16" }, { capabilities: { tools: {} } });
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
   tools: [
     {

package/dist/storage.js

@@ -4008,6 +4008,7 @@ var toolDefSchema = exports_external.object({
   loginHint: exports_external.string().optional(),
   resumeArgs: exports_external.array(exports_external.string()).optional(),
   permissionArgs: exports_external.record(exports_external.array(exports_external.string())).optional(),
+  launchArgs: exports_external.array(exports_external.string()).optional(),
   accountFile: exports_external.string().optional(),
   emailPath: exports_external.array(exports_external.string()).optional()
 });

package/dist/types.d.ts

@@ -14,6 +14,8 @@ export declare const toolDefSchema: z.ZodObject<{
     resumeArgs: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     /** Tool-specific permission presets exposed through `--permissions <preset>`. */
     permissionArgs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>;
+    /** Tool args prepended for launch/login/run; supports {profileDir}, {profileName}, {toolId}. */
+    launchArgs: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     accountFile: z.ZodOptional<z.ZodString>;
     emailPath: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strip", z.ZodTypeAny, {
@@ -27,6 +29,7 @@ export declare const toolDefSchema: z.ZodObject<{
     loginHint?: string | undefined;
     resumeArgs?: string[] | undefined;
     permissionArgs?: Record<string, string[]> | undefined;
+    launchArgs?: string[] | undefined;
     accountFile?: string | undefined;
     emailPath?: string[] | undefined;
 }, {
@@ -40,6 +43,7 @@ export declare const toolDefSchema: z.ZodObject<{
     loginHint?: string | undefined;
     resumeArgs?: string[] | undefined;
     permissionArgs?: Record<string, string[]> | undefined;
+    launchArgs?: string[] | undefined;
     accountFile?: string | undefined;
     emailPath?: string[] | undefined;
 }>;
@@ -123,6 +127,8 @@ export declare const storeSchema: z.ZodObject<{
         resumeArgs: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         /** Tool-specific permission presets exposed through `--permissions <preset>`. */
         permissionArgs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>;
+        /** Tool args prepended for launch/login/run; supports {profileDir}, {profileName}, {toolId}. */
+        launchArgs: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         accountFile: z.ZodOptional<z.ZodString>;
         emailPath: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     }, "strip", z.ZodTypeAny, {
@@ -136,6 +142,7 @@ export declare const storeSchema: z.ZodObject<{
         loginHint?: string | undefined;
         resumeArgs?: string[] | undefined;
         permissionArgs?: Record<string, string[]> | undefined;
+        launchArgs?: string[] | undefined;
         accountFile?: string | undefined;
         emailPath?: string[] | undefined;
     }, {
@@ -149,6 +156,7 @@ export declare const storeSchema: z.ZodObject<{
         loginHint?: string | undefined;
         resumeArgs?: string[] | undefined;
         permissionArgs?: Record<string, string[]> | undefined;
+        launchArgs?: string[] | undefined;
         accountFile?: string | undefined;
         emailPath?: string[] | undefined;
     }>, "many">>;
@@ -176,6 +184,7 @@ export declare const storeSchema: z.ZodObject<{
         loginHint?: string | undefined;
         resumeArgs?: string[] | undefined;
         permissionArgs?: Record<string, string[]> | undefined;
+        launchArgs?: string[] | undefined;
         accountFile?: string | undefined;
         emailPath?: string[] | undefined;
     }[];
@@ -203,6 +212,7 @@ export declare const storeSchema: z.ZodObject<{
         loginHint?: string | undefined;
         resumeArgs?: string[] | undefined;
         permissionArgs?: Record<string, string[]> | undefined;
+        launchArgs?: string[] | undefined;
         accountFile?: string | undefined;
         emailPath?: string[] | undefined;
     }[] | undefined;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,8BAA8B;AAC9B,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAE5C,uEAAuE;AACvE,eAAO,MAAM,aAAa;;;;;;;;;;IAUxB,iFAAiF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIjF,CAAC;AAEH;;;;;GAKG;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;EAQxB,CAAC;AAEH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEpD,eAAO,MAAM,WAAW;;IAEtB,mEAAmE;;IAEnE;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGH,0EAA0E;;;;;;;;;;;QApC1E,iFAAiF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsCjF,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEhD,qBAAa,aAAc,SAAQ,KAAK;gBAC1B,OAAO,EAAE,MAAM;CAI5B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,8BAA8B;AAC9B,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAE5C,uEAAuE;AACvE,eAAO,MAAM,aAAa;;;;;;;;;;IAUxB,iFAAiF;;IAEjF,gGAAgG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIhG,CAAC;AAEH;;;;;GAKG;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;EAQxB,CAAC;AAEH,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEpD,eAAO,MAAM,WAAW;;IAEtB,mEAAmE;;IAEnE;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGH,0EAA0E;;;;;;;;;;;QAtC1E,iFAAiF;;QAEjF,gGAAgG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsChG,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEhD,qBAAa,aAAc,SAAQ,KAAK;gBAC1B,OAAO,EAAE,MAAM;CAI5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/accounts",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "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",